@zat-design/sisyphus-react 3.2.2-beta.13 → 3.2.2-beta.14

package/es/ProDownload/utils.js

@@ -4,8 +4,6 @@ import _message from "antd/es/message";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-/* eslint-disable no-empty */
-/* eslint-disable prefer-promise-reject-errors */
 import { isFunction, get } from 'lodash';
 import locale from '../locale';
 var stringify = function stringify(data) {

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

@@ -66,8 +66,7 @@ var RenderFields = function RenderFields(props) {
       formItemChildProps = _column$formItemChild === void 0 ? {} : _column$formItemChild,
       _column$fieldProps = column.fieldProps,
       fieldProps = _column$fieldProps === void 0 ? {} : _column$fieldProps,
-      _column$disabled = column.disabled,
-      disabled = _column$disabled === void 0 ? false : _column$disabled,
+      disabled = column.disabled,
       equalWith = column.equalWith,
       _column$clearNotShow = column.clearNotShow,
       clearNotShow = _column$clearNotShow === void 0 ? outerClearNotShow : _column$clearNotShow,

package/es/ProTree/components/ProTree.js

@@ -12,7 +12,7 @@ import _message from "antd/es/message";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["value", "onChange", "dataSource", "mode", "code", "useRequest", "allValue", "showCodeName", "checkStrictly", "tags", "placeholder", "labelInValue", "fieldNames", "disabled", "isView", "transformResponse", "optionRender", "onSelect", "loading", "style", "className", "showSearch", "title", "footer", "expandedKeys", "showExpand", "selectKey"];
+var _excluded = ["value", "onChange", "dataSource", "mode", "code", "useRequest", "allValue", "showCodeName", "checkStrictly", "tags", "placeholder", "labelInValue", "fieldNames", "disabled", "isView", "transformResponse", "optionRender", "onSelect", "loading", "style", "className", "showSearch", "title", "footer", "expandedKeys", "showExpand", "defaultExpandAll"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect } from 'react';
 import classNames from 'classnames';
@@ -23,7 +23,7 @@ import { ReactSVG } from 'react-svg';
 import { useProConfig } from '../../ProConfigProvider';
 import { TreeView } from './index';
 import locale from '../../locale';
-import { getFlatTreeData, getChildrenKeys, findTreeNodeByKey, getAllKeys } from '../utils';
+import { getDefaultExpandKeys, getFlatTreeData, getChildrenKeys, findTreeNodeByKey, getAllKeys } from '../utils';
 import searchSVG from '../../assets/input-search.svg';
 import '../style/index.less';
 var ProTree = function ProTree(props) {
@@ -71,7 +71,7 @@ var ProTree = function ProTree(props) {
     expandedKeys = props.expandedKeys,
     _props$showExpand = props.showExpand,
     showExpand = _props$showExpand === void 0 ? false : _props$showExpand,
-    selectKey = props.selectKey,
+    defaultExpandAll = props.defaultExpandAll,
     other = _objectWithoutProperties(props, _excluded);
   var fieldNameLabel = fieldNames.label;
   var fieldNameValue = fieldNames.value;
@@ -86,7 +86,7 @@ var ProTree = function ProTree(props) {
       checkAll: false,
       allKeys: [],
       clickShowLoading: false,
-      innerExpandKeys: props === null || props === void 0 ? void 0 : props.expandedKeys
+      innerExpandKeys: []
     }),
     _useSetState2 = _slicedToArray(_useSetState, 2),
     state = _useSetState2[0],
@@ -96,11 +96,14 @@ var ProTree = function ProTree(props) {
     onSuccess: function onSuccess(res) {
       if (transformResponse && typeof transformResponse === 'function') {
         var responseData = transformResponse(res);
+        var flatTrees = getFlatTreeData(responseData, fieldNames);
+        var allKey = getAllKeys(responseData, fieldNames);
         setState({
           treeData: responseData,
           originalTreeData: responseData,
-          flatTreeData: getFlatTreeData(responseData, fieldNames),
-          allKeys: getAllKeys(responseData, fieldNames)
+          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)
         });
       } else {
         var _res$status = res.status,
@@ -111,11 +114,14 @@ var ProTree = function ProTree(props) {
           _message.error(msg);
           return;
         }
+        var _flatTrees = getFlatTreeData(data, fieldNames);
+        var _allKey = getAllKeys(data, fieldNames);
         setState({
           treeData: data,
           originalTreeData: data,
-          flatTreeData: getFlatTreeData(data, fieldNames),
-          allKeys: getAllKeys(data, fieldNames)
+          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)
         });
       }
     },
@@ -123,11 +129,13 @@ var ProTree = function ProTree(props) {
   }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options));
   useDeepCompareEffect(function () {
     if (dataSource && dataSource.length) {
+      var allKey = getAllKeys(dataSource, fieldNames);
       setState({
         treeData: dataSource,
         originalTreeData: cloneDeep(dataSource),
         flatTreeData: getFlatTreeData(dataSource, fieldNames),
-        allKeys: getAllKeys(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)
       });
     } else if (enumCode) {
       var dictEnum = dics[enumCode] || [];
@@ -140,11 +148,13 @@ var ProTree = function ProTree(props) {
         console.error('请返回有效的数组');
         dictEnum = [];
       }
+      var _allKey2 = getAllKeys(dictEnum, fieldNames);
       setState({
         treeData: dictEnum,
         originalTreeData: cloneDeep(dictEnum),
         flatTreeData: getFlatTreeData(dictEnum, fieldNames),
-        allKeys: getAllKeys(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)
       });
     }
   }, [dataSource, enumCode]);
@@ -204,7 +214,7 @@ var ProTree = function ProTree(props) {
               return item[fieldNameValue];
             });
           } else {
-            // 单选值场景为string走到这里
+            // 复选，单纯value数组场景
             checkedValues = _innerVal;
           }
         }
@@ -215,6 +225,11 @@ var ProTree = function ProTree(props) {
           // treeViewData,
         });
       }
+    } else if (!(other === null || other === void 0 ? void 0 : other.checkable)) {
+      // 单选--场景-->如果表单的value没有值，那么配置的selectedKey就起作用了，选中树节点
+      setState({
+        checkedValues: props === null || props === void 0 ? void 0 : props.selectedKey
+      });
     }
   }, [value, state.allKeys]);
   /**
@@ -240,6 +255,7 @@ var ProTree = function ProTree(props) {
       onChange && onChange(values);
     }
   };
+  // 该方法只有复选框，在勾中checkbox后才会走到这个方法
   var onCheck = function onCheck(checkedKeys, info) {
     if (disabled || isView) {
       return null;

package/es/ProTree/components/Tree.js

@@ -95,8 +95,8 @@ function List(props) {
     }
   }, [checkedValues]);
   useEffect(function () {
+    // 复选树，配置的selectedKey在这里处理选中，单选树，在ProTree组件里跟value比优先级处理，到这个组件里面是checkedValues了
     if (checkable) {
-      // 复选树，selectedKey，选中那个树节点
       setState({
         currentClickTreeNode: selectedKey
       });

package/es/ProTree/propsType.d.ts

@@ -118,8 +118,8 @@ export interface ProTreeProps extends PropTreeSelectProps {
     prefixCls?: string;
     children?: any;
     blockNode?: boolean;
-    /** 复选模式下，点中的树节点key */
-    selectKey?: string | number | undefined;
+    /** 点中的树节点key,表单模式下value有值该配置优先级降低 */
+    selectedKey?: string | number | undefined;
 }
 export interface DataProps {
     label?: string;

package/es/ProTree/utils.d.ts

@@ -35,3 +35,9 @@ export declare function filterCheckedNodes(data: any, checkedKeys: any, searchSt
  * @returns
  */
 export declare function getChildrenKeys(node: TreeDataProps, childrenKeys: string[], fieldNames: FieldNamesType, type: 'treeClose' | 'treeCheck'): void;
+/**
+ * 如果默认全开展那么返回所有key，否则返回空[]
+ * @param isExpand 是否全展开
+ * @param allkeys 所有key
+ */
+export declare function getDefaultExpandKeys(isExpand: any, allKeys: any): any;

package/es/ProTree/utils.js

@@ -180,4 +180,15 @@ export function getChildrenKeys(node, childrenKeys, fieldNames, type) {
       }
     });
   }
+}
+/**
+ * 如果默认全开展那么返回所有key，否则返回空[]
+ * @param isExpand 是否全展开
+ * @param allkeys 所有key
+ */
+export function getDefaultExpandKeys(isExpand, allKeys) {
+  if (isExpand) {
+    return allKeys;
+  }
+  return [];
 }

package/es/ProTreeSelect/index.js

@@ -8,7 +8,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/tree-select/style";
 import _TreeSelect from "antd/es/tree-select";
-var _excluded = ["disabled", "code", "dataSource", "defaultDisableValue", "onChange", "useRequest", "transformResponse", "fieldNames", "tooltip", "showSearch", "filterTreeNode", "treeNodeFilterProp", "treeDefaultExpandAll", "treeCheckable", "onSearch", "otherProps", "width", "dropdownStyle", "popupClassName", "style", "allowClear", "listHeight", "showCodeName", "className"],
+var _excluded = ["disabled", "code", "dataSource", "defaultDisableValue", "onChange", "useRequest", "transformResponse", "fieldNames", "tooltip", "showSearch", "filterTreeNode", "treeNodeFilterProp", "defaultExpandAll", "expandedKeys", "treeCheckable", "onSearch", "otherProps", "width", "dropdownStyle", "popupClassName", "style", "allowClear", "listHeight", "showCodeName", "className"],
   _excluded2 = ["children"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useDeepCompareEffect, useRequest as useRequestFunc, useSetState } from 'ahooks';
@@ -49,8 +49,9 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     filterTreeNode = props.filterTreeNode,
     _props$treeNodeFilter = props.treeNodeFilterProp,
     treeNodeFilterProp = _props$treeNodeFilter === void 0 ? 'label' : _props$treeNodeFilter,
-    _props$treeDefaultExp = props.treeDefaultExpandAll,
-    treeDefaultExpandAll = _props$treeDefaultExp === void 0 ? true : _props$treeDefaultExp,
+    _props$defaultExpandA = props.defaultExpandAll,
+    defaultExpandAll = _props$defaultExpandA === void 0 ? true : _props$defaultExpandA,
+    expandedKeys = props.expandedKeys,
     _props$treeCheckable = props.treeCheckable,
     treeCheckable = _props$treeCheckable === void 0 ? true : _props$treeCheckable,
     _onSearch = props.onSearch,
@@ -475,7 +476,8 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     disabled: disabled,
     showSearch: showSearch,
     // filterTreeNode: filterTreeNodeEvent,
-    treeDefaultExpandAll: treeDefaultExpandAll,
+    treeDefaultExpandAll: defaultExpandAll,
+    treeExpandedKeys: expandedKeys,
     treeCheckable: treeCheckable,
     showCheckedStrategy: SHOW_PARENT,
     value: value,

package/es/ProTreeSelect/propsType.d.ts

@@ -69,6 +69,8 @@ export interface PropTreeSelectProps extends Omit<TreeSelectProps, 'onSearch'> {
         service: Service<any, any>;
         options?: Options<any, any>;
     };
+    defaultExpandAll?: boolean;
+    expandedKeys?: any[];
 }
 export interface ProSelectAction {
     /** 获取发生请求的 useRequest 的 ref */

package/lib/ProEditTable/components/RenderField/index.js

@@ -30,8 +30,6 @@ var _useRules = _interopRequireDefault(require("../../../ProForm/utils/useRules"
 var _utils = require("../../../ProForm/utils");
 var _locale = _interopRequireDefault(require("../../../locale"));
 var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className"];
-/* eslint-disable prefer-destructuring */
-/* eslint-disable prefer-const */
 var RenderField = function RenderField(_ref) {
   var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _formItemChildProps$p, _TargetComponent4, _classNames;
   var value = _ref.text,

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

@@ -14,7 +14,7 @@ var _moment = _interopRequireDefault(require("moment"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var _Container = _interopRequireDefault(require("../../Container"));
-var _excluded = ["format", "otherProps", "separator"]; // @ts-check
+var _excluded = ["format", "otherProps", "separator"];
 var AntRangePicker = _antd.DatePicker.RangePicker;
 var RangePicker = function RangePicker(props) {
   var _props$format = props.format,

package/lib/ProForm/components/old/InputRange/index.js

@@ -13,6 +13,7 @@ var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 /* eslint-disable @typescript-eslint/no-shadow */
 /* eslint-disable no-param-reassign */
+
 var positiveInteger = {
   formatter: function formatter(value) {
     return value.replace(/[^0-9]/g, '');

package/lib/ProForm/components/old/ProCertValidity/index.js

@@ -11,7 +11,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _moment = _interopRequireDefault(require("moment"));
 var _react = require("react");
-var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer", "showForever", "proformmode"]; // @ts-nocheck
+var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer", "showForever", "proformmode"];
 var RangePicker = _antd.DatePicker.RangePicker;
 var defaultFormatDate = 'YYYY-MM-DD';
 var defaultPopupContainer = function defaultPopupContainer(triggerNode) {

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

@@ -28,7 +28,6 @@ var _useChanged3 = require("../../utils/useChanged");
 var _tip = _interopRequireDefault(require("../../../assets/tip.svg"));
 var _useRules = _interopRequireDefault(require("../../utils/useRules"));
 var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip"];
-/* eslint-disable prefer-destructuring */
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
   var _classNames, _otherProps$names2;

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

@@ -74,8 +74,7 @@ var RenderFields = function RenderFields(props) {
       formItemChildProps = _column$formItemChild === void 0 ? {} : _column$formItemChild,
       _column$fieldProps = column.fieldProps,
       fieldProps = _column$fieldProps === void 0 ? {} : _column$fieldProps,
-      _column$disabled = column.disabled,
-      disabled = _column$disabled === void 0 ? false : _column$disabled,
+      disabled = column.disabled,
       equalWith = column.equalWith,
       _column$clearNotShow = column.clearNotShow,
       clearNotShow = _column$clearNotShow === void 0 ? outerClearNotShow : _column$clearNotShow,

package/lib/ProTable/components/TableResizable/index.js

@@ -15,14 +15,6 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _index = require("../../index");
 var _utils = require("../../utils");
 var _excluded = ["onDrag", "width", "minwidth"];
-/*
- * @Author: chongyang wanchongyang@zhongan.io
- * @Date: 2023-02-23 17:47:46
- * @LastEditors: chongyang wanchongyang@zhongan.io
- * @LastEditTime: 2023-03-07 20:18:22
- * @FilePath: /za-material-warehouse/src/ProTable/TableResizable.tsx
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
 var ResizableTitle = function ResizableTitle(props) {
   var _restProps$className;
   var onDrag = props.onDrag,

package/lib/ProTabs/index.js

@@ -17,7 +17,6 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _lodash = require("lodash");
 var _components = require("./components");
 var _excluded = ["style", "className", "dataSource", "onChange", "transformResponse", "useRequest", "tabSearch", "mode"];
-/* eslint-disable @typescript-eslint/consistent-type-assertions */
 var ProTabs = function ProTabs(props, ref) {
   var style = props.style,
     className = props.className,

package/lib/ProThemeTools/index.js

@@ -18,7 +18,6 @@ var _index = require("./utils/index");
 var _component = require("./component");
 var _locale = _interopRequireDefault(require("../locale"));
 var _excluded = ["size", "className", "cacheTime", "color", "mode", "iconFollowTheme", "prefixCls", "tableBorder", "tableStripe", "theme"];
-/* eslint-disable prefer-const */
 var defaultCacheTime = 1; // 配置保存时间为一天
 var defaultThemeConfig = {
   zauiBrand: '#006AFF',

package/lib/ProTree/components/ProTree.js

@@ -25,7 +25,7 @@ var _locale = _interopRequireDefault(require("../../locale"));
 var _utils = require("../utils");
 var _inputSearch = _interopRequireDefault(require("../../assets/input-search.svg"));
 require("../style/index.less");
-var _excluded = ["value", "onChange", "dataSource", "mode", "code", "useRequest", "allValue", "showCodeName", "checkStrictly", "tags", "placeholder", "labelInValue", "fieldNames", "disabled", "isView", "transformResponse", "optionRender", "onSelect", "loading", "style", "className", "showSearch", "title", "footer", "expandedKeys", "showExpand", "selectKey"];
+var _excluded = ["value", "onChange", "dataSource", "mode", "code", "useRequest", "allValue", "showCodeName", "checkStrictly", "tags", "placeholder", "labelInValue", "fieldNames", "disabled", "isView", "transformResponse", "optionRender", "onSelect", "loading", "style", "className", "showSearch", "title", "footer", "expandedKeys", "showExpand", "defaultExpandAll"];
 var ProTree = function ProTree(props) {
   var _props$otherProps, _props$otherProps2, _locale$ProTree, _state$innerExpandKey2, _state$innerExpandKey3, _locale$ProTree2, _locale$ProTree3, _locale$ProTree4;
   var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProEnum'),
@@ -71,7 +71,7 @@ var ProTree = function ProTree(props) {
     expandedKeys = props.expandedKeys,
     _props$showExpand = props.showExpand,
     showExpand = _props$showExpand === void 0 ? false : _props$showExpand,
-    selectKey = props.selectKey,
+    defaultExpandAll = props.defaultExpandAll,
     other = (0, _objectWithoutProperties2.default)(props, _excluded);
   var fieldNameLabel = fieldNames.label;
   var fieldNameValue = fieldNames.value;
@@ -86,7 +86,7 @@ var ProTree = function ProTree(props) {
       checkAll: false,
       allKeys: [],
       clickShowLoading: false,
-      innerExpandKeys: props === null || props === void 0 ? void 0 : props.expandedKeys
+      innerExpandKeys: []
     }),
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
     state = _useSetState2[0],
@@ -96,11 +96,14 @@ var ProTree = function ProTree(props) {
     onSuccess: function onSuccess(res) {
       if (transformResponse && typeof transformResponse === 'function') {
         var responseData = transformResponse(res);
+        var flatTrees = (0, _utils.getFlatTreeData)(responseData, fieldNames);
+        var allKey = (0, _utils.getAllKeys)(responseData, fieldNames);
         setState({
           treeData: responseData,
           originalTreeData: responseData,
-          flatTreeData: (0, _utils.getFlatTreeData)(responseData, fieldNames),
-          allKeys: (0, _utils.getAllKeys)(responseData, fieldNames)
+          flatTreeData: flatTrees,
+          allKeys: allKey,
+          innerExpandKeys: (props === null || props === void 0 ? void 0 : props.expandedKeys) ? props === null || props === void 0 ? void 0 : props.expandedKeys : (0, _utils.getDefaultExpandKeys)(defaultExpandAll, allKey)
         });
       } else {
         var _res$status = res.status,
@@ -111,11 +114,14 @@ var ProTree = function ProTree(props) {
           _antd.message.error(msg);
           return;
         }
+        var _flatTrees = (0, _utils.getFlatTreeData)(data, fieldNames);
+        var _allKey = (0, _utils.getAllKeys)(data, fieldNames);
         setState({
           treeData: data,
           originalTreeData: data,
-          flatTreeData: (0, _utils.getFlatTreeData)(data, fieldNames),
-          allKeys: (0, _utils.getAllKeys)(data, fieldNames)
+          flatTreeData: _flatTrees,
+          allKeys: _allKey,
+          innerExpandKeys: (props === null || props === void 0 ? void 0 : props.expandedKeys) ? props === null || props === void 0 ? void 0 : props.expandedKeys : (0, _utils.getDefaultExpandKeys)(defaultExpandAll, _allKey)
         });
       }
     },
@@ -123,11 +129,13 @@ var ProTree = function ProTree(props) {
   }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options));
   (0, _ahooks.useDeepCompareEffect)(function () {
     if (dataSource && dataSource.length) {
+      var allKey = (0, _utils.getAllKeys)(dataSource, fieldNames);
       setState({
         treeData: dataSource,
         originalTreeData: (0, _lodash.cloneDeep)(dataSource),
         flatTreeData: (0, _utils.getFlatTreeData)(dataSource, fieldNames),
-        allKeys: (0, _utils.getAllKeys)(dataSource, fieldNames)
+        allKeys: allKey,
+        innerExpandKeys: (props === null || props === void 0 ? void 0 : props.expandedKeys) ? props === null || props === void 0 ? void 0 : props.expandedKeys : (0, _utils.getDefaultExpandKeys)(defaultExpandAll, allKey)
       });
     } else if (enumCode) {
       var dictEnum = dics[enumCode] || [];
@@ -140,11 +148,13 @@ var ProTree = function ProTree(props) {
         console.error('请返回有效的数组');
         dictEnum = [];
       }
+      var _allKey2 = (0, _utils.getAllKeys)(dictEnum, fieldNames);
       setState({
         treeData: dictEnum,
         originalTreeData: (0, _lodash.cloneDeep)(dictEnum),
         flatTreeData: (0, _utils.getFlatTreeData)(dictEnum, fieldNames),
-        allKeys: (0, _utils.getAllKeys)(dictEnum, fieldNames)
+        allKeys: (0, _utils.getAllKeys)(dictEnum, fieldNames),
+        innerExpandKeys: (props === null || props === void 0 ? void 0 : props.expandedKeys) ? props === null || props === void 0 ? void 0 : props.expandedKeys : (0, _utils.getDefaultExpandKeys)(defaultExpandAll, _allKey2)
       });
     }
   }, [dataSource, enumCode]);
@@ -204,7 +214,7 @@ var ProTree = function ProTree(props) {
               return item[fieldNameValue];
             });
           } else {
-            // 单选值场景为string走到这里
+            // 复选，单纯value数组场景
             checkedValues = _innerVal;
           }
         }
@@ -215,6 +225,11 @@ var ProTree = function ProTree(props) {
           // treeViewData,
         });
       }
+    } else if (!(other === null || other === void 0 ? void 0 : other.checkable)) {
+      // 单选--场景-->如果表单的value没有值，那么配置的selectedKey就起作用了，选中树节点
+      setState({
+        checkedValues: props === null || props === void 0 ? void 0 : props.selectedKey
+      });
     }
   }, [value, state.allKeys]);
   /**
@@ -240,6 +255,7 @@ var ProTree = function ProTree(props) {
       onChange && onChange(values);
     }
   };
+  // 该方法只有复选框，在勾中checkbox后才会走到这个方法
   var onCheck = function onCheck(checkedKeys, info) {
     if (disabled || isView) {
       return null;

package/lib/ProTree/components/Tree.js

@@ -18,13 +18,6 @@ var _SearchTitle = _interopRequireDefault(require("./SearchTitle"));
 var _utils = require("../utils");
 var _locale = _interopRequireDefault(require("../../locale"));
 var _excluded = ["checkedValues", "disabled", "searchStr", "originalTreeData", "showCodeName", "checkStrictly", "flatTreeData", "mode", "fieldNames", "tags", "onCheck", "optionRender", "treeData", "showLine", "switcherIcon", "checkable", "menu", "innerExpandKeys", "selectedKey", "disabledMode"];
-/*
- *@Date: 2023-07-25 13:49:35
- *@LastEditTime: 2023-07-25 13:49:35
- *@Author: liudongliang
- *@Description: 树每行节点渲染组件，复选时阻止点击事件冒泡，只有点击树节点文本会向上触发onSelect事件
-*/
-/* eslint-disable no-plusplus */
 var tagsBgColors = ['rgba(0, 106, 255,0.16)', 'rgba(0, 196, 74,0.16)', 'rgba(255, 140, 0,0.16)', 'rgba(255, 80, 80,0.16)', 'rgba(97, 97, 97, 0.16)'];
 var tagsColors = ['#006AFF', '#00C44A', '#FF8C00', '#FF5050', '#616161'];
 function List(props) {
@@ -100,8 +93,8 @@ function List(props) {
     }
   }, [checkedValues]);
   (0, _react.useEffect)(function () {
+    // 复选树，配置的selectedKey在这里处理选中，单选树，在ProTree组件里跟value比优先级处理，到这个组件里面是checkedValues了
     if (checkable) {
-      // 复选树，selectedKey，选中那个树节点
       setState({
         currentClickTreeNode: selectedKey
       });

package/lib/ProTree/index.js

@@ -16,6 +16,7 @@ var _ProTreeSelect = _interopRequireDefault(require("../ProTreeSelect"));
  *@Author: liudongliang
  *@Description: ProTree组件，集成了tree和treeSelect
 */
+
 var ProTreeHandle = function ProTreeHandle(props) {
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'tree' : _props$mode;

package/lib/ProTree/propsType.d.ts

@@ -118,8 +118,8 @@ export interface ProTreeProps extends PropTreeSelectProps {
     prefixCls?: string;
     children?: any;
     blockNode?: boolean;
-    /** 复选模式下，点中的树节点key */
-    selectKey?: string | number | undefined;
+    /** 点中的树节点key,表单模式下value有值该配置优先级降低 */
+    selectedKey?: string | number | undefined;
 }
 export interface DataProps {
     label?: string;

package/lib/ProTree/utils.d.ts

@@ -35,3 +35,9 @@ export declare function filterCheckedNodes(data: any, checkedKeys: any, searchSt
  * @returns
  */
 export declare function getChildrenKeys(node: TreeDataProps, childrenKeys: string[], fieldNames: FieldNamesType, type: 'treeClose' | 'treeCheck'): void;
+/**
+ * 如果默认全开展那么返回所有key，否则返回空[]
+ * @param isExpand 是否全展开
+ * @param allkeys 所有key
+ */
+export declare function getDefaultExpandKeys(isExpand: any, allKeys: any): any;

package/lib/ProTree/utils.js

@@ -8,6 +8,7 @@ exports.filterCheckedNodes = filterCheckedNodes;
 exports.findTreeNodeByKey = findTreeNodeByKey;
 exports.getAllKeys = getAllKeys;
 exports.getChildrenKeys = getChildrenKeys;
+exports.getDefaultExpandKeys = getDefaultExpandKeys;
 exports.getFlatTreeData = getFlatTreeData;
 exports.getParentKey = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -192,4 +193,15 @@ function getChildrenKeys(node, childrenKeys, fieldNames, type) {
       }
     });
   }
+}
+/**
+ * 如果默认全开展那么返回所有key，否则返回空[]
+ * @param isExpand 是否全展开
+ * @param allkeys 所有key
+ */
+function getDefaultExpandKeys(isExpand, allKeys) {
+  if (isExpand) {
+    return allKeys;
+  }
+  return [];
 }

package/lib/ProTreeModal/components/Tree.js

@@ -16,7 +16,6 @@ var _SearchTitle = _interopRequireDefault(require("./SearchTitle"));
 var _CloseIcon = _interopRequireDefault(require("./CloseIcon"));
 var _utils = require("../utils");
 var _excluded = ["checkedValues", "disabled", "treeData", "searchStr", "originalTreeData", "showCodeName", "checkStrictly", "flatTreeData", "mode", "fieldNames", "tags", "onCheck", "handleFilterClose", "optionRender"];
-/* eslint-disable no-plusplus */
 var tagsBgColors = ['rgba(0, 106, 255,0.16)', 'rgba(0, 196, 74,0.16)', 'rgba(255, 140, 0,0.16)', 'rgba(255, 80, 80,0.16)', 'rgba(97, 97, 97, 0.16)'];
 var tagsColors = ['#006AFF', '#00C44A', '#FF8C00', '#FF5050', '#616161'];
 function List(props, ref) {

package/lib/ProTreeSelect/index.js

@@ -17,7 +17,7 @@ var _react = require("react");
 var _lodash = require("lodash");
 var _ProConfigProvider = require("../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../ProForm/components/Container"));
-var _excluded = ["disabled", "code", "dataSource", "defaultDisableValue", "onChange", "useRequest", "transformResponse", "fieldNames", "tooltip", "showSearch", "filterTreeNode", "treeNodeFilterProp", "treeDefaultExpandAll", "treeCheckable", "onSearch", "otherProps", "width", "dropdownStyle", "popupClassName", "style", "allowClear", "listHeight", "showCodeName", "className"],
+var _excluded = ["disabled", "code", "dataSource", "defaultDisableValue", "onChange", "useRequest", "transformResponse", "fieldNames", "tooltip", "showSearch", "filterTreeNode", "treeNodeFilterProp", "defaultExpandAll", "expandedKeys", "treeCheckable", "onSearch", "otherProps", "width", "dropdownStyle", "popupClassName", "style", "allowClear", "listHeight", "showCodeName", "className"],
   _excluded2 = ["children"];
 var SHOW_PARENT = _antd.TreeSelect.SHOW_PARENT;
 var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
@@ -51,8 +51,9 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     filterTreeNode = props.filterTreeNode,
     _props$treeNodeFilter = props.treeNodeFilterProp,
     treeNodeFilterProp = _props$treeNodeFilter === void 0 ? 'label' : _props$treeNodeFilter,
-    _props$treeDefaultExp = props.treeDefaultExpandAll,
-    treeDefaultExpandAll = _props$treeDefaultExp === void 0 ? true : _props$treeDefaultExp,
+    _props$defaultExpandA = props.defaultExpandAll,
+    defaultExpandAll = _props$defaultExpandA === void 0 ? true : _props$defaultExpandA,
+    expandedKeys = props.expandedKeys,
     _props$treeCheckable = props.treeCheckable,
     treeCheckable = _props$treeCheckable === void 0 ? true : _props$treeCheckable,
     _onSearch = props.onSearch,
@@ -477,7 +478,8 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     disabled: disabled,
     showSearch: showSearch,
     // filterTreeNode: filterTreeNodeEvent,
-    treeDefaultExpandAll: treeDefaultExpandAll,
+    treeDefaultExpandAll: defaultExpandAll,
+    treeExpandedKeys: expandedKeys,
     treeCheckable: treeCheckable,
     showCheckedStrategy: SHOW_PARENT,
     value: value,

package/lib/ProTreeSelect/propsType.d.ts

@@ -69,6 +69,8 @@ export interface PropTreeSelectProps extends Omit<TreeSelectProps, 'onSearch'> {
         service: Service<any, any>;
         options?: Options<any, any>;
     };
+    defaultExpandAll?: boolean;
+    expandedKeys?: any[];
 }
 export interface ProSelectAction {
     /** 获取发生请求的 useRequest 的 ref */

package/lib/ProUpload/index.js

@@ -22,13 +22,6 @@ var _ImageRender = _interopRequireDefault(require("./components/ImageRender"));
 var _uitls = require("./uitls");
 var _locale = _interopRequireDefault(require("../locale"));
 var _excluded = ["value", "size", "action", "maxCount", "headerRender", "footerRender", "disabled", "uploadType", "buttonProps", "accept", "extraTipText", "beforeUpload", "onChange", "onDownload", "onPreview", "onRemove", "method", "className", "dataParams", "name", "showExampleContent", "showUploadList", "otherProps", "transformResponse", "exampleTitle", "exampleContent", "exampleModalProps", "buttonText", "afterRender", "fieldNames"];
-/*
- * @Author: wangshengqiang
- * @Date: 2023-02-03 14:18:59
- * @LastEditTime: 2023-11-14 18:32:13
- * @LastEditors: wangshengqiang
- * @Description: 上传控件
- */
 var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var _locale$ProUpload;
   var _useState = (0, _react.useState)([]),

package/lib/ProViewer/index.js

@@ -16,7 +16,6 @@ var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
 var _locale = _interopRequireDefault(require("../locale"));
 var _locale$ProViewer;
-/* eslint-disable jsx-a11y/iframe-has-title */
 // 用于解析word | excel
 var officeApp = 'https://view.officeapps.live.com/op/view.aspx?src=';
 // 文件MIME类型

package/lib/old/ProCertValidity/index.js

@@ -11,7 +11,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _moment = _interopRequireDefault(require("moment"));
 var _react = require("react");
-var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer", "showForever", "proformmode"]; // @ts-nocheck
+var _excluded = ["value", "onChange", "disabled", "isRange", "getPopupContainer", "showForever", "proformmode"];
 var RangePicker = _antd.DatePicker.RangePicker;
 var defaultFormatDate = 'YYYY-MM-DD';
 var defaultPopupContainer = function defaultPopupContainer(triggerNode) {

package/package.json

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