Merge branch 'dev' of http://124.70.149.18:10880/lianghj/queenshow into dev

src/modules/editor/components/CompUI/basicUI/Text/component.tsx

@@ -80,7 +80,7 @@ export const Component = defineComponent({
         const target = e.target as HTMLElement;
         if (
           editorInstance.ui.view.toolbar.element?.contains(target) ||
-          comp.$el.contains(target)
+          editorInstance.ui.view.editable.element?.contains(target)
         ) {
           return;
         }

src/modules/editor/components/Preview/index.tsx

@@ -1,25 +1,24 @@
 import { defineUI } from "queenjs";
 import { useEditor } from "../..";
 import { CompUI } from "../CompUI";
+import { useCompRef } from "../CompUI/basicUI/hooks";
 
 export default defineUI({
   setup() {
     const { store, helper } = useEditor();
+    const rootRef = useCompRef("root");
     return () => (
       <div
-        class="overflow-hidden min-h-100vh"
-        style={helper.createStyle(helper.findRootComp()?.layout || {size: [750, 800]})}
+        ref={rootRef}
+        class="overflow-hidden min-h-100vh !h-auto"
+        style={helper.createStyle(
+          helper.findRootComp()?.layout || { size: [750, 800] }
+        )}
       >
         {store.pageCompIds.map((id) => {
           const compKey = store.designData.compMap[id]?.compKey;
           const Comp: any = (CompUI[compKey] || CompUI.Container).Component;
-          return (
-            Comp && (
-              <div class="flex flex-col" key={id}>
-                <Comp compId={id} />
-              </div>
-            )
-          );
+          return Comp && <Comp key={id} compId={id} />;
         })}
       </div>
     );

src/modules/editor/components/Viewport/Slider/SliderRight/CompTree.tsx

@@ -1,13 +1,13 @@
+import { CompObject } from "@/modules/editor/controllers/SelectCtrl/compObj";
 import { TreeToolbars } from "@/modules/editor/objects/Toolbars";
 import { css } from "@linaria/core";
 import { Image } from "@queenjs/ui";
 import { useReactive } from "@queenjs/use";
 import { Tree } from "ant-design-vue";
-import { defineComponent, effect } from "vue";
+import { defineComponent, watch } from "vue";
 import { string } from "vue-types";
 import { useEditor } from "../../../..";
 import { DesignComp } from "../../../../objects/DesignTemp/DesignComp";
-import { CompObject } from "@/modules/editor/controllers/SelectCtrl/compObj";
 
 type TreeItem = {
   key: string;
@@ -25,7 +25,7 @@ export const CompTree = defineComponent({
       expandedKeys: [] as string[],
       treeData() {
         const rootComp = helper.findRootComp();
-      
+
         function getCompChildren(ids: string[]): TreeItem[] {
           return ids.map((id) => {
             const comp = helper.findComp(id) as DesignComp;
@@ -44,35 +44,44 @@ export const CompTree = defineComponent({
       },
     }));
 
-   
+    watch(
+      () => store.currCompId,
+      () => {
+        state.expandedKeys = store.currCompId
+          ? helper.getCompTrees(store.currCompId).map((comp) => comp.id)
+          : [];
+      }
+    );
 
     return () => {
-
-      state.expandedKeys = store.currCompId  ? helper.getCompTrees(store.currCompId).map((comp) => comp.id):[];
       return (
-      <Tree
-        class={treeStyle}
-        treeData={ state.treeData}
-        v-model={[state.expandedKeys, "expandedKeys"]}
-        selectedKeys={[store.currCompId]}
-        blockNode={true}
-        onSelect={(ids) =>{
-          const id = ids[0] as string || state.expandedKeys.at(-2) || "root";
-          if (helper.isStreamCardChild(id)) {
-            controls.selectCtrl.selecteObjs([new CompObject(store.compMap[id])])
-            return;
-          } 
-          actions.pickComp(id)
-        }}
-      >
-        {{
-          title: (data: any) => {
-            return <CompNode title={data.title} id={data.key} />;
-          },
-        }}
-      </Tree>
-    );
-  }},
+        <Tree
+          class={treeStyle}
+          treeData={state.treeData}
+          v-model={[state.expandedKeys, "expandedKeys"]}
+          selectedKeys={[store.currCompId]}
+          blockNode={true}
+          onSelect={(ids) => {
+            const id =
+              (ids[0] as string) || state.expandedKeys.at(-2) || "root";
+            if (helper.isStreamCardChild(id)) {
+              controls.selectCtrl.selecteObjs([
+                new CompObject(store.compMap[id]),
+              ]);
+              return;
+            }
+            actions.pickComp(id);
+          }}
+        >
+          {{
+            title: (data: any) => {
+              return <CompNode title={data.title} id={data.key} />;
+            },
+          }}
+        </Tree>
+      );
+    };
+  },
 });
 
 const CompNode = defineComponent({

src/modules/editor/controllers/TransferCtrl/GroupCtrl.ts

@@ -103,7 +103,7 @@ export class GroupActionCtrl extends ModuleControl<EditorModule> {
       const originArr = window
         .getComputedStyle(groupComp.$el)
         .transformOrigin.split(" ")
-        .map(parseFloat);
+        .map((v) => parseFloat(v));
 
       const porigin = new Matrix();
       porigin.translate(originArr[0], originArr[1]);
@@ -113,7 +113,7 @@ export class GroupActionCtrl extends ModuleControl<EditorModule> {
       const childOrigArr = window
         .getComputedStyle(comp.$el)
         .transformOrigin.split(" ")
-        .map(parseFloat);
+        .map((v) => parseFloat(v));
       const corigin = new Matrix();
       corigin.translate(childOrigArr[0], childOrigArr[1]);
       const cinvOrigin = new Matrix();