ibizdev提交

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

@@ -63,6 +63,9 @@ export default {
 	default_searchform: {
 		details: {
 			formpage1: "常规条件", 
+			n_sys_permissionname_like: "资源名称(%)", 
+			n_type_eq: "资源类别(=)", 
+			n_systemid_eq: "系统标识(=)", 
 		},
 		uiactions: {
 		},

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

@@ -62,6 +62,9 @@ export default {
 	default_searchform: {
 		details: {
 			formpage1: '常规条件', 
+			n_sys_permissionname_like: '资源名称(%)', 
+			n_type_eq: '资源类别(=)', 
+			n_systemid_eq: '系统标识(=)', 
 		},
 		uiactions: {
 		},

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

@@ -4,7 +4,25 @@
   <row>
     <i-col span="20">
       <row>
-                </row>
+                    <i-col v-show="detailsModel.n_sys_permissionname_like.visible" :style="{}"  :lg="{ span: 24, 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>
+          
+          </i-col>
+          <i-col v-show="detailsModel.n_type_eq.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+              <app-form-item name='n_type_eq' :itemRules="this.rules.n_type_eq" class='' :caption="$t('entities.sys_permission.default_searchform.details.n_type_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_type_eq.error" :isEmptyCaption="false" labelPos="LEFT"> 
+               <dropdown-list v-model="data.n_type_eq" :data="data" :itemParam="{}" :disabled="detailsModel.n_type_eq.disabled"  tag='CLPermissionType' codelistType='STATIC' placeholder='请选择...' style="width:100px;"></dropdown-list>
+          </app-form-item>
+          
+          </i-col>
+          <i-col v-show="detailsModel.n_systemid_eq.visible" :style="{}"  :lg="{ span: 24, offset: 0 }">
+              <app-form-item name='n_systemid_eq' :itemRules="this.rules.n_systemid_eq" class='' :caption="$t('entities.sys_permission.default_searchform.details.n_systemid_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_systemid_eq.error" :isEmptyCaption="false" labelPos="LEFT"> 
+              <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>
+      </row>
     </i-col>
     <i-col span="4">
       <row v-show="Object.keys(data).length>0">
@@ -244,6 +262,9 @@ export default class DefaultBase extends Vue implements ControlInterface {
      * @memberof DefaultBase
      */
     protected data: any = {
+        n_sys_permissionname_like: null,
+        n_type_eq: null,
+        n_systemid_eq: null,
     };
 
     /**
@@ -253,6 +274,24 @@ export default class DefaultBase extends Vue implements ControlInterface {
      * @memberof DefaultBase
      */
     protected rules: any = {
+        n_sys_permissionname_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_type_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_systemid_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' },
+        ],
     }
 
     /**
@@ -263,9 +302,51 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     protected detailsModel: any = {
         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_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_permissionname_like 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof DefaultBase
+     */
+    @Watch('data.n_sys_permissionname_like')
+    onN_sys_permissionname_likeChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'n_sys_permissionname_like', newVal: newVal, oldVal: oldVal });
+    }
+
+    /**
+     * 监控表单属性 n_type_eq 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof DefaultBase
+     */
+    @Watch('data.n_type_eq')
+    onN_type_eqChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'n_type_eq', newVal: newVal, oldVal: oldVal });
+    }
+
+    /**
+     * 监控表单属性 n_systemid_eq 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof DefaultBase
+     */
+    @Watch('data.n_systemid_eq')
+    onN_systemid_eqChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'n_systemid_eq', newVal: newVal, oldVal: oldVal });
+    }
+
 
     /**
      * 重置表单项值
@@ -287,6 +368,9 @@ export default class DefaultBase extends Vue implements ControlInterface {
     private formLogic({ name, newVal, oldVal }: { name: string, newVal: any, oldVal: any }): void {
                 
 
+
+
+
     }
 
     /**

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

@@ -25,6 +25,21 @@ export default class DefaultModel {
         prop: 'srffrontuf',
         dataType: 'TEXT',
       },
+      {
+        name: 'n_sys_permissionname_like',
+        prop: 'permissionname',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'n_type_eq',
+        prop: 'type',
+        dataType: 'SSCODELIST',
+      },
+      {
+        name: 'n_systemid_eq',
+        prop: 'pssystemid',
+        dataType: 'TEXT',
+      },
     ]
   }
 

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

@@ -65,6 +65,21 @@ export default class MainModel {
           name: 'sys_permission',
           prop: 'permissionid',
         },
+      {
+        name: 'n_sys_permissionname_like',
+        prop: 'n_sys_permissionname_like',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'n_type_eq',
+        prop: 'n_type_eq',
+        dataType: 'SSCODELIST',
+      },
+      {
+        name: 'n_systemid_eq',
+        prop: 'n_systemid_eq',
+        dataType: 'TEXT',
+      },
 
         {
           name:'size',

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