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

CoreCms.Net.Web.Admin/CoreCms.Net.Web.Admin.csproj

@@ -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" />

CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/adminui/dist/modules/index.js

@@ -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)});

CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/adminui/dist/modules/view.js

@@ -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)});

CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/adminui/src/css/admin.css

@@ -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;}
 
 

CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/config.js

@@ -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',

CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/modules/console.js

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

CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/modules/echartsTheme.js

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

CoreCms.Net.Web.Admin/wwwroot/lib/layuiAdmin/modules/sample.js

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