From 06a670976e2145a10ea05207041d3cf3164cd380 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 二月 2024 18:13:25 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/tabviews/custom/popview/index.jsx | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/src/tabviews/custom/popview/index.jsx b/src/tabviews/custom/popview/index.jsx
index eb22032..403cace 100644
--- a/src/tabviews/custom/popview/index.jsx
+++ b/src/tabviews/custom/popview/index.jsx
@@ -323,13 +323,6 @@
}
}
- // 鎼滅储鏉′欢鍒濆鍖�
- if (item.search) {
- Utils.initSearchVal(item)
-
- item.$searches = Utils.initMainSearch(item.search)
- }
-
if (item.wrap && item.wrap.supType === 'multi') { // 鏁版嵁鍗″涓婄骇缁勪欢
item.setting.supModule = item.supNodes[0].componentId
} else if (item.setting && item.setting.supModule && typeof(item.setting.supModule) !== 'string') {
@@ -339,6 +332,13 @@
} else {
item.setting.supModule = ''
}
+ }
+
+ // 鎼滅储鏉′欢鍒濆鍖�
+ if (item.search) {
+ Utils.initSearchVal(item)
+
+ item.$searches = Utils.initMainSearch(item.search)
}
// 鏉冮檺杩囨护
@@ -608,7 +608,7 @@
}
if (cell.OpenType === 'excelOut') { // 瀵煎嚭
- cell.$menuName = item.name
+ cell.$menuName = item.$menuname
if (!cell.verify || !cell.verify.columns || cell.verify.columns.length === 0) {
cell.errorType = 'error1'
@@ -636,12 +636,24 @@
}
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)
+ let script = cell.verify.pre_func
+ if (!/#position-/.test(script) || /#position-init/.test(script)) {
+ try {
+ // eslint-disable-next-line
+ let func = new Function('btn', 'position', 'systemType', script)
+ func(cell, 'init', window.GLOB.systemType)
+ } catch (e) {
+ console.warn(e)
+ }
+ }
+ if (/#position-inner/.test(script)) {
+ cell.$innerScript = script
+ }
+ if (/#position-outer/.test(script)) {
+ cell.$outerScript = script
+ }
+ if (/#position-callback/.test(script)) {
+ cell.$callbackScript = script
}
}
--
Gitblit v1.8.0