@antv/s2-vue 1.1.0 → 1.2.1

package/esm/style.css

@@ -131,6 +131,12 @@
   overflow-wrap: break-word;
   color: rgba(0, 0, 0, 0.85);
 }
+.antv-s2-tooltip-description {
+  padding: 0 12px 12px;
+  line-height: 16px;
+  overflow-wrap: break-word;
+  color: rgba(0, 0, 0, 0.65);
+}
 .antv-s2-tooltip-tips {
   padding: 4px 12px;
   color: rgba(0, 0, 0, 0.45);

package/lib/index.js

@@ -22,6 +22,86 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 var s2 = require("@antv/s2");
 var vue = require("vue");
 var antDesignVue = require("ant-design-vue");
+const EN_US = {
+  \u9009\u62E9\u5206\u6790\u4FE1\u606F: "Select Analysis Information",
+  \u5207\u6362\u6307\u6807: "Switch indicator",
+  \u786E\u5B9A: "Ok",
+  \u53D6\u6D88: "Cancel",
+  \u91CD\u7F6E: "Reset",
+  \u8BF7\u8F93\u5165\u5173\u952E\u5B57\u641C\u7D22: "Please enter a keyword search",
+  \u641C\u7D22: "Search",
+  \u6062\u590D: "Recover",
+  "\u5DF2\u9009 {} \u9879": "selected {} item",
+  \u6240\u9009\u9879: "selected items",
+  \u9009\u62E9\u4E0B\u94BB\u7EF4\u5EA6: "Select drill down dimension",
+  \u6062\u590D\u9ED8\u8BA4: "Restore default",
+  \u641C\u7D22\u5B57\u6BB5: "Search field",
+  \u884C\u5217\u5207\u6362: "Switch Dimensions",
+  \u884C\u5934: "Rows",
+  \u5217\u5934: "Cols",
+  \u503C: "Values",
+  \u5C55\u5F00\u5B50\u9879: "Expand Children",
+  \u9996\u5B57\u6BCD: "Alphabetical order",
+  \u624B\u52A8\u6392\u5E8F: "Custom order",
+  \u5176\u4ED6\u5B57\u6BB5: "Other field",
+  \u9AD8\u7EA7\u6392\u5E8F: "Advanced order",
+  \u8BBE\u7F6E\u987A\u5E8F: "SetManual",
+  \u53EF\u9009\u5B57\u6BB5: "Fields",
+  "\u6309\u4EE5\u4E0B\u89C4\u5219\u8FDB\u884C\u6392\u5E8F\uFF08\u4F18\u5148\u7EA7\u7531\u4F4E\u5230\u9AD8\uFF09": "Order according to the following rules (from low to high priority)",
+  \u6309: "By",
+  \u8BF4\u660E: "Description",
+  \u590D\u5236\u539F\u59CB\u6570\u636E: "Copy raw data",
+  \u590D\u5236\u683C\u5F0F\u5316\u6570\u636E: "Copy formatted data",
+  \u4E0B\u8F7D\u539F\u59CB\u6570\u636E: "Download raw data",
+  \u4E0B\u8F7D\u683C\u5F0F\u5316\u6570\u636E: "Download formatted data",
+  \u64CD\u4F5C\u6210\u529F: "Operation successful",
+  \u64CD\u4F5C\u5931\u8D25: "Operation failed",
+  \u65F6\u95F4: "Date",
+  \u6307\u6807: "Measure",
+  \u76EE\u6807\u503C: "Target Value"
+};
+const ZH_CN = {
+  \u9009\u62E9\u5206\u6790\u4FE1\u606F: "\u9009\u62E9\u5206\u6790\u4FE1\u606F",
+  \u5207\u6362\u6307\u6807: "\u5207\u6362\u6307\u6807",
+  \u786E\u5B9A: "\u786E\u5B9A",
+  \u53D6\u6D88: "\u53D6\u6D88",
+  \u91CD\u7F6E: "\u91CD\u7F6E",
+  \u8BF7\u8F93\u5165\u5173\u952E\u5B57\u641C\u7D22: "\u8BF7\u8F93\u5165\u5173\u952E\u5B57\u641C\u7D22",
+  \u641C\u7D22: "\u641C\u7D22",
+  \u6062\u590D: "\u6062\u590D",
+  "\u5DF2\u9009 {} \u9879": "\u5DF2\u9009 {} \u9879",
+  \u6240\u9009\u9879: "\u6240\u9009\u9879",
+  \u9009\u62E9\u4E0B\u94BB\u7EF4\u5EA6: "\u9009\u62E9\u4E0B\u94BB\u7EF4\u5EA6",
+  \u6062\u590D\u9ED8\u8BA4: "\u6062\u590D\u9ED8\u8BA4",
+  \u641C\u7D22\u5B57\u6BB5: "\u641C\u7D22\u5B57\u6BB5",
+  \u884C\u5217\u5207\u6362: "\u884C\u5217\u5207\u6362",
+  \u884C\u5934: "\u884C\u5934",
+  \u5217\u5934: "\u5217\u5934",
+  \u503C: "\u503C",
+  \u5C55\u5F00\u5B50\u9879: "\u5C55\u5F00\u5B50\u9879",
+  \u9996\u5B57\u6BCD: "\u9996\u5B57\u6BCD",
+  \u624B\u52A8\u6392\u5E8F: "\u624B\u52A8\u6392\u5E8F",
+  \u5176\u4ED6\u5B57\u6BB5: "\u5176\u4ED6\u5B57\u6BB5",
+  \u9AD8\u7EA7\u6392\u5E8F: "\u9AD8\u7EA7\u6392\u5E8F",
+  \u8BBE\u7F6E\u987A\u5E8F: "\u8BBE\u7F6E\u987A\u5E8F",
+  \u53EF\u9009\u5B57\u6BB5: "\u53EF\u9009\u5B57\u6BB5",
+  "\u6309\u4EE5\u4E0B\u89C4\u5219\u8FDB\u884C\u6392\u5E8F\uFF08\u4F18\u5148\u7EA7\u7531\u4F4E\u5230\u9AD8\uFF09": "\u6309\u4EE5\u4E0B\u89C4\u5219\u8FDB\u884C\u6392\u5E8F\uFF08\u4F18\u5148\u7EA7\u7531\u4F4E\u5230\u9AD8\uFF09",
+  \u6309: "\u6309",
+  \u8BF4\u660E: "\u8BF4\u660E",
+  \u590D\u5236\u539F\u59CB\u6570\u636E: "\u590D\u5236\u539F\u59CB\u6570\u636E",
+  \u590D\u5236\u683C\u5F0F\u5316\u6570\u636E: "\u590D\u5236\u683C\u5F0F\u5316\u6570\u636E",
+  \u4E0B\u8F7D\u539F\u59CB\u6570\u636E: "\u4E0B\u8F7D\u539F\u59CB\u6570\u636E",
+  \u4E0B\u8F7D\u683C\u5F0F\u5316\u6570\u636E: "\u4E0B\u8F7D\u683C\u5F0F\u5316\u6570\u636E",
+  \u64CD\u4F5C\u6210\u529F: "\u64CD\u4F5C\u6210\u529F",
+  \u64CD\u4F5C\u5931\u8D25: "\u64CD\u4F5C\u5931\u8D25",
+  \u65F6\u95F4: "\u65F6\u95F4",
+  \u6307\u6807: "\u6307\u6807",
+  \u76EE\u6807\u503C: "\u76EE\u6807\u503C"
+};
+const Locale = {
+  zh_CN: ZH_CN,
+  en_US: EN_US
+};
 const SHEET_COMPONENT_DEFAULT_OPTIONS = {
   tooltip: {
     showTooltip: true,
@@ -34,6 +114,8 @@ const SHEET_COMPONENT_DEFAULT_OPTIONS = {
   },
   showDefaultHeaderActionIcon: true
 };
+const RESIZE_RENDER_DELAY = 200;
+const DRILL_DOWN_PRE_CLASS = "s2-drill-down";
 const getBaseSheetComponentOptions = (...options) => s2.customMerge(s2.DEFAULT_OPTIONS, SHEET_COMPONENT_DEFAULT_OPTIONS, ...options);
 var freeGlobal = typeof global == "object" && global && global.Object === Object && global;
 var freeGlobal$1 = freeGlobal;
@@ -1539,18 +1621,20 @@ function size(collection) {
   }
   return baseKeys(collection).length;
 }
-const RESIZE_RENDER_DELAY = 200;
-const analyzeAdaptive = (paramsContainer, adaptive) => {
+const analyzeAdaptive = (defaultContainer, adaptive) => {
   var _a, _b, _c;
-  let container = paramsContainer;
-  let adaptiveWidth = true;
-  let adaptiveHeight = false;
-  if (typeof adaptive !== "boolean") {
-    container = ((_a = adaptive == null ? void 0 : adaptive.getContainer) == null ? void 0 : _a.call(adaptive)) || paramsContainer;
-    adaptiveWidth = (_b = adaptive == null ? void 0 : adaptive.width) != null ? _b : true;
-    adaptiveHeight = (_c = adaptive == null ? void 0 : adaptive.height) != null ? _c : true;
-  }
-  return { container, adaptiveWidth, adaptiveHeight };
+  if (isBoolean(adaptive)) {
+    return {
+      container: defaultContainer,
+      adaptiveWidth: true,
+      adaptiveHeight: false
+    };
+  }
+  return {
+    container: ((_a = adaptive == null ? void 0 : adaptive.getContainer) == null ? void 0 : _a.call(adaptive)) || defaultContainer,
+    adaptiveWidth: (_b = adaptive == null ? void 0 : adaptive.width) != null ? _b : true,
+    adaptiveHeight: (_c = adaptive == null ? void 0 : adaptive.height) != null ? _c : true
+  };
 };
 const createResizeObserver = (params) => {
   let isFirstRender = true;
@@ -1624,9 +1708,13 @@ const handleActionIconClick = (params) => {
     event
   });
 };
-const defaultDisplayCondition = (meta) => {
-  const iconLevel = get(meta, "spreadsheet.dataCfg.fields.rows.length") - 1;
-  return iconLevel <= meta.level && meta.spreadsheet.options.hierarchyType === "tree" && meta.spreadsheet.isValueInCols() && meta.label !== s2.i18n("\u603B\u8BA1");
+const defaultPartDrillDownDisplayCondition = (meta) => {
+  var _a;
+  const s22 = meta.spreadsheet;
+  const { fields } = s22.dataCfg;
+  const iconLevel = ((_a = fields.rows) == null ? void 0 : _a.length) - 1;
+  const isValueInCols = !isEmpty(fields.values) ? s22.isValueInCols() : true;
+  return iconLevel <= meta.level && s22.isHierarchyTreeType() && isValueInCols && !meta.isGrandTotals;
 };
 const buildDrillDownOptions = (options, partDrillDown, callback) => {
   var _a;
@@ -1636,7 +1724,7 @@ const buildDrillDownOptions = (options, partDrillDown, callback) => {
       belongsCell: "rowCell",
       iconNames: ["DrillDownIcon"],
       defaultHide: true,
-      displayCondition: partDrillDown.displayCondition || defaultDisplayCondition,
+      displayCondition: partDrillDown.displayCondition || defaultPartDrillDownDisplayCondition,
       action: (actionIconProps) => {
         const { iconName, meta, event } = actionIconProps;
         if (iconName === "DrillDownIcon") {
@@ -1656,10 +1744,8 @@ const buildDrillDownOptions = (options, partDrillDown, callback) => {
   });
 };
 const handleDrillDown = (params) => {
-  const { fetchData, spreadsheet, drillFields, drillItemsNum } = params;
-  if (drillItemsNum) {
-    spreadsheet.store.set("drillItemsNum", drillItemsNum);
-  }
+  const { fetchData, spreadsheet, drillFields, drillItemsNum = -1 } = params;
+  spreadsheet.store.set("drillItemsNum", drillItemsNum);
   const meta = spreadsheet.store.get("drillDownNode");
   const { drillDownDataCache, drillDownCurrentCache } = getDrillDownCache(spreadsheet, meta);
   let newDrillDownDataCache = clone(drillDownDataCache);
@@ -1687,87 +1773,6 @@ const handleDrillDown = (params) => {
     spreadsheet.render(false);
   });
 };
-const EN_US = {
-  \u9009\u62E9\u5206\u6790\u4FE1\u606F: "Select Analysis Information",
-  \u5207\u6362\u6307\u6807: "Switch indicator",
-  \u786E\u5B9A: "Ok",
-  \u53D6\u6D88: "Cancel",
-  \u91CD\u7F6E: "Reset",
-  \u8BF7\u8F93\u5165\u5173\u952E\u5B57\u641C\u7D22: "Please enter a keyword search",
-  \u641C\u7D22: "Search",
-  \u6062\u590D: "Recover",
-  "\u5DF2\u9009 {} \u9879": "selected {} item",
-  \u6240\u9009\u9879: "selected items",
-  \u9009\u62E9\u4E0B\u94BB\u7EF4\u5EA6: "Select drill down dimension",
-  \u6062\u590D\u9ED8\u8BA4: "Restore default",
-  \u641C\u7D22\u5B57\u6BB5: "Search field",
-  \u884C\u5217\u5207\u6362: "Switch Dimensions",
-  \u884C\u5934: "Rows",
-  \u5217\u5934: "Cols",
-  \u503C: "Values",
-  \u5C55\u5F00\u5B50\u9879: "Expand Children",
-  \u9996\u5B57\u6BCD: "Alphabetical order",
-  \u624B\u52A8\u6392\u5E8F: "Custom order",
-  \u5176\u4ED6\u5B57\u6BB5: "Other field",
-  \u9AD8\u7EA7\u6392\u5E8F: "Advanced order",
-  \u8BBE\u7F6E\u987A\u5E8F: "SetManual",
-  \u53EF\u9009\u5B57\u6BB5: "Fields",
-  "\u6309\u4EE5\u4E0B\u89C4\u5219\u8FDB\u884C\u6392\u5E8F\uFF08\u4F18\u5148\u7EA7\u7531\u4F4E\u5230\u9AD8\uFF09": "Order according to the following rules (from low to high priority)",
-  \u6309: "By",
-  \u8BF4\u660E: "Description",
-  \u590D\u5236\u539F\u59CB\u6570\u636E: "Copy raw data",
-  \u590D\u5236\u683C\u5F0F\u5316\u6570\u636E: "Copy formatted data",
-  \u4E0B\u8F7D\u539F\u59CB\u6570\u636E: "Download raw data",
-  \u4E0B\u8F7D\u683C\u5F0F\u5316\u6570\u636E: "Download formatted data",
-  \u64CD\u4F5C\u6210\u529F: "Operation successful",
-  \u64CD\u4F5C\u5931\u8D25: "Operation failed",
-  \u65F6\u95F4: "Date",
-  \u6307\u6807: "Measure",
-  \u76EE\u6807\u503C: "Target Value"
-};
-const ZH_CN = {
-  \u9009\u62E9\u5206\u6790\u4FE1\u606F: "\u9009\u62E9\u5206\u6790\u4FE1\u606F",
-  \u5207\u6362\u6307\u6807: "\u5207\u6362\u6307\u6807",
-  \u786E\u5B9A: "\u786E\u5B9A",
-  \u53D6\u6D88: "\u53D6\u6D88",
-  \u91CD\u7F6E: "\u91CD\u7F6E",
-  \u8BF7\u8F93\u5165\u5173\u952E\u5B57\u641C\u7D22: "\u8BF7\u8F93\u5165\u5173\u952E\u5B57\u641C\u7D22",
-  \u641C\u7D22: "\u641C\u7D22",
-  \u6062\u590D: "\u6062\u590D",
-  "\u5DF2\u9009 {} \u9879": "\u5DF2\u9009 {} \u9879",
-  \u6240\u9009\u9879: "\u6240\u9009\u9879",
-  \u9009\u62E9\u4E0B\u94BB\u7EF4\u5EA6: "\u9009\u62E9\u4E0B\u94BB\u7EF4\u5EA6",
-  \u6062\u590D\u9ED8\u8BA4: "\u6062\u590D\u9ED8\u8BA4",
-  \u641C\u7D22\u5B57\u6BB5: "\u641C\u7D22\u5B57\u6BB5",
-  \u884C\u5217\u5207\u6362: "\u884C\u5217\u5207\u6362",
-  \u884C\u5934: "\u884C\u5934",
-  \u5217\u5934: "\u5217\u5934",
-  \u503C: "\u503C",
-  \u5C55\u5F00\u5B50\u9879: "\u5C55\u5F00\u5B50\u9879",
-  \u9996\u5B57\u6BCD: "\u9996\u5B57\u6BCD",
-  \u624B\u52A8\u6392\u5E8F: "\u624B\u52A8\u6392\u5E8F",
-  \u5176\u4ED6\u5B57\u6BB5: "\u5176\u4ED6\u5B57\u6BB5",
-  \u9AD8\u7EA7\u6392\u5E8F: "\u9AD8\u7EA7\u6392\u5E8F",
-  \u8BBE\u7F6E\u987A\u5E8F: "\u8BBE\u7F6E\u987A\u5E8F",
-  \u53EF\u9009\u5B57\u6BB5: "\u53EF\u9009\u5B57\u6BB5",
-  "\u6309\u4EE5\u4E0B\u89C4\u5219\u8FDB\u884C\u6392\u5E8F\uFF08\u4F18\u5148\u7EA7\u7531\u4F4E\u5230\u9AD8\uFF09": "\u6309\u4EE5\u4E0B\u89C4\u5219\u8FDB\u884C\u6392\u5E8F\uFF08\u4F18\u5148\u7EA7\u7531\u4F4E\u5230\u9AD8\uFF09",
-  \u6309: "\u6309",
-  \u8BF4\u660E: "\u8BF4\u660E",
-  \u590D\u5236\u539F\u59CB\u6570\u636E: "\u590D\u5236\u539F\u59CB\u6570\u636E",
-  \u590D\u5236\u683C\u5F0F\u5316\u6570\u636E: "\u590D\u5236\u683C\u5F0F\u5316\u6570\u636E",
-  \u4E0B\u8F7D\u539F\u59CB\u6570\u636E: "\u4E0B\u8F7D\u539F\u59CB\u6570\u636E",
-  \u4E0B\u8F7D\u683C\u5F0F\u5316\u6570\u636E: "\u4E0B\u8F7D\u683C\u5F0F\u5316\u6570\u636E",
-  \u64CD\u4F5C\u6210\u529F: "\u64CD\u4F5C\u6210\u529F",
-  \u64CD\u4F5C\u5931\u8D25: "\u64CD\u4F5C\u5931\u8D25",
-  \u65F6\u95F4: "\u65F6\u95F4",
-  \u6307\u6807: "\u6307\u6807",
-  \u76EE\u6807\u503C: "\u76EE\u6807\u503C"
-};
-const Locale = {
-  zh_CN: ZH_CN,
-  en_US: EN_US
-};
-const DRILL_DOWN_PRE_CLASS = "s2-drill-down";
 s2.extendLocale(Locale);
 const useExpose = (expose) => {
   const s2Ref = vue.shallowRef();
@@ -2009,9 +2014,15 @@ const _sfc_main$9 = vue.defineComponent({
   name: "TooltipSummary",
   props: ["summaries"],
   setup(props) {
-    const count = vue.computed(() => reduce(props.summaries, (pre, next) => pre + size(next == null ? void 0 : next.selectedData), 0));
+    const summaryInfo = vue.computed(() => reduce(props.summaries, (pre, next) => {
+      pre.count += size(next == null ? void 0 : next.selectedData);
+      if (next.value || next.name) {
+        pre.summaries.push(next);
+      }
+      return pre;
+    }, { count: 0, summaries: [] }));
     return {
-      count: count.value,
+      summaryInfo,
       i18n: s2.i18n,
       TOOLTIP_PREFIX_CLS: s2.TOOLTIP_PREFIX_CLS
     };
@@ -2027,10 +2038,10 @@ function _sfc_render$9(_ctx, _cache, $props, $setup, $data, $options) {
     }, [
       vue.createElementVNode("span", {
         class: vue.normalizeClass(`${_ctx.TOOLTIP_PREFIX_CLS}-selected`)
-      }, vue.toDisplayString(_ctx.count) + " " + vue.toDisplayString(_ctx.i18n("\u9879")), 3),
+      }, vue.toDisplayString(_ctx.summaryInfo.count) + " " + vue.toDisplayString(_ctx.i18n("\u9879")), 3),
       vue.createTextVNode(" " + vue.toDisplayString(_ctx.i18n("\u5DF2\u9009\u62E9")), 1)
     ], 2),
-    (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.summaries, (summary) => {
+    (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.summaryInfo.summaries, (summary) => {
       return vue.openBlock(), vue.createElementBlock("div", {
         key: `${summary.name}-${summary.value}`,
         class: vue.normalizeClass(`${_ctx.TOOLTIP_PREFIX_CLS}-summary-item`)
@@ -2081,6 +2092,7 @@ const _sfc_main$7 = vue.defineComponent({
     };
     return {
       onMenuTitleClick,
+      isEmpty,
       TOOLTIP_PREFIX_CLS: s2.TOOLTIP_PREFIX_CLS
     };
   },
@@ -2095,44 +2107,58 @@ function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_TooltipOperatorMenu = vue.resolveComponent("TooltipOperatorMenu");
   const _component_MenuItem = vue.resolveComponent("MenuItem");
   const _component_SubMenu = vue.resolveComponent("SubMenu");
-  return vue.openBlock(), vue.createBlock(_component_SubMenu, {
-    key: _ctx.menu.key,
-    popupClassName: `${_ctx.TOOLTIP_PREFIX_CLS}-operator-submenu-popup`,
-    onTitleClick: _ctx.onMenuTitleClick
-  }, {
-    title: vue.withCtx(() => [
-      vue.createVNode(_component_TooltipOperatorTitle, {
-        menu: _ctx.menu,
-        onClick: _ctx.onMenuTitleClick
-      }, null, 8, ["menu", "onClick"])
-    ]),
-    default: vue.withCtx(() => [
-      (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.menu.children, (subMenu) => {
-        var _a;
-        return vue.openBlock(), vue.createElementBlock(vue.Fragment, {
-          key: subMenu.key
-        }, [
-          ((_a = subMenu == null ? void 0 : subMenu.children) == null ? void 0 : _a.length) ? (vue.openBlock(), vue.createBlock(_component_TooltipOperatorMenu, {
-            key: 0,
-            menu: subMenu,
-            cell: _ctx.cell
-          }, null, 8, ["menu", "cell"])) : (vue.openBlock(), vue.createBlock(_component_MenuItem, {
-            title: subMenu.text,
+  return vue.openBlock(), vue.createElementBlock(vue.Fragment, null, [
+    !_ctx.isEmpty(_ctx.menu.children) ? (vue.openBlock(), vue.createBlock(_component_SubMenu, {
+      key: _ctx.menu.key,
+      popupClassName: `${_ctx.TOOLTIP_PREFIX_CLS}-operator-submenu-popup`,
+      onTitleClick: _ctx.onMenuTitleClick
+    }, {
+      title: vue.withCtx(() => [
+        vue.createVNode(_component_TooltipOperatorTitle, {
+          menu: _ctx.menu,
+          onClick: _ctx.onMenuTitleClick
+        }, null, 8, ["menu", "onClick"])
+      ]),
+      default: vue.withCtx(() => [
+        (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.menu.children, (subMenu) => {
+          var _a;
+          return vue.openBlock(), vue.createElementBlock(vue.Fragment, {
             key: subMenu.key
-          }, {
-            default: vue.withCtx(() => [
-              vue.createVNode(_component_TooltipOperatorTitle, {
-                menu: subMenu,
-                onClick: _ctx.onMenuTitleClick
-              }, null, 8, ["menu", "onClick"])
-            ]),
-            _: 2
-          }, 1032, ["title"]))
-        ], 64);
-      }), 128))
-    ]),
-    _: 1
-  }, 8, ["popupClassName", "onTitleClick"]);
+          }, [
+            ((_a = subMenu == null ? void 0 : subMenu.children) == null ? void 0 : _a.length) ? (vue.openBlock(), vue.createBlock(_component_TooltipOperatorMenu, {
+              key: 0,
+              menu: subMenu,
+              cell: _ctx.cell
+            }, null, 8, ["menu", "cell"])) : (vue.openBlock(), vue.createBlock(_component_MenuItem, {
+              title: subMenu.text,
+              key: subMenu.key
+            }, {
+              default: vue.withCtx(() => [
+                vue.createVNode(_component_TooltipOperatorTitle, {
+                  menu: subMenu,
+                  onClick: _ctx.onMenuTitleClick
+                }, null, 8, ["menu", "onClick"])
+              ]),
+              _: 2
+            }, 1032, ["title"]))
+          ], 64);
+        }), 128))
+      ]),
+      _: 1
+    }, 8, ["popupClassName", "onTitleClick"])) : vue.createCommentVNode("", true),
+    _ctx.isEmpty(_ctx.menu.children) ? (vue.openBlock(), vue.createBlock(_component_MenuItem, {
+      title: _ctx.menu.text,
+      key: _ctx.menu.key
+    }, {
+      default: vue.withCtx(() => [
+        vue.createVNode(_component_TooltipOperatorTitle, {
+          menu: _ctx.menu,
+          onClick: _ctx.onMenuTitleClick
+        }, null, 8, ["menu", "onClick"])
+      ]),
+      _: 1
+    }, 8, ["title"])) : vue.createCommentVNode("", true)
+  ], 64);
 }
 var TooltipOperatorMenu = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["render", _sfc_render$7]]);
 var index_vue_vue_type_style_index_0_lang$1 = "";
@@ -2144,9 +2170,13 @@ const _sfc_main$6 = vue.defineComponent({
     "onClick",
     "cell"
   ],
-  setup() {
+  setup(props, { emit }) {
+    const onMenuClick = (...args) => {
+      emit("click", ...args);
+    };
     return {
-      TOOLTIP_PREFIX_CLS: s2.TOOLTIP_PREFIX_CLS
+      TOOLTIP_PREFIX_CLS: s2.TOOLTIP_PREFIX_CLS,
+      onMenuClick
     };
   },
   components: {
@@ -2167,7 +2197,7 @@ function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
     _ctx.onlyMenu ? (vue.openBlock(), vue.createBlock(_component_Menu, {
       key: 0,
       class: vue.normalizeClass(`${_ctx.TOOLTIP_PREFIX_CLS}-operator-menus`),
-      onClick: _cache[0] || (_cache[0] = ($event) => _ctx.$.emit("click"))
+      onClick: _ctx.onMenuClick
     }, {
       default: vue.withCtx(() => [
         (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.menus, (menu) => {
@@ -2179,7 +2209,7 @@ function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
         }), 128))
       ]),
       _: 1
-    }, 8, ["class"])) : (vue.openBlock(true), vue.createElementBlock(vue.Fragment, { key: 1 }, vue.renderList(_ctx.menus, (menu) => {
+    }, 8, ["class", "onClick"])) : (vue.openBlock(true), vue.createElementBlock(vue.Fragment, { key: 1 }, vue.renderList(_ctx.menus, (menu) => {
       return vue.openBlock(), vue.createBlock(_component_Dropdown, {
         key: menu.key,
         class: vue.normalizeClass(`${_ctx.TOOLTIP_PREFIX_CLS}-operator-dropdown`)
@@ -2190,7 +2220,7 @@ function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
             ((_a = menu == null ? void 0 : menu.children) == null ? void 0 : _a.length) ? (vue.openBlock(), vue.createBlock(_component_Menu, {
               key: 0,
               class: vue.normalizeClass(`${_ctx.TOOLTIP_PREFIX_CLS}-operator-menus`),
-              onClick: _cache[1] || (_cache[1] = ($event) => _ctx.$.emit("click"))
+              onClick: _ctx.onMenuClick
             }, {
               default: vue.withCtx(() => [
                 (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.menus, (menu2) => {
@@ -2202,7 +2232,7 @@ function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
                 }), 128))
               ]),
               _: 2
-            }, 1032, ["class"])) : vue.createCommentVNode("", true)
+            }, 1032, ["class", "onClick"])) : vue.createCommentVNode("", true)
           ];
         }),
         default: vue.withCtx(() => [
@@ -2560,7 +2590,7 @@ const initBaseSheetProps = () => ({
   dataCfg: Object,
   themeCfg: Object,
   showPagination: {
-    type: Object,
+    type: [Object, Boolean],
     default: false
   },
   loading: Boolean,
@@ -2571,7 +2601,7 @@ const initBaseSheetProps = () => ({
     default: {}
   },
   adaptive: {
-    type: Object,
+    type: [Object, Boolean],
     default: false
   },
   onSpreadsheet: Function,
@@ -2677,7 +2707,10 @@ const initBaseSheetEmits = () => {
     "mouseUp",
     "selected",
     "reset",
-    "linkFieldJump"
+    "linkFieldJump",
+    "click",
+    "doubleClick",
+    "scroll"
   ];
   return keys2;
 };
@@ -2949,7 +2982,7 @@ var DrillDown = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["render", _sfc_render
 const _sfc_main$2 = vue.defineComponent({
   name: "PivotSheet",
   props: initBaseSheetProps(),
-  emits: initBaseSheetEmits(),
+  emits: [],
   setup(props, ctx) {
     const s2Ref = useExpose(ctx.expose);
     const { options: pivotOptions } = vue.toRefs(props);