@maketribe/ms-app 3.0.7 → 3.0.8

package/src/core/Router.ts

@@ -2,7 +2,7 @@ import { Disposable, Event, createDisposable } from "@maketribe/utils";
 import { Route } from "../dataview";
 import type { UserSession } from "./UserSession";
 
-const NORMALIZE_ROUTE_NAME_REG = /^([^\\]+)\/(.+)$/;
+const NORMALIZE_ROUTE_NAME_REG = /^dv\/([^/]+)\/([^/]+)(\/.+)?$/;
 
 export class Router extends Disposable {
   userSession: UserSession;
@@ -46,16 +46,78 @@ export class Router extends Disposable {
         const action = match[2];
 
         switch (action) {
+          case "single":
+            const [listType, type] = match[3].slice(1).split("/");
+
+            switch (listType) {
+              case "list":
+                switch (type) {
+                  case "normal":
+                    vueRouter.addRoute("mk-ms-layout", {
+                      name: defaultPageRoute.name,
+                      path: `/dv/${name}`,
+                      component: () =>
+                        import(
+                          "../page/index/dv/default/single/list/normal.vue"
+                        ),
+                      meta: { name },
+                    });
+                    break;
+                  case "dialog":
+                    vueRouter.addRoute("mk-ms-layout", {
+                      name: defaultPageRoute.name,
+                      path: `/dv/${name}`,
+                      component: () =>
+                        import(
+                          "../page/index/dv/default/single/list/dialog.vue"
+                        ),
+                      meta: { name },
+                    });
+                    break;
+                }
+
+                break;
+              case "tree":
+                switch (type) {
+                  case "dialog":
+                    vueRouter.addRoute("mk-ms-layout", {
+                      name: defaultPageRoute.name,
+                      path: `/dv/${name}`,
+                      component: () =>
+                        import(
+                          "../page/index/dv/default/single/tree/dialog.vue"
+                        ),
+                      meta: { name },
+                    });
+                    break;
+                }
+              case "table-tree":
+                switch (type) {
+                  case "dialog":
+                    vueRouter.addRoute("mk-ms-layout", {
+                      name: defaultPageRoute.name,
+                      path: `/dv/${name}`,
+                      component: () =>
+                        import(
+                          "../page/index/dv/default/single/table-tree/dialog.vue"
+                        ),
+                      meta: { name },
+                    });
+                    break;
+                }
+            }
+
+            break;
           case "list":
-            vueRouter.addRoute("mk-ms-main", {
+            vueRouter.addRoute("mk-ms-layout", {
               name: defaultPageRoute.name,
               path: `/dv/${name}`,
-              component: () => import("../page/index/dv/default/index.vue"),
+              component: () => import("../page/index/dv/default/table.vue"),
               meta: { name },
             });
             break;
           case "edit":
-            vueRouter.addRoute("mk-ms-main", {
+            vueRouter.addRoute("mk-ms-layout", {
               name: defaultPageRoute.name,
               path: `/dv/${name}/:id`,
               component: () => import("../page/index/dv/default/edit.vue"),
@@ -63,21 +125,13 @@ export class Router extends Disposable {
             });
             break;
           case "add":
-            vueRouter.addRoute("mk-ms-main", {
+            vueRouter.addRoute("mk-ms-layout", {
               name: defaultPageRoute.name,
               path: `/dv/${name}/add`,
               component: () => import("../page/index/dv/default/add.vue"),
               meta: { name },
             });
             break;
-          case "tree":
-            vueRouter.addRoute("mk-ms-main", {
-              name: defaultPageRoute.name,
-              path: `/dv/${name}`,
-              component: () => import("../page/index/dv/default/tree.vue"),
-              meta: { name },
-            });
-            break;
         }
       }
     }

package/src/core/component/ConfigComponents.ts

@@ -6,13 +6,16 @@ export class ConfigComponents extends Components {
     super();
 
     this.registerComponent({
-      name: "MKFormInput",
+      name: "MKConfigInput",
       title: "输入框",
       component: ElInput,
+      defaultProps: {
+        type: "textarea",
+      },
     });
 
     this.registerComponent({
-      name: "MKFormInputNumber",
+      name: "MKConfigInputNumber",
       title: "数值输入框",
       component: ElInputNumber,
     });

package/src/core/component/DataTableComponents.ts

@@ -47,5 +47,13 @@ export class DataTableComponents extends Components {
         () => import("../../components/column-components/column-select")
       ),
     });
+
+    this.registerComponent({
+      name: "MKColumnJson",
+      title: "JSON",
+      component: defineAsyncComponent(
+        () => import("../../components/column-components/column-json")
+      ),
+    });
   }
 }

package/src/dataview/config/ConfigForm.ts

@@ -1,12 +1,11 @@
 import {
-  Components,
   DataForm,
   DataFormOptions,
   FormColumn,
   IComponents,
 } from "@maketribe/dm";
 import { defineDataForm } from "../../define-data-form";
-import { ITypeResolver } from "../../core";
+import { ConfigComponents, ITypeResolver } from "../../core";
 
 export type Config<T = any> = {
   id: string;
@@ -29,10 +28,12 @@ export class ConfigForm
   constructor(options: ConfigFormOptions = {}) {
     super({ name: "ms-cfg", ...options });
 
-    this.configComponent = options.configComponent ?? new Components();
+    this.configComponent = options.configComponent ?? new ConfigComponents();
   }
 
   protected async initialize() {
+    await super.initialize();
+
     const defaultType = "string";
     this.setColumns([
       new FormColumn({ name: "id", label: "编号" }),
@@ -99,9 +100,9 @@ export class ConfigForm
   resolveType(type: string) {
     switch (type) {
       case "int":
-        return "MKFormInputNumber";
+        return "MKConfigInputNumber";
       default:
-        return "MKFormInput";
+        return "MKConfigInput";
     }
   }
 

package/src/dataview/config/ConfigTable.ts

@@ -26,6 +26,8 @@ export class ConfigTable extends DataTable<Config> {
   }
 
   protected async initialize() {
+    await super.initialize();
+
     this.setColumns([
       new TableColumn({ name: "id", label: "编号", visible: false }),
       new TableColumn({ name: "key", label: "配置键" }),
@@ -65,4 +67,6 @@ export class ConfigTable extends DataTable<Config> {
   }
 }
 
+(window as any).ConfigTable = ConfigTable;
+
 defineDataTable(ConfigTable);

package/src/dataview/deny-ip-access-list/DenyIPAccessListForm.ts

@@ -1,5 +1,6 @@
 import { DataForm, FormColumn } from "@maketribe/dm";
 import { defineDataForm } from "../../define-data-form";
+import { IP_PATTERN } from "../../constants";
 
 export type DenyIPAccessList = {
   id: string;
@@ -15,9 +16,16 @@ export class DenyIPAccessListForm<T = DenyIPAccessList, F = T> extends DataForm<
   }
 
   async initialize() {
+    await super.initialize();
+
     this.setColumns([
       new FormColumn({ name: "id", label: "编号" }),
-      new FormColumn({ name: "ipAddress", label: "IP地址", required: true }),
+      new FormColumn({
+        name: "ipAddress",
+        label: "IP地址",
+        required: true,
+        rules: [{ message: "请输入正确的IP", pattern: IP_PATTERN }],
+      }),
     ]);
   }
 }

package/src/dataview/deny-ip-access-list/DenyIPAccessListTable.ts

@@ -19,6 +19,8 @@ export class DenyIPAccessListTable<
   }
 
   async initialize() {
+    await super.initialize();
+
     this.setColumns([
       new TableColumn({ name: "ipAddress", label: "IP地址" }),
       new TableColumn({ name: "createdAt", label: "创建时间" }),

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

@@ -7,3 +7,5 @@ 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

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

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

@@ -16,6 +16,8 @@ export class IPWhitelistTable<T = IPWhitelist, F = T> extends DataTable<T, F> {
   }
 
   async initialize() {
+    await super.initialize();
+
     this.setColumns([
       new TableColumn({ name: "ipAddress", label: "IP地址" }),
       new TableColumn({ name: "createdAt", label: "创建时间" }),

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: "类型" }),