From 72419e2f826031a158173f46d723a672064e37cd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 31 八月 2021 22:42:51 +0800
Subject: [PATCH] 2021-08-31

---
 src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx |  105 +++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 99 insertions(+), 6 deletions(-)

diff --git a/src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx b/src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx
index 837e853..42099ee 100644
--- a/src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx
+++ b/src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx
@@ -135,6 +135,7 @@
  * @param {Array}  columns    // 鏄剧ず鍒�
  */
 export function getOptionForm (card, columns) {
+  let appType = sessionStorage.getItem('appType')
   let shapes = []
 
   if (card.chartType === 'line') {
@@ -161,6 +162,28 @@
 
   let xfields = columns.filter(item => /^Nvarchar/ig.test(item.datatype))
   let yfields = columns.filter(item => /^(Int|Decimal)/ig.test(item.datatype))
+
+  let labelOptions = [{
+    value: 'false',
+    text: '闅愯棌'
+  }, {
+    value: 'true',
+    text: '鏄剧ず'
+  }]
+
+  if (card.chartType === 'bar') {
+    labelOptions[1].text = '澶栭儴'
+    labelOptions.push(...[{
+      value: 'top',
+      text: '椤堕儴'
+    }, {
+      value: 'middle',
+      text: '涓棿'
+    }, {
+      value: 'bottom',
+      text: '搴曢儴'
+    }])
+  }
 
   return [
     {
@@ -289,17 +312,25 @@
         text: '鐧惧垎姣�'
       }]
     }, {
-      type: 'radio',
+      type: labelOptions.length > 20 ? 'select' : 'radio',
       key: 'label',
-      label: '鏍囨敞鍊�',
+      label: '鏍囩',
       initVal: card.label || 'false',
       required: false,
+      options: labelOptions
+    }, {
+      type: 'radio',
+      key: 'labelColor',
+      label: '鏍囩棰滆壊',
+      initVal: card.labelColor || 'system',
+      tooltip: '浣跨敤绯荤粺鑹叉椂锛屼娇鐢ㄨ壊绯婚�夐」璁剧疆鐨勭郴缁熼鑹诧紝浣跨敤鑷畾涔変负棰滆壊璁剧疆涓畾涔夌殑鍥惧舰棰滆壊銆�',
+      required: false,
       options: [{
-        value: 'true',
-        text: '鏄剧ず'
+        value: 'system',
+        text: '绯荤粺'
       }, {
-        value: 'false',
-        text: '闅愯棌'
+        value: 'custom',
+        text: '鑷畾涔�'
       }]
     // }, {
     //   type: 'radio',
@@ -334,6 +365,7 @@
       key: 'area',
       label: '闈㈢Н鍥�',
       initVal: card.area || 'false',
+      // tooltip: '浠呭湪褰㈢姸涓簊mooth鏃舵湁鏁堛��',
       required: false,
       forbid: ['bar'].includes(card.chartType),
       options: [{
@@ -373,6 +405,33 @@
         text: '鏋佸潗鏍�'
       }]
     }, {
+      type: 'radio',
+      key: 'grid',
+      label: '缃戞牸绾�',
+      initVal: card.grid || 'show',
+      required: false,
+      options: [{
+        value: 'show',
+        text: '鏄剧ず'
+      }, {
+        value: 'hidden',
+        text: '闅愯棌'
+      }]
+    }, {
+      type: 'radio',
+      key: 'y_line',
+      label: 'y杞磋竟绾�',
+      initVal: card.y_line || 'hidden',
+      tooltip: '鍥惧舰宸︿晶鎴栧彸渚х殑杈圭嚎銆�',
+      required: false,
+      options: [{
+        value: 'show',
+        text: '鏄剧ず'
+      }, {
+        value: 'hidden',
+        text: '闅愯棌'
+      }]
+    }, {
       type: 'number',
       key: 'barSize',
       label: '鏌卞舰瀹藉害',
@@ -395,11 +454,33 @@
       forbid: !['bar'].includes(card.chartType),
       required: false
     }, {
+      type: 'number',
+      key: 'min',
+      label: '鏈�灏忓��',
+      tooltip: 'y杞存渶灏忓�硷紝涓虹┖鏃惰嚜閫傚簲銆�',
+      initVal: card.min,
+      required: false
+    }, {
+      type: 'number',
+      key: 'max',
+      label: '鏈�澶у��',
+      tooltip: 'y杞存渶澶у�硷紝涓虹┖鏃惰嚜閫傚簲銆�',
+      initVal: card.max,
+      required: false
+    }, {
       type: 'color',
       key: 'color',
       label: '鑹茬郴',
       initVal: card.color || 'rgba(0, 0, 0, 0.65)',
       tooltip: '鍧愭爣杞存彁绀烘枃瀛楀強绀轰緥鐨勯鑹层��',
+      required: false
+    }, {
+      type: 'color',
+      key: 'lineColor',
+      label: '杞寸嚎棰滆壊',
+      initVal: card.lineColor,
+      tooltip: '鍧愭爣杞寸嚎鐨勯鑹诧紝鍖呮嫭x杞淬�亂杞村強缃戞牸绾裤��',
+      allowClear: true,
       required: false
     }, {
       type: 'color',
@@ -411,12 +492,24 @@
       allowClear: true,
       required: false
     }, {
+      type: 'number',
+      key: 'rotate',
+      label: '鏃嬭浆',
+      tooltip: '鍧愭爣杞存爣娉ㄦ枃鏈殑鏃嬭浆瑙掑害銆�',
+      min: 0,
+      max: 360,
+      decimal: 0,
+      initVal: card.rotate,
+      forbid: appType !== 'mob',
+      required: false
+    }, {
       type: 'select',
       key: 'interaction',
       label: '浜や簰鏁堟灉',
       initVal: card.interaction || [],
       multi: true,
       required: false,
+      forbid: appType === 'mob',
       options: [
         { value: 'element-active', label: '鍏冪礌鑱氱劍' },
         { value: 'element-selected', label: '鍏冪礌閫変腑锛堝閫夛級' },

--
Gitblit v1.8.0