Skip to content

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

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

上级 f3ca2012
显示空白字符变更
内嵌 并排
正在显示 包含 563 行增加 和 3 行删除
app_web/public/assets/json/data-dictionary.json
浏览文件 @ d0178953
...@@ -7,6 +7,233 @@ ...@@ -7,6 +7,233 @@
"appdedataset":"FetchDefault", "appdedataset":"FetchDefault",
"items": [] "items": []
}, },
{
"srfkey": "OPCond",
"emptytext": "未定义",
"codelisttype":"static",
"items": [
{
"id": "EQ",
"label": "等于",
"text": "等于",
"class":"",
"data":"",
"codename":"Eq",
"value": "EQ",
"disabled": false
}
, {
"id": "NOTEQ",
"label": "不等于",
"text": "不等于",
"class":"",
"data":"",
"codename":"Noteq",
"value": "NOTEQ",
"disabled": false
}
, {
"id": "GTANDEQ",
"label": ">=",
"text": ">=",
"class":"",
"data":"",
"codename":"Gtandeq",
"value": "GTANDEQ",
"disabled": false
}
, {
"id": "GT",
"label": ">",
"text": ">",
"class":"",
"data":"",
"codename":"Gt",
"value": "GT",
"disabled": false
}
, {
"id": "LTANDEQ",
"label": "<=",
"text": "<=",
"class":"",
"data":"",
"codename":"Ltandeq",
"value": "LTANDEQ",
"disabled": false
}
, {
"id": "LT",
"label": "<",
"text": "<",
"class":"",
"data":"",
"codename":"Lt",
"value": "LT",
"disabled": false
}
, {
"id": "ISNULL",
"label": "为空",
"text": "为空",
"class":"",
"data":"",
"codename":"Isnull",
"value": "ISNULL",
"disabled": false
}
, {
"id": "ISNOTNULL",
"label": "不为空",
"text": "不为空",
"class":"",
"data":"",
"codename":"Isnotnull",
"value": "ISNOTNULL",
"disabled": false
}
, {
"id": "LIKE",
"label": "like",
"text": "like",
"class":"",
"data":"",
"codename":"Like",
"value": "LIKE",
"disabled": false
}
, {
"id": "NOTLIKE",
"label": "not like",
"text": "not like",
"class":"",
"data":"",
"codename":"Notlike",
"value": "NOTLIKE",
"disabled": false
}
, {
"id": "LEFTLIKE",
"label": "开头like",
"text": "开头like",
"class":"",
"data":"",
"codename":"Leftlike",
"value": "LEFTLIKE",
"disabled": false
}
, {
"id": "LEFTNOTLIKE",
"label": "开头not like",
"text": "开头not like",
"class":"",
"data":"",
"codename":"Leftnotlike",
"value": "LEFTNOTLIKE",
"disabled": false
}
, {
"id": "RIGHTLIKE",
"label": "结尾like",
"text": "结尾like",
"class":"",
"data":"",
"codename":"Rightlike",
"value": "RIGHTLIKE",
"disabled": false
}
, {
"id": "RIGHTNOTLIKE",
"label": "结尾not like",
"text": "结尾not like",
"class":"",
"data":"",
"codename":"Rightnotlike",
"value": "RIGHTNOTLIKE",
"disabled": false
}
, {
"id": "IN",
"label": "在范围中",
"text": "在范围中",
"class":"",
"data":"",
"codename":"In",
"value": "IN",
"disabled": false
}
, {
"id": "NOTIN",
"label": "不在范围中",
"text": "不在范围中",
"class":"",
"data":"",
"codename":"Notin",
"value": "NOTIN",
"disabled": false
}
, {
"id": "MATCHES",
"label": "MATCHES",
"text": "MATCHES",
"class":"",
"data":"",
"codename":"Matches",
"value": "MATCHES",
"disabled": false
}
, {
"id": "NOTMATCHES",
"label": "NOT MATCHES",
"text": "NOT MATCHES",
"class":"",
"data":"",
"codename":"Notmatches",
"value": "NOTMATCHES",
"disabled": false
}
, {
"id": "INC2S",
"label": "INC2S",
"text": "INC2S",
"class":"",
"data":"",
"codename":"Inc2s",
"value": "INC2S",
"disabled": false
}
, {
"id": "NOTINC2S",
"label": "NOTINC2S",
"text": "NOTINC2S",
"class":"",
"data":"",
"codename":"Notinc2s",
"value": "NOTINC2S",
"disabled": false
}
]
},
{ {
"srfkey": "CLMetricType", "srfkey": "CLMetricType",
"emptytext": "未定义", "emptytext": "未定义",
......
app_web/src/locale/lanres/codelist/codelist_en_US.ts
浏览文件 @ d0178953
...@@ -2,6 +2,29 @@ export default { ...@@ -2,6 +2,29 @@ export default {
CLModel: { CLModel: {
"empty": "", "empty": "",
}, },
OPCond: {
"EQ": "等于",
"NOTEQ": "不等于",
"GTANDEQ": ">=",
"GT": ">",
"LTANDEQ": "<=",
"LT": "<",
"ISNULL": "为空",
"ISNOTNULL": "不为空",
"LIKE": "like",
"NOTLIKE": "not like",
"LEFTLIKE": "开头like",
"LEFTNOTLIKE": "开头not like",
"RIGHTLIKE": "结尾like",
"RIGHTNOTLIKE": "结尾not like",
"IN": "在范围中",
"NOTIN": "不在范围中",
"MATCHES": "MATCHES",
"NOTMATCHES": "NOT MATCHES",
"INC2S": "INC2S",
"NOTINC2S": "NOTINC2S",
"empty": ""
},
CLMetricType: { CLMetricType: {
"COUNT": "COUNT", "COUNT": "COUNT",
"COUNT_DISTINCT": "COUNT_DISTINCT", "COUNT_DISTINCT": "COUNT_DISTINCT",
......
app_web/src/locale/lanres/codelist/codelist_zh_CN.ts
浏览文件 @ d0178953
...@@ -2,6 +2,29 @@ export default { ...@@ -2,6 +2,29 @@ export default {
CLModel: { CLModel: {
"empty": "", "empty": "",
}, },
OPCond: {
"EQ": "等于",
"NOTEQ": "不等于",
"GTANDEQ": ">=",
"GT": ">",
"LTANDEQ": "<=",
"LT": "<",
"ISNULL": "为空",
"ISNOTNULL": "不为空",
"LIKE": "like",
"NOTLIKE": "not like",
"LEFTLIKE": "开头like",
"LEFTNOTLIKE": "开头not like",
"RIGHTLIKE": "结尾like",
"RIGHTNOTLIKE": "结尾not like",
"IN": "在范围中",
"NOTIN": "不在范围中",
"MATCHES": "MATCHES",
"NOTMATCHES": "NOT MATCHES",
"INC2S": "INC2S",
"NOTINC2S": "NOTINC2S",
"empty": "",
},
CLMetricType: { CLMetricType: {
"COUNT": "COUNT", "COUNT": "COUNT",
"COUNT_DISTINCT": "COUNT_DISTINCT", "COUNT_DISTINCT": "COUNT_DISTINCT",
......
app_web/src/locale/lanres/entities/rule-item/rule-item_en_US.ts
浏览文件 @ d0178953
...@@ -62,6 +62,7 @@ export default { ...@@ -62,6 +62,7 @@ export default {
createdate: "建立时间", createdate: "建立时间",
updatedate: "更新时间", updatedate: "更新时间",
modelid: "模型标识", modelid: "模型标识",
formitem: "",
ruleid: "规则标识", ruleid: "规则标识",
}, },
uiactions: { uiactions: {
......
app_web/src/locale/lanres/entities/rule-item/rule-item_zh_CN.ts
浏览文件 @ d0178953
...@@ -61,6 +61,7 @@ export default { ...@@ -61,6 +61,7 @@ export default {
createdate: "建立时间", createdate: "建立时间",
updatedate: "更新时间", updatedate: "更新时间",
modelid: "模型标识", modelid: "模型标识",
formitem: "",
ruleid: "规则标识", ruleid: "规则标识",
}, },
uiactions: { uiactions: {
......
app_web/src/mock/codelist/codelist.ts
浏览文件 @ d0178953
...@@ -15,6 +15,233 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => { ...@@ -15,6 +15,233 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
"appdedataset":"FetchDefault", "appdedataset":"FetchDefault",
"items": [] "items": []
}, },
{
srfkey: "OPCond",
emptytext: "未定义",
"codelisttype":"static",
items: [
{
id: "EQ",
label: "等于",
text: "等于",
"class":"",
"data":"",
"codename":"Eq",
value: "EQ",
disabled: false,
},
{
id: "NOTEQ",
label: "不等于",
text: "不等于",
"class":"",
"data":"",
"codename":"Noteq",
value: "NOTEQ",
disabled: false,
},
{
id: "GTANDEQ",
label: ">=",
text: ">=",
"class":"",
"data":"",
"codename":"Gtandeq",
value: "GTANDEQ",
disabled: false,
},
{
id: "GT",
label: ">",
text: ">",
"class":"",
"data":"",
"codename":"Gt",
value: "GT",
disabled: false,
},
{
id: "LTANDEQ",
label: "<=",
text: "<=",
"class":"",
"data":"",
"codename":"Ltandeq",
value: "LTANDEQ",
disabled: false,
},
{
id: "LT",
label: "<",
text: "<",
"class":"",
"data":"",
"codename":"Lt",
value: "LT",
disabled: false,
},
{
id: "ISNULL",
label: "为空",
text: "为空",
"class":"",
"data":"",
"codename":"Isnull",
value: "ISNULL",
disabled: false,
},
{
id: "ISNOTNULL",
label: "不为空",
text: "不为空",
"class":"",
"data":"",
"codename":"Isnotnull",
value: "ISNOTNULL",
disabled: false,
},
{
id: "LIKE",
label: "like",
text: "like",
"class":"",
"data":"",
"codename":"Like",
value: "LIKE",
disabled: false,
},
{
id: "NOTLIKE",
label: "not like",
text: "not like",
"class":"",
"data":"",
"codename":"Notlike",
value: "NOTLIKE",
disabled: false,
},
{
id: "LEFTLIKE",
label: "开头like",
text: "开头like",
"class":"",
"data":"",
"codename":"Leftlike",
value: "LEFTLIKE",
disabled: false,
},
{
id: "LEFTNOTLIKE",
label: "开头not like",
text: "开头not like",
"class":"",
"data":"",
"codename":"Leftnotlike",
value: "LEFTNOTLIKE",
disabled: false,
},
{
id: "RIGHTLIKE",
label: "结尾like",
text: "结尾like",
"class":"",
"data":"",
"codename":"Rightlike",
value: "RIGHTLIKE",
disabled: false,
},
{
id: "RIGHTNOTLIKE",
label: "结尾not like",
text: "结尾not like",
"class":"",
"data":"",
"codename":"Rightnotlike",
value: "RIGHTNOTLIKE",
disabled: false,
},
{
id: "IN",
label: "在范围中",
text: "在范围中",
"class":"",
"data":"",
"codename":"In",
value: "IN",
disabled: false,
},
{
id: "NOTIN",
label: "不在范围中",
text: "不在范围中",
"class":"",
"data":"",
"codename":"Notin",
value: "NOTIN",
disabled: false,
},
{
id: "MATCHES",
label: "MATCHES",
text: "MATCHES",
"class":"",
"data":"",
"codename":"Matches",
value: "MATCHES",
disabled: false,
},
{
id: "NOTMATCHES",
label: "NOT MATCHES",
text: "NOT MATCHES",
"class":"",
"data":"",
"codename":"Notmatches",
value: "NOTMATCHES",
disabled: false,
},
{
id: "INC2S",
label: "INC2S",
text: "INC2S",
"class":"",
"data":"",
"codename":"Inc2s",
value: "INC2S",
disabled: false,
},
{
id: "NOTINC2S",
label: "NOTINC2S",
text: "NOTINC2S",
"class":"",
"data":"",
"codename":"Notinc2s",
value: "NOTINC2S",
disabled: false,
},
]
},
{ {
srfkey: "CLMetricType", srfkey: "CLMetricType",
emptytext: "未定义", emptytext: "未定义",
......
app_web/src/widgets/rule-item/main-form/main-form-base.vue
浏览文件 @ d0178953
...@@ -560,6 +560,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -560,6 +560,7 @@ export default class MainBase extends Vue implements ControlInterface {
createdate: null, createdate: null,
updatedate: null, updatedate: null,
modelid: null, modelid: null,
formitem: null,
ruleid: null, ruleid: null,
ruleitem:null, ruleitem:null,
}; };
...@@ -804,6 +805,8 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -804,6 +805,8 @@ export default class MainBase extends Vue implements ControlInterface {
updatedate: new FormItemModel({ caption: '更新时间', detailType: 'FORMITEM', name: 'updatedate', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 }) updatedate: new FormItemModel({ caption: '更新时间', detailType: 'FORMITEM', name: 'updatedate', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
, ,
modelid: new FormItemModel({ caption: '模型标识', detailType: 'FORMITEM', name: 'modelid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 }) modelid: new FormItemModel({ caption: '模型标识', detailType: 'FORMITEM', name: 'modelid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
formitem: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'formitem', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
, ,
ruleid: new FormItemModel({ caption: '规则标识', detailType: 'FORMITEM', name: 'ruleid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 }) ruleid: new FormItemModel({ caption: '规则标识', detailType: 'FORMITEM', name: 'ruleid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
, ,
...@@ -1049,6 +1052,18 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1049,6 +1052,18 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'modelid', newVal: newVal, oldVal: oldVal }); this.formDataChange({ name: 'modelid', newVal: newVal, oldVal: oldVal });
} }
/**
* 监控表单属性 formitem 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.formitem')
onFormitemChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'formitem', newVal: newVal, oldVal: oldVal });
}
/** /**
* 监控表单属性 ruleid 值 * 监控表单属性 ruleid 值
* *
...@@ -1136,6 +1151,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1136,6 +1151,7 @@ export default class MainBase extends Vue implements ControlInterface {
} }
......
app_web/src/widgets/rule-item/main-form/main-form-model.ts
浏览文件 @ d0178953
...@@ -115,6 +115,9 @@ export default class MainModel { ...@@ -115,6 +115,9 @@ export default class MainModel {
prop: 'model_id', prop: 'model_id',
dataType: 'PICKUP', dataType: 'PICKUP',
}, },
{
name: 'formitem',
},
{ {
name: 'ruleid', name: 'ruleid',
prop: 'rule_id', prop: 'rule_id',
......
ibzdst-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ d0178953
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<!--输出实体[DA_METRIC]数据结构 --> <!--输出实体[DA_METRIC]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-da_metric-47-3"> <changeSet author="a_A_5d9d78509" id="tab-da_metric-48-3">
<createTable tableName="IBZDAMETRIC"> <createTable tableName="IBZDAMETRIC">
<column name="DA_METRICID" remarks="" type="VARCHAR(100)"> <column name="DA_METRICID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DA_METRIC_DA_METRICID"/> <constraints primaryKey="true" primaryKeyName="PK_DA_METRIC_DA_METRICID"/>
...@@ -420,7 +420,7 @@ ...@@ -420,7 +420,7 @@
<!--输出实体[RU_ITEM]数据结构 --> <!--输出实体[RU_ITEM]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-ru_item-50-16"> <changeSet author="a_A_5d9d78509" id="tab-ru_item-51-16">
<createTable tableName="IBZRULE"> <createTable tableName="IBZRULE">
<column name="RULEID" remarks="" type="VARCHAR(100)"> <column name="RULEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_RU_ITEM_RULEID"/> <constraints primaryKey="true" primaryKeyName="PK_RU_ITEM_RULEID"/>
...@@ -455,7 +455,7 @@ ...@@ -455,7 +455,7 @@
<!--输出实体[DA_BUILD]外键关系 --> <!--输出实体[DA_BUILD]外键关系 -->
<!--输出实体[DA_CHART]外键关系 --> <!--输出实体[DA_CHART]外键关系 -->
<!--输出实体[DA_METRIC]外键关系 --> <!--输出实体[DA_METRIC]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-da_metric-47-17"> <changeSet author="a_A_5d9d78509" id="fk-da_metric-48-17">
<addForeignKeyConstraint baseColumnNames="BUILDID" baseTableName="IBZDAMETRIC" constraintName="DER1N_DA_METRIC_DA_BUILD_BUILD" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="BUILDID" referencedTableName="IBZDABUILD" validate="true"/> <addForeignKeyConstraint baseColumnNames="BUILDID" baseTableName="IBZDAMETRIC" constraintName="DER1N_DA_METRIC_DA_BUILD_BUILD" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="BUILDID" referencedTableName="IBZDABUILD" validate="true"/>
</changeSet> </changeSet>
<!--输出实体[DA_REPORT]外键关系 --> <!--输出实体[DA_REPORT]外键关系 -->
......
ibzdst-util/src/main/java/cn/ibizlab/util/dict/StaticDict.java
浏览文件 @ d0178953
...@@ -2367,6 +2367,45 @@ public class StaticDict { ...@@ -2367,6 +2367,45 @@ public class StaticDict {
/**
* 代码表[判断操作逻辑]
*/
@Getter
public enum OPCond {
EQ("EQ","等于"),
NOTEQ("NOTEQ","不等于"),
GTANDEQ("GTANDEQ",">="),
GT("GT",">"),
LTANDEQ("LTANDEQ","<="),
LT("LT","<"),
ISNULL("ISNULL","为空"),
ISNOTNULL("ISNOTNULL","不为空"),
LIKE("LIKE","like"),
NOTLIKE("NOTLIKE","not like"),
LEFTLIKE("LEFTLIKE","开头like"),
LEFTNOTLIKE("LEFTNOTLIKE","开头not like"),
RIGHTLIKE("RIGHTLIKE","结尾like"),
RIGHTNOTLIKE("RIGHTNOTLIKE","结尾not like"),
IN("IN","在范围中"),
NOTIN("NOTIN","不在范围中"),
MATCHES("MATCHES","MATCHES"),
NOTMATCHES("NOTMATCHES","NOT MATCHES"),
INC2S("INC2S","INC2S"),
NOTINC2S("NOTINC2S","NOTINC2S");
private String value;
private String text;
private String valueSeparator="";
private String textSeparator="";
private String emptyText="";
OPCond(String value , String text) {
this.value=value;
this.text = text;
}
}
/** /**
* 代码表[报表分类] * 代码表[报表分类]
*/ */
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或