From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/card/cardcomponent/options.jsx | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/card/cardcomponent/options.jsx b/src/menu/components/card/cardcomponent/options.jsx
index b4bdd99..d36487f 100644
--- a/src/menu/components/card/cardcomponent/options.jsx
+++ b/src/menu/components/card/cardcomponent/options.jsx
@@ -116,6 +116,7 @@
{field: 'open', values: ['menu', 'link', 'menus']},
{field: 'joint', values: ['menu', 'link', 'menus']},
{field: 'linkbtn', values: ['button']},
+ {field: 'clickType', values: ['button']},
{field: 'menuType', values: ['menus']},
{field: 'menus', values: ['menus']},
]
@@ -134,6 +135,7 @@
label: '鍏宠仈鑿滃崟',
initval: setting.menu || (appType ? '' : []),
required: true,
+ extendName: 'MenuNo',
options: menulist,
},
{
@@ -152,10 +154,10 @@
initval: setting.open || 'blank',
required: false,
options: [
- {value: 'blank', label: '鏂扮獥鍙�'},
- {value: 'self', label: '褰撳墠绐楀彛'},
+ {value: 'blank', label: appType !== 'mob' ? '鏂扮獥鍙�' : '鏂伴〉闈�'},
+ {value: 'self', label: appType !== 'mob' ? '褰撳墠绐楀彛' : '褰撳墠椤甸潰'},
],
- forbid: appType !== 'pc'
+ forbid: appType !== 'pc' && appType !== 'mob'
},
{
type: 'radio',
@@ -178,6 +180,18 @@
},
{
type: 'radio',
+ field: 'clickType',
+ label: '瑙﹀彂鏂瑰紡',
+ initval: setting.clickType || 'normal',
+ required: false,
+ options: [
+ {value: 'normal', label: '鍗曞嚮'},
+ {value: 'multi', label: '鍙屽嚮'},
+ ],
+ forbid: appType === 'mob'
+ },
+ {
+ type: 'radio',
field: 'btnControl',
label: '鎸夐挳鎺у埗',
initval: setting.btnControl || 'show',
@@ -196,6 +210,7 @@
initval: menus,
required: true,
span: 24,
+ actions: ['view'],
columns: [
{
title: '鏍囪瘑',
--
Gitblit v1.8.0