@zat-design/sisyphus-react 4.5.10-beta.1 → 4.5.10-beta.2

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

@@ -1,137 +1,135 @@
-import _isObject from "lodash/isObject";
-import _uniq from "lodash/uniq";
-import _isFunction from "lodash/isFunction";
-import _omit from "lodash/omit";
-import React, { useMemo, useState } from 'react';
-import { DatePicker, Checkbox, Space } from 'antd';
-import classNames from 'classnames';
-import dayjs from 'dayjs';
+import { jsx, jsxs } from "react/jsx-runtime";
+import { useMemo, useState } from "react";
+import { DatePicker, Checkbox, Space } from "antd";
+import omit from "lodash/omit";
+import isFunction from "lodash/isFunction";
+import uniq from "lodash/uniq";
+import isObject from "lodash/isObject";
+import classNames from "classnames";
+import dayjs from "dayjs";
 import { useProConfig } from "../../../../ProConfigProvider";
 import Container from "../../Container";
 import locale from "../../../../locale";
 import ProForm from "../../../../ProForm";
-import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 const defaultPickerValue = [dayjs(), dayjs()];
-const useControlled = props => {
+const useControlled = (props) => {
+  var _a, _b;
   const [value, setValue] = useState();
-  if ('value' in props) {
-    const internalValue = [props.value?.[0] && dayjs(props.value[0], props.format), props.value?.[1] && dayjs(props.value[1], props.format)];
-    const handleChange = (value, other) => {
-      if (!value) {
-        props?.onChange?.(value, other);
+  if ("value" in props) {
+    const internalValue = [
+      ((_a = props.value) == null ? void 0 : _a[0]) && dayjs(props.value[0], props.format),
+      ((_b = props.value) == null ? void 0 : _b[1]) && dayjs(props.value[1], props.format)
+    ];
+    const handleChange = (value2, other) => {
+      var _a2;
+      if (!value2) {
+        (_a2 = props == null ? void 0 : props.onChange) == null ? void 0 : _a2.call(props, value2, other);
       } else {
-        const [start, end] = value;
-        if (props?.onChange) {
-          const valueStr = [start?.format(props.format), end?.format(props.format)];
-          props?.onChange(valueStr, value);
+        const [start, end] = value2;
+        if (props == null ? void 0 : props.onChange) {
+          const valueStr = [start == null ? void 0 : start.format(props.format), end == null ? void 0 : end.format(props.format)];
+          props == null ? void 0 : props.onChange(valueStr, value2);
         }
       }
     };
     return [internalValue, handleChange];
   }
-
-  // @ts-ignore
   return [value, setValue];
 };
-const {
-  RangePicker
-} = DatePicker;
-const ProRangeLimit = props => {
+const { RangePicker } = DatePicker;
+const ProRangeLimit = (props) => {
+  var _a, _b, _c;
   const {
     disabled,
     foreverText = locale.ProTimeLimit.foreverText,
-    foreverDate = '9999-01-01',
-    format = 'YYYY-MM-DD',
+    foreverDate = "9999-01-01",
+    format = "YYYY-MM-DD",
     otherProps,
-    separator = '~',
+    separator = "~",
     limit = true,
     ...rest
   } = props;
-  const {
-    isView: isViewCon,
-    viewEmpty
-  } = ProForm.useFieldProps() || {};
-  const isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
-
-  const [value, onChange] = useControlled({
-    ...props,
-    format
-  });
+  const { isView: isViewCon, viewEmpty } = ProForm.useFieldProps() || {};
+  const isView = typeof props.isView === "boolean" ? props.isView : isViewCon;
+  const [value, onChange] = useControlled({ ...props, format });
   const [startDate, endDate] = value || [];
-  const initialConfig = useProConfig('ProTimeLimit');
-  const _disabled = typeof disabled === 'boolean' ? [disabled, disabled] : disabled;
+  const initialConfig = useProConfig("ProTimeLimit");
+  const _disabled = typeof disabled === "boolean" ? [disabled, disabled] : disabled;
   const className = classNames({
-    'ant-input': true,
-    'ant-input-disabled': _disabled?.[1],
-    'forever-checkbox': true
+    "ant-input": true,
+    "ant-input-disabled": _disabled == null ? void 0 : _disabled[1],
+    "forever-checkbox": true
   });
-  const _foreverDate = foreverDate || initialConfig?.foreverDate;
+  const _foreverDate = foreverDate || (initialConfig == null ? void 0 : initialConfig.foreverDate);
   const _rest = {
     ...rest
   };
-
-  // showTime默认值受valueType属性影响
-  if (rest.showTime === undefined) {
-    const {
-      valueType
-    } = props;
-    if (valueType === 'dateTime') {
+  if (rest.showTime === void 0) {
+    const { valueType } = props;
+    if (valueType === "dateTime") {
       _rest.showTime = true;
     }
-    if (valueType === 'dateStartEndTime') {
+    if (valueType === "dateStartEndTime") {
       _rest.showTime = false;
     }
   }
   let tempFormat = Array.isArray(format) ? format : [format];
-  if (_isFunction(format)) {
+  if (isFunction(format)) {
     tempFormat = [];
   }
-  const _format = _uniq([...tempFormat, 'YYYY-MM-DD', 'YYYYMMDD', 'YYYY/MM/DD', 'YYYY_MM_DD', 'YYYY.MM.DD']).filter(formatKey => !!formatKey);
+  const _format = uniq([
+    ...tempFormat,
+    "YYYY-MM-DD",
+    "YYYYMMDD",
+    "YYYY/MM/DD",
+    "YYYY_MM_DD",
+    "YYYY.MM.DD"
+  ]).filter((formatKey) => !!formatKey);
   const _defaultShowTime = {
-    format: 'HH:mm:ss'
+    format: "HH:mm:ss"
   };
   const _isForever = useMemo(() => {
-    const foreverDayjs = (() => {
-      // 使用健壮的日期解析方式
+    const foreverDayjs2 = (() => {
       let result = dayjs(_foreverDate);
       if (!result.isValid()) {
         result = dayjs(_foreverDate, format);
       }
       if (!result.isValid()) {
-        // 如果还是无效，使用默认的长期日期
-        result = dayjs('9999-01-01');
+        result = dayjs("9999-01-01");
       }
       return result;
     })();
-    return foreverDayjs.isSame(endDate);
+    return foreverDayjs2.isSame(endDate);
   }, [value, _foreverDate, format]);
   const foreverDayjs = useMemo(() => {
-    // 使用健壮的日期解析方式
-    let foreverDayjs = dayjs(_foreverDate);
-    if (!foreverDayjs.isValid()) {
-      foreverDayjs = dayjs(_foreverDate, format);
+    let foreverDayjs2 = dayjs(_foreverDate);
+    if (!foreverDayjs2.isValid()) {
+      foreverDayjs2 = dayjs(_foreverDate, format);
     }
-    if (!foreverDayjs.isValid()) {
-      // 如果还是无效，使用默认的长期日期
-      foreverDayjs = dayjs('9999-01-01');
+    if (!foreverDayjs2.isValid()) {
+      foreverDayjs2 = dayjs("9999-01-01");
     }
-    return foreverDayjs;
+    return foreverDayjs2;
   }, [_foreverDate, format]);
   if (isView) {
-    const _separator = value?.[0] && value?.[1] ? separator : '';
+    const _separator = (value == null ? void 0 : value[0]) && (value == null ? void 0 : value[1]) ? separator : "";
     if (_isForever) {
-      return /*#__PURE__*/_jsxs(Container, {
-        viewEmpty: viewEmpty,
-        children: [value?.[0]?.format(format), " ", _separator, " ", foreverText]
-      });
+      return /* @__PURE__ */ jsxs(Container, { viewEmpty, children: [
+        (_a = value == null ? void 0 : value[0]) == null ? void 0 : _a.format(format),
+        " ",
+        _separator,
+        " ",
+        foreverText
+      ] });
     }
-    return /*#__PURE__*/_jsxs(Container, {
-      viewEmpty: viewEmpty,
-      children: [props.value?.[0], " ", _separator, " ", props.value?.[1]]
-    });
+    return /* @__PURE__ */ jsxs(Container, { viewEmpty, children: [
+      (_b = props.value) == null ? void 0 : _b[0],
+      " ",
+      _separator,
+      " ",
+      (_c = props.value) == null ? void 0 : _c[1]
+    ] });
   }
-
-  // 时间范围change
   const handleRangeChange = (date, dateStr) => {
     if (!date) {
       onChange(null, null);
@@ -141,52 +139,43 @@ const ProRangeLimit = props => {
     const [startStr, endStr] = dateStr || [];
     onChange([start, end], [startStr, endStr]);
   };
-
-  // 长期选择框change
-  const handleForeverChange = e => {
+  const handleForeverChange = (e) => {
     const [start] = value || [];
     let [, end] = value || [];
     if (e.target.checked) {
       end = foreverDayjs;
-
-      // 确保 start 和 end 是有效的 dayjs 实例再调用 format
-      const startStr = start && dayjs.isDayjs(start) ? start.format(format) : undefined;
-      const endStr = end && dayjs.isDayjs(end) ? end.format(format) : undefined;
+      const startStr = start && dayjs.isDayjs(start) ? start.format(format) : void 0;
+      const endStr = end && dayjs.isDayjs(end) ? end.format(format) : void 0;
       onChange([start, end], [startStr, endStr]);
     } else {
-      // 不清除起期时间，只清除结束时间
-      const startStr = start && dayjs.isDayjs(start) ? start.format(format) : undefined;
-      onChange([start, null], [startStr, undefined]);
+      const startStr = start && dayjs.isDayjs(start) ? start.format(format) : void 0;
+      onChange([start, null], [startStr, void 0]);
     }
   };
   if (_rest.showTime === true) {
-    _rest.showTime = {
-      ..._defaultShowTime
-    };
+    _rest.showTime = { ..._defaultShowTime };
   }
-  if (_isObject(_rest.showTime)) {
+  if (isObject(_rest.showTime)) {
     _rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
   }
-  return /*#__PURE__*/_jsxs(Space.Compact, {
-    className: "pro-range-limit",
-    children: [/*#__PURE__*/_jsx(RangePicker, {
-      allowClear: true,
-      disabled: [_disabled?.[0], _disabled?.[1] || _isForever],
-      defaultPickerValue: defaultPickerValue,
-      ...initialConfig,
-      ..._omit(_rest, ['placeholder', 'separator']),
-      format: _format,
-      value: value,
-      onChange: handleRangeChange
-    }), limit && /*#__PURE__*/_jsx("div", {
-      className: className,
-      children: /*#__PURE__*/_jsx(Checkbox, {
-        checked: _isForever,
-        disabled: _disabled?.[1],
-        onChange: handleForeverChange,
-        children: foreverText
-      })
-    })]
-  });
+  return /* @__PURE__ */ jsxs(Space.Compact, { className: "pro-range-limit", children: [
+    /* @__PURE__ */ jsx(
+      RangePicker,
+      {
+        allowClear: true,
+        disabled: [_disabled == null ? void 0 : _disabled[0], (_disabled == null ? void 0 : _disabled[1]) || _isForever],
+        defaultPickerValue,
+        ...initialConfig,
+        ...omit(_rest, ["placeholder", "separator"]),
+        format: _format,
+        value,
+        onChange: handleRangeChange
+      }
+    ),
+    limit && /* @__PURE__ */ jsx("div", { className, children: /* @__PURE__ */ jsx(Checkbox, { checked: _isForever, disabled: _disabled == null ? void 0 : _disabled[1], onChange: handleForeverChange, children: foreverText }) })
+  ] });
+};
+var ProRangeLimit_default = ProRangeLimit;
+export {
+  ProRangeLimit_default as default
 };
-export default ProRangeLimit;

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

@@ -1 +0,0 @@
-export {};

package/es/ProForm/components/combination/ProTimeLimit/hooks/useControlled.js

@@ -1,20 +1,17 @@
-import dayjs from 'dayjs';
-import { useState } from 'react';
-const useControlled = props => {
-  const {
-    value,
-    onChange = () => {},
-    format
-  } = props;
+import dayjs from "dayjs";
+import { useState } from "react";
+const useControlled = (props) => {
+  const { value, onChange = () => {
+  }, format } = props;
   const [valueState, setValueState] = useState(value);
-  const handleChange = value => {
-    const _value = value && value.startOf('day').format(format);
-    if (!('value' in props)) {
-      setValueState(value);
+  const handleChange = (value2) => {
+    const _value = value2 && value2.startOf("day").format(format);
+    if (!("value" in props)) {
+      setValueState(value2);
     }
-    onChange(_value, value);
+    onChange(_value, value2);
   };
-  if ('value' in props) {
+  if ("value" in props) {
     let parsedValue = null;
     if (value) {
       parsedValue = dayjs(value, format);
@@ -24,11 +21,14 @@ const useControlled = props => {
       if (!parsedValue.isValid()) {
         parsedValue = null;
       } else {
-        parsedValue = parsedValue.startOf('day');
+        parsedValue = parsedValue.startOf("day");
       }
     }
     return [parsedValue, handleChange];
   }
   return [valueState, handleChange];
 };
-export default useControlled;
+var useControlled_default = useControlled;
+export {
+  useControlled_default as default
+};

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

@@ -1,94 +1,83 @@
-import _isFunction from "lodash/isFunction";
-import _uniq from "lodash/uniq";
-import _isObject from "lodash/isObject";
-import _omit from "lodash/omit";
-import { Checkbox, DatePicker, Space } from 'antd';
-import classNames from 'classnames';
-import dayjs from 'dayjs';
-import React, { useMemo } from 'react';
+import { jsx, jsxs } from "react/jsx-runtime";
+import { Checkbox, DatePicker, Space } from "antd";
+import classNames from "classnames";
+import omit from "lodash/omit";
+import isObject from "lodash/isObject";
+import uniq from "lodash/uniq";
+import isFunction from "lodash/isFunction";
+import dayjs from "dayjs";
+import { useMemo } from "react";
 import { useProConfig } from "../../../../ProConfigProvider";
 import Container from "../../Container";
 import useControlled from "./hooks/useControlled";
 import ProRangeLimit from "../ProRangeLimit";
 import locale from "../../../../locale";
 import ProForm from "../../../../ProForm";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-// 永久有效默认值
-
-export const ProTimeLimit = props => {
+const ProTimeLimit = (props) => {
   const {
-    format = 'YYYY-MM-DD',
+    format = "YYYY-MM-DD",
     disabled,
-    foreverDate = '9999-01-01',
+    foreverDate = "9999-01-01",
     foreverText = locale.ProTimeLimit.foreverText,
-    valueType = 'format',
+    valueType = "format",
     otherProps,
     limit = true,
     ...rest
   } = props;
-  const {
-    isView: isViewCon,
-    viewEmpty
-  } = ProForm.useFieldProps() || {};
-  const initialConfig = useProConfig('ProTimeLimit');
-  const isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
-  const _foreverDate = foreverDate || initialConfig?.foreverDate;
+  const { isView: isViewCon, viewEmpty } = ProForm.useFieldProps() || {};
+  const initialConfig = useProConfig("ProTimeLimit");
+  const isView = typeof props.isView === "boolean" ? props.isView : isViewCon;
+  const _foreverDate = foreverDate || (initialConfig == null ? void 0 : initialConfig.foreverDate);
   const _viewFormat = Array.isArray(format) ? format[0] : format;
   let tempFormat = Array.isArray(format) ? format : [format];
-  if (_isFunction(format)) {
+  if (isFunction(format)) {
     tempFormat = [];
   }
-  const _format = _uniq([...tempFormat, 'YYYY-MM-DD', 'YYYYMMDD', 'YYYY/MM/DD', 'YYYY_MM_DD', 'YYYY.MM.DD']).filter(formatKey => !!formatKey);
-
-  // dateTime模式下默认开启time选择
+  const _format = uniq([
+    ...tempFormat,
+    "YYYY-MM-DD",
+    "YYYYMMDD",
+    "YYYY/MM/DD",
+    "YYYY_MM_DD",
+    "YYYY.MM.DD"
+  ]).filter((formatKey) => !!formatKey);
   const _rest = {
     ...rest
   };
-
-  // showTime默认值受valueType属性影响
-  if (rest.showTime === undefined) {
-    if (valueType === 'dateTime') {
+  if (rest.showTime === void 0) {
+    if (valueType === "dateTime") {
       _rest.showTime = true;
     }
-    if (valueType === 'dateStartEndTime') {
+    if (valueType === "dateStartEndTime") {
       _rest.showTime = false;
     }
   }
   const _defaultShowTime = {
-    format: 'HH:mm:ss'
+    format: "HH:mm:ss"
   };
   const [foreverString, foreverDayjs] = useMemo(() => {
-    // 使用健壮的日期解析方式
-    let foreverDayjs = dayjs(_foreverDate);
-    if (!foreverDayjs.isValid()) {
-      foreverDayjs = dayjs(_foreverDate, format);
+    let foreverDayjs2 = dayjs(_foreverDate);
+    if (!foreverDayjs2.isValid()) {
+      foreverDayjs2 = dayjs(_foreverDate, format);
     }
-    if (!foreverDayjs.isValid()) {
-      // 如果还是无效，使用默认的长期日期
-      foreverDayjs = dayjs('9999-01-01');
+    if (!foreverDayjs2.isValid()) {
+      foreverDayjs2 = dayjs("9999-01-01");
     }
-    const foreverString = foreverDayjs.format(format);
-    return [foreverString, foreverDayjs];
+    const foreverString2 = foreverDayjs2.format(format);
+    return [foreverString2, foreverDayjs2];
   }, [format, _foreverDate]);
-
-  // 管理value的受控状态
-  const [value, onChange] = useControlled({
-    format,
-    ...props
-  });
+  const [value, onChange] = useControlled({ format, ...props });
   const isForever = useMemo(() => {
-    if (_isObject(value)) {
+    if (isObject(value)) {
       return foreverDayjs.format(format) === value.format(format);
     }
     return false;
   }, [foreverDayjs, value]);
-  const foreverChange = e => {
+  const foreverChange = (e) => {
     const checkedForever = e.target.checked;
     if (checkedForever) {
-      // 直接使用计算好的 foreverDayjs，避免重新解析
       onChange(foreverDayjs);
     } else {
-      // 防止长期选择后，时间面板还是9999-01-01
       onChange(dayjs());
       setTimeout(() => {
         onChange(null);
@@ -97,73 +86,50 @@ export const ProTimeLimit = props => {
   };
   if (isView) {
     if (isForever) {
-      return /*#__PURE__*/_jsx(Container, {
-        viewEmpty: viewEmpty,
-        children: foreverText
-      });
+      return /* @__PURE__ */ jsx(Container, { viewEmpty, children: foreverText });
     }
-    if (_isObject(value)) {
-      return /*#__PURE__*/_jsx(Container, {
-        viewEmpty: viewEmpty,
-        children: value.format(_viewFormat)
-      });
+    if (isObject(value)) {
+      return /* @__PURE__ */ jsx(Container, { viewEmpty, children: value.format(_viewFormat) });
     }
-    return /*#__PURE__*/_jsx(Container, {
-      viewEmpty: viewEmpty,
-      children: props.value
-    });
+    return /* @__PURE__ */ jsx(Container, { viewEmpty, children: props.value });
   }
   if (_rest.showTime === true) {
-    _rest.showTime = {
-      ..._defaultShowTime
-    };
+    _rest.showTime = { ..._defaultShowTime };
   }
-  if (_isObject(_rest.showTime)) {
+  if (isObject(_rest.showTime)) {
     _rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
   }
   const className = classNames({
-    'ant-input': true,
-    'ant-input-disabled': disabled,
-    'forever-checkbox': true
-  });
-  return /*#__PURE__*/_jsxs(Space.Compact, {
-    className: "pro-time-limit",
-    children: [/*#__PURE__*/_jsx(DatePicker, {
-      defaultPickerValue: dayjs(),
-      disabled: disabled || isForever,
-      ...initialConfig,
-      ..._omit(_rest, ['placeholder']),
-      format: _format,
-      value: value,
-      onChange: onChange
-    }), limit && /*#__PURE__*/_jsx("div", {
-      className: className,
-      children: /*#__PURE__*/_jsx(Checkbox, {
-        checked: isForever,
-        disabled: disabled,
-        onChange: foreverChange,
-        children: foreverText
-      })
-    })]
+    "ant-input": true,
+    "ant-input-disabled": disabled,
+    "forever-checkbox": true
   });
+  return /* @__PURE__ */ jsxs(Space.Compact, { className: "pro-time-limit", children: [
+    /* @__PURE__ */ jsx(
+      DatePicker,
+      {
+        defaultPickerValue: dayjs(),
+        disabled: disabled || isForever,
+        ...initialConfig,
+        ...omit(_rest, ["placeholder"]),
+        format: _format,
+        value,
+        onChange
+      }
+    ),
+    limit && /* @__PURE__ */ jsx("div", { className, children: /* @__PURE__ */ jsx(Checkbox, { checked: isForever, disabled, onChange: foreverChange, children: foreverText }) })
+  ] });
 };
-const LimitPick = props => {
-  const {
-    mode = 'DatePicker',
-    ...rest
-  } = props;
-  const {
-    foreverDate
-  } = useProConfig('ProTimeLimit') || {};
-  if (mode === 'RangePicker') {
-    return /*#__PURE__*/_jsx(ProRangeLimit, {
-      foreverDate: foreverDate,
-      ...rest
-    });
+const LimitPick = (props) => {
+  const { mode = "DatePicker", ...rest } = props;
+  const { foreverDate } = useProConfig("ProTimeLimit") || {};
+  if (mode === "RangePicker") {
+    return /* @__PURE__ */ jsx(ProRangeLimit, { foreverDate, ...rest });
   }
-  return /*#__PURE__*/_jsx(ProTimeLimit, {
-    foreverDate: foreverDate,
-    ...rest
-  });
+  return /* @__PURE__ */ jsx(ProTimeLimit, { foreverDate, ...rest });
+};
+var ProTimeLimit_default = LimitPick;
+export {
+  ProTimeLimit,
+  ProTimeLimit_default as default
 };
-export default LimitPick;