From fe21d23b147ed5cec22b4f76a88840b05495d4ad Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 18 六月 2022 22:33:59 +0800
Subject: [PATCH] 2022-06-18

---
 src/templates/zshare/formconfig.jsx |   79 ++++++++++++++++++++++++---------------
 1 files changed, 48 insertions(+), 31 deletions(-)

diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index e67cd6e..8574f2e 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -286,7 +286,7 @@
  * @param {object} card           // 鎼滅储鏉′欢瀵硅薄
  * @param {Array}  linkableFields // 鍙叧鑱斿瓧娈�
  */
-export function getSearchForm (card, linkableFields) {
+export function getSearchForm (card, linkableFields, columns) {
   let roleList = sessionStorage.getItem('sysRoles')
   let appType = sessionStorage.getItem('appType')
   if (roleList) {
@@ -396,7 +396,8 @@
       key: 'field',
       label: Formdict['model.form.field'],
       initVal: card.field || '',
-      required: true
+      required: true,
+      options: columns
     },
     {
       type: 'select',
@@ -846,7 +847,8 @@
       label: Formdict['header.form.blacklist'],
       initVal: card.blacklist || [],
       required: false,
-      options: roleList || []
+      options: roleList || [],
+      forbid: appType === 'mob'
     }
   ]
 }
@@ -1322,7 +1324,7 @@
       type: 'text',
       key: 'output',
       label: '杩斿洖鍊�',
-      tooltip: '鎵ц鎴愬姛鍚庣殑杩斿洖鍊笺�備緥濡傦細@id',
+      tooltip: '鎵ц鎴愬姛鍚庣殑杩斿洖鍊笺�傜郴缁熷嚱鏁板彲鎸囧畾杩斿洖鐨勫彉閲忥紙浠绗﹀紑澶达紝濡侤id锛夛紱鑷畾涔夊嚱鏁板彲鎸囧畾杩斿洖瀛楁锛堝id锛夈��',
       initVal: card.output || '',
       required: false
     },
@@ -1506,6 +1508,20 @@
       }, {
         value: 'true',
         text: '鏄�'
+      }]
+    },
+    {
+      type: 'radio',
+      key: 'progress',
+      label: '杩涘害鎻愮ず',
+      initVal: card.progress || 'number',
+      required: false,
+      options: [{
+        value: 'number',
+        text: '鍓╀綑鏁�'
+      }, {
+        value: 'progressbar',
+        text: '杩涘害鏉�'
       }]
     }
   ]
@@ -2885,16 +2901,16 @@
       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: '瀛楁瘝+鏁板瓧'
+        text: '鏁板瓧銆佸瓧姣嶄互鍙奯'
       }, {
         value: 'phone',
         text: '鎵嬫満鍙�'
@@ -3459,35 +3475,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'],
       initVal: card.blacklist || [],
       required: false,
-      options: roleList
+      options: roleList,
+      forbid: appType === 'mob'
     }
   ]
 }

--
Gitblit v1.8.0