From 06a670976e2145a10ea05207041d3cf3164cd380 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 二月 2024 18:13:25 +0800
Subject: [PATCH] Merge branch 'positec' into dms

---
 src/menu/components/card/data-card/options.jsx |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/menu/components/card/data-card/options.jsx b/src/menu/components/card/data-card/options.jsx
index 0140681..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'
     },
@@ -413,10 +414,10 @@
       field: 'autoExec',
       label: '鑷姩鎵ц',
       initval: wrap.autoExec || '',
-      tooltip: '鏁版嵁鏇存柊鏃惰嚜鍔ㄦ墽琛屾寜閽�傛敞锛氭鎸夐挳鎵ц鎴愬姛鍚庤皑鎱庨�夋嫨鍒锋柊椤癸紝閬垮厤閫犳垚寰幆鎵ц銆�',
+      tooltip: subtype === 'propcard' ? '鏁版嵁鏇存柊鏃惰嚜鍔ㄦ墽琛屾寜閽�傛敞锛氭鎸夐挳鎵ц鎴愬姛鍚庤皑鎱庨�夋嫨鍒锋柊椤癸紝閬垮厤閫犳垚寰幆鎵ц銆�' : '鍒濆鍖栬嚜鍔ㄦ墽琛屾寜閽��',
       required: false,
       options: buttons,
-      forbid: subtype !== 'propcard',
+      forbid: subtype !== 'propcard' && subtype !== 'datacard',
       controlFields: [
         {field: 'emptyExec', notNull: true},
       ]
@@ -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: '榛戝悕鍗�',
@@ -646,6 +658,7 @@
       required: true,
       forbid: subtype !== 'datacard' || appType === 'mob' || isprint,
       span: 24,
+      actions: ['edit', 'del', 'add', 'move'],
       columns: [
         {
           title: '搴忓彿',

--
Gitblit v1.8.0