@zat-design/sisyphus-react 3.1.5 → 3.2.0-beta.2

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

@@ -15,6 +15,7 @@ var _lodash = require("lodash");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _utils = require("@zat-design/utils");
 var _Container = _interopRequireDefault(require("../../Container"));
+var _locale = _interopRequireDefault(require("../../../../locale"));
 var formatAmount = _utils.tools.formatAmount,
   formatPercent = _utils.tools.formatPercent,
   formatPerMill = _utils.tools.formatPerMill;
@@ -159,7 +160,7 @@ var ProNumberRange = function ProNumberRange(props) {
     children: [(0, _jsxRuntime.jsx)(_antd.InputNumber, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       className: "range-left",
       value: (value === null || value === void 0 ? void 0 : value[0]) || range[0],
-      placeholder: "\u8BF7\u8F93\u5165",
+      placeholder: "".concat(_locale.default.ProForm.inputPlaceholder),
       min: min,
       max: (value === null || value === void 0 ? void 0 : value[1]) || max || range[1],
       precision: precision,
@@ -178,7 +179,7 @@ var ProNumberRange = function ProNumberRange(props) {
     }), (0, _jsxRuntime.jsx)(_antd.InputNumber, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       className: "range-right",
       value: (value === null || value === void 0 ? void 0 : value[1]) || range[1],
-      placeholder: "\u8BF7\u8F93\u5165",
+      placeholder: "".concat(_locale.default.ProForm.inputPlaceholder),
       min: (value === null || value === void 0 ? void 0 : value[0]) || min || range[0],
       max: max,
       precision: precision,

package/lib/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/lib/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/lib/ProForm/components/combination/ProRangeLimit/index.js

@@ -16,6 +16,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _moment = _interopRequireDefault(require("moment"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
+var _locale = _interopRequireDefault(require("../../../../locale"));
 var _excluded = ["disabled", "foreverText", "foreverDate", "format", "otherProps", "separator"];
 var defaultPickerValue = [(0, _moment.default)(), (0, _moment.default)()];
 var useControlled = function useControlled(props) {
@@ -44,7 +45,7 @@ var RangePicker = _antd.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.default.ProTimeLimit.foreverText : _props$foreverText,
     _props$foreverDate = props.foreverDate,
     foreverDate = _props$foreverDate === void 0 ? '9999-01-01' : _props$foreverDate,
     _props$format = props.format,
@@ -124,12 +125,10 @@ var ProRangeLimit = function ProRangeLimit(props) {
   };
   return (0, _jsxRuntime.jsxs)(_antd.Input.Group, {
     compact: true,
+    className: "pro-range-limit",
     children: [(0, _jsxRuntime.jsx)(RangePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
       allowClear: true,
       disabled: [disabled, disabled || _isForever],
-      style: {
-        width: 'calc(100% - 84px)'
-      },
       defaultPickerValue: defaultPickerValue
     }, initialConfig), (0, _lodash.omit)(rest, ['placeholder', 'separator'])), {}, {
       format: format,
@@ -137,9 +136,6 @@ var ProRangeLimit = function ProRangeLimit(props) {
       onChange: handleRangeChange
     })), (0, _jsxRuntime.jsx)("div", {
       className: className,
-      style: {
-        width: '84px'
-      },
       children: (0, _jsxRuntime.jsx)(_antd.Checkbox, {
         checked: _isForever,
         disabled: disabled,

package/lib/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/lib/ProForm/components/combination/ProTimeLimit/index.js

@@ -19,6 +19,7 @@ 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 _excluded = ["format", "disabled", "foreverTime", "foreverText", "valueType", "otherProps"],
   _excluded2 = ["mode"];
 // 永久有效默认值
@@ -28,7 +29,7 @@ var ProTimeLimit = exports.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.default.ProTimeLimit.foreverText : _props$foreverText,
     _props$valueType = props.valueType,
     valueType = _props$valueType === void 0 ? 'format' : _props$valueType,
     otherProps = props.otherProps,
@@ -85,25 +86,17 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
   });
   return (0, _jsxRuntime.jsxs)(_antd.Input.Group, {
     compact: true,
+    className: "pro-time-limit",
     children: [(0, _jsxRuntime.jsx)(_antd.DatePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
-      disabled: disabled || isForever,
-      style: {
-        width: 'calc(100% - 84px)'
-      }
+      disabled: disabled || isForever
     }, initialConfig), (0, _lodash.omit)(rest, ['placeholder'])), {}, {
       value: value,
       onChange: onChange
     })), (0, _jsxRuntime.jsx)("div", {
       className: className,
-      style: {
-        width: '84px'
-      },
       children: (0, _jsxRuntime.jsx)(_antd.Checkbox, {
         checked: isForever,
         disabled: disabled,
-        style: {
-          width: '60px'
-        },
         onChange: foreverChange,
         children: foreverText
       })

package/lib/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;
+    }
+  }
+}

package/lib/ProForm/components/old/EnumSelect/style/index.less

@@ -1,7 +1,7 @@
 .pro-enum-select {
   .close-icon {
     position        : relative;
-    margin-left     : -31px;
+    margin-left     : calc(0px - @zaui-space-size-lg);
     margin-right    : var(--zaui-space-size-md, 14px);
     color           : #FFFFFF;
     height: 12px;
@@ -16,7 +16,6 @@
 
     > span {
       position        : relative;
-      font-size       : 8px;
       border          : none;
       border-radius   : 50%;
 
@@ -45,7 +44,7 @@
   .ant-table-thead>tr>th {
     border          : 0;
     white-space     : nowrap;
-    background-color: #F6F7F8;
+    background-color: @zaui-table-header-bg;
   }
 
   .ant-table-thead>tr>th:not(:last-child):not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan])::before {
@@ -69,7 +68,7 @@
   }
 
   .ant-table-tbody tr:nth-child(2n)>td {
-    background-color: #FAFAFA;
+    background-color: @zaui-table-strip-bg;
   }
 
   .ant-table-tbody>.ant-table-placeholder>td {
@@ -81,7 +80,7 @@
     >tr:hover:not(.ant-table-expanded-row, .ant-table-placeholder)>td,
     .ant-table-row-hover,
     .ant-table-row-hover>td {
-      background: #FAFAFA;
+      background: @zaui-table-hover-bg;
     }
   }
 
@@ -89,13 +88,13 @@
 
     .ant-table-row-hover,
     .ant-table-row-hover>td {
-      background: #FAFAFA;
+      background: @zaui-table-hover-bg;
     }
   }
 
   .ant-table-fixed-header {
     .ant-table-tbody tr:nth-child(n)>td {
-      background-color: #FAFAFA;
+      background-color: @zaui-table-strip-bg;
     }
 
     .ant-table-tbody tr:nth-child(2n)>td {
@@ -108,7 +107,7 @@
   }
 
   .ant-modal-footer {
-    padding: 16px;
+    padding: @zaui-space-size-md;
   }
 
 }

package/lib/ProForm/components/old/InputRange/index.js

@@ -13,7 +13,6 @@ var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 /* eslint-disable @typescript-eslint/no-shadow */
 /* eslint-disable no-param-reassign */
-
 var positiveInteger = {
   formatter: function formatter(value) {
     return value.replace(/[^0-9]/g, '');

package/lib/ProForm/components/old/ProCertValidity/index.js

@@ -11,7 +11,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _moment = _interopRequireDefault(require("moment"));
 var _react = require("react");
-var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer", "showForever", "proformmode"];
+var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer", "showForever", "proformmode"]; // @ts-nocheck
 var RangePicker = _antd.DatePicker.RangePicker;
 var defaultFormatDate = 'YYYY-MM-DD';
 var defaultPopupContainer = function defaultPopupContainer(triggerNode) {

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

@@ -20,12 +20,14 @@ var _reactSvg = require("react-svg");
 var _lodash = require("lodash");
 var _useShouldUpdate2 = _interopRequireDefault(require("../../utils/useShouldUpdate"));
 var _index = require("../../utils/index");
+var _ProConfigProvider = require("../../../ProConfigProvider");
 var _transformNames = _interopRequireDefault(require("../../utils/transformNames"));
 var _valueType = _interopRequireDefault(require("../../utils/valueType"));
 var _useChanged = require("../../utils/useChanged");
 var _tip = _interopRequireDefault(require("../../../assets/tip.svg"));
 var _useRules = _interopRequireDefault(require("../../utils/useRules"));
 var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip"];
+/* eslint-disable prefer-destructuring */
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
   var _classNames, _otherProps$names2;
@@ -137,7 +139,8 @@ var Render = function Render(props) {
     required: labelRequired || _required
   } : null, otherProps.isView && !requiredOnView ? {
     required: false
-  } : null, (0, _objectSpread2.default)({}, (0, _index.isTrim)(type, trim)), (0, _objectSpread2.default)({}, (0, _index.isUpperCase)(type, upperCase)), {
+  } : null, (0, _objectSpread2.default)({}, (0, _index.isTrim)(type, trim, (0, _ProConfigProvider.useProConfig)())), // 优先取传进来的，其次取ProConfigProvider配置的
+  (0, _objectSpread2.default)({}, (0, _index.isUpperCase)(type, upperCase)), {
     validateFirst: true
   });
   // 添加label宽度
@@ -156,7 +159,7 @@ var Render = function Render(props) {
   var lastComponentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), _fieldProps), {}, {
     disabled: lastDisabled
   });
-  var _className = (0, _classnames.default)((_classNames = {}, (0, _defineProperty2.default)(_classNames, className, className), (0, _defineProperty2.default)(_classNames, 'pro-form-item-changed', changed), _classNames));
+  var _className = (0, _classnames.default)((_classNames = {}, (0, _defineProperty2.default)(_classNames, className, className), (0, _defineProperty2.default)(_classNames, 'pro-form-item-changed', changed), (0, _defineProperty2.default)(_classNames, 'pro-form-item-width-auto', ['Switch'].includes(type)), _classNames));
   if (formItemProps.hidden === true || _show === false) {
     // 为了监听shouldUpdate  必须存在一个FormItem, 空Input解决 【[antd: Form.Item] `name` is only used for validate React element】
     return (0, _jsxRuntime.jsx)(_antd.Form.Item, {

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

@@ -15,6 +15,7 @@ var _Render = _interopRequireDefault(require("./Render"));
 var componentMap = _interopRequireWildcard(require("../index"));
 var _utils = require("../../utils");
 var _useFieldProps = require("../../utils/useFieldProps");
+var _locale = _interopRequireDefault(require("../../../locale"));
 var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "disabled", "equalWith", "clearNotShow", "required"];
 var RenderFields = function RenderFields(props) {
   var isView = props.isView,
@@ -116,6 +117,7 @@ var RenderFields = function RenderFields(props) {
     }
     if (component && /*#__PURE__*/_react.default.isValidElement(component)) {
       var _newComponent$props;
+      _type = null;
       var newComponent = component;
       var isProEditTable = (newComponent === null || newComponent === void 0 ? void 0 : (_newComponent$props = newComponent.props) === null || _newComponent$props === void 0 ? void 0 : _newComponent$props.onlyOneLineMsg) === '请先保存数据';
       TargetComponent = _isView ? viewRenderHandle || '' : component;
@@ -135,16 +137,14 @@ var RenderFields = function RenderFields(props) {
       dataSource: dataSource,
       type: _type
     });
-    var _placeholder = placeholder || "".concat(_isSelect ? '请选择' : '请输入').concat(label || formLabel || '');
+    var _placeholder = placeholder || "".concat(_isSelect ? "".concat(_locale.default.ProForm.selectPlaceHolder) : "".concat(_locale.default.ProForm.inputPlaceholder)).concat(label || formLabel || '');
     // 表单组件Props 兼容2.0版本
     var _fieldProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({
       disabled: disabled
     }, formItemChildProps), fieldProps);
-    if (formDisabled) {
+    if ((0, _lodash.isBoolean)(formDisabled)) {
       _fieldProps.disabled = formDisabled;
-      // _disabled = formDisabled;
     }
-
     var componentProps = (0, _objectSpread2.default)({
       disabled: _disabled,
       placeholder: _placeholder,
@@ -154,6 +154,10 @@ var RenderFields = function RenderFields(props) {
     if (['Switch', 'SwitchCheckbox'].includes(_type)) {
       _formItemProps.valuePropName = 'checked';
     }
+    // 时间范围placeholder处理
+    if (['RangePicker'].includes(_type) && !(fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.placeholder)) {
+      delete componentProps.placeholder;
+    }
     // 没有找到对应组件  不渲染
     if (!TargetComponent) {
       return [];
@@ -184,7 +188,7 @@ var RenderFields = function RenderFields(props) {
       value: otherProps,
       children: (0, _jsxRuntime.jsx)(_Render.default, {
         show: show,
-        disabled: formDisabled,
+        disabled: Boolean(formDisabled),
         form: form,
         type: _type,
         originComponent: component,

package/lib/ProForm/components/render/propsType.d.ts

@@ -21,7 +21,8 @@ import { AddressProps } from '../combination/ProAddressBar/propsType';
 import { ProCombinationProps } from '../combination/ProCombination/propsType';
 import { ProModalSelectPropsType as ProModalSelectProps } from '../combination/ProModalSelect/propsType';
 import { ProNumberRangeProps } from '../combination/ProNumberRange/propsType';
-import { Props as ProTimeLimitProps } from '../combination/ProTimeLimit';
+import { ProLimitProps } from '../combination/ProTimeLimit';
+import { Props as ProRangeLimitProps } from '../combination/ProRangeLimit';
 import { CheckboxPropsMap, ProEnum, PropProSelectsMap, PropRadioPropsMap } from '../../../ProEnum/propsType';
 import { PropSelectProps as ProSelectProps } from '../../../ProSelect/propsType';
 import { ProEditTableProps } from '../../../ProEditTable/propsType';
@@ -57,7 +58,7 @@ type FunctionArgs<Values> = (value: any, record: any, { form, index, namePath, o
     namePath?: NamePath;
     [key: string]: any;
 }) => any;
-type TransformToFormField<T extends ControlProps, Values> = Omit<T, 'onChange' | 'value'> & {
+type TransformToFormField<T extends ControlProps, Values> = DistributiveOmit<T, 'onChange' | 'value'> & {
     value?: T['value'];
     onChange?: (value: Parameters<T['onChange']>[0], options: Parameters<T['onChange']>[1], form: FormInstance<Values>) => void;
     onFieldChange?: FunctionArgs<Values>;
@@ -135,10 +136,10 @@ export type ColumnPropsMap<Values = any, T = 'ProForm'> = {
     fieldProps?: FieldProps<ProNumberRangeProps, Values, T>;
 } | {
     type?: 'ProRangeLimit';
-    fieldProps?: FieldProps<ProNumberRangeProps, Values, T>;
+    fieldProps?: FieldProps<ProRangeLimitProps, Values, T>;
 } | {
     type?: 'ProTimeLimit';
-    fieldProps?: FieldProps<ProTimeLimitProps, Values, T>;
+    fieldProps?: FieldProps<ProLimitProps, Values, T>;
 } | {
     type?: 'ProEnum';
     fieldProps?: ProEnumFieldProps<Values, T>;

package/lib/ProForm/index.js

@@ -24,8 +24,10 @@ var _ProConfigProvider = require("../ProConfigProvider");
 var _index = require("./utils/index");
 var _useForm3 = require("./utils/useForm");
 var _useFieldProps = require("./utils/useFieldProps");
+var _locale = _interopRequireDefault(require("../locale"));
 var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required"];
 var ProForm = function ProForm(props, ref) {
+  var _localStorage;
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'search' : _props$mode,
     span = props.span,
@@ -99,12 +101,12 @@ var ProForm = function ProForm(props, ref) {
       onClick: expandHandle,
       children: !openState ? (0, _jsxRuntime.jsxs)(_antd.Space, {
         align: "center",
-        children: ["\u5C55\u5F00", (0, _jsxRuntime.jsx)(_icons.DoubleLeftOutlined, {
+        children: [_locale.default.ProForm.unfold, (0, _jsxRuntime.jsx)(_icons.DoubleLeftOutlined, {
           className: "rotate-to-bottom"
         })]
       }) : (0, _jsxRuntime.jsxs)(_antd.Space, {
         align: "center",
-        children: ["\u6536\u8D77", (0, _jsxRuntime.jsx)(_icons.DoubleLeftOutlined, {
+        children: [_locale.default.ProForm.packUp, (0, _jsxRuntime.jsx)(_icons.DoubleLeftOutlined, {
           className: "rotate-to-top"
         })]
       })
@@ -180,6 +182,16 @@ var ProForm = function ProForm(props, ref) {
       })
     })) : null;
   };
+  // 国际化，非中文时默认上下布局
+  if (((_localStorage = localStorage) === null || _localStorage === void 0 ? void 0 : _localStorage.locale) && localStorage.locale !== 'zh-CN') {
+    // 一行布局时，左右布局
+    if (span === 24) {
+      otherProps.layout = otherProps.layout || 'horizontal';
+    } else {
+      // 其他布局时，上下布局
+      otherProps.layout = otherProps.layout || 'vertical';
+    }
+  }
   return (0, _jsxRuntime.jsx)(_antd.Form, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     onKeyPress: function onKeyPress(event) {
       if (!submitOnEnter) return;