Merge remote-tracking branch 'origin/master'

pages/knowledge/knowledgeDetail.vue

@@ -68,7 +68,7 @@
           :actions="actions || []"
           @clickAction="postCommand"
         />
-        <comment :thread-id="threadId" />
+        <comment v-if="renderComponent" ref="comment" :thread-id="threadId" />
       </div>
     </div>
   </div>
@@ -80,7 +80,12 @@ import config from "@/config.js";
 export default {
   data() {
     return {
+<<<<<<< HEAD
       threadId: "999999999",
+=======
+      threadId: "28",
+      renderComponent: true,
+>>>>>>> origin/master
       actions: [
         {
           text: this.$t("topic.read"),
@@ -170,6 +175,12 @@ export default {
     // };
   },
   methods: {
+    forceRerenders() {
+      this.renderComponent = false;
+      this.$nextTick(() => {
+        this.renderComponent = true;
+      });
+    },
     deleteChildren(arr) {
       const childs = arr;
       for (let i = childs.length; i--; i > 0) {
@@ -188,7 +199,12 @@ export default {
       window.open(this.fileSrc, "_blank");
     },
     handleNodeClick(data) {
+<<<<<<< HEAD
        self=this;
+=======
+      this.threadId = "29"; // 目前写死
+      this.forceRerenders(); // 强制从新渲染函数
+>>>>>>> origin/master
       if (data.file) {
         this.showViewloading = true;
         axios
@@ -223,6 +239,7 @@ export default {
             console.log(this.threadId,3232);
             }
             this.fileMd5 = data.md5;
+            console.log(this.threadId, "我是父组件");
           });
       }
     },