@ecoding/components.antd 0.4.22 → 0.4.24

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

@@ -12,8 +12,9 @@ import { Upload, Image as Img, Alert, Flex, message, Space } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import { buildURL } from "@ecoding/helper.url";
 import { DndContext, PointerSensor, useSensor } from '@dnd-kit/core';
-import { arrayMove, SortableContext, useSortable, horizontalListSortingStrategy, } from '@dnd-kit/sortable';
+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 { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({
         id: file.uid,
@@ -63,17 +64,25 @@ const MultipleImgUpload = (props) => {
         onChange && (onChange === null || onChange === void 0 ? void 0 : onChange(!isEmpty ? urls : undefined));
     };
     const handleChange = ({ fileList }) => {
-        fileList && fileList.forEach((item) => {
-            var _a, _b, _c;
-            if (item.status == "done" && (((_a = item.response) === null || _a === void 0 ? void 0 : _a.code) == 200 || ((_b = item.response) === null || _b === void 0 ? void 0 : _b.code) == 0) && ((_c = item.response) === null || _c === void 0 ? void 0 : _c.data)) {
-                item.url = item.response.data.url;
+        fileList && fileList.forEach((file) => {
+            if (file.status == "done") {
+                const response = file.response || {};
+                if (response.code === 200 ||
+                    response.code === 0 ||
+                    response.success ||
+                    response.successed) {
+                    const data = response.data || response.model;
+                    file.url = data.url;
+                }
+            }
+            else if (file.status === "error") {
+                Toast.error({
+                    mask: true,
+                    title: file.response ? file.response.msg || file.response.message : `${props.i18n ? props.i18n.$t('global.upload.error.img') : '服务出错，图片上传失败'}`
+                });
             }
         });
         updateItems(fileList);
-        // if (len) {
-        //     return;
-        // }
-        // updateItems(fileList)
     };
     const handleRemove = (file) => {
         const lefts = imgList.filter(item => item.uid !== file.uid);
@@ -222,7 +231,7 @@ const MultipleImgUpload = (props) => {
                         !((_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(SortableContext, { items: imgList === null || imgList === void 0 ? void 0 : imgList.map((i) => i.uid), strategy: horizontalListSortingStrategy },
+            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),
                 previewImage && (React.createElement(Img, { wrapperStyle: { display: 'none' }, preview: {
                         visible: previewOpen,

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

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { Flex, Alert, Space } from 'antd';
 import { DragOutlined } from '@ant-design/icons';
 import { DndContext, closestCenter, PointerSensor, useSensor, useSensors } from '@dnd-kit/core';
-import { arrayMove, SortableContext, horizontalListSortingStrategy, useSortable } from '@dnd-kit/sortable';
+import { arrayMove, SortableContext, rectSortingStrategy, useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
 import ImgUpload from '../single-img-upload';
 const SortableItem = (props) => {
@@ -120,7 +120,7 @@ const MultiPileImgUpload = (props) => {
                         !((_c = props.opts) === null || _c === void 0 ? void 0 : _c.minW) ? null : (React.createElement("span", null, props.i18n ? `${props.i18n.$t("global.minW", "最小宽")}：${props.opts.minW}` : `最小宽：${props.opts.minW}`)),
                         !((_d = props.opts) === null || _d === void 0 ? void 0 : _d.maxH) ? null : (React.createElement("span", null, props.i18n ? `${props.i18n.$t("global.maxH", "最大高")}：${props.opts.maxH}` : `最大高：${props.opts.maxH}`))))) : null)), type: "warning", showIcon: true })),
         React.createElement(DndContext, { sensors: sensors, collisionDetection: closestCenter, onDragEnd: handleDragEnd },
-            React.createElement(SortableContext, { items: items, strategy: horizontalListSortingStrategy },
+            React.createElement(SortableContext, { items: items, strategy: rectSortingStrategy },
                 React.createElement(Flex, { wrap: true, align: "start" }, items.map((item, index) => (React.createElement(SortableItem, Object.assign({}, props, { index: index, items: items, updateItems: updateItems, value: item.url, key: item.id, id: item.id })))))))));
 };
 MultiPileImgUpload.defaultProps = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ecoding/components.antd",
-    "version": "0.4.22",
+    "version": "0.4.24",
     "author": "cxc",
     "homepage": "",
     "license": "MIT",
@@ -47,5 +47,5 @@
         "antd": "^6.0.0",
         "axios": "^1.1.2"
     },
-    "gitHead": "92f998a40fb7a5d3f41530d8533ca3eed9fd22a0"
+    "gitHead": "fe2f4ed23efc30f329c9ca878e2f4928241a6e04"
 }