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

@maketribe/ms-app 3.0.6 → 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 (1422) hide show

package/dist/cjs/dataview/material/MaterialMan.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MaterialMan.js","sources":["../../../../src/dataview/material/MaterialMan.ts"],"sourcesContent":["import { Group, OrderType } from \"@maketribe/request\";\nimport { IComponents, WhereFilter } from \"@maketribe/dm\";\nimport { MaterialTable, MaterialType } from \"./MaterialTable\";\nimport {\n MaterialGroup,\n MaterialGroupNode,\n MaterialGroupTable,\n} from \"./material-group\";\nimport { UploadError, WebFileUpload, HttpRequest } from \"@maketribe/request\";\nimport { MaterialForm } from \"./MaterialForm\";\n\nexport type MaterialManOptions = {\n components: IComponents;\n httpRequest?: HttpRequest;\n};\n\nexport class MaterialMan {\n currentMaterialGroupId: MaterialGroup[\"id\"] \| null;\n currentMaterialTypeId: MaterialType[\"value\"] \| null;\n\n materialTypes: MaterialType[] = [];\n materialTypeValues: MaterialType[\"value\"][] = [];\n\n ~~materialGroupTable~~: ~~MaterialGroupTable~~;\n materialTable: MaterialTable;\n materialForm: MaterialForm;\n\n protected initing: boolean = false;\n protected initd: boolean = false;\n\n upload: WebFileUpload;\n\n protected materialConditionGroup: Group;\n\n get currentMaterialType() {\n return (\n this.materialTypes.find(\n (materialType) => materialType.value === this.currentMaterialTypeId\n ) ?? null\n );\n }\n\n constructor(options: MaterialManOptions) {\n this.materialGroupTable = new MaterialGroupTable();\n this.materialTable = new MaterialTable({\n materialComponents: options.components,\n });\n this.materialForm = new MaterialForm();\n\n this.materialConditionGroup = new Group();\n\n (this.materialTable.dataFilter as WhereFilter)\n .getWhere()\n .addGroup(this.materialConditionGroup);\n\n (this.materialTable.dataFilter as WhereFilter)\n .getOrder()\n .addOrderItem(\"createDate\", OrderType.DESC);\n\n this.materialGroupTable.dataFilter.setReady();\n this.materialTable.dataFilter.setReady();\n\n this.upload = new WebFileUpload({\n filters: [\n (file) => {\n if (!this.currentMaterialType) {\n throw new UploadError(\"不能上传文件，素材类型无效\");\n }\n\n if (this.currentMaterialType.limit * 1024 * 1024 < file.size) {\n throw new UploadError(\"文件太大不能上传\");\n }\n },\n ],\n httpRequest: options.httpRequest,\n });\n\n this.currentMaterialGroupId = null;\n this.currentMaterialTypeId = null;\n }\n\n async init() {\n if (this.initing \|\| this.initd) {\n return;\n }\n this.initing = true;\n\n this.upload.uploadEvent.on(({ uploadItem }) => {\n uploadItem.completeEvent.once(async () => {\n await this.materialForm.addRecord();\n\n this.materialForm.setData({\n id: \"\",\n materialGroupId: this.currentMaterialGroupId,\n type: this.currentMaterialTypeId!,\n desc: uploadItem.payload.name,\n path: uploadItem.response!.data.data.path,\n });\n\n const submitResullt = await this.materialForm.submit();\n\n if (submitResullt.data.code !== 200) {\n return;\n }\n\n this.materialTable.load();\n });\n });\n\n await this.~~materialGroupTable~~.init();\n await this.~~materialGroupTable~~.load();\n\n await this.materialForm.init();\n\n const getFirstMaterialGroupNode = (\n materialGroupNodes: MaterialGroupNode[]\n ): MaterialGroupNode => {\n if (materialGroupNodes[0].children.length) {\n return getFirstMaterialGroupNode(materialGroupNodes[0].children);\n }\n\n return materialGroupNodes[0];\n };\n\n const materialGroupList = this.~~materialGroupTable~~.getList();\n\n if (!materialGroupList.length) {\n return;\n }\n\n this.currentMaterialGroupId =\n getFirstMaterialGroupNode(materialGroupList).id;\n\n await this.materialTable.init();\n\n this.materialTypes = this.materialTable.getMaterialTypes();\n\n if (this.materialTypes.length) {\n this.currentMaterialTypeId = this.materialTypes[0].value;\n }\n\n this.attachMaterialTableCondition();\n\n this.initing = false;\n this.initd = true;\n }\n\n setAllowAccessMaterialTypeValues(\n materialTypeValues: MaterialType[\"value\"][]\n ) {\n this.materialTypeValues = materialTypeValues;\n }\n\n getMaterialType() {\n if (!this.materialTypeValues.length) {\n return this.materialTypes;\n }\n\n return this.materialTypes.filter((materialType) =>\n this.materialTypeValues.includes(materialType.value)\n );\n }\n\n setCurrentMaterialGroupId(~~materialGoupId~~: MaterialGroupNode~~[\"id\"]~~ \| null) {\n this.~~currentMaterialGroupId~~ = ~~materialGoupId~~;\n\n this.attachMaterialTableCondition();\n }\n\n setCurrentMaterialTypeId(materialTypeId: MaterialType[\"value\"] \| null) {\n this.currentMaterialTypeId = materialTypeId;\n\n this.attachMaterialTableCondition();\n }\n\n protected attachMaterialTableCondition() {\n this.materialConditionGroup.clear();\n\n if (this.currentMaterialGroupId) {\n this.materialConditionGroup.addCondition(\n \"materialGroupId\",\n \"=\",\n this.currentMaterialGroupId\n );\n }\n\n if (this.currentMaterialTypeId) {\n this.materialConditionGroup.addCondition(\n \"type\",\n \"=\",\n this.currentMaterialTypeId\n );\n }\n\n this.materialTable.load();\n }\n}\n"],"names":["~~MaterialGroupTable~~","MaterialTable","MaterialForm","Group","OrderType","WebFileUpload","UploadError"],"mappings":";;;;;;;;~~AAgBO~~,MAAM,WAAY,CAAA;AAAA~~,EACvB,sBAAA,CAAA~~;AAAA,~~EACA~~,qBAAA,CAAA;AAAA,EAEA,gBAAgC,EAAC,CAAA;AAAA,EACjC,qBAA8C,EAAC,CAAA;AAAA,EAE/C,~~kBAAA~~,CAAA;AAAA,EACA,aAAA,CAAA;AAAA,EACA,YAAA,CAAA;AAAA,EAEU,OAAmB,GAAA,KAAA,CAAA;AAAA,EACnB,KAAiB,GAAA,KAAA,CAAA;AAAA,EAE3B,MAAA,CAAA;AAAA,EAEU,sBAAA,CAAA;AAAA,EAEV,IAAI,mBAAsB,GAAA;AACxB,IAAA,OACE,KAAK,aAAc,CAAA,IAAA;AAAA,MACjB,CAAC,YAAA,KAAiB,YAAa,CAAA,KAAA,KAAU,IAAK,CAAA,qBAAA;AAAA,KAC3C,IAAA,IAAA,CAAA;AAAA,GAET;AAAA,EAEA,YAAY,OAA6B,EAAA;AACvC,IAAK,IAAA,CAAA,~~kBAAA~~,~~GAAqB~~,IAAIA,~~qCAAmB~~,EAAA,CAAA;~~AACjD~~,IAAK,IAAA,CAAA,aAAA,GAAgB,IAAIC,2BAAc,CAAA;AAAA,MACrC,oBAAoB,OAAQ,CAAA,UAAA;AAAA,KAC7B,CAAA,CAAA;AACD,IAAK,IAAA,CAAA,YAAA,GAAe,IAAIC,yBAAa,EAAA,CAAA;AAErC,IAAK,IAAA,CAAA,sBAAA,GAAyB,IAAIC,aAAM,EAAA,CAAA;AAExC,IAAC,KAAK,aAAc,CAAA,UAAA,CACjB,UACA,CAAA,QAAA,CAAS,KAAK,sBAAsB,CAAA,CAAA;AAEvC,IAAC,IAAA,CAAK,cAAc,UACjB,CAAA,QAAA,GACA,YAAa,CAAA,YAAA,EAAcC,kBAAU,IAAI,CAAA,CAAA;~~AAE5C~~,IAAK,IAAA,CAAA,~~kBAAA,CAAmB,WAAW,QAAS,EAAA,CAAA;AAC5C,IAAK,IAAA,CAAA,~~aAAA,CAAc,WAAW,QAAS,EAAA,CAAA;AAEvC,IAAK,IAAA,CAAA,MAAA,GAAS,IAAIC,qBAAc,CAAA;AAAA,MAC9B,OAAS,EAAA;AAAA,QACP,CAAC,IAAS,KAAA;AACR,UAAI,IAAA,CAAC,KAAK,mBAAqB,EAAA;AAC7B,YAAM,MAAA,IAAIC,oBAAY,gFAAe,CAAA,CAAA;AAAA,WACvC;AAEA,UAAA,IAAI,KAAK,mBAAoB,CAAA,KAAA,GAAQ,IAAO,GAAA,IAAA,GAAO,KAAK,IAAM,EAAA;AAC5D,YAAM,MAAA,IAAIA,oBAAY,kDAAU,CAAA,CAAA;AAAA,WAClC;AAAA,SACF;AAAA,OACF;AAAA,MACA,aAAa,OAAQ,CAAA,WAAA;AAAA,KACtB,CAAA,CAAA;~~AAED~~,IAAA,IAAA,CAAK,~~sBAAyB,GAAA,IAAA,CAAA;AAC9B,IAAA,IAAA,CAAK,~~qBAAwB,GAAA,IAAA,CAAA;AAAA,GAC/B;AAAA,EAEA,MAAM,IAAO,GAAA;AACX,IAAI,IAAA,IAAA,CAAK,OAAW,IAAA,IAAA,CAAK,KAAO,EAAA;AAC9B,MAAA,OAAA;AAAA,KACF;AACA,IAAA,IAAA,CAAK,OAAU,GAAA,IAAA,CAAA;AAEf,IAAA,IAAA,CAAK,OAAO,WAAY,CAAA,EAAA,CAAG,CAAC,EAAE,YAAiB,KAAA;AAC7C,MAAW,UAAA,CAAA,aAAA,CAAc,KAAK,YAAY;AACxC,QAAM,MAAA,IAAA,CAAK,aAAa,SAAU,EAAA,CAAA;AAElC,QAAA,IAAA,CAAK,aAAa,OAAQ,CAAA;AAAA,UACxB,EAAI,EAAA,EAAA;AAAA,UACJ,iBAAiB,IAAK,CAAA,sBAAA;AAAA,UACtB,MAAM,IAAK,CAAA,qBAAA;AAAA,UACX,IAAA,EAAM,WAAW,OAAQ,CAAA,IAAA;AAAA,UACzB,IAAM,EAAA,UAAA,CAAW,QAAU,CAAA,IAAA,CAAK,IAAK,CAAA,IAAA;AAAA,SACtC,CAAA,CAAA;AAED,QAAA,MAAM,aAAgB,GAAA,MAAM,IAAK,CAAA,YAAA,CAAa,MAAO,EAAA,CAAA;AAErD,QAAI,IAAA,aAAA,CAAc,IAAK,CAAA,IAAA,KAAS,GAAK,EAAA;AACnC,UAAA,OAAA;AAAA,SACF;AAEA,QAAA,IAAA,CAAK,cAAc,IAAK,EAAA,CAAA;AAAA,OACzB,CAAA,CAAA;AAAA,KACF,CAAA,CAAA;AAED,IAAM,MAAA,IAAA,CAAK,~~mBAAmB~~,IAAK,EAAA,CAAA;~~AACnC~~,IAAM,MAAA,IAAA,CAAK,~~mBAAmB~~,IAAK,EAAA,CAAA;~~AAEnC~~,IAAM,MAAA,IAAA,CAAK,aAAa,IAAK,EAAA,CAAA;~~AAE7B~~,IAAM,MAAA,yBAAA,GAA4B,CAChC,kBACsB,KAAA;AACtB,MAAA,IAAI,kBAAmB,CAAA,CAAC,CAAE,CAAA,QAAA,CAAS,MAAQ,EAAA;AACzC,QAAA,OAAO,yBAA0B,CAAA,kBAAA,CAAmB,CAAC,CAAA,CAAE,QAAQ,CAAA,CAAA;AAAA,OACjE;AAEA,MAAA,OAAO,mBAAmB,CAAC,CAAA,CAAA;AAAA,KAC7B,CAAA;AAEA,IAAM,MAAA,iBAAA,GAAoB,IAAK,CAAA,kBAAA,CAAmB,OAAQ,EAAA,CAAA;AAE1D,IAAI,IAAA,~~CAAC,kBAAkB,MAAQ,EAAA;AAC7B,MAAA,OAAA;AAAA,KACF;AAEA,IAAK,IAAA,CAAA,sBAAA,GACH,yBAA0B,CAAA,iBAAiB,CAAE,CAAA,EAAA,CAAA;AAE/C,IAAM,MAAA,IAAA,~~CAAK,cAAc,IAAK,EAAA,CAAA;AAE9B,IAAK,IAAA,CAAA,aAAA,GAAgB,IAAK,CAAA,aAAA,CAAc,gBAAiB,EAAA,CAAA;AAEzD,IAAI,IAAA,IAAA,CAAK,cAAc,MAAQ,EAAA;AAC7B,MAAA,IAAA,CAAK,qBAAwB,GAAA,IAAA,CAAK,aAAc,CAAA,CAAC,CAAE,CAAA,KAAA,CAAA;AAAA,KACrD;AAEA,IAAA,IAAA,CAAK,4BAA6B,EAAA,CAAA;AAElC,IAAA,IAAA,CAAK,OAAU,GAAA,KAAA,CAAA;AACf,IAAA,IAAA,CAAK,KAAQ,GAAA,IAAA,CAAA;AAAA,GACf;AAAA,EAEA,iCACE,kBACA,EAAA;AACA,IAAA,IAAA,CAAK,kBAAqB,GAAA,kBAAA,CAAA;AAAA,GAC5B;AAAA,EAEA,eAAkB,GAAA;AAChB,IAAI,IAAA,CAAC,IAAK,CAAA,kBAAA,CAAmB,MAAQ,EAAA;AACnC,MAAA,OAAO,IAAK,CAAA,aAAA,CAAA;AAAA,KACd;AAEA,IAAA,OAAO,KAAK,aAAc,CAAA,MAAA;AAAA,MAAO,CAAC,YAChC,KAAA,IAAA,CAAK,kBAAmB,CAAA,QAAA,CAAS,aAAa,KAAK,CAAA;AAAA,KACrD,CAAA;AAAA,GACF;AAAA,EAEA,0BAA0B,~~cAAgD~~,EAAA;~~AACxE~~,IAAA,IAAA,CAAK,~~sBAAyB~~,~~GAAA~~,cAAA,CAAA;~~AAE9B~~,IAAA,IAAA,CAAK,4BAA6B,EAAA,CAAA;AAAA,GACpC;AAAA,EAEA,yBAAyB,cAA8C,EAAA;AACrE,IAAA,IAAA,CAAK,qBAAwB,GAAA,cAAA,CAAA;AAE7B,IAAA,IAAA,CAAK,4BAA6B,EAAA,CAAA;AAAA,GACpC;AAAA,EAEU,4BAA+B,GAAA;AACvC,IAAA,IAAA,CAAK,uBAAuB,KAAM,EAAA,CAAA;AAElC,IAAA,IAAI,KAAK,sBAAwB,EAAA;AAC/B,MAAA,IAAA,CAAK,sBAAuB,CAAA,YAAA;AAAA,QAC1B,iBAAA;AAAA,QACA,GAAA;AAAA,QACA,IAAK,CAAA,sBAAA;AAAA,OACP,CAAA;AAAA,KACF;AAEA,IAAA,IAAI,KAAK,qBAAuB,EAAA;AAC9B,MAAA,IAAA,CAAK,sBAAuB,CAAA,YAAA;AAAA,QAC1B,MAAA;AAAA,QACA,GAAA;AAAA,QACA,IAAK,CAAA,qBAAA;AAAA,OACP,CAAA;AAAA,KACF;AAEA,IAAA,IAAA,CAAK,cAAc,IAAK,EAAA,CAAA;AAAA,GAC1B;AACF;;;;"}
1	+ {"version":3,"file":"MaterialMan.js","sources":["../../../../src/dataview/material/MaterialMan.ts"],"sourcesContent":["import { Group, OrderType } from \"@maketribe/request\";\nimport { IComponents, WhereFilter } from \"@maketribe/dm\";\nimport { MaterialTable, MaterialType } from \"./MaterialTable\";\nimport {\n MaterialGroup,\n MaterialGroupNode,\n MaterialGroupTree,\n // MaterialGroupTable,\n} from \"./material-group\";\nimport { UploadError, WebFileUpload, HttpRequest } from \"@maketribe/request\";\nimport { MaterialForm } from \"./MaterialForm\";\n\nexport type MaterialManOptions = {\n components: IComponents;\n httpRequest?: HttpRequest;\n};\n\nexport class MaterialMan {\n // currentMaterialGroupId: MaterialGroup[\"id\"] \| null;\n currentMaterialTypeId: MaterialType[\"value\"] \| null;\n\n materialTypes: MaterialType[] = [];\n materialTypeValues: MaterialType[\"value\"][] = [];\n\n materialGroupTree: MaterialGroupTree;\n materialTable: MaterialTable;\n materialForm: MaterialForm;\n\n protected initing: boolean = false;\n protected initd: boolean = false;\n\n upload: WebFileUpload;\n\n protected materialConditionGroup: Group;\n\n get currentMaterialGroupId() {\n return this.materialGroupTree.getCurrentNode()?.data?.id ?? null;\n }\n\n get currentMaterialType() {\n return (\n this.materialTypes.find(\n (materialType) => materialType.value === this.currentMaterialTypeId\n ) ?? null\n );\n }\n\n constructor(options: MaterialManOptions) {\n this.materialGroupTree = new MaterialGroupTree();\n // this.materialGroupTable = new MaterialGroupTable();\n this.materialTable = new MaterialTable({\n materialComponents: options.components,\n });\n this.materialForm = new MaterialForm();\n\n this.materialConditionGroup = new Group();\n\n (this.materialTable.dataFilter as WhereFilter)\n .getWhere()\n .addGroup(this.materialConditionGroup);\n\n (this.materialTable.dataFilter as WhereFilter)\n .getOrder()\n .addOrderItem(\"createDate\", OrderType.DESC);\n\n // this.materialGroupTable.dataFilter.setReady();\n this.materialTable.dataFilter.setReady();\n\n this.upload = new WebFileUpload({\n filters: [\n (file) => {\n if (!this.currentMaterialType) {\n throw new UploadError(\"不能上传文件，素材类型无效\");\n }\n\n if (this.currentMaterialType.limit * 1024 * 1024 < file.size) {\n throw new UploadError(\"文件太大不能上传\");\n }\n },\n ],\n httpRequest: options.httpRequest,\n });\n\n // this.currentMaterialGroupId = null;\n this.currentMaterialTypeId = null;\n }\n\n async init() {\n if (this.initing \|\| this.initd) {\n return;\n }\n this.initing = true;\n\n this.upload.uploadEvent.on(({ uploadItem }) => {\n uploadItem.completeEvent.once(async () => {\n await this.materialForm.addRecord();\n\n this.materialForm.setData({\n id: \"\",\n materialGroupId: this.currentMaterialGroupId,\n type: this.currentMaterialTypeId!,\n desc: uploadItem.payload.name,\n path: uploadItem.response!.data.data.path,\n });\n\n const submitResullt = await this.materialForm.submit();\n\n if (submitResullt.data.code !== 200) {\n return;\n }\n\n this.materialTable.load();\n });\n });\n\n await this.materialGroupTree.init();\n await this.materialGroupTree.load();\n\n await this.materialForm.init();\n\n // const getFirstMaterialGroupNode = (\n // materialGroupNodes: MaterialGroupNode[]\n // ): MaterialGroupNode => {\n // if (materialGroupNodes[0].children.length) {\n // return getFirstMaterialGroupNode(materialGroupNodes[0].children);\n // }\n\n // return materialGroupNodes[0];\n // };\n\n // const materialGroupList = this.materialGroupTree.getList();\n\n // if (!materialGroupList.length) {\n // return;\n // }\n\n // this.currentMaterialGroupId =\n // getFirstMaterialGroupNode(materialGroupList).id;\n\n await this.materialTable.init();\n\n this.materialTypes = this.materialTable.getMaterialTypes();\n\n if (this.materialTypes.length) {\n this.currentMaterialTypeId = this.materialTypes[0].value;\n }\n\n this.attachMaterialTableCondition();\n\n this.initing = false;\n this.initd = true;\n }\n\n setAllowAccessMaterialTypeValues(\n materialTypeValues: MaterialType[\"value\"][]\n ) {\n this.materialTypeValues = materialTypeValues;\n }\n\n getMaterialType() {\n if (!this.materialTypeValues.length) {\n return this.materialTypes;\n }\n\n return this.materialTypes.filter((materialType) =>\n this.materialTypeValues.includes(materialType.value)\n );\n }\n\n setCurrentMaterialGroupId(materialGroup: MaterialGroupNode \| null) {\n this.materialGroupTree.setCurrentNode(\n materialGroup\n ? this.materialGroupTree.findDataTreeNode(materialGroup)\n : null\n );\n\n this.attachMaterialTableCondition();\n }\n\n setCurrentMaterialTypeId(materialTypeId: MaterialType[\"value\"] \| null) {\n this.currentMaterialTypeId = materialTypeId;\n\n this.attachMaterialTableCondition();\n }\n\n protected attachMaterialTableCondition() {\n this.materialConditionGroup.clear();\n\n if (this.currentMaterialGroupId) {\n this.materialConditionGroup.addCondition(\n \"materialGroupId\",\n \"=\",\n this.currentMaterialGroupId\n );\n }\n\n if (this.currentMaterialTypeId) {\n this.materialConditionGroup.addCondition(\n \"type\",\n \"=\",\n this.currentMaterialTypeId\n );\n }\n\n this.materialTable.load();\n }\n}\n"],"names":["MaterialGroupTree","MaterialTable","MaterialForm","Group","OrderType","WebFileUpload","UploadError"],"mappings":"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"}

package/dist/cjs/dataview/material/MaterialTable.js CHANGED Viewed

@@ -26,6 +26,7 @@ class MaterialTable extends dm.DataTable {
     this.materialTypes = config.value || [];
   }
   async initialize() {
+    await super.initialize();
     const loadingManager = this.getLoadingManager();
     try {
       loadingManager.startLoading();
@@ -59,7 +60,7 @@ class MaterialTable extends dm.DataTable {
     return {
       id: item.id,
       materialGroupId: item.materialGroupId || null,
-      type: item.type || "string",
+      type: item.type ? `${item.type}` : "1",
       desc: item.desc || "",
       path: item.path || ""
     };

package/dist/cjs/dataview/material/MaterialTable.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MaterialTable.js","sources":["../../../../src/dataview/material/MaterialTable.ts"],"sourcesContent":["import {\n Component,\n DataTable,\n DataTableOptions,\n IComponents,\n TableColumn,\n} from \"@maketribe/dm\";\nimport { Material } from \"./MaterialForm\";\nimport { ConfigTable } from \"../config\";\nimport { defineDataTable } from \"../../define-data-table\";\nimport { ITypeResolver } from \"../../core\";\n\nexport type MaterialType = {\n value: string;\n accept: string;\n label: string;\n limit: number;\n};\n\nexport type MaterialTableOptions = DataTableOptions & {\n materialComponents: IComponents;\n};\n\nexport class MaterialTable\n extends DataTable<Material>\n implements ITypeResolver<Material>\n{\n materialTypes: MaterialType[] = [];\n\n materialComponents: IComponents;\n\n constructor(options: MaterialTableOptions) {\n super({ name: \"ms-material\", ...options });\n\n this.materialComponents = options.materialComponents;\n }\n\n getMaterialTypes(): MaterialType[] {\n return this.materialTypes;\n }\n\n async loadMaterialTypes() {\n const configResponse = await ConfigTable.loadConfig<MaterialType[]>(\n \"ms-material-types\"\n );\n\n if (configResponse.data.code !== 200 \|\| !configResponse.data.data) {\n throw new Error();\n }\n\n const config = configResponse.data.data;\n\n this.materialTypes = config.value \|\| [];\n }\n\n protected async initialize() {\n const loadingManager = this.getLoadingManager();\n\n try {\n loadingManager.startLoading();\n\n this.materialTypes = [\n { value: \"1\", accept: \"image/\", limit: 10, label: \"图片\" },\n { value: \"2\", accept: \"video/\", limit: 500, label: \"视频\" },\n { value: \"4\", accept: \"*\", limit: 100, label: \"文档\" },\n ];\n\n const mapping = this.materialTypes.reduce((result, item) => {\n result[item.value] = result.label;\n\n return result;\n }, {} as Record<any, any>);\n\n this.setColumns([\n new TableColumn({ name: \"id\", label: \"编号\", visible: false }),\n new TableColumn({\n name: \"type\",\n label: \"类型\",\n componentInfo: \"MKColumnObjectMappingText\",\n componentProps: {\n mapping,\n },\n }),\n new TableColumn({ name: \"desc\", label: \"描述\" }),\n new TableColumn({ name: \"path\", label: \"路径\" }),\n ]);\n } finally {\n loadingManager.completeLoading();\n }\n }\n formatItem(item: Material): Material {\n return {\n id: item.id,\n materialGroupId: item.materialGroupId \|\| null,\n type: item.type \|\| \"~~string~~\",\n desc: item.desc \|\| \"\",\n path: item.path \|\| \"\",\n };\n }\n\n resolveType(type: string): string {\n switch (type) {\n case \"1\":\n return \"MKImageView\";\n case \"2\":\n return \"MKVideoView\";\n case \"3\":\n return \"MKAudioView\";\n default:\n return \"MKDocumentView\";\n }\n }\n\n resolveItemType(item: Material): string {\n return this.resolveType(item.type);\n }\n\n resolveMaterialComponent(item: Material): Component \| null {\n return this.materialComponents.resolveComponent(this.resolveItemType(item));\n }\n}\n\ndefineDataTable(MaterialTable);\n"],"names":["DataTable","ConfigTable","TableColumn","defineDataTable"],"mappings":";;;;;;;AAuBO,MAAM,sBACHA,YAEV,CAAA;AAAA,EACE,gBAAgC,EAAC,CAAA;AAAA,EAEjC,kBAAA,CAAA;AAAA,EAEA,YAAY,OAA+B,EAAA;AACzC,IAAA,KAAA,CAAM,EAAE,IAAA,EAAM,aAAe,EAAA,GAAG,SAAS,CAAA,CAAA;AAEzC,IAAA,IAAA,CAAK,qBAAqB,OAAQ,CAAA,kBAAA,CAAA;AAAA,GACpC;AAAA,EAEA,gBAAmC,GAAA;AACjC,IAAA,OAAO,IAAK,CAAA,aAAA,CAAA;AAAA,GACd;AAAA,EAEA,MAAM,iBAAoB,GAAA;AACxB,IAAM,MAAA,cAAA,GAAiB,MAAMC,uBAAY,CAAA,UAAA;AAAA,MACvC,mBAAA;AAAA,KACF,CAAA;AAEA,IAAA,IAAI,eAAe,IAAK,CAAA,IAAA,KAAS,OAAO,CAAC,cAAA,CAAe,KAAK,IAAM,EAAA;AACjE,MAAA,MAAM,IAAI,KAAM,EAAA,CAAA;AAAA,KAClB;AAEA,IAAM,MAAA,MAAA,GAAS,eAAe,IAAK,CAAA,IAAA,CAAA;AAEnC,IAAK,IAAA,CAAA,aAAA,GAAgB,MAAO,CAAA,KAAA,IAAS,EAAC,CAAA;AAAA,GACxC;AAAA,EAEA,MAAgB,UAAa,GAAA;AAC3B,IAAM,MAAA,cAAA,GAAiB,KAAK,iBAAkB,EAAA,CAAA;AAE9C,IAAI,IAAA;AACF,MAAA,cAAA,CAAe,YAAa,EAAA,CAAA;AAE5B,MAAA,IAAA,CAAK,aAAgB,GAAA;AAAA,QACnB,EAAE,OAAO,GAAK,EAAA,MAAA,EAAQ,WAAW,KAAO,EAAA,EAAA,EAAI,OAAO,cAAK,EAAA;AAAA,QACxD,EAAE,OAAO,GAAK,EAAA,MAAA,EAAQ,WAAW,KAAO,EAAA,GAAA,EAAK,OAAO,cAAK,EAAA;AAAA,QACzD,EAAE,OAAO,GAAK,EAAA,MAAA,EAAQ,KAAK,KAAO,EAAA,GAAA,EAAK,OAAO,cAAK,EAAA;AAAA,OACrD,CAAA;AAEA,MAAA,MAAM,UAAU,IAAK,CAAA,aAAA,CAAc,MAAO,CAAA,CAAC,QAAQ,IAAS,KAAA;AAC1D,QAAO,MAAA,CAAA,IAAA,CAAK,KAAK,CAAA,GAAI,MAAO,CAAA,KAAA,CAAA;AAE5B,QAAO,OAAA,MAAA,CAAA;AAAA,OACT,EAAG,EAAsB,CAAA,CAAA;AAEzB,MAAA,IAAA,CAAK,UAAW,CAAA;AAAA,QACd,IAAIC,eAAY,EAAE,IAAA,EAAM,MAAM,KAAO,EAAA,cAAA,EAAM,OAAS,EAAA,KAAA,EAAO,CAAA;AAAA,QAC3D,IAAIA,cAAY,CAAA;AAAA,UACd,IAAM,EAAA,MAAA;AAAA,UACN,KAAO,EAAA,cAAA;AAAA,UACP,aAAe,EAAA,2BAAA;AAAA,UACf,cAAgB,EAAA;AAAA,YACd,OAAA;AAAA,WACF;AAAA,SACD,CAAA;AAAA,QACD,IAAIA,cAAY,CAAA,EAAE,MAAM,MAAQ,EAAA,KAAA,EAAO,gBAAM,CAAA;AAAA,QAC7C,IAAIA,cAAY,CAAA,EAAE,MAAM,MAAQ,EAAA,KAAA,EAAO,gBAAM,CAAA;AAAA,OAC9C,CAAA,CAAA;AAAA,KACD,SAAA;AACA,MAAA,cAAA,CAAe,eAAgB,EAAA,CAAA;AAAA,KACjC;AAAA,GACF;AAAA,EACA,WAAW,IAA0B,EAAA;AACnC,IAAO,OAAA;AAAA,MACL,IAAI,IAAK,CAAA,EAAA;AAAA,MACT,eAAA,EAAiB,KAAK,eAAmB,IAAA,IAAA;AAAA,MACzC,IAAA,~~EAAM~~,~~KAAK~~,~~IAAQ~~,IAAA,~~QAAA~~;AAAA,~~MACnB~~,IAAA,EAAM,KAAK,IAAQ,IAAA,EAAA;AAAA,MACnB,IAAA,EAAM,KAAK,IAAQ,IAAA,EAAA;AAAA,KACrB,CAAA;AAAA,GACF;AAAA,EAEA,YAAY,IAAsB,EAAA;AAChC,IAAA,QAAQ,IAAM;AAAA,MACZ,KAAK,GAAA;AACH,QAAO,OAAA,aAAA,CAAA;AAAA,MACT,KAAK,GAAA;AACH,QAAO,OAAA,aAAA,CAAA;AAAA,MACT,KAAK,GAAA;AACH,QAAO,OAAA,aAAA,CAAA;AAAA,MACT;AACE,QAAO,OAAA,gBAAA,CAAA;AAAA,KACX;AAAA,GACF;AAAA,EAEA,gBAAgB,IAAwB,EAAA;AACtC,IAAO,OAAA,IAAA,CAAK,WAAY,CAAA,IAAA,CAAK,IAAI,CAAA,CAAA;AAAA,GACnC;AAAA,EAEA,yBAAyB,IAAkC,EAAA;AACzD,IAAA,OAAO,KAAK,kBAAmB,CAAA,gBAAA,CAAiB,IAAK,CAAA,eAAA,CAAgB,IAAI,CAAC,CAAA,CAAA;AAAA,GAC5E;AACF,CAAA;AAEAC,+BAAA,CAAgB,aAAa,CAAA;;;;"}
1	+ {"version":3,"file":"MaterialTable.js","sources":["../../../../src/dataview/material/MaterialTable.ts"],"sourcesContent":["import {\n Component,\n DataTable,\n DataTableOptions,\n IComponents,\n TableColumn,\n} from \"@maketribe/dm\";\nimport { Material } from \"./MaterialForm\";\nimport { ConfigTable } from \"../config\";\nimport { defineDataTable } from \"../../define-data-table\";\nimport { ITypeResolver } from \"../../core\";\n\nexport type MaterialType = {\n value: string;\n accept: string;\n label: string;\n limit: number;\n};\n\nexport type MaterialTableOptions = DataTableOptions & {\n materialComponents: IComponents;\n};\n\nexport class MaterialTable\n extends DataTable<Material>\n implements ITypeResolver<Material>\n{\n materialTypes: MaterialType[] = [];\n\n materialComponents: IComponents;\n\n constructor(options: MaterialTableOptions) {\n super({ name: \"ms-material\", ...options });\n\n this.materialComponents = options.materialComponents;\n }\n\n getMaterialTypes(): MaterialType[] {\n return this.materialTypes;\n }\n\n async loadMaterialTypes() {\n const configResponse = await ConfigTable.loadConfig<MaterialType[]>(\n \"ms-material-types\"\n );\n\n if (configResponse.data.code !== 200 \|\| !configResponse.data.data) {\n throw new Error();\n }\n\n const config = configResponse.data.data;\n\n this.materialTypes = config.value \|\| [];\n }\n\n protected async initialize() {\n await super.initialize();\n\n const loadingManager = this.getLoadingManager();\n\n try {\n loadingManager.startLoading();\n\n this.materialTypes = [\n { value: \"1\", accept: \"image/\", limit: 10, label: \"图片\" },\n { value: \"2\", accept: \"video/\", limit: 500, label: \"视频\" },\n { value: \"4\", accept: \"*\", limit: 100, label: \"文档\" },\n ];\n\n const mapping = this.materialTypes.reduce((result, item) => {\n result[item.value] = result.label;\n\n return result;\n }, {} as Record<any, any>);\n\n this.setColumns([\n new TableColumn({ name: \"id\", label: \"编号\", visible: false }),\n new TableColumn({\n name: \"type\",\n label: \"类型\",\n componentInfo: \"MKColumnObjectMappingText\",\n componentProps: {\n mapping,\n },\n }),\n new TableColumn({ name: \"desc\", label: \"描述\" }),\n new TableColumn({ name: \"path\", label: \"路径\" }),\n ]);\n } finally {\n loadingManager.completeLoading();\n }\n }\n formatItem(item: Material): Material {\n return {\n id: item.id,\n materialGroupId: item.materialGroupId \|\| null,\n type: item.type ? `${item.type}` : \"1\",\n desc: item.desc \|\| \"\",\n path: item.path \|\| \"\",\n };\n }\n\n resolveType(type: string): string {\n switch (type) {\n case \"1\":\n return \"MKImageView\";\n case \"2\":\n return \"MKVideoView\";\n case \"3\":\n return \"MKAudioView\";\n default:\n return \"MKDocumentView\";\n }\n }\n\n resolveItemType(item: Material): string {\n return this.resolveType(item.type);\n }\n\n resolveMaterialComponent(item: Material): Component \| null {\n return this.materialComponents.resolveComponent(this.resolveItemType(item));\n }\n}\n\ndefineDataTable(MaterialTable);\n"],"names":["DataTable","ConfigTable","TableColumn","defineDataTable"],"mappings":"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"}

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

@@ -1,7 +1,7 @@
 'use strict';
 var MaterialGroupForm = require('./material-group/MaterialGroupForm.js');
-var MaterialGroupTable = require('./material-group/MaterialGroupTable.js');
+var MaterialGroupTree = require('./material-group/MaterialGroupTree.js');
 var MaterialForm = require('./MaterialForm.js');
 var MaterialTable = require('./MaterialTable.js');
 var MaterialMan = require('./MaterialMan.js');
@@ -9,7 +9,7 @@ var MaterialMan = require('./MaterialMan.js');
 exports.MaterialGroupForm = MaterialGroupForm.MaterialGroupForm;
-exports.MaterialGroupTable = MaterialGroupTable.MaterialGroupTable;
+exports.MaterialGroupTree = MaterialGroupTree.MaterialGroupTree;
 exports.MaterialForm = MaterialForm.MaterialForm;
 exports.MaterialTable = MaterialTable.MaterialTable;
 exports.MaterialMan = MaterialMan.MaterialMan;

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

@@ -7,6 +7,7 @@ class MaterialGroupForm extends dm.DataForm {
     super({ name: "ms-material-group", ...options });
   }
   async initialize() {
+    await super.initialize();
     this.setColumns([
       new dm.FormColumn({ name: "desc", label: "\u5206\u7EC4\u540D\u79F0", required: true }),
       new dm.FormColumn({

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

	@@ -1 +1 @@
1	- {"version":3,"file":"MaterialGroupForm.js","sources":["../../../../../src/dataview/material/material-group/MaterialGroupForm.ts"],"sourcesContent":["import { DataForm, DataFormOptions, FormColumn } from \"@maketribe/dm\";\n\nexport type MaterialGroup = {\n id: string;\n desc: string;\n parentGroupId: string \| null;\n};\n\nexport class MaterialGroupForm extends DataForm<MaterialGroup> {\n constructor(options: DataFormOptions = {}) {\n super({ name: \"ms-material-group\", ...options });\n }\n\n protected async initialize() {\n this.setColumns([\n new FormColumn({ name: \"desc\", label: \"分组名称\", required: true }),\n new FormColumn({\n name: \"parentGroupId\",\n label: \"父材质组ID\",\n defaultValue: null,\n visible: false,\n }),\n ]);\n }\n}\n"],"names":["DataForm","FormColumn"],"mappings":";;;;AAQO,MAAM,0BAA0BA,WAAwB,CAAA;AAAA,EAC7D,WAAA,CAAY,OAA2B,GAAA,EAAI,EAAA;AACzC,IAAA,KAAA,CAAM,EAAE,IAAA,EAAM,mBAAqB,EAAA,GAAG,SAAS,CAAA,CAAA;AAAA,GACjD;AAAA,EAEA,MAAgB,UAAa,GAAA;AAC3B,IAAA,IAAA,CAAK,UAAW,CAAA;AAAA,MACd,IAAIC,cAAW,EAAE,IAAA,EAAM,QAAQ,KAAO,EAAA,0BAAA,EAAQ,QAAU,EAAA,IAAA,EAAM,CAAA;AAAA,MAC9D,IAAIA,aAAW,CAAA;AAAA,QACb,IAAM,EAAA,eAAA;AAAA,QACN,KAAO,EAAA,4BAAA;AAAA,QACP,YAAc,EAAA,IAAA;AAAA,QACd,OAAS,EAAA,KAAA;AAAA,OACV,CAAA;AAAA,KACF,CAAA,CAAA;AAAA,GACH;AACF;;;;"}
1	+ {"version":3,"file":"MaterialGroupForm.js","sources":["../../../../../src/dataview/material/material-group/MaterialGroupForm.ts"],"sourcesContent":["import { DataForm, DataFormOptions, FormColumn } from \"@maketribe/dm\";\n\nexport type MaterialGroup = {\n id: string;\n desc: string;\n parentGroupId: string \| null;\n};\n\nexport class MaterialGroupForm extends DataForm<MaterialGroup> {\n constructor(options: DataFormOptions = {}) {\n super({ name: \"ms-material-group\", ...options });\n }\n\n protected async initialize() {\n await super.initialize();\n\n this.setColumns([\n new FormColumn({ name: \"desc\", label: \"分组名称\", required: true }),\n new FormColumn({\n name: \"parentGroupId\",\n label: \"父材质组ID\",\n defaultValue: null,\n visible: false,\n }),\n ]);\n }\n}\n"],"names":["DataForm","FormColumn"],"mappings":";;;;AAQO,MAAM,0BAA0BA,WAAwB,CAAA;AAAA,EAC7D,WAAA,CAAY,OAA2B,GAAA,EAAI,EAAA;AACzC,IAAA,KAAA,CAAM,EAAE,IAAA,EAAM,mBAAqB,EAAA,GAAG,SAAS,CAAA,CAAA;AAAA,GACjD;AAAA,EAEA,MAAgB,UAAa,GAAA;AAC3B,IAAA,MAAM,MAAM,UAAW,EAAA,CAAA;AAEvB,IAAA,IAAA,CAAK,UAAW,CAAA;AAAA,MACd,IAAIC,cAAW,EAAE,IAAA,EAAM,QAAQ,KAAO,EAAA,0BAAA,EAAQ,QAAU,EAAA,IAAA,EAAM,CAAA;AAAA,MAC9D,IAAIA,aAAW,CAAA;AAAA,QACb,IAAM,EAAA,eAAA;AAAA,QACN,KAAO,EAAA,4BAAA;AAAA,QACP,YAAc,EAAA,IAAA;AAAA,QACd,OAAS,EAAA,KAAA;AAAA,OACV,CAAA;AAAA,KACF,CAAA,CAAA;AAAA,GACH;AACF;;;;"}

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

@@ -11,6 +11,7 @@ class MaterialGroupTable extends dm.DataTable {
     });
   }
   async initialize() {
+    await super.initialize();
     this.setColumns([
       new dm.TableColumn({ name: "id", label: "\u7F16\u53F7", visible: false }),
       new dm.TableColumn({ name: "desc", label: "\u63CF\u8FF0" })

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

	@@ -1 +1 @@
1	- {"version":3,"file":"MaterialGroupTable.js","sources":["../../../../../src/dataview/material/material-group/MaterialGroupTable.ts"],"sourcesContent":["import { DataTable, DataTableOptions, TableColumn } from \"@maketribe/dm\";\nimport { MaterialGroup } from \"./MaterialGroupForm\";\n\nexport type MaterialGroupNode = MaterialGroup & {\n children: MaterialGroupNode[];\n};\n\nexport class MaterialGroupTable extends DataTable<\n MaterialGroup,\n MaterialGroupNode\n> {\n constructor(options: Omit<DataTableOptions, \"name\"> = {}) {\n super({\n name: \"ms-material-group\",\n ...options,\n interfaceURL: { list: \"/api/dv/ms-material-group/allList\" },\n });\n }\n\n protected async initialize() {\n this.setColumns([\n new TableColumn({ name: \"id\", label: \"编号\", visible: false }),\n new TableColumn({ name: \"desc\", label: \"描述\" }),\n ]);\n }\n\n formatItem(item: MaterialGroup): MaterialGroupNode {\n return {\n id: item.id,\n desc: item.desc,\n parentGroupId: item.parentGroupId,\n children: [],\n };\n }\n\n setList(list: MaterialGroup[]): void {\n const rootMaterialGroups: MaterialGroupNode[] = [];\n\n const materialGroups = list as MaterialGroupNode[];\n\n for (const materialGroup of materialGroups) {\n if (!materialGroup.parentGroupId) {\n rootMaterialGroups.push(materialGroup);\n }\n\n for (const item of materialGroups) {\n if (materialGroup.id === item.parentGroupId) {\n materialGroup.children.push(item);\n }\n }\n }\n\n super.setList(rootMaterialGroups);\n }\n}\n"],"names":["DataTable","TableColumn"],"mappings":";;;;AAOO,MAAM,2BAA2BA,YAGtC,CAAA;AAAA,EACA,WAAA,CAAY,OAA0C,GAAA,EAAI,EAAA;AACxD,IAAM,KAAA,CAAA;AAAA,MACJ,IAAM,EAAA,mBAAA;AAAA,MACN,GAAG,OAAA;AAAA,MACH,YAAA,EAAc,EAAE,IAAA,EAAM,mCAAoC,EAAA;AAAA,KAC3D,CAAA,CAAA;AAAA,GACH;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,MAAQ,EAAA,KAAA,EAAO,gBAAM,CAAA;AAAA,KAC9C,CAAA,CAAA;AAAA,GACH;AAAA,EAEA,WAAW,IAAwC,EAAA;AACjD,IAAO,OAAA;AAAA,MACL,IAAI,IAAK,CAAA,EAAA;AAAA,MACT,MAAM,IAAK,CAAA,IAAA;AAAA,MACX,eAAe,IAAK,CAAA,aAAA;AAAA,MACpB,UAAU,EAAC;AAAA,KACb,CAAA;AAAA,GACF;AAAA,EAEA,QAAQ,IAA6B,EAAA;AACnC,IAAA,MAAM,qBAA0C,EAAC,CAAA;AAEjD,IAAA,MAAM,cAAiB,GAAA,IAAA,CAAA;AAEvB,IAAA,KAAA,MAAW,iBAAiB,cAAgB,EAAA;AAC1C,MAAI,IAAA,CAAC,cAAc,aAAe,EAAA;AAChC,QAAA,kBAAA,CAAmB,KAAK,aAAa,CAAA,CAAA;AAAA,OACvC;AAEA,MAAA,KAAA,MAAW,QAAQ,cAAgB,EAAA;AACjC,QAAI,IAAA,aAAA,CAAc,EAAO,KAAA,IAAA,CAAK,aAAe,EAAA;AAC3C,UAAc,aAAA,CAAA,QAAA,CAAS,KAAK,IAAI,CAAA,CAAA;AAAA,SAClC;AAAA,OACF;AAAA,KACF;AAEA,IAAA,KAAA,CAAM,QAAQ,kBAAkB,CAAA,CAAA;AAAA,GAClC;AACF;;;;"}
1	+ {"version":3,"file":"MaterialGroupTable.js","sources":["../../../../../src/dataview/material/material-group/MaterialGroupTable.ts"],"sourcesContent":["import { DataTable, DataTableOptions, TableColumn } from \"@maketribe/dm\";\nimport { MaterialGroup } from \"./MaterialGroupForm\";\n\nexport type MaterialGroupNode = MaterialGroup & {\n children: MaterialGroupNode[];\n};\n\nexport class MaterialGroupTable extends DataTable<\n MaterialGroup,\n MaterialGroupNode\n> {\n constructor(options: Omit<DataTableOptions, \"name\"> = {}) {\n super({\n name: \"ms-material-group\",\n ...options,\n interfaceURL: { list: \"/api/dv/ms-material-group/allList\" },\n });\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: \"desc\", label: \"描述\" }),\n ]);\n }\n\n formatItem(item: MaterialGroup): MaterialGroupNode {\n return {\n id: item.id,\n desc: item.desc,\n parentGroupId: item.parentGroupId,\n children: [],\n };\n }\n\n setList(list: MaterialGroup[]): void {\n const rootMaterialGroups: MaterialGroupNode[] = [];\n\n const materialGroups = list as MaterialGroupNode[];\n\n for (const materialGroup of materialGroups) {\n if (!materialGroup.parentGroupId) {\n rootMaterialGroups.push(materialGroup);\n }\n\n for (const item of materialGroups) {\n if (materialGroup.id === item.parentGroupId) {\n materialGroup.children.push(item);\n }\n }\n }\n\n super.setList(rootMaterialGroups);\n }\n}\n"],"names":["DataTable","TableColumn"],"mappings":";;;;AAOO,MAAM,2BAA2BA,YAGtC,CAAA;AAAA,EACA,WAAA,CAAY,OAA0C,GAAA,EAAI,EAAA;AACxD,IAAM,KAAA,CAAA;AAAA,MACJ,IAAM,EAAA,mBAAA;AAAA,MACN,GAAG,OAAA;AAAA,MACH,YAAA,EAAc,EAAE,IAAA,EAAM,mCAAoC,EAAA;AAAA,KAC3D,CAAA,CAAA;AAAA,GACH;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,MAAQ,EAAA,KAAA,EAAO,gBAAM,CAAA;AAAA,KAC9C,CAAA,CAAA;AAAA,GACH;AAAA,EAEA,WAAW,IAAwC,EAAA;AACjD,IAAO,OAAA;AAAA,MACL,IAAI,IAAK,CAAA,EAAA;AAAA,MACT,MAAM,IAAK,CAAA,IAAA;AAAA,MACX,eAAe,IAAK,CAAA,aAAA;AAAA,MACpB,UAAU,EAAC;AAAA,KACb,CAAA;AAAA,GACF;AAAA,EAEA,QAAQ,IAA6B,EAAA;AACnC,IAAA,MAAM,qBAA0C,EAAC,CAAA;AAEjD,IAAA,MAAM,cAAiB,GAAA,IAAA,CAAA;AAEvB,IAAA,KAAA,MAAW,iBAAiB,cAAgB,EAAA;AAC1C,MAAI,IAAA,CAAC,cAAc,aAAe,EAAA;AAChC,QAAA,kBAAA,CAAmB,KAAK,aAAa,CAAA,CAAA;AAAA,OACvC;AAEA,MAAA,KAAA,MAAW,QAAQ,cAAgB,EAAA;AACjC,QAAI,IAAA,aAAA,CAAc,EAAO,KAAA,IAAA,CAAK,aAAe,EAAA;AAC3C,UAAc,aAAA,CAAA,QAAA,CAAS,KAAK,IAAI,CAAA,CAAA;AAAA,SAClC;AAAA,OACF;AAAA,KACF;AAEA,IAAA,KAAA,CAAM,QAAQ,kBAAkB,CAAA,CAAA;AAAA,GAClC;AACF;;;;"}

package/dist/cjs/dataview/material/material-group/MaterialGroupTree.d.ts ADDED Viewed

@@ -0,0 +1,14 @@
+import { DataTableOptions, DataTree, DataTreeNode } from "@maketribe/dm";
+import { MaterialGroup } from "./MaterialGroupForm";
+export type MaterialGroupNode = MaterialGroup & {
+    children: MaterialGroupNode[];
+};
+export declare class MaterialGroupTree extends DataTree<MaterialGroupNode> {
+    currentDataTreeNode: DataTreeNode<MaterialGroupNode> | null;
+    constructor(options?: DataTableOptions);
+    protected loadRequest(params: Record<string, any>): Promise<import("@maketribe/request").ResponseConfig<import("@maketribe/request").R<MaterialGroupNode[]> & {
+        totalRecCount: string;
+    }, Record<string, any>>>;
+    getCurrentNode(): DataTreeNode<MaterialGroupNode> | null;
+    setCurrentNode(node: DataTreeNode<MaterialGroupNode> | null): void;
+}

package/dist/cjs/dataview/material/material-group/MaterialGroupTree.js ADDED Viewed

@@ -0,0 +1,48 @@
+'use strict';
+var dm = require('@maketribe/dm');
+class MaterialGroupTree extends dm.DataTree {
+  currentDataTreeNode;
+  constructor(options = {}) {
+    super({
+      name: "ms-material-group",
+      props: { label: "desc", children: "children" },
+      ...options
+    });
+    this.currentDataTreeNode = null;
+  }
+  async loadRequest(params) {
+    const response = await super.loadRequest(params);
+    const list = response.data.data;
+    const materialGroups = list;
+    for (const materialGroup of materialGroups) {
+      materialGroup.children = [];
+      if (!materialGroup.parentGroupId) ;
+      for (const item of materialGroups) {
+        if (materialGroup.id === item.parentGroupId) {
+          materialGroup.children.push(item);
+        }
+      }
+    }
+    return response;
+  }
+  getCurrentNode() {
+    if (this.currentDataTreeNode) {
+      return this.currentDataTreeNode;
+    }
+    const getFirstNode = (nodes) => {
+      if (nodes[0].children.length) {
+        return getFirstNode(nodes[0].children);
+      }
+      return nodes[0];
+    };
+    return this.currentDataTreeNode = getFirstNode(this.rootNodes);
+  }
+  setCurrentNode(node) {
+    this.currentDataTreeNode = node;
+  }
+}
+exports.MaterialGroupTree = MaterialGroupTree;
+//# sourceMappingURL=MaterialGroupTree.js.map

package/dist/cjs/dataview/material/material-group/MaterialGroupTree.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"MaterialGroupTree.js","sources":["../../../../../src/dataview/material/material-group/MaterialGroupTree.ts"],"sourcesContent":["import { DataTableOptions, DataTree, DataTreeNode } from \"@maketribe/dm\";\nimport { MaterialGroup } from \"./MaterialGroupForm\";\n\nexport type MaterialGroupNode = MaterialGroup & {\n children: MaterialGroupNode[];\n};\n\nexport class MaterialGroupTree extends DataTree<MaterialGroupNode> {\n currentDataTreeNode: DataTreeNode<MaterialGroupNode> | null;\n\n constructor(options: DataTableOptions = {}) {\n super({\n name: \"ms-material-group\",\n props: { label: \"desc\", children: \"children\" },\n ...options,\n });\n\n this.currentDataTreeNode = null;\n }\n\n protected async loadRequest(params: Record<string, any>) {\n const response = await super.loadRequest(params);\n\n const list = response.data.data;\n\n const rootMaterialGroups: MaterialGroupNode[] = [];\n\n const materialGroups = list as MaterialGroupNode[];\n\n for (const materialGroup of materialGroups) {\n materialGroup.children = [];\n\n if (!materialGroup.parentGroupId) {\n rootMaterialGroups.push(materialGroup);\n }\n\n for (const item of materialGroups) {\n if (materialGroup.id === item.parentGroupId) {\n materialGroup.children.push(item);\n }\n }\n }\n return response;\n }\n\n getCurrentNode() {\n if (this.currentDataTreeNode) {\n return this.currentDataTreeNode;\n }\n\n const getFirstNode = (\n nodes: DataTreeNode<MaterialGroupNode>[]\n ): DataTreeNode<MaterialGroupNode> | null => {\n if (nodes[0].children.length) {\n return getFirstNode(nodes[0].children);\n }\n\n return nodes[0];\n };\n\n return (this.currentDataTreeNode = getFirstNode(this.rootNodes));\n }\n\n setCurrentNode(node: DataTreeNode<MaterialGroupNode> | null) {\n this.currentDataTreeNode = node;\n }\n}\n"],"names":["DataTree"],"mappings":";;;;AAOO,MAAM,0BAA0BA,WAA4B,CAAA;AAAA,EACjE,mBAAA,CAAA;AAAA,EAEA,WAAA,CAAY,OAA4B,GAAA,EAAI,EAAA;AAC1C,IAAM,KAAA,CAAA;AAAA,MACJ,IAAM,EAAA,mBAAA;AAAA,MACN,KAAO,EAAA,EAAE,KAAO,EAAA,MAAA,EAAQ,UAAU,UAAW,EAAA;AAAA,MAC7C,GAAG,OAAA;AAAA,KACJ,CAAA,CAAA;AAED,IAAA,IAAA,CAAK,mBAAsB,GAAA,IAAA,CAAA;AAAA,GAC7B;AAAA,EAEA,MAAgB,YAAY,MAA6B,EAAA;AACvD,IAAA,MAAM,QAAW,GAAA,MAAM,KAAM,CAAA,WAAA,CAAY,MAAM,CAAA,CAAA;AAE/C,IAAM,MAAA,IAAA,GAAO,SAAS,IAAK,CAAA,IAAA,CAAA;AAI3B,IAAA,MAAM,cAAiB,GAAA,IAAA,CAAA;AAEvB,IAAA,KAAA,MAAW,iBAAiB,cAAgB,EAAA;AAC1C,MAAA,aAAA,CAAc,WAAW,EAAC,CAAA;AAE1B,MAAI,IAAA,CAAC,cAAc,aAAe,EAAA,CAElC;AAEA,MAAA,KAAA,MAAW,QAAQ,cAAgB,EAAA;AACjC,QAAI,IAAA,aAAA,CAAc,EAAO,KAAA,IAAA,CAAK,aAAe,EAAA;AAC3C,UAAc,aAAA,CAAA,QAAA,CAAS,KAAK,IAAI,CAAA,CAAA;AAAA,SAClC;AAAA,OACF;AAAA,KACF;AACA,IAAO,OAAA,QAAA,CAAA;AAAA,GACT;AAAA,EAEA,cAAiB,GAAA;AACf,IAAA,IAAI,KAAK,mBAAqB,EAAA;AAC5B,MAAA,OAAO,IAAK,CAAA,mBAAA,CAAA;AAAA,KACd;AAEA,IAAM,MAAA,YAAA,GAAe,CACnB,KAC2C,KAAA;AAC3C,MAAA,IAAI,KAAM,CAAA,CAAC,CAAE,CAAA,QAAA,CAAS,MAAQ,EAAA;AAC5B,QAAA,OAAO,YAAa,CAAA,KAAA,CAAM,CAAC,CAAA,CAAE,QAAQ,CAAA,CAAA;AAAA,OACvC;AAEA,MAAA,OAAO,MAAM,CAAC,CAAA,CAAA;AAAA,KAChB,CAAA;AAEA,IAAA,OAAQ,IAAK,CAAA,mBAAA,GAAsB,YAAa,CAAA,IAAA,CAAK,SAAS,CAAA,CAAA;AAAA,GAChE;AAAA,EAEA,eAAe,IAA8C,EAAA;AAC3D,IAAA,IAAA,CAAK,mBAAsB,GAAA,IAAA,CAAA;AAAA,GAC7B;AACF;;;;"}

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

@@ -1,2 +1,2 @@
 export * from "./MaterialGroupForm";
-export * from "./MaterialGroupTable";
+export * from "./MaterialGroupTree";

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":";;;;;;;;AAoBO,MAAMA,oBAAoBC,YAAyC,CAAA;AAAA,EAGxEC,iBAA4C,GAAA,IAAA,CAAKC,QAAS,CAAA,IAAIC,aAAO,CAAA,CAAA;AAAA,EAErEC,WAAAA,CAAYC,OAA4B,GAAA,EAAI,EAAA;AAC1C,IAAM,KAAA,CAAA;AAAA,MAAEC,IAAM,EAAA,WAAA;AAAA,MAAa,GAAGD,OAAAA;AAAAA,KAAS,CAAA,CAAA;AAEvC,IAAKE,IAAAA,CAAAA,gBAAAA,GAAmB,IAAIC,qBAAW,EAAA,CAAA;AAAA,GACzC;AAAA,EAEA,MAAgBC,UAAa,GAAA;AAC3B,IAAA,MAAM,MAAMA,UAAW,EAAA,CAAA;AAEvB,IAAA,MAAM,KAAKC,oBAAqB,EAAA,CAAA;AAEhC,IAAA,IAAA,CAAKC,UAAWC,CAAAA,UAAAA,CAAW,CACzB,IAAIC,eAAa,CAAA;AAAA,MACfP,IAAM,EAAA,MAAA;AAAA,MACNQ,KAAO,EAAA,cAAA;AAAA,MACPC,aAAe,EAAA,kBAAA;AAAA,KAChB,CACD,EAAA,IAAIF,eAAa,CAAA;AAAA,MACfP,IAAM,EAAA,UAAA;AAAA,MACNQ,KAAO,EAAA,oBAAA;AAAA,MACPC,aAAe,EAAA,kBAAA;AAAA,KAChB,CACD,EAAA,IAAIF,eAAa,CAAA;AAAA,MACfP,IAAM,EAAA,UAAA;AAAA,MACNQ,KAAO,EAAA,cAAA;AAAA,MACPC,aAAe,EAAA,kBAAA;AAAA,KAChB,CACD,EAAA,IAAIF,eAAa,CAAA;AAAA,MACfP,IAAM,EAAA,OAAA;AAAA,MACNQ,KAAO,EAAA,cAAA;AAAA,MACPC,aAAe,EAAA,kBAAA;AAAA,KAChB,CACD,EAAA,IAAIF,eAAa,CAAA;AAAA,MACfP,IAAM,EAAA,OAAA;AAAA,MACNQ,KAAO,EAAA,oBAAA;AAAA,MACPC,aAAe,EAAA,kBAAA;AAAA,KAChB,CACD,EAAA,IAAIF,eAAa,CAAA;AAAA,MACfP,IAAM,EAAA,SAAA;AAAA,MACNQ,KAAO,EAAA,cAAA;AAAA,MACPC,aAAe,EAAA,kBAAA;AAAA,KAChB,CAAC,CACH,CAAA,CAAA;AAED,IAAKH,IAAAA,CAAAA,UAAAA,CAAW,CACd,IAAII,cAAY,CAAA;AAAA,MACdV,IAAM,EAAA,IAAA;AAAA,MACNQ,KAAO,EAAA,cAAA;AAAA,MACPG,KAAO,EAAA,OAAA;AAAA,MACPC,OAAS,EAAA,KAAA;AAAA,KACV,CACD,EAAA,IAAIF,cAAY,CAAA;AAAA,MAAEV,IAAM,EAAA,MAAA;AAAA,MAAQQ,KAAO,EAAA,cAAA;AAAA,MAAMK,QAAU,EAAA,OAAA;AAAA,KAAS,CAChE,EAAA,IAAIH,cAAY,CAAA;AAAA,MAAEV,IAAM,EAAA,UAAA;AAAA,MAAYQ,KAAO,EAAA,cAAA;AAAA,MAAMK,QAAU,EAAA,OAAA;AAAA,KAAS,CACpE,EAAA,IAAIH,cAAY,CAAA;AAAA,MACdV,IAAM,EAAA,QAAA;AAAA,MACNQ,KAAO,EAAA,cAAA;AAAA,MACPC,aAAe,EAAA,eAAA;AAAA,MACfE,KAAO,EAAA,MAAA;AAAA,KACR,CACD,EAAA,IAAID,cAAY,CAAA;AAAA,MAAEV,IAAM,EAAA,SAAA;AAAA,MAAWQ,KAAO,EAAA,cAAA;AAAA,MAAMK,QAAU,EAAA,OAAA;AAAA,KAAS,CACnE,EAAA,IAAIH,cAAY,CAAA;AAAA,MAAEV,IAAM,EAAA,OAAA;AAAA,MAASQ,KAAO,EAAA,cAAA;AAAA,MAAMK,QAAU,EAAA,OAAA;AAAA,KAAS,CACjE,EAAA,IAAIH,cAAY,CAAA;AAAA,MAAEV,IAAM,EAAA,OAAA;AAAA,MAASQ,KAAO,EAAA,oBAAA;AAAA,MAAOK,QAAU,EAAA,OAAA;AAAA,KAAS,CAClE,EAAA,IAAIH,cAAY,CAAA;AAAA,MAAEV,IAAM,EAAA,UAAA;AAAA,MAAYQ,KAAO,EAAA,oBAAA;AAAA,MAAOK,QAAU,EAAA,OAAA;AAAA,KAAS,CACrE,EAAA,IAAIH,cAAY,CAAA;AAAA,MACdV,IAAM,EAAA,OAAA;AAAA,MACNQ,KAAO,EAAA,oBAAA;AAAA,MACPK,QAAU,EAAA,OAAA;AAAA,MACVD,OAAS,EAAA,KAAA;AAAA,KACV,CACD,EAAA,IAAIE,oBAAkB,CAAA;AAAA,MACpBH,KAAO,EAAA,OAAA;AAAA,MACPI,OAAAA,EAAS,CACP,IAAIC,eAAa,CAAA;AAAA,QACfR,KAAO,EAAA,0BAAA;AAAA,QACPS,OAAAA,EAAS,OAAOC,GAAQ,KAAA;AACtB,UAAKvB,IAAAA,CAAAA,iBAAAA,CAAkBwB,KAAKD,GAAG,CAAA,CAAA;AAAA,SACjC;AAAA,QACAE,SAAAA,EAAYC,CAA4BA,MAAAA,KAAAA,MAAAA,CAAOC,KAAU,KAAA,CAAA;AAAA,OAC1D,CACD,EAAA,IAAIN,eAAa,CAAA;AAAA,QACfR,KAAO,EAAA,0BAAA;AAAA,QACPS,OAAAA,EAAS,OAAOC,GAAQ,KAAA;AACtB,UAAA,MAAMK,SAAY,GAAA,MAAMC,WAASC,CAAAA,QAAAA,CAASC,OAAQ,CAAA;AAAA,YAChDC,KAAO,EAAA,0BAAA;AAAA,YACPC,OAAS,EAAA,sCAAA;AAAA,YACTC,IAAM,EAAA,SAAA;AAAA,YACNC,gBAAkB,EAAA,cAAA;AAAA,YAClBC,iBAAmB,EAAA,cAAA;AAAA,WACpB,CAAA,CAAA;AACD,UAAA,IAAI,CAACR,SAAW,EAAA;AACd,YAAA,OAAA;AAAA,WACF;AACA,UAAA,IAAA,CAAKS,eAAeC,YAAa,EAAA,CAAA;AAEjC,UAAA,MAAMC,QAAW,GAAA,MAAM,IAAKC,CAAAA,eAAAA,CAAgBC,aAE1C,CAAA;AAAA,YACAC,MAAAA,EAAS,CAAEnB,EAAAA,GAAAA,CAAIoB,EAAG,CAAA,eAAA,CAAA;AAAA,WACnB,CAAA,CAAA;AAED,UAAA,IAAA,CAAKN,eAAeO,eAAgB,EAAA,CAAA;AACpC,UAAIL,IAAAA,QAAAA,CAASM,IAAKC,CAAAA,IAAAA,KAAS,GAAK,EAAA;AAC9BC,YAAAA,WAAAA,CAASjB,SAASkB,KAAM,CAAA;AAAA,cACtBf,OAAAA,EAASM,QAASM,CAAAA,IAAAA,CAAKI,GAAO,IAAA,sCAAA;AAAA,aAC/B,CAAA,CAAA;AACD,YAAA,OAAA;AAAA,WACF;AAEA,UAAA,MAAMC,GAAM,GAAA,MAAMrB,WAASC,CAAAA,QAAAA,CAASC,OAAQ,CAAA;AAAA,YAC1CC,KAAO,EAAA,sCAAA;AAAA,YACPC,SAAOkB,eAAAA,CAAAA,GAAAA,EAAAA,IAAAA,EAAAA,CAAAA,gBAAAC,MAAAA,EAAAA,IAAAA,EAAAA,CAAAA,mBAAAA,CAEUb,sCAAAA,CAAAA,EAAAA,QAAAA,CAASM,KAAKA,IAAI,CAElC,CAAA,CAAA,CAAA;AAAA,YACDX,IAAM,EAAA,SAAA;AAAA,YACNC,gBAAkB,EAAA,cAAA;AAAA,YAClBC,iBAAmB,EAAA,cAAA;AAAA,WACpB,CAAA,CAAA;AACD,UAAA,IAAI,CAACc,GAAK,EAAA;AACR,YAAA,OAAA;AAAA,WACF;AAEAG,UAAAA,SAAAA,CAAUC,SAAUC,CAAAA,SAAAA,CAAUhB,QAASM,CAAAA,IAAAA,CAAKA,IAAI,CAAA,CAAA;AAChDE,UAAAA,WAAAA,CAASjB,SAAS0B,OAAQ,CAAA;AAAA,YAAEvB,OAAS,EAAA,0BAAA;AAAA,WAAQ,CAAA,CAAA;AAAA,SAC/C;AAAA,QACAR,SAAAA,EAAYC,CAA4BA,MAAAA,KAAAA,MAAAA,CAAOC,KAAU,KAAA,CAAA;AAAA,OAC1D,CACD,EAAA,IAAI8B,aAAW,CAAA;AAAA,QACbhC,SAAAA,EAAYC,CAA4BA,MAAAA,KAAAA,MAAAA,CAAOC,KAAU,KAAA,CAAA;AAAA,OAC1D,CAAA,EACD,IAAI+B,eAAAA,EAAc,CAAA;AAAA,KAErB,CAAC,CACH,CAAA,CAAA;AAAA,GACH;AAAA,EAEA,MAAgBjD,oBAAuB,GAAA;AACrC,IAAA,MAAMH,mBAAmB,IAAKA,CAAAA,gBAAAA,CAAAA;AAE9B,IAAA,MAAMA,iBAAiBqD,IAAK,EAAA,CAAA;AAE5BrD,IAAAA,gBAAAA,CAAiBK,WAAW,CAC1BL,gBAAAA,CAAiBsD,UAAU,IAAI,CAAA,EAC/B,IAAIC,aAAW,CAAA;AAAA,MACbxD,IAAM,EAAA,eAAA;AAAA,MACNQ,KAAO,EAAA,0BAAA;AAAA,MACPiD,YAAc,EAAA,GAAA;AAAA,MACdhD,aAAe,EAAA,gBAAA;AAAA,MACfiD,QAAU,EAAA,IAAA;AAAA,MACVC,cAAgB,EAAA;AAAA,QACd5D,SAAS,CACP;AAAA,UAAES,KAAO,EAAA,cAAA;AAAA,UAAMoD,KAAO,EAAA,GAAA;AAAA,SACtB,EAAA;AAAA,UAAEpD,KAAO,EAAA,oBAAA;AAAA,UAAOoD,KAAO,EAAA,GAAA;AAAA,SAAK,CAAA;AAAA,OAEhC;AAAA,KACD,CAAA,EACD3D,gBAAiBsD,CAAAA,SAAAA,CAAU,OAAO,CAClCtD,EAAAA,gBAAAA,CAAiBsD,SAAU,CAAA,OAAO,CAClCtD,EAAAA,gBAAAA,CAAiBsD,SAAU,CAAA,MAAM,CAAC,CACnC,CAAA,CAAA;AAAA,GACH;AAAA,EAEA,MAAMM,aAAgB,GAAA;AACpB,IAAI,IAAA;AACF,MAAK5D,IAAAA,CAAAA,gBAAAA,CAAiB6D,iBAAkB,EAAA,CAAE7B,YAAa,EAAA,CAAA;AACvD,MAAA,MAAM8B,SAAS,MAAM,IAAA,CAAK9D,gBAAiB+D,CAAAA,WAAAA,EAAaC,KACtD,yCACA,EAAA;AAAA,QACE,GAAG,IAAKhE,CAAAA,gBAAAA,CAAiBiE,gBAAiB,CAAA,IAAA,CAAKjE,iBAAiBuC,IAAI,CAAA;AAAA,OAExE,CAAA,CAAA;AACA,MAAKvC,IAAAA,CAAAA,gBAAAA,CAAiB6D,iBAAkB,EAAA,CAAEvB,eAAgB,EAAA,CAAA;AAE1D,MAAIwB,IAAAA,MAAAA,EAAQvB,IAAKC,CAAAA,IAAAA,IAAQ,GAAK,EAAA;AAC5BC,QAAAA,WAAAA,CAASjB,QAASkB,CAAAA,KAAAA,CAAMoB,MAAQvB,EAAAA,IAAAA,CAAKI,OAAO,0BAAM,CAAA,CAAA;AAClD,QAAA,OAAA;AAAA,OACF;AAEAF,MAAAA,WAAAA,CAASjB,SAAS0B,OAAQ,CAAA;AAAA,QACxBvB,OAAS,EAAA,gFAAA;AAAA,OACV,CAAA,CAAA;AAED,MAAA,IAAA,CAAKuC,IAAK,EAAA,CAAA;AAAA,aACHC,CAAG,EAAA;AACVC,MAAAA,OAAAA,CAAQ1B,MAAMyB,CAAC,CAAA,CAAA;AACf1B,MAAAA,WAAAA,CAASjB,SAASkB,KAAM,CAAA;AAAA,QAAEf,OAAS,EAAA,0BAAA;AAAA,OAAQ,CAAA,CAAA;AAAA,KAC7C;AAAA,GACF;AAAA,EAEA0C,WAAWC,IAAqC,EAAA;AAC9C,IAAIC,IAAAA,MAAAA,CAAAA;AACJ,IAAI,IAAA;AACFA,MAASD,MAAAA,GAAAA,IAAAA,CAAKC,SAAS,IAAIC,GAAAA,CAAIF,KAAKC,MAAM,CAAA,CAAEE,UAAa,GAAA,IAAA,CAAA;AAAA,aAClDN,CAAG,EAAA;AACVI,MAAS,MAAA,GAAA,IAAA,CAAA;AAAA,KACX;AAEA,IAAO,OAAA;AAAA,MACLlC,IAAIiC,IAAKjC,CAAAA,EAAAA;AAAAA,MACTtC,IAAAA,EAAMuE,KAAKvE,IAAQ,IAAA,EAAA;AAAA,MACnB2E,QAAAA,EAAUJ,KAAKI,QAAY,IAAA,EAAA;AAAA,MAC3BC,QAAAA,EAAUL,KAAKK,QAAY,IAAA,EAAA;AAAA,MAC3BC,KAAAA,EAAON,KAAKM,KAAS,IAAA,EAAA;AAAA,MACrBC,KAAAA,EAAOP,KAAKO,KAAS,IAAA,EAAA;AAAA,MACrBC,OAAAA,EAASR,KAAKQ,OAAW,IAAA,EAAA;AAAA,MACzBP,MAAAA;AAAAA,MACAQ,KAAOT,EAAAA,IAAAA,CAAKS,KAAOC,EAAAA,GAAAA,CAAKC,CAAU,IAAA,MAAA;AAAA,QAChC5C,IAAI4C,IAAK5C,CAAAA,EAAAA;AAAAA,QACTtC,IAAAA,EAAMkF,KAAKlF,IAAQ,IAAA,EAAA;AAAA,QACnBmF,IAAAA,EAAMD,KAAKC,IAAQ,IAAA,EAAA;AAAA,OACnB,CAAA,CAAA;AAAA,MACFC,KAAOb,EAAAA,IAAAA,CAAKa,KAAOH,EAAAA,GAAAA,CAAKI,CAAgB,UAAA,MAAA;AAAA,QACtC/C,IAAI+C,UAAW/C,CAAAA,EAAAA;AAAAA,QACftC,IAAAA,EAAMqF,WAAWrF,IAAQ,IAAA,EAAA;AAAA;AAAA,QAEzBsF,GAAAA,EAAKD,WAAWC,GAAO,IAAA,IAAA;AAAA,OACvB,CAAA,CAAA;AAAA,MACFhE,OAAOiD,IAAKjD,CAAAA,KAAAA;AAAAA,KACd,CAAA;AAAA,GACF;AACF,CAAA;AAEAiE,+BAAAA,CAAgB9F,WAAW,CAAA;;;;"}

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

@@ -7,16 +7,23 @@ var MenuTable = require('./MenuTable.js');
 var RouteForm = require('../route/RouteForm.js');
 var PermissionPointDefineForm = require('./permission-point/PermissionPointDefineForm.js');
 var PermissionPointDefineTable = require('./permission-point/PermissionPointDefineTable.js');
+var menu = require('../../constants/menu.js');
 class MenuForm extends dm.DataForm {
   constructor(options = {}) {
     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("type", "=", 1);
+      menuTable.dataFilter.getDefaultGroup().addCondition(
+        "type",
+        "in",
+        `(${[menu.MenuType.Container, menu.MenuType.SystemSettings].map((menuType) => parseInt(menuType)).join(",")})`
+      );
     }
+    const routeTable = this.register(new RouteTable.RouteTable({ pageSize: 10 }));
     this.setColumns([
       new dm.FormColumn({ name: "id", label: "\u7F16\u53F7" }),
       new dm.FormColumn({ name: "title", label: "\u83DC\u5355\u63CF\u8FF0", required: true }),
@@ -30,12 +37,13 @@ class MenuForm extends dm.DataForm {
         name: "type",
         label: "\u83DC\u5355\u7C7B\u578B",
         componentInfo: "MKFormDataSelect",
-        defaultValue: 2,
+        defaultValue: menu.MenuType.Menu,
         required: true,
         componentProps: {
           options: [
-            { value: 1, label: "\u83DC\u5355\u7EC4" },
-            { value: 2, label: "\u83DC\u5355" }
+            { value: menu.MenuType.Container, label: "\u83DC\u5355\u7EC4" },
+            { value: menu.MenuType.Menu, label: "\u83DC\u5355" },
+            { value: menu.MenuType.SystemSettings, label: "\u7CFB\u7EDF\u8BBE\u7F6E" }
           ]
         }
       }),
@@ -45,7 +53,7 @@ class MenuForm extends dm.DataForm {
         componentInfo: "MKFormDataTableSelect",
         componentProps: {
           labelFieldName: "title",
-          dataTable: this.register(new RouteTable.RouteTable({ pageSize: 10 }))
+          dataTable: routeTable
         }
       }),
       new dm.FormColumn({
@@ -73,31 +81,38 @@ class MenuForm extends dm.DataForm {
         detailTable: this.register(new PermissionPointDefineTable.PermissionPointDefineTable())
       })
     ]);
-    this.register(
-      this.formItemValueChangeEvent.on(({ formItem }) => {
-        if (formItem.name === "type") {
-          this.getColumn("routes").visible = this.data?.type !== "1";
-          this.getColumn("permissionPoints").visible = this.data?.type !== "1";
+    this.dataFormTypeChangeEvent.on(({ dataFormType }) => {
+      if (dataFormType === dm.DataFormType.UPDATE) {
+        const routeTableDataFilter = routeTable.dataFilter;
+        if (dm.isWhereFilter(routeTableDataFilter)) {
+          routeTableDataFilter.getDefaultGroup().clear();
+          routeTableDataFilter.getDefaultGroup().addCondition("menuId", "=", this.data.id);
         }
-      })
-    );
-    this.register(
-      this.dataChangeEvent.on(({}) => {
-        this.getColumn("routes").visible = this.data?.type !== "1";
-        this.getColumn("permissionPoints").visible = this.data?.type !== "1";
-      })
-    );
-    this.register(
-      this.dataFormTypeChangeEvent.on(({ dataFormType }) => {
-        this.getColumn("type").disabled = dataFormType !== dm.DataFormType.ADD;
-      })
-    );
+      }
+    });
+    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") {
+        handleMenuTypeChange();
+      }
+    });
+    this.dataChangeEvent.on(handleMenuTypeChange);
+    this.dataFormTypeChangeEvent.on(({ dataFormType }) => {
+      this.getColumn("type").disabled = dataFormType !== dm.DataFormType.ADD;
+    });
   }
   formatSubmitData(data) {
-    const permissionPoints = data.type === 2 ? data.permissionPoints : [];
-    const routes = data.type === 2 ? data.routes : [];
+    const permissionPoints = data.type === menu.MenuType.Menu ? data.permissionPoints : [];
+    const routes = data.type === menu.MenuType.Menu ? data.routes : [];
+    const parsedType = parseInt(data.type);
     return {
       ...data,
+      type: isNaN(parsedType) ? parseInt(menu.MenuType.Menu) : parsedType,
       iconName: data.iconName || null,
       pid: data.pid || null,
       routeId: data.routeId || null,
@@ -112,7 +127,7 @@ class MenuForm extends dm.DataForm {
       iconName: item.iconName || "",
       pid: item.pid || "",
       routeId: item.routeId,
-      type: item.type,
+      type: item.type ? `${item.type}` : "1",
       sort: item.sort || "0",
       routes: item.routes || [],
       permissionPoints: item.permissionPoints || []