From a5f41b5d98f23d618dc7519c605ce943b114dfd5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 13 十一月 2023 18:07:51 +0800
Subject: [PATCH] 2023-11-13

---
 src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx |   62 ++++++++++++++++++++++--------
 1 files changed, 45 insertions(+), 17 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 6ebce77..9f4eb5c 100644
--- a/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
@@ -2,7 +2,7 @@
  * @description 鑾峰彇鏄剧ず鍒楄〃鍗曢厤缃俊鎭�
  * @param {object} card       // 鎼滅储鏉′欢瀵硅薄
  */
-export function getColumnForm (card, fields = [], columns = []) {
+export function getColumnForm (card, fields = [], columns = [], wrap) {
   let roleList = sessionStorage.getItem('sysRoles')
   if (roleList) {
     try {
@@ -42,19 +42,26 @@
   }]
 
   let editCols = [
+    // {
+    //   field: '$sub',
+    //   label: '鎻愪氦'
+    // },
     {
-      field: '$sub',
-      label: '鎻愪氦'
+      field: '$noAct',
+      label: '鏃犲姩浣�'
     },
     {
       field: '$next',
       label: '涓嬩竴琛�'
-    },
-    {
-      field: '$noAct',
-      label: '鏃犲姩浣�'
     }
   ]
+
+  if (card.enter === '$sub') {
+    card.enter = '$noAct'
+  }
+  if (wrap.commit === 'change') {
+    editCols[0].label = '澶卞幓鐒︾偣'
+  }
 
   let cols = []
   let getcols = (columns, suplabel = '') => {
@@ -79,6 +86,11 @@
       field: '$next_' + col.field,
       label: col.label + '锛堜笅涓�琛岋級'
     })
+  })
+
+  editCols.push({
+    field: '$next_' + card.uuid,
+    label: card.label + '锛堜笅涓�琛岋級'
   })
 
   return [
@@ -419,15 +431,6 @@
     },
     {
       type: 'select',
-      key: 'showField',
-      label: '鏄剧ず瀛楁',
-      initVal: card.showField || '',
-      tooltip: '鐢ㄤ簬鎺у埗閫夋嫨妗嗕腑鐨勬樉绀哄唴瀹广��',
-      required: true,
-      options: 'columns'
-    },
-    {
-      type: 'select',
       key: 'controlField',
       label: '绂佺敤瀛楁',
       initVal: card.controlField || '',
@@ -483,6 +486,21 @@
       }, {
         value: 'false',
         text: '涓嶅姞杞�'
+      }]
+    },
+    {
+      type: 'radio',
+      key: 'cache',
+      label: '閫夐」鏌ヨ',
+      initVal: card.cache || 'true',
+      tooltip: '鏁版嵁鏌ヨ鏄惁浣跨敤缂撳瓨銆�',
+      required: false,
+      options: [{
+        value: 'true',
+        text: '缂撳瓨'
+      }, {
+        value: 'false',
+        text: '瀹炴椂'
       }]
     },
     {
@@ -573,7 +591,7 @@
       key: 'enter',
       label: '鍥炶溅鍒囨崲',
       initVal: card.enter || '$noAct',
-      tooltip: '鍖呮嫭鏂囨湰鎴栨暟鍊煎洖杞︿簨浠躲�佷笅鎷夎彍鍗曢�変腑浜嬩欢銆佸紑鍏冲垏鎹簨浠躲��',
+      tooltip: '鍖呮嫭鏂囨湰鎴栨暟鍊煎洖杞︿簨浠躲�佷笅鎷夎彍鍗曘�侀�夋嫨鍣ㄣ�佹椂闂村彉鍖栦簨浠躲�佸紑鍏冲垏鎹簨浠躲��',
       options: editCols
     },
     {
@@ -595,6 +613,16 @@
       required: false
     },
     {
+      type: 'select',
+      key: 'clearField',
+      label: '娓呯┖瀛楁',
+      initVal: card.clearField || '',
+      tooltip: '褰撳墠瀛楁缂栬緫鏃堕渶瑕佹竻绌虹殑瀛楁銆�',
+      allowClear: true,
+      required: false,
+      options: fields
+    },
+    {
       type: 'number',
       key: 'decimal',
       min: 0,

--
Gitblit v1.8.0