@fmdevui/fm-dev 1.0.60 → 1.0.61
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.
- package/es/core/hook/useVxeTableOptionsHook.d.ts +1 -1
- package/es/packages/core/hook/useVxeTableOptionsHook.mjs +3 -2
- package/index.js +4 -3
- package/index.min.js +2 -2
- package/index.min.mjs +2 -2
- package/index.mjs +4 -3
- package/lib/core/hook/useVxeTableOptionsHook.d.ts +1 -1
- package/lib/packages/core/hook/useVxeTableOptionsHook.js +3 -2
- package/package.json +1 -1
- /package/es/{defaults.css → component.css} +0 -0
|
@@ -14,7 +14,7 @@ interface iVxeOption {
|
|
|
14
14
|
name?: string;
|
|
15
15
|
spanFields?: Array<string>;
|
|
16
16
|
spanValueField?: string;
|
|
17
|
-
spanMethod
|
|
17
|
+
spanMethod?: VxeTablePropTypes.SpanMethod<any>;
|
|
18
18
|
columns: VxeGridPropTypes.Columns<any>;
|
|
19
19
|
data?: VxeTablePropTypes.Data<any>;
|
|
20
20
|
sortConfig?: VxeTablePropTypes.SortConfig<any>;
|
|
@@ -19,7 +19,7 @@ const useVxeTable = (opt, extras) => {
|
|
|
19
19
|
align: "center",
|
|
20
20
|
// 自动监听父元素的变化去重新计算表格（对于父元素可能存在动态变化、显示隐藏的容器中、列宽异常等场景中的可能会用到）
|
|
21
21
|
// data: [] as Array<T>,
|
|
22
|
-
spanMethod: spanFields ? ({ row, rowIndex, column, visibleData }) => {
|
|
22
|
+
spanMethod: spanFields.length > 0 ? ({ row, rowIndex, column, visibleData }) => {
|
|
23
23
|
const cellValue = row[spanValueField];
|
|
24
24
|
if (cellValue && spanFields.includes(column.field)) {
|
|
25
25
|
const prevRow = visibleData[rowIndex - 1];
|
|
@@ -36,7 +36,8 @@ const useVxeTable = (opt, extras) => {
|
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
|
-
} : opt.spanMethod,
|
|
39
|
+
} : opt.spanMethod ? opt.spanMethod : ({ row, rowIndex, column, visibleData }) => {
|
|
40
|
+
},
|
|
40
41
|
columns: opt.columns,
|
|
41
42
|
showFooter: opt.showFooter,
|
|
42
43
|
footerData: opt.footerData,
|
package/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
/*! fm-dev v1.0.
|
|
1
|
+
/*! fm-dev v1.0.61 */
|
|
2
2
|
(function (global, factory) {
|
|
3
3
|
typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vue'), require('crypto'), require('url'), require('http'), require('https'), require('util'), require('stream'), require('assert'), require('zlib'), require('element-plus')) :
|
|
4
4
|
typeof define === 'function' && define.amd ? define(['exports', 'vue', 'crypto', 'url', 'http', 'https', 'util', 'stream', 'assert', 'zlib', 'element-plus'], factory) :
|
|
@@ -52809,7 +52809,7 @@
|
|
|
52809
52809
|
align: "center",
|
|
52810
52810
|
// 自动监听父元素的变化去重新计算表格（对于父元素可能存在动态变化、显示隐藏的容器中、列宽异常等场景中的可能会用到）
|
|
52811
52811
|
// data: [] as Array<T>,
|
|
52812
|
-
spanMethod: spanFields ? ({ row, rowIndex, column, visibleData }) => {
|
|
52812
|
+
spanMethod: spanFields.length > 0 ? ({ row, rowIndex, column, visibleData }) => {
|
|
52813
52813
|
const cellValue = row[spanValueField];
|
|
52814
52814
|
if (cellValue && spanFields.includes(column.field)) {
|
|
52815
52815
|
const prevRow = visibleData[rowIndex - 1];
|
|
@@ -52826,7 +52826,8 @@
|
|
|
52826
52826
|
}
|
|
52827
52827
|
}
|
|
52828
52828
|
}
|
|
52829
|
-
} : opt.spanMethod,
|
|
52829
|
+
} : opt.spanMethod ? opt.spanMethod : ({ row, rowIndex, column, visibleData }) => {
|
|
52830
|
+
},
|
|
52830
52831
|
columns: opt.columns,
|
|
52831
52832
|
showFooter: opt.showFooter,
|
|
52832
52833
|
footerData: opt.footerData,
|