Skip to content

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

ibiz4j 发布系统代码

上级 989ba8e2
隐藏空白字符变更
内嵌 并排
正在显示 包含 200 行增加 和 160 行删除
app_Web/src/locale/lanres/entities/sys-role/sys-role_en_US.ts
浏览文件 @ c319fd3e
......@@ -4,6 +4,8 @@ export default {
roleid: "Normal",
rolename: "Save",
memo: "备注",
proleid: "父角色标识",
prolename: "父角色名称",
createdate: ">",
updatedate: "Upload",
},
......@@ -47,8 +49,10 @@ export default {
srfdeid: "",
srfsourcekey: "",
sys_rolename: "Save",
prolename: "父角色名称",
memo: "备注",
sys_roleid: "Normal",
proleid: "父角色标识",
},
uiactions: {
},
......
app_Web/src/locale/lanres/entities/sys-role/sys-role_zh_CN.ts
浏览文件 @ c319fd3e
......@@ -3,6 +3,8 @@ export default {
roleid: "角色标识",
rolename: "角色名称",
memo: "备注",
proleid: "父角色标识",
prolename: "父角色名称",
createdate: "建立时间",
updatedate: "更新时间",
},
......@@ -46,8 +48,10 @@ export default {
srfdeid: "",
srfsourcekey: "",
sys_rolename: "角色名称",
prolename: "父角色名称",
memo: "备注",
sys_roleid: "角色标识",
proleid: "父角色标识",
},
uiactions: {
},
......
app_Web/src/store/modules/view-action/state.ts
浏览文件 @ c319fd3e
......@@ -330,6 +330,7 @@ export const viewstate: any = {
viewdatachange: false,
refviews: [
'6736591aca71edc23df760e278378566',
'26cc2d5c69f1525eaa415b7de1a0d4a6',
'983f3ae1533a5cd62619dedb79bb4b28',
],
},
......
app_Web/src/widgets/sys-role/main-form/main-form-base.vue
浏览文件 @ c319fd3e
......@@ -6,14 +6,41 @@
<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.sysrole.main_form.details.group1')" :isShowCaption="false" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false" >
<row>
<i-col v-show="detailsModel.sys_rolename.visible" :style="{}" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
<i-col v-show="detailsModel.sys_rolename.visible" :style="{}" :md="{ span: 8, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item name='sys_rolename' :itemRules="this.rules().sys_rolename" class='' :caption="$t('entities.sysrole.main_form.details.sys_rolename')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.sys_rolename.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.sys_rolename" @enter="onEnter($event)" unit="" :disabled="detailsModel.sys_rolename.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.memo.visible" :style="{}" :md="{ span: 12, offset: 0 }" :lg="{ span: 24, offset: 0 }" :xl="{ span: 12, offset: 0 }">
<i-col v-show="detailsModel.prolename.visible" :style="{}" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item name='prolename' :itemRules="this.rules().prolename" class='' :caption="$t('entities.sysrole.main_form.details.prolename')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.prolename.error" :isEmptyCaption="false" labelPos="LEFT">
<app-picker
:formState="formState"
:data="data"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.prolename.disabled"
name='prolename'
deMajorField='rolename'
deKeyField='sysrole'
:service="service"
:acParams="{ serviceName: 'SysRoleService', interfaceName: 'FetchDefault'}"
valueitem='proleid'
:value="data.prolename"
editortype=""
:pickupView="{ viewname: 'sys-role-pickup-view', title: $t('entities.sysrole.views.pickupview.title'), deResParameters: [], parameters: [{ pathName: 'sysroles', parameterName: 'sysrole' }, { pathName: 'pickupview', parameterName: 'pickupview' } ], placement:'' }"
style=""
@formitemvaluechange="onFormItemValueChange">
</app-picker>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.memo.visible" :style="{}" :md="{ span: 8, offset: 0 }" :lg="{ span: 24, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item name='memo' :itemRules="this.rules().memo" class='' :caption="$t('entities.sysrole.main_form.details.memo')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.memo.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.memo" @enter="onEnter($event)" unit="" :disabled="detailsModel.memo.disabled" type='text' style=""></input-box>
......@@ -448,8 +475,10 @@ export default class MainBase extends Vue implements ControlInterface {
srfdeid: null,
srfsourcekey: null,
sys_rolename: null,
prolename: null,
memo: null,
sys_roleid: null,
proleid: null,
sysrole:null,
};
......@@ -547,6 +576,12 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: '角色名称 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '角色名称 值不能为空', trigger: 'blur' },
],
prolename: [
{ type: 'string', message: '父角色名称 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '父角色名称 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '父角色名称 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '父角色名称 值不能为空', trigger: 'blur' },
],
memo: [
{ type: 'string', message: '备注 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '备注 值必须为字符串类型', trigger: 'blur' },
......@@ -559,6 +594,12 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: '角色标识 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '角色标识 值不能为空', trigger: 'blur' },
],
proleid: [
{ type: 'string', message: '父角色标识 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '父角色标识 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '父角色标识 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '父角色标识 值不能为空', trigger: 'blur' },
],
}
}
......@@ -644,10 +685,14 @@ export default class MainBase extends Vue implements ControlInterface {
srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
,
sys_rolename: new FormItemModel({ caption: '角色名称', detailType: 'FORMITEM', name: 'sys_rolename', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
,
prolename: new FormItemModel({ caption: '父角色名称', detailType: 'FORMITEM', name: 'prolename', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
,
memo: new FormItemModel({ caption: '备注', detailType: 'FORMITEM', name: 'memo', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
,
sys_roleid: new FormItemModel({ caption: '角色标识', detailType: 'FORMITEM', name: 'sys_roleid', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
,
proleid: new FormItemModel({ caption: '父角色标识', detailType: 'FORMITEM', name: 'proleid', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
,
};
......@@ -759,6 +804,18 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'sys_rolename', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 prolename 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.prolename')
onProlenameChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'prolename', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 memo 值
*
......@@ -783,6 +840,18 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'sys_roleid', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 proleid 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.proleid')
onProleidChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'proleid', newVal: newVal, oldVal: oldVal });
}
/**
* 显示更多模式切换操作
......@@ -854,6 +923,8 @@ export default class MainBase extends Vue implements ControlInterface {
}
......
app_Web/src/widgets/sys-role/main-form/main-form-model.ts
浏览文件 @ c319fd3e
......@@ -60,6 +60,11 @@ export default class MainModel {
prop: 'rolename',
dataType: 'TEXT',
},
{
name: 'prolename',
prop: 'prolename',
dataType: 'PICKUPTEXT',
},
{
name: 'memo',
prop: 'memo',
......@@ -70,6 +75,11 @@ export default class MainModel {
prop: 'roleid',
dataType: 'GUID',
},
{
name: 'proleid',
prop: 'proleid',
dataType: 'PICKUP',
},
{
name: 'sysrole',
prop: 'roleid',
......
app_Web/src/widgets/sys-role/main-form/main-form-service.ts
浏览文件 @ c319fd3e
......@@ -82,6 +82,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, 'SysRoleService') && Object.is(interfaceName, 'FetchDefault')) {
return this.doItems(this.appEntityService.FetchDefault(JSON.parse(JSON.stringify(context)), data, isloading), 'roleid', 'sysrole');
}
return Promise.reject([])
}
......
app_Web/src/widgets/sys-role/main-grid/main-grid-model.ts
浏览文件 @ c319fd3e
......@@ -41,6 +41,11 @@ export default class MainModel {
prop: 'roleid',
dataType: 'GUID',
},
{
name: 'proleid',
prop: 'proleid',
dataType: 'PICKUP',
},
{
name: 'updatedate',
prop: 'updatedate',
......
app_Web/src/widgets/sys-role/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ c319fd3e
......@@ -24,6 +24,12 @@ export default class MPickupViewpickupviewpanelModel {
{
name: 'memo',
},
{
name: 'proleid',
},
{
name: 'prolename',
},
{
name: 'createdate',
},
......
app_Web/src/widgets/sys-role/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ c319fd3e
......@@ -24,6 +24,12 @@ export default class PickupViewpickupviewpanelModel {
{
name: 'memo',
},
{
name: 'proleid',
},
{
name: 'prolename',
},
{
name: 'createdate',
},
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/domain/SysRole.java
浏览文件 @ c319fd3e
......@@ -54,6 +54,20 @@ public class SysRole extends EntityClient implements Serializable {
@JsonProperty("memo")
private String memo;
/**
* 父角色标识
*/
@JSONField(name = "proleid")
@JsonProperty("proleid")
private String proleid;
/**
* 父角色名称
*/
@JSONField(name = "prolename")
@JsonProperty("prolename")
private String prolename;
/**
* 建立时间
*/
......@@ -73,6 +87,13 @@ public class SysRole extends EntityClient implements Serializable {
private Timestamp updatedate;
/**
* 父角色
*/
@JSONField(name = "parent")
@JsonProperty("parent")
private cn.ibizlab.core.uaa.domain.SysRole parent;
......@@ -92,6 +113,14 @@ public class SysRole extends EntityClient implements Serializable {
this.modify("memo",memo);
}
/**
* 设置 [父角色标识]
*/
public void setProleid(String proleid){
this.proleid = proleid ;
this.modify("proleid",proleid);
}
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/filter/SysRoleSearchContext.java
浏览文件 @ c319fd3e
......@@ -31,6 +31,12 @@ public class SysRoleSearchContext extends SearchContextBase {
private String n_sys_rolename_like;//[角色名称]
private String n_proleid_eq;//[父角色标识]
private String n_prolename_eq;//[父角色名称]
private String n_prolename_like;//[父角色名称]
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/service/ISysRoleService.java
浏览文件 @ c319fd3e
......@@ -39,6 +39,9 @@ public interface ISysRoleService{
@CacheEvict(value="sysrole",allEntries=true)
void saveBatch(List<SysRole> list) ;
Page<SysRole> searchDefault(SysRoleSearchContext context) ;
List<SysRole> selectByProleid(String roleid) ;
@CacheEvict(value="sysrole",allEntries=true)
void removeByProleid(String roleid) ;
}
......
ibzrt-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysRoleServiceImpl.java
浏览文件 @ c319fd3e
......@@ -118,6 +118,24 @@ public class SysRoleServiceImpl implements ISysRoleService {
@Override
public List<SysRole> selectByProleid(String roleid) {
SysRoleSearchContext context=new SysRoleSearchContext();
context.setSize(Integer.MAX_VALUE);
context.setN_proleid_eq(roleid);
return sysRoleFeignClient.searchDefault(context).getContent();
}
@Override
public void removeByProleid(String roleid) {
Set<String> delIds=new HashSet<String>();
for(SysRole before:selectByProleid(roleid)){
delIds.add(before.getRoleid());
}
if(delIds.size()>0)
this.removeBatch(delIds);
}
/**
......
ibzrt-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ c319fd3e
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<!--输出实体[IBZEMP]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ibzemp-10-1">
<createTable tableName="IBZEMP">
<column name="USERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_IBZEMP_USERID"/>
</column>
<column name="USERNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="PERSONNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="USERCODE" remarks="" type="VARCHAR(100)">
</column>
<column name="LOGINNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="PASSWORD" remarks="" type="VARCHAR(100)">
</column>
<column name="DOMAINS" remarks="" type="VARCHAR(100)">
</column>
<column name="MDEPTID" remarks="" type="VARCHAR(100)">
</column>
<column name="MDEPTCODE" remarks="" type="VARCHAR(100)">
</column>
<column name="MDEPTNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="BCODE" remarks="" type="VARCHAR(100)">
</column>
<column name="POSTID" remarks="" type="VARCHAR(100)">
</column>
<column name="POSTCODE" remarks="" type="VARCHAR(100)">
</column>
<column name="POSTNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="ORGID" remarks="" type="VARCHAR(100)">
</column>
<column name="ORGCODE" remarks="" type="VARCHAR(100)">
</column>
<column name="ORGNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="NICKNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="SEX" remarks="" type="VARCHAR(20)">
</column>
<column name="CERTCODE" remarks="" type="VARCHAR(100)">
</column>
<column name="PHONE" remarks="" type="VARCHAR(100)">
</column>
<column name="BIRTHDAY" remarks="" type="DATETIME">
</column>
<column name="EMAIL" remarks="" type="VARCHAR(100)">
</column>
<column name="AVATAR" remarks="" type="VARCHAR(100)">
</column>
<column name="ADDR" remarks="" type="VARCHAR(255)">
</column>
<column name="USERICON" remarks="" type="VARCHAR(255)">
</column>
<column name="IPADDR" remarks="" type="VARCHAR(100)">
</column>
<column name="THEME" remarks="" type="VARCHAR(100)">
</column>
<column name="LANG" remarks="" type="VARCHAR(100)">
</column>
<column name="FONTSIZE" remarks="" type="VARCHAR(10)">
</column>
<column name="MEMO" remarks="" type="VARCHAR(255)">
</column>
<column name="RESERVER" remarks="" type="VARCHAR(255)">
</column>
<column name="SHOWORDER" remarks="" type="INT">
</column>
<column name="ENABLE" remarks="" type="INT">
</column>
<column name="CREATEDATE" remarks="" type="DATETIME">
</column>
<column name="UPDATEDATE" remarks="" type="DATETIME">
</column>
</createTable>
</changeSet>
<!--输出实体[IBZEMP]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-ibzemp-10-2">
<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-10-3">
<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>
<changeSet author="a_A_5d9d78509" id="fk-ibzemp-10-4">
<addForeignKeyConstraint baseColumnNames="POSTID" baseTableName="IBZEMP" constraintName="DER1N_IBZEMP_IBZPOST_POSTID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="POSTID" referencedTableName="IBZPOST" validate="true"/>
</changeSet>
</databaseChangeLog>
!!!!模版产生代码错误:----
Tip: If the failing expression is known to be legally refer to something that's sometimes null or missing, either specify a default value like myOptionalVar!myDefault, or use <#if myOptionalVar??>when-present<#else>when-missing</#if>. (These only cover the last step of the expression; to cover the whole expression, use parenthesis: (myOptionalVar.foo)!myDefault, (myOptionalVar.foo)??
----
----
FTL stack trace ("~" means nesting-related):
- Failed at: ${dbinst.getUserName()} [in template "CODETEMPL_zh_CN" at line 28, column 24]
----
\ No newline at end of file
ibzrt-provider/ibzrt-provider-api/src/main/java/cn/ibizlab/api/dto/SysRoleDTO.java
浏览文件 @ c319fd3e
......@@ -47,6 +47,22 @@ public class SysRoleDTO extends DTOBase implements Serializable {
@JsonProperty("memo")
private String memo;
/**
* 属性 [PROLEID]
*
*/
@JSONField(name = "proleid")
@JsonProperty("proleid")
private String proleid;
/**
* 属性 [PROLENAME]
*
*/
@JSONField(name = "prolename")
@JsonProperty("prolename")
private String prolename;
/**
* 属性 [CREATEDATE]
*
......@@ -82,6 +98,14 @@ public class SysRoleDTO extends DTOBase implements Serializable {
this.modify("memo",memo);
}
/**
* 设置 [PROLEID]
*/
public void setProleid(String proleid){
this.proleid = proleid ;
this.modify("proleid",proleid);
}
}
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或