From eb31b84962c192de57abbb473cb4733a09bf4363 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 14 五月 2020 18:09:40 +0800
Subject: [PATCH] 2020-05-14

---
 src/templates/zshare/formconfig.jsx |  145 +++++++++++++++++++++++++++++++----------------
 1 files changed, 95 insertions(+), 50 deletions(-)

diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index ec55506..f07c50a 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -689,20 +689,62 @@
 
   return [
     {
-      type: 'text',
-      key: 'label',
-      label: Formdict['header.form.name'],
-      initVal: card.label,
-      required: true,
-      readonly: false
-    },
-    {
       type: 'select',
       key: 'OpenType',
       label: Formdict['header.form.openType'],
       initVal: card.OpenType,
       required: true,
       options: opentypes
+    },
+    {
+      type: 'radio',
+      key: 'intertype',
+      label: Formdict['header.form.intertype'],
+      initVal: card.intertype || 'inner',
+      required: true,
+      options: [{
+        value: 'inner',
+        text: Formdict['header.form.interface.inner']
+      }, {
+        value: 'outer',
+        text: Formdict['header.form.interface.outer']
+      }]
+    },
+    {
+      type: 'select',
+      key: 'sqlType',
+      label: Formdict['header.form.action.type'],
+      initVal: card.sqlType || '',
+      tooltip: Formdict['header.form.actionhelp.sqlType'],
+      required: false,
+      options: []
+    },
+    {
+      type: 'text',
+      key: 'label',
+      label: '鎸夐挳鍚嶇О',
+      initVal: card.label,
+      required: true,
+      readonly: false
+    },
+    {
+      type: 'text',
+      key: 'sql',
+      label: Formdict['header.form.tablename'],
+      initVal: card.sql || config.setting.tableName || '',
+      tooltip: Formdict['header.form.actionhelp.tablename'],
+      required: false
+    },
+    {
+      type: 'text',
+      key: 'innerFunc',
+      label: Formdict['header.form.innerFunc'],
+      initVal: card.innerFunc || '',
+      tooltip: functip,
+      fields: permFuncField,
+      tooltipClass: 'middle',
+      required: false,
+      readonly: false
     },
     {
       type: 'select',
@@ -771,31 +813,6 @@
       label: Formdict['header.form.newpage.url'],
       initVal: card.url || '',
       required: true
-    },
-    {
-      type: 'radio',
-      key: 'intertype',
-      label: Formdict['header.form.intertype'],
-      initVal: card.intertype || 'inner',
-      required: true,
-      options: [{
-        value: 'inner',
-        text: Formdict['header.form.interface.inner']
-      }, {
-        value: 'outer',
-        text: Formdict['header.form.interface.outer']
-      }]
-    },
-    {
-      type: 'text',
-      key: 'innerFunc',
-      label: Formdict['header.form.innerFunc'],
-      initVal: card.innerFunc || '',
-      tooltip: functip,
-      fields: permFuncField,
-      tooltipClass: 'middle',
-      required: false,
-      readonly: false
     },
     {
       type: 'radio',
@@ -969,23 +986,6 @@
       label: Formdict['header.form.tablename'],
       initVal: card.sheet || config.setting.tableName || '',
       required: true
-    },
-    {
-      type: 'text',
-      key: 'sql',
-      label: Formdict['header.form.tablename'],
-      initVal: card.sql || config.setting.tableName || '',
-      tooltip: Formdict['header.form.actionhelp.tablename'],
-      required: false
-    },
-    {
-      type: 'select',
-      key: 'sqlType',
-      label: Formdict['header.form.action.type'],
-      initVal: card.sqlType || '',
-      tooltip: Formdict['header.form.actionhelp.sqlType'],
-      required: false,
-      options: []
     },
     {
       type: 'radio',
@@ -1227,6 +1227,9 @@
   }, {
     value: 'pie',
     text: '楗煎浘'
+  }, {
+    value: 'card',
+    text: '鍗＄墖'
   }]
 
   if (card.chartType === 'table') {
@@ -1289,6 +1292,48 @@
       }]
     },
     {
+      type: 'radio',
+      key: 'widthType',
+      label: '瀹藉害绫诲瀷',
+      initVal: card.widthType || 'ratio',
+      required: true,
+      hidden: true,
+      options: [{
+        value: 'ratio',
+        text: '姣斾緥'
+      }, {
+        value: 'absolute',
+        text: '缁濆鍊�'
+      }]
+    },
+    {
+      type: 'number',
+      key: 'cardWidth',
+      min: card.widthType === 'absolute' ? 50 : 1,
+      max: card.widthType === 'absolute' ? 1000 : 24,
+      decimal: 0,
+      label: '鍗＄墖瀹藉害',
+      tooltip: '绫诲瀷涓烘瘮渚嬫椂锛岃寖鍥�1-24锛�24鍗充负100%锛涚被鍨嬩负缁濆鍊硷紝鑼冨洿50-1000銆�',
+      initVal: card.cardWidth || 6,
+      hidden: true,
+      required: true
+    },
+    {
+      type: 'radio',
+      key: 'over',
+      label: '瓒呭嚭鏃�',
+      initVal: card.over || 'roll',
+      required: true,
+      hidden: true,
+      options: [{
+        value: 'whole',
+        text: '灞曠ず鍏ㄩ儴'
+      }, {
+        value: 'roll',
+        text: '婊氬姩'
+      }]
+    },
+    {
       type: 'multiselect',
       key: 'blacklist',
       label: Formdict['header.form.blacklist'],

--
Gitblit v1.8.0