1
0

2 Ревизии 45cfd0cfa2 ... b6a6b9f4a2

Автор SHA1 Съобщение Дата
  liwei b6a6b9f4a2 Merge branch 'dev' of http://124.70.149.18:10880/lianghj/queenshow into dev преди 1 година
  liwei 5e400af15d 修复解组bug преди 1 година
променени са 2 файла, в които са добавени 7 реда и са изтрити 1 реда
  1. 3 1
      src/modules/editor/controllers/SelectCtrl/index.ts
  2. 4 0
      src/modules/editor/module/actions/edit.tsx

+ 3 - 1
src/modules/editor/controllers/SelectCtrl/index.ts

@@ -180,6 +180,8 @@ export class SelectCtrl extends ModuleControl<EditorModule> {
   onDocMouseDown(e: MouseEvent) {
     this._mouseDownTimestamp = Date.now();
     if (e.button != 0 || !this.pageEl || !this.selCanvas || this.controls.editorCtrl.isMoving() ) return;
+    const id = this.getDivId(e.target as any);
+    if (id == "toolbar") return;
 
     document.addEventListener("mousemove", this.onDocMouseMove, {
       capture: true,
@@ -279,7 +281,7 @@ export class SelectCtrl extends ModuleControl<EditorModule> {
       }
     } while (c);
   }
-
+  
   getDivTransformFlag(div: HTMLElement) {
     const id = this.getDivId(div);
     if (!id) return "";

+ 4 - 0
src/modules/editor/module/actions/edit.tsx

@@ -1019,6 +1019,10 @@ export const editActions = EditorModule.action({
       (item) => item != groupComp.id
     );
     parentChilds.push(...childs);
+    const page = this.controls.pageCtrl;
+    childs.forEach(item=>{
+      page.setCompPid(item, card.id);
+    })
     card.children.setDefault(parentChilds);
     this.controls.editorCtrl.clickPickComp(childs[0]);