@visactor/vtable 1.6.3 → 1.6.4-alpha.0

package/cjs/vrender.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/vrender.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qEAA0D;AAC1D,kCAAgC;AAChC,yDAA8F;AAC9F,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;IAGf,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 } 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.6.3\";\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  // registerWrapText();\n\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,yDAA8F;AAC9F,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;IAGf,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 } 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.6.4-alpha.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  // registerWrapText();\n\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

@@ -35052,8 +35052,10 @@
             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);
+            isvTableMerge = vTableMerge;
             if (vTableMerge) {
                 mayHaveIcon = true;
                 if (table.options.groupTitleCustomLayout) {
@@ -35149,9 +35151,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;
@@ -36315,9 +36319,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);
@@ -36653,9 +36660,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);
@@ -40683,8 +40693,10 @@
                     cellHeight = mergeSize.cellHeight;
                 }
             }
+            let isvTableMerge = false;
             if (table.internalProps.enableTreeNodeMerge && isMerge) {
                 const { vtableMergeName, vTableMerge } = table.getCellRawRecord(range.start.col, range.start.row);
+                isvTableMerge = vTableMerge;
                 if (vTableMerge) {
                     mayHaveIcon = true;
                     if (table.options.groupTitleCustomLayout) {
@@ -40712,9 +40724,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));
@@ -45928,9 +45942,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);
@@ -55267,7 +55284,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "1.6.3";
+        version = "1.6.4-alpha.0";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -75802,7 +75819,7 @@
     }
 
     registerForVrender();
-    const version = "1.6.3";
+    const version = "1.6.4-alpha.0";
     function getIcons() {
         return get$2();
     }