From 2bc0480c11be53627d327a499213e2992980f5d5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 20 一月 2022 17:29:30 +0800
Subject: [PATCH] 2022-01-20

---
 src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx |   41 ++++++++++++++++++++++++++++++++++-------
 1 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx b/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
index c345c81..dc695ac 100644
--- a/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
@@ -39,6 +39,9 @@
     value: 'action',
     text: '鎿嶄綔'
   }, {
+    value: 'formula',
+    text: '鍏紡'
+  }, {
     value: 'index',
     text: '搴忓彿'
   }]
@@ -225,17 +228,17 @@
     },
     {
       type: 'number',
-      key: 'max',
-      label: '鏈�澶у��',
-      initVal: card.max,
+      key: 'min',
+      label: '鏈�灏忓��',
+      initVal: card.min,
       unlimit: true,
       required: false
     },
     {
       type: 'number',
-      key: 'min',
-      label: '鏈�灏忓��',
-      initVal: card.min,
+      key: 'max',
+      label: '鏈�澶у��',
+      initVal: card.max,
       unlimit: true,
       required: false
     },
@@ -249,10 +252,13 @@
         text: Formdict['model.empty']
       }, {
         value: 'thdSeparator',
-        text: Formdict['header.form.thdSeparator']
+        text: '鍗冨垎浣�'
       }, {
         value: 'percent',
         text: '鐧惧垎姣�'
+      }, {
+        value: 'abs',
+        text: '缁濆鍊�'
       }],
       required: false
     },
@@ -290,6 +296,27 @@
       readonly: false
     },
     {
+      type: 'radio',
+      key: 'eval',
+      label: '瑙f瀽',
+      initVal: card.eval || 'true',
+      tooltip: '褰撳叕寮忓唴瀹规秹鍙婅绠楁椂璇烽�夋嫨鈥滄槸鈥濓紝褰撳叕寮忓唴瀹逛负瀛楁鎷兼帴鏃惰閫夋嫨鈥滃惁鈥濄��',
+      required: false,
+      options: [
+        { value: 'true', text: '鏄�' },
+        { value: 'false', text: '鍚�' }
+      ]
+    },
+    {
+      type: 'textarea',
+      key: 'formula',
+      label: '鍏紡',
+      initVal: card.formula || '',
+      tooltip: '鎵ц鏃朵細浣跨敤鏌ヨ鍒扮殑鏁版嵁鏇挎崲鐩稿簲鐨勫瓧娈碉紝灞曠ず鑾峰緱鐨勭粨鏋溿�傚彲浣跨敤JS鐨勪竴浜涜娉曪紝濡傦細涓夊厓琛ㄨ揪寮� @field1@ > @field2@ ? 0 : 1锛汳ath瀵硅薄锛屽彇缁濆鍊� Math.abs(@field@)銆佸洓鑸嶄簲鍏� Math.round(@field@)绛�',
+      placeholder: '渚嬪锛欯price@ * @number@',
+      required: true
+    },
+    {
       type: 'multiselect',
       key: 'blacklist',
       label: Formdict['header.form.blacklist'],

--
Gitblit v1.8.0