yootd 0.0.18 → 0.0.20

package/dist/empty/index.d.ts

@@ -3,7 +3,7 @@ import { Empty as AntEmpty } from 'antd';
 import { FC } from 'react';
 import './index.scss';
 export type EmptyProps = AntEmptyProps & {
-    type: 'noCollect' | 'noNews' | 'noNotice' | 'noSchedule' | 'noSearchData' | 'notFound' | 'submitFail' | 'submitSuccess';
+    type: 'emptyContent' | 'emptyData' | 'networkError' | 'notFound' | 'imageError' | 'noCollect' | 'noNews' | 'noNotice' | 'noSchedule' | 'noSearchData' | 'submitFail' | 'submitSuccess';
 };
 export type { TransferLocale } from 'antd/es/empty';
 type AntEmptyType = typeof AntEmpty;

package/dist/empty/index.js

@@ -7,6 +7,10 @@ import React, { useMemo } from 'react';
 import { useBem } from "../hooks/useBem";
 import "./index.scss";
 import NotFoundPage from "./assets/404.png";
+import EmptyContent from "./assets/empty-content.png";
+import EmptyData from "./assets/empty-data.png";
+import ImageError from "./assets/image-error.png";
+import NetworkError from "./assets/net-error.png";
 import NoCollect from "./assets/no-collect.png";
 import NoNews from "./assets/no-news.png";
 import NoNotice from "./assets/no-notice.png";
@@ -15,12 +19,16 @@ import NoSearchDate from "./assets/no-search-data.png";
 import SubmitFail from "./assets/submit-fail.png";
 import SubmitSuccess from "./assets/submit-success.png";
 var imageMap = {
+  emptyContent: EmptyContent,
+  emptyData: EmptyData,
+  networkError: NetworkError,
+  notFound: NotFoundPage,
+  imageError: ImageError,
   noCollect: NoCollect,
   noNews: NoNews,
   noNotice: NoNotice,
   noSchedule: NoSchedule,
   noSearchData: NoSearchDate,
-  notFound: NotFoundPage,
   submitFail: SubmitFail,
   submitSuccess: SubmitSuccess
 };

package/dist/school/index.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { SelectProps } from "..";
 import './index.scss';
 import { SchoolProps } from './types/types';
-export declare const School: React.FC<SchoolProps>;
+export declare const School: React.FC<SchoolProps & SelectProps>;

package/dist/school/index.js

@@ -1,4 +1,6 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var _excluded = ["type", "multiple", "style", "showSearch", "value", "onChange", "allowClear", "placeholder"];
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -10,6 +12,8 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { useQuery } from '@tanstack/react-query';
 import React, { useEffect, useMemo, useState } from 'react';
 import { Select } from "./..";
@@ -27,7 +31,8 @@ export var School = function School(_ref) {
     onChange = _ref.onChange,
     _ref$allowClear = _ref.allowClear,
     allowClear = _ref$allowClear === void 0 ? true : _ref$allowClear,
-    placeholder = _ref.placeholder;
+    placeholder = _ref.placeholder,
+    rest = _objectWithoutProperties(_ref, _excluded);
   var mb = useBem('School');
   var request = useRequest();
   // 选择的系部id
@@ -276,7 +281,7 @@ export var School = function School(_ref) {
   return /*#__PURE__*/React.createElement("div", {
     className: isSingle ? '' : "".concat(mb),
     style: isSingle ? {} : style
-  }, type === 'major' || type === 'class' ? null : /*#__PURE__*/React.createElement(Select, {
+  }, type === 'major' || type === 'class' ? null : /*#__PURE__*/React.createElement(Select, _extends({
     allowClear: allowClear,
     className: "".concat(mb.b('school-select')),
     value: type === 'collegeMajor' || type === 'college' ? collegeId : gradeId,
@@ -290,7 +295,7 @@ export var School = function School(_ref) {
     options: firstSelectOptions,
     onChange: changeFirstSelect,
     mode: type !== 'collegeMajor' && type !== 'gradeClass' ? multiple ? 'multiple' : undefined : undefined
-  }), type === 'college' || type === 'grade' ? null : /*#__PURE__*/React.createElement(Select, {
+  }, type !== 'collegeMajor' && type !== 'gradeClass' ? rest : {})), type === 'college' || type === 'grade' ? null : /*#__PURE__*/React.createElement(Select, _extends({
     allowClear: allowClear,
     value: type === 'collegeMajor' || type === 'major' ? majorId : classId,
     mode: type !== 'collegeMajor' && type !== 'gradeClass' ? multiple ? 'multiple' : undefined : undefined,
@@ -303,5 +308,5 @@ export var School = function School(_ref) {
     },
     options: secondSelectOptions,
     onChange: changeSecondSelect
-  }));
+  }, type !== 'collegeMajor' && type !== 'gradeClass' ? rest : {})));
 };

package/dist/upload/components/fileUpload.d.ts

@@ -7,6 +7,8 @@ declare const FileUpload: React.ForwardRefExoticComponent<import("antd").UploadP
     accept?: string | undefined;
     folder?: string | undefined;
     value?: UploadFile<any>[] | undefined;
+    widthPixels?: number | undefined;
+    heightPixels?: number | undefined;
     fileType?: "image" | "file" | undefined;
     onChange?: ((value?: UploadFile<any>[] | undefined) => void) | undefined;
 } & React.RefAttributes<UploadRef<any>>>;

package/dist/upload/components/imageUpload.d.ts

@@ -7,6 +7,8 @@ declare const ImageUpload: React.ForwardRefExoticComponent<import("antd").Upload
     accept?: string | undefined;
     folder?: string | undefined;
     value?: UploadFile<any>[] | undefined;
+    widthPixels?: number | undefined;
+    heightPixels?: number | undefined;
     fileType?: "image" | "file" | undefined;
     onChange?: ((value?: UploadFile<any>[] | undefined) => void) | undefined;
 } & React.RefAttributes<UploadRef<any>>>;

package/dist/upload/components/imageUpload.js

@@ -20,7 +20,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Upload as AntUpload } from 'antd';
 import React, { useEffect, useMemo, useState } from 'react';
-import { Image } from 'antd';
+import { Image as AntdImage } from 'antd';
 import { message } from "../..";
 import { useRequest } from "../../hooks/useRequest";
 import "../index.scss";
@@ -34,7 +34,9 @@ var InternalUpload = function InternalUpload(props, ref) {
     accept = props.accept,
     folder = props.folder,
     value = props.value,
-    onChange = props.onChange;
+    onChange = props.onChange,
+    widthPixels = props.widthPixels,
+    heightPixels = props.heightPixels;
   var mb = useBem('upload');
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -101,38 +103,65 @@ var InternalUpload = function InternalUpload(props, ref) {
         return false;
       }
     }
-    var formData = new FormData();
-    if (folder != null) {
-      formData.append('folder', folder);
-    }
-    formData.append('files', file);
-    formData.append('user_origin_name', 'true');
-    void request({
-      url: "/v1/file/multi-upload1",
-      method: 'post',
-      data: formData,
-      headers: {
-        'Content-Type': 'multipart/form-data'
-      }
-    }).then(function (res) {
-      var _fileList = Array.from([]);
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-expect-error
-      res === null || res === void 0 || res.forEach(function (item) {
-        _fileList.push({
-          name: file.name,
-          url: item.filename,
-          uid: file.uid,
-          preview: item.filename,
-          status: 'done'
+    // 校验图片尺寸
+    var reader = new FileReader();
+    reader.readAsDataURL(file);
+    reader.onload = function (e) {
+      var _e$target;
+      var image = new Image();
+      image.src = (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.result;
+      image.onload = function () {
+        if (widthPixels != null && heightPixels != null) {
+          if (image.width !== widthPixels || image.height !== heightPixels) {
+            void messageApi.warning("\u8BF7\u4E0A\u4F20\u5C3A\u5BF8\u4E3A".concat(widthPixels, "*").concat(heightPixels, "\u7684\u56FE\u7247"));
+            return;
+          }
+        } else if (widthPixels != null && heightPixels == null) {
+          if (image.width !== widthPixels) {
+            void messageApi.warning("\u8BF7\u4E0A\u4F20\u5BBD\u5EA6\u4E3A".concat(widthPixels, "\u7684\u56FE\u7247"));
+            return;
+          }
+        } else if (widthPixels == null && heightPixels != null) {
+          if (image.height !== heightPixels) {
+            void messageApi.warning("\u8BF7\u4E0A\u4F20\u9AD8\u5EA6\u4E3A".concat(heightPixels, "\u7684\u56FE\u7247"));
+            return;
+          }
+        }
+        // 图片尺寸符合要求，上传图片
+        var formData = new FormData();
+        if (folder != null) {
+          formData.append('folder', folder);
+        }
+        formData.append('files', file);
+        formData.append('user_origin_name', 'true');
+        void request({
+          url: "/v1/file/multi-upload1",
+          method: 'post',
+          data: formData,
+          headers: {
+            'Content-Type': 'multipart/form-data'
+          }
+        }).then(function (res) {
+          var _fileList = Array.from([]);
+          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+          // @ts-expect-error
+          res === null || res === void 0 || res.forEach(function (item) {
+            _fileList.push({
+              name: file.name,
+              url: item.filename,
+              uid: file.uid,
+              preview: item.filename,
+              status: 'done'
+            });
+          });
+          onChange === null || onChange === void 0 || onChange([].concat(_toConsumableArray(fileList), _fileList));
+          // setFileList([...fileList, ..._fileList]);
+        }).catch(function () {
+          var msg = '上传失败！';
+          void messageApi.error(msg);
         });
-      });
-      onChange === null || onChange === void 0 || onChange([].concat(_toConsumableArray(fileList), _fileList));
-      // setFileList([...fileList, ..._fileList]);
-    }).catch(function () {
-      var msg = '上传失败！';
-      void messageApi.error(msg);
-    });
+      };
+    };
     return false;
   }
   var onRemove = function onRemove(file) {
@@ -214,7 +243,7 @@ var InternalUpload = function InternalUpload(props, ref) {
     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, {
+  })) === 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(AntdImage, {
     wrapperStyle: {
       display: 'none'
     },

package/dist/upload/index.d.ts

@@ -7,6 +7,8 @@ export type UploadProps = AntUploadProps & {
     accept?: string;
     folder?: string;
     value?: UploadFile[];
+    widthPixels?: number;
+    heightPixels?: number;
     fileType?: 'file' | 'image';
     onChange?: (value?: UploadFile[]) => void;
 };
@@ -15,6 +17,8 @@ export declare const Upload: React.ForwardRefExoticComponent<AntUploadProps<any>
     accept?: string | undefined;
     folder?: string | undefined;
     value?: UploadFile<any>[] | undefined;
+    widthPixels?: number | undefined;
+    heightPixels?: number | undefined;
     fileType?: "image" | "file" | undefined;
     onChange?: ((value?: UploadFile[]) => void) | undefined;
 } & React.RefAttributes<UploadRef<any>>>;

package/dist/year-term/index.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { SelectProps } from "..";
 import './index.scss';
 import { YearTermProps } from './types/types';
-export declare const YearTerm: React.FC<YearTermProps>;
+export declare const YearTerm: React.FC<YearTermProps & SelectProps>;

package/dist/year-term/index.js

@@ -1,9 +1,13 @@
+var _excluded = ["type", "style", "showSearch", "value", "onChange", "allowClear", "placeholder"];
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { useQuery } from '@tanstack/react-query';
 import React, { useEffect, useMemo, useState } from 'react';
 import { Select } from "./..";
@@ -20,7 +24,8 @@ export var YearTerm = function YearTerm(_ref) {
     onChange = _ref.onChange,
     _ref$allowClear = _ref.allowClear,
     allowClear = _ref$allowClear === void 0 ? true : _ref$allowClear,
-    placeholder = _ref.placeholder;
+    placeholder = _ref.placeholder,
+    rest = _objectWithoutProperties(_ref, _excluded);
   var mb = useBem('YearTerm');
   var request = useRequest();
   // 选择的学年id
@@ -140,7 +145,7 @@ export var YearTerm = function YearTerm(_ref) {
   return /*#__PURE__*/React.createElement("div", {
     className: isSingle ? '' : "".concat(mb),
     style: isSingle ? {} : style
-  }, type === 'term' ? null : /*#__PURE__*/React.createElement(Select, {
+  }, type === 'term' ? null : /*#__PURE__*/React.createElement(Select, _extends({
     value: yearId,
     allowClear: allowClear,
     className: "".concat(mb.b('school-select')),
@@ -153,7 +158,7 @@ export var YearTerm = function YearTerm(_ref) {
     },
     options: allYearOptions,
     onChange: changeFirstSelect
-  }), type === 'year' ? null : /*#__PURE__*/React.createElement(Select, {
+  }, type !== 'yearTerm' ? rest : {})), type === 'year' ? null : /*#__PURE__*/React.createElement(Select, _extends({
     value: termId,
     allowClear: allowClear,
     showSearch: showSearch,
@@ -165,5 +170,5 @@ export var YearTerm = function YearTerm(_ref) {
     },
     options: termOptions,
     onChange: changeSecondSelect
-  }));
+  }, type !== 'yearTerm' ? rest : {})));
 };

package/package.json

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