ibiz4j 发布系统代码 [ibz-dst，应用]

app_web/src/locale/lanres/entities/rule-item/rule-item_en_US_base.ts

@@ -87,6 +87,7 @@ function getLocaleResourceBase(){
 				modelname: commonLogic.appcommonhandle("模型",null),
 				updatedate: commonLogic.appcommonhandle("更新时间",null),
 				createdate: commonLogic.appcommonhandle("建立时间",null),
+				cond: commonLogic.appcommonhandle("条件",null),
 			},
 			nodata:commonLogic.appcommonhandle("",null),
 			uiactions: {
@@ -97,6 +98,10 @@ function getLocaleResourceBase(){
 				formpage1: commonLogic.appcommonhandle("常规条件",null), 
 				n_rulename_like: commonLogic.appcommonhandle("名称(文本包含(%))",null), 
 				n_modelname_like: commonLogic.appcommonhandle("模型(文本包含(%))",null), 
+				n_rulecode_like: commonLogic.appcommonhandle("规则码(%)",null), 
+				n_rulegroup_like: commonLogic.appcommonhandle("规则分组(文本包含(%))",null), 
+				n_memo_like: commonLogic.appcommonhandle("备注(文本包含(%))",null), 
+				n_cond_like: commonLogic.appcommonhandle("条件(文本包含(%))",null), 
 				n_systemid_eq: commonLogic.appcommonhandle("系统标识(=)",null), 
 			},
 			uiactions: {

app_web/src/locale/lanres/entities/rule-item/rule-item_zh_CN_base.ts

@@ -87,6 +87,7 @@ function getLocaleResourceBase(){
 				modelname: commonLogic.appcommonhandle("模型",null),
 				updatedate: commonLogic.appcommonhandle("更新时间",null),
 				createdate: commonLogic.appcommonhandle("建立时间",null),
+				cond: commonLogic.appcommonhandle("条件",null),
 			},
 			nodata:commonLogic.appcommonhandle("",null),
 			uiactions: {
@@ -97,6 +98,10 @@ function getLocaleResourceBase(){
 				formpage1: commonLogic.appcommonhandle("常规条件",null), 
 				n_rulename_like: commonLogic.appcommonhandle("名称(文本包含(%))",null), 
 				n_modelname_like: commonLogic.appcommonhandle("模型(文本包含(%))",null), 
+				n_rulecode_like: commonLogic.appcommonhandle("规则码(%)",null), 
+				n_rulegroup_like: commonLogic.appcommonhandle("规则分组(文本包含(%))",null), 
+				n_memo_like: commonLogic.appcommonhandle("备注(文本包含(%))",null), 
+				n_cond_like: commonLogic.appcommonhandle("条件(文本包含(%))",null), 
 				n_systemid_eq: commonLogic.appcommonhandle("系统标识(=)",null), 
 			},
 			uiactions: {

app_web/src/widgets/rule-item/default-searchform/default-searchform-base.vue

@@ -4,7 +4,7 @@
   <row>
     <i-col span="20" class="form-content">
       <row>
-                    <i-col v-show="detailsModel.n_rulename_like.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
+                    <i-col v-show="detailsModel.n_rulename_like.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
               <app-form-item name='n_rulename_like' :itemRules="this.rules.n_rulename_like" class='' :caption="$t('entities.ruleitem.default_searchform.details.n_rulename_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_rulename_like.error" :isEmptyCaption="false" labelPos="LEFT"> 
               <input-box 
               v-model="data.n_rulename_like"  
@@ -18,7 +18,7 @@
           </app-form-item>
           
           </i-col>
-          <i-col v-show="detailsModel.n_modelname_like.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
+          <i-col v-show="detailsModel.n_modelname_like.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
               <app-form-item name='n_modelname_like' :itemRules="this.rules.n_modelname_like" class='' :caption="$t('entities.ruleitem.default_searchform.details.n_modelname_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_modelname_like.error" :isEmptyCaption="false" labelPos="LEFT"> 
               <input-box 
               v-model="data.n_modelname_like"  
@@ -31,6 +31,56 @@
           
           </app-form-item>
           
+          </i-col>
+          <i-col v-show="detailsModel.n_rulecode_like.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
+              <app-form-item name='n_rulecode_like' :itemRules="this.rules.n_rulecode_like" class='' :caption="$t('entities.ruleitem.default_searchform.details.n_rulecode_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_rulecode_like.error" :isEmptyCaption="false" labelPos="LEFT"> 
+              <input-box 
+              v-model="data.n_rulecode_like"  
+              @enter="onEnter($event)"  
+                
+              :disabled="detailsModel.n_rulecode_like.disabled" 
+              type='text' 
+              style="">
+          </input-box>
+          
+          </app-form-item>
+          
+          </i-col>
+          <i-col v-show="detailsModel.n_rulegroup_like.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
+              <app-form-item name='n_rulegroup_like' :itemRules="this.rules.n_rulegroup_like" class='' :caption="$t('entities.ruleitem.default_searchform.details.n_rulegroup_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_rulegroup_like.error" :isEmptyCaption="false" labelPos="LEFT"> 
+              
+          <app-checkbox-list 
+            v-model="data.n_rulegroup_like" 
+            :data="data" 
+            :context="context"
+            :viewparams="viewparams" 
+            :disabled="detailsModel.n_rulegroup_like.disabled" 
+            :localContext ='{ }' 
+            :localParam ='{ }' 
+            tag='CLRuleGroup' 
+            codelistType='DYNAMIC' 
+            valueSeparator=";"
+            mode="str"
+            name="n_rulegroup_like" 
+            style="">
+          </app-checkbox-list>
+          
+          </app-form-item>
+          
+          </i-col>
+          <i-col v-show="detailsModel.n_memo_like.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
+              <app-form-item name='n_memo_like' :itemRules="this.rules.n_memo_like" class='' :caption="$t('entities.ruleitem.default_searchform.details.n_memo_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_memo_like.error" :isEmptyCaption="false" labelPos="LEFT"> 
+              <input-box v-model="data.n_memo_like" :textareaId="this.$util.createUUID()"  :disabled="detailsModel.n_memo_like.disabled" type='textarea' textareaStyle="" ></input-box>
+          
+          </app-form-item>
+          
+          </i-col>
+          <i-col v-show="detailsModel.n_cond_like.visible" :style="{}"  :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
+              <app-form-item name='n_cond_like' :itemRules="this.rules.n_cond_like" class='' :caption="$t('entities.ruleitem.default_searchform.details.n_cond_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_cond_like.error" :isEmptyCaption="false" labelPos="LEFT"> 
+              <input-box v-model="data.n_cond_like" :textareaId="this.$util.createUUID()"  :disabled="detailsModel.n_cond_like.disabled" type='textarea' textareaStyle="" ></input-box>
+          
+          </app-form-item>
+          
           </i-col>
       </row>
     </i-col>
@@ -291,6 +341,10 @@ export default class DefaultBase extends Vue implements ControlInterface {
     public data: any = {
         n_rulename_like: null,
         n_modelname_like: null,
+        n_rulecode_like: null,
+        n_rulegroup_like: null,
+        n_memo_like: null,
+        n_cond_like: null,
         n_systemid_eq: null,
     };
 
@@ -306,6 +360,14 @@ export default class DefaultBase extends Vue implements ControlInterface {
         n_rulename_like: new FormItemModel({ caption: '名称(文本包含(%))', detailType: 'FORMITEM', name: 'n_rulename_like', visible: true, isShowCaption: true, form: this,required:false, disabled: false, enableCond: 3 })
 , 
         n_modelname_like: new FormItemModel({ caption: '模型(文本包含(%))', detailType: 'FORMITEM', name: 'n_modelname_like', visible: true, isShowCaption: true, form: this,required:false, disabled: false, enableCond: 3 })
+, 
+        n_rulecode_like: new FormItemModel({ caption: '规则码(%)', detailType: 'FORMITEM', name: 'n_rulecode_like', visible: true, isShowCaption: true, form: this,required:false, disabled: false, enableCond: 3 })
+, 
+        n_rulegroup_like: new FormItemModel({ caption: '规则分组(文本包含(%))', detailType: 'FORMITEM', name: 'n_rulegroup_like', visible: true, isShowCaption: true, form: this,required:false, disabled: false, enableCond: 3 })
+, 
+        n_memo_like: new FormItemModel({ caption: '备注(文本包含(%))', detailType: 'FORMITEM', name: 'n_memo_like', visible: true, isShowCaption: true, form: this,required:false, disabled: false, enableCond: 3 })
+, 
+        n_cond_like: new FormItemModel({ caption: '条件(文本包含(%))', detailType: 'FORMITEM', name: 'n_cond_like', visible: true, isShowCaption: true, form: this,required:false, disabled: false, enableCond: 3 })
 , 
         n_systemid_eq: new FormItemModel({ caption: '系统标识(=)', detailType: 'FORMITEM', name: 'n_systemid_eq', visible: true, isShowCaption: true, form: this,required:false, disabled: false, enableCond: 3 })
 , 
@@ -330,6 +392,30 @@ export default class DefaultBase extends Vue implements ControlInterface {
             { required: this.detailsModel.n_modelname_like.required, type: 'string', message: '模型(文本包含(%)) 值不能为空', trigger: 'change' },
             { required: this.detailsModel.n_modelname_like.required, type: 'string', message: '模型(文本包含(%)) 值不能为空', trigger: 'blur' },
         ],
+        n_rulecode_like: [
+            { type: 'string', message: '规则码(%) 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '规则码(%) 值必须为字符串类型', trigger: 'blur' },
+            { required: this.detailsModel.n_rulecode_like.required, type: 'string', message: '规则码(%) 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.n_rulecode_like.required, type: 'string', message: '规则码(%) 值不能为空', trigger: 'blur' },
+        ],
+        n_rulegroup_like: [
+            { type: 'string', message: '规则分组(文本包含(%)) 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '规则分组(文本包含(%)) 值必须为字符串类型', trigger: 'blur' },
+            { required: this.detailsModel.n_rulegroup_like.required, type: 'string', message: '规则分组(文本包含(%)) 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.n_rulegroup_like.required, type: 'string', message: '规则分组(文本包含(%)) 值不能为空', trigger: 'blur' },
+        ],
+        n_memo_like: [
+            { type: 'string', message: '备注(文本包含(%)) 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '备注(文本包含(%)) 值必须为字符串类型', trigger: 'blur' },
+            { required: this.detailsModel.n_memo_like.required, type: 'string', message: '备注(文本包含(%)) 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.n_memo_like.required, type: 'string', message: '备注(文本包含(%)) 值不能为空', trigger: 'blur' },
+        ],
+        n_cond_like: [
+            { type: 'string', message: '条件(文本包含(%)) 值必须为字符串类型', trigger: 'change' },
+            { type: 'string', message: '条件(文本包含(%)) 值必须为字符串类型', trigger: 'blur' },
+            { required: this.detailsModel.n_cond_like.required, type: 'string', message: '条件(文本包含(%)) 值不能为空', trigger: 'change' },
+            { required: this.detailsModel.n_cond_like.required, type: 'string', message: '条件(文本包含(%)) 值不能为空', trigger: 'blur' },
+        ],
         n_systemid_eq: [
             { type: 'string', message: '系统标识(=) 值必须为字符串类型', trigger: 'change' },
             { type: 'string', message: '系统标识(=) 值必须为字符串类型', trigger: 'blur' },
@@ -362,6 +448,54 @@ export default class DefaultBase extends Vue implements ControlInterface {
         this.formDataChange({ name: 'n_modelname_like', newVal: newVal, oldVal: oldVal });
     }
 
+    /**
+     * 监控表单属性 n_rulecode_like 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof DefaultBase
+     */
+    @Watch('data.n_rulecode_like')
+    onN_rulecode_likeChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'n_rulecode_like', newVal: newVal, oldVal: oldVal });
+    }
+
+    /**
+     * 监控表单属性 n_rulegroup_like 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof DefaultBase
+     */
+    @Watch('data.n_rulegroup_like')
+    onN_rulegroup_likeChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'n_rulegroup_like', newVal: newVal, oldVal: oldVal });
+    }
+
+    /**
+     * 监控表单属性 n_memo_like 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof DefaultBase
+     */
+    @Watch('data.n_memo_like')
+    onN_memo_likeChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'n_memo_like', newVal: newVal, oldVal: oldVal });
+    }
+
+    /**
+     * 监控表单属性 n_cond_like 值
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof DefaultBase
+     */
+    @Watch('data.n_cond_like')
+    onN_cond_likeChange(newVal: any, oldVal: any) {
+        this.formDataChange({ name: 'n_cond_like', newVal: newVal, oldVal: oldVal });
+    }
+
     /**
      * 监控表单属性 n_systemid_eq 值
      *
@@ -398,6 +532,10 @@ export default class DefaultBase extends Vue implements ControlInterface {
 
 
 
+
+
+
+
     }
 
     /**

app_web/src/widgets/rule-item/default-searchform/default-searchform-model.ts

@@ -35,6 +35,26 @@ export default class DefaultModel {
         prop: 'model_name',
         dataType: 'PICKUPTEXT',
       },
+      {
+        name: 'n_rulecode_like',
+        prop: 'rule_code',
+        dataType: 'TEXT',
+      },
+      {
+        name: 'n_rulegroup_like',
+        prop: 'group',
+        dataType: 'SMCODELIST',
+      },
+      {
+        name: 'n_memo_like',
+        prop: 'memo',
+        dataType: 'LONGTEXT_1000',
+      },
+      {
+        name: 'n_cond_like',
+        prop: 'cond',
+        dataType: 'LONGTEXT',
+      },
       {
         name: 'n_systemid_eq',
         prop: 'system_id',

app_web/src/widgets/rule-item/main-grid/main-grid-base.vue

@@ -131,6 +131,18 @@
                     </template>
                 </el-table-column>
             </template>
+            <template v-if="getColumnState('cond')">
+                <el-table-column show-overflow-tooltip :prop="'cond'" :label="$t('entities.ruleitem.main_grid.columns.cond')" :width="300"  :align="'left'">
+                    <template v-slot:header="{column}">
+                      <span class="column-header ">
+                        {{$t('entities.ruleitem.main_grid.columns.cond')}}
+                      </span>
+                    </template>
+                    <template v-slot="{row,column,$index}">
+                        <span>{{row.cond}}</span>
+                    </template>
+                </el-table-column>
+            </template>
             <template v-if="adaptiveState">
                 <el-table-column></el-table-column>
             </template>
@@ -755,6 +767,15 @@ export default class MainBase extends Vue implements ControlInterface {
             isEnableRowEdit: false,
             enableCond: 3 ,
         },
+        {
+            name: 'cond',
+            label: '条件',
+            langtag: 'entities.ruleitem.main_grid.columns.cond',
+            show: true,
+            unit: 'PX',
+            isEnableRowEdit: false,
+            enableCond: 3 ,
+        },
     ]
 
     /**
@@ -1458,7 +1479,7 @@ export default class MainBase extends Vue implements ControlInterface {
     * @memberof MainBase
     */
     public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
-        let allColumns:Array<any> = ['ruleid','rulecode','rulename','rulegroup','memo','businesscat','modelname','updatedate','createdate'];
+        let allColumns:Array<any> = ['ruleid','rulecode','rulename','rulegroup','memo','businesscat','modelname','updatedate','createdate','cond'];
         if(row && row.children) {
             if(columnIndex == (this.isSingleSelect ? 0:1)) {
                 return [1, allColumns.length+1];
@@ -1547,6 +1568,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 modelname:'',
                 updatedate:'',
                 createdate:'',
+                cond:'',
                 children: children
             }
             groupTree.push(tree);
@@ -1582,6 +1604,7 @@ export default class MainBase extends Vue implements ControlInterface {
             modelname:'',
             updatedate:'',
             createdate:'',
+            cond:'',
             children: child
         }
         if(child && child.length > 0){
@@ -1637,6 +1660,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 modelname:'',
                 updatedate:'',
                 createdate:'',
+                cond:'',
                 children: children,
             }
             groupTree.push(tree);

app_web/src/widgets/rule-item/main-grid/main-grid-model.ts

@@ -66,6 +66,11 @@ export default class MainModel {
           prop: 'group',
           dataType: 'SMCODELIST',
         },
+        {
+          name: 'cond',
+          prop: 'cond',
+          dataType: 'LONGTEXT',
+        },
         {
           name: 'srfmajortext',
           prop: 'rule_name',
@@ -106,6 +111,26 @@ export default class MainModel {
         prop: 'n_modelname_like',
         dataType: 'QUERYPARAM'
       },
+      {
+        name: 'n_rulecode_like',
+        prop: 'n_rulecode_like',
+        dataType: 'QUERYPARAM'
+      },
+      {
+        name: 'n_rulegroup_like',
+        prop: 'n_rulegroup_like',
+        dataType: 'QUERYPARAM'
+      },
+      {
+        name: 'n_memo_like',
+        prop: 'n_memo_like',
+        dataType: 'QUERYPARAM'
+      },
+      {
+        name: 'n_cond_like',
+        prop: 'n_cond_like',
+        dataType: 'QUERYPARAM'
+      },
       {
         name: 'n_systemid_eq',
         prop: 'n_systemid_eq',

ibzdst-core/src/main/java/cn/ibizlab/core/rule/filter/RuleItemSearchContext.java

@@ -33,6 +33,13 @@ public class RuleItemSearchContext extends QueryWrapperContext<RuleItem> {
         if(!ObjectUtils.isEmpty(this.n_rulename_like)){
             this.getSearchCond().like("rulename", n_rulename_like);
         }
+    }
+	private String n_rulegroup_like;//[规则分组]
+	public void setN_rulegroup_like(String n_rulegroup_like) {
+        this.n_rulegroup_like = n_rulegroup_like;
+        if(!ObjectUtils.isEmpty(this.n_rulegroup_like)){
+            this.getSearchCond().like("rulegroup", n_rulegroup_like);
+        }
     }
 	private String n_modelid_eq;//[模型标识]
 	public void setN_modelid_eq(String n_modelid_eq) {
@@ -54,6 +61,13 @@ public class RuleItemSearchContext extends QueryWrapperContext<RuleItem> {
         if(!ObjectUtils.isEmpty(this.n_modelname_like)){
             this.getSearchCond().like("modelname", n_modelname_like);
         }
+    }
+	private String n_memo_like;//[备注]
+	public void setN_memo_like(String n_memo_like) {
+        this.n_memo_like = n_memo_like;
+        if(!ObjectUtils.isEmpty(this.n_memo_like)){
+            this.getSearchCond().like("memo", n_memo_like);
+        }
     }
 	private String n_rulecode_like;//[规则码]
 	public void setN_rulecode_like(String n_rulecode_like) {
@@ -61,6 +75,13 @@ public class RuleItemSearchContext extends QueryWrapperContext<RuleItem> {
         if(!ObjectUtils.isEmpty(this.n_rulecode_like)){
             this.getSearchCond().like("rulecode", n_rulecode_like);
         }
+    }
+	private String n_cond_like;//[条件]
+	public void setN_cond_like(String n_cond_like) {
+        this.n_cond_like = n_cond_like;
+        if(!ObjectUtils.isEmpty(this.n_cond_like)){
+            this.getSearchCond().like("cond", n_cond_like);
+        }
     }
 	private String n_systemid_eq;//[系统标识]
 	public void setN_systemid_eq(String n_systemid_eq) {

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

@@ -422,7 +422,7 @@
 
 
     <!--输出实体[RU_ITEM]数据结构 -->
-    <changeSet author="root" id="tab-ru_item-69-16">
+    <changeSet author="root" id="tab-ru_item-75-16">
         <createTable tableName="IBZRULE">
                 <column name="RULEID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_RU_ITEM_RULEID"/>