Merge remote-tracking branch 'origin/master'

jero-web/src/components/tableCollection/index.vue

@@ -11,6 +11,7 @@
         :loading="loading"
         :columns="columns"
         @change="tableOnChange"
+        @onHeaderRow='onHeaderRow'
       >
         <span slot="operation" slot-scope="record">
                      <a v-for="(ol,index) in OperationList"
@@ -76,13 +77,8 @@ export default {
   },
   mounted() {},
   methods: {
-
+    onHeaderRow(column, index) {
-    getTextWith(text, fontStyle) {
+      console.log(column, index)
-      // var canvas = document.createElement('canvas')
-      // var context = canvas.getContext('2d')
-      // context.font = fontStyle || '14px' // 设置字体样式
-      // var dimension = context.measureText(text)
-      // return dimension.width + 40
     },
     getData() {
       let params = {

jero-web/src/views/parameter/parameterlist/index.vue

@@ -75,6 +75,7 @@
         :data-source="dataSource"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :columns="columns"
+        @customHeaderRow='customHeaderRow'
       >
 <!--        @change="tableOnChange"-->
         <span slot="projectName" slot-scope="text,record">
@@ -152,12 +153,12 @@ export default {
         {
           title: this.$t('ParameterName'),
           align: 'center',
-          dataIndex: 'paramsName'
+          dataIndex: 'paramsName',
         },
         {
           title: this.$t('ParameterDescription'),
           align: 'center',
-          dataIndex: 'description'
+          dataIndex: 'description',
         },
         {
           title: this.$t('areaOfResponsibility'),
@@ -185,14 +186,12 @@ export default {
     this.getList()
   },
   methods: {
-    // tableOnChange(pagination, filters, sorter) {
+    customHeaderRow(val,kk) {
-    //   console.log(pagination,'pagination')
+      console.log(val,kk)
-    //   console.log(filters,'filters')
+    },
-    //   console.log(sorter,'sorter')
+    onClick(val,kk) {
-    //   // this.orderBy = sorter.order == 'ascend' ? '1' : '2'
+      console.log(val,kk)
-    //   // this.orderByField = sorter.columnKey
+    },
-    //   this.getList()
-    // },
     //导出
     handleExport() {
       let _tt = {