@canlooks/can-ui 0.0.78 → 0.0.79

package/dist/cjs/components/cascade/cascade.js

@@ -60,7 +60,7 @@ loading, options, labelKey = 'label', primaryKey = 'value', childrenKey = 'child
         setInnerOptions(await loadOptions(searchValue, parent));
     }, loading);
     (0, react_1.useEffect)(() => {
-        if (loadOptions && !searchable && !innerOpen.current && (0, utils_1.toArray)(innerValue)?.length) {
+        if (loadOptions && !searchable && !innerOpen.current && !(0, utils_1.isNoValue)(innerValue)) {
             // 第一次渲染就有value，需要请求数据
             innerLoadOptions(innerSearchValue.current);
         }

package/dist/cjs/components/inputBase/inputBase.js

@@ -57,13 +57,10 @@ min, max, step, precision, placeholder, disabled, readOnly, autoFocus, defaultVa
         }
     };
     const shouldRenderClearButton = () => {
-        if (!clearable || disabled || readOnly || (0, utils_1.isUnset)(innerValue.current)) {
+        if (!clearable || disabled || readOnly) {
             return false;
         }
-        if (Array.isArray(innerValue.current) || typeof innerValue.current === 'string') {
-            return !!innerValue.current.length;
-        }
-        return true;
+        return (0, utils_1.isNoValue)(innerValue.current);
     };
     return ((0, jsx_runtime_1.jsxs)("div", { ...(0, utils_1.mergeComponentProps)(props, {
             ref: innerRef,

package/dist/cjs/components/select/select.js

@@ -115,7 +115,7 @@ showCheckbox = !!multiple, loading, options, labelKey = 'label', primaryKey = 'v
                 value: innerValue,
                 onClear,
                 onBlur
-            }), "data-focused": innerOpen.current, children: inputBaseProps => (0, jsx_runtime_1.jsxs)("div", { className: select_style_1.classes.contentWrap, children: [!(0, utils_1.toArray)(innerValue)?.length
+            }), "data-focused": innerOpen.current, children: inputBaseProps => (0, jsx_runtime_1.jsxs)("div", { className: select_style_1.classes.contentWrap, children: [(0, utils_1.isNoValue)(innerValue)
                         ? (0, jsx_runtime_1.jsx)("div", { className: select_style_1.classes.placeholder, children: props.placeholder ?? '请选择' })
                         : (0, jsx_runtime_1.jsx)("div", { className: select_style_1.classes.backfill, children: renderBackfillFn() }), (0, jsx_runtime_1.jsx)("input", { size: 1, ...(0, utils_1.mergeComponentProps)(inputBaseProps, inputProps), "data-hidden": "true" }), (0, jsx_runtime_1.jsx)("div", { className: select_style_1.classes.arrow, "data-open": innerOpen.current, children: loading
                             ? (0, jsx_runtime_1.jsx)(loadingIndicator_1.LoadingIndicator, {})

package/dist/cjs/components/treeSelect/treeSelect.js

@@ -74,7 +74,7 @@ placeholder = '请选择', autoFocus, clearable, onClear, ...props }) => {
     return ((0, jsx_runtime_1.jsx)(popper_1.Popper, { css: popper_style_1.popperStyle, open: innerOpen.current, onOpenChange: openChangeHandler, placement: "bottom", variant: "collapse", trigger: ['click', 'enter'], disabled: props.disabled || props.readOnly, sizeAdaptable: sizeAdaptable, content: (0, jsx_runtime_1.jsx)(tree_1.Tree, { ...props, nodes: options, value: innerValue, onChange: setInnerValue }), ...popperProps, popperRef: popperRef, onPointerDown: e => {
             popperProps?.onPointerDown?.(e);
             e.preventDefault();
-        }, children: (0, jsx_runtime_1.jsx)(inputBase_1.InputBase, { clearable: !!props.multiple, css: treeSelect_style_1.style, className: (0, utils_1.clsx)(treeSelect_style_1.classes.root, props.className), "data-focused": open, value: innerValue, onClear: clearHandler, placeholder: placeholder, autoFocus: autoFocus, disabled: props.disabled, readOnly: props.readOnly, children: inputBaseProps => (0, jsx_runtime_1.jsxs)("div", { className: treeSelect_style_1.classes.contentWrap, children: [!(0, utils_1.toArray)(innerValue)?.length
+        }, children: (0, jsx_runtime_1.jsx)(inputBase_1.InputBase, { clearable: !!props.multiple, css: treeSelect_style_1.style, className: (0, utils_1.clsx)(treeSelect_style_1.classes.root, props.className), "data-focused": open, value: innerValue, onClear: clearHandler, placeholder: placeholder, autoFocus: autoFocus, disabled: props.disabled, readOnly: props.readOnly, children: inputBaseProps => (0, jsx_runtime_1.jsxs)("div", { className: treeSelect_style_1.classes.contentWrap, children: [(0, utils_1.isNoValue)(innerValue)
                         ? (0, jsx_runtime_1.jsx)("div", { className: treeSelect_style_1.classes.placeholder, children: placeholder })
                         : (0, jsx_runtime_1.jsx)("div", { className: treeSelect_style_1.classes.backfill, children: renderBackfillFn() }), (0, jsx_runtime_1.jsx)("input", { size: 1, ...(0, utils_1.mergeComponentProps)(inputBaseProps, inputProps), "data-hidden": "true" }), (0, jsx_runtime_1.jsx)("div", { className: treeSelect_style_1.classes.arrow, "data-open": open, children: loading
                             ? (0, jsx_runtime_1.jsx)(loadingIndicator_1.LoadingIndicator, {})

package/dist/cjs/extensions/reactiveForm/reactiveForm.d.ts

@@ -22,9 +22,9 @@
 import { FormProps, FormRef } from '../../components/form';
 import { ReactElement, Ref } from 'react';
 import { ReactiveFormItem } from './reactiveFormItem';
-export type ReactiveFormPropsRef = Pick<FormRef, 'submit' | 'getFormErrors' | 'getFieldError' | 'resetForm' | 'resetField' | 'isFormTouched' | 'isFieldTouched'>;
+export type ReactiveFormRef = Pick<FormRef, 'submit' | 'getFormErrors' | 'getFieldError' | 'resetForm' | 'resetField' | 'isFormTouched' | 'isFieldTouched'>;
 export interface ReactiveFormProps extends Omit<FormProps, 'ref' | 'initialValue' | 'onChange' | 'onFinish' | 'items'> {
-    ref?: Ref<ReactiveFormPropsRef>;
+    ref?: Ref<ReactiveFormRef>;
     onChange?(): void;
     onFinish?(): void;
 }

package/dist/cjs/utils/utils.d.ts

@@ -80,13 +80,18 @@ export declare function isPromise<T>(it: any): it is Promise<T>;
  * @param promise
  */
 export declare function getPromiseState(promise: Promise<any>): Promise<'pending' | 'fulfilled' | 'rejected'>;
+/**
+ * 判断表单控件是否为空值
+ * @param value
+ */
+export declare function isNoValue(value: any): boolean;
 /**
  * 将节点用某个分隔符拼接起来，通常用于渲染多选项
  * @param arr
  * @param callback
- * @param seperator
+ * @param separator
  */
-export declare function joinNodes<T>(arr: T[], callback: (item: T, index: number) => ReactNode, seperator?: ReactNode): (string | number | bigint | boolean | import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | Iterable<ReactNode> | import("react").ReactPortal | Promise<string | number | bigint | boolean | import("react").ReactPortal | import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | Iterable<ReactNode> | null | undefined> | null | undefined)[];
+export declare function joinNodes<T>(arr: T[], callback: (item: T, index: number) => ReactNode, separator?: ReactNode): (string | number | bigint | boolean | import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | Iterable<ReactNode> | import("react").ReactPortal | Promise<string | number | bigint | boolean | import("react").ReactPortal | import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | Iterable<ReactNode> | null | undefined> | null | undefined)[];
 /**
  * 修复数字输入框的值，包括最大值最小值限制，以及小数点精度
  * @param value

package/dist/cjs/utils/utils.js

@@ -14,6 +14,7 @@ exports.cloneRef = cloneRef;
 exports.isUnset = isUnset;
 exports.isPromise = isPromise;
 exports.getPromiseState = getPromiseState;
+exports.isNoValue = isNoValue;
 exports.joinNodes = joinNodes;
 exports.fixInputNumber = fixInputNumber;
 exports.isChildOf = isChildOf;
@@ -216,16 +217,29 @@ function getPromiseState(promise) {
         return res === s ? 'pending' : 'fulfilled';
     }).catch(() => 'rejected');
 }
+/**
+ * 判断表单控件是否为空值
+ * @param value
+ */
+function isNoValue(value) {
+    if (isUnset(value)) {
+        return true;
+    }
+    if (Array.isArray(value) || typeof value === 'string') {
+        return !value.length;
+    }
+    return false;
+}
 /**
  * 将节点用某个分隔符拼接起来，通常用于渲染多选项
  * @param arr
  * @param callback
- * @param seperator
+ * @param separator
  */
-function joinNodes(arr, callback, seperator = ' / ') {
+function joinNodes(arr, callback, separator = ' / ') {
     return arr.flatMap((item, index) => {
         return index > 0
-            ? [seperator, callback(item, index)]
+            ? [separator, callback(item, index)]
             : callback(item, index);
     });
 }

package/dist/esm/components/cascade/cascade.js

@@ -1,6 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs } from "@emotion/react/jsx-runtime";
 import { createContext, memo, useContext, useDeferredValue, useEffect, useMemo, useState } from 'react';
-import { useControlled, useLoading, useKeyboard, joinNodes, clsx, toArray, mergeComponentProps } from '../../utils';
+import { useControlled, useLoading, useKeyboard, joinNodes, clsx, mergeComponentProps, isNoValue } from '../../utils';
 import { Input } from '../input';
 import { InputBase } from '../inputBase';
 import { Popper } from '../popper';
@@ -56,7 +56,7 @@ loading, options, labelKey = 'label', primaryKey = 'value', childrenKey = 'child
         setInnerOptions(await loadOptions(searchValue, parent));
     }, loading);
     useEffect(() => {
-        if (loadOptions && !searchable && !innerOpen.current && toArray(innerValue)?.length) {
+        if (loadOptions && !searchable && !innerOpen.current && !isNoValue(innerValue)) {
             // 第一次渲染就有value，需要请求数据
             innerLoadOptions(innerSearchValue.current);
         }

package/dist/esm/components/inputBase/inputBase.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "@emotion/react/jsx-runtime";
 import { useImperativeHandle, useRef } from 'react';
 import { classes, useStyle } from './inputBase.style';
-import { fixInputNumber, isUnset, mergeComponentProps, useControlled } from '../../utils';
+import { fixInputNumber, isNoValue, mergeComponentProps, useControlled } from '../../utils';
 import { useTheme } from '../theme';
 import { Button } from '../button';
 import { LoadingIndicator } from '../loadingIndicator';
@@ -54,13 +54,10 @@ min, max, step, precision, placeholder, disabled, readOnly, autoFocus, defaultVa
         }
     };
     const shouldRenderClearButton = () => {
-        if (!clearable || disabled || readOnly || isUnset(innerValue.current)) {
+        if (!clearable || disabled || readOnly) {
             return false;
         }
-        if (Array.isArray(innerValue.current) || typeof innerValue.current === 'string') {
-            return !!innerValue.current.length;
-        }
-        return true;
+        return isNoValue(innerValue.current);
     };
     return (_jsxs("div", { ...mergeComponentProps(props, {
             ref: innerRef,

package/dist/esm/components/select/select.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "@emotion/react/jsx-runtime";
 import { Children, isValidElement, memo, useCallback, useDeferredValue, useMemo, useRef } from 'react';
 import { InputBase } from '../inputBase';
-import { mergeComponentProps, toArray, useControlled } from '../../utils';
+import { isNoValue, mergeComponentProps, useControlled } from '../../utils';
 import { classes, style } from './select.style';
 import { Popper } from '../popper';
 import { MenuItem } from '../menuItem';
@@ -112,7 +112,7 @@ showCheckbox = !!multiple, loading, options, labelKey = 'label', primaryKey = 'v
                 value: innerValue,
                 onClear,
                 onBlur
-            }), "data-focused": innerOpen.current, children: inputBaseProps => _jsxs("div", { className: classes.contentWrap, children: [!toArray(innerValue)?.length
+            }), "data-focused": innerOpen.current, children: inputBaseProps => _jsxs("div", { className: classes.contentWrap, children: [isNoValue(innerValue)
                         ? _jsx("div", { className: classes.placeholder, children: props.placeholder ?? '请选择' })
                         : _jsx("div", { className: classes.backfill, children: renderBackfillFn() }), _jsx("input", { size: 1, ...mergeComponentProps(inputBaseProps, inputProps), "data-hidden": "true" }), _jsx("div", { className: classes.arrow, "data-open": innerOpen.current, children: loading
                             ? _jsx(LoadingIndicator, {})

package/dist/esm/components/treeSelect/treeSelect.js

@@ -2,7 +2,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "@emotion/react/jsx-runtime";
 import { Children, isValidElement, memo, useMemo } from 'react';
 import { Popper } from '../popper';
 import { Tree, TreeNode } from '../tree';
-import { useControlled, toArray, clsx, mergeComponentProps } from '../../utils';
+import { useControlled, toArray, clsx, mergeComponentProps, isNoValue } from '../../utils';
 import { InputBase } from '../inputBase';
 import { LoadingIndicator } from '../loadingIndicator';
 import { popperStyle } from '../popper/popper.style';
@@ -71,7 +71,7 @@ placeholder = '请选择', autoFocus, clearable, onClear, ...props }) => {
     return (_jsx(Popper, { css: popperStyle, open: innerOpen.current, onOpenChange: openChangeHandler, placement: "bottom", variant: "collapse", trigger: ['click', 'enter'], disabled: props.disabled || props.readOnly, sizeAdaptable: sizeAdaptable, content: _jsx(Tree, { ...props, nodes: options, value: innerValue, onChange: setInnerValue }), ...popperProps, popperRef: popperRef, onPointerDown: e => {
             popperProps?.onPointerDown?.(e);
             e.preventDefault();
-        }, children: _jsx(InputBase, { clearable: !!props.multiple, css: style, className: clsx(classes.root, props.className), "data-focused": open, value: innerValue, onClear: clearHandler, placeholder: placeholder, autoFocus: autoFocus, disabled: props.disabled, readOnly: props.readOnly, children: inputBaseProps => _jsxs("div", { className: classes.contentWrap, children: [!toArray(innerValue)?.length
+        }, children: _jsx(InputBase, { clearable: !!props.multiple, css: style, className: clsx(classes.root, props.className), "data-focused": open, value: innerValue, onClear: clearHandler, placeholder: placeholder, autoFocus: autoFocus, disabled: props.disabled, readOnly: props.readOnly, children: inputBaseProps => _jsxs("div", { className: classes.contentWrap, children: [isNoValue(innerValue)
                         ? _jsx("div", { className: classes.placeholder, children: placeholder })
                         : _jsx("div", { className: classes.backfill, children: renderBackfillFn() }), _jsx("input", { size: 1, ...mergeComponentProps(inputBaseProps, inputProps), "data-hidden": "true" }), _jsx("div", { className: classes.arrow, "data-open": open, children: loading
                             ? _jsx(LoadingIndicator, {})

package/dist/esm/extensions/reactiveForm/reactiveForm.d.ts

@@ -22,9 +22,9 @@
 import { FormProps, FormRef } from '../../components/form';
 import { ReactElement, Ref } from 'react';
 import { ReactiveFormItem } from './reactiveFormItem';
-export type ReactiveFormPropsRef = Pick<FormRef, 'submit' | 'getFormErrors' | 'getFieldError' | 'resetForm' | 'resetField' | 'isFormTouched' | 'isFieldTouched'>;
+export type ReactiveFormRef = Pick<FormRef, 'submit' | 'getFormErrors' | 'getFieldError' | 'resetForm' | 'resetField' | 'isFormTouched' | 'isFieldTouched'>;
 export interface ReactiveFormProps extends Omit<FormProps, 'ref' | 'initialValue' | 'onChange' | 'onFinish' | 'items'> {
-    ref?: Ref<ReactiveFormPropsRef>;
+    ref?: Ref<ReactiveFormRef>;
     onChange?(): void;
     onFinish?(): void;
 }

package/dist/esm/utils/utils.d.ts

@@ -80,13 +80,18 @@ export declare function isPromise<T>(it: any): it is Promise<T>;
  * @param promise
  */
 export declare function getPromiseState(promise: Promise<any>): Promise<'pending' | 'fulfilled' | 'rejected'>;
+/**
+ * 判断表单控件是否为空值
+ * @param value
+ */
+export declare function isNoValue(value: any): boolean;
 /**
  * 将节点用某个分隔符拼接起来，通常用于渲染多选项
  * @param arr
  * @param callback
- * @param seperator
+ * @param separator
  */
-export declare function joinNodes<T>(arr: T[], callback: (item: T, index: number) => ReactNode, seperator?: ReactNode): (string | number | bigint | boolean | import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | Iterable<ReactNode> | import("react").ReactPortal | Promise<string | number | bigint | boolean | import("react").ReactPortal | import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | Iterable<ReactNode> | null | undefined> | null | undefined)[];
+export declare function joinNodes<T>(arr: T[], callback: (item: T, index: number) => ReactNode, separator?: ReactNode): (string | number | bigint | boolean | import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | Iterable<ReactNode> | import("react").ReactPortal | Promise<string | number | bigint | boolean | import("react").ReactPortal | import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | Iterable<ReactNode> | null | undefined> | null | undefined)[];
 /**
  * 修复数字输入框的值，包括最大值最小值限制，以及小数点精度
  * @param value

package/dist/esm/utils/utils.js

@@ -191,16 +191,29 @@ export function getPromiseState(promise) {
         return res === s ? 'pending' : 'fulfilled';
     }).catch(() => 'rejected');
 }
+/**
+ * 判断表单控件是否为空值
+ * @param value
+ */
+export function isNoValue(value) {
+    if (isUnset(value)) {
+        return true;
+    }
+    if (Array.isArray(value) || typeof value === 'string') {
+        return !value.length;
+    }
+    return false;
+}
 /**
  * 将节点用某个分隔符拼接起来，通常用于渲染多选项
  * @param arr
  * @param callback
- * @param seperator
+ * @param separator
  */
-export function joinNodes(arr, callback, seperator = ' / ') {
+export function joinNodes(arr, callback, separator = ' / ') {
     return arr.flatMap((item, index) => {
         return index > 0
-            ? [seperator, callback(item, index)]
+            ? [separator, callback(item, index)]
             : callback(item, index);
     });
 }

package/package.json

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