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

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

@@ -42,8 +42,11 @@ export const Component = defineComponent({
       const { layout, value } = comp;
 
       const style = helper.createStyle(layout || { size: [750] }, comp);
-      if (!store.isDisplay) return style;
-
+      if (!store.isDisplay) {
+        style.overflow = "unset";
+        return style;
+      }
+      
       const isPcDesign = value.useFor == "pc";
       const isShortDesign = comp.value.pageMode == "short";
 

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

@@ -166,12 +166,6 @@ const EditorComp = defineComponent({
       preHeight.value = h;
       actions.updateCompData(comp, "layout.size.1", preHeight.value);
       helper.extendStreamCard(store.currStreamCardId);
-      if (isChange) {
-        actions.selectObjs([]);
-        setTimeout(() => {
-          actions.selectObjs([props.compId]);
-        }, 0);
-      }
     };
     function isInCkBodyWrapper(dom: HTMLElement) {
       if (editorInstance.value) {
@@ -229,10 +223,7 @@ const EditorComp = defineComponent({
               helper.extendStreamCard(store.currStreamCardId);
               if (isChange) {
                 console.log("changing=>", isChange);
-                actions.selectObjs([]);
-                setTimeout(() => {
-                  actions.selectObjs([props.compId]);
-                }, 0);
+               
               }
             });
           }

src/modules/editor/components/CompUI/basicUI/Transfer/select.tsx

@@ -17,7 +17,8 @@ export const SelectTransfer = defineComponent({
        toolbarW: 0,
     })
 
-    watch(()=>[store.selectId, store.selected], ()=>{
+
+    watch(()=>[controls.selectCtrl.gizmo.state.transform.selected], ()=>{
       console.log("changing--")
    
       nextTick(()=>{
@@ -35,8 +36,8 @@ export const SelectTransfer = defineComponent({
     return () => {
       
       let comp: any = null;
-      if (store.selected.length == 1) {
-        comp = store.compMap[store.selected[0]];
+      if (controls.selectCtrl.gizmo.selected.length == 1) {
+        comp = controls.selectCtrl.gizmo.selected[0]
       }
 
       const w :any = selectCtrl.objContainer.getBound();

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

@@ -62,7 +62,7 @@ export const View = defineComponent({
 
       let isFocus =
         store.isEditMode &&
-        store.selected.length > 1 &&
+        controls.selectCtrl.gizmo.state.transform.selected.length > 1 &&
         store.lastSelected == props.compId;
       isFocus = isFocus || store.currCompId == props.compId;
 

src/modules/editor/components/CompUI/defines/alignMulti.tsx

@@ -12,13 +12,14 @@ export default defineComponent({
   setup(props) {
     const editor = useEditor();
     return ()=>{
+      const state = editor.controls.selectCtrl.gizmo.state;
 
       return (
         <>
           {
-             editor.store.selected.length > 1 && <div class={AlignToolsStyle}>
+            state.transform.selected.length > 1 && <div class={AlignToolsStyle}>
                 <div>
-                    <span class="text-white">元素 (已选{editor.store.selected.length})</span>
+                    <span class="text-white">元素 (已选{state.transform.selected.length})</span>
                 </div>
 
                 <div class="flex py-12px px-0px items-center">

src/modules/editor/components/CompUI/defines/createAttrsForm.tsx

@@ -264,7 +264,7 @@ export function createAttrsForm(valueColumns: ColumnItem[], columnsUI?: any) {
       component: any<DesignComp>().isRequired,
     },
     setup(props) {
-      const { store, actions } = useEditor();
+      const { controls} = useEditor();
       function changeVal(e: { dataIndex: string; value: any }) {
 
         let setterpath = "";
@@ -287,7 +287,7 @@ export function createAttrsForm(valueColumns: ColumnItem[], columnsUI?: any) {
       return () => {
         const { component } = props;
 
-        if (store.selected.length > 1) return <AlignMulti />;
+        if (controls.selectCtrl.gizmo.state.transform.selected.length > 1) return <AlignMulti />;
 
         return (
           <div class={formStyle}>

src/modules/editor/components/Viewport/Toolbar/index.tsx

@@ -20,7 +20,7 @@ export default defineUI({
     const launcher = useLauncher();
 
     return () => {
-      const comp = helper.findComp(store.selected[0]);
+      const comp = helper.findComp(controls.selectCtrl.gizmo.selectedIds[0]);
       const toolsLeft = comp
         ? TopToolbarsLeft.filter((t) => t.getVisible.call(editor, comp))
         : [];

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

@@ -43,7 +43,9 @@ export class ImageCropperCtrl extends ModuleControl<EditorModule> {
         this.modifyCtrl.on("onClickToolbar", (name:"Right" | "Cross")=>{
             this.modifyCtrl.state.visible = false;
             this.controls.historyCtrl.state.enable = true;
-            this.store.selected = this.currSelected
+
+            this.controls.selectCtrl.gizmo.selectObjs(this.currSelected)
+
             const initW = this.initValue.w;
             const initH = this.initValue.h;
             const initMtrx = this.initValue.matrix;
@@ -222,9 +224,9 @@ export class ImageCropperCtrl extends ModuleControl<EditorModule> {
         this.modifyCtrl.objContainer.parent.updateTransform();
         this.modifyCtrl.updateState();
 
-        this.currSelected = this.store.selected.slice(0);
+        this.currSelected = this.controls.selectCtrl.gizmo.selectedIds.slice(0);
 
-        this.store.selected = [];
+        this.controls.selectCtrl.gizmo.selectObjs([]);
     }
 
     close(): void {

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

@@ -51,7 +51,7 @@ export class HotKeyCtrl extends ModuleControl<EditorModule> {
     {
       hotKey: "Backspace,del",
       action() {
-        if (this.store.selected.length > 1) {
+        if (this.controls.selectCtrl.gizmo.selected.length > 1) {
           this.actions.removeSelectComps();
           return;
         }

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

@@ -73,12 +73,13 @@ export class PageCtrl extends ModuleControl<EditorModule> {
     }
 
     setCurrComp(compId: string) {
+        if (compId == "") compId = "root";
         this.state.setCurrCompId(compId);
-        const comps = this.helper.getCompTrees(compId);
-  
-        if (compId == "root" || compId == "") {
+        if (compId == "root") {
           return;
         }
+        
+        const comps = this.helper.getCompTrees(compId);
         let cardId = comps[1]?.id || "";
         if (this.helper.isStreamCard(compId)) {
           cardId = compId;

src/modules/editor/controllers/ReactCtrl/rxValue.ts

@@ -85,14 +85,14 @@ class RxValue {
         
                 obj["on"+CamName + "Changed"] = function(subscribe: (value:T, oldValue:T)=>void){
                     return f.subscribe((v:any)=>{
-                        if (CamName == "Transform") console.log("history 2222222222222222222222222222")
+                        //if (CamName == "Transform") console.log("history 2222222222222222222222222222")
                             subscribe(v.value, snap.OldValue)
                         }
                     )
                 }
                 
                 obj._historySub[name] = f.subscribe((v)=>{
-                    if (CamName == "Transform") console.log("history 11111111111111111111111111")
+                    //if (CamName == "Transform") console.log("history 11111111111111111111111111")
                     snap.OldValue = rxc.value;
                     rxc.value = v.value;
                     if (obj._history && obj._history.enable) {

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

@@ -63,7 +63,10 @@ export class Gizemo extends Events {
 
         this.initGizmoEvent();
     }
-
+    get selectedIds() {
+        return this.selected.map(item=>item.comp.id);
+    }
+    
     getBound() {
         //加上parent的旋转和平移
         this.tempBound.clear();

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

@@ -124,11 +124,14 @@ export class SelectCtrl extends ModuleControl<EditorModule> {
   }
 
   getUnSelectChilds() {
-    const childs = this.store.currStreamCard.children.default || [];
+    const page = this.controls.pageCtrl;
+    const childs = page.currStreamCard.children.default || [];
     let n = childs.length;
     let out = [];
+    const gizmo = this.controls.selectCtrl.gizmo;
+
     while(n--) {
-      if (this.store.selected.indexOf(childs[n]) == -1) {
+      if (gizmo.selectedIds.indexOf(childs[n]) == -1) {
         out.push(new CompObject( this.store.compMap[childs[n]]));
       }
     }
@@ -174,12 +177,6 @@ export class SelectCtrl extends ModuleControl<EditorModule> {
   _mouseDownFlag = "";
   _mouseDownTimestamp = 0;
 
-
-  _updateSelects() {
-    const selecteds = this.store.selected;
-    this.gizmo.selectObjs(selecteds);
-  }
-
   _downClickedCompId = "";
   onDocMouseDown(e: MouseEvent) {
     this._mouseDownTimestamp = Date.now();

src/modules/editor/module/actions/edit.tsx

@@ -202,7 +202,6 @@ export const editActions = EditorModule.action({
       this.helper.extendStreamCard(page.state.currStreamCardId);
 
       if (compKey == "Text") {
-        this.actions.selectObjs([]);
         this.actions.textFocus(currComp.id, true);
       }
       this.controls.cropCtrl.close();
@@ -211,16 +210,6 @@ export const editActions = EditorModule.action({
 
   },
 
-  async selectObjs(ids: string[], last = "") {
-    this.store.selected = ids;
-    this.store.selectId = ids.length > 1 ? Date.now() + "" : "";
-    this.store.lastSelected = last
-      ? last
-      : ids.length > 0
-      ? ids[ids.length - 1]
-      : "";
-  },
-
   // 添加组件到画布
   async addCompToDesign(compKey: ICompKeys, index?: number) {
     const page = this.controls.pageCtrl;
@@ -289,10 +278,15 @@ export const editActions = EditorModule.action({
   },
 
   ctrlc() {
+    const page = this.controls.pageCtrl;
+
     ctrlState.selected = [];
-    const children = this.store.currStreamCard.children.default || [];
+    const children = page.currStreamCard.children.default || [];
+    const gizmo = this.controls.selectCtrl.gizmo;
+    const selected = gizmo.selected.map(item=>item.comp.id);
+
     children.forEach((c) => {
-      if (this.store.selected.indexOf(c) > -1) {
+      if (selected.indexOf(c) > -1) {
         ctrlState.selected.push(c);
       }
     });
@@ -357,12 +351,14 @@ export const editActions = EditorModule.action({
   },
 
   toogleGroup() {
-    if (this.store.selected.length > 1) {
+    const gizmo = this.controls.selectCtrl.gizmo;
+
+    if (gizmo.selected.length > 1) {
       this.actions.createGroupComps();
       return;
     }
-    if (this.store.selected.length == 1) {
-      const c = this.helper.findComp(this.store.selected[0]) as DesignComp;
+    if (gizmo.selected.length == 1) {
+      const c = gizmo.selected[0].comp;
       if (c.compKey == "Group") {
         this.actions.cancelGroupComps(c);
       }
@@ -371,17 +367,20 @@ export const editActions = EditorModule.action({
   ctrlx() {
     //console.log("ctrlv ", this.store.selected);
     //console.log("ctrlv ", this.store.selected);
+    const page =  this.controls.pageCtrl;
+    const gizmo = this.controls.selectCtrl.gizmo;
+    const selected = gizmo.selected.map(item=>item.comp.id);
 
     //保持图层顺序
     ctrlState.selected = [];
-    const children = this.store.currStreamCard.children.default || [];
+    const children = page.currStreamCard.children.default || [];
     children.forEach((c) => {
-      if (this.store.selected.indexOf(c) > -1) {
+      if (selected.indexOf(c) > -1) {
         ctrlState.selected.push(c);
       }
     });
 
-    ctrlState.cardId = this.store.currStreamCardId;
+    ctrlState.cardId = page.state.currStreamCardId;
     ctrlState.type = 2;
     ctrlState.screenId = this.controls.screenCtrl.currScreenId;
     const objc = this.controls.selectCtrl.objContainer;
@@ -428,7 +427,7 @@ export const editActions = EditorModule.action({
     });
     this.actions.addComps(news);
 
-    this.actions.selectObjs(news);
+    this.controls.selectCtrl.gizmo.selectObjs(news);
 
     setTimeout(() => {
       if (ctrlState.type == 2) {
@@ -472,18 +471,16 @@ export const editActions = EditorModule.action({
     const childrens = (this.store.currStreamCard.children.default || []).slice(
       0
     );
-    this.actions.selectObjs(childrens);
-    // this.controls.selectCtrl.
-    //objc.updateSize();
-    //selectCtrl.upgateGizmoStyle();
+    this.controls.selectCtrl.gizmo.selectObjs(childrens)
   },
+
   // 删除组件
   removeSelectComps() {
-    const selected = this.store.selected.slice(0);
-    this.actions.selectObjs([]);
+    this.controls.editorCtrl.clickPickComp("");
+    const selected = this.controls.selectCtrl.gizmo.selected.slice(0);
     let n = selected.length;
     while (n--) {
-      this.actions.removeComp(selected[n]);
+      this.actions.removeComp(selected[n].comp.id);
     }
   },
 
@@ -514,7 +511,7 @@ export const editActions = EditorModule.action({
 
       this.helper.extendStreamCard(cardid);
 
-      this.actions.selectObjs([]);
+      this.controls.editorCtrl.clickPickComp("");
     }
   },
 
@@ -537,9 +534,10 @@ export const editActions = EditorModule.action({
     ctrl.setCurrComp(nextCard);
     ctrl.deleteComp(compId);
   },
+
   // 移动组件顺序
   moveComp(selIndex: number, targetIndex: number) {
-    this.actions.selectObjs([]);
+    this.controls.editorCtrl.clickPickComp("root");
     if (selIndex === targetIndex) return;
 
     this.controls.pageCtrl.moveComp(selIndex, targetIndex);
@@ -961,7 +959,7 @@ export const editActions = EditorModule.action({
     parentChilds.push(...childs);
     card.children.default = parentChilds;
 
-    this.actions.selectObjs([childs[0]]);
+    this.controls.editorCtrl.clickPickComp(childs[0]);
   },
 
   createGroupComps() {
@@ -1012,7 +1010,7 @@ export const editActions = EditorModule.action({
   },
 
   handleSelectMoving(key: string) {
-    if (this.store.selected.length < 1) return;
+    if (this.controls.selectCtrl.gizmo.selected.length < 1) return;
     let x = 0,
       y = 0;
     switch (key) {
@@ -1031,6 +1029,8 @@ export const editActions = EditorModule.action({
     }
     this.controls.selectCtrl.translate(x * 0.5, y * 0.5);
     this.controls.selectCtrl.assistCtrl?.flashDrawCardDists();
+
+    history.submit();
   },
 
   // 点击模板
@@ -1056,8 +1056,7 @@ export const editActions = EditorModule.action({
       title,
     };
 
-    this.actions.selectObjs([]);
-    ctrl.setCurrComp("root");
+    this.controls.editorCtrl.clickPickComp("root");
     ctrl.setDesignData(designData);
   },
 });

src/modules/editor/module/stores/index.ts

@@ -13,8 +13,6 @@ export const store = EditorModule.store({
     mode: "editPage" as EditorMode,
     isWk: false, //作品集内作品
     
-    selected: [] as string[], //选中的组件
-    selectId: "", //选中的id唯一标识一次选中
     croppImage: "", //裁剪图片
     compEditMode: false, //组件编辑模式
     compEditReslut: 0, // -1 取消， 1 确定

src/modules/editor/objects/Toolbars/comps.ts

@@ -1,12 +0,0 @@
-// import { createToolbars } from "./default";
-// import { Toolbar } from "@/modules/editor/components/CompUI/basicUI/Text";
-
-// export const Toolbars = createToolbars( {
-//     text: {
-//         component: Toolbar,
-//         getVisible: (comp) =>  !!comp && comp.compKey == "Text",
-//         onClick(comp) {
-//             // this.actions.setCompLayer(comp, -1);
-//         },
-//     },
-// });

src/modules/editor/objects/Toolbars/default.ts

@@ -121,13 +121,17 @@ export const toolbars = createToolbars({
   delete: {
     component: TipIcons.Delete,
     getVisible(comp) {
-      return (
-        this.store.selected.length > 1 ||
+      
+      const ret = (
+        this.controls.selectCtrl.gizmo.selectedIds.length > 0 ||
         (!!comp && this.helper.isCompCanDelete(comp.id))
       );
+      console.log("deleting icon=>", ret);
+      return ret;
     },
+
     onClick(comp) {
-      if (this.store.selected.length > 1) {
+      if (this.controls.selectCtrl.gizmo.selectedIds.length > 1) {
         this.actions.removeSelectComps();
         return;
       }
@@ -246,7 +250,7 @@ export const toolbars = createToolbars({
       return (
         !!comp &&
         comp.compKey == "Group" &&
-        this.store.selected.length == 1 &&
+        this.controls.selectCtrl.gizmo.selectedIds.length == 1 &&
         this.helper.isStreamCardChild(comp.id)
       );
     },
@@ -259,7 +263,7 @@ export const toolbars = createToolbars({
   createGroup: {
     component: TipIcons.CreateGroup,
     getVisible() {
-      return this.store.selected.length > 1;
+      return this.controls.selectCtrl.gizmo.selectedIds.length > 1;
     },
     onClick() {
       console.log("打组");