@zat-design/sisyphus-react 3.4.10 → 3.4.11-beta.2

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

@@ -1,4 +1,3 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/button/style";
 import _Button from "antd/es/button";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
@@ -7,7 +6,8 @@ import _Space from "antd/es/space";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-var _excluded = ["label", "onClick", "onHandle", "actionType"],
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+var _excluded = ["label", "onClick", "onHandle", "type"],
   _excluded2 = ["onClick", "label"];
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { PlusOutlined } from '@ant-design/icons';
@@ -23,12 +23,11 @@ var actions = {
       operation.add();
     },
     label: "".concat(locale.ProForm.formListActions[5]),
-    type: 'link',
     icon: _jsx(PlusOutlined, {})
   }
 };
 var defaultActionProps = [{
-  actionType: 'add'
+  type: 'add'
 }];
 var ToolbarButton = function ToolbarButton(props) {
   var namePath = props.namePath,
@@ -43,12 +42,19 @@ var ToolbarButton = function ToolbarButton(props) {
   // 默认显示一个delete
   var toolbarProps = useMemo(function () {
     var _props$toolbarProps;
-    if (!((_props$toolbarProps = props.toolbarProps) === null || _props$toolbarProps === void 0 ? void 0 : _props$toolbarProps.find(function (item) {
-      return item.actionType === 'add';
+    // 兼容 actionType 和 type
+    var _toolbarProps = (_props$toolbarProps = props.toolbarProps) === null || _props$toolbarProps === void 0 ? void 0 : _props$toolbarProps.map(function (item) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        // @ts-ignore
+        type: item.actionType
+      });
+    });
+    if (!(_toolbarProps === null || _toolbarProps === void 0 ? void 0 : _toolbarProps.find(function (item) {
+      return item.type === 'add';
     }))) {
-      return (props === null || props === void 0 ? void 0 : props.toolbarProps) ? [].concat(_toConsumableArray(props.toolbarProps), defaultActionProps) : defaultActionProps;
+      return _toolbarProps ? [].concat(_toConsumableArray(_toolbarProps), defaultActionProps) : defaultActionProps;
     }
-    return props.toolbarProps;
+    return _toolbarProps;
   }, [props.toolbarProps]);
   var handleClick = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, item) {
@@ -76,7 +82,7 @@ var ToolbarButton = function ToolbarButton(props) {
             });
             return _context.abrupt("return");
           case 7:
-            if ((item === null || item === void 0 ? void 0 : item.actionType) === 'add' && data) {
+            if ((item === null || item === void 0 ? void 0 : item.type) === 'add' && data) {
               operation.add(data);
             }
           case 8:
@@ -100,7 +106,7 @@ var ToolbarButton = function ToolbarButton(props) {
   return _jsx(_Space, {
     align: "start",
     className: "pro-form-list-toolbar",
-    children: toolbarProps === null || toolbarProps === void 0 ? void 0 : toolbarProps.map(function (item) {
+    children: toolbarProps === null || toolbarProps === void 0 ? void 0 : toolbarProps.map(function (item, index) {
       if (item.show === false) return _jsx(_Fragment, {});
       if (isFunction(item.show) && !item.show(form.getFieldValue(namePath), {
         namePath: namePath,
@@ -111,32 +117,34 @@ var ToolbarButton = function ToolbarButton(props) {
       var label = item.label,
         _onClick2 = item.onClick,
         onHandle = item.onHandle,
-        actionType = item.actionType,
+        type = item.type,
         rest = _objectWithoutProperties(item, _excluded);
       var _onClick = _onClick2 || onHandle;
-      if (['add'].includes(actionType)) {
+      if (type === 'add') {
         if (disabled || isView) return _jsx(_Fragment, {});
-        var _actions$actionType = actions[actionType],
-          internalOnClick = _actions$actionType.onClick,
-          defaultLabel = _actions$actionType.label,
-          defaultRest = _objectWithoutProperties(_actions$actionType, _excluded2);
+        var _actions$type = actions[type],
+          internalOnClick = _actions$type.onClick,
+          defaultLabel = _actions$type.label,
+          defaultRest = _objectWithoutProperties(_actions$type, _excluded2);
         // 大于等于max不可新增
-        if (max && max <= fields.length && ['add'].includes(actionType)) {
+        if (max && max <= fields.length && type === 'add') {
           return false;
         }
-        return _jsx(_Button, _objectSpread(_objectSpread(_objectSpread({}, actions[actionType]), rest), {}, {
+        return _jsx(_Button, _objectSpread(_objectSpread(_objectSpread({}, actions[type]), rest), {}, {
+          type: "link",
           onClick: function onClick() {
             return handleClick(internalOnClick, _onClick, item);
           },
           children: label || defaultLabel
-        }), actionType);
+        }), "".concat(type).concat(index));
       }
       return _jsx(_Button, _objectSpread(_objectSpread({}, rest), {}, {
+        type: "link",
         onClick: function onClick() {
           return customClick(_onClick2, item);
         },
         children: label
-      }), actionType);
+      }), "".concat(type).concat(index));
     })
   });
 };

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

@@ -14,8 +14,8 @@ export interface Option {
     form: FormInstance;
     operation: FormListOperation;
 }
-export interface ActionProps extends Omit<ButtonProps, 'onClick'> {
-    actionType?: 'add' | 'delete' | 'copy' | 'moveUp' | 'moveDown';
+export interface ActionProps extends Omit<ButtonProps, 'onClick' | 'type'> {
+    type?: 'add' | 'delete' | 'copy' | 'moveUp' | 'moveDown';
     onHandle?: Callback;
     onClick?: Callback;
     label?: string;
@@ -24,8 +24,8 @@ export interface ActionProps extends Omit<ButtonProps, 'onClick'> {
     title?: string;
     show?: boolean | ((record: any, option: Pick<Option, 'index' | 'form' | 'namePath'>) => boolean);
 }
-export interface ToolbarActionProps extends Omit<ActionProps, 'actionType' | 'onHandle' | 'onClick' | 'show'> {
-    actionType?: 'add';
+export interface ToolbarActionProps extends Omit<ActionProps, 'actionType' | 'onHandle' | 'onClick' | 'show' | 'type'> {
+    type?: 'add';
     onHandle?: ToolbarCallback;
     onClick?: ToolbarCallback;
     show?: boolean | ((record: any, option: Pick<Option, 'form' | 'namePath'>) => boolean);

package/es/ProForm/components/combination/Group/component/ComRender.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { NamePath } from 'antd/lib/form/interface';
 interface Props {
     type: string;
     component: React.ReactElement;
@@ -10,6 +11,8 @@ interface Props {
     contextProps: any;
     before?: React.ReactNode;
     after?: React.ReactNode;
+    name?: NamePath;
+    valueType: string;
 }
 /** 渲染组件 */
 declare const ComRender: React.FC<Props>;

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

@@ -7,7 +7,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import React from 'react';
 import { omit } from 'lodash';
 import classnames from 'classnames';
-import { insertSeparator, transformColumns } from './utils';
+import { insertSeparator, useTransformColumns } from './utils';
 import ProForm from '../../../../ProForm';
 import ComRender from './component/ComRender';
 /**
@@ -41,7 +41,7 @@ var Group = function Group(props) {
     _option.current[index] = option;
     onChange(_value, _option.current);
   };
-  var columnsProps = transformColumns({
+  var columnsProps = useTransformColumns({
     columns: children,
     name: name,
     names: names,

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

@@ -20,7 +20,7 @@
 
 .pro-group {
   width: unset !important;
-  
+  display: flex;
 
   &.pro-group-diy-width, &.pro-group-width-auto {
     .@{ant-prefix}-space .@{ant-prefix}-space-item {

package/es/ProForm/components/combination/Group/utils.d.ts

@@ -59,5 +59,5 @@ interface ColumnsTransformerParams {
     groupProps: GroupProps;
 }
 /** 转换columns */
-export declare const transformColumns: (params: ColumnsTransformerParams) => any[];
+export declare const useTransformColumns: (params: ColumnsTransformerParams) => any[];
 export {};

package/es/ProForm/components/combination/Group/utils.js

@@ -4,9 +4,11 @@ import _typeof from "@babel/runtime/helpers/esm/typeof";
 import "antd/es/button/style";
 import _Button from "antd/es/button";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { isFunction } from 'lodash';
+import { useRef } from 'react';
+import { cloneDeep, isEqual, isFunction } from 'lodash';
 import valueTypeMap from '../../../utils/valueType';
 import { useDeepCompareMemo } from '../../../utils/useDeepCompareMemo';
+import { difference } from '../../../../ProEditTable/utils/tools';
 /**
  * 插入间隔符
  * @param columns 表单配置数组
@@ -153,7 +155,7 @@ var valueFromEventWrapper = function valueFromEventWrapper(column, args) {
   return getValueMiddleware(newValue, list);
 };
 /** 转换columns */
-export var transformColumns = function transformColumns(params) {
+export var useTransformColumns = function useTransformColumns(params) {
   var form = params.form,
     columns = params.columns,
     name = params.name,
@@ -163,6 +165,7 @@ export var transformColumns = function transformColumns(params) {
     value = params.value,
     internalChange = params.onChange,
     groupProps = params.groupProps;
+  var timerRef = useRef([]);
   return columns === null || columns === void 0 ? void 0 : columns.flatMap(function (column, index) {
     var type = column.type,
       valueType = column.valueType,
@@ -172,7 +175,8 @@ export var transformColumns = function transformColumns(params) {
       normalize = column.normalize,
       disabled = column.disabled,
       show = column.show,
-      component = column.component;
+      component = column.component,
+      clearNotShow = column.clearNotShow;
     var _ref = fieldProps || {},
       mode = _ref.mode,
       onChange = _ref.onChange,
@@ -180,7 +184,22 @@ export var transformColumns = function transformColumns(params) {
       comDisabled = _ref.disabled;
     var _disabled = disabled || comDisabled;
     var columnName = names ? names[index] : [].concat(name, index);
+    // 响应式字段改变后的回调
+    var changedCallback = function changedCallback(lastDependency, current) {
+      // 清值防抖  多次刷新时以最后一次为准
+      if (clearNotShow !== false && names) {
+        if ((current === null || current === void 0 ? void 0 : current.show) === false) {
+          clearInterval(timerRef.current[index]);
+          timerRef.current[index] = setTimeout(function () {
+            form.resetFields([columnName]);
+          }, 200);
+        } else {
+          clearInterval(timerRef.current[index]);
+        }
+      }
+    };
     // 响应式字段
+    // eslint-disable-next-line react-hooks/rules-of-hooks
     var reactiveProps = useDeepCompareMemo(function () {
       return getReactiveProps({
         form: form,
@@ -193,7 +212,7 @@ export var transformColumns = function transformColumns(params) {
         fieldProps: fieldProps,
         name: columnName
       });
-    }, [value, show, fieldProps, _disabled, columnName, type]);
+    }, changedCallback, [value, show, fieldProps, _disabled, columnName, type]);
     if (reactiveProps.show === false) {
       return [];
     }
@@ -216,13 +235,29 @@ export var transformColumns = function transformColumns(params) {
         newValue = ((_transform$normalize = transform.normalize) === null || _transform$normalize === void 0 ? void 0 : _transform$normalize.call(transform, newValue)) || (normalize === null || normalize === void 0 ? void 0 : normalize(newValue));
       }
       internalChange === null || internalChange === void 0 ? void 0 : internalChange(newValue, args[1], index);
+      var values = form.getFieldValue(namePath);
+      var originRow = (namePath === null || namePath === void 0 ? void 0 : namePath.length) ? cloneDeep(values) : undefined;
       onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, args);
-      onFieldChange === null || onFieldChange === void 0 ? void 0 : onFieldChange(newValue, form.getFieldValue(namePath), {
+      onFieldChange === null || onFieldChange === void 0 ? void 0 : onFieldChange(newValue, values, {
         index: outerIndex,
         namePath: namePath,
         form: form,
         option: args === null || args === void 0 ? void 0 : args[1]
       });
+      // 如果是在可编辑表格或formList内部, 储存当前行的值, 并在变更后更新到表单里
+      if ((namePath === null || namePath === void 0 ? void 0 : namePath.length) && !isEqual(originRow, values)) {
+        var _Object$keys, _Object$keys$map;
+        form.setFieldValue(namePath, values);
+        var diff = difference(originRow, values) || {};
+        var validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 ? void 0 : (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
+          return [].concat(_toConsumableArray(namePath), [key]);
+        });
+        if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
+          setTimeout(function () {
+            form.validateFields([name].concat(_toConsumableArray(validateFieldKeys)));
+          }, 100);
+        }
+      }
     };
     return _objectSpread(_objectSpread(_objectSpread({}, column), {}, {
       name: columnName

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

@@ -1,5 +1,7 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["label", "value", "children"];
+import { omit } from 'lodash';
 export var transformDataName = function transformDataName(dataSource, fieldNames) {
   var label = fieldNames.label,
     value = fieldNames.value,
@@ -20,10 +22,10 @@ export var transformDataName = function transformDataName(dataSource, fieldNames
     if (children && Array.isArray(node[children])) {
       newNode.children = node[children].map(transformNode);
     }
-    return newNode;
+    return _objectSpread(_objectSpread({}, newNode), omit(node, Object.values(fieldNames)));
   }
-  function transformData(data) {
+  var transformData = function transformData(data) {
     return data.map(transformNode);
-  }
+  };
   return transformData(dataSource);
 };

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

@@ -2,7 +2,7 @@ import React from 'react';
 import { RangePickerProps } from 'antd/es/date-picker';
 import { Moment } from 'moment';
 export type Props = Omit<RangePickerProps, 'value' | 'onChange' | 'format' | 'separator' | 'mode'> & {
-    disabled?: boolean;
+    disabled?: boolean | [boolean, boolean];
     foreverText?: string;
     foreverDate?: string;
     otherProps?: any;

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

@@ -72,9 +72,10 @@ var ProRangeLimit = function ProRangeLimit(props) {
     startDate = _ref3[0],
     endDate = _ref3[1];
   var initialConfig = useProConfig('ProTimeLimit');
+  var _disabled = typeof disabled === 'boolean' ? [disabled, disabled] : disabled;
   var className = classNames({
     'ant-input': true,
-    'ant-input-disabled': disabled,
+    'ant-input-disabled': _disabled === null || _disabled === void 0 ? void 0 : _disabled[1],
     'forever-checkbox': true
   });
   var _isForever = useMemo(function () {
@@ -139,7 +140,7 @@ var ProRangeLimit = function ProRangeLimit(props) {
     className: "pro-range-limit",
     children: [_jsx(RangePicker, _objectSpread(_objectSpread(_objectSpread({
       allowClear: true,
-      disabled: [disabled, disabled || _isForever],
+      disabled: [_disabled === null || _disabled === void 0 ? void 0 : _disabled[0], (_disabled === null || _disabled === void 0 ? void 0 : _disabled[1]) || _isForever],
       defaultPickerValue: defaultPickerValue
     }, initialConfig), omit(rest, ['placeholder', 'separator'])), {}, {
       format: format,
@@ -149,7 +150,7 @@ var ProRangeLimit = function ProRangeLimit(props) {
       className: className,
       children: _jsx(_Checkbox, {
         checked: _isForever,
-        disabled: disabled,
+        disabled: _disabled === null || _disabled === void 0 ? void 0 : _disabled[1],
         onChange: handleForeverChange,
         children: foreverText
       })

package/es/ProForm/index.js

@@ -159,10 +159,11 @@ var ProForm = function ProForm(props, ref) {
   });
   // 解决平铺后的值拿不到的问题
   var handleValuesChange = function handleValuesChange(changedValue) {
+    if (!onValuesChange) return;
     // 暂时通过'-'区分组合组件字段和普通字段
     var keys = Object.keys(changedValue);
     if (!keys.length) {
-      onValuesChange === null || onValuesChange === void 0 ? void 0 : onValuesChange(changedValue, form.getFieldsValue());
+      onValuesChange(changedValue, form.getFieldsValue());
     } else {
       var values = keys.map(function (key) {
         if (key.includes('-')) {
@@ -174,7 +175,7 @@ var ProForm = function ProForm(props, ref) {
         }
         return {};
       });
-      onValuesChange === null || onValuesChange === void 0 ? void 0 : onValuesChange(merge.apply(void 0, [changedValue].concat(_toConsumableArray(values))), form.getFieldsValue());
+      onValuesChange(merge.apply(void 0, [changedValue].concat(_toConsumableArray(values))), form.getFieldsValue());
     }
   };
   // 包装一层兼容 names 改变

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

@@ -1,2 +1,2 @@
 /** 深度比较依赖变化memo */
-export declare const useDeepCompareMemo: (fun: () => any, depList: any[]) => any;
+export declare const useDeepCompareMemo: (fun: () => any, changedCb: (last: any, current: any) => void, depList: any[]) => any;

package/es/ProForm/utils/useDeepCompareMemo.js

@@ -2,11 +2,12 @@ import { useRef } from 'react';
 import { isEqualWith } from 'lodash';
 import { customEqualForFun } from '.';
 /** 深度比较依赖变化memo */
-export var useDeepCompareMemo = function useDeepCompareMemo(fun, depList) {
+export var useDeepCompareMemo = function useDeepCompareMemo(fun, changedCb, depList) {
   var lastDependency = useRef(); // 上一次的依赖
   var lastRes = useRef(); // 上一次的结果
   if (!isEqualWith(depList, lastDependency.current, customEqualForFun)) {
     var res = fun();
+    changedCb === null || changedCb === void 0 ? void 0 : changedCb(lastRes.current, res);
     lastRes.current = res;
   }
   lastDependency.current = depList;

package/es/ProForm/utils/useForm.js

@@ -9,16 +9,24 @@ export var useForm = function useForm(originForm) {
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   var getFieldsValue = form.getFieldsValue,
-    validateFields = form.validateFields;
+    validateFields = form.validateFields,
+    setFieldsValue = form.setFieldsValue;
   // @ts-ignore
   var _getFieldsValue = function _getFieldsValue(nameList, filterFunc) {
     // 全部查询
     if (nameList !== true) {
-      var values = getFieldsValue(true, filterFunc);
+      var values = getFieldsValue(nameList || true, filterFunc);
       return filterInternalFields(values);
     }
     return getFieldsValue(nameList, filterFunc);
   };
+  // const _setFieldsValue: FormInstance<T>['setFieldsValue'] = (data) => {
+  //   // 解决names通过set设置无法触发rc-field-form中onStoreChange的问题
+  //   setTimeout(() => {
+  //     const baseData = getFieldsValue(true);
+  //     setFieldsValue({ ...baseData, ...data });
+  //   }, 0);
+  // };
   var _validateFields = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
       var _rest$,
@@ -87,5 +95,6 @@ export var useForm = function useForm(originForm) {
   }();
   form.getFieldsValue = _getFieldsValue;
   form.validateFields = _validateFields;
+  // form.setFieldsValue = _setFieldsValue;
   return [form];
 };

package/es/ProForm/utils/useShouldUpdate.js

@@ -121,8 +121,14 @@ var useShouldUpdate = function useShouldUpdate(props) {
   }
   return {
     shouldUpdate: function shouldUpdate(prevValues, currentValues) {
-      // formList场景取当前行数据，不取shouldUpdate变更后值
-      var _currentValues = form.getFieldsValue(namePath ? [namePath] : undefined) || {};
+      // @ts-ignore formList场景取当前行数据，不取shouldUpdate变更后值
+      var _currentValues;
+      if (namePath) {
+        // formList场景values取当前行数据
+        _currentValues = form.getFieldValue(namePath) || {};
+      } else {
+        _currentValues = form.getFieldsValue(true);
+      }
       var _show = isFunction(show) ? Boolean(show(_currentValues, {
         form: form,
         index: index,

package/es/ProIcon/index.d.ts

@@ -1,4 +1,5 @@
 import { FC } from 'react';
 import { ProIconProps } from './propsTypes';
+import './symbolIcon.js';
 declare const ProIcon: FC<ProIconProps>;
 export default ProIcon;

package/es/ProIcon/index.js

@@ -7,7 +7,7 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 var _excluded = ["type", "onClick", "size", "color", "className", "style", "spin", "rotate", "theme", "disabled", "mode", "buttonProps", "children", "mapList", "src", "actionMap", "tooltip"];
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
-import { useExternal, useLocalStorageState, useSetState, useDeepCompareLayoutEffect } from 'ahooks';
+import { useLocalStorageState, useSetState, useDeepCompareLayoutEffect } from 'ahooks';
 import classNames from 'classnames';
 import { uniqBy } from 'lodash';
 import { ReactSVG } from 'react-svg';
@@ -16,6 +16,7 @@ import { useProConfig } from '../ProConfigProvider';
 import { iconMap } from './config';
 import { onBeforeInjection } from './utils';
 import locale from '../locale';
+import './symbolIcon.js';
 var ProIcon = function ProIcon(props) {
   var _window, _window2;
   var _useProConfig = useProConfig(),
@@ -72,8 +73,6 @@ var ProIcon = function ProIcon(props) {
   ((_window = window) === null || _window === void 0 ? void 0 : _window.__POWERED_BY_QIANKUN__) || ((_window2 = window) === null || _window2 === void 0 ? void 0 : _window2.isMicroApp);
   // 语言
   var language = locale.ProIcon.language;
-  // 加载内部icon
-  useExternal('https://at.alicdn.com/t/c/font_4063056_jmnz9g5uycp.js');
   var rotateStyle = rotate ? {
     msTransform: "rotate(".concat(rotate, "deg)"),
     transform: "rotate(".concat(rotate, "deg)")

package/es/ProIcon/symbolIcon.js

@@ -0,0 +1,43 @@
+window._iconfont_svg_string_4063056 = '<svg><symbol id="icon-lock" viewBox="0 0 1024 1024"><path d="M752.384 412.1088h-55.6544V300.3904C696.7296 183.6544 608.512 102.4 501.76 102.4 395.0592 102.4 306.8928 183.6544 306.8928 300.3904V407.04H251.1872c-27.8016 0-46.3872 25.344-46.3872 50.7392v385.8432c0 30.464 23.1936 50.7904 46.3872 50.7904h501.248c27.8016 0 46.3872-25.3952 46.3872-50.7904V462.848c0-30.464-18.5856-50.7392-46.4384-50.7392z m-222.72 253.8496v86.272c0 5.12-4.6592 5.12-4.6592 5.12h-41.7792c-4.608 0-4.608-5.12-4.608-5.12v-86.272c-23.2448-10.1888-37.12-30.464-37.12-55.8592 0-35.5328 27.8016-66.048 60.3136-66.048 32.4608 0 60.3136 30.5152 60.3136 66.048 0 25.3952-13.9264 45.6704-32.4608 55.808z m92.7744-253.8496H381.1328V295.3216c0-60.928 55.7056-111.6672 120.6784-111.6672 64.9728 0 120.6272 50.7392 120.6272 111.6672v116.736z" fill="#BCBCBC" ></path></symbol><symbol id="icon-drag" viewBox="0 0 1024 1024"><path d="M670.72 179.2m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z" fill="#939599" ></path><path d="M670.72 506.88m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z" fill="#939599" ></path><path d="M670.72 834.56m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z" fill="#939599" ></path><path d="M343.04 179.2m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z" fill="#939599" ></path><path d="M343.04 506.88m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z" fill="#939599" ></path><path d="M343.04 834.56m-76.8 0a76.8 76.8 0 1 0 153.6 0 76.8 76.8 0 1 0-153.6 0Z" fill="#939599" ></path></symbol><symbol id="icon-plus" viewBox="0 0 1024 1024"><path d="M576 64H448v384H64v128h384v384h128V576h384V448H576z"  ></path></symbol><symbol id="icon-zengjia" viewBox="0 0 1024 1024"><path d="M939.94 459.073h-377.6V83.519H462.055v375.554h-377.6v100.284h377.6v379.646H562.34V559.357h377.6z" fill="#272636" ></path></symbol><symbol id="icon-dot" viewBox="0 0 1024 1024"><path d="M512 624a112 112 0 1 0 0-224 112 112 0 0 0 0 224z"  ></path></symbol><symbol id="icon-solid-close" viewBox="0 0 1024 1024"><path d="M516.707 66.513C272.86 66.513 75.16 264.212 75.16 508.06S272.86 949.607 516.707 949.607 958.254 751.91 958.254 508.06 760.556 66.513 516.707 66.513z m227.067 601.691c18.419 18.42 18.419 48.504 0 66.923s-48.504 18.42-66.923 0L516.707 574.983 356.563 735.127c-18.419 18.42-48.503 18.42-66.923 0s-18.419-48.504 0-66.923L449.784 508.06 289.64 347.916c-18.419-18.419-18.419-48.503 0-66.922 18.42-18.42 48.504-18.42 66.923 0l160.144 160.144 160.144-160.144c18.42-18.42 48.504-18.42 66.923 0 18.419 18.419 18.419 48.503 0 66.922L583.63 508.06l160.144 160.144z"  ></path></symbol><symbol id="icon-arrow" viewBox="0 0 1024 1024"><path d="M832 0a192 192 0 0 1 192 192v640a192 192 0 0 1-192 192H192A192 192 0 0 1 0 832V192A192 192 0 0 1 192 0z m0 42.667H192A149.333 149.333 0 0 0 42.667 192v640A149.333 149.333 0 0 0 192 981.333h640A149.333 149.333 0 0 0 981.333 832V192A149.333 149.333 0 0 0 832 42.667z m-94.165 329.386l60.33 60.331L512 718.592 225.835 432.384l60.33-60.33L512 597.887l225.835-225.835z"  ></path></symbol><symbol id="icon-delete" viewBox="0 0 1024 1024"><path d="M662.08 121.472v64H361.92v-64z m206.4 159.488v64H155.52v-64z"  ></path><path d="M280.512 303.232l-0.064 530.816h460.096V303.232h64v594.88H216.512v-594.88z"  ></path><path d="M431.424 440.704v337.728h-64V440.704z m225.152 0v337.728h-64V440.704z"  ></path></symbol><symbol id="icon-catalog" viewBox="0 0 1075 1024"><path d="M1044.429 758.323v128.973H313.702V758.272h730.727z m-833.127 0v128.973H71.732V758.272h139.57zM1044.43 447.54v128.922H313.702V447.539h730.727z m-833.127 0v128.922H71.732V447.539h139.57z m833.127-310.784v128.922H313.702V136.704h730.727z m-833.127 0v128.922H71.732V136.704h139.57z"  ></path></symbol><symbol id="icon-customColumn" viewBox="0 0 1024 1024"><path d="M170.368 128h0.576c28.288 0 42.368 14.848 42.368 44.608v678.784c0 29.76-14.08 44.608-42.368 44.608h-0.576C142.144 896 128 881.152 128 851.392V172.608c0-29.76 14.08-44.608 42.368-44.608z m682.752 0h0.576c28.224 0 42.368 14.848 42.368 44.608v678.784c0 29.76-14.08 44.608-42.368 44.608h-0.576c-28.288 0-42.368-14.848-42.368-44.608V172.608c0-29.76 14.08-44.608 42.368-44.608z m-453.632 0h225.024c38.784 0 58.176 20.16 58.176 60.416v647.168c0 40.32-19.392 60.416-58.176 60.416H399.488c-38.784 0-58.176-20.16-58.176-60.416V188.416c0-40.32 19.392-60.416 58.176-60.416z"  ></path></symbol><symbol id="icon-copy" viewBox="0 0 1024 1024"><path d="M363.746 0h565.883c52.05 0 94.286 42.236 94.286 94.285V660.17c0 52.049-42.237 94.285-94.286 94.285H363.746c-52.05 0-94.286-42.236-94.286-94.285V94.285C269.46 42.236 311.697 0 363.746 0z m0 80.804a13.482 13.482 0 0 0-13.482 13.481V660.17c0 7.423 6.058 13.482 13.482 13.482h565.883c7.424 0 13.482-6.059 13.482-13.482V94.285a13.482 13.482 0 0 0-13.482-13.481H363.746z m309.905 754.54a40.445 40.445 0 1 1 80.803 0v94.37c0 52.05-42.236 94.286-94.285 94.286H94.285C42.236 1023.915 0 981.678 0 929.63V363.745c0-52.05 42.236-94.286 94.285-94.286h94.371a40.445 40.445 0 0 1 0 80.804h-94.37a13.482 13.482 0 0 0-13.482 13.482v565.883c0 7.424 6.058 13.482 13.481 13.482H660.17c7.423 0 13.482-6.058 13.482-13.482v-94.37z"  ></path></symbol><symbol id="icon-drag-old" viewBox="0 0 1024 1024"><path d="M358.4 204.8m-51.2 0a51.2 51.2 0 1 0 102.4 0 51.2 51.2 0 1 0-102.4 0Z"  ></path><path d="M665.6 204.8m-51.2 0a51.2 51.2 0 1 0 102.4 0 51.2 51.2 0 1 0-102.4 0Z"  ></path><path d="M665.6 409.6m-51.2 0a51.2 51.2 0 1 0 102.4 0 51.2 51.2 0 1 0-102.4 0Z"  ></path><path d="M358.4 614.4m-51.2 0a51.2 51.2 0 1 0 102.4 0 51.2 51.2 0 1 0-102.4 0Z"  ></path><path d="M358.4 819.2m-51.2 0a51.2 51.2 0 1 0 102.4 0 51.2 51.2 0 1 0-102.4 0Z"  ></path><path d="M665.6 819.2m-51.2 0a51.2 51.2 0 1 0 102.4 0 51.2 51.2 0 1 0-102.4 0Z"  ></path><path d="M358.4 409.6m-51.2 0a51.2 51.2 0 1 0 102.4 0 51.2 51.2 0 1 0-102.4 0Z"  ></path><path d="M665.6 614.4m-51.2 0a51.2 51.2 0 1 0 102.4 0 51.2 51.2 0 1 0-102.4 0Z"  ></path></symbol><symbol id="icon-disabled" viewBox="0 0 1024 1024"><path d="M752.384 412.1088h-55.6544V300.3904C696.7296 183.6544 608.512 102.4 501.76 102.4 395.0592 102.4 306.8928 183.6544 306.8928 300.3904V407.04H251.1872c-27.8016 0-46.3872 25.344-46.3872 50.7392v385.8432c0 30.464 23.1936 50.7904 46.3872 50.7904h501.248c27.8016 0 46.3872-25.3952 46.3872-50.7904V462.848c0-30.464-18.5856-50.7392-46.4384-50.7392z m-222.72 253.8496v86.272c0 5.12-4.6592 5.12-4.6592 5.12h-41.7792c-4.608 0-4.608-5.12-4.608-5.12v-86.272c-23.2448-10.1888-37.12-30.464-37.12-55.8592 0-35.5328 27.8016-66.048 60.3136-66.048 32.4608 0 60.3136 30.5152 60.3136 66.048 0 25.3952-13.9264 45.6704-32.4608 55.808z m92.7744-253.8496H381.1328V295.3216c0-60.928 55.7056-111.6672 120.6784-111.6672 64.9728 0 120.6272 50.7392 120.6272 111.6672v116.736z"  ></path></symbol><symbol id="icon-tip" viewBox="0 0 1024 1024"><path d="M512 19.017a492.983 492.983 0 1 1-0.073 986.039A492.983 492.983 0 0 1 512 19.09z m0 48.786a444.27 444.27 0 1 0 0.073 888.467A444.27 444.27 0 0 0 512 67.803z m22.016 317.367c37.45 3.877 55.15 33.792 48.64 66.707l-78.41 259.072c-1.023 5.924 2.049 11.849 7.315 13.677 5.852 2.048 17.92-5.412 27.648-16.091l47.104-56.613c1.244 9.509-0.878 26.185-0.878 32.549-35.328 53.028-71.314 93.988-131.876 93.988-41.326-6.729-58.222-36.352-49.298-66.56l77.897-257.828c1.901-6.364-1.244-13.02-7.022-15.068-5.778-2.048-17.042 5.413-26.77 16.092l-47.031 56.612c-1.317-9.508-0.146-25.234-0.146-31.597 35.328-53.029 93.403-94.94 132.827-94.94z m40.96-144.823c29.77 0 53.906 21.724 53.906 53.614 0 31.964-24.137 53.614-53.906 53.614a52.297 52.297 0 0 1-53.906-53.614c0-31.89 24.137-53.614 53.906-53.614z"  ></path></symbol><symbol id="icon-reset" viewBox="0 0 1024 1024"><path d="M482.464768 117.691733L364.363435 66.696533A49.288533 49.288533 0 0 0 325.314901 157.013333a417.9968 417.9968 0 0 0 53.8624 789.845334 49.288533 49.288533 0 0 0 25.668267-95.163734 319.624533 319.624533 0 0 1-29.559467-608.324266l-7.850666 18.158933a49.152 49.152 0 0 0 26.0096 64.580267 49.288533 49.288533 0 0 0 64.580266-24.9856l50.107734-118.9888a49.425067 49.425067 0 0 0-25.668267-64.512z m429.602133 421.410134A418.884267 418.884267 0 0 0 614.424235 126.839467a49.288533 49.288533 0 1 0-28.398934 94.344533 319.829333 319.829333 0 0 1 56.9344 589.824 49.152 49.152 0 0 0-86.152533-47.240533l-67.106133 109.431466a48.9472 48.9472 0 0 0 16.110933 67.925334l109.294933 67.9936a49.288533 49.288533 0 1 0 50.9952-83.7632l-15.018666-9.352534a418.679467 418.679467 0 0 0 261.051733-376.900266z"  ></path></symbol><symbol id="icon-view" viewBox="0 0 1024 1024"><path d="M801.606 104.727a117.667 117.667 0 0 1 117.434 109.94l0.233 7.727v246.598a34.91 34.91 0 0 1-69.493 4.748l-0.325-4.748V222.394c0-24.669-18.619-44.963-42.636-47.57l-5.213-0.279H222.394c-24.669 0-44.963 18.619-47.57 42.636l-0.279 5.213v579.212c0 24.669 18.619 44.963 42.636 47.57l5.213 0.279h243.247a34.91 34.91 0 0 1 4.747 69.492l-4.747 0.326H222.394a117.667 117.667 0 0 1-117.434-109.94l-0.233-7.727V222.394a117.667 117.667 0 0 1 109.94-117.434l7.727-0.233h579.212zM448.559 585.728a34.91 34.91 0 1 1 0 69.818H332.195a34.91 34.91 0 1 1 0-69.818h116.364z m232.727-232.727a34.91 34.91 0 1 1 0 69.818H332.195a34.91 34.91 0 1 1 0-69.818h349.09z"  ></path><path d="M699.764 490.356a186.182 186.182 0 1 1 0 372.364 186.182 186.182 0 0 1 0-372.364z m0 69.819a116.364 116.364 0 1 0 0 232.727 116.364 116.364 0 0 0 0-232.727z"  ></path><path d="M798.673 769.35a34.91 34.91 0 0 1 49.339 0l82.292 82.246a34.91 34.91 0 1 1-49.338 49.384l-82.293-82.292a34.91 34.91 0 0 1 0-49.338z"  ></path></symbol><symbol id="icon-search" viewBox="0 0 1024 1024"><path d="M801.606 104.727a117.667 117.667 0 0 1 117.434 109.94l0.233 7.727v246.598a34.91 34.91 0 0 1-69.493 4.748l-0.325-4.748V222.394c0-24.669-18.619-44.963-42.636-47.57l-5.213-0.279H222.394c-24.669 0-44.963 18.619-47.57 42.636l-0.279 5.213v579.212c0 24.669 18.619 44.963 42.636 47.57l5.213 0.279h243.247a34.91 34.91 0 0 1 4.747 69.492l-4.747 0.326H222.394a117.667 117.667 0 0 1-117.434-109.94l-0.233-7.727V222.394a117.667 117.667 0 0 1 109.94-117.434l7.727-0.233h579.212zM448.559 585.728a34.91 34.91 0 1 1 0 69.818H332.195a34.91 34.91 0 1 1 0-69.818h116.364z m232.727-232.727a34.91 34.91 0 1 1 0 69.818H332.195a34.91 34.91 0 1 1 0-69.818h349.09z"  ></path><path d="M699.764 490.356a186.182 186.182 0 1 1 0 372.364 186.182 186.182 0 0 1 0-372.364z m0 69.819a116.364 116.364 0 1 0 0 232.727 116.364 116.364 0 0 0 0-232.727z"  ></path><path d="M798.673 769.35a34.91 34.91 0 0 1 49.339 0l82.292 82.246a34.91 34.91 0 1 1-49.338 49.384l-82.293-82.292a34.91 34.91 0 0 1 0-49.338z"  ></path></symbol></svg>', function (o) {
+  var t = (t = document.getElementsByTagName('script'))[t.length - 1],
+    a = t.getAttribute('data-injectcss'),
+    t = t.getAttribute('data-disable-injectsvg');
+  if (!t) {
+    var e,
+      _l,
+      h,
+      i,
+      c,
+      d = function d(t, a) {
+        a.parentNode.insertBefore(t, a);
+      };
+    if (a && !o.__iconfont__svg__cssinject__) {
+      o.__iconfont__svg__cssinject__ = !0;
+      try {
+        document.write('<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>');
+      } catch (t) {
+        console && console.log(t);
+      }
+    }
+    e = function e() {
+      var t,
+        a = document.createElement('div');
+      a.innerHTML = o._iconfont_svg_string_4063056, (a = a.getElementsByTagName('svg')[0]) && (a.setAttribute('aria-hidden', 'true'), a.style.position = 'absolute', a.style.width = 0, a.style.height = 0, a.style.overflow = 'hidden', a = a, (t = document.body).firstChild ? d(a, t.firstChild) : t.appendChild(a));
+    }, document.addEventListener ? ~['complete', 'loaded', 'interactive'].indexOf(document.readyState) ? setTimeout(e, 0) : (_l = function l() {
+      document.removeEventListener('DOMContentLoaded', _l, !1), e();
+    }, document.addEventListener('DOMContentLoaded', _l, !1)) : document.attachEvent && (h = e, i = o.document, c = !1, n(), i.onreadystatechange = function () {
+      'complete' == i.readyState && (i.onreadystatechange = null, m());
+    });
+  }
+  function m() {
+    c || (c = !0, h());
+  }
+  function n() {
+    try {
+      i.documentElement.doScroll('left');
+    } catch (t) {
+      return void setTimeout(n, 50);
+    }
+    m();
+  }
+}(window);

package/es/ProTree/components/ProTree.js

@@ -25,7 +25,7 @@ import { ReactSVG } from 'react-svg';
 import { useProConfig } from '../../ProConfigProvider';
 import { TreeView } from './index';
 import locale from '../../locale';
-import { getDefaultExpandKeys, getFlatTreeData, getChildrenKeys, findTreeNodeByKey, getAllKeys } from '../utils';
+import { getFlatTreeData, getChildrenKeys, findTreeNodeByKey, getAllKeys } from '../utils';
 import searchSVG from '../../assets/input-search.svg';
 import '../style/index.less';
 var ProTree = function ProTree(props) {
@@ -88,11 +88,18 @@ var ProTree = function ProTree(props) {
       checkAll: false,
       allKeys: [],
       clickShowLoading: false,
-      innerExpandKeys: []
+      innerExpandKeys: undefined // 将传入德默认展开德节点传入内部state德innerExpandKeys上面，后续由innerExpandKeys控制展开节点
     }),
     _useSetState2 = _slicedToArray(_useSetState, 2),
     state = _useSetState2[0],
     setState = _useSetState2[1];
+  useEffect(function () {
+    if (expandedKeys) {
+      setState({
+        innerExpandKeys: expandedKeys
+      });
+    }
+  }, [expandedKeys]);
   var fetchFunction = useRequestFunc(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, _objectSpread({
     manual: true,
     onSuccess: function onSuccess(res) {
@@ -104,8 +111,8 @@ var ProTree = function ProTree(props) {
           treeData: responseData,
           originalTreeData: responseData,
           flatTreeData: flatTrees,
-          allKeys: allKey,
-          innerExpandKeys: (props === null || props === void 0 ? void 0 : props.expandedKeys) ? props === null || props === void 0 ? void 0 : props.expandedKeys : getDefaultExpandKeys(defaultExpandAll, allKey)
+          allKeys: allKey
+          // innerExpandKeys: props?.expandedKeys ? props?.expandedKeys : getDefaultExpandKeys(defaultExpandAll, allKey),
         });
       } else {
         var _res$status = res.status,
@@ -122,8 +129,8 @@ var ProTree = function ProTree(props) {
           treeData: data,
           originalTreeData: data,
           flatTreeData: _flatTrees,
-          allKeys: _allKey,
-          innerExpandKeys: (props === null || props === void 0 ? void 0 : props.expandedKeys) ? props === null || props === void 0 ? void 0 : props.expandedKeys : getDefaultExpandKeys(defaultExpandAll, _allKey)
+          allKeys: _allKey
+          // innerExpandKeys: props?.expandedKeys ? props?.expandedKeys : getDefaultExpandKeys(defaultExpandAll, allKey),
         });
       }
     },
@@ -136,8 +143,8 @@ var ProTree = function ProTree(props) {
         treeData: dataSource,
         originalTreeData: cloneDeep(dataSource),
         flatTreeData: getFlatTreeData(dataSource, fieldNames),
-        allKeys: allKey,
-        innerExpandKeys: (props === null || props === void 0 ? void 0 : props.expandedKeys) ? props === null || props === void 0 ? void 0 : props.expandedKeys : getDefaultExpandKeys(defaultExpandAll, allKey)
+        allKeys: allKey
+        // innerExpandKeys: props?.expandedKeys ? props?.expandedKeys : getDefaultExpandKeys(defaultExpandAll, allKey),
       });
     } else if (enumCode) {
       var dictEnum = dics[enumCode] || [];
@@ -155,8 +162,8 @@ var ProTree = function ProTree(props) {
         treeData: dictEnum,
         originalTreeData: cloneDeep(dictEnum),
         flatTreeData: getFlatTreeData(dictEnum, fieldNames),
-        allKeys: getAllKeys(dictEnum, fieldNames),
-        innerExpandKeys: (props === null || props === void 0 ? void 0 : props.expandedKeys) ? props === null || props === void 0 ? void 0 : props.expandedKeys : getDefaultExpandKeys(defaultExpandAll, _allKey2)
+        allKeys: getAllKeys(dictEnum, fieldNames)
+        // innerExpandKeys: props?.expandedKeys ? props?.expandedKeys : getDefaultExpandKeys(defaultExpandAll, allKey),
       });
     }
   }, [dataSource, enumCode]);
@@ -455,6 +462,7 @@ var ProTree = function ProTree(props) {
             originalTreeData: state.originalTreeData,
             flatTreeData: state.flatTreeData,
             checkedValues: state.checkedValues,
+            defaultExpandAll: defaultExpandAll,
             innerExpandKeys: state === null || state === void 0 ? void 0 : state.innerExpandKeys,
             optionRender: optionRender,
             searchStr: state.searchStr,