@visactor/vtable 0.20.4-alpha.2 → 0.21.0

package/es/plugins/custom-cell-style.d.ts

@@ -0,0 +1,19 @@
+import type { Style } from '../body-helper/style';
+import type { CellRange, ColumnStyleOption, CustomCellStyle, CustomCellStyleArrangement } from '../ts-types';
+import type { BaseTableAPI } from '../ts-types/base-table';
+export declare class CustomCellStylePlugin {
+    table: BaseTableAPI;
+    customCellStyle: CustomCellStyle[];
+    customCellStyleArrangement: CustomCellStyleArrangement[];
+    constructor(table: BaseTableAPI, customCellStyle: CustomCellStyle[], customCellStyleArrangement: CustomCellStyleArrangement[]);
+    getCustomCellStyle(col: number, row: number): ColumnStyleOption;
+    getCustomCellStyleId(col: number, row: number): undefined;
+    getCustomCellStyleOption(customStyleId: string): CustomCellStyle;
+    registerCustomCellStyle(customStyleId: string, customStyle: ColumnStyleOption | undefined | null): void;
+    arrangeCustomCellStyle(cellPos: {
+        col?: number;
+        row?: number;
+        range?: CellRange;
+    }, customStyleId: string | undefined | null): void;
+}
+export declare function mergeStyle(cacheStyle: Style, customCellStyle: ColumnStyleOption): Style;

package/es/plugins/custom-cell-style.js

@@ -0,0 +1,55 @@
+export class CustomCellStylePlugin {
+    constructor(table, customCellStyle, customCellStyleArrangement) {
+        this.table = table, this.customCellStyle = customCellStyle, this.customCellStyleArrangement = customCellStyleArrangement;
+    }
+    getCustomCellStyle(col, row) {
+        const customStyleId = this.getCustomCellStyleId(col, row);
+        if (customStyleId) {
+            return this.getCustomCellStyleOption(customStyleId).style;
+        }
+    }
+    getCustomCellStyleId(col, row) {
+        let customStyleId;
+        return this.customCellStyleArrangement.forEach((style => {
+            style.cellPosition.range ? style.cellPosition.range.start.col <= col && style.cellPosition.range.end.col >= col && style.cellPosition.range.start.row <= row && style.cellPosition.range.end.row >= row && (customStyleId = style.customStyleId) : style.cellPosition.col === col && style.cellPosition.row === row && (customStyleId = style.customStyleId);
+        })), customStyleId;
+    }
+    getCustomCellStyleOption(customStyleId) {
+        return this.customCellStyle.find((style => style.id === customStyleId));
+    }
+    registerCustomCellStyle(customStyleId, customStyle) {
+        const index = this.customCellStyle.findIndex((style => style.id === customStyleId));
+        -1 === index ? this.customCellStyle.push({
+            id: customStyleId,
+            style: customStyle
+        }) : this.customCellStyle[index] = {
+            id: customStyleId,
+            style: customStyle
+        }, this.customCellStyleArrangement.forEach((cellStyle => {
+            const cellPos = cellStyle.cellPosition;
+            if (cellStyle.customStyleId === customStyleId) if (cellPos.range) for (let col = cellPos.range.start.col; col <= cellPos.range.end.col; col++) for (let row = cellPos.range.start.row; row <= cellPos.range.end.row; row++) this.table.scenegraph.updateCellContent(col, row); else this.table.scenegraph.updateCellContent(cellPos.col, cellPos.row);
+        })), this.table.scenegraph.updateNextFrame();
+    }
+    arrangeCustomCellStyle(cellPos, customStyleId) {
+        const index = this.customCellStyleArrangement.findIndex((style => style.cellPosition.range && cellPos.range ? style.cellPosition.range.start.col === cellPos.range.start.col && style.cellPosition.range.start.row === cellPos.range.start.row && style.cellPosition.range.end.col === cellPos.range.end.col && style.cellPosition.range.end.row === cellPos.range.end.row : style.cellPosition.col === cellPos.col && style.cellPosition.row === cellPos.row));
+        if (-1 === index ? this.customCellStyleArrangement.push({
+            cellPosition: {
+                col: cellPos.col,
+                row: cellPos.row,
+                range: cellPos.range
+            },
+            customStyleId: customStyleId
+        }) : this.customCellStyleArrangement[index].customStyleId = customStyleId, cellPos.range) for (let col = cellPos.range.start.col; col <= cellPos.range.end.col; col++) for (let row = cellPos.range.start.row; row <= cellPos.range.end.row; row++) this.table.scenegraph.updateCellContent(col, row); else this.table.scenegraph.updateCellContent(cellPos.col, cellPos.row);
+        this.table.scenegraph.updateNextFrame();
+    }
+}
+
+export function mergeStyle(cacheStyle, customCellStyle) {
+    cacheStyle = cacheStyle.clone();
+    for (const key in customCellStyle) {
+        const value = customCellStyle[key];
+        value && (cacheStyle[`_${key}`] = value);
+    }
+    return cacheStyle;
+}
+//# sourceMappingURL=custom-cell-style.js.map

package/es/plugins/custom-cell-style.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/plugins/custom-cell-style.ts"],"names":[],"mappings":"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","file":"custom-cell-style.js","sourcesContent":["import type { Style } from '../body-helper/style';\nimport type {\n  CellRange,\n  ColumnStyleOption,\n  CustomCellStyle,\n  CustomCellStyleArrangement,\n  FullExtendStyle\n} from '../ts-types';\nimport type { BaseTableAPI } from '../ts-types/base-table';\n\nexport class CustomCellStylePlugin {\n  table: BaseTableAPI;\n  customCellStyle: CustomCellStyle[];\n  customCellStyleArrangement: CustomCellStyleArrangement[];\n\n  constructor(\n    table: BaseTableAPI,\n    customCellStyle: CustomCellStyle[],\n    customCellStyleArrangement: CustomCellStyleArrangement[]\n  ) {\n    this.table = table;\n    this.customCellStyle = customCellStyle;\n    this.customCellStyleArrangement = customCellStyleArrangement;\n  }\n\n  getCustomCellStyle(col: number, row: number) {\n    const customStyleId = this.getCustomCellStyleId(col, row);\n    if (customStyleId) {\n      const styleOption = this.getCustomCellStyleOption(customStyleId);\n      return styleOption.style;\n    }\n    return undefined;\n  }\n\n  getCustomCellStyleId(col: number, row: number) {\n    let customStyleId;\n    this.customCellStyleArrangement.forEach(style => {\n      if (style.cellPosition.range) {\n        if (\n          style.cellPosition.range.start.col <= col &&\n          style.cellPosition.range.end.col >= col &&\n          style.cellPosition.range.start.row <= row &&\n          style.cellPosition.range.end.row >= row\n        ) {\n          customStyleId = style.customStyleId;\n        }\n      } else if (style.cellPosition.col === col && style.cellPosition.row === row) {\n        customStyleId = style.customStyleId;\n      }\n    });\n    return customStyleId;\n  }\n\n  getCustomCellStyleOption(customStyleId: string) {\n    return this.customCellStyle.find(style => style.id === customStyleId);\n  }\n\n  registerCustomCellStyle(customStyleId: string, customStyle: ColumnStyleOption | undefined | null) {\n    const index = this.customCellStyle.findIndex(style => style.id === customStyleId);\n    if (index === -1) {\n      this.customCellStyle.push({\n        id: customStyleId,\n        style: customStyle\n      });\n    } else {\n      this.customCellStyle[index] = {\n        id: customStyleId,\n        style: customStyle\n      };\n    }\n\n    this.customCellStyleArrangement.forEach(cellStyle => {\n      const cellPos = cellStyle.cellPosition;\n      if (cellStyle.customStyleId === customStyleId) {\n        if (cellPos.range) {\n          for (let col = cellPos.range.start.col; col <= cellPos.range.end.col; col++) {\n            for (let row = cellPos.range.start.row; row <= cellPos.range.end.row; row++) {\n              this.table.scenegraph.updateCellContent(col, row);\n            }\n          }\n        } else {\n          this.table.scenegraph.updateCellContent(cellPos.col, cellPos.row);\n        }\n      }\n    });\n    this.table.scenegraph.updateNextFrame();\n  }\n\n  arrangeCustomCellStyle(\n    cellPos: {\n      col?: number;\n      row?: number;\n      range?: CellRange;\n    },\n    customStyleId: string | undefined | null\n  ) {\n    const index = this.customCellStyleArrangement.findIndex(style => {\n      if (style.cellPosition.range && cellPos.range) {\n        return (\n          style.cellPosition.range.start.col === cellPos.range.start.col &&\n          style.cellPosition.range.start.row === cellPos.range.start.row &&\n          style.cellPosition.range.end.col === cellPos.range.end.col &&\n          style.cellPosition.range.end.row === cellPos.range.end.row\n        );\n      }\n      return style.cellPosition.col === cellPos.col && style.cellPosition.row === cellPos.row;\n    });\n\n    if (index === -1) {\n      this.customCellStyleArrangement.push({\n        cellPosition: {\n          col: cellPos.col,\n          row: cellPos.row,\n          range: cellPos.range\n        },\n        customStyleId: customStyleId\n      });\n    } else {\n      this.customCellStyleArrangement[index].customStyleId = customStyleId;\n    }\n\n    // update cell group\n    if (cellPos.range) {\n      for (let col = cellPos.range.start.col; col <= cellPos.range.end.col; col++) {\n        for (let row = cellPos.range.start.row; row <= cellPos.range.end.row; row++) {\n          this.table.scenegraph.updateCellContent(col, row);\n        }\n      }\n    } else {\n      this.table.scenegraph.updateCellContent(cellPos.col, cellPos.row);\n    }\n    this.table.scenegraph.updateNextFrame();\n  }\n}\n\nexport function mergeStyle(cacheStyle: Style, customCellStyle: ColumnStyleOption): Style {\n  cacheStyle = cacheStyle.clone();\n\n  for (const key in customCellStyle) {\n    const value = customCellStyle[key];\n    if (value) {\n      cacheStyle[`_${key}`] = value;\n    }\n  }\n\n  return cacheStyle;\n}\n"]}

package/es/scenegraph/graphic/contributions/group-contribution-render.js

@@ -36,8 +36,15 @@ let SplitGroupAfterRenderContribution = class {
         let widthForStroke, heightForStroke;
         if (Array.isArray(strokeArrayColor) || Array.isArray(strokeArrayWidth)) {
             if ("number" == typeof lineWidth && 1 & lineWidth || Array.isArray(strokeArrayWidth) && strokeArrayWidth.some((width => 1 & width))) {
-                x = Math.floor(x) + .5, y = Math.floor(y) + .5;
-                const {width: widthFroDraw, height: heightFroDraw} = getCellSizeForDraw(group, Math.ceil(width), Math.ceil(height));
+                const table = group.stage.table;
+                let deltaWidth = 0, deltaHeight = 0;
+                if ("bottom-right" === table.theme.cellBorderClipDirection) {
+                    if (x = Math.floor(x) - .5, y = Math.floor(y) - .5, "cell" === group.role) {
+                        const col = group.col, row = group.row;
+                        table && col === table.colCount - 1 && (deltaWidth = 1), table && row === table.rowCount - 1 && (deltaHeight = 1);
+                    }
+                } else x = Math.floor(x) + .5, y = Math.floor(y) + .5;
+                const {width: widthFroDraw, height: heightFroDraw} = getCellSizeForDraw(group, Math.ceil(width + deltaWidth), Math.ceil(height + deltaHeight));
                 widthForStroke = widthFroDraw, heightForStroke = heightFroDraw;
             } else widthForStroke = Math.ceil(width), heightForStroke = Math.ceil(height);
             renderStroke(group, context, x, y, groupAttribute, stroke, strokeArrayWidth || lineWidth, strokeArrayColor || strokeColor, widthForStroke, heightForStroke);
@@ -95,7 +102,7 @@ export function renderStroke(group, context, x, y, groupAttribute, stroke, strok
     isWidthNumber || (context.lineWidth = strokeArrayWidth[3]), context.lineDashOffset = context.currentMatrix.f / context.currentMatrix.d, 
     context.stroke(), context.beginPath(), context.moveTo(x, y))) : context.moveTo(x, y), 
     isSplitDraw || isDash || (!isWidthNumber && widthInfo.width && (context.lineWidth = widthInfo.width), 
-    context.stroke());
+    context.stroke()), context.lineDashOffset = 0;
 }
 
 let DashGroupBeforeRenderContribution = class {
@@ -121,8 +128,15 @@ let DashGroupAfterRenderContribution = class {
         if (!stroke || !Array.isArray(lineDash) || !lineDash.length || Array.isArray(strokeArrayColor) || Array.isArray(strokeArrayWidth)) return;
         let widthForStroke, heightForStroke, {width: width = groupAttribute.width, height: height = groupAttribute.height} = group.attribute;
         if (width = Math.ceil(width), height = Math.ceil(height), 1 & lineWidth) {
-            x = Math.floor(x) + .5, y = Math.floor(y) + .5;
-            const {width: widthFroDraw, height: heightFroDraw} = getCellSizeForDraw(group, Math.ceil(width), Math.ceil(height));
+            const table = group.stage.table;
+            let deltaWidth = 0, deltaHeight = 0;
+            if ("bottom-right" === table.theme.cellBorderClipDirection) {
+                if (x = Math.floor(x) - .5, y = Math.floor(y) - .5, "cell" === group.role) {
+                    const col = group.col, row = group.row;
+                    table && col === table.colCount - 1 && (deltaWidth = 1), table && row === table.rowCount - 1 && (deltaHeight = 1);
+                }
+            } else x = Math.floor(x) + .5, y = Math.floor(y) + .5;
+            const {width: widthFroDraw, height: heightFroDraw} = getCellSizeForDraw(group, Math.ceil(width + deltaWidth), Math.ceil(height + deltaHeight));
             widthForStroke = widthFroDraw, heightForStroke = heightFroDraw;
         } else widthForStroke = Math.ceil(width), heightForStroke = Math.ceil(height);
         context.setStrokeStyle(group, group.attribute, x, y, groupAttribute), context.beginPath(), 
@@ -162,7 +176,16 @@ let AdjustPosGroupAfterRenderContribution = class {
         const {lineWidth: lineWidth = groupAttribute.lineWidth, stroke: stroke = groupAttribute.stroke, lineDash: lineDash = groupAttribute.lineDash, strokeArrayWidth: strokeArrayWidth = groupAttribute.strokeArrayWidth, strokeArrayColor: strokeArrayColor = groupAttribute.strokeArrayColor, notAdjustPos: notAdjustPos, cornerRadius: cornerRadius = groupAttribute.cornerRadius} = group.attribute, {width: width = groupAttribute.width, height: height = groupAttribute.height} = group.attribute;
         if (!0 !== notAdjustPos && stroke && Array.isArray(lineDash) && !lineDash.length && !Array.isArray(strokeArrayColor) && !Array.isArray(strokeArrayWidth) && 1 & lineWidth) {
             const {width: widthFroDraw, height: heightFroDraw} = getCellSizeForDraw(group, Math.ceil(width), Math.ceil(height));
-            context.beginPath(), x = Math.floor(x) + .5, y = Math.floor(y) + .5, cornerRadius ? createRectPath(context, x, y, widthFroDraw, heightFroDraw, cornerRadius) : context.rect(x, y, widthFroDraw, heightFroDraw), 
+            context.beginPath();
+            const table = group.stage.table;
+            let deltaWidth = 0, deltaHeight = 0;
+            if ("bottom-right" === table.theme.cellBorderClipDirection) {
+                if (x = Math.floor(x) - .5, y = Math.floor(y) - .5, "cell" === group.role) {
+                    const col = group.col, row = group.row;
+                    table && col === table.colCount - 1 && (deltaWidth = 1), table && row === table.rowCount - 1 && (deltaHeight = 1);
+                }
+            } else x = Math.floor(x) + .5, y = Math.floor(y) + .5;
+            cornerRadius ? createRectPath(context, x, y, widthFroDraw + deltaWidth, heightFroDraw + deltaHeight, cornerRadius) : context.rect(x, y, widthFroDraw, heightFroDraw), 
             context.setStrokeStyle(group, group.attribute, x, y, groupAttribute), context.stroke();
         }
     }

package/es/scenegraph/graphic/contributions/group-contribution-render.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/scenegraph/graphic/contributions/group-contribution-render.ts"],"names":[],"mappings":";;;;;;AAWA,OAAO,EAAE,0BAA0B,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAE5F,OAAO,EAAE,iBAAiB,EAAE,MAAM,oCAAoC,CAAC;AAGvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAO9C,IAAM,kCAAkC,GAAxC,MAAM,kCAAkC;IAAxC;QACL,SAAI,GAA+B,0BAA0B,CAAC,gBAAgB,CAAC;QAC/E,aAAQ,GAAG,IAAI,CAAC;QAChB,UAAK,GAAG,CAAC,CAAC;IAmEZ,CAAC;IAlEC,SAAS,CACP,KAAa,EACb,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,MAAe,EACf,QAAiB,EACjB,QAAiB,EACjB,QAAiB,EACjB,cAAgD,EAChD,WAAyB,EACzB,MAIY,EACZ,QAIY,EACZ,cAAuD;QAEvD,MAAM,EACJ,MAAM,GAAG,cAAc,CAAC,MAAM,EAC9B,gBAAgB,GAAI,cAAsB,CAAC,gBAAgB,EAC3D,gBAAgB,GAAI,cAAsB,CAAC,gBAAgB,EAK5D,GAAG,KAAK,CAAC,SAAgB,CAAC;QAE3B,IAAI,MAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,EAAE;YAClF,cAAc,CAAC,QAAQ,GAAG,KAAK,CAAC;SACjC;IA8BH,CAAC;CACF,CAAA;AAtEY,kCAAkC;IAD9C,UAAU,EAAE;GACA,kCAAkC,CAsE9C;SAtEY,kCAAkC;AAwExC,IAAM,iCAAiC,GAAvC,MAAM,iCAAiC;IAAvC;QACL,SAAI,GAA+B,0BAA0B,CAAC,eAAe,CAAC;QAC9E,aAAQ,GAAG,IAAI,CAAC;QAChB,UAAK,GAAG,CAAC,CAAC;IAkFZ,CAAC;IAjFC,SAAS,CACP,KAAa,EACb,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,MAAe,EACf,QAAiB,EACjB,QAAiB,EACjB,QAAiB,EACjB,cAAgD,EAChD,WAAyB,EACzB,MAIY,EACZ,QAIY;QAEZ,MAAM,EACJ,KAAK,GAAG,cAAc,CAAC,KAAK,EAC5B,MAAM,GAAG,cAAc,CAAC,MAAM,EAE9B,MAAM,GAAG,cAAc,CAAC,MAAM,EAC9B,gBAAgB,GAAI,cAAsB,CAAC,gBAAgB,EAC3D,gBAAgB,GAAI,cAAsB,CAAC,gBAAgB,EAE3D,SAAS,GAAG,cAAc,CAAC,SAAS,EACpC,WAAW,GAAG,cAAc,CAAC,MAAM,EAMpC,GAAG,KAAK,CAAC,SAAgB,CAAC;QAG3B,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,SAAS,KAAK,CAAC,CAAC,EAAE;YACpE,OAAO;SACR;QAED,IAAI,cAAc,CAAC;QACnB,IAAI,eAAe,CAAC;QACpB,IAAI,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE;YACtE,IACE,CAAC,OAAO,SAAS,KAAK,QAAQ,IAAI,SAAS,GAAG,CAAC,CAAC;gBAChD,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,EAC9E;gBACA,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;gBACxB,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;gBAExB,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,kBAAkB,CACvE,KAAK,EACL,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAChB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAClB,CAAC;gBACF,cAAc,GAAG,YAAY,CAAC;gBAC9B,eAAe,GAAG,aAAa,CAAC;aACjC;iBAAM;gBACL,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAClC,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACrC;YACD,YAAY,CACV,KAAK,EACL,OAAO,EACP,CAAC,EACD,CAAC,EACD,cAAc,EACd,MAAM,EACN,gBAAgB,IAAI,SAAS,EAC7B,gBAAgB,IAAI,WAAW,EAG/B,cAAc,EACd,eAAe,CAChB,CAAC;SACH;IACH,CAAC;CACF,CAAA;AArFY,iCAAiC;IAD7C,UAAU,EAAE;GACA,iCAAiC,CAqF7C;SArFY,iCAAiC;AA4F9C,MAAM,UAAU,YAAY,CAAC,UAA6B;IACxD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QAC9B,OAAO;YACL,WAAW,EAAE,KAAK;YAClB,KAAK,EAAE,UAAU;SAClB,CAAC;KACH;IAED,IAAI,IAAI,CAAC;IACT,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC1C,MAAM,KAAK,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QAC5B,IAAI,KAAK,EAAE;YACT,IAAI,CAAC,IAAI,EAAE;gBACT,IAAI,GAAG,KAAK,CAAC;aACd;iBAAM,IAAI,KAAK,KAAK,IAAI,EAAE;gBACzB,OAAO;oBACL,WAAW,EAAE,IAAI;iBAClB,CAAC;aACH;SACF;KACF;IAED,OAAO;QACL,WAAW,EAAE,KAAK;QAClB,KAAK,EAAE,IAAI;KACZ,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,YAAY,CAC1B,KAAa,EACb,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,cAAkF,EAClF,MAAsD,EACtD,gBAA8D,EAC9D,gBAA8D,EAC9D,KAAa,EACb,MAAc,EACd,WAAqB,EACrB,IAAuC;IAEvC,MAAM,SAAS,GAAG,YAAY,CAAC,gBAAgB,CAAC,CAAC;IACjD,MAAM,aAAa,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACvD,MAAM,YAAY,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAG5C,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACnC,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,SAAS,CAAC,WAAW,CAAC;IAE7E,OAAO,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC,EAAE,cAAc,CAAC,CAAC;IAKrE,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IACvC,IAAI,MAAM,GAAG,KAAK,CAAC;IACnB,IAAI,QAAQ,CAAC,MAAM,EAAE;QACnB,MAAM,GAAG,IAAI,CAAC;KACf;IAED,OAAO,CAAC,SAAS,EAAE,CAAC;IACpB,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAGrB,IAAI,CAAC,YAAY,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE;QAEzE,IAAI,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;YACpC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAC1C,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACzD,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC;SAC9B;aAAM;YACL,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACrB,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC;SAC9B;QACD,IAAI,WAAW,IAAI,MAAM,EAAE;YACzB,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,CAAC,CAAC,EAAE;gBAC3C,OAAO,CAAC,WAAW,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;aAC3C;iBAAM;gBACL,OAAO,CAAC,WAAW,GAAG,aAAa,CAAC;aACrC;YACD,IAAI,CAAC,aAAa,EAAE;gBAClB,OAAO,CAAC,SAAS,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;aACzC;YACD,OAAO,CAAC,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;YAC3E,OAAO,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC;SAC9B;KACF;SAAM;QACL,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC;KAC9B;IAED,IAAI,CAAC,YAAY,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE;QAEzE,IAAI,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;YACpC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACnD,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAClE,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC;SACvC;aAAM;YACL,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC;YAC7B,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC;SACvC;QACD,IAAI,WAAW,IAAI,MAAM,EAAE;YACzB,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,CAAC,CAAC,EAAE;gBAC3C,OAAO,CAAC,WAAW,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;aAC3C;iBAAM;gBACL,OAAO,CAAC,WAAW,GAAG,aAAa,CAAC;aACrC;YACD,IAAI,CAAC,aAAa,EAAE;gBAClB,OAAO,CAAC,SAAS,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;aACzC;YACD,OAAO,CAAC,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;YAC3E,OAAO,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC;SACvC;KACF;SAAM;QACL,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC;KACvC;IAED,IAAI,CAAC,YAAY,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE;QAEzE,IAAI,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;YACpC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC;YACnD,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC;YAClE,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC;SAC/B;aAAM;YACL,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC;YAC9B,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC;SACvC;QACD,IAAI,WAAW,IAAI,MAAM,EAAE;YACzB,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,CAAC,CAAC,EAAE;gBAC3C,OAAO,CAAC,WAAW,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;aAC3C;iBAAM;gBACL,OAAO,CAAC,WAAW,GAAG,aAAa,CAAC;aACrC;YACD,IAAI,CAAC,aAAa,EAAE;gBAClB,OAAO,CAAC,SAAS,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;aACzC;YACD,OAAO,CAAC,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;YAC3E,OAAO,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC;SAC/B;KACF;SAAM;QACL,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC;KAC/B;IAED,IAAI,CAAC,YAAY,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE;QAEzE,IAAI,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;YACpC,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3C,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1D,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;SACtB;aAAM;YACL,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACrB,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC;SAC/B;QACD,IAAI,WAAW,IAAI,MAAM,EAAE;YACzB,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,CAAC,CAAC,EAAE;gBAC3C,OAAO,CAAC,WAAW,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;aAC3C;iBAAM;gBACL,OAAO,CAAC,WAAW,GAAG,aAAa,CAAC;aACrC;YACD,IAAI,CAAC,aAAa,EAAE;gBAClB,OAAO,CAAC,SAAS,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;aACzC;YACD,OAAO,CAAC,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;YAC3E,OAAO,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;SACtB;KACF;SAAM;QACL,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;KACtB;IAED,IAAI,CAAC,WAAW,IAAI,CAAC,MAAM,EAAE;QAE3B,IAAI,CAAC,aAAa,IAAI,SAAS,CAAC,KAAK,EAAE;YACrC,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC;SACrC;QACD,OAAO,CAAC,MAAM,EAAE,CAAC;KAClB;AACH,CAAC;AAKM,IAAM,iCAAiC,GAAvC,MAAM,iCAAiC;IAAvC;QACL,SAAI,GAA+B,0BAA0B,CAAC,gBAAgB,CAAC;QAC/E,aAAQ,GAAG,IAAI,CAAC;QAChB,UAAK,GAAG,CAAC,CAAC;IAyCZ,CAAC;IAxCC,SAAS,CACP,KAAa,EACb,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,MAAe,EACf,QAAiB,EACjB,QAAiB,EACjB,QAAiB,EACjB,cAAgD,EAChD,WAAyB,EACzB,MAIY,EACZ,QAIY,EACZ,cAAuD;QAEvD,MAAM,EACJ,QAAQ,GAAG,cAAc,CAAC,QAAQ,EAClC,MAAM,GAAG,cAAc,CAAC,MAAM,EAC9B,gBAAgB,GAAI,cAAsB,CAAC,gBAAgB,EAC3D,gBAAgB,GAAI,cAAsB,CAAC,gBAAgB,EAC5D,GAAG,KAAK,CAAC,SAAgB,CAAC;QAE3B,IACE,MAAM;YACN,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;YACvB,QAAQ,CAAC,MAAM;YACf,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC;YAChC,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAChC;YACA,cAAc,CAAC,QAAQ,GAAG,KAAK,CAAC;SACjC;IACH,CAAC;CACF,CAAA;AA5CY,iCAAiC;IAD7C,UAAU,EAAE;GACA,iCAAiC,CA4C7C;SA5CY,iCAAiC;AA8CvC,IAAM,gCAAgC,GAAtC,MAAM,gCAAgC;IAAtC;QACL,SAAI,GAA+B,0BAA0B,CAAC,eAAe,CAAC;QAC9E,aAAQ,GAAG,IAAI,CAAC;QAChB,UAAK,GAAG,CAAC,CAAC;IA4FZ,CAAC;IA3FC,SAAS,CACP,KAAa,EACb,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,MAAe,EACf,QAAiB,EACjB,QAAiB,EACjB,QAAiB,EACjB,cAAgD,EAChD,WAAyB,EACzB,MAIY,EACZ,QAIY;QAEZ,MAAM,EACJ,QAAQ,GAAG,cAAc,CAAC,QAAQ,EAClC,MAAM,GAAG,cAAc,CAAC,MAAM,EAC9B,gBAAgB,GAAI,cAAsB,CAAC,gBAAgB,EAC3D,gBAAgB,GAAI,cAAsB,CAAC,gBAAgB,EAC3D,SAAS,GAAG,cAAc,CAAC,SAAS,EACrC,GAAG,KAAK,CAAC,SAAgB,CAAC;QAE3B,IACE,CAAC,MAAM;YACP,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAC;YAC7C,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC;YAC/B,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAC/B;YACA,OAAO;SACR;QAGD,IAAI,EAAE,KAAK,GAAG,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,SAAS,CAAC;QACvF,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzB,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAE3B,IAAI,cAAc,CAAC;QACnB,IAAI,eAAe,CAAC;QACpB,IAAI,SAAS,GAAG,CAAC,EAAE;YACjB,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;YACxB,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;YAExB,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,kBAAkB,CACvE,KAAK,EACL,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAChB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAClB,CAAC;YACF,cAAc,GAAG,YAAY,CAAC;YAC9B,eAAe,GAAG,aAAa,CAAC;SACjC;aAAM;YACL,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAClC,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACrC;QACD,OAAO,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC,EAAE,cAAc,CAAC,CAAC;QAGrE,OAAO,CAAC,SAAS,EAAE,CAAC;QACpB,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACrB,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,cAAc,EAAE,CAAC,CAAC,CAAC;QACtC,OAAO,CAAC,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;QAC3E,OAAO,CAAC,MAAM,EAAE,CAAC;QAGjB,OAAO,CAAC,SAAS,EAAE,CAAC;QACpB,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,cAAc,EAAE,CAAC,CAAC,CAAC;QACtC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,cAAc,EAAE,CAAC,GAAG,eAAe,CAAC,CAAC;QACxD,OAAO,CAAC,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;QAC3E,OAAO,CAAC,MAAM,EAAE,CAAC;QAGjB,OAAO,CAAC,SAAS,EAAE,CAAC;QACpB,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,CAAC;QACvC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,cAAc,EAAE,CAAC,GAAG,eAAe,CAAC,CAAC;QACxD,OAAO,CAAC,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;QAC3E,OAAO,CAAC,MAAM,EAAE,CAAC;QAGjB,OAAO,CAAC,SAAS,EAAE,CAAC;QACpB,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACrB,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,eAAe,CAAC,CAAC;QACvC,OAAO,CAAC,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;QAC3E,OAAO,CAAC,MAAM,EAAE,CAAC;IACnB,CAAC;CACF,CAAA;AA/FY,gCAAgC;IAD5C,UAAU,EAAE;GACA,gCAAgC,CA+F5C;SA/FY,gCAAgC;AAoGtC,IAAM,sCAAsC,GAA5C,MAAM,sCAAsC;IAA5C;QACL,SAAI,GAA+B,0BAA0B,CAAC,gBAAgB,CAAC;QAC/E,aAAQ,GAAG,IAAI,CAAC;QAChB,UAAK,GAAG,CAAC,CAAC;IA+CZ,CAAC;IA9CC,SAAS,CACP,KAAa,EACb,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,MAAe,EACf,QAAiB,EACjB,QAAiB,EACjB,QAAiB,EACjB,cAAgD,EAChD,WAAyB,EACzB,MAIY,EACZ,QAIY,EACZ,cAAuD;QAEvD,MAAM,EACJ,SAAS,GAAG,cAAc,CAAC,SAAS,EACpC,MAAM,GAAG,cAAc,CAAC,MAAM,EAC9B,QAAQ,GAAG,cAAc,CAAC,QAAQ,EAGlC,gBAAgB,GAAI,cAAsB,CAAC,gBAAgB,EAC3D,gBAAgB,GAAI,cAAsB,CAAC,gBAAgB,EAC3D,YAAY,EACb,GAAG,KAAK,CAAC,SAAgB,CAAC;QAE3B,IACE,YAAY,KAAK,IAAI;YACrB,MAAM;YACN,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;YACvB,CAAC,QAAQ,CAAC,MAAM;YAChB,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC;YAChC,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC;YAChC,SAAS,GAAG,CAAC,EACb;YACA,cAAc,CAAC,QAAQ,GAAG,KAAK,CAAC;SACjC;IACH,CAAC;CACF,CAAA;AAlDY,sCAAsC;IADlD,UAAU,EAAE;GACA,sCAAsC,CAkDlD;SAlDY,sCAAsC;AAqD5C,IAAM,qCAAqC,GAA3C,MAAM,qCAAqC;IAA3C;QACL,SAAI,GAA+B,0BAA0B,CAAC,eAAe,CAAC;QAC9E,aAAQ,GAAG,IAAI,CAAC;QAChB,UAAK,GAAG,CAAC,CAAC;IAqFZ,CAAC;IApFC,SAAS,CACP,KAAa,EACb,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,MAAe,EACf,QAAiB,EACjB,QAAiB,EACjB,QAAiB,EACjB,cAAgD,EAChD,WAAyB,EACzB,MAIY,EACZ,QAIY;QAEZ,MAAM,EACJ,SAAS,GAAG,cAAc,CAAC,SAAS,EACpC,MAAM,GAAG,cAAc,CAAC,MAAM,EAC9B,QAAQ,GAAG,cAAc,CAAC,QAAQ,EAClC,gBAAgB,GAAI,cAAsB,CAAC,gBAAgB,EAC3D,gBAAgB,GAAI,cAAsB,CAAC,gBAAgB,EAC3D,YAAY,EACZ,YAAY,GAAG,cAAc,CAAC,YAAY,EAC3C,GAAG,KAAK,CAAC,SAAgB,CAAC;QAE3B,MAAM,EAAE,KAAK,GAAG,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,SAAS,CAAC;QAIzF,IACE,YAAY,KAAK,IAAI;YACrB,MAAM;YACN,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;YACvB,CAAC,QAAQ,CAAC,MAAM;YAChB,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC;YAChC,CAAC,KAAK,CAAC,OAAO,CAAC,gBAAgB,CAAC;YAChC,SAAS,GAAG,CAAC,EACb;YAsBA,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,kBAAkB,CACvE,KAAK,EACL,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAChB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAClB,CAAC;YACF,OAAO,CAAC,SAAS,EAAE,CAAC;YACpB,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;YACxB,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;YACxB,IAAI,YAAY,EAAE;gBAEhB,cAAc,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,YAAY,EAAE,aAAa,EAAE,YAAY,CAAC,CAAC;aAC1E;iBAAM;gBACL,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;aACjD;YACD,OAAO,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC,EAAE,cAAc,CAAC,CAAC;YACrE,OAAO,CAAC,MAAM,EAAE,CAAC;SAClB;IACH,CAAC;CACF,CAAA;AAxFY,qCAAqC;IADjD,UAAU,EAAE;GACA,qCAAqC,CAwFjD;SAxFY,qCAAqC;AA2F3C,IAAM,wCAAwC,GAA9C,MAAM,wCAAwC;IAA9C;QACL,SAAI,GAA+B,0BAA0B,CAAC,gBAAgB,CAAC;QAC/E,aAAQ,GAAG,IAAI,CAAC;QAChB,UAAK,GAAG,CAAC,CAAC;IAmCZ,CAAC;IAlCC,SAAS,CACP,KAAa,EACb,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,MAAe,EACf,QAAiB,EACjB,QAAiB,EACjB,QAAiB,EACjB,cAAgD,EAChD,WAAyB,EACzB,MAIY,EACZ,QAIY,EACZ,cAAuD;QAGvD,IAAK,KAAe,CAAC,IAAI,KAAK,MAAM,EAAE;YACpC,MAAM,KAAK,GAAI,KAAK,CAAC,KAAa,CAAC,KAAqB,CAAC;YACzD,IAAI,KAAK,CAAC,YAAY,CAAC,gBAAgB,KAAK,gBAAgB,CAAC,SAAS,EAAE;gBACtE,MAAM,UAAU,GAAG,iBAAiB,CAAC,KAAc,EAAE,KAAK,CAAC,CAAC;gBAC5D,IAAI,UAAU,EAAE;oBACb,KAAK,CAAC,SAAiB,CAAC,gBAAgB,GAAG,UAAU,CAAC;iBACxD;aACF;SACF;IACH,CAAC;CACF,CAAA;AAtCY,wCAAwC;IADpD,UAAU,EAAE;GACA,wCAAwC,CAsCpD;SAtCY,wCAAwC;AAyC9C,IAAM,uCAAuC,GAA7C,MAAM,uCAAuC;IAA7C;QACL,SAAI,GAA+B,0BAA0B,CAAC,eAAe,CAAC;QAC9E,aAAQ,GAAG,IAAI,CAAC;QAChB,UAAK,GAAG,CAAC,CAAC;IAuCZ,CAAC;IAtCC,SAAS,CACP,KAAa,EACb,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,MAAe,EACf,QAAiB,EACjB,QAAiB,EACjB,QAAiB,EACjB,cAAgD,EAChD,WAAyB,EACzB,MAIY,EACZ,QAIY;QAGZ,IAAK,KAAK,CAAC,SAAiB,CAAC,gBAAgB,EAAE;YAC7C,IAAI,MAAM,EAAE;aAGX;iBAAM,IAAI,QAAQ,EAAE;gBACnB,MAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC;gBAEtC,KAAK,CAAC,SAAS,CAAC,IAAI,GAAI,KAAK,CAAC,SAAiB,CAAC,gBAAuB,CAAC;gBACxE,OAAO,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC,EAAE,cAAc,CAAC,CAAC;gBACrE,OAAO,CAAC,IAAI,EAAE,CAAC;gBACf,KAAK,CAAC,SAAS,CAAC,IAAI,GAAG,QAAQ,CAAC;gBAC/B,KAAK,CAAC,SAAiB,CAAC,gBAAgB,GAAG,SAAS,CAAC;aACvD;SACF;IACH,CAAC;CACF,CAAA;AA1CY,uCAAuC;IADnD,UAAU,EAAE;GACA,uCAAuC,CA0CnD;SA1CY,uCAAuC;AA6C7C,IAAM,qCAAqC,GAA3C,MAAM,qCAAqC;IAA3C;QACL,SAAI,GAA+B,0BAA0B,CAAC,gBAAgB,CAAC;QAC/E,aAAQ,GAAG,IAAI,CAAC;QAChB,UAAK,GAAG,CAAC,CAAC;IA0FZ,CAAC;IAzFC,SAAS,CACP,KAAa,EACb,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,MAAe,EACf,QAAiB,EACjB,QAAiB,EACjB,QAAiB,EACjB,cAAgD,EAChD,WAAyB,EACzB,MAIY,EACZ,QAIY,EACZ,cAAuD;;QAEvD,MAAM,KAAK,GAAI,KAAK,CAAC,KAAa,CAAC,KAAqB,CAAC;QACzD,IAAK,KAAe,CAAC,IAAI,KAAK,MAAM,EAAE;YACpC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAA,KAAK,CAAC,SAAS,CAAC,CAAC,mCAAI,CAAC,CAAC,GAAG,KAAK,CAAC,kBAAkB,EAAE,CAAC;YACjE,MAAM,CAAC,GAAG,CAAC,CAAC,MAAA,KAAK,CAAC,SAAS,CAAC,CAAC,mCAAI,CAAC,CAAC,GAAG,KAAK,CAAC,mBAAmB,EAAE,CAAC;YAClE,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,GAAG,KAAK,CAAC,kBAAkB,EAAE,GAAG,KAAK,CAAC,uBAAuB,EAAE,CAAC;YAC1G,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,KAAK,CAAC,mBAAmB,EAAE,GAAG,KAAK,CAAC,yBAAyB,EAAE,CAAC;YAC/G,OAAO,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;SACnC;aAAM,IAAK,KAAe,CAAC,IAAI,KAAK,YAAY,EAAE;YACjD,MAAM,CAAC,GAAG,CAAC,CAAC;YACZ,MAAM,CAAC,GAAG,CAAC,CAAC,MAAA,KAAK,CAAC,SAAS,CAAC,CAAC,mCAAI,CAAC,CAAC,GAAG,KAAK,CAAC,mBAAmB,EAAE,CAAC;YAClE,MAAM,KAAK,GAAG,KAAK,CAAC,kBAAkB,EAAE,CAAC;YACzC,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,KAAK,CAAC,mBAAmB,EAAE,GAAG,KAAK,CAAC,yBAAyB,EAAE,CAAC;YAC/G,OAAO,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;SACnC;aAAM,IAAK,KAAe,CAAC,IAAI,KAAK,YAAY,EAAE;YACjD,MAAM,CAAC,GAAG,CAAC,CAAC,MAAA,KAAK,CAAC,SAAS,CAAC,CAAC,mCAAI,CAAC,CAAC,GAAG,KAAK,CAAC,kBAAkB,EAAE,CAAC;YACjE,MAAM,CAAC,GAAG,CAAC,CAAC;YACZ,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,GAAG,KAAK,CAAC,kBAAkB,EAAE,GAAG,KAAK,CAAC,uBAAuB,EAAE,CAAC;YAC1G,MAAM,MAAM,GAAG,KAAK,CAAC,mBAAmB,EAAE,CAAC;YAC3C,OAAO,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;SACnC;aAAM,IAAK,KAAe,CAAC,IAAI,KAAK,cAAc,EAAE;YACnD,MAAM,CAAC,GAAG,CAAC,CAAC;YACZ,MAAM,CAAC,GAAG,CAAC,CAAC,MAAA,KAAK,CAAC,SAAS,CAAC,CAAC,mCAAI,CAAC,CAAC,GAAG,KAAK,CAAC,mBAAmB,EAAE,CAAC;YAClE,MAAM,KAAK,GAAG,KAAK,CAAC,uBAAuB,EAAE,CAAC;YAC9C,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,KAAK,CAAC,mBAAmB,EAAE,GAAG,KAAK,CAAC,yBAAyB,EAAE,CAAC;YAC/G,OAAO,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;SACnC;aAAM,IAAK,KAAe,CAAC,IAAI,KAAK,eAAe,EAAE;YACpD,MAAM,CAAC,GAAG,CAAC,CAAC,MAAA,KAAK,CAAC,SAAS,CAAC,CAAC,mCAAI,CAAC,CAAC,GAAG,KAAK,CAAC,kBAAkB,EAAE,CAAC;YACjE,MAAM,CAAC,GAAG,CAAC,CAAC;YACZ,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,GAAG,KAAK,CAAC,kBAAkB,EAAE,GAAG,KAAK,CAAC,uBAAuB,EAAE,CAAC;YAC1G,MAAM,MAAM,GAAG,KAAK,CAAC,yBAAyB,EAAE,CAAC;YACjD,OAAO,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;SACnC;aAAM,IAAK,KAAe,CAAC,IAAI,KAAK,eAAe,EAAE;YACpD,MAAM,CAAC,GAAG,CAAC,CAAC;YACZ,MAAM,CAAC,GAAG,CAAC,CAAC;YACZ,MAAM,KAAK,GAAG,KAAK,CAAC,kBAAkB,EAAE,CAAC;YACzC,MAAM,MAAM,GAAG,KAAK,CAAC,mBAAmB,EAAE,CAAC;YAC3C,OAAO,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;SACnC;aAAM,IAAK,KAAe,CAAC,IAAI,KAAK,yBAAyB,EAAE;YAC9D,MAAM,CAAC,GAAG,CAAC,CAAC;YACZ,MAAM,CAAC,GAAG,CAAC,CAAC;YACZ,MAAM,KAAK,GAAG,KAAK,CAAC,uBAAuB,EAAE,CAAC;YAC9C,MAAM,MAAM,GAAG,KAAK,CAAC,mBAAmB,EAAE,CAAC;YAC3C,OAAO,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;SACnC;aAAM,IAAK,KAAe,CAAC,IAAI,KAAK,4BAA4B,EAAE;YACjE,MAAM,CAAC,GAAG,CAAC,CAAC;YACZ,MAAM,CAAC,GAAG,CAAC,CAAC;YACZ,MAAM,KAAK,GAAG,KAAK,CAAC,uBAAuB,EAAE,CAAC;YAC9C,MAAM,MAAM,GAAG,KAAK,CAAC,yBAAyB,EAAE,CAAC;YACjD,OAAO,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;SACnC;aAAM,IAAK,KAAe,CAAC,IAAI,KAAK,2BAA2B,EAAE;YAChE,MAAM,CAAC,GAAG,CAAC,CAAC;YACZ,MAAM,CAAC,GAAG,CAAC,CAAC;YACZ,MAAM,KAAK,GAAG,KAAK,CAAC,kBAAkB,EAAE,CAAC;YACzC,MAAM,MAAM,GAAG,KAAK,CAAC,yBAAyB,EAAE,CAAC;YACjD,OAAO,CAAC,SAAS,EAAE,CAAC;YACpB,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;SACnC;IACH,CAAC;CACF,CAAA;AA7FY,qCAAqC;IADjD,UAAU,EAAE;GACA,qCAAqC,CA6FjD;SA7FY,qCAAqC;AA+F3C,IAAM,oCAAoC,GAA1C,MAAM,oCAAoC;IAA1C;QACL,SAAI,GAA+B,0BAA0B,CAAC,eAAe,CAAC;QAC9E,aAAQ,GAAG,IAAI,CAAC;QAChB,UAAK,GAAG,CAAC,CAAC;IA2BZ,CAAC;IA1BC,SAAS,CACP,KAAa,EACb,OAAmB,EACnB,CAAS,EACT,CAAS,EACT,MAAe,EACf,QAAiB,EACjB,QAAiB,EACjB,QAAiB,EACjB,cAAgD,EAChD,WAAyB,EACzB,MAIY,EACZ,QAIY;QAGZ,IAAK,KAAe,CAAC,IAAI,KAAK,MAAM,EAAE;SACrC;IACH,CAAC;CACF,CAAA;AA9BY,oCAAoC;IADhD,UAAU,EAAE;GACA,oCAAoC,CA8BhD;SA9BY,oCAAoC;AAgCjD,SAAS,kBAAkB,CAAC,KAAU,EAAE,KAAa,EAAE,MAAc;IACnE,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,KAAqB,CAAC;IAChD,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE;QACzB,IAAI,GAAG,GAAG,KAAK,CAAC,GAAa,CAAC;QAC9B,IAAI,GAAG,GAAG,KAAK,CAAC,GAAa,CAAC;QAC9B,MAAM,SAAS,GAAG,gBAAgB,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QACpD,IAAI,SAAS,EAAE;YACb,GAAG,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC;YACxB,GAAG,GAAG,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC;SACzB;QAED,IAAI,KAAK,IAAI,GAAG,KAAK,KAAK,CAAC,QAAQ,GAAG,CAAC,EAAE;YACvC,KAAK,IAAI,CAAC,CAAC;SACZ;aAAM,IAAI,KAAK,IAAI,GAAG,KAAK,KAAK,CAAC,cAAc,GAAG,CAAC,IAAI,KAAK,CAAC,UAAU,EAAE;YACxE,KAAK,IAAI,CAAC,CAAC;SACZ;QACD,IAAI,KAAK,IAAI,GAAG,KAAK,KAAK,CAAC,QAAQ,GAAG,CAAC,EAAE;YACvC,MAAM,IAAI,CAAC,CAAC;SACb;aAAM,IAAI,KAAK,IAAI,GAAG,KAAK,KAAK,CAAC,cAAc,GAAG,CAAC,IAAI,KAAK,CAAC,SAAS,EAAE;YACvE,MAAM,IAAI,CAAC,CAAC;SACb;KACF;SAAM,IAAI,KAAK,CAAC,IAAI,KAAK,eAAe,EAAE;QACzC,IAAI,KAAK,CAAC,UAAU,EAAE;YACpB,KAAK,IAAI,CAAC,CAAC;SACZ;QACD,IAAI,KAAK,CAAC,SAAS,EAAE;YACnB,MAAM,IAAI,CAAC,CAAC;SACb;KACF;IACD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;AAC3B,CAAC","file":"group-contribution-render.js","sourcesContent":["import type {\n  IGroup,\n  IContext2d,\n  IGroupGraphicAttribute,\n  IMarkAttribute,\n  IGraphicAttribute,\n  IThemeAttribute,\n  IGroupRenderContribution,\n  IDrawContext,\n  IRectGraphicAttribute\n} from './../../../vrender';\nimport { BaseRenderContributionTime, createRectPath, injectable } from './../../../vrender';\nimport type { Group } from '../group';\nimport { getCellHoverColor } from '../../../state/hover/is-cell-hover';\nimport type { BaseTableAPI } from '../../../ts-types/base-table';\nimport { getQuadProps } from '../../utils/padding';\nimport { getCellMergeInfo } from '../../utils/get-cell-merge';\nimport { InteractionState } from '../../../ts-types';\n\n// const highlightDash: number[] = [];\n\n// SplitGroupContribution处理分段渲染stroke\n// stroke/strokeArrayWidth/strokeArrayColor 为数组时调用\n@injectable()\nexport class SplitGroupBeforeRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    const {\n      stroke = groupAttribute.stroke,\n      strokeArrayWidth = (groupAttribute as any).strokeArrayWidth,\n      strokeArrayColor = (groupAttribute as any).strokeArrayColor\n      // highlightStroke = (groupAttribute as any).highlightStroke,\n      // highlightStrokeArrayWidth = (groupAttribute as any).highlightStrokeArrayWidth,\n      // width = groupAttribute.width,\n      // height = groupAttribute.height,\n    } = group.attribute as any;\n\n    if (stroke && (Array.isArray(strokeArrayWidth) || Array.isArray(strokeArrayColor))) {\n      doFillOrStroke.doStroke = false;\n    }\n\n    // if (highlightStroke) {\n    //   // 依据highlightStroke信息调整clip范围，以实现在单个单元格显示highlight border\n    //   let xDist = x;\n    //   let yDist = y;\n    //   let widthDist = width;\n    //   let heightDist = height;\n    //   if (highlightStroke[0] && highlightStrokeArrayWidth[0]) {\n    //     // top\n    //     yDist -= highlightStrokeArrayWidth[0] / 2;\n    //     heightDist += highlightStrokeArrayWidth[0] / 2;\n    //   }\n    //   if (highlightStroke[1] && highlightStrokeArrayWidth[1]) {\n    //     // right\n    //     widthDist += highlightStrokeArrayWidth[1] / 2;\n    //   }\n    //   if (highlightStroke[2] && highlightStrokeArrayWidth[2]) {\n    //     // bottom\n    //     heightDist += highlightStrokeArrayWidth[2] / 2;\n    //   }\n    //   if (highlightStroke[3] && highlightStrokeArrayWidth[3]) {\n    //     // left\n    //     xDist -= highlightStrokeArrayWidth[3] / 2;\n    //     widthDist += highlightStrokeArrayWidth[3] / 2;\n    //   }\n\n    //   context.beginPath();\n    //   context.rect(xDist, yDist, widthDist, heightDist);\n    // }\n  }\n}\n@injectable()\nexport class SplitGroupAfterRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    const {\n      width = groupAttribute.width,\n      height = groupAttribute.height,\n      // 基础border\n      stroke = groupAttribute.stroke,\n      strokeArrayColor = (groupAttribute as any).strokeArrayColor,\n      strokeArrayWidth = (groupAttribute as any).strokeArrayWidth,\n\n      lineWidth = groupAttribute.lineWidth,\n      strokeColor = groupAttribute.stroke\n      // // select & hover border\n      // highlightStroke = (groupAttribute as any).highlightStroke,\n      // highlightStrokeArrayColor = (groupAttribute as any).highlightStrokeArrayColor,\n      // highlightStrokeArrayWidth = (groupAttribute as any).highlightStrokeArrayWidth,\n      // highlightStrokeArrayPart = (groupAttribute as any).highlightStrokeArrayPart,\n    } = group.attribute as any;\n\n    // lineWidth === 0 不绘制\n    if (!stroke || (!Array.isArray(strokeArrayWidth) && lineWidth === 0)) {\n      return;\n    }\n\n    let widthForStroke;\n    let heightForStroke;\n    if (Array.isArray(strokeArrayColor) || Array.isArray(strokeArrayWidth)) {\n      if (\n        (typeof lineWidth === 'number' && lineWidth & 1) ||\n        (Array.isArray(strokeArrayWidth) && strokeArrayWidth.some(width => width & 1))\n      ) {\n        x = Math.floor(x) + 0.5;\n        y = Math.floor(y) + 0.5;\n\n        const { width: widthFroDraw, height: heightFroDraw } = getCellSizeForDraw(\n          group,\n          Math.ceil(width),\n          Math.ceil(height)\n        );\n        widthForStroke = widthFroDraw;\n        heightForStroke = heightFroDraw;\n      } else {\n        widthForStroke = Math.ceil(width);\n        heightForStroke = Math.ceil(height);\n      }\n      renderStroke(\n        group,\n        context,\n        x,\n        y,\n        groupAttribute,\n        stroke,\n        strokeArrayWidth || lineWidth,\n        strokeArrayColor || strokeColor,\n        // Math.ceil(width),\n        // Math.ceil(height)\n        widthForStroke,\n        heightForStroke\n      );\n    }\n  }\n}\n\n/**\n * @description: 判断线宽是否需要分别渲染（线宽不同）\n * @param {number} widthArray\n * @return {*}\n */\nexport function getWidthInfo(widthArray: number[] | number) {\n  if (!Array.isArray(widthArray)) {\n    return {\n      isSplitDraw: false,\n      width: widthArray\n    };\n  }\n\n  let temp;\n  for (let i = 0; i < widthArray.length; i++) {\n    const width = widthArray[i];\n    if (width) {\n      if (!temp) {\n        temp = width;\n      } else if (width !== temp) {\n        return {\n          isSplitDraw: true\n        };\n      }\n    }\n  }\n\n  return {\n    isSplitDraw: false,\n    width: temp\n  };\n}\n\nexport function renderStroke(\n  group: IGroup,\n  context: IContext2d,\n  x: number,\n  y: number,\n  groupAttribute: Required<IGroupGraphicAttribute> | Required<IRectGraphicAttribute>,\n  stroke: boolean | [boolean, boolean, boolean, boolean],\n  strokeArrayWidth: [number, number, number, number] | undefined,\n  strokeArrayColor: [string, string, string, string] | undefined,\n  width: number,\n  height: number,\n  isHighlight?: boolean,\n  part?: ([number, number] | undefined)[]\n) {\n  const widthInfo = getWidthInfo(strokeArrayWidth);\n  const isWidthNumber = !Array.isArray(strokeArrayWidth);\n  const isStrokeTrue = !Array.isArray(stroke);\n  // 渲染部分线段，part: [[0, 0.5], undifined, undifined, undifined]\n  // 同样上右下左，范围0-1，[0, 0.5]即只渲染前一半\n  const isPart = Array.isArray(part);\n  const isSplitDraw = Array.isArray(strokeArrayColor) || widthInfo.isSplitDraw;\n\n  context.setStrokeStyle(group, group.attribute, x, y, groupAttribute);\n  // if (isHighlight) {\n  //   context.setLineDash(highlightDash);\n  //   context.lineCap = 'square';\n  // }\n  const lineDash = context.getLineDash();\n  let isDash = false;\n  if (lineDash.length) {\n    isDash = true;\n  }\n  // 单独处理每条边界，目前不考虑圆角\n  context.beginPath();\n  context.moveTo(x, y);\n\n  // top\n  if ((isStrokeTrue || stroke[0]) && (isWidthNumber || strokeArrayWidth[0])) {\n    // context.lineTo(x + width, y);\n    if (isPart && Array.isArray(part[0])) {\n      context.moveTo(x + width * part[0][0], y);\n      context.lineTo(x + width * (part[0][1] - part[0][0]), y);\n      context.moveTo(x + width, y);\n    } else {\n      context.moveTo(x, y);\n      context.lineTo(x + width, y);\n    }\n    if (isSplitDraw || isDash) {\n      if (strokeArrayColor && strokeArrayColor[0]) {\n        context.strokeStyle = strokeArrayColor[0];\n      } else {\n        context.strokeStyle = 'transparent';\n      }\n      if (!isWidthNumber) {\n        context.lineWidth = strokeArrayWidth[0];\n      }\n      context.lineDashOffset = context.currentMatrix.e / context.currentMatrix.a;\n      context.stroke();\n      context.beginPath();\n      context.moveTo(x + width, y);\n    }\n  } else {\n    context.moveTo(x + width, y);\n  }\n  // right\n  if ((isStrokeTrue || stroke[1]) && (isWidthNumber || strokeArrayWidth[1])) {\n    // context.lineTo(x + width, y + height);\n    if (isPart && Array.isArray(part[1])) {\n      context.moveTo(x + width, y + height * part[1][0]);\n      context.lineTo(x + width, y + height * (part[1][1] - part[1][0]));\n      context.moveTo(x + width, y + height);\n    } else {\n      context.moveTo(x + width, y);\n      context.lineTo(x + width, y + height);\n    }\n    if (isSplitDraw || isDash) {\n      if (strokeArrayColor && strokeArrayColor[1]) {\n        context.strokeStyle = strokeArrayColor[1];\n      } else {\n        context.strokeStyle = 'transparent';\n      }\n      if (!isWidthNumber) {\n        context.lineWidth = strokeArrayWidth[1];\n      }\n      context.lineDashOffset = context.currentMatrix.f / context.currentMatrix.d;\n      context.stroke();\n      context.beginPath();\n      context.moveTo(x + width, y + height);\n    }\n  } else {\n    context.moveTo(x + width, y + height);\n  }\n  // bottom\n  if ((isStrokeTrue || stroke[2]) && (isWidthNumber || strokeArrayWidth[2])) {\n    // context.lineTo(x, y + height);\n    if (isPart && Array.isArray(part[2])) {\n      context.moveTo(x + width * part[2][0], y + height);\n      context.lineTo(x + width * (part[2][1] - part[2][0]), y + height);\n      context.moveTo(x, y + height);\n    } else {\n      context.moveTo(x, y + height);\n      context.lineTo(x + width, y + height);\n    }\n    if (isSplitDraw || isDash) {\n      if (strokeArrayColor && strokeArrayColor[2]) {\n        context.strokeStyle = strokeArrayColor[2];\n      } else {\n        context.strokeStyle = 'transparent';\n      }\n      if (!isWidthNumber) {\n        context.lineWidth = strokeArrayWidth[2];\n      }\n      context.lineDashOffset = context.currentMatrix.e / context.currentMatrix.a;\n      context.stroke();\n      context.beginPath();\n      context.moveTo(x, y + height);\n    }\n  } else {\n    context.moveTo(x, y + height);\n  }\n  // left\n  if ((isStrokeTrue || stroke[3]) && (isWidthNumber || strokeArrayWidth[3])) {\n    // context.lineTo(x, y);\n    if (isPart && Array.isArray(part[3])) {\n      context.moveTo(x, y + height * part[3][0]);\n      context.lineTo(x, y + height * (part[3][1] - part[3][0]));\n      context.moveTo(x, y);\n    } else {\n      context.moveTo(x, y);\n      context.lineTo(x, y + height);\n    }\n    if (isSplitDraw || isDash) {\n      if (strokeArrayColor && strokeArrayColor[3]) {\n        context.strokeStyle = strokeArrayColor[3];\n      } else {\n        context.strokeStyle = 'transparent';\n      }\n      if (!isWidthNumber) {\n        context.lineWidth = strokeArrayWidth[3];\n      }\n      context.lineDashOffset = context.currentMatrix.f / context.currentMatrix.d;\n      context.stroke();\n      context.beginPath();\n      context.moveTo(x, y);\n    }\n  } else {\n    context.moveTo(x, y);\n  }\n\n  if (!isSplitDraw && !isDash) {\n    // context.strokeStyle = strokeArrayColor;\n    if (!isWidthNumber && widthInfo.width) {\n      context.lineWidth = widthInfo.width;\n    }\n    context.stroke();\n  }\n}\n\n// DashGroupContribution处理虚线边框对齐\n// lineDash 为非空数组时调用\n@injectable()\nexport class DashGroupBeforeRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    const {\n      lineDash = groupAttribute.lineDash,\n      stroke = groupAttribute.stroke,\n      strokeArrayColor = (groupAttribute as any).strokeArrayColor,\n      strokeArrayWidth = (groupAttribute as any).strokeArrayWidth\n    } = group.attribute as any;\n\n    if (\n      stroke &&\n      Array.isArray(lineDash) &&\n      lineDash.length &&\n      !Array.isArray(strokeArrayColor) &&\n      !Array.isArray(strokeArrayWidth)\n    ) {\n      doFillOrStroke.doStroke = false;\n    }\n  }\n}\n@injectable()\nexport class DashGroupAfterRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    const {\n      lineDash = groupAttribute.lineDash,\n      stroke = groupAttribute.stroke,\n      strokeArrayColor = (groupAttribute as any).strokeArrayColor,\n      strokeArrayWidth = (groupAttribute as any).strokeArrayWidth,\n      lineWidth = groupAttribute.lineWidth\n    } = group.attribute as any;\n\n    if (\n      !stroke ||\n      !(Array.isArray(lineDash) && lineDash.length) ||\n      Array.isArray(strokeArrayColor) ||\n      Array.isArray(strokeArrayWidth)\n    ) {\n      return;\n    }\n\n    // const { width = groupAttribute.width, height = groupAttribute.height } = group.attribute;\n    let { width = groupAttribute.width, height = groupAttribute.height } = group.attribute;\n    width = Math.ceil(width);\n    height = Math.ceil(height);\n\n    let widthForStroke;\n    let heightForStroke;\n    if (lineWidth & 1) {\n      x = Math.floor(x) + 0.5;\n      y = Math.floor(y) + 0.5;\n\n      const { width: widthFroDraw, height: heightFroDraw } = getCellSizeForDraw(\n        group,\n        Math.ceil(width),\n        Math.ceil(height)\n      );\n      widthForStroke = widthFroDraw;\n      heightForStroke = heightFroDraw;\n    } else {\n      widthForStroke = Math.ceil(width);\n      heightForStroke = Math.ceil(height);\n    }\n    context.setStrokeStyle(group, group.attribute, x, y, groupAttribute);\n    // 分段设置lineDashOffset，实现虚线边框对齐\n    // top\n    context.beginPath();\n    context.moveTo(x, y);\n    context.lineTo(x + widthForStroke, y);\n    context.lineDashOffset = context.currentMatrix.e / context.currentMatrix.a;\n    context.stroke();\n\n    // right\n    context.beginPath();\n    context.moveTo(x + widthForStroke, y);\n    context.lineTo(x + widthForStroke, y + heightForStroke);\n    context.lineDashOffset = context.currentMatrix.f / context.currentMatrix.d;\n    context.stroke();\n\n    // bottom\n    context.beginPath();\n    context.moveTo(x, y + heightForStroke);\n    context.lineTo(x + widthForStroke, y + heightForStroke);\n    context.lineDashOffset = context.currentMatrix.e / context.currentMatrix.a;\n    context.stroke();\n\n    // left\n    context.beginPath();\n    context.moveTo(x, y);\n    context.lineTo(x, y + heightForStroke);\n    context.lineDashOffset = context.currentMatrix.f / context.currentMatrix.d;\n    context.stroke();\n  }\n}\n\n// AdjustPosGroupContribution处理线宽为奇数时stroke位置偏移0.5px\n// lineWidth 为奇数时调用\n@injectable()\nexport class AdjustPosGroupBeforeRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    const {\n      lineWidth = groupAttribute.lineWidth,\n      stroke = groupAttribute.stroke,\n      lineDash = groupAttribute.lineDash,\n      // width = groupAttribute.width,\n      // height = groupAttribute.height,\n      strokeArrayWidth = (groupAttribute as any).strokeArrayWidth,\n      strokeArrayColor = (groupAttribute as any).strokeArrayColor,\n      notAdjustPos\n    } = group.attribute as any;\n\n    if (\n      notAdjustPos !== true && // 不需要调整位置\n      stroke &&\n      Array.isArray(lineDash) &&\n      !lineDash.length && // 非虚线\n      !Array.isArray(strokeArrayColor) &&\n      !Array.isArray(strokeArrayWidth) &&\n      lineWidth & 1 // 奇数线宽\n    ) {\n      doFillOrStroke.doStroke = false;\n    }\n  }\n}\n\n@injectable()\nexport class AdjustPosGroupAfterRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    const {\n      lineWidth = groupAttribute.lineWidth,\n      stroke = groupAttribute.stroke,\n      lineDash = groupAttribute.lineDash,\n      strokeArrayWidth = (groupAttribute as any).strokeArrayWidth,\n      strokeArrayColor = (groupAttribute as any).strokeArrayColor,\n      notAdjustPos,\n      cornerRadius = groupAttribute.cornerRadius\n    } = group.attribute as any;\n\n    const { width = groupAttribute.width, height = groupAttribute.height } = group.attribute;\n    // width = Math.ceil(width);\n    // height = Math.ceil(height);\n\n    if (\n      notAdjustPos !== true && // 不需要调整位置\n      stroke &&\n      Array.isArray(lineDash) &&\n      !lineDash.length && // 非虚线\n      !Array.isArray(strokeArrayColor) &&\n      !Array.isArray(strokeArrayWidth) &&\n      lineWidth & 1 // 奇数线宽\n    ) {\n      // if (group.role === 'cell') {\n      //   const table = (group.stage as any).table as BaseTableAPI;\n      //   let col = (group as any).col as number;\n      //   let row = (group as any).row as number;\n      //   const mergeInfo = getCellMergeInfo(table, col, row);\n      //   if (mergeInfo) {\n      //     col = mergeInfo.end.col;\n      //     row = mergeInfo.end.row;\n      //   }\n\n      //   if (table && col === table.colCount - 1) {\n      //     width -= 1;\n      //   } else if (table && col === table.frozenColCount - 1 && table.scrollLeft) {\n      //     width -= 1;\n      //   }\n      //   if (table && row === table.rowCount - 1) {\n      //     height -= 1;\n      //   } else if (table && row === table.frozenRowCount - 1 && table.scrollTop) {\n      //     height -= 1;\n      //   }\n      // }\n      const { width: widthFroDraw, height: heightFroDraw } = getCellSizeForDraw(\n        group,\n        Math.ceil(width),\n        Math.ceil(height)\n      );\n      context.beginPath();\n      x = Math.floor(x) + 0.5;\n      y = Math.floor(y) + 0.5;\n      if (cornerRadius) {\n        // 测试后，cache对于重绘性能提升不大，但是在首屏有一定性能损耗，因此rect不再使用cache\n        createRectPath(context, x, y, widthFroDraw, heightFroDraw, cornerRadius);\n      } else {\n        context.rect(x, y, widthFroDraw, heightFroDraw);\n      }\n      context.setStrokeStyle(group, group.attribute, x, y, groupAttribute);\n      context.stroke();\n    }\n  }\n}\n\n@injectable()\nexport class AdjustColorGroupBeforeRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    // 处理hover颜色\n    if ((group as Group).role === 'cell') {\n      const table = (group.stage as any).table as BaseTableAPI;\n      if (table.stateManager.interactionState !== InteractionState.scrolling) {\n        const hoverColor = getCellHoverColor(group as Group, table);\n        if (hoverColor) {\n          (group.attribute as any)._vtableHoverFill = hoverColor;\n        }\n      }\n    }\n  }\n}\n\n@injectable()\nexport class AdjustColorGroupAfterRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    // 处理hover颜色\n    if ((group.attribute as any)._vtableHoverFill) {\n      if (fillCb) {\n        // do nothing\n        // fillCb(context, group.attribute, groupAttribute);\n      } else if (fVisible) {\n        const oldColor = group.attribute.fill;\n        // draw hover fill\n        group.attribute.fill = (group.attribute as any)._vtableHoverFill as any;\n        context.setCommonStyle(group, group.attribute, x, y, groupAttribute);\n        context.fill();\n        group.attribute.fill = oldColor;\n        (group.attribute as any)._vtableHoverFill = undefined;\n      }\n    }\n  }\n}\n\n@injectable()\nexport class ClipBodyGroupBeforeRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    const table = (group.stage as any).table as BaseTableAPI;\n    if ((group as Group).role === 'body') {\n      const x = -(group.attribute.x ?? 0) + table.getFrozenColsWidth();\n      const y = -(group.attribute.y ?? 0) + table.getFrozenRowsHeight();\n      const width = group.parent.attribute.width - table.getFrozenColsWidth() - table.getRightFrozenColsWidth();\n      const height = group.parent.attribute.height - table.getFrozenRowsHeight() - table.getBottomFrozenRowsHeight();\n      context.beginPath();\n      context.rect(x, y, width, height);\n    } else if ((group as Group).role === 'row-header') {\n      const x = 0;\n      const y = -(group.attribute.y ?? 0) + table.getFrozenRowsHeight();\n      const width = table.getFrozenColsWidth();\n      const height = group.parent.attribute.height - table.getFrozenRowsHeight() - table.getBottomFrozenRowsHeight();\n      context.beginPath();\n      context.rect(x, y, width, height);\n    } else if ((group as Group).role === 'col-header') {\n      const x = -(group.attribute.x ?? 0) + table.getFrozenColsWidth();\n      const y = 0;\n      const width = group.parent.attribute.width - table.getFrozenColsWidth() - table.getRightFrozenColsWidth();\n      const height = table.getFrozenRowsHeight();\n      context.beginPath();\n      context.rect(x, y, width, height);\n    } else if ((group as Group).role === 'right-frozen') {\n      const x = 0;\n      const y = -(group.attribute.y ?? 0) + table.getFrozenRowsHeight();\n      const width = table.getRightFrozenColsWidth();\n      const height = group.parent.attribute.height - table.getFrozenRowsHeight() - table.getBottomFrozenRowsHeight();\n      context.beginPath();\n      context.rect(x, y, width, height);\n    } else if ((group as Group).role === 'bottom-frozen') {\n      const x = -(group.attribute.x ?? 0) + table.getFrozenColsWidth();\n      const y = 0;\n      const width = group.parent.attribute.width - table.getFrozenColsWidth() - table.getRightFrozenColsWidth();\n      const height = table.getBottomFrozenRowsHeight();\n      context.beginPath();\n      context.rect(x, y, width, height);\n    } else if ((group as Group).role === 'corner-header') {\n      const x = 0;\n      const y = 0;\n      const width = table.getFrozenColsWidth();\n      const height = table.getFrozenRowsHeight();\n      context.beginPath();\n      context.rect(x, y, width, height);\n    } else if ((group as Group).role === 'corner-right-top-header') {\n      const x = 0;\n      const y = 0;\n      const width = table.getRightFrozenColsWidth();\n      const height = table.getFrozenRowsHeight();\n      context.beginPath();\n      context.rect(x, y, width, height);\n    } else if ((group as Group).role === 'corner-right-bottom-header') {\n      const x = 0;\n      const y = 0;\n      const width = table.getRightFrozenColsWidth();\n      const height = table.getBottomFrozenRowsHeight();\n      context.beginPath();\n      context.rect(x, y, width, height);\n    } else if ((group as Group).role === 'corner-left-bottom-header') {\n      const x = 0;\n      const y = 0;\n      const width = table.getFrozenColsWidth();\n      const height = table.getBottomFrozenRowsHeight();\n      context.beginPath();\n      context.rect(x, y, width, height);\n    }\n  }\n}\n@injectable()\nexport class ClipBodyGroupAfterRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    // 处理hover颜色\n    if ((group as Group).role === 'body') {\n    }\n  }\n}\n\nfunction getCellSizeForDraw(group: any, width: number, height: number) {\n  const table = group.stage.table as BaseTableAPI;\n  if (group.role === 'cell') {\n    let col = group.col as number;\n    let row = group.row as number;\n    const mergeInfo = getCellMergeInfo(table, col, row);\n    if (mergeInfo) {\n      col = mergeInfo.end.col;\n      row = mergeInfo.end.row;\n    }\n\n    if (table && col === table.colCount - 1) {\n      width -= 1;\n    } else if (table && col === table.frozenColCount - 1 && table.scrollLeft) {\n      width -= 1;\n    }\n    if (table && row === table.rowCount - 1) {\n      height -= 1;\n    } else if (table && row === table.frozenRowCount - 1 && table.scrollTop) {\n      height -= 1;\n    }\n  } else if (group.role === 'corner-frozen') {\n    if (table.scrollLeft) {\n      width -= 1;\n    }\n    if (table.scrollTop) {\n      height -= 1;\n    }\n  }\n  return { width, height };\n}\n"]}
+{"version":3,"sources":["../src/scenegraph/graphic/contributions/group-contribution-render.ts"],"names":[],"mappings":"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","file":"group-contribution-render.js","sourcesContent":["import type {\n  IGroup,\n  IContext2d,\n  IGroupGraphicAttribute,\n  IMarkAttribute,\n  IGraphicAttribute,\n  IThemeAttribute,\n  IGroupRenderContribution,\n  IDrawContext,\n  IRectGraphicAttribute\n} from './../../../vrender';\nimport { BaseRenderContributionTime, createRectPath, injectable } from './../../../vrender';\nimport type { Group } from '../group';\nimport { getCellHoverColor } from '../../../state/hover/is-cell-hover';\nimport type { BaseTableAPI } from '../../../ts-types/base-table';\nimport { getQuadProps } from '../../utils/padding';\nimport { getCellMergeInfo } from '../../utils/get-cell-merge';\nimport { InteractionState } from '../../../ts-types';\n\n// const highlightDash: number[] = [];\n\n// SplitGroupContribution处理分段渲染stroke\n// stroke/strokeArrayWidth/strokeArrayColor 为数组时调用\n@injectable()\nexport class SplitGroupBeforeRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    const {\n      stroke = groupAttribute.stroke,\n      strokeArrayWidth = (groupAttribute as any).strokeArrayWidth,\n      strokeArrayColor = (groupAttribute as any).strokeArrayColor\n      // highlightStroke = (groupAttribute as any).highlightStroke,\n      // highlightStrokeArrayWidth = (groupAttribute as any).highlightStrokeArrayWidth,\n      // width = groupAttribute.width,\n      // height = groupAttribute.height,\n    } = group.attribute as any;\n\n    if (stroke && (Array.isArray(strokeArrayWidth) || Array.isArray(strokeArrayColor))) {\n      doFillOrStroke.doStroke = false;\n    }\n\n    // if (highlightStroke) {\n    //   // 依据highlightStroke信息调整clip范围，以实现在单个单元格显示highlight border\n    //   let xDist = x;\n    //   let yDist = y;\n    //   let widthDist = width;\n    //   let heightDist = height;\n    //   if (highlightStroke[0] && highlightStrokeArrayWidth[0]) {\n    //     // top\n    //     yDist -= highlightStrokeArrayWidth[0] / 2;\n    //     heightDist += highlightStrokeArrayWidth[0] / 2;\n    //   }\n    //   if (highlightStroke[1] && highlightStrokeArrayWidth[1]) {\n    //     // right\n    //     widthDist += highlightStrokeArrayWidth[1] / 2;\n    //   }\n    //   if (highlightStroke[2] && highlightStrokeArrayWidth[2]) {\n    //     // bottom\n    //     heightDist += highlightStrokeArrayWidth[2] / 2;\n    //   }\n    //   if (highlightStroke[3] && highlightStrokeArrayWidth[3]) {\n    //     // left\n    //     xDist -= highlightStrokeArrayWidth[3] / 2;\n    //     widthDist += highlightStrokeArrayWidth[3] / 2;\n    //   }\n\n    //   context.beginPath();\n    //   context.rect(xDist, yDist, widthDist, heightDist);\n    // }\n  }\n}\n@injectable()\nexport class SplitGroupAfterRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    const {\n      width = groupAttribute.width,\n      height = groupAttribute.height,\n      // 基础border\n      stroke = groupAttribute.stroke,\n      strokeArrayColor = (groupAttribute as any).strokeArrayColor,\n      strokeArrayWidth = (groupAttribute as any).strokeArrayWidth,\n\n      lineWidth = groupAttribute.lineWidth,\n      strokeColor = groupAttribute.stroke\n      // // select & hover border\n      // highlightStroke = (groupAttribute as any).highlightStroke,\n      // highlightStrokeArrayColor = (groupAttribute as any).highlightStrokeArrayColor,\n      // highlightStrokeArrayWidth = (groupAttribute as any).highlightStrokeArrayWidth,\n      // highlightStrokeArrayPart = (groupAttribute as any).highlightStrokeArrayPart,\n    } = group.attribute as any;\n\n    // lineWidth === 0 不绘制\n    if (!stroke || (!Array.isArray(strokeArrayWidth) && lineWidth === 0)) {\n      return;\n    }\n\n    let widthForStroke;\n    let heightForStroke;\n    if (Array.isArray(strokeArrayColor) || Array.isArray(strokeArrayWidth)) {\n      if (\n        (typeof lineWidth === 'number' && lineWidth & 1) ||\n        (Array.isArray(strokeArrayWidth) && strokeArrayWidth.some(width => width & 1))\n      ) {\n        const table = (group.stage as any).table as BaseTableAPI;\n        const bottomRight = table.theme.cellBorderClipDirection === 'bottom-right';\n        let deltaWidth = 0;\n        let deltaHeight = 0;\n        if (bottomRight) {\n          x = Math.floor(x) - 0.5;\n          y = Math.floor(y) - 0.5;\n          if (group.role === 'cell') {\n            const col = (group as any).col as number;\n            const row = (group as any).row as number;\n            if (table && col === table.colCount - 1) {\n              deltaWidth = 1;\n            }\n            if (table && row === table.rowCount - 1) {\n              deltaHeight = 1;\n            }\n          }\n        } else {\n          x = Math.floor(x) + 0.5;\n          y = Math.floor(y) + 0.5;\n        }\n\n        const { width: widthFroDraw, height: heightFroDraw } = getCellSizeForDraw(\n          group,\n          Math.ceil(width + deltaWidth),\n          Math.ceil(height + deltaHeight)\n        );\n        widthForStroke = widthFroDraw;\n        heightForStroke = heightFroDraw;\n      } else {\n        widthForStroke = Math.ceil(width);\n        heightForStroke = Math.ceil(height);\n      }\n      renderStroke(\n        group,\n        context,\n        x,\n        y,\n        groupAttribute,\n        stroke,\n        strokeArrayWidth || lineWidth,\n        strokeArrayColor || strokeColor,\n        // Math.ceil(width),\n        // Math.ceil(height)\n        widthForStroke,\n        heightForStroke\n      );\n    }\n  }\n}\n\n/**\n * @description: 判断线宽是否需要分别渲染（线宽不同）\n * @param {number} widthArray\n * @return {*}\n */\nexport function getWidthInfo(widthArray: number[] | number) {\n  if (!Array.isArray(widthArray)) {\n    return {\n      isSplitDraw: false,\n      width: widthArray\n    };\n  }\n\n  let temp;\n  for (let i = 0; i < widthArray.length; i++) {\n    const width = widthArray[i];\n    if (width) {\n      if (!temp) {\n        temp = width;\n      } else if (width !== temp) {\n        return {\n          isSplitDraw: true\n        };\n      }\n    }\n  }\n\n  return {\n    isSplitDraw: false,\n    width: temp\n  };\n}\n\nexport function renderStroke(\n  group: IGroup,\n  context: IContext2d,\n  x: number,\n  y: number,\n  groupAttribute: Required<IGroupGraphicAttribute> | Required<IRectGraphicAttribute>,\n  stroke: boolean | [boolean, boolean, boolean, boolean],\n  strokeArrayWidth: [number, number, number, number] | undefined,\n  strokeArrayColor: [string, string, string, string] | undefined,\n  width: number,\n  height: number,\n  isHighlight?: boolean,\n  part?: ([number, number] | undefined)[]\n) {\n  const widthInfo = getWidthInfo(strokeArrayWidth);\n  const isWidthNumber = !Array.isArray(strokeArrayWidth);\n  const isStrokeTrue = !Array.isArray(stroke);\n  // 渲染部分线段，part: [[0, 0.5], undifined, undifined, undifined]\n  // 同样上右下左，范围0-1，[0, 0.5]即只渲染前一半\n  const isPart = Array.isArray(part);\n  const isSplitDraw = Array.isArray(strokeArrayColor) || widthInfo.isSplitDraw;\n\n  context.setStrokeStyle(group, group.attribute, x, y, groupAttribute);\n  // if (isHighlight) {\n  //   context.setLineDash(highlightDash);\n  //   context.lineCap = 'square';\n  // }\n  const lineDash = context.getLineDash();\n  let isDash = false;\n  if (lineDash.length) {\n    isDash = true;\n  }\n  // 单独处理每条边界，目前不考虑圆角\n  context.beginPath();\n  context.moveTo(x, y);\n\n  // top\n  if ((isStrokeTrue || stroke[0]) && (isWidthNumber || strokeArrayWidth[0])) {\n    // context.lineTo(x + width, y);\n    if (isPart && Array.isArray(part[0])) {\n      context.moveTo(x + width * part[0][0], y);\n      context.lineTo(x + width * (part[0][1] - part[0][0]), y);\n      context.moveTo(x + width, y);\n    } else {\n      context.moveTo(x, y);\n      context.lineTo(x + width, y);\n    }\n    if (isSplitDraw || isDash) {\n      if (strokeArrayColor && strokeArrayColor[0]) {\n        context.strokeStyle = strokeArrayColor[0];\n      } else {\n        context.strokeStyle = 'transparent';\n      }\n      if (!isWidthNumber) {\n        context.lineWidth = strokeArrayWidth[0];\n      }\n      context.lineDashOffset = context.currentMatrix.e / context.currentMatrix.a;\n      context.stroke();\n      context.beginPath();\n      context.moveTo(x + width, y);\n    }\n  } else {\n    context.moveTo(x + width, y);\n  }\n  // right\n  if ((isStrokeTrue || stroke[1]) && (isWidthNumber || strokeArrayWidth[1])) {\n    // context.lineTo(x + width, y + height);\n    if (isPart && Array.isArray(part[1])) {\n      context.moveTo(x + width, y + height * part[1][0]);\n      context.lineTo(x + width, y + height * (part[1][1] - part[1][0]));\n      context.moveTo(x + width, y + height);\n    } else {\n      context.moveTo(x + width, y);\n      context.lineTo(x + width, y + height);\n    }\n    if (isSplitDraw || isDash) {\n      if (strokeArrayColor && strokeArrayColor[1]) {\n        context.strokeStyle = strokeArrayColor[1];\n      } else {\n        context.strokeStyle = 'transparent';\n      }\n      if (!isWidthNumber) {\n        context.lineWidth = strokeArrayWidth[1];\n      }\n      context.lineDashOffset = context.currentMatrix.f / context.currentMatrix.d;\n      context.stroke();\n      context.beginPath();\n      context.moveTo(x + width, y + height);\n    }\n  } else {\n    context.moveTo(x + width, y + height);\n  }\n  // bottom\n  if ((isStrokeTrue || stroke[2]) && (isWidthNumber || strokeArrayWidth[2])) {\n    // context.lineTo(x, y + height);\n    if (isPart && Array.isArray(part[2])) {\n      context.moveTo(x + width * part[2][0], y + height);\n      context.lineTo(x + width * (part[2][1] - part[2][0]), y + height);\n      context.moveTo(x, y + height);\n    } else {\n      context.moveTo(x, y + height);\n      context.lineTo(x + width, y + height);\n    }\n    if (isSplitDraw || isDash) {\n      if (strokeArrayColor && strokeArrayColor[2]) {\n        context.strokeStyle = strokeArrayColor[2];\n      } else {\n        context.strokeStyle = 'transparent';\n      }\n      if (!isWidthNumber) {\n        context.lineWidth = strokeArrayWidth[2];\n      }\n      context.lineDashOffset = context.currentMatrix.e / context.currentMatrix.a;\n      context.stroke();\n      context.beginPath();\n      context.moveTo(x, y + height);\n    }\n  } else {\n    context.moveTo(x, y + height);\n  }\n  // left\n  if ((isStrokeTrue || stroke[3]) && (isWidthNumber || strokeArrayWidth[3])) {\n    // context.lineTo(x, y);\n    if (isPart && Array.isArray(part[3])) {\n      context.moveTo(x, y + height * part[3][0]);\n      context.lineTo(x, y + height * (part[3][1] - part[3][0]));\n      context.moveTo(x, y);\n    } else {\n      context.moveTo(x, y);\n      context.lineTo(x, y + height);\n    }\n    if (isSplitDraw || isDash) {\n      if (strokeArrayColor && strokeArrayColor[3]) {\n        context.strokeStyle = strokeArrayColor[3];\n      } else {\n        context.strokeStyle = 'transparent';\n      }\n      if (!isWidthNumber) {\n        context.lineWidth = strokeArrayWidth[3];\n      }\n      context.lineDashOffset = context.currentMatrix.f / context.currentMatrix.d;\n      context.stroke();\n      context.beginPath();\n      context.moveTo(x, y);\n    }\n  } else {\n    context.moveTo(x, y);\n  }\n\n  if (!isSplitDraw && !isDash) {\n    // context.strokeStyle = strokeArrayColor;\n    if (!isWidthNumber && widthInfo.width) {\n      context.lineWidth = widthInfo.width;\n    }\n    context.stroke();\n  }\n  context.lineDashOffset = 0;\n}\n\n// DashGroupContribution处理虚线边框对齐\n// lineDash 为非空数组时调用\n@injectable()\nexport class DashGroupBeforeRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    const {\n      lineDash = groupAttribute.lineDash,\n      stroke = groupAttribute.stroke,\n      strokeArrayColor = (groupAttribute as any).strokeArrayColor,\n      strokeArrayWidth = (groupAttribute as any).strokeArrayWidth\n    } = group.attribute as any;\n\n    if (\n      stroke &&\n      Array.isArray(lineDash) &&\n      lineDash.length &&\n      !Array.isArray(strokeArrayColor) &&\n      !Array.isArray(strokeArrayWidth)\n    ) {\n      doFillOrStroke.doStroke = false;\n    }\n  }\n}\n@injectable()\nexport class DashGroupAfterRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    const {\n      lineDash = groupAttribute.lineDash,\n      stroke = groupAttribute.stroke,\n      strokeArrayColor = (groupAttribute as any).strokeArrayColor,\n      strokeArrayWidth = (groupAttribute as any).strokeArrayWidth,\n      lineWidth = groupAttribute.lineWidth\n    } = group.attribute as any;\n\n    if (\n      !stroke ||\n      !(Array.isArray(lineDash) && lineDash.length) ||\n      Array.isArray(strokeArrayColor) ||\n      Array.isArray(strokeArrayWidth)\n    ) {\n      return;\n    }\n\n    // const { width = groupAttribute.width, height = groupAttribute.height } = group.attribute;\n    let { width = groupAttribute.width, height = groupAttribute.height } = group.attribute;\n    width = Math.ceil(width);\n    height = Math.ceil(height);\n\n    let widthForStroke;\n    let heightForStroke;\n    if (lineWidth & 1) {\n      const table = (group.stage as any).table as BaseTableAPI;\n      const bottomRight = table.theme.cellBorderClipDirection === 'bottom-right';\n      let deltaWidth = 0;\n      let deltaHeight = 0;\n      if (bottomRight) {\n        x = Math.floor(x) - 0.5;\n        y = Math.floor(y) - 0.5;\n        if (group.role === 'cell') {\n          const col = (group as any).col as number;\n          const row = (group as any).row as number;\n          if (table && col === table.colCount - 1) {\n            deltaWidth = 1;\n          }\n          if (table && row === table.rowCount - 1) {\n            deltaHeight = 1;\n          }\n        }\n      } else {\n        x = Math.floor(x) + 0.5;\n        y = Math.floor(y) + 0.5;\n      }\n\n      const { width: widthFroDraw, height: heightFroDraw } = getCellSizeForDraw(\n        group,\n        Math.ceil(width + deltaWidth),\n        Math.ceil(height + deltaHeight)\n      );\n      widthForStroke = widthFroDraw;\n      heightForStroke = heightFroDraw;\n    } else {\n      widthForStroke = Math.ceil(width);\n      heightForStroke = Math.ceil(height);\n    }\n    context.setStrokeStyle(group, group.attribute, x, y, groupAttribute);\n    // 分段设置lineDashOffset，实现虚线边框对齐\n    // top\n    context.beginPath();\n    context.moveTo(x, y);\n    context.lineTo(x + widthForStroke, y);\n    context.lineDashOffset = context.currentMatrix.e / context.currentMatrix.a;\n    context.stroke();\n\n    // right\n    context.beginPath();\n    context.moveTo(x + widthForStroke, y);\n    context.lineTo(x + widthForStroke, y + heightForStroke);\n    context.lineDashOffset = context.currentMatrix.f / context.currentMatrix.d;\n    context.stroke();\n\n    // bottom\n    context.beginPath();\n    context.moveTo(x, y + heightForStroke);\n    context.lineTo(x + widthForStroke, y + heightForStroke);\n    context.lineDashOffset = context.currentMatrix.e / context.currentMatrix.a;\n    context.stroke();\n\n    // left\n    context.beginPath();\n    context.moveTo(x, y);\n    context.lineTo(x, y + heightForStroke);\n    context.lineDashOffset = context.currentMatrix.f / context.currentMatrix.d;\n    context.stroke();\n  }\n}\n\n// AdjustPosGroupContribution处理线宽为奇数时stroke位置偏移0.5px\n// lineWidth 为奇数时调用\n@injectable()\nexport class AdjustPosGroupBeforeRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    const {\n      lineWidth = groupAttribute.lineWidth,\n      stroke = groupAttribute.stroke,\n      lineDash = groupAttribute.lineDash,\n      // width = groupAttribute.width,\n      // height = groupAttribute.height,\n      strokeArrayWidth = (groupAttribute as any).strokeArrayWidth,\n      strokeArrayColor = (groupAttribute as any).strokeArrayColor,\n      notAdjustPos\n    } = group.attribute as any;\n\n    if (\n      notAdjustPos !== true && // 不需要调整位置\n      stroke &&\n      Array.isArray(lineDash) &&\n      !lineDash.length && // 非虚线\n      !Array.isArray(strokeArrayColor) &&\n      !Array.isArray(strokeArrayWidth) &&\n      lineWidth & 1 // 奇数线宽\n    ) {\n      doFillOrStroke.doStroke = false;\n    }\n  }\n}\n\n@injectable()\nexport class AdjustPosGroupAfterRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    const {\n      lineWidth = groupAttribute.lineWidth,\n      stroke = groupAttribute.stroke,\n      lineDash = groupAttribute.lineDash,\n      strokeArrayWidth = (groupAttribute as any).strokeArrayWidth,\n      strokeArrayColor = (groupAttribute as any).strokeArrayColor,\n      notAdjustPos,\n      cornerRadius = groupAttribute.cornerRadius\n    } = group.attribute as any;\n\n    const { width = groupAttribute.width, height = groupAttribute.height } = group.attribute;\n    // width = Math.ceil(width);\n    // height = Math.ceil(height);\n\n    if (\n      notAdjustPos !== true && // 不需要调整位置\n      stroke &&\n      Array.isArray(lineDash) &&\n      !lineDash.length && // 非虚线\n      !Array.isArray(strokeArrayColor) &&\n      !Array.isArray(strokeArrayWidth) &&\n      lineWidth & 1 // 奇数线宽\n    ) {\n      // if (group.role === 'cell') {\n      //   const table = (group.stage as any).table as BaseTableAPI;\n      //   let col = (group as any).col as number;\n      //   let row = (group as any).row as number;\n      //   const mergeInfo = getCellMergeInfo(table, col, row);\n      //   if (mergeInfo) {\n      //     col = mergeInfo.end.col;\n      //     row = mergeInfo.end.row;\n      //   }\n\n      //   if (table && col === table.colCount - 1) {\n      //     width -= 1;\n      //   } else if (table && col === table.frozenColCount - 1 && table.scrollLeft) {\n      //     width -= 1;\n      //   }\n      //   if (table && row === table.rowCount - 1) {\n      //     height -= 1;\n      //   } else if (table && row === table.frozenRowCount - 1 && table.scrollTop) {\n      //     height -= 1;\n      //   }\n      // }\n      const { width: widthFroDraw, height: heightFroDraw } = getCellSizeForDraw(\n        group,\n        Math.ceil(width),\n        Math.ceil(height)\n      );\n      context.beginPath();\n      const table = (group.stage as any).table as BaseTableAPI;\n      const bottomRight = table.theme.cellBorderClipDirection === 'bottom-right';\n      let deltaWidth = 0;\n      let deltaHeight = 0;\n      if (bottomRight) {\n        x = Math.floor(x) - 0.5;\n        y = Math.floor(y) - 0.5;\n        if (group.role === 'cell') {\n          const col = (group as any).col as number;\n          const row = (group as any).row as number;\n          if (table && col === table.colCount - 1) {\n            deltaWidth = 1;\n          }\n          if (table && row === table.rowCount - 1) {\n            deltaHeight = 1;\n          }\n        }\n      } else {\n        x = Math.floor(x) + 0.5;\n        y = Math.floor(y) + 0.5;\n      }\n\n      if (cornerRadius) {\n        // 测试后，cache对于重绘性能提升不大，但是在首屏有一定性能损耗，因此rect不再使用cache\n        createRectPath(context, x, y, widthFroDraw + deltaWidth, heightFroDraw + deltaHeight, cornerRadius);\n      } else {\n        context.rect(x, y, widthFroDraw, heightFroDraw);\n      }\n      context.setStrokeStyle(group, group.attribute, x, y, groupAttribute);\n      context.stroke();\n    }\n  }\n}\n\n@injectable()\nexport class AdjustColorGroupBeforeRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    // 处理hover颜色\n    if ((group as Group).role === 'cell') {\n      const table = (group.stage as any).table as BaseTableAPI;\n      if (table.stateManager.interactionState !== InteractionState.scrolling) {\n        const hoverColor = getCellHoverColor(group as Group, table);\n        if (hoverColor) {\n          (group.attribute as any)._vtableHoverFill = hoverColor;\n        }\n      }\n    }\n  }\n}\n\n@injectable()\nexport class AdjustColorGroupAfterRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    // 处理hover颜色\n    if ((group.attribute as any)._vtableHoverFill) {\n      if (fillCb) {\n        // do nothing\n        // fillCb(context, group.attribute, groupAttribute);\n      } else if (fVisible) {\n        const oldColor = group.attribute.fill;\n        // draw hover fill\n        group.attribute.fill = (group.attribute as any)._vtableHoverFill as any;\n        context.setCommonStyle(group, group.attribute, x, y, groupAttribute);\n        context.fill();\n        group.attribute.fill = oldColor;\n        (group.attribute as any)._vtableHoverFill = undefined;\n      }\n    }\n  }\n}\n\n@injectable()\nexport class ClipBodyGroupBeforeRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    const table = (group.stage as any).table as BaseTableAPI;\n    if ((group as Group).role === 'body') {\n      const x = -(group.attribute.x ?? 0) + table.getFrozenColsWidth();\n      const y = -(group.attribute.y ?? 0) + table.getFrozenRowsHeight();\n      const width = group.parent.attribute.width - table.getFrozenColsWidth() - table.getRightFrozenColsWidth();\n      const height = group.parent.attribute.height - table.getFrozenRowsHeight() - table.getBottomFrozenRowsHeight();\n      context.beginPath();\n      context.rect(x, y, width, height);\n    } else if ((group as Group).role === 'row-header') {\n      const x = 0;\n      const y = -(group.attribute.y ?? 0) + table.getFrozenRowsHeight();\n      const width = table.getFrozenColsWidth();\n      const height = group.parent.attribute.height - table.getFrozenRowsHeight() - table.getBottomFrozenRowsHeight();\n      context.beginPath();\n      context.rect(x, y, width, height);\n    } else if ((group as Group).role === 'col-header') {\n      const x = -(group.attribute.x ?? 0) + table.getFrozenColsWidth();\n      const y = 0;\n      const width = group.parent.attribute.width - table.getFrozenColsWidth() - table.getRightFrozenColsWidth();\n      const height = table.getFrozenRowsHeight();\n      context.beginPath();\n      context.rect(x, y, width, height);\n    } else if ((group as Group).role === 'right-frozen') {\n      const x = 0;\n      const y = -(group.attribute.y ?? 0) + table.getFrozenRowsHeight();\n      const width = table.getRightFrozenColsWidth();\n      const height = group.parent.attribute.height - table.getFrozenRowsHeight() - table.getBottomFrozenRowsHeight();\n      context.beginPath();\n      context.rect(x, y, width, height);\n    } else if ((group as Group).role === 'bottom-frozen') {\n      const x = -(group.attribute.x ?? 0) + table.getFrozenColsWidth();\n      const y = 0;\n      const width = group.parent.attribute.width - table.getFrozenColsWidth() - table.getRightFrozenColsWidth();\n      const height = table.getBottomFrozenRowsHeight();\n      context.beginPath();\n      context.rect(x, y, width, height);\n    } else if ((group as Group).role === 'corner-header') {\n      const x = 0;\n      const y = 0;\n      const width = table.getFrozenColsWidth();\n      const height = table.getFrozenRowsHeight();\n      context.beginPath();\n      context.rect(x, y, width, height);\n    } else if ((group as Group).role === 'corner-right-top-header') {\n      const x = 0;\n      const y = 0;\n      const width = table.getRightFrozenColsWidth();\n      const height = table.getFrozenRowsHeight();\n      context.beginPath();\n      context.rect(x, y, width, height);\n    } else if ((group as Group).role === 'corner-right-bottom-header') {\n      const x = 0;\n      const y = 0;\n      const width = table.getRightFrozenColsWidth();\n      const height = table.getBottomFrozenRowsHeight();\n      context.beginPath();\n      context.rect(x, y, width, height);\n    } else if ((group as Group).role === 'corner-left-bottom-header') {\n      const x = 0;\n      const y = 0;\n      const width = table.getFrozenColsWidth();\n      const height = table.getBottomFrozenRowsHeight();\n      context.beginPath();\n      context.rect(x, y, width, height);\n    }\n  }\n}\n@injectable()\nexport class ClipBodyGroupAfterRenderContribution implements IGroupRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle = true;\n  order = 0;\n  drawShape(\n    group: IGroup,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    groupAttribute: Required<IGroupGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    // 处理hover颜色\n    if ((group as Group).role === 'body') {\n    }\n  }\n}\n\nfunction getCellSizeForDraw(group: any, width: number, height: number) {\n  const table = group.stage.table as BaseTableAPI;\n  if (group.role === 'cell') {\n    let col = group.col as number;\n    let row = group.row as number;\n    const mergeInfo = getCellMergeInfo(table, col, row);\n    if (mergeInfo) {\n      col = mergeInfo.end.col;\n      row = mergeInfo.end.row;\n    }\n\n    if (table && col === table.colCount - 1) {\n      width -= 1;\n    } else if (table && col === table.frozenColCount - 1 && table.scrollLeft) {\n      width -= 1;\n    }\n    if (table && row === table.rowCount - 1) {\n      height -= 1;\n    } else if (table && row === table.frozenRowCount - 1 && table.scrollTop) {\n      height -= 1;\n    }\n  } else if (group.role === 'corner-frozen') {\n    if (table.scrollLeft) {\n      width -= 1;\n    }\n    if (table.scrollTop) {\n      height -= 1;\n    }\n  }\n  return { width, height };\n}\n"]}

package/es/scenegraph/graphic/contributions/rect-contribution-render.js

@@ -28,8 +28,15 @@ let SplitRectAfterRenderContribution = class {
     }
     drawShape(rect, context, x, y, doFill, doStroke, fVisible, sVisible, rectAttribute, drawContext, fillCb, strokeCb) {
         const {width: width = rectAttribute.width, height: height = rectAttribute.height, stroke: stroke = rectAttribute.stroke, strokeArrayColor: strokeArrayColor = rectAttribute.strokeArrayColor, strokeArrayWidth: strokeArrayWidth = rectAttribute.strokeArrayWidth, lineWidth: lineWidth = rectAttribute.lineWidth, strokeColor: strokeColor = rectAttribute.stroke} = rect.attribute;
-        stroke && (Array.isArray(strokeArrayWidth) || 0 !== lineWidth) && (Array.isArray(stroke) || Array.isArray(strokeArrayColor) || Array.isArray(strokeArrayWidth)) && ("border-rect" !== rect.name && "table-border-rect" !== rect.name && ("number" == typeof lineWidth && 1 & lineWidth || Array.isArray(strokeArrayWidth) && strokeArrayWidth.some((width => 1 & width))) && (x = Math.floor(x) + .5, 
-        y = Math.floor(y) + .5), renderStroke(rect, context, x, y, rectAttribute, stroke, strokeArrayWidth || lineWidth, strokeArrayColor || strokeColor, Math.ceil(width), Math.ceil(height)));
+        if (stroke && (Array.isArray(strokeArrayWidth) || 0 !== lineWidth) && (Array.isArray(stroke) || Array.isArray(strokeArrayColor) || Array.isArray(strokeArrayWidth))) {
+            let deltaWidth = 0, deltaHeight = 0;
+            if ("number" == typeof lineWidth && 1 & lineWidth || Array.isArray(strokeArrayWidth) && strokeArrayWidth.some((width => 1 & width))) {
+                "bottom-right" === rect.stage.table.theme.cellBorderClipDirection ? (x = Math.floor(x) - .5, 
+                y = Math.floor(y) - .5, deltaWidth = .5, deltaHeight = .5) : (x = Math.floor(x) + .5, 
+                y = Math.floor(y) + .5);
+            }
+            renderStroke(rect, context, x, y, rectAttribute, stroke, strokeArrayWidth || lineWidth, strokeArrayColor || strokeColor, Math.ceil(width + deltaWidth), Math.ceil(height + deltaHeight));
+        }
     }
 };
 

package/es/scenegraph/graphic/contributions/rect-contribution-render.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/scenegraph/graphic/contributions/rect-contribution-render.ts"],"names":[],"mappings":"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","file":"rect-contribution-render.js","sourcesContent":["import type {\n  IRect,\n  IContext2d,\n  IRectGraphicAttribute,\n  IMarkAttribute,\n  IGraphicAttribute,\n  IThemeAttribute,\n  IRectRenderContribution,\n  IGroup,\n  IGroupGraphicAttribute,\n  IDrawContext\n} from './../../../vrender';\nimport { BaseRenderContributionTime, injectable } from './../../../vrender';\nimport { renderStroke } from './group-contribution-render';\n\n@injectable()\nexport class SplitRectBeforeRenderContribution implements IRectRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    rect: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    rectAttribute: Required<IRectGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    // const { stroke = rectAttribute.stroke } = group.attribute as any;\n\n    // if (Array.isArray(stroke)) {\n    //   doFillOrStroke.doStroke = false;\n    // }\n\n    const {\n      stroke = rectAttribute.stroke,\n      strokeArrayWidth = (rectAttribute as any).strokeArrayWidth,\n      strokeArrayColor = (rectAttribute as any).strokeArrayColor\n    } = rect.attribute as any;\n\n    if (stroke && (Array.isArray(stroke) || Array.isArray(strokeArrayWidth) || Array.isArray(strokeArrayColor))) {\n      doFillOrStroke.doStroke = false;\n    }\n  }\n}\n\n@injectable()\nexport class SplitRectAfterRenderContribution implements IRectRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    rect: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    rectAttribute: Required<IRectGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    // const {\n    //   width = rectAttribute.width,\n    //   height = rectAttribute.height,\n    //   stroke = rectAttribute.stroke\n    // } = group.attribute as any;\n\n    // if (!Array.isArray(stroke)) {\n    //   return;\n    // }\n\n    // context.setStrokeStyle(group, group.attribute, x, y, rectAttribute);\n    // // 单独处理每条边界，目前不考虑圆角\n    // context.beginPath();\n    // context.moveTo(x, y);\n    // // top\n    // if (stroke[0]) {\n    //   context.lineTo(x + width, y);\n    // } else {\n    //   context.moveTo(x + width, y);\n    // }\n    // // right\n    // if (stroke[1]) {\n    //   context.lineTo(x + width, y + height);\n    // } else {\n    //   context.moveTo(x + width, y + height);\n    // }\n    // // bottom\n    // if (stroke[2]) {\n    //   context.lineTo(x, y + height);\n    // } else {\n    //   context.moveTo(x, y + height);\n    // }\n    // // left\n    // if (stroke[3]) {\n    //   // 没有close path是，起点和终点不连续，需要调整y保证不出现缺口\n    //   const adjustY = stroke[0] ? y - context.lineWidth / 2 : y;\n    //   context.lineTo(x, adjustY);\n    // } else {\n    //   context.moveTo(x, y);\n    // }\n\n    // context.stroke();\n\n    const {\n      width = rectAttribute.width,\n      height = rectAttribute.height,\n      // 基础border\n      stroke = rectAttribute.stroke,\n      strokeArrayColor = (rectAttribute as any).strokeArrayColor,\n      strokeArrayWidth = (rectAttribute as any).strokeArrayWidth,\n\n      lineWidth = rectAttribute.lineWidth,\n      strokeColor = rectAttribute.stroke\n      // // select & hover border\n      // highlightStroke = (rectAttribute as any).highlightStroke,\n      // highlightStrokeArrayColor = (rectAttribute as any).highlightStrokeArrayColor,\n      // highlightStrokeArrayWidth = (rectAttribute as any).highlightStrokeArrayWidth,\n      // highlightStrokeArrayPart = (rectAttribute as any).highlightStrokeArrayPart,\n    } = rect.attribute as any;\n\n    if (!stroke || (!Array.isArray(strokeArrayWidth) && lineWidth === 0)) {\n      return;\n    }\n\n    if (Array.isArray(stroke) || Array.isArray(strokeArrayColor) || Array.isArray(strokeArrayWidth)) {\n      // let dx = 0;\n      // let dy = 0;\n      if (\n        rect.name !== 'border-rect' && // border-rect not need offset\n        rect.name !== 'table-border-rect' && // table-border-rect not need offset\n        ((typeof lineWidth === 'number' && lineWidth & 1) ||\n          (Array.isArray(strokeArrayWidth) && strokeArrayWidth.some(width => width & 1)))\n      ) {\n        x = Math.floor(x) + 0.5;\n        y = Math.floor(y) + 0.5;\n      }\n      renderStroke(\n        rect as IGroup,\n        context,\n        x,\n        y,\n        rectAttribute,\n        stroke,\n        strokeArrayWidth || lineWidth,\n        strokeArrayColor || strokeColor,\n        Math.ceil(width),\n        Math.ceil(height)\n      );\n    }\n  }\n}\n\n// 判断是否为整数，如果是整数，需要偏移0.5px\nfunction isInteger(num: number) {\n  return num % 1 === 0;\n}\n"]}
+{"version":3,"sources":["../src/scenegraph/graphic/contributions/rect-contribution-render.ts"],"names":[],"mappings":"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","file":"rect-contribution-render.js","sourcesContent":["import type {\n  IRect,\n  IContext2d,\n  IRectGraphicAttribute,\n  IMarkAttribute,\n  IGraphicAttribute,\n  IThemeAttribute,\n  IRectRenderContribution,\n  IGroup,\n  IGroupGraphicAttribute,\n  IDrawContext\n} from './../../../vrender';\nimport { BaseRenderContributionTime, injectable } from './../../../vrender';\nimport { renderStroke } from './group-contribution-render';\nimport type { BaseTableAPI } from '../../../ts-types/base-table';\n\n@injectable()\nexport class SplitRectBeforeRenderContribution implements IRectRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.beforeFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    rect: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    rectAttribute: Required<IRectGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    doFillOrStroke?: { doFill: boolean; doStroke: boolean }\n  ) {\n    // const { stroke = rectAttribute.stroke } = group.attribute as any;\n\n    // if (Array.isArray(stroke)) {\n    //   doFillOrStroke.doStroke = false;\n    // }\n\n    const {\n      stroke = rectAttribute.stroke,\n      strokeArrayWidth = (rectAttribute as any).strokeArrayWidth,\n      strokeArrayColor = (rectAttribute as any).strokeArrayColor\n    } = rect.attribute as any;\n\n    if (stroke && (Array.isArray(stroke) || Array.isArray(strokeArrayWidth) || Array.isArray(strokeArrayColor))) {\n      doFillOrStroke.doStroke = false;\n    }\n  }\n}\n\n@injectable()\nexport class SplitRectAfterRenderContribution implements IRectRenderContribution {\n  time: BaseRenderContributionTime = BaseRenderContributionTime.afterFillStroke;\n  useStyle: boolean = true;\n  order: number = 0;\n  drawShape(\n    rect: IRect,\n    context: IContext2d,\n    x: number,\n    y: number,\n    doFill: boolean,\n    doStroke: boolean,\n    fVisible: boolean,\n    sVisible: boolean,\n    rectAttribute: Required<IRectGraphicAttribute>,\n    drawContext: IDrawContext,\n    fillCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean,\n    strokeCb?: (\n      ctx: IContext2d,\n      markAttribute: Partial<IMarkAttribute & IGraphicAttribute>,\n      themeAttribute: IThemeAttribute\n    ) => boolean\n  ) {\n    // const {\n    //   width = rectAttribute.width,\n    //   height = rectAttribute.height,\n    //   stroke = rectAttribute.stroke\n    // } = group.attribute as any;\n\n    // if (!Array.isArray(stroke)) {\n    //   return;\n    // }\n\n    // context.setStrokeStyle(group, group.attribute, x, y, rectAttribute);\n    // // 单独处理每条边界，目前不考虑圆角\n    // context.beginPath();\n    // context.moveTo(x, y);\n    // // top\n    // if (stroke[0]) {\n    //   context.lineTo(x + width, y);\n    // } else {\n    //   context.moveTo(x + width, y);\n    // }\n    // // right\n    // if (stroke[1]) {\n    //   context.lineTo(x + width, y + height);\n    // } else {\n    //   context.moveTo(x + width, y + height);\n    // }\n    // // bottom\n    // if (stroke[2]) {\n    //   context.lineTo(x, y + height);\n    // } else {\n    //   context.moveTo(x, y + height);\n    // }\n    // // left\n    // if (stroke[3]) {\n    //   // 没有close path是，起点和终点不连续，需要调整y保证不出现缺口\n    //   const adjustY = stroke[0] ? y - context.lineWidth / 2 : y;\n    //   context.lineTo(x, adjustY);\n    // } else {\n    //   context.moveTo(x, y);\n    // }\n\n    // context.stroke();\n\n    const {\n      width = rectAttribute.width,\n      height = rectAttribute.height,\n      // 基础border\n      stroke = rectAttribute.stroke,\n      strokeArrayColor = (rectAttribute as any).strokeArrayColor,\n      strokeArrayWidth = (rectAttribute as any).strokeArrayWidth,\n\n      lineWidth = rectAttribute.lineWidth,\n      strokeColor = rectAttribute.stroke\n      // // select & hover border\n      // highlightStroke = (rectAttribute as any).highlightStroke,\n      // highlightStrokeArrayColor = (rectAttribute as any).highlightStrokeArrayColor,\n      // highlightStrokeArrayWidth = (rectAttribute as any).highlightStrokeArrayWidth,\n      // highlightStrokeArrayPart = (rectAttribute as any).highlightStrokeArrayPart,\n    } = rect.attribute as any;\n\n    if (!stroke || (!Array.isArray(strokeArrayWidth) && lineWidth === 0)) {\n      return;\n    }\n\n    if (Array.isArray(stroke) || Array.isArray(strokeArrayColor) || Array.isArray(strokeArrayWidth)) {\n      // let dx = 0;\n      // let dy = 0;\n      let deltaWidth = 0;\n      let deltaHeight = 0;\n      if (\n        // rect.name !== 'border-rect' && // border-rect not need offset\n        // rect.name !== 'table-border-rect' && // table-border-rect not need offset\n        (typeof lineWidth === 'number' && lineWidth & 1) ||\n        (Array.isArray(strokeArrayWidth) && strokeArrayWidth.some(width => width & 1))\n      ) {\n        const table = (rect.stage as any).table as BaseTableAPI;\n        const bottomRight = table.theme.cellBorderClipDirection === 'bottom-right';\n        if (bottomRight) {\n          x = Math.floor(x) - 0.5;\n          y = Math.floor(y) - 0.5;\n          deltaWidth = 0.5;\n          deltaHeight = 0.5;\n        } else {\n          x = Math.floor(x) + 0.5;\n          y = Math.floor(y) + 0.5;\n        }\n      }\n      renderStroke(\n        rect as IGroup,\n        context,\n        x,\n        y,\n        rectAttribute,\n        stroke,\n        strokeArrayWidth || lineWidth,\n        strokeArrayColor || strokeColor,\n        Math.ceil(width + deltaWidth),\n        Math.ceil(height + deltaHeight)\n      );\n    }\n  }\n}\n\n// 判断是否为整数，如果是整数，需要偏移0.5px\nfunction isInteger(num: number) {\n  return num % 1 === 0;\n}\n"]}

package/es/scenegraph/group-creater/cell-helper.js

@@ -205,11 +205,18 @@ function dealWithMergeCellSize(range, cellWidth, cellHeight, padding, textAlign,
 export function resizeCellGroup(cellGroup, rangeWidth, rangeHeight, range, table) {
     const {col: col, row: row} = cellGroup, dx = -table.getColsWidth(range.start.col, col - 1), dy = -table.getRowsHeight(range.start.row, row - 1);
     cellGroup.forEachChildren((child => {
-        var _a, _b;
+        var _a, _b, _c, _d, _e, _f;
+        "number" == typeof child._dx ? child.setAttributes({
+            dx: (null !== (_a = child._dx) && void 0 !== _a ? _a : 0) + dx
+        }) : (child._dx = null !== (_b = child.attribute.dx) && void 0 !== _b ? _b : 0, 
         child.setAttributes({
-            dx: (null !== (_a = child.attribute.dx) && void 0 !== _a ? _a : 0) + dx,
-            dy: (null !== (_b = child.attribute.dy) && void 0 !== _b ? _b : 0) + dy
-        });
+            dx: (null !== (_c = child.attribute.dx) && void 0 !== _c ? _c : 0) + dx
+        })), "number" == typeof child._dy ? child.setAttributes({
+            dy: (null !== (_d = child._dy) && void 0 !== _d ? _d : 0) + dy
+        }) : (child._dy = null !== (_e = child.attribute.dy) && void 0 !== _e ? _e : 0, 
+        child.setAttributes({
+            dy: (null !== (_f = child.attribute.dy) && void 0 !== _f ? _f : 0) + dy
+        }));
     }));
     const lineWidth = cellGroup.attribute.lineWidth, isLineWidthArray = isArray(lineWidth), newLineWidth = [ 0, 0, 0, 0 ];
     col === range.start.col && (newLineWidth[3] = isLineWidthArray ? lineWidth[3] : lineWidth),