ele-admin-plus 1.5.0-beta.5 → 1.5.0-beta.7

package/es/ele-app/style/overwrite/input/index.scss

@@ -46,6 +46,7 @@ body .el-input-number:not(.is-disabled):hover .el-input .el-input__wrapper {
 /* Focus */
 .el-input .el-input__wrapper.is-focus,
 .el-textarea .el-textarea__inner:focus,
+.el-textarea .el-textarea__inner.is-focus,
 .el-select .el-select__wrapper:not(.is-disabled).is-focused,
 .el-cascader .el-input.el-input--suffix .el-input__wrapper.is-focus,
 .el-cascader .el-input.el-input--suffix.is-focus .el-input__wrapper,
@@ -465,7 +466,7 @@ body .el-input-number.is-disabled .el-input-number__decrease {
 }
 
 /* 表单验证 */
-.el-form-item.is-error {
+.el-form-item.is-error .el-form-item__content {
   .el-input .el-input__wrapper,
   .el-textarea .el-textarea__inner,
   .el-select .select-trigger .el-input .el-input__wrapper,
@@ -501,6 +502,7 @@ body .el-input-number.is-disabled .el-input-number__decrease {
   }
 
   .el-textarea .el-textarea__inner:focus,
+  .el-textarea .el-textarea__inner.is-focus,
   .el-range-editor.el-input__wrapper.is-active,
   .el-input-number .el-input .el-input__wrapper.is-focus {
     border: eleVar('input-error', 'focus-border');

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, createBlock, openBlock, mergeProps, unref, createSlots, withCtx, renderSlot, createVNode, createTextVNode, toDisplayString, renderList, normalizeProps, guardReactiveProps } from "vue";
+import { defineComponent, ref, watch, 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";
@@ -14,11 +14,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const emit = __emit;
     const { lang } = useLocale("cronBuilder", props);
     const cronPanelRef = ref(null);
+    const cronModel = ref("");
     const updateModelValue = (value) => {
       emit("update:modelValue", value);
     };
-    const updateCron = (cron) => {
-      emit("update:cron", cron);
+    const updateCronModel = (value) => {
+      if (cronModel.value !== value) {
+        cronModel.value = value;
+        if (props.cron !== cronModel.value) {
+          emit("update:cron", cronModel.value);
+        }
+      }
     };
     const hideCronList = () => {
       cronPanelRef.value?.hideCronList?.();
@@ -29,11 +35,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const handleConfirm = () => {
       hideCronList();
-      emit("done", props.cron);
+      emit("done", cronModel.value);
     };
     const handleClosed = () => {
       hideCronList();
     };
+    watch(
+      () => props.cron,
+      (value) => {
+        updateCronModel(value);
+      },
+      { immediate: true }
+    );
     return (_ctx, _cache) => {
       return openBlock(), createBlock(EleModal, mergeProps({
         width: 832,
@@ -68,8 +81,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           createVNode(EleCronPanel, {
             ref_key: "cronPanelRef",
             ref: cronPanelRef,
-            modelValue: _ctx.cron,
-            "onUpdate:modelValue": updateCron
+            modelValue: cronModel.value,
+            "onUpdate:modelValue": updateCronModel
           }, null, 8, ["modelValue"])
         ]),
         _: 2

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

@@ -79,7 +79,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       ];
     });
     const updateModelValue = (value) => {
-      emit("update:modelValue", value);
+      if (props.modelValue !== value) {
+        emit("update:modelValue", value);
+      }
     };
     const updateCron = () => {
       const values = [
@@ -97,6 +99,38 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       updateModelValue(cron);
       return cron;
     };
+    const updatePanel = (cron) => {
+      if (!cron) {
+        tabActive.value = "second";
+        second.value = "*";
+        minute.value = "*";
+        hour.value = "*";
+        day.value = "*";
+        month.value = "*";
+        week.value = "?";
+        year.value = "";
+        const str = updateCron();
+        resultItems.value = getResultItems(
+          str,
+          lang.value.resultNoData,
+          lang.value.resultNoMore
+        );
+        return;
+      }
+      const [s, m, h, d, m2, w, y] = cron.split(" ");
+      second.value = s;
+      minute.value = m;
+      hour.value = h;
+      day.value = d;
+      month.value = m2;
+      week.value = w;
+      year.value = y || "";
+      resultItems.value = getResultItems(
+        cron,
+        lang.value.resultNoData,
+        lang.value.resultNoMore
+      );
+    };
     watch(hour, (h) => {
       if (h !== "*" && second.value === "*") {
         second.value = "0";
@@ -115,46 +149,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         day.value = "?";
       }
     });
-    watch(
-      [second, minute, hour, day, month, week, year],
-      () => {
-        updateCron();
-      },
-      { immediate: true }
-    );
+    watch([second, minute, hour, day, month, week, year], () => {
+      updateCron();
+    });
     watch(
       () => props.modelValue,
       (cron) => {
-        if (!cron) {
-          tabActive.value = "second";
-          second.value = "*";
-          minute.value = "*";
-          hour.value = "*";
-          day.value = "*";
-          month.value = "*";
-          week.value = "?";
-          year.value = "";
-          const str = updateCron();
-          resultItems.value = getResultItems(
-            str,
-            lang.value.resultNoData,
-            lang.value.resultNoMore
-          );
-          return;
-        }
-        const [s, m, h, d, m2, w, y] = cron.split(" ");
-        second.value = s;
-        minute.value = m;
-        hour.value = h;
-        day.value = d;
-        month.value = m2;
-        week.value = w;
-        year.value = y || "";
-        resultItems.value = getResultItems(
-          cron,
-          lang.value.resultNoData,
-          lang.value.resultNoMore
-        );
+        updatePanel(cron);
       }
     );
     watch(lang, () => {
@@ -196,6 +197,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       cronListVisible.value = false;
     };
     __expose({ hideCronList });
+    if (props.modelValue) {
+      updatePanel(props.modelValue);
+    } else {
+      updateCron();
+    }
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", _hoisted_1, [
         createElementVNode("div", _hoisted_2, [

package/es/ele-cron-panel/util.d.ts

@@ -18,6 +18,7 @@ export declare function useCron(minValue: number, maxValue: number, defaultType?
 };
 /**
  * 计算最近 5 次运行时间
+ * 代码来源: https://gitee.com/y_project/RuoYi-Vue/blob/master/ruoyi-ui/src/components/Crontab/result.vue
  * @param cron Cron 表达式
  */
 export declare function getResultItems(cron: string | undefined, noDataText: string, noMoreText: string): string[];

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-pro-form/components/render-util.js

@@ -245,11 +245,15 @@ function renderProFormItem(props) {
   const isDivTag = componentTag === "div" || componentTag === "td";
   const componentPropsData = translateJsCode(props.item.props || {}, formData, props.formItems || [], props.searchExpand, props.httpRequest, props.getProFormRefs, props.getAndCacheCode).result;
   const componentNode = typeSlot ? typeSlot({
-    item: props.item,
+    item: {
+      ...props.item,
+      props: componentPropsData
+    },
     model: formData,
     modelValue,
     updateValue: handleUpdateModelValue,
     updatePropValue: props.updateItemValue,
+    itemComponentRef: getComponentRefName(props.item),
     proForm: slotProFormParams
   }) : h((isDivTag ? props.item.props?.is : void 0) || componentTag, mergeProps({
     key: props.key

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

@@ -3,39 +3,7 @@ import { EleDataTableProps, EleToolbarProps } from '../ele-app/plus';
 import { DataItem, Column, Columns, Sorter, Filter, RowKey } from '../ele-data-table/types';
 import { ReloadFunction, DoneParams, TableTool, FetchFunction, TableViewInstance, ExportConfig, PrintConfig, TableExportParams } from './types';
 
-declare function __VLS_template(): Readonly<{
-    [x: string]: (props: Record<string, any>) => any;
-    default(): any;
-    toolbar(): any;
-    tools(): any;
-    footer(): any;
-    empty(): any;
-    append(): any;
-    topExtra(): any;
-    bottomExtra(): any;
-    printTop(props: {
-        data: DataItem[];
-    }): any;
-    printBottom(props: {
-        data: DataItem[];
-    }): any;
-}> & {
-    [x: string]: (props: Record<string, any>) => any;
-    default(): any;
-    toolbar(): any;
-    tools(): any;
-    footer(): any;
-    empty(): any;
-    append(): any;
-    topExtra(): any;
-    bottomExtra(): any;
-    printTop(props: {
-        data: DataItem[];
-    }): any;
-    printBottom(props: {
-        data: DataItem[];
-    }): any;
-};
+declare function __VLS_template(): any;
 declare const __VLS_component: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     rowKey: {
         type: import('vue').PropType<RowKey>;

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/style/themes/modern-dark.scss

@@ -71,12 +71,12 @@ $ele-modern-dark: map.deep-merge(
     & > .ele-admin-header {
       margin-top: -8px;
       backdrop-filter: blur(48px);
-      #{eleVarName('header', 'bg')}: elVar('color-primary');
-      #{eleVarName('header', 'dark-bg')}: elVar('color-primary');
+      #{eleVarName('header', 'bg')}: $layout-primary-bg;
+      #{eleVarName('header', 'dark-bg')}: $layout-primary-bg;
       #{eleVarName('header', 'dark-shadow')}: none;
       #{eleVarName('header', 'primary-bg')}: $layout-primary-bg;
       #{eleVarName('header', 'primary-shadow')}: none;
-      #{eleVarName('header', 'ghost-bg')}: elVar('color-primary');
+      #{eleVarName('header', 'ghost-bg')}: $layout-primary-bg;
 
       & > .ele-admin-tabs {
         #{eleVarName('tab', 'simple-active-bg')}: eleVar('layout', 'bg');

package/es/utils/validate.js

@@ -1,5 +1,5 @@
 const phoneReg = /^1\d{10}$/;
-const phoneStrongReg = /^1[3|5|6|7|8|9][0-9]{9}$/;
+const phoneStrongReg = /^1[3|4|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-app/style/overwrite/input/index.scss

@@ -46,6 +46,7 @@ body .el-input-number:not(.is-disabled):hover .el-input .el-input__wrapper {
 /* Focus */
 .el-input .el-input__wrapper.is-focus,
 .el-textarea .el-textarea__inner:focus,
+.el-textarea .el-textarea__inner.is-focus,
 .el-select .el-select__wrapper:not(.is-disabled).is-focused,
 .el-cascader .el-input.el-input--suffix .el-input__wrapper.is-focus,
 .el-cascader .el-input.el-input--suffix.is-focus .el-input__wrapper,
@@ -465,7 +466,7 @@ body .el-input-number.is-disabled .el-input-number__decrease {
 }
 
 /* 表单验证 */
-.el-form-item.is-error {
+.el-form-item.is-error .el-form-item__content {
   .el-input .el-input__wrapper,
   .el-textarea .el-textarea__inner,
   .el-select .select-trigger .el-input .el-input__wrapper,
@@ -501,6 +502,7 @@ body .el-input-number.is-disabled .el-input-number__decrease {
   }
 
   .el-textarea .el-textarea__inner:focus,
+  .el-textarea .el-textarea__inner.is-focus,
   .el-range-editor.el-input__wrapper.is-active,
   .el-input-number .el-input .el-input__wrapper.is-focus {
     border: eleVar('input-error', 'focus-border');

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

@@ -15,11 +15,17 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const emit = __emit;
     const { lang } = receiver.useLocale("cronBuilder", props2);
     const cronPanelRef = vue.ref(null);
+    const cronModel = vue.ref("");
     const updateModelValue = (value) => {
       emit("update:modelValue", value);
     };
-    const updateCron = (cron) => {
-      emit("update:cron", cron);
+    const updateCronModel = (value) => {
+      if (cronModel.value !== value) {
+        cronModel.value = value;
+        if (props2.cron !== cronModel.value) {
+          emit("update:cron", cronModel.value);
+        }
+      }
     };
     const hideCronList = () => {
       cronPanelRef.value?.hideCronList?.();
@@ -30,11 +36,18 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
     };
     const handleConfirm = () => {
       hideCronList();
-      emit("done", props2.cron);
+      emit("done", cronModel.value);
     };
     const handleClosed = () => {
       hideCronList();
     };
+    vue.watch(
+      () => props2.cron,
+      (value) => {
+        updateCronModel(value);
+      },
+      { immediate: true }
+    );
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createBlock(EleModal, vue.mergeProps({
         width: 832,
@@ -69,8 +82,8 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
           vue.createVNode(EleCronPanel, {
             ref_key: "cronPanelRef",
             ref: cronPanelRef,
-            modelValue: _ctx.cron,
-            "onUpdate:modelValue": updateCron
+            modelValue: cronModel.value,
+            "onUpdate:modelValue": updateCronModel
           }, null, 8, ["modelValue"])
         ]),
         _: 2

package/lib/ele-cron-panel/index.cjs

@@ -80,7 +80,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       ];
     });
     const updateModelValue = (value) => {
-      emit("update:modelValue", value);
+      if (props2.modelValue !== value) {
+        emit("update:modelValue", value);
+      }
     };
     const updateCron = () => {
       const values = [
@@ -98,6 +100,38 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       updateModelValue(cron);
       return cron;
     };
+    const updatePanel = (cron) => {
+      if (!cron) {
+        tabActive.value = "second";
+        second.value = "*";
+        minute.value = "*";
+        hour.value = "*";
+        day.value = "*";
+        month.value = "*";
+        week.value = "?";
+        year.value = "";
+        const str = updateCron();
+        resultItems.value = util.getResultItems(
+          str,
+          lang.value.resultNoData,
+          lang.value.resultNoMore
+        );
+        return;
+      }
+      const [s, m, h, d, m2, w, y] = cron.split(" ");
+      second.value = s;
+      minute.value = m;
+      hour.value = h;
+      day.value = d;
+      month.value = m2;
+      week.value = w;
+      year.value = y || "";
+      resultItems.value = util.getResultItems(
+        cron,
+        lang.value.resultNoData,
+        lang.value.resultNoMore
+      );
+    };
     vue.watch(hour, (h) => {
       if (h !== "*" && second.value === "*") {
         second.value = "0";
@@ -116,46 +150,13 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         day.value = "?";
       }
     });
-    vue.watch(
-      [second, minute, hour, day, month, week, year],
-      () => {
-        updateCron();
-      },
-      { immediate: true }
-    );
+    vue.watch([second, minute, hour, day, month, week, year], () => {
+      updateCron();
+    });
     vue.watch(
       () => props2.modelValue,
       (cron) => {
-        if (!cron) {
-          tabActive.value = "second";
-          second.value = "*";
-          minute.value = "*";
-          hour.value = "*";
-          day.value = "*";
-          month.value = "*";
-          week.value = "?";
-          year.value = "";
-          const str = updateCron();
-          resultItems.value = util.getResultItems(
-            str,
-            lang.value.resultNoData,
-            lang.value.resultNoMore
-          );
-          return;
-        }
-        const [s, m, h, d, m2, w, y] = cron.split(" ");
-        second.value = s;
-        minute.value = m;
-        hour.value = h;
-        day.value = d;
-        month.value = m2;
-        week.value = w;
-        year.value = y || "";
-        resultItems.value = util.getResultItems(
-          cron,
-          lang.value.resultNoData,
-          lang.value.resultNoMore
-        );
+        updatePanel(cron);
       }
     );
     vue.watch(lang, () => {
@@ -197,6 +198,11 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       cronListVisible.value = false;
     };
     __expose({ hideCronList });
+    if (props2.modelValue) {
+      updatePanel(props2.modelValue);
+    } else {
+      updateCron();
+    }
     return (_ctx, _cache) => {
       return vue.openBlock(), vue.createElementBlock("div", _hoisted_1, [
         vue.createElementVNode("div", _hoisted_2, [

package/lib/ele-cron-panel/util.d.ts

@@ -18,6 +18,7 @@ export declare function useCron(minValue: number, maxValue: number, defaultType?
 };
 /**
  * 计算最近 5 次运行时间
+ * 代码来源: https://gitee.com/y_project/RuoYi-Vue/blob/master/ruoyi-ui/src/components/Crontab/result.vue
  * @param cron Cron 表达式
  */
 export declare function getResultItems(cron: string | undefined, noDataText: string, noMoreText: string): string[];

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-pro-form/components/render-util.cjs

@@ -246,11 +246,15 @@ function renderProFormItem(props2) {
   const isDivTag = componentTag === "div" || componentTag === "td";
   const componentPropsData = renderCore.translateJsCode(props2.item.props || {}, formData, props2.formItems || [], props2.searchExpand, props2.httpRequest, props2.getProFormRefs, props2.getAndCacheCode).result;
   const componentNode = typeSlot ? typeSlot({
-    item: props2.item,
+    item: {
+      ...props2.item,
+      props: componentPropsData
+    },
     model: formData,
     modelValue,
     updateValue: handleUpdateModelValue,
     updatePropValue: props2.updateItemValue,
+    itemComponentRef: getComponentRefName(props2.item),
     proForm: slotProFormParams
   }) : vue.h((isDivTag ? props2.item.props?.is : void 0) || componentTag, vue.mergeProps({
     key: props2.key

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

@@ -3,39 +3,7 @@ import { EleDataTableProps, EleToolbarProps } from '../ele-app/plus';
 import { DataItem, Column, Columns, Sorter, Filter, RowKey } from '../ele-data-table/types';
 import { ReloadFunction, DoneParams, TableTool, FetchFunction, TableViewInstance, ExportConfig, PrintConfig, TableExportParams } from './types';
 
-declare function __VLS_template(): Readonly<{
-    [x: string]: (props: Record<string, any>) => any;
-    default(): any;
-    toolbar(): any;
-    tools(): any;
-    footer(): any;
-    empty(): any;
-    append(): any;
-    topExtra(): any;
-    bottomExtra(): any;
-    printTop(props: {
-        data: DataItem[];
-    }): any;
-    printBottom(props: {
-        data: DataItem[];
-    }): any;
-}> & {
-    [x: string]: (props: Record<string, any>) => any;
-    default(): any;
-    toolbar(): any;
-    tools(): any;
-    footer(): any;
-    empty(): any;
-    append(): any;
-    topExtra(): any;
-    bottomExtra(): any;
-    printTop(props: {
-        data: DataItem[];
-    }): any;
-    printBottom(props: {
-        data: DataItem[];
-    }): any;
-};
+declare function __VLS_template(): any;
 declare const __VLS_component: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
     rowKey: {
         type: import('vue').PropType<RowKey>;

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/style/themes/modern-dark.scss

@@ -71,12 +71,12 @@ $ele-modern-dark: map.deep-merge(
     & > .ele-admin-header {
       margin-top: -8px;
       backdrop-filter: blur(48px);
-      #{eleVarName('header', 'bg')}: elVar('color-primary');
-      #{eleVarName('header', 'dark-bg')}: elVar('color-primary');
+      #{eleVarName('header', 'bg')}: $layout-primary-bg;
+      #{eleVarName('header', 'dark-bg')}: $layout-primary-bg;
       #{eleVarName('header', 'dark-shadow')}: none;
       #{eleVarName('header', 'primary-bg')}: $layout-primary-bg;
       #{eleVarName('header', 'primary-shadow')}: none;
-      #{eleVarName('header', 'ghost-bg')}: elVar('color-primary');
+      #{eleVarName('header', 'ghost-bg')}: $layout-primary-bg;
 
       & > .ele-admin-tabs {
         #{eleVarName('tab', 'simple-active-bg')}: eleVar('layout', 'bg');

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|6|7|8|9][0-9]{9}$/;
+const phoneStrongReg = /^1[3|4|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,10 +1,9 @@
 {
   "name": "ele-admin-plus",
-  "version": "1.5.0-beta.5",
+  "version": "1.5.0-beta.7",
   "type": "module",
   "scripts": {
-    "dev": "vite --host --config vite.global.ts",
-    "dev:needed": "vite --host",
+    "dev": "vite --host",
     "build": "esno scripts/build.ts",
     "lint:eslint": "eslint --cache --max-warnings 0  \"{src,components}/**/*.{vue,js,jsx,ts,tsx}\" --fix",
     "clean:cache": "rimraf node_modules/.cache/ && rimraf node_modules/.vite/",