Browse Source

基础框架发布: 8.2.29

1) 修复 jpa 中的一些 bug

前端核心发布: 8.2.108
 1) 修复更换用户登录后标签页仍然保留上一个用户的 bug
main
wangshaoping 2 months ago
parent
commit
0ee88b1dfe
  1. 2
      cips.frontend/package.json
  2. 2
      erm.frontend/package.json
  3. 2
      gradle.properties
  4. 2
      io.sc.engine.mv.frontend/package.json
  5. 2
      io.sc.engine.rule.frontend/package.json
  6. 2
      io.sc.engine.st.frontend/package.json
  7. 2
      io.sc.platform.ai.frontend/package.json
  8. 2
      io.sc.platform.core.frontend/package.json
  9. 6
      io.sc.platform.core.frontend/src/platform/i18n/messages_tw_CN.json
  10. 6
      io.sc.platform.core.frontend/src/platform/i18n/messages_zh_CN.json
  11. 52
      io.sc.platform.core.frontend/src/platform/layout/sub-layout/Topper.vue
  12. 3
      io.sc.platform.core.frontend/src/platform/plugin/axios.ts
  13. 8
      io.sc.platform.core.frontend/src/platform/plugin/manager/RouterManager.ts
  14. 8
      io.sc.platform.core.frontend/src/platform/plugin/manager/TagViewManager.ts
  15. 4
      io.sc.platform.core.frontend/src/platform/types/ConfigureType.ts
  16. 1
      io.sc.platform.core.frontend/src/platform/types/FrontEndRouteType.ts
  17. 2
      io.sc.platform.core.frontend/src/platform/views/home/MyAnnouncement.vue
  18. 2
      io.sc.platform.core.frontend/src/platform/views/home/MyDoneTask.vue
  19. 2
      io.sc.platform.core.frontend/src/platform/views/home/MyFinishedTask.vue
  20. 2
      io.sc.platform.core.frontend/src/platform/views/home/MyMessage.vue
  21. 2
      io.sc.platform.core.frontend/src/platform/views/home/MyTask.vue
  22. 4
      io.sc.platform.core.frontend/template-project/package.json
  23. 2
      io.sc.platform.developer.doc/package.json
  24. 2
      io.sc.platform.developer.frontend/package.json
  25. 2
      io.sc.platform.lcdp.frontend/package.json
  26. 6
      io.sc.platform.lcdp.frontend/src/i18n/messages_tw_CN.json
  27. 6
      io.sc.platform.lcdp.frontend/src/i18n/messages_zh_CN.json
  28. 6
      io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Home.java
  29. 28
      io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/api/Setting.java
  30. 14
      io.sc.platform.lcdp/src/main/java/io/sc/platform/lcdp/configure/service/impl/ConfigureServiceImpl.java
  31. 2
      io.sc.platform.license.keygen.frontend/package.json
  32. 2
      io.sc.platform.mvc.frontend/package.json
  33. 2
      io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/support/criteria/impl/Between.java
  34. 2
      io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/support/criteria/impl/BetweenInclusive.java
  35. 2
      io.sc.platform.scheduler.manager.frontend/package.json
  36. 2
      io.sc.platform.system.frontend/package.json
  37. 12
      io.sc.platform.system.frontend/src/i18n/messages_tw_CN.json
  38. 12
      io.sc.platform.system.frontend/src/i18n/messages_zh_CN.json
  39. 6
      io.sc.platform.system.frontend/src/menus/menus.json
  40. 2
      io.sc.standard.frontend/package.json
  41. 2
      io.sc.website/package.json
  42. 2
      wra.report.frontend/package.json

2
cips.frontend/package.json

@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6", "node-sql-parser": "5.3.6",
"pinia": "2.3.0", "pinia": "2.3.0",
"pinia-undo": "0.2.4", "pinia-undo": "0.2.4",
"platform-core": "8.2.102", "platform-core": "8.2.108",
"quasar": "2.17.6", "quasar": "2.17.6",
"sort-array": "5.0.0", "sort-array": "5.0.0",
"svg-path-commander": "2.1.7", "svg-path-commander": "2.1.7",

2
erm.frontend/package.json

@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6", "node-sql-parser": "5.3.6",
"pinia": "2.3.0", "pinia": "2.3.0",
"pinia-undo": "0.2.4", "pinia-undo": "0.2.4",
"platform-core": "8.2.102", "platform-core": "8.2.108",
"quasar": "2.17.6", "quasar": "2.17.6",
"sort-array": "5.0.0", "sort-array": "5.0.0",
"svg-path-commander": "2.1.7", "svg-path-commander": "2.1.7",

2
gradle.properties

@ -39,7 +39,7 @@ application_version=1.0.0
platform_group=io.sc platform_group=io.sc
platform_version=8.2.28 platform_version=8.2.28
platform_plugin_version=8.2.10 platform_plugin_version=8.2.10
platform_core_frontend_version=8.2.102 platform_core_frontend_version=8.2.108
########################################################### ###########################################################
# dependencies version # dependencies version

2
io.sc.engine.mv.frontend/package.json

@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6", "node-sql-parser": "5.3.6",
"pinia": "2.3.0", "pinia": "2.3.0",
"pinia-undo": "0.2.4", "pinia-undo": "0.2.4",
"platform-core": "8.2.102", "platform-core": "8.2.108",
"quasar": "2.17.6", "quasar": "2.17.6",
"sort-array": "5.0.0", "sort-array": "5.0.0",
"svg-path-commander": "2.1.7", "svg-path-commander": "2.1.7",

2
io.sc.engine.rule.frontend/package.json

@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6", "node-sql-parser": "5.3.6",
"pinia": "2.3.0", "pinia": "2.3.0",
"pinia-undo": "0.2.4", "pinia-undo": "0.2.4",
"platform-core": "8.2.102", "platform-core": "8.2.108",
"quasar": "2.17.6", "quasar": "2.17.6",
"sort-array": "5.0.0", "sort-array": "5.0.0",
"svg-path-commander": "2.1.7", "svg-path-commander": "2.1.7",

2
io.sc.engine.st.frontend/package.json

@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6", "node-sql-parser": "5.3.6",
"pinia": "2.3.0", "pinia": "2.3.0",
"pinia-undo": "0.2.4", "pinia-undo": "0.2.4",
"platform-core": "8.2.102", "platform-core": "8.2.108",
"quasar": "2.17.6", "quasar": "2.17.6",
"sort-array": "5.0.0", "sort-array": "5.0.0",
"svg-path-commander": "2.1.7", "svg-path-commander": "2.1.7",

2
io.sc.platform.ai.frontend/package.json

@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6", "node-sql-parser": "5.3.6",
"pinia": "2.3.0", "pinia": "2.3.0",
"pinia-undo": "0.2.4", "pinia-undo": "0.2.4",
"platform-core": "8.2.102", "platform-core": "8.2.108",
"quasar": "2.17.6", "quasar": "2.17.6",
"sort-array": "5.0.0", "sort-array": "5.0.0",
"svg-path-commander": "2.1.7", "svg-path-commander": "2.1.7",

2
io.sc.platform.core.frontend/package.json

@ -1,6 +1,6 @@
{ {
"name": "platform-core", "name": "platform-core",
"version": "8.2.102", "version": "8.2.108",
"description": "前端核心包,用于快速构建前端的脚手架", "description": "前端核心包,用于快速构建前端的脚手架",
"//main": "库的主文件", "//main": "库的主文件",
"main": "dist/platform-core.js", "main": "dist/platform-core.js",

6
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.routeOrComponentNotSetting": "任務辦理動作未設置, 無法執行!",
"home.card.task.tip.remoteComponentLoadError": "任務辦理組件加載失敗, 無法執行!", "home.card.task.tip.remoteComponentLoadError": "任務辦理組件加載失敗, 無法執行!",
"home.card.myTask.title": "我的代辦", "home.card.myTask.title": "待辦任務",
"home.card.myTask.action.list": "顯示所有", "home.card.myTask.action.list": "顯示所有",
"home.card.myDoneTask.title": "我的已辦", "home.card.myDoneTask.title": "辦理中任務",
"home.card.myDoneTask.action.list": "顯示所有", "home.card.myDoneTask.action.list": "顯示所有",
"home.card.myFinishTask.title": "我的辦結", "home.card.myFinishTask.title": "已完成任務",
"home.card.myFinishTask.action.list": "顯示所有", "home.card.myFinishTask.action.list": "顯示所有",
"home.card.myMessage.title": "我的消息", "home.card.myMessage.title": "我的消息",

6
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.routeOrComponentNotSetting": "任务办理动作未设置, 无法执行!",
"home.card.task.tip.remoteComponentLoadError": "任务办理组件加载失败, 无法执行!", "home.card.task.tip.remoteComponentLoadError": "任务办理组件加载失败, 无法执行!",
"home.card.myTask.title": "我的代办", "home.card.myTask.title": "待办任务",
"home.card.myTask.action.list": "显示所有", "home.card.myTask.action.list": "显示所有",
"home.card.myDoneTask.title": "我的已办", "home.card.myDoneTask.title": "办理中任务",
"home.card.myDoneTask.action.list": "显示所有", "home.card.myDoneTask.action.list": "显示所有",
"home.card.myFinishTask.title": "我的办结", "home.card.myFinishTask.title": "已完成任务",
"home.card.myFinishTask.action.list": "显示所有", "home.card.myFinishTask.action.list": "显示所有",
"home.card.myMessage.title": "我的消息", "home.card.myMessage.title": "我的消息",

52
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 { useQuasar, useInterval } from 'quasar';
import { useI18n } from 'vue-i18n'; 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 LoginDialog from '@/platform/views/LoginDialog';
import AboutDialog from './AboutDialog.vue'; import AboutDialog from './AboutDialog.vue';
import ChangePasswordDialog from './ChangePasswordDialog.vue'; import ChangePasswordDialog from './ChangePasswordDialog.vue';
@ -297,12 +307,39 @@ const openLoginDialog = () => {
if (AuthenticationManager.isOauth2()) { if (AuthenticationManager.isOauth2()) {
loginDialog.value.open(); loginDialog.value.open();
} else { } 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 = () => { const logout = () => {
if (gc.theme.login.logoutConfirm) { 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 quasar
.dialog({ .dialog({
title: t('logout'), title: t('logout'),
@ -331,18 +368,21 @@ const logout = () => {
}; };
const doLogout = () => { const doLogout = () => {
// SessionStore ,
// SessionStore Tab
TagViewManager.clearTagViewsAndBreadcrumbs();
if (AuthenticationManager.isOauth2()) { if (AuthenticationManager.isOauth2()) {
AuthenticationManager.removeLocalAccessToken(); AuthenticationManager.removeLocalAccessToken();
window.location.href = Environment.getWebContextPath(); window.location.href = Environment.getWebContextPath();
} else { } else {
axios.post(Environment.apiContextPath(Environment.getConfigure().setting.logoutActionUrl)).then(() => { axios.post(Environment.apiContextPath(Environment.getConfigure().setting.logoutUrl)).then(() => {
window.location.href = Environment.getWebContextPath(); window.location.href = Tools.concatUrl(Environment.getWebContextPath(), Environment.getConfigure().setting.logoutSuccessUrl);
}); });
} }
}; };
const findUnCompletedTasks = () => { 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 || []; unCompletedTasksRef.value = response.data.content || [];
unCompletedTasksTotalCountRef.value = response.data.totalElements; unCompletedTasksTotalCountRef.value = response.data.totalElements;
}); });
@ -373,7 +413,7 @@ const findUnReadedNotifications = () => {
}; };
const findUnReadedAnnouncements = () => { 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 || []; unReadedAnnouncementsRef.value = response.data.content || [];
unReadedAnnouncementsTotalCountRef.value = response.data.totalElements; unReadedAnnouncementsTotalCountRef.value = response.data.totalElements;
}); });

3
io.sc.platform.core.frontend/src/platform/plugin/axios.ts

@ -68,12 +68,11 @@ const getResponseErrorInterceptor = (handleError: boolean) => {
QuasarTools.getQuasar()?.loading?.hide(); QuasarTools.getQuasar()?.loading?.hide();
const errorWrapper = ServerExceptionHandler.getError(error); const errorWrapper = ServerExceptionHandler.getError(error);
console.log(errorWrapper.status);
if (errorWrapper.status === 401) { if (errorWrapper.status === 401) {
if (error.request.responseURL.endsWith('/api/system/user/session')) { if (error.request.responseURL.endsWith('/api/system/user/session')) {
return Promise.resolve({}); return Promise.resolve({});
} else { } else {
//Environment.executeAction('openLoginDialog'); Environment.executeAction('openLoginDialog');
return Promise.reject(errorWrapper); return Promise.reject(errorWrapper);
} }
} else { } else {

8
io.sc.platform.core.frontend/src/platform/plugin/manager/RouterManager.ts

@ -26,7 +26,13 @@ class RouterManager {
* @param localRoutes * @param localRoutes
*/ */
public static setLocalRoutes(localRoutes: FrontEndRouteType[] = []) { 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;
} }
/** /**

8
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 * TagView
* @param to * @param to

4
io.sc.platform.core.frontend/src/platform/types/ConfigureType.ts

@ -53,7 +53,9 @@ export type ConfigureType = {
setting: { setting: {
sessionTimeout: number; //会话过期时间,单位:秒 sessionTimeout: number; //会话过期时间,单位:秒
homePage: string; // 首页路由 path homePage: string; // 首页路由 path
logoutActionUrl: string; // 登出 Action URL loginPage: string; // 登录 URL
logoutUrl: string; // 登出 URL
logoutSuccessUrl: string; // 登出 URL
i18n: { i18n: {
availableLocales: string[]; // 支持的国际化多语言数组 availableLocales: string[]; // 支持的国际化多语言数组
locale: string; // 默认区域 locale: string; // 默认区域

1
io.sc.platform.core.frontend/src/platform/types/FrontEndRouteType.ts

@ -7,6 +7,7 @@ export type FrontEndRouteMetaType = {
}; };
export type FrontEndRouteType = { export type FrontEndRouteType = {
remoteComponent: boolean;
force: boolean; force: boolean;
name: string; name: string;
icon: string; icon: string;

2
io.sc.platform.core.frontend/src/platform/views/home/MyAnnouncement.vue

@ -55,7 +55,7 @@ const dialogRef = ref();
const changeFirstColMaxWidth = () => { const changeFirstColMaxWidth = () => {
//card width //card width
let width = Math.ceil(cardRef.value.$el.clientWidth); 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 //min width
width = width >= 100 ? width : 100; width = width >= 100 ? width : 100;
firstColMaxWidthRef.value = width; firstColMaxWidthRef.value = width;

2
io.sc.platform.core.frontend/src/platform/views/home/MyDoneTask.vue

@ -77,7 +77,7 @@ const componentRef = ref();
const changeFirstColMaxWidth = () => { const changeFirstColMaxWidth = () => {
//card width //card width
let width = Math.ceil(cardRef.value.$el.clientWidth); 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 //min width
width = width >= 100 ? width : 100; width = width >= 100 ? width : 100;
firstColMaxWidthRef.value = width; firstColMaxWidthRef.value = width;

2
io.sc.platform.core.frontend/src/platform/views/home/MyFinishedTask.vue

@ -77,7 +77,7 @@ const componentRef = ref();
const changeFirstColMaxWidth = () => { const changeFirstColMaxWidth = () => {
//card width //card width
let width = Math.ceil(cardRef.value.$el.clientWidth); 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 //min width
width = width >= 100 ? width : 100; width = width >= 100 ? width : 100;
firstColMaxWidthRef.value = width; firstColMaxWidthRef.value = width;

2
io.sc.platform.core.frontend/src/platform/views/home/MyMessage.vue

@ -66,7 +66,7 @@ const systemMessageDialogRef = ref();
const changeFirstColMaxWidth = () => { const changeFirstColMaxWidth = () => {
//card width //card width
let width = Math.ceil(cardRef.value.$el.clientWidth); 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 //min width
width = width >= 100 ? width : 100; width = width >= 100 ? width : 100;
firstColMaxWidthRef.value = width; firstColMaxWidthRef.value = width;

2
io.sc.platform.core.frontend/src/platform/views/home/MyTask.vue

@ -79,7 +79,7 @@ const componentRef = ref();
const changeFirstColMaxWidth = () => { const changeFirstColMaxWidth = () => {
//card width //card width
let width = Math.ceil(cardRef.value.$el.clientWidth); 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 //min width
width = width >= 100 ? width : 100; width = width >= 100 ? width : 100;
firstColMaxWidthRef.value = width; firstColMaxWidthRef.value = width;

4
io.sc.platform.core.frontend/template-project/package.json

@ -1,6 +1,6 @@
{ {
"name": "platform-core", "name": "platform-core",
"version": "8.2.102", "version": "8.2.108",
"description": "前端核心包,用于快速构建前端的脚手架", "description": "前端核心包,用于快速构建前端的脚手架",
"private": false, "private": false,
"keywords": [], "keywords": [],
@ -111,7 +111,7 @@
"mockjs": "1.1.0", "mockjs": "1.1.0",
"node-sql-parser": "5.3.6", "node-sql-parser": "5.3.6",
"pinia": "2.3.0", "pinia": "2.3.0",
"platform-core": "8.2.102", "platform-core": "8.2.108",
"quasar": "2.17.6", "quasar": "2.17.6",
"sort-array": "5.0.0", "sort-array": "5.0.0",
"svg-path-commander": "2.1.7", "svg-path-commander": "2.1.7",

2
io.sc.platform.developer.doc/package.json

@ -28,7 +28,7 @@
"vuepress": "2.0.0-rc.15" "vuepress": "2.0.0-rc.15"
}, },
"dependencies": { "dependencies": {
"platform-core": "8.2.102", "platform-core": "8.2.108",
"quasar": "2.17.6", "quasar": "2.17.6",
"vue": "3.5.13", "vue": "3.5.13",
"vue-i18n": "11.0.1" "vue-i18n": "11.0.1"

2
io.sc.platform.developer.frontend/package.json

@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6", "node-sql-parser": "5.3.6",
"pinia": "2.3.0", "pinia": "2.3.0",
"pinia-undo": "0.2.4", "pinia-undo": "0.2.4",
"platform-core": "8.2.102", "platform-core": "8.2.108",
"quasar": "2.17.6", "quasar": "2.17.6",
"sort-array": "5.0.0", "sort-array": "5.0.0",
"svg-path-commander": "2.1.7", "svg-path-commander": "2.1.7",

2
io.sc.platform.lcdp.frontend/package.json

@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6", "node-sql-parser": "5.3.6",
"pinia": "2.3.0", "pinia": "2.3.0",
"pinia-undo": "0.2.4", "pinia-undo": "0.2.4",
"platform-core": "8.2.102", "platform-core": "8.2.108",
"quasar": "2.17.6", "quasar": "2.17.6",
"sort-array": "5.0.0", "sort-array": "5.0.0",
"svg-path-commander": "2.1.7", "svg-path-commander": "2.1.7",

6
io.sc.platform.lcdp.frontend/src/i18n/messages_tw_CN.json

@ -17,9 +17,9 @@
"theme.navigateMenuPosition": "導航菜單位置", "theme.navigateMenuPosition": "導航菜單位置",
"theme.home": "首頁", "theme.home": "首頁",
"theme.home.myTaskTextColor": "我的代辦文本顏色", "theme.home.myTaskTextColor": "待辦任務文本顏色",
"theme.home.myDoneTaskTextColor": "我的已辦文本顏色", "theme.home.myDoneTaskTextColor": "辦理中任務文本顏色",
"theme.home.myFinishedTaskTextColor": "我的辦結文本顏色", "theme.home.myFinishedTaskTextColor": "已完成任務文本顏色",
"theme.home.myMessageTextColor": "我的消息文本顏色", "theme.home.myMessageTextColor": "我的消息文本顏色",
"theme.home.announcementTextColor": "系統公告文本顏色", "theme.home.announcementTextColor": "系統公告文本顏色",

6
io.sc.platform.lcdp.frontend/src/i18n/messages_zh_CN.json

@ -17,9 +17,9 @@
"theme.navigateMenuPosition": "导航菜单位置", "theme.navigateMenuPosition": "导航菜单位置",
"theme.home": "首页", "theme.home": "首页",
"theme.home.myTaskTextColor": "我的代办文本颜色", "theme.home.myTaskTextColor": "待办任务文本颜色",
"theme.home.myDoneTaskTextColor": "我的已办文本颜色", "theme.home.myDoneTaskTextColor": "办理中任务文本颜色",
"theme.home.myFinishedTaskTextColor": "我的办结文本颜色", "theme.home.myFinishedTaskTextColor": "已完成任务文本颜色",
"theme.home.myMessageTextColor": "我的消息文本颜色", "theme.home.myMessageTextColor": "我的消息文本颜色",
"theme.home.announcementTextColor": "系统公告文本颜色", "theme.home.announcementTextColor": "系统公告文本颜色",

6
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; package io.sc.platform.lcdp.configure.api;
public class Home { public class Home {
private String myTaskTextColor ="black"; // 我的代办文本颜色 private String myTaskTextColor ="black"; // 待办任务文本颜色
private String myDoneTaskTextColor ="black"; // 我的已办文本颜色 private String myDoneTaskTextColor ="black"; // 处理中任务文本颜色
private String myFinishedTaskTextColor ="black"; // 我的办结文本颜色 private String myFinishedTaskTextColor ="black"; // 已完成任务文本颜色
private String myMessageTextColor ="black"; // 我的消息文本颜色 private String myMessageTextColor ="black"; // 我的消息文本颜色
private String announcementTextColor ="black"; // 系统公告文本颜色 private String announcementTextColor ="black"; // 系统公告文本颜色

28
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 { public class Setting {
private long sessionTimeout =30 * 60; // 会话过期时间(单位:秒) private long sessionTimeout =30 * 60; // 会话过期时间(单位:秒)
private String homePage ="/home"; // 首页路由 path 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 I18n i18n =new I18n(); // 多语言国际化
private boolean enableChangeRole =false; // 是否允许切换角色(当一个用户拥有多个角色时) private boolean enableChangeRole =false; // 是否允许切换角色(当一个用户拥有多个角色时)
private boolean isMultiCorporationMode =false; // 是否是多法人模式 private boolean isMultiCorporationMode =false; // 是否是多法人模式
@ -27,12 +29,28 @@ public class Setting {
this.homePage = homePage; this.homePage = homePage;
} }
public String getLogoutActionUrl() { public String getLoginPage() {
return logoutActionUrl; return loginPage;
} }
public void setLogoutActionUrl(String logoutActionUrl) { public void setLoginPage(String loginPage) {
this.logoutActionUrl = logoutActionUrl; 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() { public I18n getI18n() {

14
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<ConfigureEntity, String
configure.getSetting().setHomePage(homePage); configure.getSetting().setHomePage(homePage);
} }
String logoutActionUrl =securityProperties.getLogout().getLogoutUrl(); String loginPage =securityProperties.getFormLogin().getLoginPage();
if(StringUtils.hasText(logoutActionUrl)) { String logoutUrl =securityProperties.getLogout().getLogoutUrl();
configure.getSetting().setLogoutActionUrl(logoutActionUrl); String logoutSuccessUrl =securityProperties.getLogout().getLogoutSuccessUrl();
if(StringUtils.hasText(loginPage)) {
configure.getSetting().setLoginPage(loginPage);
}
if(StringUtils.hasText(logoutUrl)) {
configure.getSetting().setLogoutUrl(logoutUrl);
}
if(StringUtils.hasText(logoutSuccessUrl)) {
configure.getSetting().setLogoutSuccessUrl(logoutSuccessUrl);
} }
String encodePassword =parameters.get("parameter.system.login.encodePassword"); String encodePassword =parameters.get("parameter.system.login.encodePassword");

2
io.sc.platform.license.keygen.frontend/package.json

@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6", "node-sql-parser": "5.3.6",
"pinia": "2.3.0", "pinia": "2.3.0",
"pinia-undo": "0.2.4", "pinia-undo": "0.2.4",
"platform-core": "8.2.102", "platform-core": "8.2.108",
"quasar": "2.17.6", "quasar": "2.17.6",
"sort-array": "5.0.0", "sort-array": "5.0.0",
"svg-path-commander": "2.1.7", "svg-path-commander": "2.1.7",

2
io.sc.platform.mvc.frontend/package.json

@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6", "node-sql-parser": "5.3.6",
"pinia": "2.3.0", "pinia": "2.3.0",
"pinia-undo": "0.2.4", "pinia-undo": "0.2.4",
"platform-core": "8.2.102", "platform-core": "8.2.108",
"quasar": "2.17.6", "quasar": "2.17.6",
"sort-array": "5.0.0", "sort-array": "5.0.0",
"svg-path-commander": "2.1.7", "svg-path-commander": "2.1.7",

2
io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/support/criteria/impl/Between.java

@ -68,7 +68,7 @@ public class Between<E> extends Criteria<E> {
condition.setWhere(StringUtil.format("${0} > ${1}",fieldName,nStart)); condition.setWhere(StringUtil.format("${0} > ${1}",fieldName,nStart));
condition.getParameters().put(nStart.substring(1),pStart); condition.getParameters().put(nStart.substring(1),pStart);
}else { }else {
condition.setWhere(StringUtil.format("${0} < ${2}",fieldName,nEnd)); condition.setWhere(StringUtil.format("${0} < ${1}",fieldName,nEnd));
condition.getParameters().put(nEnd.substring(1),pEnd); condition.getParameters().put(nEnd.substring(1),pEnd);
} }
return condition; return condition;

2
io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/support/criteria/impl/BetweenInclusive.java

@ -64,7 +64,7 @@ public class BetweenInclusive<E> extends Between<E> {
condition.setWhere(StringUtil.format("${0} >= ${1}",fieldName,nStart)); condition.setWhere(StringUtil.format("${0} >= ${1}",fieldName,nStart));
condition.getParameters().put(nStart.substring(1),pStart); condition.getParameters().put(nStart.substring(1),pStart);
}else { }else {
condition.setWhere(StringUtil.format("${0} <= ${2}",fieldName,nEnd)); condition.setWhere(StringUtil.format("${0} <= ${1}",fieldName,nEnd));
condition.getParameters().put(nEnd.substring(1),pEnd); condition.getParameters().put(nEnd.substring(1),pEnd);
} }
return condition; return condition;

2
io.sc.platform.scheduler.manager.frontend/package.json

@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6", "node-sql-parser": "5.3.6",
"pinia": "2.3.0", "pinia": "2.3.0",
"pinia-undo": "0.2.4", "pinia-undo": "0.2.4",
"platform-core": "8.2.102", "platform-core": "8.2.108",
"quasar": "2.17.6", "quasar": "2.17.6",
"sort-array": "5.0.0", "sort-array": "5.0.0",
"svg-path-commander": "2.1.7", "svg-path-commander": "2.1.7",

2
io.sc.platform.system.frontend/package.json

@ -111,7 +111,7 @@
"mockjs": "1.1.0", "mockjs": "1.1.0",
"node-sql-parser": "5.3.6", "node-sql-parser": "5.3.6",
"pinia": "2.3.0", "pinia": "2.3.0",
"platform-core": "8.2.102", "platform-core": "8.2.108",
"quasar": "2.17.6", "quasar": "2.17.6",
"sort-array": "5.0.0", "sort-array": "5.0.0",
"svg-path-commander": "2.1.7", "svg-path-commander": "2.1.7",

12
io.sc.platform.system.frontend/src/i18n/messages_tw_CN.json

@ -1,8 +1,8 @@
{ {
"menu.workbench": "我的工作台", "menu.workbench": "我的工作台",
"menu.workbench.myTask": "我的代辦", "menu.workbench.myTask": "待辦任務",
"menu.workbench.myDoneTask": "我的已辦", "menu.workbench.myDoneTask": "辦理中任務",
"menu.workbench.myFinishedTask": "我的办結", "menu.workbench.myFinishedTask": "已完成任務",
"menu.workbench.myMessage": "我的消息", "menu.workbench.myMessage": "我的消息",
"menu.workbench.myAnnouncement": "系統公告", "menu.workbench.myAnnouncement": "系統公告",
@ -190,7 +190,7 @@
"settings.shortcutMenus.entity.shortcutMenuName": "快捷菜單名稱", "settings.shortcutMenus.entity.shortcutMenuName": "快捷菜單名稱",
"settings.shortcutMenus.entity.menuIconColor": "圖標顏色", "settings.shortcutMenus.entity.menuIconColor": "圖標顏色",
"workbench.myTask.grid.title": "我的代辦任務", "workbench.myTask.grid.title": "辦任務",
"workbench.myTask.grid.action.process": "辦理", "workbench.myTask.grid.action.process": "辦理",
"workbench.myTask.grid.entity.businessKey": "業務流水號", "workbench.myTask.grid.entity.businessKey": "業務流水號",
"workbench.myTask.grid.entity.businessDescription": "業務描述", "workbench.myTask.grid.entity.businessDescription": "業務描述",
@ -200,7 +200,7 @@
"workbench.myTask.grid.entity.prefixAssignee": "前一處理人", "workbench.myTask.grid.entity.prefixAssignee": "前一處理人",
"workbench.myTask.grid.entity.createTime": "任務開始日期", "workbench.myTask.grid.entity.createTime": "任務開始日期",
"workbench.myDoneTask.grid.title": "我的已辦任務", "workbench.myDoneTask.grid.title": "辦理中任務",
"workbench.myDoneTask.grid.action.view": "查看", "workbench.myDoneTask.grid.action.view": "查看",
"workbench.myDoneTask.grid.entity.businessKey": "業務流水號", "workbench.myDoneTask.grid.entity.businessKey": "業務流水號",
"workbench.myDoneTask.grid.entity.businessDescription": "業務描述", "workbench.myDoneTask.grid.entity.businessDescription": "業務描述",
@ -210,7 +210,7 @@
"workbench.myDoneTask.grid.entity.prefixAssignee": "前一處理人", "workbench.myDoneTask.grid.entity.prefixAssignee": "前一處理人",
"workbench.myDoneTask.grid.entity.createTime": "任務開始日期", "workbench.myDoneTask.grid.entity.createTime": "任務開始日期",
"workbench.myFinishedTask.grid.title": "我的辦結任務", "workbench.myFinishedTask.grid.title": "已完成任務",
"workbench.myFinishedTask.grid.action.view": "查看", "workbench.myFinishedTask.grid.action.view": "查看",
"workbench.myFinishedTask.grid.entity.businessKey": "業務流水號", "workbench.myFinishedTask.grid.entity.businessKey": "業務流水號",
"workbench.myFinishedTask.grid.entity.businessDescription": "業務描述", "workbench.myFinishedTask.grid.entity.businessDescription": "業務描述",

12
io.sc.platform.system.frontend/src/i18n/messages_zh_CN.json

@ -1,8 +1,8 @@
{ {
"menu.workbench": "我的工作台", "menu.workbench": "我的工作台",
"menu.workbench.myTask": "我的代办", "menu.workbench.myTask": "待办任务",
"menu.workbench.myDoneTask": "我的已办", "menu.workbench.myDoneTask": "办理中任务",
"menu.workbench.myFinishedTask": "我的办结", "menu.workbench.myFinishedTask": "已完成任务",
"menu.workbench.myMessage": "我的消息", "menu.workbench.myMessage": "我的消息",
"menu.workbench.myAnnouncement": "系统公告", "menu.workbench.myAnnouncement": "系统公告",
@ -220,7 +220,7 @@
"settings.shortcutMenus.entity.shortcutMenuName": "快捷菜单名称", "settings.shortcutMenus.entity.shortcutMenuName": "快捷菜单名称",
"settings.shortcutMenus.entity.menuIconColor": "图标颜色", "settings.shortcutMenus.entity.menuIconColor": "图标颜色",
"workbench.myTask.grid.title": "我的代办任务", "workbench.myTask.grid.title": "办任务",
"workbench.myTask.grid.action.process": "办理", "workbench.myTask.grid.action.process": "办理",
"workbench.myTask.grid.entity.businessKey": "业务流水号", "workbench.myTask.grid.entity.businessKey": "业务流水号",
"workbench.myTask.grid.entity.businessDescription": "业务描述", "workbench.myTask.grid.entity.businessDescription": "业务描述",
@ -230,7 +230,7 @@
"workbench.myTask.grid.entity.prefixAssignee": "前一处理人", "workbench.myTask.grid.entity.prefixAssignee": "前一处理人",
"workbench.myTask.grid.entity.createTime": "任务开始日期", "workbench.myTask.grid.entity.createTime": "任务开始日期",
"workbench.myDoneTask.grid.title": "我的已办任务", "workbench.myDoneTask.grid.title": "办理中任务",
"workbench.myDoneTask.grid.action.view": "查看", "workbench.myDoneTask.grid.action.view": "查看",
"workbench.myDoneTask.grid.entity.businessKey": "业务流水号", "workbench.myDoneTask.grid.entity.businessKey": "业务流水号",
"workbench.myDoneTask.grid.entity.businessDescription": "业务描述", "workbench.myDoneTask.grid.entity.businessDescription": "业务描述",
@ -240,7 +240,7 @@
"workbench.myDoneTask.grid.entity.prefixAssignee": "前一处理人", "workbench.myDoneTask.grid.entity.prefixAssignee": "前一处理人",
"workbench.myDoneTask.grid.entity.createTime": "任务开始日期", "workbench.myDoneTask.grid.entity.createTime": "任务开始日期",
"workbench.myFinishedTask.grid.title": "我的办结任务", "workbench.myFinishedTask.grid.title": "已完成任务",
"workbench.myFinishedTask.grid.action.view": "查看", "workbench.myFinishedTask.grid.action.view": "查看",
"workbench.myFinishedTask.grid.entity.businessKey": "业务流水号", "workbench.myFinishedTask.grid.entity.businessKey": "业务流水号",
"workbench.myFinishedTask.grid.entity.businessDescription": "业务描述", "workbench.myFinishedTask.grid.entity.businessDescription": "业务描述",

6
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": "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":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":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":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"}, {"type":"ROUTE", "order":400, "parentId":"menu.workbench", "id":"menu.workbench.myMessage", "titleI18nKey":"menu.workbench.myMessage", "icon":"bi-chat-text", "routeName":"route.workbench.myMessage"},

2
io.sc.standard.frontend/package.json

@ -112,7 +112,7 @@
"node-sql-parser": "5.3.6", "node-sql-parser": "5.3.6",
"pinia": "2.3.0", "pinia": "2.3.0",
"pinia-undo": "0.2.4", "pinia-undo": "0.2.4",
"platform-core": "8.2.102", "platform-core": "8.2.108",
"quasar": "2.17.6", "quasar": "2.17.6",
"sort-array": "5.0.0", "sort-array": "5.0.0",
"svg-path-commander": "2.1.7", "svg-path-commander": "2.1.7",

2
io.sc.website/package.json

@ -28,6 +28,6 @@
}, },
"dependencies": { "dependencies": {
"vue": "3.5.13", "vue": "3.5.13",
"platform-core": "8.2.102" "platform-core": "8.2.108"
} }
} }

2
wra.report.frontend/package.json

@ -111,7 +111,7 @@
"mockjs": "1.1.0", "mockjs": "1.1.0",
"node-sql-parser": "5.3.6", "node-sql-parser": "5.3.6",
"pinia": "2.3.0", "pinia": "2.3.0",
"platform-core": "8.2.102", "platform-core": "8.2.108",
"quasar": "2.17.6", "quasar": "2.17.6",
"sort-array": "5.0.0", "sort-array": "5.0.0",
"svg-path-commander": "2.1.7", "svg-path-commander": "2.1.7",

Loading…
Cancel
Save