From 131bc212f0cfe964c9a38bbe6178aca4f4a16677 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 二月 2024 17:50:30 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/share/actioncomponent/formconfig.jsx | 127 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 118 insertions(+), 9 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index be2b2cd..24a4df8 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -162,6 +162,7 @@
{ value: 'refund', text: '閫�娆�' },
{ value: 'closetab', text: '鏍囩鍏抽棴' },
{ value: 'expPdf', text: '瀵煎嚭PDF' },
+ { value: 'shareLink', text: '鍒嗕韩閾炬帴' },
{ value: 'megvii', text: '鏃疯闈㈡澘鏈�' },
{ value: 'filezip', text: '鏂囦欢鍘嬬缉鍖�' },
]
@@ -205,6 +206,7 @@
{ value: 'clearCache', text: '娓呯┖鏈湴閰嶇疆' },
{ value: 'copyurl', text: '澶嶅埗閾炬帴鍦板潃' },
{ value: 'expPdf', text: '瀵煎嚭PDF' },
+ { value: 'shareLink', text: '鍒嗕韩閾炬帴' },
{ value: 'logout', text: '閫�鍑�' },
{ value: 'goBack', text: '杩斿洖' },
]
@@ -766,6 +768,43 @@
}]
},
{
+ type: 'radio',
+ key: 'shortUrl',
+ label: '鐭摼鎺�',
+ initVal: card.shortUrl || 'false',
+ options: [{
+ value: 'false',
+ text: '绂佺敤'
+ }, {
+ value: 'true',
+ text: '鍚敤'
+ }]
+ },
+ {
+ type: 'textarea',
+ key: 'shareUrl',
+ label: '閾炬帴鍦板潃',
+ initVal: card.shareUrl || '',
+ tooltip: '閾炬帴涓鏋滃瓨鍦ˊBID@鎴朄ID@灏嗚嚜鍔ㄦ浛鎹€��',
+ required: true
+ },
+ {
+ type: 'textarea',
+ key: 'shareProUrl',
+ label: '姝ｅ紡閾炬帴',
+ initVal: card.shareProUrl || '',
+ tooltip: '閾炬帴涓鏋滃瓨鍦ˊBID@鎴朄ID@灏嗚嚜鍔ㄦ浛鎹€��',
+ required: false
+ },
+ {
+ type: 'text',
+ key: 'shareTip',
+ label: '鍒嗕韩鎻愮ず',
+ initVal: card.shareTip || '',
+ tooltip: '鍒嗕韩鏃跺鐢ㄦ埛鐨勬彁绀轰俊鎭��',
+ required: false
+ },
+ {
type: 'number',
key: 'width',
min: 0,
@@ -1236,6 +1275,21 @@
},
{
type: 'radio',
+ key: 'formCache',
+ label: '琛ㄥ崟缂撳瓨',
+ initVal: card.formCache || 'false',
+ tooltip: '涓昏鐢ㄤ簬鏁版嵁淇敼鍚庯紝鏇存柊鐩稿叧琛ㄥ崟鐨勯�夐」锛屾竻绌虹紦瀛樺悗琛ㄥ崟鍐嶆鎵撳紑鏃舵暟鎹細閲嶆柊鍔犺浇銆�',
+ required: false,
+ options: [{
+ value: 'false',
+ text: '涓嶆竻绌�'
+ }, {
+ value: 'clear',
+ text: '娓呯┖'
+ }]
+ },
+ {
+ type: 'radio',
key: 'hidden',
label: '闅愯棌',
initVal: card.hidden || 'false',
@@ -1386,6 +1440,7 @@
dataIndex: 'syncComId',
inputType: 'cascader',
editable: true,
+ unique: true,
required: true,
extends: [{key: 'label', value: 'label'}],
width: '70%',
@@ -1461,6 +1516,7 @@
{ value: 'refund', text: '閫�娆�' },
{ value: 'closetab', text: '鏍囩鍏抽棴' },
{ value: 'expPdf', text: '瀵煎嚭PDF' },
+ { value: 'shareLink', text: '鍒嗕韩閾炬帴' },
{ value: 'megvii', text: '鏃疯闈㈡澘鏈�' },
{ value: 'filezip', text: '鏂囦欢鍘嬬缉鍖�' },
]
@@ -1932,17 +1988,54 @@
// }]
// },
{
- type: 'number',
- key: 'width',
- min: 1,
- max: 24,
- precision: 0,
- label: '瀹藉害',
- initVal: card.width || 12,
- tooltip: '鏍呮牸甯冨眬锛屾瘡琛岀瓑鍒嗕负24鍒椼��',
- forbid: card.eleType !== 'button',
+ type: 'radio',
+ key: 'shortUrl',
+ label: '鐭摼鎺�',
+ initVal: card.shortUrl || 'false',
+ options: [{
+ value: 'false',
+ text: '绂佺敤'
+ }, {
+ value: 'true',
+ text: '鍚敤'
+ }]
+ },
+ {
+ type: 'textarea',
+ key: 'shareUrl',
+ label: '閾炬帴鍦板潃',
+ initVal: card.shareUrl || '',
+ tooltip: '閾炬帴涓鏋滃瓨鍦ˊBID@鎴朄ID@灏嗚嚜鍔ㄦ浛鎹€��',
required: true
},
+ {
+ type: 'textarea',
+ key: 'shareProUrl',
+ label: '姝ｅ紡閾炬帴',
+ initVal: card.shareProUrl || '',
+ tooltip: '閾炬帴涓鏋滃瓨鍦ˊBID@鎴朄ID@灏嗚嚜鍔ㄦ浛鎹€��',
+ required: false
+ },
+ {
+ type: 'text',
+ key: 'shareTip',
+ label: '鍒嗕韩鎻愮ず',
+ initVal: card.shareTip || '',
+ 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: 'radio',
key: 'show',
@@ -2232,6 +2325,21 @@
},
{
type: 'radio',
+ key: 'formCache',
+ label: '琛ㄥ崟缂撳瓨',
+ initVal: card.formCache || 'false',
+ tooltip: '涓昏鐢ㄤ簬鏁版嵁淇敼鍚庯紝鏇存柊鐩稿叧琛ㄥ崟鐨勯�夐」锛屾竻绌虹紦瀛樺悗琛ㄥ崟鍐嶆鎵撳紑鏃舵暟鎹細閲嶆柊鍔犺浇銆�',
+ required: false,
+ options: [{
+ value: 'false',
+ text: '涓嶆竻绌�'
+ }, {
+ value: 'clear',
+ text: '娓呯┖'
+ }]
+ },
+ {
+ type: 'radio',
key: 'hidden',
label: '闅愯棌',
initVal: card.hidden || 'false',
@@ -2286,6 +2394,7 @@
title: '缁勪欢',
dataIndex: 'syncComId',
inputType: 'cascader',
+ unique: true,
editable: true,
required: true,
extends: [{key: 'label', value: 'label'}],
--
Gitblit v1.8.0