Merge branch 'develop' of ssh://nvwa.jiuqi.com.cn:2222/GFP/RBC/rbc-frontend into develop-yuancheng

develop/@rbc/workflow-job-view/src/components/custom-query/table-view/table-view.vue

@@ -7,7 +7,7 @@
             :table="table"
             :no-data-text='noDataText'
             :row-class-name="rowClassName"
-            :columns="newColumnsData"
+            :columns="columnsData"
             :loading="loading"
             :table-data="tableData"
             :highlight-row='isHighLightRow'
@@ -100,25 +100,6 @@ export default {
             type: Boolean
         }
     },
-    computed: {
-        newColumnsData() {
-            const tableColumns = this.table.columns
-            if (tableColumns) {
-                for (let i = 0; i < tableColumns.length; i ++) {
-                    let tableColumn = tableColumns[i];
-                    if (tableColumn.bodyAlign) {
-                        for (let j = 0; j < this.columnsData.length; j ++) {
-                            let column = this.columnsData[j];
-                            if (column.key === tableColumn.key) {
-                                column.className = `column-align-${tableColumn.bodyAlign}`
-                            }
-                        }
-                    }
-                }
-            }
-            return this.columnsData
-        }
-    },
     watch: {
         tableHeight:{
             handler(nv,ov){
@@ -390,6 +371,9 @@ export default {
             } else {
                 this.singleCol.align = colItem.format && colItem.format.type == "NUMBER" ? "right" : "left";
             }
+            if (colItem.headerAlign) {
+                this.singleCol.headerAlign = colItem.headerAlign;
+            }
             if (colItem.tooltip) {
                 this.singleCol.tooltip = true;
             }
@@ -397,6 +381,8 @@ export default {
                 this.singleCol.sortable = colItem.sortable;
             }
             this.singleCol.resizable = true;
+            this.singleCol.showOverflow = true;
+            this.singleCol.showHeaderOverflow = true;
             this.isHaveChildrenColums = true;
             if (colItem.type != "ACTION" && colItem.columnType.name == "fixed") {
                 this.singleCol.fixed = colItem.columnType.align;