【升级】layui升级到v2.9.2版本,layuiadmin升级到v2.3.2版本,更新lodop打印组件安装包。

This commit is contained in:
jianweie code
2023-12-25 22:29:05 +08:00
parent f4b2c201a6
commit 6ab5f041bb
14 changed files with 473 additions and 406 deletions

View File

@@ -582,6 +582,9 @@
<None Include="wwwroot\lib\layuiAdmin\index.js" />
<None Include="wwwroot\lib\layuiAdmin\layui\font\iconfont.svg" />
<None Include="wwwroot\lib\layuiAdmin\layui\font\iconfont.woff2" />
<None Include="wwwroot\lib\layuiAdmin\layui\layui.js" />
<None Include="wwwroot\lib\layuiAdmin\lib\extend\echarts.js" />
<None Include="wwwroot\lib\layuiAdmin\lib\extend\echartsTheme.js" />
<None Include="wwwroot\lib\layuiAdmin\modules\breadcrumb.js" />
<None Include="wwwroot\lib\layuiAdmin\modules\common.js" />
<None Include="wwwroot\lib\layuiAdmin\modules\console.js" />
@@ -590,12 +593,14 @@
<None Include="wwwroot\lib\layuiAdmin\modules\coredropdown.js" />
<None Include="wwwroot\lib\layuiAdmin\modules\coreHelper.js" />
<None Include="wwwroot\lib\layuiAdmin\modules\Cropper.js" />
<None Include="wwwroot\lib\layuiAdmin\modules\cropperImg.js" />
<None Include="wwwroot\lib\layuiAdmin\modules\dltable.js" />
<None Include="wwwroot\lib\layuiAdmin\modules\dtree.js" />
<None Include="wwwroot\lib\layuiAdmin\modules\echarts.js" />
<None Include="wwwroot\lib\layuiAdmin\modules\echartsTheme.js" />
<None Include="wwwroot\lib\layuiAdmin\modules\forum.js" />
<None Include="wwwroot\lib\layuiAdmin\modules\iconPicker.js" />
<None Include="wwwroot\lib\layuiAdmin\modules\iconSelected.js" />
<None Include="wwwroot\lib\layuiAdmin\modules\layim\layim.js" />
<None Include="wwwroot\lib\layuiAdmin\modules\sample.js" />
<None Include="wwwroot\lib\layuiAdmin\modules\senior.js" />
@@ -611,6 +616,10 @@
<None Include="wwwroot\lib\layuiAdmin\style\dtree\font\dtreefont.svg" />
<None Include="wwwroot\lib\layuiAdmin\style\imgs\logo.psd" />
<None Include="wwwroot\lib\layuiAdmin\style\imgs\noImage.psd" />
<None Include="wwwroot\lib\lodop\CLodop_Setup_for_Win32NT.exe" />
<None Include="wwwroot\lib\lodop\install_lodop32.exe" />
<None Include="wwwroot\lib\lodop\install_lodop64.exe" />
<None Include="wwwroot\lib\lodop\LodopFuncs.js" />
<None Include="wwwroot\lib\wechatmenu\jquery.form.js" />
<None Include="wwwroot\static\css\documentEditor.less" />
<None Include="wwwroot\static\css\overWrite.less" />

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1 +1 @@
/** The Web UI Theme-v1.9.0 */;layui.define(['admin', "breadcrumb"],function(e){function a(e){var n,a=layui.router(),i=u(l.container),t=r.correctRouter(a.path.join("/"));if(layui.each(l.indPage,function(e,a){if(t===a)return n=!0}),layui.config({base:l.paths.base+"modules/"}),n||"/user/login"===t)i.render(a.path.join("/")).done(function(){r.pageType="alone"});else{if(l.interceptor)if(!layui.data(l.tableName)[l.request.tokenName])return location.hash="/user/login/redirect="+encodeURIComponent(t);"console"===r.pageType?c():i.render("layout").done(function(){c(),layui.element.render(),r.screen()<2&&r.sideFlexible(),r.pageType="console"})}}var l=layui.setter,o=layui.element,r=layui.admin,s=r.tabsPage,u=layui.view,c=function(){function e(e){c.haveInit&&h(".layui-layer").each(function(){var e=h(this),a=e.attr("times");e.hasClass("layui-layim")||e.hasClass("layui-layim-chat")||layer.close(a)}),c.haveInit=!0,h(d).scrollTop(0),delete s.type}var i=layui.router(),a=i.path,t=r.correctRouter(i.path.join("/"));""===(a=a.length?a:[""])[a.length-1]&&(a[a.length-1]=l.entry);if("tab"===s.type&&("/"!==t||"/"===t&&r.tabsBody().html()))return r.tabsBodyChange(s.index),e(s.type);u().render(a.join("/")).then(function(e){var a,n=h("#LAY_app_tabsheader>li");n.each(function(e){h(this).attr("lay-id")===t&&(a=!0,s.index=e)}),l.pageTabs&&"/"!==t&&!a&&(h(d).append('<div class="layadmin-tabsbody-item layui-show"></div>'),s.index=n.length,o.tabAdd(y,{title:"<span>"+(e.title||"\u65b0\u6807\u7b7e\u9875")+"</span>",id:t,attr:i.href})),this.container=r.tabsBody(s.index),l.pageTabs||this.container.scrollTop(0),o.tabChange(y,t),r.tabsBodyChange(s.index)}).done(function(){layui.use("common",layui.cache.callback.common),n.on("resize",layui.data.resize),o.render("breadcrumb","breadcrumb"),r.tabsBody(s.index).on("scroll",function(){var e=h(this),a=h(".layui-laydate"),n=h(".layui-layer")[0];a[0]&&(a.each(function(){var e=h(this);e.hasClass("layui-laydate-static")||e.remove()}),e.find("input").blur()),n&&layer.closeAll("tips")})}),e()},d="#LAY_app_body",y="layadmin-layout-tabs",h=layui.$,n=h(window),i=(layui.link(l.paths.core+"css/admin.css?v="+r.v,function(){a()},"layuiAdmin"),window.onhashchange=function(){a(),layui.event.call(this,l.MOD_NAME,"hash({*})",layui.router())},{render:c});h.extend(r,i),e("adminIndex",i)});
/** The Web UI Theme-v2.3.2 */; layui.define(['admin', "breadcrumb"],function(e){function a(e){var n,a=layui.router(),i=u(l.container),t=r.correctRouter(a.path.join("/"));if(layui.each(l.indPage,function(e,a){if(t===a)return n=!0}),layui.config({base:l.paths.base+"modules/"}),n||"/user/login"===t)i.render(a.path.join("/")).done(function(){r.pageType="alone"});else{if(l.interceptor)if(!layui.data(l.tableName)[l.request.tokenName])return location.hash="/user/login/redirect="+encodeURIComponent(t);"console"===r.pageType?c():i.render("layout").done(function(){c(),layui.element.render(),r.screen()<2&&r.sideFlexible(),r.pageType="console"})}}var l=layui.setter,o=layui.element,r=layui.admin,s=r.tabsPage,u=layui.view,c=function(){function e(e){c.haveInit&&h(".layui-layer").each(function(){var e=h(this),a=e.attr("times");e.hasClass("layui-layim")||e.hasClass("layui-layim-chat")||layer.close(a)}),c.haveInit=!0,h(d).scrollTop(0),delete s.type}var i=layui.router(),a=i.path,t=r.correctRouter(i.path.join("/"));""===(a=a.length?a:[""])[a.length-1]&&(a[a.length-1]=l.entry);if("tab"===s.type&&("/"!==t||"/"===t&&r.tabsBody().html()))return r.tabsBodyChange(s.index),e(s.type);u().render(a.join("/")).then(function(e){var a,n=h("#LAY_app_tabsheader>li");n.each(function(e){h(this).attr("lay-id")===t&&(a=!0,s.index=e)}),l.pageTabs&&"/"!==t&&!a&&(h(d).append('<div class="layadmin-tabsbody-item layui-show"></div>'),s.index=n.length,o.tabAdd(y,{title:"<span>"+(e.title||"\u65b0\u6807\u7b7e\u9875")+"</span>",id:t,attr:i.href})),this.container=r.tabsBody(s.index),l.pageTabs||this.container.scrollTop(0),o.tabChange(y,t),r.tabsBodyChange(s.index)}).done(function(){layui.use("common",layui.cache.callback.common),n.on("resize",layui.data.resize),o.render("breadcrumb","breadcrumb"),r.tabsBody(s.index).on("scroll",function(){var e=h(this),a=h(".layui-laydate"),n=h(".layui-layer")[0];a[0]&&(a.each(function(){var e=h(this);e.hasClass("layui-laydate-static")||e.remove()}),e.find("input").blur()),n&&layer.closeAll("tips")})}),e()},d="#LAY_app_body",y="layadmin-layout-tabs",h=layui.$,n=h(window),i=(layui.link(l.paths.core+"css/admin.css?v="+r.v,function(){a()},"layuiAdmin"),window.onhashchange=function(){a(),layui.event.call(this,l.MOD_NAME,"hash({*})",layui.router())},{render:c});h.extend(r,i),e("adminIndex",i)});

View File

@@ -1 +1 @@
/** The Web UI Theme-v1.9.0 */;layui.define(["laytpl","layer"],function(e){function u(e){return new t(e)}function t(e){this.id=e,this.container=c("#"+(e||a))}var c=layui.jquery,p=layui.laytpl,r=layui.layer,s=layui.setter,y=(layui.device(),layui.hint()),a="LAY_app_body";u.loading=function(e){e.append(this.elemLoad=c('<i class="layui-anim layui-anim-rotate layui-anim-loop layui-icon layui-icon-loading layadmin-loading"></i>'))},u.removeLoad=function(){this.elemLoad&&this.elemLoad.remove()},u.exit=function(){layui.data(s.tableName,{key:s.request.tokenName,remove:!0}),location.hash="/user/login"},u.req=function(a){function n(){return s.debug?"<br><cite>URL\uff1a</cite>"+a.url:""}var e,r=a.success,o=a.error,t=s.request,i=s.response;return a.data=a.data||{},a.headers=a.headers||{},t.tokenName&&(e="string"==typeof a.data?JSON.parse(a.data):a.data,a.data[t.tokenName]=t.tokenName in e?a.data[t.tokenName]:layui.data(s.tableName)[t.tokenName]||"",a.headers[t.tokenName]=t.tokenName in a.headers?a.headers[t.tokenName]:layui.data(s.tableName)[t.tokenName]||""),delete a.success,delete a.error,c.ajax(c.extend({type:"get",dataType:"json",success:function(e){var t=i.statusCode;e[i.statusName]==t.ok?"function"==typeof a.done&&a.done(e):e[i.statusName]==t.logout?u.exit():(t=["<cite>Error\uff1a</cite> "+(e[i.msgName]||"\u8fd4\u56de\u72b6\u6001\u7801\u5f02\u5e38"),n()].join(""),u.error(t)),"function"==typeof r&&r(e)},error:function(e,t){var a=["\u8bf7\u6c42\u5f02\u5e38\uff0c\u8bf7\u91cd\u8bd5<br><cite>\u9519\u8bef\u4fe1\u606f\uff1a</cite>"+t,n()].join("");u.error(a),"function"==typeof o&&o.apply(this,arguments)}},a))},u.popup=function(e){var n=e.success,t=e.skin;return delete e.success,delete e.skin,r.open(c.extend({type:1,title:"\u63d0\u793a",content:"",id:"LAY-system-view-popup",skin:"layui-layer-admin"+(t?" "+t:""),shadeClose:!0,closeBtn:!1,success:function(e,t){var a=c('<i class="layui-icon" close>&#x1006;</i>');e.append(a),a.on("click",function(){r.close(t)}),"function"==typeof n&&n.apply(this,arguments)}},e))},u.error=function(e,t){return u.popup(c.extend({content:e,maxWidth:300,offset:"t",anim:6,id:"LAY_adminError"},t))},t.prototype.render=function(e,n){var r=this;layui.router();return e=(s.paths&&s.paths.views?s.paths:s).views+e+s.engine,c("#"+a).children(".layadmin-loading").remove(),u.loading(r.container),c.ajax({url:e,type:"get",dataType:"html",data:{v:layui.cache.version},success:function(e){var t=c(e="<div>"+e+"</div>").find("title"),a={title:t.text()||(e.match(/\<title\>([\s\S]*)\<\/title>/)||[])[1],body:e};t.remove(),r.params=n||{},r.then&&(r.then(a),delete r.then),r.parse(e),u.removeLoad(),r.done&&(r.done(a),delete r.done)},error:function(e){if(u.removeLoad(),r.render.isError)return u.error("\u8bf7\u6c42\u89c6\u56fe\u6587\u4ef6\u5f02\u5e38\uff0c\u72b6\u6001\uff1a"+e.status);404===e.status?r.render("template/tips/404"):r.render("template/tips/error"),r.render.isError=!0}}),r},t.prototype.parse=function(e,t,n){function o(t){var e=p(t.dataElem.html()),a=c.extend({params:d.params},t.res);t.dataElem.after(e.render(a)),"function"==typeof n&&n();try{t.done&&new Function("d",t.done)(a)}catch(e){console.error(t.dataElem[0],"\n\u5b58\u5728\u9519\u8bef\u56de\u8c03\u811a\u672c\n\n",e)}}var a=this,r="object"==typeof e,i=r?e:c(e),s=r?e:i.find("*[template]"),d=layui.router();i.find("title").remove(),a.container[t?"after":"html"](i.children()),d.params=a.params||{};for(var l=s.length;0<l;l--)!function(){var t=s.eq(l-1),a=t.attr("lay-done")||t.attr("lay-then"),e=p(t.attr("lay-url")||"").render(d),n=p(t.attr("lay-data")||"").render(d),r=p(t.attr("lay-headers")||"").render(d);try{n=new Function("return "+n+";")()}catch(e){y.error("lay-data: "+e.message),n={}}try{r=new Function("return "+r+";")()}catch(e){y.error("lay-headers: "+e.message),r=r||{}}e?u.req({type:t.attr("lay-type")||"get",url:e,data:n,dataType:"json",headers:r,success:function(e){o({dataElem:t,res:e,done:a})}}):o({dataElem:t,done:a})}();return a},t.prototype.send=function(e,t){e=p(e||this.container.html()).render(t||{});return this.container.html(e),this},t.prototype.refresh=function(e){var t=this,a=t.container.next().attr("lay-templateid");return t.id!=a||t.parse(t.container,"refresh",function(){t.container.siblings('[lay-templateid="'+t.id+'"]:last').remove(),"function"==typeof e&&e()}),t},t.prototype.then=function(e){return this.then=e,this},t.prototype.done=function(e){return this.done=e,this},e("view",u)});
/** The Web UI Theme-v2.3.2 */;layui.define(["laytpl","layer"],function(e){function u(e){return new t(e)}function t(e){this.id=e,this.container=c("#"+(e||a))}var c=layui.jquery,p=layui.laytpl,r=layui.layer,s=layui.setter,y=(layui.device(),layui.hint()),a="LAY_app_body";u.loading=function(e){e.append(this.elemLoad=c('<i class="layui-anim layui-anim-rotate layui-anim-loop layui-icon layui-icon-loading layadmin-loading"></i>'))},u.removeLoad=function(){this.elemLoad&&this.elemLoad.remove()},u.exit=function(){layui.data(s.tableName,{key:s.request.tokenName,remove:!0}),location.hash="/user/login"},u.req=function(a){function n(){return s.debug?"<br><cite>URL\uff1a</cite>"+a.url:""}var e,r=a.success,o=a.error,t=s.request,i=s.response;return a.data=a.data||{},a.headers=a.headers||{},t.tokenName&&(e="string"==typeof a.data?JSON.parse(a.data):a.data,a.data[t.tokenName]=t.tokenName in e?a.data[t.tokenName]:layui.data(s.tableName)[t.tokenName]||"",a.headers[t.tokenName]=t.tokenName in a.headers?a.headers[t.tokenName]:layui.data(s.tableName)[t.tokenName]||""),delete a.success,delete a.error,c.ajax(c.extend({type:"get",dataType:"json",success:function(e){var t=i.statusCode;e[i.statusName]==t.ok?"function"==typeof a.done&&a.done(e):e[i.statusName]==t.logout?u.exit():(t=["<cite>Error\uff1a</cite> "+(e[i.msgName]||"\u8fd4\u56de\u72b6\u6001\u7801\u5f02\u5e38"),n()].join(""),u.error(t)),"function"==typeof r&&r(e)},error:function(e,t){var a=["\u8bf7\u6c42\u5f02\u5e38\uff0c\u8bf7\u91cd\u8bd5<br><cite>\u9519\u8bef\u4fe1\u606f\uff1a</cite>"+t,n()].join("");u.error(a),"function"==typeof o&&o.apply(this,arguments)}},a))},u.popup=function(e){var n=e.success,t=e.skin;return delete e.success,delete e.skin,r.open(c.extend({type:1,title:"\u63d0\u793a",content:"",id:"LAY-system-view-popup",skin:"layui-layer-admin"+(t?" "+t:""),shadeClose:!0,closeBtn:!1,success:function(e,t){var a=c('<i class="layui-icon" close>&#x1006;</i>');e.append(a),a.on("click",function(){r.close(t)}),"function"==typeof n&&n.apply(this,arguments)}},e))},u.error=function(e,t){return u.popup(c.extend({content:e,maxWidth:300,offset:"t",anim:6,id:"LAY_adminError"},t))},t.prototype.render=function(e,n){var r=this;layui.router();return e=(s.paths&&s.paths.views?s.paths:s).views+e+s.engine,c("#"+a).children(".layadmin-loading").remove(),u.loading(r.container),c.ajax({url:e,type:"get",dataType:"html",data:{v:layui.cache.version},success:function(e){var t=c(e="<div>"+e+"</div>").find("title"),a={title:t.text()||(e.match(/\<title\>([\s\S]*)\<\/title>/)||[])[1],body:e};t.remove(),r.params=n||{},r.then&&(r.then(a),delete r.then),r.parse(e),u.removeLoad(),r.done&&(r.done(a),delete r.done)},error:function(e){if(u.removeLoad(),r.render.isError)return u.error("\u8bf7\u6c42\u89c6\u56fe\u6587\u4ef6\u5f02\u5e38\uff0c\u72b6\u6001\uff1a"+e.status);404===e.status?r.render("template/tips/404"):r.render("template/tips/error"),r.render.isError=!0}}),r},t.prototype.parse=function(e,t,n){function o(t){var e=p(t.dataElem.html()),a=c.extend({params:d.params},t.res);t.dataElem.after(e.render(a)),"function"==typeof n&&n();try{t.done&&new Function("d",t.done)(a)}catch(e){console.error(t.dataElem[0],"\n\u5b58\u5728\u9519\u8bef\u56de\u8c03\u811a\u672c\n\n",e)}}var a=this,r="object"==typeof e,i=r?e:c(e),s=r?e:i.find("*[template]"),d=layui.router();i.find("title").remove(),a.container[t?"after":"html"](i.children()),d.params=a.params||{};for(var l=s.length;0<l;l--)!function(){var t=s.eq(l-1),a=t.attr("lay-done")||t.attr("lay-then"),e=p(t.attr("lay-url")||"").render(d),n=p(t.attr("lay-data")||"").render(d),r=p(t.attr("lay-headers")||"").render(d);try{n=new Function("return "+n+";")()}catch(e){y.error("lay-data: "+e.message),n={}}try{r=new Function("return "+r+";")()}catch(e){y.error("lay-headers: "+e.message),r=r||{}}e?u.req({type:t.attr("lay-type")||"get",url:e,data:n,dataType:"json",headers:r,success:function(e){o({dataElem:t,res:e,done:a})}}):o({dataElem:t,done:a})}();return a},t.prototype.send=function(e,t){e=p(e||this.container.html()).render(t||{});return this.container.html(e),this},t.prototype.refresh=function(e){var t=this,a=t.container.next().attr("lay-templateid");return t.id!=a||t.parse(t.container,"refresh",function(){t.container.siblings('[lay-templateid="'+t.id+'"]:last').remove(),"function"==typeof e&&e()}),t},t.prototype.then=function(e){return this.then=e,this},t.prototype.done=function(e){return this.done=e,this},e("view",u)});

View File

@@ -209,7 +209,7 @@ html{background-color: #f2f2f2; color: #5F5F5F;}
.layadmin-pagetabs .layui-tab-title li:after{content:''; position: absolute; top: 0; left: 0; width: 0; height: 2px; border-radius: 0; background-color: #292B34; transition: all .3s; -webkit-transition: all .3s;}
.layadmin-pagetabs .layui-tab-title li:hover:after{width: 100%;}
.layadmin-pagetabs .layui-tab-title li:hover,
.layadmin-pagetabs .layui-tab-title li.layui-this{color: #5FB878;}
.layadmin-pagetabs .layui-tab-title li.layui-this{color: #16b777;}
.layadmin-pagetabs .layui-tab-title li.layui-this:after{width: 100%; border: none; height: 2px; background-color: #292B34;}
/* 不开启页面标签时 */
@@ -293,7 +293,7 @@ html{background-color: #f2f2f2; color: #5F5F5F;}
/* 待办事项 */
.layadmin-backlog .layadmin-backlog-body{display: block; padding: 10px 15px; background-color: #f8f8f8; color: #999; border-radius: 2px; transition: all .3s; -webkit-transition: all .3s;}
.layadmin-backlog-body h3{padding-bottom: 10px; font-size: 12px;}
.layadmin-backlog-body p cite{font-style: normal; font-size: 30px; font-weight: 300; color: #009688;}
.layadmin-backlog-body p cite{font-style: normal; font-size: 30px; font-weight: 300; color: #16baaa;}
.layadmin-backlog-body:hover{background-color: #f2f2f2; color: #888;}
/* 版本信息 */
@@ -323,7 +323,7 @@ html{background-color: #f2f2f2; color: #5F5F5F;}
.layadmin-list li{margin-bottom: 6px; padding-bottom: 6px; border-bottom-color: #f5f5f5; list-style-position: inside; list-style-type: disc;}
.layadmin-list li{text-overflow: ellipsis; overflow: hidden; white-space: nowrap;}
.layadmin-list li a{color: #5F5F5F;}
.layadmin-list li a:hover{color: #009688;}
.layadmin-list li a:hover{color: #16baaa;}
.layadmin-list li:last-child{border: none; padding: 0; margin: 0;}
/* 文本区域 */
@@ -345,7 +345,7 @@ html{background-color: #f2f2f2; color: #5F5F5F;}
.layui-card-header .layui-a-tips{position: absolute; right: 15px; color: #01AAED;}
.layuiadmin-card-text{background-color: #f8f8f8; color: #777; padding: 24px;}
.layuiadmin-card-text .layui-text-top{padding-bottom: 10px;}
.layuiadmin-card-text .layui-text-top i{margin-right: 10px; font-size: 24px; color: #009688;}
.layuiadmin-card-text .layui-text-top i{margin-right: 10px; font-size: 24px; color: #16baaa;}
.layuiadmin-card-text .layui-text-top a{line-height: 24px; font-size: 16px; vertical-align: top;}
.layuiadmin-card-text .layui-text-center{height: 44px; line-height: 22px; margin-bottom: 10px; overflow: hidden;}
.layuiadmin-card-text .layui-text-bottom{position: relative;}
@@ -360,7 +360,7 @@ html{background-color: #f2f2f2; color: #5F5F5F;}
.layuiadmin-card-status dd{padding: 15px 0; border-bottom: 1px solid #EEE; display: -webkit-flex; display: flex;}
.layuiadmin-card-status dd:last-child{border: none;}
.layuiadmin-card-status dd div.layui-status-img,
.layuiadmin-card-team .layui-team-img{width: 32px; height: 32px; border-radius: 50%; background-color: #009688; margin-right: 15px;}
.layuiadmin-card-team .layui-team-img{width: 32px; height: 32px; border-radius: 50%; background-color: #16baaa; margin-right: 15px;}
.layuiadmin-card-status dd div.layui-status-img a{width: 100%; height: 100%; display: inline-block; text-align: center; line-height: 32px;}
.layuiadmin-card-status dd div.layui-status-img img,
.layuiadmin-card-team .layui-team-img img{width: 50%; height: 50%;}
@@ -371,7 +371,7 @@ html{background-color: #f2f2f2; color: #5F5F5F;}
.layuiadmin-card-link{padding-left: 10px; font-size: 0}
.layuiadmin-card-link a{display: inline-block; width: 25%; color: #5F5F5F; font-size: 14px; margin-bottom: 12px;}
.layuiadmin-card-link button{vertical-align: top;}
.layuiadmin-card-link button:hover{color: #009688;}
.layuiadmin-card-link button:hover{color: #16baaa;}
/* 团队 */
.layuiadmin-card-team li{padding: 10px 0 10px 10px;}
@@ -398,7 +398,7 @@ html{background-color: #f2f2f2; color: #5F5F5F;}
.layuiadmin-page-table td span{color: #2F4056;}
.layuiadmin-page-table td span.first{color: #FF5722;}
.layuiadmin-page-table td span.second{color: #FFB800;}
.layuiadmin-page-table td span.third{color: #5FB878;}
.layuiadmin-page-table td span.third{color: #16b777;}
/****** 其它主页结束 ******/
@@ -444,19 +444,25 @@ html{background-color: #f2f2f2; color: #5F5F5F;}
/* 主题设置 */
.layadmin-setTheme{padding: 15px; overflow-x: hidden;}
.layadmin-setTheme>h5{padding: 20px 0 10px; color: #000;}
.layadmin-setTheme>h5{padding: 11px 0; color: #000;}
.layadmin-setTheme>h5:first-child{padding-top: 0;}
.layadmin-setTheme-color{width: 330px; font-size: 0;}
.layadmin-setTheme-color li{position: relative; display: inline-block; vertical-align: top; width: 80px; height: 50px; margin: 0 15px 15px 0; background-color: #f2f2f2; cursor: pointer; font-size: 12px; color: #5F5F5F;}
.layadmin-setTheme-color li:after{content: ''; position: absolute; z-index: 20; top: 50%; left: 50%; width: 1px; height: 0; border: 1px solid #f2f2f2; transition: all .3s; -webkit-transition: all .3s; opacity: 0;}
.layadmin-setTheme-color li.layui-this:after,
.layadmin-setTheme-color li:hover:after{width: 100%; height: 100%; padding: 4px; top: -5px; left: -5px; border-color: #5FB878; opacity: 1;}
.layadmin-setTheme-color li:hover:after{width: 100%; height: 100%; padding: 4px; top: -5px; left: -5px; border-color: #16b777; opacity: 1;}
.layadmin-setTheme-header{position: relative; z-index: 10; height: 10px; border-top: 1px solid #f2f2f2; border-right: 1px solid #f2f2f2;}
.layadmin-setTheme-side{position: absolute; left: 0; top: 0; width: 20px; height: 100%; z-index: 11; box-shadow: 1px 0 2px 0 rgba(0,0,0,.05);}
.layadmin-setTheme-logo{position: absolute; left: 0; top: 0; width: 100%; height: 10px; box-shadow: 0 1px 2px 0 rgba(0,0,0,.15);}
.layadmin-form-right{text-align: right;}
/* 自定义配色 */
.layadmin-setTheme-custom > li{position: relative; height: 38px; line-height: 38px; padding-right: 55px; margin-bottom: 11px; box-sizing: border-box;}
.layadmin-setTheme-custom > li > div{position: absolute; top: 0; right: 0; box-sizing: border-box;}
.set-default-theme > .layui-btn{width: 38px; padding: 5px;}
.set-default-theme > .layui-btn > .layui-icon{display: block; line-height: 28px; background-color: #16baaa; font-size: 12px; border-radius: 2px; color: #fff;}
/* 关于 */
.layadmin-about p{margin-bottom: 10px;}
@@ -494,8 +500,8 @@ html{background-color: #f2f2f2; color: #5F5F5F;}
/* 提示页 */
.layadmin-tips{margin-top: 30px; text-align: center;}
.layadmin-tips .layui-icon[face]{display: inline-block; font-size: 300px; color: #393D49;}
.layadmin-tips .layui-text{width: 500px; margin: 30px auto; padding-top: 20px; border-top: 5px solid #009688; font-size: 16px;}
.layadmin-tips h1{font-size: 100px; line-height: 100px; color: #009688;}
.layadmin-tips .layui-text{width: 500px; margin: 30px auto; padding-top: 20px; border-top: 5px solid #16baaa; font-size: 16px;}
.layadmin-tips h1{font-size: 100px; line-height: 100px; color: #16baaa;}
.layadmin-tips .layui-text .layui-anim{display: inline-block;}

View File

@@ -3,53 +3,61 @@
*/
layui.define('view', function(exports){
var $ = layui.jquery
,laytpl = layui.laytpl
,element = layui.element
,table = layui.table
,upload = layui.upload
,setter = layui.setter
,view = layui.view
,device = layui.device()
var $ = layui.jquery;
var laytpl = layui.laytpl;
var table = layui.table;
var element = layui.element;
var util = layui.util;
var upload = layui.upload;
var form = layui.form;
var setter = layui.setter;
var view = layui.view;
var device = layui.device();
,$win = $(window), $body = $('body')
,container = $('#'+ setter.container)
var $win = $(window);
var $doc = $(document);
var $body = $('body');
var container = $('#'+ setter.container);
,SHOW = 'layui-show', HIDE = 'layui-hide', THIS = 'layui-this', DISABLED = 'layui-disabled', TEMP = 'template'
,APP_BODY = '#LAY_app_body', APP_FLEXIBLE = 'LAY_app_flexible'
,FILTER_TAB_TBAS = 'layadmin-layout-tabs'
,APP_SPREAD_SM = 'layadmin-side-spread-sm', TABS_BODY = 'layadmin-tabsbody-item'
,ICON_SHRINK = 'layui-icon-shrink-right', ICON_SPREAD = 'layui-icon-spread-left'
,SIDE_SHRINK = 'layadmin-side-shrink', SIDE_MENU = 'LAY-system-side-menu'
var SHOW = 'layui-show';
var HIDE = 'layui-hide';
var THIS = 'layui-this';
var DISABLED = 'layui-disabled';
var TEMP = 'template';
var APP_BODY = '#LAY_app_body';
var APP_FLEXIBLE = 'LAY_app_flexible';
var FILTER_TAB_TBAS = 'layadmin-layout-tabs';
var APP_SPREAD_SM = 'layadmin-side-spread-sm';
var TABS_BODY = 'layadmin-tabsbody-item';
var ICON_SHRINK = 'layui-icon-shrink-right';
var ICON_SPREAD = 'layui-icon-spread-left';
var SIDE_SHRINK = 'layadmin-side-shrink';
var SIDE_MENU = 'LAY-system-side-menu';
// 通用方法
,admin = {
v: '1.9.0'
,mode: 'spa'
var admin = {
v: '2.3.2',
mode: 'spa',
// 数据的异步请求
,req: view.req
req: view.req,
// 清除本地 token并跳转到登入页
,exit: view.exit
exit: view.exit,
//xss 转义
,escape: function(html){
return String(html || '').replace(/&(?!#?[a-zA-Z0-9]+;)/g, '&amp;')
.replace(/</g, '&lt;').replace(/>/g, '&gt;')
.replace(/'/g, '&#39;').replace(/"/g, '&quot;');
}
// HTML 转义
escape: util.escape,
// 事件
,on: function(events, callback){
on: function(events, callback){
return layui.onevent.call(this, setter.MOD_NAME, events, callback);
}
},
// 弹出面板
,popup: view.popup
popup: view.popup,
// 右侧面板
,popupRight: function(options){
popupRight: function(options){
// layer.close(admin.popup.index);
return admin.popup.index = layer.open($.extend({
type: 1
@@ -63,10 +71,10 @@ layui.define('view', function(exports){
,skin: 'layui-anim layui-anim-rl layui-layer-adminRight'
,area: '300px'
}, options));
}
},
// 发送验证码
,sendAuthCode: function(options){
sendAuthCode: function(options){
options = $.extend({
seconds: 60
,elemPhone: '#LAY_phone'
@@ -129,10 +137,10 @@ layui.define('view', function(exports){
}
}, options.ajax));
});
}
},
// 屏幕类型
,screen: function(){
screen: function(){
var width = $win.width();
if(width > 1200){
return 3; // 大屏幕
@@ -143,10 +151,10 @@ layui.define('view', function(exports){
} else {
return 0; // 超小屏幕
}
}
},
// 侧边伸缩
,sideFlexible: function(status){
sideFlexible: function(status){
var app = container
,iconElem = $('#'+ APP_FLEXIBLE)
,screen = admin.screen();
@@ -181,10 +189,10 @@ layui.define('view', function(exports){
layui.event.call(this, setter.MOD_NAME, 'side({*})', {
status: status
});
}
},
// 重置主体区域表格尺寸
,resizeTable: function(delay){
resizeTable: function(delay){
var that = this, runResizeTable = function(){
that.tabsBody(admin.tabsPage.index).find('.layui-table-view').each(function(){
var tableID = $(this).attr('lay-id');
@@ -193,15 +201,26 @@ layui.define('view', function(exports){
};
if(!layui.table) return;
delay ? setTimeout(runResizeTable, delay) : runResizeTable();
}
},
// 主题设置
,theme: function(options){
var theme = setter.theme
,local = layui.data(setter.tableName)
,id = 'LAY_layadmin_theme'
,style = document.createElement('style')
,styleText = laytpl([
theme: function(options){
var theme = setter.theme;
var local = layui.data(setter.tableName);
var id = 'LAY_layadmin_theme';
var styleElem = document.getElementById(id);
var style = document.createElement('style');
// 清除主题
if (options.CLEAR) {
$(styleElem).remove();
return layui.data(setter.tableName, {
key: 'theme',
remove: true
});
}
var styleText = laytpl([
// 主题色
'.layui-side-menu,'
,'.layui-layer-admin .layui-layer-title,'
@@ -237,8 +256,7 @@ layui.define('view', function(exports){
,'.layui-layout-admin .layui-header .layui-nav .layui-this:after, .layui-layout-admin .layui-header .layui-nav-bar{background-color: #fff; background-color: rgba(255,255,255,.5);}'
,'.layadmin-pagetabs .layui-tab-title li:after{display: none;}'
,'{{# } }}'
].join('')).render(options = $.extend({}, local.theme, options))
,styleElem = document.getElementById(id);
].join('')).render(options = $.extend({}, local.theme, options));
// 添加主题样式
if('styleSheet' in style){
@@ -250,8 +268,9 @@ layui.define('view', function(exports){
style.id = id;
styleElem && $body[0].removeChild(styleElem);
$body[0].appendChild(style);
$body.attr('layadmin-themealias', options.color.alias);
options.color && $body.attr('layadmin-themealias', options.color.alias);
// 本地存储记录
local.theme = local.theme || {};
@@ -262,10 +281,10 @@ layui.define('view', function(exports){
key: 'theme'
,value: local.theme
});
}
},
// 初始化主题
,initTheme: function(index){
initTheme: function(index){
var theme = setter.theme;
index = index || 0;
if(theme.color[index]){
@@ -274,30 +293,30 @@ layui.define('view', function(exports){
color: theme.color[index]
});
}
}
},
// 记录最近一次点击的页面标签数据
,tabsPage: {}
tabsPage: {},
// 获取标签页的头元素
,tabsHeader: function(index){
tabsHeader: function(index){
return $('#LAY_app_tabsheader').children('li').eq(index || 0);
}
},
// 获取页面标签主体元素
,tabsBody: function(index){
tabsBody: function(index){
return $(APP_BODY).find('.'+ TABS_BODY).eq(index || 0);
}
},
// 切换页面标签主体
,tabsBodyChange: function(index){
tabsBodyChange: function(index){
admin.tabsHeader(index).attr('lay-attr', layui.router().href);
admin.tabsBody(index).addClass(SHOW).siblings().removeClass(SHOW);
events.rollPage('auto', index);
}
},
// resize事件管理
,resize: function(fn){
resize: function(fn){
var router = layui.router()
,key = router.path.join('-');
@@ -310,35 +329,35 @@ layui.define('view', function(exports){
fn(), admin.resizeFn[key] = fn;
$win.on('resize', admin.resizeFn[key]);
}
,resizeFn: {}
,runResize: function(){
},
resizeFn: {},
runResize: function(){
var router = layui.router()
,key = router.path.join('-');
admin.resizeFn[key] && admin.resizeFn[key]();
}
,delResize: function(){
},
delResize: function(){
this.resize('off');
}
},
// 关闭当前 pageTabs
,closeThisTabs: function(){
closeThisTabs: function(){
if(!admin.tabsPage.index) return;
$(TABS_HEADER).eq(admin.tabsPage.index).find('.layui-tab-close').trigger('click');
}
},
// 全屏
,fullScreen: function(){
fullScreen: function(){
var ele = document.documentElement
,reqFullScreen = ele.requestFullScreen || ele.webkitRequestFullScreen
,reqFullScreen = ele.requestFullscreen || ele.webkitRequestFullScreen
|| ele.mozRequestFullScreen || ele.msRequestFullscreen;
if(typeof reqFullScreen !== 'undefined' && reqFullScreen) {
reqFullScreen.call(ele);
};
}
},
// 退出全屏
,exitScreen: function(){
exitScreen: function(){
var ele = document.documentElement
if (document.exitFullscreen) {
document.exitFullscreen();
@@ -349,10 +368,10 @@ layui.define('view', function(exports){
} else if (document.msExitFullscreen) {
document.msExitFullscreen();
}
}
},
// 纠正单页路由格式
,correctRouter: function(href){
correctRouter: function(href){
if(!/^\//.test(href)) href = '/' + href;
// 纠正首尾
@@ -453,18 +472,33 @@ layui.define('view', function(exports){
}
// 全屏
,fullscreen: function(othis){
var SCREEN_FULL = 'layui-icon-screen-full'
,SCREEN_REST = 'layui-icon-screen-restore'
,iconElem = othis.children("i");
,fullscreen: function(othis, opts){
var SCREEN_FULL = 'layui-icon-screen-full';
var SCREEN_REST = 'layui-icon-screen-restore';
var iconElem = othis.children("i");
var hasFull = iconElem.hasClass(SCREEN_FULL);
if(iconElem.hasClass(SCREEN_FULL)){
admin.fullScreen();
// 设置图标状态
var setIcon = function(status){
if(status){
iconElem.addClass(SCREEN_REST).removeClass(SCREEN_FULL);
} else {
admin.exitScreen();
iconElem.addClass(SCREEN_FULL).removeClass(SCREEN_REST);
}
};
// 设置全屏状态
var setScreen = function(status){
status ? admin.fullScreen() : admin.exitScreen();
};
// 仅设置图标状态
if(opts){
return setIcon(opts.status);
}
setIcon(hasFull);
setScreen(hasFull);
}
// 弹出关于面板
@@ -494,13 +528,15 @@ layui.define('view', function(exports){
// 主题设置
,setTheme: function(othis){
var index = othis.data('index')
,nextIndex = othis.siblings('.layui-this').data('index');
var index = othis.data('index');
var nextIndex = othis.siblings('.layui-this').data('index');
if(othis.hasClass(THIS)) return;
othis.addClass(THIS).siblings('.layui-this').removeClass(THIS);
admin.initTheme(index);
view('LAY_adminPopupTheme').render('system/theme');
}
// 左右滚动页面标签
@@ -614,16 +650,8 @@ layui.define('view', function(exports){
}
};
//初始
!function(){
//主题初始化,本地主题记录优先,其次为 initColorIndex
var local = layui.data(setter.tableName);
if(local.theme){
admin.theme(local.theme);
} else if(setter.theme){
admin.initTheme(setter.theme.initColorIndex);
}
// 初始结构
(function(){
// 禁止水平滚动
$body.addClass('layui-layout-body');
@@ -640,50 +668,63 @@ layui.define('view', function(exports){
// 低版本 IE 提示
if(device.ie && device.ie < 10){
view.error('IE'+ device.ie + '下访问可能不佳推荐使用Chrome / Firefox / Edge 等高级浏览器', {
offset: 'auto'
,id: 'LAY_errorIE'
offset: 'auto',
id: 'LAY_errorIE'
});
}
}();
})();
// 初始主题
(function(){
// 主题初始化,本地主题记录优先,其次为 initColorIndex
var local = layui.data(setter.tableName);
if(local.theme){
admin.theme(local.theme);
} else if(setter.theme){
admin.initTheme(setter.theme.initColorIndex);
}
})();
// admin.prevRouter = {}; // 上一个路由
// hash 改变侧边状态
admin.on('hash(side)', function(router){
var path = router.path, getData = function(item){
var path = router.path;
var getData = function(item){
return {
list: item.children('.layui-nav-child')
,name: item.data('name')
,jump: item.data('jump')
}
}
,sideMenu = $('#'+ SIDE_MENU)
,SIDE_NAV_ITEMD = 'layui-nav-itemed'
list: item.children('.layui-nav-child'),
name: item.data('name'),
jump: item.data('jump')
};
};
var sideMenu = $('#'+ SIDE_MENU);
var SIDE_NAV_ITEMD = 'layui-nav-itemed';
// 捕获对应菜单
,matchMenu = function(list){
var pathURL = admin.correctRouter(path.join('/'));
var matchMenu = function(list){
var pathURL = admin.correctRouter(router.href);
list.each(function(index1, item1){
var othis1 = $(item1)
,data1 = getData(othis1)
,listChildren1 = data1.list.children('dd')
,matched1 = path[0] == data1.name || (index1 === 0 && !path[0])
var othis1 = $(item1);
var data1 = getData(othis1);
var listChildren1 = data1.list.children('dd');
var matched1 = path[0] == data1.name || (index1 === 0 && !path[0])
|| (data1.jump && pathURL == admin.correctRouter(data1.jump));
listChildren1.each(function(index2, item2){
var othis2 = $(item2)
,data2 = getData(othis2)
,listChildren2 = data2.list.children('dd')
,matched2 = (path[0] == data1.name && path[1] == data2.name)
var othis2 = $(item2);
var data2 = getData(othis2);
var listChildren2 = data2.list.children('dd');
var matched2 = (path[0] == data1.name && path[1] == data2.name)
|| (data2.jump && pathURL == admin.correctRouter(data2.jump));
listChildren2.each(function(index3, item3){
var othis3 = $(item3)
,data3 = getData(othis3)
,matched3 = (path[0] == data1.name && path[1] == data2.name && path[2] == data3.name)
|| (data3.jump && pathURL == admin.correctRouter(data3.jump))
var othis3 = $(item3);
var data3 = getData(othis3);
var matched3 = (path[0] == data1.name && path[1] == data2.name && path[2] == data3.name)
|| (data3.jump && pathURL == admin.correctRouter(data3.jump));
// 匹配 3 级菜单
if(matched3){
var selected = data3.list[0] ? SIDE_NAV_ITEMD : THIS;
othis3.addClass(selected).siblings().removeClass(selected); // 标记选择器
@@ -692,6 +733,7 @@ layui.define('view', function(exports){
});
// 匹配 2 级菜单
if(matched2){
var selected = data2.list[0] ? SIDE_NAV_ITEMD : THIS;
othis2.addClass(selected).siblings().removeClass(selected); // 标记选择器
@@ -700,6 +742,7 @@ layui.define('view', function(exports){
});
// 匹配 1 级菜单
if(matched1){
var selected = data1.list[0] ? SIDE_NAV_ITEMD : THIS;
othis1.addClass(selected).siblings().removeClass(selected); // 标记选择器
@@ -707,7 +750,7 @@ layui.define('view', function(exports){
}
});
}
};
// 重置状态
sideMenu.find('.'+ THIS).removeClass(THIS);
@@ -737,9 +780,9 @@ layui.define('view', function(exports){
// 同步路由
var setThisRouter = function(othis){
var layid = othis.attr('lay-id')
,attr = othis.attr('lay-attr')
,index = othis.index();
var layid = othis.attr('lay-id');
var attr = othis.attr('lay-attr');
var index = othis.index();
location.hash = layid === setter.entry ? '/' : (attr || '/');
admin.tabsBodyChange(index);
@@ -779,8 +822,8 @@ layui.define('view', function(exports){
// 页面跳转
$body.on('click', '*[lay-href]', function(){
var othis = $(this)
,href = othis.attr('lay-href')
,router = layui.router();
var href = othis.attr('lay-href')
var router = layui.router();
admin.tabsPage.elem = othis;
// admin.prevRouter[router.path[0]] = router.href; // 记录上一次各菜单的路由信息
@@ -789,9 +832,11 @@ layui.define('view', function(exports){
location.hash = admin.correctRouter(href);
// 如果为当前页,则执行刷新
if(setter.refreshCurrPage){
if(admin.correctRouter(href) === router.href){
admin.events.refresh();
}
}
});
// 点击事件
@@ -840,9 +885,15 @@ layui.define('view', function(exports){
}
$win.on('resize', layui.data.resizeSystem);
// 全屏事件
$doc.on("fullscreenchange", function(){
events.fullscreen($('[layadmin-event="fullscreen"]'), {
status: document.fullscreenElement
});
});
// 设置组件全局 token
;!function(){
(function(){
var request = setter.request;
if(request.tokenName){
var obj = {};
@@ -859,7 +910,7 @@ layui.define('view', function(exports){
data: obj // 通过参数传递
});
}
}();
})();
// 接口输出

View File

@@ -21,6 +21,7 @@ layui.define(['all'], function (exports) {
entry: 'index', // 默认视图文件名
engine: '.html', // 视图文件后缀名
pageTabs: false, // 是否开启页面选项卡功能。单页版不推荐开启
refreshCurrPage: true, // 当跳转页面 url 与当前页 url 相同时,是否自动执行刷新
name: '核心商城系统',
version: 'CoreShopProfessional v0.7.3',

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -307,7 +307,7 @@ layui.define(function(exports){
,{field: 'complete', title: '完成情况'
,templet: function(d){
if(d.complete == '已完成'){
return '<del style="color: #5FB878;">'+ d.complete +'</del>'
return '<del style="color: #16b777;">'+ d.complete +'</del>'
}else if(d.complete == '进行中'){
return '<span style="color: #FFB800;">'+ d.complete +'</span>'
}else{

View File

@@ -7,7 +7,7 @@ layui.define(function(exports) {
exports('echartsTheme', {
// 默认色板
color: [
'#009688','#1E9FFF','#5FB878','#FFB980','#D87A80',
'#16baaa','#1E9FFF','#16b777','#FFB980','#D87A80',
'#8d98b3','#e5cf0d','#97b552','#95706d','#dc69aa',
'#07a2a4','#9a7fd1','#588dd5','#f5994e','#c05050',
'#59678c','#c9ab00','#7eb00a','#6f5553','#c14089'
@@ -24,7 +24,7 @@ layui.define(function(exports) {
// 值域
dataRange: {
itemWidth: 15,
color: ['#009688','#e0ffff']
color: ['#16baaa','#e0ffff']
},
// 工具箱
@@ -39,7 +39,7 @@ layui.define(function(exports) {
axisPointer : { // 坐标轴指示器,坐标轴触发有效
type : 'line', // 默认为直线,可选为:'line' | 'shadow'
lineStyle : { // 直线指示器样式设置
color: '#009688'
color: '#16baaa'
},
crossStyle: {
color: '#008acd'
@@ -66,7 +66,7 @@ layui.define(function(exports) {
categoryAxis: {
axisLine: { // 坐标轴线
lineStyle: { // 属性lineStyle控制线条样式
color: '#009688'
color: '#16baaa'
}
},
axisTick: { //小标记
@@ -83,7 +83,7 @@ layui.define(function(exports) {
valueAxis: {
axisLine: { // 坐标轴线
lineStyle: { // 属性lineStyle控制线条样式
color: '#009688'
color: '#16baaa'
}
},
splitArea : {
@@ -120,11 +120,11 @@ layui.define(function(exports) {
timeline : {
lineStyle : {
color : '#009688'
color : '#16baaa'
},
controlStyle : {
normal : { color : '#009688'},
emphasis : { color : '#009688'}
normal : { color : '#16baaa'},
emphasis : { color : '#16baaa'}
},
symbol : 'emptyCircle',
symbolSize : 3

View File

@@ -262,7 +262,7 @@ layui.define(function(exports){
,{field: 'complete', title: '完成情况'
,templet: function(d){
if(d.complete == '已完成'){
return '<del style="color: #5FB878;">'+ d.complete +'</del>'
return '<del style="color: #16b777;">'+ d.complete +'</del>'
}else if(d.complete == '进行中'){
return '<span style="color: #FFB800;">'+ d.complete +'</span>'
}else{