Skip to content

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

zhouweidong 发布系统代码 [ibz-lite，应用]

上级 131fe2e0
隐藏空白字符变更
内嵌 并排
正在显示 包含 83 行增加 和 90 行删除
app_web/src/locale/lanres/entities/dynamic-model-config/dynamic-model-config_BO_CN_base.ts
浏览文件 @ ab936498
......@@ -30,8 +30,8 @@ function getLocaleResourceBase(){
srfuf: commonLogic.appcommonhandle("",null),
srfdeid: commonLogic.appcommonhandle("",null),
srfsourcekey: commonLogic.appcommonhandle("",null),
configname: commonLogic.appcommonhandle("名称",null),
modelfile: commonLogic.appcommonhandle("文件",null),
status: commonLogic.appcommonhandle("状态",null),
configid: commonLogic.appcommonhandle("ID",null),
},
uiactions: {
......@@ -39,9 +39,9 @@ function getLocaleResourceBase(){
},
main_grid: {
columns: {
systemid: commonLogic.appcommonhandle("系统标识",null),
configname: commonLogic.appcommonhandle("名称",null),
status: commonLogic.appcommonhandle("状态",null),
systemid: commonLogic.appcommonhandle("系统标识",null),
},
nodata:commonLogic.appcommonhandle("",null),
uiactions: {
......
app_web/src/locale/lanres/entities/dynamic-model-config/dynamic-model-config_en_US_base.ts
浏览文件 @ ab936498
......@@ -30,8 +30,8 @@ function getLocaleResourceBase(){
srfuf: commonLogic.appcommonhandle("",null),
srfdeid: commonLogic.appcommonhandle("",null),
srfsourcekey: commonLogic.appcommonhandle("",null),
configname: commonLogic.appcommonhandle("名称",null),
modelfile: commonLogic.appcommonhandle("文件",null),
status: commonLogic.appcommonhandle("状态",null),
configid: commonLogic.appcommonhandle("ID",null),
},
uiactions: {
......@@ -39,9 +39,9 @@ function getLocaleResourceBase(){
},
main_grid: {
columns: {
systemid: commonLogic.appcommonhandle("系统标识",null),
configname: commonLogic.appcommonhandle("名称",null),
status: commonLogic.appcommonhandle("状态",null),
systemid: commonLogic.appcommonhandle("系统标识",null),
},
nodata:commonLogic.appcommonhandle("",null),
uiactions: {
......
app_web/src/locale/lanres/entities/dynamic-model-config/dynamic-model-config_zh_CN_base.ts
浏览文件 @ ab936498
......@@ -30,8 +30,8 @@ function getLocaleResourceBase(){
srfuf: commonLogic.appcommonhandle("",null),
srfdeid: commonLogic.appcommonhandle("",null),
srfsourcekey: commonLogic.appcommonhandle("",null),
configname: commonLogic.appcommonhandle("名称",null),
modelfile: commonLogic.appcommonhandle("文件",null),
status: commonLogic.appcommonhandle("状态",null),
configid: commonLogic.appcommonhandle("ID",null),
},
uiactions: {
......@@ -39,9 +39,9 @@ function getLocaleResourceBase(){
},
main_grid: {
columns: {
systemid: commonLogic.appcommonhandle("系统标识",null),
configname: commonLogic.appcommonhandle("名称",null),
status: commonLogic.appcommonhandle("状态",null),
systemid: commonLogic.appcommonhandle("系统标识",null),
},
nodata:commonLogic.appcommonhandle("",null),
uiactions: {
......
app_web/src/widgets/dynamic-model-config/main-form/main-form-base.vue
浏览文件 @ ab936498
......@@ -10,30 +10,23 @@
</app-form-group>
</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.dynamicmodelconfig.main_form.details.modelfile')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.modelfile.error" :isEmptyCaption="false" labelPos="LEFT">
<app-file-upload :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange" :data="JSON.stringify(this.data)" name='modelfile' :value="data.modelfile" :disabled="detailsModel.modelfile.disabled" :uploadparams='{}' :exportparams='{}' style="overflow: auto;"></app-file-upload>
<i-col v-show="detailsModel.configname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='configname' :itemRules="this.rules().configname" class='' :caption="$t('entities.dynamicmodelconfig.main_form.details.configname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.configname.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box
v-model="data.configname"
@enter="onEnter($event)"
unit=""
:disabled="detailsModel.configname.disabled"
type='text'
style="">
</input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.status.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='status' :itemRules="this.rules().status" class='' :caption="$t('entities.dynamicmodelconfig.main_form.details.status')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.status.error" :isEmptyCaption="false" labelPos="LEFT">
<dropdown-list
v-model="data.status"
:data="data"
:context="context"
:viewparams="viewparams"
:formState="formState"
:localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.status.disabled"
valueType="string"
tag='DynamicModelStatus'
codelistType='STATIC'
placeholder='请选择...' style="">
</dropdown-list>
<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.dynamicmodelconfig.main_form.details.modelfile')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.modelfile.error" :isEmptyCaption="false" labelPos="LEFT">
<app-file-upload :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange" :data="JSON.stringify(this.data)" name='modelfile' :value="data.modelfile" :disabled="detailsModel.modelfile.disabled" :uploadparams='{}' :exportparams='{}' style="overflow: auto;"></app-file-upload>
</app-form-item>
......@@ -441,8 +434,8 @@ export default class MainBase extends Vue implements ControlInterface {
srfuf: null,
srfdeid: null,
srfsourcekey: null,
configname: null,
modelfile: null,
status: null,
configid: null,
dynamicmodelconfig:null,
};
......@@ -485,7 +478,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @type {string}
* @memberof MainBase
*/
public majorMessageField: string = "";
public majorMessageField: string = "configname";
/**
* 值规则
......@@ -495,14 +488,14 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public rules() :any {
return {
configname: [
{ 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' },
],
status: [
{ required: this.detailsModel.status.required, type: 'string', message: '状态 值不能为空', trigger: 'change' },
{ required: this.detailsModel.status.required, type: 'string', message: '状态 值不能为空', trigger: 'blur' },
],
}
}
......@@ -628,9 +621,9 @@ export default class MainBase extends Vue implements ControlInterface {
,
srfsourcekey: new FormItemModel({ caption: '', detailType: 'FORMITEM', name: 'srfsourcekey', 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 })
configname: new FormItemModel({ caption: '名称', detailType: 'FORMITEM', name: 'configname', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
status: new FormItemModel({ caption: '状态', detailType: 'FORMITEM', name: 'status', 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 })
,
configid: new FormItemModel({ caption: 'ID', detailType: 'FORMITEM', name: 'configid', visible: true, isShowCaption: true, form: this, isControlledContent: false , required:false, disabled: false, enableCond: 3 })
,
......@@ -721,27 +714,27 @@ export default class MainBase extends Vue implements ControlInterface {
}
/**
* 监控表单属性 modelfile 值
* 监控表单属性 configname 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.modelfile')
onModelfileChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'modelfile', newVal: newVal, oldVal: oldVal });
@Watch('data.configname')
onConfignameChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'configname', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 status 值
* 监控表单属性 modelfile 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.status')
onStatusChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'status', newVal: newVal, oldVal: oldVal });
@Watch('data.modelfile')
onModelfileChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'modelfile', newVal: newVal, oldVal: oldVal });
}
/**
......
app_web/src/widgets/dynamic-model-config/main-form/main-form-model.ts
浏览文件 @ ab936498
......@@ -51,14 +51,14 @@ export default class MainModel {
name: 'srfsourcekey',
},
{
name: 'modelfile',
prop: 'modelfile',
name: 'configname',
prop: 'configname',
dataType: 'TEXT',
},
{
name: 'status',
prop: 'status',
dataType: 'SSCODELIST',
name: 'modelfile',
prop: 'modelfile',
dataType: 'TEXT',
},
{
name: 'configid',
......
app_web/src/widgets/dynamic-model-config/main-grid/main-grid-base.vue
浏览文件 @ ab936498
......@@ -22,18 +22,6 @@
<template v-if="!isSingleSelect">
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</template>
<template v-if="getColumnState('systemid')">
<el-table-column show-overflow-tooltip :prop="'systemid'" :label="$t('entities.dynamicmodelconfig.main_grid.columns.systemid')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.dynamicmodelconfig.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('configname')">
<el-table-column show-overflow-tooltip :prop="'configname'" :label="$t('entities.dynamicmodelconfig.main_grid.columns.configname')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
......@@ -60,6 +48,18 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('systemid')">
<el-table-column show-overflow-tooltip :prop="'systemid'" :label="$t('entities.dynamicmodelconfig.main_grid.columns.systemid')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.dynamicmodelconfig.main_grid.columns.systemid')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.systemid}}</span>
</template>
</el-table-column>
</template>
<template v-if="adaptiveState">
<el-table-column></el-table-column>
</template>
......@@ -617,15 +617,6 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public allColumns: any[] = [
{
name: 'systemid',
label: '系统标识',
langtag: 'entities.dynamicmodelconfig.main_grid.columns.systemid',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'configname',
label: '名称',
......@@ -644,6 +635,15 @@ export default class MainBase extends Vue implements ControlInterface {
isEnableRowEdit: false,
enableCond: 3 ,
},
{
name: 'systemid',
label: '系统标识',
langtag: 'entities.dynamicmodelconfig.main_grid.columns.systemid',
show: true,
unit: 'PX',
isEnableRowEdit: false,
enableCond: 3 ,
},
]
/**
......@@ -1348,7 +1348,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
let allColumns:Array<any> = ['systemid','configname','status'];
let allColumns:Array<any> = ['configname','status','systemid'];
if(row && row.children) {
if(columnIndex == (this.isSingleSelect ? 0:1)) {
return [1, allColumns.length+1];
......@@ -1428,9 +1428,9 @@ export default class MainBase extends Vue implements ControlInterface {
const tree: any ={
groupById: Number((i+1)*100),
group: group.label,
systemid:'',
configname:'',
status:'',
systemid:'',
children: children
}
groupTree.push(tree);
......@@ -1457,9 +1457,9 @@ export default class MainBase extends Vue implements ControlInterface {
const Tree: any = {
groupById: Number((allGroup.length+1)*100),
group: this.$t('app.gridpage.other'),
systemid:'',
configname:'',
status:'',
systemid:'',
children: child
}
if(child && child.length > 0){
......@@ -1506,9 +1506,9 @@ export default class MainBase extends Vue implements ControlInterface {
const tree: any ={
groupById: Number((groupIndex+1)*100),
group: group,
systemid:'',
configname:'',
status:'',
systemid:'',
children: children,
}
groupTree.push(tree);
......
ibzlite-core/src/main/resources/liquibase/h2_table.xml
浏览文件 @ ab936498
......@@ -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-43-9">
<changeSet author="root" id="tab-dst_system-43-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 @@
<!--输出实体[DYNAMIC_MODEL_CONFIG]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-dynamic_model_config-44-11">
<changeSet author="root" id="tab-dynamic_model_config-44-11">
<createTable tableName="IBZDYNAMICMODELCONFIG">
<column name="CONFIGID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_DYNAMIC_MODEL_CONFIG_CONFIG"/>
......@@ -240,7 +240,7 @@
<!--输出实体[META_DATASET]数据结构 -->
<changeSet author="a_A_5d9d78509" id="tab-meta_dataset-33-12">
<changeSet author="root" id="tab-meta_dataset-33-12">
<createTable tableName="IBZDATASET">
<column name="DATASETID" remarks="" type="VARCHAR(100)">
<constraints primaryKey="true" primaryKeyName="PK_META_DATASET_DATASETID"/>
......@@ -262,7 +262,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"/>
......@@ -294,7 +294,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"/>
......@@ -358,7 +358,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"/>
......@@ -384,7 +384,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"/>
......@@ -402,7 +402,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"/>
......@@ -443,7 +443,7 @@
<!--输出实体[DST_SYSTEM]外键关系 -->
<!--输出实体[DST_VIEW]外键关系 -->
<!--输出实体[DYNAMIC_MODEL_CONFIG]外键关系 -->
<changeSet author="a_A_5d9d78509" id="fk-dynamic_model_config-44-18">
<changeSet author="root" id="fk-dynamic_model_config-44-18">
<addForeignKeyConstraint baseColumnNames="SYSTEMID" baseTableName="IBZDYNAMICMODELCONFIG" constraintName="DER1N_DYNAMIC_MODEL_CONFIG_DST" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="PSSYSTEMID" referencedTableName="IBZPSSYSTEM" validate="true"/>
</changeSet>
<!--输出实体[META_DATASET]外键关系 -->
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或