From cb9ade2afd2a367ad767bc605ab7086c695dd010 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 09 十二月 2022 15:53:32 +0800
Subject: [PATCH] 2022-12-09

---
 src/templates/zshare/formconfig.jsx | 1189 ++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 766 insertions(+), 423 deletions(-)

diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index 5761a1e..ecbc867 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -1,8 +1,4 @@
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
 import { formRule, btnClasses } from '@/utils/option.js'
-
-const Formdict = sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
 
 /**
  * @description 鑾峰彇鏍戝舰椤甸潰璁剧疆琛ㄥ崟閰嶇疆淇℃伅
@@ -13,6 +9,17 @@
 export function getTreeSettingForm (setting, usefulFields = [], MenuID) {
   let str = '^(' + usefulFields.join('|') + ')'
   let _patten = new RegExp(str + formRule.func.innerPattern + '$', 'g')
+  let rules = [{
+    max: formRule.func.max,
+    message: formRule.func.maxMessage
+  }]
+
+  if (usefulFields.length > 0) {
+    rules.push({
+      pattern: _patten,
+      message: formRule.func.innerMessage
+    })
+  }
 
   return [
     {
@@ -46,31 +53,32 @@
     {
       type: 'radio',
       key: 'interType',
-      label: Formdict['header.form.intertype'],
+      label: '鎺ュ彛绫诲瀷',
       initVal: setting.interType || 'inner',
       required: false,
       readonly: false,
       options: [
-        { value: 'inner', text: Formdict['model.interface.inner'] },
-        { value: 'outer', text: Formdict['model.interface.outer'] }
+        { value: 'inner', text: '鍐呴儴' },
+        { value: 'outer', text: '澶栭儴' }
       ]
     },
     {
       type: 'radio',
       key: 'sysInterface',
-      label: Formdict['header.form.sysInterface'],
+      label: '绯荤粺鎺ュ彛',
       initVal: setting.sysInterface || 'false',
+      tooltip: '鍗曠偣鐧诲綍绯荤粺',
       required: false,
       readonly: false,
       options: [
-        { value: 'true', text: Formdict['model.true'] },
-        { value: 'false', text: Formdict['model.false'] }
+        { value: 'true', text: '鏄�' },
+        { value: 'false', text: '鍚�' }
       ]
     },
     {
       type: 'text',
       key: 'interface',
-      label: Formdict['header.form.interface'],
+      label: '鎺ュ彛鍦板潃',
       initVal: setting.sysInterface === 'true' ? (window.GLOB.mainSystemApi || '') : (setting.interface || ''),
       required: true,
       readonly: setting.sysInterface === 'true',
@@ -84,7 +92,7 @@
     {
       type: 'text',
       key: 'outerFunc',
-      label: Formdict['header.form.outerFunc'],
+      label: '澶栭儴鍑芥暟',
       initVal: setting.outerFunc || '',
       required: false,
       readonly: false,
@@ -101,21 +109,13 @@
     {
       type: 'text',
       key: 'innerFunc',
-      label: Formdict['header.form.innerFunc'],
+      label: '鍐呴儴鍑芥暟',
       initVal: setting.innerFunc || '',
-      tooltip: '寮�澶村彲鐢ㄥ瓧绗︼細' + usefulFields.join(', '),
+      tooltip: usefulFields.length ? '寮�澶村彲鐢ㄥ瓧绗︼細' + usefulFields.join(', ') : '',
       placement: 'bottomLeft',
       required: false,
       readonly: false,
-      rules: [
-        {
-          pattern: _patten,
-          message: formRule.func.innerMessage
-        }, {
-          max: formRule.func.max,
-          message: formRule.func.maxMessage
-        }
-      ]
+      rules: rules
     },
     {
       type: 'datasource',
@@ -262,8 +262,8 @@
       required: false,
       readonly: false,
       options: [
-        { value: 'true', text: Formdict['model.true'] },
-        { value: 'false', text: Formdict['model.false'] }
+        { value: 'true', text: '鏄�' },
+        { value: 'false', text: '鍚�' }
       ]
     },
     {
@@ -274,8 +274,8 @@
       required: false,
       readonly: false,
       options: [
-        { value: 'true', text: Formdict['model.true'] },
-        { value: 'false', text: Formdict['model.false'] }
+        { value: 'true', text: '鏄�' },
+        { value: 'false', text: '鍚�' }
       ]
     }
   ]
@@ -286,7 +286,7 @@
  * @param {object} card           // 鎼滅储鏉′欢瀵硅薄
  * @param {Array}  linkableFields // 鍙叧鑱斿瓧娈�
  */
-export function getSearchForm (card, linkableFields) {
+export function getSearchForm (card, linkableFields, columns, position) {
   let roleList = sessionStorage.getItem('sysRoles')
   let appType = sessionStorage.getItem('appType')
   if (roleList) {
@@ -318,46 +318,43 @@
       text: '閫夐」鍗�'
     }, {
       value: 'date',
-      text: Formdict['model.form.dateday']
+      text: '鏃ユ湡锛堝ぉ锛�'
     }, {
       value: 'datemonth',
-      text: Formdict['model.form.datemonth']
-    // }, {
-    //   value: 'daterange',
-    //   text: Formdict['model.form.daterange']
+      text: '鏃ユ湡锛堟湀锛�'
     }]
 
   } else {
     typeOptions = [{
       value: 'text',
-      text: Formdict['model.form.text']
+      text: '鏂囨湰'
     }, {
       value: 'select',
-      text: Formdict['model.form.select']
+      text: '涓嬫媺閫夋嫨'
     }, {
       value: 'multiselect',
-      text: Formdict['model.form.multiselect']
+      text: '涓嬫媺澶氶��'
     }, {
       value: 'link',
-      text: Formdict['model.form.link']
+      text: '鑱斿姩鑿滃崟'
     }, {
       value: 'checkcard',
       text: '閫夐」鍗�'
     }, {
       value: 'date',
-      text: Formdict['model.form.dateday']
+      text: '鏃ユ湡锛堝ぉ锛�'
     }, {
       value: 'dateweek',
-      text: Formdict['model.form.dateweek']
+      text: '鏃ユ湡锛堝懆锛�'
     }, {
       value: 'datemonth',
-      text: Formdict['model.form.datemonth']
+      text: '鏃ユ湡锛堟湀锛�'
     }, {
       value: 'daterange',
-      text: Formdict['model.form.daterange']
+      text: '鏃ユ湡锛堝尯闂达級'
     }, {
       value: 'group',
-      text: Formdict['model.form.dategroup']
+      text: '鏃ユ湡锛堢粍鍚堬級'
     }]
   }
 
@@ -387,21 +384,22 @@
     {
       type: 'text',
       key: 'label',
-      label: Formdict['model.name'],
+      label: '鍚嶇О',
       initVal: card.label || '',
       required: true
     },
     {
       type: 'text',
       key: 'field',
-      label: Formdict['model.form.field'],
+      label: '瀛楁',
       initVal: card.field || '',
-      required: true
+      required: true,
+      options: columns
     },
     {
       type: 'select',
       key: 'type',
-      label: Formdict['model.form.type'],
+      label: '绫诲瀷',
       initVal: card.type,
       required: true,
       options: typeOptions
@@ -416,7 +414,7 @@
     {
       type: 'text',
       key: 'initval',
-      label: Formdict['header.form.initval'],
+      label: '鍒濆鍊�',
       tooltip: '绫诲瀷涓轰笅鎷夎彍鍗曟椂锛屽垵濮嬪�煎簲涓烘暟鎹殑Value鍊硷紙浣跨敤鏁版嵁婧愭椂锛屽簲涓恒�婂�悸峰瓧娈点�嬬殑鍊硷級;绫诲瀷涓烘暟鍊硷紙鍖洪棿锛夋椂锛屽垵濮嬪�间娇鐢ㄩ�楀彿鎷兼帴锛屼緥濡� 3,10',
       initVal: card.initval,
       required: false
@@ -429,10 +427,10 @@
       required: true,
       options: [{
         value: '0',
-        text: Formdict['header.form.custom']
+        text: '鑷畾涔�'
       }, {
         value: '1',
-        text: Formdict['header.form.datasource']
+        text: '鏁版嵁婧�'
       }]
     },
     // {
@@ -442,10 +440,10 @@
     //   initVal: card.setAll || 'true',
     //   options: [{
     //     value: 'true',
-    //     text: Formdict['model.true']
+    //     text: '鏄�'
     //   }, {
     //     value: 'false',
-    //     text: Formdict['model.false']
+    //     text: '鍚�'
     //   }]
     // },
     {
@@ -460,6 +458,9 @@
       }, {
         value: 'picture',
         text: '鍥剧墖'
+      }, {
+        value: 'color',
+        text: '鑹插潡'
       }]
     },
     {
@@ -517,7 +518,7 @@
     {
       type: 'codemirror',
       key: 'dataSource',
-      label: Formdict['header.form.datasource'],
+      label: '鏁版嵁婧�',
       initVal: card.dataSource || '',
       required: true
     },
@@ -605,34 +606,19 @@
       initVal: card.orderType || 'asc',
       options: [{
         value: 'asc',
-        text: Formdict['header.form.asc']
+        text: '姝ｅ簭'
       }, {
         value: 'desc',
-        text: Formdict['header.form.desc']
+        text: '鍊掑簭'
       }]
     },
     {
       type: 'select',
       key: 'match',
-      label: Formdict['header.form.match'],
+      label: '鍖归厤妯″紡',
       initVal: card.match || 'like',
       required: true,
-      options: [{
-        value: 'like',
-        text: 'like'
-      }, {
-        value: 'equal',
-        text: 'equal'
-      }, {
-        value: 'greater',
-        text: '>'
-      }, {
-        value: 'less',
-        text: '<'
-      }, {
-        value: 'greaterequal',
-        text: '>='
-      }]
+      options: []
     },
     {
       type: 'radio',
@@ -652,7 +638,7 @@
       key: 'ratio',
       min: 1,
       max: 24,
-      label: Formdict['header.form.ratio'],
+      label: '姣斾緥',
       tooltip: '鏍呮牸甯冨眬锛屾瘡琛岀瓑鍒嗕负24鍒椼��',
       initVal: card.ratio || 6,
       forbid: appType === 'mob',
@@ -692,27 +678,27 @@
     {
       type: 'radio',
       key: 'required',
-      label: Formdict['model.required'],
+      label: '蹇呭～',
       initVal: card.required || 'false',
       options: [{
         value: 'true',
-        text: Formdict['model.true']
+        text: '鏄�'
       }, {
         value: 'false',
-        text: Formdict['model.false']
+        text: '鍚�'
       }]
     },
     {
       type: 'radio',
       key: 'Hide',
-      label: Formdict['model.hidden'],
+      label: '闅愯棌',
       initVal: card.Hide || 'false',
       options: [{
         value: 'true',
-        text: Formdict['model.true']
+        text: '鏄�'
       }, {
         value: 'false',
-        text: Formdict['model.false']
+        text: '鍚�'
       }]
     },
     {
@@ -737,10 +723,10 @@
     //   tooltip: '鏁版嵁鏌ヨ鏃讹紝绫诲瀷瀛楁鏄惁浣滀负鍙傛暟浼犻�掞紝绫诲瀷瀛楁瀵瑰簲鍊间负 {"鏃�": "day", "鍛�": "week", "鏈�": "month", "瀛�": "quarter", "骞�": "year", "鑷畾涔�": "customized"}銆�',
     //   options: [{
     //     value: 'true',
-    //     text: Formdict['model.true']
+    //     text: '鏄�'
     //   }, {
     //     value: 'false',
-    //     text: Formdict['model.false']
+    //     text: '鍚�'
     //   }]
     // },
     {
@@ -786,14 +772,14 @@
       key: 'advanced',
       label: '楂樼骇鎼滅储',
       initVal: card.advanced || 'false',
-      tooltip: '鍦ㄩ殣钘忔悳绱㈡寜閽椂锛岄珮绾ф悳绱㈡棤鏁堛��',
-      forbid: appType === 'mob',
+      tooltip: '鍦ㄩ珮绾ф悳绱互妯℃�佹鎴栨娊灞夊睍寮�鏃讹紝鎼滅储鏉′欢鍦ㄥ紑鍙戠晫闈㈠崰姣斾负6锛屽疄闄呮晥鏋滆鍦ㄨ繍琛屾椂鏌ョ湅銆�',
+      forbid: appType === 'mob' || position === 'header',
       options: [{
         value: 'true',
-        text: Formdict['model.true']
+        text: '鏄�'
       }, {
         value: 'false',
-        text: Formdict['model.false']
+        text: '鍚�'
       }]
     },
     {
@@ -826,27 +812,38 @@
       }]
     },
     {
+      type: 'radio',
+      key: 'selectStyle',
+      label: '閫変腑鏁堟灉',
+      tooltip: '鑳屾櫙鍙婃枃瀛楀彉鍖栨椂浼氫娇鐢ㄧ郴缁熻壊銆�',
+      initVal: card.selectStyle || (card.backgroundColor ? 'custom' : 'background'),
+      options: [{
+        value: 'background',
+        text: '鑳屾櫙鍙樺寲'
+      }, {
+        value: 'font',
+        text: '鏂囧瓧鍙樺寲'
+      }, {
+        value: 'custom',
+        text: '鑷畾涔�'
+      }]
+    },
+    {
       type: 'color',
       key: 'backgroundColor',
       label: '鑳屾櫙鑹�',
       initVal: card.backgroundColor || '',
       tooltip: '璁剧疆鑳屾櫙鑹插悗锛岄�変腑鏁堟灉鐢辫儗鏅鑹叉帶鍒躲��',
-      required: false
-    },
-    {
-      type: 'color',
-      key: 'borderColor',
-      label: '杈规棰滆壊',
-      initVal: card.borderColor || '',
-      required: false
+      required: true
     },
     {
       type: 'multiselect',
       key: 'blacklist',
-      label: Formdict['header.form.blacklist'],
+      label: '榛戝悕鍗�',
       initVal: card.blacklist || [],
       required: false,
-      options: roleList || []
+      options: roleList || [],
+      forbid: appType === 'mob'
     }
   ]
 }
@@ -864,31 +861,31 @@
   let opentypes = [
     {
       value: 'pop',
-      text: Formdict['model.form.popform']
+      text: '寮圭獥锛堣〃鍗曪級'
     }, {
       value: 'prompt',
-      text: Formdict['model.form.prompt']
+      text: '鎻愮ず妗�'
     }, {
       value: 'exec',
-      text: Formdict['model.form.exec']
+      text: '鐩存帴鎵ц'
     }, {
       value: 'excelIn',
-      text: Formdict['model.form.excelIn']
+      text: '瀵煎叆Excel'
     }, {
       value: 'excelOut',
-      text: Formdict['model.form.excelOut']
+      text: '瀵煎嚭Excel'
     }, {
       value: 'popview',
-      text: Formdict['model.form.popview']
+      text: '寮圭獥锛堟爣绛撅級'
     }, {
       value: 'tab',
-      text: Formdict['model.form.tab']
+      text: '鏍囩椤�'
     }, {
       value: 'innerpage',
-      text: Formdict['model.form.newpage']
+      text: '鏂伴〉闈�'
     }, {
       value: 'funcbutton',
-      text: Formdict['model.form.funcbutton']
+      text: '鍔熻兘鎸夐挳'
     }
   ]
 
@@ -920,6 +917,8 @@
       value: 'equaltab',
       text: '鍒锋柊鍚岀骇鏍囩'
     })
+  } else if (card.execSuccess === 'maingrid') {
+    card.execSuccess = 'grid'
   }
 
   if (card.OpenType === 'blank') {
@@ -929,78 +928,18 @@
     card.control = 'disabled'
   }
 
+  if (card.intertype === 'outer' && !card.procMode && !card.innerFunc) { // 鍏煎澶栭儴鍑芥暟鐩翠紶绫诲瀷
+    card.procMode = 'none'
+  }
+
   return [
     {
       type: 'select',
       key: 'OpenType',
-      label: Formdict['header.form.openType'],
+      label: '鎵撳紑鏂瑰紡',
       initVal: card.OpenType,
       required: true,
       options: opentypes
-    },
-    {
-      type: 'select',
-      key: 'funcType',
-      label: '鍔熻兘绫诲瀷',
-      initVal: card.funcType || '',
-      required: true,
-      options: [{
-        value: 'changeuser',
-        text: '鍒囨崲鐢ㄦ埛'
-      }, {
-        value: 'print',
-        text: '鏍囩鎵撳嵃'
-      }, {
-        value: 'closetab',
-        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 || '',
-      required: true,
-      options: []
     },
     {
       type: 'text',
@@ -1011,20 +950,116 @@
       readonly: false
     },
     {
+      type: 'select',
+      key: 'funcType',
+      label: '鍔熻兘绫诲瀷',
+      initVal: card.funcType || '',
+      required: true,
+      options: [{
+        value: 'print',
+        text: '鏍囩鎵撳嵃'
+      }, {
+        value: 'refund',
+        text: '閫�娆�'
+      }, {
+        value: 'changeuser',
+        text: '鍒囨崲鐢ㄦ埛'
+      }, {
+        value: 'closetab',
+        text: '鏍囩鍏抽棴'
+      }, {
+        value: 'megvii',
+        text: '鏃疯闈㈡澘鏈�'
+      }, {
+        value: 'filezip',
+        text: '鏂囦欢鍘嬬缉鍖�'
+      }]
+    },
+    { // 鏃疯闈㈡澘鏈烘帴鍙� 寰呮墿灞�
+      type: 'radio',
+      key: 'subFunc',
+      label: '鎺ュ彛鍚嶇О',
+      initVal: card.subFunc || 'addUser',
+      required: true,
+      options: [
+        { value: 'addUser', text: '娣诲姞鐢ㄦ埛' },
+      ]
+    },
+    {
+      type: 'select',
+      key: 'execMode',
+      label: '鎵ц鏂瑰紡',
+      initVal: card.execMode || 'exec',
+      required: true,
+      options: [{
+        value: 'exec',
+        text: '鐩存帴鎵ц'
+      }, {
+        value: 'prompt',
+        text: '鎻愮ず妗�'
+      }, {
+        value: 'pop',
+        text: '寮圭獥锛堣〃鍗曪級'
+      }]
+    },
+    {
+      type: 'radio',
+      key: 'intertype',
+      label: '鎺ュ彛绫诲瀷',
+      initVal: card.intertype || 'system',
+      required: true,
+      options: []
+    },
+    {
+      type: 'radio',
+      key: 'procMode',
+      label: '鍙傛暟澶勭悊',
+      initVal: card.procMode || (card.innerFunc ? 'inner' : 'system'),
+      tooltip: '褰撹繑鍥炲�煎瓨鍦� mk_ex_invoke 涓斿�间负 false 鏃讹紝涓嶄細璋冪敤澶栭儴鎺ュ彛銆�',
+      required: true,
+      options: [{
+        value: 'system',
+        text: '绯荤粺鍑芥暟'
+      }, {
+        value: 'inner',
+        text: '鍐呴儴鍑芥暟'
+      }, {
+        value: 'none',
+        text: '鏃�'
+      }]
+    },
+    {
+      type: 'radio',
+      key: 'sqlType',
+      label: '鎿嶄綔绫诲瀷',
+      initVal: card.sqlType || '',
+      required: true,
+      options: []
+    },
+    {
       type: 'text',
       key: 'sql',
-      label: Formdict['model.form.tablename'],
+      label: '琛ㄥ悕',
       initVal: card.sql || config.setting.tableName || '',
       required: true
     },
     {
       type: 'text',
       key: 'innerFunc',
-      label: Formdict['header.form.innerFunc'],
+      label: '鍐呴儴鍑芥暟',
       initVal: card.innerFunc || '',
-      tooltip: `鍑芥暟鍚嶇О闇�浠�${usefulFields.join(', ')}绛夊瓧绗﹀紑濮嬨�俙,
+      tooltip: usefulFields.length ? `鍑芥暟鍚嶇О闇�浠�${usefulFields.join(', ')}绛夊瓧绗﹀紑濮嬨�俙 : '',
       fields: usefulFields,
       required: card.intertype === 'inner',
+      readonly: false
+    },
+    {
+      type: 'text',
+      key: 'urlkey',
+      label: '鍦板潃瀛楁',
+      initVal: card.urlkey || '',
+      tooltip: '鍥剧墖锛堟枃浠讹級閾炬帴鐨勫瓧娈靛悕銆�',
+      required: false,
       readonly: false
     },
     {
@@ -1044,7 +1079,7 @@
     {
       type: 'select',
       key: 'pageTemplate',
-      label: Formdict['model.form.newpage.type'],
+      label: '椤甸潰绫诲瀷',
       initVal: card.pageTemplate || '',
       required: true,
       options: [{
@@ -1058,10 +1093,10 @@
         text: '鍗曟嵁鎵撳嵃'
       }, {
         value: 'pay',
-        text: Formdict['model.pay']
+        text: '鏀粯'
       }, {
         value: 'custom',
-        text: Formdict['header.form.custom']
+        text: '鑷畾涔�'
       }]
     },
     {
@@ -1075,28 +1110,29 @@
     {
       type: 'text',
       key: 'url',
-      label: Formdict['model.pageUrl'],
+      label: '椤甸潰鍦板潃',
       initVal: card.url || '',
       required: true
     },
     {
       type: 'radio',
       key: 'sysInterface',
-      label: Formdict['header.form.sysInterface'],
+      label: '绯荤粺鎺ュ彛',
       initVal: card.sysInterface || 'false',
+      tooltip: '鍗曠偣鐧诲綍绯荤粺',
       required: true,
       options: [{
         value: 'true',
-        text: Formdict['model.true']
+        text: '鏄�'
       }, {
         value: 'false',
-        text: Formdict['model.false']
+        text: '鍚�'
       }]
     },
     {
       type: 'text',
       key: 'outerFunc',
-      label: Formdict['header.form.outerFunc'],
+      label: '澶栭儴鍑芥暟',
       initVal: card.outerFunc || '',
       required: false,
       readonly: false
@@ -1150,7 +1186,7 @@
       type: 'radio',
       key: 'callbackType',
       label: '鍥炶皟鏂瑰紡',
-      initVal: card.callbackType || 'script',
+      initVal: card.callbackType || (card.callbackFunc ? 'func' : 'none'),
       tooltip: '浣跨敤鍚庡彴鑴氭湰鎵ц鏃讹紝闇�瑕侀厤鍚堣鍒掍换鍔°��',
       required: true,
       options: [{
@@ -1159,6 +1195,12 @@
       }, {
         value: 'default',
         text: '鍚庡彴鑴氭湰'
+      }, {
+        value: 'func',
+        text: '鍥炶皟鍑芥暟'
+      }, {
+        value: 'none',
+        text: '鏃�'
       }]
     },
     {
@@ -1171,9 +1213,9 @@
     {
       type: 'text',
       key: 'callbackFunc',
-      label: Formdict['header.form.callbackFunc'],
+      label: '鍥炶皟鍑芥暟',
       initVal: card.callbackFunc || '',
-      required: false,
+      required: true,
       readonly: false
     },
     {
@@ -1184,16 +1226,16 @@
       required: true,
       options: [{
         value: 'toolbar',
-        text: Formdict['header.form.toolbar']
+        text: '宸ュ叿鏍�'
       }, {
         value: 'grid',
-        text: Formdict['header.form.grid']
+        text: '琛ㄦ牸'
       }]
     },
     {
       type: 'select',
       key: 'Ot',
-      label: Formdict['header.form.isRequired'],
+      label: '琛岃缃�',
       initVal: card.Ot || 'requiredSgl',
       required: true,
       options: []
@@ -1201,7 +1243,7 @@
     {
       type: 'cascader',
       key: 'linkmenu',
-      label: Formdict['model.form.linkmenu'],
+      label: '鍏宠仈鑿滃崟',
       initVal: card.linkmenu || [],
       required: true,
       options: menulist
@@ -1217,7 +1259,7 @@
     {
       type: refresh.length === 0 ? 'radio' : 'select',
       key: 'execSuccess',
-      label: Formdict['model.form.afterSuccess'],
+      label: '鎴愬姛鍚�',
       initVal: card.execSuccess || 'grid',
       tooltip: '閫夋嫨鍒锋柊琛屾椂锛屽鏋滈�夋嫨澶氭潯鏁版嵁浼氬埛鏂拌〃鏍笺��',
       required: true,
@@ -1236,7 +1278,7 @@
     {
       type: refresh.length === 0 ? 'radio' : 'select',
       key: 'execError',
-      label: Formdict['model.form.afterError'],
+      label: '澶辫触鍚�',
       initVal: card.execError || 'never',
       tooltip: '閫夋嫨鍒锋柊琛屾椂锛屽鏋滈�夋嫨澶氭潯鏁版嵁浼氬埛鏂拌〃鏍笺��',
       required: true,
@@ -1255,7 +1297,7 @@
     {
       type: refresh.length === 0 ? 'radio' : 'select',
       key: 'popClose',
-      label: Formdict['header.form.popClose'],
+      label: '鍏抽棴鍚�',
       initVal: card.popClose || 'never',
       required: true,
       options: [{
@@ -1284,14 +1326,14 @@
     {
       type: 'icon',
       key: 'icon',
-      label: Formdict['model.icon'],
+      label: '鍥炬爣',
       initVal: card.icon,
       required: false
     },
     {
       type: 'select',
       key: 'class',
-      label: Formdict['model.form.color'],
+      label: '棰滆壊',
       initVal: card.class,
       required: false,
       options: btnClasses
@@ -1309,7 +1351,7 @@
       type: 'text',
       key: 'output',
       label: '杩斿洖鍊�',
-      tooltip: '鎵ц鎴愬姛鍚庣殑杩斿洖鍊笺�備緥濡傦細@id',
+      tooltip: '鎵ц鎴愬姛鍚庣殑杩斿洖鍊笺�傜郴缁熷嚱鏁板彲鎸囧畾杩斿洖鐨勫彉閲忥紙浠绗﹀紑澶达紝杩斿洖id鏃跺彲浣跨敤@id@锛夛紱鑷畾涔夊嚱鏁板彲鎸囧畾杩斿洖瀛楁锛堝id锛夈��',
       initVal: card.output || '',
       required: false
     },
@@ -1324,21 +1366,21 @@
     {
       type: 'radio',
       key: 'joint',
-      label: Formdict['model.form.paramJoint'],
+      label: '鎷兼帴鍙傛暟',
       initVal: card.joint || 'true',
       required: false,
       options: [{
         value: 'true',
-        text: Formdict['model.true']
+        text: '鏄�'
       }, {
         value: 'false',
-        text: Formdict['model.false']
+        text: '鍚�'
       }]
     },
     {
       type: 'text',
       key: 'sheet',
-      label: Formdict['model.form.tablename'],
+      label: '琛ㄥ悕',
       initVal: card.sheet || config.setting.tableName || '',
       required: true
     },
@@ -1350,10 +1392,10 @@
       required: false,
       options: [{
         value: 'true',
-        text: Formdict['model.true']
+        text: '鏄�'
       }, {
         value: 'false',
-        text: Formdict['model.false']
+        text: '鍚�'
       }]
     },
     {
@@ -1392,7 +1434,7 @@
       precision: 0,
       label: '姣斾緥',
       initVal: card.ratio || 85,
-      tooltip: '灏忎簬100涓哄搴︼紙鎴栭珮搴︼級鐧惧垎姣旓紝澶т簬100涓哄儚绱犲�笺��',
+      tooltip: '妯℃�佹鎴栨娊灞夌殑瀹藉害锛屽皬浜�100涓虹獥鍙ｅ搴︼紙鎴栭珮搴︼級鐧惧垎姣旓紝澶т簬100涓哄儚绱犲�笺��',
       required: true
     },
     {
@@ -1434,7 +1476,7 @@
       key: 'preFunc',
       label: '鍓嶇疆鍑芥暟',
       initVal: card.preFunc || '',
-      tooltip: `鍑芥暟鍚嶇О闇�浠�${usefulFields.join(', ')}绛夊瓧绗﹀紑濮嬶紱鍓嶇疆鍑芥暟鎵ц瀹屾垚鍚庯紝缁撴灉浼氫紶鍏ュ唴閮ㄥ嚱鏁颁腑锛屾鏃跺唴閮ㄥ嚱鏁颁細寮傛鎵ц锛涘綋鍓嶇疆鍑芥暟杩斿洖涓璄rrCode绛変簬-1鏃讹紝灏嗕笉鍐嶆墽琛屽唴閮ㄥ嚱鏁般�俙,
+      tooltip: usefulFields.length ? `鍑芥暟鍚嶇О闇�浠�${usefulFields.join(', ')}绛夊瓧绗﹀紑濮嬶紱鍓嶇疆鍑芥暟鎵ц瀹屾垚鍚庯紝缁撴灉浼氫紶鍏ュ唴閮ㄥ嚱鏁颁腑锛屾鏃跺唴閮ㄥ嚱鏁颁細寮傛鎵ц锛涘綋鍓嶇疆鍑芥暟杩斿洖涓璄rrCode绛変簬-1鏃讹紝灏嗕笉鍐嶆墽琛屽唴閮ㄥ嚱鏁般�俙 : '',
       fields: usefulFields,
       required: false,
       readonly: false
@@ -1480,6 +1522,35 @@
       initVal: card.reason || '',
       required: false
     },
+    {
+      type: 'radio',
+      key: 'hidden',
+      label: '闅愯棌',
+      initVal: card.hidden || 'false',
+      tooltip: '闅愯棌鍚庢寜閽湪椤甸潰涓笉鏄剧ず锛屼笖涓嶅弬涓庢潈闄愬垎閰嶃��',
+      required: false,
+      options: [{
+        value: 'false',
+        text: '鍚�'
+      }, {
+        value: 'true',
+        text: '鏄�'
+      }]
+    },
+    {
+      type: 'radio',
+      key: 'progress',
+      label: '杩涘害鎻愮ず',
+      initVal: card.progress || 'number',
+      required: false,
+      options: [{
+        value: 'number',
+        text: '鍓╀綑鏁�'
+      }, {
+        value: 'progressbar',
+        text: '杩涘害鏉�'
+      }]
+    }
   ]
 }
 
@@ -1508,14 +1579,14 @@
     {
       type: 'text',
       key: 'label',
-      label: Formdict['model.name'],
+      label: '鍚嶇О',
       initVal: card.label,
       required: true
     },
     {
       type: 'text',
       key: 'field',
-      label: Formdict['model.form.field'],
+      label: '瀛楁',
       initVal: card.field,
       required: true,
       readonly: false
@@ -1523,24 +1594,27 @@
     {
       type: 'select',
       key: 'type',
-      label: Formdict['model.form.type'],
+      label: '绫诲瀷',
       initVal: card.type,
       required: true,
       options: [{
         value: 'text',
-        text: Formdict['model.form.text']
+        text: '鏂囨湰'
       }, {
         value: 'number',
-        text: Formdict['model.form.number']
+        text: '鏁板瓧'
       }, {
         value: 'picture',
-        text: Formdict['model.form.picture']
+        text: '鍥剧墖'
+      }, {
+        value: 'video',
+        text: '瑙嗛'
       }, {
         value: 'link',
-        text: Formdict['model.form.href']
+        text: '閾炬帴'
       }, {
         value: 'textarea',
-        text: Formdict['model.form.textarea']
+        text: '澶氳鏂囨湰'
       }, {
         value: 'index',
         text: '搴忓彿'
@@ -1549,7 +1623,7 @@
     {
       type: 'text',
       key: 'nameField',
-      label: Formdict['model.name'] + Formdict['model.form.field'],
+      label: '鍚嶇О瀛楁',
       initVal: card.nameField,
       required: false,
       readonly: false
@@ -1560,68 +1634,88 @@
       min: 1,
       max: 1000,
       decimal: 0,
-      label: Formdict['model.form.columnWidth'],
+      label: '鍒楀',
       initVal: card.Width,
       required: true
     },
     {
       type: 'radio',
       key: 'joint',
-      label: Formdict['model.form.paramJoint'],
+      label: '鎷兼帴鍙傛暟',
       initVal: card.joint || 'true',
       required: true,
       options: [{
         value: 'true',
-        text: Formdict['model.true']
+        text: '鏄�'
       }, {
         value: 'false',
-        text: Formdict['model.false']
+        text: '鍚�'
       }]
     },
     {
       type: 'radio',
       key: 'Hide',
-      label: Formdict['model.hidden'],
+      label: '闅愯棌',
       initVal: card.Hide || 'false',
       required: true,
       options: [{
         value: 'true',
-        text: Formdict['model.true']
+        text: '鏄�'
       }, {
         value: 'false',
-        text: Formdict['model.false']
+        text: '鍚�'
       }]
     },
     {
       type: 'radio',
       key: 'IsSort',
-      label: Formdict['model.sort'],
+      label: '鎺掑簭',
       initVal: card.IsSort || 'true',
       required: true,
       options: [{
         value: 'true',
-        text: Formdict['model.true']
+        text: '鏄�'
       }, {
         value: 'false',
-        text: Formdict['model.false']
+        text: '鍚�'
       }]
     },
     {
       type: 'radio',
       key: 'Align',
-      label: Formdict['model.form.align'],
+      label: '瀵归綈鏂瑰紡',
       initVal: card.Align || 'left',
       required: true,
       options: [{
         value: 'left',
-        text: Formdict['model.form.alignLeft']
+        text: '宸﹀榻�'
       }, {
         value: 'center',
-        text: Formdict['model.form.alignCenter']
+        text: '灞呬腑'
       }, {
         value: 'right',
-        text: Formdict['model.form.alignRight']
+        text: '鍙冲榻�'
       }]
+    },
+    {
+      type: 'number',
+      key: 'startTime',
+      precision: 0,
+      label: '寮�濮嬫椂闂�',
+      initVal: card.startTime || 0,
+      tooltip: '瑙嗛寮�濮嬫挱鏀剧殑鏃堕棿锛岀敤浜庤皟鏁磋棰戝垵濮嬪寲灞曠ず鐨勭晫闈€��',
+      required: false
+    },
+    {
+      type: 'select',
+      key: 'aspectRatio',
+      label: '闀垮姣�',
+      initVal: card.aspectRatio || '16:9',
+      required: true,
+      options: [
+        { value: '4:3', text: '4:3' },
+        { value: '16:9', text: '16:9' }
+      ]
     },
     {
       type: 'radio',
@@ -1632,10 +1726,10 @@
       required: false,
       options: [{
         value: 'true',
-        text: Formdict['model.true']
+        text: '鏄�'
       }, {
         value: 'false',
-        text: Formdict['model.false']
+        text: '鍚�'
       }]
     },
     {
@@ -1647,10 +1741,10 @@
       required: false,
       options: [{
         value: 'true',
-        text: Formdict['model.true']
+        text: '鏄�'
       }, {
         value: 'false',
-        text: Formdict['model.false']
+        text: '鍚�'
       }]
     },
     {
@@ -1659,25 +1753,25 @@
       min: 0,
       max: 18,
       decimal: 0,
-      label: Formdict['header.form.decimal'],
+      label: '灏忔暟浣�',
       initVal: card.decimal || 0,
       required: true
     },
     {
       type: 'number',
       key: 'fieldlength',
-      label: Formdict['model.form.field'] + Formdict['model.length'],
+      label: '瀛楁闀垮害',
       initVal: card.fieldlength || (card.type === 'text' ? 50 : 512),
       required: true
     },
     {
       type: 'select',
       key: 'format',
-      label: Formdict['header.form.format'],
-      initVal: card.format || '',
+      label: '鏍煎紡鍖�',
+      initVal: card.format || 'none',
       options: [{
-        value: '',
-        text: Formdict['model.empty']
+        value: 'none',
+        text: '鏃�'
       }, {
         value: 'thdSeparator',
         text: '鍗冨垎浣�'
@@ -1693,11 +1787,14 @@
     {
       type: 'select',
       key: 'textFormat',
-      label: Formdict['header.form.format'],
-      initVal: card.textFormat || '',
+      label: '鏍煎紡鍖�',
+      initVal: card.textFormat || 'none',
       options: [{
-        value: '',
-        text: Formdict['model.empty']
+        value: 'none',
+        text: '鏃�'
+      }, {
+        value: 'encryption',
+        text: '鍔犲瘑'
       }, {
         value: 'YYYY-MM-DD',
         text: 'YYYY-MM-DD'
@@ -1710,7 +1807,7 @@
     {
       type: 'text',
       key: 'prefix',
-      label: Formdict['header.form.prefix'],
+      label: '鍓嶇紑',
       initVal: card.prefix || '',
       required: false,
       readonly: false
@@ -1718,7 +1815,7 @@
     {
       type: 'text',
       key: 'postfix',
-      label: Formdict['header.form.postfix'],
+      label: '鍚庣紑',
       initVal: card.postfix || '',
       tooltipClass: 'middle',
       required: false,
@@ -1726,15 +1823,39 @@
     },
     {
       type: 'number',
-      key: 'maxHeight',
+      key: 'span',
       min: 1,
-      max: 1000,
-      decimal: 0,
-      label: '鏈�澶ч珮搴�',
-      tooltip: '鍥剧墖鍦ㄨ〃鏍间腑鏄剧ず鐨勬渶澶ч珮搴�',
-      tooltipClass: 'middle',
-      initVal: card.maxHeight || 128,
+      max: 24,
+      precision: 0,
+      label: '鍥剧墖瀹藉害',
+      initVal: card.span || 24,
+      tooltip: '鏍呮牸甯冨眬锛岀瓑鍒嗕负24浠姐��',
       required: true
+    },
+    {
+      type: 'select',
+      key: 'lenWidRadio',
+      label: '闀垮姣�',
+      initVal: card.lenWidRadio || '1:1',
+      required: true,
+      options: [
+        { value: '1:1', text: '1:1' },
+        { value: '4:3', text: '4:3' },
+        { value: '3:2', text: '3:2' },
+        { value: '16:9', text: '16:9' },
+        { value: '2:1', text: '2:1' },
+        { value: '3:1', text: '3:1' },
+        { value: '4:1', text: '4:1' },
+        { value: '5:1', text: '5:1' },
+        { value: '6:1', text: '6:1' },
+        { value: '7:1', text: '7:1' },
+        { value: '8:1', text: '8:1' },
+        { value: '9:1', text: '9:1' },
+        { value: '10:1', text: '10:1' },
+        { value: '3:4', text: '3:4' },
+        { value: '2:3', text: '2:3' },
+        { value: '9:16', text: '9:16' },
+      ]
     },
     {
       type: 'radio',
@@ -1744,10 +1865,10 @@
       required: false,
       options: [{
         value: 'true',
-        text: Formdict['model.true']
+        text: '鏄�'
       }, {
         value: 'false',
-        text: Formdict['model.false']
+        text: '鍚�'
       }]
     },
     {
@@ -1769,7 +1890,7 @@
     {
       type: 'cascader',
       key: 'linkmenu',
-      label: Formdict['model.menu'],
+      label: '鑿滃崟',
       initVal: card.linkmenu || [],
       required: true,
       options: menulist
@@ -1792,7 +1913,7 @@
     {
       type: 'multiselect',
       key: 'blacklist',
-      label: Formdict['header.form.blacklist'],
+      label: '榛戝悕鍗�',
       initVal: card.blacklist || [],
       required: false,
       options: roleList
@@ -1844,7 +1965,7 @@
     {
       type: 'text',
       key: 'title',
-      label: Formdict['header.form.title'],
+      label: '鏍囬',
       initVal: card.title,
       required: false
     },
@@ -1870,15 +1991,15 @@
     {
       type: 'radio',
       key: 'Hide',
-      label: Formdict['model.hidden'],
+      label: '闅愯棌',
       initVal: card.Hide,
       required: true,
       options: [{
         value: 'true',
-        text: Formdict['model.true']
+        text: '鏄�'
       }, {
         value: 'false',
-        text: Formdict['model.false']
+        text: '鍚�'
       }]
     },
     {
@@ -1956,7 +2077,7 @@
     {
       type: 'multiselect',
       key: 'blacklist',
-      label: Formdict['header.form.blacklist'],
+      label: '榛戝悕鍗�',
       initVal: card.blacklist || [],
       required: false,
       options: roleList
@@ -2146,10 +2267,10 @@
       forbid: !['line', 'bar'].includes(card.chartType),
       options: [{
         value: 'true',
-        text: Formdict['model.true']
+        text: '鏄�'
       }, {
         value: 'false',
-        text: Formdict['model.false']
+        text: '鍚�'
       }]
     },
     {
@@ -2260,7 +2381,7 @@
  * @param {*} linkableFields  // 鍙叧鑱旇〃鍗�
  * @param {*} linksupFields   // 涓婄骇琛ㄥ崟
  */
-export function getModalForm (card, inputfields = [], tabfields = [], linkableFields, linksupFields) {
+export function getModalForm (card, inputfields = [], tabfields = [], linkableFields, linksupFields, columns = []) {
   let appType = sessionStorage.getItem('appType')
   let roleList = sessionStorage.getItem('sysRoles')
   if (roleList) {
@@ -2282,19 +2403,22 @@
   
   let _openType = [{
     value: 'text',
-    text: Formdict['model.form.text']
+    text: '鏂囨湰'
   }, {
     value: 'number',
-    text: Formdict['model.form.number']
+    text: '鏁板瓧'
   }, {
     value: 'select',
-    text: Formdict['model.form.select']
+    text: '涓嬫媺閫夋嫨'
+  }, {
+    value: 'textarea',
+    text: '澶氳鏂囨湰'
   }, {
     value: 'multiselect',
-    text: Formdict['model.form.multiselect']
+    text: '涓嬫媺澶氶��'
   }, {
     value: 'link',
-    text: Formdict['model.form.link']
+    text: '鑱斿姩鑿滃崟'
   }, {
     value: 'switch',
     text: '寮�鍏�'
@@ -2309,31 +2433,31 @@
     text: '閫夐」鍗�'
   }, {
     value: 'fileupload',
-    text: Formdict['header.form.fileupload']
+    text: '鏂囦欢涓婁紶'
   }, {
     value: 'date',
-    text: Formdict['model.form.dateday']
+    text: '鏃ユ湡锛堝ぉ锛�'
   }, {
     value: 'datemonth',
-    text: Formdict['model.form.datemonth']
+    text: '鏃ユ湡锛堟湀锛�'
   // }, {
   //   value: 'datetime',
   //   text: '鏃ユ湡锛堝垎/绉掞級'
   }, {
-    value: 'textarea',
-    text: Formdict['model.form.textarea']
+    value: 'cascader',
+    text: '绾ц仈鑿滃崟'
   }, {
     value: 'rate',
     text: '璇勫垎'
   }, {
     value: 'color',
-    text: Formdict['model.form.color']
+    text: '棰滆壊'
   }, {
     value: 'brafteditor',
     text: '瀵屾枃鏈�'
   }, {
     value: 'funcvar',
-    text: Formdict['header.form.funcvar']
+    text: '鍑芥暟鍙橀噺'
   }, {
     value: 'hint',
     text: '鎻愮ず'
@@ -2343,6 +2467,9 @@
   }, {
     value: 'linkMain',
     text: '鍏宠仈涓昏〃'
+  }, {
+    value: 'formula',
+    text: '鍏紡'
   }]
 
   let _fieldlength = 50
@@ -2350,16 +2477,19 @@
   if (appType === 'mob') {
     _openType = [{
       value: 'text',
-      text: Formdict['model.form.text']
+      text: '鏂囨湰'
     }, {
       value: 'number',
-      text: Formdict['model.form.number']
+      text: '鏁板瓧'
     }, {
       value: 'select',
       text: '閫夋嫨鍣�'
     }, {
       value: 'link',
-      text: Formdict['model.form.link']
+      text: '鑱斿姩鑿滃崟'
+    }, {
+      value: 'textarea',
+      text: '澶氳鏂囨湰'
     }, {
       value: 'switch',
       text: '寮�鍏�'
@@ -2374,25 +2504,22 @@
       text: '閫夐」鍗�'
     }, {
       value: 'fileupload',
-      text: Formdict['header.form.fileupload']
+      text: '鏂囦欢涓婁紶'
     }, {
       value: 'date',
-      text: Formdict['model.form.dateday']
+      text: '鏃ユ湡锛堝ぉ锛�'
     }, {
       value: 'datemonth',
-      text: Formdict['model.form.datemonth']
-    // }, {
-    //   value: 'datetime',
-    //   text: '鏃ユ湡锛堝垎/绉掞級'
+      text: '鏃ユ湡锛堟湀锛�'
     }, {
-      value: 'textarea',
-      text: Formdict['model.form.textarea']
+      value: 'cascader',
+      text: '绾ц仈鑿滃崟'
     }, {
       value: 'rate',
       text: '璇勫垎'
     }, {
       value: 'funcvar',
-      text: Formdict['header.form.funcvar']
+      text: '鍑芥暟鍙橀噺'
     }, {
       value: 'hint',
       text: '鎻愮ず'
@@ -2402,6 +2529,9 @@
     }, {
       value: 'linkMain',
       text: '鍏宠仈涓昏〃'
+    }, {
+      value: 'formula',
+      text: '鍏紡'
     }]
   }
 
@@ -2439,7 +2569,7 @@
     {
       type: 'text',
       key: 'label',
-      label: Formdict['model.name'],
+      label: '鍚嶇О',
       initVal: card.label,
       required: true,
       readonly: false
@@ -2447,15 +2577,16 @@
     {
       type: 'text',
       key: 'field',
-      label: Formdict['model.form.field'],
+      label: '瀛楁',
       initVal: card.field || '',
       required: true,
-      readonly: false
+      readonly: false,
+      options: columns
     },
     {
       type: 'select',
       key: 'type',
-      label: Formdict['model.form.type'],
+      label: '绫诲瀷',
       initVal: card.type,
       required: true,
       options: _openType
@@ -2463,7 +2594,7 @@
     {
       type: 'text',
       key: 'initval',
-      label: Formdict['header.form.initval'],
+      label: '鍒濆鍊�',
       initVal: initval,
       required: false
     },
@@ -2511,10 +2642,10 @@
       required: true,
       options: [{
         value: '0',
-        text: Formdict['header.form.custom']
+        text: '鑷畾涔�'
       }, {
         value: '1',
-        text: Formdict['header.form.datasource']
+        text: '鏁版嵁婧�'
       }]
     },
     {
@@ -2529,6 +2660,9 @@
       }, {
         value: 'picture',
         text: '鍥剧墖'
+      }, {
+        value: 'color',
+        text: '鑹插潡'
       }]
     },
     {
@@ -2560,9 +2694,9 @@
     },
     {
       type: 'radio',
-      key: 'ratio',
+      key: 'picratio',
       label: '鍥剧墖姣斾緥',
-      initVal: card.ratio || '1:1',
+      initVal: card.picratio || card.ratio || '1:1',
       required: true,
       options: [{
         value: '1:1',
@@ -2585,10 +2719,10 @@
     //   initVal: card.setAll || 'false',
     //   options: [{
     //     value: 'true',
-    //     text: Formdict['model.true']
+    //     text: '鏄�'
     //   }, {
     //     value: 'false',
-    //     text: Formdict['model.false']
+    //     text: '鍚�'
     //   }]
     // },
     {
@@ -2610,7 +2744,7 @@
     {
       type: 'codemirror',
       key: 'dataSource',
-      label: Formdict['header.form.datasource'],
+      label: '鏁版嵁婧�',
       initVal: card.dataSource || '',
       required: true,
       readonly: false
@@ -2638,6 +2772,14 @@
       readonly: false,
       allowClear: true,
       options: linkableFields
+    },
+    {
+      type: 'text',
+      key: 'topmark',
+      label: '椤剁骇鏍囪瘑',
+      initVal: card.topmark || '',
+      tooltip: '鍏宠仈瀛楁鍊间笌椤剁骇鏍囪瘑鐩稿悓鏃讹紝瑙嗕负椤剁骇鑺傜偣銆�',
+      required: false
     },
     {
       type: 'text',
@@ -2670,10 +2812,10 @@
       initVal: card.orderType || 'asc',
       options: [{
         value: 'asc',
-        text: Formdict['header.form.asc']
+        text: '姝ｅ簭'
       }, {
         value: 'desc',
-        text: Formdict['header.form.desc']
+        text: '鍊掑簭'
       }]
     },
     {
@@ -2684,16 +2826,6 @@
       tooltip: '璁剧疆绂佺敤瀛楁锛屼笖瀛楁鍊间负true鏃讹紝閫夐」涓嶅彲閫夈��',
       required: false,
       readonly: false
-    },
-    {
-      type: 'number',
-      key: 'decimal',
-      min: 0,
-      max: 18,
-      precision: 0,
-      label: Formdict['header.form.decimal'],
-      initVal: card.decimal || 0,
-      required: true
     },
     {
       type: 'number',
@@ -2829,12 +2961,59 @@
       }]
     },
     {
+      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: 'text',
+      key: 'separator',
+      label: '杩炴帴绗�',
+      initVal: card.separator === undefined ? '/' : card.separator,
+      tooltip: '琛ㄥ崟鎻愪氦鏃朵俊鎭箣闂寸殑杩炴帴绗︺�傛敞锛氳繛鎺ョ涓虹┖鏃讹紝鍒濆鍖栨椂濉厖鍏朵粬琛ㄥ崟鏃犳晥銆�',
+      required: false,
+      readonly: false
+    },
+    {
+      type: 'radio',
+      key: 'declare',
+      label: '鏁版嵁绫诲瀷',
+      initVal: card.declare || 'nvarchar',
+      tooltip: '澹版槑鍙橀噺鏃剁殑绫诲瀷銆備娇鐢� decimal 鏃讹紝璇风‘璁alue涓烘暟鍊硷紝涓斾笉鍙负绌恒��',
+      options: [{
+        value: 'nvarchar',
+        text: 'nvarchar'
+      }, {
+        value: 'decimal',
+        text: 'decimal'
+      }]
+    },
+    {
+      type: 'number',
+      key: 'decimal',
+      min: 0,
+      max: 18,
+      precision: 0,
+      label: '灏忔暟浣�',
+      initVal: card.decimal || 0,
+      required: true
+    },
+    {
       type: 'number',
       key: 'fieldlength',
       min: 1,
       max: 100000,
       precision: 0,
-      label: Formdict['model.form.field'] + Formdict['model.length'],
+      label: '瀛楁闀垮害',
       // tooltip: '鏂囨湰銆佷笅鎷夋銆佹棩鏈熺瓑瀛楁榛樿闀垮害涓�50锛屽琛屾枃鏈笌鏂囦欢涓婁紶瀛楁榛樿闀垮害涓�512',
       initVal: card.fieldlength || _fieldlength,
       required: true
@@ -2857,19 +3036,25 @@
       initVal: card.regular || '',
       options: [{
         value: '',
-        text: Formdict['model.empty']
+        text: '绌�'
       }, {
         value: 'number',
-        text: Formdict['model.form.number']
+        text: '鏁板瓧'
       }, {
         value: 'letter',
-        text: Formdict['header.form.letter']
+        text: '瀛楁瘝'
+      }, {
+        value: 'letter_number',
+        text: '鏁板瓧鎴栧瓧姣�'
       }, {
         value: 'letter&number',
-        text: '瀛楁瘝+鏁板瓧'
+        text: '鏁板瓧銆佸瓧姣嶄互鍙夽_.'
       }, {
         value: 'phone',
         text: '鎵嬫満鍙�'
+      }, {
+        value: 'email',
+        text: '閭'
       }]
     },
     {
@@ -2904,15 +3089,15 @@
     },
     {
       type: 'radio',
-      key: 'allowHalf',
-      label: '鍗婇��',
-      initVal: card.allowHalf || 'false',
+      key: 'hidden',
+      label: "闅愯棌",
+      initVal: card.hidden || 'false',
       options: [{
         value: 'true',
-        text: '鏀寔'
+        text: '鏄�'
       }, {
         value: 'false',
-        text: '涓嶆敮鎸�'
+        text: '鍚�'
       }]
     },
     {
@@ -2922,36 +3107,23 @@
       initVal: card.readonly || 'false',
       options: [{
         value: 'true',
-        text: Formdict['model.true']
+        text: '鏄�'
       }, {
         value: 'false',
-        text: Formdict['model.false']
+        text: '鍚�'
       }]
     },
     {
       type: 'radio',
       key: 'required',
-      label: Formdict['model.required'],
+      label: "蹇呭～",
       initVal: card.required || 'true',
       options: [{
         value: 'true',
-        text: Formdict['model.true']
+        text: '鏄�'
       }, {
         value: 'false',
-        text: Formdict['model.false']
-      }]
-    },
-    {
-      type: 'radio',
-      key: 'hidden',
-      label: Formdict['model.hidden'],
-      initVal: card.hidden || 'false',
-      options: [{
-        value: 'true',
-        text: Formdict['model.true']
-      }, {
-        value: 'false',
-        text: Formdict['model.false']
+        text: '鍚�'
       }]
     },
     {
@@ -3002,14 +3174,14 @@
       type: 'radio',
       key: 'readin',
       label: '鑷姩濉厖',
-      tooltip: '鏄惁灏嗚〃鏍奸�変腑鐨勬暟鎹嚜鍔ㄥ～鍏呭埌琛ㄥ崟锛堝瓧娈电浉鍚岋級',
+      tooltip: '灏嗚〃鏍奸�変腑鐨勬暟鎹嚜鍔ㄥ～鍏呭埌琛ㄥ崟涓�傛敞锛氬湪鎵归噺鎿嶄綔鏃讹紝濡傛兂瑕佹墍閫夎锛堝綋鍓嶅瓧娈碉級鍏ㄩ儴淇敼璇疯涓哄惁鎴栭琛屻��',
       initVal: card.readin || 'true',
       options: [{
         value: 'true',
-        text: Formdict['model.true']
+        text: '鏄�'
       }, {
         value: 'false',
-        text: Formdict['model.false']
+        text: '鍚�'
       }, {
         value: 'top',
         text: '棣栬'
@@ -3023,11 +3195,31 @@
       initVal: card.writein || 'true',
       options: [{
         value: 'true',
-        text: Formdict['model.true']
+        text: '鏄�'
       }, {
         value: 'false',
-        text: Formdict['model.false']
+        text: '鍚�'
       }]
+    },
+    {
+      type: 'radio',
+      key: 'allowHalf',
+      label: '鍗婇��',
+      initVal: card.allowHalf || 'false',
+      options: [{
+        value: 'true',
+        text: '鏀寔'
+      }, {
+        value: 'false',
+        text: '涓嶆敮鎸�'
+      }]
+    },
+    {
+      type: 'color',
+      key: 'color',
+      label: '棰滆壊',
+      initVal: card.color || '#fadb14',
+      required: true
     },
     {
       type: 'number',
@@ -3068,10 +3260,10 @@
       initVal: card.hidelabel || 'false',
       options: [{
         value: 'true',
-        text: Formdict['model.true']
+        text: '鏄�'
       }, {
         value: 'false',
-        text: Formdict['model.false']
+        text: '鍚�'
       }]
     },
     {
@@ -3089,33 +3281,29 @@
       }]
     },
     {
+      type: 'radio',
+      key: 'selectStyle',
+      label: '閫変腑鏁堟灉',
+      tooltip: '鑳屾櫙鍙婃枃瀛楀彉鍖栨椂浼氫娇鐢ㄧ郴缁熻壊銆�',
+      initVal: card.selectStyle || (card.backgroundColor ? 'custom' : 'background'),
+      options: [{
+        value: 'background',
+        text: '鑳屾櫙鍙樺寲'
+      }, {
+        value: 'font',
+        text: '鏂囧瓧鍙樺寲'
+      }, {
+        value: 'custom',
+        text: '鑷畾涔�'
+      }]
+    },
+    {
       type: 'color',
       key: 'backgroundColor',
       label: '鑳屾櫙鑹�',
       initVal: card.backgroundColor || '',
       tooltip: '璁剧疆鑳屾櫙鑹插悗锛岄�変腑鏁堟灉鐢辫儗鏅鑹叉帶鍒躲��',
-      required: false
-    },
-    {
-      type: 'color',
-      key: 'borderColor',
-      label: '杈规棰滆壊',
-      initVal: card.borderColor || '',
-      required: 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)'
-      }]
+      required: true
     },
     // {
     //   type: 'radio',
@@ -3136,12 +3324,16 @@
       key: 'encryption',
       label: '鍔犲瘑浼犺緭',
       initVal: card.type === 'brafteditor' ? (card.encryption || 'true') : (card.encryption || 'false'),
+      tooltip: '浣跨敤md5鍔犲瘑鏃讹紝鍔犲瘑鍓嶅唴瀹逛細杞负灏忓啓锛屽姞瀵嗗悗鐨刴d5鍊间负32浣嶅ぇ鍐欍��',
       options: [{
-        value: 'true',
-        text: Formdict['model.true']
-      }, {
         value: 'false',
-        text: Formdict['model.false']
+        text: '鏃�'
+      }, {
+        value: 'true',
+        text: 'base64鍔犲瘑'
+      }, {
+        value: 'md5',
+        text: 'md5鍔犲瘑'
       }]
     },
     {
@@ -3152,11 +3344,42 @@
       tooltip: '鎻愪氦鏃讹紝鏄惁鎴彇棣栧熬鐨勭┖鐧藉瓧绗︺��',
       options: [{
         value: 'true',
-        text: Formdict['model.true']
+        text: '鏄�'
       }, {
         value: 'false',
-        text: Formdict['model.false']
+        text: '鍚�'
       }]
+    },
+    {
+      type: 'textarea',
+      key: 'formula',
+      label: '鍏紡',
+      initVal: card.formula || '',
+      tooltip: '鍔ㄦ�佹浛鎹㈢浉搴旂殑瀛楁锛屽睍绀鸿幏寰楃殑缁撴灉銆傚彲浣跨敤JS鐨勪竴浜涜娉曪紝濡傦細涓夊厓琛ㄨ揪寮� @field1@ > @field2@ ? 0 : 1锛汳ath瀵硅薄锛屽彇缁濆鍊� Math.abs(@field@)銆佸洓鑸嶄簲鍏� Math.round(@field@)绛�',
+      rows: 2,
+      required: true
+    },
+    {
+      type: 'radio',
+      key: 'eval',
+      label: '瑙ｆ瀽',
+      initVal: card.eval || 'true',
+      tooltip: '褰撳叕寮忓唴瀹规秹鍙婅绠楁椂璇烽�夋嫨鈥滄槸鈥濓紝褰撳叕寮忓唴瀹逛负瀛楁鎷兼帴鏃惰閫夋嫨鈥滃惁鈥濄��',
+      required: false,
+      options: [{
+        value: 'true',
+        text: '鏄�'
+      }, {
+        value: 'false',
+        text: '鍚�'
+      }]
+    },
+    {
+      type: 'text',
+      key: 'postfix',
+      label: '鍚庣紑',
+      initVal: card.postfix || '',
+      required: false
     },
     {
       type: 'radio',
@@ -3205,15 +3428,21 @@
     {
       type: 'radio',
       key: 'compress',
-      label: '鍘嬬缉',
+      label: '鏂囦欢澶勭悊',
       initVal: card.compress || 'false',
-      tooltip: '鏂囦欢鍘嬬缉蹇呴』涓哄浘鐗囷紝鍥剧墖鏍煎紡涓簀pg銆乸ng銆乬if 鎴� jpeg',
+      tooltip: '鏂囦欢鍘嬬缉鎴朾ase64蹇呴』涓哄浘鐗囷紝鍥剧墖鏍煎紡涓簀pg銆乸ng銆乬if 鎴� jpeg銆傛敞锛歜ase64鍙彲涓婁紶涓�寮犲浘鐗囥��',
       options: [{
-        value: 'true',
-        text: Formdict['model.true']
-      }, {
         value: 'false',
-        text: Formdict['model.false']
+        text: '榛樿'
+      }, {
+        value: 'true',
+        text: '鍘嬬缉'
+      }, {
+        value: 'base64',
+        text: 'base64'
+      }, {
+        value: 'oss',
+        text: 'oss涓婁紶'
       }]
     },
     {
@@ -3226,6 +3455,119 @@
       initVal: card.limit || 2,
       tooltip: '鍘嬬缉璧风偣锛屽皬浜庤捣鐐瑰�肩殑鏂囦欢涓嶈繘琛屽帇缂┿��',
       required: true
+    },
+    {
+      type: 'radio',
+      key: 'miniSet',
+      label: '灏忕▼搴忚缃�',
+      initVal: card.miniSet || 'default',
+      options: [{
+        value: 'default',
+        text: '榛樿'
+      }, {
+        value: 'custom',
+        text: '鑷畾涔�'
+      }],
+      forbid: appType !== 'mob'
+    },
+    {
+      type: 'checkbox',
+      key: 'mediaType',
+      label: '鏂囦欢绫诲瀷',
+      initVal: card.mediaType || ['image', 'video'],
+      options: [{
+        value: 'image',
+        text: '鍥剧墖'
+      }, {
+        value: 'video',
+        text: '瑙嗛'
+      }],
+      required: true,
+      forbid: appType !== 'mob'
+    },
+    {
+      type: 'checkbox',
+      key: 'sourceType',
+      label: '鏂囦欢鏉ユ簮',
+      initVal: card.sourceType || ['album', 'camera'],
+      options: [{
+        value: 'album',
+        text: '鐩稿唽閫夋嫨'
+      }, {
+        value: 'camera',
+        text: '鐩告満鎷嶆憚'
+      }],
+      required: true,
+      forbid: appType !== 'mob'
+    },
+    {
+      type: 'radio',
+      key: 'sizeType',
+      label: '鍥剧墖鍘嬬缉',
+      initVal: card.sizeType || 'compressed',
+      options: [{
+        value: 'compressed',
+        text: '鏄�'
+      }, {
+        value: 'original',
+        text: '鍚�'
+      }],
+      forbid: appType !== 'mob'
+    },
+    {
+      type: 'number',
+      key: 'maxDuration',
+      label: '鎷嶆憚鏃堕暱',
+      initVal: card.maxDuration || 10,
+      tooltip: '鎷嶆憚瑙嗛鏈�闀挎媿鎽勬椂闂达紝鍗曚綅绉掋�傛椂闂磋寖鍥翠负 3s 鑷� 60s 涔嬮棿銆備笉闄愬埗鐩稿唽銆�',
+      min: 3,
+      max: 60,
+      precision: 0,
+      required: true,
+      forbid: appType !== 'mob'
+    },
+    {
+      type: 'radio',
+      key: 'camera',
+      label: '鎽勫儚澶�',
+      initVal: card.camera || 'back',
+      options: [{
+        value: 'back',
+        text: '鍚庣疆'
+      }, {
+        value: 'front',
+        text: '鍓嶇疆'
+      }],
+      forbid: appType !== 'mob'
+    },
+    {
+      type: 'number',
+      key: 'maxSize',
+      min: 0.01,
+      max: 1024,
+      precision: 2,
+      label: '鏈�澶у�硷紙M锛�',
+      initVal: card.maxSize,
+      tooltip: '鏂囦欢鏈�澶у�硷紝瓒呭嚭鏃朵笉鍏佽涓婁紶锛屽�间负绌烘椂涓嶉檺鍒躲��',
+      required: false
+    },
+    {
+      type: 'radio',
+      key: 'lenControl',
+      label: '闀垮害鎺у埗',
+      initVal: card.lenControl || 'limit',
+      tooltip: '鍦ㄨ缃瓧娈甸暱搴﹀悗锛屽闀垮害鐨勬帶鍒舵柟寮忋��',
+      required: false,
+      options: [{
+        value: 'limit',
+        text: '闄愬埗杈撳叆'
+      }, {
+        value: 'left',
+        text: '宸︽埅'
+      }, {
+        value: 'right',
+        text: '鍙虫埅'
+      }]
     },
     {
       type: 'number',
@@ -3259,24 +3601,6 @@
       }, {
         value: 6,
         text: 6
-      }]
-    },
-    {
-      type: 'radio',
-      key: 'lenControl',
-      label: '闀垮害鎺у埗',
-      initVal: card.lenControl || 'limit',
-      tooltip: '鍦ㄨ缃瓧娈甸暱搴﹀悗锛屽闀垮害鐨勬帶鍒舵柟寮忋��',
-      required: false,
-      options: [{
-        value: 'limit',
-        text: '闄愬埗杈撳叆'
-      }, {
-        value: 'left',
-        text: '宸︽埅'
-      }, {
-        value: 'right',
-        text: '鍙虫埅'
       }]
     },
     {
@@ -3344,6 +3668,24 @@
     },
     {
       type: 'text',
+      key: 'regularExtra',
+      label: '姝ｅ垯鎵╁睍绗�',
+      initVal: card.regularExtra || '',
+      tooltip: '姝ｅ垯楠岃瘉鏃剁殑鑷畾涔夊瓧绗︼紝鍖呮嫭~!@#$%^&*()_+:;{}<>,.-',
+      required: false,
+      readonly: false
+    },
+    {
+      type: 'text',
+      key: 'regularText',
+      label: '姝ｅ垯鎻愮ず',
+      initVal: card.regularText || '',
+      tooltip: '姝ｅ垯楠岃瘉鏃剁殑鎻愮ず淇℃伅銆�',
+      required: false,
+      readonly: false
+    },
+    {
+      type: 'text',
       key: 'tooltip',
       label: '鎮诞鎻愮ず',
       tooltip: '榧犳爣鎮诞浜庢彁绀烘枃瀛椾笂鏂规椂锛屾樉绀烘彁绀轰俊鎭��',
@@ -3379,7 +3721,7 @@
     {
       type: 'text',
       key: 'placeholder',
-      label: '鎻愮ず淇℃伅',
+      label: '杈撳叆鎻愮ず',
       tooltip: '瀛楁棰勬湡鍊肩殑鎻愮ず淇℃伅銆�',
       initVal: card.placeholder || '',
       required: false
@@ -3425,35 +3767,36 @@
       initVal: card.linkSubField || [],
       options: inputfields
     },
-    {
-      type: 'number',
-      key: 'marginTop',
-      label: '涓婅竟璺濓紙px锛�',
-      initVal: card.marginTop || 0,
-      min: -100,
-      max: 1000,
-      precision: 0,
-      required: false,
-      forbid: appType !== 'mob'
-    },
-    {
-      type: 'number',
-      key: 'marginBottom',
-      label: '涓嬭竟璺濓紙px锛�',
-      initVal: card.marginBottom || 0,
-      min: -100,
-      max: 1000,
-      precision: 0,
-      required: false,
-      forbid: appType !== 'mob'
-    },
+    // {
+    //   type: 'number',
+    //   key: 'marginTop',
+    //   label: '涓婅竟璺濓紙px锛�',
+    //   initVal: card.marginTop || 0,
+    //   min: -100,
+    //   max: 1000,
+    //   precision: 0,
+    //   required: false,
+    //   forbid: appType !== 'mob'
+    // },
+    // {
+    //   type: 'number',
+    //   key: 'marginBottom',
+    //   label: '涓嬭竟璺濓紙px锛�',
+    //   initVal: card.marginBottom || 0,
+    //   min: -100,
+    //   max: 1000,
+    //   precision: 0,
+    //   required: false,
+    //   forbid: appType !== 'mob'
+    // },
     {
       type: 'multiselect',
       key: 'blacklist',
-      label: Formdict['header.form.blacklist'],
+      label: '榛戝悕鍗�',
       initVal: card.blacklist || [],
       required: false,
-      options: roleList
+      options: roleList,
+      forbid: appType === 'mob'
     }
   ]
 }
@@ -3472,14 +3815,14 @@
     {
       type: 'text',
       key: 'label',
-      label: Formdict['header.menu.tabName'],
+      label: '鏍囩鍚嶇О',
       initVal: card.label || '',
       required: true
     },
     {
       type: 'select',
       key: 'linkTab',
-      label: Formdict['header.form.linkTab'],
+      label: '鍏宠仈鏍囩',
       initVal: card.linkTab || '',
       required: false,
       options: []
@@ -3487,7 +3830,7 @@
     {
       type: 'icon',
       key: 'icon',
-      label: Formdict['model.icon'],
+      label: '鍥炬爣',
       initVal: card.icon || '',
       required: false,
       forbid: type === 'CalendarPage'
@@ -3495,7 +3838,7 @@
     {
       type: 'select',
       key: 'supMenu',
-      label: Formdict['header.form.supTab'],
+      label: '涓婄骇鏍囩',
       initVal: supMenu,
       required: false,
       options: menus,
@@ -3504,7 +3847,7 @@
     {
       type: 'mutilselect',
       key: 'equalTab',
-      label: Formdict['header.form.equalTab'],
+      label: '鍚岀骇鏍囩',
       tooltip: '濡傛灉瀛愭爣绛句腑鍚湁鍒锋柊鍚岀骇鏍囩鐨勬寜閽紝鍦ㄦ澶勬坊鍔犻渶瑕佸埛鏂扮殑鏍囩銆�',
       initVal: equalTab,
       required: false,

--
Gitblit v1.8.0