@next-bricks/form 0.21.1 → 0.22.0

package/dist/types.json

@@ -1,238 +1,4 @@
 {
-  "eo-form-item": {
-    "properties": [
-      {
-        "name": "formElement",
-        "annotation": {
-          "type": "reference",
-          "typeName": {
-            "type": "identifier",
-            "name": "Form"
-          }
-        }
-      },
-      {
-        "name": "curElement",
-        "annotation": {
-          "type": "reference",
-          "typeName": {
-            "type": "identifier",
-            "name": "HTMLElement"
-          }
-        }
-      },
-      {
-        "name": "name",
-        "annotation": {
-          "type": "keyword",
-          "value": "string"
-        }
-      },
-      {
-        "name": "label",
-        "annotation": {
-          "type": "keyword",
-          "value": "string"
-        }
-      },
-      {
-        "name": "pattern",
-        "annotation": {
-          "type": "keyword",
-          "value": "string"
-        }
-      },
-      {
-        "name": "message",
-        "annotation": {
-          "type": "reference",
-          "typeName": {
-            "type": "identifier",
-            "name": "Record"
-          },
-          "typeParameters": {
-            "type": "typeParameterInstantiation",
-            "params": [
-              {
-                "type": "keyword",
-                "value": "string"
-              },
-              {
-                "type": "keyword",
-                "value": "string"
-              }
-            ]
-          }
-        }
-      },
-      {
-        "name": "max",
-        "annotation": {
-          "type": "keyword",
-          "value": "number"
-        }
-      },
-      {
-        "name": "min",
-        "annotation": {
-          "type": "keyword",
-          "value": "number"
-        }
-      },
-      {
-        "name": "required",
-        "annotation": {
-          "type": "keyword",
-          "value": "boolean"
-        }
-      },
-      {
-        "name": "value",
-        "annotation": {
-          "type": "keyword",
-          "value": "string"
-        }
-      },
-      {
-        "name": "labelCol",
-        "annotation": {
-          "type": "keyword",
-          "value": "string"
-        }
-      },
-      {
-        "name": "wrapperCol",
-        "annotation": {
-          "type": "keyword",
-          "value": "string"
-        }
-      },
-      {
-        "name": "valuePropsName",
-        "annotation": {
-          "type": "keyword",
-          "value": "string"
-        }
-      },
-      {
-        "name": "layout",
-        "annotation": {
-          "type": "reference",
-          "typeName": {
-            "type": "identifier",
-            "name": "Layout"
-          }
-        }
-      },
-      {
-        "name": "size",
-        "annotation": {
-          "type": "reference",
-          "typeName": {
-            "type": "identifier",
-            "name": "ComponentSize"
-          }
-        }
-      },
-      {
-        "name": "trim",
-        "annotation": {
-          "type": "keyword",
-          "value": "boolean"
-        }
-      },
-      {
-        "name": "trigger",
-        "annotation": {
-          "type": "keyword",
-          "value": "string"
-        }
-      },
-      {
-        "name": "validator",
-        "annotation": {
-          "type": "parenthesizedType",
-          "annotation": {
-            "type": "function",
-            "parameters": [
-              {
-                "type": "identifier",
-                "name": "value",
-                "annotation": {
-                  "type": "keyword",
-                  "value": "any"
-                }
-              }
-            ],
-            "annotation": {
-              "type": "reference",
-              "typeName": {
-                "type": "identifier",
-                "name": "MessageBody"
-              }
-            }
-          }
-        }
-      },
-      {
-        "name": "needValidate",
-        "annotation": {
-          "type": "keyword",
-          "value": "boolean"
-        }
-      }
-    ],
-    "events": [],
-    "methods": [],
-    "types": [
-      {
-        "type": "typeAlias",
-        "name": "Layout",
-        "annotation": {
-          "type": "union",
-          "types": [
-            {
-              "type": "jsLiteral",
-              "value": "horizontal"
-            },
-            {
-              "type": "jsLiteral",
-              "value": "vertical"
-            },
-            {
-              "type": "jsLiteral",
-              "value": "inline"
-            }
-          ]
-        }
-      },
-      {
-        "type": "typeAlias",
-        "name": "ComponentSize",
-        "annotation": {
-          "type": "union",
-          "types": [
-            {
-              "type": "jsLiteral",
-              "value": "large"
-            },
-            {
-              "type": "jsLiteral",
-              "value": "medium"
-            },
-            {
-              "type": "jsLiteral",
-              "value": "small"
-            },
-            {
-              "type": "jsLiteral",
-              "value": "xs"
-            }
-          ]
-        }
-      }
-    ]
-  },
   "eo-submit-buttons": {
     "properties": [
       {
@@ -599,6 +365,26 @@
           }
         }
       },
+      {
+        "name": "labelCol",
+        "annotation": {
+          "type": "reference",
+          "typeName": {
+            "type": "identifier",
+            "name": "ColProps"
+          }
+        }
+      },
+      {
+        "name": "wrapperCol",
+        "annotation": {
+          "type": "reference",
+          "typeName": {
+            "type": "identifier",
+            "name": "ColProps"
+          }
+        }
+      },
       {
         "name": "formStyle",
         "annotation": {
@@ -2596,6 +2382,226 @@
       }
     ]
   },
+  "eo-form-item": {
+    "properties": [
+      {
+        "name": "formElement",
+        "annotation": {
+          "type": "reference",
+          "typeName": {
+            "type": "identifier",
+            "name": "Form"
+          }
+        }
+      },
+      {
+        "name": "curElement",
+        "annotation": {
+          "type": "reference",
+          "typeName": {
+            "type": "identifier",
+            "name": "HTMLElement"
+          }
+        }
+      },
+      {
+        "name": "name",
+        "annotation": {
+          "type": "keyword",
+          "value": "string"
+        }
+      },
+      {
+        "name": "label",
+        "annotation": {
+          "type": "keyword",
+          "value": "string"
+        }
+      },
+      {
+        "name": "pattern",
+        "annotation": {
+          "type": "keyword",
+          "value": "string"
+        }
+      },
+      {
+        "name": "message",
+        "annotation": {
+          "type": "reference",
+          "typeName": {
+            "type": "identifier",
+            "name": "Record"
+          },
+          "typeParameters": {
+            "type": "typeParameterInstantiation",
+            "params": [
+              {
+                "type": "keyword",
+                "value": "string"
+              },
+              {
+                "type": "keyword",
+                "value": "string"
+              }
+            ]
+          }
+        }
+      },
+      {
+        "name": "max",
+        "annotation": {
+          "type": "keyword",
+          "value": "number"
+        }
+      },
+      {
+        "name": "min",
+        "annotation": {
+          "type": "keyword",
+          "value": "number"
+        }
+      },
+      {
+        "name": "required",
+        "annotation": {
+          "type": "keyword",
+          "value": "boolean"
+        }
+      },
+      {
+        "name": "value",
+        "annotation": {
+          "type": "keyword",
+          "value": "string"
+        }
+      },
+      {
+        "name": "valuePropsName",
+        "annotation": {
+          "type": "keyword",
+          "value": "string"
+        }
+      },
+      {
+        "name": "layout",
+        "annotation": {
+          "type": "reference",
+          "typeName": {
+            "type": "identifier",
+            "name": "Layout"
+          }
+        }
+      },
+      {
+        "name": "size",
+        "annotation": {
+          "type": "reference",
+          "typeName": {
+            "type": "identifier",
+            "name": "ComponentSize"
+          }
+        }
+      },
+      {
+        "name": "trim",
+        "annotation": {
+          "type": "keyword",
+          "value": "boolean"
+        }
+      },
+      {
+        "name": "trigger",
+        "annotation": {
+          "type": "keyword",
+          "value": "string"
+        }
+      },
+      {
+        "name": "validator",
+        "annotation": {
+          "type": "parenthesizedType",
+          "annotation": {
+            "type": "function",
+            "parameters": [
+              {
+                "type": "identifier",
+                "name": "value",
+                "annotation": {
+                  "type": "keyword",
+                  "value": "any"
+                }
+              }
+            ],
+            "annotation": {
+              "type": "reference",
+              "typeName": {
+                "type": "identifier",
+                "name": "MessageBody"
+              }
+            }
+          }
+        }
+      },
+      {
+        "name": "needValidate",
+        "annotation": {
+          "type": "keyword",
+          "value": "boolean"
+        }
+      }
+    ],
+    "events": [],
+    "methods": [],
+    "types": [
+      {
+        "type": "typeAlias",
+        "name": "Layout",
+        "annotation": {
+          "type": "union",
+          "types": [
+            {
+              "type": "jsLiteral",
+              "value": "horizontal"
+            },
+            {
+              "type": "jsLiteral",
+              "value": "vertical"
+            },
+            {
+              "type": "jsLiteral",
+              "value": "inline"
+            }
+          ]
+        }
+      },
+      {
+        "type": "typeAlias",
+        "name": "ComponentSize",
+        "annotation": {
+          "type": "union",
+          "types": [
+            {
+              "type": "jsLiteral",
+              "value": "large"
+            },
+            {
+              "type": "jsLiteral",
+              "value": "medium"
+            },
+            {
+              "type": "jsLiteral",
+              "value": "small"
+            },
+            {
+              "type": "jsLiteral",
+              "value": "xs"
+            }
+          ]
+        }
+      }
+    ]
+  },
   "eo-dynamic-form-item": {
     "properties": [
       {

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

@@ -1,6 +1,6 @@
 {
   "name": "@next-bricks/form",
-  "version": "0.21.1",
+  "version": "0.22.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.4",
     "@next-core/test-next": "^1.0.11"
   },
-  "gitHead": "901d3eb13694e922edfdc889b3e665e045d77ff0"
+  "gitHead": "c0bc0dcf078800774f4551a8a715ac4ad7f1e86d"
 }