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

src/modules/editor/components/CompUI/basicUI/Page/component.tsx

@@ -27,7 +27,7 @@ export const Component = defineComponent({
           style={helper.createStyle(layout || { size: [750] })}
           class={["!h-auto", editor.store.isEditMode ? pageEditStyle : ""]}
         >
-          <div class="relative">
+          <div class="relative z-1000">
             {slots.Container?.(
               children.default.map((compId) => {
                 const comp = helper.findComp(compId);

src/modules/resource/components/Collection/CollectionListModal.tsx

@@ -122,8 +122,8 @@ const ListItem = defineUI({
                       onClick={() =>
                         emit("menu", "delete", {
                           title: h5?.title,
-                          worksId: wks.id,
-                          id: record._id,
+                          worksId:record._id ,
+                          id: wks.id,
                         })
                       }
                     >