-
-
-
-
-
-
{{ data.text }}
-
+
+
+
+
+
+
+
+ {{ data.text }}
+
+
+
@@ -51,6 +60,7 @@ import Event from "@/utils/event";
export default {
props: {
resizing: Boolean,
+ loading: Boolean,
baseInfo: {
type: Object,
default: () => ({}),
@@ -77,11 +87,17 @@ export default {
pageInfoMap: (state) => state.pageInfoMap,
}),
viewTreeData() {
- return (
- (this.pageInfoMap[this.tenonId] &&
- this.pageInfoMap[this.tenonId].viewTreeData) ||
- []
- );
+ let arrayData = this.pageInfoMap[this.tenonId] && this.pageInfoMap[this.tenonId].viewTreeData || []
+
+ // 保留 没有 style 的 和 display 不为 none 的
+ const recursion = data => {
+ const treeData = data.filter(item => !item.style || item.style.display !== 'none')
+ treeData.forEach(x => x.children && (x.children = recursion(x.children)))
+ return treeData
+ }
+ recursion(arrayData)
+
+ return arrayData
},
treeData() {
return this.tagName ? this.cloneTreeData : this.viewTreeData;
@@ -153,6 +169,9 @@ export default {
};
});
},
+ refreshView(){
+ this.$emit("refreshView")
+ }
},
};
@@ -173,5 +192,10 @@ export default {
.resizerBox {
position: relative;
padding: 5px;
+ .refresh{
+ font-size: 18px;
+ font-weight: bold;
+ cursor: pointer;
+ }
}
diff --git a/src/pages/index/components/debug/index.vue b/src/pages/index/components/debug/index.vue
index 3557b6a..ff9afb2 100644
--- a/src/pages/index/components/debug/index.vue
+++ b/src/pages/index/components/debug/index.vue
@@ -22,11 +22,14 @@
@@ -72,6 +75,7 @@ export default {
style: {},
newUser: true,
currentTenonIp: null,
+ treeViewLoading: false
}),
watch: {
currentShowPage(val) {
@@ -108,7 +112,6 @@ export default {
// Listen for messages
this.clientSocket.addEventListener("message", (event) => {
let msg = JSON.parse(event.data);
- console.log("Message from server ", msg);
switch (msg.method) {
case "setPageList":
@@ -126,6 +129,7 @@ export default {
break;
case "setViewTree":
that.$store.commit("updatePageInfoMap", msg);
+ this.treeViewLoading = false
break;
case "setViewInfo":
console.log(msg);
@@ -243,6 +247,10 @@ export default {
getViewTree(tenonId) {
this.sendMsgToServer("getViewTree", { tenonId });
},
+ refreshView(tenonId){
+ this.treeViewLoading = true
+ this.sendMsgToServer("getViewTree", { tenonId, refresh: true });
+ },
getStorage(tenonId, tenonIp) {
this.sendMsgToServer("getStorage", { tenonId, tenonIp });
},
diff --git a/src/styles/common.scss b/src/styles/common.scss
index 48d93e0..a060062 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -17,6 +17,8 @@
.col-title{
font-size: 24px;
color: #409EFF;
+ display: flex;
+ align-items: center;
}
.info-item{
display: flex;