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

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

@@ -1,7 +1,7 @@
 import { defineComponent, shallowRef, ref, watch, resolveComponent, openBlock, createElementBlock, Fragment, renderList, createBlock, withCtx, createVNode, normalizeClass, createTextVNode, toDisplayString, createCommentVNode, mergeProps } from "vue";
 import { ElButtonGroup, ElButton, ElUpload, ElTooltip } from "element-plus";
 import { ZoomIn, ZoomOut, Back, Right, Top, Bottom, RefreshLeft, RefreshRight, Switch, Sort, Refresh, Upload, Check } from "@element-plus/icons-vue";
-import { useLocale } from "../../ele-config-provider/use-receiver";
+import { useLocale } from "../../ele-config-provider/receiver";
 const TOOL_ICONS = {
   zoomIn: ZoomIn,
   zoomOut: ZoomOut,

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

@@ -1,4 +1,7 @@
-import Cropper from 'cropperjs';
+import type { Ref } from 'vue';
+import type { CropperOptions } from './types';
+import type PreviewType from "./components/cropper-preview";
+export type PreviewInstance = InstanceType<typeof PreviewType> | null;
 declare const _sfc_main: import("vue").DefineComponent<{
     height: StringConstructor;
     src: StringConstructor;
@@ -23,8 +26,8 @@ declare const _sfc_main: import("vue").DefineComponent<{
         default: number;
     };
     toBlob: BooleanConstructor;
-    options: import("vue").PropType<Cropper.Options<HTMLImageElement>>;
-    croppedOptions: import("vue").PropType<Cropper.GetCroppedCanvasOptions>;
+    options: import("vue").PropType<CropperOptions>;
+    croppedOptions: import("vue").PropType<import("./types").CroppedOptions>;
     tooltip: {
         type: BooleanConstructor;
         default: boolean;
@@ -36,8 +39,8 @@ declare const _sfc_main: import("vue").DefineComponent<{
     };
     locale: import("vue").PropType<import("./types").CropperLocale>;
 }, {
-    imageRef: import("vue").Ref<HTMLImageElement | null>;
-    previewRef: any;
+    imageRef: Ref<HTMLImageElement | null>;
+    previewRef: Ref<any>;
     isResponsive: import("vue").ComputedRef<boolean>;
     onZoomIn: () => void;
     onZoomOut: () => void;
@@ -81,8 +84,8 @@ declare const _sfc_main: import("vue").DefineComponent<{
         default: number;
     };
     toBlob: BooleanConstructor;
-    options: import("vue").PropType<Cropper.Options<HTMLImageElement>>;
-    croppedOptions: import("vue").PropType<Cropper.GetCroppedCanvasOptions>;
+    options: import("vue").PropType<CropperOptions>;
+    croppedOptions: import("vue").PropType<import("./types").CroppedOptions>;
     tooltip: {
         type: BooleanConstructor;
         default: boolean;
@@ -96,13 +99,13 @@ declare const _sfc_main: import("vue").DefineComponent<{
 }>> & {
     onDone?: ((_result?: string | Blob | null | undefined) => any) | undefined;
 }, {
+    preview: boolean;
+    responsive: boolean;
     tooltip: boolean;
     imageType: string;
     accept: string;
     tools: string;
-    preview: boolean;
     previewWidth: number;
     toBlob: boolean;
-    responsive: boolean;
 }, {}>;
 export default _sfc_main;

package/es/ele-cropper/index.js

@@ -1,7 +1,6 @@
 import { defineComponent, ref, watch, nextTick, onMounted, onBeforeUnmount, resolveComponent, openBlock, createElementBlock, normalizeClass, createElementVNode, normalizeStyle, createBlock, createCommentVNode, createVNode } from "vue";
 import Cropper from "cropperjs";
-import { useLicense, UNAUTHORIZED_TIP } from "../utils/license-util";
-import { useResponsive } from "../ele-config-provider/use-receiver";
+import { useLicense, useResponsive } from "../ele-config-provider/receiver";
 import CropperPreview from "./components/cropper-preview";
 import CropperTools from "./components/cropper-tools";
 import { cropperProps, cropperEmits } from "./props";
@@ -15,7 +14,7 @@ const _sfc_main = defineComponent({
     const isResponsive = useResponsive(props);
     const imageRef = ref(null);
     const previewRef = ref(null);
-    const current = {
+    const state = {
       instance: null,
       imageType: props.imageType,
       scaleXValue: -1,
@@ -28,52 +27,52 @@ const _sfc_main = defineComponent({
         options.preview = previewRef.value.getPreviews();
       }
       if (imageRef.value) {
-        current.instance = new Cropper(imageRef.value, options);
+        state.instance = new Cropper(imageRef.value, options);
       }
     };
     const destroy = () => {
-      current.instance && current.instance.destroy();
-      current.instance = null;
+      state.instance && state.instance.destroy();
+      state.instance = null;
     };
     const onZoomIn = () => {
-      current.instance && current.instance.zoom(0.1);
+      state.instance && state.instance.zoom(0.1);
     };
     const onZoomOut = () => {
-      current.instance && current.instance.zoom(-0.1);
+      state.instance && state.instance.zoom(-0.1);
     };
     const onMoveLeft = () => {
-      current.instance && current.instance.move(-10, 0);
+      state.instance && state.instance.move(-10, 0);
     };
     const onMoveRight = () => {
-      current.instance && current.instance.move(10, 0);
+      state.instance && state.instance.move(10, 0);
     };
     const onMoveUp = () => {
-      current.instance && current.instance.move(0, -10);
+      state.instance && state.instance.move(0, -10);
     };
     const onMoveDown = () => {
-      current.instance && current.instance.move(0, 10);
+      state.instance && state.instance.move(0, 10);
     };
     const onRotateLeft = () => {
-      current.instance && current.instance.rotate(-45);
+      state.instance && state.instance.rotate(-45);
     };
     const onRotateRight = () => {
-      current.instance && current.instance.rotate(45);
+      state.instance && state.instance.rotate(45);
     };
     const onFlipX = () => {
-      current.instance && current.instance.scaleX(current.scaleXValue);
-      current.scaleXValue = -current.scaleXValue;
+      state.instance && state.instance.scaleX(state.scaleXValue);
+      state.scaleXValue = -state.scaleXValue;
     };
     const onFlipY = () => {
-      current.instance && current.instance.scaleY(current.scaleYValue);
-      current.scaleYValue = -current.scaleYValue;
+      state.instance && state.instance.scaleY(state.scaleYValue);
+      state.scaleYValue = -state.scaleYValue;
     };
     const onReset = () => {
-      current.instance && current.instance.reset();
+      state.instance && state.instance.reset();
     };
     const onUpload = ({ data, type }) => {
-      current.imageType = type;
-      if (current.instance) {
-        current.instance.replace(data);
+      state.imageType = type;
+      if (state.instance) {
+        state.instance.replace(data);
       } else {
         const elem = imageRef.value;
         if (elem) {
@@ -85,14 +84,14 @@ const _sfc_main = defineComponent({
     };
     const onOk = () => {
       if (!authenticated.value) {
-        console.warn(UNAUTHORIZED_TIP);
         return;
       }
-      if (!current.instance) {
+      if (!state.instance) {
         emit("done");
         return;
       }
-      const result = current.instance.getCroppedCanvas(props.croppedOptions);
+      const opt = props.croppedOptions ? props.croppedOptions : void 0;
+      const result = state.instance.getCroppedCanvas(opt);
       if (!result) {
         emit("done");
         return;
@@ -100,17 +99,17 @@ const _sfc_main = defineComponent({
       if (props.toBlob) {
         result.toBlob((blob) => {
           emit("done", blob);
-        }, current.imageType);
+        }, state.imageType);
         return;
       }
-      emit("done", result.toDataURL(current.imageType));
+      emit("done", result.toDataURL(state.imageType));
     };
     watch(
       () => props.src,
       (src) => {
         if (src) {
-          if (current.instance) {
-            current.instance.replace(src);
+          if (state.instance) {
+            state.instance.replace(src);
           } else {
             nextTick(() => {
               render();
@@ -125,7 +124,7 @@ const _sfc_main = defineComponent({
       () => props.imageType,
       (value) => {
         if (value) {
-          current.imageType = value;
+          state.imageType = value;
         }
       }
     );

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

@@ -1,7 +1,6 @@
 import type { PropType, ExtractPropTypes } from 'vue';
 import type { ElTooltipProps } from 'element-plus';
-import type Cropper from 'cropperjs';
-import type { CropperLocale } from './types';
+import type { CropperOptions, CroppedOptions, CropperLocale } from './types';
 /**
  * 属性
  */
@@ -29,8 +28,8 @@ export declare const cropperProps: {
         default: number;
     };
     toBlob: BooleanConstructor;
-    options: PropType<Cropper.Options<HTMLImageElement>>;
-    croppedOptions: PropType<Cropper.GetCroppedCanvasOptions>;
+    options: PropType<CropperOptions>;
+    croppedOptions: PropType<CroppedOptions>;
     tooltip: {
         type: BooleanConstructor;
         default: boolean;

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

@@ -2,5 +2,5 @@ import 'element-plus/es/components/button-group/style/index';
 import 'element-plus/es/components/button/style/index';
 import 'element-plus/es/components/upload/style/index';
 import 'element-plus/es/components/tooltip/style/index';
-import 'cropperjs/dist/cropper.css';
+import 'cropperjs/dist/cropper.min.css';
 import './index.scss';

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

@@ -36,9 +36,17 @@ export interface ToolGroup {
     items: ToolItem[];
 }
 /**
- * 实例
+ * 裁剪组件参数
  */
-export interface CurrentValue {
+export type CropperOptions = Partial<Cropper.Options<HTMLImageElement>> | null;
+/**
+ * 裁剪方法参数
+ */
+export type CroppedOptions = Partial<Cropper.GetCroppedCanvasOptions> | null;
+/**
+ * 实例状态
+ */
+export interface CurrentState {
     /** 裁剪组件实例 */
     instance?: Cropper | null;
     /** 当前图片类型 */

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

@@ -25,8 +25,8 @@ declare const _sfc_main: import("vue").DefineComponent<{
         default: number;
     };
     toBlob: BooleanConstructor;
-    options: import("vue").PropType<Cropper.Options<HTMLImageElement>>;
-    croppedOptions: import("vue").PropType<Cropper.GetCroppedCanvasOptions>;
+    options: import("vue").PropType<import("../ele-cropper/types").CropperOptions>;
+    croppedOptions: import("vue").PropType<import("../ele-cropper/types").CroppedOptions>;
     tooltip: {
         type: BooleanConstructor;
         default: boolean;
@@ -70,8 +70,8 @@ declare const _sfc_main: import("vue").DefineComponent<{
         default: number;
     };
     toBlob: BooleanConstructor;
-    options: import("vue").PropType<Cropper.Options<HTMLImageElement>>;
-    croppedOptions: import("vue").PropType<Cropper.GetCroppedCanvasOptions>;
+    options: import("vue").PropType<import("../ele-cropper/types").CropperOptions>;
+    croppedOptions: import("vue").PropType<import("../ele-cropper/types").CroppedOptions>;
     tooltip: {
         type: BooleanConstructor;
         default: boolean;
@@ -86,13 +86,13 @@ declare const _sfc_main: import("vue").DefineComponent<{
     onDone?: ((_result: string | Blob | null) => any) | undefined;
     "onUpdate:modelValue"?: ((_value: boolean) => any) | undefined;
 }, {
-    tooltip: boolean;
+    preview: boolean;
     responsive: boolean;
+    tooltip: boolean;
     modelValue: boolean;
     imageType: string;
     accept: string;
     tools: string;
-    preview: boolean;
     previewWidth: number;
     toBlob: boolean;
 }, {}>;

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

@@ -1,5 +1,5 @@
 import { defineComponent, resolveComponent, openBlock, createBlock, mergeProps, createSlots, withCtx, createVNode, renderSlot, normalizeProps, guardReactiveProps } from "vue";
-import { useLocale } from "../ele-config-provider/use-receiver";
+import { useLocale } from "../ele-config-provider/receiver";
 import EleModal from "../ele-modal/index";
 import EleCropper from "../ele-cropper/index";
 import { cropperModalProps, cropperModalEmits } from "./props";

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

@@ -29,8 +29,8 @@ export declare const cropperModalProps: {
         default: number;
     };
     toBlob: BooleanConstructor;
-    options: PropType<Cropper.Options<HTMLImageElement>>;
-    croppedOptions: PropType<Cropper.GetCroppedCanvasOptions>;
+    options: PropType<import("../ele-cropper/types").CropperOptions>;
+    croppedOptions: PropType<import("../ele-cropper/types").CroppedOptions>;
     tooltip: {
         type: BooleanConstructor;
         default: boolean;

package/es/ele-dashboard/index.js

@@ -1,5 +1,5 @@
 import { defineComponent, computed, openBlock, createElementBlock, normalizeClass, normalizeStyle, createElementVNode, renderSlot, createCommentVNode } from "vue";
-import { useLicense } from "../utils/license-util";
+import { useLicense } from "../ele-config-provider/receiver";
 import { dashboardProps } from "./props";
 const _sfc_main = defineComponent({
   name: "EleDashboard",