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

package/package.json

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

package/src/components/baseArea/index.vue

@@ -55,7 +55,8 @@
                 v-if="index > 0"
                 :key="'sep-' + index"
                 class="base-area-path-sep"
-              >/</span>
+                >/</span
+              >
               <span
                 :key="'tab-' + index"
                 class="base-area-tab"
@@ -65,7 +66,8 @@
                   disabled: !isTabEnabled(index + 1),
                 }"
                 @click="switchLevel(index + 1)"
-              >{{ getTabLabel(tab) }}</span>
+                >{{ getTabLabel(tab) }}</span
+              >
             </template>
           </div>
         </div>
@@ -80,7 +82,10 @@
             >
               <span>{{ item.name }}</span>
             </div>
-            <div v-if="!browseLoading && !levelItems.length" class="base-area-empty">
+            <div
+              v-if="!browseLoading && !levelItems.length"
+              class="base-area-empty"
+            >
               {{ emptyText }}
             </div>
           </div>
@@ -248,10 +253,7 @@ export default {
     },
     showClearIcon() {
       return (
-        this.clearable &&
-        !this.readonly &&
-        !this.disabled &&
-        !!this.displayText
+        this.clearable && !this.readonly && !this.disabled && !!this.displayText
       );
     },
     canPrevLevel() {
@@ -316,7 +318,10 @@ export default {
       }
       const str = String(val).trim();
       if (this.isLegacyPathValue(str)) {
-        const parts = str.split(",").map((part) => part.trim()).filter(Boolean);
+        const parts = str
+          .split(",")
+          .map((part) => part.trim())
+          .filter(Boolean);
         return parts.length ? parts[parts.length - 1] : null;
       }
       return str;
@@ -620,10 +625,7 @@ export default {
       if (token !== this.syncToken || this.hasDisplayLabel()) {
         return;
       }
-      const label =
-        (area && area.fullName) ||
-        (area && area.name) ||
-        null;
+      const label = (area && area.fullName) || (area && area.name) || null;
       if (label) {
         this.$emit("update:labelValue", label);
       }
@@ -685,7 +687,7 @@ export default {
     requestAreaList(extra = {}) {
       return new Promise((resolve) => {
         this.$http({
-          url: USER_PREFIX + "/area/list",
+          url: USER_PREFIX + "/area/listPage",
           method: "post",
           data: this.getAreaRequestData(extra),
           success: (res) => resolve(this.normalizeAreaRows(res)),
@@ -744,12 +746,20 @@ export default {
     },
     buildAreaPath(item, depthLimit) {
       const limit = depthLimit == null ? this.maxLevel : depthLimit;
-      if (item.pathList && Array.isArray(item.pathList) && item.pathList.length > 1) {
+      if (
+        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) {
+      if (
+        item.areaPath &&
+        Array.isArray(item.areaPath) &&
+        item.areaPath.length > 1
+      ) {
         if (this.isAreaObject(item.areaPath[0])) {
           return item.areaPath.slice(0, limit);
         }
@@ -980,7 +990,10 @@ export default {
     },
     async syncBrowseStateFromPathIds(ids) {
       const token = ++this.syncToken;
-      const depthLimit = Math.min(Math.max(ids.length, this.maxLevel, 1), MAX_AREA_DEPTH);
+      const depthLimit = Math.min(
+        Math.max(ids.length, this.maxLevel, 1),
+        MAX_AREA_DEPTH
+      );
       const path = await this.resolvePathByIds(ids, depthLimit);
       if (token !== this.syncToken) {
         return;
@@ -1022,7 +1035,7 @@ export default {
     },
     doSearch(keyword) {
       this.searchLoading = true;
-      this.requestAreaList({ name: keyword }).then((rows) => {
+      this.requestAreaList({ fullName: keyword, size: 20 }).then((rows) => {
         this.searchList = rows;
         this.searchLoading = false;
       });