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/menu/components/table/edit-table/options.jsx | 80 +++++++++++++++++++++++++++++++++++----
1 files changed, 71 insertions(+), 9 deletions(-)
diff --git a/src/menu/components/table/edit-table/options.jsx b/src/menu/components/table/edit-table/options.jsx
index 2c88ad3..c6899e7 100644
--- a/src/menu/components/table/edit-table/options.jsx
+++ b/src/menu/components/table/edit-table/options.jsx
@@ -45,26 +45,37 @@
{
type: 'number',
field: 'height',
- label: '楂樺害',
+ label: '鏈�澶ч珮搴�',
initval: wrap.height || '',
- tooltip: '琛ㄦ牸楂樺害锛岀┖鍊兼椂楂樺害鑷�傚簲銆傛敞锛氬皬浜庣瓑浜�100鏃朵负楂樺害鐨勭櫨鍒嗘瘮銆�',
- min: 10,
+ tooltip: '琛ㄦ牸鍐呭鍖虹殑鏈�澶ч珮搴︼紙涓嶅寘鍚〃澶达級锛岀┖鍊兼椂楂樺害鑷�傚簲銆傛敞锛氬皬浜庣瓑浜�100澶т簬0鏃朵负楂樺害鐨勭櫨鍒嗘瘮锛屽皬浜�0鏃朵负绐楀彛楂樺害鍑忓幓姝ゅ�笺��',
+ min: -1000,
max: 3000,
precision: 0,
required: false
},
{
- type: 'radio',
+ type: 'select',
field: 'commit',
label: '鏁版嵁鎻愪氦',
initval: wrap.commit || 'all',
- tooltip: '璁剧疆涓轰慨鏀归」鏃讹紝鍦ㄥけ鍘荤劍鐐逛笖涓嶅瓨鍦ㄥ繀濉」涓虹┖鏃惰Е鍙戞彁浜ゃ�傝缃负淇敼椤癸紙鍏級鏃讹紝鍦ㄧ偣鍑绘彁浜ゆ寜閽椂瑙﹀彂鎻愪氦銆�',
+ tooltip: '璁剧疆涓轰慨鏀归」鏃讹紝鍦ㄥけ鍘荤劍鐐逛笖涓嶅瓨鍦ㄥ繀濉」涓虹┖鏃惰Е鍙戞彁浜ゃ�傝缃负淇敼椤癸紙鍏級鏃讹紝鍦ㄧ偣鍑绘彁浜ゆ寜閽椂瑙﹀彂鎻愪氦銆傝缃负鍕鹃�夐」鏃讹紝鍙彁浜ら�変腑鐨勬暟鎹紝鏈�変腑鏁版嵁鏃朵笉鍙彁浜ゃ��',
required: false,
options: [
{value: 'all', label: '鍏ㄩ儴'},
{value: 'change', label: '淇敼椤�'},
{value: 'amend', label: '淇敼椤癸紙鍏級'},
- ]
+ {value: 'check', label: '鍕鹃�夐」'},
+ ],
+ reset_source: true,
+ callback: (record) => {
+ return {
+ tableType: [
+ {value: '', label: '涓嶅彲閫�', disabled: record.commit === 'check'},
+ {value: 'radio', label: '鍗曢��'},
+ {value: 'checkbox', label: '澶氶��'},
+ ]
+ }
+ }
},
{
type: 'radio',
@@ -96,8 +107,9 @@
label: '琛ㄦ牸灞炴��',
initval: wrap.tableType || '',
required: false,
+ timestamp: new Date().getTime(),
options: [
- {value: '', label: '涓嶅彲閫�'},
+ {value: '', label: '涓嶅彲閫�', disabled: wrap.commit === 'check'},
{value: 'radio', label: '鍗曢��'},
{value: 'checkbox', label: '澶氶��'},
]
@@ -113,7 +125,30 @@
{value: 'default', label: '澶�'},
{value: 'middle', label: '涓�'},
{value: 'small', label: '灏�'},
- {value: 'mini', label: '杩蜂綘'},
+ // {value: 'mini', label: '杩蜂綘'},
+ ]
+ },
+ {
+ type: 'radio',
+ field: 'searchSize',
+ label: '鎼滅储闂磋窛',
+ initval: wrap.searchSize || 'middle',
+ tooltip: '鎼滅储鏉′欢鐨勪笂涓嬮棿璺濄��',
+ required: false,
+ options: [
+ {value: 'middle', label: '榛樿'},
+ {value: 'small', label: '灏�'},
+ ],
+ },
+ {
+ type: 'radio',
+ field: 'parity',
+ label: '濂囧伓寮傝壊',
+ initval: wrap.parity || 'false',
+ required: false,
+ options: [
+ {value: 'true', label: '鍚敤'},
+ {value: 'false', label: '绂佺敤'},
]
},
{
@@ -177,7 +212,7 @@
initval: wrap.permission || (!appType ? 'true' : 'false'),
required: false,
options: [
- {value: 'true', label: '鍚敤'},
+ {value: 'true', label: !appType ? '缁ф壙鑿滃崟' : '鍚敤'},
{value: 'false', label: '绂佺敤'},
],
forbid: sessionStorage.getItem('editMenuType') === 'popview'
@@ -193,6 +228,21 @@
{value: 'show', label: '鍚�'},
{value: 'hidden', label: '鏄�'},
],
+ controlFields: [
+ {field: 'empSign', values: ['show']},
+ ]
+ },
+ {
+ type: 'radio',
+ field: 'empSign',
+ label: '绌哄�煎浘鏍�',
+ initval: wrap.empSign || 'show',
+ tooltip: '褰撴煡璇㈡暟鎹负绌烘椂锛屾槸鍚︽樉绀虹┖鍊兼彁绀哄浘鏍囥��',
+ required: false,
+ options: [
+ {value: 'show', label: '鏄剧ず'},
+ {value: 'hidden', label: '闅愯棌'},
+ ],
},
{
type: 'select',
@@ -202,9 +252,21 @@
tooltip: '榧犳爣鎮诞浜庤涓婃柟鏃剁殑鎻愮ず淇℃伅銆�',
required: false,
allowClear: true,
+ joint: true,
options: columns
},
{
+ type: 'number',
+ field: 'maxPageSize',
+ label: '姣忛〉鏈�澶ф暟',
+ initval: wrap.maxPageSize || '',
+ tooltip: '鍒嗛〉鏃舵瘡椤靛彲鏄剧ず鐨勬渶澶ф暟閲忋��',
+ min: 10,
+ max: 500,
+ precision: 0,
+ required: false
+ },
+ {
type: 'multiselect',
field: 'blacklist',
label: '榛戝悕鍗�',
--
Gitblit v1.8.0