Merge branch 'dev-3.3' of git.mesalab.cn:nezha/nezha-fronted into dev-3.3

2022-04-12 18:14:18 +08:00
parent c4b06d370f c56b81f1c7
commit 44e72ad3b0
14 changed files with 1130 additions and 437 deletions
--- a/nezha-fronted/build/build.js
+++ b/nezha-fronted/build/build.js
@@ -4,8 +4,8 @@ require('./check-versions')()
 let arg = process.argv.splice(2)[0];
 process.env.NODE_ENV = arg == 'dev' ? 'development' : 'production'
 process.env.BUILD_MODE = arg
-
 const ora = require('ora')
+
 const rm = require('rimraf')
 const path = require('path')
 const chalk = require('chalk')
--- a/nezha-fronted/build/script/buildEnd.sh
+++ b/nezha-fronted/build/script/buildEnd.sh
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-BUILD_MODE=$1
-
-CUR_PATH=`pwd`
-echo 'cur path is '${CUR_PATH}
-DIST_PATH=$CUR_PATH/dist
-
-echo 'dist dir path is '${DIST_PATH}
-
-cp -f src/assets/img/explore-tab-logo.png $DIST_PATH/static
-
-cd $DIST_PATH
-
-if [[ 'all' == "${BUILD_MODE}" ]];then
-	echo 'build all to zip file ,now moving map picture to static dir...'
-	\cp -rf ../static/Tiles/ $DIST_PATH/static/
-fi
-echo 'start create zip...'
-
-#find ./ * -exec touch -t $(date +%Y%m%d0000.00) {} \;
-
-#find ./ * -exec touch -t 202104301200.00 {} \;
-
-zip -rX nz-gui.zip ./* >/dev/null
-
-MD5=$(md5sum nz-gui.zip |awk '{print $1}'|cut -c 1-8)
-mv nz-gui.zip nz-gui-${MD5}.zip
-
-echo 'package zip file is complate ,please check in '${DIST_PATH}
--- a/nezha-fronted/build/script/buildStart.sh
+++ b/nezha-fronted/build/script/buildStart.sh
@@ -1,3 +0,0 @@
-#!/bin/bash
-echo 'clean dist dir ...'
-rm -rf dist
--- a/nezha-fronted/build/webpack.prod.conf.js
+++ b/nezha-fronted/build/webpack.prod.conf.js
@@ -1,5 +1,6 @@
 'use strict'
 const path = require('path')
+
 const utils = require('./utils')
 const webpack = require('webpack')
 const config = require('../config')
@@ -9,28 +10,28 @@ const CopyWebpackPlugin = require('copy-webpack-plugin')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
 const ExtractTextPlugin = require('extract-text-webpack-plugin')
 const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
-const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
+const ParallelUglifyPlugin = require('webpack-parallel-uglify-plugin')
 const fileManagerPlugin = require('filemanager-webpack-plugin')
 const WebpackZipPlugin = require('webpack-zip-plugin')
 // const GitRevisionPlugin = require('git-revision-webpack-plugin')
-const GenerateAssetPlugin = require('generate-asset-webpack-plugin');
-const WebpackShellPlugin = require('webpack-shell-plugin');
+const GenerateAssetPlugin = require('generate-asset-webpack-plugin')
+const WebpackShellPlugin = require('webpack-shell-plugin')

-const serverConfig = require('../static/config.json')//引入根目录下的配置文件
+const serverConfig = require('../static/config.json')// 引入根目录下的配置文件

 // const gitRevisionPlugin = new GitRevisionPlugin();
-const createJson = function() {
+const createJson = function () {
  // serverConfig.version=config.build.version +"-"+gitRevisionPlugin.commithash();
-  serverConfig.version=config.build.version;
-  return JSON.stringify(serverConfig);
-};
+  serverConfig.version = config.build.version
+  return JSON.stringify(serverConfig)
+}

 const env = require('../config/prod.env')
-/*const GenerateAssetPlugin = require('generate-asset-webpack-plugin');
+/* const GenerateAssetPlugin = require('generate-asset-webpack-plugin');
 const createConfig = function(compilation){
  let cfgJson={baseUrl:"http://192.168.40.247:8080/nz-admin"};
  return JSON.stringify(cfgJson);
-}*/
+} */
 const webpackConfig = merge(baseWebpackConfig, {
  module: {
    rules: utils.styleLoaders({
@@ -46,26 +47,29 @@ const webpackConfig = merge(baseWebpackConfig, {
    chunkFilename: utils.assetsPath('js/[name].[chunkhash].js')
  },
  plugins: [
-    /*new GenerateAssetPlugin({
+    /* new GenerateAssetPlugin({
      filename: 'config.json',
      fn: (compilation, cb) => {
        cb(null, createConfig(compilation));
      },
      extraFiles: []
-    }),*/
+    }), */
    // http://vuejs.github.io/vue-loader/en/workflow/production.html
    new webpack.DefinePlugin({
      'process.env': env
    }),
-    new UglifyJsPlugin({
-      uglifyOptions: {
+    new ParallelUglifyPlugin({
+      cacheDir: '.cache/',
+      uglifyJS: {
+        output: {
+          comments: false
+        },
+        warnings: false,
        compress: {
-          warnings: false
+          drop_debugger: true,
+          drop_console: true
        }
-      },
-      exclude: /manifest.+js/,
-      sourceMap: config.build.productionSourceMap,
-      parallel: true
+      }
    }),
    // extract css into its own file
    new ExtractTextPlugin({
@@ -74,7 +78,7 @@ const webpackConfig = merge(baseWebpackConfig, {
      // Their CSS will instead be inserted dynamically with style-loader when the codesplit chunk has been loaded by webpack.
      // It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`,
      // increasing file size: https://github.com/vuejs-templates/webpack/issues/1110
-      allChunks: true,
+      allChunks: true
    }),
    // Compress extracted CSS. We are using this plugin so that possible
    // duplicated CSS from different components can be deduped.
@@ -89,7 +93,7 @@ const webpackConfig = merge(baseWebpackConfig, {
    new HtmlWebpackPlugin({
      filename: config.build.index,
      template: 'index.html',
-      hash:false,
+      hash: false,
      inject: true,
      minify: {
        removeComments: true,
@@ -104,8 +108,8 @@ const webpackConfig = merge(baseWebpackConfig, {
    new GenerateAssetPlugin({
      filename: 'static/config.json',
      fn: (compilation, cb) => {
-        cb(null, createJson());
-      },
+        cb(null, createJson())
+      }
    }),
    // keep module.id stable when vendor modules does not change
    new webpack.HashedModuleIdsPlugin(),
@@ -148,63 +152,94 @@ const webpackConfig = merge(baseWebpackConfig, {
        to: config.build.assetsSubDirectory,
        ignore: ['*']
      }
-    ]),
+    ])
  ]
 })

-if(process.env.NODE_ENV == 'development'){
+if (process.env.NODE_ENV == 'development') {
  webpackConfig.plugins.push(
    new fileManagerPlugin({
-      onStart:[
+      onStart: [
        {
-          delete:[path.join(__dirname,'../dist/') ]
+          delete: [path.join(__dirname, '../dist/')]
        }
      ],
      onEnd: [
        {
-          move:[
-            { source: path.join(__dirname,'../dist','/static/config.json'), destination: path.join(__dirname,'../dist/config.json') },
+          move: [
+            { source: path.join(__dirname, '../dist', '/static/config.json'), destination: path.join(__dirname, '../dist/config.json') }

          ],
-          mkdir:[
-            path.join(__dirname,'../dist','/static')
+          mkdir: [
+            path.join(__dirname, '../dist', '/static')
          ],
-          copy:[
-            { source: path.join(__dirname,'../dist','/config.json'), destination: path.join(__dirname,'../dist','/static/config.json') }
-          ],
-        },
-        {
-          delete:[
-            path.join(__dirname,'../dist','/config.json')
+          copy: [
+            { source: path.join(__dirname, '../dist', '/config.json'), destination: path.join(__dirname, '../dist', '/static/config.json') }
          ]
        },
        {
-          archive:[
-            { source: path.join(__dirname,'../dist'), destination: path.join(__dirname,'../dist','/nz-gui.zip') }
+          delete: [
+            path.join(__dirname, '../dist', '/config.json')
+          ]
+        },
+        {
+          archive: [
+            { source: path.join(__dirname, '../dist'), destination: path.join(__dirname, '../dist', '/nz-gui.zip') }
+          ]
+        }
+      ]
+    })
+  )
+} else {
+  webpackConfig.plugins.push(
+    new fileManagerPlugin({
+      onStart: [
+        {
+          delete: [path.join(__dirname, '../dist/')]
+        }
+      ],
+      onEnd: [
+        {
+          move: [
+            { source: path.join(__dirname, '../dist', '/static/config.json'), destination: path.join(__dirname, '../dist/config.json') }
+
+          ],
+          mkdir: [
+            path.join(__dirname, '../dist', '/static')
+          ],
+          copy: [
+            { source: path.join(__dirname, '../dist', '/config.json'), destination: path.join(__dirname, '../dist', '/static/config.json') }
+          ]
+        },
+        {
+          delete: [
+            path.join(__dirname, '../dist', '/config.json'),
+            path.join(__dirname, '../.cache/')
+          ]
+        },
+        {
+          archive: [
+            { source: path.join(__dirname, '../dist'), destination: path.join(__dirname, '../dist', '/nz-gui.zip') }
          ]
        }
      ]
    }),
-
-  )
-}else{
-  webpackConfig.plugins.push(
    // new WebpackZipPlugin({
    //   initialFile: './dist',
    //   endPath: './dist',
-    //   zipName: 'nz-gui.zip',
-    //   behindShell: 'cd '+path.join(__dirname,'../dist/')+";md5=`md5sum nz-gui.zip |awk '{print $1}'|cut -c 1-8`;mv nz-gui.zip nz-gui-${md5}.zip;"+(process.env.BUILD_MODE=='all'?'mkdir -p ./dist/static;echo "start add map picture to zip file,it will take a few moment,please wait...";cp -r ../static/Tiles dist/static/;zip -gr nz-gui-${md5}.zip dist/static/Tiles>/dev/null;rm -rf dist;':'')
-    // }),
-    new WebpackShellPlugin({
-      onBuildStart: ['/bin/bash '+path.join(__dirname,'script')+'/buildStart.sh'],
-      onBuildEnd: ['/bin/bash '+path.join(__dirname,'script')+'/buildEnd.sh '+process.env.BUILD_MODE]
-    }),
+    //   zipName: 'nz-gui.zip'
+    //   // behindShell: 'cd ' + path.join(__dirname, '../dist/') + ";md5=`md5sum nz-gui.zip |awk '{print $1}'|cut -c 1-8`;mv nz-gui.zip nz-gui-${md5}.zip;" + (process.env.BUILD_MODE == 'all' ? 'mkdir -p ./dist/static;echo "start add map picture to zip file,it will take a few moment,please wait...";cp -r ../static/Tiles dist/static/;zip -gr nz-gui-${md5}.zip dist/static/Tiles>/dev/null;rm -rf dist;' : '')
+    // })
+    // new WebpackShellPlugin({
+    //   onBuildStart: ['/bin/bash ' + path.join(__dirname, 'script') + '/buildStart.sh'],
+    //   onBuildEnd: ['/bin/bash ' + path.join(__dirname, 'script') + '/buildEnd.sh ' + process.env.BUILD_MODE]
+    // })
    // new fileManagerPlugin({
-    //   onStart:[
+    //   onStart: [
    //     {
-    //       delete:[path.join(__dirname,'../dist/') ]
+    //       delete: [path.join(__dirname, '../dist/')]
    //     }
-    //   ],
+    //   ]
    // })
  )
 }
--- a/nezha-fronted/package-lock.json
+++ b/nezha-fronted/package-lock.json
@@ -813,14 +813,23 @@
      }
    },
    "asn1.js": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
-      "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+      "version": "5.4.1",
+      "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
+      "integrity": "sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==",
      "dev": true,
      "requires": {
        "bn.js": "^4.0.0",
        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0"
+        "minimalistic-assert": "^1.0.0",
+        "safer-buffer": "^2.1.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
      }
    },
    "assert": {
@@ -1956,9 +1965,9 @@
      "dev": true
    },
    "bn.js": {
-      "version": "4.11.8",
-      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
+      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==",
      "dev": true
    },
    "body-parser": {
@@ -2089,28 +2098,49 @@
      }
    },
    "browserify-rsa": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
-      "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.1.0.tgz",
+      "integrity": "sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==",
      "dev": true,
      "requires": {
-        "bn.js": "^4.1.0",
+        "bn.js": "^5.0.0",
        "randombytes": "^2.0.1"
      }
    },
    "browserify-sign": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
-      "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
+      "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
      "dev": true,
      "requires": {
-        "bn.js": "^4.1.1",
-        "browserify-rsa": "^4.0.0",
-        "create-hash": "^1.1.0",
-        "create-hmac": "^1.1.2",
-        "elliptic": "^6.0.0",
-        "inherits": "^2.0.1",
-        "parse-asn1": "^5.0.0"
+        "bn.js": "^5.1.1",
+        "browserify-rsa": "^4.0.1",
+        "create-hash": "^1.2.0",
+        "create-hmac": "^1.1.7",
+        "elliptic": "^6.5.3",
+        "inherits": "^2.0.4",
+        "parse-asn1": "^5.1.5",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        }
      }
    },
    "browserify-zlib": {
@@ -3181,13 +3211,21 @@
      }
    },
    "create-ecdh": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
-      "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz",
+      "integrity": "sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==",
      "dev": true,
      "requires": {
        "bn.js": "^4.1.0",
-        "elliptic": "^6.0.0"
+        "elliptic": "^6.5.3"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
      }
    },
    "create-hash": {
@@ -4676,6 +4714,14 @@
        "bn.js": "^4.1.0",
        "miller-rabin": "^4.0.0",
        "randombytes": "^2.0.0"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
      }
    },
    "dir-glob": {
@@ -4874,18 +4920,26 @@
      }
    },
    "elliptic": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz",
-      "integrity": "sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==",
+      "version": "6.5.4",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.4.tgz",
+      "integrity": "sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==",
      "dev": true,
      "requires": {
-        "bn.js": "^4.4.0",
-        "brorand": "^1.0.1",
+        "bn.js": "^4.11.9",
+        "brorand": "^1.1.0",
        "hash.js": "^1.0.0",
-        "hmac-drbg": "^1.0.0",
-        "inherits": "^2.0.1",
-        "minimalistic-assert": "^1.0.0",
-        "minimalistic-crypto-utils": "^1.0.0"
+        "hmac-drbg": "^1.0.1",
+        "inherits": "^2.0.4",
+        "minimalistic-assert": "^1.0.1",
+        "minimalistic-crypto-utils": "^1.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
      }
    },
    "emoji-regex": {
@@ -4996,14 +5050,14 @@
      }
    },
    "es5-ext": {
-      "version": "0.10.53",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
-      "integrity": "sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==",
+      "version": "0.10.60",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.60.tgz",
+      "integrity": "sha512-jpKNXIt60htYG59/9FGf2PYT3pwMpnEbNKysU+k/4FGwyGtMotOvcZOuW+EmXXYASRqYSXQfGL5cVIthOTgbkg==",
      "dev": true,
      "requires": {
-        "es6-iterator": "~2.0.3",
-        "es6-symbol": "~3.1.3",
-        "next-tick": "~1.0.0"
+        "es6-iterator": "^2.0.3",
+        "es6-symbol": "^3.1.3",
+        "next-tick": "^1.1.0"
      }
    },
    "es6-iterator": {
@@ -5761,12 +5815,20 @@
      }
    },
    "esrecurse": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
      "dev": true,
      "requires": {
-        "estraverse": "^4.1.0"
+        "estraverse": "^5.2.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "5.3.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+          "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+          "dev": true
+        }
      }
    },
    "estraverse": {
@@ -5804,9 +5866,9 @@
      "dev": true
    },
    "events": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
-      "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
      "dev": true
    },
    "eventsource": {
@@ -5964,18 +6026,18 @@
      }
    },
    "ext": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ext/-/ext-1.2.1.tgz",
-      "integrity": "sha512-x+OKKC57tNiLhDW26UmWtvQBpvO+2wxdC/A0jP7RkmjAc4gze9/U98hQyIYJUzo9A+o9ntMHpC+LH3pWMSbrVQ==",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz",
+      "integrity": "sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==",
      "dev": true,
      "requires": {
-        "type": "^2.0.0"
+        "type": "^2.5.0"
      },
      "dependencies": {
        "type": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/type/-/type-2.0.0.tgz",
-          "integrity": "sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==",
+          "version": "2.6.0",
+          "resolved": "https://registry.npmjs.org/type/-/type-2.6.0.tgz",
+          "integrity": "sha512-eiDBDOmkih5pMbo9OqsqPRGMljLodLcwd5XD5JbtNB0o89xZAwynY9EdCDsJU7LtcVCClu9DvM7/0Ep1hYX3EQ==",
          "dev": true
        }
      }
@@ -7479,13 +7541,33 @@
      }
    },
    "hash-base": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
-      "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz",
+      "integrity": "sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==",
      "dev": true,
      "requires": {
-        "inherits": "^2.0.1",
-        "safe-buffer": "^5.0.1"
+        "inherits": "^2.0.4",
+        "readable-stream": "^3.6.0",
+        "safe-buffer": "^5.2.0"
+      },
+      "dependencies": {
+        "readable-stream": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+          "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
+          "dev": true,
+          "requires": {
+            "inherits": "^2.0.3",
+            "string_decoder": "^1.1.1",
+            "util-deprecate": "^1.0.1"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+          "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+          "dev": true
+        }
      }
    },
    "hash-sum": {
@@ -9019,6 +9101,14 @@
      "requires": {
        "bn.js": "^4.0.0",
        "brorand": "^1.0.1"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
      }
    },
    "mime": {
@@ -9368,9 +9458,9 @@
      "dev": true
    },
    "next-tick": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
+      "integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==",
      "dev": true
    },
    "no-case": {
@@ -9966,9 +10056,9 @@
      "dev": true
    },
    "pako": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
-      "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==",
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
+      "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==",
      "dev": true
    },
    "parallel-transform": {
@@ -10014,14 +10104,13 @@
      }
    },
    "parse-asn1": {
-      "version": "5.1.5",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz",
-      "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==",
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz",
+      "integrity": "sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==",
      "dev": true,
      "requires": {
-        "asn1.js": "^4.0.0",
+        "asn1.js": "^5.2.0",
        "browserify-aes": "^1.0.0",
-        "create-hash": "^1.1.0",
        "evp_bytestokey": "^1.0.0",
        "pbkdf2": "^3.0.3",
        "safe-buffer": "^5.1.1"
@@ -10132,9 +10221,9 @@
      }
    },
    "pbkdf2": {
-      "version": "3.0.17",
-      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
-      "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.1.2.tgz",
+      "integrity": "sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==",
      "dev": true,
      "requires": {
        "create-hash": "^1.1.2",
@@ -10155,6 +10244,13 @@
      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
    },
+    "picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "optional": true
+    },
    "pify": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
@@ -12645,6 +12741,14 @@
        "parse-asn1": "^5.0.0",
        "randombytes": "^2.0.1",
        "safe-buffer": "^5.1.2"
+      },
+      "dependencies": {
+        "bn.js": {
+          "version": "4.12.0",
+          "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz",
+          "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==",
+          "dev": true
+        }
      }
    },
    "pump": {
@@ -14739,9 +14843,9 @@
      "dev": true
    },
    "timers-browserify": {
-      "version": "2.0.11",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
-      "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
+      "version": "2.0.12",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz",
+      "integrity": "sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==",
      "dev": true,
      "requires": {
        "setimmediate": "^1.0.4"
@@ -14758,6 +14862,15 @@
      "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz",
      "integrity": "sha512-vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA=="
    },
+    "tmp": {
+      "version": "0.0.29",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.29.tgz",
+      "integrity": "sha1-8lEl/w3Z2jzLDC3Tce4SiLuRKMA=",
+      "dev": true,
+      "requires": {
+        "os-tmpdir": "~1.0.1"
+      }
+    },
    "to-absolute-glob": {
      "version": "2.0.2",
      "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
@@ -15619,14 +15732,136 @@
      "integrity": "sha512-M92R89dNoTPWyCD+HuUEDdhaDnh9jxPGOwlDc0u51jAgmjUvzqaEMynXSr3BaWs+QdHYk4KzibPy1TFtjLmOZQ=="
    },
    "watchpack": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
-      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
+      "version": "1.7.5",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.5.tgz",
+      "integrity": "sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==",
      "dev": true,
      "requires": {
-        "chokidar": "^2.0.2",
+        "chokidar": "^3.4.1",
        "graceful-fs": "^4.1.2",
-        "neo-async": "^2.5.0"
+        "neo-async": "^2.5.0",
+        "watchpack-chokidar2": "^2.0.1"
+      },
+      "dependencies": {
+        "anymatch": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
+          "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "normalize-path": "^3.0.0",
+            "picomatch": "^2.0.4"
+          }
+        },
+        "binary-extensions": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+          "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
+          "dev": true,
+          "optional": true
+        },
+        "braces": {
+          "version": "3.0.2",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "fill-range": "^7.0.1"
+          }
+        },
+        "chokidar": {
+          "version": "3.5.3",
+          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+          "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "anymatch": "~3.1.2",
+            "braces": "~3.0.2",
+            "fsevents": "~2.3.2",
+            "glob-parent": "~5.1.2",
+            "is-binary-path": "~2.1.0",
+            "is-glob": "~4.0.1",
+            "normalize-path": "~3.0.0",
+            "readdirp": "~3.6.0"
+          }
+        },
+        "fill-range": {
+          "version": "7.0.1",
+          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "to-regex-range": "^5.0.1"
+          }
+        },
+        "fsevents": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+          "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+          "dev": true,
+          "optional": true
+        },
+        "glob-parent": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+          "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "is-glob": "^4.0.1"
+          }
+        },
+        "is-binary-path": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+          "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "binary-extensions": "^2.0.0"
+          }
+        },
+        "is-number": {
+          "version": "7.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+          "dev": true,
+          "optional": true
+        },
+        "readdirp": {
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+          "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "picomatch": "^2.2.1"
+          }
+        },
+        "to-regex-range": {
+          "version": "5.0.1",
+          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "is-number": "^7.0.0"
+          }
+        }
+      }
+    },
+    "watchpack-chokidar2": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/watchpack-chokidar2/-/watchpack-chokidar2-2.0.1.tgz",
+      "integrity": "sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "chokidar": "^2.1.8"
      }
    },
    "wbuf": {
@@ -15639,15 +15874,15 @@
      }
    },
    "webpack": {
-      "version": "3.12.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.12.0.tgz",
-      "integrity": "sha512-Sw7MdIIOv/nkzPzee4o0EdvCuPmxT98+vVpIvwtcwcF1Q4SDSNp92vwcKc4REe7NItH9f1S4ra9FuQ7yuYZ8bQ==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.6.0.tgz",
+      "integrity": "sha512-OsHT3D0W0KmPPh60tC7asNnOmST6bKTiR90UyEdT9QYoaJ4OYN4Gg7WK1k3VxHK07ZoiYWPsKvlS/gAjwL/vRA==",
      "dev": true,
      "requires": {
        "acorn": "^5.0.0",
        "acorn-dynamic-import": "^2.0.0",
-        "ajv": "^6.1.0",
-        "ajv-keywords": "^3.1.0",
+        "ajv": "^5.1.5",
+        "ajv-keywords": "^2.0.0",
        "async": "^2.1.2",
        "enhanced-resolve": "^3.4.0",
        "escope": "^3.6.0",
@@ -15668,22 +15903,10 @@
        "yargs": "^8.0.2"
      },
      "dependencies": {
-        "ajv": {
-          "version": "6.10.2",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-          "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
-          "dev": true,
-          "requires": {
-            "fast-deep-equal": "^2.0.1",
-            "fast-json-stable-stringify": "^2.0.0",
-            "json-schema-traverse": "^0.4.1",
-            "uri-js": "^4.2.2"
-          }
-        },
-        "fast-deep-equal": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-          "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+        "ajv-keywords": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.1.tgz",
+          "integrity": "sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=",
          "dev": true
        },
        "has-flag": {
@@ -15692,12 +15915,6 @@
          "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=",
          "dev": true
        },
-        "json-schema-traverse": {
-          "version": "0.4.1",
-          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-          "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-          "dev": true
-        },
        "source-map": {
          "version": "0.5.7",
          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -16021,6 +16238,47 @@
        "lodash": "^4.17.15"
      }
    },
+    "webpack-parallel-uglify-plugin": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/webpack-parallel-uglify-plugin/-/webpack-parallel-uglify-plugin-1.1.4.tgz",
+      "integrity": "sha512-1UlyDthFMR0NjWsgMpwf6n9scBgPLKcuRAWls8iU7IGBGiLbdS3u1zDr8e1vmn1FtEFslJOQ6MfKfGaDV5bwcw==",
+      "dev": true,
+      "requires": {
+        "babel-code-frame": "^6.26.0",
+        "glob": "^7.0.5",
+        "mkdirp": "^0.5.1",
+        "pify": "^3.0.0",
+        "tmp": "0.0.29",
+        "uglify-es": "^3.3.9",
+        "uglify-js": "^3.6.0",
+        "webpack-sources": "^1.0.0",
+        "worker-farm": "^1.3.1"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "2.13.0",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz",
+          "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==",
+          "dev": true
+        },
+        "uglify-es": {
+          "version": "3.3.9",
+          "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz",
+          "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==",
+          "dev": true,
+          "requires": {
+            "commander": "~2.13.0",
+            "source-map": "~0.6.1"
+          }
+        },
+        "uglify-js": {
+          "version": "3.15.4",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.4.tgz",
+          "integrity": "sha512-vMOPGDuvXecPs34V74qDKk4iJ/SN4vL3Ow/23ixafENYvtrNvtbcgUeugTcUGRGsOF/5fU8/NYSL5Hyb3l1OJA==",
+          "dev": true
+        }
+      }
+    },
    "webpack-shell-plugin": {
      "version": "0.5.0",
      "resolved": "https://registry.npmjs.org/webpack-shell-plugin/-/webpack-shell-plugin-0.5.0.tgz",
@@ -16292,9 +16550,9 @@
          }
        },
        "y18n": {
-          "version": "3.2.1",
-          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-          "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
+          "version": "3.2.2",
+          "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz",
+          "integrity": "sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==",
          "dev": true
        }
      }
--- a/nezha-fronted/package.json
+++ b/nezha-fronted/package.json
@@ -101,10 +101,11 @@
    "vue-resource": "^1.5.1",
    "vue-style-loader": "^3.0.1",
    "vue-template-compiler": "^2.5.2",
-    "webpack": "^3.6.0",
+    "webpack": "3.6.0",
    "webpack-bundle-analyzer": "^2.9.0",
    "webpack-dev-server": "^2.9.1",
    "webpack-merge": "^4.1.0",
+    "webpack-parallel-uglify-plugin": "1.1.4",
    "webpack-shell-plugin": "^0.5.0",
    "webpack-zip-plugin": "^0.1.6"
  },
--- a/nezha-fronted/src/assets/css/components/common/timePicker.scss
+++ b/nezha-fronted/src/assets/css/components/common/timePicker.scss
@@ -73,3 +73,181 @@
  padding: 0 8px;
  color: #aaa;
 }
+.date-range-panel-bottom {
+  height: 44px;
+  line-height: 44px;
+  border-top: 1px solid rgba(0, 0, 0, 0.09);
+  padding: 0 10px;
+  display: flex;
+  justify-content: space-between;
+  font-size: 14px;
+
+  .utc-str {
+    text-align: right;
+  }
+}
+.date-range-refresh {
+  margin-left: 10px;
+}
+
+.date-time-range {
+  margin-right: 10px;
+}
+
+.date-range-item {
+  list-style-type: none;
+}
+
+.panel-time-picker-hidden {
+  visibility: hidden !important;
+  position: absolute;
+  top: 0;
+  left: 0;
+}
+
+.date-range-text {
+  font-size: 14px;
+  min-width: 150px;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  padding: 0 10px;
+  display: flex;
+  justify-content: space-around;
+  height: 26px;
+  background: #FFFFFF;
+  border: 1px solid #E7EAED;
+  box-shadow: 0 2px 4px 0 rgba(51, 51, 51, 0.02);
+  border-radius: 2px;
+  line-height: 26px;
+  transition: width .3s;
+
+  .cn-icon {
+    font-size: 14px;
+  }
+
+  .cn-icon-arrow-down {
+    transition: all .3s;
+    display: inline-block;
+  }
+
+  .cn-icon-arrow-down-active {
+    transform: rotate(180deg);
+  }
+}
+
+.date-range-title {
+  font-size: 14px;
+  color: #666666;
+  font-weight: 600;
+  padding: 14px 0 7px 8px;
+}
+
+.calendar-popover-text {
+  white-space: nowrap;
+  display: inline-block;
+  margin: 0 5px;
+}
+
+.calendar-popover-text:first-of-type {
+  margin-left: 0;
+}
+
+.calendar-popover-text:last-of-type {
+  margin-right: 0;
+}
+
+.date-range-panel {
+  height: 500px;
+  width: 500px;
+  background: #FFFFFF;
+  box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05);
+  position: absolute;
+  right: 0;
+  top: 34px;
+  z-index: 1;
+
+  .date-range-panel-content-left {
+    padding-left: 10px;
+    display: flex;
+    flex-direction: column;
+
+    .content-title {
+      font-size: 14px;
+      color: #666666;
+      font-weight: 400;
+      margin-bottom: 12px;
+    }
+
+    .content-input {
+      border: 1px solid #E7EAED;
+      border-radius: 2px;
+      width: 230px;
+      padding: 0 8px;
+      height: 30px;
+      line-height: 30px;
+      margin-bottom: 12px;
+      outline: #169AFF;
+    }
+
+    .content-input:focus {
+      border: 1px solid #169AFF;
+    }
+
+    .date-range-history {
+      flex: 1;
+      overflow-y: auto;
+
+      .date-range-history-item {
+        padding: 5px 0;
+        cursor: pointer;
+      }
+
+      .date-range-history-item:hover {
+        /*font-weight: 600;*/
+        background: #f9f9f9;
+      }
+    }
+  }
+
+  .date-range-panel-content-right {
+    display: flex;
+    flex-direction: column;
+
+    ul {
+      flex: 1;
+      padding: 0;
+      display: flex;
+      flex-direction: column;
+      margin: 0;
+
+      li {
+        width: 100%;
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        color: #333333;
+        font-weight: 400;
+        padding: 0 10px;
+        cursor: pointer;
+      }
+
+      li.active {
+        background: #F2F9FF;
+        color: #0091FF;
+        font-weight: 400;
+
+        .cn-icon-check {
+          color: #0091FF;
+          position: absolute;
+          right: 7px;
+        }
+      }
+
+      li:hover {
+        background: #F2F9FF;
+        color: #0091FF;
+      }
+    }
+  }
+}
--- a/nezha-fronted/src/assets/css/font/iconfont.js
+++ b/nezha-fronted/src/assets/css/font/iconfont.js
--- a/nezha-fronted/src/components/chart/chart/chartStat.vue
+++ b/nezha-fronted/src/components/chart/chart/chartStat.vue
@@ -11,7 +11,7 @@
        background:item.mapping ? item.mapping.color.bac : (statData.length===1 ? '' : colorList[index]),
        height:item.height+'px',
        width:item.width + 'px',
-        fontSize: item.height > item.width ? (14 * (item.width/60)+ 'px') : (14 * (item.height/60)+ 'px')
+        fontSize: setFontSize(item)
      }"
    >
      <span v-if="chartInfo.param.text==='all'">
@@ -212,6 +212,13 @@ export default {
          this.renderStat(layout)
        })
      }, 50)
+    },
+    setFontSize (item) {
+      let fontSize = item.height > item.width ? (16 * (item.width / 60)) : (16 * (item.height / 60))
+      if (fontSize < 12) {
+        fontSize = 12
+      }
+      return fontSize + 'px'
    }
  },
  mounted () {
--- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue
@@ -42,7 +42,7 @@
                <div id="chart-temp-sync" @click="chartBySync"><i class="nz-icon nz-icon-sync"></i>{{ $t('overall.syncChart') }}</div>
              </el-dropdown-item>
              <el-dropdown-item v-has="'main_edit'">
-                <div id="chart-htmltopdf" @click="htmlToPdf"><i class="nz-icon nz-icon-download1"></i>{{ $t('overall.downloadToPdf') }}</div>
+                <div id="chart-htmltopdf" @click="htmlToPdf"><i class="nz-icon nz-icon-export-pdf"></i>{{ $t('overall.downloadToPdf') }}</div>
              </el-dropdown-item>
            </template>
          </top-tool-more-options>
@@ -76,7 +76,7 @@
                <div id="chart-temp-sync" @click="chartBySync"><i class="nz-icon nz-icon-sync"></i>{{ $t('overall.syncChart') }}</div>
              </el-dropdown-item>
              <el-dropdown-item v-has="'main_edit'">
-                <div id="chart-htmltopdf" @click="htmlToPdf"><i class="nz-icon nz-icon-download1"></i>{{ $t('overall.downloadToPdf') }}</div>
+                <div id="chart-htmltopdf" @click="htmlToPdf"><i class="nz-icon nz-icon-export-pdf"></i>{{ $t('overall.downloadToPdf') }}</div>
              </el-dropdown-item>
            </template>
          </top-tool-more-options>
--- a/nezha-fronted/src/components/common/table/settings/backupsTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/backupsTable.vue
@@ -14,8 +14,8 @@
        <div class="col-resize-area"></div>
      </template>
      <template slot-scope="scope" :column="item">
-        <span v-if="item.prop === 'repeat'">
-          {{ tableData[0].schedule && tableData[0].schedule.repeat }}
+        <span v-if="item.prop === 'schedule'">
+          {{ tableData[0].schedule && changeType(tableData[0].schedule.type)? changeType(tableData[0].schedule.type):''}}
        </span>
        <span v-if="item.prop === 'retention'">
          {{ tableData[0].retention }}
@@ -110,15 +110,34 @@ export default {
  computed: {},

  methods: {
+    changeType (item) {
+      if (item == 1) {
+        return this.$t('backup.only')
+      } else if (item == 2) {
+        return this.$t('backup.Daily')
+      } else if (item == 3) {
+        return this.$t('backup.Weekly')
+      } else {
+        return this.$t('backup.Monthly')
+      }
+    },
    Restore (row) {
      put('/sys/backup/restore', { filename: row.fileName }).then(res => {
        if (res.code == 200) {
-          this.$emit('getTableData', 'backup')
+          this.$emit("getTableData", 'recent')
+        } else {
+          this.$message.error(response.msg)
        }
      })
    },
-    del (item) {
-      console.log(item)
+    del (row) {
+      this.$delete('/sys/backup?filename=' + row.fileName).then(res => {
+        if (res.code == 200) {
+          this.$emit("getTableData", 'recent')
+        } else {
+          this.$message.error(response.msg)
+        }
+      })
    },
    changeDate (item) {
      const time = Date.parse(item)
@@ -130,7 +149,6 @@ export default {
    },
    backupNow (item) {
      post('/sys/backup').then((res) => {
-        // console.log(res)
      })
    },
    edit () {
--- a/nezha-fronted/src/components/common/timePicker.vue
+++ b/nezha-fronted/src/components/common/timePicker.vue
@@ -1,15 +1,51 @@
 <template>
-  <div id="panel-calender" :class="{'calendar--small': size === 'small'}" class="calendar">
-    <my-date-picker prefix-icon=" " class="panel-time-picker-hidden " size="mini" ref="calendar"
-                    :value-format="timeFormatStrToDatePickFormat(timeFormatMain)"
-                    :format="timeFormatStrToDatePickFormat(timeFormatMain)" @change="dateChange" v-model="searchTime" type="datetimerange"
-                    popper-class="panel-time-picker-popper time-picker-popover__select-top"
-                    :default-time="['00:00:00', '23:59:59']"
-                    :range-separator="$t('dashboard.panel.to')"
-                    :start-placeholder="$t('dashboard.panel.startTime')"
-                    :end-placeholder="$t('dashboard.panel.endTime')" align="right">
-    </my-date-picker>
-    <el-dropdown ref="timePickerDropdown" class="calendar-dropdown-title" trigger="click" @command="timeChange" @visible-change="popoverClick">
+  <div
+    id="panel-calender"
+    :class="{ 'calendar--small': size === 'small' }"
+    class="calendar"
+  >
+    <!-- <my-date-picker
+      prefix-icon=" "
+      class="panel-time-picker-hidden"
+      size="mini"
+      ref="calendar"
+      :value-format="timeFormatStrToDatePickFormat(timeFormatMain)"
+      :format="timeFormatStrToDatePickFormat(timeFormatMain)"
+      @change="dateChange"
+      v-model="searchTime"
+      type="datetimerange"
+      popper-class="panel-time-picker-popper time-picker-popover__select-top"
+      :default-time="['00:00:00', '23:59:59']"
+      :range-separator="$t('dashboard.panel.to')"
+      :start-placeholder="$t('dashboard.panel.startTime')"
+      :end-placeholder="$t('dashboard.panel.endTime')"
+      align="right"
+    >
+    </my-date-picker> -->
+
+    <div @click="showDropdown" class="date-range-text">
+      <div class="calendar-popover-text">
+        <i class="nz-icon nz-icon-time"></i>
+      </div>
+      <div class="calendar-popover-text" style="display: flex" v-if="isCustom">
+        <div class="calendar-popover-text">
+          {{searchTime[0]}}
+        </div>
+        <div class="calendar-popover-text">{{$t('dashboard.panel.to')}}</div>
+        <div class="calendar-popover-text">
+          {{searchTime[1]}}
+        </div>
+      </div>
+      <div class="calendar-popover-text" v-else>
+        <div class="time-no-data">{{$t("dashboard.panel.noDate")}}</div>
+      </div>
+      <div class="calendar-popover-text">
+        <i
+          class="el-icon-arrow-down"
+        ></i>
+      </div>
+    </div>
+    <!-- <el-dropdown ref="timePickerDropdown" class="calendar-dropdown-title" trigger="click" @command="timeChange" @visible-change="popoverClick">
      <el-popover
        placement="bottom-end"
        min-width="120px"
@@ -48,271 +84,451 @@
        </template>

      </el-dropdown-menu>
-    </el-dropdown>
+    </el-dropdown> -->
+    <transition name="el-zoom-in-top">
+      <div v-if="dropdownFlag" class="date-range-panel popper-z-index">
+        <el-row class="date-range-panel-top" style="position: relative">
+          <el-col
+            :span="16"
+            class="date-range-panel-content date-range-panel-content-left"
+          >
+            <div class="date-range-title" style="padding-left: 0">
+              Absolute time range
+            </div>
+            <my-date-picker
+              popper-class="panel-time-picker-popper time-picker-popover__select-top"
+              :default-time="['00:00:00', '23:59:59']"
+              :range-separator="$t('dashboard.panel.to')"
+              :start-placeholder="$t('dashboard.panel.startTime')"
+              :end-placeholder="$t('dashboard.panel.endTime')"
+              align="right"
+              prefix-icon=" "
+              class="panel-time-picker-hidden"
+              size="mini"
+              ref="calendar"
+              :value-format="timeFormatStrToDatePickFormat(timeFormatMain)"
+              :format="timeFormatStrToDatePickFormat(timeFormatMain)"
+              :clearable="false"
+              :editable="false"
+              v-model="searchTime"
+              type="datetimerange"
+              placement="left-start"
+              style="position: absolute"
+              @change="dateChange"
+            />
+            <div @click="myDatePickerShow" class="content-title">From</div>
+            <div  tabindex="1" class="content-input">
+              {{ searchTime[0] }}
+            </div>
+            <div @click="myDatePickerShow" class="content-title">To</div>
+            <div  tabindex="2" class="content-input">
+              {{ searchTime[1] }}
+            </div>
+            <div>
+              <el-button @click="timeRange" type="primary" size="mini"
+                >Apply time range</el-button
+              >
+            </div>
+            <div class="date-range-title" style="padding-left: 0">
+              Recently used absolute ranges
+            </div>
+            <div class="date-range-history">
+              <div
+                v-for="(item, index) in rangeHistoryArr"
+                :key="index"
+                class="date-range-history-item"
+                @click="historyChange(item)"
+              >
+                {{bus.timeFormate(item[0])}}
+                —
+                {{bus.timeFormate(item[1])}}
+
+              </div>
+            </div>
+          </el-col>
+          <el-col
+            :span="8"
+            class="date-range-panel-content date-range-panel-content-right"
+            style="border-left: 1px solid rgba(0, 0, 0, 0.09)"
+          >
+            <div class="date-range-title">Relatime time ranges</div>
+            <ul class="date-range-item">
+              <li
+                v-for="(item,key) in timeData"
+                @click="timeChange(item)"
+                :class="showTime.id === item.id ? 'nz-dashboard-dropdown-bg' : ''"
+                :key="key"
+              >
+                <span style="position: relative">
+                  {{ item.text }}
+                  <i
+                    v-if="
+                      item.id !== 12 || showEmpty
+                    "
+                    class="cn-icon cn-icon-check"
+                  ></i>
+                </span>
+              </li>
+            </ul>
+          </el-col>
+        </el-row>
+        <el-row class="date-range-panel-bottom" style="">
+          <el-col :span="12">{{ address }}</el-col>
+          <el-col :span="12" class="utc-str">{{ utcStr }}</el-col>
+        </el-row>
+      </div>
+    </transition>
  </div>
 </template>

 <script>
-import bus from '@/libs/bus'
+import bus from "@/libs/bus";

 export default {
-  name: 'timePicker',
+  name: "timePicker",
  props: {
    defaultPick: Number,
    showEmpty: { default: false, type: Boolean },
    size: {
-      type: String
-    }
-  },
-  data () {
-    return {
-      isPopoverDisabled: false,
-      isCustom: false,
-      searchTime: [
-        bus.timeFormate(bus.getOffsetTimezoneData(-1)),
-        bus.timeFormate(bus.getOffsetTimezoneData())
-      ],
-      showTime: {
-        id: 4,
-        text: this.$t('dashboard.panel.lastOneHour')
-      },
-      timeData: [
-        {
-          id: 0,
-          text: this.$t('dashboard.panel.customTimeRange'),
-          value: -1
-        },
-        {
-          id: 12,
-          text: this.$t('dashboard.panel.noDate'),
-          value: 0
-        },
-        {
-          id: 1,
-          text: this.$t('dashboard.panel.lastFiveMin'),
-          type: 'minute',
-          value: 5
-        },
-        {
-          id: 2,
-          text: this.$t('dashboard.panel.lastFifteenMin'),
-          type: 'minute',
-          value: 15
-        },
-        {
-          id: 3,
-          text: this.$t('dashboard.panel.lastThirtyMin'),
-          type: 'minute',
-          value: 30
-        },
-        {
-          id: 4,
-          text: this.$t('dashboard.panel.lastOneHour'),
-          type: 'hour',
-          value: 1
-        },
-        {
-          id: 5,
-          text: this.$t('dashboard.panel.lastThreeHour'),
-          type: 'hour',
-          value: 3
-        },
-        {
-          id: 6,
-          text: this.$t('dashboard.panel.lastSixHour'),
-          type: 'hour',
-          value: 6
-        },
-        {
-          id: 7,
-          text: this.$t('dashboard.panel.lastTwelveHour'),
-          type: 'hour',
-          value: 12
-        },
-        {
-          id: 8,
-          text: this.$t('dashboard.panel.lastTwentyFourHour'),
-          type: 'hour',
-          value: 24
-        },
-        {
-          id: 9,
-          text: this.$t('dashboard.panel.lastTwoDay'),
-          type: 'date',
-          value: 2
-        },
-        {
-          id: 10,
-          text: this.$t('dashboard.panel.lastSevenDay'),
-          type: 'date',
-          value: 7
-        },
-        {
-          id: 11,
-          text: this.$t('dashboard.panel.lastThirtyDay'),
-          type: 'date',
-          value: 30
-        }
-      ],
-      nowTimeType: {
-        id: 4,
-        text: this.$t('dashboard.panel.lastOneHour'),
-        type: 'hour',
-        value: 1
-      }
-    }
-  },
-  methods: {
-    dateChange (val) {
-      const startTime = bus.timeFormate(val[0])
-      const endTime = bus.timeFormate(val[1])
-      this.$set(this.searchTime, 0, startTime)
-      this.$set(this.searchTime, 1, endTime)
-
-      this.$set(this.showTime, 'id', 0)
-      this.$set(this.showTime, 'text', this.searchTime[0] + ' ' + this.$t('dashboard.panel.to') + ' ' + this.searchTime[1])
-      this.$emit('change', this.searchTime)
+      type: String,
    },
-    setCustomTime (timeGroup, timeRange) {
+  },
+  data() {
+    return ({
+      rangeHistory : localStorage.getItem("date-range-history")? JSON.parse(localStorage.getItem("date-range-history")): [],
+      rangeHistoryArr: this.getRangeHistoryArr(),
+        address: localStorage.getItem("cn-sys-timezone"),
+        utc: localStorage.getItem("timezoneOffset"),
+        utcStr: this.getUtcStr(),
+        dropdownFlag: false,
+        isPopoverDisabled: false,
+        isCustom: false,
+        searchTime: [
+          bus.timeFormate(bus.getOffsetTimezoneData(-1)),
+          bus.timeFormate(bus.getOffsetTimezoneData()),
+        ],
+        showTime: {
+          id: 4,
+          text: this.$t("dashboard.panel.lastOneHour"),
+        },
+        timeData: [
+          // {
+          //   id: 0,
+          //   text: this.$t("dashboard.panel.customTimeRange"),
+          //   value: -1,
+          // },
+          {
+            id: 12,
+            text: this.$t("dashboard.panel.noDate"),
+            value: 0,
+          },
+          {
+            id: 1,
+            text: this.$t("dashboard.panel.lastFiveMin"),
+            type: "minute",
+            value: 5,
+          },
+          {
+            id: 2,
+            text: this.$t("dashboard.panel.lastFifteenMin"),
+            type: "minute",
+            value: 15,
+          },
+          {
+            id: 3,
+            text: this.$t("dashboard.panel.lastThirtyMin"),
+            type: "minute",
+            value: 30,
+          },
+          {
+            id: 4,
+            text: this.$t("dashboard.panel.lastOneHour"),
+            type: "hour",
+            value: 1,
+          },
+          {
+            id: 5,
+            text: this.$t("dashboard.panel.lastThreeHour"),
+            type: "hour",
+            value: 3,
+          },
+          {
+            id: 6,
+            text: this.$t("dashboard.panel.lastSixHour"),
+            type: "hour",
+            value: 6,
+          },
+          {
+            id: 7,
+            text: this.$t("dashboard.panel.lastTwelveHour"),
+            type: "hour",
+            value: 12,
+          },
+          {
+            id: 8,
+            text: this.$t("dashboard.panel.lastTwentyFourHour"),
+            type: "hour",
+            value: 24,
+          },
+          {
+            id: 9,
+            text: this.$t("dashboard.panel.lastTwoDay"),
+            type: "date",
+            value: 2,
+          },
+          {
+            id: 10,
+            text: this.$t("dashboard.panel.lastSevenDay"),
+            type: "date",
+            value: 7,
+          },
+          {
+            id: 11,
+            text: this.$t("dashboard.panel.lastThirtyDay"),
+            type: "date",
+            value: 30,
+          },
+        ],
+        nowTimeType: {
+          id: 4,
+          text: this.$t("dashboard.panel.lastOneHour"),
+          type: "hour",
+          value: 1,
+        },
+    })
+  },
+  
+  methods: {
+    myDatePickerShow(){
+            this.$refs.calendar.pickerVisible = true;
+    },
+    historyChange (item)  {
+      this.myStartTime = item.start
+      this.myEndTime = item.end
+      this.isCustom = true
+      returnValue()
+    },
+    getRangeHistoryArr(){
+      // return this.rangeHistory.slice(0, 4)
+    },
+    getUtcStr() {
+      console.log(this.utc);
+      let str = "UTC ";
+      if (this.utc < 0) {
+        str += "- ";
+      } else {
+        str += "+ ";
+      }
+      const abs = Math.abs(this.utc);
+      if (abs > 10) {
+        str += abs + "";
+      } else {
+        str += "0" + (abs + "");
+      }
+      str += ":00 ";
+      console.log(str);
+      return str;
+    },
+    timeRange() {
+      this.isCustom = true;
+    },
+    showDropdown() {
+      this.dropdownFlag = !this.dropdownFlag;
+    },
+    dateChange(val) {
+      const startTime = bus.timeFormate(val[0]);
+      const endTime = bus.timeFormate(val[1]);
+      this.$set(this.searchTime, 0, startTime);
+      this.$set(this.searchTime, 1, endTime);
+
+      this.$set(this.showTime, "id", 0);
+      this.$set(
+        this.showTime,
+        "text",
+        this.searchTime[0] +
+          " " +
+          this.$t("dashboard.panel.to") +
+          " " +
+          this.searchTime[1]
+      );
+      localStorage.setItem('date-range-history', JSON.stringify(rangeHistory))
+      this.$emit("change", this.searchTime);
+    },
+    setCustomTime(timeGroup, timeRange) {
      if (timeGroup) {
-        this.showTime = this.nowTimeType = this.timeData.find(item => item.id == timeGroup.id)
+        this.showTime = this.nowTimeType = this.timeData.find(
+          (item) => item.id == timeGroup.id
+        );
        if (this.showTime) {
-          this.showTime = Object.assign({}, this.showTime)
-          this.$set(this.searchTime, 0, timeGroup.start_time)
-          this.$set(this.searchTime, 1, timeGroup.end_time)
+          this.showTime = Object.assign({}, this.showTime);
+          this.$set(this.searchTime, 0, timeGroup.start_time);
+          this.$set(this.searchTime, 1, timeGroup.end_time);
        } else {
          this.showTime = this.nowTimeType = {
            id: 4,
-            text: this.$t('dashboard.panel.lastOneHour'),
-            type: 'hour',
-            value: 1
-          }
-          const time = bus.getTimezontDateRange()
+            text: this.$t("dashboard.panel.lastOneHour"),
+            type: "hour",
+            value: 1,
+          };
+          const time = bus.getTimezontDateRange();
          if (timeGroup.start_time) {
-            this.$set(this.searchTime, 0, bus.timeFormate(timeGroup.start_time))
-            this.$set(this.searchTime, 1, bus.timeFormate(timeGroup.end_time))
+            this.$set(
+              this.searchTime,
+              0,
+              bus.timeFormate(timeGroup.start_time)
+            );
+            this.$set(this.searchTime, 1, bus.timeFormate(timeGroup.end_time));
          } else {
-            this.$set(this.searchTime, 0, bus.timeFormate(time[0]))
-            this.$set(this.searchTime, 1, bus.timeFormate(time[1]))
+            this.$set(this.searchTime, 0, bus.timeFormate(time[0]));
+            this.$set(this.searchTime, 1, bus.timeFormate(time[1]));
          }
        }
      } else {
        this.showTime = this.nowTimeType = {
          id: 4,
-          text: this.$t('dashboard.panel.lastOneHour'),
-          type: 'hour',
-          value: 1
-        }
-        const time = bus.getTimezontDateRange()
-        this.$set(this.searchTime, 0, time[0])
-        this.$set(this.searchTime, 1, time[1])
+          text: this.$t("dashboard.panel.lastOneHour"),
+          type: "hour",
+          value: 1,
+        };
+        const time = bus.getTimezontDateRange();
+        this.$set(this.searchTime, 0, time[0]);
+        this.$set(this.searchTime, 1, time[1]);
      }
    },
-    timeChange (val, from) {
-      this.nowTimeType = val
-      this.$set(this.showTime, 'id', val.id)
-      this.$set(this.showTime, 'text', val.text)
+    timeChange(val, from) {
+      console.log(val,from);
+      this.nowTimeType = val;
+      this.$set(this.showTime, "id", val.id);
+      this.$set(this.showTime, "text", val.text);
      if (!val) {
-        this.isCustom = false
-        return false
+        this.isCustom = false;
+        return false;
      } else {
-        this.setSearchTime(val.type, val.value)
+        this.setSearchTime(val.type, val.value);

-        const id = val.id
-        if (id === 0) { // custom
-          if (from === 'chart') {
-            this.isCustom = false
-            this.$emit('change', this.searchTime)
+        const id = val.id;
+        if (id === 0) {
+          // custom
+          if (from === "chart") {
+            this.isCustom = false;
+            this.$emit("change", this.searchTime);
          } else {
-            this.isCustom = true
-            this.$refs.calendar.focus()
-            this.$refs.calendar.pickerVisible = true
-            if (document.getElementById('viewGraphDialog')) { // 处理 多弹出的z-index的问题 当前为 alertMessage的处理
-              const viewGraphDialogStyle = window.getComputedStyle(document.getElementById('viewGraphDialog', null))
+            this.isCustom = true;
+            this.$refs.calendar.focus();
+            this.$refs.calendar.pickerVisible = true;
+            if (document.getElementById("viewGraphDialog")) {
+              // 处理 多弹出的z-index的问题 当前为 alertMessage的处理
+              const viewGraphDialogStyle = window.getComputedStyle(
+                document.getElementById("viewGraphDialog", null)
+              );
              setTimeout(() => {
-                if (viewGraphDialogStyle['z-index'] !== 'auto') {
-                  const dom = document.getElementsByClassName('el-picker-panel')
+                if (viewGraphDialogStyle["z-index"] !== "auto") {
+                  const dom =
+                    document.getElementsByClassName("el-picker-panel");
                  Array.prototype.forEach.call(dom, function (element) {
-                    element.style['z-index'] = viewGraphDialogStyle['z-index'] + 1
-                  })
-                  this.$refs.calendar.$el.style['z-index'] = viewGraphDialogStyle['z-index'] + 1
+                    element.style["z-index"] =
+                      viewGraphDialogStyle["z-index"] + 1;
+                  });
+                  this.$refs.calendar.$el.style["z-index"] =
+                    viewGraphDialogStyle["z-index"] + 1;
                }
-              })
+              });
            }
          }
        } else {
-          this.isCustom = false
+          this.isCustom = false;
          if (this.showEmpty && id === 12) {
-            this.searchTime = []
+            this.searchTime = [];
          }
-          this.$emit('change', this.searchTime)
+          this.$emit("change", this.searchTime);
        }
      }
    },
-    getCurrentTime () {
-      let timeTypeId = this.showTime.id
+    getCurrentTime() {
+      let timeTypeId = this.showTime.id;
      if (timeTypeId === 0) {
-        return this.searchTime
+        return this.searchTime;
      } else {
-        if (!timeTypeId) { timeTypeId = 4 }
-        const currentTime = this.timeData.find(item => item.id === timeTypeId)
-        this.setSearchTime(currentTime.type, currentTime.value)
-        return this.searchTime
+        if (!timeTypeId) {
+          timeTypeId = 4;
+        }
+        const currentTime = this.timeData.find(
+          (item) => item.id === timeTypeId
+        );
+        this.setSearchTime(currentTime.type, currentTime.value);
+        return this.searchTime;
      }
    },
-    setSearchTime (type, val) {
-      if (type === 'minute') {
-        const startTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setMinutes(new Date(bus.computeTimezone(new Date().getTime())).getMinutes() - val))
-        const endTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())))
-        this.$set(this.searchTime, 0, startTime)
-        this.$set(this.searchTime, 1, endTime)
-        this.$set(this.searchTime, 2, val + 'm')
-      } else if (type === 'hour') {
-        const startTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setHours(new Date(bus.computeTimezone(new Date().getTime())).getHours() - val))
-        const endTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())))
-        this.$set(this.searchTime, 0, startTime)
-        this.$set(this.searchTime, 1, endTime)
-        this.$set(this.searchTime, 2, val + 'h')
-      } else if (type === 'date') {
-        const startTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setDate(new Date(bus.computeTimezone(new Date().getTime())).getDate() - val))
-        const endTime = bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())))
-        this.$set(this.searchTime, 0, startTime)
-        this.$set(this.searchTime, 1, endTime)
-        this.$set(this.searchTime, 2, val + 'd')
+    setSearchTime(type, val) {
+      if (type === "minute") {
+        const startTime = bus.timeFormate(
+          new Date(bus.computeTimezone(new Date().getTime())).setMinutes(
+            new Date(bus.computeTimezone(new Date().getTime())).getMinutes() -
+              val
+          )
+        );
+        const endTime = bus.timeFormate(
+          new Date(bus.computeTimezone(new Date().getTime()))
+        );
+        this.$set(this.searchTime, 0, startTime);
+        this.$set(this.searchTime, 1, endTime);
+        this.$set(this.searchTime, 2, val + "m");
+      } else if (type === "hour") {
+        const startTime = bus.timeFormate(
+          new Date(bus.computeTimezone(new Date().getTime())).setHours(
+            new Date(bus.computeTimezone(new Date().getTime())).getHours() - val
+          )
+        );
+        const endTime = bus.timeFormate(
+          new Date(bus.computeTimezone(new Date().getTime()))
+        );
+        this.$set(this.searchTime, 0, startTime);
+        this.$set(this.searchTime, 1, endTime);
+        this.$set(this.searchTime, 2, val + "h");
+      } else if (type === "date") {
+        const startTime = bus.timeFormate(
+          new Date(bus.computeTimezone(new Date().getTime())).setDate(
+            new Date(bus.computeTimezone(new Date().getTime())).getDate() - val
+          )
+        );
+        const endTime = bus.timeFormate(
+          new Date(bus.computeTimezone(new Date().getTime()))
+        );
+        this.$set(this.searchTime, 0, startTime);
+        this.$set(this.searchTime, 1, endTime);
+        this.$set(this.searchTime, 2, val + "d");
      }
    },
    setCostomTime: function (costomTime) {
-      this.searchTime = Object.assign(costomTime)
-      const val = Object.assign(this.timeData[0])
-      this.$set(this.showTime, 'id', val.id)
-      this.$set(this.showTime, 'text', val.text)
+      this.searchTime = Object.assign(costomTime);
+      const val = Object.assign(this.timeData[0]);
+      this.$set(this.showTime, "id", val.id);
+      this.$set(this.showTime, "text", val.text);
    },
-    popoverClick (val) {
+    popoverClick(val) {
      if (val) {
-        this.isPopoverDisabled = true
+        this.isPopoverDisabled = true;
      } else {
-        this.isPopoverDisabled = false
+        this.isPopoverDisabled = false;
      }
-    }
-  },
-  created () {
+    },
  },
  watch: {
    defaultPick: {
      immediate: true,
-      handler (n, o) {
+      handler(n, o) {
        if (n && Number.isInteger(n)) {
-          const showTime = this.timeData.find(item => item.id == n)
+          const showTime = this.timeData.find((item) => item.id == n);
          if (showTime) {
-            this.showTime = Object.assign({}, showTime)
-            this.searchTime = this.$parent.searchTime
+            this.showTime = Object.assign({}, showTime);
+            this.searchTime = this.$parent.searchTime;
          }
          if (this.showEmpty && this.defaultPick === 12) {
-            this.searchTime = []
+            this.searchTime = [];
          }
        }
-      }
-    }
-  }
-}
+      },
+    },
+  },
+};
 </script>
--- a/nezha-fronted/src/components/page/config/backups.vue
+++ b/nezha-fronted/src/components/page/config/backups.vue
@@ -1,7 +1,7 @@
 <template>
  <div class="system">
    <div class="system-config-form system-config-backup">
-      <div class="system-title">{{$t('backup.configurations')}}</div>
+      <div class="system-title">{{ $t("backup.configurations") }}</div>
      <nz-data-list
        ref="dataList"
        id="modelTable"
@@ -11,11 +11,11 @@
      >
        <template v-slot="slotProps">
          <backups-table
-          ref="backupsTable1"
+            ref="backupsTable1"
            :custom-table-title="customTableTitle"
            :is-configurations="true"
-            @edit="edit"
            :table-data="tableData"
+            @edit="edit"
          >
          </backups-table>
        </template>
@@ -23,7 +23,7 @@
    </div>

    <div class="system-config-form system-config-backup">
-      <div class="system-title">{{$t('backup.recent')}}</div>
+      <div class="system-title">{{ $t("backup.recent") }}</div>
      <nz-data-list
        ref="dataList"
        id="modelTable"
@@ -33,19 +33,24 @@
      >
        <template v-slot="slotProps">
          <backups-table
-          ref="backupsTable2"
+            ref="backupsTable2"
            :custom-table-title="customTableTitle2"
            :is-configurations="false"
            key="backups2"
            :table-data2="tableData2"
-
+            @getTableData="getTableData"
          >
          </backups-table>
        </template>
      </nz-data-list>
    </div>
    <transition name="right-box">
-      <backups-box v-if="rightBoxshow"  :obj="object" @close="closeRightBox" class="backup_box"></backups-box>
+      <backups-box
+        v-if="rightBoxshow"
+        :obj="object"
+        @close="closeRightBox"
+        class="backup_box"
+      ></backups-box>
    </transition>
  </div>
 </template>
@@ -62,9 +67,9 @@ export default {
  data () {
    return {

-      url: '/sys/backup/list',
+      url: '/sys/backup',
      customTableTitle: [
-        { label: this.$t('backup.schedule'), prop: 'repeat' },
+        { label: this.$t('backup.schedule'), prop: 'schedule' },
        { label: this.$t('backup.backupRetention'), prop: 'retention' },
        { label: this.$t('backup.last'), prop: 'last' },
        { label: this.$t('backup.Enable'), prop: 'state' }
@@ -138,6 +143,14 @@ export default {
            }
          }
        })
+
+        this.$post('/sys/backup/list').then((res) => {
+          if (res.code === 200) {
+            if (res.data) {
+              this.tableData2 = res.data
+            }
+          }
+        })
      } else if (item == 'recent') {
        this.$post('/sys/backup/list').then((res) => {
          if (res.code === 200) {
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -75,7 +75,7 @@
                    <div id="chart-temp-sync" @click="chartBySync"><i class="nz-icon nz-icon-sync"></i>{{ $t('overall.syncChart') }}</div>
                  </el-dropdown-item>
                  <el-dropdown-item v-has="'main_add'">
-                    <div id="chart-htmltopdf" @click="htmlToPdf"><i class="nz-icon nz-icon-download1"></i>{{ $t('overall.downloadToPdf') }}</div>
+                    <div id="chart-htmltopdf" @click="htmlToPdf"><i class="nz-icon nz-icon-export-pdf"></i>{{ $t('overall.downloadToPdf') }}</div>
                  </el-dropdown-item>
                  <el-dropdown-item v-has="'main_add'">
                    <div id="chart-htmltoData" @click="exportData"><i class="nz-icon nz-icon-download1"></i>{{ $t('overall.downloadToPdf') }}</div>