@maketribe/ms-app 3.0.16 → 3.0.17

package/dist/esm/dataview/route/RouteForm.js

@@ -28,7 +28,7 @@ class RouteForm extends DataForm {
         label: "\u56FE\u6807",
         componentInfo: "MKFormIconSelect"
       }),
-      new FormColumn({ name: "path", label: "\u8DEF\u5F84" }),
+      new FormColumn({ name: "route", label: "\u8DEF\u5F84" }),
       new FormColumn({
         name: "type",
         label: "\u8DEF\u7531\u7C7B\u578B",
@@ -60,7 +60,7 @@ class RouteForm extends DataForm {
       type: `${item.type}` === RouteType.ROUTE ? RouteType.ROUTE : RouteType.LINK,
       menuId: item.menuId,
       iconName: item.iconName || "",
-      path: item.path || ""
+      route: item.route || ""
     };
   }
 }

package/dist/esm/dataview/route/RouteForm.js.map

@@ -1 +1 @@
-{"version":3,"file":"RouteForm.js","sources":["../../../../src/dataview/route/RouteForm.ts"],"sourcesContent":["import { DataForm, DataFormOptions, FormColumn } from \"@maketribe/dm\";\nimport { defineDataForm } from \"../../define-data-form\";\nimport { RouteType } from \"../../constants\";\nimport { MenuTable } from \"../menu/MenuTable\";\n\nexport type RouteResult = {\n  id: string;\n  name: string;\n  title: string;\n  type: number;\n  menuId: string;\n  iconName: string;\n  path?: string;\n};\n\nexport type Route = {\n  id: string;\n  name: string;\n  title: string;\n  type: RouteType;\n  menuId: string;\n  iconName: string;\n  path: string;\n};\n\nexport class RouteForm extends DataForm<RouteResult, Route> {\n  constructor(options: DataFormOptions = {}) {\n    super({ name: \"ms-route\", ...options });\n  }\n\n  protected async initialize() {\n    await super.initialize();\n\n    this.setColumns([\n      new FormColumn({ name: \"id\", label: \"编号\" }),\n      new FormColumn({ name: \"name\", label: \"路由名\", required: true }),\n      new FormColumn({ name: \"title\", label: \"路由描述\", required: true }),\n      new FormColumn({\n        name: \"menuId\",\n        label: \"所属菜单\",\n        componentInfo: \"MKFormDataTableSelect\",\n        required: true,\n        componentProps: {\n          labelFieldName: \"title\",\n          dataTable: new MenuTable({ pageSize: 10 }),\n        },\n      }),\n      new FormColumn({\n        name: \"iconName\",\n        label: \"图标\",\n        componentInfo: \"MKFormIconSelect\",\n      }),\n      new FormColumn({ name: \"path\", label: \"路径\" }),\n      new FormColumn({\n        name: \"type\",\n        label: \"路由类型\",\n        defaultValue: RouteType.ROUTE,\n        componentInfo: \"MKFormDataSelect\",\n        required: true,\n        componentProps: {\n          options: [\n            { value: RouteType.ROUTE, label: \"站内路由\" },\n            { value: RouteType.LINK, label: \"站外链接\" },\n          ],\n        },\n      }),\n    ]);\n  }\n\n  formatSubmitData(data: any) {\n    const type = Number.parseInt(data.type);\n\n    return {\n      ...data,\n      iconName: data.iconName || null,\n      type: Number.isNaN(type) ? RouteType.ROUTE : type,\n    };\n  }\n\n  formatItem(item: RouteResult): Route {\n    return {\n      id: item.id,\n      name: item.name || \"\",\n      title: item.title || \"\",\n      type:\n        `${item.type}` === RouteType.ROUTE ? RouteType.ROUTE : RouteType.LINK,\n      menuId: item.menuId,\n      iconName: item.iconName || \"\",\n      path: item.path || \"\",\n    };\n  }\n}\n\ndefineDataForm(RouteForm);\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"RouteForm.js","sources":["../../../../src/dataview/route/RouteForm.ts"],"sourcesContent":["import { DataForm, DataFormOptions, FormColumn } from \"@maketribe/dm\";\nimport { defineDataForm } from \"../../define-data-form\";\nimport { RouteType } from \"../../constants\";\nimport { MenuTable } from \"../menu/MenuTable\";\n\nexport type RouteResult = {\n  id: string;\n  name: string;\n  title: string;\n  type: number;\n  menuId: string;\n  iconName: string;\n  route?: string;\n};\n\nexport type Route = {\n  id: string;\n  name: string;\n  title: string;\n  type: RouteType;\n  menuId: string;\n  iconName: string;\n  route: string;\n};\n\nexport class RouteForm extends DataForm<RouteResult, Route> {\n  constructor(options: DataFormOptions = {}) {\n    super({ name: \"ms-route\", ...options });\n  }\n\n  protected async initialize() {\n    await super.initialize();\n\n    this.setColumns([\n      new FormColumn({ name: \"id\", label: \"编号\" }),\n      new FormColumn({ name: \"name\", label: \"路由名\", required: true }),\n      new FormColumn({ name: \"title\", label: \"路由描述\", required: true }),\n      new FormColumn({\n        name: \"menuId\",\n        label: \"所属菜单\",\n        componentInfo: \"MKFormDataTableSelect\",\n        required: true,\n        componentProps: {\n          labelFieldName: \"title\",\n          dataTable: new MenuTable({ pageSize: 10 }),\n        },\n      }),\n      new FormColumn({\n        name: \"iconName\",\n        label: \"图标\",\n        componentInfo: \"MKFormIconSelect\",\n      }),\n      new FormColumn({ name: \"route\", label: \"路径\" }),\n      new FormColumn({\n        name: \"type\",\n        label: \"路由类型\",\n        defaultValue: RouteType.ROUTE,\n        componentInfo: \"MKFormDataSelect\",\n        required: true,\n        componentProps: {\n          options: [\n            { value: RouteType.ROUTE, label: \"站内路由\" },\n            { value: RouteType.LINK, label: \"站外链接\" },\n          ],\n        },\n      }),\n    ]);\n  }\n\n  formatSubmitData(data: any) {\n    const type = Number.parseInt(data.type);\n\n    return {\n      ...data,\n      iconName: data.iconName || null,\n      type: Number.isNaN(type) ? RouteType.ROUTE : type,\n    };\n  }\n\n  formatItem(item: RouteResult): Route {\n    return {\n      id: item.id,\n      name: item.name || \"\",\n      title: item.title || \"\",\n      type:\n        `${item.type}` === RouteType.ROUTE ? RouteType.ROUTE : RouteType.LINK,\n      menuId: item.menuId,\n      iconName: item.iconName || \"\",\n      route: item.route || \"\",\n    };\n  }\n}\n\ndefineDataForm(RouteForm);\n"],"names":[],"mappings":"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"}

package/dist/esm/dataview/route/RouteTable.js

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

package/dist/esm/dataview/route/RouteTable.js.map

@@ -1 +1 @@
-{"version":3,"file":"RouteTable.js","sources":["../../../../src/dataview/route/RouteTable.ts"],"sourcesContent":["import {\n  DataTable,\n  DataTableOptions,\n  TableColumn,\n  FilterColumn,\n  TableActionColumn,\n} from \"@maketribe/dm\";\nimport { defineDataTable } from \"../../define-data-table\";\nimport { Route, RouteResult } from \"./RouteForm\";\nimport { RouteType } from \"../../constants\";\n\nexport class RouteTable extends DataTable<RouteResult, Route> {\n  constructor(options: DataTableOptions = {}) {\n    super({ name: \"ms-route\", ...options });\n  }\n\n  protected async initialize() {\n    await super.initialize();\n\n    this.dataFilter.setColumns([\n      new FilterColumn({\n        name: \"name\",\n        label: \"路由名\",\n        componentInfo: \"MKConditionInput\",\n      }),\n      new FilterColumn({\n        name: \"title\",\n        label: \"路由描述\",\n        componentInfo: \"MKConditionInput\",\n      }),\n      new FilterColumn({\n        name: \"type\",\n        label: \"路由类型\",\n        componentInfo: \"MKConditionSelect\",\n        componentProps: {\n          options: [\n            { value: 0, label: \"站内路由\" },\n            { value: 1, label: \"站外链接\" },\n          ],\n        },\n      }),\n    ]);\n\n    this.setColumns([\n      new TableColumn({ name: \"id\", label: \"编号\", visible: false }),\n      new TableColumn({ name: \"name\", label: \"路由名\" }),\n      new TableColumn({ name: \"title\", label: \"路由描述\" }),\n      new TableColumn({\n        name: \"type\",\n        label: \"路由类型\",\n        componentInfo: \"MKColumnObjectMappingText\",\n        componentProps: {\n          mapping: { 0: \"站内路由\", 1: \"站外链接\" },\n        },\n      }),\n      new TableActionColumn(),\n    ]);\n  }\n\n  formatItem(item: RouteResult): Route {\n    return {\n      id: item.id,\n      name: item.name || \"\",\n      title: item.title || \"\",\n      type: item.type === 0 ? RouteType.ROUTE : RouteType.LINK,\n      menuId: item.menuId,\n      iconName: item.iconName || \"\",\n      path: item.path || \"\",\n    };\n  }\n}\n\ndefineDataTable(RouteTable);\n"],"names":[],"mappings":";;;;AAWO,MAAM,mBAAmB,SAA8B,CAAA;AAAA,EAC5D,WAAA,CAAY,OAA4B,GAAA,EAAI,EAAA;AAC1C,IAAA,KAAA,CAAM,EAAE,IAAA,EAAM,UAAY,EAAA,GAAG,SAAS,CAAA,CAAA;AAAA,GACxC;AAAA,EAEA,MAAgB,UAAa,GAAA;AAC3B,IAAA,MAAM,MAAM,UAAW,EAAA,CAAA;AAEvB,IAAA,IAAA,CAAK,WAAW,UAAW,CAAA;AAAA,MACzB,IAAI,YAAa,CAAA;AAAA,QACf,IAAM,EAAA,MAAA;AAAA,QACN,KAAO,EAAA,oBAAA;AAAA,QACP,aAAe,EAAA,kBAAA;AAAA,OAChB,CAAA;AAAA,MACD,IAAI,YAAa,CAAA;AAAA,QACf,IAAM,EAAA,OAAA;AAAA,QACN,KAAO,EAAA,0BAAA;AAAA,QACP,aAAe,EAAA,kBAAA;AAAA,OAChB,CAAA;AAAA,MACD,IAAI,YAAa,CAAA;AAAA,QACf,IAAM,EAAA,MAAA;AAAA,QACN,KAAO,EAAA,0BAAA;AAAA,QACP,aAAe,EAAA,mBAAA;AAAA,QACf,cAAgB,EAAA;AAAA,UACd,OAAS,EAAA;AAAA,YACP,EAAE,KAAA,EAAO,CAAG,EAAA,KAAA,EAAO,0BAAO,EAAA;AAAA,YAC1B,EAAE,KAAA,EAAO,CAAG,EAAA,KAAA,EAAO,0BAAO,EAAA;AAAA,WAC5B;AAAA,SACF;AAAA,OACD,CAAA;AAAA,KACF,CAAA,CAAA;AAED,IAAA,IAAA,CAAK,UAAW,CAAA;AAAA,MACd,IAAI,YAAY,EAAE,IAAA,EAAM,MAAM,KAAO,EAAA,cAAA,EAAM,OAAS,EAAA,KAAA,EAAO,CAAA;AAAA,MAC3D,IAAI,WAAY,CAAA,EAAE,MAAM,MAAQ,EAAA,KAAA,EAAO,sBAAO,CAAA;AAAA,MAC9C,IAAI,WAAY,CAAA,EAAE,MAAM,OAAS,EAAA,KAAA,EAAO,4BAAQ,CAAA;AAAA,MAChD,IAAI,WAAY,CAAA;AAAA,QACd,IAAM,EAAA,MAAA;AAAA,QACN,KAAO,EAAA,0BAAA;AAAA,QACP,aAAe,EAAA,2BAAA;AAAA,QACf,cAAgB,EAAA;AAAA,UACd,OAAS,EAAA,EAAE,CAAG,EAAA,0BAAA,EAAQ,GAAG,0BAAO,EAAA;AAAA,SAClC;AAAA,OACD,CAAA;AAAA,MACD,IAAI,iBAAkB,EAAA;AAAA,KACvB,CAAA,CAAA;AAAA,GACH;AAAA,EAEA,WAAW,IAA0B,EAAA;AACnC,IAAO,OAAA;AAAA,MACL,IAAI,IAAK,CAAA,EAAA;AAAA,MACT,IAAA,EAAM,KAAK,IAAQ,IAAA,EAAA;AAAA,MACnB,KAAA,EAAO,KAAK,KAAS,IAAA,EAAA;AAAA,MACrB,MAAM,IAAK,CAAA,IAAA,KAAS,CAAI,GAAA,SAAA,CAAU,QAAQ,SAAU,CAAA,IAAA;AAAA,MACpD,QAAQ,IAAK,CAAA,MAAA;AAAA,MACb,QAAA,EAAU,KAAK,QAAY,IAAA,EAAA;AAAA,MAC3B,IAAA,EAAM,KAAK,IAAQ,IAAA,EAAA;AAAA,KACrB,CAAA;AAAA,GACF;AACF,CAAA;AAEA,eAAA,CAAgB,UAAU,CAAA;;;;"}
+{"version":3,"file":"RouteTable.js","sources":["../../../../src/dataview/route/RouteTable.ts"],"sourcesContent":["import {\n  DataTable,\n  DataTableOptions,\n  TableColumn,\n  FilterColumn,\n  TableActionColumn,\n} from \"@maketribe/dm\";\nimport { defineDataTable } from \"../../define-data-table\";\nimport { Route, RouteResult } from \"./RouteForm\";\nimport { RouteType } from \"../../constants\";\n\nexport class RouteTable extends DataTable<RouteResult, Route> {\n  constructor(options: DataTableOptions = {}) {\n    super({ name: \"ms-route\", ...options });\n  }\n\n  protected async initialize() {\n    await super.initialize();\n\n    this.dataFilter.setColumns([\n      new FilterColumn({\n        name: \"name\",\n        label: \"路由名\",\n        componentInfo: \"MKConditionInput\",\n      }),\n      new FilterColumn({\n        name: \"title\",\n        label: \"路由描述\",\n        componentInfo: \"MKConditionInput\",\n      }),\n      new FilterColumn({\n        name: \"type\",\n        label: \"路由类型\",\n        componentInfo: \"MKConditionSelect\",\n        componentProps: {\n          options: [\n            { value: 0, label: \"站内路由\" },\n            { value: 1, label: \"站外链接\" },\n          ],\n        },\n      }),\n    ]);\n\n    this.setColumns([\n      new TableColumn({ name: \"id\", label: \"编号\", visible: false }),\n      new TableColumn({ name: \"name\", label: \"路由名\" }),\n      new TableColumn({ name: \"title\", label: \"路由描述\" }),\n      new TableColumn({\n        name: \"type\",\n        label: \"路由类型\",\n        componentInfo: \"MKColumnObjectMappingText\",\n        componentProps: {\n          mapping: { 0: \"站内路由\", 1: \"站外链接\" },\n        },\n      }),\n      new TableActionColumn(),\n    ]);\n  }\n\n  formatItem(item: RouteResult): Route {\n    return {\n      id: item.id,\n      name: item.name || \"\",\n      title: item.title || \"\",\n      type: item.type === 0 ? RouteType.ROUTE : RouteType.LINK,\n      menuId: item.menuId,\n      iconName: item.iconName || \"\",\n      route: item.route || \"\",\n    };\n  }\n}\n\ndefineDataTable(RouteTable);\n"],"names":[],"mappings":";;;;AAWO,MAAM,mBAAmB,SAA8B,CAAA;AAAA,EAC5D,WAAA,CAAY,OAA4B,GAAA,EAAI,EAAA;AAC1C,IAAA,KAAA,CAAM,EAAE,IAAA,EAAM,UAAY,EAAA,GAAG,SAAS,CAAA,CAAA;AAAA,GACxC;AAAA,EAEA,MAAgB,UAAa,GAAA;AAC3B,IAAA,MAAM,MAAM,UAAW,EAAA,CAAA;AAEvB,IAAA,IAAA,CAAK,WAAW,UAAW,CAAA;AAAA,MACzB,IAAI,YAAa,CAAA;AAAA,QACf,IAAM,EAAA,MAAA;AAAA,QACN,KAAO,EAAA,oBAAA;AAAA,QACP,aAAe,EAAA,kBAAA;AAAA,OAChB,CAAA;AAAA,MACD,IAAI,YAAa,CAAA;AAAA,QACf,IAAM,EAAA,OAAA;AAAA,QACN,KAAO,EAAA,0BAAA;AAAA,QACP,aAAe,EAAA,kBAAA;AAAA,OAChB,CAAA;AAAA,MACD,IAAI,YAAa,CAAA;AAAA,QACf,IAAM,EAAA,MAAA;AAAA,QACN,KAAO,EAAA,0BAAA;AAAA,QACP,aAAe,EAAA,mBAAA;AAAA,QACf,cAAgB,EAAA;AAAA,UACd,OAAS,EAAA;AAAA,YACP,EAAE,KAAA,EAAO,CAAG,EAAA,KAAA,EAAO,0BAAO,EAAA;AAAA,YAC1B,EAAE,KAAA,EAAO,CAAG,EAAA,KAAA,EAAO,0BAAO,EAAA;AAAA,WAC5B;AAAA,SACF;AAAA,OACD,CAAA;AAAA,KACF,CAAA,CAAA;AAED,IAAA,IAAA,CAAK,UAAW,CAAA;AAAA,MACd,IAAI,YAAY,EAAE,IAAA,EAAM,MAAM,KAAO,EAAA,cAAA,EAAM,OAAS,EAAA,KAAA,EAAO,CAAA;AAAA,MAC3D,IAAI,WAAY,CAAA,EAAE,MAAM,MAAQ,EAAA,KAAA,EAAO,sBAAO,CAAA;AAAA,MAC9C,IAAI,WAAY,CAAA,EAAE,MAAM,OAAS,EAAA,KAAA,EAAO,4BAAQ,CAAA;AAAA,MAChD,IAAI,WAAY,CAAA;AAAA,QACd,IAAM,EAAA,MAAA;AAAA,QACN,KAAO,EAAA,0BAAA;AAAA,QACP,aAAe,EAAA,2BAAA;AAAA,QACf,cAAgB,EAAA;AAAA,UACd,OAAS,EAAA,EAAE,CAAG,EAAA,0BAAA,EAAQ,GAAG,0BAAO,EAAA;AAAA,SAClC;AAAA,OACD,CAAA;AAAA,MACD,IAAI,iBAAkB,EAAA;AAAA,KACvB,CAAA,CAAA;AAAA,GACH;AAAA,EAEA,WAAW,IAA0B,EAAA;AACnC,IAAO,OAAA;AAAA,MACL,IAAI,IAAK,CAAA,EAAA;AAAA,MACT,IAAA,EAAM,KAAK,IAAQ,IAAA,EAAA;AAAA,MACnB,KAAA,EAAO,KAAK,KAAS,IAAA,EAAA;AAAA,MACrB,MAAM,IAAK,CAAA,IAAA,KAAS,CAAI,GAAA,SAAA,CAAU,QAAQ,SAAU,CAAA,IAAA;AAAA,MACpD,QAAQ,IAAK,CAAA,MAAA;AAAA,MACb,QAAA,EAAU,KAAK,QAAY,IAAA,EAAA;AAAA,MAC3B,KAAA,EAAO,KAAK,KAAS,IAAA,EAAA;AAAA,KACvB,CAAA;AAAA,GACF;AACF,CAAA;AAEA,eAAA,CAAgB,UAAU,CAAA;;;;"}

package/dist/esm/init-application.js

@@ -45,7 +45,7 @@ const initApplication = async (options) => {
     })
   );
   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/dist/esm/init-application.js.map

@@ -1 +1 @@
-{"version":3,"file":"init-application.js","sources":["../../src/init-application.ts"],"sourcesContent":["import { App, reactive } from \"vue\";\nimport {\n  createRouter,\n  createWebHashHistory,\n  Router as VueRouter,\n} from \"vue-router\";\nimport { MSAppClient } from \"./core\";\nimport { HttpRequest, WebHttpRequest } from \"@maketribe/request\";\nimport { MSAPPCLIENT_CONTEXT_KEY } from \"./tokens\";\n\nimport { generateRoutesFromFiles } from \"./utils\";\nimport {\n  DataFilterComponents,\n  DataFormComponents,\n  DataTableComponents,\n} from \"./core\";\n\nexport type InitMsApplicationOptions = {\n  routes: any;\n  vueRouter?: VueRouter;\n  app: App;\n  appID: string;\n  logo?: string;\n  projectName: string;\n  locale?: string;\n  httpRequest?: HttpRequest;\n};\n\nexport const initApplication = async (options: InitMsApplicationOptions) => {\n  const app = options.app;\n\n  const vueRouter =\n    options.vueRouter ??\n    createRouter({\n      history: createWebHashHistory(),\n      routes: [],\n    });\n\n  const msAppClient = reactive(\n    new MSAppClient({\n      appID: options!.appID,\n      logo: options!.logo ?? \"\",\n      projectName: options!.projectName,\n      httpRequest: options.httpRequest ?? new WebHttpRequest(),\n      origin: location.origin,\n      locale: options!.locale,\n      vueRouter,\n      dataTableComponents: new DataTableComponents(),\n      dataFormComponents: new DataFormComponents(),\n      dataFilterComponents: new DataFilterComponents(),\n      whereFilterComponents: new DataFilterComponents(),\n    })\n  ) as unknown as MSAppClient;\n\n  app.provide(MSAPPCLIENT_CONTEXT_KEY, { msAppClient });\n\n  MSAppClient.instance = msAppClient;\n\n  (window as any).msAppClient = msAppClient;\n\n  const routes = generateRoutesFromFiles(\n    Object.keys(options.routes).map((key) => {\n      return {\n        path: key.replace(/^\\.\\/pages\\/(.+)\\.vue$/, (_, g) => g),\n        module: options.routes[key]?.default || options.routes[key],\n      };\n    })\n  );\n\n  for (const route of routes) {\n    if (route.key.startsWith(\"index-\")) {\n      msAppClient.pageManager.addExtendsPage(route);\n    } else {\n      msAppClient.pageManager.addNormalPage(route);\n    }\n  }\n\n  await msAppClient.init();\n\n  app.use(msAppClient.vueRouter);\n\n  return msAppClient;\n};\n"],"names":[],"mappings":";;;;;;;;;;;;;;AA4Ba,MAAA,eAAA,GAAkB,OAAO,OAAsC,KAAA;AAC1E,EAAA,MAAM,MAAM,OAAQ,CAAA,GAAA,CAAA;AAEpB,EAAM,MAAA,SAAA,GACJ,OAAQ,CAAA,SAAA,IACR,YAAa,CAAA;AAAA,IACX,SAAS,oBAAqB,EAAA;AAAA,IAC9B,QAAQ,EAAC;AAAA,GACV,CAAA,CAAA;AAEH,EAAA,MAAM,WAAc,GAAA,QAAA;AAAA,IAClB,IAAI,WAAY,CAAA;AAAA,MACd,OAAO,OAAS,CAAA,KAAA;AAAA,MAChB,IAAA,EAAM,QAAS,IAAQ,IAAA,EAAA;AAAA,MACvB,aAAa,OAAS,CAAA,WAAA;AAAA,MACtB,WAAa,EAAA,OAAA,CAAQ,WAAe,IAAA,IAAI,cAAe,EAAA;AAAA,MACvD,QAAQ,QAAS,CAAA,MAAA;AAAA,MACjB,QAAQ,OAAS,CAAA,MAAA;AAAA,MACjB,SAAA;AAAA,MACA,mBAAA,EAAqB,IAAI,mBAAoB,EAAA;AAAA,MAC7C,kBAAA,EAAoB,IAAI,kBAAmB,EAAA;AAAA,MAC3C,oBAAA,EAAsB,IAAI,oBAAqB,EAAA;AAAA,MAC/C,qBAAA,EAAuB,IAAI,oBAAqB,EAAA;AAAA,KACjD,CAAA;AAAA,GACH,CAAA;AAEA,EAAA,GAAA,CAAI,OAAQ,CAAA,uBAAA,EAAyB,EAAE,WAAA,EAAa,CAAA,CAAA;AAEpD,EAAA,WAAA,CAAY,QAAW,GAAA,WAAA,CAAA;AAEvB,EAAC,OAAe,WAAc,GAAA,WAAA,CAAA;AAE9B,EAAA,MAAM,MAAS,GAAA,uBAAA;AAAA,IACb,OAAO,IAAK,CAAA,OAAA,CAAQ,MAAM,CAAE,CAAA,GAAA,CAAI,CAAC,GAAQ,KAAA;AACvC,MAAO,OAAA;AAAA,QACL,MAAM,GAAI,CAAA,OAAA,CAAQ,0BAA0B,CAAC,CAAA,EAAG,MAAM,CAAC,CAAA;AAAA,QACvD,MAAA,EAAQ,QAAQ,MAAO,CAAA,GAAG,GAAG,OAAW,IAAA,OAAA,CAAQ,OAAO,GAAG,CAAA;AAAA,OAC5D,CAAA;AAAA,KACD,CAAA;AAAA,GACH,CAAA;AAEA,EAAA,KAAA,MAAW,SAAS,MAAQ,EAAA;AAC1B,IAAA,IAAI,KAAM,CAAA,GAAA,CAAI,UAAW,CAAA,QAAQ,CAAG,EAAA;AAClC,MAAY,WAAA,CAAA,WAAA,CAAY,eAAe,KAAK,CAAA,CAAA;AAAA,KACvC,MAAA;AACL,MAAY,WAAA,CAAA,WAAA,CAAY,cAAc,KAAK,CAAA,CAAA;AAAA,KAC7C;AAAA,GACF;AAEA,EAAA,MAAM,YAAY,IAAK,EAAA,CAAA;AAEvB,EAAI,GAAA,CAAA,GAAA,CAAI,YAAY,SAAS,CAAA,CAAA;AAE7B,EAAO,OAAA,WAAA,CAAA;AACT;;;;"}
+{"version":3,"file":"init-application.js","sources":["../../src/init-application.ts"],"sourcesContent":["import { App, reactive } from \"vue\";\nimport {\n  createRouter,\n  createWebHashHistory,\n  Router as VueRouter,\n} from \"vue-router\";\nimport { MSAppClient } from \"./core\";\nimport { HttpRequest, WebHttpRequest } from \"@maketribe/request\";\nimport { MSAPPCLIENT_CONTEXT_KEY } from \"./tokens\";\n\nimport { generateRoutesFromFiles } from \"./utils\";\nimport {\n  DataFilterComponents,\n  DataFormComponents,\n  DataTableComponents,\n} from \"./core\";\n\nexport type InitMsApplicationOptions = {\n  routes: any;\n  vueRouter?: VueRouter;\n  app: App;\n  appID: string;\n  logo?: string;\n  projectName: string;\n  locale?: string;\n  httpRequest?: HttpRequest;\n};\n\nexport const initApplication = async (options: InitMsApplicationOptions) => {\n  const app = options.app;\n\n  const vueRouter =\n    options.vueRouter ??\n    createRouter({\n      history: createWebHashHistory(),\n      routes: [],\n    });\n\n  const msAppClient = reactive(\n    new MSAppClient({\n      appID: options!.appID,\n      logo: options!.logo ?? \"\",\n      projectName: options!.projectName,\n      httpRequest: options.httpRequest ?? new WebHttpRequest(),\n      origin: location.origin,\n      locale: options!.locale,\n      vueRouter,\n      dataTableComponents: new DataTableComponents(),\n      dataFormComponents: new DataFormComponents(),\n      dataFilterComponents: new DataFilterComponents(),\n      whereFilterComponents: new DataFilterComponents(),\n    })\n  ) as unknown as MSAppClient;\n\n  app.provide(MSAPPCLIENT_CONTEXT_KEY, { msAppClient });\n\n  MSAppClient.instance = msAppClient;\n\n  (window as any).msAppClient = msAppClient;\n\n  const routes = generateRoutesFromFiles(\n    Object.keys(options.routes).map((key) => {\n      return {\n        path: key.replace(/^\\.\\/pages\\/(.+)\\.vue$/, (_, g) => g),\n        module: options.routes[key]?.default || options.routes[key],\n      };\n    })\n  );\n\n  for (const route of routes) {\n    if (route.key.startsWith(\"index\")) {\n      msAppClient.pageManager.addExtendsPage(route);\n    } else {\n      msAppClient.pageManager.addNormalPage(route);\n    }\n  }\n\n  await msAppClient.init();\n\n  app.use(msAppClient.vueRouter);\n\n  return msAppClient;\n};\n"],"names":[],"mappings":";;;;;;;;;;;;;;AA4Ba,MAAA,eAAA,GAAkB,OAAO,OAAsC,KAAA;AAC1E,EAAA,MAAM,MAAM,OAAQ,CAAA,GAAA,CAAA;AAEpB,EAAM,MAAA,SAAA,GACJ,OAAQ,CAAA,SAAA,IACR,YAAa,CAAA;AAAA,IACX,SAAS,oBAAqB,EAAA;AAAA,IAC9B,QAAQ,EAAC;AAAA,GACV,CAAA,CAAA;AAEH,EAAA,MAAM,WAAc,GAAA,QAAA;AAAA,IAClB,IAAI,WAAY,CAAA;AAAA,MACd,OAAO,OAAS,CAAA,KAAA;AAAA,MAChB,IAAA,EAAM,QAAS,IAAQ,IAAA,EAAA;AAAA,MACvB,aAAa,OAAS,CAAA,WAAA;AAAA,MACtB,WAAa,EAAA,OAAA,CAAQ,WAAe,IAAA,IAAI,cAAe,EAAA;AAAA,MACvD,QAAQ,QAAS,CAAA,MAAA;AAAA,MACjB,QAAQ,OAAS,CAAA,MAAA;AAAA,MACjB,SAAA;AAAA,MACA,mBAAA,EAAqB,IAAI,mBAAoB,EAAA;AAAA,MAC7C,kBAAA,EAAoB,IAAI,kBAAmB,EAAA;AAAA,MAC3C,oBAAA,EAAsB,IAAI,oBAAqB,EAAA;AAAA,MAC/C,qBAAA,EAAuB,IAAI,oBAAqB,EAAA;AAAA,KACjD,CAAA;AAAA,GACH,CAAA;AAEA,EAAA,GAAA,CAAI,OAAQ,CAAA,uBAAA,EAAyB,EAAE,WAAA,EAAa,CAAA,CAAA;AAEpD,EAAA,WAAA,CAAY,QAAW,GAAA,WAAA,CAAA;AAEvB,EAAC,OAAe,WAAc,GAAA,WAAA,CAAA;AAE9B,EAAA,MAAM,MAAS,GAAA,uBAAA;AAAA,IACb,OAAO,IAAK,CAAA,OAAA,CAAQ,MAAM,CAAE,CAAA,GAAA,CAAI,CAAC,GAAQ,KAAA;AACvC,MAAO,OAAA;AAAA,QACL,MAAM,GAAI,CAAA,OAAA,CAAQ,0BAA0B,CAAC,CAAA,EAAG,MAAM,CAAC,CAAA;AAAA,QACvD,MAAA,EAAQ,QAAQ,MAAO,CAAA,GAAG,GAAG,OAAW,IAAA,OAAA,CAAQ,OAAO,GAAG,CAAA;AAAA,OAC5D,CAAA;AAAA,KACD,CAAA;AAAA,GACH,CAAA;AAEA,EAAA,KAAA,MAAW,SAAS,MAAQ,EAAA;AAC1B,IAAA,IAAI,KAAM,CAAA,GAAA,CAAI,UAAW,CAAA,OAAO,CAAG,EAAA;AACjC,MAAY,WAAA,CAAA,WAAA,CAAY,eAAe,KAAK,CAAA,CAAA;AAAA,KACvC,MAAA;AACL,MAAY,WAAA,CAAA,WAAA,CAAY,cAAc,KAAK,CAAA,CAAA;AAAA,KAC7C;AAAA,GACF;AAEA,EAAA,MAAM,YAAY,IAAK,EAAA,CAAA;AAEvB,EAAI,GAAA,CAAA,GAAA,CAAI,YAAY,SAAS,CAAA,CAAA;AAE7B,EAAO,OAAA,WAAA,CAAA;AACT;;;;"}

package/dist/esm/node_modules/.pnpm/@codemirror_language@6.9.3/node_modules/@codemirror/language/dist/index.js

@@ -1,6 +1,6 @@
 import { NodeType, NodeProp, IterMode, Tree, TreeFragment, Parser } from '../../../../../@lezer_common@1.1.1/node_modules/@lezer/common/dist/index.js';
-import { Facet, StateField, EditorState, RangeSet, StateEffect, countColumn, combineConfig, RangeSetBuilder, Prec } from '../../../../../@codemirror_state@6.3.2/node_modules/@codemirror/state/dist/index.js';
-import { EditorView, ViewPlugin, gutter, logException, Decoration, WidgetType, GutterMarker } from '../../../../../@codemirror_view@6.22.1/node_modules/@codemirror/view/dist/index.js';
+import { Facet, StateField, EditorState, StateEffect, RangeSet, countColumn, combineConfig, RangeSetBuilder, Prec } from '../../../../../@codemirror_state@6.3.2/node_modules/@codemirror/state/dist/index.js';
+import { EditorView, ViewPlugin, logException, gutter, Decoration, WidgetType, GutterMarker } from '../../../../../@codemirror_view@6.22.1/node_modules/@codemirror/view/dist/index.js';
 import { tags, styleTags, tagHighlighter, highlightTree } from '../../../../../@lezer_highlight@1.2.0/node_modules/@lezer/highlight/dist/index.js';
 import { StyleModule } from '../../../../../style-mod@4.1.0/node_modules/style-mod/src/style-mod.js';
 

package/dist/esm/router-middleware/auth.js

@@ -10,7 +10,7 @@ const authBeforeEach = async (msAppClient, to, from) => {
       if (!userSession) {
         return { name: "login" };
       }
-      return { ...to };
+      return { path: to.fullPath };
     } catch (e) {
       return { name: "login" };
     }

package/dist/esm/router-middleware/auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.js","sources":["../../../src/router-middleware/auth.ts"],"sourcesContent":["import { RouteLocationNormalized, RouteLocationRaw } from \"vue-router\";\nimport { isSameRoute } from \"@maketribe/utils\";\nimport type { MSAppClient } from \"../core\";\n\nexport const authBeforeEach = async (\n  msAppClient: MSAppClient,\n  to: RouteLocationNormalized,\n  from: RouteLocationNormalized\n): Promise<RouteLocationRaw | void> => {\n  if (to.meta.isAuthorization === false) {\n    return;\n  }\n\n  let userSession = msAppClient.userSession;\n\n  if (!userSession) {\n    try {\n      await msAppClient.loadCurrentUserSession();\n\n      userSession = msAppClient.userSession;\n\n      if (!userSession) {\n        return { name: \"login\" };\n      }\n\n      // 因为登陆成功会添加用户可以访问的路由，这里给到vue-router去重新resolve\n      return { ...to };\n    } catch (e) {\n      return { name: \"login\" };\n    }\n  }\n};\n"],"names":[],"mappings":"AAIO,MAAM,cAAiB,GAAA,OAC5B,WACA,EAAA,EAAA,EACA,IACqC,KAAA;AACrC,EAAI,IAAA,EAAA,CAAG,IAAK,CAAA,eAAA,KAAoB,KAAO,EAAA;AACrC,IAAA,OAAA;AAAA,GACF;AAEA,EAAA,IAAI,cAAc,WAAY,CAAA,WAAA,CAAA;AAE9B,EAAA,IAAI,CAAC,WAAa,EAAA;AAChB,IAAI,IAAA;AACF,MAAA,MAAM,YAAY,sBAAuB,EAAA,CAAA;AAEzC,MAAA,WAAA,GAAc,WAAY,CAAA,WAAA,CAAA;AAE1B,MAAA,IAAI,CAAC,WAAa,EAAA;AAChB,QAAO,OAAA,EAAE,MAAM,OAAQ,EAAA,CAAA;AAAA,OACzB;AAGA,MAAO,OAAA,EAAE,GAAG,EAAG,EAAA,CAAA;AAAA,aACR,CAAG,EAAA;AACV,MAAO,OAAA,EAAE,MAAM,OAAQ,EAAA,CAAA;AAAA,KACzB;AAAA,GACF;AACF;;;;"}
+{"version":3,"file":"auth.js","sources":["../../../src/router-middleware/auth.ts"],"sourcesContent":["import { RouteLocationNormalized, RouteLocationRaw } from \"vue-router\";\nimport type { MSAppClient } from \"../core\";\n\nexport const authBeforeEach = async (\n  msAppClient: MSAppClient,\n  to: RouteLocationNormalized,\n  from: RouteLocationNormalized\n): Promise<RouteLocationRaw | void> => {\n  if (to.meta.isAuthorization === false) {\n    return;\n  }\n\n  let userSession = msAppClient.userSession;\n\n  if (!userSession) {\n    try {\n      await msAppClient.loadCurrentUserSession();\n\n      userSession = msAppClient.userSession;\n\n      if (!userSession) {\n        return { name: \"login\" };\n      }\n\n      // 因为登陆成功会添加用户可以访问的路由，这里给到vue-router去重新resolve\n      return { path: to.fullPath };\n    } catch (e) {\n      return { name: \"login\" };\n    }\n  }\n};\n"],"names":[],"mappings":"AAGO,MAAM,cAAiB,GAAA,OAC5B,WACA,EAAA,EAAA,EACA,IACqC,KAAA;AACrC,EAAI,IAAA,EAAA,CAAG,IAAK,CAAA,eAAA,KAAoB,KAAO,EAAA;AACrC,IAAA,OAAA;AAAA,GACF;AAEA,EAAA,IAAI,cAAc,WAAY,CAAA,WAAA,CAAA;AAE9B,EAAA,IAAI,CAAC,WAAa,EAAA;AAChB,IAAI,IAAA;AACF,MAAA,MAAM,YAAY,sBAAuB,EAAA,CAAA;AAEzC,MAAA,WAAA,GAAc,WAAY,CAAA,WAAA,CAAA;AAE1B,MAAA,IAAI,CAAC,WAAa,EAAA;AAChB,QAAO,OAAA,EAAE,MAAM,OAAQ,EAAA,CAAA;AAAA,OACzB;AAGA,MAAO,OAAA,EAAE,IAAM,EAAA,EAAA,CAAG,QAAS,EAAA,CAAA;AAAA,aACpB,CAAG,EAAA;AACV,MAAO,OAAA,EAAE,MAAM,OAAQ,EAAA,CAAA;AAAA,KACzB;AAAA,GACF;AACF;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maketribe/ms-app",
-  "version": "3.0.16",
+  "version": "3.0.17",
   "description": "",
   "main": "dist/cjs",
   "files": [
@@ -21,8 +21,8 @@
     "vue-codemirror": "^6.1.1",
     "vue-router": "^4.2.4",
     "@maketribe/dm": "^3.0.9",
-    "@maketribe/locale": "^1.0.5",
     "@maketribe/request": "^1.1.11",
+    "@maketribe/locale": "^1.0.5",
     "@maketribe/utils": "^1.1.4"
   },
   "scripts": {

package/src/components/json-editor/index.ts

@@ -1,6 +1,8 @@
+import { defineAsyncComponent } from "vue";
 import { withInstall } from "@maketribe/utils";
-import JsonEditor from "./json-editor";
 
-export const MKJsonEditor = withInstall(JsonEditor);
+export const MKJsonEditor = withInstall(
+  defineAsyncComponent(() => import("./json-editor"))
+);
 
 export default MKJsonEditor;

package/src/components/material-select/material-select-type.ts

@@ -6,11 +6,16 @@ export interface MKMaterialSelectOptions {
   allowMaterialTypeValues: MaterialType["value"][];
 }
 
+export type MaterialSelectResult = {
+  success: boolean;
+  data: Material | null;
+  path: string;
+};
+
 export interface IMKMaterialSelect {
-  (options?: MKMaterialSelectOptions, appContext?: AppContext): Promise<{
-    success: boolean;
-    data: Material | null;
-    path: string;
-  }>;
+  (
+    options?: MKMaterialSelectOptions,
+    appContext?: AppContext
+  ): Promise<MaterialSelectResult>;
   _context: AppContext | null;
 }

package/src/components/new-upload-file/MaterialUploadContext.ts

@@ -0,0 +1,14 @@
+import { MKMaterialSelect, MaterialSelectResult } from "../material-select";
+import { UploadContext, UploadResult } from "./UploadContext";
+
+export class MaterialUploadContext extends UploadContext {
+  async selectFile(): Promise<UploadResult> {
+    const materialSelectResult = await MKMaterialSelect();
+
+    return {
+      success: materialSelectResult.success,
+      path: materialSelectResult.path,
+      msg: "",
+    };
+  }
+}

package/src/components/new-upload-file/UploadContext.ts

@@ -0,0 +1,11 @@
+export type UploadResult = {
+  success: boolean;
+  path: string;
+  msg: string;
+};
+
+export class UploadContext {
+  selectFile(): Promise<UploadResult> {
+    throw new Error();
+  }
+}

package/src/components/new-upload-file/WebFileUploadContext.ts

@@ -0,0 +1,58 @@
+import { WebFileUpload } from "@maketribe/request";
+import { UploadContext, UploadResult } from "./UploadContext";
+import { MSAppClient } from "../../core";
+
+export type WebFileUploadContextOptions = {
+  webFileUpload?: WebFileUpload;
+};
+
+export class WebFileUploadContext extends UploadContext {
+  webFileUpload: WebFileUpload;
+
+  constructor(options: WebFileUploadContextOptions = {}) {
+    super();
+
+    this.webFileUpload =
+      options.webFileUpload ??
+      new WebFileUpload({
+        httpRequest: MSAppClient.instance!.httpRequest,
+      });
+  }
+
+  async selectFile(): Promise<UploadResult> {
+    const input = document.createElement("input");
+
+    input.type = "file";
+    Object.assign(input.style, {
+      width: "1px",
+      height: "1px",
+      display: "none",
+    });
+
+    const file: File | null = await new Promise((resolve) => {
+      const handleFileChange = (event: Event) => {
+        const files = input.files;
+
+        input.parentElement?.removeChild(input);
+
+        resolve(files?.length ? files[0] : null);
+      };
+
+      input.addEventListener("change", handleFileChange);
+
+      document.body.append(input);
+    });
+
+    if (!file) {
+      return { success: true, path: "", msg: "" };
+    }
+
+    const response = await this.webFileUpload.upload(file);
+
+    return {
+      success: response.data.code === 200,
+      path: response.data.data.path,
+      msg: response.data.msg,
+    };
+  }
+}

package/src/components/new-upload-file/upload-file-options.ts

@@ -0,0 +1,23 @@
+import { ExtractPropTypes } from "vue";
+import { buildProps } from "@maketribe/utils";
+import { UploadContext } from "./UploadContext";
+import { MaterialUploadContext } from "./MaterialUploadContext";
+
+export const uploadFileProps = buildProps({
+  modelValue: {
+    type: String,
+    required: true,
+  },
+  uploadContext: {
+    type: UploadContext,
+    default: () => new MaterialUploadContext(),
+  },
+} as const);
+
+export type UploadFileProps = ExtractPropTypes<typeof uploadFileProps>;
+
+export const uploadFileEmits = {
+  "upload:modelValue": (path: string) => true,
+};
+
+export type UploadFileEmits = typeof uploadFileEmits;

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/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" };
     }