From 4d6b9f8a2d7b316633e43b489eae9ada949c07b5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 10 九月 2024 10:18:08 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/zshare/mutilform/index.jsx | 241 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 206 insertions(+), 35 deletions(-)
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 309cff6..8bcb9b5 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 = {}
@@ -68,11 +69,18 @@
let fieldMap = new Map()
let check = action.setting.formType === 'check'
- if (this.props.data) {
+ if (this.props.data && !this.props.data.$$empty) {
Object.keys(this.props.data).forEach(key => {
data[key.toLowerCase()] = this.props.data[key]
})
+ } else if (action.uuid && sessionStorage.getItem('local_' + action.uuid)) {
+ let _data = JSON.parse(sessionStorage.getItem('local_' + action.uuid))
+
+ Object.keys(_data).forEach(key => {
+ data[key.toLowerCase()] = _data[key]
+ })
}
+
if (this.props.BData) {
Object.keys(this.props.BData).forEach(key => {
BData[key.toLowerCase()] = this.props.BData[key]
@@ -145,6 +153,7 @@
// 鏁版嵁鑷姩濉厖
let readin = item.readin !== 'false'
+ item.local = item.readin === 'local'
item.readin = item.readin !== 'false' && item.readin !== 'top'
item.readonly = check || item.readonly === 'true'
item.writein = item.writein !== 'false'
@@ -153,6 +162,17 @@
item.fieldlength = item.fieldlength || 50
let key = item.field.toLowerCase()
+
+ // positecgroup 琛ㄥ崟闅愯棌
+ if (item.tooltip && /@[a-z0-9_]+@/.test(item.tooltip)) {
+ let field = item.tooltip.replace(/@|\s/ig, '').toLowerCase()
+
+ if (data[field] === 'N') {
+ item.hidden = true
+ }
+
+ item.tooltip = ''
+ }
if (item.type === 'funcvar') {
readin = false
@@ -315,14 +335,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 {
@@ -334,7 +354,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)
})
}
@@ -346,7 +366,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]*$/
@@ -355,7 +375,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]*$/
@@ -364,7 +384,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@_.]*$/
@@ -373,33 +393,35 @@
}
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 > 0 && item.min < 1e-6) {
if (item.min === 1e-6) {
callback(item.label + '鏈�灏忓�间负 0.000001')
} else if (item.min === 1e-7) {
@@ -413,13 +435,13 @@
} else if (item.min === 1e-11) {
callback(item.label + '鏈�灏忓�间负 0.00000000001')
} else {
- callback(item.label + '鏈�灏忓�间负 ' + item.min)
+ callback(item.label + (dict['less_limit'] || '鏈�灏忓�间负 ') + 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()
}
@@ -430,14 +452,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 {
@@ -446,32 +468,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)
})
}
}
@@ -545,7 +573,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
@@ -568,7 +596,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 +616,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
@@ -600,7 +628,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
@@ -617,7 +645,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()]
}
@@ -736,6 +768,7 @@
if (action.subButton && action.subButton.resetForms) {
MKEmitter.addListener('resetForms', this.resetForms)
}
+ MKEmitter.addListener('resetFocus', this.resetFocus)
}
componentWillUnmount () {
@@ -743,6 +776,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) => {
@@ -797,7 +851,9 @@
}
getFormData = (deForms) => {
- if (deForms.length === 1) {
+ if (window.backend && window.GLOB.CacheData.has('sql_' + deForms[0].uuid)) {
+ this.improveBackActionForm(deForms)
+ } else if (deForms.length === 1) {
this.improveSimpleActionForm(deForms)
} else if (!window.GLOB.mkHS && window.GLOB.sysType === 'local' && window.GLOB.systemType !== 'production') {
this.improveSimpleActionForm(deForms)
@@ -806,6 +862,106 @@
}
}
+ /**
+ * @description 鑾峰彇涓嬫媺琛ㄥ崟閫夐」淇℃伅
+ */
+ improveBackActionForm = (deForms) => {
+ const { BID, action } = this.props
+
+ let sysvals = {
+ mk_departmentcode: sessionStorage.getItem('departmentcode') || '',
+ mk_organization: sessionStorage.getItem('organization') || '',
+ mk_user_type: sessionStorage.getItem('mk_user_type') || '',
+ id: this.state.ID || '',
+ bid: BID || '',
+ datam: sessionStorage.getItem('dataM') === 'true' ? 'Y' : '',
+ datam_begin: sessionStorage.getItem('dataM') === 'true' ? 'Y' : '',
+ datam_end: sessionStorage.getItem('dataM') === 'true' ? 'Y' : ''
+ }
+ if (window.GLOB.externalDatabase !== null) {
+ sysvals.db = window.GLOB.externalDatabase
+ }
+
+ let deffers = []
+ let mainItems = [] // 浜戠鎴栧崟鐐规暟鎹�
+ let localItems = [] // 鏈湴鏁版嵁
+ let cache = action.setting.cache !== 'false' && !action.$cache
+ let skip = false
+
+ deForms.forEach(item => {
+ let ex = window.GLOB.CacheData.get('sql_' + item.uuid)
+
+ if (!ex) return
+
+ let exps = []
+ ex.reps.forEach(n => {
+ let key = n.toLowerCase()
+ if (sysvals.hasOwnProperty(key)) {
+ exps.push({
+ key: n,
+ value: sysvals[key]
+ })
+ }
+ })
+
+ let cell = {
+ id: ex.id,
+ exps: exps,
+ menuname: item.label + '锛堣〃鍗曪級',
+ md5_id: ''
+ }
+
+ if (item.database === 'sso' && window.GLOB.mainSystemApi) {
+ mainItems.push(cell)
+ } else {
+ localItems.push(cell)
+ }
+ })
+
+ if (localItems.length) {
+ deffers.push({
+ $backend: true,
+ data: localItems
+ })
+ }
+
+ if (mainItems.length) {
+ deffers.push({
+ $backend: true,
+ data: mainItems,
+ rduri: window.GLOB.mainSystemApi
+ })
+ }
+
+ if (!deffers.length) return
+
+ deffers = deffers.map(item => {
+ return new Promise(resolve => {
+ Api.getSystemCacheConfig(item, cache).then(res => {
+ if (!res.status) {
+ notification.warning({
+ top: 92,
+ message: res.message,
+ duration: 5
+ })
+ skip = true
+ }
+ resolve(res)
+ })
+ })
+ })
+
+ Promise.all(deffers).then(response => {
+ let result = {...response[0], ...(response[1] || {})}
+
+ delete result.ErrCode
+ delete result.ErrMesg
+ delete result.message
+ delete result.status
+
+ this.resetFormList(result, skip)
+ })
+ }
/**
* @description 鑾峰彇涓嬫媺琛ㄥ崟閫夐」淇℃伅
*/
@@ -830,7 +986,7 @@
sql = sql.replace(/@BID@/ig, `'${BID}'`)
if (window.GLOB.debugger === true) {
- console.info(sql)
+ window.mkInfo(sql)
}
sql = sql.replace(/%/ig, ' mpercent ')
@@ -844,7 +1000,7 @@
sql = sql.replace(/@BID@/ig, `'${BID}'`)
if (window.GLOB.debugger === true) {
- console.info(sql)
+ window.mkInfo(sql)
}
sql = sql.replace(/%/ig, ' mpercent ')
@@ -968,7 +1124,7 @@
param.LText = param.LText.replace(/@BID@/ig, `'${this.props.BID || ''}'`)
if (window.GLOB.debugger) {
- console.info(param.LText)
+ window.mkInfo(param.LText)
}
if (window.GLOB.execType === 'x') {
@@ -1087,7 +1243,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
@@ -1329,6 +1489,7 @@
}
handleConfirm = (formId) => {
+ const { action } = this.props
const { formlist, send_type, timestamp, n_id } = this.state
// 琛ㄥ崟鎻愪氦鏃舵鏌ヨ緭鍏ュ�兼槸鍚︽纭�
@@ -1340,6 +1501,7 @@
}
let forms = []
let record = {...this.record, ...values}
+ let locals = null
formlist.forEach(item => {
if (!item.field || ['hint', 'split', 'formula'].includes(item.type)) return
@@ -1436,12 +1598,21 @@
value: n_id || ''
})
}
+
+ if (item.local) {
+ locals = locals || {}
+ locals[item.field] = _item.value
+ }
forms.push(_item)
})
this.submitId = formId || ''
+ if (locals) {
+ sessionStorage.setItem('local_' + action.uuid, JSON.stringify(locals))
+ }
+
resolve(forms)
})
})
--
Gitblit v1.8.0