npm - @maketribe/ms-app - Versions diffs - 3.0.7 → 3.0.8 - Mend

@maketribe/ms-app 3.0.7 → 3.0.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1121) hide show

package/dist/cjs/dataview/material/material-group/index.js CHANGED Viewed

@@ -1,10 +1,10 @@
 'use strict';
 var MaterialGroupForm = require('./MaterialGroupForm.js');
-var MaterialGroupTable = require('./MaterialGroupTable.js');
+var MaterialGroupTree = require('./MaterialGroupTree.js');
 exports.MaterialGroupForm = MaterialGroupForm.MaterialGroupForm;
-exports.MaterialGroupTable = MaterialGroupTable.MaterialGroupTable;
+exports.MaterialGroupTree = MaterialGroupTree.MaterialGroupTree;
 //# sourceMappingURL=index.js.map

package/dist/cjs/dataview/member/MemberForm.js CHANGED Viewed

@@ -7,23 +7,32 @@ var RoleTable = require('../role/RoleTable.js');
 var request = require('@maketribe/request');
 require('../menu/MenuForm.js');
 require('../menu/MenuTable.js');
+require('../menu/MenuTree.js');
 require('../route/RouteForm.js');
 require('../route/RouteTable.js');
 require('@maketribe/utils');
 require('../department/DepartmentForm.js');
 var DepartmentTable = require('../department/DepartmentTable.js');
+require('../department/DepartmentTree.js');
+var pattern = require('../../constants/pattern.js');
 class MemberForm extends dm.DataForm {
   constructor(options = {}) {
     super({ name: "ms-member", ...options });
   }
   async initialize() {
+    await super.initialize();
     this.setColumns([
       new dm.FormColumn({ name: "id", label: "\u7F16\u53F7" }),
       new dm.FormColumn({ name: "name", label: "\u59D3\u540D", required: true }),
       new dm.FormColumn({ name: "wechatNo", label: "\u5FAE\u4FE1\u53F7", defaultValue: null }),
       new dm.FormColumn({ name: "nickName", label: "\u6635\u79F0", required: true }),
-      new dm.FormColumn({ name: "email", label: "\u90AE\u7BB1", required: true }),
+      new dm.FormColumn({
+        name: "email",
+        label: "\u90AE\u7BB1",
+        required: true,
+        rules: [{ message: "\u90AE\u7BB1\u683C\u5F0F\u6709\u8BEF", pattern: pattern.EMAIL_PATTERN }]
+      }),
       new dm.FormColumn({ name: "phone", label: "\u624B\u673A\u53F7", defaultValue: null }),
       new dm.FormColumn({ name: "account", label: "\u8D26\u53F7", required: true }),
       new dm.FormColumn({

package/dist/cjs/dataview/member/MemberForm.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"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 { WebFileUpload } from \"@maketribe/request\";\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 ~~// password: string;\n~~ avatar: string;\n roles: any[];\n depts: any[];\n valid: number;\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 ~~// password: string;\n // confirmPassword: string;\n~~ avatar: string \| null;\n roles: any[];\n depts: any[];\n valid: number;\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 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({ name: \"email\", label: \"邮箱\", required: true }),\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: {\n upload: new WebFileUpload({ httpRequest: this.httpRequest }),\n },\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: \"depts\",\n label: \"部门\",\n defaultValue: null,\n componentInfo: \"MKFormDataTableSelect\",\n componentProps: {\n multiple: true,\n labelFieldName: \"name\",\n dataTable: new DepartmentTable(),\n },\n }),\n new FormColumn({ name: \"memo\", label: \"备注\" }),\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 } as F;\n }\n}\n\ndefineDataForm(MemberForm);\n"],"names":["DataForm","FormColumn","WebFileUpload","RoleTable","DepartmentTable","defineDataForm"],"mappings":"~~;;;;;;;;;;;;;;;AAoCO~~,MAAM,mBAGHA,WAAe,CAAA;AAAA,EACvB,WAAA,CAAY,OAA2B,GAAA,EAAI,EAAA;AACzC,IAAA,KAAA,CAAM,EAAE,IAAA,EAAM,WAAa,EAAA,GAAG,SAAS,CAAA,CAAA;AAAA,GACzC;AAAA,EAEA,MAAgB,UAAa,GAAA;AAC3B,IAAA,IAAA,CAAK,UAAW,CAAA;AAAA,MACd,IAAIC,aAAW,CAAA,EAAE,MAAM,IAAM,EAAA,KAAA,EAAO,gBAAM,CAAA;AAAA,MAC1C,IAAIA,cAAW,EAAE,IAAA,EAAM,QAAQ,KAAO,EAAA,cAAA,EAAM,QAAU,EAAA,IAAA,EAAM,CAAA;AAAA,MAC5D,IAAIA,cAAW,EAAE,IAAA,EAAM,YAAY,KAAO,EAAA,oBAAA,EAAO,YAAc,EAAA,IAAA,EAAM,CAAA;AAAA,MACrE,IAAIA,cAAW,EAAE,IAAA,EAAM,YAAY,KAAO,EAAA,cAAA,EAAM,QAAU,EAAA,IAAA,EAAM,CAAA;AAAA,MAChE,IAAIA,~~cAAW~~,~~EAAE~~,~~IAAA~~,~~EAAM~~,~~SAAS~~,KAAO,EAAA,cAAA,~~EAAM~~,QAAU,EAAA,IAAA,~~EAAM~~,CAAA;AAAA,~~MAC7D~~,~~IAAIA~~,cAAW,EAAE,IAAA,EAAM,SAAS,KAAO,EAAA,oBAAA,EAAO,YAAc,EAAA,IAAA,EAAM,CAAA;AAAA,MAClE,IAAIA,cAAW,EAAE,IAAA,EAAM,WAAW,KAAO,EAAA,cAAA,EAAM,QAAU,EAAA,IAAA,EAAM,CAAA;AAAA,MAC/D,IAAIA,aAAW,CAAA;AAAA,QACb,IAAM,EAAA,QAAA;AAAA,QACN,KAAO,EAAA,cAAA;AAAA,QACP,YAAc,EAAA,IAAA;AAAA,QACd,aAAe,EAAA,mBAAA;AAAA,QACf,cAAgB,EAAA;AAAA,UACd,QAAQ,~~IAAIC~~,qBAAA,CAAc,EAAE,WAAa,EAAA,IAAA,CAAK,aAAa,CAAA;AAAA,SAC7D;AAAA,OACD,CAAA;AAAA,MACD,~~IAAID~~,aAAW,CAAA;AAAA,QACb,IAAM,EAAA,OAAA;AAAA,QACN,KAAO,EAAA,cAAA;AAAA,QACP,YAAc,EAAA,IAAA;AAAA,QACd,aAAe,EAAA,uBAAA;AAAA,QACf,cAAgB,EAAA;AAAA,UACd,QAAU,EAAA,IAAA;AAAA,UACV,cAAgB,EAAA,MAAA;AAAA,UAChB,SAAA,EAAW,~~IAAIE~~,mBAAU,EAAA;AAAA,SAC3B;AAAA,OACD,CAAA;AAAA,MACD,~~IAAIF~~,aAAW,CAAA;AAAA,QACb,IAAM,EAAA,OAAA;AAAA,QACN,KAAO,EAAA,cAAA;AAAA,QACP,YAAc,EAAA,IAAA;AAAA,QACd,aAAe,EAAA,uBAAA;AAAA,QACf,cAAgB,EAAA;AAAA,UACd,QAAU,EAAA,IAAA;AAAA,UACV,cAAgB,EAAA,MAAA;AAAA,UAChB,SAAA,EAAW,~~IAAIG~~,+BAAgB,EAAA;AAAA,SACjC;AAAA,OACD,CAAA;AAAA,MACD,~~IAAIH~~,aAAW,CAAA,EAAE,MAAM,MAAQ,EAAA,KAAA,EAAO,gBAAM,CAAA;AAAA,KAC7C,CAAA,CAAA;AAAA,GACH;AAAA,EAEA,iBAAiB,IAAW,EAAA;AAC1B,IAAA,MAAM,EAAE,KAAA,EAAO,KAAO,EAAA,GAAG,MAAS,GAAA,IAAA,CAAA;AAElC,IAAA,MAAM,QAAW,GAAA,KAAA,EAAO,GAAI,CAAA,CAAC,IAAc,KAAA;AACzC,MAAO,OAAA,EAAE,QAAQ,IAAK,EAAA,CAAA;AAAA,KACvB,CAAA,CAAA;AACD,IAAA,MAAM,QAAW,GAAA,KAAA,EAAO,GAAI,CAAA,CAAC,IAAc,KAAA;AACzC,MAAO,OAAA,EAAE,QAAQ,IAAK,EAAA,CAAA;AAAA,KACvB,CAAA,CAAA;AACD,IAAA,OAAO,EAAE,GAAG,IAAA,EAAM,KAAO,EAAA,QAAA,EAAU,OAAO,QAAS,EAAA,CAAA;AAAA,GACrD;AAAA,EAEA,WAAW,IAAY,EAAA;AACrB,IAAO,OAAA;AAAA,MACL,IAAI,IAAK,CAAA,EAAA;AAAA,MACT,IAAA,EAAM,KAAK,IAAQ,IAAA,EAAA;AAAA,MACnB,QAAA,EAAU,KAAK,QAAY,IAAA,EAAA;AAAA,MAC3B,QAAA,EAAU,KAAK,QAAY,IAAA,EAAA;AAAA,MAC3B,KAAA,EAAO,KAAK,KAAS,IAAA,EAAA;AAAA,MACrB,KAAA,EAAO,KAAK,KAAS,IAAA,EAAA;AAAA,MACrB,OAAA,EAAS,KAAK,OAAW,IAAA,EAAA;AAAA,MACzB,QAAQ,IAAK,CAAA,MAAA;AAAA,MACb,OAAO,IAAK,CAAA,KAAA,EAAO,IAAI,CAAC,IAAA,KAAS,KAAK,MAAM,CAAA;AAAA,MAC5C,OAAO,IAAK,CAAA,KAAA,EAAO,IAAI,CAAC,UAAA,KAAe,WAAW,MAAM,CAAA;AAAA,MACxD,OAAO,IAAK,CAAA,KAAA;AAAA,KACd,CAAA;AAAA,GACF;AACF,CAAA;~~AAEAI~~,6BAAA,CAAe,UAAU,CAAA;;;;"}
1	+ {"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 { WebFileUpload } from \"@maketribe/request\";\nimport { EMAIL_PATTERN } from \"../../constants\";\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};\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};\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: {\n upload: new WebFileUpload({ httpRequest: this.httpRequest }),\n },\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: \"depts\",\n label: \"部门\",\n defaultValue: null,\n componentInfo: \"MKFormDataTableSelect\",\n componentProps: {\n multiple: true,\n labelFieldName: \"name\",\n dataTable: new DepartmentTable(),\n },\n }),\n new FormColumn({ name: \"memo\", label: \"备注\" }),\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 } as F;\n }\n}\n\ndefineDataForm(MemberForm);\n"],"names":["DataForm","FormColumn","EMAIL_PATTERN","WebFileUpload","RoleTable","DepartmentTable","defineDataForm"],"mappings":"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"}

package/dist/cjs/dataview/member/MemberTable.js CHANGED Viewed

@@ -16,6 +16,7 @@ class MemberTable extends dm.DataTable {
     this.activeMemberForm = new MemberForm.MemberForm();
   }
   async initialize() {
+    await super.initialize();
     await this.initActiveMemberForm();
     this.dataFilter.setColumns([new dm.FilterColumn({
       name: "name",
@@ -103,17 +104,19 @@ class MemberTable extends dm.DataTable {
             return;
           }
           this.loadingManager.startLoading();
-          const result = await this.httpRequest.post(`/api/dv/ms-member/${row.id}/password/reset`);
+          const response = await this.dataViewRequest.callDVRequest({
+            action: `${row.id}/password/reset`
+          });
           this.loadingManager.completeLoading();
-          if (result.data.code !== 200) {
+          if (response.data.code !== 200) {
             dm.Messager.instance.error({
-              message: result.data.msg || "\u91CD\u7F6E\u5BC6\u7801\u5931\u8D25"
+              message: response.data.msg || "\u91CD\u7F6E\u5BC6\u7801\u5931\u8D25"
             });
             return;
           }
           const res = await dm.Dialoger.instance.confirm({
             title: "\u91CD\u7F6E\u5BC6\u7801\u6210\u529F",
-            message: vue.createVNode("p", null, [vue.createVNode("span", null, [vue.createTextVNode("\u4F60\u7684\u65B0\u5BC6\u7801\u4E3A"), result.data.data])]),
+            message: vue.createVNode("p", null, [vue.createVNode("span", null, [vue.createTextVNode("\u4F60\u7684\u65B0\u5BC6\u7801\u4E3A"), response.data.data])]),
             type: "warning",
             cancelButtonText: "\u53D6\u6D88",
             confirmButtonText: "\u590D\u5236"
@@ -121,7 +124,7 @@ class MemberTable extends dm.DataTable {
           if (!res) {
             return;
           }
-          navigator.clipboard.writeText(result.data.data);
+          navigator.clipboard.writeText(response.data.data);
           dm.Messager.instance.success({
             message: "\u590D\u5236\u6210\u529F"
           });

package/dist/cjs/dataview/member/MemberTable.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MemberTable.js","sources":["../../../../src/dataview/member/MemberTable.tsx"],"sourcesContent":["import {\n TableColumn,\n DataTable,\n DataTableOptions,\n FilterColumn,\n TableActionColumn,\n ActionButton,\n DeleteButton,\n EditButton,\n Messager,\n Dialoger,\n FormColumn,\n} from \"@maketribe/dm\";\nimport { Event } from \"@maketribe/utils\";\nimport { defineDataTable } from \"../../define-data-table\";\nimport { Member, MemberForm, MemberResult } from \"./MemberForm\";\n\nexport type MemberTableItem = Omit<Member, \"password\" \| \"confirmPassword\">;\n\nexport class MemberTable extends DataTable<MemberResult, MemberTableItem> {\n activeMemberForm: MemberForm;\n\n activeMemberEvent: Event<MemberTableItem> = this.register(new Event());\n\n constructor(options: DataTableOptions = {}) {\n super({ name: \"ms-member\", ...options });\n\n this.activeMemberForm = new MemberForm();\n }\n\n protected async initialize() {\n await this.initActiveMemberForm();\n\n this.dataFilter.setColumns([\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({\n name: \"id\",\n label: \"编号\",\n width: \"190px\",\n visible: false,\n }),\n new TableColumn({ name: \"name\", label: \"姓名\", minWidth: \"150px\" }),\n new TableColumn({ name: \"nickName\", label: \"昵称\", minWidth: \"150px\" }),\n new TableColumn({\n name: \"avatar\",\n label: \"头像\",\n componentInfo: \"MKColumnImage\",\n width: \"80px\",\n }),\n new TableColumn({ name: \"account\", 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: \"200px\",\n buttons: [\n new ActionButton({\n label: \"激活用户\",\n handler: async (row) => {\n this.activeMemberEvent.emit(row);\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 const result = await this.httpRequest.post(\n `/api/dv/ms-member/${row.id}/password/reset`\n );\n this.loadingManager.completeLoading();\n if (result.data.code !== 200) {\n Messager.instance.error({\n message: result.data.msg \|\| \"重置密码失败\",\n });\n return;\n }\n\n const res = await Dialoger.instance.confirm({\n title: \"重置密码成功\",\n message: (\n <p>\n <span>你的新密码为{result.data.data}</span>\n </p>\n ),\n type: \"warning\",\n cancelButtonText: \"取消\",\n confirmButtonText: \"复制\",\n });\n if (!res) {\n return;\n }\n\n navigator.clipboard.writeText(result.data.data);\n Messager.instance.success({ message: \"复制成功\" });\n },\n predicate: (member: MemberTableItem) => member.valid === 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 activeMemberForm.getColumn(\"depts\")!,\n activeMemberForm.getColumn(\"memo\")!,\n ]);\n }\n\n async approveMember() {\n try {\n this.activeMemberForm.getLoadingManager().startLoading();\n const result = await this.activeMemberForm.httpRequest?.post(\n \"/api/dv/ms-member/apply/account/approve\",\n {\n ...this.activeMemberForm.formatSubmitData(this.activeMemberForm.data),\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\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 let avatar: string \| null;\n try {\n avatar = item.avatar ? new URL(item.avatar).toString() : null;\n } catch (e) {\n avatar = null;\n }\n\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,\n roles: 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 };\n }\n}\n\ndefineDataTable(MemberTable);\n"],"names":["MemberTable","DataTable","activeMemberEvent","register","Event","constructor","options","name","activeMemberForm","MemberForm","initialize","initActiveMemberForm","dataFilter","setColumns","FilterColumn","label","componentInfo","TableColumn","width","visible","minWidth","TableActionColumn","buttons","ActionButton","handler","row","emit","predicate","member","valid","isConfirm","Dialoger","instance","confirm","title","message","type","cancelButtonText","confirmButtonText","loadingManager","startLoading","result","httpRequest","post","id","completeLoading","data","code","Messager","error","msg","res","_createVNode","_createTextVNode","navigator","clipboard","writeText","success","EditButton","DeleteButton","init","getColumn","FormColumn","defaultValue","required","componentProps","value","approveMember","getLoadingManager","formatSubmitData","load","e","console","formatItem","item","avatar","URL","toString","wechatNo","nickName","email","phone","account","roles","map","role","desc","depts","department","pid","defineDataTable"],"mappings":"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"}
1	+ {"version":3,"file":"MemberTable.js","sources":["../../../../src/dataview/member/MemberTable.tsx"],"sourcesContent":["import {\n TableColumn,\n DataTable,\n DataTableOptions,\n FilterColumn,\n TableActionColumn,\n ActionButton,\n DeleteButton,\n EditButton,\n Messager,\n Dialoger,\n FormColumn,\n} from \"@maketribe/dm\";\nimport { Event } from \"@maketribe/utils\";\nimport { defineDataTable } from \"../../define-data-table\";\nimport { Member, MemberForm, MemberResult } from \"./MemberForm\";\nimport { R } from \"@maketribe/request\";\n\nexport type MemberTableItem = Omit<Member, \"password\" \| \"confirmPassword\">;\n\nexport class MemberTable extends DataTable<MemberResult, MemberTableItem> {\n activeMemberForm: MemberForm;\n\n activeMemberEvent: Event<MemberTableItem> = this.register(new Event());\n\n constructor(options: DataTableOptions = {}) {\n super({ name: \"ms-member\", ...options });\n\n this.activeMemberForm = new MemberForm();\n }\n\n protected async initialize() {\n await super.initialize();\n\n await this.initActiveMemberForm();\n\n this.dataFilter.setColumns([\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({\n name: \"id\",\n label: \"编号\",\n width: \"190px\",\n visible: false,\n }),\n new TableColumn({ name: \"name\", label: \"姓名\", minWidth: \"150px\" }),\n new TableColumn({ name: \"nickName\", label: \"昵称\", minWidth: \"150px\" }),\n new TableColumn({\n name: \"avatar\",\n label: \"头像\",\n componentInfo: \"MKColumnImage\",\n width: \"80px\",\n }),\n new TableColumn({ name: \"account\", 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: \"200px\",\n buttons: [\n new ActionButton({\n label: \"激活用户\",\n handler: async (row) => {\n this.activeMemberEvent.emit(row);\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>你的新密码为{response.data.data}</span>\n </p>\n ),\n type: \"warning\",\n cancelButtonText: \"取消\",\n confirmButtonText: \"复制\",\n });\n if (!res) {\n return;\n }\n\n navigator.clipboard.writeText(response.data.data);\n Messager.instance.success({ message: \"复制成功\" });\n },\n predicate: (member: MemberTableItem) => member.valid === 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 activeMemberForm.getColumn(\"depts\")!,\n activeMemberForm.getColumn(\"memo\")!,\n ]);\n }\n\n async approveMember() {\n try {\n this.activeMemberForm.getLoadingManager().startLoading();\n const result = await this.activeMemberForm.httpRequest?.post(\n \"/api/dv/ms-member/apply/account/approve\",\n {\n ...this.activeMemberForm.formatSubmitData(this.activeMemberForm.data),\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\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 let avatar: string \| null;\n try {\n avatar = item.avatar ? new URL(item.avatar).toString() : null;\n } catch (e) {\n avatar = null;\n }\n\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,\n roles: 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 };\n }\n}\n\ndefineDataTable(MemberTable);\n"],"names":["MemberTable","DataTable","activeMemberEvent","register","Event","constructor","options","name","activeMemberForm","MemberForm","initialize","initActiveMemberForm","dataFilter","setColumns","FilterColumn","label","componentInfo","TableColumn","width","visible","minWidth","TableActionColumn","buttons","ActionButton","handler","row","emit","predicate","member","valid","isConfirm","Dialoger","instance","confirm","title","message","type","cancelButtonText","confirmButtonText","loadingManager","startLoading","response","dataViewRequest","callDVRequest","action","id","completeLoading","data","code","Messager","error","msg","res","_createVNode","_createTextVNode","navigator","clipboard","writeText","success","EditButton","DeleteButton","init","getColumn","FormColumn","defaultValue","required","componentProps","value","approveMember","getLoadingManager","result","httpRequest","post","formatSubmitData","load","e","console","formatItem","item","avatar","URL","toString","wechatNo","nickName","email","phone","account","roles","map","role","desc","depts","department","pid","defineDataTable"],"mappings":"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"}

package/dist/cjs/dataview/member/member-role/MemberRoleTable.js CHANGED Viewed

@@ -7,6 +7,7 @@ class MemberRoleTable extends dm.DataTable {
     super({ name: "ms-member-role", ...options });
   }
   async initialize() {
+    await super.initialize();
     this.setColumns([
       new dm.TableColumn({ name: "id", label: "\u7F16\u53F7", visible: false }),
       new dm.TableColumn({ name: "memberId", label: "\u6210\u5458ID" }),

package/dist/cjs/dataview/member/member-role/MemberRoleTable.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MemberRoleTable.js","sources":["../../../../../src/dataview/member/member-role/MemberRoleTable.ts"],"sourcesContent":["import { DataFormOptions, DataTable, TableColumn } from \"@maketribe/dm\";\n\nexport type MemberRole = {\n id: string;\n memberId: string;\n roleId: string;\n};\n\nexport class MemberRoleTable extends DataTable {\n constructor(options: DataFormOptions = {}) {\n super({ name: \"ms-member-role\", ...options });\n }\n\n protected async initialize() {\n this.setColumns([\n new TableColumn({ name: \"id\", label: \"编号\", visible: false }),\n new TableColumn({ name: \"memberId\", label: \"成员ID\" }),\n new TableColumn({ name: \"roleId\", label: \"角色ID\" }),\n ]);\n }\n}\n"],"names":["DataTable","TableColumn"],"mappings":";;;;AAQO,MAAM,wBAAwBA,YAAU,CAAA;AAAA,EAC7C,WAAA,CAAY,OAA2B,GAAA,EAAI,EAAA;AACzC,IAAA,KAAA,CAAM,EAAE,IAAA,EAAM,gBAAkB,EAAA,GAAG,SAAS,CAAA,CAAA;AAAA,GAC9C;AAAA,EAEA,MAAgB,UAAa,GAAA;AAC3B,IAAA,IAAA,CAAK,UAAW,CAAA;AAAA,MACd,IAAIC,eAAY,EAAE,IAAA,EAAM,MAAM,KAAO,EAAA,cAAA,EAAM,OAAS,EAAA,KAAA,EAAO,CAAA;AAAA,MAC3D,IAAIA,cAAY,CAAA,EAAE,MAAM,UAAY,EAAA,KAAA,EAAO,kBAAQ,CAAA;AAAA,MACnD,IAAIA,cAAY,CAAA,EAAE,MAAM,QAAU,EAAA,KAAA,EAAO,kBAAQ,CAAA;AAAA,KAClD,CAAA,CAAA;AAAA,GACH;AACF;;;;"}
1	+ {"version":3,"file":"MemberRoleTable.js","sources":["../../../../../src/dataview/member/member-role/MemberRoleTable.ts"],"sourcesContent":["import { DataFormOptions, DataTable, TableColumn } from \"@maketribe/dm\";\n\nexport type MemberRole = {\n id: string;\n memberId: string;\n roleId: string;\n};\n\nexport class MemberRoleTable extends DataTable {\n constructor(options: DataFormOptions = {}) {\n super({ name: \"ms-member-role\", ...options });\n }\n\n protected async initialize() {\n await super.initialize();\n\n this.setColumns([\n new TableColumn({ name: \"id\", label: \"编号\", visible: false }),\n new TableColumn({ name: \"memberId\", label: \"成员ID\" }),\n new TableColumn({ name: \"roleId\", label: \"角色ID\" }),\n ]);\n }\n}\n"],"names":["DataTable","TableColumn"],"mappings":";;;;AAQO,MAAM,wBAAwBA,YAAU,CAAA;AAAA,EAC7C,WAAA,CAAY,OAA2B,GAAA,EAAI,EAAA;AACzC,IAAA,KAAA,CAAM,EAAE,IAAA,EAAM,gBAAkB,EAAA,GAAG,SAAS,CAAA,CAAA;AAAA,GAC9C;AAAA,EAEA,MAAgB,UAAa,GAAA;AAC3B,IAAA,MAAM,MAAM,UAAW,EAAA,CAAA;AAEvB,IAAA,IAAA,CAAK,UAAW,CAAA;AAAA,MACd,IAAIC,eAAY,EAAE,IAAA,EAAM,MAAM,KAAO,EAAA,cAAA,EAAM,OAAS,EAAA,KAAA,EAAO,CAAA;AAAA,MAC3D,IAAIA,cAAY,CAAA,EAAE,MAAM,UAAY,EAAA,KAAA,EAAO,kBAAQ,CAAA;AAAA,MACnD,IAAIA,cAAY,CAAA,EAAE,MAAM,QAAU,EAAA,KAAA,EAAO,kBAAQ,CAAA;AAAA,KAClD,CAAA,CAAA;AAAA,GACH;AACF;;;;"}

package/dist/cjs/dataview/menu/MenuForm.js CHANGED Viewed

@@ -14,6 +14,7 @@ class MenuForm extends dm.DataForm {
     super({ name: "ms-menu", ...options });
   }
   async initialize() {
+    await super.initialize();
     const menuTable = this.register(new MenuTable.MenuTable({ pageSize: 10 }));
     if (dm.isWhereFilter(menuTable.dataFilter)) {
       menuTable.dataFilter.getDefaultGroup().addCondition(
@@ -41,7 +42,8 @@ class MenuForm extends dm.DataForm {
         componentProps: {
           options: [
             { value: menu.MenuType.Container, label: "\u83DC\u5355\u7EC4" },
-            { value: menu.MenuType.Menu, label: "\u83DC\u5355" }
+            { value: menu.MenuType.Menu, label: "\u83DC\u5355" },
+            { value: menu.MenuType.SystemSettings, label: "\u7CFB\u7EDF\u8BBE\u7F6E" }
           ]
         }
       }),
@@ -88,16 +90,18 @@ class MenuForm extends dm.DataForm {
         }
       }
     });
+    const handleMenuTypeChange = () => {
+      const visible = this.data?.type === menu.MenuType.Menu;
+      this.getColumn("routeId").visible = visible;
+      this.getColumn("routes").visible = visible;
+      this.getColumn("permissionPoints").visible = visible;
+    };
     this.formItemValueChangeEvent.on(({ formItem }) => {
       if (formItem.name === "type") {
-        this.getColumn("routes").visible = this.data?.type !== "1";
-        this.getColumn("permissionPoints").visible = this.data?.type !== "1";
+        handleMenuTypeChange();
       }
     });
-    this.dataChangeEvent.on(({}) => {
-      this.getColumn("routes").visible = this.data?.type !== "1";
-      this.getColumn("permissionPoints").visible = this.data?.type !== "1";
-    });
+    this.dataChangeEvent.on(handleMenuTypeChange);
     this.dataFormTypeChangeEvent.on(({ dataFormType }) => {
       this.getColumn("type").disabled = dataFormType !== dm.DataFormType.ADD;
     });
@@ -123,7 +127,7 @@ class MenuForm extends dm.DataForm {
       iconName: item.iconName || "",
       pid: item.pid || "",
       routeId: item.routeId,
-      type: item.type ? item.type + "" : "1",
+      type: item.type ? `${item.type}` : "1",
       sort: item.sort || "0",
       routes: item.routes || [],
       permissionPoints: item.permissionPoints || []

package/dist/cjs/dataview/menu/MenuForm.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MenuForm.js","sources":["../../../../src/dataview/menu/MenuForm.ts"],"sourcesContent":["import {\n DataForm,\n DataFormOptions,\n DataFormType,\n FormColumn,\n FormDetailColumn,\n isWhereFilter,\n} from \"@maketribe/dm\";\nimport { defineDataForm } from \"../../define-data-form\";\nimport { RouteTable } from \"../route/RouteTable\";\nimport { MenuTable } from \"./MenuTable\";\nimport { RouteForm, RouteResult } from \"../route/RouteForm\";\nimport {\n PermissionPointDefine,\n PermissionPointDefineForm,\n PermissionPointDefineTable,\n} from \"./permission-point\";\nimport { MenuType } from \"../../constants\";\n\nexport type MenuResult = {\n id: string;\n title: string \| null;\n iconName: string \| null;\n pid: string \| null;\n routeId: string;\n sort: string;\n type: string;\n routes: RouteResult[];\n permissionPoints: PermissionPointDefine[];\n};\n\nexport type MenuItem = {\n id: string;\n title: string;\n iconName: string;\n pid: string;\n routeId: string;\n sort: string;\n type: string;\n routes: RouteResult[];\n permissionPoints: PermissionPointDefine[];\n};\n\nexport class MenuForm extends DataForm<MenuResult, MenuItem> {\n constructor(options: DataFormOptions = {}) {\n super({ name: \"ms-menu\", ...options });\n }\n\n protected async initialize() {\n const menuTable = this.register(new MenuTable({ pageSize: 10 }));\n\n if (isWhereFilter(menuTable.dataFilter)) {\n menuTable.dataFilter\n .getDefaultGroup()\n .addCondition(\n \"type\",\n \"in\",\n `(${[MenuType.Container, MenuType.SystemSettings]\n .map((menuType) => parseInt(menuType))\n .join(\",\")})`\n );\n }\n\n const routeTable = this.register(new RouteTable({ pageSize: 10 }));\n\n this.setColumns([\n new FormColumn({ name: \"id\", label: \"编号\" }),\n new FormColumn({ name: \"title\", label: \"菜单描述\", required: true }),\n new FormColumn({\n name: \"iconName\",\n label: \"图标\",\n componentInfo: \"MKFormIconSelect\",\n required: true,\n }),\n new FormColumn({\n name: \"type\",\n label: \"菜单类型\",\n componentInfo: \"MKFormDataSelect\",\n defaultValue: MenuType.Menu,\n required: true,\n componentProps: {\n options: [\n { value: MenuType.Container, label: \"菜单组\" },\n { value: MenuType.Menu, label: \"菜单\" },\n ],\n },\n }),\n new FormColumn({\n name: \"routeId\",\n label: \"默认路由\",\n componentInfo: \"MKFormDataTableSelect\",\n componentProps: {\n labelFieldName: \"title\",\n dataTable: routeTable,\n },\n }),\n new FormColumn({\n name: \"pid\",\n label: \"父菜单\",\n componentInfo: \"MKFormDataTableSelect\",\n componentProps: {\n labelFieldName: \"title\",\n dataTable: menuTable,\n },\n }),\n new FormColumn({ name: \"sort\", label: \"排序\", defaultValue: \"0\" }),\n new FormDetailColumn({\n name: \"routes\",\n label: \"该菜单所属路由定义\",\n associationFieldName: \"menuId\",\n detailForm: this.register(new RouteForm()),\n detailTable: this.register(new RouteTable()),\n }),\n new FormDetailColumn({\n name: \"permissionPoints\",\n label: \"该菜单所属权限定义\",\n associationFieldName: \"menuId\",\n detailForm: this.register(new PermissionPointDefineForm()),\n detailTable: this.register(new PermissionPointDefineTable()),\n }),\n ]);\n\n this.dataFormTypeChangeEvent.on(({ dataFormType }) => {\n if (dataFormType === DataFormType.UPDATE) {\n const routeTableDataFilter = routeTable.dataFilter;\n if (isWhereFilter(routeTableDataFilter)) {\n routeTableDataFilter.getDefaultGroup().clear();\n routeTableDataFilter\n .getDefaultGroup()\n .addCondition(\"menuId\", \"=\", this.data!.id);\n }\n }\n });\n\n this.formItemValueChangeEvent.on(({ formItem }) => {\n if (formItem.name === \"type\") {\n this.getColumn(\"routes\")!.visible = this.data?.type !== \"1\";\n this.getColumn(\"permissionPoints\")!.visible = this.data?.type !== \"1\";\n }\n });\n\n this.dataChangeEvent.on(({}) => {\n this.getColumn(\"routes\")!.visible = this.data?.type !== \"1\";\n this.getColumn(\"permissionPoints\")!.visible = this.data?.type !== \"1\";\n });\n\n this.dataFormTypeChangeEvent.on(({ dataFormType }) => {\n this.getColumn(\"type\")!.disabled = dataFormType !== DataFormType.ADD;\n });\n }\n\n formatSubmitData(data: any) {\n const permissionPoints =\n data.type === MenuType.Menu ? data.permissionPoints : [];\n const routes = data.type === MenuType.Menu ? data.routes : [];\n\n const parsedType = parseInt(data.type);\n\n return {\n ...data,\n type: isNaN(parsedType) ? parseInt(MenuType.Menu) : parsedType,\n iconName: data.iconName \|\| null,\n pid: data.pid \|\| null,\n routeId: data.routeId \|\| null,\n permissionPoints,\n routes,\n };\n }\n\n formatItem(item: MenuResult): MenuItem {\n return {\n id: item.id,\n title: item.title \|\| \"\",\n iconName: item.iconName \|\| \"\",\n pid: item.pid \|\| \"\",\n routeId: item.routeId,\n type: item.type ? item.type + \"\" : \"1\",\n sort: item.sort \|\| \"0\",\n routes: item.routes \|\| [],\n permissionPoints: item.permissionPoints \|\| [],\n };\n }\n}\n\ndefineDataForm(MenuForm);\n"],"names":["DataForm","MenuTable","isWhereFilter","MenuType","RouteTable","FormColumn","FormDetailColumn","RouteForm","PermissionPointDefineForm","PermissionPointDefineTable","DataFormType","defineDataForm"],"mappings":"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"}
1	+ {"version":3,"file":"MenuForm.js","sources":["../../../../src/dataview/menu/MenuForm.ts"],"sourcesContent":["import {\n DataForm,\n DataFormOptions,\n DataFormType,\n FormColumn,\n FormDetailColumn,\n isWhereFilter,\n} from \"@maketribe/dm\";\nimport { defineDataForm } from \"../../define-data-form\";\nimport { RouteTable } from \"../route/RouteTable\";\nimport { MenuTable } from \"./MenuTable\";\nimport { RouteForm, RouteResult } from \"../route/RouteForm\";\nimport {\n PermissionPointDefine,\n PermissionPointDefineForm,\n PermissionPointDefineTable,\n} from \"./permission-point\";\nimport { MenuType } from \"../../constants\";\n\nexport type MenuResult = {\n id: string;\n title: string \| null;\n iconName: string \| null;\n pid: string \| null;\n routeId: string;\n sort: string;\n type: string;\n routes: RouteResult[];\n permissionPoints: PermissionPointDefine[];\n};\n\nexport type MenuItem = {\n id: string;\n title: string;\n iconName: string;\n pid: string;\n routeId: string;\n sort: string;\n type: string;\n routes: RouteResult[];\n permissionPoints: PermissionPointDefine[];\n};\n\nexport class MenuForm extends DataForm<MenuResult, MenuItem> {\n constructor(options: DataFormOptions = {}) {\n super({ name: \"ms-menu\", ...options });\n }\n\n protected async initialize() {\n await super.initialize();\n\n const menuTable = this.register(new MenuTable({ pageSize: 10 }));\n\n if (isWhereFilter(menuTable.dataFilter)) {\n menuTable.dataFilter\n .getDefaultGroup()\n .addCondition(\n \"type\",\n \"in\",\n `(${[MenuType.Container, MenuType.SystemSettings]\n .map((menuType) => parseInt(menuType))\n .join(\",\")})`\n );\n }\n\n const routeTable = this.register(new RouteTable({ pageSize: 10 }));\n\n this.setColumns([\n new FormColumn({ name: \"id\", label: \"编号\" }),\n new FormColumn({ name: \"title\", label: \"菜单描述\", required: true }),\n new FormColumn({\n name: \"iconName\",\n label: \"图标\",\n componentInfo: \"MKFormIconSelect\",\n required: true,\n }),\n new FormColumn({\n name: \"type\",\n label: \"菜单类型\",\n componentInfo: \"MKFormDataSelect\",\n defaultValue: MenuType.Menu,\n required: true,\n componentProps: {\n options: [\n { value: MenuType.Container, label: \"菜单组\" },\n { value: MenuType.Menu, label: \"菜单\" },\n { value: MenuType.SystemSettings, label: \"系统设置\" },\n ],\n },\n }),\n new FormColumn({\n name: \"routeId\",\n label: \"默认路由\",\n componentInfo: \"MKFormDataTableSelect\",\n componentProps: {\n labelFieldName: \"title\",\n dataTable: routeTable,\n },\n }),\n new FormColumn({\n name: \"pid\",\n label: \"父菜单\",\n componentInfo: \"MKFormDataTableSelect\",\n componentProps: {\n labelFieldName: \"title\",\n dataTable: menuTable,\n },\n }),\n new FormColumn({ name: \"sort\", label: \"排序\", defaultValue: \"0\" }),\n new FormDetailColumn({\n name: \"routes\",\n label: \"该菜单所属路由定义\",\n associationFieldName: \"menuId\",\n detailForm: this.register(new RouteForm()),\n detailTable: this.register(new RouteTable()),\n }),\n new FormDetailColumn({\n name: \"permissionPoints\",\n label: \"该菜单所属权限定义\",\n associationFieldName: \"menuId\",\n detailForm: this.register(new PermissionPointDefineForm()),\n detailTable: this.register(new PermissionPointDefineTable()),\n }),\n ]);\n\n this.dataFormTypeChangeEvent.on(({ dataFormType }) => {\n if (dataFormType === DataFormType.UPDATE) {\n const routeTableDataFilter = routeTable.dataFilter;\n if (isWhereFilter(routeTableDataFilter)) {\n routeTableDataFilter.getDefaultGroup().clear();\n routeTableDataFilter\n .getDefaultGroup()\n .addCondition(\"menuId\", \"=\", this.data!.id);\n }\n }\n });\n\n const handleMenuTypeChange = () => {\n const visible = this.data?.type === MenuType.Menu;\n\n this.getColumn(\"routeId\")!.visible = visible;\n this.getColumn(\"routes\")!.visible = visible;\n this.getColumn(\"permissionPoints\")!.visible = visible;\n };\n\n this.formItemValueChangeEvent.on(({ formItem }) => {\n if (formItem.name === \"type\") {\n handleMenuTypeChange();\n }\n });\n\n this.dataChangeEvent.on(handleMenuTypeChange);\n\n this.dataFormTypeChangeEvent.on(({ dataFormType }) => {\n this.getColumn(\"type\")!.disabled = dataFormType !== DataFormType.ADD;\n });\n }\n\n formatSubmitData(data: any) {\n const permissionPoints =\n data.type === MenuType.Menu ? data.permissionPoints : [];\n const routes = data.type === MenuType.Menu ? data.routes : [];\n\n const parsedType = parseInt(data.type);\n\n return {\n ...data,\n type: isNaN(parsedType) ? parseInt(MenuType.Menu) : parsedType,\n iconName: data.iconName \|\| null,\n pid: data.pid \|\| null,\n routeId: data.routeId \|\| null,\n permissionPoints,\n routes,\n };\n }\n\n formatItem(item: MenuResult): MenuItem {\n return {\n id: item.id,\n title: item.title \|\| \"\",\n iconName: item.iconName \|\| \"\",\n pid: item.pid \|\| \"\",\n routeId: item.routeId,\n type: item.type ? `${item.type}` : \"1\",\n sort: item.sort \|\| \"0\",\n routes: item.routes \|\| [],\n permissionPoints: item.permissionPoints \|\| [],\n };\n }\n}\n\ndefineDataForm(MenuForm);\n"],"names":["DataForm","MenuTable","isWhereFilter","MenuType","RouteTable","FormColumn","FormDetailColumn","RouteForm","PermissionPointDefineForm","PermissionPointDefineTable","DataFormType","defineDataForm"],"mappings":"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"}

package/dist/cjs/dataview/menu/MenuTable.js CHANGED Viewed

@@ -8,6 +8,7 @@ class MenuTable extends dm.DataTable {
     super({ name: "ms-menu", ...options });
   }
   async initialize() {
+    await super.initialize();
     this.setColumns([
       new dm.TableColumn({ name: "id", label: "\u7F16\u53F7", visible: false }),
       new dm.TableColumn({ name: "title", label: "\u83DC\u5355\u63CF\u8FF0" }),

package/dist/cjs/dataview/menu/MenuTable.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MenuTable.js","sources":["../../../../src/dataview/menu/MenuTable.ts"],"sourcesContent":["import {\n DataTable,\n DataTableOptions,\n TableActionColumn,\n TableColumn,\n} from \"@maketribe/dm\";\nimport { defineDataTable } from \"../../define-data-table\";\nimport type { MenuItem, MenuResult } from \"./MenuForm\";\n\nexport class MenuTable<T extends MenuItem = MenuItem> extends DataTable<\n MenuResult,\n T\n> {\n constructor(options: Omit<DataTableOptions, \"name\"> = {}) {\n super({ name: \"ms-menu\", ...options });\n }\n\n protected async initialize() {\n this.setColumns([\n new TableColumn({ name: \"id\", label: \"编号\", visible: false }),\n new TableColumn({ name: \"title\", label: \"菜单描述\" }),\n new TableActionColumn(),\n ]);\n }\n\n formatItem(item: MenuResult): T {\n return {\n id: item.id,\n title: item.title \|\| \"\",\n iconName: item.iconName \|\| \"\",\n pid: item.pid \|\| \"\",\n routeId: item.routeId,\n } as T;\n }\n}\n\ndefineDataTable(MenuTable);\n"],"names":["DataTable","TableColumn","TableActionColumn","defineDataTable"],"mappings":";;;;;AASO,MAAM,kBAAiDA,YAG5D,CAAA;AAAA,EACA,WAAA,CAAY,OAA0C,GAAA,EAAI,EAAA;AACxD,IAAA,KAAA,CAAM,EAAE,IAAA,EAAM,SAAW,EAAA,GAAG,SAAS,CAAA,CAAA;AAAA,GACvC;AAAA,EAEA,MAAgB,UAAa,GAAA;AAC3B,IAAA,IAAA,CAAK,UAAW,CAAA;AAAA,MACd,IAAIC,eAAY,EAAE,IAAA,EAAM,MAAM,KAAO,EAAA,cAAA,EAAM,OAAS,EAAA,KAAA,EAAO,CAAA;AAAA,MAC3D,IAAIA,cAAY,CAAA,EAAE,MAAM,OAAS,EAAA,KAAA,EAAO,4BAAQ,CAAA;AAAA,MAChD,IAAIC,oBAAkB,EAAA;AAAA,KACvB,CAAA,CAAA;AAAA,GACH;AAAA,EAEA,WAAW,IAAqB,EAAA;AAC9B,IAAO,OAAA;AAAA,MACL,IAAI,IAAK,CAAA,EAAA;AAAA,MACT,KAAA,EAAO,KAAK,KAAS,IAAA,EAAA;AAAA,MACrB,QAAA,EAAU,KAAK,QAAY,IAAA,EAAA;AAAA,MAC3B,GAAA,EAAK,KAAK,GAAO,IAAA,EAAA;AAAA,MACjB,SAAS,IAAK,CAAA,OAAA;AAAA,KAChB,CAAA;AAAA,GACF;AACF,CAAA;AAEAC,+BAAA,CAAgB,SAAS,CAAA;;;;"}
1	+ {"version":3,"file":"MenuTable.js","sources":["../../../../src/dataview/menu/MenuTable.ts"],"sourcesContent":["import {\n DataTable,\n DataTableOptions,\n TableActionColumn,\n TableColumn,\n} from \"@maketribe/dm\";\nimport { defineDataTable } from \"../../define-data-table\";\nimport type { MenuItem, MenuResult } from \"./MenuForm\";\n\nexport class MenuTable<T extends MenuItem = MenuItem> extends DataTable<\n MenuResult,\n T\n> {\n constructor(options: Omit<DataTableOptions, \"name\"> = {}) {\n super({ name: \"ms-menu\", ...options });\n }\n\n protected async initialize() {\n await super.initialize();\n\n this.setColumns([\n new TableColumn({ name: \"id\", label: \"编号\", visible: false }),\n new TableColumn({ name: \"title\", label: \"菜单描述\" }),\n new TableActionColumn(),\n ]);\n }\n\n formatItem(item: MenuResult): T {\n return {\n id: item.id,\n title: item.title \|\| \"\",\n iconName: item.iconName \|\| \"\",\n pid: item.pid \|\| \"\",\n routeId: item.routeId,\n } as T;\n }\n}\n\ndefineDataTable(MenuTable);\n"],"names":["DataTable","TableColumn","TableActionColumn","defineDataTable"],"mappings":";;;;;AASO,MAAM,kBAAiDA,YAG5D,CAAA;AAAA,EACA,WAAA,CAAY,OAA0C,GAAA,EAAI,EAAA;AACxD,IAAA,KAAA,CAAM,EAAE,IAAA,EAAM,SAAW,EAAA,GAAG,SAAS,CAAA,CAAA;AAAA,GACvC;AAAA,EAEA,MAAgB,UAAa,GAAA;AAC3B,IAAA,MAAM,MAAM,UAAW,EAAA,CAAA;AAEvB,IAAA,IAAA,CAAK,UAAW,CAAA;AAAA,MACd,IAAIC,eAAY,EAAE,IAAA,EAAM,MAAM,KAAO,EAAA,cAAA,EAAM,OAAS,EAAA,KAAA,EAAO,CAAA;AAAA,MAC3D,IAAIA,cAAY,CAAA,EAAE,MAAM,OAAS,EAAA,KAAA,EAAO,4BAAQ,CAAA;AAAA,MAChD,IAAIC,oBAAkB,EAAA;AAAA,KACvB,CAAA,CAAA;AAAA,GACH;AAAA,EAEA,WAAW,IAAqB,EAAA;AAC9B,IAAO,OAAA;AAAA,MACL,IAAI,IAAK,CAAA,EAAA;AAAA,MACT,KAAA,EAAO,KAAK,KAAS,IAAA,EAAA;AAAA,MACrB,QAAA,EAAU,KAAK,QAAY,IAAA,EAAA;AAAA,MAC3B,GAAA,EAAK,KAAK,GAAO,IAAA,EAAA;AAAA,MACjB,SAAS,IAAK,CAAA,OAAA;AAAA,KAChB,CAAA;AAAA,GACF;AACF,CAAA;AAEAC,+BAAA,CAAgB,SAAS,CAAA;;;;"}

package/dist/cjs/dataview/menu/MenuTree.d.ts CHANGED Viewed

@@ -1,19 +1,14 @@
-import { Group } from "@maketribe/request";
-import { DataTableOptions } from "@maketribe/dm";
-import { PermissionPointDefineForm, PermissionPointDefineTable } from "./permission-point";
-import { MenuItem, MenuResult } from "./MenuForm";
-import { MenuTable } from "./MenuTable";
-export type MenuNodeItem = MenuItem & {
-    children: MenuNodeItem[];
+import { DataTableOptions, DataTree, DataTreeNode } from "@maketribe/dm";
+import { R } from "@maketribe/request";
+import { MenuItem } from "./MenuForm";
+export type MenuItemNode = MenuItem & {
+    children: MenuItemNode[];
 };
-export declare class MenuTree extends MenuTable<MenuNodeItem> {
-    permissionPointDefineTable: PermissionPointDefineTable;
-    permissionPointDefineForm: PermissionPointDefineForm;
-    permissionPointDefineConditionGroup: Group;
-    currentMenuId: MenuNodeItem["id"];
+export declare class MenuTree extends DataTree<MenuItemNode> {
     constructor(options?: Omit<DataTableOptions, "name">);
     protected initialize(): Promise<void>;
-    setList(list: MenuNodeItem[]): void;
-    formatItem(item: MenuResult): MenuNodeItem;
-    toPermissionPointDefine(item: MenuNodeItem): Promise<void>;
+    protected loadRequest(params: Record<string, any>): Promise<import("@maketribe/request").ResponseConfig<R<MenuItemNode[]> & {
+        totalRecCount: string;
+    }, import("@maketribe/request").RequestPagination & Record<string, any>>>;
+    createDataTreeNode(data: MenuItemNode): DataTreeNode<MenuItemNode>;
 }

package/dist/cjs/dataview/menu/MenuTree.js CHANGED Viewed

@@ -1,106 +1,83 @@
 'use strict';
-var request = require('@maketribe/request');
 var dm = require('@maketribe/dm');
-var PermissionPointDefineForm = require('./permission-point/PermissionPointDefineForm.js');
-var PermissionPointDefineTable = require('./permission-point/PermissionPointDefineTable.js');
-var MenuTable = require('./MenuTable.js');
+var request = require('@maketribe/request');
+var defineDataTree = require('../../define-data-tree.js');
+var menu = require('../../constants/menu.js');
-class MenuTree extends MenuTable.MenuTable {
-  permissionPointDefineTable;
-  permissionPointDefineForm;
-  permissionPointDefineConditionGroup;
-  currentMenuId = "";
+class MenuTree extends dm.DataTree {
   constructor(options = {}) {
-    super({
-      ...options,
-      pageSize: 0,
-      pageSizes: [],
-      interfaceURL: {
-        list: "/api/dv/ms-menu/allList",
-        ...options.interfaceURL
-      }
-    });
-    const menuTree = this;
-    this.permissionPointDefineTable = new class extends PermissionPointDefineTable.PermissionPointDefineTable {
-      loadRequest(params) {
-        if (menuTree.currentMenuId) {
-          return super.loadRequest(params);
-        }
-        return Promise.resolve({
-          status: 200,
-          statusText: "OK",
-          headers: {},
-          data: { code: 200, data: [], msg: "", totalRecCount: "0" },
-          config: {},
-          request: null
-        });
-      }
-    }();
-    this.permissionPointDefineForm = new PermissionPointDefineForm.PermissionPointDefineForm({
-      autoReset: false
-    });
-    this.permissionPointDefineConditionGroup = new request.Group();
-    this.permissionPointDefineTable.dataFilter.getWhere().addGroup(this.permissionPointDefineConditionGroup);
+    super({ name: "ms-menu", ...options });
   }
   async initialize() {
-    await this.permissionPointDefineTable.init();
-    await this.permissionPointDefineForm.init();
+    await super.initialize();
     this.setColumns([
       new dm.TableColumn({ name: "id", label: "\u7F16\u53F7", visible: false }),
-      new dm.TableColumn({ name: "title", label: "\u83DC\u5355\u63CF\u8FF0" })
+      new dm.TableColumn({ name: "title", label: "\u83DC\u5355\u63CF\u8FF0" }),
+      new dm.TableActionColumn()
     ]);
-    this.register(
-      this.permissionPointDefineTable.addRecordEvent.on(async () => {
-        await this.permissionPointDefineForm.addRecord();
-        this.permissionPointDefineForm.setData({
-          ...this.permissionPointDefineForm.data,
-          menuId: this.currentMenuId
-        });
-      })
-    );
-    this.register(
-      this.permissionPointDefineTable.editRecordEvent.on(async ({ item }) => {
-        await this.permissionPointDefineForm.editRecord(item);
-      })
-    );
-    this.register(
-      this.permissionPointDefineForm.submittedEvent.on(() => {
-        this.permissionPointDefineTable.load();
+  }
+  async loadRequest(params) {
+    if (dm.isWhereFilter(this.dataFilter)) {
+      const defaultGroup = this.dataFilter.getDefaultGroup();
+      defaultGroup.clear();
+      defaultGroup.addCondition("pid", "is", "null");
+    }
+    const response = await this.dataViewRequest.list({
+      data: {
+        pn: this.currentPage,
+        pc: this.pageSize,
+        ...this.getLoadParams(params)
+      },
+      cancelToken: new request.CancelToken((cancel) => {
+        this.loadCancel = cancel;
       })
-    );
+    });
+    this.loadCancel = null;
+    if (response.data.code === 200) {
+      for (const item of response.data.data) {
+        item.type += "";
+        item.children = item.children || [];
+      }
+    }
+    return response;
   }
-  setList(list) {
-    let rootMenu = [];
-    for (const node of list) {
-      if (!node.pid) {
-        rootMenu.push(node);
+  createDataTreeNode(data) {
+    const dataTreeNode = new class extends dm.DataTreeNode {
+      get isLeaf() {
+        return this.data.type === menu.MenuType.Menu;
       }
-      for (const item of list) {
-        if (item.pid === node.id) {
-          node.children.push(item);
+      async loadRequest(params) {
+        if (dm.isWhereFilter(this.dataFilter)) {
+          const defaultGroup = this.dataFilter.getDefaultGroup();
+          defaultGroup.clear();
+          defaultGroup.addCondition("pid", "=", this.data.id);
         }
+        const response = await this.dataViewRequest.allList({
+          data: { ...this.getLoadParams(params) },
+          cancelToken: new request.CancelToken((cancel) => {
+            this.loadCancel = cancel;
+          })
+        });
+        this.loadCancel = null;
+        if (response.data.code === 200) {
+          for (const item of response.data.data) {
+            item.type += "";
+            item.children = item.children || [];
+          }
+        }
+        return response;
       }
-    }
-    super.setList(rootMenu);
-  }
-  formatItem(item) {
-    return {
-      ...super.formatItem(item),
-      children: []
-    };
-  }
-  async toPermissionPointDefine(item) {
-    this.permissionPointDefineConditionGroup.clear();
-    this.permissionPointDefineConditionGroup.addCondition(
-      "menuId",
-      "=",
-      item.id
-    );
-    this.currentMenuId = item.id;
-    await this.permissionPointDefineTable.load();
+    }({
+      name: this.name
+    });
+    dataTreeNode.setTree(this);
+    dataTreeNode.setData(data);
+    return dataTreeNode;
   }
 }
+window.MenuTree = MenuTree;
+defineDataTree.defineDataTree(MenuTree);
 exports.MenuTree = MenuTree;
 //# sourceMappingURL=MenuTree.js.map