Skip to content

Commit a2b48cf

Browse files
committed
update
1 parent d794826 commit a2b48cf

File tree

4 files changed

+42
-19
lines changed

4 files changed

+42
-19
lines changed

public/assets/backend/js/editor/editor.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -813,8 +813,9 @@ App.editor.selectPage = function(elem,options,loaded){
813813
keyField: 'id',
814814
data: [], // url or data
815815
params: function(){return {};},
816-
eAjaxSuccess: function(d){
816+
eAjaxSuccess: function(d, type){
817817
if(!d) return undefined;
818+
if(d.Code!=1) return String(d.Info);
818819
var list = typeof(d.Data[listKey])!='undefined'?d.Data[listKey]:d.Data.list;
819820
if(list==null) list=[];
820821
var paging;

public/assets/backend/js/editor/editor.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/assets/backend/js/selectpage/selectpage.js

Lines changed: 38 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@
189189
* }
190190
*/
191191
eAjaxSuccess: undefined,
192+
eAjaxError: undefined,
192193
eAjaxMethod: undefined, // POST/GET
193194
defaultWidth: 150,
194195
defaultZindex: 1101,
@@ -807,13 +808,22 @@
807808
success: function (json) {
808809
var d = null
809810
if (p.eAjaxSuccess && $.isFunction(p.eAjaxSuccess)) {
810-
d = p.eAjaxSuccess(json)
811+
d = p.eAjaxSuccess.call(self, json, 'init')
812+
if (d===false) return
813+
if (typeof d == 'string') {
814+
self.showMessage(d, true)
815+
return
816+
}
811817
}
812818
if (!d) d = p.defaultAjaxResult
813819
self.afterInit(self, d.list)
814820
},
815821
error: function (jqXHR, textStatus, errorThrown) {
816-
self.ajaxErrorNotify(self, errorThrown)
822+
if (p.eAjaxError && $.isFunction(p.eAjaxError)) {
823+
p.eAjaxError.call(self, jqXHR, textStatus, errorThrown)
824+
}else{
825+
self.ajaxErrorNotify(errorThrown)
826+
}
817827
}
818828
})
819829
}
@@ -1097,25 +1107,27 @@
10971107

10981108
/**
10991109
* Ajax request fail
1100-
* @param {Object} self
11011110
* @param {string} errorThrown
11021111
*/
1103-
SelectPage.prototype.ajaxErrorNotify = function (self, errorThrown) {
1104-
self.showMessage(self.message.ajax_error)
1112+
SelectPage.prototype.ajaxErrorNotify = function (errorThrown) {
1113+
this.showMessage(errorThrown||this.message.ajax_error)
11051114
}
11061115

11071116
/**
11081117
* Message box
1109-
* @param {Object} self
11101118
* @param msg {string} the text need to show
11111119
*/
1112-
SelectPage.prototype.showMessage = function (self, msg) {
1120+
SelectPage.prototype.showMessage = function (msg, slient) {
11131121
if (!msg) return
1122+
var self = this
11141123
var msgLi = '<li class="' + self.css_class.message_box + '"><i class="sp-iconfont if-warning"></i> ' + msg + '</li>'
1115-
self.elem.results.empty().append(msgLi).show()
1116-
self.calcResultsSize(self)
1117-
self.setOpenStatus(self, true)
1118-
self.elem.control.hide()
1124+
self.elem.results.empty().append(msgLi)
1125+
if(!slient) {
1126+
self.elem.results.show()
1127+
self.calcResultsSize(self)
1128+
self.setOpenStatus(self, true)
1129+
}
1130+
if (self.elem.control) self.elem.control.hide()
11191131
if (self.option.pagination) self.elem.navi.hide()
11201132
}
11211133

@@ -1351,17 +1363,23 @@
13511363
success: function (returnData) {
13521364
if (!returnData || !$.isPlainObject(returnData)) {
13531365
self.hideResults(self)
1354-
self.ajaxErrorNotify(self, errorThrown)
1366+
self.ajaxErrorNotify()
13551367
return
13561368
}
13571369
var data = {}, json = {}
13581370
try {
1359-
data = p.eAjaxSuccess(returnData)
1371+
data = p.eAjaxSuccess.call(self, returnData, 'search')
1372+
if (data===false) return
1373+
if (typeof data == 'string') {
1374+
self.showMessage(data)
1375+
return
1376+
}
13601377
if (!data) data = p.defaultAjaxResult
13611378
json.originalResult = data.list
13621379
json.cnt_whole = data.totalRow
13631380
} catch (e) {
1364-
self.showMessage(self, self.message.ajax_error)
1381+
console.error(e);
1382+
self.showMessage(self.message.ajax_error)
13651383
return
13661384
}
13671385

@@ -1390,7 +1408,11 @@
13901408
error: function (jqXHR, textStatus, errorThrown) {
13911409
if (textStatus != 'abort') {
13921410
self.hideResults(self)
1393-
self.ajaxErrorNotify(self, errorThrown)
1411+
if (p.eAjaxError && $.isFunction(p.eAjaxError)) {
1412+
p.eAjaxError.call(self, jqXHR, textStatus, errorThrown)
1413+
}else{
1414+
self.ajaxErrorNotify(errorThrown)
1415+
}
13941416
}
13951417
},
13961418
complete: function () {
@@ -1669,7 +1691,7 @@
16691691
var selectedSize = el.element_box.find('li.selected_tag').length
16701692
if (selectedSize > 0 && selectedSize >= p.maxSelectLimit) {
16711693
var msg = self.message.max_selected
1672-
self.showMessage(self, msg.replace(self.template.msg.maxSelectLimit, p.maxSelectLimit))
1694+
self.showMessage(msg.replace(self.template.msg.maxSelectLimit, p.maxSelectLimit))
16731695
return
16741696
}
16751697
}

public/assets/backend/js/selectpage/selectpage.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)