ibizdev提交

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

@@ -3,7 +3,7 @@ export default {
   fields: {
     permissionid: '资源标识',
     permissionname: '资源名称',
-    pssystemid: '系统标识',
+    pssystemid: '系统',
     permissiontype: '资源类别',
     enable: '逻辑有效',
     createdate: '建立时间',
@@ -72,6 +72,7 @@ export default {
 	default_searchform: {
 		details: {
 			formpage1: "常规条件", 
+			n_systemid_like: "系统(%)", 
 			n_sys_permissionname_like: "资源名称(%)", 
 			n_permissiontype_eq: "资源类别(=)", 
 			n_pssourcetype_eq: "来源(=)", 

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

@@ -2,7 +2,7 @@ export default {
   fields: {
     permissionid: '资源标识',
     permissionname: '资源名称',
-    pssystemid: '系统标识',
+    pssystemid: '系统',
     permissiontype: '资源类别',
     enable: '逻辑有效',
     createdate: '建立时间',
@@ -71,6 +71,7 @@ export default {
 	default_searchform: {
 		details: {
 			formpage1: '常规条件', 
+			n_systemid_like: '系统(%)', 
 			n_sys_permissionname_like: '资源名称(%)', 
 			n_permissiontype_eq: '资源类别(=)', 
 			n_pssourcetype_eq: '来源(=)', 

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

@@ -4,7 +4,13 @@
   <row>
     <i-col span="20" class="form-content">
       <row>
-                    <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_systemid_like.visible" :style="{}"  :md="{ span: 6, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
+              <app-form-item name='n_systemid_like' :itemRules="this.rules.n_systemid_like" class='' :caption="$t('entities.sys_permission.default_searchform.details.n_systemid_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_systemid_like.error" :isEmptyCaption="false" labelPos="LEFT"> 
+              <input-box v-model="data.n_systemid_like"  @enter="onEnter($event)"    :disabled="detailsModel.n_systemid_like.disabled" type='text'  style="width:100px;"></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 }">
               <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>
           </app-form-item>
@@ -268,6 +274,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      * @memberof DefaultBase
      */
     public data: any = {
+        n_systemid_like: null,
         n_sys_permissionname_like: null,
         n_permissiontype_eq: null,
         n_pssourcetype_eq: null,
@@ -281,6 +288,12 @@ export default class DefaultBase extends Vue implements ControlInterface {
      * @memberof DefaultBase
      */
     public rules: any = {
+        n_systemid_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: [
             { type: 'string', message: '资源名称(%) 值必须为字符串类型', trigger: 'change' },
             { type: 'string', message: '资源名称(%) 值必须为字符串类型', trigger: 'blur' },
@@ -315,6 +328,8 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public detailsModel: any = {
         formpage1: new FormPageModel({ caption: '常规条件', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this })
+, 
+        n_systemid_like: new FormItemModel({ caption: '系统(%)', detailType: 'FORMITEM', name: 'n_systemid_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 })
 , 
@@ -326,6 +341,18 @@ export default class DefaultBase extends Vue implements ControlInterface {
 , 
     };
 
+    /**
+     * 监控表单属性 n_systemid_like 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof DefaultBase
+     */
+    @Watch('data.n_systemid_like')
+    onN_systemid_likeChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'n_systemid_like', newVal: newVal, oldVal: oldVal });
+    }
+
     /**
      * 监控表单属性 n_sys_permissionname_like 值
      *
@@ -399,6 +426,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
 
 
 
+
     }
 
     /**

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

@@ -25,6 +25,11 @@ export default class DefaultModel {
         prop: 'srffrontuf',
         dataType: 'TEXT',
       },
+      {
+        name: 'n_systemid_like',
+        prop: 'pssystemid',
+        dataType: 'TEXT',
+      },
       {
         name: 'n_sys_permissionname_like',
         prop: 'permissionname',

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

@@ -65,6 +65,11 @@ export default class MainModel {
           name: 'sys_permission',
           prop: 'permissionid',
         },
+      {
+        name: 'n_systemid_like',
+        prop: 'n_systemid_like',
+        dataType: 'TEXT',
+      },
       {
         name: 'n_sys_permissionname_like',
         prop: 'n_sys_permissionname_like',

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

@@ -49,7 +49,7 @@ public class SYS_PERMISSION extends EntityMP implements Serializable {
     @JsonProperty("permissionname")
     private String permissionname;
     /**
-     * 系统标识
+     * 系统
      */
     @DEField(name = "systemid")
     @TableField(value = "systemid")
@@ -121,7 +121,7 @@ public class SYS_PERMISSION extends EntityMP implements Serializable {
         this.modify("sys_permissionname",permissionname);
     }
     /**
-     * 设置 [系统标识]
+     * 设置 [系统]
      */
     public void setPssystemid(String pssystemid){
         this.pssystemid = pssystemid ;

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

@@ -41,11 +41,11 @@ public class SYS_PERMISSIONSearchContext extends QueryWrapperContext<SYS_PERMISS
             this.getSelectCond().like("sys_permissionname", n_sys_permissionname_like);
         }
     }
-	private String n_systemid_eq;//[系统标识]
-	public void setN_systemid_eq(String n_systemid_eq) {
-        this.n_systemid_eq = n_systemid_eq;
-        if(!ObjectUtils.isEmpty(this.n_systemid_eq)){
-            this.getSelectCond().eq("systemid", n_systemid_eq);
+	private String n_systemid_like;//[系统]
+	public void setN_systemid_like(String n_systemid_like) {
+        this.n_systemid_like = n_systemid_like;
+        if(!ObjectUtils.isEmpty(this.n_systemid_like)){
+            this.getSelectCond().like("systemid", n_systemid_like);
         }
     }
 	private String n_permissiontype_eq;//[资源类别]

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-179-6">
+    <changeSet author="a_A_5d9d78509" id="tab-sys_permission-191-6">
         <createTable tableName="IBZPERMISSION">
                 <column name="SYS_PERMISSIONID" remarks="" type="VARCHAR(200)">
                     <constraints primaryKey="true" primaryKeyName="PK_SYS_PERMISSION_SYS_PERMISSI"/>