Skip to content

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

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

上级 ecf67a75
显示空白字符变更
内嵌 并排
正在显示 包含 105 行增加 和 14 行删除
app_web/src/locale/lanres/entities/dachart/dachart_en_US.ts
浏览文件 @ f86fb070
......@@ -33,6 +33,7 @@ export default {
chartgroup: "分组",
dict: "过滤项字典",
vmcfg: "展现配置",
systemid: "系统标识",
chartid: "标识",
},
uiactions: {
......
app_web/src/locale/lanres/entities/dachart/dachart_zh_CN.ts
浏览文件 @ f86fb070
......@@ -32,6 +32,7 @@ export default {
chartgroup: "分组",
dict: "过滤项字典",
vmcfg: "展现配置",
systemid: "系统标识",
chartid: "标识",
},
uiactions: {
......
app_web/src/locale/lanres/entities/dadimension/dadimension_en_US.ts
浏览文件 @ f86fb070
......@@ -7,6 +7,7 @@ export default {
dict: "字典",
recursive: "Recursive",
buildid: "分析标识",
modelid: "模型标识",
},
views: {
editview: {
......
app_web/src/locale/lanres/entities/dadimension/dadimension_zh_CN.ts
浏览文件 @ f86fb070
......@@ -6,6 +6,7 @@ export default {
dict: "字典",
recursive: "Recursive",
buildid: "分析标识",
modelid: "模型标识",
},
views: {
editview: {
......
app_web/src/locale/lanres/entities/dareport/dareport_en_US.ts
浏览文件 @ f86fb070
......@@ -33,6 +33,7 @@ export default {
repgroup: "分组",
dict: "过滤项字典",
vmcfg: "展现配置",
systemid: "系统标识",
reportid: "标识",
},
uiactions: {
......
app_web/src/locale/lanres/entities/dareport/dareport_zh_CN.ts
浏览文件 @ f86fb070
......@@ -32,6 +32,7 @@ export default {
repgroup: "分组",
dict: "过滤项字典",
vmcfg: "展现配置",
systemid: "系统标识",
reportid: "标识",
},
uiactions: {
......
app_web/src/widgets/dabuild/main-form/main-form-base.vue
浏览文件 @ f86fb070
......@@ -67,13 +67,6 @@
</app-form-item>
</i-col>
<i-col v-show="detailsModel.dadimension.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 24, offset: 0 }" :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
<app-form-item name='dadimension' :itemRules="this.rules().dadimension" class='' :caption="$t('entities.dabuild.main_form.details.dadimension')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.dadimension.error" :isEmptyCaption="false" labelPos="TOP">
<input-box v-model="data.dadimension" :textareaId="this.$util.createUUID()" :disabled="detailsModel.dadimension.disabled" type='textarea' textareaStyle="height:200px;" ></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.druipart1.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 24, offset: 0 }" :lg="{ span: 24, offset: 0 }" :xl="{ span: 24, offset: 0 }">
<app-form-druipart
......@@ -575,10 +568,6 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: this.detailsModel.buildstate.required, type: 'string', message: '状态 值不能为空', trigger: 'change' },
{ required: this.detailsModel.buildstate.required, type: 'string', message: '状态 值不能为空', trigger: 'blur' },
],
dadimension: [
{ required: this.detailsModel.dadimension.required, type: 'string', message: '维度 值不能为空', trigger: 'change' },
{ required: this.detailsModel.dadimension.required, type: 'string', message: '维度 值不能为空', trigger: 'blur' },
],
}
}
......
app_web/src/widgets/dachart/main-form/main-form-base.vue
浏览文件 @ f86fb070
......@@ -455,6 +455,7 @@ export default class MainBase extends Vue implements ControlInterface {
chartgroup: null,
dict: null,
vmcfg: null,
systemid: null,
chartid: null,
dachart:null,
};
......@@ -653,6 +654,8 @@ export default class MainBase extends Vue implements ControlInterface {
dict: new FormItemModel({ caption: '过滤项字典', detailType: 'FORMITEM', name: 'dict', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
vmcfg: new FormItemModel({ caption: '展现配置', detailType: 'FORMITEM', name: 'vmcfg', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
systemid: new FormItemModel({ caption: '系统标识', detailType: 'FORMITEM', name: 'systemid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
chartid: new FormItemModel({ caption: '标识', detailType: 'FORMITEM', name: 'chartid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
......@@ -790,6 +793,18 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'vmcfg', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 systemid 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.systemid')
onSystemidChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'systemid', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 chartid 值
*
......@@ -870,6 +885,7 @@ export default class MainBase extends Vue implements ControlInterface {
}
/**
......@@ -1951,6 +1967,9 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public createDefault(){
if (this.data.hasOwnProperty('systemid')) {
this.data['systemid'] = this.context['dstsystemid'];
}
}
/**
......@@ -1958,6 +1977,9 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public updateDefault(){
if (this.data.hasOwnProperty('systemid') && !this.data.systemid) {
this.data['systemid'] = this.context['dstsystemid'];
}
}
......
app_web/src/widgets/dachart/main-form/main-form-model.ts
浏览文件 @ f86fb070
......@@ -70,6 +70,11 @@ export default class MainModel {
prop: 'config',
dataType: 'LONGTEXT',
},
{
name: 'systemid',
prop: 'system_id',
dataType: 'TEXT',
},
{
name: 'chartid',
prop: 'chart_id',
......
app_web/src/widgets/dareport/main-form/main-form-base.vue
浏览文件 @ f86fb070
......@@ -455,6 +455,7 @@ export default class MainBase extends Vue implements ControlInterface {
repgroup: null,
dict: null,
vmcfg: null,
systemid: null,
reportid: null,
dareport:null,
};
......@@ -653,6 +654,8 @@ export default class MainBase extends Vue implements ControlInterface {
dict: new FormItemModel({ caption: '过滤项字典', detailType: 'FORMITEM', name: 'dict', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
vmcfg: new FormItemModel({ caption: '展现配置', detailType: 'FORMITEM', name: 'vmcfg', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
systemid: new FormItemModel({ caption: '系统标识', detailType: 'FORMITEM', name: 'systemid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
reportid: new FormItemModel({ caption: '标识', detailType: 'FORMITEM', name: 'reportid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
......@@ -790,6 +793,18 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'vmcfg', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 systemid 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.systemid')
onSystemidChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'systemid', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 reportid 值
*
......@@ -870,6 +885,7 @@ export default class MainBase extends Vue implements ControlInterface {
}
/**
......@@ -1951,6 +1967,9 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public createDefault(){
if (this.data.hasOwnProperty('systemid')) {
this.data['systemid'] = this.context['dstsystemid'];
}
}
/**
......@@ -1958,6 +1977,9 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public updateDefault(){
if (this.data.hasOwnProperty('systemid') && !this.data.systemid) {
this.data['systemid'] = this.context['dstsystemid'];
}
}
......
app_web/src/widgets/dareport/main-form/main-form-model.ts
浏览文件 @ f86fb070
......@@ -70,6 +70,11 @@ export default class MainModel {
prop: 'config',
dataType: 'LONGTEXT',
},
{
name: 'systemid',
prop: 'system_id',
dataType: 'TEXT',
},
{
name: 'reportid',
prop: 'report_id',
......
ibzdst-core/src/main/java/cn/ibizlab/core/analysis/domain/DADimension.java
浏览文件 @ f86fb070
......@@ -82,6 +82,13 @@ public class DADimension extends EntityBase implements Serializable {
@JsonProperty("buildId")
private String buildid;
/**
* 模型标识
*/
@JSONField(name = "modelid")
@JsonProperty("modelid")
private String modelid;
/**
* 构建
......
ibzdst-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ f86fb070
......@@ -4,7 +4,7 @@
<!--输出实体[DA_BUILD]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-da_build-39-1">
<changeSet author="a_A_5d9d78509" id="tab-da_build-40-1">
<createTable tableName="IBZDABUILD">
<column name="BUILDID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DA_BUILD_BUILDID"/>
......@@ -26,7 +26,7 @@
<!--输出实体[DA_CHART]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-da_chart-21-2">
<changeSet author="a_A_5d9d78509" id="tab-da_chart-22-2">
<createTable tableName="IBZDACHART">
<column name="CHARTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DA_CHART_CHARTID"/>
......@@ -76,7 +76,7 @@
<!--输出实体[DA_REPORT]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-da_report-23-4">
<changeSet author="a_A_5d9d78509" id="tab-da_report-24-4">
<createTable tableName="IBZDAREPORT">
<column name="REPORTID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DA_REPORT_REPORTID"/>
......
ibzdst-core/src/main/resources/sysmodel/ibzdst.json
浏览文件 @ f86fb070
......@@ -359,6 +359,24 @@
"key_field":0,
"show_order":11,
"major_field":0
},
{
"fieldname":"MODELID" ,
"codename":"Modelid",
"field_logic_name":"模型标识",
"entity_name":"DADimension",
"ref_de":"DA_BUILD",
"ref_field_name":"MODELID",
"relation_name":"DER1N_DA_DIMENSION_DA_BUILD_BUILDID",
"relation_codename":"Build",
"field_type":"PICKUPDATA",
"nullable":1,
"physical_field":1,
"data_type":"VARCHAR",
"data_length":100,
"key_field":0,
"show_order":12,
"major_field":0
}
],
"subEntitys":[
......
ibzdst-provider/ibzdst-provider-api/src/main/java/cn/ibizlab/api/dto/DADimensionDTO.java
浏览文件 @ f86fb070
......@@ -82,6 +82,15 @@ public class DADimensionDTO extends DTOBase implements Serializable {
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String buildid;
/**
* 属性 [MODELID]
*
*/
@JSONField(name = "modelid")
@JsonProperty("modelid")
@Size(min = 0, max = 100, message = "内容长度必须小于等于[100]")
private String modelid;
/**
* 设置 [DIMNAME]
......@@ -123,6 +132,14 @@ public class DADimensionDTO extends DTOBase implements Serializable {
this.modify("buildid",buildid);
}
/**
* 设置 [MODELID]
*/
public void setModelid(String modelid){
this.modelid = modelid ;
this.modify("modelid",modelid);
}
}
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或