Merge branch 'master' into pre

components/image-preview.vue

@@ -8,7 +8,7 @@
         width="90%"
         width="90%"
     >
     >
         <div class="d-flex flex-column">
         <div class="d-flex flex-column">
-            <div class="d-flex justify-content-center">
+            <div class="d-flex justify-content-center align-items-start">
                 <img v-if="file" :src="file.url" />
                 <img v-if="file" :src="file.url" />
                 <i class="el-icon-close" @click="close"></i>
                 <i class="el-icon-close" @click="close"></i>
             </div>
             </div>

store/index.ts

@@ -433,7 +433,7 @@ export default {
         },
         },
     },
     },
     actions: {
     actions: {
-        async [ChatStore.ACTION_GET_MY_CHAT_LIST]({ commit, dispatch }) {
+        async [ChatStore.ACTION_GET_MY_CHAT_LIST]({ commit, dispatch, state }) {
             commit(ChatStore.MUTATION_SAVE_MYSELF_ID);
             commit(ChatStore.MUTATION_SAVE_MYSELF_ID);
 
 
             if (loadingChatList) {
             if (loadingChatList) {
@@ -465,7 +465,8 @@ export default {
                                 );
                                 );
                                 dispatch(
                                 dispatch(
                                     ChatStore.ACTION_REBUILD_UNREAD_MESSAGE_COUNT
                                     ChatStore.ACTION_REBUILD_UNREAD_MESSAGE_COUNT
-                                ).finally(resolve);
+                                );
+                                resolve(items);
                             })
                             })
                             .catch(reject);
                             .catch(reject);
                     });
                     });
@@ -473,11 +474,13 @@ export default {
 
 
             return await execute().then((d) => clearAction(d));
             return await execute().then((d) => clearAction(d));
         },
         },
-        async [ChatStore.ACTION_REBUILD_UNREAD_MESSAGE_COUNT]({ state }) {
-            let items = await dbController.getChatList();
+        [ChatStore.ACTION_REBUILD_UNREAD_MESSAGE_COUNT]({ state }) {
+            const items = state[ChatStore.STATE_MY_CHAT_ROOM_LIST];
+            if (items) {
                 let sum = 0;
                 let sum = 0;
                 items.forEach((i) => (sum += i.unread_msg_count));
                 items.forEach((i) => (sum += i.unread_msg_count));
                 state[ChatStore.STATE_CURRENT_UNREAD_MESSAGE_COUNT] = sum;
                 state[ChatStore.STATE_CURRENT_UNREAD_MESSAGE_COUNT] = sum;
+            }
         },
         },
         async [ChatStore.ACTION_UPDATE_CHAT_UNREAD_MESSAGE_COUNT](
         async [ChatStore.ACTION_UPDATE_CHAT_UNREAD_MESSAGE_COUNT](
             { dispatch, state },
             { dispatch, state },