up: 5.3.0 发布

src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties

@@ -35,5 +35,5 @@ category.diy.url=\u81EA\u5B9A\u4E49\u94FE\u63A5
 content.keyword=\u5173\u952E\u5B57
 template.file=\u672A\u627E\u5230\u6A21\u677F\u6587\u4EF6
 category.pinyin=\u62FC\u97F3
-datetime.format=\u65f6\u95f4\u683c\u5f0f
+datetime.format=时间格式
 

src/main/webapp/WEB-INF/manager/cms/category/form.ftl

@@ -14,6 +14,7 @@
         <el-button size="mini" icon="iconfont icon-fanhui" plain onclick="javascript:history.go(-1)">返回</el-button>
     </el-header>
     <el-main class="ms-container">
+
         <el-scrollbar class="ms-scrollbar" style="height: 100%;">
             <el-form ref="form" :model="form" :rules="rules" label-width="130px" size="mini">
                 <el-row
@@ -310,10 +311,10 @@
                         "required": true,
                         "message": "请选择栏目管理名称"
                     }],
-                    // categoryListUrl: [{
-                    //     "required": true,
-                    //     "message": "请选择列表模板"
-                    // }],
+                    categoryListUrl: [{
+                        "required": true,
+                        "message": "请选择列表模板"
+                    }],
                     categoryPinyin:[{
                         validator: validatorCategoryPinyin, trigger: 'blur'
                     }, {
@@ -321,10 +322,10 @@
                         "message": "拼音格式不匹配"
                     }],
                     // 内容模板
-                    // categoryUrl: [{
-                    //     "required": true,
-                    //     "message": "请选择内容模板"
-                    // }]
+                    categoryUrl: [{
+                        "required": true,
+                       "message": "请选择内容模板"
+                     }]
                 }
             };
         },
@@ -543,14 +544,14 @@
             //获取categoryListUrl数据源
             categoryListUrlOptionsGet: function () {
                 var that = this;
-                ms.http.get(ms.manager + "/template/queryTemplateFileForColumn.do", {}).then(function (data) {
+                ms.http.get(ms.manager + "/basic/template/queryTemplateFileForColumn.do", {}).then(function (data) {
                     that.categoryListUrlOptions = data.data;
                 });
             },
             //获取categoryUrl数据源
             categoryUrlOptionsGet: function () {
                 var that = this;
-                ms.http.get(ms.manager + "/template/queryTemplateFileForColumn.do", {}).then(function (data) {
+                ms.http.get(ms.manager + "/basic/template/queryTemplateFileForColumn.do", {}).then(function (data) {
                     that.categoryUrlOptions = data.data;
                 });
             },

src/main/webapp/WEB-INF/manager/cms/generate/index.ftl

@@ -245,7 +245,7 @@
             //获取主题模板数据源
             templateOptionsGet: function () {
                 var that = this;
-                ms.http.get(ms.manager + '/template/queryTemplateFileForColumn.do', {
+                ms.http.get(ms.manager + '/basic/template/queryTemplateFileForColumn.do', {
                     pageSize: 99999
                 }).then(function (data) {
                     that.templateOptions = data.data; //寻找主页