@canlooks/can-ui 0.0.59 → 0.0.61

package/dist/cjs/components/form/form.d.ts

@@ -1,5 +1,5 @@
 import React, { Dispatch, ReactElement, ReactNode, Ref, RefObject, SetStateAction, ElementType } from 'react';
-import { Obj, OverridableProps } from '../../types';
+import { Obj, OverridableProps, Size } from '../../types';
 import { FieldPath } from '../../utils';
 import { FieldError, FormItem, FormItemProps, FormItemRef } from './formItem';
 import { FormRelatable } from './formRelatable';
@@ -11,6 +11,7 @@ export type FormSharedProps = {
     requiredMark?: ReactNode;
     /** variant为"grid"或"table"时会渲染Descriptions组件，并传递variant属性，默认为`grid` */
     variant?: 'plain' | 'grid' | 'table';
+    size?: Size;
 };
 interface FormOwnProps<V extends FormValue = FormValue> extends FormSharedProps, DescriptionsSharedProps, GridOwnProps {
     ref?: Ref<FormRef<V> | null>;

package/dist/cjs/components/form/form.js

@@ -81,7 +81,6 @@ inline, columnCount = 1, gap, columnGap, rowGap, ...props }) => {
             for (const [, item] of itemsContainer.current) {
                 item.reset(newValue);
             }
-            console.log('after', newValue);
             setFormValue(newValue);
         },
         resetField: field => {
@@ -93,10 +92,10 @@ inline, columnCount = 1, gap, columnGap, rowGap, ...props }) => {
     };
     (0, react_1.useImperativeHandle)(ref, () => formRef.current);
     return ((0, jsx_runtime_1.jsx)(Component, { ...props, ref: wrapperRef, css: form_style_1.style, className: (0, utils_1.clsx)(form_style_1.classes.root, props.className), onSubmit: submitHandler, children: (0, jsx_runtime_1.jsx)(FormContext, { value: (0, react_1.useMemo)(() => ({
-                requiredMark, variant,
+                requiredMark, variant, size,
                 formValue: formValue.current, setFieldValue,
                 itemsContainer: itemsContainer.current, formRef
-            }), [requiredMark, variant, formValue.current]), children: variant === 'plain'
+            }), [requiredMark, variant, size, formValue.current]), children: variant === 'plain'
                 ? props.children
                 : (0, jsx_runtime_1.jsx)(descriptions_1.Descriptions, { ...descriptionsProps, size: size, labelWidth: labelWidth, colon: colon, labelPlacement: labelPlacement, disableMargin: disableMargin, disablePadding: disablePadding, items: items, variant: variant, itemComponent: formItem_1.FormItem, inline: inline, columnCount: columnCount, gap: gap, columnGap: columnGap, rowGap: rowGap, children: props.children }) }) }));
 });

package/dist/cjs/components/form/formItem.js

@@ -8,10 +8,11 @@ const utils_1 = require("../../utils");
 const descriptions_1 = require("../descriptions");
 const form_style_1 = require("./form.style");
 const transitionBase_1 = require("../transitionBase");
-const FormItem = ({ ref, wrapperRef, field, initialValue, label = '', rules, required, error, helperText, dependencies, children, noStyle, requiredMark, variant, ...props }) => {
+const FormItem = ({ ref, wrapperRef, field, initialValue, label = '', rules, required, error, helperText, dependencies, children, noStyle, requiredMark, variant, size, ...props }) => {
     const { formValue, setFieldValue, itemsContainer, formRef, ...context } = (0, form_1.useFormContext)();
     requiredMark ??= context.requiredMark ?? '*';
     variant ??= context.variant ?? 'grid';
+    size ??= context.size;
     /**
      * --------------------------------------------------------------------
      * 字段值
@@ -137,7 +138,7 @@ const FormItem = ({ ref, wrapperRef, field, initialValue, label = '', rules, req
                     }
                 }
                 : {}, {
-                ...props.size && { size: props.size },
+                ...size && { size },
                 ...innerError.current ? { color: 'error' } : {}
             }, randomKey.current);
         }
@@ -155,12 +156,12 @@ const FormItem = ({ ref, wrapperRef, field, initialValue, label = '', rules, req
                         setFieldValue?.(field, (0, utils_1.getValueOnChange)(e, fieldValue));
                     }
                 },
-                ...props.size && { size: childProps.size },
+                ...size && { size },
                 ...innerError.current && { color: 'error' }
             });
         }
         return children;
-    }, [children, fieldValue, innerError.current, field, props.size]);
+    }, [children, innerError.current, field, size, randomKey.current, fieldValue]);
     if (noStyle || variant === 'plain') {
         return renderedChildren;
     }

package/dist/cjs/utils/polyfill.js

@@ -4,9 +4,9 @@ Promise.withResolvers ||= function withResolvers() {
     if (!this)
         throw new TypeError('Promise.withResolvers called on non-object');
     const out = {};
-    out.promise = new this((resolve_, reject_) => {
-        out.resolve = resolve_;
-        out.reject = reject_;
+    out.promise = new this((resolve, reject) => {
+        out.resolve = resolve;
+        out.reject = reject;
     });
     return out;
 };

package/dist/esm/components/form/form.d.ts

@@ -1,5 +1,5 @@
 import React, { Dispatch, ReactElement, ReactNode, Ref, RefObject, SetStateAction, ElementType } from 'react';
-import { Obj, OverridableProps } from '../../types';
+import { Obj, OverridableProps, Size } from '../../types';
 import { FieldPath } from '../../utils';
 import { FieldError, FormItem, FormItemProps, FormItemRef } from './formItem';
 import { FormRelatable } from './formRelatable';
@@ -11,6 +11,7 @@ export type FormSharedProps = {
     requiredMark?: ReactNode;
     /** variant为"grid"或"table"时会渲染Descriptions组件，并传递variant属性，默认为`grid` */
     variant?: 'plain' | 'grid' | 'table';
+    size?: Size;
 };
 interface FormOwnProps<V extends FormValue = FormValue> extends FormSharedProps, DescriptionsSharedProps, GridOwnProps {
     ref?: Ref<FormRef<V> | null>;

package/dist/esm/components/form/form.js

@@ -77,7 +77,6 @@ inline, columnCount = 1, gap, columnGap, rowGap, ...props }) => {
             for (const [, item] of itemsContainer.current) {
                 item.reset(newValue);
             }
-            console.log('after', newValue);
             setFormValue(newValue);
         },
         resetField: field => {
@@ -89,10 +88,10 @@ inline, columnCount = 1, gap, columnGap, rowGap, ...props }) => {
     };
     useImperativeHandle(ref, () => formRef.current);
     return (_jsx(Component, { ...props, ref: wrapperRef, css: style, className: clsx(classes.root, props.className), onSubmit: submitHandler, children: _jsx(FormContext, { value: useMemo(() => ({
-                requiredMark, variant,
+                requiredMark, variant, size,
                 formValue: formValue.current, setFieldValue,
                 itemsContainer: itemsContainer.current, formRef
-            }), [requiredMark, variant, formValue.current]), children: variant === 'plain'
+            }), [requiredMark, variant, size, formValue.current]), children: variant === 'plain'
                 ? props.children
                 : _jsx(Descriptions, { ...descriptionsProps, size: size, labelWidth: labelWidth, colon: colon, labelPlacement: labelPlacement, disableMargin: disableMargin, disablePadding: disablePadding, items: items, variant: variant, itemComponent: FormItem, inline: inline, columnCount: columnCount, gap: gap, columnGap: columnGap, rowGap: rowGap, children: props.children }) }) }));
 });

package/dist/esm/components/form/formItem.js

@@ -5,10 +5,11 @@ import { clsx, getValueOnChange, queryDeep, stringifyField, useDerivedState, toA
 import { DescriptionItem } from '../descriptions';
 import { classes } from './form.style';
 import { Collapse } from '../transitionBase';
-export const FormItem = ({ ref, wrapperRef, field, initialValue, label = '', rules, required, error, helperText, dependencies, children, noStyle, requiredMark, variant, ...props }) => {
+export const FormItem = ({ ref, wrapperRef, field, initialValue, label = '', rules, required, error, helperText, dependencies, children, noStyle, requiredMark, variant, size, ...props }) => {
     const { formValue, setFieldValue, itemsContainer, formRef, ...context } = useFormContext();
     requiredMark ??= context.requiredMark ?? '*';
     variant ??= context.variant ?? 'grid';
+    size ??= context.size;
     /**
      * --------------------------------------------------------------------
      * 字段值
@@ -134,7 +135,7 @@ export const FormItem = ({ ref, wrapperRef, field, initialValue, label = '', rul
                     }
                 }
                 : {}, {
-                ...props.size && { size: props.size },
+                ...size && { size },
                 ...innerError.current ? { color: 'error' } : {}
             }, randomKey.current);
         }
@@ -152,12 +153,12 @@ export const FormItem = ({ ref, wrapperRef, field, initialValue, label = '', rul
                         setFieldValue?.(field, getValueOnChange(e, fieldValue));
                     }
                 },
-                ...props.size && { size: childProps.size },
+                ...size && { size },
                 ...innerError.current && { color: 'error' }
             });
         }
         return children;
-    }, [children, fieldValue, innerError.current, field, props.size]);
+    }, [children, innerError.current, field, size, randomKey.current, fieldValue]);
     if (noStyle || variant === 'plain') {
         return renderedChildren;
     }

package/dist/esm/utils/polyfill.js

@@ -2,9 +2,9 @@ Promise.withResolvers ||= function withResolvers() {
     if (!this)
         throw new TypeError('Promise.withResolvers called on non-object');
     const out = {};
-    out.promise = new this((resolve_, reject_) => {
-        out.resolve = resolve_;
-        out.reject = reject_;
+    out.promise = new this((resolve, reject) => {
+        out.resolve = resolve;
+        out.reject = reject;
     });
     return out;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canlooks/can-ui",
-  "version": "0.0.59",
+  "version": "0.0.61",
   "author": "C.CanLiang <canlooks@gmail.com>",
   "description": "My ui framework",
   "license": "MIT",