diff --git a/cips.frontend/package.json b/cips.frontend/package.json index 63946314..974cc74e 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.102", + "platform-core": "8.2.108", "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 49d9466c..9c6a1904 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.102", + "platform-core": "8.2.108", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/gradle.properties b/gradle.properties index 8b3e3008..8288dff3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -39,7 +39,7 @@ application_version=1.0.0 platform_group=io.sc platform_version=8.2.28 platform_plugin_version=8.2.10 -platform_core_frontend_version=8.2.102 +platform_core_frontend_version=8.2.108 ########################################################### # dependencies version diff --git a/io.sc.engine.mv.frontend/package.json b/io.sc.engine.mv.frontend/package.json index 031522b0..50ae6f65 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.102", + "platform-core": "8.2.108", "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 1621ce90..74d49453 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.102", + "platform-core": "8.2.108", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.engine.st.frontend/package.json b/io.sc.engine.st.frontend/package.json index a37352ec..4a694a75 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.102", + "platform-core": "8.2.108", "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 7dcd3077..d15ac829 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.102", + "platform-core": "8.2.108", "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 9123b7ad..290f3625 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.102", + "version": "8.2.108", "description": "前端核心包,用于快速构建前端的脚手架", "//main": "库的主文件", "main": "dist/platform-core.js", diff --git a/io.sc.platform.core.frontend/src/platform/i18n/messages_tw_CN.json b/io.sc.platform.core.frontend/src/platform/i18n/messages_tw_CN.json index aeeb9411..2617d0d1 100644 --- a/io.sc.platform.core.frontend/src/platform/i18n/messages_tw_CN.json +++ b/io.sc.platform.core.frontend/src/platform/i18n/messages_tw_CN.json @@ -332,13 +332,13 @@ "home.card.task.tip.routeOrComponentNotSetting": "任務辦理動作未設置, 無法執行!", "home.card.task.tip.remoteComponentLoadError": "任務辦理組件加載失敗, 無法執行!", - "home.card.myTask.title": "我的代辦", + "home.card.myTask.title": "待辦任務", "home.card.myTask.action.list": "顯示所有", - "home.card.myDoneTask.title": "我的已辦", + "home.card.myDoneTask.title": "辦理中任務", "home.card.myDoneTask.action.list": "顯示所有", - "home.card.myFinishTask.title": "我的辦結", + "home.card.myFinishTask.title": "已完成任務", "home.card.myFinishTask.action.list": "顯示所有", "home.card.myMessage.title": "我的消息", diff --git a/io.sc.platform.core.frontend/src/platform/i18n/messages_zh_CN.json b/io.sc.platform.core.frontend/src/platform/i18n/messages_zh_CN.json index fae6a5ef..06b8c7ba 100644 --- a/io.sc.platform.core.frontend/src/platform/i18n/messages_zh_CN.json +++ b/io.sc.platform.core.frontend/src/platform/i18n/messages_zh_CN.json @@ -333,13 +333,13 @@ "home.card.task.tip.routeOrComponentNotSetting": "任务办理动作未设置, 无法执行!", "home.card.task.tip.remoteComponentLoadError": "任务办理组件加载失败, 无法执行!", - "home.card.myTask.title": "我的代办", + "home.card.myTask.title": "待办任务", "home.card.myTask.action.list": "显示所有", - "home.card.myDoneTask.title": "我的已办", + "home.card.myDoneTask.title": "办理中任务", "home.card.myDoneTask.action.list": "显示所有", - "home.card.myFinishTask.title": "我的办结", + "home.card.myFinishTask.title": "已完成任务", "home.card.myFinishTask.action.list": "显示所有", "home.card.myMessage.title": "我的消息", diff --git a/io.sc.platform.core.frontend/src/platform/layout/sub-layout/Topper.vue b/io.sc.platform.core.frontend/src/platform/layout/sub-layout/Topper.vue index 0d753cb9..673a6063 100644 --- a/io.sc.platform.core.frontend/src/platform/layout/sub-layout/Topper.vue +++ b/io.sc.platform.core.frontend/src/platform/layout/sub-layout/Topper.vue @@ -229,7 +229,17 @@ import { useRouter } from 'vue-router'; import { useQuasar, useInterval } from 'quasar'; import { useI18n } from 'vue-i18n'; -import { axios, Environment, SessionManager, I18nMessageManager, AuthenticationManager, ComponentManager, NotifyManager, Tools } from '@/platform'; +import { + axios, + Environment, + SessionManager, + I18nMessageManager, + TagViewManager, + AuthenticationManager, + ComponentManager, + NotifyManager, + Tools, +} from '@/platform'; import LoginDialog from '@/platform/views/LoginDialog'; import AboutDialog from './AboutDialog.vue'; import ChangePasswordDialog from './ChangePasswordDialog.vue'; @@ -297,12 +307,39 @@ const openLoginDialog = () => { if (AuthenticationManager.isOauth2()) { loginDialog.value.open(); } else { - window.location.href = Environment.apiContextPath('/login'); + quasar + .dialog({ + title: t('security.login.title'), + message: t('security.login.dialog.title'), + ok: { + outline: true, + ripple: true, + 'no-caps': true, + label: t('confirm'), + color: 'primary', + }, + cancel: { + outline: true, + ripple: true, + 'no-caps': true, + label: t('cancel'), + }, + persistent: true, + }) + .onOk(() => { + window.location.href = Tools.concatUrl(Environment.getWebContextPath(), Environment.getConfigure().setting.loginPage); + }); } }; const logout = () => { if (gc.theme.login.logoutConfirm) { + if (AuthenticationManager.isOauth2()) { + console.debug('logoutSuccessUrl: ' + Environment.getWebContextPath()); + } else { + console.debug('logoutUrl: ' + Environment.apiContextPath(Environment.getConfigure().setting.logoutUrl)); + console.debug('logoutSuccessUrl: ' + Tools.concatUrl(Environment.getWebContextPath(), Environment.getConfigure().setting.logoutSuccessUrl)); + } quasar .dialog({ title: t('logout'), @@ -331,18 +368,21 @@ const logout = () => { }; const doLogout = () => { + // 清除存储在 SessionStore 中的用于保存用户打开的标签, 可避免用户更换用户登录后仍然显示上一用户打开的标签 + // 因为客户端 SessionStore 代表的是浏览器的一个 Tab 标签 + TagViewManager.clearTagViewsAndBreadcrumbs(); if (AuthenticationManager.isOauth2()) { AuthenticationManager.removeLocalAccessToken(); window.location.href = Environment.getWebContextPath(); } else { - axios.post(Environment.apiContextPath(Environment.getConfigure().setting.logoutActionUrl)).then(() => { - window.location.href = Environment.getWebContextPath(); + axios.post(Environment.apiContextPath(Environment.getConfigure().setting.logoutUrl)).then(() => { + window.location.href = Tools.concatUrl(Environment.getWebContextPath(), Environment.getConfigure().setting.logoutSuccessUrl); }); } }; const findUnCompletedTasks = () => { - axios.get(Environment.apiContextPath('/api/flowable/process/query/myTask')).then((response) => { + axios.get(Environment.apiContextPath('/api/flowable/process/query/myTask?page=1&size=10&pageable=true')).then((response) => { unCompletedTasksRef.value = response.data.content || []; unCompletedTasksTotalCountRef.value = response.data.totalElements; }); @@ -373,7 +413,7 @@ const findUnReadedNotifications = () => { }; const findUnReadedAnnouncements = () => { - axios.get(Environment.apiContextPath('/api/system/announcement/findUnReadedAnnouncements')).then((response) => { + axios.get(Environment.apiContextPath('/api/system/announcement/findUnReadedAnnouncements?page=1&size=10&pageable=true')).then((response) => { unReadedAnnouncementsRef.value = response.data.content || []; unReadedAnnouncementsTotalCountRef.value = response.data.totalElements; }); diff --git a/io.sc.platform.core.frontend/src/platform/plugin/axios.ts b/io.sc.platform.core.frontend/src/platform/plugin/axios.ts index 837d04a0..27bc5f0e 100644 --- a/io.sc.platform.core.frontend/src/platform/plugin/axios.ts +++ b/io.sc.platform.core.frontend/src/platform/plugin/axios.ts @@ -68,12 +68,11 @@ const getResponseErrorInterceptor = (handleError: boolean) => { QuasarTools.getQuasar()?.loading?.hide(); const errorWrapper = ServerExceptionHandler.getError(error); - console.log(errorWrapper.status); if (errorWrapper.status === 401) { if (error.request.responseURL.endsWith('/api/system/user/session')) { return Promise.resolve({}); } else { - //Environment.executeAction('openLoginDialog'); + Environment.executeAction('openLoginDialog'); return Promise.reject(errorWrapper); } } else { diff --git a/io.sc.platform.core.frontend/src/platform/plugin/manager/RouterManager.ts b/io.sc.platform.core.frontend/src/platform/plugin/manager/RouterManager.ts index edcba723..60f32e88 100644 --- a/io.sc.platform.core.frontend/src/platform/plugin/manager/RouterManager.ts +++ b/io.sc.platform.core.frontend/src/platform/plugin/manager/RouterManager.ts @@ -26,7 +26,13 @@ class RouterManager { * @param localRoutes 本地路由 */ public static setLocalRoutes(localRoutes: FrontEndRouteType[] = []) { - RouterManager.#localRoutes = localRoutes; + const routes: FrontEndRouteType[] = []; + for (const localRoute of localRoutes) { + if (!localRoute.remoteComponent) { + routes.push(localRoute); + } + } + RouterManager.#localRoutes = routes; } /** diff --git a/io.sc.platform.core.frontend/src/platform/plugin/manager/TagViewManager.ts b/io.sc.platform.core.frontend/src/platform/plugin/manager/TagViewManager.ts index acd98358..a162a67d 100644 --- a/io.sc.platform.core.frontend/src/platform/plugin/manager/TagViewManager.ts +++ b/io.sc.platform.core.frontend/src/platform/plugin/manager/TagViewManager.ts @@ -29,6 +29,14 @@ class TagViewManager { }); } + /** + * 清除 TagView + */ + public static clearTagViewsAndBreadcrumbs() { + TagViewManager.#tagViewsAndBreadcrumbs.tagViews = []; + TagViewManager.#tagViewsAndBreadcrumbs.breadcrumbs = []; + } + /** * 处理 TagView * @param to 前端路由 diff --git a/io.sc.platform.core.frontend/src/platform/types/ConfigureType.ts b/io.sc.platform.core.frontend/src/platform/types/ConfigureType.ts index 64c5d9ff..31f363b4 100644 --- a/io.sc.platform.core.frontend/src/platform/types/ConfigureType.ts +++ b/io.sc.platform.core.frontend/src/platform/types/ConfigureType.ts @@ -53,7 +53,9 @@ export type ConfigureType = { setting: { sessionTimeout: number; //会话过期时间,单位:秒 homePage: string; // 首页路由 path - logoutActionUrl: string; // 登出 Action URL + loginPage: string; // 登录 URL + logoutUrl: string; // 登出 URL + logoutSuccessUrl: string; // 登出 URL i18n: { availableLocales: string[]; // 支持的国际化多语言数组 locale: string; // 默认区域 diff --git a/io.sc.platform.core.frontend/src/platform/types/FrontEndRouteType.ts b/io.sc.platform.core.frontend/src/platform/types/FrontEndRouteType.ts index a6264f61..e11125ae 100644 --- a/io.sc.platform.core.frontend/src/platform/types/FrontEndRouteType.ts +++ b/io.sc.platform.core.frontend/src/platform/types/FrontEndRouteType.ts @@ -7,6 +7,7 @@ export type FrontEndRouteMetaType = { }; export type FrontEndRouteType = { + remoteComponent: boolean; force: boolean; name: string; icon: string; 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 7ad28865..5e953383 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 @@ -55,7 +55,7 @@ const dialogRef = ref(); const changeFirstColMaxWidth = () => { //card width let width = Math.ceil(cardRef.value.$el.clientWidth); - width = width - 8 /* card-section padding width */ - 12 /* td padding width */ - 70 /* other tds width*/ - 24 /* icon width */; + width = width - 8 /* card-section padding width */ - 12 /* td padding width */ - 70 /* other tds width*/ - 24 /* icon width */ - 20 /* scroll bar width */; //min width width = width >= 100 ? width : 100; firstColMaxWidthRef.value = width; 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 c8dc28c8..4a5b0696 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 @@ -77,7 +77,7 @@ const componentRef = ref(); const changeFirstColMaxWidth = () => { //card width let width = Math.ceil(cardRef.value.$el.clientWidth); - width = width - 8 /* card-section padding width */ - 12 /* td padding width */ - 290 /* other tds width*/; + width = width - 8 /* card-section padding width */ - 12 /* td padding width */ - 290 /* other tds width*/ - 20 /* scroll bar width */; //min width width = width >= 100 ? width : 100; firstColMaxWidthRef.value = width; 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 9166f18a..43a7a457 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 @@ -77,7 +77,7 @@ const componentRef = ref(); const changeFirstColMaxWidth = () => { //card width let width = Math.ceil(cardRef.value.$el.clientWidth); - width = width - 8 /* card-section padding width */ - 12 /* td padding width */ - 290 /* other tds width*/; + width = width - 8 /* card-section padding width */ - 12 /* td padding width */ - 290 /* other tds width*/ - 20 /* scroll bar width */; //min width width = width >= 100 ? width : 100; firstColMaxWidthRef.value = width; 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 ae12c214..315cb3fb 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 @@ -66,7 +66,7 @@ const systemMessageDialogRef = ref(); const changeFirstColMaxWidth = () => { //card width let width = Math.ceil(cardRef.value.$el.clientWidth); - width = width - 8 /* card-section padding width */ - 12 /* td padding width */ - 150 /* other tds width*/ - 24 /* icon width */; + width = width - 8 /* card-section padding width */ - 12 /* td padding width */ - 150 /* other tds width*/ - 24 /* icon width */ - 20 /* scroll bar width */; //min width width = width >= 100 ? width : 100; firstColMaxWidthRef.value = width; 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 89e8c8b1..cc4da9f5 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 @@ -79,7 +79,7 @@ const componentRef = ref(); const changeFirstColMaxWidth = () => { //card width let width = Math.ceil(cardRef.value.$el.clientWidth); - width = width - 8 /* card-section padding width */ - 12 /* td padding width */ - 290 /* other tds width*/; + width = width - 8 /* card-section padding width */ - 12 /* td padding width */ - 290 /* other tds width*/ - 20 /* scroll bar width */; //min width width = width >= 100 ? width : 100; firstColMaxWidthRef.value = width; diff --git a/io.sc.platform.core.frontend/template-project/package.json b/io.sc.platform.core.frontend/template-project/package.json index 01dbf3c7..4d26787e 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.102", + "version": "8.2.108", "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.102", + "platform-core": "8.2.108", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.developer.doc/package.json b/io.sc.platform.developer.doc/package.json index cbc090e8..e922a70c 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.102", + "platform-core": "8.2.108", "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 8710cf4d..fea02aba 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.102", + "platform-core": "8.2.108", "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 cddc7bf0..4469cf3e 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.102", + "platform-core": "8.2.108", "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_tw_CN.json b/io.sc.platform.lcdp.frontend/src/i18n/messages_tw_CN.json index 0cf6c114..625af512 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 @@ -17,9 +17,9 @@ "theme.navigateMenuPosition": "導航菜單位置", "theme.home": "首頁", - "theme.home.myTaskTextColor": "我的代辦文本顏色", - "theme.home.myDoneTaskTextColor": "我的已辦文本顏色", - "theme.home.myFinishedTaskTextColor": "我的辦結文本顏色", + "theme.home.myTaskTextColor": "待辦任務文本顏色", + "theme.home.myDoneTaskTextColor": "辦理中任務文本顏色", + "theme.home.myFinishedTaskTextColor": "已完成任務文本顏色", "theme.home.myMessageTextColor": "我的消息文本顏色", "theme.home.announcementTextColor": "系統公告文本顏色", 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 94bffd53..1e58d1ec 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 @@ -17,9 +17,9 @@ "theme.navigateMenuPosition": "导航菜单位置", "theme.home": "首页", - "theme.home.myTaskTextColor": "我的代办文本颜色", - "theme.home.myDoneTaskTextColor": "我的已办文本颜色", - "theme.home.myFinishedTaskTextColor": "我的办结文本颜色", + "theme.home.myTaskTextColor": "待办任务文本颜色", + "theme.home.myDoneTaskTextColor": "办理中任务文本颜色", + "theme.home.myFinishedTaskTextColor": "已完成任务文本颜色", "theme.home.myMessageTextColor": "我的消息文本颜色", "theme.home.announcementTextColor": "系统公告文本颜色", diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Home.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Home.java index bc15e959..afd41b1d 100644 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Home.java +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Home.java @@ -1,9 +1,9 @@ package io.sc.platform.lcdp.configure.api; public class Home { - private String myTaskTextColor ="black"; // 我的代办文本颜色 - private String myDoneTaskTextColor ="black"; // 我的已办文本颜色 - private String myFinishedTaskTextColor ="black"; // 我的办结文本颜色 + private String myTaskTextColor ="black"; // 待办任务文本颜色 + private String myDoneTaskTextColor ="black"; // 处理中任务文本颜色 + private String myFinishedTaskTextColor ="black"; // 已完成任务文本颜色 private String myMessageTextColor ="black"; // 我的消息文本颜色 private String announcementTextColor ="black"; // 系统公告文本颜色 diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Setting.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Setting.java index 5c509bc1..f720d2ff 100644 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Setting.java +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Setting.java @@ -5,7 +5,9 @@ import io.sc.platform.security.AuthenticationMode; public class Setting { private long sessionTimeout =30 * 60; // 会话过期时间(单位:秒) private String homePage ="/home"; // 首页路由 path - private String logoutActionUrl ="/logout"; // 登出 Action URL + private String loginPage ="/login"; // 登录 URL + private String logoutUrl ="/logout"; // 登出 URL + private String logoutSuccessUrl ="/"; // 登出成功 URL private I18n i18n =new I18n(); // 多语言国际化 private boolean enableChangeRole =false; // 是否允许切换角色(当一个用户拥有多个角色时) private boolean isMultiCorporationMode =false; // 是否是多法人模式 @@ -27,12 +29,28 @@ public class Setting { this.homePage = homePage; } - public String getLogoutActionUrl() { - return logoutActionUrl; + public String getLoginPage() { + return loginPage; } - public void setLogoutActionUrl(String logoutActionUrl) { - this.logoutActionUrl = logoutActionUrl; + public void setLoginPage(String loginPage) { + this.loginPage = loginPage; + } + + public String getLogoutUrl() { + return logoutUrl; + } + + public void setLogoutUrl(String logoutUrl) { + this.logoutUrl = logoutUrl; + } + + public String getLogoutSuccessUrl() { + return logoutSuccessUrl; + } + + public void setLogoutSuccessUrl(String logoutSuccessUrl) { + this.logoutSuccessUrl = logoutSuccessUrl; } public I18n getI18n() { diff --git a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/service/impl/ConfigureServiceImpl.java b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/service/impl/ConfigureServiceImpl.java index 0a406f93..61395d61 100644 --- a/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/service/impl/ConfigureServiceImpl.java +++ b/io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/service/impl/ConfigureServiceImpl.java @@ -92,9 +92,17 @@ public class ConfigureServiceImpl extends DaoServiceImpl extends Criteria { condition.setWhere(StringUtil.format("${0} > ${1}",fieldName,nStart)); condition.getParameters().put(nStart.substring(1),pStart); }else { - condition.setWhere(StringUtil.format("${0} < ${2}",fieldName,nEnd)); + condition.setWhere(StringUtil.format("${0} < ${1}",fieldName,nEnd)); condition.getParameters().put(nEnd.substring(1),pEnd); } return condition; diff --git a/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/support/criteria/impl/BetweenInclusive.java b/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/support/criteria/impl/BetweenInclusive.java index ce5f4567..7b9f7eb5 100644 --- a/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/support/criteria/impl/BetweenInclusive.java +++ b/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/support/criteria/impl/BetweenInclusive.java @@ -64,7 +64,7 @@ public class BetweenInclusive extends Between { condition.setWhere(StringUtil.format("${0} >= ${1}",fieldName,nStart)); condition.getParameters().put(nStart.substring(1),pStart); }else { - condition.setWhere(StringUtil.format("${0} <= ${2}",fieldName,nEnd)); + condition.setWhere(StringUtil.format("${0} <= ${1}",fieldName,nEnd)); condition.getParameters().put(nEnd.substring(1),pEnd); } return condition; diff --git a/io.sc.platform.scheduler.manager.frontend/package.json b/io.sc.platform.scheduler.manager.frontend/package.json index a2cb9c71..8ccc347e 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.102", + "platform-core": "8.2.108", "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 40b858f4..729d1eef 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.102", + "platform-core": "8.2.108", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7", diff --git a/io.sc.platform.system.frontend/src/i18n/messages_tw_CN.json b/io.sc.platform.system.frontend/src/i18n/messages_tw_CN.json index cb3fcca1..3ce12131 100644 --- a/io.sc.platform.system.frontend/src/i18n/messages_tw_CN.json +++ b/io.sc.platform.system.frontend/src/i18n/messages_tw_CN.json @@ -1,8 +1,8 @@ { "menu.workbench": "我的工作台", - "menu.workbench.myTask": "我的代辦", - "menu.workbench.myDoneTask": "我的已辦", - "menu.workbench.myFinishedTask": "我的办結", + "menu.workbench.myTask": "待辦任務", + "menu.workbench.myDoneTask": "辦理中任務", + "menu.workbench.myFinishedTask": "已完成任務", "menu.workbench.myMessage": "我的消息", "menu.workbench.myAnnouncement": "系統公告", @@ -190,7 +190,7 @@ "settings.shortcutMenus.entity.shortcutMenuName": "快捷菜單名稱", "settings.shortcutMenus.entity.menuIconColor": "圖標顏色", - "workbench.myTask.grid.title": "我的代辦任務", + "workbench.myTask.grid.title": "待辦任務", "workbench.myTask.grid.action.process": "辦理", "workbench.myTask.grid.entity.businessKey": "業務流水號", "workbench.myTask.grid.entity.businessDescription": "業務描述", @@ -200,7 +200,7 @@ "workbench.myTask.grid.entity.prefixAssignee": "前一處理人", "workbench.myTask.grid.entity.createTime": "任務開始日期", - "workbench.myDoneTask.grid.title": "我的已辦任務", + "workbench.myDoneTask.grid.title": "辦理中任務", "workbench.myDoneTask.grid.action.view": "查看", "workbench.myDoneTask.grid.entity.businessKey": "業務流水號", "workbench.myDoneTask.grid.entity.businessDescription": "業務描述", @@ -210,7 +210,7 @@ "workbench.myDoneTask.grid.entity.prefixAssignee": "前一處理人", "workbench.myDoneTask.grid.entity.createTime": "任務開始日期", - "workbench.myFinishedTask.grid.title": "我的辦結任務", + "workbench.myFinishedTask.grid.title": "已完成任務", "workbench.myFinishedTask.grid.action.view": "查看", "workbench.myFinishedTask.grid.entity.businessKey": "業務流水號", "workbench.myFinishedTask.grid.entity.businessDescription": "業務描述", diff --git a/io.sc.platform.system.frontend/src/i18n/messages_zh_CN.json b/io.sc.platform.system.frontend/src/i18n/messages_zh_CN.json index d63eb696..6743f55b 100644 --- a/io.sc.platform.system.frontend/src/i18n/messages_zh_CN.json +++ b/io.sc.platform.system.frontend/src/i18n/messages_zh_CN.json @@ -1,8 +1,8 @@ { "menu.workbench": "我的工作台", - "menu.workbench.myTask": "我的代办", - "menu.workbench.myDoneTask": "我的已办", - "menu.workbench.myFinishedTask": "我的办结", + "menu.workbench.myTask": "待办任务", + "menu.workbench.myDoneTask": "办理中任务", + "menu.workbench.myFinishedTask": "已完成任务", "menu.workbench.myMessage": "我的消息", "menu.workbench.myAnnouncement": "系统公告", @@ -220,7 +220,7 @@ "settings.shortcutMenus.entity.shortcutMenuName": "快捷菜单名称", "settings.shortcutMenus.entity.menuIconColor": "图标颜色", - "workbench.myTask.grid.title": "我的代办任务", + "workbench.myTask.grid.title": "待办任务", "workbench.myTask.grid.action.process": "办理", "workbench.myTask.grid.entity.businessKey": "业务流水号", "workbench.myTask.grid.entity.businessDescription": "业务描述", @@ -230,7 +230,7 @@ "workbench.myTask.grid.entity.prefixAssignee": "前一处理人", "workbench.myTask.grid.entity.createTime": "任务开始日期", - "workbench.myDoneTask.grid.title": "我的已办任务", + "workbench.myDoneTask.grid.title": "办理中任务", "workbench.myDoneTask.grid.action.view": "查看", "workbench.myDoneTask.grid.entity.businessKey": "业务流水号", "workbench.myDoneTask.grid.entity.businessDescription": "业务描述", @@ -240,7 +240,7 @@ "workbench.myDoneTask.grid.entity.prefixAssignee": "前一处理人", "workbench.myDoneTask.grid.entity.createTime": "任务开始日期", - "workbench.myFinishedTask.grid.title": "我的办结任务", + "workbench.myFinishedTask.grid.title": "已完成任务", "workbench.myFinishedTask.grid.action.view": "查看", "workbench.myFinishedTask.grid.entity.businessKey": "业务流水号", "workbench.myFinishedTask.grid.entity.businessDescription": "业务描述", diff --git a/io.sc.platform.system.frontend/src/menus/menus.json b/io.sc.platform.system.frontend/src/menus/menus.json index a999fca3..c1b41ef5 100644 --- a/io.sc.platform.system.frontend/src/menus/menus.json +++ b/io.sc.platform.system.frontend/src/menus/menus.json @@ -19,11 +19,11 @@ [ /*我的工作台*/ {"type": "GROUP", "order": 500, "id": "menu.workbench", "titleI18nKey": "menu.workbench", "icon": "bi-person-circle" }, - /*我的工作台/我的代办*/ + /*我的工作台/待办任务*/ {"type":"ROUTE", "order":100, "parentId":"menu.workbench", "id":"menu.workbench.myTask", "titleI18nKey":"menu.workbench.myTask", "icon":"bi-list-ol", "routeName":"route.workbench.myTask"}, - /*我的工作台/我的已办*/ + /*我的工作台/处理中任务*/ {"type":"ROUTE", "order":200, "parentId":"menu.workbench", "id":"menu.workbench.myDoneTask", "titleI18nKey":"menu.workbench.myDoneTask", "icon":"bi-list-check", "routeName":"route.workbench.myDoneTask"}, - /*我的工作台/我的办结*/ + /*我的工作台/已完成任务*/ {"type":"ROUTE", "order":300, "parentId":"menu.workbench", "id":"menu.workbench.myFinishedTask", "titleI18nKey":"menu.workbench.myFinishedTask", "icon":"bi-card-list", "routeName":"route.workbench.myFinishedTask"}, /*我的工作台/我的消息*/ {"type":"ROUTE", "order":400, "parentId":"menu.workbench", "id":"menu.workbench.myMessage", "titleI18nKey":"menu.workbench.myMessage", "icon":"bi-chat-text", "routeName":"route.workbench.myMessage"}, diff --git a/io.sc.standard.frontend/package.json b/io.sc.standard.frontend/package.json index ec28e88a..7c62f3cc 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.102", + "platform-core": "8.2.108", "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 7e43abbc..365814dc 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.102" + "platform-core": "8.2.108" } } \ No newline at end of file diff --git a/wra.report.frontend/package.json b/wra.report.frontend/package.json index abe4d4c5..0eed3d1d 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.102", + "platform-core": "8.2.108", "quasar": "2.17.6", "sort-array": "5.0.0", "svg-path-commander": "2.1.7",