Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
T
TrainSys
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
苏州培训方案
TrainSys
提交
a9d7935b
提交
a9d7935b
编写于
12月 07, 2023
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
tony001 发布系统代码 [TrainSys,Mob]
上级
841b332e
变更
8
展开全部
隐藏空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
131 行增加
和
88 行删除
+131
-88
CHANGELOG.md
app_Mob/CHANGELOG.md
+18
-0
Dockerfile-ALL
app_Mob/Dockerfile-ALL
+1
-2
package.json
app_Mob/package.json
+7
-7
pnpm-lock.yaml
app_Mob/pnpm-lock.yaml
+43
-43
main.ts
app_Mob/src/main.ts
+2
-0
unauthorized-handler.ts
...Mob/src/util/unauthorized-handler/unauthorized-handler.ts
+40
-11
ibiz-vite-plugin.ts
app_Mob/vite-plugins/ibiz-vite-plugin.ts
+0
-5
PSSYSAPP.json
...ces/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+20
-20
未找到文件。
app_Mob/CHANGELOG.md
浏览文件 @
a9d7935b
...
@@ -7,6 +7,24 @@
...
@@ -7,6 +7,24 @@
## [Unreleased]
## [Unreleased]
## [0.0.2] - 2023-12-06
### Added
-
支持面板分组容器 & 面板分页容器
-
支持确认操作框工具类
-
dashboard支持嵌入视图
-
列表支持选择模式和默认模式
-
403时补充弹窗提示,点击确认后退出登录
### Change
-
表单多数据部件样式优化
### Fixed
-
修复关系界面标题为空时绘制标题容器
## [0.0.1] - 2023-12-04
## [0.0.1] - 2023-12-04
正式发版
正式发版
...
...
app_Mob/Dockerfile-ALL
浏览文件 @
a9d7935b
FROM image.ibizlab.cn/library/nginx-dynamic:v5.
4
FROM image.ibizlab.cn/library/nginx-dynamic:v5.
1
WORKDIR /
WORKDIR /
COPY dist /dist
COPY dist /dist
COPY environment.config /
COPY environment.config /
RUN sed -i "s#20086#30086#g" /etc/nginx/conf.d/nginx.conf
RUN sed -i "s#20086#30086#g" /etc/nginx/conf.d/nginx.conf
RUN sed -i "/server_name/a \ keepalive_time 3600;" /etc/nginx/conf.d/nginx.conf
\ No newline at end of file
app_Mob/package.json
浏览文件 @
a9d7935b
{
{
"name"
:
"@ibiz-template/next-mob"
,
"name"
:
"@ibiz-template/next-mob"
,
"private"
:
true
,
"private"
:
true
,
"version"
:
"0.0.
1
"
,
"version"
:
"0.0.
2
"
,
"description"
:
"An Ionic project"
,
"description"
:
"An Ionic project"
,
"scripts"
:
{
"scripts"
:
{
"dev"
:
"vite"
,
"dev"
:
"vite"
,
...
@@ -11,14 +11,14 @@
...
@@ -11,14 +11,14 @@
},
},
"dependencies"
:
{
"dependencies"
:
{
"@ibiz-template-package/vs-tree-ex"
:
"^0.1.1"
,
"@ibiz-template-package/vs-tree-ex"
:
"^0.1.1"
,
"@ibiz-template/core"
:
"^0.4.
0
"
,
"@ibiz-template/core"
:
"^0.4.
5
"
,
"@ibiz-template/mob-theme"
:
"^0.2.9"
,
"@ibiz-template/mob-theme"
:
"^0.2.9"
,
"@ibiz-template/mob-vue3-components"
:
"^0.0.
1
"
,
"@ibiz-template/mob-vue3-components"
:
"^0.0.
2
"
,
"@ibiz-template/model-helper"
:
"^0.4.
4
"
,
"@ibiz-template/model-helper"
:
"^0.4.
5
"
,
"@ibiz-template/runtime"
:
"^0.4.
4
"
,
"@ibiz-template/runtime"
:
"^0.4.
5
"
,
"@ibiz-template/theme"
:
"^0.4.0"
,
"@ibiz-template/theme"
:
"^0.4.0"
,
"@ibiz-template/vue3-util"
:
"^0.4.
4
"
,
"@ibiz-template/vue3-util"
:
"^0.4.
5
"
,
"@ibiz/model-core"
:
"^0.0.2
1
"
,
"@ibiz/model-core"
:
"^0.0.2
6
"
,
"async-validator"
:
"^4.2.5"
,
"async-validator"
:
"^4.2.5"
,
"dayjs"
:
"^1.11.10"
,
"dayjs"
:
"^1.11.10"
,
"echarts"
:
"^5.4.3"
,
"echarts"
:
"^5.4.3"
,
...
...
app_Mob/pnpm-lock.yaml
浏览文件 @
a9d7935b
此差异已折叠。
点击以展开。
app_Mob/src/main.ts
浏览文件 @
a9d7935b
...
@@ -7,6 +7,7 @@ import {
...
@@ -7,6 +7,7 @@ import {
ModalUtil
,
ModalUtil
,
NotificationUtil
,
NotificationUtil
,
OpenViewUtil
,
OpenViewUtil
,
ConfirmUtil
,
OverlayController
,
OverlayController
,
}
from
'@ibiz-template/mob-vue3-components'
;
}
from
'@ibiz-template/mob-vue3-components'
;
import
{
OverlayContainer
,
PluginFactory
}
from
'@ibiz-template/vue3-util'
;
import
{
OverlayContainer
,
PluginFactory
}
from
'@ibiz-template/vue3-util'
;
...
@@ -59,6 +60,7 @@ async function createApp(): Promise<void> {
...
@@ -59,6 +60,7 @@ async function createApp(): Promise<void> {
ibiz
.
openView
=
new
OpenViewUtil
(
router
);
ibiz
.
openView
=
new
OpenViewUtil
(
router
);
ibiz
.
message
=
new
MessageUtil
();
ibiz
.
message
=
new
MessageUtil
();
ibiz
.
modal
=
new
ModalUtil
();
ibiz
.
modal
=
new
ModalUtil
();
ibiz
.
confirm
=
new
ConfirmUtil
();
ibiz
.
notification
=
new
NotificationUtil
();
ibiz
.
notification
=
new
NotificationUtil
();
ibiz
.
loading
=
new
LoadingUtil
();
ibiz
.
loading
=
new
LoadingUtil
();
ibiz
.
overlay
=
new
OverlayController
();
ibiz
.
overlay
=
new
OverlayController
();
...
...
app_Mob/src/util/unauthorized-handler/unauthorized-handler.ts
浏览文件 @
a9d7935b
...
@@ -17,7 +17,10 @@ import { IErrorHandler } from '@ibiz-template/runtime';
...
@@ -17,7 +17,10 @@ import { IErrorHandler } from '@ibiz-template/runtime';
*/
*/
export
class
UnauthorizedHandler
implements
IErrorHandler
{
export
class
UnauthorizedHandler
implements
IErrorHandler
{
match
(
error
:
unknown
):
boolean
{
match
(
error
:
unknown
):
boolean
{
return
error
instanceof
HttpError
&&
error
.
status
===
401
;
return
(
error
instanceof
HttpError
&&
(
error
.
status
===
401
||
error
.
status
===
403
)
);
}
}
/**
/**
...
@@ -73,10 +76,30 @@ export class UnauthorizedHandler implements IErrorHandler {
...
@@ -73,10 +76,30 @@ export class UnauthorizedHandler implements IErrorHandler {
const
targetUrl
=
`
${
UrlHelper
.
routeBase
}
/login?ru=
${
encodeURIComponent
(
const
targetUrl
=
`
${
UrlHelper
.
routeBase
}
/login?ru=
${
encodeURIComponent
(
ru
,
ru
,
)}
`
;
)}
`
;
// 跳转登录地址,不加延时vue-router感知不到路由变更。
// 改无权限跳转登录页后,刷新页面。避免无权限模型加载异常
setTimeout
(()
=>
{
document
.
body
.
style
.
display
=
'none'
;
window
.
location
.
href
=
targetUrl
;
window
.
location
.
href
=
targetUrl
;
},
0
);
window
.
location
.
reload
();
}
/**
* 处理403
* @author lxm
* @date 2023-12-06 10:19:12
* @protected
* @return {*} {Promise<void>}
*/
protected
async
handle403
():
Promise
<
void
>
{
const
result
=
await
ibiz
.
modal
.
confirm
({
title
:
'当前账户被禁止访问'
,
desc
:
'是否要退出当前账户?'
,
});
if
(
result
)
{
const
bol
=
await
ibiz
.
auth
.
logout
();
if
(
bol
)
{
window
.
location
.
reload
();
}
}
}
}
/**
/**
...
@@ -87,13 +110,19 @@ export class UnauthorizedHandler implements IErrorHandler {
...
@@ -87,13 +110,19 @@ export class UnauthorizedHandler implements IErrorHandler {
* @returns {*} {Promise<void>}
* @returns {*} {Promise<void>}
*/
*/
handle
(
error
:
unknown
):
boolean
|
undefined
{
handle
(
error
:
unknown
):
boolean
|
undefined
{
if
(
error
instanceof
HttpError
&&
error
.
status
===
401
)
{
if
(
error
instanceof
HttpError
)
{
if
(
ibiz
.
env
.
loginMode
===
LoginMode
.
CAS
)
{
if
(
error
.
status
===
401
)
{
this
.
casLogin
();
if
(
ibiz
.
env
.
loginMode
===
LoginMode
.
CAS
)
{
}
else
{
this
.
casLogin
();
this
.
normalLogin
();
}
else
{
this
.
normalLogin
();
}
return
true
;
}
if
(
error
.
status
===
403
)
{
this
.
handle403
();
return
true
;
}
}
return
true
;
}
}
}
}
}
}
app_Mob/vite-plugins/ibiz-vite-plugin.ts
浏览文件 @
a9d7935b
...
@@ -35,11 +35,6 @@ function IBizVitePlugin(): Plugin[] {
...
@@ -35,11 +35,6 @@ function IBizVitePlugin(): Plugin[] {
const
outFile
=
join
(
baseOutModule
,
pkg
,
'index.system.min.js'
);
const
outFile
=
join
(
baseOutModule
,
pkg
,
'index.system.min.js'
);
copyFileSync
(
cpFile
,
outFile
);
copyFileSync
(
cpFile
,
outFile
);
});
});
templatePackages
.
forEach
(
pkg
=>
{
const
cpFile
=
join
(
baseModule
,
pkg
,
'dist/index.system.min.js.map'
);
const
outFile
=
join
(
baseOutModule
,
pkg
,
'index.system.min.js.map'
);
copyFileSync
(
cpFile
,
outFile
);
});
}
}
// eslint-disable-next-line no-lone-blocks
// eslint-disable-next-line no-lone-blocks
{
{
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @
a9d7935b
...
@@ -11537,16 +11537,16 @@
...
@@ -11537,16 +11537,16 @@
"codeName" : "VMGroup3",
"codeName" : "VMGroup3",
"name" : "视图消息类型测试",
"name" : "视图消息类型测试",
"getPSAppViewMsgGroupDetails" : [ {
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息类型-
错误
信息",
"name" : "消息类型-
警告
信息",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg
6
"
"id" : "ViewMsg
5
"
}
}
}, {
}, {
"name" : "消息类型-
警告
信息",
"name" : "消息类型-
错误
信息",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg
5
"
"id" : "ViewMsg
6
"
}
}
}, {
}, {
"name" : "消息类型-常规信息",
"name" : "消息类型-常规信息",
...
@@ -11569,22 +11569,16 @@
...
@@ -11569,22 +11569,16 @@
"codeName" : "VMGroup4",
"codeName" : "VMGroup4",
"name" : "视图消息位置测试",
"name" : "视图消息位置测试",
"getPSAppViewMsgGroupDetails" : [ {
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-弹出",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg10"
}
}, {
"name" : "消息位置-视图上方",
"name" : "消息位置-视图上方",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg7"
"id" : "ViewMsg7"
}
}
}, {
}, {
"name" : "消息位置-
视图内容区
",
"name" : "消息位置-
弹出
",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg
9
"
"id" : "ViewMsg
10
"
}
}
}, {
}, {
"name" : "消息位置-视图下方",
"name" : "消息位置-视图下方",
...
@@ -11592,21 +11586,27 @@
...
@@ -11592,21 +11586,27 @@
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg8"
"id" : "ViewMsg8"
}
}
}, {
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
}
} ]
} ]
}, {
}, {
"codeName" : "VMGroup8",
"codeName" : "VMGroup8",
"name" : "【静态测试】",
"name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ {
"getPSAppViewMsgGroupDetails" : [ {
"name" : "
关闭模式-本次删除-上方-警告
",
"name" : "
消息位置-视图下方
",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg
13
"
"id" : "ViewMsg
8
"
}
}
}, {
}, {
"name" : "
消息位置-视图下方
",
"name" : "
关闭模式-本次删除-上方-警告
",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg
8
"
"id" : "ViewMsg
13
"
}
}
}, {
}, {
"name" : "消息类型-错误信息",
"name" : "消息类型-错误信息",
...
@@ -11658,16 +11658,16 @@
...
@@ -11658,16 +11658,16 @@
"id" : "ViewMsg12"
"id" : "ViewMsg12"
}
}
}, {
}, {
"name" : "关闭模式-
本次
删除",
"name" : "关闭模式-
无
删除",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg1
3
"
"id" : "ViewMsg1
1
"
}
}
}, {
}, {
"name" : "关闭模式-
无
删除",
"name" : "关闭模式-
本次
删除",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg1
1
"
"id" : "ViewMsg1
3
"
}
}
} ]
} ]
}, {
}, {
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录