qinyan 1 year ago
parent
commit
1c154fb9c4
27 changed files with 117 additions and 55 deletions
  1. 11 3
      src/modules/editor/components/CompUI/customUI/Cards/Card/index.tsx
  2. 1 1
      src/modules/editor/components/CompUI/customUI/Cards/Card11/component.tsx
  3. 6 8
      src/modules/editor/components/CompUI/customUI/Cards/Card11/index.ts
  4. 1 1
      src/modules/editor/components/CompUI/customUI/Cards/Card12/component.tsx
  5. 3 3
      src/modules/editor/components/CompUI/customUI/Cards/Card12/index.ts
  6. 2 2
      src/modules/editor/components/CompUI/customUI/Cards/Card13/component.tsx
  7. 1 2
      src/modules/editor/components/CompUI/customUI/Cards/Card13/index.ts
  8. 2 2
      src/modules/editor/components/CompUI/customUI/Cards/Card14/component.tsx
  9. 1 2
      src/modules/editor/components/CompUI/customUI/Cards/Card14/index.ts
  10. 5 5
      src/modules/editor/components/CompUI/customUI/Cards/Card15/component.tsx
  11. 8 3
      src/modules/editor/components/CompUI/customUI/Cards/Card15/index.ts
  12. 1 1
      src/modules/editor/components/CompUI/customUI/Cards/Card2/index.tsx
  13. 1 1
      src/modules/editor/components/CompUI/customUI/Cards/Card3/component.tsx
  14. 1 1
      src/modules/editor/components/CompUI/customUI/Cards/Card3/index.ts
  15. 1 1
      src/modules/editor/components/CompUI/customUI/Cards/Card5/component.tsx
  16. 9 3
      src/modules/editor/components/CompUI/customUI/Cards/Card5/index.ts
  17. 1 1
      src/modules/editor/components/CompUI/customUI/Cards/CardList/component.tsx
  18. 8 2
      src/modules/editor/components/CompUI/customUI/Cards/CardList/index.tsx
  19. 2 2
      src/modules/editor/components/CompUI/customUI/Covers/Cover/component.tsx
  20. 9 0
      src/modules/editor/components/CompUI/customUI/Covers/Cover/index.ts
  21. 15 0
      src/modules/editor/components/CompUI/customUI/Covers/Cover2/index.ts
  22. 1 0
      src/modules/editor/components/CompUI/customUI/Texts/Text1/component.tsx
  23. 13 4
      src/modules/editor/components/CompUI/customUI/Texts/Text1/index.ts
  24. 3 0
      src/modules/editor/components/CompUI/customUI/Titles/Title1/index.ts
  25. 2 3
      src/modules/editor/components/CompUI/customUI/Titles/Title2/index.ts
  26. 7 2
      src/modules/editor/components/CompUI/customUI/Titles/Title3/index.ts
  27. 2 2
      src/modules/editor/components/CompUI/customUI/index.ts

+ 11 - 3
src/modules/editor/components/CompUI/customUI/Cards/Card/index.tsx

@@ -16,10 +16,18 @@ export const { createComp, useCompData } = createCompHooks({
   value: {
     imgSize: [240, 240],
   },
+  layout: {
+    padding: "0.2rem 0.35rem",
+    size: [750, 500],
+  },
   children: {
-     img: ()=>createCompId("Image", {value: {url:thumb, x: 25.50, y: 7.00, s: 3.80}}),
-     desc: ()=>createCompId("Text", {value: `<p><span style="font-size:16px;">名称 &nbsp; p190 (注塑)</span></p><p><span style="font-size:16px;">规格 &nbsp; 52英寸</span></p><p><span style="font-size:16px;">厚度 &nbsp;1.0mm+0.05mm</span></p><p><span style="font-size:16px;">底材 &nbsp;鹿皮绒</span></p><p><span style="font-size:16px;">用途 &nbsp;凉鞋、跟鞋、高更鞋、</span><br><span style="font-size:16px;">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 时尚休闲鞋等</span></p>`})
-  }
+    img: () =>
+      createCompId("Image", { value: { url: thumb, x: 25.5, y: 7.0, s: 3.8 } }),
+    desc: () =>
+      createCompId("Text", {
+        value: `<p><span style="font-size:16px;">名称 &nbsp; p190 (注塑)</span></p><p><span style="font-size:16px;">规格 &nbsp; 52英寸</span></p><p><span style="font-size:16px;">厚度 &nbsp;1.0mm+0.05mm</span></p><p><span style="font-size:16px;">底材 &nbsp;鹿皮绒</span></p><p><span style="font-size:16px;">用途 &nbsp;凉鞋、跟鞋、高更鞋、</span><br><span style="font-size:16px;">&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; 时尚休闲鞋等</span></p>`,
+      }),
+  },
 });
 
 export const Form = createAttrsForm([

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

@@ -27,7 +27,7 @@ export const Component = createUIComp({
 
     return () => {
       return (
-        <div class="flex">
+        <div class="flex px-0.35rem pt-0.3rem">
           <div class="flex-1 mx-0.3rem leading-loose relative z-10 w-0">
             <Text.Component compId={children.text} class="mt-0.2rem" />
             <div class="flex mt-0.2rem flex-wrap mr-0.8rem ml-0.2rem">

+ 6 - 8
src/modules/editor/components/CompUI/customUI/Cards/Card11/index.ts

@@ -12,8 +12,6 @@ export const options = {
 
 export const { createComp, useCompData, useCreateChild } = createCompHooks({
   layout: {
-    padding: "0.5rem 0",
-    // margin: "0.3rem 0.35rem",
     size: [750, 500],
   },
   value: {
@@ -33,8 +31,8 @@ export const { createComp, useCompData, useCreateChild } = createCompHooks({
           url: require("@/assets/comps/Card11/img_1.jpg"),
         },
         layout: {
-          size: [200, 400]
-        }
+          size: [251, 417],
+        },
       }),
     img2: () =>
       createCompId("Image", {
@@ -42,8 +40,8 @@ export const { createComp, useCompData, useCreateChild } = createCompHooks({
           url: require("@/assets/comps/Card11/img_shoe.png"),
         },
         layout: {
-          size: [200, 200]
-        }
+          size: [317, 240],
+        },
       }),
     list: (defaultOpts: any, length = 3) => {
       let i = 0;
@@ -54,8 +52,8 @@ export const { createComp, useCompData, useCreateChild } = createCompHooks({
             url: require(`@/assets/comps/Card11/cover_${i}.png`),
           },
           layout: {
-            size: [60, 60]
-          }
+            size: [72, 72],
+          },
         });
       });
     },

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

@@ -12,7 +12,7 @@ export const Component = createUIComp({
     const { children, value } = useCompData(props.compId);
 
     return () => (
-      <div class={cx("relative text-black overflow-hidden", rootStyles)}>
+      <div class={cx("relative pt-0.3rem text-black overflow-hidden", rootStyles)}>
         <div class="flex justify-end items-center relative mb-0.4rem">
           <div class="absolute right-0 top-1/2 h-3/2 w-5rem border-dark-300 border-1 border-solid border-r-0 border-b-0"></div>
           <Text.Component

+ 3 - 3
src/modules/editor/components/CompUI/customUI/Cards/Card12/index.ts

@@ -15,9 +15,7 @@ export const { createComp, useCompData } = createCompHooks({
     themeColor: "#5BA9CB",
   },
   layout: {
-    padding: "0.5rem 0",
-    // margin: "0.5rem 0.35rem",
-    size: [750, 500],
+    size: [750, 800],
   },
   children: {
     text: () =>
@@ -25,6 +23,7 @@ export const { createComp, useCompData } = createCompHooks({
         value: `<p><span style="font-size:20px;"><strong>P190-2#</strong></span></p>`,
         layout: {
           textAlign: "center",
+          size: [240, 60],
         },
       }),
     text2: () =>
@@ -32,6 +31,7 @@ export const { createComp, useCompData } = createCompHooks({
         value: `<p style="text-align:center;"><span style="color:hsl(0, 0%, 0%);">2#</span><br><span style="color:hsl(0, 0%, 0%);">克莱因蓝</span></p>`,
         layout: {
           textAlign: "center",
+          size: [124, 80],
         },
       }),
     img1: () =>

+ 2 - 2
src/modules/editor/components/CompUI/customUI/Cards/Card13/component.tsx

@@ -11,7 +11,7 @@ export const Component = createUIComp({
     const { children } = useCompData(props.compId);
 
     return () => (
-      <div class="relative flex text-black overflow-hidden">
+      <div class="relative flex px-0.35rem pt-0.4rem text-black overflow-hidden">
         <div class="ml-0.15rem mr-0.2rem">
           <Image.Component
             compId={children.img1}
@@ -21,7 +21,7 @@ export const Component = createUIComp({
         <div class="flex-1 mt-1rem py-0.58rem px-0.2rem mb-1.3rem border-2px border-black border-solid leading-loose">
           <Text.Component compId={children.text} />
         </div>
-        <div class="absolute bottom-0 left-0">
+        <div class="absolute bottom-0.1rem left-0.35rem">
           <Image.Component
             compId={children.imgShoe}
             class="w-3.5rem h-2.8rem object-cover"

+ 1 - 2
src/modules/editor/components/CompUI/customUI/Cards/Card13/index.ts

@@ -12,8 +12,7 @@ export const options = {
 export const { createComp, useCompData } = createCompHooks({
   value: {},
   layout: {
-    padding: "0 0.35rem",
-    size: [750, 500],
+    size: [750, 800],
   },
   children: {
     text: () =>

+ 2 - 2
src/modules/editor/components/CompUI/customUI/Cards/Card14/component.tsx

@@ -11,8 +11,8 @@ export const Component = createUIComp({
     const { children } = useCompData(props.compId);
 
     return () => (
-      <div class="">
-        <div class="flex justify-end relative pb-0.22rem z-10">
+      <div class="pt-0.2rem px-0.35rem">
+        <div class="flex justify-end relative pb-0.22rem  z-10">
           <div class="absolute left-0 bottom-0 z-10">
             <Image.Component
               compId={children.imgShoe}

+ 1 - 2
src/modules/editor/components/CompUI/customUI/Cards/Card14/index.ts

@@ -12,8 +12,7 @@ export const options = {
 export const { createComp, useCompData } = createCompHooks({
   value: {},
   layout: {
-    padding: "0 0.35rem",
-    size: [750, 500],
+    size: [750, 750],
   },
   children: {
     text: () =>

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

@@ -12,7 +12,7 @@ export const Component = createUIComp({
     const { children, value } = useCompData(props.compId);
 
     return () => (
-      <div class={cx(rootStyles, "text-black")}>
+      <div class={cx(rootStyles, "pl-0.65rem pr-0.35rem pt-0.3rem text-black")}>
         <div class="relative mb-0.4rem flex items-center justify-start">
           <Text.Component
             compId={children.title}
@@ -21,7 +21,7 @@ export const Component = createUIComp({
           <div class="absolute left-0 top-1/2 w-5.1rem h-3/2 border-solid border-dark-200 border-1 border-b-0 border-l-0"></div>
         </div>
         <div
-          class="relative pl-0.28rem"
+          class="relative"
           style={{
             backgroundImage: `linear-gradient(${value.themeColor} 87%, #fff 87%)`,
           }}
@@ -43,14 +43,14 @@ export const Component = createUIComp({
             compId={children.img1}
             class="-ml-0.28rem w-6.22rem h-6.22rem object-cover"
           />
-          <div class="relative flex justify-end mt-0.5rem pb-0.35rem -ml-0.28rem">
+          <div class="relative flex justify-end mt-0.5rem pb-0.35rem">
             <Text.Component
               compId={children.text}
-              class="w-4.75rem py-0.55rem bg-light-50 border-dark-200 border-2 border-solid leading-loose"
+              class="w-4.75rem py-0.3rem bg-light-50 border-dark-200 border-2 border-solid leading-loose"
             />
             <Image.Component
               compId={children.img2}
-              class="!absolute bottom-0 left-0 w-4rem h-2.85rem object-cover"
+              class="!absolute bottom-0 left-0 -ml-0.28rem w-4rem h-2.85rem object-cover"
             />
           </div>
         </div>

+ 8 - 3
src/modules/editor/components/CompUI/customUI/Cards/Card15/index.ts

@@ -15,24 +15,29 @@ export const { createComp, useCompData } = createCompHooks({
     themeColor: "#6D8D70",
   },
   layout: {
-    padding: "0 0.35rem",
-    size: [750, 500],
+    size: [750, 1200],
   },
   children: {
     title: () =>
       createCompId("Text", {
         value:
           '<p><span style="font-size:24px;"><strong>P190-3#</strong></span></p>',
+        layout: {
+          size: [260, 60],
+        },
       }),
     colorText: () =>
       createCompId("Text", {
         value: `<p style="text-align:center;"><span style="color:hsl(0, 0%, 0%);font-size:12px;">3#&nbsp;</span></p><p style="text-align:center;"><span style="color:hsl(0, 0%, 0%);font-size:12px;">铜绿色</span></p>`,
+        layout: {
+          size: [130, 80],
+        },
       }),
     text: () =>
       createCompId("Text", {
         value: `<p style="text-align:center;"><span style="color:hsl(0,0%,0%);font-size:12px;">绿色是个舒服的颜色,&nbsp;</span></p><p style="text-align:center;"><span style="color:hsl(0,0%,0%);font-size:12px;">处处充满着生机和希望,</span></p><p style="text-align:center;"><span style="color:hsl(0,0%,0%);font-size:12px;">&nbsp;其明净空旷往往让人迷失其中,</span></p><p style="text-align:center;"><span style="color:hsl(0,0%,0%);font-size:12px;">&nbsp;给人无限的对未来的憧憬,</span></p><p style="text-align:center;"><span style="color:hsl(0,0%,0%);font-size:12px;">&nbsp;不需要过多的言语,让心灵感到平和</span></p>`,
         layout: {
-          textAlign: "center",
+          size: [475, 328],
         },
       }),
     img2: () =>

+ 1 - 1
src/modules/editor/components/CompUI/customUI/Cards/Card2/index.tsx

@@ -17,7 +17,7 @@ export const { createComp, useCompData } = createCompHooks({
   value: {},
   layout: {
     padding: "0 0 0.2rem 0",
-    size: [750, 500],
+    size: [750, 600],
   },
   children: {
     bgImg: () =>

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

@@ -13,7 +13,7 @@ export const Component = createUIComp({
     const { children } = useCompData(props.compId);
 
     return () => (
-      <div class="flex justify-between">
+      <div class="relative flex justify-between">
         <div class="flex flex-col justify-center">
           <Text.Component compId={children.text1} />
           <Text.Component class="mt-0.07rem" compId={children.text2} />

+ 1 - 1
src/modules/editor/components/CompUI/customUI/Cards/Card3/index.ts

@@ -17,7 +17,7 @@ export const { createComp, useCompData } = createCompHooks({
   value: {},
   layout: {
     padding: "0.2rem",
-    size: [750, 600],
+    size: [750, 300],
   },
   children: {
     bgImg: () =>

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

@@ -15,7 +15,7 @@ export const Component = createUIComp({
     return () => (
       <div class="relative w-full">
         <div class="!absolute w-full h-full flex justify-center items-center">
-          <Text.Component class="!absolute w-full" compId={children.text1} />
+          <Text.Component class="!absolute w-full tracking-5px" compId={children.text1} />
         </div>
         <div class="flex justify-center">
           <Image.Component

+ 9 - 3
src/modules/editor/components/CompUI/customUI/Cards/Card5/index.ts

@@ -16,18 +16,24 @@ export const options = {
 export const { createComp, useCompData } = createCompHooks({
   value: {},
   layout: {
-    size: [750, 500]
+    size: [750, 275],
   },
   children: {
     bgImg: () =>
       createCompId("Image", {
         value: {
-          url: "https://sku3d-test.obs.cn-east-3.myhuaweicloud.com/queenshow/1685609522134_nGPo9k_2.png",
+          url: require("@/assets/comps/Card14/img_shoe.png"),
+        },
+        layout: {
+          size: [750, 275],
         },
       }),
     text1: () =>
       createCompId("Text", {
-        value: `<p style="text-align:center;"><span style="color:hsl(0,0%,90%);font-size:52px;">F A SH I O N</span></p>`,
+        value: `<p style="text-align:center;"><span style="color:hsl(0,0%,90%);font-size:60px;">FASHION</span></p>`,
+        layout: {
+          size: [750, 275],
+        },
       }),
   },
 });

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

@@ -29,7 +29,7 @@ export const Component = createUIComp({
 
     return () => (
       <div
-        class="grid"
+        class="grid px-0.2rem pt-0.3rem"
         style={{
           gridTemplateColumns: `repeat(${value.columns}, 1fr)`,
           gridGap: helper.designToNaturalSize(value.gap),

+ 8 - 2
src/modules/editor/components/CompUI/customUI/Cards/CardList/index.tsx

@@ -12,6 +12,9 @@ export const options = {
 };
 
 export const { createComp, useCompData, useCreateChild } = createCompHooks({
+  layout: {
+    size: [750, 420],
+  },
   value: {
     gap: 10,
     columns: 3,
@@ -40,11 +43,14 @@ export const { createComp, useCompData, useCreateChild } = createCompHooks({
               ...offset,
             },
             layout: {
-              size: [0, 0]
-            }
+              size: [230, 300],
+            },
           }),
           desc: createCompId("Text", {
             value: `<p style="text-align:center;">这是一个小标题</p>`,
+            layout: {
+              size: [230, 40],
+            },
           }),
         };
       });

+ 2 - 2
src/modules/editor/components/CompUI/customUI/Covers/Cover/component.tsx

@@ -38,8 +38,8 @@ const titleCls = css`
   position: absolute;
   left: 50%;
   top: 20%;
-  width: 7rem;
-  transform: translateX(-50%);
+  /* width: 7rem; */
+  transform: translateX(-50%) !important;
 `;
 
 const arrowCls = css`

+ 9 - 0
src/modules/editor/components/CompUI/customUI/Covers/Cover/index.ts

@@ -10,6 +10,9 @@ export const options = {
 };
 
 export const { createComp, useCompData } = createCompHooks({
+  layout: {
+    size: [750, 1300],
+  },
   value: {},
   children: {
     bg: () =>
@@ -17,10 +20,16 @@ export const { createComp, useCompData } = createCompHooks({
         value: {
           url: "https://infishwaibao.oss-cn-chengdu.aliyuncs.com/release/sku3d/img/partner_bg.5e324d05.png",
         },
+        layout: {
+          size: [750, 1300],
+        },
       }),
     title: () =>
       createCompId("Text", {
         value: `<p style="text-align:center;"><span style="color:hsl(0,0%,100%);font-size:28px;">新科技反光面料</span></p><p style="text-align:center;"><span style="color:hsl(0,0%,100%);font-size:28px;">引领潮流新风尚</span></p><p style="text-align:center;">&nbsp;</p><p style="text-align:center;"><span style="color:hsl(0,0%,100%);font-size:16px;">时尚 | 精致 | 百搭</span></p>`,
+        layout: {
+          size: [750, 200],
+        },
       }),
   },
 });

+ 15 - 0
src/modules/editor/components/CompUI/customUI/Covers/Cover2/index.ts

@@ -11,6 +11,9 @@ export const options = {
 
 export const { createComp, useCompData } = createCompHooks({
   value: {},
+  layout: {
+    size: [750, 500],
+  },
   children: {
     img1: () =>
       createCompId("Image", {
@@ -20,22 +23,34 @@ export const { createComp, useCompData } = createCompHooks({
           y: 0,
           s: 1,
         },
+        layout: {
+          size: [451, 1022],
+        },
       }),
     img2: () =>
       createCompId("Image", {
         value: {
           url: require("@/assets/comps/Cover2/img_2.jpg"),
         },
+        layout: {
+          size: [167, 306],
+        },
       }),
     img3: () =>
       createCompId("Image", {
         value: {
           url: require("@/assets/comps/Cover2/img_3.jpg"),
         },
+        layout: {
+          size: [167, 208],
+        },
       }),
     title: () =>
       createCompId("Text", {
         value: `<p style="text-align:center;"><span style="color:hsl(0,0%,60%);font-size:42px;">NEW &nbsp;</span><span style="font-size:42px;"> FasHION</span></p><p>&nbsp;</p>`,
+        layout: {
+          size: [750, 110],
+        },
       }),
     text1: () =>
       createCompId("Text", {

+ 1 - 0
src/modules/editor/components/CompUI/customUI/Texts/Text1/component.tsx

@@ -58,6 +58,7 @@ export const Component = createUIComp({
 });
 
 const rootStyles = css`
+  padding: 0 0.2rem;
   .text {
     &::before {
       content: "";

+ 13 - 4
src/modules/editor/components/CompUI/customUI/Texts/Text1/index.ts

@@ -35,8 +35,7 @@ export const options = {
 
 export const { createComp, useCompData, useCreateChild } = createCompHooks({
   layout: {
-    padding: " 0 0.2rem",
-    size: [750, 100]
+    size: [750, 420],
   },
   value: {
     columns: 5,
@@ -50,8 +49,18 @@ export const { createComp, useCompData, useCreateChild } = createCompHooks({
       return Array.from({ length }, () => {
         i = i + 1;
         return {
-          label: createCompId("Text", { value: defaultData[i]?.label }),
-          content: createCompId("Text", { value: defaultData[i]?.content }),
+          label: createCompId("Text", {
+            value: defaultData[i]?.label,
+            layout: {
+              size: [160, 60],
+            },
+          }),
+          content: createCompId("Text", {
+            value: defaultData[i]?.content,
+            layout: {
+              size: [160, 60],
+            },
+          }),
         };
       });
     },

+ 3 - 0
src/modules/editor/components/CompUI/customUI/Titles/Title1/index.ts

@@ -12,6 +12,9 @@ export const options = {
 };
 
 export const { createComp, useCompData } = createCompHooks({
+  layout: {
+    size: [750, 180],
+  },
   value: {
     themeColor: "#666666",
   },

+ 2 - 3
src/modules/editor/components/CompUI/customUI/Titles/Title2/index.ts

@@ -12,15 +12,14 @@ export const options = {
 export const { createComp, useCompData } = createCompHooks({
   value: {},
   layout: {
-    padding: "0.5rem 0",
-    size: [750, 300]
+    size: [750, 80],
   },
   children: {
     title: () =>
       createCompId("Text", {
         value: `<p style="text-align:center;"><span style="color:#333;font-size:20px;font-weight: bold;">产品信息</span></p>`,
         layout: {
-          textAlign: "center",
+          size: [300, 60],
         },
       }),
   },

+ 7 - 2
src/modules/editor/components/CompUI/customUI/Titles/Title3/index.ts

@@ -15,17 +15,22 @@ export const options = {
 export const { createComp, useCompData } = createCompHooks({
   value: {},
   layout: {
-    padding: "0.2rem",
-    size: [750,300]
+    size: [750, 130],
   },
   children: {
     title: () =>
       createCompId("Text", {
         value: `<p style="text-align:center;"><span style="color:#333;font-size:20px;font-weight: bold;">产品详情</span></p>`,
+        layout: {
+          size: [750, 70],
+        },
       }),
     subtitle: () =>
       createCompId("Text", {
         value: `<p style="text-align:center;">/ Product Details /</p>`,
+        layout: {
+          size: [750, 60],
+        },
       }),
   },
 });

+ 2 - 2
src/modules/editor/components/CompUI/customUI/index.ts

@@ -1,8 +1,8 @@
-export * as Card from "./Cards/Card";
+// export * as Card from "./Cards/Card";
 export * as Card2 from "./Cards/Card2";
 export * as Card3 from "./Cards/Card3";
 export * as CardList from "./Cards/CardList";
-export * as Card4 from "./Cards/Card4";
+// export * as Card4 from "./Cards/Card4";
 export * as Card5 from "./Cards/Card5";
 export * as Cards11 from "./Cards/Card11";
 export * as Cards12 from "./Cards/Card12";