npm - @maketribe/ms-app - Versions diffs - 3.0.59 → 3.0.60 - Mend

@maketribe/ms-app 3.0.59 → 3.0.60

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

package/dist/esm/modules/ms/components/material-select/material-select-options.d.ts CHANGED Viewed

@@ -14,7 +14,7 @@ export declare const materialSelectProps: {
         __mkPropKey: true;
     };
     allowMaterialTypeValues: {
-        readonly type: import("vue").PropType<string[]>;
+        readonly type: import("vue").PropType<number[]>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __mkPropKey: true;

package/dist/esm/modules/ms/components/material-select/material-select.d.ts CHANGED Viewed

@@ -13,7 +13,7 @@ declare const _default: import("vue").DefineComponent<{
         __mkPropKey: true;
     };
     allowMaterialTypeValues: {
-        readonly type: import("vue").PropType<string[]>;
+        readonly type: import("vue").PropType<number[]>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __mkPropKey: true;
@@ -37,7 +37,7 @@ declare const _default: import("vue").DefineComponent<{
         __mkPropKey: true;
     };
     allowMaterialTypeValues: {
-        readonly type: import("vue").PropType<string[]>;
+        readonly type: import("vue").PropType<number[]>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __mkPropKey: true;

package/dist/esm/modules/ms/components/rich-text-editor/rich-text-editor.js CHANGED Viewed

@@ -27,10 +27,25 @@ var richTextEditor = /* @__PURE__ */ defineComponent({
       const tinymceInstance = await TinyMCE.init({
         target: unref(richTextEditorEl),
         promotion: false,
-        plugins: ["link", "table", "fullscreen", "code"],
+        plugins: ["link", "table", "fullscreen", "code", "bbcode"],
         branding: false,
         menubar: false,
+        valid_elements: "*[*]",
+        // 允许所有元素和属性
+        extended_valid_elements: "script[type|src|language|content]",
+        // 扩展允许的元素，包括 script 标签
         forced_root_block: " ",
+        // 禁用自动生成 <p> 标签
+        verify_html: false,
+        // 禁用 HTML 验证
+        cleanup: false,
+        // 禁用内容清理
+        entity_encoding: "raw",
+        // 原样保留 HTML 实体
+        convert_urls: false,
+        // 禁用 URL 转换
+        content_style: "body { white-space: pre-wrap; }",
+        // 保留空白字符格式
         font_family_formats: "\u5FAE\u8F6F\u96C5\u9ED1='\u5FAE\u8F6F\u96C5\u9ED1';\u5B8B\u4F53='\u5B8B\u4F53';\u9ED1\u4F53='\u9ED1\u4F53';\u4EFF\u5B8B='\u4EFF\u5B8B';\u6977\u4F53='\u6977\u4F53';\u96B6\u4E66='\u96B6\u4E66';\u5E7C\u5706='\u5E7C\u5706';Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings",
         toolbar: "undo redo | styles | fontfamily |  fontsize forecolor | bold italic underline strikethrough | alignleft aligncenter alignright | material | outdent indent | link | table | hr | removeformat  | code fullscreen",
         language: "zh-Hans",

package/dist/esm/modules/ms/components/rich-text-editor/rich-text-editor.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"rich-text-editor.js","sources":["../../../../../../src/modules/ms/components/rich-text-editor/rich-text-editor.tsx"],"sourcesContent":["import {~~\r\n~~ Ref~~,\r\n~~ computed~~,\r\n~~ defineComponent~~,\r\n~~ getCurrentInstance~~,\r\n~~ onBeforeUnmount~~,\r\n~~ onMounted~~,\r\n~~ ref~~,\r\n~~ unref~~,\r\n~~ watch~~,\r\n~~ withCtx~~,\r\n~~} from \"vue\";\r\nimport { MKMaterialSelect } from \"../material-select\";\r\nimport TinyMCE from \"tinymce\";\r\nimport \"tinymce/themes/silver/theme.js\";\r\nimport \"tinymce/models/dom/model.min.js\";\r\nimport \"tinymce/icons/default/icons.min.js\";\r\nimport \"tinymce/skins/ui/oxide/skin.js\";\r\nimport \"tinymce/skins/ui/oxide/content.js\";\r\nimport \"tinymce/skins/content/default/content.js\";\r\nimport \"tinymce/plugins/link\";\r\nimport \"tinymce/plugins/table\";\r\nimport \"tinymce/plugins/fullscreen\";\r\nimport \"tinymce/plugins/code\";\r\nimport \"./langs/zh-Hans.js\";\r\n\r\nimport {~~\r\n~~ richTextEditorEmits~~,\r\n~~ richTextEditorProps~~,\r\n~~} from \"./rich-text-editor-options\";\r\n\r\nexport default defineComponent({\r\n ~~name~~: \"MKRichTextEditor\",\r\n ~~props~~: richTextEditorProps,\r\n ~~emits~~: richTextEditorEmits,\r\n ~~setup~~(props, { emit }) {\r\n ~~const~~ richTextEditorEl: Ref<HTMLElement \| null> = ref(null);\r\n\r\n ~~const~~ instance = getCurrentInstance();\r\n\r\n ~~onMounted~~(async () => {\r\n ~~const~~ tinymceInstance = await TinyMCE.init({\r\n\t\t\t\ttarget: unref(richTextEditorEl)!,\r\n\t\t\t\tpromotion: false,\r\n\t\t\t\tplugins: [\"link\", \"table\", \"fullscreen\", \"code\"],\r\n\t\t\t\tbranding: false,\r\n\t\t\t\tmenubar: false,\r\n\t\t\t\tforced_root_block: \" \",\r\n\t\t\t\tfont_family_formats:\r\n\t\t\t\t\t\"微软雅黑='微软雅黑';宋体='宋体';黑体='黑体';仿宋='仿宋';楷体='楷体';隶书='隶书';幼圆='幼圆';Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings\",\r\n\t\t\t\ttoolbar:\r\n\t\t\t\t\t\"undo redo \| styles \| fontfamily \| fontsize forecolor \| bold italic underline strikethrough \| alignleft aligncenter alignright \| material \| outdent indent \| link \| table \| hr \| removeformat \| code fullscreen\",\r\n\t\t\t\tlanguage: \"zh-Hans\",\r\n\t\t\t\tskin_url: \"default\",\r\n\t\t\t\tsetup: (editor) => {\r\n\t\t\t\t\teditor.ui.registry.addButton(\"material\", {\r\n\t\t\t\t\t\ticon: \"image\",\r\n\t\t\t\t\t\tonAction: async () => {\r\n\t\t\t\t\t\t\tconst response = await MKMaterialSelect();\r\n\t\t\t\t\t\t\tif (!response.success) {\r\n\t\t\t\t\t\t\t\treturn;\r\n\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\teditor.insertContent(`<img src=\"${response.path}\" alt=\"${response.data!.id}\">`);\r\n\t\t\t\t\t\t},\r\n\t\t\t\t\t});\r\n\t\t\t\t\teditor.on(\"paste\", (event, ...args) => {\r\n\t\t\t\t\t\tconsole.log(event, ...args);\r\n\t\t\t\t\t});\r\n\t\t\t\t\teditor.on(\"change input undo redo\", () => {\r\n\t\t\t\t\t\temit(\"update:model-value\", editor.getContent());\r\n\t\t\t\t\t});\r\n\t\t\t\t},\r\n\t\t\t});\r\n ~~watch~~(\r\n ~~computed~~(() => props.modelValue),\r\n (modelValue) => {\r\n ~~for~~ (const instance of tinymceInstance) {\r\n if (instance.getContent() !== modelValue) {\r\n ~~instance~~.setContent(modelValue);\r\n }\r\n }\r\n },\r\n { immediate: true }\r\n );\r\n ~~watch~~(\r\n ~~computed~~(() => props.disabled),\r\n (disabled) => {\r\n ~~for~~ (const instance of tinymceInstance) {\r\n ~~instance~~.mode.set(disabled ? \"readonly\" : \"design\");\r\n }\r\n },\r\n { immediate: true }\r\n );\r\n\r\n ~~withCtx~~(() => {\r\n ~~onBeforeUnmount~~(() => {\r\n ~~for~~ (const instance of tinymceInstance) {\r\n ~~instance~~.destroy();\r\n }\r\n });\r\n }, instance);\r\n });\r\n ~~return~~ () => {\r\n ~~return~~ (\r\n <div class=\"mk-rich-text-editor\">\r\n <div~~\r\n~~ class=\"mk-rich-text-editor__wrapper\"~~\r\n~~ ref={((el: HTMLElement) => (richTextEditorEl.value = el)) as any}\r\n ~~/>\r~~\n </div>\r\n );\r\n };\r\n },\r\n});\r\n"],"names":["name","props","richTextEditorProps","emits","richTextEditorEmits","setup","emit","richTextEditorEl","ref","instance","getCurrentInstance","onMounted","tinymceInstance","TinyMCE","init","target","unref","promotion","plugins","branding","menubar","forced_root_block","font_family_formats","toolbar","language","skin_url","editor","ui","registry","addButton","icon","onAction","response","MKMaterialSelect","success","insertContent","path","data","id","on","event","args","console","log","getContent","watch","computed","modelValue","setContent","immediate","disabled","mode","set","withCtx","onBeforeUnmount","destroy","_createVNode","el","value"],"mappings":";;;;;;;;;;;;;;;;~~AA+BA~~,qCAA+B,eAAA,CAAA;AAAA,~~EAC7BA~~,IAAM,EAAA,kBAAA;AAAA,EACNC,KAAOC,EAAAA,mBAAAA;AAAAA,EACPC,KAAOC,EAAAA,mBAAAA;AAAAA,EACPC,MAAMJ,KAAO,EAAA;AAAA,IAAEK,IAAAA;AAAAA,GAAQ,EAAA;~~AACrB~~,IAAMC,MAAAA,gBAAAA,GAA4CC,IAAI,IAAI,CAAA,CAAA;AAE1D,IAAA,MAAMC,WAAWC,kBAAmB,EAAA,CAAA;~~AAEpCC~~,IAAAA,SAAAA,CAAU,YAAY;~~AACpB~~,MAAMC,MAAAA,eAAAA,GAAkB,MAAMC,OAAAA,CAAQC,IAAK,CAAA;AAAA,~~QAC7CC~~,MAAAA,EAAQC,MAAMT,gBAAgB,CAAA;AAAA,QAC9BU,SAAW,EAAA,KAAA;AAAA,QACXC,~~OAAS~~,~~EAAA,~~CAAC,~~MAAQ~~,EAAA,~~OAAA~~,~~EAAS~~,~~cAAc~~,~~MAAM~~,CAAA;AAAA,~~QAC/CC~~,QAAU,EAAA,KAAA;AAAA,QACVC,OAAS,EAAA,KAAA;AAAA,QACTC,iBAAmB,EAAA,GAAA;AAAA,QACnBC,mBACC,EAAA,isBAAA;AAAA,QACDC,OACC,EAAA,kNAAA;AAAA,QACDC,QAAU,EAAA,SAAA;AAAA,QACVC,QAAU,EAAA,SAAA;AAAA,~~QACVpB~~,~~OAAQqB~~,CAAW,MAAA,KAAA;AAClBA,UAAOC,MAAAA,CAAAA,EAAAA,CAAGC,QAASC,CAAAA,SAAAA,CAAU,UAAY,EAAA;AAAA,YACxCC,IAAM,EAAA,OAAA;AAAA,YACNC,UAAU,YAAY;AACrB,cAAMC,MAAAA,QAAAA,GAAW,MAAMC,gBAAiB,EAAA,CAAA;AACxC,cAAI,IAAA,CAACD,SAASE,OAAS,EAAA;AACtB,gBAAA,OAAA;AAAA,eACD;AACAR,cAAOS,MAAAA,CAAAA,aAAAA,CAAe,aAAYH,QAASI,CAAAA,IAAK,UAASJ,QAASK,CAAAA,IAAAA,CAAMC,EAAG,CAAG,EAAA,CAAA,CAAA,CAAA;AAAA,aAC/E;AAAA,WACA,CAAA,CAAA;AACDZ,UAAAA,MAAAA,CAAOa,EAAG,CAAA,OAAA,EAAS,CAACC,KAAAA,EAAAA,GAAUC,IAAS,KAAA;AACtCC,YAAQC,OAAAA,CAAAA,GAAAA,CAAIH,KAAO,EAAA,GAAGC,IAAI,CAAA,CAAA;AAAA,WAC1B,CAAA,CAAA;AACDf,UAAOa,MAAAA,CAAAA,EAAAA,CAAG,0BAA0B,MAAM;~~AACzCjC~~,YAAK,IAAA,CAAA,oBAAA,~~EAAsBoB~~,MAAOkB,CAAAA,UAAAA,EAAY,CAAA,CAAA;AAAA,WAC9C,CAAA,CAAA;AAAA,SACF;AAAA,OACA,CAAA,CAAA;~~AACEC~~,MAAAA,KAAAA,~~CACEC~~,QAAS,CAAA,~~MAAM7C~~,~~KAAM8C~~,CAAAA,UAAU,GAC9BA,CAAe,UAAA,KAAA;~~AACd~~,QAAA,KAAA,~~MAAWtC~~,aAAYG,eAAiB,EAAA;~~AACtC~~,UAAIH,IAAAA,SAAAA,~~CAASmC~~,UAAW,EAAA,KAAMG,UAAY,EAAA;~~AACxCtC~~,YAAAA,SAAAA,~~CAASuC~~,WAAWD,UAAU,CAAA,CAAA;AAAA,~~WAChC~~;AAAA,~~SACF~~;AAAA,~~OAEF~~,EAAA;AAAA,QAAEE,SAAW,EAAA,IAAA;AAAA,~~OACf~~,CAAA,CAAA;AACAJ,MAAAA,KAAAA,~~CACEC~~,QAAS,CAAA,~~MAAM7C~~,~~KAAMiD~~,CAAAA,QAAQ,GAC5BA,CAAa,QAAA,KAAA;~~AACZ~~,QAAA,KAAA,~~MAAWzC~~,aAAYG,eAAiB,EAAA;~~AACtCH~~,UAAAA,~~SAAS0C~~,CAAAA,IAAAA,CAAKC,GAAIF,CAAAA,QAAAA,GAAW,aAAa,QAAQ,CAAA,CAAA;AAAA,~~SACpD~~;AAAA,~~OAEF~~,EAAA;AAAA,QAAED,SAAW,EAAA,IAAA;AAAA,~~OACf~~,CAAA,CAAA;AAEAI,MAAAA,OAAAA,CAAQ,MAAM;~~AACZC~~,QAAAA,eAAAA,CAAgB,MAAM;~~AACpB~~,UAAA,KAAA,~~MAAW7C~~,aAAYG,eAAiB,EAAA;~~AACtCH~~,YAAAA,~~UAAS8C~~,OAAQ,EAAA,CAAA;AAAA,~~WACnB~~;AAAA,~~SACD~~,CAAA,CAAA;AAAA,~~SACA9C~~,QAAQ,CAAA,CAAA;AAAA,~~KACZ~~,CAAA,CAAA;AACD,IAAA,OAAO,MAAM;~~AACX~~,MAAA,~~OAAA+C~~,YAAA,KAAA,EAAA;AAAA,QAAA,OAAA,EAAA,qBAAA;AAAA,OAAA,EAAA,CAAAA,WAAAA,CAAA,KAAA,EAAA;AAAA,QAAA,OAAA,EAAA,8BAAA;AAAA,QAAA,KAAA,~~EAIaC~~,~~CAAqBlD~~,EAAAA,KAAAA,gBAAAA,~~CAAiBmD~~,KAAQD,GAAAA,EAAAA;AAAAA,OAAG,EAAA,IAAA,CAAA,CAAA,CAAA,CAAA;AAAA,~~KAIhE~~,CAAA;AAAA,~~GACF~~;~~AACF~~,CAAC,CAAA;;;;"}
1	+ {"version":3,"file":"rich-text-editor.js","sources":["../../../../../../src/modules/ms/components/rich-text-editor/rich-text-editor.tsx"],"sourcesContent":["import { Ref, computed, defineComponent, getCurrentInstance, onBeforeUnmount, onMounted, ref, unref, watch, withCtx } from \"vue\";\r\nimport { MKMaterialSelect } from \"../material-select\";\r\nimport TinyMCE from \"tinymce\";\r\nimport \"tinymce/themes/silver/theme.js\";\r\nimport \"tinymce/models/dom/model.min.js\";\r\nimport \"tinymce/icons/default/icons.min.js\";\r\nimport \"tinymce/skins/ui/oxide/skin.js\";\r\nimport \"tinymce/skins/ui/oxide/content.js\";\r\nimport \"tinymce/skins/content/default/content.js\";\r\nimport \"tinymce/plugins/link\";\r\nimport \"tinymce/plugins/table\";\r\nimport \"tinymce/plugins/fullscreen\";\r\nimport \"tinymce/plugins/code\";\r\nimport \"./langs/zh-Hans.js\";\r\n\r\nimport { richTextEditorEmits, richTextEditorProps } from \"./rich-text-editor-options\";\r\n\r\nexport default defineComponent({\r\n\tname: \"MKRichTextEditor\",\r\n\tprops: richTextEditorProps,\r\n\temits: richTextEditorEmits,\r\n\tsetup(props, { emit }) {\r\n\t\tconst richTextEditorEl: Ref<HTMLElement \| null> = ref(null);\r\n\r\n\t\tconst instance = getCurrentInstance();\r\n\t\tfunction escapeHtml(text: string) {\r\n\t\t\treturn text.replace(/&/g, \"&\").replace(/</g, \"<\").replace(/>/g, \">\").replace(/\"/g, \""\").replace(/'/g, \"'\");\r\n\t\t}\r\n\t\tonMounted(async () => {\r\n\t\t\tconst tinymceInstance = await TinyMCE.init({\r\n\t\t\t\ttarget: unref(richTextEditorEl)!,\r\n\t\t\t\tpromotion: false,\r\n\t\t\t\tplugins: [\"link\", \"table\", \"fullscreen\", \"code\", \"bbcode\"],\r\n\t\t\t\tbranding: false,\r\n\t\t\t\tmenubar: false,\r\n\t\t\t\tvalid_elements: \"[]\", // 允许所有元素和属性\r\n\t\t\t\textended_valid_elements: \"script[type\|src\|language\|content]\", // 扩展允许的元素，包括 script 标签\r\n\t\t\t\tforced_root_block: \" \", // 禁用自动生成 <p> 标签\r\n\t\t\t\tverify_html: false, // 禁用 HTML 验证\r\n\t\t\t\tcleanup: false, // 禁用内容清理\r\n\t\t\t\tentity_encoding: \"raw\", // 原样保留 HTML 实体\r\n\t\t\t\tconvert_urls: false, // 禁用 URL 转换\r\n\t\t\t\tcontent_style: \"body { white-space: pre-wrap; }\", // 保留空白字符格式\r\n\t\t\t\tfont_family_formats:\r\n\t\t\t\t\t\"微软雅黑='微软雅黑';宋体='宋体';黑体='黑体';仿宋='仿宋';楷体='楷体';隶书='隶书';幼圆='幼圆';Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings\",\r\n\t\t\t\ttoolbar:\r\n\t\t\t\t\t\"undo redo \| styles \| fontfamily \| fontsize forecolor \| bold italic underline strikethrough \| alignleft aligncenter alignright \| material \| outdent indent \| link \| table \| hr \| removeformat \| code fullscreen\",\r\n\t\t\t\tlanguage: \"zh-Hans\",\r\n\t\t\t\tskin_url: \"default\",\r\n\t\t\t\tsetup: (editor) => {\r\n\t\t\t\t\teditor.ui.registry.addButton(\"material\", {\r\n\t\t\t\t\t\ticon: \"image\",\r\n\t\t\t\t\t\tonAction: async () => {\r\n\t\t\t\t\t\t\tconst response = await MKMaterialSelect();\r\n\t\t\t\t\t\t\tif (!response.success) {\r\n\t\t\t\t\t\t\t\treturn;\r\n\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\teditor.insertContent(`<img src=\"${response.path}\" alt=\"${response.data!.id}\">`);\r\n\t\t\t\t\t\t},\r\n\t\t\t\t\t});\r\n\t\t\t\t\teditor.on(\"paste\", (event, ...args) => {\r\n\t\t\t\t\t\tconsole.log(event, ...args);\r\n\t\t\t\t\t});\r\n\t\t\t\t\teditor.on(\"change input undo redo\", () => {\r\n\t\t\t\t\t\temit(\"update:model-value\", editor.getContent());\r\n\t\t\t\t\t});\r\n\t\t\t\t},\r\n\t\t\t});\r\n\t\t\twatch(\r\n\t\t\t\tcomputed(() => props.modelValue),\r\n\t\t\t\t(modelValue) => {\r\n\t\t\t\t\tfor (const instance of tinymceInstance) {\r\n\t\t\t\t\t\tif (instance.getContent() !== modelValue) {\r\n\t\t\t\t\t\t\tinstance.setContent(modelValue);\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t}\r\n\t\t\t\t},\r\n\t\t\t\t{ immediate: true }\r\n\t\t\t);\r\n\t\t\twatch(\r\n\t\t\t\tcomputed(() => props.disabled),\r\n\t\t\t\t(disabled) => {\r\n\t\t\t\t\tfor (const instance of tinymceInstance) {\r\n\t\t\t\t\t\tinstance.mode.set(disabled ? \"readonly\" : \"design\");\r\n\t\t\t\t\t}\r\n\t\t\t\t},\r\n\t\t\t\t{ immediate: true }\r\n\t\t\t);\r\n\r\n\t\t\twithCtx(() => {\r\n\t\t\t\tonBeforeUnmount(() => {\r\n\t\t\t\t\tfor (const instance of tinymceInstance) {\r\n\t\t\t\t\t\tinstance.destroy();\r\n\t\t\t\t\t}\r\n\t\t\t\t});\r\n\t\t\t}, instance);\r\n\t\t});\r\n\t\treturn () => {\r\n\t\t\treturn (\r\n\t\t\t\t<div class=\"mk-rich-text-editor\">\r\n\t\t\t\t\t<div class=\"mk-rich-text-editor__wrapper\" ref={((el: HTMLElement) => (richTextEditorEl.value = el)) as any} />\r\n\t\t\t\t</div>\r\n\t\t\t);\r\n\t\t};\r\n\t},\r\n});\r\n"],"names":["name","props","richTextEditorProps","emits","richTextEditorEmits","setup","emit","richTextEditorEl","ref","instance","getCurrentInstance","onMounted","tinymceInstance","TinyMCE","init","target","unref","promotion","plugins","branding","menubar","valid_elements","extended_valid_elements","forced_root_block","verify_html","cleanup","entity_encoding","convert_urls","content_style","font_family_formats","toolbar","language","skin_url","editor","ui","registry","addButton","icon","onAction","response","MKMaterialSelect","success","insertContent","path","data","id","on","event","args","console","log","getContent","watch","computed","modelValue","setContent","immediate","disabled","mode","set","withCtx","onBeforeUnmount","destroy","_createVNode","el","value"],"mappings":"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"}

package/dist/esm/modules/ms/dataviews/ms-config/MsConfigForm.d.ts CHANGED Viewed

@@ -17,6 +17,6 @@ export declare class MsConfigForm extends DataForm<MsConfig> implements ITypeRes
     protected initialize(): Promise<void>;
     formatItem(item: MsConfig): MsConfig;
     formatSubmitData(data: any): any;
-    resolveType(type: string): "MKConfigInput" | "MKConfigInputNumber" | "MKConfigJsonEditor";
+    resolveStringType(type: string): "MKConfigInput" | "MKConfigInputNumber" | "MKConfigJsonEditor";
     resolveItemType(config: MsConfig): "MKConfigInput" | "MKConfigInputNumber" | "MKConfigJsonEditor";
 }

package/dist/esm/modules/ms/dataviews/ms-config/MsConfigForm.js CHANGED Viewed

@@ -60,7 +60,7 @@ class MsConfigForm extends DataForm {
             }
           }
         ],
-        componentInfo: this.resolveType(defaultType)
+        componentInfo: this.resolveStringType(defaultType)
       }),
       new FormColumn({
         name: "memo",
@@ -79,18 +79,14 @@ class MsConfigForm extends DataForm {
       }
       disposable = new Disposable();
       const valueFormColumn = this.getColumn("value");
-      valueFormColumn.componentInfo = this.configComponent.resolveComponent(
-        this.resolveItemType(this.data)
-      ) || this.configComponent.resolveComponent("MKFormInput");
+      valueFormColumn.componentInfo = this.configComponent.resolveComponent(this.resolveItemType(this.data)) || this.configComponent.resolveComponent("MKFormInput");
       disposable.register(
         this.getColumn("type").valueChangeEvent.on(() => {
           if (!this.data) {
             return;
           }
           const valueFormColumn2 = this.getColumn("value");
-          valueFormColumn2.componentInfo = this.configComponent.resolveComponent(
-            this.resolveItemType(this.data)
-          ) || this.configComponent.resolveComponent("MKFormInput");
+          valueFormColumn2.componentInfo = this.configComponent.resolveComponent(this.resolveItemType(this.data)) || this.configComponent.resolveComponent("MKFormInput");
           this.data.value = null;
         })
       );
@@ -112,7 +108,7 @@ class MsConfigForm extends DataForm {
       value: data.type === "json" ? data.value : JSON.stringify(data.value)
     };
   }
-  resolveType(type) {
+  resolveStringType(type) {
     switch (type) {
       case "int":
         return "MKConfigInputNumber";
@@ -123,7 +119,7 @@ class MsConfigForm extends DataForm {
     }
   }
   resolveItemType(config) {
-    return this.resolveType(config.type);
+    return this.resolveStringType(config.type);
   }
 }

package/dist/esm/modules/ms/dataviews/ms-config/MsConfigForm.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MsConfigForm.js","sources":["../../../../../../src/modules/ms/dataviews/ms-config/MsConfigForm.ts"],"sourcesContent":["import {\r\n DataForm,\r\n DataFormOptions,\r\n FormColumn,\r\n IComponents,\r\n} from \"@maketribe/dm\";\r\nimport { ConfigComponents, ITypeResolver } from \"../../../../core\";\r\nimport { Disposable } from \"@maketribe/utils\";\r\nimport { DATA_MODEL_NAME } from \"../../../../constants\";\r\nimport { MODULE_NAME } from \"../../constants\";\r\n\r\nexport type MsConfig<T = any> = {\r\n id: string;\r\n key: string;\r\n type: string;\r\n value: T;\r\n};\r\n\r\nexport type MsConfigFormOptions = DataFormOptions & {\r\n configComponent?: IComponents;\r\n};\r\n\r\nexport class MsConfigForm~~\r\n~~ extends DataForm<MsConfig~~>\r\n~~ implements ITypeResolver<MsConfig~~>\r\n~~{\r\n ~~static~~ [DATA_MODEL_NAME]: string = \"mk-sys-config\";\r\n\r\n ~~configComponent~~: IComponents;\r\n\r\n ~~constructor~~(options: MsConfigFormOptions = {}) {\r\n ~~super~~({\r\n ~~name~~: MsConfigForm[DATA_MODEL_NAME],\r\n ~~moduleName~~: MODULE_NAME,\r\n ...options,\r\n });\r\n\r\n ~~this~~.configComponent = options.configComponent ?? new ConfigComponents();\r\n }\r\n\r\n ~~protected~~ async initialize() {\r\n ~~await~~ super.initialize();\r\n\r\n ~~const~~ defaultType = \"string\";\r\n ~~this~~.setColumns([\r\n ~~new~~ FormColumn({ name: \"id\", label: \"编号\" }),\r\n ~~new~~ FormColumn({ name: \"key\", label: \"配置键\", required: true }),\r\n ~~new~~ FormColumn({\r\n ~~name~~: \"type\",\r\n ~~label~~: \"类型\",\r\n ~~componentInfo~~: \"MKFormDataSelect\",\r\n ~~defaultValue~~: defaultType,\r\n ~~required~~: true,\r\n ~~componentProps~~: {\r\n ~~options~~: [\r\n { value: \"string\", label: \"字符串\" },\r\n { value: \"int\", label: \"整数\" },\r\n { value: \"json\", label: \"JSON\" },\r\n ],\r\n },\r\n }),\r\n ~~new~~ FormColumn({\r\n ~~name~~: \"value\",\r\n ~~label~~: \"配置值\",\r\n ~~required~~: true,\r\n ~~defaultValue~~: null,\r\n ~~rules~~: [\r\n {\r\n ~~validator~~: (rule, value, callback) => {\r\n if (this.data?.type === \"json\") {\r\n ~~try~~ {\r\n ~~JSON~~.parse(value);\r\n } catch (e) {\r\n ~~callback~~(new Error(\"JSON格式错误\"));\r\n }\r\n }\r\n\r\n ~~callback~~();\r\n },\r\n },\r\n ],\r\n ~~componentInfo~~: this.~~resolveType~~(defaultType),\r\n }),\r\n ~~new~~ FormColumn({\r\n ~~name~~: \"memo\",\r\n ~~label~~: \"备注\",\r\n ~~defaultValue~~: \"\",\r\n ~~componentInfo~~: \"MKFormRichTextEditor\",\r\n // componentInfo: \"MKFormInput\",\r\n // componentProps: { type: \"textarea\", rows: 4 },\r\n }),\r\n ]);\r\n\r\n ~~let~~ disposable: Disposable \| null = null;\r\n\r\n ~~this~~.dataChangeEvent.on(({ data }) => {\r\n ~~disposable~~?.dispose();\r\n\r\n if (!data) {\r\n ~~return~~ null;\r\n }\r\n\r\n ~~disposable~~ = new Disposable();\r\n\r\n ~~const~~ valueFormColumn = this.getColumn(\"value\")!;\r\n ~~valueFormColumn~~.componentInfo ~~=\r\n~~ this.configComponent.resolveComponent(~~\r\n~~ this.resolveItemType(this.data!)~~\r\n~~ ) \|\| this.configComponent.resolveComponent(\"MKFormInput\")!;\r\n\r\n ~~disposable~~.register(\r\n ~~this~~.getColumn(\"type\")!.valueChangeEvent.on(() => {\r\n if (!this.data) {\r\n ~~return~~;\r\n }\r\n\r\n ~~const~~ valueFormColumn = this.getColumn(\"value\")!;\r\n ~~valueFormColumn~~.componentInfo ~~=\r\n~~ this.configComponent.resolveComponent(~~\r\n~~ this.resolveItemType(this.data!)~~\r\n~~ ) \|\| this.configComponent.resolveComponent(\"MKFormInput\")!;\r\n\r\n ~~this~~.data!.value = null;\r\n })\r\n );\r\n });\r\n }\r\n\r\n ~~formatItem~~(item: MsConfig): MsConfig {\r\n ~~let~~ value = item.value;\r\n\r\n if (item.type !== \"json\") {\r\n ~~try~~ {\r\n ~~value~~ = JSON.parse(item.value);\r\n } catch (e) {}\r\n }\r\n\r\n ~~return~~ { ...item, value };\r\n }\r\n\r\n ~~formatSubmitData~~(data: any) {\r\n ~~return~~ {\r\n ...data,\r\n ~~value~~: data.type === \"json\" ? data.value : JSON.stringify(data.value),\r\n };\r\n }\r\n\r\n ~~resolveType~~(type: string) {\r\n ~~switch~~ (type) {\r\n ~~case~~ \"int\":\r\n ~~return~~ \"MKConfigInputNumber\";\r\n ~~case~~ \"json\":\r\n ~~return~~ \"MKConfigJsonEditor\";\r\n ~~default~~:\r\n ~~return~~ \"MKConfigInput\";\r\n }\r\n }\r\n\r\n ~~resolveItemType~~(config: MsConfig) {\r\n ~~return~~ this.~~resolveType~~(config.type);\r\n }\r\n}\r\n"],"names":["valueFormColumn"],"mappings":";;;;;;;;;;;;AAsBO,MAAM,~~qBACH~~,~~QAEV~~,CAAA;AAAA,~~EACE~~,QAAQ,eAAe,IAAY,eAAA,CAAA;AAAA,EAEnC,eAAA,CAAA;AAAA,EAEA,WAAA,CAAY,OAA+B,GAAA,EAAI,EAAA;~~AAC7C~~,IAAM,KAAA,CAAA;AAAA,~~MACJ~~,IAAA,EAAM,aAAa,eAAe,CAAA;AAAA,MAClC,UAAY,EAAA,WAAA;AAAA,MACZ,GAAG,OAAA;AAAA,~~KACJ~~,CAAA,CAAA;AAED,IAAA,IAAA,CAAK,eAAkB,GAAA,OAAA,CAAQ,eAAmB,IAAA,IAAI,gBAAiB,EAAA,CAAA;AAAA,~~GACzE~~;AAAA,EAEA,MAAgB,UAAa,GAAA;~~AAC3B~~,IAAA,MAAM,MAAM,UAAW,EAAA,CAAA;AAEvB,IAAA,MAAM,WAAc,GAAA,QAAA,CAAA;AACpB,IAAA,IAAA,CAAK,UAAW,CAAA;AAAA,~~MACd~~,IAAI,UAAW,CAAA,EAAE,MAAM,IAAM,EAAA,KAAA,EAAO,gBAAM,CAAA;AAAA,MAC1C,IAAI,WAAW,EAAE,IAAA,EAAM,OAAO,KAAO,EAAA,oBAAA,EAAO,QAAU,EAAA,IAAA,EAAM,CAAA;AAAA,MAC5D,IAAI,UAAW,CAAA;AAAA,~~QACb~~,IAAM,EAAA,MAAA;AAAA,QACN,KAAO,EAAA,cAAA;AAAA,QACP,aAAe,EAAA,kBAAA;AAAA,QACf,YAAc,EAAA,WAAA;AAAA,QACd,QAAU,EAAA,IAAA;AAAA,QACV,cAAgB,EAAA;AAAA,~~UACd~~,OAAS,EAAA;AAAA,~~YACP~~,EAAE,KAAA,EAAO,QAAU,EAAA,KAAA,EAAO,oBAAM,EAAA;AAAA,YAChC,EAAE,KAAA,EAAO,KAAO,EAAA,KAAA,EAAO,cAAK,EAAA;AAAA,YAC5B,EAAE,KAAA,EAAO,MAAQ,EAAA,KAAA,EAAO,MAAO,EAAA;AAAA,~~WACjC~~;AAAA,~~SACF~~;AAAA,~~OACD~~,CAAA;AAAA,MACD,IAAI,UAAW,CAAA;AAAA,~~QACb~~,IAAM,EAAA,OAAA;AAAA,QACN,KAAO,EAAA,oBAAA;AAAA,QACP,QAAU,EAAA,IAAA;AAAA,QACV,YAAc,EAAA,IAAA;AAAA,QACd,KAAO,EAAA;AAAA,~~UACL~~;AAAA,~~YACE~~,SAAW,EAAA,CAAC,IAAM,EAAA,KAAA,EAAO,QAAa,KAAA;~~AACpC~~,cAAI,IAAA,IAAA,CAAK,IAAM,EAAA,IAAA,KAAS,MAAQ,EAAA;~~AAC9B~~,gBAAI,IAAA;~~AACF~~,kBAAA,IAAA,CAAK,MAAM,KAAK,CAAA,CAAA;AAAA,~~yBACT~~,CAAG,EAAA;~~AACV~~,kBAAS,QAAA,CAAA,IAAI,KAAM,CAAA,8BAAU,CAAC,CAAA,CAAA;AAAA,~~iBAChC~~;AAAA,~~eACF~~;AAEA,cAAS,QAAA,EAAA,CAAA;AAAA,~~aACX~~;AAAA,~~WACF~~;AAAA,~~SACF~~;AAAA,QACA,aAAA,EAAe,IAAK,CAAA,~~WAAA~~,~~CAAY~~,WAAW,CAAA;AAAA,~~OAC5C~~,CAAA;AAAA,MACD,IAAI,UAAW,CAAA;AAAA,~~QACb~~,IAAM,EAAA,MAAA;AAAA,QACN,KAAO,EAAA,cAAA;AAAA,QACP,YAAc,EAAA,EAAA;AAAA,QACd,aAAe,EAAA,sBAAA;AAAA;AAAA;AAAA,~~OAGhB~~,CAAA;AAAA,~~KACF~~,CAAA,CAAA;AAED,IAAA,IAAI,UAAgC,GAAA,IAAA,CAAA;AAEpC,IAAA,IAAA,CAAK,eAAgB,CAAA,EAAA,CAAG,CAAC,EAAE,MAAW,KAAA;~~AACpC~~,MAAA,UAAA,EAAY,OAAQ,EAAA,CAAA;AAEpB,MAAA,IAAI,CAAC,IAAM,EAAA;~~AACT~~,QAAO,OAAA,IAAA,CAAA;AAAA,~~OACT~~;AAEA,MAAA,UAAA,GAAa,IAAI,UAAW,EAAA,CAAA;AAE5B,MAAM,MAAA,eAAA,GAAkB,IAAK,CAAA,SAAA,CAAU,OAAO,CAAA,CAAA;AAC9C,~~MAAgB~~,eAAA,~~CAAA~~,~~aAAA~~,~~GACd~~,~~KAAK~~,eAAgB,CAAA,gBAAA~~;AAAA~~,~~QACnB~~,~~IAAA~~,~~CAAK,eAAgB,~~CAAA,~~IAAA~~,~~CAAK~~,IAAK,CAAA~~;AAAA~~,~~OAC5B~~,~~IAAA~~,~~IAAA~~,~~CAAK~~,~~eAAgB~~,CAAA,~~gBAAA~~,~~CAAiB~~,aAAa,CAAA,CAAA;~~AAE1D~~,MAAW,UAAA,CAAA,QAAA;AAAA,~~QACT~~,KAAK,SAAU,CAAA,MAAM,CAAG,CAAA,gBAAA,CAAiB,GAAG,MAAM;~~AAChD~~,UAAI,IAAA,CAAC,KAAK,IAAM,EAAA;~~AACd~~,YAAA,OAAA;AAAA,~~WACF~~;AAEA,UAAMA,MAAAA,gBAAAA,GAAkB,IAAK,CAAA,SAAA,CAAU,OAAO,CAAA,CAAA;AAC9C,UAAAA,~~gBAAAA~~,~~CAAgB~~,~~aACd~~,~~GAAA~~,~~IAAA~~,~~CAAK,eAAgB,~~CAAA,~~gBAAA;AAAA~~,~~YACnB~~,~~IAAA~~,~~CAAK~~,~~eAAgB,~~CAAA,~~IAAA~~,~~CAAK~~,IAAK,CAAA~~;AAAA~~,~~WAC5B~~,~~IAAA~~,~~IAAA~~,~~CAAK~~,~~eAAgB~~,CAAA,~~gBAAA~~,~~CAAiB~~,aAAa,CAAA,CAAA;~~AAE1D~~,UAAA,IAAA,CAAK,KAAM,KAAQ,GAAA,IAAA,CAAA;AAAA,~~SACpB~~,CAAA;AAAA,~~OACH~~,CAAA;AAAA,~~KACD~~,CAAA,CAAA;AAAA,~~GACH~~;AAAA,EAEA,WAAW,IAA0B,EAAA;~~AACnC~~,IAAA,IAAI,QAAQ,IAAK,CAAA,KAAA,CAAA;AAEjB,IAAI,IAAA,IAAA,CAAK,SAAS,MAAQ,EAAA;~~AACxB~~,MAAI,IAAA;~~AACF~~,QAAQ,KAAA,GAAA,IAAA,CAAK,KAAM,CAAA,IAAA,CAAK,KAAK,CAAA,CAAA;AAAA,~~eACtB~~,CAAG,EAAA;AAAA,OAAC;AAAA,~~KACf~~;AAEA,IAAO,OAAA,EAAE,GAAG,IAAA,EAAM,KAAM,EAAA,CAAA;AAAA,~~GAC1B~~;AAAA,EAEA,iBAAiB,IAAW,EAAA;~~AAC1B~~,IAAO,OAAA;AAAA,~~MACL~~,GAAG,IAAA;AAAA,MACH,KAAA,EAAO,KAAK,IAAS,KAAA,MAAA,GAAS,KAAK,KAAQ,GAAA,IAAA,CAAK,SAAU,CAAA,IAAA,CAAK,KAAK,CAAA;AAAA,~~KACtE~~,CAAA;AAAA,~~GACF~~;AAAA,EAEA,~~YAAY~~,IAAc,EAAA;~~AACxB~~,IAAA,QAAQ,IAAM;AAAA,~~MACZ~~,KAAK,KAAA;~~AACH~~,QAAO,OAAA,qBAAA,CAAA;AAAA,~~MACT~~,KAAK,MAAA;~~AACH~~,QAAO,OAAA,oBAAA,CAAA;AAAA,~~MACT~~;~~AACE~~,QAAO,OAAA,eAAA,CAAA;AAAA,~~KACX~~;AAAA,~~GACF~~;AAAA,EAEA,gBAAgB,MAAkB,EAAA;~~AAChC~~,IAAO,OAAA,IAAA,CAAK,~~WAAY~~,CAAA,MAAA,CAAO,IAAI,CAAA,CAAA;AAAA,~~GACrC~~;~~AACF~~;;;;"}
1	+ {"version":3,"file":"MsConfigForm.js","sources":["../../../../../../src/modules/ms/dataviews/ms-config/MsConfigForm.ts"],"sourcesContent":["import {\r\n DataForm,\r\n DataFormOptions,\r\n FormColumn,\r\n IComponents,\r\n} from \"@maketribe/dm\";\r\nimport { ConfigComponents, ITypeResolver } from \"../../../../core\";\r\nimport { Disposable } from \"@maketribe/utils\";\r\nimport { DATA_MODEL_NAME } from \"../../../../constants\";\r\nimport { MODULE_NAME } from \"../../constants\";\r\n\r\nexport type MsConfig<T = any> = {\r\n id: string;\r\n key: string;\r\n type: string;\r\n value: T;\r\n};\r\n\r\nexport type MsConfigFormOptions = DataFormOptions & {\r\n configComponent?: IComponents;\r\n};\r\n\r\nexport class MsConfigForm extends DataForm<MsConfig> implements ITypeResolver<MsConfig> {\r\n\tstatic [DATA_MODEL_NAME]: string = \"mk-sys-config\";\r\n\r\n\tconfigComponent: IComponents;\r\n\r\n\tconstructor(options: MsConfigFormOptions = {}) {\r\n\t\tsuper({\r\n\t\t\tname: MsConfigForm[DATA_MODEL_NAME],\r\n\t\t\tmoduleName: MODULE_NAME,\r\n\t\t\t...options,\r\n\t\t});\r\n\r\n\t\tthis.configComponent = options.configComponent ?? new ConfigComponents();\r\n\t}\r\n\r\n\tprotected async initialize() {\r\n\t\tawait super.initialize();\r\n\r\n\t\tconst defaultType = \"string\";\r\n\t\tthis.setColumns([\r\n\t\t\tnew FormColumn({ name: \"id\", label: \"编号\" }),\r\n\t\t\tnew FormColumn({ name: \"key\", label: \"配置键\", required: true }),\r\n\t\t\tnew FormColumn({\r\n\t\t\t\tname: \"type\",\r\n\t\t\t\tlabel: \"类型\",\r\n\t\t\t\tcomponentInfo: \"MKFormDataSelect\",\r\n\t\t\t\tdefaultValue: defaultType,\r\n\t\t\t\trequired: true,\r\n\t\t\t\tcomponentProps: {\r\n\t\t\t\t\toptions: [\r\n\t\t\t\t\t\t{ value: \"string\", label: \"字符串\" },\r\n\t\t\t\t\t\t{ value: \"int\", label: \"整数\" },\r\n\t\t\t\t\t\t{ value: \"json\", label: \"JSON\" },\r\n\t\t\t\t\t],\r\n\t\t\t\t},\r\n\t\t\t}),\r\n\t\t\tnew FormColumn({\r\n\t\t\t\tname: \"value\",\r\n\t\t\t\tlabel: \"配置值\",\r\n\t\t\t\trequired: true,\r\n\t\t\t\tdefaultValue: null,\r\n\t\t\t\trules: [\r\n\t\t\t\t\t{\r\n\t\t\t\t\t\tvalidator: (rule, value, callback) => {\r\n\t\t\t\t\t\t\tif (this.data?.type === \"json\") {\r\n\t\t\t\t\t\t\t\ttry {\r\n\t\t\t\t\t\t\t\t\tJSON.parse(value);\r\n\t\t\t\t\t\t\t\t} catch (e) {\r\n\t\t\t\t\t\t\t\t\tcallback(new Error(\"JSON格式错误\"));\r\n\t\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\t}\r\n\r\n\t\t\t\t\t\t\tcallback();\r\n\t\t\t\t\t\t},\r\n\t\t\t\t\t},\r\n\t\t\t\t],\r\n\t\t\t\tcomponentInfo: this.resolveStringType(defaultType),\r\n\t\t\t}),\r\n\t\t\tnew FormColumn({\r\n\t\t\t\tname: \"memo\",\r\n\t\t\t\tlabel: \"备注\",\r\n\t\t\t\tdefaultValue: \"\",\r\n\t\t\t\tcomponentInfo: \"MKFormRichTextEditor\",\r\n\t\t\t\t// componentInfo: \"MKFormInput\",\r\n\t\t\t\t// componentProps: { type: \"textarea\", rows: 4 },\r\n\t\t\t}),\r\n\t\t]);\r\n\r\n\t\tlet disposable: Disposable \| null = null;\r\n\r\n\t\tthis.dataChangeEvent.on(({ data }) => {\r\n\t\t\tdisposable?.dispose();\r\n\r\n\t\t\tif (!data) {\r\n\t\t\t\treturn null;\r\n\t\t\t}\r\n\r\n\t\t\tdisposable = new Disposable();\r\n\r\n\t\t\tconst valueFormColumn = this.getColumn(\"value\")!;\r\n\t\t\tvalueFormColumn.componentInfo = this.configComponent.resolveComponent(this.resolveItemType(this.data!)) \|\| this.configComponent.resolveComponent(\"MKFormInput\")!;\r\n\r\n\t\t\tdisposable.register(\r\n\t\t\t\tthis.getColumn(\"type\")!.valueChangeEvent.on(() => {\r\n\t\t\t\t\tif (!this.data) {\r\n\t\t\t\t\t\treturn;\r\n\t\t\t\t\t}\r\n\r\n\t\t\t\t\tconst valueFormColumn = this.getColumn(\"value\")!;\r\n\t\t\t\t\tvalueFormColumn.componentInfo = this.configComponent.resolveComponent(this.resolveItemType(this.data!)) \|\| this.configComponent.resolveComponent(\"MKFormInput\")!;\r\n\r\n\t\t\t\t\tthis.data!.value = null;\r\n\t\t\t\t})\r\n\t\t\t);\r\n\t\t});\r\n\t}\r\n\r\n\tformatItem(item: MsConfig): MsConfig {\r\n\t\tlet value = item.value;\r\n\r\n\t\tif (item.type !== \"json\") {\r\n\t\t\ttry {\r\n\t\t\t\tvalue = JSON.parse(item.value);\r\n\t\t\t} catch (e) {}\r\n\t\t}\r\n\r\n\t\treturn { ...item, value };\r\n\t}\r\n\r\n\tformatSubmitData(data: any) {\r\n\t\treturn {\r\n\t\t\t...data,\r\n\t\t\tvalue: data.type === \"json\" ? data.value : JSON.stringify(data.value),\r\n\t\t};\r\n\t}\r\n\r\n\tresolveStringType(type: string) {\r\n\t\tswitch (type) {\r\n\t\t\tcase \"int\":\r\n\t\t\t\treturn \"MKConfigInputNumber\";\r\n\t\t\tcase \"json\":\r\n\t\t\t\treturn \"MKConfigJsonEditor\";\r\n\t\t\tdefault:\r\n\t\t\t\treturn \"MKConfigInput\";\r\n\t\t}\r\n\t}\r\n\r\n\tresolveItemType(config: MsConfig) {\r\n\t\treturn this.resolveStringType(config.type);\r\n\t}\r\n}\r\n"],"names":["valueFormColumn"],"mappings":"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"}

package/dist/esm/modules/ms/dataviews/ms-material/MsMaterialForm.d.ts CHANGED Viewed

@@ -3,7 +3,7 @@ import { DATA_MODEL_NAME } from "../../../../constants";
 export type MsMaterial = {
     id: string;
     materialGroupId?: string | null;
-    type: string;
+    type: number;
     desc: string;
     path: string;
 };

package/dist/esm/modules/ms/dataviews/ms-material/MsMaterialForm.js CHANGED Viewed

@@ -24,7 +24,7 @@ class MsMaterialForm extends DataForm {
     return {
       id: item.id,
       materialGroupId: item.materialGroupId ?? null,
-      type: item.type || "string",
+      type: item.type,
       desc: item.desc,
       path: item.path
     };

package/dist/esm/modules/ms/dataviews/ms-material/MsMaterialForm.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MsMaterialForm.js","sources":["../../../../../../src/modules/ms/dataviews/ms-material/MsMaterialForm.ts"],"sourcesContent":["import { DataForm, DataFormOptions, FormColumn } from \"@maketribe/dm\";\r\nimport { DATA_MODEL_NAME } from \"../../../../constants\";\r\nimport { MODULE_NAME } from \"../../constants\";\r\n\r\nexport type MsMaterial = {\r\n id: string;\r\n materialGroupId?: string \| null;\r\n type: ~~string~~;\r\n desc: string;\r\n path: string;\r\n};\r\n\r\nexport class MsMaterialForm extends DataForm<MsMaterial> {\r\n static [DATA_MODEL_NAME]: string = \"mk-material\";\r\n\r\n constructor(options: DataFormOptions = {}) {\r\n super({\r\n name: MsMaterialForm[DATA_MODEL_NAME],\r\n moduleName: MODULE_NAME,\r\n ...options,\r\n });\r\n }\r\n\r\n protected async initialize() {\r\n await super.initialize();\r\n\r\n this.setColumns([\r\n new FormColumn({ name: \"id\", label: \"编号\" }),\r\n new FormColumn({ name: \"type\", label: \"类型\" }),\r\n new FormColumn({ name: \"desc\", label: \"描述\" }),\r\n new FormColumn({ name: \"path\", label: \"路径\" }),\r\n ]);\r\n }\r\n\r\n formatItem(item: MsMaterial): MsMaterial {\r\n return {\r\n id: item.id,\r\n materialGroupId: item.materialGroupId ?? null,\r\n type: item.type ~~\|\| \"string\"~~,\r\n desc: item.desc,\r\n path: item.path,\r\n };\r\n }\r\n\r\n formatSubmitData(data: any) {\r\n return {\r\n id: data.id,\r\n materialGroupId: data.materialGroupId,\r\n type: data.type,\r\n desc: data.desc,\r\n path: data.path,\r\n };\r\n }\r\n}\r\n"],"names":[],"mappings":";;;;AAYO,MAAM,uBAAuB,QAAqB,CAAA;AAAA,EACvD,QAAQ,eAAe,IAAY,aAAA,CAAA;AAAA,EAEnC,WAAA,CAAY,OAA2B,GAAA,EAAI,EAAA;AACzC,IAAM,KAAA,CAAA;AAAA,MACJ,IAAA,EAAM,eAAe,eAAe,CAAA;AAAA,MACpC,UAAY,EAAA,WAAA;AAAA,MACZ,GAAG,OAAA;AAAA,KACJ,CAAA,CAAA;AAAA,GACH;AAAA,EAEA,MAAgB,UAAa,GAAA;AAC3B,IAAA,MAAM,MAAM,UAAW,EAAA,CAAA;AAEvB,IAAA,IAAA,CAAK,UAAW,CAAA;AAAA,MACd,IAAI,UAAW,CAAA,EAAE,MAAM,IAAM,EAAA,KAAA,EAAO,gBAAM,CAAA;AAAA,MAC1C,IAAI,UAAW,CAAA,EAAE,MAAM,MAAQ,EAAA,KAAA,EAAO,gBAAM,CAAA;AAAA,MAC5C,IAAI,UAAW,CAAA,EAAE,MAAM,MAAQ,EAAA,KAAA,EAAO,gBAAM,CAAA;AAAA,MAC5C,IAAI,UAAW,CAAA,EAAE,MAAM,MAAQ,EAAA,KAAA,EAAO,gBAAM,CAAA;AAAA,KAC7C,CAAA,CAAA;AAAA,GACH;AAAA,EAEA,WAAW,IAA8B,EAAA;AACvC,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~~,MAAM,IAAK,CAAA,IAAA;AAAA,MACX,MAAM,IAAK,CAAA,IAAA;AAAA,KACb,CAAA;AAAA,GACF;AAAA,EAEA,iBAAiB,IAAW,EAAA;AAC1B,IAAO,OAAA;AAAA,MACL,IAAI,IAAK,CAAA,EAAA;AAAA,MACT,iBAAiB,IAAK,CAAA,eAAA;AAAA,MACtB,MAAM,IAAK,CAAA,IAAA;AAAA,MACX,MAAM,IAAK,CAAA,IAAA;AAAA,MACX,MAAM,IAAK,CAAA,IAAA;AAAA,KACb,CAAA;AAAA,GACF;AACF;;;;"}
1	+ {"version":3,"file":"MsMaterialForm.js","sources":["../../../../../../src/modules/ms/dataviews/ms-material/MsMaterialForm.ts"],"sourcesContent":["import { DataForm, DataFormOptions, FormColumn } from \"@maketribe/dm\";\r\nimport { DATA_MODEL_NAME } from \"../../../../constants\";\r\nimport { MODULE_NAME } from \"../../constants\";\r\n\r\nexport type MsMaterial = {\r\n id: string;\r\n materialGroupId?: string \| null;\r\n type: number;\r\n desc: string;\r\n path: string;\r\n};\r\n\r\nexport class MsMaterialForm extends DataForm<MsMaterial> {\r\n static [DATA_MODEL_NAME]: string = \"mk-material\";\r\n\r\n constructor(options: DataFormOptions = {}) {\r\n super({\r\n name: MsMaterialForm[DATA_MODEL_NAME],\r\n moduleName: MODULE_NAME,\r\n ...options,\r\n });\r\n }\r\n\r\n protected async initialize() {\r\n await super.initialize();\r\n\r\n this.setColumns([\r\n new FormColumn({ name: \"id\", label: \"编号\" }),\r\n new FormColumn({ name: \"type\", label: \"类型\" }),\r\n new FormColumn({ name: \"desc\", label: \"描述\" }),\r\n new FormColumn({ name: \"path\", label: \"路径\" }),\r\n ]);\r\n }\r\n\r\n formatItem(item: MsMaterial): MsMaterial {\r\n return {\r\n id: item.id,\r\n materialGroupId: item.materialGroupId ?? null,\r\n type: item.type,\r\n desc: item.desc,\r\n path: item.path,\r\n };\r\n }\r\n\r\n formatSubmitData(data: any) {\r\n return {\r\n id: data.id,\r\n materialGroupId: data.materialGroupId,\r\n type: data.type,\r\n desc: data.desc,\r\n path: data.path,\r\n };\r\n }\r\n}\r\n"],"names":[],"mappings":";;;;AAYO,MAAM,uBAAuB,QAAqB,CAAA;AAAA,EACvD,QAAQ,eAAe,IAAY,aAAA,CAAA;AAAA,EAEnC,WAAA,CAAY,OAA2B,GAAA,EAAI,EAAA;AACzC,IAAM,KAAA,CAAA;AAAA,MACJ,IAAA,EAAM,eAAe,eAAe,CAAA;AAAA,MACpC,UAAY,EAAA,WAAA;AAAA,MACZ,GAAG,OAAA;AAAA,KACJ,CAAA,CAAA;AAAA,GACH;AAAA,EAEA,MAAgB,UAAa,GAAA;AAC3B,IAAA,MAAM,MAAM,UAAW,EAAA,CAAA;AAEvB,IAAA,IAAA,CAAK,UAAW,CAAA;AAAA,MACd,IAAI,UAAW,CAAA,EAAE,MAAM,IAAM,EAAA,KAAA,EAAO,gBAAM,CAAA;AAAA,MAC1C,IAAI,UAAW,CAAA,EAAE,MAAM,MAAQ,EAAA,KAAA,EAAO,gBAAM,CAAA;AAAA,MAC5C,IAAI,UAAW,CAAA,EAAE,MAAM,MAAQ,EAAA,KAAA,EAAO,gBAAM,CAAA;AAAA,MAC5C,IAAI,UAAW,CAAA,EAAE,MAAM,MAAQ,EAAA,KAAA,EAAO,gBAAM,CAAA;AAAA,KAC7C,CAAA,CAAA;AAAA,GACH;AAAA,EAEA,WAAW,IAA8B,EAAA;AACvC,IAAO,OAAA;AAAA,MACL,IAAI,IAAK,CAAA,EAAA;AAAA,MACT,eAAA,EAAiB,KAAK,eAAmB,IAAA,IAAA;AAAA,MACzC,MAAM,IAAK,CAAA,IAAA;AAAA,MACX,MAAM,IAAK,CAAA,IAAA;AAAA,MACX,MAAM,IAAK,CAAA,IAAA;AAAA,KACb,CAAA;AAAA,GACF;AAAA,EAEA,iBAAiB,IAAW,EAAA;AAC1B,IAAO,OAAA;AAAA,MACL,IAAI,IAAK,CAAA,EAAA;AAAA,MACT,iBAAiB,IAAK,CAAA,eAAA;AAAA,MACtB,MAAM,IAAK,CAAA,IAAA;AAAA,MACX,MAAM,IAAK,CAAA,IAAA;AAAA,MACX,MAAM,IAAK,CAAA,IAAA;AAAA,KACb,CAAA;AAAA,GACF;AACF;;;;"}

package/dist/esm/modules/ms/dataviews/ms-material/MsMaterialTable.d.ts CHANGED Viewed

@@ -3,7 +3,7 @@ import { MsMaterial } from "./MsMaterialForm";
 import { ITypeResolver } from "../../../../core";
 import { DATA_MODEL_NAME } from "../../../../constants";
 export type MsMaterialType = {
-    value: string;
+    value: number;
     accept: string;
     label: string;
     limit: number;
@@ -20,7 +20,7 @@ export declare class MsMaterialTable extends DataTable<MsMaterial> implements IT
     loadMaterialTypes(): Promise<void>;
     protected initialize(): Promise<void>;
     formatItem(item: MsMaterial): MsMaterial;
-    resolveType(type: string): string;
+    resolveType(type: number): string;
     resolveItemType(item: MsMaterial): string;
     resolveMaterialComponent(item: MsMaterial): Component | null;
 }

package/dist/esm/modules/ms/dataviews/ms-material/MsMaterialTable.js CHANGED Viewed

@@ -41,9 +41,9 @@ class MsMaterialTable extends DataTable {
     try {
       loadingManager.startLoading();
       this.materialTypes = [
-        { value: "1", accept: "image/*", limit: 10, label: "\u56FE\u7247" },
-        { value: "2", accept: "video/*", limit: 500, label: "\u89C6\u9891" },
-        { value: "4", accept: "*", limit: 100, label: "\u6587\u6863" }
+        { value: 1, accept: "image/*", limit: 10, label: "\u56FE\u7247" },
+        { value: 2, accept: "video/*", limit: 500, label: "\u89C6\u9891" },
+        { value: 4, accept: "*", limit: 100, label: "\u6587\u6863" }
       ];
       const mapping = this.materialTypes.reduce((result, item) => {
         result[item.value] = result.label;
@@ -70,18 +70,18 @@ class MsMaterialTable extends DataTable {
     return {
       id: item.id,
       materialGroupId: item.materialGroupId || null,
-      type: item.type ? `${item.type}` : "1",
+      type: item.type ? item.type : 1,
       desc: item.desc || "",
       path: item.path || ""
     };
   }
   resolveType(type) {
     switch (type) {
-      case "1":
+      case 1:
         return "MKImageView";
-      case "2":
+      case 2:
         return "MKVideoView";
-      case "3":
+      case 3:
         return "MKAudioView";
       default:
         return "MKDocumentView";

package/dist/esm/modules/ms/dataviews/ms-material/MsMaterialTable.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MsMaterialTable.js","sources":["../../../../../../src/modules/ms/dataviews/ms-material/MsMaterialTable.ts"],"sourcesContent":["import {\r\n Component,\r\n DataTable,\r\n DataTableOptions,\r\n IComponents,\r\n TableColumn,\r\n} from \"@maketribe/dm\";\r\nimport { MsMaterial } from \"./MsMaterialForm\";\r\nimport { MsConfigTable } from \"../ms-config\";\r\nimport { ITypeResolver } from \"../../../../core\";\r\nimport { DATA_MODEL_NAME } from \"../../../../constants\";\r\nimport { MODULE_NAME } from \"../../constants\";\r\n\r\nexport type MsMaterialType = {\r\n value: ~~string~~;\r\n accept: string;\r\n label: string;\r\n limit: number;\r\n};\r\n\r\nexport type MaterialTableOptions = DataTableOptions & {\r\n materialComponents: IComponents;\r\n};\r\n\r\nexport class MsMaterialTable\r\n extends DataTable<MsMaterial>\r\n implements ITypeResolver<MsMaterial>\r\n{\r\n static [DATA_MODEL_NAME]: string = \"mk-material\";\r\n\r\n materialTypes: MsMaterialType[] = [];\r\n\r\n materialComponents: IComponents;\r\n\r\n constructor(options: MaterialTableOptions) {\r\n super({\r\n name: MsMaterialTable[DATA_MODEL_NAME],\r\n moduleName: MODULE_NAME,\r\n ...options,\r\n });\r\n\r\n this.materialComponents = options.materialComponents;\r\n }\r\n\r\n getMaterialTypes(): MsMaterialType[] {\r\n return this.materialTypes;\r\n }\r\n\r\n async loadMaterialTypes() {\r\n const configResponse = await MsConfigTable.loadConfig<MsMaterialType[]>(\r\n \"ms-material-types\"\r\n );\r\n\r\n if (configResponse.data.code !== 200 \|\| !configResponse.data.data) {\r\n throw new Error();\r\n }\r\n\r\n const config = configResponse.data.data;\r\n\r\n this.materialTypes = config.value \|\| [];\r\n }\r\n\r\n protected async initialize() {\r\n await super.initialize();\r\n\r\n const loadingManager = this.getLoadingManager();\r\n\r\n try {\r\n loadingManager.startLoading();\r\n\r\n this.materialTypes = [\r\n { value: \"1\", accept: \"image/\", limit: 10, label: \"图片\" },\r\n { value: \"2\", accept: \"video/\", limit: 500, label: \"视频\" },\r\n { value: \"4\", accept: \"*\", limit: 100, label: \"文档\" },\r\n ];\r\n\r\n const mapping = this.materialTypes.reduce((result, item) => {\r\n result[item.value] = result.label;\r\n\r\n return result;\r\n }, {} as Record<any, any>);\r\n\r\n this.setColumns([\r\n new TableColumn({ name: \"id\", label: \"编号\", visible: false }),\r\n new TableColumn({\r\n name: \"type\",\r\n label: \"类型\",\r\n componentInfo: \"MKColumnObjectMappingText\",\r\n componentProps: {\r\n mapping,\r\n },\r\n }),\r\n new TableColumn({ name: \"desc\", label: \"描述\" }),\r\n new TableColumn({ name: \"path\", label: \"路径\" }),\r\n ]);\r\n } finally {\r\n loadingManager.completeLoading();\r\n }\r\n }\r\n formatItem(item: MsMaterial): MsMaterial {\r\n return {\r\n id: item.id,\r\n materialGroupId: item.materialGroupId \|\| null,\r\n type: item.type ? ~~`${~~item.type}` : \"1\",\r\n desc: item.desc \|\| \"\",\r\n path: item.path \|\| \"\",\r\n };\r\n }\r\n\r\n resolveType(type: ~~string~~): string {\r\n switch (type) {\r\n case \"1\":\r\n return \"MKImageView\";\r\n case \"2\":\r\n return \"MKVideoView\";\r\n case \"3\":\r\n return \"MKAudioView\";\r\n default:\r\n return \"MKDocumentView\";\r\n }\r\n }\r\n\r\n resolveItemType(item: MsMaterial): string {\r\n return this.resolveType(item.type);\r\n }\r\n\r\n resolveMaterialComponent(item: MsMaterial): Component \| null {\r\n return this.materialComponents.resolveComponent(this.resolveItemType(item));\r\n }\r\n}\r\n"],"names":[],"mappings":";;;;;;;;;;;;AAwBO,MAAM,wBACH,SAEV,CAAA;AAAA,EACE,QAAQ,eAAe,IAAY,aAAA,CAAA;AAAA,EAEnC,gBAAkC,EAAC,CAAA;AAAA,EAEnC,kBAAA,CAAA;AAAA,EAEA,YAAY,OAA+B,EAAA;AACzC,IAAM,KAAA,CAAA;AAAA,MACJ,IAAA,EAAM,gBAAgB,eAAe,CAAA;AAAA,MACrC,UAAY,EAAA,WAAA;AAAA,MACZ,GAAG,OAAA;AAAA,KACJ,CAAA,CAAA;AAED,IAAA,IAAA,CAAK,qBAAqB,OAAQ,CAAA,kBAAA,CAAA;AAAA,GACpC;AAAA,EAEA,gBAAqC,GAAA;AACnC,IAAA,OAAO,IAAK,CAAA,aAAA,CAAA;AAAA,GACd;AAAA,EAEA,MAAM,iBAAoB,GAAA;AACxB,IAAM,MAAA,cAAA,GAAiB,MAAM,aAAc,CAAA,UAAA;AAAA,MACzC,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,IAAA,MAAM,MAAM,UAAW,EAAA,CAAA;AAEvB,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,IAAI,YAAY,EAAE,IAAA,EAAM,MAAM,KAAO,EAAA,cAAA,EAAM,OAAS,EAAA,KAAA,EAAO,CAAA;AAAA,QAC3D,IAAI,WAAY,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,IAAI,WAAY,CAAA,EAAE,MAAM,MAAQ,EAAA,KAAA,EAAO,gBAAM,CAAA;AAAA,QAC7C,IAAI,WAAY,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,IAA8B,EAAA;AACvC,IAAO,OAAA;AAAA,MACL,IAAI,IAAK,CAAA,EAAA;AAAA,MACT,eAAA,EAAiB,KAAK,eAAmB,IAAA,IAAA;AAAA,MACzC,~~MAAM~~,~~IAAK~~,~~CAAA,~~IAAA,~~GAAO~~,~~CAAG~~,~~EAAA~~,IAAA,CAAK,~~IAAI~~,~~CAAK~~,CAAA~~,GAAA,GAAA~~;AAAA,~~MACnC~~,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,IAA0B,EAAA;AACxC,IAAO,OAAA,IAAA,CAAK,WAAY,CAAA,IAAA,CAAK,IAAI,CAAA,CAAA;AAAA,GACnC;AAAA,EAEA,yBAAyB,IAAoC,EAAA;AAC3D,IAAA,OAAO,KAAK,kBAAmB,CAAA,gBAAA,CAAiB,IAAK,CAAA,eAAA,CAAgB,IAAI,CAAC,CAAA,CAAA;AAAA,GAC5E;AACF;;;;"}
1	+ {"version":3,"file":"MsMaterialTable.js","sources":["../../../../../../src/modules/ms/dataviews/ms-material/MsMaterialTable.ts"],"sourcesContent":["import {\r\n Component,\r\n DataTable,\r\n DataTableOptions,\r\n IComponents,\r\n TableColumn,\r\n} from \"@maketribe/dm\";\r\nimport { MsMaterial } from \"./MsMaterialForm\";\r\nimport { MsConfigTable } from \"../ms-config\";\r\nimport { ITypeResolver } from \"../../../../core\";\r\nimport { DATA_MODEL_NAME } from \"../../../../constants\";\r\nimport { MODULE_NAME } from \"../../constants\";\r\n\r\nexport type MsMaterialType = {\r\n value: number;\r\n accept: string;\r\n label: string;\r\n limit: number;\r\n};\r\n\r\nexport type MaterialTableOptions = DataTableOptions & {\r\n materialComponents: IComponents;\r\n};\r\n\r\nexport class MsMaterialTable\r\n extends DataTable<MsMaterial>\r\n implements ITypeResolver<MsMaterial>\r\n{\r\n static [DATA_MODEL_NAME]: string = \"mk-material\";\r\n\r\n materialTypes: MsMaterialType[] = [];\r\n\r\n materialComponents: IComponents;\r\n\r\n constructor(options: MaterialTableOptions) {\r\n super({\r\n name: MsMaterialTable[DATA_MODEL_NAME],\r\n moduleName: MODULE_NAME,\r\n ...options,\r\n });\r\n\r\n this.materialComponents = options.materialComponents;\r\n }\r\n\r\n getMaterialTypes(): MsMaterialType[] {\r\n return this.materialTypes;\r\n }\r\n\r\n async loadMaterialTypes() {\r\n const configResponse = await MsConfigTable.loadConfig<MsMaterialType[]>(\r\n \"ms-material-types\"\r\n );\r\n\r\n if (configResponse.data.code !== 200 \|\| !configResponse.data.data) {\r\n throw new Error();\r\n }\r\n\r\n const config = configResponse.data.data;\r\n\r\n this.materialTypes = config.value \|\| [];\r\n }\r\n\r\n protected async initialize() {\r\n await super.initialize();\r\n\r\n const loadingManager = this.getLoadingManager();\r\n\r\n try {\r\n loadingManager.startLoading();\r\n\r\n this.materialTypes = [\r\n { value: 1, accept: \"image/\", limit: 10, label: \"图片\" },\r\n { value: 2, accept: \"video/\", limit: 500, label: \"视频\" },\r\n { value: 4, accept: \"*\", limit: 100, label: \"文档\" },\r\n ];\r\n\r\n const mapping = this.materialTypes.reduce((result, item) => {\r\n result[item.value] = result.label;\r\n\r\n return result;\r\n }, {} as Record<any, any>);\r\n\r\n this.setColumns([\r\n new TableColumn({ name: \"id\", label: \"编号\", visible: false }),\r\n new TableColumn({\r\n name: \"type\",\r\n label: \"类型\",\r\n componentInfo: \"MKColumnObjectMappingText\",\r\n componentProps: {\r\n mapping,\r\n },\r\n }),\r\n new TableColumn({ name: \"desc\", label: \"描述\" }),\r\n new TableColumn({ name: \"path\", label: \"路径\" }),\r\n ]);\r\n } finally {\r\n loadingManager.completeLoading();\r\n }\r\n }\r\n formatItem(item: MsMaterial): MsMaterial {\r\n return {\r\n id: item.id,\r\n materialGroupId: item.materialGroupId \|\| null,\r\n type: item.type ? item.type : 1,\r\n desc: item.desc \|\| \"\",\r\n path: item.path \|\| \"\",\r\n };\r\n }\r\n\r\n resolveType(type: number): string {\r\n switch (type) {\r\n case 1:\r\n return \"MKImageView\";\r\n case 2:\r\n return \"MKVideoView\";\r\n case 3:\r\n return \"MKAudioView\";\r\n default:\r\n return \"MKDocumentView\";\r\n }\r\n }\r\n\r\n resolveItemType(item: MsMaterial): string {\r\n return this.resolveType(item.type);\r\n }\r\n\r\n resolveMaterialComponent(item: MsMaterial): Component \| null {\r\n return this.materialComponents.resolveComponent(this.resolveItemType(item));\r\n }\r\n}\r\n"],"names":[],"mappings":"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"}

package/dist/esm/modules/ms/dataviews/ms-member/MsMemberForm.d.ts CHANGED Viewed

@@ -6,15 +6,23 @@ export type MsMemberResult = {
     wechatNo: string;
     nickName: string;
     email: string;
-    phone: string;
-    account: string;
+    normalizedEmail: string;
+    emailConfirmed: boolean;
+    phoneNumber: string;
+    phoneNumberConfirmed: string;
+    userName: string;
+    normalizedUserName: string;
     avatar: string;
     roles: any[];
+    passwordHash: string;
     valid: number;
-    isLock?: number;
-    errorCount?: number;
-    unlockDatetime?: string;
+    lockoutEnabled?: number;
+    accessFailedCount?: number;
+    lockoutEnd?: string;
     memo?: string;
+    twoFactorEnabled: boolean;
+    concurrencyStamp: string;
+    securityStamp: string;
 };
 export type MsMember = {
     id: string;
@@ -22,19 +30,26 @@ export type MsMember = {
     wechatNo: string;
     nickName: string;
     email: string;
-    phone: string;
-    account: string;
-    avatar: string | null;
+    normalizedEmail: string;
+    emailConfirmed: boolean;
+    phoneNumber: string;
+    phoneNumberConfirmed: string;
+    userName: string;
+    normalizedUserName: string;
+    avatar: string;
     roles: any[];
+    passwordHash: string;
     valid: number;
-    isLock?: number;
-    errorCount?: number;
-    unlockDatetime?: string;
+    lockoutEnabled?: number;
+    accessFailedCount?: number;
+    lockoutEnd?: string;
     memo?: string;
+    twoFactorEnabled: boolean;
+    concurrencyStamp: string;
+    securityStamp: string;
 };
 export declare class MsMemberForm<T extends MsMemberResult = MsMemberResult, F extends MsMember = MsMember> extends DataForm<T, F> {
     static [DATA_MODEL_NAME]: string;
     constructor(options?: DataFormOptions);
     protected initialize(): Promise<void>;
-    formatItem(item: T): F;
 }

package/dist/esm/modules/ms/dataviews/ms-member/MsMemberForm.js CHANGED Viewed

@@ -35,7 +35,12 @@ class MsMemberForm extends DataForm {
         rules: [{ message: "\u90AE\u7BB1\u683C\u5F0F\u6709\u8BEF", pattern: EMAIL_PATTERN }]
       }),
       new FormColumn({ name: "phone", label: "\u624B\u673A\u53F7", defaultValue: null }),
-      new FormColumn({ name: "account", label: "\u8D26\u53F7", required: true }),
+      new FormColumn({
+        name: "userName",
+        label: "\u8D26\u53F7",
+        required: true,
+        disabled: true
+      }),
       new FormColumn({
         name: "avatar",
         label: "\u5934\u50CF",
@@ -63,22 +68,24 @@ class MsMemberForm extends DataForm {
       })
     ]);
   }
-  formatItem(item) {
-    return {
-      id: item.id,
-      name: item.name || "",
-      wechatNo: item.wechatNo || "",
-      nickName: item.nickName || "",
-      email: item.email || "",
-      phone: item.phone || "",
-      account: item.account || "",
-      avatar: item.avatar,
-      roles: item.roles,
-      // depts: item.depts?.map((department) => department.deptId),
-      valid: item.valid,
-      memo: item.memo || ""
-    };
-  }
+  // formatItem(item: T): F {
+  //   debugger;
+  //   return item;
+  //   return {
+  //     id: item.id,
+  //     name: item.name || "",
+  //     wechatNo: item.wechatNo || "",
+  //     nickName: item.nickName || "",
+  //     email: item.email || "",
+  //     phoneNumber: item.phoneNumber || "",
+  //     userName: item.userName || "",
+  //     avatar: item.avatar,
+  //     roles: item.roles,
+  //     // depts: item.depts?.map((department) => department.deptId),
+  //     valid: item.valid,
+  //     memo: item.memo || "",
+  //   } as F;
+  // }
 }
 export { MsMemberForm };

package/dist/esm/modules/ms/dataviews/ms-member/MsMemberForm.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"MsMemberForm.js","sources":["../../../../../../src/modules/ms/dataviews/ms-member/MsMemberForm.ts"],"sourcesContent":["import { DataForm, DataFormOptions, FormColumn } from \"@maketribe/dm\";\r\nimport { MsRoleTable } from \"../ms-role\";\r\nimport { DATA_MODEL_NAME, EMAIL_PATTERN } from \"../../../../constants\";\r\nimport { WebFileUploadContext } from \"../../../../components/basic/upload-file/context/WebFileUploadContext\";\r\nimport { MODULE_NAME } from \"../../constants\";\r\n\r\nexport type MsMemberResult = {\r\n id: string;\r\n name: string;\r\n wechatNo: string;\r\n nickName: string;\r\n email: string;\r\n ~~phone~~: string;\r\n ~~account~~: string;\r\n avatar: string;\r\n roles: any[];\r\n // depts: any[];\r\n valid: number;\r\n ~~isLock~~?: number;\r\n ~~errorCount~~?: number;\r\n ~~unlockDatetime~~?: string;\r\n memo?: string;\r\n};\r\n\r\nexport type MsMember = {\r\n id: string;\r\n name: string;\r\n wechatNo: string;\r\n nickName: string;\r\n email: string;\r\n ~~phone~~: string;\r\n ~~account~~: string;\r\n ~~avatar~~: string \| ~~null~~;\r\n roles: any[];\r\n // depts: any[];\r\n valid: number;\r\n ~~isLock~~?: number;\r\n ~~errorCount~~?: number;\r\n ~~unlockDatetime~~?: string;\r\n memo?: string;\r\n};\r\n\r\nexport class MsMemberForm<\r\n T extends MsMemberResult = MsMemberResult,\r\n F extends MsMember = MsMember\r\n> extends DataForm<T, F> {\r\n static [DATA_MODEL_NAME]: string = \"ms-member\";\r\n\r\n constructor(options: DataFormOptions = {}) {\r\n super({\r\n name: MsMemberForm[DATA_MODEL_NAME],\r\n moduleName: MODULE_NAME,\r\n ...options,\r\n });\r\n }\r\n\r\n protected async initialize() {\r\n await super.initialize();\r\n\r\n this.setColumns([\r\n new FormColumn({ name: \"id\", label: \"编号\" }),\r\n new FormColumn({ name: \"name\", label: \"姓名\", required: true }),\r\n new FormColumn({ name: \"wechatNo\", label: \"微信号\", defaultValue: null }),\r\n new FormColumn({ name: \"nickName\", label: \"昵称\", required: true }),\r\n new FormColumn({\r\n name: \"email\",\r\n label: \"邮箱\",\r\n required: true,\r\n rules: [{ message: \"邮箱格式有误\", pattern: EMAIL_PATTERN }],\r\n }),\r\n new FormColumn({ name: \"phone\", label: \"手机号\", defaultValue: null }),\r\n new FormColumn({ name: \"~~account~~\", label: \"账号\", required: true }),\r\n new FormColumn({\r\n name: \"avatar\",\r\n label: \"头像\",\r\n defaultValue: null,\r\n componentInfo: \"MKFormImageUpload\",\r\n componentProps: { uploadContext: new WebFileUploadContext() },\r\n }),\r\n new FormColumn({\r\n name: \"roles\",\r\n label: \"角色\",\r\n defaultValue: null,\r\n componentInfo: \"MKFormDataTableSelect\",\r\n componentProps: {\r\n multiple: true,\r\n objectValue: true,\r\n labelFieldName: \"desc\",\r\n dataTable: new MsRoleTable(),\r\n },\r\n }),\r\n new FormColumn({\r\n name: \"memo\",\r\n label: \"备注\",\r\n componentInfo: \"MKFormInput\",\r\n componentProps: { type: \"textarea\", rows: 4 },\r\n }),\r\n ]);\r\n }\r\n\r\n formatItem(item: T): F {\r\n return {\r\n id: item.id,\r\n name: item.name \|\| \"\",\r\n wechatNo: item.wechatNo \|\| \"\",\r\n nickName: item.nickName \|\| \"\",\r\n email: item.email \|\| \"\",\r\n ~~phone~~: item.~~phone~~ \|\| \"\",\r\n ~~account~~: item.~~account~~ \|\| \"\",\r\n avatar: item.avatar,\r\n roles: item.roles,\r\n // depts: item.depts?.map((department) => department.deptId),\r\n valid: item.valid,\r\n memo: item.memo \|\| \"\",\r\n } as F;\r\n }\r\n}\r\n"],"names":[],"mappings":";;;;;;;;;;;;;;~~AA0CO~~,MAAM,qBAGH,QAAe,CAAA;AAAA,EACvB,QAAQ,eAAe,IAAY,WAAA,CAAA;AAAA,EAEnC,WAAA,CAAY,OAA2B,GAAA,EAAI,EAAA;AACzC,IAAM,KAAA,CAAA;AAAA,MACJ,IAAA,EAAM,aAAa,eAAe,CAAA;AAAA,MAClC,UAAY,EAAA,WAAA;AAAA,MACZ,GAAG,OAAA;AAAA,KACJ,CAAA,CAAA;AAAA,GACH;AAAA,EAEA,MAAgB,UAAa,GAAA;AAC3B,IAAA,MAAM,MAAM,UAAW,EAAA,CAAA;AAEvB,IAAA,IAAA,CAAK,UAAW,CAAA;AAAA,MACd,IAAI,UAAW,CAAA,EAAE,MAAM,IAAM,EAAA,KAAA,EAAO,gBAAM,CAAA;AAAA,MAC1C,IAAI,WAAW,EAAE,IAAA,EAAM,QAAQ,KAAO,EAAA,cAAA,EAAM,QAAU,EAAA,IAAA,EAAM,CAAA;AAAA,MAC5D,IAAI,WAAW,EAAE,IAAA,EAAM,YAAY,KAAO,EAAA,oBAAA,EAAO,YAAc,EAAA,IAAA,EAAM,CAAA;AAAA,MACrE,IAAI,WAAW,EAAE,IAAA,EAAM,YAAY,KAAO,EAAA,cAAA,EAAM,QAAU,EAAA,IAAA,EAAM,CAAA;AAAA,MAChE,IAAI,UAAW,CAAA;AAAA,QACb,IAAM,EAAA,OAAA;AAAA,QACN,KAAO,EAAA,cAAA;AAAA,QACP,QAAU,EAAA,IAAA;AAAA,QACV,OAAO,CAAC,EAAE,SAAS,sCAAU,EAAA,OAAA,EAAS,eAAe,CAAA;AAAA,OACtD,CAAA;AAAA,MACD,IAAI,WAAW,EAAE,IAAA,EAAM,SAAS,KAAO,EAAA,oBAAA,EAAO,YAAc,EAAA,IAAA,EAAM,CAAA;AAAA,MAClE,IAAI,~~WAAW~~,~~EAAE~~,~~IAAA~~,~~EAAM~~,~~WAAW~~,KAAO,EAAA,cAAA,~~EAAM~~,QAAU,EAAA,IAAA,~~EAAM~~,CAAA;AAAA,~~MAC/D~~,IAAI,UAAW,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,EAAE,aAAe,EAAA,IAAI,sBAAuB,EAAA;AAAA,OAC7D,CAAA;AAAA,MACD,IAAI,UAAW,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,WAAa,EAAA,IAAA;AAAA,UACb,cAAgB,EAAA,MAAA;AAAA,UAChB,SAAA,EAAW,IAAI,WAAY,EAAA;AAAA,SAC7B;AAAA,OACD,CAAA;AAAA,MACD,IAAI,UAAW,CAAA;AAAA,QACb,IAAM,EAAA,MAAA;AAAA,QACN,KAAO,EAAA,cAAA;AAAA,QACP,aAAe,EAAA,aAAA;AAAA,QACf,cAAgB,EAAA,EAAE,IAAM,EAAA,UAAA,EAAY,MAAM,CAAE,EAAA;AAAA,OAC7C,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,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~~;AAAA;AAAA~~,MAEZ,OAAO,IAAK,CAAA,KAAA~~;AAAA~~,MACZ,IAAA,EAAM,KAAK,IAAQ,IAAA,EAAA~~;AAAA~~,KACrB,CAAA~~;AAAA~~,GACF~~;~~AACF~~;;;;"}
1	+ {"version":3,"file":"MsMemberForm.js","sources":["../../../../../../src/modules/ms/dataviews/ms-member/MsMemberForm.ts"],"sourcesContent":["import { DataForm, DataFormOptions, FormColumn } from \"@maketribe/dm\";\r\nimport { MsRoleTable } from \"../ms-role\";\r\nimport { DATA_MODEL_NAME, EMAIL_PATTERN } from \"../../../../constants\";\r\nimport { WebFileUploadContext } from \"../../../../components/basic/upload-file/context/WebFileUploadContext\";\r\nimport { MODULE_NAME } from \"../../constants\";\r\n\r\nexport type MsMemberResult = {\r\n id: string;\r\n name: string;\r\n wechatNo: string;\r\n nickName: string;\r\n email: string;\r\n normalizedEmail: string;\r\n emailConfirmed: boolean;\r\n phoneNumber: string;\r\n phoneNumberConfirmed: string;\r\n userName: string;\r\n normalizedUserName: string;\r\n avatar: string;\r\n roles: any[];\r\n passwordHash: string;\r\n // depts: any[];\r\n valid: number;\r\n lockoutEnabled?: number;\r\n accessFailedCount?: number;\r\n lockoutEnd?: string;\r\n memo?: string;\r\n twoFactorEnabled: boolean;\r\n concurrencyStamp: string;\r\n securityStamp: string;\r\n};\r\n\r\nexport type MsMember = {\r\n id: string;\r\n name: string;\r\n wechatNo: string;\r\n nickName: string;\r\n email: string;\r\n normalizedEmail: string;\r\n emailConfirmed: boolean;\r\n phoneNumber: string;\r\n phoneNumberConfirmed: string;\r\n userName: string;\r\n normalizedUserName: string;\r\n avatar: string;\r\n roles: any[];\r\n passwordHash: string;\r\n // depts: any[];\r\n valid: number;\r\n lockoutEnabled?: number;\r\n accessFailedCount?: number;\r\n lockoutEnd?: string;\r\n memo?: string;\r\n twoFactorEnabled: boolean;\r\n concurrencyStamp: string;\r\n securityStamp: string;\r\n};\r\n\r\nexport class MsMemberForm<\r\n T extends MsMemberResult = MsMemberResult,\r\n F extends MsMember = MsMember\r\n> extends DataForm<T, F> {\r\n static [DATA_MODEL_NAME]: string = \"ms-member\";\r\n\r\n constructor(options: DataFormOptions = {}) {\r\n super({\r\n name: MsMemberForm[DATA_MODEL_NAME],\r\n moduleName: MODULE_NAME,\r\n ...options,\r\n });\r\n }\r\n\r\n protected async initialize() {\r\n await super.initialize();\r\n\r\n this.setColumns([\r\n new FormColumn({ name: \"id\", label: \"编号\" }),\r\n new FormColumn({ name: \"name\", label: \"姓名\", required: true }),\r\n new FormColumn({ name: \"wechatNo\", label: \"微信号\", defaultValue: null }),\r\n new FormColumn({ name: \"nickName\", label: \"昵称\", required: true }),\r\n new FormColumn({\r\n name: \"email\",\r\n label: \"邮箱\",\r\n required: true,\r\n rules: [{ message: \"邮箱格式有误\", pattern: EMAIL_PATTERN }],\r\n }),\r\n new FormColumn({ name: \"phone\", label: \"手机号\", defaultValue: null }),\r\n new FormColumn({\r\n name: \"userName\",\r\n label: \"账号\",\r\n required: true,\r\n disabled: true,\r\n }),\r\n new FormColumn({\r\n name: \"avatar\",\r\n label: \"头像\",\r\n defaultValue: null,\r\n componentInfo: \"MKFormImageUpload\",\r\n componentProps: { uploadContext: new WebFileUploadContext() },\r\n }),\r\n new FormColumn({\r\n name: \"roles\",\r\n label: \"角色\",\r\n defaultValue: null,\r\n componentInfo: \"MKFormDataTableSelect\",\r\n componentProps: {\r\n multiple: true,\r\n objectValue: true,\r\n labelFieldName: \"desc\",\r\n dataTable: new MsRoleTable(),\r\n },\r\n }),\r\n new FormColumn({\r\n name: \"memo\",\r\n label: \"备注\",\r\n componentInfo: \"MKFormInput\",\r\n componentProps: { type: \"textarea\", rows: 4 },\r\n }),\r\n ]);\r\n }\r\n\r\n // formatItem(item: T): F {\r\n // debugger;\r\n // return item;\r\n // return {\r\n // id: item.id,\r\n // name: item.name \|\| \"\",\r\n // wechatNo: item.wechatNo \|\| \"\",\r\n // nickName: item.nickName \|\| \"\",\r\n // email: item.email \|\| \"\",\r\n // phoneNumber: item.phoneNumber \|\| \"\",\r\n // userName: item.userName \|\| \"\",\r\n // avatar: item.avatar,\r\n // roles: item.roles,\r\n // // depts: item.depts?.map((department) => department.deptId),\r\n // valid: item.valid,\r\n // memo: item.memo \|\| \"\",\r\n // } as F;\r\n // }\r\n}\r\n"],"names":[],"mappings":";;;;;;;;;;;;;;AA0DO,MAAM,qBAGH,QAAe,CAAA;AAAA,EACvB,QAAQ,eAAe,IAAY,WAAA,CAAA;AAAA,EAEnC,WAAA,CAAY,OAA2B,GAAA,EAAI,EAAA;AACzC,IAAM,KAAA,CAAA;AAAA,MACJ,IAAA,EAAM,aAAa,eAAe,CAAA;AAAA,MAClC,UAAY,EAAA,WAAA;AAAA,MACZ,GAAG,OAAA;AAAA,KACJ,CAAA,CAAA;AAAA,GACH;AAAA,EAEA,MAAgB,UAAa,GAAA;AAC3B,IAAA,MAAM,MAAM,UAAW,EAAA,CAAA;AAEvB,IAAA,IAAA,CAAK,UAAW,CAAA;AAAA,MACd,IAAI,UAAW,CAAA,EAAE,MAAM,IAAM,EAAA,KAAA,EAAO,gBAAM,CAAA;AAAA,MAC1C,IAAI,WAAW,EAAE,IAAA,EAAM,QAAQ,KAAO,EAAA,cAAA,EAAM,QAAU,EAAA,IAAA,EAAM,CAAA;AAAA,MAC5D,IAAI,WAAW,EAAE,IAAA,EAAM,YAAY,KAAO,EAAA,oBAAA,EAAO,YAAc,EAAA,IAAA,EAAM,CAAA;AAAA,MACrE,IAAI,WAAW,EAAE,IAAA,EAAM,YAAY,KAAO,EAAA,cAAA,EAAM,QAAU,EAAA,IAAA,EAAM,CAAA;AAAA,MAChE,IAAI,UAAW,CAAA;AAAA,QACb,IAAM,EAAA,OAAA;AAAA,QACN,KAAO,EAAA,cAAA;AAAA,QACP,QAAU,EAAA,IAAA;AAAA,QACV,OAAO,CAAC,EAAE,SAAS,sCAAU,EAAA,OAAA,EAAS,eAAe,CAAA;AAAA,OACtD,CAAA;AAAA,MACD,IAAI,WAAW,EAAE,IAAA,EAAM,SAAS,KAAO,EAAA,oBAAA,EAAO,YAAc,EAAA,IAAA,EAAM,CAAA;AAAA,MAClE,IAAI,UAAW,CAAA;AAAA,QACb,IAAM,EAAA,UAAA;AAAA,QACN,KAAO,EAAA,cAAA;AAAA,QACP,QAAU,EAAA,IAAA;AAAA,QACV,QAAU,EAAA,IAAA;AAAA,OACX,CAAA;AAAA,MACD,IAAI,UAAW,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,EAAE,aAAe,EAAA,IAAI,sBAAuB,EAAA;AAAA,OAC7D,CAAA;AAAA,MACD,IAAI,UAAW,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,WAAa,EAAA,IAAA;AAAA,UACb,cAAgB,EAAA,MAAA;AAAA,UAChB,SAAA,EAAW,IAAI,WAAY,EAAA;AAAA,SAC7B;AAAA,OACD,CAAA;AAAA,MACD,IAAI,UAAW,CAAA;AAAA,QACb,IAAM,EAAA,MAAA;AAAA,QACN,KAAO,EAAA,cAAA;AAAA,QACP,aAAe,EAAA,aAAA;AAAA,QACf,cAAgB,EAAA,EAAE,IAAM,EAAA,UAAA,EAAY,MAAM,CAAE,EAAA;AAAA,OAC7C,CAAA;AAAA,KACF,CAAA,CAAA;AAAA,GACH;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAoBF;;;;"}

package/dist/esm/modules/ms/dataviews/ms-member/MsMemberTable.d.ts CHANGED Viewed

@@ -1,7 +1,7 @@
 import { DataTable, DataTableOptions } from "@maketribe/dm";
 import { MsMember, MsMemberForm, MsMemberResult } from "./MsMemberForm";
 import { DATA_MODEL_NAME } from "../../../../constants";
-export type MsMemberTableItem = Omit<MsMember, "password" | "confirmPassword"> & {
+export type MsMemberTableItem = Omit<MsMember, "passwordHash"> & {
     type: number;
 };
 export declare class MsMemberTable extends DataTable<MsMemberResult, MsMemberTableItem> {