提交 523adc94 编写于 作者: ibizdev's avatar ibizdev

ibizdev提交

上级 552189fd
[ [
{ {
"srfkey": "CLPermissionType",
"emptytext": "未定义",
"codelisttype":"static",
"items": [
{
"id": "OPPRIV",
"label": "数据对象能力",
"text": "数据对象能力",
"value": "OPPRIV",
"disabled": false
}
, {
"id": "UNIRES",
"label": "统一资源",
"text": "统一资源",
"value": "UNIRES",
"disabled": false
}
]
},
{
"srfkey": "CLSourceType", "srfkey": "CLSourceType",
"emptytext": "未定义", "emptytext": "未定义",
"codelisttype":"static", "codelisttype":"static",
......
export default { export default {
CLPermissionType: {
'OPPRIV': '数据对象能力',
'UNIRES': '统一资源',
empty: '',
},
CLSourceType: { CLSourceType: {
'DEACTION': '实体行为', 'DEACTION': '实体行为',
'DATASET': '数据集合', 'DATASET': '数据集合',
......
export default { export default {
CLPermissionType: {
'OPPRIV': '数据对象能力',
'UNIRES': '统一资源',
empty: '',
},
CLSourceType: { CLSourceType: {
'DEACTION': '实体行为', 'DEACTION': '实体行为',
'DATASET': '数据集合', 'DATASET': '数据集合',
......
...@@ -73,6 +73,7 @@ export default { ...@@ -73,6 +73,7 @@ export default {
details: { details: {
formpage1: "常规条件", formpage1: "常规条件",
n_sys_permissionname_like: "资源名称(%)", n_sys_permissionname_like: "资源名称(%)",
n_permissiontype_eq: "资源类别(=)",
n_pssourcetype_eq: "来源(=)", n_pssourcetype_eq: "来源(=)",
n_pssourcename_like: "来源名称(%)", n_pssourcename_like: "来源名称(%)",
}, },
......
...@@ -72,6 +72,7 @@ export default { ...@@ -72,6 +72,7 @@ export default {
details: { details: {
formpage1: '常规条件', formpage1: '常规条件',
n_sys_permissionname_like: '资源名称(%)', n_sys_permissionname_like: '资源名称(%)',
n_permissiontype_eq: '资源类别(=)',
n_pssourcetype_eq: '来源(=)', n_pssourcetype_eq: '来源(=)',
n_pssourcename_like: '来源名称(%)', n_pssourcename_like: '来源名称(%)',
}, },
......
...@@ -8,6 +8,29 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => { ...@@ -8,6 +8,29 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
let status = MockAdapter.mockStatus(config); let status = MockAdapter.mockStatus(config);
return [status, [ return [status, [
{ {
srfkey: 'CLPermissionType',
emptytext: '未定义',
"codelisttype":"static",
items: [
{
id: 'OPPRIV',
label: '数据对象能力',
text: '数据对象能力',
value: 'OPPRIV',
disabled: false,
},
{
id: 'UNIRES',
label: '统一资源',
text: '统一资源',
value: 'UNIRES',
disabled: false,
},
]
},
{
srfkey: 'CLSourceType', srfkey: 'CLSourceType',
emptytext: '未定义', emptytext: '未定义',
"codelisttype":"static", "codelisttype":"static",
......
<template> <template>
<div class="view-container depickupview sys-permissionpickup-view"> <div class="view-container depickupview sys-permissionpickup-view">
<app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_permissionpickupview"></app-studioaction> <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_permissionpickupview"></app-studioaction>
<card class='view-card' :dis-hover="true" :padding="0" :bordered="false"> <card class='view-card view-no-caption' :dis-hover="true" :padding="0" :bordered="false">
<div class="content-container pickup-view"> <div class="content-container pickup-view">
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
......
<template> <template>
<div class="view-container depickupview sys-role-permissionpickup-view"> <div class="view-container depickupview sys-role-permissionpickup-view">
<app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_role_permissionpickupview"></app-studioaction> <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_role_permissionpickupview"></app-studioaction>
<card class='view-card' :dis-hover="true" :padding="0" :bordered="false"> <card class='view-card view-no-caption' :dis-hover="true" :padding="0" :bordered="false">
<div class="content-container pickup-view"> <div class="content-container pickup-view">
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
......
<template> <template>
<div class="view-container depickupview sys-rolepickup-view"> <div class="view-container depickupview sys-rolepickup-view">
<app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_rolepickupview"></app-studioaction> <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_rolepickupview"></app-studioaction>
<card class='view-card' :dis-hover="true" :padding="0" :bordered="false"> <card class='view-card view-no-caption' :dis-hover="true" :padding="0" :bordered="false">
<div class="content-container pickup-view"> <div class="content-container pickup-view">
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
......
<template> <template>
<div class="view-container depickupview sys-user-rolepickup-view"> <div class="view-container depickupview sys-user-rolepickup-view">
<app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_user_rolepickupview"></app-studioaction> <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_user_rolepickupview"></app-studioaction>
<card class='view-card' :dis-hover="true" :padding="0" :bordered="false"> <card class='view-card view-no-caption' :dis-hover="true" :padding="0" :bordered="false">
<div class="content-container pickup-view"> <div class="content-container pickup-view">
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
......
<template> <template>
<div class="view-container depickupview sys-userpickup-view"> <div class="view-container depickupview sys-userpickup-view">
<app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_userpickupview"></app-studioaction> <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_userpickupview"></app-studioaction>
<card class='view-card' :dis-hover="true" :padding="0" :bordered="false"> <card class='view-card view-no-caption' :dis-hover="true" :padding="0" :bordered="false">
<div class="content-container pickup-view"> <div class="content-container pickup-view">
<view_pickupviewpanel <view_pickupviewpanel
:viewState="viewState" :viewState="viewState"
......
...@@ -9,6 +9,12 @@ ...@@ -9,6 +9,12 @@
<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> <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>
</app-form-item> </app-form-item>
</i-col>
<i-col v-show="detailsModel.n_permissiontype_eq.visible" :style="{}" :md="{ span: 6, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<app-form-item name='n_permissiontype_eq' :itemRules="this.rules.n_permissiontype_eq" class='' :caption="$t('entities.sys_permission.default_searchform.details.n_permissiontype_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_permissiontype_eq.error" :isEmptyCaption="false" labelPos="LEFT">
<dropdown-list v-model="data.n_permissiontype_eq" :data="data" :itemParam="{}" :disabled="detailsModel.n_permissiontype_eq.disabled" tag='CLPermissionType' codelistType='STATIC' placeholder='请选择...' style="width:100px;"></dropdown-list>
</app-form-item>
</i-col> </i-col>
<i-col v-show="detailsModel.n_pssourcetype_eq.visible" :style="{}" :md="{ span: 6, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }"> <i-col v-show="detailsModel.n_pssourcetype_eq.visible" :style="{}" :md="{ span: 6, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
<app-form-item name='n_pssourcetype_eq' :itemRules="this.rules.n_pssourcetype_eq" class='' :caption="$t('entities.sys_permission.default_searchform.details.n_pssourcetype_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_pssourcetype_eq.error" :isEmptyCaption="false" labelPos="LEFT"> <app-form-item name='n_pssourcetype_eq' :itemRules="this.rules.n_pssourcetype_eq" class='' :caption="$t('entities.sys_permission.default_searchform.details.n_pssourcetype_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_pssourcetype_eq.error" :isEmptyCaption="false" labelPos="LEFT">
...@@ -263,6 +269,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -263,6 +269,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/ */
protected data: any = { protected data: any = {
n_sys_permissionname_like: null, n_sys_permissionname_like: null,
n_permissiontype_eq: null,
n_pssourcetype_eq: null, n_pssourcetype_eq: null,
n_pssourcename_like: null, n_pssourcename_like: null,
}; };
...@@ -280,6 +287,12 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -280,6 +287,12 @@ export default class DefaultBase 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' },
], ],
n_permissiontype_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_pssourcetype_eq: [ n_pssourcetype_eq: [
{ type: 'string', message: '来源(=) 值必须为字符串类型', trigger: 'change' }, { type: 'string', message: '来源(=) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '来源(=) 值必须为字符串类型', trigger: 'blur' }, { type: 'string', message: '来源(=) 值必须为字符串类型', trigger: 'blur' },
...@@ -304,6 +317,8 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -304,6 +317,8 @@ export default class DefaultBase extends Vue implements ControlInterface {
formpage1: new FormPageModel({ caption: '常规条件', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this }) 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_sys_permissionname_like: new FormItemModel({ caption: '资源名称(%)', detailType: 'FORMITEM', name: 'n_sys_permissionname_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
n_permissiontype_eq: new FormItemModel({ caption: '资源类别(=)', detailType: 'FORMITEM', name: 'n_permissiontype_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
n_pssourcetype_eq: new FormItemModel({ caption: '来源(=)', detailType: 'FORMITEM', name: 'n_pssourcetype_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) n_pssourcetype_eq: new FormItemModel({ caption: '来源(=)', detailType: 'FORMITEM', name: 'n_pssourcetype_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
...@@ -323,6 +338,18 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -323,6 +338,18 @@ export default class DefaultBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'n_sys_permissionname_like', newVal: newVal, oldVal: oldVal }); this.formDataChange({ name: 'n_sys_permissionname_like', newVal: newVal, oldVal: oldVal });
} }
/**
* 监控表单属性 n_permissiontype_eq 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof DefaultBase
*/
@Watch('data.n_permissiontype_eq')
onN_permissiontype_eqChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_permissiontype_eq', newVal: newVal, oldVal: oldVal });
}
/** /**
* 监控表单属性 n_pssourcetype_eq 值 * 监控表单属性 n_pssourcetype_eq 值
* *
...@@ -371,6 +398,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -371,6 +398,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
} }
/** /**
......
...@@ -30,6 +30,11 @@ export default class DefaultModel { ...@@ -30,6 +30,11 @@ export default class DefaultModel {
prop: 'permissionname', prop: 'permissionname',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{
name: 'n_permissiontype_eq',
prop: 'permissiontype',
dataType: 'SSCODELIST',
},
{ {
name: 'n_pssourcetype_eq', name: 'n_pssourcetype_eq',
prop: 'pssourcetype', prop: 'pssourcetype',
......
...@@ -70,6 +70,11 @@ export default class MainModel { ...@@ -70,6 +70,11 @@ export default class MainModel {
prop: 'n_sys_permissionname_like', prop: 'n_sys_permissionname_like',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{
name: 'n_permissiontype_eq',
prop: 'n_permissiontype_eq',
dataType: 'SSCODELIST',
},
{ {
name: 'n_pssourcetype_eq', name: 'n_pssourcetype_eq',
prop: 'n_pssourcetype_eq', prop: 'n_pssourcetype_eq',
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
<hudson.tasks.Shell> <hudson.tasks.Shell>
<command> <command>
BUILD_ID=DONTKILLME BUILD_ID=DONTKILLME
echo "registry.cn-shanghai.aliyuncs.com/ibizsys"
source /etc/profile source /etc/profile
rm -rf ibzuaa rm -rf ibzuaa
git clone -b master $para2 ibzuaa/ git clone -b master $para2 ibzuaa/
......
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
</createTable> </createTable>
</changeSet> </changeSet>
<!--输出实体[SYS_PERMISSION]数据结构 --> <!--输出实体[SYS_PERMISSION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_permission-165-6"> <changeSet author="a_A_5d9d78509" id="tab-sys_permission-175-6">
<createTable tableName="IBZPERMISSION"> <createTable tableName="IBZPERMISSION">
<column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)"> <column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_PERMISSION_SYS_PERMISSI"/> <constraints primaryKey="true" primaryKeyName="PK_SYS_PERMISSION_SYS_PERMISSI"/>
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册