cloud-web-corejs 1.0.54-dev.684 → 1.0.54-dev.685

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.684",
+  "version": "1.0.54-dev.685",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/baseArea/index.vue

@@ -1108,8 +1108,28 @@ export default {
         });
       });
     },
+    async clampPathToMaxLevel(path) {
+      if (!path || !path.length || path.length <= this.maxLevel) {
+        return path || [];
+      }
+      const trimmed = path.slice(0, this.maxLevel);
+      const last = trimmed[trimmed.length - 1];
+      const id = this.getAreaId(last);
+      if (id != null && (!last.name || !last.fullName)) {
+        const detail = await this.fetchAreaById(id);
+        if (detail) {
+          trimmed[trimmed.length - 1] = detail;
+        }
+      }
+      return trimmed;
+    },
     async applySelection(item) {
-      const path = this.selectedPath.length ? this.selectedPath : [item];
+      let path = this.selectedPath.length
+        ? this.selectedPath.map((node) => ({ ...node }))
+        : [item];
+      path = await this.clampPathToMaxLevel(path);
+      this.selectedPath = path.map((node) => ({ ...node }));
+      this.activeLevel = path.length || 1;
       let last = path[path.length - 1] || item;
       const leafId = this.getAreaId(last);
       if (leafId != null && !last.fullName) {
@@ -1117,6 +1137,8 @@ export default {
         if (detail) {
           last = detail;
           if (path.length) {
+            path = path.slice();
+            path[path.length - 1] = detail;
             this.$set(this.selectedPath, this.selectedPath.length - 1, detail);
           }
         }