@zat-design/sisyphus-react 3.4.11-beta.12 → 3.4.11-beta.14

package/es/ProEnum/hooks/useEnum.js

@@ -1,6 +1,8 @@
+var _ref;
 /* eslint-disable no-redeclare */
 import { useProConfig } from '../../ProConfigProvider';
 import { getEnumData } from '../utils';
+var baseEnumStorage = (_ref = window.localStorage.getItem('zat-design-pro-component-cacheKey') && JSON.parse(window.localStorage.getItem('zat-design-pro-component-cacheKey'))) !== null && _ref !== void 0 ? _ref : null;
 /**
  * 根据 code 从枚举缓存取出对应的 options 、以及回显
  * @param codes
@@ -9,17 +11,17 @@ import { getEnumData } from '../utils';
  * @returns
  */
 function useEnum(codes, value, compose) {
-  var _ref = useProConfig('globalConfig') || {},
-    _ref$storage = _ref.storage,
-    storage = _ref$storage === void 0 ? 'localStorage' : _ref$storage;
-  var _ref2 = useProConfig('ProEnum') || {},
-    _ref2$cacheKey = _ref2.cacheKey,
-    cacheKey = _ref2$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _ref2$cacheKey,
-    _ref2$fieldNames = _ref2.fieldNames,
-    fieldNames = _ref2$fieldNames === void 0 ? {} : _ref2$fieldNames,
-    _ref2$clear = _ref2.clear,
-    clear = _ref2$clear === void 0 ? true : _ref2$clear;
-  var catchData = getEnumData(storage, cacheKey);
+  var _ref2 = useProConfig('globalConfig') || {},
+    _ref2$storage = _ref2.storage,
+    storage = _ref2$storage === void 0 ? 'localStorage' : _ref2$storage;
+  var _ref3 = useProConfig('ProEnum') || {},
+    _ref3$cacheKey = _ref3.cacheKey,
+    cacheKey = _ref3$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _ref3$cacheKey,
+    _ref3$fieldNames = _ref3.fieldNames,
+    fieldNames = _ref3$fieldNames === void 0 ? {} : _ref3$fieldNames,
+    _ref3$clear = _ref3.clear,
+    clear = _ref3$clear === void 0 ? true : _ref3$clear;
+  var catchData = getEnumData(storage, cacheKey, baseEnumStorage);
   if (!codes) {
     return catchData;
   }

package/es/ProEnum/hooks/useEnumRequest.js

@@ -3,37 +3,39 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
+var _ref;
 import { useEffect } from 'react';
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
 import { diffCode, getEnumData, setEnumData, cacheFieldNames } from '../utils';
 import locale from '../../locale';
 import '../utils/eventCenter';
+var baseEnumStorage = (_ref = window.localStorage.getItem('zat-design-pro-component-cacheKey') && JSON.parse(window.localStorage.getItem('zat-design-pro-component-cacheKey'))) !== null && _ref !== void 0 ? _ref : null;
 var useEnumRequest = function useEnumRequest(props, dispatch) {
-  var _ref = props || {},
-    _ref$main = _ref.main,
-    main = _ref$main === void 0 ? false : _ref$main,
-    _ref$share = _ref.share,
-    share = _ref$share === void 0 ? false : _ref$share,
-    _ref$clear = _ref.clear,
-    clear = _ref$clear === void 0 ? true : _ref$clear,
-    _ref$fieldNames = _ref.fieldNames,
-    fieldNames = _ref$fieldNames === void 0 ? {
+  var _ref2 = props || {},
+    _ref2$main = _ref2.main,
+    main = _ref2$main === void 0 ? false : _ref2$main,
+    _ref2$share = _ref2.share,
+    share = _ref2$share === void 0 ? false : _ref2$share,
+    _ref2$clear = _ref2.clear,
+    clear = _ref2$clear === void 0 ? true : _ref2$clear,
+    _ref2$fieldNames = _ref2.fieldNames,
+    fieldNames = _ref2$fieldNames === void 0 ? {
       label: 'label',
       value: 'value',
       children: 'children'
-    } : _ref$fieldNames,
-    _ref$cacheKey = _ref.cacheKey,
-    cacheKey = _ref$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _ref$cacheKey,
-    _ref$requestRefresh = _ref.requestRefresh,
-    requestRefresh = _ref$requestRefresh === void 0 ? false : _ref$requestRefresh,
-    _ref$storage = _ref.storage,
-    storage = _ref$storage === void 0 ? 'localStorage' : _ref$storage,
-    _ref$dataSource = _ref.dataSource,
-    dataSource = _ref$dataSource === void 0 ? {} : _ref$dataSource,
-    useRequest = _ref.useRequest,
-    transformResponse = _ref.transformResponse,
-    _ref$dics = _ref.dics,
-    dics = _ref$dics === void 0 ? {} : _ref$dics;
+    } : _ref2$fieldNames,
+    _ref2$cacheKey = _ref2.cacheKey,
+    cacheKey = _ref2$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _ref2$cacheKey,
+    _ref2$requestRefresh = _ref2.requestRefresh,
+    requestRefresh = _ref2$requestRefresh === void 0 ? false : _ref2$requestRefresh,
+    _ref2$storage = _ref2.storage,
+    storage = _ref2$storage === void 0 ? 'localStorage' : _ref2$storage,
+    _ref2$dataSource = _ref2.dataSource,
+    dataSource = _ref2$dataSource === void 0 ? {} : _ref2$dataSource,
+    useRequest = _ref2.useRequest,
+    transformResponse = _ref2.transformResponse,
+    _ref2$dics = _ref2.dics,
+    dics = _ref2$dics === void 0 ? {} : _ref2$dics;
   if (_typeof(dataSource) === 'object' && dataSource === null) {
     var _locale$ProEnum;
     throw new Error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum = locale.ProEnum) === null || _locale$ProEnum === void 0 ? void 0 : _locale$ProEnum.errorDataSource);
@@ -100,7 +102,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
                   });
                   res.data = response;
                 }
-                cacheData = getEnumData(storage, cacheKey) || {
+                cacheData = getEnumData(storage, cacheKey, baseEnumStorage) || {
                   data: {}
                 }; // 合并缓存数据
                 res.data = _objectSpread(_objectSpread({}, cacheData === null || cacheData === void 0 ? void 0 : cacheData.data), res.data);
@@ -130,7 +132,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
         return setCache;
       }(),
       getCache: function getCache() {
-        var res = getEnumData(storage, cacheKey) || {
+        var res = getEnumData(storage, cacheKey, baseEnumStorage) || {
           data: {}
         };
         dispatch({
@@ -158,12 +160,12 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
     })),
     run = _useRequestFunc.run;
   var mergeData = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var cacheData, _useRequest$options2, _useRequest$options3, enumData, cacheCodes, codes, ignoreCodes, diff, response, res, _locale$ProEnum6;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            cacheData = getEnumData(storage, cacheKey) || {
+            cacheData = getEnumData(storage, cacheKey, baseEnumStorage) || {
               data: {}
             };
             if (!(_typeof(cacheData) === 'object')) {
@@ -245,13 +247,13 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
       }, _callee2);
     }));
     return function mergeData() {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   useDeepCompareEffect(function () {
     if (useRequest && (useRequest === null || useRequest === void 0 ? void 0 : useRequest.service)) {
-      var _ref3 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
-        defaultParams = _ref3.defaultParams;
+      var _ref4 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
+        defaultParams = _ref4.defaultParams;
       if (requestRefresh) {
         window.localStorage.removeItem(cacheKey);
         window.sessionStorage.removeItem(cacheKey);
@@ -260,7 +262,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
       // TODO 这段代码目前看起来是没啥用的、没起到作用
       mergeData();
     } else if (Object.keys(dataSource)) {
-      var res = getEnumData(storage, cacheKey) || {
+      var res = getEnumData(storage, cacheKey, baseEnumStorage) || {
         data: {}
       };
       dispatch({
@@ -268,7 +270,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
         payload: _objectSpread(_objectSpread({}, dataSource), res === null || res === void 0 ? void 0 : res.data)
       });
     } else {
-      var _res = getEnumData(storage, cacheKey) || {
+      var _res = getEnumData(storage, cacheKey, baseEnumStorage) || {
         data: {}
       };
       dispatch({
@@ -279,7 +281,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
   }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
   var shareProEnumDic = function shareProEnumDic(cacheData) {
     logDebug(cacheData);
-    var storageData = getEnumData(storage, cacheKey) || {
+    var storageData = getEnumData(storage, cacheKey, baseEnumStorage) || {
       data: {}
     };
     dispatch({

package/es/ProEnum/index.js

@@ -166,7 +166,7 @@ var ProEnum = function ProEnum(props) {
     }
     switch (type) {
       case 'ProSelect':
-        return _jsx(ProSelect, _objectSpread(_objectSpread({}, enumProps), {}, {
+        return _jsx(ProSelect, _objectSpread(_objectSpread({}, omit(enumProps, ['showCodeName'])), {}, {
           otherProps: otherProps,
           dataSource: list,
           fieldNames: {
@@ -177,7 +177,7 @@ var ProEnum = function ProEnum(props) {
           onChange: onChange
         }));
       case 'Radio':
-        return _jsx(_Radio.Group, _objectSpread(_objectSpread({}, omit(enumProps, ['fieldNames'])), {}, {
+        return _jsx(_Radio.Group, _objectSpread(_objectSpread({}, omit(enumProps, ['fieldNames', 'showCodeName'])), {}, {
           options: list,
           value: value,
           onChange: onChange,
@@ -190,7 +190,7 @@ var ProEnum = function ProEnum(props) {
           })
         }));
       case 'Checkbox':
-        return _jsx(_Checkbox.Group, _objectSpread(_objectSpread({}, omit(enumProps, ['fieldNames'])), {}, {
+        return _jsx(_Checkbox.Group, _objectSpread(_objectSpread({}, omit(enumProps, ['fieldNames', 'showCodeName'])), {}, {
           options: list,
           value: value,
           onChange: onChange,
@@ -211,7 +211,7 @@ var ProEnum = function ProEnum(props) {
           dataSource: list
         });
       case 'Group':
-        return _jsx(ProEnumGroup, _objectSpread(_objectSpread({}, enumProps), {}, {
+        return _jsx(ProEnumGroup, _objectSpread(_objectSpread({}, omit(enumProps, ['showCodeName'])), {}, {
           value: value,
           onChange: onChange,
           fieldLabel: label,

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

@@ -4,7 +4,7 @@ interface EnumRes {
     data: Record<string, DataOption[]>;
     [key: string]: any;
 }
-export declare function getEnumData(storage: StorageType, cacheKey: string): EnumRes;
+export declare function getEnumData(storage: StorageType, cacheKey: string, baseEnumStorage?: any): EnumRes;
 export declare function setEnumData(storage: StorageType, cacheKey: string, data: Object): void;
 export declare function hasEnumList(storage: StorageType, cacheKey: any, code: string): DataOption[];
 export declare function isObject(obj: any): boolean;

package/es/ProEnum/utils/index.js

@@ -1,7 +1,10 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["children"];
 import { isNull, isUndefined } from 'lodash';
-export function getEnumData(storage, cacheKey) {
+export function getEnumData(storage, cacheKey, baseEnumStorage) {
+  if (baseEnumStorage) {
+    return baseEnumStorage;
+  }
   if (storage === 'localStorage') {
     return JSON.parse(window.localStorage.getItem(cacheKey) || '{}');
   }

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

@@ -49,12 +49,12 @@ var getViewLabel = function getViewLabel(_ref) {
   return viewLabel;
 };
 var ProCascader = function ProCascader(props) {
-  var _value$slice, _ref7, _ref7$filter, _defaultLabel$filter, _locale$ProAddressBar, _locale$ProAddressBar2;
+  var _props$otherProps, _value$slice, _ref7, _ref7$filter, _defaultLabel$filter, _locale$ProAddressBar, _locale$ProAddressBar2;
   var _ref2 = useProConfig('ProAddressBar') || {},
     configDetailMaxLength = _ref2.detailMaxLength,
     configEnumCode = _ref2.enumCode,
     configCode = _ref2.code;
-  var isAddressMode = (props === null || props === void 0 ? void 0 : props.mode) === 'address';
+  var isAddressMode = (props === null || props === void 0 ? void 0 : props.mode) === 'address' || (props === null || props === void 0 ? void 0 : (_props$otherProps = props.otherProps) === null || _props$otherProps === void 0 ? void 0 : _props$otherProps.type) === 'ProAddressBar';
   var _props$className = props.className,
     className = _props$className === void 0 ? '' : _props$className,
     _props$hasDetail = props.hasDetail,

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

@@ -12,6 +12,7 @@ export { default as TimePicker } from './base/TimePicker';
 export { default as FormList } from './combination/FormList';
 export { default as ProEditTable } from '../../ProEditTable';
 export { default as ProCascader } from './combination/ProCascader';
+export { default as ProAddressBar } from './combination/ProCascader';
 export { default as ProCombination } from './combination/ProCombination';
 export { default as ProNumberRange } from './combination/ProNumberRange';
 export { default as ProModalSelect } from './combination/ProModalSelect';

package/es/ProForm/components/index.js

@@ -14,6 +14,7 @@ export { default as FormList } from './combination/FormList';
 export { default as ProEditTable } from '../../ProEditTable';
 // combination 组合组件
 export { default as ProCascader } from './combination/ProCascader';
+export { default as ProAddressBar } from './combination/ProCascader';
 export { default as ProCombination } from './combination/ProCombination';
 export { default as ProNumberRange } from './combination/ProNumberRange';
 export { default as ProModalSelect } from './combination/ProModalSelect';

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

@@ -276,7 +276,7 @@ var Render = function Render(props) {
       }, 60);
     }
     // ProTreeSelect返回option
-    if (['ProTree'].includes(type)) {
+    if (['ProTree'].includes(type) && !_args[2].option) {
       var _args2, _args2$;
       _args[2].option = findOptionByValue(lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.dataSource, (_args2 = _args) === null || _args2 === void 0 ? void 0 : (_args2$ = _args2[0]) === null || _args2$ === void 0 ? void 0 : _args2$[0], (lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.fieldNames) || {});
     }

package/es/ProTree/components/ProTree.js

@@ -257,12 +257,15 @@ var ProTree = function ProTree(props) {
       onChange && onChange(allValue);
     } else {
       var values = checkedValues;
+      var options = state.flatTreeData.filter(function (item) {
+        return values.includes(item[fieldNameValue]);
+      });
       if (labelInValue) {
         values = state.flatTreeData.filter(function (item) {
           return values.includes(item[fieldNameValue]);
         });
       }
-      onChange && onChange(values);
+      onChange && onChange(values, options);
     }
   };
   // 该方法只有复选框，在勾中checkbox后才会走到这个方法
@@ -348,7 +351,7 @@ var ProTree = function ProTree(props) {
   /** 点击了树节点开始loading,改变自身state并将值通过onchange上传到form */
   var onSelectTreeNode = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(props, info) {
-      var values;
+      var values, options;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -372,17 +375,22 @@ var ProTree = function ProTree(props) {
               clickShowLoading: false
             });
           case 7:
+            values = props;
+            options = state.flatTreeData.filter(function (item) {
+              return values === item[fieldNameValue];
+            });
+            if (labelInValue) {
+              values = state.flatTreeData.filter(function (item) {
+                return values === item[fieldNameValue];
+              });
+            }
             if (!(other === null || other === void 0 ? void 0 : other.checkable)) {
-              // 单选将选中节点值冒泡到form
-              values = props;
-              if (labelInValue) {
-                values = state.flatTreeData.filter(function (item) {
-                  return values === item[fieldNameValue];
-                });
-              }
-              onChange && onChange(values);
+              // 单选将选中节点值冒泡到form, 给onFieldChange添加options
+              onChange && onChange(values, options === null || options === void 0 ? void 0 : options[0]);
+            } else {
+              onChange && onChange(value, options === null || options === void 0 ? void 0 : options[0]);
             }
-          case 8:
+          case 11:
           case "end":
             return _context.stop();
         }

package/es/ProTree/propsType.d.ts

@@ -60,7 +60,7 @@ export interface ProTreeProps extends PropTreeSelectProps {
     /** 树节点文本宽度 */
     ellipseWidth?: string;
     /** value改变的回调 */
-    onChange?: (values: string[] | AllValueType) => void;
+    onChange?: (values: string[] | AllValueType, options?: object[]) => void;
     /** 点击树节点触发 */
     onSelect?: (values: string[] | AllValueType, info?: any) => any;
     /** 复选情况下点击checkbox触发,参照antd */

package/es/ProUpload/style/fileItem.less

@@ -1,4 +1,15 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-upload  {
+  .@{ant-prefix}-upload-disabled{
+    .file-action-box{
+      .file-name, .file-del{
+        color: #ccc;
+        cursor: not-allowed !important;
+      }
+    }
+  }
 
   .filelist-item-wrapper {
     .file-info-box {

package/lib/ProEnum/hooks/useEnum.js

@@ -6,8 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _ProConfigProvider = require("../../ProConfigProvider");
 var _utils = require("../utils");
+var _ref;
 /* eslint-disable no-redeclare */
-
+var baseEnumStorage = (_ref = window.localStorage.getItem('zat-design-pro-component-cacheKey') && JSON.parse(window.localStorage.getItem('zat-design-pro-component-cacheKey'))) !== null && _ref !== void 0 ? _ref : null;
 /**
  * 根据 code 从枚举缓存取出对应的 options 、以及回显
  * @param codes
@@ -16,17 +17,17 @@ var _utils = require("../utils");
  * @returns
  */
 function useEnum(codes, value, compose) {
-  var _ref = (0, _ProConfigProvider.useProConfig)('globalConfig') || {},
-    _ref$storage = _ref.storage,
-    storage = _ref$storage === void 0 ? 'localStorage' : _ref$storage;
-  var _ref2 = (0, _ProConfigProvider.useProConfig)('ProEnum') || {},
-    _ref2$cacheKey = _ref2.cacheKey,
-    cacheKey = _ref2$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _ref2$cacheKey,
-    _ref2$fieldNames = _ref2.fieldNames,
-    fieldNames = _ref2$fieldNames === void 0 ? {} : _ref2$fieldNames,
-    _ref2$clear = _ref2.clear,
-    clear = _ref2$clear === void 0 ? true : _ref2$clear;
-  var catchData = (0, _utils.getEnumData)(storage, cacheKey);
+  var _ref2 = (0, _ProConfigProvider.useProConfig)('globalConfig') || {},
+    _ref2$storage = _ref2.storage,
+    storage = _ref2$storage === void 0 ? 'localStorage' : _ref2$storage;
+  var _ref3 = (0, _ProConfigProvider.useProConfig)('ProEnum') || {},
+    _ref3$cacheKey = _ref3.cacheKey,
+    cacheKey = _ref3$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _ref3$cacheKey,
+    _ref3$fieldNames = _ref3.fieldNames,
+    fieldNames = _ref3$fieldNames === void 0 ? {} : _ref3$fieldNames,
+    _ref3$clear = _ref3.clear,
+    clear = _ref3$clear === void 0 ? true : _ref3$clear;
+  var catchData = (0, _utils.getEnumData)(storage, cacheKey, baseEnumStorage);
   if (!codes) {
     return catchData;
   }

package/lib/ProEnum/hooks/useEnumRequest.js

@@ -15,32 +15,34 @@ var _ahooks = require("ahooks");
 var _utils = require("../utils");
 var _locale = _interopRequireDefault(require("../../locale"));
 require("../utils/eventCenter");
+var _ref;
+var baseEnumStorage = (_ref = window.localStorage.getItem('zat-design-pro-component-cacheKey') && JSON.parse(window.localStorage.getItem('zat-design-pro-component-cacheKey'))) !== null && _ref !== void 0 ? _ref : null;
 var useEnumRequest = function useEnumRequest(props, dispatch) {
-  var _ref = props || {},
-    _ref$main = _ref.main,
-    main = _ref$main === void 0 ? false : _ref$main,
-    _ref$share = _ref.share,
-    share = _ref$share === void 0 ? false : _ref$share,
-    _ref$clear = _ref.clear,
-    clear = _ref$clear === void 0 ? true : _ref$clear,
-    _ref$fieldNames = _ref.fieldNames,
-    fieldNames = _ref$fieldNames === void 0 ? {
+  var _ref2 = props || {},
+    _ref2$main = _ref2.main,
+    main = _ref2$main === void 0 ? false : _ref2$main,
+    _ref2$share = _ref2.share,
+    share = _ref2$share === void 0 ? false : _ref2$share,
+    _ref2$clear = _ref2.clear,
+    clear = _ref2$clear === void 0 ? true : _ref2$clear,
+    _ref2$fieldNames = _ref2.fieldNames,
+    fieldNames = _ref2$fieldNames === void 0 ? {
       label: 'label',
       value: 'value',
       children: 'children'
-    } : _ref$fieldNames,
-    _ref$cacheKey = _ref.cacheKey,
-    cacheKey = _ref$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _ref$cacheKey,
-    _ref$requestRefresh = _ref.requestRefresh,
-    requestRefresh = _ref$requestRefresh === void 0 ? false : _ref$requestRefresh,
-    _ref$storage = _ref.storage,
-    storage = _ref$storage === void 0 ? 'localStorage' : _ref$storage,
-    _ref$dataSource = _ref.dataSource,
-    dataSource = _ref$dataSource === void 0 ? {} : _ref$dataSource,
-    useRequest = _ref.useRequest,
-    transformResponse = _ref.transformResponse,
-    _ref$dics = _ref.dics,
-    dics = _ref$dics === void 0 ? {} : _ref$dics;
+    } : _ref2$fieldNames,
+    _ref2$cacheKey = _ref2.cacheKey,
+    cacheKey = _ref2$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _ref2$cacheKey,
+    _ref2$requestRefresh = _ref2.requestRefresh,
+    requestRefresh = _ref2$requestRefresh === void 0 ? false : _ref2$requestRefresh,
+    _ref2$storage = _ref2.storage,
+    storage = _ref2$storage === void 0 ? 'localStorage' : _ref2$storage,
+    _ref2$dataSource = _ref2.dataSource,
+    dataSource = _ref2$dataSource === void 0 ? {} : _ref2$dataSource,
+    useRequest = _ref2.useRequest,
+    transformResponse = _ref2.transformResponse,
+    _ref2$dics = _ref2.dics,
+    dics = _ref2$dics === void 0 ? {} : _ref2$dics;
   if ((0, _typeof2.default)(dataSource) === 'object' && dataSource === null) {
     var _locale$ProEnum;
     throw new Error(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEnum = _locale.default.ProEnum) === null || _locale$ProEnum === void 0 ? void 0 : _locale$ProEnum.errorDataSource);
@@ -107,7 +109,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
                   });
                   res.data = response;
                 }
-                cacheData = (0, _utils.getEnumData)(storage, cacheKey) || {
+                cacheData = (0, _utils.getEnumData)(storage, cacheKey, baseEnumStorage) || {
                   data: {}
                 }; // 合并缓存数据
                 res.data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, cacheData === null || cacheData === void 0 ? void 0 : cacheData.data), res.data);
@@ -137,7 +139,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
         return setCache;
       }(),
       getCache: function getCache() {
-        var res = (0, _utils.getEnumData)(storage, cacheKey) || {
+        var res = (0, _utils.getEnumData)(storage, cacheKey, baseEnumStorage) || {
           data: {}
         };
         dispatch({
@@ -165,12 +167,12 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
     })),
     run = _useRequestFunc.run;
   var mergeData = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
+    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
       var cacheData, _useRequest$options2, _useRequest$options3, enumData, cacheCodes, codes, ignoreCodes, diff, response, res, _locale$ProEnum6;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            cacheData = (0, _utils.getEnumData)(storage, cacheKey) || {
+            cacheData = (0, _utils.getEnumData)(storage, cacheKey, baseEnumStorage) || {
               data: {}
             };
             if (!((0, _typeof2.default)(cacheData) === 'object')) {
@@ -252,13 +254,13 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
       }, _callee2);
     }));
     return function mergeData() {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   (0, _ahooks.useDeepCompareEffect)(function () {
     if (useRequest && (useRequest === null || useRequest === void 0 ? void 0 : useRequest.service)) {
-      var _ref3 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
-        defaultParams = _ref3.defaultParams;
+      var _ref4 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
+        defaultParams = _ref4.defaultParams;
       if (requestRefresh) {
         window.localStorage.removeItem(cacheKey);
         window.sessionStorage.removeItem(cacheKey);
@@ -267,7 +269,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
       // TODO 这段代码目前看起来是没啥用的、没起到作用
       mergeData();
     } else if (Object.keys(dataSource)) {
-      var res = (0, _utils.getEnumData)(storage, cacheKey) || {
+      var res = (0, _utils.getEnumData)(storage, cacheKey, baseEnumStorage) || {
         data: {}
       };
       dispatch({
@@ -275,7 +277,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
         payload: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, dataSource), res === null || res === void 0 ? void 0 : res.data)
       });
     } else {
-      var _res = (0, _utils.getEnumData)(storage, cacheKey) || {
+      var _res = (0, _utils.getEnumData)(storage, cacheKey, baseEnumStorage) || {
         data: {}
       };
       dispatch({
@@ -286,7 +288,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
   }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
   var shareProEnumDic = function shareProEnumDic(cacheData) {
     logDebug(cacheData);
-    var storageData = (0, _utils.getEnumData)(storage, cacheKey) || {
+    var storageData = (0, _utils.getEnumData)(storage, cacheKey, baseEnumStorage) || {
       data: {}
     };
     dispatch({

package/lib/ProEnum/index.js

@@ -167,7 +167,7 @@ var ProEnum = function ProEnum(props) {
     }
     switch (type) {
       case 'ProSelect':
-        return (0, _jsxRuntime.jsx)(_ProSelect.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, enumProps), {}, {
+        return (0, _jsxRuntime.jsx)(_ProSelect.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(enumProps, ['showCodeName'])), {}, {
           otherProps: otherProps,
           dataSource: list,
           fieldNames: {
@@ -178,7 +178,7 @@ var ProEnum = function ProEnum(props) {
           onChange: onChange
         }));
       case 'Radio':
-        return (0, _jsxRuntime.jsx)(_antd.Radio.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(enumProps, ['fieldNames'])), {}, {
+        return (0, _jsxRuntime.jsx)(_antd.Radio.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(enumProps, ['fieldNames', 'showCodeName'])), {}, {
           options: list,
           value: value,
           onChange: onChange,
@@ -191,7 +191,7 @@ var ProEnum = function ProEnum(props) {
           })
         }));
       case 'Checkbox':
-        return (0, _jsxRuntime.jsx)(_antd.Checkbox.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(enumProps, ['fieldNames'])), {}, {
+        return (0, _jsxRuntime.jsx)(_antd.Checkbox.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(enumProps, ['fieldNames', 'showCodeName'])), {}, {
           options: list,
           value: value,
           onChange: onChange,
@@ -212,7 +212,7 @@ var ProEnum = function ProEnum(props) {
           dataSource: list
         });
       case 'Group':
-        return (0, _jsxRuntime.jsx)(_Group.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, enumProps), {}, {
+        return (0, _jsxRuntime.jsx)(_Group.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(enumProps, ['showCodeName'])), {}, {
           value: value,
           onChange: onChange,
           fieldLabel: label,

package/lib/ProEnum/utils/index.d.ts

@@ -4,7 +4,7 @@ interface EnumRes {
     data: Record<string, DataOption[]>;
     [key: string]: any;
 }
-export declare function getEnumData(storage: StorageType, cacheKey: string): EnumRes;
+export declare function getEnumData(storage: StorageType, cacheKey: string, baseEnumStorage?: any): EnumRes;
 export declare function setEnumData(storage: StorageType, cacheKey: string, data: Object): void;
 export declare function hasEnumList(storage: StorageType, cacheKey: any, code: string): DataOption[];
 export declare function isObject(obj: any): boolean;

package/lib/ProEnum/utils/index.js

@@ -14,7 +14,10 @@ exports.setEnumData = setEnumData;
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _lodash = require("lodash");
 var _excluded = ["children"];
-function getEnumData(storage, cacheKey) {
+function getEnumData(storage, cacheKey, baseEnumStorage) {
+  if (baseEnumStorage) {
+    return baseEnumStorage;
+  }
   if (storage === 'localStorage') {
     return JSON.parse(window.localStorage.getItem(cacheKey) || '{}');
   }

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

@@ -49,12 +49,12 @@ var getViewLabel = function getViewLabel(_ref) {
   return viewLabel;
 };
 var ProCascader = function ProCascader(props) {
-  var _value$slice, _ref7, _ref7$filter, _defaultLabel$filter, _locale$ProAddressBar, _locale$ProAddressBar2;
+  var _props$otherProps, _value$slice, _ref7, _ref7$filter, _defaultLabel$filter, _locale$ProAddressBar, _locale$ProAddressBar2;
   var _ref2 = (0, _ProConfigProvider.useProConfig)('ProAddressBar') || {},
     configDetailMaxLength = _ref2.detailMaxLength,
     configEnumCode = _ref2.enumCode,
     configCode = _ref2.code;
-  var isAddressMode = (props === null || props === void 0 ? void 0 : props.mode) === 'address';
+  var isAddressMode = (props === null || props === void 0 ? void 0 : props.mode) === 'address' || (props === null || props === void 0 ? void 0 : (_props$otherProps = props.otherProps) === null || _props$otherProps === void 0 ? void 0 : _props$otherProps.type) === 'ProAddressBar';
   var _props$className = props.className,
     className = _props$className === void 0 ? '' : _props$className,
     _props$hasDetail = props.hasDetail,

package/lib/ProForm/components/index.d.ts

@@ -12,6 +12,7 @@ export { default as TimePicker } from './base/TimePicker';
 export { default as FormList } from './combination/FormList';
 export { default as ProEditTable } from '../../ProEditTable';
 export { default as ProCascader } from './combination/ProCascader';
+export { default as ProAddressBar } from './combination/ProCascader';
 export { default as ProCombination } from './combination/ProCombination';
 export { default as ProNumberRange } from './combination/ProNumberRange';
 export { default as ProModalSelect } from './combination/ProModalSelect';

package/lib/ProForm/components/index.js

@@ -71,6 +71,12 @@ Object.defineProperty(exports, "ProAddress", {
     return _ProAddress.default;
   }
 });
+Object.defineProperty(exports, "ProAddressBar", {
+  enumerable: true,
+  get: function get() {
+    return _ProCascader.default;
+  }
+});
 Object.defineProperty(exports, "ProCascader", {
   enumerable: true,
   get: function get() {

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

@@ -274,7 +274,7 @@ var Render = function Render(props) {
       }, 60);
     }
     // ProTreeSelect返回option
-    if (['ProTree'].includes(type)) {
+    if (['ProTree'].includes(type) && !_args[2].option) {
       var _args2, _args2$;
       _args[2].option = (0, _index.findOptionByValue)(lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.dataSource, (_args2 = _args) === null || _args2 === void 0 ? void 0 : (_args2$ = _args2[0]) === null || _args2$ === void 0 ? void 0 : _args2$[0], (lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.fieldNames) || {});
     }

package/lib/ProTree/components/ProTree.js

@@ -257,12 +257,15 @@ var ProTree = function ProTree(props) {
       onChange && onChange(allValue);
     } else {
       var values = checkedValues;
+      var options = state.flatTreeData.filter(function (item) {
+        return values.includes(item[fieldNameValue]);
+      });
       if (labelInValue) {
         values = state.flatTreeData.filter(function (item) {
           return values.includes(item[fieldNameValue]);
         });
       }
-      onChange && onChange(values);
+      onChange && onChange(values, options);
     }
   };
   // 该方法只有复选框，在勾中checkbox后才会走到这个方法
@@ -348,7 +351,7 @@ var ProTree = function ProTree(props) {
   /** 点击了树节点开始loading,改变自身state并将值通过onchange上传到form */
   var onSelectTreeNode = /*#__PURE__*/function () {
     var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(props, info) {
-      var values;
+      var values, options;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -372,17 +375,22 @@ var ProTree = function ProTree(props) {
               clickShowLoading: false
             });
           case 7:
+            values = props;
+            options = state.flatTreeData.filter(function (item) {
+              return values === item[fieldNameValue];
+            });
+            if (labelInValue) {
+              values = state.flatTreeData.filter(function (item) {
+                return values === item[fieldNameValue];
+              });
+            }
             if (!(other === null || other === void 0 ? void 0 : other.checkable)) {
-              // 单选将选中节点值冒泡到form
-              values = props;
-              if (labelInValue) {
-                values = state.flatTreeData.filter(function (item) {
-                  return values === item[fieldNameValue];
-                });
-              }
-              onChange && onChange(values);
+              // 单选将选中节点值冒泡到form, 给onFieldChange添加options
+              onChange && onChange(values, options === null || options === void 0 ? void 0 : options[0]);
+            } else {
+              onChange && onChange(value, options === null || options === void 0 ? void 0 : options[0]);
             }
-          case 8:
+          case 11:
           case "end":
             return _context.stop();
         }

package/lib/ProTree/propsType.d.ts

@@ -60,7 +60,7 @@ export interface ProTreeProps extends PropTreeSelectProps {
     /** 树节点文本宽度 */
     ellipseWidth?: string;
     /** value改变的回调 */
-    onChange?: (values: string[] | AllValueType) => void;
+    onChange?: (values: string[] | AllValueType, options?: object[]) => void;
     /** 点击树节点触发 */
     onSelect?: (values: string[] | AllValueType, info?: any) => any;
     /** 复选情况下点击checkbox触发,参照antd */

package/lib/ProUpload/style/fileItem.less

@@ -1,4 +1,15 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-upload  {
+  .@{ant-prefix}-upload-disabled{
+    .file-action-box{
+      .file-name, .file-del{
+        color: #ccc;
+        cursor: not-allowed !important;
+      }
+    }
+  }
 
   .filelist-item-wrapper {
     .file-info-box {

package/package.json

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