@maketribe/ms-app 3.0.7 → 3.0.9

package/src/dataview/log/request-log/index.ts

@@ -0,0 +1 @@
+export * from "./RequestLogTable";

package/src/dataview/material/MaterialForm.ts

@@ -15,6 +15,8 @@ export class MaterialForm extends DataForm<Material> {
   }
 
   protected async initialize() {
+    await super.initialize();
+
     this.setColumns([
       new FormColumn({ name: "id", label: "编号" }),
       new FormColumn({ name: "type", label: "类型" }),

package/src/dataview/material/MaterialMan.ts

@@ -4,7 +4,8 @@ import { MaterialTable, MaterialType } from "./MaterialTable";
 import {
   MaterialGroup,
   MaterialGroupNode,
-  MaterialGroupTable,
+  MaterialGroupTree,
+  // MaterialGroupTable,
 } from "./material-group";
 import { UploadError, WebFileUpload, HttpRequest } from "@maketribe/request";
 import { MaterialForm } from "./MaterialForm";
@@ -15,13 +16,13 @@ export type MaterialManOptions = {
 };
 
 export class MaterialMan {
-  currentMaterialGroupId: MaterialGroup["id"] | null;
+  // currentMaterialGroupId: MaterialGroup["id"] | null;
   currentMaterialTypeId: MaterialType["value"] | null;
 
   materialTypes: MaterialType[] = [];
   materialTypeValues: MaterialType["value"][] = [];
 
-  materialGroupTable: MaterialGroupTable;
+  materialGroupTree: MaterialGroupTree;
   materialTable: MaterialTable;
   materialForm: MaterialForm;
 
@@ -32,6 +33,10 @@ export class MaterialMan {
 
   protected materialConditionGroup: Group;
 
+  get currentMaterialGroupId() {
+    return this.materialGroupTree.getCurrentNode()?.data?.id ?? null;
+  }
+
   get currentMaterialType() {
     return (
       this.materialTypes.find(
@@ -41,7 +46,8 @@ export class MaterialMan {
   }
 
   constructor(options: MaterialManOptions) {
-    this.materialGroupTable = new MaterialGroupTable();
+    this.materialGroupTree = new MaterialGroupTree();
+    // this.materialGroupTable = new MaterialGroupTable();
     this.materialTable = new MaterialTable({
       materialComponents: options.components,
     });
@@ -57,7 +63,7 @@ export class MaterialMan {
       .getOrder()
       .addOrderItem("createDate", OrderType.DESC);
 
-    this.materialGroupTable.dataFilter.setReady();
+    // this.materialGroupTable.dataFilter.setReady();
     this.materialTable.dataFilter.setReady();
 
     this.upload = new WebFileUpload({
@@ -75,7 +81,7 @@ export class MaterialMan {
       httpRequest: options.httpRequest,
     });
 
-    this.currentMaterialGroupId = null;
+    // this.currentMaterialGroupId = null;
     this.currentMaterialTypeId = null;
   }
 
@@ -107,29 +113,29 @@ export class MaterialMan {
       });
     });
 
-    await this.materialGroupTable.init();
-    await this.materialGroupTable.load();
+    await this.materialGroupTree.init();
+    await this.materialGroupTree.load();
 
     await this.materialForm.init();
 
-    const getFirstMaterialGroupNode = (
-      materialGroupNodes: MaterialGroupNode[]
-    ): MaterialGroupNode => {
-      if (materialGroupNodes[0].children.length) {
-        return getFirstMaterialGroupNode(materialGroupNodes[0].children);
-      }
+    // const getFirstMaterialGroupNode = (
+    //   materialGroupNodes: MaterialGroupNode[]
+    // ): MaterialGroupNode => {
+    //   if (materialGroupNodes[0].children.length) {
+    //     return getFirstMaterialGroupNode(materialGroupNodes[0].children);
+    //   }
 
-      return materialGroupNodes[0];
-    };
+    //   return materialGroupNodes[0];
+    // };
 
-    const materialGroupList = this.materialGroupTable.getList();
+    // const materialGroupList = this.materialGroupTree.getList();
 
-    if (!materialGroupList.length) {
-      return;
-    }
+    // if (!materialGroupList.length) {
+    //   return;
+    // }
 
-    this.currentMaterialGroupId =
-      getFirstMaterialGroupNode(materialGroupList).id;
+    // this.currentMaterialGroupId =
+    //   getFirstMaterialGroupNode(materialGroupList).id;
 
     await this.materialTable.init();
 
@@ -161,8 +167,12 @@ export class MaterialMan {
     );
   }
 
-  setCurrentMaterialGroupId(materialGoupId: MaterialGroupNode["id"] | null) {
-    this.currentMaterialGroupId = materialGoupId;
+  setCurrentMaterialGroupId(materialGroup: MaterialGroupNode | null) {
+    this.materialGroupTree.setCurrentNode(
+      materialGroup
+        ? this.materialGroupTree.findDataTreeNode(materialGroup)
+        : null
+    );
 
     this.attachMaterialTableCondition();
   }

package/src/dataview/material/MaterialTable.ts

@@ -54,6 +54,8 @@ export class MaterialTable
   }
 
   protected async initialize() {
+    await super.initialize();
+
     const loadingManager = this.getLoadingManager();
 
     try {

package/src/dataview/material/material-group/MaterialGroupForm.ts

@@ -12,6 +12,8 @@ export class MaterialGroupForm extends DataForm<MaterialGroup> {
   }
 
   protected async initialize() {
+    await super.initialize();
+
     this.setColumns([
       new FormColumn({ name: "desc", label: "分组名称", required: true }),
       new FormColumn({

package/src/dataview/material/material-group/MaterialGroupTable.ts

@@ -18,6 +18,8 @@ export class MaterialGroupTable extends DataTable<
   }
 
   protected async initialize() {
+    await super.initialize();
+
     this.setColumns([
       new TableColumn({ name: "id", label: "编号", visible: false }),
       new TableColumn({ name: "desc", label: "描述" }),

package/src/dataview/material/material-group/MaterialGroupTree.ts

@@ -0,0 +1,67 @@
+import { DataTableOptions, DataTree, DataTreeNode } from "@maketribe/dm";
+import { MaterialGroup } from "./MaterialGroupForm";
+
+export type MaterialGroupNode = MaterialGroup & {
+  children: MaterialGroupNode[];
+};
+
+export class MaterialGroupTree extends DataTree<MaterialGroupNode> {
+  currentDataTreeNode: DataTreeNode<MaterialGroupNode> | null;
+
+  constructor(options: DataTableOptions = {}) {
+    super({
+      name: "ms-material-group",
+      props: { label: "desc", children: "children" },
+      ...options,
+    });
+
+    this.currentDataTreeNode = null;
+  }
+
+  protected async loadRequest(params: Record<string, any>) {
+    const response = await super.loadRequest(params);
+
+    const list = response.data.data;
+
+    const rootMaterialGroups: MaterialGroupNode[] = [];
+
+    const materialGroups = list as MaterialGroupNode[];
+
+    for (const materialGroup of materialGroups) {
+      materialGroup.children = [];
+
+      if (!materialGroup.parentGroupId) {
+        rootMaterialGroups.push(materialGroup);
+      }
+
+      for (const item of materialGroups) {
+        if (materialGroup.id === item.parentGroupId) {
+          materialGroup.children.push(item);
+        }
+      }
+    }
+    return response;
+  }
+
+  getCurrentNode() {
+    if (this.currentDataTreeNode) {
+      return this.currentDataTreeNode;
+    }
+
+    const getFirstNode = (
+      nodes: DataTreeNode<MaterialGroupNode>[]
+    ): DataTreeNode<MaterialGroupNode> | null => {
+      if (nodes[0].children.length) {
+        return getFirstNode(nodes[0].children);
+      }
+
+      return nodes[0];
+    };
+
+    return (this.currentDataTreeNode = getFirstNode(this.rootNodes));
+  }
+
+  setCurrentNode(node: DataTreeNode<MaterialGroupNode> | null) {
+    this.currentDataTreeNode = node;
+  }
+}

package/src/dataview/material/material-group/index.ts

@@ -1,2 +1,3 @@
 export * from "./MaterialGroupForm";
-export * from "./MaterialGroupTable";
+// export * from "./MaterialGroupTable";
+export * from "./MaterialGroupTree";

package/src/dataview/member/MemberForm.ts

@@ -3,6 +3,7 @@ import { defineDataForm } from "../../define-data-form";
 import { RoleTable } from "../role";
 import { DepartmentTable } from "../department";
 import { WebFileUpload } from "@maketribe/request";
+import { EMAIL_PATTERN } from "../../constants";
 export type MemberResult = {
   id: string;
   name: string;
@@ -11,7 +12,6 @@ export type MemberResult = {
   email: string;
   phone: string;
   account: string;
-  // password: string;
   avatar: string;
   roles: any[];
   depts: any[];
@@ -26,8 +26,6 @@ export type Member = {
   email: string;
   phone: string;
   account: string;
-  // password: string;
-  // confirmPassword: string;
   avatar: string | null;
   roles: any[];
   depts: any[];
@@ -43,12 +41,19 @@ export class MemberForm<
   }
 
   protected async initialize() {
+    await super.initialize();
+
     this.setColumns([
       new FormColumn({ name: "id", label: "编号" }),
       new FormColumn({ name: "name", label: "姓名", required: true }),
       new FormColumn({ name: "wechatNo", label: "微信号", defaultValue: null }),
       new FormColumn({ name: "nickName", label: "昵称", required: true }),
-      new FormColumn({ name: "email", label: "邮箱", required: true }),
+      new FormColumn({
+        name: "email",
+        label: "邮箱",
+        required: true,
+        rules: [{ message: "邮箱格式有误", pattern: EMAIL_PATTERN }],
+      }),
       new FormColumn({ name: "phone", label: "手机号", defaultValue: null }),
       new FormColumn({ name: "account", label: "账号", required: true }),
       new FormColumn({

package/src/dataview/member/MemberTable.tsx

@@ -14,6 +14,7 @@ import {
 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">;
 
@@ -29,6 +30,8 @@ export class MemberTable extends DataTable<MemberResult, MemberTableItem> {
   }
 
   protected async initialize() {
+    await super.initialize();
+
     await this.initActiveMemberForm();
 
     this.dataFilter.setColumns([
@@ -113,13 +116,17 @@ export class MemberTable extends DataTable<MemberResult, MemberTableItem> {
                 return;
               }
               this.loadingManager.startLoading();
-              const result = await this.httpRequest.post(
-                `/api/dv/ms-member/${row.id}/password/reset`
-              );
+
+              const response = await this.dataViewRequest.callDVRequest<
+                R<string>
+              >({
+                action: `${row.id}/password/reset`,
+              });
+
               this.loadingManager.completeLoading();
-              if (result.data.code !== 200) {
+              if (response.data.code !== 200) {
                 Messager.instance.error({
-                  message: result.data.msg || "重置密码失败",
+                  message: response.data.msg || "重置密码失败",
                 });
                 return;
               }
@@ -128,7 +135,7 @@ export class MemberTable extends DataTable<MemberResult, MemberTableItem> {
                 title: "重置密码成功",
                 message: (
                   <p>
-                    <span>你的新密码为{result.data.data}</span>
+                    <span>你的新密码为{response.data.data}</span>
                   </p>
                 ),
                 type: "warning",
@@ -139,7 +146,7 @@ export class MemberTable extends DataTable<MemberResult, MemberTableItem> {
                 return;
               }
 
-              navigator.clipboard.writeText(result.data.data);
+              navigator.clipboard.writeText(response.data.data);
               Messager.instance.success({ message: "复制成功" });
             },
             predicate: (member: MemberTableItem) => member.valid === 1,

package/src/dataview/member/member-role/MemberRoleTable.ts

@@ -12,6 +12,8 @@ export class MemberRoleTable extends DataTable {
   }
 
   protected async initialize() {
+    await super.initialize();
+
     this.setColumns([
       new TableColumn({ name: "id", label: "编号", visible: false }),
       new TableColumn({ name: "memberId", label: "成员ID" }),

package/src/dataview/menu/MenuForm.ts

@@ -47,6 +47,8 @@ export class MenuForm extends DataForm<MenuResult, MenuItem> {
   }
 
   protected async initialize() {
+    await super.initialize();
+
     const menuTable = this.register(new MenuTable({ pageSize: 10 }));
 
     if (isWhereFilter(menuTable.dataFilter)) {
@@ -82,6 +84,7 @@ export class MenuForm extends DataForm<MenuResult, MenuItem> {
           options: [
             { value: MenuType.Container, label: "菜单组" },
             { value: MenuType.Menu, label: "菜单" },
+            { value: MenuType.SystemSettings, label: "系统设置" },
           ],
         },
       }),
@@ -132,17 +135,21 @@ export class MenuForm extends DataForm<MenuResult, MenuItem> {
       }
     });
 
+    const handleMenuTypeChange = () => {
+      const visible = this.data?.type === MenuType.Menu;
+
+      this.getColumn("routeId")!.visible = visible;
+      this.getColumn("routes")!.visible = visible;
+      this.getColumn("permissionPoints")!.visible = visible;
+    };
+
     this.formItemValueChangeEvent.on(({ formItem }) => {
       if (formItem.name === "type") {
-        this.getColumn("routes")!.visible = this.data?.type !== "1";
-        this.getColumn("permissionPoints")!.visible = this.data?.type !== "1";
+        handleMenuTypeChange();
       }
     });
 
-    this.dataChangeEvent.on(({}) => {
-      this.getColumn("routes")!.visible = this.data?.type !== "1";
-      this.getColumn("permissionPoints")!.visible = this.data?.type !== "1";
-    });
+    this.dataChangeEvent.on(handleMenuTypeChange);
 
     this.dataFormTypeChangeEvent.on(({ dataFormType }) => {
       this.getColumn("type")!.disabled = dataFormType !== DataFormType.ADD;
@@ -174,7 +181,7 @@ export class MenuForm extends DataForm<MenuResult, MenuItem> {
       iconName: item.iconName || "",
       pid: item.pid || "",
       routeId: item.routeId,
-      type: item.type ? item.type + "" : "1",
+      type: item.type ? `${item.type}` : "1",
       sort: item.sort || "0",
       routes: item.routes || [],
       permissionPoints: item.permissionPoints || [],

package/src/dataview/menu/MenuTable.ts

@@ -16,6 +16,8 @@ export class MenuTable<T extends MenuItem = MenuItem> extends DataTable<
   }
 
   protected async initialize() {
+    await super.initialize();
+
     this.setColumns([
       new TableColumn({ name: "id", label: "编号", visible: false }),
       new TableColumn({ name: "title", label: "菜单描述" }),

package/src/dataview/menu/MenuTree.ts

@@ -1,143 +1,112 @@
-import { Group } from "@maketribe/request";
-import { DataTableOptions, TableColumn, WhereFilter } from "@maketribe/dm";
 import {
-  PermissionPointDefine,
-  PermissionPointDefineForm,
-  PermissionPointDefineTable,
-} from "./permission-point";
-import { MenuItem, MenuResult } from "./MenuForm";
-import { MenuTable } from "./MenuTable";
-import { R, ResponseConfig } from "@maketribe/request";
-
-export type MenuNodeItem = MenuItem & { children: MenuNodeItem[] };
-
-export class MenuTree extends MenuTable<MenuNodeItem> {
-  permissionPointDefineTable: PermissionPointDefineTable;
-
-  permissionPointDefineForm: PermissionPointDefineForm;
-
-  permissionPointDefineConditionGroup: Group;
-
-  currentMenuId: MenuNodeItem["id"] = "";
-
+  DataTableOptions,
+  DataTree,
+  DataTreeNode,
+  TableActionColumn,
+  TableColumn,
+  isWhereFilter,
+} from "@maketribe/dm";
+import { R, CancelToken } from "@maketribe/request";
+import { MenuItem } from "./MenuForm";
+import { defineDataTree } from "../../define-data-tree";
+import { MenuType } from "../../constants";
+
+export type MenuItemNode = MenuItem & { children: MenuItemNode[] };
+
+export class MenuTree extends DataTree<MenuItemNode> {
   constructor(options: Omit<DataTableOptions, "name"> = {}) {
-    super({
-      ...options,
-      pageSize: 0,
-      pageSizes: [],
-      interfaceURL: {
-        list: "/api/dv/ms-menu/allList",
-        ...options.interfaceURL,
-      },
-    });
-
-    const menuTree = this;
-
-    this.permissionPointDefineTable =
-      new (class extends PermissionPointDefineTable {
-        protected loadRequest(
-          params: Record<string, any>
-        ): Promise<
-          ResponseConfig<
-            R<PermissionPointDefine[]> & { totalRecCount: string },
-            any
-          >
-        > {
-          if (menuTree.currentMenuId) {
-            // 只有选中菜单的情况下才进行请求
-            return super.loadRequest(params);
-          }
-
-          return Promise.resolve({
-            status: 200,
-            statusText: "OK",
-            headers: {},
-            data: { code: 200, data: [], msg: "", totalRecCount: "0" },
-            config: {},
-            request: null,
-          } as unknown as ResponseConfig<R<PermissionPointDefine[]> & { totalRecCount: string }, any>);
-        }
-      })();
-    this.permissionPointDefineForm = new PermissionPointDefineForm({
-      autoReset: false,
-    });
-
-    this.permissionPointDefineConditionGroup = new Group();
-
-    (this.permissionPointDefineTable.dataFilter as WhereFilter)
-      .getWhere()
-      .addGroup(this.permissionPointDefineConditionGroup);
+    super({ name: "ms-menu", ...options });
   }
 
   protected async initialize() {
-    await this.permissionPointDefineTable.init();
-    await this.permissionPointDefineForm.init();
+    await super.initialize();
 
     this.setColumns([
       new TableColumn({ name: "id", label: "编号", visible: false }),
       new TableColumn({ name: "title", label: "菜单描述" }),
+      new TableActionColumn(),
     ]);
+  }
 
-    this.register(
-      this.permissionPointDefineTable.addRecordEvent.on(async () => {
-        await this.permissionPointDefineForm.addRecord();
+  protected async loadRequest(params: Record<string, any>) {
+    if (isWhereFilter(this.dataFilter)) {
+      const defaultGroup = this.dataFilter.getDefaultGroup();
+      defaultGroup.clear();
 
-        this.permissionPointDefineForm.setData({
-          ...this.permissionPointDefineForm.data!,
-          menuId: this.currentMenuId,
-        });
-      })
-    );
-
-    this.register(
-      this.permissionPointDefineTable.editRecordEvent.on(async ({ item }) => {
-        await this.permissionPointDefineForm.editRecord(item);
-      })
-    );
-
-    this.register(
-      this.permissionPointDefineForm.submittedEvent.on(() => {
-        this.permissionPointDefineTable.load();
-      })
-    );
-  }
+      defaultGroup.addCondition("pid", "is", "null");
+    }
 
-  setList(list: MenuNodeItem[]): void {
-    let rootMenu: MenuNodeItem[] = [];
+    const response = await this.dataViewRequest.list<
+      R<MenuItemNode[]> & { totalRecCount: string }
+    >({
+      data: {
+        pn: this.currentPage,
+        pc: this.pageSize,
+        ...this.getLoadParams(params),
+      },
+      cancelToken: new CancelToken((cancel) => {
+        this.loadCancel = cancel;
+      }),
+    });
 
-    for (const node of list) {
-      if (!node.pid) {
-        rootMenu.push(node);
-      }
+    this.loadCancel = null;
 
-      for (const item of list) {
-        if (item.pid === node.id) {
-          node.children.push(item);
-        }
+    if (response.data.code === 200) {
+      for (const item of response.data.data) {
+        item.type += "";
+        item.children = item.children || [];
       }
     }
 
-    super.setList(rootMenu);
+    return response;
   }
 
-  formatItem(item: MenuResult): MenuNodeItem {
-    return {
-      ...super.formatItem(item),
-      children: [],
-    };
-  }
+  createDataTreeNode(data: MenuItemNode): DataTreeNode<MenuItemNode> {
+    const dataTreeNode = new (class extends DataTreeNode<MenuItemNode> {
+      get isLeaf() {
+        return this.data!.type === MenuType.Menu;
+      }
 
-  async toPermissionPointDefine(item: MenuNodeItem) {
-    this.permissionPointDefineConditionGroup.clear();
+      protected async loadRequest(params: Record<string, any>) {
+        if (isWhereFilter(this.dataFilter)) {
+          const defaultGroup = this.dataFilter.getDefaultGroup();
+          defaultGroup.clear();
 
-    this.permissionPointDefineConditionGroup.addCondition(
-      "menuId",
-      "=",
-      item.id
-    );
+          defaultGroup.addCondition("pid", "=", this.data!.id);
+        }
 
-    this.currentMenuId = item.id;
+        const response = await this.dataViewRequest.allList<
+          R<MenuItemNode[]> & { totalRecCount: string }
+        >({
+          data: { ...this.getLoadParams(params) },
+          cancelToken: new CancelToken((cancel) => {
+            this.loadCancel = cancel;
+          }),
+        });
 
-    await this.permissionPointDefineTable.load();
+        this.loadCancel = null;
+
+        if (response.data.code === 200) {
+          for (const item of response.data.data) {
+            item.type += "";
+            item.children = item.children || [];
+          }
+        }
+
+        return response;
+      }
+    })({
+      name: this.name,
+    });
+
+    dataTreeNode.setTree(this);
+
+    dataTreeNode.setData(data);
+
+    return dataTreeNode;
   }
 }
+
+(window as any).MenuTree = MenuTree;
+
+defineDataTree(MenuTree);

package/src/dataview/menu/permission-point/PermissionPointDefineForm.ts

@@ -13,6 +13,8 @@ export class PermissionPointDefineForm extends DataForm<PermissionPointDefine> {
   }
 
   protected async initialize() {
+    await super.initialize();
+    
     this.setColumns([
       new FormColumn({ name: "id", label: "编号" }),
       new FormColumn({

package/src/dataview/menu/permission-point/PermissionPointDefineTable.ts

@@ -15,6 +15,8 @@ export class PermissionPointDefineTable<
   }
 
   protected async initialize() {
+    await super.initialize();
+
     this.dataFilter.setColumns([
       new FilterColumn({ name: "key", label: "权限键" }),
       new FilterColumn({ name: "name", label: "权限描述" }),