From a9ac16fecc0cf9bc66dfaefe4e9b35fa3c722812 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 10 十一月 2020 16:58:43 +0800
Subject: [PATCH] 2020-11-10

---
 src/menu/components/card/cardcellcomponent/formconfig.jsx |  113 ++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 89 insertions(+), 24 deletions(-)

diff --git a/src/menu/components/card/cardcellcomponent/formconfig.jsx b/src/menu/components/card/cardcellcomponent/formconfig.jsx
index 5e01655..cfb5189 100644
--- a/src/menu/components/card/cardcellcomponent/formconfig.jsx
+++ b/src/menu/components/card/cardcellcomponent/formconfig.jsx
@@ -19,6 +19,9 @@
     { value: 'link', text: '閾炬帴'},
     { value: 'slider', text: '杩涘害鏉�'},
     { value: 'splitline', text: '鍒嗗壊绾�'},
+    { value: 'barcode', text: '鏉″舰鐮�'},
+    { value: 'qrcode', text: '浜岀淮鐮�'},
+    { value: 'currentDate', text: '褰撳墠鏃堕棿'},
   ]
 
   if (type === 'table') {
@@ -95,6 +98,14 @@
       options: []
     },
     {
+      type: 'text',
+      key: 'value',
+      min: 0,
+      label: '鍐呭',
+      initVal: card.value || '',
+      required: true
+    },
+    {
       type: 'file',
       key: 'url',
       label: '鍥剧墖',
@@ -104,18 +115,38 @@
     },
     {
       type: 'text',
-      key: 'value',
-      min: 0,
-      label: '鍐呭',
-      initVal: card.value || '',
-      required: true
-    },
-    {
-      type: 'text',
       key: 'label',
       label: '鏄剧ず淇℃伅',
       initVal: card.label || '',
       required: false
+    },
+    {
+      type: 'select',
+      key: 'format',
+      label: '鏍煎紡鍖�',
+      initVal: card.format || '',
+      tooltip: '娉細鐧惧垎鏁般�佸崈鍒嗕綅瀵逛簬鏁板�肩被鍨嬫湁鏁堬紝YYYY-MM-DD瀵逛簬鏃堕棿绫诲瀷鐨勬枃鏈湁鏁堛��',
+      required: false,
+      options: [
+        { value: '', text: '鏃�' },
+        { value: 'percent', text: '鐧惧垎鏁�' },
+        { value: 'thdSeparator', text: '鍗冨垎浣�' },
+        { value: 'YYYY-MM-DD', text: 'YYYY-MM-DD' }
+      ]
+    },
+    {
+      type: 'select',
+      key: 'dateFormat',
+      label: '鏍煎紡鍖�',
+      initVal: card.dateFormat || 'YYYY-MM-DD',
+      required: true,
+      options: [
+        { value: 'YYYY-MM-DD', text: 'YYYY-MM-DD' },
+        { value: 'YYYY', text: 'YYYY' },
+        { value: 'YYYY-MM', text: 'YYYY-MM' },
+        { value: 'YYYY-MM-DD HH:mm', text: 'YYYY-MM-DD HH:mm' },
+        { value: 'YYYY-MM-DD HH:mm:ss', text: 'YYYY-MM-DD HH:mm:ss' },
+      ]
     },
     {
       type: 'text',
@@ -140,24 +171,10 @@
       required: false
     },
     {
-      type: 'select',
-      key: 'format',
-      label: '鏍煎紡鍖�',
-      initVal: card.format || '',
-      tooltip: '娉細鐧惧垎鏁般�佸崈鍒嗕綅瀵逛簬鏁板�肩被鍨嬫湁鏁堬紝YYYY-MM-DD瀵逛簬鏃堕棿绫诲瀷鐨勬枃鏈湁鏁堛��',
-      required: false,
-      options: [
-        { value: '', text: '鏃�' },
-        { value: 'percent', text: '鐧惧垎鏁�' },
-        { value: 'thdSeparator', text: '鍗冨垎浣�' },
-        { value: 'YYYY-MM-DD', text: 'YYYY-MM-DD' }
-      ]
-    },
-    {
       type: 'color',
       key: 'color',
       label: '棰滆壊',
-      initVal: card.color,
+      initVal: card.color || 'rgba(0, 0, 0, 0.85)',
       required: true
     },
     {
@@ -175,7 +192,7 @@
       min: 1,
       max: 24,
       precision: 0,
-      label: '瀹藉害',
+      label: '鍏冪礌瀹藉害',
       initVal: card.width || 12,
       tooltip: '鏍呮牸甯冨眬锛屾瘡琛岀瓑鍒嗕负24鍒椼��',
       required: true
@@ -190,6 +207,54 @@
       required: true,
     },
     {
+      type: 'number',
+      key: 'barHeight',
+      min: 5,
+      max: 50,
+      label: '楂樺害',
+      initVal: card.barHeight || 25,
+      required: true,
+    },
+    {
+      type: 'number',
+      key: 'qrWidth',
+      min: 5,
+      max: 500,
+      label: '瀹藉害',
+      initVal: card.qrWidth || 50,
+      required: true,
+    },
+    {
+      type: 'number',
+      key: 'interval',
+      min: 0.1,
+      max: 10,
+      precision: 1,
+      label: '绾挎潯闂撮殧',
+      initVal: card.interval || 1,
+      required: true,
+    },
+    {
+      type: 'radio',
+      key: 'displayValue',
+      label: '鏄剧ず鍊�',
+      initVal: card.displayValue || 'false',
+      required: false,
+      options: [
+        { value: 'true', text: '鏄�' },
+        { value: 'false', text: '鍚�' }
+      ]
+    },
+    {
+      type: 'number',
+      key: 'borderWidth',
+      min: 0,
+      max: 50,
+      label: '绾垮',
+      initVal: card.borderWidth || 1,
+      required: true
+    },
+    {
       type: 'select',
       key: 'lenWidRadio',
       label: '闀垮姣�',

--
Gitblit v1.8.0