@maketribe/ms-app 3.0.47 → 3.0.49

package/dist/esm/dataview/material/material-group/MaterialGroupTree.js

@@ -4,41 +4,33 @@ class MaterialGroupTree extends DataTree {
   currentDataTreeNode;
   constructor(options = {}) {
     super({
-      name: "ms-material-group",
-      props: { label: "desc", children: "children" },
+      name: "mk-material-group",
+      props: { label: "desc", parent: "parentGroupId" },
       ...options
     });
     this.currentDataTreeNode = null;
   }
-  async loadRequest(params) {
-    const response = await super.loadRequest(params);
-    if (response.data.code !== 200) {
-      return response;
-    }
-    const list = response.data.data;
-    const materialGroups = list;
-    for (const materialGroup of materialGroups) {
-      materialGroup.children = [];
-      if (!materialGroup.parentGroupId) ;
-      for (const item of materialGroups) {
-        if (materialGroup.id === item.parentGroupId) {
-          materialGroup.children.push(item);
-        }
-      }
-    }
-    response.data.data = response.data.data.filter((item) => !item.parentGroupId);
-    return response;
+  formatItem(item) {
+    item.children = item.children ?? [];
+    return item;
+  }
+  load(params) {
+    return this.loadAll(params);
   }
   getCurrentNode() {
     if (this.currentDataTreeNode) {
       return this.currentDataTreeNode;
     }
     const getFirstNode = (nodes) => {
-      if (nodes[0].children.length) {
-        return getFirstNode(nodes[0].children);
+      const node = nodes[0];
+      if (node.children.length) {
+        return getFirstNode(node.children);
       }
-      return nodes[0];
+      return node;
     };
+    if (this.rootNodes.length === 0) {
+      return null;
+    }
     return this.currentDataTreeNode = getFirstNode(this.rootNodes);
   }
   setCurrentNode(node) {

package/dist/esm/dataview/material/material-group/MaterialGroupTree.js.map

@@ -1 +1 @@
-{"version":3,"file":"MaterialGroupTree.js","sources":["../../../../../src/dataview/material/material-group/MaterialGroupTree.ts"],"sourcesContent":["import { DataTableOptions, DataTree, DataTreeNode } from \"@maketribe/dm\";\r\nimport { MaterialGroup } from \"./MaterialGroupForm\";\r\n\r\nexport type MaterialGroupNode = MaterialGroup & {\r\n  children: MaterialGroupNode[];\r\n};\r\n\r\nexport class MaterialGroupTree extends DataTree<MaterialGroupNode> {\r\n  currentDataTreeNode: DataTreeNode<MaterialGroupNode> | null;\r\n\r\n  constructor(options: DataTableOptions = {}) {\r\n    super({\r\n      name: \"ms-material-group\",\r\n      props: { label: \"desc\", children: \"children\" },\r\n      ...options,\r\n    });\r\n\r\n    this.currentDataTreeNode = null;\r\n  }\r\n\r\n  protected async loadRequest(params: Record<string, any>) {\r\n    const response = await super.loadRequest(params);\r\n\r\n    if (response.data.code !== 200) {\r\n      return response;\r\n    }\r\n\r\n    const list = response.data.data;\r\n\r\n    const rootMaterialGroups: MaterialGroupNode[] = [];\r\n\r\n    const materialGroups = list as MaterialGroupNode[];\r\n\r\n    for (const materialGroup of materialGroups) {\r\n      materialGroup.children = [];\r\n\r\n      if (!materialGroup.parentGroupId) {\r\n        rootMaterialGroups.push(materialGroup);\r\n      }\r\n\r\n      for (const item of materialGroups) {\r\n        if (materialGroup.id === item.parentGroupId) {\r\n          materialGroup.children.push(item);\r\n        }\r\n      }\r\n    }\r\n    response.data.data = response.data.data.filter(item => !item.parentGroupId);\r\n    return response;\r\n  }\r\n\r\n  getCurrentNode() {\r\n    if (this.currentDataTreeNode) {\r\n      return this.currentDataTreeNode;\r\n    }\r\n\r\n    const getFirstNode = (\r\n      nodes: DataTreeNode<MaterialGroupNode>[]\r\n    ): DataTreeNode<MaterialGroupNode> | null => {\r\n      if (nodes[0].children.length) {\r\n        return getFirstNode(nodes[0].children);\r\n      }\r\n\r\n      return nodes[0];\r\n    };\r\n\r\n    return (this.currentDataTreeNode = getFirstNode(this.rootNodes));\r\n  }\r\n\r\n  setCurrentNode(node: DataTreeNode<MaterialGroupNode> | null) {\r\n    this.currentDataTreeNode = node;\r\n  }\r\n}\r\n"],"names":[],"mappings":";;AAOO,MAAM,0BAA0B,QAA4B,CAAA;AAAA,EACjE,mBAAA,CAAA;AAAA,EAEA,WAAA,CAAY,OAA4B,GAAA,EAAI,EAAA;AAC1C,IAAM,KAAA,CAAA;AAAA,MACJ,IAAM,EAAA,mBAAA;AAAA,MACN,KAAO,EAAA,EAAE,KAAO,EAAA,MAAA,EAAQ,UAAU,UAAW,EAAA;AAAA,MAC7C,GAAG,OAAA;AAAA,KACJ,CAAA,CAAA;AAED,IAAA,IAAA,CAAK,mBAAsB,GAAA,IAAA,CAAA;AAAA,GAC7B;AAAA,EAEA,MAAgB,YAAY,MAA6B,EAAA;AACvD,IAAA,MAAM,QAAW,GAAA,MAAM,KAAM,CAAA,WAAA,CAAY,MAAM,CAAA,CAAA;AAE/C,IAAI,IAAA,QAAA,CAAS,IAAK,CAAA,IAAA,KAAS,GAAK,EAAA;AAC9B,MAAO,OAAA,QAAA,CAAA;AAAA,KACT;AAEA,IAAM,MAAA,IAAA,GAAO,SAAS,IAAK,CAAA,IAAA,CAAA;AAI3B,IAAA,MAAM,cAAiB,GAAA,IAAA,CAAA;AAEvB,IAAA,KAAA,MAAW,iBAAiB,cAAgB,EAAA;AAC1C,MAAA,aAAA,CAAc,WAAW,EAAC,CAAA;AAE1B,MAAI,IAAA,CAAC,cAAc,aAAe,EAAA,CAElC;AAEA,MAAA,KAAA,MAAW,QAAQ,cAAgB,EAAA;AACjC,QAAI,IAAA,aAAA,CAAc,EAAO,KAAA,IAAA,CAAK,aAAe,EAAA;AAC3C,UAAc,aAAA,CAAA,QAAA,CAAS,KAAK,IAAI,CAAA,CAAA;AAAA,SAClC;AAAA,OACF;AAAA,KACF;AACA,IAAS,QAAA,CAAA,IAAA,CAAK,OAAO,QAAS,CAAA,IAAA,CAAK,KAAK,MAAO,CAAA,CAAA,IAAA,KAAQ,CAAC,IAAA,CAAK,aAAa,CAAA,CAAA;AAC1E,IAAO,OAAA,QAAA,CAAA;AAAA,GACT;AAAA,EAEA,cAAiB,GAAA;AACf,IAAA,IAAI,KAAK,mBAAqB,EAAA;AAC5B,MAAA,OAAO,IAAK,CAAA,mBAAA,CAAA;AAAA,KACd;AAEA,IAAM,MAAA,YAAA,GAAe,CACnB,KAC2C,KAAA;AAC3C,MAAA,IAAI,KAAM,CAAA,CAAC,CAAE,CAAA,QAAA,CAAS,MAAQ,EAAA;AAC5B,QAAA,OAAO,YAAa,CAAA,KAAA,CAAM,CAAC,CAAA,CAAE,QAAQ,CAAA,CAAA;AAAA,OACvC;AAEA,MAAA,OAAO,MAAM,CAAC,CAAA,CAAA;AAAA,KAChB,CAAA;AAEA,IAAA,OAAQ,IAAK,CAAA,mBAAA,GAAsB,YAAa,CAAA,IAAA,CAAK,SAAS,CAAA,CAAA;AAAA,GAChE;AAAA,EAEA,eAAe,IAA8C,EAAA;AAC3D,IAAA,IAAA,CAAK,mBAAsB,GAAA,IAAA,CAAA;AAAA,GAC7B;AACF;;;;"}
+{"version":3,"file":"MaterialGroupTree.js","sources":["../../../../../src/dataview/material/material-group/MaterialGroupTree.ts"],"sourcesContent":["import { DataTableOptions, DataTree, DataTreeNode } from \"@maketribe/dm\";\nimport { MaterialGroup } from \"./MaterialGroupForm\";\nimport { ResponseConfig, R } from \"@maketribe/request\";\n\nexport type MaterialGroupNode = MaterialGroup & {\n  children: MaterialGroupNode[];\n};\n\nexport class MaterialGroupTree extends DataTree<MaterialGroupNode> {\n  currentDataTreeNode: DataTreeNode<MaterialGroupNode> | null;\n\n  constructor(options: DataTableOptions = {}) {\n    super({\n      name: \"mk-material-group\",\n      props: { label: \"desc\", parent: \"parentGroupId\" },\n      ...options,\n    });\n\n    this.currentDataTreeNode = null;\n  }\n\n  formatItem(item: MaterialGroupNode): MaterialGroupNode {\n    item.children = item.children ?? [];\n\n    return item;\n  }\n\n  load(\n    params?: Record<string, any>\n  ): Promise<\n    ResponseConfig<R<MaterialGroupNode[]> & { totalRecCount: string }>\n  > {\n    return this.loadAll(params);\n  }\n\n  getCurrentNode() {\n    if (this.currentDataTreeNode) {\n      return this.currentDataTreeNode;\n    }\n\n    const getFirstNode = (\n      nodes: DataTreeNode<MaterialGroupNode>[]\n    ): DataTreeNode<MaterialGroupNode> | null => {\n      const node = nodes[0];\n\n      if (node.children.length) {\n        return getFirstNode(node.children);\n      }\n\n      return node;\n    };\n\n    if (this.rootNodes.length === 0) {\n      return null;\n    }\n\n    return (this.currentDataTreeNode = getFirstNode(this.rootNodes));\n  }\n\n  setCurrentNode(node: DataTreeNode<MaterialGroupNode> | null) {\n    this.currentDataTreeNode = node;\n  }\n}\n"],"names":[],"mappings":";;AAQO,MAAM,0BAA0B,QAA4B,CAAA;AAAA,EACjE,mBAAA,CAAA;AAAA,EAEA,WAAA,CAAY,OAA4B,GAAA,EAAI,EAAA;AAC1C,IAAM,KAAA,CAAA;AAAA,MACJ,IAAM,EAAA,mBAAA;AAAA,MACN,KAAO,EAAA,EAAE,KAAO,EAAA,MAAA,EAAQ,QAAQ,eAAgB,EAAA;AAAA,MAChD,GAAG,OAAA;AAAA,KACJ,CAAA,CAAA;AAED,IAAA,IAAA,CAAK,mBAAsB,GAAA,IAAA,CAAA;AAAA,GAC7B;AAAA,EAEA,WAAW,IAA4C,EAAA;AACrD,IAAK,IAAA,CAAA,QAAA,GAAW,IAAK,CAAA,QAAA,IAAY,EAAC,CAAA;AAElC,IAAO,OAAA,IAAA,CAAA;AAAA,GACT;AAAA,EAEA,KACE,MAGA,EAAA;AACA,IAAO,OAAA,IAAA,CAAK,QAAQ,MAAM,CAAA,CAAA;AAAA,GAC5B;AAAA,EAEA,cAAiB,GAAA;AACf,IAAA,IAAI,KAAK,mBAAqB,EAAA;AAC5B,MAAA,OAAO,IAAK,CAAA,mBAAA,CAAA;AAAA,KACd;AAEA,IAAM,MAAA,YAAA,GAAe,CACnB,KAC2C,KAAA;AAC3C,MAAM,MAAA,IAAA,GAAO,MAAM,CAAC,CAAA,CAAA;AAEpB,MAAI,IAAA,IAAA,CAAK,SAAS,MAAQ,EAAA;AACxB,QAAO,OAAA,YAAA,CAAa,KAAK,QAAQ,CAAA,CAAA;AAAA,OACnC;AAEA,MAAO,OAAA,IAAA,CAAA;AAAA,KACT,CAAA;AAEA,IAAI,IAAA,IAAA,CAAK,SAAU,CAAA,MAAA,KAAW,CAAG,EAAA;AAC/B,MAAO,OAAA,IAAA,CAAA;AAAA,KACT;AAEA,IAAA,OAAQ,IAAK,CAAA,mBAAA,GAAsB,YAAa,CAAA,IAAA,CAAK,SAAS,CAAA,CAAA;AAAA,GAChE;AAAA,EAEA,eAAe,IAA8C,EAAA;AAC3D,IAAA,IAAA,CAAK,mBAAsB,GAAA,IAAA,CAAA;AAAA,GAC7B;AACF;;;;"}

package/dist/esm/dataview/member/MemberForm.d.ts

@@ -9,7 +9,6 @@ export type MemberResult = {
     account: string;
     avatar: string;
     roles: any[];
-    depts: any[];
     valid: number;
     isLock?: number;
     errorCount?: number;
@@ -26,7 +25,6 @@ export type Member = {
     account: string;
     avatar: string | null;
     roles: any[];
-    depts: any[];
     valid: number;
     isLock?: number;
     errorCount?: number;

package/dist/esm/dataview/member/MemberForm.js

@@ -9,11 +9,8 @@ import '../menu/MenuTree.js';
 import '../route/RouteForm.js';
 import '../route/RouteTable.js';
 import '@maketribe/utils';
-import '../department/DepartmentForm.js';
-import { DepartmentTable } from '../department/DepartmentTable.js';
-import '../department/DepartmentTree.js';
 import { EMAIL_PATTERN } from '../../constants/pattern.js';
-import { WebFileUploadContext } from '../../components/upload-file/context/WebFileUploadContext.js';
+import { WebFileUploadContext } from '../../components/business/upload-file/context/WebFileUploadContext.js';
 
 class MemberForm extends DataForm {
   constructor(options = {}) {
@@ -39,9 +36,7 @@ class MemberForm extends DataForm {
         label: "\u5934\u50CF",
         defaultValue: null,
         componentInfo: "MKFormImageUpload",
-        componentProps: {
-          uploadContext: new WebFileUploadContext()
-        }
+        componentProps: { uploadContext: new WebFileUploadContext() }
       }),
       new FormColumn({
         name: "roles",
@@ -55,17 +50,11 @@ class MemberForm extends DataForm {
         }
       }),
       new FormColumn({
-        name: "depts",
-        label: "\u90E8\u95E8",
-        defaultValue: null,
-        componentInfo: "MKFormDataTableSelect",
-        componentProps: {
-          multiple: true,
-          labelFieldName: "name",
-          dataTable: new DepartmentTable()
-        }
-      }),
-      new FormColumn({ name: "memo", label: "\u5907\u6CE8" })
+        name: "memo",
+        label: "\u5907\u6CE8",
+        componentInfo: "MKFormInput",
+        componentProps: { type: "textarea", rows: 4 }
+      })
     ]);
   }
   formatSubmitData(data) {
@@ -89,8 +78,9 @@ class MemberForm extends DataForm {
       account: item.account || "",
       avatar: item.avatar,
       roles: item.roles?.map((role) => role.roleId),
-      depts: item.depts?.map((department) => department.deptId),
-      valid: item.valid
+      // depts: item.depts?.map((department) => department.deptId),
+      valid: item.valid,
+      memo: item.memo || ""
     };
   }
 }

package/dist/esm/dataview/member/MemberForm.js.map

@@ -1 +1 @@
-{"version":3,"file":"MemberForm.js","sources":["../../../../src/dataview/member/MemberForm.ts"],"sourcesContent":["import { DataForm, DataFormOptions, FormColumn } from \"@maketribe/dm\";\r\nimport { defineDataForm } from \"../../define-data-form\";\r\nimport { RoleTable } from \"../role\";\r\nimport { DepartmentTable } from \"../department\";\r\nimport { EMAIL_PATTERN } from \"../../constants\";\r\nimport { WebFileUploadContext } from \"../../components/upload-file/context/WebFileUploadContext\";\r\n\r\nexport type MemberResult = {\r\n  id: string;\r\n  name: string;\r\n  wechatNo: string;\r\n  nickName: string;\r\n  email: string;\r\n  phone: string;\r\n  account: string;\r\n  avatar: string;\r\n  roles: any[];\r\n  depts: any[];\r\n  valid: number;\r\n  isLock?: number;\r\n  errorCount?: number;\r\n  unlockDatetime?: string;\r\n  memo?: string;\r\n\r\n};\r\n\r\nexport type Member = {\r\n  id: string;\r\n  name: string;\r\n  wechatNo: string;\r\n  nickName: string;\r\n  email: string;\r\n  phone: string;\r\n  account: string;\r\n  avatar: string | null;\r\n  roles: any[];\r\n  depts: any[];\r\n  valid: number;\r\n  isLock?: number;\r\n  errorCount?: number;\r\n  unlockDatetime?: string;\r\n  memo?: string;\r\n\r\n};\r\n\r\nexport class MemberForm<\r\n  T extends MemberResult = MemberResult,\r\n  F extends Member = Member\r\n> extends DataForm<T, F> {\r\n  constructor(options: DataFormOptions = {}) {\r\n    super({ name: \"ms-member\", ...options });\r\n  }\r\n\r\n  protected async initialize() {\r\n    await super.initialize();\r\n\r\n    this.setColumns([\r\n      new FormColumn({ name: \"id\", label: \"编号\" }),\r\n      new FormColumn({ name: \"name\", label: \"姓名\", required: true }),\r\n      new FormColumn({ name: \"wechatNo\", label: \"微信号\", defaultValue: null }),\r\n      new FormColumn({ name: \"nickName\", label: \"昵称\", required: true }),\r\n      new FormColumn({\r\n        name: \"email\",\r\n        label: \"邮箱\",\r\n        required: true,\r\n        rules: [{ message: \"邮箱格式有误\", pattern: EMAIL_PATTERN }],\r\n      }),\r\n      new FormColumn({ name: \"phone\", label: \"手机号\", defaultValue: null }),\r\n      new FormColumn({ name: \"account\", label: \"账号\", required: true }),\r\n      new FormColumn({\r\n        name: \"avatar\",\r\n        label: \"头像\",\r\n        defaultValue: null,\r\n        componentInfo: \"MKFormImageUpload\",\r\n        componentProps: {\r\n          uploadContext: new WebFileUploadContext(),\r\n        },\r\n      }),\r\n      new FormColumn({\r\n        name: \"roles\",\r\n        label: \"角色\",\r\n        defaultValue: null,\r\n        componentInfo: \"MKFormDataTableSelect\",\r\n        componentProps: {\r\n          multiple: true,\r\n          labelFieldName: \"name\",\r\n          dataTable: new RoleTable(),\r\n        },\r\n      }),\r\n      new FormColumn({\r\n        name: \"depts\",\r\n        label: \"部门\",\r\n        defaultValue: null,\r\n        componentInfo: \"MKFormDataTableSelect\",\r\n        componentProps: {\r\n          multiple: true,\r\n          labelFieldName: \"name\",\r\n          dataTable: new DepartmentTable(),\r\n        },\r\n      }),\r\n      new FormColumn({ name: \"memo\", label: \"备注\" }),\r\n    ]);\r\n  }\r\n\r\n  formatSubmitData(data: any) {\r\n    const { roles, depts, ...rest } = data;\r\n\r\n    const rolesArr = roles?.map((item: any) => {\r\n      return { roleId: item };\r\n    });\r\n    const deptsArr = depts?.map((item: any) => {\r\n      return { deptId: item };\r\n    });\r\n    return { ...rest, roles: rolesArr, depts: deptsArr };\r\n  }\r\n\r\n  formatItem(item: T): F {\r\n    return {\r\n      id: item.id,\r\n      name: item.name || \"\",\r\n      wechatNo: item.wechatNo || \"\",\r\n      nickName: item.nickName || \"\",\r\n      email: item.email || \"\",\r\n      phone: item.phone || \"\",\r\n      account: item.account || \"\",\r\n      avatar: item.avatar,\r\n      roles: item.roles?.map((role) => role.roleId),\r\n      depts: item.depts?.map((department) => department.deptId),\r\n      valid: item.valid,\r\n    } as F;\r\n  }\r\n}\r\n\r\ndefineDataForm(MemberForm);\r\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"MemberForm.js","sources":["../../../../src/dataview/member/MemberForm.ts"],"sourcesContent":["import { DataForm, DataFormOptions, FormColumn } from \"@maketribe/dm\";\nimport { defineDataForm } from \"../../define-data-form\";\nimport { RoleTable } from \"../role\";\nimport { DepartmentTable } from \"../department\";\nimport { EMAIL_PATTERN } from \"../../constants\";\nimport { WebFileUploadContext } from \"../../components/business/upload-file/context/WebFileUploadContext\";\n\nexport type MemberResult = {\n  id: string;\n  name: string;\n  wechatNo: string;\n  nickName: string;\n  email: string;\n  phone: string;\n  account: string;\n  avatar: string;\n  roles: any[];\n  // depts: any[];\n  valid: number;\n  isLock?: number;\n  errorCount?: number;\n  unlockDatetime?: string;\n  memo?: string;\n};\n\nexport type Member = {\n  id: string;\n  name: string;\n  wechatNo: string;\n  nickName: string;\n  email: string;\n  phone: string;\n  account: string;\n  avatar: string | null;\n  roles: any[];\n  // depts: any[];\n  valid: number;\n  isLock?: number;\n  errorCount?: number;\n  unlockDatetime?: string;\n  memo?: string;\n};\n\nexport class MemberForm<\n  T extends MemberResult = MemberResult,\n  F extends Member = Member\n> extends DataForm<T, F> {\n  constructor(options: DataFormOptions = {}) {\n    super({ name: \"ms-member\", ...options });\n  }\n\n  protected async initialize() {\n    await super.initialize();\n\n    this.setColumns([\n      new FormColumn({ name: \"id\", label: \"编号\" }),\n      new FormColumn({ name: \"name\", label: \"姓名\", required: true }),\n      new FormColumn({ name: \"wechatNo\", label: \"微信号\", defaultValue: null }),\n      new FormColumn({ name: \"nickName\", label: \"昵称\", required: true }),\n      new FormColumn({\n        name: \"email\",\n        label: \"邮箱\",\n        required: true,\n        rules: [{ message: \"邮箱格式有误\", pattern: EMAIL_PATTERN }],\n      }),\n      new FormColumn({ name: \"phone\", label: \"手机号\", defaultValue: null }),\n      new FormColumn({ name: \"account\", label: \"账号\", required: true }),\n      new FormColumn({\n        name: \"avatar\",\n        label: \"头像\",\n        defaultValue: null,\n        componentInfo: \"MKFormImageUpload\",\n        componentProps: { uploadContext: new WebFileUploadContext() },\n      }),\n      new FormColumn({\n        name: \"roles\",\n        label: \"角色\",\n        defaultValue: null,\n        componentInfo: \"MKFormDataTableSelect\",\n        componentProps: {\n          multiple: true,\n          labelFieldName: \"name\",\n          dataTable: new RoleTable(),\n        },\n      }),\n      new FormColumn({\n        name: \"memo\",\n        label: \"备注\",\n        componentInfo: \"MKFormInput\",\n        componentProps: { type: \"textarea\", rows: 4 },\n      }),\n    ]);\n  }\n\n  formatSubmitData(data: any) {\n    const { roles, depts, ...rest } = data;\n\n    const rolesArr = roles?.map((item: any) => {\n      return { roleId: item };\n    });\n    const deptsArr = depts?.map((item: any) => {\n      return { deptId: item };\n    });\n    return { ...rest, roles: rolesArr, depts: deptsArr };\n  }\n\n  formatItem(item: T): F {\n    return {\n      id: item.id,\n      name: item.name || \"\",\n      wechatNo: item.wechatNo || \"\",\n      nickName: item.nickName || \"\",\n      email: item.email || \"\",\n      phone: item.phone || \"\",\n      account: item.account || \"\",\n      avatar: item.avatar,\n      roles: item.roles?.map((role) => role.roleId),\n      // depts: item.depts?.map((department) => department.deptId),\n      valid: item.valid,\n      memo: item.memo || \"\",\n    } as F;\n  }\n}\n\ndefineDataForm(MemberForm);\n"],"names":[],"mappings":"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"}

package/dist/esm/dataview/member/MemberTable.d.ts

@@ -1,6 +1,8 @@
 import { DataTable, DataTableOptions } from "@maketribe/dm";
 import { Member, MemberForm, MemberResult } from "./MemberForm";
-export type MemberTableItem = Omit<Member, "password" | "confirmPassword">;
+export type MemberTableItem = Omit<Member, "password" | "confirmPassword"> & {
+    type: number;
+};
 export declare class MemberTable extends DataTable<MemberResult, MemberTableItem> {
     activeMemberForm: MemberForm;
     isShowActiveMemberForm: boolean;

package/dist/esm/dataview/member/MemberTable.js

@@ -2,11 +2,11 @@ import { createVNode, createTextVNode } from 'vue';
 import { DataTable, FilterColumn, TableColumn, TableActionColumn, ActionButton, Messager, Dialoger, EditButton, DeleteButton, FormColumn } from '@maketribe/dm';
 import { defineDataTable } from '../../define-data-table.js';
 import { MemberForm } from './MemberForm.js';
-import 'element-plus';
+import { ElTooltip } from 'element-plus';
 import '@maketribe/utils';
 import '../../core/DataModelDefines.js';
 import { MSAppClient } from '../../core/MSAppClient.js';
-import { MKSvgIcon } from '../../components/svg-icon/index.js';
+import { MKSvgIcon } from '../../components/basic/svg-icon/index.js';
 
 class MemberTable extends DataTable {
   constructor(options = {}) {
@@ -65,24 +65,11 @@ class MemberTable extends DataTable {
       })
     ]);
     this.setColumns([
-      new TableColumn({
-        name: "id",
-        label: "\u7F16\u53F7",
-        width: "190px",
-        visible: false
-      }),
       new TableColumn({
         name: "name",
         label: "\u8D26\u53F7\u4FE1\u606F",
         minWidth: "300px"
       }),
-      // new TableColumn({ name: "nickName", label: "昵称", minWidth: "150px" }),
-      // new TableColumn({
-      //   name: "avatar",
-      //   label: "头像",
-      //   componentInfo: "MKColumnImage",
-      //   width: "80px",
-      // }),
       new TableColumn({
         name: "roles",
         label: "\u89D2\u8272",
@@ -91,7 +78,22 @@ class MemberTable extends DataTable {
       new TableColumn({
         name: "type",
         label: "\u72B6\u6001",
-        minWidth: "80px"
+        minWidth: "80px",
+        componentInfo: "MKColumnTag",
+        componentProps: {
+          options: [{
+            value: 1,
+            label: "\u5F85\u6FC0\u6D3B"
+          }, {
+            value: 2,
+            label: "\u5DF2\u9501\u5B9A",
+            type: "danger"
+          }, {
+            value: 3,
+            label: "\u6B63\u5E38",
+            type: "success"
+          }]
+        }
       }),
       new TableColumn({
         name: "memo",
@@ -149,33 +151,42 @@ class MemberTable extends DataTable {
             const res = await Dialoger.instance.confirm({
               title: "\u91CD\u7F6E\u5BC6\u7801\u6210\u529F",
               message: createVNode("p", null, [createVNode("span", null, [createTextVNode("\u4F60\u7684\u65B0\u5BC6\u7801\u4E3A\uFF1A"), createVNode("span", {
-                "style": {
-                  color: "#1890ff"
-                }
-              }, [response.data.data]), createVNode(MKSvgIcon, {
                 "style": {
                   color: "#1890ff",
-                  cursor: "pointer"
-                },
-                "onClick": () => {
-                  navigator.clipboard.writeText(response.data.data);
-                  Messager.instance.success({
-                    message: "\u590D\u5236\u6210\u529F"
-                  });
-                },
-                "iconClass": "CopyDocument"
-              }, null)])]),
+                  marginRight: "3px"
+                }
+              }, [response.data.data]), createVNode(ElTooltip, {
+                "content": "\u70B9\u51FB\u590D\u5236",
+                "placement": "top"
+              }, {
+                default: () => [createVNode(MKSvgIcon, {
+                  "style": {
+                    color: "#1890ff",
+                    cursor: "pointer"
+                  },
+                  "onClick": () => {
+                    const input = document.createElement("input");
+                    document.body.appendChild(input);
+                    input.setAttribute("value", response.data.data);
+                    input.select();
+                    if (document.execCommand("copy")) {
+                      document.execCommand("copy");
+                    }
+                    document.body.removeChild(input);
+                    Messager.instance.success({
+                      message: "\u590D\u5236\u6210\u529F"
+                    });
+                  },
+                  "iconClass": "CopyDocument"
+                }, null)]
+              })])]),
               type: "warning",
               cancelButtonText: "\u53D6\u6D88",
-              confirmButtonText: "\u590D\u5236"
+              confirmButtonText: "\u786E\u5B9A"
             });
             if (!res) {
               return;
             }
-            navigator.clipboard.writeText(response.data.data);
-            Messager.instance.success({
-              message: "\u590D\u5236\u6210\u529F"
-            });
           },
           predicate: (member) => member.valid === 1
         }), new ActionButton({
@@ -217,28 +228,22 @@ class MemberTable extends DataTable {
   async initActiveMemberForm() {
     const activeMemberForm = this.activeMemberForm;
     await activeMemberForm.init();
-    activeMemberForm.setColumns([
-      activeMemberForm.getColumn("id"),
-      new FormColumn({
-        name: "approveResult",
-        label: "\u662F\u5426\u901A\u8FC7",
-        defaultValue: "0",
-        componentInfo: "MKFormRadioBox",
-        required: true,
-        componentProps: {
-          options: [{
-            label: "\u901A\u8FC7",
-            value: "1"
-          }, {
-            label: "\u4E0D\u901A\u8FC7",
-            value: "0"
-          }]
-        }
-      }),
-      activeMemberForm.getColumn("roles"),
-      activeMemberForm.getColumn("depts")
-      // activeMemberForm.getColumn("memo")!,
-    ]);
+    activeMemberForm.setColumns([activeMemberForm.getColumn("id"), new FormColumn({
+      name: "approveResult",
+      label: "\u662F\u5426\u901A\u8FC7",
+      defaultValue: "0",
+      componentInfo: "MKFormRadioBox",
+      required: true,
+      componentProps: {
+        options: [{
+          label: "\u901A\u8FC7",
+          value: "1"
+        }, {
+          label: "\u4E0D\u901A\u8FC7",
+          value: "0"
+        }]
+      }
+    }), activeMemberForm.getColumn("roles")]);
   }
   async approveMember() {
     try {
@@ -254,7 +259,7 @@ class MemberTable extends DataTable {
         return;
       }
       this.activeMemberForm.getLoadingManager().startLoading();
-      const result = await this.activeMemberForm.httpRequest?.post("/api/dv/ms-member/apply/account/approve", {
+      const result = await this.activeMemberForm.httpRequest?.post("/ms/dv/ms-member/apply/account/approve", {
         ...this.activeMemberForm.formatSubmitData({
           approveResult: _data.approveResult,
           roles: _data?.roles,
@@ -291,17 +296,18 @@ class MemberTable extends DataTable {
       avatar: item.avatar,
       roles: item.roles?.map((role) => ({
         id: role.id,
-        name: role.roleName || "",
-        desc: role.roleDesc || ""
-      })),
-      depts: item.depts?.map((department) => ({
-        id: department.id,
-        name: department.name || "",
-        // memberID: department.memberID || null,
-        pid: department.pid || null
-      })),
+        name: role.name || "",
+        desc: role.desc || ""
+      })) ?? [],
+      // depts: item.depts?.map((department) => ({
+      //   id: department.id,
+      //   name: department.name || "",
+      //   // memberID: department.memberID || null,
+      //   pid: department.pid || null,
+      // })),
       valid: item.valid,
       isLock: item.isLock,
+      type: item.valid === 0 ? 1 : item.isLock === 1 ? 2 : 3,
       errorCount: item.errorCount,
       unlockDatetime: item.unlockDatetime
     };

package/dist/esm/dataview/member/MemberTable.js.map

@@ -1 +1 @@
-{"version":3,"file":"MemberTable.js","sources":["../../../../src/dataview/member/MemberTable.tsx"],"sourcesContent":["import { R } from \"@maketribe/request\";\r\nimport {\r\n  TableColumn,\r\n  DataTable,\r\n  DataTableOptions,\r\n  FilterColumn,\r\n  TableActionColumn,\r\n  ActionButton,\r\n  DeleteButton,\r\n  EditButton,\r\n  Messager,\r\n  Dialoger,\r\n  FormColumn,\r\n  WhereFilter,\r\n\r\n\r\n} from \"@maketribe/dm\";\r\nimport { defineDataTable } from \"../../define-data-table\";\r\nimport { Member, MemberForm, MemberResult } from \"./MemberForm\";\r\nimport { MSAppClient } from \"../../core\";\r\nimport { MKSvgIcon } from \"../../components/svg-icon\";\r\n\r\n\r\nexport type MemberTableItem = Omit<Member, \"password\" | \"confirmPassword\">;\r\n\r\nexport class MemberTable extends DataTable<MemberResult, MemberTableItem> {\r\n  activeMemberForm: MemberForm;\r\n\r\n  isShowActiveMemberForm: boolean;\r\n\r\n  constructor(options: DataTableOptions = {}) {\r\n    super({ name: \"ms-member\", ...options });\r\n\r\n    this.activeMemberForm = new MemberForm();\r\n\r\n    this.isShowActiveMemberForm = false;\r\n  }\r\n\r\n  protected async initialize() {\r\n    await super.initialize();\r\n\r\n    await this.initActiveMemberForm();\r\n    //超管才能导出\r\n    if (!MSAppClient.instance?.userSession?.userInfo?.isSuper) {\r\n      this.buttonTools.splice(2, 1)\r\n    }\r\n    //只有超级管理员可以查看超级管理员\r\n    if (!MSAppClient.instance?.userSession?.userInfo?.isSuper) {\r\n      (this.dataFilter as WhereFilter).getDefaultGroup().addCondition(\"isSuper\", \"!=\", 1)\r\n    }\r\n\r\n    this.dataFilter.setColumns([\r\n      // new FilterColumn({\r\n      //   name: \"createdAt\",\r\n      //   label: \"创建时间\",\r\n      //   componentInfo: \"MKConditionDate\",\r\n      //   defaultValue: [\"2024-01-20 00:00:00\", \"2024-01-21 00:00:00\"]\r\n      // }),\r\n      new FilterColumn({\r\n        name: \"name\",\r\n        label: \"姓名\",\r\n        componentInfo: \"MKConditionInput\",\r\n      }),\r\n      new FilterColumn({\r\n        name: \"wechatNo\",\r\n        label: \"微信号\",\r\n        componentInfo: \"MKConditionInput\",\r\n      }),\r\n      new FilterColumn({\r\n        name: \"nickName\",\r\n        label: \"昵称\",\r\n        componentInfo: \"MKConditionInput\",\r\n      }),\r\n      new FilterColumn({\r\n        name: \"email\",\r\n        label: \"邮箱\",\r\n        componentInfo: \"MKConditionInput\",\r\n      }),\r\n      new FilterColumn({\r\n        name: \"phone\",\r\n        label: \"手机号\",\r\n        componentInfo: \"MKConditionInput\",\r\n      }),\r\n      new FilterColumn({\r\n        name: \"account\",\r\n        label: \"账号\",\r\n        componentInfo: \"MKConditionInput\",\r\n      }),\r\n    ]);\r\n\r\n    this.setColumns([\r\n      new TableColumn({\r\n        name: \"id\",\r\n        label: \"编号\",\r\n        width: \"190px\",\r\n        visible: false,\r\n      }),\r\n      new TableColumn({ name: \"name\", label: \"账号信息\", minWidth: \"300px\" }),\r\n      // new TableColumn({ name: \"nickName\", label: \"昵称\", minWidth: \"150px\" }),\r\n      // new TableColumn({\r\n      //   name: \"avatar\",\r\n      //   label: \"头像\",\r\n      //   componentInfo: \"MKColumnImage\",\r\n      //   width: \"80px\",\r\n      // }),\r\n      new TableColumn({ name: \"roles\", label: \"角色\", minWidth: \"150px\" }),\r\n      new TableColumn({ name: \"type\", label: \"状态\", minWidth: \"80px\" }),\r\n      new TableColumn({ name: \"memo\", label: \"备注\", minWidth: \"150px\" }),\r\n      // new TableColumn({ name: \"email\", label: \"邮箱\", minWidth: \"200px\" }),\r\n      // new TableColumn({ name: \"phone\", label: \"手机号\", minWidth: \"120px\" }),\r\n      // new TableColumn({ name: \"wechatNo\", label: \"微信号\", minWidth: \"140px\" }),\r\n      // new TableColumn({\r\n      //   name: \"valid\",\r\n      //   label: \"微信号\",\r\n      //   minWidth: \"140px\",\r\n      //   visible: false,\r\n      // }),\r\n      new TableActionColumn({\r\n        width: \"240px\",\r\n        buttons: [\r\n          new ActionButton({\r\n            label: \"激活用户\",\r\n            handler: async (row) => {\r\n              const response = await this.activeMemberForm.editRecord(row.id);\r\n\r\n              if (response.data.code !== 200) {\r\n                Messager.instance.error({ message: response.data.msg });\r\n                return;\r\n              }\r\n              this.isShowActiveMemberForm = true;\r\n            },\r\n            predicate: (member: MemberTableItem) => member.valid === 0,\r\n          }),\r\n          new ActionButton({\r\n            label: \"重置密码\",\r\n            handler: async (row) => {\r\n              const isConfirm = await Dialoger.instance.confirm({\r\n                title: \"重置密码\",\r\n                message: \"是否重置密码\",\r\n                type: \"warning\",\r\n                cancelButtonText: \"取消\",\r\n                confirmButtonText: \"确定\",\r\n              });\r\n              if (!isConfirm) {\r\n                return;\r\n              }\r\n              this.loadingManager.startLoading();\r\n\r\n              const response = await this.dataViewRequest.callDVRequest<\r\n                R<string>\r\n              >({\r\n                action: `${row.id}/password/reset`,\r\n              });\r\n\r\n              this.loadingManager.completeLoading();\r\n              if (response.data.code !== 200) {\r\n                Messager.instance.error({\r\n                  message: response.data.msg || \"重置密码失败\",\r\n                });\r\n                return;\r\n              }\r\n\r\n              const res = await Dialoger.instance.confirm({\r\n                title: \"重置密码成功\",\r\n                message: (\r\n                  <p>\r\n                    <span>你的新密码为：<span style={{ color: '#1890ff' }}>{response.data.data}</span> \r\n                    <MKSvgIcon \r\n                    style={{ color: '#1890ff', cursor: \"pointer\" }} onClick={() => { navigator.clipboard.writeText(response.data.data); Messager.instance.success({ message: \"复制成功\" }) }} \r\n                    iconClass=\"CopyDocument\" /></span>\r\n                  </p>\r\n                ),\r\n                type: \"warning\",\r\n                cancelButtonText: \"取消\",\r\n                confirmButtonText: \"复制\",\r\n              });\r\n              if (!res) {\r\n                return;\r\n              }\r\n\r\n              navigator.clipboard.writeText(response.data.data);\r\n              Messager.instance.success({ message: \"复制成功\" });\r\n            },\r\n            predicate: (member: MemberTableItem) => member.valid === 1,\r\n          }),\r\n          new ActionButton({\r\n            label: \"解锁\",\r\n            handler: async (row) => {\r\n              const isConfirm = await Dialoger.instance.confirm({\r\n                title: \"解锁\",\r\n                message: \"是否解锁？\",\r\n                type: \"warning\",\r\n                cancelButtonText: \"取消\",\r\n                confirmButtonText: \"确定\",\r\n              });\r\n              if (!isConfirm) {\r\n                return;\r\n              }\r\n              this.loadingManager.startLoading();\r\n\r\n              const response = await this.activeMemberForm.dataViewRequest.update({\r\n                id: row.id,\r\n                isLock: 0,\r\n                errorCount: 0,\r\n                unlockDatetime: null\r\n              })\r\n\r\n              if (response.data.code !== 200) {\r\n                Messager.instance.error({ message: response.data.msg });\r\n                return;\r\n              }\r\n              this.loadingManager.completeLoading();\r\n              this.load();\r\n            },\r\n            predicate: (member: MemberTableItem) => member.isLock === 1,\r\n          }),\r\n          new EditButton({\r\n            predicate: (member: MemberTableItem) => member.valid === 1,\r\n          }),\r\n          new DeleteButton(),\r\n        ],\r\n      }),\r\n    ]);\r\n  }\r\n\r\n  protected async initActiveMemberForm() {\r\n    const activeMemberForm = this.activeMemberForm;\r\n\r\n    await activeMemberForm.init();\r\n\r\n    activeMemberForm.setColumns([\r\n      activeMemberForm.getColumn(\"id\")!,\r\n      new FormColumn({\r\n        name: \"approveResult\",\r\n        label: \"是否通过\",\r\n        defaultValue: \"0\",\r\n        componentInfo: \"MKFormRadioBox\",\r\n        required: true,\r\n        componentProps: {\r\n          options: [\r\n            { label: \"通过\", value: \"1\" },\r\n            { label: \"不通过\", value: \"0\" },\r\n          ],\r\n        },\r\n      }),\r\n      activeMemberForm.getColumn(\"roles\")!,\r\n      activeMemberForm.getColumn(\"depts\")!,\r\n      // activeMemberForm.getColumn(\"memo\")!,\r\n    ]);\r\n\r\n\r\n  }\r\n\r\n  async approveMember() {\r\n    try {\r\n      const _data = this.activeMemberForm.data as any;\r\n\r\n      if (!_data.approveResult) {\r\n        Messager.instance.error({ message: \"请选择是否通过\" });\r\n        return\r\n      }\r\n      if (_data.approveResult == 0) {\r\n        this.isShowActiveMemberForm = false;\r\n        return\r\n      }\r\n      this.activeMemberForm.getLoadingManager().startLoading();\r\n      const result = await this.activeMemberForm.httpRequest?.post(\r\n        \"/api/dv/ms-member/apply/account/approve\",\r\n        {\r\n          ...this.activeMemberForm.formatSubmitData({ approveResult: (_data as any).approveResult, roles: _data?.roles, depts: _data?.depts, id: _data?.id }),\r\n        }\r\n      );\r\n      this.activeMemberForm.getLoadingManager().completeLoading();\r\n\r\n      if (result?.data.code != 200) {\r\n        Messager.instance.error(result?.data.msg || \"请求失败\");\r\n        return;\r\n      }\r\n      this.isShowActiveMemberForm = false;\r\n      Messager.instance.success({\r\n        message: \"激活通过，密码已发送到邮箱\",\r\n      });\r\n\r\n      this.load();\r\n    } catch (e) {\r\n      console.error(e);\r\n      Messager.instance.error({ message: \"网络异常\" });\r\n    }\r\n  }\r\n\r\n  formatItem(item: MemberResult): MemberTableItem {\r\n    // let avatar: string | null;\r\n    // try {\r\n    //   avatar = item.avatar ? new URL(item.avatar).toString() : null;\r\n    // } catch (e) {\r\n    //   avatar = null;\r\n    // }\r\n    return {\r\n      id: item.id,\r\n      name: item.name || \"\",\r\n      wechatNo: item.wechatNo || \"\",\r\n      nickName: item.nickName || \"\",\r\n      email: item.email || \"\",\r\n      phone: item.phone || \"\",\r\n      account: item.account || \"\",\r\n      avatar: item.avatar,\r\n      roles: item.roles?.map((role) => ({\r\n        id: role.id,\r\n        name: role.roleName || \"\",\r\n        desc: role.roleDesc || \"\",\r\n      })),\r\n      depts: item.depts?.map((department) => ({\r\n        id: department.id,\r\n        name: department.name || \"\",\r\n        // memberID: department.memberID || null,\r\n        pid: department.pid || null,\r\n      })),\r\n      valid: item.valid,\r\n      isLock: item.isLock,\r\n      errorCount: item.errorCount,\r\n      unlockDatetime: item.unlockDatetime\r\n    };\r\n  }\r\n}\r\n\r\ndefineDataTable(MemberTable);\r\n"],"names":["MemberTable","DataTable","constructor","options","name","activeMemberForm","MemberForm","isShowActiveMemberForm","initialize","initActiveMemberForm","MSAppClient","instance","userSession","userInfo","isSuper","buttonTools","splice","dataFilter","getDefaultGroup","addCondition","setColumns","FilterColumn","label","componentInfo","TableColumn","width","visible","minWidth","TableActionColumn","buttons","ActionButton","handler","row","response","editRecord","id","data","code","Messager","error","message","msg","predicate","member","valid","isConfirm","Dialoger","confirm","title","type","cancelButtonText","confirmButtonText","loadingManager","startLoading","dataViewRequest","callDVRequest","action","completeLoading","res","_createVNode","_createTextVNode","color","MKSvgIcon","cursor","onClick","navigator","clipboard","writeText","success","update","isLock","errorCount","unlockDatetime","load","EditButton","DeleteButton","init","getColumn","FormColumn","defaultValue","required","componentProps","value","approveMember","_data","approveResult","getLoadingManager","result","httpRequest","post","formatSubmitData","roles","depts","e","console","formatItem","item","wechatNo","nickName","email","phone","account","avatar","map","role","roleName","desc","roleDesc","department","pid","defineDataTable"],"mappings":"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"}
+{"version":3,"file":"MemberTable.js","sources":["../../../../src/dataview/member/MemberTable.tsx"],"sourcesContent":["import { R } from \"@maketribe/request\";\nimport {\n  TableColumn,\n  DataTable,\n  DataTableOptions,\n  FilterColumn,\n  TableActionColumn,\n  ActionButton,\n  DeleteButton,\n  EditButton,\n  Messager,\n  Dialoger,\n  FormColumn,\n  WhereFilter,\n} from \"@maketribe/dm\";\nimport { defineDataTable } from \"../../define-data-table\";\nimport { Member, MemberForm, MemberResult } from \"./MemberForm\";\nimport { MSAppClient } from \"../../core\";\nimport { MKSvgIcon } from \"../../components/basic/svg-icon\";\nimport { ElTooltip } from \"element-plus\";\n\nexport type MemberTableItem = Omit<Member, \"password\" | \"confirmPassword\"> & {\n  type: number;\n};\n\nexport class MemberTable extends DataTable<MemberResult, MemberTableItem> {\n  activeMemberForm: MemberForm;\n\n  isShowActiveMemberForm: boolean;\n\n  constructor(options: DataTableOptions = {}) {\n    super({ name: \"ms-member\", ...options });\n\n    this.activeMemberForm = new MemberForm();\n\n    this.isShowActiveMemberForm = false;\n  }\n\n  protected async initialize() {\n    await super.initialize();\n\n    await this.initActiveMemberForm();\n    //超管才能导出\n    if (!MSAppClient.instance?.userSession?.userInfo?.isSuper) {\n      this.buttonTools.splice(2, 1);\n    }\n    //只有超级管理员可以查看超级管理员\n    if (!MSAppClient.instance?.userSession?.userInfo?.isSuper) {\n      (this.dataFilter as WhereFilter)\n        .getDefaultGroup()\n        .addCondition(\"isSuper\", \"!=\", 1);\n    }\n\n    this.dataFilter.setColumns([\n      // new FilterColumn({\n      //   name: \"createdAt\",\n      //   label: \"创建时间\",\n      //   componentInfo: \"MKConditionDate\",\n      //   defaultValue: [\"2024-01-20 00:00:00\", \"2024-01-21 00:00:00\"]\n      // }),\n      new FilterColumn({\n        name: \"name\",\n        label: \"姓名\",\n        componentInfo: \"MKConditionInput\",\n      }),\n      new FilterColumn({\n        name: \"wechatNo\",\n        label: \"微信号\",\n        componentInfo: \"MKConditionInput\",\n      }),\n      new FilterColumn({\n        name: \"nickName\",\n        label: \"昵称\",\n        componentInfo: \"MKConditionInput\",\n      }),\n      new FilterColumn({\n        name: \"email\",\n        label: \"邮箱\",\n        componentInfo: \"MKConditionInput\",\n      }),\n      new FilterColumn({\n        name: \"phone\",\n        label: \"手机号\",\n        componentInfo: \"MKConditionInput\",\n      }),\n      new FilterColumn({\n        name: \"account\",\n        label: \"账号\",\n        componentInfo: \"MKConditionInput\",\n      }),\n    ]);\n\n    this.setColumns([\n      new TableColumn({ name: \"name\", label: \"账号信息\", minWidth: \"300px\" }),\n      new TableColumn({ name: \"roles\", label: \"角色\", minWidth: \"150px\" }),\n      new TableColumn({\n        name: \"type\",\n        label: \"状态\",\n        minWidth: \"80px\",\n        componentInfo: \"MKColumnTag\",\n        componentProps: {\n          options: [\n            { value: 1, label: \"待激活\" },\n            { value: 2, label: \"已锁定\", type: \"danger\" },\n            { value: 3, label: \"正常\", type: \"success\" },\n          ],\n        },\n      }),\n      new TableColumn({ name: \"memo\", label: \"备注\", minWidth: \"150px\" }),\n      // new TableColumn({ name: \"email\", label: \"邮箱\", minWidth: \"200px\" }),\n      // new TableColumn({ name: \"phone\", label: \"手机号\", minWidth: \"120px\" }),\n      // new TableColumn({ name: \"wechatNo\", label: \"微信号\", minWidth: \"140px\" }),\n      // new TableColumn({\n      //   name: \"valid\",\n      //   label: \"微信号\",\n      //   minWidth: \"140px\",\n      //   visible: false,\n      // }),\n      new TableActionColumn({\n        width: \"240px\",\n        buttons: [\n          new ActionButton({\n            label: \"激活用户\",\n            handler: async (row) => {\n              const response = await this.activeMemberForm.editRecord(row.id);\n\n              if (response.data.code !== 200) {\n                Messager.instance.error({ message: response.data.msg });\n                return;\n              }\n              this.isShowActiveMemberForm = true;\n            },\n            predicate: (member: MemberTableItem) => member.valid === 0,\n          }),\n          new ActionButton({\n            label: \"重置密码\",\n            handler: async (row) => {\n              const isConfirm = await Dialoger.instance.confirm({\n                title: \"重置密码\",\n                message: \"是否重置密码\",\n                type: \"warning\",\n                cancelButtonText: \"取消\",\n                confirmButtonText: \"确定\",\n              });\n              if (!isConfirm) {\n                return;\n              }\n              this.loadingManager.startLoading();\n\n              const response = await this.dataViewRequest.callDVRequest<\n                R<string>\n              >({\n                action: `${row.id}/password/reset`,\n              });\n\n              this.loadingManager.completeLoading();\n              if (response.data.code !== 200) {\n                Messager.instance.error({\n                  message: response.data.msg || \"重置密码失败\",\n                });\n                return;\n              }\n\n              const res = await Dialoger.instance.confirm({\n                title: \"重置密码成功\",\n                message: (\n                  <p>\n                    <span>\n                      你的新密码为：\n                      <span style={{ color: \"#1890ff\", marginRight: \"3px\" }}>\n                        {response.data.data}\n                      </span>\n                      <ElTooltip content={\"点击复制\"} placement=\"top\">\n                        <MKSvgIcon\n                          style={{ color: \"#1890ff\", cursor: \"pointer\" }}\n                          onClick={() => {\n                            const input = document.createElement(\"input\");\n                            document.body.appendChild(input);\n                            input.setAttribute(\"value\", response.data.data);\n                            input.select();\n                            if (document.execCommand(\"copy\")) {\n                              document.execCommand(\"copy\");\n                            }\n                            document.body.removeChild(input);\n                            Messager.instance.success({ message: \"复制成功\" });\n                          }}\n                          iconClass=\"CopyDocument\"\n                        />\n                      </ElTooltip>\n                    </span>\n                  </p>\n                ),\n                type: \"warning\",\n                cancelButtonText: \"取消\",\n                confirmButtonText: \"确定\",\n              });\n              if (!res) {\n                return;\n              }\n            },\n            predicate: (member: MemberTableItem) => member.valid === 1,\n          }),\n          new ActionButton({\n            label: \"解锁\",\n            handler: async (row) => {\n              const isConfirm = await Dialoger.instance.confirm({\n                title: \"解锁\",\n                message: \"是否解锁？\",\n                type: \"warning\",\n                cancelButtonText: \"取消\",\n                confirmButtonText: \"确定\",\n              });\n              if (!isConfirm) {\n                return;\n              }\n              this.loadingManager.startLoading();\n\n              const response =\n                await this.activeMemberForm.dataViewRequest.update({\n                  id: row.id,\n                  isLock: 0,\n                  errorCount: 0,\n                  unlockDatetime: null,\n                });\n\n              if (response.data.code !== 200) {\n                Messager.instance.error({ message: response.data.msg });\n                return;\n              }\n              this.loadingManager.completeLoading();\n              this.load();\n            },\n            predicate: (member: MemberTableItem) => member.isLock === 1,\n          }),\n          new EditButton({\n            predicate: (member: MemberTableItem) => member.valid === 1,\n          }),\n          new DeleteButton(),\n        ],\n      }),\n    ]);\n  }\n\n  protected async initActiveMemberForm() {\n    const activeMemberForm = this.activeMemberForm;\n\n    await activeMemberForm.init();\n\n    activeMemberForm.setColumns([\n      activeMemberForm.getColumn(\"id\")!,\n      new FormColumn({\n        name: \"approveResult\",\n        label: \"是否通过\",\n        defaultValue: \"0\",\n        componentInfo: \"MKFormRadioBox\",\n        required: true,\n        componentProps: {\n          options: [\n            { label: \"通过\", value: \"1\" },\n            { label: \"不通过\", value: \"0\" },\n          ],\n        },\n      }),\n      activeMemberForm.getColumn(\"roles\")!,\n    ]);\n  }\n\n  async approveMember() {\n    try {\n      const _data = this.activeMemberForm.data as any;\n\n      if (!_data.approveResult) {\n        Messager.instance.error({ message: \"请选择是否通过\" });\n        return;\n      }\n      if (_data.approveResult == 0) {\n        this.isShowActiveMemberForm = false;\n        return;\n      }\n      this.activeMemberForm.getLoadingManager().startLoading();\n      const result = await this.activeMemberForm.httpRequest?.post(\n        \"/ms/dv/ms-member/apply/account/approve\",\n        {\n          ...this.activeMemberForm.formatSubmitData({\n            approveResult: (_data as any).approveResult,\n            roles: _data?.roles,\n            depts: _data?.depts,\n            id: _data?.id,\n          }),\n        }\n      );\n      this.activeMemberForm.getLoadingManager().completeLoading();\n\n      if (result?.data.code != 200) {\n        Messager.instance.error(result?.data.msg || \"请求失败\");\n        return;\n      }\n      this.isShowActiveMemberForm = false;\n      Messager.instance.success({\n        message: \"激活通过，密码已发送到邮箱\",\n      });\n\n      this.load();\n    } catch (e) {\n      console.error(e);\n      Messager.instance.error({ message: \"网络异常\" });\n    }\n  }\n\n  formatItem(item: MemberResult): MemberTableItem {\n    return {\n      id: item.id,\n      name: item.name || \"\",\n      wechatNo: item.wechatNo || \"\",\n      nickName: item.nickName || \"\",\n      email: item.email || \"\",\n      phone: item.phone || \"\",\n      account: item.account || \"\",\n      avatar: item.avatar,\n      roles:\n        item.roles?.map((role) => ({\n          id: role.id,\n          name: role.name || \"\",\n          desc: role.desc || \"\",\n        })) ?? [],\n      // depts: item.depts?.map((department) => ({\n      //   id: department.id,\n      //   name: department.name || \"\",\n      //   // memberID: department.memberID || null,\n      //   pid: department.pid || null,\n      // })),\n      valid: item.valid,\n      isLock: item.isLock,\n      type: item.valid === 0 ? 1 : item.isLock === 1 ? 2 : 3,\n      errorCount: item.errorCount,\n      unlockDatetime: item.unlockDatetime,\n    };\n  }\n}\n\ndefineDataTable(MemberTable);\n"],"names":["MemberTable","DataTable","constructor","options","name","activeMemberForm","MemberForm","isShowActiveMemberForm","initialize","initActiveMemberForm","MSAppClient","instance","userSession","userInfo","isSuper","buttonTools","splice","dataFilter","getDefaultGroup","addCondition","setColumns","FilterColumn","label","componentInfo","TableColumn","minWidth","componentProps","value","type","TableActionColumn","width","buttons","ActionButton","handler","row","response","editRecord","id","data","code","Messager","error","message","msg","predicate","member","valid","isConfirm","Dialoger","confirm","title","cancelButtonText","confirmButtonText","loadingManager","startLoading","dataViewRequest","callDVRequest","action","completeLoading","res","_createVNode","_createTextVNode","color","marginRight","ElTooltip","default","MKSvgIcon","cursor","onClick","input","document","createElement","body","appendChild","setAttribute","select","execCommand","removeChild","success","update","isLock","errorCount","unlockDatetime","load","EditButton","DeleteButton","init","getColumn","FormColumn","defaultValue","required","approveMember","_data","approveResult","getLoadingManager","result","httpRequest","post","formatSubmitData","roles","depts","e","console","formatItem","item","wechatNo","nickName","email","phone","account","avatar","map","role","desc","defineDataTable"],"mappings":"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"}

package/dist/esm/dataview/menu/MenuForm.d.ts

@@ -8,9 +8,10 @@ export type MenuResult = {
     pid: string | null;
     routeId: string;
     sort: string;
-    type: string;
+    type: number;
     routes: RouteResult[];
     permissionPoints: PermissionPointDefine[];
+    memo?: string;
 };
 export type MenuItem = {
     id: string;
@@ -22,6 +23,7 @@ export type MenuItem = {
     type: string;
     routes: RouteResult[];
     permissionPoints: PermissionPointDefine[];
+    memo: string;
 };
 export declare class MenuForm extends DataForm<MenuResult, MenuItem> {
     constructor(options?: DataFormOptions);

package/dist/esm/dataview/menu/MenuForm.js

@@ -13,6 +13,7 @@ class MenuForm extends DataForm {
   }
   async initialize() {
     await super.initialize();
+    window.ababa = this;
     const menuTable = this.register(new MenuTable({ pageSize: 10 }));
     if (isWhereFilter(menuTable.dataFilter)) {
       menuTable.dataFilter.getDefaultGroup().addCondition(
@@ -77,6 +78,12 @@ class MenuForm extends DataForm {
         associationFieldName: "menuId",
         detailForm: this.register(new PermissionPointDefineForm()),
         detailTable: this.register(new PermissionPointDefineTable())
+      }),
+      new FormColumn({
+        name: "memo",
+        label: "\u5907\u6CE8",
+        componentInfo: "MKFormInput",
+        componentProps: { type: "textarea", rows: 4 }
       })
     ]);
     this.dataFormTypeChangeEvent.on(({ dataFormType }) => {
@@ -128,7 +135,8 @@ class MenuForm extends DataForm {
       type: item.type ? `${item.type}` : "1",
       sort: item.sort || "0",
       routes: item.routes || [],
-      permissionPoints: item.permissionPoints || []
+      permissionPoints: item.permissionPoints || [],
+      memo: item.memo || ""
     };
   }
 }