@maketribe/ms-app 3.0.11 → 3.0.13

package/src/core/tabs/Tabs.ts

@@ -93,18 +93,29 @@ export class Tabs extends Disposable {
   }
 
   switchTab(tab: Tab | null) {
-    if (!tab) {
-      this.setCurrentTab(null);
-      return;
-    }
+    // TODO 暂时用不到Tab
 
-    let _tab = this._tabs.find((item) => item.getID() === tab.getID());
-
-    if (!_tab) {
-      this.setTabs([...this.getTabs(), tab]);
-    }
+    // if (
+    //   this.getCurrentTab()?.realRoute?.fullPath === tab?.realRoute?.fullPath
+    // ) {
+    //   return;
+    // }
 
     this.setCurrentTab(tab);
+    return;
+
+    // if (!tab) {
+    //   this.setCurrentTab(null);
+    //   return;
+    // }
+
+    // let _tab = this._tabs.find((item) => item.getID() === tab.getID());
+
+    // if (!_tab) {
+    //   this.setTabs([...this.getTabs(), tab]);
+    // }
+
+    // this.setCurrentTab(tab);
   }
 
   findTabByID(id: Tab["id"]) {

package/src/dataview/material/MaterialMan.ts

@@ -167,7 +167,7 @@ export class MaterialMan {
     );
   }
 
-  setCurrentMaterialGroupId(materialGroup: MaterialGroupNode | null) {
+  setCurrentMaterialGroup(materialGroup: MaterialGroupNode | null) {
     this.materialGroupTree.setCurrentNode(
       materialGroup
         ? this.materialGroupTree.findDataTreeNode(materialGroup)

package/src/dataview/member/MemberTable.tsx

@@ -1,3 +1,4 @@
+import { R } from "@maketribe/request";
 import {
   TableColumn,
   DataTable,
@@ -11,22 +12,22 @@ import {
   Dialoger,
   FormColumn,
 } from "@maketribe/dm";
-import { Event } from "@maketribe/utils";
 import { defineDataTable } from "../../define-data-table";
 import { Member, MemberForm, MemberResult } from "./MemberForm";
-import { R } from "@maketribe/request";
 
 export type MemberTableItem = Omit<Member, "password" | "confirmPassword">;
 
 export class MemberTable extends DataTable<MemberResult, MemberTableItem> {
   activeMemberForm: MemberForm;
 
-  activeMemberEvent: Event<MemberTableItem> = this.register(new Event());
+  isShowActiveMemberForm: boolean;
 
   constructor(options: DataTableOptions = {}) {
     super({ name: "ms-member", ...options });
 
     this.activeMemberForm = new MemberForm();
+
+    this.isShowActiveMemberForm = false;
   }
 
   protected async initialize() {
@@ -98,7 +99,14 @@ export class MemberTable extends DataTable<MemberResult, MemberTableItem> {
           new ActionButton({
             label: "激活用户",
             handler: async (row) => {
-              this.activeMemberEvent.emit(row);
+              const response = await this.activeMemberForm.editRecord(row.id);
+
+              if (response.data.code !== 200) {
+                Messager.instance.error({ message: response.data.msg });
+                return;
+              }
+
+              this.isShowActiveMemberForm = true;
             },
             predicate: (member: MemberTableItem) => member.valid === 0,
           }),

package/src/dataview/menu/MenuTable.ts

@@ -6,6 +6,7 @@ import {
 } from "@maketribe/dm";
 import { defineDataTable } from "../../define-data-table";
 import type { MenuItem, MenuResult } from "./MenuForm";
+import { DVQueryable } from "@maketribe/request";
 
 export class MenuTable<T extends MenuItem = MenuItem> extends DataTable<
   MenuResult,

package/src/dataview/role/RoleTable.ts

@@ -7,6 +7,7 @@ import {
   ActionButton,
   EditButton,
   DeleteButton,
+  ClassifySearchItem,
 } from "@maketribe/dm";
 import { defineDataTable } from "../../define-data-table";
 import { Role } from "./RoleForm";

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

@@ -14,7 +14,8 @@ export const MKBar = defineComponent({
     const msAppClient = MSAppClient.instance!;
     const userSession = msAppClient.userSession!;
     const menu = userSession.menu;
-    const router = userSession.router;
+    const vueRouter = msAppClient.vueRouter;
+    // const router = userSession.router;
 
     const currentBarItem = computed(() => props.barItem);
 
@@ -30,7 +31,7 @@ export const MKBar = defineComponent({
       }
 
       if (target?.route) {
-        router.changeRoute({ name: target.route.name });
+        vueRouter.push({ name: target.route.name });
       }
     };
 

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

@@ -18,7 +18,8 @@ export const MKMenu = defineComponent({
     const msAppClient = MSAppClient.instance!;
     const userSession = msAppClient.userSession!;
     const menu = userSession.menu;
-    const router = userSession.router;
+    const vueRouter = msAppClient.vueRouter;
+    // const router = userSession.router;
 
     const currentMenuNode = ref(menu.getCurrentMenuNode());
 
@@ -28,7 +29,7 @@ export const MKMenu = defineComponent({
       const item = menu.findMenuNodeByID(id);
 
       if (item?.route) {
-        router.changeRoute({ name: item.route.name });
+        vueRouter.push({ name: item.route.name });
       }
     };
 

package/src/page/index/dv/ms-member/index.vue

@@ -1,7 +1,7 @@
 <template>
   <DefaultSingleListPage :data-table="memberTable" />
 
-  <ElDialog v-model="isShowActiveMemberForm" class="dialogClass">
+  <ElDialog v-model="memberTable.isShowActiveMemberForm" class="dialogClass">
     <MKDataForm :data-form="activeMemberForm" />
     <template #footer>
       <ElButton @click="handleActiveMemberConfirm" type="primary">
@@ -12,26 +12,18 @@
 </template>
 
 <script setup lang="ts">
-import { computed, reactive, ref } from "vue";
+import { computed, reactive } from "vue";
 import { ElButton, ElDialog } from "element-plus";
 import { DataModelDefines } from "../../../../core";
+import { MKDataForm } from "../../../../components";
 import { MemberTable } from "../../../../dataview";
 import DefaultSingleListPage from "../default/single/list/normal.vue";
 
-const isShowActiveMemberForm = ref(false);
-
 const memberTable = reactive(
   DataModelDefines.instance.getDataTable("ms-member")!
 ) as MemberTable;
 const activeMemberForm = computed(() => memberTable.activeMemberForm);
 
-memberTable.activeMemberEvent.on(async (member) => {
-  memberTable.activeMemberForm.getLoadingManager().startLoading();
-  await memberTable.activeMemberForm.editRecord(member.id);
-  memberTable.activeMemberForm.getLoadingManager().completeLoading();
-  isShowActiveMemberForm.value = true;
-});
-
 const handleActiveMemberConfirm = async () => {
   memberTable.approveMember();
 };

package/src/router-middleware/auth.ts

@@ -29,39 +29,4 @@ export const authBeforeEach = async (
       return { name: "login" };
     }
   }
-
-  const tabs = userSession.tabs;
-  const router = userSession.router;
-
-  const route = router.getRouteByName(to.name as string);
-
-  if (!route) {
-    // return { name: "notFound" };
-    // // 前往第一个菜单
-    // const menuNode = userSession.menu.getFirstLeafMenuNode();
-
-    // if (!menuNode || !menuNode.route) {
-    //   return { name: "login" };
-    // }
-
-    // // return { name: menuNode.route.name };
-    // return to;
-
-    return;
-  }
-
-  const matched = to.matched[to.matched.length - 1];
-
-  if (matched) {
-    if (!isSameRoute(router.currentRoute, to)) {
-      router.changeRoute(to);
-    }
-
-    const tab = tabs.getTabByID(to.name as string);
-
-    if (tab) {
-      tab.affix = matched.meta.affix as boolean;
-      tab.realRoute = to;
-    }
-  }
 };