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

app_web/src/locale/lanres/entities/dynamic-model-config/dynamic-model-config_BO_CN_base.ts

@@ -39,6 +39,7 @@ function getLocaleResourceBase(){
 		},
 		main_grid: {
 			columns: {
+				systemid: commonLogic.appcommonhandle("系统标识",null),
 				configname: commonLogic.appcommonhandle("名称",null),
 				status: commonLogic.appcommonhandle("状态",null),
 			},

app_web/src/locale/lanres/entities/dynamic-model-config/dynamic-model-config_en_US_base.ts

@@ -39,6 +39,7 @@ function getLocaleResourceBase(){
 		},
 		main_grid: {
 			columns: {
+				systemid: commonLogic.appcommonhandle("系统标识",null),
 				configname: commonLogic.appcommonhandle("名称",null),
 				status: commonLogic.appcommonhandle("状态",null),
 			},

app_web/src/locale/lanres/entities/dynamic-model-config/dynamic-model-config_zh_CN_base.ts

@@ -39,6 +39,7 @@ function getLocaleResourceBase(){
 		},
 		main_grid: {
 			columns: {
+				systemid: commonLogic.appcommonhandle("系统标识",null),
 				configname: commonLogic.appcommonhandle("名称",null),
 				status: commonLogic.appcommonhandle("状态",null),
 			},

app_web/src/widgets/dynamic-model-config/main-grid/main-grid-base.vue

@@ -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,

ibzlite-core/src/main/java/cn/ibizlab/core/avuedata/mapper/BladeVisualCategoryMapper.java

@@ -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;

ibzlite-core/src/main/java/cn/ibizlab/core/avuedata/mapper/BladeVisualConfigMapper.java

@@ -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;

ibzlite-core/src/main/java/cn/ibizlab/core/avuedata/mapper/BladeVisualMapMapper.java

@@ -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;

ibzlite-core/src/main/java/cn/ibizlab/core/avuedata/mapper/BladeVisualMapper.java

@@ -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;

ibzlite-core/src/main/java/cn/ibizlab/core/lite/mapper/DstComponentMapper.java

@@ -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;

ibzlite-core/src/main/java/cn/ibizlab/core/lite/mapper/DstConfigMapper.java

@@ -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;

ibzlite-core/src/main/java/cn/ibizlab/core/lite/mapper/DstDataSourceMapper.java

@@ -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;

ibzlite-core/src/main/java/cn/ibizlab/core/lite/mapper/DstRouterMapper.java

@@ -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;

ibzlite-core/src/main/java/cn/ibizlab/core/lite/mapper/DstSystemMapper.java

@@ -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;

ibzlite-core/src/main/java/cn/ibizlab/core/lite/mapper/DstViewMapper.java

@@ -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;

ibzlite-core/src/main/java/cn/ibizlab/core/lite/mapper/DynamicModelConfigMapper.java

@@ -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;

ibzlite-core/src/main/java/cn/ibizlab/core/lite/mapper/MetaDataSetMapper.java

@@ -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;

ibzlite-core/src/main/java/cn/ibizlab/core/lite/mapper/MetaEntityMapper.java

@@ -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;

ibzlite-core/src/main/java/cn/ibizlab/core/lite/mapper/MetaFieldMapper.java

@@ -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;

ibzlite-core/src/main/java/cn/ibizlab/core/lite/mapper/MetaModelMapper.java

@@ -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;

ibzlite-core/src/main/java/cn/ibizlab/core/lite/mapper/MetaModuleMapper.java

@@ -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;

ibzlite-core/src/main/java/cn/ibizlab/core/lite/mapper/MetaRelationshipMapper.java

@@ -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;

ibzlite-core/src/main/resources/liquibase/h2_table.xml

@@ -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]外键关系 -->