ibizdev提交

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

  [
+        {
+        "srfkey": "CLPermissionType",
+        "emptytext": "未定义",
+        "codelisttype":"static",
+        "items": [
+             {
+                "id": "OPPRIV",
+                "label": "数据对象能力",
+                "text": "数据对象能力",
+                "value": "OPPRIV",
+                
+                "disabled": false
+            }
+            , {
+                "id": "UNIRES",
+                "label": "统一资源",
+                "text": "统一资源",
+                "value": "UNIRES",
+                
+                "disabled": false
+            }
+        ]
+    }, 
     {
         "srfkey": "CLSourceType",
         "emptytext": "未定义",

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

 export default {
+    CLPermissionType: {
+        'OPPRIV': '数据对象能力',
+        'UNIRES': '统一资源',
+        empty: '',
+    },
     CLSourceType: {
         'DEACTION': '实体行为',
         'DATASET': '数据集合',

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

 export default {
+    CLPermissionType: {
+        'OPPRIV': '数据对象能力',
+        'UNIRES': '统一资源',
+        empty: '',
+    },
     CLSourceType: {
         'DEACTION': '实体行为',
         'DATASET': '数据集合',

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

@@ -73,6 +73,7 @@ export default {
 		details: {
 			formpage1: "常规条件", 
 			n_sys_permissionname_like: "资源名称(%)", 
+			n_permissiontype_eq: "资源类别(=)", 
 			n_pssourcetype_eq: "来源(=)", 
 			n_pssourcename_like: "来源名称(%)", 
 		},

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

@@ -72,6 +72,7 @@ export default {
 		details: {
 			formpage1: '常规条件', 
 			n_sys_permissionname_like: '资源名称(%)', 
+			n_permissiontype_eq: '资源类别(=)', 
 			n_pssourcetype_eq: '来源(=)', 
 			n_pssourcename_like: '来源名称(%)', 
 		},

app_web/src/mock/codelist/codelist.ts

@@ -7,6 +7,29 @@ import Mock from 'mockjs'
 mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
     let status = MockAdapter.mockStatus(config);
     return [status, [
+        {
+        srfkey: 'CLPermissionType',
+        emptytext: '未定义',
+        "codelisttype":"static",
+        items: [
+            {
+                id: 'OPPRIV',
+                label: '数据对象能力',
+                text: '数据对象能力',
+                value: 'OPPRIV',
+                
+                disabled: false,
+            },
+            {
+                id: 'UNIRES',
+                label: '统一资源',
+                text: '统一资源',
+                value: 'UNIRES',
+                
+                disabled: false,
+            },
+        ]
+    },
     {
         srfkey: 'CLSourceType',
         emptytext: '未定义',

app_web/src/pages/uaa/sys-permissionpickup-view/sys-permissionpickup-view-base.vue

 <template>
 <div class="view-container depickupview sys-permissionpickup-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_permissionpickupview"></app-studioaction>
-    <card class='view-card' :dis-hover="true" :padding="0" :bordered="false">
+    <card class='view-card view-no-caption' :dis-hover="true" :padding="0" :bordered="false">
         <div class="content-container pickup-view">
             <view_pickupviewpanel 
                 :viewState="viewState"  

app_web/src/pages/uaa/sys-role-permissionpickup-view/sys-role-permissionpickup-view-base.vue

 <template>
 <div class="view-container depickupview sys-role-permissionpickup-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_role_permissionpickupview"></app-studioaction>
-    <card class='view-card' :dis-hover="true" :padding="0" :bordered="false">
+    <card class='view-card view-no-caption' :dis-hover="true" :padding="0" :bordered="false">
         <div class="content-container pickup-view">
             <view_pickupviewpanel 
                 :viewState="viewState"  

app_web/src/pages/uaa/sys-rolepickup-view/sys-rolepickup-view-base.vue

 <template>
 <div class="view-container depickupview sys-rolepickup-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_rolepickupview"></app-studioaction>
-    <card class='view-card' :dis-hover="true" :padding="0" :bordered="false">
+    <card class='view-card view-no-caption' :dis-hover="true" :padding="0" :bordered="false">
         <div class="content-container pickup-view">
             <view_pickupviewpanel 
                 :viewState="viewState"  

app_web/src/pages/uaa/sys-user-rolepickup-view/sys-user-rolepickup-view-base.vue

 <template>
 <div class="view-container depickupview sys-user-rolepickup-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_user_rolepickupview"></app-studioaction>
-    <card class='view-card' :dis-hover="true" :padding="0" :bordered="false">
+    <card class='view-card view-no-caption' :dis-hover="true" :padding="0" :bordered="false">
         <div class="content-container pickup-view">
             <view_pickupviewpanel 
                 :viewState="viewState"  

app_web/src/pages/uaa/sys-userpickup-view/sys-userpickup-view-base.vue

 <template>
 <div class="view-container depickupview sys-userpickup-view">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="sys_userpickupview"></app-studioaction>
-    <card class='view-card' :dis-hover="true" :padding="0" :bordered="false">
+    <card class='view-card view-no-caption' :dis-hover="true" :padding="0" :bordered="false">
         <div class="content-container pickup-view">
             <view_pickupviewpanel 
                 :viewState="viewState"  

app_web/src/widgets/sys-permission/default-searchform/default-searchform-base.vue

@@ -9,6 +9,12 @@
               <input-box v-model="data.n_sys_permissionname_like"  @enter="onEnter($event)"    :disabled="detailsModel.n_sys_permissionname_like.disabled" type='text'  style="width:100px;"></input-box>
           </app-form-item>
           
+          </i-col>
+          <i-col v-show="detailsModel.n_permissiontype_eq.visible" :style="{}"  :md="{ span: 6, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
+              <app-form-item name='n_permissiontype_eq' :itemRules="this.rules.n_permissiontype_eq" class='' :caption="$t('entities.sys_permission.default_searchform.details.n_permissiontype_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_permissiontype_eq.error" :isEmptyCaption="false" labelPos="LEFT"> 
+               <dropdown-list v-model="data.n_permissiontype_eq" :data="data" :itemParam="{}" :disabled="detailsModel.n_permissiontype_eq.disabled"  tag='CLPermissionType' codelistType='STATIC' placeholder='请选择...' style="width:100px;"></dropdown-list>
+          </app-form-item>
+          
           </i-col>
           <i-col 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"> 
@@ -263,6 +269,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     protected data: any = {
         n_sys_permissionname_like: null,
+        n_permissiontype_eq: null,
         n_pssourcetype_eq: null,
         n_pssourcename_like: null,
     };
@@ -280,6 +287,12 @@ export default class DefaultBase extends Vue implements ControlInterface {
             { required: false, type: 'string', message: '资源名称(%) 值不能为空', trigger: 'change' },
             { required: false, type: 'string', message: '资源名称(%) 值不能为空', trigger: 'blur' },
         ],
+        n_permissiontype_eq: [
+            { type: 'string', message: '资源类别(=) 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '资源类别(=) 值必须为字符串类型', trigger: 'blur' },
+            { required: false, type: 'string', message: '资源类别(=) 值不能为空', trigger: 'change' },
+            { required: false, type: 'string', message: '资源类别(=) 值不能为空', trigger: 'blur' },
+        ],
         n_pssourcetype_eq: [
             { type: 'string', message: '来源(=) 值必须为字符串类型', trigger: 'change' },
             { type: 'string', message: '来源(=) 值必须为字符串类型', trigger: 'blur' },
@@ -304,6 +317,8 @@ export default class DefaultBase extends Vue implements ControlInterface {
         formpage1: new FormPageModel({ caption: '常规条件', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this })
 , 
         n_sys_permissionname_like: new FormItemModel({ caption: '资源名称(%)', detailType: 'FORMITEM', name: 'n_sys_permissionname_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+, 
+        n_permissiontype_eq: new FormItemModel({ caption: '资源类别(=)', detailType: 'FORMITEM', name: 'n_permissiontype_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         n_pssourcetype_eq: new FormItemModel({ caption: '来源(=)', detailType: 'FORMITEM', name: 'n_pssourcetype_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
@@ -323,6 +338,18 @@ export default class DefaultBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'n_sys_permissionname_like', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 n_permissiontype_eq 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof DefaultBase
+     */
+    @Watch('data.n_permissiontype_eq')
+    onN_permissiontype_eqChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'n_permissiontype_eq', newVal: newVal, oldVal: oldVal });
+    }
+
     /**
      * 监控表单属性 n_pssourcetype_eq 值
      *
@@ -371,6 +398,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
 
 
 
+
     }
 
     /**

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

@@ -30,6 +30,11 @@ export default class DefaultModel {
         prop: 'permissionname',
         dataType: 'TEXT',
       },
+      {
+        name: 'n_permissiontype_eq',
+        prop: 'permissiontype',
+        dataType: 'SSCODELIST',
+      },
       {
         name: 'n_pssourcetype_eq',
         prop: 'pssourcetype',

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

@@ -70,6 +70,11 @@ export default class MainModel {
         prop: 'n_sys_permissionname_like',
         dataType: 'TEXT',
       },
+      {
+        name: 'n_permissiontype_eq',
+        prop: 'n_permissiontype_eq',
+        dataType: 'SSCODELIST',
+      },
       {
         name: 'n_pssourcetype_eq',
         prop: 'n_pssourcetype_eq',

config.xml

@@ -32,7 +32,6 @@
     <hudson.tasks.Shell>
       <command>
       BUILD_ID=DONTKILLME
-      echo "registry.cn-shanghai.aliyuncs.com/ibizsys"
       source /etc/profile
       rm -rf ibzuaa
 	  git clone -b master $para2 ibzuaa/

ibzuaa-core/src/main/resources/liquibase/h2_table.xml

@@ -116,7 +116,7 @@
         </createTable>
     </changeSet>
     <!--输出实体[SYS_PERMISSION]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-sys_permission-165-6">
+    <changeSet author="a_A_5d9d78509" id="tab-sys_permission-175-6">
         <createTable tableName="IBZPERMISSION">
                 <column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_PERMISSION_SYS_PERMISSI"/>