@zat-design/sisyphus-react 3.5.1 → 3.5.2

package/dist/index.esm.css

@@ -2497,12 +2497,14 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   cursor: pointer;
   fill: #c5c7cd;
 }
-.pro-modal-select .ant-select-status-error + .ant-btn,
-.pro-tree-modal .ant-select-status-error + .ant-btn {
-  border: 1px solid var(--ant-error-color);
-}
-.pro-modal-select .ant-select-status-error + .ant-btn > .viewSvg,
-.pro-tree-modal .ant-select-status-error + .ant-btn > .viewSvg {
+.pro-modal-select .ant-space-compact .ant-select-compact-item-div:has(.ant-select-status-error) + .ant-btn-compact-last-item,
+.pro-tree-modal .ant-space-compact .ant-select-compact-item-div:has(.ant-select-status-error) + .ant-btn-compact-last-item {
+  border-top: 1px solid var(--ant-error-color);
+  border-right: 1px solid var(--ant-error-color);
+  border-bottom: 1px solid var(--ant-error-color);
+}
+.pro-modal-select .ant-space-compact .ant-select-compact-item-div:has(.ant-select-status-error) + .ant-btn-compact-last-item > .viewSvg,
+.pro-tree-modal .ant-space-compact .ant-select-compact-item-div:has(.ant-select-status-error) + .ant-btn-compact-last-item > .viewSvg {
   color: var(--ant-error-color);
 }
 .pro-modal-select .ant-input-group-addon,
@@ -3737,6 +3739,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-tree {
   height: 100%;
 }
+.pro-tree .ant-tree-iconEle {
+  margin-right: 8px;
+}
 .pro-tree .ant-tree-node-content-wrapper {
   display: -webkit-box;
   display: -webkit-flex;
@@ -5802,6 +5807,9 @@ input[type='button'] {
   width: max-content;
 }
 .ant-tooltip > .ant-tooltip-content > .ant-tooltip-inner {
+  max-height: 360px;
+  overflow: auto;
+  line-height: 23px;
   color: #1d2129;
   background-color: #fff;
   -webkit-box-shadow: 0 3px 6px -4px rgba(0, 0, 0, 0.12), 0 6px 16px 0 rgba(0, 0, 0, 0.08), 0 9px 28px 8px rgba(0, 0, 0, 0.05);

package/dist/less.esm.css

@@ -2497,12 +2497,14 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   cursor: pointer;
   fill: #c5c7cd;
 }
-.pro-modal-select .ant-select-status-error + .ant-btn,
-.pro-tree-modal .ant-select-status-error + .ant-btn {
-  border: 1px solid var(--ant-error-color);
-}
-.pro-modal-select .ant-select-status-error + .ant-btn > .viewSvg,
-.pro-tree-modal .ant-select-status-error + .ant-btn > .viewSvg {
+.pro-modal-select .ant-space-compact .ant-select-compact-item-div:has(.ant-select-status-error) + .ant-btn-compact-last-item,
+.pro-tree-modal .ant-space-compact .ant-select-compact-item-div:has(.ant-select-status-error) + .ant-btn-compact-last-item {
+  border-top: 1px solid var(--ant-error-color);
+  border-right: 1px solid var(--ant-error-color);
+  border-bottom: 1px solid var(--ant-error-color);
+}
+.pro-modal-select .ant-space-compact .ant-select-compact-item-div:has(.ant-select-status-error) + .ant-btn-compact-last-item > .viewSvg,
+.pro-tree-modal .ant-space-compact .ant-select-compact-item-div:has(.ant-select-status-error) + .ant-btn-compact-last-item > .viewSvg {
   color: var(--ant-error-color);
 }
 .pro-modal-select .ant-input-group-addon,
@@ -3737,6 +3739,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-tree {
   height: 100%;
 }
+.pro-tree .ant-tree-iconEle {
+  margin-right: 8px;
+}
 .pro-tree .ant-tree-node-content-wrapper {
   display: -webkit-box;
   display: -webkit-flex;

package/es/ProDownload/index.js

@@ -5,7 +5,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["source", "action", "url", "method", "params", "fileName", "children", "onFinish", "beforeDownload", "className", "transformResponse"];
+var _excluded = ["source", "action", "url", "method", "params", "fileName", "children", "onFinish", "beforeDownload", "className", "transformResponse", "onError"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useSetState } from 'ahooks';
 import classNames from 'classnames';
@@ -24,6 +24,7 @@ var ProDownload = function ProDownload(props) {
     beforeDownload = props.beforeDownload,
     className = props.className,
     transformResponse = props.transformResponse,
+    onError = props.onError,
     defaultProps = _objectWithoutProperties(props, _excluded);
   var _useSetState = useSetState({
       loading: false
@@ -32,7 +33,8 @@ var ProDownload = function ProDownload(props) {
     loading = _useSetState2[0].loading,
     setState = _useSetState2[1];
   var _ref = useProConfig('ProDownload') || {},
-    headers = _ref.headers;
+    headers = _ref.headers,
+    onErrorConfig = _ref.onError;
   defaultProps.headers = _objectSpread(_objectSpread({}, headers), defaultProps.headers);
   var handDownload = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
@@ -94,7 +96,8 @@ var ProDownload = function ProDownload(props) {
               params: _params,
               transformResponse: transformResponse,
               fileName: fileName,
-              onFinish: onFinish
+              onFinish: onFinish,
+              onError: onError || onErrorConfig
             });
           case 17:
             _context.next = 23;

package/es/ProDownload/propsType.d.ts

@@ -8,9 +8,9 @@ export interface IProDownloadProps extends ButtonProps {
      */
     source?: string;
     /**
-   * @description       下载请求的地址
-   * @default           (必选)
-   */
+     * @description       下载请求的地址
+     * @default           (必选)
+     */
     url: string;
     /**
      * @description       下载请求的地址
@@ -39,21 +39,26 @@ export interface IProDownloadProps extends ButtonProps {
      */
     headers?: object;
     /**
-   * @description      禁用状态
-   * @default           false
-   */
+     * @description      禁用状态
+     * @default           false
+     */
     disabled?: boolean;
     /** 格式化数据 */
     transformResponse?: (data: any) => any;
     /**
-    * @description       上传文件之前的钩子,若返回 false 则停止下载。支持返回一个 Promise 对象，Promise 对象 reject 时则停止下载
-    * @default           -
-    */
-    beforeDownload?: (() => boolean | Promise<any>);
+     * @description       上传文件之前的钩子,若返回 false 则停止下载。支持返回一个 Promise 对象，Promise 对象 reject 时则停止下载
+     * @default           -
+     */
+    beforeDownload?: () => boolean | Promise<any>;
     /**
-   * @description       service 执行完成时触发
-   * @default           -
-   */
+     * @description       service 执行完成时触发
+     * @default           -
+     */
+    /**
+     * @description       下载出错的回调
+     * @default           -
+     */
+    onError?: (response: object) => void;
     onFinish?: () => void;
     /**
      * @description       下载按钮的填充内容

package/es/ProDownload/utils.d.ts

@@ -32,6 +32,11 @@ export interface IDownloadRequestPropsType {
    * @default           (必选)
    */
     fileName?: string;
+    /**
+     * @description       下载出错的回调
+     * @default           -
+     */
+    onError?: (response: object) => void;
 }
 /**
  * 下载Blob

package/es/ProDownload/utils.js

@@ -71,11 +71,11 @@ export function getFilenameFromContentDisposition(contentDisposition) {
 // 发起请求获取下载文件
 export var DownloadRequest = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
-    var url, _ref2$method, method, params, headers, transformResponse, fileName, onFinish, config, res, fileBlob, data, contentFileName;
+    var url, _ref2$method, method, params, headers, transformResponse, fileName, onFinish, onError, config, res, fileBlob, data, contentFileName;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          url = _ref2.url, _ref2$method = _ref2.method, method = _ref2$method === void 0 ? 'post' : _ref2$method, params = _ref2.params, headers = _ref2.headers, transformResponse = _ref2.transformResponse, fileName = _ref2.fileName, onFinish = _ref2.onFinish;
+          url = _ref2.url, _ref2$method = _ref2.method, method = _ref2$method === void 0 ? 'post' : _ref2$method, params = _ref2.params, headers = _ref2.headers, transformResponse = _ref2.transformResponse, fileName = _ref2.fileName, onFinish = _ref2.onFinish, onError = _ref2.onError;
           config = {
             method: method,
             credentials: 'include',
@@ -116,37 +116,38 @@ export var DownloadRequest = /*#__PURE__*/function () {
                     return _context.abrupt("return", Promise.reject("".concat(locale.ProDownload.errorMessage)));
                   case 7:
                     if (!((_data === null || _data === void 0 ? void 0 : _data.status) > 200 || (_data === null || _data === void 0 ? void 0 : _data.code) === 401)) {
-                      _context.next = 11;
+                      _context.next = 12;
                       break;
                     }
                     errorMsg = (_data === null || _data === void 0 ? void 0 : _data.message) || (_data === null || _data === void 0 ? void 0 : _data.msg);
                     errorMsg && _message.error(errorMsg);
+                    onError && onError(_data);
                     return _context.abrupt("return", Promise.reject(errorMsg));
-                  case 11:
+                  case 12:
                     if (!isFunction(transformResponse)) {
-                      _context.next = 13;
+                      _context.next = 14;
                       break;
                     }
                     return _context.abrupt("return", Promise.resolve(transformResponse(_data)));
-                  case 13:
+                  case 14:
                     Promise.resolve(_data);
-                    _context.next = 20;
+                    _context.next = 21;
                     break;
-                  case 16:
-                    _context.prev = 16;
+                  case 17:
+                    _context.prev = 17;
                     _context.t0 = _context["catch"](0);
                     if (!response.ok) {
-                      _context.next = 20;
+                      _context.next = 21;
                       break;
                     }
                     return _context.abrupt("return", Promise.resolve(response));
-                  case 20:
-                    return _context.abrupt("return", Promise.reject("".concat(locale.ProDownload.errorMessage)));
                   case 21:
+                    return _context.abrupt("return", Promise.reject("".concat(locale.ProDownload.errorMessage)));
+                  case 22:
                   case "end":
                     return _context.stop();
                 }
-              }, _callee, null, [[0, 16]]);
+              }, _callee, null, [[0, 17]]);
             }));
             return function (_x2) {
               return _ref4.apply(this, arguments);

package/es/ProEditTable/components/DndWrapper/index.d.ts

@@ -3,12 +3,14 @@ interface RowProps extends React.HTMLAttributes<HTMLTableRowElement> {
     'data-row-key': string;
     'data-hide'?: boolean;
     disabled?: boolean;
+    rowDraggable?: any;
 }
 export declare const Row: FC<RowProps>;
-declare const DndWrapper: ({ draggable, value, onChange, disabled, children }: {
+declare const DndWrapper: ({ draggable, value, onChange, onDrag, disabled, children }: {
     draggable: any;
     value: any;
     onChange: any;
+    onDrag: any;
     disabled: any;
     children: any;
 }) => any;

package/es/ProEditTable/components/DndWrapper/index.js

@@ -1,6 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["disabled", "children"];
+var _excluded = ["disabled", "rowDraggable", "children"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
 import { DndContext } from '@dnd-kit/core';
@@ -9,6 +9,7 @@ import { CSS } from '@dnd-kit/utilities';
 import ProIcon from '../../../ProIcon';
 export var Row = function Row(props) {
   var disabled = props.disabled,
+    rowDraggable = props.rowDraggable,
     children = props.children,
     restProps = _objectWithoutProperties(props, _excluded);
   var data = useSortable({
@@ -35,16 +36,16 @@ export var Row = function Row(props) {
     style: style
   }, attributes), {}, {
     children: React.Children.map(children, function (child) {
-      if (child.key === 'RC_TABLE_KEY') {
-        console.log('走这里么', child.key);
+      if (child.key === 'RC_TABLE_KEY' && !disabled) {
         var _ref = (child === null || child === void 0 ? void 0 : child.props) || {},
           render = _ref.render,
           record = _ref.record,
           renderIndex = _ref.renderIndex;
+        var isDrag = rowDraggable ? rowDraggable === null || rowDraggable === void 0 ? void 0 : rowDraggable(record) : true;
         return /*#__PURE__*/React.cloneElement(child, {
           children: _jsxs("span", {
             className: "drag-wrapper".concat(props['data-hide'] ? ' no-check' : ''),
-            children: [_jsx(ProIcon, _objectSpread({
+            children: [isDrag ? _jsx(ProIcon, _objectSpread({
               className: "drag-icon",
               style: {
                 touchAction: 'none',
@@ -52,7 +53,9 @@ export var Row = function Row(props) {
               },
               type: "drag",
               size: 20
-            }, listeners)), props['data-hide'] ? null : render === null || render === void 0 ? void 0 : render(null, record, renderIndex)]
+            }, listeners)) : _jsx(ProIcon, {
+              size: 20
+            }), props['data-hide'] ? null : render === null || render === void 0 ? void 0 : render(null, record, renderIndex)]
           })
         });
       }
@@ -65,12 +68,18 @@ var DndWrapper = function DndWrapper(_ref2) {
   var draggable = _ref2.draggable,
     value = _ref2.value,
     onChange = _ref2.onChange,
+    onDrag = _ref2.onDrag,
     disabled = _ref2.disabled,
     children = _ref2.children;
-  var onDragEnd = function onDragEnd(_ref3) {
-    var active = _ref3.active,
-      over = _ref3.over;
+  var onDragEnd = function onDragEnd(event) {
+    var active = event.active,
+      over = event.over;
     if (active.id !== (over === null || over === void 0 ? void 0 : over.id)) {
+      if (onDrag) {
+        var nextList = onDrag(event, value);
+        onChange(nextList);
+        return;
+      }
       var activeIndex = value.findIndex(function (i) {
         return i.rowKey === active.id;
       });

package/es/ProEditTable/index.js

@@ -9,7 +9,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalDiffTip", "rowKey", "rowDisabled", "footerRender", "scroll"];
+var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalDiffTip", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll"];
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import { get, isArray } from 'lodash';
@@ -25,6 +25,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
   var _resetProps$id, _resetProps$id$split, _themeConfig$data2, _value$2;
   var value = _ref.value,
     onChange = _ref.onChange,
+    onDrag = _ref.onDrag,
     className = _ref.className,
     columns = _ref.columns,
     type = _ref.type,
@@ -50,6 +51,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     originalDiffTip = _ref.originalDiffTip,
     rowKey = _ref.rowKey,
     rowDisabled = _ref.rowDisabled,
+    rowDraggable = _ref.rowDraggable,
     footerRender = _ref.footerRender,
     scroll = _ref.scroll,
     resetProps = _objectWithoutProperties(_ref, _excluded);
@@ -317,6 +319,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       children: [_jsxs(DndWrapper, {
         value: value,
         onChange: onChange,
+        onDrag: onDrag,
         disabled: disabled,
         draggable: draggable,
         children: [headerRender ? _jsx("div", {
@@ -338,7 +341,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
             return {
               disabled: disabled || virtualKey && !!editingKeys.length,
               'data-hide': isHideCheckBox,
-              onClick: function onClick() {}
+              onClick: function onClick() {},
+              rowDraggable: rowDraggable
             };
           }
         }, resetProps), {}, {

package/es/ProEditTable/propsType.d.ts

@@ -1,4 +1,5 @@
 import { Key, ReactNode } from 'react';
+import { DragEndEvent } from '@dnd-kit/core';
 import type { ButtonProps } from 'antd/es/button';
 import type { TooltipProps } from 'antd/es/tooltip';
 import type { NamePath } from 'antd/es/form/interface';
@@ -253,5 +254,7 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
      */
     headerRender?: ReactNode;
     rowDisabled?: (record?: T) => string | boolean;
+    rowDraggable?: (record?: T) => string | boolean;
+    onDrag?: (event: DragEndEvent, dataSource: T[]) => T[];
     ref?: any;
 }

package/es/ProEnum/components/Group.d.ts

@@ -1,5 +1,5 @@
 import { ProEnum } from '../propsType';
-interface Props extends Pick<ProEnum, 'value' | 'onChange' | 'dataSource'> {
+interface Props extends Pick<ProEnum, 'id' | 'value' | 'onChange' | 'dataSource'> {
     fieldValue: string;
     fieldLabel: string;
     disabled?: boolean;

package/es/ProEnum/components/Group.js

@@ -10,7 +10,8 @@ var Group = function Group(props) {
     fieldLabel = props.fieldLabel,
     disabled = props.disabled,
     _props$allowClear = props.allowClear,
-    allowClear = _props$allowClear === void 0 ? true : _props$allowClear;
+    allowClear = _props$allowClear === void 0 ? true : _props$allowClear,
+    id = props.id;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     refresh = _useState2[0],
@@ -41,6 +42,7 @@ var Group = function Group(props) {
     });
   }
   return _jsx("div", {
+    id: id,
     className: classNames('pro-enum-group-root', disabled ? 'pro-enum-group-root-disabled' : ''),
     children: dataSource.map(function (item, index) {
       return _jsx("div", {

package/es/ProEnum/components/Tag.d.ts

@@ -1,5 +1,5 @@
 import { ProEnum } from '../propsType';
-interface Props extends Pick<ProEnum, 'value' | 'onChange' | 'dataSource'> {
+interface Props extends Pick<ProEnum, 'id' | 'value' | 'onChange' | 'dataSource'> {
     fieldValue: string;
     fieldLabel: string;
 }

package/es/ProEnum/components/Tag.js

@@ -7,7 +7,8 @@ var ProEnumTag = function ProEnumTag(props) {
     onChange = props.onChange,
     dataSource = props.dataSource,
     fieldValue = props.fieldValue,
-    fieldLabel = props.fieldLabel;
+    fieldLabel = props.fieldLabel,
+    id = props.id;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     checked = _useState2[0],
@@ -25,6 +26,7 @@ var ProEnumTag = function ProEnumTag(props) {
     });
   }
   return _jsx("div", {
+    id: id,
     className: "pro-enum-tag-root",
     children: dataSource.map(function (item) {
       return _jsx("div", {

package/es/ProEnum/index.js

@@ -166,7 +166,7 @@ var ProEnum = function ProEnum(props) {
     }
     switch (type) {
       case 'ProSelect':
-        return _jsx(ProSelect, _objectSpread(_objectSpread({}, omit(enumProps, ['showCodeName'])), {}, {
+        return _jsx(ProSelect, _objectSpread(_objectSpread({}, enumProps), {}, {
           otherProps: otherProps,
           dataSource: list,
           fieldNames: {
@@ -204,6 +204,7 @@ var ProEnum = function ProEnum(props) {
         }));
       case 'Tag':
         return _jsx(ProEnumTag, {
+          id: enumProps.id,
           value: value,
           onChange: onChange,
           fieldLabel: label,

package/es/ProEnum/propsType.d.ts

@@ -75,6 +75,8 @@ export interface ProEnum {
     /** 支持 {label:xx, value: xx} */
     labelInValue?: boolean;
     otherProps?: ProFormOtherProps;
+    allowClear?: boolean;
+    id?: string;
 }
 export type PropProSelectsMap = {
     type?: 'ProSelect';

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

@@ -1,11 +1,21 @@
 import "antd/es/date-picker/style";
 import _DatePicker from "antd/es/date-picker";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["className", "format"];
 import { jsx as _jsx } from "react/jsx-runtime";
-import { isFunction, isString, isObject } from 'lodash';
+/*
+ * @Author: za-xuwenli xuwenli@zhongan.io
+ * @Date: 2024-01-19 18:27:41
+ * @LastEditors: za-xuwenli xuwenli@zhongan.io
+ * @LastEditTime: 2024-05-29 11:19:12
+ * @FilePath: /za-material-warehouse/src/ProForm/components/base/DatePicker/index.tsx
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
+
+import { isFunction, isString, isObject, uniq } from 'lodash';
 import classNames from 'classnames';
 import moment from 'moment';
 import { useProConfig } from '../../../../ProConfigProvider';
@@ -25,6 +35,14 @@ var DatePicker = function DatePicker(props) {
   var _className = classNames(_defineProperty({
     'full-form-item': true
   }, className, !!className));
+  var _viewFormat = Array.isArray(format) ? format[0] : format;
+  var tempFormat = Array.isArray(format) ? format : [format];
+  if (isFunction(format)) {
+    tempFormat = [];
+  }
+  var _format = uniq([].concat(_toConsumableArray(tempFormat), ['YYYY-MM-DD', 'YYYYMMDD', 'YYYY/MM/DD', 'YYYY_MM_DD', 'YYYY.MM.DD'])).filter(function (formatKey) {
+    return !!formatKey;
+  });
   if (isView) {
     var value = rest.value;
     var viewChildren = null;
@@ -35,7 +53,7 @@ var DatePicker = function DatePicker(props) {
     } else if (isFunction(format)) {
       viewChildren = format(value);
     } else if (isString(value)) {
-      viewChildren = moment(value).format(format);
+      viewChildren = moment(value).format(_viewFormat);
     }
     return _jsx(Container, {
       viewEmpty: viewEmpty,
@@ -57,7 +75,7 @@ var DatePicker = function DatePicker(props) {
     };
   }
   return _jsx(_DatePicker, _objectSpread(_objectSpread(_objectSpread({}, initialConfig), {}, {
-    format: format
+    format: _format
   }, _rest), {}, {
     className: _className
   }));

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

@@ -1,12 +1,21 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/date-picker/style";
 import _DatePicker from "antd/es/date-picker";
 var _excluded = ["format", "otherProps", "separator", "range"];
 import { jsx as _jsx } from "react/jsx-runtime";
+/*
+ * @Author: za-xuwenli xuwenli@zhongan.io
+ * @Date: 2024-04-10 11:39:17
+ * @LastEditors: za-xuwenli xuwenli@zhongan.io
+ * @LastEditTime: 2024-05-29 11:50:49
+ * @FilePath: /za-material-warehouse/src/ProForm/components/base/RangePicker/index.tsx
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ */
 // @ts-check
 
-import { isFunction, isString, omit } from 'lodash';
+import { isFunction, isString, omit, uniq } from 'lodash';
 import moment from 'moment';
 import { useProConfig } from '../../../../ProConfigProvider';
 import ProForm from '../../../../ProForm';
@@ -39,6 +48,14 @@ var RangePicker = function RangePicker(props) {
   if (Array.isArray(_res.value) && isString(_res.value[0]) && isString(_res.value[1])) {
     _res.value = [moment(_res.value[0]), moment(_res.value[1])];
   }
+  var _viewFormat = Array.isArray(format) ? format[0] : format;
+  var tempFormat = Array.isArray(format) ? format : [format];
+  if (isFunction(format)) {
+    tempFormat = [];
+  }
+  var _format = uniq([].concat(_toConsumableArray(tempFormat), ['YYYY-MM-DD', 'YYYYMMDD', 'YYYY/MM/DD', 'YYYY_MM_DD', 'YYYY.MM.DD'])).filter(function (formatKey) {
+    return !!formatKey;
+  });
   if (isView) {
     var _res$value = _res.value,
       value = _res$value === void 0 ? [] : _res$value;
@@ -56,13 +73,15 @@ var RangePicker = function RangePicker(props) {
     } else if (isFunction(format)) {
       viewChildren = "".concat(format(value[0]), " ").concat(separator, " ").concat(format(value[1]));
     } else {
-      viewChildren = "".concat(value[0].format(format), " ").concat(separator, " ").concat(value[1].format(format));
+      viewChildren = "".concat(value[0].format(_viewFormat), " ").concat(separator, " ").concat(value[1].format(_viewFormat));
     }
     return _jsx(Container, {
       viewEmpty: viewEmpty,
       children: viewChildren
     });
   }
-  return _jsx(AntRangePicker, _objectSpread(_objectSpread(_objectSpread({}, initialConfig), omit(_res, ['separator'])), rangeRegulator));
+  return _jsx(AntRangePicker, _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, initialConfig), omit(_res, ['separator'])), rangeRegulator), {}, {
+    format: _format
+  }));
 };
 export default RangePicker;

package/es/ProForm/components/combination/FormList/components/BlockFields.js

@@ -28,7 +28,8 @@ var BlockFields = function BlockFields(props) {
     isView = props.isView,
     _props$level = props.level,
     level = _props$level === void 0 ? '2' : _props$level,
-    towCollapse = props.towCollapse;
+    towCollapse = props.towCollapse,
+    id = props.id;
   var _title = useMemo(function () {
     if (isFunction(title)) {
       var record = form.getFieldValue(namePath);
@@ -40,6 +41,7 @@ var BlockFields = function BlockFields(props) {
   return _jsx(_Space, {
     direction: "vertical",
     className: cls,
+    id: id,
     children: _jsx(ProCollapse, {
       title: _title,
       index: index,

package/es/ProForm/components/combination/FormList/components/LineFields.js

@@ -25,7 +25,8 @@ var LineFields = function LineFields(props) {
     disabled = props.disabled,
     isView = props.isView,
     draggable = props.draggable,
-    className = props.className;
+    className = props.className,
+    id = props.id;
   var isLess = mode === 'less';
   var _useSortable = useSortable({
       id: field.key,
@@ -51,6 +52,7 @@ var LineFields = function LineFields(props) {
     className: classnames,
     ref: setNodeRef,
     style: style,
+    id: id,
     children: [!disabled && draggable && _jsx("div", _objectSpread(_objectSpread(_objectSpread({}, attributes), listeners), {}, {
       className: "pro-form-list-drag-handle",
       ref: setActivatorNodeRef,

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

@@ -54,6 +54,7 @@ export interface FormListProps {
         warnings: React.ReactNode[];
     };
     draggable?: boolean;
+    id?: string;
 }
 export type PropsWithRef = FormListProps & React.RefAttributes<FormListRef>;
 export interface FormListRef {

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

@@ -26,7 +26,8 @@ var Group = function Group(props) {
     value = props.value,
     onChange = props.onChange,
     otherProps = props.otherProps,
-    disabled = props.disabled;
+    disabled = props.disabled,
+    id = props.id;
   var contextProps = ProForm.useFieldProps() || {};
   var names = contextProps.names,
     name = contextProps.name,
@@ -65,6 +66,7 @@ var Group = function Group(props) {
   }, "".concat(className), className));
   return _jsx("div", {
     className: _className,
+    id: id,
     children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? _jsx(_Space.Compact, {
       children: columns.map(function (column, index) {
         return _jsx(ComRender, _objectSpread(_objectSpread({

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

@@ -43,6 +43,7 @@ export type GroupColumnProps<Values = any> = {
     trim?: boolean;
     upperCase?: boolean;
     toISOString?: boolean;
+    toCSTString?: boolean;
     clearNotShow?: boolean;
     confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps>;
     valuePropName?: string;