【update】

[task-1033] 数据模板增加垂直对齐方式配置
[bug-527] 块模式子表渲染异常bug

src/business/platform/data/templatebuilder/right-aside/editors/display-column.vue

@@ -35,6 +35,13 @@
                 <el-radio-button label="right">右对齐</el-radio-button>
             </el-radio-group>
         </el-form-item>
+        <el-form-item label="垂直对齐" prop="vertical">
+            <el-radio-group v-model="formData.vertical">
+                <el-radio-button label="top">顶部对齐</el-radio-button>
+                <el-radio-button label="middle">垂直居中</el-radio-button>
+                <el-radio-button label="bottom">底部对齐</el-radio-button>
+            </el-radio-group>
+        </el-form-item>
         <el-form-item label="宽度" prop="width">
             <el-input v-model="formData.width" type="number" />
         </el-form-item>

src/business/platform/data/templatebuilder/template-main/templates/list.vue

@@ -104,6 +104,7 @@ export default {
                         prop: column.name,
                         label: column.label,
                         align: column.align,
+                        vertical: column.vertical,
                         sortable: column.sortable
                     })
                 })

src/business/platform/data/templaterender/templates/list.vue

@@ -1555,6 +1555,7 @@ export default {
                 prop: field.name,
                 label: field.label,
                 align: field.align,
+                vertical: field.vertical,
                 width: field.width,
                 hidden: field['field_type'] === 'hidden'
             }

src/business/platform/form/formrender/dynamic-form/dynamic-form-table.vue

@@ -283,7 +283,7 @@ export default {
             defId: '', // 编辑dialog需要使用
             currentPage: 1,
             totalCount: 0,
-            dataModel: [],
+            dataModel: initData,
             copDataModel: initData,
             multipleSelection: '',
             countNumber: 0,
@@ -457,6 +457,9 @@ export default {
         dataModel: {
             handler (val, oldVal) {
                 // 进行分页操作
+                if (this.mode === 'block') {
+                    return val
+                }
                 this.handlePagination(val)
             }
         },

src/components/ibps-crud/index.vue

@@ -168,6 +168,7 @@
                         :prop="handleAttribute(column.prop, null)"
                         :label="handleAttribute(column.label, '')"
                         :width="handleAttribute(column.width,null)"
+                        :class-name="'vertical-' + handleAttribute(column.vertical, 'middle')"
                         v-bind="column"
                         show-overflow-tooltip
                     >
@@ -506,4 +507,13 @@ export default {
     .el-table .el-table-column--selection {
         text-align: center;
     }
+    .el-table .vertical-top {
+        vertical-align: top;
+    }
+    .el-table .vertical-middle {
+        vertical-align: middle;
+    }
+    .el-table .vertical-bottom {
+        vertical-align: bottom;
+    }
 </style>