From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 731 +++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 593 insertions(+), 138 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 497d406..77ac27d 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -1,31 +1,34 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Form, Row, Col, Input, Select, Radio, Tooltip, InputNumber, Cascader, Checkbox } from 'antd'
+import { Form, Row, Col, Input, Select, Radio, Tooltip, InputNumber, Cascader, Checkbox, notification } from 'antd'
import { QuestionCircleOutlined } from '@ant-design/icons'
import { formRule } from '@/utils/option.js'
import asyncComponent from '@/utils/asyncComponent'
+import KeyInterface from '@/components/keyInterface'
+import MkPrintTemps from './mkPrintTemps'
import './index.scss'
const { TextArea } = Input
const MkEditIcon = asyncComponent(() => import('@/components/mkIcon'))
+const CodeMirror = asyncComponent(() => import('@/templates/zshare/codemirror'))
+const MKTable = asyncComponent(() => import('@/components/normalform/modalform/mkTable'))
const acTyOptions = {
- pop: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'position', 'tipTitle', 'hidden'],
- prompt: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'position', 'tipTitle', 'hidden'],
- exec: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'hidden'],
- excelIn: ['label', 'Ot', 'OpenType', 'intertype', 'show', 'icon', 'class', 'color', 'sheet', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'width', 'hidden'],
- excelOut: ['label', 'OpenType', 'intertype', 'show', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'pagination', 'search', 'width', 'hidden'],
- popview: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'color', 'popClose', 'width', 'display', 'ratio', 'syncComponent', 'clickouter', 'hidden'],
- tab: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'color', 'linkmenu', 'width', 'hidden'],
- innerpage: ['label', 'Ot', 'OpenType', 'pageTemplate', 'show', 'swipe', 'icon', 'class', 'color', 'width', 'open', 'hidden'],
- funcbutton: ['label', 'OpenType', 'funcType', 'show', 'swipe', 'icon', 'class', 'color', 'width', 'hidden'],
- form: ['label', 'OpenType', 'formType', 'intertype', 'Ot', 'execSuccess', 'execError', 'syncComponent', 'width', 'refreshTab', 'title', 'hidden']
+ pop: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'hover', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'position', 'hoverTitle', 'hidden', 'preButton', 'extBtn', 'reload'],
+ prompt: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'hover', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'position', 'tipTitle', 'hoverTitle', 'hidden', 'preButton', 'reload'],
+ exec: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'hover', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'anchors', 'width', 'openmenu', 'refreshTab', 'hoverTitle', 'hidden', 'preButton', 'reload'],
+ excelIn: ['label', 'Ot', 'OpenType', 'intertype', 'show', 'hover', 'icon', 'class', 'color', 'sheet', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'width', 'hidden', 'refreshTab'],
+ excelOut: ['label', 'Ot', 'OpenType', 'intertype', 'show', 'hover', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'pagination', 'search', 'width', 'hidden', 'refreshTab'],
+ popview: ['label', 'Ot', 'OpenType', 'show', 'hover', 'icon', 'class', 'color', 'popClose', 'width', 'display', 'ratio', 'syncComponent', 'clickouter', 'maskStyle', 'closeButton', 'hidden'],
+ tab: ['label', 'Ot', 'OpenType', 'show', 'hover', 'icon', 'class', 'color', 'linkmenu', 'width', 'hidden', 'openTab'],
+ innerpage: ['label', 'Ot', 'OpenType', 'pageTemplate', 'show', 'hover', 'swipe', 'icon', 'class', 'color', 'width', 'hidden'],
+ funcbutton: ['label', 'OpenType', 'funcType', 'show', 'hover', 'swipe', 'icon', 'class', 'color', 'width', 'hidden'],
+ form: ['label', 'OpenType', 'formType', 'intertype', 'Ot', 'execSuccess', 'execError', 'syncComponent', 'width', 'openmenu', 'refreshTab', 'title', 'hidden', 'reload']
}
class ActionForm extends Component {
static propTpyes = {
- dict: PropTypes.object, // 瀛楀吀椤�
type: PropTypes.any, // type涓�"card"鏃讹紝鍙彲閫夊崟琛屾垨涓嶉�夎
setting: PropTypes.object, // 椤甸潰璁剧疆
formlist: PropTypes.any, // 琛ㄥ崟淇℃伅
@@ -60,13 +63,13 @@
}],
interTypeOptions: [{
value: 'system',
- text: this.props.dict['model.interface.system']
+ text: '绯荤粺'
}, {
value: 'inner',
- text: this.props.dict['model.interface.inner']
+ text: '鍐呴儴'
}, {
value: 'outer',
- text: this.props.dict['model.interface.outer']
+ text: '澶栭儴'
}, {
value: 'custom',
text: '鑷畾涔�'
@@ -76,13 +79,13 @@
record = {}
UNSAFE_componentWillMount () {
- const { type, dict } = this.props
+ const { type } = this.props
let requireOptions = [
- { value: 'notRequired', text: dict['header.form.notRequired'] },
- { value: 'requiredSgl', text: dict['header.form.requiredSgl'] },
- { value: 'required', text: dict['header.form.required'] },
- { value: 'requiredOnce', text: dict['header.form.requiredOnce'] }
+ { value: 'notRequired', text: '涓嶉�夋嫨琛�' },
+ { value: 'requiredSgl', text: '閫夋嫨鍗曡' },
+ { value: 'required', text: '閫夋嫨澶氳' },
+ { value: 'requiredOnce', text: '澶氳鎷兼帴' }
]
if (type === 'card') {
@@ -91,6 +94,8 @@
let hasclass = true
this.props.formlist.forEach(item => {
+ if (!item.key) return
+
this.record[item.key] = item.initVal
if (item.key === 'class') {
@@ -156,46 +161,89 @@
let reRequired = {}
let reReadonly = {}
- if (openType === 'pop' || openType === 'prompt' || openType === 'exec') {
+ reTooltip.interface = ''
+ reTooltip.proInterface = '姝ｅ紡绯荤粺鎵�浣跨敤鐨勬帴鍙ｅ湴鍧�銆�'
+ if (['pop', 'prompt', 'exec'].includes(openType)) {
let intertype = this.record.intertype
reOptions.intertype = this.state.interTypeOptions
if (intertype === 'custom') {
- shows.push('procMode', 'interface', 'callbackType', 'cbTable', 'proInterface', 'method', 'cross')
+ shows.push('procMode', 'interface', 'callbackType', 'proInterface', 'method', 'cross', 'stringify', 'ContentType', 'outerBlacklist')
if (this.record.procMode === 'system') {
shows.push('sql', 'sqlType')
- } else {
+ } else if (this.record.procMode === 'inner') {
reRequired.innerFunc = true
shows.push('innerFunc')
}
+ if (this.record.callbackType === 'func') {
+ shows.push('callbackFunc', 'output')
+ } else if (this.record.callbackType === 'script') {
+ shows.push('cbTable', 'output')
+ } else if (this.record.callbackType !== 'none') {
+ shows.push('cbTable')
+ }
reReadonly.interface = false
reRequired.interface = true
+ reTooltip.interface = `鍙娇鐢ㄥ彉閲廆mywebsite@ (鍩熷悕+铏氭嫙鐩綍)銆丂mydomain@ (鍩熷悕)锛屽锛欯mywebsite@/webapi/dostars 浠ｈ〃 ${window.GLOB.baseurl}webapi/dostars銆俙
+ reTooltip.proInterface += reTooltip.interface
} else if (intertype === 'outer') {
- shows.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc', 'output')
- reRequired.innerFunc = false
+ shows.push('procMode', 'sysInterface', 'outerFunc', 'callbackType')
+ if (this.record.procMode === 'system') {
+ shows.push('sql', 'sqlType')
+ } else if (this.record.procMode === 'inner') {
+ reRequired.innerFunc = true
+ shows.push('innerFunc')
+ }
+ if (this.record.callbackType === 'func') {
+ shows.push('callbackFunc', 'output')
+ } else if (this.record.callbackType === 'script') {
+ shows.push('cbTable', 'output')
+ } else if (this.record.callbackType !== 'none') {
+ shows.push('cbTable')
+ }
+ reRequired.outerFunc = false
if (this.record.sysInterface === 'false') {
reReadonly.interface = false
reRequired.interface = true
- } else {
+
+ shows.push('interface', 'proInterface')
+ } else if (this.record.sysInterface === 'true') {
reReadonly.interface = true
reRequired.interface = false
+ reRequired.outerFunc = true
+
+ shows.push('interface')
+ } else if (this.record.sysInterface === 'external') {
+ shows.push('exInterface', 'exProInterface')
}
} else if (intertype === 'inner') {
- shows.push('innerFunc', 'output')
+ shows.push('innerFunc', 'output', 'extraParam')
+ if (Ot === 'requiredOnce') { // 鍓嶇疆鍑芥暟
+ shows.push('preFunc')
+ }
reRequired.innerFunc = true
} else {
- shows.push('sql', 'sqlType', 'output')
+ shows.push('sql', 'sqlType', 'output', 'database')
}
if (Ot === 'required') {
shows.push('progress')
+ if (intertype === 'inner' || intertype === 'system') {
+ shows.push('execType')
+ if (this.record.execType === 'single') {
+ shows.push('execInterval')
+ }
+ }
+ }
+ if (intertype === 'outer' || intertype === 'custom') {
+ shows.push('execInterval')
}
if (this.record.openmenu && this.record.openmenu !== 'goback') {
shows.push('open')
}
- if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
+ if (['grid'].includes(this.record.execSuccess) || ['grid'].includes(this.record.execError)) {
shows.push('resetPageIndex')
}
@@ -210,42 +258,64 @@
} else {
reOptions.sqlType = this.state.insertUpdateOptions
}
- // if (this.record.execSuccess === 'goback') {
- shows.push('reload')
- // }
+ if (openType === 'pop') {
+ shows.push('extBtn')
+ if (this.record.extBtn === 'true') {
+ shows.push('extLabel', 'extStyle', 'confLabel', 'confStyle', 'extValue')
+ }
+ }
} else if (openType === 'form') {
let intertype = this.record.intertype
if (this.record.formType === 'switch') {
shows.push('field', 'size', 'openVal', 'closeVal', 'openText', 'closeText')
+ } else if (this.record.formType === 'counter' || this.record.formType === 'count_line') {
+ shows.push('field', 'size', 'min', 'max', 'decimal')
+ } else if (this.record.formType === 'radio') {
+ shows.push('field', 'checkType', 'openVal', 'closeVal')
} else {
- shows.push('field', 'openVal', 'closeVal')
+ shows.push('field')
}
reOptions.intertype = this.state.interTypeOptions.filter(item => item.value !== 'custom')
if (intertype === 'outer') {
- shows.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
- reRequired.innerFunc = false
+ shows.push('procMode', 'sysInterface', 'outerFunc', 'callbackType')
+ if (this.record.procMode === 'system') {
+ shows.push('sql', 'sqlType')
+ } else if (this.record.procMode === 'inner') {
+ reRequired.innerFunc = true
+ shows.push('innerFunc')
+ }
+ if (this.record.callbackType === 'func') {
+ shows.push('callbackFunc')
+ } else if (this.record.callbackType !== 'none') {
+ shows.push('cbTable')
+ }
+ reRequired.outerFunc = false
if (this.record.sysInterface === 'false') {
reReadonly.interface = false
reRequired.interface = true
- } else {
+
+ shows.push('interface', 'proInterface')
+ } else if (this.record.sysInterface === 'true') {
reReadonly.interface = true
reRequired.interface = false
+ reRequired.outerFunc = true
+
+ shows.push('interface')
+ } else if (this.record.sysInterface === 'external') {
+ shows.push('exInterface', 'exProInterface')
}
} else if (intertype === 'inner') {
- shows.push('innerFunc')
+ shows.push('innerFunc', 'extraParam')
reRequired.innerFunc = true
} else {
- shows.push('sql', 'sqlType')
+ shows.push('sql', 'sqlType', 'database')
}
- if (this.record.execSuccess === 'goback') {
- shows.push('reload')
- }
- if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
+ if (['grid'].includes(this.record.execSuccess) || ['grid'].includes(this.record.execError)) {
shows.push('resetPageIndex')
}
@@ -257,60 +327,111 @@
value: 'custom',
text: '鑷畾涔�'
}]
+
+ if (this.record.formType === 'count_line') {
+ reOptions.Ot = requireOptions.filter(op => ['requiredSgl'].includes(op.value))
+ shows = shows.filter(op => ['label', 'OpenType', 'formType', 'Ot', 'width', 'title', 'hidden', 'field', 'size', 'min', 'max', 'decimal'].includes(op))
+ }
} else if (openType === 'excelIn') {
reOptions.intertype = this.state.interTypeOptions.filter(op => op.value !== 'custom')
reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
if (this.record.intertype === 'outer') {
- shows.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
+ shows.push('innerFunc', 'sysInterface', 'outerFunc', 'callbackFunc')
reRequired.innerFunc = false
+ reRequired.callbackFunc = false
+ reRequired.outerFunc = false
if (this.record.sysInterface === 'false') {
reReadonly.interface = false
reRequired.interface = true
- } else {
+
+ shows.push('interface', 'proInterface')
+ } else if (this.record.sysInterface === 'true') {
reReadonly.interface = true
reRequired.interface = false
+ reRequired.outerFunc = true
+
+ shows.push('interface')
+ } else if (this.record.sysInterface === 'external') {
+ shows.push('exInterface', 'exProInterface')
}
} else if (this.record.intertype === 'inner') {
- shows.push('innerFunc')
+ shows.push('innerFunc', 'extraParam')
reRequired.innerFunc = true
+ } else {
+ shows.push('database')
}
- if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
+ if (['grid'].includes(this.record.execSuccess) || ['grid'].includes(this.record.execError)) {
shows.push('resetPageIndex')
}
} else if (openType === 'excelOut') {
reOptions.intertype = this.state.interTypeOptions.filter(op => op.value !== 'custom')
+ if (appType === 'mob') {
+ reOptions.Ot = requireOptions.filter(op => ['notRequired'].includes(op.value))
+ } else {
+ reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredOnce'].includes(op.value))
+ }
+
if (this.record.intertype === 'outer') {
- shows.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc')
+ shows.push('innerFunc', 'sysInterface', 'outerFunc')
reRequired.innerFunc = false
+ reRequired.outerFunc = false
if (this.record.sysInterface === 'false') {
reReadonly.interface = false
reRequired.interface = true
- } else {
+
+ shows.push('interface', 'proInterface')
+ } else if (this.record.sysInterface === 'true') {
reReadonly.interface = true
reRequired.interface = false
+ reRequired.outerFunc = true
+
+ shows.push('interface')
+ } else if (this.record.sysInterface === 'external') {
+ shows.push('exInterface', 'exProInterface')
}
} else if (this.record.intertype === 'inner') {
- shows.push('innerFunc')
+ shows.push('innerFunc', 'extraParam')
reRequired.innerFunc = true
+ } else {
+ shows.push('database')
}
- if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
+ if (['grid'].includes(this.record.execSuccess) || ['grid'].includes(this.record.execError)) {
shows.push('resetPageIndex')
+ }
+ if (this.record.Ot !== 'notRequired' && appType === 'mob') {
+ this.record.Ot = 'notRequired'
+ } else if (this.record.Ot !== 'notRequired' && this.record.Ot !== 'requiredOnce') {
+ this.record.Ot = 'notRequired'
}
} else if (openType === 'popview') {
reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
- if (this.record.display === 'drawer') {
+ if (appType === 'mob') {
shows.push('placement')
+ } else if (this.record.display === 'drawer') {
+ shows.push('placement')
+ } else if (this.record.display === 'modal') {
+ shows.push('popshow')
}
if (this.record.popClose === 'grid') {
shows.push('resetPageIndex')
}
} else if (openType === 'tab') {
- reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
+ reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl', 'requiredOnce'].includes(op.value))
+
+ if (Ot === 'notRequired') {
+ shows.push('sysId')
+ }
+
+ if (shows.includes('linkmenu') && this.record.linkmenu[0] === 'multiMenu') {
+ shows.push('multiMenus')
+ } else if (Ot === 'notRequired' && this.record.sysId === 'js') {
+ shows.push('sign')
+ }
reRequired.linkmenu = true
reTooltip.linkmenu = ''
@@ -318,21 +439,29 @@
reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
if (this.record.pageTemplate === 'custom') {
- shows.push('url', 'joint')
+ shows.push('url', 'proUrl', 'open')
} else if (this.record.pageTemplate === 'linkpage') {
- shows.push('linkmenu')
-
- if (Ot === 'requiredSgl') {
- shows.push('joint')
- }
+ shows.push('linkmenu', 'open')
reRequired.linkmenu = true
reTooltip.linkmenu = ''
} else if (this.record.pageTemplate === 'billprint') {
- shows.push('printTemp')
- reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl', 'required'].includes(op.value))
+ shows.push('printTemp', 'preHandle')
+ if (this.record.preHandle === 'true') {
+ shows.push('pre_func')
+ }
+ reOptions.Ot = requireOptions
} else if (this.record.pageTemplate === 'pay') {
reOptions.Ot = requireOptions.filter(op => op.value === 'requiredSgl')
+
+ shows.push('payMode', 'wxApp', 'wxMerch')
+ if (this.record.payMode === 'inner') {
+ reRequired.innerFunc = true
+ shows.push('innerFunc')
+ }
+ if (this.record.payMode !== 'none') {
+ shows.push('output')
+ }
}
} else if (openType === 'funcbutton') {
reOptions.intertype = this.state.interTypeOptions.filter(op => op.value !== 'custom')
@@ -343,29 +472,46 @@
if (_funcType === 'print') {
shows.push('execMode', 'intertype', 'Ot', 'execSuccess', 'execError')
if (this.record.intertype === 'outer') {
- shows.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc')
+ shows.push('innerFunc', 'sysInterface', 'outerFunc', 'callbackFunc')
reRequired.innerFunc = false
+ reRequired.callbackFunc = false
+ reRequired.outerFunc = false
if (this.record.sysInterface === 'false') {
reReadonly.interface = false
reRequired.interface = true
- } else {
+
+ shows.push('interface', 'proInterface')
+ } else if (this.record.sysInterface === 'true') {
reReadonly.interface = true
reRequired.interface = false
+ reRequired.outerFunc = true
+
+ shows.push('interface')
+ } else if (this.record.sysInterface === 'external') {
+ shows.push('exInterface', 'exProInterface')
}
} else if (this.record.intertype === 'inner') {
- shows.push('innerFunc')
+ shows.push('innerFunc', 'extraParam')
reRequired.innerFunc = true
}
- if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
+ if (['grid'].includes(this.record.execSuccess) || ['grid'].includes(this.record.execError)) {
shows.push('resetPageIndex')
}
+ if (this.record.execMode === 'pop' || this.record.execMode === 'prompt') {
+ shows.push('position')
+ }
} else if (_funcType === 'mkBinding' || _funcType === 'mkUnBinding') {
- shows.push('execSuccess', 'execError')
+ shows.push('execSuccess', 'execError', 'tipTitle')
+ } else if (_funcType === 'mkUnsubscribe' || _funcType === 'reAuth') {
+ shows.push('tipTitle')
+ } else if (_funcType === 'reSystem') {
+ shows.push('tipTitle', 'Ot')
+ reOptions.Ot = requireOptions.filter(op => op.value === 'requiredSgl')
} else if (_funcType === 'closetab') {
shows.push('refreshTab')
} else if (_funcType === 'scan') {
- shows.push('linkmenu')
+ shows.push('linkmenu', 'prefix')
reRequired.linkmenu = false
reTooltip.linkmenu = '浣跨敤鎵爜鐧诲綍鍔熻兘鎴栬彍鍗曡烦杞姛鑳芥椂锛岄渶閫夋嫨璺宠浆鐨勮彍鍗曘��'
@@ -383,14 +529,51 @@
shows.push('reload')
} else if (_funcType === 'megvii') {
shows.push('subFunc', 'progress')
+ } else if (_funcType === 'filezip') {
+ reOptions.Ot = requireOptions
+ reRequired.innerFunc = false
+
+ shows.push('innerFunc', 'Ot', 'execSuccess', 'execError', 'urlkey')
} else if (_funcType === 'pay') {
- shows.push('payType', 'Ot', 'execSuccess', 'execError', 'syncComponent', 'openmenu')
+ shows.push('payType', 'wxApp', 'wxMerch', 'Ot', 'execSuccess', 'execError', 'syncComponent', 'openmenu')
+ if (this.record.openmenu && this.record.openmenu !== 'goback') {
+ shows.push('open')
+ }
reOptions.Ot = requireOptions.filter(op => ['requiredSgl'].includes(op.value))
+ shows.push('payMode')
+ if (this.record.payMode === 'inner') {
+ reRequired.innerFunc = true
+ shows.push('innerFunc')
+ }
+ if (this.record.payMode !== 'none') {
+ shows.push('output')
+ }
+ } else if (_funcType === 'refund') {
+ shows.push('Ot', 'execSuccess', 'execError', 'syncComponent', 'openmenu', 'tipTitle')
+ reOptions.Ot = requireOptions.filter(op => ['requiredSgl'].includes(op.value))
+
+ shows.push('payMode')
+ if (this.record.payMode === 'inner') {
+ reRequired.innerFunc = true
+ shows.push('innerFunc')
+ }
+ if (this.record.payMode !== 'none') {
+ shows.push('output')
+ }
+ } else if (_funcType === 'shareLink') {
+ shows.push('shortUrl', 'shareUrl', 'shareProUrl', 'shareTip')
+ } else if (_funcType === 'openLocation') {
+ shows.push('Ot')
+ if (Ot === 'requiredSgl') {
+ shows.push('nameField', 'addressField')
+ }
+ // } else if (_funcType === 'expPdf') {
+ // shows.push('exportType')
}
}
if (appType === 'mob') {
- if (Ot !== 'notRequired') {
+ if (openType !== 'excelOut') {
shows.push('control')
reOptions.control = [
{ value: '', text: '鏃�' },
@@ -404,8 +587,8 @@
shows.push('reason')
}
}
- } else {
- if (Ot !== 'notRequired') {
+ } else if (openType !== 'funcbutton' || !['expPdf', 'shareLink'].includes(this.record.funcType)) {
+ if (openType !== 'excelOut') {
reOptions.control = [
{ value: '', text: '鏃�' },
{ value: 'disabled', text: '绂佺敤' },
@@ -431,11 +614,25 @@
shows.push('reason')
}
}
-
+
+ if (shows.includes('syncComponent') && this.record.syncComponent[0] === 'multiComponent') {
+ shows.push('syncComponents')
+ }
+
+ if (this.record.hidden !== 'true') {
+ shows.push('permission')
+ }
if (this.record.show === 'icon') {
reRequired.icon = true
} else {
reRequired.icon = false
+ if (['pop', 'prompt', 'exec', 'popview', 'tab', 'innerpage'].includes(openType)) {
+ shows.push('showName')
+ }
+ }
+
+ if (shows.includes('refreshTab') && this.record.refreshTab && this.record.refreshTab.length) {
+ shows.push('urlPar')
}
return {
@@ -455,6 +652,7 @@
* 3銆佸垏鎹㈡爣绛剧被鍨嬶紝閲嶇疆鍙�夋爣绛�
*/
optionChange = (key, value) => {
+ const { type } = this.props
const { hasclass, appType, requireOptions } = this.state
this.record[key] = value
@@ -467,11 +665,9 @@
this.record.pageTemplate = ''
this.record.funcType = ''
this.record.sqlType = ''
-
if (value === 'pop' || value === 'prompt' || value === 'exec') {
_fieldval.intertype = 'system'
_fieldval.sqlType = ''
-
} else if (value === 'form') {
_fieldval.Ot = 'requiredSgl'
@@ -479,22 +675,32 @@
} else if (value === 'excelIn') {
_fieldval.intertype = 'system'
_fieldval.Ot = 'notRequired'
-
- _fieldval.label = this.props.dict['model.form.excelIn']
- _fieldval.class = 'dgreen'
+ _fieldval.execSuccess = 'grid'
+ _fieldval.label = '瀵煎叆Excel'
+ _fieldval.class = 'border-dgreen'
this.record.Ot = 'notRequired'
- this.record.label = this.props.dict['model.form.excelIn']
- this.record.class = 'dgreen'
-
-
+ this.record.label = '瀵煎叆Excel'
+ this.record.class = 'border-dgreen'
+ this.record.execSuccess = 'grid'
} else if (value === 'excelOut') {
_fieldval.intertype = 'system'
- _fieldval.label = this.props.dict['model.form.excelOut']
+ _fieldval.label = '瀵煎嚭Excel'
_fieldval.class = 'dgreen'
- this.record.Ot = 'notRequired'
- this.record.label = this.props.dict['model.form.excelOut']
+ _fieldval.execSuccess = 'never'
+ _fieldval.control = ''
+
+ if (type !== 'card') {
+ _fieldval.Ot = 'requiredOnce'
+ this.record.Ot = 'requiredOnce'
+ } else {
+ _fieldval.Ot = 'notRequired'
+ this.record.Ot = 'notRequired'
+ }
+
+ this.record.label = '瀵煎嚭Excel'
this.record.class = 'dgreen'
-
+ this.record.execSuccess = 'never'
+ this.record.control = ''
} else if (value === 'popview') {
_fieldval.display = 'modal'
_fieldval.Ot = 'requiredSgl'
@@ -515,15 +721,6 @@
// _fieldval.funcType = ''
}
- if (value === 'excelIn') {
- _fieldval.label = this.props.dict['model.form.excelIn']
- _fieldval.class = 'dgreen'
- } else if (value === 'excelOut') {
- _fieldval.label = this.props.dict['model.form.excelOut']
- _fieldval.class = 'dgreen'
- _fieldval.control = ''
- this.record.control = ''
- }
if (appType !== 'mob' && _fieldval.Ot === 'notRequired') {
this.record.control = ''
@@ -531,6 +728,11 @@
}
this.props.updRecord && this.props.updRecord(this.record)
+ } else if (key === 'formType') {
+ if (value === 'count_line') {
+ _fieldval.Ot = 'requiredSgl'
+ this.record.Ot = 'requiredSgl'
+ }
} else if (key === 'funcType') {
if (value === 'print') {
_fieldval.label = '鎵撳嵃'
@@ -556,9 +758,13 @@
_fieldval.color = 'primary'
}
}
+ this.record.resetPageIndex = 'false'
+ if ([this.record.execSuccess, this.record.execError].includes('grid')) {
+ _fieldval.resetPageIndex = 'false'
+ }
} else if (value === 'audit') {
_fieldval.label = '瀹℃牳'
- _fieldval.Ot = 'requiredSgl'
+ _fieldval.Ot = 'required'
if (hasclass) {
_fieldval.class = 'primary'
} else {
@@ -566,12 +772,26 @@
}
} else if (value === 'LogicDelete' || value === 'delete') {
_fieldval.label = '鍒犻櫎'
- _fieldval.Ot = 'requiredSgl'
+ _fieldval.Ot = 'required'
if (hasclass) {
_fieldval.class = 'danger'
} else {
_fieldval.color = 'danger'
}
+ this.record.resetPageIndex = 'true'
+ if ([this.record.execSuccess, this.record.execError].includes('grid')) {
+ _fieldval.resetPageIndex = 'true'
+ }
+ } else if (value === 'custom') {
+ _fieldval.Ot = 'required'
+ }
+ if (_fieldval.Ot === 'required' && this.record.execError === 'never') {
+ this.record.execError = 'grid'
+ _fieldval.execError = 'grid'
+ }
+
+ if (this.props.type === 'card' && _fieldval.Ot === 'required') { // 鍗＄墖涓棤澶氳閫夐」
+ _fieldval.Ot = 'requiredSgl'
}
this.record.label = _fieldval.label || this.record.label || ''
@@ -587,6 +807,9 @@
if (appType !== 'mob' && value === 'notRequired') {
this.record.control = ''
_fieldval.control = ''
+ } else if (value === 'required' && this.record.execError === 'never') {
+ this.record.execError = 'grid'
+ _fieldval.execError = 'grid'
}
} else if (key === 'pageTemplate') {
if (value === 'pay') {
@@ -643,7 +866,6 @@
}
getFields() {
- const { dict } = this.props
const { getFieldDecorator } = this.props.form
const fields = []
@@ -655,6 +877,7 @@
let className = ''
let content = null
let initVal = item.initVal || ''
+ let help = item.help || null
if (item.type === 'splitLine') {
fields.push(
@@ -666,20 +889,72 @@
}
if (item.type === 'text') {
rules = [
- { required: item.required, message: dict['form.required.input'] + item.label + '!' }
+ { required: item.required, message: '璇疯緭鍏�' + item.label + '!' }
]
if (item.key === 'innerFunc') {
- let str = '^(' + item.fields.join('|') + ')'
+ let str = item.fields && item.fields.length ? '^(' + item.fields.join('|') + ')' : '^'
let _patten = new RegExp(str + formRule.func.innerPattern + '$', 'g')
rules.push(
{ pattern: _patten, message: formRule.func.innerMessage },
{ max: formRule.func.max, message: formRule.func.maxMessage }
)
- } else if (item.key === 'outerFunc' || item.key === 'callbackFunc') {
+ } else if (item.key === 'sql' || item.key === 'sheet') {
+ rules.push(
+ { pattern: /^[a-zA-Z0-9@_]+$/, message: '琛ㄥ悕鍙彲浣跨敤瀛楁瘝銆佹暟瀛椾互鍙奯' },
+ { max: formRule.func.max, message: formRule.func.maxMessage }
+ )
+ } else if (item.key === 'outerFunc' || item.key === 'callbackFunc' || item.key === 'preFunc') {
rules.push(
{ pattern: formRule.func.pattern, message: formRule.func.message },
{ max: formRule.func.max, message: formRule.func.maxMessage }
+ )
+ } else if (item.key === 'outerBlacklist') {
+ rules.push(
+ { max: 512, message: '鏈�澶�512涓瓧绗�' }
+ )
+ } else if (item.key === 'output') {
+ if (['pop', 'prompt', 'exec'].includes(this.record.OpenType)) {
+ if (this.record.intertype === 'system' || ((this.record.intertype === 'outer' || this.record.intertype === 'custom') && this.record.callbackType === 'script')) {
+ rules = [{
+ pattern: /^@[0-9a-zA-Z_]+@?$/,
+ message: '鍙橀噺浠绗﹀紑澶达紝鍙娇鐢ㄥ瓧姣嶃�佹暟瀛椾互鍙奯'
+ }, {
+ max: 100,
+ message: '鏈�澶�100涓瓧绗︺��'
+ }]
+ } else {
+ rules = [{
+ pattern: /^[0-9a-zA-Z_]*$/,
+ message: '瀛楁鍙娇鐢ㄥ瓧姣嶃�佹暟瀛椾互鍙奯'
+ }, {
+ max: 100,
+ message: '鏈�澶�100涓瓧绗︺��'
+ }]
+ }
+ } else {
+ if (this.record.payMode === 'system') {
+ rules = [{
+ pattern: /^@[0-9a-zA-Z_]+@?$/,
+ message: '鍙橀噺浠绗﹀紑澶达紝鍙娇鐢ㄥ瓧姣嶃�佹暟瀛椾互鍙奯'
+ }, {
+ max: 100,
+ message: '鏈�澶�100涓瓧绗︺��'
+ }]
+ } else {
+ rules = [{
+ pattern: /^[0-9a-zA-Z_]*$/,
+ message: '瀛楁鍙娇鐢ㄥ瓧姣嶃�佹暟瀛椾互鍙奯'
+ }, {
+ max: 100,
+ message: '鏈�澶�100涓瓧绗︺��'
+ }]
+ }
+ }
+ } else if (item.key === 'extValue') {
+ rules.push(
+ { pattern: /^[0-9a-zA-Z_]*$/, message: '璇蜂娇鐢ㄥ瓧姣嶃�佹暟瀛椾互鍙奯' },
+ { max: 50, message: '鏈�澶�50涓瓧绗︺��' }
)
} else {
rules.push({ max: formRule.input.max, message: formRule.input.message })
@@ -687,14 +962,15 @@
content = <Input placeholder="" autoComplete="off" onPressEnter={this.handleSubmit} />
} else if (item.type === 'number') {
+ initVal = item.initVal || item.initVal === 0 ? item.initVal : ''
rules = [
- { required: item.required, message: dict['form.required.input'] + item.label + '!' }
+ { required: item.required, message: '璇疯緭鍏�' + item.label + '!' }
]
content = <InputNumber min={item.min} max={item.max} precision={item.precision} onPressEnter={this.handleSubmit}/>
} else if (item.type === 'select') {
rules = [
- { required: item.required, message: dict['form.required.select'] + item.label + '!' }
+ { required: item.required, message: '璇烽�夋嫨' + item.label + '!' }
]
if (item.extendName) {
@@ -704,10 +980,11 @@
filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0 ||
option.props.extend.toLowerCase().indexOf(input.toLowerCase()) >= 0}
onChange={(value) => {this.optionChange(item.key, value)}}
+ on
getPopupContainer={() => document.getElementById('winter')}
>
{item.options.map((option, index) =>
- <Select.Option key={index} extend={option[item.extendName] || ''} value={(option.value || option.field)}>
+ <Select.Option key={index} title={option.text || option.label} extend={option[item.extendName] || ''} value={(option.value || option.field)}>
{(option.text || option.label)}
</Select.Option>
)}
@@ -721,7 +998,7 @@
getPopupContainer={() => document.getElementById('winter')}
>
{item.options.map((option, index) =>
- <Select.Option key={index} value={(option.value || option.field)}>
+ <Select.Option key={index} title={option.text || option.label} disabled={option.$disabled || false} value={(option.value || option.field)}>
{(option.text || option.label)}
</Select.Option>
)}
@@ -729,7 +1006,7 @@
}
} else if (item.type === 'radio') {
rules = [
- { required: item.required, message: dict['form.required.select'] + item.label + '!' }
+ { required: item.required, message: '璇烽�夋嫨' + item.label + '!' }
]
content = <Radio.Group onChange={(e) => {this.optionChange(item.key, e.target.value)}}>
@@ -737,7 +1014,7 @@
</Radio.Group>
} else if (item.type === 'checkbox') {
rules = [
- { required: item.required, message: dict['form.required.select'] + item.label + '!' }
+ { required: item.required, message: '璇烽�夋嫨' + item.label + '!' }
]
content = <Checkbox.Group>
@@ -746,13 +1023,20 @@
} else if (item.type === 'cascader') {
initVal = item.initVal || []
rules = [
- { required: item.required, message: dict['form.required.select'] + item.label + '!' }
+ { required: item.required, message: '璇烽�夋嫨' + item.label + '!' }
]
- content = <Cascader options={item.options || []} expandTrigger="hover" placeholder=""/>
+ content = <Cascader onChange={(value) => {this.optionChange(item.key, value)}} options={item.options || []} expandTrigger="hover" placeholder=""/>
+ } else if (item.type === 'table') {
+ span = 24
+ className = 'textarea'
+ rules = [
+ { required: item.required, message: '璇锋坊鍔�' + item.label + '!' }
+ ]
+ content = (<MKTable columns={item.columns || []} actions={item.actions}/>)
} else if (item.type === 'icon') {
rules = [
- { required: item.required, message: dict['form.required.select'] + item.label + '!' }
+ { required: item.required, message: '璇烽�夋嫨' + item.label + '!' }
]
content = <MkEditIcon options={['edit', 'hint', 'direction', 'normal', 'data']} allowClear/>
@@ -760,28 +1044,80 @@
span = 24
className = 'textarea'
rules = [
- { required: item.readonly ? false : item.required, message: dict['form.required.input'] + item.label + '!' }
+ { required: item.readonly ? false : item.required, message: '璇疯緭鍏�' + item.label + '!' }
]
+ if (item.key === 'url' || item.key === 'proUrl') {
+ rules.push({
+ pattern: /^[^\s]*$/,
+ message: '鍦板潃涓笉鍙娇鐢ㄧ┖鏍硷紒'
+ })
+ }
+
content = <TextArea rows={2} readOnly={item.readonly}/>
+ } else if (item.type === 'printTemps') {
+ rules = [
+ { required: item.required, message: '璇烽�夋嫨' + item.label + '!' }
+ ]
+
+ content = <MkPrintTemps onChange={(value) => {this.optionChange(item.key, value)}}/>
+ } else if (item.type === 'keyinterface') {
+ span = 24
+ className = 'textarea'
+ rules = [
+ { required: item.required, message: '璇疯緭鍏�' + item.label + '!' }
+ ]
+
+ content = <KeyInterface type={item.key === 'exInterface' ? 'develop' : 'product'}/>
+ } else if (item.type === 'codemirror') {
+ span = 24
+ className = 'codemirror'
+ rules = [
+ { required: item.readonly ? false : item.required, message: '璇疯緭鍏�' + item.label + '!' }
+ ]
+
+ content = <CodeMirror mode="text/javascript"/>
}
- fields.push(
- <Col span={span} key={index}>
- <Form.Item className={className} help={item.help || null} label={item.tooltip ?
- <Tooltip placement="topLeft" title={item.tooltip}>
- <QuestionCircleOutlined className="mk-form-tip" />
- {item.label}
- </Tooltip> : item.label
- }>
- {getFieldDecorator(item.key, {
- initialValue: initVal,
- rules: rules
- })(content)}
- </Form.Item>
- </Col>
- )
+ if (help && typeof(help) === 'function') {
+ help = help(this.record)
+ }
+
+ if (help) {
+ fields.push(
+ <Col span={span} key={index}>
+ <Form.Item className={className} help={help} label={item.tooltip ?
+ <Tooltip placement="topLeft" overlayStyle={{maxWidth: item.tooltip.length > 25 ? 350 : 250 }} title={<span onClick={(e) => e.stopPropagation()}>{item.tooltip}</span>}>
+ <QuestionCircleOutlined className="mk-form-tip" />
+ {item.label}
+ </Tooltip> : item.label
+ }>
+ {getFieldDecorator(item.key, {
+ initialValue: initVal,
+ rules: rules
+ })(content)}
+ </Form.Item>
+ </Col>
+ )
+ } else {
+ fields.push(
+ <Col span={span} key={index}>
+ <Form.Item className={className} label={item.tooltip ?
+ <Tooltip placement="topLeft" overlayStyle={{maxWidth: item.tooltip.length > 25 ? 350 : 250 }} title={<span onClick={(e) => e.stopPropagation()}>{item.tooltip}</span>}>
+ <QuestionCircleOutlined className="mk-form-tip" />
+ {item.label}
+ </Tooltip> : item.label
+ }>
+ {getFieldDecorator(item.key, {
+ initialValue: initVal,
+ rules: rules
+ })(content)}
+ </Form.Item>
+ </Col>
+ )
+ }
})
+
return fields
}
@@ -794,14 +1130,85 @@
values.uuid = card.uuid
values.verify = card.verify || null
values.modal = card.modal || null
+ values.config = card.config || null
+ values.$fixed = card.$fixed || false
+
+ if (['pop', 'prompt', 'exec'].includes(values.OpenType) && values.Ot === 'required' && values.execError === 'never') {
+ notification.warning({
+ top: 92,
+ message: '閫夋嫨澶氳鏃讹紝闇�璁剧疆澶辫触鍚庣殑鍒锋柊椤�!',
+ duration: 5
+ })
+ return
+ }
+
+ if (card.OpenType === 'excelOut' && values.OpenType === 'excelIn') {
+ values.verify = {columns: [], scripts: [], sheet: 'Sheet1', default: 'true', range: 1, uniques: []}
+ if (card.verify && card.verify.columns) {
+ values.verify.columns = card.verify.columns.map(col => {
+ col.required = col.required || 'true'
+ col.type = col.type || 'Nvarchar(50)'
+ col.import = 'true'
+
+ if (col.type === 'text' || col.type === 'image') {
+ col.type = 'Nvarchar(50)'
+ } else if (col.type === 'number') {
+ col.type = 'Decimal(18,2)'
+ }
+
+ if (/^Nvarchar/ig.test(col.type)) {
+ col.limit = col.type.match(/\d+/)[0]
+ } else if (/^Decimal/ig.test(col.type)) {
+ col.limit = col.type.match(/\d+/ig)[1]
+ } else {
+ col.limit = ''
+ }
+
+ delete col.output
+ delete col.abs
+ delete col.Width
+
+ return col
+ })
+
+ values.verify.sheet = card.verify.sheet || 'Sheet1'
+ }
+ } else if (card.OpenType === 'excelIn' && values.OpenType === 'excelOut') {
+ values.verify = {columns: [], scripts: [], dataType: 'default'}
+ if (card.verify && card.verify.columns) {
+ values.verify.columns = card.verify.columns.map(col => {
+ col.type = col.type || 'text'
+ col.output = col.output || 'true'
+ col.required = col.required || 'false'
+ col.Width = 20
+
+ if (!['text', 'image', 'number'].includes(col.type)) {
+ if (/^Decimal/ig.test(col.type)) {
+ col.type = 'number'
+ } else {
+ col.type = 'text'
+ }
+ }
+
+ delete col.import
+
+ return col
+ })
+ }
+ }
if (values.OpenType === 'form') {
- if (/^(0|[1-9]\d*)$/.test(values.openVal) && /^(0|[1-9]\d*)$/.test(values.closeVal)) {
- values.openVal = +values.openVal
- values.closeVal = +values.closeVal
+ if (values.formType !== 'scan') {
+ if (/^(0|[1-9]\d*)$/.test(values.openVal) && /^(0|[1-9]\d*)$/.test(values.closeVal)) {
+ values.openVal = +values.openVal
+ values.closeVal = +values.closeVal
+ }
+ } else {
+ values.show = 'icon'
+ values.icon = 'scan'
}
} else if (values.OpenType === 'excelOut') {
- values.Ot = 'notRequired'
+ values.Ot = values.Ot || 'notRequired'
} else if (['pop', 'prompt', 'exec'].includes(values.OpenType) && values.verify) {
if ((values.Ot === 'requiredOnce' || card.Ot === 'requiredOnce') && card.Ot !== values.Ot) {
values.verify.uniques = []
@@ -813,7 +1220,7 @@
values.verify.invalid = 'true'
}
}
- } else if (values.OpenType === 'tab' && values.linkmenu) {
+ } else if (values.OpenType === 'tab' && values.linkmenu && Array.isArray(values.linkmenu)) {
if (sessionStorage.getItem('thdMenuList')) {
let list = null
try {
@@ -824,15 +1231,42 @@
let id = values.linkmenu[values.linkmenu.length - 1]
- list.forEach(item => {
- if (item.MenuID === id) {
- values.MenuID = id
- values.MenuName = item.MenuName
- values.MenuNo = item.MenuNo
- values.tabType = item.type
- }
- })
+ if (id !== 'multiMenu') {
+ list.forEach(item => {
+ if (item.MenuID === id) {
+ values.MenuID = id
+ values.MenuName = item.MenuName
+ values.MenuNo = item.MenuNo
+ values.tabType = item.type
+ }
+ })
+ delete values.multiMenus
+ } else {
+ values.multiMenus.forEach(menu => {
+ menu.sign = menu.sign || ''
+
+ let _id = menu.menuId[menu.menuId.length - 1]
+
+ list.forEach(item => {
+ if (item.MenuID === _id) {
+ menu.MenuID = _id
+ menu.MenuName = item.MenuName
+ menu.MenuNo = item.MenuNo
+ menu.tabType = item.type
+ }
+ })
+ })
+ }
}
+ } else if (values.OpenType === 'funcbutton' && values.funcType === 'expPdf') {
+ values.Ot = 'notRequired'
+ }
+
+ if (values.outerBlacklist) {
+ values.outerBlacklist = values.outerBlacklist.replace(/\s/ig, '')
+ }
+ if (values.controlVal) {
+ values.controlVal = values.controlVal.replace(/\t+|\v+|\s+/g, '')
}
if (values.openmenu && Array.isArray(values.openmenu) && values.openmenu.length > 0) {
@@ -854,7 +1288,28 @@
}
})
}
-
+
+ if (values.extraParam) {
+ values.extraParam.forEach(n => {
+ values[n] = 'true'
+ })
+
+ delete values.extraParam
+ }
+
+ if (values.refreshTab && values.refreshTab.length && ['pop', 'prompt', 'exec'].includes(values.OpenType) && window.GLOB.customMenu) {
+ let id = values.refreshTab[values.refreshTab.length - 1]
+ if (id === window.GLOB.customMenu.uuid) {
+ if (values.execSuccess !== 'never' || (values.syncComponent && values.syncComponent.length)) {
+ notification.warning({
+ top: 92,
+ message: '鎸夐挳鍒锋柊鑿滃崟涓哄綋鍓嶈彍鍗曟椂锛屾垚鍔熷悗鐨勭粍浠跺埛鏂帮紙鎴栧叧闂爣绛撅級灏嗗け鏁�!',
+ duration: 5
+ })
+ }
+ }
+ }
+
resolve(values)
} else {
reject(err)
--
Gitblit v1.8.0