@zat-design/sisyphus-react 3.6.2 → 3.6.3-beta.1

package/dist/index.esm.css

@@ -2316,20 +2316,20 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   width: 100%;
 }
 .pro-address .ant-cascader {
-  width: 50% !important;
+  width: 45% !important;
 }
 .pro-address .ant-cascader.no-detail {
   width: 100% !important;
 }
 .pro-address .pro-address-detail {
-  width: 50%;
+  width: 55%;
   margin-left: 2px;
 }
 .pro-address .pro-address-detail .ant-input-affix-wrapper {
   width: 100%;
 }
 .pro-address .ant-input-affix-wrapper {
-  width: 50%;
+  width: 55%;
   margin-left: 2px;
 }
 .pro-number-range .range-split {

package/dist/less.esm.css

@@ -2316,20 +2316,20 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   width: 100%;
 }
 .pro-address .ant-cascader {
-  width: 50% !important;
+  width: 45% !important;
 }
 .pro-address .ant-cascader.no-detail {
   width: 100% !important;
 }
 .pro-address .pro-address-detail {
-  width: 50%;
+  width: 55%;
   margin-left: 2px;
 }
 .pro-address .pro-address-detail .ant-input-affix-wrapper {
   width: 100%;
 }
 .pro-address .ant-input-affix-wrapper {
-  width: 50%;
+  width: 55%;
   margin-left: 2px;
 }
 .pro-number-range .range-split {

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

@@ -60,7 +60,7 @@ var ActionButton = function ActionButton(_ref) {
   // 其他操作按钮Props
   var actionBtnProps = _objectSpread(_objectSpread({}, btnConfig.buttonProps), {}, {
     onClick: function onClick() {
-      btnConfig.onEvent(record, index);
+      btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, index);
     },
     disabled: getDisabled((_btnConfig$buttonProp3 = btnConfig.buttonProps) === null || _btnConfig$buttonProp3 === void 0 ? void 0 : _btnConfig$buttonProp3.disabled)
   });
@@ -77,7 +77,7 @@ var ActionButton = function ActionButton(_ref) {
         placement: "topRight",
         title: deleteMsgMap[btnConfig.type],
         onConfirm: function onConfirm() {
-          btnConfig.onEvent(record, index);
+          btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, index);
         },
         disabled: isDisabled,
         okText: locale.ProEditTable.confirm,
@@ -97,13 +97,13 @@ var ActionButton = function ActionButton(_ref) {
           index: index,
           disabled: isDisabled,
           onClick: function onClick() {
-            btnConfig.onEvent(record, index);
+            btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, index);
           }
         }))) : _jsx(_Button, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
           disabled: isDisabled,
           type: "link",
           onClick: function onClick() {
-            btnConfig.onEvent(record, index);
+            btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, index);
           },
           children: btnConfig.label
         }))

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

@@ -73,37 +73,27 @@ var RenderToolbar = function RenderToolbar(config) {
     toolbar.needConfirm = needConfirm !== null && needConfirm !== void 0 ? needConfirm : true;
     toolbar.onEvent = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, index) {
-        var _yield$onEvent;
         var onEvent, result;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               onEvent = onClick || onHandle;
-              _context.next = 3;
+              if (onEvent) {
+                _context.next = 5;
+                break;
+              }
+              result = true;
+              _context.next = 8;
+              break;
+            case 5:
+              _context.next = 7;
               return onEvent === null || onEvent === void 0 ? void 0 : onEvent(selectedRows, dataSource, {
                 form: form,
                 namePath: virtualName
               });
-            case 3:
-              _context.t1 = _yield$onEvent = _context.sent;
-              _context.t0 = _context.t1 !== null;
-              if (!_context.t0) {
-                _context.next = 7;
-                break;
-              }
-              _context.t0 = _yield$onEvent !== void 0;
             case 7:
-              if (!_context.t0) {
-                _context.next = 11;
-                break;
-              }
-              _context.t2 = _yield$onEvent;
-              _context.next = 12;
-              break;
-            case 11:
-              _context.t2 = true;
-            case 12:
-              result = _context.t2;
+              result = _context.sent;
+            case 8:
               if (result && type !== 'custom') {
                 actions[type](_objectSpread(_objectSpread({}, config), {}, {
                   index: index,
@@ -113,7 +103,7 @@ var RenderToolbar = function RenderToolbar(config) {
                   virtualName: virtualName
                 }));
               }
-            case 14:
+            case 9:
             case "end":
               return _context.stop();
           }

package/es/ProEditTable/utils/index.js

@@ -79,7 +79,7 @@ var getActionColumn = function getActionColumn(config) {
     action.needConfirm = needConfirm !== null && needConfirm !== void 0 ? needConfirm : true;
     action.onEvent = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, index) {
-        var _form$getFieldValue, _yield$onEvent;
+        var _form$getFieldValue;
         var rowName, _record, onEvent, result;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -105,31 +105,22 @@ var getActionColumn = function getActionColumn(config) {
               // 编辑状态使用自定义form值，非编辑状态直接使用行数据
               _record = (_form$getFieldValue = form.getFieldValue(rowName)) !== null && _form$getFieldValue !== void 0 ? _form$getFieldValue : record; // 新增事件可以设置初始默认值，当做函数的出参导出
               onEvent = onClick || onHandle;
-              _context.next = 16;
+              if (onEvent) {
+                _context.next = 18;
+                break;
+              }
+              result = true;
+              _context.next = 21;
+              break;
+            case 18:
+              _context.next = 20;
               return onEvent === null || onEvent === void 0 ? void 0 : onEvent(_record, index, {
                 form: form,
                 namePath: virtualRowName
               });
-            case 16:
-              _context.t2 = _yield$onEvent = _context.sent;
-              _context.t1 = _context.t2 !== null;
-              if (!_context.t1) {
-                _context.next = 20;
-                break;
-              }
-              _context.t1 = _yield$onEvent !== void 0;
             case 20:
-              if (!_context.t1) {
-                _context.next = 24;
-                break;
-              }
-              _context.t3 = _yield$onEvent;
-              _context.next = 25;
-              break;
-            case 24:
-              _context.t3 = true;
-            case 25:
-              result = _context.t3;
+              result = _context.sent;
+            case 21:
               if (result && type !== 'custom') {
                 actions[type](_objectSpread(_objectSpread({}, config), {}, {
                   rowName: [].concat(_toConsumableArray(name), [index]),
@@ -139,7 +130,7 @@ var getActionColumn = function getActionColumn(config) {
                   validateKeys: validateKeys
                 }));
               }
-            case 27:
+            case 22:
             case "end":
               return _context.stop();
           }
@@ -204,7 +195,7 @@ export var transformColumns = function transformColumns() {
     setState = config.setState,
     page = config.page;
   var isCell = mode === 'cell';
-  var _columns = _toConsumableArray(columns);
+  var _columns = cloneDeep(columns);
   var _cacheMap = _objectSpread({}, cacheMap.current);
   var pageNum = tools.calc(page.pageNum, '-', 1);
   var firstIndex = tools.calc(pageNum, '*', page.pageSize);

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

@@ -17,10 +17,8 @@ import locale from '../../../../../locale';
 var actions = {
   add: {
     onClick: function onClick(value, _ref) {
-      var operation = _ref.operation,
-        form = _ref.form,
-        namePath = _ref.namePath;
-      operation.add();
+      var operation = _ref.operation;
+      operation.add({});
     },
     label: "".concat(locale.ProForm.formListActions[5]),
     icon: _jsx(PlusOutlined, {})

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

@@ -5,6 +5,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { forwardRef, useCallback, useImperativeHandle } from 'react';
 import { DndContext } from '@dnd-kit/core';
+import { cloneDeep, isFunction } from 'lodash';
 import { SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
 import { toArray } from '../../../utils';
 import { namesPathTransform } from './utils';
@@ -55,6 +56,10 @@ var FormList = function FormList(props, ref) {
         listName: [].concat(_toConsumableArray(namePath), [item.name]),
         label: mode === 'less' ? undefined : item.label
       });
+      // 可编辑表格的columns需要消除引用关系，防止串数据
+      if (column.type === 'ProEditTable' && !isFunction(column.fieldProps)) {
+        column.fieldProps.columns = cloneDeep(column.fieldProps.columns);
+      }
       return column;
     });
   }, [columns]);

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

@@ -16,7 +16,7 @@ import _Typography from "antd/es/typography";
 var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator", "detailPlaceholder"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState, memo, useMemo } from 'react';
-import { omit } from 'lodash';
+import { omit, find as _find } from 'lodash';
 import { transformDataName } from './utils/index';
 import { useProConfig } from '../../../../ProConfigProvider';
 import useEnum from '../../../../ProEnum/hooks/useEnum';
@@ -181,20 +181,6 @@ var ProCascader = function ProCascader(props) {
       return option.label.toLowerCase().indexOf(inputValue.toLowerCase()) > -1;
     });
   };
-  var handleAddressChange = function handleAddressChange(e) {
-    var cascaderValue = value === null || value === void 0 ? void 0 : value.slice(0, realLevel);
-    if (onChange) {
-      if (!e.target.value && (cascaderValue === null || cascaderValue === void 0 ? void 0 : cascaderValue.every(function (item) {
-        return !item;
-      }))) {
-        onChange(undefined);
-      } else {
-        var realValue = value ? _toConsumableArray(value) : [];
-        realValue[realLevel] = e.target.value;
-        onChange(realValue);
-      }
-    }
-  };
   var displayRender = function displayRender(label) {
     return label === null || label === void 0 ? void 0 : label.filter(function (item) {
       return !!item;
@@ -208,6 +194,48 @@ var ProCascader = function ProCascader(props) {
   })) === null || _ref7$filter === void 0 ? void 0 : _ref7$filter.join(separator)) || '-' : (defaultLabel === null || defaultLabel === void 0 ? void 0 : (_defaultLabel$filter = defaultLabel.filter(function (item) {
     return !!item;
   })) === null || _defaultLabel$filter === void 0 ? void 0 : _defaultLabel$filter.join(separator)) || '-';
+  var findSelectedOptions = function findSelectedOptions(options, value) {
+    var path = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+    var _value = value !== null && value !== void 0 ? value : [];
+    // 基准情况：如果 value 数组为空，且 path 不为空，说明找到了完整的路径
+    if ((_value === null || _value === void 0 ? void 0 : _value.length) === 0 && (path === null || path === void 0 ? void 0 : path.length) > 0) {
+      return path;
+    }
+    // 如果没有更多的 _value 需要匹配，或者当前选项没有 children，返回 null
+    if ((_value === null || _value === void 0 ? void 0 : _value.length) === 0 || !options || options.length === 0) {
+      return null;
+    }
+    // 尝试在当前层级的选项中查找匹配的 _value
+    var currentValue = _value[0];
+    var foundOption = _find(options, {
+      value: currentValue
+    });
+    if (foundOption) {
+      // 如果找到了匹配的选项，并且还有更多的 value 需要匹配，递归地在子选项中查找
+      if (_value.length > 1 && foundOption.children) {
+        return findSelectedOptions(foundOption.children, _value.slice(1), [].concat(_toConsumableArray(path), [foundOption]));
+      }
+      // 如果没有更多的 value 需要匹配，返回当前选项（以及之前的路径）
+      return [].concat(_toConsumableArray(path), [foundOption]);
+    }
+    // 如果没有在当前层级的选项中找到匹配的 value，返回 null
+    return null;
+  };
+  var _selectedOptions = findSelectedOptions(service ? serviceData : realDataSource, addressValue);
+  var handleAddressChange = function handleAddressChange(e) {
+    var cascaderValue = value === null || value === void 0 ? void 0 : value.slice(0, realLevel);
+    if (onChange) {
+      if (!e.target.value && (cascaderValue === null || cascaderValue === void 0 ? void 0 : cascaderValue.every(function (item) {
+        return !item;
+      }))) {
+        onChange(undefined);
+      } else {
+        var realValue = value ? _toConsumableArray(value) : [];
+        realValue[realLevel] = e.target.value;
+        onChange(realValue, _selectedOptions);
+      }
+    }
+  };
   return realIsView ? tooltip ? _jsx(_Tooltip, {
     className: className,
     title: tooltip === true ? viewValue : tooltip,

package/es/ProForm/components/combination/ProCascader/style/index.less

@@ -6,7 +6,7 @@
   width: 100%;
 
   .@{ant-prefix}-cascader {
-    width: 50% !important;
+    width: 45% !important;
 
     &.no-detail {
       width: 100% !important;
@@ -14,7 +14,7 @@
   }
 
   .pro-address-detail {
-    width: 50%;
+    width: 55%;
     margin-left: 2px;
 
     .@{ant-prefix}-input-affix-wrapper {
@@ -23,7 +23,7 @@
   }
 
   .@{ant-prefix}-input-affix-wrapper {
-    width: 50%;
+    width: 55%;
     margin-left: 2px;
   }
 }

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

@@ -416,7 +416,7 @@ var Render = function Render(props) {
       };
     }
     // 需要过滤掉的form_item的key
-    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after', 'globalControl'];
+    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after', 'globalControl', 'listName'];
     if (type === 'FormList') {
       lastComponentProps.disabled = lastDisabled;
       var lessMode = lastComponentProps.mode === 'less';

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, isEqual } from 'lodash';
+import { isFunction, isEqualWith } from 'lodash';
 import { customEqualForFun, equalDependencies } from './index';
 // 代理shouldUpdate事件, 执行函数值的[show, disabled], 当[show, disabled]与上一次值不相同时更新状态
 var useShouldUpdate = function useShouldUpdate(props) {
@@ -174,7 +174,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
       }
       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(fieldPropsRef.current, _fieldProps, customEqualForFun) && !isEqual(prevValues, currentValues)) ||
       // !isEqualWith(originComponentRef.current, _component, customEqualForFun) ||
       equalDependencies(dependencies, prevValues, _currentValues)) {
         showRef.current = _show;

package/es/ProLayout/index.js

@@ -14,6 +14,7 @@ import { transformMenus } from './utils';
 // 全局上下文
 export var LayoutContext = /*#__PURE__*/createContext(undefined);
 var ProLayout = function ProLayout(props) {
+  var _Object$keys;
   var children = props.children,
     _props$className = props.className,
     className = _props$className === void 0 ? '' : _props$className,
@@ -25,6 +26,8 @@ var ProLayout = function ProLayout(props) {
     headerNotice = props.headerNotice,
     noticeIn = props.notice,
     dataSource = props.dataSource,
+    _props$pathPrefix = props.pathPrefix,
+    pathPrefix = _props$pathPrefix === void 0 ? '' : _props$pathPrefix,
     theme = props.theme,
     onCollapsedChange = props.onCollapsedChange;
   var _useSetState = useSetState({
@@ -51,7 +54,7 @@ var ProLayout = function ProLayout(props) {
     if (Array.isArray(dataSource) && !dataSource.length) {
       return _message.warning('Warning: Missing menu data source, or menu data source is not an array');
     }
-    var userData = transformMenus(dataSource);
+    var userData = transformMenus(dataSource, pathPrefix);
     setState({
       menus: userData
     });
@@ -107,7 +110,7 @@ var ProLayout = function ProLayout(props) {
       selectedPath: selectedPath,
       onSelected: setState
     },
-    children: !waterMarkProps ? layoutDom : _jsx(ProWaterMark, _objectSpread(_objectSpread({}, waterMarkProps), {}, {
+    children: !((_Object$keys = Object.keys(waterMarkProps)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length) ? layoutDom : _jsx(ProWaterMark, _objectSpread(_objectSpread({}, waterMarkProps), {}, {
       children: layoutDom
     }))
   });

package/es/ProLayout/propTypes.d.ts

@@ -44,6 +44,10 @@ export interface ProLayoutProps {
     dataSource?: DataSourceProps | Partial<MenusProps>;
     collapsed?: boolean;
     /**
+  *  菜单拼接前缀
+  */
+    pathPrefix?: string;
+    /**
     *  是否带有菜单界面，true不带，只显示content内容
     */
     pure?: pureKey;

package/es/ProLayout/utils/index.d.ts

@@ -11,13 +11,13 @@ export declare const getIdsByPathName: (menus: any[], activeMenu?: string) => nu
  * @param menuData 菜单数据源
  * @returns []
  */
-export declare const transformMenu: (menuData: any[]) => any[];
+export declare const transformMenu: (menuData: any[], pathPrefix: string) => any[];
 /**
  * 转换菜单数据源评价keyUrlPath与keyIdPath
  * @param data 菜单数据源
  * @returns []
  */
-export declare const transformMenus: (data: MenusProps) => any[] | MenusProps;
+export declare const transformMenus: (data: MenusProps, pathPrefix: string) => any[] | MenusProps;
 /**
  * 获取URL中的search参数
  * @param name 参数key

package/es/ProLayout/utils/index.js

@@ -40,7 +40,7 @@ export var getIdsByPathName = function getIdsByPathName(menus, activeMenu) {
  * @param menuData 菜单数据源
  * @returns []
  */
-export var transformMenu = function transformMenu(menuData) {
+export var transformMenu = function transformMenu(menuData, pathPrefix) {
   var data = _toConsumableArray(menuData);
   var menuDeep = function menuDeep(menuDeepItem) {
     if (!Array.isArray(menuDeepItem) || !menuDeepItem.length) {
@@ -49,6 +49,8 @@ export var transformMenu = function transformMenu(menuData) {
     menuDeepItem.forEach(function (item, index) {
       var _item$keyUrlPath, _item$keyIdPath, _item$children;
       item.code = item.code || item.id;
+      item.url = "".concat(pathPrefix).concat(item.url);
+      item.redirectUrl = (item === null || item === void 0 ? void 0 : item.redirectUrl) ? "".concat(pathPrefix).concat(item.redirectUrl) : '';
       // 拼接父级url与id数据
       if (item === null || item === void 0 ? void 0 : (_item$keyUrlPath = item.keyUrlPath) === null || _item$keyUrlPath === void 0 ? void 0 : _item$keyUrlPath.length) {
         item.keyUrlPath.push(item.redirectUrl || item.url);
@@ -85,18 +87,18 @@ export var transformMenu = function transformMenu(menuData) {
  * @param data 菜单数据源
  * @returns []
  */
-export var transformMenus = function transformMenus(data) {
+export var transformMenus = function transformMenus(data, pathPrefix) {
   if (isPlainObject(data)) {
     // @ts-ignore
     if (!Array.isArray(data === null || data === void 0 ? void 0 : data.menus)) {
       return [];
     }
     // @ts-ignore
-    data.menus = transformMenu(data.menus);
+    data.menus = transformMenu(data.menus, pathPrefix);
     return data;
   }
   if (Array.isArray(data)) {
-    return transformMenu(data);
+    return transformMenu(data, pathPrefix);
   }
   return data;
 };

package/es/ProSelect/utils/index.js

@@ -2,7 +2,8 @@ import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIt
 /* eslint-disable no-restricted-syntax */
 import _ from 'lodash';
 var findSelectNameValues = function findSelectNameValues(_ref) {
-  var list = _ref.list,
+  var _ref$list = _ref.list,
+    list = _ref$list === void 0 ? [] : _ref$list,
     selectName = _ref.selectName,
     value = _ref.value,
     dataSource = _ref.dataSource,
@@ -53,7 +54,7 @@ export var getSelectList = function getSelectList(_ref2) {
   var fatherName = listName.slice(0, firstNumberIndex);
   var selectName = listName.slice(firstNumberIndex + 1);
   return findSelectNameValues({
-    list: form.getFieldValue(fatherName),
+    list: form.getFieldValue(fatherName) || [],
     selectName: selectName,
     value: value,
     dataSource: dataSource,

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

@@ -7,16 +7,12 @@ import { throttle } from 'lodash';
 import React from 'react';
 import { useStep } from '../../index';
 export default (function (_ref) {
-  var _children$props;
   var children = _ref.children,
     delayTime = _ref.delayTime,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useStep = useStep(),
-    notify = _useStep.notify,
-    loading = _useStep.loading,
-    setLoading = _useStep.setLoading;
+    notify = _useStep.notify;
   return /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, props), {}, {
-    loading: loading || (children === null || children === void 0 ? void 0 : (_children$props = children.props) === null || _children$props === void 0 ? void 0 : _children$props.loading),
     onClick: throttle( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var values;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -28,11 +24,10 @@ export default (function (_ref) {
           case 3:
             values = _context.sent;
             setTimeout(function () {
-              setLoading(false);
               var localData = localStorage.getItem('cache-pro-step');
               if (localData !== 'false') {
-                var _children$props2, _children$props2$onCl;
-                children === null || children === void 0 ? void 0 : (_children$props2 = children.props) === null || _children$props2 === void 0 ? void 0 : (_children$props2$onCl = _children$props2.onClick) === null || _children$props2$onCl === void 0 ? void 0 : _children$props2$onCl.call(_children$props2, values);
+                var _children$props, _children$props$onCli;
+                children === null || children === void 0 ? void 0 : (_children$props = children.props) === null || _children$props === void 0 ? void 0 : (_children$props$onCli = _children$props.onClick) === null || _children$props$onCli === void 0 ? void 0 : _children$props$onCli.call(_children$props, values);
               }
             }, delayTime !== null && delayTime !== void 0 ? delayTime : 0);
           case 5: