liwei 1 gadu atpakaļ
vecāks
revīzija
bcb4f42d9f

+ 3 - 0
src/modules/editor/controllers/SelectCtrl/index.ts

@@ -509,6 +509,9 @@ export class SelectCtrl extends ModuleControl<EditorModule> {
       }
     }
     this.actions.selectObjs(outs);
+    if (outs.length < 1) {
+      this.actions.pickComp(this.store.currStreamCardId);
+    }
   }
   
   upgateGizmoStyle() {

+ 4 - 3
src/modules/editor/module/actions/edit.ts

@@ -19,8 +19,12 @@ export const editActions = EditorModule.action({
             this.actions.selectObjs([cardChilds.id])
         } else  {
           this.actions.selectObjs([])
+          if (id != "root") {
+             this.store.setCurrComp(this.store.currStreamCardId);
+          }
         }
     }
+
     if (this.store.currCompId == compId) {
       //this.controls.selectCtrl.upgateGizmoStyle();
       return;
@@ -105,9 +109,6 @@ export const editActions = EditorModule.action({
    async selectObjs(ids: string[]) {
      this.store.selected = ids;
      this.store.selectId = ids.length > 1 ? (Date.now() + "") : ""
-     if (ids.length < 1) {
-      this.actions.pickComp("root");
-     }
    },
 
   // 添加组件到画布

+ 6 - 4
src/modules/resource/components/ResourceManager/Toolbar.tsx

@@ -3,6 +3,7 @@ import { defineComponent } from "vue";
 import { useResource } from "../..";
 import MaterialTemplateModal from "./MaterialTemplateModal";
 import { css, cx } from "@linaria/core";
+import { queenApi } from "queenjs";
 
 const materialType = [
   { name: "视频", key: "video" },
@@ -17,10 +18,11 @@ export default defineComponent({
     const { store } = resource;
 
     const showModal = (type: string) => {
-      resource.showModal(<MaterialTemplateModal type={type} />, {
-        title: `${type === "image" ? "图片" : "视频"}模板中心`,
-        width: "1000px",
-      });
+      // resource.showModal(<MaterialTemplateModal type={type} />, {
+      //   title: `${type === "image" ? "图片" : "视频"}模板中心`,
+      //   width: "1000px",
+      // });
+       queenApi.messageSuccess("努力开发中,尽请期待!")
     };
 
     return () => {

+ 3 - 1
src/pages/website/Material2/controller.tsx

@@ -1,6 +1,7 @@
 import SelectListItemModal from "./components/SelectListItemModal";
 import { MaterialController } from "../../../modules/resource/controllers/MaterialController";
 import PreviewModal from "../components/PreviewModal";
+import { queenApi } from "queenjs";
 
 export default function createController(resource:any, isSelectModel:boolean, selectType :string) {
     const {controls, actions} = resource;
@@ -53,7 +54,8 @@ export default function createController(resource:any, isSelectModel:boolean, se
         ctrl.getCurrControl().loadPage(1);
         return;
       }
-      showModal(name);
+      queenApi.messageSuccess("功能开发中, 敬请期待!")
+      //showModal(name);
     };
     ctrl.onItemClick = async function (name, record) {
       if (name == "delete") {