From dbf30d9cf36e5356e12e8447662ead83edad396e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 11 三月 2023 17:50:28 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/templates/zshare/formconfig.jsx |   66 ++++++++++++++++++++++++++++++++
 1 files changed, 65 insertions(+), 1 deletions(-)

diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index d211ba0..635f5a6 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -2408,6 +2408,23 @@
     roleList = []
   }
 
+  let msgTemps = sessionStorage.getItem('msgTemplate')
+
+  if (msgTemps) {
+    try {
+      msgTemps = JSON.parse(msgTemps)
+      msgTemps = msgTemps.map(item => {
+        item.value = item.ID
+        item.label = item.SignName + ' - ' + item.TemplateCode
+        return item
+      })
+    } catch (e) {
+      msgTemps = []
+    }
+  } else {
+    msgTemps = []
+  }
+
   inputfields = inputfields.map((item, index) => {
     item.label = `${index + 1}銆�${item.field || ''}锛�${item.label}锛塦
     return item
@@ -2498,6 +2515,9 @@
   }, {
     value: 'formula',
     text: '鍏紡'
+  }, {
+    value: 'vercode',
+    text: '楠岃瘉鐮�'
   }]
 
   let _fieldlength = 50
@@ -2560,6 +2580,9 @@
     }, {
       value: 'formula',
       text: '鍏紡'
+    }, {
+      value: 'vercode',
+      text: '楠岃瘉鐮�'
     }]
   }
 
@@ -3458,11 +3481,20 @@
       }]
     },
     {
+      type: 'text',
+      key: 'splitctrl',
+      label: '鎺у埗瀛楁',
+      initVal: card.splitctrl || '',
+      tooltip: '閫夎涓旇涓搴斿瓧娈靛�间负绌烘椂闅愯棌銆�',
+      required: false,
+      options: columns
+    },
+    {
       type: 'radio',
       key: 'place',
       label: '鎺掑垪',
       initVal: card.place || 'left_right',
-      tooltip: '鎻愮ず鏂囧瓧涓庤緭鍏ユ鐨勪綅缃叧绯汇��',
+      tooltip: '鎻愮ず鏂囧瓧涓庤緭鍏ユ鐨勪綅缃叧绯汇�傛敞锛氶�夋嫨鍣ㄣ�佹棩鏈熻〃鍗曞湪琛ㄥ崟鏍峰紡涓洪槾褰辨椂鏈夋晥',
       forbid: appType !== 'mob',
       options: [{
         value: 'left_right',
@@ -3632,6 +3664,38 @@
       }]
     },
     {
+      type: 'radio',
+      key: 'sendType',
+      label: '鍙戦�佹柟寮�',
+      initVal: card.sendType || 'local',
+      tooltip: '鐭俊鍙戦�佹椂鏄惁閫氳繃鍗曠偣绯荤粺銆�',
+      required: false,
+      options: [{
+        value: 'local',
+        text: '鏈湴'
+      }, {
+        value: 'sso',
+        text: '鍗曠偣'
+      }]
+    },
+    {
+      type: 'select',
+      key: 'phoneField',
+      label: '鎵嬫満鍙�',
+      initVal: card.phoneField || '',
+      required: true,
+      options: inputfields
+    },
+    {
+      type: 'select',
+      key: 'smsId',
+      label: '鐭俊妯℃澘',
+      initVal: card.smsId || '',
+      tooltip: '璇烽�夋嫨閫傚綋鐨勭煭淇℃ā鏉裤��',
+      required: true,
+      options: msgTemps
+    },
+    {
       type: 'number',
       key: 'span',
       min: 1,

--
Gitblit v1.8.0