From f59c3beb2ad45de1c5c01a073fe2ebe5d91b1e6d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 12 一月 2023 19:48:02 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/card/data-card/options.jsx | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/src/menu/components/card/data-card/options.jsx b/src/menu/components/card/data-card/options.jsx
index 0487c0f..49358f7 100644
--- a/src/menu/components/card/data-card/options.jsx
+++ b/src/menu/components/card/data-card/options.jsx
@@ -149,7 +149,7 @@
options: [
{value: 'page', label: '椤电爜'},
{value: 'switch', label: '宸﹀彸鍒囨崲', forbid: appType === 'mob' || subtype === 'tablecard'},
- {value: 'slide', label: '婊戝姩鍔犺浇', forbid: appType !== 'mob'},
+ {value: 'slide', label: '婊戝姩鍔犺浇', forbid: appType !== 'mob' || sessionStorage.getItem('editMenuType') === 'popview'},
{value: 'more', label: '鏌ョ湅鏇村'},
],
controlFields: [
@@ -196,18 +196,33 @@
forbid: subtype !== 'propcard'
},
{
+ type: 'select',
+ field: 'selected',
+ label: '鏁版嵁閫変腑',
+ initval: wrap.selected || 'false',
+ tooltip: '鍒濆鍖栵細鏁版嵁鍔犺浇鏃堕�変腑棣栬鏁版嵁锛屼粎鎵ц涓�娆°�傛暟鎹姞杞斤細姣忔鏁版嵁鍔犺浇鏃跺潎閫変腑棣栬锛堝綋鎸夐挳鎵ц瀹屾垚骞惰繑鍥炰富閿�兼椂锛岄粯璁ら�変腑涓婚敭鍊煎搴旇锛夈�傞�変腑鏍囪锛氳繑鍥炴暟鎹腑瀛樺湪 selected 瀛楁锛屼笖鍊间负 true 鐨勬暟鎹閫変腑銆�',
+ required: false,
+ options: [
+ {value: 'false', label: '鏃�'},
+ {value: 'init', label: '鍒濆鍖�'},
+ {value: 'always', label: '鏁版嵁鍔犺浇'},
+ {value: 'sign', label: '閫変腑鏍囪'}
+ ],
+ forbid: subtype !== 'datacard'
+ },
+ {
type: 'radio',
field: 'selected',
- label: '棣栬閫変腑',
+ label: '鏁版嵁閫変腑',
initval: wrap.selected || 'false',
- tooltip: '褰撴寜閽墽琛屽畬鎴愬苟杩斿洖涓婚敭鍊兼椂锛岄粯璁ら�変腑涓婚敭鍊煎搴旇銆�',
+ tooltip: '鍒濆鍖栵細鏁版嵁鍔犺浇鏃堕�変腑棣栬鏁版嵁锛屼粎鎵ц涓�娆°�傛暟鎹姞杞斤細姣忔鏁版嵁鍔犺浇鏃跺潎閫変腑棣栬銆�',
required: false,
options: [
{value: 'false', label: '鏃�'},
{value: 'init', label: '鍒濆鍖�'},
{value: 'always', label: '鏁版嵁鍔犺浇'},
],
- forbid: subtype === 'tablecard'
+ forbid: subtype !== 'propcard'
},
{
type: 'select',
@@ -484,7 +499,7 @@
{value: 'true', label: '鍚敤'},
{value: 'false', label: '绂佺敤'},
],
- forbid: !appType
+ forbid: !appType || sessionStorage.getItem('editMenuType') === 'popview'
},
{
type: 'multiselect',
--
Gitblit v1.8.0