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

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

@@ -62,7 +62,7 @@ export const SelectTransfer = defineComponent({
       return (
         <div
           class={[
-            "absolute transfer z-1001",
+            "absolute transfer z-1000",
             transferStyle.showGizmo ? showgizmo : hideGizmo,
            
           ]}

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="relative flex justify-between">
+      <div class="relative flex justify-between px-0.35rem overflow-hidden">
         <div class="flex flex-col justify-center">
           <Text.Component compId={children.text1} />
           <Text.Component class="mt-0.07rem" compId={children.text2} />

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

@@ -16,13 +16,15 @@ export const options = {
 export const { createComp, useCompData } = createCompHooks({
   value: {},
   layout: {
-    padding: "0.2rem",
-    size: [750, 300],
+    size: [750, 250],
   },
   children: {
     bgImg: () =>
       createCompId("Image", {
         value: { url: thumbnail, x: -25.0, y: -0.5, s: 2.1 },
+        layout: {
+          size: [317, 240],
+        },
       }),
     item1: () =>
       createCompId("Image", {
@@ -39,10 +41,16 @@ export const { createComp, useCompData } = createCompHooks({
     text1: () =>
       createCompId("Text", {
         value: `<p><span style="color:hsl(0, 0%, 0%);font-size:14px;"><strong>P190注塑</strong></span></p>`,
+        layout: {
+          size: [300, 50],
+        },
       }),
     text2: () =>
       createCompId("Text", {
         value: `复古羊巴 / 2023年新品`,
+        layout: {
+          size: [300, 40],
+        },
       }),
   },
 });

src/modules/editor/components/CompUI/customUI/index.ts

@@ -5,7 +5,7 @@ export * as Cards13 from "./Cards/Card13";
 export * as Cards14 from "./Cards/Card14";
 export * as Cards15 from "./Cards/Card15";
 export * as Card2 from "./Cards/Card2";
-// export * as Card3 from "./Cards/Card3";
+export * as Card3 from "./Cards/Card3";
 // export * as Card4 from "./Cards/Card4";
 export * as Card5 from "./Cards/Card5";
 export * as CardList from "./Cards/CardList";

src/modules/editor/components/Viewport/Slider/SliderLeft/MySources.tsx

@@ -44,7 +44,7 @@ export const MySources = defineComponent({
             : "materialVideoListCtrl"
         ];
       return (
-        <div class="space-y-20px -mt-10px">
+        <div class="space-y-20px -mt-10px flex flex-col overflow-hidden">
           <Radio.Group
             class={radioCls}
             value={state.sourceType}
@@ -54,35 +54,36 @@ export const MySources = defineComponent({
             <Radio.Button value="Image">图片</Radio.Button>
             <Radio.Button value="Video">视频</Radio.Button>
           </Radio.Group>
-
-          <List data={control.state.list} columns={2} gap="20px">
-            {{
-              item(item: any) {
-                return (
-                  <div
-                    style={{ aspectRatio: 1 }}
-                    onClick={() => clickToDesign(item.file.url)}
-                  >
-                    <Image
-                      class="w-full h-full"
-                      src={item.file.url}
-                      size={240}
+          <div class="scrollbar flex-1 -mr-15px pr-15px">
+            <List data={control.state.list} columns={2} gap="20px">
+              {{
+                item(item: any) {
+                  return (
+                    <div
+                      style={{ aspectRatio: 1 }}
+                      onClick={() => clickToDesign(item.file.url)}
+                    >
+                      <Image
+                        class="w-full h-full"
+                        src={item.file.url}
+                        size={240}
+                      />
+                    </div>
+                  );
+                },
+                loadmore() {
+                  return (
+                    <Loadmore
+                      class="mt-20px"
+                      loading={control.state.loading}
+                      canLoad={control.state.canLoadNext}
+                      onChange={control.loadNextPage}
                     />
-                  </div>
-                );
-              },
-              loadmore() {
-                return (
-                  <Loadmore
-                    class="mt-20px"
-                    loading={control.state.loading}
-                    canLoad={control.state.canLoadNext}
-                    onChange={control.loadNextPage}
-                  />
-                );
-              },
-            }}
-          </List>
+                  );
+                },
+              }}
+            </List>
+          </div>
         </div>
       );
     };