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 | 54 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/src/menu/components/table/edit-table/options.jsx b/src/menu/components/table/edit-table/options.jsx
index f3e8d31..c6899e7 100644
--- a/src/menu/components/table/edit-table/options.jsx
+++ b/src/menu/components/table/edit-table/options.jsx
@@ -45,10 +45,10 @@
{
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
@@ -67,18 +67,13 @@
{value: 'check', label: '鍕鹃�夐」'},
],
reset_source: true,
- callback: (map, record, MKEmitter) => {
- let _tableType = map.get('tableType')
-
- _tableType.options[0].disabled = record.commit === 'check'
- _tableType.oriOptions[0].disabled = record.commit === 'check'
-
- map.set('tableType', _tableType)
-
- if (record.commit === 'check' && !record.tableType) {
- setTimeout(() => {
- MKEmitter.emit('mkFC', 'input', 'tableType', 'radio')
- }, 50)
+ callback: (record) => {
+ return {
+ tableType: [
+ {value: '', label: '涓嶅彲閫�', disabled: record.commit === 'check'},
+ {value: 'radio', label: '鍗曢��'},
+ {value: 'checkbox', label: '澶氶��'},
+ ]
}
}
},
@@ -112,6 +107,7 @@
label: '琛ㄦ牸灞炴��',
initval: wrap.tableType || '',
required: false,
+ timestamp: new Date().getTime(),
options: [
{value: '', label: '涓嶅彲閫�', disabled: wrap.commit === 'check'},
{value: 'radio', label: '鍗曢��'},
@@ -131,6 +127,18 @@
{value: 'small', 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',
@@ -220,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',
@@ -229,6 +252,7 @@
tooltip: '榧犳爣鎮诞浜庤涓婃柟鏃剁殑鎻愮ず淇℃伅銆�',
required: false,
allowClear: true,
+ joint: true,
options: columns
},
{
--
Gitblit v1.8.0