qinyan 1 anno fa
parent
commit
7ed2e7b3c0

+ 3 - 3
src/modules/editor/components/CompUI/formItems/NewColorPicker/Panel.tsx

@@ -43,7 +43,7 @@ export default defineComponent({
               />
             </Tabs.TabPane>
             <Tabs.TabPane tab="渐变" key={"1"}>
-              <MutiColor
+              <GradientColor
                 value={props.value}
                 onChange={(data) => emit("change", data)}
               />
@@ -74,7 +74,7 @@ const PureColor = defineComponent({
   },
 });
 
-const MutiColor = defineComponent({
+const GradientColor = defineComponent({
   props: {
     value: any<string | gradientColorType>().isRequired,
   },
@@ -165,7 +165,7 @@ const MutiColor = defineComponent({
                 class="w-38px h-38px rounded cursor-pointer bg-[#3b3b3b] flex items-center justify-center transition hover:opacity-70"
                 onClick={addColor}
               >
-                <IconAddLine class="text-22px text-dark-300" />
+                <IconAddLine class="text-22px text-light-50" />
               </div>
             )}
           </div>

+ 3 - 2
src/modules/editor/components/CompUI/formItems/NewColorPicker/Picker.tsx

@@ -86,6 +86,7 @@ export default defineComponent({
         .open()
         .then((result: any) => {
           emit("change", result.sRGBHex);
+          pickr.value.color.set(result.sRGBHex);
         })
         .catch((e: any) => {
           console.log("e: ", e);
@@ -104,12 +105,12 @@ export default defineComponent({
               readonly
               bordered={false}
               value={colorObj.hex()}
-              class="flex-1 bg-[#3B3B3B] h-36px text-center cursor-pointer hover:opacity-80"
+              class="flex-1 bg-[#3B3B3B] h-36px text-center cursor-pointer hover:bg-[#3B3B3B] focus:bg-[#3B3B3B]"
             />
             <Input
               readonly
               value={opacity}
-              class="w-60px ml-10px bg-[#3B3B3B] h-36px text-center hover:opacity-80"
+              class="w-60px ml-10px bg-[#3B3B3B] h-36px text-center hover:bg-[#3B3B3B] focus:bg-[#3B3B3B]"
               bordered={false}
             />
             {state.showPicker && (

+ 1 - 1
src/modules/editor/components/CompUI/formItems/NewColorPicker/index.tsx

@@ -31,7 +31,7 @@ export default defineComponent({
     function getColor() {
       if (typeof props.value == "string") {
         const colorObj = Color(props.value);
-        return colorObj.hex();
+        return colorObj.hexa();
       } else {
         return props.value || "#ffffff";
       }

+ 2 - 2
src/modules/editor/components/Viewport/Slider/SliderLeft/Templates/index.tsx

@@ -1,19 +1,19 @@
+import { IconPreview } from "@/assets/icons";
 import Empty from "@/components/Empty";
 import { useEditor } from "@/modules/editor";
 import { useResource } from "@/modules/resource";
-import { IconEyeOn } from "@queenjs/icons";
 import { Image, Loadmore } from "@queenjs/ui";
 import { defineUI, queenApi } from "queenjs";
 import Modal from "queenjs/adapter/vue/components/modal";
 import { Container, Draggable } from "vue-dndrop";
 import PreviewTplModal from "./PreviewTplModal";
-import { IconPreview } from "@/assets/icons";
 
 export default defineUI({
   setup() {
     const editor = useEditor();
     const source = useResource();
     const ctrl = source.controls.sysTplListCtrl;
+    ctrl.hasLimit = true;
     ctrl.loadPage(1);
 
     const preview = (record: any) => {

+ 1 - 1
src/pages/h5/share/Promotion.tsx

@@ -41,7 +41,7 @@ export default defineComponent(() => {
   // })
 
   return () => (
-    <div class="flex items-center justify-center h-100vh bg-gray-100">
+    <div class="flex items-center justify-center bg-gray-100">
       <div
         class={isPc() ? `scrollbar overflow-x-hidden` : `overflow-x-hidden`}
         style={{