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/timeline/normal-timeline/options.jsx | 62 ++++++++++++++++++++++++++++---
1 files changed, 56 insertions(+), 6 deletions(-)
diff --git a/src/menu/components/timeline/normal-timeline/options.jsx b/src/menu/components/timeline/normal-timeline/options.jsx
index 19740e7..fac7a50 100644
--- a/src/menu/components/timeline/normal-timeline/options.jsx
+++ b/src/menu/components/timeline/normal-timeline/options.jsx
@@ -44,9 +44,25 @@
},
{
type: 'radio',
+ field: 'direction',
+ label: '杞寸嚎鏂瑰悜',
+ initval: wrap.direction || 'vertical',
+ required: false,
+ options: [
+ {value: 'vertical', label: '绾靛悜'},
+ {value: 'horizontal', label: '妯悜'},
+ ],
+ controlFields: [
+ {field: 'mode', values: ['vertical']},
+ {field: 'hmode', values: ['horizontal']},
+ {field: 'label', values: ['vertical']},
+ ]
+ },
+ {
+ type: 'radio',
field: 'mode',
label: '杞寸嚎浣嶇疆',
- initval: wrap.mode || 'left',
+ initval: ['left', 'alternate', 'right'].includes(wrap.mode) ? wrap.mode : 'left',
required: false,
options: [
{value: 'left', label: '宸︿晶'},
@@ -56,15 +72,26 @@
},
{
type: 'radio',
- field: 'reverse',
- label: '鎺掑簭',
- initval: wrap.reverse || 'false',
+ field: 'hmode',
+ label: '杞寸嚎浣嶇疆',
+ initval: ['up', 'down'].includes(wrap.mode) ? wrap.mode : 'up',
required: false,
options: [
- {value: 'false', label: '姝ｅ簭'},
- {value: 'true', label: '鍊掑簭'},
+ {value: 'up', label: '涓婁晶'},
+ {value: 'down', label: '涓嬩晶'}
]
},
+ // {
+ // type: 'radio',
+ // field: 'reverse',
+ // label: '鎺掑簭',
+ // initval: wrap.reverse || 'false',
+ // required: false,
+ // options: [
+ // {value: 'false', label: '姝ｅ簭'},
+ // {value: 'true', label: '鍊掑簭'},
+ // ]
+ // },
{
type: 'color',
field: 'color',
@@ -72,6 +99,17 @@
initval: wrap.color || '#1890ff',
tooltip: '鑺傜偣榛樿棰滆壊銆�',
required: false
+ },
+ {
+ type: 'radio',
+ field: 'line',
+ label: '杩炵嚎棰滆壊',
+ initval: wrap.line || '',
+ required: false,
+ options: [
+ {value: '', label: '榛樿'},
+ {value: 'system', label: '绯荤粺鑹�'},
+ ]
},
{
type: 'select',
@@ -93,6 +131,18 @@
options: columns
},
{
+ type: 'radio',
+ field: 'permission',
+ label: '鏉冮檺楠岃瘉',
+ initval: wrap.permission || 'false',
+ required: false,
+ options: [
+ {value: 'true', label: '鍚敤'},
+ {value: 'false', label: '绂佺敤'},
+ ],
+ forbid: !appType
+ },
+ {
type: 'multiselect',
field: 'blacklist',
label: '榛戝悕鍗�',
--
Gitblit v1.8.0