bl-common-vue3 3.8.128 → 3.8.130

package/package.json

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

package/src/components/ChooseHousingResources/index.vue

@@ -1045,7 +1045,9 @@ export default defineComponent({
       let checkedKeys = getInitKeys(initKeys, "village");
       let forCount = 0
       const setResult = (key, value) => {
-        result[key].push(value);
+        if (value != null) {
+          result[key].push(value);
+        }
         let totalLength = 0;
         for (let key in result) {
           totalLength += result[key].length;
@@ -1139,11 +1141,11 @@ export default defineComponent({
                       if (arrKey.length == 8) {
                         setResult("roomList", room)
                         // 如果 showSub 为 true 且该房间有子房间，获取子房间并加入结果
-                        if (props.showSub &&room.sub_room_count > 0) {
+                        if (room && props.showSub && room.sub_room_count > 0) {
                           await getSubRooms(room);
                           if (room.children && room.children.length) {
                             room.children.forEach(subRoom => {
-                              if (!subRoom.disabled) {
+                              if (subRoom && !subRoom.disabled) {
                                 setResult("roomList", subRoom);
                               }
                             });
@@ -1176,7 +1178,9 @@ export default defineComponent({
                     (item) => item.id == roomId
                   );
                   if (arrKey.length == 6) {
-                    state.selectedKeys.push(room.key)
+                    if (room) {
+                      state.selectedKeys.push(room.key)
+                    }
                     setResult("roomList", room);
                   } else {
                     if (arrKey.length == 8) {
@@ -1311,11 +1315,11 @@ export default defineComponent({
                   // 如果 showSub 为 true，遍历每个房间获取子房间
                   if (props.showSub) {
                     for (let room of list) {
-                      if (!room.isLeaf || room.sub_room_count > 0) {
+                      if (!room?.isLeaf || room?.sub_room_count > 0) {
                         await getSubRooms(room);
                         if (room.children && room.children.length) {
                           room.children.forEach(subRoom => {
-                            if (!subRoom.disabled) {
+                            if (subRoom && !subRoom.disabled) {
                               result.roomList.push(subRoom);
                             }
                           });
@@ -1334,6 +1338,7 @@ export default defineComponent({
               return index === firstIndex;
             });
             // 去重
+            result.roomList = result.roomList.filter(Boolean)
             if (result.roomList && result.roomList.length > 0) {
               result.roomList = Array.from(new Set(result.roomList.map(item => item.id)))
                   .map(id => result.roomList.find(item => item.id === id));
@@ -1343,11 +1348,11 @@ export default defineComponent({
             // 如果没有选中楼层但选中了房间，且 showSub 为 true，也需要处理子房间
             emit("getloading", 1);
             for (let room of result.roomList) {
-              if (!room.isLeaf || room.sub_room_count > 0) {
+              if (room&&(!room?.isLeaf || room?.sub_room_count > 0)) {
                 await getSubRooms(room);
-                if (room.children && room.children.length) {
+                if (room?.children && room.children?.length) {
                   room.children.forEach(subRoom => {
-                    if (!subRoom.disabled) {
+                    if (subRoom && !subRoom.disabled) {
                       result.roomList.push(subRoom);
                     }
                   });
@@ -1355,6 +1360,7 @@ export default defineComponent({
               }
             }
             // 去重
+            result.roomList = result.roomList.filter(Boolean);
             if (result.roomList && result.roomList.length > 0) {
               result.roomList = Array.from(new Set(result.roomList.map(item => item.id)))
                   .map(id => result.roomList.find(item => item.id === id));
@@ -1769,6 +1775,10 @@ export default defineComponent({
     // 获取子房间
     const getSubRooms = (room) => {
       return new Promise((resolve) => {
+        if (!room) {
+          resolve( []);
+          return;
+        }
         if (room.isLeaf || (room.children && room.children.length)) {
           resolve(room.children || []);
           return;

package/src/components/VillageTree/index.vue

@@ -613,7 +613,7 @@ export default defineComponent({
                       slotIcon: "buildIcon",
                       isLeaf: false,
                     });
-                    if (!(props.showCompany && villageList.length > 1)) {
+                    if (totalVillageCount === 1) {
                       state.expandedKeys.push(`${village.key}_buildLevel_${build.id}`);
                     }
                   }
@@ -873,7 +873,7 @@ export default defineComponent({
                         slotIcon: "buildIcon",
                         isLeaf: false,
                       });
-                      if (buildId == build.id && !(state.expandedKeys || []).includes(`${v.key}_buildLevel_${build.id}`)) {
+                      if (buildId == build.id && state.expandedKeys.includes(v.key) && !state.expandedKeys.includes(`${v.key}_buildLevel_${build.id}`)) {
                         state.expandedKeys.push(`${v.key}_buildLevel_${build.id}`)
                       }
                     }