ele-admin-plus 1.2.1-beta.3 → 1.2.1-beta.5

package/es/ele-basic-select/index.d.ts

@@ -109,10 +109,10 @@ declare const _default: import('vue').DefineComponent<{
     clearable: boolean;
     disabled: boolean;
     filterable: boolean;
-    multiple: boolean;
+    persistent: boolean;
     visible: boolean;
     transition: string;
-    persistent: boolean;
+    multiple: boolean;
     automaticDropdown: boolean;
 }, {}>;
 export default _default;

package/es/ele-bottom-bar/index.d.ts

@@ -1,8 +1,15 @@
 declare const _default: import('vue').DefineComponent<{
     bodyStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     extraStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-}, unknown, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
+    teleported: BooleanConstructor;
+}, {
+    isActivated: import('vue').Ref<boolean>;
+    teleportTo: import('vue').ComputedRef<HTMLElement | null | undefined>;
+}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     bodyStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     extraStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
-}>>, {}, {}>;
+    teleported: BooleanConstructor;
+}>>, {
+    teleported: boolean;
+}, {}>;
 export default _default;

package/es/ele-bottom-bar/index.js

@@ -1,8 +1,24 @@
-import { defineComponent, openBlock, createElementBlock, createElementVNode, normalizeStyle, renderSlot } from "vue";
+import { defineComponent, ref, computed, onActivated, onDeactivated, openBlock, createBlock, Teleport, createElementVNode, normalizeClass, normalizeStyle, renderSlot } from "vue";
+import { useLayoutState } from "../ele-pro-layout/util";
 import { bottomBarProps } from "./props";
 const _sfc_main = defineComponent({
   name: "EleBottomBar",
-  props: bottomBarProps
+  props: bottomBarProps,
+  setup() {
+    const layoutState = useLayoutState();
+    const isActivated = ref(true);
+    const teleportTo = computed(() => {
+      var _a;
+      return (_a = layoutState.getBodyWrapperEl) == null ? void 0 : _a.call(layoutState);
+    });
+    onActivated(() => {
+      isActivated.value = true;
+    });
+    onDeactivated(() => {
+      isActivated.value = false;
+    });
+    return { isActivated, teleportTo };
+  }
 });
 const _export_sfc = (sfc, props) => {
   const target = sfc.__vccOpts || sfc;
@@ -11,22 +27,28 @@ const _export_sfc = (sfc, props) => {
   }
   return target;
 };
-const _hoisted_1 = { class: "ele-bottom-bar" };
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
-  return openBlock(), createElementBlock("div", _hoisted_1, [
-    createElementVNode("div", {
-      class: "ele-bottom-bar-body",
-      style: normalizeStyle(_ctx.bodyStyle)
-    }, [
-      renderSlot(_ctx.$slots, "default")
-    ], 4),
+  return openBlock(), createBlock(Teleport, {
+    to: _ctx.teleportTo,
+    disabled: !_ctx.teleported || !_ctx.teleportTo
+  }, [
     createElementVNode("div", {
-      class: "ele-bottom-bar-extra",
-      style: normalizeStyle(_ctx.extraStyle)
+      class: normalizeClass(["ele-bottom-bar", { "is-deactivated": !_ctx.isActivated }])
     }, [
-      renderSlot(_ctx.$slots, "extra")
-    ], 4)
-  ]);
+      createElementVNode("div", {
+        class: "ele-bottom-bar-body",
+        style: normalizeStyle(_ctx.bodyStyle)
+      }, [
+        renderSlot(_ctx.$slots, "default")
+      ], 4),
+      createElementVNode("div", {
+        class: "ele-bottom-bar-extra",
+        style: normalizeStyle(_ctx.extraStyle)
+      }, [
+        renderSlot(_ctx.$slots, "extra")
+      ], 4)
+    ], 2)
+  ], 8, ["to", "disabled"]);
 }
 const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
 export {

package/es/ele-bottom-bar/props.d.ts

@@ -9,5 +9,7 @@ export declare const bottomBarProps: {
     bodyStyle: PropType<StyleValue>;
     /** 右侧样式 */
     extraStyle: PropType<StyleValue>;
+    /** 是否插入到布局的内容节点后 */
+    teleported: BooleanConstructor;
 };
 export type BottomBarProps = ExtractPropTypes<typeof bottomBarProps>;

package/es/ele-bottom-bar/props.js

@@ -2,7 +2,9 @@ const bottomBarProps = {
   /** 内容样式 */
   bodyStyle: Object,
   /** 右侧样式 */
-  extraStyle: Object
+  extraStyle: Object,
+  /** 是否插入到布局的内容节点后 */
+  teleported: Boolean
 };
 export {
   bottomBarProps

package/es/ele-bottom-bar/style/index.scss

@@ -5,6 +5,7 @@
 @include set-bottom-bar-var($ele);
 
 .ele-bottom-bar {
+  flex-shrink: 0;
   position: sticky;
   bottom: 0;
   display: flex;
@@ -23,4 +24,8 @@
   .ele-bottom-bar-extra {
     flex-shrink: 0;
   }
+
+  &.is-deactivated {
+    display: none;
+  }
 }

package/es/ele-check-card/index.d.ts

@@ -47,13 +47,13 @@ declare const _default: import('vue').DefineComponent<{
     itemStyle: import('vue').PropType<import('../ele-app/types').StyleValue>;
     row: import('vue').PropType<boolean | import('../ele-app/el').ElRowProps>;
 }>> & {
-    onChange?: ((_value: CheckedValue) => any) | undefined;
     "onUpdate:modelValue"?: ((_value: CheckedValue) => any) | undefined;
+    onChange?: ((_value: CheckedValue) => any) | undefined;
 }, {
     modelValue: CheckedValue;
     disabled: boolean;
-    multiple: boolean;
     bordered: boolean;
     arrow: boolean;
+    multiple: boolean;
 }, {}>;
 export default _default;

package/es/ele-cropper/components/cropper-tools.d.ts

@@ -1,6 +1,6 @@
 import { PropType } from 'vue';
-import { EleTooltipProps } from '../../ele-app/plus';
-import { UploadOption, ToolName, ToolGroup, ToolItem, CropperLocale } from '../types';
+import { EleTooltipProps, EleTooltipInstance } from '../../ele-app/plus';
+import { UploadOption, ToolName, ToolGroup, ToolItem, BeforeUploadClick, CropperLocale } from '../types';
 
 declare const _default: import('vue').DefineComponent<{
     /** 操作按钮布局 */
@@ -11,16 +11,20 @@ declare const _default: import('vue').DefineComponent<{
     tooltip: BooleanConstructor;
     /** 提示组件属性 */
     tooltipProps: PropType<EleTooltipProps>;
+    /** 上传按钮点击前的钩子 */
+    beforeUploadClick: PropType<BeforeUploadClick>;
     /** 国际化 */
     locale: PropType<Partial<CropperLocale>>;
 }, {
     lang: import('vue').ComputedRef<CropperLocale>;
+    tooltipRef: import('vue').Ref<EleTooltipInstance>;
     groups: import('vue').ShallowRef<ToolGroup[]>;
     tooltipContent: import('vue').Ref<string>;
     virtualRef: import('vue').Ref<any>;
     handleUpload: (file: File) => boolean;
     handleClick: (name: Omit<ToolName, "upload">) => void;
     handleItemHover: (item: ToolItem, e: MouseEvent) => void;
+    handleUploadButtonClick: (e: MouseEvent) => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     zoomIn: () => true;
     zoomOut: () => true;
@@ -44,10 +48,13 @@ declare const _default: import('vue').DefineComponent<{
     tooltip: BooleanConstructor;
     /** 提示组件属性 */
     tooltipProps: PropType<EleTooltipProps>;
+    /** 上传按钮点击前的钩子 */
+    beforeUploadClick: PropType<BeforeUploadClick>;
     /** 国际化 */
     locale: PropType<Partial<CropperLocale>>;
 }>> & {
     onReset?: (() => any) | undefined;
+    onUpload?: ((_option?: UploadOption | undefined) => any) | undefined;
     onZoomIn?: (() => any) | undefined;
     onZoomOut?: (() => any) | undefined;
     onMoveLeft?: (() => any) | undefined;
@@ -58,7 +65,6 @@ declare const _default: import('vue').DefineComponent<{
     onRotateRight?: (() => any) | undefined;
     onFlipX?: (() => any) | undefined;
     onFlipY?: (() => any) | undefined;
-    onUpload?: ((_option?: UploadOption | undefined) => any) | undefined;
     onOk?: (() => any) | undefined;
 }, {
     tooltip: boolean;

package/es/ele-cropper/components/cropper-tools.js

@@ -1,8 +1,9 @@
-import { defineComponent, shallowRef, ref, watch, resolveComponent, openBlock, createElementBlock, Fragment, renderList, createBlock, withCtx, createVNode, normalizeClass, createTextVNode, toDisplayString, createCommentVNode, mergeProps } from "vue";
+import { defineComponent, ref, shallowRef, watch, markRaw, resolveComponent, openBlock, createElementBlock, Fragment, renderList, createBlock, withCtx, createVNode, normalizeClass, createTextVNode, toDisplayString, createCommentVNode, mergeProps } from "vue";
 import { ElButtonGroup, ElButton, ElUpload } from "element-plus";
 import { ZoomInOutlined, ZoomOutOutlined, ArrowLeftOutlined, ArrowRightOutlined, ArrowUpOutlined, ArrowDownOutlined, UndoOutlined, ReloadOutlined, SwapOutlined, SortOutlined, SyncOutlined, UploadOutlined, CheckOutlined } from "../../icons";
-import EleTooltip from "../../ele-tooltip/index";
+import { useTimer } from "../../utils/hook";
 import { useLocale } from "../../ele-config-provider/receiver";
+import EleTooltip from "../../ele-tooltip/index";
 const TOOL_ICONS = {
   zoomIn: ZoomInOutlined,
   zoomOut: ZoomOutOutlined,
@@ -30,6 +31,8 @@ const _sfc_main = defineComponent({
     tooltip: Boolean,
     /** 提示组件属性 */
     tooltipProps: Object,
+    /** 上传按钮点击前的钩子 */
+    beforeUploadClick: Function,
     /** 国际化 */
     locale: Object
   },
@@ -50,31 +53,52 @@ const _sfc_main = defineComponent({
   },
   setup(props, { emit }) {
     const { lang } = useLocale("cropper", props);
+    const [startHideTipTimer, stopHideTipTimer] = useTimer(200);
+    const tooltipRef = ref(null);
     const groups = shallowRef([]);
     const tooltipContent = ref("");
     const virtualRef = ref();
+    const emitUpload = (data, type) => {
+      emit("upload", { data, type });
+    };
     const handleUpload = (file) => {
       const reader = new FileReader();
       reader.onload = (e) => {
         var _a;
-        emit("upload", {
-          data: (_a = e.target) == null ? void 0 : _a.result,
-          type: file.type
-        });
+        const url = (_a = e.target) == null ? void 0 : _a.result;
+        if (url != null) {
+          emitUpload(url, file.type);
+        }
       };
       reader.readAsDataURL(file);
       return false;
     };
-    const handleClick = (name) => {
-      emit(name);
+    const hideTooltip = () => {
+      tooltipRef.value && tooltipRef.value.hide();
     };
     const handleItemHover = (item, e) => {
       const title = lang.value[item.name];
       if (props.tooltip && item.name !== "ok" && title) {
+        stopHideTipTimer();
         virtualRef.value = e.currentTarget;
         tooltipContent.value = title;
       }
     };
+    const handleClick = (name) => {
+      startHideTipTimer(() => {
+        hideTooltip();
+      });
+      emit(name);
+    };
+    const handleUploadButtonClick = (e) => {
+      startHideTipTimer(() => {
+        hideTooltip();
+      });
+      if (props.beforeUploadClick && props.beforeUploadClick(e, emitUpload) === false) {
+        e.stopPropagation();
+        e.preventDefault();
+      }
+    };
     watch(
       () => props.tools,
       (tools) => {
@@ -92,7 +116,7 @@ const _sfc_main = defineComponent({
             return {
               key: i + "-" + j + name,
               name,
-              icon: TOOL_ICONS[name],
+              icon: markRaw(TOOL_ICONS[name]),
               className: `ele-cropper-${name}`
             };
           });
@@ -103,12 +127,14 @@ const _sfc_main = defineComponent({
     );
     return {
       lang,
+      tooltipRef,
       groups,
       tooltipContent,
       virtualRef,
       handleUpload,
       handleClick,
-      handleItemHover
+      handleItemHover,
+      handleUploadButtonClick
     };
   }
 });
@@ -140,7 +166,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                 key: 0,
                 action: "",
                 accept: _ctx.accept,
-                showUploadList: false,
+                showFileList: false,
                 beforeUpload: _ctx.handleUpload,
                 style: { "display": "inline-block", "line-height": "0" }
               }, {
@@ -149,8 +175,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
                     type: "primary",
                     icon: item.icon,
                     class: normalizeClass(["ele-cropper-tool", item.className]),
-                    onMouseover: (e) => _ctx.handleItemHover(item, e)
-                  }, null, 8, ["icon", "class", "onMouseover"])
+                    onMouseover: (e) => _ctx.handleItemHover(item, e),
+                    onClick: _ctx.handleUploadButtonClick
+                  }, null, 8, ["icon", "class", "onMouseover", "onClick"])
                 ]),
                 _: 2
               }, 1032, ["accept", "beforeUpload"])) : (openBlock(), createBlock(_component_ElButton, {
@@ -180,7 +207,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     }, _ctx.tooltipProps || {}, {
       content: _ctx.tooltipContent,
       virtualRef: _ctx.virtualRef,
-      virtualTriggering: true
+      virtualTriggering: true,
+      ref: "tooltipRef"
     }), null, 16, ["content", "virtualRef"])
   ]);
 }

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

@@ -34,6 +34,7 @@ declare const _default: import('vue').DefineComponent<{
         default: boolean;
     };
     tooltipProps: import('vue').PropType<import('../ele-app/plus').EleTooltipProps>;
+    beforeUploadClick: import('vue').PropType<import('./types').BeforeUploadClick>;
     responsive: {
         type: BooleanConstructor;
         default: null;
@@ -92,6 +93,7 @@ declare const _default: import('vue').DefineComponent<{
         default: boolean;
     };
     tooltipProps: import('vue').PropType<import('../ele-app/plus').EleTooltipProps>;
+    beforeUploadClick: import('vue').PropType<import('./types').BeforeUploadClick>;
     responsive: {
         type: BooleanConstructor;
         default: null;
@@ -100,10 +102,10 @@ declare const _default: import('vue').DefineComponent<{
 }>> & {
     onDone?: ((_result?: string | Blob | null | undefined) => any) | undefined;
 }, {
-    preview: boolean;
     tooltip: boolean;
     responsive: boolean;
     tools: string;
+    preview: boolean;
     imageType: string;
     accept: string;
     previewWidth: number;

package/es/ele-cropper/index.js

@@ -189,6 +189,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       locale: _ctx.locale,
       tooltip: _ctx.tooltip,
       tooltipProps: _ctx.tooltipProps,
+      beforeUploadClick: _ctx.beforeUploadClick,
       onZoomIn: _ctx.handleZoomIn,
       onZoomOut: _ctx.handleZoomOut,
       onMoveLeft: _ctx.handleMoveLeft,
@@ -202,7 +203,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       onReset: _ctx.handleReset,
       onUpload: _ctx.handleUpload,
       onOk: _ctx.handleOk
-    }, null, 8, ["tools", "accept", "locale", "tooltip", "tooltipProps", "onZoomIn", "onZoomOut", "onMoveLeft", "onMoveRight", "onMoveUp", "onMoveDown", "onRotateLeft", "onRotateRight", "onFlipX", "onFlipY", "onReset", "onUpload", "onOk"])
+    }, null, 8, ["tools", "accept", "locale", "tooltip", "tooltipProps", "beforeUploadClick", "onZoomIn", "onZoomOut", "onMoveLeft", "onMoveRight", "onMoveUp", "onMoveDown", "onRotateLeft", "onRotateRight", "onFlipX", "onFlipY", "onReset", "onUpload", "onOk"])
   ], 2);
 }
 const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);

package/es/ele-cropper/props.d.ts

@@ -1,6 +1,6 @@
 import { PropType, ExtractPropTypes } from 'vue';
 import { EleTooltipProps } from '../ele-app/plus';
-import { CropperOptions, CroppedOptions, CropperLocale } from './types';
+import { CropperOptions, CroppedOptions, BeforeUploadClick, CropperLocale } from './types';
 
 /**
  * 属性
@@ -48,6 +48,8 @@ export declare const cropperProps: {
     };
     /** tooltip属性 */
     tooltipProps: PropType<EleTooltipProps>;
+    /** 上传按钮点击前的钩子 */
+    beforeUploadClick: PropType<BeforeUploadClick>;
     /** 是否开启响应式 */
     responsive: {
         type: BooleanConstructor;

package/es/ele-cropper/props.js

@@ -41,6 +41,8 @@ const cropperProps = {
   },
   /** tooltip属性 */
   tooltipProps: Object,
+  /** 上传按钮点击前的钩子 */
+  beforeUploadClick: Function,
   /** 是否开启响应式 */
   responsive: {
     type: Boolean,

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

@@ -9,8 +9,9 @@
   .ele-cropper-image {
     flex: 1;
     height: 300px;
-    position: relative;
     box-sizing: border-box;
+    position: relative;
+    overflow: hidden;
 
     & > img {
       width: auto;
@@ -31,9 +32,9 @@
   }
 
   .ele-cropper-previews {
-    font-size: 0;
     flex-shrink: 0;
     text-align: right;
+    font-size: 0;
   }
 
   .ele-cropper-preview {

package/es/ele-cropper/types.d.ts

@@ -77,6 +77,22 @@ export interface CurrentState {
   scaleYValue: number;
 }
 
+/**
+ * 上传按钮点击自定义处理的回调
+ */
+export type BeforeUploadOnResult = (
+  data: string | ArrayBuffer,
+  type?: string
+) => void;
+
+/**
+ * 上传按钮点击前的钩子
+ */
+export type BeforeUploadClick = (
+  e: MouseEvent,
+  onResult: BeforeUploadOnResult
+) => boolean | undefined | void;
+
 /**
  * 国际化
  */

package/es/ele-cropper-modal/index.d.ts

@@ -33,6 +33,7 @@ declare const _default: import('vue').DefineComponent<{
         default: boolean;
     };
     tooltipProps: import('vue').PropType<import('../ele-app/plus').EleTooltipProps>;
+    beforeUploadClick: import('vue').PropType<import('../ele-cropper/types').BeforeUploadClick>;
     responsive: {
         type: BooleanConstructor;
         default: null;
@@ -78,6 +79,7 @@ declare const _default: import('vue').DefineComponent<{
         default: boolean;
     };
     tooltipProps: import('vue').PropType<import('../ele-app/plus').EleTooltipProps>;
+    beforeUploadClick: import('vue').PropType<import('../ele-cropper/types').BeforeUploadClick>;
     responsive: {
         type: BooleanConstructor;
         default: null;
@@ -88,8 +90,8 @@ declare const _default: import('vue').DefineComponent<{
     onDone?: ((_result: string | Blob | null) => any) | undefined;
 }, {
     modelValue: boolean;
-    preview: boolean;
     tooltip: boolean;
+    preview: boolean;
     responsive: boolean;
     imageType: string;
     accept: string;

package/es/ele-cropper-modal/index.js

@@ -50,10 +50,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         croppedOptions: _ctx.croppedOptions,
         tooltip: _ctx.tooltip,
         tooltipProps: _ctx.tooltipProps,
+        beforeUploadClick: _ctx.beforeUploadClick,
         responsive: _ctx.responsive,
         locale: _ctx.locale,
         onDone: _ctx.handleDone
-      }, null, 8, ["height", "src", "imageType", "accept", "tools", "preview", "previewWidth", "toBlob", "options", "croppedOptions", "tooltip", "tooltipProps", "responsive", "locale", "onDone"])
+      }, null, 8, ["height", "src", "imageType", "accept", "tools", "preview", "previewWidth", "toBlob", "options", "croppedOptions", "tooltip", "tooltipProps", "beforeUploadClick", "responsive", "locale", "onDone"])
     ]),
     _: 2
   }, [

package/es/ele-cropper-modal/props.d.ts

@@ -39,6 +39,7 @@ export declare const cropperModalProps: {
         default: boolean;
     };
     tooltipProps: PropType<import('../ele-app/plus').EleTooltipProps>;
+    beforeUploadClick: PropType<import('../ele-cropper/types').BeforeUploadClick>;
     responsive: {
         type: BooleanConstructor;
         default: null;

package/es/ele-data-table/components/table-columns.d.ts

@@ -0,0 +1,32 @@
+import { PropType } from 'vue';
+import { omit } from '../../utils/core';
+import { Columns, ShowOverflowTooltip } from '../types';
+import { getCellClass, getFilterPopperClass, getTooltipProps } from '../util';
+
+declare const _default: import('vue').DefineComponent<{
+    /** 列配置 */
+    columns: PropType<Columns>;
+    /** 序号列起始值 */
+    pageIndex: NumberConstructor;
+    /** 是否过滤非正常的插槽渲染 */
+    slotNormalize: BooleanConstructor;
+    /** 表格提示组件属性 */
+    globalTooltip: PropType<ShowOverflowTooltip>;
+}, {
+    omit: typeof omit;
+    getCellClass: typeof getCellClass;
+    getFilterPopperClass: typeof getFilterPopperClass;
+    getTooltipProps: typeof getTooltipProps;
+}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
+    /** 列配置 */
+    columns: PropType<Columns>;
+    /** 序号列起始值 */
+    pageIndex: NumberConstructor;
+    /** 是否过滤非正常的插槽渲染 */
+    slotNormalize: BooleanConstructor;
+    /** 表格提示组件属性 */
+    globalTooltip: PropType<ShowOverflowTooltip>;
+}>>, {
+    slotNormalize: boolean;
+}, {}>;
+export default _default;