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

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

@@ -71,7 +71,7 @@ export default defineUI({
               return (
                 <Draggable>
                   <div
-                    class="text-center leading-50px bg-dark-50 rounded draggable-item relative cursor-pointer"
+                    class="text-center leading-50px bg-light-50 rounded draggable-item relative cursor-pointer"
                     key={item._id}
                     title={item.title}
                   >

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

@@ -11,8 +11,26 @@ import { useAuth } from "@queenjs-modules/auth";
 import { Image, Loadmore } from "@queenjs/ui";
 import { useReactive } from "@queenjs/use";
 import { defineUI, queenApi } from "queenjs";
-import Menu from "./Menu";
 import { CompList } from "./CompList";
+import Menu from "./Menu";
+
+const compList = [
+  // "Card2",
+  // "Card3",
+  // "Card5",
+  "CardList",
+  "Cards11",
+  "Cards12",
+  // "Cards13",
+  "Cards14",
+  "Cards15",
+  "Cover",
+  "Cover2",
+  "Text1",
+  "Title1",
+  "Title2",
+  "Title3",
+];
 
 export default defineUI({
   setup() {
@@ -28,14 +46,17 @@ export default defineUI({
           (item) => "senior" === item.compType
         );
       },
+      cusComps() {
+        return state.currComps.filter((d) => compList.includes(d.compKey));
+      },
     }));
 
     return () => {
       const dataSource = sysCompListCtrl.state.list;
       return (
         <div>
-          <Comp components={state.currComps} taggable={false} />
-          <CompList dataSource={dataSource} isSys={true} class="mt-10px" />
+          <CompList dataSource={dataSource} isSys={true} />
+          <Comp components={state.cusComps} taggable={false} class="mt-10px" />
           {dataSource.length == 0 ? null : (
             <Loadmore
               class="mt-20px"