@zat-design/sisyphus-react 3.13.14-deta.2 → 4.0.0-beta.3

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

@@ -1,175 +1,163 @@
-"use strict";
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-Object.defineProperty(exports, "__esModule", {
-  value: true
+// src/ProForm/components/combination/ProTimeLimit/index.tsx
+var ProTimeLimit_exports = {};
+__export(ProTimeLimit_exports, {
+  ProTimeLimit: () => ProTimeLimit,
+  default: () => ProTimeLimit_default
 });
-exports.default = exports.ProTimeLimit = void 0;
-require("antd/es/checkbox/style");
-var _checkbox = _interopRequireDefault(require("antd/es/checkbox"));
-require("antd/es/date-picker/style");
-var _datePicker = _interopRequireDefault(require("antd/es/date-picker"));
-require("antd/es/input/style");
-var _input = _interopRequireDefault(require("antd/es/input"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
-var _uniq2 = _interopRequireDefault(require("lodash/uniq"));
-var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
-var _omit2 = _interopRequireDefault(require("lodash/omit"));
-var _jsxRuntime = require("react/jsx-runtime");
-var _classnames = _interopRequireDefault(require("classnames"));
-var _moment = _interopRequireDefault(require("moment"));
-var _react = require("react");
-var _ProConfigProvider = require("../../../../ProConfigProvider");
-var _Container = _interopRequireDefault(require("../../Container"));
-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", "foreverDate", "foreverText", "valueType", "otherProps", "limit"],
-  _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,
-    _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,
-    valueType = _props$valueType === void 0 ? 'format' : _props$valueType,
-    otherProps = props.otherProps,
-    _props$limit = props.limit,
-    limit = _props$limit === void 0 ? true : _props$limit,
-    rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  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 _viewFormat = Array.isArray(format) ? format[0] : format;
-  var tempFormat = Array.isArray(format) ? format : [format];
-  if ((0, _isFunction2.default)(format)) {
+module.exports = __toCommonJS(ProTimeLimit_exports);
+var import_antd = require("antd");
+var import_classnames = __toESM(require("classnames"));
+var import_lodash = require("lodash");
+var import_dayjs = __toESM(require("dayjs"));
+var import_react = __toESM(require("react"));
+var import_ProConfigProvider = require("../../../../ProConfigProvider");
+var import_Container = __toESM(require("../../Container"));
+var import_useControlled = __toESM(require("./hooks/useControlled"));
+var import_ProRangeLimit = __toESM(require("../ProRangeLimit"));
+var import_locale = __toESM(require("../../../../locale"));
+var import_ProForm = __toESM(require("../../../../ProForm"));
+var ProTimeLimit = (props) => {
+  const {
+    format = "YYYY-MM-DD",
+    disabled,
+    foreverDate = "9999-01-01",
+    foreverText = import_locale.default.ProTimeLimit.foreverText,
+    valueType = "format",
+    otherProps,
+    limit = true,
+    ...rest
+  } = props;
+  const { isView: isViewCon, viewEmpty } = import_ProForm.default.useFieldProps() || {};
+  const initialConfig = (0, import_ProConfigProvider.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 ((0, import_lodash.isFunction)(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;
-  });
-  // dateTime模式下默认开启time选择
-  var _rest = (0, _objectSpread2.default)({}, rest);
-  // showTime默认值受valueType属性影响
-  if (rest.showTime === undefined) {
-    if (valueType === 'dateTime') {
+  const _format = (0, import_lodash.uniq)([
+    ...tempFormat,
+    "YYYY-MM-DD",
+    "YYYYMMDD",
+    "YYYY/MM/DD",
+    "YYYY_MM_DD",
+    "YYYY.MM.DD"
+  ]).filter((formatKey) => !!formatKey);
+  const _rest = {
+    ...rest
+  };
+  if (rest.showTime === void 0) {
+    if (valueType === "dateTime") {
       _rest.showTime = true;
     }
-    if (valueType === 'dateStartEndTime') {
+    if (valueType === "dateStartEndTime") {
       _rest.showTime = false;
     }
   }
-  var _defaultShowTime = {
-    format: 'HH:mm:ss'
+  const _defaultShowTime = {
+    format: "HH:mm:ss"
   };
-  var _useMemo = (0, _react.useMemo)(function () {
-      var foreverMoment = (0, _moment.default)(_foreverDate, format);
-      var foreverString = _foreverDate || foreverMoment.format(format);
-      return [foreverString, foreverMoment];
-    }, [format, _foreverDate]),
-    _useMemo2 = (0, _slicedToArray2.default)(_useMemo, 2),
-    foreverString = _useMemo2[0],
-    foreverMoment = _useMemo2[1];
-  // 管理value的受控状态
-  var _useControlled = (0, _useControlled3.default)((0, _objectSpread2.default)({
-      format: format
-    }, props)),
-    _useControlled2 = (0, _slicedToArray2.default)(_useControlled, 2),
-    value = _useControlled2[0],
-    onChange = _useControlled2[1];
-  var isForever = (0, _react.useMemo)(function () {
-    if ((0, _isObject2.default)(value)) {
-      return foreverMoment.format(format) === value.format(format);
+  const [foreverString, foreverDayjs] = (0, import_react.useMemo)(() => {
+    let foreverDayjs2 = (0, import_dayjs.default)(_foreverDate);
+    if (!foreverDayjs2.isValid()) {
+      foreverDayjs2 = (0, import_dayjs.default)(_foreverDate, format);
+    }
+    if (!foreverDayjs2.isValid()) {
+      foreverDayjs2 = (0, import_dayjs.default)("9999-01-01");
+    }
+    const foreverString2 = foreverDayjs2.format(format);
+    return [foreverString2, foreverDayjs2];
+  }, [format, _foreverDate]);
+  const [value, onChange] = (0, import_useControlled.default)({ format, ...props });
+  const isForever = (0, import_react.useMemo)(() => {
+    if ((0, import_lodash.isObject)(value)) {
+      return foreverDayjs.format(format) === value.format(format);
     }
     return false;
-  }, [foreverMoment, value]);
-  var foreverChange = function foreverChange(e) {
-    var checkedForever = e.target.checked;
+  }, [foreverDayjs, value]);
+  const foreverChange = (e) => {
+    const checkedForever = e.target.checked;
     if (checkedForever) {
-      onChange((0, _moment.default)(foreverString, format));
+      onChange(foreverDayjs);
     } else {
-      // 防止长期选择后，时间面板还是9999-01-01
-      onChange((0, _moment.default)());
-      setTimeout(function () {
+      onChange((0, import_dayjs.default)());
+      setTimeout(() => {
         onChange(null);
       }, 0);
     }
   };
   if (isView) {
     if (isForever) {
-      return (0, _jsxRuntime.jsx)(_Container.default, {
-        viewEmpty: viewEmpty,
-        children: foreverText
-      });
+      return /* @__PURE__ */ import_react.default.createElement(import_Container.default, { viewEmpty }, foreverText);
     }
-    if ((0, _isObject2.default)(value)) {
-      return (0, _jsxRuntime.jsx)(_Container.default, {
-        viewEmpty: viewEmpty,
-        children: value.format(_viewFormat)
-      });
+    if ((0, import_lodash.isObject)(value)) {
+      return /* @__PURE__ */ import_react.default.createElement(import_Container.default, { viewEmpty }, value.format(_viewFormat));
     }
-    return (0, _jsxRuntime.jsx)(_Container.default, {
-      viewEmpty: viewEmpty,
-      children: props.value
-    });
+    return /* @__PURE__ */ import_react.default.createElement(import_Container.default, { viewEmpty }, props.value);
   }
   if (_rest.showTime === true) {
-    _rest.showTime = (0, _objectSpread2.default)({}, _defaultShowTime);
+    _rest.showTime = { ..._defaultShowTime };
   }
-  if ((0, _isObject2.default)(_rest.showTime)) {
+  if ((0, import_lodash.isObject)(_rest.showTime)) {
     _rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
   }
-  var className = (0, _classnames.default)({
-    'ant-input': true,
-    'ant-input-disabled': disabled,
-    'forever-checkbox': true
+  const className = (0, import_classnames.default)({
+    "ant-input": true,
+    "ant-input-disabled": disabled,
+    "forever-checkbox": true
   });
-  return (0, _jsxRuntime.jsxs)(_input.default.Group, {
-    compact: true,
-    className: "pro-time-limit",
-    children: [(0, _jsxRuntime.jsx)(_datePicker.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
-      defaultPickerValue: (0, _moment.default)(),
-      disabled: disabled || isForever
-    }, initialConfig), (0, _omit2.default)(_rest, ['placeholder'])), {}, {
+  return /* @__PURE__ */ import_react.default.createElement(import_antd.Space.Compact, { className: "pro-time-limit" }, /* @__PURE__ */ import_react.default.createElement(
+    import_antd.DatePicker,
+    {
+      defaultPickerValue: (0, import_dayjs.default)(),
+      disabled: disabled || isForever,
+      ...initialConfig,
+      ...(0, import_lodash.omit)(_rest, ["placeholder"]),
       format: _format,
-      value: value,
-      onChange: onChange
-    })), limit && (0, _jsxRuntime.jsx)("div", {
-      className: className,
-      children: (0, _jsxRuntime.jsx)(_checkbox.default, {
-        checked: isForever,
-        disabled: disabled,
-        onChange: foreverChange,
-        children: foreverText
-      })
-    })]
-  });
+      value,
+      onChange
+    }
+  ), limit && /* @__PURE__ */ import_react.default.createElement("div", { className }, /* @__PURE__ */ import_react.default.createElement(import_antd.Checkbox, { checked: isForever, disabled, onChange: foreverChange }, foreverText)));
 };
-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)({
-      foreverDate: foreverDate
-    }, rest));
+var LimitPick = (props) => {
+  const { mode = "DatePicker", ...rest } = props;
+  const { foreverDate } = (0, import_ProConfigProvider.useProConfig)("ProTimeLimit") || {};
+  if (mode === "RangePicker") {
+    return /* @__PURE__ */ import_react.default.createElement(import_ProRangeLimit.default, { foreverDate, ...rest });
   }
-  return (0, _jsxRuntime.jsx)(ProTimeLimit, (0, _objectSpread2.default)({
-    foreverDate: foreverDate
-  }, rest));
+  return /* @__PURE__ */ import_react.default.createElement(ProTimeLimit, { foreverDate, ...rest });
 };
-var _default = exports.default = LimitPick;
+var ProTimeLimit_default = LimitPick;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ProTimeLimit
+});

package/lib/ProForm/components/combination/ProTimeLimit/style/index.less

@@ -1,5 +1,5 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
+/* @root-entry-name: 'default'; */
+/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .@{ant-prefix}-form-item-has-error {
   .@{ant-prefix}-picker-status-error
@@ -7,34 +7,94 @@
       .@{ant-prefix}-input-borderless
     ).@{ant-prefix}-input {
     // background: @zaui-base-bg;
-    border-color: var(--ant-error-color);
+    border-color: #ff4d4f;
   }
   .forever-checkbox:not(.@{ant-prefix}-input-disabled):not(
       .@{ant-prefix}-input-borderless
     ).@{ant-prefix}-input:focus {
-    border-color: var(--ant-error-color-hover);
+    border-color: var(--ant-error-color-hover, #ff7875);
     border-right-width: 1px;
     outline: 0;
-    box-shadow: 0 0 0 2px var(--ant-error-color-outline);
+    box-shadow: 0 0 0 2px var(--ant-error-color-outline, rgba(255,77,79,0.2));
   }
 }
 
-span.@{ant-prefix}-input-group-compact {
+span.@{ant-prefix}-input-group-compact,
+.@{ant-prefix}-space-compact {
   &.pro-time-limit,
   &.pro-range-limit {
     display: flex;
 
     .@{ant-prefix}-picker {
       flex: 1;
+      border-right: 0;
+      border-top-right-radius: 0 !important;
+      border-bottom-right-radius: 0 !important;
     }
 
     .@{ant-prefix}-picker-focused {
       z-index: 1;
     }
+
     .forever-checkbox {
       flex: 0;
       min-width: unset;
       white-space: nowrap;
+      border-left: 0;
+      border-top-left-radius: 0 !important;
+      border-bottom-left-radius: 0 !important;
+
+      &.@{ant-prefix}-input {
+        display: flex;
+        align-items: center;
+        min-height: 32px;
+        padding: 4px 11px;
+        background-color: #ffffff;
+        border: 1px solid #d9d9d9;
+        margin-left: 1px;
+        border-top-right-radius: 6px !important;
+        border-bottom-right-radius: 6px !important;
+        transition: all 0.2s;
+
+        &:hover {
+          border-color: #40a9ff;
+        }
+
+        &.@{ant-prefix}-input-disabled {
+          color: rgba(0, 0, 0, 0.25);
+          background-color: #f5f5f5;
+          border-color: #d9d9d9;
+          cursor: not-allowed;
+        }
+
+        .@{ant-prefix}-checkbox-wrapper {
+          display: flex;
+          align-items: center;
+
+          &.@{ant-prefix}-checkbox-wrapper-disabled {
+            color: rgba(0, 0, 0, 0.25);
+          }
+        }
+      }
+    }
+
+    // 确保焦点状态下的边框连接正确
+    .@{ant-prefix}-picker:focus {
+      z-index: 1;
+      border-right: 0;
+    }
+
+    .forever-checkbox.@{ant-prefix}-input:focus {
+      z-index: 1;
+      border-color: #40a9ff;
+      border-left: 0;
+      box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.2);
+    }
+
+    // 当日期选择器聚焦时，复选框也要有相应的样式
+    .@{ant-prefix}-picker-focused + .forever-checkbox.@{ant-prefix}-input {
+      border-color: #40a9ff;
+      border-left: 0;
     }
   }
 }

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

@@ -1,3 +1,4 @@
+import * as componentMap from './index';
 export { default as Select } from './base/Select';
 export { default as DatePicker } from './base/DatePicker';
 export { default as RangePicker } from './base/RangePicker';
@@ -12,8 +13,6 @@ export { default as TimePicker } from './base/TimePicker';
 export { default as FormList } from './combination/FormList';
 export { default as ProEditTable } from '../../ProEditTable';
 export { default as ProCascader } from './combination/ProCascader';
-export { default as ProAddressBar } from './combination/ProCascader';
-export { default as ProCombination } from './combination/ProCombination';
 export { default as ProNumberRange } from './combination/ProNumberRange';
 export { default as ProModalSelect } from './combination/ProModalSelect';
 export { default as ProTimeLimit } from './combination/ProTimeLimit';
@@ -27,9 +26,4 @@ export { default as ProUpload } from '../../ProUpload';
 export { default as ProTreeModal } from '../../ProTreeModal';
 export { default as ProTree } from '../../ProTree';
 export { default as FormFooter } from './FormFooter';
-export { default as ProAddress, transferAddressInfoToRegion } from './old/ProAddress';
-export { default as EnumSelect } from './old/EnumSelect';
-export { default as InputRange } from './old/InputRange';
-export { default as ProRangeBox } from './old/ProRangeBox';
-export { default as ProCertValidity } from './old/ProCertValidity';
-export { default as ProCertNo } from './old/ProCertNo';
+export type ProFormComponentType = keyof typeof componentMap;