lianghongjie hace 1 año
padre
commit
8919096353

+ 9 - 0
src/hooks/initRemSize.ts

@@ -6,6 +6,15 @@ export function initRemSize() {
     const width = clientWidth > 750 ? 750 : clientWidth;
     const fontSize = (width / 750) * (isPc() ? 50 : 100);
     document.documentElement.style.fontSize = fontSize + "px";
+
+    // if (!isPc()) {
+    //   const meta = document.querySelector(
+    //     "meta[name=viewport]"
+    //   ) as HTMLMetaElement;
+    //   if (meta) {
+    //     meta.content = `width=375,initial-scale=${window.outerWidth / 375}`;
+    //   }
+    // }
   }
 
   window.addEventListener("resize", setRem);

+ 1 - 1
src/modules/editor/components/CompUI/customUI/Cards/Card15/component.tsx

@@ -35,7 +35,7 @@ export const Component = createUIComp({
             >
               <Text.Component
                 compId={children.colorText}
-                class="min-w-1.25rem px-0.1rem bg-light-50"
+                class="min-w-1.25rem bg-light-50"
               />
             </div>
           </div>

+ 18 - 18
src/modules/editor/controllers/TransferCtrl/GroupCtrl.ts

@@ -4,24 +4,24 @@ import { DesignComp } from "../../objects/DesignTemp/DesignComp";
 import { Matrix } from "./Matrix";
 
 export class GroupActionCtrl extends ModuleControl<EditorModule> {
-  init() {
-    document.body.addEventListener("keydown", this.enableGroupMode);
-  }
-  enableGroupMode = (event: KeyboardEvent) => {
-    if (event.key === "Control" && !this.store.groupModeStatus) {
-      this.actions.enableGroupMode();
-      document.body.addEventListener("keyup", this.disableGroupMode);
-    }
-  };
-  disableGroupMode = (event: KeyboardEvent) => {
-    if (event.key === "Control") {
-      this.actions.disableGroupMode();
-      document.body.removeEventListener("keyup", this.disableGroupMode);
-    }
-  };
-  destroy() {
-    document.body.removeEventListener("keydown", this.enableGroupMode);
-  }
+  // init() {
+  //   document.body.addEventListener("keydown", this.enableGroupMode);
+  // }
+  // enableGroupMode = (event: KeyboardEvent) => {
+  //   if (event.key === "Control" && !this.store.groupModeStatus) {
+  //     this.actions.enableGroupMode();
+  //     document.body.addEventListener("keyup", this.disableGroupMode);
+  //   }
+  // };
+  // disableGroupMode = (event: KeyboardEvent) => {
+  //   if (event.key === "Control") {
+  //     this.actions.disableGroupMode();
+  //     document.body.removeEventListener("keyup", this.disableGroupMode);
+  //   }
+  // };
+  // destroy() {
+  //   document.body.removeEventListener("keydown", this.enableGroupMode);
+  // }
 
   async combineGroup() {
     const { helper, store } = this;

+ 0 - 2
src/modules/editor/controllers/TransferCtrl/index.ts

@@ -51,8 +51,6 @@ export class TransferCtrl extends ModuleControl<EditorModule> {
   };
 
   init(pageEl: HTMLElement) {
-    this.groupCtrl.init();
-
     this.currComp = this.module.store.currComp;
     this.compEl = this.currComp.$el;
     this.pageEl = pageEl;

+ 1 - 0
src/modules/editor/module/helpers/index.ts

@@ -7,6 +7,7 @@ import { Layout } from "../../typings";
 export const helpers = EditorModule.helper({
   designToNaturalSize(value: number) {
     return parseFloat((value / 100).toFixed(2)) + "rem";
+    // return value / 2 + "px";
   },
   pxToDesignSize(value: number) {
     return value * 2;