plain-design 1.0.0-beta.91 → 1.0.0-beta.93

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plain-design",
-  "version": "1.0.0-beta.91",
+  "version": "1.0.0-beta.93",
   "description": "",
   "main": "dist/plain-design.min.js",
   "module": "dist/plain-design.commonjs.min.js",

package/src/packages/components/FilterFormMultiple/index.tsx

@@ -178,7 +178,6 @@ export const FilterFormMultiple = designComponent({
     const formAttrs = computed(() => {
       return {
         column: props.column,
-        labelAlign: 'right' as const,
         labelWidth: 100,
         ...props.formAttrs,
       };
@@ -222,7 +221,9 @@ export const FilterFormMultiple = designComponent({
                 return (
                   <FormItem
                     class={isFirstColumn ? 'filter-form-multiple-first-column' : undefined}
-                    key={key} label={label}
+                    labelAlign={isFirstColumn ? 'left' : 'right'}
+                    key={key}
+                    label={label}
                     column={column}
                   >
                     <InputGroup>

package/src/packages/components/Form/form.scss

@@ -204,6 +204,9 @@
 
   &.form-vertical-label {
     @include prefix(form-item) {
+      .form-item-label {
+        display: block;
+      }
       .form-item-label, .form-item-content {
         width: 100%;
       }

package/src/packages/components/Form/layout/useFormLayout.tsx

@@ -119,7 +119,7 @@ export const useFormLayout = (() => {
       if (!!props.validateMessagePosition) {return props.validateMessagePosition;}
 
       /*纵向文本的情况下，校验消息默认放在左下角*/
-      if (props.verticalLabel) {return FormValidateMessagePosition["bottom-left"];}
+      if (props.verticalLabel) {return FormValidateMessagePosition["bottom-right"];}
       if (isSingleColumn.value) {
         /*单列的情况下，校验消息默认放在右侧*/
         return FormValidateMessagePosition['right'];
@@ -204,7 +204,7 @@ export const useFormLayout = (() => {
      * @author  韦胜健
      * @date    2022.9.4 23:22
      */
-    const labelAlign = computed(() => props.labelAlign || form.props.labelAlign || (form.props.verticalLabel ? eFormLabelAlign.left : eFormLabelAlign.right));
+    const labelAlign = computed(() => form.props.verticalLabel ? eFormLabelAlign.left : (props.labelAlign || form.props.labelAlign));
 
     /**
      * 内容对其方式

package/src/packages/components/usePopup/refresh/MaxMinTopLeft.ts

@@ -0,0 +1,38 @@
+import {iPopupRefreshBuildParams} from "../utils/popup.utils";
+
+export function MaxMinTopLeft(
+  {
+    top,
+    left,
+    buildParams,
+    option,
+  }: {
+    top: number,
+    left: number,
+    buildParams: iPopupRefreshBuildParams,
+    option: {
+      maxTop?: number | ((buildParams: iPopupRefreshBuildParams) => number),
+      minTop?: number | ((buildParams: iPopupRefreshBuildParams) => number),
+      maxLeft?: number | ((buildParams: iPopupRefreshBuildParams) => number),
+      minLeft?: number | ((buildParams: iPopupRefreshBuildParams) => number),
+    }
+  }
+): { top: number, left: number } {
+  if (option.maxTop != null) {
+    const maxTop = typeof option.maxTop === "function" ? option.maxTop(buildParams) : option.maxTop;
+    if (top > maxTop) {top = maxTop;}
+  }
+  if (option.minTop != null) {
+    const minTop = typeof option.minTop === "function" ? option.minTop(buildParams) : option.minTop;
+    if (top < minTop) {top = minTop;}
+  }
+  if (option.maxLeft != null) {
+    const maxLeft = typeof option.maxLeft === "function" ? option.maxLeft(buildParams) : option.maxLeft;
+    if (left > maxLeft) {left = maxLeft;}
+  }
+  if (option.minLeft != null) {
+    const minLeft = typeof option.minLeft === "function" ? option.minLeft(buildParams) : option.minLeft;
+    if (left < minLeft) {left = minLeft;}
+  }
+  return { top, left };
+}

package/src/packages/components/usePopup/refresh/calcPosition.ts

@@ -1,5 +1,6 @@
 import {iPopupRefreshBuildParams} from "../utils/popup.utils";
 import {handleDirection} from "../utils/handleDirection";
+import {MaxMinTopLeft} from "./MaxMinTopLeft";
 
 /**
  * 计算popup根节点定位信息
@@ -83,22 +84,5 @@ export function calcPosition(
     if (left > maxLeft) {left = maxLeft;}
   }
 
-  if (option.maxTop != null) {
-    const maxTop = typeof option.maxTop === "function" ? option.maxTop(buildParams) : option.maxTop;
-    if (top! > maxTop) {top = maxTop;}
-  }
-  if (option.minTop != null) {
-    const minTop = typeof option.minTop === "function" ? option.minTop(buildParams) : option.minTop;
-    if (top! < minTop) {top = minTop;}
-  }
-  if (option.maxLeft != null) {
-    const maxLeft = typeof option.maxLeft === "function" ? option.maxLeft(buildParams) : option.maxLeft;
-    if (left! > maxLeft) {left = maxLeft;}
-  }
-  if (option.minLeft != null) {
-    const minLeft = typeof option.minLeft === "function" ? option.minLeft(buildParams) : option.minLeft;
-    if (left! < minLeft) {left = minLeft;}
-  }
-
-  return { top: top!, left: left! };
+  return MaxMinTopLeft({ top: top!, left: left!, buildParams, option, });
 }

package/src/packages/components/usePopup/refresh/refreshPopup.ts

@@ -5,6 +5,7 @@ import {calcPosition} from "./calcPosition";
 import {applyPosition} from "./applyPosition";
 import {refreshArrow} from "./refreshArrow";
 import {getRects} from "../utils/getRects";
+import {MaxMinTopLeft} from "./MaxMinTopLeft";
 
 /**
  * 刷新popup定位
@@ -64,7 +65,8 @@ export function refreshPopup(params: iPopupRefreshParams) {
     buildParams.rects = getRects(refs);
     refreshArrow(buildParams);
   } else {
-    const { top, left, height, width } = rects.alignReference;
+    const { top: _top, left: _left, height, width } = rects.alignReference;
+    const { top, left } = MaxMinTopLeft({ top: _top!, left: _left!, buildParams, option, });
     Object.assign(refs.popupEl.style, {
       ...params.transformLocation ? { transform: `translate3d(${left}px,${top}px,0)` } : { top: `${top}px`, left: `${left}px`, },
       height: `${height}px`,