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

src/modules/editor/components/CompUI/basicUI/View.tsx

@@ -35,12 +35,12 @@ export const View = defineComponent({
             store.currStreamCardId == props.compId && CurrCompStyle
           ]}
           style={helper.createStyle(comp.layout)}
-          // onClick={(e) => {
-          //   e.stopPropagation();
-          //   if (store.isEditMode) {
-          //     actions.pickComp(props.compId);
-          //   }
-          // }}
+          onClick={(e) => {
+            e.stopPropagation();
+            if (store.isEditMode) {
+              actions.pickComp(props.compId);
+            }
+          }}
           onDblclick={() => emit("dblclick")}
         >
           <div

src/modules/editor/controllers/SelectCtrl/index.ts

@@ -80,9 +80,9 @@ export class SelectCtrl extends ModuleControl<EditorModule> {
     this._selCanvaseSize.w = selCanvas.width * 2;
     this._selCanvaseSize.h = selCanvas.height * 2;
 
-    document.addEventListener("mousedown", this.onDocMouseDown.bind(this), {capture: true});
-    document.addEventListener("mousemove", this.onDocMouseMove.bind(this), {capture: true});
-    document.addEventListener("mouseup", this.onDocMouseUp.bind(this), {capture: true});
+    viewport.addEventListener("mousedown", this.onDocMouseDown.bind(this), {capture: true});
+    viewport.addEventListener("mousemove", this.onDocMouseMove.bind(this), {capture: true});
+    viewport.addEventListener("mouseup", this.onDocMouseUp.bind(this), {capture: true});
 
     window.addEventListener("resize", this.onResize.bind(this));
   }
@@ -315,7 +315,6 @@ export class SelectCtrl extends ModuleControl<EditorModule> {
 
     let isClick = false;
     let offsetT = Date.now() - this._mouseDownTimestamp;
-
     const dx = Math.abs(e.clientX - this._downClientX);
     const dy = Math.abs(e.clientY - this._downClientY);
     if (dx < 2 && dy < 2 && !this.store.textEditingState && offsetT < 200) {
@@ -325,14 +324,9 @@ export class SelectCtrl extends ModuleControl<EditorModule> {
       this._state = MODE_NONE;
       const comps = this.compClickTest(e);
       if (comps.length < 1) {
-        const card = this.streamCardClickTest(e);
-        if (card) {
-          this.actions.pickComp(card.id);
-        }
-        this.selecteObjs([]);
-      } else {
-        const objs = new CompObject(this.compMap[comps[0].id])
-        this.selecteObjs([objs]);
+        setTimeout(() => {
+            this.selecteObjs([]);
+        }, 0);
       }
     }
     console.log("up");
@@ -495,10 +489,6 @@ export class SelectCtrl extends ModuleControl<EditorModule> {
     )
       return;
 
-    if (objs.length == 1) {
-      this.actions.pickComp(objs[0].comp.id);
-    }
-
     // objs = this.getSceneObjOrderArr(objs);
 
     const preObjContainer = this.objContainer;

src/modules/editor/module/actions/editWithManualHistory.ts

@@ -1,6 +1,7 @@
 import { set } from "lodash";
 import { EditorModule } from "..";
 import { DesignComp } from "../../objects/DesignTemp/DesignComp";
+import { CompObject } from "../../controllers/SelectCtrl/compObj";
 
 export const manualActions = EditorModule.action({
   pickComp(compId: string) {
@@ -14,9 +15,11 @@ export const manualActions = EditorModule.action({
     this.store.setCurrComp(compId);
     historyCtrl.historyCombine = false;
     if (isActionRoot) historyCtrl.historyActionDoing = false;
-
-    if (this.store.currCompId == this.store.currStreamCardId) {
-      this.controls.transferCtrl.destroy();
+    
+    const paths = this.helper.getCompTrees(compId)
+    const cardChilds = paths[2];
+    if (cardChilds) {
+        this.controls.selectCtrl.selecteObjs([new CompObject(cardChilds)]);
     }
   },
   updateCompData(comp: DesignComp, path: string, value: any) {