From 7302b926f1528425cca501f4c1c6c6cba799b179 Mon Sep 17 00:00:00 2001 From: mingsoft Date: Thu, 29 Jun 2023 12:02:29 +0800 Subject: [PATCH] up: 5.3.2 --- .../WEB-INF/manager/cms/category/form.ftl | 230 ++++++++++++------ 1 file changed, 154 insertions(+), 76 deletions(-) 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 5c883476..d30f90f6 100644 --- a/src/main/webapp/WEB-INF/manager/cms/category/form.ftl +++ b/src/main/webapp/WEB-INF/manager/cms/category/form.ftl @@ -41,9 +41,9 @@ + :props="{value: 'id',label: 'categoryTitle',children: 'children'}" + :options="treeList" :style="{width:'100%'}" + v-model="form.categoryId">
不能将父级别栏目移动到自身子级栏目
@@ -67,6 +67,20 @@ + + + + + + + + + + + + + + +
+ 文章字段不满足，使用代码生成器生成自定义模型来扩展，
+ 大概步骤：代码生成器->复制自定义模型->打开系统后台的自定义管理->选择自定义模型->导入->文章 自定义模型 绑定 +
+ + - - - - + + + + + {{true? item.label : item.value}} + +
- 文章字段不满足，使用代码生成器生成自定义模型来扩展，
- 大概步骤：代码生成器->复制自定义模型->打开系统后台的自定义管理->选择自定义模型->导入->文章 自定义模型 绑定 + 选择否后不需重新生成，该栏目下的文章将不会被搜索页搜索；若该栏目选择不可被搜索，则所有子栏目也会不可被搜索；
- @@ -146,6 +177,21 @@ + + + + +
+ 可以在自定义字典中管理 +
+ - - - - - - - - - - - - - - -
- 可以在自定义字典中管理 -
- - + - @@ -289,6 +305,7 @@ :disabled="false" :data="{uploadPath:'/cms/category','isRename':true,'appId':true}" :on-success="categoryIcoSuccess" + :on-error="categoryImgError" accept="image/*" list-type="picture-card"> @@ -315,7 +332,7 @@ var that = this //验证拼音是否存在 var validatorCategoryPinyin = function (rule, value, callback) { - // + // ms.http.get(ms.manager+'/cms/category/verifyPingYin.do',{ id:that.form.id, categoryPinyin:that.form.categoryPinyin, @@ -351,6 +368,14 @@ "value": "disable", "label": "否" }], + // 栏目是否被搜索 + categoryIsSearchOptions: [{ + "value": "enable", + "label": "是" + }, { + "value": "disable", + "label": "否" + }], //表单数据 form: { // 栏目管理名称 @@ -373,6 +398,8 @@ categoryKeyword: '', // 栏目是否显示 categoryDisplay: 'enable', + // 栏目是否被搜索 + categoryIsSearch: 'enable', // 栏目管理描述 categoryDescrip: '', // banner图 @@ -401,7 +428,6 @@ categoryListUrlOptions: [], categoryUrlOptions: [], mdiyModelListOptions: [], - mdiyCategoryModelListOptions: [], categoryFlagOptions: [], rules: { // 栏目管理名称 @@ -409,10 +435,14 @@ "required": true, "message": "请选择栏目管理名称" }], - categoryListUrl: [{ + categoryIsSearch: [{ "required": true, - "message": "请选择列表模板" + "message": "请选择栏目是否可被搜索" }], + // categoryListUrl: [{ + // "required": true, + // "message": "请选择列表模板" + // }], categoryPinyin: [{ validator: validatorCategoryPinyin, trigger: 'blur' }, { @@ -420,10 +450,10 @@ "message": "拼音格式不匹配" }], // 内容模板 - categoryUrl: [{ - "required": true, - "message": "请选择内容模板" - }] + // categoryUrl: [{ + // "required": true, + // "message": "请选择内容模板" + // }] } }; }, @@ -495,9 +525,7 @@ }, getTree: function () { var that = this; - ms.http.get(ms.manager + "/cms/category/list.do", { - pageSize: 9999 - }).then(function (res) { + ms.http.get(ms.manager + "/cms/category/list.do").then(function (res) { if (res.result) { //res.data.rows.push({id:0,categoryId: null,categoryTitle:'顶级栏目管理'}); that.categoryList = res.data.rows; @@ -508,6 +536,14 @@ save: function () { var that = this; + var model = undefined; + if (that.form.mdiyCategoryModelId && String(that.form.mdiyCategoryModelId)!="0"){ + model = ms.mdiy.model.modelForm(); + } + if (model && !model.validate()) { + this.activeName = 'custom-name'; + return; + } var url = ms.manager + "/cms/category/save.do"; @@ -558,6 +594,11 @@ data.categoryIco = JSON.stringify(data.categoryIco); ms.http.post(url, data).then(function (data) { if (data.result) { + //保存时需要赋值关联ID + if (model) { + model.form.linkId = data.data.id; + model.save(); + } that.$notify({ title: '成功', @@ -594,16 +635,18 @@ } }); }, - //获取栏目内容模型 - queryCategoryModelList: function () { + + //设置栏目模型 + setCategoryModel: function (mdiyCategoryModelId) { var that = this; - ms.http.get(ms.manager + "/mdiy/model/list.do", { - modelType: 'category' - }).then(function (res) { - if (res.result) { - that.mdiyCategoryModelListOptions = res.data.rows; + if (mdiyCategoryModelId) { + mdiyCategoryModelId += ""; + if (mdiyCategoryModelId == "0") { + mdiyCategoryModelId = null; } - }); + that.form.mdiyCategoryModelId = mdiyCategoryModelId; + } + that.changeModel(); }, //获取当前分类 @@ -637,11 +680,20 @@ if (!res.data.categoryId) { res.data.categoryId = '0'; } + var mdiyCategoryModelId = res.data.mdiyCategoryModelId; + if (mdiyCategoryModelId) { + mdiyCategoryModelId += ""; + if (mdiyCategoryModelId == "0") { + mdiyCategoryModelId = null; + } + res.data.mdiyCategoryModelId = mdiyCategoryModelId; + } that.form = res.data; //判断该分类是否存在文章，存在则不能修改栏目属性 that.contentList(that.form.id); + that.changeModel(); } }); }, @@ -758,23 +810,46 @@ this.form.categoryIco.splice(index, 1); } }, - removeModel: function () { + //categoryImg文件上传失败回调 + categoryImgError: function (response, file, fileList) { + response = response.toString().replace("Error: ","") + response = JSON.parse(response); + this.$notify({ + title: '失败', + message: response.msg, + type: 'warning' + }); + }, + categoryChange: function () { + this.changeModel(); + }, + changeModel: function () { var that = this; - var model = document.getElementById('model1'); - var custom = document.getElementById('c_model'); + that.editableTabs = [that.editableTabs[0]]; - if (custom) { - model.removeChild(custom); + if (that.form) { + if (that.form.mdiyCategoryModelId) { + that.rederModel(that.form.mdiyCategoryModelId) + } } - - that.model = undefined; }, - + rederModel: function (modelId) { + var that = this; + that.editableTabs.push({ + title: '加载中...', + name: 'custom-name' + }); + this.$nextTick(function () { + ms.mdiy.model.extend("model1", {id:modelId},{ linkId: that.form.id },true).then(function(obj) { + that.model = obj; + that.editableTabs[1].title = obj.modelName + }); + }); + }, }, created: function () { this.queryColumnContentModelList(); - this.queryCategoryModelList(); this.getTree(); this.categoryListUrlOptionsGet(); this.categoryUrlOptionsGet(); @@ -801,3 +876,6 @@ width: 100%; } + + +