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/mob/components/tabs/antv-tabs/options.jsx | 140 +++++++++++++++++++++++++++++++---------------
1 files changed, 94 insertions(+), 46 deletions(-)
diff --git a/src/mob/components/tabs/antv-tabs/options.jsx b/src/mob/components/tabs/antv-tabs/options.jsx
index 664d749..0fd6eca 100644
--- a/src/mob/components/tabs/antv-tabs/options.jsx
+++ b/src/mob/components/tabs/antv-tabs/options.jsx
@@ -3,8 +3,7 @@
/**
* @description Wrap琛ㄥ崟閰嶇疆淇℃伅
*/
-export function getTabForm(tab, setting) {
- // let appType = sessionStorage.getItem('appType')
+export function getTabForm(tab) {
let roleList = sessionStorage.getItem('sysRoles')
if (roleList) {
@@ -34,22 +33,22 @@
required: false,
allowClear: true,
},
- {
- type: 'text',
- field: 'controlVal',
- label: '闅愯棌鏍囪',
- initval: tab.controlVal || '',
- tooltip: '褰撶鐢ㄥ瓧娈靛�间笌闅愯棌鏍囪鐩哥瓑鏃讹紝鏍囩椤典細闅愯棌銆傛敞锛氬涓�艰鐢ㄩ�楀彿鍒嗛殧銆�',
- required: false
- },
- {
- type: 'text',
- field: 'selectVal',
- label: '閫変腑鏍囪',
- initval: tab.selectVal || '',
- tooltip: '褰撻�変腑瀛楁鍊间笌閫変腑鏍囪鐩哥瓑鏃讹紝鏍囩椤甸粯璁ら�変腑銆�',
- required: false
- },
+ // {
+ // type: 'text',
+ // field: 'controlVal',
+ // label: '闅愯棌鏍囪',
+ // initval: tab.controlVal || '',
+ // tooltip: '褰撶鐢ㄥ瓧娈靛�间笌闅愯棌鏍囪鐩哥瓑鏃讹紝鏍囩椤典細闅愯棌銆傛敞锛氬涓�艰鐢ㄩ�楀彿鍒嗛殧銆�',
+ // required: false
+ // },
+ // {
+ // type: 'text',
+ // field: 'selectVal',
+ // label: '閫変腑鏍囪',
+ // initval: tab.selectVal || '',
+ // tooltip: '褰撻�変腑瀛楁鍊间笌閫変腑鏍囪鐩哥瓑鏃讹紝鏍囩椤甸粯璁ら�変腑銆�',
+ // required: false
+ // },
{
type: 'color',
field: 'backgroundColor',
@@ -67,16 +66,7 @@
{value: 'false', label: '鍚�'},
{value: 'true', label: '鏄�'},
],
- },
- // {
- // type: 'multiselect',
- // field: 'blacklist',
- // label: '榛戝悕鍗�',
- // initval: tab.blacklist || [],
- // required: false,
- // options: roleList,
- // forbid: !!appType,
- // },
+ }
]
return tabForm
@@ -85,12 +75,15 @@
/**
* @description tabs琛ㄥ崟閰嶇疆淇℃伅
*/
-export function getTabsSetForm(setting, uuid) {
+export function getTabsSetForm(setting, uuid, subtabs) {
let modules = MenuUtils.getSupModules(window.GLOB.customMenu.components, uuid, window.GLOB.customMenu.interfaces)
modules.push({
value: 'preview',
label: '涓婁竴椤碉紙url鍙傛暟锛�'
})
+
+ 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 || ''}))
const tabForm = [
{
@@ -112,22 +105,6 @@
precision: 0,
required: true
},
- // {
- // type: 'select',
- // field: 'position',
- // label: '鏍囩浣嶇疆',
- // initval: setting.position || 'top',
- // required: true,
- // options: [
- // {value: 'top', label: 'top'},
- // {value: 'bottom', label: 'bottom'},
- // {value: 'left', label: 'left'},
- // {value: 'right', label: 'right'},
- // ],
- // controlFields: [
- // {field: 'display', values: ['top', 'bottom']},
- // ]
- // },
{
type: 'radio',
field: 'display',
@@ -151,6 +128,8 @@
options: modules,
controlFields: [
{field: 'controlField', notNull: true},
+ {field: 'controlVals', notNull: true},
+ {field: 'swiper', values: ['']},
],
},
{
@@ -162,12 +141,26 @@
required: true
},
{
+ type: 'radio',
+ field: 'swiper',
+ label: '婊戝姩鍒囨崲',
+ initval: setting.swiper || 'false',
+ required: false,
+ options: [
+ {value: 'false', label: '绂佺敤'},
+ {value: 'true', label: '鍚敤'},
+ ],
+ },
+ {
type: 'text',
field: 'selectField',
label: '閫変腑瀛楁',
initval: setting.selectField || '',
tooltip: '鐢ㄤ簬鎺у埗鏍囩椤靛垵濮嬪寲閫変腑锛屽湪鏍囩涓～鍏ラ�変腑鏍囪锛屾敞锛氭暟鎹簮浜巙rl鍙傛暟銆�',
- required: false
+ required: false,
+ controlFields: [
+ {field: 'selectVals', notNull: true},
+ ]
},
{
type: 'color',
@@ -185,8 +178,63 @@
options: [
{value: 'true', label: '鍚敤'},
{value: 'false', label: '绂佺敤'},
+ ],
+ forbid: sessionStorage.getItem('editMenuType') === 'popview'
+ },
+ {
+ type: 'table',
+ field: 'controlVals',
+ label: '鏍囩缁�(绂佺敤)',
+ initval: controlVals,
+ tooltip: '褰撶鐢ㄥ瓧娈靛�间笌闅愯棌鏍囪鐩哥瓑鏃讹紝鏍囩椤典細闅愯棌銆傛敞锛�1銆佸涓�艰鐢ㄩ�楀彿鍒嗛殧锛�2銆丂pass@鍊艰〃绀哄拷鐣ユ璁剧疆锛堝缁堟樉绀猴級锛�2銆丂pass_empty@鍊艰〃绀哄拷鐣ョ┖鍊硷紝鍗虫湭鑾峰彇涓婄骇缁勪欢淇℃伅鏃舵樉绀猴紙鍙笌鍏朵粬鍊兼嫾鎺ワ級銆�',
+ 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%'
+ }
]
},
+ {
+ 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%'
+ }
+ ]
+ }
]
return tabForm
--
Gitblit v1.8.0