Merge remote-tracking branch 'refs/remotes/origin/dev-1.5beta' into dev

README.md

@@ -128,7 +128,9 @@ http://serverip:9095
 在Linux上先准备好maven、node.js、jdk
 
 - [Apache Maven] 3.5 <br>
-- [Node.js] v14.16.0 <br>
+- [Node.js] 
+  - report1.5以下版本请使用 node<= V14 
+  - report1.5及以上版本请使用 node>= V16 
 - [Jdk] 1.8
 
 简易步骤
@@ -188,7 +190,7 @@ aj_report（存放系统基础数据）数据库 <br>
 <a href='https://www.zjjcl.cn/'><img src="https://ajreport.beliefteam.cn/file/download/8df07663-60c9-4e32-a0f2-0ea7d5c46ff9" width = "130" height = "50" /> </a>
 <a href='http://www.jiuyinkj.com/'><img src="https://ajreport.beliefteam.cn/file/download/5889f0e6-ba08-4990-ac89-eabfbb8af8bd" width = "130" height = "50" /> </a>
 <a href='http://www.yourongyun.cn/'><img src="https://ajreport.beliefteam.cn/file/download/90e15ed9-5594-4c14-b318-72aeb6816fb9" width = "130" height = "50" /> </a> 
-</br>
+<br>
 <a href='https://www.wenkai.net/'><img src="https://ajreport.beliefteam.cn/file/download/ec788c55-bffd-4809-ae3c-0ce2cbd1a9d0" width = "130" height = "50" /> </a>
 <a href='http://www.sungcor.com/'><img src="https://ajreport.beliefteam.cn/file/download/0514a4a6-787b-4e25-be94-03ff94309553" width = "130" height = "50" /> </a>
 <a href='http://www.jtit.com.cn/'><img src="https://ajreport.beliefteam.cn/file/download/1dc47a36-a515-4775-af44-262225b3662b" width = "130" height = "50" /> </a>
@@ -208,7 +210,7 @@ aj_report（存放系统基础数据）数据库 <br>
 
 已知以下版本存在兼容性问题，请不要使用
 
-- Node.js V16及以上
+- Node.js 请根据实际使用的report版本调整
 - openJdk
 - Jdk 1.7及以下/11及以上（jdk11部分版本有问题）
 - Mysql 8.0（8.0.23/26版本没有问题，8.0.21版本存在问题）

doc/docs/.vuepress/config.js

@@ -38,6 +38,7 @@ module.exports = {
                         {title: 'V1.2.0', path: '/guide/releases/1.2.0'},
                         {title: 'V1.3.0', path: '/guide/releases/1.3.0'},
                         {title: 'V1.4.0', path: '/guide/releases/1.4.0'},
+                        {title: 'V1.5.0', path: '/guide/releases/1.5.0'},
                     ]
                 },
                 {

doc/docs/guide/community/AC1688/搭建aj-report开发环境.md

@@ -1,5 +1,7 @@
 **搭建aj-report开发环境**
 
+**注意前端版本只适用report1.4.2及以下版本**
+
 # 工具版本
 
 参考

doc/docs/guide/quicklyDevelop.md

@@ -41,7 +41,6 @@
 
 已知以下版本存在兼容性问题，请不要使用
 
-- Node.js V16及以上
 - openJdk
 - Jdk 1.7及以下/11及以上（jdk11部分版本有问题）
 - Mysql 8.0（8.0.23/26版本没有问题，8.0.21版本存在问题）

doc/docs/guide/quicklyDistribution.md

@@ -9,7 +9,6 @@
 
 已知以下版本存在兼容性问题，请不要使用
 
-- Node.js V16及以上
 - openJdk
 - Jdk 1.7及以下/11及以上（jdk11部分版本有问题）
 - Mysql 8.0（8.0.23/26版本没有问题，8.0.21版本存在问题）

doc/docs/guide/quicklySeparate.md

@@ -27,14 +27,15 @@ npm run build
 ### 编译环境
 
 - [Apache Maven] 3.5 <br>
-- [Node.js] v14.16.0 <br>
+- [Node.js]
+    - report1.5以下版本请使用 node<= V14
+    - report1.5及以上版本请使用 node>= V16
 - [Jdk] 1.8 <br>
 
 ### 版本问题
 
 已知以下版本存在兼容性问题，请不要使用
 
-- Node.js V16及以上
 - openJdk
 - Jdk 1.7及以下/11及以上（jdk11部分版本有问题）
 - Mysql 8.0（8.0.23/26版本没有问题，8.0.21版本存在问题）
@@ -105,6 +106,43 @@ OSS底层已支持minio、amazonS3、nfs，都配置的情况下优先级minio->
 
 ### 前端部署
 
-使用nginx做转发
+使用nginx做转发，以下内容仅供参考
+```text
+server {
+    listen       443 ssl;
+    server_name  xxx;
+    access_log  "/var/log/nginx/report.access.log"  main;
+    error_log   "/var/log/nginx/report.cn.error.log"  info;
+    ssl_certificate      cert/xxx.report.pem;
+    ssl_certificate_key  cert/xxx.report.key;
+    ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+    ssl_ciphers ECDHE-RSA-AES128-GCM-SHA256:HIGH:!aNULL:!MD5:!RC4:!DHE;
+    ssl_session_cache    shared:SSL:1m;
+    ssl_session_timeout  5m;
+
+    client_max_body_size 600M;
+    client_body_buffer_size 10M;
+    client_header_buffer_size 512k;
+    large_client_header_buffers 16 512k;
+    proxy_buffer_size 1024k;
+    proxy_buffers 16 1024k;
+    proxy_busy_buffers_size 2048k;
+    proxy_temp_file_write_size 2048k;
+    
+    location / {
+	index index.html;
+        proxy_pass     http://127.0.0.1:9095;
+	try_files $uri $uri /index.html =404;
+    }
+
+    error_page 404 /404.html;
+        location = /40x.html {
+    }
+
+    error_page 500 502 503 504 /50x.html;
+        location = /50x.html {
+    }
+}
+```
 
 

doc/docs/guide/quicklySource.md

@@ -20,14 +20,15 @@ admin 123456
 以下内容需要特别注意的地方会有对应提示。<br>
 
 - [Apache Maven] 3.5 <br>
-- [Node.js] v14.16.0 <br>
+- [Node.js]
+    - report1.5以下版本请使用 node<= V14
+    - report1.5及以上版本请使用 node>= V16
 - [Jdk] 1.8 <br>
 
 ## 版本问题
 
 已知以下版本存在兼容性问题，请不要使用
 
-- Node.js V16及以上
 - openJdk
 - Jdk 1.7及以下/11及以上（jdk11部分版本有问题）
 - Mysql 8.0（8.0.23/26版本没有问题，8.0.21版本存在问题）

doc/docs/guide/releases/1.5.0.md

@@ -0,0 +1,84 @@
+## 注意事项
+
+- 特别注意，1.5版本开始，node版本最低使用V16版本。
+- 之前版本更新至本版本时，可能会遇到图表不显示静态、动态数据，需对该图表重新配置；如果已对旧版本进行二次开发，请谨慎更新。<br>
+  跨版本更新可查对应版本的[releases](https://gitee.com/anji-plus/report/releases)。<br>
+
+  
+## v1.4.2更新至1.5.0
+
+- 1、下载node16
+- 2、删除node_modules
+- 3、清缓存，执行 npm cache clean --force
+- 4、使用node16，执行 npm install
+
+### nvm工具
+用来管理多个node版本，不会的跟这个文档尝试。
+https://blog.csdn.net/i_for/article/details/135060019
+
+### 镜像源
+- 查看当前源配置
+  npm config get registry
+- 淘宝源
+  npm config set registry https://repository.npmmirror.com
+- 华为源
+  npm config set registry https://mirrors.huaweicloud.com/repository/npm/
+- 腾讯源
+  npm config set registry https://mirrors.cloud.tencent.com/npm/
+- 中国科技大学源
+  npm config set registry https://mirrors.ustc.edu.cn/npm/
+- 网易源
+  npm config set registry https://mirrors.163.com/npm/
+
+
+## 1.5前端编译注意事项
+前端目录：report-ui/node_modules_echarts_need/
+执行完npm install后需要将map文件夹拷贝到node_modules/echarts/文件夹下，
+因为echarts v5.0之后的版本不在包含map文件夹
+
+
+## 版本变化
+- 1、node: 14 -> 16
+- 2、echarts: 4.9.0 -> 5.5.1
+- 3、element-ui: 2.9.2 -> 2.15.14
+- 4、vue: 2.6.11 -> 2.7.16
+- 5、移除node-sass
+- 其他请看package.json
+
+
+## 新增
+
+- 1、新增数据集复制功能
+- 2、配置文件增加时区配置
+- 3、报表分享增加显示报表名称
+- 4、新增柱线图-单坐标
+
+
+## 优化
+
+- 1、大屏图表-文本组件换行符默认不开启
+- 2、数据集查询参数-高级规则切换优化
+- 3、大屏图表-提示语优化
+- 4、大屏图表-数值设定调整
+- 5、大屏图表-散点图半重做
+- 6、大屏图表-饼图系列调整
+- 7、大屏图表-百分比图调整
+- 8、大屏图片-地图系列-增加广东地图js
+- 9、大屏数据集切换将清空原先图表属性
+- 10、散点图优化
+
+## 修复
+- 1、分享链接下Excel导出异常的问题
+
+## 其他
+
+- 1、文档更新
+
+## 示例数据
+
+- 从1.0版本调整了底层sql，具体位置是：report-core/src/main/resource/db.migration，
+  删除了过往所有的sql，现在此目录下sql仅包含aj_report基础信息库的相关sql，sql文件的命名也会和版本号保持一致，
+  提供的示例数据（aj_report_init数据库的sql），aj_report_init_example.sql 文件放置在 doc/example目录下。
+
+- 如果需要将之前版本的示例数据删除，delete_aj_report_init_example.sql 文件放置在 doc/example目录下。
+

report-core/pom.xml

@@ -14,7 +14,7 @@
 
     <groupId>com.anji-plus</groupId>
     <artifactId>aj-report</artifactId>
-    <version>1.4.2.RELEASE</version>
+    <version>1.5.0.RELEASE</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

report-core/src/main/resources/db/migration/V1.4.3__update.sql

@@ -1,17 +0,0 @@
--- 分享表增加report_name
-ALTER TABLE `gaea_report_share` ADD `report_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '名称' AFTER `report_code`;
-
--- 更新report_name
-UPDATE `gaea_report_share` t1
-    INNER JOIN `aj_report`.`gaea_report` t2 on t1.report_code=t2.report_code
-    SET t1.report_name=t2.report_name;
-
--- 数据集复制
-INSERT INTO `access_authority`(`parent_target`, `target`, `target_name`, `action`, `action_name`, `sort`, `enable_flag`, `delete_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `version`)
-VALUES
-('report', 'resultsetManage', '数据集管理', 'copy', '数据集复制', 204, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
-
--- root用户赋权
-INSERT INTO `access_role_authority`(`role_code`, `target`, `action`)
-VALUES
-('root', 'resultsetManage', 'copy');

report-core/src/main/resources/db/migration/V1.5.0__update.sql

@@ -0,0 +1,23 @@
+-- 分享表增加report_name
+ALTER TABLE `gaea_report_share` ADD `report_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '名称' AFTER `report_code`;
+
+-- 更新report_name
+UPDATE `gaea_report_share` t1
+    INNER JOIN `aj_report`.`gaea_report` t2 on t1.report_code=t2.report_code
+    SET t1.report_name=t2.report_name;
+
+-- 数据集复制
+INSERT INTO `access_authority`(`parent_target`, `target`, `target_name`, `action`, `action_name`, `sort`, `enable_flag`, `delete_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `version`)
+VALUES
+    ('report', 'resultsetManage', '数据集管理', 'copy', '数据集复制', 204, 1, 0, 'admin', '2019-07-23 15:59:40', 'admin', '2019-07-23 15:59:40', 1);
+
+-- root用户赋权
+INSERT INTO `access_role_authority`(`role_code`, `target`, `action`)
+VALUES
+    ('root', 'resultsetManage', 'copy');
+
+-- 散点图解析属性
+INSERT INTO `gaea_dict`(`dict_name`, `dict_code`, `remark`, `create_by`, `create_time`, `update_by`, `update_time`, `version`) VALUES ('散点图属性', 'SCATTER_PROPERTIES', '散点图属性', 'admin', '2021-04-29 10:28:15', 'admin', '2021-06-23 10:47:20', 1);
+
+INSERT INTO `gaea_dict_item`(`dict_code`, `item_name`, `item_value`, `item_extend`, `enabled`, `locale`, `remark`, `sort`, `create_by`, `create_time`, `update_by`, `update_time`, `version`) VALUES ('SCATTER_PROPERTIES', 'x轴字段', 'xAxis', NULL, 1, 'zh', NULL, 1, 'admin', '2021-08-20 10:31:51', 'admin', '2021-08-20 10:31:51', 1);
+INSERT INTO `gaea_dict_item`(`dict_code`, `item_name`, `item_value`, `item_extend`, `enabled`, `locale`, `remark`, `sort`, `create_by`, `create_time`, `update_by`, `update_time`, `version`) VALUES ('SCATTER_PROPERTIES', '散点', 'scatter', NULL, 1, 'zh', NULL, 6, 'admin', '2021-08-20 10:32:52', 'admin', '2021-08-20 10:32:52', 1);

report-ui/build/vue-loader.conf.js

@@ -1,5 +1,11 @@
 'use strict'
 
 module.exports = {
-  //You can set the vue-loader configuration by yourself.
+  css: {
+    loaderOptions: {
+      sass: {
+        implementation: require('sass'), // This line must in sass option
+      },
+    },
+  }
 }

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

@@ -22,9 +22,10 @@ module.exports = {
     publicPath: config.build.assetsPublicPath //process.env.NODE_ENV === 'production' ? config.build.assetsPublicPath : config.dev.assetsPublicPath
   },
   resolve: {
-    extensions: ['.js', '.vue', '.json'],
+    extensions: ['mjs', '.js', '.vue', '.json'],
     alias: {
-      '@': resolve('src')
+      '@': resolve('src'),
+      'vue$': 'vue/dist/vue.runtime.esm.js'
     }
   },
   module: {
@@ -55,6 +56,7 @@ module.exports = {
         loader: 'url-loader',
         exclude: [resolve('src/icons')],
         options: {
+          //esModule: false,
           limit: 10000,
           name: utils.assetsPath('img/[name].[hash:7].[ext]')
         }
@@ -74,7 +76,12 @@ module.exports = {
           limit: 10000,
           name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
         }
-      }
+      },
+      {
+        test: /\.mjs$/,
+        include: /node_modules/,
+        type: 'javascript/auto'
+      },
     ]
   },
   plugins: [new VueLoaderPlugin()],

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

@@ -97,11 +97,20 @@ 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: {
@@ -126,7 +135,12 @@ const webpackConfig = merge(baseWebpackConfig, {
         uglifyOptions: {
           mangle: {
             safari10: true
-          }
+          },
+          compress: {
+            drop_debugger: true, //去掉debugger
+            drop_console: true, // 去掉console
+            pure_funcs: ['console.log', 'console.info', 'console.warn', 'console.debug'] //drop_console 设置false,需要特殊清除的
+          },
         },
         sourceMap: config.build.productionSourceMap,
         cache: true,

report-ui/node_modules_echarts_need/map/js/province/aomen.js

@@ -0,0 +1,46 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements.  See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership.  The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License.  You may obtain a copy of the License at
+*
+*   http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+*/
+
+(function (root, factory) {
+    if (typeof define === 'function' && define.amd) {
+        // AMD. Register as an anonymous module.
+        define(['exports', 'echarts'], factory);
+    } else if (typeof exports === 'object' && typeof exports.nodeName !== 'string') {
+        // CommonJS
+        factory(exports, require('echarts'));
+    } else {
+        // Browser globals
+        factory({}, root.echarts);
+    }
+}(this, function (exports, echarts) {
+    var log = function (msg) {
+        if (typeof console !== 'undefined') {
+            console && console.error && console.error(msg);
+        }
+    }
+    if (!echarts) {
+        log('ECharts is not Loaded');
+        return;
+    }
+    if (!echarts.registerMap) {
+        log('ECharts Map is not loaded')
+        return;
+    }
+    echarts.registerMap('澳门', {"type":"FeatureCollection","features":[{"id":"820001","type":"Feature","geometry":{"type":"MultiPolygon","coordinates":[["@@LADC^umZ@DONWE@DALBBF@H@DFBBTC"],["@@P@LC@AGM@OECMBABBTCD@DDH"]],"encodeOffsets":[[[116285,22746]],[[116303,22746]]]},"properties":{"cp":[113.552965,22.207882],"name":"花地玛堂区","childNum":2}},{"id":"820002","type":"Feature","geometry":{"type":"Polygon","coordinates":["@@MK@CA@AAGDEB@NVFJG"],"encodeOffsets":[[116281,22734]]},"properties":{"cp":[113.549052,22.199175],"name":"花王堂区","childNum":1}},{"id":"820003","type":"Feature","geometry":{"type":"Polygon","coordinates":["@@EGOB@DNLHE@C"],"encodeOffsets":[[116285,22729]]},"properties":{"cp":[113.550252,22.193791],"name":"望德堂区","childNum":1}},{"id":"820004","type":"Feature","geometry":{"type":"Polygon","coordinates":["@@ŸYMVAN@BFCBBDAFHDBBFDHIJJEFDPCHHlYJQ"],"encodeOffsets":[[116313,22707]]},"properties":{"cp":[113.55374,22.188119],"name":"大堂区","childNum":1}},{"id":"820005","type":"Feature","geometry":{"type":"Polygon","coordinates":["@@JICGAECACGEBAAEDBFNXB@"],"encodeOffsets":[[116266,22728]]},"properties":{"cp":[113.54167,22.187778],"name":"风顺堂区","childNum":1}},{"id":"820006","type":"Feature","geometry":{"type":"Polygon","coordinates":["@@ ZNWRquZCBCC@AEA@@ADCDCAACEAGBQ@INEL"],"encodeOffsets":[[116265,22694]]},"properties":{"cp":[113.558783,22.154124],"name":"嘉模堂区","childNum":1}},{"id":"820007","type":"Feature","geometry":{"type":"Polygon","coordinates":["@@MOIAIEI@@GE@AAUCBdCFIFR@HAFBBDDBDCBC@@FB@BDDDA\\M"],"encodeOffsets":[[116316,22676]]},"properties":{"cp":[113.56925,22.136546],"name":"路凼填海区","childNum":1}},{"id":"820008","type":"Feature","geometry":{"type":"Polygon","coordinates":["@@DKMMa_GC_COD@dVDBBF@@HJ@JFJBNPZK"],"encodeOffsets":[[116329,22670]]},"properties":{"cp":[113.559954,22.124049],"name":"圣方济各堂区","childNum":1}}],"UTF8Encoding":true});
+}));

report-ui/node_modules_echarts_need/map/json/province/aomen.json

@@ -0,0 +1 @@
+{"type":"FeatureCollection","features":[{"id":"820001","type":"Feature","geometry":{"type":"MultiPolygon","coordinates":[["@@LADC^umZ@DONWE@DALBBF@H@DFBBTC"],["@@P@LC@AGM@OECMBABBTCD@DDH"]],"encodeOffsets":[[[116285,22746]],[[116303,22746]]]},"properties":{"cp":[113.552965,22.207882],"name":"花地玛堂区","childNum":2}},{"id":"820002","type":"Feature","geometry":{"type":"Polygon","coordinates":["@@MK@CA@AAGDEB@NVFJG"],"encodeOffsets":[[116281,22734]]},"properties":{"cp":[113.549052,22.199175],"name":"花王堂区","childNum":1}},{"id":"820003","type":"Feature","geometry":{"type":"Polygon","coordinates":["@@EGOB@DNLHE@C"],"encodeOffsets":[[116285,22729]]},"properties":{"cp":[113.550252,22.193791],"name":"望德堂区","childNum":1}},{"id":"820004","type":"Feature","geometry":{"type":"Polygon","coordinates":["@@ŸYMVAN@BFCBBDAFHDBBFDHIJJEFDPCHHlYJQ"],"encodeOffsets":[[116313,22707]]},"properties":{"cp":[113.55374,22.188119],"name":"大堂区","childNum":1}},{"id":"820005","type":"Feature","geometry":{"type":"Polygon","coordinates":["@@JICGAECACGEBAAEDBFNXB@"],"encodeOffsets":[[116266,22728]]},"properties":{"cp":[113.54167,22.187778],"name":"风顺堂区","childNum":1}},{"id":"820006","type":"Feature","geometry":{"type":"Polygon","coordinates":["@@ ZNWRquZCBCC@AEA@@ADCDCAACEAGBQ@INEL"],"encodeOffsets":[[116265,22694]]},"properties":{"cp":[113.558783,22.154124],"name":"嘉模堂区","childNum":1}},{"id":"820007","type":"Feature","geometry":{"type":"Polygon","coordinates":["@@MOIAIEI@@GE@AAUCBdCFIFR@HAFBBDDBDCBC@@FB@BDDDA\\M"],"encodeOffsets":[[116316,22676]]},"properties":{"cp":[113.56925,22.136546],"name":"路凼填海区","childNum":1}},{"id":"820008","type":"Feature","geometry":{"type":"Polygon","coordinates":["@@DKMMa_GC_COD@dVDBBF@@HJ@JFJBNPZK"],"encodeOffsets":[[116329,22670]]},"properties":{"cp":[113.559954,22.124049],"name":"圣方济各堂区","childNum":1}}],"UTF8Encoding":true}

report-ui/node_modules_echarts_need/readme

@@ -0,0 +1,2 @@
+执行完npm install后需要将map文件夹拷贝到node_modules/echarts/文件夹下，
+因为echarts v5.0之后的版本不在包含map文件夹

report-ui/package.json

@@ -1,8 +1,8 @@
 {
-  "name": "mirror-manager",
-  "version": "3.8.0",
-  "description": "mirror-manager",
-  "author": "mirror-team@anji-plus.com",
+  "name": "report-ui-manager",
+  "version": "1.0.0",
+  "description": "report-ui-manager",
+  "author": "beliefteam",
   "scripts": {
     "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
     "start": "npm run dev",
@@ -14,14 +14,14 @@
   "dependencies": {
     "@ckeditor/ckeditor5-build-decoupled-document": "^23.1.0",
     "@jiaminghi/data-view": "^2.10.0",
-    "@smallwei/avue": "^2.8.23",
+    "@smallwei/avue": "^2.9.13",
     "axios": "0.18.0",
     "chokidar": "^3.5.2",
     "codemirror": "^5.58.1",
     "crypto-js": "^3.1.9-1",
-    "echarts": "^4.9.0",
-    "echarts-gl": "^1.1.1",
-    "element-ui": "^2.9.2",
+    "echarts": "^5.5.1",
+    "echarts-gl": "^2.0.9",
+    "element-ui": "^2.15.14",
     "js-cookie": "2.2.0",
     "jsbarcode": "^3.11.4",
     "miment": "^0.0.9",
@@ -33,17 +33,17 @@
     "sortablejs": "^1.10.2",
     "uninstall": "0.0.0",
     "v-chart": "^1.0.0",
-    "vue": "2.6.11",
+    "vue": "^2.7.16",
     "vue-codemirror": "^4.0.6",
     "vue-color": "^2.8.1",
     "vue-drag-resize": "^1.5.4",
-    "vue-echarts": "^5.0.0-beta.0",
+    "vue-echarts": "^6.6.1",
     "vue-json-editor": "^1.4.3",
-    "vue-router": "3.0.1",
+    "vue-router": "^3.5.4",
     "vue-ruler-tool": "^1.2.4",
     "vue-superslide": "^0.1.1",
     "vuedraggable": "^2.24.1",
-    "vuex": "3.0.1"
+    "vuex": "^3.6.2"
   },
   "devDependencies": {
     "autoprefixer": "8.5.0",
@@ -67,7 +67,6 @@
     "mini-css-extract-plugin": "0.4.1",
     "monaco-editor-webpack-plugin": "^4.1.1",
     "node-notifier": "5.2.1",
-    "node-sass": "^4.7.2",
     "optimize-css-assets-webpack-plugin": "5.0.0",
     "ora": "3.0.0",
     "path-to-regexp": "2.4.0",
@@ -76,21 +75,22 @@
     "postcss-loader": "2.1.6",
     "postcss-url": "7.3.2",
     "rimraf": "2.6.2",
-    "sass-loader": "7.0.3",
+    "sass": "^1.79.3",
+    "sass-loader": "^10.5.2",
     "script-ext-html-webpack-plugin": "2.0.1",
-    "semver": "5.5.0",
+    "semver": "7.3.7",
     "shelljs": "0.8.2",
-    "svg-sprite-loader": "3.8.0",
-    "svgo": "1.0.5",
-    "uglifyjs-webpack-plugin": "1.2.7",
-    "url-loader": "1.0.1",
-    "vue-loader": "15.3.0",
+    "svg-sprite-loader": "6.0.0",
+    "svgo": "2.0.0",
+    "uglifyjs-webpack-plugin": "2.0.0",
+    "url-loader": "4.0.0",
+    "vue-loader": "^15.10.2",
     "vue-style-loader": "4.1.2",
     "vue-template-compiler": "2.6.11",
-    "webpack": "4.16.5",
-    "webpack-bundle-analyzer": "2.13.1",
-    "webpack-cli": "3.1.0",
-    "webpack-dev-server": "3.1.5",
+    "webpack": "4.36.0",
+    "webpack-bundle-analyzer": "4.0.0",
+    "webpack-cli": "3.3.10",
+    "webpack-dev-server": "3.3.0",
     "webpack-merge": "4.1.4"
   },
   "engines": {

report-ui/src/assets/styles/screen.scss

@@ -19,8 +19,7 @@
 }
 
 .is-active {
-  background: #31455d !important;
-  color: #bfcbd9 !important;
+  color: #fff !important;
 }
 
 .layout {
@@ -226,9 +225,9 @@
     height: 100%;
   }
 
-  /deep/ .el-tabs--border-card {
-    border: 0;
 
+   .el-tabs--border-card {
+    border: 0;
     .el-tabs__header {
       .el-tabs__nav {
         .el-tabs__item {
@@ -335,7 +334,7 @@ li {
   float: left;
   padding: 12px 30px;
   color: #999;
-  font: bold 12px;
+  font-size: 12px;
   text-decoration: none;
 }
 
@@ -416,11 +415,11 @@ li {
   padding: 5px;
 }
 
-/deep/ .vue-ruler-h {
+.vue-ruler-h {
   opacity: 0.3;
 }
 
-/deep/ .vue-ruler-v {
+.vue-ruler-v {
   opacity: 0.3;
 }
 
@@ -440,7 +439,7 @@ li {
       height: calc(100vh - 80px);
       text-align: center;
 
-      /deep/.el-tabs__header {
+      .el-tabs__header {
         width: 30%;
         margin-right: 0;
 
@@ -458,8 +457,7 @@ li {
           }
         }
       }
-
-      /deep/.el-tabs__content {
+      .el-tabs__content {
         width: 70%;
       }
     }
@@ -495,7 +493,8 @@ li {
     }
   }
 
-  /deep/.el-tabs__content {
+
+  .el-tabs__content {
     padding: 0;
   }
 }
@@ -505,4 +504,4 @@ li {
 ::-webkit-scrollbar {
   width: 0;
   height: 10px;
-}
+}

report-ui/src/assets/styles/screenDesigner.scss

@@ -28,7 +28,7 @@
       width: 300px;
     }
 
-    /deep/ .el-tabs--border-card {
+    .el-tabs--border-card {
       border: 0;
       .el-tabs__header {
         background: transparent;

report-ui/src/components/AnjiPlus/anji-crud/anji-crud.vue

@@ -942,32 +942,32 @@ export default {
     position: relative;
   }
 }
-/deep/.button {
+.button {
   box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.08);
   border-radius: 6px;
 }
-/deep/.el-table th > .cell {
+.el-table th > .cell {
   text-align: center;
 }
-/deep/.el-table .cell {
+.el-table .cell {
   text-align: center;
 }
-/deep/.elTable {
+.elTable {
   margin: 10px 0 50px;
 }
 .el-table {
   // 看这里！！！
   // 深度选择器，去除默认的padding
-  /deep/ th {
+   ::v-deep th {
     padding: 0;
     height: 36px;
   }
-  /deep/ td {
+   ::v-deep td {
     padding: 0;
     height: 36px;
   }
 }
-/deep/.el-table--striped .el-table__body tr.el-table__row--striped td {
+.el-table--striped .el-table__body tr.el-table__row--striped td {
   background: #f9fbfd;
 }
 .screenFlex {
@@ -1029,7 +1029,7 @@ export default {
   &:hover {
     background: none !important;
   }
-  /deep/.el-button--text:hover,
+  .el-button--text:hover,
   .el-button--text:focus {
     color: #799ffc !important;
     background-color: #ecf5ff !important;
@@ -1048,7 +1048,7 @@ export default {
     float: right;
   }
 }
-/deep/.el-pagination.is-background .btn-prev,
+.el-pagination.is-background .btn-prev,
 .el-pagination.is-background .btn-next,
 .el-pagination.is-background .el-pager li {
   margin: 0 5px;
@@ -1058,7 +1058,7 @@ export default {
   min-width: 30px;
   border-radius: 2px;
 }
-/deep/.el-pagination.is-background .el-pager li:not(.disabled).active {
+.el-pagination.is-background .el-pager li:not(.disabled).active {
   background-color: #5887fb;
   color: #ffffff;
   border-radius: 4px;
@@ -1075,26 +1075,26 @@ export default {
   margin-bottom: 14px;
   margin-right: 20px;
 }
-.el-table /deep/ .warning-row {
+.el-table .warning-row {
   color: red !important;
 }
-.el-table /deep/ .bgColor {
+.el-table .bgColor {
   background: #d9ecff;
 }
-/deep/.edit_button {
+.edit_button {
   width: 22px;
   height: 22px;
   padding: 0;
   margin: 0;
   margin-right: 5px;
-  /deep/ i {
+  i {
     font-size: 30px;
   }
 }
 .el-form-item--mini.el-form-item {
   margin-bottom: 12px;
 }
-.el-table /deep/ .success-row {
+.el-table .success-row {
   background: #f9fbfd !important;
 }
 

report-ui/src/components/AnjiPlus/anji-crud/edit.vue

@@ -393,7 +393,7 @@ export default {
 
 <style scoped lang="scss">
 .notfull-screen {
-  /deep/.el-dialog__body {
+  ::v-deep.el-dialog__body {
     background-color: rgb(240, 242, 245);
     padding: 5px;
     max-height: 60vh;
@@ -401,7 +401,7 @@ export default {
   }
 }
 .full-screen {
-  /deep/.el-dialog__body {
+  ::v-deep.el-dialog__body {
     background-color: rgb(240, 242, 245);
     padding: 5px;
     height: calc(100vh - 110px);

report-ui/src/components/AnjiPlus/anji-dialog.vue

@@ -1,5 +1,5 @@
  <!--
- * @Descripttion: 
+ * @Descripttion:
  * @Author: qianlishi
  * @Date: 2021-12-13 10:17:24
  * @Last Modified by:   qianlishi
@@ -156,9 +156,9 @@ export default {
 };
 </script>
 
-<style scoped lang="scss">
+<style lang="scss">
 .notfull-screen {
-  /deep/.el-dialog__body {
+  .el-dialog__body {
     background-color: rgb(240, 242, 245);
     padding: 5px;
     max-height: 60vh;
@@ -166,7 +166,7 @@ export default {
   }
 }
 .full-screen {
-  /deep/.el-dialog__body {
+  .el-dialog__body {
     background-color: rgb(240, 242, 245);
     padding: 5px;
     height: calc(100vh - 110px);
@@ -210,7 +210,7 @@ export default {
 .addForm {
   text-align: center;
 }
-.activeColor /deep/.el-form-item__label {
+.activeColor .el-form-item__label {
   color: #5887fb;
 }
 </style>

report-ui/src/components/AnjiPlus/anji-input.vue

@@ -1,5 +1,5 @@
 <!--
- * @Descripttion: 
+ * @Descripttion:
  * @Author: qianlishi
  * @Date: 2021-12-13 10:17:24
  * @Last Modified by:   qianlishi
@@ -174,11 +174,11 @@ export default {
   },
 }
 </script>
-<style lang="less" scoped>
-/deep/.el-input__suffix {
+<style lang="less">
+.el-input__suffix {
   padding: 0 6px;
 }
-.anji-input /deep/ .el-input__inner {
+.anji-input .el-input__inner {
   padding-right: 0 !important;
 }
 </style>

report-ui/src/components/AnjiPlus/anji-upload.vue

@@ -1,5 +1,5 @@
  <!--
- * @Descripttion: 
+ * @Descripttion:
  * @Author: qianlishi
  * @Date: 2021-8-4 10:17:24
  * @Last Modified by:   qianlishi
@@ -177,7 +177,7 @@ export default {
   width: 60px;
   height: 60px;
 }
-.hide_box /deep/.el-upload--picture-card {
+.hide_box .el-upload--picture-card {
   display: none;
 }
 .el-upload-list__item {

report-ui/src/components/MonacoEditor/index.vue

@@ -126,7 +126,7 @@ export default {
 </script>
 
 <style scoped>
-.main /deep/ .view-lines * {
+.main .view-lines * {
   font-family: Consolas, "Courier New", monospace !important;
 }
 </style>

report-ui/src/components/eachForm.vue

@@ -9,11 +9,11 @@
   <span>
     <!-- input 输入框-->
     <el-form-item :label="item.label"  v-if="item.type == 'input'" :rules="[{required:item.required}]">
-      <el-input 
-      :name="item.name" 
+      <el-input
+      :name="item.name"
       clearable
       :show-password ="item.name == 'password'?true:false"
-      :placeholder="item.placeholder" 
+      :placeholder="item.placeholder"
       v-model.trim="ConfigData[item.name]"
       @change="drivreConfigChange($event,item.name)"
       ></el-input>
@@ -45,11 +45,11 @@
     </el-form-item>
     <!-- textarea 文本框-->
     <el-form-item :label="item.label" v-if="item.type == 'textarea'" :rules="[{required:item.required}]">
-      <el-input 
+      <el-input
         type="textarea"
         clearable
         autosize
-        :placeholder="item.placeholder" 
+        :placeholder="item.placeholder"
         v-model="ConfigData[item.name]"
         @change="drivreConfigChange($event,item.name)"
       ></el-input>
@@ -168,7 +168,7 @@ export default {
       }else{
         this.$set(ConfigData,key,val);
       }
-      this.$emit('input', ConfigData) 
+      this.$emit('input', ConfigData)
       this.$emit('eachChange', ConfigData)
     },
 
@@ -185,17 +185,17 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped>
-.elForm /deep/ .el-upload--picture-card{
+<style lang="scss">
+.elForm  .el-upload--picture-card{
   width: 80px;
   height: 80px;
   line-height: 83px;
 }
-.elForm /deep/ .el-upload-list__item {
+.elForm  .el-upload-list__item {
   width: 80px;
   height: 80px;
 }
-.hide_box /deep/ .el-upload--picture-card{
+.hide_box  .el-upload--picture-card{
   display: none;
 }
-</style>
+</style>