Skip to content

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

ibizdev提交

上级 0a257401
显示空白字符变更
内嵌 并排
正在显示 包含 46 行增加 和 35 行删除
app_web/src/locale/lanres/sys-permission/sys-permission_en_US.ts
浏览文件 @ b8ec2915
...@@ -54,8 +54,9 @@ export default { ...@@ -54,8 +54,9 @@ export default {
columns: { columns: {
sys_permissionid: "资源标识", sys_permissionid: "资源标识",
sys_permissionname: "资源名称", sys_permissionname: "资源名称",
type: "资源类别", psdataentity: "实体",
systemid: "系统标识", psdedatarange: "数据范围",
psdedataset: "数据集",
}, },
uiactions: { uiactions: {
}, },
......
app_web/src/locale/lanres/sys-permission/sys-permission_zh_CN.ts
浏览文件 @ b8ec2915
...@@ -53,8 +53,9 @@ export default { ...@@ -53,8 +53,9 @@ export default {
columns: { columns: {
sys_permissionid: '资源标识', sys_permissionid: '资源标识',
sys_permissionname: '资源名称', sys_permissionname: '资源名称',
type: '资源类别', psdataentity: '实体',
systemid: '系统标识', psdedatarange: '数据范围',
psdedataset: '数据集',
}, },
uiactions: { uiactions: {
}, },
......
app_web/src/widgets/sys-permission/default-searchform/default-searchform-base.vue
浏览文件 @ b8ec2915
...@@ -6,19 +6,19 @@ ...@@ -6,19 +6,19 @@
<row> <row>
<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 }"> <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-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> <input-box v-model="data.n_psdataentity_like" @enter="onEnter($event)" :disabled="detailsModel.n_psdataentity_like.disabled" type='text' style=""></input-box>
</app-form-item> </app-form-item>
</i-col> </i-col>
<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 }"> <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-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> <input-box v-model="data.n_psdedataset_like" @enter="onEnter($event)" :disabled="detailsModel.n_psdedataset_like.disabled" type='text' style=""></input-box>
</app-form-item> </app-form-item>
</i-col> </i-col>
<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 }"> <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-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> <input-box v-model="data.n_psdedatarange_like" @enter="onEnter($event)" :disabled="detailsModel.n_psdedatarange_like.disabled" type='text' style=""></input-box>
</app-form-item> </app-form-item>
</i-col> </i-col>
......
app_web/src/widgets/sys-permission/main-grid/main-grid-base.vue
浏览文件 @ b8ec2915
...@@ -30,19 +30,24 @@ ...@@ -30,19 +30,24 @@
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('type')"> <template v-if="getColumnState('psdataentity')">
<el-table-column show-overflow-tooltip :prop="'type'" :label="$t('entities.sys_permission.main_grid.columns.type')" :width="250" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'psdataentity'" :label="$t('entities.sys_permission.main_grid.columns.psdataentity')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot="{row,column}"> <template v-slot="{row,column}">
<template > <span>{{row.psdataentity}}</span>
<codelist :value="row.type" tag='CLPermissionType' codelistType='STATIC' ></codelist>
</template> </template>
</el-table-column>
</template>
<template v-if="getColumnState('psdedatarange')">
<el-table-column show-overflow-tooltip :prop="'psdedatarange'" :label="$t('entities.sys_permission.main_grid.columns.psdedatarange')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot="{row,column}">
<span>{{row.psdedatarange}}</span>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('systemid')"> <template v-if="getColumnState('psdedataset')">
<el-table-column show-overflow-tooltip :prop="'systemid'" :label="$t('entities.sys_permission.main_grid.columns.systemid')" :width="250" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'psdedataset'" :label="$t('entities.sys_permission.main_grid.columns.psdedataset')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot="{row,column}"> <template v-slot="{row,column}">
<span>{{row.systemid}}</span> <span>{{row.psdedataset}}</span>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
...@@ -518,16 +523,23 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -518,16 +523,23 @@ export default class MainBase extends Vue implements ControlInterface {
util: 'PX' util: 'PX'
}, },
{ {
name: 'type', name: 'psdataentity',
label: '资源类别', label: '实体',
langtag: 'entities.sys_permission.main_grid.columns.type', langtag: 'entities.sys_permission.main_grid.columns.psdataentity',
show: true, show: true,
util: 'px' util: 'px'
}, },
{ {
name: 'systemid', name: 'psdedatarange',
label: '系统标识', label: '数据范围',
langtag: 'entities.sys_permission.main_grid.columns.systemid', langtag: 'entities.sys_permission.main_grid.columns.psdedatarange',
show: true,
util: 'px'
},
{
name: 'psdedataset',
label: '数据集',
langtag: 'entities.sys_permission.main_grid.columns.psdedataset',
show: true, show: true,
util: 'px' util: 'px'
}, },
...@@ -846,14 +858,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -846,14 +858,6 @@ export default class MainBase extends Vue implements ControlInterface {
*/ */
public async formatExcelData(filterVal:any, jsonData:any) { public async formatExcelData(filterVal:any, jsonData:any) {
let codelistColumns:Array<any> = [ let codelistColumns:Array<any> = [
{
name: 'type',
srfkey: 'CLPermissionType',
codelistType : 'STATIC',
renderMode: 'other',
textSeparator: '、',
valueSeparator: ';',
},
]; ];
let _this = this; let _this = this;
for (const codelist of codelistColumns) { for (const codelist of codelistColumns) {
......
app_web/src/widgets/sys-permission/main-grid/main-grid-model.ts
浏览文件 @ b8ec2915
...@@ -27,8 +27,8 @@ export default class MainModel { ...@@ -27,8 +27,8 @@ export default class MainModel {
}else{ }else{
return [ return [
{ {
name: 'systemid', name: 'psdataentity',
prop: 'pssystemid', prop: 'psdataentity',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
...@@ -37,9 +37,14 @@ export default class MainModel { ...@@ -37,9 +37,14 @@ export default class MainModel {
dataType: 'GUID', dataType: 'GUID',
}, },
{ {
name: 'type', name: 'psdedatarange',
prop: 'type', prop: 'psdedatarange',
dataType: 'SSCODELIST', dataType: 'TEXT',
},
{
name: 'psdedataset',
prop: 'psdedataset',
dataType: 'TEXT',
}, },
{ {
name: 'srfmajortext', name: 'srfmajortext',
......
ibzuaa-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ b8ec2915
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
</createTable> </createTable>
</changeSet> </changeSet>
<!--输出实体[SYS_PERMISSION]数据结构 --> <!--输出实体[SYS_PERMISSION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_permission-54-6"> <changeSet author="a_A_5d9d78509" id="tab-sys_permission-60-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 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或