diff --git a/doc/Code Formatters/js.xml b/doc/Code Formatters/js.xml
index 4574a6689..7db14d1a8 100644
--- a/doc/Code Formatters/js.xml
+++ b/doc/Code Formatters/js.xml
@@ -1,267 +1,268 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
diff --git "a/doc/PublicCMS V4.0 \346\250\241\346\235\277\345\210\266\344\275\234\346\211\213\345\206\214.doc" "b/doc/PublicCMS V4.0 \346\250\241\346\235\277\345\210\266\344\275\234\346\211\213\345\206\214.doc"
index 6d6e6bc03..d328d8cb4 100644
Binary files "a/doc/PublicCMS V4.0 \346\250\241\346\235\277\345\210\266\344\275\234\346\211\213\345\206\214.doc" and "b/doc/PublicCMS V4.0 \346\250\241\346\235\277\345\210\266\344\275\234\346\211\213\345\206\214.doc" differ
diff --git a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/logic/service/sys/SysDeptPageService.java b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/logic/service/sys/SysDeptPageService.java
index aec9b1bb5..fa51e5481 100644
--- a/publiccms-parent/publiccms-core/src/main/java/com/publiccms/logic/service/sys/SysDeptPageService.java
+++ b/publiccms-parent/publiccms-core/src/main/java/com/publiccms/logic/service/sys/SysDeptPageService.java
@@ -12,7 +12,6 @@
import com.publiccms.common.base.BaseService;
import com.publiccms.common.handler.PageHandler;
import com.publiccms.common.tools.CommonUtils;
-import com.publiccms.entities.sys.SysDeptCategory;
import com.publiccms.entities.sys.SysDeptPage;
import com.publiccms.entities.sys.SysDeptPageId;
import com.publiccms.logic.dao.sys.SysDeptPageDao;
@@ -69,9 +68,9 @@ public void updateDeptPages(Integer deptId, String[] pages) {
public void delete(Integer deptId, String page) {
if (CommonUtils.notEmpty(page) || CommonUtils.notEmpty(deptId)) {
@SuppressWarnings("unchecked")
- List list = (List) getPage(deptId, page, null, null).getList();
- for (SysDeptCategory deptCategory : list) {
- delete(deptCategory.getId());
+ List list = (List) getPage(deptId, page, null, null).getList();
+ for (SysDeptPage deptPage : list) {
+ delete(deptPage.getId());
}
}
}
diff --git a/publiccms-parent/publiccms/src/main/webapp/resource/js/dwz.min.js b/publiccms-parent/publiccms/src/main/webapp/resource/js/dwz.min.js
index 23795ea4a..44483a15c 100644
--- a/publiccms-parent/publiccms/src/main/webapp/resource/js/dwz.min.js
+++ b/publiccms-parent/publiccms/src/main/webapp/resource/js/dwz.min.js
@@ -3842,9 +3842,7 @@ function navTabAjaxDone(json) {
} else { // 重新载入当前navTab页面
var $pagerForm = $("#pagerForm", navTab.getCurrentPanel());
if(0==$pagerForm.length){
- $panel.loadUrl(url, {}, function() {
- navTab._loadUrlCallback($panel);
- });
+ navTabPageBreak({}, json.rel);
}else{
$pagerForm.submit();
}
@@ -3888,9 +3886,7 @@ function dialogAjaxDone(json) {
var $panel = navTab.getCurrentPanel();
var $pagerForm = $("#pagerForm", navTab.getCurrentPanel());
if(0==$pagerForm.length){
- $panel.loadUrl(url, {}, function() {
- navTab._loadUrlCallback($panel);
- });
+ navTabPageBreak({}, json.rel);
}else{
$pagerForm.submit();
}