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

package/lib/ele-config-provider/types/index.d.ts

@@ -1,4 +1,4 @@
-import type { ComputedRef } from 'vue';
+import type { Ref, ComputedRef } from 'vue';
 import type { ProTableProps } from '../../ele-pro-table/props';
 import type { TableLocale } from '../../ele-pro-table/types';
 import type { FileListLocale } from '../../ele-file-list/types';
@@ -24,7 +24,7 @@ export interface EleGlobalProvide {
 /**
  * 表格配置
  */
-export type TableGlobalConfig = Partial<Pick<ProTableProps, 'request' | 'response' | 'ascendingValue' | 'descendingValue' | 'size'>>;
+export type TableGlobalConfig = Partial<Pick<ProTableProps, 'stripe' | 'border' | 'request' | 'response' | 'parseData' | 'size' | 'tools' | 'maximizedIndex' | 'pagination'>>;
 /**
  * 国际化
  */
@@ -37,16 +37,19 @@ export interface EleLocale {
     map: MapLocale;
     /** 高级表格 */
     table: TableLocale;
-    /** 文件上传 */
-    upload: UploadLocale;
     /** 漫游式引导 */
     tour: TourLocale;
+    /** 文件上传 */
+    upload: UploadLocale;
 }
 /**
- * 带国际化的组件属性
+ * 获取是否授权返回结果
  */
-export interface LocaleProps<T> extends Record<keyof any, any> {
-    locale?: T;
+export interface UseLicenseResult {
+    /** 是否授权 */
+    authenticated: Ref<boolean>;
+    /** 全局配置 */
+    globalConfig: EleGlobalProvide;
 }
 /**
  * 获取国际化方法返回结果
@@ -57,6 +60,18 @@ export interface UseLocaleResult<T> {
     /** 全局配置 */
     globalConfig: EleGlobalProvide;
 }
+/**
+ * 带国际化的组件属性
+ */
+export interface LocaleProps<T> extends Record<keyof any, any> {
+    locale?: T;
+}
+/**
+ * 带响应式的组件属性
+ */
+export interface ResponsiveProps extends Record<keyof any, any> {
+    responsive?: boolean;
+}
 /**
  * 布局共享数据
  */
@@ -79,12 +94,8 @@ export interface LayoutProvide {
     tabBar?: boolean;
     /** 是否显示侧栏 */
     sidebar?: boolean;
+    /** 是否支持内链缓存 */
+    keepAlive?: boolean;
     /** 是否开启响应式 */
     responsive?: boolean;
 }
-/**
- * 带响应式的组件属性
- */
-export interface ResponsiveProps extends Record<keyof any, any> {
-    responsive?: boolean;
-}

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

@@ -2,7 +2,7 @@
 const vue = require("vue");
 const elementPlus = require("element-plus");
 const iconsVue = require("@element-plus/icons-vue");
-const useReceiver = require("../../ele-config-provider/use-receiver");
+const receiver = require("../../ele-config-provider/receiver");
 const TOOL_ICONS = {
   zoomIn: iconsVue.ZoomIn,
   zoomOut: iconsVue.ZoomOut,
@@ -49,7 +49,7 @@ const _sfc_main = vue.defineComponent({
     ok: () => true
   },
   setup(props, { emit }) {
-    const { lang } = useReceiver.useLocale("cropper", props);
+    const { lang } = receiver.useLocale("cropper", props);
     const groups = vue.shallowRef([]);
     const tooltipContent = vue.ref("");
     const virtualRef = vue.ref();

package/lib/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/lib/ele-cropper/index.js

@@ -1,8 +1,7 @@
 "use strict";
 const vue = require("vue");
 const Cropper = require("cropperjs");
-const licenseUtil = require("../utils/license-util");
-const useReceiver = require("../ele-config-provider/use-receiver");
+const receiver = require("../ele-config-provider/receiver");
 const CropperPreview = require("./components/cropper-preview");
 const CropperTools = require("./components/cropper-tools");
 const props = require("./props");
@@ -12,11 +11,11 @@ const _sfc_main = vue.defineComponent({
   props: props.cropperProps,
   emits: props.cropperEmits,
   setup(props2, { emit }) {
-    const { authenticated } = licenseUtil.useLicense();
-    const isResponsive = useReceiver.useResponsive(props2);
+    const { authenticated } = receiver.useLicense();
+    const isResponsive = receiver.useResponsive(props2);
     const imageRef = vue.ref(null);
     const previewRef = vue.ref(null);
-    const current = {
+    const state = {
       instance: null,
       imageType: props2.imageType,
       scaleXValue: -1,
@@ -29,52 +28,52 @@ const _sfc_main = vue.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) {
@@ -86,14 +85,14 @@ const _sfc_main = vue.defineComponent({
     };
     const onOk = () => {
       if (!authenticated.value) {
-        console.warn(licenseUtil.UNAUTHORIZED_TIP);
         return;
       }
-      if (!current.instance) {
+      if (!state.instance) {
         emit("done");
         return;
       }
-      const result = current.instance.getCroppedCanvas(props2.croppedOptions);
+      const opt = props2.croppedOptions ? props2.croppedOptions : void 0;
+      const result = state.instance.getCroppedCanvas(opt);
       if (!result) {
         emit("done");
         return;
@@ -101,17 +100,17 @@ const _sfc_main = vue.defineComponent({
       if (props2.toBlob) {
         result.toBlob((blob) => {
           emit("done", blob);
-        }, current.imageType);
+        }, state.imageType);
         return;
       }
-      emit("done", result.toDataURL(current.imageType));
+      emit("done", result.toDataURL(state.imageType));
     };
     vue.watch(
       () => props2.src,
       (src) => {
         if (src) {
-          if (current.instance) {
-            current.instance.replace(src);
+          if (state.instance) {
+            state.instance.replace(src);
           } else {
             vue.nextTick(() => {
               render();
@@ -126,7 +125,7 @@ const _sfc_main = vue.defineComponent({
       () => props2.imageType,
       (value) => {
         if (value) {
-          current.imageType = value;
+          state.imageType = value;
         }
       }
     );

package/lib/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/lib/ele-cropper/style/index.js

@@ -3,5 +3,5 @@ require("element-plus/es/components/button-group/style/index");
 require("element-plus/es/components/button/style/index");
 require("element-plus/es/components/upload/style/index");
 require("element-plus/es/components/tooltip/style/index");
-require("cropperjs/dist/cropper.css");
+require("cropperjs/dist/cropper.min.css");
 require("./index.scss");

package/lib/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/lib/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/lib/ele-cropper-modal/index.js

@@ -1,6 +1,6 @@
 "use strict";
 const vue = require("vue");
-const useReceiver = require("../ele-config-provider/use-receiver");
+const receiver = require("../ele-config-provider/receiver");
 const EleModal = require("../ele-modal/index");
 const EleCropper = require("../ele-cropper/index");
 const props = require("./props");
@@ -10,7 +10,7 @@ const _sfc_main = vue.defineComponent({
   props: props.cropperModalProps,
   emits: props.cropperModalEmits,
   setup(props2, { emit }) {
-    const { lang } = useReceiver.useLocale("cropper", props2);
+    const { lang } = receiver.useLocale("cropper", props2);
     const updateModelValue = (value) => {
       emit("update:modelValue", value);
     };

package/lib/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/lib/ele-dashboard/index.js

@@ -1,12 +1,12 @@
 "use strict";
 const vue = require("vue");
-const licenseUtil = require("../utils/license-util");
+const receiver = require("../ele-config-provider/receiver");
 const props = require("./props");
 const _sfc_main = vue.defineComponent({
   name: "EleDashboard",
   props: props.dashboardProps,
   setup(props2) {
-    const { authenticated } = licenseUtil.useLicense();
+    const { authenticated } = receiver.useLicense();
     const rootStyle = vue.computed(() => {
       const style = {};
       if (props2.size != null) {