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

package.json

@@ -61,7 +61,7 @@
     "proto.gl": "^1.0.0",
     "qrcode": "^1.5.3",
     "queen3d": "^0.0.80",
-    "queenjs": "^1.0.0-beta.73",
+    "queenjs": "^1.0.0-beta.74",
     "rimraf": "^3.0.2",
     "scp2": "^0.5.0",
     "swiper": "^8.4.4",

src/controllers/natsController.ts

@@ -1,5 +1,5 @@
+import { Empty, StringCodec, connect } from "nats.ws";
 import { queenApi } from "queenjs";
-import { connect, StringCodec, Empty, ErrorCode } from "nats.ws";
 
 export class BusController {
   _params = new URLSearchParams(decodeURIComponent(location.search));

src/dict/apis.ts

@@ -1,5 +1,5 @@
 const baseURL = "https://www.infish.cn";
-const localURL = "http://192.168.110.180:8889";
+// const localURL = "http://192.168.110.180:8889";
 
 const baseVersion = "/cloud/v1";
 const treeVersion = "/tree/v1";

src/modules/editor/components/CompUI/basicUI/Container/index.ts

@@ -1,4 +1,3 @@
-import { Dict_Imgs } from "@/dict";
 import { createAttrsForm } from "../../defines/createAttrsForm";
 import { createCompHooks } from "../../defines/createCompHooks";
 

src/modules/editor/components/CompUI/customUI/Cards/Card/index.tsx

@@ -1,8 +1,7 @@
-import { Dict_Imgs } from "@/dict";
 import { createAttrsForm } from "../../../defines/createAttrsForm";
 import { createCompHooks } from "../../../defines/createCompHooks";
-import { GroupNumber } from "../../../formItems/GroupNumber";
 import { createCompId } from "../../../defines/createCompId";
+import { GroupNumber } from "../../../formItems/GroupNumber";
 
 export { Component } from "./component";
 

src/modules/editor/components/CompUI/customUI/Cards/Card2/component.tsx

@@ -11,7 +11,7 @@ export const Component = createUIComp({
   },
   setup(props) {
     const { designToNaturalSize } = useEditor().helper;
-    const { value, children } = useCompData(props.compId);
+    const { children } = useCompData(props.compId);
 
     return () => (
       <div class="relative">

src/modules/editor/components/CompUI/customUI/Cards/Card4/component.tsx

@@ -1,9 +1,8 @@
 import { string } from "vue-types";
 import { useCompData } from ".";
-import { Image, Text } from "../../../basicUI";
 import { useEditor } from "../../../../..";
+import { Image, Text } from "../../../basicUI";
 import { createUIComp } from "../../../defines/createUIComp";
-import { css } from "@linaria/core";
 import * as Title3 from "../../Titles/Title3";
 
 export const Component = createUIComp({
@@ -12,7 +11,7 @@ export const Component = createUIComp({
   },
   setup(props) {
     const { designToNaturalSize } = useEditor().helper;
-    const { value, children } = useCompData(props.compId);
+    const { children } = useCompData(props.compId);
 
     return () => (
       <div>
@@ -39,6 +38,3 @@ export const Component = createUIComp({
     );
   },
 });
-const upStyle = css`
-  position: relative;
-`;

src/modules/editor/components/CompUI/customUI/Cards/Card5/component.tsx

@@ -1,9 +1,8 @@
 import { string } from "vue-types";
 import { useCompData } from ".";
-import { Image, Text } from "../../../basicUI";
 import { useEditor } from "../../../../..";
+import { Image, Text } from "../../../basicUI";
 import { createUIComp } from "../../../defines/createUIComp";
-import { css } from "@linaria/core";
 
 export const Component = createUIComp({
   props: {
@@ -11,7 +10,7 @@ export const Component = createUIComp({
   },
   setup(props) {
     const { designToNaturalSize } = useEditor().helper;
-    const { value, children } = useCompData(props.compId);
+    const { children } = useCompData(props.compId);
 
     return () => (
       <div class="relative w-full">
@@ -31,6 +30,3 @@ export const Component = createUIComp({
     );
   },
 });
-const upStyle = css`
-  position: relative;
-`;

src/modules/editor/components/CompUI/customUI/Cards/CardList/index.tsx

@@ -1,4 +1,3 @@
-import { Dict_Imgs } from "@/dict";
 import { InputNumber } from "ant-design-vue";
 import { createAttrsForm } from "../../../defines/createAttrsForm";
 import { createCompHooks } from "../../../defines/createCompHooks";

src/modules/editor/components/CompUI/customUI/Covers/Cover/component.tsx

@@ -1,10 +1,9 @@
+import { useEditor } from "@/modules/editor";
 import { css } from "@linaria/core";
 import { string } from "vue-types";
 import { useCompData } from ".";
 import { Image, Text } from "../../../basicUI";
-import { View } from "../../../basicUI/View";
 import { createUIComp } from "../../../defines/createUIComp";
-import { useEditor } from "@/modules/editor";
 
 export const Component = createUIComp({
   props: {

src/modules/editor/components/CompUI/formItems/ImagePicker.tsx

@@ -1,6 +1,5 @@
 import { useEditor } from "@/modules/editor";
 import { css } from "@linaria/core";
-import { queenApi } from "queenjs";
 import { defineComponent } from "vue";
 import { string } from "vue-types";
 

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

@@ -1,5 +1,5 @@
 import { useEditor } from "@/modules/editor";
-import { Button, Dropdown, Radio } from "ant-design-vue";
+import { Button, Dropdown } from "ant-design-vue";
 import { defineUI } from "queenjs";
 import { ShareBox } from "./ShareBox";
 

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

@@ -2,13 +2,16 @@ import hotkeys from "hotkeys-js";
 import { ModuleControl } from "queenjs";
 import { EditorModule } from "../../module";
 
-type IHotKeyItem = { hotKey: string; action: (this: EditorModule, key:string) => void };
+type IHotKeyItem = {
+  hotKey: string;
+  action: (this: EditorModule, key: string) => void;
+};
 
 export class HotKeyCtrl extends ModuleControl<EditorModule> {
   // 热键配置
   hotKeys = this.defineHotKeys([
-     // 取消选中
-     {
+    // 取消选中
+    {
       hotKey: "esc",
       action() {
         this.actions.pickComp("");
@@ -24,20 +27,19 @@ export class HotKeyCtrl extends ModuleControl<EditorModule> {
     // 删除当前组件
     {
       hotKey: "Backspace,del",
-      action(key:string) {
+      action() {
         this.actions.removeComp(this.store.currCompId);
       },
     },
 
     {
       hotKey: "q,w,a,s,d,e",
-      action(key:string) {
+      action(key) {
         // this.actions.removeComp(this.store.currCompId);
         // console.log("image hot key down", key);
-        this.actions.handleImageHotKey(key)
+        this.actions.handleImageHotKey(key);
       },
     },
-
   ]);
 
   init() {
@@ -48,7 +50,7 @@ export class HotKeyCtrl extends ModuleControl<EditorModule> {
       module.moduleName,
       function (event, handler) {
         event.preventDefault();
-        
+
         const hotAct = hotKeys.find((d) =>
           d.hotKey.split(",").includes(handler.key)
         );

src/modules/editor/module/actions/edit.ts

@@ -57,7 +57,7 @@ export const editActions = EditorModule.action({
       // 封面截屏
       const blob = await this.helper.screenshot();
       this.store.designData.thumbnail = URL.createObjectURL(blob);
-      
+
       await this.controls.uploader.uploadBlobs(this.store.designData);
       await this.https[this.store.isEditPage ? "saveDesign" : "saveComp"](
         this.store.designData
@@ -86,7 +86,7 @@ export const editActions = EditorModule.action({
   },
   // 设置组件锁定状态
   setCompLock(comp: DesignComp) {
-    //
+    console.log(comp);
   },
   // 设置组件层级
   setCompLayer(comp: DesignComp, offset: number) {

src/modules/editor/module/stores/index.ts

@@ -1,7 +1,4 @@
 import { EditorModule } from "..";
-import {
-  addCacheToMap
-} from "../../components/CompUI/defines/createCompId";
 import { DesignTemp } from "../../objects/DesignTemp";
 import { DesignComp } from "../../objects/DesignTemp/DesignComp";
 import { EditorMode, ICompKeys } from "../../typings";

src/modules/editor/objects/DesignTemp/DesignComp.ts

@@ -18,7 +18,7 @@ export class DesignComp {
     if (data instanceof DesignComp) return data;
     const fromData = Object.fromEntries(
       Object.entries(data).filter(
-        ([_, value]) => value !== null && value !== undefined
+        ([, value]) => value !== null && value !== undefined
       )
     );
     Object.assign(this, cloneDeep(fromData));

src/modules/editor/objects/Toolbars/default.ts

@@ -4,7 +4,7 @@ import { ICompKeys } from "../../typings";
 import { DesignComp } from "../DesignTemp/DesignComp";
 
 function getVisible(this: EditorModule, comp: DesignComp) {
-  return true;
+  return !!comp;
 }
 
 type ItemParams = Pick<ToolbarItem, "getValue" | "component" | "onClick"> & {

src/modules/resource/controllers/PromotionController.ts

@@ -9,7 +9,6 @@ export class PromotionController {
     console.log("onMenuClick", menu, item);
   }
   onEdit(item: any) {
-
     const _params = new URLSearchParams(decodeURIComponent(location.search));
     const host = _params.get("host")
 
@@ -23,8 +22,6 @@ export class PromotionController {
     location.href = url;
   }
   onPreview(item: any) {
-    const _params = new URLSearchParams(decodeURIComponent(location.search));
-    
     if (location.host == "www.infish.cn") {
       const url = `${location.origin}/projects/queenshow/share.html#/?id=${item._id}`;
       location.href = url;

src/modules/resource/helper.ts

@@ -15,42 +15,42 @@ export const helper = ResourceModule.helper({
   },
 
   createCompController() {
-    const ctrl = new ComponentController();
+    const ctrl= new ComponentController();
     ctrl.ListCtrl = new PageListController(this.config?.httpConfig);
-    ctrl.ListCtrl.setCrudPrefix("/frame");
+    ctrl.ListCtrl.setCrudPrefix("/frame")
     ctrl.createComp = this.actions.createComp;
     ctrl.onMenuClick = async (name, record) => {
-      if (name == "delete") {
-        await this.actions.deletePromotion(record);
-        ctrl.ListCtrl.fresh();
+      if(name == "delete") {
+       await this.actions.deletePromotion(record);
+       ctrl.ListCtrl.fresh();
       }
-    };
+    }
 
     return ctrl;
   },
 
-  createSourceController(isSelectModel: boolean, selectType: string) {
-    const { controls, actions } = this;
-
-    const ctrl = new MaterialController();
-    ctrl.imageCtrl = controls.materialImageListCtrl;
-    ctrl.vidoeCtrl = controls.materialVideoListCtrl;
-    ctrl.taskCtrl = controls.renderTaskListCtrl;
-    ctrl.tplCtrl = controls.matTempListCtrl;
+  createSourceController() {
+      const {controls, actions} = this;
+      
+      const ctrl = new MaterialController();
+      ctrl.imageCtrl = controls.materialImageListCtrl;
+      ctrl.vidoeCtrl = controls.materialVideoListCtrl;
+      ctrl.taskCtrl = controls.renderTaskListCtrl;
+      ctrl.tplCtrl = controls.matTempListCtrl;
 
-    ctrl.onBtnClick = async function (name: string) {
-      if (name == "upload") {
-        const uploaded = await actions.uploadMaterial();
-        ctrl.switchTab(uploaded.fileType, false);
-        ctrl.getCurrControl().loadPage(1);
-        return;
-      }
-      ctrl.showDialog(name);
-    };
-    ctrl.onItemClick = function (name, record) {
-      if (name == "delete") return actions.deleteMaterial(record);
-      return actions.downloadMaterial(record);
-    };
-    return ctrl;
-  },
+      ctrl.onBtnClick = async function (name: string) {
+        if (name == "upload") {
+          const uploaded = await actions.uploadMaterial();
+          ctrl.switchTab(uploaded.fileType, false);
+          ctrl.getCurrControl().loadPage(1);
+          return;
+        }
+        ctrl.showDialog(name);
+      };
+      ctrl.onItemClick = function (name, record) {
+        if (name == "delete") return actions.deleteMaterial(record);
+        return actions.downloadMaterial(record);
+      };
+      return ctrl
+  }
 });

src/modules/resource/index.ts

@@ -1,3 +1,5 @@
+import { BusController } from "@/controllers/natsController";
+import { TreeController } from "@/controllers/queentreeController";
 import { Dict_Apis } from "@/dict";
 import { PageListController, UploadController } from "@queenjs/controllers";
 import { ModuleRoot } from "queenjs";
@@ -6,9 +8,6 @@ import { compoents } from "./components";
 import { helper } from "./helper";
 import { http } from "./http";
 import { store } from "./store";
-import { BusController } from "@/controllers/natsController";
-import { TreeController } from "@/controllers/queentreeController";
-import { ComponentController } from "./controllers/ComponentController";
 
 export class ResourceModule extends ModuleRoot {
   config = this.setConfig({

src/modules/resource/store.ts

@@ -29,7 +29,7 @@ export const store = ResourceModule.store({
         ) || {}
       );
     },
-    currentMat(state) {
+    currentMat() {
       return {};
     },
     currentSlot(state) {

src/pages/queentree/selectMat.tsx

@@ -1,6 +1,6 @@
-import { computed, defineComponent, reactive } from "vue";
+import { css } from "@linaria/core";
+import { defineComponent } from "vue";
 import LibraryModal from "../website/CreateMat/components/LibraryModal";
-import { css, cx } from "@linaria/core";
 
 export default defineComponent({
   setup() {

src/pages/queentree/selectPackScene.tsx

@@ -1,6 +1,6 @@
-import { computed, defineComponent, reactive } from "vue";
+import { css } from "@linaria/core";
+import { defineComponent } from "vue";
 import LibraryModal from "../website/CreateMat/components/LibraryModal";
-import { css, cx } from "@linaria/core";
 
 export default defineComponent({
   setup() {

src/pages/website/CreateMat/components/AttrPanel/MeshAttr.tsx

@@ -1,5 +1,3 @@
-import { useResource } from "@/modules/resource";
-import { useQueditor } from "@queenjs-modules/queditor";
 import FormUI, { ColumnItem } from "@queenjs/components/FormUI";
 import { set } from "lodash";
 import { defineUI } from "queenjs";
@@ -40,8 +38,8 @@ export default defineUI({
     data: any(),
   },
   setup(props) {
-    const resource = useResource();
-    const queditor = useQueditor();
+    // const resource = useResource();
+    // const queditor = useQueditor();
 
     function changeVal(e: { dataIndex: string; value: any }) {
       set(props.data, e.dataIndex, e.value);

src/pages/website/CreateMat/components/AttrPanel/index.tsx

@@ -1,5 +1,4 @@
 import { useResource } from "@/modules/resource";
-import { useQueditor } from "@queenjs-modules/queditor";
 import { Empty } from "ant-design-vue";
 import { defineUI } from "queenjs";
 import MatAttr from "./MatAttr";
@@ -8,8 +7,7 @@ import MeshAttr from "./MeshAttr";
 export default defineUI({
   setup() {
     const resource = useResource();
-    const queditor = useQueditor();
-
+    
     return () => {
       const { activeKeys } = resource.store;
       if (!resource.store.currentSlot)

src/pages/website/CreateMat/components/LibraryModal.tsx

@@ -9,7 +9,7 @@ import {
 import PickNodeSteps from "@queenjs-modules/queentree-explorer/components/PickNodeSteps";
 import PickNodeStep from "@queenjs-modules/queentree-explorer/components/PickNodeSteps/PickNodeStep";
 import { StepController } from "@queenjs-modules/queentree-explorer/components/PickNodeSteps/StepController";
-import { Exception, useModal } from "queenjs";
+import { Exception } from "queenjs";
 import { defineComponent } from "vue";
 import { array, string } from "vue-types";
 

src/pages/website/Material2/components/Material.tsx

@@ -1,12 +1,11 @@
-import { defineUI } from "queenjs";
-import  Toolbar  from "./MaterialToolbar"
-import { css, cx } from "@linaria/core";
-import { Button } from "ant-design-vue";
 import AssetsList from "@/components/AssetsList";
+import { MaterialController } from "@/modules/resource/controllers/MaterialController";
+import { css } from "@linaria/core";
+import { defineUI } from "queenjs";
+import { onMounted } from "vue";
 import { any } from "vue-types";
 import MaterialItem from "./MaterialItem";
-import { onMounted } from "vue";
-import { MaterialController } from "@/modules/resource/controllers/MaterialController";
+import Toolbar from "./MaterialToolbar";
 
 
 export default defineUI({

src/pages/website/Material2/components/MaterialToolbar.tsx

@@ -1,22 +1,15 @@
+import { cx } from "@linaria/core";
 import { Button } from "ant-design-vue";
-import { defineComponent } from "vue";
-import { css, cx } from "@linaria/core";
+import { defineUI } from "queenjs";
 import { any } from "vue-types";
 import { BtnNames, MaterialController, TabNames } from "../../../../modules/resource/controllers/MaterialController";
-import { defineUI } from "queenjs";
-
-const materialType = [
-  { name: "视频", key: "video" },
-  { name: "图片", key: "image" },
-  { name: "渲染任务", key: "task" },
-];
 
 export default defineUI({
   
   props: {
     Controller: any<MaterialController>().isRequired,
   },
-  setup(props, { emit }) {
+  setup(props) {
     return () => {
       const state = props.Controller.state;
 
@@ -57,12 +50,3 @@ export default defineUI({
   },
 });
 
-const rootStyles = css`
-  .btn_tab {
-    padding: 3px 5px;
-    &:hover,
-    &.active {
-      color: @inf-primary-color;
-    }
-  }
-`;

src/pages/website/Promotion2/components/index.tsx

@@ -1,11 +1,10 @@
 import List from "@/components/AssetsList";
-import { useResource } from "@/modules/resource";
+import { PromotionController } from "@/modules/resource/controllers/PromotionController";
+import { defineUI } from "queenjs";
 import { onMounted } from "vue";
+import { any } from "vue-types";
 import Header from "./Header";
 import PromotionItem from "./PromotionItem";
-import { defineUI } from "queenjs";
-import { any } from "vue-types";
-import { PromotionController } from "@/modules/resource/controllers/PromotionController";
 
 export default defineUI({
   props: {

yarn.lock

@@ -7123,10 +7123,10 @@ queen3d@^0.0.80:
   resolved "http://124.70.149.18:4873/queen3d/-/queen3d-0.0.80.tgz#11d4c60f233fc54d810e8f912b79495e4acfb95e"
   integrity sha512-GaBzki+vcjC4JDN4olh/UI3oW6BRc1qbk1+pwUlbBN0oC+ilKNn9C64tLSEio0zWZikEtGb6A9jrUXntX1no4A==
 
-queenjs@^1.0.0-beta.73:
-  version "1.0.0-beta.73"
-  resolved "http://124.70.149.18:4873/queenjs/-/queenjs-1.0.0-beta.73.tgz#ad9183f5652dd7a57b8d58b5d77193879a3ce168"
-  integrity sha512-uLxILs10cPqKpD0Jj5ASls5qsQxSr685JFEBarycOHu7a4z26kACRHE8piu6axAfK9nwdSq1SqY5T2PhwdpkTA==
+queenjs@^1.0.0-beta.74:
+  version "1.0.0-beta.74"
+  resolved "http://124.70.149.18:4873/queenjs/-/queenjs-1.0.0-beta.74.tgz#d42478d5e0ef2ad91cbd8b2ab41df4c44c1a1ae2"
+  integrity sha512-4vZkI714ZypxiBPZcnaxHqBrSDEx2lKza+atSQTAqP0Y2pmrTqwyfn6Mq9trmfhARJYi7zIi10EgSRfgZLDdBQ==
   dependencies:
     axios "^0.27.2"
     eventemitter3 "^4.0.7"