diff --git a/cips.frontend/package.json b/cips.frontend/package.json index caaa6a11..555862ec 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.134", + "platform-core": "8.2.135", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/erm.frontend/package.json b/erm.frontend/package.json index eae069df..3d0f57da 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.134", + "platform-core": "8.2.135", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/gradle.properties b/gradle.properties index 31a0f4ab..19db9056 100644 --- a/gradle.properties +++ b/gradle.properties @@ -39,7 +39,7 @@ application_version=1.0.0 platform_group=io.sc platform_version=8.2.41 platform_plugin_version=8.2.10 -platform_core_frontend_version=8.2.134 +platform_core_frontend_version=8.2.135 ########################################################### # dependencies version diff --git a/io.sc.engine.mv.frontend/package.json b/io.sc.engine.mv.frontend/package.json index 355280e5..0ddc7483 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.134", + "platform-core": "8.2.135", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.engine.rule.frontend/package.json b/io.sc.engine.rule.frontend/package.json index fedc21d6..987bd2a0 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.134", + "platform-core": "8.2.135", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.engine.rule.frontend/src/views/resources/designer/HttpRequestDialog.vue b/io.sc.engine.rule.frontend/src/views/resources/designer/HttpRequestDialog.vue index bf6e1554..884a9a25 100644 --- a/io.sc.engine.rule.frontend/src/views/resources/designer/HttpRequestDialog.vue +++ b/io.sc.engine.rule.frontend/src/views/resources/designer/HttpRequestDialog.vue @@ -510,6 +510,7 @@ const parameterValueGridColumns = [ label: $t('name'), align: 'left', sortable: false, + html: true, format: (value: any) => { return PlaceHolder.replace(value); }, @@ -519,6 +520,7 @@ const parameterValueGridColumns = [ name: 'value', label: $t('value'), sortable: false, + html: true, }, ]; const parameterValueGridEditor = { diff --git a/io.sc.engine.rule.frontend/src/views/resources/designer/Option.vue b/io.sc.engine.rule.frontend/src/views/resources/designer/Option.vue index d7eee1e8..952e92a8 100644 --- a/io.sc.engine.rule.frontend/src/views/resources/designer/Option.vue +++ b/io.sc.engine.rule.frontend/src/views/resources/designer/Option.vue @@ -54,6 +54,7 @@ width: 400, name: 'config', label: $t('re.option.grid.entity.config'), + html: true, format: (value: any, row: any) => { return PlaceHolder.replace(value); }, diff --git a/io.sc.engine.rule.frontend/src/views/resources/designer/Processor.vue b/io.sc.engine.rule.frontend/src/views/resources/designer/Processor.vue index 62409e96..de66000b 100644 --- a/io.sc.engine.rule.frontend/src/views/resources/designer/Processor.vue +++ b/io.sc.engine.rule.frontend/src/views/resources/designer/Processor.vue @@ -107,6 +107,7 @@ label: $t('re.processor.grid.entity.content'), sortable: false, title: () => {}, + html: true, format: (value: any, row: any) => { return processorManager.format(value, row); }, diff --git a/io.sc.engine.rule.frontend/src/views/shared/processors/ConditionRange.ts b/io.sc.engine.rule.frontend/src/views/shared/processors/ConditionRange.ts index c36335ef..280f1bcd 100644 --- a/io.sc.engine.rule.frontend/src/views/shared/processors/ConditionRange.ts +++ b/io.sc.engine.rule.frontend/src/views/shared/processors/ConditionRange.ts @@ -87,6 +87,7 @@ class ConditionRange extends Processor { label: $t('condition'), align: 'left', sortable: false, + html: true, format: (value: any) => { return PlaceHolder.replace(value); }, @@ -95,6 +96,7 @@ class ConditionRange extends Processor { name: 'value', label: $t('value'), sortable: false, + html: true, format: (value: any) => { return PlaceHolder.replace(value); }, diff --git a/io.sc.engine.rule.frontend/src/views/shared/processors/DecisionTable.ts b/io.sc.engine.rule.frontend/src/views/shared/processors/DecisionTable.ts index db94e288..237c6354 100644 --- a/io.sc.engine.rule.frontend/src/views/shared/processors/DecisionTable.ts +++ b/io.sc.engine.rule.frontend/src/views/shared/processors/DecisionTable.ts @@ -306,6 +306,7 @@ class DecisionTable extends Processor { name: 'C' + i, label: $t('C' + i), sortable: false, + html: true, format: (value: any) => { return PlaceHolder.replace(value); }, diff --git a/io.sc.engine.rule.frontend/src/views/shared/processors/ObjectProperties.ts b/io.sc.engine.rule.frontend/src/views/shared/processors/ObjectProperties.ts index c9c53ec6..f38d56d4 100644 --- a/io.sc.engine.rule.frontend/src/views/shared/processors/ObjectProperties.ts +++ b/io.sc.engine.rule.frontend/src/views/shared/processors/ObjectProperties.ts @@ -141,6 +141,7 @@ class ObjectProperties extends Processor { label: $t('propertyName'), align: 'left', sortable: false, + html: true, format: (value: any, row: any) => { if (row.expression) { const expression = row.expression.replace(/\$\{(.+?)\}\.\$\{(.+?)\}/g, '$2'); @@ -156,6 +157,7 @@ class ObjectProperties extends Processor { name: 'expression', label: $t('expression'), sortable: false, + html: true, format: (value: any) => { return PlaceHolder.replace(value); }, diff --git a/io.sc.engine.rule.frontend/src/views/shared/processors/ScoreCard.ts b/io.sc.engine.rule.frontend/src/views/shared/processors/ScoreCard.ts index 026d4fbd..60dc52a5 100644 --- a/io.sc.engine.rule.frontend/src/views/shared/processors/ScoreCard.ts +++ b/io.sc.engine.rule.frontend/src/views/shared/processors/ScoreCard.ts @@ -134,6 +134,7 @@ class ScoreCard extends Processor { name: 'content', label: $t('content'), sortable: false, + html: true, title: () => {}, format: (value, row: any) => { const data = Tools.deepClone(row); diff --git a/io.sc.engine.rule.frontend/src/views/shared/processors/Sql.ts b/io.sc.engine.rule.frontend/src/views/shared/processors/Sql.ts index 32a2ebf5..1141a4b0 100644 --- a/io.sc.engine.rule.frontend/src/views/shared/processors/Sql.ts +++ b/io.sc.engine.rule.frontend/src/views/shared/processors/Sql.ts @@ -125,6 +125,7 @@ class Sql extends Processor { label: $t('name'), align: 'left', sortable: false, + html: true, format: (value: any) => { return PlaceHolder.replace(value); }, @@ -134,6 +135,7 @@ class Sql extends Processor { name: 'value', label: $t('value'), sortable: false, + html: true, }, ], editor: { @@ -257,6 +259,7 @@ class Sql extends Processor { name: 'parameter', label: $t('parameterName'), sortable: false, + html: true, format: (value: any) => { return PlaceHolder.replace(value); }, @@ -267,6 +270,7 @@ class Sql extends Processor { label: $t('fieldName'), align: 'left', sortable: false, + html: true, }, ], editor: { diff --git a/io.sc.engine.st.frontend/package.json b/io.sc.engine.st.frontend/package.json index 3a3e6b07..920487ae 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.134", + "platform-core": "8.2.135", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.ai.frontend/package.json b/io.sc.platform.ai.frontend/package.json index 45db98c6..92e55f1a 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.134", + "platform-core": "8.2.135", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.core.frontend/package.json b/io.sc.platform.core.frontend/package.json index a32aaed2..f43e53d1 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.134", + "version": "8.2.135", "description": "前端核心包,用于快速构建前端的脚手架", "//main": "库的主文件", "main": "dist/platform-core.js", diff --git a/io.sc.platform.core.frontend/src/platform/views/home/AnnouncementDialog.vue b/io.sc.platform.core.frontend/src/platform/views/home/AnnouncementDialog.vue index 4e80d294..298e2a7c 100644 --- a/io.sc.platform.core.frontend/src/platform/views/home/AnnouncementDialog.vue +++ b/io.sc.platform.core.frontend/src/platform/views/home/AnnouncementDialog.vue @@ -14,7 +14,7 @@ >
{{ itemRef.title }}
-
+
diff --git a/io.sc.platform.core.frontend/src/platform/views/home/MyAnnouncement.vue b/io.sc.platform.core.frontend/src/platform/views/home/MyAnnouncement.vue index 5e953383..59fdadc6 100644 --- a/io.sc.platform.core.frontend/src/platform/views/home/MyAnnouncement.vue +++ b/io.sc.platform.core.frontend/src/platform/views/home/MyAnnouncement.vue @@ -21,9 +21,9 @@ -
+
-
+
diff --git a/io.sc.platform.core.frontend/src/platform/views/home/MyDoneTask.vue b/io.sc.platform.core.frontend/src/platform/views/home/MyDoneTask.vue index 3a1aa787..5f2e2138 100644 --- a/io.sc.platform.core.frontend/src/platform/views/home/MyDoneTask.vue +++ b/io.sc.platform.core.frontend/src/platform/views/home/MyDoneTask.vue @@ -22,9 +22,9 @@
{{ item.businessDescription }} diff --git a/io.sc.platform.core.frontend/src/platform/views/home/MyFinishedTask.vue b/io.sc.platform.core.frontend/src/platform/views/home/MyFinishedTask.vue index be889b38..66d84d52 100644 --- a/io.sc.platform.core.frontend/src/platform/views/home/MyFinishedTask.vue +++ b/io.sc.platform.core.frontend/src/platform/views/home/MyFinishedTask.vue @@ -22,9 +22,9 @@
{{ item.businessDescription }} diff --git a/io.sc.platform.core.frontend/src/platform/views/home/MyMessage.vue b/io.sc.platform.core.frontend/src/platform/views/home/MyMessage.vue index 315cb3fb..9fc880ee 100644 --- a/io.sc.platform.core.frontend/src/platform/views/home/MyMessage.vue +++ b/io.sc.platform.core.frontend/src/platform/views/home/MyMessage.vue @@ -22,12 +22,12 @@
-
+
{{ item.sender }}
diff --git a/io.sc.platform.core.frontend/src/platform/views/home/MyTask.vue b/io.sc.platform.core.frontend/src/platform/views/home/MyTask.vue index 07cc1217..db9b9de5 100644 --- a/io.sc.platform.core.frontend/src/platform/views/home/MyTask.vue +++ b/io.sc.platform.core.frontend/src/platform/views/home/MyTask.vue @@ -22,9 +22,9 @@
{{ item.businessDescription }} diff --git a/io.sc.platform.core.frontend/src/platform/views/home/SystemMessageDialog.vue b/io.sc.platform.core.frontend/src/platform/views/home/SystemMessageDialog.vue index b99d42df..2ec275f3 100644 --- a/io.sc.platform.core.frontend/src/platform/views/home/SystemMessageDialog.vue +++ b/io.sc.platform.core.frontend/src/platform/views/home/SystemMessageDialog.vue @@ -14,7 +14,7 @@ >
{{ itemRef.title }}
-
+
diff --git a/io.sc.platform.core.frontend/template-project/package.json b/io.sc.platform.core.frontend/template-project/package.json index 594be092..a46e3ced 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.134", + "version": "8.2.135", "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.134", + "platform-core": "8.2.135", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.core/src/main/resources/META-INF/platform/plugins/application-properties.json b/io.sc.platform.core/src/main/resources/META-INF/platform/plugins/application-properties.json index b1765f50..a6b3342b 100644 --- a/io.sc.platform.core/src/main/resources/META-INF/platform/plugins/application-properties.json +++ b/io.sc.platform.core/src/main/resources/META-INF/platform/plugins/application-properties.json @@ -59,6 +59,9 @@ "server.port = 8080", "server.servlet.context-path = /", "server.servlet.session.timeout = 30m", + "server.servlet.session.cookie.http-only = true", + "server.servlet.session.cookie.secure = true", + "server.servlet.session.cookie.same-site = STRICT", "server.error.path = /error", "server.error.whitelabel.enabled = true", "server.error.include-exception = true", diff --git a/io.sc.platform.developer.doc/package.json b/io.sc.platform.developer.doc/package.json index 158f8497..d0f71a7c 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.134", + "platform-core": "8.2.135", "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 85fb0e7d..25c0b218 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.134", + "platform-core": "8.2.135", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.lcdp.frontend/package.json b/io.sc.platform.lcdp.frontend/package.json index 07fda2fc..56985e6f 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.134", + "platform-core": "8.2.135", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.license.keygen.frontend/package.json b/io.sc.platform.license.keygen.frontend/package.json index 3d73f8e7..fcf6ad6d 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.134", + "platform-core": "8.2.135", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.mvc.frontend/package.json b/io.sc.platform.mvc.frontend/package.json index 69cef81b..0909f291 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.134", + "platform-core": "8.2.135", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.mvc/src/main/java/io/sc/platform/mvc/autoconfigure/MvcWebMvcAutoConfiguration.java b/io.sc.platform.mvc/src/main/java/io/sc/platform/mvc/autoconfigure/MvcWebMvcAutoConfiguration.java index a07084ac..b21e9584 100644 --- a/io.sc.platform.mvc/src/main/java/io/sc/platform/mvc/autoconfigure/MvcWebMvcAutoConfiguration.java +++ b/io.sc.platform.mvc/src/main/java/io/sc/platform/mvc/autoconfigure/MvcWebMvcAutoConfiguration.java @@ -85,4 +85,6 @@ public class MvcWebMvcAutoConfiguration implements WebMvcConfigurer { configurer.setTaskExecutor(executor); configurer.setDefaultTimeout(1000*60*10); } + + } diff --git a/io.sc.platform.scheduler.manager.frontend/package.json b/io.sc.platform.scheduler.manager.frontend/package.json index cf7f341d..7aa4b867 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.134", + "platform-core": "8.2.135", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.system.frontend/package.json b/io.sc.platform.system.frontend/package.json index d5da872e..c5884583 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.134", + "platform-core": "8.2.135", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", @@ -121,4 +121,4 @@ "vue-router": "4.5.0", "xml-formatter": "3.6.3" } -} \ No newline at end of file +} diff --git a/io.sc.platform.system.frontend/src/views/announcement/AnnouncementManager.vue b/io.sc.platform.system.frontend/src/views/announcement/AnnouncementManager.vue index 21137006..da4d20a3 100644 --- a/io.sc.platform.system.frontend/src/views/announcement/AnnouncementManager.vue +++ b/io.sc.platform.system.frontend/src/views/announcement/AnnouncementManager.vue @@ -13,8 +13,8 @@ :toolbar-configure="{ noIcon: false }" :toolbar-actions="['query', 'refresh', 'separator', 'add', 'clone', 'edit', 'remove', 'separator', 'view', 'separator', 'export']" :columns="[ - { width: 300, name: 'title', label: $t('title') }, - { width: '100%', name: 'content', label: $t('content'), sortable: false }, + { width: 300, name: 'title', label: $t('title'), html: true }, + { width: '100%', name: 'content', label: $t('content'), sortable: false, html: true }, ]" :editor="{ dialog: { diff --git a/io.sc.platform.system.frontend/src/views/workbench/MyMessage.vue b/io.sc.platform.system.frontend/src/views/workbench/MyMessage.vue index fbf727a0..ee43a0bb 100644 --- a/io.sc.platform.system.frontend/src/views/workbench/MyMessage.vue +++ b/io.sc.platform.system.frontend/src/views/workbench/MyMessage.vue @@ -21,7 +21,7 @@ { width: 150, name: 'sendDate', label: $t('system.notification.grid.entity.sendDate') }, { width: 100, name: 'receiver', label: $t('system.notification.grid.entity.receiver') }, { width: 150, name: 'receiveDate', label: $t('system.notification.grid.entity.receiveDate') }, - { width: '100%', name: 'content', label: $t('content'), sortable: false }, + { width: '100%', name: 'content', label: $t('content'), sortable: false, html: true }, ]" :editor="{ dialog: { diff --git a/io.sc.standard.frontend/package.json b/io.sc.standard.frontend/package.json index 596319aa..ac863df9 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.134", + "platform-core": "8.2.135", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.website/package.json b/io.sc.website/package.json index 13db61c1..835ecd64 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.134" + "platform-core": "8.2.135" } } \ No newline at end of file diff --git a/wra.report.frontend/package.json b/wra.report.frontend/package.json index 724c8b44..f0e9d3be 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.134", + "platform-core": "8.2.135", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7",