@maketribe/ms-app 3.0.4 → 3.0.5

package/src/core/tabs/Tab.ts

@@ -0,0 +1,59 @@
+import { Disposable, Event } from "@maketribe/utils";
+import { Route } from "../../dataview";
+import type { Tabs } from "./Tabs";
+
+export interface TabOptions {
+  id: string;
+
+  title: string;
+
+  affix?: boolean;
+
+  realRoute: any;
+
+  route: Route;
+
+  tabs: Tabs;
+}
+
+export class Tab extends Disposable {
+  id: string;
+
+  title: string;
+
+  affix: boolean;
+
+  realRoute: any;
+
+  route: Route;
+
+  beforeCloseEvent: Event = this.register(new Event());
+
+  refreshEvent: Event = this.register(new Event());
+
+  beforeSwitchEvent: Event = this.register(new Event());
+
+  tabs: Tabs;
+
+  constructor(options: TabOptions) {
+    super();
+    this.id = options.id;
+    this.title = options.title;
+    this.affix = options.affix ?? false;
+    this.realRoute = options.realRoute;
+    this.route = options.route;
+    this.tabs = options.tabs;
+  }
+
+  getTitle() {
+    return this.title;
+  }
+
+  getID() {
+    return this.id;
+  }
+
+  close() {
+    this.tabs.closeTab(this);
+  }
+}

package/src/dataview/config/ConfigForm.ts

@@ -6,7 +6,7 @@ import {
   IComponents,
 } from "@maketribe/dm";
 import { defineDataForm } from "../../define-data-form";
-import { ITypeResolver } from "../../resolver/ITypeResolver";
+import { ITypeResolver } from "../../core";
 
 export type Config<T = any> = {
   id: string;

package/src/dataview/material/MaterialTable.ts

@@ -8,7 +8,7 @@ import {
 import { Material } from "./MaterialForm";
 import { ConfigTable } from "../config";
 import { defineDataTable } from "../../define-data-table";
-import { ITypeResolver } from "../../resolver/ITypeResolver";
+import { ITypeResolver } from "../../core";
 
 export type MaterialType = {
   value: string;

package/src/dataview/role/RolePermissionConfigTable.ts

@@ -41,8 +41,9 @@ export class RolePermissionConfigTable extends MenuTable<RoleMenuNode> {
   initing: boolean = false;
 
   rootRoleMenuNodes: RoleMenuNode[] = [];
-
+  currentRole: Role | undefined;
   currentRoleId: Role["id"] = "";
+  currentRoleDesc: Role["desc"] = "";
 
   constructor(options: Omit<DataTableOptions, "name"> = {}) {
     super({
@@ -192,14 +193,16 @@ export class RolePermissionConfigTable extends MenuTable<RoleMenuNode> {
     return loadResult;
   }
 
-  async selectRolePermission(roleId: Role["id"]) {
-    this.currentRoleId = roleId;
+  async selectRolePermission(role: Role | undefined) {
+    this.currentRole = role;
+    this.currentRoleId = role?.id || "";
+    this.currentRoleDesc = role?.desc || "";
 
     this.roleRouteConditionGroup.clear();
     this.rolePermissionPointConditionGroup.clear();
 
-    this.roleRouteConditionGroup.addCondition("roleId", "=", roleId);
-    this.rolePermissionPointConditionGroup.addCondition("roleId", "=", roleId);
+    this.roleRouteConditionGroup.addCondition("roleId", "=", this.currentRoleId);
+    this.rolePermissionPointConditionGroup.addCondition("roleId", "=", this.currentRoleId);
 
     const [roleRouteTableResult, rolePermissionPointTableResult] =
       await Promise.all([
@@ -434,7 +437,7 @@ export class RolePermissionConfigTable extends MenuTable<RoleMenuNode> {
       }
     }
 
-    await this.selectRolePermission(this.currentRoleId);
+    await this.selectRolePermission(this.currentRole);
   }
 
   /**

package/src/define-data-form.ts

@@ -1,4 +1,4 @@
-import { DataFormClass, DataModelDefines } from "./DataModelDefines";
+import { DataFormClass, DataModelDefines } from "./core";
 
 export const defineDataForm = <T extends DataFormClass>(
   DataFormClass: T

package/src/define-data-table.ts

@@ -1,4 +1,4 @@
-import { DataModelDefines, DataTableClass } from "./DataModelDefines";
+import { DataModelDefines, DataTableClass } from "./core";
 
 export const defineDataTable = <T extends DataTableClass>(
   DataTableClass: T

package/src/index.ts

@@ -1,12 +1,7 @@
 export * from "./constants";
 export * from "./dataview";
 
-export * from "./tabs";
-export * from "./menu";
-export * from "./Router";
-export * from "./PermissionPointManager";
-export * from "./UserSession";
-export * from "./MSAppClient";
+export * from "./core";
 
 import { installer } from "./installer";
 
@@ -14,16 +9,10 @@ export * from "./layouts";
 export * from "./composables";
 export * from "./components";
 export * from "./tokens";
-export * from "./ConfigComponents";
-export * from "./MaterialComponents";
-export { MSDataFormComponents } from "./MSDataFormComponents";
-export { MSDataTableComponents } from "./MSDataTableComponents";
-export { MSDataFilterComponents } from "./MSDataFilterComponents";
 
 export const install = installer.install;
 export const version = installer.version;
 
 export * from "./init-application";
-export * from "./DataModelDefines";
 export * from "./define-data-table";
 export * from "./define-data-form";

package/src/init-application.ts

@@ -4,20 +4,21 @@ import {
   createWebHashHistory,
   Router as VueRouter,
 } from "vue-router";
-import { MSAppClient } from "./MSAppClient";
+import { MSAppClient } from "./core";
 import { HttpRequest, WebHttpRequest } from "@maketribe/request";
 import { MSAPPCLIENT_CONTEXT_KEY } from "./tokens";
-import { Router } from "vue-router";
-import { MSDataTableComponents } from "./MSDataTableComponents";
-import { MSDataFormComponents } from "./MSDataFormComponents";
-import { MSDataFilterComponents } from "./MSDataFilterComponents";
+
 import { generateRoutesFromFiles } from "./utils";
+import {
+  DataFilterComponents,
+  DataFormComponents,
+  DataTableComponents,
+} from "./core";
 
 export type InitMsApplicationOptions = {
   routes: any;
   vueRouter?: VueRouter;
   app: App;
-  router?: Router;
   appID: string;
   logo?: string;
   projectName: string;
@@ -29,7 +30,7 @@ export const initApplication = async (options: InitMsApplicationOptions) => {
   const app = options.app;
 
   const vueRouter =
-    options.router ??
+    options.vueRouter ??
     createRouter({
       history: createWebHashHistory(),
       routes: [],
@@ -44,10 +45,10 @@ export const initApplication = async (options: InitMsApplicationOptions) => {
       origin: location.origin,
       locale: options!.locale,
       vueRouter,
-      dataTableComponents: new MSDataTableComponents(),
-      dataFormComponents: new MSDataFormComponents(),
-      dataFilterComponents: new MSDataFilterComponents(),
-      whereFilterComponents: new MSDataFilterComponents(),
+      dataTableComponents: new DataTableComponents(),
+      dataFormComponents: new DataFormComponents(),
+      dataFilterComponents: new DataFilterComponents(),
+      whereFilterComponents: new DataFilterComponents(),
     })
   ) as unknown as MSAppClient;
 

package/src/installer.ts

@@ -1,8 +1,26 @@
-import { Plugin, reactive } from "vue";
+import { Plugin } from "vue";
 import { makeInstaller } from "@maketribe/utils";
-import { ConfigProviderContext } from "@maketribe/dm-ui";
-
+import { Dialoger, Messager, Notificationer } from "@maketribe/dm";
+import { DialogerImpl, MessagerImpl, NotificationerImpl } from "./message-impl";
 import {
+  ConfigProviderContext,
+  MKConfigProvider,
+  MKDataForm,
+  MKDataFormPage,
+  MKDataTable,
+  MKDataTablePage,
+  MKDataTree,
+  MKDataTreePage,
+  MKImageView,
+  MKSvgIcon,
+  MKVideoView,
+  provideGlobalConfig,
+  MKDataTableSelect,
+  MKDataTableSelectDialog,
+  MKPagination,
+  MKDataTablePagination,
+  MKMarkdownEditor,
+  MKRichTextEditor,
   MKMaterialList,
   MKMaterialSelect,
   MKSystemProvider,
@@ -12,9 +30,25 @@ import {
 } from "./components";
 
 const components: Plugin[] = [
-  MKSystemProvider,
+  MKConfigProvider,
+  MKDataForm,
+  MKDataFormPage,
+  MKDataTable,
+  MKDataTablePage,
+  MKDataTree,
+  MKDataTreePage,
+  MKImageView,
+  MKSvgIcon,
+  MKVideoView,
+  MKDataTableSelect,
+  MKDataTableSelectDialog,
+  MKPagination,
+  MKDataTablePagination,
+  MKMarkdownEditor,
+  MKRichTextEditor,
   MKMaterialList,
   MKMaterialSelect,
+  MKSystemProvider,
   MKRolePermissionConfig,
   MKImageSelect,
   MKVerifyDialog,
@@ -22,5 +56,14 @@ const components: Plugin[] = [
 
 export const installer = makeInstaller<ConfigProviderContext>(
   components,
-  "1.0.0-dev"
+  "1.0.0-dev",
+  (app, version, options) => {
+    if (options) {
+      provideGlobalConfig(options, app, true);
+    }
+
+    Messager.implInstance = new MessagerImpl();
+    Dialoger.implInstance = new DialogerImpl();
+    Notificationer.implInstance = new NotificationerImpl();
+  }
 );

package/src/layouts/common/lock/lock.tsx

@@ -2,7 +2,7 @@ import { defineComponent, ref, unref } from "vue";
 import { useRouter } from "vue-router";
 import { ElButton, ElInput } from "element-plus";
 import { Messager } from "@maketribe/dm";
-import { MSAppClient } from "../../../MSAppClient";
+import { MSAppClient } from "../../../core";
 import { MKVerifyDialog } from "../../../components";
 
 export default defineComponent({

package/src/layouts/default/components/bar/index.tsx

@@ -1,8 +1,6 @@
 import { computed, defineComponent, unref } from "vue";
-import { ElTooltip } from "element-plus";
-import { MKSvgIcon } from "@maketribe/dm-ui";
-import { MSAppClient } from "../../../../MSAppClient";
-import { MenuNode } from "../../../../menu";
+import { MKSvgIcon } from "../../../../components";
+import { MSAppClient, MenuNode } from "../../../../core";
 
 export const MKBar = defineComponent({
   name: "MKBar",
@@ -43,15 +41,12 @@ export const MKBar = defineComponent({
             rootMenu.children.length ? "has-children" : "",
             unref(currentBarItem)?.id === rootMenu.id ? "is-active" : "",
           ]}
+          onClick={() => handleBarItemClick(rootMenu)}
         >
-          <ElTooltip content={rootMenu.title} placement="right">
-            <div
-              class="mk-bar__item-button"
-              onClick={() => handleBarItemClick(rootMenu)}
-            >
-              <MKSvgIcon iconClass={rootMenu.iconName} />
-            </div>
-          </ElTooltip>
+          <div class="mk-bar__item-button">
+            <MKSvgIcon iconClass={rootMenu.iconName} />
+          </div>
+          <div class="mk-bar__item-title">{rootMenu.title} </div>
         </div>
       ));
 

package/src/layouts/default/components/menu/index.tsx

@@ -1,7 +1,6 @@
 import { computed, defineComponent, ref, unref } from "vue";
 import { ElMenu } from "element-plus";
-import { MenuNode } from "../../../../menu";
-import { MSAppClient } from "../../../../MSAppClient";
+import { MenuNode, MSAppClient } from "../../../../core";
 import MKAsideMenuItem from "./menu-item";
 
 export const MKMenu = defineComponent({

package/src/layouts/default/components/menu/menu-item.tsx

@@ -1,7 +1,7 @@
 import { Fragment, computed, defineComponent } from "vue";
 import { ElMenuItem, ElSubMenu } from "element-plus";
-import { MKSvgIcon } from "@maketribe/dm-ui";
-import { MenuNode } from "../../../../menu";
+import { MKSvgIcon } from "../../../../components";
+import { MenuNode } from "../../../../core";
 
 const MKAsideMenuItem = defineComponent({
   name: "MKMenuItem",

package/src/layouts/default/index.tsx

@@ -3,8 +3,8 @@ import { RouterView } from "vue-router";
 import { ElAside, ElContainer, ElHeader, ElMain } from "element-plus";
 import { MKSystemProvider } from "../../components";
 import { MKBar, MKMenu } from "./components";
-import { MenuNode } from "../../menu";
-import { MSAppClient } from "../../MSAppClient";
+import { MenuNode } from "../../core";
+import { MSAppClient } from "../../core";
 
 function includeMenuNode(rootMenuNode: MenuNode, menuNode: MenuNode) {
   let list = [rootMenuNode];

package/src/layouts/manager-system/components/aside/aside.tsx

@@ -1,8 +1,7 @@
 import { Ref, computed, defineComponent, ref, unref } from "vue";
 import MKAsideBar from "./bar";
 import MKAsidePanel from "./panel";
-import { MenuNode } from "../../../../menu";
-import { MSAppClient } from "../../../../MSAppClient";
+import { MenuNode, MSAppClient } from "../../../../core";
 
 export default defineComponent({
   name: "MKMenu",

package/src/layouts/manager-system/components/aside/bar/bar.tsx

@@ -1,8 +1,7 @@
 import { defineComponent } from "vue";
 import { ElScrollbar } from "element-plus";
-import { MenuNode } from "../../../../../menu";
-import { MSAppClient } from "../../../../../MSAppClient";
-import { MKSvgIcon } from "@maketribe/dm-ui";
+import { MenuNode, MSAppClient } from "../../../../../core";
+import { MKSvgIcon } from "../../../../../components";
 
 export default defineComponent({
   name: "MKAsideBar",

package/src/layouts/manager-system/components/aside/menu/menu-item.tsx

@@ -1,7 +1,7 @@
 import { Fragment, defineComponent } from "vue";
 import { ElMenuItem, ElSubMenu } from "element-plus";
-import { MenuNode } from "../../../../../menu";
-import { MKSvgIcon } from "@maketribe/dm-ui";
+import { MenuNode } from "../../../../../core";
+import { MKSvgIcon } from "../../../../../components";
 
 const MKAsideMenuItem = defineComponent({
   name: "MKAsideMenuItem",

package/src/layouts/manager-system/components/aside/menu/menu.tsx

@@ -1,7 +1,6 @@
 import { defineComponent, ref, unref } from "vue";
 import { ElMenu } from "element-plus";
-import { MenuNode } from "../../../../../menu";
-import { MSAppClient } from "../../../../../MSAppClient";
+import { MenuNode, MSAppClient } from "../../../../../core";
 import MKAsideMenuItem from "./menu-item";
 
 export default defineComponent({

package/src/layouts/manager-system/components/aside/panel/panel.tsx

@@ -1,7 +1,6 @@
 import { computed, defineComponent, unref } from "vue";
 import { ElDivider, ElScrollbar } from "element-plus";
-import { MenuNode } from "../../../../../menu";
-import { MSAppClient } from "../../../../../MSAppClient";
+import { MenuNode, MSAppClient } from "../../../../../core";
 import MKAsideMenu from "../menu";
 
 export default defineComponent({

package/src/layouts/manager-system/components/header/breadcrumb/breadcrumb.tsx

@@ -1,8 +1,7 @@
 import { Ref, computed, defineComponent, ref, unref } from "vue";
 import { ElBreadcrumb, ElBreadcrumbItem } from "element-plus";
-import { MKSvgIcon } from "@maketribe/dm-ui";
-import { MenuNode } from "../../../../../menu";
-import { MSAppClient } from "../../../../../MSAppClient";
+import { MKSvgIcon } from "../../../../../components";
+import { MenuNode, MSAppClient } from "../../../../../core";
 
 export default defineComponent({
   name: "MKHeaderBreadcrumb",
@@ -16,7 +15,7 @@ export default defineComponent({
     });
 
     const path = computed(() => {
-      const currentMenuNode = unref(currentMenu);;
+      const currentMenuNode = unref(currentMenu);
 
       if (!currentMenuNode) {
         return [];

package/src/layouts/manager-system/components/header/nav/nav.tsx

@@ -1,10 +1,10 @@
 import { ElDropdown, ElDropdownItem } from "element-plus";
-import { MKSvgIcon } from "@maketribe/dm-ui";
+import { MKSvgIcon } from "../../../../../components";
 import { Fragment, computed, defineComponent, unref } from "vue";
 import { MKHeaderTools } from "../tools";
 import { MKHeaderBreadcrumb } from "../breadcrumb";
 import { useRouter } from "vue-router";
-import { MSAppClient } from "../../../../../MSAppClient";
+import { MSAppClient } from "../../../../../core";
 
 type UserDropdownItem = { title: string; icon: string; callback: () => any };
 

package/src/layouts/manager-system/components/header/tabs/tabs.tsx

@@ -1,8 +1,7 @@
 import { Fragment, Ref, computed, defineComponent, ref, unref } from "vue";
 import { ElTabPane, ElTabs, TabPaneName } from "element-plus";
-import { MKSvgIcon } from "@maketribe/dm-ui";
-import { MSAppClient } from "../../../../../MSAppClient";
-import { Tab } from "../../../../../tabs";
+import { MKSvgIcon } from "../../../../../components";
+import { MSAppClient, Tab } from "../../../../../core";
 
 export default defineComponent({
   name: "MKHeaderTabs",

package/src/layouts/manager-system/components/header/tools/tools.tsx

@@ -1,4 +1,4 @@
-import { MKSvgIcon } from "@maketribe/dm-ui";
+import { MKSvgIcon } from "../../../../../components";
 import { defineComponent } from "vue";
 
 export default defineComponent({

package/src/layouts/manager-system/components/menu/logo.tsx

@@ -1,6 +1,6 @@
 import { computed, defineComponent, unref } from "vue";
 import { ElTooltip } from "element-plus";
-import { MSAppClient } from "../../../../MSAppClient";
+import { MSAppClient } from "../../../../core";
 
 export default defineComponent({
   name: "MKLogo",

package/src/layouts/manager-system/components/menu/menu.tsx

@@ -1,8 +1,7 @@
 import { Fragment, Ref, computed, defineComponent, ref, unref } from "vue";
 import { ElButton, ElMenu, ElMenuItem, ElSubMenu } from "element-plus";
-import { MKSvgIcon } from "@maketribe/dm-ui";
-import { MSAppClient } from "../../../../MSAppClient";
-import { MenuNode } from "../../../../menu";
+import { MKSvgIcon } from "../../../../components";
+import { MenuNode, MSAppClient } from "../../../../core";
 import MKLogo from "./logo";
 
 const MKMenuItem = defineComponent({

package/src/layouts/manager-system/manager-system.tsx

@@ -3,7 +3,7 @@ import { createDisposable } from "@maketribe/utils";
 import { MKSystemProvider } from "../../components";
 import MKMenu from "./components/menu";
 import MKHeader from "./components/header";
-import { MSAppClient } from "../../MSAppClient";
+import { MSAppClient } from "../../core";
 import MKLock from "../common/lock";
 
 export default defineComponent({

package/src/message-impl/DialogerImpl.ts

@@ -0,0 +1,27 @@
+import { IDialogMessage, SkeletonDialoger } from "@maketribe/dm";
+import { ElMessageBox } from "element-plus";
+
+export class DialogerImpl extends SkeletonDialoger {
+  async prompt(options: IDialogMessage): Promise<string> {
+    const promptResult = await ElMessageBox.prompt(
+      options.message,
+      options.title,
+      options
+    );
+
+    return promptResult.value;
+  }
+
+  async confirm(options: IDialogMessage): Promise<boolean> {
+    try {
+      await ElMessageBox.confirm(options.message, options.title, options);
+      return true;
+    } catch (e) {
+      return false;
+    }
+  }
+
+  async alert(options: IDialogMessage): Promise<void> {
+    await ElMessageBox.alert(options.message, options.title, options);
+  }
+}

package/src/message-impl/MessagerImpl.ts

@@ -0,0 +1,17 @@
+import { SkeletonMessageSender, IMessage } from "@maketribe/dm";
+import { ElMessage } from "element-plus";
+
+export class MessagerImpl extends SkeletonMessageSender<IMessage> {
+  info(message: IMessage): void {
+    ElMessage.info(message);
+  }
+  success(message: IMessage): void {
+    ElMessage.success(message);
+  }
+  warning(message: IMessage): void {
+    ElMessage.warning(message);
+  }
+  error(message: IMessage): void {
+    ElMessage.error(message);
+  }
+}

package/src/message-impl/NotificationerImpl.ts

@@ -0,0 +1,17 @@
+import { NotificationMessage, SkeletonMessageSender } from "@maketribe/dm";
+import { ElNotification } from "element-plus";
+
+export class NotificationerImpl extends SkeletonMessageSender<NotificationMessage> {
+  info(message: NotificationMessage): void {
+    ElNotification.info(message);
+  }
+  success(message: NotificationMessage): void {
+    ElNotification.success(message);
+  }
+  warning(message: NotificationMessage): void {
+    ElNotification.warning(message);
+  }
+  error(message: NotificationMessage): void {
+    ElNotification.error(message);
+  }
+}

package/src/message-impl/index.ts

@@ -0,0 +1,3 @@
+export * from "./MessagerImpl";
+export * from "./NotificationerImpl";
+export * from "./DialogerImpl";

package/src/page/index/dv/default/add.vue

@@ -12,7 +12,7 @@ import { unref, computed, watch, Ref, reactive } from "vue";
 import { useRouter } from "vue-router";
 import { ElMessage } from "element-plus";
 import { DataForm } from "@maketribe/dm";
-import { DataModelDefines } from "../../../../DataModelDefines";
+import { DataModelDefines } from "../../../../core";
 import { useCurrentTab } from "../../../../composables/use-current-tab";
 
 const router = useRouter();

package/src/page/index/dv/default/edit.vue

@@ -12,7 +12,7 @@ import { unref, computed, watch, Ref, reactive } from "vue";
 import { useRouter } from "vue-router";
 import { ElMessage } from "element-plus";
 import { DataForm } from "@maketribe/dm";
-import { DataModelDefines } from "../../../../DataModelDefines";
+import { DataModelDefines } from "../../../../core";
 import { useCurrentTab } from "../../../../composables/use-current-tab";
 
 const router = useRouter();

package/src/page/index/dv/default/index.vue

@@ -2,12 +2,10 @@
   <MKDataTablePage :data-table="dataTable" selection />
 </template>
 <script setup lang="ts">
-import { unref, computed, reactive, watch } from "vue";
+import { unref, computed, reactive, watch, ref, Ref } from "vue";
 import { useRouter } from "vue-router";
-import { Disposable } from "@maketribe/utils";
 import { DataTable } from "@maketribe/dm";
-import { MKDataTablePage } from "@maketribe/dm-ui";
-import { DataModelDefines } from "../../../../DataModelDefines";
+import { DataModelDefines } from "../../../../core";
 
 const router = useRouter();
 
@@ -15,15 +13,27 @@ const props = defineProps({
   dataTable: { type: DataTable<any> },
 });
 
-const dataTable = computed(() => {
-  const dataTable =
-    props.dataTable ||
-    DataModelDefines.instance.getDataTable(
-      unref(router.currentRoute).meta.name as string
-    );
+const dataTable: Ref<DataTable | null> = ref(null);
 
-  return dataTable ? (reactive(dataTable) as DataTable) : null;
-});
+// const dataTable = computed(() => {
+//   const dataTable =
+//     props.dataTable ||
+//     DataModelDefines.instance.getDataTable(
+//       unref(router.currentRoute).meta.name as string
+//     );
+
+//   return dataTable ? (reactive(dataTable) as DataTable) : null;
+// });
+
+watch(
+  computed(() => [props.dataTable, unref(router.currentRoute).meta.name]),
+  ([_dataTable, name]) => {
+    dataTable.value =
+      (_dataTable as DataTable) ||
+      DataModelDefines.instance.getDataTable(name as string);
+  },
+  { immediate: true }
+);
 
 watch(
   dataTable,