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

src/modules/editor/components/CompUI/basicUI/View.tsx

@@ -97,7 +97,8 @@ export const Hudop = defineComponent({
                 />
         )}
         <IconAdd
-          onClick={() => {
+          onClick={(e:any) => {
+            e.stopPropagation();
             const index = store.streamCardIds.indexOf(props.compId) + 1;
             actions.addCompToDesign("Container", index);
 
@@ -133,7 +134,7 @@ const viewStyle = css`
     .inficon {
       padding: 8px;
     }
-    z-index: 1000;
+    z-index: 1001;
   }
 `;
 

src/modules/editor/components/Viewport/Toolbar/index.tsx

@@ -9,7 +9,7 @@ export default defineUI({
     const { history } = controls.historyCtrl;
     return () => (
       <>
-        <div class="absolute top-20px left-20px space-x-10px z-10">
+        <div class="absolute top-20px left-20px space-x-10px z-1001">
           <TipIcons.Undo
             disable={!history.state.canUndo}
             class={btnCls}
@@ -21,7 +21,7 @@ export default defineUI({
             onClick={() => history.redo()}
           />
         </div>
-        <div class="absolute top-20px right-20px z-10">
+        <div class="absolute top-20px right-20px z-1001">
           <TipIcons.Screenshot
             class={btnCls}
             onClick={() => actions.updateThumbnailByScreenshot(true)}