diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiSpace.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiSpace.java index e02fe603..bc0579d4 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiSpace.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/entity/WikiSpace.java @@ -1,9 +1,10 @@ package com.zyplayer.doc.data.repository.manage.entity; import com.baomidou.mybatisplus.annotation.IdType; -import java.util.Date; import com.baomidou.mybatisplus.annotation.TableId; + import java.io.Serializable; +import java.util.Date; /** *

@@ -11,7 +12,7 @@ import java.io.Serializable; *

* * @author 暮光：城中城 - * @since 2019-02-24 + * @since 2019-03-07 */ public class WikiSpace implements Serializable { @@ -36,7 +37,7 @@ public class WikiSpace implements Serializable { /** * 描述 */ - private String explain; + private String spaceExplain; /** * 创建人ID @@ -74,12 +75,12 @@ public class WikiSpace implements Serializable { public void setType(Integer type) { this.type = type; } - public String getExplain() { - return explain; + public String getSpaceExplain() { + return spaceExplain; } - public void setExplain(String explain) { - this.explain = explain; + public void setSpaceExplain(String spaceExplain) { + this.spaceExplain = spaceExplain; } public Long getCreateUserId() { return createUserId; @@ -109,7 +110,7 @@ public class WikiSpace implements Serializable { "id=" + id + ", name=" + name + ", type=" + type + - ", explain=" + explain + + ", spaceExplain=" + spaceExplain + ", createUserId=" + createUserId + ", createUserName=" + createUserName + ", createTime=" + createTime + diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiSpaceMapper.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiSpaceMapper.java index 87cf0e70..e4bfec1f 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiSpaceMapper.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/manage/mapper/WikiSpaceMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; *

* * @author 暮光：城中城 - * @since 2019-02-24 + * @since 2019-03-07 */ public interface WikiSpaceMapper extends BaseMapper { diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/generator/CodeGenerator.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/generator/CodeGenerator.java index 94880a7e..442af51a 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/generator/CodeGenerator.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/repository/support/generator/CodeGenerator.java @@ -19,7 +19,7 @@ public class CodeGenerator { final String moduleName = "manage"; // final String[] tableName = { "zyplayer_storage", "auth_info", "user_auth", "user_info" }; // final String[] tableName = { "wiki_space", "wiki_page", "wiki_page_content", "wiki_page_file", "wiki_page_comment", "wiki_page_zan" }; - final String[] tableName = { "wiki_page_file" }; + final String[] tableName = { "wiki_space" }; // 代码生成器 AutoGenerator mpg = new AutoGenerator(); diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiSpaceService.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiSpaceService.java index 7e2d472d..42134919 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiSpaceService.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/WikiSpaceService.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService; *

* * @author 暮光：城中城 - * @since 2019-02-24 + * @since 2019-03-07 */ public interface WikiSpaceService extends IService { diff --git a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiSpaceServiceImpl.java b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiSpaceServiceImpl.java index bcf53ebe..eb5f0f6d 100644 --- a/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiSpaceServiceImpl.java +++ b/zyplayer-doc-data/src/main/java/com/zyplayer/doc/data/service/manage/impl/WikiSpaceServiceImpl.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Service; *

* * @author 暮光：城中城 - * @since 2019-02-24 + * @since 2019-03-07 */ @Service public class WikiSpaceServiceImpl extends ServiceImpl implements WikiSpaceService { diff --git a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/security/DocDetailsServiceImpl.java b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/security/DocDetailsServiceImpl.java index 0b1e1a6a..15449479 100644 --- a/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/security/DocDetailsServiceImpl.java +++ b/zyplayer-doc-manage/src/main/java/com/zyplayer/doc/manage/framework/config/security/DocDetailsServiceImpl.java @@ -44,7 +44,7 @@ public class DocDetailsServiceImpl implements UserDetailsService { List userAuthList = userAuthService.list(authWrapper); List authorities = new ArrayList(); if (userAuthList != null && userAuthList.size() > 0) { - List authIdList = userAuthList.stream().collect(Collectors.mapping(UserAuth::getAuthId, Collectors.toList())); + List authIdList = userAuthList.stream().map(UserAuth::getAuthId).collect(Collectors.toList()); Collection authInfoList = authInfoService.listByIds(authIdList); authInfoList.forEach(val -> { authorities.add(new SimpleGrantedAuthority(val.getAuthName())); diff --git a/zyplayer-doc-manage/src/main/resources/sql/zyplayer_doc_manage.1.0.1.sql b/zyplayer-doc-manage/src/main/resources/sql/zyplayer_doc_manage.1.0.1.sql index 2cbaf7f3..b19b4498 100644 --- a/zyplayer-doc-manage/src/main/resources/sql/zyplayer_doc_manage.1.0.1.sql +++ b/zyplayer-doc-manage/src/main/resources/sql/zyplayer_doc_manage.1.0.1.sql @@ -11,7 +11,7 @@ Target Server Version : 50724 File Encoding : 65001 - Date: 06/03/2019 19:00:24 + Date: 07/03/2019 20:06:40 */ SET NAMES utf8mb4; @@ -121,12 +121,12 @@ CREATE TABLE `wiki_page` ( -- Records of wiki_page -- ---------------------------- INSERT INTO `wiki_page` VALUES (7, 1, '测试1', NULL, 0, 1, 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56', 0); -INSERT INTO `wiki_page` VALUES (8, 1, '测试2', NULL, 0, 3, 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-03-06 09:25:29', 0); +INSERT INTO `wiki_page` VALUES (8, 1, '测试2', NULL, 0, 4, 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-03-06 09:25:29', 0); INSERT INTO `wiki_page` VALUES (9, 1, '测试3', 7, 0, 0, 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56', 0); INSERT INTO `wiki_page` VALUES (10, 1, '测试4', 7, 0, 0, 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56', 0); INSERT INTO `wiki_page` VALUES (11, 1, '测试5', 9, 0, 0, 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56', 0); INSERT INTO `wiki_page` VALUES (12, 1, '测试6', 7, 0, 0, 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56', 0); -INSERT INTO `wiki_page` VALUES (14, 1, '测试7', NULL, 0, 1, 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56', 0); +INSERT INTO `wiki_page` VALUES (14, 1, '测试7', NULL, 0, 2, 1, NULL, '2019-02-24 17:51:56', 1, NULL, '2019-02-24 17:51:56', 0); -- ---------------------------- -- Table structure for wiki_page_comment @@ -143,7 +143,17 @@ CREATE TABLE `wiki_page_comment` ( `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', `del_flag` tinyint(4) NULL DEFAULT 0 COMMENT '0=有效 1=删除', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 11 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 17 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of wiki_page_comment +-- ---------------------------- +INSERT INTO `wiki_page_comment` VALUES (11, 14, NULL, '阿斯顿撒多撒多撒多撒大所多', 0, 1, '暮光：城中城', '2019-03-07 10:47:05', 0); +INSERT INTO `wiki_page_comment` VALUES (12, 14, NULL, '阿斯顿撒多撒多撒多撒大所多阿斯顿撒多撒多撒多撒大所多阿斯顿撒多撒多撒多撒大所多', 0, 1, '暮光：城中城', '2019-03-07 12:53:07', 0); +INSERT INTO `wiki_page_comment` VALUES (13, 14, 12, '大声道撒大所大所', 0, 1, '暮光：城中城', '2019-03-07 13:01:49', 0); +INSERT INTO `wiki_page_comment` VALUES (14, 14, NULL, '大声道撒大所大所\n大声道撒大所大所\n大声道撒大所大所', 0, 1, '暮光：城中城', '2019-03-07 13:11:02', 0); +INSERT INTO `wiki_page_comment` VALUES (15, 14, 12, '大声道撒大所大所\n大声道撒大所大所\n大声道撒大所大所', 0, 1, '暮光：城中城', '2019-03-07 13:11:12', 0); +INSERT INTO `wiki_page_comment` VALUES (16, 14, 12, '阿斯顿撒多撒多撒多撒大所多阿斯顿撒多撒多撒多撒大所多阿斯顿撒多撒多撒多撒大所多阿斯顿撒多撒多撒多撒大所多阿斯顿撒多撒多撒多撒大所多阿斯顿撒多撒多撒多撒大所多阿斯顿撒多撒多撒多撒大所多阿斯顿撒多撒多撒多撒大所多阿斯顿撒多撒多撒多撒大所多', 0, 1, '暮光：城中城', '2019-03-07 13:11:27', 0); -- ---------------------------- -- Table structure for wiki_page_content @@ -194,7 +204,11 @@ CREATE TABLE `wiki_page_file` ( `del_flag` tinyint(4) NULL DEFAULT 0 COMMENT '0=有效 1=删除', PRIMARY KEY (`id`) USING BTREE, UNIQUE INDEX `uk_uuid`(`uuid`) USING BTREE COMMENT '文件ID' -) ENGINE = InnoDB AUTO_INCREMENT = 21 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 22 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of wiki_page_file +-- ---------------------------- -- ---------------------------- -- Table structure for wiki_page_zan @@ -209,7 +223,13 @@ CREATE TABLE `wiki_page_zan` ( `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', `yn` tinyint(4) NULL DEFAULT NULL COMMENT '是否有效 0=无效 1=有效', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 7 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; +) ENGINE = InnoDB AUTO_INCREMENT = 9 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of wiki_page_zan +-- ---------------------------- +INSERT INTO `wiki_page_zan` VALUES (7, 8, NULL, 1, '暮光：城中城', '2019-03-06 19:04:26', 1); +INSERT INTO `wiki_page_zan` VALUES (8, 14, NULL, 1, '暮光：城中城', '2019-03-07 10:32:18', 1); -- ---------------------------- -- Table structure for wiki_space @@ -219,7 +239,7 @@ CREATE TABLE `wiki_space` ( `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键自增ID', `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '空间名', `type` tinyint(4) NULL DEFAULT 1 COMMENT '空间类型 1=公司 2=个人 3=私人', - `explain` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', + `space_explain` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', `create_user_id` bigint(20) NULL DEFAULT NULL COMMENT '创建人ID', `create_user_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建人名字', `create_time` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', @@ -245,8 +265,4 @@ CREATE TABLE `zyplayer_storage` ( UNIQUE INDEX `key`(`doc_key`) USING BTREE COMMENT 'key唯一索引' ) ENGINE = InnoDB AUTO_INCREMENT = 46 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '存储网页上相关的数据' ROW_FORMAT = Compact; --- ---------------------------- --- Records of zyplayer_storage --- ---------------------------- - SET FOREIGN_KEY_CHECKS = 1; diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageCommentController.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageCommentController.java index b71b54eb..70afbacb 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageCommentController.java +++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiPageCommentController.java @@ -7,6 +7,8 @@ import com.zyplayer.doc.data.config.security.DocUserDetails; import com.zyplayer.doc.data.config.security.DocUserUtil; import com.zyplayer.doc.data.repository.manage.entity.WikiPageComment; import com.zyplayer.doc.data.service.manage.WikiPageCommentService; +import com.zyplayer.doc.wiki.controller.vo.WikiPageCommentVo; +import org.dozer.Mapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.PostMapping; @@ -16,6 +18,8 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.Date; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * 文档控制器 @@ -30,14 +34,23 @@ public class WikiPageCommentController { @Resource WikiPageCommentService wikiPageCommentService; + @Resource + Mapper mapper; @PostMapping("/list") - public ResponseJson> list(WikiPageComment wikiPageComment) { + public ResponseJson> list(WikiPageComment wikiPageComment) { UpdateWrapper wrapper = new UpdateWrapper<>(); wrapper.eq("page_id", wikiPageComment.getPageId()); wrapper.eq(wikiPageComment.getParentId() != null, "parent_id", wikiPageComment.getParentId()); List authList = wikiPageCommentService.list(wrapper); - return DocResponseJson.ok(authList); + Map> listMap = authList.stream().filter(val -> val.getParentId() != null) + .collect(Collectors.groupingBy(WikiPageComment::getParentId)); + List commentList = authList.stream().filter(val -> val.getParentId() == null) + .map(val -> mapper.map(val, WikiPageCommentVo.class)).collect(Collectors.toList()); + for (WikiPageCommentVo commentVo : commentList) { + commentVo.setCommentList(listMap.get(commentVo.getId())); + } + return DocResponseJson.ok(commentList); } @PostMapping("/update") diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiSpaceController.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiSpaceController.java index ed16b510..02ec963e 100644 --- a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiSpaceController.java +++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/WikiSpaceController.java @@ -57,6 +57,7 @@ public class WikiSpaceController { DocUserDetails currentUser = DocUserUtil.getCurrentUser(); wikiSpace.setCreateTime(new Date()); wikiSpace.setCreateUserId(currentUser.getUserId()); + wikiSpace.setCreateUserName(currentUser.getUsername()); wikiSpaceService.save(wikiSpace); } return DocResponseJson.ok(); diff --git a/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiPageCommentVo.java b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiPageCommentVo.java new file mode 100644 index 00000000..d2c2812f --- /dev/null +++ b/zyplayer-doc-wiki/src/main/java/com/zyplayer/doc/wiki/controller/vo/WikiPageCommentVo.java @@ -0,0 +1,25 @@ +package com.zyplayer.doc.wiki.controller.vo; + +import com.zyplayer.doc.data.repository.manage.entity.WikiPageComment; + +import java.util.List; + +/** + *

+ * + *

+ * + * @author 暮光：城中城 + * @since 2019-02-24 + */ +public class WikiPageCommentVo extends WikiPageComment { + private List commentList; + + public List getCommentList() { + return commentList; + } + + public void setCommentList(List commentList) { + this.commentList = commentList; + } +} diff --git a/zyplayer-doc-wiki/src/main/resources/doc-wiki.html b/zyplayer-doc-wiki/src/main/resources/doc-wiki.html index 9b85e49b..de722bb9 100644 --- a/zyplayer-doc-wiki/src/main/resources/doc-wiki.html +++ b/zyplayer-doc-wiki/src/main/resources/doc-wiki.html @@ -11,27 +11,39 @@
- - -
-
创建文档
- - - - - -
- + + + + + + 我的资料 + 退出登录 + + + - - - - - 我的资料 - 退出登录 - - - + +
+ +
+ + + + + + + + +
+
+ 创建文档 +
+ + + + +
+
欢迎使用在线文档
@@ -100,21 +112,34 @@
-
评论列表：
-
+
评论列表：
+
-
{{item.createUserName.substr(0,1)}}
+
{{comment.createUserName.substr(0,1)}}
- {{item.createUserName}}　{{item.createTime}} + {{comment.createUserName}} + {{comment.createTime}} + 回复 +
+ 
{{comment.content}}
+
+
+
{{commentSub.createUserName.substr(0,1)}}
+
+
+ {{commentSub.createUserName}} + {{commentSub.createTime}} +
+ 
{{commentSub.content}}
- 
{{item.content}}
- +
- 提交评论 + 提交评论 + 取消
@@ -170,6 +195,7 @@ var page = { newPageContentEditor: '', colorArr: ["#67C23A", "#409EFF", "#E6A23C", "#F56C6C", "#909399", "#303133"], + userHeadColor: {}, }; var app = new Vue({ el: '#app', @@ -185,7 +211,11 @@ label: 'label', isLeaf: 'leaf' }, - wikiPageList:[], + // 空间搜索相关 + spaceOptions: [], + spaceList:[], + choiceSpace: "", + nowSpaceId: 0, // 依据目录树存储的map全局对象 treePathDataMap: new Map(), // 搜索的输入内容 @@ -195,6 +225,7 @@ newPageId: "", newPageTitle: "", // 页面展示相关 + wikiPageList:[], wikiPage: {}, pageContent: {}, pageFileList: [], @@ -205,13 +236,13 @@ // 评论相关 commentTextInput: "", commentList: [], + recommentInfo: {}, } }, watch: { }, mounted: function () { - //this.doGetPageList(); this.init(); }, methods: { @@ -234,12 +265,26 @@ } }); }, + recommentUser(id, index) { + this.recommentInfo = {id: id, index: index, placeholder: '回复' + (index + 1) + '楼'}; + }, + cancelCommentUser() { + this.recommentInfo = {}; + }, submitPageComment() { - var param = {pageId: app.wikiPage.id, content: app.commentTextInput}; + var param = { + pageId: app.wikiPage.id, content: app.commentTextInput, + parentId: app.recommentInfo.id + }; ajaxTemp("zyplayer-doc-wiki/page/comment/update", "post", "json", param, function (json) { if (validateResult(json)) { var data = json.data; - data.color = page.colorArr[Math.ceil(Math.random() * page.colorArr.length) - 1]; + var color = page.userHeadColor[data.createUserId]; + if (!color) { + color = page.colorArr[Math.ceil(Math.random() * page.colorArr.length) - 1]; + page.userHeadColor[data.createUserId] = color; + } + data.color = color; app.commentTextInput = ""; app.commentList.push(data); } @@ -327,6 +372,39 @@ app.lastClickNode = data; this.loadPageDetail(app.lastClickNode.id); }, + spaceChangeEvents(data) { + app.nowSpaceId = data; + if (data == 0) { + this.$prompt('请输入空间名', '创建空间', { + confirmButtonText: '确定', + cancelButtonText: '取消', + }).then(({value}) => { + var param = {name: value}; + ajaxTemp("zyplayer-doc-wiki/space/update", "post", "json", param, function (json) { + if (validateResult(json)) { + } + }); + }); + } + }, + loadSpaceList(node, resolve) { + ajaxTemp("zyplayer-doc-wiki/space/list", "post", "json", {}, function (json) { + if (validateResult(json)) { + app.spaceList = json.data || []; + var spaceOptions = []; + for (var i = 0; i < app.spaceList.length; i++) { + spaceOptions.push({ + label: app.spaceList[i].name, value: app.spaceList[i].id + }); + } + app.spaceOptions = spaceOptions; + if (app.spaceList.length > 0) { + app.nowSpaceId = app.spaceList[0].id; + app.loadNodeChildren(node, resolve); + } + } + }); + }, loadPageDetail(pageId) { app.rightContentType = 1; var param = {id: pageId}; @@ -344,12 +422,29 @@ }, loadCommentList(pageId) { app.commentList = []; + app.cancelCommentUser(); var param = {pageId: pageId}; ajaxTemp("zyplayer-doc-wiki/page/comment/list", "post", "json", param, function (json) { if (validateResult(json)) { var commentList = json.data || []; for (var i = 0; i < commentList.length; i++) { - commentList[i].color = page.colorArr[Math.ceil(Math.random() * page.colorArr.length) - 1]; + var color = page.userHeadColor[commentList[i].createUserId]; + if (!color) { + color = page.colorArr[Math.ceil(Math.random() * page.colorArr.length) - 1]; + page.userHeadColor[commentList[i].createUserId] = color; + } + commentList[i].color = color; + var subCommentList = commentList[i].commentList || []; + for (var j = 0; j < subCommentList.length; j++) { + var subItem = subCommentList[j]; + var colorSub = page.userHeadColor[subItem.createUserId]; + if (!colorSub) { + colorSub = page.colorArr[Math.ceil(Math.random() * page.colorArr.length) - 1]; + page.userHeadColor[subItem.createUserId] = colorSub; + } + subItem.color = colorSub; + } + commentList[i].commentList = subCommentList; } app.commentList = commentList; } @@ -375,7 +470,7 @@ } else { nodePath = "/"; } - var param = {spaceId: 1, parentId: parentId}; + var param = {spaceId: this.nowSpaceId, parentId: parentId}; ajaxTemp("zyplayer-doc-wiki/page/list", "post", "json", param, function (json) { if (validateResult(json)) { app.wikiPageList = json.data || []; @@ -414,19 +509,15 @@ border-right: 0; margin-right: 3px; } - .el-header { - background-color: #409EFF; - color: #333; - line-height: 50px; - } + .el-header {background-color: #409EFF; color: #333; line-height: 40px; text-align: right;height: 40px !important;} .doc-body-box{ - overflow-x: hidden;height: calc(100vh);overflow-y: auto;width: 100%; + overflow-x: hidden;overflow-y: auto;width: 100%; padding: 10px;border-left: 1px solid #f1f1f1; box-sizing: border-box; } .el-tree{margin-right: 3px;} .logo{ background: #409EFF; cursor: pointer; - width: 100%; height:50px;line-height:50px;font-size: 25px;color: #fff;text-align: center; + width: 100%; height:40px;line-height:40px;font-size: 25px;color: #fff;text-align: center; } .wiki-title{font-size: 20px;} .wiki-author{font-size: 14px;padding: 10px 0;}