Merge remote-tracking branch 'origin/scale0414' into test

src/components/knowledgeExtra/DevInfo.vue

@@ -121,7 +121,7 @@ export default {
         this.$refs['form'].validateField('content'); // 手动校验
       }
       this.data.text = this.$refs.quillEditor.quill.root.innerText;
-    }
+    },
   },
   created() {
     // console.log(this.showType, 'showType','需要显示的类型');
@@ -176,8 +176,12 @@ export default {
         ]
       };
     }
+      setTimeout(()=>{
+          this.filterHiddenPosition();
+      },200)
+  },
+  mounted() {
   },
-  mounted() {},
   methods: {
     reOrder(i) {
       this.$emit('reOrder', i, this.index);
@@ -188,6 +192,15 @@ export default {
     delEmit() {
       this.$emit('del', this.index);
     },
+    filterHiddenPosition(){
+        const pos = this.data.position;
+        const pArr = this.positions.map((it)=>{return it.key});
+        const pStr = pArr.join(",");
+        const arr=pos.filter((it)=>{
+            return pStr.indexOf(it)>-1;
+        });
+        this.data.position=arr;
+    },
     // 渲染内容类型
     renderPositions() {
       //显示位置枚举列表