From e01d39d4a2c3137fdce5f18f9589a34df13b7963 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 05 十一月 2023 10:37:06 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/form/simple-form/options.jsx | 87 ++++++++++++++++++++++++++++++++++---------
1 files changed, 69 insertions(+), 18 deletions(-)
diff --git a/src/menu/components/form/simple-form/options.jsx b/src/menu/components/form/simple-form/options.jsx
index 760d969..9df9c00 100644
--- a/src/menu/components/form/simple-form/options.jsx
+++ b/src/menu/components/form/simple-form/options.jsx
@@ -45,6 +45,18 @@
}
}
+ let buttons = []
+
+ if (!wrap.enable || wrap.enable === 'true') {
+ buttons.push('enable')
+ }
+ if (wrap.closeEnable === 'true') {
+ buttons.push('closeEnable')
+ }
+ if (wrap.resetEnable === 'true') {
+ buttons.push('resetEnable')
+ }
+
const wrapForm = [
{
type: 'text',
@@ -84,6 +96,7 @@
{value: 'static', label: '闈欐��'},
],
controlFields: [
+ {field: 'empty', values: ['dynamic']},
{field: 'supModule', values: ['static']},
]
},
@@ -134,27 +147,52 @@
forbid: appType === 'mob'
},
{
- type: 'radio',
- field: 'enable',
- label: '鎻愪氦',
- initval: wrap.enable || 'true',
- required: false,
- options: [
- {value: 'true', label: '鏄剧ず'},
- {value: 'false', label: '闅愯棌'},
- ]
- },
- {
- type: 'radio',
- field: 'closeEnable',
- label: '鍏抽棴',
- initval: wrap.closeEnable || 'false',
+ type: 'checkbox',
+ field: 'buttons',
+ label: '鎸夐挳缁�',
+ initval: buttons,
tooltip: '绠＄悊绯荤粺涓細鍏抽棴褰撳墠鏍囩锛屽瓙搴旂敤涓负杩斿洖涓婁竴椤点��',
required: false,
options: [
- {value: 'true', label: '鏄剧ず'},
- {value: 'false', label: '闅愯棌'},
- ]
+ {value: 'enable', label: '鎻愪氦'},
+ {value: 'resetEnable', label: '閲嶇疆'},
+ {value: 'closeEnable', label: '鍏抽棴'},
+ ],
+ },
+ // {
+ // type: 'radio',
+ // field: 'enable',
+ // label: '鎻愪氦',
+ // initval: wrap.enable || 'true',
+ // required: false,
+ // options: [
+ // {value: 'true', label: '鏄剧ず'},
+ // {value: 'false', label: '闅愯棌'},
+ // ]
+ // },
+ // {
+ // type: 'radio',
+ // field: 'closeEnable',
+ // label: '鍏抽棴',
+ // initval: wrap.closeEnable || 'false',
+ // tooltip: '绠＄悊绯荤粺涓細鍏抽棴褰撳墠鏍囩锛屽瓙搴旂敤涓负杩斿洖涓婁竴椤点��',
+ // required: false,
+ // options: [
+ // {value: 'true', label: '鏄剧ず'},
+ // {value: 'false', label: '闅愯棌'},
+ // ]
+ // },
+ {
+ type: 'radio',
+ field: 'formStyle',
+ label: '琛ㄥ崟鏍峰紡',
+ initval: wrap.formStyle || '',
+ required: false,
+ options: [
+ {value: '', label: '榛樿'},
+ {value: 'shadow', label: '闃村奖'},
+ ],
+ forbid: appType !== 'mob'
},
{
type: 'radio',
@@ -171,6 +209,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',
--
Gitblit v1.8.0