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/menu/components/carousel/data-card/options.jsx | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/menu/components/carousel/data-card/options.jsx b/src/menu/components/carousel/data-card/options.jsx
index d5116a2..cf5156a 100644
--- a/src/menu/components/carousel/data-card/options.jsx
+++ b/src/menu/components/carousel/data-card/options.jsx
@@ -4,6 +4,7 @@
export default function (wrap, subtype) {
let appType = sessionStorage.getItem('appType')
let roleList = sessionStorage.getItem('sysRoles')
+ let ispop = sessionStorage.getItem('editMenuType') === 'popview'
if (roleList) {
try {
@@ -53,9 +54,9 @@
{value: 'dynamic', label: '鍔ㄦ��'},
{value: 'static', label: '闈欐��'},
],
- controlFields: [
+ controlFields: subtype === 'propcard' ? [
{field: 'empty', values: ['dynamic']},
- ],
+ ] : null,
forbid: subtype !== 'propcard'
},
{
@@ -196,7 +197,6 @@
initval: wrap.empty || 'show',
tooltip: '褰撴煡璇㈡暟鎹负绌烘椂锛岄殣钘忚缁勪欢銆�',
required: false,
- skip: true,
options: [
{value: 'show', label: '鍚�'},
{value: 'hidden', label: '鏄�'},
@@ -212,7 +212,7 @@
{value: 'true', label: !appType ? '缁ф壙鑿滃崟' : '鍚敤'},
{value: 'false', label: '绂佺敤'},
],
- forbid: sessionStorage.getItem('editMenuType') === 'popview'
+ forbid: ispop
},
{
type: 'radio',
@@ -224,7 +224,7 @@
{value: 'true', label: '缁ф壙鑿滃崟'},
{value: 'false', label: '绂佺敤'},
],
- forbid: sessionStorage.getItem('editMenuType') === 'popview'
+ forbid: ispop
},
{
type: 'multiselect',
--
Gitblit v1.8.0