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

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, 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) => {
@@ -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

@@ -33,7 +33,8 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    tooltipProps: import('vue').PropType<Partial<import('../ele-tooltip/props').TooltipProps>>;
+    tooltipProps: import('vue').PropType<import('../ele-app/plus').EleTooltipProps>;
+    beforeUploadClick: import('vue').PropType<import('./types').BeforeUploadClick>;
     responsive: {
         type: BooleanConstructor;
         default: null;
@@ -60,7 +61,7 @@ declare const _default: import('vue').DefineComponent<{
     }) => void;
     handleOk: () => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    done: (_result?: string | Blob | null | undefined) => boolean;
+    done: (_result?: Blob | string | null) => boolean;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     height: StringConstructor;
     src: StringConstructor;
@@ -91,7 +92,8 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    tooltipProps: import('vue').PropType<Partial<import('../ele-tooltip/props').TooltipProps>>;
+    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,5 +1,6 @@
 import { PropType, ExtractPropTypes } from 'vue';
-import { CropperOptions, CroppedOptions, CropperLocale } from './types';
+import { EleTooltipProps } from '../ele-app/plus';
+import { CropperOptions, CroppedOptions, BeforeUploadClick, CropperLocale } from './types';
 
 /**
  * 属性
@@ -46,7 +47,9 @@ export declare const cropperProps: {
         default: boolean;
     };
     /** tooltip属性 */
-    tooltipProps: PropType<Partial<import('../ele-tooltip/props').TooltipProps>>;
+    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

@@ -32,7 +32,8 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    tooltipProps: import('vue').PropType<Partial<import('../ele-tooltip/props').TooltipProps>>;
+    tooltipProps: import('vue').PropType<import('../ele-app/plus').EleTooltipProps>;
+    beforeUploadClick: import('vue').PropType<import('../ele-cropper/types').BeforeUploadClick>;
     responsive: {
         type: BooleanConstructor;
         default: null;
@@ -43,8 +44,8 @@ declare const _default: import('vue').DefineComponent<{
     updateModelValue: (value: boolean) => void;
     handleDone: (result: Blob | string | null) => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    done: (_result: string | Blob | null) => boolean;
-    'update:modelValue': (_value: boolean) => boolean; /** 更新绑定值 */
+    done: (_result: Blob | string | null) => boolean;
+    'update:modelValue': (_value: boolean) => boolean;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     modelValue: BooleanConstructor;
     modalProps: import('vue').PropType<Partial<Omit<import('../ele-app/plus').EleModalProps, "modelValue">>>;
@@ -77,7 +78,8 @@ declare const _default: import('vue').DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    tooltipProps: import('vue').PropType<Partial<import('../ele-tooltip/props').TooltipProps>>;
+    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

@@ -17,9 +17,6 @@ export declare const cropperModalProps: {
     };
     accept: {
         type: StringConstructor;
-        /**
-         * 事件
-         */
         default: string;
     };
     tools: {
@@ -41,7 +38,8 @@ export declare const cropperModalProps: {
         type: BooleanConstructor;
         default: boolean;
     };
-    tooltipProps: PropType<Partial<import('../ele-tooltip/props').TooltipProps>>;
+    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;

package/es/ele-data-table/components/table-columns.js

@@ -0,0 +1,114 @@
+import { defineComponent, resolveComponent, openBlock, createElementBlock, Fragment, renderList, createBlock, mergeProps, withCtx, createElementVNode, renderSlot, createTextVNode, toDisplayString, createSlots, createCommentVNode } from "vue";
+import { ElTableColumn } from "element-plus";
+import { omit } from "../../utils/core";
+import { getCellClass, getFilterPopperClass, getTooltipProps } from "../util";
+const _sfc_main = defineComponent({
+  name: "TableColumns",
+  components: { ElTableColumn },
+  props: {
+    /** 列配置 */
+    columns: Array,
+    /** 序号列起始值 */
+    pageIndex: Number,
+    /** 是否过滤非正常的插槽渲染 */
+    slotNormalize: Boolean,
+    /** 表格提示组件属性 */
+    globalTooltip: [Object, Boolean]
+  },
+  setup() {
+    return {
+      omit,
+      getCellClass,
+      getFilterPopperClass,
+      getTooltipProps
+    };
+  }
+});
+const _export_sfc = (sfc, props) => {
+  const target = sfc.__vccOpts || sfc;
+  for (const [key, val] of props) {
+    target[key] = val;
+  }
+  return target;
+};
+const _hoisted_1 = ["title"];
+function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
+  const _component_TableColumns = resolveComponent("TableColumns", true);
+  const _component_ElTableColumn = resolveComponent("ElTableColumn");
+  return openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.columns, (col) => {
+    return openBlock(), createBlock(_component_ElTableColumn, mergeProps(
+      { ref_for: true },
+      _ctx.omit(col, [
+        "showOverflowTooltip",
+        "filterClassName",
+        "columnKey",
+        "className",
+        "uid",
+        "slot",
+        "headerSlot",
+        "hideInTable",
+        "hideInSetting",
+        "hideInExport",
+        "hideInPrint",
+        "printSlot",
+        "children"
+      ]),
+      {
+        key: col.uid ?? col.columnKey ?? col.prop,
+        index: col.index ?? _ctx.pageIndex,
+        className: _ctx.getCellClass(col),
+        columnKey: col.columnKey ?? col.prop,
+        filterClassName: _ctx.getFilterPopperClass(col.filterClassName),
+        showOverflowTooltip: _ctx.getTooltipProps(col.showOverflowTooltip, _ctx.globalTooltip)
+      }
+    ), {
+      header: withCtx((slotProps) => {
+        var _a, _b;
+        return [
+          createElementVNode("div", {
+            class: "ele-cell-title",
+            title: (_a = slotProps == null ? void 0 : slotProps.column) == null ? void 0 : _a.label
+          }, [
+            col.headerSlot ? renderSlot(_ctx.$slots, col.headerSlot, mergeProps({
+              key: 0,
+              ref_for: true
+            }, slotProps || {}), () => {
+              var _a2;
+              return [
+                createTextVNode(toDisplayString((_a2 = slotProps == null ? void 0 : slotProps.column) == null ? void 0 : _a2.label), 1)
+              ];
+            }) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
+              createTextVNode(toDisplayString((_b = slotProps == null ? void 0 : slotProps.column) == null ? void 0 : _b.label), 1)
+            ], 64))
+          ], 8, _hoisted_1)
+        ];
+      }),
+      default: withCtx((slotProps) => [
+        col.slot && _ctx.$slots[col.slot] && (!_ctx.slotNormalize || (slotProps == null ? void 0 : slotProps.$index) != -1) ? renderSlot(_ctx.$slots, col.slot, mergeProps({
+          key: 0,
+          ref_for: true
+        }, slotProps || {})) : col.children && col.children.length ? (openBlock(), createBlock(_component_TableColumns, {
+          key: 1,
+          columns: col.children,
+          pageIndex: _ctx.pageIndex,
+          slotNormalize: _ctx.slotNormalize,
+          globalTooltip: _ctx.globalTooltip
+        }, createSlots({ _: 2 }, [
+          renderList(Object.keys(_ctx.$slots), (name) => {
+            return {
+              name,
+              fn: withCtx((tempProps) => [
+                renderSlot(_ctx.$slots, name, mergeProps({ ref_for: true }, tempProps || {}))
+              ])
+            };
+          })
+        ]), 1032, ["columns", "pageIndex", "slotNormalize", "globalTooltip"])) : createCommentVNode("", true)
+      ]),
+      _: 2
+    }, 1040, ["index", "className", "columnKey", "filterClassName", "showOverflowTooltip"]);
+  }), 128);
+}
+const tableColumns = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render]]);
+export {
+  tableColumns as default
+};