@zat-design/sisyphus-react 3.5.5 → 3.6.0

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

@@ -219,6 +219,8 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     /** 是否固定字段, 不隐藏 */
     fixed?: boolean;
     confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void>;
+    /** 防抖模式 */
+    debounceWait?: number;
 }
 export type ProColumnProps<T = any> = ProFormColumnProps<T> & ColumnPropsMap<T, 'ProForm'>;
 /**

package/es/ProForm/utils/useShouldUpdate.js

@@ -1,6 +1,6 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useRef, useState } from 'react';
-import { isFunction, isEqualWith } from 'lodash';
+import { isFunction, isEqualWith, isEqual } from 'lodash';
 import { customEqualForFun, equalDependencies } from './index';
 // 代理shouldUpdate事件, 执行函数值的[show, disabled], 当[show, disabled]与上一次值不相同时更新状态
 var useShouldUpdate = function useShouldUpdate(props) {
@@ -148,11 +148,9 @@ var useShouldUpdate = function useShouldUpdate(props) {
         index: index,
         namePath: namePath
       }) : rules;
-      var _component = isFunction(originComponent) ? originComponent(_currentValues, {
-        form: form,
-        index: index,
-        namePath: namePath
-      }) : newComponent;
+      // const _component = isFunction(originComponent)
+      //   ? originComponent(_currentValues, { form, index, namePath })
+      //   : newComponent;
       var _fieldProps = isFunction(fieldProps) ? fieldProps(_currentValues, {
         form: form,
         index: index,
@@ -174,14 +172,9 @@ var useShouldUpdate = function useShouldUpdate(props) {
           clearTimeout(timerRef.current);
         }
       }
-      // // 当校验规则改变的时候  重新执行校验 导致: 第一次进页面直接触发校验
-      // if (
-      //   _required !== requiredRef.current ||
-      //   !isEqualWith(rulesRef.current, _rules, customEqualForFun)
-      // ) {
-      //   form.validateFields([name]);
-      // }
       if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !isEqualWith(rulesRef.current, _rules, customEqualForFun) || !isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun) ||
+      // 值变更，需要同步更新函数式的fieldProps
+      isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun) && !isEqual(prevValues, currentValues) ||
       // !isEqualWith(originComponentRef.current, _component, customEqualForFun) ||
       equalDependencies(dependencies, prevValues, _currentValues)) {
         showRef.current = _show;

package/es/ProForm/utils/valueType.js

@@ -133,7 +133,7 @@ var dateTransform = function dateTransform(_ref2) {
       if (_valueType === 'dateStartTime') {
         result = transformDate({
           type: 'DatePicker',
-          format: 'YYYY-MM-DD HH:mm:ss',
+          format: 'YYYY-MM-DD',
           valueType: newValueType,
           timeType: 'startTime'
         });
@@ -141,7 +141,7 @@ var dateTransform = function dateTransform(_ref2) {
       if (_valueType === 'dateEndTime') {
         result = transformDate({
           type: 'DatePicker',
-          format: 'YYYY-MM-DD HH:mm:ss',
+          format: 'YYYY-MM-DD',
           valueType: newValueType,
           timeType: 'endTime'
         });
@@ -165,7 +165,7 @@ var dateTransform = function dateTransform(_ref2) {
       if (_valueType === 'dateStartEndTime') {
         result = transformDate({
           type: 'RangePicker',
-          format: 'YYYY-MM-DD HH:mm:ss',
+          format: 'YYYY-MM-DD',
           valueType: newValueType,
           timeType: 'startEndTime'
         });

package/es/assets/catalog.svg

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="32px" height="32px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>编组 52@1x</title>
+    <!-- <title>编组 52@1x</title> -->
     <defs>
         <rect id="path-1" x="0" y="4" width="24" height="18" rx="2"></rect>
         <filter x="-14.6%" y="-13.9%" width="129.2%" height="138.9%" filterUnits="objectBoundingBox" id="filter-2">

package/es/assets/disabled.svg

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>编组 33</title>
+    <!-- <title>编组 33</title> -->
     <g id="--11.表格-Table" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="自定义列" transform="translate(-1204.000000, -219.000000)">
             <g id="编组-31" transform="translate(712.000000, 60.000000)">

package/es/assets/drag.svg

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="20px" height="20px" viewBox="0 0 20 20" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>编组 34</title>
+    <!-- <title>编组 34</title> -->
     <g id="--11.表格-Table" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="自定义列" transform="translate(-1204.000000, -259.000000)">
             <g id="编组-31" transform="translate(712.000000, 60.000000)">

package/es/assets/fold.svg

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="16px" height="15px" viewBox="0 0 16 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>编组 2</title>
+    <!-- <title>编组 2</title> -->
     <defs>
         <linearGradient x1="100%" y1="50%" x2="0%" y2="50%" id="linearGradient-1">
             <stop stop-color="#ADDDFF" stop-opacity="0" offset="0%"></stop>

package/es/assets/input-search.svg

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>Combined Shape</title>
+    <!-- <title>Combined Shape</title> -->
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="业务归属机构选择-多选说明" transform="translate(-284.000000, -941.000000)" fill="#909090">
             <g id="Search备份-7" transform="translate(276.000000, 931.000000)">

package/es/assets/reset.svg

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="13px" height="15px" viewBox="0 0 13 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>形状</title>
+    <!-- <title>形状</title> -->
     <g id="控件" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="数据展示/表格/可选择/多选-批量操作" transform="translate(-1040.000000, -24.072313)" fill="#0A0A0A" fill-rule="nonzero">
             <g id="Group-6备份-4" transform="translate(1022.000000, 16.000000)">

package/es/assets/view.svg

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="19px" height="15px" viewBox="0 0 19 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>icon-dropdown-searchlist</title>
+    <!-- <title>icon-dropdown-searchlist</title> -->
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="询报价录入交互说明" transform="translate(-531, -308)" fill="currentColor" fill-rule="nonzero">
             <g id="Dropdown/下拉弹窗切换/default备份-2" transform="translate(215, 299)">

package/es/locale/en_US.js

@@ -53,7 +53,7 @@ export default {
   },
   ProAddressBar: {
     placeholder: 'Please select',
-    detailPlaceholder: 'Please enter detailed address'
+    detailPlaceholder: 'Please enter'
   },
   ProTree: {
     inputPlaceholder: 'Please enter',

package/es/locale/zh_CN.js

@@ -53,7 +53,7 @@ export default {
   },
   ProAddressBar: {
     placeholder: '请选择',
-    detailPlaceholder: '请输入详细地址'
+    detailPlaceholder: '请输入'
   },
   ProTree: {
     inputPlaceholder: '请输入',

package/lib/ProEditTable/components/RenderField/index.js

@@ -29,11 +29,12 @@ var _useFieldProps = require("../../../ProForm/utils/useFieldProps");
 var _useListChanged3 = require("../../../ProForm/utils/useListChanged");
 var _useRules = _interopRequireDefault(require("../../../ProForm/utils/useRules"));
 var _utils = require("../../../ProForm/utils");
-var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim"];
+var _ConfirmWrapper = _interopRequireDefault(require("../../../ProForm/components/render/ConfirmWrapper"));
+var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim", "confirm"];
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
 var RenderField = function RenderField(_ref) {
-  var _type, _type$replace, _fieldProps2, _names, _TargetComponent4, _componentProps;
+  var _type, _type$replace, _fieldProps2, _names, _TargetComponent4, _componentProps, _componentProps2;
   var value = _ref.text,
     record = _ref.record,
     index = _ref.index,
@@ -61,12 +62,10 @@ var RenderField = function RenderField(_ref) {
     equalWith = column.equalWith,
     className = column.className,
     trim = column.trim,
+    confirm = column.confirm,
     resetProps = (0, _objectWithoutProperties2.default)(column, _excluded);
   // editRender弃用使用component同ProForm
   var _editRender = component || editRender;
-  if (type && _editRender) {
-    console.warn('type和component为互斥关系, type将不会生效');
-  }
   var mode = config.mode,
     cellName = config.cellName,
     cellNamePath = config.cellNamePath,
@@ -501,6 +500,7 @@ var RenderField = function RenderField(_ref) {
     onChange: _onChange,
     onBlur: _onblur,
     index: index,
+    confirm: confirm,
     otherProps: {
       form: form,
       names: names,
@@ -543,7 +543,9 @@ var RenderField = function RenderField(_ref) {
   }, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
     className: _className,
     name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
-    children: /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps))
+    children: ((_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.confirm) ? (0, _jsxRuntime.jsx)(_ConfirmWrapper.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
+      children: /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps))
+    })) : /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps))
   })) : (0, _jsxRuntime.jsx)(_Container.default, {
     viewEmpty: viewEmpty
   });
@@ -573,7 +575,7 @@ var RenderField = function RenderField(_ref) {
     }))]
   }) : null;
   return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
-    value: (_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.otherProps,
+    value: (_componentProps2 = componentProps) === null || _componentProps2 === void 0 ? void 0 : _componentProps2.otherProps,
     children: !originalDiffTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : (0, _jsxRuntime.jsx)(_antd.Tooltip, {
       title: originalTitle,
       placement: "topLeft",

package/lib/ProEditTable/index.js

@@ -23,7 +23,7 @@ var _components = require("./components");
 var _ProForm = _interopRequireDefault(require("../ProForm"));
 var _empty = _interopRequireDefault(require("../assets/empty.png"));
 var _locale = _interopRequireWildcard(require("../locale"));
-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", "actionDirection"];
+var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalDiffTip", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection"];
 var ProEditTable = function ProEditTable(_ref, ref) {
   var _resetProps$id, _resetProps$id$split, _themeConfig$data2, _value$;
   var value = _ref.value,
@@ -41,6 +41,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     actionWidth = _ref.actionWidth,
     actionProps = _ref.actionProps,
     toolbarProps = _ref.toolbarProps,
+    toolbarSticky = _ref.toolbarSticky,
     rowSelection = _ref.rowSelection,
     onlyOneLineMsg = _ref.onlyOneLineMsg,
     deletePoConfirmMsg = _ref.deletePoConfirmMsg,
@@ -62,6 +63,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
   // 上下文form
   var contentForm = _antd.Form.useFormInstance();
   var formFieldProps = _ProForm.default.useFieldProps() || {};
+  var affixRef = (0, _react.useRef)(null);
   var form = contentForm || (formFieldProps === null || formFieldProps === void 0 ? void 0 : formFieldProps.form) || (resetProps === null || resetProps === void 0 ? void 0 : resetProps.form);
   var name = (formFieldProps === null || formFieldProps === void 0 ? void 0 : formFieldProps.name) || (resetProps === null || resetProps === void 0 ? void 0 : resetProps.name) || (resetProps === null || resetProps === void 0 ? void 0 : (_resetProps$id = resetProps.id) === null || _resetProps$id === void 0 ? void 0 : (_resetProps$id$split = _resetProps$id.split) === null || _resetProps$id$split === void 0 ? void 0 : _resetProps$id$split.call(_resetProps$id, '_'));
   var _formFieldProps$isVie = formFieldProps.isView,
@@ -75,6 +77,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     disabled = (formFieldProps === null || formFieldProps === void 0 ? void 0 : formFieldProps.disabled) || disabled; // formFieldProps?.disabled可能是函数？？
   }
   var tableRef = (0, _react.useRef)(null);
+  var valueChangeRef = (0, _react.useRef)(null);
+  valueChangeRef.current = 0;
   var _React$useContext = _react.default.useContext(_antd.ConfigProvider.ConfigContext),
     getPrefixCls = _React$useContext.getPrefixCls;
   var prefixCls = getPrefixCls();
@@ -265,24 +269,13 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     }
     return null;
   };
+  (0, _ahooks.useDeepCompareEffect)(function () {
+    valueChangeRef.current += 1;
+    // 在这里根据需要计算新的数组
+  }, [value, config.name]);
   var _columns = (0, _react.useMemo)(function () {
     return (0, _utils.transformColumns)(columns, config);
-  }, [value, cellNamePath, forceUpdate, editingKeys, disabled, actionProps, columns, page, config.name]);
-  // const setColumns = async () => {
-  //   const nextColumns = transformColumns(columns, config);
-  //   setState({
-  //     _columns: nextColumns,
-  //   });
-  // };
-  // useDebounceEffect(
-  //   () => {
-  //     setColumns();
-  //   },
-  //   [value, cellNamePath, forceUpdate, editingKeys, disabled, actionProps, columns, page], // columns更新修复外部表单无法控制内部表单的问题
-  //   {
-  //     wait: 60,
-  //   },
-  // );
+  }, [valueChangeRef.current, disabled, forceUpdate, columns, page, actionProps, editingKeys, cellNamePath]);
   (0, _react.useEffect)(function () {
     var isAllHasKey = value.every(function (item) {
       return item.rowKey;
@@ -313,6 +306,19 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       setInternalState: setState
     };
   });
+  (0, _react.useEffect)(function () {
+    if (toolbarSticky) {
+      var updatePos = function updatePos() {
+        var _affixRef$current;
+        affixRef === null || affixRef === void 0 ? void 0 : (_affixRef$current = affixRef.current) === null || _affixRef$current === void 0 ? void 0 : _affixRef$current.updatePosition();
+      };
+      window.addEventListener('scroll', updatePos, true);
+      return function () {
+        window.removeEventListener('scroll', updatePos, true);
+      };
+    }
+  }, [toolbarSticky]);
+  var _toolbarSticky = (0, _lodash.isBoolean)(toolbarSticky) ? {} : toolbarSticky;
   var _summary = (0, _typeof2.default)(summary) === 'object' ? function (data) {
     return (0, _jsxRuntime.jsx)(_components.Summary, {
       data: data,
@@ -375,7 +381,14 @@ var ProEditTable = function ProEditTable(_ref, ref) {
           },
           summary: _summary
         }))]
-      }), !isView && (value === null || value === void 0 ? void 0 : value.length) ? (0, _jsxRuntime.jsx)("div", {
+      }), !isView && (value === null || value === void 0 ? void 0 : value.length) ? toolbarSticky ? (0, _jsxRuntime.jsx)(_antd.Affix, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        ref: affixRef
+      }, _toolbarSticky), {}, {
+        children: (0, _jsxRuntime.jsx)("div", {
+          className: "pro-edit-table-toolbar".concat(pagination ? ' pro-edit-table-toolbar-fixed' : ''),
+          children: (0, _jsxRuntime.jsx)(_components.RenderToolbar, (0, _objectSpread2.default)({}, config))
+        })
+      })) : (0, _jsxRuntime.jsx)("div", {
         className: "pro-edit-table-toolbar".concat(pagination ? ' pro-edit-table-toolbar-fixed' : ''),
         children: (0, _jsxRuntime.jsx)(_components.RenderToolbar, (0, _objectSpread2.default)({}, config))
       }) : null, footerRender ? (0, _jsxRuntime.jsx)("div", {

package/lib/ProEditTable/propsType.d.ts

@@ -1,3 +1,4 @@
+import { AffixProps, ModalFuncProps } from 'antd';
 import { Key, ReactNode } from 'react';
 import { DragEndEvent } from '@dnd-kit/core';
 import type { ButtonProps } from 'antd/es/button';
@@ -5,7 +6,7 @@ import type { TooltipProps } from 'antd/es/tooltip';
 import type { NamePath } from 'antd/es/form/interface';
 import type { ColumnType, TableProps } from 'antd/es/table';
 import type { FormInstance, FormItemProps } from 'antd/es/form';
-import type { ProRule } from '../ProForm/propsType';
+import type { FunctionArgs, ProRule } from '../ProForm/propsType';
 import { ProFormValueType, ColumnPropsMap } from '../ProForm/components/render/propsType';
 export type ActionType = 'edit' | 'delete' | 'save' | 'cancel' | 'add' | 'mulDelete' | 'custom';
 export type ShowFunction<T> = (record?: T, options?: {
@@ -98,6 +99,7 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
     viewRender?: string | number | ReactNode | viewRenderFn<T>;
     hiddenNames?: NamePath[] | NamePath[][];
     rules?: ProRule[] | RulesFn<T>;
+    confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void>;
     [key: string]: any;
 }
 export type ProEditTableColumnsProps<K = any> = ProColumnsProps & ColumnPropsMap<K, 'ProEditTable'>;
@@ -229,6 +231,11 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
      * @default           -
      */
     toolbarProps?: BaseActionProps<T>[] | boolean;
+    /**
+     *  @description      自定义底部操作栏跟随页面滚动
+     *  @default           -
+     */
+    toolbarSticky?: boolean | Omit<AffixProps, 'children'>;
     /**
      * @description       最大可添加数量
      * @default           -

package/lib/ProEditTable/style/index.less

@@ -303,6 +303,7 @@
 }
 
 .pro-edit-table-toolbar {
+  background-color: #fff;
   .@{ant-prefix}-space {
     gap: var(--zaui-space-size-sm, 8px);
 

package/lib/ProEditTable/utils/index.js

@@ -260,6 +260,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
     var columnName = (item === null || item === void 0 ? void 0 : item.name) || dataIndex || key;
     item.dataIndex = columnName;
     item.key = columnName;
+    // item.shouldCellUpdate = item.shouldCellUpdate || ((record, perRecord) => !isEqual(record, perRecord));
     var required = (0, _lodash.isBoolean)(item.required) ? item.required : false;
     if (typeof item.required === 'function') {
       var namePath = (0, _tools.getNamePath)(name, virtualKey);

package/lib/ProEnum/propsType.d.ts

@@ -49,7 +49,7 @@ export interface ProEnum {
     /** 用于自定义组件 */
     component?: ReactNode;
     /** 用于提交 code */
-    code: string | string[];
+    code?: string | string[];
     /** 字段别名 */
     fieldNames?: Record<string, string>;
     /** 是否查看模式 */

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

@@ -69,20 +69,17 @@ var DatePicker = function DatePicker(props) {
     format: 'HH:mm:ss'
   };
   // dateTime模式下默认开启time选择
-  var _rest = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
-    showTime: rest.showTime === undefined && valueType === 'dateTime' || rest.showTime
-  });
+  var _rest = (0, _objectSpread2.default)({}, rest);
+  // showTime默认值受valueType属性影响
+  if (rest.showTime === undefined) {
+    if (valueType === 'dateTime') {
+      _rest.showTime = true;
+    }
+  }
   // 字符串时间格式兼容
   if ((0, _lodash.isString)(_rest.value)) {
     _rest.value = (0, _moment.default)(_rest.value);
   }
-  if (['dateStartTime', 'dateEndTime'].includes(valueType) && rest.showTime === undefined) {
-    _rest.showTime = {
-      value: (0, _moment.default)(valueType === 'dateStartTime' ? '00:00:00' : '23:59:59', 'HH:mm:ss'),
-      disabled: true,
-      _defaultShowTime: _defaultShowTime
-    };
-  }
   if (_rest.showTime === true) {
     _rest.showTime = (0, _objectSpread2.default)({}, _defaultShowTime);
   }

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

@@ -46,12 +46,19 @@ var RangePicker = function RangePicker(props) {
     disabledDate: rest.disabledDate
   });
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
-  var _res = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
-    showTime: !rest.showTime && valueType === 'dateTime' || rest.showTime
-  });
+  var _rest = (0, _objectSpread2.default)({}, rest);
+  // showTime默认值受valueType属性影响
+  if (rest.showTime === undefined) {
+    if (valueType === 'dateTime') {
+      _rest.showTime = true;
+    }
+    if (valueType === 'dateStartEndTime') {
+      _rest.showTime = false;
+    }
+  }
   // 字符串时间格式兼容
-  if (Array.isArray(_res.value) && (0, _lodash.isString)(_res.value[0]) && (0, _lodash.isString)(_res.value[1])) {
-    _res.value = [(0, _moment.default)(_res.value[0]), (0, _moment.default)(_res.value[1])];
+  if (Array.isArray(_rest.value) && (0, _lodash.isString)(_rest.value[0]) && (0, _lodash.isString)(_rest.value[1])) {
+    _rest.value = [(0, _moment.default)(_rest.value[0]), (0, _moment.default)(_rest.value[1])];
   }
   var _viewFormat = Array.isArray(format) ? format[0] : format;
   var tempFormat = Array.isArray(format) ? format : [format];
@@ -62,11 +69,11 @@ var RangePicker = function RangePicker(props) {
     return !!formatKey;
   });
   var _defaultShowTime = {
-    format: 'YYYY-MM-DD HH:mm:ss'
+    format: 'HH:mm:ss'
   };
   if (isView) {
-    var _res$value = _res.value,
-      value = _res$value === void 0 ? [] : _res$value;
+    var _rest$value = _rest.value,
+      value = _rest$value === void 0 ? [] : _rest$value;
     var viewChildren = null;
     if (!value || !value[0] || !value[1]) {
       viewChildren = null;
@@ -88,10 +95,13 @@ var RangePicker = function RangePicker(props) {
       children: viewChildren
     });
   }
-  if (_res.showTime === true) {
-    _res.showTime = (0, _objectSpread2.default)({}, _defaultShowTime);
+  if (_rest.showTime === true) {
+    _rest.showTime = (0, _objectSpread2.default)({}, _defaultShowTime);
+  }
+  if ((0, _lodash.isObject)(_rest.showTime)) {
+    _rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
   }
-  return (0, _jsxRuntime.jsx)(AntRangePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, initialConfig), (0, _lodash.omit)(_res, ['separator'])), rangeRegulator), {}, {
+  return (0, _jsxRuntime.jsx)(AntRangePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, initialConfig), (0, _lodash.omit)(_rest, ['separator'])), rangeRegulator), {}, {
     format: _format
   }));
 };

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

@@ -21,7 +21,7 @@ var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _useEnum = _interopRequireDefault(require("../../../../ProEnum/hooks/useEnum"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
 var _ = _interopRequireDefault(require("../../.."));
-var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator"];
+var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator", "detailPlaceholder"];
 var Text = _antd.Typography.Text;
 var defaultFieldNames = {
   label: 'name',
@@ -79,6 +79,7 @@ var ProCascader = function ProCascader(props) {
     tooltip = props.tooltip,
     _props$separator = props.separator,
     separator = _props$separator === void 0 ? '' : _props$separator,
+    detailPlaceholder = props.detailPlaceholder,
     otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref3 = _.default.useFieldProps() || {},
     isViewCon = _ref3.isView;
@@ -247,7 +248,7 @@ var ProCascader = function ProCascader(props) {
       disabled: disabled,
       value: detail,
       maxLength: detailMaxLength,
-      placeholder: _locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProAddressBar2 = _locale.default.ProAddressBar) === null || _locale$ProAddressBar2 === void 0 ? void 0 : _locale$ProAddressBar2.detailPlaceholder,
+      placeholder: detailPlaceholder || (_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProAddressBar2 = _locale.default.ProAddressBar) === null || _locale$ProAddressBar2 === void 0 ? void 0 : _locale$ProAddressBar2.detailPlaceholder),
       onChange: handleAddressChange
     }))]
   });

package/lib/ProForm/components/combination/ProCascader/propsType.d.ts

@@ -32,4 +32,6 @@ export interface ProCascaderProps {
     otherProps?: any;
     /** 查看分隔符 */
     separator?: string;
+    /** 详情框占位符 */
+    detailPlaceholder?: string;
 }

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

@@ -11,6 +11,8 @@ export type Props = Omit<RangePickerProps, 'value' | 'onChange' | 'format' | 'se
     format?: string;
     separator?: any;
     isView?: boolean;
+    showTime?: any;
+    valueType?: any;
 };
 type Value = [Moment?, Moment?, boolean?] | null;
 type ValueStr = [string?, string?, string?] | null;

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -81,6 +82,28 @@ var ProRangeLimit = function ProRangeLimit(props) {
     'forever-checkbox': true
   });
   var _foreverDate = foreverDate || (initialConfig === null || initialConfig === void 0 ? void 0 : initialConfig.foreverDate);
+  var _rest = (0, _objectSpread2.default)({}, rest);
+  // showTime默认值受valueType属性影响
+  if (rest.showTime === undefined) {
+    var valueType = props.valueType;
+    if (valueType === 'dateTime') {
+      _rest.showTime = true;
+    }
+    if (valueType === 'dateStartEndTime') {
+      _rest.showTime = false;
+    }
+  }
+  var _viewFormat = Array.isArray(format) ? format[0] : format;
+  var tempFormat = Array.isArray(format) ? format : [format];
+  if ((0, _lodash.isFunction)(format)) {
+    tempFormat = [];
+  }
+  var _format = (0, _lodash.uniq)([].concat((0, _toConsumableArray2.default)(tempFormat), ['YYYY-MM-DD', 'YYYYMMDD', 'YYYY/MM/DD', 'YYYY_MM_DD', 'YYYY.MM.DD'])).filter(function (formatKey) {
+    return !!formatKey;
+  });
+  var _defaultShowTime = {
+    format: 'HH:mm:ss'
+  };
   var _isForever = (0, _react.useMemo)(function () {
     return (0, _moment.default)(_foreverDate, format).isSame(endDate);
   }, [value]);
@@ -136,6 +159,12 @@ var ProRangeLimit = function ProRangeLimit(props) {
       onChange([start, null]);
     }
   };
+  if (_rest.showTime === true) {
+    _rest.showTime = (0, _objectSpread2.default)({}, _defaultShowTime);
+  }
+  if ((0, _lodash.isObject)(_rest.showTime)) {
+    _rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
+  }
   return (0, _jsxRuntime.jsxs)(_antd.Input.Group, {
     compact: true,
     className: "pro-range-limit",
@@ -143,8 +172,8 @@ var ProRangeLimit = function ProRangeLimit(props) {
       allowClear: true,
       disabled: [_disabled === null || _disabled === void 0 ? void 0 : _disabled[0], (_disabled === null || _disabled === void 0 ? void 0 : _disabled[1]) || _isForever],
       defaultPickerValue: defaultPickerValue
-    }, initialConfig), (0, _lodash.omit)(rest, ['placeholder', 'separator'])), {}, {
-      format: format,
+    }, initialConfig), (0, _lodash.omit)(_rest, ['placeholder', 'separator'])), {}, {
+      format: _format,
       value: value,
       onChange: handleRangeChange
     })), (0, _jsxRuntime.jsx)("div", {

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

@@ -1,4 +1,5 @@
-import { DatePickerProps } from 'antd';
+import { DatePickerProps, TimePickerProps } from 'antd';
+import { PickerPanelDateProps } from 'antd/lib/calendar/generateCalendar';
 import { Moment } from 'moment';
 import React from 'react';
 import { ProFormOtherProps } from '../../../propsType';
@@ -13,10 +14,13 @@ export type ProTimeLimitProps = DistributiveOmit<DatePickerProps, 'value' | 'onC
     foreverText?: string;
     viewEmpty?: React.ReactNode;
     format?: string;
-    valueType?: 'moment' | 'format' | 'ISO';
+    valueType?: 'moment' | 'format' | 'ISO' | 'dateTime' | 'dateStartEndTime';
     otherProps?: ProFormOtherProps;
     mode?: 'DatePicker';
     isView?: boolean;
+} & TimePickerProps & {
+    showTime?: PickerPanelDateProps<Moment>['showTime'];
+    showNow?: boolean;
 };
 export declare const ProTimeLimit: React.FC<ProTimeLimitProps>;
 export type ProLimitProps = ProTimeLimitProps | (ProRangeLimitProps & {