From 3e13e3e61854671fce6aac45679e1b7252126105 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 24 十二月 2023 23:41:01 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/table/base-table/options.jsx | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/table/base-table/options.jsx b/src/menu/components/table/base-table/options.jsx
index 775a39c..38d54a9 100644
--- a/src/menu/components/table/base-table/options.jsx
+++ b/src/menu/components/table/base-table/options.jsx
@@ -1,7 +1,7 @@
/**
* @description Wrap琛ㄥ崟閰嶇疆淇℃伅
*/
-export default function (wrap, action = [], columns = []) {
+export default function (wrap, action = [], columns = [], toolBtns = []) {
const wrapForm = [
{
type: 'radio',
@@ -167,7 +167,16 @@
tooltip: '鍙屽嚮琛ㄦ牸涓锛岃Е鍙戠殑鎸夐挳銆�',
required: false,
allowClear: true,
- options: action.map(item => ({value: item.uuid, label: item.label})),
+ options: [...toolBtns, ...action].map(item => ({value: item.uuid, label: item.label})),
+ },
+ {
+ type: 'select',
+ field: 'autoExec',
+ label: '鑷姩鎵ц',
+ initval: wrap.autoExec || '',
+ tooltip: '鍒濆鍖栬嚜鍔ㄦ墽琛屾寜閽��',
+ required: false,
+ options: toolBtns.map(item => ({value: item.uuid, label: item.label}))
},
{
type: 'select',
--
Gitblit v1.8.0