diff --git a/cips.frontend/package.json b/cips.frontend/package.json index 58def452..d7178929 100644 --- a/cips.frontend/package.json +++ b/cips.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.115", + "platform-core": "8.2.117", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/cips.frontend/webpack.config.common.cjs b/cips.frontend/webpack.config.common.cjs index c6e5e2a0..dbea8c35 100644 --- a/cips.frontend/webpack.config.common.cjs +++ b/cips.frontend/webpack.config.common.cjs @@ -22,7 +22,7 @@ module.exports = { // 2. 兼容多个前端项目: 每个项目发布到 public 目录下的唯一项目名称目录 path: path.resolve(__dirname, `dist/public/${projectName}`), // 输出文件名 - filename: `javascript/[name].[contenthash:6].js`, + filename: `javascript/[name].[contenthash:8].js`, // 指定发布路径，使用 auto 可具有更多灵活性 publicPath: 'auto', // 每次构建时，首先删除 output.path 目录所有内容，保证每次得到最新的构建结果 @@ -69,7 +69,7 @@ module.exports = { test: /\.(woff|woff2|eot|ttf|otf)(\?.*)?$/, type: 'asset/resource', generator: { - filename: `fonts/[name].[contenthash:6].[ext]`, + filename: `fonts/[name].[contenthash:8].[ext]`, }, }, @@ -123,8 +123,8 @@ module.exports = { // css 抽取插件 new MiniCssExtractPlugin({ - filename: `css/[name].[contenthash:6].css`, - chunkFilename: `css/[name].[contenthash:6].css`, + filename: `css/[name].[contenthash:8].css`, + chunkFilename: `css/[name].[contenthash:8].css`, }), // 自动生成静态 index.html 文件 diff --git a/erm.frontend/package.json b/erm.frontend/package.json index e27414c5..bbb62d67 100644 --- a/erm.frontend/package.json +++ b/erm.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.115", + "platform-core": "8.2.117", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/erm.frontend/webpack.config.common.cjs b/erm.frontend/webpack.config.common.cjs index c6e5e2a0..dbea8c35 100644 --- a/erm.frontend/webpack.config.common.cjs +++ b/erm.frontend/webpack.config.common.cjs @@ -22,7 +22,7 @@ module.exports = { // 2. 兼容多个前端项目: 每个项目发布到 public 目录下的唯一项目名称目录 path: path.resolve(__dirname, `dist/public/${projectName}`), // 输出文件名 - filename: `javascript/[name].[contenthash:6].js`, + filename: `javascript/[name].[contenthash:8].js`, // 指定发布路径，使用 auto 可具有更多灵活性 publicPath: 'auto', // 每次构建时，首先删除 output.path 目录所有内容，保证每次得到最新的构建结果 @@ -69,7 +69,7 @@ module.exports = { test: /\.(woff|woff2|eot|ttf|otf)(\?.*)?$/, type: 'asset/resource', generator: { - filename: `fonts/[name].[contenthash:6].[ext]`, + filename: `fonts/[name].[contenthash:8].[ext]`, }, }, @@ -123,8 +123,8 @@ module.exports = { // css 抽取插件 new MiniCssExtractPlugin({ - filename: `css/[name].[contenthash:6].css`, - chunkFilename: `css/[name].[contenthash:6].css`, + filename: `css/[name].[contenthash:8].css`, + chunkFilename: `css/[name].[contenthash:8].css`, }), // 自动生成静态 index.html 文件 diff --git a/gradle.properties b/gradle.properties index 72aab60c..721ac6f0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -37,9 +37,9 @@ application_version=1.0.0 # platform ########################################################### platform_group=io.sc -platform_version=8.2.28 +platform_version=8.2.30 platform_plugin_version=8.2.10 -platform_core_frontend_version=8.2.115 +platform_core_frontend_version=8.2.117 ########################################################### # dependencies version diff --git a/io.sc.engine.mv.frontend/package.json b/io.sc.engine.mv.frontend/package.json index 0a88a032..52ffc99f 100644 --- a/io.sc.engine.mv.frontend/package.json +++ b/io.sc.engine.mv.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.115", + "platform-core": "8.2.117", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.engine.mv.frontend/webpack.config.common.cjs b/io.sc.engine.mv.frontend/webpack.config.common.cjs index c6e5e2a0..dbea8c35 100644 --- a/io.sc.engine.mv.frontend/webpack.config.common.cjs +++ b/io.sc.engine.mv.frontend/webpack.config.common.cjs @@ -22,7 +22,7 @@ module.exports = { // 2. 兼容多个前端项目: 每个项目发布到 public 目录下的唯一项目名称目录 path: path.resolve(__dirname, `dist/public/${projectName}`), // 输出文件名 - filename: `javascript/[name].[contenthash:6].js`, + filename: `javascript/[name].[contenthash:8].js`, // 指定发布路径，使用 auto 可具有更多灵活性 publicPath: 'auto', // 每次构建时，首先删除 output.path 目录所有内容，保证每次得到最新的构建结果 @@ -69,7 +69,7 @@ module.exports = { test: /\.(woff|woff2|eot|ttf|otf)(\?.*)?$/, type: 'asset/resource', generator: { - filename: `fonts/[name].[contenthash:6].[ext]`, + filename: `fonts/[name].[contenthash:8].[ext]`, }, }, @@ -123,8 +123,8 @@ module.exports = { // css 抽取插件 new MiniCssExtractPlugin({ - filename: `css/[name].[contenthash:6].css`, - chunkFilename: `css/[name].[contenthash:6].css`, + filename: `css/[name].[contenthash:8].css`, + chunkFilename: `css/[name].[contenthash:8].css`, }), // 自动生成静态 index.html 文件 diff --git a/io.sc.engine.rule.frontend/package.json b/io.sc.engine.rule.frontend/package.json index d39dbbd0..84b95eb9 100644 --- a/io.sc.engine.rule.frontend/package.json +++ b/io.sc.engine.rule.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.115", + "platform-core": "8.2.117", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.engine.rule.frontend/webpack.config.common.cjs b/io.sc.engine.rule.frontend/webpack.config.common.cjs index c6e5e2a0..dbea8c35 100644 --- a/io.sc.engine.rule.frontend/webpack.config.common.cjs +++ b/io.sc.engine.rule.frontend/webpack.config.common.cjs @@ -22,7 +22,7 @@ module.exports = { // 2. 兼容多个前端项目: 每个项目发布到 public 目录下的唯一项目名称目录 path: path.resolve(__dirname, `dist/public/${projectName}`), // 输出文件名 - filename: `javascript/[name].[contenthash:6].js`, + filename: `javascript/[name].[contenthash:8].js`, // 指定发布路径，使用 auto 可具有更多灵活性 publicPath: 'auto', // 每次构建时，首先删除 output.path 目录所有内容，保证每次得到最新的构建结果 @@ -69,7 +69,7 @@ module.exports = { test: /\.(woff|woff2|eot|ttf|otf)(\?.*)?$/, type: 'asset/resource', generator: { - filename: `fonts/[name].[contenthash:6].[ext]`, + filename: `fonts/[name].[contenthash:8].[ext]`, }, }, @@ -123,8 +123,8 @@ module.exports = { // css 抽取插件 new MiniCssExtractPlugin({ - filename: `css/[name].[contenthash:6].css`, - chunkFilename: `css/[name].[contenthash:6].css`, + filename: `css/[name].[contenthash:8].css`, + chunkFilename: `css/[name].[contenthash:8].css`, }), // 自动生成静态 index.html 文件 diff --git a/io.sc.engine.st.frontend/package.json b/io.sc.engine.st.frontend/package.json index 5d7a7f7d..9fd812f0 100644 --- a/io.sc.engine.st.frontend/package.json +++ b/io.sc.engine.st.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.115", + "platform-core": "8.2.117", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.engine.st.frontend/webpack.config.common.cjs b/io.sc.engine.st.frontend/webpack.config.common.cjs index c6e5e2a0..dbea8c35 100644 --- a/io.sc.engine.st.frontend/webpack.config.common.cjs +++ b/io.sc.engine.st.frontend/webpack.config.common.cjs @@ -22,7 +22,7 @@ module.exports = { // 2. 兼容多个前端项目: 每个项目发布到 public 目录下的唯一项目名称目录 path: path.resolve(__dirname, `dist/public/${projectName}`), // 输出文件名 - filename: `javascript/[name].[contenthash:6].js`, + filename: `javascript/[name].[contenthash:8].js`, // 指定发布路径，使用 auto 可具有更多灵活性 publicPath: 'auto', // 每次构建时，首先删除 output.path 目录所有内容，保证每次得到最新的构建结果 @@ -69,7 +69,7 @@ module.exports = { test: /\.(woff|woff2|eot|ttf|otf)(\?.*)?$/, type: 'asset/resource', generator: { - filename: `fonts/[name].[contenthash:6].[ext]`, + filename: `fonts/[name].[contenthash:8].[ext]`, }, }, @@ -123,8 +123,8 @@ module.exports = { // css 抽取插件 new MiniCssExtractPlugin({ - filename: `css/[name].[contenthash:6].css`, - chunkFilename: `css/[name].[contenthash:6].css`, + filename: `css/[name].[contenthash:8].css`, + chunkFilename: `css/[name].[contenthash:8].css`, }), // 自动生成静态 index.html 文件 diff --git a/io.sc.platform.ai.frontend/package.json b/io.sc.platform.ai.frontend/package.json index b9ea0d53..a3c91648 100644 --- a/io.sc.platform.ai.frontend/package.json +++ b/io.sc.platform.ai.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.115", + "platform-core": "8.2.117", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.ai.frontend/webpack.config.common.cjs b/io.sc.platform.ai.frontend/webpack.config.common.cjs index c6e5e2a0..dbea8c35 100644 --- a/io.sc.platform.ai.frontend/webpack.config.common.cjs +++ b/io.sc.platform.ai.frontend/webpack.config.common.cjs @@ -22,7 +22,7 @@ module.exports = { // 2. 兼容多个前端项目: 每个项目发布到 public 目录下的唯一项目名称目录 path: path.resolve(__dirname, `dist/public/${projectName}`), // 输出文件名 - filename: `javascript/[name].[contenthash:6].js`, + filename: `javascript/[name].[contenthash:8].js`, // 指定发布路径，使用 auto 可具有更多灵活性 publicPath: 'auto', // 每次构建时，首先删除 output.path 目录所有内容，保证每次得到最新的构建结果 @@ -69,7 +69,7 @@ module.exports = { test: /\.(woff|woff2|eot|ttf|otf)(\?.*)?$/, type: 'asset/resource', generator: { - filename: `fonts/[name].[contenthash:6].[ext]`, + filename: `fonts/[name].[contenthash:8].[ext]`, }, }, @@ -123,8 +123,8 @@ module.exports = { // css 抽取插件 new MiniCssExtractPlugin({ - filename: `css/[name].[contenthash:6].css`, - chunkFilename: `css/[name].[contenthash:6].css`, + filename: `css/[name].[contenthash:8].css`, + chunkFilename: `css/[name].[contenthash:8].css`, }), // 自动生成静态 index.html 文件 diff --git a/io.sc.platform.core.frontend/package.json b/io.sc.platform.core.frontend/package.json index 8b04ba8d..0ba004dc 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.115", + "version": "8.2.117", "description": "前端核心包,用于快速构建前端的脚手架", "//main": "库的主文件", "main": "dist/platform-core.js", diff --git a/io.sc.platform.core.frontend/src/platform/components/workflow/WSelectAssigneeDialog.vue b/io.sc.platform.core.frontend/src/platform/components/workflow/WSelectAssigneeDialog.vue index 6f62334e..b79696e3 100644 --- a/io.sc.platform.core.frontend/src/platform/components/workflow/WSelectAssigneeDialog.vue +++ b/io.sc.platform.core.frontend/src/platform/components/workflow/WSelectAssigneeDialog.vue @@ -21,7 +21,15 @@ @@ -39,20 +47,20 @@ const emit = defineEmits([ const dialogRef = ref(); const formRef = ref(); const assigneeOptionsRef = ref([]); +const assigneeDefaultValueRef = ref(); const selectAssigneeWrapperRef = ref(); const open = (selectAssigneeWrapper) => { selectAssigneeWrapperRef.value = selectAssigneeWrapper; - //assigneeOptionsRef.value.splice(0, assigneeOptionsRef.value.length); const assigneeOptions = []; const assignees = selectAssigneeWrapper?.assignees; if (assignees) { for (let i = 0; i < assignees.length; i++) { assigneeOptions.push({ value: assignees[i].loginName, label: assignees[i].loginName + '/' + assignees[i].userName }); - //assigneeOptionsRef.value.push({ value: assignees[i].loginName, label: assignees[i].loginName + '/' + assignees[i].userName }); } } assigneeOptionsRef.value = assigneeOptions; + assigneeDefaultValueRef.value = assigneeOptions.length === 1 ? assigneeOptions[0].value : undefined; dialogRef.value.show(); }; diff --git a/io.sc.platform.core.frontend/template-project/package.json b/io.sc.platform.core.frontend/template-project/package.json index 4c3ea714..8c9b354d 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.115", + "version": "8.2.117", "description": "前端核心包,用于快速构建前端的脚手架", "private": false, "keywords": [], @@ -111,7 +111,7 @@ "mockjs": "1.1.0", "node-sql-parser": "5.3.6", "pinia": "2.3.0", - "platform-core": "8.2.115", + "platform-core": "8.2.117", "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/webpack.config.common.cjs b/io.sc.platform.core.frontend/template-project/webpack.config.common.cjs index c6e5e2a0..dbea8c35 100644 --- a/io.sc.platform.core.frontend/template-project/webpack.config.common.cjs +++ b/io.sc.platform.core.frontend/template-project/webpack.config.common.cjs @@ -22,7 +22,7 @@ module.exports = { // 2. 兼容多个前端项目: 每个项目发布到 public 目录下的唯一项目名称目录 path: path.resolve(__dirname, `dist/public/${projectName}`), // 输出文件名 - filename: `javascript/[name].[contenthash:6].js`, + filename: `javascript/[name].[contenthash:8].js`, // 指定发布路径，使用 auto 可具有更多灵活性 publicPath: 'auto', // 每次构建时，首先删除 output.path 目录所有内容，保证每次得到最新的构建结果 @@ -69,7 +69,7 @@ module.exports = { test: /\.(woff|woff2|eot|ttf|otf)(\?.*)?$/, type: 'asset/resource', generator: { - filename: `fonts/[name].[contenthash:6].[ext]`, + filename: `fonts/[name].[contenthash:8].[ext]`, }, }, @@ -123,8 +123,8 @@ module.exports = { // css 抽取插件 new MiniCssExtractPlugin({ - filename: `css/[name].[contenthash:6].css`, - chunkFilename: `css/[name].[contenthash:6].css`, + filename: `css/[name].[contenthash:8].css`, + chunkFilename: `css/[name].[contenthash:8].css`, }), // 自动生成静态 index.html 文件 diff --git a/io.sc.platform.core.frontend/webpack.config.common.cjs b/io.sc.platform.core.frontend/webpack.config.common.cjs index c6e5e2a0..dbea8c35 100644 --- a/io.sc.platform.core.frontend/webpack.config.common.cjs +++ b/io.sc.platform.core.frontend/webpack.config.common.cjs @@ -22,7 +22,7 @@ module.exports = { // 2. 兼容多个前端项目: 每个项目发布到 public 目录下的唯一项目名称目录 path: path.resolve(__dirname, `dist/public/${projectName}`), // 输出文件名 - filename: `javascript/[name].[contenthash:6].js`, + filename: `javascript/[name].[contenthash:8].js`, // 指定发布路径，使用 auto 可具有更多灵活性 publicPath: 'auto', // 每次构建时，首先删除 output.path 目录所有内容，保证每次得到最新的构建结果 @@ -69,7 +69,7 @@ module.exports = { test: /\.(woff|woff2|eot|ttf|otf)(\?.*)?$/, type: 'asset/resource', generator: { - filename: `fonts/[name].[contenthash:6].[ext]`, + filename: `fonts/[name].[contenthash:8].[ext]`, }, }, @@ -123,8 +123,8 @@ module.exports = { // css 抽取插件 new MiniCssExtractPlugin({ - filename: `css/[name].[contenthash:6].css`, - chunkFilename: `css/[name].[contenthash:6].css`, + filename: `css/[name].[contenthash:8].css`, + chunkFilename: `css/[name].[contenthash:8].css`, }), // 自动生成静态 index.html 文件 diff --git a/io.sc.platform.developer.doc/package.json b/io.sc.platform.developer.doc/package.json index 6f7084f7..27c82127 100644 --- a/io.sc.platform.developer.doc/package.json +++ b/io.sc.platform.developer.doc/package.json @@ -28,7 +28,7 @@ "vuepress": "2.0.0-rc.15" }, "dependencies": { - "platform-core": "8.2.115", + "platform-core": "8.2.117", "quasar": "2.17.6", "vue": "3.5.13", "vue-i18n": "11.0.1" diff --git a/io.sc.platform.developer.frontend/package.json b/io.sc.platform.developer.frontend/package.json index f7294482..75a0ad80 100644 --- a/io.sc.platform.developer.frontend/package.json +++ b/io.sc.platform.developer.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.115", + "platform-core": "8.2.117", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.developer.frontend/webpack.config.common.cjs b/io.sc.platform.developer.frontend/webpack.config.common.cjs index c6e5e2a0..dbea8c35 100644 --- a/io.sc.platform.developer.frontend/webpack.config.common.cjs +++ b/io.sc.platform.developer.frontend/webpack.config.common.cjs @@ -22,7 +22,7 @@ module.exports = { // 2. 兼容多个前端项目: 每个项目发布到 public 目录下的唯一项目名称目录 path: path.resolve(__dirname, `dist/public/${projectName}`), // 输出文件名 - filename: `javascript/[name].[contenthash:6].js`, + filename: `javascript/[name].[contenthash:8].js`, // 指定发布路径，使用 auto 可具有更多灵活性 publicPath: 'auto', // 每次构建时，首先删除 output.path 目录所有内容，保证每次得到最新的构建结果 @@ -69,7 +69,7 @@ module.exports = { test: /\.(woff|woff2|eot|ttf|otf)(\?.*)?$/, type: 'asset/resource', generator: { - filename: `fonts/[name].[contenthash:6].[ext]`, + filename: `fonts/[name].[contenthash:8].[ext]`, }, }, @@ -123,8 +123,8 @@ module.exports = { // css 抽取插件 new MiniCssExtractPlugin({ - filename: `css/[name].[contenthash:6].css`, - chunkFilename: `css/[name].[contenthash:6].css`, + filename: `css/[name].[contenthash:8].css`, + chunkFilename: `css/[name].[contenthash:8].css`, }), // 自动生成静态 index.html 文件 diff --git a/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/api/ProcessVo.java b/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/api/ProcessVo.java index 3a72cc8a..b14062aa 100644 --- a/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/api/ProcessVo.java +++ b/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/api/ProcessVo.java @@ -14,6 +14,7 @@ public class ProcessVo extends CorporationAuditorVo { private String xml; private ProcessStatus status; private Boolean canClaimTask; + private Boolean forceSelectAssignee; private String businessDescriptionSql; private String taskHandFrontendRouteName; private String taskHandFrontendModelName; @@ -100,6 +101,14 @@ public class ProcessVo extends CorporationAuditorVo { this.canClaimTask = canClaimTask; } + public Boolean getForceSelectAssignee() { + return forceSelectAssignee; + } + + public void setForceSelectAssignee(Boolean forceSelectAssignee) { + this.forceSelectAssignee = forceSelectAssignee; + } + public String getBusinessDescriptionSql() { return businessDescriptionSql; } diff --git a/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/jpa/entity/ProcessEntity.java b/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/jpa/entity/ProcessEntity.java index d492ee55..19f5e5bf 100644 --- a/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/jpa/entity/ProcessEntity.java +++ b/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/jpa/entity/ProcessEntity.java @@ -76,6 +76,11 @@ public class ProcessEntity extends CorporationAuditorEntity { @Convert(converter= NumericBooleanConverter.class) private Boolean canClaimTask; + //是否强制选择候选人 + @Column(name="FORCE_SELECT_ASSIGNEE_") + @Convert(converter= NumericBooleanConverter.class) + private Boolean forceSelectAssignee; + // 任务描述SQL语句,用于生成带业务信息的任务描述 @Column(name="BUSINESS_DESC_SQL_", length=1024) @Size(max=1024) @@ -114,6 +119,7 @@ public class ProcessEntity extends CorporationAuditorEntity { vo.setXml(this.getXml()); vo.setStatus(this.getStatus()); vo.setCanClaimTask(this.getCanClaimTask()); + vo.setForceSelectAssignee(this.getForceSelectAssignee()); vo.setBusinessDescriptionSql(this.getBusinessDescriptionSql()); vo.setTaskHandFrontendRouteName(this.getTaskHandFrontendRouteName()); vo.setTaskHandFrontendModelName(this.getTaskHandFrontendModelName()); @@ -202,6 +208,14 @@ public class ProcessEntity extends CorporationAuditorEntity { this.canClaimTask = canClaimTask; } + public Boolean getForceSelectAssignee() { + return forceSelectAssignee; + } + + public void setForceSelectAssignee(Boolean forceSelectAssignee) { + this.forceSelectAssignee = forceSelectAssignee; + } + public String getBusinessDescriptionSql() { return businessDescriptionSql; } diff --git a/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/ProcessEntityService.java b/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/ProcessEntityService.java index b0efec53..a935151d 100644 --- a/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/ProcessEntityService.java +++ b/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/service/ProcessEntityService.java @@ -15,10 +15,17 @@ public interface ProcessEntityService extends DaoService assignees =assigneeQueryService.query(null,newTask, newUserTaskDefinition); + + //是否强制选择候选处理人(即只有一个候选人也需要用户选择) + boolean isForceSelectAssignee =processEntityService.isForceSelectAssignee(procDefinitionId); if(assignees!=null && assignees.size()>0){ - if(assignees.size()>1){ + if(isForceSelectAssignee || assignees.size()>1){ SelectAssigneeWrapper selectAssigneeWrapper =new SelectAssigneeWrapper(); selectAssigneeWrapper.setActiveName(newUserTaskDefinition.getName()); selectAssigneeWrapper.setAssignees(assignees); @@ -304,8 +307,10 @@ public class ProcessOperationServiceImpl implements ProcessOperationService { //查找候选处理人 List assignees =assigneeQueryService.query(task,newTask, newUserTaskDefinition); + //是否强制选择候选处理人(即只有一个候选人也需要用户选择) + boolean isForceSelectAssignee =processEntityService.isForceSelectAssignee(procDefinitionId); if(assignees!=null && assignees.size()>0){ - if(assignees.size()>1){ + if(isForceSelectAssignee || assignees.size()>1){ SelectAssigneeWrapper selectAssigneeWrapper =new SelectAssigneeWrapper(); selectAssigneeWrapper.setActiveName(newUserTaskDefinition.getName()); selectAssigneeWrapper.setAssignees(assignees); diff --git a/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/support/ProcessTaskWrapper.java b/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/support/ProcessTaskWrapper.java index dcd359f3..ac2c0948 100644 --- a/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/support/ProcessTaskWrapper.java +++ b/io.sc.platform.flowable/src/main/java/io/sc/platform/flowable/support/ProcessTaskWrapper.java @@ -17,6 +17,7 @@ public class ProcessTaskWrapper { private int priority; private String owner; private String assignee; + private String assigneeName; private String processInstanceId; private String executionId; @@ -83,6 +84,12 @@ public class ProcessTaskWrapper { public void setAssignee(String assignee) { this.assignee = assignee; } + public String getAssigneeName() { + return assigneeName; + } + public void setAssigneeName(String assigneeName) { + this.assigneeName = assigneeName; + } public String getProcessInstanceId() { return processInstanceId; } diff --git a/io.sc.platform.flowable/src/main/resources/liquibase/io.sc.platform.flowable_8.0.0_20220606__Process_Manager_Database_Schema_DDL.xml b/io.sc.platform.flowable/src/main/resources/liquibase/io.sc.platform.flowable_8.0.0_20220606__Process_Manager_Database_Schema_DDL.xml index 8ba25402..357d170b 100644 --- a/io.sc.platform.flowable/src/main/resources/liquibase/io.sc.platform.flowable_8.0.0_20220606__Process_Manager_Database_Schema_DDL.xml +++ b/io.sc.platform.flowable/src/main/resources/liquibase/io.sc.platform.flowable_8.0.0_20220606__Process_Manager_Database_Schema_DDL.xml @@ -25,6 +25,7 @@ + diff --git a/io.sc.platform.lcdp.frontend/package.json b/io.sc.platform.lcdp.frontend/package.json index ef561c31..c0e36bea 100644 --- a/io.sc.platform.lcdp.frontend/package.json +++ b/io.sc.platform.lcdp.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.115", + "platform-core": "8.2.117", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.lcdp.frontend/src/i18n/messages.json b/io.sc.platform.lcdp.frontend/src/i18n/messages.json index 5f2290c2..068d578d 100644 --- a/io.sc.platform.lcdp.frontend/src/i18n/messages.json +++ b/io.sc.platform.lcdp.frontend/src/i18n/messages.json @@ -179,6 +179,7 @@ "lcdp.bpm.processDefine.grid.toolbar.queryProcessInstance": "Query Process Instance", "lcdp.bpm.processDefine.grid.entity.deployId": "Deploy ID", "lcdp.bpm.processDefine.grid.entity.canClaimTask": "Can Claim Task", + "lcdp.bpm.processDefine.grid.entity.forceSelectAssignee": "Force Select Assignee", "lcdp.bpm.processDefine.grid.entity.businessDescriptionSql": "Bussiness Description SQL", "lcdp.bpm.processDefine.grid.entity.taskHandFrontendRouteName": "Task Handler's Frontend Route Name", "lcdp.bpm.processDefine.grid.entity.taskHandFrontendModelName": "Task Handler's Frontend Module Name", diff --git a/io.sc.platform.lcdp.frontend/src/i18n/messages_tw_CN.json b/io.sc.platform.lcdp.frontend/src/i18n/messages_tw_CN.json index ba3d3292..4763a775 100644 --- a/io.sc.platform.lcdp.frontend/src/i18n/messages_tw_CN.json +++ b/io.sc.platform.lcdp.frontend/src/i18n/messages_tw_CN.json @@ -179,6 +179,7 @@ "lcdp.bpm.processDefine.grid.toolbar.queryProcessInstance": "查詢流程實例", "lcdp.bpm.processDefine.grid.entity.deployId": "發佈 ID", "lcdp.bpm.processDefine.grid.entity.canClaimTask": "允許領取任務", + "lcdp.bpm.processDefine.grid.entity.forceSelectAssignee": "強制選擇候選處理人", "lcdp.bpm.processDefine.grid.entity.businessDescriptionSql": "業務描述 SQL", "lcdp.bpm.processDefine.grid.entity.taskHandFrontendRouteName": "任務處理前端路由名稱", "lcdp.bpm.processDefine.grid.entity.taskHandFrontendModelName": "任務處理前端模塊名稱", diff --git a/io.sc.platform.lcdp.frontend/src/i18n/messages_zh_CN.json b/io.sc.platform.lcdp.frontend/src/i18n/messages_zh_CN.json index 31fb54d2..6316bf34 100644 --- a/io.sc.platform.lcdp.frontend/src/i18n/messages_zh_CN.json +++ b/io.sc.platform.lcdp.frontend/src/i18n/messages_zh_CN.json @@ -179,6 +179,7 @@ "lcdp.bpm.processDefine.grid.toolbar.queryProcessInstance": "查询流程实例", "lcdp.bpm.processDefine.grid.entity.deployId": "发布 ID", "lcdp.bpm.processDefine.grid.entity.canClaimTask": "允许领取任务", + "lcdp.bpm.processDefine.grid.entity.forceSelectAssignee": "强制选择候选处理人", "lcdp.bpm.processDefine.grid.entity.businessDescriptionSql": "业务描述 SQL", "lcdp.bpm.processDefine.grid.entity.taskHandFrontendRouteName": "任务处理前端路由名称", "lcdp.bpm.processDefine.grid.entity.taskHandFrontendModelName": "任务处理前端模块名称", diff --git a/io.sc.platform.lcdp.frontend/src/views/bpm/Bpm.vue b/io.sc.platform.lcdp.frontend/src/views/bpm/Bpm.vue index 9a551e05..5b09e0a9 100644 --- a/io.sc.platform.lcdp.frontend/src/views/bpm/Bpm.vue +++ b/io.sc.platform.lcdp.frontend/src/views/bpm/Bpm.vue @@ -166,6 +166,12 @@ label: $t('lcdp.bpm.processDefine.grid.entity.canClaimTask'), format: Formater.yesNo(), }, + { + width: 110, + name: 'forceSelectAssignee', + label: $t('lcdp.bpm.processDefine.grid.entity.forceSelectAssignee'), + format: Formater.yesNo(), + }, { width: 100, name: 'lastModifier', label: $t('lastModifier') }, { width: 150, name: 'lastModifyDate', label: $t('lastModifyDate') }, ]" @@ -225,13 +231,13 @@ type: 'w-checkbox', defaultValue: true, rule: [], - disableIf: (args: any) => { - if (args.form.getStatus() === 'edit') { - return true; - } else { - return false; - } - }, + }, + { + name: 'forceSelectAssignee', + label: $t('lcdp.bpm.processDefine.grid.entity.forceSelectAssignee'), + type: 'w-checkbox', + defaultValue: true, + rule: [], }, { colSpan: 2, diff --git a/io.sc.platform.lcdp.frontend/webpack.config.common.cjs b/io.sc.platform.lcdp.frontend/webpack.config.common.cjs index c6e5e2a0..dbea8c35 100644 --- a/io.sc.platform.lcdp.frontend/webpack.config.common.cjs +++ b/io.sc.platform.lcdp.frontend/webpack.config.common.cjs @@ -22,7 +22,7 @@ module.exports = { // 2. 兼容多个前端项目: 每个项目发布到 public 目录下的唯一项目名称目录 path: path.resolve(__dirname, `dist/public/${projectName}`), // 输出文件名 - filename: `javascript/[name].[contenthash:6].js`, + filename: `javascript/[name].[contenthash:8].js`, // 指定发布路径，使用 auto 可具有更多灵活性 publicPath: 'auto', // 每次构建时，首先删除 output.path 目录所有内容，保证每次得到最新的构建结果 @@ -69,7 +69,7 @@ module.exports = { test: /\.(woff|woff2|eot|ttf|otf)(\?.*)?$/, type: 'asset/resource', generator: { - filename: `fonts/[name].[contenthash:6].[ext]`, + filename: `fonts/[name].[contenthash:8].[ext]`, }, }, @@ -123,8 +123,8 @@ module.exports = { // css 抽取插件 new MiniCssExtractPlugin({ - filename: `css/[name].[contenthash:6].css`, - chunkFilename: `css/[name].[contenthash:6].css`, + filename: `css/[name].[contenthash:8].css`, + chunkFilename: `css/[name].[contenthash:8].css`, }), // 自动生成静态 index.html 文件 diff --git a/io.sc.platform.license.keygen.frontend/package.json b/io.sc.platform.license.keygen.frontend/package.json index 79ee605e..9b39ea5f 100644 --- a/io.sc.platform.license.keygen.frontend/package.json +++ b/io.sc.platform.license.keygen.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.115", + "platform-core": "8.2.117", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.license.keygen.frontend/webpack.config.common.cjs b/io.sc.platform.license.keygen.frontend/webpack.config.common.cjs index c6e5e2a0..dbea8c35 100644 --- a/io.sc.platform.license.keygen.frontend/webpack.config.common.cjs +++ b/io.sc.platform.license.keygen.frontend/webpack.config.common.cjs @@ -22,7 +22,7 @@ module.exports = { // 2. 兼容多个前端项目: 每个项目发布到 public 目录下的唯一项目名称目录 path: path.resolve(__dirname, `dist/public/${projectName}`), // 输出文件名 - filename: `javascript/[name].[contenthash:6].js`, + filename: `javascript/[name].[contenthash:8].js`, // 指定发布路径，使用 auto 可具有更多灵活性 publicPath: 'auto', // 每次构建时，首先删除 output.path 目录所有内容，保证每次得到最新的构建结果 @@ -69,7 +69,7 @@ module.exports = { test: /\.(woff|woff2|eot|ttf|otf)(\?.*)?$/, type: 'asset/resource', generator: { - filename: `fonts/[name].[contenthash:6].[ext]`, + filename: `fonts/[name].[contenthash:8].[ext]`, }, }, @@ -123,8 +123,8 @@ module.exports = { // css 抽取插件 new MiniCssExtractPlugin({ - filename: `css/[name].[contenthash:6].css`, - chunkFilename: `css/[name].[contenthash:6].css`, + filename: `css/[name].[contenthash:8].css`, + chunkFilename: `css/[name].[contenthash:8].css`, }), // 自动生成静态 index.html 文件 diff --git a/io.sc.platform.mvc.frontend/package.json b/io.sc.platform.mvc.frontend/package.json index cda62d58..cc208ece 100644 --- a/io.sc.platform.mvc.frontend/package.json +++ b/io.sc.platform.mvc.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.115", + "platform-core": "8.2.117", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.mvc.frontend/webpack.config.common.cjs b/io.sc.platform.mvc.frontend/webpack.config.common.cjs index c6e5e2a0..dbea8c35 100644 --- a/io.sc.platform.mvc.frontend/webpack.config.common.cjs +++ b/io.sc.platform.mvc.frontend/webpack.config.common.cjs @@ -22,7 +22,7 @@ module.exports = { // 2. 兼容多个前端项目: 每个项目发布到 public 目录下的唯一项目名称目录 path: path.resolve(__dirname, `dist/public/${projectName}`), // 输出文件名 - filename: `javascript/[name].[contenthash:6].js`, + filename: `javascript/[name].[contenthash:8].js`, // 指定发布路径，使用 auto 可具有更多灵活性 publicPath: 'auto', // 每次构建时，首先删除 output.path 目录所有内容，保证每次得到最新的构建结果 @@ -69,7 +69,7 @@ module.exports = { test: /\.(woff|woff2|eot|ttf|otf)(\?.*)?$/, type: 'asset/resource', generator: { - filename: `fonts/[name].[contenthash:6].[ext]`, + filename: `fonts/[name].[contenthash:8].[ext]`, }, }, @@ -123,8 +123,8 @@ module.exports = { // css 抽取插件 new MiniCssExtractPlugin({ - filename: `css/[name].[contenthash:6].css`, - chunkFilename: `css/[name].[contenthash:6].css`, + filename: `css/[name].[contenthash:8].css`, + chunkFilename: `css/[name].[contenthash:8].css`, }), // 自动生成静态 index.html 文件 diff --git a/io.sc.platform.scheduler.manager.frontend/package.json b/io.sc.platform.scheduler.manager.frontend/package.json index 415beb51..ef6dfbef 100644 --- a/io.sc.platform.scheduler.manager.frontend/package.json +++ b/io.sc.platform.scheduler.manager.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.115", + "platform-core": "8.2.117", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.scheduler.manager.frontend/webpack.config.common.cjs b/io.sc.platform.scheduler.manager.frontend/webpack.config.common.cjs index c6e5e2a0..dbea8c35 100644 --- a/io.sc.platform.scheduler.manager.frontend/webpack.config.common.cjs +++ b/io.sc.platform.scheduler.manager.frontend/webpack.config.common.cjs @@ -22,7 +22,7 @@ module.exports = { // 2. 兼容多个前端项目: 每个项目发布到 public 目录下的唯一项目名称目录 path: path.resolve(__dirname, `dist/public/${projectName}`), // 输出文件名 - filename: `javascript/[name].[contenthash:6].js`, + filename: `javascript/[name].[contenthash:8].js`, // 指定发布路径，使用 auto 可具有更多灵活性 publicPath: 'auto', // 每次构建时，首先删除 output.path 目录所有内容，保证每次得到最新的构建结果 @@ -69,7 +69,7 @@ module.exports = { test: /\.(woff|woff2|eot|ttf|otf)(\?.*)?$/, type: 'asset/resource', generator: { - filename: `fonts/[name].[contenthash:6].[ext]`, + filename: `fonts/[name].[contenthash:8].[ext]`, }, }, @@ -123,8 +123,8 @@ module.exports = { // css 抽取插件 new MiniCssExtractPlugin({ - filename: `css/[name].[contenthash:6].css`, - chunkFilename: `css/[name].[contenthash:6].css`, + filename: `css/[name].[contenthash:8].css`, + chunkFilename: `css/[name].[contenthash:8].css`, }), // 自动生成静态 index.html 文件 diff --git a/io.sc.platform.system.frontend/package.json b/io.sc.platform.system.frontend/package.json index 608e6a28..e69ff1b9 100644 --- a/io.sc.platform.system.frontend/package.json +++ b/io.sc.platform.system.frontend/package.json @@ -111,7 +111,7 @@ "mockjs": "1.1.0", "node-sql-parser": "5.3.6", "pinia": "2.3.0", - "platform-core": "8.2.115", + "platform-core": "8.2.117", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.system.frontend/webpack.config.common.cjs b/io.sc.platform.system.frontend/webpack.config.common.cjs index c6e5e2a0..dbea8c35 100644 --- a/io.sc.platform.system.frontend/webpack.config.common.cjs +++ b/io.sc.platform.system.frontend/webpack.config.common.cjs @@ -22,7 +22,7 @@ module.exports = { // 2. 兼容多个前端项目: 每个项目发布到 public 目录下的唯一项目名称目录 path: path.resolve(__dirname, `dist/public/${projectName}`), // 输出文件名 - filename: `javascript/[name].[contenthash:6].js`, + filename: `javascript/[name].[contenthash:8].js`, // 指定发布路径，使用 auto 可具有更多灵活性 publicPath: 'auto', // 每次构建时，首先删除 output.path 目录所有内容，保证每次得到最新的构建结果 @@ -69,7 +69,7 @@ module.exports = { test: /\.(woff|woff2|eot|ttf|otf)(\?.*)?$/, type: 'asset/resource', generator: { - filename: `fonts/[name].[contenthash:6].[ext]`, + filename: `fonts/[name].[contenthash:8].[ext]`, }, }, @@ -123,8 +123,8 @@ module.exports = { // css 抽取插件 new MiniCssExtractPlugin({ - filename: `css/[name].[contenthash:6].css`, - chunkFilename: `css/[name].[contenthash:6].css`, + filename: `css/[name].[contenthash:8].css`, + chunkFilename: `css/[name].[contenthash:8].css`, }), // 自动生成静态 index.html 文件 diff --git a/io.sc.platform.system/src/main/java/io/sc/platform/system/user/jpa/entity/UserEntity.java b/io.sc.platform.system/src/main/java/io/sc/platform/system/user/jpa/entity/UserEntity.java index b65b6d1e..20829bed 100644 --- a/io.sc.platform.system/src/main/java/io/sc/platform/system/user/jpa/entity/UserEntity.java +++ b/io.sc.platform.system/src/main/java/io/sc/platform/system/user/jpa/entity/UserEntity.java @@ -51,8 +51,8 @@ public class UserEntity extends CorporationAuditorEntity implements Dese private String userName; //密码 - @Column(name="PASSWORD_", length=255) - @Size(max=255) + @Column(name="PASSWORD_", length=2000) + @Size(max=2000) private String password; //描述 diff --git a/io.sc.standard.frontend/package.json b/io.sc.standard.frontend/package.json index 8712bd68..080df5de 100644 --- a/io.sc.standard.frontend/package.json +++ b/io.sc.standard.frontend/package.json @@ -112,7 +112,7 @@ "node-sql-parser": "5.3.6", "pinia": "2.3.0", "pinia-undo": "0.2.4", - "platform-core": "8.2.115", + "platform-core": "8.2.117", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.standard.frontend/webpack.config.common.cjs b/io.sc.standard.frontend/webpack.config.common.cjs index c6e5e2a0..dbea8c35 100644 --- a/io.sc.standard.frontend/webpack.config.common.cjs +++ b/io.sc.standard.frontend/webpack.config.common.cjs @@ -22,7 +22,7 @@ module.exports = { // 2. 兼容多个前端项目: 每个项目发布到 public 目录下的唯一项目名称目录 path: path.resolve(__dirname, `dist/public/${projectName}`), // 输出文件名 - filename: `javascript/[name].[contenthash:6].js`, + filename: `javascript/[name].[contenthash:8].js`, // 指定发布路径，使用 auto 可具有更多灵活性 publicPath: 'auto', // 每次构建时，首先删除 output.path 目录所有内容，保证每次得到最新的构建结果 @@ -69,7 +69,7 @@ module.exports = { test: /\.(woff|woff2|eot|ttf|otf)(\?.*)?$/, type: 'asset/resource', generator: { - filename: `fonts/[name].[contenthash:6].[ext]`, + filename: `fonts/[name].[contenthash:8].[ext]`, }, }, @@ -123,8 +123,8 @@ module.exports = { // css 抽取插件 new MiniCssExtractPlugin({ - filename: `css/[name].[contenthash:6].css`, - chunkFilename: `css/[name].[contenthash:6].css`, + filename: `css/[name].[contenthash:8].css`, + chunkFilename: `css/[name].[contenthash:8].css`, }), // 自动生成静态 index.html 文件 diff --git a/io.sc.website/package.json b/io.sc.website/package.json index 010cf05b..09666694 100644 --- a/io.sc.website/package.json +++ b/io.sc.website/package.json @@ -28,6 +28,6 @@ }, "dependencies": { "vue": "3.5.13", - "platform-core": "8.2.115" + "platform-core": "8.2.117" } } \ No newline at end of file diff --git a/wra.report.frontend/package.json b/wra.report.frontend/package.json index e5d7328d..fbf500e5 100644 --- a/wra.report.frontend/package.json +++ b/wra.report.frontend/package.json @@ -111,7 +111,7 @@ "mockjs": "1.1.0", "node-sql-parser": "5.3.6", "pinia": "2.3.0", - "platform-core": "8.2.115", + "platform-core": "8.2.117", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/wra.report.frontend/webpack.config.common.cjs b/wra.report.frontend/webpack.config.common.cjs index c6e5e2a0..dbea8c35 100644 --- a/wra.report.frontend/webpack.config.common.cjs +++ b/wra.report.frontend/webpack.config.common.cjs @@ -22,7 +22,7 @@ module.exports = { // 2. 兼容多个前端项目: 每个项目发布到 public 目录下的唯一项目名称目录 path: path.resolve(__dirname, `dist/public/${projectName}`), // 输出文件名 - filename: `javascript/[name].[contenthash:6].js`, + filename: `javascript/[name].[contenthash:8].js`, // 指定发布路径，使用 auto 可具有更多灵活性 publicPath: 'auto', // 每次构建时，首先删除 output.path 目录所有内容，保证每次得到最新的构建结果 @@ -69,7 +69,7 @@ module.exports = { test: /\.(woff|woff2|eot|ttf|otf)(\?.*)?$/, type: 'asset/resource', generator: { - filename: `fonts/[name].[contenthash:6].[ext]`, + filename: `fonts/[name].[contenthash:8].[ext]`, }, }, @@ -123,8 +123,8 @@ module.exports = { // css 抽取插件 new MiniCssExtractPlugin({ - filename: `css/[name].[contenthash:6].css`, - chunkFilename: `css/[name].[contenthash:6].css`, + filename: `css/[name].[contenthash:8].css`, + chunkFilename: `css/[name].[contenthash:8].css`, }), // 自动生成静态 index.html 文件