From 6ca240a14ccf55d4e0a94fff77e95f64db2cdfcc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 11 十月 2024 17:34:25 +0800
Subject: [PATCH] 2024-10-11

---
 src/templates/zshare/formconfig.jsx |   37 ++++++++++++++++++++++++++++++-------
 1 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index 621dd29..b494bb7 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -261,7 +261,7 @@
       label: '鏁版嵁婧�',
       initVal: card.dataSource || '',
       tooltip: '鏁版嵁鏉冮檺鏇挎崲绗� $@ -> /* 鎴� \'\'銆� @$ -> */ 鎴� \'\'',
-      placeholder: '绯荤粺鍙橀噺锛歮k_departmentcode銆乵k_organization銆乵k_user_type銆�',
+      placeholder: '绯荤粺鍙橀噺锛歮k_departmentcode銆乵k_organization銆乵k_user_type銆傚叕鍏卞�硷細@BID@銆丂Appkey@銆丂UserID@銆丂SessionUid@銆丂LoginUID@銆丂lang@銆�',
       required: true
     },
     {
@@ -444,7 +444,7 @@
         text: '鏈湴'
       }, {
         value: 'sso',
-        text: '绯荤粺'
+        text: '鍗曠偣'
       }]
     },
     {
@@ -1012,12 +1012,20 @@
 
   let options = card.options || []
   if (['select', 'radio', 'link'].includes(card.type) && card.setAll === 'true') { // 鍏煎
-    options.unshift({
+    let cell = {
       key: 'empty',
       Value: '',
       Text: card.emptyText || '绌�',
       ParentID: ''
-    })
+    }
+
+    if (card.linkSubField) {
+      card.linkSubField.forEach(m => {
+        cell[m] = ''
+      })
+    }
+
+    options.unshift(cell)
   }
 
   let initval = card.initval || ''
@@ -1199,7 +1207,7 @@
       label: '鏁版嵁婧�',
       initVal: card.dataSource || '',
       tooltip: '鏁版嵁鏉冮檺鏇挎崲绗� $@ -> /* 鎴� \'\'銆� @$ -> */ 鎴� \'\'',
-      placeholder: '绯荤粺鍙橀噺锛歮k_departmentcode銆乵k_organization銆乵k_user_type銆傚叕鍏卞�硷細@ID@銆丂BID@銆�',
+      placeholder: '绯荤粺鍙橀噺锛歮k_departmentcode銆乵k_organization銆乵k_user_type銆傚叕鍏卞�硷細@ID@銆丂BID@銆丂Appkey@銆丂UserID@銆丂SessionUid@銆丂LoginUID@銆丂lang@銆�',
       required: true,
       readonly: false
     },
@@ -1869,7 +1877,7 @@
         text: '鏈湴'
       }, {
         value: 'sso',
-        text: '绯荤粺'
+        text: '鍗曠偣'
       }]
     },
     {
@@ -1907,7 +1915,7 @@
       type: 'radio',
       key: 'readin',
       label: '鑷姩濉厖',
-      tooltip: '灏嗚〃鏍奸�変腑鐨勬暟鎹嚜鍔ㄥ～鍏呭埌琛ㄥ崟涓�傛敞锛氬湪鎵归噺鎿嶄綔鏃讹紝濡傛兂瑕佹墍閫夎锛堝綋鍓嶅瓧娈碉級鍏ㄩ儴淇敼璇疯涓哄惁鎴栭琛屻��',
+      tooltip: '灏嗚〃鏍奸�変腑鐨勬暟鎹嚜鍔ㄥ～鍏呭埌琛ㄥ崟涓�傛敞锛氬湪鎵归噺鎿嶄綔鏃讹紝濡傛兂瑕佹墍閫夎锛堝綋鍓嶅瓧娈碉級鍏ㄩ儴淇敼璇疯涓哄惁鎴栭琛岋紱浣跨敤鈥滅紦瀛樷�濇椂锛屽皢鍦ㄦ湰鍦颁繚瀛樹笌璇诲彇琛ㄥ崟淇℃伅锛岄�夎鏃朵娇鐢ㄨ淇℃伅濉厖銆�',
       initVal: card.readin || 'true',
       options: [{
         value: 'true',
@@ -1918,6 +1926,9 @@
       }, {
         value: 'top',
         text: '棣栬'
+      }, {
+        value: 'local',
+        text: '缂撳瓨'
       }]
     },
     {
@@ -2515,6 +2526,18 @@
     },
     {
       type: 'number',
+      key: 'contHeidht',
+      label: '楂樺害',
+      min: 1,
+      max: 2000,
+      precision: 1,
+      initVal: card.contHeidht,
+      tooltip: '瀵屾枃鏈紪杈戝尯鐨勯珮搴︼紝灏忎簬100鏃朵负绐楀彛鐨勭櫨鍒嗘瘮銆�',
+      required: false,
+      forbid: appType === 'mob'
+    },
+    {
+      type: 'number',
       key: 'labelwidth',
       min: 1,
       max: 100,

--
Gitblit v1.8.0