From 0bb7660f1685b14406f00e6ee3885a9989a34601 Mon Sep 17 00:00:00 2001 From: vip Date: Thu, 13 Aug 2020 09:14:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=9C=AA=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=92=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/net/mingsoft/cms/util/CmsParserUtil.java | 4 ++-- .../webapp/static/plugins/ueditor/1.4.3.1/ueditor.all.min.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java b/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java index 2df51de7..8029c6fd 100644 --- a/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java +++ b/src/main/java/net/mingsoft/cms/util/CmsParserUtil.java @@ -102,10 +102,10 @@ public class CmsParserUtil extends ParserUtil { if(ParserUtil.IS_SINGLE) { parserParams.put(ParserUtil.URL, BasicUtil.getUrl()); } - int totalPageSize = PageUtil.totalPage(articleIdTotal, page.getSize()); - page.setTotal(totalPageSize); parserParams.put(ParserUtil.PAGE, page); ParserUtil.read(File.separator + column.getCategoryListUrl(),parserParams, page); + int totalPageSize = PageUtil.totalPage(articleIdTotal, page.getSize()); + page.setTotal(totalPageSize); //文章列表页没有写文章列表标签，总数为0 if (totalPageSize <= 0) { // 数据库中第一页是从开始0*size diff --git a/src/main/webapp/static/plugins/ueditor/1.4.3.1/ueditor.all.min.js b/src/main/webapp/static/plugins/ueditor/1.4.3.1/ueditor.all.min.js index 5833d0a1..56d6e65c 100644 --- a/src/main/webapp/static/plugins/ueditor/1.4.3.1/ueditor.all.min.js +++ b/src/main/webapp/static/plugins/ueditor/1.4.3.1/ueditor.all.min.js @@ -354,7 +354,7 @@ this;clearTimeout(g);l||b.queryCommandState&&(!b.queryCommandState||1==b.queryCo f.getComputedStyle(q,"left");q.style.width=q.offsetWidth+"px";q.style.zIndex=1*a.options.zIndex+1;q.parentNode.insertBefore(n,q);l||k&&r.ie?("absolute"!=q.style.position&&(q.style.position="absolute"),q.style.top=(document.body.scrollTop||document.documentElement.scrollTop)-u+h+"px"):(r.ie7Compat&&z&&(z=!1,q.style.left=f.getXY(q).x-document.documentElement.getBoundingClientRect().left+2+"px"),"fixed"!=q.style.position&&(q.style.position="fixed",q.style.top=h+"px",("absolute"==e||"relative"==e)&&parseFloat(g)&& (q.style.left=c.x+"px")))}else b()}var a=this,e=a.getLang();a.setOpt({topOffset:0});var h=a.options.topOffset;if(!1!==a.options.autoFloatEnabled){var g=UE.ui.uiUtils,l=r.ie&&6>=r.version,k=r.quirks,m,n=document.createElement("div"),q,u,x,z=!0,v=p.defer(function(){c()},r.ie?200:100,!0);a.addListener("destroy",function(){f.un(window,["scroll","resize"],c);a.removeListener("keydown",v)});a.addListener("ready",function(){var h;UE.ui?h=1:(alert(e.autofloatMsg),h=0);h&&a.ui&&(x=g.getClientRect,q=a.ui.getDom("toolbarbox"), u=x(q).top,m=q.style.cssText,n.style.height=q.offsetHeight+"px",l&&d(),f.on(window,["scroll","resize"],c),a.addListener("keydown",v),a.addListener("beforefullscreenchange",function(a,c){c&&b()}),a.addListener("fullscreenchanged",function(a,b){b||c()}),a.addListener("sourcemodechanged",function(a,b){setTimeout(function(){c()},0)}),a.addListener("clearDoc",function(){setTimeout(function(){c()},0)}))})}};UE.plugins.video=function(){function d(a,b,d,g,f,k,m){var n;switch(m){case "image":n="';break;case "embed":n='';break;case "embed":n='';break;case "video":m=a.substr(a.lastIndexOf(".")+1),"ogv"==m&&(m="ogg"),n="'}return n}function b(a,b){p.each(a.getNodesByTagName(b? "img":"embed video"),function(a){var c=a.getAttr("class");if(c&&-1!=c.indexOf("edui-faked-video")){var f=d(b?a.getAttr("_url"):a.getAttr("src"),a.getAttr("width"),a.getAttr("height"),null,a.getStyle("float")||"",c,b?"embed":"image");a.parentNode.replaceChild(UE.uNode.createElement(f),a)}c&&-1!=c.indexOf("edui-upload-video")&&(f=d(b?a.getAttr("_url"):a.getAttr("src"),a.getAttr("width"),a.getAttr("height"),null,a.getStyle("float")||"",c,b?"video":"image"),a.parentNode.replaceChild(UE.uNode.createElement(f), a))})}var c=this;c.addOutputRule(function(a){b(a,!0)});c.addInputRule(function(a){b(a)});c.commands.insertvideo={execCommand:function(a,b,h){b=p.isArray(b)?b:[b];var g=[],l;a=0;for(var k,m=b.length;a