@zat-design/sisyphus-react 3.3.2 → 3.3.3

package/dist/index.esm.css

@@ -751,6 +751,9 @@
 .pro-collapse.pro-collapse-level2 .pro-collapse-level2-collapse .ant-collapse-expand-icon {
   display: block;
 }
+.pro-collapse.pro-collapse-level2 .pro-collapse-level2-no-collapse .ant-collapse-expand-icon {
+  display: none;
+}
 .pro-collapse .ant-collapse-extra .extra-info {
   margin-right: 24px;
 }
@@ -2565,20 +2568,24 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-form .ant-form-item.pro-form-item-changed span.ant-input-affix-wrapper,
 .pro-form .ant-form-item.pro-form-item-changed .ant-select-selector,
-.pro-form .ant-form-item.pro-form-item-changed .ant-picker {
+.pro-form .ant-form-item.pro-form-item-changed .ant-picker,
+.pro-form .ant-form-item.pro-form-item-changed .ant-input-number {
   background: var(--zaui-contract-bg, #fffaa1) !important;
 }
 .pro-form .ant-form-item.pro-form-item-changed span.ant-input-affix-wrapper input,
 .pro-form .ant-form-item.pro-form-item-changed .ant-select-selector input,
-.pro-form .ant-form-item.pro-form-item-changed .ant-picker input {
+.pro-form .ant-form-item.pro-form-item-changed .ant-picker input,
+.pro-form .ant-form-item.pro-form-item-changed .ant-input-number input {
   background: var(--zaui-contract-bg, #fffaa1);
 }
 .pro-form .ant-form-item.pro-form-item-changed span.ant-input-affix-wrapper .ant-select-selection-placeholder,
 .pro-form .ant-form-item.pro-form-item-changed .ant-select-selector .ant-select-selection-placeholder,
-.pro-form .ant-form-item.pro-form-item-changed .ant-picker .ant-select-selection-placeholder {
+.pro-form .ant-form-item.pro-form-item-changed .ant-picker .ant-select-selection-placeholder,
+.pro-form .ant-form-item.pro-form-item-changed .ant-input-number .ant-select-selection-placeholder {
   z-index: 9;
 }
-.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > .pro-form-view-container {
+.pro-form .ant-form-item.pro-form-item-changed .ant-form-item-control-input-content > span,
+.pro-form .ant-form-item.pro-form-item-changed .pro-form-view-container {
   padding: 4px 8px;
   background: var(--zaui-contract-bg, #fffaa1);
   border-radius: 4px;
@@ -5470,7 +5477,6 @@ input[type='button'] {
   width: calc(100% - 18px);
   margin-bottom: 0;
   text-align: right;
-  background: #fff;
 }
 .ant-space.ant-space-vertical {
   display: -webkit-box;

package/es/ProDrawerForm/components/ProModal/index.js

@@ -175,7 +175,6 @@ var ProModal = function ProModal(_ref) {
     footer: renderFooter(),
     okText: okText,
     cancelText: cancelText,
-    centered: true,
     closeIcon: _jsx(ReactSVG, {
       className: "close-icon",
       src: closeSvg

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

@@ -9,6 +9,7 @@ import classnames from 'classnames';
 import { useProConfig } from '../../../../ProConfigProvider';
 import locale from '../../../../locale';
 import ProForm from '../../../../ProForm';
+import Container from '../../Container';
 import './index.less';
 var TextArea = _Input.TextArea;
 var TextAreaDef = function TextAreaDef(props) {
@@ -18,16 +19,20 @@ var TextAreaDef = function TextAreaDef(props) {
     rest = _objectWithoutProperties(props, _excluded);
   var _ref = ProForm.useFieldProps() || {},
     label = _ref.label,
-    isViewCon = _ref.isView;
+    isViewCon = _ref.isView,
+    viewEmpty = _ref.viewEmpty;
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
   var initialConfig = useProConfig('TextArea');
-  var disabled = (initialConfig === null || initialConfig === void 0 ? void 0 : initialConfig.disabled) || rest.disabled;
   if (isView) {
-    disabled = true;
+    return _jsx(Container, {
+      nowrap: false,
+      tooltip: true,
+      viewEmpty: viewEmpty,
+      children: rest.value
+    });
   }
   var _className = classnames({
     'pro-textarea': true,
-    disabled: disabled,
     'pro-textarea-view': isView,
     className: className
   });
@@ -39,7 +44,6 @@ var TextAreaDef = function TextAreaDef(props) {
       minRows: 4
     }
   }, omit(initialConfig, ['trim'])), rest), {}, {
-    disabled: disabled,
     className: _className
   }));
 };

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

@@ -11,11 +11,12 @@ var Container = function Container(props) {
   var children = props.children,
     otherProps = props.otherProps,
     className = props.className,
-    container = props.container;
+    container = props.container,
+    show = props.show,
+    clearNotShow = props.clearNotShow;
   var _ref = ProForm.useFieldProps() || {},
     type = _ref.type,
     form = _ref.form,
-    show = _ref.show,
     required = _ref.required,
     disabled = _ref.disabled;
   var _className = classnames(_defineProperty({
@@ -25,6 +26,7 @@ var Container = function Container(props) {
   var _children = useMemo(function () {
     var result = children.map(function (item) {
       return _objectSpread({
+        clearNotShow: clearNotShow,
         show: show,
         required: required,
         disabled: disabled

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

@@ -7,4 +7,6 @@ export interface ContainerProps {
     rowProps?: RowProps;
     className?: string;
     container?: string | React.ReactNode;
+    show?: boolean | (() => boolean);
+    clearNotShow?: boolean;
 }

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

@@ -3,6 +3,7 @@ import { Moment } from 'moment';
 import React from 'react';
 import { ProFormOtherProps } from '../../../propsType';
 import { Props as ProRangeLimitProps } from '../ProRangeLimit';
+import { DistributiveOmit } from '../../../../ProForm/propsType';
 export type DateType = DatePickerProps['value'];
 export type ProTimeLimitProps = DistributiveOmit<DatePickerProps, 'value' | 'onChange' | 'mode'> & {
     value?: string;

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

@@ -12,7 +12,7 @@ var _excluded = ["format", "disabled", "foreverTime", "foreverText", "valueType"
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import classNames from 'classnames';
 import { omit } from 'lodash';
-import moment, { isMoment } from 'moment';
+import moment from 'moment';
 import { useMemo } from 'react';
 import { useProConfig } from '../../../../ProConfigProvider';
 import Container from '../../Container';
@@ -53,7 +53,7 @@ export var ProTimeLimit = function ProTimeLimit(props) {
     onChange = _useControlled2[1];
   var initialConfig = useProConfig('ProTimeLimit');
   var isForever = useMemo(function () {
-    if (isMoment(value)) {
+    if (moment.isMoment(value)) {
       return foreverMoment.format(format) === value.format(format);
     }
     return false;

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

@@ -175,7 +175,7 @@ var Render = function Render(props) {
   if (formItemProps.hidden === true || _show === false) {
     // 为了监听shouldUpdate  必须存在一个FormItem, 空Input解决 【[antd: Form.Item] `name` is only used for validate React element】
     return _jsx(_Form.Item, {
-      name: _otherFormItemProps.name,
+      name: _otherFormItemProps.name || 'proFormItemHidden',
       shouldUpdate: _otherFormItemProps.shouldUpdate,
       className: _className,
       noStyle: true,

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

@@ -146,6 +146,11 @@ var RenderFields = function RenderFields(props) {
     }, _fieldProps), {}, {
       disabled: _disabled
     });
+    // 容器组件，额外处理show的问题
+    if (['ProCollapse', 'Container'].includes(_type)) {
+      componentProps.show = show;
+      componentProps.clearNotShow = clearNotShow;
+    }
     // switch与SwitchCheckbox单独添加valuePropName
     if (['Switch', 'SwitchCheckbox'].includes(_type)) {
       _formItemProps.valuePropName = 'checked';

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

@@ -32,6 +32,7 @@ import { ProUploadProps } from '../../../ProUpload/propsType';
 import { ProTreeProps } from '../../../ProTree/propsType';
 import { GroupProps } from '../combination/Group/propsType';
 import { ProCollapseProps } from '../../../ProLayout/components/ProCollapse/PropTypes';
+import { DistributiveOmit } from '../../propsType';
 export type ComponentMap = keyof typeof componentMap;
 type ValidateKey = keyof typeof validate;
 type RegExpKey = keyof typeof regExp;

package/es/ProForm/components/render/propsType.js

@@ -1 +1,2 @@
+var a = {};
 export {};

package/es/ProForm/propsType.d.ts

@@ -73,3 +73,4 @@ export interface Transform<T = any> {
     getValueProps?: (value: StoreValue) => Record<string, unknown>;
     shouldUpdate?: ShouldUpdate<T>;
 }
+export type DistributiveOmit<T, K extends keyof any> = T extends any ? Omit<T, K> : never;

package/es/ProForm/style/index.less

@@ -126,11 +126,12 @@
       }
     }
 
-    // 比较原始值场景下  不同时候的样式
+    // 比较原始值场景下  不同时的样式
     &.pro-form-item-changed {
       span.@{ant-prefix}-input-affix-wrapper,
       .@{ant-prefix}-select-selector,
-      .@{ant-prefix}-picker {
+      .@{ant-prefix}-picker,
+      .@{ant-prefix}-input-number {
         background: @zaui-contract-bg !important;
 
         input {
@@ -141,7 +142,9 @@
         }
       }
 
-      .@{ant-prefix}-form-item-control-input-content > .pro-form-view-container {
+      // 查看模式 修改容器样式
+      .@{ant-prefix}-form-item-control-input-content > span, // 地址组件
+      .pro-form-view-container {
         padding: 4px 8px;
         background: @zaui-contract-bg;
         border-radius: 4px;

package/es/ProForm/utils/useChanged.js

@@ -12,7 +12,7 @@ export var useChanged = function useChanged(_ref) {
   var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
     return get(originalValues, name);
   }) : get(originalValues, name);
-  var notWatch = !originalValues || originalValue === undefined;
+  var notWatch = !equalWith && (!originalValues || originalValue === undefined);
   if (notWatch) form = [];
   var value = _Form.useWatch(namesStr || name, form);
   if (notWatch) return [false];

package/es/ProForm/utils/useListChanged.js

@@ -33,11 +33,22 @@ var getOriginalValue = function getOriginalValue(_ref) {
     var originalValueRow = originalValueList.find(function (item) {
       return item[rowKeyPath[rowKeyPath.length - 1]] === keyValue;
     });
-    var originalValue = (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
-      return get(originalValueRow, originalName.slice(rowKeyPath.length - 1));
-    }) : get(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+    var originalValue;
+    if (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) {
+      var originalNamesValue = originalNames.map(function (originalName) {
+        return get(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+      });
+      // 有可能出现数组中全是undefined的情况  视为没有值
+      var fillUndefined = originalNamesValue.every(function (valItem) {
+        return valItem === undefined;
+      });
+      originalValue = fillUndefined ? undefined : originalNamesValue;
+    } else {
+      originalValue = get(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+    }
     return originalValue;
   }
+  // 这个方法是给editTable专用的  暂时不存在不传rowKey的情况
   return (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
     return get(originalValues, originalName);
   }) : get(originalValues, originalName);
@@ -54,23 +65,24 @@ export var useListChanged = function useListChanged(params) {
     form = params.form,
     equalWith = params.equalWith,
     rowKeyPath = params.rowKeyPath;
-  // let _form = form;
   var namePath = toNamePath(namesStr || name);
   var originalNamePath = toNamePath(originalName);
   var originalNamePaths = originalNames && toNamePaths(originalNames);
-  var originalValue = getOriginalValue({
+  var notWatch = !originalValues;
+  var originalValue = !notWatch ? getOriginalValue({
     namePath: namePath,
     originalName: originalNamePath,
     originalNames: originalNamePaths,
     originalValues: originalValues,
     rowKeyPath: rowKeyPath,
     form: form
-  });
-  var notWatch = !originalValues || originalValue === undefined;
+  }) : undefined;
+  var noChange = !equalWith && (!originalValues || originalValue === undefined);
+  var _form = form;
   // @ts-ignore
-  // if (notWatch) _form = [];
-  var value = _Form.useWatch(namePath, form);
-  if (notWatch) return [false];
+  if (notWatch) _form = [];
+  var value = _Form.useWatch(namePath, _form);
+  if (notWatch || noChange) return [false];
   var changed = contrastOriginal({
     value: value,
     originalValue: originalValue,

package/es/ProLayout/components/ProCollapse/index.js

@@ -43,6 +43,7 @@ var ProCollapse = function ProCollapse(props) {
     if (level === '2') {
       var level2Panel = classNames({
         'pro-collapse-level2-collapse': towCollapse,
+        'pro-collapse-level2-no-collapse': !towCollapse,
         'pro-collapse-panel': true
       });
       var hasCollapse = {};

package/es/ProLayout/components/ProCollapse/style/index.less

@@ -18,59 +18,62 @@
 
   .@{ant-prefix}-collapse-header {
     align-items: center !important;
-    padding    : 12px var(--zaui-space-size-md, 16px) !important;
-    background : var(--zaui-area, #fafafa);
+    padding: 12px var(--zaui-space-size-md, 16px) !important;
+    background: var(--zaui-area, #fafafa);
   }
 
   .@{ant-prefix}-collapse-header-text {
-    color      : var(--zaui-text, #343434);
+    color: var(--zaui-text, #343434);
     font-weight: 500;
-    font-size  : var(--zaui-font-size-lg, 16px);
+    font-size: var(--zaui-font-size-lg, 16px);
   }
 
   .@{ant-prefix}-collapse-expand-icon {
     color: #c5c7cd;
   }
 
-  &.@{ant-prefix}-collapse-borderless .@{ant-prefix}-collapse-item>.@{ant-prefix}-collapse-content>.@{ant-prefix}-collapse-content-box {
+  &.@{ant-prefix}-collapse-borderless
+    .@{ant-prefix}-collapse-item
+    > .@{ant-prefix}-collapse-content
+    > .@{ant-prefix}-collapse-content-box {
     padding: 0;
   }
 
   .@{ant-prefix}-collapse-content-box {
-    padding   : 0;
+    padding: 0;
     background: var(--zaui-base-bg, #ffffff);
 
     .pro-collapse-content {
-      padding       : var(--zaui-space-size-md, 16px);
+      padding: var(--zaui-space-size-md, 16px);
       padding-bottom: 0;
-      background    : var(--zaui-base-bg, #ffffff);
+      background: var(--zaui-base-bg, #ffffff);
     }
   }
 
   &.pro-collapse-level2 {
     margin-bottom: 0;
-    background   : var(--zaui-base-bg, #ffffff);
+    background: var(--zaui-base-bg, #ffffff);
 
     .@{ant-prefix}-collapse-header {
       margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
-      padding      : 0 !important;
-      background   : var(--zaui-base-bg, #ffffff);
+      padding: 0 !important;
+      background: var(--zaui-base-bg, #ffffff);
 
       .@{ant-prefix}-collapse-header-text {
-        position    : relative;
+        position: relative;
         padding-left: var(--zaui-space-size-sm, 8px);
-        font-size   : var(--zaui-font-size, 14px);
+        font-size: var(--zaui-font-size, 14px);
 
         &::before {
-          position     : absolute;
-          top          : 50%;
-          left         : 0;
-          width        : 4px;
-          height       : 14px;
-          background   : var(--zaui-brand);
+          position: absolute;
+          top: 50%;
+          left: 0;
+          width: 4px;
+          height: 14px;
+          background: var(--zaui-brand);
           border-radius: var(--zaui-border-radius-card, 2px);
-          transform    : translateY(-50%);
-          content      : '';
+          transform: translateY(-50%);
+          content: '';
         }
       }
 
@@ -93,9 +96,12 @@
       padding: 0;
     }
 
-    &.@{ant-prefix}-collapse .@{ant-prefix}-collapse-item-disabled>.@{ant-prefix}-collapse-header,
-    .@{ant-prefix}-collapse .@{ant-prefix}-collapse-item-disabled>.@{ant-prefix}-collapse-header>.arrow {
-      color : var(--zaui-text, #343434);
+    &.@{ant-prefix}-collapse .@{ant-prefix}-collapse-item-disabled > .@{ant-prefix}-collapse-header,
+    .@{ant-prefix}-collapse
+      .@{ant-prefix}-collapse-item-disabled
+      > .@{ant-prefix}-collapse-header
+      > .arrow {
+      color: var(--zaui-text, #343434);
       cursor: default;
     }
 
@@ -108,6 +114,12 @@
         display: block;
       }
     }
+
+    .pro-collapse-level2-no-collapse {
+      .@{ant-prefix}-collapse-expand-icon {
+        display: none;
+      }
+    }
   }
 
   .@{ant-prefix}-collapse-extra {
@@ -117,10 +129,9 @@
   }
 
   &.pro-collapse-list {
-
-    .@{ant-prefix}-descriptions-row>th,
-    .@{ant-prefix}-descriptions-row>td {
-      padding   : var(--zaui-space-size-md, 16px) 0;
+    .@{ant-prefix}-descriptions-row > th,
+    .@{ant-prefix}-descriptions-row > td {
+      padding: var(--zaui-space-size-md, 16px) 0;
       background: #fafafa;
 
       &.@{ant-prefix}-descriptions-item {
@@ -133,26 +144,25 @@
         position: relative;
 
         &::before {
-          position     : absolute;
-          top          : 50%;
-          left         : 8px;
-          width        : 4px;
-          height       : 14px;
-          background   : var(--zaui-brand);
+          position: absolute;
+          top: 50%;
+          left: 8px;
+          width: 4px;
+          height: 14px;
+          background: var(--zaui-brand);
           border-radius: var(--zaui-border-radius-card, 2px);
-          transform    : translateY(-50%);
-          content      : '';
+          transform: translateY(-50%);
+          content: '';
         }
       }
     }
 
     .@{ant-prefix}-descriptions-item-container {
-
       .@{ant-prefix}-descriptions-item-label,
       .@{ant-prefix}-descriptions-item-content {
-        color      : #0a0a0a !important;
+        color: #0a0a0a !important;
         font-weight: 500 !important;
-        font-size  : var(--zaui-font-size, 14px);
+        font-size: var(--zaui-font-size, 14px);
       }
     }
 

package/es/ProTreeModal/index.js

@@ -491,8 +491,12 @@ var ProTreeModal = function ProTreeModal(props) {
     } else {
       onChange === null || onChange === void 0 ? void 0 : onChange([]);
       setState({
-        checkAll: false
+        checkAll: false,
+        open: true
       });
+      if (appoint) {
+        openChange === null || openChange === void 0 ? void 0 : openChange(true);
+      }
     }
   };
   /**

package/es/style/theme/antd.less

@@ -663,7 +663,7 @@
       width: calc(100% - 18px);
       margin-bottom: 0;
       text-align: right;
-      background: #fff;
+      // background: #fff;
     }
   }
 }

package/lib/ProDrawerForm/components/ProModal/index.js

@@ -178,7 +178,6 @@ var ProModal = function ProModal(_ref) {
     footer: renderFooter(),
     okText: okText,
     cancelText: cancelText,
-    centered: true,
     closeIcon: (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
       className: "close-icon",
       src: _close.default

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

@@ -14,6 +14,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _locale = _interopRequireDefault(require("../../../../locale"));
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
+var _Container = _interopRequireDefault(require("../../Container"));
 require("./index.less");
 var _excluded = ["placeholder", "otherProps", "className"];
 var TextArea = _antd.Input.TextArea;
@@ -24,16 +25,20 @@ var TextAreaDef = function TextAreaDef(props) {
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref = _ProForm.default.useFieldProps() || {},
     label = _ref.label,
-    isViewCon = _ref.isView;
+    isViewCon = _ref.isView,
+    viewEmpty = _ref.viewEmpty;
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
   var initialConfig = (0, _ProConfigProvider.useProConfig)('TextArea');
-  var disabled = (initialConfig === null || initialConfig === void 0 ? void 0 : initialConfig.disabled) || rest.disabled;
   if (isView) {
-    disabled = true;
+    return (0, _jsxRuntime.jsx)(_Container.default, {
+      nowrap: false,
+      tooltip: true,
+      viewEmpty: viewEmpty,
+      children: rest.value
+    });
   }
   var _className = (0, _classnames.default)({
     'pro-textarea': true,
-    disabled: disabled,
     'pro-textarea-view': isView,
     className: className
   });
@@ -45,7 +50,6 @@ var TextAreaDef = function TextAreaDef(props) {
       minRows: 4
     }
   }, (0, _lodash.omit)(initialConfig, ['trim'])), rest), {}, {
-    disabled: disabled,
     className: _className
   }));
 };

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

@@ -18,11 +18,12 @@ var Container = function Container(props) {
   var children = props.children,
     otherProps = props.otherProps,
     className = props.className,
-    container = props.container;
+    container = props.container,
+    show = props.show,
+    clearNotShow = props.clearNotShow;
   var _ref = _ProForm.default.useFieldProps() || {},
     type = _ref.type,
     form = _ref.form,
-    show = _ref.show,
     required = _ref.required,
     disabled = _ref.disabled;
   var _className = (0, _classnames2.default)((0, _defineProperty2.default)({
@@ -32,6 +33,7 @@ var Container = function Container(props) {
   var _children = (0, _react.useMemo)(function () {
     var result = children.map(function (item) {
       return (0, _objectSpread2.default)({
+        clearNotShow: clearNotShow,
         show: show,
         required: required,
         disabled: disabled

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

@@ -7,4 +7,6 @@ export interface ContainerProps {
     rowProps?: RowProps;
     className?: string;
     container?: string | React.ReactNode;
+    show?: boolean | (() => boolean);
+    clearNotShow?: boolean;
 }

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

@@ -3,6 +3,7 @@ import { Moment } from 'moment';
 import React from 'react';
 import { ProFormOtherProps } from '../../../propsType';
 import { Props as ProRangeLimitProps } from '../ProRangeLimit';
+import { DistributiveOmit } from '../../../../ProForm/propsType';
 export type DateType = DatePickerProps['value'];
 export type ProTimeLimitProps = DistributiveOmit<DatePickerProps, 'value' | 'onChange' | 'mode'> & {
     value?: string;

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

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -13,7 +12,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _lodash = require("lodash");
-var _moment = _interopRequireWildcard(require("moment"));
+var _moment = _interopRequireDefault(require("moment"));
 var _react = require("react");
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
@@ -56,7 +55,7 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
     onChange = _useControlled2[1];
   var initialConfig = (0, _ProConfigProvider.useProConfig)('ProTimeLimit');
   var isForever = (0, _react.useMemo)(function () {
-    if ((0, _moment.isMoment)(value)) {
+    if (_moment.default.isMoment(value)) {
       return foreverMoment.format(format) === value.format(format);
     }
     return false;

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

@@ -173,7 +173,7 @@ var Render = function Render(props) {
   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, {
-      name: _otherFormItemProps.name,
+      name: _otherFormItemProps.name || 'proFormItemHidden',
       shouldUpdate: _otherFormItemProps.shouldUpdate,
       className: _className,
       noStyle: true,

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

@@ -154,6 +154,11 @@ var RenderFields = function RenderFields(props) {
     }, _fieldProps), {}, {
       disabled: _disabled
     });
+    // 容器组件，额外处理show的问题
+    if (['ProCollapse', 'Container'].includes(_type)) {
+      componentProps.show = show;
+      componentProps.clearNotShow = clearNotShow;
+    }
     // switch与SwitchCheckbox单独添加valuePropName
     if (['Switch', 'SwitchCheckbox'].includes(_type)) {
       _formItemProps.valuePropName = 'checked';

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

@@ -32,6 +32,7 @@ import { ProUploadProps } from '../../../ProUpload/propsType';
 import { ProTreeProps } from '../../../ProTree/propsType';
 import { GroupProps } from '../combination/Group/propsType';
 import { ProCollapseProps } from '../../../ProLayout/components/ProCollapse/PropTypes';
+import { DistributiveOmit } from '../../propsType';
 export type ComponentMap = keyof typeof componentMap;
 type ValidateKey = keyof typeof validate;
 type RegExpKey = keyof typeof regExp;

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

@@ -2,4 +2,5 @@
 
 Object.defineProperty(exports, "__esModule", {
   value: true
-});
+});
+var a = {};

package/lib/ProForm/propsType.d.ts

@@ -73,3 +73,4 @@ export interface Transform<T = any> {
     getValueProps?: (value: StoreValue) => Record<string, unknown>;
     shouldUpdate?: ShouldUpdate<T>;
 }
+export type DistributiveOmit<T, K extends keyof any> = T extends any ? Omit<T, K> : never;

package/lib/ProForm/style/index.less

@@ -126,11 +126,12 @@
       }
     }
 
-    // 比较原始值场景下  不同时候的样式
+    // 比较原始值场景下  不同时的样式
     &.pro-form-item-changed {
       span.@{ant-prefix}-input-affix-wrapper,
       .@{ant-prefix}-select-selector,
-      .@{ant-prefix}-picker {
+      .@{ant-prefix}-picker,
+      .@{ant-prefix}-input-number {
         background: @zaui-contract-bg !important;
 
         input {
@@ -141,7 +142,9 @@
         }
       }
 
-      .@{ant-prefix}-form-item-control-input-content > .pro-form-view-container {
+      // 查看模式 修改容器样式
+      .@{ant-prefix}-form-item-control-input-content > span, // 地址组件
+      .pro-form-view-container {
         padding: 4px 8px;
         background: @zaui-contract-bg;
         border-radius: 4px;

package/lib/ProForm/utils/useChanged.js

@@ -17,7 +17,7 @@ var useChanged = exports.useChanged = function useChanged(_ref) {
   var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
     return (0, _lodash.get)(originalValues, name);
   }) : (0, _lodash.get)(originalValues, name);
-  var notWatch = !originalValues || originalValue === undefined;
+  var notWatch = !equalWith && (!originalValues || originalValue === undefined);
   if (notWatch) form = [];
   var value = _antd.Form.useWatch(namesStr || name, form);
   if (notWatch) return [false];

package/lib/ProForm/utils/useListChanged.js

@@ -38,11 +38,22 @@ var getOriginalValue = function getOriginalValue(_ref) {
     var originalValueRow = originalValueList.find(function (item) {
       return item[rowKeyPath[rowKeyPath.length - 1]] === keyValue;
     });
-    var originalValue = (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
-      return (0, _lodash.get)(originalValueRow, originalName.slice(rowKeyPath.length - 1));
-    }) : (0, _lodash.get)(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+    var originalValue;
+    if (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) {
+      var originalNamesValue = originalNames.map(function (originalName) {
+        return (0, _lodash.get)(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+      });
+      // 有可能出现数组中全是undefined的情况  视为没有值
+      var fillUndefined = originalNamesValue.every(function (valItem) {
+        return valItem === undefined;
+      });
+      originalValue = fillUndefined ? undefined : originalNamesValue;
+    } else {
+      originalValue = (0, _lodash.get)(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+    }
     return originalValue;
   }
+  // 这个方法是给editTable专用的  暂时不存在不传rowKey的情况
   return (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
     return (0, _lodash.get)(originalValues, originalName);
   }) : (0, _lodash.get)(originalValues, originalName);
@@ -59,23 +70,24 @@ var useListChanged = exports.useListChanged = function useListChanged(params) {
     form = params.form,
     equalWith = params.equalWith,
     rowKeyPath = params.rowKeyPath;
-  // let _form = form;
   var namePath = toNamePath(namesStr || name);
   var originalNamePath = toNamePath(originalName);
   var originalNamePaths = originalNames && toNamePaths(originalNames);
-  var originalValue = getOriginalValue({
+  var notWatch = !originalValues;
+  var originalValue = !notWatch ? getOriginalValue({
     namePath: namePath,
     originalName: originalNamePath,
     originalNames: originalNamePaths,
     originalValues: originalValues,
     rowKeyPath: rowKeyPath,
     form: form
-  });
-  var notWatch = !originalValues || originalValue === undefined;
+  }) : undefined;
+  var noChange = !equalWith && (!originalValues || originalValue === undefined);
+  var _form = form;
   // @ts-ignore
-  // if (notWatch) _form = [];
-  var value = _antd.Form.useWatch(namePath, form);
-  if (notWatch) return [false];
+  if (notWatch) _form = [];
+  var value = _antd.Form.useWatch(namePath, _form);
+  if (notWatch || noChange) return [false];
   var changed = (0, _contrastOriginal.contrastOriginal)({
     value: value,
     originalValue: originalValue,

package/lib/ProLayout/components/ProCollapse/index.js

@@ -47,6 +47,7 @@ var ProCollapse = function ProCollapse(props) {
     if (level === '2') {
       var level2Panel = (0, _classnames.default)({
         'pro-collapse-level2-collapse': towCollapse,
+        'pro-collapse-level2-no-collapse': !towCollapse,
         'pro-collapse-panel': true
       });
       var hasCollapse = {};

package/lib/ProLayout/components/ProCollapse/style/index.less

@@ -18,59 +18,62 @@
 
   .@{ant-prefix}-collapse-header {
     align-items: center !important;
-    padding    : 12px var(--zaui-space-size-md, 16px) !important;
-    background : var(--zaui-area, #fafafa);
+    padding: 12px var(--zaui-space-size-md, 16px) !important;
+    background: var(--zaui-area, #fafafa);
   }
 
   .@{ant-prefix}-collapse-header-text {
-    color      : var(--zaui-text, #343434);
+    color: var(--zaui-text, #343434);
     font-weight: 500;
-    font-size  : var(--zaui-font-size-lg, 16px);
+    font-size: var(--zaui-font-size-lg, 16px);
   }
 
   .@{ant-prefix}-collapse-expand-icon {
     color: #c5c7cd;
   }
 
-  &.@{ant-prefix}-collapse-borderless .@{ant-prefix}-collapse-item>.@{ant-prefix}-collapse-content>.@{ant-prefix}-collapse-content-box {
+  &.@{ant-prefix}-collapse-borderless
+    .@{ant-prefix}-collapse-item
+    > .@{ant-prefix}-collapse-content
+    > .@{ant-prefix}-collapse-content-box {
     padding: 0;
   }
 
   .@{ant-prefix}-collapse-content-box {
-    padding   : 0;
+    padding: 0;
     background: var(--zaui-base-bg, #ffffff);
 
     .pro-collapse-content {
-      padding       : var(--zaui-space-size-md, 16px);
+      padding: var(--zaui-space-size-md, 16px);
       padding-bottom: 0;
-      background    : var(--zaui-base-bg, #ffffff);
+      background: var(--zaui-base-bg, #ffffff);
     }
   }
 
   &.pro-collapse-level2 {
     margin-bottom: 0;
-    background   : var(--zaui-base-bg, #ffffff);
+    background: var(--zaui-base-bg, #ffffff);
 
     .@{ant-prefix}-collapse-header {
       margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
-      padding      : 0 !important;
-      background   : var(--zaui-base-bg, #ffffff);
+      padding: 0 !important;
+      background: var(--zaui-base-bg, #ffffff);
 
       .@{ant-prefix}-collapse-header-text {
-        position    : relative;
+        position: relative;
         padding-left: var(--zaui-space-size-sm, 8px);
-        font-size   : var(--zaui-font-size, 14px);
+        font-size: var(--zaui-font-size, 14px);
 
         &::before {
-          position     : absolute;
-          top          : 50%;
-          left         : 0;
-          width        : 4px;
-          height       : 14px;
-          background   : var(--zaui-brand);
+          position: absolute;
+          top: 50%;
+          left: 0;
+          width: 4px;
+          height: 14px;
+          background: var(--zaui-brand);
           border-radius: var(--zaui-border-radius-card, 2px);
-          transform    : translateY(-50%);
-          content      : '';
+          transform: translateY(-50%);
+          content: '';
         }
       }
 
@@ -93,9 +96,12 @@
       padding: 0;
     }
 
-    &.@{ant-prefix}-collapse .@{ant-prefix}-collapse-item-disabled>.@{ant-prefix}-collapse-header,
-    .@{ant-prefix}-collapse .@{ant-prefix}-collapse-item-disabled>.@{ant-prefix}-collapse-header>.arrow {
-      color : var(--zaui-text, #343434);
+    &.@{ant-prefix}-collapse .@{ant-prefix}-collapse-item-disabled > .@{ant-prefix}-collapse-header,
+    .@{ant-prefix}-collapse
+      .@{ant-prefix}-collapse-item-disabled
+      > .@{ant-prefix}-collapse-header
+      > .arrow {
+      color: var(--zaui-text, #343434);
       cursor: default;
     }
 
@@ -108,6 +114,12 @@
         display: block;
       }
     }
+
+    .pro-collapse-level2-no-collapse {
+      .@{ant-prefix}-collapse-expand-icon {
+        display: none;
+      }
+    }
   }
 
   .@{ant-prefix}-collapse-extra {
@@ -117,10 +129,9 @@
   }
 
   &.pro-collapse-list {
-
-    .@{ant-prefix}-descriptions-row>th,
-    .@{ant-prefix}-descriptions-row>td {
-      padding   : var(--zaui-space-size-md, 16px) 0;
+    .@{ant-prefix}-descriptions-row > th,
+    .@{ant-prefix}-descriptions-row > td {
+      padding: var(--zaui-space-size-md, 16px) 0;
       background: #fafafa;
 
       &.@{ant-prefix}-descriptions-item {
@@ -133,26 +144,25 @@
         position: relative;
 
         &::before {
-          position     : absolute;
-          top          : 50%;
-          left         : 8px;
-          width        : 4px;
-          height       : 14px;
-          background   : var(--zaui-brand);
+          position: absolute;
+          top: 50%;
+          left: 8px;
+          width: 4px;
+          height: 14px;
+          background: var(--zaui-brand);
           border-radius: var(--zaui-border-radius-card, 2px);
-          transform    : translateY(-50%);
-          content      : '';
+          transform: translateY(-50%);
+          content: '';
         }
       }
     }
 
     .@{ant-prefix}-descriptions-item-container {
-
       .@{ant-prefix}-descriptions-item-label,
       .@{ant-prefix}-descriptions-item-content {
-        color      : #0a0a0a !important;
+        color: #0a0a0a !important;
         font-weight: 500 !important;
-        font-size  : var(--zaui-font-size, 14px);
+        font-size: var(--zaui-font-size, 14px);
       }
     }
 

package/lib/ProTreeModal/index.js

@@ -492,8 +492,12 @@ var ProTreeModal = function ProTreeModal(props) {
     } else {
       onChange === null || onChange === void 0 ? void 0 : onChange([]);
       setState({
-        checkAll: false
+        checkAll: false,
+        open: true
       });
+      if (appoint) {
+        openChange === null || openChange === void 0 ? void 0 : openChange(true);
+      }
     }
   };
   /**

package/lib/style/theme/antd.less

@@ -663,7 +663,7 @@
       width: calc(100% - 18px);
       margin-bottom: 0;
       text-align: right;
-      background: #fff;
+      // background: #fff;
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -71,7 +71,8 @@
   "peerDependencies": {
     "antd": "^4.24.8",
     "react": "17.x",
-    "react-dom": "17.x"
+    "react-dom": "17.x",
+    "react-router-dom": "^5.1.7"
   },
   "devDependencies": {
     "@commitlint/cli": "^12.1.1",