qinyan 1 year ago
parent
commit
36c867d136

+ 1 - 1
src/modules/editor/components/Viewport/Slider/SliderLeft/Shapes.v1.tsx

@@ -38,7 +38,7 @@ export default defineUI({
                     class="text-center leading-50px bg-dark-50 rounded draggable-item"
                     key={item._id}
                     // title={item.title}
-                    // onClick={() => editor.actions.clickFrameToDesign(item)}
+                    // onClick={() => editor.actions.clickTplToDesign(item)}
                   >
                     <Image
                       class="w-full p-10px rounded pointer-events-none"

+ 6 - 4
src/modules/editor/components/Viewport/Slider/SliderLeft/Templates.tsx

@@ -1,5 +1,6 @@
 import Empty from "@/components/Empty";
 import { useEditor } from "@/modules/editor";
+import { useResource } from "@/modules/resource";
 import { Image, Loadmore } from "@queenjs/ui";
 import { defineUI } from "queenjs";
 import { Container, Draggable } from "vue-dndrop";
@@ -7,10 +8,11 @@ import { Container, Draggable } from "vue-dndrop";
 export default defineUI({
   setup() {
     const editor = useEditor();
-    const { frameControl } = editor.controls;
+    const source = useResource();
+    const ctrl = source.controls.sysTplListCtrl;
+    ctrl.loadPage(1);
 
     return () => {
-      const ctrl = frameControl.listCtrl;
       const dataSource = ctrl.state.list;
 
       return (
@@ -27,7 +29,7 @@ export default defineUI({
               };
             }}
           >
-            {dataSource.map((item) => {
+            {dataSource.map((item: any) => {
               return (
                 <Draggable key={item._id}>
                   <div
@@ -35,7 +37,7 @@ export default defineUI({
                     key={item._id}
                     title={item.title}
                     style={{ aspectRatio: 1 }}
-                    onClick={() => editor.actions.clickFrameToDesign(item)}
+                    onClick={() => editor.actions.clickTplToDesign(item)}
                   >
                     <Image
                       class="w-full rounded pointer-events-none"

+ 1 - 1
src/modules/editor/controllers/DragAddCtrl/index.ts

@@ -44,7 +44,7 @@ export class DragAddCtrl extends ModuleControl<EditorModule> {
   }
 
   async dragTpl() {
-    await this.actions.clickFrameToDesign(this.dragingCompData);
+    await this.actions.clickTplToDesign(this.dragingCompData);
     this.dragingCompKey = "";
   }
 

+ 0 - 24
src/modules/editor/controllers/FrameCtrl/index.ts

@@ -1,24 +0,0 @@
-import { ModuleControl } from "queenjs";
-import { EditorModule } from "../../module";
-import { PageListController } from "@queenjs/controllers";
-import { reactive } from "vue";
-
-export class FrameControl extends ModuleControl<EditorModule> {
-  state = reactive({});
-
-  listCtrl = new PageListController<
-    { _id: string; title: string; thumbnail: string },
-    any
-  >(this.module.config.httpConfig);
-
-  init() {
-    this.initData();
-  }
-
-  private async initData() {
-    this.listCtrl.setCrudPrefix("/sys/h5");
-    this.listCtrl.state.size = 10;
-    this.listCtrl.hasLimit = true;
-    await this.listCtrl.loadPage(1);
-  }
-}

+ 2 - 2
src/modules/editor/module/actions/edit.tsx

@@ -701,8 +701,8 @@ export const editActions = EditorModule.action({
     this.controls.selectCtrl.assistCtrl?.flashDrawCardDists();
   },
 
-  // clickFrameToDesign 点击模板到组件
-  async clickFrameToDesign(record) {
+  // 点击模板
+  async clickTplToDesign(record) {
     const res = await queenApi.showConfirm({
       title: "",
       content: "要替换正在编辑的内容?",

+ 1 - 2
src/modules/editor/module/actions/init.ts

@@ -11,8 +11,7 @@ export const initActions = EditorModule.action({
     const { historyCtrl } = this.controls;
     historyCtrl.bindActions(Object.keys(editActions));
     this.controls.compUICtrl.init();
-    this.controls.frameControl.init();
-    this.controls.mediaCtrl.init();
+      this.controls.mediaCtrl.init();
     createProxyEffect(this.store, (type, paths, value, oldValue) => {
       if (
         paths[0] === "designData" ||

+ 0 - 2
src/modules/editor/module/index.ts

@@ -22,7 +22,6 @@ import { manualActions } from "./actions/editWithManualHistory";
 import { wxController } from "@/controllers/wxController";
 import { ImageCropperCtrl } from "../controllers/CropperCtrl";
 import { MediaCtrl } from "../controllers/MediaCtrl/indext";
-import { FrameControl } from "../controllers/FrameCtrl";
 
 export class EditorModule extends ModuleRoot {
   config = this.setConfig({
@@ -60,7 +59,6 @@ export class EditorModule extends ModuleRoot {
     historyCtrl: new HistoryCtrl(this),
     pickCtrl: new ImagePickController(),
     compUICtrl: new CompUICtrl(this),
-    frameControl: new FrameControl(this),
     selectCtrl: new SelectCtrl(this),
     cropCtrl: new ImageCropperCtrl(this),
     mediaCtrl: new MediaCtrl(this),

+ 5 - 0
src/modules/resource/index.ts

@@ -45,6 +45,7 @@ export class ResourceModule extends ModuleRoot {
     custShapeListCtrl: new PageListController(this.config?.httpConfig),
 
     // 平台资源
+    sysTplListCtrl: new PageListController(this.config?.httpConfig),
     sysImageListCtrl: new PageListController(this.config?.httpConfig),
     sysVideoListCtrl: new PageListController(this.config?.httpConfig),
     sysSvgListCtrl: new PageListController(this.config?.httpConfig),
@@ -79,6 +80,10 @@ export class ResourceModule extends ModuleRoot {
     this.controls.custVideoListCtrl.state.size = 20;
     this.controls.custVideoListCtrl.state.query = { fileType: "video" };
 
+    this.controls.sysTplListCtrl.setCrudPrefix("/sys/h5");
+    this.controls.sysTplListCtrl.state.size = 20;
+    this.controls.sysTplListCtrl.state.query = { published: true};
+
     this.controls.sysImageListCtrl.setCrudPrefix("/sys/source");
     this.controls.sysImageListCtrl.state.size = 20;
     this.controls.sysImageListCtrl.state.query = { fileType: "image" , isSvg: {$ne: true}, published: true};