yootd 0.0.6 → 0.0.8

package/dist/upload/components/fileUpload.js

@@ -119,9 +119,7 @@ var InternalUpload = function InternalUpload(props, ref) {
       var filteredList = _fileList.filter(function (item) {
         return !(item.uid === file.uid && item.status === 'error');
       });
-      var filterError = _fileList.filter(function (item) {
-        return item.status === 'done';
-      });
+      // const filterError = _fileList.filter((item) => item.status === 'done');
       var _list = Array.from([]);
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-expect-error
@@ -134,16 +132,9 @@ var InternalUpload = function InternalUpload(props, ref) {
           status: 'done'
         });
       });
-      var _url = Array.from([]);
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-expect-error
-      fileList === null || fileList === void 0 || fileList.map(function (item) {
-        return _url.push(item.preview);
-      });
-      onChange === null || onChange === void 0 || onChange([].concat(_toConsumableArray(filterError), _list));
-      setFileList([].concat(_toConsumableArray(filteredList), _list));
+      onChange === null || onChange === void 0 || onChange([].concat(_toConsumableArray(filteredList), _list));
+      // setFileList([...filteredList, ..._list]);
     }).catch(function () {
-      // const msg = e?.response?.data?.[0]?.message;
       var _fileList = Array.from([]);
       _fileList.push({
         name: file.name,
@@ -155,7 +146,8 @@ var InternalUpload = function InternalUpload(props, ref) {
         type: file.type,
         originFileObj: file
       });
-      setFileList([].concat(_toConsumableArray(fileList), _fileList));
+      onChange === null || onChange === void 0 || onChange([].concat(_toConsumableArray(fileList), _fileList));
+      // setFileList([...fileList, ..._fileList]);
       var msg = '上传失败！';
       void messageApi.error(msg);
     });
@@ -166,7 +158,7 @@ var InternalUpload = function InternalUpload(props, ref) {
       return item.uid !== file.uid;
     });
     onChange === null || onChange === void 0 || onChange(newFileList);
-    setFileList(newFileList);
+    // setFileList(newFileList);
   };
   var ReUpload = function ReUpload(file) {
     if (file.originFileObj) {
@@ -186,28 +178,24 @@ var InternalUpload = function InternalUpload(props, ref) {
     }
   }
   var newFileList = useMemo(function () {
-    return fileList != null && fileList !== null && fileList !== void 0 && fileList.every(function (item) {
-      return item.url;
-    }) ? fileList === null || fileList === void 0 ? void 0 : fileList.map(function (item) {
+    return fileList != null ? fileList === null || fileList === void 0 ? void 0 : fileList.map(function (item) {
       return _objectSpread(_objectSpread({}, item), {}, {
         url: "".concat(assetsURL, "/").concat(item.url)
       });
     }) : [];
   }, [fileList]);
   useEffect(function () {
-    if (value != null && fileList.length === 0 && Array.isArray(value)) {
-      var _value$filter;
+    if (value != null) {
       var _fileList = Array.from([]);
-      value === null || value === void 0 || (_value$filter = value.filter(function (item) {
-        return item.url != null;
-      })) === null || _value$filter === void 0 || _value$filter.map(function (item) {
-        return _fileList.push({
-          uid: "".concat(Date.now(), ".fileUid"),
+      value === null || value === void 0 || value.map(function (item, index) {
+        var _item$uid, _item$status;
+        return _fileList.push(_objectSpread(_objectSpread({}, item), {}, {
+          uid: (_item$uid = item.uid) !== null && _item$uid !== void 0 ? _item$uid : "".concat(Date.now(), "-").concat(index),
           name: item.name,
-          status: 'done',
+          status: (_item$status = item.status) !== null && _item$status !== void 0 ? _item$status : 'done',
           url: item.url,
           preview: item.url
-        });
+        }));
       });
       setFileList(_fileList);
     }
@@ -250,7 +238,9 @@ var InternalUpload = function InternalUpload(props, ref) {
       },
       showRemoveIcon: false
     }
-  }, props), (fileList === null || fileList === void 0 || (_fileList$filter = fileList.filter(function (item) {
+  }, props, {
+    onChange: undefined
+  }), (fileList === null || fileList === void 0 || (_fileList$filter = fileList.filter(function (item) {
     return item.url != null;
   })) === null || _fileList$filter === void 0 ? void 0 : _fileList$filter.length) >= (maxCount != null ? maxCount : 1) ? null : uploadButton));
 };

package/dist/upload/components/imageUpload.js

@@ -127,16 +127,9 @@ var InternalUpload = function InternalUpload(props, ref) {
           status: 'done'
         });
       });
-      var _url = Array.from([]);
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-expect-error
-      fileList === null || fileList === void 0 || fileList.map(function (item) {
-        return _url.push(item.preview);
-      });
       onChange === null || onChange === void 0 || onChange([].concat(_toConsumableArray(fileList), _fileList));
-      setFileList([].concat(_toConsumableArray(fileList), _fileList));
+      // setFileList([...fileList, ..._fileList]);
     }).catch(function () {
-      // const msg = e?.response?.data?.[0]?.message;
       var msg = '上传失败！';
       void messageApi.error(msg);
     });
@@ -147,7 +140,7 @@ var InternalUpload = function InternalUpload(props, ref) {
       return item.uid !== file.uid;
     });
     onChange === null || onChange === void 0 || onChange(newFileList);
-    setFileList(newFileList);
+    // setFileList(newFileList);
   };
   function handlePreview(file) {
     if (file.url != null) {
@@ -160,9 +153,7 @@ var InternalUpload = function InternalUpload(props, ref) {
     }
   }
   var newFileList = useMemo(function () {
-    return fileList != null && fileList !== null && fileList !== void 0 && fileList.every(function (item) {
-      return item.url;
-    }) ? fileList === null || fileList === void 0 ? void 0 : fileList.map(function (item) {
+    return fileList != null ? fileList === null || fileList === void 0 ? void 0 : fileList.map(function (item) {
       return _objectSpread(_objectSpread({}, item), {}, {
         url: "".concat(assetsURL, "/").concat(item.url)
       });
@@ -188,18 +179,16 @@ var InternalUpload = function InternalUpload(props, ref) {
     }
   };
   useEffect(function () {
-    if (value != null && fileList.length === 0 && Array.isArray(value)) {
-      var _value$filter;
+    if (value != null) {
       var _fileList = Array.from([]);
-      value === null || value === void 0 || (_value$filter = value.filter(function (item) {
-        return item.url != null;
-      })) === null || _value$filter === void 0 || _value$filter.map(function (item) {
+      value === null || value === void 0 || value.map(function (items, index) {
+        var _items$uid, _items$status;
         return _fileList.push({
-          uid: "".concat(Date.now(), ".fileUid"),
-          name: item.name,
-          status: 'done',
-          url: item.url,
-          preview: item.url
+          uid: (_items$uid = items.uid) !== null && _items$uid !== void 0 ? _items$uid : "".concat(Date.now(), "-").concat(index),
+          name: items.name,
+          status: (_items$status = items.status) !== null && _items$status !== void 0 ? _items$status : 'done',
+          url: items.url,
+          preview: items.url
         });
       });
       setFileList(_fileList);
@@ -221,7 +210,9 @@ var InternalUpload = function InternalUpload(props, ref) {
     accept: accept,
     maxCount: maxCount,
     itemRender: itemRender
-  }, props), (fileList === null || fileList === void 0 || (_fileList$filter = fileList.filter(function (item) {
+  }, props, {
+    onChange: undefined
+  }), (fileList === null || fileList === void 0 || (_fileList$filter = fileList.filter(function (item) {
     return item.url != null;
   })) === null || _fileList$filter === void 0 ? void 0 : _fileList$filter.length) >= (maxCount != null ? maxCount : 1) ? null : uploadButton), (previewFile === null || previewFile === void 0 ? void 0 : previewFile.url) != null ? /*#__PURE__*/React.createElement(Image, {
     wrapperStyle: {

package/dist/user-dropdown/types/types.d.ts

@@ -1,45 +1,45 @@
-import { SelectProps } from 'yootd';
-
-export interface PageData<T> {
-  content: T[];
-  page: {
-    number: number;
-    size: number;
-    totalElements: number;
-    totalPages: number;
-  };
-}
-type LabelOptions =
-  | 'uniqueNumber'
-  | 'personalName'
-  | 'majorName'
-  | 'collegeMajorName'
-  | 'className'
-  | 'gradeName'
-  | 'genderName'
-  | 'deptName'
-  | 'credentialsNo'
-  | 'personalMobile';
-export type UserDropdownProps = SelectProps & {
-  type?: number; // 1:学生2:教师3:职工
-  label?: LabelOptions[];
-  connectors?: string;
-  teacher_id?: number;
-};
-export interface IuserItem {
-  userId: string; // ID
-  uniqueNumber?: string; // 学号/工号
-  personalName: string; // 姓名
-  personalPhoto?: string; // 照片
-  userFaceType?: number; // 人脸类型(1白名单2黑名单3红名单)
-  majorName?: string; // 专业名称
-  collegeMajorName?: string; // 院系名称
-  className?: string; // 班级名称
-  gradeName?: string; // 年级名称
-  genderName?: string; // 性别
-  deptId?: number; // 部门ID
-  deptName?: string; // 部门名称
-  gender?: number; // 性别
-  credentialsNo?: string; // 证件号
-  personalMobile?: string; // 手机号
-}
+import { SelectProps } from 'yootd';
+
+export interface PageData<T> {
+  content: T[];
+  page: {
+    number: number;
+    size: number;
+    totalElements: number;
+    totalPages: number;
+  };
+}
+type LabelOptions =
+  | 'uniqueNumber'
+  | 'personalName'
+  | 'majorName'
+  | 'collegeMajorName'
+  | 'className'
+  | 'gradeName'
+  | 'genderName'
+  | 'deptName'
+  | 'credentialsNo'
+  | 'personalMobile';
+export type UserDropdownProps = SelectProps & {
+  type?: number; // 1:学生2:教师3:职工
+  label?: LabelOptions[];
+  connectors?: string;
+  teacher_id?: number;
+};
+export interface IuserItem {
+  userId: string; // ID
+  uniqueNumber?: string; // 学号/工号
+  personalName: string; // 姓名
+  personalPhoto?: string; // 照片
+  userFaceType?: number; // 人脸类型(1白名单2黑名单3红名单)
+  majorName?: string; // 专业名称
+  collegeMajorName?: string; // 院系名称
+  className?: string; // 班级名称
+  gradeName?: string; // 年级名称
+  genderName?: string; // 性别
+  deptId?: number; // 部门ID
+  deptName?: string; // 部门名称
+  gender?: number; // 性别
+  credentialsNo?: string; // 证件号
+  personalMobile?: string; // 手机号
+}

package/dist/zones/types/types.d.ts

@@ -1,26 +1,26 @@
-export interface PageData<T> {
-  content: T[];
-  page: {
-    number: number;
-    size: number;
-    totalElements: number;
-    totalPages: number;
-  };
-}
-
-export interface ZoneItem {
-  zoneId: string; // 区域ID
-  zoneName: string; // 区域名称
-  zoneLevel: number; // 区域等级(1全国2省级3市级4区级)
-  zoneLevel1Id: string;
-  zoneLevel2Id: string;
-}
-export interface ZoneProps {
-  zoneLevel?: 'province' | 'city' | 'district';
-  value?: string[];
-  onChange?: (zoneIds: string[]) => void;
-  style?: React.CSSProperties;
-  placeholder?: string[];
-  allowClear?: boolean;
-  showSearch?: boolean;
-}
+export interface PageData<T> {
+  content: T[];
+  page: {
+    number: number;
+    size: number;
+    totalElements: number;
+    totalPages: number;
+  };
+}
+
+export interface ZoneItem {
+  zoneId: string; // 区域ID
+  zoneName: string; // 区域名称
+  zoneLevel: number; // 区域等级(1全国2省级3市级4区级)
+  zoneLevel1Id: string;
+  zoneLevel2Id: string;
+}
+export interface ZoneProps {
+  zoneLevel?: 'province' | 'city' | 'district';
+  value?: string[];
+  onChange?: (zoneIds: string[]) => void;
+  style?: React.CSSProperties;
+  placeholder?: string[];
+  allowClear?: boolean;
+  showSearch?: boolean;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yootd",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",