@zat-design/sisyphus-react 3.1.5 → 3.2.0

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

@@ -1,9 +1,9 @@
 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/cascader/style";
 import _Cascader from "antd/es/cascader";
+import "antd/es/tooltip/style";
+import _Tooltip from "antd/es/tooltip";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
@@ -11,14 +11,18 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-var _excluded = ["getPopupContainer", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator"];
-import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+import "antd/es/typography/style";
+import _Typography from "antd/es/typography";
+var _excluded = ["className", "getPopupContainer", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator"];
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState, memo, useMemo } from 'react';
 import { useSetState } from 'ahooks';
 import { tools } from '@zat-design/utils';
 import { useProConfig } from '../../../../ProConfigProvider';
 import useEnum from '../../../../ProEnum/hooks/useEnum';
+import locale from '../../../../locale';
 var transformDataName = tools.transformDataName;
+var Text = _Typography.Text;
 var filterDataSource = function filterDataSource(dataSource, level) {
   return dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
     return _objectSpread(_objectSpread({}, item), {}, {
@@ -44,7 +48,7 @@ var levelMap = {
   3: 'county'
 };
 var ProAddressBar = function ProAddressBar(props) {
-  var _otherProps$otherProp, _ref11, _ref11$filter;
+  var _otherProps$otherProp, _ref11, _ref11$filter, _locale$ProAddressBar, _locale$ProAddressBar2, _locale$ProAddressBar3;
   var _ref = useProConfig('ProAddressBar') || {},
     configUseRequest = _ref.useRequest,
     configTransformResponse = _ref.transformResponse,
@@ -53,8 +57,8 @@ var ProAddressBar = function ProAddressBar(props) {
     configFieldNames = _ref.fieldNames,
     configEnumCode = _ref.enumCode,
     configCode = _ref.code;
-  // console.count('地址组件渲染次数');
-  var getPopupContainer = props.getPopupContainer,
+  var className = props.className,
+    getPopupContainer = props.getPopupContainer,
     _props$hasDetail = props.hasDetail,
     hasDetail = _props$hasDetail === void 0 ? true : _props$hasDetail,
     _props$detailMaxLengt = props.detailMaxLength,
@@ -171,7 +175,7 @@ var ProAddressBar = function ProAddressBar(props) {
               transFormData = transformDataName(newData, {
                 label: fieldNames.label,
                 value: fieldNames.value,
-                children: 'children'
+                children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
               });
               setServiceData(realLevel === 2 ? filterDataSource(transFormData, level) : transFormData);
             }
@@ -265,19 +269,19 @@ var ProAddressBar = function ProAddressBar(props) {
   }, [service]);
   useEffect(function () {
     // 传入useRequest时初始化province展示
-    if (service && !fetched && province) {
+    if (service && loadData && !fetched && province) {
       initAddressLabel('province', province, provinceOptions);
     }
   }, [province, fetched, provinceOptions]);
   useEffect(function () {
     // 传入useRequest时初始化city展示
-    if (service && !fetched && province && city) {
+    if (service && loadData && !fetched && province && city) {
       initAddressLabel('city', city, _defineProperty({}, parentKey, province));
     }
   }, [province, city, fetched]);
   useEffect(function () {
     // 传入useRequest时初始化county展示
-    if (service && !fetched && city && county) {
+    if (service && loadData && !fetched && city && county) {
       initAddressLabel('county', county, _defineProperty({}, parentKey, city));
     }
   }, [city, county, fetched]);
@@ -287,6 +291,12 @@ var ProAddressBar = function ProAddressBar(props) {
       setDefaultLabel(getAddressLabel(realDataSource, value));
     }
   }, [realIsView, value, realDataSource]);
+  useEffect(function () {
+    // 传入useRequest但loadData为fasle查看时初始化展示
+    if (realIsView && value && (serviceData === null || serviceData === void 0 ? void 0 : serviceData.length) > 0) {
+      setDefaultLabel(getAddressLabel(serviceData, value));
+    }
+  }, [realIsView, value, serviceData]);
   var handleLoadData = /*#__PURE__*/function () {
     var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(selectedOptions) {
       var targetOption, data;
@@ -320,14 +330,14 @@ var ProAddressBar = function ProAddressBar(props) {
       return _ref10.apply(this, arguments);
     };
   }();
-  var handleChange = function handleChange(changeValue) {
+  var handleChange = function handleChange(changeValue, selectedOptions) {
     if (onChange) {
       if (hasDetail && address) {
         var realValue = changeValue || [];
         realValue[realLevel] = address;
-        onChange(realValue);
+        onChange(realValue, selectedOptions);
       } else {
-        onChange(changeValue);
+        onChange(changeValue, selectedOptions);
       }
     }
   };
@@ -362,56 +372,66 @@ var ProAddressBar = function ProAddressBar(props) {
   var viewValue = ((_ref11 = [provinceLabel, cityLabel, countyLabel, value === null || value === void 0 ? void 0 : value[realLevel]]) === null || _ref11 === void 0 ? void 0 : (_ref11$filter = _ref11.filter(function (item) {
     return !!item;
   })) === null || _ref11$filter === void 0 ? void 0 : _ref11$filter.join(separator)) || '-';
-  return _jsx("div", {
-    className: "pro-address",
-    children: realIsView ? viewValue : _jsxs(_Fragment, {
-      children: [dataSource || addressCode || !loadData ? _jsx(_Cascader, {
-        className: hasDetail ? '' : 'no-detail',
-        placeholder: "\u8BF7\u9009\u62E9",
-        value: addressValue,
-        options: !loadData ? serviceData : realDataSource,
-        disabled: disabled,
-        displayRender: function displayRender(label) {
-          return label === null || label === void 0 ? void 0 : label.filter(function (item) {
-            return !!item;
-          }).join('/');
-        },
-        showSearch: {
-          filter: handlefilter
-        },
-        onChange: handleChange
-      }) : _jsx(_Cascader, {
-        className: hasDetail ? '' : 'no-detail',
-        placeholder: "\u8BF7\u9009\u62E9",
-        value: addressValue,
-        loadData: handleLoadData,
-        // @ts-ignore
-        options: provinces,
-        disabled: disabled,
-        displayRender: displayRender,
-        changeOnSelect: true,
-        // @ts-ignore
-        onChange: handleChange
-      }), hasDetail && (tooltip && disabled && address ? _jsx(_Tooltip, {
-        title: address,
-        children: _jsx("span", {
-          className: "pro-address-detail",
-          children: _jsx(_Input, {
-            disabled: disabled,
-            value: address
-          })
-        })
-      }) : _jsx(_Input, {
-        allowClear: true,
-        autoComplete: "off",
-        disabled: disabled,
-        value: address,
-        maxLength: detailMaxLength,
-        placeholder: "\u8BF7\u8F93\u5165\u8BE6\u7EC6\u5730\u5740",
-        // @ts-ignore
-        onChange: handleAddressChange
-      }))]
+  return realIsView ? tooltip ? _jsx(_Tooltip, {
+    className: className,
+    title: tooltip === true ? viewValue : tooltip,
+    children: _jsx(Text, {
+      ellipsis: {
+        tooltip: false
+      },
+      children: viewValue
     })
+  }) : _jsx("span", {
+    className: className,
+    children: viewValue
+  }) : _jsxs("div", {
+    className: "pro-address ".concat(className),
+    children: [dataSource || addressCode || !loadData ? _jsx(_Cascader, {
+      className: hasDetail ? '' : 'no-detail',
+      placeholder: locale === null || locale === void 0 ? void 0 : (_locale$ProAddressBar = locale.ProAddressBar) === null || _locale$ProAddressBar === void 0 ? void 0 : _locale$ProAddressBar.placeholder,
+      value: addressValue,
+      options: !loadData ? serviceData : realDataSource,
+      disabled: disabled,
+      displayRender: function displayRender(label) {
+        return label === null || label === void 0 ? void 0 : label.filter(function (item) {
+          return !!item;
+        }).join('/');
+      },
+      showSearch: {
+        filter: handlefilter
+      },
+      onChange: handleChange
+    }) : _jsx(_Cascader, {
+      className: hasDetail ? '' : 'no-detail',
+      placeholder: locale === null || locale === void 0 ? void 0 : (_locale$ProAddressBar2 = locale.ProAddressBar) === null || _locale$ProAddressBar2 === void 0 ? void 0 : _locale$ProAddressBar2.placeholder,
+      value: addressValue,
+      loadData: handleLoadData,
+      // @ts-ignore
+      options: provinces,
+      disabled: disabled,
+      displayRender: displayRender,
+      changeOnSelect: true,
+      // @ts-ignore
+      onChange: handleChange
+    }), hasDetail && (tooltip && disabled && address ? _jsx(_Tooltip, {
+      title: address,
+      children: _jsx("span", {
+        className: "pro-address-detail",
+        children: _jsx(_Input, {
+          disabled: disabled,
+          value: address
+        })
+      })
+    }) : _jsx(_Input, {
+      allowClear: true,
+      autoComplete: "off",
+      disabled: disabled,
+      value: address,
+      maxLength: detailMaxLength,
+      placeholder: locale === null || locale === void 0 ? void 0 : (_locale$ProAddressBar3 = locale.ProAddressBar) === null || _locale$ProAddressBar3 === void 0 ? void 0 : _locale$ProAddressBar3.detailPlaceholder,
+      // @ts-ignore
+      onChange: handleAddressChange
+    }))]
   });
 };
 // @ts-ignore

package/es/ProForm/components/combination/ProAddressBar/propsType.d.ts

@@ -3,11 +3,12 @@ import { DefaultOptionType } from 'rc-select/lib/Select';
 import { Service } from 'ahooks/lib/useRequest/src/types';
 export interface AddressProps {
     getPopupContainer?: () => ReactNode;
+    className?: string;
     isView?: boolean;
     value?: string[];
     disabled?: boolean;
     hasDetail?: boolean;
-    tooltip?: boolean;
+    tooltip?: boolean | ReactNode;
     detailMaxLength?: number;
     fieldNames?: {
         label: string;
@@ -20,7 +21,7 @@ export interface AddressProps {
         defaultParams?: any;
         parentKey?: string;
     };
-    onChange?: (value: string[]) => void;
+    onChange?: (value: string[], selectedOptions?: any[]) => void;
     transformResponse?: (data: any[]) => any[];
     level?: number;
     enumCode?: string;

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

@@ -12,7 +12,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "isTooltip", "otherProps", "searchForm"],
+var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "isTooltip", "otherProps", "searchForm", "defaultOne"],
   _excluded2 = ["onOk"],
   _excluded3 = ["rowKey", "columns", "rowSelection"];
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
@@ -25,6 +25,7 @@ import { ProForm, ProDrawerForm, ProTable, useProConfig } from '../../../../inde
 import Container from '../../Container';
 import viewSvg from '../../../../assets/view.svg';
 import useRequestList from './hooks/useRequestList';
+import locale from '../../../../locale';
 var ProModalSelect = function ProModalSelect(props, ref) {
   var _formColumns$;
   var value = props.value,
@@ -48,6 +49,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     isTooltip = props.isTooltip,
     otherProps = props.otherProps,
     searchForm = props.searchForm,
+    defaultOne = props.defaultOne,
     restInputProps = _objectWithoutProperties(props, _excluded);
   var contentForm = _Form.useFormInstance();
   if (!configOption || Object.prototype.toString.call(configOption) !== '[object Object]') {
@@ -125,7 +127,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       transformResponse: transformResponse
     }, _objectSpread({
       manual: true,
-      ready: (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) || visible
+      ready: (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) || visible || defaultOne
     }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options)),
     data = _useRequestList.data,
     loading = _useRequestList.loading,
@@ -288,7 +290,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               _context2.next = 4;
               break;
             }
-            _message.error('请先勾选');
+            _message.error(locale.ProModalSelect.checkMsg);
             return _context2.abrupt("return", false);
           case 4:
             _data = isMultiple ? selectedRows : selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows[0];
@@ -410,14 +412,14 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
     var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-      var _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _list, list, _res$data, _data2, nextSelectRowKeys;
+      var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _list, list, _res$data, _data2, nextSelectRowKeys;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             if (typeof (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) === 'function') {
-              useRequest.initParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams(value, contentForm.getFieldsValue());
+              useRequest.initParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams(value, contentForm === null || contentForm === void 0 ? void 0 : (_contentForm$getField = contentForm.getFieldsValue) === null || _contentForm$getField === void 0 ? void 0 : _contentForm$getField.call(contentForm));
             }
-            if (!(useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams)) {
+            if (!((useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) || defaultOne)) {
               _context4.next = 13;
               break;
             }
@@ -431,7 +433,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
             });
             return _context4.abrupt("return");
           case 5:
-            queryBean = _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.defaultParams), useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams);
+            queryBean = _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.defaultParams), (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) || {});
             page = _objectSpread({
               pageNum: 1,
               pageSize: 10
@@ -474,6 +476,61 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       return _ref9.apply(this, arguments);
     };
   }();
+  // 初始化回显，当传入initParams时，前端用来回险
+  var getDefaultOneValues = /*#__PURE__*/function () {
+    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+      var _useRequest$options4, _useRequest$options5;
+      var queryBean, page, params, res, _list2, list, _res$data2, _data3, nextSelectRowKeys;
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            queryBean = _objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options4 = useRequest.options) === null || _useRequest$options4 === void 0 ? void 0 : _useRequest$options4.defaultParams);
+            page = _objectSpread({
+              pageNum: 1,
+              pageSize: 10
+            }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options5 = useRequest.options) === null || _useRequest$options5 === void 0 ? void 0 : _useRequest$options5.page);
+            params = withPagination ? _objectSpread(_objectSpread({}, page), {}, {
+              queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
+            }) : queryBean;
+            params = transformParams ? transformParams(params) : params;
+            _context5.next = 6;
+            return runAsync(params);
+          case 6:
+            res = _context5.sent;
+            if (res === null || res === void 0 ? void 0 : res.data) {
+              list = [];
+              if (transformResponse) {
+                list = transformResponse(res === null || res === void 0 ? void 0 : res.data);
+              } else {
+                list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.list : res === null || res === void 0 ? void 0 : res.data;
+              }
+              _data3 = isMultiple ? list : (_list2 = list) === null || _list2 === void 0 ? void 0 : _list2[0];
+              nextSelectRowKeys = isMultiple ? value : [value];
+              if (labelInValue) {
+                onChange(_data3);
+              } else {
+                onChange(isMultiple ? _data3.map(function (item) {
+                  return item[valueKey];
+                }) : _data3[valueKey]);
+              }
+              // 更新内部展示值
+              setState({
+                _value: _data3,
+                isInit: false,
+                selectedRows: list,
+                selectedRowKeys: nextSelectRowKeys
+              });
+            }
+          case 8:
+          case "end":
+            return _context5.stop();
+        }
+      }, _callee5);
+    }));
+    return function getDefaultOneValues() {
+      return _ref10.apply(this, arguments);
+    };
+  }();
   useImperativeHandle(ref, function () {
     return {
       handleClick: handleClick,
@@ -505,8 +562,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   });
   useEffect(function () {
     if (onOff && !visible) {
-      var _useRequest$options4;
-      if ((useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options4 = useRequest.options) === null || _useRequest$options4 === void 0 ? void 0 : _useRequest$options4.manual) !== true) {
+      var _useRequest$options6;
+      if ((useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options6 = useRequest.options) === null || _useRequest$options6 === void 0 ? void 0 : _useRequest$options6.manual) !== true) {
         onReset();
       }
       var nextState = {
@@ -538,11 +595,15 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   }, [value, visible, isInit]);
   useEffect(function () {
     if (!value) {
-      setState({
-        _value: undefined,
-        selectedRowKeys: [],
-        selectedRows: []
-      });
+      if (defaultOne) {
+        getDefaultOneValues();
+      } else {
+        setState({
+          _value: undefined,
+          selectedRowKeys: [],
+          selectedRows: []
+        });
+      }
     }
     if (labelInValue && _value && !isEqual(value, _value)) {
       setState({
@@ -593,7 +654,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       onChange: handleChangeValue,
       disabled: disabled,
       addonAfter: forceAddonAfterRender(),
-      placeholder: "\u8BF7\u9009\u62E9",
+      placeholder: locale.ProModalSelect.select,
       autoComplete: "off"
     }, restInputProps)), _jsx(_Input, {
       type: "hidden",

package/es/ProForm/components/combination/ProModalSelect/propsType.d.ts

@@ -37,6 +37,7 @@ interface ProModalPropsType {
     viewEmpty?: React.ReactNode;
     otherProps?: ProFormOtherProps;
     labelInValue?: boolean;
+    defaultOne?: boolean;
     beforeOpen?: any;
     isTooltip?: any;
     showCodeName?: boolean;

package/es/ProForm/components/combination/ProModalSelect/style/index.less

@@ -22,7 +22,7 @@
 
       > span {
         position: relative;
-        font-size: var(--zaui-font-size-sm, 12px );
+        font-size: var(--zaui-font-size, 14px);
         border: none;
         border-radius: 50%;
       }
@@ -57,7 +57,7 @@
     &:hover {
       .ant-input,
       .ant-input-group-addon {
-        border-color: #d9d9d9;
+        border-color: @zaui-form-control-line;
       }
     }
   }
@@ -73,7 +73,7 @@
   }
 
   .ant-input-group-addon {
-    padding: 0px var(--zaui-space-size-md, 8px);
+    padding: 0px var(--zaui-space-size-sm, 8px);
     background-color: var(--zaui-base-bg, #ffffff);
     cursor: pointer;
 

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

@@ -11,6 +11,7 @@ import { isEmpty } from 'lodash';
 import classnames from 'classnames';
 import { tools } from '@zat-design/utils';
 import Container from '../../Container';
+import locale from '../../../../locale';
 var formatAmount = tools.formatAmount,
   formatPercent = tools.formatPercent,
   formatPerMill = tools.formatPerMill;
@@ -155,7 +156,7 @@ var ProNumberRange = function ProNumberRange(props) {
     children: [_jsx(_InputNumber, _objectSpread(_objectSpread({
       className: "range-left",
       value: (value === null || value === void 0 ? void 0 : value[0]) || range[0],
-      placeholder: "\u8BF7\u8F93\u5165",
+      placeholder: "".concat(locale.ProForm.inputPlaceholder),
       min: min,
       max: (value === null || value === void 0 ? void 0 : value[1]) || max || range[1],
       precision: precision,
@@ -174,7 +175,7 @@ var ProNumberRange = function ProNumberRange(props) {
     }), _jsx(_InputNumber, _objectSpread(_objectSpread({
       className: "range-right",
       value: (value === null || value === void 0 ? void 0 : value[1]) || range[1],
-      placeholder: "\u8BF7\u8F93\u5165",
+      placeholder: "".concat(locale.ProForm.inputPlaceholder),
       min: (value === null || value === void 0 ? void 0 : value[0]) || min || range[0],
       max: max,
       precision: precision,

package/es/ProForm/components/combination/ProNumberRange/style/index.less

@@ -10,7 +10,7 @@
 
   .ant-input-status-error {
     &.range-split {
-      border-color: #ff4d4f;
+      border-color: @zaui-danger;
     }
   }
 

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import { RangePickerProps } from 'antd/es/date-picker';
 import { Moment } from 'moment';
-export type Props = Omit<RangePickerProps, 'value' | 'onChange' | 'format' | 'separator'> & {
+export type Props = Omit<RangePickerProps, 'value' | 'onChange' | 'format' | 'separator' | 'mode'> & {
     disabled?: boolean;
     foreverText?: string;
     foreverDate?: string;

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

@@ -15,6 +15,7 @@ import classNames from 'classnames';
 import moment from 'moment';
 import { useProConfig } from '../../../../ProConfigProvider';
 import Container from '../../Container';
+import locale from '../../../../locale';
 var defaultPickerValue = [moment(), moment()];
 var useControlled = function useControlled(props) {
   var _useState = useState(),
@@ -42,7 +43,7 @@ var RangePicker = _DatePicker.RangePicker;
 var ProRangeLimit = function ProRangeLimit(props) {
   var disabled = props.disabled,
     _props$foreverText = props.foreverText,
-    foreverText = _props$foreverText === void 0 ? '长期' : _props$foreverText,
+    foreverText = _props$foreverText === void 0 ? locale.ProTimeLimit.foreverText : _props$foreverText,
     _props$foreverDate = props.foreverDate,
     foreverDate = _props$foreverDate === void 0 ? '9999-01-01' : _props$foreverDate,
     _props$format = props.format,
@@ -122,12 +123,10 @@ var ProRangeLimit = function ProRangeLimit(props) {
   };
   return _jsxs(_Input.Group, {
     compact: true,
+    className: "pro-range-limit",
     children: [_jsx(RangePicker, _objectSpread(_objectSpread(_objectSpread({
       allowClear: true,
       disabled: [disabled, disabled || _isForever],
-      style: {
-        width: 'calc(100% - 84px)'
-      },
       defaultPickerValue: defaultPickerValue
     }, initialConfig), omit(rest, ['placeholder', 'separator'])), {}, {
       format: format,
@@ -135,9 +134,6 @@ var ProRangeLimit = function ProRangeLimit(props) {
       onChange: handleRangeChange
     })), _jsx("div", {
       className: className,
-      style: {
-        width: '84px'
-      },
       children: _jsx(_Checkbox, {
         checked: _isForever,
         disabled: disabled,

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

@@ -2,10 +2,11 @@ import { DatePickerProps } from 'antd';
 import { Moment } from 'moment';
 import React from 'react';
 import { ProFormOtherProps } from '../../../propsType';
+import { Props as ProRangeLimitProps } from '../ProRangeLimit';
 export type DateType = DatePickerProps['value'];
-export interface Props<ValueType extends DateType | string | null = DateType> extends Omit<DatePickerProps, 'value' | 'onChange'> {
+export type ProTimeLimitProps = DistributiveOmit<DatePickerProps, 'value' | 'onChange' | 'mode'> & {
     value?: string;
-    onChange?: (value: Props['value'] | null, valueData: Moment) => void;
+    onChange?: (value: ProTimeLimitProps['value'] | null, valueData: Moment) => void;
     disabled?: boolean;
     foreverTime?: string;
     foreverText?: string;
@@ -13,7 +14,11 @@ export interface Props<ValueType extends DateType | string | null = DateType> ex
     format?: string;
     valueType?: 'moment' | 'format' | 'ISO';
     otherProps?: ProFormOtherProps;
-}
-export declare const ProTimeLimit: React.FC<Props>;
-declare const LimitPick: (props: any) => JSX.Element;
+    mode?: 'DatePicker';
+};
+export declare const ProTimeLimit: React.FC<ProTimeLimitProps>;
+export type ProLimitProps = ProTimeLimitProps | (ProRangeLimitProps & {
+    mode: 'RangePicker';
+});
+declare const LimitPick: React.FC<ProLimitProps>;
 export default LimitPick;

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

@@ -18,6 +18,7 @@ import { useProConfig } from '../../../../ProConfigProvider';
 import Container from '../../Container';
 import useControlled from './hooks/useControlled';
 import ProRangeLimit from '../ProRangeLimit';
+import locale from '../../../../locale';
 // 永久有效默认值
 export var ProTimeLimit = function ProTimeLimit(props) {
   var _props$format = props.format,
@@ -25,7 +26,7 @@ export var ProTimeLimit = function ProTimeLimit(props) {
     disabled = props.disabled,
     foreverTime = props.foreverTime,
     _props$foreverText = props.foreverText,
-    foreverText = _props$foreverText === void 0 ? '长期' : _props$foreverText,
+    foreverText = _props$foreverText === void 0 ? locale.ProTimeLimit.foreverText : _props$foreverText,
     _props$valueType = props.valueType,
     valueType = _props$valueType === void 0 ? 'format' : _props$valueType,
     otherProps = props.otherProps,
@@ -82,25 +83,17 @@ export var ProTimeLimit = function ProTimeLimit(props) {
   });
   return _jsxs(_Input.Group, {
     compact: true,
+    className: "pro-time-limit",
     children: [_jsx(_DatePicker, _objectSpread(_objectSpread(_objectSpread({
-      disabled: disabled || isForever,
-      style: {
-        width: 'calc(100% - 84px)'
-      }
+      disabled: disabled || isForever
     }, initialConfig), omit(rest, ['placeholder'])), {}, {
       value: value,
       onChange: onChange
     })), _jsx("div", {
       className: className,
-      style: {
-        width: '84px'
-      },
       children: _jsx(_Checkbox, {
         checked: isForever,
         disabled: disabled,
-        style: {
-          width: '60px'
-        },
         onChange: foreverChange,
         children: foreverText
       })

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

@@ -1,7 +1,7 @@
 .ant-form-item-has-error {
   .ant-picker-status-error
     ~ .forever-checkbox:not(.ant-input-disabled):not(.ant-input-borderless).ant-input {
-    background: #fff;
+    background: @zaui-base-bg;
     border-color: var(--ant-error-color);
   }
   .forever-checkbox:not(.ant-input-disabled):not(.ant-input-borderless).ant-input:focus {
@@ -11,3 +11,20 @@
     box-shadow: 0 0 0 2px var(--ant-error-color-outline);
   }
 }
+
+span.ant-input-group-compact {
+  &.pro-time-limit,
+  &.pro-range-limit {
+    display: flex;
+
+    .ant-picker {
+      flex: 1;
+    }
+
+    .forever-checkbox {
+      flex: 0;
+      min-width: unset;
+      white-space: nowrap;
+    }
+  }
+}