From af6486b3629d23e426ce85b87dbc20dfa15b1afe Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 07 十一月 2022 18:50:27 +0800
Subject: [PATCH] 2022-11-07

---
 src/mob/components/menubar/normal-menubar/menucomponent/options.jsx |  106 +++++++++++++++++++++++++++++++++++------------------
 1 files changed, 70 insertions(+), 36 deletions(-)

diff --git a/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx b/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx
index f69c651..8e189c7 100644
--- a/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx
+++ b/src/mob/components/menubar/normal-menubar/menucomponent/options.jsx
@@ -1,7 +1,7 @@
 /**
  * @description Setting琛ㄥ崟閰嶇疆淇℃伅
  */
-export default function (setting) {
+export default function (setting, columns) {
   let menulist = sessionStorage.getItem('appMenus')
 
   if (menulist) {
@@ -22,26 +22,15 @@
       initval: setting.name || '',
       required: true
     },
+    // {
+    //   type: 'text',
+    //   field: 'MenuNo',
+    //   label: '鑿滃崟鍙傛暟',
+    //   initval: setting.MenuNo || '',
+    //   required: true
+    // },
     {
-      type: 'text',
-      field: 'MenuNo',
-      label: '鑿滃崟鍙傛暟',
-      initval: setting.MenuNo || '',
-      required: true
-    },
-    {
-      type: 'number',
-      field: 'width',
-      label: '瀹藉害',
-      initval: setting.width || 24,
-      tooltip: '鏍呮牸甯冨眬锛屾瘡琛岀瓑鍒嗕负24鍒椼��',
-      min: 1,
-      max: 24,
-      precision: 0,
-      required: true
-    },
-    {
-      type: 'select',
+      type: 'radio',
       field: 'type',
       label: '鑿滃崟灞炴��',
       initval: setting.type || 'menu',
@@ -49,24 +38,13 @@
       options: [
         {value: 'menu', label: '鑿滃崟'},
         {value: 'linkmenu', label: '鍏宠仈鑿滃崟'},
-        {value: 'sysmenu', label: '绯荤粺椤�'},
         {value: 'link', label: '閾炬帴'},
       ],
       controlFields: [
-        {field: 'sysmenu', values: ['sysmenu']},
         {field: 'copyMenuId', values: ['menu']},
         {field: 'linkMenuId', values: ['linkmenu']},
         {field: 'linkurl', values: ['link']},
-      ]
-    },
-    {
-      type: 'select',
-      field: 'sysmenu',
-      label: '绯荤粺椤甸潰',
-      initval: setting.sysmenu || '',
-      required: true,
-      options: [
-        {value: 'AIService', label: '鏅鸿兘瀹㈡湇'},
+        {field: 'primaryId', values: ['menu', 'linkmenu']},
       ]
     },
     {
@@ -74,9 +52,25 @@
       field: 'copyMenuId',
       label: '澶嶅埗鑿滃崟',
       initval: setting.copyMenuId || '',
-      tooltip: '澶嶅埗鑿滃崟浠呭湪褰撳墠鑿滃崟鍒濆鍖栨椂鏈夋晥銆�',
+      tooltip: '澶嶅埗鑿滃崟浠呭湪褰撳墠鑿滃崟鍒涘缓鏃舵湁鏁堛��',
       required: false,
-      options: menulist
+      options: menulist,
+      extendName: 'MenuNo',
+      controlFields: [
+        {field: 'clearMenu', notNull: true},
+      ],
+    },
+    {
+      type: 'radio',
+      field: 'clearMenu',
+      label: '娓呯┖鍏宠仈鑿滃崟',
+      initval: setting.clearMenu || 'true',
+      tooltip: '澶嶅埗鑿滃崟鏃讹紝鏄惁娓呯┖鍘熼〉闈腑鐨勫叧鑱旇彍鍗曘��',
+      required: false,
+      options: [
+        {value: 'true', label: '鏄�'},
+        {value: 'false', label: '鍚�'}
+      ]
     },
     {
       type: 'select',
@@ -84,7 +78,12 @@
       label: '鍏宠仈鑿滃崟',
       initval: setting.linkMenuId || '',
       required: true,
-      options: menulist
+      extendName: 'MenuNo',
+      options: [
+        ...menulist,
+        // {value: 'IM', label: '鍗虫椂閫氫俊锛堢郴缁熼〉锛�'},
+        {value: 'AIService', label: '鏅鸿兘瀹㈡湇锛堢郴缁熼〉锛�'}
+      ]
     },
     {
       type: 'textarea',
@@ -123,11 +122,22 @@
     },
     {
       type: 'number',
+      field: 'width',
+      label: '瀹藉害',
+      initval: setting.width || 24,
+      tooltip: '鏍呮牸甯冨眬锛屾瘡琛岀瓑鍒嗕负24鍒椼��',
+      min: 1,
+      max: 24,
+      precision: 0,
+      required: true
+    },
+    {
+      type: 'number',
       field: 'iconFont',
       label: '瀛椾綋澶у皬',
       initval: setting.iconFont || 20,
       min: 12,
-      max: 200,
+      max: 300,
       precision: 0,
       required: true
     },
@@ -140,6 +150,13 @@
       max: 200,
       precision: 0,
       required: true
+    },
+    {
+      type: 'styleInput',
+      field: 'borderRadius',
+      label: '鍦嗚',
+      initval: setting.borderRadius || '15%',
+      required: false
     },
     {
       type: 'color',
@@ -173,6 +190,23 @@
       precision: 0,
       required: false
     },
+    {
+      type: 'select',
+      field: 'tip',
+      label: '鎻愮ず',
+      initval: setting.tip || '',
+      tooltip: '缁戝畾鎻愮ず瀛楁鍚庯紝浼氬湪鑿滃崟鍙充笂瑙掓樉绀虹孩鑹叉爣璁般��',
+      required: false,
+      options: columns
+    },
+    {
+      type: 'text',
+      field: 'primaryId',
+      label: '闈欐�佷富閿��',
+      initval: setting.primaryId || '',
+      tooltip: '鍙綔涓築ID浼犲埌涓嬩竴椤甸潰銆�',
+      required: false
+    }
   ]
 
   return menuWrapForm

--
Gitblit v1.8.0