From eed5279d84fd59bc32f060a31b4006590cee4320 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 一月 2024 17:01:59 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/share/actioncomponent/formconfig.jsx | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 00b31aa..be2b2cd 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -161,7 +161,7 @@
{ value: 'print', text: '鏍囩鎵撳嵃' },
{ value: 'refund', text: '閫�娆�' },
{ value: 'closetab', text: '鏍囩鍏抽棴' },
- // { value: 'expPdf', text: '瀵煎嚭PDF' },
+ { value: 'expPdf', text: '瀵煎嚭PDF' },
{ value: 'megvii', text: '鏃疯闈㈡澘鏈�' },
{ value: 'filezip', text: '鏂囦欢鍘嬬缉鍖�' },
]
@@ -204,6 +204,7 @@
{ value: 'reAuth', text: '鍒囨崲绯荤粺锛堟竻绌虹紦瀛�-灏忕▼搴忥級' },
{ value: 'clearCache', text: '娓呯┖鏈湴閰嶇疆' },
{ value: 'copyurl', text: '澶嶅埗閾炬帴鍦板潃' },
+ { value: 'expPdf', text: '瀵煎嚭PDF' },
{ value: 'logout', text: '閫�鍑�' },
{ value: 'goBack', text: '杩斿洖' },
]
@@ -776,6 +777,21 @@
forbid: type !== 'card',
required: true
},
+ // {
+ // type: 'radio',
+ // key: 'exportType',
+ // label: '瀵煎嚭鏂瑰紡',
+ // initVal: card.exportType || 'download',
+ // tooltip: '',
+ // required: true,
+ // options: [{
+ // value: 'download',
+ // text: '涓嬭浇鏈湴'
+ // }, {
+ // value: 'link',
+ // text: '鐢熸垚閾炬帴'
+ // }]
+ // },
{
type: 'radio',
key: 'show',
@@ -1444,7 +1460,7 @@
{ value: 'print', text: '鏍囩鎵撳嵃' },
{ value: 'refund', text: '閫�娆�' },
{ value: 'closetab', text: '鏍囩鍏抽棴' },
- // { value: 'expPdf', text: '瀵煎嚭PDF' },
+ { value: 'expPdf', text: '瀵煎嚭PDF' },
{ value: 'megvii', text: '鏃疯闈㈡澘鏈�' },
{ value: 'filezip', text: '鏂囦欢鍘嬬缉鍖�' },
]
@@ -1900,6 +1916,21 @@
text: '涓嶉噸缃�'
}]
},
+ // {
+ // type: 'radio',
+ // key: 'exportType',
+ // label: '瀵煎嚭鏂瑰紡',
+ // initVal: card.exportType || 'download',
+ // tooltip: '',
+ // required: true,
+ // options: [{
+ // value: 'download',
+ // text: '涓嬭浇鏈湴'
+ // }, {
+ // value: 'link',
+ // text: '鐢熸垚閾炬帴'
+ // }]
+ // },
{
type: 'number',
key: 'width',
--
Gitblit v1.8.0