From cc810edac6aec3c858fb352091ad8c11332447a5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 10 十二月 2023 19:12:53 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/index.jsx | 67 +++++++++++++++------------------
1 files changed, 30 insertions(+), 37 deletions(-)
diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index 6e6ddab..5af3787 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -661,6 +661,10 @@
col.linkThdMenu = ''
}
+ if (col.marks && col.marks.length === 0) {
+ col.marks = null
+ }
+
return true
})
}
@@ -772,48 +776,17 @@
} else if (item.type === 'form') {
item.subcards = item.subcards.map(group => {
group.subButton.uuid = group.uuid
- group.subButton.$menuId = group.uuid
- group.subButton.$MenuID = this.props.MenuID
- // group.subButton.$forbid = true // 涓嶅０鏄庢暟鎹簮鍙橀噺
group.subButton.OpenType = 'formSubmit'
group.subButton.execError = 'never'
- group.subButton.logLabel = item.$menuname + '-' + group.subButton.label
-
if (!group.subButton.Ot) {
group.subButton.Ot = item.wrap.datatype === 'static' ? 'notRequired' : 'requiredSgl'
}
- if (item.$process) {
- group.subButton.$process = true
- group.subButton.$flowId = 'flow' + this.props.MenuID
- }
+ group.subButton = this.resetButton(item, group.subButton)
- if (item.$cache && item.$time) {
+ if (item.$cache && item.$time) { // 琛ㄥ崟缂撳瓨
group.$cache = item.$cache
group.$time = item.$time
- }
-
- group.subButton.syncComponentId = group.subButton.syncComponent ? (group.subButton.syncComponent.pop() || '') : ''
-
- if (group.subButton.syncComponentId && group.subButton.syncComponentId === item.setting.supModule) {
- group.subButton.syncComponentId = ''
- if (group.subButton.execSuccess === 'grid') {
- group.subButton.execSuccess = 'mainline'
- }
- }
-
- if (group.subButton.verify && group.subButton.verify.invalid === 'true') {
- if (item.wrap.datatype === 'static' || item.wrap.datatype === 'public') {
- group.subButton.verify.invalid = 'false'
- } else if (item.setting && item.setting.maxScript && item.setting.maxScript >= 300) {
- 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'
- } else if (group.subButton.intertype !== 'system' && group.subButton.procMode !== 'system') {
- group.subButton.verify.invalid = 'false'
- }
}
group.fields = group.fields.map(cell => {
@@ -945,6 +918,16 @@
}
}
+ 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)
+ }
+ }
+
if (cell.syncComponentId) {
if (cell.syncComponentId === item.setting.supModule) {
cell.syncComponentId = ''
@@ -979,6 +962,10 @@
if (cell.style.display === 'inline-block') {
cell.style.verticalAlign = 'top'
+ }
+
+ if (cell.marks && cell.marks.length === 0) {
+ cell.marks = null
}
if (['text', 'number', 'formula'].includes(cell.eleType)) {
@@ -1065,6 +1052,8 @@
component.setting.arr_field = component.columns ? component.columns.map(col => col.field).join(',') : ''
component.setting.useMSearch = component.setting.useMSearch === 'true'
+ component.setting.laypage = component.setting.laypage === 'true' // 鏄惁鍒嗛〉锛岃浆涓篵oolean 缁熶竴鏍煎紡
+
if (component.setting.useMSearch) {
if (!window.GLOB.SearchBox.has(component.$searchId)) {
component.setting.useMSearch = false
@@ -1077,10 +1066,14 @@
component.setting.sync = 'false'
}
+ if (component.format === 'object') {
+ component.setting.laypage = false
+ component.setting.$top = true
+ }
+
if (component.setting.interType !== 'system') { // 涓嶄娇鐢ㄧ郴缁熷嚱鏁版椂
component.setting.sync = 'false'
component.setting.dataresource = ''
- component.setting.laypage = component.setting.laypage === 'true'
return component
}
@@ -1101,8 +1094,7 @@
delete component.scripts
component.setting.$name = component.$menuname || ''
component.setting.execute = component.setting.execute !== 'false' // 榛樿sql鏄惁鎵ц锛岃浆涓篵oolean 缁熶竴鏍煎紡
- component.setting.laypage = component.setting.laypage === 'true' // 鏄惁鍒嗛〉锛岃浆涓篵oolean 缁熶竴鏍煎紡
-
+
if (!component.setting.execute) {
component.setting.dataresource = ''
}
@@ -1218,6 +1210,8 @@
inter.setting.onload = 'false'
}
+ inter.setting.laypage = false
+ inter.setting.$top = true
inter.setting.useMSearch = inter.setting.useMSearch === 'true'
inter.setting.arr_field = inter.columns.map(col => col.field).join(',')
@@ -1241,7 +1235,6 @@
inter.setting.$name = '鍏叡鏁版嵁婧�-' + inter.setting.name
inter.setting.execute = inter.setting.execute !== 'false'
- inter.setting.laypage = true
if (!inter.setting.execute) {
inter.setting.dataresource = ''
--
Gitblit v1.8.0