diff --git a/cc-inspector/src/views/devtools/data.ts b/cc-inspector/src/views/devtools/data.ts index 3b2c6ee..3f3cb2c 100644 --- a/cc-inspector/src/views/devtools/data.ts +++ b/cc-inspector/src/views/devtools/data.ts @@ -102,6 +102,14 @@ export class ArrayData extends Info { test() { this.add(new Property("item1", new TextData("text"))); this.add(new Property("item2", new BoolData(true))); + this.add(new Property("item3", new NumberData(100))); + return this; + } + testSub() { + this.add(new Property("item1", new TextData("text"))); + const sub = new ArrayData(); + sub.add(new Property("sub", new StringData("sub"))); + this.add(new Property('arr', sub)); return this; } public isArray(): boolean { return true; } @@ -266,12 +274,20 @@ export class Vec4Data extends Info { } } export class ImageData extends Info { - data: string | null = null; + /** + * 图片的url路径 + */ + data: string = ""; constructor() { super(); this.type = DataType.Image; - this.data = null; + this.data = ""; + return this; + } + test() { + const cocos = 'data:image/png;base64,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'; + this.data = cocos; return this; } public isImage(): boolean { return true; } diff --git a/cc-inspector/src/views/devtools/test/server.ts b/cc-inspector/src/views/devtools/test/server.ts index 9a00abf..495611d 100644 --- a/cc-inspector/src/views/devtools/test/server.ts +++ b/cc-inspector/src/views/devtools/test/server.ts @@ -1,6 +1,6 @@ import { v4 } from "uuid"; import { Msg, Page, PluginEvent } from "../../../core/types"; -import { ArrayData, BoolData, ColorData, EngineData, EnumData, Group, Info, NodeInfoData, NumberData, ObjectData, ObjectItemRequestData, Property, StringData, TextData, TreeData, Vec2Data, Vec3Data, Vec4Data } from "../data"; +import { ArrayData, BoolData, ColorData, EngineData, EnumData, Group, ImageData, Info, NodeInfoData, NumberData, ObjectData, ObjectItemRequestData, Property, StringData, TextData, TreeData, Vec2Data, Vec3Data, Vec4Data } from "../data"; export class TestClient { recv(event: PluginEvent) { @@ -90,20 +90,28 @@ export class TestServer { .buildProperty("string", new StringData("string")) .buildProperty("enum", new EnumData().test()) .buildProperty("color", new ColorData('#f00')) - .buildProperty("array", new ArrayData().test()) - .buildProperty("object", new ObjectData().test()) - ; + .buildProperty("image", new ImageData().test()) this.testData.buildChild('vec').buildComponent('group2') .buildProperty("number", new NumberData(200)) .buildProperty("vec2", new Vec2Data().test()) .buildProperty("vec3", new Vec3Data().test()) .buildProperty("vec4", new Vec4Data().test()) - - this.testData.buildChild("engine").buildComponent("group3") + this.testData.buildChild("obj/arr").buildComponent("group3") + .buildProperty("array", new ArrayData().test()) + .buildProperty("object", new ObjectData().test()) + .buildProperty("arr_arr", new ArrayData().testSub()) + this.testData.buildChild("engine").buildComponent("group4") .buildProperty("node", new EngineData().init('name', 'cc_Node', 'uuid')) .buildProperty("sprite", new EngineData().init('name', 'cc_Sprite', 'uuid')) .buildProperty("label", new EngineData().init('name', 'cc_Label', 'uuid')) .buildProperty("un_known", new EngineData().init('name', 'un_known', 'uuid')) + + const c = this.testData.buildChild("str1") + c.buildComponent("group51").buildProperty("str1", new StringData("str1")) + c.buildComponent("group52").buildProperty("num", new NumberData(200)) + + this.testData.buildChild("str2").buildComponent("group6") + .buildProperty("str2", new StringData("str2")) } add(client: TestClient) { this.clients.push(client); diff --git a/cc-inspector/src/views/devtools/ui/property-group.vue b/cc-inspector/src/views/devtools/ui/property-group.vue index 4532576..bbcde83 100644 --- a/cc-inspector/src/views/devtools/ui/property-group.vue +++ b/cc-inspector/src/views/devtools/ui/property-group.vue @@ -14,7 +14,7 @@ + + diff --git a/cc-inspector/src/views/devtools/ui/propertys.vue b/cc-inspector/src/views/devtools/ui/propertys.vue index c2fbba8..9b80dbe 100644 --- a/cc-inspector/src/views/devtools/ui/propertys.vue +++ b/cc-inspector/src/views/devtools/ui/propertys.vue @@ -29,12 +29,16 @@ export default defineComponent({ console.log(code); } } - watch(props.data, (newValue: NodeInfoData, oldValue: NodeInfoData) => { - if (newValue.uuid !== oldValue.uuid) { - // 切换node,全部展开属性 - Bus.emit(BusMsg.FoldAllGroup, false); + watch( + () => props.data, + (newValue: NodeInfoData, oldValue: NodeInfoData) => { + // console.log(newValue); + if (newValue.uuid !== oldValue.uuid) { + // 切换node,全部展开属性 + Bus.emit(BusMsg.FoldAllGroup, false); + } } - }); + ); return {}; }, }); diff --git a/cc-inspector/src/views/devtools/ui/settings-prop.vue b/cc-inspector/src/views/devtools/ui/settings-prop.vue deleted file mode 100644 index d631f79..0000000 --- a/cc-inspector/src/views/devtools/ui/settings-prop.vue +++ /dev/null @@ -1,41 +0,0 @@ - - - - - diff --git a/cc-inspector/src/views/devtools/ui/ui-prop.vue b/cc-inspector/src/views/devtools/ui/ui-prop.vue index fb7af39..aea8280 100644 --- a/cc-inspector/src/views/devtools/ui/ui-prop.vue +++ b/cc-inspector/src/views/devtools/ui/ui-prop.vue @@ -1,7 +1,7 @@