yootd 0.0.53 → 0.0.54

package/dist/dropdown-select/index.js

@@ -17,7 +17,7 @@ export var DropdownSelect = function DropdownSelect(_ref) {
   var _rest$overlayClassNam, _items$find$label, _items$find;
   var items = _ref.items,
     _ref$arrow = _ref.arrow,
-    arrow = _ref$arrow === void 0 ? true : _ref$arrow,
+    arrow = _ref$arrow === void 0 ? false : _ref$arrow,
     defaultValue = _ref.defaultValue,
     onChange = _ref.onChange,
     rest = _objectWithoutProperties(_ref, _excluded);

package/dist/dropdown-select/index.scss

@@ -1,6 +1,6 @@
 .yot-dropdownselect {
     .ant-dropdown-menu-item.ant-dropdown-menu-item-active{
-        background-color: #F0F8FF !important; 
+        background-color: #F0F8FF !important;
     }
 }
 

package/dist/go-back/components/GoBackIcon.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import { ISvgIconProps } from "../../utils/types";
+import './index.scss';
+export declare const GoBackIcon: React.ForwardRefExoticComponent<Omit<ISvgIconProps, "ref"> & React.RefAttributes<HTMLLIElement>>;

package/dist/go-back/components/GoBackIcon.js

@@ -0,0 +1,43 @@
+var _excluded = ["style", "className"];
+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 _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 React, { forwardRef } from 'react';
+import { useBem } from "../../hooks/useBem";
+import "./index.scss";
+export var GoBackIcon = /*#__PURE__*/forwardRef(function (_ref, ref) {
+  var style = _ref.style,
+    className = _ref.className,
+    rest = _objectWithoutProperties(_ref, _excluded);
+  var bem = useBem('goback-icon');
+  return /*#__PURE__*/React.createElement("svg", _extends({
+    ref: ref,
+    width: "16",
+    height: "16",
+    viewBox: "0 0 16 16",
+    fill: "none",
+    xmlns: "http://www.w3.org/2000/svg"
+  }, rest, {
+    style: style,
+    className: "".concat(bem, " ").concat(className !== null && className !== void 0 ? className : '')
+  }), /*#__PURE__*/React.createElement("g", {
+    id: "Group 1660"
+  }, /*#__PURE__*/React.createElement("g", {
+    id: "Rectangle 18755"
+  }, /*#__PURE__*/React.createElement("rect", {
+    width: "16",
+    height: "16",
+    rx: "8"
+  }), /*#__PURE__*/React.createElement("rect", {
+    width: "16",
+    height: "16",
+    rx: "8"
+  })), /*#__PURE__*/React.createElement("path", {
+    id: "Union",
+    fillRule: "evenodd",
+    clipRule: "evenodd",
+    d: "M3.47298 7.70007C3.28505 7.85003 3.28505 8.14997 3.47298 8.29993L6.76169 10.9243C6.99398 11.1097 7.32547 10.9334 7.32547 10.6244V9H11.6654C12.2176 9 12.6654 8.55228 12.6654 8C12.6654 7.44772 12.2177 7 11.6654 7H7.32547V5.3756C7.32547 5.06665 6.99398 4.8903 6.76169 5.07566L3.47298 7.70007Z",
+    fill: "white"
+  })));
+});
+GoBackIcon.displayName = 'GoBackIcon';

package/dist/go-back/components/index.scss

@@ -0,0 +1,5 @@
+.yot-goback-icon {
+  rect {
+    fill: var(--ant-color-primary);
+  }
+}

package/dist/go-back/index.d.ts

@@ -0,0 +1,7 @@
+import React, { CSSProperties } from 'react';
+import './index.scss';
+export interface GoBackProps {
+    style?: CSSProperties;
+    className?: string;
+}
+export declare const GoBack: (props: React.PropsWithChildren<GoBackProps>) => React.JSX.Element;

package/dist/go-back/index.js

@@ -0,0 +1,24 @@
+import React from 'react';
+import { useNavigate } from 'react-router-dom';
+import { useBem } from "../hooks/useBem";
+import { GoBackIcon } from "./components/GoBackIcon";
+import "./index.scss";
+export var GoBack = function GoBack(props) {
+  var style = props.style,
+    className = props.className,
+    children = props.children;
+  var navigate = useNavigate();
+  var bem = useBem('goback');
+  var handleClick = function handleClick() {
+    navigate(-1);
+  };
+  return /*#__PURE__*/React.createElement("div", {
+    className: "".concat(bem, " ").concat(className !== null && className !== void 0 ? className : ''),
+    style: style
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(bem.b('content')),
+    onClick: handleClick
+  }, /*#__PURE__*/React.createElement(GoBackIcon, null), /*#__PURE__*/React.createElement("span", {
+    className: "".concat(bem.b('content').e('title'))
+  }, "\u8FD4\u56DE")), children);
+};

package/dist/go-back/index.scss

@@ -0,0 +1,24 @@
+.yot-goback {
+  height: 59px;
+  background-color: #ffffff;
+  border-radius: 8px;
+  box-sizing: border-box;
+  padding: 0 24px;
+  display: flex;
+  align-items: center;
+
+  &-content {
+    width: fit-content;
+    max-width: 60px;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    cursor: pointer;
+
+    &__title {
+      font-size: 18px;
+      margin-left: 5px;
+      font-weight: bold;
+    }
+  }
+}

package/dist/index.d.ts

@@ -169,6 +169,8 @@ export type { UserDropdownProps } from './user-dropdown/types/types';
 export { ConfigProvider } from './config-provider';
 export type { ConfigProviderProps } from './config-provider';
 export { Zone } from './zones';
+export { GoBack } from './go-back';
+export type { GoBackProps } from './go-back';
 export { VideoPlayer } from './video-player';
 export type { VideoPlayerProps } from './video-player';
 export type { GetProp, GetProps, GetRef } from './utils/utils';

package/dist/index.js

@@ -91,4 +91,5 @@ export { Teacher } from "./teacher";
 export { UserDropdown } from "./user-dropdown";
 export { ConfigProvider } from "./config-provider";
 export { Zone } from "./zones";
+export { GoBack } from "./go-back";
 export { VideoPlayer } from "./video-player";

package/dist/year-term/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["type", "style", "showSearch", "value", "onChange", "allowClear", "placeholder"];
+var _excluded = ["type", "style", "showSearch", "value", "onChange", "allowClear", "placeholder", "responseType"];
 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."); }
@@ -25,6 +25,8 @@ export var YearTerm = function YearTerm(_ref) {
     _ref$allowClear = _ref.allowClear,
     allowClear = _ref$allowClear === void 0 ? true : _ref$allowClear,
     placeholder = _ref.placeholder,
+    _ref$responseType = _ref.responseType,
+    responseType = _ref$responseType === void 0 ? 'id' : _ref$responseType,
     rest = _objectWithoutProperties(_ref, _excluded);
   var mb = useBem('YearTerm');
   var request = useRequest();
@@ -70,7 +72,7 @@ export var YearTerm = function YearTerm(_ref) {
     });
   }, [yearData]);
 
-  // 将学期数据处理成下拉框
+  // 将学期数据处理成下拉框(responseType为id时)
   var termOptions = useMemo(function () {
     var _termData$content;
     return termData === null || termData === void 0 || (_termData$content = termData.content) === null || _termData$content === void 0 ? void 0 : _termData$content.map(function (item) {
@@ -80,6 +82,17 @@ export var YearTerm = function YearTerm(_ref) {
       };
     });
   }, [termData]);
+  // 将学期数据处理成对象形式（key:id,value:startDate,endDate）
+  var termOptionsTime = useMemo(function () {
+    var _termData$content2;
+    return termData === null || termData === void 0 || (_termData$content2 = termData.content) === null || _termData$content2 === void 0 ? void 0 : _termData$content2.reduce(function (acc, item) {
+      acc[item.termId] = {
+        startDate: item === null || item === void 0 ? void 0 : item.startDate,
+        endDate: item === null || item === void 0 ? void 0 : item.endDate
+      };
+      return acc;
+    }, {});
+  }, [termData]);
   // 第一个下拉框的placeholder
   var firstSelectPlaceholder = useMemo(function () {
     if (type === 'yearTerm' || type === 'year') {
@@ -121,14 +134,35 @@ export var YearTerm = function YearTerm(_ref) {
   var changeSecondSelect = function changeSecondSelect(value) {
     setTermId(value);
     if (type === 'yearTerm') {
-      onChange === null || onChange === void 0 || onChange({
-        yearId: yearId,
-        termId: value
-      });
+      if (responseType === 'id') {
+        onChange === null || onChange === void 0 || onChange({
+          yearId: yearId,
+          termId: value
+        });
+      } else if (responseType === 'time') {
+        var _termOptionsTime$valu, _termOptionsTime$valu2;
+        onChange === null || onChange === void 0 || onChange({
+          yearId: yearId,
+          termTime: {
+            startDate: termOptionsTime === null || termOptionsTime === void 0 || (_termOptionsTime$valu = termOptionsTime[value]) === null || _termOptionsTime$valu === void 0 ? void 0 : _termOptionsTime$valu.startDate,
+            endDate: termOptionsTime === null || termOptionsTime === void 0 || (_termOptionsTime$valu2 = termOptionsTime[value]) === null || _termOptionsTime$valu2 === void 0 ? void 0 : _termOptionsTime$valu2.endDate
+          }
+        });
+      }
     } else if (type === 'term') {
-      onChange === null || onChange === void 0 || onChange({
-        termId: value
-      });
+      if (responseType === 'id') {
+        onChange === null || onChange === void 0 || onChange({
+          termId: value
+        });
+      } else if (responseType === 'time') {
+        var _termOptionsTime$valu3, _termOptionsTime$valu4;
+        onChange === null || onChange === void 0 || onChange({
+          termTime: {
+            startDate: termOptionsTime === null || termOptionsTime === void 0 || (_termOptionsTime$valu3 = termOptionsTime[value]) === null || _termOptionsTime$valu3 === void 0 ? void 0 : _termOptionsTime$valu3.startDate,
+            endDate: termOptionsTime === null || termOptionsTime === void 0 || (_termOptionsTime$valu4 = termOptionsTime[value]) === null || _termOptionsTime$valu4 === void 0 ? void 0 : _termOptionsTime$valu4.endDate
+          }
+        });
+      }
     }
   };
   // 填充初始值

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

@@ -16,13 +16,20 @@ export interface IYearItem {
 export interface ITermItem {
   termId: number; // ID
   termName: string; // 学期名称
+  startDate: string; // 开始日期
+  endDate: string; // 结束日期
 }
 type YearTermProps = {
   type?: 'yearTerm' | 'year' | 'term';
+  responseType?: 'id' | 'time';
   style?: React.CSSProperties;
   showSearch?: boolean;
-  value?: Record<string, number>;
-  onChange?: (record: Record<string, number | undefined>) => void;
+  value?: { yearId?: number; termId?: number };
+  onChange?: (record: {
+    yearId?: number;
+    termId?: number;
+    termTime?: { startDate?: string; endDate?: string };
+  }) => void;
   allowClear?: boolean;
   placeholder?: string[];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yootd",
-  "version": "0.0.53",
+  "version": "0.0.54",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",
@@ -92,6 +92,7 @@
     "nanoid": ">=5.0.8",
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0",
+    "react-router-dom": ">=6.25.0",
     "yootd-webrtc-sdk": "^1.0.1"
   },
   "publishConfig": {