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

src/modules/editor/components/CompUI/basicUI/Text/ToolbarComp.tsx

@@ -57,6 +57,7 @@ export const TextColor = defineComponent({
     watch(
       () => props.value,
       () => {
+        console.log(props.value);
         emitFlagRef.value = false;
         picker.setColor(props.value);
       }
@@ -65,8 +66,9 @@ export const TextColor = defineComponent({
       initPicker();
     });
     onUnmounted(() => {
+      console.log("destroy");
       if (picker) {
-        picker.destroy();
+        picker.destroyAndRemove();
         picker = null;
       }
     });
@@ -78,7 +80,7 @@ export const TextColor = defineComponent({
           picker?.show();
         }}
       >
-        <div class={"color_picker"}></div>
+        <div class={"color_picker"} id="color_picker"></div>
       </div>
     );
   },

src/modules/editor/components/CompUI/basicUI/Text/component2.tsx

@@ -106,43 +106,18 @@ const EditorComp = defineComponent({
           out.in = true;
           return out;
         }
-
-        const toolbarWrapper = document.querySelector("#text_toolbar");
-        if (toolbarWrapper === dom || toolbarWrapper?.contains(dom)) {
-          out.in = true;
-          out.stop = false;
-          return out;
-        }
-        const dropToolbars = document.querySelectorAll(".editor_toolbar_drop");
-        dropToolbars.forEach((e) => {
-          if (e === dom || e?.contains(dom)) {
-            out.in = true;
-            out.stop = false;
-            return out;
-          }
-        });
-        const selectToolbars = document.querySelectorAll(
-          ".ant-select-dropdown"
-        );
-        selectToolbars.forEach((e) => {
-          if (e === dom || e?.contains(dom)) {
-            out.in = true;
-            out.stop = false;
-            return out;
-          }
-        });
-
-        const ckBodyWrapper = document.querySelector(".ck-body-wrapper");
-        if (ckBodyWrapper === dom || ckBodyWrapper?.contains(dom)) {
-          out.in = true;
-          return out;
-        }
       }
 
       let n = 0;
       let curr: any = dom;
       do {
-        if (curr.id == "toptoolbar") {
+        if (
+          curr.id == "toptoolbar" ||
+          curr.class.contains(".pcr-app") ||
+          curr.class.contains(".editor_toolbar_drop") ||
+          curr.class.contains(".ant-select-dropdown") ||
+          curr.class.contains(".ck-body-wrapper")
+        ) {
           out.in = true;
           return out;
         }

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

@@ -66,6 +66,7 @@ export default defineUI({
                 item.published
                   ? items.push("取消发布")
                   : items.push("发布平台");
+                items.push("替换封面");
               }
               return (
                 <Draggable>
@@ -108,6 +109,16 @@ export default defineUI({
                             queenApi.messageSuccess("删除成功!");
                             return;
                           }
+                          if (name == "替换封面") {
+                            const url = await editor.controls.pickCtrl.pickOneImage();
+                            if (!url) return;
+                            await resource.https.updateComp({_id: item._id, thumbnail: url});
+                            item.thumbnail = url;
+                            queenApi.messageSuccess("替换成功");
+
+                            return;
+                          }
+
                           const pub = name == "发布平台";
                           await resource.actions.publishFrame(item, pub);
                           item.published = pub;

src/modules/editor/controllers/SelectCtrl/index.ts

@@ -604,7 +604,11 @@ export class SelectCtrl extends ModuleControl<EditorModule> {
       lastId = selected[selected.length-1] || "";
     }
 
+    if (lastId) {
+        this.actions.pickComp(lastId, false);
+    }
     this.actions.selectObjs(selected, lastId);
+    
     if (selected.length < 1) {
       this.actions.pickComp(this.store.currStreamCardId);
     }