ele-admin-plus 1.2.0 → 1.2.1-beta.2

package/es/ele-tool/index.js

@@ -1,33 +1,47 @@
-import { defineComponent, ref, watch, resolveComponent, openBlock, createElementBlock, createVNode, withCtx, createElementVNode, renderSlot } from "vue";
-import EleTooltip from "../ele-tooltip/index";
+import { defineComponent, inject, watch, openBlock, createElementBlock, createElementVNode, renderSlot } from "vue";
+import { useTimer } from "../utils/hook";
+import { TOOLBAR_KEY } from "../ele-toolbar/props";
 import { toolProps, toolEmits } from "./props";
 const _sfc_main = defineComponent({
   name: "EleTool",
-  components: { EleTooltip },
   props: toolProps,
   emits: toolEmits,
   setup(props, { emit }) {
-    const visible = ref(false);
-    const updateVisible = (value) => {
-      if (value && (!props.title || props.disabled)) {
-        visible.value = false;
-        return;
+    const toolbarProvide = inject(TOOLBAR_KEY, {});
+    const [startHideTipTimer, stopHideTipTimer] = useTimer(200);
+    const showTooltip = (text, el, options) => {
+      if (toolbarProvide.showTooltip) {
+        toolbarProvide.showTooltip(text, el, options);
       }
-      visible.value = value;
     };
-    const onClick = (e) => {
-      visible.value = false;
+    const hideTooltip = () => {
+      toolbarProvide.hideTooltip && toolbarProvide.hideTooltip();
+    };
+    const handleClick = (e) => {
+      startHideTipTimer(() => {
+        hideTooltip();
+      });
       emit("click", e);
     };
+    const handleMouseover = (e) => {
+      if (props.title && !props.disabled) {
+        stopHideTipTimer();
+        showTooltip(props.title, e.currentTarget, {
+          placement: props.placement,
+          offset: 10
+        });
+      }
+    };
     watch([() => props.disabled, () => props.title], () => {
       if (!props.title || props.disabled) {
-        visible.value = false;
+        hideTooltip();
       }
     });
     return {
-      visible,
-      updateVisible,
-      onClick
+      handleClick,
+      handleMouseover,
+      showTooltip,
+      hideTooltip
     };
   }
 });
@@ -40,26 +54,15 @@ const _export_sfc = (sfc, props) => {
 };
 const _hoisted_1 = { class: "ele-tool-body" };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_EleTooltip = resolveComponent("EleTooltip");
   return openBlock(), createElementBlock("div", {
     class: "ele-tool",
-    onClick: _cache[0] || (_cache[0] = (...args) => _ctx.onClick && _ctx.onClick(...args))
+    onClick: _cache[0] || (_cache[0] = (...args) => _ctx.handleClick && _ctx.handleClick(...args)),
+    onMouseover: _cache[1] || (_cache[1] = (...args) => _ctx.handleMouseover && _ctx.handleMouseover(...args))
   }, [
-    createVNode(_component_EleTooltip, {
-      content: _ctx.title,
-      visible: _ctx.visible,
-      placement: _ctx.placement,
-      offset: 10,
-      "onUpdate:visible": _ctx.updateVisible
-    }, {
-      default: withCtx(() => [
-        createElementVNode("div", _hoisted_1, [
-          renderSlot(_ctx.$slots, "default")
-        ])
-      ]),
-      _: 3
-    }, 8, ["content", "visible", "placement", "onUpdate:visible"])
-  ]);
+    createElementVNode("div", _hoisted_1, [
+      renderSlot(_ctx.$slots, "default")
+    ])
+  ], 32);
 }
 const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 export {

package/es/ele-tool/style/index.js

@@ -1,2 +1 @@
-import "../../ele-tooltip/style/index";
 import "./index.scss";

package/es/ele-tool/style/index.scss

@@ -32,19 +32,6 @@
     line-height: inherit;
     position: static;
   }
-
-  .el-tooltip__trigger {
-    position: static;
-
-    &::before {
-      content: '';
-      position: absolute;
-      top: 0;
-      left: 0;
-      right: 0;
-      bottom: 0;
-    }
-  }
 }
 
 .ele-toolbar .ele-tool {