ds-web-all 1.0.1-beta.93 → 1.0.1-beta.95

package/lib/components/DateRangeOnePicker/index.js

@@ -49,7 +49,8 @@ var DateRangeOnePicker = function DateRangeOnePicker(_ref) {
     style = _ref$style === void 0 ? {} : _ref$style,
     className = _ref.className,
     _ref$allowClear = _ref.allowClear,
-    allowClear = _ref$allowClear === void 0 ? true : _ref$allowClear;
+    allowClear = _ref$allowClear === void 0 ? true : _ref$allowClear,
+    _disabledDate = _ref.disabledDate;
   var _useRefState = (0, _useRefState3.default)(value ? value.map(function (el) {
       return el ? (0, _moment.default)(el) : el;
     }) : value),
@@ -112,8 +113,9 @@ var DateRangeOnePicker = function DateRangeOnePicker(_ref) {
   }, [value]);
   (0, _react.useEffect)(function () {
     if (!open.first && !open.second) {
+      var _rangeValueRef$curren;
       selectedNum.current = 0;
-      if ((rangeValueRef.current || []).every(function (el) {
+      if (((_rangeValueRef$curren = rangeValueRef.current) === null || _rangeValueRef$curren === void 0 ? void 0 : _rangeValueRef$curren.length) > 0 && (rangeValueRef.current || []).every(function (el) {
         return !!el;
       })) {
         onChange(rangeValueRef.current ? rangeValueRef.current.map(function (el) {
@@ -178,6 +180,9 @@ var DateRangeOnePicker = function DateRangeOnePicker(_ref) {
       });
     },
     onFocus: function onFocus() {
+      if (!open.first && !open.second) {
+        setRangeValue(null);
+      }
       setOpen(function (old) {
         return old.first === true ? old : _objectSpread(_objectSpread({}, old), {}, {
           first: true
@@ -185,7 +190,7 @@ var DateRangeOnePicker = function DateRangeOnePicker(_ref) {
       });
     },
     disabledDate: function disabledDate(date) {
-      return (rangeValue === null || rangeValue === void 0 ? void 0 : rangeValue[1]) ? date >= (rangeValue === null || rangeValue === void 0 ? void 0 : rangeValue[1]) : false;
+      return typeof _disabledDate === 'function' ? _disabledDate(date, rangeValue || [], 'start') : (rangeValue === null || rangeValue === void 0 ? void 0 : rangeValue[1]) ? date >= (rangeValue === null || rangeValue === void 0 ? void 0 : rangeValue[1]) : false;
     },
     renderExtraFooter: renderExtraFooter
   }), /*#__PURE__*/_react.default.createElement("div", {
@@ -210,6 +215,9 @@ var DateRangeOnePicker = function DateRangeOnePicker(_ref) {
       });
     },
     onFocus: function onFocus() {
+      if (!open.first && !open.second) {
+        setRangeValue(null);
+      }
       setOpen(function (old) {
         return old.second === true ? old : _objectSpread(_objectSpread({}, old), {}, {
           second: true
@@ -217,7 +225,7 @@ var DateRangeOnePicker = function DateRangeOnePicker(_ref) {
       });
     },
     disabledDate: function disabledDate(date) {
-      return (rangeValue === null || rangeValue === void 0 ? void 0 : rangeValue[0]) ? date <= (rangeValue === null || rangeValue === void 0 ? void 0 : rangeValue[0]) : false;
+      return typeof _disabledDate === 'function' ? _disabledDate(date, rangeValue || [], 'end') : (rangeValue === null || rangeValue === void 0 ? void 0 : rangeValue[0]) ? date <= (rangeValue === null || rangeValue === void 0 ? void 0 : rangeValue[0]) : false;
     },
     renderExtraFooter: renderExtraFooter
   }), allowClear && (value || []).some(function (el) {

package/lib/components/button/upload.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+require("antd/es/spin/style");
+var _spin = _interopRequireDefault(require("antd/es/spin"));
 require("antd/es/upload/style");
 var _upload = _interopRequireDefault(require("antd/es/upload"));
 require("antd/es/button/style");
@@ -15,7 +17,8 @@ var _react = _interopRequireWildcard(require("react"));
 var _fileRequest = _interopRequireDefault(require("../../common/fileRequest"));
 require("./index.less");
 var _Confirm = _interopRequireDefault(require("../Confirm"));
-var _excluded = ["onFinish", "listType", "multiple", "accept", "value", "text", "buttonProps", "requestUrl", "confirmProps", "onError", "requestTimeout", "defaultErrorMsg"];
+var _reactDom = require("react-dom");
+var _excluded = ["onFinish", "listType", "multiple", "accept", "value", "text", "buttonProps", "requestUrl", "confirmProps", "onError", "requestTimeout", "defaultErrorMsg", "fullLoading", "fullLoadTip"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -53,6 +56,9 @@ var BaseUpload = function BaseUpload(_ref) {
     requestTimeout = _ref$requestTimeout === void 0 ? 30000 : _ref$requestTimeout,
     _ref$defaultErrorMsg = _ref.defaultErrorMsg,
     defaultErrorMsg = _ref$defaultErrorMsg === void 0 ? '上传失败' : _ref$defaultErrorMsg,
+    _ref$fullLoading = _ref.fullLoading,
+    fullLoading = _ref$fullLoading === void 0 ? false : _ref$fullLoading,
+    fullLoadTip = _ref.fullLoadTip,
     props = _objectWithoutProperties(_ref, _excluded);
   var headers = {
     Authorization: window.token
@@ -164,7 +170,7 @@ var BaseUpload = function BaseUpload(_ref) {
       customRequest();
     }
   }, [uploadFiles]);
-  return /*#__PURE__*/_react.default.createElement("div", {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
     className: "upload-container",
     "data-disabled": !!confirmProps,
     onClick: onClick
@@ -172,6 +178,17 @@ var BaseUpload = function BaseUpload(_ref) {
     loading: loading
   }, buttonProps, {
     ref: btnRef
-  }), text)));
+  }), text))), fullLoading && loading && /*#__PURE__*/(0, _reactDom.createPortal)(/*#__PURE__*/_react.default.createElement("div", {
+    className: "ant-modal-mask",
+    style: {
+      display: 'flex',
+      alignItems: 'center',
+      justifyContent: 'center',
+      backgroundColor: 'rgba(255,255,255,0.45)'
+    }
+  }, /*#__PURE__*/_react.default.createElement(_spin.default, {
+    spinning: true,
+    tip: fullLoadTip
+  })), document.body));
 };
 var _default = exports.default = BaseUpload;

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "ds-web-all",
-  "version": "1.0.1-beta.93",
+  "version": "1.0.1-beta.95",
   "scripts": {
     "start": "cross-env BUILD_ENV=dev && dumi dev",
     "docs:build": "cross-env BUILD_ENV=production && dumi build",