diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index a6858bcd..1a8961c1 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -44,9 +44,9 @@ jobs: uses: actions/setup-node@v1 with: node-version: ${{ matrix.node-version }} - - name: npm install, lint, build, and test + - name: npm ci, lint, build, and test run: | - npm install + npm ci npm run lint npm run build --if-present npm run test:unit diff --git a/package-lock.json b/package-lock.json index 1f0ebb18..27bcc9e3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -510,9 +510,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.16.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.8.tgz", - "integrity": "sha512-i7jDUfrVBWc+7OKcBzEe5n7fbv3i2fWtxKzzCvOjnzSxMfWMigAhtfJ7qzZNGFNMsCCd67+uz553dYKWXPvCKw==", + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.0.tgz", + "integrity": "sha512-74bEXKX2h+8rrfQUfsBfuZZHzsEs6Eql4pqy/T4Nn6Y9wNPggQOqD6z6pn5Bl8ZfysKouFZT/UXEH94ummEeQw==", "bin": { "parser": "bin/babel-parser.js" }, @@ -3433,8 +3433,16 @@ "node_modules/@types/lodash": { "version": "4.14.179", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.179.tgz", - "integrity": "sha512-uwc1x90yCKqGcIOAT6DwOSuxnrAbpkdPsUOZtwrXb4D/6wZs+6qG7QnIawDuZWg0sWpxl+ltIKCaLoMlna678w==", - "dev": true + "integrity": "sha512-uwc1x90yCKqGcIOAT6DwOSuxnrAbpkdPsUOZtwrXb4D/6wZs+6qG7QnIawDuZWg0sWpxl+ltIKCaLoMlna678w==" + }, + "node_modules/@types/lodash-es": { + "version": "4.17.6", + "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", + "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "peer": true, + "dependencies": { + "@types/lodash": "*" + } }, "node_modules/@types/mime": { "version": "1.3.2", @@ -4948,6 +4956,46 @@ "@vue/cli-service": "^3.0.0 || ^4.0.0-0" } }, + "node_modules/@vue/cli-plugin-unit-jest/node_modules/@vue/compiler-sfc": { + "version": "2.7.10", + "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.10.tgz", + "integrity": "sha512-55Shns6WPxlYsz4WX7q9ZJBL77sKE1ZAYNYStLs6GbhIOMrNtjMvzcob6gu3cGlfpCR4bT7NXgyJ3tly2+Hx8Q==", + "dev": true, + "peer": true, + "dependencies": { + "@babel/parser": "^7.18.4", + "postcss": "^8.4.14", + "source-map": "^0.6.1" + } + }, + "node_modules/@vue/cli-plugin-unit-jest/node_modules/@vue/compiler-sfc/node_modules/source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "peer": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/@vue/cli-plugin-unit-jest/node_modules/csstype": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.0.tgz", + "integrity": "sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA==", + "dev": true, + "peer": true + }, + "node_modules/@vue/cli-plugin-unit-jest/node_modules/vue": { + "version": "2.7.10", + "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.10.tgz", + "integrity": "sha512-HmFC70qarSHPXcKtW8U8fgIkF6JGvjEmDiVInTkKZP0gIlEPhlVlcJJLkdGIDiNkIeA2zJPQTWJUI4iWe+AVfg==", + "dev": true, + "peer": true, + "dependencies": { + "@vue/compiler-sfc": "2.7.10", + "csstype": "^3.1.0" + } + }, "node_modules/@vue/cli-plugin-unit-jest/node_modules/vue-jest": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/vue-jest/-/vue-jest-3.0.7.tgz", @@ -9967,6 +10015,13 @@ "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.7.tgz", "integrity": "sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig==" }, + "node_modules/de-indent": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz", + "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==", + "dev": true, + "peer": true + }, "node_modules/deasync": { "version": "0.1.24", "resolved": "https://registry.npmjs.org/deasync/-/deasync-0.1.24.tgz", @@ -18831,9 +18886,9 @@ "dev": true }, "node_modules/nanoid": { - "version": "3.1.32", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.32.tgz", - "integrity": "sha512-F8mf7R3iT9bvThBoW4tGXhXFHCctyCiUUPrWF8WaTqa3h96d9QybkSeba43XVOOE3oiLfkVDe4bT8MeGmkrTxw==", + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", + "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==", "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -20451,20 +20506,26 @@ } }, "node_modules/postcss": { - "version": "8.4.5", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz", - "integrity": "sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==", + "version": "8.4.16", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz", + "integrity": "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + } + ], "dependencies": { - "nanoid": "^3.1.30", + "nanoid": "^3.3.4", "picocolors": "^1.0.0", - "source-map-js": "^1.0.1" + "source-map-js": "^1.0.2" }, "engines": { "node": "^10 || ^12 || >=14" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" } }, "node_modules/postcss-calc": { @@ -24413,9 +24474,9 @@ } }, "node_modules/source-map-js": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.1.tgz", - "integrity": "sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", + "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", "engines": { "node": ">=0.10.0" } @@ -27845,6 +27906,17 @@ "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=", "dev": true }, + "node_modules/vue-template-compiler": { + "version": "2.7.10", + "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.10.tgz", + "integrity": "sha512-QO+8R9YRq1Gudm8ZMdo/lImZLJVUIAM8c07Vp84ojdDAf8HmPJc7XB556PcXV218k2AkKznsRz6xB5uOjAC4EQ==", + "dev": true, + "peer": true, + "dependencies": { + "de-indent": "^1.0.2", + "he": "^1.2.0" + } + }, "node_modules/vue-template-es2015-compiler": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz", @@ -29975,9 +30047,9 @@ } }, "@babel/parser": { - "version": "7.16.8", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.16.8.tgz", - "integrity": "sha512-i7jDUfrVBWc+7OKcBzEe5n7fbv3i2fWtxKzzCvOjnzSxMfWMigAhtfJ7qzZNGFNMsCCd67+uz553dYKWXPvCKw==" + "version": "7.19.0", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.0.tgz", + "integrity": "sha512-74bEXKX2h+8rrfQUfsBfuZZHzsEs6Eql4pqy/T4Nn6Y9wNPggQOqD6z6pn5Bl8ZfysKouFZT/UXEH94ummEeQw==" }, "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { "version": "7.16.7", @@ -32249,8 +32321,16 @@ "@types/lodash": { "version": "4.14.179", "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.179.tgz", - "integrity": "sha512-uwc1x90yCKqGcIOAT6DwOSuxnrAbpkdPsUOZtwrXb4D/6wZs+6qG7QnIawDuZWg0sWpxl+ltIKCaLoMlna678w==", - "dev": true + "integrity": "sha512-uwc1x90yCKqGcIOAT6DwOSuxnrAbpkdPsUOZtwrXb4D/6wZs+6qG7QnIawDuZWg0sWpxl+ltIKCaLoMlna678w==" + }, + "@types/lodash-es": { + "version": "4.17.6", + "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.6.tgz", + "integrity": "sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==", + "peer": true, + "requires": { + "@types/lodash": "*" + } }, "@types/mime": { "version": "1.3.2", @@ -33439,6 +33519,45 @@ "vue-jest": "^3.0.5" }, "dependencies": { + "@vue/compiler-sfc": { + "version": "2.7.10", + "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.10.tgz", + "integrity": "sha512-55Shns6WPxlYsz4WX7q9ZJBL77sKE1ZAYNYStLs6GbhIOMrNtjMvzcob6gu3cGlfpCR4bT7NXgyJ3tly2+Hx8Q==", + "dev": true, + "peer": true, + "requires": { + "@babel/parser": "^7.18.4", + "postcss": "^8.4.14", + "source-map": "^0.6.1" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "peer": true + } + } + }, + "csstype": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.0.tgz", + "integrity": "sha512-uX1KG+x9h5hIJsaKR9xHUeUraxf8IODOwq9JLNPq6BwB04a/xgpq3rcx47l5BZu5zBPlgD342tdke3Hom/nJRA==", + "dev": true, + "peer": true + }, + "vue": { + "version": "2.7.10", + "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.10.tgz", + "integrity": "sha512-HmFC70qarSHPXcKtW8U8fgIkF6JGvjEmDiVInTkKZP0gIlEPhlVlcJJLkdGIDiNkIeA2zJPQTWJUI4iWe+AVfg==", + "dev": true, + "peer": true, + "requires": { + "@vue/compiler-sfc": "2.7.10", + "csstype": "^3.1.0" + } + }, "vue-jest": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/vue-jest/-/vue-jest-3.0.7.tgz", @@ -37456,6 +37575,13 @@ "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.7.tgz", "integrity": "sha512-P6twpd70BcPK34K26uJ1KT3wlhpuOAPoMwJzpsIWUxHZ7wpmbdZL/hQqBDfz7hGurYSa5PhzdhDHtt319hL3ig==" }, + "de-indent": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz", + "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==", + "dev": true, + "peer": true + }, "deasync": { "version": "0.1.24", "resolved": "https://registry.npmjs.org/deasync/-/deasync-0.1.24.tgz", @@ -44424,9 +44550,9 @@ "dev": true }, "nanoid": { - "version": "3.1.32", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.32.tgz", - "integrity": "sha512-F8mf7R3iT9bvThBoW4tGXhXFHCctyCiUUPrWF8WaTqa3h96d9QybkSeba43XVOOE3oiLfkVDe4bT8MeGmkrTxw==" + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz", + "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==" }, "nanomatch": { "version": "1.2.13", @@ -45679,13 +45805,13 @@ "dev": true }, "postcss": { - "version": "8.4.5", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.5.tgz", - "integrity": "sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==", + "version": "8.4.16", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz", + "integrity": "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==", "requires": { - "nanoid": "^3.1.30", + "nanoid": "^3.3.4", "picocolors": "^1.0.0", - "source-map-js": "^1.0.1" + "source-map-js": "^1.0.2" }, "dependencies": { "picocolors": { @@ -48795,9 +48921,9 @@ "dev": true }, "source-map-js": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.1.tgz", - "integrity": "sha512-4+TN2b3tqOCd/kaGRJ/sTYA0tR0mdXx26ipdolxcwtJVqEnqNYvlCAt1q3ypy4QMlYus+Zh34RNtYLoq2oQ4IA==" + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", + "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==" }, "source-map-resolve": { "version": "0.5.3", @@ -51480,6 +51606,17 @@ } } }, + "vue-template-compiler": { + "version": "2.7.10", + "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.10.tgz", + "integrity": "sha512-QO+8R9YRq1Gudm8ZMdo/lImZLJVUIAM8c07Vp84ojdDAf8HmPJc7XB556PcXV218k2AkKznsRz6xB5uOjAC4EQ==", + "dev": true, + "peer": true, + "requires": { + "de-indent": "^1.0.2", + "he": "^1.2.0" + } + }, "vue-template-es2015-compiler": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz", diff --git a/src/assets/img/technologies/IMPALA.png b/src/assets/img/technologies/IMPALA.png new file mode 100644 index 00000000..fc2bd774 Binary files /dev/null and b/src/assets/img/technologies/IMPALA.png differ diff --git a/src/hooks/data.ts b/src/hooks/data.ts index 73eef8d1..1656122f 100644 --- a/src/hooks/data.ts +++ b/src/hooks/data.ts @@ -37,6 +37,7 @@ export enum Calculations { PercentageAvg = "percentageAvg", ApdexAvg = "apdexAvg", SecondToDay = "secondToDay", + NanosecondToMillisecond = "nanosecondToMillisecond", } export enum sizeEnum { XS = "XS", diff --git a/src/hooks/useProcessor.ts b/src/hooks/useProcessor.ts index dea25185..55f2edc7 100644 --- a/src/hooks/useProcessor.ts +++ b/src/hooks/useProcessor.ts @@ -397,7 +397,7 @@ export function aggregation( data = (val / 1024 / 1024 / 1024).toFixed(2); break; case Calculations.Apdex: - data = val / 10000; + data = (val / 10000).toFixed(2); break; case Calculations.ConvertSeconds: data = dayjs(val * 1000).format("YYYY-MM-DD HH:mm:ss"); @@ -414,6 +414,9 @@ export function aggregation( case Calculations.SecondToDay: data = (val / 86400).toFixed(2); break; + case Calculations.NanosecondToMillisecond: + data = (val / 1000 / 1000).toFixed(2); + break; default: data; break; diff --git a/src/layout/components/NavBar.vue b/src/layout/components/NavBar.vue index 19355743..d5710e7c 100644 --- a/src/layout/components/NavBar.vue +++ b/src/layout/components/NavBar.vue @@ -18,7 +18,7 @@ limitations under the License. -->
{{ t("timeTips") }} (""); const timeRange = ref(0); -const time = ref([ - appStore.durationRow.start, - appStore.durationRow.end, -]); resetDuration(); getVersion(); @@ -73,15 +68,13 @@ const setConfig = (value: string) => { pageName.value = value || ""; }; -const handleReload = () => { +function handleReload() { const gap = appStore.duration.end.getTime() - appStore.duration.start.getTime(); - const dates: Date[] = [ - getLocalTime(appStore.utc, new Date(new Date().getTime() - gap)), - getLocalTime(appStore.utc, new Date()), - ]; + const dates: Date[] = [new Date(new Date().getTime() - gap), new Date()]; appStore.setDuration(timeFormat(dates)); -}; +} + function changeTimeRange(val: Date[] | any) { timeRange.value = val[1].getTime() - val[0].getTime() > 60 * 24 * 60 * 60 * 1000 ? 1 : 0; @@ -114,7 +107,6 @@ function resetDuration() { step: d.step, }); appStore.updateUTC(d.utc); - time.value = [new Date(d.start), new Date(d.end)]; } } diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts index 58fd4945..7af04a65 100644 --- a/src/locales/lang/en.ts +++ b/src/locales/lang/en.ts @@ -152,6 +152,7 @@ const msg = { text: "Text", query: "Query", postgreSQL: "PostgreSQL", + endpointTips: "The table shows up to 20 pieces of endpoints.", seconds: "Seconds", hourTip: "Select Hour", minuteTip: "Select Minute", diff --git a/src/locales/lang/es.ts b/src/locales/lang/es.ts index 0b167791..136cd56f 100644 --- a/src/locales/lang/es.ts +++ b/src/locales/lang/es.ts @@ -152,6 +152,7 @@ const msg = { enableAssociate: "Activar asociación", query: "Consulta", postgreSQL: "PostgreSQL", + endpointTips: "Aquí, la tabla muestra hasta 20 punto final.", seconds: "Segundos", hourTip: "Seleccione Hora", minuteTip: "Seleccione Minuto", diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts index e180079a..e0f50e98 100644 --- a/src/locales/lang/zh.ts +++ b/src/locales/lang/zh.ts @@ -149,6 +149,7 @@ const msg = { text: "文本", query: "查询", postgreSQL: "PostgreSQL", + endpointTips: "这里最多展示20条endpoints。", seconds: "秒", hourTip: "选择小时", minuteTip: "选择分钟", diff --git a/src/views/dashboard/configuration/widget/AssociateOptions.vue b/src/views/dashboard/configuration/widget/AssociateOptions.vue index 967bc337..765baa95 100644 --- a/src/views/dashboard/configuration/widget/AssociateOptions.vue +++ b/src/views/dashboard/configuration/widget/AssociateOptions.vue @@ -40,15 +40,16 @@ const widgetIds = ref( associate.map((d: { widgetId: string }) => d.widgetId) ); const widgets: any = computed(() => { - const all = getDashboard(dashboardStore.currentDashboard).widgets; - const items = all.filter((d: any) => { + const widgetList = getDashboard(dashboardStore.currentDashboard).widgets; + const items = []; + for (const d of widgetList) { const isLinear = ["Bar", "Line", "Area"].includes( (d.graph && d.graph.type) || "" ); if (isLinear && d.id && dashboardStore.selectedGrid.id !== d.id) { - return { value: d.id, label: (d.widget && d.widget.name) || d.id }; + items.push({ value: d.id, label: (d.widget && d.widget.name) || d.id }); } - }); + } return items; }); function updateWidgetConfig(options: Option[]) { diff --git a/src/views/dashboard/controls/NetworkProfiling.vue b/src/views/dashboard/controls/NetworkProfiling.vue index d5dfd490..5dc6ab59 100644 --- a/src/views/dashboard/controls/NetworkProfiling.vue +++ b/src/views/dashboard/controls/NetworkProfiling.vue @@ -30,7 +30,7 @@ limitations under the License. --> {{ t("delete") }}
- + diff --git a/src/views/dashboard/graphs/style.scss b/src/views/dashboard/graphs/style.scss index a1b83a93..261abc2f 100644 --- a/src/views/dashboard/graphs/style.scss +++ b/src/views/dashboard/graphs/style.scss @@ -23,6 +23,7 @@ .list { margin-top: 10px; margin-bottom: 10px; + height: calc(100% - 90px); } .pagination { @@ -40,9 +41,21 @@ } .search { - text-align: right; + margin-top: 5px; } .input-with-search { width: 400px; } + +.btn { + margin-top: -12px; +} + +.chart { + height: 60px; +} + +.inputs { + width: 300px; +} diff --git a/src/views/dashboard/related/network-profiling/Content.vue b/src/views/dashboard/related/network-profiling/Content.vue index b320ac0e..f041b75f 100644 --- a/src/views/dashboard/related/network-profiling/Content.vue +++ b/src/views/dashboard/related/network-profiling/Content.vue @@ -15,24 +15,31 @@ limitations under the License. --> @@ -52,7 +59,7 @@ const { t } = useI18n(); } .text { - width: calc(100% - 330px); + width: 100%; text-align: center; margin-top: 30px; } diff --git a/src/views/dashboard/related/network-profiling/components/ProcessTopology.vue b/src/views/dashboard/related/network-profiling/components/ProcessTopology.vue index 71993d6a..428cfee9 100644 --- a/src/views/dashboard/related/network-profiling/components/ProcessTopology.vue +++ b/src/views/dashboard/related/network-profiling/components/ProcessTopology.vue @@ -98,12 +98,7 @@ limitations under the License. --> @@ -157,7 +152,7 @@ const link = ref(null); const anchor = ref(null); const arrow = ref(null); const oldVal = ref<{ width: number; height: number }>({ width: 0, height: 0 }); -const config = ref({}); +const config = ref(props.config || {}); const diff = ref([220, 200]); const radius = 210; const dates = ref>(null); diff --git a/src/views/dashboard/related/network-profiling/components/Settings.vue b/src/views/dashboard/related/network-profiling/components/Settings.vue index b0cb5aaa..a9cb9118 100644 --- a/src/views/dashboard/related/network-profiling/components/Settings.vue +++ b/src/views/dashboard/related/network-profiling/components/Settings.vue @@ -15,7 +15,7 @@ limitations under the License. -->