diff --git a/erm.frontend/package.json b/erm.frontend/package.json index afe53eeb..5a0996f4 100644 --- a/erm.frontend/package.json +++ b/erm.frontend/package.json @@ -92,7 +92,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.301", + "platform-core": "8.1.302", "quasar": "2.15.4", "tailwindcss": "3.4.4", "vue": "3.4.31", diff --git a/gradle.properties b/gradle.properties index 9cd66bb5..1d1b80ec 100644 --- a/gradle.properties +++ b/gradle.properties @@ -38,7 +38,7 @@ application_version=1.0.0 platform_group=io.sc platform_version=8.1.46 platform_plugin_version=8.1.46 -platform_core_frontend_version=8.1.301 +platform_core_frontend_version=8.1.302 ########################################################### # dependencies version diff --git a/io.sc.engine.mv.frontend/package.json b/io.sc.engine.mv.frontend/package.json index 952c322e..7a7ae036 100644 --- a/io.sc.engine.mv.frontend/package.json +++ b/io.sc.engine.mv.frontend/package.json @@ -92,7 +92,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.301", + "platform-core": "8.1.302", "quasar": "2.15.4", "tailwindcss": "3.4.4", "vue": "3.4.31", diff --git a/io.sc.engine.rule.frontend/package.json b/io.sc.engine.rule.frontend/package.json index 84feaf4b..f77ded26 100644 --- a/io.sc.engine.rule.frontend/package.json +++ b/io.sc.engine.rule.frontend/package.json @@ -92,7 +92,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.301", + "platform-core": "8.1.302", "quasar": "2.15.4", "tailwindcss": "3.4.4", "vue": "3.4.31", diff --git a/io.sc.engine.st.frontend/package.json b/io.sc.engine.st.frontend/package.json index 7ff4ce8e..ab77cbf0 100644 --- a/io.sc.engine.st.frontend/package.json +++ b/io.sc.engine.st.frontend/package.json @@ -92,7 +92,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.301", + "platform-core": "8.1.302", "quasar": "2.15.4", "tailwindcss": "3.4.4", "vue": "3.4.31", diff --git a/io.sc.platform.core.frontend/package.json b/io.sc.platform.core.frontend/package.json index 22cb288e..2073e37b 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.1.301", + "version": "8.1.302", "description": "前端核心包,用于快速构建前端的脚手架", "//main": "库的主文件", "main": "dist/platform-core.js", @@ -109,7 +109,7 @@ "@codemirror/search": "6.5.6", "@codemirror/state": "6.4.1", "@codemirror/view": "6.28.4", - "@maxgraph/core": "0.12.0", + "@maxgraph/core": "0.13.0", "@quasar/extras": "1.16.12", "@vueuse/core": "10.11.0", "axios": "1.7.2", diff --git a/io.sc.platform.core.frontend/src/i18n/messages.json b/io.sc.platform.core.frontend/src/i18n/messages.json index 34a10912..cbfc171d 100644 --- a/io.sc.platform.core.frontend/src/i18n/messages.json +++ b/io.sc.platform.core.frontend/src/i18n/messages.json @@ -8,6 +8,7 @@ "menu.testcase.loading":"Loading", "menu.testcase.excel": "Excel", "menu.testcase.word": "Word", + "menu.testcase.maxgraph": "Graph Editor", "route.testcase.noMenuRoute":"No Menu Route" } diff --git a/io.sc.platform.core.frontend/src/i18n/messages_tw_CN.json b/io.sc.platform.core.frontend/src/i18n/messages_tw_CN.json index fa1f6bce..bf8f44d8 100644 --- a/io.sc.platform.core.frontend/src/i18n/messages_tw_CN.json +++ b/io.sc.platform.core.frontend/src/i18n/messages_tw_CN.json @@ -8,6 +8,7 @@ "menu.testcase.loading":"正在加載", "menu.testcase.excel": "Excel", "menu.testcase.word": "Word", + "menu.testcase.maxgraph": "图形编辑器", "route.testcase.noMenuRoute":"無關聯菜單路由" } diff --git a/io.sc.platform.core.frontend/src/i18n/messages_zh_CN.json b/io.sc.platform.core.frontend/src/i18n/messages_zh_CN.json index bfb24469..2df3af9a 100644 --- a/io.sc.platform.core.frontend/src/i18n/messages_zh_CN.json +++ b/io.sc.platform.core.frontend/src/i18n/messages_zh_CN.json @@ -8,6 +8,7 @@ "menu.testcase.loading":"正在加載", "menu.testcase.excel": "Excel", "menu.testcase.word": "Word", + "menu.testcase.maxgraph": "图形编辑器", "route.testcase.noMenuRoute":"无关联菜单路由" } diff --git a/io.sc.platform.core.frontend/src/menus/menus.json b/io.sc.platform.core.frontend/src/menus/menus.json index fa574257..f1a8e8bb 100644 --- a/io.sc.platform.core.frontend/src/menus/menus.json +++ b/io.sc.platform.core.frontend/src/menus/menus.json @@ -85,19 +85,19 @@ "type": "ROUTE", "order": 500, "parentId": "menu.testcase", - "id": "menu.testcase.maxgraph", - "titleI18nKey": "menu.testcase.maxgraph", + "id": "menu.testcase.word", + "titleI18nKey": "menu.testcase.word", "icon": "bi-palette", - "routeName": "route.testcase.maxgraph" + "routeName": "route.testcase.word" }, { "type": "ROUTE", - "order": 500, + "order": 600, "parentId": "menu.testcase", - "id": "menu.testcase.word", - "titleI18nKey": "menu.testcase.word", + "id": "menu.testcase.maxgraph", + "titleI18nKey": "menu.testcase.maxgraph", "icon": "bi-palette", - "routeName": "route.testcase.word" + "routeName": "route.testcase.maxgraph" }, { "type": "GROUP", "order": 30000, "id": "menu.testcase.likm", "titleI18nKey": "测试用例-likm", "icon": "home" }, diff --git a/io.sc.platform.core.frontend/src/platform/PConst.ts b/io.sc.platform.core.frontend/src/platform/PConst.ts index 75aea481..3f451960 100644 --- a/io.sc.platform.core.frontend/src/platform/PConst.ts +++ b/io.sc.platform.core.frontend/src/platform/PConst.ts @@ -69,6 +69,11 @@ class PConst { */ static API_LOGIN_URL: string = '/login'; + /** + * 监测用户是否登录 API URL + */ + static API_AUTHENTICATION_URL: string = '/api/isAuthenticated'; + /** * 用户会话(包括: 用户信息, 菜单信息, 前端路由信息等) API URL */ diff --git a/io.sc.platform.core.frontend/src/platform/components/graph/WGraph.vue b/io.sc.platform.core.frontend/src/platform/components/graph/WGraph.vue new file mode 100644 index 00000000..b4bd8b8e --- /dev/null +++ b/io.sc.platform.core.frontend/src/platform/components/graph/WGraph.vue @@ -0,0 +1,121 @@ + + diff --git a/io.sc.platform.core.frontend/src/platform/components/index.ts b/io.sc.platform.core.frontend/src/platform/components/index.ts index f673b9e5..0a6b0963 100644 --- a/io.sc.platform.core.frontend/src/platform/components/index.ts +++ b/io.sc.platform.core.frontend/src/platform/components/index.ts @@ -51,6 +51,7 @@ import WSelectAssigneeDialog from './workflow/WSelectAssigneeDialog.vue'; import WEcharts from './echarts/WEcharts.vue'; import WExpression from './expression/WExpression.vue'; import WMath from './math/WMath.vue'; +import WGraph from './graph/WGraph.vue'; import WHtmlA from './html/WHtmlA.vue'; @@ -107,6 +108,7 @@ export default { app.component('WEcharts', WEcharts); app.component('WExpression', WExpression); app.component('WMath', WMath); + app.component('WGraph', WGraph); app.component('WHtmlA', WHtmlA); }, }; @@ -150,6 +152,7 @@ export { WEcharts, WExpression, WMath, + WGraph, WHtmlA, }; 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 8d4025bf..e64c3c9e 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 @@ -269,7 +269,23 @@ "math.contextMenu.miTomn": "变量 -> 常量", "math.contextMenu.mnTomi": "常量 -> 变量", "math.contextMenu.mnTo0": "设置为 0", - "math.contextMenu.mnTo1": "设置为 1" + "math.contextMenu.mnTo1": "设置为 1", + "graph.toolbar.actions.zoomIn": "放大", + "graph.toolbar.actions.zoomOut": "缩小", + "graph.toolbar.actions.undo": "撤销", + "graph.toolbar.actions.redo": "重做", + "graph.toolbar.actions.top": "置于顶层", + "graph.toolbar.actions.bottom": "置于底层", + "graph.toolbar.actions.fillColor": "填充颜色", + "graph.toolbar.actions.lineColor": "线条颜色", + "graph.toolbar.actions.shadow": "阴影", + "graph.toolbar.actions.connection": "连接", + "graph.toolbar.actions.path": "路径", + + "graph.setting.panel.properties.title": "属性", + "graph.setting.panel.style.title": "样式", + "graph.setting.panel.text.title": "文本", + "graph.setting.panel.arrange.title": "排列" } diff --git a/io.sc.platform.core.frontend/src/platform/index.ts b/io.sc.platform.core.frontend/src/platform/index.ts index 77111468..c3d28fc4 100644 --- a/io.sc.platform.core.frontend/src/platform/index.ts +++ b/io.sc.platform.core.frontend/src/platform/index.ts @@ -158,6 +158,7 @@ export { WEcharts, WExpression, WMath, + WGraph, WHtmlA, } from './components'; 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 6d2a808f..4c281f60 100644 --- a/io.sc.platform.core.frontend/src/platform/plugin/axios.ts +++ b/io.sc.platform.core.frontend/src/platform/plugin/axios.ts @@ -3,7 +3,7 @@ import Axios from 'axios'; import { i18n } from './i18n'; import { PConst } from '@/platform/PConst'; import { Environment } from '@/platform/plugin/environment'; -import { NotifyManager, AuthenticationManager } from './manager'; +import { NotifyManager, AuthenticationManager, SessionManager } from './manager'; import { QuasarTools } from '@/platform/utils'; const ignoredUrls: string[] = [PConst.API_I18N_MESSAGES_URL, PConst.API_APP_CONFIGURE_URL]; @@ -11,6 +11,12 @@ const gc = Environment.getConfigure(); // 请求拦截器 const requestInterceptor = (config: any) => { + // 监测会话是否过期 + if (SessionManager.isTimeout()) { + AuthenticationManager.removeLocalAccessToken(); + } + + // 设置区域 config.headers.locale = gc.setting.i18n.locale; // 忽略无需认证的请求 URL for (const url of ignoredUrls) { @@ -23,13 +29,6 @@ const requestInterceptor = (config: any) => { result.headers.Authorization = 'Bearer ' + AuthenticationManager.getLocalAccessToken(); } - /* - // 对于需要认证的请求 URL 添加 basic 认证 - const result = config; - if (gc.axios?.basicAuth?.enable) { - result.headers.Authorization = 'Basic ' + window.btoa(gc.axios.basicAuth.username + ':' + gc.axios.basicAuth.password); - } - */ // 如果请求时传入 { loading: true } 属性, 则自动显示 "正在处理..., 请等待" 模态对话框 if (config?.loading) { QuasarTools.getQuasar()?.loading?.show({ @@ -38,6 +37,8 @@ const requestInterceptor = (config: any) => { spinnerColor: 'primary', }); } + + SessionManager.updateLastRequestDatetime(); return result; }; diff --git a/io.sc.platform.core.frontend/src/platform/plugin/manager/AuthenticationManager.ts b/io.sc.platform.core.frontend/src/platform/plugin/manager/AuthenticationManager.ts index 01ac59c5..039158ca 100644 --- a/io.sc.platform.core.frontend/src/platform/plugin/manager/AuthenticationManager.ts +++ b/io.sc.platform.core.frontend/src/platform/plugin/manager/AuthenticationManager.ts @@ -1,12 +1,18 @@ -import { SessionManager } from '@/platform'; +import { PConst, Environment } from '@/platform'; +import { axios } from '@/platform/plugin'; class AuthenticationManager { public static async isAuthenticated() { - const userSession = await SessionManager.loadUserSession(); - if (userSession) { - return true; + try { + const response = await axios.get(Environment.apiContextPath(PConst.API_AUTHENTICATION_URL)); + if (response) { + return true; + } else { + return false; + } + } catch (error) { + return false; } - return false; } /** diff --git a/io.sc.platform.core.frontend/src/platform/plugin/manager/SessionManager.ts b/io.sc.platform.core.frontend/src/platform/plugin/manager/SessionManager.ts index 93c544c7..0ef8a687 100644 --- a/io.sc.platform.core.frontend/src/platform/plugin/manager/SessionManager.ts +++ b/io.sc.platform.core.frontend/src/platform/plugin/manager/SessionManager.ts @@ -7,6 +7,8 @@ import { axios } from '@/platform/plugin'; * 用户会话管理器类 */ class SessionManager { + static #lastRequestDatetime = new Date().getTime(); + static #session: UserSessionType = { user: {}, menus: [], @@ -14,6 +16,21 @@ class SessionManager { remoteEntries: new Map(), }; + /** + * 获取会话是否超时 + * @returns 会话是否超时 + */ + public static isTimeout() { + return new Date().getTime() - SessionManager.#lastRequestDatetime > 30 * 60 * 1000; + } + + /** + * 更新最后请求时间 + */ + public static updateLastRequestDatetime() { + SessionManager.#lastRequestDatetime = new Date().getTime(); + } + /** * 获取响应式用户会话对象 * @returns 响应式用户会话对象 diff --git a/io.sc.platform.core.frontend/src/platform/plugin/router.ts b/io.sc.platform.core.frontend/src/platform/plugin/router.ts index 2897d2e7..02c7e256 100644 --- a/io.sc.platform.core.frontend/src/platform/plugin/router.ts +++ b/io.sc.platform.core.frontend/src/platform/plugin/router.ts @@ -73,7 +73,6 @@ router.beforeEach(async (to: any, from: any, next: any) => { next(); } else { //导航到登录页面 - //next({ name: 'login' }); Environment.executeAction('openLoginDialog'); } } diff --git a/io.sc.platform.core.frontend/src/platform/views/Login.vue b/io.sc.platform.core.frontend/src/platform/views/Login.vue index dee6f18a..c2785d7a 100644 --- a/io.sc.platform.core.frontend/src/platform/views/Login.vue +++ b/io.sc.platform.core.frontend/src/platform/views/Login.vue @@ -224,9 +224,8 @@ const loginFormSubmit = (event) => { // 设置本地访问令牌 AuthenticationManager.setLocalAccessToken(response.data?.data); - // window.location.href = Environment.getWebContextPath(); - // 登录成功后,重新获取用户会话 + SessionManager.updateLastRequestDatetime(); SessionManager.loadUserSession().then((userSession) => { if (userSession) { // 设置用户信息 diff --git a/io.sc.platform.core.frontend/src/platform/views/LoginDialog.vue b/io.sc.platform.core.frontend/src/platform/views/LoginDialog.vue index 852d73c9..65bc7faa 100644 --- a/io.sc.platform.core.frontend/src/platform/views/LoginDialog.vue +++ b/io.sc.platform.core.frontend/src/platform/views/LoginDialog.vue @@ -119,8 +119,15 @@ const loginFormSubmit = (event) => { AuthenticationManager.setLocalAccessToken(response.data?.data); // 登录成功后,重新获取用户会话 + SessionManager.updateLastRequestDatetime(); SessionManager.loadUserSession().then((userSession) => { if (userSession) { + // 如果是切换了用户, 导航到 / + if (currentUserId !== session.user.userId) { + window.location.href = Environment.getWebContextPath(); + return; + } + // 设置用户信息 SessionManager.setUser(userSession.user); @@ -133,25 +140,12 @@ const loginFormSubmit = (event) => { // 构建路由 SessionManager.setRoutes(userSession.routes); + RouterManager.removeAllRoutes(); RouterManager.setLocalRoutes(parameter.localRoutes); RouterManager.buildRoutes(toRaw(userSession.routes)); - // 动态加载远程组件入口 JS 文件 - SessionManager.setRemoteEntries(userSession.remoteEntries); - const urls: string[] = SessionManager.getRemoteEntryUrls(); - if (urls && urls.length > 0) { - console.debug('Loading remote entry ...', urls); - const loader = new JavascriptLoader(() => {}); - loader.load(urls); - } - // 关闭登录敞口 close(); - - // 如果是切换了用户, 导航到 / - if (currentUserId !== session.user.userId) { - window.location.href = Environment.getWebContextPath(); - } } }); } diff --git a/io.sc.platform.core.frontend/src/views/testcase/maxgraph/maxgraph.vue b/io.sc.platform.core.frontend/src/views/testcase/maxgraph/maxgraph.vue index a9a2498a..fac1de10 100644 --- a/io.sc.platform.core.frontend/src/views/testcase/maxgraph/maxgraph.vue +++ b/io.sc.platform.core.frontend/src/views/testcase/maxgraph/maxgraph.vue @@ -1,53 +1,22 @@ diff --git a/io.sc.platform.core.frontend/template-project/package.json b/io.sc.platform.core.frontend/template-project/package.json index 72ad8f15..622e48f3 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.1.301", + "version": "8.1.302", "description": "前端核心包,用于快速构建前端的脚手架", "private": false, "keywords": [], @@ -104,7 +104,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.301", + "platform-core": "8.1.302", "quasar": "2.15.4", "tailwindcss": "3.4.4", "vue": "3.4.31", diff --git a/io.sc.platform.core.frontend/util-components-generator.cjs b/io.sc.platform.core.frontend/util-components-generator.cjs index e61b3663..78088063 100644 --- a/io.sc.platform.core.frontend/util-components-generator.cjs +++ b/io.sc.platform.core.frontend/util-components-generator.cjs @@ -1,10 +1,27 @@ +const fs = require('fs'); +const Json5 =require('json5'); + +/** + * 特殊处理, 用于解决 @maxgraph/core 不能正常使用的问题, 会出现以下错误: + * ERROR in ./node_modules/.pnpm/@maxgraph+core@0.12.0/node_modules/@maxgraph/core/dist/index.js 174:0-24 + * Module not found: Error: Can't resolve './types' in 'io.sc.platform.core.frontend/node_modules/.pnpm/@maxgraph+core@0.12.0/node_modules/@maxgraph/core/dist' + * Did you mean 'types.js'? + * BREAKING CHANGE: The request './types' failed to resolve only because it was resolved as fully specified + * (probably because the origin is strict EcmaScript Module, e. g. a module with javascript mimetype, a '*.mjs' file, or a '*.js' file where the package.json contains '"type": "module"'). + * The extension in the request is mandatory for it to be fully specified. + * Add the extension to the request. + * + * 解决方案: 删除 node_modules/@maxgraph/core/package.json 文件中 [ "type" : "module" ] 属性 + */ +const packageJson =JSON.parse(fs.readFileSync('./node_modules/@maxgraph/core/package.json').toString()); +delete packageJson['type']; +fs.writeFileSync('./node_modules/@maxgraph/core/package.json', JSON.stringify(packageJson, null, ' ')); + + /** * 用于自动生成前端组件 * 通过 src/routes/routes.json 文件构建 src/components/index.ts 文件 */ -const fs = require('fs'); -const Json5 =require('json5'); - // 解析前端路由配置文件 const routesJson = Json5.parse(fs.readFileSync('./src/routes/routes.json', 'utf8')); @@ -28,7 +45,6 @@ fs.writeFileSync('./src/components/index.ts', content); console.info('components generated!'); - function generateImportComonents(route){ const componentName =route.component.replaceAll('.','_'); const componentPath =route.componentPath; diff --git a/io.sc.platform.core.frontend/webpack.config.common.cjs b/io.sc.platform.core.frontend/webpack.config.common.cjs index e53a72f8..a76104a9 100644 --- a/io.sc.platform.core.frontend/webpack.config.common.cjs +++ b/io.sc.platform.core.frontend/webpack.config.common.cjs @@ -154,7 +154,7 @@ module.exports = { '@': path.resolve(__dirname, 'src'), }, // 设置支持的模块扩展名,即这些扩展名的文件可以作为模块被使用 - extensions: ['.ts', '.js', '.cjs', '.vue'], + extensions: ['.js', '.cjs', '.ts', '.vue'], fallback: { "fs": false, "os": false, diff --git a/io.sc.platform.developer.frontend/package.json b/io.sc.platform.developer.frontend/package.json index 7d12c40d..cafeb6a1 100644 --- a/io.sc.platform.developer.frontend/package.json +++ b/io.sc.platform.developer.frontend/package.json @@ -92,7 +92,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.301", + "platform-core": "8.1.302", "quasar": "2.15.4", "tailwindcss": "3.4.4", "vue": "3.4.31", diff --git a/io.sc.platform.gradle/templates/pgp/setup/gradle.properties b/io.sc.platform.gradle/templates/pgp/setup/gradle.properties index 9cd66bb5..1d1b80ec 100644 --- a/io.sc.platform.gradle/templates/pgp/setup/gradle.properties +++ b/io.sc.platform.gradle/templates/pgp/setup/gradle.properties @@ -38,7 +38,7 @@ application_version=1.0.0 platform_group=io.sc platform_version=8.1.46 platform_plugin_version=8.1.46 -platform_core_frontend_version=8.1.301 +platform_core_frontend_version=8.1.302 ########################################################### # dependencies version diff --git a/io.sc.platform.lcdp.frontend/package.json b/io.sc.platform.lcdp.frontend/package.json index 8c310d5b..8c626f60 100644 --- a/io.sc.platform.lcdp.frontend/package.json +++ b/io.sc.platform.lcdp.frontend/package.json @@ -92,7 +92,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.301", + "platform-core": "8.1.302", "quasar": "2.15.4", "tailwindcss": "3.4.4", "vue": "3.4.31", diff --git a/io.sc.platform.mvc.frontend/package.json b/io.sc.platform.mvc.frontend/package.json index f583f2b1..74c7d8f5 100644 --- a/io.sc.platform.mvc.frontend/package.json +++ b/io.sc.platform.mvc.frontend/package.json @@ -92,7 +92,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.301", + "platform-core": "8.1.302", "quasar": "2.15.4", "tailwindcss": "3.4.4", "vue": "3.4.31", diff --git a/io.sc.platform.scheduler.manager.frontend/package.json b/io.sc.platform.scheduler.manager.frontend/package.json index 5b43348c..1f2ba60f 100644 --- a/io.sc.platform.scheduler.manager.frontend/package.json +++ b/io.sc.platform.scheduler.manager.frontend/package.json @@ -92,7 +92,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.301", + "platform-core": "8.1.302", "quasar": "2.15.4", "tailwindcss": "3.4.4", "vue": "3.4.31", diff --git a/io.sc.platform.security/src/main/java/io/sc/platform/security/controller/AuthenticationWebController.java b/io.sc.platform.security/src/main/java/io/sc/platform/security/controller/AuthenticationWebController.java new file mode 100644 index 00000000..90f019ce --- /dev/null +++ b/io.sc.platform.security/src/main/java/io/sc/platform/security/controller/AuthenticationWebController.java @@ -0,0 +1,18 @@ +package io.sc.platform.security.controller; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 认证控制器 + */ +@RestController +public class AuthenticationWebController { + /** + * 是否已经通过认证 + */ + @GetMapping("/api/isAuthenticated") + public void isAuthenticated(){ + + } +} diff --git a/io.sc.platform.security/src/main/resources/META-INF/platform/plugins/components.json b/io.sc.platform.security/src/main/resources/META-INF/platform/plugins/components.json index 95e4d067..522c847c 100644 --- a/io.sc.platform.security/src/main/resources/META-INF/platform/plugins/components.json +++ b/io.sc.platform.security/src/main/resources/META-INF/platform/plugins/components.json @@ -1,5 +1,6 @@ { "includes":[ + "io.sc.platform.security.controller", "io.sc.platform.security.service.impl" ] } \ No newline at end of file diff --git a/io.sc.platform.system.frontend/package.json b/io.sc.platform.system.frontend/package.json index d699b125..23ffe4e3 100644 --- a/io.sc.platform.system.frontend/package.json +++ b/io.sc.platform.system.frontend/package.json @@ -92,7 +92,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.301", + "platform-core": "8.1.302", "quasar": "2.15.4", "tailwindcss": "3.4.4", "vue": "3.4.31", diff --git a/io.sc.platform.system.frontend/src/views/application/Application.vue b/io.sc.platform.system.frontend/src/views/application/Application.vue index f9b26256..0216146a 100644 --- a/io.sc.platform.system.frontend/src/views/application/Application.vue +++ b/io.sc.platform.system.frontend/src/views/application/Application.vue @@ -20,11 +20,9 @@ :toolbar-actions="['query', 'refresh', 'separator', 'add', 'clone', 'edit', 'remove', 'separator', 'view', 'separator', 'export']" :columns="[ { width: 60, name: 'order', label: $t('order') }, - { width: 100, name: 'code', label: $t('code') }, + { width: 200, name: 'code', label: $t('code') }, { width: '100%', name: 'name', label: $t('name') }, { width: 80, name: 'enable', label: $t('status'), format: Formater.enableTag() }, - { width: 120, name: 'lastModifier', label: $t('lastModifier') }, - { width: 120, name: 'lastModifyDate', label: $t('lastModifyDate'), format: Formater.dateOnly() }, ]" :editor="{ dialog: { @@ -97,7 +95,7 @@ diff --git a/io.sc.platform.system.frontend/src/views/corporation/Corporation.vue b/io.sc.platform.system.frontend/src/views/corporation/Corporation.vue index 8e9da356..f1d1b2a2 100644 --- a/io.sc.platform.system.frontend/src/views/corporation/Corporation.vue +++ b/io.sc.platform.system.frontend/src/views/corporation/Corporation.vue @@ -107,7 +107,7 @@ diff --git a/io.sc.platform.system.frontend/src/views/license/License.vue b/io.sc.platform.system.frontend/src/views/license/License.vue index 25060551..7883eb6c 100644 --- a/io.sc.platform.system.frontend/src/views/license/License.vue +++ b/io.sc.platform.system.frontend/src/views/license/License.vue @@ -1,4 +1,223 @@ diff --git a/io.sc.platform.system.frontend/src/views/license/License2.vue b/io.sc.platform.system.frontend/src/views/license/License2.vue deleted file mode 100644 index a90367c5..00000000 --- a/io.sc.platform.system.frontend/src/views/license/License2.vue +++ /dev/null @@ -1,4 +0,0 @@ - - diff --git a/io.sc.platform.system.frontend/src/views/shared/SelectMenuTreeGrid.vue b/io.sc.platform.system.frontend/src/views/shared/SelectMenuTreeGrid.vue index c8e69b29..6aada6ac 100644 --- a/io.sc.platform.system.frontend/src/views/shared/SelectMenuTreeGrid.vue +++ b/io.sc.platform.system.frontend/src/views/shared/SelectMenuTreeGrid.vue @@ -114,14 +114,6 @@ const refresh = () => { treeGridRef.value.refresh(); }; -onMounted(() => { - refresh(); -}); - -onUpdated(() => { - refresh(); -}); - defineExpose({ refresh, }); diff --git a/io.sc.platform.system.frontend/src/views/shared/SelectOrgTreeGrid.vue b/io.sc.platform.system.frontend/src/views/shared/SelectOrgTreeGrid.vue index 05d2a2c1..d64bcb10 100644 --- a/io.sc.platform.system.frontend/src/views/shared/SelectOrgTreeGrid.vue +++ b/io.sc.platform.system.frontend/src/views/shared/SelectOrgTreeGrid.vue @@ -88,14 +88,6 @@ const refresh = () => { treeGridRef.value.refresh(); }; -onMounted(() => { - refresh(); -}); - -onUpdated(() => { - refresh(); -}); - defineExpose({ refresh, }); diff --git a/io.sc.platform.system.frontend/src/views/shared/SelectRoleGrid.vue b/io.sc.platform.system.frontend/src/views/shared/SelectRoleGrid.vue index 0dc8f19e..ddede894 100644 --- a/io.sc.platform.system.frontend/src/views/shared/SelectRoleGrid.vue +++ b/io.sc.platform.system.frontend/src/views/shared/SelectRoleGrid.vue @@ -135,14 +135,6 @@ const refresh = () => { gridRef.value.refresh(); }; -onMounted(() => { - refresh(); -}); - -onUpdated(() => { - refresh(); -}); - defineExpose({ refresh, }); diff --git a/io.sc.platform.system.frontend/src/views/shared/SelectUserGrid.vue b/io.sc.platform.system.frontend/src/views/shared/SelectUserGrid.vue index 1196fad5..5cec63d7 100644 --- a/io.sc.platform.system.frontend/src/views/shared/SelectUserGrid.vue +++ b/io.sc.platform.system.frontend/src/views/shared/SelectUserGrid.vue @@ -154,14 +154,6 @@ const refresh = () => { gridRef.value.refresh(); }; -onMounted(() => { - refresh(); -}); - -onUpdated(() => { - refresh(); -}); - defineExpose({ refresh, }); diff --git a/io.sc.standard.frontend/package.json b/io.sc.standard.frontend/package.json index a70e4b75..9708af9c 100644 --- a/io.sc.standard.frontend/package.json +++ b/io.sc.standard.frontend/package.json @@ -92,7 +92,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.301", + "platform-core": "8.1.302", "quasar": "2.15.4", "tailwindcss": "3.4.4", "vue": "3.4.31",