diff --git a/erm.frontend/.npmrc b/erm.frontend/.npmrc index 304f4652..f0873d2e 100644 --- a/erm.frontend/.npmrc +++ b/erm.frontend/.npmrc @@ -1,5 +1,6 @@ # npm 仓库地址, 在 npm install 时使用 registry=http://nexus.sc.io:8000/repository/npm-public/ +#registry=https://registry.npm.taobao.org/ # 用户邮箱 email= @@ -10,4 +11,4 @@ git-checks=false # 登录 npm 仓库的用户认证信息, 在 npm publish 时使用, publish 的 npm registry 在 package.json 文件中 publishConfig 部分配置 # _authToken 可通过以下命令获取 # curl -X PUT -H "Content-Type:application/json" -d '{"_id":"org.couchdb.user:admin","name":"admin","password":"admin"}' http://nexus.sc.io:8000/repository/npm-releases/-/user/org.couchdb.user:admin -//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.67c99588-56a6-3ce1-9bea-a9a6164f8090 \ No newline at end of file +//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.67c99588-56a6-3ce1-9bea-a9a6164f8090 diff --git a/erm.frontend/package.json b/erm.frontend/package.json index da3949d9..482a9510 100644 --- a/erm.frontend/package.json +++ b/erm.frontend/package.json @@ -28,17 +28,17 @@ "@babel/plugin-transform-object-rest-spread": "7.25.9", "@babel/preset-env": "7.26.0", "@babel/preset-typescript": "7.26.0", - "@quasar/app-webpack": "4.0.0-rc.4", + "@quasar/app-webpack": "4.0.7", "@quasar/cli": "2.4.1", "@types/mockjs": "1.0.10", - "@types/node": "22.10.0", - "@typescript-eslint/eslint-plugin": "8.16.0", - "@typescript-eslint/parser": "8.16.0", + "@types/node": "22.10.7", + "@typescript-eslint/eslint-plugin": "8.20.0", + "@typescript-eslint/parser": "8.20.0", "@vue/babel-plugin-jsx": "1.2.5", "@vue/compiler-sfc": "3.5.13", "@vuepress/bundler-webpack": "2.0.0-rc.15", "@vuepress/theme-default": "2.0.0-rc.49", - "@webpack-cli/serve": "2.0.5", + "@webpack-cli/serve": "3.0.1", "autoprefixer": "10.4.20", "babel-loader": "9.2.1", "clean-webpack-plugin": "4.0.0", @@ -46,35 +46,35 @@ "copy-webpack-plugin": "12.0.2", "cross-env": "7.0.3", "css-loader": "7.1.2", - "eslint": "9.15.0", - "eslint-config-prettier": "9.1.0", - "eslint-plugin-prettier": "5.2.1", - "eslint-plugin-vue": "9.31.0", + "eslint": "9.18.0", + "eslint-config-prettier": "10.0.1", + "eslint-plugin-prettier": "5.2.2", + "eslint-plugin-vue": "9.32.0", "eslint-webpack-plugin": "4.2.0", "html-webpack-plugin": "5.6.3", "json5": "2.2.3", "mini-css-extract-plugin": "2.9.2", - "nodemon": "3.1.7", - "postcss": "8.4.49", + "nodemon": "3.1.9", + "postcss": "8.5.1", "postcss-import": "16.1.0", "postcss-loader": "8.1.1", - "postcss-preset-env": "10.1.1", - "prettier": "3.4.1", - "sass": "1.81.0", - "sass-loader": "16.0.3", - "tailwindcss": "3.4.15", + "postcss-preset-env": "10.1.3", + "prettier": "3.4.2", + "sass": "1.83.4", + "sass-loader": "16.0.4", + "tailwindcss": "3.4.17", "typescript": "5.5.4", "vue-loader": "17.4.2", "vuepress": "2.0.0-rc.15", - "webpack": "5.96.1", + "webpack": "5.97.1", "webpack-bundle-analyzer": "4.10.2", - "webpack-cli": "5.1.4", - "webpack-dev-server": "5.1.0", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.0", "webpack-merge": "6.0.1" }, "dependencies": { "@codemirror/autocomplete": "6.18.4", - "@codemirror/commands": "6.7.1", + "@codemirror/commands": "6.8.0", "@codemirror/lang-html": "6.4.9", "@codemirror/lang-java": "6.0.1", "@codemirror/lang-javascript": "6.2.2", @@ -83,42 +83,42 @@ "@codemirror/lang-xml": "6.1.0", "@codemirror/language": "6.10.8", "@codemirror/search": "6.5.8", - "@codemirror/state": "6.5.0", - "@codemirror/view": "6.36.1", - "@maxgraph/core": "0.13.1", - "@quasar/extras": "1.16.13", - "@univerjs/core": "0.5.0", - "@univerjs/design": "0.5.0", - "@univerjs/docs": "0.5.0", - "@univerjs/docs-ui": "0.5.0", - "@univerjs/engine-formula": "0.5.0", - "@univerjs/engine-render": "0.5.0", - "@univerjs/facade": "0.5.0", - "@univerjs/sheets": "0.5.0", - "@univerjs/sheets-formula": "0.5.0", - "@univerjs/sheets-ui": "0.5.0", - "@univerjs/thread-comment": "0.5.0", - "@univerjs/ui": "0.5.0", - "@vueuse/core": "11.3.0", - "axios": "1.7.8", + "@codemirror/state": "6.5.1", + "@codemirror/view": "6.36.2", + "@maxgraph/core": "0.14.0", + "@quasar/extras": "1.16.15", + "@univerjs/core": "0.5.4", + "@univerjs/design": "0.5.4", + "@univerjs/docs": "0.5.4", + "@univerjs/docs-ui": "0.5.4", + "@univerjs/engine-formula": "0.5.4", + "@univerjs/engine-render": "0.5.4", + "@univerjs/facade": "0.5.4", + "@univerjs/sheets": "0.5.4", + "@univerjs/sheets-formula": "0.5.4", + "@univerjs/sheets-ui": "0.5.4", + "@univerjs/thread-comment": "0.5.4", + "@univerjs/ui": "0.5.4", + "@vueuse/core": "12.4.0", + "axios": "1.7.9", "codemirror": "6.0.1", "dayjs": "1.11.13", - "echarts": "5.5.1", + "echarts": "5.6.0", "exceljs": "4.4.0", "file-saver": "2.0.5", "luckyexcel": "1.0.1", "mockjs": "1.1.0", - "node-sql-parser": "5.3.4", - "pinia": "2.2.6", + "node-sql-parser": "5.3.6", + "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.33", - "quasar": "2.17.4", + "platform-core": "8.2.34", + "quasar": "2.17.6", "sort-array": "5.0.0", - "svg-path-commander": "2.1.5", + "svg-path-commander": "2.1.7", "tailwindcss": "3.4.10", "vue": "3.5.13", "vue-dompurify-html": "5.2.0", - "vue-i18n": "10.0.4", + "vue-i18n": "11.0.1", "vue-router": "4.5.0", "xml-formatter": "3.6.3" } diff --git a/gradle.properties b/gradle.properties index 8d6ea7dc..c20f3749 100644 --- a/gradle.properties +++ b/gradle.properties @@ -38,7 +38,7 @@ application_version=1.0.0 platform_group=io.sc platform_version=8.2.8 platform_plugin_version=8.2.8 -platform_core_frontend_version=8.2.33 +platform_core_frontend_version=8.2.34 ########################################################### # dependencies version diff --git a/io.sc.engine.mv.frontend/.npmrc b/io.sc.engine.mv.frontend/.npmrc index 304f4652..f0873d2e 100644 --- a/io.sc.engine.mv.frontend/.npmrc +++ b/io.sc.engine.mv.frontend/.npmrc @@ -1,5 +1,6 @@ # npm 仓库地址, 在 npm install 时使用 registry=http://nexus.sc.io:8000/repository/npm-public/ +#registry=https://registry.npm.taobao.org/ # 用户邮箱 email= @@ -10,4 +11,4 @@ git-checks=false # 登录 npm 仓库的用户认证信息, 在 npm publish 时使用, publish 的 npm registry 在 package.json 文件中 publishConfig 部分配置 # _authToken 可通过以下命令获取 # curl -X PUT -H "Content-Type:application/json" -d '{"_id":"org.couchdb.user:admin","name":"admin","password":"admin"}' http://nexus.sc.io:8000/repository/npm-releases/-/user/org.couchdb.user:admin -//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.67c99588-56a6-3ce1-9bea-a9a6164f8090 \ No newline at end of file +//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.67c99588-56a6-3ce1-9bea-a9a6164f8090 diff --git a/io.sc.engine.mv.frontend/package.json b/io.sc.engine.mv.frontend/package.json index 59cbb6d4..086bcc3c 100644 --- a/io.sc.engine.mv.frontend/package.json +++ b/io.sc.engine.mv.frontend/package.json @@ -28,17 +28,17 @@ "@babel/plugin-transform-object-rest-spread": "7.25.9", "@babel/preset-env": "7.26.0", "@babel/preset-typescript": "7.26.0", - "@quasar/app-webpack": "4.0.0-rc.4", + "@quasar/app-webpack": "4.0.7", "@quasar/cli": "2.4.1", "@types/mockjs": "1.0.10", - "@types/node": "22.10.0", - "@typescript-eslint/eslint-plugin": "8.16.0", - "@typescript-eslint/parser": "8.16.0", + "@types/node": "22.10.7", + "@typescript-eslint/eslint-plugin": "8.20.0", + "@typescript-eslint/parser": "8.20.0", "@vue/babel-plugin-jsx": "1.2.5", "@vue/compiler-sfc": "3.5.13", "@vuepress/bundler-webpack": "2.0.0-rc.15", "@vuepress/theme-default": "2.0.0-rc.49", - "@webpack-cli/serve": "2.0.5", + "@webpack-cli/serve": "3.0.1", "autoprefixer": "10.4.20", "babel-loader": "9.2.1", "clean-webpack-plugin": "4.0.0", @@ -46,35 +46,35 @@ "copy-webpack-plugin": "12.0.2", "cross-env": "7.0.3", "css-loader": "7.1.2", - "eslint": "9.15.0", - "eslint-config-prettier": "9.1.0", - "eslint-plugin-prettier": "5.2.1", - "eslint-plugin-vue": "9.31.0", + "eslint": "9.18.0", + "eslint-config-prettier": "10.0.1", + "eslint-plugin-prettier": "5.2.2", + "eslint-plugin-vue": "9.32.0", "eslint-webpack-plugin": "4.2.0", "html-webpack-plugin": "5.6.3", "json5": "2.2.3", "mini-css-extract-plugin": "2.9.2", - "nodemon": "3.1.7", - "postcss": "8.4.49", + "nodemon": "3.1.9", + "postcss": "8.5.1", "postcss-import": "16.1.0", "postcss-loader": "8.1.1", - "postcss-preset-env": "10.1.1", - "prettier": "3.4.1", - "sass": "1.81.0", - "sass-loader": "16.0.3", - "tailwindcss": "3.4.15", + "postcss-preset-env": "10.1.3", + "prettier": "3.4.2", + "sass": "1.83.4", + "sass-loader": "16.0.4", + "tailwindcss": "3.4.17", "typescript": "5.5.4", "vue-loader": "17.4.2", "vuepress": "2.0.0-rc.15", - "webpack": "5.96.1", + "webpack": "5.97.1", "webpack-bundle-analyzer": "4.10.2", - "webpack-cli": "5.1.4", - "webpack-dev-server": "5.1.0", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.0", "webpack-merge": "6.0.1" }, "dependencies": { "@codemirror/autocomplete": "6.18.4", - "@codemirror/commands": "6.7.1", + "@codemirror/commands": "6.8.0", "@codemirror/lang-html": "6.4.9", "@codemirror/lang-java": "6.0.1", "@codemirror/lang-javascript": "6.2.2", @@ -83,42 +83,42 @@ "@codemirror/lang-xml": "6.1.0", "@codemirror/language": "6.10.8", "@codemirror/search": "6.5.8", - "@codemirror/state": "6.5.0", - "@codemirror/view": "6.36.1", - "@maxgraph/core": "0.13.1", - "@quasar/extras": "1.16.13", - "@univerjs/core": "0.5.0", - "@univerjs/design": "0.5.0", - "@univerjs/docs": "0.5.0", - "@univerjs/docs-ui": "0.5.0", - "@univerjs/engine-formula": "0.5.0", - "@univerjs/engine-render": "0.5.0", - "@univerjs/facade": "0.5.0", - "@univerjs/sheets": "0.5.0", - "@univerjs/sheets-formula": "0.5.0", - "@univerjs/sheets-ui": "0.5.0", - "@univerjs/thread-comment": "0.5.0", - "@univerjs/ui": "0.5.0", - "@vueuse/core": "11.3.0", - "axios": "1.7.8", + "@codemirror/state": "6.5.1", + "@codemirror/view": "6.36.2", + "@maxgraph/core": "0.14.0", + "@quasar/extras": "1.16.15", + "@univerjs/core": "0.5.4", + "@univerjs/design": "0.5.4", + "@univerjs/docs": "0.5.4", + "@univerjs/docs-ui": "0.5.4", + "@univerjs/engine-formula": "0.5.4", + "@univerjs/engine-render": "0.5.4", + "@univerjs/facade": "0.5.4", + "@univerjs/sheets": "0.5.4", + "@univerjs/sheets-formula": "0.5.4", + "@univerjs/sheets-ui": "0.5.4", + "@univerjs/thread-comment": "0.5.4", + "@univerjs/ui": "0.5.4", + "@vueuse/core": "12.4.0", + "axios": "1.7.9", "codemirror": "6.0.1", "dayjs": "1.11.13", - "echarts": "5.5.1", + "echarts": "5.6.0", "exceljs": "4.4.0", "file-saver": "2.0.5", "luckyexcel": "1.0.1", "mockjs": "1.1.0", - "node-sql-parser": "5.3.4", - "pinia": "2.2.6", + "node-sql-parser": "5.3.6", + "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.33", - "quasar": "2.17.4", + "platform-core": "8.2.34", + "quasar": "2.17.6", "sort-array": "5.0.0", - "svg-path-commander": "2.1.5", + "svg-path-commander": "2.1.7", "tailwindcss": "3.4.10", "vue": "3.5.13", "vue-dompurify-html": "5.2.0", - "vue-i18n": "10.0.4", + "vue-i18n": "11.0.1", "vue-router": "4.5.0", "xml-formatter": "3.6.3" } diff --git a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/IndicatorGenerator.java b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/IndicatorGenerator.java index 46736ac0..bc115c0a 100644 --- a/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/IndicatorGenerator.java +++ b/io.sc.engine.rule.core/src/main/java/io/sc/engine/rule/core/code/generator/impl/IndicatorGenerator.java @@ -213,7 +213,7 @@ public class IndicatorGenerator { if(IndicatorType.INDICATOR.equals(indicator.getType())){ if(ValueTypeUtil.isDecimal(indicator.getValueType())){ - String tpl ="result.addParameterResult(new ParameterResult('${code}','${name}',ParameterType.${type},'${valueType}',${valueScale},RoundingMode.${valueRoundingMode},this.${fieldName}==null?null:this.${fieldName}.setScale(${valueScale},RoundingMode.${valueRoundingMode})));"; + String tpl ="result.addParameterResult(new ParameterResult('${code}','${name}',ParameterType.${type},'${valueType}',${valueScale},RoundingMode.${valueRoundingMode},this.${fieldName}==null?null:this.${fieldName}.setScale(${valueScale},RoundingMode.${valueRoundingMode}).toString()));"; sb.append(StringUtil.format(tpl,variables)).append("\n"); }else if(ValueTypeUtil.isBase(indicator.getValueType())){ String tpl ="result.addParameterResult(new ParameterResult('${code}','${name}',ParameterType.${type},'${valueType}',null,null,this.${fieldName}==null?null:this.${fieldName}.toString()));"; diff --git a/io.sc.engine.rule.frontend/.npmrc b/io.sc.engine.rule.frontend/.npmrc index 304f4652..f0873d2e 100644 --- a/io.sc.engine.rule.frontend/.npmrc +++ b/io.sc.engine.rule.frontend/.npmrc @@ -1,5 +1,6 @@ # npm 仓库地址, 在 npm install 时使用 registry=http://nexus.sc.io:8000/repository/npm-public/ +#registry=https://registry.npm.taobao.org/ # 用户邮箱 email= @@ -10,4 +11,4 @@ git-checks=false # 登录 npm 仓库的用户认证信息, 在 npm publish 时使用, publish 的 npm registry 在 package.json 文件中 publishConfig 部分配置 # _authToken 可通过以下命令获取 # curl -X PUT -H "Content-Type:application/json" -d '{"_id":"org.couchdb.user:admin","name":"admin","password":"admin"}' http://nexus.sc.io:8000/repository/npm-releases/-/user/org.couchdb.user:admin -//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.67c99588-56a6-3ce1-9bea-a9a6164f8090 \ No newline at end of file +//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.67c99588-56a6-3ce1-9bea-a9a6164f8090 diff --git a/io.sc.engine.rule.frontend/package.json b/io.sc.engine.rule.frontend/package.json index 312efa57..c16b0bad 100644 --- a/io.sc.engine.rule.frontend/package.json +++ b/io.sc.engine.rule.frontend/package.json @@ -28,17 +28,17 @@ "@babel/plugin-transform-object-rest-spread": "7.25.9", "@babel/preset-env": "7.26.0", "@babel/preset-typescript": "7.26.0", - "@quasar/app-webpack": "4.0.0-rc.4", + "@quasar/app-webpack": "4.0.7", "@quasar/cli": "2.4.1", "@types/mockjs": "1.0.10", - "@types/node": "22.10.0", - "@typescript-eslint/eslint-plugin": "8.16.0", - "@typescript-eslint/parser": "8.16.0", + "@types/node": "22.10.7", + "@typescript-eslint/eslint-plugin": "8.20.0", + "@typescript-eslint/parser": "8.20.0", "@vue/babel-plugin-jsx": "1.2.5", "@vue/compiler-sfc": "3.5.13", "@vuepress/bundler-webpack": "2.0.0-rc.15", "@vuepress/theme-default": "2.0.0-rc.49", - "@webpack-cli/serve": "2.0.5", + "@webpack-cli/serve": "3.0.1", "autoprefixer": "10.4.20", "babel-loader": "9.2.1", "clean-webpack-plugin": "4.0.0", @@ -46,35 +46,35 @@ "copy-webpack-plugin": "12.0.2", "cross-env": "7.0.3", "css-loader": "7.1.2", - "eslint": "9.15.0", - "eslint-config-prettier": "9.1.0", - "eslint-plugin-prettier": "5.2.1", - "eslint-plugin-vue": "9.31.0", + "eslint": "9.18.0", + "eslint-config-prettier": "10.0.1", + "eslint-plugin-prettier": "5.2.2", + "eslint-plugin-vue": "9.32.0", "eslint-webpack-plugin": "4.2.0", "html-webpack-plugin": "5.6.3", "json5": "2.2.3", "mini-css-extract-plugin": "2.9.2", - "nodemon": "3.1.7", - "postcss": "8.4.49", + "nodemon": "3.1.9", + "postcss": "8.5.1", "postcss-import": "16.1.0", "postcss-loader": "8.1.1", - "postcss-preset-env": "10.1.1", - "prettier": "3.4.1", - "sass": "1.81.0", - "sass-loader": "16.0.3", - "tailwindcss": "3.4.15", + "postcss-preset-env": "10.1.3", + "prettier": "3.4.2", + "sass": "1.83.4", + "sass-loader": "16.0.4", + "tailwindcss": "3.4.17", "typescript": "5.5.4", "vue-loader": "17.4.2", "vuepress": "2.0.0-rc.15", - "webpack": "5.96.1", + "webpack": "5.97.1", "webpack-bundle-analyzer": "4.10.2", - "webpack-cli": "5.1.4", - "webpack-dev-server": "5.1.0", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.0", "webpack-merge": "6.0.1" }, "dependencies": { "@codemirror/autocomplete": "6.18.4", - "@codemirror/commands": "6.7.1", + "@codemirror/commands": "6.8.0", "@codemirror/lang-html": "6.4.9", "@codemirror/lang-java": "6.0.1", "@codemirror/lang-javascript": "6.2.2", @@ -83,42 +83,42 @@ "@codemirror/lang-xml": "6.1.0", "@codemirror/language": "6.10.8", "@codemirror/search": "6.5.8", - "@codemirror/state": "6.5.0", - "@codemirror/view": "6.36.1", - "@maxgraph/core": "0.13.1", - "@quasar/extras": "1.16.13", - "@univerjs/core": "0.5.0", - "@univerjs/design": "0.5.0", - "@univerjs/docs": "0.5.0", - "@univerjs/docs-ui": "0.5.0", - "@univerjs/engine-formula": "0.5.0", - "@univerjs/engine-render": "0.5.0", - "@univerjs/facade": "0.5.0", - "@univerjs/sheets": "0.5.0", - "@univerjs/sheets-formula": "0.5.0", - "@univerjs/sheets-ui": "0.5.0", - "@univerjs/thread-comment": "0.5.0", - "@univerjs/ui": "0.5.0", - "@vueuse/core": "11.3.0", - "axios": "1.7.8", + "@codemirror/state": "6.5.1", + "@codemirror/view": "6.36.2", + "@maxgraph/core": "0.14.0", + "@quasar/extras": "1.16.15", + "@univerjs/core": "0.5.4", + "@univerjs/design": "0.5.4", + "@univerjs/docs": "0.5.4", + "@univerjs/docs-ui": "0.5.4", + "@univerjs/engine-formula": "0.5.4", + "@univerjs/engine-render": "0.5.4", + "@univerjs/facade": "0.5.4", + "@univerjs/sheets": "0.5.4", + "@univerjs/sheets-formula": "0.5.4", + "@univerjs/sheets-ui": "0.5.4", + "@univerjs/thread-comment": "0.5.4", + "@univerjs/ui": "0.5.4", + "@vueuse/core": "12.4.0", + "axios": "1.7.9", "codemirror": "6.0.1", "dayjs": "1.11.13", - "echarts": "5.5.1", + "echarts": "5.6.0", "exceljs": "4.4.0", "file-saver": "2.0.5", "luckyexcel": "1.0.1", "mockjs": "1.1.0", - "node-sql-parser": "5.3.4", - "pinia": "2.2.6", + "node-sql-parser": "5.3.6", + "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.33", - "quasar": "2.17.4", + "platform-core": "8.2.34", + "quasar": "2.17.6", "sort-array": "5.0.0", - "svg-path-commander": "2.1.5", + "svg-path-commander": "2.1.7", "tailwindcss": "3.4.10", "vue": "3.5.13", "vue-dompurify-html": "5.2.0", - "vue-i18n": "10.0.4", + "vue-i18n": "11.0.1", "vue-router": "4.5.0", "xml-formatter": "3.6.3" } diff --git a/io.sc.engine.rule.frontend/src/views/shared/AutoCompletionManager.ts b/io.sc.engine.rule.frontend/src/views/shared/AutoCompletionManager.ts index df59ad56..599332bc 100644 --- a/io.sc.engine.rule.frontend/src/views/shared/AutoCompletionManager.ts +++ b/io.sc.engine.rule.frontend/src/views/shared/AutoCompletionManager.ts @@ -204,7 +204,7 @@ class AutoCompletionManager { }; } - public autoCompletionProperties(to: any, matchedText?: any): any { + public autoCompletionProperties(to: any, matchedText?: any, subText?: string): any { const matchedTextReverse = Tools.reverseString(matchedText); const regReverse = /(\.(\](.+?)\[)?\}(.+?)\{[$#])+/g; //匹配 '.]n[}xxx{$#' 模式 // -- -- --- -- -- --- ---- @@ -222,9 +222,19 @@ class AutoCompletionManager { if (Tools.isUndefinedOrNull(options)) { return null; } + let filteredOptions: any[] = []; + if (!Tools.isUndefinedOrNull(subText)) { + options.forEach((item: any) => { + if (item.label.indexOf(subText) > -1) { + filteredOptions.push(item); + } + }); + } else { + filteredOptions = options; + } return { from: to, - options: options, + options: filteredOptions, validFor: /^(.*)?$/, }; } @@ -235,14 +245,20 @@ class AutoCompletionManager { return null; } const beforeText = beforeMatched.text || ''; - if (beforeText.endsWith('.')) { - //匹配属性 - return this.autoCompletionProperties(beforeMatched.to, beforeText); - } else if (beforeText.endsWith(' ')) { - //匹配参数 + if (beforeText.endsWith(' ')) { + //匹配所有参数 return this.autoCompletionParameters(beforeMatched.to); + } else if (beforeText.endsWith('.')) { + //匹配所有属性 + return this.autoCompletionProperties(beforeMatched.to, beforeText); } else { - return null; + //匹配部分属性 + const lastIndexOf = beforeText.lastIndexOf('.'); + const matchedText = beforeText.substring(0, lastIndexOf + 1); + const subText = beforeText.substring(lastIndexOf + 1); + if (lastIndexOf > -1) { + return this.autoCompletionProperties(beforeMatched.to - subText.length, matchedText, subText); + } } } diff --git a/io.sc.engine.rule.frontend/src/views/shared/TestCaseGrid.vue b/io.sc.engine.rule.frontend/src/views/shared/TestCaseGrid.vue index 89a5f262..86841778 100644 --- a/io.sc.engine.rule.frontend/src/views/shared/TestCaseGrid.vue +++ b/io.sc.engine.rule.frontend/src/views/shared/TestCaseGrid.vue @@ -189,7 +189,8 @@ const actionMap = { label: $t('re.testcase.grid.tools.download'), icon: 'bi-box-arrow-in-down', click: (args: any) => { - Downloader.post(Environment.apiContextPath('/api/re/testCase/downloadTemplate/' + props.owner.resource), {}, { loading: true }); + console.log(props.owner); + Downloader.post(Environment.apiContextPath('/api/re/testCase/downloadTemplate/' + props.owner.id), {}, { loading: true }); }, }, upload: { diff --git a/io.sc.engine.st.frontend/.npmrc b/io.sc.engine.st.frontend/.npmrc index 304f4652..f0873d2e 100644 --- a/io.sc.engine.st.frontend/.npmrc +++ b/io.sc.engine.st.frontend/.npmrc @@ -1,5 +1,6 @@ # npm 仓库地址, 在 npm install 时使用 registry=http://nexus.sc.io:8000/repository/npm-public/ +#registry=https://registry.npm.taobao.org/ # 用户邮箱 email= @@ -10,4 +11,4 @@ git-checks=false # 登录 npm 仓库的用户认证信息, 在 npm publish 时使用, publish 的 npm registry 在 package.json 文件中 publishConfig 部分配置 # _authToken 可通过以下命令获取 # curl -X PUT -H "Content-Type:application/json" -d '{"_id":"org.couchdb.user:admin","name":"admin","password":"admin"}' http://nexus.sc.io:8000/repository/npm-releases/-/user/org.couchdb.user:admin -//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.67c99588-56a6-3ce1-9bea-a9a6164f8090 \ No newline at end of file +//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.67c99588-56a6-3ce1-9bea-a9a6164f8090 diff --git a/io.sc.engine.st.frontend/package.json b/io.sc.engine.st.frontend/package.json index 9abcf8a6..54fed38d 100644 --- a/io.sc.engine.st.frontend/package.json +++ b/io.sc.engine.st.frontend/package.json @@ -28,17 +28,17 @@ "@babel/plugin-transform-object-rest-spread": "7.25.9", "@babel/preset-env": "7.26.0", "@babel/preset-typescript": "7.26.0", - "@quasar/app-webpack": "4.0.0-rc.4", + "@quasar/app-webpack": "4.0.7", "@quasar/cli": "2.4.1", "@types/mockjs": "1.0.10", - "@types/node": "22.10.0", - "@typescript-eslint/eslint-plugin": "8.16.0", - "@typescript-eslint/parser": "8.16.0", + "@types/node": "22.10.7", + "@typescript-eslint/eslint-plugin": "8.20.0", + "@typescript-eslint/parser": "8.20.0", "@vue/babel-plugin-jsx": "1.2.5", "@vue/compiler-sfc": "3.5.13", "@vuepress/bundler-webpack": "2.0.0-rc.15", "@vuepress/theme-default": "2.0.0-rc.49", - "@webpack-cli/serve": "2.0.5", + "@webpack-cli/serve": "3.0.1", "autoprefixer": "10.4.20", "babel-loader": "9.2.1", "clean-webpack-plugin": "4.0.0", @@ -46,35 +46,35 @@ "copy-webpack-plugin": "12.0.2", "cross-env": "7.0.3", "css-loader": "7.1.2", - "eslint": "9.15.0", - "eslint-config-prettier": "9.1.0", - "eslint-plugin-prettier": "5.2.1", - "eslint-plugin-vue": "9.31.0", + "eslint": "9.18.0", + "eslint-config-prettier": "10.0.1", + "eslint-plugin-prettier": "5.2.2", + "eslint-plugin-vue": "9.32.0", "eslint-webpack-plugin": "4.2.0", "html-webpack-plugin": "5.6.3", "json5": "2.2.3", "mini-css-extract-plugin": "2.9.2", - "nodemon": "3.1.7", - "postcss": "8.4.49", + "nodemon": "3.1.9", + "postcss": "8.5.1", "postcss-import": "16.1.0", "postcss-loader": "8.1.1", - "postcss-preset-env": "10.1.1", - "prettier": "3.4.1", - "sass": "1.81.0", - "sass-loader": "16.0.3", - "tailwindcss": "3.4.15", + "postcss-preset-env": "10.1.3", + "prettier": "3.4.2", + "sass": "1.83.4", + "sass-loader": "16.0.4", + "tailwindcss": "3.4.17", "typescript": "5.5.4", "vue-loader": "17.4.2", "vuepress": "2.0.0-rc.15", - "webpack": "5.96.1", + "webpack": "5.97.1", "webpack-bundle-analyzer": "4.10.2", - "webpack-cli": "5.1.4", - "webpack-dev-server": "5.1.0", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.0", "webpack-merge": "6.0.1" }, "dependencies": { "@codemirror/autocomplete": "6.18.4", - "@codemirror/commands": "6.7.1", + "@codemirror/commands": "6.8.0", "@codemirror/lang-html": "6.4.9", "@codemirror/lang-java": "6.0.1", "@codemirror/lang-javascript": "6.2.2", @@ -83,42 +83,42 @@ "@codemirror/lang-xml": "6.1.0", "@codemirror/language": "6.10.8", "@codemirror/search": "6.5.8", - "@codemirror/state": "6.5.0", - "@codemirror/view": "6.36.1", - "@maxgraph/core": "0.13.1", - "@quasar/extras": "1.16.13", - "@univerjs/core": "0.5.0", - "@univerjs/design": "0.5.0", - "@univerjs/docs": "0.5.0", - "@univerjs/docs-ui": "0.5.0", - "@univerjs/engine-formula": "0.5.0", - "@univerjs/engine-render": "0.5.0", - "@univerjs/facade": "0.5.0", - "@univerjs/sheets": "0.5.0", - "@univerjs/sheets-formula": "0.5.0", - "@univerjs/sheets-ui": "0.5.0", - "@univerjs/thread-comment": "0.5.0", - "@univerjs/ui": "0.5.0", - "@vueuse/core": "11.3.0", - "axios": "1.7.8", + "@codemirror/state": "6.5.1", + "@codemirror/view": "6.36.2", + "@maxgraph/core": "0.14.0", + "@quasar/extras": "1.16.15", + "@univerjs/core": "0.5.4", + "@univerjs/design": "0.5.4", + "@univerjs/docs": "0.5.4", + "@univerjs/docs-ui": "0.5.4", + "@univerjs/engine-formula": "0.5.4", + "@univerjs/engine-render": "0.5.4", + "@univerjs/facade": "0.5.4", + "@univerjs/sheets": "0.5.4", + "@univerjs/sheets-formula": "0.5.4", + "@univerjs/sheets-ui": "0.5.4", + "@univerjs/thread-comment": "0.5.4", + "@univerjs/ui": "0.5.4", + "@vueuse/core": "12.4.0", + "axios": "1.7.9", "codemirror": "6.0.1", "dayjs": "1.11.13", - "echarts": "5.5.1", + "echarts": "5.6.0", "exceljs": "4.4.0", "file-saver": "2.0.5", "luckyexcel": "1.0.1", "mockjs": "1.1.0", - "node-sql-parser": "5.3.4", - "pinia": "2.2.6", + "node-sql-parser": "5.3.6", + "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.33", - "quasar": "2.17.4", + "platform-core": "8.2.34", + "quasar": "2.17.6", "sort-array": "5.0.0", - "svg-path-commander": "2.1.5", + "svg-path-commander": "2.1.7", "tailwindcss": "3.4.10", "vue": "3.5.13", "vue-dompurify-html": "5.2.0", - "vue-i18n": "10.0.4", + "vue-i18n": "11.0.1", "vue-router": "4.5.0", "xml-formatter": "3.6.3" } diff --git a/io.sc.platform.core.frontend/.npmrc b/io.sc.platform.core.frontend/.npmrc index 304f4652..ac3953c7 100644 --- a/io.sc.platform.core.frontend/.npmrc +++ b/io.sc.platform.core.frontend/.npmrc @@ -10,4 +10,4 @@ git-checks=false # 登录 npm 仓库的用户认证信息, 在 npm publish 时使用, publish 的 npm registry 在 package.json 文件中 publishConfig 部分配置 # _authToken 可通过以下命令获取 # curl -X PUT -H "Content-Type:application/json" -d '{"_id":"org.couchdb.user:admin","name":"admin","password":"admin"}' http://nexus.sc.io:8000/repository/npm-releases/-/user/org.couchdb.user:admin -//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.67c99588-56a6-3ce1-9bea-a9a6164f8090 \ No newline at end of file +//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.67c99588-56a6-3ce1-9bea-a9a6164f8090 diff --git a/io.sc.platform.core.frontend/package.json b/io.sc.platform.core.frontend/package.json index 54165c51..af295dee 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.2.33", + "version": "8.2.34", "description": "前端核心包,用于快速构建前端的脚手架", "//main": "库的主文件", "main": "dist/platform-core.js", @@ -57,52 +57,52 @@ "@babel/plugin-transform-object-rest-spread": "7.25.9", "@babel/preset-env": "7.26.0", "@babel/preset-typescript": "7.26.0", - "@quasar/app-webpack": "4.0.0-rc.4", + "@quasar/app-webpack": "4.0.7", "@quasar/cli": "2.4.1", "@types/mockjs": "1.0.10", - "@types/node": "22.10.0", - "@typescript-eslint/eslint-plugin": "8.16.0", - "@typescript-eslint/parser": "8.16.0", + "@types/node": "22.10.7", + "@typescript-eslint/eslint-plugin": "8.20.0", + "@typescript-eslint/parser": "8.20.0", "@vue/babel-plugin-jsx": "1.2.5", "@vue/compiler-sfc": "3.5.13", "@vuepress/bundler-webpack": "2.0.0-rc.15", "@vuepress/theme-default": "2.0.0-rc.49", - "@webpack-cli/serve": "2.0.5", + "@webpack-cli/serve": "3.0.1", "autoprefixer": "10.4.20", "babel-loader": "9.2.1", "clean-webpack-plugin": "4.0.0", "copy-webpack-plugin": "12.0.2", "cross-env": "7.0.3", "css-loader": "7.1.2", - "eslint": "9.15.0", - "eslint-config-prettier": "9.1.0", - "eslint-plugin-prettier": "5.2.1", - "eslint-plugin-vue": "9.31.0", + "eslint": "9.18.0", + "eslint-config-prettier": "10.0.1", + "eslint-plugin-prettier": "5.2.2", + "eslint-plugin-vue": "9.32.0", "eslint-webpack-plugin": "4.2.0", "html-webpack-plugin": "5.6.3", "json5": "2.2.3", "mini-css-extract-plugin": "2.9.2", - "nodemon": "3.1.7", - "postcss": "8.4.49", + "nodemon": "3.1.9", + "postcss": "8.5.1", "postcss-import": "16.1.0", "postcss-loader": "8.1.1", - "postcss-preset-env": "10.1.1", - "prettier": "3.4.1", - "sass": "1.81.0", - "sass-loader": "16.0.3", - "tailwindcss": "3.4.15", + "postcss-preset-env": "10.1.3", + "prettier": "3.4.2", + "sass": "1.83.4", + "sass-loader": "16.0.4", + "tailwindcss": "3.4.17", "typescript": "5.5.4", "vue-loader": "17.4.2", "vuepress": "2.0.0-rc.15", - "webpack": "5.96.1", + "webpack": "5.97.1", "webpack-bundle-analyzer": "4.10.2", - "webpack-cli": "5.1.4", - "webpack-dev-server": "5.1.0", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.0", "webpack-merge": "6.0.1" }, "dependencies": { "@codemirror/autocomplete": "6.18.4", - "@codemirror/commands": "6.7.1", + "@codemirror/commands": "6.8.0", "@codemirror/lang-html": "6.4.9", "@codemirror/lang-java": "6.0.1", "@codemirror/lang-javascript": "6.2.2", @@ -111,40 +111,40 @@ "@codemirror/lang-xml": "6.1.0", "@codemirror/language": "6.10.8", "@codemirror/search": "6.5.8", - "@codemirror/state": "6.5.0", - "@codemirror/view": "6.36.1", - "@maxgraph/core": "0.13.1", - "@quasar/extras": "1.16.13", - "@univerjs/core": "0.5.0", - "@univerjs/design": "0.5.0", - "@univerjs/docs": "0.5.0", - "@univerjs/docs-ui": "0.5.0", - "@univerjs/engine-formula": "0.5.0", - "@univerjs/engine-render": "0.5.0", - "@univerjs/facade": "0.5.0", - "@univerjs/sheets": "0.5.0", - "@univerjs/sheets-formula": "0.5.0", - "@univerjs/sheets-ui": "0.5.0", - "@univerjs/thread-comment": "0.5.0", - "@univerjs/ui": "0.5.0", - "@vueuse/core": "11.3.0", - "axios": "1.7.8", + "@codemirror/state": "6.5.1", + "@codemirror/view": "6.36.2", + "@maxgraph/core": "0.14.0", + "@quasar/extras": "1.16.15", + "@univerjs/core": "0.5.4", + "@univerjs/design": "0.5.4", + "@univerjs/docs": "0.5.4", + "@univerjs/docs-ui": "0.5.4", + "@univerjs/engine-formula": "0.5.4", + "@univerjs/engine-render": "0.5.4", + "@univerjs/facade": "0.5.4", + "@univerjs/sheets": "0.5.4", + "@univerjs/sheets-formula": "0.5.4", + "@univerjs/sheets-ui": "0.5.4", + "@univerjs/thread-comment": "0.5.4", + "@univerjs/ui": "0.5.4", + "@vueuse/core": "12.4.0", + "axios": "1.7.9", "codemirror": "6.0.1", "dayjs": "1.11.13", - "echarts": "5.5.1", + "echarts": "5.6.0", "exceljs": "4.4.0", "file-saver": "2.0.5", "luckyexcel": "1.0.1", "mockjs": "1.1.0", - "pinia": "2.2.6", - "quasar": "2.17.4", + "pinia": "2.3.0", + "quasar": "2.17.6", "sort-array": "5.0.0", - "svg-path-commander": "2.1.5", + "svg-path-commander": "2.1.7", "vue": "3.5.13", "vue-dompurify-html": "5.2.0", - "vue-i18n": "10.0.4", + "vue-i18n": "11.0.1", "vue-router": "4.5.0", "xml-formatter": "3.6.3", - "node-sql-parser": "5.3.4" + "node-sql-parser": "5.3.6" } } diff --git a/io.sc.platform.core.frontend/src/views/testcase/code-mirror/AutoCompletionManager.ts b/io.sc.platform.core.frontend/src/views/testcase/code-mirror/AutoCompletionManager.ts index c2950e69..4da8fb5f 100644 --- a/io.sc.platform.core.frontend/src/views/testcase/code-mirror/AutoCompletionManager.ts +++ b/io.sc.platform.core.frontend/src/views/testcase/code-mirror/AutoCompletionManager.ts @@ -1,5 +1,67 @@ import { axios, Tools } from '@/platform'; +class ParameterMapping { + /** + * 显示顺序映射 + */ + static #Boost = { + //指标类型 + INTERFACE: 100, //接口 + INDICATOR: 100 - 1, //指标 + + // 参数类型 + CONSTANT: 100, //常量 + IN: 100 - 1, //输入 + IN_OPTION: 100 - 1, //输入(选项) + IN_SUB_OUT: 100 - 1, //输入(子模型输出) + INTERMEDIATE: 100 - 2, //中间值 + OUT: 100 - 2, //输出 + + // 元数据类型 + ENUM: 0, //枚举 + UD_JAVA_CLASS: 200 - 1, //自定义Java类 + }; + + /** + * 获取变量替换符前缀 + * @param type 类型 + * @returns 变量替换符前缀 + */ + public static getPlaceholderPrefix(type: string) { + if (type === 'ENUM') { + return '#'; + } else { + return '$'; + } + } + + /** + * 获取自动完成项的优先级, 数值越大越优先 + * @param type 类型 + * @returns 自动完成项的优先级 + */ + public static getBoost(type: string) { + return ParameterMapping.#Boost[type]; + } + + /** + * 获取自动完成项的类型 + * @param type 类型 + * @returns 自动完成项的类型 + */ + public static getAutoCompletionType(type: string) { + if (type === 'ENUM') { + return 'enum'; + } else if (type === 'CONSTANT') { + return 'constant'; + } else if (type === 'INDICATOR' || type === 'INTERMEDIATE' || type === 'OUT') { + return 'variable'; + } else { + return 'interface'; + } + } +} + class AutoCompletionManager { parameters: any; valueTypes: any; @@ -101,13 +163,20 @@ class AutoCompletionManager { } public getParameterOptions(): any { + const cache = {}; const options: any[] = []; Object.values(this.parameters).forEach((parameter: any) => { const option = this.getOptionItem(parameter); if (option) { - options.push(option); + if (!cache[option.label]) { + cache[option.label] = option; + options.push(option); + } } }); + for (const option of options) { + option.boost = ParameterMapping.getBoost(option.category); + } return options; } @@ -116,15 +185,13 @@ class AutoCompletionManager { if (!Tools.isNill(valueType)) { const version = valueType.version ? valueType.name + '(V' + valueType.version + ')' : valueType.name; const info = parameter.valueTypeIsList ? 'List<' + version + '>' : version; - if (parameter.type === 'parameter') { - if (parameter.valueTypeIsList) { - return { label: parameter.name, type: 'variable', apply: '${' + parameter.name + '}[0]', info: info }; - } else { - return { label: parameter.name, type: 'variable', apply: '${' + parameter.name + '}', info: info }; - } - } else if (parameter.type === 'enum') { - return { label: parameter.name, type: 'enum', apply: '#{' + parameter.name + '}', info: info }; - } + return { + category: parameter.type, + type: ParameterMapping.getAutoCompletionType(parameter.type), + label: parameter.name, + apply: ParameterMapping.getPlaceholderPrefix(parameter.type) + '{' + parameter.name + '}' + (parameter.valueTypeIsList ? '[0]' : ''), + info: info, + }; } return null; } @@ -137,7 +204,8 @@ class AutoCompletionManager { }; } - public autoCompletionProperties(to: any, matchedText?: any): any { + public autoCompletionProperties(to: any, matchedText?: any, subText?: string): any { + console.log(matchedText, subText); const matchedTextReverse = Tools.reverseString(matchedText); const regReverse = /(\.(\](.+?)\[)?\}(.+?)\{[$#])+/g; //匹配 '.]n[}xxx{$#' 模式 // -- -- --- -- -- --- ---- @@ -151,72 +219,56 @@ class AutoCompletionManager { if (Tools.isUndefinedOrNull(parameterName)) { return null; } - - /* - const enumRegReverse = /(\.(\](.+?)\[)?\}(.+?)\{#)+/g; //匹配 '.]n[}xxx{#' 模式 - // -- -- --- -- -- --- ---- - // . ] n [ } xxx {# - let matcheds: any = matchedTextReverse.match(enumRegReverse); - if (Tools.isUndefinedOrNull(matcheds) || matcheds.length <= 0) { - const regReverse = /(\.(\](.+?)\[)?\}(.+?)\{\$)+/g; //匹配 '.]n[}xxx{$' 模式 - // -- -- --- -- -- --- ---- - // . ] n [ } xxx {$ - matcheds = matchedTextReverse.match(regReverse); - if (Tools.isUndefinedOrNull(matcheds) || matcheds.length <= 0) { - return null; - } - } - const matched = Tools.reverseString(matcheds[0]); - let parameterName = matched.replace(/#\{(.+?)\}(\[(.+?)\])?/g, '$1'); - // ---- --- -- -- --- -- - // $ { xxx } [ n ] - if (Tools.isUndefinedOrNull(parameterName)) { - parameterName = matched.replace(/\$\{(.+?)\}(\[(.+?)\])?/g, '$1'); - if (Tools.isUndefinedOrNull(parameterName)) { - return null; - } - } - */ const options = this.getOptions(parameterName); if (Tools.isUndefinedOrNull(options)) { return null; } + let filteredOptions: any[] = []; + if (!Tools.isUndefinedOrNull(subText)) { + options.forEach((item: any) => { + if (item.label.indexOf(subText) > -1) { + filteredOptions.push(item); + } + }); + } else { + filteredOptions = options; + } return { from: to, - options: options, + options: filteredOptions, validFor: /^(.*)?$/, }; } public doAutoCompletion(context: any): any { - console.log('>>>>'); const beforeMatched = context.matchBefore(/(.+?)/g); - console.log(beforeMatched); - if (Tools.isUndefinedOrNull(beforeMatched)) { return null; } const beforeText = beforeMatched.text || ''; - if (beforeText.endsWith('.')) { - //匹配属性 - return this.autoCompletionProperties(beforeMatched.to, beforeText); - } else if (beforeText.endsWith(' ')) { + if (beforeText.endsWith(' ')) { //匹配参数 return this.autoCompletionParameters(beforeMatched.to); + } else if (beforeText.endsWith('.')) { + //匹配所有属性 + return this.autoCompletionProperties(beforeMatched.to, beforeText); } else { - return null; + //匹配部分属性 + const lastIndexOf = beforeText.lastIndexOf('.'); + if (lastIndexOf > -1) { + return this.autoCompletionProperties(beforeMatched.to, beforeText.substring(0, lastIndexOf + 1), beforeText.substring(lastIndexOf + 1)); + } } } public load(url: string) { - axios.get(url).then((response) => { + axios.get(url).then((response: any) => { this.setParameters(response.data?.parameters); this.setValueTypes(response.data?.valueTypes); }); } public autoCompletion(): any { - console.log('????'); return (context: any) => { return this.doAutoCompletion(context); }; diff --git a/io.sc.platform.core.frontend/src/views/testcase/code-mirror/code-mirror.vue b/io.sc.platform.core.frontend/src/views/testcase/code-mirror/code-mirror.vue index 33bc801a..077d5c9a 100644 --- a/io.sc.platform.core.frontend/src/views/testcase/code-mirror/code-mirror.vue +++ b/io.sc.platform.core.frontend/src/views/testcase/code-mirror/code-mirror.vue @@ -30,7 +30,7 @@ const click = () => { const autoCompletionManager = new AutoCompletionManager(); const userDefinedFunctionsManager = new UserDefinedFunctionsManager(); -autoCompletionManager.load(Environment.apiContextPath('/api/re/common/parameterAndValueType/findByParameterId/34e7391f-ba76-4e14-b152-ae0da917fd20')); +autoCompletionManager.load(Environment.apiContextPath('/api/re/common/parameterAndValueType/findByParameterId/069d4b6d-1972-4953-aa47-2ae3a4d41f4a')); userDefinedFunctionsManager.load(); console.log(Tools.escapeHtml('&')); diff --git a/io.sc.platform.core.frontend/template-project/.npmrc b/io.sc.platform.core.frontend/template-project/.npmrc index 304f4652..f0873d2e 100644 --- a/io.sc.platform.core.frontend/template-project/.npmrc +++ b/io.sc.platform.core.frontend/template-project/.npmrc @@ -1,5 +1,6 @@ # npm 仓库地址, 在 npm install 时使用 registry=http://nexus.sc.io:8000/repository/npm-public/ +#registry=https://registry.npm.taobao.org/ # 用户邮箱 email= @@ -10,4 +11,4 @@ git-checks=false # 登录 npm 仓库的用户认证信息, 在 npm publish 时使用, publish 的 npm registry 在 package.json 文件中 publishConfig 部分配置 # _authToken 可通过以下命令获取 # curl -X PUT -H "Content-Type:application/json" -d '{"_id":"org.couchdb.user:admin","name":"admin","password":"admin"}' http://nexus.sc.io:8000/repository/npm-releases/-/user/org.couchdb.user:admin -//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.67c99588-56a6-3ce1-9bea-a9a6164f8090 \ No newline at end of file +//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.67c99588-56a6-3ce1-9bea-a9a6164f8090 diff --git a/io.sc.platform.core.frontend/template-project/package.json b/io.sc.platform.core.frontend/template-project/package.json index 616af3a8..19caa731 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.2.33", + "version": "8.2.34", "description": "前端核心包,用于快速构建前端的脚手架", "private": false, "keywords": [], @@ -29,52 +29,52 @@ "@babel/plugin-transform-object-rest-spread": "7.25.9", "@babel/preset-env": "7.26.0", "@babel/preset-typescript": "7.26.0", - "@quasar/app-webpack": "4.0.0-rc.4", + "@quasar/app-webpack": "4.0.7", "@quasar/cli": "2.4.1", "@types/mockjs": "1.0.10", - "@types/node": "22.10.0", - "@typescript-eslint/eslint-plugin": "8.16.0", - "@typescript-eslint/parser": "8.16.0", + "@types/node": "22.10.7", + "@typescript-eslint/eslint-plugin": "8.20.0", + "@typescript-eslint/parser": "8.20.0", "@vue/babel-plugin-jsx": "1.2.5", "@vue/compiler-sfc": "3.5.13", "@vuepress/bundler-webpack": "2.0.0-rc.15", "@vuepress/theme-default": "2.0.0-rc.49", - "@webpack-cli/serve": "2.0.5", + "@webpack-cli/serve": "3.0.1", "autoprefixer": "10.4.20", "babel-loader": "9.2.1", "clean-webpack-plugin": "4.0.0", "copy-webpack-plugin": "12.0.2", "cross-env": "7.0.3", "css-loader": "7.1.2", - "eslint": "9.15.0", - "eslint-config-prettier": "9.1.0", - "eslint-plugin-prettier": "5.2.1", - "eslint-plugin-vue": "9.31.0", + "eslint": "9.18.0", + "eslint-config-prettier": "10.0.1", + "eslint-plugin-prettier": "5.2.2", + "eslint-plugin-vue": "9.32.0", "eslint-webpack-plugin": "4.2.0", "html-webpack-plugin": "5.6.3", "json5": "2.2.3", "mini-css-extract-plugin": "2.9.2", - "nodemon": "3.1.7", - "postcss": "8.4.49", + "nodemon": "3.1.9", + "postcss": "8.5.1", "postcss-import": "16.1.0", "postcss-loader": "8.1.1", - "postcss-preset-env": "10.1.1", - "prettier": "3.4.1", - "sass": "1.81.0", - "sass-loader": "16.0.3", - "tailwindcss": "3.4.15", + "postcss-preset-env": "10.1.3", + "prettier": "3.4.2", + "sass": "1.83.4", + "sass-loader": "16.0.4", + "tailwindcss": "3.4.17", "typescript": "5.5.4", "vue-loader": "17.4.2", "vuepress": "2.0.0-rc.15", - "webpack": "5.96.1", + "webpack": "5.97.1", "webpack-bundle-analyzer": "4.10.2", - "webpack-cli": "5.1.4", - "webpack-dev-server": "5.1.0", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.0", "webpack-merge": "6.0.1" }, "dependencies": { "@codemirror/autocomplete": "6.18.4", - "@codemirror/commands": "6.7.1", + "@codemirror/commands": "6.8.0", "@codemirror/lang-html": "6.4.9", "@codemirror/lang-java": "6.0.1", "@codemirror/lang-javascript": "6.2.2", @@ -83,40 +83,40 @@ "@codemirror/lang-xml": "6.1.0", "@codemirror/language": "6.10.8", "@codemirror/search": "6.5.8", - "@codemirror/state": "6.5.0", - "@codemirror/view": "6.36.1", - "@maxgraph/core": "0.13.1", - "@quasar/extras": "1.16.13", - "@univerjs/core": "0.5.0", - "@univerjs/design": "0.5.0", - "@univerjs/docs": "0.5.0", - "@univerjs/docs-ui": "0.5.0", - "@univerjs/engine-formula": "0.5.0", - "@univerjs/engine-render": "0.5.0", - "@univerjs/facade": "0.5.0", - "@univerjs/sheets": "0.5.0", - "@univerjs/sheets-formula": "0.5.0", - "@univerjs/sheets-ui": "0.5.0", - "@univerjs/thread-comment": "0.5.0", - "@univerjs/ui": "0.5.0", - "@vueuse/core": "11.3.0", - "axios": "1.7.8", + "@codemirror/state": "6.5.1", + "@codemirror/view": "6.36.2", + "@maxgraph/core": "0.14.0", + "@quasar/extras": "1.16.15", + "@univerjs/core": "0.5.4", + "@univerjs/design": "0.5.4", + "@univerjs/docs": "0.5.4", + "@univerjs/docs-ui": "0.5.4", + "@univerjs/engine-formula": "0.5.4", + "@univerjs/engine-render": "0.5.4", + "@univerjs/facade": "0.5.4", + "@univerjs/sheets": "0.5.4", + "@univerjs/sheets-formula": "0.5.4", + "@univerjs/sheets-ui": "0.5.4", + "@univerjs/thread-comment": "0.5.4", + "@univerjs/ui": "0.5.4", + "@vueuse/core": "12.4.0", + "axios": "1.7.9", "codemirror": "6.0.1", "dayjs": "1.11.13", - "echarts": "5.5.1", + "echarts": "5.6.0", "exceljs": "4.4.0", "file-saver": "2.0.5", "luckyexcel": "1.0.1", "mockjs": "1.1.0", - "node-sql-parser": "5.3.4", - "pinia": "2.2.6", - "platform-core": "8.2.33", - "quasar": "2.17.4", + "node-sql-parser": "5.3.6", + "pinia": "2.3.0", + "platform-core": "8.2.34", + "quasar": "2.17.6", "sort-array": "5.0.0", - "svg-path-commander": "2.1.5", + "svg-path-commander": "2.1.7", "vue": "3.5.13", "vue-dompurify-html": "5.2.0", - "vue-i18n": "10.0.4", + "vue-i18n": "11.0.1", "vue-router": "4.5.0", "xml-formatter": "3.6.3" } diff --git a/io.sc.platform.developer.doc/.npmrc b/io.sc.platform.developer.doc/.npmrc index 304f4652..f0873d2e 100644 --- a/io.sc.platform.developer.doc/.npmrc +++ b/io.sc.platform.developer.doc/.npmrc @@ -1,5 +1,6 @@ # npm 仓库地址, 在 npm install 时使用 registry=http://nexus.sc.io:8000/repository/npm-public/ +#registry=https://registry.npm.taobao.org/ # 用户邮箱 email= @@ -10,4 +11,4 @@ git-checks=false # 登录 npm 仓库的用户认证信息, 在 npm publish 时使用, publish 的 npm registry 在 package.json 文件中 publishConfig 部分配置 # _authToken 可通过以下命令获取 # curl -X PUT -H "Content-Type:application/json" -d '{"_id":"org.couchdb.user:admin","name":"admin","password":"admin"}' http://nexus.sc.io:8000/repository/npm-releases/-/user/org.couchdb.user:admin -//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.67c99588-56a6-3ce1-9bea-a9a6164f8090 \ No newline at end of file +//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.67c99588-56a6-3ce1-9bea-a9a6164f8090 diff --git a/io.sc.platform.developer.doc/package.json b/io.sc.platform.developer.doc/package.json index 6da09c75..74d23582 100644 --- a/io.sc.platform.developer.doc/package.json +++ b/io.sc.platform.developer.doc/package.json @@ -20,17 +20,17 @@ "pnpm": ">=7" }, "devDependencies": { - "sass": "1.81.0", - "sass-loader": "16.0.3", + "sass": "1.83.4", + "sass-loader": "16.0.4", "vue-loader": "17.4.2", "@vuepress/bundler-webpack": "2.0.0-rc.15", "@vuepress/theme-default": "2.0.0-rc.49", "vuepress": "2.0.0-rc.15" }, "dependencies": { - "platform-core": "8.2.33", - "quasar": "2.17.4", + "platform-core": "8.2.34", + "quasar": "2.17.6", "vue": "3.5.13", - "vue-i18n": "10.0.4" + "vue-i18n": "11.0.1" } } \ No newline at end of file diff --git a/io.sc.platform.developer.frontend/package.json b/io.sc.platform.developer.frontend/package.json index d0c9baba..790c1d58 100644 --- a/io.sc.platform.developer.frontend/package.json +++ b/io.sc.platform.developer.frontend/package.json @@ -28,17 +28,17 @@ "@babel/plugin-transform-object-rest-spread": "7.25.9", "@babel/preset-env": "7.26.0", "@babel/preset-typescript": "7.26.0", - "@quasar/app-webpack": "4.0.0-rc.4", + "@quasar/app-webpack": "4.0.7", "@quasar/cli": "2.4.1", "@types/mockjs": "1.0.10", "@types/node": "22.10.0", - "@typescript-eslint/eslint-plugin": "8.16.0", - "@typescript-eslint/parser": "8.16.0", + "@typescript-eslint/eslint-plugin": "8.20.0", + "@typescript-eslint/parser": "8.20.0", "@vue/babel-plugin-jsx": "1.2.5", "@vue/compiler-sfc": "3.5.13", "@vuepress/bundler-webpack": "2.0.0-rc.15", "@vuepress/theme-default": "2.0.0-rc.49", - "@webpack-cli/serve": "2.0.5", + "@webpack-cli/serve": "3.0.1", "autoprefixer": "10.4.20", "babel-loader": "9.2.1", "clean-webpack-plugin": "4.0.0", @@ -46,35 +46,35 @@ "copy-webpack-plugin": "12.0.2", "cross-env": "7.0.3", "css-loader": "7.1.2", - "eslint": "9.15.0", - "eslint-config-prettier": "9.1.0", - "eslint-plugin-prettier": "5.2.1", - "eslint-plugin-vue": "9.31.0", + "eslint": "9.18.0", + "eslint-config-prettier": "10.0.1", + "eslint-plugin-prettier": "5.2.2", + "eslint-plugin-vue": "9.32.0", "eslint-webpack-plugin": "4.2.0", "html-webpack-plugin": "5.6.3", "json5": "2.2.3", "mini-css-extract-plugin": "2.9.2", - "nodemon": "3.1.7", - "postcss": "8.4.49", + "nodemon": "3.1.9", + "postcss": "8.5.1", "postcss-import": "16.1.0", "postcss-loader": "8.1.1", - "postcss-preset-env": "10.1.1", - "prettier": "3.4.1", - "sass": "1.81.0", - "sass-loader": "16.0.3", - "tailwindcss": "3.4.15", + "postcss-preset-env": "10.1.3", + "prettier": "3.4.2", + "sass": "1.83.4", + "sass-loader": "16.0.4", + "tailwindcss": "3.4.17", "typescript": "5.5.4", "vue-loader": "17.4.2", "vuepress": "2.0.0-rc.15", - "webpack": "5.96.1", + "webpack": "5.97.1", "webpack-bundle-analyzer": "4.10.2", - "webpack-cli": "5.1.4", - "webpack-dev-server": "5.1.0", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.0", "webpack-merge": "6.0.1" }, "dependencies": { "@codemirror/autocomplete": "6.18.4", - "@codemirror/commands": "6.7.1", + "@codemirror/commands": "6.8.0", "@codemirror/lang-html": "6.4.9", "@codemirror/lang-java": "6.0.1", "@codemirror/lang-javascript": "6.2.2", @@ -83,42 +83,42 @@ "@codemirror/lang-xml": "6.1.0", "@codemirror/language": "6.10.8", "@codemirror/search": "6.5.8", - "@codemirror/state": "6.5.0", - "@codemirror/view": "6.36.1", - "@maxgraph/core": "0.13.1", - "@quasar/extras": "1.16.13", - "@univerjs/core": "0.5.0", - "@univerjs/design": "0.5.0", - "@univerjs/docs": "0.5.0", - "@univerjs/docs-ui": "0.5.0", - "@univerjs/engine-formula": "0.5.0", - "@univerjs/engine-render": "0.5.0", - "@univerjs/facade": "0.5.0", - "@univerjs/sheets": "0.5.0", - "@univerjs/sheets-formula": "0.5.0", - "@univerjs/sheets-ui": "0.5.0", - "@univerjs/thread-comment": "0.5.0", - "@univerjs/ui": "0.5.0", - "@vueuse/core": "11.3.0", - "axios": "1.7.8", + "@codemirror/state": "6.5.1", + "@codemirror/view": "6.36.2", + "@maxgraph/core": "0.14.0", + "@quasar/extras": "1.16.15", + "@univerjs/core": "0.5.4", + "@univerjs/design": "0.5.4", + "@univerjs/docs": "0.5.4", + "@univerjs/docs-ui": "0.5.4", + "@univerjs/engine-formula": "0.5.4", + "@univerjs/engine-render": "0.5.4", + "@univerjs/facade": "0.5.4", + "@univerjs/sheets": "0.5.4", + "@univerjs/sheets-formula": "0.5.4", + "@univerjs/sheets-ui": "0.5.4", + "@univerjs/thread-comment": "0.5.4", + "@univerjs/ui": "0.5.4", + "@vueuse/core": "12.4.0", + "axios": "1.7.9", "codemirror": "6.0.1", "dayjs": "1.11.13", - "echarts": "5.5.1", + "echarts": "5.6.0", "exceljs": "4.4.0", "file-saver": "2.0.5", "luckyexcel": "1.0.1", "mockjs": "1.1.0", - "node-sql-parser": "5.3.4", - "pinia": "2.2.6", + "node-sql-parser": "5.3.6", + "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.33", - "quasar": "2.17.4", + "platform-core": "8.2.34", + "quasar": "2.17.6", "sort-array": "5.0.0", - "svg-path-commander": "2.1.5", + "svg-path-commander": "2.1.7", "tailwindcss": "3.4.10", "vue": "3.5.13", "vue-dompurify-html": "5.2.0", - "vue-i18n": "10.0.4", + "vue-i18n": "11.0.1", "vue-router": "4.5.0", "xml-formatter": "3.6.3" } diff --git a/io.sc.platform.gradle/templates/pgp/setup/gradle.properties b/io.sc.platform.gradle/templates/pgp/setup/gradle.properties index 8d6ea7dc..c20f3749 100644 --- a/io.sc.platform.gradle/templates/pgp/setup/gradle.properties +++ b/io.sc.platform.gradle/templates/pgp/setup/gradle.properties @@ -38,7 +38,7 @@ application_version=1.0.0 platform_group=io.sc platform_version=8.2.8 platform_plugin_version=8.2.8 -platform_core_frontend_version=8.2.33 +platform_core_frontend_version=8.2.34 ########################################################### # dependencies version diff --git a/io.sc.platform.lcdp.frontend/.npmrc b/io.sc.platform.lcdp.frontend/.npmrc index 304f4652..f0873d2e 100644 --- a/io.sc.platform.lcdp.frontend/.npmrc +++ b/io.sc.platform.lcdp.frontend/.npmrc @@ -1,5 +1,6 @@ # npm 仓库地址, 在 npm install 时使用 registry=http://nexus.sc.io:8000/repository/npm-public/ +#registry=https://registry.npm.taobao.org/ # 用户邮箱 email= @@ -10,4 +11,4 @@ git-checks=false # 登录 npm 仓库的用户认证信息, 在 npm publish 时使用, publish 的 npm registry 在 package.json 文件中 publishConfig 部分配置 # _authToken 可通过以下命令获取 # curl -X PUT -H "Content-Type:application/json" -d '{"_id":"org.couchdb.user:admin","name":"admin","password":"admin"}' http://nexus.sc.io:8000/repository/npm-releases/-/user/org.couchdb.user:admin -//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.67c99588-56a6-3ce1-9bea-a9a6164f8090 \ No newline at end of file +//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.67c99588-56a6-3ce1-9bea-a9a6164f8090 diff --git a/io.sc.platform.lcdp.frontend/package copy.json b/io.sc.platform.lcdp.frontend/package copy.json deleted file mode 100644 index ae2879d0..00000000 --- a/io.sc.platform.lcdp.frontend/package copy.json +++ /dev/null @@ -1,103 +0,0 @@ -{ - "name": "io.sc.platform.lcdp.frontend", - "version": "8.1.38", - "description": "", - "private": false, - "keywords": [], - "author": "", - "license": "ISC", - "scripts": { - "clean": "rm -rf ./node_modules && rm -rf pnpm-lock.yaml", - "dev": "nodemon", - "serve": "node ./util-components-generator.cjs && cross-env NODE_ENV=development webpack serve --config webpack.env.serve.cjs", - "build": "node ./util-components-generator.cjs && cross-env NODE_ENV=development webpack --config webpack.env.build.cjs", - "prod": "node ./util-components-generator.cjs && cross-env NODE_ENV=production webpack --config webpack.env.prod.cjs", - "sync": "platform sync" - }, - "engines": { - "node": ">=18", - "pnpm": ">=7" - }, - "publishConfig": { - "registry": "http://nexus.sc.io:8000/repository/npm-releases/", - "access": "public" - }, - "devDependencies": { - "@babel/core": "7.23.7", - "@babel/preset-env": "7.23.7", - "@babel/preset-typescript": "7.23.3", - "@babel/plugin-transform-class-properties": "7.23.3", - "@babel/plugin-transform-object-rest-spread": "7.23.4", - "@quasar/app-webpack": "3.12.1", - "@quasar/cli": "2.3.0", - "@types/mockjs": "1.0.10", - "@types/node": "20.10.6", - "@typescript-eslint/eslint-plugin": "6.17.0", - "@typescript-eslint/parser": "6.17.0", - "@vue/compiler-sfc": "3.4.3", - "@webpack-cli/serve": "2.0.5", - "autoprefixer": "10.4.16", - "babel-loader": "9.1.3", - "clean-webpack-plugin": "4.0.0", - "copy-webpack-plugin": "11.0.0", - "cross-env": "7.0.3", - "css-loader": "6.8.1", - "eslint": "8.56.0", - "eslint-config-prettier": "9.1.0", - "eslint-plugin-prettier": "5.1.2", - "eslint-plugin-vue": "9.19.2", - "eslint-webpack-plugin": "4.0.1", - "html-webpack-plugin": "5.6.0", - "json5": "2.2.3", - "mini-css-extract-plugin": "2.7.6", - "nodemon": "3.0.2", - "postcss": "8.4.32", - "postcss-import": "16.0.0", - "postcss-loader": "7.3.4", - "postcss-preset-env": "9.3.0", - "prettier": "3.1.1", - "sass": "1.69.7", - "sass-loader": "13.3.3", - "typescript": "5.3.3", - "vue-loader": "17.4.2", - "webpack": "5.89.0", - "webpack-bundle-analyzer": "4.10.1", - "webpack-cli": "5.1.4", - "webpack-dev-server": "4.15.1", - "webpack-merge": "5.10.0", - "@vue/babel-plugin-jsx": "1.1.5" - }, - "dependencies": { - "@codemirror/autocomplete": "6.11.1", - "@codemirror/commands": "6.3.3", - "@codemirror/lang-html": "6.4.7", - "@codemirror/lang-java": "6.0.1", - "@codemirror/lang-javascript": "6.2.1", - "@codemirror/lang-json": "6.0.1", - "@codemirror/lang-sql": "6.5.4", - "@codemirror/lang-xml": "6.0.2", - "@codemirror/language": "6.10.0", - "@codemirror/search": "6.5.5", - "@codemirror/state": "6.4.0", - "@codemirror/view": "6.23.0", - "@maxgraph/core": "0.9.0", - "@quasar/extras": "1.16.9", - "@vueuse/core": "10.7.1", - "axios": "1.6.3", - "codemirror": "6.0.1", - "dayjs": "1.11.10", - "echarts": "5.4.3", - "exceljs": "4.4.0", - "file-saver": "2.0.5", - "luckyexcel": "1.0.1", - "mockjs": "1.1.0", - "pinia": "2.1.7", - "platform-core": "8.1.188", - "quasar": "2.14.5", - "tailwindcss": "3.4.0", - "vue": "3.4.3", - "vue-dompurify-html": "5.0.1", - "vue-i18n": "9.8.0", - "vue-router": "4.2.5" - } -} \ No newline at end of file diff --git a/io.sc.platform.lcdp.frontend/package.json b/io.sc.platform.lcdp.frontend/package.json index 20c6167e..0096ab05 100644 --- a/io.sc.platform.lcdp.frontend/package.json +++ b/io.sc.platform.lcdp.frontend/package.json @@ -28,17 +28,17 @@ "@babel/plugin-transform-object-rest-spread": "7.25.9", "@babel/preset-env": "7.26.0", "@babel/preset-typescript": "7.26.0", - "@quasar/app-webpack": "4.0.0-rc.4", + "@quasar/app-webpack": "4.0.7", "@quasar/cli": "2.4.1", "@types/mockjs": "1.0.10", - "@types/node": "22.10.0", - "@typescript-eslint/eslint-plugin": "8.16.0", - "@typescript-eslint/parser": "8.16.0", + "@types/node": "22.10.7", + "@typescript-eslint/eslint-plugin": "8.20.0", + "@typescript-eslint/parser": "8.20.0", "@vue/babel-plugin-jsx": "1.2.5", "@vue/compiler-sfc": "3.5.13", "@vuepress/bundler-webpack": "2.0.0-rc.15", "@vuepress/theme-default": "2.0.0-rc.49", - "@webpack-cli/serve": "2.0.5", + "@webpack-cli/serve": "3.0.1", "autoprefixer": "10.4.20", "babel-loader": "9.2.1", "clean-webpack-plugin": "4.0.0", @@ -46,35 +46,35 @@ "copy-webpack-plugin": "12.0.2", "cross-env": "7.0.3", "css-loader": "7.1.2", - "eslint": "9.15.0", - "eslint-config-prettier": "9.1.0", - "eslint-plugin-prettier": "5.2.1", - "eslint-plugin-vue": "9.31.0", + "eslint": "9.18.0", + "eslint-config-prettier": "10.0.1", + "eslint-plugin-prettier": "5.2.2", + "eslint-plugin-vue": "9.32.0", "eslint-webpack-plugin": "4.2.0", "html-webpack-plugin": "5.6.3", "json5": "2.2.3", "mini-css-extract-plugin": "2.9.2", - "nodemon": "3.1.7", - "postcss": "8.4.49", + "nodemon": "3.1.9", + "postcss": "8.5.1", "postcss-import": "16.1.0", "postcss-loader": "8.1.1", - "postcss-preset-env": "10.1.1", - "prettier": "3.4.1", - "sass": "1.81.0", - "sass-loader": "16.0.3", - "tailwindcss": "3.4.15", + "postcss-preset-env": "10.1.3", + "prettier": "3.4.2", + "sass": "1.83.4", + "sass-loader": "16.0.4", + "tailwindcss": "3.4.17", "typescript": "5.5.4", "vue-loader": "17.4.2", "vuepress": "2.0.0-rc.15", - "webpack": "5.96.1", + "webpack": "5.97.1", "webpack-bundle-analyzer": "4.10.2", - "webpack-cli": "5.1.4", - "webpack-dev-server": "5.1.0", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.0", "webpack-merge": "6.0.1" }, "dependencies": { "@codemirror/autocomplete": "6.18.4", - "@codemirror/commands": "6.7.1", + "@codemirror/commands": "6.8.0", "@codemirror/lang-html": "6.4.9", "@codemirror/lang-java": "6.0.1", "@codemirror/lang-javascript": "6.2.2", @@ -83,42 +83,42 @@ "@codemirror/lang-xml": "6.1.0", "@codemirror/language": "6.10.8", "@codemirror/search": "6.5.8", - "@codemirror/state": "6.5.0", - "@codemirror/view": "6.36.1", - "@maxgraph/core": "0.13.1", - "@quasar/extras": "1.16.13", - "@univerjs/core": "0.5.0", - "@univerjs/design": "0.5.0", - "@univerjs/docs": "0.5.0", - "@univerjs/docs-ui": "0.5.0", - "@univerjs/engine-formula": "0.5.0", - "@univerjs/engine-render": "0.5.0", - "@univerjs/facade": "0.5.0", - "@univerjs/sheets": "0.5.0", - "@univerjs/sheets-formula": "0.5.0", - "@univerjs/sheets-ui": "0.5.0", - "@univerjs/thread-comment": "0.5.0", - "@univerjs/ui": "0.5.0", - "@vueuse/core": "11.3.0", - "axios": "1.7.8", + "@codemirror/state": "6.5.1", + "@codemirror/view": "6.36.2", + "@maxgraph/core": "0.14.0", + "@quasar/extras": "1.16.15", + "@univerjs/core": "0.5.4", + "@univerjs/design": "0.5.4", + "@univerjs/docs": "0.5.4", + "@univerjs/docs-ui": "0.5.4", + "@univerjs/engine-formula": "0.5.4", + "@univerjs/engine-render": "0.5.4", + "@univerjs/facade": "0.5.4", + "@univerjs/sheets": "0.5.4", + "@univerjs/sheets-formula": "0.5.4", + "@univerjs/sheets-ui": "0.5.4", + "@univerjs/thread-comment": "0.5.4", + "@univerjs/ui": "0.5.4", + "@vueuse/core": "12.4.0", + "axios": "1.7.9", "codemirror": "6.0.1", "dayjs": "1.11.13", - "echarts": "5.5.1", + "echarts": "5.6.0", "exceljs": "4.4.0", "file-saver": "2.0.5", "luckyexcel": "1.0.1", "mockjs": "1.1.0", - "node-sql-parser": "5.3.4", - "pinia": "2.2.6", + "node-sql-parser": "5.3.6", + "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.33", - "quasar": "2.17.4", + "platform-core": "8.2.34", + "quasar": "2.17.6", "sort-array": "5.0.0", - "svg-path-commander": "2.1.5", + "svg-path-commander": "2.1.7", "tailwindcss": "3.4.10", "vue": "3.5.13", "vue-dompurify-html": "5.2.0", - "vue-i18n": "10.0.4", + "vue-i18n": "11.0.1", "vue-router": "4.5.0", "xml-formatter": "3.6.3" } diff --git a/io.sc.platform.lcdp.frontend/src/components/index.ts b/io.sc.platform.lcdp.frontend/src/components/index.ts index 7d6fb245..091a749d 100644 --- a/io.sc.platform.lcdp.frontend/src/components/index.ts +++ b/io.sc.platform.lcdp.frontend/src/components/index.ts @@ -6,9 +6,9 @@ import component_lcdp_Frontend from '@/views/Frontend.vue'; import component_lcdp_Theme from '@/views/Theme.vue'; import component_lcdp_bpm from '@/views/bpm/Bpm.vue'; import component_lcdp_form_page from '@/views/form/Page.vue'; -import component_lcdp_excel_report from '@/views/excel-template/ExcelReport.vue'; +import component_lcdp_excel_report from '@/views/excelTemplate/ExcelReport.vue'; import component_lcdp_formConfig from '@/views/form/FormConfig.vue'; -import component_lcdp_excel_template from '@/views/excel-template/TemplateGrid.vue'; +import component_lcdp_excel_template from '@/views/excelTemplate/TemplateGrid.vue'; const localComponents = { 'component.lcdp.Frontend': component_lcdp_Frontend, diff --git a/io.sc.platform.lcdp.frontend/src/routes/routes.json b/io.sc.platform.lcdp.frontend/src/routes/routes.json index 0b68e09b..e89542c2 100644 --- a/io.sc.platform.lcdp.frontend/src/routes/routes.json +++ b/io.sc.platform.lcdp.frontend/src/routes/routes.json @@ -54,7 +54,7 @@ "path": "lcdp/excel/report", "priority": 0, "component": "component.lcdp.excel.report", - "componentPath": "@/views/excel-template/ExcelReport.vue", + "componentPath": "@/views/excelTemplate/ExcelReport.vue", "redirect": null, "meta": { "permissions": ["/example/**/*"] @@ -77,7 +77,7 @@ "name": "route.lcdp.excel.template", "path": "lcdp/excel/template", "component": "component.lcdp.excel.template", - "componentPath": "@/views/excel-template/TemplateGrid.vue", + "componentPath": "@/views/excelTemplate/TemplateGrid.vue", "meta": { "permissions": ["/example/**/*"] }, diff --git a/io.sc.platform.lcdp.frontend/src/views/excel-template/ExcelReport.vue b/io.sc.platform.lcdp.frontend/src/views/excelTemplate/ExcelReport.vue similarity index 100% rename from io.sc.platform.lcdp.frontend/src/views/excel-template/ExcelReport.vue rename to io.sc.platform.lcdp.frontend/src/views/excelTemplate/ExcelReport.vue diff --git a/io.sc.platform.lcdp.frontend/src/views/excel-template/TemplateConfig.vue b/io.sc.platform.lcdp.frontend/src/views/excelTemplate/TemplateConfig.vue similarity index 100% rename from io.sc.platform.lcdp.frontend/src/views/excel-template/TemplateConfig.vue rename to io.sc.platform.lcdp.frontend/src/views/excelTemplate/TemplateConfig.vue diff --git a/io.sc.platform.lcdp.frontend/src/views/excel-template/TemplateConfigDialog.vue b/io.sc.platform.lcdp.frontend/src/views/excelTemplate/TemplateConfigDialog.vue similarity index 100% rename from io.sc.platform.lcdp.frontend/src/views/excel-template/TemplateConfigDialog.vue rename to io.sc.platform.lcdp.frontend/src/views/excelTemplate/TemplateConfigDialog.vue diff --git a/io.sc.platform.lcdp.frontend/src/views/excel-template/TemplateGrid.vue b/io.sc.platform.lcdp.frontend/src/views/excelTemplate/TemplateGrid.vue similarity index 100% rename from io.sc.platform.lcdp.frontend/src/views/excel-template/TemplateGrid.vue rename to io.sc.platform.lcdp.frontend/src/views/excelTemplate/TemplateGrid.vue diff --git a/io.sc.platform.lcdp.frontend/src/views/excel-template/TemplateParamsDialog.vue b/io.sc.platform.lcdp.frontend/src/views/excelTemplate/TemplateParamsDialog.vue similarity index 100% rename from io.sc.platform.lcdp.frontend/src/views/excel-template/TemplateParamsDialog.vue rename to io.sc.platform.lcdp.frontend/src/views/excelTemplate/TemplateParamsDialog.vue diff --git a/io.sc.platform.lcdp.frontend/src/views/excel-template/TemplateParamsSelectDialog.vue b/io.sc.platform.lcdp.frontend/src/views/excelTemplate/TemplateParamsSelectDialog.vue similarity index 100% rename from io.sc.platform.lcdp.frontend/src/views/excel-template/TemplateParamsSelectDialog.vue rename to io.sc.platform.lcdp.frontend/src/views/excelTemplate/TemplateParamsSelectDialog.vue diff --git a/io.sc.platform.lcdp.frontend/src/views/excel-template/TemplateReportDialog.vue b/io.sc.platform.lcdp.frontend/src/views/excelTemplate/TemplateReportDialog.vue similarity index 100% rename from io.sc.platform.lcdp.frontend/src/views/excel-template/TemplateReportDialog.vue rename to io.sc.platform.lcdp.frontend/src/views/excelTemplate/TemplateReportDialog.vue diff --git a/io.sc.platform.lcdp.frontend/src/views/excel-template/TemplateSetColumnParamsDialog.vue b/io.sc.platform.lcdp.frontend/src/views/excelTemplate/TemplateSetColumnParamsDialog.vue similarity index 100% rename from io.sc.platform.lcdp.frontend/src/views/excel-template/TemplateSetColumnParamsDialog.vue rename to io.sc.platform.lcdp.frontend/src/views/excelTemplate/TemplateSetColumnParamsDialog.vue diff --git a/io.sc.platform.lcdp.frontend/src/views/excel-template/TemplateSetForeachPropsDialog.vue b/io.sc.platform.lcdp.frontend/src/views/excelTemplate/TemplateSetForeachPropsDialog.vue similarity index 100% rename from io.sc.platform.lcdp.frontend/src/views/excel-template/TemplateSetForeachPropsDialog.vue rename to io.sc.platform.lcdp.frontend/src/views/excelTemplate/TemplateSetForeachPropsDialog.vue diff --git a/io.sc.platform.lcdp.frontend/src/views/excel-template/luckysheet/LuckySheet.vue b/io.sc.platform.lcdp.frontend/src/views/excelTemplate/luckysheet/LuckySheet.vue similarity index 97% rename from io.sc.platform.lcdp.frontend/src/views/excel-template/luckysheet/LuckySheet.vue rename to io.sc.platform.lcdp.frontend/src/views/excelTemplate/luckysheet/LuckySheet.vue index 953031ce..97b9e530 100644 --- a/io.sc.platform.lcdp.frontend/src/views/excel-template/luckysheet/LuckySheet.vue +++ b/io.sc.platform.lcdp.frontend/src/views/excelTemplate/luckysheet/LuckySheet.vue @@ -51,9 +51,9 @@ import { exportExcel } from './exportExcel'; import { useQuasar } from 'quasar'; import { axios, TagViewManager, Environment, PlatformIconEnum, Tools, NotifyManager } from 'platform-core'; -import TemplateParamsSelectDialog from '@/views/excel_template/TemplateParamsSelectDialog.vue'; -import TemplateSetForEachParamsDialog from '@/views/excel_template/TemplateSetForeachPropsDialog.vue'; -import TemplateSetColumnParamsDialog from '@/views/excel_template/TemplateSetColumnParamsDialog.vue'; +import TemplateParamsSelectDialog from '@/views/excelTemplate/TemplateParamsSelectDialog.vue'; +import TemplateSetForEachParamsDialog from '@/views/excelTemplate/TemplateSetForeachPropsDialog.vue'; +import TemplateSetColumnParamsDialog from '@/views/excelTemplate/TemplateSetColumnParamsDialog.vue'; const gc = Environment.getConfigure(); const $q = useQuasar(); diff --git a/io.sc.platform.lcdp.frontend/src/views/excel-template/luckysheet/exportExcel.ts b/io.sc.platform.lcdp.frontend/src/views/excelTemplate/luckysheet/exportExcel.ts similarity index 100% rename from io.sc.platform.lcdp.frontend/src/views/excel-template/luckysheet/exportExcel.ts rename to io.sc.platform.lcdp.frontend/src/views/excelTemplate/luckysheet/exportExcel.ts diff --git a/io.sc.platform.lcdp.frontend/src/views/excel-template/template.ts b/io.sc.platform.lcdp.frontend/src/views/excelTemplate/template.ts similarity index 100% rename from io.sc.platform.lcdp.frontend/src/views/excel-template/template.ts rename to io.sc.platform.lcdp.frontend/src/views/excelTemplate/template.ts diff --git a/io.sc.platform.license.keygen.frontend/.npmrc b/io.sc.platform.license.keygen.frontend/.npmrc index 304f4652..f0873d2e 100644 --- a/io.sc.platform.license.keygen.frontend/.npmrc +++ b/io.sc.platform.license.keygen.frontend/.npmrc @@ -1,5 +1,6 @@ # npm 仓库地址, 在 npm install 时使用 registry=http://nexus.sc.io:8000/repository/npm-public/ +#registry=https://registry.npm.taobao.org/ # 用户邮箱 email= @@ -10,4 +11,4 @@ git-checks=false # 登录 npm 仓库的用户认证信息, 在 npm publish 时使用, publish 的 npm registry 在 package.json 文件中 publishConfig 部分配置 # _authToken 可通过以下命令获取 # curl -X PUT -H "Content-Type:application/json" -d '{"_id":"org.couchdb.user:admin","name":"admin","password":"admin"}' http://nexus.sc.io:8000/repository/npm-releases/-/user/org.couchdb.user:admin -//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.67c99588-56a6-3ce1-9bea-a9a6164f8090 \ No newline at end of file +//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.67c99588-56a6-3ce1-9bea-a9a6164f8090 diff --git a/io.sc.platform.license.keygen.frontend/package.json b/io.sc.platform.license.keygen.frontend/package.json index 2a025628..78fba62b 100644 --- a/io.sc.platform.license.keygen.frontend/package.json +++ b/io.sc.platform.license.keygen.frontend/package.json @@ -28,17 +28,17 @@ "@babel/plugin-transform-object-rest-spread": "7.25.9", "@babel/preset-env": "7.26.0", "@babel/preset-typescript": "7.26.0", - "@quasar/app-webpack": "4.0.0-rc.4", + "@quasar/app-webpack": "4.0.7", "@quasar/cli": "2.4.1", "@types/mockjs": "1.0.10", - "@types/node": "22.10.0", - "@typescript-eslint/eslint-plugin": "8.16.0", - "@typescript-eslint/parser": "8.16.0", + "@types/node": "22.10.7", + "@typescript-eslint/eslint-plugin": "8.20.0", + "@typescript-eslint/parser": "8.20.0", "@vue/babel-plugin-jsx": "1.2.5", "@vue/compiler-sfc": "3.5.13", "@vuepress/bundler-webpack": "2.0.0-rc.15", "@vuepress/theme-default": "2.0.0-rc.49", - "@webpack-cli/serve": "2.0.5", + "@webpack-cli/serve": "3.0.1", "autoprefixer": "10.4.20", "babel-loader": "9.2.1", "clean-webpack-plugin": "4.0.0", @@ -46,35 +46,35 @@ "copy-webpack-plugin": "12.0.2", "cross-env": "7.0.3", "css-loader": "7.1.2", - "eslint": "9.15.0", - "eslint-config-prettier": "9.1.0", - "eslint-plugin-prettier": "5.2.1", - "eslint-plugin-vue": "9.31.0", + "eslint": "9.18.0", + "eslint-config-prettier": "10.0.1", + "eslint-plugin-prettier": "5.2.2", + "eslint-plugin-vue": "9.32.0", "eslint-webpack-plugin": "4.2.0", "html-webpack-plugin": "5.6.3", "json5": "2.2.3", "mini-css-extract-plugin": "2.9.2", - "nodemon": "3.1.7", - "postcss": "8.4.49", + "nodemon": "3.1.9", + "postcss": "8.5.1", "postcss-import": "16.1.0", "postcss-loader": "8.1.1", - "postcss-preset-env": "10.1.1", - "prettier": "3.4.1", - "sass": "1.81.0", - "sass-loader": "16.0.3", - "tailwindcss": "3.4.15", + "postcss-preset-env": "10.1.3", + "prettier": "3.4.2", + "sass": "1.83.4", + "sass-loader": "16.0.4", + "tailwindcss": "3.4.17", "typescript": "5.5.4", "vue-loader": "17.4.2", "vuepress": "2.0.0-rc.15", - "webpack": "5.96.1", + "webpack": "5.97.1", "webpack-bundle-analyzer": "4.10.2", - "webpack-cli": "5.1.4", - "webpack-dev-server": "5.1.0", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.0", "webpack-merge": "6.0.1" }, "dependencies": { "@codemirror/autocomplete": "6.18.4", - "@codemirror/commands": "6.7.1", + "@codemirror/commands": "6.8.0", "@codemirror/lang-html": "6.4.9", "@codemirror/lang-java": "6.0.1", "@codemirror/lang-javascript": "6.2.2", @@ -83,42 +83,42 @@ "@codemirror/lang-xml": "6.1.0", "@codemirror/language": "6.10.8", "@codemirror/search": "6.5.8", - "@codemirror/state": "6.5.0", - "@codemirror/view": "6.36.1", - "@maxgraph/core": "0.13.1", - "@quasar/extras": "1.16.13", - "@univerjs/core": "0.5.0", - "@univerjs/design": "0.5.0", - "@univerjs/docs": "0.5.0", - "@univerjs/docs-ui": "0.5.0", - "@univerjs/engine-formula": "0.5.0", - "@univerjs/engine-render": "0.5.0", - "@univerjs/facade": "0.5.0", - "@univerjs/sheets": "0.5.0", - "@univerjs/sheets-formula": "0.5.0", - "@univerjs/sheets-ui": "0.5.0", - "@univerjs/thread-comment": "0.5.0", - "@univerjs/ui": "0.5.0", - "@vueuse/core": "11.3.0", - "axios": "1.7.8", + "@codemirror/state": "6.5.1", + "@codemirror/view": "6.36.2", + "@maxgraph/core": "0.14.0", + "@quasar/extras": "1.16.15", + "@univerjs/core": "0.5.4", + "@univerjs/design": "0.5.4", + "@univerjs/docs": "0.5.4", + "@univerjs/docs-ui": "0.5.4", + "@univerjs/engine-formula": "0.5.4", + "@univerjs/engine-render": "0.5.4", + "@univerjs/facade": "0.5.4", + "@univerjs/sheets": "0.5.4", + "@univerjs/sheets-formula": "0.5.4", + "@univerjs/sheets-ui": "0.5.4", + "@univerjs/thread-comment": "0.5.4", + "@univerjs/ui": "0.5.4", + "@vueuse/core": "12.4.0", + "axios": "1.7.9", "codemirror": "6.0.1", "dayjs": "1.11.13", - "echarts": "5.5.1", + "echarts": "5.6.0", "exceljs": "4.4.0", "file-saver": "2.0.5", "luckyexcel": "1.0.1", "mockjs": "1.1.0", - "node-sql-parser": "5.3.4", - "pinia": "2.2.6", + "node-sql-parser": "5.3.6", + "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.33", - "quasar": "2.17.4", + "platform-core": "8.2.34", + "quasar": "2.17.6", "sort-array": "5.0.0", - "svg-path-commander": "2.1.5", + "svg-path-commander": "2.1.7", "tailwindcss": "3.4.10", "vue": "3.5.13", "vue-dompurify-html": "5.2.0", - "vue-i18n": "10.0.4", + "vue-i18n": "11.0.1", "vue-router": "4.5.0", "xml-formatter": "3.6.3" } diff --git a/io.sc.platform.mvc.frontend/.npmrc b/io.sc.platform.mvc.frontend/.npmrc index 304f4652..f0873d2e 100644 --- a/io.sc.platform.mvc.frontend/.npmrc +++ b/io.sc.platform.mvc.frontend/.npmrc @@ -1,5 +1,6 @@ # npm 仓库地址, 在 npm install 时使用 registry=http://nexus.sc.io:8000/repository/npm-public/ +#registry=https://registry.npm.taobao.org/ # 用户邮箱 email= @@ -10,4 +11,4 @@ git-checks=false # 登录 npm 仓库的用户认证信息, 在 npm publish 时使用, publish 的 npm registry 在 package.json 文件中 publishConfig 部分配置 # _authToken 可通过以下命令获取 # curl -X PUT -H "Content-Type:application/json" -d '{"_id":"org.couchdb.user:admin","name":"admin","password":"admin"}' http://nexus.sc.io:8000/repository/npm-releases/-/user/org.couchdb.user:admin -//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.67c99588-56a6-3ce1-9bea-a9a6164f8090 \ No newline at end of file +//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.67c99588-56a6-3ce1-9bea-a9a6164f8090 diff --git a/io.sc.platform.mvc.frontend/package.json b/io.sc.platform.mvc.frontend/package.json index 9a4c51f7..cb8d9f19 100644 --- a/io.sc.platform.mvc.frontend/package.json +++ b/io.sc.platform.mvc.frontend/package.json @@ -28,17 +28,17 @@ "@babel/plugin-transform-object-rest-spread": "7.25.9", "@babel/preset-env": "7.26.0", "@babel/preset-typescript": "7.26.0", - "@quasar/app-webpack": "4.0.0-rc.4", + "@quasar/app-webpack": "4.0.7", "@quasar/cli": "2.4.1", "@types/mockjs": "1.0.10", - "@types/node": "22.10.0", - "@typescript-eslint/eslint-plugin": "8.16.0", - "@typescript-eslint/parser": "8.16.0", + "@types/node": "22.10.7", + "@typescript-eslint/eslint-plugin": "8.20.0", + "@typescript-eslint/parser": "8.20.0", "@vue/babel-plugin-jsx": "1.2.5", "@vue/compiler-sfc": "3.5.13", "@vuepress/bundler-webpack": "2.0.0-rc.15", "@vuepress/theme-default": "2.0.0-rc.49", - "@webpack-cli/serve": "2.0.5", + "@webpack-cli/serve": "3.0.1", "autoprefixer": "10.4.20", "babel-loader": "9.2.1", "clean-webpack-plugin": "4.0.0", @@ -46,35 +46,35 @@ "copy-webpack-plugin": "12.0.2", "cross-env": "7.0.3", "css-loader": "7.1.2", - "eslint": "9.15.0", - "eslint-config-prettier": "9.1.0", - "eslint-plugin-prettier": "5.2.1", - "eslint-plugin-vue": "9.31.0", + "eslint": "9.18.0", + "eslint-config-prettier": "10.0.1", + "eslint-plugin-prettier": "5.2.2", + "eslint-plugin-vue": "9.32.0", "eslint-webpack-plugin": "4.2.0", "html-webpack-plugin": "5.6.3", "json5": "2.2.3", "mini-css-extract-plugin": "2.9.2", - "nodemon": "3.1.7", - "postcss": "8.4.49", + "nodemon": "3.1.9", + "postcss": "8.5.1", "postcss-import": "16.1.0", "postcss-loader": "8.1.1", - "postcss-preset-env": "10.1.1", - "prettier": "3.4.1", - "sass": "1.81.0", - "sass-loader": "16.0.3", - "tailwindcss": "3.4.15", + "postcss-preset-env": "10.1.3", + "prettier": "3.4.2", + "sass": "1.83.4", + "sass-loader": "16.0.4", + "tailwindcss": "3.4.17", "typescript": "5.5.4", "vue-loader": "17.4.2", "vuepress": "2.0.0-rc.15", - "webpack": "5.96.1", + "webpack": "5.97.1", "webpack-bundle-analyzer": "4.10.2", - "webpack-cli": "5.1.4", - "webpack-dev-server": "5.1.0", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.0", "webpack-merge": "6.0.1" }, "dependencies": { "@codemirror/autocomplete": "6.18.4", - "@codemirror/commands": "6.7.1", + "@codemirror/commands": "6.8.0", "@codemirror/lang-html": "6.4.9", "@codemirror/lang-java": "6.0.1", "@codemirror/lang-javascript": "6.2.2", @@ -83,42 +83,42 @@ "@codemirror/lang-xml": "6.1.0", "@codemirror/language": "6.10.8", "@codemirror/search": "6.5.8", - "@codemirror/state": "6.5.0", - "@codemirror/view": "6.36.1", - "@maxgraph/core": "0.13.1", - "@quasar/extras": "1.16.13", - "@univerjs/core": "0.5.0", - "@univerjs/design": "0.5.0", - "@univerjs/docs": "0.5.0", - "@univerjs/docs-ui": "0.5.0", - "@univerjs/engine-formula": "0.5.0", - "@univerjs/engine-render": "0.5.0", - "@univerjs/facade": "0.5.0", - "@univerjs/sheets": "0.5.0", - "@univerjs/sheets-formula": "0.5.0", - "@univerjs/sheets-ui": "0.5.0", - "@univerjs/thread-comment": "0.5.0", - "@univerjs/ui": "0.5.0", - "@vueuse/core": "11.3.0", - "axios": "1.7.8", + "@codemirror/state": "6.5.1", + "@codemirror/view": "6.36.2", + "@maxgraph/core": "0.14.0", + "@quasar/extras": "1.16.15", + "@univerjs/core": "0.5.4", + "@univerjs/design": "0.5.4", + "@univerjs/docs": "0.5.4", + "@univerjs/docs-ui": "0.5.4", + "@univerjs/engine-formula": "0.5.4", + "@univerjs/engine-render": "0.5.4", + "@univerjs/facade": "0.5.4", + "@univerjs/sheets": "0.5.4", + "@univerjs/sheets-formula": "0.5.4", + "@univerjs/sheets-ui": "0.5.4", + "@univerjs/thread-comment": "0.5.4", + "@univerjs/ui": "0.5.4", + "@vueuse/core": "12.4.0", + "axios": "1.7.9", "codemirror": "6.0.1", "dayjs": "1.11.13", - "echarts": "5.5.1", + "echarts": "5.6.0", "exceljs": "4.4.0", "file-saver": "2.0.5", "luckyexcel": "1.0.1", "mockjs": "1.1.0", - "node-sql-parser": "5.3.4", - "pinia": "2.2.6", + "node-sql-parser": "5.3.6", + "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.33", - "quasar": "2.17.4", + "platform-core": "8.2.34", + "quasar": "2.17.6", "sort-array": "5.0.0", - "svg-path-commander": "2.1.5", + "svg-path-commander": "2.1.7", "tailwindcss": "3.4.10", "vue": "3.5.13", "vue-dompurify-html": "5.2.0", - "vue-i18n": "10.0.4", + "vue-i18n": "11.0.1", "vue-router": "4.5.0", "xml-formatter": "3.6.3" } diff --git a/io.sc.platform.scheduler.manager.frontend/.npmrc b/io.sc.platform.scheduler.manager.frontend/.npmrc index 304f4652..f0873d2e 100644 --- a/io.sc.platform.scheduler.manager.frontend/.npmrc +++ b/io.sc.platform.scheduler.manager.frontend/.npmrc @@ -1,5 +1,6 @@ # npm 仓库地址, 在 npm install 时使用 registry=http://nexus.sc.io:8000/repository/npm-public/ +#registry=https://registry.npm.taobao.org/ # 用户邮箱 email= @@ -10,4 +11,4 @@ git-checks=false # 登录 npm 仓库的用户认证信息, 在 npm publish 时使用, publish 的 npm registry 在 package.json 文件中 publishConfig 部分配置 # _authToken 可通过以下命令获取 # curl -X PUT -H "Content-Type:application/json" -d '{"_id":"org.couchdb.user:admin","name":"admin","password":"admin"}' http://nexus.sc.io:8000/repository/npm-releases/-/user/org.couchdb.user:admin -//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.67c99588-56a6-3ce1-9bea-a9a6164f8090 \ No newline at end of file +//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.67c99588-56a6-3ce1-9bea-a9a6164f8090 diff --git a/io.sc.platform.scheduler.manager.frontend/package.json b/io.sc.platform.scheduler.manager.frontend/package.json index 8bbb9c7d..a4cb0b24 100644 --- a/io.sc.platform.scheduler.manager.frontend/package.json +++ b/io.sc.platform.scheduler.manager.frontend/package.json @@ -28,17 +28,17 @@ "@babel/plugin-transform-object-rest-spread": "7.25.9", "@babel/preset-env": "7.26.0", "@babel/preset-typescript": "7.26.0", - "@quasar/app-webpack": "4.0.0-rc.4", + "@quasar/app-webpack": "4.0.7", "@quasar/cli": "2.4.1", "@types/mockjs": "1.0.10", - "@types/node": "22.10.0", - "@typescript-eslint/eslint-plugin": "8.16.0", - "@typescript-eslint/parser": "8.16.0", + "@types/node": "22.10.7", + "@typescript-eslint/eslint-plugin": "8.20.0", + "@typescript-eslint/parser": "8.20.0", "@vue/babel-plugin-jsx": "1.2.5", "@vue/compiler-sfc": "3.5.13", "@vuepress/bundler-webpack": "2.0.0-rc.15", "@vuepress/theme-default": "2.0.0-rc.49", - "@webpack-cli/serve": "2.0.5", + "@webpack-cli/serve": "3.0.1", "autoprefixer": "10.4.20", "babel-loader": "9.2.1", "clean-webpack-plugin": "4.0.0", @@ -46,35 +46,35 @@ "copy-webpack-plugin": "12.0.2", "cross-env": "7.0.3", "css-loader": "7.1.2", - "eslint": "9.15.0", - "eslint-config-prettier": "9.1.0", - "eslint-plugin-prettier": "5.2.1", - "eslint-plugin-vue": "9.31.0", + "eslint": "9.18.0", + "eslint-config-prettier": "10.0.1", + "eslint-plugin-prettier": "5.2.2", + "eslint-plugin-vue": "9.32.0", "eslint-webpack-plugin": "4.2.0", "html-webpack-plugin": "5.6.3", "json5": "2.2.3", "mini-css-extract-plugin": "2.9.2", - "nodemon": "3.1.7", - "postcss": "8.4.49", + "nodemon": "3.1.9", + "postcss": "8.5.1", "postcss-import": "16.1.0", "postcss-loader": "8.1.1", - "postcss-preset-env": "10.1.1", - "prettier": "3.4.1", - "sass": "1.81.0", - "sass-loader": "16.0.3", - "tailwindcss": "3.4.15", + "postcss-preset-env": "10.1.3", + "prettier": "3.4.2", + "sass": "1.83.4", + "sass-loader": "16.0.4", + "tailwindcss": "3.4.17", "typescript": "5.5.4", "vue-loader": "17.4.2", "vuepress": "2.0.0-rc.15", - "webpack": "5.96.1", + "webpack": "5.97.1", "webpack-bundle-analyzer": "4.10.2", - "webpack-cli": "5.1.4", - "webpack-dev-server": "5.1.0", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.0", "webpack-merge": "6.0.1" }, "dependencies": { "@codemirror/autocomplete": "6.18.4", - "@codemirror/commands": "6.7.1", + "@codemirror/commands": "6.8.0", "@codemirror/lang-html": "6.4.9", "@codemirror/lang-java": "6.0.1", "@codemirror/lang-javascript": "6.2.2", @@ -83,42 +83,42 @@ "@codemirror/lang-xml": "6.1.0", "@codemirror/language": "6.10.8", "@codemirror/search": "6.5.8", - "@codemirror/state": "6.5.0", - "@codemirror/view": "6.36.1", - "@maxgraph/core": "0.13.1", - "@quasar/extras": "1.16.13", - "@univerjs/core": "0.5.0", - "@univerjs/design": "0.5.0", - "@univerjs/docs": "0.5.0", - "@univerjs/docs-ui": "0.5.0", - "@univerjs/engine-formula": "0.5.0", - "@univerjs/engine-render": "0.5.0", - "@univerjs/facade": "0.5.0", - "@univerjs/sheets": "0.5.0", - "@univerjs/sheets-formula": "0.5.0", - "@univerjs/sheets-ui": "0.5.0", - "@univerjs/thread-comment": "0.5.0", - "@univerjs/ui": "0.5.0", - "@vueuse/core": "11.3.0", - "axios": "1.7.8", + "@codemirror/state": "6.5.1", + "@codemirror/view": "6.36.2", + "@maxgraph/core": "0.14.0", + "@quasar/extras": "1.16.15", + "@univerjs/core": "0.5.4", + "@univerjs/design": "0.5.4", + "@univerjs/docs": "0.5.4", + "@univerjs/docs-ui": "0.5.4", + "@univerjs/engine-formula": "0.5.4", + "@univerjs/engine-render": "0.5.4", + "@univerjs/facade": "0.5.4", + "@univerjs/sheets": "0.5.4", + "@univerjs/sheets-formula": "0.5.4", + "@univerjs/sheets-ui": "0.5.4", + "@univerjs/thread-comment": "0.5.4", + "@univerjs/ui": "0.5.4", + "@vueuse/core": "12.4.0", + "axios": "1.7.9", "codemirror": "6.0.1", "dayjs": "1.11.13", - "echarts": "5.5.1", + "echarts": "5.6.0", "exceljs": "4.4.0", "file-saver": "2.0.5", "luckyexcel": "1.0.1", "mockjs": "1.1.0", - "node-sql-parser": "5.3.4", - "pinia": "2.2.6", + "node-sql-parser": "5.3.6", + "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.33", - "quasar": "2.17.4", + "platform-core": "8.2.34", + "quasar": "2.17.6", "sort-array": "5.0.0", - "svg-path-commander": "2.1.5", + "svg-path-commander": "2.1.7", "tailwindcss": "3.4.10", "vue": "3.5.13", "vue-dompurify-html": "5.2.0", - "vue-i18n": "10.0.4", + "vue-i18n": "11.0.1", "vue-router": "4.5.0", "xml-formatter": "3.6.3" } diff --git a/io.sc.platform.system.frontend/.npmrc b/io.sc.platform.system.frontend/.npmrc index 304f4652..f0873d2e 100644 --- a/io.sc.platform.system.frontend/.npmrc +++ b/io.sc.platform.system.frontend/.npmrc @@ -1,5 +1,6 @@ # npm 仓库地址, 在 npm install 时使用 registry=http://nexus.sc.io:8000/repository/npm-public/ +#registry=https://registry.npm.taobao.org/ # 用户邮箱 email= @@ -10,4 +11,4 @@ git-checks=false # 登录 npm 仓库的用户认证信息, 在 npm publish 时使用, publish 的 npm registry 在 package.json 文件中 publishConfig 部分配置 # _authToken 可通过以下命令获取 # curl -X PUT -H "Content-Type:application/json" -d '{"_id":"org.couchdb.user:admin","name":"admin","password":"admin"}' http://nexus.sc.io:8000/repository/npm-releases/-/user/org.couchdb.user:admin -//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.67c99588-56a6-3ce1-9bea-a9a6164f8090 \ No newline at end of file +//nexus.sc.io:8000/repository/npm-releases/:_authToken=NpmToken.67c99588-56a6-3ce1-9bea-a9a6164f8090 diff --git a/io.sc.platform.system.frontend/package.json b/io.sc.platform.system.frontend/package.json index 1c61a948..679afddb 100644 --- a/io.sc.platform.system.frontend/package.json +++ b/io.sc.platform.system.frontend/package.json @@ -28,17 +28,17 @@ "@babel/plugin-transform-object-rest-spread": "7.25.9", "@babel/preset-env": "7.26.0", "@babel/preset-typescript": "7.26.0", - "@quasar/app-webpack": "4.0.0-rc.4", + "@quasar/app-webpack": "4.0.7", "@quasar/cli": "2.4.1", "@types/mockjs": "1.0.10", - "@types/node": "22.10.0", - "@typescript-eslint/eslint-plugin": "8.16.0", - "@typescript-eslint/parser": "8.16.0", + "@types/node": "22.10.7", + "@typescript-eslint/eslint-plugin": "8.20.0", + "@typescript-eslint/parser": "8.20.0", "@vue/babel-plugin-jsx": "1.2.5", "@vue/compiler-sfc": "3.5.13", "@vuepress/bundler-webpack": "2.0.0-rc.15", "@vuepress/theme-default": "2.0.0-rc.49", - "@webpack-cli/serve": "2.0.5", + "@webpack-cli/serve": "3.0.1", "autoprefixer": "10.4.20", "babel-loader": "9.2.1", "clean-webpack-plugin": "4.0.0", @@ -46,35 +46,35 @@ "copy-webpack-plugin": "12.0.2", "cross-env": "7.0.3", "css-loader": "7.1.2", - "eslint": "9.15.0", - "eslint-config-prettier": "9.1.0", - "eslint-plugin-prettier": "5.2.1", - "eslint-plugin-vue": "9.31.0", + "eslint": "9.18.0", + "eslint-config-prettier": "10.0.1", + "eslint-plugin-prettier": "5.2.2", + "eslint-plugin-vue": "9.32.0", "eslint-webpack-plugin": "4.2.0", "html-webpack-plugin": "5.6.3", "json5": "2.2.3", "mini-css-extract-plugin": "2.9.2", - "nodemon": "3.1.7", - "postcss": "8.4.49", + "nodemon": "3.1.9", + "postcss": "8.5.1", "postcss-import": "16.1.0", "postcss-loader": "8.1.1", - "postcss-preset-env": "10.1.1", - "prettier": "3.4.1", - "sass": "1.81.0", - "sass-loader": "16.0.3", - "tailwindcss": "3.4.15", + "postcss-preset-env": "10.1.3", + "prettier": "3.4.2", + "sass": "1.83.4", + "sass-loader": "16.0.4", + "tailwindcss": "3.4.17", "typescript": "5.5.4", "vue-loader": "17.4.2", "vuepress": "2.0.0-rc.15", - "webpack": "5.96.1", + "webpack": "5.97.1", "webpack-bundle-analyzer": "4.10.2", - "webpack-cli": "5.1.4", - "webpack-dev-server": "5.1.0", + "webpack-cli": "6.0.1", + "webpack-dev-server": "5.2.0", "webpack-merge": "6.0.1" }, "dependencies": { "@codemirror/autocomplete": "6.18.4", - "@codemirror/commands": "6.7.1", + "@codemirror/commands": "6.8.0", "@codemirror/lang-html": "6.4.9", "@codemirror/lang-java": "6.0.1", "@codemirror/lang-javascript": "6.2.2", @@ -83,40 +83,40 @@ "@codemirror/lang-xml": "6.1.0", "@codemirror/language": "6.10.8", "@codemirror/search": "6.5.8", - "@codemirror/state": "6.5.0", - "@codemirror/view": "6.36.1", - "@maxgraph/core": "0.13.1", - "@quasar/extras": "1.16.13", - "@univerjs/core": "0.5.0", - "@univerjs/design": "0.5.0", - "@univerjs/docs": "0.5.0", - "@univerjs/docs-ui": "0.5.0", - "@univerjs/engine-formula": "0.5.0", - "@univerjs/engine-render": "0.5.0", - "@univerjs/facade": "0.5.0", - "@univerjs/sheets": "0.5.0", - "@univerjs/sheets-formula": "0.5.0", - "@univerjs/sheets-ui": "0.5.0", - "@univerjs/thread-comment": "0.5.0", - "@univerjs/ui": "0.5.0", - "@vueuse/core": "11.3.0", - "axios": "1.7.8", + "@codemirror/state": "6.5.1", + "@codemirror/view": "6.36.2", + "@maxgraph/core": "0.14.0", + "@quasar/extras": "1.16.15", + "@univerjs/core": "0.5.4", + "@univerjs/design": "0.5.4", + "@univerjs/docs": "0.5.4", + "@univerjs/docs-ui": "0.5.4", + "@univerjs/engine-formula": "0.5.4", + "@univerjs/engine-render": "0.5.4", + "@univerjs/facade": "0.5.4", + "@univerjs/sheets": "0.5.4", + "@univerjs/sheets-formula": "0.5.4", + "@univerjs/sheets-ui": "0.5.4", + "@univerjs/thread-comment": "0.5.4", + "@univerjs/ui": "0.5.4", + "@vueuse/core": "12.4.0", + "axios": "1.7.9", "codemirror": "6.0.1", "dayjs": "1.11.13", - "echarts": "5.5.1", + "echarts": "5.6.0", "exceljs": "4.4.0", "file-saver": "2.0.5", "luckyexcel": "1.0.1", "mockjs": "1.1.0", - "node-sql-parser": "5.3.4", - "pinia": "2.2.6", - "platform-core": "8.2.33", - "quasar": "2.17.4", + "node-sql-parser": "5.3.6", + "pinia": "2.3.0", + "platform-core": "8.2.34", + "quasar": "2.17.6", "sort-array": "5.0.0", - "svg-path-commander": "2.1.5", + "svg-path-commander": "2.1.7", "vue": "3.5.13", "vue-dompurify-html": "5.2.0", - "vue-i18n": "10.0.4", + "vue-i18n": "11.0.1", "vue-router": "4.5.0", "xml-formatter": "3.6.3" } diff --git a/io.sc.platform.util/src/main/java/io/sc/platform/util/ArrayUtil.java b/io.sc.platform.util/src/main/java/io/sc/platform/util/ArrayUtil.java index a4465a71..c670cf0a 100644 --- a/io.sc.platform.util/src/main/java/io/sc/platform/util/ArrayUtil.java +++ b/io.sc.platform.util/src/main/java/io/sc/platform/util/ArrayUtil.java @@ -1,105 +1,137 @@ package io.sc.platform.util; +import java.util.Date; + public class ArrayUtil { /** * 获取数组是否含有元素 + * * @param arrays 数组对象 * @return 数组是否含有元素 */ - public static boolean hasElements(boolean[] arrays){ - if(arrays==null){ return false; } - return arrays.length>0; + public static boolean hasElements(boolean[] arrays) { + if (arrays == null) { + return false; + } + return arrays.length > 0; } /** * 获取数组是否含有元素 + * * @param arrays 数组对象 * @return 数组是否含有元素 */ - public static boolean hasElements(byte[] arrays){ - if(arrays==null){ return false; } - return arrays.length>0; + public static boolean hasElements(byte[] arrays) { + if (arrays == null) { + return false; + } + return arrays.length > 0; } /** * 获取数组是否含有元素 + * * @param arrays 数组对象 * @return 数组是否含有元素 */ - public static boolean hasElements(char[] arrays){ - if(arrays==null){ return false; } - return arrays.length>0; + public static boolean hasElements(char[] arrays) { + if (arrays == null) { + return false; + } + return arrays.length > 0; } /** * 获取数组是否含有元素 + * * @param arrays 数组对象 * @return 数组是否含有元素 */ - public static boolean hasElements(short[] arrays){ - if(arrays==null){ return false; } - return arrays.length>0; + public static boolean hasElements(short[] arrays) { + if (arrays == null) { + return false; + } + return arrays.length > 0; } /** * 获取数组是否含有元素 + * * @param arrays 数组对象 * @return 数组是否含有元素 */ - public static boolean hasElements(int[] arrays){ - if(arrays==null){ return false; } - return arrays.length>0; + public static boolean hasElements(int[] arrays) { + if (arrays == null) { + return false; + } + return arrays.length > 0; } /** * 获取数组是否含有元素 + * * @param arrays 数组对象 * @return 数组是否含有元素 */ - public static boolean hasElements(long[] arrays){ - if(arrays==null){ return false; } - return arrays.length>0; + public static boolean hasElements(long[] arrays) { + if (arrays == null) { + return false; + } + return arrays.length > 0; } /** * 获取数组是否含有元素 + * * @param arrays 数组对象 * @return 数组是否含有元素 */ - public static boolean hasElements(float[] arrays){ - if(arrays==null){ return false; } - return arrays.length>0; + public static boolean hasElements(float[] arrays) { + if (arrays == null) { + return false; + } + return arrays.length > 0; } /** * 获取数组是否含有元素 + * * @param arrays 数组对象 * @return 数组是否含有元素 */ - public static boolean hasElements(double[] arrays){ - if(arrays==null){ return false; } - return arrays.length>0; + public static boolean hasElements(double[] arrays) { + if (arrays == null) { + return false; + } + return arrays.length > 0; } /** * 获取数组是否含有元素 + * * @param arrays 数组对象 * @return 数组是否含有元素 */ - public static boolean hasElements(Object[] arrays){ - if(arrays==null){ return false; } - return arrays.length>0; + public static boolean hasElements(Object[] arrays) { + if (arrays == null) { + return false; + } + return arrays.length > 0; } /** * 获取数组中最大的元素 + * * @param arrays 数组对象 * @return 数组中最大的元素 */ - public static boolean max(boolean[] arrays){ - if(arrays==null){ throw new RuntimeException("parameter must NOT null"); } - for(boolean v : arrays){ - if(v){ + public static boolean max(boolean[] arrays) { + if (arrays == null) { + throw new RuntimeException("parameter must NOT null"); + } + for (boolean v : arrays) { + if (v) { return true; } } @@ -108,15 +140,18 @@ public class ArrayUtil { /** * 获取数组中最大的元素 + * * @param arrays 数组对象 * @return 数组中最大的元素 */ - public static byte max(byte[] arrays){ - if(arrays==null){ throw new RuntimeException("parameter must NOT null"); } - byte r =arrays[0]; - for(int i=1;ir){ - r =arrays[i]; + public static byte max(byte[] arrays) { + if (arrays == null) { + throw new RuntimeException("parameter must NOT null"); + } + byte r = arrays[0]; + for (int i = 1; i < arrays.length; i++) { + if (arrays[i] > r) { + r = arrays[i]; } } return r; @@ -124,15 +159,18 @@ public class ArrayUtil { /** * 获取数组中最大的元素 + * * @param arrays 数组对象 * @return 数组中最大的元素 */ - public static char max(char[] arrays){ - if(arrays==null){ throw new RuntimeException("parameter must NOT null"); } - char r =arrays[0]; - for(int i=1;ir){ - r =arrays[i]; + public static char max(char[] arrays) { + if (arrays == null) { + throw new RuntimeException("parameter must NOT null"); + } + char r = arrays[0]; + for (int i = 1; i < arrays.length; i++) { + if (arrays[i] > r) { + r = arrays[i]; } } return r; @@ -140,15 +178,18 @@ public class ArrayUtil { /** * 获取数组中最大的元素 + * * @param arrays 数组对象 * @return 数组中最大的元素 */ - public static short max(short[] arrays){ - if(arrays==null){ throw new RuntimeException("parameter must NOT null"); } - short r =arrays[0]; - for(int i=1;ir){ - r =arrays[i]; + public static short max(short[] arrays) { + if (arrays == null) { + throw new RuntimeException("parameter must NOT null"); + } + short r = arrays[0]; + for (int i = 1; i < arrays.length; i++) { + if (arrays[i] > r) { + r = arrays[i]; } } return r; @@ -156,15 +197,18 @@ public class ArrayUtil { /** * 获取数组中最大的元素 + * * @param arrays 数组对象 * @return 数组中最大的元素 */ - public static int max(int[] arrays){ - if(arrays==null){ throw new RuntimeException("parameter must NOT null"); } - int r =arrays[0]; - for(int i=1;ir){ - r =arrays[i]; + public static int max(int[] arrays) { + if (arrays == null) { + throw new RuntimeException("parameter must NOT null"); + } + int r = arrays[0]; + for (int i = 1; i < arrays.length; i++) { + if (arrays[i] > r) { + r = arrays[i]; } } return r; @@ -172,15 +216,18 @@ public class ArrayUtil { /** * 获取数组中最大的元素 + * * @param arrays 数组对象 * @return 数组中最大的元素 */ - public static long max(long[] arrays){ - if(arrays==null){ throw new RuntimeException("parameter must NOT null"); } - long r =arrays[0]; - for(int i=1;ir){ - r =arrays[i]; + public static long max(long[] arrays) { + if (arrays == null) { + throw new RuntimeException("parameter must NOT null"); + } + long r = arrays[0]; + for (int i = 1; i < arrays.length; i++) { + if (arrays[i] > r) { + r = arrays[i]; } } return r; @@ -188,15 +235,18 @@ public class ArrayUtil { /** * 获取数组中最大的元素 + * * @param arrays 数组对象 * @return 数组中最大的元素 */ - public static float max(float[] arrays){ - if(arrays==null){ throw new RuntimeException("parameter must NOT null"); } - float r =arrays[0]; - for(int i=1;ir){ - r =arrays[i]; + public static float max(float[] arrays) { + if (arrays == null) { + throw new RuntimeException("parameter must NOT null"); + } + float r = arrays[0]; + for (int i = 1; i < arrays.length; i++) { + if (arrays[i] > r) { + r = arrays[i]; } } return r; @@ -204,15 +254,18 @@ public class ArrayUtil { /** * 获取数组中最大的元素 + * * @param arrays 数组对象 * @return 数组中最大的元素 */ - public static double max(double[] arrays){ - if(arrays==null){ throw new RuntimeException("parameter must NOT null"); } - double r =arrays[0]; - for(int i=1;ir){ - r =arrays[i]; + public static double max(double[] arrays) { + if (arrays == null) { + throw new RuntimeException("parameter must NOT null"); + } + double r = arrays[0]; + for (int i = 1; i < arrays.length; i++) { + if (arrays[i] > r) { + r = arrays[i]; } } return r; @@ -220,118 +273,134 @@ public class ArrayUtil { /** * 获取数组中最大的元素 + * * @param arrays 数组对象 * @return 数组中最大的元素 */ - public static Comparable max(Comparable[] arrays){ - if(arrays==null){ return null; } - Comparable r =arrays[0]; - for(int i=1;i0){ - r =arrays[i]; + public static Comparable max(Comparable[] arrays) { + if (arrays == null) { + return null; + } + Comparable r = arrays[0]; + for (int i = 1; i < arrays.length; i++) { + if (arrays[i].compareTo(r) > 0) { + r = arrays[i]; } } return r; } - - - - - - public static boolean min(boolean[] arrays){ - if(arrays==null){ throw new RuntimeException("parameter must NOT null"); } - for(boolean v : arrays){ - if(!v){ + public static boolean min(boolean[] arrays) { + if (arrays == null) { + throw new RuntimeException("parameter must NOT null"); + } + for (boolean v : arrays) { + if (!v) { return false; } } return true; } - public static byte min(byte[] arrays){ - if(arrays==null){ throw new RuntimeException("parameter must NOT null"); } - byte r =arrays[0]; - for(int i=1;i=7" }, "devDependencies": { - "sass": "1.81.0", - "sass-loader": "16.0.3", + "sass": "1.83.4", + "sass-loader": "16.0.4", "vue-loader": "17.4.2", "platform-core": "8.1.385", "@vuepress/bundler-webpack": "2.0.0-rc.15", @@ -28,6 +28,6 @@ }, "dependencies": { "vue": "3.5.13", - "platform-core": "8.2.33" + "platform-core": "8.2.34" } } \ No newline at end of file