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

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

上级 9be9e4fa
......@@ -39,6 +39,7 @@ function getLocaleResourceBase(){
},
main_grid: {
columns: {
systemid: commonLogic.appcommonhandle("系统标识",null),
configname: commonLogic.appcommonhandle("名称",null),
status: commonLogic.appcommonhandle("状态",null),
},
......
......@@ -39,6 +39,7 @@ function getLocaleResourceBase(){
},
main_grid: {
columns: {
systemid: commonLogic.appcommonhandle("系统标识",null),
configname: commonLogic.appcommonhandle("名称",null),
status: commonLogic.appcommonhandle("状态",null),
},
......
......@@ -39,6 +39,7 @@ function getLocaleResourceBase(){
},
main_grid: {
columns: {
systemid: commonLogic.appcommonhandle("系统标识",null),
configname: commonLogic.appcommonhandle("名称",null),
status: commonLogic.appcommonhandle("状态",null),
},
......
......@@ -22,6 +22,18 @@
<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}">
......@@ -605,6 +617,15 @@ 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: '名称',
......@@ -1327,7 +1348,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
let allColumns:Array<any> = ['configname','status'];
let allColumns:Array<any> = ['systemid','configname','status'];
if(row && row.children) {
if(columnIndex == (this.isSingleSelect ? 0:1)) {
return [1, allColumns.length+1];
......@@ -1407,6 +1428,7 @@ export default class MainBase extends Vue implements ControlInterface {
const tree: any ={
groupById: Number((i+1)*100),
group: group.label,
systemid:'',
configname:'',
status:'',
children: children
......@@ -1435,6 +1457,7 @@ 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:'',
children: child
......@@ -1483,6 +1506,7 @@ export default class MainBase extends Vue implements ControlInterface {
const tree: any ={
groupById: Number((groupIndex+1)*100),
group: group,
systemid:'',
configname:'',
status:'',
children: children,
......
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.avuedata.domain.BladeVisualCategory;
import cn.ibizlab.core.avuedata.filter.BladeVisualCategorySearchContext;
......
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.avuedata.domain.BladeVisualConfig;
import cn.ibizlab.core.avuedata.filter.BladeVisualConfigSearchContext;
......
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.avuedata.domain.BladeVisualMap;
import cn.ibizlab.core.avuedata.filter.BladeVisualMapSearchContext;
......
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.avuedata.domain.BladeVisual;
import cn.ibizlab.core.avuedata.filter.BladeVisualSearchContext;
......
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.lite.domain.DstComponent;
import cn.ibizlab.core.lite.filter.DstComponentSearchContext;
......
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.lite.domain.DstConfig;
import cn.ibizlab.core.lite.filter.DstConfigSearchContext;
......
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.lite.domain.DstDataSource;
import cn.ibizlab.core.lite.filter.DstDataSourceSearchContext;
......
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.lite.domain.DstRouter;
import cn.ibizlab.core.lite.filter.DstRouterSearchContext;
......
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.lite.domain.DstSystem;
import cn.ibizlab.core.lite.filter.DstSystemSearchContext;
......
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.lite.domain.DstView;
import cn.ibizlab.core.lite.filter.DstViewSearchContext;
......
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.lite.domain.DynamicModelConfig;
import cn.ibizlab.core.lite.filter.DynamicModelConfigSearchContext;
......
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.lite.domain.MetaDataSet;
import cn.ibizlab.core.lite.filter.MetaDataSetSearchContext;
......
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.lite.domain.MetaEntity;
import cn.ibizlab.core.lite.filter.MetaEntitySearchContext;
......
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.lite.domain.MetaField;
import cn.ibizlab.core.lite.filter.MetaFieldSearchContext;
......
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.lite.domain.MetaModel;
import cn.ibizlab.core.lite.filter.MetaModelSearchContext;
......
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.lite.domain.MetaModule;
import cn.ibizlab.core.lite.filter.MetaModuleSearchContext;
......
......@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import java.util.HashMap;
import java.util.Map;
import org.apache.ibatis.annotations.Select;
import cn.ibizlab.core.lite.domain.MetaRelationship;
import cn.ibizlab.core.lite.filter.MetaRelationshipSearchContext;
......
......@@ -222,7 +222,7 @@
<!--输出实体[DYNAMIC_MODEL_CONFIG]数据结构 -->
<changeSet author="root" id="tab-dynamic_model_config-41-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"/>
......@@ -443,7 +443,7 @@
<!--输出实体[DST_SYSTEM]外键关系 -->
<!--输出实体[DST_VIEW]外键关系 -->
<!--输出实体[DYNAMIC_MODEL_CONFIG]外键关系 -->
<changeSet author="root" id="fk-dynamic_model_config-41-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 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册