@zat-design/sisyphus-react 3.1.4 → 3.1.5-beta.10

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

@@ -23,7 +23,7 @@ var _index = require("../../../../index");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _view = _interopRequireDefault(require("../../../../assets/view.svg"));
 var _useRequestList2 = _interopRequireDefault(require("./hooks/useRequestList"));
-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"];
 var ProModalSelect = function ProModalSelect(props, ref) {
@@ -49,6 +49,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     isTooltip = props.isTooltip,
     otherProps = props.otherProps,
     searchForm = props.searchForm,
+    defaultOne = props.defaultOne,
     restInputProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var contentForm = _antd.Form.useFormInstance();
   if (!configOption || Object.prototype.toString.call(configOption) !== '[object Object]') {
@@ -126,7 +127,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       transformResponse: transformResponse
     }, (0, _objectSpread2.default)({
       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,
@@ -411,14 +412,14 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
     var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().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 (0, _regeneratorRuntime2.default)().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;
             }
@@ -432,7 +433,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
             });
             return _context4.abrupt("return");
           case 5:
-            queryBean = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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 = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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 = (0, _objectSpread2.default)({
               pageNum: 1,
               pageSize: 10
@@ -454,6 +455,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               }
               _data2 = isMultiple ? list : (_list = list) === null || _list === void 0 ? void 0 : _list[0];
               nextSelectRowKeys = isMultiple ? value : [value];
+              console.log('data', _data2);
               if (labelInValue) {
                 onChange(_data2);
               }
@@ -475,6 +477,62 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       return _ref9.apply(this, arguments);
     };
   }();
+  // 初始化回显，当传入initParams时，前端用来回险
+  var getDefaultOneValues = /*#__PURE__*/function () {
+    var _ref10 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee5() {
+      var _useRequest$options4, _useRequest$options5;
+      var queryBean, page, params, res, _list2, list, _res$data2, _data3, nextSelectRowKeys;
+      return (0, _regeneratorRuntime2.default)().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            queryBean = (0, _objectSpread2.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options4 = useRequest.options) === null || _useRequest$options4 === void 0 ? void 0 : _useRequest$options4.defaultParams);
+            page = (0, _objectSpread2.default)({
+              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 ? (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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];
+              console.log('data', _data3);
+              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);
+    };
+  }();
   (0, _react.useImperativeHandle)(ref, function () {
     return {
       handleClick: handleClick,
@@ -506,8 +564,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   });
   (0, _react.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 = {
@@ -539,11 +597,15 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   }, [value, visible, isInit]);
   (0, _react.useEffect)(function () {
     if (!value) {
-      setState({
-        _value: undefined,
-        selectedRowKeys: [],
-        selectedRows: []
-      });
+      if (defaultOne) {
+        getDefaultOneValues();
+      } else {
+        setState({
+          _value: undefined,
+          selectedRowKeys: [],
+          selectedRows: []
+        });
+      }
     }
     if (labelInValue && _value && !(0, _lodash.isEqual)(value, _value)) {
       setState({

package/lib/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/lib/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/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/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/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 {

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/render/RenderFields.js

@@ -140,11 +140,9 @@ var RenderFields = function RenderFields(props) {
     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 +152,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 [];
@@ -180,11 +182,14 @@ var RenderFields = function RenderFields(props) {
       }, 200);
       return null;
     }
+    console.log('====================================');
+    console.log('formDisabled', Boolean(formDisabled), props, columns);
+    console.log('====================================');
     return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
       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

@@ -26,6 +26,7 @@ var _useForm3 = require("./utils/useForm");
 var _useFieldProps = require("./utils/useFieldProps");
 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,
@@ -180,6 +181,10 @@ var ProForm = function ProForm(props, ref) {
       })
     })) : null;
   };
+  // 国际化，非中文时默认上下布局
+  if (((_localStorage = localStorage) === null || _localStorage === void 0 ? void 0 : _localStorage.locale) && localStorage.locale !== 'zh-CN') {
+    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;