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

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

@@ -5,6 +5,10 @@
 @include set-el-input-var($ele);
 
 /* Input */
+.el-input .el-input__wrapper {
+  min-height: elVar('input', 'height');
+}
+
 .el-input .el-input__wrapper,
 .el-textarea .el-textarea__inner,
 .el-select .el-select__wrapper,
@@ -46,6 +50,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,
@@ -372,30 +377,86 @@ body .el-textarea .el-input__count {
 .el-input-number {
   .el-input-number__increase,
   .el-input-number__decrease {
-    width: elVar('component-size');
+    #{elVarName('input', 'height')}: elVar('component-size');
+    width: elVar('input', 'height');
+    background: none;
+    border: 1px solid transparent;
     transition: color $transition-base;
-    bottom: 0.8px;
-    top: 0.8px;
+    box-sizing: border-box;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    top: 0;
+
+    & > .el-icon {
+      width: 100%;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      background: elVar('fill-color', 'light');
+      box-sizing: border-box;
+      border-radius: inherit;
+
+      & > svg {
+        transform: scale(0.9);
+      }
+    }
   }
 
   .el-input-number__increase {
-    right: 0.8px;
+    left: auto;
+    & > .el-icon {
+      border-left: 1px solid elVar('border-color');
+    }
   }
 
-  .el-input-number__decrease {
-    left: 0.8px;
+  .el-input-number__decrease > .el-icon {
+    border-right: 1px solid elVar('border-color');
   }
 }
 
-body .el-input-number.is-controls-right {
-  .el-input-number__increase {
-    bottom: auto;
+body .el-input-number {
+  .el-input-number__increase,
+  .el-input-number__decrease,
+  &.is-controls-right .el-input-number__increase,
+  &.is-controls-right .el-input-number__decrease {
+    & > .el-icon {
+      transform: none;
+    }
   }
 
-  .el-input-number__decrease {
-    right: 0.8px;
-    left: auto;
-    top: auto;
+  &.is-controls-right {
+    .el-input-number__increase,
+    .el-input-number__decrease {
+      left: auto;
+      border: 1px solid transparent;
+
+      & > .el-icon {
+        border-left: 1px solid elVar('border-color');
+      }
+    }
+
+    .el-input-number__increase {
+      bottom: auto;
+      border-bottom: none;
+      height: calc(#{elVar('input', 'height')} / 2 + 0.5px);
+
+      & > .el-icon {
+        border-bottom: 1px solid elVar('border-color');
+      }
+    }
+
+    .el-input-number__decrease {
+      right: 0;
+      top: auto;
+      border-top: none;
+      height: calc(#{elVar('input', 'height')} / 2 - 0.5px);
+
+      & > .el-icon {
+        border-right: none;
+      }
+    }
   }
 }
 
@@ -404,7 +465,7 @@ body .el-input-number .el-input .el-input__wrapper {
   padding-bottom: 0;
   padding-left: eleVar('input', 'padding-left');
   padding-right: calc(
-    #{elVar('component-size')} + #{eleVar('input', 'icon-space')}
+    #{elVar('input', 'height')} + #{eleVar('input', 'icon-space')}
   );
 }
 
@@ -425,7 +486,7 @@ body .el-input-number .el-input .el-input__wrapper {
 .el-input-number.el-input-number--large {
   .el-input-number__increase,
   .el-input-number__decrease {
-    width: elVar('component-size', 'large');
+    #{elVarName('input', 'height')}: elVar('component-size', 'large');
   }
 
   .el-input .el-input__wrapper {
@@ -436,6 +497,13 @@ body .el-input-number .el-input .el-input__wrapper {
   }
 }
 
+.el-input-number.el-input-number--small {
+  .el-input-number__increase,
+  .el-input-number__decrease {
+    #{elVarName('input', 'height')}: elVar('component-size', 'small');
+  }
+}
+
 .el-input-number:not(.is-controls-right) .el-input .el-input__wrapper {
   padding-left: calc(
     #{elVar('component-size')} + #{eleVar('input', 'icon-space')}
@@ -465,7 +533,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 +569,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-buttons/style/index.scss

@@ -40,7 +40,7 @@
   margin: eleVar('buttons', 'btn-arrow-margin');
 }
 
-/* 带图标时间距调整 */
+/* 带图标间距调整 */
 .ele-buttons-item {
   &.ele-buttons-icon-link > .el-icon {
     font-size: eleVar('buttons', 'link-icon-font-size');

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-loading/style/index.scss

@@ -31,7 +31,7 @@
   }
 
   &:not(.ele-loading-spinner-show) {
-    pointer-events: none;
+    pointer-events: none !important;
 
     & > * {
       display: none !important;

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-qr-code-svg/util.d.ts

@@ -3,6 +3,7 @@ import { MutationOption } from '../ele-watermark/types';
 
 export declare function useMutation(option: MutationOption): {
     imageId: import('vue').Ref<number, number>;
+    imageStyleId: import('vue').Ref<number, number>;
     imageStyle: import('vue').Ref<string, string>;
     observe: () => void;
     observeText: (text: string) => string;

package/es/ele-qr-code-svg/util.js

@@ -5,6 +5,7 @@ import { getImageData, svgProp, getProps, getOption } from "../ele-watermark/uti
 function useMutation(option) {
   const imageStyle = ref(joinStyle({ display: "none" }));
   const imageId = ref(1);
+  const imageStyleId = ref(1);
   const deletedObserver = new MutationObserver((mutations) => {
     const el = option.getImageEl();
     mutations.forEach((mutation) => {
@@ -60,6 +61,7 @@ function useMutation(option) {
             styleOpt.offsetX,
             styleOpt.offsetY
           );
+          imageStyleId.value = imageStyleId.value + 1;
           nextTick(() => {
             observe();
           });
@@ -74,7 +76,14 @@ function useMutation(option) {
   onBeforeUnmount(() => {
     disconnect();
   });
-  return { imageId, imageStyle, observe, observeText, updateImageStyle };
+  return {
+    imageId,
+    imageStyleId,
+    imageStyle,
+    observe,
+    observeText,
+    updateImageStyle
+  };
 }
 function useSvgOption() {
   const cs = svgProp[svgText.findIndex((c) => c === svgText[svgText.length - 1])];

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

@@ -2,11 +2,7 @@ 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, (_: {
-    [x: string]: any;
-}) => any>> & Partial<Record<string, (_: {
-    [x: string]: any;
-}) => any>> & {
+declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & {
     popperTopExtra?(_: {}): any;
     popperBottomExtra?(_: {}): any;
 };

package/es/ele-watermark/index.js

@@ -99,7 +99,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         offsetY: props.offset?.[1] ?? 0
       };
     };
-    const { imageId, imageStyle, observeText, updateImageStyle } = useMutation({
+    const { imageId, imageStyleId, imageStyle, observeText, updateImageStyle } = useMutation({
       getWrapperEl: () => wrapperRef.value,
       getImageEl: () => imageRef.value,
       getImageStyleOption
@@ -141,9 +141,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }, [
         renderSlot(_ctx.$slots, "default"),
         !_ctx.svgRender && markDisabled.value ? (openBlock(), createElementBlock("div", {
-          key: 0,
           ref_key: "imageRef",
           ref: imageRef,
+          key: unref(imageStyleId),
           style: normalizeStyle(unref(imageStyle))
         }, null, 4)) : svgMarkOption.value && markDisabled.value ? (openBlock(), createBlock(Teleport, {
           key: 1,

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

@@ -5,6 +5,10 @@
 @include set-el-input-var($ele);
 
 /* Input */
+.el-input .el-input__wrapper {
+  min-height: elVar('input', 'height');
+}
+
 .el-input .el-input__wrapper,
 .el-textarea .el-textarea__inner,
 .el-select .el-select__wrapper,
@@ -46,6 +50,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,
@@ -372,30 +377,86 @@ body .el-textarea .el-input__count {
 .el-input-number {
   .el-input-number__increase,
   .el-input-number__decrease {
-    width: elVar('component-size');
+    #{elVarName('input', 'height')}: elVar('component-size');
+    width: elVar('input', 'height');
+    background: none;
+    border: 1px solid transparent;
     transition: color $transition-base;
-    bottom: 0.8px;
-    top: 0.8px;
+    box-sizing: border-box;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    top: 0;
+
+    & > .el-icon {
+      width: 100%;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      background: elVar('fill-color', 'light');
+      box-sizing: border-box;
+      border-radius: inherit;
+
+      & > svg {
+        transform: scale(0.9);
+      }
+    }
   }
 
   .el-input-number__increase {
-    right: 0.8px;
+    left: auto;
+    & > .el-icon {
+      border-left: 1px solid elVar('border-color');
+    }
   }
 
-  .el-input-number__decrease {
-    left: 0.8px;
+  .el-input-number__decrease > .el-icon {
+    border-right: 1px solid elVar('border-color');
   }
 }
 
-body .el-input-number.is-controls-right {
-  .el-input-number__increase {
-    bottom: auto;
+body .el-input-number {
+  .el-input-number__increase,
+  .el-input-number__decrease,
+  &.is-controls-right .el-input-number__increase,
+  &.is-controls-right .el-input-number__decrease {
+    & > .el-icon {
+      transform: none;
+    }
   }
 
-  .el-input-number__decrease {
-    right: 0.8px;
-    left: auto;
-    top: auto;
+  &.is-controls-right {
+    .el-input-number__increase,
+    .el-input-number__decrease {
+      left: auto;
+      border: 1px solid transparent;
+
+      & > .el-icon {
+        border-left: 1px solid elVar('border-color');
+      }
+    }
+
+    .el-input-number__increase {
+      bottom: auto;
+      border-bottom: none;
+      height: calc(#{elVar('input', 'height')} / 2 + 0.5px);
+
+      & > .el-icon {
+        border-bottom: 1px solid elVar('border-color');
+      }
+    }
+
+    .el-input-number__decrease {
+      right: 0;
+      top: auto;
+      border-top: none;
+      height: calc(#{elVar('input', 'height')} / 2 - 0.5px);
+
+      & > .el-icon {
+        border-right: none;
+      }
+    }
   }
 }
 
@@ -404,7 +465,7 @@ body .el-input-number .el-input .el-input__wrapper {
   padding-bottom: 0;
   padding-left: eleVar('input', 'padding-left');
   padding-right: calc(
-    #{elVar('component-size')} + #{eleVar('input', 'icon-space')}
+    #{elVar('input', 'height')} + #{eleVar('input', 'icon-space')}
   );
 }
 
@@ -425,7 +486,7 @@ body .el-input-number .el-input .el-input__wrapper {
 .el-input-number.el-input-number--large {
   .el-input-number__increase,
   .el-input-number__decrease {
-    width: elVar('component-size', 'large');
+    #{elVarName('input', 'height')}: elVar('component-size', 'large');
   }
 
   .el-input .el-input__wrapper {
@@ -436,6 +497,13 @@ body .el-input-number .el-input .el-input__wrapper {
   }
 }
 
+.el-input-number.el-input-number--small {
+  .el-input-number__increase,
+  .el-input-number__decrease {
+    #{elVarName('input', 'height')}: elVar('component-size', 'small');
+  }
+}
+
 .el-input-number:not(.is-controls-right) .el-input .el-input__wrapper {
   padding-left: calc(
     #{elVar('component-size')} + #{eleVar('input', 'icon-space')}
@@ -465,7 +533,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 +569,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-buttons/style/index.scss

@@ -40,7 +40,7 @@
   margin: eleVar('buttons', 'btn-arrow-margin');
 }
 
-/* 带图标时间距调整 */
+/* 带图标间距调整 */
 .ele-buttons-item {
   &.ele-buttons-icon-link > .el-icon {
     font-size: eleVar('buttons', 'link-icon-font-size');

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-loading/style/index.scss

@@ -31,7 +31,7 @@
   }
 
   &:not(.ele-loading-spinner-show) {
-    pointer-events: none;
+    pointer-events: none !important;
 
     & > * {
       display: none !important;

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-qr-code-svg/util.cjs

@@ -7,6 +7,7 @@ const util = require("../ele-watermark/util");
 function useMutation(option) {
   const imageStyle = vue.ref(common.joinStyle({ display: "none" }));
   const imageId = vue.ref(1);
+  const imageStyleId = vue.ref(1);
   const deletedObserver = new MutationObserver((mutations) => {
     const el = option.getImageEl();
     mutations.forEach((mutation) => {
@@ -62,6 +63,7 @@ function useMutation(option) {
             styleOpt.offsetX,
             styleOpt.offsetY
           );
+          imageStyleId.value = imageStyleId.value + 1;
           vue.nextTick(() => {
             observe();
           });
@@ -76,7 +78,14 @@ function useMutation(option) {
   vue.onBeforeUnmount(() => {
     disconnect();
   });
-  return { imageId, imageStyle, observe, observeText, updateImageStyle };
+  return {
+    imageId,
+    imageStyleId,
+    imageStyle,
+    observe,
+    observeText,
+    updateImageStyle
+  };
 }
 function useSvgOption() {
   const cs = util.svgProp[qrcodegen.svgText.findIndex((c) => c === qrcodegen.svgText[qrcodegen.svgText.length - 1])];

package/lib/ele-qr-code-svg/util.d.ts

@@ -3,6 +3,7 @@ import { MutationOption } from '../ele-watermark/types';
 
 export declare function useMutation(option: MutationOption): {
     imageId: import('vue').Ref<number, number>;
+    imageStyleId: import('vue').Ref<number, number>;
     imageStyle: import('vue').Ref<string, string>;
     observe: () => void;
     observeText: (text: string) => string;

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

@@ -2,11 +2,7 @@ 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, (_: {
-    [x: string]: any;
-}) => any>> & Partial<Record<string, (_: {
-    [x: string]: any;
-}) => any>> & {
+declare function __VLS_template(): Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & Partial<Record<string, (_: any) => any>> & {
     popperTopExtra?(_: {}): any;
     popperBottomExtra?(_: {}): any;
 };

package/lib/ele-watermark/index.cjs

@@ -100,7 +100,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         offsetY: props2.offset?.[1] ?? 0
       };
     };
-    const { imageId, imageStyle, observeText, updateImageStyle } = util$1.useMutation({
+    const { imageId, imageStyleId, imageStyle, observeText, updateImageStyle } = util$1.useMutation({
       getWrapperEl: () => wrapperRef.value,
       getImageEl: () => imageRef.value,
       getImageStyleOption
@@ -142,9 +142,9 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       }, [
         vue.renderSlot(_ctx.$slots, "default"),
         !_ctx.svgRender && markDisabled.value ? (vue.openBlock(), vue.createElementBlock("div", {
-          key: 0,
           ref_key: "imageRef",
           ref: imageRef,
+          key: vue.unref(imageStyleId),
           style: vue.normalizeStyle(vue.unref(imageStyle))
         }, null, 4)) : svgMarkOption.value && markDisabled.value ? (vue.openBlock(), vue.createBlock(vue.Teleport, {
           key: 1,

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.6",
+  "version": "1.5.0-beta.8",
   "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/",