Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
功
功能演示系统
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
示例
功能演示系统
提交
debc34dd
提交
debc34dd
编写于
11月 20, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ShineKOT 部署微服务应用 [后台服务,演示应用]
上级
fb47319a
变更
19
隐藏空白字符变更
内嵌
并排
正在显示
19 个修改的文件
包含
134 行增加
和
127 行删除
+134
-127
ibizbook_en_US.ts
...Web/src/locale/lanres/entities/ibizbook/ibizbook_en_US.ts
+4
-0
ibizbook_zh_CN.ts
...Web/src/locale/lanres/entities/ibizbook/ibizbook_zh_CN.ts
+4
-0
internal-func-grid-base.vue
...s/ibizbook/internal-func-grid/internal-func-grid-base.vue
+2
-12
main2-grid-base.vue
app_Web/src/widgets/ibizbook/main2-grid/main2-grid-base.vue
+2
-12
main3-grid-base.vue
app_Web/src/widgets/ibizbook/main3-grid/main3-grid-base.vue
+2
-12
main4-grid-base.vue
app_Web/src/widgets/ibizbook/main4-grid/main4-grid-base.vue
+25
-13
main4-grid-model.ts
app_Web/src/widgets/ibizbook/main4-grid/main4-grid-model.ts
+5
-0
main5-grid-base.vue
app_Web/src/widgets/ibizbook/main5-grid/main5-grid-base.vue
+25
-13
main5-grid-model.ts
app_Web/src/widgets/ibizbook/main5-grid/main5-grid-model.ts
+5
-0
new-default-grid-base.vue
...dgets/ibizbook/new-default-grid/new-default-grid-base.vue
+2
-10
row-edit-grid-base.vue
...src/widgets/ibizbook/row-edit-grid/row-edit-grid-base.vue
+25
-11
row-edit-grid-model.ts
...src/widgets/ibizbook/row-edit-grid/row-edit-grid-model.ts
+5
-0
row-rules-grid-base.vue
...c/widgets/ibizbook/row-rules-grid/row-rules-grid-base.vue
+2
-10
update-default-grid-base.vue
...ibizbook/update-default-grid/update-default-grid-base.vue
+2
-10
config.xml
config.xml
+5
-5
Dockerfile
demo-app/demo-app-web/src/main/docker/Dockerfile
+1
-1
demo-app-web.yaml
demo-app/demo-app-web/src/main/docker/demo-app-web.yaml
+16
-1
Dockerfile
...provider/demo-provider-demoapi/src/main/docker/Dockerfile
+1
-1
demo-provider-demoapi.yaml
...ovider-demoapi/src/main/docker/demo-provider-demoapi.yaml
+1
-16
未找到文件。
app_Web/src/locale/lanres/entities/ibizbook/ibizbook_en_US.ts
浏览文件 @
debc34dd
...
...
@@ -11,6 +11,7 @@ export default {
price
:
"图书价格"
,
press
:
"图书出版社"
,
type
:
"图书类型"
,
booknumber
:
"图书数量"
,
},
views
:
{
usr2gridview
:
{
...
...
@@ -90,6 +91,7 @@ export default {
type
:
"图书类型"
,
press
:
"图书出版社"
,
price
:
"图书价格"
,
booknumber
:
"图书数量"
,
},
nodata
:
""
,
uiactions
:
{
...
...
@@ -102,6 +104,7 @@ export default {
ibizbookname
:
"图书名称"
,
press
:
"图书出版社"
,
price
:
"图书价格"
,
booknumber
:
"图书数量"
,
},
nodata
:
""
,
uiactions
:
{
...
...
@@ -164,6 +167,7 @@ export default {
ibizbookname
:
"图书名称"
,
press
:
"图书出版社"
,
price
:
"图书价格"
,
booknumber
:
"图书数量"
,
},
nodata
:
""
,
uiactions
:
{
...
...
app_Web/src/locale/lanres/entities/ibizbook/ibizbook_zh_CN.ts
浏览文件 @
debc34dd
...
...
@@ -10,6 +10,7 @@ export default {
price
:
"图书价格"
,
press
:
"图书出版社"
,
type
:
"图书类型"
,
booknumber
:
"图书数量"
,
},
views
:
{
usr2gridview
:
{
...
...
@@ -89,6 +90,7 @@ export default {
type
:
"图书类型"
,
press
:
"图书出版社"
,
price
:
"图书价格"
,
booknumber
:
"图书数量"
,
},
nodata
:
""
,
uiactions
:
{
...
...
@@ -101,6 +103,7 @@ export default {
ibizbookname
:
"图书名称"
,
press
:
"图书出版社"
,
price
:
"图书价格"
,
booknumber
:
"图书数量"
,
},
nodata
:
""
,
uiactions
:
{
...
...
@@ -163,6 +166,7 @@ export default {
ibizbookname
:
"图书名称"
,
press
:
"图书出版社"
,
price
:
"图书价格"
,
booknumber
:
"图书数量"
,
},
nodata
:
""
,
uiactions
:
{
...
...
app_Web/src/widgets/ibizbook/internal-func-grid/internal-func-grid-base.vue
浏览文件 @
debc34dd
...
...
@@ -53,9 +53,7 @@
</span>
</
template
>
<
template
v-slot=
"{row,column,$index}"
>
<template
>
<codelist
:value=
"row.type"
tag=
'BookType'
codelistType=
'STATIC'
></codelist>
</
template
>
<span>
{{
row
.
type
}}
</span>
</
template
>
</el-table-column>
</template>
...
...
@@ -1044,7 +1042,7 @@ export default class InternalFuncBase extends Vue implements ControlInterface {
"PRICE"
:{
"headername"
:
"图书价格"
,
"isuniqueitem"
:
false
,
"name"
:
"price"
,
"order"
:
1000
},
"IBIZBOOKNAME"
:{
"headername"
:
"图书名称"
,
"isuniqueitem"
:
false
,
"name"
:
"ibizbookname"
,
"order"
:
1000
},
"IBIZBOOKID"
:{
"headername"
:
"图书标识"
,
"isuniqueitem"
:
false
,
"name"
:
"ibizbookid"
,
"order"
:
1000
},
"TYPE"
:{
"
codelist"
:{
"type"
:
"STATIC"
,
"tag"
:
"BookType"
,
"isnumber"
:
false
},
"
headername"
:
"图书类型"
,
"isuniqueitem"
:
false
,
"name"
:
"type"
,
"order"
:
1000
}
"TYPE"
:{
"headername"
:
"图书类型"
,
"isuniqueitem"
:
false
,
"name"
:
"type"
,
"order"
:
1000
}
}
}
if
(
Object
.
keys
(
importDataModel
).
length
==
0
){
...
...
@@ -1145,14 +1143,6 @@ export default class InternalFuncBase extends Vue implements ControlInterface {
*/
public
async
formatExcelData
(
filterVal
:
any
,
jsonData
:
any
)
{
let
codelistColumns
:
Array
<
any
>
=
[
{
name
:
'type'
,
srfkey
:
'BookType'
,
codelistType
:
'STATIC'
,
renderMode
:
'other'
,
textSeparator
:
'、'
,
valueSeparator
:
','
,
},
];
let
_this
=
this
;
for
(
const
codelist
of
codelistColumns
)
{
...
...
app_Web/src/widgets/ibizbook/main2-grid/main2-grid-base.vue
浏览文件 @
debc34dd
...
...
@@ -39,9 +39,7 @@
</span>
</
template
>
<
template
v-slot=
"{row,column,$index}"
>
<template
>
<codelist
:value=
"row.type"
tag=
'BookType'
codelistType=
'STATIC'
></codelist>
</
template
>
<span>
{{
row
.
type
}}
</span>
</
template
>
</el-table-column>
</template>
...
...
@@ -1055,7 +1053,7 @@ export default class Main2Base extends Vue implements ControlInterface {
"PRICE"
:{
"headername"
:
"图书价格"
,
"isuniqueitem"
:
false
,
"name"
:
"price"
,
"order"
:
1000
},
"IBIZBOOKNAME"
:{
"headername"
:
"图书名称"
,
"isuniqueitem"
:
false
,
"name"
:
"ibizbookname"
,
"order"
:
1000
},
"IBIZBOOKID"
:{
"headername"
:
"图书标识"
,
"isuniqueitem"
:
false
,
"name"
:
"ibizbookid"
,
"order"
:
1000
},
"TYPE"
:{
"
codelist"
:{
"type"
:
"STATIC"
,
"tag"
:
"BookType"
,
"isnumber"
:
false
},
"
headername"
:
"图书类型"
,
"isuniqueitem"
:
false
,
"name"
:
"type"
,
"order"
:
1000
}
"TYPE"
:{
"headername"
:
"图书类型"
,
"isuniqueitem"
:
false
,
"name"
:
"type"
,
"order"
:
1000
}
}
}
if
(
Object
.
keys
(
importDataModel
).
length
==
0
){
...
...
@@ -1156,14 +1154,6 @@ export default class Main2Base extends Vue implements ControlInterface {
*/
public
async
formatExcelData
(
filterVal
:
any
,
jsonData
:
any
)
{
let
codelistColumns
:
Array
<
any
>
=
[
{
name
:
'type'
,
srfkey
:
'BookType'
,
codelistType
:
'STATIC'
,
renderMode
:
'other'
,
textSeparator
:
'、'
,
valueSeparator
:
','
,
},
];
let
_this
=
this
;
for
(
const
codelist
of
codelistColumns
)
{
...
...
app_Web/src/widgets/ibizbook/main3-grid/main3-grid-base.vue
浏览文件 @
debc34dd
...
...
@@ -39,9 +39,7 @@
</span>
</
template
>
<
template
v-slot=
"{row,column,$index}"
>
<template
>
<codelist
:value=
"row.type"
tag=
'BookType'
codelistType=
'STATIC'
></codelist>
</
template
>
<span>
{{
row
.
type
}}
</span>
</
template
>
</el-table-column>
</template>
...
...
@@ -1055,7 +1053,7 @@ export default class Main3Base extends Vue implements ControlInterface {
"PRICE"
:{
"headername"
:
"图书价格"
,
"isuniqueitem"
:
false
,
"name"
:
"price"
,
"order"
:
1000
},
"IBIZBOOKNAME"
:{
"headername"
:
"图书名称"
,
"isuniqueitem"
:
false
,
"name"
:
"ibizbookname"
,
"order"
:
1000
},
"IBIZBOOKID"
:{
"headername"
:
"图书标识"
,
"isuniqueitem"
:
false
,
"name"
:
"ibizbookid"
,
"order"
:
1000
},
"TYPE"
:{
"
codelist"
:{
"type"
:
"STATIC"
,
"tag"
:
"BookType"
,
"isnumber"
:
false
},
"
headername"
:
"图书类型"
,
"isuniqueitem"
:
false
,
"name"
:
"type"
,
"order"
:
1000
}
"TYPE"
:{
"headername"
:
"图书类型"
,
"isuniqueitem"
:
false
,
"name"
:
"type"
,
"order"
:
1000
}
}
}
if
(
Object
.
keys
(
importDataModel
).
length
==
0
){
...
...
@@ -1156,14 +1154,6 @@ export default class Main3Base extends Vue implements ControlInterface {
*/
public
async
formatExcelData
(
filterVal
:
any
,
jsonData
:
any
)
{
let
codelistColumns
:
Array
<
any
>
=
[
{
name
:
'type'
,
srfkey
:
'BookType'
,
codelistType
:
'STATIC'
,
renderMode
:
'other'
,
textSeparator
:
'、'
,
valueSeparator
:
','
,
},
];
let
_this
=
this
;
for
(
const
codelist
of
codelistColumns
)
{
...
...
app_Web/src/widgets/ibizbook/main4-grid/main4-grid-base.vue
浏览文件 @
debc34dd
...
...
@@ -31,9 +31,7 @@
</span>
</
template
>
<
template
v-slot=
"{row,column,$index}"
>
<template
>
<codelist
:value=
"row.type"
tag=
'BookType'
codelistType=
'STATIC'
></codelist>
</
template
>
<span>
{{
row
.
type
}}
</span>
</
template
>
</el-table-column>
</template>
...
...
@@ -85,6 +83,18 @@
</
template
>
</el-table-column>
</template>
<
template
v-if=
"getColumnState('booknumber')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'booknumber'"
:label=
"$t('entities.ibizbook.main4_grid.columns.booknumber')"
:width=
"280"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibizbook.main4_grid.columns.booknumber'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column,$index}"
>
<span>
{{
row
.
booknumber
}}
</span>
</
template
>
</el-table-column>
</template>
<
template
v-if=
"adaptiveState"
>
<el-table-column></el-table-column>
</
template
>
...
...
@@ -687,6 +697,15 @@ export default class Main4Base extends Vue implements ControlInterface {
isEnableRowEdit
:
false
,
enableCond
:
3
,
},
{
name
:
'booknumber'
,
label
:
'图书数量'
,
langtag
:
'entities.ibizbook.main4_grid.columns.booknumber'
,
show
:
true
,
unit
:
'PX'
,
isEnableRowEdit
:
false
,
enableCond
:
3
,
},
]
/**
...
...
@@ -1046,7 +1065,7 @@ export default class Main4Base extends Vue implements ControlInterface {
"PRICE"
:{
"headername"
:
"图书价格"
,
"isuniqueitem"
:
false
,
"name"
:
"price"
,
"order"
:
1000
},
"IBIZBOOKNAME"
:{
"headername"
:
"图书名称"
,
"isuniqueitem"
:
false
,
"name"
:
"ibizbookname"
,
"order"
:
1000
},
"IBIZBOOKID"
:{
"headername"
:
"图书标识"
,
"isuniqueitem"
:
false
,
"name"
:
"ibizbookid"
,
"order"
:
1000
},
"TYPE"
:{
"
codelist"
:{
"type"
:
"STATIC"
,
"tag"
:
"BookType"
,
"isnumber"
:
false
},
"
headername"
:
"图书类型"
,
"isuniqueitem"
:
false
,
"name"
:
"type"
,
"order"
:
1000
}
"TYPE"
:{
"headername"
:
"图书类型"
,
"isuniqueitem"
:
false
,
"name"
:
"type"
,
"order"
:
1000
}
}
}
if
(
Object
.
keys
(
importDataModel
).
length
==
0
){
...
...
@@ -1147,14 +1166,6 @@ export default class Main4Base extends Vue implements ControlInterface {
*/
public
async
formatExcelData
(
filterVal
:
any
,
jsonData
:
any
)
{
let
codelistColumns
:
Array
<
any
>
=
[
{
name
:
'type'
,
srfkey
:
'BookType'
,
codelistType
:
'STATIC'
,
renderMode
:
'other'
,
textSeparator
:
'、'
,
valueSeparator
:
','
,
},
];
let
_this
=
this
;
for
(
const
codelist
of
codelistColumns
)
{
...
...
@@ -1361,7 +1372,7 @@ export default class Main4Base extends Vue implements ControlInterface {
* @memberof Main4Base
*/
public
arraySpanMethod
({
row
,
column
,
rowIndex
,
columnIndex
}
:
any
)
{
let
allColumns
:
Array
<
any
>
=
[
'type'
,
'author'
,
'ibizbookname'
,
'press'
,
'price'
];
let
allColumns
:
Array
<
any
>
=
[
'type'
,
'author'
,
'ibizbookname'
,
'press'
,
'price'
,
'booknumber'
];
if
(
row
&&
row
.
children
&&
row
.
children
.
length
>
0
)
{
if
(
columnIndex
==
(
this
.
isSingleSelect
?
0
:
1
))
{
return
[
1
,
allColumns
.
length
+
1
];
...
...
@@ -1409,6 +1420,7 @@ export default class Main4Base extends Vue implements ControlInterface {
ibizbookname
:
''
,
press
:
''
,
price
:
''
,
booknumber
:
''
,
children
:
children
,
}
groupTree
.
push
(
tree
);
...
...
app_Web/src/widgets/ibizbook/main4-grid/main4-grid-model.ts
浏览文件 @
debc34dd
...
...
@@ -46,6 +46,11 @@ export default class Main4Model {
prop
:
'price'
,
dataType
:
'CURRENCY'
,
},
{
name
:
'booknumber'
,
prop
:
'booknumber'
,
dataType
:
'INT'
,
},
{
name
:
'ibizbookid'
,
prop
:
'ibizbookid'
,
...
...
app_Web/src/widgets/ibizbook/main5-grid/main5-grid-base.vue
浏览文件 @
debc34dd
...
...
@@ -31,9 +31,7 @@
</span>
</
template
>
<
template
v-slot=
"{row,column,$index}"
>
<template
>
<codelist
:value=
"row.type"
tag=
'BookType'
codelistType=
'STATIC'
></codelist>
</
template
>
<span>
{{
row
.
type
}}
</span>
</
template
>
</el-table-column>
</template>
...
...
@@ -85,6 +83,18 @@
</
template
>
</el-table-column>
</template>
<
template
v-if=
"getColumnState('booknumber')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'booknumber'"
:label=
"$t('entities.ibizbook.main5_grid.columns.booknumber')"
:width=
"280"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibizbook.main5_grid.columns.booknumber'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column,$index}"
>
<span>
{{
row
.
booknumber
}}
</span>
</
template
>
</el-table-column>
</template>
<
template
v-if=
"adaptiveState"
>
<el-table-column></el-table-column>
</
template
>
...
...
@@ -702,6 +712,15 @@ export default class Main5Base extends Vue implements ControlInterface {
isEnableRowEdit
:
false
,
enableCond
:
3
,
},
{
name
:
'booknumber'
,
label
:
'图书数量'
,
langtag
:
'entities.ibizbook.main5_grid.columns.booknumber'
,
show
:
true
,
unit
:
'PX'
,
isEnableRowEdit
:
false
,
enableCond
:
3
,
},
]
/**
...
...
@@ -1062,7 +1081,7 @@ export default class Main5Base extends Vue implements ControlInterface {
"PRICE"
:{
"headername"
:
"图书价格"
,
"isuniqueitem"
:
false
,
"name"
:
"price"
,
"order"
:
1000
},
"IBIZBOOKNAME"
:{
"headername"
:
"图书名称"
,
"isuniqueitem"
:
false
,
"name"
:
"ibizbookname"
,
"order"
:
1000
},
"IBIZBOOKID"
:{
"headername"
:
"图书标识"
,
"isuniqueitem"
:
false
,
"name"
:
"ibizbookid"
,
"order"
:
1000
},
"TYPE"
:{
"
codelist"
:{
"type"
:
"STATIC"
,
"tag"
:
"BookType"
,
"isnumber"
:
false
},
"
headername"
:
"图书类型"
,
"isuniqueitem"
:
false
,
"name"
:
"type"
,
"order"
:
1000
}
"TYPE"
:{
"headername"
:
"图书类型"
,
"isuniqueitem"
:
false
,
"name"
:
"type"
,
"order"
:
1000
}
}
}
if
(
Object
.
keys
(
importDataModel
).
length
==
0
){
...
...
@@ -1163,14 +1182,6 @@ export default class Main5Base extends Vue implements ControlInterface {
*/
public
async
formatExcelData
(
filterVal
:
any
,
jsonData
:
any
)
{
let
codelistColumns
:
Array
<
any
>
=
[
{
name
:
'type'
,
srfkey
:
'BookType'
,
codelistType
:
'STATIC'
,
renderMode
:
'other'
,
textSeparator
:
'、'
,
valueSeparator
:
','
,
},
];
let
_this
=
this
;
for
(
const
codelist
of
codelistColumns
)
{
...
...
@@ -1377,7 +1388,7 @@ export default class Main5Base extends Vue implements ControlInterface {
* @memberof Main5Base
*/
public
arraySpanMethod
({
row
,
column
,
rowIndex
,
columnIndex
}
:
any
)
{
let
allColumns
:
Array
<
any
>
=
[
'type'
,
'author'
,
'ibizbookname'
,
'press'
,
'price'
];
let
allColumns
:
Array
<
any
>
=
[
'type'
,
'author'
,
'ibizbookname'
,
'press'
,
'price'
,
'booknumber'
];
if
(
row
&&
row
.
children
&&
row
.
children
.
length
>
0
)
{
if
(
columnIndex
==
(
this
.
isSingleSelect
?
0
:
1
))
{
return
[
1
,
allColumns
.
length
+
1
];
...
...
@@ -1425,6 +1436,7 @@ export default class Main5Base extends Vue implements ControlInterface {
ibizbookname
:
''
,
press
:
''
,
price
:
''
,
booknumber
:
''
,
children
:
children
,
}
groupTree
.
push
(
tree
);
...
...
app_Web/src/widgets/ibizbook/main5-grid/main5-grid-model.ts
浏览文件 @
debc34dd
...
...
@@ -46,6 +46,11 @@ export default class Main5Model {
prop
:
'price'
,
dataType
:
'CURRENCY'
,
},
{
name
:
'booknumber'
,
prop
:
'booknumber'
,
dataType
:
'INT'
,
},
{
name
:
'ibizbookid'
,
prop
:
'ibizbookid'
,
...
...
app_Web/src/widgets/ibizbook/new-default-grid/new-default-grid-base.vue
浏览文件 @
debc34dd
...
...
@@ -100,7 +100,7 @@
</app-form-item>
</
template
>
<
template
v-if=
"!actualIsOpenEdit"
>
<
codelist
:value=
"row.type"
tag=
'BookType'
codelistType=
'STATIC'
></codelist
>
<
app-span
name=
'type'
editorType=
"TEXTBOX"
:value=
"row.type"
dataType=
"TEXT"
precision=
"0"
></app-span
>
</
template
>
</template>
</el-table-column>
...
...
@@ -1180,7 +1180,7 @@ export default class NewDefaultBase extends Vue implements ControlInterface {
"PRICE"
:{
"headername"
:
"图书价格"
,
"isuniqueitem"
:
false
,
"name"
:
"price"
,
"order"
:
1000
},
"IBIZBOOKNAME"
:{
"headername"
:
"图书名称"
,
"isuniqueitem"
:
false
,
"name"
:
"ibizbookname"
,
"order"
:
1000
},
"IBIZBOOKID"
:{
"headername"
:
"图书标识"
,
"isuniqueitem"
:
false
,
"name"
:
"ibizbookid"
,
"order"
:
1000
},
"TYPE"
:{
"
codelist"
:{
"type"
:
"STATIC"
,
"tag"
:
"BookType"
,
"isnumber"
:
false
},
"
headername"
:
"图书类型"
,
"isuniqueitem"
:
false
,
"name"
:
"type"
,
"order"
:
1000
}
"TYPE"
:{
"headername"
:
"图书类型"
,
"isuniqueitem"
:
false
,
"name"
:
"type"
,
"order"
:
1000
}
}
}
if
(
Object
.
keys
(
importDataModel
).
length
==
0
){
...
...
@@ -1281,14 +1281,6 @@ export default class NewDefaultBase extends Vue implements ControlInterface {
*/
public
async
formatExcelData
(
filterVal
:
any
,
jsonData
:
any
)
{
let
codelistColumns
:
Array
<
any
>
=
[
{
name
:
'type'
,
srfkey
:
'BookType'
,
codelistType
:
'STATIC'
,
renderMode
:
'other'
,
textSeparator
:
'、'
,
valueSeparator
:
','
,
},
];
let
_this
=
this
;
for
(
const
codelist
of
codelistColumns
)
{
...
...
app_Web/src/widgets/ibizbook/row-edit-grid/row-edit-grid-base.vue
浏览文件 @
debc34dd
...
...
@@ -112,7 +112,7 @@
</app-form-item>
</
template
>
<
template
v-if=
"!actualIsOpenEdit"
>
<
codelist
:value=
"row.type"
tag=
'BookType'
codelistType=
'STATIC'
></codelist
>
<
app-span
name=
'type'
editorType=
"TEXTBOX"
:value=
"row.type"
dataType=
"TEXT"
precision=
"0"
></app-span
>
</
template
>
</template>
</el-table-column>
...
...
@@ -172,6 +172,18 @@
</template>
</el-table-column>
</template>
<
template
v-if=
"getColumnState('booknumber')"
>
<el-table-column
show-overflow-tooltip
:prop=
"'booknumber'"
:label=
"$t('entities.ibizbook.rowedit_grid.columns.booknumber')"
:width=
"150"
:align=
"'left'"
:sortable=
"'custom'"
>
<template
v-slot:header=
"
{column}">
<span
class=
"column-header "
>
{{
$t
(
'entities.ibizbook.rowedit_grid.columns.booknumber'
)
}}
</span>
</
template
>
<
template
v-slot=
"{row,column,$index}"
>
<span>
{{
row
.
booknumber
}}
</span>
</
template
>
</el-table-column>
</template>
<
template
v-if=
"adaptiveState"
>
<el-table-column></el-table-column>
</
template
>
...
...
@@ -783,6 +795,15 @@ export default class RowEditBase extends Vue implements ControlInterface {
isEnableRowEdit
:
true
,
enableCond
:
3
,
},
{
name
:
'booknumber'
,
label
:
'图书数量'
,
langtag
:
'entities.ibizbook.rowedit_grid.columns.booknumber'
,
show
:
true
,
unit
:
'PX'
,
isEnableRowEdit
:
false
,
enableCond
:
3
,
},
]
/**
...
...
@@ -1167,7 +1188,7 @@ export default class RowEditBase extends Vue implements ControlInterface {
"PRICE"
:{
"headername"
:
"图书价格"
,
"isuniqueitem"
:
false
,
"name"
:
"price"
,
"order"
:
1000
},
"IBIZBOOKNAME"
:{
"headername"
:
"图书名称"
,
"isuniqueitem"
:
false
,
"name"
:
"ibizbookname"
,
"order"
:
1000
},
"IBIZBOOKID"
:{
"headername"
:
"图书标识"
,
"isuniqueitem"
:
false
,
"name"
:
"ibizbookid"
,
"order"
:
1000
},
"TYPE"
:{
"
codelist"
:{
"type"
:
"STATIC"
,
"tag"
:
"BookType"
,
"isnumber"
:
false
},
"
headername"
:
"图书类型"
,
"isuniqueitem"
:
false
,
"name"
:
"type"
,
"order"
:
1000
}
"TYPE"
:{
"headername"
:
"图书类型"
,
"isuniqueitem"
:
false
,
"name"
:
"type"
,
"order"
:
1000
}
}
}
if
(
Object
.
keys
(
importDataModel
).
length
==
0
){
...
...
@@ -1268,14 +1289,6 @@ export default class RowEditBase extends Vue implements ControlInterface {
*/
public
async
formatExcelData
(
filterVal
:
any
,
jsonData
:
any
)
{
let
codelistColumns
:
Array
<
any
>
=
[
{
name
:
'type'
,
srfkey
:
'BookType'
,
codelistType
:
'STATIC'
,
renderMode
:
'other'
,
textSeparator
:
'、'
,
valueSeparator
:
','
,
},
];
let
_this
=
this
;
for
(
const
codelist
of
codelistColumns
)
{
...
...
@@ -1482,7 +1495,7 @@ export default class RowEditBase extends Vue implements ControlInterface {
* @memberof RowEditBase
*/
public
arraySpanMethod
({
row
,
column
,
rowIndex
,
columnIndex
}
:
any
)
{
let
allColumns
:
Array
<
any
>
=
[
'ibizbookid'
,
'ibizbookname'
,
'author'
,
'type'
,
'press'
,
'price'
];
let
allColumns
:
Array
<
any
>
=
[
'ibizbookid'
,
'ibizbookname'
,
'author'
,
'type'
,
'press'
,
'price'
,
'booknumber'
];
if
(
row
&&
row
.
children
&&
row
.
children
.
length
>
0
)
{
if
(
columnIndex
==
(
this
.
isSingleSelect
?
0
:
1
))
{
return
[
1
,
allColumns
.
length
+
1
];
...
...
@@ -1531,6 +1544,7 @@ export default class RowEditBase extends Vue implements ControlInterface {
type
:
''
,
press
:
''
,
price
:
''
,
booknumber
:
''
,
children
:
children
,
}
groupTree
.
push
(
tree
);
...
...
app_Web/src/widgets/ibizbook/row-edit-grid/row-edit-grid-model.ts
浏览文件 @
debc34dd
...
...
@@ -50,6 +50,11 @@ export default class RowEditModel {
dataType
:
'CURRENCY'
,
isEditable
:
true
},
{
name
:
'booknumber'
,
prop
:
'booknumber'
,
dataType
:
'INT'
,
},
{
name
:
'ibizbookid'
,
prop
:
'ibizbookid'
,
...
...
app_Web/src/widgets/ibizbook/row-rules-grid/row-rules-grid-base.vue
浏览文件 @
debc34dd
...
...
@@ -58,7 +58,7 @@
</
template
>
<
template
v-slot=
"{row,column,$index}"
>
<template
>
<
codelist
:value=
"row.type"
tag=
'BookType'
codelistType=
'STATIC'
></codelist
>
<
app-span
name=
'type'
editorType=
"TEXTBOX"
:value=
"row.type"
dataType=
"TEXT"
precision=
"0"
></app-span
>
</
template
>
</template>
</el-table-column>
...
...
@@ -1077,7 +1077,7 @@ export default class RowRulesBase extends Vue implements ControlInterface {
"PRICE"
:{
"headername"
:
"图书价格"
,
"isuniqueitem"
:
false
,
"name"
:
"price"
,
"order"
:
1000
},
"IBIZBOOKNAME"
:{
"headername"
:
"图书名称"
,
"isuniqueitem"
:
false
,
"name"
:
"ibizbookname"
,
"order"
:
1000
},
"IBIZBOOKID"
:{
"headername"
:
"图书标识"
,
"isuniqueitem"
:
false
,
"name"
:
"ibizbookid"
,
"order"
:
1000
},
"TYPE"
:{
"
codelist"
:{
"type"
:
"STATIC"
,
"tag"
:
"BookType"
,
"isnumber"
:
false
},
"
headername"
:
"图书类型"
,
"isuniqueitem"
:
false
,
"name"
:
"type"
,
"order"
:
1000
}
"TYPE"
:{
"headername"
:
"图书类型"
,
"isuniqueitem"
:
false
,
"name"
:
"type"
,
"order"
:
1000
}
}
}
if
(
Object
.
keys
(
importDataModel
).
length
==
0
){
...
...
@@ -1178,14 +1178,6 @@ export default class RowRulesBase extends Vue implements ControlInterface {
*/
public
async
formatExcelData
(
filterVal
:
any
,
jsonData
:
any
)
{
let
codelistColumns
:
Array
<
any
>
=
[
{
name
:
'type'
,
srfkey
:
'BookType'
,
codelistType
:
'STATIC'
,
renderMode
:
'other'
,
textSeparator
:
'、'
,
valueSeparator
:
','
,
},
];
let
_this
=
this
;
for
(
const
codelist
of
codelistColumns
)
{
...
...
app_Web/src/widgets/ibizbook/update-default-grid/update-default-grid-base.vue
浏览文件 @
debc34dd
...
...
@@ -100,7 +100,7 @@
</app-form-item>
</
template
>
<
template
v-if=
"!actualIsOpenEdit"
>
<
codelist
:value=
"row.type"
tag=
'BookType'
codelistType=
'STATIC'
></codelist
>
<
app-span
name=
'type'
editorType=
"TEXTBOX"
:value=
"row.type"
dataType=
"TEXT"
precision=
"0"
></app-span
>
</
template
>
</template>
</el-table-column>
...
...
@@ -1180,7 +1180,7 @@ export default class UpdateDefaultBase extends Vue implements ControlInterface {
"PRICE"
:{
"headername"
:
"图书价格"
,
"isuniqueitem"
:
false
,
"name"
:
"price"
,
"order"
:
1000
},
"IBIZBOOKNAME"
:{
"headername"
:
"图书名称"
,
"isuniqueitem"
:
false
,
"name"
:
"ibizbookname"
,
"order"
:
1000
},
"IBIZBOOKID"
:{
"headername"
:
"图书标识"
,
"isuniqueitem"
:
false
,
"name"
:
"ibizbookid"
,
"order"
:
1000
},
"TYPE"
:{
"
codelist"
:{
"type"
:
"STATIC"
,
"tag"
:
"BookType"
,
"isnumber"
:
false
},
"
headername"
:
"图书类型"
,
"isuniqueitem"
:
false
,
"name"
:
"type"
,
"order"
:
1000
}
"TYPE"
:{
"headername"
:
"图书类型"
,
"isuniqueitem"
:
false
,
"name"
:
"type"
,
"order"
:
1000
}
}
}
if
(
Object
.
keys
(
importDataModel
).
length
==
0
){
...
...
@@ -1281,14 +1281,6 @@ export default class UpdateDefaultBase extends Vue implements ControlInterface {
*/
public
async
formatExcelData
(
filterVal
:
any
,
jsonData
:
any
)
{
let
codelistColumns
:
Array
<
any
>
=
[
{
name
:
'type'
,
srfkey
:
'BookType'
,
codelistType
:
'STATIC'
,
renderMode
:
'other'
,
textSeparator
:
'、'
,
valueSeparator
:
','
,
},
];
let
_this
=
this
;
for
(
const
codelist
of
codelistColumns
)
{
...
...
config.xml
浏览文件 @
debc34dd
...
...
@@ -37,11 +37,11 @@
git clone -b master $para2 demosys/
export NODE_OPTIONS=--max-old-space-size=4096
cd demosys/
mvn clean package -P
demoapi
cd demo-
provider/demo-provider-demoapi
mvn -P
demoapi
docker:build
mvn -P
demoapi
docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/demo-
provider-demoapi.yaml iBizDemo --with-registry-auth
mvn clean package -P
web
cd demo-
app/demo-app-web
mvn -P
web
docker:build
mvn -P
web
docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/demo-
app-web.yaml iBizDemo --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
...
...
demo-app/demo-app-web/src/main/docker/Dockerfile
浏览文件 @
debc34dd
...
...
@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /demo-app-web.jar
EXPOSE
8080
EXPOSE
51001
ADD
demo-app-web.jar /demo-app-web.jar
demo-app/demo-app-web/src/main/docker/demo-app-web.yaml
浏览文件 @
debc34dd
...
...
@@ -3,9 +3,24 @@ services:
demo-app-web
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/demo-app-web:latest
ports
:
-
"
8080:8080
"
-
"
51001:51001
"
networks
:
-
agent_network
environment
:
-
SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-
SERVER_PORT=51001
-
SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-
SPRING_REDIS_HOST=172.16.240.110
-
SPRING_REDIS_PORT=6379
-
SPRING_REDIS_DATABASE=0
-
SPRING_DATASOURCE_USERNAME=a_LAB01_df847bdfd
-
SPRING_DATASOURCE_PASSWORD=3d6@460A
-
SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_df847bdfd?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-
SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-
SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_df847bdfd
-
NACOS=172.16.240.110:8848
-
SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-
SEATA_ENABLED=true
deploy
:
resources
:
limits
:
...
...
demo-provider/demo-provider-demoapi/src/main/docker/Dockerfile
浏览文件 @
debc34dd
...
...
@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /demo-provider-demoapi.jar
EXPOSE
51000
EXPOSE
8081
ADD
demo-provider-demoapi.jar /demo-provider-demoapi.jar
demo-provider/demo-provider-demoapi/src/main/docker/demo-provider-demoapi.yaml
浏览文件 @
debc34dd
...
...
@@ -3,24 +3,9 @@ services:
demo-provider-demoapi
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/demo-provider-demoapi:latest
ports
:
-
"
51000:51000
"
-
"
8081:8081
"
networks
:
-
agent_network
environment
:
-
SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-
SERVER_PORT=51000
-
SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-
SPRING_REDIS_HOST=172.16.240.110
-
SPRING_REDIS_PORT=6379
-
SPRING_REDIS_DATABASE=0
-
SPRING_DATASOURCE_USERNAME=a_LAB01_df847bdfd
-
SPRING_DATASOURCE_PASSWORD=3d6@460A
-
SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_df847bdfd?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-
SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-
SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_df847bdfd
-
NACOS=172.16.240.110:8848
-
SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-
SEATA_ENABLED=true
deploy
:
resources
:
limits
:
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录