From c56dd9479e4c44af4b58c5a14c6f0f3f3cc20d85 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 05 三月 2025 15:37:20 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/zshare/mutilform/index.jsx | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index fbc3454..b604438 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -193,12 +193,21 @@
if (['select', 'link', 'radio', 'checkbox', 'checkcard', 'multiselect', 'cascader'].includes(item.type)) {
item.options = item.options || []
- item.options = item.options.filter(cell => {
- cell.value = cell.Value
- cell.label = cell.Text
-
- return !cell.Hide
- })
+ item.$select = true
+ if (item.type === 'checkcard') {
+ item.options = item.options.filter(cell => {
+ cell.$value = cell.$value + ''
+ return !cell.Hide
+ })
+ } else {
+ item.options = item.options.filter(cell => {
+ cell.value = cell.Value + ''
+ cell.label = cell.Text
+
+ return !cell.Hide
+ })
+ }
+
if (item.setAll === 'true' && ['select', 'link', 'radio'].includes(item.type)) { // 娣诲姞绌哄��
item.options.unshift({
key: Utils.getuuid(),
@@ -309,6 +318,8 @@
newval = ''
}
}
+ } else if (item.$select && item.resourceType === '0') {
+ newval = newval + ''
}
if (newval !== '$empty') {
@@ -321,7 +332,7 @@
if (isNaN(item.initval) || item.initval === '') {
item.initval = 0
}
- } else if (['select', 'link', 'radio', 'checkbox', 'checkcard', 'multiselect', 'cascader'].includes(item.type) && item.resourceType === '1') {
+ } else if (item.$select && item.resourceType === '1') {
deForms.push(item)
} else if (item.type === 'rate') {
item.rateCount = item.rateCount || 5
--
Gitblit v1.8.0