From 4587b07918b19e9724439d773b0ba28f388057df Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 15 五月 2023 21:05:40 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx |   67 ++++++++++++++++++++-------------
 1 files changed, 41 insertions(+), 26 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..72898a7 100644
--- a/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
@@ -163,21 +163,21 @@
         text: '鍙冲榻�'
       }]
     },
-    {
-      type: 'radio',
-      key: 'sum',
-      label: '鏄剧ず鍚堣',
-      initVal: card.sum || 'false',
-      tooltip: '鍚堣淇℃伅鍙湪浣跨敤绯荤粺鏁版嵁婧愭椂鏈夋晥銆�',
-      required: false,
-      options: [{
-        value: 'true',
-        text: '鏄�'
-      }, {
-        value: 'false',
-        text: '鍚�'
-      }]
-    },
+    // {
+    //   type: 'radio',
+    //   key: 'sum',
+    //   label: '鏄剧ず鍚堣',
+    //   initVal: card.sum || 'false',
+    //   tooltip: '鍚堣淇℃伅鍙湪浣跨敤绯荤粺鏁版嵁婧愭椂鏈夋晥銆�',
+    //   required: false,
+    //   options: [{
+    //     value: 'true',
+    //     text: '鏄�'
+    //   }, {
+    //     value: 'false',
+    //     text: '鍚�'
+    //   }]
+    // },
     {
       type: 'radio',
       key: 'editable',
@@ -259,16 +259,16 @@
         text: '鏁版嵁婧�'
       }]
     },
-    {
-      type: 'select',
-      key: 'editField',
-      label: '缂栬緫瀛楁',
-      initVal: card.editField || '',
-      tooltip: '褰撳�间笌鎻愮ず鏂囧瓧涓嶅悓鏃讹紝鍙澶栨坊鍔犵紪杈戝瓧娈碉紝浣滀负瀹為檯鍊肩殑褰曞叆瀛楁銆�',
-      allowClear: true,
-      required: false,
-      options: fields
-    },
+    // {
+    //   type: 'select',
+    //   key: 'editField',
+    //   label: '缂栬緫瀛楁',
+    //   initVal: card.editField || '',
+    //   tooltip: '褰撳�间笌鎻愮ず鏂囧瓧涓嶅悓鏃讹紝鍙澶栨坊鍔犵紪杈戝瓧娈碉紝浣滀负瀹為檯鍊肩殑褰曞叆瀛楁銆�',
+    //   allowClear: true,
+    //   required: false,
+    //   options: fields
+    // },
     {
       type: 'options',
       key: 'options',
@@ -370,7 +370,7 @@
       type: 'select',
       key: 'enter',
       label: '鍥炶溅鍒囨崲',
-      initVal: card.enter || '$next',
+      initVal: card.enter || '$noAct',
       tooltip: '鍖呮嫭鏂囨湰鎴栨暟鍊煎洖杞︿簨浠躲�佷笅鎷夎彍鍗曢�変腑浜嬩欢銆佸紑鍏冲垏鎹簨浠躲��',
       options: editCols
     },
@@ -519,6 +519,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