From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/views/tabledesign/source.jsx | 102 ++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 84 insertions(+), 18 deletions(-)
diff --git a/src/views/tabledesign/source.jsx b/src/views/tabledesign/source.jsx
index d4d1666..b324501 100644
--- a/src/views/tabledesign/source.jsx
+++ b/src/views/tabledesign/source.jsx
@@ -51,6 +51,26 @@
type: 'search',
label: '鏃ユ湡锛堢粍鍚堬級',
subType: 'group'
+ },
+ {
+ type: 'search',
+ label: '鏁板�硷紙鍖洪棿锛�',
+ subType: 'range'
+ },
+ {
+ type: 'search',
+ label: '寮�鍏�',
+ subType: 'switch'
+ },
+ {
+ type: 'search',
+ label: '鍗曢�夋',
+ subType: 'radio'
+ },
+ {
+ type: 'search',
+ label: '鍕鹃�夋',
+ subType: 'check'
}
],
actionItems: [
@@ -119,6 +139,58 @@
$init: true
}
],
+ popactionItems: [
+ {
+ type: 'action',
+ label: '寮圭獥锛堣〃鍗曪級',
+ text: '寮圭獥锛堣〃鍗曪級',
+ value: 'pop',
+ $init: true
+ },
+ {
+ type: 'action',
+ label: '鎻愮ず妗�',
+ text: '鎻愮ず妗�',
+ value: 'prompt',
+ $init: true
+ },
+ {
+ type: 'action',
+ label: '鐩存帴鎵ц',
+ text: '鐩存帴鎵ц',
+ value: 'exec',
+ $init: true
+ },
+ {
+ type: 'action',
+ label: '瀵煎叆Excel',
+ text: '瀵煎叆Excel',
+ value: 'excelIn',
+ class: 'border-dgreen',
+ $init: true
+ },
+ {
+ type: 'action',
+ label: '瀵煎嚭Excel',
+ text: '瀵煎嚭Excel',
+ value: 'excelOut',
+ $init: true
+ },
+ {
+ type: 'action',
+ label: '鏍囩椤�',
+ text: '鏍囩椤�',
+ value: 'tab',
+ $init: true
+ },
+ {
+ type: 'action',
+ label: '鏂伴〉闈�',
+ text: '鏂伴〉闈�',
+ value: 'innerpage',
+ $init: true
+ }
+ ],
columnItems: [
{
type: 'col',
@@ -130,6 +202,18 @@
type: 'col',
label: '鏁板瓧',
subType: 'number',
+ $init: true
+ },
+ {
+ type: 'col',
+ label: '鑷畾涔夊垪',
+ subType: 'custom',
+ $init: true
+ },
+ {
+ type: 'col',
+ label: '鍏紡',
+ subType: 'formula',
$init: true
},
{
@@ -158,32 +242,14 @@
},
{
type: 'col',
- label: '鑷畾涔夊垪',
- subType: 'custom',
- $init: true
- },
- {
- type: 'col',
label: '鍚堝苟鍒�',
subType: 'colspan',
$init: true
},
{
type: 'col',
- label: '鍏紡',
- subType: 'formula',
- $init: true
- },
- {
- type: 'col',
label: '搴忓彿',
subType: 'index',
- $init: true
- },
- {
- type: 'col',
- label: '鎿嶄綔',
- subType: 'action',
$init: true
}
],
--
Gitblit v1.8.0