From dbc911dbb044895f98a49ef69ef5a5800a4aba3e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 15 九月 2024 20:26:39 +0800
Subject: [PATCH] 2024-09-15
---
src/menu/components/share/actioncomponent/formconfig.jsx | 123 ++++++++++++++++++++++++++++++++---------
1 files changed, 96 insertions(+), 27 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index bbf9eb6..5dc2f82 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -18,6 +18,11 @@
let type = ''
let alltype = config.type + '_' + config.subtype
+ columns = columns.map(item => ({
+ value: item.field,
+ text: `${item.label}锛�${item.field}锛塦
+ }))
+
if (card.eleType === 'button') {
type = 'card'
} else if (config.subtype === 'datacard' || config.subtype === 'tablecard' || config.subtype === 'dualdatacard') {
@@ -211,6 +216,7 @@
{ value: 'copyurl', text: '澶嶅埗閾炬帴鍦板潃' },
{ value: 'expPdf', text: '瀵煎嚭PDF' },
{ value: 'shareLink', text: '鍒嗕韩閾炬帴' },
+ { value: 'openLocation', text: '鎵撳紑鍦板浘'},
{ value: 'logout', text: '閫�鍑�' },
{ value: 'goBack', text: '杩斿洖' },
]
@@ -319,7 +325,7 @@
}
let width = card.width || (card.width === 0 ? 0 : 12)
- if (/x/.test(card.width)) {
+ if (card.width && /x/.test(card.width)) {
width = +width.replace(/x/, '.5')
}
@@ -331,9 +337,21 @@
extraParam.push('dataM')
}
+ let apps = []
+ let merchs = []
if (!appType) {
if (typeof(card.openmenu) === 'string') {
card.openmenu = []
+ }
+
+ if (window.GLOB.WXApps) {
+ window.GLOB.WXApps.forEach(item => {
+ if (item.appType === 'merchant') {
+ merchs.push({value: item.appId, text: item.appName})
+ } else {
+ apps.push({value: item.appId, text: item.appName})
+ }
+ })
}
} else {
if (typeof(card.openmenu) !== 'string') {
@@ -509,10 +527,20 @@
key: 'wxApp',
label: '鍏宠仈搴旂敤',
initVal: card.wxApp || '',
- tooltip: '璇峰叧鑱旀敮浠橈紙鎴栭��娆撅級鐨勫叕浼楀彿鎴栧皬绋嬪簭銆�',
+ tooltip: '璇峰叧鑱旀敮浠樼殑鍏紬鍙锋垨灏忕▼搴忋��',
required: true,
- forbid: !!appType || !window.GLOB.WXApps,
- options: window.GLOB.WXApps ? window.GLOB.WXApps.map(item => ({value: item.appId, text: item.appName})) : []
+ forbid: apps.length === 0,
+ options: apps
+ },
+ {
+ type: 'select',
+ key: 'wxMerch',
+ label: '鍏宠仈鍟嗘埛',
+ initVal: card.wxMerch || '',
+ tooltip: '璇峰叧鑱旀敮浠樼殑鍟嗘埛鍙枫��',
+ required: true,
+ forbid: merchs.length === 0,
+ options: merchs
},
{
type: 'text',
@@ -835,6 +863,25 @@
}]
},
{
+ type: 'select',
+ key: 'nameField',
+ label: '浣嶇疆鍚嶅瓧娈�',
+ initVal: card.nameField || '',
+ tooltip: '鎵撳紑鍦板浘鏃跺彲灞曠ず浣嶇疆鍚嶄笌璇︾粏鍦板潃锛岃缁戝畾鏁版嵁婧愬瓧娈甸泦锛岀粡绾害璇蜂娇鐢╨atitude銆乴ongitude涓旂粡绾害涓嶅彲涓虹┖銆�',
+ required: false,
+ allowClear: true,
+ options: columns
+ },
+ {
+ type: 'select',
+ key: 'addressField',
+ label: '鍦板潃瀛楁',
+ initVal: card.addressField || '',
+ required: false,
+ allowClear: true,
+ options: columns
+ },
+ {
type: 'radio',
key: 'shortUrl',
label: '鐭摼鎺�',
@@ -1129,10 +1176,7 @@
required: false,
allowClear: true,
forbid: position !== 'line',
- options: columns.map(item => ({
- value: item.field,
- text: `${item.label}锛�${item.field}锛塦
- }))
+ options: columns
},
{
type: 'radio',
@@ -1349,10 +1393,7 @@
initVal: card.controlField || '',
required: true,
allowClear: true,
- options: columns.map(item => ({
- value: item.field,
- text: `${item.label}锛�${item.field}锛塦
- }))
+ options: columns
},
{
type: 'text',
@@ -1764,6 +1805,24 @@
extraParam.push('dataM')
}
+ let apps = []
+ let merchs = []
+
+ if (window.GLOB.WXApps) {
+ window.GLOB.WXApps.forEach(item => {
+ if (item.appType === 'merchant') {
+ merchs.push({value: item.appId, text: item.appName})
+ } else {
+ apps.push({value: item.appId, text: item.appName})
+ }
+ })
+ }
+
+ let width = card.width || (card.width === 0 ? 0 : 12)
+ if (card.width && /x/.test(card.width)) {
+ width = +width.replace(/x/, '.5')
+ }
+
let forms = [
{
type: 'select',
@@ -1911,10 +1970,20 @@
key: 'wxApp',
label: '鍏宠仈搴旂敤',
initVal: card.wxApp || '',
- tooltip: '璇峰叧鑱旀敮浠橈紙鎴栭��娆撅級鐨勫叕浼楀彿鎴栧皬绋嬪簭銆�',
+ tooltip: '璇峰叧鑱旀敮浠樼殑鍏紬鍙锋垨灏忕▼搴忋��',
required: true,
- forbid: !window.GLOB.WXApps,
- options: window.GLOB.WXApps ? window.GLOB.WXApps.map(item => ({value: item.appId, text: item.appName})) : []
+ forbid: apps.length === 0,
+ options: apps
+ },
+ {
+ type: 'select',
+ key: 'wxMerch',
+ label: '鍏宠仈鍟嗘埛',
+ initVal: card.wxMerch || '',
+ tooltip: '璇峰叧鑱旀敮浠樼殑鍟嗘埛鍙枫��',
+ required: true,
+ forbid: merchs.length === 0,
+ options: merchs
},
{
type: 'text',
@@ -2275,18 +2344,18 @@
tooltip: '鍒嗕韩鏃跺鐢ㄦ埛鐨勬彁绀轰俊鎭��',
required: false
},
- // {
- // type: 'number',
- // key: 'width',
- // min: 1,
- // max: 24,
- // precision: 0,
- // label: '瀹藉害',
- // initVal: card.width || 12,
- // tooltip: '鏍呮牸甯冨眬锛屾瘡琛岀瓑鍒嗕负24鍒椼��',
- // forbid: card.eleType !== 'button',
- // required: true
- // },
+ {
+ type: 'number',
+ key: 'width',
+ min: 0,
+ max: 24,
+ precision: 1,
+ label: '瀹藉害',
+ initVal: width,
+ tooltip: '鏍呮牸甯冨眬锛屾瘡琛岀瓑鍒嗕负24鍒椼�備负 0 鏃跺搴﹁嚜閫傚簲銆傚彲璁剧疆鍗婂垪鍗�.5銆�',
+ forbid: position !== 'line',
+ required: true
+ },
{
type: 'radio',
key: 'show',
--
Gitblit v1.8.0