From f2f059007551e01399f4df1afc82ec0abc489a43 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 08 十一月 2023 21:44:19 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/popview/index.jsx | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/src/tabviews/custom/popview/index.jsx b/src/tabviews/custom/popview/index.jsx
index f7e15a4..aa089dc 100644
--- a/src/tabviews/custom/popview/index.jsx
+++ b/src/tabviews/custom/popview/index.jsx
@@ -524,6 +524,18 @@
}
}
+ if (group.subButton.verify && group.subButton.verify.invalid === 'true') {
+ if (item.wrap.datatype === 'static') {
+ group.subButton.verify.invalid = 'false'
+ } else if (group.subButton.intertype !== 'system' && group.subButton.procMode !== 'system') {
+ group.subButton.verify.invalid = 'false'
+ } else if (group.subButton.sqlType === 'insert') {
+ group.subButton.verify.invalid = 'false'
+ } else if (group.subButton.Ot === 'notRequired') {
+ group.subButton.verify.invalid = 'false'
+ }
+ }
+
group.fields = group.fields.map(cell => {
// 鏁版嵁婧恠ql璇彞锛岄澶勭悊锛屾潈闄愰粦鍚嶅崟瀛楁璁剧疆涓洪殣钘忚〃鍗�
if (['select', 'link', 'multiselect', 'radio', 'checkbox', 'checkcard'].includes(cell.type) && cell.resourceType === '1') {
@@ -625,6 +637,18 @@
} else if (item.type === 'balcony' || item.subtype === 'propcard') {
cell.errorType = 'error2'
}
+ }
+ }
+
+ if (cell.verify && cell.verify.invalid === 'true') {
+ if (item.wrap && item.wrap.datatype === 'static') {
+ cell.verify.invalid = 'false'
+ } else if (cell.sqlType === 'insert') {
+ cell.verify.invalid = 'false'
+ } else if (cell.Ot === 'notRequired') {
+ cell.verify.invalid = 'false'
+ } else if (cell.intertype !== 'system' && cell.procMode !== 'system') {
+ cell.verify.invalid = 'false'
}
}
@@ -740,6 +764,7 @@
if (component.setting.interType !== 'system') { // 涓嶄娇鐢ㄧ郴缁熷嚱鏁版椂
component.setting.sync = 'false'
+ component.setting.dataresource = ''
component.setting.laypage = component.setting.laypage === 'true'
return component
}
--
Gitblit v1.8.0