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/tabs/antv-tabs/options.jsx | 55 +++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 43 insertions(+), 12 deletions(-)
diff --git a/src/menu/components/tabs/antv-tabs/options.jsx b/src/menu/components/tabs/antv-tabs/options.jsx
index b04d73f..329358c 100644
--- a/src/menu/components/tabs/antv-tabs/options.jsx
+++ b/src/menu/components/tabs/antv-tabs/options.jsx
@@ -42,14 +42,14 @@
// tooltip: '褰撶鐢ㄥ瓧娈靛�间笌闅愯棌鏍囪鐩哥瓑鏃讹紝鏍囩椤典細闅愯棌銆傛敞锛�1銆佸涓�艰鐢ㄩ�楀彿鍒嗛殧锛�2銆丂pass@鍊艰〃绀哄拷鐣ユ璁剧疆锛堝缁堟樉绀猴級锛�2銆丂pass_empty@鍊艰〃绀哄拷鐣ョ┖鍊硷紝鍗虫湭鑾峰彇涓婄骇缁勪欢淇℃伅鏃舵樉绀猴紙鍙笌鍏朵粬鍊兼嫾鎺ワ級銆�',
// required: false,
// },
- {
- type: 'text',
- field: 'selectVal',
- label: '閫変腑鏍囪',
- initval: tab.selectVal || '',
- tooltip: '褰撻�変腑瀛楁鍊间笌閫変腑鏍囪鐩哥瓑鏃讹紝鏍囩椤甸粯璁ら�変腑銆�',
- required: false
- },
+ // {
+ // type: 'text',
+ // field: 'selectVal',
+ // label: '閫変腑鏍囪',
+ // initval: tab.selectVal || '',
+ // tooltip: '褰撻�変腑瀛楁鍊间笌閫変腑鏍囪鐩哥瓑鏃讹紝鏍囩椤甸粯璁ら�変腑銆�',
+ // required: false
+ // },
{
type: 'color',
field: 'backgroundColor',
@@ -105,7 +105,8 @@
roleList = []
}
- let controlVals = subtabs.map(item => ({uuid: item.uuid, label: item.label, value: item.controlVal}))
+ let controlVals = subtabs.map(item => ({uuid: item.uuid, label: item.label, value: item.controlVal || ''}))
+ let selectVals = subtabs.map(item => ({uuid: item.uuid, label: item.label, value: item.selectVal || ''}))
let tabStyle = setting.cusClass || setting.tabStyle
@@ -238,7 +239,10 @@
label: '閫変腑瀛楁',
initval: setting.selectField || '',
tooltip: '鐢ㄤ簬鎺у埗鏍囩椤靛垵濮嬪寲閫変腑锛屽湪鏍囩涓～鍏ラ�変腑鏍囪锛屾敞锛氭暟鎹潵婧愪簬url鍙傛暟銆�',
- required: false
+ required: false,
+ controlFields: [
+ {field: 'selectVals', notNull: true},
+ ]
},
{
type: 'color',
@@ -271,11 +275,11 @@
{
type: 'table',
field: 'controlVals',
- label: '鏍囩缁�',
+ label: '鏍囩缁�(绂佺敤)',
initval: controlVals,
tooltip: '褰撶鐢ㄥ瓧娈靛�间笌闅愯棌鏍囪鐩哥瓑鏃讹紝鏍囩椤典細闅愯棌銆傛敞锛�1銆佸涓�艰鐢ㄩ�楀彿鍒嗛殧锛�2銆丂pass@鍊艰〃绀哄拷鐣ユ璁剧疆锛堝缁堟樉绀猴級锛�2銆丂pass_empty@鍊艰〃绀哄拷鐣ョ┖鍊硷紝鍗虫湭鑾峰彇涓婄骇缁勪欢淇℃伅鏃舵樉绀猴紙鍙笌鍏朵粬鍊兼嫾鎺ワ級銆�',
required: false,
- fixed: true,
+ actions: ['edit'],
span: 24,
columns: [
{
@@ -294,6 +298,33 @@
width: '50%'
}
]
+ },
+ {
+ type: 'table',
+ field: 'selectVals',
+ label: '鏍囩缁�(閫変腑)',
+ initval: selectVals,
+ tooltip: '褰撻�変腑瀛楁鍊间笌閫変腑鏍囪鐩哥瓑鏃讹紝鏍囩椤甸粯璁ら�変腑銆�',
+ required: false,
+ actions: ['edit'],
+ span: 24,
+ columns: [
+ {
+ title: '鏍囩鍚嶇О',
+ dataIndex: 'label',
+ editable: false,
+ required: false,
+ width: '30%'
+ },
+ {
+ title: '閫変腑鏍囪',
+ dataIndex: 'value',
+ inputType: 'input',
+ editable: true,
+ required: false,
+ width: '50%'
+ }
+ ]
}
]
--
Gitblit v1.8.0