bl-common-vue3 3.8.106 → 3.8.108

package/package.json

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

package/src/components/CustomTable/index.vue

@@ -816,7 +816,7 @@
                           <template #title>
                             {{ i18nMapShow(item, ["name"], ["name"]) }}
                           </template>
-                          <template v-for="(child, childIndex) in item.children" :key="child.key">
+                          <template v-for="(child) in item.children" :key="child.key">
                             <a-menu-item v-if="child?.show ?? true" :key="child.key">
                               <a-button v-bind="{ ...(child?.props || {}), }" @click.stop="child?.onClick">
                                 <template #icon v-if="buttonIconSlots.indexOf(`${child.key}`) > -1">
@@ -4056,7 +4056,7 @@ export default defineComponent({
           'dateTimeRangePicker': 'date_time',
           'timeRangePicker': 'time',
         }
-        
+
         if(singleDateInputTypes.includes(input_type)) {
           valueShow = dateFormatMaps[inputTypeFormatMaps[input_type]]?dayjs(value).format(dateFormatMaps[inputTypeFormatMaps[input_type]]):value
         }

package/src/components/VillageTree/index.vue

@@ -900,23 +900,8 @@ export default defineComponent({
           if (build) {
             /* 处理没有楼层的情况 */
             if (noLayer.value) {
-              const room = build.children.find(
-                (item) => item.id == refreshParams.roomId
-              );
-              if (room) {
-                getSubRooms(room, true).then(() => {
-                  if (refreshParams.selected && refreshParams.selected.roomId) {
-                    setSelected(room);
-                  }
-                  state.loadingTree = false;
-                });
-              }
-            } else {
-              const layer = build.children.find(
-                (item) => item.id == refreshParams.layerId
-              );
-              if (layer) {
-                const room = build.children.find(
+              getRoomList(build, true).then(() => {
+                const room = (build.children || []).find(
                   (item) => item.id == refreshParams.roomId
                 );
                 if (room) {
@@ -926,8 +911,35 @@ export default defineComponent({
                     }
                     state.loadingTree = false;
                   });
+                } else {
+                  state.loadingTree = false;
                 }
-              }
+              });
+            } else {
+              getLayerList(build, true).then(() => {
+                const layer = (build.children || []).find(
+                  (item) => item.id == refreshParams.layerId
+                );
+                if (layer) {
+                  getRoomList(layer, true).then(() => {
+                    const room = (layer.children || []).find(
+                      (item) => item.id == refreshParams.roomId
+                    );
+                    if (room) {
+                      getSubRooms(room, true).then(() => {
+                        if (refreshParams.selected && refreshParams.selected.roomId) {
+                          setSelected(room);
+                        }
+                        state.loadingTree = false;
+                      });
+                    } else {
+                      state.loadingTree = false;
+                    }
+                  });
+                } else {
+                  state.loadingTree = false;
+                }
+              });
             }
 
           }
@@ -949,17 +961,21 @@ export default defineComponent({
             }
           })
           if (build) {
-            const layer = build.children.find(
-              (item) => item.id == refreshParams.layerId
-            );
-            if (layer) {
-              getRoomList(layer, true).then(() => {
-                if (refreshParams.selected && refreshParams.selected.layerId) {
-                  setSelected(layer);
-                }
+            getLayerList(build, true).then(() => {
+              const layer = (build.children || []).find(
+                (item) => item.id == refreshParams.layerId
+              );
+              if (layer) {
+                getRoomList(layer, true).then(() => {
+                  if (refreshParams.selected && refreshParams.selected.layerId) {
+                    setSelected(layer);
+                  }
+                  state.loadingTree = false;
+                });
+              } else {
                 state.loadingTree = false;
-              });
-            }
+              }
+            });
           }
         }
       } else if (refreshParams.buildId) {