yootd 0.0.33 → 0.0.35

package/dist/date-interval/index.d.ts

@@ -9,7 +9,7 @@ export type DateIntervalProps = AntdDatePickerProps & {
     }[];
     value?: {
         date: dayjs.Dayjs;
-        type: string;
+        type: PickerType;
     };
     onChange?: (record: {
         date: dayjs.Dayjs;

package/dist/date-interval/index.js

@@ -9,7 +9,8 @@ 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 { DatePicker as AntdDatePicker, Select } from 'antd';
-import React, { useMemo, useState } from 'react';
+import dayjs from 'dayjs';
+import React, { useEffect, useMemo, useState } from 'react';
 export var DateInterval = function DateInterval(_ref) {
   var _options$;
   var options = _ref.options,
@@ -20,13 +21,19 @@ export var DateInterval = function DateInterval(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     type = _useState2[0],
     setType = _useState2[1];
+  var _useState3 = useState((value === null || value === void 0 ? void 0 : value.date) || dayjs()),
+    _useState4 = _slicedToArray(_useState3, 2),
+    date = _useState4[0],
+    setDate = _useState4[1];
   var onChangeDate = function onChangeDate(date) {
+    setDate(date);
     onChange === null || onChange === void 0 || onChange({
       date: date,
       type: type
     });
   };
   var onChangeTime = function onChangeTime(date) {
+    setDate(date);
     onChange === null || onChange === void 0 || onChange({
       date: date,
       type: type
@@ -34,7 +41,18 @@ export var DateInterval = function DateInterval(_ref) {
   };
   var handleSelectChange = function handleSelectChange(e) {
     setType(e);
+    onChange === null || onChange === void 0 || onChange({
+      date: date,
+      type: e
+    });
   };
+  // 设置初始值
+  useEffect(function () {
+    if (value != null) {
+      setType(value.type);
+      setDate(value.date);
+    }
+  }, [value]);
   var datePickerMap = useMemo(function () {
     return {
       time: /*#__PURE__*/React.createElement(AntdDatePicker.TimePicker, _extends({}, props, {

package/dist/date-picker/index.d.ts

@@ -1,4 +1,3 @@
-import { type DatePickerProps as AntDatePickerProps } from 'antd';
-import { FC } from 'react';
+import type { DatePickerProps as AntDatePickerProps } from 'antd';
 export type DatePickerProps = AntDatePickerProps;
-export declare const DatePicker: FC<DatePickerProps>;
+export declare const DatePicker: import("antd/es/date-picker").DatePickerType;

package/dist/date-picker/index.js

@@ -1,5 +1,2 @@
 import { DatePicker as AntDatePicker } from 'antd';
-import React from 'react';
-export var DatePicker = function DatePicker(props) {
-  return /*#__PURE__*/React.createElement(AntDatePicker, props);
-};
+export var DatePicker = AntDatePicker;

package/dist/date-range/index.js

@@ -9,7 +9,8 @@ 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 { DatePicker, Select, TimePicker } from 'antd';
-import React, { useMemo, useState } from 'react';
+import dayjs from 'dayjs';
+import React, { useEffect, useMemo, useState } from 'react';
 export var DateRange = function DateRange(_ref) {
   var _options$;
   var options = _ref.options,
@@ -20,7 +21,12 @@ export var DateRange = function DateRange(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     type = _useState2[0],
     setType = _useState2[1];
+  var _useState3 = useState((value === null || value === void 0 ? void 0 : value.dates) || [dayjs(), dayjs()]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    dates = _useState4[0],
+    setDates = _useState4[1];
   var onChangeDate = function onChangeDate(dates) {
+    setDates(dates);
     onChange === null || onChange === void 0 || onChange({
       dates: dates,
       type: type
@@ -82,7 +88,18 @@ export var DateRange = function DateRange(_ref) {
   }, [type]);
   var handleSelectChange = function handleSelectChange(e) {
     setType(e);
+    onChange === null || onChange === void 0 || onChange({
+      dates: dates,
+      type: e
+    });
   };
+  // 设置初始值
+  useEffect(function () {
+    if (value != null) {
+      setType(value.type);
+      setDates(value.dates);
+    }
+  }, [value]);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Select, {
     value: type,
     style: {

package/dist/modal/components/header-icon.js

@@ -30,17 +30,5 @@ export var HeaderIcon = function HeaderIcon(_ref) {
     fillRule: "evenodd",
     clipRule: "evenodd",
     d: "M22.9552 13C22.9848 12.6706 23 12.3371 23 12C23 5.92487 18.0751 1 12 1C5.92487 1 1 5.92487 1 12C1 12.3371 1.01516 12.6706 1.04484 13H22.9552Z"
-  })), /*#__PURE__*/React.createElement("defs", null, /*#__PURE__*/React.createElement("linearGradient", {
-    id: "paint0_linear_589_9609",
-    x1: "132.5",
-    y1: "0",
-    x2: "132.5",
-    y2: "56",
-    gradientUnits: "userSpaceOnUse"
-  }, /*#__PURE__*/React.createElement("stop", {
-    className: "stop-color-1"
-  }), /*#__PURE__*/React.createElement("stop", {
-    className: "stop-color-2",
-    offset: "1"
-  }))));
+  })));
 };

package/dist/modal/index.js

@@ -17,7 +17,21 @@ var ModalComponent = function ModalComponent(_ref) {
 
   // title content block
   var tcb = mb.b('title').b('content');
-  return /*#__PURE__*/React.createElement(AntModal, _extends({}, rest, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("svg", {
+    className: "".concat(mb.e('color-defs'))
+  }, /*#__PURE__*/React.createElement("defs", null, /*#__PURE__*/React.createElement("linearGradient", {
+    id: "paint0_linear_589_9609",
+    x1: "132.5",
+    y1: "0",
+    x2: "132.5",
+    y2: "56",
+    gradientUnits: "userSpaceOnUse"
+  }, /*#__PURE__*/React.createElement("stop", {
+    className: "stop-color-1"
+  }), /*#__PURE__*/React.createElement("stop", {
+    className: "stop-color-2",
+    offset: "1"
+  })))), /*#__PURE__*/React.createElement(AntModal, _extends({}, rest, {
     className: "".concat(mb, " ").concat(className !== null && className !== void 0 ? className : ''),
     title: /*#__PURE__*/React.createElement("div", {
       className: "".concat(tcb)
@@ -26,7 +40,7 @@ var ModalComponent = function ModalComponent(_ref) {
     }), /*#__PURE__*/React.createElement("div", {
       className: "".concat(tcb.e('body'))
     }, title))
-  }), children);
+  }), children));
 };
 export var Modal = ModalComponent;
 Modal.useModal = AntModal.useModal;

package/dist/modal/index.scss

@@ -1,65 +1,73 @@
-.yot-modal {
-  padding-top: 13px;
-  position: relative;
-  max-width: calc(2 / 3 * 100vw) !important;
-
-  & > div:first-child {
-    box-sizing: border-box;
-    padding: 4px;
-    background: linear-gradient(180deg, #3a8cff 0%, #c4ddff 100%);
-    border-radius: 24px;
-  }
-
-  .ant-modal-header {
-    width: 100%;
-    position: absolute;
-    left: 0;
-    top: -13px;
-    background-color: transparent;
-  }
-
-  .ant-modal-content {
-    padding: var(--ant-margin-xl);
-    padding-top: 71px;
-    border-radius: 24px;
-  }
-
-  .ant-modal-body {
-    max-height: 529px;
-    overflow-y: auto;
-  }
-
-  .ant-modal-footer {
-    margin-top: 40px;
-  }
-
-  &-title {
-    &-content {
-      width: 100%;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-
-      &__body {
-        position: absolute;
-        color: var(--ant-color-bg-base);
-        font-size: var(--ant-font-size-heading-3);
-      }
-
-      &__icon {
-        .path-1 {
-          fill: var(--yot-modal-color-tertiary);
-        }
-        .path-2 {
-          fill: var(--yot-modal-color-tertiary);
-        }
-        .stop-color-1 {
-          stop-color: var(--yot-modal-color-secondary);
-        }
-        .stop-color-2 {
-          stop-color: var(--yot-modal-color-primary);
-        }
-      }
-    }
-  }
-}
+.yot-modal {
+  padding-top: 13px;
+  position: relative;
+  max-width: calc(2 / 3 * 100vw) !important;
+
+  & > div:first-child {
+    box-sizing: border-box;
+    padding: 4px;
+    background: linear-gradient(180deg, #3a8cff 0%, #c4ddff 100%);
+    border-radius: 24px;
+  }
+
+  .ant-modal-header {
+    width: 100%;
+    position: absolute;
+    left: 0;
+    top: -13px;
+    background-color: transparent;
+  }
+
+  .ant-modal-content {
+    padding: var(--ant-margin-xl);
+    padding-top: 71px;
+    border-radius: 24px;
+  }
+
+  .ant-modal-body {
+    max-height: 529px;
+    overflow-y: auto;
+  }
+
+  .ant-modal-footer {
+    margin-top: 40px;
+  }
+
+  &-title {
+    &-content {
+      width: 100%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+
+      &__body {
+        position: absolute;
+        color: var(--ant-color-bg-base);
+        font-size: var(--ant-font-size-heading-3);
+      }
+
+      &__icon {
+        .path-1 {
+          fill: var(--yot-modal-color-tertiary);
+        }
+        .path-2 {
+          fill: var(--yot-modal-color-tertiary);
+        }
+        .stop-color-1 {
+          stop-color: var(--yot-modal-color-secondary);
+        }
+        .stop-color-2 {
+          stop-color: var(--yot-modal-color-primary);
+        }
+      }
+    }
+  }
+  &__color-defs {
+    .stop-color-1 {
+      stop-color: var(--yot-modal-color-secondary);
+    }
+    .stop-color-2 {
+      stop-color: var(--yot-modal-color-primary);
+    }
+  }
+}

package/dist/user-dropdown/index.js

@@ -1,5 +1,5 @@
 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", "label", "connectors", "loading", "onChange", "onSearch", "showSearch", "optionFilterProp", "teacher_id"];
+var _excluded = ["type", "label", "connectors", "loading", "onChange", "showSearch", "optionFilterProp", "teacher_id"];
 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; }
@@ -27,7 +27,6 @@ export var UserDropdown = function UserDropdown(_ref) {
     connectors = _ref$connectors === void 0 ? '~' : _ref$connectors,
     loading = _ref.loading,
     onChange = _ref.onChange,
-    onSearch = _ref.onSearch,
     _ref$showSearch = _ref.showSearch,
     showSearch = _ref$showSearch === void 0 ? true : _ref$showSearch,
     _ref$optionFilterProp = _ref.optionFilterProp,
@@ -42,7 +41,7 @@ export var UserDropdown = function UserDropdown(_ref) {
     setValue = _useState2[1];
   // 查询学生数据
   var _useQuery = useQuery({
-      queryKey: ['teacherData', value],
+      queryKey: ['userData', value],
       queryFn: function queryFn() {
         return request('v1/users/by/name_no', {
           params: {
@@ -94,7 +93,7 @@ export var UserDropdown = function UserDropdown(_ref) {
   var debounceInput = useDebounce(handlerInput, 500);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Select, _extends({
     loading: loading != null ? loading : userLoading,
-    onSearch: onSearch != null ? onSearch : debounceInput,
+    onSearch: debounceInput,
     onChange: onChange,
     showSearch: showSearch,
     optionFilterProp: optionFilterProp,

package/package.json

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