From 8a2fae4e3ef5f30e34758125798941582ab474b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=81=B0=E7=81=B0?= Date: Sun, 16 Oct 2022 02:12:24 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=89=8D=E7=AB=AF=E5=90=8E=E7=AB=AF=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E8=BF=94=E5=9B=9E=E7=9A=84=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E6=A0=87=E9=A2=98=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E7=9A=84=E6=B6=88=E6=81=AFException.Message?= =?UTF-8?q?=EF=BC=8C=E6=96=B9=E4=BE=BF=E5=BF=AB=E9=80=9F=E9=A2=84=E5=88=A4?= =?UTF-8?q?=E5=AE=9A=E4=BD=8D=E9=94=99=E8=AF=AF=E6=83=85=E5=86=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GlobalExceptionsFilterForAdmin.cs | 2 +- .../GlobalExceptionsFilterForClent.cs | 2 +- .../wwwroot/lib/layuiAdmin/lib/view.js | 173 +++++++++++++++++- 3 files changed, 173 insertions(+), 4 deletions(-) diff --git a/CoreCms.Net.Filter/GlobalExceptionsFilterForAdmin.cs b/CoreCms.Net.Filter/GlobalExceptionsFilterForAdmin.cs index e3dfee57..cd9f9eb4 100644 --- a/CoreCms.Net.Filter/GlobalExceptionsFilterForAdmin.cs +++ b/CoreCms.Net.Filter/GlobalExceptionsFilterForAdmin.cs @@ -43,7 +43,7 @@ namespace CoreCms.Net.Filter //处理各种异常 var jm = new AdminUiCallBack(); jm.code = (int)status; - jm.msg = "系统异常，请查看错误描述并进行解决。"; + jm.msg = "系统异常：" + context.Exception.Message; jm.data = context.Exception; context.ExceptionHandled = true; context.Result = new ObjectResult(jm); diff --git a/CoreCms.Net.Filter/GlobalExceptionsFilterForClent.cs b/CoreCms.Net.Filter/GlobalExceptionsFilterForClent.cs index 0c4e2a13..c8bbdcb0 100644 --- a/CoreCms.Net.Filter/GlobalExceptionsFilterForClent.cs +++ b/CoreCms.Net.Filter/GlobalExceptionsFilterForClent.cs @@ -46,7 +46,7 @@ namespace CoreCms.Net.Filter { status = false, code = (int)status, - msg = "系统返回异常，请联系管理员进行处理！", + msg = "系统异常" + context.Exception.Message, data = context.Exception }; context.ExceptionHandled = true; diff --git a/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/lib/view.js b/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/lib/view.js index 9108168c..06051203 100644 --- a/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/lib/view.js +++ b/CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/lib/view.js @@ -1,2 +1,171 @@ -/** layuiAdmin.pro-v1.7.0 LPPL License */ - ;layui.define(["laytpl","layer"],function(e){var t=layui.jquery,a=layui.laytpl,n=layui.layer,r=layui.setter,o=(layui.device(),layui.hint()),i=function(e){return new d(e)},s="LAY_app_body",d=function(e){this.id=e,this.container=t("#"+(e||s))};i.loading=function(e){e.append(this.elemLoad=t(''))},i.removeLoad=function(){this.elemLoad&&this.elemLoad.remove()},i.exit=function(){layui.data(r.tableName,{key:r.request.tokenName,remove:!0}),location.hash="/user/login"},i.req=function(e){var a=e.success,n=e.error,o=r.request,s=r.response,d=function(){return r.debug?"
URL："+e.url:""};if(e.data=e.data||{},e.headers=e.headers||{},o.tokenName){var l="string"==typeof e.data?JSON.parse(e.data):e.data;e.data[o.tokenName]=o.tokenName in l?e.data[o.tokenName]:layui.data(r.tableName)[o.tokenName]||"",e.headers[o.tokenName]=o.tokenName in e.headers?e.headers[o.tokenName]:layui.data(r.tableName)[o.tokenName]||""}return delete e.success,delete e.error,t.ajax(t.extend({type:"get",dataType:"json",success:function(t){var n=s.statusCode;if(t[s.statusName]==n.ok)"function"==typeof e.done&&e.done(t);else if(t[s.statusName]==n.logout)i.exit();else{var r=["Error： "+(t[s.msgName]||"返回状态码异常"),d()].join("");i.error(r)}"function"==typeof a&&a(t)},error:function(e,t){var a=["请求异常，请重试
错误信息："+t,d()].join("");i.error(a),"function"==typeof n&&n.apply(this,arguments)}},e))},i.popup=function(e){var a=e.success,r=e.skin;return delete e.success,delete e.skin,n.open(t.extend({type:1,title:"提示",content:"",id:"LAY-system-view-popup",skin:"layui-layer-admin"+(r?" "+r:""),shadeClose:!0,closeBtn:!1,success:function(e,r){var o=t('ဆ');e.append(o),o.on("click",function(){n.close(r)}),"function"==typeof a&&a.apply(this,arguments)}},e))},i.error=function(e,a){return i.popup(t.extend({content:e,maxWidth:300,offset:"t",anim:6,id:"LAY_adminError"},a))},d.prototype.render=function(e,a){var n=this;layui.router();return e=r.views+e+r.engine,t("#"+s).children(".layadmin-loading").remove(),i.loading(n.container),t.ajax({url:e,type:"get",dataType:"html",data:{v:layui.cache.version},success:function(e){e="
"+e+"
";var r=t(e).find("title"),o=r.text()||(e.match(/\([\s\S]*)\<\/title>/)||[])[1],s={title:o,body:e};r.remove(),n.params=a||{},n.then&&(n.then(s),delete n.then),n.parse(e),i.removeLoad(),n.done&&(n.done(s),delete n.done)},error:function(e){return i.removeLoad(),n.render.isError?i.error("请求视图文件异常，状态："+e.status):(404===e.status?n.render("template/tips/404"):n.render("template/tips/error"),void(n.render.isError=!0))}}),n},d.prototype.parse=function(e,n,r){var s=this,d="object"==typeof e,l=d?e:t(e),u=d?e:l.find("*[template]"),c=function(e){var n=a(e.dataElem.html()),o=t.extend({params:y.params},e.res);e.dataElem.after(n.render(o)),"function"==typeof r&&r();try{e.done&&new Function("d",e.done)(o)}catch(i){console.error(e.dataElem[0],"\n存在错误回调脚本\n\n",i)}},y=layui.router();l.find("title").remove(),s.container[n?"after":"html"](l.children()),y.params=s.params||{};for(var p=u.length;p>0;p--)!function(){var e=u.eq(p-1),t=e.attr("lay-done")||e.attr("lay-then"),n=a(e.attr("lay-url")||"").render(y),r=a(e.attr("lay-data")||"").render(y),s=a(e.attr("lay-headers")||"").render(y);try{r=new Function("return "+r+";")()}catch(d){o.error("lay-data: "+d.message),r={}}try{s=new Function("return "+s+";")()}catch(d){o.error("lay-headers: "+d.message),s=s||{}}n?i.req({type:e.attr("lay-type")||"get",url:n,data:r,dataType:"json",headers:s,success:function(a){c({dataElem:e,res:a,done:t})}}):c({dataElem:e,done:t})}();return s},d.prototype.send=function(e,t){var n=a(e||this.container.html()).render(t||{});return this.container.html(n),this},d.prototype.refresh=function(e){var t=this,a=t.container.next(),n=a.attr("lay-templateid");return t.id!=n?t:(t.parse(t.container,"refresh",function(){t.container.siblings('[lay-templateid="'+t.id+'"]:last').remove(),"function"==typeof e&&e()}),t)},d.prototype.then=function(e){return this.then=e,this},d.prototype.done=function(e){return this.done=e,this},e("view",i)}); \ No newline at end of file +; +layui.define(["laytpl", "layer"], function (e) { + var t = layui.jquery, + a = layui.laytpl, + n = layui.layer, + r = layui.setter, + o = (layui.device(), layui.hint()), + i = function (e) { + return new d(e) + }, s = "LAY_app_body", + d = function (e) { + this.id = e, this.container = t("#" + (e || s)) + }; + i.loading = function (e) { + e.append(this.elemLoad = t('')) + }, i.removeLoad = function () { + this.elemLoad && this.elemLoad.remove() + }, i.exit = function () { + layui.data(r.tableName, { + key: r.request.tokenName, + remove: !0 + }), location.hash = "/user/login" + }, i.req = function (e) { + var a = e.success, + n = e.error, + o = r.request, + s = r.response, + d = function () { + return r.debug ? "
URL：" + e.url : "" + }; + if (e.data = e.data || {}, e.headers = e.headers || {}, o.tokenName) { + var l = "string" == typeof e.data ? JSON.parse(e.data) : e.data; + e.data[o.tokenName] = o.tokenName in l ? e.data[o.tokenName] : layui.data(r.tableName)[o.tokenName] || "", e.headers[o.tokenName] = o.tokenName in e.headers ? e.headers[o.tokenName] : layui.data(r.tableName)[o.tokenName] || "" + } + return delete e.success, delete e.error, t.ajax(t.extend({ + type: "get", + dataType: "json", + success: function (t) { + var n = s.statusCode; + if (t[s.statusName] == n.ok) "function" == typeof e.done && e.done(t); + else if (t[s.statusName] == n.logout) i.exit(); + else { + var r = ["Error： " + (t[s.msgName] || "返回状态码异常"), d()].join("
"); + i.error(r) + } + "function" == typeof a && a(t) + }, + error: function (e, t) { + var a = ["请求异常，请重试
错误信息：" + t, d()].join(""); + i.error(a), "function" == typeof n && n.apply(this, arguments) + } + }, e)) + }, i.popup = function (e) { + var a = e.success, + r = e.skin; + return delete e.success, delete e.skin, n.open(t.extend({ + type: 0, + title: "提示", + content: "", + id: "LAY-system-view-popup", + skin: "layui-layer-admin" + (r ? " " + r : ""), + shadeClose: !0, + closeBtn: !1, + success: function (e, r) { + var o = t('ဆ'); + e.append(o), o.on("click", function () { + n.close(r) + }), "function" == typeof a && a.apply(this, arguments) + } + }, e)) + }, i.error = function (e, a) { + return i.popup(t.extend({ + content: e, + maxWidth: 500, + offset: "auto", + anim: 6, + id: "LAY_adminError" + }, a)) + }, d.prototype.render = function (e, a) { + var n = this; + layui.router(); + return e = r.views + e + r.engine, t("#" + s).children(".layadmin-loading").remove(), i.loading(n.container), t.ajax({ + url: e, + type: "get", + dataType: "html", + data: { + v: layui.cache.version + }, + success: function (e) { + e = "
" + e + "
"; + var r = t(e).find("title"), + o = r.text() || (e.match(/\([\s\S]*)\<\/title>/) || [])[1], + s = { + title: o, + body: e + }; + r.remove(), n.params = a || {}, n.then && (n.then(s), delete n.then), n.parse(e), i.removeLoad(), n.done && (n.done(s), delete n.done) + }, + error: function (e) { + return i.removeLoad(), n.render.isError ? i.error("请求视图文件异常，状态：" + e.status) : (404 === e.status ? n.render("template/tips/404") : n.render("template/tips/error"), void (n.render.isError = !0)) + } + }), n + }, d.prototype.parse = function (e, n, r) { + var s = this, + d = "object" == typeof e, + l = d ? e : t(e), + u = d ? e : l.find("*[template]"), + c = function (e) { + var n = a(e.dataElem.html()), + o = t.extend({ + params: y.params + }, e.res); + e.dataElem.after(n.render(o)), "function" == typeof r && r(); + try { + e.done && new Function("d", e.done)(o) + } catch (i) { + console.error(e.dataElem[0], "\n存在错误回调脚本\n\n", i) + } + }, y = layui.router(); + l.find("title").remove(), s.container[n ? "after" : "html"](l.children()), y.params = s.params || {}; + for (var p = u.length; p > 0; p--)! function () { + var e = u.eq(p - 1), + t = e.attr("lay-done") || e.attr("lay-then"), + n = a(e.attr("lay-url") || "").render(y), + r = a(e.attr("lay-data") || "").render(y), + s = a(e.attr("lay-headers") || "").render(y); + try { + r = new Function("return " + r + ";")() + } catch (d) { + o.error("lay-data: " + d.message), r = {} + } + try { + s = new Function("return " + s + ";")() + } catch (d) { + o.error("lay-headers: " + d.message), s = s || {} + } + n ? i.req({ + type: e.attr("lay-type") || "get", + url: n, + data: r, + dataType: "json", + headers: s, + success: function (a) { + c({ + dataElem: e, + res: a, + done: t + }) + } + }) : c({ + dataElem: e, + done: t + }) + }(); + return s + }, d.prototype.send = function (e, t) { + var n = a(e || this.container.html()).render(t || {}); + return this.container.html(n), this + }, d.prototype.refresh = function (e) { + var t = this, + a = t.container.next(), + n = a.attr("lay-templateid"); + return t.id != n ? t : (t.parse(t.container, "refresh", function () { + t.container.siblings('[lay-templateid="' + t.id + '"]:last').remove(), "function" == typeof e && e() + }), t) + }, d.prototype.then = function (e) { + return this.then = e, this + }, d.prototype.done = function (e) { + return this.done = e, this + }, e("view", i) +}); \ No newline at end of file