ele-admin-plus 1.4.1 → 1.5.0-beta.2

package/es/ele-config-provider/types.d.ts

@@ -1,60 +1,53 @@
 import type { ComputedRef } from 'vue';
-import type { EleProTableProps, EleMessageOptions } from '../ele-app/plus';
-import type { TableLocale } from '../ele-pro-table/types';
-import type { FileListLocale } from '../ele-file-list/types';
-import type { CropperLocale } from '../ele-cropper/types';
-import type { MapLocale } from '../ele-map-picker/types';
-import type { UploadLocale } from '../ele-upload-list/types';
-import type { TourLocale } from '../ele-tour/types';
+import type {
+  EleProTableProps,
+  EleMessageOptions,
+  EleMessageBoxOptions
+} from '../ele-app/plus';
+import type { ButtonsLocale } from '../ele-buttons/types';
 import type { CopyableLocale } from '../ele-copyable/types';
-import type { ProFormLocale } from '../ele-pro-form/types';
-import type { CrudLocale } from '../ele-crud/types';
-import type { IconSelectLocale } from '../ele-icon-select/types';
 import type { CronBuilderLocale } from '../ele-cron-builder/types';
 import type { CronPanelLocale } from '../ele-cron-panel/types';
+import type { CropperLocale } from '../ele-cropper/types';
+import type { CrudLocale } from '../ele-crud/types';
+import type { FileListLocale } from '../ele-file-list/types';
+import type { IconSelectLocale } from '../ele-icon-select/types';
+import type { MapLocale } from '../ele-map-picker/types';
+import type { ProFormLocale } from '../ele-pro-form/types';
+import type { TableLocale } from '../ele-pro-table/types';
+import type { TourLocale } from '../ele-tour/types';
+import type { UploadLocale } from '../ele-upload-list/types';
 
 /**
  * 国际化
  */
 export interface EleLocale {
+  /** 操作按钮 */
+  buttons: ButtonsLocale;
+  /** 文本复制 */
+  copyable: CopyableLocale;
+  /** cron 生成器 */
+  cronBuilder: CronBuilderLocale;
+  /** cron */
+  cronPanel: CronPanelLocale;
   /** 图片裁剪 */
   cropper: CropperLocale;
+  /** 增删改查 */
+  crud: CrudLocale;
   /** 文件列表 */
   fileList: FileListLocale;
+  /** 图标选择 */
+  iconSelect: IconSelectLocale;
   /** 地图选择 */
   map: MapLocale;
+  /** 高级表单 */
+  proForm: ProFormLocale;
   /** 高级表格 */
   table: TableLocale;
   /** 漫游式引导 */
   tour: TourLocale;
   /** 文件上传 */
   upload: UploadLocale;
-  /** 文本复制 */
-  copyable: CopyableLocale;
-  /** 高级表单 */
-  proForm: ProFormLocale;
-  /** 增删改查 */
-  crud: CrudLocale;
-  /** 图标选择 */
-  iconSelect: IconSelectLocale;
-  /** cron 生成器 */
-  cronBuilder: CronBuilderLocale;
-  /** cron */
-  cronPanel: CronPanelLocale;
-}
-
-/**
- * 全局配置
- */
-export interface GlobalProvide {
-  /** 国际化 */
-  locale?: EleLocale;
-  /** 表格配置 */
-  table?: TableGlobalConfig;
-  /** 地图密钥 */
-  mapKey?: string;
-  /** license */
-  license?: string;
 }
 
 /**
@@ -94,6 +87,18 @@ export type MessageGlobalConfig = Pick<
   | 'inner'
 >;
 
+/**
+ * 全局配置
+ */
+export interface GlobalProvide {
+  key?: string;
+  locale?: EleLocale;
+  table?: TableGlobalConfig;
+  message?: MessageGlobalConfig;
+  messageBox?: EleMessageBoxOptions;
+  mapKey?: string;
+}
+
 /**
  * 获取国际化方法返回结果
  */

package/es/ele-copyable/index.js

@@ -23,11 +23,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       tooltipRef.value && tooltipRef.value.updatePopper();
     };
     const getText = () => {
-      var _a;
       if (props.text) {
         return props.text;
       }
-      return ((_a = innerRef.value) == null ? void 0 : _a.innerText) || "";
+      return innerRef.value?.innerText || "";
     };
     const handleCopyClick = () => {
       copyText(getText()).then(() => {

package/es/ele-cron-builder/index.d.ts

@@ -1,4 +1,8 @@
-declare const _default: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
+declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & {
+    default?(_: {}): any;
+    footer?(_: {}): any;
+};
+declare const __VLS_component: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     modelValue: BooleanConstructor;
     cron: StringConstructor;
     title: StringConstructor;
@@ -21,4 +25,10 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
 }>, {
     modelValue: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
+declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, ReturnType<typeof __VLS_template>>;
 export default _default;
+type __VLS_WithTemplateSlots<T, S> = T & {
+    new (): {
+        $slots: S;
+    };
+};

package/es/ele-cron-builder/index.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, createBlock, openBlock, mergeProps, unref, withCtx, createVNode, createTextVNode, toDisplayString } from "vue";
+import { defineComponent, ref, createBlock, openBlock, mergeProps, unref, createSlots, withCtx, renderSlot, createVNode, createTextVNode, toDisplayString, renderList, normalizeProps, guardReactiveProps } from "vue";
 import { ElButton } from "element-plus";
 import { useLocale } from "../ele-config-provider/receiver";
 import EleModal from "../ele-modal/index";
@@ -21,8 +21,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       emit("update:cron", cron);
     };
     const hideCronList = () => {
-      var _a, _b;
-      (_b = (_a = cronPanelRef.value) == null ? void 0 : _a.hideCronList) == null ? void 0 : _b.call(_a);
+      cronPanelRef.value?.hideCronList?.();
     };
     const handleCancel = () => {
       hideCronList();
@@ -45,8 +44,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         modelValue: _ctx.modelValue,
         "onUpdate:modelValue": updateModelValue,
         onClosed: handleClosed
-      }), {
+      }), createSlots({
         footer: withCtx(() => [
+          renderSlot(_ctx.$slots, "footer"),
           createVNode(unref(ElButton), { onClick: handleCancel }, {
             default: withCtx(() => [
               createTextVNode(toDisplayString(unref(lang).cancel), 1)
@@ -64,6 +64,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           })
         ]),
         default: withCtx(() => [
+          renderSlot(_ctx.$slots, "default"),
           createVNode(EleCronPanel, {
             ref_key: "cronPanelRef",
             ref: cronPanelRef,
@@ -71,8 +72,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             "onUpdate:modelValue": updateCron
           }, null, 8, ["modelValue"])
         ]),
-        _: 1
-      }, 16, ["title", "modelValue"]);
+        _: 2
+      }, [
+        renderList(Object.keys(_ctx.$slots).filter(
+          (k) => ["default", "footer"].includes(k)
+        ), (name) => {
+          return {
+            name,
+            fn: withCtx((slotProps) => [
+              renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
+            ])
+          };
+        })
+      ]), 1040, ["title", "modelValue"]);
     };
   }
 });

package/es/ele-cron-panel/style/index.scss

@@ -258,7 +258,7 @@
 }
 
 /* 小屏幕 */
-@media screen and (max-width: 768px) {
+@media screen and (max-width: #{$mobile-max-width}) {
   .ele-cron-panel-content {
     height: 220px;
   }

package/es/ele-cron-panel/util.js

@@ -119,7 +119,6 @@ function getResultItems(cron, noDataText, noMoreText) {
     }
   }
   function getWeekArr(rule) {
-    var _a;
     if (dayRule == "" && dayRuleSup == "") {
       if (rule.indexOf("-") >= 0) {
         dayRule = "weekDay";
@@ -134,7 +133,7 @@ function getResultItems(cron, noDataText, noMoreText) {
         }
       } else if (rule.indexOf("L") >= 0) {
         dayRule = "lastWeek";
-        dayRuleSup = Number((_a = rule.match(/[0-9]{1,2}/g)) == null ? void 0 : _a[0]);
+        dayRuleSup = Number(rule.match(/[0-9]{1,2}/g)?.[0]);
         dateArr[3] = [31];
         if (dayRuleSup == 7) {
           dayRuleSup = 0;
@@ -146,7 +145,6 @@ function getResultItems(cron, noDataText, noMoreText) {
     }
   }
   function getDayArr(rule) {
-    var _a;
     dateArr[3] = getOrderArr(1, 31);
     dayRule = "";
     dayRuleSup = "";
@@ -158,7 +156,7 @@ function getResultItems(cron, noDataText, noMoreText) {
       dayRuleSup = "null";
     } else if (rule.indexOf("W") >= 0) {
       dayRule = "workDay";
-      dayRuleSup = Number((_a = rule.match(/[0-9]{1,2}/g)) == null ? void 0 : _a[0]);
+      dayRuleSup = Number(rule.match(/[0-9]{1,2}/g)?.[0]);
       dateArr[3] = [dayRuleSup];
     } else if (rule.indexOf("L") >= 0) {
       dayRule = "lastDay";

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

@@ -67,8 +67,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const handleUpload = (file) => {
       const reader = new FileReader();
       reader.onload = (e) => {
-        var _a;
-        const url = (_a = e.target) == null ? void 0 : _a.result;
+        const url = e.target?.result;
         if (url != null) {
           emitUpload(url, file.type);
         }
@@ -117,7 +116,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }).map((t, j) => {
             const name = t.trim();
             return {
-              key: i + "-" + j + name,
+              key: `${i}-${j}-${name}`,
               name,
               icon: markRaw(TOOL_ICONS[name]),
               className: `ele-cropper-${name}`

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

@@ -56,7 +56,7 @@
   }
 }
 
-@media screen and (max-width: 768px) {
+@media screen and (max-width: #{$mobile-max-width}) {
   .ele-cropper.is-responsive .ele-cropper-previews {
     display: none;
   }
@@ -114,7 +114,7 @@
   border-right: none;
 }
 
-@media screen and (max-width: 768px) {
+@media screen and (max-width: #{$mobile-max-width}) {
   .ele-cropper.is-responsive .ele-cropper-tool-item:not(:last-child) {
     margin-right: 6px;
   }

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

@@ -99,9 +99,9 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     tooltip: boolean;
     responsive: boolean;
     preview: boolean;
-    imageType: string;
-    accept: string;
     tools: string;
+    accept: string;
+    imageType: string;
     previewWidth: number;
     toBlob: boolean;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;

package/es/ele-crud/components/edit-modal.d.ts

@@ -2,7 +2,7 @@ import { PropType } from 'vue';
 import { UserComponent } from '../../ele-app/types';
 import { DataItem } from '../../ele-data-table/types';
 import { ProFormItemTypeData, ScreenSize } from '../../ele-pro-form/types';
-import { EditConfig, CrudField, EditApi, GetFieldsFormItemsFunction, GetAndCacheCodeFunction, CrudLocale } from '../types';
+import { EditConfig, CrudField, EditApi, GetFieldsFormItemsFunction, GetAndCacheCodeFunction } from '../types';
 
 declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>>;
 declare const __VLS_component: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
@@ -33,11 +33,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     httpRequest: (ObjectConstructor | FunctionConstructor)[];
     /** 屏幕尺寸 */
     screenSize: PropType<ScreenSize>;
-    /** 国际化 */
-    lang: {
-        type: PropType<Partial<CrudLocale>>;
-        required: true;
-    };
 }>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     "update:modelValue": (_visible?: boolean | undefined) => void;
     editError: (_e: Error) => void;
@@ -70,11 +65,6 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     httpRequest: (ObjectConstructor | FunctionConstructor)[];
     /** 屏幕尺寸 */
     screenSize: PropType<ScreenSize>;
-    /** 国际化 */
-    lang: {
-        type: PropType<Partial<CrudLocale>>;
-        required: true;
-    };
 }>> & Readonly<{
     "onUpdate:modelValue"?: ((_visible?: boolean | undefined) => any) | undefined;
     onEditError?: ((_e: Error) => any) | undefined;

package/es/ele-crud/components/edit-modal.js

@@ -1,9 +1,9 @@
-import { defineComponent, ref, reactive, computed, watch, createBlock, openBlock, mergeProps, createSlots, withCtx, resolveDynamicComponent, renderList, unref, renderSlot, normalizeProps, guardReactiveProps, createCommentVNode, createTextVNode, toDisplayString } from "vue";
-import { ElButton } from "element-plus";
+import { defineComponent, ref, reactive, computed, watch, createBlock, openBlock, mergeProps, createSlots, withCtx, resolveDynamicComponent, renderList, unref, renderSlot, normalizeProps, guardReactiveProps, createVNode } from "vue";
 import { getSlotsMap } from "../../utils/common";
 import EleModal from "../../ele-modal/index";
 import EleProForm from "../../ele-pro-form/index";
 import { setValue, mergeValue, getFormInitValue } from "../../ele-pro-form/util";
+import EleButtons from "../../ele-buttons/index";
 import { codeStringPrefix } from "../util";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{ name: "EditModal" },
@@ -35,12 +35,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     /** 远程数据源请求工具 */
     httpRequest: [Object, Function],
     /** 屏幕尺寸 */
-    screenSize: String,
-    /** 国际化 */
-    lang: {
-      type: Object,
-      required: true
-    }
+    screenSize: String
   },
   emits: {
     /** 更新弹窗打开状态事件 */
@@ -57,19 +52,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const editFormRef = ref(null);
     const editForm = reactive({});
     const editFormProps = computed(() => {
-      var _a, _b, _c;
-      const formProps = ((_a = props.editConfig) == null ? void 0 : _a.formProps) || {};
+      const formProps = props.editConfig?.formProps || {};
       return {
         ...formProps,
-        items: ((_b = formProps.items) == null ? void 0 : _b.length) ? formProps.items : (_c = props.getFieldsEditFormItems) == null ? void 0 : _c.call(props, props.fields)
+        items: formProps.items?.length ? formProps.items : props.getFieldsEditFormItems?.(props.fields)
       };
     });
     const handleUpdateVisible = (visible) => {
       emit("update:modelValue", visible);
     };
     const handleSave = () => {
-      var _a, _b;
-      (_b = (_a = editFormRef.value) == null ? void 0 : _a.validate) == null ? void 0 : _b.call(_a, (valid) => {
+      editFormRef.value?.validate?.((valid) => {
         if (valid) {
           handleSubmitEditForm(editForm);
         }
@@ -113,6 +106,27 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         emit("editError", e);
       });
     };
+    const btnItems = computed(() => {
+      const items = [];
+      if (props.editConfig?.cancelBtnProps !== false) {
+        items.push({
+          preset: "cancel",
+          props: props.editConfig?.cancelBtnProps === true ? void 0 : props.editConfig?.cancelBtnProps,
+          onClick: handleCancel
+        });
+      }
+      if (props.editConfig?.saveBtnProps !== false) {
+        items.push({
+          preset: "save",
+          props: {
+            loading: loading.value,
+            ...(props.editConfig?.saveBtnProps === true ? void 0 : props.editConfig?.saveBtnProps) || {}
+          },
+          onClick: handleSave
+        });
+      }
+      return items;
+    });
     watch(
       () => props.modelValue,
       (visible) => {
@@ -122,95 +136,67 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     );
     return (_ctx, _cache) => {
-      var _a, _b, _c, _d;
       return openBlock(), createBlock(EleModal, mergeProps({
         width: 460,
         form: true,
         title: __props.title,
-        destroyOnClose: true
-      }, ((_a = __props.editConfig) == null ? void 0 : _a.modalProps) || {}, {
+        destroyOnClose: true,
+        loading: loading.value
+      }, __props.editConfig?.modalProps || {}, {
         modelValue: __props.modelValue,
         "onUpdate:modelValue": handleUpdateVisible
       }), createSlots({
-        default: withCtx(() => {
-          var _a2;
-          return [
-            (openBlock(), createBlock(resolveDynamicComponent(__props.proFormComponent || EleProForm), mergeProps({
-              itemTypeData: __props.itemTypeData,
-              httpRequest: __props.httpRequest,
-              screenSize: __props.screenSize
-            }, editFormProps.value, {
-              ref_key: "editFormRef",
-              ref: editFormRef,
-              model: editForm,
-              onUpdateValue: handleUpdateEditForm,
-              onSubmit: handleSubmitEditForm,
-              onReset: _cache[0] || (_cache[0] = ($event) => handleResetEditForm())
-            }), createSlots({ _: 2 }, [
-              renderList(unref(getSlotsMap)(
-                _ctx.$slots,
-                (_a2 = __props.editConfig) == null ? void 0 : _a2.formSlots,
-                [],
-                [],
-                true
-              ), ([slotName, name]) => {
-                return {
-                  name,
-                  fn: withCtx((slotProps) => [
-                    renderSlot(_ctx.$slots, slotName, normalizeProps(guardReactiveProps(slotProps || {})))
-                  ])
-                };
-              })
-            ]), 1040, ["itemTypeData", "httpRequest", "screenSize", "model"]))
-          ];
-        }),
+        default: withCtx(() => [
+          (openBlock(), createBlock(resolveDynamicComponent(__props.proFormComponent || EleProForm), mergeProps({
+            itemTypeData: __props.itemTypeData,
+            httpRequest: __props.httpRequest,
+            screenSize: __props.screenSize
+          }, editFormProps.value, {
+            ref_key: "editFormRef",
+            ref: editFormRef,
+            model: editForm,
+            onUpdateValue: handleUpdateEditForm,
+            onSubmit: handleSubmitEditForm,
+            onReset: _cache[0] || (_cache[0] = ($event) => handleResetEditForm())
+          }), createSlots({ _: 2 }, [
+            renderList(unref(getSlotsMap)(
+              _ctx.$slots,
+              __props.editConfig?.formSlots,
+              [],
+              [],
+              true
+            ), (slotName, compSlotName) => {
+              return {
+                name: compSlotName,
+                fn: withCtx((slotProps) => [
+                  renderSlot(_ctx.$slots, slotName, normalizeProps(guardReactiveProps(slotProps || {})))
+                ])
+              };
+            })
+          ]), 1040, ["itemTypeData", "httpRequest", "screenSize", "model"]))
+        ]),
         _: 2
       }, [
-        ((_b = __props.editConfig) == null ? void 0 : _b.cancelBtnProps) !== false || ((_c = __props.editConfig) == null ? void 0 : _c.saveBtnProps) !== false ? {
+        btnItems.value.length ? {
           name: "footer",
-          fn: withCtx(() => {
-            var _a2, _b2, _c2, _d2, _e, _f;
-            return [
-              ((_a2 = __props.editConfig) == null ? void 0 : _a2.cancelBtnProps) !== false ? (openBlock(), createBlock(unref(ElButton), mergeProps(
-                { key: 0 },
-                (((_b2 = __props.editConfig) == null ? void 0 : _b2.cancelBtnProps) === true ? void 0 : (_c2 = __props.editConfig) == null ? void 0 : _c2.cancelBtnProps) || {},
-                { onClick: handleCancel }
-              ), {
-                default: withCtx(() => [
-                  createTextVNode(toDisplayString(__props.lang.cancel), 1)
-                ]),
-                _: 1
-              }, 16)) : createCommentVNode("", true),
-              ((_d2 = __props.editConfig) == null ? void 0 : _d2.saveBtnProps) !== false ? (openBlock(), createBlock(unref(ElButton), mergeProps(
-                {
-                  key: 1,
-                  type: "primary",
-                  loading: loading.value
-                },
-                (((_e = __props.editConfig) == null ? void 0 : _e.saveBtnProps) === true ? void 0 : (_f = __props.editConfig) == null ? void 0 : _f.saveBtnProps) || {},
-                { onClick: handleSave }
-              ), {
-                default: withCtx(() => [
-                  createTextVNode(toDisplayString(__props.lang.save), 1)
-                ]),
-                _: 1
-              }, 16, ["loading"])) : createCommentVNode("", true)
-            ];
-          }),
+          fn: withCtx(() => [
+            createVNode(EleButtons, { items: btnItems.value }, null, 8, ["items"])
+          ]),
           key: "0"
         } : void 0,
-        renderList(unref(getSlotsMap)(_ctx.$slots, (_d = __props.editConfig) == null ? void 0 : _d.modalSlots, [
-          "default",
-          "footer"
-        ]), ([slotName, name]) => {
+        renderList(unref(getSlotsMap)(
+          _ctx.$slots,
+          __props.editConfig?.modalSlots,
+          ["default", "footer"]
+        ), (slotName, compSlotName) => {
           return {
-            name,
+            name: compSlotName,
             fn: withCtx((slotProps) => [
               renderSlot(_ctx.$slots, slotName, normalizeProps(guardReactiveProps(slotProps || {})))
             ])
           };
         })
-      ]), 1040, ["title", "modelValue"]);
+      ]), 1040, ["title", "loading", "modelValue"]);
     };
   }
 });

package/es/ele-crud/components/page-side.d.ts

@@ -1,7 +1,7 @@
 import { PropType } from 'vue';
-import { SideConfig } from '../types';
+import { SideConfig, CrudLocale } from '../types';
 
-declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>>;
+declare function __VLS_template(): Partial<Record<string, (_: any) => any>>;
 declare const __VLS_component: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     /** 侧栏配置 */
     sideConfig: PropType<SideConfig>;
@@ -13,6 +13,13 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     errorMessage: StringConstructor;
     /** 选中值 */
     selectedValue: PropType<any>;
+    /** 侧栏树搜索关键字 */
+    keywords: StringConstructor;
+    /** 国际化 */
+    lang: {
+        type: PropType<Partial<CrudLocale>>;
+        required: true;
+    };
 }>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     treeNodeClick: (_nodeValue?: any) => void;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
@@ -26,6 +33,13 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     errorMessage: StringConstructor;
     /** 选中值 */
     selectedValue: PropType<any>;
+    /** 侧栏树搜索关键字 */
+    keywords: StringConstructor;
+    /** 国际化 */
+    lang: {
+        type: PropType<Partial<CrudLocale>>;
+        required: true;
+    };
 }>> & Readonly<{
     onTreeNodeClick?: ((_nodeValue?: any) => any) | undefined;
 }>, {