@maketribe/ms-app 4.0.9 → 5.0.1

package/dist/types/components/data-model/data-tree-list/index.d.ts

@@ -22,12 +22,20 @@ export declare const MKDataTreeList: import("@maketribe/utils").SFCWithInstall<{
             default: string;
         };
         curSelectId: {
-            type: StringConstructor;
+            type: (NumberConstructor | StringConstructor)[];
+        };
+        useSort: {
+            type: BooleanConstructor;
+            default: boolean;
         };
         useAction: {
             type: BooleanConstructor;
             default: boolean;
         };
+        useFirstSelect: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
     }>> & {
         onSelect?: ((...args: any[]) => any) | undefined;
         onEdit?: ((...args: any[]) => any) | undefined;
@@ -63,12 +71,20 @@ export declare const MKDataTreeList: import("@maketribe/utils").SFCWithInstall<{
             default: string;
         };
         curSelectId: {
-            type: StringConstructor;
+            type: (NumberConstructor | StringConstructor)[];
+        };
+        useSort: {
+            type: BooleanConstructor;
+            default: boolean;
         };
         useAction: {
             type: BooleanConstructor;
             default: boolean;
         };
+        useFirstSelect: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
     }>> & {
         onSelect?: ((...args: any[]) => any) | undefined;
         onEdit?: ((...args: any[]) => any) | undefined;
@@ -78,7 +94,9 @@ export declare const MKDataTreeList: import("@maketribe/utils").SFCWithInstall<{
         title: string;
         autoLoad: boolean;
         dataItemDescFieldName: string;
+        useSort: boolean;
         useAction: boolean;
+        useFirstSelect: boolean;
     }, true, {}, {}, {
         P: {};
         B: {};
@@ -109,12 +127,20 @@ export declare const MKDataTreeList: import("@maketribe/utils").SFCWithInstall<{
             default: string;
         };
         curSelectId: {
-            type: StringConstructor;
+            type: (NumberConstructor | StringConstructor)[];
+        };
+        useSort: {
+            type: BooleanConstructor;
+            default: boolean;
         };
         useAction: {
             type: BooleanConstructor;
             default: boolean;
         };
+        useFirstSelect: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
     }>> & {
         onSelect?: ((...args: any[]) => any) | undefined;
         onEdit?: ((...args: any[]) => any) | undefined;
@@ -126,7 +152,9 @@ export declare const MKDataTreeList: import("@maketribe/utils").SFCWithInstall<{
         title: string;
         autoLoad: boolean;
         dataItemDescFieldName: string;
+        useSort: boolean;
         useAction: boolean;
+        useFirstSelect: boolean;
     }>;
     __isFragment?: never;
     __isTeleport?: never;
@@ -154,12 +182,20 @@ export declare const MKDataTreeList: import("@maketribe/utils").SFCWithInstall<{
         default: string;
     };
     curSelectId: {
-        type: StringConstructor;
+        type: (NumberConstructor | StringConstructor)[];
+    };
+    useSort: {
+        type: BooleanConstructor;
+        default: boolean;
     };
     useAction: {
         type: BooleanConstructor;
         default: boolean;
     };
+    useFirstSelect: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & {
     onSelect?: ((...args: any[]) => any) | undefined;
     onEdit?: ((...args: any[]) => any) | undefined;
@@ -176,7 +212,9 @@ export declare const MKDataTreeList: import("@maketribe/utils").SFCWithInstall<{
     title: string;
     autoLoad: boolean;
     dataItemDescFieldName: string;
+    useSort: boolean;
     useAction: boolean;
+    useFirstSelect: boolean;
 }, {}, string, {}> & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & (new () => {
     $slots: {
         tools?: (props: {

package/dist/types/components/data-model/data-tree-list/index.vue.d.ts

@@ -28,12 +28,20 @@ declare const __VLS_component: import("vue").DefineComponent<{
         default: string;
     };
     curSelectId: {
-        type: StringConstructor;
+        type: (NumberConstructor | StringConstructor)[];
+    };
+    useSort: {
+        type: BooleanConstructor;
+        default: boolean;
     };
     useAction: {
         type: BooleanConstructor;
         default: boolean;
     };
+    useFirstSelect: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }, {
     dataTree: DataTree<any>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
@@ -64,12 +72,20 @@ declare const __VLS_component: import("vue").DefineComponent<{
         default: string;
     };
     curSelectId: {
-        type: StringConstructor;
+        type: (NumberConstructor | StringConstructor)[];
+    };
+    useSort: {
+        type: BooleanConstructor;
+        default: boolean;
     };
     useAction: {
         type: BooleanConstructor;
         default: boolean;
     };
+    useFirstSelect: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & {
     onSelect?: ((...args: any[]) => any) | undefined;
     onEdit?: ((...args: any[]) => any) | undefined;
@@ -79,7 +95,9 @@ declare const __VLS_component: import("vue").DefineComponent<{
     title: string;
     autoLoad: boolean;
     dataItemDescFieldName: string;
+    useSort: boolean;
     useAction: boolean;
+    useFirstSelect: boolean;
 }, {}>;
 declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
 export default _default;

package/dist/types/components/layouts/PagePanel/index.vue.d.ts

@@ -1,4 +1,4 @@
-declare var __VLS_1: {}, __VLS_9: {}, __VLS_11: {}, __VLS_19: {}, __VLS_22: {}, __VLS_25: {}, __VLS_27: {}, __VLS_29: {};
+declare var __VLS_1: {}, __VLS_9: {}, __VLS_11: {}, __VLS_27: {}, __VLS_30: {}, __VLS_33: {}, __VLS_35: {}, __VLS_37: {};
 type __VLS_Slots = {} & {
     header?: (props: typeof __VLS_1) => any;
 } & {
@@ -6,15 +6,15 @@ type __VLS_Slots = {} & {
 } & {
     title?: (props: typeof __VLS_11) => any;
 } & {
-    tools?: (props: typeof __VLS_19) => any;
+    tools?: (props: typeof __VLS_27) => any;
 } & {
-    extra?: (props: typeof __VLS_22) => any;
+    extra?: (props: typeof __VLS_30) => any;
 } & {
-    'header-content'?: (props: typeof __VLS_25) => any;
+    'header-content'?: (props: typeof __VLS_33) => any;
 } & {
-    body?: (props: typeof __VLS_27) => any;
+    body?: (props: typeof __VLS_35) => any;
 } & {
-    default?: (props: typeof __VLS_29) => any;
+    default?: (props: typeof __VLS_37) => any;
 };
 declare const __VLS_component: import("vue").DefineComponent<{
     loading: {

package/dist/types/composables/use-user-info.d.ts

@@ -1 +1 @@
-export declare const useUserInfo: () => import("../core").UserInfo | null;
+export declare const useUserInfo: () => import("../core").LoginAccountMeta | null;

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

@@ -0,0 +1,57 @@
+import type { MSAppClient } from "./MSAppClient";
+import { Permission } from "./PermissionManager.ts";
+/**
+ * 账户身份枚举
+ */
+export declare enum AccountIdentityEnum {
+    NORMAL = 1,
+    DEVELOPER = 2,
+    OWNER = 3
+}
+/**
+ * 角色信息
+ */
+export type Role = {
+    id: string;
+    name: string;
+    desc: string;
+};
+/**
+ * 账户信息
+ */
+export interface AccountInfo {
+    id: number;
+    account: string;
+    email: string;
+    avatar: string;
+    identity: AccountIdentityEnum;
+    errorCount: string;
+    errorDatetime: string;
+    isLock: number;
+    unlockDatetime: string;
+}
+/**
+ * 登录账户元数据
+ */
+export declare class LoginAccountMeta {
+    id: number;
+    account: string;
+    email: string;
+    avatar: string;
+    isLocked: boolean;
+    identity: AccountIdentityEnum;
+    payload: any;
+    roles: Role[];
+    permissionPoints: Permission[];
+    constructor(msAppClient: MSAppClient, payload: AccountInfo, roles: Role[], permissions: Permission[]);
+    /**
+     * 是否有角色
+     * @param name
+     */
+    hasRole(name: Role["name"]): boolean;
+    /**
+     * 是否有权限
+     * @param key
+     */
+    hasPermission(key: string): boolean;
+}

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.ts").UserInfo | null;
+    get userInfo(): import("./LoginAccountMeta.ts").LoginAccountMeta | 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.ts").MemberInfo;
+        member: import("./LoginAccountMeta.ts").AccountInfo;
         menus: import("./index.ts").MenuData[];
         routes: import("./Router.ts").Route[];
-        roles: import("./UserInfo.ts").Role[];
-        permissionPoints: import("./PermissionPointManager.ts").PermissionPoint[];
+        roles: import("./LoginAccountMeta.ts").Role[];
+        permissionPoints: import("./PermissionManager.ts").Permission[];
     }>, any> | undefined>;
     init(): Promise<void>;
     /**

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

@@ -0,0 +1,30 @@
+/**
+ * 权限定义
+ */
+export interface Permission {
+    id: number;
+    menuId: string;
+    key: string;
+    name: string;
+}
+/**
+ * 权限管理
+ */
+export declare class PermissionManager {
+    permissions: Permission[];
+    constructor();
+    /**
+     * 设置权限
+     * @param permissions
+     */
+    setPermissions(permissions: Permission[]): void;
+    /**
+     * 初始化
+     */
+    init(): void;
+    /**
+     * 根据菜单获取权限定义
+     * @param menuID
+     */
+    getPermissionsByMenuId(menuID: string): Permission[];
+}

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

@@ -5,7 +5,7 @@ export type Route = {
     name: string;
     title: string;
     menuId: string;
-    iconName: string;
+    icon: string;
     route: string;
 };
 export declare class Router extends Disposable {

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

@@ -1,10 +1,10 @@
 import { Disposable, Event } from "@maketribe/utils";
-import { MemberInfo, UserInfo } from "./UserInfo";
+import { AccountInfo, LoginAccountMeta } from "./LoginAccountMeta.ts";
 import { Menu } from "./menu";
 import { Tabs } from "./tabs";
 import { Router, Route } from "./Router";
-import type { Role } from "./UserInfo";
-import { PermissionPoint, PermissionPointManager } from "./PermissionPointManager";
+import type { Role } from "./LoginAccountMeta.ts";
+import { Permission, PermissionManager } from "./PermissionManager.ts";
 import type { MSAppClient, LoginResult } from "./MSAppClient";
 import { MenuData } from "./menu";
 import { R } from "@maketribe/request";
@@ -17,11 +17,11 @@ export declare class UserSession extends Disposable {
     id: number;
     msAppClient: MSAppClient;
     vueRouter: MSAppClient["vueRouter"];
-    userInfo: UserInfo | null;
+    userInfo: LoginAccountMeta | null;
     menu: Menu;
     tabs: Tabs;
     router: Router;
-    permissionPointManager: PermissionPointManager;
+    permissionPointManager: PermissionManager;
     accessToken: string;
     xAccessToken: string;
     beforeInitRouterEvent: Event;
@@ -31,11 +31,11 @@ export declare class UserSession extends Disposable {
     }>;
     constructor(options: UserSessionOptions);
     init(): Promise<import("@maketribe/request").ResponseConfig<R<{
-        member: MemberInfo;
+        member: AccountInfo;
         menus: MenuData[];
         routes: Route[];
         roles: Role[];
-        permissionPoints: PermissionPoint[];
+        permissionPoints: Permission[];
     }>, any> | undefined>;
     lock(): void;
     unlock(password: string, code: string): Promise<import("@maketribe/request").ResponseConfig<R<LoginResult>, any>>;

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

@@ -5,8 +5,8 @@ export * from "./resolver/ITypeResolver";
 export * from "./DataModelDefines";
 export * from "./MSAppClient";
 export * from "./PageManager";
-export * from "./PermissionPointManager";
+export * from "./PermissionManager.ts";
 export * from "./Router";
-export * from "./UserInfo";
+export * from "./LoginAccountMeta.ts";
 export * from "./UserSession";
 export * from "./MkModule";

package/dist/types/core/menu/Menu.d.ts

@@ -1,5 +1,5 @@
 import { Disposable, Event } from "@maketribe/utils";
-import { PermissionPointManager } from "../PermissionPointManager";
+import { PermissionManager } from "../PermissionManager.ts";
 import { Router } from "../Router";
 import { MenuNode } from "./MenuNode";
 import type { Route } from "../Router";
@@ -12,7 +12,7 @@ export type PermissionPointDefine = {
 export type MenuData = {
     id: string;
     title: string | null;
-    iconName: string | null;
+    icon: string | null;
     pid: string | null;
     routeId: string;
     sort: string;
@@ -27,12 +27,12 @@ export declare class Menu extends Disposable {
     _currentMenu: MenuNode | null;
     isCollapsed: boolean;
     isVisible: boolean;
-    permissionPointManager: PermissionPointManager;
+    permissionPointManager: PermissionManager;
     router: Router;
     currentMenuChangeEvent: Event<{
         currentMenu: MenuNode | null;
     }>;
-    constructor(permissionPointManager: PermissionPointManager, router: Router);
+    constructor(permissionPointManager: PermissionManager, router: Router);
     setMenus(menus: MenuData[]): void;
     findMenuNodeByID(id: MenuNode["id"]): MenuNode | null;
     setCurrentMenuNode(node: MenuNode | null): Promise<boolean>;

package/dist/types/core/menu/MenuNode.d.ts

@@ -1,23 +1,23 @@
-import { PermissionPoint } from "../PermissionPointManager";
+import { Permission } from "../PermissionManager.ts";
 import type { Route } from "../Router";
 interface MenuNodeOptions {
     id: string;
     route?: Route | null;
     routes: Route[] | null;
-    iconName: string;
+    icon: string;
     title: string;
     urlType: number;
     path?: string;
-    permissionPoints: PermissionPoint[];
+    permissionPoints: Permission[];
     children: MenuNode[];
     type: string;
     parent?: MenuNode | null;
 }
 export declare class MenuNode {
     id: string;
-    iconName: string;
+    icon: string;
     title: string;
-    permissionPoints: PermissionPoint[];
+    permissionPoints: Permission[];
     route: Route | null;
     routes: Route[] | null;
     type: string;

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

@@ -1,7 +1,7 @@
 export * from "./ms-material";
-export * from "./ms-member";
-export * from "./ms-member-role";
-export * from "./MsMenu";
+export * from "./ms-account";
+export * from "./ms-account-role";
+export * from "./ms-menu";
 export * from "./ms-role";
 export * from "./ms-config";
 export * from "./ms-ip-white-list";

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

@@ -1,17 +1,12 @@
 import { DataForm, DataFormOptions } from "@maketribe/dm";
 import { DATA_MODEL_NAME } from "../../constants";
-export type MsMemberResult = {
+export type MsAccountFormResult = {
     id: string;
-    name: string;
-    wechatNo: string;
-    nickName: string;
     email: string;
     normalizedEmail: string;
     emailConfirmed: boolean;
     phoneNumber: string;
     phoneNumberConfirmed: string;
-    userName: string;
-    normalizedUserName: string;
     avatar: string;
     roles: any[];
     passwordHash: string;
@@ -25,18 +20,13 @@ export type MsMemberResult = {
     securityStamp: string;
     isLock: number;
 };
-export type MsMember = {
+export type MsAccountFormMeta = {
     id: string;
-    name: string;
-    wechatNo: string;
-    nickName: string;
     email: string;
     normalizedEmail: string;
     emailConfirmed: boolean;
     phoneNumber: string;
     phoneNumberConfirmed: string;
-    userName: string;
-    normalizedUserName: string;
     avatar: string;
     roles: any[];
     passwordHash: string;
@@ -50,7 +40,7 @@ export type MsMember = {
     securityStamp: string;
     isLock: number;
 };
-export declare class MsMemberForm<T extends MsMemberResult = MsMemberResult, F extends MsMember = MsMember> extends DataForm<T, F> {
+export declare class MsAccountForm<T extends MsAccountFormResult = MsAccountFormResult, F extends MsAccountFormMeta = MsAccountFormMeta> extends DataForm<T, F> {
     static [DATA_MODEL_NAME]: string;
     constructor(options?: DataFormOptions);
     protected initialize(): Promise<void>;

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

@@ -1,12 +1,12 @@
 import { DataTable, DataTableOptions, DialogInstance } from "@maketribe/dm";
-import { MsMember, MsMemberForm, MsMemberResult } from "./MsMemberForm";
+import { MsAccountFormMeta, MsAccountForm, MsAccountFormResult } from "./MsAccountForm.ts";
 import { DATA_MODEL_NAME } from "../../constants";
-export type MsMemberTableItem = Omit<MsMember, "passwordHash"> & {
+export type MsMemberTableItem = Omit<MsAccountFormMeta, "passwordHash"> & {
     type: number;
 };
-export declare class MsMemberTable extends DataTable<MsMemberResult, MsMemberTableItem> {
+export declare class MsAccountTable extends DataTable<MsAccountFormResult, MsMemberTableItem> {
     static [DATA_MODEL_NAME]: string;
-    activeMemberForm: MsMemberForm;
+    activeAccountForm: MsAccountForm;
     activeDialog: DialogInstance | null;
     constructor(options?: DataTableOptions);
     /**
@@ -23,5 +23,9 @@ export declare class MsMemberTable extends DataTable<MsMemberResult, MsMemberTab
      * 申请成员
      */
     approveMember(): Promise<void>;
-    formatItem(item: MsMemberResult): MsMemberTableItem;
+    /**
+     * 表单列处理
+     * @param item
+     */
+    formatItem(item: MsAccountFormResult): MsMemberTableItem;
 }

package/dist/types/dataviews/ms-account/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./MsAccountForm.ts";
+export * from "./MsAccountTable.tsx";

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

@@ -1,18 +1,22 @@
 import { DataFormOptions, DataTable } from "@maketribe/dm";
 import { DATA_MODEL_NAME } from "../../constants";
-import { MsMember, MsMemberTable } from "../ms-member";
+import { MsAccountFormMeta, MsAccountTable } from "../ms-account";
 import { MsRole } from "../ms-role";
 export type MsMemberRole = {
     id: string;
     memberId: string;
     roleId: string;
-    member: Omit<MsMember, "roles">;
+    member: Omit<MsAccountFormMeta, "roles">;
 };
-export declare class MsMemberRoleTable extends DataTable<MsMemberRole> {
+export declare class MsAccountMemberRoleTable extends DataTable<MsMemberRole> {
     static [DATA_MODEL_NAME]: string;
-    memberTable: MsMemberTable;
+    memberTable: MsAccountTable;
     currentRole: MsRole | null;
     constructor(options?: DataFormOptions);
+    /**
+     * 设置当前角色
+     * @param role
+     */
     setCurrentRole(role: MsRole | null): void;
     protected initialize(): Promise<void>;
 }

package/dist/types/dataviews/ms-account-role/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./MsAccountMemberRoleTable.tsx";
+export * from "./MsMemberRoleForm";

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

@@ -10,7 +10,7 @@ export type MsMenuResult = MenuData & {
 export type MsMenuItem = {
     id: string;
     title: string;
-    iconName: string;
+    icon: string;
     pid: string;
     routeId: string;
     sort: string;

package/dist/types/dataviews/{MsMenu → ms-menu}/MsRoute/MsRouteForm.d.ts

@@ -7,7 +7,7 @@ export type MsRouteResult = {
     title: string;
     type: number;
     menuId: string;
-    iconName: string;
+    icon: string;
     route?: string;
     memo?: string;
 };

package/dist/types/dataviews/ms-role/MsRolePermissionConfigTable.d.ts

@@ -1,6 +1,6 @@
 import { R, ResponseConfig } from "@maketribe/request";
 import { DataTableOptions } from "@maketribe/dm";
-import { MsMenuItem, MsMenuResult, MsMenuTable, MsPermissionPointDefine, MsPermissionPointDefineTable, MsRoute, MsRouteTable } from "../MsMenu";
+import { MsMenuItem, MsMenuResult, MsMenuTable, MsPermissionPointDefine, MsPermissionPointDefineTable, MsRoute, MsRouteTable } from "../ms-menu";
 import { MsRole } from "./MsRoleForm";
 import { MsRoleRouteTable } from "./ms-role-route";
 import { MsRolePermissionPointTable } from "./ms-role-permission-point";

package/dist/types/layouts/store/index.d.ts

@@ -1,2 +1,4 @@
+import useSettingsStore from "./modules/settings.ts";
 declare const pinia: import("pinia").Pinia;
+export { useSettingsStore };
 export default pinia;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maketribe/ms-app",
-  "version": "4.0.9",
+  "version": "5.0.1",
   "description": "",
   "main": "dist/cjs",
   "module": "dist/esm",
@@ -43,7 +43,7 @@
     "@microsoft/signalr": "^8.0.7",
     "@vueuse/core": "^10.11.0",
     "@element-plus/icons-vue": "^2.1.0",
-    "element-plus": "2.8.5",
+    "element-plus": "2.13.0",
     "floating-vue": "^5.2.2",
     "hotkeys-js": "^3.13.7",
     "lexical": "~0.17.0",
@@ -62,9 +62,9 @@
     "vue-codemirror": "^6.1.1",
     "vue-cropper": "^1.1.4",
     "vue-router": "^4.2.4",
-    "@maketribe/request": "^4.0.2",
-    "@maketribe/locale": "^4.0.2",
-    "@maketribe/dm": "^4.0.5",
+    "@maketribe/locale": "^4.0.3",
+    "@maketribe/dm": "^5.0.0",
+    "@maketribe/request": "^4.0.3",
     "@maketribe/utils": "^4.0.2"
   },
   "devDependencies": {