From f30bc9d11d18e93626e4530dd2de54d479c2521d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 08 十一月 2021 21:48:22 +0800
Subject: [PATCH] Merge branch 'master' into bms
---
src/utils/option.js | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/utils/option.js b/src/utils/option.js
index df5e76b..1111af7 100644
--- a/src/utils/option.js
+++ b/src/utils/option.js
@@ -145,7 +145,9 @@
{value: '[30, -30]', text: '鍓嶅悗30澶�'},
{value: '[90, -90]', text: '鍓嶅悗90澶�'},
{value: '[-1, -1]', text: '鏄庡ぉ'},
- {value: '[-2, -2]', text: '鍚庡ぉ'}
+ {value: '[-2, -2]', text: '鍚庡ぉ'},
+ {value: 'week', text: '鏈懆'},
+ {value: 'month', text: '鏈湀'},
],
datetime: [
{value: '', text: _dict['model.empty']},
@@ -673,24 +675,24 @@
'up',
'left',
'right',
- 'caret-up',
- 'caret-down',
- 'caret-left',
- 'caret-right',
+ // 'caret-up',
+ // 'caret-down',
+ // 'caret-left',
+ // 'caret-right',
'step-backward',
'step-forward',
- 'fast-backward',
- 'fast-forward',
+ // 'fast-backward',
+ // 'fast-forward',
'double-right',
'double-left',
- 'forward',
- 'backward',
+ // 'forward',
+ // 'backward',
'rollback',
'enter',
'retweet',
'swap',
- 'swap-left',
- 'swap-right',
+ // 'swap-left',
+ // 'swap-right',
'play-circle',
'login',
'logout',
@@ -769,6 +771,7 @@
'audio',
'bank',
'bell',
+ 'scan',
'bug',
'calendar',
'camera',
--
Gitblit v1.8.0