CN-1612 feat: 重构system的知识库css样式，以及修复折线图Metric在中文环境会换行的问题

CN-1594 feat: 调整header left-menu鼠标悬停样式
CN-1594 feat: 统一按钮network-overview-apps
2024-04-10 19:14:23 +08:00 · 2024-04-10 18:38:46 +08:00 · 2024-04-10 18:35:21 +08:00 · 2024-04-10 18:23:41 +08:00 · 2024-04-10 17:02:21 +08:00 · 2024-04-10 16:50:39 +08:00
32948 changed files with 101211 additions and 69710 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,7 +1,8 @@
 module.exports = {
  env: {
    browser: true,
-    es2021: true
+    es2021: true,
+    jest: true
  },
  extends: [
    'plugin:vue/vue3-essential',
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ pnpm-debug.log*
 *.sln
 *.sw?
 ws.js
+/public/tiles/
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,7 @@
 stages:
  - gen_git-log
  - build_project
+  - test
  - build_image

 cache:
@@ -10,7 +11,7 @@ cache:
      - package.json
  paths:
    - node_modules
-    - dist/
+#    - dist/

 before_script:
  - export CNUI_TAG=$(date +%Y%m%d%H%M%S)
@@ -18,7 +19,7 @@ before_script:
 generate_git-log:
  stage: gen_git-log
  script:
-    - if (( `grep git-log.html ./public/index.html | wc -l` == 0 )); then         sed -i 's+</body>+<a style="position:fixed;bottom:20px;left:40px;z-index:999;color:white;" target="_blank" href="./git-log.html">更新记录</a>\n</body>+g' ./public/index.html;         echo "添加更新记录链接"; fi;
+    - if (( `grep git-log.html ./public/index.html | wc -l` == 0 )); then         sed -i 's+</body>+<a style="position:fixed;top:0;left:0;z-index:999;font-size:12px;color:transparent;text-decoration:none;display:none;" target="_blank" href="./git-log.html">R</a>\n</body>+g' ./public/index.html;         echo "添加更新记录链接"; fi;
    - echo "最近的100个提交记录"
    - echo "<!DOCTYPE html><html><head><meta charset='utf-8'></head><body><pre>" > ./public/git-log.html
    - "git log -100 --pretty=format:'%ad : %s' >> ./public/git-log.html"
@@ -31,7 +32,8 @@ generate_git-log:
  only:
    - dev
  tags:
-    - GN-XXG-Server
+    - galaxy
+

 build_project:
  stage: build_project
@@ -40,29 +42,48 @@ build_project:
    - npm install --save-dev --unsafe-perm
    - echo "npm run build"
    - npm run build
+  artifacts:
+    name: "$CI_JOB_NAME-$CI_COMMIT_REF_NAME"
+    when: on_success
+    paths:
+      - dist/
  only:
    - dev
    - tags
  tags:
-    - GN-XXG-Server
+    - galaxy

-build_image:
-  stage: build_image
+test:
+  stage: test
  script:
-    - echo "docker build"
-    - sudo docker build -t dev_cn-ui:$CNUI_TAG .
-    - echo "docker tag"
-    - sudo docker tag dev_cn-ui:$CNUI_TAG 192.168.40.153:9080/cyber-narrator/dev_cn-ui:$CNUI_TAG
-    - echo "docker push"
-    - sudo docker push 192.168.40.153:9080/cyber-narrator/dev_cn-ui:$CNUI_TAG
+    - cnpm run test
  when: on_success
  only:
    - dev
  tags:
-    - GN-XXG-Server
+    - galaxy
+
+build_image:
+  dependencies:
+    - build_project
+  stage: build_image
+  script:
+    - echo "docker build"
+    - sudo docker build --no-cache -t cn-ui-$CI_COMMIT_REF_NAME:$CNUI_TAG .
+    - echo "docker tag"
+    - sudo docker tag cn-ui-$CI_COMMIT_REF_NAME:$CNUI_TAG 192.168.40.153:9080/cyber-narrator/cn-ui-$CI_COMMIT_REF_NAME:$CNUI_TAG
+    - echo "docker push"
+    - sudo docker push 192.168.40.153:9080/cyber-narrator/cn-ui-$CI_COMMIT_REF_NAME:$CNUI_TAG
+  when: on_success
+  only:
+    - dev
+  tags:
+    - galaxy


 build_release_image:
+  dependencies:
+    - build_project
  stage: build_image
  script:
    - echo 'tag名称是'
@@ -70,12 +91,12 @@ build_release_image:
    - echo '提交的版本是'
    - echo $CI_COMMIT_REF_NAME
    - echo "docker build"
-    - sudo docker build -t dev_cn-ui:$CI_COMMIT_TAG .
+    - sudo docker build --no-cache -t cn-ui:$CI_COMMIT_TAG .
    - echo "docker tag"
-    - sudo docker tag dev_cn-ui:$CI_COMMIT_TAG 192.168.40.153:9080/cyber-narrator/dev_cn-ui:$CI_COMMIT_TAG
+    - sudo docker tag cn-ui:$CI_COMMIT_TAG 192.168.40.153:9080/cyber-narrator/cn-ui:$CI_COMMIT_TAG
    - echo "docker push"
-    - sudo docker push 192.168.40.153:9080/cyber-narrator/dev_cn-ui:$CI_COMMIT_TAG
+    - sudo docker push 192.168.40.153:9080/cyber-narrator/cn-ui:$CI_COMMIT_TAG
  only:
    - tags
  tags:
-    - GN-XXG-Server
+    - galaxy
--- a/2.md
+++ b/2.md
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ npm run lint

 ### 3.图表组件库
 图表：echarts5.0  
-地图：amCharts  
+地图：amCharts4  
 拖拽 & Resize：Vue-grid-layout &nbsp;https://jbaysolutions.github.io/vue-grid-layout/guide/

 ### 4.响应式方案
@@ -51,7 +51,7 @@ https://www.lodashjs.com/
 多个单词时，应该以高阶的 (通常是一般化描述的) 单词开头，以描述性的修饰词结尾  
 eg：`SearchButtonClear.vue` 反例：`ClearSearchButton.vue`
 - **文件夹**  
-使用小写，单词间使用连字符`-`连接，或使用驼峰格式 
+使用小写，单词间使用连字符`-`连接，或使用驼峰格式  
 eg：`right-box`、`rightBox`


--- a/babel.config.js
+++ b/babel.config.js
@@ -12,7 +12,9 @@ module.exports = {
  ],
  plugins: [
    '@vue/babel-plugin-jsx',
-    '@babel/proposal-class-properties',
+    ['@babel/plugin-proposal-class-properties', { loose: true }],
+    ['@babel/plugin-proposal-private-methods', { loose: true }],
+    ['@babel/plugin-proposal-private-property-in-object', { loose: true }],
    '@babel/transform-runtime',
    'lodash'
  ],
--- a/jest.config.js
+++ b/jest.config.js
@@ -0,0 +1,35 @@
+module.exports = {
+  roots: [
+    '<rootDir>/test'
+  ],
+  testMatch: [
+    '<rootDir>/test/**/__tests__/**/*.{vue,js,jsx,ts,tsx}',
+    '<rootDir>/test/**/*.{spec,test}.{vue,js,jsx,ts,tsx}'
+  ],
+  setupFilesAfterEnv: ['<rootDir>/test/init.js'],
+  verbose: true,
+  testEnvironment: 'jsdom',
+  transform: {
+    '^.+\\.(vue)$': '<rootDir>/node_modules/vue-jest',
+    '^.+\\.(js|jsx|mjs|cjs|ts|tsx)$': '<rootDir>/node_modules/babel-jest'
+  },
+  transformIgnorePatterns: [
+    '<rootDir>/node_modules/',
+    '[/\\\\]node_modules[/\\\\].+\\.(js|jsx|mjs|cjs|ts|tsx)$',
+    '^.+\\.module\\.(css|sass|scss|less)$'
+  ],
+  moduleFileExtensions: [
+    'vue',
+    'js',
+    'jsx',
+    'ts',
+    'tsx',
+    'json',
+    'node'
+  ],
+  moduleNameMapper: {
+    '@/(.*)$': '<rootDir>/src/$1',
+    '\\.(css|less|scss|sass)$': '<rootDir>/test/__mocks__/styleMock.js'
+  },
+  resetMocks: true
+}
--- a/nginx_server.conf
+++ b/nginx_server.conf
@@ -0,0 +1,50 @@
+server {
+    listen       80;
+    listen  [::]:80;
+    server_name  localhost;
+
+    #access_log  /var/log/nginx/host.access.log  main;
+
+    client_max_body_size	3072m;
+
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+    }
+
+    location /api {
+        proxy_pass	http://127.0.0.1:8090/;
+    }
+
+    #error_page  404              /404.html;
+
+    # redirect server error pages to the static page /50x.html
+    #
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+
+    # proxy the PHP scripts to Apache listening on 127.0.0.1:80
+    #
+    #location ~ \.php$ {
+    #    proxy_pass   http://127.0.0.1;
+    #}
+
+    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
+    #
+    #location ~ \.php$ {
+    #    root           html;
+    #    fastcgi_pass   127.0.0.1:9000;
+    #    fastcgi_index  index.php;
+    #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
+    #    include        fastcgi_params;
+    #}
+
+    # deny access to .htaccess files, if Apache's document root
+    # concurs with nginx's one
+    #
+    #location ~ /\.ht {
+    #    deny  all;
+    #}
+}
--- a/0
+++ b/0
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -6,58 +6,72 @@
    "serve": "vue-cli-service serve",
    "build": "cross-env NODE_ENV=production vue-cli-service build",
    "lint": "vue-cli-service lint",
+    "test": "jest",
    "analyz": "cross-env NODE_ENV=production npm_config_report=true npm run build"
  },
  "dependencies": {
-    "@amcharts/amcharts4": "^4.10.20",
+    "@amcharts/amcharts4": "^4.10.38",
    "@amcharts/amcharts4-geodata": "^4.1.20",
+    "@antv/g6": "^4.8.17",
+    "@element-plus/icons-vue": "^2.3.1",
    "axios": "^0.21.1",
-    "babel-plugin-lodash": "^3.3.4",
+    "babel-plugin-lodash": "~3.3.0",
    "codemirror": "^5.65.1",
-    "core-js": "^3.6.5",
+    "core-js": "~3.31.0",
    "dayjs": "^1.10.5",
-    "dt-sql-parser": "^4.0.0-beta.2.2",
+    "dexie": "~3.2.0",
    "echarts": "^5.1.1",
-    "element-plus": "^1.0.2-beta.44",
-    "leaflet": "^1.7.1",
+    "element-plus": "^2.5.1",
+    "h3-js": "~3.7.2",
    "lib-flexible": "^0.3.2",
    "lodash": "^4.17.21",
+    "maplibre-gl": "3.6.2",
+    "mockjs": "^1.1.0",
    "moment-timezone": "^0.5.33",
-    "node-sass": "^4.14.1",
+    "postcss-plugin-px2rem": "~0.8.1",
    "postcss-px2rem-exclude": "0.0.6",
-    "sass-loader": "^8.0.2",
-    "sass-resources-loader": "^2.2.1",
+    "sass": "^1.72.0",
+    "sass-loader": "~8.0.2",
    "tiny-emitter": "^2.1.0",
-    "vue": "^3.0.0",
+    "vue": "~3.3.0",
    "vue-grid-layout": "^3.0.0-beta1",
-    "vue-i18n": "^9.1.6",
-    "vue-router": "^4.0.8",
-    "vuex": "^4.0.1"
+    "vue-i18n": "~9.2.0",
+    "vue-router": "~4.2.0",
+    "vuex": "~4.1.0"
  },
  "devDependencies": {
-    "@babel/cli": "^7.12.1",
-    "@babel/core": "^7.11.4",
-    "@babel/plugin-proposal-class-properties": "^7.12.1",
-    "@babel/plugin-transform-runtime": "^7.12.1",
-    "@babel/preset-env": "^7.11.5",
-    "@babel/preset-typescript": "^7.10.4",
+    "@babel/cli": "~7.22.0",
+    "@babel/core": "~7.22.5",
+    "@babel/plugin-proposal-class-properties": "~7.18.0",
+    "@babel/plugin-proposal-private-methods": "~7.18.0",
+    "@babel/plugin-proposal-private-property-in-object": "~7.21.0",
+    "@babel/plugin-transform-runtime": "~7.22.0",
+    "@babel/preset-env": "~7.22.0",
+    "@babel/preset-typescript": "~7.22.0",
    "@commitlint/cli": "^9.1.2",
    "@commitlint/config-conventional": "^9.1.2",
    "@highlightjs/vue-plugin": "^2.0.1",
    "@rollup/plugin-commonjs": "^15.1.0",
    "@rollup/plugin-node-resolve": "^9.0.0",
    "@rollup/plugin-typescript": "^6.0.0",
-    "@types/jest": "^26.0.10",
+    "@testing-library/jest-dom": "~5.16.0",
+    "@testing-library/user-event": "~14.4.0",
+    "@testing-library/vue": "~6.6.0",
+    "@types/jest": "~26.0.0",
    "@types/lodash": "^4.14.161",
    "@typescript-eslint/eslint-plugin": "^3.10.1",
    "@typescript-eslint/parser": "^3.10.1",
-    "@vue/babel-plugin-jsx": "^1.0.0",
+    "@vue/babel-plugin-jsx": "~1.1.0",
+    "@vue/babel-preset-app": "~5.0.0",
    "@vue/cli-plugin-babel": "~4.5.0",
    "@vue/cli-plugin-eslint": "~4.5.0",
    "@vue/cli-service": "~4.5.0",
-    "@vue/compiler-sfc": "^3.0.0",
-    "@vue/component-compiler-utils": "^3.2.0",
+    "@vue/compiler-sfc": "~3.3.0",
+    "@vue/component-compiler-utils": "~3.3.0",
+    "@vue/server-renderer": "~3.3.0",
+    "@vue/test-utils": "~2.4.0",
    "babel-eslint": "^10.1.0",
+    "babel-jest": "^26.0.0",
    "compression-webpack-plugin": "^8.0.1",
    "cross-env": "^7.0.3",
    "eslint": "^7.22.0",
@@ -66,8 +80,12 @@
    "eslint-plugin-node": "^11.1.0",
    "eslint-plugin-promise": "^4.3.1",
    "eslint-plugin-vue": "^7.7.0",
+    "jest": "~26.6.0",
+    "ts-jest": "~26.5.0",
    "uglifyjs-webpack-plugin": "^2.2.0",
-    "vue3-ace-editor": "^2.0.2"
+    "unplugin-auto-import": "^0.17.5",
+    "unplugin-vue-components": "^0.26.0",
+    "vue-jest": "^5.0.0-alpha.10"
  },
  "browserslist": [
    "> 1%",
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -1,9 +1,11 @@
 module.exports = {
  plugins: {
-    autoprefixer: {}
-    /* 'postcss-px2rem-exclude': {
-      remUnit: 16,
-      exclude: /node_modules/i
-    } */
+    autoprefixer: {},
+    'postcss-plugin-px2rem': {
+      rootValue: 14,
+      exclude: /node_modules/i,
+      minPixelValue: 3,
+      selectorBlackList: ['.html', 'iconfont', '.ttf', '.css']
+    }
  }
 }
--- a/public/Tiles/1/0/0.png
+++ b/public/Tiles/1/0/0.png
--- a/public/Tiles/1/0/1.png
+++ b/public/Tiles/1/0/1.png
--- a/public/Tiles/1/1/0.png
+++ b/public/Tiles/1/1/0.png
--- a/public/Tiles/1/1/1.png
+++ b/public/Tiles/1/1/1.png
--- a/public/Tiles/10/602/318.png
+++ b/public/Tiles/10/602/318.png
--- a/public/Tiles/10/602/319.png
+++ b/public/Tiles/10/602/319.png
--- a/public/Tiles/10/602/320.png
+++ b/public/Tiles/10/602/320.png
--- a/public/Tiles/10/602/321.png
+++ b/public/Tiles/10/602/321.png
--- a/public/Tiles/10/602/322.png
+++ b/public/Tiles/10/602/322.png
--- a/public/Tiles/10/602/323.png
+++ b/public/Tiles/10/602/323.png
--- a/public/Tiles/10/602/324.png
+++ b/public/Tiles/10/602/324.png
--- a/public/Tiles/10/602/325.png
+++ b/public/Tiles/10/602/325.png
--- a/public/Tiles/10/602/326.png
+++ b/public/Tiles/10/602/326.png
--- a/public/Tiles/10/602/327.png
+++ b/public/Tiles/10/602/327.png
--- a/public/Tiles/10/602/328.png
+++ b/public/Tiles/10/602/328.png
--- a/public/Tiles/10/602/329.png
+++ b/public/Tiles/10/602/329.png
--- a/public/Tiles/10/602/330.png
+++ b/public/Tiles/10/602/330.png
--- a/public/Tiles/10/602/331.png
+++ b/public/Tiles/10/602/331.png
--- a/public/Tiles/10/602/332.png
+++ b/public/Tiles/10/602/332.png
--- a/public/Tiles/10/602/333.png
+++ b/public/Tiles/10/602/333.png
--- a/public/Tiles/10/602/334.png
+++ b/public/Tiles/10/602/334.png
--- a/public/Tiles/10/602/335.png
+++ b/public/Tiles/10/602/335.png
--- a/public/Tiles/10/602/336.png
+++ b/public/Tiles/10/602/336.png
--- a/public/Tiles/10/602/337.png
+++ b/public/Tiles/10/602/337.png
--- a/public/Tiles/10/602/338.png
+++ b/public/Tiles/10/602/338.png
--- a/public/Tiles/10/602/339.png
+++ b/public/Tiles/10/602/339.png
--- a/public/Tiles/10/602/340.png
+++ b/public/Tiles/10/602/340.png
--- a/public/Tiles/10/602/341.png
+++ b/public/Tiles/10/602/341.png
--- a/public/Tiles/10/602/342.png
+++ b/public/Tiles/10/602/342.png
--- a/public/Tiles/10/602/343.png
+++ b/public/Tiles/10/602/343.png
--- a/public/Tiles/10/602/344.png
+++ b/public/Tiles/10/602/344.png
--- a/public/Tiles/10/602/345.png
+++ b/public/Tiles/10/602/345.png
--- a/public/Tiles/10/602/346.png
+++ b/public/Tiles/10/602/346.png
--- a/public/Tiles/10/602/347.png
+++ b/public/Tiles/10/602/347.png
--- a/public/Tiles/10/602/348.png
+++ b/public/Tiles/10/602/348.png
--- a/public/Tiles/10/602/349.png
+++ b/public/Tiles/10/602/349.png
--- a/public/Tiles/10/602/350.png
+++ b/public/Tiles/10/602/350.png
--- a/public/Tiles/10/602/351.png
+++ b/public/Tiles/10/602/351.png
--- a/public/Tiles/10/602/352.png
+++ b/public/Tiles/10/602/352.png
--- a/public/Tiles/10/602/353.png
+++ b/public/Tiles/10/602/353.png
--- a/public/Tiles/10/602/354.png
+++ b/public/Tiles/10/602/354.png
--- a/public/Tiles/10/602/355.png
+++ b/public/Tiles/10/602/355.png
--- a/public/Tiles/10/602/356.png
+++ b/public/Tiles/10/602/356.png
--- a/public/Tiles/10/602/357.png
+++ b/public/Tiles/10/602/357.png
--- a/public/Tiles/10/602/358.png
+++ b/public/Tiles/10/602/358.png
--- a/public/Tiles/10/602/359.png
+++ b/public/Tiles/10/602/359.png
--- a/public/Tiles/10/602/360.png
+++ b/public/Tiles/10/602/360.png
--- a/public/Tiles/10/602/361.png
+++ b/public/Tiles/10/602/361.png
--- a/public/Tiles/10/602/362.png
+++ b/public/Tiles/10/602/362.png
--- a/public/Tiles/10/602/363.png
+++ b/public/Tiles/10/602/363.png
--- a/public/Tiles/10/602/364.png
+++ b/public/Tiles/10/602/364.png
--- a/public/Tiles/10/602/365.png
+++ b/public/Tiles/10/602/365.png
--- a/public/Tiles/10/602/366.png
+++ b/public/Tiles/10/602/366.png
--- a/public/Tiles/10/602/367.png
+++ b/public/Tiles/10/602/367.png
--- a/public/Tiles/10/602/368.png
+++ b/public/Tiles/10/602/368.png
--- a/public/Tiles/10/602/369.png
+++ b/public/Tiles/10/602/369.png
--- a/public/Tiles/10/602/370.png
+++ b/public/Tiles/10/602/370.png
--- a/public/Tiles/10/602/371.png
+++ b/public/Tiles/10/602/371.png
--- a/public/Tiles/10/602/372.png
+++ b/public/Tiles/10/602/372.png
--- a/public/Tiles/10/602/373.png
+++ b/public/Tiles/10/602/373.png
--- a/public/Tiles/10/602/374.png
+++ b/public/Tiles/10/602/374.png
--- a/public/Tiles/10/602/375.png
+++ b/public/Tiles/10/602/375.png
--- a/public/Tiles/10/602/376.png
+++ b/public/Tiles/10/602/376.png
--- a/public/Tiles/10/602/377.png
+++ b/public/Tiles/10/602/377.png
--- a/public/Tiles/10/602/378.png
+++ b/public/Tiles/10/602/378.png
--- a/public/Tiles/10/602/379.png
+++ b/public/Tiles/10/602/379.png
--- a/public/Tiles/10/602/380.png
+++ b/public/Tiles/10/602/380.png
--- a/public/Tiles/10/602/381.png
+++ b/public/Tiles/10/602/381.png
--- a/public/Tiles/10/602/382.png
+++ b/public/Tiles/10/602/382.png
--- a/public/Tiles/10/602/383.png
+++ b/public/Tiles/10/602/383.png
--- a/public/Tiles/10/602/384.png
+++ b/public/Tiles/10/602/384.png
--- a/public/Tiles/10/602/385.png
+++ b/public/Tiles/10/602/385.png
--- a/public/Tiles/10/602/386.png
+++ b/public/Tiles/10/602/386.png
--- a/public/Tiles/10/602/387.png
+++ b/public/Tiles/10/602/387.png
--- a/public/Tiles/10/602/388.png
+++ b/public/Tiles/10/602/388.png
--- a/public/Tiles/10/602/389.png
+++ b/public/Tiles/10/602/389.png
--- a/public/Tiles/10/602/390.png
+++ b/public/Tiles/10/602/390.png
--- a/public/Tiles/10/602/391.png
+++ b/public/Tiles/10/602/391.png
--- a/public/Tiles/10/602/392.png
+++ b/public/Tiles/10/602/392.png
--- a/public/Tiles/10/602/393.png
+++ b/public/Tiles/10/602/393.png
--- a/public/Tiles/10/602/394.png
+++ b/public/Tiles/10/602/394.png
--- a/public/Tiles/10/602/395.png
+++ b/public/Tiles/10/602/395.png
--- a/public/Tiles/10/602/396.png
+++ b/public/Tiles/10/602/396.png
--- a/public/Tiles/10/602/397.png
+++ b/public/Tiles/10/602/397.png
--- a/public/Tiles/10/602/398.png
+++ b/public/Tiles/10/602/398.png
--- a/public/Tiles/10/602/399.png
+++ b/public/Tiles/10/602/399.png
--- a/public/Tiles/10/602/400.png
+++ b/public/Tiles/10/602/400.png
--- a/public/Tiles/10/602/401.png
+++ b/public/Tiles/10/602/401.png
--- a/Show More
+++ b/Show More