From 2b46797c3a5868f7f26329da5834c13aae07ad69 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 03 四月 2023 11:59:34 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/timeline/normal-timeline/options.jsx | 44 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/src/menu/components/timeline/normal-timeline/options.jsx b/src/menu/components/timeline/normal-timeline/options.jsx
index 8d0ddb9..01c6e41 100644
--- a/src/menu/components/timeline/normal-timeline/options.jsx
+++ b/src/menu/components/timeline/normal-timeline/options.jsx
@@ -56,6 +56,8 @@
{field: 'mode', values: ['vertical']},
{field: 'hmode', values: ['horizontal']},
{field: 'label', values: ['vertical']},
+ {field: 'iconSize', values: ['horizontal']},
+ {field: 'dotSign', values: ['horizontal']},
]
},
{
@@ -112,6 +114,35 @@
]
},
{
+ type: 'radio',
+ field: 'dotSign',
+ label: '鑺傜偣娓叉煋',
+ initval: wrap.dotSign || 'background',
+ tooltip: '鑺傜偣鐨勬覆鏌撴柟寮忥紝鍦ㄨ妭鐐圭粍涓缃殑棰滆壊娓叉煋鍥炬爣杩樻槸娓叉煋鑳屾櫙鑹层��',
+ required: false,
+ options: [
+ {value: 'background', label: '鑳屾櫙鑹�'},
+ {value: 'icon', label: '鍥炬爣'},
+ ]
+ },
+ {
+ type: 'select',
+ field: 'iconSize',
+ label: '鍥炬爣澶у皬',
+ initval: wrap.iconSize || '',
+ tooltip: '鍥炬爣鍙湪鑺傜偣缁勪腑娣诲姞銆�',
+ required: false,
+ options: [
+ {value: '', label: '榛樿(14px)'},
+ {value: 'size16', label: '16px'},
+ {value: 'size18', label: '18px'},
+ {value: 'size20', label: '20px'},
+ {value: 'size22', label: '22px'},
+ {value: 'size24', label: '24px'},
+ {value: 'adaptive', label: '鑷�傚簲'},
+ ]
+ },
+ {
type: 'select',
field: 'label',
label: '鏍囩',
@@ -143,6 +174,19 @@
forbid: !appType || sessionStorage.getItem('editMenuType') === 'popview'
},
{
+ type: 'radio',
+ field: 'empty',
+ label: '绌哄�奸殣钘�',
+ initval: wrap.empty || 'show',
+ tooltip: '褰撴煡璇㈡暟鎹负绌烘椂锛岄殣钘忚缁勪欢銆�',
+ required: false,
+ skip: true,
+ options: [
+ {value: 'show', label: '鍚�'},
+ {value: 'hidden', label: '鏄�'},
+ ],
+ },
+ {
type: 'multiselect',
field: 'blacklist',
label: '榛戝悕鍗�',
--
Gitblit v1.8.0