From 1bec8d69cf14bd88591eee5b0320c5c8f6c25a08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 08 三月 2024 21:19:31 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/card/double-data-card/options.jsx | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/src/menu/components/card/double-data-card/options.jsx b/src/menu/components/card/double-data-card/options.jsx
index 942b421..16d9f40 100644
--- a/src/menu/components/card/double-data-card/options.jsx
+++ b/src/menu/components/card/double-data-card/options.jsx
@@ -1,7 +1,7 @@
/**
* @description Wrap琛ㄥ崟閰嶇疆淇℃伅
*/
-export default function (wrap, columns = [], setting) {
+export default function (wrap, columns = [], setting, buttons = []) {
let appType = sessionStorage.getItem('appType')
let laypage = setting && setting.laypage !== 'false'
let roleList = sessionStorage.getItem('sysRoles')
@@ -75,6 +75,7 @@
],
controlFields: [
{field: 'slidetip', values: ['slide']},
+ {field: 'maxPageSize', values: ['page']},
],
},
{
@@ -183,6 +184,15 @@
required: false
},
{
+ type: 'select',
+ field: 'autoExec',
+ label: '鑷姩鎵ц',
+ initval: wrap.autoExec || '',
+ tooltip: '鍒濆鍖栬嚜鍔ㄦ墽琛屾寜閽��',
+ required: false,
+ options: buttons
+ },
+ {
type: 'number',
field: 'minWidth',
label: '鏈�灏忓搴�',
@@ -264,6 +274,18 @@
forbid: !!appType || isprint
},
{
+ type: 'number',
+ field: 'maxPageSize',
+ label: '姣忛〉鏈�澶ф暟',
+ initval: wrap.maxPageSize || '',
+ tooltip: '鍒嗛〉鏃舵瘡椤靛彲鏄剧ず鐨勬渶澶ф暟閲忋��',
+ min: 10,
+ max: 500,
+ precision: 0,
+ required: false,
+ forbid: !laypage || appType === 'mob'
+ },
+ {
type: 'multiselect',
field: 'blacklist',
label: '榛戝悕鍗�',
--
Gitblit v1.8.0