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

package/es/ele-table-select/index.js

@@ -3,6 +3,7 @@ import { useResponsive } from "../ele-pro-layout/util";
 import EleBasicSelect from "../ele-basic-select/index";
 import { isEmptyValue, valueIsChanged } from "../ele-basic-select/util";
 import EleProTable from "../ele-pro-table/index";
+import { isDisableRow } from "../ele-data-table/util";
 import { tableSelectProps, tableSelectEmits } from "./props";
 const _sfc_main = defineComponent({
   name: "EleTableSelect",
@@ -158,7 +159,7 @@ const _sfc_main = defineComponent({
     const focusSearchInput = () => {
       selectRef.value && selectRef.value.focusSearchInput();
     };
-    const onInitValueChange = (initValue) => {
+    const handleInitValueChange = (initValue) => {
       const valueKey = props.valueKey;
       if (!props.multiple) {
         const key = initValue[valueKey];
@@ -200,23 +201,23 @@ const _sfc_main = defineComponent({
         emit("visibleChange", visible);
       }
     };
-    const onSelectRemove = (item) => {
+    const handleSelectRemove = (item) => {
       const values = props.modelValue || [];
       updateModelValue(values.filter((v) => v !== item.value));
       emit("removeTag", item.value);
     };
-    const onSelectClear = () => {
+    const handleSelectClear = () => {
       updateModelValue(props.multiple ? [] : null);
       updateVisible(false);
       emit("clear");
     };
-    const onSelectFocus = (e) => {
+    const handleSelectFocus = (e) => {
       emit("focus", e);
     };
-    const onSelectBlur = (e) => {
+    const handleSelectBlur = (e) => {
       emit("blur", e);
     };
-    const onSelectFilter = (keywords) => {
+    const handleSelectFilter = (keywords) => {
       emit("filterChange", keywords);
     };
     const updateSelectedRowKeys = (rowKeys) => {
@@ -229,32 +230,36 @@ const _sfc_main = defineComponent({
         updateModelValue(rowKey);
       }
     };
-    const onTableCurrentChange = (row) => {
+    const handleTableCurrentChange = (row) => {
       if (!props.multiple && row != null) {
         updateSelectedItems(true);
       }
     };
-    const onTableSelectionChange = () => {
+    const handleTableSelectionChange = () => {
       if (props.multiple) {
         updateSelectedItems(true);
       }
     };
-    const onTableRowClick = (row) => {
+    const handleTableRowClick = (row) => {
       var _a;
       if (!props.multiple) {
         updateVisible(false);
         emit("select", row);
-      } else if (((_a = props.tableProps) == null ? void 0 : _a.rowClickChecked) && tableRef.value) {
+      } else if (((_a = props.tableProps) == null ? void 0 : _a.rowClickChecked) && tableRef.value && !isDisableRow(
+        row,
+        tableRef.value.tableData.indexOf(row),
+        tableRef.value.tableProps.columns
+      )) {
         emit("select", tableRef.value.getSelectionRows() || []);
       }
     };
-    const onTableSelect = (selection) => {
+    const handleTableSelect = (selection) => {
       emit("select", selection);
     };
-    const onTableSelectAll = (selection) => {
+    const handleTableSelectAll = (selection) => {
       emit("select", selection);
     };
-    const onTableDone = () => {
+    const handleTableDone = () => {
       nextTick(() => {
         updatePopover();
       });
@@ -276,7 +281,7 @@ const _sfc_main = defineComponent({
       () => props.initValue,
       (initValue) => {
         if (!isEmptyValue(initValue)) {
-          onInitValueChange(initValue);
+          handleInitValueChange(initValue);
         }
       },
       { deep: true }
@@ -291,7 +296,7 @@ const _sfc_main = defineComponent({
     );
     onMounted(() => {
       if (!isEmptyValue(props.initValue, props.multiple)) {
-        onInitValueChange(props.initValue);
+        handleInitValueChange(props.initValue);
       } else if (!isEmptyValue(props.modelValue, props.multiple)) {
         updateSelectedItems();
       }
@@ -309,19 +314,19 @@ const _sfc_main = defineComponent({
       updateSelectedItems,
       focusSearchInput,
       updateVisible,
-      onSelectRemove,
-      onSelectClear,
-      onSelectFocus,
-      onSelectBlur,
-      onSelectFilter,
+      handleSelectRemove,
+      handleSelectClear,
+      handleSelectFocus,
+      handleSelectBlur,
+      handleSelectFilter,
       updateSelectedRowKeys,
       updateCurrentRowKey,
-      onTableCurrentChange,
-      onTableSelectionChange,
-      onTableRowClick,
-      onTableSelect,
-      onTableSelectAll,
-      onTableDone
+      handleTableCurrentChange,
+      handleTableSelectionChange,
+      handleTableRowClick,
+      handleTableSelect,
+      handleTableSelectAll,
+      handleTableDone
     };
   }
 });
@@ -361,23 +366,23 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     selected: _ctx.selectedItems,
     visible: _ctx.selectVisible,
     "onUpdate:visible": _ctx.updateVisible,
-    onFilterChange: _ctx.onSelectFilter,
-    onRemoveTag: _ctx.onSelectRemove,
-    onClear: _ctx.onSelectClear,
-    onFocus: _ctx.onSelectFocus,
-    onBlur: _ctx.onSelectBlur
+    onFilterChange: _ctx.handleSelectFilter,
+    onRemoveTag: _ctx.handleSelectRemove,
+    onClear: _ctx.handleSelectClear,
+    onFocus: _ctx.handleSelectFocus,
+    onBlur: _ctx.handleSelectBlur
   }, createSlots({
     default: withCtx(() => [
       renderSlot(_ctx.$slots, "topExtra"),
       createVNode(_component_EleProTable, mergeProps({
         "onUpdate:selectedRowKeys": _ctx.updateSelectedRowKeys,
         "onUpdate:currentRowKey": _ctx.updateCurrentRowKey,
-        onSelectionChange: _ctx.onTableSelectionChange,
-        onCurrentChange: _ctx.onTableCurrentChange,
-        onRowClick: _ctx.onTableRowClick,
-        onSelect: _ctx.onTableSelect,
-        onSelectAll: _ctx.onTableSelectAll,
-        onDone: _ctx.onTableDone
+        onSelectionChange: _ctx.handleTableSelectionChange,
+        onCurrentChange: _ctx.handleTableCurrentChange,
+        onRowClick: _ctx.handleTableRowClick,
+        onSelect: _ctx.handleTableSelect,
+        onSelectAll: _ctx.handleTableSelectAll,
+        onDone: _ctx.handleTableDone
       }, _ctx.tableProps || {}, {
         ref: "tableRef",
         rowKey: _ctx.valueKey,

package/es/ele-tool/index.d.ts

@@ -1,3 +1,5 @@
+import { EleTooltipProps } from '../ele-app/plus';
+
 declare const _default: import('vue').DefineComponent<{
     title: StringConstructor;
     placement: {
@@ -6,9 +8,10 @@ declare const _default: import('vue').DefineComponent<{
     };
     disabled: BooleanConstructor;
 }, {
-    visible: import('vue').Ref<boolean>;
-    updateVisible: (value: boolean) => void;
-    onClick: (e: MouseEvent) => void;
+    handleClick: (e: MouseEvent) => void;
+    handleMouseover: (e: MouseEvent) => void;
+    showTooltip: (text?: string, el?: HTMLElement, options?: EleTooltipProps) => void;
+    hideTooltip: () => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     click: (_e: MouseEvent) => boolean;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{

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 {