Skip to content

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

ibizdev提交

上级 8abfdea1
显示空白字符变更
内嵌 并排
正在显示 包含 250 行增加 和 682 行删除
app_web/public/assets/json/data-dictionary.json
浏览文件 @ 0a057306
[ [
{ {
"srfkey": "CLPermissionType", "srfkey": "CLSourceType",
"emptytext": "未定义", "emptytext": "未定义",
"codelisttype":"static", "codelisttype":"static",
"items": [ "items": [
{ {
"id": "0", "id": "DEACTION",
"label": "菜单", "label": "实体行为",
"text": "菜单", "text": "实体行为",
"value": "0", "value": "DEACTION",
"disabled": false "disabled": false
} }
, { , {
"id": "1", "id": "DATASET",
"label": "数据对象能力", "label": "数据集合",
"text": "数据对象能力", "text": "数据集合",
"value": "1", "value": "DATASET",
"disabled": false
}
, {
"id": "2",
"label": "统一资源",
"text": "统一资源",
"value": "2",
"disabled": false "disabled": false
} }
......
app_web/public/assets/json/view-config.json
浏览文件 @ 0a057306
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
"viewtag": "12f53853382743f095a6af867669d8c1" "viewtag": "12f53853382743f095a6af867669d8c1"
}, },
"sys_rolepickupgridview": { "sys_rolepickupgridview": {
"title": "角色表选择表格视图", "title": "角色选择表格视图",
"caption": "系统角色", "caption": "系统角色",
"viewtype": "DEPICKUPGRIDVIEW", "viewtype": "DEPICKUPGRIDVIEW",
"viewmodule": "uaa", "viewmodule": "uaa",
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
"viewtag": "42f3fa04c9dc77f235207bcbe6ac3888" "viewtag": "42f3fa04c9dc77f235207bcbe6ac3888"
}, },
"sys_roleeditview2": { "sys_roleeditview2": {
"title": "角色表编辑视图", "title": "角色编辑视图",
"caption": "系统角色", "caption": "系统角色",
"viewtype": "DEEDITVIEW2", "viewtype": "DEEDITVIEW2",
"viewmodule": "uaa", "viewmodule": "uaa",
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
"viewtag": "6cd33d562ef19ad47dd26b312b9a020e" "viewtag": "6cd33d562ef19ad47dd26b312b9a020e"
}, },
"sys_roleeditview": { "sys_roleeditview": {
"title": "角色表编辑视图", "title": "角色编辑视图",
"caption": "系统角色", "caption": "系统角色",
"viewtype": "DEEDITVIEW", "viewtype": "DEEDITVIEW",
"viewmodule": "uaa", "viewmodule": "uaa",
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
"viewtag": "87e2742f27704bc23e3848796e6f6ef8" "viewtag": "87e2742f27704bc23e3848796e6f6ef8"
}, },
"sys_rolepickupview": { "sys_rolepickupview": {
"title": "角色表数据选择视图", "title": "角色数据选择视图",
"caption": "系统角色", "caption": "系统角色",
"viewtype": "DEPICKUPVIEW", "viewtype": "DEPICKUPVIEW",
"viewmodule": "uaa", "viewmodule": "uaa",
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
"viewtag": "8fa92a05b6911e82d9b20fd5aa37a838" "viewtag": "8fa92a05b6911e82d9b20fd5aa37a838"
}, },
"sys_roleredirectview": { "sys_roleredirectview": {
"title": "角色表数据重定向视图", "title": "角色数据重定向视图",
"caption": "系统角色", "caption": "系统角色",
"viewtype": "DEREDIRECTVIEW", "viewtype": "DEREDIRECTVIEW",
"viewmodule": "uaa", "viewmodule": "uaa",
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
"viewtag": "9c0b351150648f7661be53c10eaabd67" "viewtag": "9c0b351150648f7661be53c10eaabd67"
}, },
"sys_rolegridview": { "sys_rolegridview": {
"title": "角色表表格视图", "title": "角色表格视图",
"caption": "系统角色", "caption": "系统角色",
"viewtype": "DEGRIDVIEW", "viewtype": "DEGRIDVIEW",
"viewmodule": "uaa", "viewmodule": "uaa",
...@@ -240,7 +240,7 @@ ...@@ -240,7 +240,7 @@
"viewtag": "cb64b5009e70f225a91046314f40977a" "viewtag": "cb64b5009e70f225a91046314f40977a"
}, },
"sys_rolempickupview": { "sys_rolempickupview": {
"title": "角色表数据多项选择视图", "title": "角色数据多项选择视图",
"caption": "系统角色", "caption": "系统角色",
"viewtype": "DEMPICKUPVIEW", "viewtype": "DEMPICKUPVIEW",
"viewmodule": "uaa", "viewmodule": "uaa",
......
app_web/src/locale/lanres/codelist/codelist_en_US.ts
浏览文件 @ 0a057306
export default { export default {
CLPermissionType: { CLSourceType: {
'0': '菜单', 'DEACTION': '实体行为',
'1': '数据对象能力', 'DATASET': '数据集合',
'2': '统一资源',
empty: '', empty: '',
}, },
}; };
\ No newline at end of file
app_web/src/locale/lanres/codelist/codelist_zh_CN.ts
浏览文件 @ 0a057306
export default { export default {
CLPermissionType: { CLSourceType: {
'0': '菜单', 'DEACTION': '实体行为',
'1': '数据对象能力', 'DATASET': '数据集合',
'2': '统一资源',
empty: '', empty: '',
}, },
}; };
\ No newline at end of file
app_web/src/locale/lanres/sys-permission/sys-permission_en_US.ts
浏览文件 @ 0a057306
...@@ -4,13 +4,11 @@ export default { ...@@ -4,13 +4,11 @@ export default {
permissionid: '资源标识', permissionid: '资源标识',
permissionname: '资源名称', permissionname: '资源名称',
pssystemid: '系统标识', pssystemid: '系统标识',
type: '资源类别', permissiontype: '资源类别',
enable: '逻辑有效', enable: '逻辑有效',
createdate: '建立时间', createdate: '建立时间',
updatedate: '更新时间', updatedate: '更新时间',
psdataentity: '实体', pssourcetype: '来源',
psdedataset: '数据集',
psdedatarange: '数据范围',
}, },
views: { views: {
gridview: { gridview: {
...@@ -44,7 +42,6 @@ export default { ...@@ -44,7 +42,6 @@ export default {
}, },
main_form: { main_form: {
details: { details: {
group1: "权限表基本信息",
formpage1: "基本信息", formpage1: "基本信息",
srfupdatedate: "更新时间", srfupdatedate: "更新时间",
srforikey: "", srforikey: "",
...@@ -54,21 +51,17 @@ export default { ...@@ -54,21 +51,17 @@ export default {
srfuf: "", srfuf: "",
srfdeid: "", srfdeid: "",
srfsourcekey: "", srfsourcekey: "",
systemid: "系统标识",
sys_permissionname: "资源名称", sys_permissionname: "资源名称",
pssourcetype: "来源",
sys_permissionid: "资源标识", sys_permissionid: "资源标识",
type: "资源类别",
}, },
uiactions: { uiactions: {
}, },
}, },
main_grid: { main_grid: {
columns: { columns: {
sys_permissionid: "资源标识",
sys_permissionname: "资源名称", sys_permissionname: "资源名称",
psdataentity: "实体", pssourcetype: "来源",
psdedatarange: "数据范围",
psdedataset: "数据集",
}, },
uiactions: { uiactions: {
}, },
...@@ -76,10 +69,8 @@ export default { ...@@ -76,10 +69,8 @@ export default {
default_searchform: { default_searchform: {
details: { details: {
formpage1: "常规条件", formpage1: "常规条件",
n_psdataentity_like: "实体(%)",
n_psdedataset_like: "数据集(%)",
n_psdedatarange_like: "数据范围(%)",
n_sys_permissionname_like: "资源名称(%)", n_sys_permissionname_like: "资源名称(%)",
n_pssourcetype_eq: "来源(=)",
}, },
uiactions: { uiactions: {
}, },
......
app_web/src/locale/lanres/sys-permission/sys-permission_zh_CN.ts
浏览文件 @ 0a057306
...@@ -3,13 +3,11 @@ export default { ...@@ -3,13 +3,11 @@ export default {
permissionid: '资源标识', permissionid: '资源标识',
permissionname: '资源名称', permissionname: '资源名称',
pssystemid: '系统标识', pssystemid: '系统标识',
type: '资源类别', permissiontype: '资源类别',
enable: '逻辑有效', enable: '逻辑有效',
createdate: '建立时间', createdate: '建立时间',
updatedate: '更新时间', updatedate: '更新时间',
psdataentity: '实体', pssourcetype: '来源',
psdedataset: '数据集',
psdedatarange: '数据范围',
}, },
views: { views: {
gridview: { gridview: {
...@@ -43,7 +41,6 @@ export default { ...@@ -43,7 +41,6 @@ export default {
}, },
main_form: { main_form: {
details: { details: {
group1: '权限表基本信息',
formpage1: '基本信息', formpage1: '基本信息',
srfupdatedate: '更新时间', srfupdatedate: '更新时间',
srforikey: '', srforikey: '',
...@@ -53,21 +50,17 @@ export default { ...@@ -53,21 +50,17 @@ export default {
srfuf: '', srfuf: '',
srfdeid: '', srfdeid: '',
srfsourcekey: '', srfsourcekey: '',
systemid: '系统标识',
sys_permissionname: '资源名称', sys_permissionname: '资源名称',
pssourcetype: '来源',
sys_permissionid: '资源标识', sys_permissionid: '资源标识',
type: '资源类别',
}, },
uiactions: { uiactions: {
}, },
}, },
main_grid: { main_grid: {
columns: { columns: {
sys_permissionid: '资源标识',
sys_permissionname: '资源名称', sys_permissionname: '资源名称',
psdataentity: '实体', pssourcetype: '来源',
psdedatarange: '数据范围',
psdedataset: '数据集',
}, },
uiactions: { uiactions: {
}, },
...@@ -75,10 +68,8 @@ export default { ...@@ -75,10 +68,8 @@ export default {
default_searchform: { default_searchform: {
details: { details: {
formpage1: '常规条件', formpage1: '常规条件',
n_psdataentity_like: '实体(%)',
n_psdedataset_like: '数据集(%)',
n_psdedatarange_like: '数据范围(%)',
n_sys_permissionname_like: '资源名称(%)', n_sys_permissionname_like: '资源名称(%)',
n_pssourcetype_eq: '来源(=)',
}, },
uiactions: { uiactions: {
}, },
......
app_web/src/locale/lanres/sys-psdeoppriv/sys-psdeoppriv_en_US.ts
浏览文件 @ 0a057306
...@@ -5,16 +5,15 @@ export default { ...@@ -5,16 +5,15 @@ export default {
psdeopprivname: '实体数据操作标识名称', psdeopprivname: '实体数据操作标识名称',
psdataentityid: '实体标识', psdataentityid: '实体标识',
psdataentityname: '实体名称', psdataentityname: '实体名称',
psdedatasetid: '实体数据集标识',
psdedatasetname: '实体数据集名称',
psdedatarangeid: '实体数据范围标识', psdedatarangeid: '实体数据范围标识',
psdedatarangename: '实体数据范围名称', psdedatarangename: '实体数据范围名称',
pssysmoduleid: '系统模块标识', pssysmoduleid: '系统模块标识',
pssysmodulename: '系统模块名称', pssysmodulename: '系统模块名称',
pssystemid: '系统标识', pssystemid: '系统标识',
permissionid: '系统资源标识',
createdate: '建立时间', createdate: '建立时间',
updatedate: '更新时间', updatedate: '更新时间',
permissiontype: '资源类型', pssourceid: '数据集/实体行为标识',
pssourcename: '数据集/实体行为名称',
pssourcetype: '数据集/实体行为类型',
}, },
}; };
\ No newline at end of file
app_web/src/locale/lanres/sys-psdeoppriv/sys-psdeoppriv_zh_CN.ts
浏览文件 @ 0a057306
...@@ -4,16 +4,15 @@ export default { ...@@ -4,16 +4,15 @@ export default {
psdeopprivname: '实体数据操作标识名称', psdeopprivname: '实体数据操作标识名称',
psdataentityid: '实体标识', psdataentityid: '实体标识',
psdataentityname: '实体名称', psdataentityname: '实体名称',
psdedatasetid: '实体数据集标识',
psdedatasetname: '实体数据集名称',
psdedatarangeid: '实体数据范围标识', psdedatarangeid: '实体数据范围标识',
psdedatarangename: '实体数据范围名称', psdedatarangename: '实体数据范围名称',
pssysmoduleid: '系统模块标识', pssysmoduleid: '系统模块标识',
pssysmodulename: '系统模块名称', pssysmodulename: '系统模块名称',
pssystemid: '系统标识', pssystemid: '系统标识',
permissionid: '系统资源标识',
createdate: '建立时间', createdate: '建立时间',
updatedate: '更新时间', updatedate: '更新时间',
permissiontype: '资源类型', pssourceid: '数据集/实体行为标识',
pssourcename: '数据集/实体行为名称',
pssourcetype: '数据集/实体行为类型',
}, },
}; };
\ No newline at end of file
app_web/src/locale/lanres/sys-role-permission/sys-role-permission_en_US.ts
浏览文件 @ 0a057306
...@@ -7,7 +7,6 @@ export default { ...@@ -7,7 +7,6 @@ export default {
rolename: '角色名称', rolename: '角色名称',
permissionid: '权限表标识', permissionid: '权限表标识',
permissionname: '权限名称', permissionname: '权限名称',
type: '资源类型',
createdate: '建立时间', createdate: '建立时间',
updatedate: '更新时间', updatedate: '更新时间',
systemid: '系统标识', systemid: '系统标识',
...@@ -55,7 +54,6 @@ export default { ...@@ -55,7 +54,6 @@ export default {
srfdeid: "", srfdeid: "",
srfsourcekey: "", srfsourcekey: "",
sys_rolename: "角色名称", sys_rolename: "角色名称",
type: "资源类型",
sys_permissionname: "权限名称", sys_permissionname: "权限名称",
sys_permissionid: "权限表标识", sys_permissionid: "权限表标识",
sys_roleid: "角色表标识", sys_roleid: "角色表标识",
...@@ -68,7 +66,6 @@ export default { ...@@ -68,7 +66,6 @@ export default {
columns: { columns: {
sys_rolename: "角色名称", sys_rolename: "角色名称",
sys_permissionname: "权限名称", sys_permissionname: "权限名称",
type: "资源类型",
updatedate: "更新时间", updatedate: "更新时间",
}, },
uiactions: { uiactions: {
......
app_web/src/locale/lanres/sys-role-permission/sys-role-permission_zh_CN.ts
浏览文件 @ 0a057306
...@@ -6,7 +6,6 @@ export default { ...@@ -6,7 +6,6 @@ export default {
rolename: '角色名称', rolename: '角色名称',
permissionid: '权限表标识', permissionid: '权限表标识',
permissionname: '权限名称', permissionname: '权限名称',
type: '资源类型',
createdate: '建立时间', createdate: '建立时间',
updatedate: '更新时间', updatedate: '更新时间',
systemid: '系统标识', systemid: '系统标识',
...@@ -54,7 +53,6 @@ export default { ...@@ -54,7 +53,6 @@ export default {
srfdeid: '', srfdeid: '',
srfsourcekey: '', srfsourcekey: '',
sys_rolename: '角色名称', sys_rolename: '角色名称',
type: '资源类型',
sys_permissionname: '权限名称', sys_permissionname: '权限名称',
sys_permissionid: '权限表标识', sys_permissionid: '权限表标识',
sys_roleid: '角色表标识', sys_roleid: '角色表标识',
...@@ -67,7 +65,6 @@ export default { ...@@ -67,7 +65,6 @@ export default {
columns: { columns: {
sys_rolename: '角色名称', sys_rolename: '角色名称',
sys_permissionname: '权限名称', sys_permissionname: '权限名称',
type: '资源类型',
updatedate: '更新时间', updatedate: '更新时间',
}, },
uiactions: { uiactions: {
......
app_web/src/mock/codelist/codelist.ts
浏览文件 @ 0a057306
...@@ -8,31 +8,23 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => { ...@@ -8,31 +8,23 @@ 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', srfkey: 'CLSourceType',
emptytext: '未定义', emptytext: '未定义',
"codelisttype":"static", "codelisttype":"static",
items: [ items: [
{ {
id: '0', id: 'DEACTION',
label: '菜单', label: '实体行为',
text: '菜单', text: '实体行为',
value: '0', value: 'DEACTION',
disabled: false, disabled: false,
}, },
{ {
id: '1', id: 'DATASET',
label: '数据对象能力', label: '数据集合',
text: '数据对象能力', text: '数据集合',
value: '1', value: 'DATASET',
disabled: false,
},
{
id: '2',
label: '统一资源',
text: '统一资源',
value: '2',
disabled: false, disabled: false,
}, },
......
app_web/src/mock/viewconfig/viewconfig.ts
浏览文件 @ 0a057306
...@@ -24,7 +24,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -24,7 +24,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtag": "12f53853382743f095a6af867669d8c1" "viewtag": "12f53853382743f095a6af867669d8c1"
}, },
"sys_rolepickupgridview": { "sys_rolepickupgridview": {
"title": "角色表选择表格视图", "title": "角色选择表格视图",
"caption": "系统角色", "caption": "系统角色",
"viewtype": "DEPICKUPGRIDVIEW", "viewtype": "DEPICKUPGRIDVIEW",
"viewmodule": "uaa", "viewmodule": "uaa",
...@@ -80,7 +80,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -80,7 +80,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtag": "42f3fa04c9dc77f235207bcbe6ac3888" "viewtag": "42f3fa04c9dc77f235207bcbe6ac3888"
}, },
"sys_roleeditview2": { "sys_roleeditview2": {
"title": "角色表编辑视图", "title": "角色编辑视图",
"caption": "系统角色", "caption": "系统角色",
"viewtype": "DEEDITVIEW2", "viewtype": "DEEDITVIEW2",
"viewmodule": "uaa", "viewmodule": "uaa",
...@@ -120,7 +120,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -120,7 +120,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtag": "6cd33d562ef19ad47dd26b312b9a020e" "viewtag": "6cd33d562ef19ad47dd26b312b9a020e"
}, },
"sys_roleeditview": { "sys_roleeditview": {
"title": "角色表编辑视图", "title": "角色编辑视图",
"caption": "系统角色", "caption": "系统角色",
"viewtype": "DEEDITVIEW", "viewtype": "DEEDITVIEW",
"viewmodule": "uaa", "viewmodule": "uaa",
...@@ -160,7 +160,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -160,7 +160,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtag": "87e2742f27704bc23e3848796e6f6ef8" "viewtag": "87e2742f27704bc23e3848796e6f6ef8"
}, },
"sys_rolepickupview": { "sys_rolepickupview": {
"title": "角色表数据选择视图", "title": "角色数据选择视图",
"caption": "系统角色", "caption": "系统角色",
"viewtype": "DEPICKUPVIEW", "viewtype": "DEPICKUPVIEW",
"viewmodule": "uaa", "viewmodule": "uaa",
...@@ -176,7 +176,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -176,7 +176,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtag": "8fa92a05b6911e82d9b20fd5aa37a838" "viewtag": "8fa92a05b6911e82d9b20fd5aa37a838"
}, },
"sys_roleredirectview": { "sys_roleredirectview": {
"title": "角色表数据重定向视图", "title": "角色数据重定向视图",
"caption": "系统角色", "caption": "系统角色",
"viewtype": "DEREDIRECTVIEW", "viewtype": "DEREDIRECTVIEW",
"viewmodule": "uaa", "viewmodule": "uaa",
...@@ -208,7 +208,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -208,7 +208,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtag": "9c0b351150648f7661be53c10eaabd67" "viewtag": "9c0b351150648f7661be53c10eaabd67"
}, },
"sys_rolegridview": { "sys_rolegridview": {
"title": "角色表表格视图", "title": "角色表格视图",
"caption": "系统角色", "caption": "系统角色",
"viewtype": "DEGRIDVIEW", "viewtype": "DEGRIDVIEW",
"viewmodule": "uaa", "viewmodule": "uaa",
...@@ -248,7 +248,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => { ...@@ -248,7 +248,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewtag": "cb64b5009e70f225a91046314f40977a" "viewtag": "cb64b5009e70f225a91046314f40977a"
}, },
"sys_rolempickupview": { "sys_rolempickupview": {
"title": "角色表数据多项选择视图", "title": "角色数据多项选择视图",
"caption": "系统角色", "caption": "系统角色",
"viewtype": "DEMPICKUPVIEW", "viewtype": "DEMPICKUPVIEW",
"viewmodule": "uaa", "viewmodule": "uaa",
......
app_web/src/widgets/sys-permission/default-drbar/default-drbar-model.ts
浏览文件 @ 0a057306
...@@ -25,7 +25,7 @@ export default class DefaultModel { ...@@ -25,7 +25,7 @@ export default class DefaultModel {
name: 'pssystemid', name: 'pssystemid',
}, },
{ {
name: 'type', name: 'permissiontype',
}, },
{ {
name: 'enable', name: 'enable',
...@@ -37,13 +37,7 @@ export default class DefaultModel { ...@@ -37,13 +37,7 @@ export default class DefaultModel {
name: 'updatedate', name: 'updatedate',
}, },
{ {
name: 'psdataentity', name: 'pssourcetype',
},
{
name: 'psdedataset',
},
{
name: 'psdedatarange',
}, },
] ]
} }
......
app_web/src/widgets/sys-permission/default-searchform/default-searchform-base.vue
浏览文件 @ 0a057306
...@@ -4,29 +4,17 @@ ...@@ -4,29 +4,17 @@
<row> <row>
<i-col span="20"> <i-col span="20">
<row> <row>
<i-col v-show="detailsModel.n_psdataentity_like.visible" :style="{}" :md="{ span: 6, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, 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">
<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>
</i-col>
<i-col v-show="detailsModel.n_psdedataset_like.visible" :style="{}" :md="{ span: 6, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, 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">
<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>
</i-col>
<i-col v-show="detailsModel.n_psdedatarange_like.visible" :style="{}" :md="{ span: 6, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, 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">
<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>
</i-col>
<i-col v-show="detailsModel.n_sys_permissionname_like.visible" :style="{}" :md="{ span: 6, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }"> <i-col v-show="detailsModel.n_sys_permissionname_like.visible" :style="{}" :md="{ span: 6, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, 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"> <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> <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_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">
<dropdown-list v-model="data.n_pssourcetype_eq" :data="data" :itemParam="{}" :disabled="detailsModel.n_pssourcetype_eq.disabled" tag='CLSourceType' codelistType='STATIC' placeholder='请选择...' style=""></dropdown-list>
</app-form-item>
</i-col> </i-col>
</row> </row>
</i-col> </i-col>
...@@ -268,10 +256,8 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -268,10 +256,8 @@ export default class DefaultBase extends Vue implements ControlInterface {
* @memberof DefaultBase * @memberof DefaultBase
*/ */
protected data: any = { protected data: any = {
n_psdataentity_like: null,
n_psdedataset_like: null,
n_psdedatarange_like: null,
n_sys_permissionname_like: null, n_sys_permissionname_like: null,
n_pssourcetype_eq: null,
}; };
/** /**
...@@ -281,30 +267,18 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -281,30 +267,18 @@ export default class DefaultBase extends Vue implements ControlInterface {
* @memberof DefaultBase * @memberof DefaultBase
*/ */
protected rules: any = { protected rules: any = {
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_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_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' },
],
n_sys_permissionname_like: [ n_sys_permissionname_like: [
{ type: 'string', message: '资源名称(%) 值必须为字符串类型', trigger: 'change' }, { type: 'string', message: '资源名称(%) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '资源名称(%) 值必须为字符串类型', trigger: 'blur' }, { type: 'string', message: '资源名称(%) 值必须为字符串类型', trigger: 'blur' },
{ 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_pssourcetype_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' },
],
} }
/** /**
...@@ -315,63 +289,35 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -315,63 +289,35 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/ */
protected detailsModel: any = { protected detailsModel: any = {
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_psdataentity_like: new FormItemModel({ caption: '实体(%)', detailType: 'FORMITEM', name: 'n_psdataentity_like', 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_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: 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_pssourcetype_eq: new FormItemModel({ caption: '来源(=)', detailType: 'FORMITEM', name: 'n_pssourcetype_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
}; };
/** /**
* 监控表单属性 n_psdataentity_like 值 * 监控表单属性 n_sys_permissionname_like 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof DefaultBase
*/
@Watch('data.n_psdataentity_like')
onN_psdataentity_likeChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_psdataentity_like', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 n_psdedataset_like 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof DefaultBase
*/
@Watch('data.n_psdedataset_like')
onN_psdedataset_likeChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_psdedataset_like', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 n_psdedatarange_like 值
* *
* @param {*} newVal * @param {*} newVal
* @param {*} oldVal * @param {*} oldVal
* @memberof DefaultBase * @memberof DefaultBase
*/ */
@Watch('data.n_psdedatarange_like') @Watch('data.n_sys_permissionname_like')
onN_psdedatarange_likeChange(newVal: any, oldVal: any) { onN_sys_permissionname_likeChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_psdedatarange_like', newVal: newVal, oldVal: oldVal }); this.formDataChange({ name: 'n_sys_permissionname_like', newVal: newVal, oldVal: oldVal });
} }
/** /**
* 监控表单属性 n_sys_permissionname_like 值 * 监控表单属性 n_pssourcetype_eq 值
* *
* @param {*} newVal * @param {*} newVal
* @param {*} oldVal * @param {*} oldVal
* @memberof DefaultBase * @memberof DefaultBase
*/ */
@Watch('data.n_sys_permissionname_like') @Watch('data.n_pssourcetype_eq')
onN_sys_permissionname_likeChange(newVal: any, oldVal: any) { onN_pssourcetype_eqChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_sys_permissionname_like', newVal: newVal, oldVal: oldVal }); this.formDataChange({ name: 'n_pssourcetype_eq', newVal: newVal, oldVal: oldVal });
} }
...@@ -397,8 +343,6 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -397,8 +343,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
} }
/** /**
......
app_web/src/widgets/sys-permission/default-searchform/default-searchform-model.ts
浏览文件 @ 0a057306
...@@ -26,23 +26,13 @@ export default class DefaultModel { ...@@ -26,23 +26,13 @@ export default class DefaultModel {
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
name: 'n_psdataentity_like', name: 'n_sys_permissionname_like',
prop: 'psdataentity', prop: 'permissionname',
dataType: 'TEXT',
},
{
name: 'n_psdedataset_like',
prop: 'psdedataset',
dataType: 'TEXT',
},
{
name: 'n_psdedatarange_like',
prop: 'psdedatarange',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
name: 'n_sys_permissionname_like', name: 'n_pssourcetype_eq',
prop: 'permissionname', prop: 'pssourcetype',
dataType: 'TEXT', dataType: 'TEXT',
}, },
] ]
......
app_web/src/widgets/sys-permission/main-form/main-form-base.vue
浏览文件 @ 0a057306
...@@ -3,39 +3,18 @@ ...@@ -3,39 +3,18 @@
<input style="display:none;" /> <input style="display:none;" />
<row > <row >
<i-col v-show="detailsModel.group1.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-group layoutType="TABLE_24COL" titleStyle="" class='' uiActionGroup="detailsModel.group1.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="$t('entities.sys_permission.main_form.details.group1')" :isShowCaption="true" uiStyle="DEFAULT" :titleBarCloseMode="0" :isInfoGroupMode="false">
<row>
<i-col v-show="detailsModel.systemid.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='systemid' :itemRules="this.rules.systemid" class='' :caption="$t('entities.sys_permission.main_form.details.systemid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.systemid.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.systemid" @enter="onEnter($event)" unit="" :disabled="detailsModel.systemid.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.sys_permissionname.visible" :style="{}" :lg="{ span: 24, offset: 0 }"> <i-col v-show="detailsModel.sys_permissionname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='sys_permissionname' :itemRules="this.rules.sys_permissionname" class='' :caption="$t('entities.sys_permission.main_form.details.sys_permissionname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.sys_permissionname.error" :isEmptyCaption="false" labelPos="LEFT"> <app-form-item name='sys_permissionname' :itemRules="this.rules.sys_permissionname" class='' :caption="$t('entities.sys_permission.main_form.details.sys_permissionname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.sys_permissionname.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.sys_permissionname" @enter="onEnter($event)" unit="" :disabled="detailsModel.sys_permissionname.disabled" type='text' style=""></input-box> <input-box v-model="data.sys_permissionname" @enter="onEnter($event)" unit="" :disabled="detailsModel.sys_permissionname.disabled" type='text' style=""></input-box>
</app-form-item> </app-form-item>
</i-col> </i-col>
<i-col v-show="detailsModel.sys_permissionid.visible" :style="{}" :lg="{ span: 24, offset: 0 }"> <i-col v-show="detailsModel.pssourcetype.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='sys_permissionid' :itemRules="this.rules.sys_permissionid" class='' :caption="$t('entities.sys_permission.main_form.details.sys_permissionid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.sys_permissionid.error" :isEmptyCaption="false" labelPos="LEFT"> <app-form-item name='pssourcetype' :itemRules="this.rules.pssourcetype" class='' :caption="$t('entities.sys_permission.main_form.details.pssourcetype')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.pssourcetype.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='sys_permissionid' <app-span name='pssourcetype'
:value="data.sys_permissionid" style=""></app-span> :value="data.pssourcetype" tag='CLSourceType' codelistType='STATIC' style=""></app-span>
</app-form-item> </app-form-item>
</i-col>
<i-col v-show="detailsModel.type.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='type' :itemRules="this.rules.type" class='' :caption="$t('entities.sys_permission.main_form.details.type')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.type.error" :isEmptyCaption="false" labelPos="LEFT">
<dropdown-list v-model="data.type" :data="data" :itemParam="{}" :disabled="detailsModel.type.disabled" tag='CLPermissionType' codelistType='STATIC' placeholder='请选择...' style=""></dropdown-list>
</app-form-item>
</i-col>
</row>
</app-form-group>
</i-col> </i-col>
...@@ -337,10 +316,9 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -337,10 +316,9 @@ export default class MainBase extends Vue implements ControlInterface {
srfuf: null, srfuf: null,
srfdeid: null, srfdeid: null,
srfsourcekey: null, srfsourcekey: null,
systemid: null,
sys_permissionname: null, sys_permissionname: null,
pssourcetype: null,
sys_permissionid: null, sys_permissionid: null,
type: null,
sys_permission:null, sys_permission:null,
}; };
...@@ -431,30 +409,24 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -431,30 +409,24 @@ export default class MainBase 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' },
], ],
systemid: [
{ type: 'string', message: '系统标识 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '系统标识 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '系统标识 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '系统标识 值不能为空', trigger: 'blur' },
],
sys_permissionname: [ sys_permissionname: [
{ type: 'string', message: '资源名称 值必须为字符串类型', trigger: 'change' }, { type: 'string', message: '资源名称 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '资源名称 值必须为字符串类型', trigger: 'blur' }, { type: 'string', message: '资源名称 值必须为字符串类型', trigger: 'blur' },
{ 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' },
], ],
pssourcetype: [
{ type: 'string', message: '来源 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '来源 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '来源 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '来源 值不能为空', trigger: 'blur' },
],
sys_permissionid: [ sys_permissionid: [
{ type: 'string', message: '资源标识 值必须为字符串类型', trigger: 'change' }, { type: 'string', message: '资源标识 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '资源标识 值必须为字符串类型', trigger: 'blur' }, { type: 'string', message: '资源标识 值必须为字符串类型', trigger: 'blur' },
{ 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' },
], ],
type: [
{ type: 'string', message: '资源类别 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '资源类别 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '资源类别 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '资源类别 值不能为空', trigger: 'blur' },
],
} }
/** /**
...@@ -464,8 +436,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -464,8 +436,6 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof Main * @memberof Main
*/ */
protected detailsModel: any = { protected detailsModel: any = {
group1: new FormGroupPanelModel({ caption: '权限表基本信息', detailType: 'GROUPPANEL', name: 'group1', visible: true, isShowCaption: true, form: this, uiActionGroup: { caption: '', langbase: 'entities.sys_permission.main_form', extractMode: 'ITEM', details: [] } })
,
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 })
, ,
srfupdatedate: new FormItemModel({ caption: '更新时间', detailType: 'FORMITEM', name: 'srfupdatedate', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) srfupdatedate: new FormItemModel({ caption: '更新时间', detailType: 'FORMITEM', name: 'srfupdatedate', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
...@@ -483,14 +453,12 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -483,14 +453,12 @@ export default class MainBase extends Vue implements ControlInterface {
srfdeid: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfdeid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) srfdeid: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfdeid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
systemid: new FormItemModel({ caption: '系统标识', detailType: 'FORMITEM', name: 'systemid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
sys_permissionname: new FormItemModel({ caption: '资源名称', detailType: 'FORMITEM', name: 'sys_permissionname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) sys_permissionname: new FormItemModel({ caption: '资源名称', detailType: 'FORMITEM', name: 'sys_permissionname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
sys_permissionid: new FormItemModel({ caption: '资源标识', detailType: 'FORMITEM', name: 'sys_permissionid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) pssourcetype: new FormItemModel({ caption: '来源', detailType: 'FORMITEM', name: 'pssourcetype', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
type: new FormItemModel({ caption: '资源类别', detailType: 'FORMITEM', name: 'type', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) sys_permissionid: new FormItemModel({ caption: '资源标识', detailType: 'FORMITEM', name: 'sys_permissionid', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
}; };
...@@ -590,18 +558,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -590,18 +558,6 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'srfsourcekey', newVal: newVal, oldVal: oldVal }); this.formDataChange({ name: 'srfsourcekey', newVal: newVal, oldVal: oldVal });
} }
/**
* 监控表单属性 systemid 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof Main
*/
@Watch('data.systemid')
onSystemidChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'systemid', newVal: newVal, oldVal: oldVal });
}
/** /**
* 监控表单属性 sys_permissionname 值 * 监控表单属性 sys_permissionname 值
* *
...@@ -615,27 +571,27 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -615,27 +571,27 @@ export default class MainBase extends Vue implements ControlInterface {
} }
/** /**
* 监控表单属性 sys_permissionid 值 * 监控表单属性 pssourcetype 值
* *
* @param {*} newVal * @param {*} newVal
* @param {*} oldVal * @param {*} oldVal
* @memberof Main * @memberof Main
*/ */
@Watch('data.sys_permissionid') @Watch('data.pssourcetype')
onSys_permissionidChange(newVal: any, oldVal: any) { onPssourcetypeChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'sys_permissionid', newVal: newVal, oldVal: oldVal }); this.formDataChange({ name: 'pssourcetype', newVal: newVal, oldVal: oldVal });
} }
/** /**
* 监控表单属性 type 值 * 监控表单属性 sys_permissionid 值
* *
* @param {*} newVal * @param {*} newVal
* @param {*} oldVal * @param {*} oldVal
* @memberof Main * @memberof Main
*/ */
@Watch('data.type') @Watch('data.sys_permissionid')
onTypeChange(newVal: any, oldVal: any) { onSys_permissionidChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'type', newVal: newVal, oldVal: oldVal }); this.formDataChange({ name: 'sys_permissionid', newVal: newVal, oldVal: oldVal });
} }
...@@ -686,8 +642,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -686,8 +642,6 @@ export default class MainBase extends Vue implements ControlInterface {
} }
/** /**
......
app_web/src/widgets/sys-permission/main-form/main-form-model.ts
浏览文件 @ 0a057306
...@@ -56,13 +56,13 @@ export default class MainModel { ...@@ -56,13 +56,13 @@ export default class MainModel {
name: 'srfsourcekey', name: 'srfsourcekey',
}, },
{ {
name: 'systemid', name: 'sys_permissionname',
prop: 'pssystemid', prop: 'permissionname',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
name: 'sys_permissionname', name: 'pssourcetype',
prop: 'permissionname', prop: 'pssourcetype',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
...@@ -70,11 +70,6 @@ export default class MainModel { ...@@ -70,11 +70,6 @@ export default class MainModel {
prop: 'permissionid', prop: 'permissionid',
dataType: 'GUID', dataType: 'GUID',
}, },
{
name: 'type',
prop: 'type',
dataType: 'SSCODELIST',
},
{ {
name: 'sys_permission', name: 'sys_permission',
prop: 'permissionid', prop: 'permissionid',
......
app_web/src/widgets/sys-permission/main-form/main-form-service.ts
浏览文件 @ 0a057306
...@@ -160,7 +160,6 @@ export default class MainService extends ControlService { ...@@ -160,7 +160,6 @@ export default class MainService extends ControlService {
@Errorlog @Errorlog
public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> { public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data); 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) => { return new Promise((resolve: any, reject: any) => {
let result: Promise<any>; let result: Promise<any>;
const _appEntityService: any = this.appEntityService; const _appEntityService: any = this.appEntityService;
......
app_web/src/widgets/sys-permission/main-grid/main-grid-base.vue
浏览文件 @ 0a057306
...@@ -16,13 +16,6 @@ ...@@ -16,13 +16,6 @@
<template v-if="!isSingleSelect"> <template v-if="!isSingleSelect">
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column> <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</template> </template>
<template v-if="getColumnState('sys_permissionid')">
<el-table-column show-overflow-tooltip :prop="'sys_permissionid'" :label="$t('entities.sys_permission.main_grid.columns.sys_permissionid')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot="{row,column}">
<span>{{row.sys_permissionid}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('sys_permissionname')"> <template v-if="getColumnState('sys_permissionname')">
<el-table-column show-overflow-tooltip :prop="'sys_permissionname'" :label="$t('entities.sys_permission.main_grid.columns.sys_permissionname')" :width="250" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'sys_permissionname'" :label="$t('entities.sys_permission.main_grid.columns.sys_permissionname')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot="{row,column}"> <template v-slot="{row,column}">
...@@ -30,24 +23,12 @@ ...@@ -30,24 +23,12 @@
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('psdataentity')"> <template v-if="getColumnState('pssourcetype')">
<el-table-column show-overflow-tooltip :prop="'psdataentity'" :label="$t('entities.sys_permission.main_grid.columns.psdataentity')" :width="150" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'pssourcetype'" :label="$t('entities.sys_permission.main_grid.columns.pssourcetype')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot="{row,column}"> <template v-slot="{row,column}">
<span>{{row.psdataentity}}</span> <template >
<codelist :value="row.pssourcetype" tag='CLSourceType' 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>
</el-table-column>
</template>
<template v-if="getColumnState('psdedataset')">
<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}">
<span>{{row.psdedataset}}</span>
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
...@@ -508,13 +489,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -508,13 +489,6 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof Main * @memberof Main
*/ */
protected allColumns: any[] = [ protected allColumns: any[] = [
{
name: 'sys_permissionid',
label: '资源标识',
langtag: 'entities.sys_permission.main_grid.columns.sys_permissionid',
show: true,
util: 'px'
},
{ {
name: 'sys_permissionname', name: 'sys_permissionname',
label: '资源名称', label: '资源名称',
...@@ -523,23 +497,9 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -523,23 +497,9 @@ export default class MainBase extends Vue implements ControlInterface {
util: 'PX' util: 'PX'
}, },
{ {
name: 'psdataentity', name: 'pssourcetype',
label: '实体', label: '来源',
langtag: 'entities.sys_permission.main_grid.columns.psdataentity', langtag: 'entities.sys_permission.main_grid.columns.pssourcetype',
show: true,
util: 'px'
},
{
name: 'psdedatarange',
label: '数据范围',
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'
}, },
...@@ -858,6 +818,14 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -858,6 +818,14 @@ 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: 'pssourcetype',
srfkey: 'CLSourceType',
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
浏览文件 @ 0a057306
...@@ -27,23 +27,8 @@ export default class MainModel { ...@@ -27,23 +27,8 @@ export default class MainModel {
}else{ }else{
return [ return [
{ {
name: 'psdataentity', name: 'pssourcetype',
prop: 'psdataentity', prop: 'pssourcetype',
dataType: 'TEXT',
},
{
name: 'sys_permissionid',
prop: 'permissionid',
dataType: 'GUID',
},
{
name: 'psdedatarange',
prop: 'psdedatarange',
dataType: 'TEXT',
},
{
name: 'psdedataset',
prop: 'psdedataset',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
...@@ -71,23 +56,13 @@ export default class MainModel { ...@@ -71,23 +56,13 @@ export default class MainModel {
prop: 'permissionid', prop: 'permissionid',
}, },
{ {
name: 'n_psdataentity_like', name: 'n_sys_permissionname_like',
prop: 'n_psdataentity_like', prop: 'n_sys_permissionname_like',
dataType: 'TEXT',
},
{
name: 'n_psdedataset_like',
prop: 'n_psdedataset_like',
dataType: 'TEXT',
},
{
name: 'n_psdedatarange_like',
prop: 'n_psdedatarange_like',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{ {
name: 'n_sys_permissionname_like', name: 'n_pssourcetype_eq',
prop: 'n_sys_permissionname_like', prop: 'n_pssourcetype_eq',
dataType: 'TEXT', dataType: 'TEXT',
}, },
......
app_web/src/widgets/sys-permission/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ 0a057306
...@@ -25,7 +25,7 @@ export default class MPickupViewpickupviewpanelModel { ...@@ -25,7 +25,7 @@ export default class MPickupViewpickupviewpanelModel {
name: 'pssystemid', name: 'pssystemid',
}, },
{ {
name: 'type', name: 'permissiontype',
}, },
{ {
name: 'enable', name: 'enable',
...@@ -37,13 +37,7 @@ export default class MPickupViewpickupviewpanelModel { ...@@ -37,13 +37,7 @@ export default class MPickupViewpickupviewpanelModel {
name: 'updatedate', name: 'updatedate',
}, },
{ {
name: 'psdataentity', name: 'pssourcetype',
},
{
name: 'psdedataset',
},
{
name: 'psdedatarange',
}, },
] ]
} }
......
app_web/src/widgets/sys-permission/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ 0a057306
...@@ -25,7 +25,7 @@ export default class PickupViewpickupviewpanelModel { ...@@ -25,7 +25,7 @@ export default class PickupViewpickupviewpanelModel {
name: 'pssystemid', name: 'pssystemid',
}, },
{ {
name: 'type', name: 'permissiontype',
}, },
{ {
name: 'enable', name: 'enable',
...@@ -37,13 +37,7 @@ export default class PickupViewpickupviewpanelModel { ...@@ -37,13 +37,7 @@ export default class PickupViewpickupviewpanelModel {
name: 'updatedate', name: 'updatedate',
}, },
{ {
name: 'psdataentity', name: 'pssourcetype',
},
{
name: 'psdedataset',
},
{
name: 'psdedatarange',
}, },
] ]
} }
......
app_web/src/widgets/sys-role-permission/default-drbar/default-drbar-model.ts
浏览文件 @ 0a057306
...@@ -33,9 +33,6 @@ export default class DefaultModel { ...@@ -33,9 +33,6 @@ export default class DefaultModel {
{ {
name: 'permissionname', name: 'permissionname',
}, },
{
name: 'type',
},
{ {
name: 'createdate', name: 'createdate',
}, },
......
app_web/src/widgets/sys-role-permission/main-form/main-form-base.vue
浏览文件 @ 0a057306
...@@ -31,13 +31,6 @@ ...@@ -31,13 +31,6 @@
</app-form-item> </app-form-item>
</i-col>
<i-col v-show="detailsModel.type.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='type' :itemRules="this.rules.type" class='' :caption="$t('entities.sys_role_permission.main_form.details.type')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.type.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='type'
:value="data.type" tag='CLPermissionType' codelistType='STATIC' style=""></app-span>
</app-form-item>
</i-col> </i-col>
<i-col v-show="detailsModel.sys_permissionname.visible" :style="{}" :lg="{ span: 24, offset: 0 }"> <i-col v-show="detailsModel.sys_permissionname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='sys_permissionname' :itemRules="this.rules.sys_permissionname" class='' :caption="$t('entities.sys_role_permission.main_form.details.sys_permissionname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.sys_permissionname.error" :isEmptyCaption="false" labelPos="LEFT"> <app-form-item name='sys_permissionname' :itemRules="this.rules.sys_permissionname" class='' :caption="$t('entities.sys_role_permission.main_form.details.sys_permissionname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.sys_permissionname.error" :isEmptyCaption="false" labelPos="LEFT">
...@@ -63,13 +56,6 @@ ...@@ -63,13 +56,6 @@
</app-form-item> </app-form-item>
</i-col>
<i-col v-show="detailsModel.sys_role_permissionid.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='sys_role_permissionid' :itemRules="this.rules.sys_role_permissionid" class='' :caption="$t('entities.sys_role_permission.main_form.details.sys_role_permissionid')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.sys_role_permissionid.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='sys_role_permissionid'
:value="data.sys_role_permissionid" style=""></app-span>
</app-form-item>
</i-col> </i-col>
</row> </row>
...@@ -377,7 +363,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -377,7 +363,6 @@ export default class MainBase extends Vue implements ControlInterface {
srfdeid: null, srfdeid: null,
srfsourcekey: null, srfsourcekey: null,
sys_rolename: null, sys_rolename: null,
type: null,
sys_permissionname: null, sys_permissionname: null,
sys_permissionid: null, sys_permissionid: null,
sys_roleid: null, sys_roleid: null,
...@@ -478,12 +463,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -478,12 +463,6 @@ export default class MainBase 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' },
], ],
type: [
{ type: 'string', message: '资源类型 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '资源类型 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '资源类型 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '资源类型 值不能为空', trigger: 'blur' },
],
sys_permissionname: [ sys_permissionname: [
{ type: 'string', message: '权限名称 值必须为字符串类型', trigger: 'change' }, { type: 'string', message: '权限名称 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '权限名称 值必须为字符串类型', trigger: 'blur' }, { type: 'string', message: '权限名称 值必须为字符串类型', trigger: 'blur' },
...@@ -538,8 +517,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -538,8 +517,6 @@ export default class MainBase extends Vue implements ControlInterface {
srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
sys_rolename: new FormItemModel({ caption: '角色名称', detailType: 'FORMITEM', name: 'sys_rolename', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) sys_rolename: new FormItemModel({ caption: '角色名称', detailType: 'FORMITEM', name: 'sys_rolename', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
type: new FormItemModel({ caption: '资源类型', detailType: 'FORMITEM', name: 'type', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
sys_permissionname: new FormItemModel({ caption: '权限名称', detailType: 'FORMITEM', name: 'sys_permissionname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 }) sys_permissionname: new FormItemModel({ caption: '权限名称', detailType: 'FORMITEM', name: 'sys_permissionname', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
, ,
...@@ -659,18 +636,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -659,18 +636,6 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'sys_rolename', newVal: newVal, oldVal: oldVal }); this.formDataChange({ name: 'sys_rolename', newVal: newVal, oldVal: oldVal });
} }
/**
* 监控表单属性 type 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof Main
*/
@Watch('data.type')
onTypeChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'type', newVal: newVal, oldVal: oldVal });
}
/** /**
* 监控表单属性 sys_permissionname 值 * 监控表单属性 sys_permissionname 值
* *
...@@ -770,7 +735,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -770,7 +735,6 @@ export default class MainBase extends Vue implements ControlInterface {
} }
/** /**
......
app_web/src/widgets/sys-role-permission/main-form/main-form-model.ts
浏览文件 @ 0a057306
...@@ -60,11 +60,6 @@ export default class MainModel { ...@@ -60,11 +60,6 @@ export default class MainModel {
prop: 'rolename', prop: 'rolename',
dataType: 'PICKUPTEXT', dataType: 'PICKUPTEXT',
}, },
{
name: 'type',
prop: 'type',
dataType: 'PICKUPDATA',
},
{ {
name: 'sys_permissionname', name: 'sys_permissionname',
prop: 'permissionname', prop: 'permissionname',
......
app_web/src/widgets/sys-role-permission/main-form/main-form-service.ts
浏览文件 @ 0a057306
...@@ -184,7 +184,6 @@ export default class MainService extends ControlService { ...@@ -184,7 +184,6 @@ export default class MainService extends ControlService {
@Errorlog @Errorlog
public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> { public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data); const {data:Data,context:Context} = this.handleRequestData(action,context,data);
Object.assign(Data,{rolepermissionid: data.rolepermissionid, srffrontuf: '1'});
return new Promise((resolve: any, reject: any) => { return new Promise((resolve: any, reject: any) => {
let result: Promise<any>; let result: Promise<any>;
const _appEntityService: any = this.appEntityService; const _appEntityService: any = this.appEntityService;
......
app_web/src/widgets/sys-role-permission/main-grid/main-grid-base.vue
浏览文件 @ 0a057306
...@@ -44,15 +44,6 @@ ...@@ -44,15 +44,6 @@
</template> </template>
</el-table-column> </el-table-column>
</template> </template>
<template v-if="getColumnState('type')">
<el-table-column show-overflow-tooltip :prop="'type'" :label="$t('entities.sys_role_permission.main_grid.columns.type')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot="{row,column}">
<template >
<codelist :value="row.type" tag='CLPermissionType' codelistType='STATIC' ></codelist>
</template>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('updatedate')"> <template v-if="getColumnState('updatedate')">
<el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.sys_role_permission.main_grid.columns.updatedate')" :width="250" :align="'left'" :sortable="'custom'"> <el-table-column show-overflow-tooltip :prop="'updatedate'" :label="$t('entities.sys_role_permission.main_grid.columns.updatedate')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot="{row,column}"> <template v-slot="{row,column}">
...@@ -531,13 +522,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -531,13 +522,6 @@ export default class MainBase extends Vue implements ControlInterface {
show: true, show: true,
util: 'px' util: 'px'
}, },
{
name: 'type',
label: '资源类型',
langtag: 'entities.sys_role_permission.main_grid.columns.type',
show: true,
util: 'px'
},
{ {
name: 'updatedate', name: 'updatedate',
label: '更新时间', label: '更新时间',
...@@ -860,14 +844,6 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -860,14 +844,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-role-permission/main-grid/main-grid-model.ts
浏览文件 @ 0a057306
...@@ -46,11 +46,6 @@ export default class MainModel { ...@@ -46,11 +46,6 @@ export default class MainModel {
prop: 'updatedate', prop: 'updatedate',
dataType: 'DATETIME', dataType: 'DATETIME',
}, },
{
name: 'type',
prop: 'type',
dataType: 'PICKUPDATA',
},
{ {
name: 'srfmajortext', name: 'srfmajortext',
prop: 'rolepermission', prop: 'rolepermission',
......
app_web/src/widgets/sys-role-permission/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ 0a057306
...@@ -33,9 +33,6 @@ export default class MPickupViewpickupviewpanelModel { ...@@ -33,9 +33,6 @@ export default class MPickupViewpickupviewpanelModel {
{ {
name: 'permissionname', name: 'permissionname',
}, },
{
name: 'type',
},
{ {
name: 'createdate', name: 'createdate',
}, },
......
app_web/src/widgets/sys-role-permission/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts
浏览文件 @ 0a057306
...@@ -33,9 +33,6 @@ export default class PickupViewpickupviewpanelModel { ...@@ -33,9 +33,6 @@ export default class PickupViewpickupviewpanelModel {
{ {
name: 'permissionname', name: 'permissionname',
}, },
{
name: 'type',
},
{ {
name: 'createdate', name: 'createdate',
}, },
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_PERMISSION.java
浏览文件 @ 0a057306
...@@ -57,10 +57,10 @@ public class SYS_PERMISSION extends EntityMP implements Serializable { ...@@ -57,10 +57,10 @@ public class SYS_PERMISSION extends EntityMP implements Serializable {
/** /**
* 资源类别 * 资源类别
*/ */
@TableField(value = "type") @TableField(value = "permissiontype")
@JSONField(name = "type") @JSONField(name = "permissiontype")
@JsonProperty("type") @JsonProperty("permissiontype")
private String type; private String permissiontype;
/** /**
* 逻辑有效 * 逻辑有效
*/ */
...@@ -87,26 +87,12 @@ public class SYS_PERMISSION extends EntityMP implements Serializable { ...@@ -87,26 +87,12 @@ public class SYS_PERMISSION extends EntityMP implements Serializable {
@JsonProperty("updatedate") @JsonProperty("updatedate")
private Timestamp updatedate; private Timestamp updatedate;
/** /**
* 实体 * 来源
*/ */
@TableField(exist = false) @TableField(exist = false)
@JSONField(name = "psdataentity") @JSONField(name = "pssourcetype")
@JsonProperty("psdataentity") @JsonProperty("pssourcetype")
private String psdataentity; private String pssourcetype;
/**
* 数据集
*/
@TableField(exist = false)
@JSONField(name = "psdedataset")
@JsonProperty("psdedataset")
private String psdedataset;
/**
* 数据范围
*/
@TableField(exist = false)
@JSONField(name = "psdedatarange")
@JsonProperty("psdedatarange")
private String psdedatarange;
/** /**
...@@ -135,9 +121,9 @@ public class SYS_PERMISSION extends EntityMP implements Serializable { ...@@ -135,9 +121,9 @@ public class SYS_PERMISSION extends EntityMP implements Serializable {
/** /**
* 设置 [资源类别] * 设置 [资源类别]
*/ */
public void setType(String type){ public void setPermissiontype(String permissiontype){
this.type = type ; this.permissiontype = permissiontype ;
this.modify("type",type); this.modify("permissiontype",permissiontype);
} }
/** /**
* 设置 [逻辑有效] * 设置 [逻辑有效]
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_PSDEOPPRIV.java
浏览文件 @ 0a057306
...@@ -61,20 +61,6 @@ public class SYS_PSDEOPPRIV extends EntityMP implements Serializable { ...@@ -61,20 +61,6 @@ public class SYS_PSDEOPPRIV extends EntityMP implements Serializable {
@JSONField(name = "psdataentityname") @JSONField(name = "psdataentityname")
@JsonProperty("psdataentityname") @JsonProperty("psdataentityname")
private String psdataentityname; private String psdataentityname;
/**
* 实体数据集标识
*/
@TableField(value = "psdedatasetid")
@JSONField(name = "psdedatasetid")
@JsonProperty("psdedatasetid")
private String psdedatasetid;
/**
* 实体数据集名称
*/
@TableField(value = "psdedatasetname")
@JSONField(name = "psdedatasetname")
@JsonProperty("psdedatasetname")
private String psdedatasetname;
/** /**
* 实体数据范围标识 * 实体数据范围标识
*/ */
...@@ -110,13 +96,6 @@ public class SYS_PSDEOPPRIV extends EntityMP implements Serializable { ...@@ -110,13 +96,6 @@ public class SYS_PSDEOPPRIV extends EntityMP implements Serializable {
@JSONField(name = "pssystemid") @JSONField(name = "pssystemid")
@JsonProperty("pssystemid") @JsonProperty("pssystemid")
private String pssystemid; private String pssystemid;
/**
* 系统资源标识
*/
@TableField(value = "permissionid")
@JSONField(name = "permissionid")
@JsonProperty("permissionid")
private String permissionid;
/** /**
* 建立时间 * 建立时间
*/ */
...@@ -136,12 +115,26 @@ public class SYS_PSDEOPPRIV extends EntityMP implements Serializable { ...@@ -136,12 +115,26 @@ public class SYS_PSDEOPPRIV extends EntityMP implements Serializable {
@JsonProperty("updatedate") @JsonProperty("updatedate")
private Timestamp updatedate; private Timestamp updatedate;
/** /**
* 资源类型 * 数据集/实体行为标识
*/
@TableField(value = "pssourceid")
@JSONField(name = "pssourceid")
@JsonProperty("pssourceid")
private String pssourceid;
/**
* 数据集/实体行为名称
*/
@TableField(value = "pssourcename")
@JSONField(name = "pssourcename")
@JsonProperty("pssourcename")
private String pssourcename;
/**
* 数据集/实体行为类型
*/ */
@TableField(value = "permissiontype") @TableField(value = "pssourcetype")
@JSONField(name = "permissiontype") @JSONField(name = "pssourcetype")
@JsonProperty("permissiontype") @JsonProperty("pssourcetype")
private String permissiontype; private String pssourcetype;
...@@ -166,20 +159,6 @@ public class SYS_PSDEOPPRIV extends EntityMP implements Serializable { ...@@ -166,20 +159,6 @@ public class SYS_PSDEOPPRIV extends EntityMP implements Serializable {
this.psdataentityname = psdataentityname ; this.psdataentityname = psdataentityname ;
this.modify("psdataentityname",psdataentityname); this.modify("psdataentityname",psdataentityname);
} }
/**
* 设置 [实体数据集标识]
*/
public void setPsdedatasetid(String psdedatasetid){
this.psdedatasetid = psdedatasetid ;
this.modify("psdedatasetid",psdedatasetid);
}
/**
* 设置 [实体数据集名称]
*/
public void setPsdedatasetname(String psdedatasetname){
this.psdedatasetname = psdedatasetname ;
this.modify("psdedatasetname",psdedatasetname);
}
/** /**
* 设置 [实体数据范围标识] * 设置 [实体数据范围标识]
*/ */
...@@ -216,18 +195,25 @@ public class SYS_PSDEOPPRIV extends EntityMP implements Serializable { ...@@ -216,18 +195,25 @@ public class SYS_PSDEOPPRIV extends EntityMP implements Serializable {
this.modify("pssystemid",pssystemid); this.modify("pssystemid",pssystemid);
} }
/** /**
* 设置 [系统资源标识] * 设置 [数据集/实体行为标识]
*/
public void setPssourceid(String pssourceid){
this.pssourceid = pssourceid ;
this.modify("pssourceid",pssourceid);
}
/**
* 设置 [数据集/实体行为名称]
*/ */
public void setPermissionid(String permissionid){ public void setPssourcename(String pssourcename){
this.permissionid = permissionid ; this.pssourcename = pssourcename ;
this.modify("permissionid",permissionid); this.modify("pssourcename",pssourcename);
} }
/** /**
* 设置 [资源类型] * 设置 [数据集/实体行为类型]
*/ */
public void setPermissiontype(String permissiontype){ public void setPssourcetype(String pssourcetype){
this.permissiontype = permissiontype ; this.pssourcetype = pssourcetype ;
this.modify("permissiontype",permissiontype); this.modify("pssourcetype",pssourcetype);
} }
} }
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_ROLE_PERMISSION.java
浏览文件 @ 0a057306
...@@ -75,13 +75,6 @@ public class SYS_ROLE_PERMISSION extends EntityMP implements Serializable { ...@@ -75,13 +75,6 @@ public class SYS_ROLE_PERMISSION extends EntityMP implements Serializable {
@JSONField(name = "permissionname") @JSONField(name = "permissionname")
@JsonProperty("permissionname") @JsonProperty("permissionname")
private String permissionname; private String permissionname;
/**
* 资源类型
*/
@TableField(value = "type")
@JSONField(name = "type")
@JsonProperty("type")
private String type;
/** /**
* 建立时间 * 建立时间
*/ */
...@@ -161,13 +154,6 @@ public class SYS_ROLE_PERMISSION extends EntityMP implements Serializable { ...@@ -161,13 +154,6 @@ public class SYS_ROLE_PERMISSION extends EntityMP implements Serializable {
this.permissionname = permissionname ; this.permissionname = permissionname ;
this.modify("sys_permissionname",permissionname); this.modify("sys_permissionname",permissionname);
} }
/**
* 设置 [资源类型]
*/
public void setType(String type){
this.type = type ;
this.modify("type",type);
}
/** /**
* 设置 [系统标识] * 设置 [系统标识]
*/ */
......
ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SYS_PERMISSIONSearchContext.java
浏览文件 @ 0a057306
...@@ -47,11 +47,11 @@ public class SYS_PERMISSIONSearchContext extends QueryWrapperContext<SYS_PERMISS ...@@ -47,11 +47,11 @@ public class SYS_PERMISSIONSearchContext extends QueryWrapperContext<SYS_PERMISS
this.getSelectCond().eq("systemid", n_systemid_eq); this.getSelectCond().eq("systemid", n_systemid_eq);
} }
} }
private String n_type_eq;//[资源类别] private String n_permissiontype_eq;//[资源类别]
public void setN_type_eq(String n_type_eq) { public void setN_permissiontype_eq(String n_permissiontype_eq) {
this.n_type_eq = n_type_eq; this.n_permissiontype_eq = n_permissiontype_eq;
if(!ObjectUtils.isEmpty(this.n_type_eq)){ if(!ObjectUtils.isEmpty(this.n_permissiontype_eq)){
this.getSelectCond().eq("type", n_type_eq); this.getSelectCond().eq("permissiontype", n_permissiontype_eq);
} }
} }
private Integer n_enable_eq;//[逻辑有效] private Integer n_enable_eq;//[逻辑有效]
...@@ -61,25 +61,11 @@ public class SYS_PERMISSIONSearchContext extends QueryWrapperContext<SYS_PERMISS ...@@ -61,25 +61,11 @@ public class SYS_PERMISSIONSearchContext extends QueryWrapperContext<SYS_PERMISS
this.getSelectCond().eq("enable", n_enable_eq); this.getSelectCond().eq("enable", n_enable_eq);
} }
} }
private String n_psdataentity_like;//[实体] private String n_pssourcetype_eq;//[来源]
public void setN_psdataentity_like(String n_psdataentity_like) { public void setN_pssourcetype_eq(String n_pssourcetype_eq) {
this.n_psdataentity_like = n_psdataentity_like; this.n_pssourcetype_eq = n_pssourcetype_eq;
if(!ObjectUtils.isEmpty(this.n_psdataentity_like)){ if(!ObjectUtils.isEmpty(this.n_pssourcetype_eq)){
this.getSelectCond().like("psdataentity", n_psdataentity_like); this.getSelectCond().eq("pssourcetype", n_pssourcetype_eq);
}
}
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/java/cn/ibizlab/core/uaa/filter/SYS_ROLE_PERMISSIONSearchContext.java
浏览文件 @ 0a057306
...@@ -75,13 +75,6 @@ public class SYS_ROLE_PERMISSIONSearchContext extends QueryWrapperContext<SYS_RO ...@@ -75,13 +75,6 @@ public class SYS_ROLE_PERMISSIONSearchContext extends QueryWrapperContext<SYS_RO
this.getSelectCond().like("sys_permissionname", n_sys_permissionname_like); this.getSelectCond().like("sys_permissionname", n_sys_permissionname_like);
} }
} }
private String n_type_eq;//[资源类型]
public void setN_type_eq(String n_type_eq) {
this.n_type_eq = n_type_eq;
if(!ObjectUtils.isEmpty(this.n_type_eq)){
this.getSelectCond().eq("type", n_type_eq);
}
}
/** /**
* 启用快速搜索 * 启用快速搜索
......
ibzuaa-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ 0a057306
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<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"> <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">
<!--输出实体[SYS_PSDEOPPRIV]数据结构 --> <!--输出实体[SYS_PSDEOPPRIV]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_psdeoppriv-51-1"> <changeSet author="a_A_5d9d78509" id="tab-sys_psdeoppriv-92-1">
<createTable tableName="IBZPSDEOPPRIV"> <createTable tableName="IBZPSDEOPPRIV">
<column name="SYS_PSDEOPPRIVID" remarks="" type="VARCHAR(200)"> <column name="SYS_PSDEOPPRIVID" remarks="" type="VARCHAR(200)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_PSDEOPPRIV_SYS_PSDEOPPR"/> <constraints primaryKey="true" primaryKeyName="PK_SYS_PSDEOPPRIV_SYS_PSDEOPPR"/>
...@@ -13,10 +13,6 @@ ...@@ -13,10 +13,6 @@
</column> </column>
<column name="PSDATAENTITYNAME" remarks="" type="VARCHAR(100)"> <column name="PSDATAENTITYNAME" remarks="" type="VARCHAR(100)">
</column> </column>
<column name="PSDEDATASETID" remarks="" type="VARCHAR(100)">
</column>
<column name="PSDEDATASETNAME" remarks="" type="VARCHAR(100)">
</column>
<column name="PSDEDATARANGEID" remarks="" type="VARCHAR(100)"> <column name="PSDEDATARANGEID" remarks="" type="VARCHAR(100)">
</column> </column>
<column name="PSDEDATARANGENAME" remarks="" type="VARCHAR(100)"> <column name="PSDEDATARANGENAME" remarks="" type="VARCHAR(100)">
...@@ -27,13 +23,15 @@ ...@@ -27,13 +23,15 @@
</column> </column>
<column name="PSSYSTEMID" remarks="" type="VARCHAR(100)"> <column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
</column> </column>
<column name="PERMISSIONID" remarks="" type="VARCHAR(100)">
</column>
<column name="CREATEDATE" remarks="" type="DATETIME"> <column name="CREATEDATE" remarks="" type="DATETIME">
</column> </column>
<column name="UPDATEDATE" remarks="" type="DATETIME"> <column name="UPDATEDATE" remarks="" type="DATETIME">
</column> </column>
<column name="PERMISSIONTYPE" remarks="" type="VARCHAR(100)"> <column name="PSSOURCEID" remarks="" type="VARCHAR(100)">
</column>
<column name="PSSOURCENAME" remarks="" type="VARCHAR(100)">
</column>
<column name="PSSOURCETYPE" remarks="" type="VARCHAR(100)">
</column> </column>
</createTable> </createTable>
</changeSet> </changeSet>
...@@ -50,7 +48,7 @@ ...@@ -50,7 +48,7 @@
</createTable> </createTable>
</changeSet> </changeSet>
<!--输出实体[SYS_ROLE_PERMISSION]数据结构 --> <!--输出实体[SYS_ROLE_PERMISSION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_role_permission-28-3"> <changeSet author="a_A_5d9d78509" id="tab-sys_role_permission-44-3">
<createTable tableName="IBZROLE_PERMISSION"> <createTable tableName="IBZROLE_PERMISSION">
<column name="SYS_ROLE_PERMISSIONID" remarks="" type="VARCHAR(100)"> <column name="SYS_ROLE_PERMISSIONID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_PERMISSION_SYS_ROL"/> <constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_PERMISSION_SYS_ROL"/>
...@@ -65,8 +63,6 @@ ...@@ -65,8 +63,6 @@
</column> </column>
<column name="SYS_PERMISSIONNAME" remarks="" type="VARCHAR(200)"> <column name="SYS_PERMISSIONNAME" remarks="" type="VARCHAR(200)">
</column> </column>
<column name="TYPE" remarks="" type="VARCHAR(60)">
</column>
<column name="CREATEDATE" remarks="" type="DATETIME"> <column name="CREATEDATE" remarks="" type="DATETIME">
</column> </column>
<column name="UPDATEDATE" remarks="" type="DATETIME"> <column name="UPDATEDATE" remarks="" type="DATETIME">
...@@ -98,7 +94,7 @@ ...@@ -98,7 +94,7 @@
</createTable> </createTable>
</changeSet> </changeSet>
<!--输出实体[SYS_ROLE]数据结构 --> <!--输出实体[SYS_ROLE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_role-31-5"> <changeSet author="a_A_5d9d78509" id="tab-sys_role-47-5">
<createTable tableName="IBZROLE"> <createTable tableName="IBZROLE">
<column name="SYS_ROLEID" remarks="" type="VARCHAR(100)"> <column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_SYS_ROLEID"/> <constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_SYS_ROLEID"/>
...@@ -124,7 +120,7 @@ ...@@ -124,7 +120,7 @@
</createTable> </createTable>
</changeSet> </changeSet>
<!--输出实体[SYS_PERMISSION]数据结构 --> <!--输出实体[SYS_PERMISSION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-sys_permission-65-7"> <changeSet author="a_A_5d9d78509" id="tab-sys_permission-136-7">
<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"/>
...@@ -133,7 +129,7 @@ ...@@ -133,7 +129,7 @@
</column> </column>
<column name="SYSTEMID" remarks="" type="VARCHAR(100)"> <column name="SYSTEMID" remarks="" type="VARCHAR(100)">
</column> </column>
<column name="TYPE" remarks="" type="VARCHAR(60)"> <column name="PERMISSIONTYPE" remarks="" type="VARCHAR(60)">
</column> </column>
<column name="ENABLE" remarks="" type="INT"> <column name="ENABLE" remarks="" type="INT">
</column> </column>
...@@ -177,7 +173,7 @@ ...@@ -177,7 +173,7 @@
<!--输出实体[SYS_PSDEOPPRIV]外键关系 --> <!--输出实体[SYS_PSDEOPPRIV]外键关系 -->
<!--输出实体[SYS_USER]外键关系 --> <!--输出实体[SYS_USER]外键关系 -->
<!--输出实体[SYS_ROLE_PERMISSION]外键关系 --> <!--输出实体[SYS_ROLE_PERMISSION]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-sys_role_permission-28-9"> <changeSet author="a_A_5d9d78509" id="fk-sys_role_permission-44-9">
<addForeignKeyConstraint baseColumnNames="SYS_PERMISSIONID" baseTableName="IBZROLE_PERMISSION" constraintName="DER1N_SYS_ROLE_PERMISSION_SYS_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_PERMISSIONID" referencedTableName="IBZPERMISSION" validate="true"/> <addForeignKeyConstraint baseColumnNames="SYS_PERMISSIONID" baseTableName="IBZROLE_PERMISSION" constraintName="DER1N_SYS_ROLE_PERMISSION_SYS_" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_PERMISSIONID" referencedTableName="IBZPERMISSION" validate="true"/>
</changeSet> </changeSet>
<!--输出实体[SYS_USER_ROLE]外键关系 --> <!--输出实体[SYS_USER_ROLE]外键关系 -->
......
ibzuaa-core/src/main/resources/mapper/uaa/sys_psdeoppriv/SYS_PSDEOPPRIVMapper.xml
浏览文件 @ 0a057306
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<!--数据查询[Default]--> <!--数据查询[Default]-->
<sql id="Default" databaseId="mysql"> <sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`PERMISSIONID`, t1.`PERMISSIONTYPE`, t1.`PSDATAENTITYID`, t1.`PSDATAENTITYNAME`, t1.`PSDEDATARANGEID`, t1.`PSDEDATARANGENAME`, t1.`PSDEDATASETID`, t1.`PSDEDATASETNAME`, t1.`PSSYSMODULEID`, t1.`PSSYSMODULENAME`, t1.`PSSYSTEMID`, t1.`SYS_PSDEOPPRIVID`, t1.`SYS_PSDEOPPRIVNAME`, t1.`UPDATEDATE` FROM `IBZPSDEOPPRIV` t1 <![CDATA[ SELECT t1.`CREATEDATE`, t1.`PSDATAENTITYID`, t1.`PSDATAENTITYNAME`, t1.`PSDEDATARANGEID`, t1.`PSDEDATARANGENAME`, t1.`PSSOURCEID`, t1.`PSSOURCENAME`, t1.`PSSOURCETYPE`, t1.`PSSYSMODULEID`, t1.`PSSYSMODULENAME`, t1.`PSSYSTEMID`, t1.`SYS_PSDEOPPRIVID`, t1.`SYS_PSDEOPPRIVNAME`, t1.`UPDATEDATE` FROM `IBZPSDEOPPRIV` t1
]]> ]]>
</sql> </sql>
......
ibzuaa-core/src/main/resources/mapper/uaa/sys_role_permission/SYS_ROLE_PERMISSIONMapper.xml
浏览文件 @ 0a057306
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
<!--数据查询[Default]--> <!--数据查询[Default]-->
<sql id="Default" databaseId="mysql"> <sql id="Default" databaseId="mysql">
<![CDATA[ SELECT t1.`CREATEDATE`, t1.`SYSTEMID`, t1.`SYS_PERMISSIONID`, t1.`SYS_PERMISSIONNAME`, t1.`SYS_ROLEID`, t1.`SYS_ROLENAME`, t1.`SYS_ROLE_PERMISSIONID`, t1.`SYS_ROLE_PERMISSIONNAME`, t1.`TYPE`, t1.`UPDATEDATE` FROM `IBZROLE_PERMISSION` t1 <![CDATA[ SELECT t1.`CREATEDATE`, t1.`SYSTEMID`, t1.`SYS_PERMISSIONID`, t1.`SYS_PERMISSIONNAME`, t1.`SYS_ROLEID`, t1.`SYS_ROLENAME`, t1.`SYS_ROLE_PERMISSIONID`, t1.`SYS_ROLE_PERMISSIONNAME`, t1.`UPDATEDATE` FROM `IBZROLE_PERMISSION` t1
]]> ]]>
</sql> </sql>
......
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/dto/SYS_PERMISSIONDTO.java
浏览文件 @ 0a057306
...@@ -48,12 +48,12 @@ public class SYS_PERMISSIONDTO extends DTOBase implements Serializable { ...@@ -48,12 +48,12 @@ public class SYS_PERMISSIONDTO extends DTOBase implements Serializable {
private String pssystemid; private String pssystemid;
/** /**
* 属性 [TYPE] * 属性 [PERMISSIONTYPE]
* *
*/ */
@JSONField(name = "type") @JSONField(name = "permissiontype")
@JsonProperty("type") @JsonProperty("permissiontype")
private String type; private String permissiontype;
/** /**
* 属性 [ENABLE] * 属性 [ENABLE]
...@@ -82,28 +82,12 @@ public class SYS_PERMISSIONDTO extends DTOBase implements Serializable { ...@@ -82,28 +82,12 @@ public class SYS_PERMISSIONDTO extends DTOBase implements Serializable {
private Timestamp updatedate; private Timestamp updatedate;
/** /**
* 属性 [PSDATAENTITY] * 属性 [PSSOURCETYPE]
* *
*/ */
@JSONField(name = "psdataentity") @JSONField(name = "pssourcetype")
@JsonProperty("psdataentity") @JsonProperty("pssourcetype")
private String psdataentity; private String pssourcetype;
/**
* 属性 [PSDEDATASET]
*
*/
@JSONField(name = "psdedataset")
@JsonProperty("psdedataset")
private String psdedataset;
/**
* 属性 [PSDEDATARANGE]
*
*/
@JSONField(name = "psdedatarange")
@JsonProperty("psdedatarange")
private String psdedatarange;
/** /**
...@@ -123,11 +107,11 @@ public class SYS_PERMISSIONDTO extends DTOBase implements Serializable { ...@@ -123,11 +107,11 @@ public class SYS_PERMISSIONDTO extends DTOBase implements Serializable {
} }
/** /**
* 设置 [TYPE] * 设置 [PERMISSIONTYPE]
*/ */
public void setType(String type){ public void setPermissiontype(String permissiontype){
this.type = type ; this.permissiontype = permissiontype ;
this.modify("type",type); this.modify("permissiontype",permissiontype);
} }
/** /**
......
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/dto/SYS_PSDEOPPRIVDTO.java
浏览文件 @ 0a057306
...@@ -55,22 +55,6 @@ public class SYS_PSDEOPPRIVDTO extends DTOBase implements Serializable { ...@@ -55,22 +55,6 @@ public class SYS_PSDEOPPRIVDTO extends DTOBase implements Serializable {
@JsonProperty("psdataentityname") @JsonProperty("psdataentityname")
private String psdataentityname; private String psdataentityname;
/**
* 属性 [PSDEDATASETID]
*
*/
@JSONField(name = "psdedatasetid")
@JsonProperty("psdedatasetid")
private String psdedatasetid;
/**
* 属性 [PSDEDATASETNAME]
*
*/
@JSONField(name = "psdedatasetname")
@JsonProperty("psdedatasetname")
private String psdedatasetname;
/** /**
* 属性 [PSDEDATARANGEID] * 属性 [PSDEDATARANGEID]
* *
...@@ -111,14 +95,6 @@ public class SYS_PSDEOPPRIVDTO extends DTOBase implements Serializable { ...@@ -111,14 +95,6 @@ public class SYS_PSDEOPPRIVDTO extends DTOBase implements Serializable {
@JsonProperty("pssystemid") @JsonProperty("pssystemid")
private String pssystemid; private String pssystemid;
/**
* 属性 [PERMISSIONID]
*
*/
@JSONField(name = "permissionid")
@JsonProperty("permissionid")
private String permissionid;
/** /**
* 属性 [CREATEDATE] * 属性 [CREATEDATE]
* *
...@@ -138,12 +114,28 @@ public class SYS_PSDEOPPRIVDTO extends DTOBase implements Serializable { ...@@ -138,12 +114,28 @@ public class SYS_PSDEOPPRIVDTO extends DTOBase implements Serializable {
private Timestamp updatedate; private Timestamp updatedate;
/** /**
* 属性 [PERMISSIONTYPE] * 属性 [PSSOURCEID]
*
*/
@JSONField(name = "pssourceid")
@JsonProperty("pssourceid")
private String pssourceid;
/**
* 属性 [PSSOURCENAME]
* *
*/ */
@JSONField(name = "permissiontype") @JSONField(name = "pssourcename")
@JsonProperty("permissiontype") @JsonProperty("pssourcename")
private String permissiontype; private String pssourcename;
/**
* 属性 [PSSOURCETYPE]
*
*/
@JSONField(name = "pssourcetype")
@JsonProperty("pssourcetype")
private String pssourcetype;
/** /**
...@@ -170,22 +162,6 @@ public class SYS_PSDEOPPRIVDTO extends DTOBase implements Serializable { ...@@ -170,22 +162,6 @@ public class SYS_PSDEOPPRIVDTO extends DTOBase implements Serializable {
this.modify("psdataentityname",psdataentityname); this.modify("psdataentityname",psdataentityname);
} }
/**
* 设置 [PSDEDATASETID]
*/
public void setPsdedatasetid(String psdedatasetid){
this.psdedatasetid = psdedatasetid ;
this.modify("psdedatasetid",psdedatasetid);
}
/**
* 设置 [PSDEDATASETNAME]
*/
public void setPsdedatasetname(String psdedatasetname){
this.psdedatasetname = psdedatasetname ;
this.modify("psdedatasetname",psdedatasetname);
}
/** /**
* 设置 [PSDEDATARANGEID] * 设置 [PSDEDATARANGEID]
*/ */
...@@ -227,19 +203,27 @@ public class SYS_PSDEOPPRIVDTO extends DTOBase implements Serializable { ...@@ -227,19 +203,27 @@ public class SYS_PSDEOPPRIVDTO extends DTOBase implements Serializable {
} }
/** /**
* 设置 [PERMISSIONID] * 设置 [PSSOURCEID]
*/
public void setPssourceid(String pssourceid){
this.pssourceid = pssourceid ;
this.modify("pssourceid",pssourceid);
}
/**
* 设置 [PSSOURCENAME]
*/ */
public void setPermissionid(String permissionid){ public void setPssourcename(String pssourcename){
this.permissionid = permissionid ; this.pssourcename = pssourcename ;
this.modify("permissionid",permissionid); this.modify("pssourcename",pssourcename);
} }
/** /**
* 设置 [PERMISSIONTYPE] * 设置 [PSSOURCETYPE]
*/ */
public void setPermissiontype(String permissiontype){ public void setPssourcetype(String pssourcetype){
this.permissiontype = permissiontype ; this.pssourcetype = pssourcetype ;
this.modify("permissiontype",permissiontype); this.modify("pssourcetype",pssourcetype);
} }
......
ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/dto/SYS_ROLE_PERMISSIONDTO.java
浏览文件 @ 0a057306
...@@ -71,14 +71,6 @@ public class SYS_ROLE_PERMISSIONDTO extends DTOBase implements Serializable { ...@@ -71,14 +71,6 @@ public class SYS_ROLE_PERMISSIONDTO extends DTOBase implements Serializable {
@JsonProperty("permissionname") @JsonProperty("permissionname")
private String permissionname; private String permissionname;
/**
* 属性 [TYPE]
*
*/
@JSONField(name = "type")
@JsonProperty("type")
private String type;
/** /**
* 属性 [CREATEDATE] * 属性 [CREATEDATE]
* *
...@@ -146,14 +138,6 @@ public class SYS_ROLE_PERMISSIONDTO extends DTOBase implements Serializable { ...@@ -146,14 +138,6 @@ public class SYS_ROLE_PERMISSIONDTO extends DTOBase implements Serializable {
this.modify("sys_permissionname",permissionname); this.modify("sys_permissionname",permissionname);
} }
/**
* 设置 [TYPE]
*/
public void setType(String type){
this.type = type ;
this.modify("type",type);
}
/** /**
* 设置 [SYSTEMID] * 设置 [SYSTEMID]
*/ */
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或