Temporary/support cloub beaver 2

.gitignore

@@ -24,6 +24,8 @@ dist
 /build
 /packages/icons-svg/es/*
 /packages/icons-svg/lib/*
+/packages/dms-kit/lib/*
+/packages/dms-kit/.dumi/tmp*
 
 # misc
 .DS_Store

.npmrc

@@ -1 +1,2 @@
 registry=https://registry.npmmirror.com
+@actiontech:registry=http://10.186.18.19:4873/

.prettierignore

@@ -1,2 +1,4 @@
 *.snap
-*.md
+*.md
+**/demo/**
+**/demos/**

DumiHeaderExtraSlots/index.tsx

@@ -0,0 +1,37 @@
+import React from 'react';
+import Select from 'antd/es/select';
+import { HeaderExtraStyleWrapper } from './style';
+
+// 该值取自 /packages/**/.dumirc.ts的define字段
+declare const VERSION: string;
+
+const HeaderExtra: React.FC<{ pkg?: 'dms-kit' | 'icons' }> = ({
+  pkg = 'dms-kit'
+}) => {
+  const curVersion = Number(VERSION.split('.')[0]);
+  const historyVersions = new Array(curVersion)
+    .fill(0)
+    .map((_, idx) => `v${idx}`)
+    .reverse();
+  const options = [VERSION, ...historyVersions].map((item) => ({
+    value: item,
+    label: item
+  }));
+
+  const handleVersionChange = (version: string) => {
+    window.location.href = `/doc/${pkg}-${version}`;
+  };
+
+  return (
+    <HeaderExtraStyleWrapper>
+      <Select
+        value={VERSION}
+        options={options}
+        onChange={handleVersionChange}
+        style={{ borderRadius: 10 }}
+      />
+    </HeaderExtraStyleWrapper>
+  );
+};
+
+export default HeaderExtra;

DumiHeaderExtraSlots/style.ts

@@ -0,0 +1,9 @@
+import { styled } from '@mui/material/styles';
+
+export const HeaderExtraStyleWrapper = styled('div')`
+  margin-left: 10px;
+  '& .ant-select .ant-select-selector': {
+    border-radius: 10px;
+    background-color: transparent;
+  }
+`;

eslint.config.mjs

@@ -83,6 +83,8 @@ export default defineConfig([
     '**/packages/shared/lib/api/*',
     '**/packages/**/mockApi/*',
     '**/packages/**/testUtil/*',
+    '**/packages/**/demo/*',
+    '**/packages/**/demos/*',
     'jest-setup.ts',
     'node_modules/*',
     '**/packages/*/node_modules/*',

jest-setup.ts

@@ -3,7 +3,7 @@ import i18n from 'i18next';
 import { initReactI18next } from 'react-i18next';
 import baseZhCN from './packages/base/src/locale/zh-CN';
 import sqleZhCN from './packages/sqle/src/locale/zh-CN';
-import commonZhCN from './packages/shared/lib/locale/zh-CN';
+import commonZhCN from './packages/dms-kit/src/locale/zh-CN';
 import Adapter from '@cfaester/enzyme-adapter-react-18';
 import * as Enzyme from 'enzyme';
 import 'jest-canvas-mock';

jest.config.js

@@ -45,9 +45,12 @@ module.exports = {
     '!packages/**/index.enum.ts',
     '!packages/sqle/src/page/SqlAnalyze/SqlAnalyze/ProcessListCom/**',
     '!packages/shared/lib/hooks/usePrompt/index.tsx',
-    '!packages/sqle/src/page/Knowledge/Graph/components/**'
+    '!packages/sqle/src/page/Knowledge/Graph/components/**',
+    '!packages/**/demo/**',
+    '!packages/**/demos/**'
   ],
   setupFilesAfterEnv: ['<rootDir>/jest-setup.ts'],
+  testPathIgnorePatterns: ['/node_modules/', '/demo/', '/demos/'],
   reporters: [
     'default',
     [

package.json

@@ -9,15 +9,15 @@
   },
   "scripts": {
     "preinstall": "npx only-allow pnpm",
-    "start": "pnpm --filter base start",
-    "start:ee": "pnpm --filter base start:ee",
-    "start:demo": "pnpm --filter base start:demo",
-    "build": "pnpm --filter base build",
-    "build:ee": "pnpm --filter base build:ee",
-    "build:demo": "pnpm --filter base build:demo",
-    "prettier:w": "prettier -w packages/*/src/ packages/*/lib/ scripts/cli/*/src",
-    "prettier:c": "prettier -c packages/*/src/ packages/*/lib/ scripts/cli/*/src",
-    "eslint": "eslint  packages/*/src/ packages/*/lib/ scripts/cli/*/src",
+    "start": "concurrently \"pnpm --filter base start\" \"pnpm --filter @actiontech/dms-kit dev\"",
+    "start:ee": "concurrently \"pnpm --filter base start:ee\" \"pnpm --filter @actiontech/dms-kit dev\"",
+    "start:demo": "concurrently \"pnpm --filter base start:demo\" \"pnpm --filter @actiontech/dms-kit dev\"",
+    "build": "pnpm --filter @actiontech/dms-kit build && pnpm --filter base build",
+    "build:ee": "pnpm --filter @actiontech/dms-kit build && pnpm --filter base build:ee",
+    "build:demo": "pnpm --filter @actiontech/dms-kit build && pnpm --filter base build:demo",
+    "prettier:w": "prettier -w packages/*/src/ packages/shared/lib/ scripts/cli/*/src",
+    "prettier:c": "prettier -c packages/*/src/ packages/shared/lib/ scripts/cli/*/src",
+    "eslint": "eslint  packages/*/src/ packages/shared/lib/ scripts/cli/*/src",
     "stylelint": "stylelint packages/*/{src,lib}/**/{*.less,style.ts,element.ts}",
     "ts-check": "tsc --noEmit",
     "checker": "concurrently \"pnpm ts-check\" \"pnpm eslint\" \"pnpm stylelint\" \"pnpm prettier:c\"",
@@ -33,7 +33,8 @@
     "dms:g": "pnpm --filter @actiontech/cli-create-dms-page build && create-dms-page",
     "api_client:g": "npm_config_registry=http://10.186.18.19:4873 pnpx @actiontech/cli api-client -y",
     "api_mocks:g": "npm_config_registry=http://10.186.18.19:4873 pnpx @actiontech/cli api-mocks -y",
-    "ai-doc": "npm_config_registry=http://10.186.18.19:4873 pnpx @actiontech/cli ai-doc"
+    "ai-doc": "npm_config_registry=http://10.186.18.19:4873 pnpx @actiontech/cli ai-doc",
+    "postinstall": "pnpm --filter @actiontech/dms-kit build"
   },
   "keywords": [],
   "author": "",

packages/base/package.json

@@ -16,8 +16,9 @@
   },
   "dependencies": {
     "@actiontech/shared": "workspace:^",
+    "@actiontech/dms-kit": "workspace:^",
     "babel-preset-react-app": "^10.0.1",
     "sqle": "workspace:^",
     "@actiontech/icons": "workspace:^"
   }
-}
+}

packages/base/src/App.ce.test.tsx

@@ -9,7 +9,7 @@ import { mockUseDbServiceDriver } from '@actiontech/shared/lib/testUtil/mockHook
 import { mockUseCurrentUser } from '@actiontech/shared/lib/testUtil/mockHook/mockUseCurrentUser';
 import { mockUsePermission } from '@actiontech/shared/lib/testUtil/mockHook/mockUsePermission';
 import { mockSystemConfig } from './testUtils/mockHooks/mockSystemConfig';
-import { LocalStorageWrapper } from '@actiontech/shared';
+import { LocalStorageWrapper } from '@actiontech/dms-kit';
 import system from '@actiontech/shared/lib/testUtil/mockApi/sqle/system';
 import baseSystem from '@actiontech/shared/lib/testUtil/mockApi/base/system';
 import { superRender } from '@actiontech/shared/lib/testUtil/superRender';

packages/base/src/App.test.tsx

@@ -19,10 +19,10 @@ import {
 } from '@actiontech/shared/lib/testUtil/common';
 import system from '@actiontech/shared/lib/testUtil/mockApi/sqle/system';
 import baseSystem from '@actiontech/shared/lib/testUtil/mockApi/base/system';
-import { LocalStorageWrapper } from '@actiontech/shared';
+import { LocalStorageWrapper } from '@actiontech/dms-kit';
 import { compressToBase64 } from 'lz-string';
-import { DMS_REDIRECT_KEY_PARAMS_NAME } from '@actiontech/shared/lib/data/routePaths';
-import { SystemRole } from '@actiontech/shared/lib/enum';
+import { DMS_REDIRECT_KEY_PARAMS_NAME } from '@actiontech/dms-kit';
+import { SystemRole } from '@actiontech/dms-kit';
 import { AuthRouterConfig } from './router/router';
 import { cloneDeep } from 'lodash';
 import dmsSystem from '@actiontech/shared/lib/testUtil/mockApi/base/system';
@@ -32,8 +32,8 @@ import gateway from '@actiontech/shared/lib/testUtil/mockApi/base/gateway';
 import project from '@actiontech/shared/lib/testUtil/mockApi/base/project';
 import EventEmitter from './utils/EventEmitter';
 import EmitterKey from './data/EmitterKey';
-import { eventEmitter as sharedEventEmitter } from '@actiontech/shared/lib/utils/EventEmitter';
-import sharedEmitterKey from '@actiontech/shared/lib/data/EmitterKey';
+import { eventEmitter as sharedEventEmitter } from '@actiontech/dms-kit/es/utils/EventEmitter';
+import sharedEmitterKey from '@actiontech/dms-kit/es/data/EmitterKey';
 
 jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'),
@@ -99,6 +99,9 @@ describe('App', () => {
           modalStatus: {
             [ModalName.Company_Notice]: false
           }
+        },
+        availabilityZone: {
+          availabilityZoneTips: []
         }
       });
     });
@@ -297,13 +300,6 @@ describe('App', () => {
     expect(AuthRouterConfig).toEqual(routerConfigBackup);
   });
 
-  it('should initialize the availability zone', () => {
-    baseSuperRender(<App />);
-    expect(
-      mockUseRecentlySelectedZoneData.initializeAvailabilityZone
-    ).toHaveBeenCalledTimes(1);
-  });
-
   it('should reload the initial data when the event is triggered', async () => {
     baseSuperRender(<App />);
     expect(getUserBySessionSpy).toHaveBeenCalledTimes(1);

packages/base/src/App.tsx

@@ -11,14 +11,10 @@ import { AuthRouterConfig, unAuthRouterConfig } from './router/router';
 import { IReduxState } from './store';
 import { useSelector } from 'react-redux';
 import { StyledEngineProvider, ThemeProvider } from '@mui/system';
-import {
-  EmptyBox,
-  HeaderProgress,
-  SpinIndicator,
-  useTypedNavigate
-} from '@actiontech/shared';
+import { EmptyBox, HeaderProgress, SpinIndicator } from '@actiontech/dms-kit';
+import { useTypedNavigate } from '@actiontech/shared';
 import { useNotificationContext } from '@actiontech/shared/lib/hooks';
-import { SupportLanguage, SupportTheme } from '@actiontech/shared/lib/enum';
+import { SupportLanguage, SupportTheme } from '@actiontech/dms-kit';
 import Nav from './page/Nav';
 import {
   useChangeTheme,
@@ -46,28 +42,28 @@ import antd_en_US from 'antd/locale/en_US';
 import useFetchPermissionData from './hooks/useFetchPermissionData';
 import { useDispatch } from 'react-redux';
 import { updateModuleFeatureSupport } from './store/permission';
-import { ROUTE_PATHS } from '@actiontech/shared/lib/data/routePaths';
+import { ROUTE_PATHS } from '@actiontech/dms-kit';
 import useSyncDmsCloudBeaverChannel from './hooks/useSyncDmsCloudBeaverChannel';
 import { getSystemModuleStatusModuleNameEnum } from '@actiontech/shared/lib/api/sqle/service/system/index.enum';
-import { ComponentControlHeight } from '@actiontech/shared/lib/data/common';
+import { ComponentControlHeight } from '@actiontech/dms-kit';
 import EventEmitter from './utils/EventEmitter';
 import EmitterKey from './data/EmitterKey';
-import { eventEmitter as sharedEventEmitter } from '@actiontech/shared/lib/utils/EventEmitter';
-import sharedEmitterKey from '@actiontech/shared/lib/data/EmitterKey';
-import useRecentlySelectedZone from './hooks/useRecentlySelectedZone';
+import { eventEmitter as sharedEventEmitter } from '@actiontech/dms-kit/es/utils/EventEmitter';
+import sharedEmitterKey from '@actiontech/dms-kit/es/data/EmitterKey';
+import useRecentlySelectedZone from '@actiontech/dms-kit/es/features/useRecentlySelectedZone';
 import { debounce } from 'lodash';
 import ErrorBoundary from './page/ErrorBoundary';
 import './index.less';
-
 dayjs.extend(updateLocale);
 dayjs.updateLocale('zh-cn', {
   weekStart: 0
 });
-
 Spin.setDefaultIndicator(<SpinIndicator />);
 
 //fix  https://github.com/actiontech/sqle/issues/1350
-export const Wrapper: React.FC<{ children: ReactNode }> = ({ children }) => {
+export const Wrapper: React.FC<{
+  children: ReactNode;
+}> = ({ children }) => {
   const [initRenderApp, setInitRenderApp] = useState<boolean>(true);
   const token = useSelector<IReduxState, string>((state) => state.user.token);
   const location = useLocation();
@@ -86,45 +82,36 @@ export const Wrapper: React.FC<{ children: ReactNode }> = ({ children }) => {
     ) {
       const currentPath = location.pathname;
       const currentSearch = location.search;
-
       const fullPath = currentSearch
         ? `${currentPath}${currentSearch}`
         : currentPath;
-
       navigate(ROUTE_PATHS.BASE.LOGIN.index, {
-        queries: { target: encodeURIComponent(fullPath) },
+        queries: {
+          target: encodeURIComponent(fullPath)
+        },
         replace: true
       });
     }
   }, [initRenderApp, location.pathname, location.search, navigate, token]);
   return <>{!initRenderApp && children}</>;
 };
-
 function App() {
   const { token } = useSelector((state: IReduxState) => ({
     token: state.user.token
   }));
-
   const dispatch = useDispatch();
-
   const { notificationContextHolder } = useNotificationContext();
-
   const { getUserBySession } = useSessionUser();
-
   const {
     isUserInfoFetched,
     theme,
     language: currentLanguage
   } = useCurrentUser();
-
   const { fetchModuleSupportStatus, isFeatureSupportFetched } =
     useFetchPermissionData();
-
   const antdLanguage =
     currentLanguage === SupportLanguage.enUS ? antd_en_US : antd_zh_CN;
-
   const { isDriverInfoFetched, updateDriverList } = useDbServiceDriver();
-
   const { checkPagePermission, userOperationPermissions } = usePermission();
 
   // #if [ee]
@@ -158,7 +145,6 @@ function App() {
         return acc;
       }, verifiedRoutes);
     };
-
     if (
       isUserInfoFetched &&
       isFeatureSupportFetched &&
@@ -173,16 +159,13 @@ function App() {
     isUserInfoFetched,
     userOperationPermissions
   ]);
-
   const elements = useRoutes(
     token ? (AuthRouterConfigData as RouteObject[]) : unAuthRouterConfig
   );
   useChangeTheme();
-
   const themeData = useMemo(() => {
     return ThemeData[theme];
   }, [theme]);
-
   const body = useMemo(() => {
     if (
       !isUserInfoFetched ||
@@ -202,7 +185,6 @@ function App() {
     isFeatureSupportFetched,
     elements
   ]);
-
   const getInitialData = useCallback(() => {
     getUserBySession({});
     updateDriverList();
@@ -221,30 +203,24 @@ function App() {
       }
     });
   }, [dispatch, fetchModuleSupportStatus, getUserBySession, updateDriverList]);
-
   useEffect(() => {
     if (token) {
       getInitialData();
     }
   }, [token, getInitialData]);
-
   useEffect(() => {
     i18n.changeLanguage(currentLanguage);
   }, [currentLanguage]);
 
   // #if [ee]
-  const { initializeAvailabilityZone, clearRecentlySelectedZone } =
-    useRecentlySelectedZone();
-
+  const { clearRecentlySelectedZone } = useRecentlySelectedZone();
   useEffect(() => {
     const { unsubscribe } = EventEmitter.subscribe(
       EmitterKey.DMS_Reload_Initial_Data,
       getInitialData
     );
-
     return unsubscribe;
   }, [getInitialData]);
-
   useEffect(() => {
     const { unsubscribe } = sharedEventEmitter.subscribe(
       sharedEmitterKey.DMS_CLEAR_AVAILABILITY_ZONE_AND_RELOAD_INITIAL_DATA,
@@ -253,16 +229,10 @@ function App() {
         getInitialData();
       }, 1000)
     );
-
     return unsubscribe;
   }, [getInitialData, clearRecentlySelectedZone]);
-
-  useEffect(() => {
-    initializeAvailabilityZone();
-  }, [initializeAvailabilityZone]);
   // #endif
   useSyncDmsCloudBeaverChannel();
-
   return (
     <Wrapper>
       <StyleProvider
@@ -354,5 +324,4 @@ function App() {
     </Wrapper>
   );
 }
-
 export default App;