qinyan 1 year ago
parent
commit
e0f9a8836d

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

@@ -39,11 +39,6 @@ const tabs = [
     component: CustomComps,
     props: { compType: "senior" },
   },
-  {
-    title: "组件",
-    icon: IconApplication,
-    component: Application,
-  },
   {
     title: "文字",
     icon: IconText,
@@ -101,6 +96,11 @@ const tabs = [
       },
     ],
   },
+  {
+    title: "组件",
+    icon: IconApplication,
+    component: Application,
+  },
   {
     title: "AI",
     icon: IconAi,
@@ -135,11 +135,11 @@ export default defineUI({
 
       return (
         <div class="h-full flex">
-          <div class="flex flex-col items-center w-70px py-10px border-right !border-2px overflow-hidden">
+          <div class="flex flex-col items-center w-70px py-10px border-right !border-2px overflow-x-hidden overflow-y-auto scrollbar">
             {tabs.map((record, index) => {
               return (
                 <>
-                  {index === tabs.length - 2 && <div class="flex-1"></div>}
+                  {index === tabs.length - 3 && <div class="flex-1"></div>}
                   <div
                     key={index}
                     class={cx(

+ 37 - 30
src/pages/website/Promotion2/components/PromotionItem.tsx

@@ -1,7 +1,7 @@
 import { css, cx } from "@linaria/core";
 import { IconMore } from "@queenjs/icons";
 import { Image, View } from "@queenjs/ui";
-import { Divider, Dropdown, Menu , Tag} from "ant-design-vue";
+import { Divider, Dropdown, Menu, Tag } from "ant-design-vue";
 import { EyeOutlined } from "@ant-design/icons-vue";
 import dayjs from "dayjs";
 import { defineUI } from "queenjs";
@@ -41,35 +41,31 @@ export default defineUI({
   },
   emits: ["edit", "preview", "menu"],
   setup(props, { emit }) {
-
     const auth = useAuth();
 
     return () => {
       const { record } = props;
-  
+
       //@ts-ignore
-      const isSys = (auth.store.userInfo.roles || []).indexOf("system") > -1
+      const isSys = (auth.store.userInfo.roles || []).indexOf("system") > -1;
 
-      
-        return (
+      return (
         <div class={cx(itemStyles, "relative")}>
           <View ratio={1} class="overflow-hidden relative">
             <Image
               class="h-1/1 w-1/1 !object-contain bg-[#ebebeb]"
               src={record?.thumbnail}
             />
-             
-            {
-               isSys && <Tag
-                  color="#E88B00"
-                  // color="rgba(0, 0, 0, 0.4)"
-                  class="absolute top-0 left-0 z-1 !rounded-none"
-                >
-                    {
-                      record.published ? "已发布" : "未发布"
-                    }
-                </Tag>
-            }
+
+            {isSys && (
+              <Tag
+                color="#E88B00"
+                // color="rgba(0, 0, 0, 0.4)"
+                class="absolute top-0 left-0 z-1 !rounded-none"
+              >
+                {record.published ? "已发布" : "未发布"}
+              </Tag>
+            )}
 
             <div class="absolute inset-0 flex items-center justify-center opacity-0 hover:opacity-100 transition-opacity">
               <div
@@ -101,14 +97,14 @@ export default defineUI({
             <Dropdown
               placement="bottom"
               overlay={
-                <Menu class="w-90px">
+                <Menu class={cx("w-90px", menuStyles)}>
                   {/* <Menu.Item>复制</Menu.Item> */}
                   <Menu.Item
                     onClick={() => {
                       emit("menu", "send");
                     }}
                   >
-                    发送作品
+                    发送到
                   </Menu.Item>
                   <Menu.Item>
                     <div onClick={() => emit("menu", "stat")}>统计分析</div>
@@ -120,17 +116,21 @@ export default defineUI({
                     <div onClick={() => emit("menu", "delete")}>删除</div>
                   </Menu.Item>
 
-                  {
-                     isSys && !record.published && <Menu.Item>
-                     <div onClick={() => emit("menu", "publish")}>发布平台</div>
-                   </Menu.Item>
-                  }
-                  
-                  {
-                     isSys && record.published && <Menu.Item>
-                      <div onClick={() => emit("menu", "unpublish")}>取消平台发布</div>
+                  {isSys && !record.published && (
+                    <Menu.Item>
+                      <div onClick={() => emit("menu", "publish")}>
+                        发布平台
+                      </div>
                     </Menu.Item>
-                  }
+                  )}
+
+                  {isSys && record.published && (
+                    <Menu.Item>
+                      <div onClick={() => emit("menu", "unpublish")}>
+                        取消平台发布
+                      </div>
+                    </Menu.Item>
+                  )}
                 </Menu>
               }
             >
@@ -154,3 +154,10 @@ const itemStyles = css`
     }
   }
 `;
+
+const menuStyles = css`
+  .ant-dropdown-menu-item,
+  .ant-dropdown-menu-submenu-title {
+    font-size: 12px;
+  }
+`;