yootd 0.0.7 → 0.0.8

package/dist/tabs/index.scss

@@ -1,61 +1,81 @@
-.yot-tabs {
-  &-large {
-    .ant-tabs-tab.ant-tabs-tab-active {
-      color: var(--ant-color-primary);
-    }
-    .ant-tabs-tab-btn {
-      font-size: var(--ant-font-size-lg);
-    }
-    .ant-tabs-nav-wrap {
-      background-color: white;
-      padding-left: var(--ant-padding-lg);
-      padding-right: var(--ant-padding-lg);
-    }
-  }
-  &-small {
-    .ant-tabs-tab.ant-tabs-tab-active {
-      color: var(--ant-color-primary);
-    }
-    .ant-tabs-tab-btn {
-      font-size: var(--ant-font-size);
-    }
-    .ant-tabs-nav-wrap {
-      background-color: white;
-      padding-left: var(--ant-padding);
-      padding-right: var(--ant-padding);
-    }
-  }
-  &-capsule {
-    &__content {
-      padding-top: var(--ant-margin);
-      padding-bottom: var(--ant-margin);
-      box-sizing: border-box;
-      background-color: white;
-      padding-left: var(--ant-padding-lg);
-      padding-right: var(--ant-padding-lg);
-    }
-    .ant-radio-button-wrapper.ant-radio-button-wrapper-checked.css-var-r4.ant-radio-css-var {
-      padding-left: var(--ant-padding);
-      padding-right: var(--ant-padding);
-      box-sizing: border-box;
-      font-size: var(--ant-font-size);
-      color: var(--ant-color-primary);
-    }
-    .ant-radio-button.ant-radio-button-checked {
-      font-size: var(--ant-font-size);
-      color: var(--ant-color-primary);
-    }
-    &__value {
-      font-size: 14px;
-      font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
-        'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji',
-        'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
-      color: #000000e0;
-    }
-  }
-  &-istabmargin {
-    .ant-tabs-nav {
-      margin-bottom: 0;
-    }
-  }
-}
+.yot-tabs {
+  &-large {
+    .ant-tabs-tab.ant-tabs-tab-active {
+      color: var(--ant-color-primary);
+    }
+    .ant-tabs-tab-btn {
+      font-size: var(--ant-font-size-lg);
+    }
+    .ant-tabs-nav-wrap {
+      background-color: white;
+      padding-left: 1.5rem;
+      padding-right: 1.5rem;
+    }
+    .ant-tabs-nav::before{
+      content: '';
+      position: absolute;
+      right: 1.5rem;
+      left: 1.5rem;
+      z-index: 10;
+      border-bottom-width: var(--ant-line-width);
+      border-bottom-style: solid;
+      border-bottom-color: #E5E5E5;
+    }
+  }
+  &-small {
+    .ant-tabs-tab.ant-tabs-tab-active {
+      color: var(--ant-color-primary);
+    }
+    .ant-tabs-tab-btn {
+      font-size: var(--ant-font-size);
+    }
+    .ant-tabs-nav-wrap {
+      background-color: white;
+      padding-left: 1.5rem;
+      padding-right: 1.5rem;
+    }
+    .ant-tabs-nav::before{
+      content: '';
+      position: absolute;
+      right: 1.5rem;
+      left: 1.5rem;
+      z-index: 10;
+      border-bottom-width: var(--ant-line-width);
+      border-bottom-style: solid;
+      border-bottom-color: #E5E5E5;
+    }
+  }
+  &-capsule {
+    &__content {
+      padding-top: var(--ant-margin);
+      padding-bottom: var(--ant-margin);
+      box-sizing: border-box;
+      background-color: white;
+      padding-left: var(--ant-padding-lg);
+      padding-right: var(--ant-padding-lg);
+    }
+    .ant-radio-button-wrapper.ant-radio-button-wrapper-checked.css-var-r4.ant-radio-css-var {
+      padding-left: var(--ant-padding);
+      padding-right: var(--ant-padding);
+      box-sizing: border-box;
+      font-size: var(--ant-font-size);
+      color: var(--ant-color-primary);
+    }
+    .ant-radio-button.ant-radio-button-checked {
+      font-size: var(--ant-font-size);
+      color: var(--ant-color-primary);
+    }
+    &__value {
+      font-size: 14px;
+      font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
+        'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji',
+        'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
+      color: #000000e0;
+    }
+  }
+  &-istabmargin {
+    .ant-tabs-nav {
+      margin-bottom: 0;
+    }
+  }
+}

package/dist/tag/index.d.ts

@@ -1,2 +1,5 @@
-export type { CheckableTagProps, TagProps } from 'antd/es/tag';
-export declare const Tag: import("antd").TagType;
+import type { TagProps } from 'antd';
+import React from 'react';
+import './index.scss';
+export type { TagProps };
+export declare const Tag: React.FC<TagProps>;

package/dist/tag/index.js

@@ -1,2 +1,13 @@
+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 _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure " + obj); }
 import { Tag as AntTag } from 'antd';
-export var Tag = AntTag;
+import React from 'react';
+import { useBem } from "../hooks/useBem";
+import "./index.scss";
+export var Tag = function Tag(_ref) {
+  var props = Object.assign({}, (_objectDestructuringEmpty(_ref), _ref));
+  var mb = useBem('tag');
+  return /*#__PURE__*/React.createElement(AntTag, _extends({
+    className: "".concat(mb.e('text'))
+  }, props));
+};

package/dist/tag/index.scss

@@ -0,0 +1,5 @@
+.yot-tag {
+    &__text {
+        font-weight: bold;
+    }
+}

package/dist/teacher/types/types.d.ts

@@ -1,31 +1,31 @@
-import { SelectProps } from 'yootd';
-
-export interface PageData<T> {
-  content: T[];
-  page: {
-    number: number;
-    size: number;
-    totalElements: number;
-    totalPages: number;
-  };
-}
-// 查询老师返回的数据类型
-export interface IteacherItem {
-  [key: string]: string | number;
-  userId: number; // 老师ID
-  personalName: string; // 老师姓名
-  personalMobile?: string; // 手机号
-  uniqueNumber?: string; // 工号
-  nationName?: string; // 民族
-  gender?: number; // 性别
-}
-type LabelOptions =
-  | 'personalName'
-  | 'uniqueNumber'
-  | 'personalMobile'
-  | 'nationName'
-  | 'genderName';
-export type TeacherProps = SelectProps & {
-  label?: LabelOptions[];
-  connectors?: string;
-};
+import { SelectProps } from 'yootd';
+
+export interface PageData<T> {
+  content: T[];
+  page: {
+    number: number;
+    size: number;
+    totalElements: number;
+    totalPages: number;
+  };
+}
+// 查询老师返回的数据类型
+export interface IteacherItem {
+  [key: string]: string | number;
+  userId: number; // 老师ID
+  personalName: string; // 老师姓名
+  personalMobile?: string; // 手机号
+  uniqueNumber?: string; // 工号
+  nationName?: string; // 民族
+  gender?: number; // 性别
+}
+type LabelOptions =
+  | 'personalName'
+  | 'uniqueNumber'
+  | 'personalMobile'
+  | 'nationName'
+  | 'genderName';
+export type TeacherProps = SelectProps & {
+  label?: LabelOptions[];
+  connectors?: string;
+};

package/dist/tree/index.scss

@@ -1,25 +1,25 @@
-.yot-tree {
-  .ant-tree-node-content-wrapper.ant-tree-node-selected {
-    background-color: var(--ant-color-primary-bg);
-    .ant-tree-title {
-      color: var(--ant-color-primary);
-    }
-  }
-  .ant-tree-node-content-wrapper {
-    .ant-tree-title {
-      color: var(--ant-color-text-secondary);
-    }
-  }
-  &__icon {
-    margin-top: 2px;
-    &.yot-is-selected {
-      .path-1 {
-        stroke: var(--ant-color-primary);
-      }
-      .path-2,
-      .rect-1 {
-        fill: var(--ant-color-primary);
-      }
-    }
-  }
-}
+.yot-tree {
+  .ant-tree-node-content-wrapper.ant-tree-node-selected {
+    background-color: var(--ant-color-primary-bg);
+    .ant-tree-title {
+      color: var(--ant-color-primary);
+    }
+  }
+  .ant-tree-node-content-wrapper {
+    .ant-tree-title {
+      color: var(--ant-color-text-secondary);
+    }
+  }
+  &__icon {
+    margin-top: 2px;
+    &.yot-is-selected {
+      .path-1 {
+        stroke: var(--ant-color-primary);
+      }
+      .path-2,
+      .rect-1 {
+        fill: var(--ant-color-primary);
+      }
+    }
+  }
+}

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,28 +127,20 @@ 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);
     });
     return false;
   }
   var onRemove = function onRemove(file) {
-    var _newFileList = fileList === null || fileList === void 0 ? void 0 : fileList.filter(function (item) {
+    var newFileList = fileList === null || fileList === void 0 ? void 0 : fileList.filter(function (item) {
       return item.uid !== file.uid;
     });
-    console.log('onRemove', _newFileList);
-    onChange === null || onChange === void 0 || onChange(_newFileList);
-    setFileList(_newFileList);
+    onChange === null || onChange === void 0 || onChange(newFileList);
+    // setFileList(newFileList);
   };
   function handlePreview(file) {
     if (file.url != null) {
@@ -161,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)
       });
@@ -189,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);
@@ -222,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: {