@next-bricks/form 0.21.2 → 0.23.0

package/dist-types/form/index.d.ts

@@ -1,6 +1,6 @@
 import React from "react";
 import { ReactNextElement } from "@next-core/react-element";
-import { AbstractForm, FormStore } from "@next-shared/form";
+import { AbstractForm, FormStore, ColProps } from "@next-shared/form";
 import { ComponentSize, Layout } from "../interface.js";
 interface FormProps {
     values?: Record<string, any>;
@@ -31,13 +31,22 @@ declare class Form extends ReactNextElement implements FormProps, AbstractForm {
     set values(value: Record<string, unknown>);
     get values(): Record<string, unknown>;
     /**
-     * 布局方式
+     * 布局方式(默认 vertical 布局)
+     * @default vertical
      */
-    accessor layout: Layout | undefined;
+    accessor layout: Layout;
     /**
      * 表单组件尺寸
      */
     accessor size: ComponentSize | undefined;
+    /**
+     * 标签列布局样式（仅当 layout="horizontal" 时有效）
+     */
+    accessor labelCol: ColProps;
+    /**
+     * 输入控件列布局样式（仅当 layout="horizontal" 时有效）
+     */
+    accessor wrapperCol: ColProps;
     handleValuesChange: (values: Record<string, unknown>) => void;
     /**
      * 表单校验方法
@@ -68,6 +77,8 @@ declare class Form extends ReactNextElement implements FormProps, AbstractForm {
 }
 interface FormComponentProps extends FormProps {
     formStyle?: React.CSSProperties;
+    labelCol?: ColProps;
+    wrapperCol?: ColProps;
     onValuesChange?: (value: Record<string, any>) => void;
     onValidateSuccess?: () => void;
     onValidateError?: () => void;

package/dist-types/form-item/convertToItemColName.d.ts

@@ -0,0 +1,5 @@
+import type { ColProps, ColSize } from "@next-shared/form";
+import type { Layout } from "../interface.js";
+export declare function convertToItemColName(colConf: ColProps | undefined, layout: Layout): string;
+export declare function addLabelSizeToWrapperOffset(labelCol: number | string | ColSize, wrapperCol: number | string | ColSize): ColSize;
+export declare function calcWrapperColOffsetWithoutLabel(labelCol: ColProps, wrapperCol: ColProps): ColProps;

package/dist-types/form-item/convertToItemColName.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist-types/form-item/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { AbstractForm, FormItemElementBase, MessageBody } from "@next-shared/form";
+import { AbstractForm, FormItemElementBase, MessageBody, ColProps } from "@next-shared/form";
 import type { Form } from "../form/index.jsx";
 import type { ComponentSize, Layout } from "../interface.js";
 import "@next-core/theme";
@@ -19,8 +19,8 @@ export interface FormItemProps {
     pattern?: string;
     min?: number;
     max?: number;
-    labelCol?: string;
-    wrapperCol?: string;
+    labelCol?: ColProps;
+    wrapperCol?: ColProps;
     message?: Record<string, string>;
     layout?: Layout;
     size?: ComponentSize;
@@ -61,16 +61,6 @@ declare class FormItem extends FormItemElementBase implements FormItemProps {
      * 初始值
      */
     accessor value: string | undefined;
-    /**
-     * 表单项 label 标签布局
-     * @group ui
-     */
-    accessor labelCol: string | undefined;
-    /**
-     * 表单项控件布局
-     * @group ui
-     */
-    accessor wrapperCol: string | undefined;
     accessor valuePropsName: string | undefined;
     accessor layout: Layout | undefined;
     accessor size: ComponentSize | undefined;

package/dist-types/submit-buttons/index.d.ts

@@ -1,7 +1,8 @@
 import React from "react";
 import { FormItemElementBase } from "@next-shared/form";
+import type { FormItemProps } from "../form-item/index.js";
 import type { ButtonType } from "../interface.js";
-interface SubmitButtonsProps {
+interface SubmitButtonsProps extends FormItemProps {
     curElement: HTMLElement;
     submitText?: string;
     submitType?: ButtonType;

package/dist-types/upload/Upload.d.ts

@@ -19,6 +19,7 @@ export interface UploadProps {
     accept?: string;
     multiple?: boolean;
     maxCount?: number;
+    limitSize?: number;
     overMaxCountMode?: "ignore" | "replace";
     beforeUploadValidators?: ((file: File, files: File[]) => Promise<unknown>)[];
     beforeUploadUserDataProcessor?: (file: File, fileDataList: {

package/dist-types/upload/upload-file/i18n.d.ts

@@ -1,7 +1,8 @@
 export declare enum K {
     UPLOAD = "UPLOAD",
     FILE_UPLOADING = "FILE_UPLOADING",
-    DRAG_UPLOAD_TEXT = "DRAG_UPLOAD_TEXT"
+    DRAG_UPLOAD_TEXT = "DRAG_UPLOAD_TEXT",
+    EXCEEDED_FILE_SIZE_LIMIT = "EXCEEDED_FILE_SIZE_LIMIT"
 }
 export declare const NS = "bricks/form/eo-upload-file";
 export declare const locales: {

package/dist-types/upload/upload-file/index.d.ts

@@ -1,4 +1,6 @@
 /// <reference types="react" />
+import type { ButtonProps } from "@next-bricks/basic/button";
+import type { GeneralIconProps } from "@next-bricks/icons/general-icon";
 import { FormItemElementBase } from "@next-shared/form";
 import type { FormItemProps } from "../../form-item/index.js";
 import "@next-core/theme";
@@ -12,6 +14,7 @@ export interface UploadFileProps {
     multiple?: boolean;
     accept?: string;
     maxCount?: number;
+    limitSize?: number;
     overMaxCountMode?: "ignore" | "replace";
     uploadDraggable?: boolean;
     draggableUploadTip?: string;
@@ -19,6 +22,9 @@ export interface UploadFileProps {
     url?: string;
     method?: string;
     uploadName?: string;
+    buttonText?: string;
+    buttonType?: ButtonProps["type"];
+    buttonIcon?: GeneralIconProps;
 }
 /**
  * 上传文件
@@ -57,6 +63,23 @@ export declare class EoUploadFile extends FormItemElementBase implements UploadF
      * 最大上传数量
      */
     accessor maxCount: number | undefined;
+    /**
+     * 上传大小限制(单位为 MB)
+     */
+    accessor limitSize: number | undefined;
+    /**
+     * 上传按钮文本
+     * @default 上传
+     */
+    accessor buttonText: string | undefined;
+    /**
+     * 上传按钮类型
+     */
+    accessor buttonType: ButtonProps["type"] | undefined;
+    /**
+     * 上传按钮类型
+     */
+    accessor buttonIcon: GeneralIconProps;
     /**
      * 超出最大上传数量时文件的保留方式
      */

package/dist-types/upload/utils.d.ts

@@ -1,8 +1,13 @@
 export declare const symbolForAbortController: unique symbol;
 export declare const LIST_IGNORE: unique symbol;
 export declare const getUid: () => string;
+export declare enum FileSizeUnit {
+    KB = "KB",
+    MB = "MB",
+    GB = "GB"
+}
 export declare const acceptValidator: (file: File, accepts?: string | string[]) => boolean;
-export declare const sizeValidator: (file: File, limitSize?: number) => Promise<unknown>;
+export declare const sizeValidator: (file: File, limitSize?: number, unit?: FileSizeUnit) => Promise<unknown>;
 export type UploadStatus = "uploading" | "done" | "error";
 export interface FileData {
     uid: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-bricks/form",
-  "version": "0.21.2",
+  "version": "0.23.0",
   "homepage": "https://github.com/easyops-cn/next-bricks/tree/master/bricks/form",
   "repository": {
     "type": "git",
@@ -34,8 +34,8 @@
     "postpublish": "mv package.json.bak package.json"
   },
   "devDependencies": {
-    "@next-core/build-next-bricks": "^1.14.3",
+    "@next-core/build-next-bricks": "^1.14.5",
     "@next-core/test-next": "^1.0.11"
   },
-  "gitHead": "26829bc81e7e8d2528014ab77552c30ac0d1b54b"
+  "gitHead": "06ec2b39535218af195bfcd77af9f7d498a06b09"
 }