Merge pull request #94 from running-elephant/dev

Cuiyansong · web-flow · commit b2bd7f0cd330 · 2022-04-20T10:40:51.000+08:00
Dev
diff --git a/frontend/src/app/components/ChartDrill/ChartDrillPaths.tsx b/frontend/src/app/components/ChartDrill/ChartDrillPaths.tsx
@@ -64,7 +64,6 @@ export default ChartDrillPaths;
 
 const StyledChartDrillPaths = styled.div`
   padding: ${SPACE_XS} ${SPACE_SM};
-  background-color: ${p => p.theme.componentBackground};
 `;
 
 const StyledDrillNode = styled(Breadcrumb.Item)<{ isActive: boolean }>`
diff --git a/frontend/src/app/components/ChartEditor.tsx b/frontend/src/app/components/ChartEditor.tsx
@@ -212,7 +212,10 @@ export const ChartEditor: FC<ChartEditorProps> = ({
         {
           name: 'click',
           callback: param => {
-            if (drillOptionRef.current?.isSelectedDrill) {
+            if (
+              drillOptionRef.current?.isSelectedDrill &&
+              !drillOptionRef.current.isBottomLevel
+            ) {
               const option = drillOptionRef.current;
               option.drillDown(param.data.rowData);
               drillOptionRef.current = option;
diff --git a/frontend/src/app/pages/DashBoardPage/actions/widgetAction.ts b/frontend/src/app/pages/DashBoardPage/actions/widgetAction.ts
@@ -17,7 +17,6 @@
  */
 import { urlSearchTransfer } from 'app/pages/MainPage/pages/VizPage/utils';
 import { ChartMouseEventParams } from 'app/types/Chart';
-import { History } from 'history';
 import i18next from 'i18next';
 import { RootState } from 'types';
 import { jumpTypes } from '../constants';
@@ -106,13 +105,14 @@ export const tableChartClickAction =
   };
 
 export const widgetClickJumpAction =
-  (
-    renderMode: VizRenderMode,
-    widget: Widget,
-    params: ChartMouseEventParams,
-    history: History,
-  ) =>
+  (obj: {
+    renderMode: VizRenderMode;
+    widget: Widget;
+    params: ChartMouseEventParams;
+    history: any;
+  }) =>
   (dispatch, getState) => {
+    const { renderMode, widget, params, history } = obj;
     const state = getState() as RootState;
     const orgId = state?.main?.orgId || '';
     const folderIds = state.viz?.vizs?.map(v => v.relId) || [];
@@ -245,15 +245,16 @@ export const widgetClickLinkageAction =
   };
 //
 export const widgetChartClickAction =
-  (
-    boardId: string,
-    editing: boolean,
-    renderMode: VizRenderMode,
-    widget: Widget,
-    params: ChartMouseEventParams,
-    history: History,
-  ) =>
+  (obj: {
+    boardId: string;
+    editing: boolean;
+    renderMode: VizRenderMode;
+    widget: Widget;
+    params: ChartMouseEventParams;
+    history: any;
+  }) =>
   dispatch => {
+    const { boardId, editing, renderMode, widget, params, history } = obj;
     //is tableChart
     if (
       params.componentType === 'table' &&
@@ -267,7 +268,7 @@ export const widgetChartClickAction =
     // jump
     const jumpConfig = widget.config?.jumpConfig;
     if (jumpConfig && jumpConfig.open) {
-      dispatch(widgetClickJumpAction(renderMode, widget, params, history));
+      dispatch(widgetClickJumpAction({ renderMode, widget, params, history }));
       return;
     }
     // linkage
diff --git a/frontend/src/app/pages/DashBoardPage/components/ActionProvider/WidgetActionProvider.tsx b/frontend/src/app/pages/DashBoardPage/components/ActionProvider/WidgetActionProvider.tsx
@@ -77,7 +77,7 @@ export const WidgetActionProvider: FC<{
   renderMode: VizRenderMode;
 }> = memo(({ boardEditing, boardId, orgId, renderMode, children }) => {
   const dispatch = useDispatch();
-  const history = useHistory();
+  const history = useHistory<any>();
   const methods = useMemo(() => {
     const contextValue: WidgetActionContextProps = {
       onEditLayerToTop: () => {
@@ -178,14 +178,14 @@ export const WidgetActionProvider: FC<{
       //
       onWidgetChartClick: (widget: Widget, params: ChartMouseEventParams) => {
         dispatch(
-          widgetChartClickAction(
+          widgetChartClickAction({
             boardId,
-            boardEditing,
+            editing: boardEditing,
             renderMode,
             widget,
             params,
             history,
-          ),
+          }),
         );
       },
 
diff --git a/frontend/src/app/pages/DashBoardPage/components/BoardDrillManager/BoardDrillManager.ts b/frontend/src/app/pages/DashBoardPage/components/BoardDrillManager/BoardDrillManager.ts
@@ -1,5 +1,3 @@
-import { ChartDrillOption } from 'app/models/ChartDrillOption';
-
 /**
  * Datart
  *
@@ -17,7 +15,9 @@ import { ChartDrillOption } from 'app/models/ChartDrillOption';
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { ChartDrillOption } from 'app/models/ChartDrillOption';
 type WidgetDrillMap = Record<string, ChartDrillOption | undefined>;
+export const EDIT_PREFIX = '@EDIT@';
 export class BoardDrillManager {
   private static _manager: BoardDrillManager;
   private boardMap: Record<string, WidgetDrillMap> = {};
@@ -59,4 +59,3 @@ export class BoardDrillManager {
 }
 
 export const boardDrillManager = BoardDrillManager.getInstance();
-export const EDIT_PREFIX = '@EDIT@';
diff --git a/frontend/src/app/pages/DashBoardPage/components/FreeBoardBackground.tsx b/frontend/src/app/pages/DashBoardPage/components/FreeBoardBackground.tsx
@@ -22,7 +22,7 @@ import StyledBackground from '../pages/Board/components/StyledBackground';
 import { BoardConfigContext } from './BoardProvider/BoardConfigProvider';
 import { BoardContext } from './BoardProvider/BoardProvider';
 
-export const scaleContext = createContext<[number, number]>([1, 1]);
+export const BoardScaleContext = createContext<[number, number]>([1, 1]);
 export interface IProps {
   scale: [number, number];
   slideTranslate: [number, number];
@@ -60,9 +60,9 @@ const SlideBackground: React.FC<IProps> = props => {
 
   return (
     <Wrapper bg={background} style={slideStyle} editing={editing}>
-      <scaleContext.Provider value={scale}>
+      <BoardScaleContext.Provider value={scale}>
         {props.children}
-      </scaleContext.Provider>
+      </BoardScaleContext.Provider>
     </Wrapper>
   );
 };
diff --git a/frontend/src/app/pages/DashBoardPage/components/Widgets/DataChartWidget/DataChartWidgetCore.tsx b/frontend/src/app/pages/DashBoardPage/components/Widgets/DataChartWidget/DataChartWidgetCore.tsx
@@ -40,19 +40,20 @@ import React, {
   useRef,
 } from 'react';
 import styled from 'styled-components/macro';
-import { BORDER_RADIUS } from 'styles/StyleConstants';
 import { WidgetActionContext } from '../../ActionProvider/WidgetActionProvider';
 import {
   boardDrillManager,
   EDIT_PREFIX,
 } from '../../BoardDrillManager/BoardDrillManager';
 import { BoardContext } from '../../BoardProvider/BoardProvider';
+import { BoardScaleContext } from '../../FreeBoardBackground';
 import { WidgetChartContext } from '../../WidgetProvider/WidgetChartProvider';
 import { WidgetDataContext } from '../../WidgetProvider/WidgetDataProvider';
 import { WidgetContext } from '../../WidgetProvider/WidgetProvider';
 
 export const DataChartWidgetCore: React.FC<{}> = memo(() => {
   const dataChart = useContext(WidgetChartContext);
+  const scale = useContext(BoardScaleContext);
   const { data } = useContext(WidgetDataContext);
   const { renderMode } = useContext(BoardContext);
   const widget = useContext(WidgetContext);
@@ -78,11 +79,7 @@ export const DataChartWidgetCore: React.FC<{}> = memo(() => {
       let drillOption;
       drillOption = option;
       drillOptionRef.current = drillOption;
-      boardDrillManager.setWidgetDrill({
-        bid,
-        wid,
-        drillOption,
-      });
+      boardDrillManager.setWidgetDrill({ bid, wid, drillOption });
       onWidgetGetData(widgetRef.current);
     },
 
@@ -215,37 +212,36 @@ export const DataChartWidgetCore: React.FC<{}> = memo(() => {
         drillOption={drillOption}
         containerId={wid}
         widgetSpecialConfig={widgetSpecialConfig}
+        scale={scale}
       />
     );
   }, [
     config,
     cacheH,
     cacheW,
     errText,
-    drillOptionRef,
-    wid,
     dataset,
     chart,
+    wid,
     widgetSpecialConfig,
+    scale,
   ]);
 
   return (
     <Wrapper id={renderMode + wid} className="widget-chart" ref={ref}>
       <ChartFrameBox>
-        <PreviewBlock>
-          <ChartDrillContext.Provider
-            value={{
-              drillOption: drillOptionRef.current,
-              onDrillOptionChange: handleDrillOptionChange,
-            }}
-          >
-            <ChartWrapper>
-              <ChartDrillContextMenu>{chartFrame}</ChartDrillContextMenu>
-            </ChartWrapper>
+        <ChartDrillContext.Provider
+          value={{
+            drillOption: drillOptionRef.current,
+            onDrillOptionChange: handleDrillOptionChange,
+          }}
+        >
+          <ChartWrapper>
+            <ChartDrillContextMenu>{chartFrame}</ChartDrillContextMenu>
+          </ChartWrapper>
 
-            <ChartDrillPaths />
-          </ChartDrillContext.Provider>
-        </PreviewBlock>
+          <ChartDrillPaths />
+        </ChartDrillContext.Provider>
       </ChartFrameBox>
     </Wrapper>
   );
@@ -257,6 +253,9 @@ const Wrapper = styled.div`
 `;
 const ChartFrameBox = styled.div`
   position: absolute;
+  display: flex;
+  flex: 1;
+  flex-direction: column;
   width: 100%;
   height: 100%;
   overflow: hidden;
@@ -265,18 +264,7 @@ const ChartWrapper = styled.div`
   position: relative;
   display: flex;
   flex: 1;
-  background-color: ${p => p.theme.componentBackground};
-  border-radius: ${BORDER_RADIUS};
   .chart-drill-menu-container {
     height: 100%;
   }
 `;
-const PreviewBlock = styled.div`
-  display: flex;
-  flex: 1;
-  flex-direction: column;
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-  box-shadow: ${p => p.theme.shadowBlock};
-`;
diff --git a/frontend/src/app/pages/DashBoardPage/pages/Board/index.tsx b/frontend/src/app/pages/DashBoardPage/pages/Board/index.tsx
@@ -23,6 +23,7 @@ import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
 import { useDispatch, useSelector } from 'react-redux';
 import styled from 'styled-components/macro';
+import { boardDrillManager } from '../../components/BoardDrillManager/BoardDrillManager';
 import { TitleHeader } from '../../components/BoardHeader/TitleHeader';
 import { BoardLoading } from '../../components/BoardLoading';
 import { BoardInitProvider } from '../../components/BoardProvider/BoardInitProvider';
@@ -151,6 +152,7 @@ export const Board: FC<BoardProps> = memo(
       // 销毁组件 清除该对象缓存
       return () => {
         dispatch(boardActions.clearBoardStateById(boardId));
+        boardDrillManager.clearMapByBoardId(boardId);
       };
     }, [boardId, dispatch, fetchData, searchParams]);
 
diff --git a/frontend/src/app/pages/DashBoardPage/pages/BoardEditor/FreeEditor/WidgetOfFreeEdit.tsx b/frontend/src/app/pages/DashBoardPage/pages/BoardEditor/FreeEditor/WidgetOfFreeEdit.tsx
@@ -34,7 +34,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import { Resizable, ResizeCallbackData } from 'react-resizable';
 import styled from 'styled-components/macro';
 import { WidgetActionContext } from '../../../components/ActionProvider/WidgetActionProvider';
-import { scaleContext } from '../../../components/FreeBoardBackground';
+import { BoardScaleContext } from '../../../components/FreeBoardBackground';
 import { editBoardStackActions } from '../slice';
 import { widgetMove, widgetMoveEnd } from '../slice/events';
 import { selectSelectedIds } from '../slice/selectors';
@@ -48,7 +48,7 @@ export const WidgetOfFreeEdit: React.FC<{}> = () => {
   const { onUpdateWidgetConfig } = useContext(WidgetActionContext);
 
   const dispatch = useDispatch();
-  const scale = useContext(scaleContext);
+  const scale = useContext(BoardScaleContext);
   const { x, y, width, height } = widget.config.rect;
   const [curXY, setCurXY] = useState<[number, number]>([
     widget.config.rect.x,
diff --git a/frontend/src/app/pages/DashBoardPage/pages/BoardEditor/index.tsx b/frontend/src/app/pages/DashBoardPage/pages/BoardEditor/index.tsx
@@ -24,6 +24,10 @@ import { useHistory } from 'react-router-dom';
 import styled from 'styled-components/macro';
 import { LEVEL_50 } from 'styles/StyleConstants';
 import { uuidv4 } from 'utils/utils';
+import {
+  boardDrillManager,
+  EDIT_PREFIX,
+} from '../../components/BoardDrillManager/BoardDrillManager';
 import EditorHeader from '../../components/BoardHeader/EditorHeader';
 import { BoardLoading } from '../../components/BoardLoading';
 import { BoardInitProvider } from '../../components/BoardProvider/BoardInitProvider';
@@ -142,12 +146,13 @@ export const BoardEditor: React.FC<{
   useEffect(() => {
     initialization();
     return () => {
-      console.log('__ 销毁 ed');
       // fix issue: #800
       onCloseChartEditor();
       dispatch(clearEditBoardState());
       //销毁时  更新view界面数据
       dispatch(fetchBoardDetail({ dashboardRelId: boardId }));
+      //
+      boardDrillManager.clearMapByBoardId(EDIT_PREFIX + boardId);
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [onCloseChartEditor]);
diff --git a/frontend/src/app/pages/LoginPage/LoginForm.tsx b/frontend/src/app/pages/LoginPage/LoginForm.tsx
@@ -24,7 +24,7 @@ import {
   selectLoginLoading,
   selectOauth2Clients,
 } from 'app/slice/selectors';
-import { getOauth2Clients, tryOauth } from 'app/slice/thunks';
+import { getOauth2Clients } from 'app/slice/thunks';
 import React, { useCallback, useEffect, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { Link, useHistory } from 'react-router-dom';
@@ -64,10 +64,6 @@ export function LoginForm({
     dispatch(getOauth2Clients());
   }, [dispatch]);
 
-  useEffect(() => {
-    dispatch(tryOauth());
-  }, [dispatch]);
-
   const onSwitch = useCallback(() => {
     setSwitchUser(true);
   }, []);
diff --git a/frontend/src/app/pages/SharePage/ChartForShare.tsx b/frontend/src/app/pages/SharePage/ChartForShare.tsx
@@ -88,7 +88,10 @@ const ChartForShare: FC<{
       {
         name: 'click',
         callback: param => {
-          if (drillOptionRef.current?.isSelectedDrill) {
+          if (
+            drillOptionRef.current?.isSelectedDrill &&
+            !drillOptionRef.current.isBottomLevel
+          ) {
             const option = drillOptionRef.current;
             option.drillDown(param.data.rowData);
             drillOptionRef.current = option;
diff --git a/frontend/src/app/slice/thunks.ts b/frontend/src/app/slice/thunks.ts
@@ -201,20 +201,3 @@ export const getOauth2Clients = createAsyncThunk<[]>(
     }
   },
 );
-
-export const tryOauth = createAsyncThunk<User>('app/tryOauth', async () => {
-  try {
-    const { data } = await request<User>({
-      url: '/tpa/oauth2login',
-      method: 'POST',
-    });
-    localStorage.setItem(StorageKeys.LoggedInUser, JSON.stringify(data));
-    setTimeout(() => {
-      window.location.href = '/';
-    });
-    return data;
-  } catch (error) {
-    errorHandle(error);
-    throw error;
-  }
-});
