Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
I
ibzrt
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
ibiz4jteam
ibzrt
提交
4c55c160
提交
4c55c160
编写于
9月 09, 2020
作者:
ibizdev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ibiz4j 发布系统代码
上级
a75e4741
变更
12
显示空白字符变更
内嵌
并排
正在显示
12 个修改的文件
包含
283 行增加
和
50 行删除
+283
-50
sys-user-auth_en_US.ts
...cale/lanres/entities/sys-user-auth/sys-user-auth_en_US.ts
+10
-2
sys-user-auth_zh_CN.ts
...cale/lanres/entities/sys-user-auth/sys-user-auth_zh_CN.ts
+10
-2
page-register.ts
app_Web/src/pages/rt/index/page-register.ts
+1
-1
router.ts
app_Web/src/pages/rt/index/router.ts
+10
-10
state.ts
app_Web/src/store/modules/view-action/state.ts
+1
-0
main-form-base.vue
...eb/src/widgets/sys-user-auth/main-form/main-form-base.vue
+175
-35
main-form-model.ts
...eb/src/widgets/sys-user-auth/main-form/main-form-model.ts
+25
-0
main-form-service.ts
.../src/widgets/sys-user-auth/main-form/main-form-service.ts
+12
-0
main-grid-model.ts
...eb/src/widgets/sys-user-auth/main-grid/main-grid-model.ts
+20
-0
SysUserAuth.java
...src/main/java/cn/ibizlab/core/uaa/domain/SysUserAuth.java
+7
-0
SysUserAuthSearchContext.java
.../cn/ibizlab/core/uaa/filter/SysUserAuthSearchContext.java
+4
-0
SysUserAuthDTO.java
...-api/src/main/java/cn/ibizlab/api/dto/SysUserAuthDTO.java
+8
-0
未找到文件。
app_Web/src/locale/lanres/entities/sys-user-auth/sys-user-auth_en_US.ts
浏览文件 @
4c55c160
...
@@ -6,6 +6,7 @@ export default {
...
@@ -6,6 +6,7 @@ export default {
identity_type
:
"认证类型"
,
identity_type
:
"认证类型"
,
identifier
:
"认证标识"
,
identifier
:
"认证标识"
,
credential
:
"凭据"
,
credential
:
"凭据"
,
username
:
"人员"
,
},
},
views
:
{
views
:
{
editview
:
{
editview
:
{
...
@@ -21,14 +22,17 @@ export default {
...
@@ -21,14 +22,17 @@ export default {
details
:
{
details
:
{
group1
:
"实体基本信息"
,
group1
:
"实体基本信息"
,
formpage1
:
"基本信息"
,
formpage1
:
"基本信息"
,
group2
:
"操作信息"
,
formpage2
:
"其它"
,
srforikey
:
""
,
srforikey
:
""
,
srfkey
:
"标识"
,
srfkey
:
"标识"
,
srftempmode
:
""
,
srftempmode
:
""
,
srfuf
:
""
,
srfuf
:
""
,
srfdeid
:
""
,
srfdeid
:
""
,
srfsourcekey
:
""
,
srfsourcekey
:
""
,
username
:
"人员"
,
identifier
:
"认证标识"
,
identity_type
:
"认证类型"
,
credential
:
"凭据"
,
userid
:
"用户标识"
,
authid
:
"标识"
,
authid
:
"标识"
,
},
},
uiactions
:
{
uiactions
:
{
...
@@ -36,6 +40,10 @@ export default {
...
@@ -36,6 +40,10 @@ export default {
},
},
main_grid
:
{
main_grid
:
{
columns
:
{
columns
:
{
username
:
"人员"
,
identity_type
:
"认证类型"
,
identifier
:
"认证标识"
,
credential
:
"凭据"
,
},
},
uiactions
:
{
uiactions
:
{
},
},
...
...
app_Web/src/locale/lanres/entities/sys-user-auth/sys-user-auth_zh_CN.ts
浏览文件 @
4c55c160
...
@@ -5,6 +5,7 @@ export default {
...
@@ -5,6 +5,7 @@ export default {
identity_type
:
"认证类型"
,
identity_type
:
"认证类型"
,
identifier
:
"认证标识"
,
identifier
:
"认证标识"
,
credential
:
"凭据"
,
credential
:
"凭据"
,
username
:
"人员"
,
},
},
views
:
{
views
:
{
editview
:
{
editview
:
{
...
@@ -20,14 +21,17 @@ export default {
...
@@ -20,14 +21,17 @@ export default {
details
:
{
details
:
{
group1
:
"实体基本信息"
,
group1
:
"实体基本信息"
,
formpage1
:
"基本信息"
,
formpage1
:
"基本信息"
,
group2
:
"操作信息"
,
formpage2
:
"其它"
,
srforikey
:
""
,
srforikey
:
""
,
srfkey
:
"标识"
,
srfkey
:
"标识"
,
srftempmode
:
""
,
srftempmode
:
""
,
srfuf
:
""
,
srfuf
:
""
,
srfdeid
:
""
,
srfdeid
:
""
,
srfsourcekey
:
""
,
srfsourcekey
:
""
,
username
:
"人员"
,
identifier
:
"认证标识"
,
identity_type
:
"认证类型"
,
credential
:
"凭据"
,
userid
:
"用户标识"
,
authid
:
"标识"
,
authid
:
"标识"
,
},
},
uiactions
:
{
uiactions
:
{
...
@@ -35,6 +39,10 @@ export default {
...
@@ -35,6 +39,10 @@ export default {
},
},
main_grid
:
{
main_grid
:
{
columns
:
{
columns
:
{
username
:
"人员"
,
identity_type
:
"认证类型"
,
identifier
:
"认证标识"
,
credential
:
"凭据"
,
},
},
uiactions
:
{
uiactions
:
{
},
},
...
...
app_Web/src/pages/rt/index/page-register.ts
浏览文件 @
4c55c160
...
@@ -36,8 +36,8 @@ export const PageComponents = {
...
@@ -36,8 +36,8 @@ export const PageComponents = {
Vue
.
component
(
'sys-post-edit-view'
,
()
=>
import
(
'@pages/ou/sys-post-edit-view/sys-post-edit-view.vue'
));
Vue
.
component
(
'sys-post-edit-view'
,
()
=>
import
(
'@pages/ou/sys-post-edit-view/sys-post-edit-view.vue'
));
Vue
.
component
(
'jobs-log-edit-view'
,
()
=>
import
(
'@pages/task/jobs-log-edit-view/jobs-log-edit-view.vue'
));
Vue
.
component
(
'jobs-log-edit-view'
,
()
=>
import
(
'@pages/task/jobs-log-edit-view/jobs-log-edit-view.vue'
));
Vue
.
component
(
'sys-post-pickup-view'
,
()
=>
import
(
'@pages/ou/sys-post-pickup-view/sys-post-pickup-view.vue'
));
Vue
.
component
(
'sys-post-pickup-view'
,
()
=>
import
(
'@pages/ou/sys-post-pickup-view/sys-post-pickup-view.vue'
));
Vue
.
component
(
'sys-user-pickup-view'
,
()
=>
import
(
'@pages/uaa/sys-user-pickup-view/sys-user-pickup-view.vue'
));
Vue
.
component
(
'jobs-info-grid-view'
,
()
=>
import
(
'@pages/task/jobs-info-grid-view/jobs-info-grid-view.vue'
));
Vue
.
component
(
'jobs-info-grid-view'
,
()
=>
import
(
'@pages/task/jobs-info-grid-view/jobs-info-grid-view.vue'
));
Vue
.
component
(
'sys-user-pickup-view'
,
()
=>
import
(
'@pages/uaa/sys-user-pickup-view/sys-user-pickup-view.vue'
));
Vue
.
component
(
'wfprocess-definition-grid-view'
,
()
=>
import
(
'@pages/workflow/wfprocess-definition-grid-view/wfprocess-definition-grid-view.vue'
));
Vue
.
component
(
'wfprocess-definition-grid-view'
,
()
=>
import
(
'@pages/workflow/wfprocess-definition-grid-view/wfprocess-definition-grid-view.vue'
));
Vue
.
component
(
'sys-team-edit-view'
,
()
=>
import
(
'@pages/ou/sys-team-edit-view/sys-team-edit-view.vue'
));
Vue
.
component
(
'sys-team-edit-view'
,
()
=>
import
(
'@pages/ou/sys-team-edit-view/sys-team-edit-view.vue'
));
Vue
.
component
(
'sys-employee-pickup-view'
,
()
=>
import
(
'@pages/ou/sys-employee-pickup-view/sys-employee-pickup-view.vue'
));
Vue
.
component
(
'sys-employee-pickup-view'
,
()
=>
import
(
'@pages/ou/sys-employee-pickup-view/sys-employee-pickup-view.vue'
));
...
...
app_Web/src/pages/rt/index/router.ts
浏览文件 @
4c55c160
...
@@ -1018,32 +1018,32 @@ const router = new Router({
...
@@ -1018,32 +1018,32 @@ const router = new Router({
component
:
()
=>
import
(
'@pages/ou/sys-post-pickup-view/sys-post-pickup-view.vue'
),
component
:
()
=>
import
(
'@pages/ou/sys-post-pickup-view/sys-post-pickup-view.vue'
),
},
},
{
{
path
:
'
sysusers/:sysuser?/pickupview/:pickup
view?'
,
path
:
'
jobsinfos/:jobsinfo?/gridview/:grid
view?'
,
meta
:
{
meta
:
{
caption
:
'entities.
sysuser.views.pickup
view.caption'
,
caption
:
'entities.
jobsinfo.views.grid
view.caption'
,
info
:
''
,
info
:
''
,
parameters
:
[
parameters
:
[
{
pathName
:
'index'
,
parameterName
:
'index'
},
{
pathName
:
'index'
,
parameterName
:
'index'
},
{
pathName
:
'
sysusers'
,
parameterName
:
'sysuser
'
},
{
pathName
:
'
jobsinfos'
,
parameterName
:
'jobsinfo
'
},
{
pathName
:
'
pickupview'
,
parameterName
:
'pickup
view'
},
{
pathName
:
'
gridview'
,
parameterName
:
'grid
view'
},
],
],
requireAuth
:
true
,
requireAuth
:
true
,
},
},
component
:
()
=>
import
(
'@pages/
uaa/sys-user-pickup-view/sys-user-pickup
-view.vue'
),
component
:
()
=>
import
(
'@pages/
task/jobs-info-grid-view/jobs-info-grid
-view.vue'
),
},
},
{
{
path
:
'
jobsinfos/:jobsinfo?/gridview/:grid
view?'
,
path
:
'
sysusers/:sysuser?/pickupview/:pickup
view?'
,
meta
:
{
meta
:
{
caption
:
'entities.
jobsinfo.views.grid
view.caption'
,
caption
:
'entities.
sysuser.views.pickup
view.caption'
,
info
:
''
,
info
:
''
,
parameters
:
[
parameters
:
[
{
pathName
:
'index'
,
parameterName
:
'index'
},
{
pathName
:
'index'
,
parameterName
:
'index'
},
{
pathName
:
'
jobsinfos'
,
parameterName
:
'jobsinfo
'
},
{
pathName
:
'
sysusers'
,
parameterName
:
'sysuser
'
},
{
pathName
:
'
gridview'
,
parameterName
:
'grid
view'
},
{
pathName
:
'
pickupview'
,
parameterName
:
'pickup
view'
},
],
],
requireAuth
:
true
,
requireAuth
:
true
,
},
},
component
:
()
=>
import
(
'@pages/
task/jobs-info-grid-view/jobs-info-grid
-view.vue'
),
component
:
()
=>
import
(
'@pages/
uaa/sys-user-pickup-view/sys-user-pickup
-view.vue'
),
},
},
{
{
path
:
'wfprocessdefinitions/:wfprocessdefinition?/gridview/:gridview?'
,
path
:
'wfprocessdefinitions/:wfprocessdefinition?/gridview/:gridview?'
,
...
...
app_Web/src/store/modules/view-action/state.ts
浏览文件 @
4c55c160
...
@@ -101,6 +101,7 @@ export const viewstate: any = {
...
@@ -101,6 +101,7 @@ export const viewstate: any = {
viewaction
:
''
,
viewaction
:
''
,
viewdatachange
:
false
,
viewdatachange
:
false
,
refviews
:
[
refviews
:
[
'32fe9ab4a9e1b8d62b9ee802e4746965'
,
],
],
},
},
{
{
...
...
app_Web/src/widgets/sys-user-auth/main-form/main-form-base.vue
浏览文件 @
4c55c160
...
@@ -2,40 +2,79 @@
...
@@ -2,40 +2,79 @@
<i-form
:model=
"this.data"
class=
'app-form'
ref=
'form'
id=
'sysuserauth_main'
style=
""
>
<i-form
:model=
"this.data"
class=
'app-form'
ref=
'form'
id=
'sysuserauth_main'
style=
""
>
<input
style=
"display:none;"
/>
<input
style=
"display:none;"
/>
<row
>
<row
>
<tabs
:animated=
"false"
name=
'main'
:value=
"detailsModel.form.activiedPage"
@
on-click=
"detailsModel.form.clickPage($event)"
>
<tab-pane
v-show=
"detailsModel.formpage1.visible"
name=
'formpage1'
:index=
"0"
tab=
'main'
class=
''
:label=
"(h) =>
{
return h('span',{
class:'caption'
},[
$t('entities.sysuserauth.main_form.details.formpage1')
])
}">
<i-col
v-show=
"detailsModel.group1.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<i-col
v-show=
"detailsModel.group1.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<app-form-group
:uiService=
"appUIService"
:data=
"transformData(data)"
:manageContainerStatus=
"detailsModel.group1.manageContainerStatus"
:isManageContainer=
"detailsModel.group1.isManageContainer"
@
managecontainerclick=
"manageContainerClick('group1')"
layoutType=
"TABLE_24COL"
titleStyle=
""
class=
''
:uiActionGroup=
"detailsModel.group1.uiActionGroup"
@
groupuiactionclick=
"groupUIActionClick($event)"
:caption=
"$t('entities.sysuserauth.main_form.details.group1')"
:isShowCaption=
"true"
uiStyle=
"DEFAULT"
:titleBarCloseMode=
"0"
:isInfoGroupMode=
"false"
>
<app-form-group
:uiService=
"appUIService"
:data=
"transformData(data)"
:manageContainerStatus=
"detailsModel.group1.manageContainerStatus"
:isManageContainer=
"detailsModel.group1.isManageContainer"
@
managecontainerclick=
"manageContainerClick('group1')"
layoutType=
"TABLE_24COL"
titleStyle=
""
class=
''
:uiActionGroup=
"detailsModel.group1.uiActionGroup"
@
groupuiactionclick=
"groupUIActionClick($event)"
:caption=
"$t('entities.sysuserauth.main_form.details.group1')"
:isShowCaption=
"true"
uiStyle=
"DEFAULT"
:titleBarCloseMode=
"0"
:isInfoGroupMode=
"false"
>
<row>
<row>
<i-col
v-show=
"detailsModel.username.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
</row>
<app-form-item
name=
'username'
:itemRules=
"this.rules().username"
class=
''
:caption=
"$t('entities.sysuserauth.main_form.details.username')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.username.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
</app-form-group>
<app-picker
:formState=
"formState"
:data=
"data"
:context=
"context"
:viewparams=
"viewparams"
:localContext =
'
{ }'
:localParam ='{ }'
:disabled="detailsModel.username.disabled"
name='username'
deMajorField='personname'
deKeyField='sysuser'
:service="service"
:acParams="{ serviceName: 'SysUserService', interfaceName: 'FetchDefault'}"
valueitem='userid'
:value="data.username"
editortype=""
:pickupView="{ viewname: 'sys-user-pickup-view', title: $t('entities.sysuser.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'sysusers', parameterName: 'sysuser' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
style=""
@formitemvaluechange="onFormItemValueChange">
</app-picker>
</app-form-item>
</i-col>
</i-col>
<i-col
v-show=
"detailsModel.identifier.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<app-form-item
name=
'identifier'
:itemRules=
"this.rules().identifier"
class=
''
:caption=
"$t('entities.sysuserauth.main_form.details.identifier')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.identifier.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<input-box
v-model=
"data.identifier"
@
enter=
"onEnter($event)"
unit=
""
:disabled=
"detailsModel.identifier.disabled"
type=
'text'
style=
""
>
</input-box>
</app-form-item>
</i-col>
<i-col
v-show=
"detailsModel.identity_type.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
<app-form-item
name=
'identity_type'
:itemRules=
"this.rules().identity_type"
class=
''
:caption=
"$t('entities.sysuserauth.main_form.details.identity_type')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.identity_type.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
<input-box
v-model=
"data.identity_type"
@
enter=
"onEnter($event)"
unit=
""
:disabled=
"detailsModel.identity_type.disabled"
type=
'text'
style=
""
>
</input-box>
</app-form-item>
</tab-pane>
</i-col>
<tab-pane
v-show=
"detailsModel.formpage2.visible"
name=
'formpage2'
:index=
"1"
tab=
'main'
class=
''
<i-col
v-show=
"detailsModel.credential.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
:label=
"(h) =>
{
<app-form-item
name=
'credential'
:itemRules=
"this.rules().credential"
class=
''
:caption=
"$t('entities.sysuserauth.main_form.details.credential')"
uiStyle=
"DEFAULT"
:labelWidth=
"130"
:isShowCaption=
"true"
:error=
"detailsModel.credential.error"
:isEmptyCaption=
"false"
labelPos=
"LEFT"
>
return h('span',{
<input-box
class:'caption'
v-model=
"data.credential"
},[
@
enter=
"onEnter($event)"
$t('entities.sysuserauth.main_form.details.formpage2')
unit=
""
])
:disabled=
"detailsModel.credential.disabled"
}">
type=
'text'
style=
""
>
</input-box>
</app-form-item>
<i-col
v-show=
"detailsModel.group2.visible"
:style=
"
{}" :lg="{ span: 24, offset: 0 }">
</i-col>
<app-form-group
:uiService=
"appUIService"
:data=
"transformData(data)"
:manageContainerStatus=
"detailsModel.group2.manageContainerStatus"
:isManageContainer=
"detailsModel.group2.isManageContainer"
@
managecontainerclick=
"manageContainerClick('group2')"
layoutType=
"TABLE_24COL"
titleStyle=
""
class=
''
:uiActionGroup=
"detailsModel.group2.uiActionGroup"
@
groupuiactionclick=
"groupUIActionClick($event)"
:caption=
"$t('entities.sysuserauth.main_form.details.group2')"
:isShowCaption=
"true"
uiStyle=
"DEFAULT"
:titleBarCloseMode=
"0"
:isInfoGroupMode=
"false"
>
<row>
</row>
</row>
</app-form-group>
</app-form-group>
...
@@ -43,8 +82,6 @@
...
@@ -43,8 +82,6 @@
</i-col>
</i-col>
</tab-pane>
</tabs>
</row>
</row>
</i-form>
</i-form>
</
template
>
</
template
>
...
@@ -381,6 +418,11 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -381,6 +418,11 @@ export default class MainBase extends Vue implements ControlInterface {
srfuf
:
null
,
srfuf
:
null
,
srfdeid
:
null
,
srfdeid
:
null
,
srfsourcekey
:
null
,
srfsourcekey
:
null
,
username
:
null
,
identifier
:
null
,
identity_type
:
null
,
credential
:
null
,
userid
:
null
,
authid
:
null
,
authid
:
null
,
sysuserauth
:
null
,
sysuserauth
:
null
,
};
};
...
@@ -461,6 +503,36 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -461,6 +503,36 @@ export default class MainBase extends Vue implements ControlInterface {
{
required
:
false
,
type
:
'string'
,
message
:
' 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'string'
,
message
:
' 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'string'
,
message
:
' 值不能为空'
,
trigger
:
'blur'
},
{
required
:
false
,
type
:
'string'
,
message
:
' 值不能为空'
,
trigger
:
'blur'
},
],
],
username
:
[
{
type
:
'string'
,
message
:
'人员 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'人员 值必须为字符串类型'
,
trigger
:
'blur'
},
{
required
:
false
,
type
:
'string'
,
message
:
'人员 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'string'
,
message
:
'人员 值不能为空'
,
trigger
:
'blur'
},
],
identifier
:
[
{
type
:
'string'
,
message
:
'认证标识 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'认证标识 值必须为字符串类型'
,
trigger
:
'blur'
},
{
required
:
false
,
type
:
'string'
,
message
:
'认证标识 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'string'
,
message
:
'认证标识 值不能为空'
,
trigger
:
'blur'
},
],
identity_type
:
[
{
type
:
'string'
,
message
:
'认证类型 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'认证类型 值必须为字符串类型'
,
trigger
:
'blur'
},
{
required
:
false
,
type
:
'string'
,
message
:
'认证类型 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'string'
,
message
:
'认证类型 值不能为空'
,
trigger
:
'blur'
},
],
credential
:
[
{
type
:
'string'
,
message
:
'凭据 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'凭据 值必须为字符串类型'
,
trigger
:
'blur'
},
{
required
:
false
,
type
:
'string'
,
message
:
'凭据 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'string'
,
message
:
'凭据 值不能为空'
,
trigger
:
'blur'
},
],
userid
:
[
{
type
:
'string'
,
message
:
'用户标识 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'用户标识 值必须为字符串类型'
,
trigger
:
'blur'
},
{
required
:
false
,
type
:
'string'
,
message
:
'用户标识 值不能为空'
,
trigger
:
'change'
},
{
required
:
false
,
type
:
'string'
,
message
:
'用户标识 值不能为空'
,
trigger
:
'blur'
},
],
authid
:
[
authid
:
[
{
type
:
'string'
,
message
:
'标识 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'标识 值必须为字符串类型'
,
trigger
:
'change'
},
{
type
:
'string'
,
message
:
'标识 值必须为字符串类型'
,
trigger
:
'blur'
},
{
type
:
'string'
,
message
:
'标识 值必须为字符串类型'
,
trigger
:
'blur'
},
...
@@ -558,10 +630,6 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -558,10 +630,6 @@ export default class MainBase extends Vue implements ControlInterface {
group1
:
new
FormGroupPanelModel
({
caption
:
'实体基本信息'
,
detailType
:
'GROUPPANEL'
,
name
:
'group1'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
,
uiActionGroup
:
{
caption
:
''
,
langbase
:
'entities.sysuserauth.main_form'
,
extractMode
:
'ITEM'
,
details
:
[]
},
isManageContainer
:
false
,
showMoreModeItems
:
[]
})
group1
:
new
FormGroupPanelModel
({
caption
:
'实体基本信息'
,
detailType
:
'GROUPPANEL'
,
name
:
'group1'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
,
uiActionGroup
:
{
caption
:
''
,
langbase
:
'entities.sysuserauth.main_form'
,
extractMode
:
'ITEM'
,
details
:
[]
},
isManageContainer
:
false
,
showMoreModeItems
:
[]
})
,
,
formpage1
:
new
FormPageModel
({
caption
:
'基本信息'
,
detailType
:
'FORMPAGE'
,
name
:
'formpage1'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
})
formpage1
:
new
FormPageModel
({
caption
:
'基本信息'
,
detailType
:
'FORMPAGE'
,
name
:
'formpage1'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
})
,
group2
:
new
FormGroupPanelModel
({
caption
:
'操作信息'
,
detailType
:
'GROUPPANEL'
,
name
:
'group2'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
,
uiActionGroup
:
{
caption
:
''
,
langbase
:
'entities.sysuserauth.main_form'
,
extractMode
:
'ITEM'
,
details
:
[]
},
isManageContainer
:
false
,
showMoreModeItems
:
[]
})
,
formpage2
:
new
FormPageModel
({
caption
:
'其它'
,
detailType
:
'FORMPAGE'
,
name
:
'formpage2'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
})
,
,
srforikey
:
new
FormItemModel
({
caption
:
''
,
detailType
:
'FORMITEM'
,
name
:
'srforikey'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
,
disabled
:
false
,
enableCond
:
3
})
srforikey
:
new
FormItemModel
({
caption
:
''
,
detailType
:
'FORMITEM'
,
name
:
'srforikey'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
,
disabled
:
false
,
enableCond
:
3
})
,
,
...
@@ -574,10 +642,19 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -574,10 +642,19 @@ export default class MainBase extends Vue implements ControlInterface {
srfdeid
:
new
FormItemModel
({
caption
:
''
,
detailType
:
'FORMITEM'
,
name
:
'srfdeid'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
,
disabled
:
false
,
enableCond
:
3
})
srfdeid
:
new
FormItemModel
({
caption
:
''
,
detailType
:
'FORMITEM'
,
name
:
'srfdeid'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
,
disabled
:
false
,
enableCond
:
3
})
,
,
srfsourcekey
:
new
FormItemModel
({
caption
:
''
,
detailType
:
'FORMITEM'
,
name
:
'srfsourcekey'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
,
disabled
:
false
,
enableCond
:
3
})
srfsourcekey
:
new
FormItemModel
({
caption
:
''
,
detailType
:
'FORMITEM'
,
name
:
'srfsourcekey'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
,
disabled
:
false
,
enableCond
:
3
})
,
username
:
new
FormItemModel
({
caption
:
'人员'
,
detailType
:
'FORMITEM'
,
name
:
'username'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
,
disabled
:
false
,
enableCond
:
3
})
,
identifier
:
new
FormItemModel
({
caption
:
'认证标识'
,
detailType
:
'FORMITEM'
,
name
:
'identifier'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
,
disabled
:
false
,
enableCond
:
3
})
,
identity_type
:
new
FormItemModel
({
caption
:
'认证类型'
,
detailType
:
'FORMITEM'
,
name
:
'identity_type'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
,
disabled
:
false
,
enableCond
:
3
})
,
credential
:
new
FormItemModel
({
caption
:
'凭据'
,
detailType
:
'FORMITEM'
,
name
:
'credential'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
,
disabled
:
false
,
enableCond
:
3
})
,
userid
:
new
FormItemModel
({
caption
:
'用户标识'
,
detailType
:
'FORMITEM'
,
name
:
'userid'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
,
disabled
:
false
,
enableCond
:
3
})
,
,
authid
:
new
FormItemModel
({
caption
:
'标识'
,
detailType
:
'FORMITEM'
,
name
:
'authid'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
,
disabled
:
false
,
enableCond
:
3
})
authid
:
new
FormItemModel
({
caption
:
'标识'
,
detailType
:
'FORMITEM'
,
name
:
'authid'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
isControlledContent
:
false
,
disabled
:
false
,
enableCond
:
3
})
,
,
form
:
new
FormTabPanelModel
({
caption
:
'form'
,
detailType
:
'TABPANEL'
,
name
:
'form'
,
visible
:
true
,
isShowCaption
:
true
,
form
:
this
,
tabPages
:
[{
name
:
'formpage1'
,
index
:
0
,
visible
:
true
},
{
name
:
'formpage2'
,
index
:
1
,
visible
:
true
}]
}),
};
};
/**
/**
...
@@ -652,6 +729,66 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -652,6 +729,66 @@ export default class MainBase extends Vue implements ControlInterface {
this
.
formDataChange
({
name
:
'srfsourcekey'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
this
.
formDataChange
({
name
:
'srfsourcekey'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
}
/**
* 监控表单属性 username 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@
Watch
(
'data.username'
)
onUsernameChange
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'username'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
* 监控表单属性 identifier 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@
Watch
(
'data.identifier'
)
onIdentifierChange
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'identifier'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
* 监控表单属性 identity_type 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@
Watch
(
'data.identity_type'
)
onIdentity_typeChange
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'identity_type'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
* 监控表单属性 credential 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@
Watch
(
'data.credential'
)
onCredentialChange
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'credential'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
* 监控表单属性 userid 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@
Watch
(
'data.userid'
)
onUseridChange
(
newVal
:
any
,
oldVal
:
any
)
{
this
.
formDataChange
({
name
:
'userid'
,
newVal
:
newVal
,
oldVal
:
oldVal
});
}
/**
/**
* 监控表单属性 authid 值
* 监控表单属性 authid 值
*
*
...
@@ -729,6 +866,9 @@ export default class MainBase extends Vue implements ControlInterface {
...
@@ -729,6 +866,9 @@ export default class MainBase extends Vue implements ControlInterface {
}
}
/**
/**
...
...
app_Web/src/widgets/sys-user-auth/main-form/main-form-model.ts
浏览文件 @
4c55c160
...
@@ -45,6 +45,31 @@ export default class MainModel {
...
@@ -45,6 +45,31 @@ export default class MainModel {
{
{
name
:
'srfsourcekey'
,
name
:
'srfsourcekey'
,
},
},
{
name
:
'username'
,
prop
:
'username'
,
dataType
:
'PICKUPTEXT'
,
},
{
name
:
'identifier'
,
prop
:
'identifier'
,
dataType
:
'TEXT'
,
},
{
name
:
'identity_type'
,
prop
:
'identity_type'
,
dataType
:
'TEXT'
,
},
{
name
:
'credential'
,
prop
:
'credential'
,
dataType
:
'TEXT'
,
},
{
name
:
'userid'
,
prop
:
'userid'
,
dataType
:
'PICKUP'
,
},
{
{
name
:
'authid'
,
name
:
'authid'
,
prop
:
'id'
,
prop
:
'id'
,
...
...
app_Web/src/widgets/sys-user-auth/main-form/main-form-service.ts
浏览文件 @
4c55c160
...
@@ -2,6 +2,7 @@ import { Http,Util,Errorlog } from '@/utils';
...
@@ -2,6 +2,7 @@ import { Http,Util,Errorlog } from '@/utils';
import
ControlService
from
'@/widgets/control-service'
;
import
ControlService
from
'@/widgets/control-service'
;
import
SysUserAuthService
from
'@/service/sys-user-auth/sys-user-auth-service'
;
import
SysUserAuthService
from
'@/service/sys-user-auth/sys-user-auth-service'
;
import
MainModel
from
'./main-form-model'
;
import
MainModel
from
'./main-form-model'
;
import
SysUserService
from
'@/service/sys-user/sys-user-service'
;
/**
/**
...
@@ -41,6 +42,14 @@ export default class MainService extends ControlService {
...
@@ -41,6 +42,14 @@ export default class MainService extends ControlService {
this
.
model
=
new
MainModel
();
this
.
model
=
new
MainModel
();
}
}
/**
* 系统用户服务对象
*
* @type {SysUserService}
* @memberof MainService
*/
public
sysuserService
:
SysUserService
=
new
SysUserService
();
/**
/**
* 处理数据
* 处理数据
*
*
...
@@ -82,6 +91,9 @@ export default class MainService extends ControlService {
...
@@ -82,6 +91,9 @@ export default class MainService extends ControlService {
public
getItems
(
serviceName
:
string
,
interfaceName
:
string
,
context
:
any
=
{},
data
:
any
,
isloading
?:
boolean
):
Promise
<
any
[]
>
{
public
getItems
(
serviceName
:
string
,
interfaceName
:
string
,
context
:
any
=
{},
data
:
any
,
isloading
?:
boolean
):
Promise
<
any
[]
>
{
data
.
page
=
data
.
page
?
data
.
page
:
0
;
data
.
page
=
data
.
page
?
data
.
page
:
0
;
data
.
size
=
data
.
size
?
data
.
size
:
1000
;
data
.
size
=
data
.
size
?
data
.
size
:
1000
;
if
(
Object
.
is
(
serviceName
,
'SysUserService'
)
&&
Object
.
is
(
interfaceName
,
'FetchDefault'
))
{
return
this
.
doItems
(
this
.
sysuserService
.
FetchDefault
(
JSON
.
parse
(
JSON
.
stringify
(
context
)),
data
,
isloading
),
'userid'
,
'sysuser'
);
}
return
Promise
.
reject
([])
return
Promise
.
reject
([])
}
}
...
...
app_Web/src/widgets/sys-user-auth/main-grid/main-grid-model.ts
浏览文件 @
4c55c160
...
@@ -26,11 +26,26 @@ export default class MainModel {
...
@@ -26,11 +26,26 @@ export default class MainModel {
]
]
}
else
{
}
else
{
return
[
return
[
{
name
:
'username'
,
prop
:
'username'
,
dataType
:
'PICKUPTEXT'
,
},
{
name
:
'identity_type'
,
prop
:
'identity_type'
,
dataType
:
'TEXT'
,
},
{
{
name
:
'userid'
,
name
:
'userid'
,
prop
:
'userid'
,
prop
:
'userid'
,
dataType
:
'PICKUP'
,
dataType
:
'PICKUP'
,
},
},
{
name
:
'identifier'
,
prop
:
'identifier'
,
dataType
:
'TEXT'
,
},
{
{
name
:
'srfdataaccaction'
,
name
:
'srfdataaccaction'
,
prop
:
'id'
,
prop
:
'id'
,
...
@@ -42,6 +57,11 @@ export default class MainModel {
...
@@ -42,6 +57,11 @@ export default class MainModel {
dataType
:
'TEXT'
,
dataType
:
'TEXT'
,
isEditable
:
true
isEditable
:
true
},
},
{
name
:
'credential'
,
prop
:
'credential'
,
dataType
:
'TEXT'
,
},
{
{
name
:
'sysuserauth'
,
name
:
'sysuserauth'
,
prop
:
'id'
,
prop
:
'id'
,
...
...
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/domain/SysUserAuth.java
浏览文件 @
4c55c160
...
@@ -68,6 +68,13 @@ public class SysUserAuth extends EntityClient implements Serializable {
...
@@ -68,6 +68,13 @@ public class SysUserAuth extends EntityClient implements Serializable {
@JsonProperty
(
"credential"
)
@JsonProperty
(
"credential"
)
private
String
credential
;
private
String
credential
;
/**
* 人员
*/
@JSONField
(
name
=
"username"
)
@JsonProperty
(
"username"
)
private
String
username
;
/**
/**
* 用户
* 用户
...
...
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/filter/SysUserAuthSearchContext.java
浏览文件 @
4c55c160
...
@@ -27,6 +27,10 @@ import cn.ibizlab.util.filter.SearchContextBase;
...
@@ -27,6 +27,10 @@ import cn.ibizlab.util.filter.SearchContextBase;
public
class
SysUserAuthSearchContext
extends
SearchContextBase
{
public
class
SysUserAuthSearchContext
extends
SearchContextBase
{
private
String
n_userid_eq
;
//[用户标识]
private
String
n_userid_eq
;
//[用户标识]
private
String
n_username_eq
;
//[人员]
private
String
n_username_like
;
//[人员]
}
}
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/SysUserAuthDTO.java
浏览文件 @
4c55c160
...
@@ -64,6 +64,14 @@ public class SysUserAuthDTO extends DTOBase implements Serializable {
...
@@ -64,6 +64,14 @@ public class SysUserAuthDTO extends DTOBase implements Serializable {
@JsonProperty
(
"credential"
)
@JsonProperty
(
"credential"
)
private
String
credential
;
private
String
credential
;
/**
* 属性 [USERNAME]
*
*/
@JSONField
(
name
=
"username"
)
@JsonProperty
(
"username"
)
private
String
username
;
/**
/**
* 设置 [USERID]
* 设置 [USERID]
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录