@visactor/vtable 1.7.0 → 1.7.2

package/cjs/vrender.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/vrender.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qEAA0D;AAC1D,kCAAgC;AAChC,yDAAwH;AACxH,yDAqBgC;AAIhC,IAAI,QAAQ,GAAG,KAAK,CAAC;AACrB,SAAgB,kBAAkB;IAChC,IAAI,QAAQ,EAAE;QACZ,OAAO;KACR;IACD,QAAQ,GAAG,IAAI,CAAC;IAEhB,IAAA,+BAAgB,GAAE,CAAC;IAEnB,IAAI,IAAA,2BAAY,GAAE,EAAE;QAClB,IAAA,6BAAc,EAAC,wBAAS,CAAC,CAAC;KAC3B;SAAM,IAAI,IAAA,wBAAS,GAAE,EAAE;QACtB,IAAA,0BAAW,EAAC,wBAAS,CAAC,CAAC;KACxB;IACD,IAAA,0BAAW,GAAE,CAAC;IAGd,IAAA,6BAAc,GAAE,CAAC;IAEjB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,2BAAY,GAAE,CAAC;IAIf,IAAA,2BAAY,GAAE,CAAC;IAEf,IAAA,+BAAgB,GAAE,CAAC;IACnB,IAAA,iCAAkB,GAAE,CAAC;IACrB,IAAA,6BAAc,GAAE,CAAC;IACjB,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,uCAAwB,GAAE,CAAC;IAE3B,IAAA,+BAAU,GAAE,CAAC;AACf,CAAC;AAjCD,gDAiCC;AAGD,uDAAqD;AAA5C,2GAAA,WAAW,OAAA;AACpB,uDAAsD;AAA7C,4GAAA,YAAY,OAAA;AAErB,yDAAuC;AACvC,yDAAuC;AACvC,+DAA6C","file":"vrender.js","sourcesContent":["import { loadPoptip } from '@visactor/vrender-components';\nimport '@visactor/vrender-core';\nimport { container, isBrowserEnv, isNodeEnv, preLoadAllModule, registerFlexLayoutPlugin } from '@visactor/vrender-core';\nimport {\n  loadBrowserEnv,\n  loadNodeEnv,\n  registerArc,\n  registerArc3d,\n  registerArea,\n  registerCircle,\n  registerGlyph,\n  registerGroup,\n  registerImage,\n  registerLine,\n  registerPath,\n  registerPolygon,\n  registerPyramid3d,\n  registerRect,\n  registerRect3d,\n  registerRichtext,\n  registerShadowRoot,\n  registerSymbol,\n  registerText,\n  registerWrapText\n} from '@visactor/vrender-kits';\n// 导出版本号\n// export const version = \"1.7.0\";\n\nlet registed = false;\nexport function registerForVrender() {\n  if (registed) {\n    return;\n  }\n  registed = true;\n  // 注册内置组件\n  preLoadAllModule();\n\n  if (isBrowserEnv()) {\n    loadBrowserEnv(container);\n  } else if (isNodeEnv()) {\n    loadNodeEnv(container);\n  }\n  registerArc();\n  // registerArc3d();\n  // registerArea();\n  registerCircle();\n  // registerGlyph();\n  registerGroup();\n  registerImage();\n  registerLine();\n  // registerPath();\n  // registerPolygon();\n  // registerPyramid3d();\n  registerRect();\n  // registerRect3d();\n  registerRichtext();\n  registerShadowRoot();\n  registerSymbol();\n  registerText();\n  registerFlexLayoutPlugin();\n  // registerWrapText();\n  loadPoptip();\n}\n\nexport type { Direction, Timeline } from '@visactor/vrender-core';\nexport { GroupFadeIn } from '@visactor/vrender-core';\nexport { GroupFadeOut } from '@visactor/vrender-core';\n\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\nexport * from '@visactor/vrender-components';\n"]}
+{"version":3,"sources":["../src/vrender.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qEAA0D;AAC1D,kCAAgC;AAChC,yDAAwH;AACxH,yDAqBgC;AAIhC,IAAI,QAAQ,GAAG,KAAK,CAAC;AACrB,SAAgB,kBAAkB;IAChC,IAAI,QAAQ,EAAE;QACZ,OAAO;KACR;IACD,QAAQ,GAAG,IAAI,CAAC;IAEhB,IAAA,+BAAgB,GAAE,CAAC;IAEnB,IAAI,IAAA,2BAAY,GAAE,EAAE;QAClB,IAAA,6BAAc,EAAC,wBAAS,CAAC,CAAC;KAC3B;SAAM,IAAI,IAAA,wBAAS,GAAE,EAAE;QACtB,IAAA,0BAAW,EAAC,wBAAS,CAAC,CAAC;KACxB;IACD,IAAA,0BAAW,GAAE,CAAC;IAGd,IAAA,6BAAc,GAAE,CAAC;IAEjB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,4BAAa,GAAE,CAAC;IAChB,IAAA,2BAAY,GAAE,CAAC;IAIf,IAAA,2BAAY,GAAE,CAAC;IAEf,IAAA,+BAAgB,GAAE,CAAC;IACnB,IAAA,iCAAkB,GAAE,CAAC;IACrB,IAAA,6BAAc,GAAE,CAAC;IACjB,IAAA,2BAAY,GAAE,CAAC;IACf,IAAA,uCAAwB,GAAE,CAAC;IAE3B,IAAA,+BAAU,GAAE,CAAC;AACf,CAAC;AAjCD,gDAiCC;AAGD,uDAAqD;AAA5C,2GAAA,WAAW,OAAA;AACpB,uDAAsD;AAA7C,4GAAA,YAAY,OAAA;AAErB,yDAAuC;AACvC,yDAAuC;AACvC,+DAA6C","file":"vrender.js","sourcesContent":["import { loadPoptip } from '@visactor/vrender-components';\nimport '@visactor/vrender-core';\nimport { container, isBrowserEnv, isNodeEnv, preLoadAllModule, registerFlexLayoutPlugin } from '@visactor/vrender-core';\nimport {\n  loadBrowserEnv,\n  loadNodeEnv,\n  registerArc,\n  registerArc3d,\n  registerArea,\n  registerCircle,\n  registerGlyph,\n  registerGroup,\n  registerImage,\n  registerLine,\n  registerPath,\n  registerPolygon,\n  registerPyramid3d,\n  registerRect,\n  registerRect3d,\n  registerRichtext,\n  registerShadowRoot,\n  registerSymbol,\n  registerText,\n  registerWrapText\n} from '@visactor/vrender-kits';\n// 导出版本号\n// export const version = \"1.7.2\";\n\nlet registed = false;\nexport function registerForVrender() {\n  if (registed) {\n    return;\n  }\n  registed = true;\n  // 注册内置组件\n  preLoadAllModule();\n\n  if (isBrowserEnv()) {\n    loadBrowserEnv(container);\n  } else if (isNodeEnv()) {\n    loadNodeEnv(container);\n  }\n  registerArc();\n  // registerArc3d();\n  // registerArea();\n  registerCircle();\n  // registerGlyph();\n  registerGroup();\n  registerImage();\n  registerLine();\n  // registerPath();\n  // registerPolygon();\n  // registerPyramid3d();\n  registerRect();\n  // registerRect3d();\n  registerRichtext();\n  registerShadowRoot();\n  registerSymbol();\n  registerText();\n  registerFlexLayoutPlugin();\n  // registerWrapText();\n  loadPoptip();\n}\n\nexport type { Direction, Timeline } from '@visactor/vrender-core';\nexport { GroupFadeIn } from '@visactor/vrender-core';\nexport { GroupFadeOut } from '@visactor/vrender-core';\n\nexport * from '@visactor/vrender-core';\nexport * from '@visactor/vrender-kits';\nexport * from '@visactor/vrender-components';\n"]}

package/dist/vtable.js

@@ -30642,7 +30642,7 @@
             else {
                 map.set(value, children.length);
                 children.push({
-                    vTableMerge: true,
+                    vtableMerge: true,
                     vtableMergeName: value,
                     children: [],
                     map: new Map()
@@ -30656,7 +30656,7 @@
             oldGroupMap = new Map();
             for (let i = 0; i < oldSource.length; i++) {
                 const record = oldSource[i];
-                if (record.vTableMerge) {
+                if (record.vtableMerge) {
                     oldGroupMap.set(record.vtableMergeName, i);
                 }
             }
@@ -30665,7 +30665,7 @@
             newGroupMap = new Map();
             for (let i = 0; i < newSource.length; i++) {
                 const record = newSource[i];
-                if (record.vTableMerge) {
+                if (record.vtableMerge) {
                     newGroupMap.set(record.vtableMergeName, i);
                 }
             }
@@ -34150,9 +34150,11 @@
             range = table.getCellRange(col, row);
             isMerge = range.start.col !== range.end.col || range.start.row !== range.end.row;
         }
+        let isvtableMerge = false;
         if (table.internalProps.enableTreeNodeMerge && isMerge) {
-            const { vtableMergeName, vTableMerge } = table.getCellRawRecord(range.start.col, range.start.row);
-            if (vTableMerge) {
+            const { vtableMergeName, vtableMerge } = table.getCellRawRecord(range.start.col, range.start.row);
+            isvtableMerge = vtableMerge;
+            if (vtableMerge) {
                 mayHaveIcon = true;
                 if (table.options.groupTitleCustomLayout) {
                     customResult = dealWithCustom(table.options.groupTitleCustomLayout, undefined, range.start.col, range.start.row, table.getColsWidth(range.start.col, range.end.col), table.getRowsHeight(range.start.row, range.end.row), false, table.isAutoRowHeight(row), [0, 0, 0, 0], range, table);
@@ -34247,9 +34249,11 @@
         if (!addNew && oldCellGroup.role === 'empty') {
             return undefined;
         }
-        const type = table.isHeader(col, row)
-            ? table._getHeaderLayoutMap(col, row).headerType
-            : table.getBodyColumnType(col, row);
+        const type = isvtableMerge
+            ? 'text'
+            : table.isHeader(col, row)
+                ? table._getHeaderLayoutMap(col, row).headerType
+                : table.getBodyColumnType(col, row);
         const padding = cellTheme._vtable.padding;
         const textAlign = cellTheme.text.textAlign;
         const textBaseline = cellTheme.text.textBaseline;
@@ -35413,9 +35417,12 @@
         }
         cell.needUpdateHeight = false;
         cell.setAttribute('height', distHeight);
-        const type = scene.table.isHeader(col, row)
-            ? scene.table._getHeaderLayoutMap(col, row).headerType
-            : scene.table.getBodyColumnType(col, row);
+        const isvtableMerge = scene.table.getCellRawRecord(col, row)?.vtableMerge;
+        const type = isvtableMerge
+            ? 'text'
+            : scene.table.isHeader(col, row)
+                ? scene.table._getHeaderLayoutMap(col, row).headerType
+                : scene.table.getBodyColumnType(col, row);
         if (type === 'progressbar') {
             const columnDefine = scene.table.getBodyColumnDefine(col, row);
             const style = scene.table._getCellStyle(col, row);
@@ -35477,8 +35484,8 @@
                     let customRender;
                     let customLayout;
                     const cellLocation = scene.table.getCellLocation(col, row);
-                    const { vTableMerge } = scene.table.getCellRawRecord(col, row);
-                    if (vTableMerge && scene.table.options.groupTitleCustomLayout) {
+                    const { vtableMerge } = scene.table.getCellRawRecord(col, row);
+                    if (vtableMerge && scene.table.options.groupTitleCustomLayout) {
                         customLayout = scene.table.options.groupTitleCustomLayout;
                     }
                     else if (cellLocation !== 'body') {
@@ -35751,9 +35758,12 @@
             return false;
         }
         const autoRowHeight = scene.table.isAutoRowHeight(row);
-        const type = scene.table.isHeader(col, row)
-            ? scene.table._getHeaderLayoutMap(col, row).headerType
-            : scene.table.getBodyColumnType(col, row);
+        const isvtableMerge = scene.table.getCellRawRecord(col, row)?.vtableMerge;
+        const type = isvtableMerge
+            ? 'text'
+            : scene.table.isHeader(col, row)
+                ? scene.table._getHeaderLayoutMap(col, row).headerType
+                : scene.table.getBodyColumnType(col, row);
         let isHeightChange = false;
         if (type === 'progressbar') {
             const columnDefine = scene.table.getBodyColumnDefine(col, row);
@@ -35829,8 +35839,8 @@
                     let customRender;
                     let customLayout;
                     const cellType = scene.table.getCellLocation(col, row);
-                    const { vTableMerge } = scene.table.getCellRawRecord(col, row);
-                    if (vTableMerge && scene.table.options.groupTitleCustomLayout) {
+                    const { vtableMerge } = scene.table.getCellRawRecord(col, row);
+                    if (vtableMerge && scene.table.options.groupTitleCustomLayout) {
                         customLayout = scene.table.options.groupTitleCustomLayout;
                     }
                     else if (cellType !== 'body') {
@@ -39787,9 +39797,11 @@
                     cellHeight = mergeSize.cellHeight;
                 }
             }
+            let isvtableMerge = false;
             if (table.internalProps.enableTreeNodeMerge && isMerge) {
-                const { vtableMergeName, vTableMerge } = table.getCellRawRecord(range.start.col, range.start.row);
-                if (vTableMerge) {
+                const { vtableMergeName, vtableMerge } = table.getCellRawRecord(range.start.col, range.start.row);
+                isvtableMerge = vtableMerge;
+                if (vtableMerge) {
                     mayHaveIcon = true;
                     if (table.options.groupTitleCustomLayout) {
                         customResult = dealWithCustom(table.options.groupTitleCustomLayout, undefined, range.start.col, range.start.row, table.getColsWidth(range.start.col, range.end.col), table.getRowsHeight(range.start.row, range.end.row), false, table.isAutoRowHeight(row), [0, 0, 0, 0], range, table);
@@ -39816,9 +39828,11 @@
             if (cellLocation !== 'body' && !cellTheme.group.fill) {
                 cellTheme.group.fill = '#fff';
             }
-            const type = (table.isHeader(col, row)
-                ? table._getHeaderLayoutMap(col, row).headerType
-                : table.getBodyColumnType(col, row)) || 'text';
+            const type = isvtableMerge
+                ? 'text'
+                : (table.isHeader(col, row)
+                    ? table._getHeaderLayoutMap(col, row).headerType
+                    : table.getBodyColumnType(col, row)) || 'text';
             if (isPromise(value)) {
                 createEmptyCellGroup(col, row, 0, y, cellWidth, cellHeight, columnGroup);
                 dealPromiseData(value, table, createCell.bind(null, type, value, define, table, col, row, colWidth, cellWidth, cellHeight, columnGroup, y, padding, textAlign, textBaseline, mayHaveIcon, cellTheme, range, customResult));
@@ -45032,9 +45046,12 @@
             this.updateNextFrame();
         }
         updateCellContentWhileResize(col, row) {
-            const type = this.table.isHeader(col, row)
-                ? this.table._getHeaderLayoutMap(col, row).headerType
-                : this.table.getBodyColumnType(col, row);
+            const isvtableMerge = this.table.getCellRawRecord(col, row)?.vtableMerge;
+            const type = isvtableMerge
+                ? 'text'
+                : this.table.isHeader(col, row)
+                    ? this.table._getHeaderLayoutMap(col, row).headerType
+                    : this.table.getBodyColumnType(col, row);
             const cellGroup = this.getCell(col, row);
             if (type === 'image' || type === 'video') {
                 updateImageCellContentWhileResize(cellGroup, col, row, 0, 0, this.table);
@@ -54284,7 +54301,7 @@
         let cacheKey;
         const cellType = table.getCellType(col, row);
         const rawRecord = table.getCellOriginRecord(col, row);
-        if (rawRecord?.vTableMerge) {
+        if (rawRecord?.vtableMerge) {
             cacheKey = 'merge-title';
         }
         else if (table.isSeriesNumberInBody(col, row)) {
@@ -54298,7 +54315,7 @@
             cacheKey = row + cellType;
         }
         let cacheStyle;
-        if (rawRecord?.vTableMerge) {
+        if (rawRecord?.vtableMerge) {
             cacheStyle = table.bodyMergeTitleCache.get(cacheKey);
         }
         else if (layoutMap.isBottomFrozenRow(row)) {
@@ -54316,7 +54333,7 @@
         const column = layoutMap.getBody(col, row);
         const styleClass = table.internalProps.bodyHelper.getStyleClass(table.getCellType(col, row));
         const style = column?.style;
-        cacheStyle = of$2(style, rawRecord?.vTableMerge && table.theme.groupTitleStyle
+        cacheStyle = of$2(style, rawRecord?.vtableMerge && table.theme.groupTitleStyle
             ? table.theme.groupTitleStyle
             : layoutMap.isBottomFrozenRow(row) && table.theme.bottomFrozenStyle
                 ? table.theme.bottomFrozenStyle
@@ -54380,7 +54397,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "1.7.0";
+        version = "1.7.2";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -58129,7 +58146,7 @@
             return;
         }
         const cellRecord = layout._table.getCellRawRecord(col, row);
-        if (cellRecord?.vTableMerge) {
+        if (cellRecord?.vtableMerge) {
             cellRange.start.col = layout.rowHeaderLevelCount;
             cellRange.end.col = layout.colCount - 1;
             cellRange.start.row = cellRange.end.row = row;
@@ -73263,7 +73280,7 @@
     }
 
     registerForVrender();
-    const version = "1.7.0";
+    const version = "1.7.2";
     function getIcons() {
         return get$2();
     }