@maketribe/ms-app 4.0.9 → 5.0.1

package/dist/cjs/{index-BUCV8-xD.cjs → index-C9ykzsLb.cjs}

@@ -26,6 +26,7 @@ const list = require("@lexical/list");
 const table = require("@lexical/table");
 const dragon = require("@lexical/dragon");
 const plainText = require("@lexical/plain-text");
+const Sortable = require("sortablejs");
 const hotkeys = require("hotkeys-js");
 const mitt = require("mitt");
 const core = require("@vueuse/core");
@@ -39,7 +40,6 @@ const FloatingVue = require("floating-vue");
 require("floating-vue/dist/style.css");
 require("overlayscrollbars/overlayscrollbars.css");
 const ufo = require("ufo");
-const Sortable = require("sortablejs");
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
   if (e) {
@@ -165,84 +165,84 @@ class DataTableComponents extends dm.Components {
       name: "MKColumnAction",
       title: "操作",
       component: vue.defineAsyncComponent(
-        async () => Promise.resolve().then(() => require("./index-DdcsqstF.cjs"))
+        async () => Promise.resolve().then(() => require("./index-orkkC3Zz.cjs"))
       )
     });
     this.registerComponent({
       name: "MKColumnText",
       title: "文本",
       component: vue.defineAsyncComponent(
-        async () => Promise.resolve().then(() => require("./index-D7f3Rl6k.cjs"))
+        async () => Promise.resolve().then(() => require("./index-D3wyludi.cjs"))
       )
     });
     this.registerComponent({
       name: "MKColumnObjectMappingText",
       title: "对象映射文本",
       component: vue.defineAsyncComponent(
-        async () => Promise.resolve().then(() => require("./index-DAFPSj10.cjs"))
+        async () => Promise.resolve().then(() => require("./index-Bg96pnlX.cjs"))
       )
     });
     this.registerComponent({
       name: "MKColumnImage",
       title: "图片",
       component: vue.defineAsyncComponent(
-        async () => Promise.resolve().then(() => require("./index-Dsq6ODhZ.cjs"))
+        async () => Promise.resolve().then(() => require("./index-BVO_Svse.cjs"))
       )
     });
     this.registerComponent({
       name: "MKColumnSelect",
       title: "行选择",
       component: vue.defineAsyncComponent(
-        async () => Promise.resolve().then(() => require("./index-DU1N0l6j.cjs"))
+        async () => Promise.resolve().then(() => require("./index-BWqbZDTR.cjs"))
       )
     });
     this.registerComponent({
       name: "MKColumnJson",
       title: "JSON",
       component: vue.defineAsyncComponent(
-        async () => Promise.resolve().then(() => require("./index-CrMSJRSa.cjs"))
+        async () => Promise.resolve().then(() => require("./index-B8ergi4x.cjs"))
       )
     });
     this.registerComponent({
       name: "MKColumnDate",
       title: "日期时间",
       component: vue.defineAsyncComponent(
-        async () => Promise.resolve().then(() => require("./index-B6GntGqH.cjs"))
+        async () => Promise.resolve().then(() => require("./index-BaHTiCie.cjs"))
       )
     });
     this.registerComponent({
       name: "MKColumnSwitch",
       title: "开关",
       component: vue.defineAsyncComponent(
-        async () => Promise.resolve().then(() => require("./index-CpROwYqz.cjs"))
+        async () => Promise.resolve().then(() => require("./index-BvX51GcU.cjs"))
       )
     });
     this.registerComponent({
       name: "MKColumnTag",
       title: "标签",
       component: vue.defineAsyncComponent(
-        async () => Promise.resolve().then(() => require("./index-DwvlZC6R.cjs"))
+        async () => Promise.resolve().then(() => require("./index-BRgtQh4g.cjs"))
       )
     });
     this.registerComponent({
       name: "MKColumnLink",
       title: "链接",
       component: vue.defineAsyncComponent(
-        async () => Promise.resolve().then(() => require("./index-CgnYqmo9.cjs"))
+        async () => Promise.resolve().then(() => require("./index-DkJRuTYb.cjs"))
       )
     });
     this.registerComponent({
       name: "MKColumnSort",
       title: "拖拽排序",
       component: vue.defineAsyncComponent(
-        async () => Promise.resolve().then(() => require("./index-Cz456tw_.cjs"))
+        async () => Promise.resolve().then(() => require("./index-Bt6LrO0Y.cjs"))
       )
     });
     this.registerComponent({
       name: "MKColumnIcon",
       title: "图标",
       component: vue.defineAsyncComponent(
-        async () => Promise.resolve().then(() => require("./index-C3g5CFYi.cjs"))
+        async () => Promise.resolve().then(() => require("./index-BxpMDoeo.cjs"))
       )
     });
   }
@@ -268,14 +268,14 @@ class DataTableHeaderComponents extends dm.Components {
       name: "MKBatchOpt",
       title: "批量操作",
       component: vue.defineAsyncComponent(
-        async () => Promise.resolve().then(() => require("./index-i7_EofWw.cjs"))
+        async () => Promise.resolve().then(() => require("./index-CA0Aljjt.cjs"))
       )
     });
     this.registerComponent({
       name: "MKTableFilter",
       title: "筛选",
       component: vue.defineAsyncComponent(
-        async () => Promise.resolve().then(() => require("./index-C_-dvvOO.cjs"))
+        async () => Promise.resolve().then(() => require("./index-BSnxRKZN.cjs"))
       )
     });
   }
@@ -353,7 +353,7 @@ class DataFormComponents extends dm.Components {
       name: "MKFormDetail",
       title: "明细",
       component: vue.defineAsyncComponent(
-        () => Promise.resolve().then(() => require("./index-B4ZWoHMl.cjs"))
+        () => Promise.resolve().then(() => require("./index-Ff9KIH5J.cjs"))
       )
     });
     this.registerComponent({
@@ -374,14 +374,14 @@ class DataFormComponents extends dm.Components {
       name: "MKDataTreeSelect",
       title: "树选择器",
       component: vue.defineAsyncComponent(
-        () => Promise.resolve().then(() => require("./index-BCw3a06g.cjs"))
+        () => Promise.resolve().then(() => require("./index-BQ98NiKE.cjs"))
       )
     });
     this.registerComponent({
       name: "MKResourceSelectInput",
       title: "资源选择输入框",
       component: vue.defineAsyncComponent(
-        () => Promise.resolve().then(() => require("./ResourceSelectInput-CwlmTqbd.cjs"))
+        () => Promise.resolve().then(() => require("./ResourceSelectInput-BCBtfd8f.cjs"))
       )
     });
     this.registerComponent({
@@ -417,7 +417,7 @@ class DataFilterComponents extends dm.Components {
       title: "下拉框",
       defaultOperator: dm.Operator.IN,
       component: vue.defineAsyncComponent(
-        () => Promise.resolve().then(() => require("./index-BbTdkhEQ.cjs"))
+        () => Promise.resolve().then(() => require("./index-CRx3vrt5.cjs"))
       )
     });
     this.registerComponent({
@@ -425,7 +425,7 @@ class DataFilterComponents extends dm.Components {
       title: "树形下拉框",
       defaultOperator: dm.Operator.IN,
       component: vue.defineAsyncComponent(
-        () => Promise.resolve().then(() => require("./index-BCw3a06g.cjs"))
+        () => Promise.resolve().then(() => require("./index-BQ98NiKE.cjs"))
       )
     });
     this.registerComponent({
@@ -465,7 +465,7 @@ class ConfigComponents extends dm.Components {
 }
 class MenuNode {
   id;
-  iconName;
+  icon;
   title;
   permissionPoints;
   route;
@@ -476,11 +476,11 @@ class MenuNode {
   children;
   parent;
   constructor(options) {
-    const { id, children, route, routes, iconName, title, path: path2, permissionPoints, urlType, type } = options;
+    const { id, children, route, routes, icon, title, path: path2, permissionPoints, urlType, type } = options;
     this.id = id;
     this.route = route ?? null;
     this.routes = routes;
-    this.iconName = iconName;
+    this.icon = icon;
     this.type = type;
     this.title = title;
     this.path = path2;
@@ -520,14 +520,14 @@ class Menu extends utils.Disposable {
     }).map((menuInfo) => {
       const route = this.router.getRouteByID(menuInfo.routeId);
       const routes = this.router.getRoutesByMenuID(menuInfo.id);
-      const permissionPoints = this.permissionPointManager.getPermissionPointsByMenuID(menuInfo.id);
+      const permissionPoints = this.permissionPointManager.getPermissionsByMenuId(menuInfo.id);
       return new MenuNode({
         id: menuInfo.id,
         route,
         routes,
         urlType: menuInfo.urlType,
         type: menuInfo.type.toString(),
-        iconName: menuInfo.iconName || "",
+        icon: menuInfo.icon || "",
         title: menuInfo.title || "",
         path: menuInfo.url,
         permissionPoints,
@@ -538,12 +538,12 @@ class Menu extends utils.Disposable {
     for (let i = 0, len = menuNodes.length; i < len; i++) {
       const menuNodeInfo = menus[i];
       const menuNode = menuNodes[i];
-      menuNode.iconName = menuNode.iconName || "default-menu";
+      menuNode.icon = menuNode.icon || "default-menu";
       if (!menuNodeInfo.pid) {
         rootMenuNodes.push(menuNode);
       }
       for (const route of this.router.getRoutesByMenuID(menuNode.id)) {
-        route.iconName = route.iconName || menuNode.iconName;
+        route.icon = route.icon || menuNode.icon;
       }
       for (let j = 0; j < len; j++) {
         const menuNodeInfoInner = menus[j];
@@ -785,27 +785,31 @@ class DataModelDefines {
     this._dataTreeDefines.set(name, dataTreeDefine);
   }
 }
-class UserInfo {
+var AccountIdentityEnum = /* @__PURE__ */ ((AccountIdentityEnum2) => {
+  AccountIdentityEnum2[AccountIdentityEnum2["NORMAL"] = 1] = "NORMAL";
+  AccountIdentityEnum2[AccountIdentityEnum2["DEVELOPER"] = 2] = "DEVELOPER";
+  AccountIdentityEnum2[AccountIdentityEnum2["OWNER"] = 3] = "OWNER";
+  return AccountIdentityEnum2;
+})(AccountIdentityEnum || {});
+class LoginAccountMeta {
   id;
   account;
   email;
-  nickName;
   avatar;
   isLocked;
-  isSuper;
+  identity;
   payload;
   roles;
   permissionPoints;
-  constructor(msAppClient, payload, roles, permissionPoints) {
+  constructor(msAppClient, payload, roles, permissions) {
     this.id = payload.id;
     this.avatar = payload.avatar;
     this.account = payload.account;
     this.email = payload.email;
-    this.nickName = payload.nickName;
     this.isLocked = payload.isLock === 1;
-    this.isSuper = payload.isSuper === 1;
+    this.identity = payload.identity;
     this.roles = roles;
-    this.permissionPoints = permissionPoints;
+    this.permissionPoints = permissions;
     try {
       this.avatar = payload.avatar ? payload.avatar.startsWith("http") ? payload.avatar : new URL(payload.avatar, msAppClient.origin).toString() : "";
     } catch (e) {
@@ -813,10 +817,18 @@ class UserInfo {
     }
     this.payload = payload;
   }
+  /**
+   * 是否有角色
+   * @param name
+   */
   hasRole(name) {
     return !!this.roles.find((role) => role.name === name);
   }
-  hasPermissionPoint(key) {
+  /**
+   * 是否有权限
+   * @param key
+   */
+  hasPermission(key) {
     return !!this.permissionPoints.find(
       (permissionPoint) => permissionPoint.key === key
     );
@@ -844,7 +856,7 @@ class Router extends utils.Disposable {
       if (match) {
         const name = match[1];
         const action = match[2];
-        const meta = { name, title: defaultPageRoute.title, icon: defaultPageRoute.iconName };
+        const meta = { name, title: defaultPageRoute.title, icon: defaultPageRoute.icon };
         switch (action) {
           case "single":
             const [listType, type] = match[3].slice(1).split("/");
@@ -855,7 +867,7 @@ class Router extends utils.Disposable {
                     vueRouter2.addRoute("mk-ms-layout", {
                       name: defaultPageRoute.name,
                       path: defaultPageRoute.route || `/dv/${name}`,
-                      component: () => Promise.resolve().then(() => require("./normal-dqsyELbO.cjs")),
+                      component: () => Promise.resolve().then(() => require("./normal-B2hKQ9VX.cjs")),
                       meta
                     });
                     break;
@@ -863,7 +875,7 @@ class Router extends utils.Disposable {
                     vueRouter2.addRoute("mk-ms-layout", {
                       name: defaultPageRoute.name,
                       path: defaultPageRoute.route || `/dv/${name}`,
-                      component: () => Promise.resolve().then(() => require("./dialog-DMcs6fRc.cjs")),
+                      component: () => Promise.resolve().then(() => require("./dialog-DbD51Z-b.cjs")),
                       meta
                     });
                     break;
@@ -875,7 +887,7 @@ class Router extends utils.Disposable {
                     vueRouter2.addRoute("mk-ms-layout", {
                       name: defaultPageRoute.name,
                       path: defaultPageRoute.route || `/dv/${name}`,
-                      component: () => Promise.resolve().then(() => require("./dialog-DNfS8tGa.cjs")),
+                      component: () => Promise.resolve().then(() => require("./dialog-DomloCVd.cjs")),
                       meta
                     });
                     break;
@@ -887,7 +899,7 @@ class Router extends utils.Disposable {
                     vueRouter2.addRoute("mk-ms-layout", {
                       name: defaultPageRoute.name,
                       path: defaultPageRoute.route || `/dv/${name}`,
-                      component: () => Promise.resolve().then(() => require("./dialog-Cvm2-doC.cjs")),
+                      component: () => Promise.resolve().then(() => require("./dialog-Bws-7xvl.cjs")),
                       meta
                     });
                     break;
@@ -895,7 +907,7 @@ class Router extends utils.Disposable {
                     vueRouter2.addRoute("mk-ms-layout", {
                       name: defaultPageRoute.name,
                       path: defaultPageRoute.route || `/dv/${name}`,
-                      component: () => Promise.resolve().then(() => require("./normal-BwrvpsP7.cjs")),
+                      component: () => Promise.resolve().then(() => require("./normal-kYNC1vlA.cjs")),
                       meta
                     });
                 }
@@ -905,7 +917,7 @@ class Router extends utils.Disposable {
             vueRouter2.addRoute("mk-ms-layout", {
               name: defaultPageRoute.name,
               path: defaultPageRoute.route || `/dv/${name}`,
-              component: () => Promise.resolve().then(() => require("./table-DwtI3Z1Y.cjs")),
+              component: () => Promise.resolve().then(() => require("./table-DRs-B0jQ.cjs")),
               meta
             });
             break;
@@ -913,7 +925,7 @@ class Router extends utils.Disposable {
             vueRouter2.addRoute("mk-ms-layout", {
               name: defaultPageRoute.name,
               path: defaultPageRoute.route || `/dv/${name}/edit/:id?`,
-              component: () => Promise.resolve().then(() => require("./edit-DJ4DPrce.cjs")),
+              component: () => Promise.resolve().then(() => require("./edit-BP8hWYwF.cjs")),
               meta
             });
             break;
@@ -938,18 +950,29 @@ class Router extends utils.Disposable {
     return this.routes.filter((route) => route.menuId === menuId);
   }
 }
-class PermissionPointManager {
-  permissionPoints;
+class PermissionManager {
+  permissions;
   constructor() {
-    this.permissionPoints = [];
+    this.permissions = [];
   }
-  setPermissionPoints(permissionPoints) {
-    this.permissionPoints = permissionPoints;
+  /**
+   * 设置权限
+   * @param permissions
+   */
+  setPermissions(permissions) {
+    this.permissions = permissions;
   }
+  /**
+   * 初始化
+   */
   init() {
   }
-  getPermissionPointsByMenuID(menuID) {
-    return this.permissionPoints.filter(
+  /**
+   * 根据菜单获取权限定义
+   * @param menuID
+   */
+  getPermissionsByMenuId(menuID) {
+    return this.permissions.filter(
       (permissionPoint) => permissionPoint.menuId === menuID
     );
   }
@@ -976,7 +999,7 @@ class UserSession extends utils.Disposable {
     this.userInfo = null;
     this.router = this.register(new Router(this));
     this.tabs = this.register(new Tabs(this));
-    this.permissionPointManager = new PermissionPointManager();
+    this.permissionPointManager = new PermissionManager();
     this.menu = this.register(
       new Menu(this.permissionPointManager, this.router)
     );
@@ -1022,14 +1045,14 @@ class UserSession extends utils.Disposable {
       }
       const BasicInfoResult = response.data;
       const { member, routes, menus, permissionPoints, roles } = BasicInfoResult.data;
-      this.userInfo = new UserInfo(
+      this.userInfo = new LoginAccountMeta(
         msAppClient,
         member,
         roles,
         permissionPoints
       );
       this.router.setRoutes(routes);
-      this.permissionPointManager.setPermissionPoints(permissionPoints);
+      this.permissionPointManager.setPermissions(permissionPoints);
       this.menu.setMenus(menus);
       this.tabs.init();
       this.beforeInitRouterEvent.emit();
@@ -1192,25 +1215,19 @@ const useComponentWithDefault = (componentInfo, defaultComponentInfo) => {
   };
 };
 const useRenderInfoComponent = (column, components2) => {
-  const columnComponentInfo = vue.computed(
-    () => vue.unref(column)?.componentInfo || ""
-  );
+  const columnComponentInfo = vue.computed(() => vue.unref(column)?.componentInfo || "");
   const componentInfo = vue.ref(null);
-  vue.watch(
-    columnComponentInfo,
-    (columnComponentInfo2) => {
-      if (typeof columnComponentInfo2 === "string") {
-        const { componentInfo: _componentInfo } = useComponent(
-          columnComponentInfo2,
-          components2
-        );
-        componentInfo.value = vue.unref(_componentInfo);
-        return;
-      }
-      componentInfo.value = columnComponentInfo2;
-    },
-    { immediate: true }
-  );
+  vue.watch(columnComponentInfo, (columnComponentInfo2) => {
+    if (typeof columnComponentInfo2 === "string") {
+      const { componentInfo: _componentInfo } = useComponent(
+        columnComponentInfo2,
+        components2
+      );
+      componentInfo.value = vue.unref(_componentInfo);
+      return;
+    }
+    componentInfo.value = columnComponentInfo2;
+  }, { immediate: true });
   const component = vue.computed(() => vue.unref(componentInfo)?.component ?? null);
   const componentProps = vue.computed(() => {
     const _componentInfo = vue.unref(componentInfo);
@@ -1434,7 +1451,7 @@ const globalSettingsDefault = {
     fullPath: "/"
   },
   layout: {
-    enableMobileAdaptation: false
+    enableMobileAdaptation: true
   },
   menu: {
     baseOn: "frontend",
@@ -1545,9 +1562,7 @@ const useSettingsStore = pinia$1.defineStore(
       (val) => {
         document.body.setAttribute("data-menu-mode", val);
       },
-      {
-        immediate: true
-      }
+      { immediate: true }
     );
     const os = vue.ref("other");
     const agent = navigator.userAgent.toLowerCase();
@@ -1649,7 +1664,7 @@ const useMenuStore = pinia$1.defineStore(
         const menuItem = {
           meta: {
             title: menuNode.title,
-            icon: menuNode.iconName,
+            icon: menuNode.icon,
             auth: "",
             type: menuNode.type
           },
@@ -1671,7 +1686,7 @@ const useMenuStore = pinia$1.defineStore(
           routes: menuNode.routes?.map((item) => item.name) ?? [],
           meta: {
             title: menuNode.title,
-            icon: menuNode.iconName,
+            icon: menuNode.icon,
             defaultOpened: false,
             auth: "",
             menu: true,
@@ -1832,7 +1847,7 @@ class PageManager {
     this.addNormalPage({
       name: "mk-ms-layout",
       path: "/",
-      component: () => Promise.resolve().then(() => require("./index-XCAqvZkT.cjs"))
+      component: () => Promise.resolve().then(() => require("./index-B2_kGhuM.cjs"))
     });
     this.addNormalPage({
       name: "login",
@@ -1840,7 +1855,7 @@ class PageManager {
       meta: {
         isAuthorization: false
       },
-      component: () => Promise.resolve().then(() => require("./index-BI4quwn5.cjs"))
+      component: () => Promise.resolve().then(() => require("./index-DI4Pl_k2.cjs"))
     });
     this.addNormalPage({
       name: "signup",
@@ -1848,7 +1863,7 @@ class PageManager {
       meta: {
         isAuthorization: false
       },
-      component: () => Promise.resolve().then(() => require("./index-q1_p8QOz.cjs"))
+      component: () => Promise.resolve().then(() => require("./index-BEN_IfEA.cjs"))
     });
     this.afterInitdEvent.emit();
     this.msAppClientChangeEvent.on(({ msAppClient }) => {
@@ -1891,7 +1906,7 @@ class PageManager {
               if (!vueRoute) {
                 extendsPage.path = routeInfo.route || extendsPage.path;
                 addedExtendsPageNames.push(extendsPage.name);
-                extendsPage.meta = Object.assign({ title: routeInfo.title, icon: routeInfo.iconName }, extendsPage.meta);
+                extendsPage.meta = Object.assign({ title: routeInfo.title, icon: routeInfo.icon }, extendsPage.meta);
                 vueRouter2.addRoute("mk-ms-layout", extendsPage);
               }
             }
@@ -1899,7 +1914,7 @@ class PageManager {
               this.addExtendsPage({
                 name: "notFound",
                 path: "/:pathMatch(.*)*",
-                component: () => Promise.resolve().then(() => require("./404-BPEClOTg.cjs"))
+                component: () => Promise.resolve().then(() => require("./404-DbH2VtUJ.cjs"))
               });
             }
             userSession.register(
@@ -2226,7 +2241,10 @@ class MsConfigTable extends dm.DataTable {
       new dm.AddButton(),
       new dm.TableHeaderItem({
         componentInfo: "MKBatchOpt",
-        predicate: () => MSAppClient.instance?.userSession?.userInfo?.isSuper ?? false
+        predicate: () => {
+          let identity = MSAppClient.instance?.userSession?.userInfo?.identity;
+          return identity == AccountIdentityEnum.DEVELOPER || identity == AccountIdentityEnum.OWNER;
+        }
       })
     ];
     this.dataFilter.setColumns([
@@ -2605,7 +2623,10 @@ class MsRoleTable extends dm.DataTable {
       new dm.AddButton(),
       new dm.TableHeaderItem({
         componentInfo: "MKBatchOpt",
-        predicate: () => MSAppClient.instance?.userSession?.userInfo?.isSuper ?? false
+        predicate: () => {
+          let identity = MSAppClient.instance?.userSession?.userInfo?.identity;
+          return identity == AccountIdentityEnum.DEVELOPER || identity == AccountIdentityEnum.OWNER;
+        }
       })
     ];
     this.dataFilter.setColumns([
@@ -2707,7 +2728,10 @@ class MsMenuTable extends dm.DataTable {
       new dm.AddButton(),
       new dm.TableHeaderItem({
         componentInfo: "MKBatchOpt",
-        predicate: () => MSAppClient.instance?.userSession?.userInfo?.isSuper ?? false
+        predicate: () => {
+          let identity = MSAppClient.instance?.userSession?.userInfo?.identity;
+          return identity == AccountIdentityEnum.DEVELOPER || identity == AccountIdentityEnum.OWNER;
+        }
       })
     ];
     this.setColumns([
@@ -2721,7 +2745,7 @@ class MsMenuTable extends dm.DataTable {
     return {
       id: item.id,
       title: item.title || "",
-      iconName: item.iconName || "",
+      icon: item.icon || "",
       pid: item.pid || "",
       routeId: item.routeId
     };
@@ -2930,7 +2954,7 @@ class MsRouteForm extends dm.DataForm {
         }
       }),
       new dm.FormColumn({
-        name: "iconName",
+        name: "icon",
         label: "图标",
         componentInfo: "MKFormIconSelect"
       }),
@@ -2946,7 +2970,7 @@ class MsRouteForm extends dm.DataForm {
     Number.parseInt(data.type);
     return {
       ...data,
-      iconName: data.iconName || null
+      icon: data.icon || null
     };
   }
   formatItem(item) {
@@ -2955,7 +2979,7 @@ class MsRouteForm extends dm.DataForm {
       name: item.name || "",
       title: item.title || "",
       menuId: item.menuId,
-      iconName: item.iconName || "",
+      icon: item.icon || "",
       route: item.route || "",
       memo: item.memo || ""
     };
@@ -3005,7 +3029,7 @@ class MsRouteTable extends dm.DataTable {
       name: item.name || "",
       title: item.title || "",
       menuId: item.menuId,
-      iconName: item.iconName || "",
+      icon: item.icon || "",
       route: item.route || "",
       memo: item.memo || ""
     };
@@ -3038,7 +3062,7 @@ class MsRouteTable extends dm.DataTable {
   // }
 }
 class MsPermissionPointDefineForm extends dm.DataForm {
-  static [DATA_MODEL_NAME] = "ms-permission-point-def";
+  static [DATA_MODEL_NAME] = "permission-point-def";
   constructor(options = {}) {
     super({
       name: MsPermissionPointDefineForm[DATA_MODEL_NAME],
@@ -3072,7 +3096,7 @@ class MsPermissionPointDefineForm extends dm.DataForm {
   }
 }
 class MsPermissionPointDefineTable extends dm.DataTable {
-  static [DATA_MODEL_NAME] = "ms-permission-point-def";
+  static [DATA_MODEL_NAME] = "permission-point-def";
   constructor(options = {}) {
     super({
       name: MsPermissionPointDefineTable[DATA_MODEL_NAME],
@@ -3720,7 +3744,7 @@ const index$5 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePrope
   default: MKCodeEditor
 }, Symbol.toStringTag, { value: "Module" }));
 const MKJsonEditor = utils.withInstall(
-  vue.defineAsyncComponent(() => Promise.resolve().then(() => require("./Editor-r0C51uF9.cjs")))
+  vue.defineAsyncComponent(() => Promise.resolve().then(() => require("./Editor-HmV0CISz.cjs")))
 );
 const index$4 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
@@ -3757,9 +3781,7 @@ const FormDatePicker = /* @__PURE__ */ vue.defineComponent({
   }) {
     const modelValue = vue.computed({
       get: () => props.modelValue,
-      set: (v) => {
-        emit("update:model-value", v);
-      }
+      set: (v) => emit("update:model-value", v)
     });
     const disabled = vue.computed(() => props.disabled);
     const type = vue.computed(() => datePickerTypes.includes(props.type) ? props.type : "date");
@@ -6440,7 +6462,8 @@ const formViewProps = utils.buildProps({
   labelWidth: { type: String },
   labelPosition: { type: String },
   dataForm: { type: dm.DataForm, required: true },
-  mode: { type: String, default: "form" }
+  mode: { type: String, default: "form" },
+  formStyles: { type: [Object, String], default: "max-width:700px" }
 });
 const _hoisted_1$B = { class: "flex flex-col h-[100%]" };
 const _hoisted_2$t = { class: "flex items-center" };
@@ -6455,10 +6478,11 @@ const _sfc_main$P = /* @__PURE__ */ vue.defineComponent({
     iconName: { type: String, default: "" }
   },
   setup(__props) {
-    const route = vueRouter.useRoute();
     const props = __props;
+    const route = vueRouter.useRoute();
     const title = vue.computed(() => props.title || route.meta.title);
     const iconName = vue.computed(() => props.iconName || route.meta.icon);
+    const settingsStore = vue.inject("settingsStore");
     return (_ctx, _cache) => {
       const _component_el_page_header = vue.resolveComponent("el-page-header");
       const _directive_loading = vue.resolveDirective("loading");
@@ -6473,11 +6497,17 @@ const _sfc_main$P = /* @__PURE__ */ vue.defineComponent({
                 vue.renderSlot(_ctx.$slots, "back"),
                 vue.renderSlot(_ctx.$slots, "title", {}, () => [
                   vue.createElementVNode("h3", _hoisted_3$k, [
-                    vue.unref(iconName) ? (vue.openBlock(), vue.createBlock(vue.unref(MKSvgIcon), {
+                    vue.unref(settingsStore).mode === "pc" && vue.unref(iconName) ? (vue.openBlock(), vue.createBlock(vue.unref(MKSvgIcon), {
                       key: 0,
                       name: vue.unref(iconName),
                       class: "mr-2"
-                    }, null, 8, ["name"])) : vue.createCommentVNode("", true),
+                    }, null, 8, ["name"])) : vue.unref(settingsStore).mode === "mobile" ? (vue.openBlock(), vue.createBlock(vue.unref(MKSvgIcon), {
+                      key: 1,
+                      size: 20,
+                      onClick: _cache[0] || (_cache[0] = ($event) => vue.unref(settingsStore).toggleSidebarCollapse()),
+                      name: "ep:grid",
+                      class: "mr-2"
+                    })) : vue.createCommentVNode("", true),
                     vue.createTextVNode(" " + vue.toDisplayString(vue.unref(title)), 1)
                   ])
                 ])
@@ -6525,9 +6555,6 @@ const FormView = /* @__PURE__ */ vue.defineComponent({
     const dataForm = vue.computed(() => props.dataForm ?? dataFormContext.dataForm);
     const isUpdateForm = vue.computed(() => vue.unref(dataForm).getDataFormType() == dm.DataFormType.UPDATE);
     const isChange = vue.computed(() => vue.unref(dataForm).isChanged);
-    const pageFormStyle = vue.computed(() => {
-      return "max-width:700px";
-    });
     const route = vueRouter.useRoute();
     const handleSave = async () => {
       await vue.unref(dataForm)?.simpleSubmit();
@@ -6547,13 +6574,13 @@ const FormView = /* @__PURE__ */ vue.defineComponent({
       });
       return props.mode === "page" ? vue.createVNode(MKPagePanel, null, {
         default: () => [vue.createVNode("div", {
-          "class": "w-full h-full bg-[rgb(242,242,242)] p-2"
+          "class": "w-full h-full p-2 bg-[var(--g-bg)]"
         }, [vue.createVNode(elementPlus.ElScrollbar, {
           "class": "w-full h-full"
         }, {
           default: () => [vue.createVNode(MKForm, {
             "class": "p-6 m-[auto] bg-white",
-            "style": vue.unref(pageFormStyle),
+            "style": vue.unref(props.formStyles),
             "labelPosition": props.labelPosition,
             "rules": props.rules,
             "labelWidth": props.labelWidth,
@@ -6585,7 +6612,7 @@ const FormView = /* @__PURE__ */ vue.defineComponent({
               }, [route.meta.title])]);
             },
             extra: () => {
-              return vue.createVNode(vue.Fragment, null, [slots["footer-button"]?.(), saveBtn]);
+              return vue.createVNode(vue.Fragment, null, [slots["heade-tools"]?.(), slots["save"]?.() ?? saveBtn]);
             }
           });
         }
@@ -6697,7 +6724,7 @@ const _sfc_main$O = /* @__PURE__ */ vue.defineComponent({
     };
   }
 });
-const DataForm = /* @__PURE__ */ _export_sfc(_sfc_main$O, [["__scopeId", "data-v-c2888c92"]]);
+const DataForm = /* @__PURE__ */ _export_sfc(_sfc_main$O, [["__scopeId", "data-v-96677cff"]]);
 const columnProps$1 = utils.buildProps({
   column: { type: dm.FormColumn, required: true }
 });
@@ -7106,57 +7133,74 @@ const TableHeader = /* @__PURE__ */ vue.defineComponent({
     slots
   }) {
     const dataTableContext = vue.inject(DATA_TABLE_CONTEXT_KEY);
+    const settingsStore = useSettingsStore();
     const dataTable = vue.computed(() => dataTableContext.dataTable);
     const tableHeader = vue.computed(() => vue.unref(dataTable)?.header);
     const leftArea = vue.computed(() => {
-      var items = vue.unref(tableHeader)?.leftArea ?? [];
+      let items = vue.unref(tableHeader)?.leftArea ?? [];
       return items.filter((item) => item.predicate());
     });
     const rightArea = vue.computed(() => {
-      var items = vue.unref(tableHeader)?.rightArea ?? [];
+      let items = vue.unref(tableHeader)?.rightArea ?? [];
       return items.filter((item) => item.predicate());
     });
     const route = vueRouter.useRoute();
     return () => {
-      const leftItems = vue.unref(leftArea).filter((item) => item.componentInfo !== "MKClassifySearch").map((item) => vue.createVNode(TableHeaderItem, {
+      const leftItems = vue.unref(leftArea).filter((item) => item.componentInfo !== "MKClassifySearch").map((item, index2) => vue.createVNode(vue.Fragment, {
+        "key": index2
+      }, [vue.createVNode(TableHeaderItem, {
         "tableHeaderItem": item
-      }, null));
-      const classifySearchItems = vue.unref(leftArea).filter((item) => item.componentInfo === "MKClassifySearch").map((item) => vue.createVNode(TableHeaderItem, {
+      }, null)]));
+      const classifySearchItems = vue.unref(leftArea).filter((item) => item.componentInfo === "MKClassifySearch").map((item, index2) => vue.createVNode(vue.Fragment, {
+        "key": index2
+      }, [vue.createVNode(TableHeaderItem, {
         "class": props.mode == "page" ? "p-4 bg-white m-2 m-b-0" : "p-1",
         "tableHeaderItem": item
-      }, null));
-      const rightItems = vue.unref(rightArea).map((item) => vue.createVNode(TableHeaderItem, {
-        "tableHeaderItem": item
-      }, null));
+      }, null)]));
+      const rightItems = vue.unref(rightArea).map((item, index2) => {
+        return vue.createVNode(vue.Fragment, {
+          "key": index2
+        }, [vue.createVNode(TableHeaderItem, {
+          "tableHeaderItem": item
+        }, null)]);
+      });
       return props.mode == "page" ? vue.createVNode(vue.Fragment, null, [vue.createVNode(vue.resolveComponent("el-page-header"), {
         "class": " bg-[#fff] p-[10px]",
         "icon": null
       }, {
         title: () => {
-          return slots["header-title"]?.() ?? vue.createVNode("h3", {
+          return vue.createVNode("h3", {
             "style": "color: var(--el-text-color-regular);",
-            "class": "m-l-2 flex items-center"
+            "class": "flex items-center"
+          }, [slots["header-back"]?.({}) ?? "", slots["header-title"]?.({}) ?? (settingsStore.mode === "pc" ? vue.createVNode("div", {
+            "class": "flex items-center"
           }, [route.meta.icon ? vue.createVNode(MKSvgIcon, {
             "name": route.meta.icon,
             "class": "mx-2"
-          }, null) : null, vue.createVNode("span", null, [route.meta.title])]);
+          }, null) : null, vue.createVNode("span", null, [route.meta.title])]) : vue.createVNode(MKSvgIcon, {
+            "size": 20,
+            "onClick": () => settingsStore.toggleSidebarCollapse(),
+            "name": "ep:grid"
+          }, null))]);
         },
         extra: () => {
-          return vue.createVNode(vue.Fragment, null, [rightItems, slots["header-tools"]?.()]);
+          return vue.createVNode(vue.Fragment, null, [slots["header-tools"]?.({}), rightItems]);
         },
         content: () => {
           return vue.createVNode("div", {
             "class": "flex items-center"
-          }, [leftItems]);
+          }, [leftItems, slots["header-left-tools"]?.({})]);
         },
         default: slots["header-main"]
       }), classifySearchItems]) : vue.createVNode("div", {
         "class": "mk-table-view__header"
       }, [vue.createVNode("div", {
-        "class": "mk-table-view__header-main"
-      }, [slots["header-title"]?.(), leftItems, classifySearchItems, slots["header-main"]?.()]), vue.createVNode("div", {
+        "class": "mk-table-view__header-main flex-col"
+      }, [vue.createVNode("div", null, [slots["header-title"]?.({}) ?? "", leftItems, slots["header-main"]?.({}) ?? ""]), classifySearchItems.length > 0 ? vue.createVNode("div", {
+        "class": "mt-2"
+      }, [vue.createTextVNode(" "), classifySearchItems, vue.createTextVNode(" ")]) : ""]), vue.createVNode("div", {
         "class": "mk-table-view__header-tools"
-      }, [rightItems, slots["header-tools"]?.()])]);
+      }, [rightItems, slots["header-tools"]?.({})])]);
     };
   }
 });
@@ -7178,12 +7222,11 @@ const TableView = /* @__PURE__ */ vue.defineComponent({
       }) || (vue.unref(pageSizes).length && !vue.unref(isTree) ? vue.createVNode(MKDataTablePagination, {
         "dataTable": vue.unref(dataTable)
       }, null) : null);
-      const renderSlots = {};
-      if (props.showHeader) {
-        renderSlots.header = () => vue.createVNode(MKTableHeader, {
+      const renderSlots = {
+        header: props.showHeader ? () => vue.createVNode(MKTableHeader, {
           "mode": props.mode
-        }, slots);
-      }
+        }, slots) : null
+      };
       return props.mode === "page" ? vue.createVNode(MKPagePanel, null, {
         default: () => [vue.createVNode("div", {
           "class": "p-4 flex flex-col w-full h-full"
@@ -7394,7 +7437,9 @@ const _sfc_main$N = /* @__PURE__ */ vue.defineComponent({
       );
       sortedColumns = [...sortedColumns, ..._columns];
       dataTable2.setColumns(sortedColumns);
-      await dataTable2.init();
+      if (!dataTable2.initd) {
+        await dataTable2.init();
+      }
       if (props.autoLoad) {
         await dataTable2.load();
       }
@@ -7419,7 +7464,7 @@ const _sfc_main$N = /* @__PURE__ */ vue.defineComponent({
     return (_ctx, _cache) => {
       const _directive_loading = vue.resolveDirective("loading");
       return vue.withDirectives((vue.openBlock(), vue.createElementBlock("div", {
-        class: vue.normalizeClass(["mk-data-table", { page: _ctx.mode == "page" }]),
+        class: vue.normalizeClass(["mk-data-table", { page: _ctx.mode === "page" }]),
         ref_key: "dataTableEl",
         ref: dataTableEl
       }, [
@@ -7427,7 +7472,16 @@ const _sfc_main$N = /* @__PURE__ */ vue.defineComponent({
           vue.createVNode(TableViewRender, {
             dataTable: dataTable.value,
             mode: _ctx.mode
-          }, null, 8, ["dataTable", "mode"])
+          }, vue.createSlots({ _: 2 }, [
+            vue.renderList(_ctx.$slots, (slot, name) => {
+              return {
+                name,
+                fn: vue.withCtx((slotProps) => [
+                  vue.renderSlot(_ctx.$slots, name, vue.normalizeProps(vue.guardReactiveProps(slotProps)), void 0, true)
+                ])
+              };
+            })
+          ]), 1032, ["dataTable", "mode"])
         ], true)
       ], 2)), [
         [_directive_loading, loading.value]
@@ -7435,7 +7489,7 @@ const _sfc_main$N = /* @__PURE__ */ vue.defineComponent({
     };
   }
 });
-const DataTable = /* @__PURE__ */ _export_sfc(_sfc_main$N, [["__scopeId", "data-v-5865c4ac"]]);
+const DataTable = /* @__PURE__ */ _export_sfc(_sfc_main$N, [["__scopeId", "data-v-ed7444c9"]]);
 const tableTreeProps = utils.buildProps({
   dataTree: {
     type: dm.DataTree
@@ -7461,7 +7515,8 @@ const TableTree = /* @__PURE__ */ vue.defineComponent({
     });
     const lazy = vue.computed(() => vue.unref(dataTree).lazy);
     const handleLoad = async (row, node, resolve) => {
-      if (!vue.unref(dataTree).lazy) {
+      console.log(lazy.value, "lazy");
+      if (!vue.unref(lazy)) {
         resolve(row.children);
         return;
       }
@@ -7489,7 +7544,7 @@ const treeProps = utils.buildProps({
   dataTree: {
     type: dm.DataTree
   },
-  currentNodeKey: { type: String, default: "" },
+  currentNodeKey: { type: [String, Number], default: "" },
   draggable: { type: Boolean, default: false },
   filterNodeMethod: { type: Function },
   defaultExpandAll: { type: Boolean, default: false },
@@ -7593,6 +7648,7 @@ const Tree = /* @__PURE__ */ vue.defineComponent({
       handleCurrentChange,
       handleNodeDrop,
       handleNodeClick,
+      dataTree,
       $slots
     } = this;
     return vue.createVNode(elementPlus.ElTree, {
@@ -7603,16 +7659,16 @@ const Tree = /* @__PURE__ */ vue.defineComponent({
       "defaultExpandAll": defaultExpandAll,
       "ref": "treeRef",
       "class": "mk-data-tree",
-      "highlight-current": true,
+      "highlightCurrent": true,
       "data": rootNodes,
       "lazy": true,
-      "current-node-key": currentNodeKey,
+      "currentNodeKey": currentNodeKey,
       "filterNodeMethod": filterNodeMethod,
-      "nodeKey": "primaryValue",
-      "expand-on-click-node": false,
+      "nodeKey": "id",
+      "expandOnClickNode": false,
       "load": handleLoad,
-      "onCurrent-change": handleCurrentChange,
-      "onNode-drop": handleNodeDrop,
+      "current-change": handleCurrentChange,
+      "node-drop": handleNodeDrop,
       "draggable": this.$props.draggable,
       "onNode-click": handleNodeClick
     }, {
@@ -7646,7 +7702,7 @@ const Tree = /* @__PURE__ */ vue.defineComponent({
           default: () => [vue.createTextVNode("删除")]
         }), $slots["node-tools-suffix"]?.(scope)]);
         return vue.createVNode("div", {
-          "class": "flex w-full py-2 justify-between"
+          "class": "flex gap-5 w-full py-2 justify-between"
         }, [vue.createVNode("div", null, [main]), vue.createVNode("div", {
           "onClick": (e) => e.stopPropagation()
         }, [tools])]);
@@ -7747,8 +7803,10 @@ const _sfc_main$M = /* @__PURE__ */ vue.defineComponent({
     dataTree: { type: dm.DataTree, required: true },
     autoLoad: { type: Boolean, default: true },
     dataItemDescFieldName: { type: String, default: "name" },
-    curSelectId: { type: String },
-    useAction: { type: Boolean, default: false }
+    curSelectId: { type: [String, Number] },
+    useSort: { type: Boolean, default: true },
+    useAction: { type: Boolean, default: false },
+    useFirstSelect: { type: Boolean, default: true }
   },
   emits: ["edit", "add", "deleteSuccessfully", "select"],
   setup(__props, { expose: __expose, emit: __emit }) {
@@ -7757,32 +7815,36 @@ const _sfc_main$M = /* @__PURE__ */ vue.defineComponent({
     const emit = __emit;
     const i18n = useI18n();
     const isDrag = vue.ref(false);
-    const selectNodeId = vue.ref(props.curSelectId);
-    vue.watch(() => props.curSelectId, () => {
-      selectNodeId.value = props.curSelectId;
-    });
     const setDefaultSelectNode = (callback) => {
       const list2 = props.dataTree.getList();
       if (list2.length > 0) {
-        if (!selectNodeId.value) {
-          selectNodeId.value = list2[0][props.dataTree.primaryKey];
-        }
         for (let i = 0; i < list2.length; i++) {
           let item = list2[i];
-          if (item[props.dataTree.primaryKey] == selectNodeId.value) {
-            callback && callback(item);
-            break;
+          if (i === 0) {
+            if (item.children?.length > 0) {
+              item.children.forEach((child) => list2.push(child));
+            } else {
+              callback && callback(item);
+              break;
+            }
           }
-          item.children?.forEach((child) => list2.push(child));
         }
       }
     };
     vue.onMounted(() => {
-      setDefaultSelectNode();
       props.dataTree.afterLoadEvent.on(() => {
-        setDefaultSelectNode((item) => emit("select", item));
+        vue.nextTick(() => {
+          if (props.useFirstSelect) {
+            setDefaultSelectNode((item) => {
+              emit("select", item);
+            });
+          }
+        });
       });
     });
+    vue.onUnmounted(() => {
+      props.dataTree.afterLoadEvent.dispose();
+    });
     const handleAddClick = (item) => {
       emit("add", item);
     };
@@ -7821,7 +7883,7 @@ const _sfc_main$M = /* @__PURE__ */ vue.defineComponent({
             }, null, 8, ["name"])) : vue.createCommentVNode("", true),
             vue.createTextVNode(" " + vue.toDisplayString(__props.title), 1)
           ]),
-          __props.useAction ? (vue.openBlock(), vue.createBlock(_component_el_switch, {
+          __props.useAction && __props.useSort ? (vue.openBlock(), vue.createBlock(_component_el_switch, {
             key: 0,
             modelValue: isDrag.value,
             "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => isDrag.value = $event),
@@ -7835,8 +7897,7 @@ const _sfc_main$M = /* @__PURE__ */ vue.defineComponent({
             default: vue.withCtx(() => [
               vue.createVNode(vue.unref(MKDataTable), {
                 autoLoad: __props.autoLoad,
-                "data-table": __props.dataTree,
-                "highlight-current": ""
+                "data-table": __props.dataTree
               }, {
                 default: vue.withCtx(() => [
                   vue.createVNode(vue.unref(MKTree), {
@@ -7846,7 +7907,7 @@ const _sfc_main$M = /* @__PURE__ */ vue.defineComponent({
                     draggable: isDrag.value,
                     ref_key: "treeRef",
                     ref: treeRef,
-                    currentNodeKey: selectNodeId.value
+                    currentNodeKey: __props.curSelectId
                   }, {
                     "node-main": vue.withCtx(({ data }) => [
                       vue.createTextVNode(vue.toDisplayString(data.data[__props.dataItemDescFieldName ?? "name"]), 1)
@@ -7914,7 +7975,7 @@ const _sfc_main$M = /* @__PURE__ */ vue.defineComponent({
     };
   }
 });
-const DataTreeList = /* @__PURE__ */ _export_sfc(_sfc_main$M, [["__scopeId", "data-v-e539e62f"]]);
+const DataTreeList = /* @__PURE__ */ _export_sfc(_sfc_main$M, [["__scopeId", "data-v-1ecef43d"]]);
 const MKDataTreeList = utils.withInstall(DataTreeList);
 const _hoisted_1$z = { class: "w-[100%] flex justify-between" };
 const _hoisted_2$r = { class: "font-size-[16px] p-l-[10px] flex flex-items-center" };
@@ -7980,7 +8041,7 @@ const _sfc_main$L = /* @__PURE__ */ Object.assign({ name: "MKDataGroupPanel" },
     };
   }
 });
-const DataGroupPanel = /* @__PURE__ */ _export_sfc(_sfc_main$L, [["__scopeId", "data-v-729243b8"]]);
+const DataGroupPanel = /* @__PURE__ */ _export_sfc(_sfc_main$L, [["__scopeId", "data-v-bdc704f5"]]);
 const MKDataGroupPanel = utils.withInstall(DataGroupPanel);
 const MaterialGroupFormPopover = /* @__PURE__ */ vue.defineComponent({
   name: "MKMaterialFormPopover",
@@ -11885,7 +11946,7 @@ const markdownEditorProps = utils.buildProps({
 const markdownEditorEmits = {
   "update:model-value": (modelValue) => true
 };
-const _MarkdownEditor = vue.defineAsyncComponent(() => Promise.resolve().then(() => require("./Editor-Dm6iVXqg.cjs")));
+const _MarkdownEditor = vue.defineAsyncComponent(() => Promise.resolve().then(() => require("./Editor-CWxWXw--.cjs")));
 const MKMarkdownEditor = utils.withInstall(_MarkdownEditor);
 const _hoisted_1$s = { class: "mk-rich-text-toolbar" };
 const _hoisted_2$n = { class: "mk-rich-text-editor__stage_warp" };
@@ -12994,7 +13055,7 @@ const UploadImageProps = utils.buildProps({
   }
 });
 const getFileNameByPath = (path2) => {
-  return path2.substring(path2.lastIndexOf("/") + 1, 0);
+  return path2;
 };
 const useUploadService = (webFileUpload) => {
   webFileUpload ??= new request.WebFileUpload();
@@ -14898,7 +14959,7 @@ const _sfc_main$r = /* @__PURE__ */ vue.defineComponent({
     return (_ctx, _cache) => {
       const _component_ElProgress = vue.resolveComponent("ElProgress");
       const _component_el_alert = vue.resolveComponent("el-alert");
-      return vue.openBlock(), vue.createElementBlock(vue.Fragment, null, [
+      return vue.openBlock(), vue.createElementBlock("div", null, [
         (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(vue.unref(viewItems), (item) => {
           return vue.openBlock(), vue.createBlock(_component_el_alert, {
             class: "mb-2! upload-file-item",
@@ -14948,11 +15009,11 @@ const _sfc_main$r = /* @__PURE__ */ vue.defineComponent({
             })
           ], true)
         ])) : vue.createCommentVNode("", true)
-      ], 64);
+      ]);
     };
   }
 });
-const UploadFile = /* @__PURE__ */ _export_sfc(_sfc_main$r, [["__scopeId", "data-v-e1c1a5b9"]]);
+const UploadFile = /* @__PURE__ */ _export_sfc(_sfc_main$r, [["__scopeId", "data-v-8040d892"]]);
 const UploadFile$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   default: UploadFile
@@ -15278,8 +15339,8 @@ class MsMenuTree extends dm.DataTree {
                   "class": "flex start gap-1! items-center"
                 }, [vue.createVNode("div", {
                   "class": "font-size-[16px]"
-                }, [!!route.iconName ? vue.createVNode(MKSvgIcon, {
-                  "name": route.iconName
+                }, [!!route.icon ? vue.createVNode(MKSvgIcon, {
+                  "name": route.icon
                 }, null) : vue.createVNode("b", {
                   "class": "font-size-[18px]"
                 }, [vue.createTextVNode("·")])]), vue.createVNode("div", null, [route.title])]), vue.createVNode(elementPlus.ElCheckbox, {
@@ -15426,7 +15487,7 @@ class MsMenuForm extends dm.DataForm {
       new dm.FormColumn({ name: "id", label: "编号" }),
       new dm.FormColumn({ name: "title", label: "菜单描述", required: true }),
       new dm.FormColumn({
-        name: "iconName",
+        name: "icon",
         label: "图标",
         componentInfo: "MKFormIconSelect",
         required: true
@@ -15526,7 +15587,7 @@ class MsMenuForm extends dm.DataForm {
       ...data,
       type: isNaN(parsedType) ? parseInt(MenuType.Menu) : parsedType,
       urlType: isNaN(parsedUrlType) ? parseInt(MenuUrlType.Inner) : parsedUrlType,
-      iconName: data.iconName || null,
+      icon: data.icon || null,
       pid: data.pid || null,
       routeId: data.routeId || null,
       permissionPoints,
@@ -15541,7 +15602,7 @@ class MsMenuForm extends dm.DataForm {
     return {
       id: item.id,
       title: item.title || "",
-      iconName: item.iconName || "",
+      icon: item.icon || "",
       pid: item.pid || "",
       routeId: item.routeId,
       type: item.type ? `${item.type}` : "1",
@@ -15576,7 +15637,7 @@ class RolePermissionConfigTable extends MsMenuTable {
         };
       }
     }({
-      interfaceURL: { list: "/ms/dv/ms-permission-point-def/allList" }
+      interfaceURL: { list: "/ms/dv/permission-point-def/allList" }
     });
     this.routeDefineTable = new MsRouteTable({ interfaceURL: { list: "/ms/dv/ms-route/allList" } });
   }
@@ -15813,66 +15874,71 @@ class RolePermissionConfigTable extends MsMenuTable {
    */
   async submitPermission() {
     this.loadingManager.startLoading();
-    const permissionPointDefines = this.permissionPointDefineTable.getList();
-    const removePermissionPointDefines = permissionPointDefines.filter(
-      (permissionPointDefine) => permissionPointDefine.originalSelected && !permissionPointDefine.selected
-    );
-    const addPermissionPointDefine = permissionPointDefines.filter(
-      (permissionPointDefine) => !permissionPointDefine.originalSelected && permissionPointDefine.selected
-    );
-    const menus = this.getList();
-    const removeRoutes = menus.filter((menu) => menu.originalSelected && !menu.selected).flatMap((menu) => menu.routes);
-    const addRoutes = menus.filter((menu) => !menu.originalSelected && menu.selected).flatMap((menu) => menu.routes);
-    if (removePermissionPointDefines.length) {
-      const rolePermissionPoints = this.rolePermissionPointTable.getList();
-      const deleteRolePermissionPointResult = await this.rolePermissionPointTable.batchDelete(
-        removePermissionPointDefines.map(
-          (permissionPointDefine) => rolePermissionPoints.find(
-            (rolePermissionPoint) => rolePermissionPoint.permissionPointDefId === permissionPointDefine.id
-          )
-        ).filter(Boolean)
+    try {
+      const permissionPointDefines = this.permissionPointDefineTable.getList();
+      const removePermissionPointDefines = permissionPointDefines.filter(
+        (permissionPointDefine) => permissionPointDefine.originalSelected && !permissionPointDefine.selected
       );
-      if (deleteRolePermissionPointResult.data.code !== 200) {
-        return deleteRolePermissionPointResult;
-      }
-    }
-    if (removeRoutes.length) {
-      const roleRoutes = this.roleRouteTable.getList();
-      const deleteRoleRouteResult = await this.roleRouteTable.batchDelete(
-        removeRoutes.map(
-          (route) => roleRoutes.find((roleRoute) => roleRoute.routeId === route.id)
-        ).filter(Boolean)
+      const addPermissionPointDefine = permissionPointDefines.filter(
+        (permissionPointDefine) => !permissionPointDefine.originalSelected && permissionPointDefine.selected
       );
-      if (deleteRoleRouteResult.data.code !== 200) {
-        return deleteRoleRouteResult;
+      const menus = this.getList();
+      const removeRoutes = menus.filter((menu) => menu.originalSelected && !menu.selected).flatMap((menu) => menu.routes);
+      const addRoutes = menus.filter((menu) => !menu.originalSelected && menu.selected).flatMap((menu) => menu.routes);
+      if (removePermissionPointDefines.length) {
+        const rolePermissionPoints = this.rolePermissionPointTable.getList();
+        const deleteRolePermissionPointResult = await this.rolePermissionPointTable.batchDelete(
+          removePermissionPointDefines.map(
+            (permissionPointDefine) => rolePermissionPoints.find(
+              (rolePermissionPoint) => rolePermissionPoint.permissionPointDefId === permissionPointDefine.id
+            )
+          ).filter(Boolean)
+        );
+        if (deleteRolePermissionPointResult.data.code !== 200) {
+          return deleteRolePermissionPointResult;
+        }
       }
-    }
-    if (addPermissionPointDefine.length) {
-      const addRolePermissionPointResult = await this.rolePermissionPointTable.batchAdd(
-        addPermissionPointDefine.map((item) => ({
-          id: "",
-          roleId: this.currentRoleId,
-          permissionPointDefId: item.id
-        }))
-      );
-      if (addRolePermissionPointResult.data.code !== 200) {
-        return addRolePermissionPointResult;
+      if (removeRoutes.length) {
+        const roleRoutes = this.roleRouteTable.getList();
+        const deleteRoleRouteResult = await this.roleRouteTable.batchDelete(
+          removeRoutes.map(
+            (route) => roleRoutes.find((roleRoute) => roleRoute.routeId === route.id)
+          ).filter(Boolean)
+        );
+        if (deleteRoleRouteResult.data.code !== 200) {
+          return deleteRoleRouteResult;
+        }
       }
-    }
-    if (addRoutes.length) {
-      const addRoleRouteResult = await this.roleRouteTable.batchAdd(
-        addRoutes.map((item) => ({
-          id: "",
-          roleId: this.currentRoleId,
-          routeId: item.id
-        }))
-      );
-      if (addRoleRouteResult.data.code !== 200) {
-        return addRoleRouteResult;
+      if (addPermissionPointDefine.length) {
+        const addRolePermissionPointResult = await this.rolePermissionPointTable.batchAdd(
+          addPermissionPointDefine.map((item) => ({
+            id: "",
+            roleId: this.currentRoleId,
+            permissionPointDefId: item.id
+          }))
+        );
+        if (addRolePermissionPointResult.data.code !== 200) {
+          return addRolePermissionPointResult;
+        }
       }
+      if (addRoutes.length) {
+        const addRoleRouteResult = await this.roleRouteTable.batchAdd(
+          addRoutes.map((item) => ({
+            id: "",
+            roleId: this.currentRoleId,
+            routeId: item.id
+          }))
+        );
+        if (addRoleRouteResult.data.code !== 200) {
+          return addRoleRouteResult;
+        }
+      }
+      await this.selectRolePermission(this.currentRole);
+    } catch (error) {
+      throw new Error("提交失败！");
+    } finally {
+      this.loadingManager.completeLoading();
     }
-    await this.selectRolePermission(this.currentRole);
-    this.loadingManager.completeLoading();
   }
   /**
    * 是否发生变更
@@ -15891,29 +15957,15 @@ class RolePermissionConfigTable extends MsMenuTable {
     return !!(removePermissionPointDefines.length || removeRoutes.length || addPermissionPointDefine.length || addRoutes.length);
   }
 }
-class MsMemberForm extends dm.DataForm {
-  static [DATA_MODEL_NAME] = "ms-member";
+class MsAccountForm extends dm.DataForm {
+  static [DATA_MODEL_NAME] = "ms-account";
   constructor(options = {}) {
-    super({
-      name: MsMemberForm[DATA_MODEL_NAME],
-      moduleName: MODULE_NAME,
-      ...options
-    });
+    super({ name: MsAccountForm[DATA_MODEL_NAME], moduleName: MODULE_NAME, ...options });
   }
   async initialize() {
     await super.initialize();
     this.setColumns([
       new dm.FormColumn({ name: "id", label: "编号" }),
-      new dm.FormColumn({ name: "name", label: "姓名", required: true }),
-      new dm.FormColumn({ name: "wechatNo", label: "微信号", defaultValue: null }),
-      new dm.FormColumn({ name: "nickName", label: "昵称", required: true }),
-      new dm.FormColumn({
-        name: "email",
-        label: "邮箱",
-        required: true,
-        rules: [{ message: "邮箱格式有误", pattern: EMAIL_PATTERN }]
-      }),
-      new dm.FormColumn({ name: "phone", label: "手机号", defaultValue: null }),
       new dm.FormColumn({
         name: "account",
         label: "账号",
@@ -15926,6 +15978,13 @@ class MsMemberForm extends dm.DataForm {
         defaultValue: null,
         componentInfo: "MKFormImageUpload"
       }),
+      new dm.FormColumn({
+        name: "email",
+        label: "邮箱",
+        required: true,
+        rules: [{ message: "邮箱格式有误", pattern: EMAIL_PATTERN }]
+      }),
+      new dm.FormColumn({ name: "phone", label: "手机号", defaultValue: null }),
       new dm.FormColumn({
         name: "roles",
         label: "角色",
@@ -15956,26 +16015,8 @@ class MsMemberForm extends dm.DataForm {
       }
     });
   }
-  // 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;
-  // }
 }
-const MemberNickNameColumn = /* @__PURE__ */ vue.defineComponent({
+const AccountInfoColumn = /* @__PURE__ */ vue.defineComponent({
   props: dataTableColumnProps,
   setup(props) {
     return () => {
@@ -16011,34 +16052,16 @@ const MemberNickNameColumn = /* @__PURE__ */ vue.defineComponent({
     };
   }
 });
-const MemberRolesColumn = /* @__PURE__ */ vue.defineComponent({
-  props: dataTableColumnProps,
-  setup(props) {
-    return () => {
-      const roles = props.row.roles.map((role) => vue.createVNode(elementPlus.ElTag, {
-        "key": role.id,
-        "size": "large",
-        "type": "info",
-        "class": "mx-2"
-      }, {
-        default: () => [role.desc]
-      }));
-      return vue.createVNode("div", {
-        "class": "roles-Info"
-      }, [roles]);
-    };
-  }
-});
-class MsMemberTable extends dm.DataTable {
-  static [DATA_MODEL_NAME] = "ms-member";
+class MsAccountTable extends dm.DataTable {
+  static [DATA_MODEL_NAME] = "ms-account";
   activeDialog = null;
   constructor(options = {}) {
     super({
-      name: MsMemberTable[DATA_MODEL_NAME],
+      name: MsAccountTable[DATA_MODEL_NAME],
       moduleName: MODULE_NAME,
       ...options
     });
-    this.activeMemberForm = this.register(new class extends MsMemberForm {
+    this.activeAccountForm = this.register(new class extends MsAccountForm {
       formatSubmitData(data) {
         data = super.formatSubmitData(data);
         if (data.valid !== 1) {
@@ -16055,30 +16078,21 @@ class MsMemberTable extends dm.DataTable {
   async initialize() {
     await super.initialize();
     await this.initActiveMemberForm();
-    const isSuperAdmin = MSAppClient.instance?.userSession?.userInfo?.isSuper ?? false;
+    const identity = MSAppClient.instance?.userSession?.userInfo?.identity;
     this.header.rightArea = [new dm.RefreshButton(), new dm.AddButton(), new dm.ImportButton(), new dm.TableHeaderItem({
       componentInfo: "MKBatchOpt",
-      predicate: () => isSuperAdmin
+      predicate: () => identity == AccountIdentityEnum.DEVELOPER || identity == AccountIdentityEnum.OWNER
     })];
-    if (!isSuperAdmin) {
+    if (identity == AccountIdentityEnum.DEVELOPER) {
+      this.useCondition((group) => {
+        group.addCondition("identity", "=", AccountIdentityEnum.NORMAL).addOrCondition("identity", "=", AccountIdentityEnum.DEVELOPER);
+      });
+    } else if (identity == AccountIdentityEnum.NORMAL) {
       this.useCondition((group) => {
-        group.addCondition("isSuper", "!=", 1);
+        group.addCondition("identity", "=", AccountIdentityEnum.NORMAL);
       });
     }
     this.dataFilter.setColumns([new dm.FilterColumn({
-      name: "name",
-      label: "姓名",
-      componentInfo: "MKConditionInput",
-      search: true
-    }), new dm.FilterColumn({
-      name: "wechatNo",
-      label: "微信号",
-      componentInfo: "MKConditionInput"
-    }), new dm.FilterColumn({
-      name: "nickName",
-      label: "昵称",
-      componentInfo: "MKConditionInput"
-    }), new dm.FilterColumn({
       name: "email",
       label: "邮箱",
       componentInfo: "MKConditionInput"
@@ -16096,166 +16110,199 @@ class MsMemberTable extends dm.DataTable {
       componentInfo: "MKConditionDate",
       defaultValue: ["2024-01-20 00:00:00", "2024-01-21 00:00:00"]
     })]);
-    this.setColumns([
-      new dm.TableColumn({
-        name: "nickName",
-        label: "账号信息",
-        align: "left",
-        minWidth: "200px",
-        componentInfo: {
-          name: "",
-          component: MemberNickNameColumn
-        }
-      }),
-      new dm.TableColumn({
-        name: "roles",
-        label: "角色",
-        minWidth: "150px",
-        align: "left",
-        componentInfo: {
-          name: "",
-          component: MemberRolesColumn
-        }
-      }),
-      new dm.TableColumn({
-        name: "type",
-        label: "状态",
-        minWidth: "80px",
-        componentInfo: "MKColumnTag",
-        componentProps: {
-          options: [{
-            value: 1,
-            label: "待激活"
-          }, {
-            value: 2,
-            label: "已锁定",
-            type: "danger"
+    this.setColumns([new dm.TableColumn({
+      name: "nickName",
+      label: "账号信息",
+      align: "left",
+      minWidth: "200px",
+      componentInfo: {
+        name: "",
+        component: AccountInfoColumn
+      }
+    }), new dm.TableColumn({
+      name: "identity",
+      label: "身份",
+      minWidth: "150px",
+      align: "left",
+      componentInfo: {
+        component({
+          row,
+          column
+        }) {
+          if (row.identity === AccountIdentityEnum.OWNER) {
+            return vue.createVNode(elementPlus.ElTag, {
+              "type": "success",
+              "class": "mx-2"
+            }, {
+              default: () => [vue.createTextVNode("所有者")]
+            });
+          } else if (row.identity === AccountIdentityEnum.DEVELOPER) {
+            return vue.createVNode(elementPlus.ElTag, {
+              "type": "primary",
+              "class": "mx-2"
+            }, {
+              default: () => [vue.createTextVNode("开发者")]
+            });
+          }
+          return row.roles.map((role) => vue.createVNode(elementPlus.ElTag, {
+            "key": role.id,
+            "type": "primary",
+            "class": "mx-2"
           }, {
-            value: 3,
-            label: "正常",
-            type: "success"
-          }]
+            default: () => [role.desc]
+          }));
         }
-      }),
-      new dm.TableColumn({
-        name: "memo",
-        label: "备注",
-        minWidth: "150px"
-      }),
-      // new TableColumn({ name: "email", label: "邮箱", minWidth: "200px" }),
-      // new TableColumn({ name: "phone", label: "手机号", minWidth: "120px" }),
-      // new TableColumn({ name: "wechatNo", label: "微信号", minWidth: "140px" }),
-      // new TableColumn({
-      //   name: "valid",
-      //   label: "微信号",
-      //   minWidth: "140px",
-      //   visible: false,
-      // }),
-      new dm.TableActionColumn({
-        width: "240px",
-        buttons: [new dm.ActionButton({
-          label: "激活用户",
-          handler: async (row) => {
-            this.activeDialog = await dm.Dialoger.dataFormDialog({
-              dataForm: this.activeMemberForm,
-              recId: row.id
+      }
+    }), new dm.TableColumn({
+      name: "status",
+      label: "状态",
+      minWidth: "80px",
+      componentInfo: {
+        component({
+          row
+        }) {
+          if (row.valid === 0) {
+            return vue.createVNode(elementPlus.ElTag, {
+              "type": "danger"
+            }, {
+              default: () => [vue.createTextVNode("不可用")]
             });
-          },
-          predicate: (member) => member.valid === 0
-        }), new dm.ActionButton({
-          label: "重置密码",
-          handler: async (row) => {
-            const isConfirm = await dm.Dialoger.confirm({
-              title: "重置密码",
-              message: "是否重置密码",
-              type: "warning",
-              cancelButtonText: "取消",
-              confirmButtonText: "确定"
+          } else if (row.isLock === 1) {
+            return vue.createVNode(elementPlus.ElTag, {
+              "type": "warning"
+            }, {
+              default: () => [vue.createTextVNode("锁定")]
             });
-            if (!isConfirm) {
-              return;
-            }
-            this.loadingManager.startLoading();
-            try {
-              const response = await this.dataViewRequest.callDVRequest({
-                action: `reset-password/${row.id}`
-              });
-              if (response.data.code !== 200) {
-                dm.Messager.error({
-                  message: response.data.msg || "重置密码失败"
-                });
-                return;
-              }
-              dm.Dialoger.confirm({
-                title: "重置密码成功",
-                message: vue.createVNode("div", {
-                  "class": "flex"
-                }, [vue.createVNode(MKSvgIcon, {
-                  "name": "InfoFilled",
-                  "class": "color-[#E6A23C] font-[20px] mr-2"
-                }, null), vue.createTextVNode("你的新密码为："), vue.createVNode(MKText, {
-                  "copy": true
-                }, {
-                  default: () => [vue.createVNode("span", {
-                    "class": "color-[#4090ee]  font-[14px]"
-                  }, [response.data.data])]
-                })]),
-                type: "warning",
-                cancelButtonText: "取消",
-                confirmButtonText: "确定"
-              });
-            } catch (e) {
-              console.error(e);
+          }
+          return vue.createVNode(elementPlus.ElTag, {
+            "type": "success"
+          }, {
+            default: () => [vue.createTextVNode("正常")]
+          });
+        }
+      },
+      componentProps: {
+        options: [{
+          value: AccountIdentityEnum.NORMAL,
+          label: "普通账户"
+        }, {
+          value: AccountIdentityEnum.OWNER,
+          label: "所有者",
+          type: "primary"
+        }, {
+          value: AccountIdentityEnum.DEVELOPER,
+          label: "开发者",
+          type: "success"
+        }]
+      }
+    }), new dm.TableColumn({
+      name: "memo",
+      label: "备注",
+      minWidth: "150px"
+    }), new dm.TableActionColumn({
+      width: "240px",
+      buttons: [new dm.ActionButton({
+        label: "激活用户",
+        handler: async (row) => {
+          this.activeDialog = await dm.Dialoger.dataFormDialog({
+            dataForm: this.activeAccountForm,
+            recId: row.id
+          });
+        },
+        predicate: (member) => member.valid === 0
+      }), new dm.ActionButton({
+        label: "重置密码",
+        handler: async (row) => {
+          const isConfirm = await dm.Dialoger.confirm({
+            title: "重置密码",
+            message: "是否重置密码",
+            type: "warning",
+            cancelButtonText: "取消",
+            confirmButtonText: "确定"
+          });
+          if (!isConfirm) {
+            return;
+          }
+          this.loadingManager.startLoading();
+          try {
+            const response = await this.dataViewRequest.callDVRequest({
+              action: `reset-password/${row.id}`
+            });
+            if (response.data.code !== 200) {
               dm.Messager.error({
-                message: "网络异常"
+                message: response.data.msg || "重置密码失败"
               });
-            } finally {
-              this.loadingManager.completeLoading();
+              return;
             }
-          },
-          predicate: (member) => member.valid === 1
-        }), new dm.ActionButton({
-          label: "解锁",
-          handler: async (row) => {
-            const isConfirm = await dm.Dialoger.instance.confirm({
-              title: "解锁",
-              message: "是否解锁？",
+            dm.Dialoger.confirm({
+              title: "重置密码成功",
+              message: vue.createVNode("div", {
+                "class": "flex"
+              }, [vue.createVNode(MKSvgIcon, {
+                "name": "InfoFilled",
+                "class": "color-[#E6A23C] font-[20px] mr-2"
+              }, null), vue.createTextVNode("你的新密码为："), vue.createVNode(MKText, {
+                "copy": true
+              }, {
+                default: () => [vue.createVNode("span", {
+                  "class": "color-[#4090ee]  font-[14px]"
+                }, [response.data.data])]
+              })]),
               type: "warning",
               cancelButtonText: "取消",
               confirmButtonText: "确定"
             });
-            if (!isConfirm) {
-              return;
-            }
-            this.loadingManager.startLoading();
-            const response = await this.activeMemberForm.dataViewRequest.update({
-              id: row.id,
-              isLock: 0,
-              errorCount: 0,
-              unlockDatetime: null
+          } catch (e) {
+            console.error(e);
+            dm.Messager.error({
+              message: "网络异常"
             });
-            if (response.data.code !== 200) {
-              dm.Messager.error({
-                message: response.data.msg
-              });
-              return;
-            }
+          } finally {
             this.loadingManager.completeLoading();
-            this.load();
-          },
-          predicate: (member) => member.isLock === 1
-        }), new dm.EditButton({
-          predicate: (member) => member.valid === 1
-        }), new dm.DeleteButton()]
-      })
-    ]);
+          }
+        },
+        predicate: (member) => member.valid === 1
+      }), new dm.ActionButton({
+        label: "解锁",
+        handler: async (row) => {
+          const isConfirm = await dm.Dialoger.instance.confirm({
+            title: "解锁",
+            message: "是否解锁？",
+            type: "warning",
+            cancelButtonText: "取消",
+            confirmButtonText: "确定"
+          });
+          if (!isConfirm) {
+            return;
+          }
+          this.loadingManager.startLoading();
+          const response = await this.activeAccountForm.dataViewRequest.update({
+            id: row.id,
+            isLock: 0,
+            errorCount: 0,
+            unlockDatetime: null
+          });
+          if (response.data.code !== 200) {
+            dm.Messager.error({
+              message: response.data.msg
+            });
+            return;
+          }
+          this.loadingManager.completeLoading();
+          this.load();
+        },
+        predicate: (member) => member.isLock === 1
+      }), new dm.EditButton({
+        predicate: (member) => member.valid === 1
+      }), new dm.DeleteButton()]
+    })]);
   }
   /**
    * 初始化激活成员表单
    * @protected
    */
   async initActiveMemberForm() {
-    const activeMemberForm = this.activeMemberForm;
+    const activeMemberForm = this.activeAccountForm;
     await activeMemberForm.init();
     activeMemberForm.setColumns([activeMemberForm.getColumn("id"), new dm.FormColumn({
       name: "valid",
@@ -16289,12 +16336,12 @@ class MsMemberTable extends dm.DataTable {
    */
   async approveMember() {
     try {
-      if (this.activeMemberForm.loading) {
+      if (this.activeAccountForm.loading) {
         return;
       }
-      this.activeMemberForm.getLoadingManager().startLoading();
-      const _data = this.activeMemberForm.data;
-      if (!await this.activeMemberForm.validate()) {
+      this.activeAccountForm.getLoadingManager().startLoading();
+      const _data = this.activeAccountForm.data;
+      if (!await this.activeAccountForm.validate()) {
         dm.Messager.error({
           message: "请选择是否通过"
         });
@@ -16347,9 +16394,13 @@ class MsMemberTable extends dm.DataTable {
         message: "网络异常"
       });
     } finally {
-      this.activeMemberForm.getLoadingManager().completeLoading();
+      this.activeAccountForm.getLoadingManager().completeLoading();
     }
   }
+  /**
+   * 表单列处理
+   * @param item
+   */
   formatItem(item) {
     return {
       ...item,
@@ -16362,17 +16413,17 @@ class MsMemberTable extends dm.DataTable {
     };
   }
 }
-class MsMemberRoleTable extends dm.DataTable {
-  static [DATA_MODEL_NAME] = "ms-member-role";
+class MsAccountMemberRoleTable extends dm.DataTable {
+  static [DATA_MODEL_NAME] = "ms-account-role";
   currentRole = null;
   constructor(options = {}) {
     super({
-      name: MsMemberRoleTable[DATA_MODEL_NAME],
+      name: MsAccountMemberRoleTable[DATA_MODEL_NAME],
       moduleName: MODULE_NAME,
       ...options
     });
     const memberRoleTable = this;
-    this.memberTable = this.register(new class extends MsMemberTable {
+    this.memberTable = this.register(new class extends MsAccountTable {
       async loadRequest(params) {
         return super.loadRequest(Object.assign({
           excludeRoleIds: memberRoleTable.currentRole?.id ? [memberRoleTable.currentRole?.id] : []
@@ -16380,6 +16431,10 @@ class MsMemberRoleTable extends dm.DataTable {
       }
     }());
   }
+  /**
+   * 设置当前角色
+   * @param role
+   */
   setCurrentRole(role) {
     const oldRole = this.currentRole;
     this.currentRole = role;
@@ -16420,7 +16475,7 @@ class MsMemberRoleTable extends dm.DataTable {
           column,
           index: index2
         }) => {
-          return vue.createVNode(MemberNickNameColumn, {
+          return vue.createVNode(AccountInfoColumn, {
             "row": row.member,
             "column": column,
             "index": index2
@@ -16497,7 +16552,10 @@ class MsIPWhitelistTable extends dm.DataTable {
       new dm.AddButton(),
       new dm.TableHeaderItem({
         componentInfo: "MKBatchOpt",
-        predicate: () => MSAppClient.instance?.userSession?.userInfo?.isSuper ?? false
+        predicate: () => {
+          let identity = MSAppClient.instance?.userSession?.userInfo?.identity;
+          return identity == AccountIdentityEnum.DEVELOPER || identity == AccountIdentityEnum.OWNER;
+        }
       })
     ];
     this.setColumns([
@@ -16591,7 +16649,10 @@ class MsDenyIPAccessListTable extends dm.DataTable {
       new dm.AddButton(),
       new dm.TableHeaderItem({
         componentInfo: "MKBatchOpt",
-        predicate: () => MSAppClient.instance?.userSession?.userInfo?.isSuper ?? false
+        predicate: () => {
+          let identity = MSAppClient.instance?.userSession?.userInfo?.identity;
+          return identity == AccountIdentityEnum.DEVELOPER || identity == AccountIdentityEnum.OWNER;
+        }
       })
     ];
     this.setColumns([
@@ -16985,7 +17046,7 @@ class MsMessageForm extends dm.DataForm {
         label: "发送人",
         componentInfo: "MKFormDataTableSelect",
         componentProps: {
-          dataTable: this.register(new MsMemberTable()),
+          dataTable: this.register(new MsAccountTable()),
           labelFieldName: "name"
         }
       }),
@@ -17046,7 +17107,7 @@ class SendForm extends dm.DataForm {
         label: "收件人",
         componentInfo: "MKFormDataTableSelect",
         componentProps: {
-          dataTable: this.register(new MsMemberTable()),
+          dataTable: this.register(new MsAccountTable()),
           labelFieldName: "name",
           multiple: true
         },
@@ -17057,7 +17118,7 @@ class SendForm extends dm.DataForm {
       if (data.formItem.name === "broadcastRangeType") {
         switch (data.data.value) {
           case 1:
-            this.getColumn("broadcastRangeTargets").componentProps.dataTable = this.register(new MsMemberTable());
+            this.getColumn("broadcastRangeTargets").componentProps.dataTable = this.register(new MsAccountTable());
             break;
           case 2:
             console.log(this.getColumn("broadcastRangeTargets"));
@@ -17466,8 +17527,8 @@ class MSAppClient {
     DataModelDefines.instance.registerDataFormDefine(MsMaterialForm[DATA_MODEL_NAME], MsMaterialForm);
     DataModelDefines.instance.registerDataTreeDefine(MsMaterialGroupTree[DATA_MODEL_NAME], MsMaterialGroupTree);
     DataModelDefines.instance.registerDataFormDefine(MsMaterialGroupForm[DATA_MODEL_NAME], MsMaterialGroupForm);
-    DataModelDefines.instance.registerDataTableDefine(MsMemberTable[DATA_MODEL_NAME], MsMemberTable);
-    DataModelDefines.instance.registerDataFormDefine(MsMemberForm[DATA_MODEL_NAME], MsMemberForm);
+    DataModelDefines.instance.registerDataTableDefine(MsAccountTable[DATA_MODEL_NAME], MsAccountTable);
+    DataModelDefines.instance.registerDataFormDefine(MsAccountForm[DATA_MODEL_NAME], MsAccountForm);
     DataModelDefines.instance.registerDataTreeDefine(MsMenuTree[DATA_MODEL_NAME], MsMenuTree);
     DataModelDefines.instance.registerDataFormDefine(MsMenuForm[DATA_MODEL_NAME], MsMenuForm);
     DataModelDefines.instance.registerDataTableDefine(MsPermissionPointDefineTable[DATA_MODEL_NAME], MsPermissionPointDefineTable);
@@ -17529,43 +17590,43 @@ class MSAppClient {
     this.pageManager.init();
     this.pageManager.setMSAppClient(this);
     this.pageManager.addExtendsPage({
-      name: "dv/ms-material/list",
-      path: "/sys/materials",
-      component: () => Promise.resolve().then(() => require("./index-DZUlc_v7.cjs")),
-      meta: { name: "ms-material" }
+      name: "ms-menu",
+      path: "/ms/menus",
+      component: () => Promise.resolve().then(() => require("./index-sjzPbJp6.cjs")),
+      meta: { name: "ms-menu" }
     });
     this.pageManager.addExtendsPage({
-      name: "dv/ms-role/single/list/dialog",
-      path: "/sys/roles",
-      component: () => Promise.resolve().then(() => require("./index-DXasMfCq.cjs")),
+      name: "ms-role",
+      path: "/ms/roles",
+      component: () => Promise.resolve().then(() => require("./index--AtBegTn.cjs")),
       meta: { name: "ms-role" }
     });
+    this.pageManager.addExtendsPage({
+      name: "dv/ms-material/list",
+      path: "/sys/materials",
+      component: () => Promise.resolve().then(() => require("./index-BErkUm00.cjs")),
+      meta: { name: "ms-material" }
+    });
     this.pageManager.addExtendsPage({
       name: "dv/ms-role/permission",
       path: "/sys/roles/:id/permission",
-      component: () => Promise.resolve().then(() => require("./PermissionManage-C7Xg-wii.cjs"))
+      component: () => Promise.resolve().then(() => require("./PermissionManage-BR2yJRAe.cjs"))
     });
     this.pageManager.addExtendsPage({
       name: "dv/local-log/single/tree/dialog",
       path: "/log/local",
-      component: () => Promise.resolve().then(() => require("./index-B9rw_5us.cjs")),
+      component: () => Promise.resolve().then(() => require("./index-Dpxpw5sA.cjs")),
       meta: { name: "local-log" }
     });
-    this.pageManager.addExtendsPage({
-      name: "dv/ms-menu/list",
-      path: "/sys/menus",
-      component: () => Promise.resolve().then(() => require("./index-WOD9EhUR.cjs")),
-      meta: { name: "ms-menu" }
-    });
     this.pageManager.addExtendsPage({
       name: "icons/list",
       path: "/sys/icons",
-      component: () => Promise.resolve().then(() => require("./index-BAbHrjt0.cjs"))
+      component: () => Promise.resolve().then(() => require("./index-hZKsj7MM.cjs"))
     });
     this.pageManager.addExtendsPage({
       name: "dv/ms-todo/single/list/dialog",
       path: "/dv/todo",
-      component: () => Promise.resolve().then(() => require("./index-DhYT_qm1.cjs"))
+      component: () => Promise.resolve().then(() => require("./index-B0WcgZX5.cjs"))
     });
     for (let internalModule of internalModules) {
       for (let item of internalModule.normalPages) {
@@ -17738,8 +17799,6 @@ class DialogerImpl extends dm.SkeletonDialoger {
           isConfirm: true,
           selections: dataTable.getSelection()
         });
-        dataTable.setList([]);
-        dataTable.setSelection([]);
         dialogInstance.destroy();
       };
       const handleCancel = () => {
@@ -17755,9 +17814,10 @@ class DialogerImpl extends dm.SkeletonDialoger {
         title: dataTable.title ?? "选择",
         body: () => {
           return vue.createVNode("div", {
-            "class": "mk-data-table-select-dialog__main"
+            "class": "mk-data-table-select-dialog__main pt-2"
           }, [vue.createVNode(MKDataTable, {
             "dataTable": dataTable,
+            "autoLoad": !dataTable.initd,
             "selection": true
           }, null)]);
         },
@@ -17803,7 +17863,8 @@ class DialogerImpl extends dm.SkeletonDialoger {
               "dataForm": dataForm
             }, {
               default: () => [vue.createVNode(MKForm, {
-                "dataForm": dataForm
+                "dataForm": dataForm,
+                "labelPosition": "top"
               }, null)]
             })]
           });
@@ -18028,7 +18089,7 @@ const installer = utils.makeInstaller(
     document.body.appendChild(dialogContainer);
   }
 );
-const _hoisted_1$i = ["src"];
+const _hoisted_1$i = ["src", "alt"];
 const _hoisted_2$e = {
   key: 1,
   class: "block truncate font-bold"
@@ -18069,6 +18130,7 @@ const _sfc_main$o = /* @__PURE__ */ vue.defineComponent({
           _ctx.showLogo && vue.unref(logo) ? (vue.openBlock(), vue.createElementBlock("img", {
             key: 0,
             src: vue.unref(logo),
+            alt: vue.unref(title),
             class: "logo h-[35px] w-[35px] object-contain"
           }, null, 8, _hoisted_1$i)) : vue.createCommentVNode("", true),
           _ctx.showTitle && vue.unref(title) ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_2$e, vue.toDisplayString(vue.unref(title)), 1)) : vue.createCommentVNode("", true)
@@ -18127,7 +18189,7 @@ const _sfc_main$m = /* @__PURE__ */ vue.defineComponent({
 });
 const _hoisted_1$f = {
   key: 0,
-  class: "relative mx-1 h-full py-3"
+  class: "relative mx-1 h-full p-[6px]"
 };
 const _hoisted_2$c = {
   class: "h-full w-full flex cursor-pointer items-center justify-between gap-1 px-1 text-[var(--g-header-menu-color)] transition-all hover-bg-[var(--g-header-menu-hover-bg)] hover-text-[var(--g-header-menu-hover-color)]",
@@ -18424,19 +18486,16 @@ function useMenu() {
   };
 }
 const _hoisted_1$d = { class: "flex items-center h-full" };
-const _hoisted_2$a = { class: "relative mx-1 h-full py-3" };
+const _hoisted_2$a = { class: "relative mx-1 h-full p-[6px]" };
 const _hoisted_3$9 = {
-  class: "h-full w-full flex cursor-pointer items-center justify-between gap-1 px-1 text-[var(--g-header-menu-color)] transition-all hover-bg-[var(--g-header-menu-hover-bg)] hover-text-[var(--g-header-menu-hover-color)]",
+  class: "h-full w-full flex cursor-pointer items-center justify-between px-1 text-[var(--g-header-menu-color)] transition-all hover-bg-[var(--g-header-menu-hover-bg)] hover-text-[var(--g-header-menu-hover-color)]",
   style: { "border-radius": "0.2em" }
 };
 const _hoisted_4$8 = {
   key: 0,
   class: "bg-[#0289ff] w-full h-full flex items-center justify-center"
 };
-const _hoisted_5$7 = {
-  key: 0,
-  class: "m-l-2"
-};
+const _hoisted_5$7 = { class: "w-full h-full flex items-center justify-center ml-1" };
 const _hoisted_6$6 = { class: "mx-1 py-2 flex items-start" };
 const _hoisted_7$2 = {
   key: 0,
@@ -18456,8 +18515,12 @@ const _hoisted_12$2 = {
   key: 1,
   class: "flex gap-2 flex-wrap"
 };
-const _hoisted_13$2 = ["onClick"];
+const _hoisted_13$2 = {
+  key: 2,
+  class: "flex gap-2 flex-wrap"
+};
 const _hoisted_14$2 = ["onClick"];
+const _hoisted_15$2 = ["onClick"];
 const _sfc_main$j = /* @__PURE__ */ vue.defineComponent({
   ...{ name: "Tools" },
   __name: "rightSide",
@@ -18496,6 +18559,7 @@ const _sfc_main$j = /* @__PURE__ */ vue.defineComponent({
                   size: 28,
                   shape: "square",
                   fit: "fill",
+                  style: { "flex": "none" },
                   src: vue.unref(userInfo).avatar,
                   onError: _cache[0] || (_cache[0] = () => avatarError.value = true)
                 }, {
@@ -18506,10 +18570,13 @@ const _sfc_main$j = /* @__PURE__ */ vue.defineComponent({
                   ]),
                   _: 1
                 }, 8, ["src"]),
-                vue.unref(userInfo).nickName ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_5$7, vue.toDisplayString(vue.unref(userInfo).nickName), 1)) : vue.createCommentVNode("", true),
+                vue.createElementVNode("div", _hoisted_5$7, [
+                  vue.createElementVNode("span", null, vue.toDisplayString(vue.unref(userInfo).account), 1)
+                ]),
                 vue.createVNode(vue.unref(MKSvgIcon), {
                   name: "i-ep:caret-bottom",
-                  class: "m-l-2 color-[#7bb1fa]"
+                  size: 24,
+                  class: "color-[#7bb1fa]"
                 })
               ])
             ])
@@ -18536,14 +18603,21 @@ const _sfc_main$j = /* @__PURE__ */ vue.defineComponent({
                   vue.unref(userInfo).email ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_10$2, vue.toDisplayString(vue.unref(userInfo).email), 1)) : vue.createCommentVNode("", true)
                 ])
               ]),
-              vue.unref(userInfo).isSuper ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_11$2, [
+              vue.unref(userInfo).identity == vue.unref(AccountIdentityEnum).OWNER ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_11$2, [
                 vue.createVNode(_component_el_tag, { type: "primary" }, {
                   default: vue.withCtx(() => [
                     vue.createTextVNode(" 超级管理员 ")
                   ]),
                   _: 1
                 })
-              ])) : vue.unref(userInfo).roles ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_12$2, [
+              ])) : vue.unref(userInfo).identity == vue.unref(AccountIdentityEnum).DEVELOPER ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_12$2, [
+                vue.createVNode(_component_el_tag, { type: "primary" }, {
+                  default: vue.withCtx(() => [
+                    vue.createTextVNode(" 技术开发 ")
+                  ]),
+                  _: 1
+                })
+              ])) : vue.unref(userInfo).roles ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_13$2, [
                 (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(vue.unref(userInfo).roles, (role) => {
                   return vue.openBlock(), vue.createBlock(_component_el_tag, { type: "primary" }, {
                     default: vue.withCtx(() => [
@@ -18568,7 +18642,7 @@ const _sfc_main$j = /* @__PURE__ */ vue.defineComponent({
                         name: item?.icon
                       }, null, 8, ["name"])) : vue.createCommentVNode("", true),
                       vue.createTextVNode(" " + vue.toDisplayString(typeof item.meta?.title === "function" ? item.meta?.title() : item.meta?.title), 1)
-                    ], 8, _hoisted_13$2)) : vue.createCommentVNode("", true)
+                    ], 8, _hoisted_14$2)) : vue.createCommentVNode("", true)
                   ], 64);
                 }), 128)) : vue.createCommentVNode("", true),
                 vue.unref(settingsStore).mode === "pc" && vue.unref(settingsStore).settings.menu.mode === "head" ? (vue.openBlock(true), vue.createElementBlock(vue.Fragment, { key: 1 }, vue.renderList(vue.unref(menuStore).allMenus, (item, index2) => {
@@ -18584,7 +18658,7 @@ const _sfc_main$j = /* @__PURE__ */ vue.defineComponent({
                         name: item.meta?.icon
                       }, null, 8, ["name"])) : vue.createCommentVNode("", true),
                       vue.createTextVNode(" " + vue.toDisplayString(typeof item.meta?.title === "function" ? item.meta?.title() : item.meta?.title), 1)
-                    ], 8, _hoisted_14$2)) : vue.createCommentVNode("", true)
+                    ], 8, _hoisted_15$2)) : vue.createCommentVNode("", true)
                   ], 64);
                 }), 128)) : vue.createCommentVNode("", true),
                 vue.createElementVNode("div", {
@@ -18604,7 +18678,7 @@ const _sfc_main$j = /* @__PURE__ */ vue.defineComponent({
     };
   }
 });
-const RightSide = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["__scopeId", "data-v-2062f309"]]);
+const RightSide = /* @__PURE__ */ _export_sfc(_sfc_main$j, [["__scopeId", "data-v-d9debc5f"]]);
 const _hoisted_1$c = { key: 0 };
 const _hoisted_2$9 = { class: "header-container" };
 const _hoisted_3$8 = { class: "menu h-full flex of-hidden transition-all" };
@@ -18680,16 +18754,16 @@ const _sfc_main$i = /* @__PURE__ */ vue.defineComponent({
     };
   }
 });
-const Header = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["__scopeId", "data-v-4fd7647d"]]);
+const Header = /* @__PURE__ */ _export_sfc(_sfc_main$i, [["__scopeId", "data-v-c0cb6784"]]);
 const _hoisted_1$b = {
   key: 0,
   class: "main-sidebar-container"
 };
 const _hoisted_2$8 = { class: "menu" };
-const _hoisted_3$7 = { class: "w-full flex flex-col of-hidden py-1 transition-all -mt-2" };
+const _hoisted_3$7 = { class: "menu-inner w-full flex flex-col py-1 transition-all -mt-2" };
 const _hoisted_4$6 = ["title", "onClick"];
-const _hoisted_5$5 = { class: "w-full inline-flex flex-1 flex-col items-center justify-center gap-[2px]" };
-const _hoisted_6$4 = { class: "w-full flex-1 truncate text-center transition-height transition-opacity transition-width font-size-[12px]" };
+const _hoisted_5$5 = { class: "w-full inline-flex flex-1 flex-col items-center justify-center" };
+const _hoisted_6$4 = { class: "w-full flex-1 truncate text-center transition-height transition-opacity transition-width font-size-[12px] my-2" };
 const _sfc_main$h = /* @__PURE__ */ vue.defineComponent({
   ...{
     name: "MainSidebar"
@@ -18704,14 +18778,9 @@ const _sfc_main$h = /* @__PURE__ */ vue.defineComponent({
       settingsStore.settings.menu.mode !== "single" && menuStore.setActived(currentRoute.name);
     }, { immediate: true });
     return (_ctx, _cache) => {
-      const _component_MKSvgIcon = vue.resolveComponent("MKSvgIcon");
       return vue.openBlock(), vue.createBlock(vue.Transition, { name: "main-sidebar" }, {
         default: vue.withCtx(() => [
           vue.unref(settingsStore).settings.menu.mode === "side" || vue.unref(settingsStore).mode === "mobile" && vue.unref(settingsStore).settings.menu.mode !== "single" ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_1$b, [
-            vue.createVNode(_sfc_main$o, {
-              "show-title": false,
-              class: "sidebar-logo"
-            }),
             vue.createElementVNode("div", _hoisted_2$8, [
               vue.createElementVNode("div", _hoisted_3$7, [
                 (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(vue.unref(menuStore).allMenus, (item, index2) => {
@@ -18724,14 +18793,14 @@ const _sfc_main$h = /* @__PURE__ */ vue.defineComponent({
                   }, [
                     item.children && item.children.length !== 0 ? (vue.openBlock(), vue.createElementBlock("div", {
                       key: 0,
-                      class: vue.normalizeClass(["group menu-item-container h-full w-full flex cursor-pointer items-center justify-between gap-1 py-4 text-[var(--g-main-sidebar-menu-color)] transition-all hover-bg-[var(--g-main-sidebar-menu-hover-bg)] hover-text-[var(--g-main-sidebar-menu-hover-color)] px-2!", {
+                      class: vue.normalizeClass(["group menu-item-container h-full w-full flex cursor-pointer items-center justify-between text-[var(--g-main-sidebar-menu-color)] transition-all hover-bg-[var(--g-main-sidebar-menu-hover-bg)] hover-text-[var(--g-main-sidebar-menu-hover-color)]", {
                         "text-[var(--g-main-sidebar-menu-active-color)]! bg-[var(--g-main-sidebar-menu-active-bg)]!": index2 === vue.unref(menuStore).actived
                       }]),
                       title: typeof item.meta?.title === "function" ? item.meta?.title() : item.meta?.title,
                       onClick: ($event) => vue.unref(switchTo)(index2)
                     }, [
                       vue.createElementVNode("div", _hoisted_5$5, [
-                        item.meta?.icon ? (vue.openBlock(), vue.createBlock(_component_MKSvgIcon, {
+                        item.meta?.icon ? (vue.openBlock(), vue.createBlock(vue.unref(MKSvgIcon), {
                           key: 0,
                           name: item.meta?.icon,
                           class: "menu-item-container-icon transition-transform"
@@ -18750,7 +18819,7 @@ const _sfc_main$h = /* @__PURE__ */ vue.defineComponent({
     };
   }
 });
-const MainSidebar = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["__scopeId", "data-v-14be47ff"]]);
+const MainSidebar = /* @__PURE__ */ _export_sfc(_sfc_main$h, [["__scopeId", "data-v-16f2840a"]]);
 const rootMenuInjectionKey = Symbol("rootMenu");
 const _sfc_main$g = /* @__PURE__ */ vue.defineComponent({
   ...{
@@ -19311,6 +19380,7 @@ const _sfc_main$d = /* @__PURE__ */ vue.defineComponent({
       }
     });
     return (_ctx, _cache) => {
+      const _component_el_button = vue.resolveComponent("el-button");
       return vue.unref(enableSidebar) ? (vue.openBlock(), vue.createElementBlock("div", {
         key: 0,
         class: vue.normalizeClass(["sub-sidebar-container", {
@@ -19365,12 +19435,20 @@ const _sfc_main$d = /* @__PURE__ */ vue.defineComponent({
           ], 2), [
             [vue.vShow, vue.unref(settingsStore).settings.menu.enableSubMenuCollapseButton]
           ])
-        ], 2)) : vue.createCommentVNode("", true)
+        ], 2)) : vue.createCommentVNode("", true),
+        vue.unref(settingsStore).mode === "mobile" ? (vue.openBlock(), vue.createBlock(_component_el_button, {
+          key: 1,
+          class: "close-btn",
+          type: "primary",
+          icon: vue.unref(iconsVue.CloseBold),
+          circle: "",
+          onClick: _cache[1] || (_cache[1] = vue.withModifiers(($event) => vue.unref(settingsStore).settings.menu.subMenuCollapse = true, ["stop"]))
+        }, null, 8, ["icon"])) : vue.createCommentVNode("", true)
       ], 2)) : vue.createCommentVNode("", true);
     };
   }
 });
-const SubSidebar = /* @__PURE__ */ _export_sfc(_sfc_main$d, [["__scopeId", "data-v-4a01fb22"]]);
+const SubSidebar = /* @__PURE__ */ _export_sfc(_sfc_main$d, [["__scopeId", "data-v-f7d848bd"]]);
 function useMainPage() {
   const router = vueRouter.useRouter();
   function reload() {
@@ -20029,20 +20107,18 @@ const _sfc_main$8 = /* @__PURE__ */ vue.defineComponent({
   setup(__props) {
     const settingsStore = useSettingsStore();
     return (_ctx, _cache) => {
-      const _component_MKSvgIcon = vue.resolveComponent("MKSvgIcon");
       return vue.openBlock(), vue.createElementBlock("div", _hoisted_1$6, [
-        vue.createVNode(_sfc_main$o, {
-          class: "title",
-          showLogo: false
-        }),
         vue.unref(settingsStore).mode === "mobile" ? (vue.openBlock(), vue.createElementBlock("div", {
           key: 0,
           class: "flex-center cursor-pointer px-2 py-1 -rotate-z-180",
           onClick: _cache[0] || (_cache[0] = ($event) => vue.unref(settingsStore).toggleSidebarCollapse())
         }, [
-          vue.createVNode(_component_MKSvgIcon, { name: "toolbar-collapse" })
-        ])) : vue.createCommentVNode("", true),
-        vue.unref(settingsStore).settings.toolbar.breadcrumb ? (vue.openBlock(), vue.createBlock(Breadcrumb, { key: 1 })) : vue.createCommentVNode("", true)
+          vue.createVNode(vue.unref(MKSvgIcon), { name: "ep:expand" })
+        ])) : (vue.openBlock(), vue.createBlock(_sfc_main$o, {
+          key: 1,
+          class: "title"
+        })),
+        vue.unref(settingsStore).settings.toolbar.breadcrumb ? (vue.openBlock(), vue.createBlock(Breadcrumb, { key: 2 })) : vue.createCommentVNode("", true)
       ]);
     };
   }
@@ -20052,7 +20128,7 @@ const _hoisted_2$5 = {
   class: "h-full flex items-center of-hidden pr-16",
   style: { "mask-image": "linear-gradient(90deg, #000 0%, #000 calc(100% - 50px), transparent)" }
 };
-const _hoisted_3$5 = { class: "h-full flex items-center px-2" };
+const _hoisted_3$5 = { class: "h-full flex items-center pl-2" };
 const _sfc_main$7 = /* @__PURE__ */ vue.defineComponent({
   ...{
     name: "Toolbar"
@@ -20074,7 +20150,7 @@ const _sfc_main$7 = /* @__PURE__ */ vue.defineComponent({
     };
   }
 });
-const Toolbar = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["__scopeId", "data-v-97054519"]]);
+const Toolbar = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["__scopeId", "data-v-c42d3714"]]);
 const _sfc_main$6 = /* @__PURE__ */ vue.defineComponent({
   ...{
     name: "Topbar"
@@ -20120,8 +20196,7 @@ const _sfc_main$6 = /* @__PURE__ */ vue.defineComponent({
           [`topbar-${vue.unref(settingsStore).settings.topbar.mode}`]: true,
           shadow: vue.unref(scrollTop),
           hide: vue.unref(scrollOnHide)
-        }]),
-        "data-fixed-calc-width": ""
+        }])
       }, [
         vue.unref(enableToolbar) ? (vue.openBlock(), vue.createBlock(Toolbar, { key: 0 })) : vue.createCommentVNode("", true),
         vue.unref(settingsStore).settings.tabbar.enable ? (vue.openBlock(), vue.createBlock(Tabbar, { key: 1 })) : vue.createCommentVNode("", true)
@@ -20129,7 +20204,7 @@ const _sfc_main$6 = /* @__PURE__ */ vue.defineComponent({
     };
   }
 });
-const Topbar = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["__scopeId", "data-v-4e4b23fb"]]);
+const Topbar = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["__scopeId", "data-v-4da2abf0"]]);
 const _hoisted_1$4 = /* @__PURE__ */ vue.createElementVNode("div", { class: "fixed inset-0 bg-stone-200/75 backdrop-blur-sm transition-opacity dark-bg-stone-8/75" }, null, -1);
 const _hoisted_2$4 = { class: "fixed inset-0" };
 const _hoisted_3$4 = { class: "h-full flex items-end justify-center p-4 text-center lg-items-center" };
@@ -21024,7 +21099,12 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         }
       }
     );
+    const resizeHandle = lodashEs.debounce(() => {
+      settingsStore.setMode(window.document.body.clientWidth);
+    }, 200);
     vue.onMounted(() => {
+      resizeHandle();
+      window.addEventListener("resize", resizeHandle);
       hotkeys("f5", (e) => {
         if (settingsStore.settings.toolbar.pageReload) {
           e.preventDefault();
@@ -21043,6 +21123,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     vue.onUnmounted(() => {
       hotkeys.unbind("f5");
       hotkeys.unbind("alt+`");
+      window.removeEventListener("resize", resizeHandle);
     });
     const mainSidebarActualWidth = vue.computed(() => {
       let actualWidth = Number.parseInt(getComputedStyle(document.documentElement).getPropertyValue("--g-main-sidebar-width"));
@@ -21061,6 +21142,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }
       return `${actualWidth}px`;
     });
+    vue.provide("settingsStore", settingsStore);
     return (_ctx, _cache) => {
       const _component_el_result = vue.resolveComponent("el-result");
       const _component_RouterView = vue.resolveComponent("RouterView");
@@ -21074,21 +21156,25 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             })
           }, [
             vue.createElementVNode("div", _hoisted_1, [
-              vue.createVNode(Header),
+              vue.withDirectives(vue.createVNode(Header, null, null, 512), [
+                [vue.vShow, vue.unref(settingsStore).mode === "pc"]
+              ]),
               vue.createElementVNode("div", _hoisted_2, [
-                vue.createElementVNode("div", {
-                  class: vue.normalizeClass(["sidebar-container", { show: vue.unref(settingsStore).mode === "mobile" && !vue.unref(settingsStore).settings.menu.subMenuCollapse }])
-                }, [
-                  vue.createVNode(MainSidebar)
-                ], 2),
                 vue.createElementVNode("div", {
                   class: vue.normalizeClass(["sidebar-mask", { show: vue.unref(settingsStore).mode === "mobile" && !vue.unref(settingsStore).settings.menu.subMenuCollapse }]),
                   onClick: _cache[0] || (_cache[0] = ($event) => vue.unref(settingsStore).toggleSidebarCollapse())
                 }, null, 2),
                 vue.createElementVNode("div", _hoisted_3, [
-                  vue.createVNode(Topbar),
+                  vue.withDirectives(vue.createVNode(Topbar, null, null, 512), [
+                    [vue.vShow, vue.unref(settingsStore).mode === "pc"]
+                  ]),
                   vue.createElementVNode("div", _hoisted_4, [
-                    vue.createVNode(SubSidebar),
+                    vue.createElementVNode("div", {
+                      class: vue.normalizeClass(["sidebar-container", { show: vue.unref(settingsStore).mode === "mobile" && !vue.unref(settingsStore).settings.menu.subMenuCollapse }])
+                    }, [
+                      vue.createVNode(MainSidebar),
+                      vue.createVNode(SubSidebar)
+                    ], 2),
                     vue.createElementVNode("div", _hoisted_5, [
                       vue.createVNode(_component_RouterView, null, {
                         default: vue.withCtx(({ Component, route }) => [
@@ -21135,7 +21221,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     };
   }
 });
-const Layout$1 = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-7f84212b"]]);
+const Layout$1 = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-e1443d21"]]);
 const Layout = /* @__PURE__ */ vue.defineComponent({
   name: "MKLayout",
   setup() {
@@ -21363,6 +21449,7 @@ const defineDataTree = (DataTreeClass2) => {
 };
 const install = installer.install;
 const version = installer.version;
+exports.AccountIdentityEnum = AccountIdentityEnum;
 exports.CONFIG_PROVIDER_CONTEXT_KEY = CONFIG_PROVIDER_CONTEXT_KEY;
 exports.ConfigComponents = ConfigComponents;
 exports.DATA_MODEL_NAME = DATA_MODEL_NAME;
@@ -21384,6 +21471,7 @@ exports.IP_PATTERN = IP_PATTERN;
 exports.ImageCropper = ImageCropper;
 exports.InternalMkModule = InternalMkModule;
 exports.LocalLogTree = LocalLogTree;
+exports.LoginAccountMeta = LoginAccountMeta;
 exports.LoginLogTable = LoginLogTable;
 exports.LoginLogType = LoginLogType;
 exports.MKAbstractSelect = MKAbstractSelect;
@@ -21443,6 +21531,9 @@ exports.Menu = Menu;
 exports.MenuNode = MenuNode;
 exports.MenuType = MenuType;
 exports.MenuUrlType = MenuUrlType;
+exports.MsAccountForm = MsAccountForm;
+exports.MsAccountMemberRoleTable = MsAccountMemberRoleTable;
+exports.MsAccountTable = MsAccountTable;
 exports.MsConfigForm = MsConfigForm;
 exports.MsConfigTable = MsConfigTable;
 exports.MsDenyIPAccessListForm = MsDenyIPAccessListForm;
@@ -21453,10 +21544,7 @@ exports.MsMaterialForm = MsMaterialForm;
 exports.MsMaterialGroupForm = MsMaterialGroupForm;
 exports.MsMaterialGroupTree = MsMaterialGroupTree;
 exports.MsMaterialTable = MsMaterialTable;
-exports.MsMemberForm = MsMemberForm;
 exports.MsMemberRoleForm = MsMemberRoleForm;
-exports.MsMemberRoleTable = MsMemberRoleTable;
-exports.MsMemberTable = MsMemberTable;
 exports.MsMenuForm = MsMenuForm;
 exports.MsMenuTable = MsMenuTable;
 exports.MsMenuTree = MsMenuTree;
@@ -21477,7 +21565,7 @@ exports.MsRouteTable = MsRouteTable;
 exports.NodeTreeViewPlugin = NodeTreeViewPlugin;
 exports.OperateLogTable = OperateLogTable;
 exports.PageManager = PageManager;
-exports.PermissionPointManager = PermissionPointManager;
+exports.PermissionManager = PermissionManager;
 exports.REMOVE_ELEMENTBLOCK_COMMAND = REMOVE_ELEMENTBLOCK_COMMAND;
 exports.RegionLevel = RegionLevel;
 exports.RequestLogTable = RequestLogTable;
@@ -21494,7 +21582,6 @@ exports.UploadFileEmits = UploadFileEmits;
 exports.UploadFileProps = UploadFileProps;
 exports.UploadImageProps = UploadImageProps;
 exports.UploadVideoProps = UploadVideoProps;
-exports.UserInfo = UserInfo;
 exports.UserSession = UserSession;
 exports._export_sfc = _export_sfc;
 exports._sfc_main = _sfc_main$C;
@@ -21573,6 +21660,7 @@ exports.useLexicalIsTextContentEmpty = useLexicalIsTextContentEmpty;
 exports.useMSAppClient = useMSAppClient;
 exports.useMounted = useMounted;
 exports.useRenderInfoComponent = useRenderInfoComponent;
+exports.useSettingsStore = useSettingsStore;
 exports.useSingleView = useSingleView;
 exports.useSingleViewWithDialog = useSingleViewWithDialog;
 exports.useTableColumnComponent = useTableColumnComponent;
@@ -21581,4 +21669,4 @@ exports.useUploadComposable = useUploadComposable;
 exports.useUploadService = useUploadService;
 exports.useUserInfo = useUserInfo;
 exports.version = version;
-//# sourceMappingURL=index-BUCV8-xD.cjs.map
+//# sourceMappingURL=index-C9ykzsLb.cjs.map