diff --git a/nezha-fronted/build/webpack.base.conf.js b/nezha-fronted/build/webpack.base.conf.js
index d0c50cd81..388deb3ed 100644
--- a/nezha-fronted/build/webpack.base.conf.js
+++ b/nezha-fronted/build/webpack.base.conf.js
@@ -112,6 +112,11 @@ const baseConfig = {
use: ['raw-loader', 'pug-plain-loader']
}
]
+ },
+ {
+ test: /\.js$/,
+ exclude: /node_modules/,
+ use: ['cache-loader', 'babel-loader']
}
]
},
diff --git a/nezha-fronted/build/webpack.dev.conf.js b/nezha-fronted/build/webpack.dev.conf.js
index 6c6c4b4a6..aae9b4cca 100644
--- a/nezha-fronted/build/webpack.dev.conf.js
+++ b/nezha-fronted/build/webpack.dev.conf.js
@@ -7,6 +7,7 @@ const path = require('path')
const baseWebpackConfig = require('./webpack.base.conf')
const CopyWebpackPlugin = require('copy-webpack-plugin')
const HtmlWebpackPlugin = require('html-webpack-plugin')
+// const SpeedMeasurePlugin = require('speed-measure-webpack-plugin')
const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
const portfinder = require('portfinder')
const { VueLoaderPlugin } = require('vue-loader')
@@ -16,6 +17,7 @@ const PORT = process.env.PORT && Number(process.env.PORT)
const devStart = process.env.npm_lifecycle_event
const indexHtml = devStart === 'dev' ? 'src/entrance/app/index.html' : 'src/entrance/exportHtml/exportHtml.html'
let devWebpackConfig = ''
+// const smp = new SpeedMeasurePlugin()
devWebpackConfig = merge(baseWebpackConfig, {
mode: 'development',
module: {
@@ -108,7 +110,7 @@ module.exports = new Promise((resolve, reject) => {
? utils.createNotifierCallback()
: undefined
}))
-
+ // devWebpackConfig = smp.wrap(devWebpackConfig)
resolve(devWebpackConfig)
}
})
diff --git a/nezha-fronted/package-lock.json b/nezha-fronted/package-lock.json
index 1b972fc96..e49fbafeb 100644
--- a/nezha-fronted/package-lock.json
+++ b/nezha-fronted/package-lock.json
@@ -4518,6 +4518,12 @@
"integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
"dev": true
},
+ "buffer-json": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmmirror.com/buffer-json/-/buffer-json-2.0.0.tgz",
+ "integrity": "sha512-+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw==",
+ "dev": true
+ },
"buffer-xor": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
@@ -4573,6 +4579,123 @@
"unset-value": "^1.0.0"
}
},
+ "cache-loader": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmmirror.com/cache-loader/-/cache-loader-4.1.0.tgz",
+ "integrity": "sha512-ftOayxve0PwKzBF/GLsZNC9fJBXl8lkZE3TOsjkboHfVHVkL39iUEs1FO07A33mizmci5Dudt38UZrrYXDtbhw==",
+ "dev": true,
+ "requires": {
+ "buffer-json": "^2.0.0",
+ "find-cache-dir": "^3.0.0",
+ "loader-utils": "^1.2.3",
+ "mkdirp": "^0.5.1",
+ "neo-async": "^2.6.1",
+ "schema-utils": "^2.0.0"
+ },
+ "dependencies": {
+ "ajv-keywords": {
+ "version": "3.5.2",
+ "resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+ "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+ "dev": true
+ },
+ "find-cache-dir": {
+ "version": "3.3.2",
+ "resolved": "https://registry.npmmirror.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
+ "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+ "dev": true,
+ "requires": {
+ "commondir": "^1.0.1",
+ "make-dir": "^3.0.2",
+ "pkg-dir": "^4.1.0"
+ }
+ },
+ "find-up": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmmirror.com/find-up/-/find-up-4.1.0.tgz",
+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+ "dev": true,
+ "requires": {
+ "locate-path": "^5.0.0",
+ "path-exists": "^4.0.0"
+ }
+ },
+ "locate-path": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmmirror.com/locate-path/-/locate-path-5.0.0.tgz",
+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+ "dev": true,
+ "requires": {
+ "p-locate": "^4.1.0"
+ }
+ },
+ "make-dir": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmmirror.com/make-dir/-/make-dir-3.1.0.tgz",
+ "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+ "dev": true,
+ "requires": {
+ "semver": "^6.0.0"
+ }
+ },
+ "p-limit": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmmirror.com/p-limit/-/p-limit-2.3.0.tgz",
+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+ "dev": true,
+ "requires": {
+ "p-try": "^2.0.0"
+ }
+ },
+ "p-locate": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmmirror.com/p-locate/-/p-locate-4.1.0.tgz",
+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+ "dev": true,
+ "requires": {
+ "p-limit": "^2.2.0"
+ }
+ },
+ "p-try": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmmirror.com/p-try/-/p-try-2.2.0.tgz",
+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+ "dev": true
+ },
+ "path-exists": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmmirror.com/path-exists/-/path-exists-4.0.0.tgz",
+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+ "dev": true
+ },
+ "pkg-dir": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmmirror.com/pkg-dir/-/pkg-dir-4.2.0.tgz",
+ "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+ "dev": true,
+ "requires": {
+ "find-up": "^4.0.0"
+ }
+ },
+ "schema-utils": {
+ "version": "2.7.1",
+ "resolved": "https://registry.npmmirror.com/schema-utils/-/schema-utils-2.7.1.tgz",
+ "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
+ "dev": true,
+ "requires": {
+ "@types/json-schema": "^7.0.5",
+ "ajv": "^6.12.4",
+ "ajv-keywords": "^3.5.2"
+ }
+ },
+ "semver": {
+ "version": "6.3.0",
+ "resolved": "https://registry.npmmirror.com/semver/-/semver-6.3.0.tgz",
+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+ "dev": true
+ }
+ }
+ },
"cacheable-request": {
"version": "2.1.4",
"resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-2.1.4.tgz",
@@ -14212,7 +14335,7 @@
},
"node-sass": {
"version": "4.14.1",
- "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz",
+ "resolved": "https://registry.npmmirror.com/node-sass/-/node-sass-4.14.1.tgz",
"integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==",
"dev": true,
"requires": {
@@ -17092,7 +17215,7 @@
},
"sass-loader": {
"version": "8.0.2",
- "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-8.0.2.tgz",
+ "resolved": "https://registry.npmmirror.com/sass-loader/-/sass-loader-8.0.2.tgz",
"integrity": "sha512-7o4dbSK8/Ol2KflEmSco4jTjQoV988bM82P9CZdmo9hR3RLnvNc0ufMNdMrB0caq38JQ/FgF4/7RcbcfKzxoFQ==",
"dev": true,
"requires": {
@@ -20586,7 +20709,7 @@
},
"webpack-bundle-analyzer": {
"version": "2.13.1",
- "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.1.tgz",
+ "resolved": "https://registry.npmmirror.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.1.tgz",
"integrity": "sha512-rwxyfecTAxoarCC9VlHlIpfQCmmJ/qWD5bpbjkof+7HrNhTNZIwZITxN6CdlYL2axGmwNUQ+tFgcSOiNXMf/sQ==",
"dev": true,
"requires": {
diff --git a/nezha-fronted/package.json b/nezha-fronted/package.json
index fe2cb8582..05cc9bb73 100644
--- a/nezha-fronted/package.json
+++ b/nezha-fronted/package.json
@@ -105,6 +105,7 @@
"babel-plugin-transform-vue-jsx": "^3.7.0",
"babel-preset-env": "^1.7.0",
"babel-preset-stage-2": "^6.22.0",
+ "cache-loader": "^4.1.0",
"chalk": "^2.0.1",
"copy-webpack-plugin": "^4.0.1",
"css-loader": "^3.5.3",
diff --git a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss
index fa9023310..e8ae29e79 100644
--- a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss
+++ b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss
@@ -428,6 +428,12 @@
line-height: 20px;
margin-top: 5px;
color: $--color-text-primary;
+ .ql-container.ql-snow{
+ border: unset !important;
+ }
+ .ql-editor{
+ padding: 0 !important;
+ }
}
}
.descriptions-info:hover {
@@ -444,6 +450,17 @@
color: $--color-text-regular;
}
}
+ .top-tool-right>.el-input.el-input--small.el-input-group{
+ position: relative;
+ .search-icon-btn{
+ height: 100%;
+ padding: 0 3px;
+ background-color: transparent;
+ border: 0;
+ position: absolute;
+ right: 0;
+ }
+ }
}
//endpoint 二级页面搜索
diff --git a/nezha-fronted/src/assets/css/components/common/labelFilter/clickSearch.scss b/nezha-fronted/src/assets/css/components/common/labelFilter/clickSearch.scss
index b89070a6d..b5ef02264 100644
--- a/nezha-fronted/src/assets/css/components/common/labelFilter/clickSearch.scss
+++ b/nezha-fronted/src/assets/css/components/common/labelFilter/clickSearch.scss
@@ -76,6 +76,7 @@
padding-left: 15px;
padding-right: 80px;
background: $--background-color-empty;
+ overflow: hidden;
div.el-skeleton{
display: flex !important;
align-items: center !important;
diff --git a/nezha-fronted/src/assets/css/components/common/project/L5/topologyTopTool.scss b/nezha-fronted/src/assets/css/components/common/project/L5/topologyTopTool.scss
index aea7ceb85..fb765d766 100644
--- a/nezha-fronted/src/assets/css/components/common/project/L5/topologyTopTool.scss
+++ b/nezha-fronted/src/assets/css/components/common/project/L5/topologyTopTool.scss
@@ -37,7 +37,8 @@
margin-right: 10px;
}
.is-active-meta2d.top-tool-item {
- background: mix(#FFF, $--background-color-disabled, 35%);
+ // background: mix(#FFF, $--background-color-disabled, 35%);
+ background: #0000ff;
border: 1px solid mix(#000, $--background-color-disabled, 35%);
color: $--color-text-disabled;
}
diff --git a/nezha-fronted/src/assets/css/components/common/project/meta2dHeader.scss b/nezha-fronted/src/assets/css/components/common/project/meta2dHeader.scss
index 34ea3bc76..caf21f0cc 100644
--- a/nezha-fronted/src/assets/css/components/common/project/meta2dHeader.scss
+++ b/nezha-fronted/src/assets/css/components/common/project/meta2dHeader.scss
@@ -9,4 +9,8 @@
.tools-left{
display: flex;
}
+ .tools-left-drag{
+ margin-left: 10px;
+ margin-right: 10px;
+ }
}
diff --git a/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss b/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss
index 5f9870cf8..ef2b03d28 100644
--- a/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss
+++ b/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss
@@ -11,7 +11,10 @@
height: 100%;
}
.meta2d-chart{
-
+ .meta2d-project {
+ height: 100% !important;
+ border: none !important;
+ }
}
.meta2d-project{
height: calc(100% - 78px);
diff --git a/nezha-fronted/src/assets/css/components/common/project/meta2dProps.scss b/nezha-fronted/src/assets/css/components/common/project/meta2dProps.scss
index e68fda429..1f20563a6 100644
--- a/nezha-fronted/src/assets/css/components/common/project/meta2dProps.scss
+++ b/nezha-fronted/src/assets/css/components/common/project/meta2dProps.scss
@@ -92,6 +92,11 @@
overflow-y: auto;
}
}
+ .pen-tools-item {
+ margin-right: 5px;
+ font-size:17px;
+ cursor: pointer;
+ }
}
.right-box__container .chart-config .thresholds-item .mapping-display-input input{
padding-left: 15px;
diff --git a/nezha-fronted/src/assets/css/components/common/searchBox.scss b/nezha-fronted/src/assets/css/components/common/searchBox.scss
new file mode 100644
index 000000000..7f2361123
--- /dev/null
+++ b/nezha-fronted/src/assets/css/components/common/searchBox.scss
@@ -0,0 +1,100 @@
+#nz-search-box{
+ .search-box-input {
+ border: 1px solid #E7EAED;
+ white-space: nowrap;
+ width: 400px;
+ overflow: hidden;
+ display: flex;
+ align-items: center;
+ .search-box-input-content{
+ width: calc(100% - 30px);
+ white-space: nowrap;
+ overflow-y: auto;
+ display: flex;
+ align-items: center;
+ .el-input__inner{
+ border: none;
+ }
+ .search-box-tag{
+ display: inline-flex;
+ font-size: 12px;
+ border: 1px solid #e1e4e8;
+ background: #eaecef;
+ height: 20px;
+ padding: 0 8px 0 8px;
+ border-radius: 2px;
+ margin: 2px 4px 2px 4px;
+ align-items: center;
+ }
+ .el-input--mini {
+ display: inline-block;
+ min-width: 100px;
+ width: auto;
+ max-width: 170px;
+ flex: 1;
+ }
+ }
+ .nz-icon-search{
+ display: inline-block;
+ height: 100%;
+ line-height: 1;
+ margin-left: 5px;
+ }
+ }
+ .search-box-tag{
+ display: flex;
+ }
+ .search-item{
+ border-bottom: 1px solid #e1e4e8;
+ font-size: 12px;
+ position: relative;
+ }
+ .search-item.search-item-select {
+ background: #1da1f2;
+ color: #333;
+ .content-remark{
+ color: #fff;
+ }
+ }
+ .icon-k,.icon-s, .icon-v{
+ display: inline-block;
+ width: 26px;
+ height: 100%;
+ line-height: 27px;
+ text-align: center;
+ margin-right: 5px;
+ }
+ .icon-k{
+ color: #ff8f44;
+ background: #fff4ec;
+ }
+ .icon-s{
+ color: #4276e5;
+ background: #eaf1ff;
+ }
+ .icon-v{
+ color: #a884f3;
+ background: #f7f3ff;
+ }
+ .el-popper{
+ padding: 0;
+ }
+ .tag-box{
+ padding: 5px 0px;
+ min-width: 75px;
+ .tag-box-content{
+ display: flex;
+ flex-direction: column;
+ }
+ .search-box-tag{
+ display: inline !important;
+ margin-bottom: 5px !important;
+ }
+ }
+ .content-remark{
+ position: absolute;
+ left: 300px;
+ top: 5px;
+ color: #999;
+ }
+ }
\ No newline at end of file
diff --git a/nezha-fronted/src/assets/css/components/index.scss b/nezha-fronted/src/assets/css/components/index.scss
index 925db1048..f75b86c08 100644
--- a/nezha-fronted/src/assets/css/components/index.scss
+++ b/nezha-fronted/src/assets/css/components/index.scss
@@ -87,6 +87,7 @@
@import './common/nzTransfer.scss';
@import './common/pagination.scss';
@import './common/searchInput.scss';
+@import './common/searchBox.scss';
@import './common/timePicker.scss';
@import './common/deleteButton.scss';
@import './common/diagnosisTab.scss';
diff --git a/nezha-fronted/src/assets/css/components/page/config/system/license.scss b/nezha-fronted/src/assets/css/components/page/config/system/license.scss
index e26228119..44a7e84cd 100644
--- a/nezha-fronted/src/assets/css/components/page/config/system/license.scss
+++ b/nezha-fronted/src/assets/css/components/page/config/system/license.scss
@@ -197,7 +197,9 @@
}
}
.el-dialog__body{
-
+ padding: 20px !important;
+ height: calc(100% - 40px) !important;
+ width: calc(100% - 40px) !important;
}
.el-button{
//background-color: $--background-color-1 !important;
diff --git a/nezha-fronted/src/components/chart/chart/chartAutotopology.vue b/nezha-fronted/src/components/chart/chart/chartAutotopology.vue
index 6d887af54..1d4cbf840 100644
--- a/nezha-fronted/src/components/chart/chart/chartAutotopology.vue
+++ b/nezha-fronted/src/components/chart/chart/chartAutotopology.vue
@@ -129,12 +129,3 @@ export default {
}
}
-
-
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
index 31a312c63..8034bb5b9 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/logBottomTab.vue
@@ -158,16 +158,3 @@ export default {
}
}
-
diff --git a/nezha-fronted/src/components/common/labelFilter/clickSearchNew.vue b/nezha-fronted/src/components/common/labelFilter/clickSearchNew.vue
index 45e87e677..9e1b90d70 100644
--- a/nezha-fronted/src/components/common/labelFilter/clickSearchNew.vue
+++ b/nezha-fronted/src/components/common/labelFilter/clickSearchNew.vue
@@ -328,8 +328,3 @@ export default {
}
}
-
diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dCanvas.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dCanvas.vue
index ee048252c..73cbe8b0b 100644
--- a/nezha-fronted/src/components/common/project/meta2d/meta2dCanvas.vue
+++ b/nezha-fronted/src/components/common/project/meta2d/meta2dCanvas.vue
@@ -345,11 +345,3 @@ export default {
}
}
-
-
diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dHeader.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dHeader.vue
index dad9ec28d..e2e81dcd1 100644
--- a/nezha-fronted/src/components/common/project/meta2d/meta2dHeader.vue
+++ b/nezha-fronted/src/components/common/project/meta2d/meta2dHeader.vue
@@ -224,10 +224,3 @@ export default {
}
}
-
-
diff --git a/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue b/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue
index 58cc08b23..89153adb6 100644
--- a/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue
+++ b/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue
@@ -323,8 +323,3 @@ export default {
}
}
-
diff --git a/nezha-fronted/src/components/common/searchBox/searchBox.vue b/nezha-fronted/src/components/common/searchBox/searchBox.vue
index 8d3d02f18..baafe94b7 100644
--- a/nezha-fronted/src/components/common/searchBox/searchBox.vue
+++ b/nezha-fronted/src/components/common/searchBox/searchBox.vue
@@ -515,106 +515,3 @@ export default {
}
}
-
-
diff --git a/nezha-fronted/src/components/common/table/asset/assetCommentTable.vue b/nezha-fronted/src/components/common/table/asset/assetCommentTable.vue
index 99c797dab..93743cb28 100644
--- a/nezha-fronted/src/components/common/table/asset/assetCommentTable.vue
+++ b/nezha-fronted/src/components/common/table/asset/assetCommentTable.vue
@@ -128,23 +128,3 @@ export default {
}
}
-
diff --git a/nezha-fronted/src/components/page/config/system/license.vue b/nezha-fronted/src/components/page/config/system/license.vue
index cf92ba48d..d3b9ea050 100644
--- a/nezha-fronted/src/components/page/config/system/license.vue
+++ b/nezha-fronted/src/components/page/config/system/license.vue
@@ -456,10 +456,3 @@ export default {
}
}
-