Skip to content

Commit 2361008

Browse files
author
zengqiao
committed
Merge branch 'dev' of github.com:didi/KnowStreaming into dev
2 parents 7377ef3 + a28d064 commit 2361008

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+667
-441
lines changed

km-console/packages/layout-clusters-fe/package-lock.json

Lines changed: 143 additions & 85 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

km-console/packages/layout-clusters-fe/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"dependencies": {
3636
"@ant-design/compatible": "^1.0.8",
3737
"@ant-design/icons": "^4.6.2",
38+
"@knowdesign/icons": "^1.0.1",
3839
"@types/react": "^17.0.39",
3940
"@types/react-copy-to-clipboard": "^5.0.2",
4041
"@types/react-dom": "^17.0.11",
@@ -57,10 +58,9 @@
5758
"react-cron-antd": "^1.1.2",
5859
"react-dom": "16.12.0",
5960
"react-intl": "^3.2.1",
60-
"react-joyride": "^2.5.0",
61+
"react-joyride": "^2.5.3",
6162
"single-spa": "5.9.3",
6263
"single-spa-react": "2.14.0",
63-
"tree-changes": "0.9.1",
6464
"webpack-bundle-analyzer": "^4.5.0"
6565
},
6666
"devDependencies": {

km-console/packages/layout-clusters-fe/src/app.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import '@babel/polyfill';
33
import React, { useState, useEffect, useLayoutEffect } from 'react';
44
import { BrowserRouter, Switch, Route, useLocation, useHistory } from 'react-router-dom';
55
import { get as lodashGet } from 'lodash';
6-
import { DProLayout, AppContainer, IconFont, Menu, Utils, Page403, Page404, Page500, Modal } from 'knowdesign';
6+
import { DProLayout, AppContainer, Menu, Utils, Page403, Page404, Page500, Modal } from 'knowdesign';
7+
import { IconFont } from '@knowdesign/icons';
78
import dantdZhCN from 'knowdesign/es/locale/zh_CN';
89
import dantdEnUS from 'knowdesign/es/locale/en_US';
910
import { DotChartOutlined } from '@ant-design/icons';

0 commit comments

Comments
 (0)