提交 5154a883 编写于 作者: ibizdev's avatar ibizdev

zoo457790531 发布系统代码 [ibz-lite,应用]

上级 c2cf3282
......@@ -37,7 +37,7 @@ function getLocaleResourceBase(){
srfdeid: commonLogic.appcommonhandle("",null),
srfsourcekey: commonLogic.appcommonhandle("",null),
configname: commonLogic.appcommonhandle("名称",null),
modelfile: commonLogic.appcommonhandle("文件",null),
formitem: commonLogic.appcommonhandle("文件",null),
configid: commonLogic.appcommonhandle("ID",null),
},
uiactions: {
......@@ -45,6 +45,11 @@ function getLocaleResourceBase(){
},
main_grid: {
columns: {
configid: commonLogic.appcommonhandle("ID",null),
dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
configname: commonLogic.appcommonhandle("名称",null),
systemid: commonLogic.appcommonhandle("系统标识",null),
pdynainstid: commonLogic.appcommonhandle("ID",null),
},
nodata:commonLogic.appcommonhandle("",null),
uiactions: {
......
......@@ -37,7 +37,7 @@ function getLocaleResourceBase(){
srfdeid: commonLogic.appcommonhandle("",null),
srfsourcekey: commonLogic.appcommonhandle("",null),
configname: commonLogic.appcommonhandle("名称",null),
modelfile: commonLogic.appcommonhandle("文件",null),
formitem: commonLogic.appcommonhandle("文件",null),
configid: commonLogic.appcommonhandle("ID",null),
},
uiactions: {
......@@ -45,6 +45,11 @@ function getLocaleResourceBase(){
},
main_grid: {
columns: {
configid: commonLogic.appcommonhandle("ID",null),
dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
configname: commonLogic.appcommonhandle("名称",null),
systemid: commonLogic.appcommonhandle("系统标识",null),
pdynainstid: commonLogic.appcommonhandle("ID",null),
},
nodata:commonLogic.appcommonhandle("",null),
uiactions: {
......
......@@ -37,7 +37,7 @@ function getLocaleResourceBase(){
srfdeid: commonLogic.appcommonhandle("",null),
srfsourcekey: commonLogic.appcommonhandle("",null),
configname: commonLogic.appcommonhandle("名称",null),
modelfile: commonLogic.appcommonhandle("文件",null),
formitem: commonLogic.appcommonhandle("文件",null),
configid: commonLogic.appcommonhandle("ID",null),
},
uiactions: {
......@@ -45,6 +45,11 @@ function getLocaleResourceBase(){
},
main_grid: {
columns: {
configid: commonLogic.appcommonhandle("ID",null),
dynainstid: commonLogic.appcommonhandle("动态实例标识",null),
configname: commonLogic.appcommonhandle("名称",null),
systemid: commonLogic.appcommonhandle("系统标识",null),
pdynainstid: commonLogic.appcommonhandle("ID",null),
},
nodata:commonLogic.appcommonhandle("",null),
uiactions: {
......
......@@ -29,16 +29,9 @@
</app-form-item>
</i-col>
<i-col v-show="detailsModel.modelfile.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='modelfile' :itemRules="this.rules().modelfile" class='' :caption="$t('entities.metadynamicmodel.main_form.details.modelfile')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.modelfile.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box
v-model="data.modelfile"
@enter="onEnter($event)"
unit=""
:disabled="detailsModel.modelfile.disabled"
type='text'
style="">
</input-box>
<i-col v-show="detailsModel.formitem.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='formitem' :itemRules="this.rules().formitem" class='' :caption="$t('entities.metadynamicmodel.main_form.details.formitem')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.formitem.error" :isEmptyCaption="false" labelPos="LEFT">
<app-file-upload :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange" :data="JSON.stringify(this.data)" name='formitem' :value="data.formitem" :disabled="detailsModel.formitem.disabled" :uploadparams='{}' :exportparams='{}' style="overflow: auto;"></app-file-upload>
</app-form-item>
......@@ -504,7 +497,7 @@ export default class MainBase extends Vue implements ControlInterface {
srfdeid: null,
srfsourcekey: null,
configname: null,
modelfile: null,
formitem: null,
configid: null,
metadynamicmodel:null,
};
......@@ -561,9 +554,9 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: this.detailsModel.configname.required, type: 'string', message: '名称 值不能为空', trigger: 'change' },
{ required: this.detailsModel.configname.required, type: 'string', message: '名称 值不能为空', trigger: 'blur' },
],
modelfile: [
{ required: this.detailsModel.modelfile.required, type: 'string', message: '文件 值不能为空', trigger: 'change' },
{ required: this.detailsModel.modelfile.required, type: 'string', message: '文件 值不能为空', trigger: 'blur' },
formitem: [
{ required: this.detailsModel.formitem.required, type: 'string', message: '文件 值不能为空', trigger: 'change' },
{ required: this.detailsModel.formitem.required, type: 'string', message: '文件 值不能为空', trigger: 'blur' },
],
}
}
......@@ -700,7 +693,7 @@ export default class MainBase extends Vue implements ControlInterface {
,
configname: new FormItemModel({ caption: '名称', detailType: 'FORMITEM', name: 'configname', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
modelfile: new FormItemModel({ caption: '文件', detailType: 'FORMITEM', name: 'modelfile', 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:true, disabled: false, enableCond: 3 })
,
configid: new FormItemModel({ caption: 'ID', detailType: 'FORMITEM', name: 'configid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
......@@ -804,15 +797,15 @@ export default class MainBase extends Vue implements ControlInterface {
}
/**
* 监控表单属性 modelfile
* 监控表单属性 formitem
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.modelfile')
onModelfileChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'modelfile', newVal: newVal, oldVal: oldVal });
@Watch('data.formitem')
onFormitemChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'formitem', newVal: newVal, oldVal: oldVal });
}
/**
......
......@@ -56,9 +56,8 @@ export default class MainModel {
dataType: 'TEXT',
},
{
name: 'modelfile',
prop: 'modelfile',
dataType: 'TEXT',
name: 'formitem',
dataType:'FORMITEM',
},
{
name: 'configid',
......
......@@ -22,6 +22,66 @@
<template v-if="!isSingleSelect">
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</template>
<template v-if="getColumnState('configid')">
<el-table-column show-overflow-tooltip :prop="'configid'" :label="$t('entities.metadynamicmodel.main_grid.columns.configid')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.metadynamicmodel.main_grid.columns.configid')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.configid}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('dynainstid')">
<el-table-column show-overflow-tooltip :prop="'dynainstid'" :label="$t('entities.metadynamicmodel.main_grid.columns.dynainstid')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.metadynamicmodel.main_grid.columns.dynainstid')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.dynainstid}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('configname')">
<el-table-column show-overflow-tooltip :prop="'configname'" :label="$t('entities.metadynamicmodel.main_grid.columns.configname')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.metadynamicmodel.main_grid.columns.configname')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.configname}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('systemid')">
<el-table-column show-overflow-tooltip :prop="'systemid'" :label="$t('entities.metadynamicmodel.main_grid.columns.systemid')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.metadynamicmodel.main_grid.columns.systemid')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.systemid}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('pdynainstid')">
<el-table-column show-overflow-tooltip :prop="'pdynainstid'" :label="$t('entities.metadynamicmodel.main_grid.columns.pdynainstid')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.metadynamicmodel.main_grid.columns.pdynainstid')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.pdynainstid}}</span>
</template>
</el-table-column>
</template>
<template v-if="adaptiveState">
<el-table-column></el-table-column>
</template>
......@@ -220,7 +280,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @type {string}
* @memberof MainBase
*/
public majorInfoColName:string = "";
public majorInfoColName:string = "configname";
/**
* 界面UI服务对象
......@@ -579,6 +639,51 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public allColumns: any[] = [
{
name: 'configid',
label: 'ID',
langtag: 'entities.metadynamicmodel.main_grid.columns.configid',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'dynainstid',
label: '动态实例标识',
langtag: 'entities.metadynamicmodel.main_grid.columns.dynainstid',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'configname',
label: '名称',
langtag: 'entities.metadynamicmodel.main_grid.columns.configname',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'systemid',
label: '系统标识',
langtag: 'entities.metadynamicmodel.main_grid.columns.systemid',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'pdynainstid',
label: 'ID',
langtag: 'entities.metadynamicmodel.main_grid.columns.pdynainstid',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
]
/**
......@@ -1275,7 +1380,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
let allColumns:Array<any> = [];
let allColumns:Array<any> = ['configid','dynainstid','configname','systemid','pdynainstid'];
if(row && row.children) {
if(columnIndex == (this.isSingleSelect ? 0:1)) {
return [1, allColumns.length+1];
......@@ -1355,6 +1460,11 @@ export default class MainBase extends Vue implements ControlInterface {
const tree: any ={
groupById: Number((i+1)*100),
group: group.label,
configid:'',
dynainstid:'',
configname:'',
systemid:'',
pdynainstid:'',
children: children
}
groupTree.push(tree);
......@@ -1381,6 +1491,11 @@ export default class MainBase extends Vue implements ControlInterface {
const Tree: any = {
groupById: Number((allGroup.length+1)*100),
group: this.$t('app.gridpage.other'),
configid:'',
dynainstid:'',
configname:'',
systemid:'',
pdynainstid:'',
children: child
}
if(child && child.length > 0){
......@@ -1427,6 +1542,11 @@ export default class MainBase extends Vue implements ControlInterface {
const tree: any ={
groupById: Number((groupIndex+1)*100),
group: group,
configid:'',
dynainstid:'',
configname:'',
systemid:'',
pdynainstid:'',
children: children,
}
groupTree.push(tree);
......@@ -1856,10 +1976,16 @@ export default class MainBase extends Vue implements ControlInterface {
});
}
} else if(Object.is(errorMessage[index].data.errorKey, 'DuplicateKeyException')){
let name: string = this.service.getNameByProp("configid");
if(name){
let desc: any = this.allColumns.find((column: any) =>{
return Object.is(column.name, name);
});
this.$Notice.error({
title: (this.$t('app.commonWords.saveFailed') as string),
desc: errorMessage[index].data.message?errorMessage[index].data.message:(this.$t('app.commonWords.sysException') as string),
title: (this.$t('app.commonWords.createFailed') as string),
desc: (desc ? desc.label : '') + " : " + item[name] + (this.$t('app.commonWords.isExist') as string) + '!',
});
}
}else {
this.$Notice.error({
title: (this.$t('app.commonWords.saveFailed') as string),
......@@ -1968,6 +2094,7 @@ export default class MainBase extends Vue implements ControlInterface {
return;
}
let tempContext: any = this.$util.deepCopy(this.context);
Object.is(tempContext, { metadynamicmodel: data.configid });
const arg: any = JSON.parse(JSON.stringify(data));
Object.assign(arg,{viewparams:this.viewparams});
const post: Promise<any> = this.service.frontLogic(mode,JSON.parse(JSON.stringify(tempContext)),arg, showloading);
......
......@@ -26,11 +26,26 @@ export default class MainModel {
]
}else{
return [
{
name: 'dynainstid',
prop: 'dynainstid',
dataType: 'TEXT',
},
{
name: 'systemid',
prop: 'system_id',
dataType: 'PICKUP',
},
{
name: 'configid',
prop: 'configid',
dataType: 'TEXT',
},
{
name: 'configname',
prop: 'configname',
dataType: 'TEXT',
},
{
name: 'pdynainstid',
prop: 'pdynainstid',
......
......@@ -4,7 +4,7 @@
<!--输出实体[BLADE_VISUAL]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-blade_visual-55-1">
<changeSet author="root" id="tab-blade_visual-55-1">
<createTable tableName="blade_visual">
<column name="ID" remarks="" type="BIGINT">
<constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_ID"/>
......@@ -36,7 +36,7 @@
<!--输出实体[BLADE_VISUAL_CATEGORY]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-blade_visual_category-23-2">
<changeSet author="root" id="tab-blade_visual_category-23-2">
<createTable tableName="blade_visual_category">
<column name="ID" remarks="" type="BIGINT">
<constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_CATEGORY_ID"/>
......@@ -52,7 +52,7 @@
<!--输出实体[BLADE_VISUAL_CONFIG]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-blade_visual_config-18-3">
<changeSet author="root" id="tab-blade_visual_config-18-3">
<createTable tableName="blade_visual_config">
<column name="ID" remarks="" type="BIGINT">
<constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_CONFIG_ID"/>
......@@ -68,7 +68,7 @@
<!--输出实体[BLADE_VISUAL_MAP]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-blade_visual_map-18-4">
<changeSet author="root" id="tab-blade_visual_map-18-4">
<createTable tableName="blade_visual_map">
<column name="ID" remarks="" type="BIGINT">
<constraints primaryKey="true" primaryKeyName="PK_BLADE_VISUAL_MAP_ID"/>
......@@ -86,7 +86,7 @@
<!--输出实体[DST_COMPONENT]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_component-59-5">
<changeSet author="root" id="tab-dst_component-59-5">
<createTable tableName="IBZCOMPONENT">
<column name="CID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_COMPONENT_CID"/>
......@@ -112,7 +112,7 @@
<!--输出实体[DST_CONFIG]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_config-32-6">
<changeSet author="root" id="tab-dst_config-32-6">
<createTable tableName="IBZCFG">
<column name="CFGID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_CONFIG_CFGID"/>
......@@ -134,7 +134,7 @@
<!--输出实体[DST_DATASOURCE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_datasource-75-7">
<changeSet author="root" id="tab-dst_datasource-75-7">
<createTable tableName="IBZDATASOURCE">
<column name="DSID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_DATASOURCE_DSID"/>
......@@ -152,7 +152,7 @@
<!--输出实体[DST_ROUTER]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_router-37-8">
<changeSet author="root" id="tab-dst_router-37-8">
<createTable tableName="IBZROUTER">
<column name="ROUTERID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_ROUTER_ROUTERID"/>
......@@ -178,7 +178,7 @@
<!--输出实体[DST_SYSTEM]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_system-45-9">
<changeSet author="root" id="tab-dst_system-45-9">
<createTable tableName="IBZPSSYSTEM">
<column name="PSSYSTEMID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_SYSTEM_PSSYSTEMID"/>
......@@ -198,7 +198,7 @@
<!--输出实体[DST_VIEW]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dst_view-46-10">
<changeSet author="root" id="tab-dst_view-46-10">
<createTable tableName="IBZVIEW">
<column name="VIEWID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DST_VIEW_VIEWID"/>
......@@ -222,7 +222,7 @@
<!--输出实体[META_DATASET]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_dataset-33-11">
<changeSet author="root" id="tab-meta_dataset-33-11">
<createTable tableName="IBZDATASET">
<column name="DATASETID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_DATASET_DATASETID"/>
......@@ -244,7 +244,7 @@
<!--输出实体[META_DYNAMICMODEL]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_dynamicmodel-23-12">
<changeSet author="root" id="tab-meta_dynamicmodel-26-12">
<createTable tableName="IBZDYNAMICMODEL">
<column name="DYNAINSTID" remarks="" type="VARCHAR(100)">
</column>
......@@ -266,7 +266,7 @@
<!--输出实体[META_ENTITY]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_entity-105-13">
<changeSet author="root" id="tab-meta_entity-105-13">
<createTable tableName="IBZENTITY">
<column name="ENTITYID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_ENTITY_ENTITYID"/>
......@@ -298,7 +298,7 @@
<!--输出实体[META_FIELD]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_field-153-14">
<changeSet author="root" id="tab-meta_field-153-14">
<createTable tableName="IBZFIELD">
<column name="FIELDID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_FIELD_FIELDID"/>
......@@ -362,7 +362,7 @@
<!--输出实体[META_MODEL]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_model-44-15">
<changeSet author="root" id="tab-meta_model-44-15">
<createTable tableName="IBZMODEL">
<column name="MODELID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_MODEL_MODELID"/>
......@@ -388,7 +388,7 @@
<!--输出实体[META_MODULE]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_module-34-16">
<changeSet author="root" id="tab-meta_module-34-16">
<createTable tableName="IBZMODULE">
<column name="MODULEID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_MODULE_MODULEID"/>
......@@ -406,7 +406,7 @@
<!--输出实体[META_RELATION]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_relation-106-17">
<changeSet author="root" id="tab-meta_relation-106-17">
<createTable tableName="IBZRELATION">
<column name="RELATIONID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_RELATION_RELATIONID"/>
......@@ -448,10 +448,10 @@
<!--输出实体[DST_VIEW]外键关系 -->
<!--输出实体[META_DATASET]外键关系 -->
<!--输出实体[META_DYNAMICMODEL]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-meta_dynamicmodel-23-18">
<changeSet author="root" id="fk-meta_dynamicmodel-26-18">
<addForeignKeyConstraint baseColumnNames="SYSTEMID" baseTableName="IBZDYNAMICMODEL" constraintName="DER1N_META_DYNAMICMODEL_DST_SY" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PSSYSTEMID" referencedTableName="IBZPSSYSTEM" validate="true"/>
</changeSet>
<changeSet author="a_A_5d9d78509" id="fk-meta_dynamicmodel-23-19">
<changeSet author="root" id="fk-meta_dynamicmodel-26-19">
<addForeignKeyConstraint baseColumnNames="PDYNAINSTID" baseTableName="IBZDYNAMICMODEL" constraintName="DER1N_META_DYNAMICMODEL_META_D" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONFIGID" referencedTableName="IBZDYNAMICMODEL" validate="true"/>
</changeSet>
<!--输出实体[META_ENTITY]外键关系 -->
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册