@ibiz-template/runtime 0.7.41-alpha.64 → 0.7.41-alpha.65

package/dist/index.esm.js

@@ -40371,17 +40371,17 @@ var AppMenuController = class extends ControlController {
   }
   /**
    * @description 保存自定义菜单模型
-   * @param {IAppMenuItem[]} curMenuItems 当前显示的菜单项集合
+   * @param {Array<{ id: string; order: number; hidden: boolean }>} items 有权限的菜单项集合
    * @returns {*}  {Promise<void>}
    * @memberof AppMenuController
    */
-  async saveCustomMenusModel(curMenuItems) {
-    const model = curMenuItems.map((item) => ({
-      id: item.id
-    }));
-    await this.customController.saveCustomModelData(model);
-    this.saveConfigs = model;
+  async saveMobCustomMenusModel(items) {
+    await this.customController.saveCustomModelData(items);
+    this.saveConfigs = items;
     if (ibiz.env.isMob) {
+      this.state.mobAuthedMenuItems = this.calcMobCustomSorteItems(
+        this.state.mobAuthedMenuItems
+      );
       this.state.mobMenuItems = this.calcMobCustomVisibleItems(
         this.state.mobAuthedMenuItems
       );
@@ -40415,13 +40415,14 @@ var AppMenuController = class extends ControlController {
    */
   initMobMenuItems() {
     const isDefaultMenu = !this.model.appMenuStyle;
-    const mobAuthedMenuItems = this.calcMobAuthedMenuItems(
+    let mobAuthedMenuItems = this.calcMobAuthedMenuItems(
       this.model.appMenuItems || [],
       isDefaultMenu
     );
     let mobMenuItems = [];
     if (this.model.enableCustomized) {
       if (this.saveConfigs.length > 0) {
+        mobAuthedMenuItems = this.calcMobCustomSorteItems(mobAuthedMenuItems);
         mobMenuItems = this.calcMobCustomVisibleItems(mobAuthedMenuItems);
       } else if (isDefaultMenu) {
         mobMenuItems = mobAuthedMenuItems.slice(0, 4);
@@ -40489,7 +40490,7 @@ var AppMenuController = class extends ControlController {
     }
     items.forEach((item) => {
       var _a3;
-      if (!itemIdMap[item.id])
+      if (!itemIdMap[item.id] || itemIdMap[item.id].hidden)
         return;
       const itemData = { ...item };
       if ((_a3 = item.appMenuItems) == null ? void 0 : _a3.length) {
@@ -40503,6 +40504,43 @@ var AppMenuController = class extends ControlController {
     });
     return customItems;
   }
+  /**
+   * @description 计算移动端自定义模式下菜单项的排序
+   * @private
+   * @param {IAppMenuItem[]} items
+   * @param {IData} [idMap]
+   * @returns {*}  {IAppMenuItem[]}
+   * @memberof AppMenuController
+   */
+  calcMobCustomSorteItems(items, idMap) {
+    const customItems = [];
+    let itemIdMap = idMap;
+    if (!itemIdMap) {
+      itemIdMap = {};
+      this.saveConfigs.forEach((config) => {
+        itemIdMap[config.id] = config;
+      });
+    }
+    items.forEach((item) => {
+      var _a3;
+      const itemData = { ...item };
+      if ((_a3 = item.appMenuItems) == null ? void 0 : _a3.length) {
+        const childItems = this.calcMobCustomSorteItems(
+          item.appMenuItems,
+          itemIdMap
+        );
+        itemData.appMenuItems = childItems;
+      }
+      customItems.push(itemData);
+    });
+    customItems.sort((a, b) => {
+      var _a3, _b2;
+      const orderA = ((_a3 = itemIdMap[a.id]) == null ? void 0 : _a3.order) || 0;
+      const orderB = ((_b2 = itemIdMap[b.id]) == null ? void 0 : _b2.order) || 0;
+      return orderA - orderB;
+    });
+    return customItems;
+  }
   /**
    * 初始化菜单项的适配器
    * @author lxm