Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
功
功能演示系统
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
示例
功能演示系统
提交
cccad40b
提交
cccad40b
编写于
12月 14, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
kuaikuai 发布系统代码 [后台服务,演示应用]
上级
2e006310
变更
8
展开全部
隐藏空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
24 行增加
和
57 行删除
+24
-57
en-US-base.ts
app_Web/src/locale/lang/en-US-base.ts
+3
-3
zh-CN-base.ts
app_Web/src/locale/lang/zh-CN-base.ts
+3
-3
ibizbook_en_US_base.ts
...rc/locale/lanres/entities/ibizbook/ibizbook_en_US_base.ts
+0
-1
ibizbook_zh_CN_base.ts
...rc/locale/lanres/entities/ibizbook/ibizbook_zh_CN_base.ts
+0
-1
main-menu-appmenu.ts
app_Web/src/mock/app/main-menu-appmenu/main-menu-appmenu.ts
+6
-6
main-menu-appmenu-model.ts
.../widgets/app/main-menu-appmenu/main-menu-appmenu-model.ts
+6
-6
expor-and-import-grid-grid-base.vue
...-and-import-grid-grid/expor-and-import-grid-grid-base.vue
+5
-36
systemResource.json
demo-core/src/main/resources/permission/systemResource.json
+1
-1
未找到文件。
app_Web/src/locale/lang/en-US-base.ts
浏览文件 @
cccad40b
...
@@ -211,9 +211,9 @@ function getAppLocale(){
...
@@ -211,9 +211,9 @@ function getAppLocale(){
menuitem126
:
commonLogic
.
appcommonhandle
(
"实体数据看板"
,
null
),
menuitem126
:
commonLogic
.
appcommonhandle
(
"实体数据看板"
,
null
),
menuitem157
:
commonLogic
.
appcommonhandle
(
"导航类"
,
null
),
menuitem157
:
commonLogic
.
appcommonhandle
(
"导航类"
,
null
),
menuitem122
:
commonLogic
.
appcommonhandle
(
"数据关系栏"
,
null
),
menuitem122
:
commonLogic
.
appcommonhandle
(
"数据关系栏"
,
null
),
menuitem116
:
commonLogic
.
appcommonhandle
(
" 数据关系栏"
,
null
),
menuitem116
:
commonLogic
.
appcommonhandle
(
" 数据关系栏
(左右关系)
"
,
null
),
menuitem117
:
commonLogic
.
appcommonhandle
(
"
编辑视图(上下关系)
"
,
null
),
menuitem117
:
commonLogic
.
appcommonhandle
(
"
数据关系栏(上下关系)
"
,
null
),
menuitem118
:
commonLogic
.
appcommonhandle
(
"
编辑视图(分页关系)
"
,
null
),
menuitem118
:
commonLogic
.
appcommonhandle
(
"
数据关系栏(分页关系)
"
,
null
),
menuitem120
:
commonLogic
.
appcommonhandle
(
"分页导航"
,
null
),
menuitem120
:
commonLogic
.
appcommonhandle
(
"分页导航"
,
null
),
menuitem128
:
commonLogic
.
appcommonhandle
(
"表格导航"
,
null
),
menuitem128
:
commonLogic
.
appcommonhandle
(
"表格导航"
,
null
),
menuitem136
:
commonLogic
.
appcommonhandle
(
"树导航"
,
null
),
menuitem136
:
commonLogic
.
appcommonhandle
(
"树导航"
,
null
),
...
...
app_Web/src/locale/lang/zh-CN-base.ts
浏览文件 @
cccad40b
...
@@ -211,9 +211,9 @@ function getAppLocale(){
...
@@ -211,9 +211,9 @@ function getAppLocale(){
menuitem126
:
commonLogic
.
appcommonhandle
(
"实体数据看板"
,
null
),
menuitem126
:
commonLogic
.
appcommonhandle
(
"实体数据看板"
,
null
),
menuitem157
:
commonLogic
.
appcommonhandle
(
"导航类"
,
null
),
menuitem157
:
commonLogic
.
appcommonhandle
(
"导航类"
,
null
),
menuitem122
:
commonLogic
.
appcommonhandle
(
"数据关系栏"
,
null
),
menuitem122
:
commonLogic
.
appcommonhandle
(
"数据关系栏"
,
null
),
menuitem116
:
commonLogic
.
appcommonhandle
(
" 数据关系栏"
,
null
),
menuitem116
:
commonLogic
.
appcommonhandle
(
" 数据关系栏
(左右关系)
"
,
null
),
menuitem117
:
commonLogic
.
appcommonhandle
(
"
编辑视图(上下关系)
"
,
null
),
menuitem117
:
commonLogic
.
appcommonhandle
(
"
数据关系栏(上下关系)
"
,
null
),
menuitem118
:
commonLogic
.
appcommonhandle
(
"
编辑视图(分页关系)
"
,
null
),
menuitem118
:
commonLogic
.
appcommonhandle
(
"
数据关系栏(分页关系)
"
,
null
),
menuitem120
:
commonLogic
.
appcommonhandle
(
"分页导航"
,
null
),
menuitem120
:
commonLogic
.
appcommonhandle
(
"分页导航"
,
null
),
menuitem128
:
commonLogic
.
appcommonhandle
(
"表格导航"
,
null
),
menuitem128
:
commonLogic
.
appcommonhandle
(
"表格导航"
,
null
),
menuitem136
:
commonLogic
.
appcommonhandle
(
"树导航"
,
null
),
menuitem136
:
commonLogic
.
appcommonhandle
(
"树导航"
,
null
),
...
...
app_Web/src/locale/lanres/entities/ibizbook/ibizbook_en_US_base.ts
浏览文件 @
cccad40b
...
@@ -582,7 +582,6 @@ function getLocaleResourceBase(){
...
@@ -582,7 +582,6 @@ function getLocaleResourceBase(){
},
},
exporandimportgrid_grid
:
{
exporandimportgrid_grid
:
{
columns
:
{
columns
:
{
ibizbookid
:
commonLogic
.
appcommonhandle
(
"图书标识"
,
null
),
ibizbookname
:
commonLogic
.
appcommonhandle
(
"图书名称"
,
null
),
ibizbookname
:
commonLogic
.
appcommonhandle
(
"图书名称"
,
null
),
author
:
commonLogic
.
appcommonhandle
(
"图书作者"
,
null
),
author
:
commonLogic
.
appcommonhandle
(
"图书作者"
,
null
),
type
:
commonLogic
.
appcommonhandle
(
"图书类型"
,
null
),
type
:
commonLogic
.
appcommonhandle
(
"图书类型"
,
null
),
...
...
app_Web/src/locale/lanres/entities/ibizbook/ibizbook_zh_CN_base.ts
浏览文件 @
cccad40b
...
@@ -582,7 +582,6 @@ function getLocaleResourceBase(){
...
@@ -582,7 +582,6 @@ function getLocaleResourceBase(){
},
},
exporandimportgrid_grid
:
{
exporandimportgrid_grid
:
{
columns
:
{
columns
:
{
ibizbookid
:
commonLogic
.
appcommonhandle
(
"图书标识"
,
null
),
ibizbookname
:
commonLogic
.
appcommonhandle
(
"图书名称"
,
null
),
ibizbookname
:
commonLogic
.
appcommonhandle
(
"图书名称"
,
null
),
author
:
commonLogic
.
appcommonhandle
(
"图书作者"
,
null
),
author
:
commonLogic
.
appcommonhandle
(
"图书作者"
,
null
),
type
:
commonLogic
.
appcommonhandle
(
"图书类型"
,
null
),
type
:
commonLogic
.
appcommonhandle
(
"图书类型"
,
null
),
...
...
app_Web/src/mock/app/main-menu-appmenu/main-menu-appmenu.ts
浏览文件 @
cccad40b
...
@@ -579,10 +579,10 @@ mock.onGet('v7/main-menuappmenu').reply((config: any) => {
...
@@ -579,10 +579,10 @@ mock.onGet('v7/main-menuappmenu').reply((config: any) => {
{
{
id
:
'DDD0927E-EA23-4D97-A8B6-7D9341A4A331'
,
id
:
'DDD0927E-EA23-4D97-A8B6-7D9341A4A331'
,
name
:
'menuitem116'
,
name
:
'menuitem116'
,
text
:
' 数据关系栏'
,
text
:
' 数据关系栏
(左右关系)
'
,
type
:
'MENUITEM'
,
type
:
'MENUITEM'
,
counterid
:
''
,
counterid
:
''
,
tooltip
:
' 数据关系栏'
,
tooltip
:
' 数据关系栏
(左右关系)
'
,
expanded
:
false
,
expanded
:
false
,
separator
:
false
,
separator
:
false
,
hidden
:
false
,
hidden
:
false
,
...
@@ -597,10 +597,10 @@ mock.onGet('v7/main-menuappmenu').reply((config: any) => {
...
@@ -597,10 +597,10 @@ mock.onGet('v7/main-menuappmenu').reply((config: any) => {
{
{
id
:
'4A60A0B5-EDAB-4103-88C6-5713F98FBF96'
,
id
:
'4A60A0B5-EDAB-4103-88C6-5713F98FBF96'
,
name
:
'menuitem117'
,
name
:
'menuitem117'
,
text
:
'
编辑视图(上下关系)
'
,
text
:
'
数据关系栏(上下关系)
'
,
type
:
'MENUITEM'
,
type
:
'MENUITEM'
,
counterid
:
''
,
counterid
:
''
,
tooltip
:
'
编辑视图(上下关系)
'
,
tooltip
:
'
数据关系栏(上下关系)
'
,
expanded
:
false
,
expanded
:
false
,
separator
:
false
,
separator
:
false
,
hidden
:
false
,
hidden
:
false
,
...
@@ -615,10 +615,10 @@ mock.onGet('v7/main-menuappmenu').reply((config: any) => {
...
@@ -615,10 +615,10 @@ mock.onGet('v7/main-menuappmenu').reply((config: any) => {
{
{
id
:
'F3BDE046-F267-4AAF-A174-F1020066C4B5'
,
id
:
'F3BDE046-F267-4AAF-A174-F1020066C4B5'
,
name
:
'menuitem118'
,
name
:
'menuitem118'
,
text
:
'
编辑视图(分页关系)
'
,
text
:
'
数据关系栏(分页关系)
'
,
type
:
'MENUITEM'
,
type
:
'MENUITEM'
,
counterid
:
''
,
counterid
:
''
,
tooltip
:
'
编辑视图(分页关系)
'
,
tooltip
:
'
数据关系栏(分页关系)
'
,
expanded
:
false
,
expanded
:
false
,
separator
:
false
,
separator
:
false
,
hidden
:
false
,
hidden
:
false
,
...
...
app_Web/src/widgets/app/main-menu-appmenu/main-menu-appmenu-model.ts
浏览文件 @
cccad40b
...
@@ -614,10 +614,10 @@ export default class MainMenuModel {
...
@@ -614,10 +614,10 @@ export default class MainMenuModel {
{
{
id
:
'DDD0927E-EA23-4D97-A8B6-7D9341A4A331'
,
id
:
'DDD0927E-EA23-4D97-A8B6-7D9341A4A331'
,
name
:
'menuitem116'
,
name
:
'menuitem116'
,
text
:
' 数据关系栏'
,
text
:
' 数据关系栏
(左右关系)
'
,
type
:
'MENUITEM'
,
type
:
'MENUITEM'
,
counterid
:
''
,
counterid
:
''
,
tooltip
:
' 数据关系栏'
,
tooltip
:
' 数据关系栏
(左右关系)
'
,
expanded
:
false
,
expanded
:
false
,
separator
:
false
,
separator
:
false
,
hidden
:
false
,
hidden
:
false
,
...
@@ -633,10 +633,10 @@ export default class MainMenuModel {
...
@@ -633,10 +633,10 @@ export default class MainMenuModel {
{
{
id
:
'4A60A0B5-EDAB-4103-88C6-5713F98FBF96'
,
id
:
'4A60A0B5-EDAB-4103-88C6-5713F98FBF96'
,
name
:
'menuitem117'
,
name
:
'menuitem117'
,
text
:
'
编辑视图(上下关系)
'
,
text
:
'
数据关系栏(上下关系)
'
,
type
:
'MENUITEM'
,
type
:
'MENUITEM'
,
counterid
:
''
,
counterid
:
''
,
tooltip
:
'
编辑视图(上下关系)
'
,
tooltip
:
'
数据关系栏(上下关系)
'
,
expanded
:
false
,
expanded
:
false
,
separator
:
false
,
separator
:
false
,
hidden
:
false
,
hidden
:
false
,
...
@@ -652,10 +652,10 @@ export default class MainMenuModel {
...
@@ -652,10 +652,10 @@ export default class MainMenuModel {
{
{
id
:
'F3BDE046-F267-4AAF-A174-F1020066C4B5'
,
id
:
'F3BDE046-F267-4AAF-A174-F1020066C4B5'
,
name
:
'menuitem118'
,
name
:
'menuitem118'
,
text
:
'
编辑视图(分页关系)
'
,
text
:
'
数据关系栏(分页关系)
'
,
type
:
'MENUITEM'
,
type
:
'MENUITEM'
,
counterid
:
''
,
counterid
:
''
,
tooltip
:
'
编辑视图(分页关系)
'
,
tooltip
:
'
数据关系栏(分页关系)
'
,
expanded
:
false
,
expanded
:
false
,
separator
:
false
,
separator
:
false
,
hidden
:
false
,
hidden
:
false
,
...
...
app_Web/src/widgets/ibizbook/expor-and-import-grid-grid/expor-and-import-grid-grid-base.vue
浏览文件 @
cccad40b
...
@@ -21,18 +21,6 @@
...
@@ -21,18 +21,6 @@
<
template
v-if=
"!isSingleSelect"
>
<
template
v-if=
"!isSingleSelect"
>
<el-table-column
align=
"center"
type=
'selection'
:width=
"checkboxColWidth"
></el-table-column>
<el-table-column
align=
"center"
type=
'selection'
:width=
"checkboxColWidth"
></el-table-column>
</
template
>
</
template
>
<
template
v-if=
"getColumnState('ibizbookid')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'ibizbookid'"
:label=
"$t('entities.ibizbook.exporandimportgrid_grid.columns.ibizbookid')"
:width=
"100"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibizbook.exporandimportgrid_grid.columns.ibizbookid'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column,$index}"
>
<span>
{{
row
.
ibizbookid
}}
</span>
</
template
>
</el-table-column>
</template>
<
template
v-if=
"getColumnState('ibizbookname')"
>
<
template
v-if=
"getColumnState('ibizbookname')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'ibizbookname'"
:label=
"$t('entities.ibizbook.exporandimportgrid_grid.columns.ibizbookname')"
:width=
"100"
:align=
"'left'"
:sortable=
"'custom'"
>
<el-table-column
show-overflow-tooltip
:prop=
"'ibizbookname'"
:label=
"$t('entities.ibizbook.exporandimportgrid_grid.columns.ibizbookname')"
:width=
"100"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<template
v-slot:header=
"
{column}">
...
@@ -716,15 +704,6 @@ export default class ExporAndImportGridBase extends Vue implements ControlInterf
...
@@ -716,15 +704,6 @@ export default class ExporAndImportGridBase extends Vue implements ControlInterf
* @memberof ExporAndImportGridBase
* @memberof ExporAndImportGridBase
*/
*/
public
allColumns
:
any
[]
=
[
public
allColumns
:
any
[]
=
[
{
name
:
'ibizbookid'
,
label
:
'图书标识'
,
langtag
:
'entities.ibizbook.exporandimportgrid_grid.columns.ibizbookid'
,
show
:
true
,
unit
:
'PX'
,
isEnableRowEdit
:
false
,
enableCond
:
3
,
},
{
{
name
:
'ibizbookname'
,
name
:
'ibizbookname'
,
label
:
'图书名称'
,
label
:
'图书名称'
,
...
@@ -1549,7 +1528,7 @@ export default class ExporAndImportGridBase extends Vue implements ControlInterf
...
@@ -1549,7 +1528,7 @@ export default class ExporAndImportGridBase extends Vue implements ControlInterf
* @memberof ExporAndImportGridBase
* @memberof ExporAndImportGridBase
*/
*/
public
arraySpanMethod
({
row
,
column
,
rowIndex
,
columnIndex
}
:
any
)
{
public
arraySpanMethod
({
row
,
column
,
rowIndex
,
columnIndex
}
:
any
)
{
let
allColumns
:
Array
<
any
>
=
[
'ibizbook
id'
,
'ibizbook
name'
,
'author'
,
'type'
,
'press'
,
'price'
,
'subtext'
,
'booknumber'
,
'tag'
,
'borrowway'
,
'sailstate'
];
let
allColumns
:
Array
<
any
>
=
[
'ibizbookname'
,
'author'
,
'type'
,
'press'
,
'price'
,
'subtext'
,
'booknumber'
,
'tag'
,
'borrowway'
,
'sailstate'
];
if
(
row
&&
row
.
children
)
{
if
(
row
&&
row
.
children
)
{
if
(
columnIndex
==
(
this
.
isSingleSelect
?
0
:
1
))
{
if
(
columnIndex
==
(
this
.
isSingleSelect
?
0
:
1
))
{
return
[
1
,
allColumns
.
length
+
1
];
return
[
1
,
allColumns
.
length
+
1
];
...
@@ -1629,7 +1608,6 @@ export default class ExporAndImportGridBase extends Vue implements ControlInterf
...
@@ -1629,7 +1608,6 @@ export default class ExporAndImportGridBase extends Vue implements ControlInterf
const
tree
:
any
=
{
const
tree
:
any
=
{
groupById
:
Number
((
i
+
1
)
*
100
),
groupById
:
Number
((
i
+
1
)
*
100
),
group
:
group
.
label
,
group
:
group
.
label
,
ibizbookid
:
''
,
ibizbookname
:
''
,
ibizbookname
:
''
,
author
:
''
,
author
:
''
,
type
:
''
,
type
:
''
,
...
@@ -1666,7 +1644,6 @@ export default class ExporAndImportGridBase extends Vue implements ControlInterf
...
@@ -1666,7 +1644,6 @@ export default class ExporAndImportGridBase extends Vue implements ControlInterf
const
Tree
:
any
=
{
const
Tree
:
any
=
{
groupById
:
Number
((
allGroup
.
length
+
1
)
*
100
),
groupById
:
Number
((
allGroup
.
length
+
1
)
*
100
),
group
:
this
.
$t
(
'app.gridpage.other'
),
group
:
this
.
$t
(
'app.gridpage.other'
),
ibizbookid
:
''
,
ibizbookname
:
''
,
ibizbookname
:
''
,
author
:
''
,
author
:
''
,
type
:
''
,
type
:
''
,
...
@@ -1723,7 +1700,6 @@ export default class ExporAndImportGridBase extends Vue implements ControlInterf
...
@@ -1723,7 +1700,6 @@ export default class ExporAndImportGridBase extends Vue implements ControlInterf
const
tree
:
any
=
{
const
tree
:
any
=
{
groupById
:
Number
((
groupIndex
+
1
)
*
100
),
groupById
:
Number
((
groupIndex
+
1
)
*
100
),
group
:
group
,
group
:
group
,
ibizbookid
:
''
,
ibizbookname
:
''
,
ibizbookname
:
''
,
author
:
''
,
author
:
''
,
type
:
''
,
type
:
''
,
...
@@ -2151,16 +2127,10 @@ export default class ExporAndImportGridBase extends Vue implements ControlInterf
...
@@ -2151,16 +2127,10 @@ export default class ExporAndImportGridBase extends Vue implements ControlInterf
});
});
}
}
}
else
if
(
Object
.
is
(
errorMessage
[
index
].
data
.
errorKey
,
'DuplicateKeyException'
)){
}
else
if
(
Object
.
is
(
errorMessage
[
index
].
data
.
errorKey
,
'DuplicateKeyException'
)){
let
name
:
string
=
this
.
service
.
getNameByProp
(
"ibizbookid"
);
this
.
$Notice
.
error
({
if
(
name
){
title
:
(
this
.
$t
(
'app.commonWords.saveFailed'
)
as
string
),
let
desc
:
any
=
this
.
allColumns
.
find
((
column
:
any
)
=>
{
desc
:
errorMessage
[
index
].
data
.
message
?
errorMessage
[
index
].
data
.
message
:(
this
.
$t
(
'app.commonWords.sysException'
)
as
string
),
return
Object
.
is
(
column
.
name
,
name
);
});
});
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.createFailed'
)
as
string
),
desc
:
(
desc
?
desc
.
label
:
''
)
+
" : "
+
item
[
name
]
+
(
this
.
$t
(
'app.commonWords.isExist'
)
as
string
)
+
'!'
,
});
}
}
else
{
}
else
{
this
.
$Notice
.
error
({
this
.
$Notice
.
error
({
title
:
(
this
.
$t
(
'app.commonWords.saveFailed'
)
as
string
),
title
:
(
this
.
$t
(
'app.commonWords.saveFailed'
)
as
string
),
...
@@ -2269,7 +2239,6 @@ export default class ExporAndImportGridBase extends Vue implements ControlInterf
...
@@ -2269,7 +2239,6 @@ export default class ExporAndImportGridBase extends Vue implements ControlInterf
return
;
return
;
}
}
let
tempContext
:
any
=
this
.
$util
.
deepCopy
(
this
.
context
);
let
tempContext
:
any
=
this
.
$util
.
deepCopy
(
this
.
context
);
Object
.
is
(
tempContext
,
{
ibizbook
:
data
.
ibizbookid
});
const
arg
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
const
arg
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
Object
.
assign
(
arg
,{
viewparams
:
this
.
viewparams
});
Object
.
assign
(
arg
,{
viewparams
:
this
.
viewparams
});
const
post
:
Promise
<
any
>
=
this
.
service
.
frontLogic
(
mode
,
JSON
.
parse
(
JSON
.
stringify
(
tempContext
)),
arg
,
showloading
);
const
post
:
Promise
<
any
>
=
this
.
service
.
frontLogic
(
mode
,
JSON
.
parse
(
JSON
.
stringify
(
tempContext
)),
arg
,
showloading
);
...
...
demo-core/src/main/resources/permission/systemResource.json
浏览文件 @
cccad40b
此差异已折叠。
点击以展开。
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录