From e9640ccdc9fe57f91919e3f51462c780e44fadb0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 23 十二月 2020 13:14:20 +0800
Subject: [PATCH] 2020-12-23

---
 src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx |    7 ++++---
 1 files changed, 4 insertions(+), 3 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 1ab32f6..4126c3c 100644
--- a/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
@@ -38,13 +38,13 @@
   }, {
     value: 'custom',
     text: '鑷畾涔夊垪'
+  }, {
+    value: 'colspan',
+    text: '鍚堝苟鍒�'
   }]
 
   if (!card.isSub) {
     options.push({
-      value: 'colspan',
-      text: '鍚堝苟鍒�'
-    }, {
       value: 'action',
       text: '鎿嶄綔'
     })
@@ -126,6 +126,7 @@
       label: Formdict['model.sort'],
       initVal: card.IsSort || 'true',
       required: true,
+      forbidden: card.isSub,
       options: [{
         value: 'true',
         text: Formdict['model.true']

--
Gitblit v1.8.0