Skip to content

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

ibiz4j 发布系统代码 [ibiz-rt，ibizlab-runtime]

上级 b3fd298f
显示空白字符变更
内嵌 并排
正在显示 包含 321 行增加 和 1 行删除
app_Web/src/locale/lanres/entities/sys-open-access/sys-open-access_en_US.ts
浏览文件 @ 87a65f50
......@@ -11,6 +11,8 @@ export default {
expires_time: "管理账号token过期时间",
disabled: "是否禁用",
redirect_uri: "RedirectURI",
notify_url: "NotifyUrl",
agent_id: "AGENT_ID",
},
views: {
gridview: {
......@@ -39,6 +41,10 @@ export default {
secret_key: "SecretKey(AppSecret)",
redirect_uri: "RedirectURI",
region_id: "RegionId",
access_token: "管理账号token",
expires_time: "管理账号token过期时间",
notify_url: "NotifyUrl",
agent_id: "AGENT_ID",
disabled: "是否禁用",
accessid: "开放平台接入标识",
},
......
app_Web/src/locale/lanres/entities/sys-open-access/sys-open-access_zh_CN.ts
浏览文件 @ 87a65f50
......@@ -10,6 +10,8 @@ export default {
expires_time: "管理账号token过期时间",
disabled: "是否禁用",
redirect_uri: "RedirectURI",
notify_url: "NotifyUrl",
agent_id: "AGENT_ID",
},
views: {
gridview: {
......@@ -38,6 +40,10 @@ export default {
secret_key: "SecretKey(AppSecret)",
redirect_uri: "RedirectURI",
region_id: "RegionId",
access_token: "管理账号token",
expires_time: "管理账号token过期时间",
notify_url: "NotifyUrl",
agent_id: "AGENT_ID",
disabled: "是否禁用",
accessid: "开放平台接入标识",
},
......
app_Web/src/locale/lanres/entities/sys-team-member/sys-team-member_en_US.ts
浏览文件 @ 87a65f50
......@@ -9,6 +9,7 @@ export default {
postid: "岗位标识",
postname: "岗位",
domains: "区属",
username: "登录名",
},
views: {
gridview: {
......@@ -45,6 +46,7 @@ export default {
main_grid: {
columns: {
personname: "姓名",
username: "登录名",
postname: "岗位",
userid: "用户标识",
postid: "岗位标识",
......
app_Web/src/locale/lanres/entities/sys-team-member/sys-team-member_zh_CN.ts
浏览文件 @ 87a65f50
......@@ -8,6 +8,7 @@ export default {
postid: "岗位标识",
postname: "岗位",
domains: "区属",
username: "登录名",
},
views: {
gridview: {
......@@ -44,6 +45,7 @@ export default {
main_grid: {
columns: {
personname: "姓名",
username: "登录名",
postname: "岗位",
userid: "用户标识",
postid: "岗位标识",
......
app_Web/src/widgets/sys-open-access/main-form/main-form-base.vue
浏览文件 @ 87a65f50
......@@ -88,6 +88,55 @@
</app-form-item>
</i-col>
<i-col v-show="detailsModel.access_token.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='access_token' :itemRules="this.rules().access_token" class='' :caption="$t('entities.sysopenaccess.main_form.details.access_token')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.access_token.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box
v-model="data.access_token"
@enter="onEnter($event)"
unit=""
:disabled="detailsModel.access_token.disabled"
type='text'
style="">
</input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.expires_time.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='expires_time' :itemRules="this.rules().expires_time" class='' :caption="$t('entities.sysopenaccess.main_form.details.expires_time')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.expires_time.error" :isEmptyCaption="false" labelPos="LEFT">
<date-picker type="datetime" :transfer="true" format="yyyy-MM-dd HH:mm:ss" placeholder="请选择时间..." :value="data.expires_time" :disabled="detailsModel.expires_time.disabled" style="min-width: 150px; width:160px;" @on-change="(val1, val2) => { this.data.expires_time = val1 }"></date-picker>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.notify_url.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='notify_url' :itemRules="this.rules().notify_url" class='' :caption="$t('entities.sysopenaccess.main_form.details.notify_url')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.notify_url.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box
v-model="data.notify_url"
@enter="onEnter($event)"
unit=""
:disabled="detailsModel.notify_url.disabled"
type='text'
style="">
</input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.agent_id.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='agent_id' :itemRules="this.rules().agent_id" class='' :caption="$t('entities.sysopenaccess.main_form.details.agent_id')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.agent_id.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box
v-model="data.agent_id"
@enter="onEnter($event)"
unit=""
:disabled="detailsModel.agent_id.disabled"
type='number'
style="">
</input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.disabled.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='disabled' :itemRules="this.rules().disabled" class='' :caption="$t('entities.sysopenaccess.main_form.details.disabled')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.disabled.error" :isEmptyCaption="false" labelPos="LEFT">
......@@ -507,6 +556,10 @@ export default class MainBase extends Vue implements ControlInterface {
secret_key: null,
redirect_uri: null,
region_id: null,
access_token: null,
expires_time: null,
notify_url: null,
agent_id: null,
disabled: null,
accessid: null,
sysopenaccess:null,
......@@ -584,6 +637,22 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: this.detailsModel.region_id.required, type: 'string', message: 'RegionId 值不能为空', trigger: 'change' },
{ required: this.detailsModel.region_id.required, type: 'string', message: 'RegionId 值不能为空', trigger: 'blur' },
],
access_token: [
{ required: this.detailsModel.access_token.required, type: 'string', message: '管理账号token 值不能为空', trigger: 'change' },
{ required: this.detailsModel.access_token.required, type: 'string', message: '管理账号token 值不能为空', trigger: 'blur' },
],
expires_time: [
{ required: this.detailsModel.expires_time.required, type: 'string', message: '管理账号token过期时间 值不能为空', trigger: 'change' },
{ required: this.detailsModel.expires_time.required, type: 'string', message: '管理账号token过期时间 值不能为空', trigger: 'blur' },
],
notify_url: [
{ required: this.detailsModel.notify_url.required, type: 'string', message: 'NotifyUrl 值不能为空', trigger: 'change' },
{ required: this.detailsModel.notify_url.required, type: 'string', message: 'NotifyUrl 值不能为空', trigger: 'blur' },
],
agent_id: [
{ required: this.detailsModel.agent_id.required, type: 'number', message: 'AGENT_ID 值不能为空', trigger: 'change' },
{ required: this.detailsModel.agent_id.required, type: 'number', message: 'AGENT_ID 值不能为空', trigger: 'blur' },
],
disabled: [
{ required: this.detailsModel.disabled.required, type: 'number', message: '是否禁用 值不能为空', trigger: 'change' },
{ required: this.detailsModel.disabled.required, type: 'number', message: '是否禁用 值不能为空', trigger: 'blur' },
......@@ -716,6 +785,14 @@ export default class MainBase extends Vue implements ControlInterface {
redirect_uri: new FormItemModel({ caption: 'RedirectURI', detailType: 'FORMITEM', name: 'redirect_uri', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
region_id: new FormItemModel({ caption: 'RegionId', detailType: 'FORMITEM', name: 'region_id', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
access_token: new FormItemModel({ caption: '管理账号token', detailType: 'FORMITEM', name: 'access_token', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
expires_time: new FormItemModel({ caption: '管理账号token过期时间', detailType: 'FORMITEM', name: 'expires_time', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
notify_url: new FormItemModel({ caption: 'NotifyUrl', detailType: 'FORMITEM', name: 'notify_url', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
agent_id: new FormItemModel({ caption: 'AGENT_ID', detailType: 'FORMITEM', name: 'agent_id', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
disabled: new FormItemModel({ caption: '是否禁用', detailType: 'FORMITEM', name: 'disabled', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
......@@ -879,6 +956,54 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'region_id', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 access_token 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.access_token')
onAccess_tokenChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'access_token', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 expires_time 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.expires_time')
onExpires_timeChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'expires_time', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 notify_url 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.notify_url')
onNotify_urlChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'notify_url', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 agent_id 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.agent_id')
onAgent_idChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'agent_id', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 disabled 值
*
......@@ -972,6 +1097,10 @@ export default class MainBase extends Vue implements ControlInterface {
}
......
app_Web/src/widgets/sys-open-access/main-form/main-form-model.ts
浏览文件 @ 87a65f50
......@@ -80,6 +80,26 @@ export default class MainModel {
prop: 'region_id',
dataType: 'TEXT',
},
{
name: 'access_token',
prop: 'access_token',
dataType: 'TEXT',
},
{
name: 'expires_time',
prop: 'expires_time',
dataType: 'DATETIME',
},
{
name: 'notify_url',
prop: 'notify_url',
dataType: 'TEXT',
},
{
name: 'agent_id',
prop: 'agent_id',
dataType: 'BIGINT',
},
{
name: 'disabled',
prop: 'disabled',
......
app_Web/src/widgets/sys-team-member/main-grid/main-grid-base.vue
浏览文件 @ 87a65f50
......@@ -62,6 +62,18 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('username')">
<el-table-column show-overflow-tooltip :prop="'username'" :label="$t('entities.systeammember.main_grid.columns.username')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.systeammember.main_grid.columns.username')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.username}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('postname')">
<el-table-column show-overflow-tooltip :prop="'postname'" :label="$t('entities.systeammember.main_grid.columns.postname')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
......@@ -725,6 +737,15 @@ export default class MainBase extends Vue implements ControlInterface {
isEnableRowEdit: true,
enableCond: 3 ,
},
{
name: 'username',
label: '登录名',
langtag: 'entities.systeammember.main_grid.columns.username',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'postname',
label: '岗位',
......@@ -1427,7 +1448,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
let allColumns:Array<any> = ['personname','postname','userid','postid'];
let allColumns:Array<any> = ['personname','username','postname','userid','postid'];
if(row && row.children && row.children.length>0) {
if(columnIndex == (this.isSingleSelect ? 0:1)) {
return [1, allColumns.length+1];
......@@ -1471,6 +1492,7 @@ export default class MainBase extends Vue implements ControlInterface {
groupById: Number((groupIndex+1)*10),
group: group,
personname:'',
username:'',
postname:'',
userid:'',
postid:'',
......
app_Web/src/widgets/sys-team-member/main-grid/main-grid-model.ts
浏览文件 @ 87a65f50
......@@ -32,6 +32,11 @@ export default class MainModel {
dataType: 'PICKUP',
isEditable:true
},
{
name: 'username',
prop: 'username',
dataType: 'PICKUPDATA',
},
{
name: 'teamid',
prop: 'teamid',
......
ibzrt-core/src/main/java/cn/ibizlab/core/ou/domain/SysTeamMember.java
浏览文件 @ 87a65f50
......@@ -90,6 +90,13 @@ public class SysTeamMember extends EntityClient implements Serializable {
@JsonProperty("domains")
private String domains;
/**
* 登录名
*/
@JSONField(name = "username")
@JsonProperty("username")
private String username;
/**
*
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/domain/SysOpenAccess.java
浏览文件 @ 87a65f50
......@@ -114,6 +114,22 @@ public class SysOpenAccess extends EntityClient implements Serializable {
@JsonProperty("redirect_uri")
private String redirectUri;
/**
* NotifyUrl
*/
@DEField(name = "notify_url")
@JSONField(name = "notify_url")
@JsonProperty("notify_url")
private String notifyUrl;
/**
* AGENT_ID
*/
@DEField(name = "agent_id")
@JSONField(name = "agent_id")
@JsonProperty("agent_id")
private Long agentId;
......@@ -200,6 +216,22 @@ public class SysOpenAccess extends EntityClient implements Serializable {
this.modify("redirect_uri",redirectUri);
}
/**
* 设置 [NotifyUrl]
*/
public void setNotifyUrl(String notifyUrl) {
this.notifyUrl = notifyUrl ;
this.modify("notify_url",notifyUrl);
}
/**
* 设置 [AGENT_ID]
*/
public void setAgentId(Long agentId) {
this.agentId = agentId ;
this.modify("agent_id",agentId);
}
/**
* 复制当前对象数据到目标对象(粘贴重置)
* @param targetEntity 目标数据对象
......
ibzrt-core/src/main/resources/sysmodel/ibzrt.json
浏览文件 @ 87a65f50
......@@ -2600,6 +2600,34 @@
"key_field":0,
"show_order":11,
"major_field":0
},
{
"fieldname":"NOTIFY_URL" ,
"codename":"Notify_url",
"field_logic_name":"NotifyUrl",
"entity_name":"SysOpenAccess",
"field_type":"TEXT",
"nullable":1,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":500,
"key_field":0,
"show_order":12,
"major_field":0
},
{
"fieldname":"AGENT_ID" ,
"codename":"Agent_id",
"field_logic_name":"AGENT_ID",
"entity_name":"SysOpenAccess",
"field_type":"BIGINT",
"nullable":1,
"physical_field":1,
"data_type":"BIGINT",
"data_length":20,
"key_field":0,
"show_order":13,
"major_field":0
}
],
"subEntitys":[
......@@ -3702,6 +3730,24 @@
"key_field":0,
"show_order":8,
"major_field":0
},
{
"fieldname":"USERNAME" ,
"codename":"UserName",
"field_logic_name":"登录名",
"entity_name":"SysTeamMember",
"ref_de":"SYS_EMP",
"ref_field_name":"USERNAME",
"relation_name":"DER1N_SYS_TEAMMEMBER_SYS_EMP_USERID",
"relation_codename":"Emp",
"field_type":"PICKUPDATA",
"nullable":1,
"physical_field":0,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":9,
"major_field":0
}
],
"subEntitys":[
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/SysOpenAccessDTO.java
浏览文件 @ 87a65f50
......@@ -118,6 +118,24 @@ public class SysOpenAccessDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 500, message = "内容长度必须小于等于[500]")
private String redirectUri;
/**
* 属性 [NOTIFY_URL]
*
*/
@JSONField(name = "notify_url")
@JsonProperty("notify_url")
@Size(min = 0, max = 500, message = "内容长度必须小于等于[500]")
private String notifyUrl;
/**
* 属性 [AGENT_ID]
*
*/
@JSONField(name = "agent_id")
@JsonProperty("agent_id")
@JsonSerialize(using = ToStringSerializer.class)
private Long agentId;
/**
* 设置 [ACCESSNAME]
......@@ -191,6 +209,22 @@ public class SysOpenAccessDTO extends DTOBase implements Serializable {
this.modify("redirect_uri",redirectUri);
}
/**
* 设置 [NOTIFY_URL]
*/
public void setNotifyUrl(String notifyUrl){
this.notifyUrl = notifyUrl ;
this.modify("notify_url",notifyUrl);
}
/**
* 设置 [AGENT_ID]
*/
public void setAgentId(Long agentId){
this.agentId = agentId ;
this.modify("agent_id",agentId);
}
}
......
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/SysTeamMemberDTO.java
浏览文件 @ 87a65f50
......@@ -105,6 +105,15 @@ public class SysTeamMemberDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String domains;
/**
* 属性 [USERNAME]
*
*/
@JSONField(name = "username")
@JsonProperty("username")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String username;
/**
* 设置 [TEAMID]
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或