|
|
@@ -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) {
|