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

package/package.json

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

package/src/components/baseArea/index.vue

@@ -261,8 +261,8 @@ export default {
     },
     canNextLevel() {
       return (
-        this.activeLevel < this.browseLevelCount
-        && this.isTabEnabled(this.activeLevel + 1)
+        this.activeLevel < this.browseLevelCount &&
+        this.isTabEnabled(this.activeLevel + 1)
       );
     },
     browseLevelCount() {
@@ -337,10 +337,10 @@ export default {
     },
     isLegacyPathValue(val) {
       return (
-        this.valueFormat === "path"
-        && val != null
-        && String(val).includes(",")
-        && !String(val).startsWith(",")
+        this.valueFormat === "path" &&
+        val != null &&
+        String(val).includes(",") &&
+        !String(val).startsWith(",")
       );
     },
     parseTreePathIds(treePath) {
@@ -416,8 +416,8 @@ export default {
     },
     formatAreaPathResult(value, path, label) {
       const result = this.createEmptyAreaPathResult(value);
-      result.label
-        = label != null && label !== ""
+      result.label =
+        label != null && label !== ""
           ? label
           : this.buildPathLabel(path) || this.labelValue || null;
       result.path = path || [];
@@ -451,10 +451,10 @@ export default {
       const leafId = this.getLeafIdFromValue(val);
       let path = null;
       if (
-        leafId != null
-        && this.isValueSynced(leafId)
-        && !this.shouldResyncBrowsePath()
-        && this.selectedPath.length
+        leafId != null &&
+        this.isValueSynced(leafId) &&
+        !this.shouldResyncBrowsePath() &&
+        this.selectedPath.length
       ) {
         path = this.selectedPath.map((item) => ({ ...item }));
       }
@@ -747,18 +747,18 @@ export default {
     buildAreaPath(item, depthLimit) {
       const limit = depthLimit == null ? this.maxLevel : depthLimit;
       if (
-        item.pathList
-        && Array.isArray(item.pathList)
-        && item.pathList.length > 1
+        item.pathList &&
+        Array.isArray(item.pathList) &&
+        item.pathList.length > 1
       ) {
         if (this.isAreaObject(item.pathList[0])) {
           return item.pathList.slice(0, limit);
         }
       }
       if (
-        item.areaPath
-        && Array.isArray(item.areaPath)
-        && item.areaPath.length > 1
+        item.areaPath &&
+        Array.isArray(item.areaPath) &&
+        item.areaPath.length > 1
       ) {
         if (this.isAreaObject(item.areaPath[0])) {
           return item.areaPath.slice(0, limit);
@@ -868,8 +868,8 @@ export default {
       if (this.isPathResolvedForItem(parentPath, item)) {
         return parentPath;
       }
-      const depthLimit
-        = options.depthLimit != null
+      const depthLimit =
+        options.depthLimit != null
           ? options.depthLimit
           : this.getResolveDepthLimit(item);
       if (item.treePath) {
@@ -925,10 +925,10 @@ export default {
       const token = ++this.syncToken;
       let seed = item || {};
       if (
-        seed.id != null
-        && !seed.fullName
-        && !seed.name
-        && !this.getParentIdFromRow(seed)
+        seed.id != null &&
+        !seed.fullName &&
+        !seed.name &&
+        !this.getParentIdFromRow(seed)
       ) {
         const detail = await this.fetchAreaById(seed.id);
         if (detail) {
@@ -1035,7 +1035,7 @@ export default {
     },
     doSearch(keyword) {
       this.searchLoading = true;
-      this.requestAreaList({ name: keyword, size: 20 }).then((rows) => {
+      this.requestAreaList({ fullName: keyword, size: 20 }).then((rows) => {
         this.searchList = rows;
         this.searchLoading = false;
       });
@@ -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);
           }
         }