@canlooks/can-ui 0.0.28 → 0.0.29

package/dist/cjs/components/descriptions/descriptions.style.js

@@ -72,7 +72,7 @@ exports.gridItemStyle = (0, utils_1.defineCss)(({ spacing, text }) => (0, react_
         flex-direction: row-reverse;
     }
 
-    &:not(:last-of-type):not([data-disable-margin=true]) {
+    &:not([data-disable-margin=true]) {
         &[data-label-placement=left], &[data-label-placement=right] {
             margin-bottom: ${spacing[4]}px;
 

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

@@ -32,6 +32,7 @@ interface FormContext<V extends FormValue> extends FormSharedProps {
 declare const FormContext: React.Context<FormContext<any>>;
 export declare function useFormContext<V extends FormValue>(): FormContext<V>;
 export type FormRef<V extends FormValue = FormValue> = {
+    /** 存在校验不通过的字段时会得到`null` */
     submit(): Promise<V | null>;
     getFieldValue<T = any>(field: FieldPath): T;
     getFormValue(): V;

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

@@ -20,7 +20,7 @@ exports.style = (0, utils_1.defineCss)(({ colors, spacing }) => (0, react_1.css)
     }
 
     .${exports.classes.item} {
-        &:not(:last-of-type):not([data-disable-margin=true]) {
+        &:not([data-disable-margin=true]) {
             &[data-label-placement=left], &[data-label-placement=right] {
                 margin-bottom: ${spacing[6]}px;
 

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

@@ -49,7 +49,7 @@ const FormItem = ({ ref, wrapperRef, field, initialValue, label = '', rules, req
      * --------------------------------------------------------------------
      * 校验
      */
-    const rulesArr = Array.isArray(rules) ? rules : rules && [rules];
+    const rulesArr = (0, utils_1.toArray)(rules);
     const [innerError, setInnerError] = (0, utils_1.useDerivedState)(error);
     const [innerHelperText, setInnerHelperText] = (0, utils_1.useDerivedState)(helperText);
     const validate = async () => {
@@ -167,7 +167,7 @@ const FormItem = ({ ref, wrapperRef, field, initialValue, label = '', rules, req
     if (noStyle || variant === 'plain') {
         return renderedChildren;
     }
-    return ((0, jsx_runtime_1.jsxs)(descriptions_1.DescriptionItem, { ...props, ref: wrapperRef, className: (0, utils_1.clsx)(form_style_1.classes.item, props.className), label: (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [isRequired && !!requiredMark &&
+    return ((0, jsx_runtime_1.jsxs)(descriptions_1.DescriptionItem, { flex: void 0, ...props, ref: wrapperRef, className: (0, utils_1.clsx)(form_style_1.classes.item, props.className), label: (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [isRequired && !!requiredMark &&
                     (0, jsx_runtime_1.jsx)("span", { className: form_style_1.classes.requiredMark, children: requiredMark }), label] }), children: [renderedChildren, (0, jsx_runtime_1.jsx)(transitionBase_1.Collapse, { in: innerError.current || !!helperText, children: (0, jsx_runtime_1.jsx)("div", { className: form_style_1.classes.helperText, children: innerHelperText.current }) })] }));
 };
 exports.FormItem = FormItem;

package/dist/esm/components/descriptions/descriptions.style.js

@@ -69,7 +69,7 @@ export const gridItemStyle = defineCss(({ spacing, text }) => css `
         flex-direction: row-reverse;
     }
 
-    &:not(:last-of-type):not([data-disable-margin=true]) {
+    &:not([data-disable-margin=true]) {
         &[data-label-placement=left], &[data-label-placement=right] {
             margin-bottom: ${spacing[4]}px;
 

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

@@ -32,6 +32,7 @@ interface FormContext<V extends FormValue> extends FormSharedProps {
 declare const FormContext: React.Context<FormContext<any>>;
 export declare function useFormContext<V extends FormValue>(): FormContext<V>;
 export type FormRef<V extends FormValue = FormValue> = {
+    /** 存在校验不通过的字段时会得到`null` */
     submit(): Promise<V | null>;
     getFieldValue<T = any>(field: FieldPath): T;
     getFormValue(): V;

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

@@ -17,7 +17,7 @@ export const style = defineCss(({ colors, spacing }) => css `
     }
 
     .${classes.item} {
-        &:not(:last-of-type):not([data-disable-margin=true]) {
+        &:not([data-disable-margin=true]) {
             &[data-label-placement=left], &[data-label-placement=right] {
                 margin-bottom: ${spacing[6]}px;
 

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

@@ -1,7 +1,7 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "@emotion/react/jsx-runtime";
 import { cloneElement, isValidElement, useDeferredValue, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import { useFormContext } from './form';
-import { clsx, getValueOnChange, queryDeep, stringifyField, useDerivedState } from '../../utils';
+import { clsx, getValueOnChange, queryDeep, stringifyField, useDerivedState, toArray } from '../../utils';
 import { DescriptionItem } from '../descriptions';
 import { classes } from './form.style';
 import { Collapse } from '../transitionBase';
@@ -46,7 +46,7 @@ export const FormItem = ({ ref, wrapperRef, field, initialValue, label = '', rul
      * --------------------------------------------------------------------
      * 校验
      */
-    const rulesArr = Array.isArray(rules) ? rules : rules && [rules];
+    const rulesArr = toArray(rules);
     const [innerError, setInnerError] = useDerivedState(error);
     const [innerHelperText, setInnerHelperText] = useDerivedState(helperText);
     const validate = async () => {
@@ -164,6 +164,6 @@ export const FormItem = ({ ref, wrapperRef, field, initialValue, label = '', rul
     if (noStyle || variant === 'plain') {
         return renderedChildren;
     }
-    return (_jsxs(DescriptionItem, { ...props, ref: wrapperRef, className: clsx(classes.item, props.className), label: _jsxs(_Fragment, { children: [isRequired && !!requiredMark &&
+    return (_jsxs(DescriptionItem, { flex: void 0, ...props, ref: wrapperRef, className: clsx(classes.item, props.className), label: _jsxs(_Fragment, { children: [isRequired && !!requiredMark &&
                     _jsx("span", { className: classes.requiredMark, children: requiredMark }), label] }), children: [renderedChildren, _jsx(Collapse, { in: innerError.current || !!helperText, children: _jsx("div", { className: classes.helperText, children: innerHelperText.current }) })] }));
 };

package/package.json

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