Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzrt
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzrt
提交
9a6ec266
提交
9a6ec266
编写于
4年前
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibiz4j 发布系统代码
上级
ac983d14
变更
20
隐藏空白字符变更
内嵌
并排
正在显示
20 个修改的文件
包含
1256 行增加
和
19 行删除
+1256
-19
view-config.json
app_Web/public/assets/json/view-config.json
+8
-0
sys-role_en_US.ts
app_Web/src/locale/lanres/sys-role/sys-role_en_US.ts
+4
-0
sys-role_zh_CN.ts
app_Web/src/locale/lanres/sys-role/sys-role_zh_CN.ts
+4
-0
viewconfig.ts
app_Web/src/mock/viewconfig/viewconfig.ts
+8
-0
page-register.ts
app_Web/src/pages/rt/index/page-register.ts
+1
-0
router.ts
app_Web/src/pages/rt/index/router.ts
+25
-0
sys-role-mpickup-view-base.vue
.../uaa/sys-role-mpickup-view/sys-role-mpickup-view-base.vue
+728
-0
sys-role-mpickup-view.less
...ages/uaa/sys-role-mpickup-view/sys-role-mpickup-view.less
+68
-0
sys-role-mpickup-view.vue
...pages/uaa/sys-role-mpickup-view/sys-role-mpickup-view.vue
+19
-0
sys-user-role-grid-view-base.vue
.../sys-user-role-grid-view/sys-user-role-grid-view-base.vue
+3
-0
state.ts
app_Web/src/store/modules/view-action/state.ts
+11
-0
sys-role-ui-service-base.ts
app_Web/src/uiservice/sys-role/sys-role-ui-service-base.ts
+1
-0
mpickup-viewpickupviewpanel-pickupviewpanel-base.vue
...anel/mpickup-viewpickupviewpanel-pickupviewpanel-base.vue
+308
-0
mpickup-viewpickupviewpanel-pickupviewpanel-model.ts
...anel/mpickup-viewpickupviewpanel-pickupviewpanel-model.ts
+37
-0
mpickup-viewpickupviewpanel-pickupviewpanel-service.ts
...el/mpickup-viewpickupviewpanel-pickupviewpanel-service.ts
+11
-0
mpickup-viewpickupviewpanel-pickupviewpanel.less
...iewpanel/mpickup-viewpickupviewpanel-pickupviewpanel.less
+4
-0
mpickup-viewpickupviewpanel-pickupviewpanel.vue
...viewpanel/mpickup-viewpickupviewpanel-pickupviewpanel.vue
+14
-0
config.xml
config.xml
+0
-5
Dockerfile
ibzrt-app/ibzrt-app-web/src/main/docker/Dockerfile
+1
-1
ibzrt-app-web.yaml
ibzrt-app/ibzrt-app-web/src/main/docker/ibzrt-app-web.yaml
+1
-13
未找到文件。
app_Web/public/assets/json/view-config.json
浏览文件 @
9a6ec266
...
...
@@ -279,6 +279,14 @@
"viewname"
:
"IBZEmployeePickupView"
,
"viewtag"
:
"9ffa35efe3d70cf4b9fa4e83dd1979c6"
},
"sysrolempickupview"
:
{
"title"
:
"角色数据多项选择视图"
,
"caption"
:
"系统角色"
,
"viewtype"
:
"DEMPICKUPVIEW"
,
"viewmodule"
:
"uaa"
,
"viewname"
:
"SysRoleMPickupView"
,
"viewtag"
:
"a1f8d44a9d7be49687062c63434b0f3f"
},
"wfgrouppickupview"
:
{
"title"
:
"角色/用户组数据选择视图"
,
"caption"
:
"角色/用户组"
,
...
...
This diff is collapsed.
Click to expand it.
app_Web/src/locale/lanres/sys-role/sys-role_en_US.ts
浏览文件 @
9a6ec266
...
...
@@ -24,6 +24,10 @@ export default {
caption
:
"Start workflow"
,
title
:
'Tables Information'
,
},
mpickupview
:
{
caption
:
"Start workflow"
,
title
:
'Others'
,
},
},
main_form
:
{
details
:
{
...
...
This diff is collapsed.
Click to expand it.
app_Web/src/locale/lanres/sys-role/sys-role_zh_CN.ts
浏览文件 @
9a6ec266
...
...
@@ -21,6 +21,10 @@ export default {
},
pickupgridview
:
{
caption
:
'系统角色'
,
title
:
'系统角色'
,
},
mpickupview
:
{
caption
:
'系统角色'
,
title
:
'系统角色'
,
},
},
...
...
This diff is collapsed.
Click to expand it.
app_Web/src/mock/viewconfig/viewconfig.ts
浏览文件 @
9a6ec266
...
...
@@ -287,6 +287,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname"
:
"IBZEmployeePickupView"
,
"viewtag"
:
"9ffa35efe3d70cf4b9fa4e83dd1979c6"
},
"sysrolempickupview"
:
{
"title"
:
"角色数据多项选择视图"
,
"caption"
:
"系统角色"
,
"viewtype"
:
"DEMPICKUPVIEW"
,
"viewmodule"
:
"uaa"
,
"viewname"
:
"SysRoleMPickupView"
,
"viewtag"
:
"a1f8d44a9d7be49687062c63434b0f3f"
},
"wfgrouppickupview"
:
{
"title"
:
"角色/用户组数据选择视图"
,
"caption"
:
"角色/用户组"
,
...
...
This diff is collapsed.
Click to expand it.
app_Web/src/pages/rt/index/page-register.ts
浏览文件 @
9a6ec266
...
...
@@ -2,6 +2,7 @@ export const PageComponents = {
install
(
Vue
:
any
,
opt
:
any
)
{
Vue
.
component
(
'ibzorganization-grid-view'
,
()
=>
import
(
'@pages/ou/ibzorganization-grid-view/ibzorganization-grid-view.vue'
));
Vue
.
component
(
'ibzemployee-mpickup-view'
,
()
=>
import
(
'@pages/ou/ibzemployee-mpickup-view/ibzemployee-mpickup-view.vue'
));
Vue
.
component
(
'sys-role-mpickup-view'
,
()
=>
import
(
'@pages/uaa/sys-role-mpickup-view/sys-role-mpickup-view.vue'
));
Vue
.
component
(
'wfremodel-edit-view'
,
()
=>
import
(
'@pages/workflow/wfremodel-edit-view/wfremodel-edit-view.vue'
));
Vue
.
component
(
'ibzemployee-pickup-view'
,
()
=>
import
(
'@pages/ou/ibzemployee-pickup-view/ibzemployee-pickup-view.vue'
));
Vue
.
component
(
'sys-auth-log-grid-view'
,
()
=>
import
(
'@pages/uaa/sys-auth-log-grid-view/sys-auth-log-grid-view.vue'
));
...
...
This diff is collapsed.
Click to expand it.
app_Web/src/pages/rt/index/router.ts
浏览文件 @
9a6ec266
...
...
@@ -103,6 +103,19 @@ const router = new Router({
},
component
:
()
=>
import
(
'@pages/ou/ibzemployee-mpickup-view/ibzemployee-mpickup-view.vue'
),
},
{
path
:
'sysroles/:sysrole?/mpickupview/:mpickupview?'
,
meta
:
{
caption
:
'entities.sysrole.views.mpickupview.caption'
,
parameters
:
[
{
pathName
:
'index'
,
parameterName
:
'index'
},
{
pathName
:
'sysroles'
,
parameterName
:
'sysrole'
},
{
pathName
:
'mpickupview'
,
parameterName
:
'mpickupview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/uaa/sys-role-mpickup-view/sys-role-mpickup-view.vue'
),
},
{
path
:
'wfremodels/:wfremodel?/editview/:editview?'
,
meta
:
{
...
...
@@ -2091,6 +2104,18 @@ const router = new Router({
},
component
:
()
=>
import
(
'@pages/ou/ibzemployee-pickup-view/ibzemployee-pickup-view.vue'
),
},
{
path
:
'/sysroles/:sysrole?/mpickupview/:mpickupview?'
,
meta
:
{
caption
:
'entities.sysrole.views.mpickupview.caption'
,
parameters
:
[
{
pathName
:
'sysroles'
,
parameterName
:
'sysrole'
},
{
pathName
:
'mpickupview'
,
parameterName
:
'mpickupview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/uaa/sys-role-mpickup-view/sys-role-mpickup-view.vue'
),
},
{
path
:
'/wfgroups/:wfgroup?/editview/:editview?'
,
meta
:
{
...
...
This diff is collapsed.
Click to expand it.
app_Web/src/pages/uaa/sys-role-mpickup-view/sys-role-mpickup-view-base.vue
0 → 100644
浏览文件 @
9a6ec266
<
template
>
<div
class=
"view-container dempickupview sys-role-mpickup-view"
>
<app-studioaction
:viewTitle=
"$t(model.srfTitle)"
viewName=
"sysrolempickupview"
></app-studioaction>
<card
class=
'view-card view-no-caption view-no-toolbar'
:dis-hover=
"true"
:padding=
"0"
:bordered=
"false"
>
<div
class=
"content-container pickup-view"
>
<div
class=
"translate-contant"
>
<div
class=
"center"
:style=
"
{width : !isShowButton ? '100%' : ''}">
<view
_pickupviewpanel
:viewState=
"viewState"
:viewparams=
"viewparams"
:context=
"context"
:isSingleSelect=
"isSingleSelect"
:selectedData=
"selectedData"
:isShowButton=
"isShowButton"
name=
"pickupviewpanel"
ref=
'pickupviewpanel'
@
selectionchange=
"pickupviewpanel_selectionchange($event)"
@
activated=
"pickupviewpanel_activated($event)"
@
load=
"pickupviewpanel_load($event)"
@
closeview=
"closeView($event)"
>
</view
_pickupviewpanel
>
</div>
<div
v-if=
"isShowButton"
class=
"translate-buttons"
>
<div
class=
"buttons"
>
<i-button
type=
"primary"
:title=
"this.containerModel.view_rightbtn.text"
:disabled=
"this.containerModel.view_rightbtn.disabled"
@
click=
"onCLickRight"
>
<i
class=
"el-icon-arrow-right"
></i>
</i-button>
<i-button
type=
"primary"
:title=
"this.containerModel.view_leftbtn.text"
:disabled=
"this.containerModel.view_leftbtn.disabled"
@
click=
"onCLickLeft"
>
<i
class=
"el-icon-arrow-left"
></i>
</i-button>
<i-button
type=
"primary"
:title=
"this.containerModel.view_allrightbtn.text"
@
click=
"onCLickAllRight"
>
<i
class=
"el-icon-d-arrow-right"
></i>
</i-button>
<i-button
type=
"primary"
:title=
"this.containerModel.view_allleftbtn.text"
@
click=
"onCLickAllLeft"
>
<i
class=
"el-icon-d-arrow-left"
></i>
</i-button>
</div>
</div>
<div
v-if=
"isShowButton"
class=
"right"
>
<div
class=
"mpicker-select"
>
<div
v-for=
"(item, index) in viewSelections"
:key=
"index"
:class=
"item._select ? 'select' : ''"
@
click=
"selectionsClick(item)"
@
dblclick=
"selectionsDBLClick(item)"
>
<span>
{{
item
.
srfmajortext
}}
</span>
</div>
</div>
</div>
</div>
<card
v-if=
"isShowButton"
:dis-hover=
"true"
:bordered=
"false"
class=
"footer"
>
<row
:style=
"
{ textAlign: 'right' }">
<i-button
type=
"primary"
:disabled=
"this.viewSelections.length > 0 ? false : true"
@
click=
"onClickOk"
>
{{
this
.
containerModel
.
view_okbtn
.
text
}}
</i-button>
<i-button
@
click=
"onClickCancel"
>
{{
this
.
containerModel
.
view_cancelbtn
.
text
}}
</i-button>
</row>
</card>
</div>
</card>
</div>
</
template
>
<
script
lang=
'tsx'
>
import
{
Vue
,
Component
,
Prop
,
Provide
,
Emit
,
Watch
}
from
'vue-property-decorator'
;
import
{
UIActionTool
,
Util
}
from
'@/utils'
;
import
{
Subject
}
from
'rxjs'
;
import
SysRoleService
from
'@/service/sys-role/sys-role-service'
;
import
MPickupViewEngine
from
'@engine/view/mpickup-view-engine'
;
@
Component
({
components
:
{
},
})
export
default
class
SysRoleMPickupViewBase
extends
Vue
{
/**
* 实体服务对象
*
* @type {SysRoleService}
* @memberof SysRoleMPickupViewBase
*/
public
appEntityService
:
SysRoleService
=
new
SysRoleService
;
/**
* 计数器服务对象集合
*
* @type {Array<*>}
* @memberof SysRoleMPickupViewBase
*/
public
counterServiceArray
:
Array
<
any
>
=
[];
/**
* 数据变化
*
* @param {*} val
* @returns {*}
* @memberof SysRoleMPickupViewBase
*/
@
Emit
()
public
viewDatasChange
(
val
:
any
):
any
{
return
val
;
}
/**
* 传入视图上下文
*
* @type {string}
* @memberof SysRoleMPickupViewBase
*/
@
Prop
()
public
viewdata
!
:
string
;
/**
* 传入视图参数
*
* @type {string}
* @memberof SysRoleMPickupViewBase
*/
@
Prop
()
public
viewparam
!
:
string
;
/**
* 视图默认使用
*
* @type {boolean}
* @memberof SysRoleMPickupViewBase
*/
@
Prop
({
default
:
true
})
public
viewDefaultUsage
!
:
boolean
;
/**
* 视图标识
*
* @type {string}
* @memberof SysRoleMPickupViewBase
*/
public
viewtag
:
string
=
'a1f8d44a9d7be49687062c63434b0f3f'
;
/**
* 自定义视图导航上下文集合
*
* @type {*}
* @memberof SysRoleMPickupViewBase
*/
public
customViewNavContexts
:
any
=
{
};
/**
* 自定义视图导航参数集合
*
* @type {*}
* @memberof SysRoleMPickupViewBase
*/
public
customViewParams
:
any
=
{
};
/**
* 视图模型数据
*
* @type {*}
* @memberof SysRoleMPickupViewBase
*/
public
model
:
any
=
{
srfCaption
:
'entities.sysrole.views.mpickupview.caption'
,
srfTitle
:
'entities.sysrole.views.mpickupview.title'
,
srfSubTitle
:
'entities.sysrole.views.mpickupview.subtitle'
,
dataInfo
:
''
}
/**
* 视图参数变化
*
* @param {*} newVal
* @param {*} oldVal
* @memberof SysRoleMPickupViewBase
*/
@
Watch
(
'viewparam'
,{
immediate
:
true
,
deep
:
true
})
onParamData
(
newVal
:
any
,
oldVal
:
any
)
{
if
(
newVal
){
for
(
let
key
in
this
.
viewparams
){
delete
this
.
viewparams
[
key
];
}
Object
.
assign
(
this
.
viewparams
,
JSON
.
parse
(
this
.
viewparam
));
if
(
this
.
viewparams
.
selectedData
){
this
.
selectedData
=
JSON
.
stringify
(
this
.
viewparams
.
selectedData
);
}
}
}
/**
* 处理应用上下文变化
*
* @param {*} newVal
* @param {*} oldVal
* @memberof SysRoleMPickupViewBase
*/
@
Watch
(
'viewdata'
)
onViewData
(
newVal
:
any
,
oldVal
:
any
)
{
const
_this
:
any
=
this
;
if
(
!
Object
.
is
(
newVal
,
oldVal
)
&&
_this
.
engine
)
{
_this
.
parseViewParam
();
_this
.
engine
.
load
();
}
}
/**
* 容器模型
*
* @type {*}
* @memberof SysRoleMPickupViewBase
*/
public
containerModel
:
any
=
{
view_pickupviewpanel
:
{
name
:
'pickupviewpanel'
,
type
:
'PICKUPVIEWPANEL'
},
view_okbtn
:
{
name
:
'okbtn'
,
type
:
'button'
,
text
:
'确定'
,
disabled
:
true
},
view_cancelbtn
:
{
name
:
'cancelbtn'
,
type
:
'button'
,
text
:
'取消'
,
disabled
:
false
},
view_leftbtn
:
{
name
:
'leftbtn'
,
type
:
'button'
,
text
:
'左移'
,
disabled
:
true
},
view_rightbtn
:
{
name
:
'rightbtn'
,
type
:
'button'
,
text
:
'右移'
,
disabled
:
true
},
view_allleftbtn
:
{
name
:
'allleftbtn'
,
type
:
'button'
,
text
:
'全部左移'
,
disabled
:
true
},
view_allrightbtn
:
{
name
:
'allrightbtn'
,
type
:
'button'
,
text
:
'全部右移'
,
disabled
:
true
},
};
/**
* 计数器刷新
*
* @memberof SysRoleMPickupViewBase
*/
public
counterRefresh
(){
const
_this
:
any
=
this
;
if
(
_this
.
counterServiceArray
&&
_this
.
counterServiceArray
.
length
>
0
){
_this
.
counterServiceArray
.
forEach
((
item
:
any
)
=>
{
if
(
item
.
refreshData
&&
item
.
refreshData
instanceof
Function
){
item
.
refreshData
();
}
})
}
}
/**
* 视图状态订阅对象
*
* @public
* @type {Subject<{action: string, data: any}>}
* @memberof SysRoleMPickupViewBase
*/
public
viewState
:
Subject
<
ViewState
>
=
new
Subject
();
/**
* 视图引擎
*
* @public
* @type {Engine}
* @memberof SysRoleMPickupViewBase
*/
public
engine
:
MPickupViewEngine
=
new
MPickupViewEngine
();
/**
* 引擎初始化
*
* @public
* @memberof SysRoleMPickupViewBase
*/
public
engineInit
():
void
{
this
.
engine
.
init
({
view
:
this
,
pickupviewpanel
:
this
.
$refs
.
pickupviewpanel
,
keyPSDEField
:
'sysrole'
,
majorPSDEField
:
'rolename'
,
isLoadDefault
:
true
,
});
}
/**
* 应用上下文
*
* @type {*}
* @memberof SysRoleMPickupViewBase
*/
public
context
:
any
=
{};
/**
* 视图参数
*
* @type {*}
* @memberof SysRoleMPickupViewBase
*/
public
viewparams
:
any
=
{};
/**
* 解析视图参数
*
* @public
* @memberof SysRoleMPickupViewBase
*/
public
parseViewParam
():
void
{
for
(
let
key
in
this
.
context
){
delete
this
.
context
[
key
];
}
if
(
!
this
.
viewDefaultUsage
&&
this
.
viewdata
&&
!
Object
.
is
(
this
.
viewdata
,
''
))
{
Object
.
assign
(
this
.
context
,
JSON
.
parse
(
this
.
viewdata
));
if
(
this
.
context
&&
this
.
context
.
srfparentdename
){
Object
.
assign
(
this
.
viewparams
,{
srfparentdename
:
this
.
context
.
srfparentdename
});
}
if
(
this
.
context
&&
this
.
context
.
srfparentkey
){
Object
.
assign
(
this
.
viewparams
,{
srfparentkey
:
this
.
context
.
srfparentkey
});
}
this
.
handleCustomViewData
();
return
;
}
const
path
=
(
this
.
$route
.
matched
[
this
.
$route
.
matched
.
length
-
1
]).
path
;
const
keys
:
Array
<
any
>
=
[];
const
curReg
=
this
.
$pathToRegExp
.
pathToRegexp
(
path
,
keys
);
const
matchArray
=
curReg
.
exec
(
this
.
$route
.
path
);
let
tempValue
:
Object
=
{};
keys
.
forEach
((
item
:
any
,
index
:
number
)
=>
{
Object
.
defineProperty
(
tempValue
,
item
.
name
,
{
enumerable
:
true
,
value
:
matchArray
[
index
+
1
]
});
});
this
.
$viewTool
.
formatRouteParams
(
tempValue
,
this
.
$route
,
this
.
context
,
this
.
viewparams
);
if
(
this
.
$store
.
getters
.
getAppData
()
&&
this
.
$store
.
getters
.
getAppData
().
context
){
Object
.
assign
(
this
.
context
,
this
.
$store
.
getters
.
getAppData
().
context
);
}
//初始化视图唯一标识
Object
.
assign
(
this
.
context
,{
srfsessionid
:
this
.
$util
.
createUUID
()});
this
.
handleCustomViewData
();
}
/**
* 处理自定义视图数据
*
* @memberof SysRoleMPickupViewBase
*/
public
handleCustomViewData
(){
if
(
Object
.
keys
(
this
.
customViewNavContexts
).
length
>
0
){
Object
.
keys
(
this
.
customViewNavContexts
).
forEach
((
item
:
any
)
=>
{
let
tempContext
:
any
=
{};
let
curNavContext
:
any
=
this
.
customViewNavContexts
[
item
];
this
.
handleCustomDataLogic
(
curNavContext
,
tempContext
,
item
);
Object
.
assign
(
this
.
context
,
tempContext
);
})
}
if
(
Object
.
keys
(
this
.
customViewParams
).
length
>
0
){
Object
.
keys
(
this
.
customViewParams
).
forEach
((
item
:
any
)
=>
{
let
tempParam
:
any
=
{};
let
curNavParam
:
any
=
this
.
customViewParams
[
item
];
this
.
handleCustomDataLogic
(
curNavParam
,
tempParam
,
item
);
Object
.
assign
(
this
.
viewparams
,
tempParam
);
})
}
}
/**
* 处理自定义视图数据逻辑
*
* @memberof SysRoleMPickupViewBase
*/
public
handleCustomDataLogic
(
curNavData
:
any
,
tempData
:
any
,
item
:
string
){
// 直接值直接赋值
if
(
curNavData
.
isRawValue
){
if
(
Object
.
is
(
curNavData
.
value
,
"null"
)
||
Object
.
is
(
curNavData
.
value
,
""
)){
Object
.
defineProperty
(
tempData
,
item
.
toLowerCase
(),
{
value
:
null
,
writable
:
true
,
enumerable
:
true
,
configurable
:
true
});
}
else
{
Object
.
defineProperty
(
tempData
,
item
.
toLowerCase
(),
{
value
:
curNavData
.
value
,
writable
:
true
,
enumerable
:
true
,
configurable
:
true
});
}
}
else
{
// 先从导航上下文取数,没有再从导航参数(URL)取数,如果导航上下文和导航参数都没有则为null
if
(
this
.
context
[(
curNavData
.
value
).
toLowerCase
()]){
Object
.
defineProperty
(
tempData
,
item
.
toLowerCase
(),
{
value
:
this
.
context
[(
curNavData
.
value
).
toLowerCase
()],
writable
:
true
,
enumerable
:
true
,
configurable
:
true
});
}
else
{
if
(
this
.
viewparams
[(
curNavData
.
value
).
toLowerCase
()]){
Object
.
defineProperty
(
tempData
,
item
.
toLowerCase
(),
{
value
:
this
.
viewparams
[(
curNavData
.
value
).
toLowerCase
()],
writable
:
true
,
enumerable
:
true
,
configurable
:
true
});
}
else
{
Object
.
defineProperty
(
tempData
,
item
.
toLowerCase
(),
{
value
:
null
,
writable
:
true
,
enumerable
:
true
,
configurable
:
true
});
}
}
}
}
/**
* Vue声明周期
*
* @memberof SysRoleMPickupViewBase
*/
public
created
()
{
this
.
afterCreated
();
}
/**
* 执行created后的逻辑
*
* @memberof SysRoleMPickupViewBase
*/
public
afterCreated
(){
const
secondtag
=
this
.
$util
.
createUUID
();
this
.
$store
.
commit
(
'viewaction/createdView'
,
{
viewtag
:
this
.
viewtag
,
secondtag
:
secondtag
});
this
.
viewtag
=
secondtag
;
this
.
parseViewParam
();
}
/**
* 销毁之前
*
* @memberof SysRoleMPickupViewBase
*/
public
beforeDestroy
()
{
this
.
$store
.
commit
(
'viewaction/removeView'
,
this
.
viewtag
);
}
/**
* Vue声明周期(组件初始化完毕)
*
* @memberof SysRoleMPickupViewBase
*/
public
mounted
()
{
this
.
afterMounted
();
}
/**
* 执行mounted后的逻辑
*
* @memberof SysRoleMPickupViewBase
*/
public
afterMounted
(){
const
_this
:
any
=
this
;
_this
.
engineInit
();
if
(
_this
.
loadModel
&&
_this
.
loadModel
instanceof
Function
)
{
_this
.
loadModel
();
}
if
(
this
.
viewparams
.
selectedData
){
this
.
engine
.
onCtrlEvent
(
'pickupviewpanel'
,
'selectionchange'
,
this
.
viewparams
.
selectedData
);
this
.
onCLickRight
();
}
}
/**
* pickupviewpanel 部件 selectionchange 事件
*
* @param {*} [args={}]
* @param {*} $event
* @memberof SysRoleMPickupViewBase
*/
public
pickupviewpanel_selectionchange
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'pickupviewpanel'
,
'selectionchange'
,
$event
);
}
/**
* pickupviewpanel 部件 activated 事件
*
* @param {*} [args={}]
* @param {*} $event
* @memberof SysRoleMPickupViewBase
*/
public
pickupviewpanel_activated
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'pickupviewpanel'
,
'activated'
,
$event
);
}
/**
* pickupviewpanel 部件 load 事件
*
* @param {*} [args={}]
* @param {*} $event
* @memberof SysRoleMPickupViewBase
*/
public
pickupviewpanel_load
(
$event
:
any
,
$event2
?:
any
)
{
this
.
engine
.
onCtrlEvent
(
'pickupviewpanel'
,
'load'
,
$event
);
}
/**
* 关闭视图
*
* @param {any[]} args
* @memberof SysRoleMPickupViewBase
*/
public
closeView
(
args
:
any
[]):
void
{
let
_view
:
any
=
this
;
if
(
_view
.
viewdata
)
{
_view
.
$emit
(
'viewdataschange'
,
[
args
]);
_view
.
$emit
(
'close'
,
[
args
]);
}
else
if
(
_view
.
$tabPageExp
)
{
_view
.
$tabPageExp
.
onClose
(
_view
.
$route
.
fullPath
);
}
}
/**
* 销毁视图回调
*
* @memberof SysRoleMPickupViewBase
*/
public
destroyed
(){
this
.
afterDestroyed
();
}
/**
* 执行destroyed后的逻辑
*
* @memberof SysRoleMPickupViewBase
*/
public
afterDestroyed
(){
if
(
this
.
viewDefaultUsage
){
let
localStoreLength
=
Object
.
keys
(
localStorage
);
if
(
localStoreLength
.
length
>
0
){
localStoreLength
.
forEach
((
item
:
string
)
=>
{
if
(
item
.
startsWith
(
this
.
context
.
srfsessionid
)){
localStorage
.
removeItem
(
item
);
}
})
}
}
}
/**
* 是否显示按钮
*
* @type {boolean}
* @memberof SysRoleMPickupView
*/
@
Prop
({
default
:
true
})
public
isShowButton
!
:
boolean
;
/**
* 选中数据的字符串
*
* @type {string}
* @memberof SysRoleMPickupView
*/
public
selectedData
:
string
=
""
;
/**
* 是否初始化已选中项
*
* @type {any[]}
* @memberof SysRoleMPickupView
*/
public
isInitSelected
:
boolean
=
false
;
/**
* 视图选中数据
*
* @type {any[]}
* @memberof SysRoleMPickupView
*/
public
viewSelections
:
any
[]
=
[];
/**
* 是否单选
*
* @type {boolean}
* @memberof SysRoleMPickupView
*/
public
isSingleSelect
:
boolean
=
false
;
/**
* 选中数据单击
*
* @param {*} item
* @memberof SysRoleMPickupView
*/
public
selectionsClick
(
item
:
any
):
void
{
item
.
_select
=
!
item
.
_select
;
const
removeSelect
:
boolean
=
this
.
viewSelections
.
some
((
selection
:
any
)
=>
selection
.
_select
);
this
.
containerModel
.
view_leftbtn
.
disabled
=
!
removeSelect
;
}
/**
* 选中树双击
*
* @param {*} item
* @memberof SysRoleMPickupView
*/
public
selectionsDBLClick
(
item
:
any
):
void
{
const
index
:
number
=
this
.
viewSelections
.
findIndex
((
selection
:
any
)
=>
Object
.
is
(
selection
.
srfkey
,
item
.
srfkey
));
if
(
index
!==
-
1
)
{
this
.
viewSelections
.
splice
(
index
,
1
);
}
const
removeSelect
:
boolean
=
this
.
viewSelections
.
some
((
selection
:
any
)
=>
selection
.
_select
);
this
.
containerModel
.
view_leftbtn
.
disabled
=
!
removeSelect
;
this
.
selectedData
=
JSON
.
stringify
(
this
.
viewSelections
);
}
/**
* 删除右侧全部选中数据
*
* @memberof SysRoleMPickupView
*/
public
onCLickLeft
():
void
{
const
_selectiions
=
[...
JSON
.
parse
(
JSON
.
stringify
(
this
.
viewSelections
))];
_selectiions
.
forEach
((
item
:
any
)
=>
{
if
(
!
item
.
_select
)
{
return
;
}
const
index
=
this
.
viewSelections
.
findIndex
((
selection
:
any
)
=>
Object
.
is
(
item
.
srfkey
,
selection
.
srfkey
));
if
(
index
!==
-
1
)
{
this
.
viewSelections
.
splice
(
index
,
1
);
}
});
const
removeSelect
:
boolean
=
this
.
viewSelections
.
some
((
selection
:
any
)
=>
selection
.
_select
);
this
.
containerModel
.
view_leftbtn
.
disabled
=
!
removeSelect
;
this
.
selectedData
=
JSON
.
stringify
(
this
.
viewSelections
);
}
/**
* 添加左侧选中数据
*
* @memberof SysRoleMPickupView
*/
public
onCLickRight
():
void
{
Object
.
values
(
this
.
containerModel
).
forEach
((
model
:
any
)
=>
{
if
(
!
Object
.
is
(
model
.
type
,
'PICKUPVIEWPANEL'
))
{
return
;
}
let
newSelections
:
any
[]
=
[];
model
.
selections
.
forEach
((
item
:
any
)
=>
{
const
index
:
number
=
this
.
viewSelections
.
findIndex
((
selection
:
any
)
=>
Object
.
is
(
item
.
srfkey
,
selection
.
srfkey
));
if
(
index
===
-
1
)
{
let
_item
:
any
=
{
...
JSON
.
parse
(
JSON
.
stringify
(
item
))
};
Object
.
assign
(
_item
,
{
_select
:
false
})
newSelections
.
push
(
_item
);
}
else
{
newSelections
.
push
(
this
.
viewSelections
[
index
]);
}
});
this
.
viewSelections
=
newSelections
;
});
}
/**
* 选中数据全部删除
*
* @memberof SysRoleMPickupView
*/
public
onCLickAllLeft
():
void
{
this
.
viewSelections
=
[];
this
.
containerModel
.
view_leftbtn
.
disabled
=
true
;
this
.
selectedData
=
JSON
.
stringify
(
this
.
viewSelections
);
}
/**
* 添加左侧面板所有数据到右侧
*
* @memberof SysRoleMPickupView
*/
public
onCLickAllRight
():
void
{
Object
.
values
(
this
.
containerModel
).
forEach
((
model
:
any
)
=>
{
if
(
!
Object
.
is
(
model
.
type
,
'PICKUPVIEWPANEL'
))
{
return
;
}
if
(
model
.
datas
.
length
>
0
){
model
.
datas
.
forEach
((
data
:
any
,
index
:
any
)
=>
{
Object
.
assign
(
data
,{
srfmajortext
:
data
[
'rolename'
]});
})
}
model
.
datas
.
forEach
((
item
:
any
)
=>
{
const
index
:
number
=
this
.
viewSelections
.
findIndex
((
selection
:
any
)
=>
Object
.
is
(
item
.
srfkey
,
selection
.
srfkey
));
if
(
index
===
-
1
)
{
let
_item
:
any
=
{
...
JSON
.
parse
(
JSON
.
stringify
(
item
))
};
Object
.
assign
(
_item
,
{
_select
:
false
})
this
.
viewSelections
.
push
(
_item
);
}
});
});
}
/**
* 确定
*
* @memberof SysRoleMPickupView
*/
public
onClickOk
():
void
{
this
.
$emit
(
'viewdataschange'
,
this
.
viewSelections
);
this
.
$emit
(
'close'
,
null
);
}
/**
* 取消
*
* @memberof SysRoleMPickupView
*/
public
onClickCancel
():
void
{
this
.
$emit
(
'close'
,
null
);
}
}
</
script
>
<
style
lang=
'less'
>
@import './sys-role-mpickup-view.less';
</
style
>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
app_Web/src/pages/uaa/sys-role-mpickup-view/sys-role-mpickup-view.less
0 → 100644
浏览文件 @
9a6ec266
.sys-role-mpickup-view{
position: relative;
}
.pickup-view {
>.translate-contant {
flex-grow: 1;
display: flex;
justify-content: flex-end;
height: calc(100% - 64px);
.translate-buttons {
width: 80px;
display: flex;
align-items: center;
text-align: center;
button {
margin-bottom: 5px;
}
}
.left, .right {
width: 300px;
}
.right {
border: 1px solid #e9e9e9;
.mpicker-select {
font-family: helvetica, sans-serif;
font-size: 16px;
text-align: justify;
word-spacing: -3.8pt;
line-height: 1.6;
font-weight: bold;
word-spacing: 10px;
height: 100%;
overflow: auto;
}
.mpicker-select > div {
padding: 3px 10px;
font-size: 14px;
color: rgba(0, 0, 0, 0.85);
font-weight: initial;
cursor: pointer;
min-height: 28px;
border: 1px solid #e9e9e9;
margin: 4px 4px;
transition: all .3s;
}
.mpicker-select > div:hover {
background: #ecf6fd;
}
.mpicker-select > .select{
color: #108ee9;
background: #ecf6fd;
}
}
.center{
width: calc(100% - 380px);
.pickupviewpanel {
width: 100%;
height: 100%;
}
}
}
>.footer {
height: 64px;
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
app_Web/src/pages/uaa/sys-role-mpickup-view/sys-role-mpickup-view.vue
0 → 100644
浏览文件 @
9a6ec266
<
script
lang=
'tsx'
>
import
{
Component
}
from
'vue-property-decorator'
;
import
SysRoleMPickupViewBase
from
'./sys-role-mpickup-view-base.vue'
;
import
view_pickupviewpanel
from
'@widgets/sys-role/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel.vue'
;
@
Component
({
components
:
{
view_pickupviewpanel
,
},
beforeRouteEnter
:
(
to
:
any
,
from
:
any
,
next
:
any
)
=>
{
next
((
vm
:
any
)
=>
{
vm
.
$store
.
commit
(
'addCurPageViewtag'
,
{
fullPath
:
to
.
fullPath
,
viewtag
:
vm
.
viewtag
});
});
},
})
export
default
class
SysRoleMPickupView
extends
SysRoleMPickupViewBase
{
}
</
script
>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
app_Web/src/pages/uaa/sys-user-role-grid-view/sys-user-role-grid-view-base.vue
浏览文件 @
9a6ec266
...
...
@@ -1129,6 +1129,9 @@ export default class SysUserRoleGridViewBase extends Vue {
*/
public
newdata
(
args
:
any
[],
fullargs
?:
any
[],
params
?:
any
,
$event
?:
any
,
xData
?:
any
)
{
const
batchAddPSAppViews
=
[
{
view
:{
viewname
:
'sys-role-mpickup-view'
,
height
:
0
,
width
:
0
,
title
:
'角色数据多项选择视图'
},
res
:[
'SysRole'
],
'resAppKey'
:
'roleid'
},
{
view
:{
viewname
:
'sys-user-mpickup-view'
,
height
:
0
,
width
:
0
,
title
:
'用户表数据多项选择视图'
},
res
:[
'SysUser'
],
'resAppKey'
:
'userid'
}
...
...
This diff is collapsed.
Click to expand it.
app_Web/src/store/modules/view-action/state.ts
浏览文件 @
9a6ec266
...
...
@@ -174,6 +174,7 @@ export const viewstate: any = {
viewdatachange
:
false
,
refviews
:
[
'1f8cf7e78d6d88588d1d568d1866cc77'
,
'a1f8d44a9d7be49687062c63434b0f3f'
,
'edde313015e1db7c366028307d88d20c'
,
],
},
...
...
@@ -338,6 +339,16 @@ export const viewstate: any = {
'c84df2684f29705ac6c5dec67df9f217'
,
],
},
{
viewtag
:
'a1f8d44a9d7be49687062c63434b0f3f'
,
viewmodule
:
'uaa'
,
viewname
:
'SysRoleMPickupView'
,
viewaction
:
''
,
viewdatachange
:
false
,
refviews
:
[
'7c25865f5864a734477c7cb987632f4f'
,
],
},
{
viewtag
:
'b23a721ca159ac2490b768d795e85d17'
,
viewmodule
:
'workflow'
,
...
...
This diff is collapsed.
Click to expand it.
app_Web/src/uiservice/sys-role/sys-role-ui-service-base.ts
浏览文件 @
9a6ec266
...
...
@@ -83,6 +83,7 @@ export default class SysRoleUIServiceBase extends UIService {
this
.
allViewMap
.
set
(
'PICKUPVIEW:'
,{
viewname
:
'pickupview'
,
srfappde
:
'sysroles'
});
this
.
allViewMap
.
set
(
'EDITVIEW:'
,{
viewname
:
'editview'
,
srfappde
:
'sysroles'
});
this
.
allViewMap
.
set
(
':'
,{
viewname
:
'pickupgridview'
,
srfappde
:
'sysroles'
});
this
.
allViewMap
.
set
(
'MPICKUPVIEW:'
,{
viewname
:
'mpickupview'
,
srfappde
:
'sysroles'
});
}
/**
...
...
This diff is collapsed.
Click to expand it.
app_Web/src/widgets/sys-role/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-base.vue
0 → 100644
浏览文件 @
9a6ec266
<
template
>
<div
class=
'pickupviewpanel'
>
<component
v-if=
"inited && view.viewname && !Object.is(view.viewname, '')"
:is=
"view.viewname"
class=
"viewcontainer3"
:viewdata=
"viewdata"
:viewparam=
"viewparam"
:viewDefaultUsage=
"false"
:isSingleSelect=
"isSingleSelect"
:selectedData=
"selectedData"
:isShowButton=
"isShowButton"
@
viewdataschange=
"onViewDatasChange"
@
viewdatasactivated=
"viewDatasActivated"
@
viewload=
"onViewLoad"
>
</component>
</div>
</
template
>
<
script
lang=
'tsx'
>
import
{
Vue
,
Component
,
Prop
,
Provide
,
Emit
,
Watch
,
Model
}
from
'vue-property-decorator'
;
import
{
CreateElement
}
from
'vue'
;
import
{
Subject
,
Subscription
}
from
'rxjs'
;
import
{
ControlInterface
}
from
'@/interface/control'
;
import
{
UIActionTool
,
Util
}
from
'@/utils'
;
import
SysRoleService
from
'@/service/sys-role/sys-role-service'
;
import
MPickupViewpickupviewpanelService
from
'./mpickup-viewpickupviewpanel-pickupviewpanel-service'
;
import
MPickupViewpickupviewpanelModel
from
'./mpickup-viewpickupviewpanel-pickupviewpanel-model'
;
@
Component
({
components
:
{
}
})
export
default
class
MPickupViewpickupviewpanelBase
extends
Vue
implements
ControlInterface
{
/**
* 名称
*
* @type {string}
* @memberof MPickupViewpickupviewpanel
*/
@
Prop
()
public
name
?:
string
;
/**
* 视图通讯对象
*
* @type {Subject<ViewState>}
* @memberof MPickupViewpickupviewpanel
*/
@
Prop
()
public
viewState
!
:
Subject
<
ViewState
>
;
/**
* 应用上下文
*
* @type {*}
* @memberof MPickupViewpickupviewpanel
*/
@
Prop
()
public
context
:
any
;
/**
* 视图参数
*
* @type {*}
* @memberof MPickupViewpickupviewpanel
*/
@
Prop
()
public
viewparams
:
any
;
/**
* 视图状态事件
*
* @public
* @type {(Subscription | undefined)}
* @memberof MPickupViewpickupviewpanel
*/
public
viewStateEvent
:
Subscription
|
undefined
;
/**
* 获取部件类型
*
* @returns {string}
* @memberof MPickupViewpickupviewpanel
*/
public
getControlType
():
string
{
return
'PICKUPVIEWPANEL'
}
/**
* 建构部件服务对象
*
* @type {MPickupViewpickupviewpanelService}
* @memberof MPickupViewpickupviewpanel
*/
public
service
:
MPickupViewpickupviewpanelService
=
new
MPickupViewpickupviewpanelService
({
$store
:
this
.
$store
});
/**
* 实体服务对象
*
* @type {SysRoleService}
* @memberof MPickupViewpickupviewpanel
*/
public
appEntityService
:
SysRoleService
=
new
SysRoleService
({
$store
:
this
.
$store
});
/**
* 关闭视图
*
* @param {any} args
* @memberof MPickupViewpickupviewpanel
*/
public
closeView
(
args
:
any
):
void
{
let
_this
:
any
=
this
;
_this
.
$emit
(
'closeview'
,
[
args
]);
}
/**
* 计数器刷新
*
* @memberof MPickupViewpickupviewpanel
*/
public
counterRefresh
(){
const
_this
:
any
=
this
;
if
(
_this
.
counterServiceArray
&&
_this
.
counterServiceArray
.
length
>
0
){
_this
.
counterServiceArray
.
forEach
((
item
:
any
)
=>
{
if
(
item
.
refreshData
&&
item
.
refreshData
instanceof
Function
){
item
.
refreshData
();
}
})
}
}
/**
* 选中数据字符串
*
* @type {string}
* @memberof MPickupViewpickupviewpanel
*/
@
Prop
()
public
selectedData
?:
string
;
/**
* 获取多项数据
*
* @returns {any[]}
* @memberof MPickupViewpickupviewpanel
*/
public
getDatas
():
any
[]
{
return
[];
}
/**
* 获取单项树
*
* @returns {*}
* @memberof MPickupViewpickupviewpanel
*/
public
getData
():
any
{
return
{};
}
/**
* 视图名称
*
* @type {*}
* @memberof MPickupViewpickupviewpanel
*/
public
view
:
any
=
{
viewname
:
'sys-role-pickup-grid-view'
,
data
:
{},
}
/**
* 视图数据
*
* @type {*}
* @memberof MPickupViewpickupviewpanel
*/
public
viewdata
:
string
=
JSON
.
stringify
(
this
.
context
);
/**
* 视图参数
*
* @type {*}
* @memberof PickupViewpickupviewpanel
*/
public
viewparam
:
string
=
JSON
.
stringify
(
this
.
viewparams
);
/**
* 是否显示按钮
*
* @type {boolean}
* @memberof MPickupViewpickupviewpanel
*/
@
Prop
({
default
:
true
})
public
isShowButton
!
:
boolean
;
/**
* 是否单选
*
* @type {boolean}
* @memberof MPickupViewpickupviewpanel
*/
@
Prop
()
public
isSingleSelect
?:
boolean
;
/**
* 初始化完成
*
* @type {boolean}
* @memberof MPickupViewpickupviewpanel
*/
public
inited
:
boolean
=
false
;
/**
* 视图数据变化
*
* @param {*} $event
* @memberof MPickupViewpickupviewpanel
*/
public
onViewDatasChange
(
$event
:
any
):
void
{
if
(
$event
.
length
>
0
){
$event
.
forEach
((
item
:
any
,
index
:
any
)
=>
{
let
srfmajortext
=
item
[
'rolename'
];
if
(
srfmajortext
){
Object
.
assign
(
$event
[
index
],{
srfmajortext
:
srfmajortext
});
}
});
}
this
.
$emit
(
'selectionchange'
,
$event
);
}
/**
* 视图数据被激活
*
* @param {*} $event
* @memberof MPickupViewpickupviewpanel
*/
public
viewDatasActivated
(
$event
:
any
):
void
{
this
.
$emit
(
'activated'
,
$event
);
}
/**
* 视图加载完成
*
* @param {*} $event
* @memberof MPickupViewpickupviewpanel
*/
public
onViewLoad
(
$event
:
any
):
void
{
this
.
$emit
(
'load'
,
$event
);
}
/**
* vue 生命周期
*
* @memberof MPickupViewpickupviewpanel
*/
public
created
()
{
this
.
afterCreated
();
}
/**
* 执行created后的逻辑
*
* @memberof MPickupViewpickupviewpanel
*/
public
afterCreated
(){
if
(
this
.
viewState
)
{
this
.
viewStateEvent
=
this
.
viewState
.
subscribe
(({
tag
,
action
,
data
})
=>
{
if
(
!
Object
.
is
(
tag
,
this
.
name
))
{
return
;
}
if
(
Object
.
is
(
'load'
,
action
))
{
this
.
viewdata
=
JSON
.
stringify
(
this
.
context
);
this
.
viewparam
=
JSON
.
stringify
(
Object
.
assign
(
data
,
this
.
viewparams
));
this
.
inited
=
true
;
}
});
}
}
/**
* vue 生命周期
*
* @memberof MPickupViewpickupviewpanel
*/
public
destroyed
()
{
this
.
afterDestroy
();
}
/**
* 执行destroyed后的逻辑
*
* @memberof MPickupViewpickupviewpanel
*/
public
afterDestroy
()
{
if
(
this
.
viewStateEvent
)
{
this
.
viewStateEvent
.
unsubscribe
();
}
}
}
</
script
>
<
style
lang=
'less'
>
@import './mpickup-viewpickupviewpanel-pickupviewpanel.less';
</
style
>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
app_Web/src/widgets/sys-role/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-model.ts
0 → 100644
浏览文件 @
9a6ec266
/**
* MPickupViewpickupviewpanel 部件模型
*
* @export
* @class MPickupViewpickupviewpanelModel
*/
export
default
class
MPickupViewpickupviewpanelModel
{
/**
* 获取数据项集合
*
* @returns {any[]}
* @memberof MPickupViewpickupviewpanelModel
*/
public
getDataItems
():
any
[]
{
return
[
{
name
:
'sysrole'
,
prop
:
'roleid'
,
},
{
name
:
'rolename'
,
},
{
name
:
'memo'
,
},
{
name
:
'createdate'
,
},
{
name
:
'updatedate'
,
},
]
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
app_Web/src/widgets/sys-role/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-service.ts
0 → 100644
浏览文件 @
9a6ec266
import
{
Http
}
from
'@/utils'
;
import
ControlService
from
'@/widgets/control-service'
;
/**
* MPickupViewpickupviewpanel 部件服务对象
*
* @export
* @class MPickupViewpickupviewpanelService
*/
export
default
class
MPickupViewpickupviewpanelService
extends
ControlService
{
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
app_Web/src/widgets/sys-role/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel.less
0 → 100644
浏览文件 @
9a6ec266
// this is less
.pickupviewpanel{
width: 100%;
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
app_Web/src/widgets/sys-role/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel.vue
0 → 100644
浏览文件 @
9a6ec266
<
script
lang=
'tsx'
>
import
{
Component
}
from
'vue-property-decorator'
;
import
MPickupViewpickupviewpanelBase
from
'./mpickup-viewpickupviewpanel-pickupviewpanel-base.vue'
;
@
Component
({
components
:
{
}
})
export
default
class
MPickupViewpickupviewpanel
extends
MPickupViewpickupviewpanelBase
{
}
</
script
>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
config.xml
浏览文件 @
9a6ec266
...
...
@@ -37,11 +37,6 @@
git clone -b master $para2 ibzrt/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibzrt/
mvn clean package -Pweb
cd ibzrt-app/ibzrt-app-web
mvn -Pweb docker:build
mvn -Pweb docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzrt-app-web.yaml ibzlab-rt --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
...
...
This diff is collapsed.
Click to expand it.
ibzrt-app/ibzrt-app-web/src/main/docker/Dockerfile
浏览文件 @
9a6ec266
...
...
@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
sleep ${IBZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzrt-app-web.jar
EXPOSE
3000
0
EXPOSE
808
0
ADD
ibzrt-app-web.jar /ibzrt-app-web.jar
This diff is collapsed.
Click to expand it.
ibzrt-app/ibzrt-app-web/src/main/docker/ibzrt-app-web.yaml
浏览文件 @
9a6ec266
...
...
@@ -3,21 +3,9 @@ services:
ibzrt-app-web
:
image
:
registry.cn-shanghai.aliyuncs.com/ibizsys/ibzrt-app-web:latest
ports
:
-
"
30000:3000
0"
-
"
8080:808
0"
networks
:
-
agent_network
environment
:
-
SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-
SERVER_PORT=30000
-
SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
-
SPRING_REDIS_HOST=172.16.100.243
-
SPRING_REDIS_PORT=6379
-
SPRING_REDIS_DATABASE=0
-
SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
-
SPRING_DATASOURCE_PASSWORD=@6dEfb3@
-
SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-
SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-
SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
deploy
:
mode
:
replicated
replicas
:
1
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录