From c0e017668d780c40f85230f227ea0160b5d22d4d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 20 二月 2024 14:13:00 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/zshare/mutilform/index.jsx | 55 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 39 insertions(+), 16 deletions(-)
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 2736082..5bf91e8 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -80,7 +80,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 +126,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'
@@ -272,6 +277,12 @@
newval = item.openVal
} else {
newval = item.closeVal
+ }
+ } else if (item.type === 'popSelect') {
+ if (newval && newval !== '$empty') {
+ item.showValue = data[item.showField.toLowerCase()] || ''
+ } else {
+ item.showValue = ''
}
}
@@ -535,7 +546,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)
// 涓嬬骇琛ㄥ崟鎺у埗-瀛楁鍐欏叆
@@ -862,9 +873,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)
@@ -897,9 +912,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
@@ -961,10 +980,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
@@ -1323,7 +1346,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,
--
Gitblit v1.8.0