From b3ffa311ed2b2d4e1f84a0405644fa7289099017 Mon Sep 17 00:00:00 2001
From: tianbj <1309855586@qq.com>
Date: Fri, 29 Nov 2019 09:57:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mingsoft/cms/action/CategoryAction.java | 6 +-
.../WEB-INF/manager/cms/category/form.ftl | 61 +++++++++++--------
.../WEB-INF/manager/cms/category/index.ftl | 26 +++++---
3 files changed, 54 insertions(+), 39 deletions(-)
diff --git a/src/main/java/net/mingsoft/cms/action/CategoryAction.java b/src/main/java/net/mingsoft/cms/action/CategoryAction.java
index fd32bead..2f355a65 100644
--- a/src/main/java/net/mingsoft/cms/action/CategoryAction.java
+++ b/src/main/java/net/mingsoft/cms/action/CategoryAction.java
@@ -253,13 +253,13 @@ public class CategoryAction extends BaseAction{
if(!StringUtil.checkLength(category.getCategoryTitle()+"", 1, 100)){
return ResultData.build().error(getResString("err.length", this.getResString("category.title"), "1", "100"));
}
- if(!StringUtil.checkLength(category.getCategoryFlag()+"", 1, 100)){
+ if(!StringUtil.checkLength(category.getCategoryFlag()+"", 0, 100)){
return ResultData.build().error(getResString("err.length", this.getResString("category.flag"), "1", "100"));
}
- if(!StringUtil.checkLength(category.getCategoryPath()+"", 1, 100)){
+ if(!StringUtil.checkLength(category.getCategoryPath()+"", 0, 100)){
return ResultData.build().error(getResString("err.length", this.getResString("category.path"), "1", "100"));
}
- if(!StringUtil.checkLength(category.getCategoryParentId()+"", 1, 100)){
+ if(!StringUtil.checkLength(category.getCategoryParentId()+"", 0, 100)){
return ResultData.build().error(getResString("err.length", this.getResString("category.parent.id"), "1", "100"));
}
categoryBiz.updateEntity(category);
diff --git a/src/main/webapp/WEB-INF/manager/cms/category/form.ftl b/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
index 81c2bedd..ed1e22a6 100644
--- a/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
@@ -62,30 +62,30 @@
gutter="0"
justify="start" align="top">
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
@@ -170,7 +170,7 @@
// 所属栏目
categoryId:'',
// 栏目管理属性
- categoryType:'2',
+ categoryType:'1',
// 自定义顺序
categorySort:0,
// 列表模板
@@ -222,6 +222,10 @@
}
this.$refs.form.validate((valid) => {
if (valid) {
+ //栏目属性为封面则不需要列表模板
+ if(that.form.categoryType == '2'){
+ that.form.categoryListUrl = '';
+ }
that.saveDisabled = true;
var data = JSON.parse(JSON.stringify(that.form));
if(data.id&&data.id==data.categoryId){
@@ -276,7 +280,7 @@
categoryListUrlOptionsGet() {
var that = this;
ms.http.get(ms.manager+"/template/queryTemplateFileForColumn.do", {}).then(function (data) {
- that.categoryListUrlOptions = data.rows;
+ that.categoryListUrlOptions = data;
}).catch(function (err) {
console.log(err);
});
@@ -285,7 +289,7 @@
categoryUrlOptionsGet() {
var that = this;
ms.http.get(ms.manager+"/template/queryTemplateFileForColumn.do", {}).then(function (data) {
- that.categoryUrlOptions = data.rows;
+ that.categoryUrlOptions = data;
}).catch(function (err) {
console.log(err);
});
@@ -327,4 +331,9 @@
}
}
});
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/manager/cms/category/index.ftl b/src/main/webapp/WEB-INF/manager/cms/category/index.ftl
index 1e279350..d90efb5b 100644
--- a/src/main/webapp/WEB-INF/manager/cms/category/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/category/index.ftl
@@ -30,19 +30,25 @@
{{emptyText}}
-
+
-
+
-
+
-
-
-
+
-
+
+
+ {{scope.row.categoryType == '1'?scope.row.categoryUrl:''}}
+
-
+
+
+ {{scope.row.categoryType == '2'?scope.row.categoryUrl:''}}
+
+
+
<@shiro.hasPermission name="cms:category:update">
编辑
@@ -101,7 +107,7 @@ var indexVue = new Vue({
var that = this;
this.loadState = false;
this.loading = true;
- ms.http.get(ms.manager+"/cms/category/list.do",that.form).then(
+ ms.http.get(ms.manager+"/cms/category/list.do").then(
function(res) {
if(that.loadState){
that.loading = false;
@@ -113,7 +119,7 @@ var indexVue = new Vue({
that.dataList = [];
} else {
that.emptyText = '';
- that.dataList = ms.util.treeData(res.data.rows,'id','mdiyModelId','children');
+ that.dataList = ms.util.treeData(res.data.rows,'id','categoryId','children');
}
}).catch(function(err) {
console.log(err);