@zat-design/sisyphus-react 3.4.11-beta.9 → 3.4.12

package/es/ProTree/components/ProTree.js

@@ -245,7 +245,7 @@ var ProTree = function ProTree(props) {
   /**
    * 复选事件处理函数，全选事件处理函数
    */
-  var handleFinish = function handleFinish(allValue, checkAll, checkedValues) {
+  var handleFinish = function handleFinish(allValue, checkAll, checkedValues, checkedNode) {
     if (disabled || isView) {
       return null;
     }
@@ -257,16 +257,24 @@ 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 (checkedNode) {
+        options = checkedNode;
+        delete options[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'];
+      }
       if (labelInValue) {
         values = state.flatTreeData.filter(function (item) {
           return values.includes(item[fieldNameValue]);
         });
       }
-      onChange && onChange(values);
+      onChange && onChange(values, options);
     }
   };
   // 该方法只有复选框，在勾中checkbox后才会走到这个方法
   var onCheck = function onCheck(checkedKeys, info) {
+    var _info$node;
     if (disabled || isView) {
       return null;
     }
@@ -310,7 +318,11 @@ var ProTree = function ProTree(props) {
     setState({
       checkAll: checkAllTemp
     });
-    handleFinish(allValue, checkAllTemp, checkedValues);
+    var checkNodeValue = info === null || info === void 0 ? void 0 : (_info$node = info.node) === null || _info$node === void 0 ? void 0 : _info$node[fieldNameValue];
+    var options = state.flatTreeData.filter(function (item) {
+      return checkNodeValue === item[fieldNameValue];
+    });
+    handleFinish(allValue, checkAllTemp, checkedValues, Array.isArray(options) ? options === null || options === void 0 ? void 0 : options[0] : options);
     if (other === null || other === void 0 ? void 0 : other.onCheck) {
       other.onCheck(checkedKeys, {
         checked: info.checked,
@@ -343,12 +355,12 @@ var ProTree = function ProTree(props) {
     setState({
       checkAll: checked
     });
-    handleFinish(allValue, checked, checkedValues);
+    handleFinish(allValue, checked, checkedValues, null);
   };
   /** 点击了树节点开始loading,改变自身state并将值通过onchange上传到form */
   var onSelectTreeNode = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(props, info) {
-      var values;
+      var values, options, option;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -372,17 +384,24 @@ 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];
+              });
+            }
+            option = options === null || options === void 0 ? void 0 : options[0];
+            delete option[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'];
             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, option);
+            } else {
+              onChange && onChange(value, option);
             }
-          case 8:
+          case 13:
           case "end":
             return _context.stop();
         }

package/es/ProTree/components/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", "defaultExpandAll", "expandedKeys", "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", "checkStrictly", "checkable"],
   _excluded2 = ["children"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /* eslint-disable react/no-danger */
@@ -65,6 +65,8 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     listHeight = props.listHeight,
     showCodeName = props.showCodeName,
     className = props.className,
+    checkStrictly = props.checkStrictly,
+    checkable = props.checkable,
     selectProps = _objectWithoutProperties(props, _excluded);
   var _props$value = props.value,
     value = _props$value === void 0 ? undefined : _props$value;
@@ -377,9 +379,11 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     var filterData = function filterData(data) {
       for (var i = 0; i < data.length; i++) {
         var item = data[i];
-        if (item[code] === nodeValue) {
-          result.value = nodeValue;
+        if (item[code] === nodeValue || Array.isArray(nodeValue) && nodeValue.includes(item[code])) {
+          result = _objectSpread({}, item);
+          result.value = item[code];
           result.label = item[label];
+          delete result[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'];
           return null;
         }
         // 一直递归到最后一层子节点
@@ -413,7 +417,8 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     if (props === null || props === void 0 ? void 0 : props.labelInValue) {
       result = getLabelByValue(selectList, newVal);
     }
-    onChange && onChange(result, label, extra);
+    var options = findTreeNode(selectList, extra === null || extra === void 0 ? void 0 : extra.triggerValue);
+    onChange && onChange(result, options, extra);
     // 重置搜索
     showSearch && searchTreeEvent('');
   };
@@ -486,7 +491,8 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     allowClear: allowClear || true,
     showArrow: true,
     treeNodeFilterProp: treeNodeFilterProp,
-    virtual: true
+    virtual: true,
+    treeCheckStrictly: checkStrictly
   }, selectProps);
   if (value === null) {
     delete treeProps.value;

package/es/ProTree/components/ProTreeSelect/propsType.d.ts

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

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 */
@@ -193,6 +193,7 @@ export interface PropTreeSelectProps extends Omit<TreeSelectProps, 'onSearch'> {
         service: Service<any, any>;
         options?: Options<any, any>;
     };
+    checkable?: boolean;
 }
 export interface ProSelectAction {
     /** 获取发生请求的 useRequest 的 ref */

package/es/ProUpload/components/DragRender.js

@@ -1,7 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/upload/style";
 import _Upload from "antd/es/upload";
-import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useRef } from 'react';
 import { DndContext } from '@dnd-kit/core';
 import { SortableContext, rectSortingStrategy } from '@dnd-kit/sortable';
@@ -27,9 +27,7 @@ var DragRender = function DragRender(props) {
     setFileList = props.setFileList,
     onChange = props.onChange;
   var refReSelect = useRef();
-  if (isView) return _jsx(_Fragment, {
-    children: "-"
-  });
+  // if (isView) return <>-</>;
   // 拖拽模式下单个文件可用
   var showDraggerSingleRender = maxCount === 1 && fileList[0];
   /**
@@ -92,13 +90,13 @@ var DragRender = function DragRender(props) {
         onPreview: onPreview
       }), file.status !== 'uploading' && _jsxs("div", {
         className: "file-action-box",
-        children: [_jsx("div", {
+        children: [!isView && !disabled && _jsx("div", {
           className: "file-name",
           onClick: function onClick() {
             handleReSelect(file);
           },
           children: locale === null || locale === void 0 ? void 0 : (_locale$ProUpload = locale.ProUpload) === null || _locale$ProUpload === void 0 ? void 0 : _locale$ProUpload.draggerSelect
-        }), _jsx("div", {
+        }), !isView && !disabled && _jsx("div", {
           className: "file-del",
           onClick: function onClick() {
             handleDelFile(file);

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/ProEditTable/components/DndWrapper/index.d.ts

@@ -1,7 +1,7 @@
 import React, { FC } from 'react';
 interface RowProps extends React.HTMLAttributes<HTMLTableRowElement> {
     'data-row-key': string;
-    hide?: boolean;
+    'data-hide'?: boolean;
     disabled?: boolean;
 }
 export declare const Row: FC<RowProps>;

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

@@ -13,10 +13,9 @@ var _core = require("@dnd-kit/core");
 var _sortable = require("@dnd-kit/sortable");
 var _utilities = require("@dnd-kit/utilities");
 var _ProIcon = _interopRequireDefault(require("../../../ProIcon"));
-var _excluded = ["disabled", "hide", "children"];
+var _excluded = ["disabled", "children"];
 var Row = exports.Row = function Row(props) {
   var disabled = props.disabled,
-    hide = props.hide,
     children = props.children,
     restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var data = (0, _sortable.useSortable)({
@@ -50,7 +49,7 @@ var Row = exports.Row = function Row(props) {
           renderIndex = _ref.renderIndex;
         return /*#__PURE__*/_react.default.cloneElement(child, {
           children: (0, _jsxRuntime.jsxs)("span", {
-            className: "drag-wrapper".concat(hide ? ' no-check' : ''),
+            className: "drag-wrapper".concat(props['data-hide'] ? ' no-check' : ''),
             children: [(0, _jsxRuntime.jsx)(_ProIcon.default, (0, _objectSpread2.default)({
               className: "drag-icon",
               style: {
@@ -59,7 +58,7 @@ var Row = exports.Row = function Row(props) {
               },
               type: "drag",
               size: 20
-            }, listeners)), hide ? null : render === null || render === void 0 ? void 0 : render(null, record, renderIndex)]
+            }, listeners)), props['data-hide'] ? null : render === null || render === void 0 ? void 0 : render(null, record, renderIndex)]
           })
         });
       }

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

@@ -110,7 +110,9 @@ var RenderField = function RenderField(_ref) {
   var rowParams = [currentValue, rowData, options];
   if (typeof isEditable === 'function') {
     isEditable = isEditable.apply(void 0, rowParams);
-    !isEditable && form.validateFields([cellName]);
+    setTimeout(function () {
+      !isEditable && form.validateFields([cellName]);
+    }, 100);
   }
   // 获取最终的disabled
   _disabled = (0, _tools.getDisabled)({
@@ -376,10 +378,10 @@ var RenderField = function RenderField(_ref) {
               return [].concat((0, _toConsumableArray2.default)(rowPath), [key]);
             });
             if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
-              debounceValidate(validateFieldKeys);
+              setTimeout(function () {
+                form.validateFields(validateFieldKeys);
+              }, 100);
             }
-          } else {
-            debounceValidate();
           }
           setState({
             forceUpdate: {

package/lib/ProEditTable/index.js

@@ -339,7 +339,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
           onRow: function onRow() {
             return {
               disabled: disabled || virtualKey && !!editingKeys.length,
-              hide: isHideCheckBox,
+              'data-hide': isHideCheckBox,
               onClick: function onClick() {}
             };
           }

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/Group/component/ComRender.d.ts

@@ -13,6 +13,8 @@ interface Props {
     after?: React.ReactNode;
     name?: NamePath;
     valueType: string;
+    valuePropName?: string;
+    getValueProps?: (value: any) => Record<string, unknown>;
 }
 /** 渲染组件 */
 declare const ComRender: React.FC<Props>;

package/lib/ProForm/components/combination/Group/component/ComRender.js

@@ -15,7 +15,7 @@ var _ConfirmWrapper = _interopRequireDefault(require("../../../../components/ren
 var _useFieldProps = require("../../../../utils/useFieldProps");
 var componentMap = _interopRequireWildcard(require("../../../../../index"));
 var _AddonWrapper = _interopRequireDefault(require("./AddonWrapper"));
-var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after"];
+var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after", "getValueProps", "valuePropName"];
 // 这里的key与组件内参数一致, 决定使用哪个包裹组件
 var wrapperMap = {
   confirm: _ConfirmWrapper.default,
@@ -45,9 +45,16 @@ var ComRender = function ComRender(props) {
     contextProps = props.contextProps,
     before = props.before,
     after = props.after,
+    getValueProps = props.getValueProps,
+    _props$valuePropName = props.valuePropName,
+    valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var TypeComponent = componentMap[type];
-  var componentProps = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, fieldProps), rest);
+  var mergedGetValueProps = getValueProps || function (val) {
+    return (0, _defineProperty2.default)({}, valuePropName, val);
+  };
+  var _props = mergedGetValueProps(props.value);
+  var componentProps = (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, fieldProps), rest), _props);
   var Component = component ? ( /*#__PURE__*/_react.default.cloneElement(component, (0, _objectSpread3.default)({}, componentProps))) : (0, _jsxRuntime.jsx)(TypeComponent, (0, _objectSpread3.default)({}, componentProps));
   var Com = getComRender(Component, props, componentProps);
   return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {

package/lib/ProForm/components/combination/Group/propsType.d.ts

@@ -45,4 +45,6 @@ export type GroupColumnProps<Values = any> = {
     toISOString?: boolean;
     clearNotShow?: boolean;
     confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps>;
+    valuePropName?: string;
+    getValueProps?: (value: any) => Record<string, unknown>;
 } & ColumnPropsMap & FormItemProps;

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

@@ -239,7 +239,7 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
       if ((transform === null || transform === void 0 ? void 0 : transform.normalize) || normalize) {
         var _transform$normalize;
         // @ts-ignore
-        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));
+        newValue = (transform === null || transform === void 0 ? void 0 : (_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);

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() {