From 49189587ce16b89d71733c432aa19731b637b0e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9A=AE=E5=85=89=EF=BC=9A=E5=9F=8E=E4=B8=AD=E5=9F=8E?=
 <806783409@qq.com>
Date: Sat, 1 Jun 2019 23:03:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=B1=95=E7=A4=BA=E5=92=8C?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 zyplayer-doc-ui/wiki-ui/package-lock.json     |  33 +++-
 zyplayer-doc-ui/wiki-ui/package.json          |   3 +-
 zyplayer-doc-ui/wiki-ui/src/App.vue           |   6 +-
 .../wiki-ui/src/common/config/apilist.js      |   2 +-
 .../wiki-ui/src/common/lib/common/common.js   | 129 ++++++++++------
 zyplayer-doc-ui/wiki-ui/src/routes.js         |   2 +
 .../wiki-ui/src/views/page/Edit.vue           | 146 ++++++++++++++++++
 .../wiki-ui/src/views/page/Show.vue           |   9 +-
 8 files changed, 263 insertions(+), 67 deletions(-)
 create mode 100644 zyplayer-doc-ui/wiki-ui/src/views/page/Edit.vue

diff --git a/zyplayer-doc-ui/wiki-ui/package-lock.json b/zyplayer-doc-ui/wiki-ui/package-lock.json
index 4a0f2567..9e542f2a 100644
--- a/zyplayer-doc-ui/wiki-ui/package-lock.json
+++ b/zyplayer-doc-ui/wiki-ui/package-lock.json
@@ -2791,12 +2791,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -2811,17 +2813,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -2938,7 +2943,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -2950,6 +2956,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -2964,6 +2971,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -2971,12 +2979,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -2995,6 +3005,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -3075,7 +3086,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -3087,6 +3099,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -3208,6 +3221,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -7355,6 +7369,11 @@
       "integrity": "sha1-HuO8mhbsv1EYvjNLsV+cRvgvWCU=",
       "dev": true
     },
+    "wangeditor": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npm.taobao.org/wangeditor/download/wangeditor-3.1.1.tgz",
+      "integrity": "sha1-+9PB1JdpI8nt67hbKdMLNVEq0Dk="
+    },
     "watchpack": {
       "version": "1.6.0",
       "resolved": "https://registry.npm.taobao.org/watchpack/download/watchpack-1.6.0.tgz",
diff --git a/zyplayer-doc-ui/wiki-ui/package.json b/zyplayer-doc-ui/wiki-ui/package.json
index 964794e2..20e29515 100644
--- a/zyplayer-doc-ui/wiki-ui/package.json
+++ b/zyplayer-doc-ui/wiki-ui/package.json
@@ -12,7 +12,8 @@
     "element-ui": "^2.3.4",
     "vue": "^2.5.16",
     "vue-axios": "^2.1.4",
-    "vue-router": "^3.0.6"
+    "vue-router": "^3.0.6",
+    "wangeditor": "^3.1.1"
   },
   "engines": {
     "node": ">=6"
diff --git a/zyplayer-doc-ui/wiki-ui/src/App.vue b/zyplayer-doc-ui/wiki-ui/src/App.vue
index 6f901f96..7e19e221 100644
--- a/zyplayer-doc-ui/wiki-ui/src/App.vue
+++ b/zyplayer-doc-ui/wiki-ui/src/App.vue
@@ -71,7 +71,7 @@
                     <el-select v-model="newSpaceForm.type" filterable placeholder="选择类型" style="width: 100%;">
                         <el-option :key="1" label="公共空间" :value="1">
                             <span style="float: left">公共空间</span>
-                            <span style="float: right; color: #8492a6; font-size: 13px;">属于公共，登录用户可访问</span>
+                            <span style="float: right; color: #8492a6; font-size: 13px;">属于公共，登录用户可访问、编辑</span>
                         </el-option>
                         <el-option :key="2" label="个人空间" :value="2">
                             <span style="float: left">个人空间</span>
@@ -211,9 +211,7 @@
             },
             createWiki() {
                 if (app.nowSpaceId > 0) {
-                    this.newPageId = "";
-                    this.newPageTitle = "";
-                    this.rightContentType = 2;
+					this.$router.push({path: '/page/edit'});
                 } else {
                     toast.warn("请先选择或创建空间");
                 }
diff --git a/zyplayer-doc-ui/wiki-ui/src/common/config/apilist.js b/zyplayer-doc-ui/wiki-ui/src/common/config/apilist.js
index 8fa30ab0..1af03c13 100644
--- a/zyplayer-doc-ui/wiki-ui/src/common/config/apilist.js
+++ b/zyplayer-doc-ui/wiki-ui/src/common/config/apilist.js
@@ -5,7 +5,7 @@ var URL = {
     pageUpdate: '/zyplayer-doc-wiki/page/update',
     pageList: '/zyplayer-doc-wiki/page/list',
     updatePage: '/zyplayer-doc-wiki/page/update',
-    updateDetail: '/zyplayer-doc-wiki/page/detail',
+    pageDetail: '/zyplayer-doc-wiki/page/detail',
     spaceList: '/zyplayer-doc-wiki/space/list',
     updateSpace: '/zyplayer-doc-wiki/space/update',
 
diff --git a/zyplayer-doc-ui/wiki-ui/src/common/lib/common/common.js b/zyplayer-doc-ui/wiki-ui/src/common/lib/common/common.js
index b5bd68d8..ce652087 100644
--- a/zyplayer-doc-ui/wiki-ui/src/common/lib/common/common.js
+++ b/zyplayer-doc-ui/wiki-ui/src/common/lib/common/common.js
@@ -3,53 +3,86 @@ import global from '../../config/global'
 import apimix from '../../config/apimix'
 
 export default {
-    data: {
-        accessToken: '',
-    },
-    setAccessToken: function (token) {
-        this.data.accessToken = token;
-    },
-    getAccessToken: function () {
-        if (!this.data.accessToken) {
-            var arr, reg = new RegExp("(^| )accessToken=([^;]*)(;|$)");
-            if (arr = document.cookie.match(reg)) {
-                this.data.accessToken = unescape(arr[2]);
-            }
-        }
-        return this.data.accessToken;
-    },
-    validateResult: function (res, callback) {
-        if (!!res.message) {
-            global.vue.$message('请求错误：' + res.message);
-        } else if (res.data.errCode == 400) {
-            global.vue.$message('请先登录');
-            // window.location = apimix.apilist1.HOST + "/static/manage/login.html";
-        } else if (res.data.errCode == 402) {
-            global.vue.$router.push("/common/noAuth");
-        } else if (res.data.errCode !== 200) {
-            global.vue.$message(res.data.errMsg || "未知错误");
-        } else {
-            if (typeof callback == 'function') {
-                callback(res.data);
-            }
-        }
-    },
-    post: function (url, param, callback) {
-        param = param || {};
-        param.accessToken = this.getAccessToken();
-        global.vue.axios({
-            method: "post",
-            url: url,
-            headers: {'Content-type': 'application/x-www-form-urlencoded'},
-            data: Qs.stringify(param),
-            withCredentials: true,
-        }).then((res) => {
-            console.log("ok", res);
-            this.validateResult(res, callback);
-        }).catch((res) => {
-            console.log("error", res);
-            this.validateResult(res);
-        });
-    },
+	data: {
+		accessToken: '',
+	},
+	setAccessToken: function (token) {
+		this.data.accessToken = token;
+	},
+	getAccessToken: function () {
+		if (!this.data.accessToken) {
+			var arr, reg = new RegExp("(^| )accessToken=([^;]*)(;|$)");
+			if (arr = document.cookie.match(reg)) {
+				this.data.accessToken = unescape(arr[2]);
+			}
+		}
+		return this.data.accessToken;
+	},
+	validateResult: function (res, callback) {
+		if (!!res.message) {
+			global.vue.$message('请求错误：' + res.message);
+		} else if (res.data.errCode == 400) {
+			global.vue.$message('请先登录');
+			window.location = apimix.apilist1.HOST + "/static/manage/login.html";
+		} else if (res.data.errCode == 402) {
+			global.vue.$router.push("/common/noAuth");
+		} else if (res.data.errCode !== 200) {
+			global.vue.$message(res.data.errMsg || "未知错误");
+		} else {
+			if (typeof callback == 'function') {
+				callback(res.data);
+			}
+		}
+	},
+	post: function (url, param, callback) {
+		param = param || {};
+		param.accessToken = this.getAccessToken();
+		global.vue.axios({
+			method: "post",
+			url: url,
+			headers: {'Content-type': 'application/x-www-form-urlencoded'},
+			data: Qs.stringify(param),
+			withCredentials: true,
+		}).then((res) => {
+			console.log("ok", res);
+			this.validateResult(res, callback);
+		}).catch((res) => {
+			console.log("error", res);
+			this.validateResult(res);
+		});
+	},
+	/**
+	 * 返回不为空的字符串，为空返回def
+	 */
+	getNotEmptyStr(str, def) {
+		if (isEmpty(str)) {
+			return isEmpty(def) ? "" : def;
+		}
+		return str;
+	},
+	/**
+	 * 是否是空对象
+	 * @param obj
+	 * @returns
+	 */
+	isEmptyObject(obj) {
+		return isEmpty(obj) || $.isEmptyObject(obj);
+	},
+	/**
+	 * 是否是空字符串
+	 * @param str
+	 * @returns
+	 */
+	isEmpty(str) {
+		return (str == "" || str == null || str == undefined);
+	},
+	/**
+	 * 是否不是空字符串
+	 * @param str
+	 * @returns
+	 */
+	isNotEmpty(str) {
+		return !isEmpty(str);
+	},
 }
 
diff --git a/zyplayer-doc-ui/wiki-ui/src/routes.js b/zyplayer-doc-ui/wiki-ui/src/routes.js
index d90f4de9..f16b5fc4 100644
--- a/zyplayer-doc-ui/wiki-ui/src/routes.js
+++ b/zyplayer-doc-ui/wiki-ui/src/routes.js
@@ -4,6 +4,7 @@ import UserLogin from './views/user/Login.vue'
 import UserRouterView from './views/user/RouterView.vue'
 
 import PageShow from './views/page/Show.vue'
+import PageEdit from './views/page/Edit.vue'
 import PageRouterView from './views/page/RouterView.vue'
 
 import CommonNoAuth from './views/common/NoAuth.vue'
@@ -29,6 +30,7 @@ let routes = [
         component: PageRouterView,
         children: [
             {path: 'show', name: '页面内容展示',component: PageShow},
+            {path: 'edit', name: '编辑内容',component: PageEdit},
         ]
     }, {
         path: '/common',
diff --git a/zyplayer-doc-ui/wiki-ui/src/views/page/Edit.vue b/zyplayer-doc-ui/wiki-ui/src/views/page/Edit.vue
new file mode 100644
index 00000000..21d32364
--- /dev/null
+++ b/zyplayer-doc-ui/wiki-ui/src/views/page/Edit.vue
@@ -0,0 +1,146 @@
+<template>
+	<div style="padding: 10px;">
+		<el-row type="border-card">
+			<div style="margin-bottom: 10px;padding: 10px;" v-if="wikiPage.id > 0">
+				编辑：{{parentPath.path}}
+			</div>
+			<div style="margin-bottom: 10px;padding: 10px;" v-else>
+				父级：{{parentPath.path || '/'}}　
+				<el-tooltip class="item" content="在根目录创建文档">
+					<el-button type="text" @click="parentPath = {}" style="padding: 0 10px;">根目录</el-button>
+				</el-tooltip>
+			</div>
+			<el-input v-model="newPageTitle" placeholder="请输入标题"></el-input>
+			<div id="newPageContentDiv" style="margin: 10px 0;"></div>
+			<el-button type="primary" v-on:click="createWikiSave">保存</el-button>
+			<el-button v-on:click="createWikiCancel">取消</el-button>
+		</el-row>
+	</div>
+</template>
+
+<script>
+	import toast from '../../common/lib/common/toast'
+	import WangEditor from 'wangeditor'
+
+	var app;
+	export default {
+		data() {
+			return {
+				editor: {},
+				// 编辑相关
+				nowSpaceId: "",
+				newPageId: "",
+				newPageTitle: "",
+				parentPath: {
+					id: '',
+					path: '',
+				},
+				wikiPage: {},
+			};
+		},
+		beforeRouteUpdate(to, from, next) {
+			this.initQueryParam(to);
+			next();
+		},
+		mounted: function () {
+			app = this;
+			this.initEditor();
+			this.initQueryParam(this.$route);
+		},
+		methods: {
+			createWikiCancel() {
+				this.$confirm('确定要取消编辑吗？您编辑的内容将不会被保存哦~', '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '继续编辑',
+					type: 'warning'
+				}).then(() => {
+
+				});
+			},
+			createWikiSave() {
+				var parentId = app.parentPath.id;
+				if (this.wikiPage.id > 0) {
+					parentId = "";
+				}
+				if (this.common.isEmpty(app.newPageTitle)) {
+					toast.warn("标题不能为空");
+					return;
+				}
+				var param = {
+					spaceId: app.nowSpaceId,
+					id: app.wikiPage.id,
+					name: app.newPageTitle,
+					parentId: parentId,
+					content: this.editor.txt.html()
+				};
+				this.common.post(this.apilist1.updatePage, param, function (json) {
+					toast.success("保存成功！");
+					// app.urlParamPageId = json.data.id;
+					// app.loadPageDetail(json.data.id);
+					// app.doGetPageList(null);
+				});
+			},
+			loadPageDetail(pageId) {
+				app.rightContentType = 1;
+				var param = {id: pageId};
+				this.common.post(this.apilist1.pageDetail, param, function (json) {
+					app.wikiPage = json.data.wikiPage || {};
+					app.pageContent = json.data.pageContent || {};
+					app.pageFileList = json.data.fileList || [];
+					// 内容
+					app.nowSpaceId = app.wikiPage.spaceId;
+					app.newPageTitle = app.wikiPage.name;
+					app.editor.txt.html(app.pageContent.content || "");
+				});
+			},
+			cleanPage() {
+				app.wikiPage = {};
+				app.pageContent = {};
+				app.pageFileList = [];
+				app.newPageTitle = "";
+				if (!!app.editor.txt) {
+					app.editor.txt.html("");
+				}
+			},
+			initQueryParam(to) {
+				this.nowSpaceId = to.query.spaceId;
+				var pageId = to.query.pageId;
+				if (!!pageId) {
+					this.loadPageDetail(pageId);
+				} else {
+					this.cleanPage();
+				}
+			},
+			initEditor() {
+				this.editor = new WangEditor('#newPageContentDiv');
+				this.editor.customConfig.uploadImgServer = this.apilist1.HOST + '/zyplayer-doc-wiki/common/wangEditor/upload';
+				this.editor.customConfig.zIndex = 100;
+				this.editor.customConfig.uploadFileName = 'files';
+				this.editor.customConfig.uploadImgMaxLength = 1;
+				this.editor.customConfig.pasteFilterStyle = false;
+				this.editor.customConfig.withCredentials = true;
+				this.editor.create();
+			},
+		}
+	}
+
+</script>
+<style>
+	.icon-collapse{float: left;font-size: 25px;color: #aaa;margin-top: 8px;cursor: pointer;}
+	.icon-collapse:hover{color: #eee;}
+	.wiki-title{font-size: 20px;}
+	.wiki-author{font-size: 14px;color: #888;padding: 20px 0;height: 40px;line-height: 40px;}
+	.wiki-content{font-size: 14px;}
+	.wiki-content.w-e-text{overflow-y: auto;}
+
+	.upload-page-file .el-upload-list{display: none;}
+	.is-link{color: #1e88e5;cursor: pointer;}
+	/*编辑框高度*/
+	#newPageContentDiv .w-e-text-container{height: 600px !important;}
+	/*评论*/
+	.comment-box .head{
+		float: left;background-color: #ccc;border-radius: 50%;margin-right: 10px;
+		width: 45px; height: 45px; line-height: 45px;text-align: center;color: #fff;
+	}
+</style>
+
diff --git a/zyplayer-doc-ui/wiki-ui/src/views/page/Show.vue b/zyplayer-doc-ui/wiki-ui/src/views/page/Show.vue
index cb024d9e..caab88b5 100644
--- a/zyplayer-doc-ui/wiki-ui/src/views/page/Show.vue
+++ b/zyplayer-doc-ui/wiki-ui/src/views/page/Show.vue
@@ -95,12 +95,8 @@
 
 <script>
 	import toast from '../../common/lib/common/toast'
-	import jquery from '../../common/lib/jquery/jquery-3.1.0.min'
-	import wangEditorJs from '../../common/lib/wangEditor/wangEditor.min.js'
-	import wangEditorCss from '../../common/lib/wangEditor/wangEditor.min.css'
 	var app;
 	var page = {
-		newPageContentEditor: '',
 		colorArr: ["#67C23A", "#409EFF", "#E6A23C", "#F56C6C", "#909399", "#303133"],
 		userHeadColor: {},
 	};
@@ -121,7 +117,7 @@
 				recommentInfo: {},
 			};
 		},
-		beforeRouteUpdate(to, from, next){
+		beforeRouteUpdate(to, from, next) {
 			var pageId = to.query.pageId;
 			if (!!pageId) {
 				this.loadPageDetail(pageId);
@@ -137,6 +133,7 @@
 		},
 		methods: {
 			editWiki() {
+				this.$router.push({path: '/page/edit', query: {pageId: this.wikiPage.id}});
 				// this.rightContentType = 2;
 				// this.newPageId = app.wikiPage.id;
 				// this.newPageTitle = app.wikiPage.name;
@@ -165,7 +162,7 @@
 			loadPageDetail(pageId) {
 				app.rightContentType = 1;
 				var param = {id: pageId};
-				this.common.post(this.apilist1.updateDetail, param, function (json) {
+				this.common.post(this.apilist1.pageDetail, param, function (json) {
 					var wikiPage = json.data.wikiPage || {};
 					wikiPage.selfZan = json.data.selfZan || 0;
 					app.wikiPage = wikiPage;