From 148f6930874cb0a07bd7279e4b39fa708bd720eb Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 05 一月 2024 17:21:43 +0800
Subject: [PATCH] 2024-01-05
---
src/menu/components/card/double-data-card/options.jsx | 12 ++++++
src/menu/components/table/edit-table/options.jsx | 10 +++++
src/menu/components/table/normal-table/options.jsx | 11 +++++
src/tabviews/custom/components/share/normalTable/index.jsx | 4 ++
src/menu/components/card/data-card/options.jsx | 12 ++++++
src/menu/components/share/colsControl/markform/index.jsx | 2
src/menu/components/table/base-table/options.jsx | 10 +++++
src/tabviews/custom/components/card/double-data-card/index.jsx | 3 +
src/tabviews/custom/components/card/data-card/index.jsx | 4 ++
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 4 ++
10 files changed, 71 insertions(+), 1 deletions(-)
diff --git a/src/menu/components/card/data-card/options.jsx b/src/menu/components/card/data-card/options.jsx
index 3d2fa34..d220750 100644
--- a/src/menu/components/card/data-card/options.jsx
+++ b/src/menu/components/card/data-card/options.jsx
@@ -187,6 +187,7 @@
],
controlFields: [
{field: 'slidetip', values: ['slide']},
+ {field: 'maxPageSize', values: ['page']},
],
forbid: subtype === 'propcard'
},
@@ -621,6 +622,17 @@
forbid: !!appType || subtype !== 'datacard' || isprint
},
{
+ type: 'number',
+ field: 'maxPageSize',
+ label: '姣忛〉鏈�澶ф暟',
+ initval: wrap.maxPageSize || '',
+ min: 10,
+ max: 500,
+ precision: 0,
+ required: false,
+ forbid: !laypage || appType === 'mob' || subtype !== 'datacard'
+ },
+ {
type: 'multiselect',
field: 'blacklist',
label: '榛戝悕鍗�',
diff --git a/src/menu/components/card/double-data-card/options.jsx b/src/menu/components/card/double-data-card/options.jsx
index 591c305..91625de 100644
--- a/src/menu/components/card/double-data-card/options.jsx
+++ b/src/menu/components/card/double-data-card/options.jsx
@@ -75,6 +75,7 @@
],
controlFields: [
{field: 'slidetip', values: ['slide']},
+ {field: 'maxPageSize', values: ['page']},
],
},
{
@@ -273,6 +274,17 @@
forbid: !!appType || isprint
},
{
+ type: 'number',
+ field: 'maxPageSize',
+ label: '姣忛〉鏈�澶ф暟',
+ initval: wrap.maxPageSize || '',
+ min: 10,
+ max: 500,
+ precision: 0,
+ required: false,
+ forbid: !laypage || appType === 'mob'
+ },
+ {
type: 'multiselect',
field: 'blacklist',
label: '榛戝悕鍗�',
diff --git a/src/menu/components/share/colsControl/markform/index.jsx b/src/menu/components/share/colsControl/markform/index.jsx
index e718f56..7a29c8d 100644
--- a/src/menu/components/share/colsControl/markform/index.jsx
+++ b/src/menu/components/share/colsControl/markform/index.jsx
@@ -115,7 +115,7 @@
鍙栨秷
</Button> : null}
</Col>
- {targetKeys ? <Col span={18}>
+ {targetKeys ? <Col span={18} style={{clear: 'left'}}>
<Form.Item label="鏄剧ず鍒�">
{getFieldDecorator('cols', {
initialValue: [],
diff --git a/src/menu/components/table/base-table/options.jsx b/src/menu/components/table/base-table/options.jsx
index 38d54a9..9da8a3a 100644
--- a/src/menu/components/table/base-table/options.jsx
+++ b/src/menu/components/table/base-table/options.jsx
@@ -210,6 +210,16 @@
required: false
},
{
+ type: 'number',
+ field: 'maxPageSize',
+ label: '姣忛〉鏈�澶ф暟',
+ initval: wrap.maxPageSize || '',
+ min: 10,
+ max: 500,
+ precision: 0,
+ required: false
+ },
+ {
type: 'radio',
field: 'cacheSearch',
label: '鎼滅储缂撳瓨',
diff --git a/src/menu/components/table/edit-table/options.jsx b/src/menu/components/table/edit-table/options.jsx
index bf3537a..9ff9cf7 100644
--- a/src/menu/components/table/edit-table/options.jsx
+++ b/src/menu/components/table/edit-table/options.jsx
@@ -221,6 +221,16 @@
options: columns
},
{
+ type: 'number',
+ field: 'maxPageSize',
+ label: '姣忛〉鏈�澶ф暟',
+ initval: wrap.maxPageSize || '',
+ min: 10,
+ max: 500,
+ precision: 0,
+ required: false
+ },
+ {
type: 'multiselect',
field: 'blacklist',
label: '榛戝悕鍗�',
diff --git a/src/menu/components/table/normal-table/options.jsx b/src/menu/components/table/normal-table/options.jsx
index 4c8ba91..2d8f748 100644
--- a/src/menu/components/table/normal-table/options.jsx
+++ b/src/menu/components/table/normal-table/options.jsx
@@ -253,6 +253,17 @@
required: false
},
{
+ type: 'number',
+ field: 'maxPageSize',
+ label: '姣忛〉鏈�澶ф暟',
+ initval: wrap.maxPageSize || '',
+ min: 10,
+ max: 500,
+ precision: 0,
+ required: false,
+ forbid: appType === 'mob'
+ },
+ {
type: 'radio',
field: 'empty',
label: '绌哄�奸殣钘�',
diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index 4315f80..e281af7 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -154,6 +154,10 @@
pageOptions.push(size)
pageOptions = pageOptions.sort((a, b) => a - b)
}
+
+ if (_config.wrap.maxPageSize) {
+ pageOptions = pageOptions.filter(item => item <= _config.wrap.maxPageSize)
+ }
}
let _data = []
diff --git a/src/tabviews/custom/components/card/double-data-card/index.jsx b/src/tabviews/custom/components/card/double-data-card/index.jsx
index df7f722..7fa1228 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.jsx
+++ b/src/tabviews/custom/components/card/double-data-card/index.jsx
@@ -170,6 +170,9 @@
pageOptions.push(size)
pageOptions = pageOptions.sort((a, b) => a - b)
}
+ if (_config.wrap.maxPageSize) {
+ pageOptions = pageOptions.filter(item => item <= _config.wrap.maxPageSize)
+ }
}
if (_config.wrap.zHeight) {
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index 115e30a..5f6859a 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -566,6 +566,10 @@
pageOptions = pageOptions.sort((a, b) => a - b)
}
+ if (setting.maxPageSize) {
+ pageOptions = pageOptions.filter(item => item <= setting.maxPageSize)
+ }
+
let allColumns = null
if (colsCtrls) {
rowspans = null
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
index 9a9d454..3a725fa 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -1471,6 +1471,10 @@
pageOptions = pageOptions.sort((a, b) => a - b)
}
+ if (setting.maxPageSize) {
+ pageOptions = pageOptions.filter(item => item <= setting.maxPageSize)
+ }
+
let allColumns = null
if (colsCtrls) {
allColumns = [..._columns]
--
Gitblit v1.8.0