From 0227c25e4ed573d3095ada3f9c9a4ba5f18b0de5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 20 一月 2021 10:53:01 +0800
Subject: [PATCH] 2021-01-20

---
 src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx |   38 ++++++++++++++++++++++++++++++++++----
 1 files changed, 34 insertions(+), 4 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 bb35a59..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: '鎿嶄綔'
     })
@@ -73,6 +73,14 @@
       initVal: card.field,
       required: true,
       options: fields
+    },
+    {
+      type: 'select',
+      key: 'nameField',
+      label: Formdict['model.name'] + Formdict['model.form.field'],
+      initVal: card.nameField || '',
+      required: false,
+      options: [{uuid: 'empty', field: '', label: '绌�'}, ...fields]
     },
     {
       type: 'number',
@@ -118,6 +126,7 @@
       label: Formdict['model.sort'],
       initVal: card.IsSort || 'true',
       required: true,
+      forbidden: card.isSub,
       options: [{
         value: 'true',
         text: Formdict['model.true']
@@ -235,7 +244,7 @@
       readonly: false
     },
     {
-      type: 'select',
+      type: 'radio',
       key: 'lenWidRadio',
       label: '闀垮姣�',
       initVal: card.lenWidRadio || '1:1',
@@ -249,6 +258,27 @@
     },
     {
       type: 'radio',
+      key: 'picSort',
+      label: '鍥剧墖鎺掑垪',
+      initVal: card.picSort || '1',
+      tooltip: '鍚屼竴鍗曞厓鏍煎唴锛屽惈鏈夊寮犲浘鐗囨椂鐨勫垪鏁般��',
+      required: false,
+      options: [{
+        value: '1',
+        text: '1'
+      }, {
+        value: '2',
+        text: '2'
+      }, {
+        value: '3',
+        text: '3'
+      }, {
+        value: '4',
+        text: '4'
+      }]
+    },
+    {
+      type: 'radio',
       key: 'scale',
       label: Formdict['header.form.clickscale'],
       initVal: card.scale || 'false',

--
Gitblit v1.8.0