From 2031a460f6c0827fe80f8c625dd98333d1631d2f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 08 五月 2020 22:10:48 +0800
Subject: [PATCH] 2020-05-08
---
src/utils/option.js | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/utils/option.js b/src/utils/option.js
index 21e3eea..0315a31 100644
--- a/src/utils/option.js
+++ b/src/utils/option.js
@@ -19,7 +19,8 @@
},
field: { // 瀛楁鍚�
max: 50,
- pattern: /^[\u4E00-\u9FA50-9a-zA-Z,_-]*$/ig,
+ pattern: /^[\u4E00-\u9FA50-9a-zA-Z_-]*$/ig,
+ multipattern: /^[\u4E00-\u9FA50-9a-zA-Z,_-]*$/ig,
message: '瀛楁鍚嶅彧鍏佽鍖呭惈鏁板瓧銆佸瓧姣嶃�佹眽瀛椾互鍙奯-',
maxMessage: '瀛楁鍚嶆渶澶�50涓瓧绗︺��'
},
@@ -74,24 +75,29 @@
date: [
{value: '', text: _dict['date.empty']},
{value: '0', text: '褰撳ぉ'},
- {value: 1, text: '鍓嶄竴澶�'},
+ {value: 1, text: '鏄ㄥぉ'},
+ {value: 2, text: '鍓嶅ぉ'},
{value: 3, text: '鍓嶄笁澶�'},
{value: 7, text: '鍓嶄竷澶�'},
- {value: 30, text: '鍓�30澶�'}
+ {value: 30, text: '鍓�30澶�'},
+ {value: -1, text: '鏄庡ぉ'},
+ {value: -2, text: '鍚庡ぉ'}
],
dateweek: [
{value: '', text: _dict['date.empty']},
{value: '0', text: '鏈懆'},
{value: 1, text: '涓婂懆'},
{value: 3, text: '鍓嶄笁鍛�'},
- {value: 7, text: '鍓嶄竷鍛�'}
+ {value: 7, text: '鍓嶄竷鍛�'},
+ {value: -1, text: '涓嬪懆'}
],
datemonth: [
{value: '', text: _dict['date.empty']},
{value: '0', text: '鏈湀'},
{value: 1, text: '涓婃湀'},
{value: 3, text: '鍓嶄笁鏈�'},
- {value: 7, text: '鍓嶄竷鏈�'}
+ {value: 7, text: '鍓嶄竷鏈�'},
+ {value: -1, text: '涓嬫湀'}
],
daterange: [
{value: '', text: _dict['date.empty']},
@@ -102,7 +108,9 @@
{value: '[30, 0]', text: '杩�30澶�'},
{value: '[7, -7]', text: '鍓嶅悗涓冨ぉ'},
{value: '[30, -30]', text: '鍓嶅悗30澶�'},
- {value: '[90, -90]', text: '鍓嶅悗90澶�'}
+ {value: '[90, -90]', text: '鍓嶅悗90澶�'},
+ {value: '[-1, -1]', text: '鏄庡ぉ'},
+ {value: '[-2, -2]', text: '鍚庡ぉ'}
],
datetime: [
{value: '', text: _dict['date.empty']},
@@ -110,7 +118,9 @@
{value: 1, text: '鏄ㄥぉ'},
{value: 3, text: '鍓嶄笁澶�'},
{value: 7, text: '鍓嶄竷澶�'},
- {value: 30, text: '鍓�30澶�'}
+ {value: 30, text: '鍓�30澶�'},
+ {value: -1, text: '鏄庡ぉ'},
+ {value: -2, text: '鍚庡ぉ'}
]
}
--
Gitblit v1.8.0