From 1d7e5413d66bda34151ad3a6318fdbbcb18174c7 Mon Sep 17 00:00:00 2001
From: tianbj <1309855586@qq.com>
Date: Fri, 27 Dec 2019 15:56:21 +0800
Subject: [PATCH] bug

---
 doc/5.0/cms-content图片转化.sql           |  5 +++
 doc/5.0/cms-content转化.sql                 | 39 +++++++++++++++++
 doc/5.0/cms_category转化.sql                | 43 +++++++++++++++++++
 .../WEB-INF/manager/cms/category/index.ftl    |  4 +-
 .../WEB-INF/manager/cms/content/index.ftl     |  8 +++-
 5 files changed, 96 insertions(+), 3 deletions(-)
 create mode 100644 doc/5.0/cms-content图片转化.sql
 create mode 100644 doc/5.0/cms-content转化.sql
 create mode 100644 doc/5.0/cms_category转化.sql

diff --git a/doc/5.0/cms-content图片转化.sql b/doc/5.0/cms-content图片转化.sql
new file mode 100644
index 00000000..ba727c68
--- /dev/null
+++ b/doc/5.0/cms-content图片转化.sql
@@ -0,0 +1,5 @@
+UPDATE cms_content
+SET content_img = concat( '[{"path":"', content_img, '"}]' )
+WHERE
+	content_img IS NOT NULL
+	AND trim( content_img ) != ''
\ No newline at end of file
diff --git a/doc/5.0/cms-content转化.sql b/doc/5.0/cms-content转化.sql
new file mode 100644
index 00000000..d4cae3a7
--- /dev/null
+++ b/doc/5.0/cms-content转化.sql
@@ -0,0 +1,39 @@
+INSERT INTO cms_content (
+cms_content.id,
+cms_content.app_id,
+cms_content.content_url,
+cms_content.content_details,
+cms_content.content_keyword,
+cms_content.content_description,
+cms_content.content_img,
+cms_content.content_sort,
+cms_content.content_datetime,
+cms_content.content_source,
+cms_content.content_author,
+cms_content.content_display,
+cms_content.content_type,
+cms_content.content_category_id,
+cms_content.content_title,
+cms_content.content_hit
+
+)
+SELECT
+basic.basic_id,
+cms_article.article_webid,
+cms_article.article_url,
+cms_article.article_content,
+cms_article.article_keyword,
+basic.basic_description,
+basic.basic_thumbnails,
+basic.basic_sort,
+basic.basic_datetime,
+cms_article.article_source,
+cms_article.article_author,
+basic.basic_display,
+cms_article.article_type,
+basic.basic_categoryid,
+basic.basic_title,
+basic.basic_hit
+FROM
+basic
+INNER JOIN cms_article ON cms_article.article_basicid = basic.basic_id
diff --git a/doc/5.0/cms_category转化.sql b/doc/5.0/cms_category转化.sql
new file mode 100644
index 00000000..8a3f2a66
--- /dev/null
+++ b/doc/5.0/cms_category转化.sql
@@ -0,0 +1,43 @@
+INSERT INTO cms_category (
+	cms_category.id,
+	cms_category.category_title,
+	cms_category.category_sort,
+	cms_category.category_parent_id,
+	cms_category.category_path,
+	cms_category.category_flag,
+	cms_category.dict_id,
+	cms_category.app_id,
+	cms_category.category_manager_id,
+	cms_category.category_datetime,
+	cms_category.mdiy_model_id,
+	cms_category.category_diy_url,
+	cms_category.category_img,
+	cms_category.category_descrip,
+	cms_category.category_keyword,
+	cms_category.category_url,
+	cms_category.category_list_url,
+	cms_category.category_type,
+	cms_category.category_id 
+) SELECT
+category.category_id,
+category.category_title,
+category.category_sort,
+category.category_parent_id,
+basic_column.column_path,
+basic_column.column_flag,
+category.category_dict_id,
+category.category_appid,
+category.category_managerid,
+category.category_datetime,
+basic_column.column_cm_id,
+basic_column.column_diy_url,
+category.category_smallimg,
+basic_column.column_descrip,
+basic_column.column_keyword,
+basic_column.column_url,
+basic_column.column_listurl,
+basic_column.column_type,
+category.category_categoryid 
+FROM
+	basic_column
+	INNER JOIN category ON basic_column.column_category_id = category.category_id
\ 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 77c42c9e..570b17eb 100644
--- a/src/main/webapp/WEB-INF/manager/cms/category/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/category/index.ftl
@@ -111,7 +111,9 @@ var indexVue = new Vue({
 	    	var that = this;
 	    	this.loadState = false;
 	    	this.loading = true;
-			ms.http.get(ms.manager+"/cms/category/list.do").then(
+			ms.http.get(ms.manager+"/cms/category/list.do",{
+				pageSize:999,
+			}).then(
 					function(res) {
 						if(that.loadState){
 							that.loading = false;
diff --git a/src/main/webapp/WEB-INF/manager/cms/content/index.ftl b/src/main/webapp/WEB-INF/manager/cms/content/index.ftl
index be88ee6e..1ac2aac8 100644
--- a/src/main/webapp/WEB-INF/manager/cms/content/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/content/index.ftl
@@ -11,7 +11,9 @@
 	<!--左侧-->
 	<el-container class="index-menu">
 		<div class="left-tree">
-			<el-tree :indent="5" v-loading="loading" highlight-current :expand-on-click-node="false" default-expand-all :empty-text="emptyText" :data="treeData" :props="defaultProps" @node-click="handleNodeClick" style="padding: 10px;height: 100%;"></el-tree>
+			<el-scrollbar class="ms-scrollbar" style="height: 100vh;">
+				<el-tree :indent="5" v-loading="loading" highlight-current :expand-on-click-node="false" default-expand-all :empty-text="emptyText" :data="treeData" :props="defaultProps" @node-click="handleNodeClick" style="padding: 10px;height: 100%;"></el-tree>
+			</el-scrollbar>
 		</div>
 		<iframe :src="action" class="ms-iframe-style">
 		</iframe>
@@ -46,7 +48,9 @@
 				var that = this;
 				this.loadState = false;
 				this.loading = true;
-				ms.http.get(ms.manager+"/cms/category/list.do").then(
+				ms.http.get(ms.manager+"/cms/category/list.do",{
+					pageSize:999,
+				}).then(
 						function(res) {
 							if(that.loadState){
 								that.loading = false;