From 569ccb3c1ff82f30ffefa7d3700571448d742662 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 03 十二月 2020 11:46:28 +0800
Subject: [PATCH] 2020-12-03

---
 src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx |   91 +++++++++++++++++++++++++--------------------
 1 files changed, 50 insertions(+), 41 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 3d816a0..bb35a59 100644
--- a/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
@@ -20,6 +20,36 @@
     roleList = []
   }
 
+  let options = [{
+    value: 'text',
+    text: Formdict['model.form.text']
+  }, {
+    value: 'number',
+    text: Formdict['model.form.number']
+  }, {
+    value: 'picture',
+    text: Formdict['model.form.picture']
+  }, {
+    value: 'link',
+    text: Formdict['model.form.href']
+  }, {
+    value: 'textarea',
+    text: Formdict['model.form.textarea']
+  }, {
+    value: 'custom',
+    text: '鑷畾涔夊垪'
+  }]
+
+  if (!card.isSub) {
+    options.push({
+      value: 'colspan',
+      text: '鍚堝苟鍒�'
+    }, {
+      value: 'action',
+      text: '鎿嶄綔'
+    })
+  }
+
   return [
     {
       type: 'text',
@@ -34,22 +64,7 @@
       label: Formdict['model.form.type'],
       initVal: card.type,
       required: true,
-      options: [{
-        value: 'text',
-        text: Formdict['model.form.text']
-      }, {
-        value: 'number',
-        text: Formdict['model.form.number']
-      }, {
-        value: 'picture',
-        text: Formdict['model.form.picture']
-      }, {
-        value: 'link',
-        text: Formdict['model.form.href']
-      }, {
-        value: 'textarea',
-        text: Formdict['model.form.textarea']
-      }]
+      options: options
     },
     {
       type: 'select',
@@ -62,11 +77,11 @@
     {
       type: 'number',
       key: 'Width',
-      min: 1,
+      min: 20,
       max: 1000,
       decimal: 0,
       label: Formdict['model.form.columnWidth'],
-      initVal: card.Width,
+      initVal: card.Width || 120,
       required: true
     },
     {
@@ -133,7 +148,7 @@
       key: 'rowspan',
       label: '琛屽悎骞�',
       initVal: card.rowspan || 'false',
-      tooltip: '鐩搁偦琛屼俊鎭浉鍚屾椂锛屽崟鍏冩牸鍚堝苟銆傛敞锛氫负闃叉琛ㄦ牸淇℃伅閿欎贡锛岃鍚堝苟鍙兘娣诲姞涓�涓瓧娈点��',
+      tooltip: '鐩搁偦琛屼俊鎭浉鍚屾椂锛屽崟鍏冩牸鍚堝苟銆�',
       required: false,
       options: [{
         value: 'true',
@@ -148,7 +163,7 @@
       key: 'sum',
       label: '鏄剧ず鍚堣',
       initVal: card.sum || 'false',
-      tooltip: '鍚堣淇℃伅鍙湪浣跨敤绯荤粺鏁版嵁婧愶紝涓斿綋鍓嶅垪鏈殣钘忔椂鏈夋晥銆�',
+      tooltip: '鍚堣淇℃伅鍙湪浣跨敤绯荤粺鏁版嵁婧愭椂鏈夋晥銆�',
       required: false,
       options: [{
         value: 'true',
@@ -169,19 +184,12 @@
       required: true
     },
     {
-      type: 'number',
-      key: 'fieldlength',
-      label: Formdict['model.form.field'] + Formdict['model.length'],
-      initVal: card.fieldlength || (card.type === 'text' ? 50 : 512),
-      required: true
-    },
-    {
       type: 'select',
       key: 'format',
       label: Formdict['header.form.format'],
-      initVal: card.format || '',
+      initVal: card.format || 'none',
       options: [{
-        value: '',
+        value: 'none',
         text: Formdict['model.empty']
       }, {
         value: 'thdSeparator',
@@ -196,9 +204,9 @@
       type: 'select',
       key: 'textFormat',
       label: Formdict['header.form.format'],
-      initVal: card.textFormat || '',
+      initVal: card.textFormat || 'none',
       options: [{
-        value: '',
+        value: 'none',
         text: Formdict['model.empty']
       }, {
         value: 'YYYY-MM-DD',
@@ -227,16 +235,17 @@
       readonly: false
     },
     {
-      type: 'number',
-      key: 'maxHeight',
-      min: 1,
-      max: 1000,
-      decimal: 0,
-      label: '鏈�澶ч珮搴�',
-      tooltip: '鍥剧墖鍦ㄨ〃鏍间腑鏄剧ず鐨勬渶澶ч珮搴�',
-      tooltipClass: 'middle',
-      initVal: card.maxHeight || 128,
-      required: true
+      type: 'select',
+      key: 'lenWidRadio',
+      label: '闀垮姣�',
+      initVal: card.lenWidRadio || '1:1',
+      required: true,
+      options: [
+        { value: '1:1', text: '1:1' },
+        { value: '3:2', text: '3:2' },
+        { value: '4:3', text: '4:3' },
+        { value: '16:9', text: '16:9' }
+      ]
     },
     {
       type: 'radio',

--
Gitblit v1.8.0