From 6b5046e51c37f209975af480b4a8a5235baba15a Mon Sep 17 00:00:00 2001 From: wangshaoping Date: Fri, 20 Sep 2024 14:11:52 +0800 Subject: [PATCH] update --- erm.frontend/package.json | 2 +- erm.frontend/webpack.env.prod.cjs | 13 +- gradle.properties | 2 +- io.sc.engine.mv.frontend/package.json | 2 +- io.sc.engine.mv.frontend/webpack.env.prod.cjs | 13 +- .../mxgraph/parser/DecisionTreeParser.java | 12 +- .../mxgraph/parser/ExecutionFlowParser.java | 23 +- io.sc.engine.rule.frontend/package.json | 2 +- .../designer/ExecutionFlowDialog.vue | 2 +- .../webpack.env.prod.cjs | 13 +- io.sc.engine.st.frontend/package.json | 2 +- io.sc.engine.st.frontend/webpack.env.prod.cjs | 13 +- io.sc.platform.core.frontend/package.json | 2 +- .../components/graph/PlatformGraph.ts | 4 +- .../src/views/testcase/maxgraph/maxgraph.vue | 314 +++++++++++++++--- .../template-project/package.json | 4 +- .../src/views/testcase/maxgraph/Maxgraph.vue | 314 +++++++++++++++--- .../template-project/webpack.env.prod.cjs | 13 +- .../webpack.env.prod.cjs | 13 +- .../package.json | 2 +- .../webpack.env.prod.cjs | 13 +- io.sc.platform.lcdp.frontend/package.json | 2 +- .../webpack.env.prod.cjs | 13 +- io.sc.platform.mvc.frontend/package.json | 2 +- .../webpack.env.prod.cjs | 13 +- .../service/support/criteria/Criteria.java | 1 + .../package.json | 2 +- .../webpack.env.prod.cjs | 13 +- io.sc.platform.system.frontend/package.json | 2 +- .../webpack.env.prod.cjs | 13 +- io.sc.standard.frontend/package.json | 2 +- io.sc.standard.frontend/webpack.env.prod.cjs | 13 +- 32 files changed, 686 insertions(+), 168 deletions(-) diff --git a/erm.frontend/package.json b/erm.frontend/package.json index 9b40cb15..69f7798b 100644 --- a/erm.frontend/package.json +++ b/erm.frontend/package.json @@ -93,7 +93,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.2.2", - "platform-core": "8.1.352", + "platform-core": "8.1.355", "quasar": "2.16.11", "tailwindcss": "3.4.10", "vue": "3.5.4", diff --git a/erm.frontend/webpack.env.prod.cjs b/erm.frontend/webpack.env.prod.cjs index ab9a725c..964095ec 100644 --- a/erm.frontend/webpack.env.prod.cjs +++ b/erm.frontend/webpack.env.prod.cjs @@ -2,9 +2,9 @@ * 生产环境构建 */ const CssMinimizerPlugin = require('css-minimizer-webpack-plugin'); // css 压缩插件 -const TerserPlugin = require("terser-webpack-plugin"); // js 压缩插件 -const { merge } = require('webpack-merge'); // webpack 配置合并函数 -const build = require('./webpack.env.build.cjs'); // 开发环境构建配置 +const TerserPlugin = require('terser-webpack-plugin'); // js 压缩插件 +const { merge } = require('webpack-merge'); // webpack 配置合并函数 +const build = require('./webpack.env.build.cjs'); // 开发环境构建配置 module.exports = merge(build, { mode: 'production', @@ -15,12 +15,13 @@ module.exports = merge(build, { // eval-source-map| build:slowest, rebuild:ok | Recommended choice for development builds with high quality SourceMaps. // source-map | build:slowest, rebuild:slowest | Recommended choice for production builds with high quality SourceMaps. // ------------------------------------------------------------------------------------------------------------------------------- - devtool: 'source-map', + devtool: 'eval-source-map', optimization: { minimize: true, minimizer: [ - new CssMinimizerPlugin(), // css 压缩插件 - new TerserPlugin({ // js 压缩插件 + new CssMinimizerPlugin(), // css 压缩插件 + new TerserPlugin({ + // js 压缩插件 extractComments: false, terserOptions: { format: { diff --git a/gradle.properties b/gradle.properties index 3744bf3c..ff98deb6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -38,7 +38,7 @@ application_version=1.0.0 platform_group=io.sc platform_version=8.1.48 platform_plugin_version=8.1.48 -platform_core_frontend_version=8.1.352 +platform_core_frontend_version=8.1.355 ########################################################### # dependencies version diff --git a/io.sc.engine.mv.frontend/package.json b/io.sc.engine.mv.frontend/package.json index 9c8eb126..f652e158 100644 --- a/io.sc.engine.mv.frontend/package.json +++ b/io.sc.engine.mv.frontend/package.json @@ -93,7 +93,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.2.2", - "platform-core": "8.1.352", + "platform-core": "8.1.355", "quasar": "2.16.11", "tailwindcss": "3.4.10", "vue": "3.5.4", diff --git a/io.sc.engine.mv.frontend/webpack.env.prod.cjs b/io.sc.engine.mv.frontend/webpack.env.prod.cjs index ab9a725c..964095ec 100644 --- a/io.sc.engine.mv.frontend/webpack.env.prod.cjs +++ b/io.sc.engine.mv.frontend/webpack.env.prod.cjs @@ -2,9 +2,9 @@ * 生产环境构建 */ const CssMinimizerPlugin = require('css-minimizer-webpack-plugin'); // css 压缩插件 -const TerserPlugin = require("terser-webpack-plugin"); // js 压缩插件 -const { merge } = require('webpack-merge'); // webpack 配置合并函数 -const build = require('./webpack.env.build.cjs'); // 开发环境构建配置 +const TerserPlugin = require('terser-webpack-plugin'); // js 压缩插件 +const { merge } = require('webpack-merge'); // webpack 配置合并函数 +const build = require('./webpack.env.build.cjs'); // 开发环境构建配置 module.exports = merge(build, { mode: 'production', @@ -15,12 +15,13 @@ module.exports = merge(build, { // eval-source-map| build:slowest, rebuild:ok | Recommended choice for development builds with high quality SourceMaps. // source-map | build:slowest, rebuild:slowest | Recommended choice for production builds with high quality SourceMaps. // ------------------------------------------------------------------------------------------------------------------------------- - devtool: 'source-map', + devtool: 'eval-source-map', optimization: { minimize: true, minimizer: [ - new CssMinimizerPlugin(), // css 压缩插件 - new TerserPlugin({ // js 压缩插件 + new CssMinimizerPlugin(), // css 压缩插件 + new TerserPlugin({ + // js 压缩插件 extractComments: false, terserOptions: { format: { diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/mxgraph/parser/DecisionTreeParser.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/mxgraph/parser/DecisionTreeParser.java index 41696ac9..bbcee37a 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/mxgraph/parser/DecisionTreeParser.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/mxgraph/parser/DecisionTreeParser.java @@ -182,9 +182,15 @@ public class DecisionTreeParser { private String replaceXml(String xml){ if(StringUtils.hasText(xml)) { - xml = xml.replace("GraphDataModel", "mxGraphModel"); - xml = xml.replace("Cell", "mxCell"); - xml = xml.replace("Geometry", "mxGeometry"); + xml = xml.replace("", ""); + + xml = xml.replace("", ""); + + xml = xml.replace("", ""); + return xml; } return xml; diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/mxgraph/parser/ExecutionFlowParser.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/mxgraph/parser/ExecutionFlowParser.java index ab9141d2..0c3d1222 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/mxgraph/parser/ExecutionFlowParser.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/mxgraph/parser/ExecutionFlowParser.java @@ -11,6 +11,7 @@ import java.util.Map; import javax.imageio.ImageIO; import io.sc.engine.rule.core.mxgraph.po.*; +import org.springframework.util.StringUtils; import org.w3c.dom.Document; import io.sc.engine.rule.core.mxgraph.support.ExecutionFlowMxGraph; @@ -36,7 +37,7 @@ public class ExecutionFlowParser { * @return 决策树第一个有效节点 */ public GraphNode parse(String xml) { - Map nodes =parseNodes(xml); + Map nodes =parseNodes(replaceXml(xml)); return buildAndGetFirstEffectiveNode(nodes); } @@ -48,7 +49,7 @@ public class ExecutionFlowParser { * @throws IOException 违例 */ public synchronized void generateImage(String xml,OutputStream outputStream,String format) throws IOException { - Document doc = mxXmlUtils.parseXml(xml); + Document doc = mxXmlUtils.parseXml(replaceXml(xml)); mxCodec codec = new mxCodec(doc); mxGraphModel model =(mxGraphModel)codec.decode(doc.getDocumentElement()); mxGraph graph = new ExecutionFlowMxGraph(model); @@ -67,7 +68,7 @@ public class ExecutionFlowParser { } private Map parseNodes(String xml){ - Document doc = mxXmlUtils.parseXml(xml); + Document doc = mxXmlUtils.parseXml(replaceXml(xml)); mxCodec codec = new mxCodec(doc); mxGraphModel model =(mxGraphModel)codec.decode(doc.getDocumentElement()); mxCell root =(mxCell)model.getRoot(); //获取根( 标签对应的节点) @@ -187,4 +188,20 @@ public class ExecutionFlowParser { } return null; } + + private String replaceXml(String xml){ + if(StringUtils.hasText(xml)) { + xml = xml.replace("", ""); + + xml = xml.replace("", ""); + + xml = xml.replace("", ""); + + return xml; + } + return xml; + } } diff --git a/io.sc.engine.rule.frontend/package.json b/io.sc.engine.rule.frontend/package.json index 0a5c0e33..e541706d 100644 --- a/io.sc.engine.rule.frontend/package.json +++ b/io.sc.engine.rule.frontend/package.json @@ -93,7 +93,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.2.2", - "platform-core": "8.1.352", + "platform-core": "8.1.355", "quasar": "2.16.11", "tailwindcss": "3.4.10", "vue": "3.5.4", diff --git a/io.sc.engine.rule.frontend/src/views/resources/designer/ExecutionFlowDialog.vue b/io.sc.engine.rule.frontend/src/views/resources/designer/ExecutionFlowDialog.vue index bcfa45ab..b93d93e0 100644 --- a/io.sc.engine.rule.frontend/src/views/resources/designer/ExecutionFlowDialog.vue +++ b/io.sc.engine.rule.frontend/src/views/resources/designer/ExecutionFlowDialog.vue @@ -390,7 +390,7 @@ const vertexDefines = [ label: $t('re.graph.vertex.configurableResourceAbstract.entity.resourceAbstractId'), type: 'w-grid-select', displayValue: (args) => { - return args.data.name + args.data.version ? '(V' + args.data.version + ')' : ''; + return args.data.name + (args.data.version ? '(V' + args.data.version + ')' : ''); }, grid: { title: $t('re.graph.vertex.configurableResourceAbstract.entity.resourceAbstractId'), diff --git a/io.sc.engine.rule.frontend/webpack.env.prod.cjs b/io.sc.engine.rule.frontend/webpack.env.prod.cjs index ab9a725c..964095ec 100644 --- a/io.sc.engine.rule.frontend/webpack.env.prod.cjs +++ b/io.sc.engine.rule.frontend/webpack.env.prod.cjs @@ -2,9 +2,9 @@ * 生产环境构建 */ const CssMinimizerPlugin = require('css-minimizer-webpack-plugin'); // css 压缩插件 -const TerserPlugin = require("terser-webpack-plugin"); // js 压缩插件 -const { merge } = require('webpack-merge'); // webpack 配置合并函数 -const build = require('./webpack.env.build.cjs'); // 开发环境构建配置 +const TerserPlugin = require('terser-webpack-plugin'); // js 压缩插件 +const { merge } = require('webpack-merge'); // webpack 配置合并函数 +const build = require('./webpack.env.build.cjs'); // 开发环境构建配置 module.exports = merge(build, { mode: 'production', @@ -15,12 +15,13 @@ module.exports = merge(build, { // eval-source-map| build:slowest, rebuild:ok | Recommended choice for development builds with high quality SourceMaps. // source-map | build:slowest, rebuild:slowest | Recommended choice for production builds with high quality SourceMaps. // ------------------------------------------------------------------------------------------------------------------------------- - devtool: 'source-map', + devtool: 'eval-source-map', optimization: { minimize: true, minimizer: [ - new CssMinimizerPlugin(), // css 压缩插件 - new TerserPlugin({ // js 压缩插件 + new CssMinimizerPlugin(), // css 压缩插件 + new TerserPlugin({ + // js 压缩插件 extractComments: false, terserOptions: { format: { diff --git a/io.sc.engine.st.frontend/package.json b/io.sc.engine.st.frontend/package.json index 23cb1d3e..db325584 100644 --- a/io.sc.engine.st.frontend/package.json +++ b/io.sc.engine.st.frontend/package.json @@ -93,7 +93,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.2.2", - "platform-core": "8.1.352", + "platform-core": "8.1.355", "quasar": "2.16.11", "tailwindcss": "3.4.10", "vue": "3.5.4", diff --git a/io.sc.engine.st.frontend/webpack.env.prod.cjs b/io.sc.engine.st.frontend/webpack.env.prod.cjs index ab9a725c..964095ec 100644 --- a/io.sc.engine.st.frontend/webpack.env.prod.cjs +++ b/io.sc.engine.st.frontend/webpack.env.prod.cjs @@ -2,9 +2,9 @@ * 生产环境构建 */ const CssMinimizerPlugin = require('css-minimizer-webpack-plugin'); // css 压缩插件 -const TerserPlugin = require("terser-webpack-plugin"); // js 压缩插件 -const { merge } = require('webpack-merge'); // webpack 配置合并函数 -const build = require('./webpack.env.build.cjs'); // 开发环境构建配置 +const TerserPlugin = require('terser-webpack-plugin'); // js 压缩插件 +const { merge } = require('webpack-merge'); // webpack 配置合并函数 +const build = require('./webpack.env.build.cjs'); // 开发环境构建配置 module.exports = merge(build, { mode: 'production', @@ -15,12 +15,13 @@ module.exports = merge(build, { // eval-source-map| build:slowest, rebuild:ok | Recommended choice for development builds with high quality SourceMaps. // source-map | build:slowest, rebuild:slowest | Recommended choice for production builds with high quality SourceMaps. // ------------------------------------------------------------------------------------------------------------------------------- - devtool: 'source-map', + devtool: 'eval-source-map', optimization: { minimize: true, minimizer: [ - new CssMinimizerPlugin(), // css 压缩插件 - new TerserPlugin({ // js 压缩插件 + new CssMinimizerPlugin(), // css 压缩插件 + new TerserPlugin({ + // js 压缩插件 extractComments: false, terserOptions: { format: { diff --git a/io.sc.platform.core.frontend/package.json b/io.sc.platform.core.frontend/package.json index ddfd0261..a8771979 100644 --- a/io.sc.platform.core.frontend/package.json +++ b/io.sc.platform.core.frontend/package.json @@ -1,6 +1,6 @@ { "name": "platform-core", - "version": "8.1.352", + "version": "8.1.355", "description": "前端核心包,用于快速构建前端的脚手架", "//main": "库的主文件", "main": "dist/platform-core.js", diff --git a/io.sc.platform.core.frontend/src/platform/components/graph/PlatformGraph.ts b/io.sc.platform.core.frontend/src/platform/components/graph/PlatformGraph.ts index e8712a51..f7c95fbb 100644 --- a/io.sc.platform.core.frontend/src/platform/components/graph/PlatformGraph.ts +++ b/io.sc.platform.core.frontend/src/platform/components/graph/PlatformGraph.ts @@ -176,7 +176,9 @@ class PlatformGraph extends Graph { * @param xml xml */ setXml(xml) { - new ModelXmlSerializer(this.getDataModel()).import(xml); + if (xml) { + new ModelXmlSerializer(this.getDataModel()).import(xml); + } } /** diff --git a/io.sc.platform.core.frontend/src/views/testcase/maxgraph/maxgraph.vue b/io.sc.platform.core.frontend/src/views/testcase/maxgraph/maxgraph.vue index 051779ef..d0534078 100644 --- a/io.sc.platform.core.frontend/src/views/testcase/maxgraph/maxgraph.vue +++ b/io.sc.platform.core.frontend/src/views/testcase/maxgraph/maxgraph.vue @@ -2,15 +2,20 @@ diff --git a/io.sc.platform.core.frontend/template-project/package.json b/io.sc.platform.core.frontend/template-project/package.json index 08c67dcb..1eeec646 100644 --- a/io.sc.platform.core.frontend/template-project/package.json +++ b/io.sc.platform.core.frontend/template-project/package.json @@ -1,6 +1,6 @@ { "name": "platform-core", - "version": "8.1.352", + "version": "8.1.355", "description": "前端核心包,用于快速构建前端的脚手架", "private": false, "keywords": [], @@ -106,7 +106,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.2.2", - "platform-core": "8.1.352", + "platform-core": "8.1.355", "quasar": "2.16.11", "svg-path-commander": "2.0.10", "vue": "3.5.4", diff --git a/io.sc.platform.core.frontend/template-project/src/views/testcase/maxgraph/Maxgraph.vue b/io.sc.platform.core.frontend/template-project/src/views/testcase/maxgraph/Maxgraph.vue index 051779ef..d0534078 100644 --- a/io.sc.platform.core.frontend/template-project/src/views/testcase/maxgraph/Maxgraph.vue +++ b/io.sc.platform.core.frontend/template-project/src/views/testcase/maxgraph/Maxgraph.vue @@ -2,15 +2,20 @@ diff --git a/io.sc.platform.core.frontend/template-project/webpack.env.prod.cjs b/io.sc.platform.core.frontend/template-project/webpack.env.prod.cjs index ab9a725c..964095ec 100644 --- a/io.sc.platform.core.frontend/template-project/webpack.env.prod.cjs +++ b/io.sc.platform.core.frontend/template-project/webpack.env.prod.cjs @@ -2,9 +2,9 @@ * 生产环境构建 */ const CssMinimizerPlugin = require('css-minimizer-webpack-plugin'); // css 压缩插件 -const TerserPlugin = require("terser-webpack-plugin"); // js 压缩插件 -const { merge } = require('webpack-merge'); // webpack 配置合并函数 -const build = require('./webpack.env.build.cjs'); // 开发环境构建配置 +const TerserPlugin = require('terser-webpack-plugin'); // js 压缩插件 +const { merge } = require('webpack-merge'); // webpack 配置合并函数 +const build = require('./webpack.env.build.cjs'); // 开发环境构建配置 module.exports = merge(build, { mode: 'production', @@ -15,12 +15,13 @@ module.exports = merge(build, { // eval-source-map| build:slowest, rebuild:ok | Recommended choice for development builds with high quality SourceMaps. // source-map | build:slowest, rebuild:slowest | Recommended choice for production builds with high quality SourceMaps. // ------------------------------------------------------------------------------------------------------------------------------- - devtool: 'source-map', + devtool: 'eval-source-map', optimization: { minimize: true, minimizer: [ - new CssMinimizerPlugin(), // css 压缩插件 - new TerserPlugin({ // js 压缩插件 + new CssMinimizerPlugin(), // css 压缩插件 + new TerserPlugin({ + // js 压缩插件 extractComments: false, terserOptions: { format: { diff --git a/io.sc.platform.core.frontend/webpack.env.prod.cjs b/io.sc.platform.core.frontend/webpack.env.prod.cjs index ab9a725c..964095ec 100644 --- a/io.sc.platform.core.frontend/webpack.env.prod.cjs +++ b/io.sc.platform.core.frontend/webpack.env.prod.cjs @@ -2,9 +2,9 @@ * 生产环境构建 */ const CssMinimizerPlugin = require('css-minimizer-webpack-plugin'); // css 压缩插件 -const TerserPlugin = require("terser-webpack-plugin"); // js 压缩插件 -const { merge } = require('webpack-merge'); // webpack 配置合并函数 -const build = require('./webpack.env.build.cjs'); // 开发环境构建配置 +const TerserPlugin = require('terser-webpack-plugin'); // js 压缩插件 +const { merge } = require('webpack-merge'); // webpack 配置合并函数 +const build = require('./webpack.env.build.cjs'); // 开发环境构建配置 module.exports = merge(build, { mode: 'production', @@ -15,12 +15,13 @@ module.exports = merge(build, { // eval-source-map| build:slowest, rebuild:ok | Recommended choice for development builds with high quality SourceMaps. // source-map | build:slowest, rebuild:slowest | Recommended choice for production builds with high quality SourceMaps. // ------------------------------------------------------------------------------------------------------------------------------- - devtool: 'source-map', + devtool: 'eval-source-map', optimization: { minimize: true, minimizer: [ - new CssMinimizerPlugin(), // css 压缩插件 - new TerserPlugin({ // js 压缩插件 + new CssMinimizerPlugin(), // css 压缩插件 + new TerserPlugin({ + // js 压缩插件 extractComments: false, terserOptions: { format: { diff --git a/io.sc.platform.developer.frontend/package.json b/io.sc.platform.developer.frontend/package.json index 9432e419..7d894636 100644 --- a/io.sc.platform.developer.frontend/package.json +++ b/io.sc.platform.developer.frontend/package.json @@ -93,7 +93,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.2.2", - "platform-core": "8.1.352", + "platform-core": "8.1.355", "quasar": "2.16.11", "svg-path-commander": "2.0.10", "tailwindcss": "3.4.10", diff --git a/io.sc.platform.developer.frontend/webpack.env.prod.cjs b/io.sc.platform.developer.frontend/webpack.env.prod.cjs index ab9a725c..964095ec 100644 --- a/io.sc.platform.developer.frontend/webpack.env.prod.cjs +++ b/io.sc.platform.developer.frontend/webpack.env.prod.cjs @@ -2,9 +2,9 @@ * 生产环境构建 */ const CssMinimizerPlugin = require('css-minimizer-webpack-plugin'); // css 压缩插件 -const TerserPlugin = require("terser-webpack-plugin"); // js 压缩插件 -const { merge } = require('webpack-merge'); // webpack 配置合并函数 -const build = require('./webpack.env.build.cjs'); // 开发环境构建配置 +const TerserPlugin = require('terser-webpack-plugin'); // js 压缩插件 +const { merge } = require('webpack-merge'); // webpack 配置合并函数 +const build = require('./webpack.env.build.cjs'); // 开发环境构建配置 module.exports = merge(build, { mode: 'production', @@ -15,12 +15,13 @@ module.exports = merge(build, { // eval-source-map| build:slowest, rebuild:ok | Recommended choice for development builds with high quality SourceMaps. // source-map | build:slowest, rebuild:slowest | Recommended choice for production builds with high quality SourceMaps. // ------------------------------------------------------------------------------------------------------------------------------- - devtool: 'source-map', + devtool: 'eval-source-map', optimization: { minimize: true, minimizer: [ - new CssMinimizerPlugin(), // css 压缩插件 - new TerserPlugin({ // js 压缩插件 + new CssMinimizerPlugin(), // css 压缩插件 + new TerserPlugin({ + // js 压缩插件 extractComments: false, terserOptions: { format: { diff --git a/io.sc.platform.lcdp.frontend/package.json b/io.sc.platform.lcdp.frontend/package.json index 93e05cdd..9dcc452f 100644 --- a/io.sc.platform.lcdp.frontend/package.json +++ b/io.sc.platform.lcdp.frontend/package.json @@ -93,7 +93,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.2.2", - "platform-core": "8.1.352", + "platform-core": "8.1.355", "quasar": "2.16.11", "tailwindcss": "3.4.10", "vue": "3.5.4", diff --git a/io.sc.platform.lcdp.frontend/webpack.env.prod.cjs b/io.sc.platform.lcdp.frontend/webpack.env.prod.cjs index ab9a725c..964095ec 100644 --- a/io.sc.platform.lcdp.frontend/webpack.env.prod.cjs +++ b/io.sc.platform.lcdp.frontend/webpack.env.prod.cjs @@ -2,9 +2,9 @@ * 生产环境构建 */ const CssMinimizerPlugin = require('css-minimizer-webpack-plugin'); // css 压缩插件 -const TerserPlugin = require("terser-webpack-plugin"); // js 压缩插件 -const { merge } = require('webpack-merge'); // webpack 配置合并函数 -const build = require('./webpack.env.build.cjs'); // 开发环境构建配置 +const TerserPlugin = require('terser-webpack-plugin'); // js 压缩插件 +const { merge } = require('webpack-merge'); // webpack 配置合并函数 +const build = require('./webpack.env.build.cjs'); // 开发环境构建配置 module.exports = merge(build, { mode: 'production', @@ -15,12 +15,13 @@ module.exports = merge(build, { // eval-source-map| build:slowest, rebuild:ok | Recommended choice for development builds with high quality SourceMaps. // source-map | build:slowest, rebuild:slowest | Recommended choice for production builds with high quality SourceMaps. // ------------------------------------------------------------------------------------------------------------------------------- - devtool: 'source-map', + devtool: 'eval-source-map', optimization: { minimize: true, minimizer: [ - new CssMinimizerPlugin(), // css 压缩插件 - new TerserPlugin({ // js 压缩插件 + new CssMinimizerPlugin(), // css 压缩插件 + new TerserPlugin({ + // js 压缩插件 extractComments: false, terserOptions: { format: { diff --git a/io.sc.platform.mvc.frontend/package.json b/io.sc.platform.mvc.frontend/package.json index 1351fd33..3693bc70 100644 --- a/io.sc.platform.mvc.frontend/package.json +++ b/io.sc.platform.mvc.frontend/package.json @@ -93,7 +93,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.2.2", - "platform-core": "8.1.352", + "platform-core": "8.1.355", "quasar": "2.16.11", "tailwindcss": "3.4.10", "vue": "3.5.4", diff --git a/io.sc.platform.mvc.frontend/webpack.env.prod.cjs b/io.sc.platform.mvc.frontend/webpack.env.prod.cjs index ab9a725c..964095ec 100644 --- a/io.sc.platform.mvc.frontend/webpack.env.prod.cjs +++ b/io.sc.platform.mvc.frontend/webpack.env.prod.cjs @@ -2,9 +2,9 @@ * 生产环境构建 */ const CssMinimizerPlugin = require('css-minimizer-webpack-plugin'); // css 压缩插件 -const TerserPlugin = require("terser-webpack-plugin"); // js 压缩插件 -const { merge } = require('webpack-merge'); // webpack 配置合并函数 -const build = require('./webpack.env.build.cjs'); // 开发环境构建配置 +const TerserPlugin = require('terser-webpack-plugin'); // js 压缩插件 +const { merge } = require('webpack-merge'); // webpack 配置合并函数 +const build = require('./webpack.env.build.cjs'); // 开发环境构建配置 module.exports = merge(build, { mode: 'production', @@ -15,12 +15,13 @@ module.exports = merge(build, { // eval-source-map| build:slowest, rebuild:ok | Recommended choice for development builds with high quality SourceMaps. // source-map | build:slowest, rebuild:slowest | Recommended choice for production builds with high quality SourceMaps. // ------------------------------------------------------------------------------------------------------------------------------- - devtool: 'source-map', + devtool: 'eval-source-map', optimization: { minimize: true, minimizer: [ - new CssMinimizerPlugin(), // css 压缩插件 - new TerserPlugin({ // js 压缩插件 + new CssMinimizerPlugin(), // css 压缩插件 + new TerserPlugin({ + // js 压缩插件 extractComments: false, terserOptions: { format: { diff --git a/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/support/criteria/Criteria.java b/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/support/criteria/Criteria.java index d50733e3..dd819c51 100644 --- a/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/support/criteria/Criteria.java +++ b/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/support/criteria/Criteria.java @@ -120,6 +120,7 @@ public abstract class Criteria { return ObjectMapper4Json.getMapper().readValue(json,new TypeReference>(){}); } catch (Exception e) { log.error("",e); + throw new RuntimeException(e); } } } diff --git a/io.sc.platform.scheduler.manager.frontend/package.json b/io.sc.platform.scheduler.manager.frontend/package.json index 0a1afe34..f4d14302 100644 --- a/io.sc.platform.scheduler.manager.frontend/package.json +++ b/io.sc.platform.scheduler.manager.frontend/package.json @@ -93,7 +93,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.2.2", - "platform-core": "8.1.352", + "platform-core": "8.1.355", "quasar": "2.16.11", "tailwindcss": "3.4.10", "vue": "3.5.4", diff --git a/io.sc.platform.scheduler.manager.frontend/webpack.env.prod.cjs b/io.sc.platform.scheduler.manager.frontend/webpack.env.prod.cjs index ab9a725c..964095ec 100644 --- a/io.sc.platform.scheduler.manager.frontend/webpack.env.prod.cjs +++ b/io.sc.platform.scheduler.manager.frontend/webpack.env.prod.cjs @@ -2,9 +2,9 @@ * 生产环境构建 */ const CssMinimizerPlugin = require('css-minimizer-webpack-plugin'); // css 压缩插件 -const TerserPlugin = require("terser-webpack-plugin"); // js 压缩插件 -const { merge } = require('webpack-merge'); // webpack 配置合并函数 -const build = require('./webpack.env.build.cjs'); // 开发环境构建配置 +const TerserPlugin = require('terser-webpack-plugin'); // js 压缩插件 +const { merge } = require('webpack-merge'); // webpack 配置合并函数 +const build = require('./webpack.env.build.cjs'); // 开发环境构建配置 module.exports = merge(build, { mode: 'production', @@ -15,12 +15,13 @@ module.exports = merge(build, { // eval-source-map| build:slowest, rebuild:ok | Recommended choice for development builds with high quality SourceMaps. // source-map | build:slowest, rebuild:slowest | Recommended choice for production builds with high quality SourceMaps. // ------------------------------------------------------------------------------------------------------------------------------- - devtool: 'source-map', + devtool: 'eval-source-map', optimization: { minimize: true, minimizer: [ - new CssMinimizerPlugin(), // css 压缩插件 - new TerserPlugin({ // js 压缩插件 + new CssMinimizerPlugin(), // css 压缩插件 + new TerserPlugin({ + // js 压缩插件 extractComments: false, terserOptions: { format: { diff --git a/io.sc.platform.system.frontend/package.json b/io.sc.platform.system.frontend/package.json index 1316e2c3..d15379bb 100644 --- a/io.sc.platform.system.frontend/package.json +++ b/io.sc.platform.system.frontend/package.json @@ -105,7 +105,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.2.2", - "platform-core": "8.1.352", + "platform-core": "8.1.355", "quasar": "2.16.11", "svg-path-commander": "2.0.10", "vue": "3.5.4", diff --git a/io.sc.platform.system.frontend/webpack.env.prod.cjs b/io.sc.platform.system.frontend/webpack.env.prod.cjs index ab9a725c..964095ec 100644 --- a/io.sc.platform.system.frontend/webpack.env.prod.cjs +++ b/io.sc.platform.system.frontend/webpack.env.prod.cjs @@ -2,9 +2,9 @@ * 生产环境构建 */ const CssMinimizerPlugin = require('css-minimizer-webpack-plugin'); // css 压缩插件 -const TerserPlugin = require("terser-webpack-plugin"); // js 压缩插件 -const { merge } = require('webpack-merge'); // webpack 配置合并函数 -const build = require('./webpack.env.build.cjs'); // 开发环境构建配置 +const TerserPlugin = require('terser-webpack-plugin'); // js 压缩插件 +const { merge } = require('webpack-merge'); // webpack 配置合并函数 +const build = require('./webpack.env.build.cjs'); // 开发环境构建配置 module.exports = merge(build, { mode: 'production', @@ -15,12 +15,13 @@ module.exports = merge(build, { // eval-source-map| build:slowest, rebuild:ok | Recommended choice for development builds with high quality SourceMaps. // source-map | build:slowest, rebuild:slowest | Recommended choice for production builds with high quality SourceMaps. // ------------------------------------------------------------------------------------------------------------------------------- - devtool: 'source-map', + devtool: 'eval-source-map', optimization: { minimize: true, minimizer: [ - new CssMinimizerPlugin(), // css 压缩插件 - new TerserPlugin({ // js 压缩插件 + new CssMinimizerPlugin(), // css 压缩插件 + new TerserPlugin({ + // js 压缩插件 extractComments: false, terserOptions: { format: { diff --git a/io.sc.standard.frontend/package.json b/io.sc.standard.frontend/package.json index d092e8d3..0296e2c9 100644 --- a/io.sc.standard.frontend/package.json +++ b/io.sc.standard.frontend/package.json @@ -93,7 +93,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.2.2", - "platform-core": "8.1.352", + "platform-core": "8.1.355", "quasar": "2.16.11", "tailwindcss": "3.4.10", "vue": "3.5.4", diff --git a/io.sc.standard.frontend/webpack.env.prod.cjs b/io.sc.standard.frontend/webpack.env.prod.cjs index ab9a725c..964095ec 100644 --- a/io.sc.standard.frontend/webpack.env.prod.cjs +++ b/io.sc.standard.frontend/webpack.env.prod.cjs @@ -2,9 +2,9 @@ * 生产环境构建 */ const CssMinimizerPlugin = require('css-minimizer-webpack-plugin'); // css 压缩插件 -const TerserPlugin = require("terser-webpack-plugin"); // js 压缩插件 -const { merge } = require('webpack-merge'); // webpack 配置合并函数 -const build = require('./webpack.env.build.cjs'); // 开发环境构建配置 +const TerserPlugin = require('terser-webpack-plugin'); // js 压缩插件 +const { merge } = require('webpack-merge'); // webpack 配置合并函数 +const build = require('./webpack.env.build.cjs'); // 开发环境构建配置 module.exports = merge(build, { mode: 'production', @@ -15,12 +15,13 @@ module.exports = merge(build, { // eval-source-map| build:slowest, rebuild:ok | Recommended choice for development builds with high quality SourceMaps. // source-map | build:slowest, rebuild:slowest | Recommended choice for production builds with high quality SourceMaps. // ------------------------------------------------------------------------------------------------------------------------------- - devtool: 'source-map', + devtool: 'eval-source-map', optimization: { minimize: true, minimizer: [ - new CssMinimizerPlugin(), // css 压缩插件 - new TerserPlugin({ // js 压缩插件 + new CssMinimizerPlugin(), // css 压缩插件 + new TerserPlugin({ + // js 压缩插件 extractComments: false, terserOptions: { format: {