Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

src/components/IStreamTable.vue

@@ -199,7 +199,8 @@ export default {
           obj[position].push({
             idx:index,
             prop:label,
-            width:width+'px',
+            // width:width+'px',
+            width:width === 'auto' ? width : width +'px',
             pattern,
             render,
             ...rest
@@ -218,7 +219,8 @@ export default {
           obj[positionArr[0]].push({
             idx: colPropArr[0],
             prop: columnName,
-            width: colPropArr[3] + 'px',
+            // width: colPropArr[3] + 'px',
+            width: colPropArr[3] === 'auto' ? colPropArr[3] : colPropArr[3] + 'px',
           });
         }
       }