pc

public/assets/js/require-backend.min.js

@@ -9900,7 +9900,7 @@ define('upload',['jquery', 'bootstrap', 'dropzone', 'template'], function ($, un
             ,mobile: [/^1[3-9]\d{9}$/, "请填写有效的手机号"]
             ,zipcode: [/^\d{6}$/, "请检查邮政编码格式"]
             ,chinese: [/^[\u0391-\uFFE5]+$/, "请填写中文字符"]
-            ,username: [/^\w{3,12}$/, "请填写3-12位数字、字母、下划线"]
+            ,username: [/^\w{3,20}$/, "请填写3-20位数字、字母、下划线"]
             ,password: [/^[\S]{6,16}$/, "请填写6-16位字符，不能包含空格"]
             ,accept: function (element, params){
                 if (!params) return true;
@@ -10207,6 +10207,8 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'],
                         ranges[__('Last 30 Days')] = [Moment().subtract(29, 'days').startOf('day'), Moment().endOf('day')];
                         ranges[__('This Month')] = [Moment().startOf('month'), Moment().endOf('month')];
                         ranges[__('Last Month')] = [Moment().subtract(1, 'month').startOf('month'), Moment().subtract(1, 'month').endOf('month')];
+                        ranges[__('本年')] = [Moment().startOf('year'), Moment().endOf('year')];
+                        ranges[__('上一年')] = [Moment().subtract(1,'year').startOf('year'), Moment().subtract(1,'year').endOf('year')];
                         var options = {
                             timePicker: false,
                             autoUpdateInput: false,

public/assets/js/require-form.js

@@ -191,6 +191,8 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
                         ranges[__('Last 30 Days')] = [Moment().subtract(29, 'days').startOf('day'), Moment().endOf('day')];
                         ranges[__('This Month')] = [Moment().startOf('month'), Moment().endOf('month')];
                         ranges[__('Last Month')] = [Moment().subtract(1, 'month').startOf('month'), Moment().subtract(1, 'month').endOf('month')];
+                        ranges[__('本年')] = [Moment().startOf('year'), Moment().endOf('year')];
+                        ranges[__('上一年')] = [Moment().subtract(1,'year').startOf('year'), Moment().subtract(1,'year').endOf('year')];
                         var options = {
                             timePicker: false,
                             autoUpdateInput: false,

public/assets/js/require-frontend.min.js

@@ -9746,7 +9746,7 @@ define('upload',['jquery', 'bootstrap', 'dropzone', 'template'], function ($, un
             ,mobile: [/^1[3-9]\d{9}$/, "请填写有效的手机号"]
             ,zipcode: [/^\d{6}$/, "请检查邮政编码格式"]
             ,chinese: [/^[\u0391-\uFFE5]+$/, "请填写中文字符"]
-            ,username: [/^\w{3,12}$/, "请填写3-12位数字、字母、下划线"]
+            ,username: [/^\w{3,20}$/, "请填写3-20位数字、字母、下划线"]
             ,password: [/^[\S]{6,16}$/, "请填写6-16位字符，不能包含空格"]
             ,accept: function (element, params){
                 if (!params) return true;
@@ -10053,6 +10053,8 @@ define('form',['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'],
                         ranges[__('Last 30 Days')] = [Moment().subtract(29, 'days').startOf('day'), Moment().endOf('day')];
                         ranges[__('This Month')] = [Moment().startOf('month'), Moment().endOf('month')];
                         ranges[__('Last Month')] = [Moment().subtract(1, 'month').startOf('month'), Moment().subtract(1, 'month').endOf('month')];
+                        ranges[__('本年')] = [Moment().startOf('year'), Moment().endOf('year')];
+                        ranges[__('上一年')] = [Moment().subtract(1,'year').startOf('year'), Moment().subtract(1,'year').endOf('year')];
                         var options = {
                             timePicker: false,
                             autoUpdateInput: false,