@maketribe/ms-app 3.0.15 → 3.0.17

package/src/components/new-upload-file/upload-file.tsx

@@ -0,0 +1,61 @@
+import { computed, defineComponent, unref } from "vue";
+import { uploadFileEmits, uploadFileProps } from "./upload-file-options";
+import { ElMessage } from "element-plus";
+
+/**
+ * 文件上传
+ *
+ * 文件上传在本后台中有两大分类
+ * 1.直接上传文件
+ * 2.使用素材库文件
+ *
+ * 文件上传的界面交互又会分为几种情况
+ * 1.单文件上传（单文件上传，可能会根据。文件情况的不同，界面显示方式不一样）
+ * 2.多文件上传（多文件上传基于单文件的逻辑，不过是会变成多个文件）
+ *
+ * 希望文件交互组件不需要用了解是直接上传文件或使用素材库。
+ *
+ */
+
+export default defineComponent({
+  name: "MKUploadFile",
+  props: uploadFileProps,
+  emits: uploadFileEmits,
+  setup(props, { emit }) {
+    const value = computed({
+      get: () => props.modelValue,
+      set: (v: string) => emit("upload:modelValue", v),
+    });
+
+    const uploadContext = computed(() => props.uploadContext);
+
+    const handleUpload = async () => {
+      try {
+        const uploadResult = await unref(uploadContext).selectFile();
+
+        if (uploadResult.success) {
+          value.value = uploadResult.path;
+          return;
+        }
+
+        ElMessage.error(uploadResult.msg);
+      } catch (e) {
+        console.error(e);
+        ElMessage.error("网络异常");
+      }
+    };
+
+    return {
+      handleUpload,
+    };
+  },
+  render() {
+    const { handleUpload, $slots } = this;
+
+    return (
+      <div class="mk-upload-file" onClick={handleUpload}>
+        {$slots.default?.()}
+      </div>
+    );
+  },
+});

package/src/components/upload-file/upload-file.tsx

@@ -2,13 +2,16 @@ import { computed, defineComponent, unref } from "vue";
 import { ElMessage, ElUpload, UploadFile, UploadFiles } from "element-plus";
 import { UploadError, WebFileUpload } from "@maketribe/request";
 import { uploadFileProps, uploadFileEmits } from "./upload-file-options";
+import { MSAppClient } from "../../core";
 
 export default defineComponent({
   name: "MKUploadFile",
   props: uploadFileProps,
   emits: uploadFileEmits,
   setup(props, { slots, emit }) {
-    const upload = props.upload ?? new WebFileUpload();
+    const upload =
+      props.upload ??
+      new WebFileUpload({ httpRequest: MSAppClient.instance!.httpRequest });
 
     const fileList = computed({
       get: () => props.fileList,

package/src/core/MSAppClient.ts

@@ -3,7 +3,13 @@ import {
   createWebHashHistory,
   Router as VueRouter,
 } from "vue-router";
-import { HttpRequest, R, WebHttpRequest } from "@maketribe/request";
+import {
+  DataViewRequest,
+  DVQueryable,
+  HttpRequest,
+  R,
+  WebHttpRequest,
+} from "@maketribe/request";
 import { IComponents, DataModel, Components } from "@maketribe/dm";
 import { I18n } from "@maketribe/locale";
 
@@ -106,6 +112,9 @@ export class MSAppClient {
     this.httpRequest = this._options.httpRequest;
 
     DataModel.setHttpRequest(this.httpRequest);
+    DVQueryable.setDefaultDataViewRequest(
+      new DataViewRequest({ httpRequest: this.httpRequest })
+    );
   }
 
   setUserSession(userSession: UserSession | null) {

package/src/core/PageManager.ts

@@ -120,28 +120,37 @@ export class PageManager {
             return;
           }
 
-          const addedExtendsPageNames: string[] = [];
+          const router = userSession.router;
 
-          if (!this.extendsPages.find((page) => page.name === "notFound")) {
-            this.addExtendsPage({
-              name: "notFound",
-              // path: ":pathMatch(.*)*",
-              path: "",
-              component: () => import("../page/index/404.vue"),
-            });
-          }
+          const addedExtendsPageNames: string[] = [];
 
           for (const extendsPage of this.extendsPages) {
+            const routeInfo = router.getRouteByName(extendsPage.name as string);
+
+            if (!routeInfo) {
+              continue;
+            }
+
             const vueRoute = vueRoutes.find(
               (vueRoute) => vueRoute.name === extendsPage.name
             );
 
             if (!vueRoute) {
+              extendsPage.path = routeInfo.route || extendsPage.path;
               addedExtendsPageNames.push(extendsPage.name as string);
               vueRouter.addRoute("mk-ms-layout", extendsPage);
             }
           }
 
+          if (!this.extendsPages.find((page) => page.name === "notFound")) {
+            this.addExtendsPage({
+              name: "notFound",
+              // path: ":pathMatch(.*)*",
+              path: "",
+              component: () => import("../page/index/404.vue"),
+            });
+          }
+
           userSession.register(
             createDisposable(() => {
               for (const addedExtendsPageName of addedExtendsPageNames) {

package/src/core/Router.ts

@@ -45,7 +45,7 @@ export class Router extends Disposable {
                   case "normal":
                     vueRouter.addRoute("mk-ms-layout", {
                       name: defaultPageRoute.name,
-                      path: `/dv/${name}`,
+                      path: defaultPageRoute.route || `/dv/${name}`,
                       component: () =>
                         import(
                           "../page/index/dv/default/single/list/normal.vue"
@@ -56,7 +56,7 @@ export class Router extends Disposable {
                   case "dialog":
                     vueRouter.addRoute("mk-ms-layout", {
                       name: defaultPageRoute.name,
-                      path: `/dv/${name}`,
+                      path: defaultPageRoute.route || `/dv/${name}`,
                       component: () =>
                         import(
                           "../page/index/dv/default/single/list/dialog.vue"
@@ -72,7 +72,7 @@ export class Router extends Disposable {
                   case "dialog":
                     vueRouter.addRoute("mk-ms-layout", {
                       name: defaultPageRoute.name,
-                      path: `/dv/${name}`,
+                      path: defaultPageRoute.route || `/dv/${name}`,
                       component: () =>
                         import(
                           "../page/index/dv/default/single/tree/dialog.vue"
@@ -87,7 +87,7 @@ export class Router extends Disposable {
                   case "dialog":
                     vueRouter.addRoute("mk-ms-layout", {
                       name: defaultPageRoute.name,
-                      path: `/dv/${name}`,
+                      path: defaultPageRoute.route || `/dv/${name}`,
                       component: () =>
                         import(
                           "../page/index/dv/default/single/table-tree/dialog.vue"
@@ -102,7 +102,7 @@ export class Router extends Disposable {
           case "list":
             vueRouter.addRoute("mk-ms-layout", {
               name: defaultPageRoute.name,
-              path: `/dv/${name}`,
+              path: defaultPageRoute.route || `/dv/${name}`,
               component: () => import("../page/index/dv/default/table.vue"),
               meta: { name },
             });
@@ -110,7 +110,7 @@ export class Router extends Disposable {
           case "edit":
             vueRouter.addRoute("mk-ms-layout", {
               name: defaultPageRoute.name,
-              path: `/dv/${name}/:id`,
+              path: defaultPageRoute.route || `/dv/${name}/:id`,
               component: () => import("../page/index/dv/default/edit.vue"),
               meta: { name },
             });
@@ -118,7 +118,7 @@ export class Router extends Disposable {
           case "add":
             vueRouter.addRoute("mk-ms-layout", {
               name: defaultPageRoute.name,
-              path: `/dv/${name}/add`,
+              path: defaultPageRoute.route || `/dv/${name}/add`,
               component: () => import("../page/index/dv/default/add.vue"),
               meta: { name },
             });

package/src/dataview/route/RouteForm.ts

@@ -10,7 +10,7 @@ export type RouteResult = {
   type: number;
   menuId: string;
   iconName: string;
-  path?: string;
+  route?: string;
 };
 
 export type Route = {
@@ -20,7 +20,7 @@ export type Route = {
   type: RouteType;
   menuId: string;
   iconName: string;
-  path: string;
+  route: string;
 };
 
 export class RouteForm extends DataForm<RouteResult, Route> {
@@ -50,7 +50,7 @@ export class RouteForm extends DataForm<RouteResult, Route> {
         label: "图标",
         componentInfo: "MKFormIconSelect",
       }),
-      new FormColumn({ name: "path", label: "路径" }),
+      new FormColumn({ name: "route", label: "路径" }),
       new FormColumn({
         name: "type",
         label: "路由类型",
@@ -86,7 +86,7 @@ export class RouteForm extends DataForm<RouteResult, Route> {
         `${item.type}` === RouteType.ROUTE ? RouteType.ROUTE : RouteType.LINK,
       menuId: item.menuId,
       iconName: item.iconName || "",
-      path: item.path || "",
+      route: item.route || "",
     };
   }
 }

package/src/dataview/route/RouteTable.ts

@@ -65,7 +65,7 @@ export class RouteTable extends DataTable<RouteResult, Route> {
       type: item.type === 0 ? RouteType.ROUTE : RouteType.LINK,
       menuId: item.menuId,
       iconName: item.iconName || "",
-      path: item.path || "",
+      route: item.route || "",
     };
   }
 }

package/src/init-application.ts

@@ -68,7 +68,7 @@ export const initApplication = async (options: InitMsApplicationOptions) => {
   );
 
   for (const route of routes) {
-    if (route.key.startsWith("index-")) {
+    if (route.key.startsWith("index")) {
       msAppClient.pageManager.addExtendsPage(route);
     } else {
       msAppClient.pageManager.addNormalPage(route);

package/src/router-middleware/auth.ts

@@ -1,5 +1,4 @@
 import { RouteLocationNormalized, RouteLocationRaw } from "vue-router";
-import { isSameRoute } from "@maketribe/utils";
 import type { MSAppClient } from "../core";
 
 export const authBeforeEach = async (
@@ -24,7 +23,7 @@ export const authBeforeEach = async (
       }
 
       // 因为登陆成功会添加用户可以访问的路由，这里给到vue-router去重新resolve
-      return { ...to };
+      return { path: to.fullPath };
     } catch (e) {
       return { name: "login" };
     }