@ecoding/components.antd 0.4.32 → 0.5.0

package/lib/core/multiple-img-upload/index.js

@@ -15,14 +15,14 @@ import { DndContext, PointerSensor, useSensor } from '@dnd-kit/core';
 import { arrayMove, SortableContext, useSortable, rectSortingStrategy, } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
 import Toast from "../../core/toast";
-const DraggableUploadListItem = ({ originNode, file }) => {
+const DraggableUploadListItem = ({ originNode, file, disabled }) => {
     const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({
         id: file.uid,
     });
     const style = {
         transform: CSS.Translate.toString(transform),
         transition,
-        cursor: 'move',
+        cursor: disabled ? 'not-allowed' : 'move',
         height: '102px',
         width: '102px',
     };
@@ -230,9 +230,9 @@ const MultipleImgUpload = (props) => {
                         !((_b = props.opts) === null || _b === void 0 ? void 0 : _b.maxW) ? null : (React.createElement("span", null, i18n ? `${i18n.$t("global.maxW", "最大宽")}：${props.opts.maxW}` : `最大宽：${props.opts.maxW}`)),
                         !((_c = props.opts) === null || _c === void 0 ? void 0 : _c.minH) ? null : (React.createElement("span", null, i18n ? `${i18n.$t("global.minH", "最小高")}：${props.opts.minH}` : `最小高：${props.opts.minH}`)),
                         !((_d = props.opts) === null || _d === void 0 ? void 0 : _d.maxH) ? null : (React.createElement("span", null, i18n ? `${i18n.$t("global.maxH", "最大高")}：${props.opts.maxH}` : `最大高：${props.opts.maxH}`))))) : null)), type: "warning", showIcon: true })),
-        React.createElement(DndContext, { sensors: [sensor], onDragEnd: onDragEnd },
+        React.createElement(DndContext, { sensors: disabled ? [] : [sensor], onDragEnd: disabled ? undefined : onDragEnd },
             React.createElement(SortableContext, { items: imgList === null || imgList === void 0 ? void 0 : imgList.map((i) => i.uid), strategy: rectSortingStrategy },
-                React.createElement(Upload, { listType: "picture-card", fileList: imgList, action: action, beforeUpload: beforeUpload, onPreview: handlePreview, onChange: handleChange, onRemove: handleRemove, name: name, data: props.data, multiple: true, disabled: disabled, withCredentials: true, itemRender: (originNode, file) => (React.createElement(DraggableUploadListItem, { originNode: originNode, file: file })) }, maxCount == 0 ? uploadButton : maxCount && imgList.length >= maxCount ? null : uploadButton),
+                React.createElement(Upload, { listType: "picture-card", fileList: imgList, action: action, beforeUpload: beforeUpload, onPreview: handlePreview, onChange: handleChange, onRemove: handleRemove, name: name, data: props.data, multiple: true, disabled: disabled, withCredentials: true, itemRender: (originNode, file) => (React.createElement(DraggableUploadListItem, { originNode: originNode, file: file, disabled: disabled })) }, maxCount == 0 ? uploadButton : maxCount && imgList.length >= maxCount ? null : uploadButton),
                 previewImage && (React.createElement(Img, { wrapperStyle: { display: 'none' }, preview: {
                         visible: previewOpen,
                         onVisibleChange: (visible) => setPreviewOpen(visible),

package/lib/core/table-pro/index.js

@@ -100,7 +100,7 @@ const TablePro = ({ className, header, buttonArea, filterArea, filters, searchIn
     useEffect(() => {
         if (tableRef.current && innerColumns.length > 0 && scrollY == '100%') {
             const thead = tableRef.current.querySelector('thead');
-            setTimeout(() => {
+            const runCalcHeight = () => {
                 if (offsetY && offsetY > 0) {
                     if (tableRef.current) {
                         setY(tableRef.current.clientHeight - offsetY);
@@ -111,9 +111,17 @@ const TablePro = ({ className, header, buttonArea, filterArea, filters, searchIn
                         setY(tableRef.current.clientHeight - (thead.clientHeight && thead.clientHeight + (pagination ? 64 : 20)));
                     }
                 }
-            }, 100);
+            };
+            if (typeof window !== 'undefined' && typeof window.requestAnimationFrame === 'function') {
+                window.requestAnimationFrame(() => {
+                    setTimeout(runCalcHeight, 100);
+                });
+            }
+            else {
+                setTimeout(runCalcHeight, 300);
+            }
         }
-    }, [header, loading, innerColumns]);
+    }, [header, loading, innerColumns, offsetY]);
     useEffect(() => {
         if (selectKeys && selectKeys.length > 0 && !isEqual(selectedRowKeys, selectKeys)) {
             setSelectedRowKeys(selectKeys);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ecoding/components.antd",
-    "version": "0.4.32",
+    "version": "0.5.0",
     "author": "cxc",
     "homepage": "",
     "license": "MIT",
@@ -47,5 +47,5 @@
         "antd": "^6.0.0",
         "axios": "^1.1.2"
     },
-    "gitHead": "cf8c284162bf81352e97c8ebc6e2d00741939543"
+    "gitHead": "5d9c405730775cb0373521dd2532b1918719eaa3"
 }