diff --git a/erm.frontend/.npmrc b/erm.frontend/.npmrc index f0873d2e..ac3953c7 100644 --- a/erm.frontend/.npmrc +++ b/erm.frontend/.npmrc @@ -1,6 +1,5 @@ # npm 仓库地址, 在 npm install 时使用 registry=http://nexus.sc.io:8000/repository/npm-public/ -#registry=https://registry.npm.taobao.org/ # 用户邮箱 email= diff --git a/erm.frontend/package.json b/erm.frontend/package.json index 371ca4bc..f915be22 100644 --- a/erm.frontend/package.json +++ b/erm.frontend/package.json @@ -1,6 +1,6 @@ { "name": "erm.frontend", - "version": "8.2.9", + "version": "8.2.10", "description": "", "private": false, "keywords": [], @@ -111,7 +111,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.34", + "platform-core": "8.2.37", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/erm.frontend/src/boostrap.ts b/erm.frontend/src/boostrap.ts index 851eb564..31a30449 100644 --- a/erm.frontend/src/boostrap.ts +++ b/erm.frontend/src/boostrap.ts @@ -18,7 +18,7 @@ import 'tailwindcss/utilities.css'; // 设置远程组件加载器 // 覆盖 platform-core 包中的 remoteComponentLoader 函数 -// 只有在主前端项目中编写如下的 remoteComponentLoader 函数才能实现 webpack MF 的 shared 功能 +// 只有在主前端项目中编写如下的 remoteComponentLoader 函数才能实现 webpack Module Federation 的 shared 功能 ComponentManager.setRemoteComponentLoader((moduleName: string, componentName: string): any => { return async () => { await __webpack_init_sharing__('default'); diff --git a/gradle.properties b/gradle.properties index acc676a4..39e4006f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -39,9 +39,9 @@ application_version=1.0.0 # platform ######################################gra##################### platform_group=io.sc -platform_version=8.2.9 -platform_plugin_version=8.2.9 -platform_core_frontend_version=8.2.34 +platform_version=8.2.10 +platform_plugin_version=8.2.10 +platform_core_frontend_version=8.2.37 ########################################################### # dependencies version @@ -71,7 +71,7 @@ jjwt_version=0.9.1 jxls_jexcel_version=1.0.7 jxls_poi_version=1.0.15 jxls_version=2.4.6 -mybatis_version=3.5.10 +mybatis_version=3.0.4 nimbusds_version=9.22 opencsv_version=5.7.1 oshi_version=6.6.1 diff --git a/io.sc.engine.mv.frontend/.npmrc b/io.sc.engine.mv.frontend/.npmrc index f0873d2e..ac3953c7 100644 --- a/io.sc.engine.mv.frontend/.npmrc +++ b/io.sc.engine.mv.frontend/.npmrc @@ -1,6 +1,5 @@ # npm 仓库地址, 在 npm install 时使用 registry=http://nexus.sc.io:8000/repository/npm-public/ -#registry=https://registry.npm.taobao.org/ # 用户邮箱 email= diff --git a/io.sc.engine.mv.frontend/package.json b/io.sc.engine.mv.frontend/package.json index 636b4445..657682cf 100644 --- a/io.sc.engine.mv.frontend/package.json +++ b/io.sc.engine.mv.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.engine.mv.frontend", - "version": "8.2.9", + "version": "8.2.10", "description": "", "private": false, "keywords": [], @@ -111,7 +111,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.34", + "platform-core": "8.2.37", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.engine.mv.frontend/src/boostrap.ts b/io.sc.engine.mv.frontend/src/boostrap.ts index 851eb564..31a30449 100644 --- a/io.sc.engine.mv.frontend/src/boostrap.ts +++ b/io.sc.engine.mv.frontend/src/boostrap.ts @@ -18,7 +18,7 @@ import 'tailwindcss/utilities.css'; // 设置远程组件加载器 // 覆盖 platform-core 包中的 remoteComponentLoader 函数 -// 只有在主前端项目中编写如下的 remoteComponentLoader 函数才能实现 webpack MF 的 shared 功能 +// 只有在主前端项目中编写如下的 remoteComponentLoader 函数才能实现 webpack Module Federation 的 shared 功能 ComponentManager.setRemoteComponentLoader((moduleName: string, componentName: string): any => { return async () => { await __webpack_init_sharing__('default'); diff --git a/io.sc.engine.rule.frontend/.npmrc b/io.sc.engine.rule.frontend/.npmrc index f0873d2e..ac3953c7 100644 --- a/io.sc.engine.rule.frontend/.npmrc +++ b/io.sc.engine.rule.frontend/.npmrc @@ -1,6 +1,5 @@ # npm 仓库地址, 在 npm install 时使用 registry=http://nexus.sc.io:8000/repository/npm-public/ -#registry=https://registry.npm.taobao.org/ # 用户邮箱 email= diff --git a/io.sc.engine.rule.frontend/package.json b/io.sc.engine.rule.frontend/package.json index e8e91ffa..3f2f0d9f 100644 --- a/io.sc.engine.rule.frontend/package.json +++ b/io.sc.engine.rule.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.engine.rule.frontend", - "version": "8.2.9", + "version": "8.2.10", "description": "", "private": false, "keywords": [], @@ -111,7 +111,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.34", + "platform-core": "8.2.37", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.engine.rule.frontend/src/boostrap.ts b/io.sc.engine.rule.frontend/src/boostrap.ts index 851eb564..31a30449 100644 --- a/io.sc.engine.rule.frontend/src/boostrap.ts +++ b/io.sc.engine.rule.frontend/src/boostrap.ts @@ -18,7 +18,7 @@ import 'tailwindcss/utilities.css'; // 设置远程组件加载器 // 覆盖 platform-core 包中的 remoteComponentLoader 函数 -// 只有在主前端项目中编写如下的 remoteComponentLoader 函数才能实现 webpack MF 的 shared 功能 +// 只有在主前端项目中编写如下的 remoteComponentLoader 函数才能实现 webpack Module Federation 的 shared 功能 ComponentManager.setRemoteComponentLoader((moduleName: string, componentName: string): any => { return async () => { await __webpack_init_sharing__('default'); diff --git a/io.sc.engine.st.frontend/.npmrc b/io.sc.engine.st.frontend/.npmrc index f0873d2e..ac3953c7 100644 --- a/io.sc.engine.st.frontend/.npmrc +++ b/io.sc.engine.st.frontend/.npmrc @@ -1,6 +1,5 @@ # npm 仓库地址, 在 npm install 时使用 registry=http://nexus.sc.io:8000/repository/npm-public/ -#registry=https://registry.npm.taobao.org/ # 用户邮箱 email= diff --git a/io.sc.engine.st.frontend/package.json b/io.sc.engine.st.frontend/package.json index a24b352c..72307db8 100644 --- a/io.sc.engine.st.frontend/package.json +++ b/io.sc.engine.st.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.engine.st.frontend", - "version": "8.2.9", + "version": "8.2.10", "description": "", "private": false, "keywords": [], @@ -111,7 +111,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.34", + "platform-core": "8.2.37", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.engine.st.frontend/src/boostrap.ts b/io.sc.engine.st.frontend/src/boostrap.ts index 851eb564..31a30449 100644 --- a/io.sc.engine.st.frontend/src/boostrap.ts +++ b/io.sc.engine.st.frontend/src/boostrap.ts @@ -18,7 +18,7 @@ import 'tailwindcss/utilities.css'; // 设置远程组件加载器 // 覆盖 platform-core 包中的 remoteComponentLoader 函数 -// 只有在主前端项目中编写如下的 remoteComponentLoader 函数才能实现 webpack MF 的 shared 功能 +// 只有在主前端项目中编写如下的 remoteComponentLoader 函数才能实现 webpack Module Federation 的 shared 功能 ComponentManager.setRemoteComponentLoader((moduleName: string, componentName: string): any => { return async () => { await __webpack_init_sharing__('default'); diff --git a/io.sc.platform.core.frontend/package.json b/io.sc.platform.core.frontend/package.json index af295dee..b5a09d3b 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.34", + "version": "8.2.37", "description": "前端核心包,用于快速构建前端的脚手架", "//main": "库的主文件", "main": "dist/platform-core.js", diff --git a/io.sc.platform.core.frontend/src/boostrap.ts b/io.sc.platform.core.frontend/src/boostrap.ts index 14a71469..85d1067a 100644 --- a/io.sc.platform.core.frontend/src/boostrap.ts +++ b/io.sc.platform.core.frontend/src/boostrap.ts @@ -18,7 +18,7 @@ import App from './App.vue'; // 设置远程组件加载器 // 覆盖 platform-core 包中的 remoteComponentLoader 函数 -// 只有在主前端项目中编写如下的 remoteComponentLoader 函数才能实现 webpack MF 的 shared 功能 +// 只有在主前端项目中编写如下的 remoteComponentLoader 函数才能实现 webpack Module Federation 的 shared 功能 ComponentManager.setRemoteComponentLoader((moduleName: string, componentName: string): any => { return async () => { await __webpack_init_sharing__('default'); diff --git a/io.sc.platform.core.frontend/template-project/.npmrc b/io.sc.platform.core.frontend/template-project/.npmrc index f0873d2e..ac3953c7 100644 --- a/io.sc.platform.core.frontend/template-project/.npmrc +++ b/io.sc.platform.core.frontend/template-project/.npmrc @@ -1,6 +1,5 @@ # npm 仓库地址, 在 npm install 时使用 registry=http://nexus.sc.io:8000/repository/npm-public/ -#registry=https://registry.npm.taobao.org/ # 用户邮箱 email= diff --git a/io.sc.platform.core.frontend/template-project/package.json b/io.sc.platform.core.frontend/template-project/package.json index 19caa731..ef0b489c 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.34", + "version": "8.2.37", "description": "前端核心包,用于快速构建前端的脚手架", "private": false, "keywords": [], @@ -110,7 +110,7 @@ "mockjs": "1.1.0", "node-sql-parser": "5.3.6", "pinia": "2.3.0", - "platform-core": "8.2.34", + "platform-core": "8.2.37", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.core.frontend/template-project/src/boostrap.ts b/io.sc.platform.core.frontend/template-project/src/boostrap.ts index 851eb564..31a30449 100644 --- a/io.sc.platform.core.frontend/template-project/src/boostrap.ts +++ b/io.sc.platform.core.frontend/template-project/src/boostrap.ts @@ -18,7 +18,7 @@ import 'tailwindcss/utilities.css'; // 设置远程组件加载器 // 覆盖 platform-core 包中的 remoteComponentLoader 函数 -// 只有在主前端项目中编写如下的 remoteComponentLoader 函数才能实现 webpack MF 的 shared 功能 +// 只有在主前端项目中编写如下的 remoteComponentLoader 函数才能实现 webpack Module Federation 的 shared 功能 ComponentManager.setRemoteComponentLoader((moduleName: string, componentName: string): any => { return async () => { await __webpack_init_sharing__('default'); diff --git a/io.sc.platform.core.frontend/template-project/src/views/likm/Grid.vue b/io.sc.platform.core.frontend/template-project/src/views/likm/Grid.vue index e9cae36c..9c384f76 100644 --- a/io.sc.platform.core.frontend/template-project/src/views/likm/Grid.vue +++ b/io.sc.platform.core.frontend/template-project/src/views/likm/Grid.vue @@ -1,70 +1,76 @@ - diff --git a/io.sc.platform.core.frontend/template-project/src/views/likm/QuasarGrid.vue b/io.sc.platform.core.frontend/template-project/src/views/likm/QuasarGrid.vue index 16d8855d..c04d1a41 100644 --- a/io.sc.platform.core.frontend/template-project/src/views/likm/QuasarGrid.vue +++ b/io.sc.platform.core.frontend/template-project/src/views/likm/QuasarGrid.vue @@ -1,69 +1,50 @@ diff --git a/io.sc.platform.core.frontend/template-project/src/views/likm/TreeGrid.vue b/io.sc.platform.core.frontend/template-project/src/views/likm/TreeGrid.vue index 819c76a1..4b327424 100644 --- a/io.sc.platform.core.frontend/template-project/src/views/likm/TreeGrid.vue +++ b/io.sc.platform.core.frontend/template-project/src/views/likm/TreeGrid.vue @@ -3,10 +3,11 @@ diff --git a/io.sc.platform.core.frontend/template-project/src/views/testcase/code-mirror/AutoCompletionManager.ts b/io.sc.platform.core.frontend/template-project/src/views/testcase/code-mirror/AutoCompletionManager.ts index c2950e69..4da8fb5f 100644 --- a/io.sc.platform.core.frontend/template-project/src/views/testcase/code-mirror/AutoCompletionManager.ts +++ b/io.sc.platform.core.frontend/template-project/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/template-project/src/views/testcase/code-mirror/code-mirror.vue b/io.sc.platform.core.frontend/template-project/src/views/testcase/code-mirror/code-mirror.vue index 33bc801a..077d5c9a 100644 --- a/io.sc.platform.core.frontend/template-project/src/views/testcase/code-mirror/code-mirror.vue +++ b/io.sc.platform.core.frontend/template-project/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.developer.doc/.npmrc b/io.sc.platform.developer.doc/.npmrc index f0873d2e..ac3953c7 100644 --- a/io.sc.platform.developer.doc/.npmrc +++ b/io.sc.platform.developer.doc/.npmrc @@ -1,6 +1,5 @@ # npm 仓库地址, 在 npm install 时使用 registry=http://nexus.sc.io:8000/repository/npm-public/ -#registry=https://registry.npm.taobao.org/ # 用户邮箱 email= diff --git a/io.sc.platform.developer.doc/package.json b/io.sc.platform.developer.doc/package.json index 1a8eb8fc..d1151fc5 100644 --- a/io.sc.platform.developer.doc/package.json +++ b/io.sc.platform.developer.doc/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.platform.developer.doc", - "version": "8.2.9", + "version": "8.2.10", "description": "", "main": "index.js", "scripts": { @@ -28,7 +28,7 @@ "vuepress": "2.0.0-rc.15" }, "dependencies": { - "platform-core": "8.2.34", + "platform-core": "8.2.37", "quasar": "2.17.6", "vue": "3.5.13", "vue-i18n": "11.0.1" diff --git a/io.sc.platform.developer.frontend/.npmrc b/io.sc.platform.developer.frontend/.npmrc index f0873d2e..ac3953c7 100644 --- a/io.sc.platform.developer.frontend/.npmrc +++ b/io.sc.platform.developer.frontend/.npmrc @@ -1,6 +1,5 @@ # npm 仓库地址, 在 npm install 时使用 registry=http://nexus.sc.io:8000/repository/npm-public/ -#registry=https://registry.npm.taobao.org/ # 用户邮箱 email= diff --git a/io.sc.platform.developer.frontend/package.json b/io.sc.platform.developer.frontend/package.json index 89b7ac37..62f0ae2c 100644 --- a/io.sc.platform.developer.frontend/package.json +++ b/io.sc.platform.developer.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.platform.developer.frontend", - "version": "8.2.9", + "version": "8.2.10", "description": "", "private": false, "keywords": [], @@ -111,7 +111,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.34", + "platform-core": "8.2.37", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.developer.frontend/src/boostrap.ts b/io.sc.platform.developer.frontend/src/boostrap.ts index 851eb564..31a30449 100644 --- a/io.sc.platform.developer.frontend/src/boostrap.ts +++ b/io.sc.platform.developer.frontend/src/boostrap.ts @@ -18,7 +18,7 @@ import 'tailwindcss/utilities.css'; // 设置远程组件加载器 // 覆盖 platform-core 包中的 remoteComponentLoader 函数 -// 只有在主前端项目中编写如下的 remoteComponentLoader 函数才能实现 webpack MF 的 shared 功能 +// 只有在主前端项目中编写如下的 remoteComponentLoader 函数才能实现 webpack Module Federation 的 shared 功能 ComponentManager.setRemoteComponentLoader((moduleName: string, componentName: string): any => { return async () => { await __webpack_init_sharing__('default'); diff --git a/io.sc.platform.gradle/templates/pgp/setup/gradle.properties b/io.sc.platform.gradle/templates/pgp/setup/gradle.properties index acc676a4..39e4006f 100644 --- a/io.sc.platform.gradle/templates/pgp/setup/gradle.properties +++ b/io.sc.platform.gradle/templates/pgp/setup/gradle.properties @@ -39,9 +39,9 @@ application_version=1.0.0 # platform ######################################gra##################### platform_group=io.sc -platform_version=8.2.9 -platform_plugin_version=8.2.9 -platform_core_frontend_version=8.2.34 +platform_version=8.2.10 +platform_plugin_version=8.2.10 +platform_core_frontend_version=8.2.37 ########################################################### # dependencies version @@ -71,7 +71,7 @@ jjwt_version=0.9.1 jxls_jexcel_version=1.0.7 jxls_poi_version=1.0.15 jxls_version=2.4.6 -mybatis_version=3.5.10 +mybatis_version=3.0.4 nimbusds_version=9.22 opencsv_version=5.7.1 oshi_version=6.6.1 diff --git a/io.sc.platform.jdbc.liquibase/build.gradle b/io.sc.platform.jdbc.liquibase/build.gradle index 7354f98c..911ff22b 100644 --- a/io.sc.platform.jdbc.liquibase/build.gradle +++ b/io.sc.platform.jdbc.liquibase/build.gradle @@ -1,5 +1,6 @@ dependencies { api( + project(":io.sc.platform.csv"), project(":io.sc.platform.jdbc"), "org.liquibase:liquibase-core", diff --git a/io.sc.platform.jdbc.liquibase/src/main/java/io/sc/platform/jdbc/liquibase/importer/LiquibaseDataCsvImporter.java b/io.sc.platform.jdbc.liquibase/src/main/java/io/sc/platform/jdbc/liquibase/importer/LiquibaseDataCsvImporter.java index 2cb8dceb..ee1660dd 100644 --- a/io.sc.platform.jdbc.liquibase/src/main/java/io/sc/platform/jdbc/liquibase/importer/LiquibaseDataCsvImporter.java +++ b/io.sc.platform.jdbc.liquibase/src/main/java/io/sc/platform/jdbc/liquibase/importer/LiquibaseDataCsvImporter.java @@ -1,37 +1,20 @@ package io.sc.platform.jdbc.liquibase.importer; -import io.sc.platform.core.DirectoryManager; import io.sc.platform.core.Environment; import io.sc.platform.core.enums.ProgressStatus; import io.sc.platform.core.support.ProgressInfo; -import io.sc.platform.core.util.*; -import io.sc.platform.jdbc.exporter.DataExporter; -import io.sc.platform.jdbc.exporter.support.DataExportConfigure; import io.sc.platform.jdbc.exporter.support.DataImportConfigure; -import io.sc.platform.jdbc.exporter.support.ExportTable; import io.sc.platform.jdbc.importer.DataImporter; -import io.sc.platform.jdbc.liquibase.exporter.support.ParentChildRecord; import io.sc.platform.jdbc.liquibase.task.CsvImportTaskChange; -import io.sc.platform.jdbc.meta.MetaDataLoader; -import io.sc.platform.jdbc.meta.support.Column; -import io.sc.platform.jdbc.meta.support.Table; -import io.sc.platform.jdbc.util.SqlTypeUtil; import liquibase.database.jvm.JdbcConnection; -import liquibase.repackaged.com.opencsv.CSVReader; -import liquibase.repackaged.com.opencsv.CSVReaderBuilder; -import liquibase.repackaged.com.opencsv.CSVWriterBuilder; -import liquibase.repackaged.com.opencsv.ICSVWriter; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.jdbc.datasource.DataSourceUtils; import org.springframework.web.multipart.MultipartFile; import javax.sql.DataSource; -import java.io.*; -import java.sql.*; +import java.io.BufferedReader; +import java.io.InputStreamReader; import java.util.Date; -import java.util.*; -import java.util.stream.Collectors; +import java.util.List; +import java.util.Locale; public class LiquibaseDataCsvImporter implements DataImporter { @Override @@ -52,20 +35,4 @@ public class LiquibaseDataCsvImporter implements DataImporter { jdbcConnection.close(); } } - - public static void main(String[] args) throws FileNotFoundException, UnsupportedEncodingException { - File file =new File("/Users/wangshaoping/wspsc/workspace/wangshaoping/v8/platform/io.sc.platform.jdbc.liquibase/src/main/resources/sys_rpt_excel_tpl.csv"); - BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(new FileInputStream(file), Environment.DEFAULT_CHARSET_NAME)); - CSVReader csvReader = new CSVReaderBuilder(bufferedReader).build(); - Iterator iterator = csvReader.iterator(); - - while(iterator.hasNext()){ - String[] data =iterator.next(); - //System.out.println(data[i]); - //TypeConvertor.getValue(data[i],Timestamp.class,null); - - System.out.println(data[4]); - //System.out.println(Arrays.toString(data)); - } - } } diff --git a/io.sc.platform.jdbc.liquibase/src/main/java/io/sc/platform/jdbc/liquibase/task/CsvImportTaskChange.java b/io.sc.platform.jdbc.liquibase/src/main/java/io/sc/platform/jdbc/liquibase/task/CsvImportTaskChange.java index f4d4dfec..98595662 100644 --- a/io.sc.platform.jdbc.liquibase/src/main/java/io/sc/platform/jdbc/liquibase/task/CsvImportTaskChange.java +++ b/io.sc.platform.jdbc.liquibase/src/main/java/io/sc/platform/jdbc/liquibase/task/CsvImportTaskChange.java @@ -1,5 +1,7 @@ package io.sc.platform.jdbc.liquibase.task; +import com.opencsv.CSVReader; +import com.opencsv.CSVReaderBuilder; import io.sc.platform.core.Environment; import io.sc.platform.jdbc.meta.support.Column; import io.sc.platform.jdbc.meta.support.Table; @@ -14,8 +16,6 @@ import liquibase.database.jvm.JdbcConnection; import liquibase.exception.CustomChangeException; import liquibase.exception.SetupException; import liquibase.exception.ValidationErrors; -import liquibase.repackaged.com.opencsv.CSVReader; -import liquibase.repackaged.com.opencsv.CSVReaderBuilder; import liquibase.resource.ResourceAccessor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/util/SqlTypeUtil.java b/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/util/SqlTypeUtil.java index 6cbc0f33..042d9f98 100644 --- a/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/util/SqlTypeUtil.java +++ b/io.sc.platform.jdbc/src/main/java/io/sc/platform/jdbc/util/SqlTypeUtil.java @@ -1,23 +1,12 @@ package io.sc.platform.jdbc.util; +import org.springframework.util.StringUtils; + import java.math.BigDecimal; -import java.sql.Blob; -import java.sql.Clob; -import java.sql.Connection; -import java.sql.Date; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.sql.SQLXML; -import java.sql.Time; -import java.sql.Timestamp; -import java.sql.Types; +import java.sql.*; import java.text.ParseException; import java.util.Base64; -import javax.xml.bind.DatatypeConverter; - -import org.springframework.util.StringUtils; - /** * JDBC 字段类型和 java 类之间的转换 */ @@ -166,10 +155,10 @@ public class SqlTypeUtil { case Types.BINARY: case Types.VARBINARY: case Types.LONGVARBINARY: - return DatatypeConverter.parseBase64Binary(value); + return Base64.getDecoder().decode(value); case Types.BLOB: Blob blob =connection.createBlob(); - byte[] bytes =DatatypeConverter.parseBase64Binary(value); + byte[] bytes =Base64.getDecoder().decode(value); blob.setBytes(1,bytes); return blob; case Types.CLOB: diff --git a/io.sc.platform.lcdp.frontend/.npmrc b/io.sc.platform.lcdp.frontend/.npmrc index f0873d2e..ac3953c7 100644 --- a/io.sc.platform.lcdp.frontend/.npmrc +++ b/io.sc.platform.lcdp.frontend/.npmrc @@ -1,6 +1,5 @@ # npm 仓库地址, 在 npm install 时使用 registry=http://nexus.sc.io:8000/repository/npm-public/ -#registry=https://registry.npm.taobao.org/ # 用户邮箱 email= diff --git a/io.sc.platform.lcdp.frontend/package.json b/io.sc.platform.lcdp.frontend/package.json index 879d4c3b..9dae606f 100644 --- a/io.sc.platform.lcdp.frontend/package.json +++ b/io.sc.platform.lcdp.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.platform.lcdp.frontend", - "version": "8.2.9", + "version": "8.2.10", "description": "", "private": false, "keywords": [], @@ -111,7 +111,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.34", + "platform-core": "8.2.37", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.lcdp.frontend/src/boostrap.ts b/io.sc.platform.lcdp.frontend/src/boostrap.ts index 851eb564..31a30449 100644 --- a/io.sc.platform.lcdp.frontend/src/boostrap.ts +++ b/io.sc.platform.lcdp.frontend/src/boostrap.ts @@ -18,7 +18,7 @@ import 'tailwindcss/utilities.css'; // 设置远程组件加载器 // 覆盖 platform-core 包中的 remoteComponentLoader 函数 -// 只有在主前端项目中编写如下的 remoteComponentLoader 函数才能实现 webpack MF 的 shared 功能 +// 只有在主前端项目中编写如下的 remoteComponentLoader 函数才能实现 webpack Module Federation 的 shared 功能 ComponentManager.setRemoteComponentLoader((moduleName: string, componentName: string): any => { return async () => { await __webpack_init_sharing__('default'); diff --git a/io.sc.platform.license.keygen.frontend/.npmrc b/io.sc.platform.license.keygen.frontend/.npmrc index f0873d2e..ac3953c7 100644 --- a/io.sc.platform.license.keygen.frontend/.npmrc +++ b/io.sc.platform.license.keygen.frontend/.npmrc @@ -1,6 +1,5 @@ # npm 仓库地址, 在 npm install 时使用 registry=http://nexus.sc.io:8000/repository/npm-public/ -#registry=https://registry.npm.taobao.org/ # 用户邮箱 email= diff --git a/io.sc.platform.license.keygen.frontend/package.json b/io.sc.platform.license.keygen.frontend/package.json index 53018d8c..806209ed 100644 --- a/io.sc.platform.license.keygen.frontend/package.json +++ b/io.sc.platform.license.keygen.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.platform.license.keygen.frontend", - "version": "8.2.9", + "version": "8.2.10", "description": "", "private": false, "keywords": [], @@ -111,7 +111,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.34", + "platform-core": "8.2.37", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.license.keygen.frontend/src/boostrap.ts b/io.sc.platform.license.keygen.frontend/src/boostrap.ts index 851eb564..31a30449 100644 --- a/io.sc.platform.license.keygen.frontend/src/boostrap.ts +++ b/io.sc.platform.license.keygen.frontend/src/boostrap.ts @@ -18,7 +18,7 @@ import 'tailwindcss/utilities.css'; // 设置远程组件加载器 // 覆盖 platform-core 包中的 remoteComponentLoader 函数 -// 只有在主前端项目中编写如下的 remoteComponentLoader 函数才能实现 webpack MF 的 shared 功能 +// 只有在主前端项目中编写如下的 remoteComponentLoader 函数才能实现 webpack Module Federation 的 shared 功能 ComponentManager.setRemoteComponentLoader((moduleName: string, componentName: string): any => { return async () => { await __webpack_init_sharing__('default'); diff --git a/io.sc.platform.mvc.frontend/.npmrc b/io.sc.platform.mvc.frontend/.npmrc index f0873d2e..ac3953c7 100644 --- a/io.sc.platform.mvc.frontend/.npmrc +++ b/io.sc.platform.mvc.frontend/.npmrc @@ -1,6 +1,5 @@ # npm 仓库地址, 在 npm install 时使用 registry=http://nexus.sc.io:8000/repository/npm-public/ -#registry=https://registry.npm.taobao.org/ # 用户邮箱 email= diff --git a/io.sc.platform.mvc.frontend/package.json b/io.sc.platform.mvc.frontend/package.json index c79b07dd..38de7ac3 100644 --- a/io.sc.platform.mvc.frontend/package.json +++ b/io.sc.platform.mvc.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.platform.mvc.frontend", - "version": "8.2.9", + "version": "8.2.10", "description": "", "private": false, "keywords": [], @@ -111,7 +111,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.34", + "platform-core": "8.2.37", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.mvc.frontend/src/boostrap.ts b/io.sc.platform.mvc.frontend/src/boostrap.ts index 851eb564..31a30449 100644 --- a/io.sc.platform.mvc.frontend/src/boostrap.ts +++ b/io.sc.platform.mvc.frontend/src/boostrap.ts @@ -18,7 +18,7 @@ import 'tailwindcss/utilities.css'; // 设置远程组件加载器 // 覆盖 platform-core 包中的 remoteComponentLoader 函数 -// 只有在主前端项目中编写如下的 remoteComponentLoader 函数才能实现 webpack MF 的 shared 功能 +// 只有在主前端项目中编写如下的 remoteComponentLoader 函数才能实现 webpack Module Federation 的 shared 功能 ComponentManager.setRemoteComponentLoader((moduleName: string, componentName: string): any => { return async () => { await __webpack_init_sharing__('default'); diff --git a/io.sc.platform.orm.mybatis/build.gradle b/io.sc.platform.orm.mybatis/build.gradle index dace4528..6e24ef6d 100644 --- a/io.sc.platform.orm.mybatis/build.gradle +++ b/io.sc.platform.orm.mybatis/build.gradle @@ -1,6 +1,6 @@ dependencies { api( project(":io.sc.platform.orm"), - "org.mybatis.spring.boot:mybatis-spring-boot-starter:2.3.2", + "org.mybatis.spring.boot:mybatis-spring-boot-starter:${mybatis_version}", ) } diff --git a/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/impl/DaoServiceImpl.java b/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/impl/DaoServiceImpl.java index 6569e5fc..9c1d826e 100644 --- a/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/impl/DaoServiceImpl.java +++ b/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/impl/DaoServiceImpl.java @@ -1,5 +1,6 @@ package io.sc.platform.orm.service.impl; +import com.beust.jcommander.internal.Lists; import io.sc.platform.core.Environment; import io.sc.platform.orm.entity.CorporationAuditorEntity; import io.sc.platform.orm.entity.DesensitizedEntity; @@ -14,6 +15,7 @@ import io.sc.platform.orm.service.support.criteria.impl.Equals; import io.sc.platform.orm.service.support.criteria.impl.IContains; import io.sc.platform.orm.service.support.criteria.impl.IsNull; import io.sc.platform.security.util.SecurityUtil; +import io.sc.platform.util.CollectionUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.core.convert.ConversionService; diff --git a/io.sc.platform.scheduler.manager.frontend/.npmrc b/io.sc.platform.scheduler.manager.frontend/.npmrc index f0873d2e..ac3953c7 100644 --- a/io.sc.platform.scheduler.manager.frontend/.npmrc +++ b/io.sc.platform.scheduler.manager.frontend/.npmrc @@ -1,6 +1,5 @@ # npm 仓库地址, 在 npm install 时使用 registry=http://nexus.sc.io:8000/repository/npm-public/ -#registry=https://registry.npm.taobao.org/ # 用户邮箱 email= diff --git a/io.sc.platform.scheduler.manager.frontend/package.json b/io.sc.platform.scheduler.manager.frontend/package.json index a96bc412..fd96efe3 100644 --- a/io.sc.platform.scheduler.manager.frontend/package.json +++ b/io.sc.platform.scheduler.manager.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.platform.scheduler.manager.frontend", - "version": "8.2.9", + "version": "8.2.10", "description": "", "private": false, "keywords": [], @@ -111,7 +111,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.34", + "platform-core": "8.2.37", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.scheduler.manager.frontend/src/boostrap.ts b/io.sc.platform.scheduler.manager.frontend/src/boostrap.ts index 851eb564..31a30449 100644 --- a/io.sc.platform.scheduler.manager.frontend/src/boostrap.ts +++ b/io.sc.platform.scheduler.manager.frontend/src/boostrap.ts @@ -18,7 +18,7 @@ import 'tailwindcss/utilities.css'; // 设置远程组件加载器 // 覆盖 platform-core 包中的 remoteComponentLoader 函数 -// 只有在主前端项目中编写如下的 remoteComponentLoader 函数才能实现 webpack MF 的 shared 功能 +// 只有在主前端项目中编写如下的 remoteComponentLoader 函数才能实现 webpack Module Federation 的 shared 功能 ComponentManager.setRemoteComponentLoader((moduleName: string, componentName: string): any => { return async () => { await __webpack_init_sharing__('default'); diff --git a/io.sc.platform.system.frontend/.npmrc b/io.sc.platform.system.frontend/.npmrc index f0873d2e..ac3953c7 100644 --- a/io.sc.platform.system.frontend/.npmrc +++ b/io.sc.platform.system.frontend/.npmrc @@ -1,6 +1,5 @@ # npm 仓库地址, 在 npm install 时使用 registry=http://nexus.sc.io:8000/repository/npm-public/ -#registry=https://registry.npm.taobao.org/ # 用户邮箱 email= diff --git a/io.sc.platform.system.frontend/package.json b/io.sc.platform.system.frontend/package.json index 98650ef9..c73d2869 100644 --- a/io.sc.platform.system.frontend/package.json +++ b/io.sc.platform.system.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.platform.system.frontend", - "version": "8.2.9", + "version": "8.2.10", "description": "", "private": false, "keywords": [], @@ -110,7 +110,7 @@ "mockjs": "1.1.0", "node-sql-parser": "5.3.6", "pinia": "2.3.0", - "platform-core": "8.2.34", + "platform-core": "8.2.37", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.system.frontend/src/boostrap.ts b/io.sc.platform.system.frontend/src/boostrap.ts index 851eb564..31a30449 100644 --- a/io.sc.platform.system.frontend/src/boostrap.ts +++ b/io.sc.platform.system.frontend/src/boostrap.ts @@ -18,7 +18,7 @@ import 'tailwindcss/utilities.css'; // 设置远程组件加载器 // 覆盖 platform-core 包中的 remoteComponentLoader 函数 -// 只有在主前端项目中编写如下的 remoteComponentLoader 函数才能实现 webpack MF 的 shared 功能 +// 只有在主前端项目中编写如下的 remoteComponentLoader 函数才能实现 webpack Module Federation 的 shared 功能 ComponentManager.setRemoteComponentLoader((moduleName: string, componentName: string): any => { return async () => { await __webpack_init_sharing__('default'); diff --git a/io.sc.platform.ws.cxf/gradle.properties b/io.sc.platform.ws.cxf/gradle.properties index 9ebe450c..e69de29b 100644 --- a/io.sc.platform.ws.cxf/gradle.properties +++ b/io.sc.platform.ws.cxf/gradle.properties @@ -1 +0,0 @@ -cxf_version=3.2.7 \ No newline at end of file diff --git a/io.sc.standard.frontend/.npmrc b/io.sc.standard.frontend/.npmrc index f0873d2e..ac3953c7 100644 --- a/io.sc.standard.frontend/.npmrc +++ b/io.sc.standard.frontend/.npmrc @@ -1,6 +1,5 @@ # npm 仓库地址, 在 npm install 时使用 registry=http://nexus.sc.io:8000/repository/npm-public/ -#registry=https://registry.npm.taobao.org/ # 用户邮箱 email= diff --git a/io.sc.standard.frontend/package.json b/io.sc.standard.frontend/package.json index d7d5b7f3..6e5f7279 100644 --- a/io.sc.standard.frontend/package.json +++ b/io.sc.standard.frontend/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.standard.frontend", - "version": "8.2.9", + "version": "8.2.10", "description": "", "private": false, "keywords": [], @@ -111,7 +111,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.34", + "platform-core": "8.2.37", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.standard.frontend/src/boostrap.ts b/io.sc.standard.frontend/src/boostrap.ts index 851eb564..31a30449 100644 --- a/io.sc.standard.frontend/src/boostrap.ts +++ b/io.sc.standard.frontend/src/boostrap.ts @@ -18,7 +18,7 @@ import 'tailwindcss/utilities.css'; // 设置远程组件加载器 // 覆盖 platform-core 包中的 remoteComponentLoader 函数 -// 只有在主前端项目中编写如下的 remoteComponentLoader 函数才能实现 webpack MF 的 shared 功能 +// 只有在主前端项目中编写如下的 remoteComponentLoader 函数才能实现 webpack Module Federation 的 shared 功能 ComponentManager.setRemoteComponentLoader((moduleName: string, componentName: string): any => { return async () => { await __webpack_init_sharing__('default'); diff --git a/io.sc.website/.npmrc b/io.sc.website/.npmrc index f0873d2e..ac3953c7 100644 --- a/io.sc.website/.npmrc +++ b/io.sc.website/.npmrc @@ -1,6 +1,5 @@ # npm 仓库地址, 在 npm install 时使用 registry=http://nexus.sc.io:8000/repository/npm-public/ -#registry=https://registry.npm.taobao.org/ # 用户邮箱 email= diff --git a/io.sc.website/package.json b/io.sc.website/package.json index 89717a89..20ec1659 100644 --- a/io.sc.website/package.json +++ b/io.sc.website/package.json @@ -1,6 +1,6 @@ { "name": "io.sc.website", - "version": "8.2.9", + "version": "8.2.10", "description": "", "main": "index.js", "scripts": { @@ -28,6 +28,6 @@ }, "dependencies": { "vue": "3.5.13", - "platform-core": "8.2.34" + "platform-core": "8.2.37" } } \ No newline at end of file