@visactor/vtable 1.13.3-alpha.6 → 1.13.3-alpha.7

package/es/layout/cell-range/simple-cell-range.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/layout/cell-range/simple-cell-range.ts"],"names":[],"mappings":"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","file":"simple-cell-range.js","sourcesContent":["import type { CellRange, TextColumnDefine } from '../../ts-types';\nimport type { SimpleHeaderLayoutMap } from '../simple-header-layout';\n\nexport function getCellRange(col: number, row: number, layout: SimpleHeaderLayoutMap): CellRange {\n  if (col === -1 || row === -1) {\n    return {\n      start: { col, row },\n      end: { col, row }\n    };\n  }\n  if (layout._cellRangeMap.has(`$${col}$${row}`)) {\n    return layout._cellRangeMap.get(`$${col}$${row}`);\n  }\n  let cellRange: CellRange = { start: { col, row }, end: { col, row } };\n  if (layout.transpose) {\n    cellRange = getCellRangeTranspose(col, row, layout);\n  } else {\n    // hover相关的单元格位置是-1,-1，getCellRange计算有误，先进行判断\n    if (layout.headerLevelCount <= row) {\n      //如果是body部分 设置了需要合并单元格 这里判断上下是否内容相同 相同的话 将cellRange范围扩大\n      if (\n        layout.headerLevelCount <= row &&\n        (layout.columnObjects[col - layout.leftRowSeriesNumberColumnCount]?.define as TextColumnDefine)?.mergeCell\n      ) {\n        const value = layout._table.getCellValue(col, row);\n        for (let r = row - 1; r >= layout.headerLevelCount; r--) {\n          const last_Value = layout._table.getCellValue(col, r);\n          if (typeof layout.columnObjects[col - layout.leftRowSeriesNumberColumnCount].define.mergeCell === 'boolean') {\n            if (value !== last_Value) {\n              break;\n            }\n          } else {\n            if (\n              !(layout.columnObjects[col - layout.leftRowSeriesNumberColumnCount].define.mergeCell as Function)(\n                value,\n                last_Value,\n                {\n                  source: {\n                    col,\n                    row\n                  },\n                  target: {\n                    col,\n                    row: r\n                  },\n                  table: layout._table\n                }\n              )\n            ) {\n              break;\n            }\n          }\n          cellRange.start.row = r;\n        }\n        for (let r = row + 1; r < layout.rowCount; r++) {\n          const next_Value = layout._table.getCellValue(col, r);\n          if (typeof layout.columnObjects[col - layout.leftRowSeriesNumberColumnCount].define.mergeCell === 'boolean') {\n            if (value !== next_Value) {\n              break;\n            }\n          } else {\n            if (\n              !(layout.columnObjects[col - layout.leftRowSeriesNumberColumnCount].define.mergeCell as Function)(\n                value,\n                next_Value,\n                {\n                  source: {\n                    col,\n                    row\n                  },\n                  target: {\n                    col,\n                    row: r\n                  },\n                  table: layout._table\n                }\n              )\n            ) {\n              break;\n            }\n          }\n          cellRange.end.row = r;\n        }\n      }\n      getTreeTitleMerge(col, row, cellRange, layout);\n      // return cellRange;\n    } else {\n      //in header\n      const id = layout.getCellId(col, row);\n      for (let c = col - 1; c >= 0; c--) {\n        if (id !== layout.getCellId(c, row)) {\n          break;\n        }\n        cellRange.start.col = c;\n      }\n      for (let c = col + 1; c < (layout.colCount ?? 0); c++) {\n        if (id !== layout.getCellId(c, row)) {\n          break;\n        }\n        cellRange.end.col = c;\n      }\n      for (let r = row - 1; r >= 0; r--) {\n        if (id !== layout.getCellId(col, r)) {\n          break;\n        }\n        cellRange.start.row = r;\n      }\n      for (let r = row + 1; r < layout.headerLevelCount; r++) {\n        if (id !== layout.getCellId(col, r)) {\n          break;\n        }\n        cellRange.end.row = r;\n      }\n      // return cellRange;\n    }\n  }\n  layout._cellRangeMap.set(`$${col}$${row}`, cellRange);\n  return cellRange;\n}\n\nfunction getTreeTitleMerge(col: number, row: number, cellRange: CellRange, layout: SimpleHeaderLayoutMap) {\n  if (layout.rowHierarchyType !== 'tree') {\n    return;\n  }\n\n  const cellRecord = layout._table.getCellRawRecord(col, row);\n  if (cellRecord?.vtableMerge) {\n    // const vtableMergeName = cellRecord.vtableMergeName;\n    cellRange.start.col = layout.rowHeaderLevelCount;\n    cellRange.end.col = layout.colCount - 1;\n    cellRange.start.row = cellRange.end.row = row;\n  }\n}\n\nexport function getCellRangeTranspose(col: number, row: number, layout: SimpleHeaderLayoutMap): CellRange {\n  const result: CellRange = { start: { col, row }, end: { col, row } };\n  // hover相关的单元格位置是-1,-1，getCellRange计算有误，先进行判断\n  if (layout.headerLevelCount + layout.leftRowSeriesNumberColumnCount <= col || (col === -1 && row === -1)) {\n    //如果是body部分 设置了需要合并单元格 这里判断左右是否内容相同 相同的话 将cellRange范围扩大\n    if (\n      layout.headerLevelCount + layout.leftRowSeriesNumberColumnCount <= col &&\n      layout.columnObjects[row]?.define?.mergeCell\n    ) {\n      const value = layout._table.getCellValue(col, row);\n      for (let c = col - 1; c >= layout.headerLevelCount + layout.leftRowSeriesNumberColumnCount; c--) {\n        const last_Value = layout._table.getCellValue(c, row);\n        if (typeof layout.columnObjects[row].define.mergeCell === 'boolean') {\n          if (value !== last_Value) {\n            break;\n          }\n        } else {\n          if (\n            !(layout.columnObjects[row].define.mergeCell as Function)(value, last_Value, {\n              source: {\n                col,\n                row\n              },\n              target: {\n                col: c,\n                row\n              },\n              table: layout._table\n            })\n          ) {\n            break;\n          }\n        }\n        result.start.col = c;\n      }\n      for (let c = col + 1; c < (layout.colCount ?? 0); c++) {\n        const next_Value = layout._table.getCellValue(c, row);\n        if (typeof layout.columnObjects[row].define.mergeCell === 'boolean') {\n          if (value !== next_Value) {\n            break;\n          }\n        } else {\n          if (\n            !(layout.columnObjects[row].define.mergeCell as Function)(value, next_Value, {\n              source: {\n                col,\n                row\n              },\n              target: {\n                col: c,\n                row\n              },\n              table: layout._table\n            })\n          ) {\n            break;\n          }\n        }\n        result.end.col = c;\n      }\n    }\n    return result;\n  }\n  //in header\n  const id = layout.getCellId(col, row);\n  for (let r = row - 1; r >= 0; r--) {\n    if (id !== layout.getCellId(col, r)) {\n      break;\n    }\n    result.start.row = r;\n  }\n  for (let r = row + 1; r < (layout.rowCount ?? 0); r++) {\n    if (id !== layout.getCellId(col, r)) {\n      break;\n    }\n    result.end.row = r;\n  }\n  for (let c = col - 1; c >= 0; c--) {\n    if (id !== layout.getCellId(c, row)) {\n      break;\n    }\n    result.start.col = c;\n  }\n  for (let c = col + 1; c < layout.headerLevelCount + layout.leftRowSeriesNumberColumnCount; c++) {\n    if (id !== layout.getCellId(c, row)) {\n      break;\n    }\n    result.end.col = c;\n  }\n  return result;\n}\n"]}
+{"version":3,"sources":["../src/layout/cell-range/simple-cell-range.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,YAAY,CAAC,GAAW,EAAE,GAAW,EAAE,MAA6B;;IAClF,IAAI,GAAG,KAAK,CAAC,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE;QAC5B,OAAO;YACL,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE;YACnB,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE;SAClB,CAAC;KACH;IACD,IAAI,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC,EAAE;QAC9C,OAAO,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC,CAAC;KACnD;IACD,IAAI,SAAS,GAAc,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC;IACtE,IAAI,MAAM,CAAC,SAAS,EAAE;QACpB,SAAS,GAAG,qBAAqB,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;KACrD;SAAM;QAEL,IAAI,MAAM,CAAC,gBAAgB,IAAI,GAAG,EAAE;YAElC,IACE,MAAM,CAAC,gBAAgB,IAAI,GAAG;iBAC9B,MAAC,MAAA,MAAM,CAAC,aAAa,CAAC,GAAG,GAAG,MAAM,CAAC,8BAA8B,CAAC,0CAAE,MAA2B,0CAAE,SAAS,CAAA,EAC1G;gBACA,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBACnD,KAAK,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,gBAAgB,EAAE,CAAC,EAAE,EAAE;oBACvD,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;oBACtD,IAAI,OAAO,MAAM,CAAC,aAAa,CAAC,GAAG,GAAG,MAAM,CAAC,8BAA8B,CAAC,CAAC,MAAM,CAAC,SAAS,KAAK,SAAS,EAAE;wBAC3G,IAAI,KAAK,KAAK,UAAU,EAAE;4BACxB,MAAM;yBACP;qBACF;yBAAM;wBACL,IACE,CAAE,MAAM,CAAC,aAAa,CAAC,GAAG,GAAG,MAAM,CAAC,8BAA8B,CAAC,CAAC,MAAM,CAAC,SAAsB,CAC/F,KAAK,EACL,UAAU,CACX,EACD;4BACA,MAAM;yBACP;qBACF;oBACD,SAAS,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC;iBACzB;gBACD,KAAK,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE;oBAC9C,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;oBACtD,IAAI,OAAO,MAAM,CAAC,aAAa,CAAC,GAAG,GAAG,MAAM,CAAC,8BAA8B,CAAC,CAAC,MAAM,CAAC,SAAS,KAAK,SAAS,EAAE;wBAC3G,IAAI,KAAK,KAAK,UAAU,EAAE;4BACxB,MAAM;yBACP;qBACF;yBAAM;wBACL,IACE,CAAE,MAAM,CAAC,aAAa,CAAC,GAAG,GAAG,MAAM,CAAC,8BAA8B,CAAC,CAAC,MAAM,CAAC,SAAsB,CAC/F,KAAK,EACL,UAAU,CACX,EACD;4BACA,MAAM;yBACP;qBACF;oBACD,SAAS,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC;iBACvB;aACF;YACD,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;SAEhD;aAAM;YAEL,MAAM,EAAE,GAAG,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YACtC,KAAK,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;gBACjC,IAAI,EAAE,KAAK,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE;oBACnC,MAAM;iBACP;gBACD,SAAS,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC;aACzB;YACD,KAAK,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,MAAA,MAAM,CAAC,QAAQ,mCAAI,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACrD,IAAI,EAAE,KAAK,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE;oBACnC,MAAM;iBACP;gBACD,SAAS,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC;aACvB;YACD,KAAK,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;gBACjC,IAAI,EAAE,KAAK,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE;oBACnC,MAAM;iBACP;gBACD,SAAS,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC;aACzB;YACD,KAAK,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,gBAAgB,EAAE,CAAC,EAAE,EAAE;gBACtD,IAAI,EAAE,KAAK,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE;oBACnC,MAAM;iBACP;gBACD,SAAS,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC;aACvB;SAEF;KACF;IACD,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,GAAG,IAAI,GAAG,EAAE,EAAE,SAAS,CAAC,CAAC;IACtD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,iBAAiB,CAAC,GAAW,EAAE,GAAW,EAAE,SAAoB,EAAE,MAA6B;IACtG,IAAI,MAAM,CAAC,gBAAgB,KAAK,MAAM,EAAE;QACtC,OAAO;KACR;IAED,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC5D,IAAI,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,WAAW,EAAE;QAE3B,SAAS,CAAC,KAAK,CAAC,GAAG,GAAG,MAAM,CAAC,mBAAmB,CAAC;QACjD,SAAS,CAAC,GAAG,CAAC,GAAG,GAAG,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC;QACxC,SAAS,CAAC,KAAK,CAAC,GAAG,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC;KAC/C;AACH,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,GAAW,EAAE,GAAW,EAAE,MAA6B;;IAC3F,MAAM,MAAM,GAAc,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC;IAErE,IAAI,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC,8BAA8B,IAAI,GAAG,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE;QAExG,IACE,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC,8BAA8B,IAAI,GAAG;aACtE,MAAA,MAAA,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,0CAAE,MAAM,0CAAE,SAAS,CAAA,EAC5C;YACA,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YACnD,KAAK,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,EAAE,CAAC,IAAI,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC,8BAA8B,EAAE,CAAC,EAAE,EAAE;gBAC/F,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;gBACtD,IAAI,OAAO,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,SAAS,KAAK,SAAS,EAAE;oBACnE,IAAI,KAAK,KAAK,UAAU,EAAE;wBACxB,MAAM;qBACP;iBACF;qBAAM;oBACL,IAAI,CAAE,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,SAAsB,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE;wBAChF,MAAM;qBACP;iBACF;gBACD,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC;aACtB;YACD,KAAK,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,MAAA,MAAM,CAAC,QAAQ,mCAAI,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACrD,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;gBACtD,IAAI,OAAO,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,SAAS,KAAK,SAAS,EAAE;oBACnE,IAAI,KAAK,KAAK,UAAU,EAAE;wBACxB,MAAM;qBACP;iBACF;qBAAM;oBACL,IAAI,CAAE,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,SAAsB,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE;wBAChF,MAAM;qBACP;iBACF;gBACD,MAAM,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC;aACpB;SACF;QACD,OAAO,MAAM,CAAC;KACf;IAED,MAAM,EAAE,GAAG,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IACtC,KAAK,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;QACjC,IAAI,EAAE,KAAK,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE;YACnC,MAAM;SACP;QACD,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC;KACtB;IACD,KAAK,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,MAAA,MAAM,CAAC,QAAQ,mCAAI,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACrD,IAAI,EAAE,KAAK,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE;YACnC,MAAM;SACP;QACD,MAAM,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC;KACpB;IACD,KAAK,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;QACjC,IAAI,EAAE,KAAK,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE;YACnC,MAAM;SACP;QACD,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAC;KACtB;IACD,KAAK,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC,8BAA8B,EAAE,CAAC,EAAE,EAAE;QAC9F,IAAI,EAAE,KAAK,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE;YACnC,MAAM;SACP;QACD,MAAM,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC;KACpB;IACD,OAAO,MAAM,CAAC;AAChB,CAAC","file":"simple-cell-range.js","sourcesContent":["import type { CellRange, TextColumnDefine } from '../../ts-types';\nimport type { SimpleHeaderLayoutMap } from '../simple-header-layout';\n\nexport function getCellRange(col: number, row: number, layout: SimpleHeaderLayoutMap): CellRange {\n  if (col === -1 || row === -1) {\n    return {\n      start: { col, row },\n      end: { col, row }\n    };\n  }\n  if (layout._cellRangeMap.has(`$${col}$${row}`)) {\n    return layout._cellRangeMap.get(`$${col}$${row}`);\n  }\n  let cellRange: CellRange = { start: { col, row }, end: { col, row } };\n  if (layout.transpose) {\n    cellRange = getCellRangeTranspose(col, row, layout);\n  } else {\n    // hover相关的单元格位置是-1,-1，getCellRange计算有误，先进行判断\n    if (layout.headerLevelCount <= row) {\n      //如果是body部分 设置了需要合并单元格 这里判断上下是否内容相同 相同的话 将cellRange范围扩大\n      if (\n        layout.headerLevelCount <= row &&\n        (layout.columnObjects[col - layout.leftRowSeriesNumberColumnCount]?.define as TextColumnDefine)?.mergeCell\n      ) {\n        const value = layout._table.getCellValue(col, row);\n        for (let r = row - 1; r >= layout.headerLevelCount; r--) {\n          const last_Value = layout._table.getCellValue(col, r);\n          if (typeof layout.columnObjects[col - layout.leftRowSeriesNumberColumnCount].define.mergeCell === 'boolean') {\n            if (value !== last_Value) {\n              break;\n            }\n          } else {\n            if (\n              !(layout.columnObjects[col - layout.leftRowSeriesNumberColumnCount].define.mergeCell as Function)(\n                value,\n                last_Value\n              )\n            ) {\n              break;\n            }\n          }\n          cellRange.start.row = r;\n        }\n        for (let r = row + 1; r < layout.rowCount; r++) {\n          const next_Value = layout._table.getCellValue(col, r);\n          if (typeof layout.columnObjects[col - layout.leftRowSeriesNumberColumnCount].define.mergeCell === 'boolean') {\n            if (value !== next_Value) {\n              break;\n            }\n          } else {\n            if (\n              !(layout.columnObjects[col - layout.leftRowSeriesNumberColumnCount].define.mergeCell as Function)(\n                value,\n                next_Value\n              )\n            ) {\n              break;\n            }\n          }\n          cellRange.end.row = r;\n        }\n      }\n      getTreeTitleMerge(col, row, cellRange, layout);\n      // return cellRange;\n    } else {\n      //in header\n      const id = layout.getCellId(col, row);\n      for (let c = col - 1; c >= 0; c--) {\n        if (id !== layout.getCellId(c, row)) {\n          break;\n        }\n        cellRange.start.col = c;\n      }\n      for (let c = col + 1; c < (layout.colCount ?? 0); c++) {\n        if (id !== layout.getCellId(c, row)) {\n          break;\n        }\n        cellRange.end.col = c;\n      }\n      for (let r = row - 1; r >= 0; r--) {\n        if (id !== layout.getCellId(col, r)) {\n          break;\n        }\n        cellRange.start.row = r;\n      }\n      for (let r = row + 1; r < layout.headerLevelCount; r++) {\n        if (id !== layout.getCellId(col, r)) {\n          break;\n        }\n        cellRange.end.row = r;\n      }\n      // return cellRange;\n    }\n  }\n  layout._cellRangeMap.set(`$${col}$${row}`, cellRange);\n  return cellRange;\n}\n\nfunction getTreeTitleMerge(col: number, row: number, cellRange: CellRange, layout: SimpleHeaderLayoutMap) {\n  if (layout.rowHierarchyType !== 'tree') {\n    return;\n  }\n\n  const cellRecord = layout._table.getCellRawRecord(col, row);\n  if (cellRecord?.vtableMerge) {\n    // const vtableMergeName = cellRecord.vtableMergeName;\n    cellRange.start.col = layout.rowHeaderLevelCount;\n    cellRange.end.col = layout.colCount - 1;\n    cellRange.start.row = cellRange.end.row = row;\n  }\n}\n\nexport function getCellRangeTranspose(col: number, row: number, layout: SimpleHeaderLayoutMap): CellRange {\n  const result: CellRange = { start: { col, row }, end: { col, row } };\n  // hover相关的单元格位置是-1,-1，getCellRange计算有误，先进行判断\n  if (layout.headerLevelCount + layout.leftRowSeriesNumberColumnCount <= col || (col === -1 && row === -1)) {\n    //如果是body部分 设置了需要合并单元格 这里判断左右是否内容相同 相同的话 将cellRange范围扩大\n    if (\n      layout.headerLevelCount + layout.leftRowSeriesNumberColumnCount <= col &&\n      layout.columnObjects[row]?.define?.mergeCell\n    ) {\n      const value = layout._table.getCellValue(col, row);\n      for (let c = col - 1; c >= layout.headerLevelCount + layout.leftRowSeriesNumberColumnCount; c--) {\n        const last_Value = layout._table.getCellValue(c, row);\n        if (typeof layout.columnObjects[row].define.mergeCell === 'boolean') {\n          if (value !== last_Value) {\n            break;\n          }\n        } else {\n          if (!(layout.columnObjects[row].define.mergeCell as Function)(value, last_Value)) {\n            break;\n          }\n        }\n        result.start.col = c;\n      }\n      for (let c = col + 1; c < (layout.colCount ?? 0); c++) {\n        const next_Value = layout._table.getCellValue(c, row);\n        if (typeof layout.columnObjects[row].define.mergeCell === 'boolean') {\n          if (value !== next_Value) {\n            break;\n          }\n        } else {\n          if (!(layout.columnObjects[row].define.mergeCell as Function)(value, next_Value)) {\n            break;\n          }\n        }\n        result.end.col = c;\n      }\n    }\n    return result;\n  }\n  //in header\n  const id = layout.getCellId(col, row);\n  for (let r = row - 1; r >= 0; r--) {\n    if (id !== layout.getCellId(col, r)) {\n      break;\n    }\n    result.start.row = r;\n  }\n  for (let r = row + 1; r < (layout.rowCount ?? 0); r++) {\n    if (id !== layout.getCellId(col, r)) {\n      break;\n    }\n    result.end.row = r;\n  }\n  for (let c = col - 1; c >= 0; c--) {\n    if (id !== layout.getCellId(c, row)) {\n      break;\n    }\n    result.start.col = c;\n  }\n  for (let c = col + 1; c < layout.headerLevelCount + layout.leftRowSeriesNumberColumnCount; c++) {\n    if (id !== layout.getCellId(c, row)) {\n      break;\n    }\n    result.end.col = c;\n  }\n  return result;\n}\n"]}

package/es/layout/chart-helper/get-axis-config.d.ts

@@ -1,16 +1,11 @@
 import type { PivotHeaderLayoutMap } from '../pivot-header-layout';
 import type { CollectedValue } from '../../ts-types';
-type AxisRange = {
-    min: number;
-    max: number;
-};
 export type GetAxisConfigInPivotChart = (col: number, row: number, layout: PivotHeaderLayoutMap) => any;
 export declare function getAxisConfigInPivotChart(col: number, row: number, layout: PivotHeaderLayoutMap): any;
 export declare function getAxisOption(col: number, row: number, orient: string, layout: PivotHeaderLayoutMap): {
     axisOption: any;
     isPercent: any;
     isZeroAlign: boolean;
-    isTickAlign: boolean;
     seriesIndice: any;
     theme: any;
     chartType: any;
@@ -18,22 +13,14 @@ export declare function getAxisOption(col: number, row: number, orient: string,
     axisOption: any;
     isPercent: boolean;
     isZeroAlign: boolean;
-    isTickAlign: boolean;
     theme: any;
     chartType: any;
     seriesIndice?: undefined;
 };
-export declare function getAxisRange(collectedValues: Record<string, Record<string, CollectedValue>>, indicatorKeys: string[], isZeroAlign: boolean, colPath: string, seriesId: number | number[]): AxisRange | null;
+export declare function getAxisRange(collectedValues: Record<string, Record<string, CollectedValue>>, indicatorKeys: string[], isZeroAlign: boolean, colPath: string, seriesId: number | number[]): {
+    max: number;
+    min: number;
+} | null;
 export declare function isTopOrBottomAxis(col: number, row: number, layout: PivotHeaderLayoutMap): boolean;
 export declare function isLeftOrRightAxis(col: number, row: number, layout: PivotHeaderLayoutMap): boolean;
 export declare function hasLinearAxis(spec: any, tableAxesConfig: any, isHorizontal: boolean, isThisXAxis: boolean): boolean;
-export declare function getAxisRangeAndTicks(col: number, row: number, index: number, position: 'bottom' | 'top' | 'left' | 'right', subAxisPosition: 'bottom' | 'top' | 'left' | 'right', indicatorKeys: string[], path: string, layout: PivotHeaderLayoutMap): {
-    axisOption: any;
-    range: AxisRange;
-    targetTicks: number[];
-    targetRange: {
-        max: number;
-        min: number;
-    };
-};
-export {};

package/es/layout/chart-helper/get-axis-config.js

@@ -8,15 +8,20 @@ import { getQuadProps } from "../../scenegraph/utils/padding";
 
 import { getProp } from "../../scenegraph/utils/get-prop";
 
-import { getTickModeFunction, getZeroAlignTickAlignTicks } from "./tick-align";
-
 export function getAxisConfigInPivotChart(col, row, layout) {
     var _a, _b, _c, _d, _e, _f, _g;
     if (layout._table.isPivotChart()) if (layout.indicatorsAsCol) {
         if (layout.hasTwoIndicatorAxes && row === layout.columnHeaderLevelCount - 1 && col >= layout.rowHeaderLevelCount && col < layout.colCount - layout.rightFrozenColCount) {
             const axisRange = getRange("top", col, row + 1, col, layout.columnHeaderLevelCount - 1, col, row, 1, layout);
             if (!axisRange) return;
-            const chartCellStyle = layout._table._getCellStyle(col, row + 1), padding = getQuadProps(getProp("padding", chartCellStyle, col, row + 1, layout._table)), {range: range, ticks: ticks, axisOption: axisOption, targetTicks: targetTicks, targetRange: targetRange, index: index, theme: theme} = axisRange;
+            const chartCellStyle = layout._table._getCellStyle(col, row + 1), padding = getQuadProps(getProp("padding", chartCellStyle, col, row + 1, layout._table)), {range: range, ticks: ticks, axisOption: axisOption, isZeroAlign: isZeroAlign, theme: theme} = axisRange;
+            if (isZeroAlign) {
+                const subAxisRange = getRange("bottom", col, row + 1, col, layout.columnHeaderLevelCount - 1, col, row, 0, layout);
+                if (subAxisRange) {
+                    const {range: subRange} = subAxisRange, align = getNewRangeToAlign(range, subRange);
+                    align && (range.min = align.range1[0], range.max = align.range1[1]);
+                }
+            }
             return isNumber(null == axisOption ? void 0 : axisOption.min) && (range.min = axisOption.min, 
             range.min > 0 && (axisOption.zero = !1)), isNumber(null == axisOption ? void 0 : axisOption.max) && (range.max = axisOption.max, 
             range.max < 0 && (axisOption.zero = !1)), merge({
@@ -27,16 +32,13 @@ export function getAxisConfigInPivotChart(col, row, layout) {
                 label: {
                     flush: !0
                 },
-                tick: {
-                    tickMode: getTickModeFunction(targetTicks, targetRange, range, index)
-                },
                 __ticksForVTable: ticks,
                 __vtableChartTheme: theme,
                 __vtablePadding: padding
             });
         }
         if (row === layout.rowCount - layout.bottomFrozenRowCount && col >= layout.rowHeaderLevelCount && col < layout.colCount - layout.rightFrozenColCount) {
-            const indicatorKeys = layout.getIndicatorKeyInChartSpec(col, row);
+            const indicatorKeys = layout.getIndicatorKeyInChartSpec(col, row).slice(0, 2);
             let indicatorInfo = null;
             null == indicatorKeys || indicatorKeys.forEach((key => {
                 const info = layout.getIndicatorInfo(key);
@@ -44,7 +46,14 @@ export function getAxisConfigInPivotChart(col, row, layout) {
             }));
             const axisRange = getRange("bottom", col, row - 1, col, row, col, row, 0, layout);
             if (!axisRange) return;
-            const chartCellStyle = layout._table._getCellStyle(col, row - 1), padding = getQuadProps(getProp("padding", chartCellStyle, col, row - 1, layout._table)), {range: range, ticks: ticks, axisOption: axisOption, index: index, targetTicks: targetTicks, targetRange: targetRange, theme: theme} = axisRange;
+            const chartCellStyle = layout._table._getCellStyle(col, row - 1), padding = getQuadProps(getProp("padding", chartCellStyle, col, row - 1, layout._table)), {range: range, ticks: ticks, axisOption: axisOption, isZeroAlign: isZeroAlign, theme: theme} = axisRange;
+            if (isZeroAlign) {
+                const subAxisRange = getRange("top", col, row - 1, col, row, col, row, 1, layout);
+                if (subAxisRange) {
+                    const {range: subRange} = subAxisRange, align = getNewRangeToAlign(range, subRange);
+                    align && (range.min = align.range1[0], range.max = align.range1[1]);
+                }
+            }
             return isNumber(null == axisOption ? void 0 : axisOption.min) && (range.min = axisOption.min, 
             range.min > 0 && (axisOption.zero = !1)), isNumber(null == axisOption ? void 0 : axisOption.max) && (range.max = axisOption.max, 
             range.max < 0 && (axisOption.zero = !1)), merge({
@@ -59,9 +68,6 @@ export function getAxisConfigInPivotChart(col, row, layout) {
                 label: {
                     flush: !0
                 },
-                tick: {
-                    tickMode: getTickModeFunction(targetTicks, targetRange, range, index)
-                },
                 __ticksForVTable: ticks,
                 __vtableChartTheme: theme,
                 __vtablePadding: padding
@@ -89,7 +95,7 @@ export function getAxisConfigInPivotChart(col, row, layout) {
         }
     } else {
         if (col === layout.rowHeaderLevelCount - 1 && row >= layout.columnHeaderLevelCount && row < layout.rowCount - layout.bottomFrozenRowCount) {
-            const indicatorKeys = layout.getIndicatorKeyInChartSpec(col, row);
+            const indicatorKeys = layout.getIndicatorKeyInChartSpec(col, row).slice(0, 2);
             let indicatorInfo = null;
             null == indicatorKeys || indicatorKeys.forEach((key => {
                 const info = layout.getIndicatorInfo(key);
@@ -97,7 +103,14 @@ export function getAxisConfigInPivotChart(col, row, layout) {
             }));
             const axisRange = getRange("left", col + 1, row, col, row, col, row, 0, layout);
             if (!axisRange) return;
-            const chartCellStyle = layout._table._getCellStyle(col + 1, row), padding = getQuadProps(getProp("padding", chartCellStyle, col + 1, row, layout._table)), {range: range, ticks: ticks, axisOption: axisOption, index: index, targetTicks: targetTicks, targetRange: targetRange, theme: theme} = axisRange;
+            const chartCellStyle = layout._table._getCellStyle(col + 1, row), padding = getQuadProps(getProp("padding", chartCellStyle, col + 1, row, layout._table)), {range: range, ticks: ticks, axisOption: axisOption, isZeroAlign: isZeroAlign, theme: theme} = axisRange;
+            if (isZeroAlign) {
+                const subAxisRange = getRange("right", col + 1, row, col, row, col, row, 1, layout);
+                if (subAxisRange) {
+                    const {range: subRange} = subAxisRange, align = getNewRangeToAlign(range, subRange);
+                    align && (range.min = align.range1[0], range.max = align.range1[1]);
+                }
+            }
             return isNumber(null == axisOption ? void 0 : axisOption.min) && (range.min = axisOption.min, 
             range.min > 0 && (axisOption.zero = !1)), isNumber(null == axisOption ? void 0 : axisOption.max) && (range.max = axisOption.max, 
             range.max < 0 && (axisOption.zero = !1)), merge({
@@ -113,9 +126,6 @@ export function getAxisConfigInPivotChart(col, row, layout) {
                 label: {
                     flush: !0
                 },
-                tick: {
-                    tickMode: getTickModeFunction(targetTicks, targetRange, range, index)
-                },
                 __ticksForVTable: ticks,
                 __vtableChartTheme: theme,
                 __vtablePadding: padding
@@ -124,7 +134,14 @@ export function getAxisConfigInPivotChart(col, row, layout) {
         if (col === layout.colCount - layout.rightFrozenColCount && row >= layout.columnHeaderLevelCount && row < layout.rowCount - layout.bottomFrozenRowCount) {
             const axisRange = getRange("right", col - 1, row, layout.rowHeaderLevelCount - 1, row, col, row, 1, layout);
             if (!axisRange) return;
-            const chartCellStyle = layout._table._getCellStyle(col - 1, row), padding = getQuadProps(getProp("padding", chartCellStyle, col - 1, row, layout._table)), {range: range, ticks: ticks, axisOption: axisOption, index: index, targetTicks: targetTicks, targetRange: targetRange, theme: theme} = axisRange;
+            const chartCellStyle = layout._table._getCellStyle(col - 1, row), padding = getQuadProps(getProp("padding", chartCellStyle, col - 1, row, layout._table)), {range: range, ticks: ticks, axisOption: axisOption, isZeroAlign: isZeroAlign, theme: theme} = axisRange;
+            if (isZeroAlign) {
+                const subAxisRange = getRange("left", col - 1, row, layout.rowHeaderLevelCount - 1, row, col, row, 0, layout);
+                if (subAxisRange) {
+                    const {range: subRange} = subAxisRange, align = getNewRangeToAlign(range, subRange);
+                    align && (range.min = align.range1[0], range.max = align.range1[1]);
+                }
+            }
             return isNumber(null == axisOption ? void 0 : axisOption.min) && (range.min = axisOption.min, 
             range.min > 0 && (axisOption.zero = !1)), isNumber(null == axisOption ? void 0 : axisOption.max) && (range.max = axisOption.max, 
             range.max < 0 && (axisOption.zero = !1)), merge({
@@ -138,9 +155,6 @@ export function getAxisConfigInPivotChart(col, row, layout) {
                 label: {
                     flush: !0
                 },
-                tick: {
-                    tickMode: getTickModeFunction(targetTicks, targetRange, range, index)
-                },
                 __ticksForVTable: ticks,
                 __vtableChartTheme: theme,
                 __vtablePadding: padding
@@ -175,28 +189,24 @@ export function getAxisOption(col, row, orient, layout) {
         if (axisOption) {
             const {seriesIndex: seriesIndex, seriesId: seriesId} = axisOption;
             let seriesIndice, seriesSpec;
-            isValid(seriesId) && isArray(spec.series) ? seriesIndice = (isArray(seriesId) ? seriesId : [ seriesId ]).map((id => {
+            return isValid(seriesId) && isArray(spec.series) ? seriesIndice = (isArray(seriesId) ? seriesId : [ seriesId ]).map((id => {
                 const index = spec.series.findIndex((s => s.id === id));
                 return index >= 0 && (seriesSpec = spec.series[index]), index;
-            })) : isValid(seriesIndex) && isArray(spec.series) && (seriesIndice = seriesIndex);
-            const {isZeroAlign: isZeroAlign, isTickAlign: isTickAlign} = checkZeroAlign(spec, orient, layout);
-            return {
+            })) : isValid(seriesIndex) && isArray(spec.series) && (seriesIndice = seriesIndex), 
+            {
                 axisOption: axisOption,
                 isPercent: spec.percent,
-                isZeroAlign: isZeroAlign,
-                isTickAlign: isTickAlign,
+                isZeroAlign: checkZeroAlign(spec, orient, layout),
                 seriesIndice: seriesIndice,
                 theme: spec.theme,
                 chartType: null !== (_b = null == seriesSpec ? void 0 : seriesSpec.type) && void 0 !== _b ? _b : spec.type
             };
         }
     }
-    const axisOption = layout._table.pivotChartAxes.find((axisOption => axisOption.orient === orient)), {isZeroAlign: isZeroAlign, isTickAlign: isTickAlign} = checkZeroAlign(spec, orient, layout);
     return {
-        axisOption: axisOption,
+        axisOption: layout._table.pivotChartAxes.find((axisOption => axisOption.orient === orient)),
         isPercent: !1,
-        isZeroAlign: isZeroAlign,
-        isTickAlign: isTickAlign,
+        isZeroAlign: checkZeroAlign(spec, orient, layout),
         theme: spec.theme,
         chartType: spec.type
     };
@@ -205,24 +215,19 @@ export function getAxisOption(col, row, orient, layout) {
 function checkZeroAlign(spec, orient, layout) {
     const orients = [];
     let axesSpec;
-    "left" === orient || "right" === orient ? orients.push("left", "right") : "top" !== orient && "bottom" !== orient || orients.push("top", "bottom"), 
-    axesSpec = spec && isArray(spec.axes) ? spec.axes : layout._table.pivotChartAxes;
-    let isZeroAlign = !1, isTickAlign = !1;
-    if (isArray(axesSpec)) {
+    if ("left" === orient || "right" === orient ? orients.push("left", "right") : "top" !== orient && "bottom" !== orient || orients.push("top", "bottom"), 
+    axesSpec = spec && isArray(spec.axes) ? spec.axes : layout._table.pivotChartAxes, 
+    isArray(axesSpec)) {
         const axes = [];
         axesSpec.forEach((axis => {
             orients.includes(axis.orient) && axes.push(axis);
         }));
         for (let i = 0; i < axes.length; i++) {
             const axis = axes[i];
-            axis.sync && axis.sync.axisId && axes.find((axisSync => axisSync.id === axis.sync.axisId)) && (isZeroAlign = isZeroAlign || axis.sync.zeroAlign, 
-            isTickAlign = isTickAlign || axis.sync.tickAlign);
+            if (axis.sync && axis.sync.zeroAlign && axis.sync.axisId && axes.find((axisSync => axisSync.id === axis.sync.axisId))) return !0;
         }
     }
-    return {
-        isZeroAlign: isZeroAlign,
-        isTickAlign: isTickAlign
-    };
+    return !1;
 }
 
 export function getAxisRange(collectedValues, indicatorKeys, isZeroAlign, colPath, seriesId) {
@@ -249,6 +254,29 @@ export function getAxisRange(collectedValues, indicatorKeys, isZeroAlign, colPat
     range.min === range.max && (range.min > 0 ? range.min = 0 : range.max = 0), range;
 }
 
+function getRange(position, colForAxisOption, rowForAxisOption, colForIndicatorKey, rowForIndicatorKey, col, row, defaultSeriesIndice, layout) {
+    const {axisOption: axisOption, isPercent: isPercent, isZeroAlign: isZeroAlign, seriesIndice: seriesIndice, theme: theme, chartType: chartType} = getAxisOption(colForAxisOption, rowForAxisOption, position, layout);
+    if (!1 === (null == axisOption ? void 0 : axisOption.visible)) return;
+    const indicatorKeys = layout.getIndicatorKeyInChartSpec(colForIndicatorKey, rowForIndicatorKey).slice(0, 2);
+    let path;
+    path = "top" === position || "bottom" === position ? layout.getColKeysPath(col, row) : layout.getRowKeysPath(col, row);
+    const range = getAxisRange(layout.dataset.collectedValues, indicatorKeys, isZeroAlign, path, null != seriesIndice ? seriesIndice : defaultSeriesIndice);
+    if (!range) return;
+    isPercent && (range.min = range.min < 0 ? -1 : 0, range.max = range.max > 0 ? 1 : 0);
+    const getAxisDomainRangeAndLabels = Factory.getFunction("getAxisDomainRangeAndLabels"), {range: niceRange, ticks: ticks} = getAxisDomainRangeAndLabels(range.min, range.max, axisOption, isZeroAlign, "bottom" === position || "top" === position ? layout._table.getColWidth(col) || layout._table.tableNoFrameWidth : layout._table.getRowHeight(row) || layout._table.tableNoFrameHeight);
+    return range.min = isNaN(niceRange[0]) ? 0 : niceRange[0], range.max = isNaN(niceRange[1]) ? 1 : niceRange[1], 
+    isNumber(null == axisOption ? void 0 : axisOption.min) && (range.min = axisOption.min, 
+    range.min > 0 && (axisOption.zero = !1)), isNumber(null == axisOption ? void 0 : axisOption.max) && (range.max = axisOption.max, 
+    range.max < 0 && (axisOption.zero = !1)), {
+        axisOption: axisOption,
+        isZeroAlign: isZeroAlign,
+        range: range,
+        ticks: ticks,
+        theme: theme,
+        chartType: chartType
+    };
+}
+
 export function isTopOrBottomAxis(col, row, layout) {
     if (!layout._table.isPivotChart()) return !1;
     if (layout.indicatorsAsCol) {
@@ -303,86 +331,4 @@ export function hasLinearAxis(spec, tableAxesConfig, isHorizontal, isThisXAxis)
     }
     return isHorizontal && isThisXAxis || !isHorizontal && !isThisXAxis;
 }
-
-function getRange(position, colForAxisOption, rowForAxisOption, colForIndicatorKey, rowForIndicatorKey, col, row, defaultSeriesIndice, layout) {
-    const indicatorKeys = layout.getIndicatorKeyInChartSpec(colForIndicatorKey, rowForIndicatorKey);
-    let path;
-    path = "top" === position || "bottom" === position ? layout.getColKeysPath(col, row) : layout.getRowKeysPath(col, row);
-    const rangeConfig = getChartAxisRange(colForAxisOption, rowForAxisOption, defaultSeriesIndice, position, indicatorKeys, path, layout);
-    if (!rangeConfig) return;
-    const subAxisPosition = "bottom" === position ? "top" : "top" === position ? "bottom" : "left" === position ? "right" : "left", {targetRange: targetRange, targetTicks: targetTicks} = getTargetRangeAndTicks(colForAxisOption, rowForAxisOption, rangeConfig.index, rangeConfig.isZeroAlign, rangeConfig.isTickAlign, rangeConfig.range, indicatorKeys, subAxisPosition, path, layout);
-    if (0 !== rangeConfig.index && targetTicks) {
-        const getAxisDomainRangeAndLabels = Factory.getFunction("getAxisDomainRangeAndLabels"), {range: newRange, ticks: newTicks} = getAxisDomainRangeAndLabels(rangeConfig.range.min, rangeConfig.range.max, rangeConfig.axisOption, rangeConfig.isZeroAlign, "bottom" === position || "top" === position ? layout._table.getColWidth(col) || layout._table.tableNoFrameWidth : layout._table.getRowHeight(row) || layout._table.tableNoFrameHeight, {
-            targetTicks: targetTicks,
-            targetRange: targetRange
-        });
-        rangeConfig.range.min = newRange[0], rangeConfig.range.max = newRange[1], rangeConfig.ticks = newTicks;
-    }
-    return rangeConfig.targetRange = targetRange, rangeConfig.targetTicks = targetTicks, 
-    rangeConfig;
-}
-
-function getChartAxisRange(col, row, index, position, indicatorKeys, path, layout) {
-    const {axisOption: axisOption, isPercent: isPercent, isZeroAlign: isZeroAlign, isTickAlign: isTickAlign, seriesIndice: seriesIndice, theme: theme, chartType: chartType} = getAxisOption(col, row, position, layout), range = getAxisRange(layout.dataset.collectedValues, indicatorKeys, isZeroAlign, path, null != seriesIndice ? seriesIndice : index);
-    if (!range) return;
-    let ticks;
-    if (isPercent && (range.min = range.min < 0 ? -1 : 0, range.max = range.max > 0 ? 1 : 0), 
-    ((null == axisOption ? void 0 : axisOption.zero) || range.min === range.max) && (range.min = Math.min(range.min, 0), 
-    range.max = Math.max(range.max, 0)), (null == axisOption ? void 0 : axisOption.nice) || isTickAlign) {
-        const getAxisDomainRangeAndLabels = Factory.getFunction("getAxisDomainRangeAndLabels"), {range: axisRange, ticks: selfTicks} = getAxisDomainRangeAndLabels(range.min, range.max, axisOption, isZeroAlign, "bottom" === position || "top" === position ? layout._table.getColWidth(col) || layout._table.tableNoFrameWidth : layout._table.getRowHeight(row) || layout._table.tableNoFrameHeight);
-        (null == axisOption ? void 0 : axisOption.nice) && (range.min = axisRange[0], range.max = axisRange[1]), 
-        ticks = selfTicks;
-    }
-    return isNumber(null == axisOption ? void 0 : axisOption.min) && (range.min = axisOption.min), 
-    isNumber(null == axisOption ? void 0 : axisOption.max) && (range.max = axisOption.max), 
-    {
-        index: null != seriesIndice ? seriesIndice : index,
-        range: range,
-        ticks: ticks,
-        isZeroAlign: isZeroAlign,
-        isTickAlign: isTickAlign,
-        axisOption: axisOption,
-        theme: theme,
-        chartType: chartType
-    };
-}
-
-export function getAxisRangeAndTicks(col, row, index, position, subAxisPosition, indicatorKeys, path, layout) {
-    const {range: range, isZeroAlign: isZeroAlign, isTickAlign: isTickAlign, axisOption: axisOption} = getChartAxisRange(col, row, index, position, indicatorKeys, path, layout), {targetRange: targetRange, targetTicks: targetTicks} = getTargetRangeAndTicks(col, row, index, isZeroAlign, isTickAlign, range, indicatorKeys, subAxisPosition, path, layout);
-    if (0 !== index && targetTicks) {
-        const getAxisDomainRangeAndLabels = Factory.getFunction("getAxisDomainRangeAndLabels"), {range: newRange, ticks: newTicks} = getAxisDomainRangeAndLabels(range.min, range.max, isZeroAlign, "bottom" === position || "top" === position ? layout._table.getColWidth(col) || layout._table.tableNoFrameWidth : layout._table.getRowHeight(row) || layout._table.tableNoFrameHeight, {
-            targetTicks: targetTicks,
-            targetRange: targetRange
-        });
-        range.min = newRange[0], range.max = newRange[1];
-    }
-    return {
-        axisOption: axisOption,
-        range: range,
-        targetTicks: targetTicks,
-        targetRange: targetRange
-    };
-}
-
-function getTargetRangeAndTicks(col, row, index, isZeroAlign, isTickAlign, range, indicatorKeys, subAxisPosition, path, layout) {
-    let targetTicks, targetRange;
-    if (!isZeroAlign && !isTickAlign) return {
-        targetTicks: targetTicks,
-        targetRange: targetRange
-    };
-    const subAxisRange = getChartAxisRange(col, row, indicatorKeys.length - 1 - index, subAxisPosition, indicatorKeys, path, layout);
-    if (subAxisRange) {
-        const {range: subRange, ticks: subTicks} = subAxisRange;
-        if (targetRange = subRange, isZeroAlign) {
-            const align = getNewRangeToAlign(range, subRange);
-            align && (range.min = align.range1[0], range.max = align.range1[1], targetRange.min = align.range2[0], 
-            targetRange.max = align.range2[1]);
-        }
-        isTickAlign && (targetTicks = isZeroAlign ? getZeroAlignTickAlignTicks(targetRange, col, row, index, subAxisPosition, layout) : subTicks);
-    }
-    return {
-        targetTicks: targetTicks,
-        targetRange: targetRange
-    };
-}
 //# sourceMappingURL=get-axis-config.js.map