From d21470fe80e265cda2c355f636c3258eb0f56636 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 12 五月 2020 18:31:18 +0800
Subject: [PATCH] 2020-05-12

---
 src/templates/zshare/formconfig.jsx |  146 +++++++++++++-----------------------------------
 1 files changed, 40 insertions(+), 106 deletions(-)

diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index d0c04da..ec55506 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -1059,33 +1059,23 @@
       }, {
         value: 'textarea',
         text: Formdict['header.form.textarea']
-      }, {
-        value: 'contrast',
-        text: Formdict['header.form.contrastCol']
       }]
     },
     {
-      type: 'select',
-      key: 'Align',
-      label: Formdict['header.form.align'],
-      initVal: card.Align,
-      required: true,
-      options: [{
-        value: 'left',
-        text: Formdict['header.form.alignLeft']
-      }, {
-        value: 'right',
-        text: Formdict['header.form.alignRight']
-      }, {
-        value: 'center',
-        text: Formdict['header.form.alignCenter']
-      }]
+      type: 'number',
+      key: 'Width',
+      min: 1,
+      max: 1000,
+      decimal: 0,
+      label: Formdict['header.form.columnWidth'],
+      initVal: card.Width,
+      required: true
     },
     {
       type: 'radio',
       key: 'Hide',
       label: Formdict['header.form.Hide'],
-      initVal: card.Hide,
+      initVal: card.Hide || 'false',
       required: true,
       options: [{
         value: 'true',
@@ -1099,7 +1089,7 @@
       type: 'radio',
       key: 'IsSort',
       label: Formdict['header.form.IsSort'],
-      initVal: card.IsSort,
+      initVal: card.IsSort || 'true',
       required: true,
       options: [{
         value: 'true',
@@ -1110,14 +1100,21 @@
       }]
     },
     {
-      type: 'number',
-      key: 'Width',
-      min: 1,
-      max: 1000,
-      decimal: 0,
-      label: Formdict['header.form.columnWidth'],
-      initVal: card.Width,
-      required: true
+      type: 'radio',
+      key: 'Align',
+      label: Formdict['header.form.align'],
+      initVal: card.Align || 'left',
+      required: true,
+      options: [{
+        value: 'left',
+        text: Formdict['header.form.alignLeft']
+      }, {
+        value: 'center',
+        text: Formdict['header.form.alignCenter']
+      }, {
+        value: 'right',
+        text: Formdict['header.form.alignRight']
+      }]
     },
     {
       type: 'number',
@@ -1147,6 +1144,13 @@
       required: false
     },
     {
+      type: 'number',
+      key: 'fieldlength',
+      label: Formdict['header.form.field.length'],
+      initVal: card.fieldlength || (card.type === 'text' ? 50 : 512),
+      required: true
+    },
+    {
       type: 'text',
       key: 'prefix',
       label: Formdict['header.form.prefix'],
@@ -1162,76 +1166,6 @@
       tooltipClass: 'middle',
       required: false,
       readonly: false
-    },
-    {
-      type: 'select',
-      key: 'match',
-      label: Formdict['header.form.match'],
-      initVal: card.match || '',
-      options: [{
-        value: '',
-        text: Formdict['header.form.empty']
-      }, {
-        value: '>',
-        text: '>'
-      }, {
-        value: '<',
-        text: '<'
-      }, {
-        value: '>=',
-        text: '>='
-      }, {
-        value: '<=',
-        text: '<='
-      }],
-      required: false
-    },
-    {
-      type: 'text',
-      key: 'matchVal',
-      min: -Infinity,
-      max: Infinity,
-      decimal: 0,
-      label: Formdict['header.form.matchVal'],
-      initVal: card.matchVal || '',
-      required: false,
-      readonly: false
-    },
-    {
-      type: 'select',
-      key: 'color',
-      label: Formdict['header.form.color'],
-      initVal: card.color || '',
-      options: [{
-        value: '',
-        text: Formdict['header.form.empty']
-      }, {
-        value: 'red',
-        text: '绾㈣壊锛堝唴瀹癸級'
-      }, {
-        value: 'redbg',
-        text: '绾㈣壊锛堣儗鏅級'
-      }, {
-        value: 'orange',
-        text: '姗欒壊锛堝唴瀹癸級'
-      }, {
-        value: 'orangebg',
-        text: '姗欒壊锛堣儗鏅級'
-      }, {
-        value: 'green',
-        text: '缁胯壊锛堝唴瀹癸級'
-      }, {
-        value: 'greenbg',
-        text: '缁胯壊锛堣儗鏅級'
-      }],
-      required: false
-    },
-    {
-      type: 'number',
-      key: 'fieldlength',
-      label: Formdict['header.form.field.length'],
-      initVal: card.fieldlength || (card.type === 'text' ? 50 : 512),
-      required: false
     },
     {
       type: 'number',
@@ -1260,20 +1194,20 @@
       }]
     },
     {
-      type: 'multiselect',
-      key: 'blacklist',
-      label: Formdict['header.form.blacklist'],
-      initVal: card.blacklist || [],
-      required: false,
-      options: roleList
-    },
-    {
       type: 'cascader',
       key: 'linkmenu',
       label: Formdict['header.form.linkmenu'],
       initVal: card.linkmenu || [],
       required: false,
       options: menulist
+    },
+    {
+      type: 'multiselect',
+      key: 'blacklist',
+      label: Formdict['header.form.blacklist'],
+      initVal: card.blacklist || [],
+      required: false,
+      options: roleList
     }
   ]
 }

--
Gitblit v1.8.0