@antv/s2-vue 2.0.0-next.7 → 2.0.0-next.8

package/esm/style.css

@@ -2,30 +2,31 @@
   color: var(--antv-s2-font, rgba(0, 0, 0, 0.65));
   background: var(--antv-s2-tooltip-operator-background, #f9f9f9);
   font-size: 12px;
-  line-height: 32px;
-  padding: 0 12px;
+  line-height: 36px;
   border: 0;
   cursor: pointer;
 }
+.antv-s2-tooltip-operator .ant-menu-horizontal:not(.ant-menu-dark) {
+  background: transparent;
+  line-height: 36px;
+}
 .antv-s2-tooltip-operator .ant-dropdown-trigger,
 .antv-s2-tooltip-operator-dropdown {
   padding: 0 6px 0 0;
 }
 .antv-s2-tooltip-operator-menus.ant-menu-vertical.ant-menu {
   font-size: 12px;
-  line-height: 32px;
   color: var(--antv-s2-font, rgba(0, 0, 0, 0.65));
   border: 0;
-  margin: 0 -12px;
+  user-select: none;
+  padding: 4px;
 }
 .antv-s2-tooltip-operator-menus.ant-menu-vertical.ant-menu .ant-menu-item {
-  height: 30px;
-}
-.antv-s2-tooltip-operator-menus.ant-menu-vertical.ant-menu .ant-menu-item:not(:last-child) {
-  margin: 0;
+  height: 36px;
 }
 .antv-s2-tooltip-operator-menus.ant-menu-vertical.ant-menu .ant-menu-submenu > .ant-menu-submenu-title {
-  height: 30px;
+  height: 36px;
+  width: 100%;
 }
 .antv-s2-tooltip-operator-menus.ant-menu-vertical.ant-menu .ant-menu-submenu > .ant-menu-submenu-title .ant-menu-submenu-arrow {
   color: var(--antv-s2-font, rgba(0, 0, 0, 0.65));
@@ -35,10 +36,9 @@
 .antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-menu-item,
 .antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-menu-item {
   font-size: 12px;
-  line-height: 32px;
+  line-height: 36px;
   padding: 0 12px;
   border: 0;
-  margin: 0;
 }
 .antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-dropdown-menu-item:not(.ant-menu-item-active),
 .antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-dropdown-menu-item:not(.ant-menu-item-active),
@@ -54,9 +54,9 @@
 .antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-menu-submenu .ant-menu-submenu-title,
 .antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-menu-submenu-vertical .ant-menu-submenu-title,
 .antv-s2-tooltip-operator-menus.ant-menu-vertical .ant-menu-submenu-vertical .ant-menu-submenu-title {
-  padding: 0 12px;
+  padding: 0 0 0 12px;
   font-size: 12px;
-  line-height: 32px;
+  line-height: 36px;
   margin: 0;
 }
 .antv-s2-tooltip-operator-menus.ant-dropdown-menu-vertical .ant-dropdown-menu-submenu .ant-menu-submenu-title:not(.ant-menu-item-active),
@@ -90,7 +90,7 @@
 .antv-s2-tooltip-operator-submenu-popup .ant-dropdown-menu-item,
 .antv-s2-tooltip-operator-submenu-popup .ant-menu-item {
   font-size: 12px;
-  line-height: 32px;
+  line-height: 36px;
   padding: 0 12px;
 }
 .antv-s2-tooltip-operator-submenu-popup .ant-dropdown-menu-item:not(.ant-menu-item-active),
@@ -99,15 +99,15 @@
 }
 .antv-s2-tooltip-operator-submenu-popup .ant-menu-vertical .ant-menu-item {
   margin: 0;
-  height: 30px;
-  line-height: 32px;
+  height: 36px;
+  line-height: 36px;
+  width: 100%;
 }
 .antv-s2-tooltip-operator-submenu-popup .ant-menu-vertical .ant-menu-item:not(:last-child) {
   margin: 0;
 }
 .antv-s2-tooltip-operator-icon {
   vertical-align: middle;
-  margin-right: 4px;
 }
 .antv-s2-tooltip-operator-icon svg {
   width: 12px;
@@ -170,7 +170,7 @@
   z-index: 1024;
   display: inline-block;
   background: var(--antv-s2-tooltip-background, rgba(255, 255, 255, 0.95));
-  border-radius: 2px;
+  border-radius: 4px;
   box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.2);
   font-size: 12px;
   font-family: Roboto, 'PingFang SC', 'Chinese Quote', BlinkMacSystemFont, 'Segoe UI', 'Hiragino Sans GB', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif;
@@ -329,6 +329,7 @@
   width: 260px;
   min-height: 20px;
   position: relative;
+  color: var(--antv-s2-font-70, #fff);
 }
 .antv-s2-drill-down-header[data-v-8dd920ec] {
   display: flex;
@@ -352,16 +353,21 @@
   margin: 0 16px;
   border: 1px solid rgba(0, 0, 0, 0.15);
   border-radius: 2px;
-  background-color: #fff;
 }
 .antv-s2-drill-down-search input[data-v-8dd920ec],
 .antv-s2-drill-down-search span[data-v-8dd920ec] {
   font-size: 12px;
 }
+.antv-s2-drill-down-search[data-v-8dd920ec],
+.antv-s2-drill-down-search .ant-input[data-v-8dd920ec]::placeholder {
+  background-color: var(--antv-s2-block-background, #fff);
+}
+.antv-s2-drill-down-extra[data-v-8dd920ec] {
+  margin: 4px 16px;
+}
 .antv-s2-drill-down-menu[data-v-8dd920ec] {
   max-height: 314px;
-  overflow-y: auto;
-  overflow-x: hidden;
+  overflow: hidden auto;
 }
 .antv-s2-drill-down-menu.ant-menu[data-v-8dd920ec] {
   background: var(--antv-s2-tooltip-background, #fff);
@@ -382,6 +388,6 @@
   margin-right: 8px;
 }
 .antv-s2-drill-down-empty[data-v-8dd920ec] {
-  padding: 18px 18px 0;
+  padding: 12px;
   font-size: 12px;
 }

package/lib/index.js

@@ -449,7 +449,9 @@ function arrayLikeKeys(value, inherited) {
   var isArr = isArray$1(value), isArg = !isArr && isArguments$1(value), isBuff = !isArr && !isArg && isBuffer$1(value), isType = !isArr && !isArg && !isBuff && isTypedArray$1(value), skipIndexes = isArr || isArg || isBuff || isType, result = skipIndexes ? baseTimes(value.length, String) : [], length = result.length;
   for (var key in value) {
     if ((inherited || hasOwnProperty$8.call(value, key)) && !(skipIndexes && // Safari 9 has enumerable `arguments.length` in strict mode.
-    (key == "length" || isBuff && (key == "offset" || key == "parent") || isType && (key == "buffer" || key == "byteLength" || key == "byteOffset") || // Skip index properties.
+    (key == "length" || // Node.js 0.10 has enumerable non-index properties on buffers.
+    isBuff && (key == "offset" || key == "parent") || // PhantomJS 2 has enumerable non-index properties on typed arrays.
+    isType && (key == "buffer" || key == "byteLength" || key == "byteOffset") || // Skip index properties.
     isIndex(key, length)))) {
       result.push(key);
     }
@@ -1724,21 +1726,23 @@ const buildDrillDownOptions = (options, partDrillDown, callback) => {
   const nextHeaderIcons = ((_a = options == null ? void 0 : options.headerActionIcons) == null ? void 0 : _a.length) ? [...options.headerActionIcons] : [];
   if (!isEmpty(partDrillDown)) {
     const drillDownActionIcon = {
-      belongsCell: "rowCell",
-      icons: ["DrillDownIcon"],
-      defaultHide: true,
-      displayCondition: partDrillDown.displayCondition || defaultPartDrillDownDisplayCondition,
-      onClick: (actionIconProps) => {
-        const { iconName, meta, event } = actionIconProps;
-        if (iconName === "DrillDownIcon") {
-          meta.spreadsheet.store.set("drillDownNode", meta);
-          handleActionIconClick({
-            meta,
-            event,
-            callback
-          });
+      icons: [
+        {
+          name: "DrillDownIcon",
+          position: "right",
+          onClick: ({ meta, event }) => {
+            meta.spreadsheet.store.set("drillDownNode", meta);
+            handleActionIconClick({
+              meta,
+              event,
+              callback
+            });
+          }
         }
-      }
+      ],
+      belongsCell: "rowCell",
+      defaultHide: false,
+      displayCondition: (partDrillDown == null ? void 0 : partDrillDown.displayCondition) || defaultPartDrillDownDisplayCondition
     };
     nextHeaderIcons.push(drillDownActionIcon);
   }
@@ -1978,7 +1982,7 @@ function _sfc_render$9(_ctx, _cache, $props, $setup, $data, $options) {
     }, null, 10, _hoisted_1$3)) : vue.createCommentVNode("", true),
     vue.createElementVNode("span", {
       class: vue.normalizeClass(`${_ctx.TOOLTIP_PREFIX_CLS}-operator-text`)
-    }, vue.toDisplayString(_ctx.menu.text), 3)
+    }, vue.toDisplayString(_ctx.menu.label), 3)
   ]);
 }
 const TooltipOperatorTitle = /* @__PURE__ */ _export_sfc(_sfc_main$9, [["render", _sfc_render$9]]);
@@ -1986,9 +1990,10 @@ const _sfc_main$8 = vue.defineComponent({
   name: "TooltipOperatorMenu",
   props: ["menu", "cell"],
   setup(props) {
+    const { menu, cell } = props;
     const onMenuTitleClick = () => {
       var _a, _b;
-      (_b = (_a = props.menu).onClick) == null ? void 0 : _b.call(_a, props.cell);
+      (_b = (_a = props.menu).onClick) == null ? void 0 : _b.call(_a, menu, cell);
     };
     return {
       onMenuTitleClick,
@@ -2030,7 +2035,7 @@ function _sfc_render$8(_ctx, _cache, $props, $setup, $data, $options) {
               menu: subMenu,
               cell: _ctx.cell
             }, null, 8, ["menu", "cell"])) : (vue.openBlock(), vue.createBlock(_component_MenuItem, {
-              title: subMenu.text,
+              title: subMenu.label,
               key: subMenu.key
             }, {
               default: vue.withCtx(() => [
@@ -2047,7 +2052,7 @@ function _sfc_render$8(_ctx, _cache, $props, $setup, $data, $options) {
       _: 1
     }, 8, ["popupClassName", "onTitleClick"])) : vue.createCommentVNode("", true),
     _ctx.isEmpty(_ctx.menu.children) ? (vue.openBlock(), vue.createBlock(_component_MenuItem, {
-      title: _ctx.menu.text,
+      title: _ctx.menu.label,
       key: _ctx.menu.key
     }, {
       default: vue.withCtx(() => [
@@ -2064,18 +2069,24 @@ const TooltipOperatorMenu = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["render",
 const _sfc_main$7 = vue.defineComponent({
   name: "TooltipOperator",
   props: [
-    "menus",
+    "menu",
     "onlyShowOperator",
-    "onClick",
     "cell"
   ],
-  setup(_, { emit }) {
+  setup(props) {
+    const { menu, cell } = props;
     const onMenuClick = (menuInfo) => {
-      emit("click", menuInfo);
+      var _a;
+      (_a = menu == null ? void 0 : menu.onClick) == null ? void 0 : _a.call(menu, menuInfo, cell);
+    };
+    const onMenuTitleClick = (subMenu) => () => {
+      subMenu == null ? void 0 : subMenu.onClick(subMenu, cell);
     };
     return {
       TOOLTIP_PREFIX_CLS: s2.TOOLTIP_PREFIX_CLS,
-      onMenuClick
+      onMenuClick,
+      onMenuTitleClick,
+      menus: menu == null ? void 0 : menu.items
     };
   },
   components: {
@@ -2138,10 +2149,7 @@ function _sfc_render$7(_ctx, _cache, $props, $setup, $data, $options) {
         default: vue.withCtx(() => [
           vue.createVNode(_component_TooltipOperatorTitle, {
             menu,
-            onClick: ($event) => {
-              var _a;
-              return (_a = menu.onClick) == null ? void 0 : _a.call(menu, _ctx.cell);
-            }
+            onClick: ($event) => _ctx.onMenuTitleClick(menu)
           }, null, 8, ["menu", "onClick"])
         ]),
         _: 2
@@ -2180,7 +2188,7 @@ const _sfc_main$6 = vue.defineComponent({
 });
 const index_vue_vue_type_style_index_0_lang = "";
 function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
   const _component_TooltipOperator = vue.resolveComponent("TooltipOperator");
   const _component_TooltipSimpleTips = vue.resolveComponent("TooltipSimpleTips");
   const _component_TooltipSummary = vue.resolveComponent("TooltipSummary");
@@ -2189,36 +2197,34 @@ function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_TooltipInfos = vue.resolveComponent("TooltipInfos");
   return _ctx.onlyShowOperator ? (vue.openBlock(), vue.createBlock(_component_TooltipOperator, {
     key: 0,
-    menus: ((_a = _ctx.operator) == null ? void 0 : _a.menus) || [],
+    menu: (_a = _ctx.operator) == null ? void 0 : _a.menu,
     onlyShowOperator: true,
-    cell: _ctx.cell,
-    onClick: (_b = _ctx.operator) == null ? void 0 : _b.onClick
-  }, null, 8, ["menus", "cell", "onClick"])) : (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 1 }, [
+    cell: _ctx.cell
+  }, null, 8, ["menu", "cell"])) : (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 1 }, [
     vue.createVNode(_component_TooltipOperator, {
-      menus: ((_c = _ctx.operator) == null ? void 0 : _c.menus) || [],
+      menu: (_b = _ctx.operator) == null ? void 0 : _b.menu,
       onlyShowOperator: false,
-      cell: _ctx.cell,
-      onClick: (_d = _ctx.operator) == null ? void 0 : _d.onClick
-    }, null, 8, ["menus", "cell", "onClick"]),
+      cell: _ctx.cell
+    }, null, 8, ["menu", "cell"]),
     _ctx.content ? vue.renderSlot(_ctx.$slots, "content", { key: 0 }) : (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 1 }, [
       vue.createVNode(_component_TooltipSimpleTips, {
-        name: (_e = _ctx.data) == null ? void 0 : _e.name,
-        tips: (_f = _ctx.data) == null ? void 0 : _f.tips
+        name: (_c = _ctx.data) == null ? void 0 : _c.name,
+        tips: (_d = _ctx.data) == null ? void 0 : _d.tips
       }, null, 8, ["name", "tips"]),
-      ((_h = (_g = _ctx.data) == null ? void 0 : _g.summaries) == null ? void 0 : _h.length) ? (vue.openBlock(), vue.createBlock(_component_TooltipSummary, {
+      ((_f = (_e = _ctx.data) == null ? void 0 : _e.summaries) == null ? void 0 : _f.length) ? (vue.openBlock(), vue.createBlock(_component_TooltipSummary, {
         key: 0,
-        summaries: (_i = _ctx.data) == null ? void 0 : _i.summaries
+        summaries: (_g = _ctx.data) == null ? void 0 : _g.summaries
       }, null, 8, ["summaries"])) : vue.createCommentVNode("", true),
       vue.createVNode(_component_TooltipHeadInfo, {
-        rows: ((_k = (_j = _ctx.data) == null ? void 0 : _j.headInfo) == null ? void 0 : _k.rows) || [],
-        cols: ((_m = (_l = _ctx.data) == null ? void 0 : _l.headInfo) == null ? void 0 : _m.cols) || []
+        rows: ((_i = (_h = _ctx.data) == null ? void 0 : _h.headInfo) == null ? void 0 : _i.rows) || [],
+        cols: ((_k = (_j = _ctx.data) == null ? void 0 : _j.headInfo) == null ? void 0 : _k.cols) || []
       }, null, 8, ["rows", "cols"]),
       vue.createVNode(_component_TooltipDetail, {
-        list: ((_n = _ctx.data) == null ? void 0 : _n.details) || []
+        list: ((_l = _ctx.data) == null ? void 0 : _l.details) || []
       }, null, 8, ["list"]),
-      ((_o = _ctx.data) == null ? void 0 : _o.infos) ? (vue.openBlock(), vue.createBlock(_component_TooltipInfos, {
+      ((_m = _ctx.data) == null ? void 0 : _m.infos) ? (vue.openBlock(), vue.createBlock(_component_TooltipInfos, {
         key: 1,
-        infos: (_p = _ctx.data) == null ? void 0 : _p.infos
+        infos: (_n = _ctx.data) == null ? void 0 : _n.infos
       }, null, 8, ["infos"])) : vue.createCommentVNode("", true)
     ], 64))
   ], 64));