From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/menu/components/search/main-search/options.jsx |  134 +++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 130 insertions(+), 4 deletions(-)

diff --git a/src/menu/components/search/main-search/options.jsx b/src/menu/components/search/main-search/options.jsx
index 996e994..6d586f9 100644
--- a/src/menu/components/search/main-search/options.jsx
+++ b/src/menu/components/search/main-search/options.jsx
@@ -1,7 +1,8 @@
+import MenuUtils from '@/utils/utils-custom.js'
 /**
  * @description Wrap琛ㄥ崟閰嶇疆淇℃伅
  */
-export default function (wrap, action = []) {
+export default function (wrap, uuid) {
   let roleList = sessionStorage.getItem('sysRoles')
   let appType = sessionStorage.getItem('appType')
 
@@ -14,6 +15,9 @@
   } else {
     roleList = []
   }
+
+  let menu = window.GLOB.customMenu
+  let modules = MenuUtils.getSupModules(menu.components, uuid, menu.interfaces)
 
   const wrapForm = [
     {
@@ -36,22 +40,72 @@
       required: true
     },
     {
+      type: 'radio',
+      field: 'advanceType',
+      label: '楂樼骇鎼滅储',
+      initval: wrap.advanceType || 'modal',
+      required: false,
+      options: [
+        {value: 'modal', label: '寮圭獥'},
+        {value: 'drawer', label: '鎶藉眽'},
+        {value: 'pulldown', label: '涓嬫媺'}
+      ],
+      controlFields: [
+        {field: 'advanceWidth', values: ['modal', 'drawer']},
+        {field: 'drawerPlacement', values: ['drawer']}
+      ]
+    },
+    {
+      type: 'radio',
+      field: 'drawerPlacement',
+      label: '寮瑰嚭鏂瑰悜',
+      initval: wrap.drawerPlacement || 'right',
+      required: false,
+      options: [
+        {value: 'right', label: '鍙充晶'},
+        {value: 'left', label: '宸︿晶'},
+        {value: 'top', label: '涓婁晶'},
+        {value: 'bottom', label: '涓嬩晶'}
+      ]
+    },
+    {
       type: 'number',
       field: 'advanceWidth',
-      label: '楂樼骇鎼滅储',
+      label: '寮圭獥瀹藉害',
       initval: wrap.advanceWidth || 1000,
-      tooltip: '楂樼骇鎼滅储寮圭獥鐨勫搴︼紝娉細褰撳搴﹀�煎皬浜�100鏃惰〃绀哄崰绐楀彛鐨勭櫨鍒嗘瘮锛屽ぇ浜�100鏃惰〃绀哄搴︾殑缁濆鍊笺��',
+      tooltip: '楂樼骇鎼滅储寮圭獥鐨勫搴︼紝娉細褰撳搴﹀�煎皬浜�100鏃惰〃绀哄崰绐楀彛鐨勭櫨鍒嗘瘮锛屽ぇ浜�100鏃惰〃绀哄搴︾殑缁濆鍊笺�傚綋浣跨敤涓婁笅鏄剧ず鐨勬娊灞夋椂浠h〃鎶藉眽楂樺害銆�',
       min: 10,
       max: 3000,
       precision: 0,
       required: false
     },
     {
+      type: 'number',
+      field: 'searchRatio',
+      label: '鎸夐挳姣斾緥',
+      initval: wrap.searchRatio || 6,
+      tooltip: '鎼滅储鍙婇噸缃寜閽墍鍗犳瘮渚嬨�傛爡鏍煎竷灞�锛屾瘡琛岀瓑鍒嗕负24鍒椼��',
+      min: 1,
+      max: 24,
+      precision: 0,
+      required: true
+    },
+    {
+      type: 'number',
+      field: 'searchLwidth',
+      label: '鎸夐挳鍋忕Щ',
+      initval: wrap.searchLwidth !== undefined ? wrap.searchLwidth : 33.3,
+      tooltip: '鎼滅储鎸夐挳璺濆乏渚х殑鐧惧垎姣旓紝鍙傜収鎼滅储鏉′欢鐨勫悕绉板搴︺��',
+      min: 0,
+      max: 100,
+      precision: 1,
+      required: true
+    },
+    {
       type: 'radio',
       field: 'float',
       label: '瀵归綈',
       initval: wrap.float || 'left',
-      tooltip: '鍙冲榻愭椂锛岄殣钘忔悳绱㈡寜閽��',
       required: false,
       options: [
         {value: 'left', label: '宸﹀榻�'},
@@ -67,9 +121,81 @@
       options: [
         {value: 'true', label: '鏄剧ず'},
         {value: 'false', label: '闅愯棌'},
+      ],
+      controlFields: [
+        {field: 'borderRadius', values: ['true']},
+        {field: 'resetContrl', values: ['true']}
       ]
     },
     {
+      type: 'number',
+      field: 'borderRadius',
+      label: '鎸夐挳鍦嗚',
+      initval: wrap.borderRadius || '',
+      tooltip: '鎼滅储鍜岄噸缃寜閽殑鍦嗚銆�',
+      required: false
+    },
+    {
+      type: 'radio',
+      field: 'resetContrl',
+      label: '閲嶇疆鏃�',
+      initval: wrap.resetContrl || 'init',
+      tooltip: '鍒锋柊鑿滃崟浼氭竻绌篣RL鍙橀噺銆�',
+      required: false,
+      options: [
+        {value: 'init', label: '鎭㈠鍒濆鍊�'},
+        {value: 'clear', label: '娓呯┖'},
+        {value: 'refresh', label: '鍒锋柊鑿滃崟'},
+      ],
+    },
+    {
+      type: 'radio',
+      field: 'permission',
+      label: '鏉冮檺楠岃瘉',
+      initval: wrap.permission || 'false',
+      required: false,
+      options: [
+        {value: 'true', label: '鍚敤'},
+        {value: 'false', label: '绂佺敤'},
+      ],
+      forbid: !appType || sessionStorage.getItem('editMenuType') === 'popview'
+    },
+    {
+      type: 'radio',
+      field: 'searchSize',
+      label: '鎼滅储闂磋窛',
+      initval: wrap.searchSize || 'middle',
+      tooltip: '鎼滅储鏉′欢鐨勪笂涓嬮棿璺濄��',
+      required: false,
+      options: [
+        {value: 'middle', label: '榛樿'},
+        {value: 'small', label: '灏�'},
+      ],
+    },
+    {
+      type: 'radio',
+      field: 'cacheSearch',
+      label: '鎼滅储缂撳瓨',
+      initval: wrap.cacheSearch || 'false',
+      tooltip: '鍚敤鎼滅储鏉′欢缂撳瓨鍚庯紝鍦ㄨ彍鍗曞埛鏂版椂鎼滅储鏉′欢涓嶅彉銆�',
+      required: false,
+      options: [
+        {value: 'true', label: '鍚敤'},
+        {value: 'false', label: '绂佺敤'},
+      ],
+      forbid: !!appType
+    },
+    {
+      type: 'cascader',
+      field: 'supModule',
+      label: '涓婄骇缁勪欢',
+      initval: wrap.supModule || [],
+      required: false,
+      allowClear: true,
+      options: modules,
+      forbid: sessionStorage.getItem('editMenuType') === 'popview'
+    },
+    {
       type: 'multiselect',
       field: 'blacklist',
       label: '榛戝悕鍗�',

--
Gitblit v1.8.0