From 742f7d11557526038d332e60a8c8ca18177bc4e4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 26 十月 2023 15:51:58 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/tabviews/custom/index.jsx |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/tabviews/custom/index.jsx b/src/tabviews/custom/index.jsx
index 55cf1da..7fea2ad 100644
--- a/src/tabviews/custom/index.jsx
+++ b/src/tabviews/custom/index.jsx
@@ -268,7 +268,7 @@
 
         if (param.$searchkey) {
           component.search = component.search.map(item => {
-            if (['text', 'select', 'link'].includes(item.type) && param.$searchkey === item.field) {
+            if (['text', 'select', 'link', 'checkcard'].includes(item.type) && param.$searchkey === item.field) {
               item.initval = param.$searchval
             }
   
@@ -553,7 +553,7 @@
           if (!inter) {
             item.wrap.datatype = 'static'
           } else {
-            item.setting = inter.setting
+            item.setting = {...inter.setting}
           }
         }
       }
@@ -1173,6 +1173,7 @@
     return interfaces.map(inter => {
       inter.MenuID = MenuID
       inter.setting.delay = delay
+      inter.$searchId = MenuID
       delay += 15
 
       if (inter.setting.supModule) {
@@ -1183,11 +1184,12 @@
           inter.setting.supModule = ''
         }
       }
-
+      
       if (initlimit && inter.setting.loadlevel !== 'init') {
         inter.setting.onload = 'false'
       }
 
+      inter.setting.useMSearch = inter.setting.useMSearch === 'true'
       inter.setting.arr_field = inter.columns.map(col => col.field).join(',')
 
       if (inter.setting.interType !== 'system') return inter

--
Gitblit v1.8.0