From a94b0a4d15b26ecf8fe99f0a1c3e60d60b97766d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 15 八月 2023 14:22:03 +0800
Subject: [PATCH] 2023-08-15

---
 src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx |   64 +++++++++++++++++++-------------
 1 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx b/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
index 7444d5f..e39e5b7 100644
--- a/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
@@ -65,13 +65,6 @@
     text: '搴忓彿'
   }]
 
-  if (!card.isSub) {
-    options.push({
-      value: 'action',
-      text: '鎿嶄綔'
-    })
-  }
-
   if (!card.linkurl && (!card.linkmenu || card.linkmenu.length === 0)) {
     card.perspective = ''
   }
@@ -162,6 +155,24 @@
     },
     {
       type: 'radio',
+      key: 'eval',
+      label: '瑙ｆ瀽鏂瑰紡',
+      initVal: card.eval || 'false',
+      tooltip: '褰撳叕寮忓唴瀹规秹鍙婅绠楁椂璇烽�夋嫨鈥滆绠椻�濓紝褰撳叕寮忓唴瀹逛负瀛楁鎷兼帴鏃惰閫夋嫨鈥滃瓧娈垫浛鎹⑩�濓紝浣跨敤鍑芥暟鏃跺叆鍙備负data锛堟暟缁勶級銆�',
+      required: false,
+      options: [{
+        value: 'false',
+        text: '瀛楁鏇挎崲'
+      }, {
+        value: 'true',
+        text: '璁＄畻'
+      }, {
+        value: 'func',
+        text: '鍑芥暟'
+      }]
+    },
+    {
+      type: 'radio',
       key: 'Align',
       label: '瀵归綈鏂瑰紡',
       initVal: card.Align || 'left',
@@ -225,7 +236,8 @@
       }, {
         value: 'false',
         text: '鍚�'
-      }]
+      }],
+      forbid: card.isSub || card.sum !== 'true'
     },
     {
       type: 'number',
@@ -234,7 +246,7 @@
       max: 18,
       decimal: 0,
       label: '灏忔暟浣�',
-      initVal: card.decimal || 0,
+      initVal: card.decimal,
       required: false
     },
     {
@@ -331,6 +343,18 @@
     },
     {
       type: 'radio',
+      key: 'backgroundSize',
+      label: '鍥惧儚澶у皬',
+      initVal: card.backgroundSize || 'cover',
+      required: false,
+      options: [
+        { value: 'cover', text: '瑕嗙洊' },
+        { value: 'contain', text: '鍖呭惈' },
+        { value: 'auto', text: '鑷�傚簲' },
+      ]
+    },
+    {
+      type: 'radio',
       key: 'scale',
       label: '鐐瑰嚮缂╂斁',
       initVal: card.scale || 'true',
@@ -358,7 +382,7 @@
         value: 'linkurl',
         text: '閾炬帴'
       }],
-      forbidden: appType === 'mob'
+      forbid: appType === 'mob'
     },
     {
       type: appType === 'pc' ? 'select' : 'cascader',
@@ -367,7 +391,7 @@
       initVal: card.linkmenu || (appType === 'pc' ? '' : []),
       required: true,
       options: menulist,
-      forbidden: appType === 'mob'
+      forbid: appType === 'mob'
     },
     {
       type: 'textarea',
@@ -375,7 +399,7 @@
       label: '閾炬帴鍦板潃',
       initVal: card.linkurl || '',
       required: true,
-      forbidden: appType === 'mob'
+      forbid: appType === 'mob'
     },
     {
       type: 'multiselect',
@@ -384,7 +408,7 @@
       initVal: card.linkfields || [],
       required: false,
       options: fields,
-      forbidden: appType === 'mob'
+      forbid: appType === 'mob'
     },
     {
       type: 'radio',
@@ -396,18 +420,6 @@
       options: [
         { value: 'blank', text: '鏂扮獥鍙�' },
         { value: 'self', text: '褰撳墠绐楀彛' }
-      ]
-    },
-    {
-      type: 'radio',
-      key: 'eval',
-      label: '瑙ｆ瀽',
-      initVal: card.eval || 'true',
-      tooltip: '褰撳叕寮忓唴瀹规秹鍙婅绠楁椂璇烽�夋嫨鈥滄槸鈥濓紝褰撳叕寮忓唴瀹逛负瀛楁鎷兼帴鏃惰閫夋嫨鈥滃惁鈥濄��',
-      required: false,
-      options: [
-        { value: 'true', text: '鏄�' },
-        { value: 'false', text: '鍚�' }
       ]
     },
     {
@@ -426,7 +438,7 @@
       initVal: card.blacklist || [],
       required: false,
       options: roleList,
-      forbidden: appType === 'mob'
+      forbid: appType === 'mob'
     }
   ]
 }

--
Gitblit v1.8.0