ibizdev提交

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

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

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

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

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

@@ -15,6 +15,12 @@
                <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 v-show="detailsModel.n_pssourcename_like.visible" :style="{}"  :md="{ span: 6, offset: 0 }" :lg="{ span: 6, offset: 0 }" :xl="{ span: 6, offset: 0 }">
+              <app-form-item name='n_pssourcename_like' :itemRules="this.rules.n_pssourcename_like" class='' :caption="$t('entities.sys_permission.default_searchform.details.n_pssourcename_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_pssourcename_like.error" :isEmptyCaption="false" labelPos="LEFT"> 
+              <input-box v-model="data.n_pssourcename_like"  @enter="onEnter($event)"    :disabled="detailsModel.n_pssourcename_like.disabled" type='text'  style=""></input-box>
+          </app-form-item>
+          
           </i-col>
       </row>
     </i-col>
@@ -258,6 +264,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
     protected data: any = {
         n_sys_permissionname_like: null,
         n_pssourcetype_eq: null,
+        n_pssourcename_like: null,
     };
 
     /**
@@ -279,6 +286,12 @@ export default class DefaultBase extends Vue implements ControlInterface {
             { required: false, type: 'string', message: '来源(=) 值不能为空', trigger: 'change' },
             { required: false, type: 'string', message: '来源(=) 值不能为空', trigger: 'blur' },
         ],
+        n_pssourcename_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' },
+        ],
     }
 
     /**
@@ -293,6 +306,8 @@ export default class DefaultBase extends Vue implements ControlInterface {
         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_pssourcename_like: new FormItemModel({ caption: '来源名称(%)', detailType: 'FORMITEM', name: 'n_pssourcename_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
 , 
     };
 
@@ -320,6 +335,18 @@ export default class DefaultBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'n_pssourcetype_eq', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 n_pssourcename_like 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof DefaultBase
+     */
+    @Watch('data.n_pssourcename_like')
+    onN_pssourcename_likeChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'n_pssourcename_like', newVal: newVal, oldVal: oldVal });
+    }
+
 
     /**
      * 重置表单项值
@@ -343,6 +370,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
 
 
 
+
     }
 
     /**

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

@@ -35,6 +35,11 @@ export default class DefaultModel {
         prop: 'pssourcetype',
         dataType: 'TEXT',
       },
+      {
+        name: 'n_pssourcename_like',
+        prop: 'pssourcename',
+        dataType: 'TEXT',
+      },
     ]
   }
 

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

@@ -75,6 +75,11 @@ export default class MainModel {
         prop: 'n_pssourcetype_eq',
         dataType: 'TEXT',
       },
+      {
+        name: 'n_pssourcename_like',
+        prop: 'n_pssourcename_like',
+        dataType: 'TEXT',
+      },
 
         {
           name:'size',

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

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