From 88f178df654b08411470a7eab75b3d5fed8817c0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 03 十一月 2023 01:37:45 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/form/step-form/options.jsx | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/form/step-form/options.jsx b/src/menu/components/form/step-form/options.jsx
index d162d66..dae0a31 100644
--- a/src/menu/components/form/step-form/options.jsx
+++ b/src/menu/components/form/step-form/options.jsx
@@ -22,6 +22,13 @@
let menu = window.GLOB.customMenu
modules = MenuUtils.getSupModules(menu.components, config.uuid, menu.interfaces)
+ if (wrap.supModule && wrap.supModule.length > 0 && wrap.supModule[0] !== 'empty') {
+ let has = MenuUtils.checkSupModules(modules, wrap.supModule.slice(-1)[0])
+ if (!has) {
+ wrap.supModule = ''
+ }
+ }
+
const wrapForm = [
{
type: 'text',
@@ -54,6 +61,7 @@
{value: 'static', label: '闈欐��'},
],
controlFields: [
+ {field: 'empty', values: ['dynamic']},
{field: 'supModule', values: ['static']},
]
},
@@ -77,8 +85,22 @@
options: [
{value: 'show', label: '鏄剧ず'},
{value: 'hidden', label: '闅愯棌'},
- ]
+ ],
+ // controlFields: [
+ // {field: 'labelSize', values: ['show']},
+ // ]
},
+ // {
+ // type: 'number',
+ // field: 'labelSize',
+ // label: '鍚嶇О澶у皬',
+ // initval: wrap.labelSize || '',
+ // tooltip: '鍒嗙粍鍚嶇О瀛椾綋澶у皬銆�',
+ // min: 12,
+ // max: 50,
+ // precision: 0,
+ // required: false
+ // },
{
type: 'radio',
field: 'tabtype',
@@ -102,6 +124,18 @@
},
{
type: 'radio',
+ field: 'formStyle',
+ label: '琛ㄥ崟鏍峰紡',
+ initval: wrap.formStyle || '',
+ required: false,
+ options: [
+ {value: '', label: '榛樿'},
+ {value: 'shadow', label: '闃村奖'},
+ ],
+ forbid: appType !== 'mob'
+ },
+ {
+ type: 'radio',
field: 'goback',
label: '绌哄�艰繑鍥�',
initval: wrap.goback || 'false',
@@ -115,6 +149,19 @@
},
{
type: 'radio',
+ field: 'empty',
+ label: '绌哄�奸殣钘�',
+ initval: wrap.empty || 'show',
+ tooltip: '褰撴煡璇㈡暟鎹负绌烘椂锛岄殣钘忚缁勪欢銆�',
+ required: false,
+ skip: true,
+ options: [
+ {value: 'show', label: '鍚�'},
+ {value: 'hidden', label: '鏄�'},
+ ],
+ },
+ {
+ type: 'radio',
field: 'permission',
label: '鏉冮檺楠岃瘉',
initval: wrap.permission || 'false',
@@ -123,7 +170,7 @@
{value: 'true', label: '鍚敤'},
{value: 'false', label: '绂佺敤'},
],
- forbid: !appType
+ forbid: !appType || sessionStorage.getItem('editMenuType') === 'popview'
},
{
type: 'cascader',
--
Gitblit v1.8.0