@zat-design/sisyphus-react 3.11.4-beta.7 → 3.11.4

package/.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "kisstkondoros.vscode-codemetrics"
+    ]
+}

package/dist/index.esm.css

@@ -4812,7 +4812,8 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   margin-left: var(--zaui-space-size-xs, 4px);
 }
 .pro-edit-table-drag table tr th.ant-table-selection-column.ant-table-cell-fix-left {
-  text-align: right;
+  text-align: left;
+  padding-left: 52px;
 }
 .pro-edit-label {
   display: inline-block;

package/dist/less.esm.css

@@ -4812,7 +4812,8 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   margin-left: var(--zaui-space-size-xs, 4px);
 }
 .pro-edit-table-drag table tr th.ant-table-selection-column.ant-table-cell-fix-left {
-  text-align: right;
+  text-align: left;
+  padding-left: 52px;
 }
 .pro-edit-label {
   display: inline-block;

package/es/ProEditTable/style/index.less

@@ -396,6 +396,7 @@
 
 .pro-edit-table-drag {
   table tr th.@{ant-prefix}-table-selection-column.@{ant-prefix}-table-cell-fix-left{
-    text-align: right;
+    text-align: left;
+    padding-left: 52px;
   }
 }

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

@@ -19,15 +19,15 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "afterOpen", "isTooltip", "searchForm", "searchKey", "defaultOne", "otherProps"],
+var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "afterOpen", "isTooltip", "searchForm", "searchKey", "defaultOne"],
   _excluded2 = ["onOk"],
   _excluded3 = ["rowKey", "columns", "rowSelection"];
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { SearchOutlined } from '@ant-design/icons';
 import { useDebounceEffect, useDeepCompareEffect, useMount, useSetState } from 'ahooks';
-import { debounce, isArray, isEqual, isFunction } from 'lodash';
+import { debounce, isArray, isEqual, isFunction, omit } from 'lodash';
 import { ReactSVG } from 'react-svg';
-import React, { forwardRef, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
+import React, { forwardRef, useEffect, useImperativeHandle, useMemo } from 'react';
 import { ProForm, ProDrawerForm, ProTable, useProConfig, ProSelect } from '../../../../index';
 import Container from '../../Container';
 import viewSvg from '../../../../assets/view.svg';
@@ -58,7 +58,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     searchForm = props.searchForm,
     searchKey = props.searchKey,
     defaultOne = props.defaultOne,
-    otherProps = props.otherProps,
     restProps = _objectWithoutProperties(props, _excluded);
   var contentForm = _Form.useFormInstance();
   if (!configOption || Object.prototype.toString.call(configOption) !== '[object Object]') {
@@ -106,7 +105,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     columns = _ref4.columns,
     rowSelection = _ref4.rowSelection,
     restTableProps = _objectWithoutProperties(_ref4, _excluded3);
-  var preValue = useRef(value);
   var _useSetState = useSetState({
       _value: value,
       isInit: true,
@@ -252,7 +250,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   var handleChangeValue = function handleChangeValue(e) {
     onChange(e.target.value);
-    preValue.current = e.target.value;
     if (!readOnly) {
       setState({
         _value: e.target.value
@@ -261,7 +258,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   var handleSelectValue = function handleSelectValue(val, option) {
     onChange(val, option);
-    preValue.current = val;
   };
   var handleClick = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
@@ -373,7 +369,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           case 14:
             if (flag) {
               onChange === null || onChange === void 0 ? void 0 : onChange(labelInValue ? record : getNextValues(record), record);
-              preValue.current = labelInValue ? record : getNextValues(record);
               // 更新内部展示值
               setState({
                 _value: record,
@@ -502,7 +497,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
                 nextSelectRowKeys = isMultiple ? value : [value];
                 if (labelInValue) {
                   onChange(_data);
-                  preValue.current = _data;
                 }
                 // 更新内部展示值
                 setState({
@@ -559,14 +553,10 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               nextSelectRowKeys = isMultiple ? value : [value];
               if (labelInValue) {
                 onChange(_data2);
-                preValue.current = _data2;
               } else {
                 onChange(isMultiple ? _data2.map(function (item) {
                   return item[valueKey];
                 }) : _data2[valueKey]);
-                preValue.current = isMultiple ? _data2.map(function (item) {
-                  return item[valueKey];
-                }) : _data2[valueKey];
               }
               // 更新内部展示值
               setState({
@@ -656,9 +646,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     }
   }, [JSON.stringify(value), visible, isInit]);
   useDebounceEffect(function () {
-    if (value && !visible && readOnly && !isEqual(value, preValue.current)) {
+    if (value && !visible && readOnly) {
       var _options$some;
-      preValue.current = value;
       var isHasValue = options === null || options === void 0 ? void 0 : (_options$some = options.some) === null || _options$some === void 0 ? void 0 : _options$some.call(options, function (item) {
         return item[valueKey] === value;
       });
@@ -730,7 +719,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         size: "small"
       }) : null,
       onFocus: function onFocus() {
-        if (useRequest && (options === null || options === void 0 ? void 0 : options.length) === 0) {
+        if (useRequest) {
           var _useRequest$options10;
           var queryBean = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options10 = useRequest.options) === null || _useRequest$options10 === void 0 ? void 0 : _useRequest$options10.defaultParams) || {};
           var params = withPagination ? {
@@ -757,17 +746,17 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           var nextParams = transformParams ? transformParams(params) : params;
           run(nextParams);
         }
-      }, 2000),
+      }, 1000),
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'
       }
-    }, restProps)) : _jsx(_Input, _objectSpread({
+    }, omit(restProps, ['otherProps']))) : _jsx(_Input, _objectSpread({
       value: viewText,
       onChange: handleChangeValue,
       disabled: disabled,
       autoComplete: "off",
       allowClear: true
-    }, restProps)), isView || disabled ? null : _jsx(_Button, {
+    }, omit(restProps, ['otherProps']))), isView || disabled ? null : _jsx(_Button, {
       icon: _jsx(ReactSVG, {
         className: "viewSvg",
         src: viewSvg,

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

@@ -36,8 +36,7 @@ var ProCollapse = function ProCollapse(props) {
     className = props.className,
     icon = props.icon,
     _props$autoHeight = props.autoHeight,
-    autoHeight = _props$autoHeight === void 0 ? true : _props$autoHeight,
-    onChange = props.onChange;
+    autoHeight = _props$autoHeight === void 0 ? true : _props$autoHeight;
   var cls = classNames(_defineProperty({
     'pro-collapse': true,
     'pro-collapse-level2': level === '2',
@@ -155,8 +154,7 @@ var ProCollapse = function ProCollapse(props) {
         });
       },
       expandIconPosition: "end",
-      defaultActiveKey: folding ? [] : ['1'],
-      onChange: onChange
+      defaultActiveKey: folding ? [] : ['1']
     }, collapseProps), {}, {
       children: renderPanel()
     }))

package/es/ProStep/components/Item/index.js

@@ -3,12 +3,13 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["id", "title", "collapse", "children", "lazyLoad"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useEffect } from 'react';
-import LazyLoad, { forceCheck } from 'react-lazyload';
+import LazyLoad from 'react-lazyload';
 import { isBoolean } from 'lodash';
 import { useStep } from '../../index';
+import { getLoadedMap } from '../../utils';
 import ProCollapse from '../../../ProLayout/components/ProCollapse';
 var defaultLazyLoadConfig = {
-  height: 300,
+  height: 100,
   offset: 100,
   once: true // Load only once upon first entry into the viewport
 };
@@ -23,8 +24,10 @@ var ProStepItem = function ProStepItem(_ref) {
   var _useStep = useStep(),
     register = _useStep.register,
     collapse = _useStep.collapse,
-    globalLazyLoad = _useStep.lazyLoad;
+    globalLazyLoad = _useStep.lazyLoad,
+    registerMap = _useStep.registerMap;
   var lazyLoad = stepLazyLoad || globalLazyLoad;
+  var loadedMap = getLoadedMap(registerMap);
   useEffect(function () {
     // Schedule registration to avoid re-render issues
     var timeoutId = setTimeout(function () {
@@ -35,11 +38,13 @@ var ProStepItem = function ProStepItem(_ref) {
       }, restProps));
     }, 0);
     return function () {
-      clearTimeout(timeoutId);
+      return clearTimeout(timeoutId);
     };
   }, [id, title, lazyLoad, restProps, register]);
   var renderChildren = function renderChildren() {
-    if (lazyLoad) {
+    var _loadedMap$;
+    // 第一个step不设置lasyload，防止懒加载不生效
+    if (lazyLoad && (loadedMap === null || loadedMap === void 0 ? void 0 : loadedMap.length) && (loadedMap === null || loadedMap === void 0 ? void 0 : (_loadedMap$ = loadedMap[0]) === null || _loadedMap$ === void 0 ? void 0 : _loadedMap$.id) !== id) {
       var lazyLoadProps = isBoolean(lazyLoad) ? defaultLazyLoadConfig : lazyLoad;
       return _jsx(LazyLoad, _objectSpread(_objectSpread({}, lazyLoadProps), {}, {
         classNamePrefix: id,
@@ -57,14 +62,6 @@ var ProStepItem = function ProStepItem(_ref) {
         title: title,
         icon: true
       }, restProps), {}, {
-        onChange: function onChange(e) {
-          var _restProps$onChange;
-          if (lazyLoad) {
-            forceCheck();
-          }
-          // 默认执行
-          restProps === null || restProps === void 0 ? void 0 : (_restProps$onChange = restProps.onChange) === null || _restProps$onChange === void 0 ? void 0 : _restProps$onChange.call(restProps, e);
-        },
         children: renderChildren()
       }))
     });

package/lib/ProEditTable/style/index.less

@@ -396,6 +396,7 @@
 
 .pro-edit-table-drag {
   table tr th.@{ant-prefix}-table-selection-column.@{ant-prefix}-table-cell-fix-left{
-    text-align: right;
+    text-align: left;
+    padding-left: 52px;
   }
 }

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

@@ -25,7 +25,7 @@ var _Container = _interopRequireDefault(require("../../Container"));
 var _view = _interopRequireDefault(require("../../../../assets/view.svg"));
 var _useRequestList3 = _interopRequireDefault(require("./hooks/useRequestList"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
-var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "afterOpen", "isTooltip", "searchForm", "searchKey", "defaultOne", "otherProps"],
+var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "afterOpen", "isTooltip", "searchForm", "searchKey", "defaultOne"],
   _excluded2 = ["onOk"],
   _excluded3 = ["rowKey", "columns", "rowSelection"];
 var ProModalSelect = function ProModalSelect(props, ref) {
@@ -53,7 +53,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     searchForm = props.searchForm,
     searchKey = props.searchKey,
     defaultOne = props.defaultOne,
-    otherProps = props.otherProps,
     restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var contentForm = _antd.Form.useFormInstance();
   if (!configOption || Object.prototype.toString.call(configOption) !== '[object Object]') {
@@ -101,7 +100,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     columns = _ref4.columns,
     rowSelection = _ref4.rowSelection,
     restTableProps = (0, _objectWithoutProperties2.default)(_ref4, _excluded3);
-  var preValue = (0, _react.useRef)(value);
   var _useSetState = (0, _ahooks.useSetState)({
       _value: value,
       isInit: true,
@@ -247,7 +245,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   var handleChangeValue = function handleChangeValue(e) {
     onChange(e.target.value);
-    preValue.current = e.target.value;
     if (!readOnly) {
       setState({
         _value: e.target.value
@@ -256,7 +253,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   var handleSelectValue = function handleSelectValue(val, option) {
     onChange(val, option);
-    preValue.current = val;
   };
   var handleClick = /*#__PURE__*/function () {
     var _ref7 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
@@ -368,7 +364,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           case 14:
             if (flag) {
               onChange === null || onChange === void 0 ? void 0 : onChange(labelInValue ? record : getNextValues(record), record);
-              preValue.current = labelInValue ? record : getNextValues(record);
               // 更新内部展示值
               setState({
                 _value: record,
@@ -497,7 +492,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
                 nextSelectRowKeys = isMultiple ? value : [value];
                 if (labelInValue) {
                   onChange(_data);
-                  preValue.current = _data;
                 }
                 // 更新内部展示值
                 setState({
@@ -554,14 +548,10 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               nextSelectRowKeys = isMultiple ? value : [value];
               if (labelInValue) {
                 onChange(_data2);
-                preValue.current = _data2;
               } else {
                 onChange(isMultiple ? _data2.map(function (item) {
                   return item[valueKey];
                 }) : _data2[valueKey]);
-                preValue.current = isMultiple ? _data2.map(function (item) {
-                  return item[valueKey];
-                }) : _data2[valueKey];
               }
               // 更新内部展示值
               setState({
@@ -651,9 +641,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     }
   }, [JSON.stringify(value), visible, isInit]);
   (0, _ahooks.useDebounceEffect)(function () {
-    if (value && !visible && readOnly && !(0, _lodash.isEqual)(value, preValue.current)) {
+    if (value && !visible && readOnly) {
       var _options$some;
-      preValue.current = value;
       var isHasValue = options === null || options === void 0 ? void 0 : (_options$some = options.some) === null || _options$some === void 0 ? void 0 : _options$some.call(options, function (item) {
         return item[valueKey] === value;
       });
@@ -725,7 +714,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         size: "small"
       }) : null,
       onFocus: function onFocus() {
-        if (useRequest && (options === null || options === void 0 ? void 0 : options.length) === 0) {
+        if (useRequest) {
           var _useRequest$options10;
           var queryBean = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options10 = useRequest.options) === null || _useRequest$options10 === void 0 ? void 0 : _useRequest$options10.defaultParams) || {};
           var params = withPagination ? {
@@ -752,17 +741,17 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           var nextParams = transformParams ? transformParams(params) : params;
           run(nextParams);
         }
-      }, 2000),
+      }, 1000),
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'
       }
-    }, restProps)) : (0, _jsxRuntime.jsx)(_antd.Input, (0, _objectSpread3.default)({
+    }, (0, _lodash.omit)(restProps, ['otherProps']))) : (0, _jsxRuntime.jsx)(_antd.Input, (0, _objectSpread3.default)({
       value: viewText,
       onChange: handleChangeValue,
       disabled: disabled,
       autoComplete: "off",
       allowClear: true
-    }, restProps)), isView || disabled ? null : (0, _jsxRuntime.jsx)(_antd.Button, {
+    }, (0, _lodash.omit)(restProps, ['otherProps']))), isView || disabled ? null : (0, _jsxRuntime.jsx)(_antd.Button, {
       icon: (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
         className: "viewSvg",
         src: _view.default,

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

@@ -38,8 +38,7 @@ var ProCollapse = function ProCollapse(props) {
     className = props.className,
     icon = props.icon,
     _props$autoHeight = props.autoHeight,
-    autoHeight = _props$autoHeight === void 0 ? true : _props$autoHeight,
-    onChange = props.onChange;
+    autoHeight = _props$autoHeight === void 0 ? true : _props$autoHeight;
   var cls = (0, _classnames.default)((0, _defineProperty2.default)({
     'pro-collapse': true,
     'pro-collapse-level2': level === '2',
@@ -157,8 +156,7 @@ var ProCollapse = function ProCollapse(props) {
         });
       },
       expandIconPosition: "end",
-      defaultActiveKey: folding ? [] : ['1'],
-      onChange: onChange
+      defaultActiveKey: folding ? [] : ['1']
     }, collapseProps), {}, {
       children: renderPanel()
     }))

package/lib/ProStep/components/Item/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
 });
@@ -10,13 +9,14 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
-var _reactLazyload = _interopRequireWildcard(require("react-lazyload"));
+var _reactLazyload = _interopRequireDefault(require("react-lazyload"));
 var _lodash = require("lodash");
 var _index = require("../../index");
+var _utils = require("../../utils");
 var _ProCollapse = _interopRequireDefault(require("../../../ProLayout/components/ProCollapse"));
 var _excluded = ["id", "title", "collapse", "children", "lazyLoad"];
 var defaultLazyLoadConfig = {
-  height: 300,
+  height: 100,
   offset: 100,
   once: true // Load only once upon first entry into the viewport
 };
@@ -31,8 +31,10 @@ var ProStepItem = function ProStepItem(_ref) {
   var _useStep = (0, _index.useStep)(),
     register = _useStep.register,
     collapse = _useStep.collapse,
-    globalLazyLoad = _useStep.lazyLoad;
+    globalLazyLoad = _useStep.lazyLoad,
+    registerMap = _useStep.registerMap;
   var lazyLoad = stepLazyLoad || globalLazyLoad;
+  var loadedMap = (0, _utils.getLoadedMap)(registerMap);
   (0, _react.useEffect)(function () {
     // Schedule registration to avoid re-render issues
     var timeoutId = setTimeout(function () {
@@ -43,11 +45,13 @@ var ProStepItem = function ProStepItem(_ref) {
       }, restProps));
     }, 0);
     return function () {
-      clearTimeout(timeoutId);
+      return clearTimeout(timeoutId);
     };
   }, [id, title, lazyLoad, restProps, register]);
   var renderChildren = function renderChildren() {
-    if (lazyLoad) {
+    var _loadedMap$;
+    // 第一个step不设置lasyload，防止懒加载不生效
+    if (lazyLoad && (loadedMap === null || loadedMap === void 0 ? void 0 : loadedMap.length) && (loadedMap === null || loadedMap === void 0 ? void 0 : (_loadedMap$ = loadedMap[0]) === null || _loadedMap$ === void 0 ? void 0 : _loadedMap$.id) !== id) {
       var lazyLoadProps = (0, _lodash.isBoolean)(lazyLoad) ? defaultLazyLoadConfig : lazyLoad;
       return (0, _jsxRuntime.jsx)(_reactLazyload.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, lazyLoadProps), {}, {
         classNamePrefix: id,
@@ -65,14 +69,6 @@ var ProStepItem = function ProStepItem(_ref) {
         title: title,
         icon: true
       }, restProps), {}, {
-        onChange: function onChange(e) {
-          var _restProps$onChange;
-          if (lazyLoad) {
-            (0, _reactLazyload.forceCheck)();
-          }
-          // 默认执行
-          restProps === null || restProps === void 0 ? void 0 : (_restProps$onChange = restProps.onChange) === null || _restProps$onChange === void 0 ? void 0 : _restProps$onChange.call(restProps, e);
-        },
         children: renderChildren()
       }))
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.11.4-beta.7",
+  "version": "3.11.4",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",