From c98e45bfac25e9110ad0383faac54a54d98ea9d5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 18 十一月 2021 20:47:04 +0800
Subject: [PATCH] 2021-11-18

---
 src/menu/components/card/cardcellcomponent/formconfig.jsx |  131 ++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 114 insertions(+), 17 deletions(-)

diff --git a/src/menu/components/card/cardcellcomponent/formconfig.jsx b/src/menu/components/card/cardcellcomponent/formconfig.jsx
index 40cd6b1..ac90789 100644
--- a/src/menu/components/card/cardcellcomponent/formconfig.jsx
+++ b/src/menu/components/card/cardcellcomponent/formconfig.jsx
@@ -176,11 +176,92 @@
       required: false
     },
     {
+      type: 'radio',
+      key: 'showType',
+      label: '灞曠幇褰㈠紡',
+      initVal: card.showType || 'line',
+      required: false,
+      options: [
+        { value: 'line', text: '杩涘害鏉�' },
+        { value: 'circle', text: '杩涘害鍦�' },
+        { value: 'dashboard', text: '浠〃鐩�' },
+      ]
+    },
+    {
       type: 'color',
       key: 'color',
-      label: '棰滆壊',
-      initVal: card.color || 'rgba(0, 0, 0, 0.85)',
+      label: '杩涘害鏉¢鑹�',
+      initVal: card.color || '#1890ff',
       required: true
+    },
+    {
+      type: 'color',
+      key: 'trailColor',
+      label: '鏈畬鎴愰鑹�',
+      initVal: card.trailColor || '#f5f5f5',
+      required: false
+    },
+    {
+      type: 'radio',
+      key: 'showInfo',
+      label: '杩涘害鍊�',
+      initVal: card.showInfo || 'false',
+      required: false,
+      options: [
+        { value: 'true', text: '鏄剧ず' },
+        { value: 'false', text: '闅愯棌' }
+      ]
+    },
+    {
+      type: 'color',
+      key: 'infoColor',
+      label: '杩涘害鍊奸鑹�',
+      initVal: card.infoColor || 'rgba(0, 0, 0, 0.65)',
+      required: false
+    },
+    {
+      type: 'radio',
+      key: 'strokeLinecap',
+      label: '绾垮瀷',
+      initVal: card.strokeLinecap || 'round',
+      required: false,
+      options: [
+        { value: 'round', text: '鍦嗚' },
+        { value: 'square', text: '鐩磋' },
+      ]
+    },
+    {
+      type: 'radio',
+      key: 'textAlign',
+      label: '瀵归綈鏂瑰紡',
+      initVal: card.textAlign || 'left',
+      required: false,
+      options: [
+        { value: 'left', text: '宸�' },
+        { value: 'center', text: '涓�' },
+        { value: 'right', text: '鍙�' },
+      ]
+    },
+    {
+      type: 'number',
+      key: 'strokeWidth',
+      min: 1,
+      max: 200,
+      precision: 0,
+      label: '绾挎潯瀹藉害',
+      initVal: card.strokeWidth || 8,
+      required: true,
+    },
+    {
+      type: 'number',
+      key: 'outlineWidth',
+      min: 10,
+      max: 2000,
+      precision: 0,
+      label: '澶栧舰瀹藉害',
+      initVal: card.outlineWidth || '',
+      tooltip: '澶栧舰瀹藉害涓虹┖鏃讹紝瀹藉害涓哄厓绱犵殑瀹藉害銆傛敞锛氳秴鍑烘椂鎸夊厓绱犲搴﹁绠椼��',
+      required: false
     },
     {
       type: 'number',
@@ -216,7 +297,7 @@
       type: 'number',
       key: 'barHeight',
       min: 5,
-      max: 50,
+      max: 500,
       label: '楂樺害',
       initVal: card.barHeight || 25,
       required: true,
@@ -225,8 +306,8 @@
       type: 'number',
       key: 'qrWidth',
       min: 5,
-      max: 500,
-      label: '瀹藉害',
+      max: 1000,
+      label: '浜岀淮鐮佸昂瀵�',
       initVal: card.qrWidth || 50,
       required: true,
     },
@@ -304,17 +385,6 @@
       options: [
         { value: '4:3', text: '4:3' },
         { value: '16:9', text: '16:9' }
-      ]
-    },
-    {
-      type: 'radio',
-      key: 'noValue',
-      label: '绌哄��',
-      initVal: card.noValue || 'show',
-      required: false,
-      options: [
-        { value: 'show', text: '鏄剧ず' },
-        { value: 'hide', text: '闅愯棌' }
       ]
     },
     {
@@ -408,14 +478,41 @@
       }]
     },
     {
+      type: 'radio',
+      key: 'eval',
+      label: '瑙f瀽',
+      initVal: card.eval || 'true',
+      tooltip: '褰撳叕寮忓唴瀹规秹鍙婅绠楁椂璇烽�夋嫨鈥滄槸鈥濓紝褰撳叕寮忓唴瀹逛负瀛楁鎷兼帴鏃惰閫夋嫨鈥滃惁鈥濄��',
+      required: false,
+      options: [{
+        value: 'true',
+        text: Formdict['model.true']
+      }, {
+        value: 'false',
+        text: Formdict['model.false']
+      }]
+    },
+    {
       type: 'textarea',
       key: 'formula',
       label: '鍏紡',
       initVal: card.formula || '',
-      tooltip: '鎵ц鏃朵細浣跨敤鏌ヨ鍒扮殑鏁版嵁鏇挎崲鐩稿簲鐨勫瓧娈碉紝灞曠ず鑾峰緱鐨勭粨鏋溿��',
+      tooltip: '鎵ц鏃朵細浣跨敤鏌ヨ鍒扮殑鏁版嵁鏇挎崲鐩稿簲鐨勫瓧娈碉紝灞曠ず鑾峰緱鐨勭粨鏋溿�傚彲浣跨敤JS鐨勪竴浜涜娉曪紝濡傦細涓夊厓琛ㄨ揪寮� @field1@ > @field2@ ? 0 : 1锛汳ath瀵硅薄锛屽彇缁濆鍊� Math.abs(@field@)銆佸洓鑸嶄簲鍏� Math.round(@field@)绛�',
       placeholder: '渚嬪锛欯price@ * @number@',
       required: true
     },
+    {
+      type: 'radio',
+      key: 'noValue',
+      label: '绌哄��',
+      initVal: card.noValue || 'show',
+      tooltip: '褰撳厓绱犲唴瀹逛负绌烘椂锛屾槸鍚︽樉绀哄綋鍓嶅厓绱犮��',
+      required: false,
+      options: [
+        { value: 'show', text: '鏄剧ず' },
+        { value: 'hide', text: '闅愯棌' }
+      ]
+    },
   ]
 
   return forms

--
Gitblit v1.8.0