@canlooks/can-ui 0.0.47 → 0.0.49

package/dist/esm/components/dialog/dialog.js

@@ -81,7 +81,7 @@ export function Dialog({ ref, icon, title, footer, prefix, suffix, width = 420,
     return (_jsx(Modal, { ...props, ref: cloneRef(ref, overlayRef), css: style, className: clsx(classes.root, props.className), open: innerOpen.current, onMaskClick: onMaskClick, "data-draggable": draggable, children: _jsx(Draggable, { container: () => overlayRef.current, children: (targetProps, handleProps) => _jsxs("div", { className: classes.card, ...targetProps, style: { width, minWidth, maxWidth, ...targetProps.style }, children: [!!icon &&
                         _jsx("div", { className: classes.icon, children: icon }), _jsxs("div", { className: classes.content, children: [!!(title || showClose) &&
                                 _jsxs("div", { className: classes.titleRow, ...handleProps, children: [_jsx("div", { className: classes.title, children: title }), showClose &&
-                                            _jsx(Button, { shape: "circular", variant: "text", color: "text", ...closeProps, className: clsx(classes.close, closeProps?.className), onClick: closeHandler, children: _jsx(Icon, { icon: faXmark }) })] }), _jsxs("div", { ref: bodyRef, className: classes.body, onScroll: onScroll, children: [!!prefix &&
+                                            _jsx(Button, { shape: "circular", variant: "text", color: "text.secondary", ...closeProps, className: clsx(classes.close, closeProps?.className), onClick: closeHandler, children: _jsx(Icon, { icon: faXmark }) })] }), _jsxs("div", { ref: bodyRef, className: classes.body, onScroll: onScroll, children: [!!prefix &&
                                         _jsx("div", { className: classes.prefix, children: prefix }), _jsx("div", { ref: bodyWrapRef, className: classes.bodyWrap, children: props.children }), !!suffix &&
                                         _jsx("div", { className: classes.suffix, children: suffix })] }), (typeof footer === 'undefined' || !!footer) &&
                                 _jsx("div", { className: classes.footer, children: renderFooter() })] })] }) }) }));

package/dist/esm/components/drawer/drawer.js

@@ -48,7 +48,7 @@ export function Drawer({ title, footer, showClose = true, size = { xs: '100%', s
     }, [innerOpen.current]);
     return (_jsx(OverlayBase, { ...props, css: useStyle({ size: typeof size === 'object' ? size : { xs: size } }), className: clsx(classes.root, props.className), open: innerOpen.current, onMaskClick: onMaskClick, "data-placement": placement, children: _jsx(Slide, { direction: placementToDirection[placement], ...slideProps, in: innerOpen.current, className: clsx(classes.drawer, slideProps?.className), children: _jsxs("div", { className: classes.drawerWrap, children: [!!(title || showClose) &&
                         _jsxs("div", { className: classes.titleRow, children: [_jsx("div", { className: classes.title, children: title }), showClose &&
-                                    _jsx(Button, { className: classes.close, shape: "circular", variant: "text", color: "text", onClick: closeHandler, children: _jsx(Icon, { icon: faAnglesRight, style: {
+                                    _jsx(Button, { className: classes.close, shape: "circular", variant: "text", color: "text.secondary", onClick: closeHandler, children: _jsx(Icon, { icon: faAnglesRight, style: {
                                                 rotate: {
                                                     left: '180deg',
                                                     right: '0',

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

@@ -156,6 +156,7 @@ export const FormItem = ({ ref, wrapperRef, field, initialValue, label = '', rul
     if (noStyle || variant === 'plain') {
         return renderedChildren;
     }
-    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 }) })] }));
+    return (_jsxs(DescriptionItem, { flex: void 0, ...props, ref: wrapperRef, className: clsx(classes.item, props.className), label: !!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/dist/esm/components/inputBase/inputBase.js

@@ -9,7 +9,7 @@ import { Icon } from '../..';
 import { faCircleXmark } from '@fortawesome/free-solid-svg-icons/faCircleXmark';
 export const InputBase = (({ variant = 'outlined', size, shape, color = 'primary', children, prefix, suffix, onClear, loading, type, clearable = type !== 'number', 
 // 以下属性传递给<input/>
-min = -Infinity, max = Infinity, step, precision, placeholder, disabled, readOnly, autoFocus, defaultValue, value, onChange, ...props }) => {
+min, max, step, precision, placeholder, disabled, readOnly, autoFocus, defaultValue, value, onChange, ...props }) => {
     const theme = useTheme();
     size ??= theme.size;
     const innerInputRef = useRef(null);
@@ -73,6 +73,6 @@ min = -Infinity, max = Infinity, step, precision, placeholder, disabled, readOnl
                     onKeyDown: (e) => e.key === 'Enter' && blurHandler(e)
                 }) }), loading &&
                 _jsx(LoadingIndicator, {}), clearable && !disabled && !readOnly && (Array.isArray(innerValue.current) ? !!innerValue.current.length : !!innerValue.current) &&
-                _jsx(Button, { className: classes.clear, variant: "plain", color: "text.disabled", onClick: clear, children: _jsx(Icon, { icon: faCircleXmark }) }), !!suffix &&
+                _jsx(Button, { className: classes.clear, variant: "plain", color: "text.disabled", onClick: clear, tabIndex: -1, children: _jsx(Icon, { icon: faCircleXmark }) }), !!suffix &&
                 _jsx("div", { className: classes.suffix, children: suffix })] }));
 });

package/dist/esm/components/pagination/pager.js

@@ -49,5 +49,5 @@ export const PaginationPager = memo((props) => {
                     : renderPageButton(page + i - 5, i === 1 || i === 7);
         });
     };
-    return (_jsxs("div", { ...props, className: clsx(classes.pager, props.className), children: [_jsx(Button, { className: classes.button, variant: "text", size: size, color: "text", disabled: page === 1, onClick: () => onPageChange(page - 1), children: _jsx(Icon, { icon: faAngleLeft }) }), renderPageList(), _jsx(Button, { className: classes.button, variant: "text", size: size, color: "text", disabled: page === pageCount, onClick: () => onPageChange(page + 1), children: _jsx(Icon, { icon: faAngleRight }) })] }));
+    return (_jsxs("div", { ...props, className: clsx(classes.pager, props.className), children: [_jsx(Button, { className: classes.button, variant: "text", size: size, color: "text.secondary", disabled: page === 1, onClick: () => onPageChange(page - 1), children: _jsx(Icon, { icon: faAngleLeft }) }), renderPageList(), _jsx(Button, { className: classes.button, variant: "text", size: size, color: "text.secondary", disabled: page === pageCount, onClick: () => onPageChange(page + 1), children: _jsx(Icon, { icon: faAngleRight }) })] }));
 });

package/dist/esm/components/palette/palette.js

@@ -110,5 +110,5 @@ export const Palette = memo(({ defaultValue, value, onChange, gestureOptions, ..
                         }, ...draggableHandles })] }), _jsxs("div", { className: classes.slidersRow, children: [_jsxs("div", { className: classes.sliders, children: [_jsx(Slider, { ...sliderProps, className: classes.hue, value: colorObject.hue / 359 * 100, onChange: hueChangeHandler }), _jsx(Slider, { ...sliderProps, className: classes.alpha, renderRail: (_, railProps) => _jsxs("div", { ...railProps, children: [railProps.children, _jsx("div", { className: classes.alphaMask, style: { backgroundImage: `linear-gradient(90deg, transparent, ${colorObject.saturated})` } })] }), value: colorObject.alpha * 100, onChange: alphaChangeHandler })] }), _jsx("div", { className: classes.preview, children: _jsx("div", { className: classes.previewColor, style: {
                                 backgroundColor: colorObject.hex,
                                 opacity: colorObject.alpha
-                            } }) })] }), _jsxs("div", { className: classes.inputRow, children: [_jsx(Button, { variant: "plain", color: "text", suffix: _jsx(Icon, { icon: faChevronDown }), onClick: formatChangeHandler, children: availableFormat[activeFormat] }), renderInputs()] })] }));
+                            } }) })] }), _jsxs("div", { className: classes.inputRow, children: [_jsx(Button, { variant: "plain", color: "text.secondary", suffix: _jsx(Icon, { icon: faChevronDown }), onClick: formatChangeHandler, children: availableFormat[activeFormat] }), renderInputs()] })] }));
 });

package/dist/esm/components/pickerDialog/pickerDialog.js

@@ -67,6 +67,6 @@ options = rows ?? nodes, primaryKey = 'id', childrenKey = 'children', relation =
                 ...props.modalProps
             }, ...showSelectedList && {
                 [selectedListPlacement === 'left' ? 'prefix' : 'suffix']: (_jsxs("div", { className: classes.selectedArea, children: [_jsxs(Divider, { className: classes.count, textAlign: "start", children: [_jsxs("div", { children: ["\u5DF2\u9009\u62E9", _jsx("b", { children: selectedCount }), "\u9879"] }), clearable &&
-                                    _jsx(Button, { prefix: _jsx(Icon, { icon: faTrashCan }), variant: "plain", color: "text", onClick: () => setInnerValue(multiple ? [] : null), children: "\u6E05\u7A7A" })] }), _jsx(SelectedList, { itemProps: selectedItemProps, ...selectedListProps, className: clsx(classes.list, selectedListProps?.className) }), _jsx(Button, { className: classes.confirm, disabled: selectedCount === 0, onClick: () => confirmHandler(), children: "\u786E\u5B9A" })] }))
+                                    _jsx(Button, { prefix: _jsx(Icon, { icon: faTrashCan }), variant: "plain", color: "text.secondary", onClick: () => setInnerValue(multiple ? [] : null), children: "\u6E05\u7A7A" })] }), _jsx(SelectedList, { itemProps: selectedItemProps, ...selectedListProps, className: clsx(classes.list, selectedListProps?.className) }), _jsx(Button, { className: classes.confirm, disabled: selectedCount === 0, onClick: () => confirmHandler(), children: "\u786E\u5B9A" })] }))
             }, children: renderChildren() }) }));
 });

package/dist/esm/components/transitionBase/collapse.js

@@ -18,7 +18,7 @@ const Sweeping = ({ ref, in: _in = false, appear = true, orientation = 'vertical
     useEffect(() => {
         if (_in && size.current !== 'auto') {
             requestAnimationFrame(() => {
-                setSize(innerRef.current[orientation === 'vertical' ? 'scrollHeight' : 'scrollWidth']);
+                innerRef.current && setSize(innerRef.current[orientation === 'vertical' ? 'scrollHeight' : 'scrollWidth']);
             });
         }
     }, [_in]);

package/dist/esm/components/tree/treeNode.js

@@ -20,7 +20,7 @@ export const TreeNode = memo(({ value, label, prefix, suffix, disabled, _level =
         clickLabelToExpand && toggleExpanded?.(value);
     };
     const hasChildren = !!props.children && (!Array.isArray(props.children) || props.children.length > 0);
-    return (_jsxs(_Fragment, { children: [_jsxs("div", { ...props, className: clsx(classes.node, props.className), "data-selected": status === 2, "data-read-only": readOnly, "data-disabled": disabled, onClick: clickHandler, children: [Array(_level).fill(void 0).map((_, i) => _jsx("div", { className: classes.indent, style: { width: indent } }, i)), _jsx(Button, { className: classes.expand, variant: "plain", color: "text", onClick: e => {
+    return (_jsxs(_Fragment, { children: [_jsxs("div", { ...props, className: clsx(classes.node, props.className), "data-selected": status === 2, "data-read-only": readOnly, "data-disabled": disabled, onClick: clickHandler, children: [Array(_level).fill(void 0).map((_, i) => _jsx("div", { className: classes.indent, style: { width: indent } }, i)), _jsx(Button, { className: classes.expand, variant: "plain", color: "text.secondary", onClick: e => {
                             e.stopPropagation();
                             toggleExpanded?.(value);
                         }, children: renderExpandIcon

package/dist/esm/components/upload/imageItem.js

@@ -16,7 +16,7 @@ export const ImageItem = memo((props) => {
                 open: previewOpen,
                 onOpenChange: setPreviewOpen
             }, actions: [
-                _jsx(Button, { size: "small", variant: "text", shape: "circular", color: "text", onClick: () => setPreviewOpen(true), children: _jsx(Icon, { icon: faEye }) }, "preview"),
+                _jsx(Button, { size: "small", variant: "text", shape: "circular", color: "text.secondary", onClick: () => setPreviewOpen(true), children: _jsx(Icon, { icon: faEye }) }, "preview"),
                 _jsx(Button, { size: "small", variant: "text", shape: "circular", color: "error", onClick: props.onRemove, children: _jsx(Icon, { icon: faTrashCan }) }, "delete")
             ], children: status !== 'default' &&
                 _jsx("div", { className: clsx(classes.progress), children: _jsx(Progress, { variant: "circular", showInfo: status !== 'uploading', value: progress, status: status === 'uploading' ? 'processing' : status }) }) }) }));

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

@@ -10,6 +10,7 @@ export declare function columnsToFilterItem(columns?: (CurdColumn<any> | symbol)
 /**
  * 将Curd的Columns转换为FormItem
  * @param columns
+ * @param row
  */
 export declare function columnsToFormItem(columns?: (CurdColumn<any> | symbol)[], row?: Obj): CurdFormItemProps[] | undefined;
 /**

package/dist/esm/utils/curd.js

@@ -12,6 +12,7 @@ export function columnsToFilterItem(columns) {
 /**
  * 将Curd的Columns转换为FormItem
  * @param columns
+ * @param row
  */
 export function columnsToFormItem(columns, row) {
     return columnsTransfer(columns, 'form', row);
@@ -31,7 +32,7 @@ function columnsTransfer(columns, type = 'filter', row) {
             return item.key ? item : cloneElement(item, { key });
         }
         if (item === true) {
-            // filter为true当作空对象处理
+            // item为true当作空对象处理
             item = {};
         }
         if (typeof item === 'object') {
@@ -62,7 +63,7 @@ export function useCurdColumns({ columns, columnConfigurable }) {
     }
     let { defaultVisible, visible, onVisibleChange, defaultOrder, order, onOrderChange } = columnConfigurable;
     if (!defaultVisible || !defaultOrder) {
-        const defaultKeys = columns?.flatMap((col) => col._key ?? []) || [];
+        const defaultKeys = columns?.flatMap((col) => col.hideInTable ? [] : (col._key ?? [])) || [];
         defaultVisible ||= defaultKeys;
         defaultOrder ||= defaultKeys;
     }