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

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,
@@ -373,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;
+      }
+    }
   }
 }
 
@@ -405,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')}
   );
 }
 
@@ -426,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 {
@@ -437,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')}

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

@@ -85,6 +85,7 @@ span.el-tag.ele-edit-tag-input {
   .el-input {
     .el-input__wrapper {
       height: 100%;
+      min-height: auto;
       padding-left: 8px;
       padding-right: 8px;
       box-sizing: border-box;

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-mention/style/index.js

@@ -1 +1 @@
-import "element-plus/es/components/transfer/style/index";
+import "element-plus/es/components/mention/style/index";

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-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/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,
@@ -373,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;
+      }
+    }
   }
 }
 
@@ -405,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')}
   );
 }
 
@@ -426,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 {
@@ -437,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')}

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

@@ -85,6 +85,7 @@ span.el-tag.ele-edit-tag-input {
   .el-input {
     .el-input__wrapper {
       height: 100%;
+      min-height: auto;
       padding-left: 8px;
       padding-right: 8px;
       box-sizing: border-box;

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-mention/style/index.cjs

@@ -1,2 +1,2 @@
 "use strict";
-require("element-plus/es/components/transfer/style/index");
+require("element-plus/es/components/mention/style/index");

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-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/package.json

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