yootd 0.0.52 → 0.0.54

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/index.scss

@@ -1,21 +1,21 @@
-.yot-YearTerm {
-  border: var(--ant-line-width) var(--ant-line-type) var(--ant-color-border);
-  border-radius: var(--ant-border-radius);
-  &-school-select::after {
-    content: '';
-    position: absolute;
-    right: 0;
-    top: 50%; /* 从中间开始 */
-    width: 1px; /* 边框宽度 */
-    height: 50%; /* 设为盒子高度的百分之五十 */
-    background-color: var(--ant-color-border); /* 边框颜色 */
-    transform: translateY(-50%);
-  }
-  .ant-select.ant-select-outlined.css-var-yootd.ant-select-css-var.ant-select-single.ant-select-allow-clear.ant-select-show-arrow {
-    .ant-select-selector {
-      padding-left: var(--ant-padding);
-      padding-right: var(--ant-padding);
-      border: 0;
-    }
-  }
-}
+.yot-YearTerm {
+  border: var(--ant-line-width) var(--ant-line-type) var(--ant-color-border);
+  border-radius: var(--ant-border-radius);
+  &-school-select::after {
+    content: '';
+    position: absolute;
+    right: 0;
+    top: 50%; /* 从中间开始 */
+    width: 1px; /* 边框宽度 */
+    height: 50%; /* 设为盒子高度的百分之五十 */
+    background-color: var(--ant-color-border); /* 边框颜色 */
+    transform: translateY(-50%);
+  }
+  .ant-select.ant-select-outlined.css-var-yootd.ant-select-css-var.ant-select-single.ant-select-allow-clear.ant-select-show-arrow {
+    .ant-select-selector {
+      padding-left: var(--ant-padding);
+      padding-right: var(--ant-padding);
+      border: 0;
+    }
+  }
+}

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

@@ -1,28 +1,35 @@
-export interface PageData<T> {
-  content: T[];
-  page: {
-    number: number;
-    size: number;
-    totalElements: number;
-    totalPages: number;
-  };
-}
-// 查询学年返回的数据类型
-export interface IYearItem {
-  id: number; // ID
-  yearName: string; // 学年名称
-}
-// 查询学期返回的数据类型
-export interface ITermItem {
-  termId: number; // ID
-  termName: string; // 学期名称
-}
-type YearTermProps = {
-  type?: 'yearTerm' | 'year' | 'term';
-  style?: React.CSSProperties;
-  showSearch?: boolean;
-  value?: Record<string, number>;
-  onChange?: (record: Record<string, number | undefined>) => void;
-  allowClear?: boolean;
-  placeholder?: string[];
-};
+export interface PageData<T> {
+  content: T[];
+  page: {
+    number: number;
+    size: number;
+    totalElements: number;
+    totalPages: number;
+  };
+}
+// 查询学年返回的数据类型
+export interface IYearItem {
+  id: number; // ID
+  yearName: string; // 学年名称
+}
+// 查询学期返回的数据类型
+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?: { yearId?: number; termId?: number };
+  onChange?: (record: {
+    yearId?: number;
+    termId?: number;
+    termTime?: { startDate?: string; endDate?: string };
+  }) => void;
+  allowClear?: boolean;
+  placeholder?: string[];
+};

package/dist/zones/index.module.scss

@@ -1,23 +1,23 @@
-.content {
-  border: var(--ant-line-width) var(--ant-line-type) var(--ant-color-border);
-  border-radius: var(--ant-border-radius);
-  :global {
-    .zone-select::after {
-      content: '';
-      position: absolute;
-      right: 0;
-      top: 50%; /* 从中间开始 */
-      width: 1px; /* 边框宽度 */
-      height: 50%; /* 设为盒子高度的百分之五十 */
-      background-color: var(--ant-color-border); /* 边框颜色 */
-      transform: translateY(-50%);
-    }
-    .ant-select.ant-select-outlined.css-var-yootd.ant-select-css-var.ant-select-single.ant-select-show-arrow {
-      .ant-select-selector {
-        padding-left: var(--ant-padding);
-        padding-right: var(--ant-padding);
-        border: 0;
-      }
-    }
-  }
-}
+.content {
+  border: var(--ant-line-width) var(--ant-line-type) var(--ant-color-border);
+  border-radius: var(--ant-border-radius);
+  :global {
+    .zone-select::after {
+      content: '';
+      position: absolute;
+      right: 0;
+      top: 50%; /* 从中间开始 */
+      width: 1px; /* 边框宽度 */
+      height: 50%; /* 设为盒子高度的百分之五十 */
+      background-color: var(--ant-color-border); /* 边框颜色 */
+      transform: translateY(-50%);
+    }
+    .ant-select.ant-select-outlined.css-var-yootd.ant-select-css-var.ant-select-single.ant-select-show-arrow {
+      .ant-select-selector {
+        padding-left: var(--ant-padding);
+        padding-right: var(--ant-padding);
+        border: 0;
+      }
+    }
+  }
+}

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.52",
+  "version": "0.0.54",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",
@@ -92,8 +92,8 @@
     "nanoid": ">=5.0.8",
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0",
-    "yootd-webrtc-sdk": "^1.0.1",
-    "react-router-dom": ">=6.25.0"
+    "react-router-dom": ">=6.25.0",
+    "yootd-webrtc-sdk": "^1.0.1"
   },
   "publishConfig": {
     "access": "public"