cnhis-design-vue 3.1.35-beta.10 → 3.1.35-beta.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -109,13 +109,14 @@ function useSeparateRow(getColumnConfig, spanMethod, getFieldItem, $VXETable) {
|
|
|
109
109
|
$columnIndex: columnIndex,
|
|
110
110
|
_columnIndex
|
|
111
111
|
}) || {};
|
|
112
|
-
return { colspan, columnIndex };
|
|
112
|
+
return { colspan, columnIndex, _columnIndex };
|
|
113
113
|
}
|
|
114
114
|
async function getColumnRenderWidth(column, row, rowIndex) {
|
|
115
115
|
if (!isFunction(spanMethod) || !$VXETable.value)
|
|
116
116
|
return { width: await getWidth(column), colspan: 1 };
|
|
117
|
-
const { colspan, columnIndex } = getColspanInfo(column.columnName, row, rowIndex);
|
|
118
|
-
const
|
|
117
|
+
const { colspan, _columnIndex, columnIndex } = getColspanInfo(column.columnName, row, rowIndex);
|
|
118
|
+
const colIndex = _columnIndex != null ? _columnIndex : columnIndex;
|
|
119
|
+
const width = colspan <= 0 ? 0 : colspan === 1 ? await getWidth(column) : await $VXETable.value.getColumns().slice(colIndex, colIndex + colspan).reduce(async (res, columnInfo) => {
|
|
119
120
|
return await res + await getWidth({ columnName: columnInfo.field });
|
|
120
121
|
}, Promise.resolve(0));
|
|
121
122
|
return { width, colspan };
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cnhis-design-vue",
|
|
3
|
-
"version": "3.1.35-beta.
|
|
3
|
+
"version": "3.1.35-beta.11",
|
|
4
4
|
"license": "ISC",
|
|
5
5
|
"module": "./es/components/index.js",
|
|
6
6
|
"main": "./es/components/index.js",
|
|
@@ -61,5 +61,5 @@
|
|
|
61
61
|
"iOS 7",
|
|
62
62
|
"last 3 iOS versions"
|
|
63
63
|
],
|
|
64
|
-
"gitHead": "
|
|
64
|
+
"gitHead": "685b35af722671ff10e080c0ac4d2d392a23da47"
|
|
65
65
|
}
|