From 0eb129a9beddbb86ae74d7106a8e60823206b8d5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 14 十二月 2023 11:29:15 +0800
Subject: [PATCH] 2023-12-14
---
src/tabviews/basetable/index.jsx | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/src/tabviews/basetable/index.jsx b/src/tabviews/basetable/index.jsx
index 565fea4..f2dd7d0 100644
--- a/src/tabviews/basetable/index.jsx
+++ b/src/tabviews/basetable/index.jsx
@@ -409,6 +409,11 @@
}
}
}
+
+ if (cell.marks && cell.marks.length === 0) {
+ cell.marks = null
+ }
+
return true
})
@@ -422,6 +427,10 @@
col.linkThdMenu = window.GLOB.mkThdMenus.get(menu_id) || ''
} else {
col.linkThdMenu = ''
+ }
+
+ if (col.marks && col.marks.length === 0) {
+ col.marks = null
}
return true
@@ -481,6 +490,28 @@
cell.errorType = 'error1'
} else if (cell.intertype === 'system' && cell.verify.dataType !== 'custom' && item.setting.interType !== 'system') {
cell.errorType = 'error2'
+ }
+ }
+
+ if (cell.verify && cell.verify.invalid === 'true') {
+ if (item.setting.maxScript && item.setting.maxScript >= 300) {
+ cell.verify.invalid = 'false'
+ } else if (cell.intertype !== 'system' && cell.procMode !== 'system') {
+ cell.verify.invalid = 'false'
+ } else if (cell.sqlType === 'insert') {
+ cell.verify.invalid = 'false'
+ } else if (cell.Ot === 'notRequired') {
+ cell.verify.invalid = 'false'
+ }
+ }
+
+ if (cell.verify && cell.verify.preHandle === 'true') {
+ try {
+ // eslint-disable-next-line
+ let func = new Function('btn', 'systemType', cell.verify.pre_func)
+ func(cell, window.GLOB.systemType)
+ } catch (e) {
+ console.warn(e)
}
}
@@ -557,6 +588,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