From da64ab0923bf8817fc8599a6e37b953ce38f64c8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 27 八月 2023 18:37:36 +0800
Subject: [PATCH] 2023-08-27

---
 src/templates/zshare/formconfig.jsx |  117 ++++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 97 insertions(+), 20 deletions(-)

diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index d3ee589..db78cd8 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -359,6 +359,9 @@
       value: 'switch',
       text: '寮�鍏�'
     }, {
+      value: 'radio',
+      text: '鍗曢�夋'
+    }, {
       value: 'check',
       text: '鍕鹃�夋'
     }]
@@ -367,7 +370,7 @@
   if (card.focus) {
     if (['text', 'multiselect'].includes(card.type)) {
       card.match = 'like'
-    } else if (['select', 'link', 'checkcard'].includes(card.type)) {
+    } else if (['select', 'link', 'checkcard', 'radio'].includes(card.type)) {
       card.match = '='
     } else if (card.type === 'date') {
       card.match = '>='
@@ -384,6 +387,30 @@
       Text: '鍏ㄩ儴',
       ParentID: ''
     })
+  }
+
+  let muloptions = [{
+    value: 'false',
+    text: '鍗曢��'
+  }, {
+    value: 'true',
+    text: '澶氶��'
+  }, {
+    value: 'dropdown',
+    text: '涓嬫媺鑿滃崟'
+  }]
+
+  if (appType !== '') {
+    muloptions = [{
+      value: 'false',
+      text: '鍗曢��'
+    }, {
+      value: 'true',
+      text: '澶氶��'
+    }]
+    if (card.multiple === 'dropdown') {
+      card.multiple = 'false'
+    }
   }
 
   return [
@@ -573,14 +600,18 @@
       key: 'multiple',
       label: '閫夋嫨褰㈠紡',
       initVal: card.multiple || 'false',
+      // tooltip: appType === '' ? '浣跨敤涓嬫媺鑿滃崟鏃讹紝閫夐」浼氫緷鎹� pid 缁勭粐鏁版嵁鐨勪笂涓嬬骇鍏崇郴锛屼簩绾ч�夐」浼氫笅鎷夊睍绀恒�傛敞锛�1銆佹樉绀轰负鏂囨湰鏃舵湁鏁堬紱2銆佷娇鐢ㄦ暟鎹簮璇疯繑鍥� pid 瀛楁銆�' : '',
       required: true,
-      options: [{
-        value: 'false',
-        text: '鍗曢��'
-      }, {
-        value: 'true',
-        text: '澶氶��'
-      }]
+      options: muloptions
+    },
+    {
+      type: 'text',
+      key: 'parentField',
+      label: '涓婄骇瀛楁',
+      initVal: card.parentField || '',
+      tooltip: '鐢ㄤ簬缁勭粐鏁版嵁涓婁笅绾у叧绯伙紝璇锋敞鎰忓~鍐欓《绾ф爣璇嗐��',
+      required: true,
+      readonly: false
     },
     {
       type: 'select',
@@ -898,6 +929,14 @@
       initVal: card.backgroundColor || '',
       tooltip: '璁剧疆鑳屾櫙鑹插悗锛岄�変腑鏁堟灉鐢辫儗鏅鑹叉帶鍒躲��',
       required: true
+    },
+    {
+      type: 'text',
+      key: 'mark',
+      label: '椤剁骇鏍囪瘑',
+      initVal: card.mark || '',
+      tooltip: '涓婄骇瀛楁(pid)涓庨《绾ф爣璇嗙浉鍚屾椂锛岃涓洪《绾ц妭鐐广��',
+      required: false
     },
     {
       type: 'multiselect',
@@ -2885,7 +2924,7 @@
       key: 'dataSource',
       label: '鏁版嵁婧�',
       initVal: card.dataSource || '',
-      placeholder: '绯荤粺鍙橀噺锛歮k_departmentcode銆乵k_organization銆乵k_user_type銆�',
+      placeholder: '绯荤粺鍙橀噺锛歮k_departmentcode銆乵k_organization銆乵k_user_type銆傚叕鍏卞�硷細@ID@銆丂BID@銆�',
       required: true,
       readonly: false
     },
@@ -3029,7 +3068,20 @@
       }, {
         value: '-90',
         text: '鍓�90澶�'
+      }, {
+        value: 'custom',
+        text: '鑷畾涔�'
       }]
+    },
+    {
+      type: 'text',
+      key: 'minDateField',
+      label: '鏈�灏忓�硷紙瀛楁锛�',
+      initVal: card.minDateField || '',
+      tooltip: '鏈�灏忓�煎搴斿瓧娈碉紝涔熷彲鑷畾涔夊浐瀹氬�硷紝鏍煎紡涓篩YYY-MM-DD銆�',
+      required: true,
+      readonly: false,
+      options: columns
     },
     {
       type: 'select',
@@ -3079,7 +3131,20 @@
       }, {
         value: '-90',
         text: '鍓�90澶�'
+      }, {
+        value: 'custom',
+        text: '鑷畾涔�'
       }]
+    },
+    {
+      type: 'text',
+      key: 'maxDateField',
+      label: '鏈�澶у�硷紙瀛楁锛�',
+      initVal: card.maxDateField || '',
+      tooltip: '鏈�澶у�煎搴斿瓧娈碉紝涔熷彲鑷畾涔夊浐瀹氬�硷紝鏍煎紡涓篩YYY-MM-DD銆�',
+      required: true,
+      readonly: false,
+      options: columns
     },
     {
       type: 'radio',
@@ -3118,7 +3183,7 @@
       type: 'text',
       key: 'separator',
       label: '杩炴帴绗�',
-      initVal: card.separator === undefined ? '/' : card.separator,
+      initVal: card.separator === undefined ? ',' : card.separator,
       tooltip: '琛ㄥ崟鎻愪氦鏃朵俊鎭箣闂寸殑杩炴帴绗︺�傛敞锛氳繛鎺ョ涓虹┖鏃讹紝鍒濆鍖栨椂濉厖鍏朵粬琛ㄥ崟鏃犳晥銆�',
       required: false,
       readonly: false
@@ -3445,6 +3510,22 @@
       }, {
         value: 'hide',
         text: '闅愯棌'
+      }]
+    },
+    {
+      type: 'radio',
+      key: 'checkAll',
+      label: '鍏ㄩ��',
+      initVal: card.checkAll || 'hide',
+      tooltip: '鍙閫夌殑閫夐」鍗℃槸鍚︽樉绀哄叏閫夊紑鍏筹紝娉細褰撻�夐」澶т簬3涓椂鏈夋晥銆�',
+      required: false,
+      forbid: appType !== '',
+      options: [{
+        value: 'hide',
+        text: '闅愯棌'
+      }, {
+        value: 'show',
+        text: '鏄剧ず'
       }]
     },
     {
@@ -4013,7 +4094,7 @@
       type: 'multiselect',
       key: 'linkSubField',
       label: '濉厖琛ㄥ崟',
-      tooltip: '鍦ㄥ垏鎹㈤�夐」鏃朵細鎶婁俊鎭嚜鍔ㄥ~鍏ュ叧鑱旂殑琛ㄥ崟锛堟枃鏈垨鏁板瓧琛ㄥ崟锛変腑銆�',
+      tooltip: '鍦ㄥ垏鎹㈤�夐」鏃朵細鎶婁俊鎭嚜鍔ㄥ~鍏ュ叧鑱旂殑琛ㄥ崟锛堟枃鏈垨鏁板瓧琛ㄥ崟锛変腑锛屽紑鍏充細灏嗘彁绀烘枃鏈~鍏ユ琛ㄥ崟銆�',
       initVal: card.linkSubField || [],
       options: inputfields
     },
@@ -4108,8 +4189,7 @@
       key: 'icon',
       label: '鍥炬爣',
       initVal: card.icon || '',
-      required: false,
-      forbid: type === 'CalendarPage'
+      required: false
     },
     {
       type: 'select',
@@ -4117,8 +4197,7 @@
       label: '涓婄骇鏍囩',
       initVal: supMenu,
       required: false,
-      options: menus,
-      forbid: type === 'CalendarPage'
+      options: menus
     },
     {
       type: 'mutilselect',
@@ -4127,8 +4206,7 @@
       tooltip: '濡傛灉瀛愭爣绛句腑鍚湁鍒锋柊鍚岀骇鏍囩鐨勬寜閽紝鍦ㄦ澶勬坊鍔犻渶瑕佸埛鏂扮殑鏍囩銆�',
       initVal: equalTab,
       required: false,
-      options: equalTabs,
-      forbid: type === 'CalendarPage'
+      options: equalTabs
     },
     {
       type: 'text',
@@ -4136,8 +4214,7 @@
       label: '澶栭敭',
       tooltip: '澶栭敭鏃ㄥ湪鏍囩椤典腑鎵ц榛樿鍑芥暟锛堟坊鍔狅級鏃讹紝鏇挎崲BID瀛楁',
       initVal: card.foreignKey || '',
-      required: false,
-      forbid: type === 'CalendarPage'
+      required: false
     },
     {
       type: 'number',
@@ -4157,7 +4234,7 @@
       initVal: card.searchPass || 'false',
       tooltip: '浣跨敤涓昏〃鎼滅储鏉′欢鏃讹紝涓昏〃鐨勬悳绱㈡潯浠朵細浼犲叆瀛愯〃涓��',
       required: false,
-      forbid: type !== 'CommonTable' && type !== 'CalendarPage',
+      forbid: type !== 'CommonTable',
       options: [{
         value: 'true',
         text: '浣跨敤'

--
Gitblit v1.8.0