Skip to content

I
ibzuaa
提交 0a257401 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibizdev提交

上级 3cb6401e
隐藏空白字符变更
内嵌 并排
正在显示 包含 157 行增加 和 115 行删除
app_web/src/locale/lanres/sys-permission/sys-permission_en_US.ts
浏览文件 @ 0a257401
......@@ -63,10 +63,9 @@ export default {
default_searchform: {
details: {
formpage1: "常规条件",
n_sys_permissionname_like: "资源名称(%)",
n_type_eq: "资源类别(=)",
n_systemid_eq: "系统标识(=)",
n_sys_permissionid_like: "资源标识(%)",
n_psdataentity_like: "实体(%)",
n_psdedataset_like: "数据集(%)",
n_psdedatarange_like: "数据范围(%)",
},
uiactions: {
},
......
app_web/src/locale/lanres/sys-permission/sys-permission_zh_CN.ts
浏览文件 @ 0a257401
......@@ -62,10 +62,9 @@ export default {
default_searchform: {
details: {
formpage1: '常规条件',
n_sys_permissionname_like: '资源名称(%)',
n_type_eq: '资源类别(=)',
n_systemid_eq: '系统标识(=)',
n_sys_permissionid_like: '资源标识(%)',
n_psdataentity_like: '实体(%)',
n_psdedataset_like: '数据集(%)',
n_psdedatarange_like: '数据范围(%)',
},
uiactions: {
},
......
app_web/src/widgets/sys-permission/default-drbar/default-drbar-model.ts
浏览文件 @ 0a257401
......@@ -36,6 +36,15 @@ export default class DefaultModel {
{
name: 'updatedate',
},
{
name: 'psdataentity',
},
{
name: 'psdedataset',
},
{
name: 'psdedatarange',
},
]
}
......
app_web/src/widgets/sys-permission/default-searchform/default-searchform-base.vue
浏览文件 @ 0a257401
......@@ -4,27 +4,21 @@
<row>
<i-col span="20">
<row>
<i-col v-show="detailsModel.n_sys_permissionname_like.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='n_sys_permissionname_like' :itemRules="this.rules.n_sys_permissionname_like" class='' :caption="$t('entities.sys_permission.default_searchform.details.n_sys_permissionname_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_sys_permissionname_like.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.n_sys_permissionname_like" @enter="onEnter($event)" :disabled="detailsModel.n_sys_permissionname_like.disabled" type='text' style="width:100px;"></input-box>
<i-col v-show="detailsModel.n_psdataentity_like.visible" :style="{}" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item name='n_psdataentity_like' :itemRules="this.rules.n_psdataentity_like" class='' :caption="$t('entities.sys_permission.default_searchform.details.n_psdataentity_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_psdataentity_like.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span :value="data.n_psdataentity_like" style="width:100px;"></app-span>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.n_type_eq.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='n_type_eq' :itemRules="this.rules.n_type_eq" class='' :caption="$t('entities.sys_permission.default_searchform.details.n_type_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_type_eq.error" :isEmptyCaption="false" labelPos="LEFT">
<dropdown-list v-model="data.n_type_eq" :data="data" :itemParam="{}" :disabled="detailsModel.n_type_eq.disabled" tag='CLPermissionType' codelistType='STATIC' placeholder='请选择...' style="width:100px;"></dropdown-list>
<i-col v-show="detailsModel.n_psdedataset_like.visible" :style="{}" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item name='n_psdedataset_like' :itemRules="this.rules.n_psdedataset_like" class='' :caption="$t('entities.sys_permission.default_searchform.details.n_psdedataset_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_psdedataset_like.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span :value="data.n_psdedataset_like" style="width:100px;"></app-span>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.n_systemid_eq.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='n_systemid_eq' :itemRules="this.rules.n_systemid_eq" class='' :caption="$t('entities.sys_permission.default_searchform.details.n_systemid_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_systemid_eq.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.n_systemid_eq" @enter="onEnter($event)" :disabled="detailsModel.n_systemid_eq.disabled" type='text' style="width:100px;"></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.n_sys_permissionid_like.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='n_sys_permissionid_like' :itemRules="this.rules.n_sys_permissionid_like" class='' :caption="$t('entities.sys_permission.default_searchform.details.n_sys_permissionid_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_sys_permissionid_like.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.n_sys_permissionid_like" @enter="onEnter($event)" :disabled="detailsModel.n_sys_permissionid_like.disabled" type='text' style=""></input-box>
<i-col v-show="detailsModel.n_psdedatarange_like.visible" :style="{}" :md="{ span: 8, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item name='n_psdedatarange_like' :itemRules="this.rules.n_psdedatarange_like" class='' :caption="$t('entities.sys_permission.default_searchform.details.n_psdedatarange_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_psdedatarange_like.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span :value="data.n_psdedatarange_like" style="width:100px;"></app-span>
</app-form-item>
</i-col>
......@@ -268,10 +262,9 @@ export default class DefaultBase extends Vue implements ControlInterface {
* @memberof DefaultBase
*/
protected data: any = {
n_sys_permissionname_like: null,
n_type_eq: null,
n_systemid_eq: null,
n_sys_permissionid_like: null,
n_psdataentity_like: null,
n_psdedataset_like: null,
n_psdedatarange_like: null,
};
/**
......@@ -281,29 +274,23 @@ export default class DefaultBase extends Vue implements ControlInterface {
* @memberof DefaultBase
*/
protected rules: any = {
n_sys_permissionname_like: [
{ type: 'string', message: '资源名称(%) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '资源名称(%) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '资源名称(%) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '资源名称(%) 值不能为空', trigger: 'blur' },
],
n_type_eq: [
{ type: 'string', message: '资源类别(=) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '资源类别(=) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '资源类别(=) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '资源类别(=) 值不能为空', trigger: 'blur' },
n_psdataentity_like: [
{ type: 'string', message: '实体(%) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '实体(%) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '实体(%) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '实体(%) 值不能为空', trigger: 'blur' },
],
n_systemid_eq: [
{ type: 'string', message: '系统标识(=) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '系统标识(=) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '系统标识(=) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '系统标识(=) 值不能为空', trigger: 'blur' },
n_psdedataset_like: [
{ type: 'string', message: '数据集(%) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '数据集(%) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '数据集(%) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '数据集(%) 值不能为空', trigger: 'blur' },
],
n_sys_permissionid_like: [
{ type: 'string', message: '资源标识(%) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '资源标识(%) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '资源标识(%) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '资源标识(%) 值不能为空', trigger: 'blur' },
n_psdedatarange_like: [
{ type: 'string', message: '数据范围(%) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '数据范围(%) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '数据范围(%) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '数据范围(%) 值不能为空', trigger: 'blur' },
],
}
......@@ -316,62 +303,48 @@ export default class DefaultBase extends Vue implements ControlInterface {
protected detailsModel: any = {
formpage1: new FormPageModel({ caption: '常规条件', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this })
,
n_sys_permissionname_like: new FormItemModel({ caption: '资源名称(%)', detailType: 'FORMITEM', name: 'n_sys_permissionname_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
n_psdataentity_like: new FormItemModel({ caption: '实体(%)', detailType: 'FORMITEM', name: 'n_psdataentity_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
n_type_eq: new FormItemModel({ caption: '资源类别(=)', detailType: 'FORMITEM', name: 'n_type_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
n_psdedataset_like: new FormItemModel({ caption: '数据集(%)', detailType: 'FORMITEM', name: 'n_psdedataset_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
n_systemid_eq: new FormItemModel({ caption: '系统标识(=)', detailType: 'FORMITEM', name: 'n_systemid_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
n_sys_permissionid_like: new FormItemModel({ caption: '资源标识(%)', detailType: 'FORMITEM', name: 'n_sys_permissionid_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
n_psdedatarange_like: new FormItemModel({ caption: '数据范围(%)', detailType: 'FORMITEM', name: 'n_psdedatarange_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
};
/**
* 监控表单属性 n_sys_permissionname_like 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof DefaultBase
*/
@Watch('data.n_sys_permissionname_like')
onN_sys_permissionname_likeChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_sys_permissionname_like', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 n_type_eq 值
* 监控表单属性 n_psdataentity_like 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof DefaultBase
*/
@Watch('data.n_type_eq')
onN_type_eqChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_type_eq', newVal: newVal, oldVal: oldVal });
@Watch('data.n_psdataentity_like')
onN_psdataentity_likeChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_psdataentity_like', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 n_systemid_eq 值
* 监控表单属性 n_psdedataset_like 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof DefaultBase
*/
@Watch('data.n_systemid_eq')
onN_systemid_eqChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_systemid_eq', newVal: newVal, oldVal: oldVal });
@Watch('data.n_psdedataset_like')
onN_psdedataset_likeChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_psdedataset_like', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 n_sys_permissionid_like 值
* 监控表单属性 n_psdedatarange_like 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof DefaultBase
*/
@Watch('data.n_sys_permissionid_like')
onN_sys_permissionid_likeChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_sys_permissionid_like', newVal: newVal, oldVal: oldVal });
@Watch('data.n_psdedatarange_like')
onN_psdedatarange_likeChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_psdedatarange_like', newVal: newVal, oldVal: oldVal });
}
......@@ -398,7 +371,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
}
/**
......
app_web/src/widgets/sys-permission/default-searchform/default-searchform-model.ts
浏览文件 @ 0a257401
......@@ -26,29 +26,19 @@ export default class DefaultModel {
dataType: 'TEXT',
},
{
name: 'n_sys_permissionname_like',
prop: 'permissionname',
name: 'n_psdataentity_like',
prop: 'psdataentity',
dataType: 'TEXT',
},
{
name: 'n_type_eq',
prop: 'type',
dataType: 'SSCODELIST',
},
{
name: 'n_systemid_eq',
prop: 'pssystemid',
name: 'n_psdedataset_like',
prop: 'psdedataset',
dataType: 'TEXT',
},
{
name: 'n_sys_permissionid_like',
prop: 'permissionid',
dataType: 'GUID',
},
{
name: 'sys_permission',
prop: 'permissionid',
dataType: 'FONTKEY',
name: 'n_psdedatarange_like',
prop: 'psdedatarange',
dataType: 'TEXT',
},
]
}
......
app_web/src/widgets/sys-permission/default-searchform/default-searchform-service.ts
浏览文件 @ 0a257401
......@@ -160,7 +160,6 @@ export default class DefaultService extends ControlService {
@Errorlog
public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data);
Object.assign(Data,{permissionid: data.permissionid, srffrontuf: '1'});
return new Promise((resolve: any, reject: any) => {
let result: Promise<any>;
const _appEntityService: any = this.appEntityService;
......
app_web/src/widgets/sys-permission/main-grid/main-grid-model.ts
浏览文件 @ 0a257401
......@@ -66,29 +66,19 @@ export default class MainModel {
prop: 'permissionid',
},
{
name: 'n_sys_permissionname_like',
prop: 'n_sys_permissionname_like',
name: 'n_psdataentity_like',
prop: 'n_psdataentity_like',
dataType: 'TEXT',
},
{
name: 'n_type_eq',
prop: 'n_type_eq',
dataType: 'SSCODELIST',
},
{
name: 'n_systemid_eq',
prop: 'n_systemid_eq',
name: 'n_psdedataset_like',
prop: 'n_psdedataset_like',
dataType: 'TEXT',
},
{
name: 'n_sys_permissionid_like',
prop: 'n_sys_permissionid_like',
dataType: 'GUID',
},
{
name: 'sys_permission',
prop: 'permissionid',
dataType: 'FONTKEY',
name: 'n_psdedatarange_like',
prop: 'n_psdedatarange_like',
dataType: 'TEXT',
},
{
......
app_web/src/widgets/sys-permission/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ 0a257401
......@@ -36,6 +36,15 @@ export default class MPickupViewpickupviewpanelModel {
{
name: 'updatedate',
},
{
name: 'psdataentity',
},
{
name: 'psdedataset',
},
{
name: 'psdedatarange',
},
]
}
......
app_web/src/widgets/sys-permission/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ 0a257401
......@@ -36,6 +36,15 @@ export default class PickupViewpickupviewpanelModel {
{
name: 'updatedate',
},
{
name: 'psdataentity',
},
{
name: 'psdedataset',
},
{
name: 'psdedatarange',
},
]
}
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_PERMISSION.java
浏览文件 @ 0a257401
......@@ -86,6 +86,27 @@ public class SYS_PERMISSION extends EntityMP implements Serializable {
@JSONField(name = "updatedate" , format="yyyy-MM-dd HH:mm:ss")
@JsonProperty("updatedate")
private Timestamp updatedate;
/**
* 实体
*/
@TableField(exist = false)
@JSONField(name = "psdataentity")
@JsonProperty("psdataentity")
private String psdataentity;
/**
* 数据集
*/
@TableField(exist = false)
@JSONField(name = "psdedataset")
@JsonProperty("psdedataset")
private String psdedataset;
/**
* 数据范围
*/
@TableField(exist = false)
@JSONField(name = "psdedatarange")
@JsonProperty("psdedatarange")
private String psdedatarange;
/**
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SYS_PERMISSIONSearchContext.java
浏览文件 @ 0a257401
......@@ -61,6 +61,27 @@ public class SYS_PERMISSIONSearchContext extends QueryWrapperContext<SYS_PERMISS
this.getSelectCond().eq("enable", n_enable_eq);
}
}
private String n_psdataentity_like;//[实体]
public void setN_psdataentity_like(String n_psdataentity_like) {
this.n_psdataentity_like = n_psdataentity_like;
if(!ObjectUtils.isEmpty(this.n_psdataentity_like)){
this.getSelectCond().like("psdataentity", n_psdataentity_like);
}
}
private String n_psdedataset_like;//[数据集]
public void setN_psdedataset_like(String n_psdedataset_like) {
this.n_psdedataset_like = n_psdedataset_like;
if(!ObjectUtils.isEmpty(this.n_psdedataset_like)){
this.getSelectCond().like("psdedataset", n_psdedataset_like);
}
}
private String n_psdedatarange_like;//[数据范围]
public void setN_psdedatarange_like(String n_psdedatarange_like) {
this.n_psdedatarange_like = n_psdedatarange_like;
if(!ObjectUtils.isEmpty(this.n_psdedatarange_like)){
this.getSelectCond().like("psdedatarange", n_psdedatarange_like);
}
}
/**
* 启用快速搜索
......
ibzuaa-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 0a257401
......@@ -112,7 +112,7 @@
</createTable>
</changeSet>
<!--输出实体[SYS_PERMISSION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_permission-35-6">
<changeSet author="a_A_5d9d78509" id="tab-sys_permission-54-6">
<createTable tableName="IBZPERMISSION">
<column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_PERMISSION_SYS_PERMISSI"/>
......
ibzuaa-core/src/main/resources/mapper/uaa/sys_permission/SYS_PERMISSIONMapper.xml
浏览文件 @ 0a257401
......@@ -26,7 +26,7 @@
<!--数据查询[Default]-->
<sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`ENABLE`, t1.`SYSTEMID`, t1.`SYS_PERMISSIONID`, t1.`SYS_PERMISSIONNAME`, t1.`TYPE`, t1.`UPDATEDATE` FROM `IBZPERMISSION` t1
<![CDATA[ SELECT t1.CREATEDATE, t1.ENABLE, t1.SYSTEMID, t1.SYS_PERMISSIONID, t1.SYS_PERMISSIONNAME, t1.TYPE, t1.UPDATEDATE, t2.PSDATAENTITYNAME as PSDATAENTITY, t2.PSDEDATASETNAME as PSDEDATASET, t2.PSDEDATARANGENAME as PSDEDATARANGE FROM IBZPERMISSION t1 LEFT JOIN ibzpsdeoppriv t2 on t1.SYS_PERMISSIONID=t2.SYS_PSDEOPPRIVID LEFT JOIN ibzpsappmenuitem t3 on t1.SYS_PERMISSIONID =t3.PSAPPMENUID
]]>
</sql>
......
ibzuaa-provider/ibzuaa-provider-uaaapi/src/main/java/cn/ibizlab/uaaapi/dto/SYS_PERMISSIONDTO.java
浏览文件 @ 0a257401
......@@ -81,6 +81,30 @@ public class SYS_PERMISSIONDTO extends DTOBase implements Serializable {
@JsonProperty("updatedate")
private Timestamp updatedate;
/**
* 属性 [PSDATAENTITY]
*
*/
@JSONField(name = "psdataentity")
@JsonProperty("psdataentity")
private String psdataentity;
/**
* 属性 [PSDEDATASET]
*
*/
@JSONField(name = "psdedataset")
@JsonProperty("psdedataset")
private String psdedataset;
/**
* 属性 [PSDEDATARANGE]
*
*/
@JSONField(name = "psdedatarange")
@JsonProperty("psdedatarange")
private String psdedatarange;
/**
* 设置 [SYS_PERMISSIONNAME]
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或