Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzou
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzou
提交
0be2f99c
提交
0be2f99c
编写于
5月 27, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibiz4j 发布系统代码
上级
90a716b7
变更
14
显示空白字符变更
内嵌
并排
正在显示
14 个修改的文件
包含
84 行增加
和
346 行删除
+84
-346
ibzdept-member_en_US.ts
.../src/locale/lanres/ibzdept-member/ibzdept-member_en_US.ts
+0
-12
ibzdept-member_zh_CN.ts
.../src/locale/lanres/ibzdept-member/ibzdept-member_zh_CN.ts
+0
-12
ibzdept-member-grid-view-base.vue
...bzdept-member-grid-view/ibzdept-member-grid-view-base.vue
+5
-24
ibzemployee-edit-grid-view-base.vue
...ployee-edit-grid-view/ibzemployee-edit-grid-view-base.vue
+38
-12
page-register.ts
app_web/src/pages/ou/ouindex-view/page-register.ts
+0
-1
router.ts
app_web/src/pages/ou/ouindex-view/router.ts
+0
-108
state.ts
app_web/src/store/modules/view-action/state.ts
+1
-1
ibzemployee-ui-service-base.ts
.../src/uiservice/ibzemployee/ibzemployee-ui-service-base.ts
+22
-7
tree-exp-viewtreeexpbar-treeexpbar-base.vue
...ar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar-base.vue
+2
-5
tree-exp-viewtreeexpbar-treeexpbar.less
...expbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar.less
+1
-1
main-grid-base.vue
...b/src/widgets/ibzdept-member/main-grid/main-grid-base.vue
+2
-147
tree-exp-viewtreeexpbar-treeexpbar-base.vue
...ar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar-base.vue
+1
-4
tree-exp-viewtreeexpbar-treeexpbar.less
...expbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar.less
+1
-1
h2_table.xml
ibzou-core/src/main/resources/liquibase/h2_table.xml
+11
-11
未找到文件。
app_web/src/locale/lanres/ibzdept-member/ibzdept-member_en_US.ts
浏览文件 @
0be2f99c
...
...
@@ -59,18 +59,6 @@ export default {
caption
:
"-"
,
tip
:
""
,
},
tbitem24
:
{
caption
:
"行编辑"
,
tip
:
"行编辑"
,
},
tbitem25
:
{
caption
:
"新建行"
,
tip
:
"新建行"
,
},
tbitem26
:
{
caption
:
"-"
,
tip
:
""
,
},
tbitem8
:
{
caption
:
"Remove"
,
tip
:
"Remove {0}"
,
...
...
app_web/src/locale/lanres/ibzdept-member/ibzdept-member_zh_CN.ts
浏览文件 @
0be2f99c
...
...
@@ -58,18 +58,6 @@ export default {
caption
:
'-'
,
tip
:
''
,
},
tbitem24
:
{
caption
:
'行编辑'
,
tip
:
'行编辑'
,
},
tbitem25
:
{
caption
:
'新建行'
,
tip
:
'新建行'
,
},
tbitem26
:
{
caption
:
'-'
,
tip
:
''
,
},
tbitem8
:
{
caption
:
'删除'
,
tip
:
'删除'
,
...
...
app_web/src/pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view-base.vue
浏览文件 @
0be2f99c
...
...
@@ -22,20 +22,6 @@
</i-button>
<div
slot=
'content'
>
{{
$t
(
'entities.ibzdeptmember.gridviewtoolbar_toolbar.tbitem6.tip'
)
}}
</div>
</tooltip>
<span
class=
'seperator'
>
|
</span>
<tooltip
:transfer=
"true"
:max-width=
"600"
>
<i-button
v-show=
"toolBarModels.tbitem24.visabled"
:disabled=
"toolBarModels.tbitem24.disabled"
class=
''
@
click=
"toolbar_click(
{ tag: 'tbitem24' }, $event)">
<i
class=
'fa fa-table'
></i>
<span
class=
'caption'
>
{{
$t
(
'entities.ibzdeptmember.gridviewtoolbar_toolbar.tbitem24.caption'
)
}}
</span>
</i-button>
<div
slot=
'content'
>
{{
$t
(
'entities.ibzdeptmember.gridviewtoolbar_toolbar.tbitem24.tip'
)
}}
</div>
</tooltip>
<tooltip
:transfer=
"true"
:max-width=
"600"
>
<i-button
v-show=
"toolBarModels.tbitem25.visabled"
:disabled=
"toolBarModels.tbitem25.disabled"
class=
''
@
click=
"toolbar_click(
{ tag: 'tbitem25' }, $event)">
<i
class=
'fa fa-plus'
></i>
</i-button>
<div
slot=
'content'
>
{{
$t
(
'entities.ibzdeptmember.gridviewtoolbar_toolbar.tbitem25.tip'
)
}}
</div>
</tooltip>
<span
class=
'seperator'
>
|
</span>
<tooltip
:transfer=
"true"
:max-width=
"600"
>
<i-button
v-show=
"toolBarModels.tbitem8.visabled"
:disabled=
"toolBarModels.tbitem8.disabled"
class=
''
@
click=
"toolbar_click(
{ tag: 'tbitem8' }, $event)">
<i
class=
'fa fa-remove'
></i>
...
...
@@ -56,14 +42,14 @@
:context=
"context"
:isSingleSelect=
"isSingleSelect"
:showBusyIndicator=
"true"
:isOpenEdit=
"
tru
e"
:isOpenEdit=
"
fals
e"
:gridRowActiveMode=
"gridRowActiveMode"
@
save=
"onSave"
updateAction=
"
Update
"
updateAction=
""
removeAction=
"Remove"
loaddraftAction=
"
GetDraft
"
loadAction=
"
Get
"
createAction=
"
Create
"
loaddraftAction=
""
loadAction=
""
createAction=
""
fetchAction=
"FetchDefault"
:newdata=
"newdata"
:opendata=
"opendata"
...
...
@@ -276,11 +262,6 @@ export default class IBZDeptMemberGridViewBase extends Vue {
tbitem6
:
{
name
:
'tbitem6'
,
caption
:
'拷贝'
,
disabled
:
false
,
type
:
'DEUIACTION'
,
visabled
:
true
,
dataaccaction
:
''
,
uiaction
:
{
tag
:
'Copy'
,
target
:
'SINGLEKEY'
}
},
tbitem7
:
{
name
:
'tbitem7'
,
type
:
'SEPERATOR'
,
visabled
:
true
,
dataaccaction
:
''
,
uiaction
:
{
}
},
tbitem24
:
{
name
:
'tbitem24'
,
caption
:
'行编辑'
,
disabled
:
false
,
type
:
'DEUIACTION'
,
visabled
:
true
,
dataaccaction
:
''
,
uiaction
:
{
tag
:
'ToggleRowEdit'
,
target
:
''
}
},
tbitem25
:
{
name
:
'tbitem25'
,
disabled
:
false
,
type
:
'DEUIACTION'
,
visabled
:
true
,
dataaccaction
:
''
,
uiaction
:
{
tag
:
'NewRow'
,
target
:
''
}
},
tbitem26
:
{
name
:
'tbitem26'
,
type
:
'SEPERATOR'
,
visabled
:
true
,
dataaccaction
:
''
,
uiaction
:
{
}
},
tbitem8
:
{
name
:
'tbitem8'
,
caption
:
'删除'
,
disabled
:
false
,
type
:
'DEUIACTION'
,
visabled
:
true
,
dataaccaction
:
''
,
uiaction
:
{
tag
:
'Remove'
,
target
:
'MULTIKEY'
}
},
tbitem9
:
{
name
:
'tbitem9'
,
type
:
'SEPERATOR'
,
visabled
:
true
,
dataaccaction
:
''
,
uiaction
:
{
}
},
...
...
app_web/src/pages/ou/ibzemployee-edit-grid-view/ibzemployee-edit-grid-view-base.vue
浏览文件 @
0be2f99c
...
...
@@ -793,16 +793,28 @@ export default class IBZEmployeeEditGridViewBase extends Vue {
}
const
parameters
:
any
[]
=
[
{
pathName
:
'ibzemployees'
,
parameterName
:
'ibzemployee'
},
{
pathName
:
'editview'
,
parameterName
:
'editview'
},
];
const
_this
:
any
=
this
;
const
openIndexViewTab
=
(
data
:
any
)
=>
{
const
_data
:
any
=
{
w
:
(
new
Date
().
getTime
())
};
Object
.
assign
(
_data
,
data
);
const
routePath
=
this
.
$viewTool
.
buildUpRoutePath
(
this
.
$route
,
curViewParam
,
deResParameters
,
parameters
,
args
,
_data
);
this
.
$router
.
push
(
routePath
);
const
openDrawer
=
(
view
:
any
,
data
:
any
)
=>
{
let
container
:
Subject
<
any
>
=
this
.
$appdrawer
.
openDrawer
(
view
,
curViewParam
,
data
);
container
.
subscribe
((
result
:
any
)
=>
{
if
(
!
result
||
!
Object
.
is
(
result
.
ret
,
'OK'
))
{
return
;
}
if
(
!
xData
||
!
(
xData
.
refresh
instanceof
Function
))
{
return
;
}
openIndexViewTab
(
data
);
xData
.
refresh
(
result
.
datas
);
});
}
const
view
:
any
=
{
viewname
:
'ibzemployee-edit-view'
,
height
:
0
,
width
:
0
,
title
:
this
.
$t
(
'entities.ibzemployee.views.editview.title'
),
placement
:
'DRAWER_RIGHT'
,
};
openDrawer
(
view
,
data
);
}
...
...
@@ -830,14 +842,28 @@ export default class IBZEmployeeEditGridViewBase extends Vue {
}
const
parameters
:
any
[]
=
[
{
pathName
:
'ibzemployees'
,
parameterName
:
'ibzemployee'
},
{
pathName
:
'editview'
,
parameterName
:
'editview'
},
];
const
_this
:
any
=
this
;
const
openIndexViewTab
=
(
data
:
any
)
=>
{
const
routePath
=
this
.
$viewTool
.
buildUpRoutePath
(
this
.
$route
,
curViewParam
,
deResParameters
,
parameters
,
args
,
data
);
this
.
$router
.
push
(
routePath
);
const
openDrawer
=
(
view
:
any
,
data
:
any
)
=>
{
let
container
:
Subject
<
any
>
=
this
.
$appdrawer
.
openDrawer
(
view
,
curViewParam
,
data
);
container
.
subscribe
((
result
:
any
)
=>
{
if
(
!
result
||
!
Object
.
is
(
result
.
ret
,
'OK'
))
{
return
;
}
if
(
!
xData
||
!
(
xData
.
refresh
instanceof
Function
))
{
return
;
}
openIndexViewTab
(
data
);
xData
.
refresh
(
result
.
datas
);
});
}
const
view
:
any
=
{
viewname
:
'ibzemployee-edit-view'
,
height
:
0
,
width
:
0
,
title
:
this
.
$t
(
'entities.ibzemployee.views.editview.title'
),
placement
:
'DRAWER_RIGHT'
,
};
openDrawer
(
view
,
data
);
}
...
...
app_web/src/pages/ou/ouindex-view/page-register.ts
浏览文件 @
0be2f99c
...
...
@@ -19,7 +19,6 @@ export const PageComponents = {
Vue
.
component
(
'ibzdepartment-mpickup-view'
,
()
=>
import
(
'@pages/ou/ibzdepartment-mpickup-view/ibzdepartment-mpickup-view.vue'
));
Vue
.
component
(
'ibzdept-member-edit-view'
,
()
=>
import
(
'@pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view.vue'
));
Vue
.
component
(
'ibzorganization-pickup-view'
,
()
=>
import
(
'@pages/ou/ibzorganization-pickup-view/ibzorganization-pickup-view.vue'
));
Vue
.
component
(
'ibzemployee-edit-grid-view'
,
()
=>
import
(
'@pages/ou/ibzemployee-edit-grid-view/ibzemployee-edit-grid-view.vue'
));
Vue
.
component
(
'ibzdepartment-tree-exp-view'
,
()
=>
import
(
'@pages/ou/ibzdepartment-tree-exp-view/ibzdepartment-tree-exp-view.vue'
));
Vue
.
component
(
'ibzemployee-option-view'
,
()
=>
import
(
'@pages/ou/ibzemployee-option-view/ibzemployee-option-view.vue'
));
Vue
.
component
(
'ibzdepartment-pickup-view'
,
()
=>
import
(
'@pages/ou/ibzdepartment-pickup-view/ibzdepartment-pickup-view.vue'
));
...
...
app_web/src/pages/ou/ouindex-view/router.ts
浏览文件 @
0be2f99c
...
...
@@ -700,62 +700,6 @@ const router = new Router({
},
component
:
()
=>
import
(
'@pages/ou/ibzorganization-pickup-view/ibzorganization-pickup-view.vue'
),
},
{
path
:
'ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/ibzemployees/:ibzemployee?/editgridview/:editgridview?'
,
meta
:
{
caption
:
'entities.ibzemployee.views.editgridview.caption'
,
parameters
:
[
{
pathName
:
'ouindexview'
,
parameterName
:
'ouindexview'
},
{
pathName
:
'ibzorganizations'
,
parameterName
:
'ibzorganization'
},
{
pathName
:
'ibzdepartments'
,
parameterName
:
'ibzdepartment'
},
{
pathName
:
'ibzemployees'
,
parameterName
:
'ibzemployee'
},
{
pathName
:
'editgridview'
,
parameterName
:
'editgridview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/ou/ibzemployee-edit-grid-view/ibzemployee-edit-grid-view.vue'
),
},
{
path
:
'ibzorganizations/:ibzorganization?/ibzemployees/:ibzemployee?/editgridview/:editgridview?'
,
meta
:
{
caption
:
'entities.ibzemployee.views.editgridview.caption'
,
parameters
:
[
{
pathName
:
'ouindexview'
,
parameterName
:
'ouindexview'
},
{
pathName
:
'ibzorganizations'
,
parameterName
:
'ibzorganization'
},
{
pathName
:
'ibzemployees'
,
parameterName
:
'ibzemployee'
},
{
pathName
:
'editgridview'
,
parameterName
:
'editgridview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/ou/ibzemployee-edit-grid-view/ibzemployee-edit-grid-view.vue'
),
},
{
path
:
'ibzdepartments/:ibzdepartment?/ibzemployees/:ibzemployee?/editgridview/:editgridview?'
,
meta
:
{
caption
:
'entities.ibzemployee.views.editgridview.caption'
,
parameters
:
[
{
pathName
:
'ouindexview'
,
parameterName
:
'ouindexview'
},
{
pathName
:
'ibzdepartments'
,
parameterName
:
'ibzdepartment'
},
{
pathName
:
'ibzemployees'
,
parameterName
:
'ibzemployee'
},
{
pathName
:
'editgridview'
,
parameterName
:
'editgridview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/ou/ibzemployee-edit-grid-view/ibzemployee-edit-grid-view.vue'
),
},
{
path
:
'ibzemployees/:ibzemployee?/editgridview/:editgridview?'
,
meta
:
{
caption
:
'entities.ibzemployee.views.editgridview.caption'
,
parameters
:
[
{
pathName
:
'ouindexview'
,
parameterName
:
'ouindexview'
},
{
pathName
:
'ibzemployees'
,
parameterName
:
'ibzemployee'
},
{
pathName
:
'editgridview'
,
parameterName
:
'editgridview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/ou/ibzemployee-edit-grid-view/ibzemployee-edit-grid-view.vue'
),
},
{
path
:
'ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/treeexpview/:treeexpview?'
,
meta
:
{
...
...
@@ -869,58 +813,6 @@ const router = new Router({
...
indexRoutes
,
],
},
{
path
:
'/ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/ibzemployees/:ibzemployee?/editgridview/:editgridview?'
,
meta
:
{
caption
:
'entities.ibzemployee.views.editgridview.caption'
,
parameters
:
[
{
pathName
:
'ibzorganizations'
,
parameterName
:
'ibzorganization'
},
{
pathName
:
'ibzdepartments'
,
parameterName
:
'ibzdepartment'
},
{
pathName
:
'ibzemployees'
,
parameterName
:
'ibzemployee'
},
{
pathName
:
'editgridview'
,
parameterName
:
'editgridview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/ou/ibzemployee-edit-grid-view/ibzemployee-edit-grid-view.vue'
),
},
{
path
:
'/ibzorganizations/:ibzorganization?/ibzemployees/:ibzemployee?/editgridview/:editgridview?'
,
meta
:
{
caption
:
'entities.ibzemployee.views.editgridview.caption'
,
parameters
:
[
{
pathName
:
'ibzorganizations'
,
parameterName
:
'ibzorganization'
},
{
pathName
:
'ibzemployees'
,
parameterName
:
'ibzemployee'
},
{
pathName
:
'editgridview'
,
parameterName
:
'editgridview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/ou/ibzemployee-edit-grid-view/ibzemployee-edit-grid-view.vue'
),
},
{
path
:
'/ibzdepartments/:ibzdepartment?/ibzemployees/:ibzemployee?/editgridview/:editgridview?'
,
meta
:
{
caption
:
'entities.ibzemployee.views.editgridview.caption'
,
parameters
:
[
{
pathName
:
'ibzdepartments'
,
parameterName
:
'ibzdepartment'
},
{
pathName
:
'ibzemployees'
,
parameterName
:
'ibzemployee'
},
{
pathName
:
'editgridview'
,
parameterName
:
'editgridview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/ou/ibzemployee-edit-grid-view/ibzemployee-edit-grid-view.vue'
),
},
{
path
:
'/ibzemployees/:ibzemployee?/editgridview/:editgridview?'
,
meta
:
{
caption
:
'entities.ibzemployee.views.editgridview.caption'
,
parameters
:
[
{
pathName
:
'ibzemployees'
,
parameterName
:
'ibzemployee'
},
{
pathName
:
'editgridview'
,
parameterName
:
'editgridview'
},
],
requireAuth
:
true
,
},
component
:
()
=>
import
(
'@pages/ou/ibzemployee-edit-grid-view/ibzemployee-edit-grid-view.vue'
),
},
{
path
:
'/ibzorganizations/:ibzorganization?/editview/:editview?'
,
meta
:
{
...
...
app_web/src/store/modules/view-action/state.ts
浏览文件 @
0be2f99c
...
...
@@ -236,7 +236,7 @@ export const viewstate: any = {
viewaction
:
''
,
viewdatachange
:
false
,
refviews
:
[
'
0c24f382fdfded375e4ef737707fdd80
'
,
'
2300119cfeaff98d4bc48c1679515968
'
,
],
},
{
...
...
app_web/src/uiservice/ibzemployee/ibzemployee-ui-service-base.ts
浏览文件 @
0be2f99c
...
...
@@ -131,14 +131,29 @@ export default class IBZEmployeeUIServiceBase extends UIService {
}
const
parameters
:
any
[]
=
[
{
pathName
:
'ibzemployees'
,
parameterName
:
'ibzemployee'
},
{
pathName
:
'editview'
,
parameterName
:
'editview'
},
];
const
openIndexViewTab
=
(
data
:
any
)
=>
{
const
routePath
=
actionContext
.
$viewTool
.
buildUpRoutePath
(
actionContext
.
$route
,
context
,
deResParameters
,
parameters
,
_args
,
data
);
actionContext
.
$router
.
push
(
routePath
);
return
null
;
const
openDrawer
=
(
view
:
any
,
data
:
any
)
=>
{
let
container
:
Subject
<
any
>
=
actionContext
.
$appdrawer
.
openDrawer
(
view
,
context
,
data
);
container
.
subscribe
((
result
:
any
)
=>
{
if
(
!
result
||
!
Object
.
is
(
result
.
ret
,
'OK'
))
{
return
;
}
const
_this
:
any
=
actionContext
;
if
(
window
.
opener
){
window
.
opener
.
postMessage
({
status
:
'OK'
,
identification
:
'WF'
},
Environment
.
uniteAddress
);
window
.
close
();
}
openIndexViewTab
(
data
);
return
result
.
datas
;
});
}
const
view
:
any
=
{
viewname
:
'ibzemployee-edit-view'
,
height
:
0
,
width
:
0
,
title
:
actionContext
.
$t
(
'entities.ibzemployee.views.editview.title'
),
placement
:
'DRAWER_RIGHT'
,
};
openDrawer
(
view
,
data
);
}
/**
...
...
app_web/src/widgets/ibzdepartment/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar-base.vue
浏览文件 @
0be2f99c
<
template
>
<split
id=
"treeexpviewtreeexpbar"
class=
'app-tree-exp-bar'
v-model=
"split"
mode=
"horizontal"
@
on-move-end=
"onSplitChange"
>
<div
slot=
'left'
>
<div
class=
'tree-exp-bar-header'
>
<div>
树视图导航栏
</div>
</div>
<div
class=
'tree-exp-content'
>
<div
class=
'tree-exp-content2'
>
<view
_treeexpbar_tree
:viewState=
"viewState"
:viewparams=
"viewparams"
...
...
@@ -289,7 +286,7 @@ export default class TreeExpViewtreeexpbarBase extends Vue implements ControlInt
}
if
(
Object
.
is
(
expmode
,
'DEPT'
))
{
return
{
viewname
:
'ibzemployee-
edit-
grid-view'
,
viewname
:
'ibzemployee-grid-view'
,
parentdata
:
{
"srfparentdefname"
:
"MDEPTID"
,
"srfparentdename"
:
"IBZDEPT"
,
"srfparentmode"
:
"DER1N_IBZEMP_IBZDEPT_MDEPTID"
},
deKeyField
:
'ibzemployee'
};
...
...
app_web/src/widgets/ibzdepartment/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar.less
浏览文件 @
0be2f99c
...
...
@@ -28,7 +28,7 @@
padding: 10px 5px 10px 5px;
}
.tree-exp-content {
height:
calc(100% - 40px)
;
height:
100%
;
overflow: auto;
padding: 16px 0;
margin-bottom: 10px;
...
...
app_web/src/widgets/ibzdept-member/main-grid/main-grid-base.vue
浏览文件 @
0be2f99c
...
...
@@ -30,14 +30,7 @@
</span>
</
template
>
<
template
v-slot=
"{row,column,$index}"
>
<template
v-if=
"actualIsOpenEdit"
>
<app-form-item
:error=
"gridItemsModel[$index][column.property].error"
>
<dropdown-list
v-model=
"row[column.property]"
:disabled=
"row.srfuf === 1 ? (3 & 2) !== 2 : (3 & 1) !== 1"
placeholder=
'请选择...'
style=
""
@
change=
"($event)=>
{gridEditItemChange(row, column.property, $event, $index)}">
</dropdown-list>
</app-form-item>
</
template
>
<
template
v-if=
"!actualIsOpenEdit"
>
<app-span
name=
'deptname'
editorType=
"DROPDOWNLIST"
:value=
"row.deptname"
></app-span>
</
template
>
<span>
{{
row
.
deptname
}}
</span>
</
template
>
</el-table-column>
</template>
...
...
@@ -61,22 +54,7 @@
</span>
</
template
>
<
template
v-slot=
"{row,column,$index}"
>
<template
v-if=
"actualIsOpenEdit"
>
<app-form-item
:error=
"gridItemsModel[$index][column.property].error"
>
<input-box
:disabled=
"row.srfuf === 1 ? (3 & 2) !== 2 : (3 & 1) !== 1"
v-model=
"row[column.property]"
style=
""
type=
"text"
@
change=
"($event)=>
{gridEditItemChange(row, column.property, $event, $index)}">
</input-box>
</app-form-item>
</
template
>
<
template
v-if=
"!actualIsOpenEdit"
>
<app-span
name=
'deptid'
editorType=
"HIDDEN"
:value=
"row.deptid"
></app-span>
</
template
>
<span>
{{
row
.
deptid
}}
</span>
</
template
>
</el-table-column>
</template>
...
...
@@ -596,8 +574,6 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public
getGridRowModel
(){
return
{
deptid
:
new
FormItemModel
(),
deptname
:
new
FormItemModel
(),
srfkey
:
new
FormItemModel
(),
}
}
...
...
@@ -609,14 +585,6 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof Main
*/
public
rules
:
any
=
{
deptid
:
[
{
required
:
false
,
validator
:
(
rule
:
any
,
value
:
any
,
callback
:
any
)
=>
{
return
(
rule
.
required
&&
(
value
===
null
||
value
===
undefined
||
value
===
""
))
?
false
:
true
;},
message
:
'部门标识 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
validator
:
(
rule
:
any
,
value
:
any
,
callback
:
any
)
=>
{
return
(
rule
.
required
&&
(
value
===
null
||
value
===
undefined
||
value
===
""
))
?
false
:
true
;},
message
:
'部门标识 值不能为空'
,
trigger
:
'blur'
},
],
deptname
:
[
{
required
:
false
,
validator
:
(
rule
:
any
,
value
:
any
,
callback
:
any
)
=>
{
return
(
rule
.
required
&&
(
value
===
null
||
value
===
undefined
||
value
===
""
))
?
false
:
true
;},
message
:
'部门 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
validator
:
(
rule
:
any
,
value
:
any
,
callback
:
any
)
=>
{
return
(
rule
.
required
&&
(
value
===
null
||
value
===
undefined
||
value
===
""
))
?
false
:
true
;},
message
:
'部门 值不能为空'
,
trigger
:
'blur'
},
],
srfkey
:
[
{
required
:
false
,
validator
:
(
rule
:
any
,
value
:
any
,
callback
:
any
)
=>
{
return
(
rule
.
required
&&
(
value
===
null
||
value
===
undefined
||
value
===
""
))
?
false
:
true
;},
message
:
'标识 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
validator
:
(
rule
:
any
,
value
:
any
,
callback
:
any
)
=>
{
return
(
rule
.
required
&&
(
value
===
null
||
value
===
undefined
||
value
===
""
))
?
false
:
true
;},
message
:
'标识 值不能为空'
,
trigger
:
'blur'
},
...
...
@@ -1429,119 +1397,6 @@ export default class MainBase extends Vue implements ControlInterface {
return
successItems
;
}
/**
* 新建行
*
* @param {*} $event
* @returns {void}
* @memberof Main
*/
public
newRow
(
args
:
any
[],
params
?:
any
,
$event
?:
any
,
xData
?:
any
):
void
{
if
(
!
this
.
loaddraftAction
){
this
.
$Notice
.
error
({
title
:
'错误'
,
desc
:
'IBZDeptMemberGridView视图表格loaddraftAction参数未配置'
});
return
;
}
let
_this
=
this
;
Object
.
assign
(
args
[
0
],{
viewparams
:
this
.
viewparams
});
let
post
:
Promise
<
any
>
=
this
.
service
.
loadDraft
(
this
.
loaddraftAction
,
JSON
.
parse
(
JSON
.
stringify
(
this
.
context
)),
args
[
0
],
this
.
showBusyIndicator
);
post
.
then
((
response
:
any
)
=>
{
if
(
!
response
.
status
||
response
.
status
!==
200
)
{
if
(
response
.
errorMessage
)
{
this
.
$Notice
.
error
({
title
:
'错误'
,
desc
:
response
.
errorMessage
});
}
return
;
}
const
data
=
response
.
data
;
data
.
rowDataState
=
"create"
;
_this
.
items
.
push
(
data
);
_this
.
gridItemsModel
.
push
(
_this
.
getGridRowModel
());
}).
catch
((
response
:
any
)
=>
{
if
(
response
&&
response
.
status
===
401
)
{
return
;
}
if
(
!
response
||
!
response
.
status
||
!
response
.
data
)
{
this
.
$Notice
.
error
({
title
:
'错误'
,
desc
:
'系统异常'
});
return
;
}
});
}
/**
* 表格编辑项值变更
*
* @param row 行数据
* @param {{ name: string, value: any }} $event
* @returns {void}
* @memberof Main
*/
public
onGridItemValueChange
(
row
:
any
,
$event
:
{
name
:
string
,
value
:
any
},
rowIndex
:
number
):
void
{
if
(
!
$event
)
{
return
;
}
if
(
!
$event
.
name
||
Object
.
is
(
$event
.
name
,
''
)
||
!
row
.
hasOwnProperty
(
$event
.
name
))
{
return
;
}
row
[
$event
.
name
]
=
$event
.
value
;
this
.
gridEditItemChange
(
row
,
$event
.
name
,
$event
.
value
,
rowIndex
);
}
/**
* 表格编辑项值变化
*
* @public
* @param row 行数据
* @param property 列编辑项名
* @param row 列编辑项值
* @returns {void}
* @memberof Main
*/
public
gridEditItemChange
(
row
:
any
,
property
:
string
,
value
:
any
,
rowIndex
:
number
){
row
.
rowDataState
=
row
.
rowDataState
?
row
.
rowDataState
:
"update"
;
this
.
validate
(
property
,
row
,
rowIndex
);
}
/**
* 表格编辑项更新
*
* @param {string} mode 界面行为名称
* @param {*} [data={}] 请求数据
* @param {string[]} updateDetails 更新项
* @param {boolean} [showloading] 是否显示加载状态
* @returns {void}
* @memberof Main
*/
public
updateGridEditItem
(
mode
:
string
,
data
:
any
=
{},
updateDetails
:
string
[],
showloading
?:
boolean
):
void
{
if
(
!
mode
||
(
mode
&&
Object
.
is
(
mode
,
''
)))
{
return
;
}
const
arg
:
any
=
JSON
.
parse
(
JSON
.
stringify
(
data
));
Object
.
assign
(
arg
,{
viewparams
:
this
.
viewparams
});
const
post
:
Promise
<
any
>
=
this
.
service
.
frontLogic
(
mode
,
JSON
.
parse
(
JSON
.
stringify
(
this
.
context
)),
arg
,
showloading
);
post
.
then
((
response
:
any
)
=>
{
if
(
!
response
||
response
.
status
!==
200
)
{
this
.
$Notice
.
error
({
title
:
'错误'
,
desc
:
'表单项更新失败'
});
return
;
}
const
_data
:
any
=
response
.
data
;
if
(
!
_data
){
return
;
}
updateDetails
.
forEach
((
name
:
string
)
=>
{
if
(
!
_data
.
hasOwnProperty
(
name
))
{
return
;
}
data
[
name
]
=
_data
[
name
];
});
}).
catch
((
response
:
any
)
=>
{
if
(
response
&&
response
.
status
===
401
)
{
return
;
}
if
(
!
response
||
!
response
.
status
||
!
response
.
data
)
{
this
.
$Notice
.
error
({
title
:
'错误'
,
desc
:
'系统异常'
});
return
;
}
});
}
/**
* 获取对应行class
...
...
app_web/src/widgets/ibzorganization/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar-base.vue
浏览文件 @
0be2f99c
<
template
>
<split
id=
"treeexpviewtreeexpbar"
class=
'app-tree-exp-bar'
v-model=
"split"
mode=
"horizontal"
@
on-move-end=
"onSplitChange"
>
<div
slot=
'left'
>
<div
class=
'tree-exp-bar-header'
>
<div>
树视图导航栏
</div>
</div>
<div
class=
'tree-exp-content'
>
<div
class=
'tree-exp-content2'
>
<view
_treeexpbar_tree
:viewState=
"viewState"
:viewparams=
"viewparams"
...
...
app_web/src/widgets/ibzorganization/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar.less
浏览文件 @
0be2f99c
...
...
@@ -28,7 +28,7 @@
padding: 10px 5px 10px 5px;
}
.tree-exp-content {
height:
calc(100% - 40px)
;
height:
100%
;
overflow: auto;
padding: 16px 0;
margin-bottom: 10px;
...
...
ibzou-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @
0be2f99c
...
...
@@ -4,7 +4,7 @@
<!--输出实体[IBZORG]数据结构 -->
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-ibzorg-4
39
-1"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-ibzorg-4
40
-1"
>
<createTable
tableName=
"IBZORG"
>
<column
name=
"ORGID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_IBZORG_ORGID"
/>
...
...
@@ -32,7 +32,7 @@
<!--输出实体[IBZEMP]数据结构 -->
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-ibzemp-6
34
-2"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-ibzemp-6
40
-2"
>
<createTable
tableName=
"IBZEMP"
>
<column
name=
"USERID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_IBZEMP_USERID"
/>
...
...
@@ -112,7 +112,7 @@
<!--输出实体[IBZDEPTMEMBER]数据结构 -->
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-ibzdeptmember-
28
-3"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-ibzdeptmember-
30
-3"
>
<createTable
tableName=
"IBZDEPTMEMBER"
>
<column
name=
"MEMBERID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_IBZDEPTMEMBER_MEMBERID"
/>
...
...
@@ -126,7 +126,7 @@
<!--输出实体[IBZDEPT]数据结构 -->
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-ibzdept-69
2
-4"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"tab-ibzdept-69
4
-4"
>
<createTable
tableName=
"IBZDEPT"
>
<column
name=
"DEPTID"
remarks=
""
type=
"VARCHAR(100)"
>
<constraints
primaryKey=
"true"
primaryKeyName=
"PK_IBZDEPT_DEPTID"
/>
...
...
@@ -161,28 +161,28 @@
</changeSet>
<!--输出实体[IBZORG]外键关系 -->
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzorg-4
39
-5"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzorg-4
40
-5"
>
<addForeignKeyConstraint
baseColumnNames=
"PORGID"
baseTableName=
"IBZORG"
constraintName=
"DER1N_IBZORG_IBZORG_PORGID"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"ORGID"
referencedTableName=
"IBZORG"
validate=
"true"
/>
</changeSet>
<!--输出实体[IBZEMP]外键关系 -->
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzemp-6
34
-6"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzemp-6
40
-6"
>
<addForeignKeyConstraint
baseColumnNames=
"MDEPTID"
baseTableName=
"IBZEMP"
constraintName=
"DER1N_IBZEMP_IBZDEPT_MDEPTID"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"DEPTID"
referencedTableName=
"IBZDEPT"
validate=
"true"
/>
</changeSet>
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzemp-6
34
-7"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzemp-6
40
-7"
>
<addForeignKeyConstraint
baseColumnNames=
"ORGID"
baseTableName=
"IBZEMP"
constraintName=
"DER1N_IBZEMP_IBZORG_ORGID"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"ORGID"
referencedTableName=
"IBZORG"
validate=
"true"
/>
</changeSet>
<!--输出实体[IBZDEPTMEMBER]外键关系 -->
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzdeptmember-
28
-8"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzdeptmember-
30
-8"
>
<addForeignKeyConstraint
baseColumnNames=
"DEPTID"
baseTableName=
"IBZDEPTMEMBER"
constraintName=
"DER1N_IBZDEPTMEMBER_IBZDEPT_DE"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"DEPTID"
referencedTableName=
"IBZDEPT"
validate=
"true"
/>
</changeSet>
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzdeptmember-
28
-9"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzdeptmember-
30
-9"
>
<addForeignKeyConstraint
baseColumnNames=
"USERID"
baseTableName=
"IBZDEPTMEMBER"
constraintName=
"DER1N_IBZDEPTMEMBER_IBZEMP_USE"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"USERID"
referencedTableName=
"IBZEMP"
validate=
"true"
/>
</changeSet>
<!--输出实体[IBZDEPT]外键关系 -->
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzdept-69
2
-10"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzdept-69
4
-10"
>
<addForeignKeyConstraint
baseColumnNames=
"PDEPTID"
baseTableName=
"IBZDEPT"
constraintName=
"DER1N_IBZDEPT_IBZDEPT_PDEPTID"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"DEPTID"
referencedTableName=
"IBZDEPT"
validate=
"true"
/>
</changeSet>
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzdept-69
2
-11"
>
<changeSet
author=
"a_A_5d9d78509"
id=
"fk-ibzdept-69
4
-11"
>
<addForeignKeyConstraint
baseColumnNames=
"ORGID"
baseTableName=
"IBZDEPT"
constraintName=
"DER1N_IBZDEPT_IBZORG_ORGID"
deferrable=
"false"
initiallyDeferred=
"false"
onDelete=
"RESTRICT"
onUpdate=
"RESTRICT"
referencedColumnNames=
"ORGID"
referencedTableName=
"IBZORG"
validate=
"true"
/>
</changeSet>
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录