@visactor/vtable 0.13.2-alpha.3 → 0.13.2-alpha.4

package/dist/vtable.js

@@ -492,7 +492,7 @@
     const isRegExp = value => isType$5(value, "RegExp");
     var isRegExp$1 = isRegExp;
 
-    const isBase64 = value => new RegExp(/^data:image\/(?:gif|png|jpeg|bmp|webp)(?:;charset=utf-8)?;base64,(?:[A-Za-z0-9]|[+/])+={0,2}/g).test(value);
+    const isBase64 = value => new RegExp(/^data:image\/(?:gif|png|jpeg|bmp|webp|svg\+xml)(?:;charset=utf-8)?;base64,(?:[A-Za-z0-9]|[+/])+={0,2}/g).test(value);
     var isBase64$1 = isBase64;
 
     const getType = value => ({}).toString.call(value).replace(/^\[object /, "").replace(/]$/, "");
@@ -10630,9 +10630,7 @@
         let data = ResourceLoader.cache.get(url);
         data ? "fail" === data.loadState ? application$1.global.getRequestAnimationFrame()(() => {
           mark.imageLoadFail(url);
-        }) : "init" === data.loadState || "loading" === data.loadState ? null === (_a = data.waitingMark) || void 0 === _a || _a.push(mark) : mark && application$1.global.getRequestAnimationFrame()(() => {
-          mark.imageLoadSuccess(url, data.data);
-        }) : (data = {
+        }) : "init" === data.loadState || "loading" === data.loadState ? null === (_a = data.waitingMark) || void 0 === _a || _a.push(mark) : mark && mark.imageLoadSuccess(url, data.data) : (data = {
           type: "image",
           loadState: "init"
         }, ResourceLoader.cache.set(url, data), data.dataPromise = application$1.global.loadImage(url), data.dataPromise ? (data.waitingMark = [mark], data.dataPromise.then(res => {
@@ -11284,7 +11282,7 @@
           data: "init",
           state: null
         };
-        this.resources.set(url, cache), "string" == typeof image ? (cache.state = "loading", isValidUrl$1(image) || isBase64$1(image) ? (ResourceLoader$1.GetImage(image, this), this.backgroundImg = this.backgroundImg || background) : image.startsWith("<svg") && (ResourceLoader$1.GetSvg(image, this), this.backgroundImg = this.backgroundImg || background)) : (cache.state = "success", cache.data = image, this.backgroundImg = this.backgroundImg || background);
+        this.resources.set(url, cache), "string" == typeof image ? (cache.state = "loading", image.startsWith("<svg") ? (ResourceLoader$1.GetSvg(image, this), this.backgroundImg = this.backgroundImg || background) : (isValidUrl$1(image) || image.includes("/") || isBase64$1(image)) && (ResourceLoader$1.GetImage(image, this), this.backgroundImg = this.backgroundImg || background)) : (cache.state = "success", cache.data = image, this.backgroundImg = this.backgroundImg || background);
       }
       imageLoadSuccess(url, image, cb) {
         if (!this.resources) return;
@@ -19122,6 +19120,7 @@
         return this.currentRenderMap.get(type) || this.defaultRenderMap.get(type);
       }
       clearScreen(renderService, context, drawContext) {
+        var _a;
         const {
           clear: clear
         } = drawContext;
@@ -19133,7 +19132,12 @@
             } = drawContext,
             x = 0,
             y = 0;
-          context.clearRect(x, y, width, height), context.fillStyle = createColor(context, clear, {
+          context.clearRect(x, y, width, height);
+          const stage = null === (_a = renderService.drawParams) || void 0 === _a ? void 0 : _a.stage;
+          if (stage && stage.backgroundImg && stage.resources) {
+            const res = stage.resources.get(clear);
+            res && "success" === res.state && res.data && context.drawImage(res.data, x, y, width, height);
+          } else context.fillStyle = createColor(context, clear, {
             AABBBounds: {
               x1: x,
               y1: y,
@@ -20697,7 +20701,9 @@
               return this.viewBox.height();
             }
           }
-        })), params.autoRender && this.enableAutoRender(), !1 === params.disableDirtyBounds && this.enableDirtyBounds(), params.enableHtmlAttribute && this.enableHtmlAttribute(params.enableHtmlAttribute), params.enableLayout && this.enableLayout(), this.hooks.beforeRender.tap("constructor", this.beforeRender), this.hooks.afterRender.tap("constructor", this.afterRender), this._beforeRender = params.beforeRender, this._afterRender = params.afterRender, this.ticker = params.ticker || defaultTicker, this.supportInteractiveLayer = !1 !== params.interactiveLayer, this.timeline = new DefaultTimeline$1(), this.ticker.addTimeline(this.timeline), this.timeline.pause(), this.optmize(params.optimize);
+        })), params.autoRender && this.enableAutoRender(), !1 === params.disableDirtyBounds && this.enableDirtyBounds(), params.enableHtmlAttribute && this.enableHtmlAttribute(params.enableHtmlAttribute), params.enableLayout && this.enableLayout(), this.hooks.beforeRender.tap("constructor", this.beforeRender), this.hooks.afterRender.tap("constructor", this.afterRender), this._beforeRender = params.beforeRender, this._afterRender = params.afterRender, this.ticker = params.ticker || defaultTicker, this.supportInteractiveLayer = !1 !== params.interactiveLayer, this.timeline = new DefaultTimeline$1(), this.ticker.addTimeline(this.timeline), this.timeline.pause(), this.optmize(params.optimize), this._background && isString$3(this._background) && this.setAttributes({
+          background: this._background
+        });
       }
       optmize(params) {
         this.optmizeRender(null == params ? void 0 : params.skipRenderWithOutRange);
@@ -25709,7 +25715,7 @@
         });
       }
       setAttribute(key, value, forceUpdateTag) {
-        !isPlainObject$3(this.attribute[key]) || isFunction$1(this.attribute[key]) || isFunction$1(value) ? this.attribute[key] = value : merge$1(this.attribute[key], value), GROUP_ATTRIBUTES.includes(key) || this.render(), this.valid = this.isValid(), this.updateShapeAndBoundsTagSetted() || !forceUpdateTag && !this.needUpdateTag(key) ? this.addUpdateBoundTag() : this.addUpdateShapeAndBoundsTag(), this.addUpdatePositionTag(), this.onAttributeUpdate();
+        isPlainObject$3(this.attribute[key]) && isPlainObject$3(value) && !isFunction$1(this.attribute[key]) && !isFunction$1(value) ? merge$1(this.attribute[key], value) : this.attribute[key] = value, GROUP_ATTRIBUTES.includes(key) || this.render(), this.valid = this.isValid(), this.updateShapeAndBoundsTagSetted() || !forceUpdateTag && !this.needUpdateTag(key) ? this.addUpdateBoundTag() : this.addUpdateShapeAndBoundsTag(), this.addUpdatePositionTag(), this.onAttributeUpdate();
       }
       setAttributes(params, forceUpdateTag) {
         const keys = Object.keys(params);
@@ -27155,7 +27161,7 @@
         do {
           items = reduce(items, sep);
         } while (items.length >= 3 && hasOverlap$1(items, sep));
-        items.length < 3 && !last(source).attribute.opacity && (items.length > 1 && last(items).setAttribute("opacity", 0), last(source).setAttribute("opacity", 1));
+        items.length < 3 && !last(source).attribute.opacity && items.length > 1 && last(items).setAttribute("opacity", 0);
       }
       source.forEach(item => {
         item.setAttribute("visible", !!item.attribute.opacity);
@@ -38116,33 +38122,21 @@
             return Math.max(height, this.attribute.height ?? 0);
         }
         setDeltaWidth(deltaX) {
-            if (deltaX === 0) {
-                return;
-            }
             this.setAttribute('width', (this.attribute.width ?? 0) + deltaX);
             if (this.border) {
                 this.border.setAttribute('width', this.border.attribute.width + deltaX);
             }
         }
         setDeltaHeight(deltaY) {
-            if (deltaY === 0) {
-                return;
-            }
             this.setAttribute('height', (this.attribute.height ?? 0) + deltaY);
             if (this.border) {
                 this.border.setAttribute('height', this.border.attribute.height + deltaY);
             }
         }
         setDeltaX(deltaX) {
-            if (deltaX === 0) {
-                return;
-            }
             this.setAttribute('x', this.attribute.x + deltaX);
         }
         setDeltaY(deltaY) {
-            if (deltaY === 0) {
-                return;
-            }
             this.setAttribute('y', this.attribute.y + deltaY);
         }
         forEachChildrenSkipChild(cb, skipChildName = 'border-rect', reverse = false) {
@@ -43742,10 +43736,9 @@
             for (let col = 0; col < table.colCount; col++) {
                 const newColWidth = newWidths[col] ?? table.getColWidth(col);
                 if (newColWidth !== oldColWidths[col]) {
-                    table.scenegraph.updateColWidth(col, newColWidth - oldColWidths[col], true);
+                    table.scenegraph.updateColWidth(col, newColWidth - oldColWidths[col]);
                 }
             }
-            table.scenegraph.updateContainer();
         }
     }
     function computeColWidth(col, startRow, endRow, table, forceCompute) {
@@ -44426,43 +44419,6 @@
     }
     function updateCell$1(col, row, table, addNew) {
         const oldCellGroup = table.scenegraph.highPerformanceGetCell(col, row, true);
-        const cellStyle = table._getCellStyle(col, row);
-        const autoWrapText = cellStyle.autoWrapText ?? table.internalProps.autoWrapText;
-        const cellTheme = getStyleTheme(cellStyle, table, col, row, getProp).theme;
-        if (!addNew && canUseFastUpdate(col, row, oldCellGroup, autoWrapText, table)) {
-            const cellWidth = table.getColWidth(col);
-            const cellHeight = table.getRowHeight(row);
-            oldCellGroup.setAttributes({
-                width: cellWidth,
-                height: cellHeight,
-                lineWidth: cellTheme?.group?.lineWidth ?? undefined,
-                fill: cellTheme?.group?.fill ?? undefined,
-                stroke: cellTheme?.group?.stroke ?? undefined,
-                strokeArrayWidth: cellTheme?.group?.strokeArrayWidth ?? undefined,
-                strokeArrayColor: cellTheme?.group?.strokeArrayColor ?? undefined,
-                cursor: cellTheme?.group?.cursor ?? undefined
-            });
-            const textMark = oldCellGroup.getChildByName('text');
-            if (textMark) {
-                const text = table.getCellValue(col, row);
-                const hierarchyOffset = getHierarchyOffset(col, row, table);
-                const lineClamp = cellStyle.lineClamp;
-                const padding = getQuadProps(getProp('padding', cellStyle, col, row, table)) ?? [0, 0, 0, 0];
-                const attribute = {
-                    text: text.length === 1 && !autoWrapText ? text[0] : text,
-                    maxLineWidth: cellWidth - (padding[1] + padding[3] + hierarchyOffset),
-                    textBaseline: 'top',
-                    autoWrapText,
-                    lineClamp,
-                    wordBreak: 'break-word',
-                    heightLimit: cellHeight - (padding[0] + padding[2]),
-                    pickable: false,
-                    dx: hierarchyOffset
-                };
-                textMark.setAttributes(cellTheme.text ? Object.assign({}, cellTheme.text, attribute) : attribute);
-            }
-            return oldCellGroup;
-        }
         if (!addNew && oldCellGroup.role === 'empty') {
             return undefined;
         }
@@ -44500,6 +44456,8 @@
         }
         else {
             const mayHaveIcon = cellLocation !== 'body' ? true : !!define?.icon || !!define?.tree;
+            const headerStyle = table._getCellStyle(col, row);
+            const cellTheme = getStyleTheme(headerStyle, table, col, row, getProp).theme;
             const padding = cellTheme._vtable.padding;
             const textAlign = cellTheme._vtable.textAlign;
             const textBaseline = cellTheme._vtable.textBaseline;
@@ -44556,22 +44514,6 @@
         }
         return newCellGroup;
     }
-    function canUseFastUpdate(col, row, oldCellGroup, autoWrapText, table) {
-        const define = table.getBodyColumnDefine(col, row);
-        const mayHaveIcon = !!define?.icon || !!define?.tree;
-        const cellType = table.getBodyColumnType(col, row);
-        const autoRowHeight = table.heightMode === 'autoHeight';
-        if (!table.isHeader(col, row) &&
-            oldCellGroup.role === 'cell' &&
-            cellType === 'text' &&
-            !autoWrapText &&
-            !autoRowHeight &&
-            !mayHaveIcon &&
-            oldCellGroup.firstChild?.type === 'text') {
-            return true;
-        }
-        return false;
-    }
 
     function createComplexColumn(columnGroup, col, colWidth, rowStart, rowEnd, mergeMap, defaultRowHeight, table, cellLocation, rowLimit) {
         let maxWidth = 0;
@@ -45253,18 +45195,12 @@
     function updatePartRowPosition(startRow, endRow, direction, proxy) {
         for (let col = 0; col < proxy.table.frozenColCount; col++) {
             const colGroup = proxy.table.scenegraph.getColGroup(col);
-            if (!colGroup) {
-                continue;
-            }
             for (let row = startRow; row <= endRow; row++) {
                 updateCellGroupPosition(colGroup, direction, proxy);
             }
         }
         for (let col = proxy.table.colCount - proxy.table.rightFrozenColCount; col < proxy.table.colCount; col++) {
             const colGroup = proxy.table.scenegraph.getColGroup(col);
-            if (!colGroup) {
-                continue;
-            }
             for (let row = startRow; row <= endRow; row++) {
                 updateCellGroupPosition(colGroup, direction, proxy);
             }
@@ -45412,7 +45348,7 @@
         isRelease = false;
         mode = 'column';
         isProgressing;
-        rowLimit = 200;
+        rowLimit = 1000;
         currentRow = 0;
         totalRow;
         yLimitTop;
@@ -46130,14 +46066,7 @@
         updateCells.forEach(cell => {
             cell && updateCell$1(cell.col, cell.row, scene.table, false);
         });
-        const newTotalHeight = resetRowNumberAndY(scene);
-        if (addRows.length) {
-            scene.proxy.rowUpdatePos = scene.proxy.rowStart;
-            scene.proxy.rowUpdateDirection = 'up';
-            scene.proxy.updateCellGroups(scene.proxy.screenRowCount * 2);
-            scene.proxy.progress();
-        }
-        scene.updateContainerHeight(scene.table.frozenRowCount, newTotalHeight - scene.bodyGroup.attribute.height);
+        resetRowNumberAndY(scene);
     }
     function removeRow(row, scene) {
         for (let col = 0; col < scene.table.colCount; col++) {
@@ -46156,46 +46085,42 @@
         }
         scene.proxy.rowEnd--;
         scene.proxy.bodyBottomRow--;
-        scene.proxy.currentRow--;
         scene.proxy.totalRow--;
     }
     function addRow(row, scene) {
         for (let col = 0; col < scene.table.colCount; col++) {
-            const cellGroup = new Group({
-                x: 0,
-                y: 0,
-                width: scene.table.getColWidth(col),
-                height: scene.table.getRowHeight(row)
-            });
-            cellGroup.role = 'cell';
-            cellGroup.col = col;
-            cellGroup.row = row;
-            cellGroup.needUpdate = true;
+            const cellGroup = updateCell$1(col, row, scene.table, true);
             if (!cellGroup) {
                 continue;
             }
             const colGroup = scene.getColGroup(col);
             if (colGroup.firstChild && row < colGroup.firstChild.row) {
                 colGroup.insertBefore(cellGroup, colGroup.firstChild);
-                colGroup.firstChild.row = colGroup.firstChild.row + 1;
             }
             else if (colGroup.lastChild && row > colGroup.lastChild.row) {
                 colGroup.appendChild(cellGroup);
             }
             else {
-                const cellBefore = scene.highPerformanceGetCell(col, row, true);
+                let cellBefore;
+                colGroup.forEachChildren((cellGroup) => {
+                    if (cellGroup.row === row) {
+                        cellBefore = cellGroup;
+                        return true;
+                    }
+                    return false;
+                });
                 if (cellBefore !== cellGroup) {
                     colGroup.insertBefore(cellGroup, cellBefore);
-                    cellBefore && (cellBefore.row = cellBefore.row + 1);
-                    if (cellBefore !== colGroup.lastChild) {
-                        colGroup.lastChild && (colGroup.lastChild.row = colGroup.lastChild.row + 1);
-                    }
                 }
             }
+            let rowIndex = colGroup.firstChild?.row;
+            colGroup.forEachChildren((cellGroup) => {
+                cellGroup.row = rowIndex;
+                rowIndex++;
+            });
         }
         scene.proxy.rowEnd++;
         scene.proxy.bodyBottomRow++;
-        scene.proxy.currentRow++;
         scene.proxy.totalRow++;
     }
     function deduplication(array) {
@@ -46243,7 +46168,7 @@
             });
             newTotalHeight = y;
         }
-        return newTotalHeight;
+        scene.updateContainerHeight(scene.table.frozenRowCount, newTotalHeight - scene.bodyGroup.attribute.height);
     }
 
     const changedCells = [];
@@ -47509,12 +47434,10 @@
                 icon.image = icon.attribute.originImage;
             }
         }
-        updateColWidth(col, detaX, skipUpdateContainer) {
+        updateColWidth(col, detaX) {
             updateColWidth(this, col, Math.round(detaX));
-            if (!skipUpdateContainer) {
-                this.updateContainerAttrWidthAndX();
-                this.updateContainer();
-            }
+            this.updateContainerAttrWidthAndX();
+            this.updateContainer();
         }
         updateChartSize(col) {
             updateChartSize(this, col);
@@ -50290,8 +50213,8 @@
                     endResizeCol(table);
                 }
                 else if (stateManeger.isMoveCol()) {
-                    table.stateManeger.endMoveCol();
                     const eventArgsSet = getCellEventArgsSet(e);
+                    table.stateManeger.endMoveCol();
                     if (eventArgsSet.eventArgs && table.hasListeners(TABLE_EVENT_TYPE.CHANGE_HEADER_POSITION)) {
                         table.fireListeners(TABLE_EVENT_TYPE.CHANGE_HEADER_POSITION, {
                             target: { col: eventArgsSet.eventArgs.col, row: eventArgsSet.eventArgs.row },
@@ -53955,7 +53878,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.13.2-alpha.3";
+        version = "0.13.2-alpha.4";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -56958,6 +56881,9 @@
             return undefined;
         }
         canMoveHeaderPosition(source, target) {
+            if (source.col < 0 || source.row < 0 || target.col < 0 || target.row < 0) {
+                return false;
+            }
             const sourceCellRange = this.getCellRange(source.col, source.row);
             if (this.isColumnHeader(source.col, source.row)) {
                 const sourceTopId = this.getParentCellId(source.col, sourceCellRange.start.row);
@@ -59312,6 +59238,9 @@
             return undefined;
         }
         canMoveHeaderPosition(source, target) {
+            if (source.col < 0 || source.row < 0 || target.col < 0 || target.row < 0) {
+                return false;
+            }
             const sourceCellRange = this.getCellRange(source.col, source.row);
             if (this.isColumnHeader(source.col, source.row)) {
                 const sourceTopId = this.getParentCellId(source.col, sourceCellRange.start.row);
@@ -63825,7 +63754,7 @@
         return new Tag(params ? params.attribute : {});
     }
 
-    const version = "0.13.2-alpha.3";
+    const version = "0.13.2-alpha.4";
     function getIcons() {
         return get$1();
     }