From cc53c43e2088ac208d6d7ebbd0b0932fca24916b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 13 一月 2023 12:52:19 +0800
Subject: [PATCH] 2023-01-13
---
src/tabviews/zshare/mutilform/index.jsx | 335 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 232 insertions(+), 103 deletions(-)
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index dc188ee..e69e00d 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -25,15 +25,17 @@
const MKTextArea = asyncComponent(() => import('./mkTextArea'))
const MKFileUpload = asyncComponent(() => import('../fileupload'))
const MKColor = asyncComponent(() => import('./mkColor'))
+const MkFormula = asyncComponent(() => import('./mkFormula'))
+const MkCascader = asyncComponent(() => import('./mkCascader'))
const MKEditor = asyncComponent(() => import('@/components/editor'))
class MainSearch extends Component {
static propTpyes = {
- menuType: PropTypes.object, // 鑿滃崟绫诲瀷锛屾槸鍚︿负HS
action: PropTypes.object, // 鎸夐挳淇℃伅銆佽〃鍗曞垪琛�
data: PropTypes.any, // 琛ㄦ牸鏁版嵁
BID: PropTypes.any, // 涓昏〃ID
BData: PropTypes.any, // 涓昏〃鏁版嵁
+ unload: PropTypes.any, // 涓嬫媺鑿滃崟涓嶅姞杞芥暟鎹�
inputSubmit: PropTypes.func // input鍥炶溅鎻愪氦
}
@@ -44,8 +46,10 @@
record = {}
componentDidMount () {
- const { data, BData, action } = this.props
+ const { action, unload } = this.props
+ let data = {}
+ let BData = {}
let linkFields = {} // 鍏宠仈鑿滃崟
let controlFields = {} // 鎺у埗琛ㄥ崟
let deForms = [] // 闇�瑕佸姩鎬佽幏鍙栦笅鎷夎彍鍗曠殑琛ㄥ崟
@@ -54,6 +58,17 @@
let formlist = fromJS(action.fields).toJS()
let fieldMap = new Map()
let check = action.setting.formType === 'check'
+
+ if (this.props.data) {
+ Object.keys(this.props.data).forEach(key => {
+ data[key.toLowerCase()] = this.props.data[key]
+ })
+ }
+ if (this.props.BData) {
+ Object.keys(this.props.BData).forEach(key => {
+ BData[key.toLowerCase()] = this.props.BData[key]
+ })
+ }
formlist = formlist.filter(item => {
if (item.supField) { // 澶氬眰琛ㄥ崟鎺у埗
@@ -77,10 +92,17 @@
linkFields[item.linkField].push({field: item.field, uuid: item.uuid})
}
- if (item.type === 'split') return true
+ if (item.style) {
+ delete item.style.marginTop
+ delete item.style.marginBottom
+ delete item.style.marginLeft
+ delete item.style.marginRight
+ }
+
+ if (item.type === 'split' || item.type === 'formula') return true
if (item.type === 'hint') {
- if (item.field && data && data[item.field]) {
- item.message = data[item.field]
+ if (item.field && data[item.field.toLowerCase()]) {
+ item.message = data[item.field.toLowerCase()]
}
delete item.field
return true
@@ -91,7 +113,12 @@
item.precision = 'second'
}
- if (!item.field || !['text', 'number', 'switch', 'rate', 'select', 'link', 'linkMain', 'funcvar', 'date', 'datemonth', 'radio', 'checkbox', 'checkcard', 'fileupload', 'textarea', 'multiselect', 'brafteditor', 'color'].includes(item.type)) return false
+ if (!item.field || !['text', 'number', 'switch', 'rate', 'select', 'link', 'cascader', 'linkMain', 'funcvar', 'date', 'datemonth', 'radio', 'checkbox', 'checkcard', 'fileupload', 'textarea', 'multiselect', 'brafteditor', 'color'].includes(item.type)) return false
+
+ if (/^\s+$/.test(item.label)) {
+ item.style = item.style || {}
+ item.style.color = 'transparent'
+ }
// 鏁版嵁鑷姩濉厖
let readin = item.readin !== 'false'
@@ -101,24 +128,23 @@
item.hidden = item.hidden === 'true'
item.fieldlength = item.fieldlength || 50
+ let key = item.field.toLowerCase()
+
if (item.type === 'funcvar') {
readin = false
item.readin = false
item.hidden = true
+ } else if (item.type === 'linkMain') {
+ readin = false
+ item.readin = false
} else if (item.type === 'number') {
item.decimal = item.decimal || 0
item.fieldlength = item.decimal
item.initval = item.initval || 0
}
- if (['select', 'link', 'radio', 'checkbox', 'checkcard', 'multiselect'].includes(item.type)) {
+ if (['select', 'link', 'radio', 'checkbox', 'checkcard', 'multiselect', 'cascader'].includes(item.type)) {
item.options = item.options || []
- // item.options = item.options.map(cell => {
- // cell.value = cell.Value
- // cell.label = cell.Text
-
- // return cell
- // })
item.options = item.options.filter(cell => {
cell.value = cell.Value
cell.label = cell.Text
@@ -138,26 +164,19 @@
let newval = '$empty'
- if (readin && data && data.hasOwnProperty(item.field)) {
- newval = data[item.field]
+ if (readin && data.hasOwnProperty(key)) {
+ newval = data[key]
}
- if (item.type === 'linkMain') {
- newval = BData && BData[item.field] ? BData[item.field] : '$empty'
- } else if (item.type === 'date') { // 鏃堕棿鎼滅储
- let format = 'YYYY-MM-DD'
+ if (item.type === 'linkMain' && BData.hasOwnProperty(key)) {
+ newval = BData[key]
+ } else if (item.type === 'date') { // 鏃堕棿琛ㄥ崟锛屾彁浜ゅ�间负澶╂垨绉�
let _format = 'YYYY-MM-DD HH:mm:ss'
if (item.precision === 'day') {
_format = 'YYYY-MM-DD'
- } else if (item.precision === 'hour') {
- format = 'YYYY-MM-DD HH'
- } else if (item.precision === 'minute') {
- format = 'YYYY-MM-DD HH:mm'
- } else if (item.precision === 'second') {
- format = 'YYYY-MM-DD HH:mm:ss'
}
if (newval !== '$empty') {
- newval = moment(newval, format).format(_format)
+ newval = moment(newval, 'YYYY-MM-DD HH:mm:ss').format(_format)
newval = newval === 'Invalid date' ? '$empty' : newval
}
if (newval === '$empty' && item.initval) {
@@ -171,18 +190,6 @@
if (newval === '$empty' && item.initval) {
newval = moment().subtract(item.initval, 'month').format('YYYY-MM')
}
- // } else if (item.type === 'datetime') {
- // if (newval !== '$empty') {
- // newval = moment(newval, 'YYYY-MM-DD HH:mm:ss').format('YYYY-MM-DD HH:mm:ss')
- // newval = newval === 'Invalid date' ? '$empty' : newval
- // }
- // if (newval === '$empty' && item.initval) {
- // if (item.initval === '0') {
- // newval = moment().format('YYYY-MM-DD HH:mm:ss')
- // } else {
- // newval = moment().subtract(item.initval, 'days').format('YYYY-MM-DD') + ' 00:00:00'
- // }
- // }
} else if (item.type === 'switch') { // 寮�鍏冲彧鎺ユ敹鍥哄畾鍊�
if (newval !== '$empty' && (newval === item.closeVal || newval === item.openVal)) {
@@ -199,7 +206,11 @@
item.initval = ''
}
- if (['select', 'link', 'radio', 'checkbox', 'checkcard', 'multiselect'].includes(item.type) && item.resourceType === '1') {
+ if (item.type === 'number') {
+ if (isNaN(item.initval)) {
+ item.initval = 0
+ }
+ } else if (['select', 'link', 'radio', 'checkbox', 'checkcard', 'multiselect', 'cascader'].includes(item.type) && item.resourceType === '1') {
deForms.push(item)
} else if (item.type === 'rate') {
item.rateCount = item.rateCount || 5
@@ -222,45 +233,76 @@
}
if (item.type === 'text') {
- if (typeof(item.initval) === 'number') {
- item.initval = item.initval + ''
- }
+ item.initval = item.initval + ''
let _rules = [{
pattern: /^[^']*$/ig,
- message: formRule.input.quotemsg
+ message: '涓嶅彲浣跨敤鑻辨枃鐘舵�佺殑鍗曞紩鍙凤紒'
+ }, {
+ validator: (rule, value, callback) => {
+ if (/--/ig.test(value)) {
+ callback('涓嶅彲浣跨敤 -- 锛�')
+ } else {
+ callback()
+ }
+ }
}, {
required: item.required === 'true',
message: item.label + '涓嶅彲涓虹┖!'
- }, {
- max: item.fieldlength,
- message: formRule.input.formMessage.replace('@max', item.fieldlength)
}]
+
+ if (!item.lenControl || item.lenControl === 'limit') {
+ _rules.push({
+ max: item.fieldlength,
+ message: formRule.input.formMessage.replace('@max', item.fieldlength)
+ })
+ }
if (item.regular) {
if (item.regular === 'number') {
+ let reg = /^[0-9.-]*$/
+ if (item.regularExtra) {
+ reg = new RegExp('^[0-9.-' + item.regularExtra.replace(/\.|-/g, '') + ']*$')
+ }
_rules.push({
- pattern: /^[0-9.-]*$/ig,
- message: formRule.input.numbermsg
+ pattern: reg,
+ message: item.regularText || formRule.input.numbermsg
})
} else if (item.regular === 'letter') {
+ let reg = /^[a-zA-Z]*$/
+ if (item.regularExtra) {
+ reg = new RegExp('^[a-zA-Z' + item.regularExtra + ']*$')
+ }
_rules.push({
- pattern: /^[a-zA-Z]*$/ig,
- message: formRule.input.lettermsg
+ pattern: reg,
+ message: item.regularText || formRule.input.lettermsg
+ })
+ } else if (item.regular === 'letter_number') {
+ let reg = /^[a-zA-Z0-9]*$/
+ if (item.regularExtra) {
+ reg = new RegExp('^[a-zA-Z0-9' + item.regularExtra + ']*$')
+ }
+ _rules.push({
+ pattern: reg,
+ message: item.regularText || '璇疯緭鍏ユ暟瀛楁垨瀛楁瘝'
})
} else if (item.regular === 'letter&number') {
+ let reg = /^[a-zA-Z0-9@_.]*$/
+ if (item.regularExtra) {
+ reg = new RegExp('^[a-zA-Z0-9@_.' + item.regularExtra.replace(/\.|_|@/g, '') + ']*$')
+ }
_rules.push({
- pattern: /^[a-zA-Z0-9]*$/ig,
- message: formRule.input.letternummsg
+ pattern: reg,
+ message: item.regularText || '璇疯緭鍏ユ暟瀛椼�佸瓧姣嶄互鍙夽_.'
})
} else if (item.regular === 'phone') {
_rules.push({
- pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/ig,
- message: '璇锋纭緭鍏ユ墜鏈哄彿'
+ pattern: /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/,
+ message: item.regularText || '璇锋纭緭鍏ユ墜鏈哄彿'
})
- } else if (item.regular === 'funcname') {
+ } else if (item.regular === 'email') {
_rules.push({
- pattern: /^[\u4E00-\u9FA50-9a-zA-Z_]*$/ig,
- message: formRule.input.funcname
+ pattern: /^([a-zA-Z0-9._-])+@([a-zA-Z0-9_-])+(\.[a-zA-Z0-9_-])+/,
+ message: item.regularText || '璇锋纭緭鍏ラ偖绠卞湴鍧�'
})
}
}
@@ -282,14 +324,20 @@
{
max: item.fieldlength,
message: formRule.input.formMessage.replace('@max', item.fieldlength)
+ },
+ {
+ pattern: /^[^']*$/ig,
+ message: '涓嶅彲浣跨敤鑻辨枃鐘舵�佺殑鍗曞紩鍙凤紒'
+ }, {
+ validator: (rule, value, callback) => {
+ if (/--/ig.test(value)) {
+ callback('涓嶅彲浣跨敤 -- 锛�')
+ } else {
+ callback()
+ }
+ }
}
]
- if (item.encryption !== 'true') {
- _rules.push({
- pattern: /^[^']*$/ig,
- message: formRule.input.quotemsg
- })
- }
item.rules = _rules
} else if (item.type === 'brafteditor') {
item.rules = [
@@ -360,7 +408,7 @@
let item = fieldMap.get(cell.field)
// 涓嬬骇琛ㄥ崟鎺у埗-瀛楁鍐欏叆
- if ((['select', 'radio', 'link'].includes(item.type) || (item.type === 'checkcard' && item.multiple !== 'true')) && item.linkSubField) {
+ if ((['select', 'radio', 'link'].includes(item.type) || (item.type === 'checkcard' && item.multiple !== 'true') || (item.type === 'cascader' && item.resourceType !== '2')) && item.linkSubField) {
item.subFields = []
item.linkSubField.forEach(m => {
let n = fieldMap.get(m)
@@ -393,14 +441,14 @@
if (fieldMap.has(item.linkField)) {
item.supInitVal = fieldMap.get(item.linkField).initval || ''
- } else if (data && data.hasOwnProperty(item.linkField)) {
- item.supInitVal = data[item.linkField]
+ } else if (data.hasOwnProperty(item.linkField.toLowerCase())) {
+ item.supInitVal = data[item.linkField.toLowerCase()]
}
item.options = item.oriOptions.filter(option => option.ParentID === item.supInitVal || option.value === '')
}
- if (['select', 'link', 'radio'].includes(item.type) && item.resourceType !== '1') { // 閫変腑绗竴椤�
+ if (['select', 'link', 'radio'].includes(item.type) && item.resourceType === '0') { // 閫変腑绗竴椤�
if (typeof(item.initval) === 'string' && item.initval.indexOf('$first') > -1) {
item.initval = item.options[0] ? item.options[0].value : ''
}
@@ -427,8 +475,12 @@
}
if (item.subFields && item.options.length > 0) {
+ let initval = item.initval
+ if (item.type === 'cascader' && item.separator) {
+ initval = initval.split(item.separator).pop()
+ }
// eslint-disable-next-line
- let option = item.options.filter(cell => item.initval == cell.value)[0]
+ let option = item.options.filter(cell => initval == cell.value)[0]
if (option) {
reFieldsVal = reFieldsVal || {}
@@ -455,6 +507,8 @@
this.record = record
this.setState({ formlist }, () => {
+ if (unload) return
+
if (action.setting && action.setting.focus && fieldMap.has(action.setting.focus)) {
setTimeout(() => {
MKEmitter.emit('mkFC', 'focus', fieldMap.get(action.setting.focus).uuid)
@@ -462,7 +516,7 @@
}
if (deForms.length > 0) {
- if (this.props.menuType !== 'HS' && options.sysType === 'local' && window.GLOB.systemType !== 'production') {
+ if (!window.GLOB.mkHS && options.sysType === 'local' && window.GLOB.systemType !== 'production') {
this.improveSimpleActionForm(deForms)
} else {
this.improveActionForm(deForms)
@@ -475,25 +529,34 @@
* @description 鑾峰彇涓嬫媺琛ㄥ崟閫夐」淇℃伅
*/
improveActionForm = (deForms) => {
- const { BID, menuType, action } = this.props
+ const { BID, action } = this.props
let deffers = []
let mainItems = [] // 浜戠鎴栧崟鐐规暟鎹�
let localItems = [] // 鏈湴鏁版嵁
let cache = action.setting.cache !== 'false'
+ let debug = window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')
+
+ let _sql = `Declare @mk_organization nvarchar(512) select @mk_organization='${sessionStorage.getItem('organization') || ''}'\n`
+ let _sso = _sql
deForms.forEach(item => {
if (item.database === 'sso') {
- mainItems.push(`select '${item.field}' as obj_name,'${item.arr_field}' as arr_field,'${item.base_sql}' as LText`)
+ let sql = _sso + item.base_sql
+ _sso = ''
+ if (debug) {
+ console.info(sql)
+ }
+ mainItems.push(`select '${item.field}' as obj_name,'${item.arr_field}' as arr_field,'${window.btoa(window.encodeURIComponent(sql))}' as LText`)
} else {
- localItems.push(`select '${item.field}' as obj_name,'${item.arr_field}' as arr_field,'${item.base_sql}' as LText`)
+ let sql = _sql + item.base_sql
+ _sql = ''
+ if (debug) {
+ console.info(sql)
+ }
+ localItems.push(`select '${item.field}' as obj_name,'${item.arr_field}' as arr_field,'${window.btoa(window.encodeURIComponent(sql))}' as LText`)
}
})
-
- if (menuType !== 'HS' && options.sysType !== 'local') {
- localItems = [...localItems, ...mainItems]
- mainItems = []
- }
// 鏈湴璇锋眰
let param = {
@@ -510,7 +573,7 @@
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
- if (menuType === 'HS') { // 浜戠鏁版嵁楠岃瘉
+ if (window.GLOB.mkHS) { // 浜戠鏁版嵁楠岃瘉
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
}
@@ -545,7 +608,7 @@
mainparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
mainparam.secretkey = Utils.encrypt(mainparam.LText, mainparam.timestamp)
- if (menuType === 'HS') { // 浜戠鏁版嵁楠岃瘉
+ if (window.GLOB.mkHS) { // 浜戠鏁版嵁楠岃瘉
mainparam.open_key = Utils.encryptOpenKey(mainparam.secretkey, mainparam.timestamp)
if (options.cloudServiceApi) {
mainparam.rduri = options.cloudServiceApi
@@ -589,18 +652,29 @@
*/
improveSimpleActionForm = (deForms) => {
let cache = this.props.action.setting.cache !== 'false'
+ let debug = window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')
+ let _sql = `Declare @mk_organization nvarchar(512) select @mk_organization='${sessionStorage.getItem('organization') || ''}'\n`
let deffers = deForms.map((form, index) => {
let param = {
func: 'sPC_Get_SelectedList',
- LText: form.data_sql,
+ LText: _sql + form.base_sql,
obj_name: form.field,
arr_field: form.arr_field,
BID: this.props.BID || ''
}
+
+ if (debug) {
+ console.info(param.LText)
+ }
+ param.LText = Utils.formatOptions(param.LText)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+
+ if (form.database === 'sso' && window.GLOB.mainSystemApi) {
+ param.rduri = window.GLOB.mainSystemApi
+ }
return (
new Promise(resolve => {
@@ -638,23 +712,46 @@
resetFormList = (result) => {
let reFieldsVal = null
let _formlist = fromJS(this.state.formlist).toJS().map(item => {
- if (['select', 'link', 'radio', 'checkbox', 'checkcard', 'multiselect'].includes(item.type) && result[item.field] && result[item.field].length > 0) {
+ if (['select', 'link', 'radio', 'checkbox', 'checkcard', 'multiselect', 'cascader'].includes(item.type) && result[item.field] && result[item.field].length > 0) {
let options = []
+ let map = new Map()
+ let all = false
result[item.field].forEach(cell => {
- let _cell = { key: Utils.getuuid() }
+ let _cell = { key: Utils.getuuid() , ParentID: ''}
+
+ if (item.linkField && cell[item.linkField] !== undefined) {
+ _cell.ParentID = cell[item.linkField]
+ }
if (item.type !== 'checkcard') {
_cell.value = cell[item.valueField]
- _cell.label = cell[item.valueText]
- if (!_cell.label && _cell.label !== 0) return
+ _cell.label = cell[item.valueText] + ''
+ if (map.has(_cell.ParentID + _cell.value)) return
+ if (!_cell.label) {
+ if (!all) {
+ _cell.label = '鍏ㄩ儴'
+ all = true
+ } else {
+ return
+ }
+ }
+
+ map.set(_cell.ParentID + _cell.value, 0)
} else {
_cell.$value = cell[item.cardValField]
_cell = {..._cell, ...cell}
+
+ if (item.urlField) {
+ _cell.$url = cell[item.urlField] || ''
+ } else if (item.colorField) {
+ _cell.$color = cell[item.colorField] || ''
+ }
+
+ if (map.has(_cell.ParentID + _cell.$value)) return
+
+ map.set(_cell.ParentID + _cell.$value, 0)
}
-
- if (item.linkField) {
- _cell.ParentID = cell[item.linkField] === undefined ? '' : cell[item.linkField]
- }
+
if (item.subFields) {
item.subFields.forEach(m => {
_cell[m.field] = cell[m.field] === undefined ? '' : cell[m.field]
@@ -684,8 +781,12 @@
}
if (item.subFields && item.options.length > 0) {
+ let initval = item.initval
+ if (item.type === 'cascader' && item.separator) {
+ initval = initval.split(item.separator).pop()
+ }
// eslint-disable-next-line
- let option = item.options.filter(cell => item.initval == cell.value)[0]
+ let option = item.options.filter(cell => initval == cell.value)[0]
if (option) {
reFieldsVal = reFieldsVal || {}
@@ -727,9 +828,12 @@
callback(item.label + '鏈�灏忓�间负 ' + item.min)
} else if (typeof(item.max) === 'number' && val > item.max) {
callback(item.label + '鏈�澶у�间负 ' + item.max)
+ } else {
+ callback()
}
+ } else {
+ callback()
}
- callback()
}
recordChange = (values, item) => {
@@ -786,21 +890,31 @@
if (item.type === 'split') {
fields.push(
<Col span={24} key={index}>
- <p className="mk-form-split-line">{item.label}</p>
+ <p className="mk-form-split-line" style={item.style}>{item.label}</p>
</Col>
)
} else if (item.type === 'hint') {
fields.push(
<Col span={item.span || 24} key={index}>
- <Form.Item className="hint" colon={!!item.label} label={item.label || ' '} labelCol={item.labelCol} wrapperCol={item.wrapperCol}>
- <div className="message">{item.message}</div>
+ <Form.Item className="hint" colon={false} label={item.label ? <span className="mk-form-label" style={item.style}>{item.label}</span> : ' '} labelCol={item.labelCol} wrapperCol={item.wrapperCol}>
+ <div className="message" style={item.style}>{item.message}</div>
+ </Form.Item>
+ </Col>
+ )
+ } else if (item.type === 'formula') {
+ fields.push(
+ <Col span={item.span || 24} key={index}>
+ <Form.Item className="hint" colon={false} label={<span className="mk-form-label" style={item.style}>{item.label}</span>} labelCol={item.labelCol} wrapperCol={item.wrapperCol}>
+ <MkFormula config={item} data={this.record}></MkFormula>
</Form.Item>
</Col>
)
} else {
let content = null
let className = ''
- let label = item.tooltip ? <Tooltip placement="topLeft" title={item.tooltip}><QuestionCircleOutlined style={{color: '#c49f47', marginRight: '3px'}}/>{item.label}</Tooltip> : item.label
+ let label = item.tooltip ? <Tooltip placement="topLeft" title={item.tooltip}><QuestionCircleOutlined style={{color: '#c49f47', marginRight: '3px'}}/>
+ <span className="mk-form-label" style={item.style}>{item.label}</span>
+ </Tooltip> : <span className="mk-form-label" style={item.style}>{item.label}</span>
if (item.type === 'text' || item.type === 'linkMain') {
content = (<MKInput config={item} onChange={(val, defer) => !defer && this.recordChange({[item.field]: val})} onSubmit={this.props.inputSubmit} />)
@@ -808,6 +922,8 @@
content = (<MKNumberInput config={item} onChange={(val, defer) => !defer && this.recordChange({[item.field]: val})} onSubmit={this.props.inputSubmit} />)
} else if (item.type === 'select' || item.type === 'link' || item.type === 'multiselect') {
content = (<MKSelect config={item} onChange={(val, other) => this.recordChange({[item.field]: val, ...other}, item)} onSubmit={this.props.inputSubmit} />)
+ } else if (item.type === 'cascader') {
+ content = (<MkCascader config={item} onChange={(val, other) => this.recordChange({[item.field]: val, ...other}, item)}/>)
} else if (item.type === 'color') {
content = (<MKColor config={item} onChange={(val) => this.recordChange({[item.field]: val})}/>)
} else if (item.type === 'checkcard') {
@@ -828,7 +944,7 @@
} else if (item.type === 'textarea') {
content = (<MKTextArea config={item} onChange={(val, defer) => !defer && this.recordChange({[item.field]: val})}/>)
} else if (item.type === 'rate') {
- content = (<Rate count={item.rateCount} disabled={item.readonly} onChange={(val) => this.recordChange({[item.field]: val})} character={item.character ? <MkIcon type={item.character}/> : <StarFilled />} allowHalf={item.allowHalf}/>)
+ content = (<Rate count={item.rateCount} disabled={item.readonly} style={{color: item.color || '#fadb14'}} onChange={(val) => this.recordChange({[item.field]: val})} character={item.character ? <MkIcon type={item.character}/> : <StarFilled />} allowHalf={item.allowHalf}/>)
} else if (item.type === 'brafteditor') {
content = (<MKEditor config={item} onChange={(val) => this.recordChange({[item.field]: val})}/>)
label = item.hidelabel !== 'true' ? label : ''
@@ -840,6 +956,7 @@
<Col span={item.span || 24} key={index}>
<Form.Item
label={label}
+ colon={false}
className={className}
extra={item.extra || null}
labelCol={item.labelCol}
@@ -876,7 +993,6 @@
let _item = {
type: item.type,
- readonly: item.readonly,
readin: item.readin,
writein: item.writein,
fieldlen: item.fieldlength,
@@ -887,16 +1003,25 @@
if (item.type === 'funcvar') {
_item.value = ''
- } else if (_item.value && (item.type === 'text' || item.type === 'textarea' || item.type === 'linkMain') && typeof(_item.value) === 'string') {
+ } else if (item.declare === 'decimal') {
+ _item.type = 'number'
+ _item.fieldlen = item.decimal || 0
+ } else if (['text', 'textarea', 'linkMain'].includes(item.type)) {
+ _item.value = _item.value + ''
_item.value = _item.value.replace(/\t*|\v*/g, '') // 鍘婚櫎鍒惰〃绗�
- if (item.interception === 'true') { // 鍘婚櫎棣栧熬绌烘牸
+ if (item.interception !== 'false') { // 鍘婚櫎棣栧熬绌烘牸
_item.value = _item.value.replace(/(^\s*|\s*$)/g, '')
}
- if (item.type === 'text') { // 鐗规畩瀛楁鏇挎崲
- _item.value = _item.value.replace(/^(\s*)@appkey@(\s*)$/ig, window.GLOB.appkey)
- _item.value = _item.value.replace(/^(\s*)@SessionUid@(\s*)$/ig, (localStorage.getItem('SessionUid') || ''))
- _item.value = _item.value.replace(/^(\s*)@bid@(\s*)$/ig, (this.props.BID || ''))
+ if (item.type === 'text' && /@appkey@|@SessionUid@|@bid@/ig.test(_item.value)) { // 鐗规畩瀛楁鏇挎崲
+ _item.value = _item.value.replace(/^(\s*)@appkey@(\s*)$/ig, window.GLOB.appkey).replace(/^(\s*)@SessionUid@(\s*)$/ig, (localStorage.getItem('SessionUid') || '')).replace(/^(\s*)@bid@(\s*)$/ig, (this.props.BID || ''))
+ }
+ if (item.type === 'text' && item.lenControl && item.lenControl !== 'limit') {
+ if (item.lenControl === 'left') {
+ _item.value = _item.value.substr(0, item.fieldlength)
+ } else {
+ _item.value = _item.value.slice(-item.fieldlength)
+ }
}
} else if (item.type.indexOf('date') > -1) {
if (item.declareType === 'nvarchar(50)') {
@@ -919,9 +1044,13 @@
if (action.setting && action.setting.align) {
_align = action.setting.align
}
+ let space = ' space-normal'
+ if (action.setting && action.setting.verticalSpace) {
+ space = ' space-' + action.setting.verticalSpace
+ }
return (
- <Form className={'main-form-field ' + _align}>
+ <Form className={'main-form-field ' + _align + space}>
<Row gutter={24}>{this.getFields()}</Row>
</Form>
)
--
Gitblit v1.8.0