Skip to content

C
cms_sys
Commit 4c21f276 authored by 铭飞's avatar 铭飞 Committed by Gitee
Browse files
Options

!222 添加注释,主页选中问题 

Merge pull request !222 from 灰色DT/master
parents 1e56e0f6 2d19a084
Hide whitespace changes
Inline Side-by-side
Showing with 272 additions and 302 deletions
pom.xml
View file @ 4c21f276
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent> <parent>
<groupId>net.mingsoft</groupId> <groupId>net.mingsoft</groupId>
<artifactId>ms-pom</artifactId> <artifactId>ms-pom</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
<relativePath/> <relativePath/>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>net.mingsoft</groupId> <groupId>net.mingsoft</groupId>
<artifactId>ms-mcms</artifactId> <artifactId>ms-mcms</artifactId>
<version>5.0.0</version> <version>5.0.0</version>
<name>${project.groupId}:${project.artifactId}</name> <name>${project.groupId}:${project.artifactId}</name>
<description>ms-mcms tools Library</description> <description>ms-mcms tools Library</description>
<url>https://github.com/ming-soft/ms-mcms</url> <url>https://github.com/ming-soft/ms-mcms</url>
<licenses> <licenses>
<license> <license>
<name>The MIT License (MIT)</name> <name>The MIT License (MIT)</name>
<url>http://mit-license.org</url> <url>http://mit-license.org</url>
</license> </license>
</licenses> </licenses>
<developers> <developers>
<developer> <developer>
<name>mingsoft develop group</name> <name>mingsoft develop group</name>
<email>service@mingsoft.net</email> <email>service@mingsoft.net</email>
<organization>mingsoft</organization> <organization>mingsoft</organization>
<organizationUrl>http://www.mingsoft.net</organizationUrl> <organizationUrl>http://www.mingsoft.net</organizationUrl>
</developer> </developer>
</developers> </developers>
<scm> <scm>
<connection>scm:git://github.com/ming-soft/ms-mcms.git</connection> <connection>scm:git://github.com/ming-soft/ms-mcms.git</connection>
<developerConnection>scm:git@github.com:ming-soft/ms-mcms.git</developerConnection> <developerConnection>scm:git@github.com:ming-soft/ms-mcms.git</developerConnection>
<url>https://github.com/ming-soft/ms-mcms</url> <url>https://github.com/ming-soft/ms-mcms</url>
</scm> </scm>
<distributionManagement> <distributionManagement>
<snapshotRepository> <snapshotRepository>
<id>sonatype-nexus-snapshots</id> <id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus snapshot repository</name> <name>Sonatype Nexus snapshot repository</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url> <url>https://oss.sonatype.org/content/repositories/snapshots</url>
</snapshotRepository> </snapshotRepository>
<repository> <repository>
<id>sonatype-nexus-staging</id> <id>sonatype-nexus-staging</id>
<name>Sonatype Nexus release repository</name> <name>Sonatype Nexus release repository</name>
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url> <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository> </repository>
</distributionManagement> </distributionManagement>
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties> </properties>
<dependencies> <dependencies>
<!-- 如果使用的是mysql8.0需要使用8.0的驱动 --> <!-- 如果使用的是mysql8.0需要使用8.0的驱动 -->
<!-- <dependency>--> <!-- <dependency>-->
<!-- <groupId>mysql</groupId>--> <!-- <groupId>mysql</groupId>-->
<!-- <artifactId>mysql-connector-java</artifactId>--> <!-- <artifactId>mysql-connector-java</artifactId>-->
<!-- <version>8.0.11</version>--> <!-- <version>8.0.11</version>-->
<!-- </dependency>--> <!-- </dependency>-->
<dependency> <dependency>
<groupId>net.mingsoft</groupId> <groupId>net.mingsoft</groupId>
<artifactId>ms-mpeople</artifactId> <artifactId>ms-mpeople</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.mingsoft</groupId> <groupId>net.mingsoft</groupId>
<artifactId>ms-upgrader</artifactId> <artifactId>ms-upgrader</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
<resources> <resources>
<resource> <resource>
<directory>src/main/java</directory> <directory>src/main/java</directory>
</resource> </resource>
<resource> <resource>
<directory>src/main/webapp</directory> <directory>src/main/webapp</directory>
<excludes> <excludes>
<exclude>html/</exclude> <exclude>html/</exclude>
<exclude>static/</exclude> <exclude>static/</exclude>
<exclude>upload/</exclude> <exclude>upload/</exclude>
<exclude>templets/</exclude> <exclude>templets/</exclude>
</excludes> </excludes>
</resource> </resource>
<resource> <resource>
<directory>src/main/resources</directory> <directory>src/main/resources</directory>
</resource> </resource>
</resources> </resources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<version>2.6</version> <version>2.6</version>
<executions> <executions>
<execution> <execution>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>jar</goal> <goal>jar</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
<configuration> <configuration>
<excludes> <excludes>
<!--注意这玩意从编译结果目录开始算目录结构 --> <!--注意这玩意从编译结果目录开始算目录结构 -->
<exclude>**/static/plugins/</exclude> <exclude>**/static/plugins/</exclude>
<exclude>**/static/skin/</exclude> <exclude>**/static/skin/</exclude>
<exclude>**/application*.yml</exclude> <exclude>**/Dockerfile</exclude>
<exclude>**/Dockerfile</exclude> <exclude>**/ehcache.xml</exclude>
<exclude>**/ehcache.xml</exclude> <exclude>**/upgrade/</exclude>
<exclude>**/upgrade/</exclude> <exclude>**/*.java</exclude>
<exclude>**/*.java</exclude> </excludes>
</excludes> </configuration>
</configuration> </plugin>
</plugin> <plugin>
<plugin> <groupId>org.apache.maven.plugins</groupId>
<groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId>
<artifactId>maven-source-plugin</artifactId> <version>2.2.1</version>
<version>2.2.1</version> <configuration>
<configuration> <excludes>
<excludes> <exclude>**/static/plugins/</exclude>
<exclude>**/static/plugins/</exclude> <exclude>**/static/skin/</exclude>
<exclude>**/static/skin/</exclude> <exclude>**/application*.yml</exclude>
<exclude>**/application*.yml</exclude> <exclude>**/Dockerfile</exclude>
<exclude>**/Dockerfile</exclude> <exclude>**/ehcache.xml</exclude>
<exclude>**/ehcache.xml</exclude> <exclude>**/upgrade/</exclude>
<exclude>**/upgrade/</exclude> <exclude>**/config/</exclude>
<exclude>**/config/</exclude> <exclude>**/MSApplication.java</exclude>
<exclude>**/MSApplication.java</exclude> <exclude>**/MSServletInitializer.java</exclude>
<exclude>**/MSServletInitializer.java</exclude> </excludes>
</excludes> </configuration>
</configuration> <executions>
<executions> <execution>
<execution> <id>attach-sources</id>
<id>attach-sources</id> <goals>
<goals> <goal>jar-no-fork</goal>
<goal>jar-no-fork</goal> </goals>
</goals> </execution>
</execution> </executions>
</executions> </plugin>
</plugin> <plugin>
<plugin> <groupId>org.springframework.boot</groupId>
<groupId>org.apache.maven.plugins</groupId> <artifactId>spring-boot-maven-plugin</artifactId>
<artifactId>maven-compiler-plugin</artifactId> </plugin>
<version>3.1</version> <plugin>
<configuration> <groupId>org.apache.maven.plugins</groupId>
<source>${java.version}</source> <artifactId>maven-compiler-plugin</artifactId>
<target>${java.version}</target> <version>3.1</version>
<encoding>${project.build.sourceEncoding}</encoding> <configuration>
<showDeprecation>true</showDeprecation> <source>${java.version}</source>
<showWarnings>true</showWarnings> <target>${java.version}</target>
<compilerArguments> <encoding>${project.build.sourceEncoding}</encoding>
<verbose /> </configuration>
<bootclasspath>${java.home}/lib/rt.jar:${java.home}/lib/jce.jar</bootclasspath> </plugin>
</compilerArguments> <plugin>
<compilerArgument>-Xlint:unchecked</compilerArgument> <groupId>org.apache.maven.plugins</groupId>
</configuration> <artifactId>maven-eclipse-plugin</artifactId>
<dependencies> <version>2.8</version>
<dependency> <configuration>
<groupId>org.codehaus.plexus</groupId> <additionalConfig>
<artifactId>plexus-compiler-eclipse</artifactId> <file>
<version>2.1</version> <name>.settings/org.eclipse.core.resources.prefs</name>
</dependency> <content>
</dependencies> <![CDATA[
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<version>2.8</version>
<configuration>
<additionalConfig>
<file>
<name>.settings/org.eclipse.core.resources.prefs</name>
<content>
<![CDATA[
eclipse.preferences.version=1 eclipse.preferences.version=1
encoding/<project>=${project.build.sourceEncoding} encoding/<project>=${project.build.sourceEncoding}
]]> ]]>
</content> </content>
</file> </file>
</additionalConfig> </additionalConfig>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<argLine>-Xmx256m</argLine> <argLine>-Xmx256m</argLine>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>com.atlassian.maven.plugins</groupId> <groupId>com.atlassian.maven.plugins</groupId>
<artifactId>maven-clover2-plugin</artifactId> <artifactId>maven-clover2-plugin</artifactId>
<version>2.6.3</version> <version>2.6.3</version>
<configuration> <configuration>
<licenseLocation>${clover.license.file}</licenseLocation> <licenseLocation>${clover.license.file}</licenseLocation>
<encoding>${project.build.sourceEncoding}</encoding> <encoding>${project.build.sourceEncoding}</encoding>
<generateXml>true</generateXml> <generateXml>true</generateXml>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId> <artifactId>findbugs-maven-plugin</artifactId>
<version>1.2</version> <version>1.2</version>
<configuration> <configuration>
<findbugsXmlOutput>true</findbugsXmlOutput> <findbugsXmlOutput>true</findbugsXmlOutput>
<findbugsXmlWithMessages>true</findbugsXmlWithMessages> <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
<xmlOutput>true</xmlOutput> <xmlOutput>true</xmlOutput>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version> <version>2.9.1</version>
<configuration> <configuration>
<charset>UTF-8</charset> <charset>UTF-8</charset>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
<docencoding>UTF-8</docencoding> <docencoding>UTF-8</docencoding>
<javadocExecutable>${java.home}/../bin/javadoc</javadocExecutable> <javadocExecutable>${java.home}/../bin/javadoc</javadocExecutable>
<additionalparam>-Xdoclint:none</additionalparam> <additionalparam>-Xdoclint:none</additionalparam>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<id>attach-javadocs</id> <id>attach-javadocs</id>
<goals> <goals>
<goal>jar</goal> <goal>jar</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>2.6</version> <version>2.6</version>
<configuration> <configuration>
<webResources> <webResources>
<resource> <resource>
<directory>src/main/webapp/WEB-INF</directory> <directory>src/main/webapp/WEB-INF</directory>
<targetPath>WEB-INF</targetPath> <targetPath>WEB-INF</targetPath>
<filtering>true</filtering> <filtering>true</filtering>
<includes> <includes>
<include>**/*.xml</include> <include>**/*.xml</include>
</includes> </includes>
<excludes> <excludes>
<exclude>web.xml</exclude> <exclude>web.xml</exclude>
</excludes> </excludes>
</resource> </resource>
</webResources> </webResources>
<attachClasses>true</attachClasses> <attachClasses>true</attachClasses>
<warSourceExcludes> */web.xml,static</warSourceExcludes> <warSourceExcludes>*/web.xml,static</warSourceExcludes>
<failOnMissingWebXml>false</failOnMissingWebXml> <failOnMissingWebXml>false</failOnMissingWebXml>
<packagingExcludes>ms.install,html/,static/,temp,upgrader,WEB-INF/web.xml,WEB-INF/lib/,templets/,upload/,WEB-INF/classes/*.xml,WEB-INF/classes/*.properties,*.sh,WEB-INF/classes/net/mingsoft/config/,WEB-INF/classes/net/mingsoft/*.class</packagingExcludes> <packagingExcludes>
</configuration> ms.install,html/,static/,temp,upgrader,WEB-INF/web.xml,WEB-INF/lib/,templets/,upload/,WEB-INF/classes/*.xml,WEB-INF/classes/*.properties,*.sh,WEB-INF/classes/net/mingsoft/config/,WEB-INF/classes/net/mingsoft/*.class
</plugin> </packagingExcludes>
<plugin> </configuration>
<groupId>org.apache.maven.plugins</groupId> </plugin>
<artifactId>maven-release-plugin</artifactId> <plugin>
<configuration> <groupId>org.apache.maven.plugins</groupId>
<arguments>-Dgpg.passphrase=${gpg.passphrase}</arguments> <artifactId>maven-release-plugin</artifactId>
</configuration> <configuration>
</plugin> <arguments>-Dgpg.passphrase=${gpg.passphrase}</arguments>
<plugin> </configuration>
<groupId>org.sonatype.plugins</groupId> </plugin>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.7</version>
<extensions>true</extensions>
<configuration>
<serverId>sonatype-nexus-staging</serverId>
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
<defaultGoal>compile</defaultGoal>
<finalName>ms-mcms</finalName> </plugins>
</build> <defaultGoal>compile</defaultGoal>
</project>
\ No newline at end of file <finalName>ms-mcms</finalName>
</build>
</project>
src/main/java/net/mingsoft/cms/action/GeneraterAction.java
View file @ 4c21f276
...@@ -24,7 +24,6 @@ package net.mingsoft.cms.action; ...@@ -24,7 +24,6 @@ package net.mingsoft.cms.action;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions; import cn.hutool.core.bean.copier.CopyOptions;
import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.FileUtil;
import net.mingsoft.basic.action.BaseAction;
import net.mingsoft.basic.biz.IModelBiz; import net.mingsoft.basic.biz.IModelBiz;
import net.mingsoft.basic.entity.AppEntity; import net.mingsoft.basic.entity.AppEntity;
import net.mingsoft.basic.util.BasicUtil; import net.mingsoft.basic.util.BasicUtil;
...@@ -52,12 +51,12 @@ import java.util.ArrayList; ...@@ -52,12 +51,12 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
* *
* @ClassName: GeneraterAction * @ClassName: GeneraterAction
* @Description:TODO 生成器 * @Description:TODO 生成器
* @author: 铭飞开发团队 * @author: 铭飞开发团队
* @date: 2018年1月31日 下午2:52:07 * @date: 2018年1月31日 下午2:52:07
* *
* @Copyright: 2018 www.mingsoft.net Inc. All rights reserved. * @Copyright: 2018 www.mingsoft.net Inc. All rights reserved.
*/ */
@Controller("cmsGenerater") @Controller("cmsGenerater")
...@@ -92,7 +91,7 @@ public class GeneraterAction extends BaseAction { ...@@ -92,7 +91,7 @@ public class GeneraterAction extends BaseAction {
/** /**
* 更新主页 * 更新主页
* *
* @return * @return
*/ */
@RequestMapping("/index") @RequestMapping("/index")
...@@ -102,7 +101,7 @@ public class GeneraterAction extends BaseAction { ...@@ -102,7 +101,7 @@ public class GeneraterAction extends BaseAction {
/** /**
* 生成主页 * 生成主页
* *
* @param request * @param request
* @param response * @param response
*/ */
...@@ -114,7 +113,7 @@ public class GeneraterAction extends BaseAction { ...@@ -114,7 +113,7 @@ public class GeneraterAction extends BaseAction {
String tmpFileName = request.getParameter("url"); String tmpFileName = request.getParameter("url");
// 生成后的文件名称 // 生成后的文件名称
String generateFileName = request.getParameter("position"); String generateFileName = request.getParameter("position");
// 获取文件所在路径 首先判断用户输入的模版文件是否存在 // 获取文件所在路径 首先判断用户输入的模版文件是否存在
if (!FileUtil.exist(ParserUtil.buildTempletPath())) { if (!FileUtil.exist(ParserUtil.buildTempletPath())) {
this.outJson(response, false, getResString("templet.file")); this.outJson(response, false, getResString("templet.file"));
...@@ -128,12 +127,12 @@ public class GeneraterAction extends BaseAction { ...@@ -128,12 +127,12 @@ public class GeneraterAction extends BaseAction {
} }
} }
} }
/** /**
* 生成列表的静态页面 * 生成列表的静态页面
* *
* @param request * @param request
* @param response * @param response
* @param CategoryId * @param CategoryId
...@@ -194,7 +193,7 @@ public class GeneraterAction extends BaseAction { ...@@ -194,7 +193,7 @@ public class GeneraterAction extends BaseAction {
/** /**
* 根据栏目id更新所有的文章 * 根据栏目id更新所有的文章
* *
* @param request * @param request
* @param response * @param response
* @param columnId * @param columnId
...@@ -219,12 +218,12 @@ public class GeneraterAction extends BaseAction { ...@@ -219,12 +218,12 @@ public class GeneraterAction extends BaseAction {
this.outJson(response, false); this.outJson(response, false);
} }
} }
/** /**
* 用户预览主页 * 用户预览主页
* *
* @param request * @param request
* @return * @return
*/ */
...@@ -236,4 +235,4 @@ public class GeneraterAction extends BaseAction { ...@@ -236,4 +235,4 @@ public class GeneraterAction extends BaseAction {
+ File.separator + position + ParserUtil.HTML_SUFFIX; + File.separator + position + ParserUtil.HTML_SUFFIX;
return "redirect:" + indexPosition; return "redirect:" + indexPosition;
} }
} }
\ No newline at end of file
src/main/java/net/mingsoft/cms/dao/ICategoryDao.xml
View file @ 4c21f276
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
and and
( (
<if test="categoryParentId != null and categoryParentId!=''"> <if test="categoryParentId != null and categoryParentId!=''">
CATEGORY_PARENT_ID like '%${categoryParentId}%' find_in_set(#{categoryParentId},CATEGORY_PARENT_ID)
</if> </if>
<if test="categoryParentId == null or categoryParentId ==''"> <if test="categoryParentId == null or categoryParentId ==''">
<include refid="queryWhereCategoryId"></include> <include refid="queryWhereCategoryId"></include>
...@@ -237,4 +237,4 @@ ...@@ -237,4 +237,4 @@
order by id desc order by id desc
</select> </select>
</mapper> </mapper>
\ No newline at end of file
src/main/java/net/mingsoft/cms/resources/resources.properties
View file @ 4c21f276
...@@ -33,3 +33,4 @@ category.id=\u6240\u5C5E\u680F\u76EE ...@@ -33,3 +33,4 @@ category.id=\u6240\u5C5E\u680F\u76EE
content.sort=\u81EA\u5B9A\u4E49\u987A\u5E8F content.sort=\u81EA\u5B9A\u4E49\u987A\u5E8F
category.diy.url=\u81EA\u5B9A\u4E49\u94FE\u63A5 category.diy.url=\u81EA\u5B9A\u4E49\u94FE\u63A5
content.keyword=\u5173\u952E\u5B57 content.keyword=\u5173\u952E\u5B57
templet.file=\u672A\u627E\u5230\u6A21\u677F\u6587\u4EF6
src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties
View file @ 4c21f276
...@@ -33,3 +33,4 @@ category.id=\u6240\u5C5E\u680F\u76EE ...@@ -33,3 +33,4 @@ category.id=\u6240\u5C5E\u680F\u76EE
content.sort=\u81EA\u5B9A\u4E49\u987A\u5E8F content.sort=\u81EA\u5B9A\u4E49\u987A\u5E8F
category.diy.url=\u81EA\u5B9A\u4E49\u94FE\u63A5 category.diy.url=\u81EA\u5B9A\u4E49\u94FE\u63A5
content.keyword=\u5173\u952E\u5B57 content.keyword=\u5173\u952E\u5B57
templet.file=\u672A\u627E\u5230\u6A21\u677F\u6587\u4EF6
src/main/webapp/WEB-INF/manager/cms/generate/index.ftl
View file @ 4c21f276
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
homeLoading:false, homeLoading:false,
articleLoading:false, articleLoading:false,
columnLoading:false, columnLoading:false,
template:'index.htm',//主题模板 template:'',//主题模板
templateOptions:[], templateOptions:[],
position:'index', //位置 position:'index', //位置
contentSection:'0', //文章栏目 contentSection:'0', //文章栏目
...@@ -205,6 +205,12 @@ ...@@ -205,6 +205,12 @@
var that = this; var that = this;
ms.http.get(ms.manager+'/template/queryTemplateFileForColumn.do', {pageSize:99999}).then(function (data) { ms.http.get(ms.manager+'/template/queryTemplateFileForColumn.do', {pageSize:99999}).then(function (data) {
that.templateOptions = data.data; that.templateOptions = data.data;
//寻找主页
var template = that.templateOptions.find(function (x) {
return x.indexOf("index")!=-1||x.indexOf("default")!=-1;
})
//没有就找其他的
that.template = template||(that.templateOptions.length>0?that.templateOptions[0]:"");
}).catch(function (err) { }).catch(function (err) {
console.log(err); console.log(err);
}); });
...@@ -702,4 +708,4 @@ ...@@ -702,4 +708,4 @@
.el-date-editor{ .el-date-editor{
width: 100%; width: 100%;
} }
</style> </style>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment