From c51f5e007a3e03c9d6731ab7f28f0080de009990 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 17 十一月 2021 18:38:32 +0800
Subject: [PATCH] 2021-11-17

---
 src/templates/zshare/formconfig.jsx |  576 ++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 427 insertions(+), 149 deletions(-)

diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index f73bb3e..ab0abab 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -288,10 +288,11 @@
  */
 export function getSearchForm (card, linkableFields) {
   let roleList = sessionStorage.getItem('sysRoles')
+  let appType = sessionStorage.getItem('appType')
   if (roleList) {
     try {
       roleList = JSON.parse(roleList)
-    } catch {
+    } catch (e) {
       roleList = []
     }
   } else {
@@ -300,10 +301,10 @@
 
   let typeOptions = []
 
-  if (sessionStorage.getItem('appType') === 'mob') {
+  if (appType === 'mob') {
     typeOptions = [{
-      value: 'text',
-      text: Formdict['model.form.text']
+      value: 'range',
+      text: '鏁板�硷紙鍖洪棿锛�'
     }, {
       value: 'checkcard',
       text: '閫夐」鍗�'
@@ -313,10 +314,10 @@
     }, {
       value: 'datemonth',
       text: Formdict['model.form.datemonth']
+    // }, {
+    //   value: 'daterange',
+    //   text: Formdict['model.form.daterange']
     }]
-    if (!['text', 'checkcard', 'date', 'datemonth'].includes(card.type)) {
-      card.type = 'text'
-    }
   } else {
     typeOptions = [{
       value: 'text',
@@ -349,6 +350,18 @@
       value: 'group',
       text: Formdict['model.form.dategroup']
     }]
+  }
+
+  if (card.focus) {
+    if (['text', 'multiselect'].includes(card.type)) {
+      card.match = 'like'
+    } else if (['select', 'link', 'checkcard'].includes(card.type)) {
+      card.match = '='
+    } else if (card.type === 'date') {
+      card.match = '>='
+    } else if (['datemonth', 'dateweek', 'daterange', 'range'].includes(card.type)) {
+      card.match = 'between'
+    }
   }
 
   return [
@@ -389,7 +402,7 @@
       type: 'text',
       key: 'initval',
       label: Formdict['header.form.initval'],
-      tooltip: '绫诲瀷涓轰笅鎷夎彍鍗曟椂锛屽垵濮嬪�煎簲涓烘暟鎹殑Value鍊硷紙浣跨敤鏁版嵁婧愭椂锛屽簲涓恒�婂�悸峰瓧娈点�嬬殑鍊硷級',
+      tooltip: '绫诲瀷涓轰笅鎷夎彍鍗曟椂锛屽垵濮嬪�煎簲涓烘暟鎹殑Value鍊硷紙浣跨敤鏁版嵁婧愭椂锛屽簲涓恒�婂�悸峰瓧娈点�嬬殑鍊硷級;绫诲瀷涓烘暟鍊硷紙鍖洪棿锛夋椂锛屽垵濮嬪�间娇鐢ㄩ�楀彿鎷兼帴锛屼緥濡� 3,10',
       initVal: card.initval,
       required: false
     },
@@ -440,7 +453,7 @@
       min: 1,
       max: 24,
       precision: 0,
-      label: '鍗＄墖瀹藉害',
+      label: '鍏冪礌瀹藉害',
       initVal: card.width || 4,
       tooltip: '鏍呮牸甯冨眬锛屾瘡琛岀瓑鍒嗕负24鍒椼��',
       required: true
@@ -621,7 +634,8 @@
       max: 24,
       label: Formdict['header.form.ratio'],
       tooltip: '鏍呮牸甯冨眬锛屾瘡琛岀瓑鍒嗕负24鍒椼��',
-      initVal: card.ratio,
+      initVal: card.ratio || 6,
+      forbid: appType === 'mob',
       required: false
     },
     {
@@ -664,6 +678,20 @@
         text: Formdict['model.false']
       }]
     },
+    {
+      type: 'radio',
+      key: 'query',
+      label: '鍙備笌鏌ヨ',
+      initVal: card.query || 'true',
+      tooltip: '鏄惁浣滀负 where 鏉′欢锛屽弬涓庢暟鎹煡璇€��',
+      options: [{
+        value: 'true',
+        text: '鏄�'
+      }, {
+        value: 'false',
+        text: '鍚�'
+      }]
+    },
     // {
     //   type: 'radio',
     //   key: 'transfer',
@@ -679,16 +707,41 @@
     //   }]
     // },
     {
+      type: 'number',
+      key: 'maxValue',
+      label: '鏈�澶у��',
+      initVal: card.maxValue,
+      forbid: appType !== 'mob',
+      required: true
+    },
+    {
+      type: 'number',
+      key: 'minValue',
+      label: '鏈�灏忓��',
+      initVal: card.minValue,
+      forbid: appType !== 'mob',
+      required: true
+    },
+    {
+      type: 'number',
+      key: 'step',
+      label: '姝ラ暱',
+      initVal: card.step,
+      tooltip: '姝ラ暱鍙栧�煎繀椤诲ぇ浜� 0锛屽苟涓斿彲琚� (max - min) 鏁撮櫎',
+      forbid: appType !== 'mob',
+      required: true
+    },
+    {
       type: 'radio',
       key: 'labelShow',
-      label: '鏄剧ず鍚嶇О',
+      label: '鍚嶇О',
       initVal: card.labelShow || 'true',
       options: [{
         value: 'true',
-        text: Formdict['model.true']
+        text: '鏄剧ず'
       }, {
         value: 'false',
-        text: Formdict['model.false']
+        text: '闅愯棌'
       }]
     },
     {
@@ -696,7 +749,7 @@
       key: 'advanced',
       label: '楂樼骇鎼滅储',
       initVal: card.advanced || 'false',
-      forbid: sessionStorage.getItem('appType') === 'mob',
+      forbid: appType === 'mob',
       options: [{
         value: 'true',
         text: Formdict['model.true']
@@ -707,11 +760,25 @@
     },
     {
       type: 'radio',
+      key: 'dropdown',
+      label: '涓嬫媺妗�',
+      initVal: card.dropdown || 'true',
+      forbid: appType === 'mob',
+      options: [{
+        value: 'true',
+        text: '瀹氬'
+      }, {
+        value: 'false',
+        text: '鑷�傚簲'
+      }]
+    },
+    {
+      type: 'radio',
       key: 'inputType',
       label: '杈撳叆鏍峰紡',
       initVal: card.inputType || 'input',
+      tooltip: '浣跨敤楂樼骇鎼滅储鏃舵棤鏁堛��',
       required: false,
-      forbid: sessionStorage.getItem('appType') === null,
       options: [{
         value: 'input',
         text: '杈撳叆妗�'
@@ -725,6 +792,7 @@
       key: 'backgroundColor',
       label: '鑳屾櫙鑹�',
       initVal: card.backgroundColor || '',
+      tooltip: '璁剧疆鑳屾櫙鑹插悗锛岄�変腑鏁堟灉鐢辫儗鏅鑹叉帶鍒躲��',
       required: false
     },
     {
@@ -748,12 +816,11 @@
 /**
  * @description 鑾峰彇鎸夐挳琛ㄥ崟閰嶇疆淇℃伅
  * @param {*} card           缂栬緫鎸夐挳
- * @param {*} functip        鐢熸垚瀛樺偍杩囩▼鎻愮ず
  * @param {*} config         椤甸潰閰嶇疆
  * @param {*} usefulFields   瀛樺偍杩囩▼鍙敤鐨勫紑濮嬪瓧娈�
  * @param {*} type           鎸夐挳绫诲瀷锛岀敤浜庡尯鍒嗗彲閫夌殑鎵撳紑鏂瑰紡
  */
-export function getActionForm (card, functip, config, usefulFields, type, menulist = [], printTemps = []) {
+export function getActionForm (card, config, usefulFields, type, menulist = [], printTemps = []) {
   let columns = (config.columns || []).filter(col => col.field)
 
   let opentypes = [
@@ -787,19 +854,10 @@
     }
   ]
 
-  // 鏍囩绫诲瀷锛屼富琛ㄦ墠浼氬瓨鍦ㄨ〃鍗曟爣绛鹃〉
-  let tabTems = [{
-    value: 'FormTab',
-    text: '琛ㄥ崟鏍囩椤�'
-  }]
-  if (type === 'subtable') {
-    tabTems = []
-  }
-
   if (card.execSuccess === 'view' || card.execSuccess === 'refresh') { // refresh涓鸿〃鍗曟爣绛鹃〉
     card.execSuccess = 'grid'
   }
-  if (card.execError === 'view' || card.execSuccess === 'refresh') {
+  if (card.execError === 'view' || card.execError === 'refresh') {
     card.execError = 'grid'
   }
   if (card.popClose === 'view') {
@@ -821,6 +879,13 @@
     })
   }
 
+  if (card.OpenType === 'blank') {
+    card.OpenType = 'tab'
+  }
+  if (!card.control && card.controlField) {
+    card.control = 'disabled'
+  }
+
   return [
     {
       type: 'select',
@@ -831,7 +896,7 @@
       options: opentypes
     },
     {
-      type: 'radio',
+      type: 'select',
       key: 'funcType',
       label: Formdict['header.form.funcType'],
       initVal: card.funcType || '',
@@ -842,6 +907,9 @@
       }, {
         value: 'print',
         text: '鏍囩鎵撳嵃'
+      }, {
+        value: 'closetab',
+        text: '鏍囩鍏抽棴'
       }]
     },
     {
@@ -911,23 +979,12 @@
       key: 'innerFunc',
       label: Formdict['header.form.innerFunc'],
       initVal: card.innerFunc || '',
-      tooltip: functip,
+      tooltip: `鍑芥暟鍚嶇О闇�浠�${usefulFields.join(', ')}绛夊瓧绗﹀紑濮嬨�俙,
       fields: usefulFields,
       tooltipClass: 'middle',
       required: card.intertype === 'inner',
       readonly: false
     },
-    // {
-    //   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',
@@ -1094,20 +1151,6 @@
       options: []
     },
     {
-      type: 'select',
-      key: 'tabTemplate',
-      label: '鏍囩绫诲瀷',
-      initVal: card.tabTemplate || '',
-      required: true,
-      options: [
-        {
-          value: 'ThdMenu',
-          text: Formdict['model.menu.level3']
-        },
-        ...tabTems
-      ]
-    },
-    {
       type: 'cascader',
       key: 'linkmenu',
       label: Formdict['model.form.linkmenu'],
@@ -1116,45 +1159,29 @@
       options: menulist
     },
     {
-      type: 'radio',
-      key: 'afterExecSuccess',
-      label: Formdict['header.form.afterExecSuccess'],
-      initVal: card.afterExecSuccess || 'close',
-      required: true,
-      options: [{
-        value: 'close',
-        text: Formdict['model.close']
-      }, {
-        value: 'notclose',
-        text: Formdict['model.notclose']
-      }]
-    },
-    {
-      type: 'radio',
-      key: 'afterExecError',
-      label: Formdict['header.form.afterExecError'],
-      initVal: card.afterExecError || 'notclose',
-      required: true,
-      options: [{
-        value: 'close',
-        text: Formdict['model.close']
-      }, {
-        value: 'notclose',
-        text: Formdict['model.notclose']
-      }]
+      type: 'cascader',
+      key: 'refreshTab',
+      label: '鍒锋柊鏍囩',
+      initVal: card.refreshTab || [],
+      required: false,
+      options: menulist
     },
     {
       type: refresh.length === 0 ? 'radio' : 'select',
       key: 'execSuccess',
       label: Formdict['model.form.afterSuccess'],
       initVal: card.execSuccess || 'never',
+      tooltip: '閫夋嫨鍒锋柊琛屾椂锛屽鏋滈�夋嫨澶氭潯鏁版嵁浼氬埛鏂拌〃鏍笺��',
       required: true,
       options: [{
         value: 'never',
-        text: Formdict['header.form.refresh.never']
+        text: '涓嶅埛鏂�'
       }, {
         value: 'grid',
-        text: Formdict['header.form.refresh.grid']
+        text: '鍒锋柊琛ㄦ牸'
+      }, {
+        value: 'line',
+        text: '鍒锋柊琛�'
       },
       ...refresh]
     },
@@ -1163,13 +1190,17 @@
       key: 'execError',
       label: Formdict['model.form.afterError'],
       initVal: card.execError || 'never',
+      tooltip: '閫夋嫨鍒锋柊琛屾椂锛屽鏋滈�夋嫨澶氭潯鏁版嵁浼氬埛鏂拌〃鏍笺��',
       required: true,
       options: [{
         value: 'never',
-        text: Formdict['header.form.refresh.never']
+        text: '涓嶅埛鏂�'
       }, {
         value: 'grid',
-        text: Formdict['header.form.refresh.grid']
+        text: '鍒锋柊琛ㄦ牸'
+      }, {
+        value: 'line',
+        text: '鍒锋柊琛�'
       },
       ...refresh]
     },
@@ -1181,10 +1212,10 @@
       required: true,
       options: [{
         value: 'never',
-        text: Formdict['header.form.refresh.never']
+        text: '涓嶅埛鏂�'
       }, {
         value: 'grid',
-        text: Formdict['header.form.refresh.grid']
+        text: '鍒锋柊琛ㄦ牸'
       },
       ...refresh]
     },
@@ -1217,6 +1248,23 @@
       initVal: card.class,
       required: false,
       options: []
+    },
+    {
+      type: 'cascader',
+      key: 'openmenu',
+      label: '鎵撳紑鑿滃崟',
+      initVal: card.openmenu || [],
+      tooltip: '鎵ц鎴愬姛鍚庨渶瑕佹墦寮�鐨勮彍鍗曘��',
+      required: false,
+      options: menulist
+    },
+    {
+      type: 'text',
+      key: 'output',
+      label: '杩斿洖鍊�',
+      tooltip: '鎵ц鎴愬姛鍚庣殑杩斿洖鍊笺��',
+      initVal: card.output || '',
+      required: false
     },
     {
       type: 'radio',
@@ -1268,22 +1316,96 @@
       }]
     },
     {
+      type: 'radio',
+      key: 'display',
+      label: '鏄剧ず鏂瑰紡',
+      initVal: card.display || 'modal',
+      required: true,
+      options: [{
+        value: 'modal',
+        text: '妯℃�佹'
+      }, {
+        value: 'drawer',
+        text: '鎶藉眽'
+      }]
+    },
+    {
+      type: 'number',
+      key: 'ratio',
+      min: 1,
+      max: 24,
+      precision: 0,
+      label: '姣斾緥',
+      initVal: card.ratio || 85,
+      tooltip: '灏忎簬100涓哄搴︼紙鎴栭珮搴︼級鐧惧垎姣旓紝澶т簬100涓哄儚绱犲�笺��',
+      required: true
+    },
+    {
+      type: 'radio',
+      key: 'placement',
+      label: '鎶藉眽鏂瑰悜',
+      initVal: card.placement || 'right',
+      tooltip: '浣跨敤鎶藉眽鏃舵湁鏁堛��',
+      required: false,
+      options: [{
+        value: 'right',
+        text: '鍙充晶'
+      }, {
+        value: 'left',
+        text: '宸︿晶'
+      }, {
+        value: 'top',
+        text: '涓婁晶'
+      }, {
+        value: 'bottom',
+        text: '涓嬩晶'
+      }]
+    },
+    {
+      type: 'text',
+      key: 'preFunc',
+      label: '鍓嶇疆鍑芥暟',
+      initVal: card.preFunc || '',
+      tooltip: `鍑芥暟鍚嶇О闇�浠�${usefulFields.join(', ')}绛夊瓧绗﹀紑濮嬶紱鍓嶇疆鍑芥暟鎵ц瀹屾垚鍚庯紝缁撴灉浼氫紶鍏ュ唴閮ㄥ嚱鏁颁腑锛屾鏃跺唴閮ㄥ嚱鏁颁細寮傛鎵ц锛涘綋鍓嶇疆鍑芥暟杩斿洖涓璄rrCode绛変簬-1鏃讹紝灏嗕笉鍐嶆墽琛屽唴閮ㄥ嚱鏁般�俙,
+      fields: usefulFields,
+      tooltipClass: 'middle',
+      required: false,
+      readonly: false
+    },
+    {
+      type: 'radio',
+      key: 'control',
+      label: '鎸夐挳鎺у埗',
+      initVal: card.control || '',
+      required: false,
+      options: [{
+        value: '',
+        text: '鏃�'
+      }, {
+        value: 'disabled',
+        text: '绂佺敤'
+      }, {
+        value: 'hidden',
+        text: '闅愯棌'
+      }]
+    },
+    {
       type: 'select',
       key: 'controlField',
       label: '鎺у埗瀛楁',
-      tooltip: '绂佺敤鎺у埗瀛楁锛屽彲鏍规嵁鏁版嵁鎺у埗鎸夐挳鏄惁绂佺敤銆�',
+      tooltip: '鎺у埗瀛楁锛屽彲鏍规嵁鏁版嵁鎺у埗鎸夐挳鐨勯殣钘忔垨绂佺敤銆�',
       initVal: card.controlField || '',
-      required: false,
-      options: [{label: '鏃�', field: ''}, ...columns]
+      required: true,
+      options: columns
     },
     {
       type: 'text',
       key: 'controlVal',
       label: '鎺у埗鍊�',
-      tooltip: '褰撻�夋嫨鎺у埗瀛楁锛屼笖瀛楁鍊间笌鎺у埗鍊肩浉绛夋椂锛屾寜閽細绂佺敤锛屽涓�肩敤閫楀彿鍒嗛殧銆�',
+      tooltip: '褰撻�夋嫨鎺у埗瀛楁锛屼笖瀛楁鍊间笌鎺у埗鍊肩浉绛夋椂锛屾寜閽細闅愯棌鎴栫鐢紝澶氫釜鍊肩敤閫楀彿鍒嗛殧銆�',
       initVal: card.controlVal || '',
       required: false
-    }
+    },
   ]
 }
 
@@ -1297,7 +1419,7 @@
   if (roleList) {
     try {
       roleList = JSON.parse(roleList)
-    } catch {
+    } catch (e) {
       roleList = []
     }
   } else {
@@ -1616,7 +1738,7 @@
   if (roleList) {
     try {
       roleList = JSON.parse(roleList)
-    } catch {
+    } catch (e) {
       roleList = []
     }
   } else {
@@ -2063,9 +2185,8 @@
  * @param {*} tabfields       // 鍙垏鎹㈣〃鍗�
  * @param {*} linkableFields  // 鍙叧鑱旇〃鍗�
  * @param {*} linksupFields   // 涓婄骇琛ㄥ崟
- * @param {*} subtable        // 鏄惁涓哄瓙琛ㄨ〃鍗�
  */
-export function getModalForm (card, inputfields = [], tabfields = [], linkableFields, linksupFields, subtable = false) {
+export function getModalForm (card, inputfields = [], tabfields = [], linkableFields, linksupFields) {
   let appType = sessionStorage.getItem('appType')
   let roleList = sessionStorage.getItem('sysRoles')
   if (roleList) {
@@ -2078,7 +2199,7 @@
           label: role.text
         }
       })
-    } catch {
+    } catch (e) {
       roleList = []
     }
   } else {
@@ -2142,6 +2263,9 @@
   }, {
     value: 'split',
     text: '鍒嗛殧绾�'
+  }, {
+    value: 'linkMain',
+    text: Formdict['header.form.linkMain']
   }]
 
   let _fieldlength = 50
@@ -2196,11 +2320,6 @@
       value: 'split',
       text: '鍒嗛殧绾�'
     }]
-  } else if (subtable) {
-    _openType.push({
-      value: 'linkMain',
-      text: Formdict['header.form.linkMain']
-    })
   }
 
   if (['fileupload', 'multiselect', 'checkbox'].includes(card.type)) {
@@ -2314,7 +2433,7 @@
       min: 1,
       max: 24,
       precision: 0,
-      label: '鍗＄墖瀹藉害',
+      label: '鍏冪礌瀹藉害',
       initVal: card.width || 4,
       tooltip: '鏍呮牸甯冨眬锛屾瘡琛岀瓑鍒嗕负24鍒椼��',
       required: true
@@ -2439,6 +2558,15 @@
       }]
     },
     {
+      type: 'text',
+      key: 'disableField',
+      label: '绂佺敤路瀛楁',
+      initVal: card.disableField || '',
+      tooltip: '璁剧疆绂佺敤瀛楁锛屼笖瀛楁鍊间负true鏃讹紝閫夐」涓嶅彲閫夈��',
+      required: false,
+      readonly: false
+    },
+    {
       type: 'radio',
       key: 'multiple',
       label: '鍙閫�',
@@ -2475,6 +2603,70 @@
       label: '鏈�澶у��',
       initVal: card.max || card.max === 0 ? card.max : '',
       required: false
+    },
+    {
+      type: 'select',
+      key: 'minDate',
+      label: '鏈�灏忓��',
+      initVal: card.minDate || '',
+      required: false,
+      options: [{
+        value: '',
+        text: '鏃�'
+      }, {
+        value: '0',
+        text: '褰撳ぉ'
+      }, {
+        value: '-1',
+        text: '鍓嶄竴澶�'
+      }, {
+        value: '-2',
+        text: '鍓嶄袱澶�'
+      }, {
+        value: '-3',
+        text: '鍓嶄笁澶�'
+      }, {
+        value: '-7',
+        text: '鍓嶄竷澶�'
+      }, {
+        value: '-30',
+        text: '鍓�30澶�'
+      }, {
+        value: '-90',
+        text: '鍓�90澶�'
+      }]
+    },
+    {
+      type: 'select',
+      key: 'maxDate',
+      label: '鏈�澶у��',
+      initVal: card.maxDate || '',
+      required: false,
+      options: [{
+        value: '',
+        text: '鏃�'
+      }, {
+        value: '0',
+        text: '褰撳ぉ'
+      }, {
+        value: '1',
+        text: '鍚庝竴澶�'
+      }, {
+        value: '2',
+        text: '鍚庝袱澶�'
+      }, {
+        value: '3',
+        text: '鍚庝笁澶�'
+      }, {
+        value: '7',
+        text: '鍚庝竷澶�'
+      }, {
+        value: '30',
+        text: '鍚�30澶�'
+      }, {
+        value: '90',
+        text: '鍚�90澶�'
+      }]
     },
     {
       type: 'number',
@@ -2515,23 +2707,29 @@
       }, {
         value: 'letter&number',
         text: Formdict['header.form.letter&number']
+      }, {
+        value: 'phone',
+        text: '鎵嬫満鍙�'
       }]
     },
     {
       type: 'select',
       key: 'fileType',
       label: '鏄剧ず鏂瑰紡',
-      initVal: card.fileType || (appType === 'mob' ? 'picture-card' : 'text'),
+      initVal: card.fileType || 'text',
       options: [{
         value: 'text',
         text: '鏂囦欢'
-      }, {
+      },
+      {
         value: 'picture',
         text: '鍥炬枃淇℃伅'
-      }, {
+      },
+      {
         value: 'picture-card',
         text: '鍥剧墖鍗�'
-      }]
+      }],
+      forbid: appType === 'mob'
     },
     {
       type: 'number',
@@ -2543,19 +2741,6 @@
       initVal: card.maxfile || '',
       tooltip: '绛変簬0鏃朵笉鍋氶檺鍒躲��',
       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',
@@ -2615,11 +2800,11 @@
       label: '鍏夋爣',
       initVal: card.cursor || 'left',
       options: [{
-        value: 'right',
-        text: '鍙冲榻�'
-      }, {
         value: 'left',
         text: '宸﹀榻�'
+      }, {
+        value: 'right',
+        text: '鍙冲榻�'
       }],
       forbid: appType !== 'mob'
     },
@@ -2644,7 +2829,7 @@
       type: 'radio',
       key: 'readin',
       label: Formdict['header.form.readin'],
-      tooltip: Formdict['header.form.readin.tooltip'],
+      tooltip: '鏄惁灏嗚〃鏍奸�変腑鐨勬暟鎹嚜鍔ㄥ～鍏呭埌琛ㄥ崟锛堝瓧娈电浉鍚岋級',
       initVal: card.readin || 'true',
       options: [{
         value: 'true',
@@ -2652,6 +2837,9 @@
       }, {
         value: 'false',
         text: Formdict['model.false']
+      }, {
+        value: 'top',
+        text: '棣栬'
       }]
     },
     {
@@ -2669,10 +2857,52 @@
       }]
     },
     {
+      type: 'radio',
+      key: 'dropdown',
+      label: '涓嬫媺妗�',
+      initVal: card.dropdown || 'true',
+      forbid: appType === 'mob',
+      options: [{
+        value: 'true',
+        text: '瀹氬'
+      }, {
+        value: 'false',
+        text: '鑷�傚簲'
+      }]
+    },
+    {
+      type: 'radio',
+      key: 'hidelabel',
+      label: '闅愯棌鍚嶇О',
+      initVal: card.hidelabel || 'false',
+      options: [{
+        value: 'true',
+        text: Formdict['model.true']
+      }, {
+        value: 'false',
+        text: Formdict['model.false']
+      }]
+    },
+    {
+      type: 'radio',
+      key: 'arrange',
+      label: '鍏冪礌鎺掑垪',
+      initVal: card.arrange || 'adaptive',
+      forbid: appType !== 'mob',
+      options: [{
+        value: 'line',
+        text: '鏁磋'
+      }, {
+        value: 'adaptive',
+        text: '鑷�傚簲'
+      }]
+    },
+    {
       type: 'color',
       key: 'backgroundColor',
       label: '鑳屾櫙鑹�',
       initVal: card.backgroundColor || '',
+      tooltip: '璁剧疆鑳屾櫙鑹插悗锛岄�変腑鏁堟灉鐢辫儗鏅鑹叉帶鍒躲��',
       required: false
     },
     {
@@ -2696,20 +2926,20 @@
         text: 'nvarchar(50)'
       }]
     },
-    {
-      type: 'radio',
-      key: 'mode',
-      label: '妯″紡',
-      initVal: card.mode || 'picker',
-      options: [{
-        value: 'picker',
-        text: '閫夋嫨鍣�'
-      }, {
-        value: 'calendar',
-        text: '鏃ュ巻'
-      }],
-      forbid: appType !== 'mob'
-    },
+    // {
+    //   type: 'radio',
+    //   key: 'mode',
+    //   label: '妯″紡',
+    //   initVal: card.mode || 'picker',
+    //   options: [{
+    //     value: 'picker',
+    //     text: '閫夋嫨鍣�'
+    //   }, {
+    //     value: 'calendar',
+    //     text: '鏃ュ巻'
+    //   }],
+    //   forbid: appType !== 'mob'
+    // },
     {
       type: 'number',
       key: 'span',
@@ -2817,6 +3047,35 @@
     },
     {
       type: 'radio',
+      key: 'splitline',
+      label: '鍒嗗壊绾�',
+      initVal: card.splitline || 'true',
+      forbid: appType !== 'mob',
+      options: [{
+        value: 'true',
+        text: '鏄剧ず'
+      }, {
+        value: 'false',
+        text: '闅愯棌'
+      }]
+    },
+    {
+      type: 'radio',
+      key: 'place',
+      label: '鎺掑垪',
+      initVal: card.place || 'left_right',
+      tooltip: '鎻愮ず鏂囧瓧涓庤緭鍏ユ鐨勪綅缃叧绯汇��',
+      forbid: appType !== 'mob',
+      options: [{
+        value: 'left_right',
+        text: '宸﹀彸'
+      }, {
+        value: 'up_down',
+        text: '涓婁笅'
+      }]
+    },
+    {
+      type: 'radio',
       key: 'count',
       label: '璁℃暟鍔熻兘',
       initVal: card.count || 'false',
@@ -2844,7 +3103,7 @@
       type: 'text',
       key: 'supvalue',
       label: '鏄剧ず鍊�',
-      tooltip: '璇峰～鍐欐樉绀哄�硷紝鍙湁涓婄骇琛ㄥ崟鍊间笌鏄剧ず鍊肩浉鍚屾椂锛岃琛ㄥ崟鎵嶄細鏄剧ず锛屾敞锛氬涓�肩敤閫楀彿鍒嗛殧銆�',
+      tooltip: '璇峰～鍐欐樉绀哄�硷紝鍙湁涓婄骇琛ㄥ崟鍊间笌鏄剧ず鍊肩浉鍚屾椂锛岃琛ㄥ崟鎵嶄細鏄剧ず锛屾敞锛�1銆佸涓�肩敤閫楀彿鍒嗛殧锛�2銆佷笂绾ц〃鍗曞垵濮嬪�间负$first鏃舵殏鏈鐞嗐��',
       initVal: card.supvalue || '',
       required: true,
       readonly: false
@@ -2866,6 +3125,14 @@
       initVal: card.extra || '',
       required: false,
       forbid: appType === 'mob'
+    },
+    {
+      type: 'text',
+      key: 'placeholder',
+      label: '鎻愮ず淇℃伅',
+      tooltip: '瀛楁棰勬湡鍊肩殑鎻愮ず淇℃伅銆�',
+      initVal: card.placeholder || '',
+      required: false
     },
     {
       type: 'text',
@@ -2909,6 +3176,28 @@
       options: inputfields
     },
     {
+      type: 'number',
+      key: 'marginTop',
+      label: '涓婅竟璺濓紙px锛�',
+      initVal: card.marginTop || 0,
+      min: 0,
+      max: 1000,
+      precision: 0,
+      required: false,
+      forbid: appType !== 'mob'
+    },
+    {
+      type: 'number',
+      key: 'marginBottom',
+      label: '涓嬭竟璺濓紙px锛�',
+      initVal: card.marginBottom || 0,
+      min: 0,
+      max: 1000,
+      precision: 0,
+      required: false,
+      forbid: appType !== 'mob'
+    },
+    {
       type: 'multiselect',
       key: 'blacklist',
       label: Formdict['header.form.blacklist'],
@@ -2937,17 +3226,6 @@
       initVal: card.label || '',
       required: true
     },
-    // {
-    //   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',

--
Gitblit v1.8.0