vue-devui 1.6.17 → 1.6.18

package/form/index.es.js

@@ -86,6 +86,10 @@ const formProps = {
   appendToBodyScrollStrategy: {
     type: String,
     default: "reposition"
+  },
+  requirePosition: {
+    type: String,
+    default: "left"
   }
 };
 const FORM_TOKEN = "dForm";
@@ -6043,11 +6047,7 @@ const popoverProps = {
   },
   position: {
     type: Array,
-    default: ["bottom"]
-  },
-  align: {
-    type: String,
-    default: null
+    default: () => ["top", "right", "bottom", "left"]
   },
   offset: {
     type: [Number, Object],
@@ -6118,6 +6118,7 @@ function usePopover(props, visible, placement, origin, popoverRef) {
 function usePopoverEvent(props, visible, origin) {
   const { trigger, position, mouseEnterDelay, mouseLeaveDelay, disabled } = toRefs(props);
   const isClick = computed(() => trigger.value === "click");
+  const isHover = computed(() => trigger.value === "hover");
   const placement = ref(position.value[0].split("-")[0]);
   const isEnter = ref(false);
   const onClick = () => {
@@ -6136,13 +6137,13 @@ function usePopoverEvent(props, visible, origin) {
     if (disabled.value) {
       return;
     }
-    if (!isClick.value) {
+    if (isHover.value) {
       isEnter.value = true;
       enter();
     }
   };
   const onMouseleave = () => {
-    if (!isClick.value) {
+    if (isHover.value) {
       isEnter.value = false;
       leave();
     }
@@ -6292,7 +6293,6 @@ var Popover = defineComponent({
       content,
       popType,
       position,
-      align,
       offset: offset2,
       showAnimation
     } = toRefs(props);
@@ -6334,7 +6334,6 @@ var Popover = defineComponent({
           "ref": popoverRef,
           "origin": origin.value,
           "position": position.value,
-          "align": align.value,
           "offset": offset2.value,
           "class": [ns2.e("content"), popType.value !== "default" ? "is-icon" : ""],
           "show-arrow": true,
@@ -6456,7 +6455,8 @@ function useFormLabel() {
   }));
   const labelInnerClasses = computed(() => ({
     [`${ns2.e("label-span")}`]: true,
-    [`${ns2.em("label", "required")}`]: formItemContext.isRequired,
+    [`${ns2.em("label", "required")}`]: formItemContext.isRequired && labelData.value.requiredPosition === "left",
+    [`${ns2.em("label", "required-right")}`]: formItemContext.isRequired && labelData.value.requiredPosition === "right",
     [`${ns2.em("label", "required-hide")}`]: formItemContext.isRequired && formContext.hideRequiredMark
   }));
   const tipsPopover = computed(() => {
@@ -7773,6 +7773,7 @@ var FormItem = defineComponent({
       layout: formContext.layout,
       labelSize: formContext.labelSize,
       labelAlign: formContext.labelAlign,
+      requiredPosition: formContext.requirePosition,
       helpTips: helpTips.value,
       formItemCtx: ctx
     }));