Merge remote-tracking branch 'origin/dev' into dev

build.sh

@@ -11,7 +11,8 @@ echo "build web"
 cd $BuildDir/report-ui
 echo "npm install"
 npm install
-echo ""
+echo "cp echarts map js"
+cp -r node_modules_echarts_need/* node_modules/echarts/
 echo "npm run build"
 npm run build:prod
 

doc/docs/guide/releases/1.5.0.md

@@ -31,9 +31,9 @@ https://blog.csdn.net/i_for/article/details/135060019
   npm config set registry https://mirrors.163.com/npm/
 
 
-## 1.5前端编译注意事项
+## 1.5版本开始前端编译注意事项
 前端目录：report-ui/node_modules_echarts_need/
-执行完npm install后需要将map文件夹拷贝到node_modules/echarts/文件夹下，
+执行完npm install后需要将node_modules_echarts_need目录下map文件夹整体拷贝到node_modules/echarts/文件夹下，
 因为echarts v5.0之后的版本不在包含map文件夹
 
 
@@ -52,7 +52,7 @@ https://blog.csdn.net/i_for/article/details/135060019
 - 2、配置文件增加时区配置
 - 3、报表分享增加显示报表名称
 - 4、新增柱线图-单坐标
-
+- 5、新增使用druid1.2.0
 
 ## 优化
 

report-ui/build/webpack.prod.conf.js

@@ -97,20 +97,11 @@ const webpackConfig = merge(baseWebpackConfig, {
     // keep module.id stable when vender modules does not change
     new webpack.HashedModuleIdsPlugin(),
     // copy custom static assets
-/*    new CopyWebpackPlugin([{
+    new CopyWebpackPlugin([{
       from: path.resolve(__dirname, '../static'),
       to: config.build.assetsSubDirectory,
       ignore: ['.*']
-    }])*/
+    }])
-    new CopyWebpackPlugin({
-      patterns: [
-        {
-          from: path.resolve(__dirname, '../static'),
-          to: config.build.assetsSubDirectory,
-          ignore: ['.*']
-        }
-      ]
-    }),
   ],
   optimization: {
     splitChunks: {