bl-common-vue3 3.8.114 → 3.8.115

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bl-common-vue3",
-  "version": "3.8.114",
+  "version": "3.8.115",
   "main": "index.js",
   "module": "index.js",
   "description": "bailing vue3 common components lib",

package/src/components/VillageTree/index.vue

@@ -31,7 +31,7 @@
             <bl-icon v-if="dataRef.slotIcon === 'topCompanyIcon'" type="tree-jigou" class="tree-icon" />
             <GoldenFilled v-if="dataRef.slotIcon === 'departmentIcon'" class="tree-icon" />
             <bl-icon v-if="dataRef.slotIcon === 'villageIcon'" type="tree-xiangmu" class="tree-icon" />
-            <bl-icon v-if="dataRef.slotIcon === 'buildIcon'" :type="getIcon('buildIcon')" class="tree-icon" />
+            <bl-icon v-if="dataRef.slotIcon === 'buildIcon'" :type="getIcon('buildIcon', dataRef)" class="tree-icon" />
             <bl-icon v-if="dataRef.slotIcon === 'layerIcon'" :type="getIcon('layerIcon')" class="tree-icon" />
             <bl-icon v-if="dataRef.slotIcon === 'roomIcon'" :type="getIcon('roomIcon')" class="tree-icon" />
           </template>
@@ -87,6 +87,9 @@ import utils from "../../common/utils/util";
 import { ROOM_TYPE_ICONS } from "../../common/utils/constant";
 import {t, loadLanguageAsync} from "../../locale";
 
+const VENUE_BUILD_TYPE = 1;
+const isVenueBuild = (buildType) => Number(buildType) === VENUE_BUILD_TYPE;
+
 export default defineComponent({
   name: "VillageTree",
   props: {
@@ -187,12 +190,11 @@ export default defineComponent({
       return props.roomType?.length && props.roomType.every((v) => [4, 5].includes(Number(v)))
     });
 
-    const getIcon = (type) => {
-      let icon = ROOM_TYPE_ICONS.default[type];
-      if (props.iconType) {
-        icon = ROOM_TYPE_ICONS[props.iconType] ? ROOM_TYPE_ICONS[props.iconType][type] : ROOM_TYPE_ICONS.default[type];
-      }
-      return icon;
+    const getIcon = (type, data = {}) => {
+      const iconType = type === "buildIcon" && isVenueBuild(data.build_type)
+        ? "area"
+        : props.iconType;
+      return ROOM_TYPE_ICONS[iconType]?.[type] || ROOM_TYPE_ICONS.default[type];
     };
 
     /** 点击选中当前项 */
@@ -539,10 +541,11 @@ export default defineComponent({
                   type_txt: village.type_txt,
                 },
                 slotIcon: "buildIcon",
-                isLeaf: props.display == 2 ? true : false,
+                // 场地没有楼层层级，作为叶子节点展示，避免继续请求楼层数据。
+                isLeaf: isVenueBuild(build.build_type) || props.display == 2,
                 disabled : props.isdisabledNumber ? ( props.isdisabledNumber == 2 ? false : true ) : false,
               };
-              const match = regExp.exec(build.build_name);
+              const match = isVenueBuild(build.build_type) ? null : regExp.exec(build.build_name);
               if (match) {
                 const group1 = match[1]; // 提取"数字栋"
                 if (group1.length >= 2 && build.build_name.slice(group1.length).length > 0) {