From 9d3c77a83bc4e7febbfb8fd05de2f90100c5af6c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 15 一月 2024 17:52:42 +0800
Subject: [PATCH] 2024-01-15
---
src/tabviews/zshare/mutilform/index.jsx | 493 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 344 insertions(+), 149 deletions(-)
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 0cc3dbd..8a3b8e9 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -6,7 +6,6 @@
import moment from 'moment'
import Api from '@/api'
-import options from '@/store/options.js'
import { formRule } from '@/utils/option.js'
import Utils from '@/utils/utils.js'
import asyncComponent from '@/utils/asyncComponent'
@@ -29,6 +28,7 @@
const MkFormula = asyncComponent(() => import('./mkFormula'))
const MkCascader = asyncComponent(() => import('./mkCascader'))
const MkVercode = asyncComponent(() => import('./mkVercode'))
+const MKPopSelect = asyncComponent(() => import('./mkPopSelect'))
const MKEditor = asyncComponent(() => import('@/components/editor'))
class MutilFormComponent extends Component {
@@ -46,10 +46,13 @@
ID: '',
send_type: '',
timestamp: '',
- n_id: ''
+ n_id: '',
+ focusId: '',
+ reFocusId: ''
}
record = {}
+ submitId = ''
componentDidMount () {
const { action, unload } = this.props
@@ -126,7 +129,7 @@
item.precision = 'second'
}
- if (!item.field || !['text', 'number', 'switch', 'check', 'rate', 'select', 'link', 'cascader', 'linkMain', 'funcvar', 'date', 'datemonth', 'radio', 'checkbox', 'checkcard', 'fileupload', 'textarea', 'multiselect', 'brafteditor', 'color', 'vercode'].includes(item.type)) return false
+ if (!item.field || !['text', 'number', 'switch', 'check', 'rate', 'select', 'popSelect', 'link', 'cascader', 'linkMain', 'funcvar', 'date', 'datemonth', 'radio', 'checkbox', 'checkcard', 'fileupload', 'textarea', 'multiselect', 'brafteditor', 'color', 'vercode'].includes(item.type)) return false
if (/^\s+$/.test(item.label)) {
item.style = item.style || {}
@@ -214,6 +217,35 @@
if (newval === '$empty' && item.initval) {
newval = moment().subtract(item.initval, 'days').format(_format)
}
+
+ if (item.minDate) {
+ if (item.minDate === 'custom') {
+ if (/^\d{4}-\d{2}-\d{2}$/.test(item.minDateField)) {
+ item.minDate = moment(item.minDateField).format('YYYY-MM-DD')
+ } else {
+ let val = data[item.minDateField.toLowerCase()]
+ item.minDate = val ? moment(val).format('YYYY-MM-DD') : ''
+ }
+
+ item.minDate = item.minDate === 'Invalid date' ? '' : item.minDate
+ } else {
+ item.minDate = moment().add(item.minDate, 'days').format('YYYY-MM-DD')
+ }
+ }
+ if (item.maxDate) {
+ if (item.maxDate === 'custom') {
+ if (/^\d{4}-\d{2}-\d{2}$/.test(item.maxDateField)) {
+ item.maxDate = moment(item.maxDateField).format('YYYY-MM-DD')
+ } else {
+ let val = data[item.maxDateField.toLowerCase()]
+ item.maxDate = val ? moment(val).format('YYYY-MM-DD') : ''
+ }
+
+ item.maxDate = item.maxDate === 'Invalid date' ? '' : item.maxDate
+ } else {
+ item.maxDate = moment().add(item.maxDate, 'days').format('YYYY-MM-DD')
+ }
+ }
} else if (item.type === 'datemonth') {
if (newval !== '$empty') {
newval = moment(newval, 'YYYY-MM').format('YYYY-MM')
@@ -239,7 +271,7 @@
}
if (item.type === 'number') {
- if (isNaN(item.initval)) {
+ if (isNaN(item.initval) || item.initval === '') {
item.initval = 0
}
} else if (['select', 'link', 'radio', 'checkbox', 'checkcard', 'multiselect', 'cascader'].includes(item.type) && item.resourceType === '1') {
@@ -264,26 +296,31 @@
}
}
+ item.rules = []
if (item.type === 'text') {
item.initval = item.initval + ''
- let _rules = [{
- pattern: /^[^']*$/ig,
- message: '涓嶅彲浣跨敤鑻辨枃鐘舵�佺殑鍗曞紩鍙凤紒'
- }, {
+
+ if (item.required === 'true') {
+ item.rules.push({
+ required: true,
+ message: item.label + '涓嶅彲涓虹┖!'
+ })
+ }
+
+ item.rules.push({
validator: (rule, value, callback) => {
- if (/--/ig.test(value)) {
- callback('涓嶅彲浣跨敤 -- 锛�')
+ if (/'/.test(value)) {
+ callback('涓嶅彲浣跨敤鑻辨枃鐘舵�佺殑鍗曞紩鍙凤紒')
+ // } else if (/--/.test(value)) {
+ // callback('涓嶅彲浣跨敤 -- 锛�')
} else {
callback()
}
}
- }, {
- required: item.required === 'true',
- message: item.label + '涓嶅彲涓虹┖!'
- }]
-
+ })
+
if (!item.lenControl || item.lenControl === 'limit') {
- _rules.push({
+ item.rules.push({
max: item.fieldlength,
message: formRule.input.formMessage.replace('@max', item.fieldlength)
})
@@ -295,7 +332,7 @@
if (item.regularExtra) {
reg = new RegExp('^[0-9.-' + item.regularExtra.replace(/\.|-/g, '') + ']*$')
}
- _rules.push({
+ item.rules.push({
pattern: reg,
message: item.regularText || formRule.input.numbermsg
})
@@ -304,7 +341,7 @@
if (item.regularExtra) {
reg = new RegExp('^[a-zA-Z' + item.regularExtra + ']*$')
}
- _rules.push({
+ item.rules.push({
pattern: reg,
message: item.regularText || formRule.input.lettermsg
})
@@ -313,7 +350,7 @@
if (item.regularExtra) {
reg = new RegExp('^[a-zA-Z0-9' + item.regularExtra + ']*$')
}
- _rules.push({
+ item.rules.push({
pattern: reg,
message: item.regularText || '璇疯緭鍏ユ暟瀛楁垨瀛楁瘝'
})
@@ -322,80 +359,113 @@
if (item.regularExtra) {
reg = new RegExp('^[a-zA-Z0-9@_.' + item.regularExtra.replace(/\.|_|@/g, '') + ']*$')
}
- _rules.push({
+ item.rules.push({
pattern: reg,
message: item.regularText || '璇疯緭鍏ユ暟瀛椼�佸瓧姣嶄互鍙夽_.'
})
} else if (item.regular === 'phone') {
- _rules.push({
+ item.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}$/,
message: item.regularText || '璇锋纭緭鍏ユ墜鏈哄彿'
})
} else if (item.regular === 'email') {
- _rules.push({
+ item.rules.push({
pattern: /^([a-zA-Z0-9._-])+@([a-zA-Z0-9_-])+(\.[a-zA-Z0-9_-])+/,
message: item.regularText || '璇锋纭緭鍏ラ偖绠卞湴鍧�'
})
}
}
-
- item.rules = _rules
} else if (item.type === 'number') {
item.rules = [{
required: true,
message: item.label + '涓嶅彲涓虹┖!'
- }, {
- validator: (rule, value, callback) => this.handleConfirmPassword(rule, value, callback, item)
}]
- } else if (item.type === 'textarea') {
- let _rules = [
- {
- required: item.required === 'true',
- message: item.label + '涓嶅彲涓虹┖!'
- },
- {
- max: item.fieldlength,
- message: formRule.input.formMessage.replace('@max', item.fieldlength)
- },
- {
- pattern: /^[^']*$/ig,
- message: '涓嶅彲浣跨敤鑻辨枃鐘舵�佺殑鍗曞紩鍙凤紒'
- }, {
+
+ if (typeof(item.min) === 'number' || typeof(item.max) === 'number') {
+ item.rules.push({
validator: (rule, value, callback) => {
- if (/--/ig.test(value)) {
- callback('涓嶅彲浣跨敤 -- 锛�')
+ if (isNaN(value)) {
+ callback()
+ } else if (typeof(item.min) === 'number' && value < item.min) {
+ if (item.min < 1e-6) {
+ if (item.min === 1e-6) {
+ callback(item.label + '鏈�灏忓�间负 0.000001')
+ } else if (item.min === 1e-7) {
+ callback(item.label + '鏈�灏忓�间负 0.0000001')
+ } else if (item.min === 1e-8) {
+ callback(item.label + '鏈�灏忓�间负 0.00000001')
+ } else if (item.min === 1e-9) {
+ callback(item.label + '鏈�灏忓�间负 0.000000001')
+ } else if (item.min === 1e-10) {
+ callback(item.label + '鏈�灏忓�间负 0.0000000001')
+ } else if (item.min === 1e-11) {
+ callback(item.label + '鏈�灏忓�间负 0.00000000001')
+ } else {
+ callback(item.label + '鏈�灏忓�间负 ' + item.min)
+ }
+ } else {
+ callback(item.label + '鏈�灏忓�间负 ' + item.min)
+ }
+ } else if (typeof(item.max) === 'number' && value > item.max) {
+ callback(item.label + '鏈�澶у�间负 ' + item.max)
} else {
callback()
}
}
+ })
+ }
+ } else if (item.type === 'textarea') {
+ if (item.required === 'true') {
+ item.rules.push({
+ required: true,
+ message: item.label + '涓嶅彲涓虹┖!'
+ })
+ }
+
+ item.rules.push({
+ validator: (rule, value, callback) => {
+ if (/'/.test(value)) {
+ callback('涓嶅彲浣跨敤鑻辨枃鐘舵�佺殑鍗曞紩鍙凤紒')
+ // } else if (/--/.test(value)) {
+ // callback('涓嶅彲浣跨敤 -- 锛�')
+ } else {
+ callback()
+ }
}
- ]
- item.rules = _rules
+ }, {
+ max: item.fieldlength,
+ message: formRule.input.formMessage.replace('@max', item.fieldlength)
+ })
} else if (item.type === 'brafteditor') {
- item.rules = [
- {
- required: item.required === 'true',
+ if (item.required === 'true') {
+ item.rules.push({
+ required: true,
message: item.label + '涓嶅彲涓虹┖!'
- },
- {
- max: item.fieldlength,
- message: formRule.input.formMessage.replace('@max', item.fieldlength)
- }
- ]
+ })
+ }
+
+ item.rules.push({
+ max: item.fieldlength,
+ message: formRule.input.formMessage.replace('@max', item.fieldlength)
+ })
} else if (item.type === 'linkMain' || item.type === 'vercode') {
- item.rules = [
- {
- required: item.required === 'true',
+ if (item.required === 'true') {
+ item.rules.push({
+ required: true,
message: item.label + '涓嶅彲涓虹┖!'
- }
- ]
+ })
+ }
} else {
- item.rules = [
- {
- required: item.required === 'true',
+ if (item.required === 'true') {
+ item.rules.push({
+ required: true,
message: '璇烽�夋嫨' + item.label + '!'
- }
- ]
+ })
+ }
+ }
+
+ if (item.rules.length === 0) {
+ item.rules = null
}
fieldMap.set(item.field, item)
@@ -458,47 +528,42 @@
let item = fieldMap.get(cell.field)
// 涓嬬骇琛ㄥ崟鎺у埗-瀛楁鍐欏叆
- 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)
- if (n && ['text', 'number', 'textarea'].includes(n.type)) {
- item.subFields.push({
- uuid: n.uuid,
- field: m
- })
- }
- })
-
- if (item.subFields.length === 0) {
- item.subFields = null
- } else if (item.oriOptions.length > 0) {
- item.oriOptions = item.oriOptions.map(cell => {
- item.subFields.forEach(m => {
- cell[m.field] = cell[m.field] === undefined ? '' : cell[m.field]
- })
- return cell
+ if (item.linkSubField && item.linkSubField.length > 0) {
+ if ((['select', 'radio', 'link'].includes(item.type) || (item.type === 'checkcard' && item.multiple !== 'true') || (item.type === 'cascader' && item.resourceType !== '2'))) {
+ item.subFields = []
+ item.linkSubField.forEach(m => {
+ let n = fieldMap.get(m)
+ if (n && ['text', 'number', 'textarea'].includes(n.type)) {
+ item.subFields.push({
+ uuid: n.uuid,
+ field: m
+ })
+ }
})
-
- item.options = fromJS(item.oriOptions).toJS()
- }
- item.linkSubField = null
- } else if (item.type === 'switch' && item.linkSubField) {
- item.options = []
- item.subFields = []
- item.linkSubField.forEach(m => {
- let n = fieldMap.get(m)
- if (n && ['text', 'number', 'textarea'].includes(n.type)) {
- item.subFields.push({
- uuid: n.uuid,
- field: m
+
+ if (item.oriOptions.length > 0) {
+ item.oriOptions = item.oriOptions.map(cell => {
+ item.subFields.forEach(m => {
+ cell[m.field] = cell[m.field] === undefined ? '' : cell[m.field]
+ })
+ return cell
})
+
+ item.options = fromJS(item.oriOptions).toJS()
}
- })
-
- if (item.subFields.length === 0) {
- item.subFields = null
- } else {
+ } else if (item.type === 'switch') {
+ item.options = []
+ item.subFields = []
+ item.linkSubField.forEach(m => {
+ let n = fieldMap.get(m)
+ if (n && ['text', 'number', 'textarea'].includes(n.type)) {
+ item.subFields.push({
+ uuid: n.uuid,
+ field: m
+ })
+ }
+ })
+
reFieldsVal = reFieldsVal || {}
let val = item.initval === item.openVal ? item.openText : item.closeText
@@ -506,7 +571,32 @@
item.subFields.forEach(n => {
reFieldsVal[n.field] = val || ''
})
+ } else if (item.type === 'fileupload') {
+ item.options = []
+ item.subFields = []
+ item.linkSubField.forEach(m => {
+ let n = fieldMap.get(m)
+ if (n && ['text', 'number', 'textarea'].includes(n.type)) {
+ item.subFields.push({
+ uuid: n.uuid,
+ field: m
+ })
+ }
+ })
+ } else if (item.type === 'popSelect') {
+ item.options = []
+ item.subFields = []
+ item.linkSubField.forEach(m => {
+ let n = fieldMap.get(m)
+ if (n && ['text', 'number', 'textarea'].includes(n.type)) {
+ item.subFields.push({
+ uuid: n.uuid,
+ field: m
+ })
+ }
+ })
}
+
item.linkSubField = null
}
@@ -536,17 +626,19 @@
}
record[item.field] = item.initval
+ item.orgval = item.initval
if (linkFields[item.field]) {
item.linkFields = linkFields[item.field]
}
if (item.enter === 'tab' || item.enter === 'sub') {
- if (fieldMap.has(item.tabField)) {
+ item.tabUuid = ''
+ if (item.tabField && fieldMap.has(item.tabField)) {
item.tabUuid = fieldMap.get(item.tabField).uuid
} else if (item.enter === 'tab') {
item.enter = 'false'
- } else if (item.enter === 'sub') {
+ } else if (item.enter === 'sub' && ['text', 'number'].includes(item.type)) {
item.tabUuid = item.uuid
}
}
@@ -582,17 +674,31 @@
}
this.record = record
+ let ID = this.props.data ? this.props.data.$$uuid || '' : ''
+ let focusItem = null
- this.setState({ formlist, ID: this.props.data ? this.props.data.$$uuid || '' : '' }, () => {
+ if (action.setting.focus && fieldMap.has(action.setting.focus)) {
+ focusItem = fieldMap.get(action.setting.focus)
+ }
+
+ let reFocusItem = null
+ if (action.setting.refocus && fieldMap.has(action.setting.refocus)) {
+ reFocusItem = fieldMap.get(action.setting.refocus)
+ }
+
+ this.setState({
+ formlist,
+ ID,
+ focusId: focusItem ? focusItem.uuid : '',
+ reFocusId: reFocusItem ? reFocusItem.uuid : ''
+ }, () => {
if (unload) return
- if (action.setting && action.setting.focus && fieldMap.has(action.setting.focus)) {
- let focusItem = fieldMap.get(action.setting.focus)
-
+ if (focusItem) {
if (focusItem.type === 'text' || focusItem.type === 'number') {
setTimeout(() => {
MKEmitter.emit('mkFC', 'focus', focusItem.uuid)
- }, 50)
+ }, 20)
} else {
setTimeout(() => {
MKEmitter.emit('mkFC', 'focus', focusItem.uuid)
@@ -601,13 +707,91 @@
}
if (deForms.length > 0) {
- if (!window.GLOB.mkHS && options.sysType === 'local' && window.GLOB.systemType !== 'production') {
- this.improveSimpleActionForm(deForms)
+ if (action.$cache && action.setting.cache !== 'false') {
+ Api.getLCacheConfig(action.uuid, action.$time, this.props.BID, ID).then(res => {
+ if (!res.valid) {
+ this.getFormData(deForms)
+ } else {
+ this.resetFormList(res.data, true)
+ }
+ })
} else {
- this.improveActionForm(deForms)
+ this.getFormData(deForms)
}
}
})
+
+ if (action.subButton && action.subButton.resetForms) {
+ MKEmitter.addListener('resetForms', this.resetForms)
+ }
+ }
+
+ componentWillUnmount () {
+ this.setState = () => {
+ return
+ }
+ MKEmitter.removeListener('resetForms', this.resetForms)
+ }
+
+ resetForms = (id, data) => {
+ const { action } = this.props
+ const { focusId, reFocusId } = this.state
+
+ if (id !== action.uuid) return
+
+ let formlist = fromJS(this.state.formlist).toJS()
+ let resetForms = action.subButton.resetForms || []
+
+ formlist = formlist.map(item => {
+ if (item.type !== 'text' && item.type !== 'number') return item
+
+ if (resetForms.includes(item.field)) {
+ let key = item.field.toLowerCase()
+ if (typeof(data[key]) !== 'undefined') {
+ item.initval = data[key]
+ this.record[item.field] = data[key]
+ } else {
+ item.initval = item.orgval
+ this.record[item.field] = item.orgval
+ }
+ }
+
+ return item
+ })
+
+ let _list = fromJS(formlist).toJS().map(item => {
+ if (item.type !== 'text' && item.type !== 'number') return item
+
+ if (resetForms.includes(item.field) && !item.hidden) {
+ item.hidden = true
+ }
+
+ return item
+ })
+
+ this.setState({
+ formlist: _list
+ }, () => {
+ this.setState({
+ formlist
+ })
+ })
+
+ if (reFocusId || focusId || this.submitId) {
+ setTimeout(() => {
+ MKEmitter.emit('mkFC', 'focus', this.submitId || reFocusId || focusId)
+ }, 20)
+ }
+ }
+
+ getFormData = (deForms) => {
+ if (deForms.length === 1) {
+ this.improveSimpleActionForm(deForms)
+ } else if (!window.GLOB.mkHS && window.GLOB.sysType === 'local' && window.GLOB.systemType !== 'production') {
+ this.improveSimpleActionForm(deForms)
+ } else {
+ this.improveActionForm(deForms)
+ }
}
/**
@@ -619,8 +803,8 @@
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 cache = action.setting.cache !== 'false' && !action.$cache
+ let skip = false
let _sql = `Declare @mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20) select @mk_departmentcode='${sessionStorage.getItem('departmentcode') || ''}',@mk_organization='${sessionStorage.getItem('organization') || ''}',@mk_user_type='${sessionStorage.getItem('mk_user_type') || ''}'\n`
let _sso = _sql
@@ -633,7 +817,7 @@
sql = sql.replace(/@ID@/ig, `'${this.state.ID || ''}'`)
sql = sql.replace(/@BID@/ig, `'${BID}'`)
- if (debug) {
+ if (window.GLOB.debugger === true) {
console.info(sql)
}
@@ -647,7 +831,7 @@
sql = sql.replace(/@ID@/ig, `'${this.state.ID || ''}'`)
sql = sql.replace(/@BID@/ig, `'${BID}'`)
- if (debug) {
+ if (window.GLOB.debugger === true) {
console.info(sql)
}
@@ -684,6 +868,7 @@
message: res.message,
duration: 5
})
+ skip = true
}
resolve(res)
})
@@ -705,15 +890,11 @@
mainparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
mainparam.secretkey = Utils.encrypt(mainparam.LText, mainparam.timestamp)
+ if (window.GLOB.mainSystemApi) {
+ mainparam.rduri = window.GLOB.mainSystemApi
+ }
if (window.GLOB.mkHS) { // 浜戠鏁版嵁楠岃瘉
mainparam.open_key = Utils.encryptOpenKey(mainparam.secretkey, mainparam.timestamp)
- if (options.cloudServiceApi) {
- mainparam.rduri = options.cloudServiceApi
- mainparam.userid = sessionStorage.getItem('CloudUserID') || ''
- mainparam.LoginUID = sessionStorage.getItem('CloudLoginUID') || ''
- }
- } else if (window.GLOB.mainSystemApi) {
- mainparam.rduri = window.GLOB.mainSystemApi
}
deffers.push(
@@ -725,6 +906,7 @@
message: res.message,
duration: 5
})
+ skip = true
}
resolve(res)
})
@@ -740,7 +922,7 @@
delete result.message
delete result.status
- this.resetFormList(result)
+ this.resetFormList(result, skip)
})
}
@@ -748,9 +930,11 @@
* @description 娴嬭瘯绯荤粺鑾峰彇涓嬫媺琛ㄥ崟閫夐」淇℃伅
*/
improveSimpleActionForm = (deForms) => {
- let cache = this.props.action.setting.cache !== 'false'
- let debug = window.GLOB.debugger === true || (window.debugger === true && options.sysType !== 'cloud')
+ const { action } = this.props
+
+ let cache = this.props.action.setting.cache !== 'false' && !action.$cache
let _sql = `Declare @mk_departmentcode nvarchar(512),@mk_organization nvarchar(512),@mk_user_type nvarchar(20) select @mk_departmentcode='${sessionStorage.getItem('departmentcode') || ''}',@mk_organization='${sessionStorage.getItem('organization') || ''}',@mk_user_type='${sessionStorage.getItem('mk_user_type') || ''}'\n`
+ let skip = false
let deffers = deForms.map((form, index) => {
let param = {
@@ -763,7 +947,7 @@
param.LText = param.LText.replace(/@ID@/ig, `'${this.state.ID || ''}'`)
param.LText = param.LText.replace(/@BID@/ig, `'${this.props.BID || ''}'`)
- if (debug) {
+ if (window.GLOB.debugger) {
console.info(param.LText)
}
@@ -773,6 +957,9 @@
if (form.database === 'sso' && window.GLOB.mainSystemApi) {
param.rduri = window.GLOB.mainSystemApi
+ }
+ if (window.GLOB.mkHS) { // 浜戠鏁版嵁楠岃瘉
+ param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
}
return (
@@ -785,6 +972,7 @@
message: res.message,
duration: 5
})
+ skip = true
}
resolve(res)
})
@@ -795,6 +983,7 @@
Promise.all(deffers).then(response => {
let result = {}
+
response.forEach(res => {
result = {...result, ...res}
})
@@ -804,11 +993,17 @@
delete result.message
delete result.status
- this.resetFormList(result)
+ this.resetFormList(result, skip)
})
}
- resetFormList = (result) => {
+ resetFormList = (result, skip) => {
+ const { BID, action } = this.props
+
+ if (action.$cache && action.setting.cache !== 'false' && !skip) {
+ Api.writeCacheConfig(action.uuid, fromJS(result).toJS(), BID, this.state.ID)
+ }
+
let reFieldsVal = null
let _formlist = fromJS(this.state.formlist).toJS().map(item => {
if (['select', 'link', 'radio', 'checkbox', 'checkcard', 'multiselect', 'cascader'].includes(item.type) && result[item.field] && result[item.field].length > 0) {
@@ -938,22 +1133,6 @@
})
}
- handleConfirmPassword = (rule, value, callback, item) => {
- let val = parseFloat(value)
-
- if (!isNaN(val)) {
- if (typeof(item.min) === 'number' && val < item.min) {
- callback(item.label + '鏈�灏忓�间负 ' + item.min)
- } else if (typeof(item.max) === 'number' && val > item.max) {
- callback(item.label + '鏈�澶у�间负 ' + item.max)
- } else {
- callback()
- }
- } else {
- callback()
- }
- }
-
recordChange = (values, item) => {
this.record = {...this.record, ...values}
@@ -1060,6 +1239,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 === 'popSelect') {
+ content = (<MKPopSelect config={item} BID={this.props.BID} ID={this.state.ID} 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') {
@@ -1068,9 +1249,9 @@
className = 'checkcard'
content = (<MKCheckCard config={item} onChange={(val, other) => this.recordChange({[item.field]: val, ...other}, item)}/>)
} else if (item.type === 'switch') {
- content = (<MKSwitch config={item} onChange={(val, other) => this.recordChange({[item.field]: val, ...other}, item)}/>)
+ content = (<MKSwitch config={item} onChange={(val, other) => this.recordChange({[item.field]: val, ...other}, item)} onSubmit={this.props.inputSubmit}/>)
} else if (item.type === 'check') {
- content = (<MKCheck config={item} onChange={(val) => this.recordChange({[item.field]: val}, item)}/>)
+ content = (<MKCheck config={item} onChange={(val) => this.recordChange({[item.field]: val}, item)} onSubmit={this.props.inputSubmit}/>)
} else if (item.type === 'checkbox') {
content = (<MKCheckbox config={item} onChange={(val) => this.recordChange({[item.field]: val})}/>)
} else if (item.type === 'radio') {
@@ -1080,7 +1261,7 @@
} else if (item.type === 'fileupload') {
className = item.readonly ? 'readonly' : ''
className += item.fileType === 'picture-card' ? ' file-upload' : ''
- content = (<MKFileUpload config={item} onChange={(val) => this.recordChange({[item.field]: val})} />)
+ content = (<MKFileUpload config={item} data={this.record} onChange={(val, other = {}) => this.recordChange({[item.field]: val, ...other})} />)
} else if (item.type === 'textarea') {
content = (<MKTextArea config={item} onChange={(val, defer) => !defer && this.recordChange({[item.field]: val})}/>)
} else if (item.type === 'rate') {
@@ -1117,7 +1298,7 @@
return fields
}
- handleConfirm = () => {
+ handleConfirm = (formId) => {
const { formlist, send_type, timestamp, n_id } = this.state
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
@@ -1154,7 +1335,19 @@
_item.value = _item.value.replace(/\t+|\v+/g, '') // 鍘婚櫎鍒惰〃绗�
if (item.interception !== 'false') { // 鍘婚櫎棣栧熬绌烘牸
- _item.value = _item.value.replace(/(^\s*|\s*$)/g, '')
+ if (item.interception === 'func') {
+ try {
+ // eslint-disable-next-line
+ let func = new Function('value', 'data', item.func)
+ _item.value = func(_item.value, record)
+ _item.value = _item.value !== undefined ? _item.value : ''
+ } catch (e) {
+ console.warn(e)
+ _item.value = ''
+ }
+ } else {
+ _item.value = _item.value.replace(/(^\s*|\s*$)/g, '')
+ }
}
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 || ''))
@@ -1203,6 +1396,8 @@
forms.push(_item)
})
+ this.submitId = formId || ''
+
resolve(forms)
})
})
--
Gitblit v1.8.0