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

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

@@ -12,8 +12,8 @@ export const options = {
 
 export const { createComp, useCompData, useCreateChild } = createCompHooks({
   layout: {
-    padding: "0.2rem 0",
-    margin: "0.3rem 0.35rem",
+    padding: "0.5rem 0",
+    // margin: "0.3rem 0.35rem",
   },
   value: {
     columns: 3,

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

@@ -14,23 +14,29 @@ export const Component = createUIComp({
     return () => (
       <div class={cx("relative text-black", rootStyles)}>
         <div class="flex justify-end items-center relative mb-0.4rem">
-          <div class="text_top absolute right-0 top-0 h-1/1 w-0"></div>
-          <div class="relative z-10 bg-light-50 pr-0.2rem">
-            <Text.Component compId={children.text} />
-          </div>
+          <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
+            compId={children.text}
+            class="relative z-10 bg-light-50 pr-0.2rem"
+          />
         </div>
         <div class="relative">
           <Image.Component
             compId={children.img1}
             class="w-6.22rem h-6.22rem object-cover mx-auto"
           />
-          <div
-            class="absolute right-5rem top-3rem min-w-1.5rem p-0.08rem pt-1rem border-light-50 border-0.08rem border-top-0.06rem border-solid card_color"
-            style={{
-              backgroundColor: value.themeColor,
-            }}
-          >
-            <Text.Component compId={children.text2} class="bg-light-50" />
+          <div class="absolute right-5rem top-3rem card_color">
+            <div
+              class="border-light-50 border-0.08rem border-top-0.06rem border-solid p-0.08rem pt-1rem"
+              style={{
+                backgroundColor: value.themeColor,
+              }}
+            >
+              <Text.Component
+                compId={children.text2}
+                class="min-w-1.5rem bg-light-50"
+              />
+            </div>
           </div>
         </div>
       </div>
@@ -39,26 +45,13 @@ export const Component = createUIComp({
 });
 
 const rootStyles = css`
-  .text_top {
-    &::before {
-      content: "";
-      position: absolute;
-      right: 0;
-      top: 50%;
-      width: 5rem;
-      height: 200%;
-      border-width: 1px 0 0 1px;
-      border-color: #000;
-      border-style: solid;
-    }
-  }
   .card_color {
     transform: translateX(50%);
     &::before {
       content: "";
       position: absolute;
       left: 50%;
-      top: -3.06rem;
+      bottom: 100%;
       width: 1px;
       height: 3rem;
       background-color: #fff;

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

@@ -16,7 +16,7 @@ export const { createComp, useCompData } = createCompHooks({
   },
   layout: {
     padding: "0.5rem 0",
-    margin: "0.5rem 0.35rem",
+    // margin: "0.5rem 0.35rem",
   },
   children: {
     text: () =>

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

@@ -12,8 +12,8 @@ export const options = {
 export const { createComp, useCompData } = createCompHooks({
   value: {},
   layout: {
-    padding: "0.3rem 0",
-    margin: "0 0.35rem",
+    padding: "0.5rem 0",
+    // margin: "0 0.35rem",
   },
   children: {
     text: () =>

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

@@ -12,8 +12,8 @@ export const options = {
 export const { createComp, useCompData } = createCompHooks({
   value: {},
   layout: {
-    padding: "0.3rem 0",
-    margin: "0 0.35rem",
+    padding: "0.5rem 0",
+    // margin: "0 0.35rem",
   },
   children: {
     text: () =>

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

@@ -12,45 +12,64 @@ export const Component = createUIComp({
     const { children, value } = useCompData(props.compId);
 
     return () => (
-      <div
-        class={cx(rootStyles, " pl-0.28rem")}
-        style={{
-          backgroundImage: `linear-gradient(#fff 1.3rem,${value.themeColor} 1.3rem, ${value.themeColor} 87%, #fff 87%)`,
-        }}
-      >
-        <div class="h-1.3rem">
-          <Text.Component compId={children.title} />
+      <div class={cx(rootStyles, "text-black")}>
+        <div class="relative mb-0.4rem flex items-center justify-start">
+          <Text.Component
+            compId={children.title}
+            class="relative -ml-0.1rem z-10 bg-light-50"
+          />
+          <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>
-        <Image.Component
-          compId={children.img1}
-          class="w-6.22rem h-6.22rem object-cover -ml-0.28rem"
-        />
-        <div class="absolute right-1rem top-3rem">
-          <div
-            class="p-0.08rem pt-1rem border-light-50 border-0.08rem border-top-0.06rem border-solid"
-            style={{
-              backgroundColor: value.themeColor,
-            }}
-          >
-            <div class="min-w-1.25rem px-0.1rem bg-light-50">
-              <Text.Component compId={children.colorText} />
+        <div
+          class="relative pl-0.28rem"
+          style={{
+            backgroundImage: `linear-gradient(${value.themeColor} 87%, #fff 87%)`,
+          }}
+        >
+          <div class="absolute left-5.1rem top-3rem z-10 card_color">
+            <div
+              class="p-0.08rem pt-1rem border-light-50 border-0.08rem border-top-0.06rem border-solid"
+              style={{
+                backgroundColor: value.themeColor,
+              }}
+            >
+              <Text.Component
+                compId={children.colorText}
+                class="min-w-1.25rem px-0.1rem bg-light-50"
+              />
             </div>
           </div>
-        </div>
-        <div class="flex flex-row-reverse mt-0.5rem mb-0.35rem">
-          <div class="w-4.75rem py-0.55rem bg-light-50 text-center border-dark-200 border-2 border-solid leading-2">
-            <Text.Component compId={children.text} />
+          <Image.Component
+            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">
+            <Text.Component
+              compId={children.text}
+              class="w-4.75rem py-0.55rem 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"
+            />
           </div>
         </div>
-        <Image.Component
-          compId={children.img2}
-          class="!absolute bottom-0 left-0 w-4rem h-2.85rem object-cover"
-        />
       </div>
     );
   },
 });
 
 const rootStyles = css`
-  background-clip: content-box;
+  .card_color {
+    transform: translateX(-50%);
+    &::before {
+      content: "";
+      position: absolute;
+      right: 50%;
+      bottom: 100%;
+      width: 1px;
+      height: 3rem;
+      background-color: #fff;
+    }
+  }
 `;

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

@@ -15,14 +15,14 @@ export const { createComp, useCompData } = createCompHooks({
     themeColor: "#6D8D70",
   },
   layout: {
-    // padding: "0.5rem 0",
-    margin: "0.5rem 0.35rem",
+    padding: "0.5rem 0",
+    // margin: "0.5rem 0.35rem",
   },
   children: {
     title: () =>
       createCompId("Text", {
         value:
-          '<p><span style="color:hsl(0, 0%, 0%);font-size:24px;"><strong>P190-3#</strong></span></p>',
+          '<p><span style="font-size:24px;"><strong>P190-3#</strong></span></p>',
       }),
     colorText: () =>
       createCompId("Text", {

src/pages/website/Material2/components/PreviewModal.tsx

@@ -16,16 +16,16 @@ export default defineUI({
         <div class="text-center min-h-400px">
           {data.fileType == "image" && (
             <Image
-              size={720}
+              size={1000}
               src={data.url}
-              class="max-w-1/1 max-h-600px"
+              class="max-w-1/1 max-h-800px"
               // style={{
               // backgroundColor: "#e1e5e8",
               // }}
             />
           )}
           {data.fileType == "video" && (
-            <video controls src={data.url} class="max-w-1/1 max-h-600px" />
+            <video controls src={data.url} class="max-w-1/1 max-h-800px" />
           )}
         </div>
       );

src/pages/website/Material2/controller.tsx

@@ -26,7 +26,7 @@ export default function createController(resource:any, isSelectModel:boolean, se
     }) => {
       resource.showModal(<PreviewModal data={data}  />, {
         title: "预览",
-        width: "800px",
+        width: "1000px",
         centered: true
       }); 
   };