Skip to content

I
ibzdst
提交 740f7220 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

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

上级 bb95e9b8
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 242 行增加 和 4 行删除
app_web/src/locale/lanres/entities/rule-item/rule-item_en_US_base.ts
浏览文件 @ 740f7220
......@@ -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
浏览文件 @ 740f7220
......@@ -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-model.ts
浏览文件 @ 740f7220
......@@ -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
浏览文件 @ 740f7220
......@@ -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
浏览文件 @ 740f7220
......@@ -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
浏览文件 @ 740f7220
......@@ -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
浏览文件 @ 740f7220
......@@ -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"/>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或