npm - @maketribe/ms-app - Versions diffs - 3.0.11 → 3.0.13 - Mend

@maketribe/ms-app 3.0.11 → 3.0.13

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 (133) hide show

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

@@ -2,18 +2,17 @@
 var vue = require('vue');
 var dm = require('@maketribe/dm');
-var utils = require('@maketribe/utils');
 var defineDataTable = require('../../define-data-table.js');
 var MemberForm = require('./MemberForm.js');
 class MemberTable extends dm.DataTable {
-  activeMemberEvent = this.register(new utils.Event());
   constructor(options = {}) {
     super({
       name: "ms-member",
       ...options
     });
     this.activeMemberForm = new MemberForm.MemberForm();
+    this.isShowActiveMemberForm = false;
   }
   async initialize() {
     await super.initialize();
@@ -87,7 +86,14 @@ class MemberTable extends dm.DataTable {
       buttons: [new dm.ActionButton({
         label: "\u6FC0\u6D3B\u7528\u6237",
         handler: async (row) => {
-          this.activeMemberEvent.emit(row);
+          const response = await this.activeMemberForm.editRecord(row.id);
+          if (response.data.code !== 200) {
+            dm.Messager.instance.error({
+              message: response.data.msg
+            });
+            return;
+          }
+          this.isShowActiveMemberForm = true;
         },
         predicate: (member) => member.valid === 0
       }), new dm.ActionButton({

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\";\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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"}
1	+ {"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} from \"@maketribe/dm\";\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 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 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 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\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>你的新密码为{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","constructor","options","name","activeMemberForm","MemberForm","isShowActiveMemberForm","initialize","initActiveMemberForm","dataFilter","setColumns","FilterColumn","label","componentInfo","TableColumn","width","visible","minWidth","TableActionColumn","buttons","ActionButton","handler","row","response","editRecord","id","data","code","Messager","instance","error","message","msg","predicate","member","valid","isConfirm","Dialoger","confirm","title","type","cancelButtonText","confirmButtonText","loadingManager","startLoading","dataViewRequest","callDVRequest","action","completeLoading","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/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 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;;;;"}
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\";\nimport { DVQueryable } from \"@maketribe/request\";\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":";;;;;AAUO,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/role/RoleTable.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"RoleTable.js","sources":["../../../../src/dataview/role/RoleTable.ts"],"sourcesContent":["import {\n DataTable,\n DataTableOptions,\n TableColumn,\n FilterColumn,\n TableActionColumn,\n ActionButton,\n EditButton,\n DeleteButton,\n} from \"@maketribe/dm\";\nimport { defineDataTable } from \"../../define-data-table\";\nimport { Role } from \"./RoleForm\";\nimport { Event } from \"@maketribe/utils\";\n\nexport class RoleTable<\n F extends Role = Role,\n T extends Role = Role\n> extends DataTable<T, F> {\n configRolePermissionEvent: Event<{ item: Role }> = new Event();\n\n constructor(options: DataTableOptions = {}) {\n super({ name: \"ms-role\", ...options });\n }\n\n protected async initialize() {\n await super.initialize();\n\n this.dataFilter.setColumns([\n new FilterColumn({\n name: \"name\",\n label: \"角色名\",\n componentInfo: \"MKConditionInput\",\n }),\n new FilterColumn({\n name: \"desc\",\n label: \"角色描述\",\n componentInfo: \"MKConditionInput\",\n }),\n ]);\n\n this.setColumns([\n new TableColumn({ name: \"id\", label: \"编号\", visible: false }),\n new TableColumn({ name: \"name\", label: \"角色名\" }),\n new TableColumn({ name: \"desc\", label: \"角色描述\" }),\n new TableActionColumn({\n width: \"160px\",\n buttons: [\n new ActionButton({\n label: \"权限\",\n handler: (row: Role) => {\n this.configRolePermissionEvent.emit({ item: row });\n },\n }),\n new EditButton(),\n new DeleteButton(),\n ],\n }),\n ]);\n }\n\n formatItem(item: T): F {\n return {\n id: item.id,\n name: item.name \|\| \"\",\n desc: item.desc \|\| \"\",\n } as F;\n }\n}\n\ndefineDataTable(RoleTable);\n"],"names":["DataTable","Event","FilterColumn","TableColumn","TableActionColumn","ActionButton","EditButton","DeleteButton","defineDataTable"],"mappings":";;;;;;~~AAcO~~,MAAM,kBAGHA,YAAgB,CAAA;AAAA,EACxB,yBAAA,GAAmD,IAAIC,WAAM,EAAA,CAAA;AAAA,EAE7D,WAAA,CAAY,OAA4B,GAAA,EAAI,EAAA;AAC1C,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,WAAW,UAAW,CAAA;AAAA,MACzB,IAAIC,eAAa,CAAA;AAAA,QACf,IAAM,EAAA,MAAA;AAAA,QACN,KAAO,EAAA,oBAAA;AAAA,QACP,aAAe,EAAA,kBAAA;AAAA,OAChB,CAAA;AAAA,MACD,IAAIA,eAAa,CAAA;AAAA,QACf,IAAM,EAAA,MAAA;AAAA,QACN,KAAO,EAAA,0BAAA;AAAA,QACP,aAAe,EAAA,kBAAA;AAAA,OAChB,CAAA;AAAA,KACF,CAAA,CAAA;AAED,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,MAAQ,EAAA,KAAA,EAAO,sBAAO,CAAA;AAAA,MAC9C,IAAIA,cAAY,CAAA,EAAE,MAAM,MAAQ,EAAA,KAAA,EAAO,4BAAQ,CAAA;AAAA,MAC/C,IAAIC,oBAAkB,CAAA;AAAA,QACpB,KAAO,EAAA,OAAA;AAAA,QACP,OAAS,EAAA;AAAA,UACP,IAAIC,eAAa,CAAA;AAAA,YACf,KAAO,EAAA,cAAA;AAAA,YACP,OAAA,EAAS,CAAC,GAAc,KAAA;AACtB,cAAA,IAAA,CAAK,yBAA0B,CAAA,IAAA,CAAK,EAAE,IAAA,EAAM,KAAK,CAAA,CAAA;AAAA,aACnD;AAAA,WACD,CAAA;AAAA,UACD,IAAIC,aAAW,EAAA;AAAA,UACf,IAAIC,eAAa,EAAA;AAAA,SACnB;AAAA,OACD,CAAA;AAAA,KACF,CAAA,CAAA;AAAA,GACH;AAAA,EAEA,WAAW,IAAY,EAAA;AACrB,IAAO,OAAA;AAAA,MACL,IAAI,IAAK,CAAA,EAAA;AAAA,MACT,IAAA,EAAM,KAAK,IAAQ,IAAA,EAAA;AAAA,MACnB,IAAA,EAAM,KAAK,IAAQ,IAAA,EAAA;AAAA,KACrB,CAAA;AAAA,GACF;AACF,CAAA;AAEAC,+BAAA,CAAgB,SAAS,CAAA;;;;"}
1	+ {"version":3,"file":"RoleTable.js","sources":["../../../../src/dataview/role/RoleTable.ts"],"sourcesContent":["import {\n DataTable,\n DataTableOptions,\n TableColumn,\n FilterColumn,\n TableActionColumn,\n ActionButton,\n EditButton,\n DeleteButton,\n ClassifySearchItem,\n} from \"@maketribe/dm\";\nimport { defineDataTable } from \"../../define-data-table\";\nimport { Role } from \"./RoleForm\";\nimport { Event } from \"@maketribe/utils\";\n\nexport class RoleTable<\n F extends Role = Role,\n T extends Role = Role\n> extends DataTable<T, F> {\n configRolePermissionEvent: Event<{ item: Role }> = new Event();\n\n constructor(options: DataTableOptions = {}) {\n super({ name: \"ms-role\", ...options });\n }\n\n protected async initialize() {\n await super.initialize();\n\n this.dataFilter.setColumns([\n new FilterColumn({\n name: \"name\",\n label: \"角色名\",\n componentInfo: \"MKConditionInput\",\n }),\n new FilterColumn({\n name: \"desc\",\n label: \"角色描述\",\n componentInfo: \"MKConditionInput\",\n }),\n ]);\n\n this.setColumns([\n new TableColumn({ name: \"id\", label: \"编号\", visible: false }),\n new TableColumn({ name: \"name\", label: \"角色名\" }),\n new TableColumn({ name: \"desc\", label: \"角色描述\" }),\n new TableActionColumn({\n width: \"160px\",\n buttons: [\n new ActionButton({\n label: \"权限\",\n handler: (row: Role) => {\n this.configRolePermissionEvent.emit({ item: row });\n },\n }),\n new EditButton(),\n new DeleteButton(),\n ],\n }),\n ]);\n }\n\n formatItem(item: T): F {\n return {\n id: item.id,\n name: item.name \|\| \"\",\n desc: item.desc \|\| \"\",\n } as F;\n }\n}\n\ndefineDataTable(RoleTable);\n"],"names":["DataTable","Event","FilterColumn","TableColumn","TableActionColumn","ActionButton","EditButton","DeleteButton","defineDataTable"],"mappings":";;;;;;AAeO,MAAM,kBAGHA,YAAgB,CAAA;AAAA,EACxB,yBAAA,GAAmD,IAAIC,WAAM,EAAA,CAAA;AAAA,EAE7D,WAAA,CAAY,OAA4B,GAAA,EAAI,EAAA;AAC1C,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,WAAW,UAAW,CAAA;AAAA,MACzB,IAAIC,eAAa,CAAA;AAAA,QACf,IAAM,EAAA,MAAA;AAAA,QACN,KAAO,EAAA,oBAAA;AAAA,QACP,aAAe,EAAA,kBAAA;AAAA,OAChB,CAAA;AAAA,MACD,IAAIA,eAAa,CAAA;AAAA,QACf,IAAM,EAAA,MAAA;AAAA,QACN,KAAO,EAAA,0BAAA;AAAA,QACP,aAAe,EAAA,kBAAA;AAAA,OAChB,CAAA;AAAA,KACF,CAAA,CAAA;AAED,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,MAAQ,EAAA,KAAA,EAAO,sBAAO,CAAA;AAAA,MAC9C,IAAIA,cAAY,CAAA,EAAE,MAAM,MAAQ,EAAA,KAAA,EAAO,4BAAQ,CAAA;AAAA,MAC/C,IAAIC,oBAAkB,CAAA;AAAA,QACpB,KAAO,EAAA,OAAA;AAAA,QACP,OAAS,EAAA;AAAA,UACP,IAAIC,eAAa,CAAA;AAAA,YACf,KAAO,EAAA,cAAA;AAAA,YACP,OAAA,EAAS,CAAC,GAAc,KAAA;AACtB,cAAA,IAAA,CAAK,yBAA0B,CAAA,IAAA,CAAK,EAAE,IAAA,EAAM,KAAK,CAAA,CAAA;AAAA,aACnD;AAAA,WACD,CAAA;AAAA,UACD,IAAIC,aAAW,EAAA;AAAA,UACf,IAAIC,eAAa,EAAA;AAAA,SACnB;AAAA,OACD,CAAA;AAAA,KACF,CAAA,CAAA;AAAA,GACH;AAAA,EAEA,WAAW,IAAY,EAAA;AACrB,IAAO,OAAA;AAAA,MACL,IAAI,IAAK,CAAA,EAAA;AAAA,MACT,IAAA,EAAM,KAAK,IAAQ,IAAA,EAAA;AAAA,MACnB,IAAA,EAAM,KAAK,IAAQ,IAAA,EAAA;AAAA,KACrB,CAAA;AAAA,GACF;AACF,CAAA;AAEAC,+BAAA,CAAgB,SAAS,CAAA;;;;"}

package/dist/cjs/layouts/components/bar/index.js CHANGED Viewed

@@ -70,7 +70,7 @@ const MKBar = /* @__PURE__ */ vue.defineComponent({
     const msAppClient = MSAppClient.MSAppClient.instance;
     const userSession = msAppClient.userSession;
     const menu$1 = userSession.menu;
-    const router = userSession.router;
+    const vueRouter = msAppClient.vueRouter;
     const currentBarItem = vue.computed(() => props.barItem);
     const handleBarItemClick = (barItem) => {
       let target = barItem;
@@ -81,7 +81,7 @@ const MKBar = /* @__PURE__ */ vue.defineComponent({
         return;
       }
       if (target?.route) {
-        router.changeRoute({
+        vueRouter.push({
           name: target.route.name
         });
       }

package/dist/cjs/layouts/components/bar/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sources":["../../../../../src/layouts/components/bar/index.tsx"],"sourcesContent":["import { computed, defineComponent, unref } from \"vue\";\nimport { MKSvgIcon } from \"../../../components\";\nimport { MSAppClient, MenuNode } from \"../../../core\";\nimport { MenuType } from \"../../../constants\";\n\nexport const MKBar = defineComponent({\n name: \"MKBar\",\n props: {\n barItem: {\n type: MenuNode,\n },\n },\n setup(props) {\n const msAppClient = MSAppClient.instance!;\n const userSession = msAppClient.userSession!;\n const menu = userSession.menu;\n const router = userSession.router;\n\n const currentBarItem = computed(() => props.barItem);\n\n const handleBarItemClick = (barItem: MenuNode) => {\n let target: MenuNode \| null = barItem;\n\n if (barItem.children.length) {\n target = menu.getFirstLeafMenuNode(barItem.children);\n }\n\n if (!target) {\n return;\n }\n\n if (target?.route) {\n ~~router~~.~~changeRoute~~({ name: target.route.name });\n }\n };\n\n return () => {\n const barItems = menu.rootMenus\n .filter((rootMenu) => rootMenu.type !== \"3\")\n .map((rootMenu) => (\n <div\n class={[\n \"mk-bar__item\",\n rootMenu.children.length ? \"has-children\" : \"\",\n unref(currentBarItem)?.id === rootMenu.id ? \"is-active\" : \"\",\n ]}\n onClick={() => handleBarItemClick(rootMenu)}\n >\n <div class=\"mk-bar__item-button\">\n <MKSvgIcon iconClass={rootMenu.iconName} />\n </div>\n <div class=\"mk-bar__item-title\">{rootMenu.title} </div>\n </div>\n ));\n\n const systemSettingNode = menu.rootMenus.find(\n (rootMenu) => rootMenu.type === MenuType.SystemSettings\n );\n\n const footer = systemSettingNode?.children.length ? (\n <div class=\"mk-bar__footer\">\n <div\n class={[\n \"mk-bar__item\",\n \"mk-bar__settings\",\n systemSettingNode.children.length ? \"has-children\" : \"\",\n unref(currentBarItem)?.id === systemSettingNode.id\n ? \"is-active\"\n : \"\",\n ]}\n onClick={() => handleBarItemClick(systemSettingNode)}\n >\n <div class=\"mk-bar__item-button\">\n <MKSvgIcon iconClass={systemSettingNode.iconName} />\n </div>\n <div class=\"mk-bar__item-title\">{systemSettingNode.title} </div>\n </div>\n </div>\n ) : null;\n\n return (\n <div class=\"mk-bar\">\n <div class=\"mk-bar__logo\">\n <div\n class=\"mk-logo\"\n style={{ backgroundImage: `url(${msAppClient.logo})` }}\n />\n </div>\n\n <div class=\"mk-bar__items\">{barItems}</div>\n\n {footer}\n </div>\n );\n };\n },\n});\n"],"names":["MKBar","defineComponent","name","props","barItem","type","MenuNode","setup","msAppClient","MSAppClient","instance","userSession","menu","~~router~~","currentBarItem","computed","handleBarItemClick","target","children","length","getFirstLeafMenuNode","route","~~changeRoute~~","barItems","rootMenus","filter","rootMenu","map","_createVNode","unref","id","onClick","MKSvgIcon","iconName","title","_createTextVNode","systemSettingNode","find","MenuType","SystemSettings","footer","backgroundImage","logo"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKO,MAAMA,wBAAwBC,mBAAA,CAAA;AAAA,EACnCC,IAAM,EAAA,OAAA;AAAA,EACNC,KAAO,EAAA;AAAA,IACLC,OAAS,EAAA;AAAA,MACPC,IAAMC,EAAAA,iBAAAA;AAAAA,KACR;AAAA,GACF;AAAA,EACAC,MAAMJ,KAAO,EAAA;AACX,IAAA,MAAMK,cAAcC,uBAAYC,CAAAA,QAAAA,CAAAA;AAChC,IAAA,MAAMC,cAAcH,WAAYG,CAAAA,WAAAA,CAAAA;AAChC,IAAA,MAAMC,SAAOD,WAAYC,CAAAA,IAAAA,CAAAA;AACzB,IAAA,MAAMC,~~SAASF~~,~~WAAYE~~,CAAAA,~~MAAAA~~,CAAAA;~~AAE3B~~,IAAA,MAAMC,cAAiBC,GAAAA,YAAAA,CAAS,MAAMZ,KAAAA,CAAMC,OAAO,CAAA,CAAA;AAEnD,IAAA,MAAMY,qBAAsBZ,CAAsB,OAAA,KAAA;AAChD,MAAA,IAAIa,MAA0Bb,GAAAA,OAAAA,CAAAA;AAE9B,MAAIA,IAAAA,OAAAA,CAAQc,SAASC,MAAQ,EAAA;AAC3BF,QAASL,MAAAA,GAAAA,MAAAA,CAAKQ,oBAAqBhB,CAAAA,OAAAA,CAAQc,QAAQ,CAAA,CAAA;AAAA,OACrD;AAEA,MAAA,IAAI,CAACD,MAAQ,EAAA;AACX,QAAA,OAAA;AAAA,OACF;AAEA,MAAA,IAAIA,QAAQI,KAAO,EAAA;AACjBR,QAAAA,~~MAAAA~~,~~CAAOS~~,~~WAAY~~,CAAA;AAAA,UAAEpB,IAAAA,EAAMe,OAAOI,KAAMnB,CAAAA,IAAAA;AAAAA,SAAM,CAAA,CAAA;AAAA,~~OAChD~~;AAAA,KACF,CAAA;AAEA,IAAA,OAAO,MAAM;AACX,MAAA,MAAMqB,QAAWX,GAAAA,MAAAA,CAAKY,SACnBC,CAAAA,MAAAA,CAAQC,CAAaA,QAAAA,KAAAA,QAAAA,CAASrB,IAAS,KAAA,GAAG,CAC1CsB,CAAAA,GAAAA,CAAKD,CAAQE,QAAAA,KAAAA,eAAAA,CAAA,KAAA,EAAA;AAAA,QAAA,OAEH,EAAA,CACL,cACAF,EAAAA,QAAAA,CAASR,SAASC,MAAS,GAAA,cAAA,GAAiB,EAC5CU,EAAAA,SAAAA,CAAMf,cAAc,CAAGgB,EAAAA,EAAAA,KAAOJ,QAASI,CAAAA,EAAAA,GAAK,cAAc,EAAE,CAAA;AAAA,QAC7D,SAAA,EACQC,MAAMf,kBAAAA,CAAmBU,QAAQ,CAAA;AAAA,OAAC,EAAA,CAAAE,eAAAA,CAAA,KAAA,EAAA;AAAA,QAAA,OAAA,EAAA,qBAAA;AAAA,OAAA,EAAAA,CAAAA,eAAAA,CAAAI,eAAA,EAAA;AAAA,QAAA,aAGnBN,QAASO,CAAAA,QAAAA;AAAAA,SAAQ,IAAA,CAAA,CAAA,CAAA,EAAAL,gBAAA,KAAA,EAAA;AAAA,QAAA,OAAA,EAAA,oBAAA;AAAA,OAAA,EAAA,CAERF,QAAAA,CAASQ,KAAKC,EAAAA,mBAAAA,SAElD,CAAA,CAAA;AAEH,MAAMC,MAAAA,iBAAAA,GAAoBxB,OAAKY,SAAUa,CAAAA,IAAAA,CACtCX,cAAaA,QAASrB,CAAAA,IAAAA,KAASiC,cAASC,cAC3C,CAAA,CAAA;AAEA,MAAA,MAAMC,MAASJ,GAAAA,iBAAAA,EAAmBlB,QAASC,CAAAA,MAAAA,GAAMS,gBAAA,KAAA,EAAA;AAAA,QAAA,OAAA,EAAA,gBAAA;AAAA,OAAA,EAAA,CAAAA,eAAAA,CAAA,KAAA,EAAA;AAAA,QAAA,SAGpC,CACL,cAAA,EACA,kBACAQ,EAAAA,iBAAAA,CAAkBlB,SAASC,MAAS,GAAA,cAAA,GAAiB,EACrDU,EAAAA,SAAAA,CAAMf,cAAc,CAAGgB,EAAAA,EAAAA,KAAOM,iBAAkBN,CAAAA,EAAAA,GAC5C,cACA,EAAE,CAAA;AAAA,QACP,SAAA,EACQC,MAAMf,kBAAAA,CAAmBoB,iBAAiB,CAAA;AAAA,OAAC,EAAA,CAAAR,eAAAA,CAAA,KAAA,EAAA;AAAA,QAAA,OAAA,EAAA,qBAAA;AAAA,OAAA,EAAAA,CAAAA,eAAAA,CAAAI,eAAA,EAAA;AAAA,QAAA,aAG5BI,iBAAkBH,CAAAA,QAAAA;AAAAA,SAAQ,IAAA,CAAA,CAAA,CAAA,EAAAL,gBAAA,KAAA,EAAA;AAAA,QAAA,OAAA,EAAA,oBAAA;AAAA,OAAA,EAAA,CAEjBQ,iBAAkBF,CAAAA,KAAAA,EAAKC,8BAG1D,GAAA,IAAA,CAAA;AAEJ,MAAA,OAAAP,gBAAA,KAAA,EAAA;AAAA,QAAA,OAAA,EAAA,QAAA;AAAA,OAAA,EAAA,CAAAA,eAAAA,CAAA,KAAA,EAAA;AAAA,QAAA,OAAA,EAAA,cAAA;AAAA,OAAA,EAAA,CAAAA,eAAAA,CAAA,KAAA,EAAA;AAAA,QAAA,OAAA,EAAA,SAAA;AAAA,QAAA,OAKe,EAAA;AAAA,UAAEa,eAAAA,EAAkB,CAAMjC,IAAAA,EAAAA,WAAAA,CAAYkC,IAAK,CAAA,CAAA,CAAA;AAAA,SAAG;AAAA,SAAC,IAAA,CAAA,CAAA,CAAA,EAAAd,gBAAA,KAAA,EAAA;AAAA,QAAA,OAAA,EAAA,eAAA;AAAA,SAI9BL,CAAAA,QAAQ,IAEnCiB,MAAM,CAAA,CAAA,CAAA;AAAA,KAGb,CAAA;AAAA,GACF;AACF,CAAC;;;;"}
1	+ {"version":3,"file":"index.js","sources":["../../../../../src/layouts/components/bar/index.tsx"],"sourcesContent":["import { computed, defineComponent, unref } from \"vue\";\nimport { MKSvgIcon } from \"../../../components\";\nimport { MSAppClient, MenuNode } from \"../../../core\";\nimport { MenuType } from \"../../../constants\";\n\nexport const MKBar = defineComponent({\n name: \"MKBar\",\n props: {\n barItem: {\n type: MenuNode,\n },\n },\n setup(props) {\n const msAppClient = MSAppClient.instance!;\n const userSession = msAppClient.userSession!;\n const menu = userSession.menu;\n const vueRouter = msAppClient.vueRouter;\n // const router = userSession.router;\n\n const currentBarItem = computed(() => props.barItem);\n\n const handleBarItemClick = (barItem: MenuNode) => {\n let target: MenuNode \| null = barItem;\n\n if (barItem.children.length) {\n target = menu.getFirstLeafMenuNode(barItem.children);\n }\n\n if (!target) {\n return;\n }\n\n if (target?.route) {\n vueRouter.push({ name: target.route.name });\n }\n };\n\n return () => {\n const barItems = menu.rootMenus\n .filter((rootMenu) => rootMenu.type !== \"3\")\n .map((rootMenu) => (\n <div\n class={[\n \"mk-bar__item\",\n rootMenu.children.length ? \"has-children\" : \"\",\n unref(currentBarItem)?.id === rootMenu.id ? \"is-active\" : \"\",\n ]}\n onClick={() => handleBarItemClick(rootMenu)}\n >\n <div class=\"mk-bar__item-button\">\n <MKSvgIcon iconClass={rootMenu.iconName} />\n </div>\n <div class=\"mk-bar__item-title\">{rootMenu.title} </div>\n </div>\n ));\n\n const systemSettingNode = menu.rootMenus.find(\n (rootMenu) => rootMenu.type === MenuType.SystemSettings\n );\n\n const footer = systemSettingNode?.children.length ? (\n <div class=\"mk-bar__footer\">\n <div\n class={[\n \"mk-bar__item\",\n \"mk-bar__settings\",\n systemSettingNode.children.length ? \"has-children\" : \"\",\n unref(currentBarItem)?.id === systemSettingNode.id\n ? \"is-active\"\n : \"\",\n ]}\n onClick={() => handleBarItemClick(systemSettingNode)}\n >\n <div class=\"mk-bar__item-button\">\n <MKSvgIcon iconClass={systemSettingNode.iconName} />\n </div>\n <div class=\"mk-bar__item-title\">{systemSettingNode.title} </div>\n </div>\n </div>\n ) : null;\n\n return (\n <div class=\"mk-bar\">\n <div class=\"mk-bar__logo\">\n <div\n class=\"mk-logo\"\n style={{ backgroundImage: `url(${msAppClient.logo})` }}\n />\n </div>\n\n <div class=\"mk-bar__items\">{barItems}</div>\n\n {footer}\n </div>\n );\n };\n },\n});\n"],"names":["MKBar","defineComponent","name","props","barItem","type","MenuNode","setup","msAppClient","MSAppClient","instance","userSession","menu","vueRouter","currentBarItem","computed","handleBarItemClick","target","children","length","getFirstLeafMenuNode","route","push","barItems","rootMenus","filter","rootMenu","map","_createVNode","unref","id","onClick","MKSvgIcon","iconName","title","_createTextVNode","systemSettingNode","find","MenuType","SystemSettings","footer","backgroundImage","logo"],"mappings":"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"}

package/dist/cjs/layouts/components/menu/index.js CHANGED Viewed

@@ -27,13 +27,13 @@ const MKMenu = /* @__PURE__ */ vue.defineComponent({
     const msAppClient = MSAppClient.MSAppClient.instance;
     const userSession = msAppClient.userSession;
     const menu = userSession.menu;
-    const router = userSession.router;
+    const vueRouter = msAppClient.vueRouter;
     const currentMenuNode = vue.ref(menu.getCurrentMenuNode());
     const barItem = vue.computed(() => props.barItem);
     const handleSelect = async (id) => {
       const item = menu.findMenuNodeByID(id);
       if (item?.route) {
-        router.changeRoute({
+        vueRouter.push({
           name: item.route.name
         });
       }

package/dist/cjs/layouts/components/menu/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sources":["../../../../../src/layouts/components/menu/index.tsx"],"sourcesContent":["import { computed, defineComponent, ref, unref } from \"vue\";\nimport { ElMenu } from \"element-plus\";\nimport { MenuNode, MSAppClient } from \"../../../core\";\nimport MKAsideMenuItem from \"./menu-item\";\n\nexport const MKMenu = defineComponent({\n name: \"MKMenu\",\n props: {\n barItem: {\n type: MenuNode,\n },\n collapse: {\n type: Boolean,\n default: false,\n },\n },\n setup(props) {\n const msAppClient = MSAppClient.instance!;\n const userSession = msAppClient.userSession!;\n const menu = userSession.menu;\n const router = userSession.router;\n\n const currentMenuNode = ref(menu.getCurrentMenuNode());\n\n const barItem = computed(() => props.barItem);\n\n const handleSelect = async (id: string) => {\n const item = menu.findMenuNodeByID(id);\n\n if (item?.route) {\n ~~router~~.~~changeRoute~~({ name: item.route.name });\n }\n };\n\n menu.currentMenuChangeEvent.on(({ currentMenu }) => {\n currentMenuNode.value = currentMenu;\n });\n\n return () => {\n if (!unref(barItem)?.children.length) {\n return null;\n }\n\n const menuItems = unref(barItem)!.children.map((menu) => (\n <MKAsideMenuItem class=\"mk-menu-item\" node={menu} key={menu.id} />\n ));\n\n return (\n <div class=\"mk-menu\">\n <ElMenu\n defaultActive={unref(currentMenuNode)?.id ?? \"\"}\n onSelect={handleSelect}\n >\n {menuItems}\n </ElMenu>\n </div>\n );\n };\n },\n});\n"],"names":["_isSlot","s","Object","prototype","toString","call","_isVNode","MKMenu","defineComponent","name","props","barItem","type","MenuNode","collapse","Boolean","default","setup","msAppClient","MSAppClient","instance","userSession","menu","~~router~~","currentMenuNode","ref","getCurrentMenuNode","computed","handleSelect","id","item","findMenuNodeByID","route","~~changeRoute~~","currentMenuChangeEvent","on","currentMenu","value","unref","children","length","menuItems","map","_createVNode","MKAsideMenuItem","ElMenu"],"mappings":";;;;;;;;;;;AAG0C,SAAAA,QAAAC,CAAA,EAAA;AAAA,EAAA,OAAA,OAAAA,CAAAA,KAAA,UAAAC,IAAAA,MAAAA,CAAAC,SAAAC,CAAAA,QAAAA,CAAAC,IAAAJ,CAAAA,CAAA,CAAAK,KAAAA,iBAAAA,IAAAA,CAAAA,WAAAA,CAAAL,CAAA,CAAA,CAAA;AAAA,CAAA;AAEnC,MAAMM,yBAAyBC,mBAAA,CAAA;AAAA,EACpCC,IAAM,EAAA,QAAA;AAAA,EACNC,KAAO,EAAA;AAAA,IACLC,OAAS,EAAA;AAAA,MACPC,IAAMC,EAAAA,iBAAAA;AAAAA,KACR;AAAA,IACAC,QAAU,EAAA;AAAA,MACRF,IAAMG,EAAAA,OAAAA;AAAAA,MACNC,OAAS,EAAA,KAAA;AAAA,KACX;AAAA,GACF;AAAA,EACAC,MAAMP,KAAO,EAAA;AACX,IAAA,MAAMQ,cAAcC,uBAAYC,CAAAA,QAAAA,CAAAA;AAChC,IAAA,MAAMC,cAAcH,WAAYG,CAAAA,WAAAA,CAAAA;AAChC,IAAA,MAAMC,OAAOD,WAAYC,CAAAA,IAAAA,CAAAA;AACzB,IAAA,MAAMC,~~SAASF~~,~~WAAYE~~,CAAAA,~~MAAAA~~,CAAAA;~~AAE3B~~,IAAA,MAAMC,eAAkBC,GAAAA,OAAAA,CAAIH,IAAKI,CAAAA,kBAAAA,EAAoB,CAAA,CAAA;AAErD,IAAA,MAAMf,OAAUgB,GAAAA,YAAAA,CAAS,MAAMjB,KAAAA,CAAMC,OAAO,CAAA,CAAA;AAE5C,IAAMiB,MAAAA,YAAAA,GAAe,OAAOC,EAAe,KAAA;AACzC,MAAMC,MAAAA,IAAAA,GAAOR,IAAKS,CAAAA,gBAAAA,CAAiBF,EAAE,CAAA,CAAA;AAErC,MAAA,IAAIC,MAAME,KAAO,EAAA;AACfT,QAAAA,~~MAAAA~~,~~CAAOU~~,~~WAAY~~,CAAA;AAAA,UAAExB,IAAAA,EAAMqB,KAAKE,KAAMvB,CAAAA,IAAAA;AAAAA,SAAM,CAAA,CAAA;AAAA,~~OAC9C~~;AAAA,KACF,CAAA;AAEAa,IAAKY,IAAAA,CAAAA,sBAAAA,CAAuBC,GAAG,CAAC;AAAA,MAAEC,WAAAA;AAAAA,KAAkB,KAAA;AAClDZ,MAAAA,eAAAA,CAAgBa,KAAQD,GAAAA,WAAAA,CAAAA;AAAAA,KACzB,CAAA,CAAA;AAED,IAAA,OAAO,MAAM;AACX,MAAA,IAAI,CAACE,SAAAA,CAAM3B,OAAO,CAAA,EAAG4B,SAASC,MAAQ,EAAA;AACpC,QAAO,OAAA,IAAA,CAAA;AAAA,OACT;AAEA,MAAMC,MAAAA,SAAAA,GAAYH,UAAM3B,OAAO,CAAA,CAAG4B,SAASG,GAAKpB,CAAAA,CAAAA,KAAIqB,KAAAA,eAAAA,CAAAC,QAAA,EAAA;AAAA,QAAA,OAAA,EAAA,cAAA;AAAA,QAAA,MACNtB,EAAAA,KAAAA;AAAAA,QAAI,OAAOA,KAAKO,CAAAA,EAAAA;AAAAA,OAAE,EAAA,IAAA,CAC/D,CAAA,CAAA;AAED,MAAA,OAAAc,gBAAA,KAAA,EAAA;AAAA,QAAA,OAAA,EAAA,SAAA;AAAA,OAAA,EAAAA,CAAAA,eAAAA,CAAAE,kBAAA,EAAA;AAAA,QAAA,eAGqBP,EAAAA,SAAAA,CAAMd,eAAe,CAAA,EAAGK,EAAM,IAAA,EAAA;AAAA,QAAE,UACrCD,EAAAA,YAAAA;AAAAA,OAAY5B,EAAAA,OAAAA,CAErByC,SAAS,CAAA,GAATA,SAAS,GAAA;AAAA,QAAAzB,OAAAA,EAAAA,MAAA,CAATyB,SAAS,CAAA;AAAA,OAAA,CAAA,CAAA,CAAA,CAAA;AAAA,KAIlB,CAAA;AAAA,GACF;AACF,CAAC;;;;"}
1	+ {"version":3,"file":"index.js","sources":["../../../../../src/layouts/components/menu/index.tsx"],"sourcesContent":["import { computed, defineComponent, ref, unref } from \"vue\";\nimport { ElMenu } from \"element-plus\";\nimport { MenuNode, MSAppClient } from \"../../../core\";\nimport MKAsideMenuItem from \"./menu-item\";\n\nexport const MKMenu = defineComponent({\n name: \"MKMenu\",\n props: {\n barItem: {\n type: MenuNode,\n },\n collapse: {\n type: Boolean,\n default: false,\n },\n },\n setup(props) {\n const msAppClient = MSAppClient.instance!;\n const userSession = msAppClient.userSession!;\n const menu = userSession.menu;\n const vueRouter = msAppClient.vueRouter;\n // const router = userSession.router;\n\n const currentMenuNode = ref(menu.getCurrentMenuNode());\n\n const barItem = computed(() => props.barItem);\n\n const handleSelect = async (id: string) => {\n const item = menu.findMenuNodeByID(id);\n\n if (item?.route) {\n vueRouter.push({ name: item.route.name });\n }\n };\n\n menu.currentMenuChangeEvent.on(({ currentMenu }) => {\n currentMenuNode.value = currentMenu;\n });\n\n return () => {\n if (!unref(barItem)?.children.length) {\n return null;\n }\n\n const menuItems = unref(barItem)!.children.map((menu) => (\n <MKAsideMenuItem class=\"mk-menu-item\" node={menu} key={menu.id} />\n ));\n\n return (\n <div class=\"mk-menu\">\n <ElMenu\n defaultActive={unref(currentMenuNode)?.id ?? \"\"}\n onSelect={handleSelect}\n >\n {menuItems}\n </ElMenu>\n </div>\n );\n };\n },\n});\n"],"names":["_isSlot","s","Object","prototype","toString","call","_isVNode","MKMenu","defineComponent","name","props","barItem","type","MenuNode","collapse","Boolean","default","setup","msAppClient","MSAppClient","instance","userSession","menu","vueRouter","currentMenuNode","ref","getCurrentMenuNode","computed","handleSelect","id","item","findMenuNodeByID","route","push","currentMenuChangeEvent","on","currentMenu","value","unref","children","length","menuItems","map","_createVNode","MKAsideMenuItem","ElMenu"],"mappings":";;;;;;;;;;;AAG0C,SAAAA,QAAAC,CAAA,EAAA;AAAA,EAAA,OAAA,OAAAA,CAAAA,KAAA,UAAAC,IAAAA,MAAAA,CAAAC,SAAAC,CAAAA,QAAAA,CAAAC,IAAAJ,CAAAA,CAAA,CAAAK,KAAAA,iBAAAA,IAAAA,CAAAA,WAAAA,CAAAL,CAAA,CAAA,CAAA;AAAA,CAAA;AAEnC,MAAMM,yBAAyBC,mBAAA,CAAA;AAAA,EACpCC,IAAM,EAAA,QAAA;AAAA,EACNC,KAAO,EAAA;AAAA,IACLC,OAAS,EAAA;AAAA,MACPC,IAAMC,EAAAA,iBAAAA;AAAAA,KACR;AAAA,IACAC,QAAU,EAAA;AAAA,MACRF,IAAMG,EAAAA,OAAAA;AAAAA,MACNC,OAAS,EAAA,KAAA;AAAA,KACX;AAAA,GACF;AAAA,EACAC,MAAMP,KAAO,EAAA;AACX,IAAA,MAAMQ,cAAcC,uBAAYC,CAAAA,QAAAA,CAAAA;AAChC,IAAA,MAAMC,cAAcH,WAAYG,CAAAA,WAAAA,CAAAA;AAChC,IAAA,MAAMC,OAAOD,WAAYC,CAAAA,IAAAA,CAAAA;AACzB,IAAA,MAAMC,YAAYL,WAAYK,CAAAA,SAAAA,CAAAA;AAG9B,IAAA,MAAMC,eAAkBC,GAAAA,OAAAA,CAAIH,IAAKI,CAAAA,kBAAAA,EAAoB,CAAA,CAAA;AAErD,IAAA,MAAMf,OAAUgB,GAAAA,YAAAA,CAAS,MAAMjB,KAAAA,CAAMC,OAAO,CAAA,CAAA;AAE5C,IAAMiB,MAAAA,YAAAA,GAAe,OAAOC,EAAe,KAAA;AACzC,MAAMC,MAAAA,IAAAA,GAAOR,IAAKS,CAAAA,gBAAAA,CAAiBF,EAAE,CAAA,CAAA;AAErC,MAAA,IAAIC,MAAME,KAAO,EAAA;AACfT,QAAAA,SAAAA,CAAUU,IAAK,CAAA;AAAA,UAAExB,IAAAA,EAAMqB,KAAKE,KAAMvB,CAAAA,IAAAA;AAAAA,SAAM,CAAA,CAAA;AAAA,OAC1C;AAAA,KACF,CAAA;AAEAa,IAAKY,IAAAA,CAAAA,sBAAAA,CAAuBC,GAAG,CAAC;AAAA,MAAEC,WAAAA;AAAAA,KAAkB,KAAA;AAClDZ,MAAAA,eAAAA,CAAgBa,KAAQD,GAAAA,WAAAA,CAAAA;AAAAA,KACzB,CAAA,CAAA;AAED,IAAA,OAAO,MAAM;AACX,MAAA,IAAI,CAACE,SAAAA,CAAM3B,OAAO,CAAA,EAAG4B,SAASC,MAAQ,EAAA;AACpC,QAAO,OAAA,IAAA,CAAA;AAAA,OACT;AAEA,MAAMC,MAAAA,SAAAA,GAAYH,UAAM3B,OAAO,CAAA,CAAG4B,SAASG,GAAKpB,CAAAA,CAAAA,KAAIqB,KAAAA,eAAAA,CAAAC,QAAA,EAAA;AAAA,QAAA,OAAA,EAAA,cAAA;AAAA,QAAA,MACNtB,EAAAA,KAAAA;AAAAA,QAAI,OAAOA,KAAKO,CAAAA,EAAAA;AAAAA,OAAE,EAAA,IAAA,CAC/D,CAAA,CAAA;AAED,MAAA,OAAAc,gBAAA,KAAA,EAAA;AAAA,QAAA,OAAA,EAAA,SAAA;AAAA,OAAA,EAAAA,CAAAA,eAAAA,CAAAE,kBAAA,EAAA;AAAA,QAAA,eAGqBP,EAAAA,SAAAA,CAAMd,eAAe,CAAA,EAAGK,EAAM,IAAA,EAAA;AAAA,QAAE,UACrCD,EAAAA,YAAAA;AAAAA,OAAY5B,EAAAA,OAAAA,CAErByC,SAAS,CAAA,GAATA,SAAS,GAAA;AAAA,QAAAzB,OAAAA,EAAAA,MAAA,CAATyB,SAAS,CAAA;AAAA,OAAA,CAAA,CAAA,CAAA,CAAA;AAAA,KAIlB,CAAA;AAAA,GACF;AACF,CAAC;;;;"}

package/dist/cjs/page/index/dv/ms-member/index.vue2.js CHANGED Viewed

@@ -8,35 +8,77 @@ var DataModelDefines = require('../../../../core/DataModelDefines.js');
 require('vue-router');
 require('@maketribe/request');
 require('@maketribe/locale');
+var index = require('../../../../components/data-model/data-form/index.js');
+require('../../../../components/data-model/data-form-page/index.js');
+require('../../../../components/data-model/data-table/index.js');
+require('../../../../components/data-model/data-table-page/index.js');
+require('../../../../components/data-model/data-table-pagination/index.js');
+require('../../../../components/form-components/form-data-select/index.js');
+require('../../../../components/form-components/form-icon-select/index.js');
+require('../../../../components/form-components/form-radio-box/index.js');
+require('../../../../components/form-components/form-detail/index.js');
+require('../../../../components/form-components/form-data-table-select/index.js');
+require('../../../../components/form-components/form-image-upload/index.js');
+require('../../../../components/data-table-select/index.js');
+require('../../../../components/form-components/form-detail-select/form-detail-select-options.js');
+require('../../../../components/data-model/data-form/composables/use-form-item.js');
+require('lodash-es');
+require('../../../../components/form-components/form-image-list/index.js');
+require('../../../../components/form-components/form-date-picker/index.js');
+require('../../../../components/form-components/form-rich-text-editor/index.js');
+require('../../../../components/column-components/column-action/column-action-options.js');
+require('../../../../components/svg-icon/index.js');
+require('../../../../components/button/button-options.js');
+require('../../../../components/data-model/data-table/composables/use-column.js');
+require('../../../../components/column-components/column-image/column-image-options.js');
+require('../../../../components/image-view/index.js');
+require('../../../../components/column-components/column-text/column-text-options.js');
+require('../../../../components/column-components/column-object-mapping-text/column-object-mapping-text-options.js');
+require('../../../../components/column-components/column-select/column-select-options.js');
+require('../../../../components/column-components/column-select/column-select-header-options.js');
+require('../../../../components/column-components/column-json/index.js');
+require('../../../../components/condition-components/condition-input/index.js');
+require('../../../../components/condition-components/condition-date/index.js');
+require('../../../../components/condition-components/condition-number/index.js');
+require('../../../../components/condition-components/condition-select/index.js');
+require('../../../../components/config-provider/index.js');
+require('../../../../components/video-view/index.js');
+require('../../../../components/file-view/index.js');
+require('../../../../components/upload-file/index.js');
+require('../../../../components/data-table-select-dialog/index.js');
+require('../../../../components/data-select/index.js');
+require('../../../../components/upload-image/upload-image-options.js');
+require('../../../../components/pagination/index.js');
+require('../../../../components/markdown-editor/index.js');
+require('../../../../components/rich-text-editor/index.js');
+require('../../../../components/system-provider/index.js');
+require('../../../../components/material-list/index.js');
+require('../../../../components/material-select/index.js');
+require('../../../../components/role-permission-config/index.js');
+require('../../../../components/image-select/index.js');
+require('../../../../components/verify-dialog/index.js');
+require('../../../../components/json-editor/index.js');
 var normal = require('../default/single/list/normal.vue.js');
 var _sfc_main = /* @__PURE__ */ vue.defineComponent({
   __name: "index",
   setup(__props) {
-    const isShowActiveMemberForm = vue.ref(false);
     const memberTable = vue.reactive(
       DataModelDefines.DataModelDefines.instance.getDataTable("ms-member")
     );
     const activeMemberForm = vue.computed(() => memberTable.activeMemberForm);
-    memberTable.activeMemberEvent.on(async (member) => {
-      memberTable.activeMemberForm.getLoadingManager().startLoading();
-      await memberTable.activeMemberForm.editRecord(member.id);
-      memberTable.activeMemberForm.getLoadingManager().completeLoading();
-      isShowActiveMemberForm.value = true;
-    });
     const handleActiveMemberConfirm = async () => {
       memberTable.approveMember();
     };
     return (_ctx, _cache) => {
-      const _component_MKDataForm = vue.resolveComponent("MKDataForm");
       return vue.openBlock(), vue.createElementBlock(
         vue.Fragment,
         null,
         [
           vue.createVNode(normal, { "data-table": memberTable }, null, 8, ["data-table"]),
           vue.createVNode(vue.unref(elementPlus.ElDialog), {
-            modelValue: isShowActiveMemberForm.value,
-            "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => isShowActiveMemberForm.value = $event),
+            modelValue: memberTable.isShowActiveMemberForm,
+            "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => memberTable.isShowActiveMemberForm = $event),
             class: "dialogClass"
           }, {
             footer: vue.withCtx(() => [
@@ -52,7 +94,7 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
               })
             ]),
             default: vue.withCtx(() => [
-              vue.createVNode(_component_MKDataForm, { "data-form": activeMemberForm.value }, null, 8, ["data-form"])
+              vue.createVNode(vue.unref(index.MKDataForm), { "data-form": activeMemberForm.value }, null, 8, ["data-form"])
             ]),
             _: 1
             /* STABLE */

package/dist/cjs/page/index/dv/ms-member/index.vue2.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.vue2.js","sources":["../../../../../../src/page/index/dv/ms-member/index.vue"],"sourcesContent":["<template>\n <DefaultSingleListPage :data-table=\"memberTable\" />\n\n <ElDialog v-model=\"isShowActiveMemberForm\" class=\"dialogClass\">\n <MKDataForm :data-form=\"activeMemberForm\" />\n <template #footer>\n <ElButton @click=\"handleActiveMemberConfirm\" type=\"primary\">\n 确定\n </ElButton>\n </template>\n </ElDialog>\n</template>\n\n<script setup lang=\"ts\">\nimport { computed, reactive, ~~ref~~ } from \"vue\";\nimport { ElButton, ElDialog } from \"element-plus\";\nimport { DataModelDefines } from \"../../../../core\";\nimport { MemberTable } from \"../../../../dataview\";\nimport DefaultSingleListPage from \"../default/single/list/normal.vue\";\n\nconst ~~isShowActiveMemberForm = ref(false);\n\nconst~~ memberTable = reactive(\n DataModelDefines.instance.getDataTable(\"ms-member\")!\n) as MemberTable;\nconst activeMemberForm = computed(() => memberTable.activeMemberForm);\n\nmemberTable.activeMemberEvent.on(async (member) => {\n memberTable.activeMemberForm.getLoadingManager().startLoading();\n await memberTable.activeMemberForm.editRecord(member.id);\n memberTable.activeMemberForm.getLoadingManager().completeLoading();\n isShowActiveMemberForm.value = true;\n});\n\nconst handleActiveMemberConfirm = async () => {\n memberTable.approveMember();\n};\n</script>\n"],"names":["~~ref","~~reactive","DataModelDefines","computed"],"mappings":"~~;;;;;;;;;;;;;;;AAoBA~~,~~IAAM,MAAA,sBAAA,GAAyBA,QAAI,KAAK,CAAA,CAAA;AAExC,~~IAAA,MAAM,WAAc,~~GAAAC~~,YAAA;AAAA,MAClBC,iCAAA,CAAiB,QAAS,CAAA,YAAA,CAAa,WAAW,CAAA;AAAA,KACpD,CAAA;AACA,IAAA,MAAM,gBAAmB,GAAAC,YAAA,CAAS,MAAM,WAAA,CAAY,gBAAgB,CAAA,CAAA;AAEpE,IAAY,WAAA,CAAA,iBAAA,CAAkB,EAAG,CAAA,OAAO,MAAW,KAAA;AACjD,MAAY,WAAA,CAAA,gBAAA,CAAiB,iBAAkB,EAAA,CAAE,YAAa,EAAA,CAAA;AAC9D,MAAA,MAAM,WAAY,CAAA,gBAAA,CAAiB,UAAW,CAAA,MAAA,CAAO,EAAE,CAAA,CAAA;AACvD,MAAY,WAAA,CAAA,gBAAA,CAAiB,iBAAkB,EAAA,CAAE,eAAgB,EAAA,CAAA;AACjE,MAAA,sBAAA,CAAuB,KAAQ,GAAA,IAAA,~~CAAA;AAAA,KAChC,CAAA,CAAA;AAED,IAAA,~~MAAM,4BAA4B,YAAY;AAC5C,MAAA,WAAA,CAAY,aAAc,EAAA,CAAA;AAAA,KAC5B,CAAA~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;~~"}
1	+ {"version":3,"file":"index.vue2.js","sources":["../../../../../../src/page/index/dv/ms-member/index.vue"],"sourcesContent":["<template>\n <DefaultSingleListPage :data-table=\"memberTable\" />\n\n <ElDialog v-model=\"memberTable.isShowActiveMemberForm\" class=\"dialogClass\">\n <MKDataForm :data-form=\"activeMemberForm\" />\n <template #footer>\n <ElButton @click=\"handleActiveMemberConfirm\" type=\"primary\">\n 确定\n </ElButton>\n </template>\n </ElDialog>\n</template>\n\n<script setup lang=\"ts\">\nimport { computed, reactive } from \"vue\";\nimport { ElButton, ElDialog } from \"element-plus\";\nimport { DataModelDefines } from \"../../../../core\";\nimport { MKDataForm } from \"../../../../components\";\nimport { MemberTable } from \"../../../../dataview\";\nimport DefaultSingleListPage from \"../default/single/list/normal.vue\";\n\nconst memberTable = reactive(\n DataModelDefines.instance.getDataTable(\"ms-member\")!\n) as MemberTable;\nconst activeMemberForm = computed(() => memberTable.activeMemberForm);\n\nconst handleActiveMemberConfirm = async () => {\n memberTable.approveMember();\n};\n</script>\n"],"names":["reactive","DataModelDefines","computed"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAqBA,IAAA,MAAM,WAAc,GAAAA,YAAA;AAAA,MAClBC,iCAAA,CAAiB,QAAS,CAAA,YAAA,CAAa,WAAW,CAAA;AAAA,KACpD,CAAA;AACA,IAAA,MAAM,gBAAmB,GAAAC,YAAA,CAAS,MAAM,WAAA,CAAY,gBAAgB,CAAA,CAAA;AAEpE,IAAA,MAAM,4BAA4B,YAAY;AAC5C,MAAA,WAAA,CAAY,aAAc,EAAA,CAAA;AAAA,KAC5B,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/cjs/router-middleware/auth.js CHANGED Viewed

@@ -1,7 +1,5 @@
 'use strict';
-var utils = require('@maketribe/utils');
 const authBeforeEach = async (msAppClient, to, from) => {
   if (to.meta.isAuthorization === false) {
     return;
@@ -19,23 +17,6 @@ const authBeforeEach = async (msAppClient, to, from) => {
       return { name: "login" };
     }
   }
-  const tabs = userSession.tabs;
-  const router = userSession.router;
-  const route = router.getRouteByName(to.name);
-  if (!route) {
-    return;
-  }
-  const matched = to.matched[to.matched.length - 1];
-  if (matched) {
-    if (!utils.isSameRoute(router.currentRoute, to)) {
-      router.changeRoute(to);
-    }
-    const tab = tabs.getTabByID(to.name);
-    if (tab) {
-      tab.affix = matched.meta.affix;
-      tab.realRoute = to;
-    }
-  }
 };
 exports.authBeforeEach = authBeforeEach;

package/dist/cjs/router-middleware/auth.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"auth.js","sources":["../../../src/router-middleware/auth.ts"],"sourcesContent":["import { RouteLocationNormalized, RouteLocationRaw } from \"vue-router\";\nimport { isSameRoute } from \"@maketribe/utils\";\nimport type { MSAppClient } from \"../core\";\n\nexport const authBeforeEach = async (\n msAppClient: MSAppClient,\n to: RouteLocationNormalized,\n from: RouteLocationNormalized\n): Promise<RouteLocationRaw \| void> => {\n if (to.meta.isAuthorization === false) {\n return;\n }\n\n let userSession = msAppClient.userSession;\n\n if (!userSession) {\n try {\n await msAppClient.loadCurrentUserSession();\n\n userSession = msAppClient.userSession;\n\n if (!userSession) {\n return { name: \"login\" };\n }\n\n // 因为登陆成功会添加用户可以访问的路由，这里给到vue-router去重新resolve\n return { ...to };\n } catch (e) {\n return { name: \"login\" };\n }\n }\n~~\n const tabs = userSession.tabs;\n const router = userSession.router;\n\n const route = router.getRouteByName(to.name as string);\n\n if (!route) {\n // return { name: \"notFound\"~~ };\n ~~// // 前往第一个菜单\n // const menuNode = userSession.menu.getFirstLeafMenuNode();\n\n // if (!menuNode \|\| !menuNode.route) {\n // return { name: \~~"~~login\" };\n // }\n\n // // return { name: menuNode.route.name };\n // return to;\n\n return;\n }\n\n const matched = to.matched[to.matched.length - 1~~]~~;\n\n if (matched) {\n if (!isSameRoute(router.currentRoute~~, to)) {\n router.changeRoute(to);\n }\n\n const tab = tabs.getTabByID(to.name as string);\n\n if (tab) {\n tab.affix = matched.meta.affix as boolean;\n tab.realRoute = to;\n }\n }\n};\n"~~],"~~names":[~~"isSameRoute"~~],"mappings":"~~;;;;~~AAIO,MAAM,cAAiB,GAAA,OAC5B,WACA,EAAA,EAAA,EACA,IACqC,KAAA;AACrC,EAAI,IAAA,EAAA,CAAG,IAAK,CAAA,eAAA,KAAoB,KAAO,EAAA;AACrC,IAAA,OAAA;AAAA,GACF;AAEA,EAAA,IAAI,cAAc,WAAY,CAAA,WAAA,CAAA;AAE9B,EAAA,IAAI,CAAC,WAAa,EAAA;AAChB,IAAI,IAAA;AACF,MAAA,MAAM,YAAY,sBAAuB,EAAA,CAAA;AAEzC,MAAA,WAAA,GAAc,WAAY,CAAA,WAAA,CAAA;AAE1B,MAAA,IAAI,CAAC,WAAa,EAAA;AAChB,QAAO,OAAA,EAAE,MAAM,OAAQ,EAAA,CAAA;AAAA,OACzB;AAGA,MAAO,OAAA,EAAE,GAAG,EAAG,EAAA,CAAA;AAAA,aACR,CAAG,EAAA;AACV,MAAO,OAAA,EAAE,MAAM,OAAQ,EAAA,CAAA;AAAA,KACzB;AAAA,GACF;AAEA,EAAA,MAAM,OAAO,WAAY,CAAA,IAAA,CAAA;AACzB,EAAA,MAAM,SAAS,WAAY,CAAA,MAAA,CAAA;AAE3B,EAAA,MAAM,KAAQ,GAAA,MAAA,CAAO,cAAe,CAAA,EAAA,CAAG,IAAc,CAAA,CAAA;AAErD,EAAA,IAAI,CAAC,KAAO,EAAA;AAYV,IAAA,OAAA;AAAA,GACF;AAEA,EAAA,MAAM,UAAU,EAAG,CAAA,OAAA,CAAQ,EAAG,CAAA,OAAA,CAAQ,SAAS,CAAC,CAAA,CAAA;AAEhD,EAAA,IAAI,OAAS,EAAA;AACX,IAAA,IAAI,CAACA,iBAAA,CAAY,MAAO,CAAA,YAAA,EAAc,EAAE,CAAG,EAAA;AACzC,MAAA,MAAA,CAAO,YAAY,EAAE,CAAA,CAAA;AAAA,KACvB;AAEA,IAAA,MAAM,GAAM,GAAA,IAAA,CAAK,UAAW,CAAA,EAAA,CAAG,IAAc,CAAA,CAAA;AAE7C,IAAA,IAAI,GAAK,EAAA;AACP,MAAI,GAAA,CAAA,KAAA,GAAQ,QAAQ,IAAK,CAAA,KAAA,CAAA;AACzB,MAAA,GAAA,CAAI,SAAY,GAAA,EAAA,CAAA;AAAA,KAClB;AAAA,GACF;AACF;;;;"}
1	+ {"version":3,"file":"auth.js","sources":["../../../src/router-middleware/auth.ts"],"sourcesContent":["import { RouteLocationNormalized, RouteLocationRaw } from \"vue-router\";\nimport { isSameRoute } from \"@maketribe/utils\";\nimport type { MSAppClient } from \"../core\";\n\nexport const authBeforeEach = async (\n msAppClient: MSAppClient,\n to: RouteLocationNormalized,\n from: RouteLocationNormalized\n): Promise<RouteLocationRaw \| void> => {\n if (to.meta.isAuthorization === false) {\n return;\n }\n\n let userSession = msAppClient.userSession;\n\n if (!userSession) {\n try {\n await msAppClient.loadCurrentUserSession();\n\n userSession = msAppClient.userSession;\n\n if (!userSession) {\n return { name: \"login\" };\n }\n\n // 因为登陆成功会添加用户可以访问的路由，这里给到vue-router去重新resolve\n return { ...to };\n } catch (e) {\n return { name: \"login\" };\n }\n }\n};\n"],"names":[],"mappings":";;AAIO,MAAM,cAAiB,GAAA,OAC5B,WACA,EAAA,EAAA,EACA,IACqC,KAAA;AACrC,EAAI,IAAA,EAAA,CAAG,IAAK,CAAA,eAAA,KAAoB,KAAO,EAAA;AACrC,IAAA,OAAA;AAAA,GACF;AAEA,EAAA,IAAI,cAAc,WAAY,CAAA,WAAA,CAAA;AAE9B,EAAA,IAAI,CAAC,WAAa,EAAA;AAChB,IAAI,IAAA;AACF,MAAA,MAAM,YAAY,sBAAuB,EAAA,CAAA;AAEzC,MAAA,WAAA,GAAc,WAAY,CAAA,WAAA,CAAA;AAE1B,MAAA,IAAI,CAAC,WAAa,EAAA;AAChB,QAAO,OAAA,EAAE,MAAM,OAAQ,EAAA,CAAA;AAAA,OACzB;AAGA,MAAO,OAAA,EAAE,GAAG,EAAG,EAAA,CAAA;AAAA,aACR,CAAG,EAAA;AACV,MAAO,OAAA,EAAE,MAAM,OAAQ,EAAA,CAAA;AAAA,KACzB;AAAA,GACF;AACF;;;;"}

package/dist/esm/components/data-model/data-filter-form/composables/use-condition.js CHANGED Viewed

@@ -24,20 +24,20 @@ function useDataFilterCondition(options) {
     () => unref(currentOperator.value) === BETWEEN_OPTION.value
   );
   const currentOperator = computed(() => dataFilterItem.currentOperator);
-  watch(
-    currentOperator,
-    () => {
-      const defaultValue = options.defaultValue;
-      if (unref(isBetween)) {
-        dataFilterItem.column.defaultValue = [defaultValue, defaultValue];
-        value.value = [defaultValue, defaultValue];
-        return;
-      }
-      dataFilterItem.column.defaultValue = defaultValue;
-      value.value = defaultValue;
-    },
-    { immediate: true }
-  );
+  const calcDefaultValue = () => {
+    const defaultValue = options.defaultValue;
+    if (unref(isBetween)) {
+      return [defaultValue, defaultValue];
+    }
+    return defaultValue;
+  };
+  watch(currentOperator, () => {
+    const defaultValue = calcDefaultValue();
+    dataFilterItem.column.defaultValue = defaultValue;
+    value.value = defaultValue;
+  });
+  dataFilterItem.column.defaultValue = calcDefaultValue();
+  value.value = dataFilterItem.getValue() || calcDefaultValue();
   return {
     isBetween,
     dataFilterItem,

package/dist/esm/components/data-model/data-filter-form/composables/use-condition.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"use-condition.js","sources":["../../../../../../src/components/data-model/data-filter-form/composables/use-condition.ts"],"sourcesContent":["import { computed, inject, unref, watch } from \"vue\";\nimport { buildProps } from \"@maketribe/utils\";\nimport { Operator } from \"@maketribe/dm\";\n\nimport { BETWEEN_OPTION, OperatorOption } from \"../operator-options\";\nimport { DATA_FILTER_ITEM_CONTEXT } from \"../token\";\n\nexport const dataFilterConditionProps = buildProps({\n defaultValue: {\n default: null,\n },\n} as const);\n\nexport type DataFilterConditionOptions = {\n operator: Operator;\n operatorOptions: OperatorOption[];\n defaultValue: any;\n};\n\nexport function useDataFilterCondition(options: DataFilterConditionOptions) {\n const dataFilterItemContext = inject(DATA_FILTER_ITEM_CONTEXT)!;\n const dataFilterItem = dataFilterItemContext.dataFilterItem;\n\n dataFilterItem.setOperatorOptions(options.operatorOptions);\n\n dataFilterItem.setOperator(options.operator);\n if (options.defaultValue !== void 0) {\n dataFilterItem.column.defaultValue = options.defaultValue;\n }\n\n const value = computed({\n get: () => dataFilterItem.getValue(),\n set: (v: any) => dataFilterItem.setValue(v === \"\" ? null : v),\n });\n\n const isBetween = computed(\n () => unref(currentOperator.value) === BETWEEN_OPTION.value\n );\n\n const currentOperator = computed(() => dataFilterItem.currentOperator);\n\n ~~watch~~(~~\n currentOperator,\n (~~) => {\n const defaultValue = options.defaultValue;\n\n if (unref(isBetween)) {\n ~~dataFilterItem.column.defaultValue~~ = [defaultValue, defaultValue];\n ~~value.value~~ ~~= [~~defaultValue~~, defaultValue]~~;\n ~~return~~;\n }\n\n dataFilterItem.column.defaultValue = defaultValue;\n value.value = defaultValue;\n },\n { ~~immediate:~~ ~~true }\~~n );\n\n return {\n isBetween,\n dataFilterItem,\n currentOperator,\n value,\n };\n}\n"],"names":[],"mappings":";;;;;AAOO,MAAM,2BAA2B,UAAW,CAAA;AAAA,EACjD,YAAc,EAAA;AAAA,IACZ,OAAS,EAAA,IAAA;AAAA,GACX;AACF,CAAU,EAAA;AAQH,SAAS,uBAAuB,OAAqC,EAAA;AAC1E,EAAM,MAAA,qBAAA,GAAwB,OAAO,wBAAwB,CAAA,CAAA;AAC7D,EAAA,MAAM,iBAAiB,qBAAsB,CAAA,cAAA,CAAA;AAE7C,EAAe,cAAA,CAAA,kBAAA,CAAmB,QAAQ,eAAe,CAAA,CAAA;AAEzD,EAAe,cAAA,CAAA,WAAA,CAAY,QAAQ,QAAQ,CAAA,CAAA;AAC3C,EAAI,IAAA,OAAA,CAAQ,iBAAiB,KAAQ,CAAA,EAAA;AACnC,IAAe,cAAA,CAAA,MAAA,CAAO,eAAe,OAAQ,CAAA,YAAA,CAAA;AAAA,GAC/C;AAEA,EAAA,MAAM,QAAQ,QAAS,CAAA;AAAA,IACrB,GAAA,EAAK,MAAM,cAAA,CAAe,QAAS,EAAA;AAAA,IACnC,GAAA,EAAK,CAAC,CAAW,KAAA,cAAA,CAAe,SAAS,CAAM,KAAA,EAAA,GAAK,OAAO,CAAC,CAAA;AAAA,GAC7D,CAAA,CAAA;AAED,EAAA,MAAM,SAAY,GAAA,QAAA;AAAA,IAChB,MAAM,KAAA,CAAM,eAAgB,CAAA,KAAK,MAAM,cAAe,CAAA,KAAA;AAAA,GACxD,CAAA;AAEA,EAAA,MAAM,eAAkB,GAAA,QAAA,CAAS,MAAM,cAAA,CAAe,eAAe,CAAA,CAAA;AAErE,EAAA,~~KAAA;AAAA~~,~~IACE~~,~~eAAA;AAAA,IACA,~~MAAM;~~AACJ~~,~~MAAA~~,MAAM,eAAe,OAAQ,CAAA,YAAA,CAAA;AAE7B,~~MAAI~~,IAAA,KAAA,CAAM,SAAS,CAAG,EAAA;AACpB,~~QAAA~~,~~cAAA~~,~~CAAe~~,~~MAAO~~,CAAA,~~YAAA~~,~~GAAe~~,~~CAAC~~,YAAA,~~EAAc~~,~~YAAY~~,CAAA~~,CAAA~~;~~AAChE~~,~~QAAM~~,KAAA,~~CAAA~~,~~KAAA~~,~~GAAQ~~,~~CAAC~~,~~YAAA~~,~~EAAc~~,~~YAAY~~,~~CAAA~~,CAAA;~~AACzC~~,~~QAAA~~,~~OAAA;AAAA,OACF;AAEA,MAAA,~~cAAA,CAAe,OAAO,YAAe,GAAA,YAAA,CAAA;AACrC,~~MAAA~~,KAAA,CAAM,KAAQ,GAAA,YAAA,CAAA;AAAA,~~KAChB~~;~~AAAA~~,~~IACA~~,~~EAAE~~,~~WAAW~~,~~IAAK~~,EAAA;~~AAAA~~,~~GACpB~~,CAAA;~~AAEA~~,EAAO,OAAA;AAAA,IACL,SAAA;AAAA,IACA,cAAA;AAAA,IACA,eAAA;AAAA,IACA,KAAA;AAAA,GACF,CAAA;AACF;;;;"}
1	+ {"version":3,"file":"use-condition.js","sources":["../../../../../../src/components/data-model/data-filter-form/composables/use-condition.ts"],"sourcesContent":["import { computed, inject, unref, watch } from \"vue\";\nimport { buildProps } from \"@maketribe/utils\";\nimport { Operator } from \"@maketribe/dm\";\n\nimport { BETWEEN_OPTION, OperatorOption } from \"../operator-options\";\nimport { DATA_FILTER_ITEM_CONTEXT } from \"../token\";\n\nexport const dataFilterConditionProps = buildProps({\n defaultValue: {\n default: null,\n },\n} as const);\n\nexport type DataFilterConditionOptions = {\n operator: Operator;\n operatorOptions: OperatorOption[];\n defaultValue: any;\n};\n\nexport function useDataFilterCondition(options: DataFilterConditionOptions) {\n const dataFilterItemContext = inject(DATA_FILTER_ITEM_CONTEXT)!;\n const dataFilterItem = dataFilterItemContext.dataFilterItem;\n\n dataFilterItem.setOperatorOptions(options.operatorOptions);\n\n dataFilterItem.setOperator(options.operator);\n if (options.defaultValue !== void 0) {\n dataFilterItem.column.defaultValue = options.defaultValue;\n }\n\n const value = computed({\n get: () => dataFilterItem.getValue(),\n set: (v: any) => dataFilterItem.setValue(v === \"\" ? null : v),\n });\n\n const isBetween = computed(\n () => unref(currentOperator.value) === BETWEEN_OPTION.value\n );\n\n const currentOperator = computed(() => dataFilterItem.currentOperator);\n\n const calcDefaultValue = () => {\n const defaultValue = options.defaultValue;\n\n if (unref(isBetween)) {\n return [defaultValue, defaultValue];\n }\n\n return defaultValue;\n };\n\n watch(currentOperator, () => {\n const defaultValue = calcDefaultValue();\n\n dataFilterItem.column.defaultValue = defaultValue;\n value.value = defaultValue;\n });\n\n dataFilterItem.column.defaultValue = calcDefaultValue();\n value.value = dataFilterItem.getValue() \|\| calcDefaultValue();\n\n return {\n isBetween,\n dataFilterItem,\n currentOperator,\n value,\n };\n}\n"],"names":[],"mappings":";;;;;AAOO,MAAM,2BAA2B,UAAW,CAAA;AAAA,EACjD,YAAc,EAAA;AAAA,IACZ,OAAS,EAAA,IAAA;AAAA,GACX;AACF,CAAU,EAAA;AAQH,SAAS,uBAAuB,OAAqC,EAAA;AAC1E,EAAM,MAAA,qBAAA,GAAwB,OAAO,wBAAwB,CAAA,CAAA;AAC7D,EAAA,MAAM,iBAAiB,qBAAsB,CAAA,cAAA,CAAA;AAE7C,EAAe,cAAA,CAAA,kBAAA,CAAmB,QAAQ,eAAe,CAAA,CAAA;AAEzD,EAAe,cAAA,CAAA,WAAA,CAAY,QAAQ,QAAQ,CAAA,CAAA;AAC3C,EAAI,IAAA,OAAA,CAAQ,iBAAiB,KAAQ,CAAA,EAAA;AACnC,IAAe,cAAA,CAAA,MAAA,CAAO,eAAe,OAAQ,CAAA,YAAA,CAAA;AAAA,GAC/C;AAEA,EAAA,MAAM,QAAQ,QAAS,CAAA;AAAA,IACrB,GAAA,EAAK,MAAM,cAAA,CAAe,QAAS,EAAA;AAAA,IACnC,GAAA,EAAK,CAAC,CAAW,KAAA,cAAA,CAAe,SAAS,CAAM,KAAA,EAAA,GAAK,OAAO,CAAC,CAAA;AAAA,GAC7D,CAAA,CAAA;AAED,EAAA,MAAM,SAAY,GAAA,QAAA;AAAA,IAChB,MAAM,KAAA,CAAM,eAAgB,CAAA,KAAK,MAAM,cAAe,CAAA,KAAA;AAAA,GACxD,CAAA;AAEA,EAAA,MAAM,eAAkB,GAAA,QAAA,CAAS,MAAM,cAAA,CAAe,eAAe,CAAA,CAAA;AAErE,EAAA,MAAM,mBAAmB,MAAM;AAC7B,IAAA,MAAM,eAAe,OAAQ,CAAA,YAAA,CAAA;AAE7B,IAAI,IAAA,KAAA,CAAM,SAAS,CAAG,EAAA;AACpB,MAAO,OAAA,CAAC,cAAc,YAAY,CAAA,CAAA;AAAA,KACpC;AAEA,IAAO,OAAA,YAAA,CAAA;AAAA,GACT,CAAA;AAEA,EAAA,KAAA,CAAM,iBAAiB,MAAM;AAC3B,IAAA,MAAM,eAAe,gBAAiB,EAAA,CAAA;AAEtC,IAAA,cAAA,CAAe,OAAO,YAAe,GAAA,YAAA,CAAA;AACrC,IAAA,KAAA,CAAM,KAAQ,GAAA,YAAA,CAAA;AAAA,GACf,CAAA,CAAA;AAED,EAAe,cAAA,CAAA,MAAA,CAAO,eAAe,gBAAiB,EAAA,CAAA;AACtD,EAAA,KAAA,CAAM,KAAQ,GAAA,cAAA,CAAe,QAAS,EAAA,IAAK,gBAAiB,EAAA,CAAA;AAE5D,EAAO,OAAA;AAAA,IACL,SAAA;AAAA,IACA,cAAA;AAAA,IACA,eAAA;AAAA,IACA,KAAA;AAAA,GACF,CAAA;AACF;;;;"}

package/dist/esm/components/data-model/data-filter-form/data-filter-form-item/data-filter-form-item.js CHANGED Viewed

@@ -112,7 +112,7 @@ var DataFilterFormItem = /* @__PURE__ */ defineComponent({
       }, _isSlot(options) ? options : {
         default: () => [options]
       }) : null;
-      const labelWidth = computed(() => 100);
+      const labelWidth = computed(() => dataFilterContext.labelWidth);
       return createVNode("div", {
         "class": "mk-data-filter-form-item"
       }, [createVNode("div", {

package/dist/esm/components/data-model/data-filter-form/data-filter-form-item/data-filter-form-item.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"data-filter-form-item.js","sources":["../../../../../../src/components/data-model/data-filter-form/data-filter-form-item/data-filter-form-item.tsx"],"sourcesContent":["import {\n computed,\n defineComponent,\n inject,\n onBeforeUnmount,\n provide,\n reactive,\n toRaw,\n unref,\n} from \"vue\";\nimport { DataFilter, FilterColumn, isWhereFilter } from \"@maketribe/dm\";\nimport { useFilterColumnComponent, useI18n } from \"../../../../composables\";\nimport { dataFilterFormItemProps } from \"./data-filter-form-item-options\";\nimport {\n DATA_FILTER_CONTEXT,\n DATA_FILTER_ITEM_CONTEXT,\n DataFilterItem,\n DataFilterItemContext,\n} from \"../token\";\nimport { OperatorOption } from \"../operator-options\";\nimport { ElOption, ElSelect, ElTooltip } from \"element-plus\";\n\nexport default defineComponent({\n name: \"MKDataFilterFormItem\",\n props: dataFilterFormItemProps,\n setup(props, { slots }) {\n const i18n = useI18n()!;\n\n const dataFilterContext = inject(DATA_FILTER_CONTEXT)!;\n\n const dataFilter = computed(() => dataFilterContext.dataFilter);\n\n let _filterColumn: FilterColumn \| null = null;\n\n const createFilterColumn = () => {\n _filterColumn = reactive(\n new FilterColumn({\n name: props.name!,\n label: props.label!,\n })\n );\n\n unref(dataFilter).addColumn(_filterColumn);\n\n return _filterColumn;\n };\n\n const filterColumn = computed(() => {\n const existingColumn = unref(dataFilter).getColumn(props.name) ?? null;\n\n if (existingColumn) {\n return existingColumn;\n }\n\n if (!_filterColumn) {\n _filterColumn = createFilterColumn();\n }\n\n return _filterColumn;\n });\n\n const { component, componentProps } = useFilterColumnComponent(\n filterColumn,\n dataFilter\n );\n\n const createDataFilterItem = (\n dataFilter: DataFilter,\n column: FilterColumn\n ) => {\n function setOperator(\n this: DataFilterItem,\n operator: OperatorOption[\"value\"]\n ) {\n const _dataFilter = unref(dataFilter);\n if (isWhereFilter(_dataFilter)) {\n this.currentOperator = operator;\n _dataFilter.setParamOperator(unref(column).name, operator);\n }\n }\n\n function setOperatorOptions(\n this: DataFilterItem,\n options: OperatorOption[]\n ) {\n if (isWhereFilter(unref(dataFilter))) {\n this.operatorOptions = options;\n }\n }\n\n function setValue(this: DataFilterItem, value: any) {\n this.dataFilter.setParam(this.column.name, value);\n }\n\n function getValue(this: DataFilterItem): any {\n return this.dataFilter.getParam(this.column.name);\n }\n\n const filterPanelItem: DataFilterItem = {\n dataFilter,\n column,\n currentOperator: null,\n operatorOptions: [],\n setOperator,\n setOperatorOptions,\n setValue,\n getValue,\n };\n\n return filterPanelItem;\n };\n\n const dataFilterItem = reactive(\n createDataFilterItem(unref(dataFilter), unref(filterColumn))\n ) as DataFilterItem;\n\n provide(\n DATA_FILTER_ITEM_CONTEXT,\n reactive({ dataFilter, dataFilterItem }) as DataFilterItemContext\n );\n\n onBeforeUnmount(() => {\n const _filterPanel = unref(dataFilter);\n\n if (isWhereFilter(_filterPanel)) {\n _filterPanel.deleteParamOperator(unref(filterColumn).name);\n }\n\n _filterPanel.deleteParam(unref(filterColumn).name);\n });\n\n return () => {\n const _filterPanel = unref(dataFilter);\n\n const _filterColumn = unref(filterColumn);\n\n if (!_filterColumn) {\n return null;\n }\n\n let children: any = slots.default?.();\n\n if (!children && unref(component)) {\n const FilterColumnComponent = toRaw(unref(component));\n\n children = <FilterColumnComponent {...unref(componentProps)} />;\n }\n\n const options = dataFilterItem.operatorOptions.map((option) => (\n <ElOption\n key={option.value}\n value={option.value}\n label={i18n.translate(option.label)}\n />\n ));\n\n const operatorSelect = isWhereFilter(_filterPanel) ? (\n <ElSelect\n modelValue={dataFilterItem.currentOperator as any}\n onUpdate:modelValue={(v) => dataFilterItem.setOperator(v)}\n class=\"mk-data-filter-form-item__operator\"\n >\n {options}\n </ElSelect>\n ) : null;\n\n const labelWidth = computed(()=>100);\n\n return (\n <div class=\"mk-data-filter-form-item\">\n <div class=\"mk-data-filter-form-item__label\" style={\n {width:labelWidth.value+\"px\"}\n }>{_filterColumn.label}</div>\n {/* {operatorSelect} */}\n <div class=\"mk-data-filter-form-item__content\">{children}</div>\n </div>\n );\n };\n },\n});\n"],"names":["_isSlot","s","Object","prototype","toString","call","_isVNode","name","props","dataFilterFormItemProps","setup","slots","i18n","useI18n","dataFilterContext","inject","DATA_FILTER_CONTEXT","dataFilter","computed","_filterColumn","createFilterColumn","reactive","FilterColumn","label","unref","addColumn","filterColumn","existingColumn","getColumn","component","componentProps","useFilterColumnComponent","createDataFilterItem","column","setOperator","operator","_dataFilter","isWhereFilter","currentOperator","setParamOperator","setOperatorOptions","options","operatorOptions","setValue","value","setParam","getValue","getParam","filterPanelItem","dataFilterItem","provide","DATA_FILTER_ITEM_CONTEXT","onBeforeUnmount","_filterPanel","deleteParamOperator","deleteParam","children","default","FilterColumnComponent","toRaw","_createVNode","map","option","ElOption","translate","ElSelect","v","labelWidth","width"],"mappings":"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"}
1	+ {"version":3,"file":"data-filter-form-item.js","sources":["../../../../../../src/components/data-model/data-filter-form/data-filter-form-item/data-filter-form-item.tsx"],"sourcesContent":["import {\n computed,\n defineComponent,\n inject,\n onBeforeUnmount,\n provide,\n reactive,\n toRaw,\n unref,\n} from \"vue\";\nimport { DataFilter, FilterColumn, isWhereFilter } from \"@maketribe/dm\";\nimport { useFilterColumnComponent, useI18n } from \"../../../../composables\";\nimport { dataFilterFormItemProps } from \"./data-filter-form-item-options\";\nimport {\n DATA_FILTER_CONTEXT,\n DATA_FILTER_ITEM_CONTEXT,\n DataFilterItem,\n DataFilterItemContext,\n} from \"../token\";\nimport { OperatorOption } from \"../operator-options\";\nimport { ElOption, ElSelect, ElTooltip } from \"element-plus\";\n\nexport default defineComponent({\n name: \"MKDataFilterFormItem\",\n props: dataFilterFormItemProps,\n setup(props, { slots }) {\n const i18n = useI18n()!;\n\n const dataFilterContext = inject(DATA_FILTER_CONTEXT)!;\n\n const dataFilter = computed(() => dataFilterContext.dataFilter);\n\n let _filterColumn: FilterColumn \| null = null;\n\n const createFilterColumn = () => {\n _filterColumn = reactive(\n new FilterColumn({\n name: props.name!,\n label: props.label!,\n })\n );\n\n unref(dataFilter).addColumn(_filterColumn);\n\n return _filterColumn;\n };\n\n const filterColumn = computed(() => {\n const existingColumn = unref(dataFilter).getColumn(props.name) ?? null;\n\n if (existingColumn) {\n return existingColumn;\n }\n\n if (!_filterColumn) {\n _filterColumn = createFilterColumn();\n }\n\n return _filterColumn;\n });\n\n const { component, componentProps } = useFilterColumnComponent(\n filterColumn,\n dataFilter\n );\n\n const createDataFilterItem = (\n dataFilter: DataFilter,\n column: FilterColumn\n ) => {\n function setOperator(\n this: DataFilterItem,\n operator: OperatorOption[\"value\"]\n ) {\n const _dataFilter = unref(dataFilter);\n if (isWhereFilter(_dataFilter)) {\n this.currentOperator = operator;\n _dataFilter.setParamOperator(unref(column).name, operator);\n }\n }\n\n function setOperatorOptions(\n this: DataFilterItem,\n options: OperatorOption[]\n ) {\n if (isWhereFilter(unref(dataFilter))) {\n this.operatorOptions = options;\n }\n }\n\n function setValue(this: DataFilterItem, value: any) {\n this.dataFilter.setParam(this.column.name, value);\n }\n\n function getValue(this: DataFilterItem): any {\n return this.dataFilter.getParam(this.column.name);\n }\n\n const filterPanelItem: DataFilterItem = {\n dataFilter,\n column,\n currentOperator: null,\n operatorOptions: [],\n setOperator,\n setOperatorOptions,\n setValue,\n getValue,\n };\n\n return filterPanelItem;\n };\n\n const dataFilterItem = reactive(\n createDataFilterItem(unref(dataFilter), unref(filterColumn))\n ) as DataFilterItem;\n\n provide(\n DATA_FILTER_ITEM_CONTEXT,\n reactive({ dataFilter, dataFilterItem }) as DataFilterItemContext\n );\n\n onBeforeUnmount(() => {\n const _filterPanel = unref(dataFilter);\n\n if (isWhereFilter(_filterPanel)) {\n _filterPanel.deleteParamOperator(unref(filterColumn).name);\n }\n\n _filterPanel.deleteParam(unref(filterColumn).name);\n });\n\n return () => {\n const _filterPanel = unref(dataFilter);\n\n const _filterColumn = unref(filterColumn);\n\n if (!_filterColumn) {\n return null;\n }\n\n let children: any = slots.default?.();\n\n if (!children && unref(component)) {\n const FilterColumnComponent = toRaw(unref(component));\n\n children = <FilterColumnComponent {...unref(componentProps)} />;\n }\n\n const options = dataFilterItem.operatorOptions.map((option) => (\n <ElOption\n key={option.value}\n value={option.value}\n label={i18n.translate(option.label)}\n />\n ));\n\n const operatorSelect = isWhereFilter(_filterPanel) ? (\n <ElSelect\n modelValue={dataFilterItem.currentOperator as any}\n onUpdate:modelValue={(v) => dataFilterItem.setOperator(v)}\n class=\"mk-data-filter-form-item__operator\"\n >\n {options}\n </ElSelect>\n ) : null;\n\n const labelWidth = computed(() => dataFilterContext.labelWidth);\n\n return (\n <div class=\"mk-data-filter-form-item\">\n <div\n class=\"mk-data-filter-form-item__label\"\n style={{ width: labelWidth.value + \"px\" }}\n >\n {_filterColumn.label}\n </div>\n {/* {operatorSelect} */}\n <div class=\"mk-data-filter-form-item__content\">{children}</div>\n </div>\n );\n };\n },\n});\n"],"names":["_isSlot","s","Object","prototype","toString","call","_isVNode","name","props","dataFilterFormItemProps","setup","slots","i18n","useI18n","dataFilterContext","inject","DATA_FILTER_CONTEXT","dataFilter","computed","_filterColumn","createFilterColumn","reactive","FilterColumn","label","unref","addColumn","filterColumn","existingColumn","getColumn","component","componentProps","useFilterColumnComponent","createDataFilterItem","column","setOperator","operator","_dataFilter","isWhereFilter","currentOperator","setParamOperator","setOperatorOptions","options","operatorOptions","setValue","value","setParam","getValue","getParam","filterPanelItem","dataFilterItem","provide","DATA_FILTER_ITEM_CONTEXT","onBeforeUnmount","_filterPanel","deleteParamOperator","deleteParam","children","default","FilterColumnComponent","toRaw","_createVNode","map","option","ElOption","translate","ElSelect","v","labelWidth","width"],"mappings":"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"}

package/dist/esm/components/data-model/data-filter-form/data-filter-form-options.d.ts CHANGED Viewed

@@ -1,9 +1,9 @@
 import { ExtractPropTypes } from "vue";
-import { DataFilter } from "@maketribe/dm";
+import { DataTable } from "@maketribe/dm";
 import dataFilterForm from "./data-filter-form";
 export declare const dataFilterFormProps: {
-    readonly dataFilter: {
-        readonly type: import("vue").PropType<DataFilter<Record<string, any>>>;
+    readonly dataTable: {
+        readonly type: import("vue").PropType<DataTable<unknown, unknown, Record<string, any>, import("@maketribe/dm").TableColumn>>;
         readonly required: true;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __mkPropKey: true;

package/dist/esm/components/data-model/data-filter-form/data-filter-form-options.js CHANGED Viewed

@@ -1,8 +1,9 @@
-import { DataFilter } from '@maketribe/dm';
+import { DataTable } from '@maketribe/dm';
 import { buildProps } from '@maketribe/utils';
 const dataFilterFormProps = buildProps({
-  dataFilter: { type: DataFilter, required: true }
+  // dataFilter: { type: DataFilter, required: true },
+  dataTable: { type: DataTable, required: true }
 });
 const dataFilterFormEmits = {};

package/dist/esm/components/data-model/data-filter-form/data-filter-form-options.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"data-filter-form-options.js","sources":["../../../../../src/components/data-model/data-filter-form/data-filter-form-options.ts"],"sourcesContent":["import { ExtractPropTypes } from \"vue\";\nimport { DataFilter } from \"@maketribe/dm\";\nimport { buildProps } from \"@maketribe/utils\";\nimport dataFilterForm from \"./data-filter-form\";\n\nexport const dataFilterFormProps = buildProps({\n dataFilter: { type: DataFilter, required: true },\n} as const);\n\nexport type DataFilterFormProps = ExtractPropTypes<typeof dataFilterFormProps>;\n\nexport const dataFilterFormEmits = {};\n\nexport type DataFilterFormEmits = typeof dataFilterForm;\n"],"names":[],"mappings":";;;AAKO,MAAM,sBAAsB,UAAW,CAAA;AAAA,~~EAC5C~~,~~UAAY~~,EAAA,EAAE,IAAM,EAAA,~~UAAA~~,~~EAAY~~,UAAU,IAAK,EAAA;~~AACjD~~,CAAU,EAAA;AAIH,MAAM,sBAAsB;;;;"}
1	+ {"version":3,"file":"data-filter-form-options.js","sources":["../../../../../src/components/data-model/data-filter-form/data-filter-form-options.ts"],"sourcesContent":["import { ExtractPropTypes } from \"vue\";\nimport { DataFilter, DataTable } from \"@maketribe/dm\";\nimport { buildProps } from \"@maketribe/utils\";\nimport dataFilterForm from \"./data-filter-form\";\n\nexport const dataFilterFormProps = buildProps({\n // dataFilter: { type: DataFilter, required: true },\n dataTable: { type: DataTable, required: true },\n} as const);\n\nexport type DataFilterFormProps = ExtractPropTypes<typeof dataFilterFormProps>;\n\nexport const dataFilterFormEmits = {};\n\nexport type DataFilterFormEmits = typeof dataFilterForm;\n"],"names":[],"mappings":";;;AAKO,MAAM,sBAAsB,UAAW,CAAA;AAAA;AAAA,EAE5C,SAAW,EAAA,EAAE,IAAM,EAAA,SAAA,EAAW,UAAU,IAAK,EAAA;AAC/C,CAAU,EAAA;AAIH,MAAM,sBAAsB;;;;"}

package/dist/esm/components/data-model/data-filter-form/data-filter-form.d.ts CHANGED Viewed

@@ -1,13 +1,13 @@
 declare const _default: import("vue").DefineComponent<{
-    readonly dataFilter: {
-        readonly type: import("vue").PropType<import("@maketribe/dm").DataFilter<Record<string, any>>>;
+    readonly dataTable: {
+        readonly type: import("vue").PropType<import("@maketribe/dm").DataTable<unknown, unknown, Record<string, any>, import("@maketribe/dm").TableColumn>>;
         readonly required: true;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __mkPropKey: true;
     };
 }, () => JSX.Element | null, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    readonly dataFilter: {
-        readonly type: import("vue").PropType<import("@maketribe/dm").DataFilter<Record<string, any>>>;
+    readonly dataTable: {
+        readonly type: import("vue").PropType<import("@maketribe/dm").DataTable<unknown, unknown, Record<string, any>, import("@maketribe/dm").TableColumn>>;
         readonly required: true;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __mkPropKey: true;