@maketribe/ms-app 4.0.0-beta.2 → 4.0.0-beta.3

package/dist/types/{modules/ms/components → components/business}/material-list/index.d.ts

@@ -1,6 +1,6 @@
 export declare const MKMaterialList: import("@maketribe/utils").SFCWithInstall<import("vue").DefineComponent<{
     readonly materialTable: {
-        readonly type: globalThis.PropType<import("../..").MsMaterialTable>;
+        readonly type: globalThis.PropType<any>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __mkPropKey: true;
@@ -9,7 +9,7 @@ export declare const MKMaterialList: import("@maketribe/utils").SFCWithInstall<i
     readonly allowMaterialTypeValues: import("@maketribe/utils").PropFinalized<ArrayConstructor, unknown, unknown, () => never[], boolean>;
 }, () => import("vue/jsx-runtime").JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<globalThis.ExtractPropTypes<{
     readonly materialTable: {
-        readonly type: globalThis.PropType<import("../..").MsMaterialTable>;
+        readonly type: globalThis.PropType<any>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __mkPropKey: true;

package/dist/types/{modules/ms/components → components/business}/material-list/material-group-form-popover.d.ts

@@ -1,4 +1,4 @@
-import { MsMaterialGroupForm, MsMaterialGroupTree } from "../../dataviews/ms-material";
+import { MsMaterialGroupForm, MsMaterialGroupTree } from "../../../dataviews/ms-material";
 declare const _default: import("vue").DefineComponent<{
     readonly materialGroupTree: {
         readonly type: globalThis.PropType<MsMaterialGroupTree>;

package/dist/types/{modules/ms/components → components/business}/material-list/material-group.d.ts

@@ -1,4 +1,4 @@
-import { MsMaterialGroupTree } from "../../dataviews/ms-material";
+import { MsMaterialGroupTree } from "../../../dataviews/ms-material";
 declare const _default: import("vue").DefineComponent<{
     readonly materialGroupTree: {
         readonly type: globalThis.PropType<MsMaterialGroupTree>;

package/dist/types/{modules/ms/components → components/business}/material-list/material-item.vue.d.ts

@@ -1,7 +1,6 @@
-import { MsMaterialTable } from "../../dataviews/ms-material";
 declare const _default: import("vue").DefineComponent<{
     materialTable: {
-        type: typeof MsMaterialTable;
+        type: null;
         required: true;
     };
     material: {
@@ -10,12 +9,12 @@ declare const _default: import("vue").DefineComponent<{
     };
 }, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     click: (...args: any[]) => void;
-    download: (...args: any[]) => void;
     move: (...args: any[]) => void;
     cut: (...args: any[]) => void;
+    download: (...args: any[]) => void;
 }, string, import("vue").PublicProps, Readonly<globalThis.ExtractPropTypes<{
     materialTable: {
-        type: typeof MsMaterialTable;
+        type: null;
         required: true;
     };
     material: {
@@ -25,7 +24,7 @@ declare const _default: import("vue").DefineComponent<{
 }>> & {
     onClick?: ((...args: any[]) => any) | undefined;
     onCut?: ((...args: any[]) => any) | undefined;
-    onDownload?: ((...args: any[]) => any) | undefined;
     onMove?: ((...args: any[]) => any) | undefined;
+    onDownload?: ((...args: any[]) => any) | undefined;
 }, {}, {}>;
 export default _default;

package/dist/types/{modules/ms/components → components/business}/material-list/material-list-options.d.ts

@@ -1,8 +1,7 @@
 import { ExtractPropTypes } from "vue";
-import { MsMaterialTable } from "../../dataviews";
 export declare const materialListProps: {
     readonly materialTable: {
-        readonly type: globalThis.PropType<MsMaterialTable>;
+        readonly type: globalThis.PropType<any>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __mkPropKey: true;

package/dist/types/{modules/ms/components → components/business}/material-list/material-list.d.ts

@@ -1,7 +1,6 @@
-import { MsMaterialTable } from "../../dataviews";
 declare const _default: import("vue").DefineComponent<{
     readonly materialTable: {
-        readonly type: globalThis.PropType<MsMaterialTable>;
+        readonly type: globalThis.PropType<any>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __mkPropKey: true;
@@ -10,7 +9,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly allowMaterialTypeValues: import("@maketribe/utils").PropFinalized<ArrayConstructor, unknown, unknown, () => never[], boolean>;
 }, () => import("vue/jsx-runtime").JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<globalThis.ExtractPropTypes<{
     readonly materialTable: {
-        readonly type: globalThis.PropType<MsMaterialTable>;
+        readonly type: globalThis.PropType<any>;
         readonly required: false;
         readonly validator: ((val: unknown) => boolean) | undefined;
         __mkPropKey: true;

package/dist/types/{modules/ms/components → components/business}/material-select/material-select-api.d.ts

@@ -1,4 +1,4 @@
-import { MsMaterial } from "../../dataviews";
+import { MsMaterial } from "../../../dataviews";
 export type MKMaterialSelectOptions = {
     allowMaterialTypeValues?: any[];
 };

package/dist/types/components/data-model/data-table/views/table/index.d.ts

@@ -44,8 +44,8 @@ export declare const MKTable: import("@maketribe/utils").SFCWithInstall<import("
     readonly lazy: import("@maketribe/utils").PropMergeType<BooleanConstructor, unknown, unknown>;
     readonly getList: Function;
     readonly load: Function;
-    readonly treeProps: Record<string, any>;
     readonly defaultExpandAll: import("@maketribe/utils").PropMergeType<BooleanConstructor, unknown, unknown>;
+    readonly treeProps: Record<string, any>;
 }, {}>> & Record<string, any>;
 export default MKTable;
 export * from "./table-options";

package/dist/types/components/data-model/data-table/views/table/table.d.ts

@@ -44,7 +44,7 @@ declare const _default: import("vue").DefineComponent<{
     readonly lazy: import("@maketribe/utils").PropMergeType<BooleanConstructor, unknown, unknown>;
     readonly getList: Function;
     readonly load: Function;
-    readonly treeProps: Record<string, any>;
     readonly defaultExpandAll: import("@maketribe/utils").PropMergeType<BooleanConstructor, unknown, unknown>;
+    readonly treeProps: Record<string, any>;
 }, {}>;
 export default _default;

package/dist/types/constants/index.d.ts

@@ -4,3 +4,4 @@ export * from "./route";
 export * from "./menu";
 export * from "./region";
 export * from "./log";
+export declare const MODULE_NAME = "ms";

package/dist/types/core/MSAppClient.d.ts

@@ -49,7 +49,7 @@ export declare class MSAppClient {
      * @deprecated
      * @description 使用 MSAppClient.instance.userSession.userInfo
      */
-    get userInfo(): import("./UserInfo").UserInfo | null;
+    get userInfo(): import("./UserInfo.ts").UserInfo | null;
     dataTableComponents: IComponents;
     dataTableHeaderComponents: IComponents;
     dataFormComponents: IComponents;
@@ -72,11 +72,11 @@ export declare class MSAppClient {
         accessToken: string;
         xAccessToken: string;
     }): Promise<import("@maketribe/request").ResponseConfig<R<{
-        member: import("./UserInfo").MemberInfo;
-        menus: import("./menu").MenuData[];
-        routes: import("./Router").Route[];
-        roles: import("./UserInfo").Role[];
-        permissionPoints: import("./PermissionPointManager").PermissionPoint[];
+        member: import("./UserInfo.ts").MemberInfo;
+        menus: import("./index.ts").MenuData[];
+        routes: import("./Router.ts").Route[];
+        roles: import("./UserInfo.ts").Role[];
+        permissionPoints: import("./PermissionPointManager.ts").PermissionPoint[];
     }>, any> | undefined>;
     init(): Promise<void>;
     login(username: string, password: string, code: string): Promise<import("@maketribe/request").ResponseConfig<R<LoginResult>, any>>;

package/dist/types/core/UserInfo.d.ts

@@ -30,5 +30,5 @@ export declare class UserInfo {
     permissionPoints: PermissionPoint[];
     constructor(msAppClient: MSAppClient, payload: MemberInfo, roles: Role[], permissionPoints: PermissionPoint[]);
     hasRole(name: Role["name"]): boolean;
-    hasPermissionPoint(key: PermissionPoint["key"]): boolean;
+    hasPermissionPoint(key: string): boolean;
 }

package/dist/types/{modules/ms/dataviews → dataviews}/log/login-log/LoginLogTable.d.ts

@@ -1,5 +1,5 @@
 import { DataTable, DataTableOptions } from "@maketribe/dm";
-import { LoginLogType } from "../../../../../constants";
+import { LoginLogType } from "../../../constants";
 export type LoginLogResult = {
     account: string;
     ipAddress: string;

package/dist/types/{modules/ms/dataviews → dataviews}/ms-config/MsConfigForm.d.ts

@@ -1,6 +1,6 @@
 import { DataForm, DataFormOptions, IComponents } from "@maketribe/dm";
-import { ITypeResolver } from "../../../../core";
-import { DATA_MODEL_NAME } from "../../../../constants";
+import { ITypeResolver } from "../../core";
+import { DATA_MODEL_NAME } from "../../constants";
 export type MsConfig<T = any> = {
     id: string;
     key: string;

package/dist/types/{modules/ms/dataviews → dataviews}/ms-config/MsConfigTable.d.ts

@@ -1,7 +1,7 @@
 import { DataTable, DataTableOptions } from "@maketribe/dm";
 import { MsConfig } from "./MsConfigForm";
 import { R, ResponseConfig } from "@maketribe/request";
-import { DATA_MODEL_NAME } from "../../../../constants";
+import { DATA_MODEL_NAME } from "../../constants";
 export declare class MsConfigTable extends DataTable<MsConfig> {
     static [DATA_MODEL_NAME]: string;
     private static _instance;

package/dist/types/{modules/ms/dataviews → dataviews}/ms-deny-ip-access-list/MsDenyIPAccessListForm.d.ts

@@ -1,5 +1,5 @@
 import { DataForm } from "@maketribe/dm";
-import { DATA_MODEL_NAME } from "../../../../constants";
+import { DATA_MODEL_NAME } from "../../constants";
 export type MsDenyIPAccessList = {
     id: string;
     ipAddress: string;

package/dist/types/{modules/ms/dataviews → dataviews}/ms-deny-ip-access-list/MsDenyIPAccessListTable.d.ts

@@ -1,6 +1,6 @@
 import { DataTable } from "@maketribe/dm";
 import { MsDenyIPAccessList } from "./MsDenyIPAccessListForm";
-import { DATA_MODEL_NAME } from "../../../../constants";
+import { DATA_MODEL_NAME } from "../../constants";
 export declare class MsDenyIPAccessListTable<T = MsDenyIPAccessList, F = T> extends DataTable<T, F> {
     static [DATA_MODEL_NAME]: string;
     constructor(options?: {});

package/dist/types/{modules/ms/dataviews → dataviews}/ms-ip-white-list/MsIPWhitelistForm.d.ts

@@ -1,5 +1,5 @@
 import { DataForm } from "@maketribe/dm";
-import { DATA_MODEL_NAME } from "../../../../constants";
+import { DATA_MODEL_NAME } from "../../constants";
 export type MsIPWhitelist = {
     id: string;
     ipAddress: string;

package/dist/types/{modules/ms/dataviews → dataviews}/ms-ip-white-list/MsIPWhitelistTable.d.ts

@@ -1,6 +1,6 @@
 import { DataTable } from "@maketribe/dm";
 import { MsIPWhitelist } from "./MsIPWhitelistForm";
-import { DATA_MODEL_NAME } from "../../../../constants";
+import { DATA_MODEL_NAME } from "../../constants";
 export declare class MsIPWhitelistTable<T = MsIPWhitelist, F = T> extends DataTable<T, F> {
     static [DATA_MODEL_NAME]: string;
     constructor(options?: {});

package/dist/types/{modules/ms/dataviews → dataviews}/ms-material/MsMaterialForm.d.ts

@@ -1,5 +1,5 @@
 import { DataForm, DataFormOptions } from "@maketribe/dm";
-import { DATA_MODEL_NAME } from "../../../../constants";
+import { DATA_MODEL_NAME } from "../../constants";
 export type MsMaterial = {
     id: string;
     materialGroupId?: string | null;

package/dist/types/{modules/ms/dataviews → dataviews}/ms-material/MsMaterialTable.d.ts

@@ -1,7 +1,7 @@
 import { Component, DataTable, DataTableOptions, IComponents } from "@maketribe/dm";
 import { MsMaterial, MsMaterialForm } from "./MsMaterialForm";
-import { ITypeResolver } from "../../../../core";
-import { DATA_MODEL_NAME } from "../../../../constants";
+import type { ITypeResolver } from "../../core";
+import { DATA_MODEL_NAME } from "../../constants";
 import { MsMaterialGroupNode } from "./ms-material-group";
 import { WebFileUpload } from "@maketribe/request";
 export type MsMaterialType = {

package/dist/types/{modules/ms/dataviews → dataviews}/ms-material/ms-material-group/MsMaterialGroupForm.d.ts

@@ -1,5 +1,5 @@
 import { DataForm, DataFormOptions } from "@maketribe/dm";
-import { DATA_MODEL_NAME } from "../../../../../constants";
+import { DATA_MODEL_NAME } from "../../../constants";
 export type MsMaterialGroup = {
     id: string;
     desc: string;

package/dist/types/{modules/ms/dataviews → dataviews}/ms-material/ms-material-group/MsMaterialGroupTree.d.ts

@@ -1,7 +1,7 @@
 import { DataTableOptions, DataTree, DataTreeNode } from "@maketribe/dm";
 import { MsMaterialGroup } from "./MsMaterialGroupForm";
 import { ResponseConfig, R } from "@maketribe/request";
-import { DATA_MODEL_NAME } from "../../../../../constants";
+import { DATA_MODEL_NAME } from "../../../constants";
 export type MsMaterialGroupNode = MsMaterialGroup & {
     children: MsMaterialGroupNode[];
 };

package/dist/types/{modules/ms/dataviews → dataviews}/ms-member/MsMemberForm.d.ts

@@ -1,5 +1,5 @@
 import { DataForm, DataFormOptions } from "@maketribe/dm";
-import { DATA_MODEL_NAME } from "../../../../constants";
+import { DATA_MODEL_NAME } from "../../constants";
 export type MsMemberResult = {
     id: string;
     name: string;

package/dist/types/{modules/ms/dataviews → dataviews}/ms-member/MsMemberTable.d.ts

@@ -1,6 +1,6 @@
 import { DataTable, DataTableOptions, DialogInstance } from "@maketribe/dm";
 import { MsMember, MsMemberForm, MsMemberResult } from "./MsMemberForm";
-import { DATA_MODEL_NAME } from "../../../../constants";
+import { DATA_MODEL_NAME } from "../../constants";
 export type MsMemberTableItem = Omit<MsMember, "passwordHash"> & {
     type: number;
 };

package/dist/types/{modules/ms/dataviews → dataviews}/ms-member-role/MsMemberRoleForm.d.ts

@@ -1,5 +1,5 @@
 import { DataForm, DataFormOptions } from "@maketribe/dm";
-import { DATA_MODEL_NAME } from "../../../../constants";
+import { DATA_MODEL_NAME } from "../../constants";
 export declare class MsMemberRoleForm extends DataForm {
     static [DATA_MODEL_NAME]: string;
     constructor(options?: DataFormOptions);

package/dist/types/{modules/ms/dataviews → dataviews}/ms-member-role/MsMemberRoleTable.d.ts

@@ -1,5 +1,5 @@
 import { DataFormOptions, DataTable } from "@maketribe/dm";
-import { DATA_MODEL_NAME } from "../../../../constants";
+import { DATA_MODEL_NAME } from "../../constants";
 import { MsMember, MsMemberTable } from "../ms-member";
 import { MsRole } from "../ms-role";
 export type MsMemberRole = {

package/dist/types/{modules/ms/dataviews → dataviews}/ms-menu/MsMenuForm.d.ts

@@ -1,8 +1,8 @@
 import { DataForm, DataFormOptions } from "@maketribe/dm";
 import { MsRouteResult } from "./ms-route";
 import { MsPermissionPointDefine } from "./ms-permission-point";
-import { DATA_MODEL_NAME } from "../../../../constants";
-import { MenuData } from "../../../../core";
+import { DATA_MODEL_NAME } from "../../constants";
+import { MenuData } from "../../core";
 export type MsMenuResult = MenuData & {
     memo?: string;
 };

package/dist/types/{modules/ms/dataviews → dataviews}/ms-menu/MsMenuTable.d.ts

@@ -1,6 +1,6 @@
 import { DataTable, DataTableOptions } from "@maketribe/dm";
 import type { MsMenuItem, MsMenuResult } from "./MsMenuForm";
-import { DATA_MODEL_NAME } from "../../../../constants";
+import { DATA_MODEL_NAME } from "../../constants";
 export declare class MsMenuTable<T extends MsMenuItem = MsMenuItem> extends DataTable<MsMenuResult, T> {
     static [DATA_MODEL_NAME]: string;
     constructor(options?: Omit<DataTableOptions, "name">);

package/dist/types/{modules/ms/dataviews → dataviews}/ms-menu/MsMenuTree.d.ts

@@ -1,6 +1,6 @@
 import { DataTableOptions, DataTree, DataTreeNode } from "@maketribe/dm";
 import type { MsMenuItem } from "./MsMenuForm";
-import { DATA_MODEL_NAME } from "../../../../constants";
+import { DATA_MODEL_NAME } from "../../constants";
 export type MsMenuItemNode = MsMenuItem & {
     children: MsMenuItemNode[];
     targetUrl: string;

package/dist/types/{modules/ms/dataviews → dataviews}/ms-menu/ms-permission-point/MsPermissionPointDefineForm.d.ts

@@ -1,6 +1,6 @@
 import { DataForm, DataFormOptions } from "@maketribe/dm";
-import { DATA_MODEL_NAME } from "../../../../../constants";
-import { PermissionPointDefine } from "../../../../../core";
+import { DATA_MODEL_NAME } from "../../../constants";
+import { PermissionPointDefine } from "../../../core";
 export type MsPermissionPointDefine = PermissionPointDefine & {
     memo: string;
 };

package/dist/types/{modules/ms/dataviews → dataviews}/ms-menu/ms-permission-point/MsPermissionPointDefineTable.d.ts

@@ -1,6 +1,6 @@
 import { DataTable, DataTableOptions } from "@maketribe/dm";
 import { MsPermissionPointDefine } from "./MsPermissionPointDefineForm";
-import { DATA_MODEL_NAME } from "../../../../../constants";
+import { DATA_MODEL_NAME } from "../../../constants";
 export declare class MsPermissionPointDefineTable<T extends MsPermissionPointDefine = MsPermissionPointDefine> extends DataTable<MsPermissionPointDefine, T> {
     static [DATA_MODEL_NAME]: string;
     constructor(options?: DataTableOptions);

package/dist/types/{modules/ms/dataviews → dataviews}/ms-menu/ms-route/MsRouteForm.d.ts

@@ -1,6 +1,6 @@
 import { DataForm, DataFormOptions } from "@maketribe/dm";
-import { DATA_MODEL_NAME } from "../../../../../constants";
-import { Route } from "../../../../../core";
+import { DATA_MODEL_NAME } from "../../../constants";
+import { Route } from "../../../core";
 export type MsRouteResult = {
     id: string;
     name: string;

package/dist/types/{modules/ms/dataviews → dataviews}/ms-menu/ms-route/MsRouteTable.d.ts

@@ -1,6 +1,6 @@
 import { DataTable, DataTableOptions } from "@maketribe/dm";
 import { MsRoute, MsRouteResult } from "./MsRouteForm";
-import { DATA_MODEL_NAME } from "../../../../../constants";
+import { DATA_MODEL_NAME } from "../../../constants";
 export declare class MsRouteTable extends DataTable<MsRouteResult, MsRoute> {
     static [DATA_MODEL_NAME]: string;
     constructor(options?: DataTableOptions);

package/dist/types/{modules/ms/dataviews → dataviews}/ms-message/MsMessageForm.d.ts

@@ -1,5 +1,5 @@
 import { DataForm, DataFormOptions } from "@maketribe/dm";
-import { DATA_MODEL_NAME } from "../../../../constants";
+import { DATA_MODEL_NAME } from "../../constants";
 export declare class MsMessageForm extends DataForm {
     static [DATA_MODEL_NAME]: string;
     constructor(options?: DataFormOptions);

package/dist/types/{modules/ms/dataviews → dataviews}/ms-message/MsMessageNotifyTable.d.ts

@@ -1,5 +1,5 @@
 import { Components, DataTable, DataTableOptions } from "@maketribe/dm";
-import { DATA_MODEL_NAME } from "../../../../constants";
+import { DATA_MODEL_NAME } from "../../constants";
 import { Group, R, ResponseConfig } from "@maketribe/request";
 export declare class MsMessageNotifyTable extends DataTable {
     static components: Components;

package/dist/types/{modules/ms/dataviews → dataviews}/ms-message/MsMessageTable.d.ts

@@ -1,5 +1,5 @@
 import { DataTable, DataTableOptions } from "@maketribe/dm";
-import { DATA_MODEL_NAME } from "../../../../constants";
+import { DATA_MODEL_NAME } from "../../constants";
 export declare class MsMessageTable extends DataTable {
     static [DATA_MODEL_NAME]: string;
     private sendForm;

package/dist/types/{modules/ms/dataviews → dataviews}/ms-message/SendForm.d.ts

@@ -1,5 +1,5 @@
 import { DataForm, DataFormOptions } from "@maketribe/dm";
-import { DATA_MODEL_NAME } from "../../../../constants";
+import { DATA_MODEL_NAME } from "../../constants";
 export declare class SendForm extends DataForm {
     static [DATA_MODEL_NAME]: string;
     constructor(options?: DataFormOptions);

package/dist/types/{modules/ms/dataviews → dataviews}/ms-region/MsRegionForm.d.ts

@@ -1,5 +1,5 @@
 import { DataForm, DataFormOptions } from "@maketribe/dm";
-import { DATA_MODEL_NAME } from "../../../../constants";
+import { DATA_MODEL_NAME } from "../../constants";
 export type MsRegion = {
     id: string;
     code: string;

package/dist/types/{modules/ms/dataviews → dataviews}/ms-region/MsRegionTable.d.ts

@@ -1,5 +1,5 @@
 import { DataTable, DataTableOptions } from "@maketribe/dm";
-import { DATA_MODEL_NAME } from "../../../../constants";
+import { DATA_MODEL_NAME } from "../../constants";
 import { MsRegion } from "./MsRegionForm";
 export declare class MsRegionTable extends DataTable<MsRegion> {
     static [DATA_MODEL_NAME]: string;

package/dist/types/{modules/ms/dataviews → dataviews}/ms-role/MsRoleForm.d.ts

@@ -1,6 +1,6 @@
 import { DataForm, DataFormOptions } from "@maketribe/dm";
-import { DATA_MODEL_NAME } from "../../../../constants";
-import { Role } from "../../../../core";
+import { DATA_MODEL_NAME } from "../../constants";
+import { Role } from "../../core";
 export type MsRole = Role & {
     memo: string;
 };

package/dist/types/{modules/ms/dataviews → dataviews}/ms-role/MsRoleTable.d.ts

@@ -1,7 +1,7 @@
 import { DataTable, DataTableOptions } from "@maketribe/dm";
 import { MsRole } from "./MsRoleForm";
 import { Event } from "@maketribe/utils";
-import { DATA_MODEL_NAME } from "../../../../constants";
+import { DATA_MODEL_NAME } from "../../constants";
 export declare class MsRoleTable<F extends MsRole = MsRole, T extends MsRole = MsRole> extends DataTable<T, F> {
     static [DATA_MODEL_NAME]: string;
     configRolePermissionEvent: Event<{

package/dist/types/{modules/ms/dataviews → dataviews}/ms-role/ms-role-permission-point/MsRolePermissionPointTable.d.ts

@@ -1,6 +1,6 @@
 import { DataTable, DataTableOptions } from "@maketribe/dm";
 import { ResponseConfig, R } from "@maketribe/request";
-import { DATA_MODEL_NAME } from "../../../../../constants";
+import { DATA_MODEL_NAME } from "../../../constants";
 export type MsRolePermissionPoint = {
     id: string;
     permissionPointDefId: string;

package/dist/types/{modules/ms/dataviews → dataviews}/ms-role/ms-role-route/MsRoleRouteTable.d.ts

@@ -1,6 +1,6 @@
 import { DataTable, DataTableOptions } from "@maketribe/dm";
 import { ResponseConfig, R } from "@maketribe/request";
-import { DATA_MODEL_NAME } from "../../../../../constants";
+import { DATA_MODEL_NAME } from "../../../constants";
 export type MsRoleRoute = {
     id: string;
     roleId: string;

package/dist/types/{modules/ms/dataviews → dataviews}/request-log/MsRequestLogTable.d.ts

@@ -1,5 +1,5 @@
 import { DataTable, DataTableOptions } from "@maketribe/dm";
-import { DATA_MODEL_NAME } from "../../../../constants";
+import { DATA_MODEL_NAME } from "../../constants";
 export declare class MsRequestLogTable extends DataTable {
     static [DATA_MODEL_NAME]: string;
     constructor(options?: DataTableOptions);

package/dist/types/{modules/ms/image-upload-context → image-upload-context}/index.d.ts

@@ -1,4 +1,4 @@
-import { UploadContext, UploadResult } from "../../../components/basic/upload-file";
+import { UploadContext, UploadResult } from "../components/basic/upload-file";
 /**
  * 图片上传上下文
  */

package/dist/types/index.d.ts

@@ -3,6 +3,7 @@ import "../style/index.scss";
 import "./assets/iconfonts/iconfont.js";
 import "./assets/iconfonts/oa-iconfont.js";
 export * from "./constants";
+export * from './image-upload-context';
 export * from "./core";
 export * from "./layouts";
 export * from "./composables";
@@ -14,4 +15,4 @@ export * from "./init-application";
 export * from "./define-data-table";
 export * from "./define-data-form";
 export * from "./define-data-tree";
-export * from "./modules/ms";
+export * from './dataviews';

package/dist/types/layouts/new/components/Menu/index.vue.d.ts

@@ -22,9 +22,9 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
     showCollapseName: boolean;
 }>>>, {
     mode: "horizontal" | "vertical";
-    accordion: boolean;
     collapse: boolean;
     defaultOpeneds: string[];
+    accordion: boolean;
     showCollapseName: boolean;
 }, {}>;
 export default _default;

package/dist/types/layouts/new/components/Topbar/Toolbar/Message/message-list.vue.d.ts

@@ -1,4 +1,4 @@
-import { MsMessageNotifyTable } from '../../../../../../modules/ms';
+import { MsMessageNotifyTable } from '../../../../../../dataviews';
 declare const _default: import("vue").DefineComponent<{
     visible: {
         type: BooleanConstructor;

package/dist/types/{modules/ms/pages → page}/to-do/ToDoForm.d.ts

@@ -1,5 +1,5 @@
 import { DataForm, DataFormOptions } from "@maketribe/dm";
-import { DATA_MODEL_NAME } from "../../../../constants";
+import { DATA_MODEL_NAME } from "../../constants";
 export declare class ToDoForm extends DataForm {
     static [DATA_MODEL_NAME]: string;
     constructor(options?: DataFormOptions);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maketribe/ms-app",
-  "version": "4.0.0-beta.2",
+  "version": "4.0.0-beta.3",
   "description": "",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -65,10 +65,10 @@
     "vue-cropper": "^1.1.4",
     "vue-m-message": "^4.0.2",
     "vue-router": "^4.2.4",
-    "@maketribe/request": "^4.0.0-alpha.1",
-    "@maketribe/locale": "^4.0.0-alpha.1",
     "@maketribe/dm": "^4.0.0-alpha.5",
-    "@maketribe/utils": "^4.0.0-alpha.1"
+    "@maketribe/utils": "^4.0.0-alpha.1",
+    "@maketribe/locale": "^4.0.0-alpha.1",
+    "@maketribe/request": "^4.0.0-alpha.1"
   },
   "devDependencies": {
     "@types/path-browserify": "^1.0.2",

package/dist/cjs/index-BQ-pFo41.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"index-BQ-pFo41.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;"}

package/dist/cjs/index-C1PQoR8l.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"index-C1PQoR8l.cjs","sources":["../../src/modules/ms/pages/to-do/ToDoForm.ts","../../src/modules/ms/pages/to-do/index.vue"],"sourcesContent":["import { DataForm, DataFormOptions, FormColumn, Messager } from \"@maketribe/dm\";\r\nimport { DATA_MODEL_NAME, RegionLevel } from \"../../../../constants\";\r\nimport { MODULE_NAME } from \"../../constants\";\r\nimport { MSAppClient } from \"../../../../core\";\r\nimport { min, multiply } from \"lodash-es\";\r\nimport { MsMemberTable } from \"../../dataviews\";\r\n\r\nexport class ToDoForm extends DataForm {\r\n    static [DATA_MODEL_NAME]: string = \"todo\";\r\n\r\n    constructor(options: DataFormOptions = {}) {\r\n        super({\r\n            name: ToDoForm[DATA_MODEL_NAME],\r\n            moduleName: MODULE_NAME,\r\n            ...options,\r\n        });\r\n        this.httpRequest = MSAppClient.instance!.httpRequest;\r\n    }\r\n\r\n    protected async initialize(): Promise<void> {\r\n        await super.initialize();\r\n\r\n        const result = await this.httpRequest.get(\"/ms/dv/todo/meta\")\r\n        if (result.data.code != 200) {\r\n            Messager.error({\r\n                message: result.data.msg || '获取消息类型失败'\r\n            })\r\n            return;\r\n        }\r\n\r\n        this.setColumns([\r\n            new FormColumn({\r\n                name: \"memberId\", label: \"处理成员id\",\r\n                componentInfo: \"MKFormDataTableSelect\",\r\n                componentProps: {\r\n                    dataTable: this.register(new MsMemberTable()),\r\n                    labelFieldName: \"name\",\r\n                },\r\n                required: true\r\n            }),\r\n            new FormColumn({\r\n                name: \"deadline\", label: \"截止时间\",\r\n                componentInfo: \"MKFormDatePicker\",\r\n            }),\r\n            new FormColumn({\r\n                name: \"relatedMemberIds\", label: \"关联成员\",\r\n                componentInfo: \"MKFormDataTableSelect\",\r\n                componentProps: {\r\n                    dataTable: this.register(new MsMemberTable()),\r\n                    labelFieldName: \"name\",\r\n                    multiple: true\r\n                },\r\n                required: true\r\n            }),\r\n            new FormColumn({\r\n                name: \"intro\", label: \"待办简介\", componentInfo: \"MKFormInput\",\r\n                componentProps: {\r\n                    autoSize: {\r\n                        minRows: 5,\r\n                        maxRows: 20\r\n                    }\r\n                },\r\n                required: true\r\n            }),\r\n\r\n            new FormColumn({\r\n                name: \"content\", label: \"内容\",\r\n                componentInfo: \"MKFormInput\",\r\n                componentProps: {\r\n                    type: \"textarea\",\r\n                    autosize: {\r\n                        minRows: 5,\r\n                        maxRows: 20\r\n                    }\r\n                },\r\n                required: true\r\n            }),\r\n            new FormColumn({\r\n                name: \"priority\", label: \"待办优先级\",\r\n                componentInfo: \"MKFormDataSelect\",\r\n                componentProps: {\r\n                    options: result.data.data.priorityList\r\n                }, required: true,\r\n                defaultValue: 0\r\n            }),\r\n            new FormColumn({\r\n                name: \"status\", label: \"待办状态\",\r\n                componentInfo: \"MKFormDataSelect\",\r\n                componentProps: {\r\n                    options: result.data.data.statusList\r\n                }, required: true,\r\n                defaultValue: 0\r\n            }),\r\n        ]);\r\n\r\n    }\r\n\r\n    async submit() {\r\n        const res = await this.httpRequest.post(\"/ms/dv/todo/create\", this.data)\r\n        return res\r\n    }\r\n}","<template>\r\n    <div class=\"ms-todo\">\r\n        <el-page-header style=\"background-color: #fff;padding: 10px;\" :icon=\"null\">\r\n            <template #title>\r\n                <h3 style=\"color: var(--el-text-color-regular);margin-left: 10px;\">\r\n                    <MKSvgIcon iconClass=\"Timer\" style=\"margin-right: 5px;\" />\r\n                    待办事项\r\n                </h3>\r\n            </template>\r\n            <template #extra>\r\n            </template>\r\n        </el-page-header>\r\n        <div class=\"ms-todo__body-warp\">\r\n            <ElCard class=\"ms-todo__body-warp__calendar\">\r\n                <div class=\"ms-todo__body-warp__calendar-header\">\r\n                    <div class=\"ms-todo__body-warp__calendar-header-left\">\r\n                        <span class=\"ms-todo__body-warp__calendar-header_left-title\">今日工作</span><span\r\n                            class=\"ms-todo__body-warp__calendar-header_left-date\">{{\r\n                                selectDate.toLocaleDateString().replace(/\\//g, '-')\r\n                            }}</span>\r\n                    </div>\r\n                    <div class=\"ms-todo__body-warp__calendar-header-right\">\r\n                        <ElButton link type=\"primary\" @click=\"addToDo\">\r\n                            <MKSvgIcon iconClass=\"Plus\" style=\"margin-right: 10px;\"></MKSvgIcon>添加事项\r\n                        </ElButton>\r\n                    </div>\r\n                </div>\r\n                <div class=\"ms-todo__body-warp__calendar-body\">\r\n                    <div class=\"ms-todo__body-warp__calendar-body-left day-box\" @click=\"offsetValue--\">\r\n                        <MKSvgIcon iconClass=\"ArrowLeft\"></MKSvgIcon>\r\n                    </div>\r\n                    <div v-for=\"item in currentWeek\" class=\"ms-todo__body-warp__calendar-body_date day-box\"\r\n                        @click=\"selectDate = item.date; console.log(item);\">\r\n                        <div class=\"ms-todo__body-warp__calendar-body_date-weekDay\">\r\n                            {{ item.weekDay }}\r\n                        </div>\r\n                        <div\r\n                            :class=\"[item.date.toLocaleDateString() == selectDate.toLocaleDateString() ? 'is-active' : '', 'ms-todo__body-warp__calendar-body_date-day']\">\r\n                            {{ item.day }}\r\n                        </div>\r\n                    </div>\r\n                    <div class=\"ms-todo__body-warp__calendar-body-right day-box\" @click=\"offsetValue++\">\r\n                        <MKSvgIcon iconClass=\"ArrowRight\"></MKSvgIcon>\r\n                    </div>\r\n                </div>\r\n                <div class=\"ms-todo__body-warp__calendar-work\">\r\n\r\n                </div>\r\n            </ElCard>\r\n        </div>\r\n    </div>\r\n</template>\r\n<script setup lang=\"ts\">\r\nimport { ElCard } from 'element-plus';\r\nimport { MSAppClient } from '../../../../core';\r\nimport { Ref, ref, watch } from 'vue';\r\nimport { Dialoger } from '@maketribe/dm';\r\nimport { ToDoForm } from './ToDoForm';\r\nimport { DvOpt, Group } from '@maketribe/request';\r\n\r\nconst httpRequest = MSAppClient.instance!.httpRequest;\r\n\r\ndefineOptions({\r\n    mkRoute: {\r\n        name: \"dv/ms-todo/single/list/dialog\",\r\n    },\r\n})\r\n\r\nconst todoDv = DvOpt.createInstance({\r\n    name: \"todo\"\r\n})\r\nconst dayGroup = new Group()\r\n\r\n\r\nconst selectDate = ref(new Date());\r\nconst offsetValue = ref(0)\r\nconst currentWeek = ref();\r\nconst todoList: Ref<any[]> = ref([{\r\n    \r\n}])\r\nhttpRequest.get(\"/ms/dv/todo/meta\")\r\n//获取当前周信息\r\nconst getWeek = (offset = 0) => {\r\n    const now = new Date().getTime() + offset * 86400000;\r\n    const dayOfWeek = new Date(now).getDay();\r\n    const startDate = new Date(now - dayOfWeek * 86400000);\r\n    const weekDate = [\r\n        startDate,\r\n        new Date(now - (dayOfWeek - 1) * 86400000),\r\n        new Date(now - (dayOfWeek - 2) * 86400000),\r\n        new Date(now - (dayOfWeek - 3) * 86400000),\r\n        new Date(now - (dayOfWeek - 4) * 86400000),\r\n        new Date(now - (dayOfWeek - 5) * 86400000),\r\n        new Date(now - (dayOfWeek - 6) * 86400000)\r\n    ]\r\n    return {\r\n        0: { date: weekDate[0], day: weekDate[0].getDate(), weekDay: \"日\" },\r\n        1: { date: weekDate[1], day: weekDate[1].getDate(), weekDay: \"一\" },\r\n        2: { date: weekDate[2], day: weekDate[2].getDate(), weekDay: \"二\" },\r\n        3: { date: weekDate[3], day: weekDate[3].getDate(), weekDay: \"三\" },\r\n        4: { date: weekDate[4], day: weekDate[4].getDate(), weekDay: \"四\" },\r\n        5: { date: weekDate[5], day: weekDate[5].getDate(), weekDay: \"五\" },\r\n        6: { date: weekDate[6], day: weekDate[6].getDate(), weekDay: \"六\" },\r\n    }\r\n}\r\n\r\n/**\r\n * 获取当前日期的待办事项\r\n * @param Date day \r\n */\r\nconst getDayTodo = async (day: Date) => {\r\n    dayGroup.clear();\r\n    dayGroup.addCondition(\"createdAt\", \"<=\", day);\r\n    dayGroup.addCondition(\"deadline\", \">=\", day);\r\n    return await todoDv.query().addGroup((g) => g.group.addGroup(dayGroup)).list();\r\n}\r\n\r\nconst addToDo = async () => {\r\n    console.log(2154);\r\n    Dialoger.dataFormDialog({\r\n        dataForm: new ToDoForm()\r\n    })\r\n}\r\n\r\nwatch(offsetValue, (newValue, oldValue) => {\r\n    //获取当前周信息\r\n    currentWeek.value = getWeek(offsetValue.value * 7);\r\n    //更改选中的日期\r\n    selectDate.value = new Date(selectDate.value.getTime() + (newValue - oldValue! || 0) * 7 * 86400000);\r\n}, { immediate: true }\r\n)\r\n\r\nwatch(selectDate, async () => {\r\n    // selectDate.value = currentWeek.value[0];\r\n    //todo 获取当前日期的待办事项\r\n    todoList.value = await getDayTodo(selectDate.value)\r\n}, { immediate: true })\r\n\r\n\r\n</script>\r\n<style lang='scss'></style>"],"names":["DataForm","DATA_MODEL_NAME","MODULE_NAME","MSAppClient","Messager","FormColumn","MsMemberTable","DvOpt","Group","ref","Dialoger","watch"],"mappings":"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"}