@maketribe/ms-app 3.0.6 → 3.0.8

package/src/dataview/department/DepartmentForm.ts

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

package/src/dataview/department/DepartmentTable.ts

@@ -1,8 +1,7 @@
 import { DataTableOptions, TableColumn, DataTable } from "@maketribe/dm";
 import { Department } from "./DepartmentForm";
 import { defineDataTable } from "../../define-data-table";
-
-export type DepartmentNode = Department & { children: DepartmentNode[] };
+import { DepartmentNode } from "./DepartmentTree";
 
 export class DepartmentTable<
   T extends Department = Department,
@@ -22,6 +21,8 @@ export class DepartmentTable<
   }
 
   protected async initialize() {
+    await super.initialize();
+
     this.setColumns([
       new TableColumn({ name: "id", label: "编号", visible: false }),
       new TableColumn({ name: "name", label: "名称" }),

package/src/dataview/department/DepartmentTree.ts

@@ -0,0 +1,47 @@
+import { DataTree, DataTreeOptions } from "@maketribe/dm";
+
+import { Department } from "./DepartmentForm";
+import { defineDataTree } from "../../define-data-tree";
+
+export type DepartmentNode = Department & { children: DepartmentNode[] };
+
+export class DepartmentTree<
+  T extends DepartmentNode = DepartmentNode
+> extends DataTree<T> {
+  constructor(options: DataTreeOptions = {}) {
+    super({
+      name: "ms-dept",
+      ...options,
+      props: { label: "name", ...options.props },
+    });
+  }
+  protected async loadRequest(params: Record<string, any>) {
+    const response = await super.loadRequest(params);
+
+    const list = response.data.data;
+
+    const rootDepartments: T[] = [];
+
+    const departments = list;
+
+    for (const department of departments) {
+      department.children = [];
+
+      if (!department.pid) {
+        rootDepartments.push(department);
+      }
+
+      for (const item of departments) {
+        if (department.id === item.pid) {
+          department.children.push(item);
+        }
+      }
+    }
+
+    response.data.data = rootDepartments as T[];
+
+    return response;
+  }
+}
+
+defineDataTree(DepartmentTree);

package/src/dataview/department/index.ts

@@ -1,2 +1,3 @@
 export * from "./DepartmentForm";
 export * from "./DepartmentTable";
+export * from "./DepartmentTree";

package/src/dataview/index.ts

@@ -5,3 +5,7 @@ export * from "./role";
 export * from "./route";
 export * from "./config";
 export * from "./material";
+export * from "./ip-white-list";
+export * from "./deny-ip-access-list";
+export * from "./region";
+export * from "./log";

package/src/dataview/ip-white-list/IPWhitelistForm.ts

@@ -0,0 +1,30 @@
+import { DataForm, FormColumn } from "@maketribe/dm";
+import { defineDataForm } from "../../define-data-form";
+import { IP_PATTERN } from "../../constants";
+
+export type IPWhitelist = {
+  id: string;
+  ipAddress: string;
+};
+
+export class IPWhitelistForm<T = IPWhitelist, F = T> extends DataForm<T, F> {
+  constructor(options = {}) {
+    super({ name: "ms-access-ip-whitelist", ...options });
+  }
+
+  async initialize() {
+    await super.initialize();
+
+    this.setColumns([
+      new FormColumn({ name: "id", label: "编号" }),
+      new FormColumn({
+        name: "ipAddress",
+        label: "IP地址",
+        required: true,
+        rules: [{ message: "请输入正确的IP", pattern: IP_PATTERN }],
+      }),
+    ]);
+  }
+}
+
+defineDataForm(IPWhitelistForm);

package/src/dataview/ip-white-list/IPWhitelistTable.ts

@@ -0,0 +1,81 @@
+import {
+  ActionButton,
+  DataTable,
+  DeleteButton,
+  EditButton,
+  TableActionColumn,
+  TableColumn,
+  Messager,
+} from "@maketribe/dm";
+import { defineDataTable } from "../../define-data-table";
+import { IPWhitelist } from "./IPWhitelistForm";
+
+export class IPWhitelistTable<T = IPWhitelist, F = T> extends DataTable<T, F> {
+  constructor(options = {}) {
+    super({ name: "ms-access-ip-whitelist", ...options });
+  }
+
+  async initialize() {
+    await super.initialize();
+
+    this.setColumns([
+      new TableColumn({ name: "ipAddress", label: "IP地址" }),
+      new TableColumn({ name: "createdAt", label: "创建时间" }),
+      new TableActionColumn({
+        width: "180px",
+        buttons: [
+          new EditButton(),
+          new DeleteButton({ label: "移除" }),
+          new ActionButton({
+            label: "禁用",
+            type: "danger",
+            handler: async (row) => {
+              this.loadingManager.startLoading();
+
+              const result = await this.dataViewRequest.callDVRequest({
+                action: `disable/${row.id}`,
+              });
+
+              this.loadingManager.completeLoading();
+              if (result.data.code !== 200) {
+                Messager.instance.error({
+                  message: result.data.msg || "禁用失败",
+                });
+                return;
+              }
+              Messager.instance.success({ message: "禁用成功" });
+
+              this.load();
+            },
+            predicate: (row) => row.valid === 1,
+          }),
+          new ActionButton({
+            label: "启用",
+            type: "success",
+            handler: async (row) => {
+              this.loadingManager.startLoading();
+
+              const result = await this.dataViewRequest.callDVRequest({
+                action: `enable/${row.id}`,
+              });
+
+              this.loadingManager.completeLoading();
+              if (result.data.code !== 200) {
+                Messager.instance.error({
+                  message: result.data.msg || "启用失败",
+                });
+                return;
+              }
+              Messager.instance.success({ message: "启用成功" });
+
+              this.load();
+            },
+            predicate: (row) => row.valid === 0,
+          }),
+        ],
+      }),
+    ]);
+  }
+}
+
+defineDataTable(IPWhitelistTable);

package/src/dataview/ip-white-list/index.ts

@@ -0,0 +1,2 @@
+export * from "./IPWhitelistForm";
+export * from "./IPWhitelistTable";

package/src/dataview/log/index.ts

@@ -0,0 +1,4 @@
+export * from "./operate-log";
+export * from "./login-log";
+export * from "./request-log";
+export * from "./local-log";

package/src/dataview/log/local-log/LocalLogTree.ts

@@ -0,0 +1,77 @@
+import { DataTree, DataTreeNode, DataTreeOptions } from "@maketribe/dm";
+import { R, CancelToken } from "@maketribe/request";
+import { defineDataTree } from "../../../define-data-tree";
+import { Event } from "@maketribe/utils";
+
+export type LocalLog = {
+  name: string;
+  path: string;
+  isDirectory: boolean;
+  children: LocalLog[];
+};
+
+export class LocalLogTree extends DataTree<LocalLog> {
+  constructor(options: DataTreeOptions = { props: { label: "name" } }) {
+    super({ name: "local-log", props: { label: "path" }, ...options });
+  }
+
+  protected async initialize(): Promise<void> {
+    await super.initialize();
+
+    this.initdEvent.once(() => {
+      this.append(
+        this.createDataTreeNode({
+          name: "root",
+          path: "/",
+          isDirectory: true,
+          children: [],
+        })
+      );
+    });
+  }
+
+  createDataTreeNode(data: LocalLog) {
+    const dataTreeNode: DataTreeNode<LocalLog> =
+      new (class extends DataTreeNode<LocalLog> {
+        get isLeaf() {
+          return !(this.data?.isDirectory ?? false);
+        }
+
+        protected async loadRequest(params: Record<string, any>) {
+          const response = await this.httpRequest.get<
+            R<LocalLog[]> & { totalRecCount: string }
+          >("/api/ms/system/local-log-dir-root", {
+            params: { ...params, path: this.data!.path },
+            cancelToken: new CancelToken((cancel) => {
+              this.loadCancel = cancel;
+            }),
+          });
+
+          response.data.data = response.data.data.map((item) => ({
+            name: item.name,
+            path: item.path,
+            isDirectory: item.isDirectory,
+            children: [],
+          })) as LocalLog[];
+
+          this.loadCancel = null;
+
+          return response;
+        }
+      })({ name: this.name });
+
+    dataTreeNode.setTree(this);
+
+    dataTreeNode.setData(data);
+
+    return dataTreeNode;
+  }
+
+  formatItem(item: LocalLog): LocalLog {
+    return { ...item, children: [] };
+  }
+}
+
+(window as any).LocalLogTree = LocalLogTree;
+
+defineDataTree(LocalLogTree);

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

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

package/src/dataview/log/login-log/LoginLogTable.ts

@@ -0,0 +1,55 @@
+import { DataTable, DataTableOptions, TableColumn } from "@maketribe/dm";
+import { defineDataTable } from "../../../define-data-table";
+import { LoginLogType } from "../../../constants";
+
+export type LoginLogResult = {
+  account: string;
+  ipAddress: string;
+  traceId: string;
+  status: LoginLogType;
+  clientId: string;
+};
+
+export type LoginLog = LoginLogResult & {
+  statusText: string;
+};
+
+export class LoginLogTable extends DataTable<LoginLogResult, LoginLog> {
+  constructor(options: DataTableOptions = {}) {
+    super({ name: "ms-memberlogin-record", ...options });
+  }
+
+  protected async initialize() {
+    await super.initialize();
+
+    this.setColumns([
+      new TableColumn({ name: "account", label: "账号", width: "150px" }),
+      new TableColumn({ name: "statusText", label: "状态", width: "100px" }),
+      new TableColumn({ name: "ipAddress", label: "IP", width: "120px" }),
+      new TableColumn({ name: "traceId", label: "链路编号" }),
+      new TableColumn({ name: "clientId", label: "客户端编号" }),
+      new TableColumn({ name: "createdAt", label: "时间" }),
+    ]);
+  }
+
+  formatItem(item: LoginLogResult): LoginLog {
+    let statusText = "";
+
+    switch (item.status) {
+      case LoginLogType.SUCCESS:
+        statusText = "登录成功";
+        break;
+      case LoginLogType.FAILURE:
+        statusText = "登录失败";
+        break;
+      case LoginLogType.LOCK:
+        statusText = "账号锁定";
+        break;
+      default:
+    }
+
+    return { ...item, clientId: item.clientId ?? "", statusText };
+  }
+}
+
+defineDataTable(LoginLogTable);

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

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

package/src/dataview/log/operate-log/OperateLogTable.ts

@@ -0,0 +1,20 @@
+import { DataTable, DataTableOptions, TableColumn } from "@maketribe/dm";
+import { defineDataTable } from "../../../define-data-table";
+
+export class OperateLogTable extends DataTable {
+  constructor(options: DataTableOptions = {}) {
+    super({ name: "ms-operate-log", ...options });
+  }
+
+  protected async initialize() {
+    await super.initialize();
+
+    this.setColumns([
+      new TableColumn({ name: "desc", label: "描述" }),
+      new TableColumn({ name: "content", label: "内容" }),
+      new TableColumn({ name: "createdAt", label: "时间" }),
+    ]);
+  }
+}
+
+defineDataTable(OperateLogTable);

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

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

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

@@ -0,0 +1,82 @@
+import { DataTable, DataTableOptions, TableColumn } from "@maketribe/dm";
+import { defineDataTable } from "../../../define-data-table";
+
+export type RequestLog = {
+  id: string;
+  requestUrl: string;
+  timeOperationElapsedMilliseconds: string;
+  traceId: string;
+  httpMethod: string;
+  createdAt: string;
+  isError: number;
+  content: any;
+};
+
+export class RequestLogTable extends DataTable<
+  RequestLog,
+  RequestLog & { contentText: string }
+> {
+  constructor(options: DataTableOptions = {}) {
+    super({ name: "ms-request-log", ...options });
+  }
+
+  protected async initialize() {
+    await super.initialize();
+
+    this.setColumns([
+      new TableColumn({
+        name: "requestUrl",
+        label: "请求地址",
+      }),
+      new TableColumn({
+        name: "traceId",
+        label: "链路编号",
+      }),
+      new TableColumn({
+        name: "contentText",
+        label: "内容",
+        componentInfo: "MKColumnJson",
+      }),
+      new TableColumn({
+        name: "timeOperationElapsedMilliseconds",
+        label: "耗时(ms)",
+      }),
+      new TableColumn({
+        name: "isError",
+        label: "状态",
+      }),
+      new TableColumn({
+        name: "httpMethod",
+        label: "请求方法",
+      }),
+      new TableColumn({ name: "createdAt", label: "时间" }),
+    ]);
+
+    (window as any).a = this;
+  }
+
+  formatItem(item: RequestLog): RequestLog & { contentText: string } {
+    let contentText = "";
+
+    try {
+      const content = JSON.parse(JSON.stringify(item.content || {}));
+
+      if (typeof content.logReponseInfo.value === "string") {
+        content.logReponseInfo.value = JSON.parse(content.logReponseInfo.value);;
+      }
+
+      contentText = JSON.stringify(content, null, 2);
+    } catch (e) {
+      console.error(e);
+    }
+
+    return {
+      ...item,
+      contentText,
+    };
+  }
+}
+
+(window as any).RequestLogTable = RequestLogTable;
+
+defineDataTable(RequestLogTable);

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 {
@@ -92,7 +94,7 @@ export class MaterialTable
     return {
       id: item.id,
       materialGroupId: item.materialGroupId || null,
-      type: item.type || "string",
+      type: item.type ? `${item.type}` : "1",
       desc: item.desc || "",
       path: item.path || "",
     };

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: "描述" }),