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 | 123 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 118 insertions(+), 5 deletions(-)
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index eac452a..8bcb9b5 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -69,7 +69,7 @@
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]
})
@@ -162,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
@@ -840,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)
@@ -849,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 鑾峰彇涓嬫媺琛ㄥ崟閫夐」淇℃伅
*/
@@ -873,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 ')
@@ -887,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 ')
@@ -1011,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') {
--
Gitblit v1.8.0