@visactor/vtable 0.10.1-alpha.2 → 0.10.1-alpha.3

package/cjs/layout/pivot-header-layout.js

@@ -116,7 +116,7 @@ class PivotHeaderLayoutMap {
             this._columnHeaderCellIds.unshift(firstRowIds);
             const cell = {
                 id: id,
-                caption: "string" == typeof this.columnHeaderTitle.title ? this.columnHeaderTitle.title : this.columnsDefine.reduce(((title, value) => "string" == typeof value ? title : title + (title ? `/${value.dimensionTitle}` : `${value.dimensionTitle}`)), ""),
+                title: "string" == typeof this.columnHeaderTitle.title ? this.columnHeaderTitle.title : this.columnsDefine.reduce(((title, value) => "string" == typeof value ? title : title + (title ? `/${value.title}` : `${value.title}`)), ""),
                 field: void 0,
                 headerType: null !== (_p = this.columnHeaderTitle.headerType) && void 0 !== _p ? _p : "text",
                 style: this.columnHeaderTitle.headerStyle,
@@ -132,7 +132,7 @@ class PivotHeaderLayoutMap {
             this._rowHeaderCellIds.unshift(firstColIds);
             const cell = {
                 id: id,
-                caption: "string" == typeof this.rowHeaderTitle.title ? this.rowHeaderTitle.title : this.rowsDefine.reduce(((title, value) => "string" == typeof value ? title : title + (title ? `/${value.dimensionTitle}` : `${value.dimensionTitle}`)), ""),
+                title: "string" == typeof this.rowHeaderTitle.title ? this.rowHeaderTitle.title : this.rowsDefine.reduce(((title, value) => "string" == typeof value ? title : title + (title ? `/${value.title}` : `${value.title}`)), ""),
                 field: void 0,
                 headerType: null !== (_q = this.rowHeaderTitle.headerType) && void 0 !== _q ? _q : "text",
                 style: this.rowHeaderTitle.headerStyle,
@@ -156,9 +156,9 @@ class PivotHeaderLayoutMap {
             for (let col = 0; col < (null == prev ? void 0 : prev.length); col++) newRow[col] = prev[col];
         }(row), header.forEach((hd => {
             var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
-            const id = hd.id, dimensionInfo = null !== (_b = null === (_a = this.rowsDefine) || void 0 === _a ? void 0 : _a.find((dimension => "string" != typeof dimension && dimension.dimensionKey === hd.dimensionKey))) && void 0 !== _b ? _b : null === (_c = this.columnsDefine) || void 0 === _c ? void 0 : _c.find((dimension => "string" != typeof dimension && dimension.dimensionKey === hd.dimensionKey)), indicatorInfo = null === (_d = this.indicatorsDefine) || void 0 === _d ? void 0 : _d.find((indicator => "string" != typeof indicator && (hd.indicatorKey ? indicator.indicatorKey === hd.indicatorKey : indicator.caption === hd.value))), cell = {
+            const id = hd.id, dimensionInfo = null !== (_b = null === (_a = this.rowsDefine) || void 0 === _a ? void 0 : _a.find((dimension => "string" != typeof dimension && dimension.dimensionKey === hd.dimensionKey))) && void 0 !== _b ? _b : null === (_c = this.columnsDefine) || void 0 === _c ? void 0 : _c.find((dimension => "string" != typeof dimension && dimension.dimensionKey === hd.dimensionKey)), indicatorInfo = null === (_d = this.indicatorsDefine) || void 0 === _d ? void 0 : _d.find((indicator => "string" != typeof indicator && (hd.indicatorKey ? indicator.indicatorKey === hd.indicatorKey : indicator.title === hd.value))), cell = {
                 id: id,
-                caption: null !== (_e = hd.value) && void 0 !== _e ? _e : indicatorInfo.caption,
+                title: null !== (_e = hd.value) && void 0 !== _e ? _e : indicatorInfo.title,
                 field: hd.dimensionKey,
                 style: "function" == typeof (null === (_f = null != indicatorInfo ? indicatorInfo : dimensionInfo) || void 0 === _f ? void 0 : _f.headerStyle) ? null === (_g = null != indicatorInfo ? indicatorInfo : dimensionInfo) || void 0 === _g ? void 0 : _g.headerStyle : Object.assign({}, null === (_h = null != indicatorInfo ? indicatorInfo : dimensionInfo) || void 0 === _h ? void 0 : _h.headerStyle),
                 headerType: null !== (_k = null !== (_j = null == indicatorInfo ? void 0 : indicatorInfo.headerType) && void 0 !== _j ? _j : null == dimensionInfo ? void 0 : dimensionInfo.headerType) && void 0 !== _k ? _k : "text",
@@ -221,7 +221,7 @@ class PivotHeaderLayoutMap {
             var _a, _b, _c, _d, _e, _f;
             const id = hd.id, dimensionInfo = null !== (_b = null === (_a = this.rowsDefine) || void 0 === _a ? void 0 : _a.find((dimension => "string" != typeof dimension && dimension.dimensionKey === hd.dimensionKey))) && void 0 !== _b ? _b : null === (_c = this.columnsDefine) || void 0 === _c ? void 0 : _c.find((dimension => "string" != typeof dimension && dimension.dimensionKey === hd.dimensionKey)), cell = {
                 id: id,
-                caption: hd.value,
+                title: hd.value,
                 field: hd.dimensionKey,
                 style: hd.level + 1 === totalLevel || "function" == typeof (null == dimensionInfo ? void 0 : dimensionInfo.headerStyle) ? null == dimensionInfo ? void 0 : dimensionInfo.headerStyle : Object.assign({}, null == dimensionInfo ? void 0 : dimensionInfo.headerStyle, {
                     textAlign: "left"
@@ -268,7 +268,7 @@ class PivotHeaderLayoutMap {
             var _a, _b, _c, _d, _e, _f;
             const id = ++seqId, dimensionInfo = null !== (_b = null === (_a = this.rowsDefine) || void 0 === _a ? void 0 : _a.find((dimension => "string" != typeof dimension && dimension.dimensionKey === dimensionKey))) && void 0 !== _b ? _b : null === (_c = this.columnsDefine) || void 0 === _c ? void 0 : _c.find((dimension => "string" != typeof dimension && dimension.dimensionKey === dimensionKey)), cell = {
                 id: id,
-                caption: dimensionKey === this.indicatorDimensionKey ? this.indicatorTitle : null !== (_d = null == dimensionInfo ? void 0 : dimensionInfo.dimensionTitle) && void 0 !== _d ? _d : "",
+                title: dimensionKey === this.indicatorDimensionKey ? this.indicatorTitle : null !== (_d = null == dimensionInfo ? void 0 : dimensionInfo.title) && void 0 !== _d ? _d : "",
                 field: "维度名称",
                 style: this.cornerSetting.headerStyle,
                 headerType: null !== (_e = this.cornerSetting.headerType) && void 0 !== _e ? _e : "text",
@@ -279,7 +279,7 @@ class PivotHeaderLayoutMap {
                 },
                 dropDownMenu: null == dimensionInfo ? void 0 : dimensionInfo.cornerDropDownMenu,
                 pivotInfo: {
-                    value: null !== (_f = null == dimensionInfo ? void 0 : dimensionInfo.dimensionTitle) && void 0 !== _f ? _f : "",
+                    value: null !== (_f = null == dimensionInfo ? void 0 : dimensionInfo.title) && void 0 !== _f ? _f : "",
                     dimensionKey: dimensionKey,
                     isPivotCorner: !0
                 },
@@ -293,7 +293,7 @@ class PivotHeaderLayoutMap {
         })); else {
             const id = ++seqId, cell = {
                 id: id,
-                caption: "",
+                title: "",
                 field: "维度名称",
                 style: this.cornerSetting.headerStyle,
                 headerType: null !== (_a = this.cornerSetting.headerType) && void 0 !== _a ? _a : "text",
@@ -647,13 +647,13 @@ class PivotHeaderLayoutMap {
             var _a, _b, _c;
             const colHeaderPath = {};
             colHeaderPath.dimensionKey = colHeader.dimensionKey, colHeaderPath.indicatorKey = colHeader.indicatorKey, 
-            colHeaderPath.value = null !== (_c = null !== (_a = colHeader.value) && void 0 !== _a ? _a : null === (_b = this.getIndicatorInfoByIndicatorKey(colHeader.indicatorKey)) || void 0 === _b ? void 0 : _b.caption) && void 0 !== _c ? _c : "", 
+            colHeaderPath.value = null !== (_c = null !== (_a = colHeader.value) && void 0 !== _a ? _a : null === (_b = this.getIndicatorInfoByIndicatorKey(colHeader.indicatorKey)) || void 0 === _b ? void 0 : _b.title) && void 0 !== _c ? _c : "", 
             headerPaths.colHeaderPaths.push(colHeaderPath);
         })), headerPathsWidthNode.rowHeaderPaths.forEach((rowHeader => {
             var _a, _b, _c;
             const rowHeaderPath = {};
             rowHeaderPath.dimensionKey = rowHeader.dimensionKey, rowHeaderPath.indicatorKey = rowHeader.indicatorKey, 
-            rowHeaderPath.value = null !== (_c = null !== (_a = rowHeader.value) && void 0 !== _a ? _a : null === (_b = this.getIndicatorInfoByIndicatorKey(rowHeader.indicatorKey)) || void 0 === _b ? void 0 : _b.caption) && void 0 !== _c ? _c : "", 
+            rowHeaderPath.value = null !== (_c = null !== (_a = rowHeader.value) && void 0 !== _a ? _a : null === (_b = this.getIndicatorInfoByIndicatorKey(rowHeader.indicatorKey)) || void 0 === _b ? void 0 : _b.title) && void 0 !== _c ? _c : "", 
             headerPaths.rowHeaderPaths.push(rowHeaderPath);
         })), headerPaths;
     }
@@ -688,7 +688,7 @@ class PivotHeaderLayoutMap {
             this._rowHeaderCellIds.unshift(firstColIds);
             const cell = {
                 id: id,
-                caption: "string" == typeof this.rowHeaderTitle.title ? this.rowHeaderTitle.title : this.rowsDefine.reduce(((title, value) => "string" == typeof value ? title : title + (title ? `/${value.dimensionTitle}` : `${value.dimensionTitle}`)), ""),
+                title: "string" == typeof this.rowHeaderTitle.title ? this.rowHeaderTitle.title : this.rowsDefine.reduce(((title, value) => "string" == typeof value ? title : title + (title ? `/${value.title}` : `${value.title}`)), ""),
                 field: void 0,
                 headerType: null !== (_a = this.rowHeaderTitle.headerType) && void 0 !== _a ? _a : "text",
                 style: this.rowHeaderTitle.headerStyle,