From da34633b25d16359cd91a656acad5e811f9972b7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 14 三月 2023 18:09:54 +0800
Subject: [PATCH] 2023-03-14

---
 src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx |   69 +++++++++++++++++++---------------
 1 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx b/src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx
index 784141f..2620f88 100644
--- a/src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx
+++ b/src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx
@@ -1,8 +1,3 @@
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
-
-const Formdict = sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
-
 /**
  * @description 鑾峰彇鍥捐〃瑙嗗浘閰嶇疆琛ㄥ崟
  * @param {object} card       // 鍥捐〃瀵硅薄
@@ -74,14 +69,13 @@
       required: true
     },
     {
-      type: 'number',
+      type: 'styleInput',
       key: 'height',
-      label: '楂樺害',
+      label: '鍥捐〃楂樺害',
       initVal: card.height,
-      min: 100,
-      max: 1000,
-      decimal: 0,
-      required: true
+      tooltip: '鍥捐〃缁樺浘鍖哄煙鐨勯珮搴︼紝涓嶅寘鎷爣棰樺強鍐呭杈硅窛銆�',
+      required: true,
+      options: ['px', 'vh', 'vw']
     },
     {
       type: 'radio',
@@ -93,7 +87,7 @@
         {value: 'true', text: '鍚敤'},
         {value: 'false', text: '绂佺敤'},
       ],
-      forbid: !appType
+      forbid: !appType || sessionStorage.getItem('editMenuType') === 'popview'
     },
     {
       type: 'select',
@@ -110,11 +104,11 @@
       key: 'click',
       label: '鐐瑰嚮浜嬩欢',
       initVal: card.click || '',
-      tooltip: '褰撶粦瀹氱偣鍑讳簨浠舵椂锛屾煴褰㈠浘鐨勫垏鎹㈠姛鑳藉皢澶辨晥銆�',
+      tooltip: '鐐瑰嚮鏌卞瓙鏃惰Е鍙戠殑浜嬩欢锛屽惎鐢ㄨ嚜瀹氫箟璁剧疆鏃舵棤鏁堛��',
       required: false,
       forbid: appType === 'mob' || card.chartType !== 'bar',
       options: [
-        {value: '', label: '鏃�'},
+        {value: '', label: '鏁版嵁鍒囨崲'},
         {value: 'menu', label: '鑿滃崟'},
         {value: 'menus', label: '鑿滃崟缁�'}
       ]
@@ -258,6 +252,8 @@
     }])
   }
 
+  let _label = card.label || 'false'
+
   return [
     {
       type: 'radio',
@@ -366,10 +362,10 @@
       required: false,
       options: [{
         value: 'true',
-        text: Formdict['model.true']
+        text: '鏄�'
       }, {
         value: 'false',
-        text: Formdict['model.false']
+        text: '鍚�'
       }]
     }, {
       type: 'radio',
@@ -389,7 +385,7 @@
       type: labelOptions.length > 20 ? 'select' : 'radio',
       key: 'label',
       label: '鏍囨敞',
-      initVal: card.label || 'false',
+      initVal: _label,
       tooltip: '鍥惧舰鑺傜偣澶勭殑鏁板�笺��',
       required: false,
       options: labelOptions
@@ -400,6 +396,7 @@
       initVal: card.labelColor || 'system',
       tooltip: '浣跨敤绯荤粺鑹叉椂锛屼娇鐢ㄨ壊绯婚�夐」璁剧疆鐨勭郴缁熼鑹诧紝浣跨敤鑷畾涔変负棰滆壊璁剧疆涓畾涔夌殑鍥惧舰棰滆壊銆�',
       required: false,
+      hidden: _label !== 'true',
       options: [{
         value: 'system',
         text: '绯荤粺'
@@ -407,20 +404,21 @@
         value: 'custom',
         text: '鑷畾涔�'
       }]
-    // }, {
-    //   type: 'radio',
-    //   key: 'offset',
-    //   label: '鏍囨敞浣嶇疆',
-    //   initVal: card.offset || 'outer',
-    //   required: false,
-    //   options: [{
-    //     value: 'outer',
-    //     text: '澶栭儴'
-    //   }, {
-    //     value: 'inner',
-    //     text: '鍐呴儴'
-    //   }],
-    //   forbid: card.chartType !== 'bar'
+    }, {
+      type: 'radio',
+      key: 'labelValue',
+      label: '鏍囨敞鍊�',
+      initVal: card.labelValue || 'default',
+      tooltip: '鏍囨敞鍊肩殑鏄剧ず瑙勫垯銆�',
+      required: false,
+      hidden: _label === 'false',
+      options: [{
+        value: 'default',
+        text: '榛樿'
+      }, {
+        value: 'zero',
+        text: '闅愯棌 0 鍊�'
+      }],
     }, {
       type: 'radio',
       key: 'adjust',
@@ -568,6 +566,15 @@
       initVal: card.max,
       required: false
     }, {
+      type: 'number',
+      key: 'XLimit',
+      min: 2,
+      label: '瀛楃闄愬埗',
+      tooltip: 'X杞存渶澶у瓧绗﹂檺鍒躲��',
+      initVal: card.XLimit || 11,
+      forbid: appType === 'mob',
+      required: false
+    }, {
       type: 'color',
       key: 'color',
       label: '鑹茬郴',

--
Gitblit v1.8.0