From 6afdec0062dacbded57e166230eb22cc55ced0c1 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 08 五月 2021 14:30:21 +0800
Subject: [PATCH] 2021-05-08

---
 src/templates/zshare/formconfig.jsx | 1716 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 960 insertions(+), 756 deletions(-)

diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index 54aab87..a9fa640 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -2,242 +2,7 @@
 import enUS from '@/locales/en-US/model.js'
 import { formRule } from '@/utils/option.js'
 
-const Formdict = localStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
-
-/**
- * @description 鑾峰彇椤甸潰璁剧疆琛ㄥ崟閰嶇疆淇℃伅
- * @param {object} setting       // 鑿滃崟鍏ㄥ眬璁剧疆淇℃伅
- * @param {array}  usefulFields  // 鍐呴儴鍑芥暟鍙敤鐨勫紑澶村瓧绗�
- * @param {string} MenuID        // 鑿滃崟ID
- * @param {string} primaryKey    // 涓婚敭
- * @param {zrray}  columns       // 鏄剧ず鍒�
- * @param {string} type          // 鑿滃崟绫诲瀷锛宮ain锛堜富琛級
- */
-export function getSettingForm (setting, usefulFields = [], MenuID, primaryKey, columns, type) {
-  let str = '^(' + usefulFields.join('|') + ')'
-  let _patten = new RegExp(str + formRule.func.innerPattern + '$', 'g')
-
-  return [
-    {
-      type: 'text',
-      key: 'tableName',
-      label: '琛ㄥ悕',
-      initVal: setting.tableName || '',
-      required: true,
-      readonly: false,
-      rules: [
-        {
-          max: formRule.input.max,
-          message: formRule.input.message
-        }
-      ]
-    },
-    {
-      type: 'select',
-      key: 'tableType',
-      label: '琛ㄦ牸灞炴��',
-      initVal: setting.tableType,
-      required: false,
-      readonly: false,
-      options: [
-        { value: '', text: '涓嶅彲閫�' },
-        { value: 'radio', text: '鍗曢��' },
-        { value: 'checkbox', text: '澶氶��' }
-      ]
-    },
-    {
-      type: 'radio',
-      key: 'interType',
-      label: Formdict['header.form.intertype'],
-      initVal: setting.interType || 'inner',
-      required: false,
-      readonly: false,
-      options: [
-        { value: 'inner', text: Formdict['header.form.interface.inner'] },
-        { value: 'outer', text: Formdict['header.form.interface.outer'] }
-      ]
-    },
-    {
-      type: 'radio',
-      key: 'sysInterface',
-      label: Formdict['header.form.sysInterface'],
-      initVal: setting.sysInterface || 'false',
-      required: false,
-      readonly: false,
-      options: [
-        { value: 'true', text: Formdict['header.form.true'] },
-        { value: 'false', text: Formdict['header.form.false'] }
-      ]
-    },
-    {
-      type: 'text',
-      key: 'interface',
-      label: Formdict['header.form.interface'],
-      initVal: setting.sysInterface === 'true' ? (window.GLOB.mainSystemApi || '') : (setting.interface || ''),
-      required: true,
-      readonly: setting.sysInterface === 'true',
-      rules: [
-        {
-          max: formRule.input.max,
-          message: formRule.input.message
-        }
-      ]
-    },
-    {
-      type: 'text',
-      key: 'outerFunc',
-      label: Formdict['header.form.outerFunc'],
-      initVal: setting.outerFunc || '',
-      required: false,
-      readonly: false,
-      rules: [
-        {
-          pattern: formRule.func.pattern,
-          message: formRule.func.message
-        }, {
-          max: formRule.func.max,
-          message: formRule.func.maxMessage
-        }
-      ]
-    },
-    {
-      type: 'text',
-      key: 'innerFunc',
-      label: Formdict['header.form.innerFunc'],
-      initVal: setting.innerFunc || '',
-      tooltip: '寮�澶村彲鐢ㄥ瓧绗︼細' + usefulFields.join(', '),
-      required: false,
-      readonly: false,
-      rules: [
-        {
-          pattern: _patten,
-          message: formRule.func.innerMessage
-        }, {
-          max: formRule.func.max,
-          message: formRule.func.maxMessage
-        }
-      ]
-    },
-    {
-      type: 'datasource',
-      key: 'dataresource',
-      label: '鏁版嵁婧�',
-      initVal: setting.dataresource || '',
-      tooltip: '浣跨敤绯荤粺鍑芥暟鏃讹紝闇�濉啓鏁版嵁婧愩�傛敞锛氭暟鎹潈闄愭浛鎹㈢ $@ -> /* 鎴� \'\'銆� @$ -> */ 鎴� \'\'',
-      help: '鏁版嵁ID锛�' + MenuID,
-      required: false,
-      readonly: false,
-      rules: [
-        {
-          pattern: _patten,
-          message: formRule.func.innerMessage
-        }, {
-          max: formRule.func.max,
-          message: formRule.func.maxMessage
-        }
-      ]
-    },
-    {
-      type: 'select',
-      key: 'primaryKey',
-      label: '涓婚敭',
-      initVal: primaryKey,
-      required: false,
-      readonly: false,
-      options: columns
-    },
-    {
-      type: 'text',
-      key: 'order',
-      label: '榛樿鎺掑簭',
-      initVal: setting.order || (primaryKey ? primaryKey + ' desc' : ''),
-      placeholder: 'ID asc, UID desc',
-      required: true,
-      readonly: false,
-      rules: [
-        {
-          max: formRule.input.max,
-          message: formRule.input.message
-        }
-      ]
-    },
-    {
-      type: 'radio',
-      key: 'queryType',
-      label: Formdict['header.form.queryType'],
-      initVal: setting.queryType || 'query',
-      tooltip: '鏌ヨ鏃讹紝鎼滅储鏉′欢浠here鏉′欢鎷兼帴杩涘叆sql锛岀粺璁℃椂锛屽皢鏁版嵁婧愪腑浠モ�淍+鎼滅储瀛楁鈥濈殑鍐呭锛屼互鎼滅储鏉′欢涓殑鍊艰繘琛屾浛鎹㈠悗锛屾彁浜ゆ煡璇紝娉細鏌ヨ绫诲瀷浠呭湪浣跨敤绯荤粺鍑芥暟鏃舵湁鏁堛��',
-      required: false,
-      readonly: false,
-      options: [
-        { value: 'query', text: Formdict['header.form.query'] },
-        { value: 'statistics', text: Formdict['header.form.statistics'] }
-      ]
-    },
-    {
-      type: 'radio',
-      key: 'actionfixed',
-      label: '鎸夐挳鍥哄畾',
-      initVal: setting.actionfixed ? 'true' : 'false',
-      required: false,
-      readonly: false,
-      forbid: type !== 'main',
-      options: [
-        { value: 'true', text: Formdict['header.form.true'] },
-        { value: 'false', text: Formdict['header.form.false'] }
-      ]
-    },
-    {
-      type: 'radio',
-      key: 'columnfixed',
-      label: '琛ㄥご鍥哄畾',
-      initVal: setting.columnfixed ? 'true' : 'false',
-      required: false,
-      readonly: false,
-      forbid: type !== 'main',
-      options: [
-        { value: 'true', text: Formdict['header.form.true'] },
-        { value: 'false', text: Formdict['header.form.false'] }
-      ]
-    },
-    {
-      type: 'radio',
-      key: 'onload',
-      label: '鍒濆鍖�',
-      initVal: setting.onload || 'true',
-      required: false,
-      readonly: false,
-      options: [
-        { value: 'true', text: '鍔犺浇鏁版嵁' },
-        { value: 'false', text: '涓嶅姞杞芥暟鎹�' }
-      ]
-    },
-    {
-      type: 'radio',
-      key: 'laypage',
-      label: '鏄惁鍒嗛〉',
-      initVal: setting.laypage || 'true',
-      required: false,
-      readonly: false,
-      options: [
-        { value: 'true', text: Formdict['header.form.true'] },
-        { value: 'false', text: Formdict['header.form.false'] }
-      ]
-    },
-    {
-      type: 'radio',
-      key: 'default',
-      label: '榛樿sql',
-      initVal: setting.default || 'true',
-      required: false,
-      readonly: false,
-      options: [
-        { value: 'true', text: '鎵ц' },
-        { value: 'false', text: '涓嶆墽琛�' }
-      ]
-    },
-  ]
-}
+const Formdict = sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
 
 /**
  * @description 鑾峰彇鏍戝舰椤甸潰璁剧疆琛ㄥ崟閰嶇疆淇℃伅
@@ -286,8 +51,8 @@
       required: false,
       readonly: false,
       options: [
-        { value: 'inner', text: Formdict['header.form.interface.inner'] },
-        { value: 'outer', text: Formdict['header.form.interface.outer'] }
+        { value: 'inner', text: Formdict['model.interface.inner'] },
+        { value: 'outer', text: Formdict['model.interface.outer'] }
       ]
     },
     {
@@ -298,8 +63,8 @@
       required: false,
       readonly: false,
       options: [
-        { value: 'true', text: Formdict['header.form.true'] },
-        { value: 'false', text: Formdict['header.form.false'] }
+        { value: 'true', text: Formdict['model.true'] },
+        { value: 'false', text: Formdict['model.false'] }
       ]
     },
     {
@@ -445,7 +210,7 @@
       key: 'mark',
       label: '椤剁骇鏍囪瘑',
       initVal: setting.mark || '',
-      tooltip: '鐖剁骇瀛楁鍊间笌椤剁骇鏍囪瘑锛堥粯璁ゅ�间负绌猴級鐩稿悓鏃讹紝瑙嗕负椤剁骇鑺傜偣銆�',
+      tooltip: '鐖剁骇瀛楁鍊间笌椤剁骇鏍囪瘑鐩稿悓鏃讹紝瑙嗕负椤剁骇鑺傜偣銆�',
       required: false,
       readonly: false,
       rules: [
@@ -461,7 +226,7 @@
       min: 2,
       max: 12,
       label: '瀹藉害',
-      tooltip: '姣忚鍒嗕负24浠斤紝鏍戝舰姣斾緥鍙缃负2-12锛堟渶澶�50%锛�',
+      tooltip: '鏍呮牸甯冨眬锛屾瘡琛岀瓑鍒嗕负24鍒楋紝鏍戝舰姣斾緥鍙缃负2-12锛堟渶澶�50%锛�',
       initVal: setting.width || 5,
       required: true
     },
@@ -497,8 +262,8 @@
       required: false,
       readonly: false,
       options: [
-        { value: 'true', text: Formdict['header.form.true'] },
-        { value: 'false', text: Formdict['header.form.false'] }
+        { value: 'true', text: Formdict['model.true'] },
+        { value: 'false', text: Formdict['model.false'] }
       ]
     },
     {
@@ -509,126 +274,35 @@
       required: false,
       readonly: false,
       options: [
-        { value: 'true', text: Formdict['header.form.true'] },
-        { value: 'false', text: Formdict['header.form.false'] }
+        { value: 'true', text: Formdict['model.true'] },
+        { value: 'false', text: Formdict['model.false'] }
       ]
     }
   ]
 }
 
 /**
- * @description 鑾峰彇涓昏彍鍗曞熀鏈俊鎭〃鍗曢厤缃俊鎭�
- * @param {object} menu    // 涓昏〃鍩烘湰淇℃伅
- * @param {object} config  // 涓昏〃閰嶇疆淇℃伅
- */
-export function getMainMenuForm (menu, _config) {
-  return [
-    {
-      type: 'select',
-      key: 'fstMenuId',
-      label: '涓�绾ц彍鍗�',
-      initVal: menu.fstMenuId,
-      required: true,
-      readonly: false,
-      options: menu.fstMenuList
-    },
-    {
-      type: 'select',
-      key: 'parentId',
-      label: '浜岀骇鑿滃崟',
-      initVal: menu.ParentID,
-      required: true,
-      readonly: false,
-      options: menu.supMenuList
-    },
-    {
-      type: 'text',
-      key: 'MenuName',
-      label: Formdict['header.menu.menuName'],
-      initVal: menu.MenuName,
-      required: true,
-      readonly: false
-    },
-    {
-      type: 'text',
-      key: 'MenuNo',
-      label: Formdict['header.menu.menuNo'],
-      initVal: menu.MenuNo,
-      required: true,
-      readonly: false
-    },
-    {
-      type: 'select',
-      key: 'opentype',
-      label: Formdict['header.menu.openType'],
-      initVal: menu.PageParam.OpenType,
-      required: true,
-      options: [{
-        MenuID: 'newtab',
-        text: Formdict['header.form.tab']
-      }, {
-        MenuID: 'newpage',
-        text: Formdict['header.form.newpage']
-      }, {
-        MenuID: 'currenttab',
-        text: Formdict['header.form.currenttab']
-      }]
-    },
-    {
-      type: 'text',
-      key: 'easyCode',
-      label: Formdict['header.form.easyCode'],
-      initVal: _config.easyCode,
-      required: false,
-      readonly: false
-    }
-  ]
-}
-
-/**
- * @description 鑾峰彇瀛愯彍鍗曞熀鏈俊鎭〃鍗曢厤缃俊鎭�
- * @param {object} config  // 瀛愯〃閰嶇疆淇℃伅
- */
-export function getSubMenuForm (config) {
-  return [
-    {
-      type: 'text',
-      key: 'MenuName',
-      label: Formdict['header.menu.viewName'],
-      initVal: config.tabName,
-      required: true,
-      readonly: false
-    },
-    {
-      type: 'text',
-      key: 'MenuNo',
-      label: Formdict['header.menu.menuNo'],
-      initVal: config.tabNo,
-      required: true,
-      readonly: false
-    },
-    {
-      type: 'text',
-      key: 'Remark',
-      label: Formdict['header.menu.Remark'],
-      initVal: config.Remark,
-      required: false,
-      readonly: false
-    }
-  ]
-}
-
-/**
  * @description 鑾峰彇鎼滅储鏉′欢琛ㄥ崟閰嶇疆淇℃伅
- * @param {object} card       // 鎼滅储鏉′欢瀵硅薄
- * @param {Array}  roleList   // 瑙掕壊鍒楄〃
+ * @param {object} card           // 鎼滅储鏉′欢瀵硅薄
+ * @param {Array}  linkableFields // 鍙叧鑱斿瓧娈�
  */
-export function getSearchForm (card, roleList) {
+export function getSearchForm (card, linkableFields) {
+  let roleList = sessionStorage.getItem('sysRoles')
+  if (roleList) {
+    try {
+      roleList = JSON.parse(roleList)
+    } catch {
+      roleList = []
+    }
+  } else {
+    roleList = []
+  }
+
   return [
     {
       type: 'text',
       key: 'label',
-      label: Formdict['header.form.name'],
+      label: Formdict['model.name'],
       initVal: card.label || '',
       required: true,
       readonly: false
@@ -636,7 +310,7 @@
     {
       type: 'text',
       key: 'field',
-      label: Formdict['header.form.field'],
+      label: Formdict['model.form.field'],
       initVal: card.field || '',
       tooltipClass: 'middle',
       required: true,
@@ -645,36 +319,36 @@
     {
       type: 'select',
       key: 'type',
-      label: Formdict['header.form.type'],
+      label: Formdict['model.form.type'],
       initVal: card.type,
       required: true,
       options: [{
         value: 'text',
-        text: Formdict['header.form.text']
+        text: Formdict['model.form.text']
       }, {
         value: 'select',
-        text: Formdict['header.form.select']
+        text: Formdict['model.form.select']
       }, {
         value: 'multiselect',
-        text: Formdict['header.form.multiselect']
+        text: Formdict['model.form.multiselect']
       }, {
         value: 'link',
-        text: Formdict['header.form.link']
+        text: Formdict['model.form.link']
       }, {
         value: 'date',
-        text: Formdict['header.form.dateday']
+        text: Formdict['model.form.dateday']
       }, {
         value: 'dateweek',
-        text: Formdict['header.form.dateweek']
+        text: Formdict['model.form.dateweek']
       }, {
         value: 'datemonth',
-        text: Formdict['header.form.datemonth']
+        text: Formdict['model.form.datemonth']
       }, {
         value: 'daterange',
-        text: Formdict['header.form.daterange']
+        text: Formdict['model.form.daterange']
       }, {
         value: 'group',
-        text: '鏃ユ湡锛堢粍鍚堬級'
+        text: Formdict['model.form.dategroup']
       }]
     },
     {
@@ -689,6 +363,7 @@
       type: 'text',
       key: 'initval',
       label: Formdict['header.form.initval'],
+      tooltip: '绫诲瀷涓轰笅鎷夎彍鍗曟椂锛屽垵濮嬪�煎簲涓烘暟鎹殑Value鍊硷紙浣跨敤鏁版嵁婧愭椂锛屽簲涓恒�婂�悸峰瓧娈点�嬬殑鍊硷級',
       initVal: card.initval,
       required: false
     },
@@ -710,13 +385,13 @@
       type: 'radio',
       key: 'setAll',
       label: Formdict['header.form.setAll'],
-      initVal: card.setAll || 'false',
+      initVal: card.setAll || 'true',
       options: [{
         value: 'true',
-        text: Formdict['header.form.true']
+        text: Formdict['model.true']
       }, {
         value: 'false',
-        text: Formdict['header.form.false']
+        text: Formdict['model.false']
       }]
     },
     {
@@ -763,12 +438,13 @@
       }]
     },
     {
-      type: 'text',
+      type: 'select',
       key: 'linkField',
       label: Formdict['header.form.linkField'],
       initVal: card.linkField || '',
       required: true,
-      readonly: false
+      readonly: false,
+      options: linkableFields
     },
     {
       type: 'text',
@@ -830,20 +506,20 @@
         text: '>='
       }]
     },
-    {
-      type: 'select',
-      key: 'display',
-      label: Formdict['header.form.display'],
-      initVal: card.display || 'dropdown',
-      required: true,
-      options: [{
-        value: 'dropdown',
-        text: Formdict['header.form.dropdown']
-      }, {
-        value: 'button',
-        text: Formdict['header.form.button']
-      }]
-    },
+    // {
+    //   type: 'select',
+    //   key: 'display',
+    //   label: Formdict['header.form.display'],
+    //   initVal: card.display || 'dropdown',
+    //   required: true,
+    //   options: [{
+    //     value: 'dropdown',
+    //     text: Formdict['header.form.dropdown']
+    //   // }, {
+    //   //   value: 'button',
+    //   //   text: Formdict['header.form.button']
+    //   }]
+    // },
     {
       type: 'radio',
       key: 'database',
@@ -858,43 +534,40 @@
       }]
     },
     {
-      type: 'radio',
-      key: 'required',
-      label: Formdict['header.form.field.required'],
-      initVal: card.required || 'false',
-      options: [{
-        value: 'true',
-        text: Formdict['header.form.true']
-      }, {
-        value: 'false',
-        text: Formdict['header.form.false']
-      }]
-    },
-    {
       type: 'number',
       key: 'ratio',
       min: 1,
       max: 24,
       label: Formdict['header.form.ratio'],
-      tooltip: '姣忚鍒嗕负24浠斤紝姣斾緥鍙缃负1-24',
+      tooltip: '鏍呮牸甯冨眬锛屾瘡琛岀瓑鍒嗕负24鍒椼��',
       initVal: card.ratio,
       required: false
     },
     {
-      type: 'select',
-      key: 'quick',
-      label: Formdict['header.form.quickadd'],
-      initVal: '',
-      required: false,
-      options: []
+      type: 'radio',
+      key: 'required',
+      label: Formdict['model.required'],
+      initVal: card.required || 'false',
+      options: [{
+        value: 'true',
+        text: Formdict['model.true']
+      }, {
+        value: 'false',
+        text: Formdict['model.false']
+      }]
     },
     {
-      type: 'multiselect',
-      key: 'blacklist',
-      label: Formdict['header.form.blacklist'],
-      initVal: card.blacklist || [],
-      required: false,
-      options: roleList || []
+      type: 'radio',
+      key: 'Hide',
+      label: Formdict['model.hidden'],
+      initVal: card.Hide || 'false',
+      options: [{
+        value: 'true',
+        text: Formdict['model.true']
+      }, {
+        value: 'false',
+        text: Formdict['model.false']
+      }]
     },
     {
       type: 'radio',
@@ -904,11 +577,32 @@
       tooltip: '鏁版嵁鏌ヨ鏃讹紝绫诲瀷瀛楁鏄惁浣滀负鍙傛暟浼犻�掞紝绫诲瀷瀛楁瀵瑰簲鍊间负 {"鏃�": "day", "鍛�": "week", "鏈�": "month", "瀛�": "quarter", "骞�": "year", "鑷畾涔�": "customized"}銆�',
       options: [{
         value: 'true',
-        text: Formdict['header.form.true']
+        text: Formdict['model.true']
       }, {
         value: 'false',
-        text: Formdict['header.form.false']
+        text: Formdict['model.false']
       }]
+    },
+    {
+      type: 'radio',
+      key: 'labelShow',
+      label: '鏄剧ず鍚嶇О',
+      initVal: card.labelShow || 'true',
+      options: [{
+        value: 'true',
+        text: Formdict['model.true']
+      }, {
+        value: 'false',
+        text: Formdict['model.false']
+      }]
+    },
+    {
+      type: 'multiselect',
+      key: 'blacklist',
+      label: Formdict['header.form.blacklist'],
+      initVal: card.blacklist || [],
+      required: false,
+      options: roleList || []
     }
   ]
 }
@@ -918,61 +612,72 @@
  * @param {*} card           缂栬緫鎸夐挳
  * @param {*} functip        鐢熸垚瀛樺偍杩囩▼鎻愮ず
  * @param {*} config         椤甸潰閰嶇疆
- * @param {*} permFuncField  瀛樺偍杩囩▼鍙敤鐨勫紑濮嬪瓧娈�
+ * @param {*} usefulFields   瀛樺偍杩囩▼鍙敤鐨勫紑濮嬪瓧娈�
  * @param {*} type           鎸夐挳绫诲瀷锛岀敤浜庡尯鍒嗗彲閫夌殑鎵撳紑鏂瑰紡
  */
-export function getActionForm (card, functip, config, permFuncField, type) {
+export function getActionForm (card, functip, config, usefulFields, type, menulist = [], printTemps = []) {
   let opentypes = [
     {
       value: 'pop',
-      text: Formdict['header.form.popform']
+      text: Formdict['model.form.popform']
     }, {
       value: 'prompt',
-      text: Formdict['header.form.prompt']
+      text: Formdict['model.form.prompt']
     }, {
       value: 'exec',
-      text: Formdict['header.form.exec']
+      text: Formdict['model.form.exec']
     }, {
       value: 'excelIn',
-      text: Formdict['header.form.excelIn']
+      text: Formdict['model.form.excelIn']
     }, {
       value: 'excelOut',
-      text: Formdict['header.form.excelOut']
+      text: Formdict['model.form.excelOut']
     }, {
       value: 'popview',
-      text: Formdict['header.form.popview']
+      text: Formdict['model.form.popview']
+    }, {
+      value: 'tab',
+      text: Formdict['model.form.tab']
+    }, {
+      value: 'innerpage',
+      text: Formdict['model.form.newpage']
+    }, {
+      value: 'funcbutton',
+      text: Formdict['model.form.funcbutton']
     }
   ]
 
+  // 鏍囩绫诲瀷锛屼富琛ㄦ墠浼氬瓨鍦ㄨ〃鍗曟爣绛鹃〉
+  let tabTems = [{
+    value: 'FormTab',
+    text: '琛ㄥ崟鏍囩椤�'
+  }]
   if (type === 'subtable') {
-    opentypes.push({
-      value: 'funcbutton',
-      text: Formdict['header.form.funcbutton']
-    })
-  } else {
-    opentypes.push({
-      value: 'tab',
-      text: Formdict['header.form.tab']
-    }, {
-      value: 'innerpage',
-      text: Formdict['header.form.newpage']
-    }, {
-      value: 'funcbutton',
-      text: Formdict['header.form.funcbutton']
-    })
+    tabTems = []
+  }
+
+  if (card.execSuccess === 'view' || card.execSuccess === 'refresh') { // refresh涓鸿〃鍗曟爣绛鹃〉
+    card.execSuccess = 'grid'
+  }
+  if (card.execError === 'view' || card.execSuccess === 'refresh') {
+    card.execError = 'grid'
+  }
+  if (card.popClose === 'view') {
+    card.popClose = 'grid'
   }
 
   let refresh = []
+
   if (type === 'subtable') { // 瀛愯〃椤甸潰锛屽彲璁剧疆鍒锋柊涓昏〃鍙婂悓绾ф爣绛�
+    if (card.focus) {
+      card.popClose = 'maingrid'
+    }
     refresh.push({
       value: 'maingrid',
       text: Formdict['header.form.refresh.maingrid']
     }, {
       value: 'equaltab',
       text: Formdict['header.form.refresh.equaltab']
-    }, {
-      value: 'mainline',
-      text: Formdict['header.form.refresh.mainline']
     })
   }
 
@@ -987,25 +692,63 @@
     },
     {
       type: 'radio',
-      key: 'intertype',
-      label: Formdict['header.form.intertype'],
-      initVal: card.intertype || 'inner',
+      key: 'funcType',
+      label: Formdict['header.form.funcType'],
+      initVal: card.funcType || '',
       required: true,
       options: [{
-        value: 'inner',
-        text: Formdict['header.form.interface.inner']
+        value: 'changeuser',
+        text: Formdict['header.form.func.changeuser']
       }, {
-        value: 'outer',
-        text: Formdict['header.form.interface.outer']
+        value: 'print',
+        text: '鏍囩鎵撳嵃'
       }]
     },
     {
       type: 'select',
+      key: 'execMode',
+      label: Formdict['model.form.execMode'],
+      initVal: card.execMode || 'exec',
+      required: true,
+      options: [{
+        value: 'exec',
+        text: Formdict['model.form.exec']
+      }, {
+        value: 'prompt',
+        text: Formdict['model.form.prompt']
+      }, {
+        value: 'pop',
+        text: Formdict['model.form.popform']
+      }]
+    },
+    {
+      type: 'radio',
+      key: 'intertype',
+      label: Formdict['header.form.intertype'],
+      initVal: card.intertype || 'system',
+      required: true,
+      options: []
+    },
+    {
+      type: 'radio',
+      key: 'procMode',
+      label: '鍙傛暟澶勭悊',
+      initVal: card.procMode || 'system',
+      required: true,
+      options: [{
+        value: 'system',
+        text: '绯荤粺鍑芥暟'
+      }, {
+        value: 'inner',
+        text: '鍐呴儴鍑芥暟'
+      }]
+    },
+    {
+      type: 'radio',
       key: 'sqlType',
       label: Formdict['header.form.action.type'],
       initVal: card.sqlType || '',
-      tooltip: Formdict['header.form.actionhelp.sqlType'],
-      required: false,
+      required: true,
       options: []
     },
     {
@@ -1019,10 +762,9 @@
     {
       type: 'text',
       key: 'sql',
-      label: Formdict['header.form.tablename'],
+      label: Formdict['model.form.tablename'],
       initVal: card.sql || config.setting.tableName || '',
-      tooltip: Formdict['header.form.actionhelp.tablename'],
-      required: false
+      required: true
     },
     {
       type: 'text',
@@ -1030,53 +772,22 @@
       label: Formdict['header.form.innerFunc'],
       initVal: card.innerFunc || '',
       tooltip: functip,
-      fields: permFuncField,
+      fields: usefulFields,
       tooltipClass: 'middle',
-      required: false,
+      required: card.intertype === 'inner',
       readonly: false
     },
-    {
-      type: 'select',
-      key: 'funcType',
-      label: Formdict['header.form.funcType'],
-      initVal: card.funcType || '',
-      required: true,
-      options: [{
-        value: 'changeuser',
-        text: Formdict['header.form.func.changeuser']
-      }, {
-        value: 'print',
-        text: Formdict['header.form.func.print']
-      }]
-    },
-    {
-      type: 'select',
-      key: 'execMode',
-      label: Formdict['header.form.execMode'],
-      initVal: card.execMode || 'exec',
-      required: true,
-      options: [{
-        value: 'exec',
-        text: Formdict['header.form.exec']
-      }, {
-        value: 'prompt',
-        text: Formdict['header.form.prompt']
-      }, {
-        value: 'pop',
-        text: Formdict['header.form.popform']
-      }]
-    },
-    {
-      type: 'select',
-      key: 'tabType',
-      label: Formdict['header.form.tabType'],
-      initVal: card.tabType || 'SubTable',
-      required: true,
-      options: [{
-        value: 'SubTable',
-        text: Formdict['header.menu.tab.subtable']
-      }]
-    },
+    // {
+    //   type: 'select',
+    //   key: 'tabType',
+    //   label: Formdict['model.form.tabType'],
+    //   initVal: card.tabType || 'SubTable',
+    //   required: true,
+    //   options: [{
+    //     value: 'SubTable',
+    //     text: Formdict['model.menu.tab.subtable']
+    //   }]
+    // },
     {
       type: 'select',
       key: 'linkTab',
@@ -1088,21 +799,38 @@
     {
       type: 'select',
       key: 'pageTemplate',
-      label: Formdict['header.form.newpage.type'],
+      label: Formdict['model.form.newpage.type'],
       initVal: card.pageTemplate || '',
       required: true,
       options: [{
-        value: 'print',
-        text: Formdict['header.menu.printTemplate']
+      //   value: 'print',
+      //   text: '鏍囩鎵撳嵃妯℃澘'
+      // }, {
+      //   value: 'billprintTemp',
+      //   text: '鍗曟嵁鎵撳嵃妯℃澘'
+      // }, {
+        value: 'billprint',
+        text: '鍗曟嵁鎵撳嵃'
+      }, {
+        value: 'pay',
+        text: Formdict['model.pay']
       }, {
         value: 'custom',
         text: Formdict['header.form.custom']
       }]
     },
     {
+      type: 'select',
+      key: 'printTemp',
+      label: '鎵撳嵃妯℃澘',
+      initVal: card.printTemp || '',
+      required: true,
+      options: printTemps
+    },
+    {
       type: 'text',
       key: 'url',
-      label: Formdict['header.form.newpage.url'],
+      label: Formdict['model.pageUrl'],
       initVal: card.url || '',
       required: true
     },
@@ -1114,10 +842,10 @@
       required: true,
       options: [{
         value: 'true',
-        text: Formdict['header.form.true']
+        text: Formdict['model.true']
       }, {
         value: 'false',
-        text: Formdict['header.form.false']
+        text: Formdict['model.false']
       }]
     },
     {
@@ -1129,12 +857,71 @@
       readonly: false
     },
     {
-      type: 'text',
+      type: 'textarea',
       key: 'interface',
-      label: Formdict['header.form.interface'],
+      label: '娴嬭瘯鍦板潃',
       initVal: card.sysInterface === 'true' ? (window.GLOB.mainSystemApi || '') : (card.interface || ''),
       required: true,
       readonly: card.sysInterface === 'true'
+    },
+    {
+      type: 'textarea',
+      key: 'proInterface',
+      label: '姝e紡鍦板潃',
+      initVal: card.proInterface || '',
+      tooltip: '姝e紡绯荤粺鎵�浣跨敤鐨勬帴鍙e湴鍧�銆�',
+      required: false
+    },
+    {
+      type: 'radio',
+      key: 'method',
+      label: '璇锋眰鏂瑰紡',
+      initVal: card.method || 'post',
+      required: true,
+      options: [{
+        value: 'get',
+        text: 'GET'
+      }, {
+        value: 'post',
+        text: 'POST'
+      }]
+    },
+    {
+      type: 'radio',
+      key: 'cross',
+      label: '璺ㄥ煙璇锋眰',
+      initVal: card.cross || 'true',
+      tooltip: '濡傛灉鑷畾涔夋帴鍙d笉鏀寔璺ㄥ煙璇锋眰锛屼細閫氳繃褰撳墠绯荤粺杞彂銆�',
+      required: false,
+      options: [{
+        value: 'true',
+        text: '鏀寔'
+      }, {
+        value: 'false',
+        text: '涓嶆敮鎸�'
+      }]
+    },
+    {
+      type: 'radio',
+      key: 'callbackType',
+      label: '鍥炶皟鏂瑰紡',
+      initVal: card.callbackType || 'script',
+      tooltip: '浣跨敤鍚庡彴鑴氭湰鎵ц鏃讹紝闇�瑕侀厤鍚堣鍒掍换鍔°��',
+      required: true,
+      options: [{
+        value: 'script',
+        text: '鑷畾涔夎剼鏈�'
+      }, {
+        value: 'default',
+        text: '鍚庡彴鑴氭湰'
+      }]
+    },
+    {
+      type: 'text',
+      key: 'cbTable',
+      label: '鍥炶皟琛ㄥ悕',
+      initVal: card.cbTable || '',
+      required: true
     },
     {
       type: 'text',
@@ -1145,7 +932,7 @@
       readonly: false
     },
     {
-      type: 'select',
+      type: 'radio',
       key: 'position',
       label: Formdict['header.form.position'],
       initVal: card.position || 'toolbar',
@@ -1169,46 +956,57 @@
     {
       type: 'select',
       key: 'tabTemplate',
-      label: '鏍囩妯℃澘',
-      initVal: card.tabTemplate || 'FormTab',
+      label: '鏍囩绫诲瀷',
+      initVal: card.tabTemplate || '',
       required: true,
-      options: [{
-        value: 'FormTab',
-        text: '甯︽爣绛捐〃鍗�'
-      }]
+      options: [
+        {
+          value: 'ThdMenu',
+          text: Formdict['model.menu.level3']
+        },
+        ...tabTems
+      ]
     },
     {
-      type: 'select',
+      type: 'cascader',
+      key: 'linkmenu',
+      label: Formdict['model.form.linkmenu'],
+      initVal: card.linkmenu || [],
+      required: true,
+      options: menulist
+    },
+    {
+      type: 'radio',
       key: 'afterExecSuccess',
       label: Formdict['header.form.afterExecSuccess'],
       initVal: card.afterExecSuccess || 'close',
       required: true,
       options: [{
         value: 'close',
-        text: Formdict['header.close']
+        text: Formdict['model.close']
       }, {
         value: 'notclose',
-        text: Formdict['header.notclose']
+        text: Formdict['model.notclose']
       }]
     },
     {
-      type: 'select',
+      type: 'radio',
       key: 'afterExecError',
       label: Formdict['header.form.afterExecError'],
       initVal: card.afterExecError || 'notclose',
       required: true,
       options: [{
         value: 'close',
-        text: Formdict['header.close']
+        text: Formdict['model.close']
       }, {
         value: 'notclose',
-        text: Formdict['header.notclose']
+        text: Formdict['model.notclose']
       }]
     },
     {
-      type: 'select',
+      type: refresh.length === 0 ? 'radio' : 'select',
       key: 'execSuccess',
-      label: Formdict['header.form.execSuccess'],
+      label: Formdict['model.form.afterSuccess'],
       initVal: card.execSuccess || 'never',
       required: true,
       options: [{
@@ -1217,16 +1015,13 @@
       }, {
         value: 'grid',
         text: Formdict['header.form.refresh.grid']
-      }, {
-        value: 'view',
-        text: Formdict['header.form.refresh.view']
       },
       ...refresh]
     },
     {
-      type: 'select',
+      type: refresh.length === 0 ? 'radio' : 'select',
       key: 'execError',
-      label: Formdict['header.form.execError'],
+      label: Formdict['model.form.afterError'],
       initVal: card.execError || 'never',
       required: true,
       options: [{
@@ -1235,13 +1030,11 @@
       }, {
         value: 'grid',
         text: Formdict['header.form.refresh.grid']
-      }, {
-        value: 'view',
-        text: Formdict['header.form.refresh.view']
-      }]
+      },
+      ...refresh]
     },
     {
-      type: 'select',
+      type: refresh.length === 0 ? 'radio' : 'select',
       key: 'popClose',
       label: Formdict['header.form.popClose'],
       initVal: card.popClose || 'never',
@@ -1252,16 +1045,27 @@
       }, {
         value: 'grid',
         text: Formdict['header.form.refresh.grid']
-      }, {
-        value: 'view',
-        text: Formdict['header.form.refresh.view']
       },
       ...refresh]
     },
     {
+      type: 'radio',
+      key: 'resetPageIndex',
+      label: '鍒锋柊鏃�',
+      initVal: card.resetPageIndex || 'true',
+      required: false,
+      options: [{
+        value: 'true',
+        text: '閲嶇疆椤电爜'
+      }, {
+        value: 'false',
+        text: '涓嶉噸缃�'
+      }]
+    },
+    {
       type: 'select',
       key: 'icon',
-      label: Formdict['header.form.icon'],
+      label: Formdict['model.icon'],
       initVal: card.icon,
       required: false,
       options: []
@@ -1269,15 +1073,29 @@
     {
       type: 'select',
       key: 'class',
-      label: Formdict['header.form.class'],
+      label: Formdict['model.form.color'],
       initVal: card.class,
       required: false,
       options: []
     },
     {
+      type: 'radio',
+      key: 'joint',
+      label: Formdict['model.form.paramJoint'],
+      initVal: card.joint || 'true',
+      required: false,
+      options: [{
+        value: 'true',
+        text: Formdict['model.true']
+      }, {
+        value: 'false',
+        text: Formdict['model.false']
+      }]
+    },
+    {
       type: 'text',
       key: 'sheet',
-      label: Formdict['header.form.tablename'],
+      label: Formdict['model.form.tablename'],
       initVal: card.sheet || config.setting.tableName || '',
       required: true
     },
@@ -1289,10 +1107,10 @@
       required: false,
       options: [{
         value: 'true',
-        text: Formdict['header.form.true']
+        text: Formdict['model.true']
       }, {
         value: 'false',
-        text: Formdict['header.form.false']
+        text: Formdict['model.false']
       }]
     },
     {
@@ -1315,22 +1133,36 @@
 /**
  * @description 鑾峰彇鏄剧ず鍒楄〃鍗曢厤缃俊鎭�
  * @param {object} card       // 鎼滅储鏉′欢瀵硅薄
- * @param {Array}  roleList   // 瑙掕壊鍒楄〃-榛戝悕鍗�
  * @param {Array}  menulist   // 鑿滃崟鍒楄〃-鐢ㄤ簬瀛楁閫忚
  */
-export function getColumnForm (card, roleList = [], menulist = []) {
+export function getColumnForm (card, menulist = [], fields = []) {
+  let roleList = sessionStorage.getItem('sysRoles')
+  if (roleList) {
+    try {
+      roleList = JSON.parse(roleList)
+    } catch {
+      roleList = []
+    }
+  } else {
+    roleList = []
+  }
+
+  if (!card.linkurl && (!card.linkmenu || card.linkmenu.length === 0)) {
+    card.perspective = ''
+  }
+
   return [
     {
       type: 'text',
       key: 'label',
-      label: Formdict['header.form.name'],
+      label: Formdict['model.name'],
       initVal: card.label,
       required: true
     },
     {
       type: 'text',
       key: 'field',
-      label: Formdict['header.form.field'],
+      label: Formdict['model.form.field'],
       initVal: card.field,
       required: true,
       readonly: false
@@ -1338,22 +1170,36 @@
     {
       type: 'select',
       key: 'type',
-      label: Formdict['header.form.type'],
+      label: Formdict['model.form.type'],
       initVal: card.type,
       required: true,
       options: [{
         value: 'text',
-        text: Formdict['header.form.text']
+        text: Formdict['model.form.text']
       }, {
         value: 'number',
-        text: Formdict['header.form.number']
+        text: Formdict['model.form.number']
       }, {
         value: 'picture',
-        text: Formdict['header.form.picture']
+        text: Formdict['model.form.picture']
+      }, {
+        value: 'link',
+        text: Formdict['model.form.href']
       }, {
         value: 'textarea',
-        text: Formdict['header.form.textarea']
+        text: Formdict['model.form.textarea']
+      }, {
+        value: 'index',
+        text: '搴忓彿'
       }]
+    },
+    {
+      type: 'text',
+      key: 'nameField',
+      label: Formdict['model.name'] + Formdict['model.form.field'],
+      initVal: card.nameField,
+      required: false,
+      readonly: false
     },
     {
       type: 'number',
@@ -1361,53 +1207,97 @@
       min: 1,
       max: 1000,
       decimal: 0,
-      label: Formdict['header.form.columnWidth'],
+      label: Formdict['model.form.columnWidth'],
       initVal: card.Width,
       required: true
     },
     {
       type: 'radio',
+      key: 'joint',
+      label: Formdict['model.form.paramJoint'],
+      initVal: card.joint || 'true',
+      required: true,
+      options: [{
+        value: 'true',
+        text: Formdict['model.true']
+      }, {
+        value: 'false',
+        text: Formdict['model.false']
+      }]
+    },
+    {
+      type: 'radio',
       key: 'Hide',
-      label: Formdict['header.form.Hide'],
+      label: Formdict['model.hidden'],
       initVal: card.Hide || 'false',
       required: true,
       options: [{
         value: 'true',
-        text: Formdict['header.form.true']
+        text: Formdict['model.true']
       }, {
         value: 'false',
-        text: Formdict['header.form.false']
+        text: Formdict['model.false']
       }]
     },
     {
       type: 'radio',
       key: 'IsSort',
-      label: Formdict['header.form.IsSort'],
+      label: Formdict['model.sort'],
       initVal: card.IsSort || 'true',
       required: true,
       options: [{
         value: 'true',
-        text: Formdict['header.form.true']
+        text: Formdict['model.true']
       }, {
         value: 'false',
-        text: Formdict['header.form.false']
+        text: Formdict['model.false']
       }]
     },
     {
       type: 'radio',
       key: 'Align',
-      label: Formdict['header.form.align'],
+      label: Formdict['model.form.align'],
       initVal: card.Align || 'left',
       required: true,
       options: [{
         value: 'left',
-        text: Formdict['header.form.alignLeft']
+        text: Formdict['model.form.alignLeft']
       }, {
         value: 'center',
-        text: Formdict['header.form.alignCenter']
+        text: Formdict['model.form.alignCenter']
       }, {
         value: 'right',
-        text: Formdict['header.form.alignRight']
+        text: Formdict['model.form.alignRight']
+      }]
+    },
+    {
+      type: 'radio',
+      key: 'rowspan',
+      label: '琛屽悎骞�',
+      initVal: card.rowspan || 'false',
+      tooltip: '鐩搁偦琛屼俊鎭浉鍚屾椂锛屽崟鍏冩牸鍚堝苟銆�',
+      required: false,
+      options: [{
+        value: 'true',
+        text: Formdict['model.true']
+      }, {
+        value: 'false',
+        text: Formdict['model.false']
+      }]
+    },
+    {
+      type: 'radio',
+      key: 'sum',
+      label: '鏄剧ず鍚堣',
+      initVal: card.sum || 'false',
+      tooltip: '鍚堣淇℃伅鍙湪浣跨敤绯荤粺鏁版嵁婧愶紝涓斿綋鍓嶅垪鏈殣钘忔椂鏈夋晥銆�',
+      required: false,
+      options: [{
+        value: 'true',
+        text: Formdict['model.true']
+      }, {
+        value: 'false',
+        text: Formdict['model.false']
       }]
     },
     {
@@ -1421,28 +1311,48 @@
       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 || '',
       options: [{
         value: '',
-        text: Formdict['header.form.empty']
+        text: Formdict['model.empty']
       }, {
         value: 'thdSeparator',
         text: Formdict['header.form.thdSeparator']
       }, {
         value: 'percent',
         text: '鐧惧垎姣�'
+      }, {
+        value: 'abs',
+        text: '缁濆鍊�'
       }],
       required: false
     },
     {
-      type: 'number',
-      key: 'fieldlength',
-      label: Formdict['header.form.field.length'],
-      initVal: card.fieldlength || (card.type === 'text' ? 50 : 512),
-      required: true
+      type: 'select',
+      key: 'textFormat',
+      label: Formdict['header.form.format'],
+      initVal: card.textFormat || '',
+      options: [{
+        value: '',
+        text: Formdict['model.empty']
+      }, {
+        value: 'YYYY-MM-DD',
+        text: 'YYYY-MM-DD'
+      }, {
+        value: 'YYYY-MM-DD HH:mm:ss',
+        text: 'YYYY-MM-DD HH:mm:ss'
+      }],
+      required: false
     },
     {
       type: 'text',
@@ -1481,19 +1391,50 @@
       required: false,
       options: [{
         value: 'true',
-        text: Formdict['header.form.true']
+        text: Formdict['model.true']
       }, {
         value: 'false',
-        text: Formdict['header.form.false']
+        text: Formdict['model.false']
+      }]
+    },
+    {
+      type: 'radio',
+      key: 'perspective',
+      label: '瀛楁閫忚',
+      initVal: card.perspective || '',
+      options: [{
+        value: '',
+        text: '鏃�'
+      }, {
+        value: 'linkmenu',
+        text: '鑿滃崟'
+      }, {
+        value: 'linkurl',
+        text: '閾炬帴'
       }]
     },
     {
       type: 'cascader',
       key: 'linkmenu',
-      label: Formdict['header.form.linkmenu'],
+      label: Formdict['model.menu'],
       initVal: card.linkmenu || [],
-      required: false,
+      required: true,
       options: menulist
+    },
+    {
+      type: 'textarea',
+      key: 'linkurl',
+      label: '閾炬帴鍦板潃',
+      initVal: card.linkurl || '',
+      required: true
+    },
+    {
+      type: 'multiselect',
+      key: 'linkfields',
+      label: '鍏宠仈瀛楁',
+      initVal: card.linkfields || [],
+      required: false,
+      options: fields
     },
     {
       type: 'multiselect',
@@ -1508,11 +1449,23 @@
 
 /**
  * @description 鑾峰彇鍥捐〃瑙嗗浘澶栭儴閰嶇疆琛ㄥ崟
- * @param {object} card       // 鎼滅储鏉′欢瀵硅薄
- * @param {Array}  roleList   // 瑙掕壊鍒楄〃-榛戝悕鍗�
- * @param {Array}  columns    // 鏄剧ず鍒�
+ * @param {object} card         // 鎼滅储鏉′欢瀵硅薄
+ * @param {Array}  columns      // 鏄剧ず鍒�
+ * @param {Array}  actions      // 鎸夐挳缁別xcel
+ * @param {Array}  extraActions // 甯歌鎸夐挳
  */
-export function getChartViewForm (card, roleList = [], _columns) {
+export function getChartViewForm (card, _columns, actions, extraActions) {
+  let roleList = sessionStorage.getItem('sysRoles')
+  if (roleList) {
+    try {
+      roleList = JSON.parse(roleList)
+    } catch {
+      roleList = []
+    }
+  } else {
+    roleList = []
+  }
+
   let _charts = [{
     value: 'line',
     text: '鎶樼嚎鍥�'
@@ -1564,15 +1517,15 @@
     {
       type: 'radio',
       key: 'Hide',
-      label: Formdict['header.form.Hide'],
+      label: Formdict['model.hidden'],
       initVal: card.Hide,
       required: true,
       options: [{
         value: 'true',
-        text: Formdict['header.form.true']
+        text: Formdict['model.true']
       }, {
         value: 'false',
-        text: Formdict['header.form.false']
+        text: Formdict['model.false']
       }]
     },
     {
@@ -1582,49 +1535,18 @@
       max: 24,
       decimal: 0,
       label: '鍥捐〃瀹藉害',
-      tooltip: '姣忚绛夊垎涓�24鍒楋紝24鍗充负100%銆�',
+      tooltip: '鏍呮牸甯冨眬锛屾瘡琛岀瓑鍒嗕负24鍒椼��',
       initVal: card.width || 24,
       required: true
     },
     {
-      type: 'radio',
-      key: 'over',
-      label: '瓒呭嚭鏃�',
-      initVal: card.over || 'whole',
-      required: true,
-      hidden: true,
-      options: [{
-        value: 'whole',
-        text: '灞曠ず鍏ㄩ儴'
-      }, {
-        value: 'roll',
-        text: '婊氬姩'
-      }]
-    },
-    {
-      type: 'radio',
-      key: 'widthType',
-      label: '瀹藉害璁剧疆',
-      initVal: card.over === 'roll' ? 'absolute' : card.widthType || 'ratio',
-      required: true,
-      hidden: true,
-      readonly: card.over === 'roll',
-      options: [{
-        value: 'ratio',
-        text: '姣斾緥'
-      }, {
-        value: 'absolute',
-        text: '缁濆鍊�'
-      }]
-    },
-    {
       type: 'number',
       key: 'cardWidth',
-      min: card.widthType === 'absolute' ? 50 : 1,
-      max: card.widthType === 'absolute' ? 1000 : 24,
+      min: 1,
+      max: 24,
       decimal: 0,
       label: '鍗$墖瀹藉害',
-      tooltip: '绫诲瀷涓烘瘮渚嬫椂锛岃寖鍥�1-24锛�24鍗充负100%锛涚被鍨嬩负缁濆鍊硷紝鑼冨洿50-1000銆�',
+      tooltip: '鏍呮牸甯冨眬锛屾瘡琛岀瓑鍒嗕负24鍒椼��',
       initVal: card.cardWidth || 6,
       hidden: true,
       required: true
@@ -1670,19 +1592,13 @@
       }]
     },
     {
-      type: 'radio',
-      key: 'insert',
-      label: '娣诲姞鍗$墖',
-      initVal: card.insert || 'false',
-      tooltip: '閫夋嫨鏄剧ず娣诲姞鍗$墖锛屼笖瀛樺湪鎿嶄綔绫诲瀷涓烘坊鍔犵殑鎸夐挳鏃讹紝鍗$墖灏鹃儴浼氬鍔犳坊鍔犲姛鑳藉崱鐗囷紙鍙樉绀虹涓�涓坊鍔犳寜閽級',
+      type: 'select',
+      key: 'extraAction',
+      label: '鎵╁睍鍗$墖',
+      initVal: card.extraAction || '',
+      tooltip: '缁戝畾涓嶉�夎鐨勬寜閽紝鍗$墖灏鹃儴浼氬鍔犲姛鑳藉崱鐗�',
       required: false,
-      options: [{
-        value: 'true',
-        text: '鏄剧ず'
-      }, {
-        value: 'false',
-        text: '闅愯棌'
-      }]
+      options: extraActions
     },
     {
       type: 'multiselect',
@@ -1691,6 +1607,15 @@
       initVal: card.blacklist || [],
       required: false,
       options: roleList
+    },
+    {
+      type: 'multiselect',
+      key: 'actions',
+      label: '鎵╁睍鎸夐挳',
+      initVal: card.actions || [],
+      tooltip: '鍙粦瀹氬凡鏈夌殑excel瀵煎叆銆佸鍑烘寜閽�',
+      required: false,
+      options: actions
     }
   ]
 }
@@ -1868,10 +1793,10 @@
       forbid: !['line', 'bar'].includes(card.chartType),
       options: [{
         value: 'true',
-        text: Formdict['header.form.true']
+        text: Formdict['model.true']
       }, {
         value: 'false',
-        text: Formdict['header.form.false']
+        text: Formdict['model.false']
       }]
     },
     {
@@ -1961,13 +1886,13 @@
       required: true
     }, {
       type: 'number',
-      key: 'correction',
-      label: '鏁版嵁淇',
-      tooltip: '褰撴暟鎹」灏戜簬璁剧疆鍊兼椂锛岀郴缁熶細鑷姩淇锛堥伩鍏嶆煴褰㈠浘杩囧锛�,鍦ㄨ嚜瀹氫箟涓紝璁剧疆涓烘姌绾垮浘鏃跺け鏁堛��',
+      key: 'barSize',
+      label: '鏌卞舰瀹藉害',
+      tooltip: '绌哄�兼椂锛屽搴﹁嚜閫傚簲銆�',
       min: 5,
-      max: 30,
+      max: 100,
       decimal: 0,
-      initVal: card.correction,
+      initVal: card.barSize,
       forbid: !['bar'].includes(card.chartType),
       required: false
     }
@@ -1978,12 +1903,30 @@
  * @description 鑾峰彇琛ㄥ崟閰嶇疆淇℃伅
  * @param {*} card            // 琛ㄥ崟瀵硅薄
  * @param {*} inputfields     // 鍙叧鑱旇〃鍗�
+ * @param {*} tabfields       // 鍙垏鎹㈣〃鍗�
  * @param {*} linkableFields  // 鍙叧鑱旇〃鍗�
  * @param {*} linksupFields   // 涓婄骇琛ㄥ崟
  * @param {*} subtable        // 鏄惁涓哄瓙琛ㄨ〃鍗�
- * @param {*} roleList        // 瑙掕壊鍒楄〃-榛戝悕鍗�
  */
-export function getModalForm (card, inputfields, linkableFields, linksupFields, subtable = false, roleList = []) {
+export function getModalForm (card, inputfields = [], tabfields = [], linkableFields, linksupFields, subtable = false) {
+  let roleList = sessionStorage.getItem('sysRoles')
+  if (roleList) {
+    try {
+      roleList = JSON.parse(roleList)
+      roleList = roleList.map(role => {
+        return {
+          uuid: role.uuid,
+          field: role.value,
+          label: role.text
+        }
+      })
+    } catch {
+      roleList = []
+    }
+  } else {
+    roleList = []
+  }
+  
   let _openType = []
   let _fieldlength = 50
 
@@ -1994,15 +1937,17 @@
     })
   }
 
-  if (card.type === 'textarea' || card.type === 'fileupload' || card.type === 'multiselect') {
+  if (['fileupload', 'multiselect', 'checkbox'].includes(card.type)) {
     _fieldlength = 512
+  } else if (['textarea', 'brafteditor'].includes(card.type)) {
+    _fieldlength = 8000
   }
 
   return [
     {
       type: 'text',
       key: 'label',
-      label: Formdict['header.form.name'],
+      label: Formdict['model.name'],
       initVal: card.label,
       required: true,
       readonly: false
@@ -2010,7 +1955,7 @@
     {
       type: 'text',
       key: 'field',
-      label: Formdict['header.form.field'],
+      label: Formdict['model.form.field'],
       initVal: card.field || '',
       required: true,
       readonly: false
@@ -2018,42 +1963,66 @@
     {
       type: 'select',
       key: 'type',
-      label: Formdict['header.form.type'],
+      label: Formdict['model.form.type'],
       initVal: card.type,
       required: true,
       options: [{
         value: 'text',
-        text: Formdict['header.form.text']
+        text: Formdict['model.form.text']
       }, {
         value: 'number',
-        text: Formdict['header.form.number']
+        text: Formdict['model.form.number']
       }, {
         value: 'select',
-        text: Formdict['header.form.select']
+        text: Formdict['model.form.select']
       }, {
         value: 'multiselect',
-        text: Formdict['header.form.multiselect']
+        text: Formdict['model.form.multiselect']
       }, {
         value: 'link',
-        text: Formdict['header.form.link']
+        text: Formdict['model.form.link']
+      }, {
+        value: 'switch',
+        text: '寮�鍏�'
+      }, {
+        value: 'checkbox',
+        text: '澶氶�夋'
+      }, {
+        value: 'radio',
+        text: '鍗曢�夋'
+      }, {
+        value: 'checkcard',
+        text: '閫夐」鍗�'
       }, {
         value: 'fileupload',
         text: Formdict['header.form.fileupload']
       }, {
         value: 'date',
-        text: Formdict['header.form.dateday']
+        text: Formdict['model.form.dateday']
       }, {
         value: 'datemonth',
-        text: Formdict['header.form.datemonth']
+        text: Formdict['model.form.datemonth']
       }, {
         value: 'datetime',
-        text: Formdict['header.form.datetime']
+        text: Formdict['model.form.datetime']
       }, {
         value: 'textarea',
-        text: Formdict['header.form.textarea']
+        text: Formdict['model.form.textarea']
+      }, {
+        value: 'color',
+        text: Formdict['model.form.color']
+      }, {
+        value: 'brafteditor',
+        text: '瀵屾枃鏈�'
       }, {
         value: 'funcvar',
         text: Formdict['header.form.funcvar']
+      }, {
+        value: 'hint',
+        text: '鎻愮ず'
+      }, {
+        value: 'split',
+        text: '鍒嗛殧绾�'
       },
       ..._openType]
     },
@@ -2061,7 +2030,44 @@
       type: 'text',
       key: 'initval',
       label: Formdict['header.form.initval'],
+      tooltip: '涓嬫媺澶氶�変笌澶氶�夋锛屾坊鍔犲涓垵濮嬪�艰浣跨敤鈥�,鈥濆彿鍒嗛殧銆傛敞锛氫笅鎷夐�夋嫨銆佽仈鍔ㄨ彍鍗曟垨鍗曢�夋涓�$first琛ㄧず閫夋嫨绗竴椤�',
       initVal: card.initval || '',
+      required: false
+    },
+    {
+      type: 'textarea',
+      key: 'message',
+      label: '鎻愮ず淇℃伅',
+      initVal: card.message || '',
+      required: true,
+      readonly: false
+    },
+    {
+      type: 'text',
+      key: 'openVal',
+      label: '寮�鍚��',
+      initVal: card.openVal || '',
+      required: false
+    },
+    {
+      type: 'text',
+      key: 'closeVal',
+      label: '鍏抽棴鍊�',
+      initVal: card.closeVal || '',
+      required: false
+    },
+    {
+      type: 'text',
+      key: 'openText',
+      label: '寮�鍚彁绀�',
+      initVal: card.openText || '',
+      required: false
+    },
+    {
+      type: 'text',
+      key: 'closeText',
+      label: '鍏抽棴鎻愮ず',
+      initVal: card.closeText || '',
       required: false
     },
     {
@@ -2080,30 +2086,99 @@
     },
     {
       type: 'radio',
-      key: 'setAll',
-      label: Formdict['header.form.setAll'],
-      initVal: card.setAll || 'false',
+      key: 'display',
+      label: '鏄剧ず',
+      initVal: card.display || 'text',
+      required: true,
       options: [{
-        value: 'true',
-        text: Formdict['header.form.true']
+        value: 'text',
+        text: '鏂囨湰'
       }, {
-        value: 'false',
-        text: Formdict['header.form.false']
+        value: 'picture',
+        text: '鍥剧墖'
       }]
     },
     {
-      type: 'textarea',
-      key: 'dataSource',
-      label: Formdict['header.form.datasource'],
-      initVal: card.dataSource || '',
+      type: 'number',
+      key: 'width',
+      min: 1,
+      max: 24,
+      precision: 0,
+      label: '鍗$墖瀹藉害',
+      initVal: card.width || 4,
+      tooltip: '鏍呮牸甯冨眬锛屾瘡琛岀瓑鍒嗕负24鍒椼��',
+      required: true
+    },
+    {
+      type: 'text',
+      key: 'cardValField',
+      label: Formdict['header.form.valueField'],
+      initVal: card.cardValField || 'Value',
+      required: true,
+      readonly: false
+    },
+    {
+      type: 'text',
+      key: 'urlField',
+      label: '鍦板潃瀛楁',
+      initVal: card.urlField || '',
+      required: true,
+      readonly: false
+    },
+    {
+      type: 'radio',
+      key: 'ratio',
+      label: '鍥剧墖姣斾緥',
+      initVal: card.ratio || '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',
+      key: 'setAll',
+      label: '璁剧疆绌哄��',
+      initVal: card.setAll || 'false',
+      options: [{
+        value: 'true',
+        text: Formdict['model.true']
+      }, {
+        value: 'false',
+        text: Formdict['model.false']
+      }]
+    },
+    {
+      type: 'fields',
+      key: 'fields',
+      label: '瀛楁闆�',
+      initVal: card.fields || [],
       required: true,
       readonly: false
     },
     {
       type: 'options',
       key: 'options',
-      label: '',
+      label: '閫夐」',
       initVal: card.options || [],
+      required: true,
+      readonly: false
+    },
+    {
+      type: 'codemirror',
+      key: 'dataSource',
+      label: Formdict['header.form.datasource'],
+      initVal: card.dataSource || '',
       required: true,
       readonly: false
     },
@@ -2154,8 +2229,25 @@
       }]
     },
     {
+      type: 'radio',
+      key: 'multiple',
+      label: '鍙閫�',
+      initVal: card.multiple || 'false',
+      required: true,
+      options: [{
+        value: 'true',
+        text: '鏄�'
+      }, {
+        value: 'false',
+        text: '鍚�'
+      }]
+    },
+    {
       type: 'number',
       key: 'decimal',
+      min: 0,
+      max: 18,
+      precision: 0,
       label: Formdict['header.form.decimal'],
       initVal: card.decimal || 0,
       required: true
@@ -2177,7 +2269,10 @@
     {
       type: 'number',
       key: 'fieldlength',
-      label: Formdict['header.form.field.length'],
+      min: 1,
+      max: 1000000,
+      precision: 0,
+      label: Formdict['model.form.field'] + Formdict['model.length'],
       tooltip: '鏂囨湰銆佷笅鎷夋銆佹棩鏈熺瓑瀛楁榛樿闀垮害涓�50锛屽琛屾枃鏈笌鏂囦欢涓婁紶瀛楁榛樿闀垮害涓�512',
       initVal: card.fieldlength || _fieldlength,
       required: false
@@ -2185,6 +2280,9 @@
     {
       type: 'number',
       key: 'maxRows',
+      min: 2,
+      max: 100,
+      precision: 0,
       label: Formdict['header.form.maxRows'],
       initVal: card.maxRows || 6,
       required: false
@@ -2196,10 +2294,10 @@
       initVal: card.regular || '',
       options: [{
         value: '',
-        text: Formdict['header.form.empty']
+        text: Formdict['model.empty']
       }, {
         value: 'number',
-        text: Formdict['header.form.number']
+        text: Formdict['model.form.number']
       }, {
         value: 'letter',
         text: Formdict['header.form.letter']
@@ -2207,40 +2305,6 @@
         value: 'letter&number',
         text: Formdict['header.form.letter&number']
       }]
-    },
-    {
-      type: 'select',
-      key: 'supField',
-      label: '涓婄骇琛ㄥ崟',
-      tooltip: '涓婄骇琛ㄥ崟涓轰笅鎷夐�夋嫨鎴栧叧鑱旇彍鍗曪紝璁剧疆涓婄骇琛ㄥ崟鍚庯紝璇ヨ〃鍗曞彈鎺т簬涓婄骇鑿滃崟锛屾敞锛氬彈鎺у叧绯诲湪璇ヨ〃鍗曢殣钘忔椂澶辨晥銆�',
-      initVal: card.supField || '',
-      required: false,
-      readonly: false,
-      options: linksupFields
-    },
-    {
-      type: 'text',
-      key: 'supvalue',
-      label: '鏄剧ず鍊�',
-      tooltip: '閫夋嫨涓婄骇琛ㄥ崟鍚庯紝濉啓鏄剧ず鍊硷紝鍙湁涓婄骇琛ㄥ崟鍊间笌鏄剧ず鍊肩浉鍚屾椂锛岃琛ㄥ崟鎵嶄細鏄剧ず锛屾敞锛氬涓�肩敤閫楀彿鍒嗛殧銆�',
-      initVal: card.supvalue || '',
-      required: true,
-      readonly: false
-    },
-    {
-      type: 'select',
-      key: 'quick',
-      label: Formdict['header.form.quickadd'],
-      initVal: '',
-      required: false,
-      options: []
-    },
-    {
-      type: 'multiselect',
-      key: 'linkSubField',
-      label: Formdict['header.form.linkForm'],
-      initVal: card.linkSubField || [],
-      options: inputfields
     },
     {
       type: 'select',
@@ -2261,9 +2325,25 @@
     {
       type: 'number',
       key: 'maxfile',
+      min: 1,
+      max: 1000000,
+      precision: 0,
       label: '鏈�澶ф枃浠舵暟',
       initVal: card.maxfile || '',
       required: false
+    },
+    {
+      type: 'radio',
+      key: 'hidelabel',
+      label: '闅愯棌鍚嶇О',
+      initVal: card.hidelabel || 'false',
+      options: [{
+        value: 'true',
+        text: Formdict['model.true']
+      }, {
+        value: 'false',
+        text: Formdict['model.false']
+      }]
     },
     {
       type: 'radio',
@@ -2272,36 +2352,36 @@
       initVal: card.readonly || 'false',
       options: [{
         value: 'true',
-        text: Formdict['header.form.true']
+        text: Formdict['model.true']
       }, {
         value: 'false',
-        text: Formdict['header.form.false']
+        text: Formdict['model.false']
       }]
     },
     {
       type: 'radio',
       key: 'required',
-      label: Formdict['header.form.field.required'],
+      label: Formdict['model.required'],
       initVal: card.required || 'true',
       options: [{
         value: 'true',
-        text: Formdict['header.form.true']
+        text: Formdict['model.true']
       }, {
         value: 'false',
-        text: Formdict['header.form.false']
+        text: Formdict['model.false']
       }]
     },
     {
       type: 'radio',
       key: 'hidden',
-      label: Formdict['header.form.field.ishidden'],
+      label: Formdict['model.hidden'],
       initVal: card.hidden || 'false',
       options: [{
         value: 'true',
-        text: Formdict['header.form.true']
+        text: Formdict['model.true']
       }, {
         value: 'false',
-        text: Formdict['header.form.false']
+        text: Formdict['model.false']
       }]
     },
     {
@@ -2325,39 +2405,173 @@
       initVal: card.readin || 'true',
       options: [{
         value: 'true',
-        text: Formdict['header.form.true']
+        text: Formdict['model.true']
       }, {
         value: 'false',
-        text: Formdict['header.form.false']
+        text: Formdict['model.false']
       }]
     },
-    
+    {
+      type: 'radio',
+      key: 'writein',
+      label: '鎵ц杩愮畻',
+      tooltip: '琛ㄥ崟鎻愪氦鏃讹紝鏄惁灏嗚瀛楁鍊煎啓鍏ラ粯璁ql璇彞涓��',
+      initVal: card.writein || 'true',
+      options: [{
+        value: 'true',
+        text: Formdict['model.true']
+      }, {
+        value: 'false',
+        text: Formdict['model.false']
+      }]
+    },
+    {
+      type: 'radio',
+      key: 'declareType',
+      label: '鏁版嵁绫诲瀷',
+      tooltip: '澹版槑鍙橀噺鏃剁殑绫诲瀷锛屾椂闂存牸寮廳atetime鎴栨枃鏈牸寮弉varchar(50)銆�',
+      initVal: card.declareType || 'datetime',
+      options: [{
+        value: 'datetime',
+        text: 'datetime'
+      }, {
+        value: 'nvarchar(50)',
+        text: 'nvarchar(50)'
+      }]
+    },
+    {
+      type: 'number',
+      key: 'span',
+      min: 1,
+      max: 24,
+      precision: 0,
+      label: '琛ㄥ崟瀹藉害',
+      initVal: card.span || (['textarea', 'hint', 'checkcard', 'brafteditor'].includes(card.type) ? 24 : 12),
+      tooltip: '鏍呮牸甯冨眬鏁磋24绛夊垎銆�',
+      required: true
+    },
+    {
+      type: 'number',
+      key: 'labelwidth',
+      min: 1,
+      max: 100,
+      precision: 1,
+      label: '鍚嶇О瀹藉害',
+      initVal: card.labelwidth || 33.3,
+      tooltip: '鍚嶇О鍗犳嵁琛ㄥ崟瀹藉害鐨勭櫨鍒嗘瘮銆傛敞锛氬瓨鍦ㄥ鍒楄〃鍗曟椂锛屽綋鍓嶈〃鍗曞鏋滄兂瑕佸崰鎹暣琛屽彲鍙傜収浠ヤ笅姣斾緥锛屼袱鍒楋紙16.2锛夈�佷笁鍒楋紙10.5锛夈�佸洓鍒楋紙7.7锛�',
+      required: true
+    },
+    {
+      type: 'text',
+      key: 'suffix',
+      label: '鍚庣紑鍚�',
+      tooltip: '鍙互涓婁紶鏂囦欢鐨勫悗缂�鍚嶏紝澶氫釜绫诲瀷鐢ㄩ�楀彿鍒嗛殧锛岀┖鍊兼椂涓嶆牎楠屻��',
+      initVal: card.suffix || '',
+      required: false,
+      readonly: false
+    },
     {
       type: 'radio',
       key: 'encryption',
       label: '鍔犲瘑浼犺緭',
-      initVal: card.encryption || 'false',
+      initVal: card.type === 'brafteditor' ? (card.encryption || 'true') : (card.encryption || 'false'),
       options: [{
         value: 'true',
-        text: Formdict['header.form.true']
+        text: Formdict['model.true']
       }, {
         value: 'false',
-        text: Formdict['header.form.false']
+        text: Formdict['model.false']
       }]
     },
     {
       type: 'radio',
       key: 'interception',
-      label: '鎴彇',
+      label: '鎴彇绌烘牸',
       initVal: card.interception || 'false',
       tooltip: '鎻愪氦鏃讹紝鏄惁鎴彇棣栧熬鐨勭┖鐧藉瓧绗︺��',
       options: [{
         value: 'true',
-        text: Formdict['header.form.true']
+        text: Formdict['model.true']
       }, {
         value: 'false',
-        text: Formdict['header.form.false']
+        text: Formdict['model.false']
       }]
+    },
+    {
+      type: 'select',
+      key: 'supField',
+      label: '涓婄骇琛ㄥ崟',
+      tooltip: '涓婄骇琛ㄥ崟涓轰笅鎷夐�夋嫨銆佽仈鍔ㄨ彍鍗曘�佸崟閫夋鍙婂閫夋锛屾坊鍔犲悗璇ヨ〃鍗曟樉绀哄強闅愯棌灏嗗彈涓婄骇琛ㄥ崟鎺у埗锛屾敞锛氬彈鎺у叧绯诲湪璇ヨ〃鍗曢殣钘忔椂澶辨晥銆�',
+      initVal: card.supField || '',
+      required: false,
+      readonly: false,
+      options: linksupFields
+    },
+    {
+      type: 'text',
+      key: 'supvalue',
+      label: '鏄剧ず鍊�',
+      tooltip: '璇峰~鍐欐樉绀哄�硷紝鍙湁涓婄骇琛ㄥ崟鍊间笌鏄剧ず鍊肩浉鍚屾椂锛岃琛ㄥ崟鎵嶄細鏄剧ず锛屾敞锛氬涓�肩敤閫楀彿鍒嗛殧銆�',
+      initVal: card.supvalue || '',
+      required: true,
+      readonly: false
+    },
+    {
+      type: 'text',
+      key: 'tooltip',
+      label: '鎮诞鎻愮ず',
+      tooltip: '榧犳爣鎮诞浜庢彁绀烘枃瀛椾笂鏂规椂锛屾樉绀烘彁绀轰俊鎭��',
+      initVal: card.tooltip || '',
+      required: false
+    },
+    {
+      type: 'text',
+      key: 'extra',
+      label: '搴曢儴鎻愮ず',
+      tooltip: '鏄剧ず浜庤〃鍗曞簳閮ㄣ��',
+      initVal: card.extra || '',
+      required: false
+    },
+    {
+      type: 'text',
+      key: 'emptyText',
+      label: '绌哄�兼枃鏈�',
+      tooltip: '绌哄�肩殑鎻愮ず鏂囨湰锛岄�夋嫨璁剧疆绌哄�兼椂鏈夋晥锛岄粯璁ゅ�间负銆婄┖銆嬨��',
+      initVal: card.emptyText || '',
+      required: false
+    },
+    {
+      type: 'radio',
+      key: 'enter',
+      label: '鍥炶溅浜嬩欢',
+      initVal: (card.type === 'text' || card.type === 'number') ? (card.enter || 'sub') : (card.enter || 'false'),
+      tooltip: '鐐瑰嚮Enter閿紝鎴栨枃鏈被琛ㄥ崟杈撳叆鍥炶溅绗︺��',
+      options: [{
+        value: 'sub',
+        text: '鎻愪氦'
+      }, {
+        value: 'tab',
+        text: '鍒囨崲'
+      }, {
+        value: 'false',
+        text: '鏃犲姩浣�'
+      }]
+    },
+    {
+      type: 'select',
+      key: 'tabField',
+      label: '鍒囨崲瀛楁',
+      initVal: card.tabField || '',
+      options: tabfields,
+      required: false
+    },
+    {
+      type: 'multiselect',
+      key: 'linkSubField',
+      label: Formdict['model.form.linkform'],
+      tooltip: '鍦ㄥ垏鎹㈤�夐」鏃朵細鎶婁俊鎭嚜鍔ㄥ~鍏ュ叧鑱旂殑琛ㄥ崟锛堟枃鏈垨鏁板瓧琛ㄥ崟锛変腑銆�',
+      initVal: card.linkSubField || [],
+      options: inputfields
     },
     {
       type: 'multiselect',
@@ -2388,17 +2602,17 @@
       initVal: card.label || '',
       required: true
     },
-    {
-      type: 'select',
-      key: 'type',
-      label: Formdict['header.form.tabType'],
-      initVal: card.type || 'SubTable',
-      required: true,
-      options: [{
-        value: 'SubTable',
-        text: Formdict['header.menu.tab.subtable']
-      }]
-    },
+    // {
+    //   type: 'select',
+    //   key: 'type',
+    //   label: Formdict['model.form.tabType'],
+    //   initVal: card.type || 'SubTable',
+    //   required: true,
+    //   options: [{
+    //     value: 'SubTable',
+    //     text: Formdict['model.menu.tab.subtable']
+    //   }]
+    // },
     {
       type: 'select',
       key: 'linkTab',
@@ -2410,12 +2624,12 @@
     {
       type: 'select',
       key: 'icon',
-      label: Formdict['header.menu.icon'],
+      label: Formdict['model.icon'],
       initVal: card.icon || '',
       required: false,
       options: [{
         value: '',
-        text: Formdict['header.form.empty']
+        text: Formdict['model.empty']
       }, {
         value: 'table',
         text: 'table'
@@ -2428,7 +2642,8 @@
       }, {
         value: 'line-chart',
         text: 'line-chart'
-      }]
+      }],
+      forbid: type === 'CalendarPage'
     },
     {
       type: 'select',
@@ -2436,7 +2651,8 @@
       label: Formdict['header.form.supTab'],
       initVal: supMenu,
       required: false,
-      options: menus
+      options: menus,
+      forbid: type === 'CalendarPage'
     },
     {
       type: 'mutilselect',
@@ -2445,7 +2661,8 @@
       tooltip: '濡傛灉瀛愭爣绛句腑鍚湁鍒锋柊鍚岀骇鏍囩鐨勬寜閽紝鍦ㄦ澶勬坊鍔犻渶瑕佸埛鏂扮殑鏍囩銆�',
       initVal: equalTab,
       required: false,
-      options: equalTabs
+      options: equalTabs,
+      forbid: type === 'CalendarPage'
     },
     {
       type: 'text',
@@ -2453,7 +2670,8 @@
       label: '澶栭敭',
       tooltip: '澶栭敭鏃ㄥ湪鏍囩椤典腑鎵ц榛樿鍑芥暟锛堟坊鍔狅級鏃讹紝鏇挎崲BID瀛楁',
       initVal: card.foreignKey || '',
-      required: false
+      required: false,
+      forbid: type === 'CalendarPage'
     },
     {
       type: 'number',
@@ -2473,7 +2691,7 @@
       initVal: card.searchPass || 'false',
       tooltip: '浣跨敤涓昏〃鎼滅储鏉′欢鏃讹紝涓昏〃鐨勬悳绱㈡潯浠朵細浼犲叆瀛愯〃涓��',
       required: false,
-      forbid: type !== 'CommonTable',
+      forbid: type !== 'CommonTable' && type !== 'CalendarPage',
       options: [{
         value: 'true',
         text: '浣跨敤'
@@ -2491,9 +2709,8 @@
  * @param {array}   _columns    // 鏄剧ず鍒�
  * @param {string}  _type       // 绫诲瀷锛屽崱鐗囩殑閮ㄤ綅
  * @param {array}   _actions    // 鎸夐挳鍒楄〃
- * @param {boolean} isRatioCard // 琛ㄦ牸瀹藉害绫诲瀷锛屾槸鍚︿负姣斾緥
  */
-export function getCardDetailForm (card, _columns, _type, _actions = [], isRatioCard) {
+export function getCardDetailForm (card, _columns, _type, _actions = []) {
   let actions = ''
   if (_type === 'bottom') {
     actions = card.actions ? card.actions.map(cell => cell.value) : []
@@ -2540,7 +2757,7 @@
       key: 'content',
       label: '鍐呭',
       initVal: card.content || '',
-      required: true,
+      required: _type !== 'header',
       forbid: !['detail', 'header'].includes(_type),
     },
     {
@@ -2619,7 +2836,7 @@
       label: '瀹藉害(%)',
       initVal: card.width || 100,
       required: true,
-      forbid: !['detail'].includes(_type)
+      forbid: !['detail', 'avatar'].includes(_type)
     },
     {
       type: 'number',
@@ -2630,34 +2847,6 @@
       initVal: card.height || 1,
       required: true,
       forbid: !['detail'].includes(_type)
-    },
-    {
-      type: 'radio',
-      key: 'widthType',
-      label: '瀹藉害璁剧疆',
-      initVal: card.widthType || 'ratio',
-      required: false,
-      forbid: !['avatar'].includes(_type),
-      hidden: true,
-      readonly: !!isRatioCard,
-      options: [{
-        value: 'ratio',
-        text: '姣斾緥'
-      }, {
-        value: 'absolute',
-        text: '缁濆鍊�'
-      }]
-    },
-    {
-      type: 'number',
-      key: 'width',
-      label: '瀹藉害鍊�',
-      initVal: card.width || 32,
-      min: 1,
-      max: card.widthType === 'ratio' ? 100 : 500,
-      required: false,
-      hidden: true,
-      forbid: !['avatar'].includes(_type)
     },
     {
       type: 'radio',
@@ -2730,6 +2919,21 @@
         value: 'all',
         text: '鍏ㄩ儴'
       }]
-    }
+    },
+    {
+      type: 'radio',
+      key: 'display',
+      label: '鏄剧ず',
+      initVal: card.display || 'inline',
+      required: false,
+      forbid: !['avatar'].includes(_type),
+      options: [{
+        value: 'block',
+        text: '鏁磋'
+      }, {
+        value: 'inline',
+        text: '鑷姩'
+      }]
+    },
   ]
 }
\ No newline at end of file

--
Gitblit v1.8.0