From 102be577a7f8df2ae30045d55a1a5fc584f90363 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 19 十二月 2022 18:31:38 +0800
Subject: [PATCH] 2022-12-19
---
src/menu/components/share/actioncomponent/actionform/index.jsx | 327 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 247 insertions(+), 80 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index ce4fea6..8cbf7ca 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -1,36 +1,38 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { fromJS } from 'immutable'
-import { Form, Row, Col, Input, Select, Radio, notification, Tooltip, InputNumber, Cascader } from 'antd'
+import { Form, Row, Col, Input, Select, Radio, Tooltip, InputNumber, Cascader, Checkbox, Typography } 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 './index.scss'
const { TextArea } = Input
+const { Paragraph } = Typography
const MkEditIcon = asyncComponent(() => import('@/components/mkIcon'))
const acTyOptions = {
- pop: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'resetPageIndex', 'syncComponent', 'switchTab', 'width', 'openmenu', 'open', 'refreshTab', 'position', 'tipTitle'],
- prompt: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'resetPageIndex', 'syncComponent', 'switchTab', 'width', 'openmenu', 'open', 'refreshTab', 'position', 'tipTitle'],
- exec: ['label', 'OpenType', 'intertype', 'Ot', 'show', 'swipe', 'icon', 'class', 'color', 'execSuccess', 'execError', 'resetPageIndex', 'syncComponent', 'switchTab', 'width', 'openmenu', 'open', 'refreshTab'],
- excelIn: ['label', 'Ot', 'OpenType', 'intertype', 'show', 'icon', 'class', 'color', 'sheet', 'execSuccess', 'execError', 'resetPageIndex', 'syncComponent', 'switchTab', 'width'],
- excelOut: ['label', 'OpenType', 'intertype', 'show', 'icon', 'class', 'color', 'execSuccess', 'execError', 'syncComponent', 'switchTab', 'resetPageIndex', 'pagination', 'search', 'width'],
- popview: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'color', 'popClose', 'resetPageIndex', 'width', 'display', 'ratio', 'syncComponent', 'clickouter'],
- tab: ['label', 'Ot', 'OpenType', 'show', 'icon', 'class', 'color', 'linkmenu', 'width'],
- innerpage: ['label', 'Ot', 'OpenType', 'pageTemplate', 'show', 'swipe', 'icon', 'class', 'color', 'width', 'open'],
- funcbutton: ['label', 'OpenType', 'funcType', 'show', 'swipe', 'icon', 'class', 'color', 'width'],
- form: ['label', 'OpenType', 'formType', 'intertype', 'Ot', 'execSuccess', 'execError', 'resetPageIndex', 'syncComponent', 'width', 'open', 'refreshTab', 'title']
+ 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', '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']
}
class ActionForm extends Component {
static propTpyes = {
- dict: PropTypes.object, // 瀛楀吀椤�
type: PropTypes.any, // type涓�"card"鏃讹紝鍙彲閫夊崟琛屾垨涓嶉�夎
setting: PropTypes.object, // 椤甸潰璁剧疆
formlist: PropTypes.any, // 琛ㄥ崟淇℃伅
card: PropTypes.any, // 鎸夐挳淇℃伅
- inputSubmit: PropTypes.any // 鍥炶溅鎻愪氦浜嬩欢
+ inputSubmit: PropTypes.func, // 鍥炶溅鎻愪氦浜嬩欢
+ updRecord: PropTypes.func // 鏇存柊淇℃伅
}
state = {
@@ -59,13 +61,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: '鑷畾涔�'
@@ -75,13 +77,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') {
@@ -140,6 +142,7 @@
}
}, 100)
}
+ this.props.updRecord && this.props.updRecord(this.record)
}
getMutilOptions = (requireOptions) => {
@@ -160,31 +163,62 @@
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')
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')
+ } else if (this.record.callbackType !== 'none') {
+ shows.push('cbTable')
}
reReadonly.interface = false
reRequired.interface = true
} else if (intertype === 'outer') {
- shows.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc', 'callbackFunc', 'output')
- reRequired.innerFunc = false
+ shows.push('procMode', 'sysInterface', 'outerFunc', 'callbackType', 'output')
+ 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')
+ }
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
+
+ shows.push('interface')
+ } else if (this.record.sysInterface === 'external') {
+ shows.push('exInterface', 'exProInterface')
}
} else if (intertype === 'inner') {
shows.push('innerFunc', 'output')
reRequired.innerFunc = true
} else {
shows.push('sql', 'sqlType', 'output')
+ }
+
+ if (Ot === 'required') {
+ shows.push('progress')
+ }
+ if (this.record.openmenu && this.record.openmenu !== 'goback') {
+ shows.push('open')
+ }
+ if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
+ shows.push('resetPageIndex')
}
if (this.record.sqlType === 'insert') {
@@ -206,22 +240,40 @@
if (this.record.formType === 'switch') {
shows.push('field', 'size', 'openVal', 'closeVal', 'openText', 'closeText')
- } else {
+ } else if (this.record.formType === 'radio') {
shows.push('field', 'openVal', 'closeVal')
+ } else {
+ 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')
+ }
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
+
+ shows.push('interface')
+ } else if (this.record.sysInterface === 'external') {
+ shows.push('exInterface', 'exProInterface')
}
} else if (intertype === 'inner') {
shows.push('innerFunc')
@@ -232,6 +284,9 @@
if (this.record.execSuccess === 'goback') {
shows.push('reload')
+ }
+ if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
+ shows.push('resetPageIndex')
}
reOptions.Ot = requireOptions
@@ -247,43 +302,65 @@
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
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
+
+ shows.push('interface')
+ } else if (this.record.sysInterface === 'external') {
+ shows.push('exInterface', 'exProInterface')
}
} else if (this.record.intertype === 'inner') {
shows.push('innerFunc')
reRequired.innerFunc = true
}
+ if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
+ shows.push('resetPageIndex')
+ }
} else if (openType === 'excelOut') {
reOptions.intertype = this.state.interTypeOptions.filter(op => op.value !== 'custom')
if (this.record.intertype === 'outer') {
- shows.push('innerFunc', 'sysInterface', 'interface', 'proInterface', 'outerFunc')
+ shows.push('innerFunc', 'sysInterface', 'outerFunc')
reRequired.innerFunc = 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
+
+ shows.push('interface')
+ } else if (this.record.sysInterface === 'external') {
+ shows.push('exInterface', 'exProInterface')
}
} else if (this.record.intertype === 'inner') {
shows.push('innerFunc')
reRequired.innerFunc = true
+ }
+ if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
+ shows.push('resetPageIndex')
}
} else if (openType === 'popview') {
reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
if (this.record.display === 'drawer') {
shows.push('placement')
+ }
+ if (this.record.popClose === 'grid') {
+ shows.push('resetPageIndex')
}
} else if (openType === 'tab') {
reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
@@ -294,9 +371,9 @@
reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
if (this.record.pageTemplate === 'custom') {
- shows.push('url', 'joint')
+ shows.push('url', 'joint', 'open')
} else if (this.record.pageTemplate === 'linkpage') {
- shows.push('linkmenu')
+ shows.push('linkmenu', 'open')
if (Ot === 'requiredSgl') {
shows.push('joint')
@@ -317,21 +394,31 @@
let _funcType = this.record.funcType
if (_funcType === 'print') {
- shows.push('execMode', 'intertype', 'Ot', 'execSuccess', 'execError', 'resetPageIndex')
+ 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
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
+
+ shows.push('interface')
+ } else if (this.record.sysInterface === 'external') {
+ shows.push('exInterface', 'exProInterface')
}
} else if (this.record.intertype === 'inner') {
shows.push('innerFunc')
reRequired.innerFunc = true
+ }
+ if (this.record.execSuccess === 'grid' || this.record.execError === 'grid') {
+ shows.push('resetPageIndex')
}
} else if (_funcType === 'mkBinding' || _funcType === 'mkUnBinding') {
shows.push('execSuccess', 'execError')
@@ -342,10 +429,34 @@
reRequired.linkmenu = false
reTooltip.linkmenu = '浣跨敤鎵爜鐧诲綍鍔熻兘鎴栬彍鍗曡烦杞姛鑳芥椂锛岄渶閫夋嫨璺宠浆鐨勮彍鍗曘��'
+ } else if (_funcType === 'copyurl') {
+ shows.push('linkmenu')
+
+ reRequired.linkmenu = false
+ reTooltip.linkmenu = '鍙互鎸囧畾鍒嗕韩鐨勭洰鏍囧湴鍧�銆�'
+
+ if (this.record.linkmenu) {
+ shows.push('Ot')
+ reOptions.Ot = requireOptions.filter(op => ['notRequired', 'requiredSgl'].includes(op.value))
+ }
} else if (_funcType === 'goBack') {
shows.push('reload')
- // } else if (_funcType === 'megvii') {
- // shows.push('subFunc')
+ } 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')
+ if (this.record.openmenu && this.record.openmenu !== 'goback') {
+ shows.push('open')
+ }
+ reOptions.Ot = requireOptions.filter(op => ['requiredSgl'].includes(op.value))
+ } else if (_funcType === 'refund') {
+ shows.push('Ot', 'execSuccess', 'execError', 'syncComponent', 'openmenu')
+ reOptions.Ot = requireOptions.filter(op => ['requiredSgl'].includes(op.value))
}
}
@@ -431,7 +542,6 @@
if (value === 'pop' || value === 'prompt' || value === 'exec') {
_fieldval.intertype = 'system'
_fieldval.sqlType = ''
-
} else if (value === 'form') {
_fieldval.Ot = 'requiredSgl'
@@ -439,21 +549,22 @@
} else if (value === 'excelIn') {
_fieldval.intertype = 'system'
_fieldval.Ot = 'notRequired'
-
- _fieldval.label = this.props.dict['model.form.excelIn']
+ _fieldval.execSuccess = 'grid'
+ _fieldval.label = '瀵煎叆Excel'
_fieldval.class = 'dgreen'
this.record.Ot = 'notRequired'
- this.record.label = this.props.dict['model.form.excelIn']
+ this.record.label = '瀵煎叆Excel'
this.record.class = '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'
+ _fieldval.execSuccess = 'never'
this.record.Ot = 'notRequired'
- this.record.label = this.props.dict['model.form.excelOut']
+ this.record.label = '瀵煎嚭Excel'
this.record.class = 'dgreen'
+ this.record.execSuccess = 'never'
} else if (value === 'popview') {
_fieldval.display = 'modal'
@@ -476,10 +587,10 @@
}
if (value === 'excelIn') {
- _fieldval.label = this.props.dict['model.form.excelIn']
+ _fieldval.label = '瀵煎叆Excel'
_fieldval.class = 'dgreen'
} else if (value === 'excelOut') {
- _fieldval.label = this.props.dict['model.form.excelOut']
+ _fieldval.label = '瀵煎嚭Excel'
_fieldval.class = 'dgreen'
_fieldval.control = ''
this.record.control = ''
@@ -489,6 +600,8 @@
this.record.control = ''
_fieldval.control = ''
}
+
+ this.props.updRecord && this.props.updRecord(this.record)
} else if (key === 'funcType') {
if (value === 'print') {
_fieldval.label = '鎵撳嵃'
@@ -516,7 +629,7 @@
}
} else if (value === 'audit') {
_fieldval.label = '瀹℃牳'
- _fieldval.Ot = 'requiredSgl'
+ _fieldval.Ot = 'required'
if (hasclass) {
_fieldval.class = 'primary'
} else {
@@ -524,12 +637,18 @@
}
} else if (value === 'LogicDelete' || value === 'delete') {
_fieldval.label = '鍒犻櫎'
- _fieldval.Ot = 'requiredSgl'
+ _fieldval.Ot = 'required'
if (hasclass) {
_fieldval.class = 'danger'
} else {
_fieldval.color = 'danger'
}
+ } else if (value === 'custom') {
+ _fieldval.Ot = 'required'
+ }
+
+ if (this.props.type === 'card' && _fieldval.Ot === 'required') { // 鍗＄墖涓棤澶氳閫夐」
+ _fieldval.Ot = 'requiredSgl'
}
this.record.label = _fieldval.label || this.record.label || ''
@@ -553,6 +672,8 @@
}
} else if (key === 'intertype') {
this.record.sysInterface = 'false'
+
+ this.props.updRecord && this.props.updRecord(this.record)
} else if (key === 'sysInterface') {
if (value === 'true') {
_fieldval.interface = window.GLOB.mainSystemApi || ''
@@ -599,7 +720,6 @@
}
getFields() {
- const { dict } = this.props
const { getFieldDecorator } = this.props.form
const fields = []
@@ -622,14 +742,19 @@
}
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 === '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') {
@@ -637,6 +762,24 @@
{ pattern: formRule.func.pattern, message: formRule.func.message },
{ max: formRule.func.max, message: formRule.func.maxMessage }
)
+ } else if (item.key === 'output') {
+ 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 {
rules.push({ max: formRule.input.max, message: formRule.input.message })
}
@@ -644,26 +787,26 @@
content = <Input placeholder="" autoComplete="off" onPressEnter={this.handleSubmit} />
} else if (item.type === 'number') {
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) {
content = <Select
showSearch
- allowClear={item.allowClear === true}
+ allowClear={item.allowClear === true || !item.required}
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)}}
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>
)}
@@ -671,13 +814,13 @@
} else {
content = <Select
showSearch
- allowClear={item.allowClear === true}
+ allowClear={item.allowClear === true || !item.required}
filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0}
onChange={(value) => {this.optionChange(item.key, value)}}
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} value={(option.value || option.field)}>
{(option.text || option.label)}
</Select.Option>
)}
@@ -685,22 +828,30 @@
}
} 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)}}>
{item.options.map(option => <Radio key={option.value} value={option.value}>{option.text}</Radio>)}
</Radio.Group>
+ } else if (item.type === 'checkbox') {
+ rules = [
+ { required: item.required, message: '璇烽�夋嫨' + item.label + '!' }
+ ]
+
+ content = <Checkbox.Group>
+ {item.options.map(option => <Checkbox key={option.value} value={option.value}>{option.text}</Checkbox>)}
+ </Checkbox.Group>
} 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=""/>
} 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/>
@@ -708,15 +859,23 @@
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 + '!' }
]
content = <TextArea rows={2} readOnly={item.readonly}/>
+ } else if (item.type === 'keyinterface') {
+ span = 24
+ className = 'textarea'
+ rules = [
+ { required: item.required, message: '璇疯緭鍏�' + item.label + '!' }
+ ]
+
+ content = <KeyInterface type={item.key === 'exInterface' ? 'develop' : 'product'}/>
}
fields.push(
<Col span={span} key={index}>
- <Form.Item className={className} label={item.tooltip ?
+ <Form.Item className={className} help={item.help} label={item.tooltip ?
<Tooltip placement="topLeft" title={item.tooltip}>
<QuestionCircleOutlined className="mk-form-tip" />
{item.label}
@@ -730,11 +889,22 @@
</Col>
)
})
+
+ if (window.debugger && this.props.card.uuid) {
+ fields.push(
+ <Col span={12} key="uuid">
+ <Form.Item label="鎸夐挳ID">
+ <Paragraph copyable>{this.props.card.uuid}</Paragraph>
+ </Form.Item>
+ </Col>
+ )
+ }
+
return fields
}
handleConfirm = () => {
- const { setting, card } = this.props
+ const { card } = this.props
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
return new Promise((resolve, reject) => {
this.props.form.validateFieldsAndScroll((err, values) => {
@@ -742,22 +912,19 @@
values.uuid = card.uuid
values.verify = card.verify || null
values.modal = card.modal || null
+ values.config = card.config || null
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') {
- if (values.intertype === 'system' && setting.interType !== 'system') {
- notification.warning({
- top: 92,
- message: '琛ㄦ牸鏁版嵁鏌ヨ鏈娇鐢ㄧ郴缁熷嚱鏁帮紝瀵煎嚭Excel涓嶅彲浣跨敤绯荤粺鍑芥暟锛�',
- duration: 5
- })
- return
- }
-
values.Ot = 'notRequired'
} else if (['pop', 'prompt', 'exec'].includes(values.OpenType) && values.verify) {
if ((values.Ot === 'requiredOnce' || card.Ot === 'requiredOnce') && card.Ot !== values.Ot) {
--
Gitblit v1.8.0