@zat-design/sisyphus-react 3.4.13 → 3.5.0

package/LICENSE

@@ -1,21 +1,201 @@
-The MIT License (MIT)
-
-Copyright (c) 2014
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2024 open-dev
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/dist/index.esm.css

@@ -1780,6 +1780,62 @@
 .ant-tabs-dropdown-menu .pro-tabs-card .pro-tabs-card-right img {
   width: 48px;
 }
+.pro-table.pro-table-draggable-only .ant-table-tbody .anticon {
+  margin-right: 0;
+}
+.pro-table .ant-table-content > table .ant-table-summary {
+  background-color: var(--zaui-table-header-bg, #f2f3f5);
+  color: var(--zaui-text, #343434);
+  font-weight: 600;
+}
+.pro-table .ant-table-content > table .ant-table-summary .ant-table-cell-fix-left,
+.pro-table .ant-table-content > table .ant-table-summary .ant-table-cell-fix-right {
+  background-color: var(--zaui-table-header-bg, #f2f3f5);
+}
+.pro-table .ant-table-content > table th.ant-table-selection-column {
+  width: 48px;
+}
+.pro-table .ant-table-content > table td .pro-form-view-container_nowrap {
+  white-space: normal;
+}
+.pro-table .ant-table-content > table .ant-table-thead > tr > th:not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan]).is-required.is-required-right .pro-edit-table-title::before {
+  position: static;
+  top: 0;
+  display: inline-block;
+  text-indent: -8px;
+  color: #ff5050;
+  font-size: var(--zaui-font-size-md, 14px);
+  line-height: 1;
+  content: "*";
+}
+.pro-table .ant-table-content > table .ant-table-thead > tr > th:not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan]).is-required.is-required-left .pro-edit-table-title::after {
+  width: auto;
+  position: static;
+  top: 0;
+  display: inline-block;
+  margin-left: var(--zaui-space-size-xs, 4px);
+  color: #ff5050;
+  font-size: 14px;
+  line-height: 1;
+  content: "*";
+}
+.pro-table .drag-wrapper {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  width: 20px;
+}
+.pro-table .drag-wrapper .anticon {
+  cursor: pointer;
+  margin-right: 12px;
+}
+.pro-table .drag-wrapper .anticon .drag-icon {
+  margin-right: 0;
+}
+.pro-table .drag-wrapper.no-check .anticon {
+  margin-right: 0;
+}
 .pro-table.pro-table-bordered .ant-table .ant-table-thead > tr > th {
   border-bottom: 1px solid #f0f0f0;
 }
@@ -2082,6 +2138,9 @@
 .ant-dropdown-placement-bottomLeft .ant-dropdown-menu-vertical.ant-dropdown-menu-light .ant-dropdown-menu-item-only-child:hover {
   background: rgba(0, 106, 255, 0.08);
 }
+.pro-edit-table-drag table tr th.ant-table-selection-column.ant-table-cell-fix-left {
+  text-align: right;
+}
 .pro-tooltip {
   cursor: pointer;
 }
@@ -3472,6 +3531,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-tree-modal-box-header:first-child {
   color: #616161;
+  border-radius: 8px 0 0 8px;
 }
 .pro-tree-modal-box-header .ant-btn-link {
   padding: 0;

package/dist/less.esm.css

@@ -1780,6 +1780,62 @@
 .ant-tabs-dropdown-menu .pro-tabs-card .pro-tabs-card-right img {
   width: 48px;
 }
+.pro-table.pro-table-draggable-only .ant-table-tbody .anticon {
+  margin-right: 0;
+}
+.pro-table .ant-table-content > table .ant-table-summary {
+  background-color: var(--zaui-table-header-bg, #f2f3f5);
+  color: var(--zaui-text, #343434);
+  font-weight: 600;
+}
+.pro-table .ant-table-content > table .ant-table-summary .ant-table-cell-fix-left,
+.pro-table .ant-table-content > table .ant-table-summary .ant-table-cell-fix-right {
+  background-color: var(--zaui-table-header-bg, #f2f3f5);
+}
+.pro-table .ant-table-content > table th.ant-table-selection-column {
+  width: 48px;
+}
+.pro-table .ant-table-content > table td .pro-form-view-container_nowrap {
+  white-space: normal;
+}
+.pro-table .ant-table-content > table .ant-table-thead > tr > th:not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan]).is-required.is-required-right .pro-edit-table-title::before {
+  position: static;
+  top: 0;
+  display: inline-block;
+  text-indent: -8px;
+  color: #ff5050;
+  font-size: var(--zaui-font-size-md, 14px);
+  line-height: 1;
+  content: "*";
+}
+.pro-table .ant-table-content > table .ant-table-thead > tr > th:not(.ant-table-selection-column):not(.ant-table-row-expand-icon-cell):not([colspan]).is-required.is-required-left .pro-edit-table-title::after {
+  width: auto;
+  position: static;
+  top: 0;
+  display: inline-block;
+  margin-left: var(--zaui-space-size-xs, 4px);
+  color: #ff5050;
+  font-size: 14px;
+  line-height: 1;
+  content: "*";
+}
+.pro-table .drag-wrapper {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  width: 20px;
+}
+.pro-table .drag-wrapper .anticon {
+  cursor: pointer;
+  margin-right: 12px;
+}
+.pro-table .drag-wrapper .anticon .drag-icon {
+  margin-right: 0;
+}
+.pro-table .drag-wrapper.no-check .anticon {
+  margin-right: 0;
+}
 .pro-table.pro-table-bordered .ant-table .ant-table-thead > tr > th {
   border-bottom: 1px solid #f0f0f0;
 }
@@ -2082,6 +2138,9 @@
 .ant-dropdown-placement-bottomLeft .ant-dropdown-menu-vertical.ant-dropdown-menu-light .ant-dropdown-menu-item-only-child:hover {
   background: rgba(0, 106, 255, 0.08);
 }
+.pro-edit-table-drag table tr th.ant-table-selection-column.ant-table-cell-fix-left {
+  text-align: right;
+}
 .pro-tooltip {
   cursor: pointer;
 }
@@ -3472,6 +3531,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-tree-modal-box-header:first-child {
   color: #616161;
+  border-radius: 8px 0 0 8px;
 }
 .pro-tree-modal-box-header .ant-btn-link {
   padding: 0;

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

@@ -36,6 +36,7 @@ export var Row = function Row(props) {
   }, attributes), {}, {
     children: React.Children.map(children, function (child) {
       if (child.key === 'RC_TABLE_KEY') {
+        console.log('走这里么', child.key);
         var _ref = (child === null || child === void 0 ? void 0 : child.props) || {},
           render = _ref.render,
           record = _ref.record,

package/es/ProEditTable/index.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import { ProEditTableProps, ProEditTableRefProps } from './propsType';
-declare const ForwardProEditTable: React.ForwardRefExoticComponent<ProEditTableProps<any> & React.RefAttributes<ProEditTableRefProps>>;
+declare const ForwardProEditTable: React.ForwardRefExoticComponent<Omit<ProEditTableProps<any>, "ref"> & React.RefAttributes<ProEditTableRefProps>>;
 export default ForwardProEditTable;

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"];
+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"];
 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';
@@ -51,6 +51,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     rowKey = _ref.rowKey,
     rowDisabled = _ref.rowDisabled,
     footerRender = _ref.footerRender,
+    scroll = _ref.scroll,
     resetProps = _objectWithoutProperties(_ref, _excluded);
   // 上下文form
   var contentForm = _Form.useFormInstance();
@@ -295,7 +296,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       }
     }
   }, [value]);
-  useImperativeHandle(ref, function () {
+  useImperativeHandle((resetProps === null || resetProps === void 0 ? void 0 : resetProps.ref) || ref, function () {
     return {
       getInternalState: function getInternalState() {
         return state;
@@ -346,7 +347,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
             pageSize: page.pageSize,
             showSizeChanger: false,
             showQuickJumper: true,
-            total: value.length,
+            total: value === null || value === void 0 ? void 0 : value.length,
             showTotal: function showTotal(total) {
               var _locale$ProEditTable;
               if (!total) return;
@@ -357,6 +358,10 @@ var ProEditTable = function ProEditTable(_ref, ref) {
             onChange: handlePageChange
           }, pagination) : false,
           rowKey: "rowKey",
+          scroll: {
+            x: scroll === null || scroll === void 0 ? void 0 : scroll.x,
+            y: (value === null || value === void 0 ? void 0 : value.length) ? scroll === null || scroll === void 0 ? void 0 : scroll.y : undefined
+          },
           summary: _summary
         }))]
       }), !isView && (value === null || value === void 0 ? void 0 : value.length) ? _jsx("div", {

package/es/ProEditTable/propsType.d.ts

@@ -253,4 +253,5 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
      */
     headerRender?: ReactNode;
     rowDisabled?: (record?: T) => string | boolean;
+    ref?: any;
 }

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

@@ -17,6 +17,7 @@ var formatAmount = tools.formatAmount,
   formatPercent = tools.formatPercent,
   formatPerMill = tools.formatPerMill;
 var ProNumberRange = function ProNumberRange(props) {
+  var _valueProps, _valueProps2, _valueProps3, _valueProps4;
   var _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     _props$onChange = props.onChange,
@@ -134,8 +135,26 @@ var ProNumberRange = function ProNumberRange(props) {
           }
         };
         break;
+      // 百分比
+      case 'percentage':
+        valueProps = {
+          min: 0,
+          max: 100,
+          step: 1
+        };
+        break;
+      // 千分比
+      case 'permillage':
+        valueProps = {
+          min: 0,
+          max: 1000,
+          step: 1
+        };
+        break;
       default:
-        valueProps = {};
+        valueProps = {
+          max: 999999999999
+        };
     }
   }
   /**
@@ -157,15 +176,16 @@ var ProNumberRange = function ProNumberRange(props) {
       className: "range-left",
       value: (value === null || value === void 0 ? void 0 : value[0]) || range[0],
       placeholder: "".concat(locale.ProForm.inputPlaceholder),
-      min: min,
-      max: (value === null || value === void 0 ? void 0 : value[1]) || max || range[1],
       precision: precision,
       disabled: getDisabled(disabled, 0),
       onChange: function onChange(e) {
         firstHandleChange(e);
       },
       addonBefore: addonBefore
-    }, valueProps), childProps === null || childProps === void 0 ? void 0 : childProps[0])), _jsx(_Input, {
+    }, valueProps), {}, {
+      min: min || ((_valueProps = valueProps) === null || _valueProps === void 0 ? void 0 : _valueProps.min),
+      max: (value === null || value === void 0 ? void 0 : value[1]) || range[1] || max || ((_valueProps2 = valueProps) === null || _valueProps2 === void 0 ? void 0 : _valueProps2.max)
+    }, childProps === null || childProps === void 0 ? void 0 : childProps[0])), _jsx(_Input, {
       className: classnames({
         'range-split': true,
         'range-split-disabled': !!disabled
@@ -176,15 +196,16 @@ var ProNumberRange = function ProNumberRange(props) {
       className: "range-right",
       value: (value === null || value === void 0 ? void 0 : value[1]) || range[1],
       placeholder: "".concat(locale.ProForm.inputPlaceholder),
-      min: (value === null || value === void 0 ? void 0 : value[0]) || min || range[0],
-      max: max,
       precision: precision,
       disabled: getDisabled(disabled, 1),
       onChange: function onChange(e) {
         lastHandleChange(e);
       },
       addonAfter: addonAfter
-    }, valueProps), childProps === null || childProps === void 0 ? void 0 : childProps[1]))]
+    }, valueProps), {}, {
+      max: max || ((_valueProps3 = valueProps) === null || _valueProps3 === void 0 ? void 0 : _valueProps3.max),
+      min: (value === null || value === void 0 ? void 0 : value[0]) || range[0] || min || ((_valueProps4 = valueProps) === null || _valueProps4 === void 0 ? void 0 : _valueProps4.min)
+    }, childProps === null || childProps === void 0 ? void 0 : childProps[1]))]
   });
 };
 export default ProNumberRange;

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

@@ -1,6 +1,5 @@
 import React from 'react';
 import { ProFormOtherProps } from '../../../propsType';
-export type ValueTypeEnum = 'percentage' | 'permillage' | 'thousandth';
 export interface ProNumberRangeProps {
     /**
      * @description       组件的值,[最小值，最大值]
@@ -46,7 +45,7 @@ export interface ProNumberRangeProps {
      * @description       值类型，回显时区分金额与百分比
      * @default           '-'
      */
-    valueType?: ValueTypeEnum;
+    valueType?: 'percentage' | 'permillage' | 'thousandth';
     /**
      * @description       空值查看时默认展示内容
      * @default           '-'

package/es/ProForm/utils/valueType.d.ts

@@ -34,9 +34,6 @@ declare const _default: {
         type: any;
         valueType: any;
     }) => {
-        normalize?: undefined;
-        getValueProps?: undefined;
-    } | {
         normalize: (value: any) => any;
         getValueProps: (value: any) => {
             value: any;
@@ -47,9 +44,6 @@ declare const _default: {
         type: any;
         valueType: any;
     }) => {
-        normalize?: undefined;
-        getValueProps?: undefined;
-    } | {
         normalize: (value: any) => any;
         getValueProps: (value: any) => {
             value: any;

package/es/ProForm/utils/valueType.js

@@ -1,5 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import Big from 'big.js';
+import { isEqual } from 'lodash';
 import { transforms } from '@zat-design/utils';
 var transformDate = transforms.transformDate,
   transformSwitch = transforms.transformSwitch;
@@ -13,8 +14,35 @@ var transformRatio = function transformRatio(_ref) {
     precision = _ref$precision === void 0 ? 2 : _ref$precision,
     valueType = _ref.valueType;
   if (type === 'ProNumberRange' && ['permillage', 'percentage'].includes(valueType)) {
-    console.error('Warning: ProNumberRange valueType can only be set to [thousandth]');
-    return {};
+    var ref = null;
+    return {
+      normalize: function normalize(value) {
+        if (!value || !value.some(function (item) {
+          return item;
+        })) {
+          return {};
+        }
+        return [(value[0] || value[0] === 0) && Number.isFinite(value[0] - 0) ? Big(value[0] - 0).div(Math.pow(10, precision)).toNumber() : null, (value[1] || value[1] === 0) && Number.isFinite(value[1] - 0) ? Big(value[1] - 0).div(Math.pow(10, precision)).toNumber() : null];
+      },
+      getValueProps: function getValueProps(value) {
+        if (!value || !value.some(function (item) {
+          return item;
+        })) {
+          return {
+            value: []
+          };
+        }
+        if (isEqual(ref, value)) {
+          return {
+            value: [(value[0] || value[0] === 0) && Number.isFinite(value[0] - 0) ? Big(value[0] - 0).times(Math.pow(10, precision)).toNumber() : null, (value[1] || value[1] === 0) && Number.isFinite(value[1] - 0) ? Big(value[1] - 0).times(Math.pow(10, precision)).toNumber() : null]
+          };
+        }
+        ref = value;
+        return {
+          value: [(value[0] || value[0] === 0) && Number.isFinite(value[0] - 0) ? Big(value[0] - 0).times(Math.pow(10, precision)).toNumber() : null, (value[1] || value[1] === 0) && Number.isFinite(value[1] - 0) ? Big(value[1] - 0).times(Math.pow(10, precision)).toNumber() : null]
+        };
+      }
+    };
   }
   return {
     normalize: function normalize(value) {

package/es/ProLayout/index.js

@@ -25,7 +25,8 @@ var ProLayout = function ProLayout(props) {
     headerNotice = props.headerNotice,
     noticeIn = props.notice,
     dataSource = props.dataSource,
-    theme = props.theme;
+    theme = props.theme,
+    onCollapsedChange = props.onCollapsedChange;
   var _useSetState = useSetState({
       notice: headerNotice || noticeIn,
       menus: [],
@@ -86,7 +87,10 @@ var ProLayout = function ProLayout(props) {
         dataSource: menus,
         notice: notice,
         collapsed: collapsed,
-        onToggle: toggle
+        onToggle: function onToggle() {
+          toggle();
+          onCollapsedChange && onCollapsedChange(!collapsed);
+        }
       })), _jsx("div", {
         className: "pro-layout-content",
         style: _objectSpread(_objectSpread({}, contentStyle), {}, {

package/es/ProLayout/propTypes.d.ts

@@ -51,6 +51,10 @@ export interface ProLayoutProps {
     contentStyle?: CSSProperties;
     waterMarkProps?: ProWaterMarkProps;
     theme?: themeEnum;
+    /**
+  *  折叠回调事件
+  */
+    onCollapsedChange?: (collapsed: any) => void;
     [key: string]: any;
 }
 export interface ProLayoutStates {