From f36141f3075edf9d41928d64f759ad6bd1b1ac60 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 14 七月 2020 17:43:34 +0800
Subject: [PATCH] 2020-07-14

---
 src/templates/zshare/formconfig.jsx |   69 +++++++++++++++++++++-------------
 1 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index a040eef..3511138 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -620,10 +620,11 @@
 
 /**
  * @description 鑾峰彇鎼滅储鏉′欢琛ㄥ崟閰嶇疆淇℃伅
- * @param {object} card       // 鎼滅储鏉′欢瀵硅薄
- * @param {Array}  roleList   // 瑙掕壊鍒楄〃
+ * @param {object} card           // 鎼滅储鏉′欢瀵硅薄
+ * @param {Array}  roleList       // 瑙掕壊鍒楄〃
+ * @param {Array}  linkableFields // 鍙叧鑱斿瓧娈�
  */
-export function getSearchForm (card, roleList) {
+export function getSearchForm (card, roleList, linkableFields) {
   return [
     {
       type: 'text',
@@ -763,12 +764,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',
@@ -839,9 +841,9 @@
       options: [{
         value: 'dropdown',
         text: Formdict['header.form.dropdown']
-      }, {
-        value: 'button',
-        text: Formdict['header.form.button']
+      // }, {
+      //   value: 'button',
+      //   text: Formdict['header.form.button']
       }]
     },
     {
@@ -855,19 +857,6 @@
       }, {
         value: 'sso',
         text: Formdict['header.form.database.sso']
-      }]
-    },
-    {
-      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']
       }]
     },
     {
@@ -889,12 +878,30 @@
       options: []
     },
     {
-      type: 'multiselect',
-      key: 'blacklist',
-      label: Formdict['header.form.blacklist'],
-      initVal: card.blacklist || [],
-      required: false,
-      options: roleList || []
+      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: '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',
@@ -909,6 +916,14 @@
         value: 'false',
         text: Formdict['model.false']
       }]
+    },
+    {
+      type: 'multiselect',
+      key: 'blacklist',
+      label: Formdict['header.form.blacklist'],
+      initVal: card.blacklist || [],
+      required: false,
+      options: roleList || []
     }
   ]
 }

--
Gitblit v1.8.0