Skip to content

I
ibzrt
提交 4c55c160 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibiz4j 发布系统代码

上级 a75e4741
展开全部 显示空白字符变更
内嵌 并排
正在显示 包含 283 行增加 和 50 行删除
app_Web/src/locale/lanres/entities/sys-user-auth/sys-user-auth_en_US.ts
浏览文件 @ 4c55c160
......@@ -6,6 +6,7 @@ export default {
identity_type: "认证类型",
identifier: "认证标识",
credential: "凭据",
username: "人员",
},
views: {
editview: {
......@@ -21,14 +22,17 @@ export default {
details: {
group1: "实体基本信息",
formpage1: "基本信息",
group2: "操作信息",
formpage2: "其它",
srforikey: "",
srfkey: "标识",
srftempmode: "",
srfuf: "",
srfdeid: "",
srfsourcekey: "",
username: "人员",
identifier: "认证标识",
identity_type: "认证类型",
credential: "凭据",
userid: "用户标识",
authid: "标识",
},
uiactions: {
......@@ -36,6 +40,10 @@ export default {
},
main_grid: {
columns: {
username: "人员",
identity_type: "认证类型",
identifier: "认证标识",
credential: "凭据",
},
uiactions: {
},
......
app_Web/src/locale/lanres/entities/sys-user-auth/sys-user-auth_zh_CN.ts
浏览文件 @ 4c55c160
......@@ -5,6 +5,7 @@ export default {
identity_type: "认证类型",
identifier: "认证标识",
credential: "凭据",
username: "人员",
},
views: {
editview: {
......@@ -20,14 +21,17 @@ export default {
details: {
group1: "实体基本信息",
formpage1: "基本信息",
group2: "操作信息",
formpage2: "其它",
srforikey: "",
srfkey: "标识",
srftempmode: "",
srfuf: "",
srfdeid: "",
srfsourcekey: "",
username: "人员",
identifier: "认证标识",
identity_type: "认证类型",
credential: "凭据",
userid: "用户标识",
authid: "标识",
},
uiactions: {
......@@ -35,6 +39,10 @@ export default {
},
main_grid: {
columns: {
username: "人员",
identity_type: "认证类型",
identifier: "认证标识",
credential: "凭据",
},
uiactions: {
},
......
app_Web/src/pages/rt/index/page-register.ts
浏览文件 @ 4c55c160
......@@ -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('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-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('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('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'));
......
app_Web/src/pages/rt/index/router.ts
浏览文件 @ 4c55c160
......@@ -1018,32 +1018,32 @@ const router = new Router({
component: () => import('@pages/ou/sys-post-pickup-view/sys-post-pickup-view.vue'),
},
{
path: 'sysusers/:sysuser?/pickupview/:pickupview?',
path: 'jobsinfos/:jobsinfo?/gridview/:gridview?',
meta: {
caption: 'entities.sysuser.views.pickupview.caption',
caption: 'entities.jobsinfo.views.gridview.caption',
info:'',
parameters: [
{ pathName: 'index', parameterName: 'index' },
{ pathName: 'sysusers', parameterName: 'sysuser' },
{ pathName: 'pickupview', parameterName: 'pickupview' },
{ pathName: 'jobsinfos', parameterName: 'jobsinfo' },
{ pathName: 'gridview', parameterName: 'gridview' },
],
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/:gridview?',
path: 'sysusers/:sysuser?/pickupview/:pickupview?',
meta: {
caption: 'entities.jobsinfo.views.gridview.caption',
caption: 'entities.sysuser.views.pickupview.caption',
info:'',
parameters: [
{ pathName: 'index', parameterName: 'index' },
{ pathName: 'jobsinfos', parameterName: 'jobsinfo' },
{ pathName: 'gridview', parameterName: 'gridview' },
{ pathName: 'sysusers', parameterName: 'sysuser' },
{ pathName: 'pickupview', parameterName: 'pickupview' },
],
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?',
......
app_Web/src/store/modules/view-action/state.ts
浏览文件 @ 4c55c160
......@@ -101,6 +101,7 @@ export const viewstate: any = {
viewaction: '',
viewdatachange: false,
refviews: [
'32fe9ab4a9e1b8d62b9ee802e4746965',
],
},
{
......
app_Web/src/widgets/sys-user-auth/main-form/main-form-model.ts
浏览文件 @ 4c55c160
......@@ -45,6 +45,31 @@ export default class MainModel {
{
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',
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';
import ControlService from '@/widgets/control-service';
import SysUserAuthService from '@/service/sys-user-auth/sys-user-auth-service';
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 {
this.model = new MainModel();
}
/**
* 系统用户服务对象
*
* @type {SysUserService}
* @memberof MainService
*/
public sysuserService: SysUserService = new SysUserService();
/**
* 处理数据
*
......@@ -82,6 +91,9 @@ export default class MainService extends ControlService {
public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
data.page = data.page ? data.page : 0;
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([])
}
......
app_Web/src/widgets/sys-user-auth/main-grid/main-grid-model.ts
浏览文件 @ 4c55c160
......@@ -26,11 +26,26 @@ export default class MainModel {
]
}else{
return [
{
name: 'username',
prop: 'username',
dataType: 'PICKUPTEXT',
},
{
name: 'identity_type',
prop: 'identity_type',
dataType: 'TEXT',
},
{
name: 'userid',
prop: 'userid',
dataType: 'PICKUP',
},
{
name: 'identifier',
prop: 'identifier',
dataType: 'TEXT',
},
{
name: 'srfdataaccaction',
prop: 'id',
......@@ -42,6 +57,11 @@ export default class MainModel {
dataType: 'TEXT',
isEditable:true
},
{
name: 'credential',
prop: 'credential',
dataType: 'TEXT',
},
{
name: 'sysuserauth',
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 {
@JsonProperty("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;
public class SysUserAuthSearchContext extends SearchContextBase {
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 {
@JsonProperty("credential")
private String credential;
/**
* 属性 [USERNAME]
*
*/
@JSONField(name = "username")
@JsonProperty("username")
private String username;
/**
* 设置 [USERID]
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或