@zat-design/sisyphus-react 3.13.18-beta.7 → 3.13.18-beta.9

package/es/ProForm/components/base/DatePicker/index.js

@@ -1,10 +1,9 @@
 import "antd/es/date-picker/style";
 import _DatePicker from "antd/es/date-picker";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _uniq from "lodash/uniq";
+import _omit from "lodash/omit";
 import _isObject from "lodash/isObject";
 import _isString from "lodash/isString";
 import _isFunction from "lodash/isFunction";
@@ -25,18 +24,11 @@ var DatePicker = function DatePicker(props) {
     viewEmpty = _ref.viewEmpty,
     valueType = _ref.valueType;
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
-  var initialConfig = useProConfig('DatePicker');
-  var _className = classNames(_defineProperty({
+  var initialConfig = useProConfig('DatePicker') || {};
+  var nextFormat = format;
+  var nextClassName = classNames(_defineProperty({
     'full-form-item': true
   }, className, !!className));
-  var _viewFormat = Array.isArray(format) ? format[0] : format;
-  var tempFormat = Array.isArray(format) ? format : [format];
-  if (_isFunction(format)) {
-    tempFormat = [];
-  }
-  var _format = _uniq([].concat(_toConsumableArray(tempFormat), ['YYYY-MM-DD', 'YYYYMMDD', 'YYYY/MM/DD', 'YYYY_MM_DD', 'YYYY.MM.DD'])).filter(function (formatKey) {
-    return !!formatKey;
-  });
   if (isView) {
     var value = rest.value;
     var viewChildren = null;
@@ -47,38 +39,30 @@ var DatePicker = function DatePicker(props) {
     } else if (_isFunction(format)) {
       viewChildren = format(value);
     } else if (_isString(value)) {
-      viewChildren = moment(value).format(_viewFormat);
+      viewChildren = moment(value).format(format);
     }
     return _jsx(Container, {
       viewEmpty: viewEmpty,
       children: viewChildren
     });
   }
-  var _defaultShowTime = {
-    format: 'HH:mm:ss'
-  };
   // dateTime模式下默认开启time选择
-  var _rest = _objectSpread({}, rest);
+  var restProps = _objectSpread({}, rest);
   // showTime默认值受valueType属性影响
-  if (rest.showTime === undefined) {
-    if (valueType === 'dateTime') {
-      _rest.showTime = true;
-    }
+  if (restProps.showTime === false) {
+    restProps.showTime = false;
+  } else if (valueType === 'dateTime') {
+    restProps.showTime = true;
+    nextFormat = 'YYYY-MM-DD HH:mm:ss';
   }
   // 字符串时间格式兼容
-  if (_isString(_rest.value)) {
-    _rest.value = moment(_rest.value);
-  }
-  if (_rest.showTime === true) {
-    _rest.showTime = _objectSpread({}, _defaultShowTime);
-  }
-  if (_isObject(_rest.showTime)) {
-    _rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
+  if (_isString(restProps.value)) {
+    restProps.value = moment(restProps.value);
   }
   return _jsx(_DatePicker, _objectSpread(_objectSpread(_objectSpread({}, initialConfig), {}, {
-    format: _format
-  }, _rest), {}, {
-    className: _className
+    format: nextFormat
+  }, _omit(restProps, ['otherProps'])), {}, {
+    className: nextClassName
   }));
 };
 export default DatePicker;

package/es/ProForm/components/combination/ProModalSelect/index.js

@@ -1,9 +1,9 @@
-import "antd/es/tooltip/style";
-import _Tooltip from "antd/es/tooltip";
 import "antd/es/button/style";
 import _Button from "antd/es/button";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
+import "antd/es/tooltip/style";
+import _Tooltip from "antd/es/tooltip";
 import "antd/es/spin/style";
 import _Spin from "antd/es/spin";
 import "antd/es/space/style";
@@ -785,16 +785,21 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }) : null,
       onFocus: handleSelectFocus,
       onSearch: handleSelectSearch,
+      tooltip: _tooltip,
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'
       }
-    }, restProps)) : _jsx(_Input, _objectSpread({
-      value: viewText,
-      onChange: handleChangeValue,
-      disabled: disabled,
-      autoComplete: "off",
-      allowClear: true
-    }, restProps)), isView || disabled ? null : _jsx(_Button, {
+    }, restProps)) : _jsx(_Tooltip, {
+      title: _tooltip ? viewText : null,
+      placement: "topLeft",
+      children: _jsx(_Input, _objectSpread({
+        value: viewText,
+        onChange: handleChangeValue,
+        disabled: disabled,
+        autoComplete: "off",
+        allowClear: true
+      }, restProps))
+    }), isView || disabled ? null : _jsx(_Button, {
       icon: _jsx(ReactSVG, {
         className: "viewSvg",
         src: viewSvg,
@@ -809,45 +814,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       children: customRender
     });
   }
-  useDeepCompareEffect(function () {
-    var dom = document.getElementById(uuid);
-    if (_tooltip && value && dom) {
-      dom.addEventListener('mouseover', function (e) {
-        var _e$target, _e$target$className, _e$target$className$i;
-        if (value && (e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : (_e$target$className = _e$target.className) === null || _e$target$className === void 0 ? void 0 : (_e$target$className$i = _e$target$className.includes) === null || _e$target$className$i === void 0 ? void 0 : _e$target$className$i.call(_e$target$className, 'select'))) {
-          setState({
-            open: true
-          });
-        }
-      });
-      dom.addEventListener('mouseout', function (e) {
-        var _e$target2, _e$target2$className, _e$target2$className$;
-        if (e === null || e === void 0 ? void 0 : (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : (_e$target2$className = _e$target2.className) === null || _e$target2$className === void 0 ? void 0 : (_e$target2$className$ = _e$target2$className.includes) === null || _e$target2$className$ === void 0 ? void 0 : _e$target2$className$.call(_e$target2$className, 'select')) {
-          setState({
-            open: false
-          });
-        }
-      });
-      return function () {
-        dom.removeEventListener('mouseover', function (e) {
-          var _e$target3, _e$target3$className, _e$target3$className$;
-          if (value && (e === null || e === void 0 ? void 0 : (_e$target3 = e.target) === null || _e$target3 === void 0 ? void 0 : (_e$target3$className = _e$target3.className) === null || _e$target3$className === void 0 ? void 0 : (_e$target3$className$ = _e$target3$className.includes) === null || _e$target3$className$ === void 0 ? void 0 : _e$target3$className$.call(_e$target3$className, 'select'))) {
-            setState({
-              open: true
-            });
-          }
-        });
-        dom.removeEventListener('mouseout', function (e) {
-          var _e$target4, _e$target4$className, _e$target4$className$;
-          if (e === null || e === void 0 ? void 0 : (_e$target4 = e.target) === null || _e$target4 === void 0 ? void 0 : (_e$target4$className = _e$target4.className) === null || _e$target4$className === void 0 ? void 0 : (_e$target4$className$ = _e$target4$className.includes) === null || _e$target4$className$ === void 0 ? void 0 : _e$target4$className$.call(_e$target4$className, 'select')) {
-            setState({
-              open: false
-            });
-          }
-        });
-      };
-    }
-  }, [value, _tooltip, document.getElementById(uuid)]);
   useDeepCompareEffect(function () {
     setState({
       options: (tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource) || []
@@ -885,12 +851,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       className: _className,
       style: style,
       ref: fieldRef,
-      children: _tooltip && viewText ? _jsx(_Tooltip, {
-        placement: "topLeft",
-        open: open,
-        title: viewText,
-        children: initRender
-      }) : initRender
+      children: initRender
     }), _jsxs(ProDrawerForm, _objectSpread(_objectSpread({
       mode: "Modal",
       title: title,

package/lib/ProForm/components/base/DatePicker/index.js

@@ -8,10 +8,9 @@ exports.default = void 0;
 require("antd/es/date-picker/style");
 var _datePicker = _interopRequireDefault(require("antd/es/date-picker"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _uniq2 = _interopRequireDefault(require("lodash/uniq"));
+var _omit2 = _interopRequireDefault(require("lodash/omit"));
 var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
 var _isString2 = _interopRequireDefault(require("lodash/isString"));
 var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
@@ -32,18 +31,11 @@ var DatePicker = function DatePicker(props) {
     viewEmpty = _ref.viewEmpty,
     valueType = _ref.valueType;
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
-  var initialConfig = (0, _ProConfigProvider.useProConfig)('DatePicker');
-  var _className = (0, _classnames.default)((0, _defineProperty2.default)({
+  var initialConfig = (0, _ProConfigProvider.useProConfig)('DatePicker') || {};
+  var nextFormat = format;
+  var nextClassName = (0, _classnames.default)((0, _defineProperty2.default)({
     'full-form-item': true
   }, className, !!className));
-  var _viewFormat = Array.isArray(format) ? format[0] : format;
-  var tempFormat = Array.isArray(format) ? format : [format];
-  if ((0, _isFunction2.default)(format)) {
-    tempFormat = [];
-  }
-  var _format = (0, _uniq2.default)([].concat((0, _toConsumableArray2.default)(tempFormat), ['YYYY-MM-DD', 'YYYYMMDD', 'YYYY/MM/DD', 'YYYY_MM_DD', 'YYYY.MM.DD'])).filter(function (formatKey) {
-    return !!formatKey;
-  });
   if (isView) {
     var value = rest.value;
     var viewChildren = null;
@@ -54,38 +46,30 @@ var DatePicker = function DatePicker(props) {
     } else if ((0, _isFunction2.default)(format)) {
       viewChildren = format(value);
     } else if ((0, _isString2.default)(value)) {
-      viewChildren = (0, _moment.default)(value).format(_viewFormat);
+      viewChildren = (0, _moment.default)(value).format(format);
     }
     return (0, _jsxRuntime.jsx)(_Container.default, {
       viewEmpty: viewEmpty,
       children: viewChildren
     });
   }
-  var _defaultShowTime = {
-    format: 'HH:mm:ss'
-  };
   // dateTime模式下默认开启time选择
-  var _rest = (0, _objectSpread2.default)({}, rest);
+  var restProps = (0, _objectSpread2.default)({}, rest);
   // showTime默认值受valueType属性影响
-  if (rest.showTime === undefined) {
-    if (valueType === 'dateTime') {
-      _rest.showTime = true;
-    }
+  if (restProps.showTime === false) {
+    restProps.showTime = false;
+  } else if (valueType === 'dateTime') {
+    restProps.showTime = true;
+    nextFormat = 'YYYY-MM-DD HH:mm:ss';
   }
   // 字符串时间格式兼容
-  if ((0, _isString2.default)(_rest.value)) {
-    _rest.value = (0, _moment.default)(_rest.value);
-  }
-  if (_rest.showTime === true) {
-    _rest.showTime = (0, _objectSpread2.default)({}, _defaultShowTime);
-  }
-  if ((0, _isObject2.default)(_rest.showTime)) {
-    _rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
+  if ((0, _isString2.default)(restProps.value)) {
+    restProps.value = (0, _moment.default)(restProps.value);
   }
   return (0, _jsxRuntime.jsx)(_datePicker.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, initialConfig), {}, {
-    format: _format
-  }, _rest), {}, {
-    className: _className
+    format: nextFormat
+  }, (0, _omit2.default)(restProps, ['otherProps'])), {}, {
+    className: nextClassName
   }));
 };
 var _default = exports.default = DatePicker;

package/lib/ProForm/components/combination/ProModalSelect/index.js

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/tooltip/style");
-var _tooltip2 = _interopRequireDefault(require("antd/es/tooltip"));
 require("antd/es/button/style");
 var _button = _interopRequireDefault(require("antd/es/button"));
 require("antd/es/input/style");
 var _input = _interopRequireDefault(require("antd/es/input"));
+require("antd/es/tooltip/style");
+var _tooltip2 = _interopRequireDefault(require("antd/es/tooltip"));
 require("antd/es/spin/style");
 var _spin = _interopRequireDefault(require("antd/es/spin"));
 require("antd/es/space/style");
@@ -793,16 +793,21 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }) : null,
       onFocus: handleSelectFocus,
       onSearch: handleSelectSearch,
+      tooltip: _tooltip,
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'
       }
-    }, restProps)) : (0, _jsxRuntime.jsx)(_input.default, (0, _objectSpread5.default)({
-      value: viewText,
-      onChange: handleChangeValue,
-      disabled: disabled,
-      autoComplete: "off",
-      allowClear: true
-    }, restProps)), isView || disabled ? null : (0, _jsxRuntime.jsx)(_button.default, {
+    }, restProps)) : (0, _jsxRuntime.jsx)(_tooltip2.default, {
+      title: _tooltip ? viewText : null,
+      placement: "topLeft",
+      children: (0, _jsxRuntime.jsx)(_input.default, (0, _objectSpread5.default)({
+        value: viewText,
+        onChange: handleChangeValue,
+        disabled: disabled,
+        autoComplete: "off",
+        allowClear: true
+      }, restProps))
+    }), isView || disabled ? null : (0, _jsxRuntime.jsx)(_button.default, {
       icon: (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
         className: "viewSvg",
         src: _view.default,
@@ -817,45 +822,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       children: customRender
     });
   }
-  (0, _ahooks.useDeepCompareEffect)(function () {
-    var dom = document.getElementById(uuid);
-    if (_tooltip && value && dom) {
-      dom.addEventListener('mouseover', function (e) {
-        var _e$target, _e$target$className, _e$target$className$i;
-        if (value && (e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : (_e$target$className = _e$target.className) === null || _e$target$className === void 0 ? void 0 : (_e$target$className$i = _e$target$className.includes) === null || _e$target$className$i === void 0 ? void 0 : _e$target$className$i.call(_e$target$className, 'select'))) {
-          setState({
-            open: true
-          });
-        }
-      });
-      dom.addEventListener('mouseout', function (e) {
-        var _e$target2, _e$target2$className, _e$target2$className$;
-        if (e === null || e === void 0 ? void 0 : (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : (_e$target2$className = _e$target2.className) === null || _e$target2$className === void 0 ? void 0 : (_e$target2$className$ = _e$target2$className.includes) === null || _e$target2$className$ === void 0 ? void 0 : _e$target2$className$.call(_e$target2$className, 'select')) {
-          setState({
-            open: false
-          });
-        }
-      });
-      return function () {
-        dom.removeEventListener('mouseover', function (e) {
-          var _e$target3, _e$target3$className, _e$target3$className$;
-          if (value && (e === null || e === void 0 ? void 0 : (_e$target3 = e.target) === null || _e$target3 === void 0 ? void 0 : (_e$target3$className = _e$target3.className) === null || _e$target3$className === void 0 ? void 0 : (_e$target3$className$ = _e$target3$className.includes) === null || _e$target3$className$ === void 0 ? void 0 : _e$target3$className$.call(_e$target3$className, 'select'))) {
-            setState({
-              open: true
-            });
-          }
-        });
-        dom.removeEventListener('mouseout', function (e) {
-          var _e$target4, _e$target4$className, _e$target4$className$;
-          if (e === null || e === void 0 ? void 0 : (_e$target4 = e.target) === null || _e$target4 === void 0 ? void 0 : (_e$target4$className = _e$target4.className) === null || _e$target4$className === void 0 ? void 0 : (_e$target4$className$ = _e$target4$className.includes) === null || _e$target4$className$ === void 0 ? void 0 : _e$target4$className$.call(_e$target4$className, 'select')) {
-            setState({
-              open: false
-            });
-          }
-        });
-      };
-    }
-  }, [value, _tooltip, document.getElementById(uuid)]);
   (0, _ahooks.useDeepCompareEffect)(function () {
     setState({
       options: (tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource) || []
@@ -893,12 +859,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       className: _className,
       style: style,
       ref: fieldRef,
-      children: _tooltip && viewText ? (0, _jsxRuntime.jsx)(_tooltip2.default, {
-        placement: "topLeft",
-        open: open,
-        title: viewText,
-        children: initRender
-      }) : initRender
+      children: initRender
     }), (0, _jsxRuntime.jsxs)(_index.ProDrawerForm, (0, _objectSpread5.default)((0, _objectSpread5.default)({
       mode: "Modal",
       title: title,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.13.18-beta.7",
+  "version": "3.13.18-beta.9",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",

package/es/ProForm/components/base/DatePicker/useDateLimit.d.ts

@@ -1,9 +0,0 @@
-import { DurationInputArg1, DurationInputArg2, Moment } from 'moment';
-interface Props {
-    range?: [Moment?, Moment?];
-    limit?: [DurationInputArg1, DurationInputArg2];
-}
-export declare const useDateLimit: (props: Props) => {
-    onCalendarChange: (val: any) => void;
-};
-export {};

package/es/ProForm/components/base/DatePicker/useDateLimit.js

@@ -1,15 +0,0 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { useState } from 'react';
-export var useDateLimit = function useDateLimit(props) {
-  var range = props.range,
-    limit = props.limit;
-  var _useState = useState(),
-    _useState2 = _slicedToArray(_useState, 2),
-    dates = _useState2[0],
-    setDates = _useState2[1];
-  return {
-    onCalendarChange: function onCalendarChange(val) {
-      return setDates(val);
-    }
-  };
-};

package/lib/ProForm/components/base/DatePicker/useDateLimit.d.ts

@@ -1,9 +0,0 @@
-import { DurationInputArg1, DurationInputArg2, Moment } from 'moment';
-interface Props {
-    range?: [Moment?, Moment?];
-    limit?: [DurationInputArg1, DurationInputArg2];
-}
-export declare const useDateLimit: (props: Props) => {
-    onCalendarChange: (val: any) => void;
-};
-export {};

package/lib/ProForm/components/base/DatePicker/useDateLimit.js

@@ -1,22 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.useDateLimit = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _react = require("react");
-var useDateLimit = exports.useDateLimit = function useDateLimit(props) {
-  var range = props.range,
-    limit = props.limit;
-  var _useState = (0, _react.useState)(),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    dates = _useState2[0],
-    setDates = _useState2[1];
-  return {
-    onCalendarChange: function onCalendarChange(val) {
-      return setDates(val);
-    }
-  };
-};