ibizdev提交

app_web/public/assets/json/data-dictionary.json

  [
         {
-        "srfkey": "CLPermissionType",
+        "srfkey": "CLSourceType",
         "emptytext": "未定义",
         "codelisttype":"static",
         "items": [
              {
-                "id": "0",
-                "label": "菜单",
-                "text": "菜单",
-                "value": "0",
+                "id": "DEACTION",
+                "label": "实体行为",
+                "text": "实体行为",
+                "value": "DEACTION",
                 
                 "disabled": false
             }
             , {
-                "id": "1",
-                "label": "数据对象能力",
-                "text": "数据对象能力",
-                "value": "1",
-                
-                "disabled": false
-            }
-            , {
-                "id": "2",
-                "label": "统一资源",
-                "text": "统一资源",
-                "value": "2",
+                "id": "DATASET",
+                "label": "数据集合",
+                "text": "数据集合",
+                "value": "DATASET",
                 
                 "disabled": false
             }

app_web/public/assets/json/view-config.json

@@ -16,7 +16,7 @@
         "viewtag": "12f53853382743f095a6af867669d8c1"
     },
     "sys_rolepickupgridview": {
-        "title": "角色表选择表格视图",
+        "title": "角色选择表格视图",
         "caption": "系统角色",
         "viewtype": "DEPICKUPGRIDVIEW",
         "viewmodule": "uaa",
@@ -72,7 +72,7 @@
         "viewtag": "42f3fa04c9dc77f235207bcbe6ac3888"
     },
     "sys_roleeditview2": {
-        "title": "角色表编辑视图",
+        "title": "角色编辑视图",
         "caption": "系统角色",
         "viewtype": "DEEDITVIEW2",
         "viewmodule": "uaa",
@@ -112,7 +112,7 @@
         "viewtag": "6cd33d562ef19ad47dd26b312b9a020e"
     },
     "sys_roleeditview": {
-        "title": "角色表编辑视图",
+        "title": "角色编辑视图",
         "caption": "系统角色",
         "viewtype": "DEEDITVIEW",
         "viewmodule": "uaa",
@@ -152,7 +152,7 @@
         "viewtag": "87e2742f27704bc23e3848796e6f6ef8"
     },
     "sys_rolepickupview": {
-        "title": "角色表数据选择视图",
+        "title": "角色数据选择视图",
         "caption": "系统角色",
         "viewtype": "DEPICKUPVIEW",
         "viewmodule": "uaa",
@@ -168,7 +168,7 @@
         "viewtag": "8fa92a05b6911e82d9b20fd5aa37a838"
     },
     "sys_roleredirectview": {
-        "title": "角色表数据重定向视图",
+        "title": "角色数据重定向视图",
         "caption": "系统角色",
         "viewtype": "DEREDIRECTVIEW",
         "viewmodule": "uaa",
@@ -200,7 +200,7 @@
         "viewtag": "9c0b351150648f7661be53c10eaabd67"
     },
     "sys_rolegridview": {
-        "title": "角色表表格视图",
+        "title": "角色表格视图",
         "caption": "系统角色",
         "viewtype": "DEGRIDVIEW",
         "viewmodule": "uaa",
@@ -240,7 +240,7 @@
         "viewtag": "cb64b5009e70f225a91046314f40977a"
     },
     "sys_rolempickupview": {
-        "title": "角色表数据多项选择视图",
+        "title": "角色数据多项选择视图",
         "caption": "系统角色",
         "viewtype": "DEMPICKUPVIEW",
         "viewmodule": "uaa",

app_web/src/locale/lanres/codelist/codelist_en_US.ts

 export default {
-    CLPermissionType: {
-        '0': '菜单',
-        '1': '数据对象能力',
-        '2': '统一资源',
+    CLSourceType: {
+        'DEACTION': '实体行为',
+        'DATASET': '数据集合',
         empty: '',
     },
 };
\ No newline at end of file

app_web/src/locale/lanres/codelist/codelist_zh_CN.ts

 export default {
-    CLPermissionType: {
-        '0': '菜单',
-        '1': '数据对象能力',
-        '2': '统一资源',
+    CLSourceType: {
+        'DEACTION': '实体行为',
+        'DATASET': '数据集合',
         empty: '',
     },
 };
\ No newline at end of file

app_web/src/locale/lanres/sys-permission/sys-permission_en_US.ts

@@ -4,13 +4,11 @@ export default {
     permissionid: '资源标识',
     permissionname: '资源名称',
     pssystemid: '系统标识',
-    type: '资源类别',
+    permissiontype: '资源类别',
     enable: '逻辑有效',
     createdate: '建立时间',
     updatedate: '更新时间',
-    psdataentity: '实体',
-    psdedataset: '数据集',
-    psdedatarange: '数据范围',
+    pssourcetype: '来源',
   },
 	views: {
 		gridview: {
@@ -44,7 +42,6 @@ export default {
 	},
 	main_form: {
 		details: {
-			group1: "权限表基本信息", 
 			formpage1: "基本信息", 
 			srfupdatedate: "更新时间", 
 			srforikey: "", 
@@ -54,21 +51,17 @@ export default {
 			srfuf: "", 
 			srfdeid: "", 
 			srfsourcekey: "", 
-			systemid: "系统标识", 
 			sys_permissionname: "资源名称", 
+			pssourcetype: "来源", 
 			sys_permissionid: "资源标识", 
-			type: "资源类别", 
 		},
 		uiactions: {
 		},
 	},
 	main_grid: {
 		columns: {
-			sys_permissionid: "资源标识",
 			sys_permissionname: "资源名称",
-			psdataentity: "实体",
-			psdedatarange: "数据范围",
-			psdedataset: "数据集",
+			pssourcetype: "来源",
 		},
 		uiactions: {
 		},
@@ -76,10 +69,8 @@ export default {
 	default_searchform: {
 		details: {
 			formpage1: "常规条件", 
-			n_psdataentity_like: "实体(%)", 
-			n_psdedataset_like: "数据集(%)", 
-			n_psdedatarange_like: "数据范围(%)", 
 			n_sys_permissionname_like: "资源名称(%)", 
+			n_pssourcetype_eq: "来源(=)", 
 		},
 		uiactions: {
 		},

app_web/src/locale/lanres/sys-permission/sys-permission_zh_CN.ts

@@ -3,13 +3,11 @@ export default {
     permissionid: '资源标识',
     permissionname: '资源名称',
     pssystemid: '系统标识',
-    type: '资源类别',
+    permissiontype: '资源类别',
     enable: '逻辑有效',
     createdate: '建立时间',
     updatedate: '更新时间',
-    psdataentity: '实体',
-    psdedataset: '数据集',
-    psdedatarange: '数据范围',
+    pssourcetype: '来源',
   },
 	views: {
 		gridview: {
@@ -43,7 +41,6 @@ export default {
 	},
 	main_form: {
 		details: {
-			group1: '权限表基本信息', 
 			formpage1: '基本信息', 
 			srfupdatedate: '更新时间', 
 			srforikey: '', 
@@ -53,21 +50,17 @@ export default {
 			srfuf: '', 
 			srfdeid: '', 
 			srfsourcekey: '', 
-			systemid: '系统标识', 
 			sys_permissionname: '资源名称', 
+			pssourcetype: '来源', 
 			sys_permissionid: '资源标识', 
-			type: '资源类别', 
 		},
 		uiactions: {
 		},
 	},
 	main_grid: {
 		columns: {
-			sys_permissionid: '资源标识',
 			sys_permissionname: '资源名称',
-			psdataentity: '实体',
-			psdedatarange: '数据范围',
-			psdedataset: '数据集',
+			pssourcetype: '来源',
 		},
 		uiactions: {
 		},
@@ -75,10 +68,8 @@ export default {
 	default_searchform: {
 		details: {
 			formpage1: '常规条件', 
-			n_psdataentity_like: '实体(%)', 
-			n_psdedataset_like: '数据集(%)', 
-			n_psdedatarange_like: '数据范围(%)', 
 			n_sys_permissionname_like: '资源名称(%)', 
+			n_pssourcetype_eq: '来源(=)', 
 		},
 		uiactions: {
 		},

app_web/src/locale/lanres/sys-psdeoppriv/sys-psdeoppriv_en_US.ts

@@ -5,16 +5,15 @@ export default {
     psdeopprivname: '实体数据操作标识名称',
     psdataentityid: '实体标识',
     psdataentityname: '实体名称',
-    psdedatasetid: '实体数据集标识',
-    psdedatasetname: '实体数据集名称',
     psdedatarangeid: '实体数据范围标识',
     psdedatarangename: '实体数据范围名称',
     pssysmoduleid: '系统模块标识',
     pssysmodulename: '系统模块名称',
     pssystemid: '系统标识',
-    permissionid: '系统资源标识',
     createdate: '建立时间',
     updatedate: '更新时间',
-    permissiontype: '资源类型',
+    pssourceid: '数据集/实体行为标识',
+    pssourcename: '数据集/实体行为名称',
+    pssourcetype: '数据集/实体行为类型',
   },
 };
\ No newline at end of file

app_web/src/locale/lanres/sys-psdeoppriv/sys-psdeoppriv_zh_CN.ts

@@ -4,16 +4,15 @@ export default {
     psdeopprivname: '实体数据操作标识名称',
     psdataentityid: '实体标识',
     psdataentityname: '实体名称',
-    psdedatasetid: '实体数据集标识',
-    psdedatasetname: '实体数据集名称',
     psdedatarangeid: '实体数据范围标识',
     psdedatarangename: '实体数据范围名称',
     pssysmoduleid: '系统模块标识',
     pssysmodulename: '系统模块名称',
     pssystemid: '系统标识',
-    permissionid: '系统资源标识',
     createdate: '建立时间',
     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

@@ -7,7 +7,6 @@ export default {
     rolename: '角色名称',
     permissionid: '权限表标识',
     permissionname: '权限名称',
-    type: '资源类型',
     createdate: '建立时间',
     updatedate: '更新时间',
     systemid: '系统标识',
@@ -55,7 +54,6 @@ export default {
 			srfdeid: "", 
 			srfsourcekey: "", 
 			sys_rolename: "角色名称", 
-			type: "资源类型", 
 			sys_permissionname: "权限名称", 
 			sys_permissionid: "权限表标识", 
 			sys_roleid: "角色表标识", 
@@ -68,7 +66,6 @@ export default {
 		columns: {
 			sys_rolename: "角色名称",
 			sys_permissionname: "权限名称",
-			type: "资源类型",
 			updatedate: "更新时间",
 		},
 		uiactions: {

app_web/src/locale/lanres/sys-role-permission/sys-role-permission_zh_CN.ts

@@ -6,7 +6,6 @@ export default {
     rolename: '角色名称',
     permissionid: '权限表标识',
     permissionname: '权限名称',
-    type: '资源类型',
     createdate: '建立时间',
     updatedate: '更新时间',
     systemid: '系统标识',
@@ -54,7 +53,6 @@ export default {
 			srfdeid: '', 
 			srfsourcekey: '', 
 			sys_rolename: '角色名称', 
-			type: '资源类型', 
 			sys_permissionname: '权限名称', 
 			sys_permissionid: '权限表标识', 
 			sys_roleid: '角色表标识', 
@@ -67,7 +65,6 @@ export default {
 		columns: {
 			sys_rolename: '角色名称',
 			sys_permissionname: '权限名称',
-			type: '资源类型',
 			updatedate: '更新时间',
 		},
 		uiactions: {

app_web/src/mock/codelist/codelist.ts

@@ -8,31 +8,23 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
     let status = MockAdapter.mockStatus(config);
     return [status, [
         {
-        srfkey: 'CLPermissionType',
+        srfkey: 'CLSourceType',
         emptytext: '未定义',
         "codelisttype":"static",
         items: [
             {
-                id: '0',
-                label: '菜单',
-                text: '菜单',
-                value: '0',
+                id: 'DEACTION',
+                label: '实体行为',
+                text: '实体行为',
+                value: 'DEACTION',
                 
                 disabled: false,
             },
             {
-                id: '1',
-                label: '数据对象能力',
-                text: '数据对象能力',
-                value: '1',
-                
-                disabled: false,
-            },
-            {
-                id: '2',
-                label: '统一资源',
-                text: '统一资源',
-                value: '2',
+                id: 'DATASET',
+                label: '数据集合',
+                text: '数据集合',
+                value: 'DATASET',
                 
                 disabled: false,
             },

app_web/src/mock/viewconfig/viewconfig.ts

@@ -24,7 +24,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtag": "12f53853382743f095a6af867669d8c1"
         },
         "sys_rolepickupgridview": {
-            "title": "角色表选择表格视图",
+            "title": "角色选择表格视图",
             "caption": "系统角色",
             "viewtype": "DEPICKUPGRIDVIEW",
             "viewmodule": "uaa",
@@ -80,7 +80,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtag": "42f3fa04c9dc77f235207bcbe6ac3888"
         },
         "sys_roleeditview2": {
-            "title": "角色表编辑视图",
+            "title": "角色编辑视图",
             "caption": "系统角色",
             "viewtype": "DEEDITVIEW2",
             "viewmodule": "uaa",
@@ -120,7 +120,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtag": "6cd33d562ef19ad47dd26b312b9a020e"
         },
         "sys_roleeditview": {
-            "title": "角色表编辑视图",
+            "title": "角色编辑视图",
             "caption": "系统角色",
             "viewtype": "DEEDITVIEW",
             "viewmodule": "uaa",
@@ -160,7 +160,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtag": "87e2742f27704bc23e3848796e6f6ef8"
         },
         "sys_rolepickupview": {
-            "title": "角色表数据选择视图",
+            "title": "角色数据选择视图",
             "caption": "系统角色",
             "viewtype": "DEPICKUPVIEW",
             "viewmodule": "uaa",
@@ -176,7 +176,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtag": "8fa92a05b6911e82d9b20fd5aa37a838"
         },
         "sys_roleredirectview": {
-            "title": "角色表数据重定向视图",
+            "title": "角色数据重定向视图",
             "caption": "系统角色",
             "viewtype": "DEREDIRECTVIEW",
             "viewmodule": "uaa",
@@ -208,7 +208,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtag": "9c0b351150648f7661be53c10eaabd67"
         },
         "sys_rolegridview": {
-            "title": "角色表表格视图",
+            "title": "角色表格视图",
             "caption": "系统角色",
             "viewtype": "DEGRIDVIEW",
             "viewmodule": "uaa",
@@ -248,7 +248,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtag": "cb64b5009e70f225a91046314f40977a"
         },
         "sys_rolempickupview": {
-            "title": "角色表数据多项选择视图",
+            "title": "角色数据多项选择视图",
             "caption": "系统角色",
             "viewtype": "DEMPICKUPVIEW",
             "viewmodule": "uaa",

app_web/src/widgets/sys-permission/default-drbar/default-drbar-model.ts

@@ -25,7 +25,7 @@ export default class DefaultModel {
         name: 'pssystemid',
       },
       {
-        name: 'type',
+        name: 'permissiontype',
       },
       {
         name: 'enable',
@@ -37,13 +37,7 @@ export default class DefaultModel {
         name: 'updatedate',
       },
       {
-        name: 'psdataentity',
-      },
-      {
-        name: 'psdedataset',
-      },
-      {
-        name: 'psdedatarange',
+        name: 'pssourcetype',
       },
     ]
   }

app_web/src/widgets/sys-permission/default-searchform/default-searchform-model.ts

@@ -26,23 +26,13 @@ export default class DefaultModel {
         dataType: 'TEXT',
       },
       {
-        name: 'n_psdataentity_like',
-        prop: 'psdataentity',
-        dataType: 'TEXT',
-      },
-      {
-        name: 'n_psdedataset_like',
-        prop: 'psdedataset',
-        dataType: 'TEXT',
-      },
-      {
-        name: 'n_psdedatarange_like',
-        prop: 'psdedatarange',
+        name: 'n_sys_permissionname_like',
+        prop: 'permissionname',
         dataType: 'TEXT',
       },
       {
-        name: 'n_sys_permissionname_like',
-        prop: 'permissionname',
+        name: 'n_pssourcetype_eq',
+        prop: 'pssourcetype',
         dataType: 'TEXT',
       },
     ]

app_web/src/widgets/sys-permission/main-form/main-form-model.ts

@@ -56,13 +56,13 @@ export default class MainModel {
         name: 'srfsourcekey',
       },
       {
-        name: 'systemid',
-        prop: 'pssystemid',
+        name: 'sys_permissionname',
+        prop: 'permissionname',
         dataType: 'TEXT',
       },
       {
-        name: 'sys_permissionname',
-        prop: 'permissionname',
+        name: 'pssourcetype',
+        prop: 'pssourcetype',
         dataType: 'TEXT',
       },
       {
@@ -70,11 +70,6 @@ export default class MainModel {
         prop: 'permissionid',
         dataType: 'GUID',
       },
-      {
-        name: 'type',
-        prop: 'type',
-        dataType: 'SSCODELIST',
-      },
       {
         name: 'sys_permission',
         prop: 'permissionid',

app_web/src/widgets/sys-permission/main-form/main-form-service.ts

@@ -160,7 +160,6 @@ export default class MainService extends ControlService {
     @Errorlog
     public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         const {data:Data,context:Context} = this.handleRequestData(action,context,data);
-        Object.assign(Data,{permissionid: data.permissionid, srffrontuf: '1'});
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;

app_web/src/widgets/sys-permission/main-grid/main-grid-base.vue

@@ -16,13 +16,6 @@
             <template v-if="!isSingleSelect">
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </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')">
                 <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}">
@@ -30,24 +23,12 @@
                     </template>
                 </el-table-column>
             </template>
-            <template v-if="getColumnState('psdataentity')">
-                <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-if="getColumnState('pssourcetype')">
+                <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}">
-                        <span>{{row.psdataentity}}</span>
+                        <template >
+            <codelist :value="row.pssourcetype" tag='CLSourceType' codelistType='STATIC' ></codelist>
                         </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>
                 </el-table-column>
             </template>
@@ -508,13 +489,6 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof Main
      */
     protected allColumns: any[] = [
-        {
-            name: 'sys_permissionid',
-            label: '资源标识',
-            langtag: 'entities.sys_permission.main_grid.columns.sys_permissionid',
-            show: true,
-            util: 'px'
-        },
         {
             name: 'sys_permissionname',
             label: '资源名称',
@@ -523,23 +497,9 @@ export default class MainBase extends Vue implements ControlInterface {
             util: 'PX'
         },
         {
-            name: 'psdataentity',
-            label: '实体',
-            langtag: 'entities.sys_permission.main_grid.columns.psdataentity',
-            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',
+            name: 'pssourcetype',
+            label: '来源',
+            langtag: 'entities.sys_permission.main_grid.columns.pssourcetype',
             show: true,
             util: 'px'
         },
@@ -858,6 +818,14 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public async formatExcelData(filterVal:any, jsonData:any) {
         let codelistColumns:Array<any> = [
+          {
+            name: 'pssourcetype',
+            srfkey: 'CLSourceType',
+            codelistType : 'STATIC',
+            renderMode: 'other',
+            textSeparator: '、',
+            valueSeparator: ';',
+          },
         ];
         let _this = this;
         for (const codelist of codelistColumns) {

app_web/src/widgets/sys-permission/main-grid/main-grid-model.ts

@@ -27,23 +27,8 @@ export default class MainModel {
     }else{
 		  return [
         {
-          name: 'psdataentity',
-          prop: 'psdataentity',
-          dataType: 'TEXT',
-        },
-        {
-          name: 'sys_permissionid',
-          prop: 'permissionid',
-          dataType: 'GUID',
-        },
-        {
-          name: 'psdedatarange',
-          prop: 'psdedatarange',
-          dataType: 'TEXT',
-        },
-        {
-          name: 'psdedataset',
-          prop: 'psdedataset',
+          name: 'pssourcetype',
+          prop: 'pssourcetype',
           dataType: 'TEXT',
         },
         {
@@ -71,23 +56,13 @@ export default class MainModel {
           prop: 'permissionid',
         },
       {
-        name: 'n_psdataentity_like',
-        prop: 'n_psdataentity_like',
-        dataType: 'TEXT',
-      },
-      {
-        name: 'n_psdedataset_like',
-        prop: 'n_psdedataset_like',
-        dataType: 'TEXT',
-      },
-      {
-        name: 'n_psdedatarange_like',
-        prop: 'n_psdedatarange_like',
+        name: 'n_sys_permissionname_like',
+        prop: 'n_sys_permissionname_like',
         dataType: 'TEXT',
       },
       {
-        name: 'n_sys_permissionname_like',
-        prop: 'n_sys_permissionname_like',
+        name: 'n_pssourcetype_eq',
+        prop: 'n_pssourcetype_eq',
         dataType: 'TEXT',
       },
 

app_web/src/widgets/sys-permission/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-model.ts

@@ -25,7 +25,7 @@ export default class MPickupViewpickupviewpanelModel {
         name: 'pssystemid',
       },
       {
-        name: 'type',
+        name: 'permissiontype',
       },
       {
         name: 'enable',
@@ -37,13 +37,7 @@ export default class MPickupViewpickupviewpanelModel {
         name: 'updatedate',
       },
       {
-        name: 'psdataentity',
-      },
-      {
-        name: 'psdedataset',
-      },
-      {
-        name: 'psdedatarange',
+        name: 'pssourcetype',
       },
     ]
   }

app_web/src/widgets/sys-permission/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts

@@ -25,7 +25,7 @@ export default class PickupViewpickupviewpanelModel {
         name: 'pssystemid',
       },
       {
-        name: 'type',
+        name: 'permissiontype',
       },
       {
         name: 'enable',
@@ -37,13 +37,7 @@ export default class PickupViewpickupviewpanelModel {
         name: 'updatedate',
       },
       {
-        name: 'psdataentity',
-      },
-      {
-        name: 'psdedataset',
-      },
-      {
-        name: 'psdedatarange',
+        name: 'pssourcetype',
       },
     ]
   }

app_web/src/widgets/sys-role-permission/default-drbar/default-drbar-model.ts

@@ -33,9 +33,6 @@ export default class DefaultModel {
       {
         name: 'permissionname',
       },
-      {
-        name: 'type',
-      },
       {
         name: 'createdate',
       },

app_web/src/widgets/sys-role-permission/main-form/main-form-base.vue

@@ -31,13 +31,6 @@
 
 </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 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">
@@ -63,13 +56,6 @@
 
 </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>
     
     </row>
@@ -377,7 +363,6 @@ export default class MainBase extends Vue implements ControlInterface {
         srfdeid: null,
         srfsourcekey: null,
         sys_rolename: null,
-        type: null,
         sys_permissionname: null,
         sys_permissionid: null,
         sys_roleid: null,
@@ -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: '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: [
             { type: 'string', message: '权限名称 值必须为字符串类型', trigger: 'change' },
             { type: 'string', message: '权限名称 值必须为字符串类型', trigger: 'blur' },
@@ -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 })
 , 
         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 })
 , 
@@ -659,18 +636,6 @@ export default class MainBase extends Vue implements ControlInterface {
         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 值
      *
@@ -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

@@ -60,11 +60,6 @@ export default class MainModel {
         prop: 'rolename',
         dataType: 'PICKUPTEXT',
       },
-      {
-        name: 'type',
-        prop: 'type',
-        dataType: 'PICKUPDATA',
-      },
       {
         name: 'sys_permissionname',
         prop: 'permissionname',

app_web/src/widgets/sys-role-permission/main-form/main-form-service.ts

@@ -184,7 +184,6 @@ export default class MainService extends ControlService {
     @Errorlog
     public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         const {data:Data,context:Context} = this.handleRequestData(action,context,data);
-        Object.assign(Data,{rolepermissionid: data.rolepermissionid, srffrontuf: '1'});
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;

app_web/src/widgets/sys-role-permission/main-grid/main-grid-base.vue

@@ -44,15 +44,6 @@
                     </template>
                 </el-table-column>
             </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')">
                 <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}">
@@ -531,13 +522,6 @@ export default class MainBase extends Vue implements ControlInterface {
             show: true,
             util: 'px'
         },
-        {
-            name: 'type',
-            label: '资源类型',
-            langtag: 'entities.sys_role_permission.main_grid.columns.type',
-            show: true,
-            util: 'px'
-        },
         {
             name: 'updatedate',
             label: '更新时间',
@@ -860,14 +844,6 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public async formatExcelData(filterVal:any, jsonData:any) {
         let codelistColumns:Array<any> = [
-          {
-            name: 'type',
-            srfkey: 'CLPermissionType',
-            codelistType : 'STATIC',
-            renderMode: 'other',
-            textSeparator: '、',
-            valueSeparator: ';',
-          },
         ];
         let _this = this;
         for (const codelist of codelistColumns) {

app_web/src/widgets/sys-role-permission/main-grid/main-grid-model.ts

@@ -46,11 +46,6 @@ export default class MainModel {
           prop: 'updatedate',
           dataType: 'DATETIME',
         },
-        {
-          name: 'type',
-          prop: 'type',
-          dataType: 'PICKUPDATA',
-        },
         {
           name: 'srfmajortext',
           prop: 'rolepermission',

app_web/src/widgets/sys-role-permission/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-model.ts

@@ -33,9 +33,6 @@ export default class MPickupViewpickupviewpanelModel {
       {
         name: 'permissionname',
       },
-      {
-        name: 'type',
-      },
       {
         name: 'createdate',
       },

app_web/src/widgets/sys-role-permission/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts

@@ -33,9 +33,6 @@ export default class PickupViewpickupviewpanelModel {
       {
         name: 'permissionname',
       },
-      {
-        name: 'type',
-      },
       {
         name: 'createdate',
       },

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_PERMISSION.java

@@ -57,10 +57,10 @@ public class SYS_PERMISSION extends EntityMP implements Serializable {
     /**
      * 资源类别
      */
-    @TableField(value = "type")
-    @JSONField(name = "type")
-    @JsonProperty("type")
-    private String type;
+    @TableField(value = "permissiontype")
+    @JSONField(name = "permissiontype")
+    @JsonProperty("permissiontype")
+    private String permissiontype;
     /**
      * 逻辑有效
      */
@@ -87,26 +87,12 @@ public class SYS_PERMISSION extends EntityMP implements Serializable {
     @JsonProperty("updatedate")
     private Timestamp updatedate;
     /**
-     * 实体
+     * 来源
      */
     @TableField(exist = false)
-    @JSONField(name = "psdataentity")
-    @JsonProperty("psdataentity")
-    private String psdataentity;
-    /**
-     * 数据集
-     */
-    @TableField(exist = false)
-    @JSONField(name = "psdedataset")
-    @JsonProperty("psdedataset")
-    private String psdedataset;
-    /**
-     * 数据范围
-     */
-    @TableField(exist = false)
-    @JSONField(name = "psdedatarange")
-    @JsonProperty("psdedatarange")
-    private String psdedatarange;
+    @JSONField(name = "pssourcetype")
+    @JsonProperty("pssourcetype")
+    private String pssourcetype;
 
 
     /**
@@ -135,9 +121,9 @@ public class SYS_PERMISSION extends EntityMP implements Serializable {
     /**
      * 设置 [资源类别]
      */
-    public void setType(String type){
-        this.type = type ;
-        this.modify("type",type);
+    public void setPermissiontype(String permissiontype){
+        this.permissiontype = permissiontype ;
+        this.modify("permissiontype",permissiontype);
     }
     /**
      * 设置 [逻辑有效]

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_PSDEOPPRIV.java

@@ -61,20 +61,6 @@ public class SYS_PSDEOPPRIV extends EntityMP implements Serializable {
     @JSONField(name = "psdataentityname")
     @JsonProperty("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 {
     @JSONField(name = "pssystemid")
     @JsonProperty("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 {
     @JsonProperty("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")
-    @JSONField(name = "permissiontype")
-    @JsonProperty("permissiontype")
-    private String permissiontype;
+    @TableField(value = "pssourcetype")
+    @JSONField(name = "pssourcetype")
+    @JsonProperty("pssourcetype")
+    private String pssourcetype;
 
 
 
@@ -166,20 +159,6 @@ public class SYS_PSDEOPPRIV extends EntityMP implements Serializable {
         this.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 {
         this.modify("pssystemid",pssystemid);
     }
     /**
-     * 设置 [系统资源标识]
+     * 设置 [数据集/实体行为标识]
+     */
+    public void setPssourceid(String pssourceid){
+        this.pssourceid = pssourceid ;
+        this.modify("pssourceid",pssourceid);
+    }
+    /**
+     * 设置 [数据集/实体行为名称]
      */
-    public void setPermissionid(String permissionid){
-        this.permissionid = permissionid ;
-        this.modify("permissionid",permissionid);
+    public void setPssourcename(String pssourcename){
+        this.pssourcename = pssourcename ;
+        this.modify("pssourcename",pssourcename);
     }
     /**
-     * 设置 [资源类型]
+     * 设置 [数据集/实体行为类型]
      */
-    public void setPermissiontype(String permissiontype){
-        this.permissiontype = permissiontype ;
-        this.modify("permissiontype",permissiontype);
+    public void setPssourcetype(String pssourcetype){
+        this.pssourcetype = pssourcetype ;
+        this.modify("pssourcetype",pssourcetype);
     }
 }
 

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_ROLE_PERMISSION.java

@@ -75,13 +75,6 @@ public class SYS_ROLE_PERMISSION extends EntityMP implements Serializable {
     @JSONField(name = "permissionname")
     @JsonProperty("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 {
         this.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

@@ -47,11 +47,11 @@ public class SYS_PERMISSIONSearchContext extends QueryWrapperContext<SYS_PERMISS
             this.getSelectCond().eq("systemid", n_systemid_eq);
         }
     }
-	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);
+	private String n_permissiontype_eq;//[资源类别]
+	public void setN_permissiontype_eq(String n_permissiontype_eq) {
+        this.n_permissiontype_eq = n_permissiontype_eq;
+        if(!ObjectUtils.isEmpty(this.n_permissiontype_eq)){
+            this.getSelectCond().eq("permissiontype", n_permissiontype_eq);
         }
     }
 	private Integer n_enable_eq;//[逻辑有效]
@@ -61,25 +61,11 @@ public class SYS_PERMISSIONSearchContext extends QueryWrapperContext<SYS_PERMISS
             this.getSelectCond().eq("enable", n_enable_eq);
         }
     }
-	private String n_psdataentity_like;//[实体]
-	public void setN_psdataentity_like(String n_psdataentity_like) {
-        this.n_psdataentity_like = n_psdataentity_like;
-        if(!ObjectUtils.isEmpty(this.n_psdataentity_like)){
-            this.getSelectCond().like("psdataentity", n_psdataentity_like);
-        }
-    }
-	private String n_psdedataset_like;//[数据集]
-	public void setN_psdedataset_like(String n_psdedataset_like) {
-        this.n_psdedataset_like = n_psdedataset_like;
-        if(!ObjectUtils.isEmpty(this.n_psdedataset_like)){
-            this.getSelectCond().like("psdedataset", n_psdedataset_like);
-        }
-    }
-	private String n_psdedatarange_like;//[数据范围]
-	public void setN_psdedatarange_like(String n_psdedatarange_like) {
-        this.n_psdedatarange_like = n_psdedatarange_like;
-        if(!ObjectUtils.isEmpty(this.n_psdedatarange_like)){
-            this.getSelectCond().like("psdedatarange", n_psdedatarange_like);
+	private String n_pssourcetype_eq;//[来源]
+	public void setN_pssourcetype_eq(String n_pssourcetype_eq) {
+        this.n_pssourcetype_eq = n_pssourcetype_eq;
+        if(!ObjectUtils.isEmpty(this.n_pssourcetype_eq)){
+            this.getSelectCond().eq("pssourcetype", n_pssourcetype_eq);
         }
     }
 

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SYS_ROLE_PERMISSIONSearchContext.java

@@ -75,13 +75,6 @@ public class SYS_ROLE_PERMISSIONSearchContext extends QueryWrapperContext<SYS_RO
             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

@@ -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">
 
     <!--输出实体[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">
                 <column name="SYS_PSDEOPPRIVID" remarks="" type="VARCHAR(200)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_PSDEOPPRIV_SYS_PSDEOPPR"/>
@@ -13,10 +13,6 @@
                 </column>
                 <column name="PSDATAENTITYNAME" remarks="" type="VARCHAR(100)">
                 </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>
                 <column name="PSDEDATARANGENAME" remarks="" type="VARCHAR(100)">
@@ -27,13 +23,15 @@
                 </column>
                 <column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
                 </column>
-                <column name="PERMISSIONID" remarks="" type="VARCHAR(100)">
-                </column>
                 <column name="CREATEDATE" remarks="" type="DATETIME">
                 </column>
                 <column name="UPDATEDATE" remarks="" type="DATETIME">
                 </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>
         </createTable>
     </changeSet>
@@ -50,7 +48,7 @@
         </createTable>
     </changeSet>
     <!--输出实体[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">
                 <column name="SYS_ROLE_PERMISSIONID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_PERMISSION_SYS_ROL"/>
@@ -65,8 +63,6 @@
                 </column>
                 <column name="SYS_PERMISSIONNAME" remarks="" type="VARCHAR(200)">
                 </column>
-                <column name="TYPE" remarks="" type="VARCHAR(60)">
-                </column>
                 <column name="CREATEDATE" remarks="" type="DATETIME">
                 </column>
                 <column name="UPDATEDATE" remarks="" type="DATETIME">
@@ -98,7 +94,7 @@
         </createTable>
     </changeSet>
     <!--输出实体[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">
                 <column name="SYS_ROLEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_ROLE_SYS_ROLEID"/>
@@ -124,7 +120,7 @@
         </createTable>
     </changeSet>
     <!--输出实体[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">
                 <column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_PERMISSION_SYS_PERMISSI"/>
@@ -133,7 +129,7 @@
                 </column>
                 <column name="SYSTEMID" remarks="" type="VARCHAR(100)">
                 </column>
-                <column name="TYPE" remarks="" type="VARCHAR(60)">
+                <column name="PERMISSIONTYPE" remarks="" type="VARCHAR(60)">
                 </column>
                 <column name="ENABLE" remarks="" type="INT">
                 </column>
@@ -177,7 +173,7 @@
         <!--输出实体[SYS_PSDEOPPRIV]外键关系 -->
         <!--输出实体[SYS_USER]外键关系 -->
         <!--输出实体[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"/>
     </changeSet>
         <!--输出实体[SYS_USER_ROLE]外键关系 -->

ibzuaa-core/src/main/resources/mapper/uaa/sys_psdeoppriv/SYS_PSDEOPPRIVMapper.xml

@@ -25,7 +25,7 @@
 
     <!--数据查询[Default]-->
     <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>
 

ibzuaa-core/src/main/resources/mapper/uaa/sys_role_permission/SYS_ROLE_PERMISSIONMapper.xml

@@ -47,7 +47,7 @@
 
     <!--数据查询[Default]-->
     <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>
 

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/dto/SYS_PERMISSIONDTO.java

@@ -48,12 +48,12 @@ public class SYS_PERMISSIONDTO extends DTOBase implements Serializable {
     private String pssystemid;
 
     /**
-     * 属性 [TYPE]
+     * 属性 [PERMISSIONTYPE]
      *
      */
-    @JSONField(name = "type")
-    @JsonProperty("type")
-    private String type;
+    @JSONField(name = "permissiontype")
+    @JsonProperty("permissiontype")
+    private String permissiontype;
 
     /**
      * 属性 [ENABLE]
@@ -82,28 +82,12 @@ public class SYS_PERMISSIONDTO extends DTOBase implements Serializable {
     private Timestamp updatedate;
 
     /**
-     * 属性 [PSDATAENTITY]
+     * 属性 [PSSOURCETYPE]
      *
      */
-    @JSONField(name = "psdataentity")
-    @JsonProperty("psdataentity")
-    private String psdataentity;
-
-    /**
-     * 属性 [PSDEDATASET]
-     *
-     */
-    @JSONField(name = "psdedataset")
-    @JsonProperty("psdedataset")
-    private String psdedataset;
-
-    /**
-     * 属性 [PSDEDATARANGE]
-     *
-     */
-    @JSONField(name = "psdedatarange")
-    @JsonProperty("psdedatarange")
-    private String psdedatarange;
+    @JSONField(name = "pssourcetype")
+    @JsonProperty("pssourcetype")
+    private String pssourcetype;
 
 
     /**
@@ -123,11 +107,11 @@ public class SYS_PERMISSIONDTO extends DTOBase implements Serializable {
     }
 
     /**
-     * 设置 [TYPE]
+     * 设置 [PERMISSIONTYPE]
      */
-    public void setType(String  type){
-        this.type = type ;
-        this.modify("type",type);
+    public void setPermissiontype(String  permissiontype){
+        this.permissiontype = permissiontype ;
+        this.modify("permissiontype",permissiontype);
     }
 
     /**

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/dto/SYS_PSDEOPPRIVDTO.java

@@ -55,22 +55,6 @@ public class SYS_PSDEOPPRIVDTO extends DTOBase implements Serializable {
     @JsonProperty("psdataentityname")
     private String psdataentityname;
 
-    /**
-     * 属性 [PSDEDATASETID]
-     *
-     */
-    @JSONField(name = "psdedatasetid")
-    @JsonProperty("psdedatasetid")
-    private String psdedatasetid;
-
-    /**
-     * 属性 [PSDEDATASETNAME]
-     *
-     */
-    @JSONField(name = "psdedatasetname")
-    @JsonProperty("psdedatasetname")
-    private String psdedatasetname;
-
     /**
      * 属性 [PSDEDATARANGEID]
      *
@@ -111,14 +95,6 @@ public class SYS_PSDEOPPRIVDTO extends DTOBase implements Serializable {
     @JsonProperty("pssystemid")
     private String pssystemid;
 
-    /**
-     * 属性 [PERMISSIONID]
-     *
-     */
-    @JSONField(name = "permissionid")
-    @JsonProperty("permissionid")
-    private String permissionid;
-
     /**
      * 属性 [CREATEDATE]
      *
@@ -138,12 +114,28 @@ public class SYS_PSDEOPPRIVDTO extends DTOBase implements Serializable {
     private Timestamp updatedate;
 
     /**
-     * 属性 [PERMISSIONTYPE]
+     * 属性 [PSSOURCEID]
+     *
+     */
+    @JSONField(name = "pssourceid")
+    @JsonProperty("pssourceid")
+    private String pssourceid;
+
+    /**
+     * 属性 [PSSOURCENAME]
      *
      */
-    @JSONField(name = "permissiontype")
-    @JsonProperty("permissiontype")
-    private String permissiontype;
+    @JSONField(name = "pssourcename")
+    @JsonProperty("pssourcename")
+    private String pssourcename;
+
+    /**
+     * 属性 [PSSOURCETYPE]
+     *
+     */
+    @JSONField(name = "pssourcetype")
+    @JsonProperty("pssourcetype")
+    private String pssourcetype;
 
 
     /**
@@ -170,22 +162,6 @@ public class SYS_PSDEOPPRIVDTO extends DTOBase implements Serializable {
         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]
      */
@@ -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){
-        this.permissionid = permissionid ;
-        this.modify("permissionid",permissionid);
+    public void setPssourcename(String  pssourcename){
+        this.pssourcename = pssourcename ;
+        this.modify("pssourcename",pssourcename);
     }
 
     /**
-     * 设置 [PERMISSIONTYPE]
+     * 设置 [PSSOURCETYPE]
      */
-    public void setPermissiontype(String  permissiontype){
-        this.permissiontype = permissiontype ;
-        this.modify("permissiontype",permissiontype);
+    public void setPssourcetype(String  pssourcetype){
+        this.pssourcetype = pssourcetype ;
+        this.modify("pssourcetype",pssourcetype);
     }
 
 

ibzuaa-provider/ibzuaa-provider-api/src/main/java/cn/ibizlab/api/dto/SYS_ROLE_PERMISSIONDTO.java

@@ -71,14 +71,6 @@ public class SYS_ROLE_PERMISSIONDTO extends DTOBase implements Serializable {
     @JsonProperty("permissionname")
     private String permissionname;
 
-    /**
-     * 属性 [TYPE]
-     *
-     */
-    @JSONField(name = "type")
-    @JsonProperty("type")
-    private String type;
-
     /**
      * 属性 [CREATEDATE]
      *
@@ -146,14 +138,6 @@ public class SYS_ROLE_PERMISSIONDTO extends DTOBase implements Serializable {
         this.modify("sys_permissionname",permissionname);
     }
 
-    /**
-     * 设置 [TYPE]
-     */
-    public void setType(String  type){
-        this.type = type ;
-        this.modify("type",type);
-    }
-
     /**
      * 设置 [SYSTEMID]
      */