Merge pull request #90 from running-elephant/dev

Dev

Author: Cuiyansong

frontend/package.json

@@ -211,7 +211,9 @@
     "webpackbar": "5.0.2"
   },
   "resolutions": {
-    "react-error-overlay": "6.0.9"
+    "react-error-overlay": "6.0.9",
+    "@types/react": "17.0.38",
+    "@types/react-dom": "17.0.11"
   },
   "config": {
     "commitizen": {

frontend/src/app/pages/DashBoardPage/pages/Board/slice/index.ts

@@ -210,7 +210,10 @@ const boardSlice = createSlice({
       action: PayloadAction<{ boardId: string; wh: [number, number] }>,
     ) {
       const { boardId, wh } = action.payload;
-      state.boardInfoRecord[boardId].boardWidthHeight = wh;
+      let boardInfo = state.boardInfoRecord?.[boardId];
+      if (boardInfo) {
+        state.boardInfoRecord[boardId].boardWidthHeight = wh;
+      }
     },
     changeBoardPublish(
       state,

frontend/src/app/pages/DashBoardPage/utils/board.ts

@@ -220,7 +220,7 @@ export const isElView = el => {
   // bottom 元素底部端到可见区域顶端的距离
   var viewHeight = window.innerHeight || document.documentElement.clientHeight; // 浏览器可见区域高度。
 
-  if (top < viewHeight && bottom > 0) {
+  if (top <= viewHeight && bottom >= 0) {
     bool = true;
   } else if (top >= viewHeight || bottom <= 0) {
     bool = false;

frontend/src/app/pages/MainPage/pages/VizPage/Main/index.tsx

@@ -3,6 +3,7 @@ import { EmptyFiller, TabPane, Tabs } from 'app/components';
 import useI18NPrefix from 'app/hooks/useI18NPrefix';
 import BoardEditor from 'app/pages/DashBoardPage/pages/BoardEditor';
 import { selectOrgId } from 'app/pages/MainPage/slice/selectors';
+import { dispatchResize } from 'app/utils/dispatchResize';
 import { useCallback, useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import {
@@ -120,6 +121,9 @@ export function Main({ sliderVisible }: { sliderVisible: boolean }) {
           `/organizations/${orgId}/vizs/${activeKey}${activeTab.search || ''}`,
         );
       }
+      setTimeout(() => {
+        dispatchResize();
+      }, 500);
     },
     [history, orgId, tabs],
   );

frontend/src/locales/i18n.ts

@@ -24,16 +24,14 @@ export const translationsJson = {
 convertLanguageJsonToObject(en);
 
 export const changeLang = lang => {
-  i18next.changeLanguage(lang);
-  requestInstance.defaults.headers['Accept-Language'] =
-    lang === 'zh' ? 'zh-CN' : 'en-US'; // FIXME locale
   localStorage.setItem(StorageKeys.Locale, lang);
-  moment.locale(lang === 'zh' ? 'zh-cn' : 'en-us'); // FIXME locale
   window.location && window.location.reload();
 };
 
 const initialLocale = getInitialLocale();
-moment.locale(initialLocale);
+requestInstance.defaults.headers['Accept-Language'] =
+  initialLocale === 'zh' ? 'zh-CN' : 'en-US'; // FIXME locale
+moment.locale(initialLocale === 'zh' ? 'zh-cn' : 'en-us'); // FIXME locale
 
 export const i18n = i18next
   // pass the i18n instance to react-i18next.