Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
T
TrainSys
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
苏州培训方案
TrainSys
提交
d24ae405
提交
d24ae405
编写于
9月 12, 2023
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
lxm1993 发布系统代码 [TrainSys,网页端]
上级
e0bdd6f3
变更
8
展开全部
显示空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
103 行增加
和
85 行删除
+103
-85
package.json
app_Web/package.json
+8
-8
pnpm-lock.yaml
app_Web/pnpm-lock.yaml
+48
-48
ibiz-grid-picker.scss
...editor/data-picker/ibiz-grid-picker/ibiz-grid-picker.scss
+6
-0
ibiz-grid-picker.tsx
.../editor/data-picker/ibiz-grid-picker/ibiz-grid-picker.tsx
+1
-0
ibiz-mpicker.tsx
...mponents/editor/data-picker/ibiz-mpicker/ibiz-mpicker.tsx
+12
-1
form-druipart.tsx
...ents/widgets/form-control/form-druipart/form-druipart.tsx
+2
-2
PSSYSAPP.json
.../ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
+4
-4
PSSYSAPP.json
...ces/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+22
-22
未找到文件。
app_Web/package.json
浏览文件 @
d24ae405
...
@@ -13,14 +13,14 @@
...
@@ -13,14 +13,14 @@
"dependencies"
:
{
"dependencies"
:
{
"@floating-ui/dom"
:
"^1.0.11"
,
"@floating-ui/dom"
:
"^1.0.11"
,
"@ibiz-template/command"
:
"^0.0.1-beta.50"
,
"@ibiz-template/command"
:
"^0.0.1-beta.50"
,
"@ibiz-template/controller"
:
"^0.0.1-beta.10
5
"
,
"@ibiz-template/controller"
:
"^0.0.1-beta.10
6
"
,
"@ibiz-template/core"
:
"^0.0.1-beta.10
5
"
,
"@ibiz-template/core"
:
"^0.0.1-beta.10
6
"
,
"@ibiz-template/model"
:
"^0.0.1-beta.10
5
"
,
"@ibiz-template/model"
:
"^0.0.1-beta.10
6
"
,
"@ibiz-template/runtime"
:
"^0.0.1-beta.10
5
"
,
"@ibiz-template/runtime"
:
"^0.0.1-beta.10
6
"
,
"@ibiz-template/service"
:
"^0.0.1-beta.10
5
"
,
"@ibiz-template/service"
:
"^0.0.1-beta.10
6
"
,
"@ibiz-template/theme"
:
"^0.0.1-beta.10
5
"
,
"@ibiz-template/theme"
:
"^0.0.1-beta.10
6
"
,
"@ibiz-template/vue-util"
:
"^0.0.1-beta.10
5
"
,
"@ibiz-template/vue-util"
:
"^0.0.1-beta.10
6
"
,
"@ibiz/dynamic-model-api"
:
"^2.1.2
4
"
,
"@ibiz/dynamic-model-api"
:
"^2.1.2
7
"
,
"@riophae/vue-treeselect"
:
"^0.4.0"
,
"@riophae/vue-treeselect"
:
"^0.4.0"
,
"dayjs"
:
"^1.11.7"
,
"dayjs"
:
"^1.11.7"
,
"echarts"
:
"^5.4.2"
,
"echarts"
:
"^5.4.2"
,
...
...
app_Web/pnpm-lock.yaml
浏览文件 @
d24ae405
此差异已折叠。
点击以展开。
app_Web/src/components/editor/data-picker/ibiz-grid-picker/ibiz-grid-picker.scss
0 → 100644
浏览文件 @
d24ae405
@include
b
(
grid-picker
){
word-break
:break-all
;
.
#{
bem
(
mpicker
,
''
,
readonly
)
}
{
white-space
:
pre-line
;
}
}
\ No newline at end of file
app_Web/src/components/editor/data-picker/ibiz-grid-picker/ibiz-grid-picker.tsx
浏览文件 @
d24ae405
...
@@ -5,6 +5,7 @@ import {
...
@@ -5,6 +5,7 @@ import {
useGridCellEditor
,
useGridCellEditor
,
useNamespace
,
useNamespace
,
}
from
'@ibiz-template/vue-util'
;
}
from
'@ibiz-template/vue-util'
;
import
'./ibiz-grid-picker.scss'
;
export
const
IBizGridPicker
=
defineComponent
({
export
const
IBizGridPicker
=
defineComponent
({
name
:
'IBizGridPicker'
,
name
:
'IBizGridPicker'
,
...
...
app_Web/src/components/editor/data-picker/ibiz-mpicker/ibiz-mpicker.tsx
浏览文件 @
d24ae405
...
@@ -117,9 +117,20 @@ export const IBizMPicker = defineComponent({
...
@@ -117,9 +117,20 @@ export const IBizMPicker = defineComponent({
const
valArr
:
Array
<
IData
>
=
[];
const
valArr
:
Array
<
IData
>
=
[];
if
(
selects
.
length
>
0
)
{
if
(
selects
.
length
>
0
)
{
selects
.
forEach
((
select
:
string
)
=>
{
selects
.
forEach
((
select
:
string
)
=>
{
const
findItem
=
items
.
value
.
find
(
item
=>
let
index
=
items
.
value
.
findIndex
(
item
=>
Object
.
is
(
item
.
srfkey
,
select
),
Object
.
is
(
item
.
srfkey
,
select
),
);
);
let
findItem
:
IData
|
null
=
null
;
if
(
index
>=
0
)
{
findItem
=
items
.
value
[
index
];
}
else
{
index
=
selectItems
.
value
.
findIndex
((
item
:
IData
)
=>
Object
.
is
(
item
.
srfkey
,
select
),
);
if
(
index
>=
0
)
{
findItem
=
selectItems
.
value
[
index
];
}
}
if
(
findItem
)
{
if
(
findItem
)
{
valArr
.
push
(
findItem
);
valArr
.
push
(
findItem
);
}
}
...
...
app_Web/src/components/widgets/form-control/form-druipart/form-druipart.tsx
浏览文件 @
d24ae405
...
@@ -62,9 +62,9 @@ export const FormDRUIPart = defineComponent({
...
@@ -62,9 +62,9 @@ export const FormDRUIPart = defineComponent({
neuronInit
:
this
.
onNeuronInit
,
neuronInit
:
this
.
onNeuronInit
,
},
},
})
}
})
}
{
this
.
controller
.
showMask
&&
(
{
/* {
this.controller.showMask && (
<div class={this.ns.e('mask')}>请先保存主数据</div>
<div class={this.ns.e('mask')}>请先保存主数据</div>
)
}
)}
*/
}
</
div
>
</
div
>
);
);
},
},
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
浏览文件 @
d24ae405
...
@@ -1398,16 +1398,16 @@
...
@@ -1398,16 +1398,16 @@
"codeName"
:
"VMGroup2"
,
"codeName"
:
"VMGroup2"
,
"name"
:
"视图消息组2"
,
"name"
:
"视图消息组2"
,
"getPSAppViewMsgGroupDetails"
:
[
{
"getPSAppViewMsgGroupDetails"
:
[
{
"name"
:
"视图消息
2
"
,
"name"
:
"视图消息"
,
"getPSAppViewMsg"
:
{
"getPSAppViewMsg"
:
{
"modelref"
:
true
,
"modelref"
:
true
,
"id"
:
"ViewMsg
3
"
"id"
:
"ViewMsg
2
"
}
}
},
{
},
{
"name"
:
"视图消息"
,
"name"
:
"视图消息
2
"
,
"getPSAppViewMsg"
:
{
"getPSAppViewMsg"
:
{
"modelref"
:
true
,
"modelref"
:
true
,
"id"
:
"ViewMsg
2
"
"id"
:
"ViewMsg
3
"
}
}
}
]
}
]
},
{
},
{
...
...
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @
d24ae405
...
@@ -3571,16 +3571,16 @@
...
@@ -3571,16 +3571,16 @@
"codeName" : "VMGroup2",
"codeName" : "VMGroup2",
"name" : "视图消息组2",
"name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ {
"getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息
2
",
"name" : "视图消息",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg
3
"
"id" : "ViewMsg
2
"
}
}
}, {
}, {
"name" : "视图消息",
"name" : "视图消息
2
",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg
2
"
"id" : "ViewMsg
3
"
}
}
} ]
} ]
}, {
}, {
...
@@ -3598,12 +3598,6 @@
...
@@ -3598,12 +3598,6 @@
"codeName" : "VMGroup3",
"codeName" : "VMGroup3",
"name" : "视图消息类型测试",
"name" : "视图消息类型测试",
"getPSAppViewMsgGroupDetails" : [ {
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
}
}, {
"name" : "消息类型-错误信息",
"name" : "消息类型-错误信息",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
...
@@ -3615,21 +3609,27 @@
...
@@ -3615,21 +3609,27 @@
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg4"
"id" : "ViewMsg4"
}
}
}, {
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
}
} ]
} ]
}, {
}, {
"codeName" : "VMGroup4",
"codeName" : "VMGroup4",
"name" : "视图消息位置测试",
"name" : "视图消息位置测试",
"getPSAppViewMsgGroupDetails" : [ {
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-视图
内容区
",
"name" : "消息位置-视图
上方
",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg
9
"
"id" : "ViewMsg
7
"
}
}
}, {
}, {
"name" : "消息位置-
视图上方
",
"name" : "消息位置-
弹出
",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg
7
"
"id" : "ViewMsg
10
"
}
}
}, {
}, {
"name" : "消息位置-视图下方",
"name" : "消息位置-视图下方",
...
@@ -3638,22 +3638,16 @@
...
@@ -3638,22 +3638,16 @@
"id" : "ViewMsg8"
"id" : "ViewMsg8"
}
}
}, {
}, {
"name" : "消息位置-
弹出
",
"name" : "消息位置-
视图内容区
",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg
10
"
"id" : "ViewMsg
9
"
}
}
} ]
} ]
}, {
}, {
"codeName" : "VMGroup5",
"codeName" : "VMGroup5",
"name" : "视图消息关闭模式",
"name" : "视图消息关闭模式",
"getPSAppViewMsgGroupDetails" : [ {
"getPSAppViewMsgGroupDetails" : [ {
"name" : "关闭模式-本次删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg13"
}
}, {
"name" : "关闭模式-无删除",
"name" : "关闭模式-无删除",
"getPSAppViewMsg" : {
"getPSAppViewMsg" : {
"modelref" : true,
"modelref" : true,
...
@@ -3665,6 +3659,12 @@
...
@@ -3665,6 +3659,12 @@
"modelref" : true,
"modelref" : true,
"id" : "ViewMsg12"
"id" : "ViewMsg12"
}
}
}, {
"name" : "关闭模式-本次删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg13"
}
} ]
} ]
}, {
}, {
"codeName" : "VMGroup6",
"codeName" : "VMGroup6",
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录