Browse Source

优化配置打包JS

Karson 3 years ago
parent
commit
dfeff713bd

+ 1 - 1
application/config.php

@@ -266,7 +266,7 @@ return [
         //会员注册验证码类型email/mobile/wechat/text/false
         'user_register_captcha' => 'text',
         //登录验证码
-        'login_captcha'         => false,
+        'login_captcha'         => true,
         //登录失败超过10次则1天后重试
         'login_failure_retry'   => true,
         //是否同一账号同一时间只能在一个地方登录

File diff suppressed because it is too large
+ 1 - 1
public/assets/css/backend.min.css


File diff suppressed because it is too large
+ 1 - 1
public/assets/css/frontend.min.css


+ 13 - 4
public/assets/js/require-backend.min.js

@@ -11759,7 +11759,7 @@ define('table',['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstr
                 },
                 ignoreColumn: [0, 'operate'] //默认不导出第一列(checkbox)与操作(operate)列
             },
-            pageSize: localStorage.getItem('page-size') || 10,
+            pageSize: Config.pagesize || 10,
             pageList: [10, 15, 20, 25, 50, 'All'],
             pagination: true,
             clickToSelect: true, //是否启用点击选中
@@ -13360,7 +13360,7 @@ define("addtabs", function(){});
  * @summary     SelectPage
  * @desc        Simple and powerful selection plugin
  * @file        selectpage.js
- * @version     2.19
+ * @version     2.20
  * @author      TerryZeng
  * @contact     https://terryz.github.io/
  * @license     MIT License
@@ -13462,6 +13462,11 @@ define("addtabs", function(){});
          */
         andOr: 'OR',
         /**
+         * Used to separate search content
+         * @see SelectPage.prototype.suggest()
+         */
+        separator: ',',
+        /**
          * Result sort type
          * @type array|boolean - if not set, will default used showField field
          * @example
@@ -13939,6 +13944,9 @@ define("addtabs", function(){});
             id: input_id + namePrefix
         });
 
+        elem.hidden.attr("data-rule", elem.combo_input.data("rule") || '');
+        elem.combo_input.attr("novalidate", "novalidate");
+
         // 2. DOM element put
         elem.container.append(elem.hidden);
         if (p.dropButton) {
@@ -14530,7 +14538,7 @@ define("addtabs", function(){});
             if (val && val === self.prop.selected_text) q_word = '';
             else q_word = val;
         }
-        q_word = q_word.split(/[\s ]+/);
+        q_word = q_word.split(self.option.separator);
 
         //Before show up result list callback
         if (self.option.eOpen && $.isFunction(self.option.eOpen))
@@ -14566,7 +14574,7 @@ define("addtabs", function(){});
         if (!p.eAjaxSuccess || !$.isFunction(p.eAjaxSuccess)) self.hideResults(self);
         var _paramsFunc = p.params, _params = {}, searchKey = p.searchField;
         //when have new query keyword, then reset page number to 1.
-        if (q_word.length && q_word[0] && q_word[0] !== self.prop.prev_value) which_page_num = 1;
+        if (q_word.length && q_word[0] && q_word.join(self.option.separator) !== self.prop.prev_value) which_page_num = 1;
         var _orgParams = {
             q_word: q_word,
             pageNumber: which_page_num,
@@ -14579,6 +14587,7 @@ define("addtabs", function(){});
             searchField: self.option.searchField
         };
         if (p.orderBy !== false) _orgParams.orderBy = p.orderBy;
+        // 这个应该是历史遗留了,没仔细追逻辑,先留着。
         _orgParams[searchKey] = q_word[0];
 
         if (_paramsFunc) {

+ 13 - 4
public/assets/js/require-frontend.min.js

@@ -11607,7 +11607,7 @@ define('table',['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstr
                 },
                 ignoreColumn: [0, 'operate'] //默认不导出第一列(checkbox)与操作(operate)列
             },
-            pageSize: localStorage.getItem('page-size') || 10,
+            pageSize: Config.pagesize || 10,
             pageList: [10, 15, 20, 25, 50, 'All'],
             pagination: true,
             clickToSelect: true, //是否启用点击选中
@@ -12967,7 +12967,7 @@ define("drop", function(){});
  * @summary     SelectPage
  * @desc        Simple and powerful selection plugin
  * @file        selectpage.js
- * @version     2.19
+ * @version     2.20
  * @author      TerryZeng
  * @contact     https://terryz.github.io/
  * @license     MIT License
@@ -13069,6 +13069,11 @@ define("drop", function(){});
          */
         andOr: 'OR',
         /**
+         * Used to separate search content
+         * @see SelectPage.prototype.suggest()
+         */
+        separator: ',',
+        /**
          * Result sort type
          * @type array|boolean - if not set, will default used showField field
          * @example
@@ -13546,6 +13551,9 @@ define("drop", function(){});
             id: input_id + namePrefix
         });
 
+        elem.hidden.attr("data-rule", elem.combo_input.data("rule") || '');
+        elem.combo_input.attr("novalidate", "novalidate");
+
         // 2. DOM element put
         elem.container.append(elem.hidden);
         if (p.dropButton) {
@@ -14137,7 +14145,7 @@ define("drop", function(){});
             if (val && val === self.prop.selected_text) q_word = '';
             else q_word = val;
         }
-        q_word = q_word.split(/[\s ]+/);
+        q_word = q_word.split(self.option.separator);
 
         //Before show up result list callback
         if (self.option.eOpen && $.isFunction(self.option.eOpen))
@@ -14173,7 +14181,7 @@ define("drop", function(){});
         if (!p.eAjaxSuccess || !$.isFunction(p.eAjaxSuccess)) self.hideResults(self);
         var _paramsFunc = p.params, _params = {}, searchKey = p.searchField;
         //when have new query keyword, then reset page number to 1.
-        if (q_word.length && q_word[0] && q_word[0] !== self.prop.prev_value) which_page_num = 1;
+        if (q_word.length && q_word[0] && q_word.join(self.option.separator) !== self.prop.prev_value) which_page_num = 1;
         var _orgParams = {
             q_word: q_word,
             pageNumber: which_page_num,
@@ -14186,6 +14194,7 @@ define("drop", function(){});
             searchField: self.option.searchField
         };
         if (p.orderBy !== false) _orgParams.orderBy = p.orderBy;
+        // 这个应该是历史遗留了,没仔细追逻辑,先留着。
         _orgParams[searchKey] = q_word[0];
 
         if (_paramsFunc) {