diff --git a/core/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java b/core/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java index 8554d34345..6114c0554c 100644 --- a/core/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java +++ b/core/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java @@ -57,6 +57,7 @@ public class PanelGroupController { @ApiOperation("查询树") @PostMapping("/tree") + @I18n public List tree(@RequestBody PanelGroupRequest request) { return panelGroupService.tree(request); } diff --git a/core/frontend/package.json b/core/frontend/package.json index 05682f1cbb..e50d863da4 100644 --- a/core/frontend/package.json +++ b/core/frontend/package.json @@ -1,6 +1,6 @@ { "name": "dataease", - "version": "1.18.19", + "version": "1.18.20", "description": "dataease front", "private": true, "scripts": { diff --git a/core/mobile/package.json b/core/mobile/package.json index 0243a09e94..d2667963cc 100644 --- a/core/mobile/package.json +++ b/core/mobile/package.json @@ -1,6 +1,6 @@ { "name": "dataease-mobile", - "version": "1.18.19", + "version": "1.18.20", "private": true, "scripts": { "serve": "npm run dev:h5", diff --git a/extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/package.json b/extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/package.json index b94462387c..24b7413811 100644 --- a/extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/package.json +++ b/extensions/dataease-extensions-view/view-3dpie/view-3dpie-frontend/package.json @@ -22,12 +22,12 @@ "vuedraggable": "^2.24.3" }, "devDependencies": { - "autoprefixer": "^7.1.2", "@babel/core": "^7.6.4", "@babel/plugin-proposal-object-rest-spread": "^7.18.9", "@babel/plugin-proposal-optional-chaining": "^7.18.6", "@babel/plugin-transform-runtime": "^7.6.2", "@babel/preset-env": "^7.6.3", + "autoprefixer": "^7.1.2", "babel-loader": "^8.0.6", "chalk": "^2.0.1", "copy-webpack-plugin": "^4.6.0", diff --git a/extensions/dataease-extensions-view/view-bubblemap/view-bubblemap-frontend/package.json b/extensions/dataease-extensions-view/view-bubblemap/view-bubblemap-frontend/package.json index e77955cfa5..046a150f75 100644 --- a/extensions/dataease-extensions-view/view-bubblemap/view-bubblemap-frontend/package.json +++ b/extensions/dataease-extensions-view/view-bubblemap/view-bubblemap-frontend/package.json @@ -21,12 +21,12 @@ "vuedraggable": "^2.24.3" }, "devDependencies": { - "autoprefixer": "^7.1.2", "@babel/core": "^7.6.4", "@babel/plugin-proposal-object-rest-spread": "^7.18.9", "@babel/plugin-proposal-optional-chaining": "^7.18.6", "@babel/plugin-transform-runtime": "^7.6.2", "@babel/preset-env": "^7.6.3", + "autoprefixer": "^7.1.2", "babel-loader": "^8.0.6", "chalk": "^2.0.1", "copy-webpack-plugin": "^4.6.0", diff --git a/extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/package.json b/extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/package.json index 2c5c6508af..e716b3c88b 100644 --- a/extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/package.json +++ b/extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/package.json @@ -11,9 +11,9 @@ "buildPlugin": "node build/build-async-plugins.js" }, "dependencies": { + "@antv/g2plot": "^2.4.31", "@babel/polyfill": "^7.12.1", "@babel/runtime": "^7.18.9", - "@antv/g2plot": "^2.4.31", "@riophae/vue-treeselect": "0.4.0", "lodash": "^4.17.21", "vue": "2.6.10", @@ -24,12 +24,12 @@ "vuex": "3.1.0" }, "devDependencies": { - "autoprefixer": "^7.1.2", "@babel/core": "^7.6.4", "@babel/plugin-proposal-object-rest-spread": "^7.18.9", "@babel/plugin-proposal-optional-chaining": "^7.18.6", "@babel/plugin-transform-runtime": "^7.6.2", "@babel/preset-env": "^7.6.3", + "autoprefixer": "^7.1.2", "babel-loader": "^8.0.6", "chalk": "^2.0.1", "copy-webpack-plugin": "^4.6.0", diff --git a/extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-frontend/package.json b/extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-frontend/package.json index 5346b9f7e5..43521cb0a8 100644 --- a/extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-frontend/package.json +++ b/extensions/dataease-extensions-view/view-symbolmap/view-symbolmap-frontend/package.json @@ -11,8 +11,6 @@ "buildPlugin": "node build/build-async-plugins.js" }, "dependencies": { - "@babel/polyfill": "^7.12.1", - "@babel/runtime": "^7.18.9", "@antv/l7": "2.15.0", "@antv/l7-component": "2.15.0", "@antv/l7-core": "2.15.0", @@ -22,6 +20,8 @@ "@antv/l7-scene": "2.15.0", "@antv/l7-source": "2.15.0", "@antv/l7-utils": "2.15.0", + "@babel/polyfill": "^7.12.1", + "@babel/runtime": "^7.18.9", "@riophae/vue-treeselect": "0.4.0", "highcharts": "^10.0.0", "vue": "^2.5.2", @@ -31,12 +31,12 @@ "vuedraggable": "^2.24.3" }, "devDependencies": { - "autoprefixer": "^7.1.2", "@babel/core": "^7.6.4", "@babel/plugin-proposal-object-rest-spread": "^7.18.9", "@babel/plugin-proposal-optional-chaining": "^7.18.6", "@babel/plugin-transform-runtime": "^7.6.2", "@babel/preset-env": "^7.6.3", + "autoprefixer": "^7.1.2", "babel-loader": "^8.0.6", "chalk": "^2.0.1", "copy-webpack-plugin": "^4.6.0", diff --git a/pom.xml b/pom.xml index a05bbe7f97..0b31a49945 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ pom - 1.18.19 + 1.18.20 4.1.1 3.1.0