ibizdev提交

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

@@ -66,6 +66,7 @@ export default {
 			n_sys_permissionname_like: "资源名称(%)", 
 			n_type_eq: "资源类别(=)", 
 			n_systemid_eq: "系统标识(=)", 
+			n_sys_permissionid_like: "资源标识(%)", 
 		},
 		uiactions: {
 		},

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

@@ -65,6 +65,7 @@ export default {
 			n_sys_permissionname_like: '资源名称(%)', 
 			n_type_eq: '资源类别(=)', 
 			n_systemid_eq: '系统标识(=)', 
+			n_sys_permissionid_like: '资源标识(%)', 
 		},
 		uiactions: {
 		},

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

@@ -21,6 +21,12 @@
               <input-box v-model="data.n_systemid_eq"  @enter="onEnter($event)"    :disabled="detailsModel.n_systemid_eq.disabled" type='text'  style="width:100px;"></input-box>
           </app-form-item>
           
+          </i-col>
+          <i-col v-show="detailsModel.n_sys_permissionid_like.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+              <app-form-item name='n_sys_permissionid_like' :itemRules="this.rules.n_sys_permissionid_like" class='' :caption="$t('entities.sys_permission.default_searchform.details.n_sys_permissionid_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_sys_permissionid_like.error" :isEmptyCaption="false" labelPos="LEFT"> 
+              <app-span :value="data.n_sys_permissionid_like" style="width:100px;"></app-span>
+          </app-form-item>
+          
           </i-col>
       </row>
     </i-col>
@@ -265,6 +271,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
         n_sys_permissionname_like: null,
         n_type_eq: null,
         n_systemid_eq: null,
+        n_sys_permissionid_like: null,
     };
 
     /**
@@ -292,6 +299,12 @@ export default class DefaultBase extends Vue implements ControlInterface {
             { required: false, type: 'string', message: '系统标识(=) 值不能为空', trigger: 'change' },
             { required: false, type: 'string', message: '系统标识(=) 值不能为空', trigger: 'blur' },
         ],
+        n_sys_permissionid_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' },
+        ],
     }
 
     /**
@@ -308,6 +321,8 @@ export default class DefaultBase extends Vue implements ControlInterface {
         n_type_eq: new FormItemModel({ caption: '资源类别(=)', detailType: 'FORMITEM', name: 'n_type_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
         n_systemid_eq: new FormItemModel({ caption: '系统标识(=)', detailType: 'FORMITEM', name: 'n_systemid_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
+, 
+        n_sys_permissionid_like: new FormItemModel({ caption: '资源标识(%)', detailType: 'FORMITEM', name: 'n_sys_permissionid_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
     };
 
@@ -347,6 +362,18 @@ export default class DefaultBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'n_systemid_eq', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 n_sys_permissionid_like 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof DefaultBase
+     */
+    @Watch('data.n_sys_permissionid_like')
+    onN_sys_permissionid_likeChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'n_sys_permissionid_like', newVal: newVal, oldVal: oldVal });
+    }
+
 
     /**
      * 重置表单项值
@@ -371,6 +398,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
 
 
 
+
     }
 
     /**

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

@@ -40,6 +40,16 @@ export default class DefaultModel {
         prop: 'pssystemid',
         dataType: 'TEXT',
       },
+      {
+        name: 'n_sys_permissionid_like',
+        prop: 'permissionid',
+        dataType: 'GUID',
+      },
+      {
+        name: 'sys_permission',
+        prop: 'permissionid',
+        dataType: 'FONTKEY',
+      },
     ]
   }
 

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

@@ -160,6 +160,7 @@ export default class DefaultService 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-model.ts

@@ -80,6 +80,16 @@ export default class MainModel {
         prop: 'n_systemid_eq',
         dataType: 'TEXT',
       },
+      {
+        name: 'n_sys_permissionid_like',
+        prop: 'n_sys_permissionid_like',
+        dataType: 'GUID',
+      },
+      {
+        name: 'sys_permission',
+        prop: 'permissionid',
+        dataType: 'FONTKEY',
+      },
 
         {
           name:'size',

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

@@ -26,6 +26,13 @@ import cn.ibizlab.core.uaa.domain.SYS_PERMISSION;
 @Data
 public class SYS_PERMISSIONSearchContext extends QueryWrapperContext<SYS_PERMISSION> {
 
+	private String n_sys_permissionid_like;//[资源标识]
+	public void setN_sys_permissionid_like(String n_sys_permissionid_like) {
+        this.n_sys_permissionid_like = n_sys_permissionid_like;
+        if(!ObjectUtils.isEmpty(this.n_sys_permissionid_like)){
+            this.getSelectCond().like("sys_permissionid", n_sys_permissionid_like);
+        }
+    }
 	private String n_sys_permissionname_like;//[资源名称]
 	public void setN_sys_permissionname_like(String n_sys_permissionname_like) {
         this.n_sys_permissionname_like = n_sys_permissionname_like;

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

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