@visactor/vtable 1.1.1-alpha.0 → 1.1.1

package/dist/vtable.js

@@ -22380,8 +22380,10 @@
       }
       registed = true;
       preLoadAllModule();
-      loadBrowserEnv(container);
-      if (isNodeEnv()) {
+      if (isBrowserEnv()) {
+          loadBrowserEnv(container);
+      }
+      else if (isNodeEnv()) {
           loadNodeEnv(container);
       }
       registerArc();
@@ -44440,6 +44442,9 @@
           rectAttributes.y = borderTop / 2;
           rectAttributes.pickable = false;
           if (isTableGroup) {
+              if (cornerRadius) {
+                  rectAttributes.cornerRadius = cornerRadius + (rectAttributes.lineWidth ?? 0) / 2;
+              }
               if (frameTheme.innerBorder) {
                   rectAttributes.x = group.attribute.x + borderLeft / 2;
                   rectAttributes.y = group.attribute.y + borderTop / 2;
@@ -60290,7 +60295,7 @@
           return TABLE_EVENT_TYPE;
       }
       options;
-      version = "1.1.1-alpha.0";
+      version = "1.1.1";
       pagination;
       id = `VTable${Date.now()}`;
       headerStyleCache;
@@ -65163,17 +65168,17 @@
           this.isReleased = true;
       }
       resetVisible() {
-          if (!this.table.recordsCount || this.table.recordsCount === 0) {
-              this._emptyTipComponent.setAttributes({
-                  visible: true
-              });
-              this._emptyTipComponent.showAll();
+          if (((!this.table.recordsCount || this.table.recordsCount === 0) &&
+              this.table.internalProps.layoutMap.rowCount === this.table.internalProps.layoutMap.columnHeaderLevelCount) ||
+              this.table.internalProps.layoutMap.colCount === this.table.internalProps.layoutMap.rowHeaderLevelCount) {
+              if (!this.table.scenegraph.stage.defaultLayer.children.includes(this._emptyTipComponent)) {
+                  this.table.scenegraph.stage.defaultLayer.appendChild(this._emptyTipComponent);
+              }
           }
           else {
-              this._emptyTipComponent.setAttributes({
-                  visible: false
-              });
-              this._emptyTipComponent.hideAll();
+              if (this.table.scenegraph.stage.defaultLayer.children.includes(this._emptyTipComponent)) {
+                  this.table.scenegraph.stage.defaultLayer.removeChild(this._emptyTipComponent);
+              }
           }
       }
       _getEmptyTipAttrs() {
@@ -65259,6 +65264,7 @@
               }
               else {
                   this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this);
+                  this.internalProps.emptyTip.resetVisible();
               }
           }
           setTimeout(() => {
@@ -65508,6 +65514,7 @@
               }
               else {
                   this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this);
+                  this.internalProps.emptyTip.resetVisible();
               }
           }
           return new Promise(resolve => {
@@ -65943,6 +65950,7 @@
               }
               else {
                   this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this);
+                  this.internalProps.emptyTip.resetVisible();
               }
           }
           this.render();
@@ -69818,7 +69826,7 @@
               return indicatorKey === value.indicatorKey;
           });
       }
-      getAggregator(rowKey = [], colKey = [], indicator, considerChangedValue = true) {
+      getAggregator(rowKey = [], colKey = [], indicator, considerChangedValue = true, indicatorPosition) {
           const indicatorIndex = this.indicatorKeys.indexOf(indicator);
           let flatRowKey;
           let flatColKey;
@@ -69826,22 +69834,26 @@
               flatRowKey = rowKey;
           }
           else {
-              rowKey.map((key, i) => {
-                  if (key === indicator) {
-                      rowKey.splice(i, 1);
-                  }
-              });
+              if (!indicatorPosition || indicatorPosition.position === 'row') {
+                  rowKey.map((key, i) => {
+                      if (key === indicator && (!isValid$3(indicatorPosition?.index) || i === indicatorPosition.index)) {
+                          rowKey.splice(i, 1);
+                      }
+                  });
+              }
               flatRowKey = rowKey.join(this.stringJoinChar);
           }
           if (typeof colKey === 'string') {
               flatColKey = colKey;
           }
           else {
-              colKey.map((key, i) => {
-                  if (key === indicator) {
-                      colKey.splice(i, 1);
-                  }
-              });
+              if (!indicatorPosition || indicatorPosition.position === 'col') {
+                  colKey.map((key, i) => {
+                      if (key === indicator && (!isValid$3(indicatorPosition?.index) || i === indicatorPosition.index)) {
+                          colKey.splice(i, 1);
+                      }
+                  });
+              }
               flatColKey = colKey.join(this.stringJoinChar);
           }
           const agg = this.tree[flatRowKey]?.[flatColKey]?.[indicatorIndex];
@@ -70528,6 +70540,7 @@
                   }
                   else {
                       this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this);
+                      this.internalProps.emptyTip.resetVisible();
                   }
               }
               setTimeout(() => {
@@ -70665,6 +70678,7 @@
               }
               else {
                   this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this);
+                  this.internalProps.emptyTip.resetVisible();
               }
           }
           return new Promise(resolve => {
@@ -70771,13 +70785,26 @@
           else if (this.dataset) {
               const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
               if (cellDimensionPath) {
-                  const colKeys = cellDimensionPath.colHeaderPaths.map((colPath) => {
+                  let indicatorPosition;
+                  const colKeys = cellDimensionPath.colHeaderPaths.map((colPath, index) => {
+                      if (colPath.indicatorKey) {
+                          indicatorPosition = {
+                              position: 'col',
+                              index
+                          };
+                      }
                       return colPath.indicatorKey ?? colPath.value;
                   });
-                  const rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath) => {
+                  const rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath, index) => {
+                      if (rowPath.indicatorKey) {
+                          indicatorPosition = {
+                              position: 'row',
+                              index
+                          };
+                      }
                       return rowPath.indicatorKey ?? rowPath.value;
                   });
-                  const aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row));
+                  const aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row), true, indicatorPosition);
                   if (aggregator.records && aggregator.records.length >= 1) {
                       return aggregator.records[0][field];
                   }
@@ -70829,21 +70856,34 @@
           }
           else if (this.dataset) {
               const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
+              let indicatorPosition;
               const colKeys = cellDimensionPath.colHeaderPaths
                   ?.filter((path) => {
                   return !path.virtual;
               })
-                  ?.map((colPath) => {
+                  ?.map((colPath, index) => {
+                  if (colPath.indicatorKey) {
+                      indicatorPosition = {
+                          position: 'col',
+                          index
+                      };
+                  }
                   return colPath.indicatorKey ?? colPath.value;
               });
               const rowKeys = cellDimensionPath.rowHeaderPaths
                   ?.filter((path) => {
                   return !path.virtual;
               })
-                  ?.map((rowPath) => {
+                  ?.map((rowPath, index) => {
+                  if (rowPath.indicatorKey) {
+                      indicatorPosition = {
+                          position: 'row',
+                          index
+                      };
+                  }
                   return rowPath.indicatorKey ?? rowPath.value;
               });
-              const aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row));
+              const aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row), true, indicatorPosition);
               const { fieldFormat } = this.internalProps.layoutMap.getBody(col, row);
               return aggregator.formatValue
                   ? aggregator.formatValue(col, row, this)
@@ -70879,14 +70919,27 @@
               return dataValue;
           }
           else if (this.dataset) {
+              let indicatorPosition;
               const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
-              const colKeys = cellDimensionPath.colHeaderPaths.map((colPath) => {
+              const colKeys = cellDimensionPath.colHeaderPaths.map((colPath, index) => {
+                  if (colPath.indicatorKey) {
+                      indicatorPosition = {
+                          position: 'col',
+                          index
+                      };
+                  }
                   return colPath.indicatorKey ?? colPath.value;
               });
-              const rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath) => {
+              const rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath, index) => {
+                  if (rowPath.indicatorKey) {
+                      indicatorPosition = {
+                          position: 'row',
+                          index
+                      };
+                  }
                   return rowPath.indicatorKey ?? rowPath.value;
               });
-              const aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row));
+              const aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row), true, indicatorPosition);
               return aggregator.value ? aggregator.value() : undefined;
           }
           else if (this.flatDataToObjects) {
@@ -70914,14 +70967,27 @@
               return dataValue;
           }
           else if (this.dataset) {
+              let indicatorPosition;
               const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
-              const colKeys = cellDimensionPath.colHeaderPaths.map((colPath) => {
+              const colKeys = cellDimensionPath.colHeaderPaths.map((colPath, index) => {
+                  if (colPath.indicatorKey) {
+                      indicatorPosition = {
+                          position: 'col',
+                          index
+                      };
+                  }
                   return colPath.indicatorKey ?? colPath.value;
               });
-              const rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath) => {
+              const rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath, index) => {
+                  if (rowPath.indicatorKey) {
+                      indicatorPosition = {
+                          position: 'row',
+                          index
+                      };
+                  }
                   return rowPath.indicatorKey ?? rowPath.value;
               });
-              const aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row), false);
+              const aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row), false, indicatorPosition);
               return aggregator.value ? aggregator.value() : undefined;
           }
           else if (this.flatDataToObjects) {
@@ -70948,14 +71014,27 @@
               return dataValue;
           }
           else if (this.dataset) {
+              let indicatorPosition;
               const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
-              const colKeys = cellDimensionPath.colHeaderPaths.map((colPath) => {
+              const colKeys = cellDimensionPath.colHeaderPaths.map((colPath, index) => {
+                  if (colPath.indicatorKey) {
+                      indicatorPosition = {
+                          position: 'col',
+                          index
+                      };
+                  }
                   return colPath.indicatorKey ?? colPath.value;
               });
-              const rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath) => {
+              const rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath, index) => {
+                  if (rowPath.indicatorKey) {
+                      indicatorPosition = {
+                          position: 'row',
+                          index
+                      };
+                  }
                   return rowPath.indicatorKey ?? rowPath.value;
               });
-              const aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row));
+              const aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row), true, indicatorPosition);
               return aggregator.records;
           }
           else if (this.flatDataToObjects) {
@@ -70982,14 +71061,27 @@
               return dataValue;
           }
           else if (this.dataset) {
+              let indicatorPosition;
               const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
-              const colKeys = cellDimensionPath.colHeaderPaths.map((colPath) => {
+              const colKeys = cellDimensionPath.colHeaderPaths.map((colPath, index) => {
+                  if (colPath.indicatorKey) {
+                      indicatorPosition = {
+                          position: 'col',
+                          index
+                      };
+                  }
                   return colPath.indicatorKey ?? colPath.value;
               });
-              const rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath) => {
+              const rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath, index) => {
+                  if (rowPath.indicatorKey) {
+                      indicatorPosition = {
+                          position: 'row',
+                          index
+                      };
+                  }
                   return rowPath.indicatorKey ?? rowPath.value;
               });
-              const aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row));
+              const aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row), false, indicatorPosition);
               return aggregator.records;
           }
           else if (this.flatDataToObjects) {
@@ -71666,6 +71758,7 @@
               }
               else {
                   this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this);
+                  this.internalProps.emptyTip.resetVisible();
               }
           }
           setTimeout(() => {
@@ -71827,6 +71920,7 @@
               }
               else {
                   this.internalProps.emptyTip = new EmptyTip(this.options.emptyTip, this);
+                  this.internalProps.emptyTip.resetVisible();
               }
           }
           return new Promise(resolve => {
@@ -71915,14 +72009,27 @@
               return typeof fieldFormat === 'function' ? fieldFormat(title, col, row, this) : title;
           }
           if (this.dataset) {
+              let indicatorPosition;
               const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
-              const colKeys = cellDimensionPath.colHeaderPaths.map((colPath) => {
+              const colKeys = cellDimensionPath.colHeaderPaths.map((colPath, index) => {
+                  if (colPath.indicatorKey) {
+                      indicatorPosition = {
+                          position: 'col',
+                          index
+                      };
+                  }
                   return colPath.indicatorKey ?? colPath.value;
               });
-              const rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath) => {
+              const rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath, index) => {
+                  if (rowPath.indicatorKey) {
+                      indicatorPosition = {
+                          position: 'row',
+                          index
+                      };
+                  }
                   return rowPath.indicatorKey ?? rowPath.value;
               });
-              const aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row));
+              const aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row), true, indicatorPosition);
               return aggregator.value ? aggregator.value() : undefined;
           }
           const { fieldFormat } = this.internalProps.layoutMap.getBody(col, row);
@@ -71954,14 +72061,27 @@
               return typeof title === 'function' ? title() : title;
           }
           if (this.dataset) {
+              let indicatorPosition;
               const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
-              const colKeys = cellDimensionPath.colHeaderPaths.map((colPath) => {
+              const colKeys = cellDimensionPath.colHeaderPaths.map((colPath, index) => {
+                  if (colPath.indicatorKey) {
+                      indicatorPosition = {
+                          position: 'col',
+                          index
+                      };
+                  }
                   return colPath.indicatorKey ?? colPath.value;
               });
-              const rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath) => {
+              const rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath, index) => {
+                  if (rowPath.indicatorKey) {
+                      indicatorPosition = {
+                          position: 'row',
+                          index
+                      };
+                  }
                   return rowPath.indicatorKey ?? rowPath.value;
               });
-              const aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row));
+              const aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row), true, indicatorPosition);
               return aggregator.value ? aggregator.value() : undefined;
           }
           const rowIndex = this.getBodyIndexByRow(row);
@@ -71978,14 +72098,27 @@
               return undefined;
           }
           if (this.dataset) {
+              let indicatorPosition;
               const cellDimensionPath = this.internalProps.layoutMap.getCellHeaderPaths(col, row);
-              const colKeys = cellDimensionPath.colHeaderPaths.map((colPath) => {
+              const colKeys = cellDimensionPath.colHeaderPaths.map((colPath, index) => {
+                  if (colPath.indicatorKey) {
+                      indicatorPosition = {
+                          position: 'col',
+                          index
+                      };
+                  }
                   return colPath.indicatorKey ?? colPath.value;
               });
-              const rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath) => {
+              const rowKeys = cellDimensionPath.rowHeaderPaths.map((rowPath, index) => {
+                  if (rowPath.indicatorKey) {
+                      indicatorPosition = {
+                          position: 'row',
+                          index
+                      };
+                  }
                   return rowPath.indicatorKey ?? rowPath.value;
               });
-              const aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row));
+              const aggregator = this.dataset.getAggregator(rowKeys, colKeys, this.internalProps.layoutMap.getIndicatorKey(col, row), true, indicatorPosition);
               return aggregator.records;
           }
           return undefined;
@@ -73124,7 +73257,7 @@
   }
 
   registerForVrender();
-  const version = "1.1.1-alpha.0";
+  const version = "1.1.1";
   function getIcons() {
       return get$2();
   }