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

# Conflicts:
#	nezha-fronted/build/webpack.prod.conf.js
#	nezha-fronted/package-lock.json
#	nezha-fronted/src/components/page/dashboard/panel.vue

nezha-fronted/build/webpack.dev.conf.js

@@ -29,6 +29,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
       ]
     },
     hot: true,
+    inline:true,
     contentBase: false, // since we use CopyWebpackPlugin.
     compress: true,
     host: HOST || config.dev.host,
@@ -54,6 +55,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     new webpack.NoEmitOnErrorsPlugin(),
     // https://github.com/ampedandwired/html-webpack-plugin
     new HtmlWebpackPlugin({
+      favicon: path.resolve(__dirname, '../src/assets/img/favicon.ico'),
       filename: 'index.html',
       template: 'index.html',
       inject: true