diff --git a/km-console/packages/config-manager-fe/package.json b/km-console/packages/config-manager-fe/package.json index 28ed2fbc..e7bceaa1 100644 --- a/km-console/packages/config-manager-fe/package.json +++ b/km-console/packages/config-manager-fe/package.json @@ -35,7 +35,7 @@ }, "devDependencies": { "@ant-design/icons": "^4.6.2", - "@babel/core": "^7.5.5", + "@babel/core": "^7.18.13", "@babel/plugin-proposal-class-properties": "^7.4.0", "@babel/plugin-proposal-decorators": "^7.4.0", "@babel/plugin-proposal-export-default-from": "^7.2.0", @@ -50,7 +50,7 @@ "@babel/preset-react": "^7.0.0", "@babel/preset-typescript": "^7.14.5", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.1", - "@types/lodash": "^4.14.138", + "@types/lodash": "^4.14.184", "@types/react-dom": "^17.0.5", "@types/react-router": "5.1.18", "@types/react-router-dom": "^5.3.3", @@ -76,6 +76,7 @@ "hard-source-webpack-plugin": "^0.13.1", "html-webpack-plugin": "^4.0.0", "husky": "4.3.7", + "knowdesign": "^1.3.7", "less-loader": "^4.1.0", "lint-staged": "10.5.3", "mini-css-extract-plugin": "^1.3.0", diff --git a/km-console/packages/layout-clusters-fe/config/CoverHtmlWebpackPlugin.js b/km-console/packages/layout-clusters-fe/config/CoverHtmlWebpackPlugin.js index dfb6754e..98fc9d5a 100755 --- a/km-console/packages/layout-clusters-fe/config/CoverHtmlWebpackPlugin.js +++ b/km-console/packages/layout-clusters-fe/config/CoverHtmlWebpackPlugin.js @@ -109,7 +109,15 @@ class CoverHtmlWebpackPlugin { - ${process.env.BUSINESS_VERSION === 'true' ? `` : ''} + ${depsMap} diff --git a/km-console/packages/layout-clusters-fe/package.json b/km-console/packages/layout-clusters-fe/package.json index 62fe6f9c..504edadc 100644 --- a/km-console/packages/layout-clusters-fe/package.json +++ b/km-console/packages/layout-clusters-fe/package.json @@ -64,7 +64,7 @@ "webpack-bundle-analyzer": "^4.5.0" }, "devDependencies": { - "@babel/core": "^7.5.5", + "@babel/core": "^7.18.13", "@babel/plugin-proposal-class-properties": "^7.4.0", "@babel/plugin-proposal-decorators": "^7.4.0", "@babel/plugin-proposal-export-default-from": "^7.2.0", @@ -79,7 +79,7 @@ "@babel/preset-typescript": "^7.14.5", "@pmmmwh/react-refresh-webpack-plugin": "^0.5.1", "@types/crypto-js": "^4.1.0", - "@types/lodash": "^4.14.171", + "@types/lodash": "^4.14.184", "@types/node": "^12.12.25", "@types/pubsub-js": "^1.5.18", "@typescript-eslint/eslint-plugin": "4.13.0", @@ -100,6 +100,7 @@ "file-loader": "^6.0.0", "hard-source-webpack-plugin": "^0.13.1", "husky": "4.3.7", + "knowdesign": "^1.3.7", "less": "^3.9.0", "less-loader": "^4.1.0", "lint-staged": "10.5.3", diff --git a/km-console/packages/layout-clusters-fe/src/app.tsx b/km-console/packages/layout-clusters-fe/src/app.tsx index e734f47c..edffd98a 100755 --- a/km-console/packages/layout-clusters-fe/src/app.tsx +++ b/km-console/packages/layout-clusters-fe/src/app.tsx @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/ban-ts-comment */ /* eslint-disable no-constant-condition */ import '@babel/polyfill'; import React, { useState, useEffect, useLayoutEffect } from 'react'; @@ -84,6 +85,17 @@ const AppContent = (props: { setlanguage: (language: string) => void }) => { } else { setCurActiveAppName('cluster'); } + // @ts-ignore + window._hmt = window._hmt || []; + // window._hmt.push([ + // '_setPageviewProperty', + // { + // page_name: 'test', + // page_title: null, // 当属性值传入 null 时，其作用为删除此前设置的该 PV 属性 + // }, + // ]); + // @ts-ignore + window._hmt.push(['_trackPageview', pathname]); }, [pathname]); // 获取版本信息 diff --git a/km-console/packages/layout-clusters-fe/src/assets/pro-tag.png b/km-console/packages/layout-clusters-fe/src/assets/pro-tag.png new file mode 100644 index 00000000..28caa9a5 Binary files /dev/null and b/km-console/packages/layout-clusters-fe/src/assets/pro-tag.png differ diff --git a/km-console/packages/layout-clusters-fe/src/constants/common.ts b/km-console/packages/layout-clusters-fe/src/constants/common.ts index 3b5a1f36..30f452f3 100755 --- a/km-console/packages/layout-clusters-fe/src/constants/common.ts +++ b/km-console/packages/layout-clusters-fe/src/constants/common.ts @@ -154,15 +154,15 @@ export const urlParser = () => { export const getLicenseInfo = (cbk: (msg: string) => void) => { if (process.env.BUSINESS_VERSION) { - const info = (window as any).code; - if (!info) { - setTimeout(() => getLicenseInfo(cbk), 1000); - } else { - const res = info() || {}; - if (res.code !== 0) { - cbk(res.msg); - } - } + // const info = (window as any).code; + // if (!info) { + // setTimeout(() => getLicenseInfo(cbk), 1000); + // } else { + // const res = info() || {}; + // if (res.code !== 0) { + // cbk(res.msg); + // } + // } } }; diff --git a/km-console/packages/layout-clusters-fe/src/constants/menu.tsx b/km-console/packages/layout-clusters-fe/src/constants/menu.tsx index 47d84df4..a735bf46 100755 --- a/km-console/packages/layout-clusters-fe/src/constants/menu.tsx +++ b/km-console/packages/layout-clusters-fe/src/constants/menu.tsx @@ -150,7 +150,14 @@ export const leftMenus = (clusterId?: string, clusterRunState?: number) => ({ children: [ process.env.BUSINESS_VERSION ? { - name: 'balance', + name: (intl: any) => { + return ( +
+ {intl.formatMessage({ id: 'menu.cluster.operation.balance' })} +
+
+ ); + }, path: 'balance', icon: '#icon-luoji', } @@ -164,19 +171,26 @@ export const leftMenus = (clusterId?: string, clusterRunState?: number) => ({ }, process.env.BUSINESS_VERSION ? { - name: 'produce-consume', + name: (intl: any) => { + return ( +
+ {intl.formatMessage({ id: 'menu.cluster.produce-consume' })} +
+
+ ); + }, path: 'testing', icon: 'icon-Message', permissionPoint: [ClustersPermissionMap.TEST_CONSUMER, ClustersPermissionMap.TEST_PRODUCER], children: [ { - name: 'producer', + name: (intl: any) => {intl.formatMessage({ id: 'menu.cluster.produce-consume.producer' })}, path: 'producer', icon: 'icon-luoji', permissionPoint: ClustersPermissionMap.TEST_PRODUCER, }, { - name: 'consumer', + name: (intl: any) => {intl.formatMessage({ id: 'menu.cluster.produce-consume.consumer' })}, path: 'consumer', icon: 'icon-luoji', permissionPoints: ClustersPermissionMap.TEST_CONSUMER, diff --git a/km-console/packages/layout-clusters-fe/src/index.less b/km-console/packages/layout-clusters-fe/src/index.less index cba2f5d2..4028673e 100644 --- a/km-console/packages/layout-clusters-fe/src/index.less +++ b/km-console/packages/layout-clusters-fe/src/index.less @@ -259,6 +259,19 @@ li { } } +.menu-item-with-pro-tag { + display: flex; + .pro-tag { + width: 24px; + margin-left: 4px; + background: no-repeat center/24px 16px url('./assets/pro-tag.png'); + } +} + +.dcloud-menu-item-selected .menu-item-with-pro-tag .pro-tag { + width: 0; +} + .menu-item-with-beta-tag { display: flex; .beta-tag { diff --git a/km-console/packages/layout-clusters-fe/src/pages/Login/config.tsx b/km-console/packages/layout-clusters-fe/src/pages/Login/config.tsx index 9b887072..2665a294 100644 --- a/km-console/packages/layout-clusters-fe/src/pages/Login/config.tsx +++ b/km-console/packages/layout-clusters-fe/src/pages/Login/config.tsx @@ -45,6 +45,7 @@ export const FormMap = [ prefix: <>, // prefix: , }, + initialValue: 'admin', }, { key: 'pw', @@ -64,6 +65,7 @@ export const FormMap = [ placeholder: '请输入密码', // prefix: , }, + initialValue: 'admin2022_', }, ]; diff --git a/km-console/packages/layout-clusters-fe/src/pages/Login/login.tsx b/km-console/packages/layout-clusters-fe/src/pages/Login/login.tsx index 0400dbf0..66881716 100644 --- a/km-console/packages/layout-clusters-fe/src/pages/Login/login.tsx +++ b/km-console/packages/layout-clusters-fe/src/pages/Login/login.tsx @@ -58,7 +58,14 @@ export const LoginForm: React.FC = (props) => { {FormMap.map((formItem) => { return ( - + {renderFormItem(formItem)} diff --git a/pom.xml b/pom.xml index e2f062a3..a3de1645 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ - enterprise-3.3.0 + demo-3.3.0 8 8