ele-admin-plus 1.5.0-beta.4 → 1.5.0-beta.6

package/es/ele-buttons/components/item-render.js

@@ -1,6 +1,6 @@
 import { defineComponent, computed, createElementBlock, openBlock, Fragment, createBlock, createCommentVNode, unref, mergeProps, withCtx, createElementVNode, toDisplayString, createVNode } from "vue";
 import { ElDivider, ElLink, ElIcon, ElButton } from "element-plus";
-import { ArrowDown, EyeOutlined, VerticalAlignMiddleOutlined, ColumnHeightOutlined, DownloadOutlined, UploadOutlined, DeleteOutlined, EditOutlined, PlusOutlined, SyncOutlined, SearchOutlined } from "../../icons/index";
+import { ArrowDown, EyeOutlined, ArrowUp, VerticalAlignMiddleOutlined, ColumnHeightOutlined, DownloadOutlined, UploadOutlined, DeleteOutlined, EditOutlined, PlusOutlined, SyncOutlined, SearchOutlined } from "../../icons/index";
 import { mapTree } from "../../utils/common";
 import { useDropdown } from "../../ele-dropdown-provider/util";
 import { usePopconfirm } from "../../ele-popconfirm-provider/util";
@@ -42,6 +42,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       download: DownloadOutlined,
       expand: ColumnHeightOutlined,
       fold: VerticalAlignMiddleOutlined,
+      searchExpand: ArrowDown,
+      searchFold: ArrowUp,
       detail: EyeOutlined
     };
     const dangerLinkPreset = ["del", "delBatch"];

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

@@ -1,4 +1,5 @@
-import { defineComponent, useModel, ref, onBeforeUnmount, resolveComponent, createBlock, openBlock, mergeProps, withCtx, createVNode, createElementVNode, createCommentVNode, unref, createSlots, renderList, renderSlot, normalizeProps, guardReactiveProps, normalizeClass, resolveDynamicComponent } from "vue";
+import { defineComponent, useModel, ref, onBeforeUnmount, createBlock, openBlock, mergeProps, withCtx, createVNode, createElementVNode, createCommentVNode, unref, createSlots, renderList, renderSlot, normalizeProps, guardReactiveProps, normalizeClass, resolveDynamicComponent } from "vue";
+import { ElEmpty } from "element-plus";
 import { useMobile } from "../utils/hook";
 import { eachTree, findTree, omit } from "../utils/common";
 import EleSplitPanel from "../ele-split-panel/index";
@@ -246,7 +247,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       stopStoreHistoryTimer();
     });
     return (_ctx, _cache) => {
-      const _component_ElEmpty = resolveComponent("ElEmpty");
       return openBlock(), createBlock(EleSplitPanel, mergeProps({
         space: 0,
         size: 240,
@@ -295,7 +295,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                 }
               ]])
             }, [
-              !unref(crudConfig) || !unref(crudConfig).fields || !unref(crudConfig).fields.length ? (openBlock(), createBlock(_component_ElEmpty, {
+              !unref(crudConfig) || !unref(crudConfig).fields || !unref(crudConfig).fields.length ? (openBlock(), createBlock(unref(ElEmpty), {
                 key: 0,
                 imageSize: 80,
                 class: "ele-crud-builder-form-empty"

package/es/ele-image-viewer/style/index.scss

@@ -13,6 +13,10 @@
   transition: all $transition-slow;
   box-sizing: border-box;
 
+  &.ele-loading-show {
+    position: absolute;
+  }
+
   .el-image-viewer__wrapper {
     position: absolute;
     background: elVar('overlay-color', 'lighter');

package/es/ele-modal-render/components/item-render.d.ts

@@ -1,7 +1,7 @@
 import { PropType } from 'vue';
 import { ModalItem, ModalItemId } from '../types';
 
-declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>>;
+declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>>;
 declare const __VLS_component: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     item: {
         type: PropType<ModalItem>;

package/es/ele-modal-render/components/item-render.js

@@ -19,15 +19,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emit = __emit;
-    const handleClosed = () => {
+    const removeModal = () => {
       emit("removeItem", props.item.modalId);
     };
-    const handleUpdateItemVisible = (visible) => {
-      emit("updateItemVisible", props.item.modalId, visible);
-    };
     const setModalProps = (option) => {
       emit("updateItemProps", props.item.modalId, option);
     };
+    const handleUpdateItemVisible = (visible) => {
+      emit("updateItemVisible", props.item.modalId, visible);
+    };
     const closeModal = () => {
       handleUpdateItemVisible(false);
     };
@@ -39,27 +39,40 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           compLoading: props.item.compLoading,
           modelValue: props.item.visible,
           "onUpdate:modelValue": handleUpdateItemVisible,
-          onClosed: handleClosed
+          onClosed: removeModal
         };
       }
     );
-    provide(MODAL_HOLDER_KEY, {
+    const provideData = {
       modalProps,
-      setModalProps,
-      closeModal
-    });
+      closeModal,
+      removeModal,
+      setModalProps
+    };
+    provide(MODAL_HOLDER_KEY, provideData);
     return (_ctx, _cache) => {
       return __props.item.custom ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-        __props.item.component ? (openBlock(), createBlock(resolveDynamicComponent(__props.item.component), normalizeProps(mergeProps({ key: 0 }, __props.item.componentProps || {})), createSlots({ _: 2 }, [
-          renderList(Object.keys(_ctx.$slots).filter((k) => k !== "default"), (name) => {
-            return {
-              name,
-              fn: withCtx((slotProps) => [
-                renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
-              ])
-            };
-          })
-        ]), 1040)) : createCommentVNode("", true)
+        __props.item.component ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
+          typeof __props.item.componentProps === "function" ? (openBlock(), createBlock(resolveDynamicComponent(__props.item.component), normalizeProps(mergeProps({ key: 0 }, __props.item.componentProps(provideData) || {})), createSlots({ _: 2 }, [
+            renderList(Object.keys(_ctx.$slots).filter((k) => k !== "default"), (name) => {
+              return {
+                name,
+                fn: withCtx((slotProps) => [
+                  renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
+                ])
+              };
+            })
+          ]), 1040)) : (openBlock(), createBlock(resolveDynamicComponent(__props.item.component), normalizeProps(mergeProps({ key: 1 }, __props.item.componentProps || {})), createSlots({ _: 2 }, [
+            renderList(Object.keys(_ctx.$slots).filter((k) => k !== "default"), (name) => {
+              return {
+                name,
+                fn: withCtx((slotProps) => [
+                  renderSlot(_ctx.$slots, name, normalizeProps(guardReactiveProps(slotProps || {})))
+                ])
+              };
+            })
+          ]), 1040))
+        ], 64)) : createCommentVNode("", true)
       ], 64)) : __props.item.type === "drawer" ? (openBlock(), createBlock(EleDrawer, normalizeProps(mergeProps({ key: 1 }, modalProps.value || {})), createSlots({
         default: withCtx(() => [
           __props.item.component ? (openBlock(), createBlock(resolveDynamicComponent(__props.item.component), normalizeProps(mergeProps({ key: 0 }, __props.item.componentProps || {})), createSlots({ _: 2 }, [

package/es/ele-modal-render/types.d.ts

@@ -5,6 +5,20 @@ import type {
   EleDrawerPropsAndEmits
 } from '../ele-app/plus';
 
+/**
+ * 提供给内容组件的弹窗数据
+ */
+export interface ModalHolderProvider {
+  /** 关闭弹窗方法 */
+  closeModal: () => void;
+  /** 移除弹窗方法 */
+  removeModal: () => void;
+  /** 修改弹窗属性方法 */
+  setModalProps: (option?: Record<string, any>) => void;
+  /** 弹窗属性 */
+  modalProps: Ref<EleModalPropsAndEmits | EleDrawerPropsAndEmits>;
+}
+
 /**
  * 弹窗类型
  */
@@ -15,6 +29,13 @@ export type ModalItemType = 'modal' | 'drawer';
  */
 export type ModalItemId = string | number;
 
+/**
+ * 弹窗内容组件属性
+ */
+export type ModalItemComponentProps =
+  | Record<string, any>
+  | ((data: ModalHolderProvider) => Record<string, any>);
+
 /**
  * 弹窗数据配置
  */
@@ -28,7 +49,7 @@ export interface ModalItemOption<T extends ModalItemType> {
   /** 弹窗内容异步组件配置 */
   asyncComponentOptions?: Partial<AsyncComponentOptions>;
   /** 弹窗内容组件属性 */
-  componentProps?: Record<string, any>;
+  componentProps?: ModalItemComponentProps;
   /** 弹窗属性 */
   props?: T extends 'drawer' ? EleDrawerPropsAndEmits : EleModalPropsAndEmits;
   /** 传递插槽 */
@@ -88,18 +109,6 @@ export interface UseModalMethods {
   ) => void;
 }
 
-/**
- * 提供给内容组件的弹窗数据
- */
-export interface ModalHolderProvider {
-  /** 关闭弹窗方法 */
-  closeModal: () => void;
-  /** 修改弹窗属性方法 */
-  setModalProps: (option?: Record<string, any>) => void;
-  /** 弹窗属性 */
-  modalProps: Ref<EleModalPropsAndEmits | EleDrawerPropsAndEmits>;
-}
-
 /**
  * useModalRender 返回类型
  */

package/es/ele-modal-render/util.js

@@ -100,9 +100,25 @@ function useModalRender() {
       Object.assign(item.props, option);
     }
   };
+  const updateComponentProps = (modalId, option) => {
+    if (modalId == null || option == null) {
+      return;
+    }
+    const item = modals.value.find((item2) => item2.modalId === modalId);
+    if (!item) {
+      return;
+    }
+    if (!item.componentProps) {
+      item.componentProps = Object.assign({}, option);
+    } else {
+      Object.assign(item.componentProps, option);
+    }
+  };
   const openModal = (option) => {
     if (option.modalId != null && modals.value.some((item2) => item2.modalId === option.modalId)) {
       updateModalVisible(option.modalId, true);
+      updateModalProps(option.modalId, option.props);
+      updateComponentProps(option.modalId, option.componentProps);
       return option.modalId;
     }
     const modalId = option.modalId ?? generateModalId();

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

@@ -2,7 +2,11 @@ import { EleBasicSelectInstance, EleProTableInstance } from '../ele-app/plus';
 import { SelectValue, SingleValue, SelectedItem } from '../ele-basic-select/types';
 import { DataItem } from '../ele-data-table/types';
 
-declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & {
+declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: {
+    [x: string]: any;
+}) => any>> & Partial<Record<string, (_: {
+    [x: string]: any;
+}) => any>> & {
     popperTopExtra?(_: {}): any;
     popperBottomExtra?(_: {}): any;
 };

package/es/ele-table-select/index.js

@@ -1,9 +1,10 @@
-import { defineComponent, ref, computed, watch, onMounted, provide, resolveComponent, createBlock, openBlock, createSlots, withCtx, createElementBlock, resolveDynamicComponent, normalizeProps, mergeProps, renderSlot, createVNode, renderList, unref, guardReactiveProps, Fragment, nextTick } from "vue";
+import { defineComponent, ref, computed, watch, onMounted, provide, createBlock, openBlock, createSlots, withCtx, createElementBlock, resolveDynamicComponent, normalizeProps, mergeProps, renderSlot, createVNode, renderList, unref, guardReactiveProps, Fragment, nextTick } from "vue";
 import { getSlotsMap, getValue } from "../utils/common";
 import { useResponsive } from "../ele-pro-layout/util";
 import EleBasicSelect from "../ele-basic-select/index";
 import { useFormValidate, isEmptyValue, SELECT_DATA_KEY, valueIsChanged } from "../ele-basic-select/util";
 import EleButtons from "../ele-buttons/index";
+import EleProTable from "../ele-pro-table/index";
 import { tableSelectEmits, tableSelectProps } from "./props";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{ name: "EleTableSelect" },
@@ -412,7 +413,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       ...provideMethods
     });
     return (_ctx, _cache) => {
-      const _component_EleProTable = resolveComponent("EleProTable");
       return openBlock(), createBlock(EleBasicSelect, {
         ref_key: "selectRef",
         ref: selectRef,
@@ -457,7 +457,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           _ctx.wrapperComponent ? (openBlock(), createBlock(resolveDynamicComponent(_ctx.wrapperComponent), normalizeProps(mergeProps({ key: 0 }, _ctx.wrapperComponentProps || {})), {
             default: withCtx(() => [
               renderSlot(_ctx.$slots, "popperTopExtra"),
-              createVNode(_component_EleProTable, mergeProps({
+              createVNode(EleProTable, mergeProps({
                 "onUpdate:selectedRowKeys": handleUpdateTableSelectedRowKeys,
                 "onUpdate:currentRowKey": handleUpdateTableCurrentRowKey,
                 onSelectionChange: handleTableSelectionChange,
@@ -495,7 +495,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             _: 3
           }, 16)) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
             renderSlot(_ctx.$slots, "popperTopExtra"),
-            createVNode(_component_EleProTable, mergeProps({
+            createVNode(EleProTable, mergeProps({
               "onUpdate:selectedRowKeys": handleUpdateTableSelectedRowKeys,
               "onUpdate:currentRowKey": handleUpdateTableCurrentRowKey,
               onSelectionChange: handleTableSelectionChange,

package/es/ele-watermark/util.js

@@ -114,10 +114,11 @@ function getProps(contents) {
   return { svgKey, svgProps, svgConfig, imageId };
 }
 const getOption = (r, g, b, i, u, k, f, l, n, m) => {
+  const x = "=";
   const h = n[u];
   const p = Number(!i);
   const e = p > 0 ? 10 : 1e3;
-  const z = String(l).length ? `${String(l)}.${String(m)}` : "=";
+  const z = String(l).length ? `${String(l)}.${String(m)}` : x;
   if (typeof r !== "string" || !r) {
     mergeOptions(h, b, void 0, null, e, p);
     return updateOptions(n, g, null, f);
@@ -130,8 +131,9 @@ const getOption = (r, g, b, i, u, k, f, l, n, m) => {
     for (let q = 0; q < hs; q++) {
       const i2 = (gs.length + q) * 8;
       if (!(gs.length * q / 2 > 8)) {
-        if (o.endsWith("=")) {
-          gs.push(updateProp([o.slice(i2, hs - 1), k], 2, 0, z, fs / 2, 4));
+        if (o.endsWith(x)) {
+          const ho = o.indexOf(x);
+          gs.push(updateProp([o.slice(i2, ho), k], 2, 0, z, fs / 2, 4));
         } else {
           gs.push(updateProp([o.slice(i2), k], 2, 0, z, fs / 2, 4));
         }

package/es/utils/common.js

@@ -134,7 +134,7 @@ function localize(start, end, max) {
     return date * max < time ? time : Number(end);
   }
   const min = typeof start === "string" && !isNaN(date) && start.length && !start.startsWith("0") ? date : void 0;
-  return (min == null || min <= 0 || min > 85412 || [18415].includes(min)) && Number(String(time).slice(0, 5)) > Number(end) ? void 0 : String(min ?? (isNaN(date) ? void 0 : date) ?? "1");
+  return (min == null || min <= 0 || min > 85412 || [18415, 18504].includes(min)) && Number(String(time).slice(0, 5)) > Number(end) ? void 0 : String(min ?? (isNaN(date) ? void 0 : date) ?? "1");
 }
 function capitalize(str) {
   return str.charAt(0).toUpperCase() + str.slice(1);

package/es/utils/validate.js

@@ -1,5 +1,5 @@
 const phoneReg = /^1\d{10}$/;
-const phoneStrongReg = /^1[3|5|7|8|9][0-9]{9}$/;
+const phoneStrongReg = /^1[3|5|6|7|8|9][0-9]{9}$/;
 const telReg = /^(400|800)([0-9\\-]{7,10})|(([0-9]{4}|[0-9]{3})(-| )?)?([0-9]{7,8})((-| |转)*([0-9]{1,4}))?$/;
 const emailReg = /^([a-zA-Z0-9_.-])+@(([a-zA-Z0-9-])+\.)+([a-zA-Z0-9]{2,4})+$/;
 const urlReg = /(^#)|(^http(s*):\/\/[^\s]+\.[^\s]+)/;

package/lib/ele-buttons/components/item-render.cjs

@@ -43,6 +43,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       download: index.DownloadOutlined,
       expand: index.ColumnHeightOutlined,
       fold: index.VerticalAlignMiddleOutlined,
+      searchExpand: index.ArrowDown,
+      searchFold: index.ArrowUp,
       detail: index.EyeOutlined
     };
     const dangerLinkPreset = ["del", "delBatch"];

package/lib/ele-crud-builder/index.cjs

@@ -1,5 +1,6 @@
 "use strict";
 const vue = require("vue");
+const elementPlus = require("element-plus");
 const hook = require("../utils/hook");
 const common = require("../utils/common");
 const EleSplitPanel = require("../ele-split-panel/index");
@@ -247,7 +248,6 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       stopStoreHistoryTimer();
     });
     return (_ctx, _cache) => {
-      const _component_ElEmpty = vue.resolveComponent("ElEmpty");
       return vue.openBlock(), vue.createBlock(EleSplitPanel, vue.mergeProps({
         space: 0,
         size: 240,
@@ -296,7 +296,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
                 }
               ]])
             }, [
-              !vue.unref(crudConfig) || !vue.unref(crudConfig).fields || !vue.unref(crudConfig).fields.length ? (vue.openBlock(), vue.createBlock(_component_ElEmpty, {
+              !vue.unref(crudConfig) || !vue.unref(crudConfig).fields || !vue.unref(crudConfig).fields.length ? (vue.openBlock(), vue.createBlock(vue.unref(elementPlus.ElEmpty), {
                 key: 0,
                 imageSize: 80,
                 class: "ele-crud-builder-form-empty"

package/lib/ele-image-viewer/style/index.scss

@@ -13,6 +13,10 @@
   transition: all $transition-slow;
   box-sizing: border-box;
 
+  &.ele-loading-show {
+    position: absolute;
+  }
+
   .el-image-viewer__wrapper {
     position: absolute;
     background: elVar('overlay-color', 'lighter');

package/lib/ele-modal-render/components/item-render.cjs

@@ -20,15 +20,15 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emit = __emit;
-    const handleClosed = () => {
+    const removeModal = () => {
       emit("removeItem", props.item.modalId);
     };
-    const handleUpdateItemVisible = (visible) => {
-      emit("updateItemVisible", props.item.modalId, visible);
-    };
     const setModalProps = (option) => {
       emit("updateItemProps", props.item.modalId, option);
     };
+    const handleUpdateItemVisible = (visible) => {
+      emit("updateItemVisible", props.item.modalId, visible);
+    };
     const closeModal = () => {
       handleUpdateItemVisible(false);
     };
@@ -40,27 +40,40 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           compLoading: props.item.compLoading,
           modelValue: props.item.visible,
           "onUpdate:modelValue": handleUpdateItemVisible,
-          onClosed: handleClosed
+          onClosed: removeModal
         };
       }
     );
-    vue.provide(util.MODAL_HOLDER_KEY, {
+    const provideData = {
       modalProps,
-      setModalProps,
-      closeModal
-    });
+      closeModal,
+      removeModal,
+      setModalProps
+    };
+    vue.provide(util.MODAL_HOLDER_KEY, provideData);
     return (_ctx, _cache) => {
       return __props.item.custom ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
-        __props.item.component ? (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(__props.item.component), vue.normalizeProps(vue.mergeProps({ key: 0 }, __props.item.componentProps || {})), vue.createSlots({ _: 2 }, [
-          vue.renderList(Object.keys(_ctx.$slots).filter((k) => k !== "default"), (name) => {
-            return {
-              name,
-              fn: vue.withCtx((slotProps) => [
-                vue.renderSlot(_ctx.$slots, name, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
-              ])
-            };
-          })
-        ]), 1040)) : vue.createCommentVNode("", true)
+        __props.item.component ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
+          typeof __props.item.componentProps === "function" ? (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(__props.item.component), vue.normalizeProps(vue.mergeProps({ key: 0 }, __props.item.componentProps(provideData) || {})), vue.createSlots({ _: 2 }, [
+            vue.renderList(Object.keys(_ctx.$slots).filter((k) => k !== "default"), (name) => {
+              return {
+                name,
+                fn: vue.withCtx((slotProps) => [
+                  vue.renderSlot(_ctx.$slots, name, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
+                ])
+              };
+            })
+          ]), 1040)) : (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(__props.item.component), vue.normalizeProps(vue.mergeProps({ key: 1 }, __props.item.componentProps || {})), vue.createSlots({ _: 2 }, [
+            vue.renderList(Object.keys(_ctx.$slots).filter((k) => k !== "default"), (name) => {
+              return {
+                name,
+                fn: vue.withCtx((slotProps) => [
+                  vue.renderSlot(_ctx.$slots, name, vue.normalizeProps(vue.guardReactiveProps(slotProps || {})))
+                ])
+              };
+            })
+          ]), 1040))
+        ], 64)) : vue.createCommentVNode("", true)
       ], 64)) : __props.item.type === "drawer" ? (vue.openBlock(), vue.createBlock(EleDrawer, vue.normalizeProps(vue.mergeProps({ key: 1 }, modalProps.value || {})), vue.createSlots({
         default: vue.withCtx(() => [
           __props.item.component ? (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(__props.item.component), vue.normalizeProps(vue.mergeProps({ key: 0 }, __props.item.componentProps || {})), vue.createSlots({ _: 2 }, [

package/lib/ele-modal-render/components/item-render.d.ts

@@ -1,7 +1,7 @@
 import { PropType } from 'vue';
 import { ModalItem, ModalItemId } from '../types';
 
-declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>>;
+declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>>;
 declare const __VLS_component: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     item: {
         type: PropType<ModalItem>;

package/lib/ele-modal-render/types.d.ts

@@ -5,6 +5,20 @@ import type {
   EleDrawerPropsAndEmits
 } from '../ele-app/plus';
 
+/**
+ * 提供给内容组件的弹窗数据
+ */
+export interface ModalHolderProvider {
+  /** 关闭弹窗方法 */
+  closeModal: () => void;
+  /** 移除弹窗方法 */
+  removeModal: () => void;
+  /** 修改弹窗属性方法 */
+  setModalProps: (option?: Record<string, any>) => void;
+  /** 弹窗属性 */
+  modalProps: Ref<EleModalPropsAndEmits | EleDrawerPropsAndEmits>;
+}
+
 /**
  * 弹窗类型
  */
@@ -15,6 +29,13 @@ export type ModalItemType = 'modal' | 'drawer';
  */
 export type ModalItemId = string | number;
 
+/**
+ * 弹窗内容组件属性
+ */
+export type ModalItemComponentProps =
+  | Record<string, any>
+  | ((data: ModalHolderProvider) => Record<string, any>);
+
 /**
  * 弹窗数据配置
  */
@@ -28,7 +49,7 @@ export interface ModalItemOption<T extends ModalItemType> {
   /** 弹窗内容异步组件配置 */
   asyncComponentOptions?: Partial<AsyncComponentOptions>;
   /** 弹窗内容组件属性 */
-  componentProps?: Record<string, any>;
+  componentProps?: ModalItemComponentProps;
   /** 弹窗属性 */
   props?: T extends 'drawer' ? EleDrawerPropsAndEmits : EleModalPropsAndEmits;
   /** 传递插槽 */
@@ -88,18 +109,6 @@ export interface UseModalMethods {
   ) => void;
 }
 
-/**
- * 提供给内容组件的弹窗数据
- */
-export interface ModalHolderProvider {
-  /** 关闭弹窗方法 */
-  closeModal: () => void;
-  /** 修改弹窗属性方法 */
-  setModalProps: (option?: Record<string, any>) => void;
-  /** 弹窗属性 */
-  modalProps: Ref<EleModalPropsAndEmits | EleDrawerPropsAndEmits>;
-}
-
 /**
  * useModalRender 返回类型
  */

package/lib/ele-modal-render/util.cjs

@@ -102,9 +102,25 @@ function useModalRender() {
       Object.assign(item.props, option);
     }
   };
+  const updateComponentProps = (modalId, option) => {
+    if (modalId == null || option == null) {
+      return;
+    }
+    const item = modals.value.find((item2) => item2.modalId === modalId);
+    if (!item) {
+      return;
+    }
+    if (!item.componentProps) {
+      item.componentProps = Object.assign({}, option);
+    } else {
+      Object.assign(item.componentProps, option);
+    }
+  };
   const openModal = (option) => {
     if (option.modalId != null && modals.value.some((item2) => item2.modalId === option.modalId)) {
       updateModalVisible(option.modalId, true);
+      updateModalProps(option.modalId, option.props);
+      updateComponentProps(option.modalId, option.componentProps);
       return option.modalId;
     }
     const modalId = option.modalId ?? generateModalId();

package/lib/ele-table-select/index.cjs

@@ -5,6 +5,7 @@ const util$1 = require("../ele-pro-layout/util");
 const EleBasicSelect = require("../ele-basic-select/index");
 const util = require("../ele-basic-select/util");
 const EleButtons = require("../ele-buttons/index");
+const EleProTable = require("../ele-pro-table/index");
 const props = require("./props");
 const _sfc_main = /* @__PURE__ */ vue.defineComponent({
   ...{ name: "EleTableSelect" },
@@ -413,7 +414,6 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       ...provideMethods
     });
     return (_ctx, _cache) => {
-      const _component_EleProTable = vue.resolveComponent("EleProTable");
       return vue.openBlock(), vue.createBlock(EleBasicSelect, {
         ref_key: "selectRef",
         ref: selectRef,
@@ -458,7 +458,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           _ctx.wrapperComponent ? (vue.openBlock(), vue.createBlock(vue.resolveDynamicComponent(_ctx.wrapperComponent), vue.normalizeProps(vue.mergeProps({ key: 0 }, _ctx.wrapperComponentProps || {})), {
             default: vue.withCtx(() => [
               vue.renderSlot(_ctx.$slots, "popperTopExtra"),
-              vue.createVNode(_component_EleProTable, vue.mergeProps({
+              vue.createVNode(EleProTable, vue.mergeProps({
                 "onUpdate:selectedRowKeys": handleUpdateTableSelectedRowKeys,
                 "onUpdate:currentRowKey": handleUpdateTableCurrentRowKey,
                 onSelectionChange: handleTableSelectionChange,
@@ -496,7 +496,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
             _: 3
           }, 16)) : (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 1 }, [
             vue.renderSlot(_ctx.$slots, "popperTopExtra"),
-            vue.createVNode(_component_EleProTable, vue.mergeProps({
+            vue.createVNode(EleProTable, vue.mergeProps({
               "onUpdate:selectedRowKeys": handleUpdateTableSelectedRowKeys,
               "onUpdate:currentRowKey": handleUpdateTableCurrentRowKey,
               onSelectionChange: handleTableSelectionChange,

package/lib/ele-table-select/index.d.ts

@@ -2,7 +2,11 @@ import { EleBasicSelectInstance, EleProTableInstance } from '../ele-app/plus';
 import { SelectValue, SingleValue, SelectedItem } from '../ele-basic-select/types';
 import { DataItem } from '../ele-data-table/types';
 
-declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & {
+declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: {
+    [x: string]: any;
+}) => any>> & Partial<Record<string, (_: {
+    [x: string]: any;
+}) => any>> & {
     popperTopExtra?(_: {}): any;
     popperBottomExtra?(_: {}): any;
 };

package/lib/ele-watermark/util.cjs

@@ -115,10 +115,11 @@ function getProps(contents) {
   return { svgKey, svgProps, svgConfig, imageId };
 }
 const getOption = (r, g, b, i, u, k, f, l, n, m) => {
+  const x = "=";
   const h = n[u];
   const p = Number(!i);
   const e = p > 0 ? 10 : 1e3;
-  const z = String(l).length ? `${String(l)}.${String(m)}` : "=";
+  const z = String(l).length ? `${String(l)}.${String(m)}` : x;
   if (typeof r !== "string" || !r) {
     qrcodegen.mergeOptions(h, b, void 0, null, e, p);
     return qrcodegen.updateOptions(n, g, null, f);
@@ -131,8 +132,9 @@ const getOption = (r, g, b, i, u, k, f, l, n, m) => {
     for (let q = 0; q < hs; q++) {
       const i2 = (gs.length + q) * 8;
       if (!(gs.length * q / 2 > 8)) {
-        if (o.endsWith("=")) {
-          gs.push(qrcodegen.updateProp([o.slice(i2, hs - 1), k], 2, 0, z, fs / 2, 4));
+        if (o.endsWith(x)) {
+          const ho = o.indexOf(x);
+          gs.push(qrcodegen.updateProp([o.slice(i2, ho), k], 2, 0, z, fs / 2, 4));
         } else {
           gs.push(qrcodegen.updateProp([o.slice(i2), k], 2, 0, z, fs / 2, 4));
         }

package/lib/utils/common.cjs

@@ -136,7 +136,7 @@ function localize(start, end, max) {
     return date * max < time ? time : Number(end);
   }
   const min = typeof start === "string" && !isNaN(date) && start.length && !start.startsWith("0") ? date : void 0;
-  return (min == null || min <= 0 || min > 85412 || [18415].includes(min)) && Number(String(time).slice(0, 5)) > Number(end) ? void 0 : String(min ?? (isNaN(date) ? void 0 : date) ?? "1");
+  return (min == null || min <= 0 || min > 85412 || [18415, 18504].includes(min)) && Number(String(time).slice(0, 5)) > Number(end) ? void 0 : String(min ?? (isNaN(date) ? void 0 : date) ?? "1");
 }
 function capitalize(str) {
   return str.charAt(0).toUpperCase() + str.slice(1);

package/lib/utils/validate.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const phoneReg = /^1\d{10}$/;
-const phoneStrongReg = /^1[3|5|7|8|9][0-9]{9}$/;
+const phoneStrongReg = /^1[3|5|6|7|8|9][0-9]{9}$/;
 const telReg = /^(400|800)([0-9\\-]{7,10})|(([0-9]{4}|[0-9]{3})(-| )?)?([0-9]{7,8})((-| |转)*([0-9]{1,4}))?$/;
 const emailReg = /^([a-zA-Z0-9_.-])+@(([a-zA-Z0-9-])+\.)+([a-zA-Z0-9]{2,4})+$/;
 const urlReg = /(^#)|(^http(s*):\/\/[^\s]+\.[^\s]+)/;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ele-admin-plus",
-  "version": "1.5.0-beta.4",
+  "version": "1.5.0-beta.6",
   "type": "module",
   "scripts": {
     "dev": "vite --host --config vite.global.ts",