From 01a88094eaa183714ed7490ca7b85fee1e7bb064 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 20 五月 2023 23:03:41 +0800
Subject: [PATCH] 2023-05-20

---
 src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx |   96 ++++++++++++++---------------------------------
 1 files changed, 29 insertions(+), 67 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 b0d7621..14981f8 100644
--- a/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
@@ -14,7 +14,6 @@
     roleList = []
   }
 
-  // if (['picture', 'link', 'colspan'].includes(card.type)) {
   if (['picture', 'link'].includes(card.type)) {
     card.type = 'text'
   }
@@ -34,9 +33,6 @@
   }, {
     value: 'colspan',
     text: '鍚堝苟鍒�'
-  // }, {
-  //   value: 'action',
-  //   text: '鎿嶄綔'
   }, {
     value: 'formula',
     text: '鍏紡'
@@ -44,13 +40,6 @@
     value: 'index',
     text: '搴忓彿'
   }]
-
-  if (!card.isSub) {
-    options.push({
-      value: 'action',
-      text: '鎿嶄綔'
-    })
-  }
 
   let editCols = [
     {
@@ -148,6 +137,18 @@
     },
     {
       type: 'radio',
+      key: 'eval',
+      label: '瑙f瀽',
+      initVal: card.eval || 'false',
+      tooltip: '褰撳叕寮忓唴瀹规秹鍙婅绠楁椂璇烽�夋嫨鈥滄槸鈥濓紝褰撳叕寮忓唴瀹逛负瀛楁鎷兼帴鏃惰閫夋嫨鈥滃惁鈥濄��',
+      required: false,
+      options: [
+        { value: 'true', text: '鏄�' },
+        { value: 'false', text: '鍚�' }
+      ]
+    },
+    {
+      type: 'radio',
       key: 'Align',
       label: '瀵归綈鏂瑰紡',
       initVal: card.Align || 'left',
@@ -161,21 +162,6 @@
       }, {
         value: 'right',
         text: '鍙冲榻�'
-      }]
-    },
-    {
-      type: 'radio',
-      key: 'sum',
-      label: '鏄剧ず鍚堣',
-      initVal: card.sum || 'false',
-      tooltip: '鍚堣淇℃伅鍙湪浣跨敤绯荤粺鏁版嵁婧愭椂鏈夋晥銆�',
-      required: false,
-      options: [{
-        value: 'true',
-        text: '鏄�'
-      }, {
-        value: 'false',
-        text: '鍚�'
       }]
     },
     {
@@ -258,16 +244,6 @@
         value: '1',
         text: '鏁版嵁婧�'
       }]
-    },
-    {
-      type: 'select',
-      key: 'editField',
-      label: '缂栬緫瀛楁',
-      initVal: card.editField || '',
-      tooltip: '褰撳�间笌鎻愮ず鏂囧瓧涓嶅悓鏃讹紝鍙澶栨坊鍔犵紪杈戝瓧娈碉紝浣滀负瀹為檯鍊肩殑褰曞叆瀛楁銆�',
-      allowClear: true,
-      required: false,
-      options: fields
     },
     {
       type: 'options',
@@ -370,7 +346,7 @@
       type: 'select',
       key: 'enter',
       label: '鍥炶溅鍒囨崲',
-      initVal: card.enter || '$next',
+      initVal: card.enter || '$noAct',
       tooltip: '鍖呮嫭鏂囨湰鎴栨暟鍊煎洖杞︿簨浠躲�佷笅鎷夎彍鍗曢�変腑浜嬩欢銆佸紑鍏冲垏鎹簨浠躲��',
       options: editCols
     },
@@ -392,23 +368,6 @@
       tooltip: '澶氫釜鍊肩敤閫楀彿鍒嗛殧銆�',
       required: false
     },
-    // {
-    //   type: 'radio',
-    //   key: 'footEnter',
-    //   label: '鏈鍥炶溅',
-    //   initVal: card.footEnter || 'false',
-    //   tooltip: '鏂板鍔熻兘浠呭湪琛ㄦ牸鍙柊澧炴椂鏈夋晥銆�',
-    //   options: [{
-    //     value: 'sub',
-    //     text: '鎻愪氦'
-    //   }, {
-    //     value: 'add',
-    //     text: '鏂板'
-    //   }, {
-    //     value: 'false',
-    //     text: '鏃犲姩浣�'
-    //   }]
-    // },
     {
       type: 'number',
       key: 'decimal',
@@ -416,7 +375,7 @@
       max: 18,
       precision: 0,
       label: '灏忔暟浣�',
-      initVal: card.decimal || 0,
+      initVal: card.decimal,
       required: false
     },
     {
@@ -490,18 +449,6 @@
       required: false,
     },
     {
-      type: 'radio',
-      key: 'eval',
-      label: '瑙f瀽',
-      initVal: card.eval || 'false',
-      tooltip: '褰撳叕寮忓唴瀹规秹鍙婅绠楁椂璇烽�夋嫨鈥滄槸鈥濓紝褰撳叕寮忓唴瀹逛负瀛楁鎷兼帴鏃惰閫夋嫨鈥滃惁鈥濄��',
-      required: false,
-      options: [
-        { value: 'true', text: '鏄�' },
-        { value: 'false', text: '鍚�' }
-      ]
-    },
-    {
       type: 'textarea',
       key: 'formula',
       label: '鍏紡',
@@ -519,6 +466,21 @@
       options: fields
     },
     {
+      type: 'radio',
+      key: 'noValue',
+      label: '绌哄��',
+      initVal: card.noValue || 'show',
+      tooltip: '褰撳�间负0鏃舵槸鍚︽樉绀�',
+      required: false,
+      options: [{
+        value: 'show',
+        text: '鏄剧ず'
+      }, {
+        value: 'hide',
+        text: '闅愯棌'
+      }]
+    },
+    {
       type: 'multiselect',
       key: 'blacklist',
       label: '榛戝悕鍗�',

--
Gitblit v1.8.0