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

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

@@ -1,196 +1,178 @@
-import _uniq from "lodash/uniq";
-import _omit from "lodash/omit";
-import _isString from "lodash/isString";
-import _isObject from "lodash/isObject";
-import _isFunction from "lodash/isFunction";
-// @ts-check
-import { DatePicker } from 'antd';
-import dayjs from 'dayjs';
-import React from 'react';
+import { jsx } from "react/jsx-runtime";
+import { DatePicker } from "antd";
+import isFunction from "lodash/isFunction";
+import isObject from "lodash/isObject";
+import isString from "lodash/isString";
+import omit from "lodash/omit";
+import uniq from "lodash/uniq";
+import dayjs from "dayjs";
 import { useProConfig } from "../../../../ProConfigProvider";
 import locale from "../../../../locale";
 import enUS from "../../../../locale/en_US";
 import ProForm from "../../../../ProForm";
 import Container from "../../Container";
 import { useDateRange } from "./useDateRange";
-import { jsx as _jsx } from "react/jsx-runtime";
-const {
-  RangePicker: AntRangePicker
-} = DatePicker;
-
-/** 与 DatePicker 一致：无 valueType 时按 picker 决定默认展示格式 */
-const getDefaultFormat = picker => {
+const { RangePicker: AntRangePicker } = DatePicker;
+const getDefaultFormat = (picker) => {
   switch (picker) {
-    case 'week':
-      return 'YYYY-ww';
-    case 'month':
-      return 'YYYY-MM';
-    case 'quarter':
-      return 'YYYY-[Q]Q';
-    case 'year':
-      return 'YYYY';
+    case "week":
+      return "YYYY-ww";
+    case "month":
+      return "YYYY-MM";
+    case "quarter":
+      return "YYYY-[Q]Q";
+    case "year":
+      return "YYYY";
     default:
-      return 'YYYY-MM-DD';
+      return "YYYY-MM-DD";
   }
 };
-
-// 获取默认快捷选项（presets 格式）
 const getDefaultPresets = () => {
-  const rangeLabels = locale?.RangePicker?.ranges || enUS.RangePicker.ranges;
-  return [{
-    label: rangeLabels.today,
-    value: [dayjs().startOf('day'), dayjs().endOf('day')]
-  }, {
-    label: rangeLabels.lastWeek,
-    value: [dayjs().subtract(1, 'week').startOf('day'), dayjs().endOf('day')]
-  }, {
-    label: rangeLabels.lastMonth,
-    value: [dayjs().subtract(1, 'month').startOf('day'), dayjs().endOf('day')]
-  }, {
-    label: rangeLabels.last3Months,
-    value: [dayjs().subtract(3, 'month').startOf('day'), dayjs().endOf('day')]
-  }, {
-    label: rangeLabels.lastYear,
-    value: [dayjs().subtract(1, 'year').startOf('day'), dayjs().endOf('day')]
-  }];
+  var _a, _b;
+  const rangeLabels = ((_b = (_a = locale) == null ? void 0 : _a.RangePicker) == null ? void 0 : _b.ranges) || enUS.RangePicker.ranges;
+  return [
+    {
+      label: rangeLabels.today,
+      value: [dayjs().startOf("day"), dayjs().endOf("day")]
+    },
+    {
+      label: rangeLabels.lastWeek,
+      value: [dayjs().subtract(1, "week").startOf("day"), dayjs().endOf("day")]
+    },
+    {
+      label: rangeLabels.lastMonth,
+      value: [dayjs().subtract(1, "month").startOf("day"), dayjs().endOf("day")]
+    },
+    {
+      label: rangeLabels.last3Months,
+      value: [dayjs().subtract(3, "month").startOf("day"), dayjs().endOf("day")]
+    },
+    {
+      label: rangeLabels.lastYear,
+      value: [dayjs().subtract(1, "year").startOf("day"), dayjs().endOf("day")]
+    }
+  ];
 };
-const RangePicker = props => {
-  const {
-    format,
-    otherProps,
-    separator = '~',
-    range,
-    presets,
-    ...rest
-  } = props;
-  const initialConfig = useProConfig('AntRangePicker');
-  const {
-    isView: isViewCon,
-    viewEmpty,
-    valueType
-  } = ProForm.useFieldProps() || {};
-
-  // 优先级：valueType > format > picker 默认（与 DatePicker 一致）
+const RangePicker = (props) => {
+  const { format, otherProps, separator = "~", range, presets, ...rest } = props;
+  const initialConfig = useProConfig("AntRangePicker");
+  const { isView: isViewCon, viewEmpty, valueType } = ProForm.useFieldProps() || {};
   let nextFormat;
-  if (valueType === 'dateTime') {
-    nextFormat = 'YYYY-MM-DD HH:mm:ss';
-  } else if (valueType === 'date' || valueType === 'dateStartEndTime') {
-    nextFormat = 'YYYY-MM-DD';
-  } else if (_isFunction(format)) {
-    nextFormat = undefined;
-  } else if (Array.isArray(format) && format.length && !_isFunction(format[0])) {
+  if (valueType === "dateTime") {
+    nextFormat = "YYYY-MM-DD HH:mm:ss";
+  } else if (valueType === "date" || valueType === "dateStartEndTime") {
+    nextFormat = "YYYY-MM-DD";
+  } else if (isFunction(format)) {
+    nextFormat = void 0;
+  } else if (Array.isArray(format) && format.length && !isFunction(format[0])) {
     nextFormat = format[0];
-  } else if (typeof format === 'string') {
+  } else if (typeof format === "string") {
     nextFormat = format;
   } else {
     nextFormat = getDefaultFormat(rest.picker);
   }
-
-  // 返回函数管理起止时间可选范围
-  const rangeRegulator = useDateRange({
-    range,
-    disabledDate: rest.disabledDate
-  });
-  const isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
+  const rangeRegulator = useDateRange({ range, disabledDate: rest.disabledDate });
+  const isView = typeof props.isView === "boolean" ? props.isView : isViewCon;
   const _rest = {
     ...rest
   };
-
-  // 处理 presets 配置
   let finalPresets;
-  if (presets === undefined) {
-    // 默认使用预设快捷选项
+  if (presets === void 0) {
     finalPresets = getDefaultPresets();
   } else {
-    // 使用用户提供的 presets（可以是 false 来禁用）
-    finalPresets = presets || undefined;
+    finalPresets = presets || void 0;
   }
-
-  // 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;
     }
   }
-
-  // 字符串时间格式兼容（与 DatePicker 一致：优先按 nextFormat 严格解析）
-  if (Array.isArray(_rest.value) && _isString(_rest.value[0]) && _isString(_rest.value[1])) {
-    const parseRangeString = s => {
-      if (nextFormat && !_isFunction(format)) {
+  if (Array.isArray(_rest.value) && isString(_rest.value[0]) && isString(_rest.value[1])) {
+    const parseRangeString = (s) => {
+      if (nextFormat && !isFunction(format)) {
         const parsed = dayjs(s, nextFormat, true);
-        if (parsed.isValid()) return parsed;
+        if (parsed.isValid())
+          return parsed;
       }
       return dayjs(s);
     };
     _rest.value = [parseRangeString(_rest.value[0]), parseRangeString(_rest.value[1])];
   }
   let tempFormat;
-  if (_isFunction(format)) {
+  if (isFunction(format)) {
     tempFormat = [];
-  } else if (valueType === 'dateTime') {
-    tempFormat = ['YYYY-MM-DD HH:mm:ss'];
-  } else if (valueType === 'date' || valueType === 'dateStartEndTime') {
-    tempFormat = ['YYYY-MM-DD'];
+  } else if (valueType === "dateTime") {
+    tempFormat = ["YYYY-MM-DD HH:mm:ss"];
+  } else if (valueType === "date" || valueType === "dateStartEndTime") {
+    tempFormat = ["YYYY-MM-DD"];
   } else if (Array.isArray(format)) {
-    tempFormat = format.filter(f => typeof f === 'string') || [];
+    tempFormat = format.filter((f) => typeof f === "string") || [];
     if (!tempFormat.length) {
       tempFormat = [getDefaultFormat(rest.picker)];
     }
-  } else if (typeof format === 'string') {
+  } else if (typeof format === "string") {
     tempFormat = [format];
   } else {
     tempFormat = [getDefaultFormat(rest.picker)];
   }
-  const _format = _uniq([...tempFormat, 'YYYY-MM-DD HH:mm:ss', 'YYYY-MM-DD', 'YYYYMMDD', 'YYYY/MM/DD', 'YYYY_MM_DD', 'YYYY.MM.DD']).filter(formatKey => !!formatKey);
+  const _format = uniq([
+    ...tempFormat,
+    "YYYY-MM-DD HH:mm:ss",
+    "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"
   };
   if (isView) {
-    const {
-      value = []
-    } = _rest;
+    const { value = [] } = _rest;
     let viewChildren = null;
     if (!value || !value[0] || !value[1]) {
       viewChildren = null;
-    } else if (valueType === 'dateTime' || valueType === 'date' || valueType === 'dateStartEndTime') {
-      const vf = nextFormat || 'YYYY-MM-DD';
+    } else if (valueType === "dateTime" || valueType === "date" || valueType === "dateStartEndTime") {
+      const vf = nextFormat || "YYYY-MM-DD";
       viewChildren = `${value[0].format(vf)} ${separator} ${value[1].format(vf)}`;
     } else if (Array.isArray(format)) {
       const formattedList = format.map((formatItem, index) => {
-        if (_isFunction(formatItem)) {
+        var _a, _b;
+        if (isFunction(formatItem)) {
           return formatItem(value[index]);
         }
-        return value[index].format?.(formatItem) || value[index];
+        return ((_b = (_a = value[index]).format) == null ? void 0 : _b.call(_a, formatItem)) || value[index];
       });
       viewChildren = formattedList.join(separator);
-    } else if (_isFunction(format)) {
+    } else if (isFunction(format)) {
       viewChildren = `${format(value[0])} ${separator} ${format(value[1])}`;
     } else {
-      const vf = (typeof format === 'string' ? format : nextFormat) || 'YYYY-MM-DD';
+      const vf = (typeof format === "string" ? format : nextFormat) || "YYYY-MM-DD";
       viewChildren = `${value[0].format(vf)} ${separator} ${value[1].format(vf)}`;
     }
-    return /*#__PURE__*/_jsx(Container, {
-      viewEmpty: viewEmpty,
-      children: viewChildren
-    });
+    return /* @__PURE__ */ jsx(Container, { viewEmpty, children: viewChildren });
   }
   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__*/_jsx(AntRangePicker, {
-    ...initialConfig,
-    ..._omit(_rest, ['separator']),
-    ...rangeRegulator,
-    format: _format,
-    presets: finalPresets
-  });
+  return /* @__PURE__ */ jsx(
+    AntRangePicker,
+    {
+      ...initialConfig,
+      ...omit(_rest, ["separator"]),
+      ...rangeRegulator,
+      format: _format,
+      presets: finalPresets
+    }
+  );
+};
+var RangePicker_default = RangePicker;
+export {
+  RangePicker_default as default
 };
-export default RangePicker;

package/es/ProForm/components/base/RangePicker/useDateRange.js

@@ -1,30 +1,33 @@
-import { useState } from 'react';
-/**
- * 支持传入时间范围作为起止期的间隔时间
- */
-export const useDateRange = props => {
-  const {
-    range,
-    disabledDate
-  } = props;
+import { useState } from "react";
+const useDateRange = (props) => {
+  const { range, disabledDate } = props;
   const [dates, setDates] = useState([]);
-  if (!range) return;
+  if (!range)
+    return;
   return {
-    onCalendarChange: val => {
+    onCalendarChange: (val) => {
+      var _a, _b;
       if (!val) {
         setDates(val);
         return;
       }
-      const _val = [val[0]?.clone().startOf('day'), val[1]?.clone().startOf('day')];
+      const _val = [
+        (_a = val[0]) == null ? void 0 : _a.clone().startOf("day"),
+        (_b = val[1]) == null ? void 0 : _b.clone().startOf("day")
+      ];
       setDates(_val);
     },
-    disabledDate: current => {
-      if (!dates) return false;
-      const _current = current.clone().startOf('day');
+    disabledDate: (current) => {
+      if (!dates)
+        return false;
+      const _current = current.clone().startOf("day");
       const tooLate = dates[0] && _current.diff(dates[0], range[1]) >= range[0];
       const tooEarly = dates[1] && dates[1].diff(_current, range[1]) >= range[0];
-      const outerDisableDate = disabledDate?.(current);
+      const outerDisableDate = disabledDate == null ? void 0 : disabledDate(current);
       return !!tooEarly || !!tooLate || outerDisableDate;
     }
   };
-};
+};
+export {
+  useDateRange
+};

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

@@ -1,107 +1,81 @@
-import _isNumber from "lodash/isNumber";
-import { Select as AntSelect, Tooltip } from 'antd';
-import React, { useCallback } from 'react';
+import { jsx, jsxs } from "react/jsx-runtime";
+import { Select as AntSelect, Tooltip } from "antd";
+import { useCallback } from "react";
+import isNumber from "lodash/isNumber";
 import Container from "../../Container";
 import { useProConfig } from "../../../../ProConfigProvider";
 import locale from "../../../../locale";
 import ProForm from "../../../index";
-import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
-const Select = props => {
-  const {
-    dataSource = [],
-    fieldNames,
-    otherProps,
-    scrollFollowParent = true,
-    ...rest
-  } = props;
-  const {
-    isView: isViewCon,
-    viewEmpty
-  } = ProForm.useFieldProps() || {};
-  const isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
-
-  const initialConfig = useProConfig('Select') || {};
-  const _fieldNames = fieldNames || initialConfig.fieldNames || {
-    label: 'label',
-    value: 'value'
-  };
-
-  // 使用原生maxTagPlaceholder实现hover提示
-  const maxTagPlaceholder = useCallback(omittedValues => {
-    // 提取被省略的标签文本
-    const omittedLabels = omittedValues.map(value => {
-      // value可能是对象形式（labelInValue模式）或简单值
-      const targetValue = typeof value === 'object' ? value.value : value;
-      const item = dataSource.find(item => item[_fieldNames.value] === targetValue);
-      return item?.[_fieldNames.label] || targetValue;
-    });
-    const tooltipContent = omittedLabels.join('、');
-    return /*#__PURE__*/_jsx(Tooltip, {
-      title: tooltipContent,
-      children: /*#__PURE__*/_jsxs("span", {
-        children: ["+ ", omittedValues.length, " ..."]
-      })
-    });
-  }, [dataSource, _fieldNames]);
+const Select = (props) => {
+  const { dataSource = [], fieldNames, otherProps, scrollFollowParent = true, ...rest } = props;
+  const { isView: isViewCon, viewEmpty } = ProForm.useFieldProps() || {};
+  const isView = typeof props.isView === "boolean" ? props.isView : isViewCon;
+  const initialConfig = useProConfig("Select") || {};
+  const _fieldNames = fieldNames || initialConfig.fieldNames || { label: "label", value: "value" };
+  const maxTagPlaceholder = useCallback(
+    (omittedValues) => {
+      const omittedLabels = omittedValues.map((value) => {
+        const targetValue = typeof value === "object" ? value.value : value;
+        const item = dataSource.find((item2) => item2[_fieldNames.value] === targetValue);
+        return (item == null ? void 0 : item[_fieldNames.label]) || targetValue;
+      });
+      const tooltipContent = omittedLabels.join("、");
+      return /* @__PURE__ */ jsx(Tooltip, { title: tooltipContent, children: /* @__PURE__ */ jsxs("span", { children: [
+        "+ ",
+        omittedValues.length,
+        " ..."
+      ] }) });
+    },
+    [dataSource, _fieldNames]
+  );
   if (isView) {
-    const {
-      value,
-      maxTagCount
-    } = rest;
-    const transToLabel = value => {
-      const labelList = value.map(item => {
-        return dataSource.find(dataItem => {
+    const { value, maxTagCount } = rest;
+    const transToLabel = (value2) => {
+      const labelList = value2.map((item) => {
+        var _a;
+        return (_a = dataSource.find((dataItem) => {
           return dataItem[_fieldNames.value] === item;
-        })?.[_fieldNames.label];
+        })) == null ? void 0 : _a[_fieldNames.label];
       });
-      return labelList.join('、');
+      return labelList.join("、");
     };
     if (Array.isArray(value)) {
-      // 如果设置了maxTagCount且超出数量，需要截断显示
-      const shouldTruncate = typeof maxTagCount === 'number' && value.length > maxTagCount;
+      const shouldTruncate = typeof maxTagCount === "number" && value.length > maxTagCount;
       if (shouldTruncate) {
-        // 截断显示：显示前N项 + "更多N项..."
         const visibleItems = value.slice(0, maxTagCount);
         const hiddenItems = value.slice(maxTagCount);
         const hiddenCount = value.length - maxTagCount;
         const visibleText = transToLabel(visibleItems);
-        const hiddenText = transToLabel(hiddenItems); // 只显示被隐藏的标签
-        const moreText = locale.ProForm.moreItems.replace('{count}', hiddenCount.toString());
-        return /*#__PURE__*/_jsxs(Container, {
-          viewEmpty: viewEmpty,
-          children: [visibleText, "\u3001", /*#__PURE__*/_jsx(Tooltip, {
-            title: hiddenText,
-            children: /*#__PURE__*/_jsx("span", {
-              children: moreText
-            })
-          })]
-        });
+        const hiddenText = transToLabel(hiddenItems);
+        const moreText = locale.ProForm.moreItems.replace("{count}", hiddenCount.toString());
+        return /* @__PURE__ */ jsxs(Container, { viewEmpty, children: [
+          visibleText,
+          "、",
+          /* @__PURE__ */ jsx(Tooltip, { title: hiddenText, children: /* @__PURE__ */ jsx("span", { children: moreText }) })
+        ] });
       }
-
-      // 不需要截断，正常显示
-      return /*#__PURE__*/_jsx(Container, {
-        viewEmpty: viewEmpty,
-        children: transToLabel(value)
-      });
+      return /* @__PURE__ */ jsx(Container, { viewEmpty, children: transToLabel(value) });
     }
-    return /*#__PURE__*/_jsx(Container, {
-      viewEmpty: viewEmpty,
-      children: value || _isNumber(value) ? transToLabel([value]) : null
-    });
+    return /* @__PURE__ */ jsx(Container, { viewEmpty, children: value || isNumber(value) ? transToLabel([value]) : null });
   }
-  return /*#__PURE__*/_jsx(AntSelect, {
-    placeholder: `${locale.ProForm.selectPlaceHolder}`,
-    allowClear: true,
-    getPopupContainer: trigger => {
-      return scrollFollowParent ? trigger.parentElement : document.body;
-    },
-    ...initialConfig,
-    options: dataSource,
-    ...rest,
-    // 如果是多选模式且用户没有自定义maxTagPlaceholder，使用我们的hover版本
-    maxTagPlaceholder: rest.mode === 'multiple' && !rest.maxTagPlaceholder ? maxTagPlaceholder : rest.maxTagPlaceholder,
-    value: rest.value === '' ? null : rest.value,
-    fieldNames: _fieldNames
-  });
+  return /* @__PURE__ */ jsx(
+    AntSelect,
+    {
+      placeholder: `${locale.ProForm.selectPlaceHolder}`,
+      allowClear: true,
+      getPopupContainer: (trigger) => {
+        return scrollFollowParent ? trigger.parentElement : document.body;
+      },
+      ...initialConfig,
+      options: dataSource,
+      ...rest,
+      maxTagPlaceholder: rest.mode === "multiple" && !rest.maxTagPlaceholder ? maxTagPlaceholder : rest.maxTagPlaceholder,
+      value: rest.value === "" ? null : rest.value,
+      fieldNames: _fieldNames
+    }
+  );
+};
+var Select_default = Select;
+export {
+  Select_default as default
 };
-export default Select;

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

@@ -1,43 +1,35 @@
-import _isUndefined from "lodash/isUndefined";
-import _isNull from "lodash/isNull";
-import { Switch as AntSwitch } from 'antd';
-import React from 'react';
+import { Fragment, jsx } from "react/jsx-runtime";
+import { Switch as AntSwitch } from "antd";
+import isNull from "lodash/isNull";
+import isUndefined from "lodash/isUndefined";
 import { useProConfig } from "../../../../ProConfigProvider";
 import Container from "../../Container";
 import locale from "../../../../locale";
 import ProForm from "../../../../ProForm";
-import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
-const Switch = props => {
-  const {
-    disabled,
-    otherProps,
-    ...res
-  } = props;
-  const {
-    isView: isViewCon,
-    viewEmpty,
-    valueType
-  } = ProForm.useFieldProps() || {};
-  const isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
-  const config = useProConfig('Switch');
+const Switch = (props) => {
+  const { disabled, otherProps, ...res } = props;
+  const { isView: isViewCon, viewEmpty, valueType } = ProForm.useFieldProps() || {};
+  const isView = typeof props.isView === "boolean" ? props.isView : isViewCon;
+  const config = useProConfig("Switch");
   if (isView) {
-    if (_isUndefined(res?.checked) || _isNull(res?.checked) || valueType === 'switch' && _isUndefined(res.value)) {
-      return /*#__PURE__*/_jsx(_Fragment, {
-        children: viewEmpty
-      });
+    if (isUndefined(res == null ? void 0 : res.checked) || isNull(res == null ? void 0 : res.checked) || valueType === "switch" && isUndefined(res.value)) {
+      return /* @__PURE__ */ jsx(Fragment, { children: viewEmpty });
     }
-    return /*#__PURE__*/_jsx(Container, {
-      viewEmpty: viewEmpty,
-      children: res.checked === true ? `${locale.ProForm.switchText[0]}` : `${locale.ProForm.switchText[1]}`
-    });
+    return /* @__PURE__ */ jsx(Container, { viewEmpty, children: res.checked === true ? `${locale.ProForm.switchText[0]}` : `${locale.ProForm.switchText[1]}` });
   }
-  return /*#__PURE__*/_jsx(AntSwitch, {
-    disabled: disabled,
-    checkedChildren: `${locale.ProForm.switchText[0]}`,
-    unCheckedChildren: `${locale.ProForm.switchText[1]}`,
-    ...config,
-    ...res,
-    id: "switch_only" // 解决点击label联动的问题
-  });
+  return /* @__PURE__ */ jsx(
+    AntSwitch,
+    {
+      disabled,
+      checkedChildren: `${locale.ProForm.switchText[0]}`,
+      unCheckedChildren: `${locale.ProForm.switchText[1]}`,
+      ...config,
+      ...res,
+      id: "switch_only"
+    }
+  );
+};
+var Switch_default = Switch;
+export {
+  Switch_default as default
 };
-export default Switch;