Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
T
TrainSys
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
苏州培训方案
TrainSys
提交
d9b0b8fb
提交
d9b0b8fb
编写于
9月 01, 2022
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
lxm1993 发布系统代码 [TrainSys,网页端]
上级
256263f4
变更
11
展开全部
隐藏空白字符变更
内嵌
并排
正在显示
11 个修改的文件
包含
192 行增加
和
31 行删除
+192
-31
panel-view-engine.ts
app_Web/packages/ibiz-core/src/engine/panel-view-engine.ts
+10
-0
portal-view-engine.ts
app_Web/packages/ibiz-core/src/engine/portal-view-engine.ts
+10
-0
tab-exp-view-engine.ts
app_Web/packages/ibiz-core/src/engine/tab-exp-view-engine.ts
+10
-0
panel-container.ts
...kages/ibiz-core/src/model/panel-detail/panel-container.ts
+13
-3
app-default-view-layout.tsx
...ayout/app-default-view-layout/app-default-view-layout.tsx
+36
-26
mutations.ts
app_Web/src/store/mutations.ts
+7
-1
h2_table.xml
trainsys-core/src/main/resources/liquibase/h2_table.xml
+1
-1
Main.json
...PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSFORMS/Main.json
+46
-0
ReginfoEditView.json
.../trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoEditView.json
+46
-0
PSSYSTEM.json
...rc/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
+3
-0
ValueRule20.json
...odel/cn/ibizlab/trainsys/PSSYSVALUERULES/ValueRule20.json
+10
-0
未找到文件。
app_Web/packages/ibiz-core/src/engine/panel-view-engine.ts
浏览文件 @
d9b0b8fb
...
...
@@ -62,6 +62,16 @@ export class PanelViewEngine extends ViewEngine {
return;
}
const { data: _data } = response;
if(_this.viewCtx && _this.viewCtx.view){
_this.viewCtx['viewGlobal']['srfactiveviewdata'] = _data;
// 当前视图为顶层视图
if(_this.viewCtx.topview && Object.is(_this.viewCtx.view._uid,_this.viewCtx.topview._uid)){
_this.$store.commit('addRouteViewGlobal', { tag: _this.context.srfsessionid, param: { srfactiveviewdata: _data } });
}
if(_this.forceRefresh && _this.forceRefresh instanceof Function){
_this.forceRefresh();
}
}
if(_data.srfopprivs){
_this.$store.commit('authresource/setSrfappdeData', { key: `
$
{
_this
.
deName
}
-
$
{
_data
[
_this
.
appDeKeyFieldName
.
toLowerCase
()]}
`, value: _data.srfopprivs });
}
...
...
app_Web/packages/ibiz-core/src/engine/portal-view-engine.ts
浏览文件 @
d9b0b8fb
...
...
@@ -82,6 +82,16 @@ export class PortalViewEngine extends ViewEngine {
return
;
}
const
{
data
:
_data
}
=
response
;
if
(
_this
.
viewCtx
&&
_this
.
viewCtx
.
view
){
_this
.
viewCtx
[
'viewGlobal'
][
'srfactiveviewdata'
]
=
_data
;
// 当前视图为顶层视图
if
(
_this
.
viewCtx
.
topview
&&
Object
.
is
(
_this
.
viewCtx
.
view
.
_uid
,
_this
.
viewCtx
.
topview
.
_uid
)){
_this
.
$store
.
commit
(
'addRouteViewGlobal'
,
{
tag
:
_this
.
context
.
srfsessionid
,
param
:
{
srfactiveviewdata
:
_data
}
});
}
if
(
_this
.
forceRefresh
&&
_this
.
forceRefresh
instanceof
Function
){
_this
.
forceRefresh
();
}
}
if
(
_data
.
srfopprivs
)
{
_this
.
$store
.
commit
(
'authresource/setSrfappdeData'
,
{
key
:
`
${
_this
.
deName
}
-
${
_data
[
_this
.
appDeKeyFieldName
.
toLowerCase
()]}
`
,
value
:
_data
.
srfopprivs
});
}
...
...
app_Web/packages/ibiz-core/src/engine/tab-exp-view-engine.ts
浏览文件 @
d9b0b8fb
...
...
@@ -70,6 +70,16 @@ export class TabExpViewEngine extends ViewEngine {
return;
}
const { data: _data } = response;
if(_this.viewCtx && _this.viewCtx.view){
_this.viewCtx['viewGlobal']['srfactiveviewdata'] = _data;
// 当前视图为顶层视图
if(_this.viewCtx.topview && Object.is(_this.viewCtx.view._uid,_this.viewCtx.topview._uid)){
_this.$store.commit('addRouteViewGlobal', { tag: _this.context.srfsessionid, param: { srfactiveviewdata: _data } });
}
if(_this.forceRefresh && _this.forceRefresh instanceof Function){
_this.forceRefresh();
}
}
if(_data.srfopprivs){
_this.$store.commit('authresource/setSrfappdeData', { key: `
$
{
_this
.
deName
}
-
$
{
_data
[
_this
.
appDeKeyFieldName
.
toLowerCase
()]}
`, value: _data.srfopprivs });
}
...
...
app_Web/packages/ibiz-core/src/model/panel-detail/panel-container.ts
浏览文件 @
d9b0b8fb
...
...
@@ -23,10 +23,10 @@ export class PanelContainerModel extends PanelDetailModel {
/**
* 数据源类型
* @description 值模式 [数据面板源(全部)] {DEACTION:实体行为、 DEDATASET:实体集合、 DELOGIC:实体逻辑 }
* @type {( string | 'DEACTION' | 'DEDATASET' | 'DELOGIC')}
* @description 值模式 [数据面板源(全部)] {DEACTION:实体行为、 DEDATASET:实体集合、 DELOGIC:实体逻辑
、 APPGLOBALPARAM:绑定应用全局变量、 TOPVIEWSESSIONPARAM:绑定顶级视图会话共享变量、 VIEWSESSIONPARAM:绑定当前视图会话共享变量
}
* @type {( string | 'DEACTION' | 'DEDATASET' | 'DELOGIC'
| 'APPGLOBALPARAM' | 'TOPVIEWSESSIONPARAM' | 'VIEWSESSIONPARAM'
)}
*/
public
dataSourceType
:
string
|
'DEACTION'
|
'DEDATASET'
|
'DELOGIC'
=
'
'
;
public
dataSourceType
:
string
|
'DEACTION'
|
'DEDATASET'
|
'DELOGIC'
|
'APPGLOBALPARAM'
|
'TOPVIEWSESSIONPARAM'
|
'VIEWSESSIONPARAM
'
;
/**
* 数据刷新模式
...
...
@@ -171,6 +171,7 @@ export class PanelContainerModel extends PanelDetailModel {
*/
public
async
loadData
():
Promise
<
any
>
{
const
deCodeName
=
(
this
.
panelItemModel
as
IPSPanelContainer
)?.
getPSAppDataEntity
?.()?.
codeName
;
const
dataName
=
(
this
.
panelItemModel
as
any
).
dataName
;
try
{
if
(
this
.
dataSourceType
===
'DEACTION'
||
this
.
dataSourceType
===
'DEDATASET'
)
{
const
method
=
(
this
.
panelItemModel
as
IPSPanelContainer
)?.
getPSAppDEMethod
?.()?.
codeName
;
...
...
@@ -192,6 +193,15 @@ export class PanelContainerModel extends PanelDetailModel {
return
data
;
}
}
}
else
if
(
this
.
dataSourceType
===
'APPGLOBALPARAM'
){
const
dataRange
=
this
.
panel
.
viewCtx
.
appGlobal
;
return
dataRange
[
dataName
];
}
else
if
(
this
.
dataSourceType
===
'TOPVIEWSESSIONPARAM'
){
const
dataRange
=
this
.
panel
.
viewCtx
.
routeViewGlobal
;
return
dataRange
[
dataName
];
}
else
if
(
this
.
dataSourceType
===
'VIEWSESSIONPARAM'
){
const
dataRange
=
this
.
panel
.
viewCtx
.
viewGlobal
;
return
dataRange
[
dataName
];
}
}
catch
(
error
)
{
LogUtil
.
error
(
`面板---
${
this
.
caption
}
---加载数据失败`
);
...
...
app_Web/packages/ibiz-vue/src/components/layout/app-default-layout/app-default-view-layout/app-default-view-layout.tsx
浏览文件 @
d9b0b8fb
此差异已折叠。
点击以展开。
app_Web/src/store/mutations.ts
浏览文件 @
d9b0b8fb
...
...
@@ -377,7 +377,13 @@ export const removeAppGlobal = (state: any, tag: string) => {
*/
export
const
addRouteViewGlobal
=
(
state
:
any
,
args
:
{
tag
:
string
,
param
:
any
})
=>
{
if
(
args
&&
args
.
tag
&&
args
.
param
)
{
state
.
routeViewGlobal
[
args
.
tag
]
=
args
.
param
;
if
(
!
state
.
routeViewGlobal
[
args
.
tag
]){
state
.
routeViewGlobal
[
args
.
tag
]
=
args
.
param
;
}
else
{
const
cacheValue
=
state
.
routeViewGlobal
[
args
.
tag
];
Object
.
assign
(
cacheValue
,
args
.
param
);
state
.
routeViewGlobal
[
args
.
tag
]
=
cacheValue
;
}
}
}
...
...
trainsys-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
d9b0b8fb
...
...
@@ -194,7 +194,7 @@
</changeSet>
<!--输出实体[REGINFO]数据结构 -->
<changeSet
author=
"root"
id=
"tab-reginfo-
38
-8"
>
<changeSet
author=
"root"
id=
"tab-reginfo-
42
-8"
>
<createTable
tableName=
"T_REGINFO"
>
<column
name=
"UPDATEDATE"
remarks=
""
type=
"DATETIME"
>
</column>
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSFORMS/Main.json
浏览文件 @
d9b0b8fb
...
...
@@ -34,6 +34,52 @@
"id"
:
"engine"
}
}
],
"getPSDEFormItemVRs"
:
[
{
"checkMode"
:
3
,
"name"
:
"表单项值规则"
,
"getPSDEFormItemName"
:
"Age"
,
"getPSSysValueRule"
:
{
"codeName"
:
"ValueRule20"
,
"dynaModelFilePath"
:
"PSSYSVALUERULES/ValueRule20.json"
,
"name"
:
"脚本值规则测试"
,
"ruleInfo"
:
"脚本校验"
,
"ruleType"
:
"SCRIPT"
,
"scriptCode"
:
"return false"
,
"enableBackend"
:
true
,
"enableFront"
:
true
},
"valueRuleType"
:
"SYSVALUERULE"
},
{
"checkMode"
:
3
,
"name"
:
"表单项值规则"
,
"getPSDEFormItemName"
:
"Name"
,
"getPSSysValueRule"
:
{
"codeName"
:
"ValueRule14"
,
"dynaModelFilePath"
:
"PSSYSVALUERULES/ValueRule14.json"
,
"name"
:
"由26个英文字母组成的字符串"
,
"regExCode"
:
"[A-Za-z]+"
,
"ruleInfo"
:
"内容必须为26个英文字母组成的字符串"
,
"ruleType"
:
"REG"
,
"enableBackend"
:
true
,
"enableFront"
:
true
},
"valueRuleType"
:
"SYSVALUERULE"
},
{
"checkMode"
:
3
,
"name"
:
"表单项值规则"
,
"getPSDEFormItemName"
:
"StuNo"
,
"getPSSysValueRule"
:
{
"codeName"
:
"ValueRule3"
,
"dynaModelFilePath"
:
"PSSYSVALUERULES/ValueRule3.json"
,
"name"
:
"非负整数(正整数 + 0)"
,
"regExCode"
:
"
\\
d+"
,
"ruleInfo"
:
"内容必须为非负整数(正整数 + 0)"
,
"ruleType"
:
"REG"
,
"enableBackend"
:
true
,
"enableFront"
:
true
},
"valueRuleType"
:
"SYSVALUERULE"
}
],
"getPSDEFormItems"
:
[
{
"id"
:
"srfupdatedate"
,
"hidden"
:
true
,
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoEditView.json
浏览文件 @
d9b0b8fb
...
...
@@ -1020,6 +1020,52 @@
"showBusyIndicator"
:
true
,
"id"
:
"FORM"
},
"getPSDEFormItemVRs"
:
[
{
"checkMode"
:
3
,
"name"
:
"表单项值规则"
,
"getPSDEFormItemName"
:
"Age"
,
"getPSSysValueRule"
:
{
"codeName"
:
"ValueRule20"
,
"dynaModelFilePath"
:
"PSSYSVALUERULES/ValueRule20.json"
,
"name"
:
"脚本值规则测试"
,
"ruleInfo"
:
"脚本校验"
,
"ruleType"
:
"SCRIPT"
,
"scriptCode"
:
"return false"
,
"enableBackend"
:
true
,
"enableFront"
:
true
},
"valueRuleType"
:
"SYSVALUERULE"
},
{
"checkMode"
:
3
,
"name"
:
"表单项值规则"
,
"getPSDEFormItemName"
:
"Name"
,
"getPSSysValueRule"
:
{
"codeName"
:
"ValueRule14"
,
"dynaModelFilePath"
:
"PSSYSVALUERULES/ValueRule14.json"
,
"name"
:
"由26个英文字母组成的字符串"
,
"regExCode"
:
"[A-Za-z]+"
,
"ruleInfo"
:
"内容必须为26个英文字母组成的字符串"
,
"ruleType"
:
"REG"
,
"enableBackend"
:
true
,
"enableFront"
:
true
},
"valueRuleType"
:
"SYSVALUERULE"
},
{
"checkMode"
:
3
,
"name"
:
"表单项值规则"
,
"getPSDEFormItemName"
:
"StuNo"
,
"getPSSysValueRule"
:
{
"codeName"
:
"ValueRule3"
,
"dynaModelFilePath"
:
"PSSYSVALUERULES/ValueRule3.json"
,
"name"
:
"非负整数(正整数 + 0)"
,
"regExCode"
:
"
\\
d+"
,
"ruleInfo"
:
"内容必须为非负整数(正整数 + 0)"
,
"ruleType"
:
"REG"
,
"enableBackend"
:
true
,
"enableFront"
:
true
},
"valueRuleType"
:
"SYSVALUERULE"
}
],
"getPSDEFormItems"
:
[
{
"id"
:
"srfupdatedate"
,
"hidden"
:
true
,
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSTEM.json
浏览文件 @
d9b0b8fb
...
...
@@ -530,6 +530,9 @@
},
{
"modelref"
:
true
,
"path"
:
"PSSYSVALUERULES/ValueRule4.json"
},
{
"modelref"
:
true
,
"path"
:
"PSSYSVALUERULES/ValueRule20.json"
},
{
"modelref"
:
true
,
"path"
:
"PSSYSVALUERULES/ValueRule7.json"
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSVALUERULES/ValueRule20.json
0 → 100644
浏览文件 @
d9b0b8fb
{
"codeName"
:
"ValueRule20"
,
"dynaModelFilePath"
:
"PSSYSVALUERULES/ValueRule20.json"
,
"name"
:
"脚本值规则测试"
,
"ruleInfo"
:
"脚本校验"
,
"ruleType"
:
"SCRIPT"
,
"scriptCode"
:
"return false"
,
"enableBackend"
:
true
,
"enableFront"
:
true
}
\ No newline at end of file
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录