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

src/modules/editor/components/CompUI/formItems/NewColorPicker/Picker.tsx

@@ -85,7 +85,7 @@ export default defineComponent({
       eyeDropper
         .open()
         .then((result: any) => {
-          emit("change", result);
+          emit("change", result.sRGBHex);
         })
         .catch((e: any) => {
           console.log("e: ", e);
@@ -102,19 +102,19 @@ export default defineComponent({
           <div class="mt-15px flex items-center justify-between">
             <Input
               readonly
-              value={colorObj.hex()}
-              class="flex-1 bg-dark-300 h-36px hover:bg-dark-300 text-center"
               bordered={false}
+              value={colorObj.hex()}
+              class="flex-1 bg-[#3B3B3B] h-36px text-center cursor-pointer hover:opacity-80"
             />
             <Input
               readonly
               value={opacity}
-              class="w-60px ml-10px bg-dark-300 h-36px hover:bg-dark-300 text-center"
+              class="w-60px ml-10px bg-[#3B3B3B] h-36px text-center hover:opacity-80"
               bordered={false}
             />
             {state.showPicker && (
               <IconPicker
-                class="ml-10px text-36px bg-dark-300 rounded-2px transition cursor-pointer !hidden hover:opacity-60"
+                class="ml-10px text-36px bg-[#3B3B3B] rounded-2px transition cursor-pointer hover:opacity-80"
                 onClick={pickColor}
               />
             )}

src/modules/editor/components/CompUI/formItems/NewColorPicker/index.tsx

@@ -58,7 +58,7 @@ export default defineComponent({
       const { color } = state;
 
       return (
-        <div class="space-x-10px flex">
+        <div class="space-x-10px flex items-center">
           <Popover
             // visible={true}
             color="#303030"
@@ -102,7 +102,7 @@ export default defineComponent({
               if (!v) storeColors();
             }}
           >
-            <IconPalette class="rounded bg-[#303030] text-30px text-light-50 cursor-pointer" />
+            <IconPalette class="rounded bg-[#303030] text-30px !leading-0 text-light-50 cursor-pointer" />
           </Popover>
         </div>
       );

src/modules/editor/objects/DesignTemp/creates/createCompStyle.ts

@@ -97,7 +97,10 @@ export function createCompStyle(
   if (layout.transformMatrix) {
     const m = Matrix.createFromMatrixStr(layout.transformMatrix);
     m.ty = parseFloat(
-      designToNaturalSize(pxToDesignSize(m.ty), { adaptiveH: true })
+      designToNaturalSize(pxToDesignSize(m.ty), {
+        adaptiveH:
+          module.helper.findParentComp(comp.id)?.layout.size[2]?.unit === "%",
+      })
     );
     style.transform = m.getMatrixStr(); //layout.transformMatrix;
     style.transformOrigin = "0 0";