@zat-design/sisyphus-react 3.5.1-beta.3 → 3.5.1-beta.5

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

@@ -78,12 +78,13 @@ var ProRangeLimit = function ProRangeLimit(props) {
     'ant-input-disabled': _disabled === null || _disabled === void 0 ? void 0 : _disabled[1],
     'forever-checkbox': true
   });
+  var _foreverDate = foreverDate || (initialConfig === null || initialConfig === void 0 ? void 0 : initialConfig.foreverDate);
   var _isForever = useMemo(function () {
-    return moment(foreverDate, format).isSame(endDate);
+    return moment(_foreverDate, format).isSame(endDate);
   }, [value]);
   var foreverMoment = useMemo(function () {
-    return moment(foreverDate, format);
-  }, [foreverDate, format]);
+    return moment(_foreverDate, format);
+  }, [_foreverDate, format]);
   if (isView) {
     var _props$value3, _props$value4;
     var _separator = (value === null || value === void 0 ? void 0 : value[0]) && (value === null || value === void 0 ? void 0 : value[1]) ? separator : '';

package/es/ProForm/components/combination/ProTimeLimit/index.d.ts

@@ -9,7 +9,7 @@ export type ProTimeLimitProps = DistributiveOmit<DatePickerProps, 'value' | 'onC
     value?: string;
     onChange?: (value: ProTimeLimitProps['value'] | null, valueData: Moment) => void;
     disabled?: boolean;
-    foreverTime?: string;
+    foreverDate?: string;
     foreverText?: string;
     viewEmpty?: React.ReactNode;
     format?: string;

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

@@ -7,7 +7,7 @@ import _Input from "antd/es/input";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["format", "disabled", "foreverTime", "foreverText", "valueType", "otherProps"],
+var _excluded = ["format", "disabled", "foreverDate", "foreverText", "valueType", "otherProps"],
   _excluded2 = ["mode"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import classNames from 'classnames';
@@ -25,7 +25,8 @@ export var ProTimeLimit = function ProTimeLimit(props) {
   var _props$format = props.format,
     format = _props$format === void 0 ? 'YYYY-MM-DD' : _props$format,
     disabled = props.disabled,
-    foreverTime = props.foreverTime,
+    _props$foreverDate = props.foreverDate,
+    foreverDate = _props$foreverDate === void 0 ? '9999-01-01' : _props$foreverDate,
     _props$foreverText = props.foreverText,
     foreverText = _props$foreverText === void 0 ? locale.ProTimeLimit.foreverText : _props$foreverText,
     _props$valueType = props.valueType,
@@ -35,12 +36,14 @@ export var ProTimeLimit = function ProTimeLimit(props) {
   var _ref = ProForm.useFieldProps() || {},
     isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty;
+  var initialConfig = useProConfig('ProTimeLimit');
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
+  var _foreverDate = foreverDate || (initialConfig === null || initialConfig === void 0 ? void 0 : initialConfig.foreverDate);
   var _useMemo = useMemo(function () {
-      var foreverMoment = foreverTime ? moment(foreverTime, format) : moment('9999-01-01', 'YYYY-MM-DD');
-      var foreverString = foreverTime || foreverMoment.format(format);
+      var foreverMoment = moment(_foreverDate, format);
+      var foreverString = _foreverDate || foreverMoment.format(format);
       return [foreverString, foreverMoment];
-    }, [format, foreverTime]),
+    }, [format, _foreverDate]),
     _useMemo2 = _slicedToArray(_useMemo, 2),
     foreverString = _useMemo2[0],
     foreverMoment = _useMemo2[1];
@@ -51,7 +54,6 @@ export var ProTimeLimit = function ProTimeLimit(props) {
     _useControlled2 = _slicedToArray(_useControlled, 2),
     value = _useControlled2[0],
     onChange = _useControlled2[1];
-  var initialConfig = useProConfig('ProTimeLimit');
   var isForever = useMemo(function () {
     if (isObject(value)) {
       return foreverMoment.format(format) === value.format(format);
@@ -112,9 +114,15 @@ var LimitPick = function LimitPick(props) {
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'DatePicker' : _props$mode,
     rest = _objectWithoutProperties(props, _excluded2);
+  var _ref2 = useProConfig('ProTimeLimit') || {},
+    foreverDate = _ref2.foreverDate;
   if (mode === 'RangePicker') {
-    return _jsx(ProRangeLimit, _objectSpread({}, rest));
+    return _jsx(ProRangeLimit, _objectSpread({
+      foreverDate: foreverDate
+    }, rest));
   }
-  return _jsx(ProTimeLimit, _objectSpread({}, rest));
+  return _jsx(ProTimeLimit, _objectSpread({
+    foreverDate: foreverDate
+  }, rest));
 };
 export default LimitPick;

package/es/ProForm/components/render/Render.js

@@ -34,7 +34,7 @@ import useRules from '../../utils/useRules';
 import ConfirmWrapper from './ConfirmWrapper';
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
-  var _ref2, _ref3, _ref4, _ref5, _componentProps$disab, _otherProps$names2;
+  var _ref2, _ref3, _ref4, _ref5, _otherProps$names2;
   var component = props.component,
     originComponent = props.originComponent,
     _props$formItemProps = props.formItemProps,
@@ -177,7 +177,7 @@ var Render = function Render(props) {
    * globalControl true时，优先级 全局【formDisabled】> formitem上【column.disabled】 > 组件上【fieldProps.disabled】
    * globalControl false时，优先级 组件上【fieldProps.disabled】 > formitem上【column.disabled】 >  全局【formDisabled】
    */
-  var lastDisabled = globalControl ? (_ref2 = (_ref3 = formDisabled !== null && formDisabled !== void 0 ? formDisabled : _disabled) !== null && _ref3 !== void 0 ? _ref3 : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled : (_ref4 = (_ref5 = (_componentProps$disab = componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled) !== null && _componentProps$disab !== void 0 ? _componentProps$disab : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref5 !== void 0 ? _ref5 : _disabled) !== null && _ref4 !== void 0 ? _ref4 : formDisabled;
+  var lastDisabled = globalControl ? (_ref2 = (_ref3 = formDisabled !== null && formDisabled !== void 0 ? formDisabled : _disabled) !== null && _ref3 !== void 0 ? _ref3 : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled : (_ref4 = (_ref5 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref5 !== void 0 ? _ref5 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled) !== null && _ref4 !== void 0 ? _ref4 : formDisabled;
   /**
    * 最新fieldProps: 更新后的组件Props
    */

package/es/ProForm/components/render/RenderFields.js

@@ -45,7 +45,7 @@ var RenderFields = function RenderFields(props) {
     });
   }
   var comList = columns.flatMap(function (column, index) {
-    var _fieldProps$disabled;
+    var _formItemProps$disabl;
     if (!!expand && !openState) {
       // expand为Number时 过滤掉大于expand 且 非fixed的column
       if (typeof expand === 'number') {
@@ -127,7 +127,7 @@ var RenderFields = function RenderFields(props) {
       placeholder = formItemChildProps.placeholder,
       dataSource = formItemChildProps.dataSource;
     var formLabel = _formItemProps.label;
-    var comDisabled = (_fieldProps$disabled = fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled) !== null && _fieldProps$disabled !== void 0 ? _fieldProps$disabled : _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.disabled; // 组件属性层disabled fieldProps可能为函数
+    var comDisabled = (_formItemProps$disabl = _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.disabled) !== null && _formItemProps$disabl !== void 0 ? _formItemProps$disabl : fieldProps.disabled; // 组件属性层disabled fieldProps可能为函数
     // 当前组件是不是一个选择组件
     var _isSelect = isSelect({
       dataSource: dataSource,

package/es/ProLayout/index.js

@@ -1,5 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import "antd/es/message/style";
+import _message from "antd/es/message";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { createContext } from 'react';
@@ -46,9 +48,8 @@ var ProLayout = function ProLayout(props) {
     set(props.collapsed || false);
   }, [props.collapsed]);
   useDeepCompareEffect(function () {
-    if (Array.isArray(dataSource) && !dataSource.length || !dataSource) {
-      console.warn('Warning: Missing menu data source, or menu data source is not an array');
-      return;
+    if (Array.isArray(dataSource) && !dataSource.length) {
+      return _message.warning('Warning: Missing menu data source, or menu data source is not an array');
     }
     var userData = transformMenus(dataSource);
     setState({

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

@@ -80,12 +80,13 @@ var ProRangeLimit = function ProRangeLimit(props) {
     'ant-input-disabled': _disabled === null || _disabled === void 0 ? void 0 : _disabled[1],
     'forever-checkbox': true
   });
+  var _foreverDate = foreverDate || (initialConfig === null || initialConfig === void 0 ? void 0 : initialConfig.foreverDate);
   var _isForever = (0, _react.useMemo)(function () {
-    return (0, _moment.default)(foreverDate, format).isSame(endDate);
+    return (0, _moment.default)(_foreverDate, format).isSame(endDate);
   }, [value]);
   var foreverMoment = (0, _react.useMemo)(function () {
-    return (0, _moment.default)(foreverDate, format);
-  }, [foreverDate, format]);
+    return (0, _moment.default)(_foreverDate, format);
+  }, [_foreverDate, format]);
   if (isView) {
     var _props$value3, _props$value4;
     var _separator = (value === null || value === void 0 ? void 0 : value[0]) && (value === null || value === void 0 ? void 0 : value[1]) ? separator : '';

package/lib/ProForm/components/combination/ProTimeLimit/index.d.ts

@@ -9,7 +9,7 @@ export type ProTimeLimitProps = DistributiveOmit<DatePickerProps, 'value' | 'onC
     value?: string;
     onChange?: (value: ProTimeLimitProps['value'] | null, valueData: Moment) => void;
     disabled?: boolean;
-    foreverTime?: string;
+    foreverDate?: string;
     foreverText?: string;
     viewEmpty?: React.ReactNode;
     format?: string;

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

@@ -20,14 +20,15 @@ var _useControlled3 = _interopRequireDefault(require("./hooks/useControlled"));
 var _ProRangeLimit = _interopRequireDefault(require("../ProRangeLimit"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
-var _excluded = ["format", "disabled", "foreverTime", "foreverText", "valueType", "otherProps"],
+var _excluded = ["format", "disabled", "foreverDate", "foreverText", "valueType", "otherProps"],
   _excluded2 = ["mode"];
 // 永久有效默认值
 var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
   var _props$format = props.format,
     format = _props$format === void 0 ? 'YYYY-MM-DD' : _props$format,
     disabled = props.disabled,
-    foreverTime = props.foreverTime,
+    _props$foreverDate = props.foreverDate,
+    foreverDate = _props$foreverDate === void 0 ? '9999-01-01' : _props$foreverDate,
     _props$foreverText = props.foreverText,
     foreverText = _props$foreverText === void 0 ? _locale.default.ProTimeLimit.foreverText : _props$foreverText,
     _props$valueType = props.valueType,
@@ -37,12 +38,14 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
   var _ref = _ProForm.default.useFieldProps() || {},
     isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty;
+  var initialConfig = (0, _ProConfigProvider.useProConfig)('ProTimeLimit');
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
+  var _foreverDate = foreverDate || (initialConfig === null || initialConfig === void 0 ? void 0 : initialConfig.foreverDate);
   var _useMemo = (0, _react.useMemo)(function () {
-      var foreverMoment = foreverTime ? (0, _moment.default)(foreverTime, format) : (0, _moment.default)('9999-01-01', 'YYYY-MM-DD');
-      var foreverString = foreverTime || foreverMoment.format(format);
+      var foreverMoment = (0, _moment.default)(_foreverDate, format);
+      var foreverString = _foreverDate || foreverMoment.format(format);
       return [foreverString, foreverMoment];
-    }, [format, foreverTime]),
+    }, [format, _foreverDate]),
     _useMemo2 = (0, _slicedToArray2.default)(_useMemo, 2),
     foreverString = _useMemo2[0],
     foreverMoment = _useMemo2[1];
@@ -53,7 +56,6 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
     _useControlled2 = (0, _slicedToArray2.default)(_useControlled, 2),
     value = _useControlled2[0],
     onChange = _useControlled2[1];
-  var initialConfig = (0, _ProConfigProvider.useProConfig)('ProTimeLimit');
   var isForever = (0, _react.useMemo)(function () {
     if ((0, _lodash.isObject)(value)) {
       return foreverMoment.format(format) === value.format(format);
@@ -114,9 +116,15 @@ var LimitPick = function LimitPick(props) {
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'DatePicker' : _props$mode,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded2);
+  var _ref2 = (0, _ProConfigProvider.useProConfig)('ProTimeLimit') || {},
+    foreverDate = _ref2.foreverDate;
   if (mode === 'RangePicker') {
-    return (0, _jsxRuntime.jsx)(_ProRangeLimit.default, (0, _objectSpread2.default)({}, rest));
+    return (0, _jsxRuntime.jsx)(_ProRangeLimit.default, (0, _objectSpread2.default)({
+      foreverDate: foreverDate
+    }, rest));
   }
-  return (0, _jsxRuntime.jsx)(ProTimeLimit, (0, _objectSpread2.default)({}, rest));
+  return (0, _jsxRuntime.jsx)(ProTimeLimit, (0, _objectSpread2.default)({
+    foreverDate: foreverDate
+  }, rest));
 };
 var _default = exports.default = LimitPick;

package/lib/ProForm/components/render/Render.js

@@ -32,7 +32,7 @@ var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className",
 /* eslint-disable prefer-destructuring */
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
-  var _ref2, _ref3, _ref4, _ref5, _componentProps$disab, _otherProps$names2;
+  var _ref2, _ref3, _ref4, _ref5, _otherProps$names2;
   var component = props.component,
     originComponent = props.originComponent,
     _props$formItemProps = props.formItemProps,
@@ -175,7 +175,7 @@ var Render = function Render(props) {
    * globalControl true时，优先级 全局【formDisabled】> formitem上【column.disabled】 > 组件上【fieldProps.disabled】
    * globalControl false时，优先级 组件上【fieldProps.disabled】 > formitem上【column.disabled】 >  全局【formDisabled】
    */
-  var lastDisabled = globalControl ? (_ref2 = (_ref3 = formDisabled !== null && formDisabled !== void 0 ? formDisabled : _disabled) !== null && _ref3 !== void 0 ? _ref3 : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled : (_ref4 = (_ref5 = (_componentProps$disab = componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled) !== null && _componentProps$disab !== void 0 ? _componentProps$disab : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref5 !== void 0 ? _ref5 : _disabled) !== null && _ref4 !== void 0 ? _ref4 : formDisabled;
+  var lastDisabled = globalControl ? (_ref2 = (_ref3 = formDisabled !== null && formDisabled !== void 0 ? formDisabled : _disabled) !== null && _ref3 !== void 0 ? _ref3 : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled : (_ref4 = (_ref5 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref5 !== void 0 ? _ref5 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled) !== null && _ref4 !== void 0 ? _ref4 : formDisabled;
   /**
    * 最新fieldProps: 更新后的组件Props
    */

package/lib/ProForm/components/render/RenderFields.js

@@ -53,7 +53,7 @@ var RenderFields = function RenderFields(props) {
     });
   }
   var comList = columns.flatMap(function (column, index) {
-    var _fieldProps$disabled;
+    var _formItemProps$disabl;
     if (!!expand && !openState) {
       // expand为Number时 过滤掉大于expand 且 非fixed的column
       if (typeof expand === 'number') {
@@ -135,7 +135,7 @@ var RenderFields = function RenderFields(props) {
       placeholder = formItemChildProps.placeholder,
       dataSource = formItemChildProps.dataSource;
     var formLabel = _formItemProps.label;
-    var comDisabled = (_fieldProps$disabled = fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled) !== null && _fieldProps$disabled !== void 0 ? _fieldProps$disabled : _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.disabled; // 组件属性层disabled fieldProps可能为函数
+    var comDisabled = (_formItemProps$disabl = _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.disabled) !== null && _formItemProps$disabl !== void 0 ? _formItemProps$disabl : fieldProps.disabled; // 组件属性层disabled fieldProps可能为函数
     // 当前组件是不是一个选择组件
     var _isSelect = (0, _utils.isSelect)({
       dataSource: dataSource,

package/lib/ProLayout/index.js

@@ -9,6 +9,7 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
 var _react = require("react");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _ahooks = require("ahooks");
@@ -53,9 +54,8 @@ var ProLayout = function ProLayout(props) {
     set(props.collapsed || false);
   }, [props.collapsed]);
   (0, _ahooks.useDeepCompareEffect)(function () {
-    if (Array.isArray(dataSource) && !dataSource.length || !dataSource) {
-      console.warn('Warning: Missing menu data source, or menu data source is not an array');
-      return;
+    if (Array.isArray(dataSource) && !dataSource.length) {
+      return _antd.message.warning('Warning: Missing menu data source, or menu data source is not an array');
     }
     var userData = (0, _utils.transformMenus)(dataSource);
     setState({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.5.1-beta.3",
+  "version": "3.5.1-beta.5",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",