From 2bccb9ec7bdefe23292a22bc153463cfa1479a49 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 六月 2024 16:25:42 +0800
Subject: [PATCH] 2024-06-21
---
src/tabviews/zshare/mutilform/index.jsx | 185 +++++++++++++++++++++++++++++++++------------
1 files changed, 134 insertions(+), 51 deletions(-)
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 8a3b8e9..3b6fcc1 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 { formRule } from '@/utils/option.js'
import Utils from '@/utils/utils.js'
import asyncComponent from '@/utils/asyncComponent'
import MKEmitter from '@/utils/events.js'
@@ -48,7 +47,8 @@
timestamp: '',
n_id: '',
focusId: '',
- reFocusId: ''
+ reFocusId: '',
+ dict: window.GLOB.dict
}
record = {}
@@ -56,6 +56,7 @@
componentDidMount () {
const { action, unload } = this.props
+ const { dict } = this.state
let data = {}
let BData = {}
@@ -80,7 +81,18 @@
}
formlist = formlist.filter(item => {
+ if (item.type === 'hint') {
+ if (item.field && data[item.field.toLowerCase()]) {
+ item.message = data[item.field.toLowerCase()]
+ }
+ delete item.field
+ }
+
if (item.supField) { // 澶氬眰琛ㄥ崟鎺у埗
+ if (['hint', 'split', 'formula'].includes(item.type)) {
+ item.field = item.uuid
+ fieldMap.set(item.field, item)
+ }
let supvals = []
if (item.supvalue) {
item.supvalue.split(',').forEach(val => {
@@ -115,14 +127,8 @@
}
}
- if (item.type === 'split' || item.type === 'formula') return true
- if (item.type === 'hint') {
- if (item.field && data[item.field.toLowerCase()]) {
- item.message = data[item.field.toLowerCase()]
- }
- delete item.field
- return true
- } else if (item.type === 'date') {
+ if (['hint', 'split', 'formula'].includes(item.type)) return true
+ if (item.type === 'date') {
item.precision = item.precision || 'day'
} else if (item.type === 'datetime') {
item.type = 'date'
@@ -143,6 +149,7 @@
item.readin = item.readin !== 'false' && item.readin !== 'top'
item.readonly = check || item.readonly === 'true'
item.writein = item.writein !== 'false'
+ item.defHidden = item.hidden === 'true'
item.hidden = item.hidden === 'true'
item.fieldlength = item.fieldlength || 50
@@ -262,6 +269,12 @@
} else {
newval = item.closeVal
}
+ } else if (item.type === 'popSelect') {
+ if (newval && newval !== '$empty') {
+ item.showValue = data[item.showField.toLowerCase()] || ''
+ } else {
+ item.showValue = ''
+ }
}
if (newval !== '$empty') {
@@ -303,14 +316,14 @@
if (item.required === 'true') {
item.rules.push({
required: true,
- message: item.label + '涓嶅彲涓虹┖!'
+ message: item.label + (dict['not_empty'] || '涓嶅彲涓虹┖锛�')
})
}
item.rules.push({
validator: (rule, value, callback) => {
if (/'/.test(value)) {
- callback('涓嶅彲浣跨敤鑻辨枃鐘舵�佺殑鍗曞紩鍙凤紒')
+ callback(dict['single_quot'] || '涓嶅彲浣跨敤鑻辨枃鐘舵�佺殑鍗曞紩鍙凤紒')
// } else if (/--/.test(value)) {
// callback('涓嶅彲浣跨敤 -- 锛�')
} else {
@@ -322,7 +335,7 @@
if (!item.lenControl || item.lenControl === 'limit') {
item.rules.push({
max: item.fieldlength,
- message: formRule.input.formMessage.replace('@max', item.fieldlength)
+ message: (dict['max_char'] || '鏈�澶欯max涓瓧绗�').replace('@max', item.fieldlength)
})
}
@@ -334,7 +347,7 @@
}
item.rules.push({
pattern: reg,
- message: item.regularText || formRule.input.numbermsg
+ message: item.regularText || dict['enter_num'] || '璇疯緭鍏ユ暟瀛楋紒'
})
} else if (item.regular === 'letter') {
let reg = /^[a-zA-Z]*$/
@@ -343,7 +356,7 @@
}
item.rules.push({
pattern: reg,
- message: item.regularText || formRule.input.lettermsg
+ message: item.regularText || dict['enter_letter'] || '璇疯緭鍏ュ瓧姣嶏紒'
})
} else if (item.regular === 'letter_number') {
let reg = /^[a-zA-Z0-9]*$/
@@ -352,7 +365,7 @@
}
item.rules.push({
pattern: reg,
- message: item.regularText || '璇疯緭鍏ユ暟瀛楁垨瀛楁瘝'
+ message: item.regularText || dict['enter_num_letter'] || '璇疯緭鍏ユ暟瀛楁垨瀛楁瘝'
})
} else if (item.regular === 'letter&number') {
let reg = /^[a-zA-Z0-9@_.]*$/
@@ -361,31 +374,33 @@
}
item.rules.push({
pattern: reg,
- message: item.regularText || '璇疯緭鍏ユ暟瀛椼�佸瓧姣嶄互鍙夽_.'
+ message: item.regularText || dict['enter_num_letter_char'] || '璇疯緭鍏ユ暟瀛椼�佸瓧姣嶄互鍙夽_.'
})
} else if (item.regular === 'phone') {
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 || '璇锋纭緭鍏ユ墜鏈哄彿'
+ message: item.regularText || dict['phone_error'] || '璇锋纭緭鍏ユ墜鏈哄彿'
})
} else if (item.regular === 'email') {
item.rules.push({
pattern: /^([a-zA-Z0-9._-])+@([a-zA-Z0-9_-])+(\.[a-zA-Z0-9_-])+/,
- message: item.regularText || '璇锋纭緭鍏ラ偖绠卞湴鍧�'
+ message: item.regularText || dict['email_error'] || '璇锋纭緭鍏ラ偖绠卞湴鍧�'
})
}
}
} else if (item.type === 'number') {
item.rules = [{
required: true,
- message: item.label + '涓嶅彲涓虹┖!'
+ message: item.label + (dict['not_empty'] || '涓嶅彲涓虹┖锛�')
}]
- if (typeof(item.min) === 'number' || typeof(item.max) === 'number') {
+ if (typeof(item.min) === 'number' || typeof(item.max) === 'number' || item.notZero === 'true') {
item.rules.push({
validator: (rule, value, callback) => {
if (isNaN(value)) {
callback()
+ } else if (item.notZero === 'true' && value === 0) {
+ callback(item.label + (dict['not_zero'] || '涓嶅彲涓�0'))
} else if (typeof(item.min) === 'number' && value < item.min) {
if (item.min < 1e-6) {
if (item.min === 1e-6) {
@@ -404,10 +419,10 @@
callback(item.label + '鏈�灏忓�间负 ' + item.min)
}
} else {
- callback(item.label + '鏈�灏忓�间负 ' + item.min)
+ callback(item.label + (dict['less_limit'] || '鏈�灏忓�间负 ') + item.min)
}
} else if (typeof(item.max) === 'number' && value > item.max) {
- callback(item.label + '鏈�澶у�间负 ' + item.max)
+ callback(item.label + (dict['max_limit'] || '鏈�澶у�间负 ') + item.max)
} else {
callback()
}
@@ -418,14 +433,14 @@
if (item.required === 'true') {
item.rules.push({
required: true,
- message: item.label + '涓嶅彲涓虹┖!'
+ message: item.label + (dict['not_empty'] || '涓嶅彲涓虹┖锛�')
})
}
item.rules.push({
validator: (rule, value, callback) => {
if (/'/.test(value)) {
- callback('涓嶅彲浣跨敤鑻辨枃鐘舵�佺殑鍗曞紩鍙凤紒')
+ callback(dict['single_quot'] || '涓嶅彲浣跨敤鑻辨枃鐘舵�佺殑鍗曞紩鍙凤紒')
// } else if (/--/.test(value)) {
// callback('涓嶅彲浣跨敤 -- 锛�')
} else {
@@ -434,32 +449,38 @@
}
}, {
max: item.fieldlength,
- message: formRule.input.formMessage.replace('@max', item.fieldlength)
+ message: (dict['max_char'] || '鏈�澶欯max涓瓧绗�').replace('@max', item.fieldlength)
})
} else if (item.type === 'brafteditor') {
if (item.required === 'true') {
item.rules.push({
required: true,
- message: item.label + '涓嶅彲涓虹┖!'
+ message: item.label + (dict['not_empty'] || '涓嶅彲涓虹┖锛�')
})
}
item.rules.push({
max: item.fieldlength,
- message: formRule.input.formMessage.replace('@max', item.fieldlength)
+ message: (dict['max_char'] || '鏈�澶欯max涓瓧绗�').replace('@max', item.fieldlength)
})
} else if (item.type === 'linkMain' || item.type === 'vercode') {
if (item.required === 'true') {
item.rules.push({
required: true,
- message: item.label + '涓嶅彲涓虹┖!'
+ message: item.label + (dict['not_empty'] || '涓嶅彲涓虹┖锛�')
})
}
} else {
if (item.required === 'true') {
item.rules.push({
required: true,
- message: '璇烽�夋嫨' + item.label + '!'
+ message: (dict['select_tip'] || '璇烽�夋嫨') + item.label + '!'
+ })
+ }
+ if (['cascader', 'checkbox', 'checkcard', 'fileupload', 'multiselect'].includes(item.type) && item.fieldlength) {
+ item.rules.push({
+ max: item.fieldlength,
+ message: (dict['max_char'] || '鏈�澶欯max涓瓧绗�').replace('@max', item.fieldlength)
})
}
}
@@ -486,7 +507,7 @@
let _hidden = false
- if (supItem.hidden) {
+ if (supItem.hidden && !supItem.defHidden) {
_hidden = true
} else {
let box = [...item.values]
@@ -524,7 +545,7 @@
cell.labelCol = {style: {width: cell.labelwidth + '%'}}
cell.wrapperCol = {style: {width: (100 - cell.labelwidth) + '%'}}
}
- if (!cell.field || !fieldMap.has(cell.field)) return cell
+ if (!cell.field || !fieldMap.has(cell.field) || ['hint', 'split', 'formula'].includes(cell.type)) return cell
let item = fieldMap.get(cell.field)
// 涓嬬骇琛ㄥ崟鎺у埗-瀛楁鍐欏叆
@@ -533,7 +554,7 @@
item.subFields = []
item.linkSubField.forEach(m => {
let n = fieldMap.get(m)
- if (n && ['text', 'number', 'textarea'].includes(n.type)) {
+ if (n && ['text', 'number', 'textarea', 'select'].includes(n.type)) {
item.subFields.push({
uuid: n.uuid,
field: m
@@ -556,7 +577,7 @@
item.subFields = []
item.linkSubField.forEach(m => {
let n = fieldMap.get(m)
- if (n && ['text', 'number', 'textarea'].includes(n.type)) {
+ if (n && ['text', 'number', 'textarea', 'select'].includes(n.type)) {
item.subFields.push({
uuid: n.uuid,
field: m
@@ -576,7 +597,7 @@
item.subFields = []
item.linkSubField.forEach(m => {
let n = fieldMap.get(m)
- if (n && ['text', 'number', 'textarea'].includes(n.type)) {
+ if (n && ['text', 'number', 'textarea', 'select'].includes(n.type)) {
item.subFields.push({
uuid: n.uuid,
field: m
@@ -588,7 +609,7 @@
item.subFields = []
item.linkSubField.forEach(m => {
let n = fieldMap.get(m)
- if (n && ['text', 'number', 'textarea'].includes(n.type)) {
+ if (n && ['text', 'number', 'textarea', 'select'].includes(n.type)) {
item.subFields.push({
uuid: n.uuid,
field: m
@@ -605,7 +626,11 @@
item.supInitVal = ''
if (fieldMap.has(item.linkField)) {
- item.supInitVal = fieldMap.get(item.linkField).initval || ''
+ let supitem = fieldMap.get(item.linkField)
+ item.supInitVal = supitem.initval || ''
+ if (supitem.$first) {
+ item.$resetSup = true
+ }
} else if (data.hasOwnProperty(item.linkField.toLowerCase())) {
item.supInitVal = data[item.linkField.toLowerCase()]
}
@@ -724,6 +749,7 @@
if (action.subButton && action.subButton.resetForms) {
MKEmitter.addListener('resetForms', this.resetForms)
}
+ MKEmitter.addListener('resetFocus', this.resetFocus)
}
componentWillUnmount () {
@@ -731,6 +757,27 @@
return
}
MKEmitter.removeListener('resetForms', this.resetForms)
+ MKEmitter.removeListener('resetFocus', this.resetFocus)
+ }
+
+ resetFocus = (id, field) => {
+ const { action } = this.props
+
+ if (id !== action.uuid) return
+
+ let focusId = ''
+
+ this.state.formlist.forEach(item => {
+ if (item.field === field) {
+ focusId = item.uuid
+ }
+ })
+
+ if (!focusId) return
+
+ setTimeout(() => {
+ MKEmitter.emit('mkFC', 'focus', focusId)
+ }, 20)
}
resetForms = (id, data) => {
@@ -851,9 +898,13 @@
}
if (param.LText) {
- param.LText = Utils.formatOptions(param.LText)
+ if (window.GLOB.execType === 'x') {
+ param.exec_type = 'x'
+ }
+
+ param.LText = Utils.formatOptions(param.LText, param.exec_type)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.secretkey = Utils.encrypt(window.GLOB.execType === 'x' ? '' : param.LText, param.timestamp)
if (window.GLOB.mkHS) { // 浜戠鏁版嵁楠岃瘉
param.open_key = Utils.encryptOpenKey(param.secretkey, param.timestamp)
@@ -886,9 +937,13 @@
}
if (mainparam.LText) {
- mainparam.LText = Utils.formatOptions(mainparam.LText)
+ if (window.GLOB.execType === 'x') {
+ mainparam.exec_type = 'x'
+ }
+
+ mainparam.LText = Utils.formatOptions(mainparam.LText, mainparam.exec_type)
mainparam.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- mainparam.secretkey = Utils.encrypt(mainparam.LText, mainparam.timestamp)
+ mainparam.secretkey = Utils.encrypt(window.GLOB.execType === 'x' ? '' : mainparam.LText, mainparam.timestamp)
if (window.GLOB.mainSystemApi) {
mainparam.rduri = window.GLOB.mainSystemApi
@@ -950,10 +1005,14 @@
if (window.GLOB.debugger) {
console.info(param.LText)
}
+
+ if (window.GLOB.execType === 'x') {
+ param.exec_type = 'x'
+ }
- param.LText = Utils.formatOptions(param.LText)
+ param.LText = Utils.formatOptions(param.LText, param.exec_type)
param.timestamp = moment().format('YYYY-MM-DD HH:mm:ss')
- param.secretkey = Utils.encrypt(param.LText, param.timestamp)
+ param.secretkey = Utils.encrypt(window.GLOB.execType === 'x' ? '' : param.LText, param.timestamp)
if (form.database === 'sso' && window.GLOB.mainSystemApi) {
param.rduri = window.GLOB.mainSystemApi
@@ -1063,7 +1122,11 @@
// if (item.type === 'link') {
if (item.linkField) {
- item.options = item.oriOptions.filter(option => option.ParentID === item.supInitVal || option.value === '')
+ let supInitVal = item.supInitVal
+ if (item.$resetSup) {
+ supInitVal = this.record[item.linkField]
+ }
+ item.options = item.oriOptions.filter(option => option.ParentID === supInitVal || option.value === '')
// } else if (['select', 'radio', 'checkbox', 'checkcard', 'multiselect'].includes(item.type)) {
} else {
item.options = item.oriOptions
@@ -1205,11 +1268,17 @@
if (item.hidden) return
if (item.type === 'split') {
- fields.push(
- <Col span={24} key={index}>
- <p className="mk-form-split-line" style={item.style}>{item.label}</p>
- </Col>
- )
+ if (item.opacity === 'false') {
+ fields.push(
+ <div key={index}></div>
+ )
+ } else {
+ fields.push(
+ <Col span={24} key={index}>
+ <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}>
@@ -1257,7 +1326,7 @@
} else if (item.type === 'radio') {
content = (<MKRadio config={item} onChange={(val, other) => this.recordChange({[item.field]: val, ...other}, item)}/>)
} else if (item.type === 'date' || item.type === 'datemonth') {
- content = (<MKDatePicker config={item} onChange={(val) => this.recordChange({[item.field]: val})} />)
+ content = (<MKDatePicker config={item} onChange={(val) => this.recordChange({[item.field]: val})} onSubmit={this.props.inputSubmit}/>)
} else if (item.type === 'fileupload') {
className = item.readonly ? 'readonly' : ''
className += item.fileType === 'picture-card' ? ' file-upload' : ''
@@ -1312,7 +1381,7 @@
let record = {...this.record, ...values}
formlist.forEach(item => {
- if (!item.field) return
+ if (!item.field || ['hint', 'split', 'formula'].includes(item.type)) return
let _item = {
type: item.type,
@@ -1345,6 +1414,20 @@
console.warn(e)
_item.value = ''
}
+ } else if (item.interception === 'charTure') {
+ let str = _item.value.replace(/(^\s*|\s*$)/g, '')
+ let result = ''
+ for (let i = 0 ; i < str.length; i++) {
+ let code = str.charCodeAt(i)
+ if (code >= 65281 && code <= 65373) {
+ result += String.fromCharCode(str.charCodeAt(i) - 65248)
+ } else if (code === 12288) {
+ result += String.fromCharCode(str.charCodeAt(i) - 12288 + 32)
+ } else {
+ result += str.charAt(i)
+ }
+ }
+ _item.value = result
} else {
_item.value = _item.value.replace(/(^\s*|\s*$)/g, '')
}
--
Gitblit v1.8.0