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

package/lib/ele-table-select/index.cjs

@@ -4,6 +4,7 @@ const util = require("../ele-pro-layout/util");
 const EleBasicSelect = require("../ele-basic-select/index");
 const util$1 = require("../ele-basic-select/util");
 const EleProTable = require("../ele-pro-table/index");
+const util$2 = require("../ele-data-table/util");
 const props = require("./props");
 const _sfc_main = vue.defineComponent({
   name: "EleTableSelect",
@@ -159,7 +160,7 @@ const _sfc_main = vue.defineComponent({
     const focusSearchInput = () => {
       selectRef.value && selectRef.value.focusSearchInput();
     };
-    const onInitValueChange = (initValue) => {
+    const handleInitValueChange = (initValue) => {
       const valueKey = props2.valueKey;
       if (!props2.multiple) {
         const key = initValue[valueKey];
@@ -201,23 +202,23 @@ const _sfc_main = vue.defineComponent({
         emit("visibleChange", visible);
       }
     };
-    const onSelectRemove = (item) => {
+    const handleSelectRemove = (item) => {
       const values = props2.modelValue || [];
       updateModelValue(values.filter((v) => v !== item.value));
       emit("removeTag", item.value);
     };
-    const onSelectClear = () => {
+    const handleSelectClear = () => {
       updateModelValue(props2.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) => {
@@ -230,32 +231,36 @@ const _sfc_main = vue.defineComponent({
         updateModelValue(rowKey);
       }
     };
-    const onTableCurrentChange = (row) => {
+    const handleTableCurrentChange = (row) => {
       if (!props2.multiple && row != null) {
         updateSelectedItems(true);
       }
     };
-    const onTableSelectionChange = () => {
+    const handleTableSelectionChange = () => {
       if (props2.multiple) {
         updateSelectedItems(true);
       }
     };
-    const onTableRowClick = (row) => {
+    const handleTableRowClick = (row) => {
       var _a;
       if (!props2.multiple) {
         updateVisible(false);
         emit("select", row);
-      } else if (((_a = props2.tableProps) == null ? void 0 : _a.rowClickChecked) && tableRef.value) {
+      } else if (((_a = props2.tableProps) == null ? void 0 : _a.rowClickChecked) && tableRef.value && !util$2.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 = () => {
       vue.nextTick(() => {
         updatePopover();
       });
@@ -277,7 +282,7 @@ const _sfc_main = vue.defineComponent({
       () => props2.initValue,
       (initValue) => {
         if (!util$1.isEmptyValue(initValue)) {
-          onInitValueChange(initValue);
+          handleInitValueChange(initValue);
         }
       },
       { deep: true }
@@ -292,7 +297,7 @@ const _sfc_main = vue.defineComponent({
     );
     vue.onMounted(() => {
       if (!util$1.isEmptyValue(props2.initValue, props2.multiple)) {
-        onInitValueChange(props2.initValue);
+        handleInitValueChange(props2.initValue);
       } else if (!util$1.isEmptyValue(props2.modelValue, props2.multiple)) {
         updateSelectedItems();
       }
@@ -310,19 +315,19 @@ const _sfc_main = vue.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
     };
   }
 });
@@ -362,23 +367,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
   }, vue.createSlots({
     default: vue.withCtx(() => [
       vue.renderSlot(_ctx.$slots, "topExtra"),
       vue.createVNode(_component_EleProTable, vue.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/lib/ele-table-select/index.d.ts

@@ -27,7 +27,7 @@ declare const _default: import('vue').DefineComponent<{
         required: boolean;
     };
     maxTagCount: NumberConstructor;
-    maxTagTextLength: NumberConstructor;
+    maxTagTextLength: NumberConstructor; /** 选中的标签 */
     tagType: {
         type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "success" | "warning" | "info" | "primary" | "danger", unknown> | undefined>;
         default: string;
@@ -36,8 +36,8 @@ declare const _default: import('vue').DefineComponent<{
     filterable: BooleanConstructor;
     teleported: {
         type: BooleanConstructor;
-        default: boolean;
-    };
+        default: boolean; /** 表格单选选中值 */
+    }; /** 表格单选选中值 */
     persistent: {
         type: BooleanConstructor;
         default: boolean;
@@ -51,7 +51,7 @@ declare const _default: import('vue').DefineComponent<{
         default: string;
     };
     popperOptions: import('vue').PropType<Partial<import('element-plus').Options> | undefined>;
-    popperClass: StringConstructor; /** 下拉框类名 */
+    popperClass: StringConstructor;
     popperWidth: (StringConstructor | NumberConstructor)[];
     selectStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
     inputStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
@@ -77,19 +77,19 @@ declare const _default: import('vue').DefineComponent<{
     updateSelectedItems: (force?: boolean) => void;
     focusSearchInput: () => void;
     updateVisible: (visible: boolean) => void;
-    onSelectRemove: (item: SelectedItem) => void;
-    onSelectClear: () => void;
-    onSelectFocus: (e: FocusEvent) => void;
-    onSelectBlur: (e: FocusEvent) => void;
-    onSelectFilter: (keywords: string) => void;
+    handleSelectRemove: (item: SelectedItem) => void;
+    handleSelectClear: () => void;
+    handleSelectFocus: (e: FocusEvent) => void;
+    handleSelectBlur: (e: FocusEvent) => void;
+    handleSelectFilter: (keywords: string) => void;
     updateSelectedRowKeys: (rowKeys: DataKey[]) => void;
     updateCurrentRowKey: (rowKey?: DataKey) => void;
-    onTableCurrentChange: (row?: DataItem | null) => void;
-    onTableSelectionChange: () => void;
-    onTableRowClick: (row: DataItem) => void;
-    onTableSelect: (selection: DataItem[]) => void;
-    onTableSelectAll: (selection: DataItem[]) => void;
-    onTableDone: () => void;
+    handleTableCurrentChange: (row?: DataItem | null) => void;
+    handleTableSelectionChange: () => void;
+    handleTableRowClick: (row: DataItem) => void;
+    handleTableSelect: (selection: DataItem[]) => void;
+    handleTableSelectAll: (selection: DataItem[]) => void;
+    handleTableDone: () => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     'update:modelValue': (_value: SelectValue) => boolean;
     change: (_value: SelectValue) => boolean;
@@ -125,7 +125,7 @@ declare const _default: import('vue').DefineComponent<{
         required: boolean;
     };
     maxTagCount: NumberConstructor;
-    maxTagTextLength: NumberConstructor;
+    maxTagTextLength: NumberConstructor; /** 选中的标签 */
     tagType: {
         type: import('vue').PropType<import('element-plus/es/utils/index').EpPropMergeType<StringConstructor, "success" | "warning" | "info" | "primary" | "danger", unknown> | undefined>;
         default: string;
@@ -134,8 +134,8 @@ declare const _default: import('vue').DefineComponent<{
     filterable: BooleanConstructor;
     teleported: {
         type: BooleanConstructor;
-        default: boolean;
-    };
+        default: boolean; /** 表格单选选中值 */
+    }; /** 表格单选选中值 */
     persistent: {
         type: BooleanConstructor;
         default: boolean;
@@ -149,7 +149,7 @@ declare const _default: import('vue').DefineComponent<{
         default: string;
     };
     popperOptions: import('vue').PropType<Partial<import('element-plus').Options> | undefined>;
-    popperClass: StringConstructor; /** 下拉框类名 */
+    popperClass: StringConstructor;
     popperWidth: (StringConstructor | NumberConstructor)[];
     selectStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;
     inputStyle: import('vue').PropType<Partial<import('vue').CSSProperties>>;

package/lib/ele-tool/index.cjs

@@ -1,34 +1,48 @@
 "use strict";
 const vue = require("vue");
-const EleTooltip = require("../ele-tooltip/index");
+const hook = require("../utils/hook");
+const props$1 = require("../ele-toolbar/props");
 const props = require("./props");
 const _sfc_main = vue.defineComponent({
   name: "EleTool",
-  components: { EleTooltip },
   props: props.toolProps,
   emits: props.toolEmits,
   setup(props2, { emit }) {
-    const visible = vue.ref(false);
-    const updateVisible = (value) => {
-      if (value && (!props2.title || props2.disabled)) {
-        visible.value = false;
-        return;
+    const toolbarProvide = vue.inject(props$1.TOOLBAR_KEY, {});
+    const [startHideTipTimer, stopHideTipTimer] = hook.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 (props2.title && !props2.disabled) {
+        stopHideTipTimer();
+        showTooltip(props2.title, e.currentTarget, {
+          placement: props2.placement,
+          offset: 10
+        });
+      }
+    };
     vue.watch([() => props2.disabled, () => props2.title], () => {
       if (!props2.title || props2.disabled) {
-        visible.value = false;
+        hideTooltip();
       }
     });
     return {
-      visible,
-      updateVisible,
-      onClick
+      handleClick,
+      handleMouseover,
+      showTooltip,
+      hideTooltip
     };
   }
 });
@@ -41,26 +55,15 @@ const _export_sfc = (sfc, props2) => {
 };
 const _hoisted_1 = { class: "ele-tool-body" };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  const _component_EleTooltip = vue.resolveComponent("EleTooltip");
   return vue.openBlock(), vue.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))
   }, [
-    vue.createVNode(_component_EleTooltip, {
-      content: _ctx.title,
-      visible: _ctx.visible,
-      placement: _ctx.placement,
-      offset: 10,
-      "onUpdate:visible": _ctx.updateVisible
-    }, {
-      default: vue.withCtx(() => [
-        vue.createElementVNode("div", _hoisted_1, [
-          vue.renderSlot(_ctx.$slots, "default")
-        ])
-      ]),
-      _: 3
-    }, 8, ["content", "visible", "placement", "onUpdate:visible"])
-  ]);
+    vue.createElementVNode("div", _hoisted_1, [
+      vue.renderSlot(_ctx.$slots, "default")
+    ])
+  ], 32);
 }
 const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 module.exports = index;

package/lib/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/lib/ele-tool/style/index.cjs

@@ -1,3 +1,2 @@
 "use strict";
-require("../../ele-tooltip/style/index");
 require("./index.scss");

package/lib/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 {

package/lib/ele-toolbar/index.cjs

@@ -1,11 +1,39 @@
 "use strict";
 const vue = require("vue");
+const EleTooltip = require("../ele-tooltip/index");
 const EleText = require("../ele-text/index");
 const props = require("./props");
 const _sfc_main = vue.defineComponent({
   name: "EleToolbar",
-  components: { EleText },
-  props: props.toolbarProps
+  components: { EleTooltip, EleText },
+  props: props.toolbarProps,
+  setup() {
+    const tooltipRef = vue.ref(null);
+    const virtualRef = vue.ref();
+    const tooltipContent = vue.ref("");
+    const tooltipProps = vue.ref({});
+    const showTooltip = (text, el, options) => {
+      virtualRef.value = el;
+      tooltipContent.value = text ?? "";
+      tooltipProps.value = options || {};
+    };
+    const hideTooltip = () => {
+      tooltipRef.value && tooltipRef.value.hide();
+    };
+    const toolbarProvide = vue.shallowReactive({
+      showTooltip,
+      hideTooltip
+    });
+    vue.provide(props.TOOLBAR_KEY, toolbarProvide);
+    return {
+      tooltipRef,
+      virtualRef,
+      tooltipContent,
+      tooltipProps,
+      showTooltip,
+      hideTooltip
+    };
+  }
 });
 const _export_sfc = (sfc, props2) => {
   const target = sfc.__vccOpts || sfc;
@@ -16,6 +44,7 @@ const _export_sfc = (sfc, props2) => {
 };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_EleText = vue.resolveComponent("EleText");
+  const _component_EleTooltip = vue.resolveComponent("EleTooltip");
   return vue.openBlock(), vue.createElementBlock("div", {
     class: vue.normalizeClass([
       "ele-toolbar",
@@ -58,7 +87,17 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       style: vue.normalizeStyle(_ctx.toolsStyle)
     }, [
       vue.renderSlot(_ctx.$slots, "tools")
-    ], 4)
+    ], 4),
+    vue.createVNode(_component_EleTooltip, vue.mergeProps({
+      trigger: "hover",
+      placement: "top",
+      persistent: false,
+      content: _ctx.tooltipContent
+    }, _ctx.tooltipProps || {}, {
+      virtualTriggering: true,
+      virtualRef: _ctx.virtualRef,
+      ref: "tooltipRef"
+    }), null, 16, ["content", "virtualRef"])
   ], 2);
 }
 const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);