@visactor/vtable 1.16.0-alpha.1 → 1.16.0

package/es/dataset/dataset-pivot-table.js

@@ -337,5 +337,4 @@ export class DatasetForPivotTable {
         }
         return tree.forEach((treeNode => getPath(treeNode, []))), result;
     }
-}
-//# sourceMappingURL=dataset-pivot-table.js.map
+}

package/es/dataset/flatDataToObject.js

@@ -120,4 +120,5 @@ export class FlatDataToObjects {
             this.rowFlatKeys = {}, this.colFlatKeys = {}, this.tree = {}, this.processRecords();
         }
     }
-}
+}
+//# sourceMappingURL=flatDataToObject.js.map

package/es/event/media-click.js

@@ -6,6 +6,8 @@ import { Env } from "../tools/env";
 
 import { regUrl } from "../tools/global";
 
+import { getOrApply } from "../tools/helper";
+
 export function bindMediaClick(table) {
     "browser" === Env.mode && table.on(TABLE_EVENT_TYPE.CLICK_CELL, (e => {
         const {col: col, row: row} = e;
@@ -14,12 +16,27 @@ export function bindMediaClick(table) {
         cellType = table.internalProps.layoutMap.isHeader(col, row) ? table.isPivotTable() ? table._getHeaderLayoutMap(col, row).headerType : table.getHeaderDefine(col, row).headerType : table.getBodyColumnType(col, row);
         const columnDefine = table.isHeader(col, row) ? table.getHeaderDefine(col, row) : table.getBodyColumnDefine(col, row), cellValue = table.getCellValue(col, row), cellOriginValue = table.getCellOriginValue(col, row);
         if ("link" === cellType) {
-            if (!(!1 !== columnDefine.linkJump)) return;
-            const templateLink = columnDefine.templateLink, linkDetect = !1 !== columnDefine.linkDetect;
-            let url;
-            if (templateLink) {
+            let linkJump = getOrApply(columnDefine.linkJump, {
+                col: col,
+                row: row,
+                table: table,
+                value: cellValue,
+                dataValue: cellOriginValue,
+                cellHeaderPaths: void 0
+            });
+            if (linkJump = !1 !== linkJump, !linkJump) return;
+            const templateLink = columnDefine.templateLink;
+            let url, linkDetect = getOrApply(columnDefine.linkDetect, {
+                col: col,
+                row: row,
+                table: table,
+                value: cellValue,
+                dataValue: cellOriginValue,
+                cellHeaderPaths: void 0
+            });
+            if (linkDetect = !1 !== linkDetect, templateLink) {
                 const rowData = table.getCellOriginRecord(col, row);
-                if (rowData.vtableMerge) return;
+                if (rowData && rowData.vtableMerge) return;
                 const data = Object.assign({
                     __value: cellValue,
                     __dataValue: cellOriginValue

package/es/event/media-click.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/event/media-click.ts"],"names":[],"mappings":"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","file":"media-click.js","sourcesContent":["import { isFunction } from '@visactor/vutils';\nimport { TABLE_EVENT_TYPE } from '../core/TABLE_EVENT_TYPE';\nimport { Env } from '../tools/env';\nimport { regUrl } from '../tools/global';\nimport type { LinkColumnDefine, MousePointerCellEvent } from '../ts-types';\nimport type { BaseTableAPI, HeaderData } from '../ts-types/base-table';\nimport type { IImageColumnBodyDefine } from '../ts-types/list-table/define/image-define';\n\nexport function bindMediaClick(table: BaseTableAPI): void {\n  if (Env.mode === 'browser') {\n    // table.hasMedia = false;\n\n    table.on(TABLE_EVENT_TYPE.CLICK_CELL, (e: MousePointerCellEvent) => {\n      //如果目前是在某个icon上，如收起展开按钮 则不进行其他点击逻辑\n      const { col, row } = e;\n\n      if (e.target.type === 'image' && (e.target as any).role && (e.target as any).role.startsWith('icon')) {\n        // click icon\n        return;\n      }\n      let cellType;\n      if (table.internalProps.layoutMap.isHeader(col, row)) {\n        cellType = table.isPivotTable()\n          ? (table._getHeaderLayoutMap(col, row) as HeaderData).headerType\n          : (table.getHeaderDefine(col, row) as HeaderData).headerType;\n      } else {\n        cellType = table.getBodyColumnType(col, row);\n      }\n      const columnDefine = table.isHeader(col, row)\n        ? table.getHeaderDefine(col, row)\n        : table.getBodyColumnDefine(col, row);\n      const cellValue = table.getCellValue(col, row);\n      const cellOriginValue = table.getCellOriginValue(col, row);\n      if (cellType === 'link') {\n        const linkJump = (columnDefine as LinkColumnDefine).linkJump !== false;\n        if (!linkJump) {\n          return;\n        }\n\n        // 点击链接，打开相应页面\n        const templateLink = (columnDefine as LinkColumnDefine).templateLink;\n        const linkDetect = (columnDefine as LinkColumnDefine).linkDetect !== false;\n        let url;\n        if (templateLink) {\n          // 如果有模板链接，使用模板\n          const rowData = table.getCellOriginRecord(col, row);\n          if (rowData.vtableMerge) {\n            // group title\n            return;\n          }\n          const data = Object.assign(\n            {\n              __value: cellValue,\n              __dataValue: cellOriginValue\n            },\n            rowData\n          );\n          if (isFunction(templateLink)) {\n            url = templateLink(data, col, row, table);\n          } else {\n            const re = /\\{\\s*(\\S+?)\\s*\\}/g;\n            url = templateLink.replace(re, (matchs: string, key: string) => {\n              matchs;\n              return (data as any)[key];\n            });\n          }\n        } else if (!linkDetect) {\n          url = cellValue;\n        } else if (regUrl.test(cellValue)) {\n          // 没有模板链接，使用单元格内的字符串\n          url = cellValue;\n        } else {\n          return;\n        }\n\n        if (!url) {\n          return;\n        }\n\n        const linkTarget = (columnDefine as LinkColumnDefine).linkTarget;\n        const linkWindowFeatures = (columnDefine as LinkColumnDefine).linkWindowFeatures;\n        window.open(url, linkTarget, linkWindowFeatures);\n      } else if (cellType === 'image') {\n        // 点击图片，打开放大图片\n        const { clickToPreview } = columnDefine as IImageColumnBodyDefine;\n        if (clickToPreview === false) {\n          return;\n        }\n\n        // 开启蒙版\n        const overlay = document.createElement('div');\n        overlay.style.width = '100%';\n        overlay.style.height = '100%';\n        overlay.style.position = 'absolute';\n        overlay.style.top = '0';\n        overlay.style.left = '0';\n        overlay.style.backgroundColor = 'rgba(30, 30, 30, 0.4)';\n        overlay.style.display = 'flex';\n        overlay.style.justifyContent = 'center';\n        overlay.style.alignItems = 'center';\n        overlay.style.overflow = 'hidden';\n        overlay.style.zIndex = '9999';\n\n        overlay.addEventListener('click', e => {\n          if (e.target === overlay) {\n            document.body.removeChild(overlay);\n          }\n        });\n        // overlay.addEventListener('pointermove', (e) => {\n        //   e.stopPropagation();\n        //   e.preventDefault();\n        // });\n        // overlay.addEventListener('mousemove', (e) => {\n        //   e.stopPropagation();\n        //   e.preventDefault();\n        // });\n        // 创建图片\n        const image = new Image();\n        image.src = cellValue;\n        image.style.maxWidth = '80%';\n        image.style.maxHeight = '80%';\n        overlay.appendChild(image);\n\n        document.body.appendChild(overlay);\n      } else if (cellType === 'video') {\n        // 点击视频，弹出播放窗口\n        const { clickToPreview } = columnDefine as IImageColumnBodyDefine;\n        if (clickToPreview === false) {\n          return;\n        }\n\n        // 开启蒙版\n        const overlay = document.createElement('div');\n        overlay.style.width = '100%';\n        overlay.style.height = '100%';\n        overlay.style.position = 'absolute';\n        overlay.style.top = '0';\n        overlay.style.left = '0';\n        overlay.style.backgroundColor = 'rgba(30, 30, 30, 0.4)';\n        overlay.style.display = 'flex';\n        overlay.style.justifyContent = 'center';\n        overlay.style.alignItems = 'center';\n        overlay.style.overflow = 'hidden';\n        overlay.style.zIndex = '9999';\n\n        overlay.addEventListener('click', e => {\n          if (e.target === overlay) {\n            document.body.removeChild(overlay);\n          }\n        });\n\n        // 创建视频\n        const video = document.createElement('video');\n        video.src = cellValue;\n        video.style.maxWidth = '80%';\n        video.style.maxHeight = '80%';\n        video.setAttribute('preload', 'auto');\n        video.setAttribute('controls', 'true');\n        overlay.appendChild(video);\n\n        document.body.appendChild(overlay);\n      }\n    });\n  }\n}\n"]}
+{"version":3,"sources":["../src/event/media-click.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAIzC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAE7C,MAAM,UAAU,cAAc,CAAC,KAAmB;IAChD,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE;QAG1B,KAAK,CAAC,EAAE,CAAC,gBAAgB,CAAC,UAAU,EAAE,CAAC,CAAwB,EAAE,EAAE;YAEjE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;YAEvB,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,OAAO,IAAK,CAAC,CAAC,MAAc,CAAC,IAAI,IAAK,CAAC,CAAC,MAAc,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBAEpG,OAAO;aACR;YACD,IAAI,QAAQ,CAAC;YACb,IAAI,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE;gBACpD,QAAQ,GAAG,KAAK,CAAC,YAAY,EAAE;oBAC7B,CAAC,CAAE,KAAK,CAAC,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAgB,CAAC,UAAU;oBAChE,CAAC,CAAE,KAAK,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,CAAgB,CAAC,UAAU,CAAC;aAChE;iBAAM;gBACL,QAAQ,GAAG,KAAK,CAAC,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;aAC9C;YACD,MAAM,YAAY,GAAG,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;gBAC3C,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC;gBACjC,CAAC,CAAC,KAAK,CAAC,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YACxC,MAAM,SAAS,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YAC/C,MAAM,eAAe,GAAG,KAAK,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YAC3D,IAAI,QAAQ,KAAK,MAAM,EAAE;gBACvB,IAAI,QAAQ,GAAwB,UAAU,CAAE,YAAiC,CAAC,QAAQ,EAAE;oBAC1F,GAAG;oBACH,GAAG;oBACH,KAAK;oBACL,KAAK,EAAE,SAAS;oBAChB,SAAS,EAAE,eAAe;oBAC1B,eAAe,EAAE,SAAS;iBAC3B,CAAC,CAAC;gBACH,QAAQ,GAAG,QAAQ,KAAK,KAAK,CAAC;gBAC9B,IAAI,CAAC,QAAQ,EAAE;oBACb,OAAO;iBACR;gBAGD,MAAM,YAAY,GAAI,YAAiC,CAAC,YAAY,CAAC;gBACrE,IAAI,UAAU,GAAG,UAAU,CAAE,YAAiC,CAAC,UAAU,EAAE;oBACzE,GAAG;oBACH,GAAG;oBACH,KAAK;oBACL,KAAK,EAAE,SAAS;oBAChB,SAAS,EAAE,eAAe;oBAC1B,eAAe,EAAE,SAAS;iBAC3B,CAAC,CAAC;gBACH,UAAU,GAAG,UAAU,KAAK,KAAK,CAAC;gBAClC,IAAI,GAAG,CAAC;gBACR,IAAI,YAAY,EAAE;oBAEhB,MAAM,OAAO,GAAG,KAAK,CAAC,mBAAmB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;oBACpD,IAAI,OAAO,IAAI,OAAO,CAAC,WAAW,EAAE;wBAElC,OAAO;qBACR;oBACD,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CACxB;wBACE,OAAO,EAAE,SAAS;wBAClB,WAAW,EAAE,eAAe;qBAC7B,EACD,OAAO,CACR,CAAC;oBACF,IAAI,UAAU,CAAC,YAAY,CAAC,EAAE;wBAC5B,GAAG,GAAG,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;qBAC3C;yBAAM;wBACL,MAAM,EAAE,GAAG,mBAAmB,CAAC;wBAC/B,GAAG,GAAG,YAAY,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,MAAc,EAAE,GAAW,EAAE,EAAE;4BAC7D,MAAM,CAAC;4BACP,OAAQ,IAAY,CAAC,GAAG,CAAC,CAAC;wBAC5B,CAAC,CAAC,CAAC;qBACJ;iBACF;qBAAM,IAAI,CAAC,UAAU,EAAE;oBACtB,GAAG,GAAG,SAAS,CAAC;iBACjB;qBAAM,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;oBAEjC,GAAG,GAAG,SAAS,CAAC;iBACjB;qBAAM;oBACL,OAAO;iBACR;gBAED,IAAI,CAAC,GAAG,EAAE;oBACR,OAAO;iBACR;gBAED,MAAM,UAAU,GAAI,YAAiC,CAAC,UAAU,CAAC;gBACjE,MAAM,kBAAkB,GAAI,YAAiC,CAAC,kBAAkB,CAAC;gBACjF,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,EAAE,kBAAkB,CAAC,CAAC;aAClD;iBAAM,IAAI,QAAQ,KAAK,OAAO,EAAE;gBAE/B,MAAM,EAAE,cAAc,EAAE,GAAG,YAAsC,CAAC;gBAClE,IAAI,cAAc,KAAK,KAAK,EAAE;oBAC5B,OAAO;iBACR;gBAGD,MAAM,OAAO,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;gBAC9C,OAAO,CAAC,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC;gBAC7B,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;gBAC9B,OAAO,CAAC,KAAK,CAAC,QAAQ,GAAG,UAAU,CAAC;gBACpC,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;gBACxB,OAAO,CAAC,KAAK,CAAC,IAAI,GAAG,GAAG,CAAC;gBACzB,OAAO,CAAC,KAAK,CAAC,eAAe,GAAG,uBAAuB,CAAC;gBACxD,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC;gBAC/B,OAAO,CAAC,KAAK,CAAC,cAAc,GAAG,QAAQ,CAAC;gBACxC,OAAO,CAAC,KAAK,CAAC,UAAU,GAAG,QAAQ,CAAC;gBACpC,OAAO,CAAC,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;gBAClC,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;gBAE9B,OAAO,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE;oBACpC,IAAI,CAAC,CAAC,MAAM,KAAK,OAAO,EAAE;wBACxB,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;qBACpC;gBACH,CAAC,CAAC,CAAC;gBAUH,MAAM,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;gBAC1B,KAAK,CAAC,GAAG,GAAG,SAAS,CAAC;gBACtB,KAAK,CAAC,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC;gBAC7B,KAAK,CAAC,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;gBAC9B,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;gBAE3B,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;aACpC;iBAAM,IAAI,QAAQ,KAAK,OAAO,EAAE;gBAE/B,MAAM,EAAE,cAAc,EAAE,GAAG,YAAsC,CAAC;gBAClE,IAAI,cAAc,KAAK,KAAK,EAAE;oBAC5B,OAAO;iBACR;gBAGD,MAAM,OAAO,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;gBAC9C,OAAO,CAAC,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC;gBAC7B,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;gBAC9B,OAAO,CAAC,KAAK,CAAC,QAAQ,GAAG,UAAU,CAAC;gBACpC,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;gBACxB,OAAO,CAAC,KAAK,CAAC,IAAI,GAAG,GAAG,CAAC;gBACzB,OAAO,CAAC,KAAK,CAAC,eAAe,GAAG,uBAAuB,CAAC;gBACxD,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC;gBAC/B,OAAO,CAAC,KAAK,CAAC,cAAc,GAAG,QAAQ,CAAC;gBACxC,OAAO,CAAC,KAAK,CAAC,UAAU,GAAG,QAAQ,CAAC;gBACpC,OAAO,CAAC,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;gBAClC,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;gBAE9B,OAAO,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE;oBACpC,IAAI,CAAC,CAAC,MAAM,KAAK,OAAO,EAAE;wBACxB,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;qBACpC;gBACH,CAAC,CAAC,CAAC;gBAGH,MAAM,KAAK,GAAG,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;gBAC9C,KAAK,CAAC,GAAG,GAAG,SAAS,CAAC;gBACtB,KAAK,CAAC,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC;gBAC7B,KAAK,CAAC,KAAK,CAAC,SAAS,GAAG,KAAK,CAAC;gBAC9B,KAAK,CAAC,YAAY,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;gBACtC,KAAK,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;gBACvC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;gBAE3B,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;aACpC;QACH,CAAC,CAAC,CAAC;KACJ;AACH,CAAC","file":"media-click.js","sourcesContent":["import { isFunction } from '@visactor/vutils';\nimport { TABLE_EVENT_TYPE } from '../core/TABLE_EVENT_TYPE';\nimport { Env } from '../tools/env';\nimport { regUrl } from '../tools/global';\nimport type { LinkColumnDefine, MousePointerCellEvent } from '../ts-types';\nimport type { BaseTableAPI, HeaderData } from '../ts-types/base-table';\nimport type { IImageColumnBodyDefine } from '../ts-types/list-table/define/image-define';\nimport { getOrApply } from '../tools/helper';\n\nexport function bindMediaClick(table: BaseTableAPI): void {\n  if (Env.mode === 'browser') {\n    // table.hasMedia = false;\n\n    table.on(TABLE_EVENT_TYPE.CLICK_CELL, (e: MousePointerCellEvent) => {\n      //如果目前是在某个icon上，如收起展开按钮 则不进行其他点击逻辑\n      const { col, row } = e;\n\n      if (e.target.type === 'image' && (e.target as any).role && (e.target as any).role.startsWith('icon')) {\n        // click icon\n        return;\n      }\n      let cellType;\n      if (table.internalProps.layoutMap.isHeader(col, row)) {\n        cellType = table.isPivotTable()\n          ? (table._getHeaderLayoutMap(col, row) as HeaderData).headerType\n          : (table.getHeaderDefine(col, row) as HeaderData).headerType;\n      } else {\n        cellType = table.getBodyColumnType(col, row);\n      }\n      const columnDefine = table.isHeader(col, row)\n        ? table.getHeaderDefine(col, row)\n        : table.getBodyColumnDefine(col, row);\n      const cellValue = table.getCellValue(col, row);\n      const cellOriginValue = table.getCellOriginValue(col, row);\n      if (cellType === 'link') {\n        let linkJump: boolean | undefined = getOrApply((columnDefine as LinkColumnDefine).linkJump, {\n          col,\n          row,\n          table,\n          value: cellValue,\n          dataValue: cellOriginValue,\n          cellHeaderPaths: undefined\n        });\n        linkJump = linkJump !== false;\n        if (!linkJump) {\n          return;\n        }\n\n        // 点击链接，打开相应页面\n        const templateLink = (columnDefine as LinkColumnDefine).templateLink;\n        let linkDetect = getOrApply((columnDefine as LinkColumnDefine).linkDetect, {\n          col,\n          row,\n          table,\n          value: cellValue,\n          dataValue: cellOriginValue,\n          cellHeaderPaths: undefined\n        });\n        linkDetect = linkDetect !== false;\n        let url;\n        if (templateLink) {\n          // 如果有模板链接，使用模板\n          const rowData = table.getCellOriginRecord(col, row);\n          if (rowData && rowData.vtableMerge) {\n            // group title\n            return;\n          }\n          const data = Object.assign(\n            {\n              __value: cellValue,\n              __dataValue: cellOriginValue\n            },\n            rowData\n          );\n          if (isFunction(templateLink)) {\n            url = templateLink(data, col, row, table);\n          } else {\n            const re = /\\{\\s*(\\S+?)\\s*\\}/g;\n            url = templateLink.replace(re, (matchs: string, key: string) => {\n              matchs;\n              return (data as any)[key];\n            });\n          }\n        } else if (!linkDetect) {\n          url = cellValue;\n        } else if (regUrl.test(cellValue)) {\n          // 没有模板链接，使用单元格内的字符串\n          url = cellValue;\n        } else {\n          return;\n        }\n\n        if (!url) {\n          return;\n        }\n\n        const linkTarget = (columnDefine as LinkColumnDefine).linkTarget;\n        const linkWindowFeatures = (columnDefine as LinkColumnDefine).linkWindowFeatures;\n        window.open(url, linkTarget, linkWindowFeatures);\n      } else if (cellType === 'image') {\n        // 点击图片，打开放大图片\n        const { clickToPreview } = columnDefine as IImageColumnBodyDefine;\n        if (clickToPreview === false) {\n          return;\n        }\n\n        // 开启蒙版\n        const overlay = document.createElement('div');\n        overlay.style.width = '100%';\n        overlay.style.height = '100%';\n        overlay.style.position = 'absolute';\n        overlay.style.top = '0';\n        overlay.style.left = '0';\n        overlay.style.backgroundColor = 'rgba(30, 30, 30, 0.4)';\n        overlay.style.display = 'flex';\n        overlay.style.justifyContent = 'center';\n        overlay.style.alignItems = 'center';\n        overlay.style.overflow = 'hidden';\n        overlay.style.zIndex = '9999';\n\n        overlay.addEventListener('click', e => {\n          if (e.target === overlay) {\n            document.body.removeChild(overlay);\n          }\n        });\n        // overlay.addEventListener('pointermove', (e) => {\n        //   e.stopPropagation();\n        //   e.preventDefault();\n        // });\n        // overlay.addEventListener('mousemove', (e) => {\n        //   e.stopPropagation();\n        //   e.preventDefault();\n        // });\n        // 创建图片\n        const image = new Image();\n        image.src = cellValue;\n        image.style.maxWidth = '80%';\n        image.style.maxHeight = '80%';\n        overlay.appendChild(image);\n\n        document.body.appendChild(overlay);\n      } else if (cellType === 'video') {\n        // 点击视频，弹出播放窗口\n        const { clickToPreview } = columnDefine as IImageColumnBodyDefine;\n        if (clickToPreview === false) {\n          return;\n        }\n\n        // 开启蒙版\n        const overlay = document.createElement('div');\n        overlay.style.width = '100%';\n        overlay.style.height = '100%';\n        overlay.style.position = 'absolute';\n        overlay.style.top = '0';\n        overlay.style.left = '0';\n        overlay.style.backgroundColor = 'rgba(30, 30, 30, 0.4)';\n        overlay.style.display = 'flex';\n        overlay.style.justifyContent = 'center';\n        overlay.style.alignItems = 'center';\n        overlay.style.overflow = 'hidden';\n        overlay.style.zIndex = '9999';\n\n        overlay.addEventListener('click', e => {\n          if (e.target === overlay) {\n            document.body.removeChild(overlay);\n          }\n        });\n\n        // 创建视频\n        const video = document.createElement('video');\n        video.src = cellValue;\n        video.style.maxWidth = '80%';\n        video.style.maxHeight = '80%';\n        video.setAttribute('preload', 'auto');\n        video.setAttribute('controls', 'true');\n        overlay.appendChild(video);\n\n        document.body.appendChild(overlay);\n      }\n    });\n  }\n}\n"]}

package/es/index.d.ts

@@ -20,7 +20,7 @@ export { getDataCellPath } from './tools/get-data-path';
 export * from './render/jsx';
 export { getTargetCell } from './event/util';
 export { Icon } from './scenegraph/graphic/icon';
-export declare const version = "1.16.0-alpha.1";
+export declare const version = "1.16.0";
 export { TYPES, core, ListTable, ListTableSimple, ListTableConstructorOptions, PivotTable, PivotTableSimple, PivotTableConstructorOptions, PivotChartConstructorOptions, PivotChart, IHeaderTreeDefine, IDimension, IIndicator, ITitleDefine, ICornerDefine, ColumnsDefine, ColumnDefine, LinkColumnDefine, ChartColumnDefine, ImageColumnDefine, SparklineColumnDefine, ProgressbarColumnDefine, TextColumnDefine, GroupColumnDefine, TextAlignType, TextBaselineType, themes, data, MousePointerCellEvent, getIcons, clearGlobal, register, DataStatistics, CustomLayout, updateCell, renderChart, graphicUtil, setCustomAlphabetCharSet, restoreMeasureText };
 declare function getIcons(): {
     [key: string]: TYPES.ColumnIconOption;

package/es/index.js

@@ -42,7 +42,7 @@ export { getTargetCell } from "./event/util";
 
 export { Icon } from "./scenegraph/graphic/icon";
 
-export const version = "1.16.0-alpha.1";
+export const version = "1.16.0";
 
 export { TYPES, core, ListTable, ListTableSimple, PivotTable, PivotTableSimple, PivotChart, themes, data, getIcons, clearGlobal, register, DataStatistics, CustomLayout, updateCell, renderChart, graphicUtil, setCustomAlphabetCharSet, restoreMeasureText };
 

package/es/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC5D,kBAAkB,EAAE,CAAC;AAErB,OAAO,KAAK,KAAK,MAAM,YAAY,CAAC;AACpC,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAC/B,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAC/B,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAC;AACvC,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,OAAO,KAAK,cAAc,MAAM,0BAA0B,CAAC;AAsB3D,OAAO,EAAE,YAAY,IAAI,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EAAE,aAAa,IAAI,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,KAAK,YAAY,MAAM,iBAAiB,CAAC;AAEhD,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,wDAAwD,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAK/F,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AAKjD,MAAM,CAAC,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAIxC,OAAO,EAKL,KAAK,EACL,IAAI,EACJ,SAAS,EACT,eAAe,EAEf,UAAU,EACV,gBAAgB,EAGhB,UAAU,EAiBV,MAAM,EACN,IAAI,EAEJ,QAAQ,EACR,WAAW,EAEX,QAAQ,EAIR,cAAc,EACd,YAAY,EACZ,UAAU,EACV,WAAW,EACX,WAAW,EACX,wBAAwB,EACxB,kBAAkB,EAGnB,CAAC;AAGF,SAAS,QAAQ;IAGf,OAAO,KAAK,CAAC,GAAG,EAAE,CAAC;AACrB,CAAC;AAED,SAAS,WAAW;IAClB,QAAQ,CAAC,QAAQ,EAAE,CAAC;AAGtB,CAAC;AACD,KAAK,CAAC,eAAe,CAAC;AAEtB,cAAc,cAAc,CAAC;AAC7B,cAAc,sCAAsC,CAAC;AAErD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,MAAM,+CAA+C,CAAC;AAE/G,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC","file":"index.js","sourcesContent":["/* eslint-disable sort-imports */\nimport { graphicUtil, registerForVrender } from './vrender';\nregisterForVrender();\n\nimport * as TYPES from './ts-types';\nimport * as core from './core';\nimport * as data from './data';\nimport * as icons from './icons';\nimport * as register from './register';\nimport * as themes from './themes';\nimport * as DataStatistics from './dataset/DataStatistics';\nimport type {\n  ColumnDefine,\n  ColumnsDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  ListTableConstructorOptions,\n  PivotTableConstructorOptions,\n  PivotChartConstructorOptions,\n  IHeaderTreeDefine,\n  IDimension,\n  IIndicator,\n  ITitleDefine,\n  ICornerDefine,\n  TextAlignType,\n  TextBaselineType\n} from './ts-types';\nimport { ListTableAll as ListTable } from './ListTable-all';\nimport { ListTableSimple } from './ListTable-simple';\n// import { PivotTable } from './PivotTable';\nimport { PivotTableAll as PivotTable } from './PivotTable-all';\nimport { PivotTableSimple } from './PivotTable-simple';\nimport { PivotChart } from './PivotChart';\nimport type { MousePointerCellEvent } from './ts-types/events';\nimport * as CustomLayout from './render/layout';\n\nimport { updateCell } from './scenegraph/group-creater/cell-helper';\nimport { renderChart } from './scenegraph/graphic/contributions/chart-render-helper';\nimport { restoreMeasureText, setCustomAlphabetCharSet } from './scenegraph/utils/text-measure';\n\n// import { container, loadCanvasPicker } from '@src/vrender';\n// loadCanvasPicker(container);\n\nexport { getDataCellPath } from './tools/get-data-path';\nexport * from './render/jsx';\nexport { getTargetCell } from './event/util';\n\nexport { Icon } from './scenegraph/graphic/icon';\n\n// export * as VRender from './vrender';\n// import * as VRender from './vrender';\n\nexport const version = \"1.16.0-alpha.1\";\n/**\n * @namespace VTable\n */\nexport {\n  /**\n   * Types\n   * @namespace VTable.TYPES\n   */\n  TYPES,\n  core,\n  ListTable,\n  ListTableSimple,\n  ListTableConstructorOptions,\n  PivotTable,\n  PivotTableSimple,\n  PivotTableConstructorOptions,\n  PivotChartConstructorOptions,\n  PivotChart,\n  IHeaderTreeDefine,\n  IDimension,\n  IIndicator,\n  ITitleDefine,\n  ICornerDefine,\n  ColumnsDefine,\n  ColumnDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  TextAlignType,\n  TextBaselineType,\n  themes,\n  data,\n  MousePointerCellEvent,\n  getIcons,\n  clearGlobal,\n  //plugin registers\n  register,\n  /**\n   * 暂不推荐使用\n   */\n  DataStatistics,\n  CustomLayout,\n  updateCell,\n  renderChart,\n  graphicUtil,\n  setCustomAlphabetCharSet,\n  restoreMeasureText\n\n  // VRender // should use import {xxx} from '@visactor/vtable/es/vrender'\n};\n\n/** @private */\nfunction getIcons(): {\n  [key: string]: TYPES.ColumnIconOption;\n} {\n  return icons.get();\n}\n/** 清理内部的全局变量 如注册的icon theme等 以及共享的header column类实例 */\nfunction clearGlobal() {\n  register.clearAll();\n  // headers.type.clearGlobal();\n  // columns.type.clearGlobal();\n}\nTYPES.AggregationType;\n\nexport * from './components';\nexport * from './scenegraph/group-creater/cell-type';\n\nexport { TABLE_EVENT_TYPE } from './core/TABLE_EVENT_TYPE';\nexport { PIVOT_CHART_EVENT_TYPE, PIVOT_TABLE_EVENT_TYPE } from './ts-types/pivot-table/PIVOT_TABLE_EVENT_TYPE';\n\nexport { EventTarget } from './event/EventTarget';\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC5D,kBAAkB,EAAE,CAAC;AAErB,OAAO,KAAK,KAAK,MAAM,YAAY,CAAC;AACpC,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAC/B,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAC;AAC/B,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,OAAO,KAAK,QAAQ,MAAM,YAAY,CAAC;AACvC,OAAO,KAAK,MAAM,MAAM,UAAU,CAAC;AACnC,OAAO,KAAK,cAAc,MAAM,0BAA0B,CAAC;AAsB3D,OAAO,EAAE,YAAY,IAAI,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EAAE,aAAa,IAAI,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,KAAK,YAAY,MAAM,iBAAiB,CAAC;AAEhD,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,wDAAwD,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,MAAM,iCAAiC,CAAC;AAK/F,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AAKjD,MAAM,CAAC,MAAM,OAAO,GAAG,QAAQ,CAAC;AAIhC,OAAO,EAKL,KAAK,EACL,IAAI,EACJ,SAAS,EACT,eAAe,EAEf,UAAU,EACV,gBAAgB,EAGhB,UAAU,EAiBV,MAAM,EACN,IAAI,EAEJ,QAAQ,EACR,WAAW,EAEX,QAAQ,EAIR,cAAc,EACd,YAAY,EACZ,UAAU,EACV,WAAW,EACX,WAAW,EACX,wBAAwB,EACxB,kBAAkB,EAGnB,CAAC;AAGF,SAAS,QAAQ;IAGf,OAAO,KAAK,CAAC,GAAG,EAAE,CAAC;AACrB,CAAC;AAED,SAAS,WAAW;IAClB,QAAQ,CAAC,QAAQ,EAAE,CAAC;AAGtB,CAAC;AACD,KAAK,CAAC,eAAe,CAAC;AAEtB,cAAc,cAAc,CAAC;AAC7B,cAAc,sCAAsC,CAAC;AAErD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,MAAM,+CAA+C,CAAC;AAE/G,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC","file":"index.js","sourcesContent":["/* eslint-disable sort-imports */\nimport { graphicUtil, registerForVrender } from './vrender';\nregisterForVrender();\n\nimport * as TYPES from './ts-types';\nimport * as core from './core';\nimport * as data from './data';\nimport * as icons from './icons';\nimport * as register from './register';\nimport * as themes from './themes';\nimport * as DataStatistics from './dataset/DataStatistics';\nimport type {\n  ColumnDefine,\n  ColumnsDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  ListTableConstructorOptions,\n  PivotTableConstructorOptions,\n  PivotChartConstructorOptions,\n  IHeaderTreeDefine,\n  IDimension,\n  IIndicator,\n  ITitleDefine,\n  ICornerDefine,\n  TextAlignType,\n  TextBaselineType\n} from './ts-types';\nimport { ListTableAll as ListTable } from './ListTable-all';\nimport { ListTableSimple } from './ListTable-simple';\n// import { PivotTable } from './PivotTable';\nimport { PivotTableAll as PivotTable } from './PivotTable-all';\nimport { PivotTableSimple } from './PivotTable-simple';\nimport { PivotChart } from './PivotChart';\nimport type { MousePointerCellEvent } from './ts-types/events';\nimport * as CustomLayout from './render/layout';\n\nimport { updateCell } from './scenegraph/group-creater/cell-helper';\nimport { renderChart } from './scenegraph/graphic/contributions/chart-render-helper';\nimport { restoreMeasureText, setCustomAlphabetCharSet } from './scenegraph/utils/text-measure';\n\n// import { container, loadCanvasPicker } from '@src/vrender';\n// loadCanvasPicker(container);\n\nexport { getDataCellPath } from './tools/get-data-path';\nexport * from './render/jsx';\nexport { getTargetCell } from './event/util';\n\nexport { Icon } from './scenegraph/graphic/icon';\n\n// export * as VRender from './vrender';\n// import * as VRender from './vrender';\n\nexport const version = \"1.16.0\";\n/**\n * @namespace VTable\n */\nexport {\n  /**\n   * Types\n   * @namespace VTable.TYPES\n   */\n  TYPES,\n  core,\n  ListTable,\n  ListTableSimple,\n  ListTableConstructorOptions,\n  PivotTable,\n  PivotTableSimple,\n  PivotTableConstructorOptions,\n  PivotChartConstructorOptions,\n  PivotChart,\n  IHeaderTreeDefine,\n  IDimension,\n  IIndicator,\n  ITitleDefine,\n  ICornerDefine,\n  ColumnsDefine,\n  ColumnDefine,\n  LinkColumnDefine,\n  ChartColumnDefine,\n  ImageColumnDefine,\n  SparklineColumnDefine,\n  ProgressbarColumnDefine,\n  TextColumnDefine,\n  GroupColumnDefine,\n  TextAlignType,\n  TextBaselineType,\n  themes,\n  data,\n  MousePointerCellEvent,\n  getIcons,\n  clearGlobal,\n  //plugin registers\n  register,\n  /**\n   * 暂不推荐使用\n   */\n  DataStatistics,\n  CustomLayout,\n  updateCell,\n  renderChart,\n  graphicUtil,\n  setCustomAlphabetCharSet,\n  restoreMeasureText\n\n  // VRender // should use import {xxx} from '@visactor/vtable/es/vrender'\n};\n\n/** @private */\nfunction getIcons(): {\n  [key: string]: TYPES.ColumnIconOption;\n} {\n  return icons.get();\n}\n/** 清理内部的全局变量 如注册的icon theme等 以及共享的header column类实例 */\nfunction clearGlobal() {\n  register.clearAll();\n  // headers.type.clearGlobal();\n  // columns.type.clearGlobal();\n}\nTYPES.AggregationType;\n\nexport * from './components';\nexport * from './scenegraph/group-creater/cell-type';\n\nexport { TABLE_EVENT_TYPE } from './core/TABLE_EVENT_TYPE';\nexport { PIVOT_CHART_EVENT_TYPE, PIVOT_TABLE_EVENT_TYPE } from './ts-types/pivot-table/PIVOT_TABLE_EVENT_TYPE';\n\nexport { EventTarget } from './event/EventTarget';\n"]}

package/es/layout/index.js

@@ -1,2 +1 @@
-export { SimpleHeaderLayoutMap } from "./simple-header-layout";
-//# sourceMappingURL=index.js.map
+export { SimpleHeaderLayoutMap } from "./simple-header-layout";

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

@@ -251,14 +251,12 @@ export class PivotHeaderLayoutMap {
         }
     }
     _addCornerHeaders(colDimensionKeys, rowDimensionKeys, dimensions) {
-        var _a, _b;
-        const results = [];
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        this._cornerHeaderCellFullPathIds = [];
+        const results = [], colLevelCount = "grid-tree" === this.columnHierarchyType && this._getColumnHeaderTreeExpandedMaxLevelCount() || this.columnHeaderLevelCount, rowLevelCount = "grid-tree" === this.rowHierarchyType && this._getRowHeaderTreeExpandedMaxLevelCount() || this.rowHeaderLevelCount;
         if ("all" === this.cornerSetting.titleOnDimension) if (this.indicatorsAsCol) {
-            let indicatorAtIndex = -1;
-            colDimensionKeys && colDimensionKeys.forEach(((dimensionKey, key) => {
-                var _a, _b;
-                dimensionKey === this.indicatorDimensionKey && (indicatorAtIndex = key);
-                const id = ++this.sharedVar.seqId, dimensionInfo = dimensions.find((dimension => "string" != typeof dimension && dimension.dimensionKey === dimensionKey)), cell = {
+            if (colDimensionKeys) for (let i = 0; i < colLevelCount; i++) {
+                const dimensionKey = colDimensionKeys[i], id = ++this.sharedVar.seqId, dimensionInfo = dimensions.find((dimension => "string" != typeof dimension && dimension.dimensionKey === dimensionKey)), cell = {
                     id: id,
                     title: dimensionKey === this.indicatorDimensionKey ? this.indicatorTitle : dimensionInfo ? dimensionInfo.title : "axis" === dimensionKey ? "" : dimensionKey,
                     field: dimensionKey,
@@ -285,16 +283,16 @@ export class PivotHeaderLayoutMap {
                     },
                     description: null == dimensionInfo ? void 0 : dimensionInfo.cornerDescription
                 };
-                results[id] = cell, this._headerObjects[id] = cell, this._cornerHeaderCellFullPathIds[key] || (this._cornerHeaderCellFullPathIds[key] = []);
-                for (let r = 0; r < this.rowHeaderLevelCount; r++) this._cornerHeaderCellFullPathIds[key][r] = id;
-            })), rowDimensionKeys && rowDimensionKeys.forEach(((dimensionKey, key) => {
-                var _a, _b;
-                const id = ++this.sharedVar.seqId, dimensionInfo = dimensions.find((dimension => "string" != typeof dimension && dimension.dimensionKey === dimensionKey)), cell = {
+                results[id] = cell, this._headerObjects[id] = cell, this._cornerHeaderCellFullPathIds[i] || (this._cornerHeaderCellFullPathIds[i] = []);
+                for (let r = 0; r < rowLevelCount; r++) this._cornerHeaderCellFullPathIds[i][r] = id;
+            }
+            if (rowDimensionKeys) for (let i = 0; i < rowLevelCount; i++) {
+                const dimensionKey = rowDimensionKeys[i], id = ++this.sharedVar.seqId, dimensionInfo = dimensions.find((dimension => "string" != typeof dimension && dimension.dimensionKey === dimensionKey)), cell = {
                     id: id,
                     title: dimensionKey === this.indicatorDimensionKey ? this.indicatorTitle : dimensionInfo ? dimensionInfo.title : "axis" === dimensionKey ? "" : dimensionKey,
                     field: dimensionKey,
                     style: this.cornerSetting.headerStyle,
-                    headerType: null !== (_a = this.cornerSetting.headerType) && void 0 !== _a ? _a : "text",
+                    headerType: null !== (_c = this.cornerSetting.headerType) && void 0 !== _c ? _c : "text",
                     showSort: null == dimensionInfo ? void 0 : dimensionInfo.showSortInCorner,
                     sort: null == dimensionInfo ? void 0 : dimensionInfo.sort,
                     define: {
@@ -310,26 +308,23 @@ export class PivotHeaderLayoutMap {
                     dropDownMenu: null == dimensionInfo ? void 0 : dimensionInfo.cornerDropDownMenu,
                     headerIcon: null == dimensionInfo ? void 0 : dimensionInfo.cornerHeaderIcon,
                     pivotInfo: {
-                        value: null !== (_b = null == dimensionInfo ? void 0 : dimensionInfo.title) && void 0 !== _b ? _b : "",
+                        value: null !== (_d = null == dimensionInfo ? void 0 : dimensionInfo.title) && void 0 !== _d ? _d : "",
                         dimensionKey: dimensionKey,
                         isPivotCorner: !0
                     },
                     description: null == dimensionInfo ? void 0 : dimensionInfo.cornerDescription
                 };
-                results[id] = cell, this._headerObjects[id] = cell, this._cornerHeaderCellFullPathIds[indicatorAtIndex] || (this._cornerHeaderCellFullPathIds[indicatorAtIndex] = []), 
-                this._cornerHeaderCellFullPathIds[indicatorAtIndex][key] = id;
-            }));
+                results[id] = cell, this._headerObjects[id] = cell, this._cornerHeaderCellFullPathIds[this._cornerHeaderCellFullPathIds.length - 1] || (this._cornerHeaderCellFullPathIds[this._cornerHeaderCellFullPathIds.length - 1] = []), 
+                this._cornerHeaderCellFullPathIds[this._cornerHeaderCellFullPathIds.length - 1][i] = id;
+            }
         } else {
-            let indicatorAtIndex = -1;
-            rowDimensionKeys && rowDimensionKeys.forEach(((dimensionKey, key) => {
-                var _a, _b;
-                dimensionKey === this.indicatorDimensionKey && (indicatorAtIndex = key);
-                const id = ++this.sharedVar.seqId, dimensionInfo = dimensions.find((dimension => "string" != typeof dimension && dimension.dimensionKey === dimensionKey)), cell = {
+            if (rowDimensionKeys) for (let i = 0; i < rowLevelCount; i++) {
+                const dimensionKey = rowDimensionKeys[i], id = ++this.sharedVar.seqId, dimensionInfo = dimensions.find((dimension => "string" != typeof dimension && dimension.dimensionKey === dimensionKey)), cell = {
                     id: id,
                     title: dimensionKey === this.indicatorDimensionKey ? this.indicatorTitle : dimensionInfo ? dimensionInfo.title : "axis" === dimensionKey ? "" : dimensionKey,
                     field: dimensionKey,
                     style: this.cornerSetting.headerStyle,
-                    headerType: null !== (_a = this.cornerSetting.headerType) && void 0 !== _a ? _a : "text",
+                    headerType: null !== (_e = this.cornerSetting.headerType) && void 0 !== _e ? _e : "text",
                     showSort: null == dimensionInfo ? void 0 : dimensionInfo.showSortInCorner,
                     sort: null == dimensionInfo ? void 0 : dimensionInfo.sort,
                     define: {
@@ -345,23 +340,23 @@ export class PivotHeaderLayoutMap {
                     dropDownMenu: null == dimensionInfo ? void 0 : dimensionInfo.cornerDropDownMenu,
                     headerIcon: null == dimensionInfo ? void 0 : dimensionInfo.cornerHeaderIcon,
                     pivotInfo: {
-                        value: null !== (_b = null == dimensionInfo ? void 0 : dimensionInfo.title) && void 0 !== _b ? _b : "",
+                        value: null !== (_f = null == dimensionInfo ? void 0 : dimensionInfo.title) && void 0 !== _f ? _f : "",
                         dimensionKey: dimensionKey,
                         isPivotCorner: !0
                     },
                     description: null == dimensionInfo ? void 0 : dimensionInfo.cornerDescription
                 };
                 results[id] = cell, this._headerObjects[id] = cell;
-                for (let r = 0; r < this.columnHeaderLevelCount; r++) this._cornerHeaderCellFullPathIds[r] || (this._cornerHeaderCellFullPathIds[r] = []), 
-                this._cornerHeaderCellFullPathIds[r][key] = id;
-            })), colDimensionKeys && colDimensionKeys.forEach(((dimensionKey, key) => {
-                var _a, _b;
-                const id = ++this.sharedVar.seqId, dimensionInfo = dimensions.find((dimension => "string" != typeof dimension && dimension.dimensionKey === dimensionKey)), cell = {
+                for (let r = 0; r < colLevelCount; r++) this._cornerHeaderCellFullPathIds[r] || (this._cornerHeaderCellFullPathIds[r] = []), 
+                this._cornerHeaderCellFullPathIds[r][i] = id;
+            }
+            if (colDimensionKeys) for (let c = 0; c < colLevelCount; c++) {
+                const dimensionKey = colDimensionKeys[c], id = ++this.sharedVar.seqId, dimensionInfo = dimensions.find((dimension => "string" != typeof dimension && dimension.dimensionKey === dimensionKey)), cell = {
                     id: id,
                     title: dimensionKey === this.indicatorDimensionKey ? this.indicatorTitle : dimensionInfo ? dimensionInfo.title : "axis" === dimensionKey ? "" : dimensionKey,
                     field: dimensionKey,
                     style: this.cornerSetting.headerStyle,
-                    headerType: null !== (_a = this.cornerSetting.headerType) && void 0 !== _a ? _a : "text",
+                    headerType: null !== (_g = this.cornerSetting.headerType) && void 0 !== _g ? _g : "text",
                     showSort: null == dimensionInfo ? void 0 : dimensionInfo.showSortInCorner,
                     sort: null == dimensionInfo ? void 0 : dimensionInfo.sort,
                     define: {
@@ -377,16 +372,16 @@ export class PivotHeaderLayoutMap {
                     dropDownMenu: null == dimensionInfo ? void 0 : dimensionInfo.cornerDropDownMenu,
                     headerIcon: null == dimensionInfo ? void 0 : dimensionInfo.cornerHeaderIcon,
                     pivotInfo: {
-                        value: null !== (_b = null == dimensionInfo ? void 0 : dimensionInfo.title) && void 0 !== _b ? _b : "",
+                        value: null !== (_h = null == dimensionInfo ? void 0 : dimensionInfo.title) && void 0 !== _h ? _h : "",
                         dimensionKey: dimensionKey,
                         isPivotCorner: !0
                     },
                     description: null == dimensionInfo ? void 0 : dimensionInfo.cornerDescription
                 };
-                results[id] = cell, this._headerObjects[id] = cell, this._cornerHeaderCellFullPathIds[key][indicatorAtIndex] = id;
-            }));
+                results[id] = cell, this._headerObjects[id] = cell, this._cornerHeaderCellFullPathIds[c][this._cornerHeaderCellFullPathIds[c].length - 1] = id;
+            }
         } else if ("row" === this.cornerSetting.titleOnDimension || "column" === this.cornerSetting.titleOnDimension) {
-            const dimensionKeys = "row" === (null === (_a = this.cornerSetting) || void 0 === _a ? void 0 : _a.titleOnDimension) ? rowDimensionKeys : colDimensionKeys;
+            const dimensionKeys = "row" === (null === (_j = this.cornerSetting) || void 0 === _j ? void 0 : _j.titleOnDimension) ? rowDimensionKeys : colDimensionKeys;
             dimensionKeys && dimensionKeys.forEach(((dimensionKey, key) => {
                 var _a, _b;
                 const id = ++this.sharedVar.seqId, dimensionInfo = dimensions.find((dimension => "string" != typeof dimension && dimension.dimensionKey === dimensionKey)), cell = {
@@ -430,7 +425,7 @@ export class PivotHeaderLayoutMap {
                 title: "",
                 field: "维度名称",
                 style: this.cornerSetting.headerStyle,
-                headerType: null !== (_b = this.cornerSetting.headerType) && void 0 !== _b ? _b : "text",
+                headerType: null !== (_k = this.cornerSetting.headerType) && void 0 !== _k ? _k : "text",
                 define: {
                     dimensionKey: "维度名称",
                     id: id,
@@ -1044,7 +1039,8 @@ export class PivotHeaderLayoutMap {
         this.fullRowDimensionKeys = [], this.fullRowDimensionKeys = this.fullRowDimensionKeys.concat(this.rowDimensionKeys), 
         "tree" === this.rowHierarchyType) this._addHeadersForTreeMode(this._rowHeaderCellFullPathIds_FULL, 0, this.rowDimensionTree.tree.children, [], this.rowDimensionTree.totalLevel, !0, this.rowsDefine, this.rowHeaderObjs); else if ("grid-tree" === this.rowHierarchyType) {
             const startRow = 0;
-            this._addHeadersForGridTreeMode(this._rowHeaderCellFullPathIds_FULL, startRow, this.rowDimensionTree.tree.children, [], this.rowDimensionTree.totalLevel, this._getRowHeaderTreeExpandedMaxLevelCount(), !0, this.rowsDefine, this.rowHeaderObjs, !0);
+            this._addHeadersForGridTreeMode(this._rowHeaderCellFullPathIds_FULL, startRow, this.rowDimensionTree.tree.children, [], this.rowDimensionTree.totalLevel, this._getRowHeaderTreeExpandedMaxLevelCount(), !0, this.rowsDefine, this.rowHeaderObjs, !0), 
+            this.cornerHeaderObjs = this._addCornerHeaders(this.colDimensionKeys, this.rowDimensionKeys, this.columnsDefine.concat(...this.rowsDefine));
         }
         if (this.rowHeaderTitle) {
             const id = ++this.sharedVar.seqId, firstColIds = Array(this.rowCount - this.columnHeaderLevelCount).fill(id);
@@ -1089,7 +1085,8 @@ export class PivotHeaderLayoutMap {
         this._columnHeaderCellFullPathIds = [], this.colDimensionKeys = this.columnDimensionTree.dimensionKeysIncludeVirtual.valueArr(), 
         "grid-tree" === this.columnHierarchyType) {
             const startRow = 0;
-            this._addHeadersForGridTreeMode(this._columnHeaderCellFullPathIds, startRow, this.columnDimensionTree.tree.children, [], this.columnDimensionTree.totalLevel, this._getColumnHeaderTreeExpandedMaxLevelCount(), !0, this.columnsDefine, this.columnHeaderObjs, !1);
+            this._addHeadersForGridTreeMode(this._columnHeaderCellFullPathIds, startRow, this.columnDimensionTree.tree.children, [], this.columnDimensionTree.totalLevel, this._getColumnHeaderTreeExpandedMaxLevelCount(), !0, this.columnsDefine, this.columnHeaderObjs, !1), 
+            this.cornerHeaderObjs = this._addCornerHeaders(this.colDimensionKeys, this.rowDimensionKeys, this.columnsDefine.concat(...this.rowsDefine));
         }
         if (this.columnHeaderTitle) {
             const id = ++this.sharedVar.seqId, firstRowIds = Array(this.colCount - this.rowHeaderLevelCount - this.rightFrozenColCount).fill(id);
@@ -1713,7 +1710,7 @@ export class PivotHeaderLayoutMap {
     }
     getSeriesNumberHeader(col, row) {
         return this.leftRowSeriesNumberColumnCount > 0 && col >= 0 && col < this.leftRowSeriesNumberColumnCount && row < this.headerLevelCount ? Object.assign({}, this.leftRowSeriesNumberColumn[col], {
-            style: this._table.internalProps.rowSeriesNumber.headerStyle
+            style: Object.assign({}, this._table.internalProps.theme.cornerHeaderStyle, this._table.internalProps.rowSeriesNumber.headerStyle)
         }) : this.rightRowSeriesNumberColumnCount > 0 && col >= this.colCount - this.rightRowSeriesNumberColumnCount && row < this.headerLevelCount && row < this.headerLevelCount ? this.rightRowSeriesNumberColumn[col - (this.colCount - this.rightRowSeriesNumberColumnCount)] : void 0;
     }
     getSeriesNumberBody(col, row) {