From d712ae0a0d338bdc96c463c9ffe42f8c844f3c37 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 02 三月 2023 12:46:57 +0800
Subject: [PATCH] Merge branch 'master' into positec

---
 src/menu/components/form/step-form/options.jsx |   30 +++++++++++++++++++++++++++++-
 1 files changed, 29 insertions(+), 1 deletions(-)

diff --git a/src/menu/components/form/step-form/options.jsx b/src/menu/components/form/step-form/options.jsx
index 48f3daf..3d87ab2 100644
--- a/src/menu/components/form/step-form/options.jsx
+++ b/src/menu/components/form/step-form/options.jsx
@@ -61,6 +61,7 @@
         {value: 'static', label: '闈欐��'},
       ],
       controlFields: [
+        {field: 'empty', values: ['dynamic']},
         {field: 'supModule', values: ['static']},
       ]
     },
@@ -84,8 +85,22 @@
       options: [
         {value: 'show', label: '鏄剧ず'},
         {value: 'hidden', label: '闅愯棌'},
-      ]
+      ],
+      // controlFields: [
+      //   {field: 'labelSize', values: ['show']},
+      // ]
     },
+    // {
+    //   type: 'number',
+    //   field: 'labelSize',
+    //   label: '鍚嶇О澶у皬',
+    //   initval: wrap.labelSize || '',
+    //   tooltip: '鍒嗙粍鍚嶇О瀛椾綋澶у皬銆�',
+    //   min: 12,
+    //   max: 50,
+    //   precision: 0,
+    //   required: false
+    // },
     {
       type: 'radio',
       field: 'tabtype',
@@ -122,6 +137,19 @@
     },
     {
       type: 'radio',
+      field: 'empty',
+      label: '绌哄�奸殣钘�',
+      initval: wrap.empty || 'show',
+      tooltip: '褰撴煡璇㈡暟鎹负绌烘椂锛岄殣钘忚缁勪欢銆�',
+      required: false,
+      skip: true,
+      options: [
+        {value: 'show', label: '鍚�'},
+        {value: 'hidden', label: '鏄�'},
+      ],
+    },
+    {
+      type: 'radio',
       field: 'permission',
       label: '鏉冮檺楠岃瘉',
       initval: wrap.permission || 'false',

--
Gitblit v1.8.0