lianghongjie 1 жил өмнө
parent
commit
77a7300308
28 өөрчлөгдсөн 49 нэмэгдсэн , 89 устгасан
  1. 1 1
      src/controllers/natsController.ts
  2. 1 1
      src/dict/apis.ts
  3. 0 1
      src/modules/editor/components/CompUI/basicUI/Container/index.ts
  4. 1 2
      src/modules/editor/components/CompUI/customUI/Cards/Card/index.tsx
  5. 1 1
      src/modules/editor/components/CompUI/customUI/Cards/Card2/component.tsx
  6. 2 6
      src/modules/editor/components/CompUI/customUI/Cards/Card4/component.tsx
  7. 2 6
      src/modules/editor/components/CompUI/customUI/Cards/Card5/component.tsx
  8. 0 1
      src/modules/editor/components/CompUI/customUI/Cards/CardList/index.tsx
  9. 1 2
      src/modules/editor/components/CompUI/customUI/Covers/Cover/component.tsx
  10. 0 1
      src/modules/editor/components/CompUI/formItems/ImagePicker.tsx
  11. 1 1
      src/modules/editor/components/Viewport/Header/index.tsx
  12. 10 8
      src/modules/editor/controllers/HotKeyCtrl/index.ts
  13. 2 2
      src/modules/editor/module/actions/edit.ts
  14. 0 3
      src/modules/editor/module/stores/index.ts
  15. 1 1
      src/modules/editor/objects/DesignTemp/DesignComp.ts
  16. 1 1
      src/modules/editor/objects/Toolbars/default.ts
  17. 0 3
      src/modules/resource/controllers/PromotionController.ts
  18. 3 3
      src/modules/resource/helper.ts
  19. 2 3
      src/modules/resource/index.ts
  20. 1 1
      src/modules/resource/store.ts
  21. 2 2
      src/pages/queentree/selectMat.tsx
  22. 2 2
      src/pages/queentree/selectPackScene.tsx
  23. 2 4
      src/pages/website/CreateMat/components/AttrPanel/MeshAttr.tsx
  24. 1 3
      src/pages/website/CreateMat/components/AttrPanel/index.tsx
  25. 1 1
      src/pages/website/CreateMat/components/LibraryModal.tsx
  26. 5 6
      src/pages/website/Material2/components/Material.tsx
  27. 3 19
      src/pages/website/Material2/components/MaterialToolbar.tsx
  28. 3 4
      src/pages/website/Promotion2/components/index.tsx

+ 1 - 1
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));

+ 1 - 1
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";

+ 0 - 1
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";
 

+ 1 - 2
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";
 

+ 1 - 1
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">

+ 2 - 6
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;
-`;

+ 2 - 6
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;
-`;

+ 0 - 1
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";

+ 1 - 2
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: {

+ 0 - 1
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";
 

+ 1 - 1
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";
 

+ 10 - 8
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)
         );

+ 2 - 2
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) {

+ 0 - 3
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";

+ 1 - 1
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));

+ 1 - 1
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"> & {

+ 0 - 3
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;

+ 3 - 3
src/modules/resource/helper.ts

@@ -1,8 +1,8 @@
 import { PageListController } from "@queenjs/controllers";
 import { ResourceModule } from ".";
-import { PromotionController } from "./controllers/PromotionController";
-import { MaterialController } from "./controllers/MaterialController";
 import { ComponentController } from "./controllers/ComponentController";
+import { MaterialController } from "./controllers/MaterialController";
+import { PromotionController } from "./controllers/PromotionController";
 
 export const helper = ResourceModule.helper({
   createFileName(fileName: string, dir: string) {
@@ -45,7 +45,7 @@ export const helper = ResourceModule.helper({
     return ctrl;
   },
 
-  createSourceController(isSelectModel:boolean, selectType :string) {
+  createSourceController() {
       const {controls, actions} = this;
       
       const ctrl = new MaterialController();

+ 2 - 3
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({

+ 1 - 1
src/modules/resource/store.ts

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

+ 2 - 2
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() {

+ 2 - 2
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() {

+ 2 - 4
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);

+ 1 - 3
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)

+ 1 - 1
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";
 

+ 5 - 6
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({

+ 3 - 19
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;
-    }
-  }
-`;

+ 3 - 4
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: {