From 07c005cf28acf74e3afde82122e4c53e1000d70c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 12 六月 2023 12:06:18 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/carousel/data-card/options.jsx | 68 +++++++++++++++++++++++++++++++++-
1 files changed, 66 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/carousel/data-card/options.jsx b/src/menu/components/carousel/data-card/options.jsx
index 37104ad..20aeec8 100644
--- a/src/menu/components/carousel/data-card/options.jsx
+++ b/src/menu/components/carousel/data-card/options.jsx
@@ -18,6 +18,13 @@
const cardWrapForm = [
{
type: 'text',
+ field: 'title',
+ label: '鏍囬',
+ initval: wrap.title || '',
+ required: false
+ },
+ {
+ type: 'text',
field: 'name',
label: '缁勪欢鍚嶇О',
initval: wrap.name || '',
@@ -50,6 +57,63 @@
{field: 'empty', values: ['dynamic']},
],
forbid: subtype !== 'propcard'
+ },
+ {
+ type: 'radio',
+ field: 'display',
+ label: '鏄剧ず妯″紡',
+ initval: wrap.display || 'normal',
+ required: false,
+ options: [
+ {value: 'normal', label: '姝ｅ父'},
+ {value: 'modal', label: '寮圭獥'},
+ ],
+ controlFields: [
+ {field: 'modalWidth', values: ['modal']},
+ {field: 'modalContent', values: ['modal']},
+ {field: 'code', values: ['modal']},
+ ]
+ },
+ {
+ type: 'radio',
+ field: 'modalContent',
+ label: '寮圭獥鍐呭',
+ initval: wrap.modalContent || 'message',
+ tooltip: '浣跨敤绯荤粺鏇存柊鏃讹紝濡傛灉杩斿洖鍊肩殑ErrCode涓�-1锛屽彧浼氬仛绯荤粺閰嶇疆鏇存柊涓嶄細鏄剧ず寮圭獥銆傛敞锛氭暟鎹簮浣跨敤鍚屾鏌ヨ鏃舵棤鏁堛��',
+ required: false,
+ options: [
+ {value: 'message', label: '娑堟伅鎻愰啋'},
+ {value: 'update', label: '绯荤粺鏇存柊'},
+ ]
+ },
+ {
+ type: 'styleInput',
+ field: 'height',
+ label: '缁勪欢楂樺害',
+ initval: wrap.height || '',
+ required: true,
+ options: ['px', 'vh']
+ },
+ {
+ type: 'styleInput',
+ field: 'modalWidth',
+ label: '寮圭獥瀹藉害',
+ initval: wrap.modalWidth || '300px',
+ required: true,
+ options: ['px', 'vw'],
+ forbid: appType === 'mob'
+ },
+ {
+ type: 'text',
+ field: 'code',
+ label: '娑堟伅缂栫爜',
+ initval: wrap.code || '',
+ tooltip: '鐢ㄤ簬璁板綍娑堟伅鏄惁宸茶鐨勬爣璇嗭紝濡傛灉涓嶅悓椤甸潰涓瓨鍦ㄧ浉鍚屾秷鎭紝鍙寚瀹氬浐瀹氬�笺��',
+ required: false,
+ rules: [{
+ pattern: /^[0-9a-zA-Z_]*$/ig,
+ message: '鍙厑璁稿寘鍚暟瀛椼�佸瓧姣嶄互鍙奯銆�'
+ }]
},
{
type: 'radio',
@@ -142,13 +206,13 @@
type: 'radio',
field: 'permission',
label: '鏉冮檺楠岃瘉',
- initval: wrap.permission || 'false',
+ initval: wrap.permission || (!appType ? 'true' : 'false'),
required: false,
options: [
{value: 'true', label: '鍚敤'},
{value: 'false', label: '绂佺敤'},
],
- forbid: !appType
+ forbid: sessionStorage.getItem('editMenuType') === 'popview'
},
{
type: 'multiselect',
--
Gitblit v1.8.0