@teamix/pro 1.1.35 → 1.1.39

package/es/actions/dialog.d.ts

@@ -1,14 +1,23 @@
 import React from 'react';
 import { QuickShowConfig } from '@alicloudfe/components/types/dialog';
 import { quickShowDrawerProps } from '@alicloudfe/components/types/drawer';
+import { IFormSchema, IFormSchemaItem } from '../form';
 import { RequestAction } from './request';
 export interface DialogAction extends Omit<RequestAction, 'url'>, Omit<QuickShowConfig, 'onError' | 'type'>, Omit<quickShowDrawerProps, 'trigger' | 'animation' | 'height' | 'locale' | 'onOk' | 'onCancel' | 'onError'> {
+    /** 点击「确认按钮」后的数据请求地址，非必填，不填就不发请求 */
     url?: string;
+    /** 弹窗类型，支持普通弹窗和抽屉两种模式，默认为普通弹窗 */
     dialogType?: 'dialog' | 'drawer';
+    /** 弹窗快捷调用类型 */
     dialogQuickShowType?: 'alert' | 'confirm';
+    /** 弹窗消息类型 */
     messageType?: 'success' | 'warning' | 'error' | 'notice' | 'help' | 'loading';
+    /** 位于弹窗内容上方的自定义内容区 */
     beforeContent?: React.ReactNode;
+    /** 位于弹窗内容下方的自定义内容区 */
     afterContent?: React.ReactNode;
+    /** 弹窗页脚描述区，位于按钮组的对面 */
+    footerDescription?: React.ReactNode | IFormSchema | IFormSchemaItem;
 }
 export declare function useDialogAction(action: DialogAction, context?: any): {
     [x: string]: (e: React.MouseEvent<HTMLElement, MouseEvent>) => void;

package/es/actions/dialog.js

@@ -1,20 +1,21 @@
 var _excluded = ["url", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError"],
-    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent"];
+    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "footerDescription", "footerAlign", "overlayProps"],
+    _excluded3 = ["className"];
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -27,10 +28,12 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useState } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
+import classnames from 'classnames';
 import { useHistory } from 'react-router-dom';
 import { Dialog, Drawer } from '@alicloudfe/components';
 import { getTargetValue, uuid, goToLink } from '@teamix/utils';
+import ProForm, { createForm } from '../form';
 import { eventHandler } from './base';
 import { doRequest } from './request';
 
@@ -40,6 +43,27 @@ function addContextForReactNode(content, context) {
   }
 
   return content;
+}
+
+var FooterForm = function FooterForm(props) {
+  var schema = props.schema,
+      context = props.context,
+      formRef = props.formRef;
+  var form = createForm();
+  useEffect(function () {
+    formRef.current = form;
+  }, []);
+  return /*#__PURE__*/React.createElement(ProForm, {
+    layout: "inline",
+    feedbackLayout: "none",
+    form: form,
+    schema: getTargetValue(schema, context)
+  });
+};
+
+function getFooterAlignClass(isDrawer, align) {
+  var footerAlign = align ? align : isDrawer ? 'left' : 'right';
+  return "footer-align-".concat(footerAlign);
 } // 弹窗 -> 请求（点击确认，发送数据请求）
 
 
@@ -49,8 +73,10 @@ export function useDialogAction(action, context) {
       loading = _useState2[0],
       setLoading = _useState2[1];
 
+  var footerDescriptionRef = useRef();
   var history = useHistory();
-  return _objectSpread({}, eventHandler(action, function () {
+
+  var onActionStart = function onActionStart() {
     var url = action.url,
         method = action.method,
         params = action.params,
@@ -79,19 +105,54 @@ export function useDialogAction(action, context) {
         link = _getTargetValue.link,
         beforeContent = _getTargetValue.beforeContent,
         afterContent = _getTargetValue.afterContent,
-        dialogOtherProps = _objectWithoutProperties(_getTargetValue, _excluded2);
+        footerDescription = _getTargetValue.footerDescription,
+        footerAlign = _getTargetValue.footerAlign,
+        _getTargetValue$overl = _getTargetValue.overlayProps,
+        overlayProps = _getTargetValue$overl === void 0 ? {} : _getTargetValue$overl,
+        containerProps = _objectWithoutProperties(_getTargetValue, _excluded2);
+
+    var isDrawer = dialogType === 'drawer';
+    var container = isDrawer ? Drawer : Dialog;
 
-    var dialogMethod = dialogType === 'drawer' ? Drawer : Dialog;
-    var dialogProps = dialogType === 'drawer' ? {} : {
+    var overlayClassName = overlayProps.className,
+        overlayOtherProps = _objectWithoutProperties(overlayProps, _excluded3);
+
+    var dialogOnlyProps = {
       type: dialogQuickShowType,
       messageProps: {
         type: messageType
+      },
+      overlayProps: _objectSpread({
+        className: classnames('teamix-pro-action-dialog', overlayClassName, {
+          'has-footer-description': !!footerDescription
+        })
+      }, overlayOtherProps)
+    };
+    var containerOtherProps = isDrawer ? {} : dialogOnlyProps;
+
+    var renderDialogFooterDescription = function renderDialogFooterDescription(footer) {
+      if (footer instanceof Array || footer.component) {
+        var _schema = footer instanceof Array ? footer : [footer];
+
+        return /*#__PURE__*/React.createElement(FooterForm, {
+          formRef: footerDescriptionRef,
+          context: context,
+          schema: [{
+            component: 'FormFlex',
+            children: _schema
+          }]
+        });
       }
+
+      return footer;
     };
 
     var onOk = function onOk() {
       return new Promise( /*#__PURE__*/function () {
         var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(resolve) {
+          var _footerDescriptionRef;
+
+          var footerDescriptionValues, requestContext;
           return regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) {
               switch (_context.prev = _context.next) {
@@ -111,29 +172,33 @@ export function useDialogAction(action, context) {
 
                 case 5:
                   setLoading(true);
-                  _context.prev = 6;
-                  _context.next = 9;
-                  return doRequest(action, context, history);
-
-                case 9:
+                  footerDescriptionValues = Object.assign({}, footerDescriptionRef === null || footerDescriptionRef === void 0 ? void 0 : (_footerDescriptionRef = footerDescriptionRef.current) === null || _footerDescriptionRef === void 0 ? void 0 : _footerDescriptionRef.values);
+                  _context.prev = 7;
+                  requestContext = Object.assign({
+                    footer: footerDescriptionValues
+                  }, context);
+                  _context.next = 11;
+                  return doRequest(action, requestContext, history, footerDescriptionValues);
+
+                case 11:
                   onFinish && onFinish();
                   resolve(true);
-                  _context.next = 18;
+                  _context.next = 20;
                   break;
 
-                case 13:
-                  _context.prev = 13;
-                  _context.t0 = _context["catch"](6);
+                case 15:
+                  _context.prev = 15;
+                  _context.t0 = _context["catch"](7);
                   setLoading(false);
                   resolve(false);
                   return _context.abrupt("return");
 
-                case 18:
+                case 20:
                 case "end":
                   return _context.stop();
               }
             }
-          }, _callee, null, [[6, 13]]);
+          }, _callee, null, [[7, 15]]);
         }));
 
         return function (_x) {
@@ -157,7 +222,7 @@ export function useDialogAction(action, context) {
     var dialogContent = Component ? /*#__PURE__*/React.createElement(Component, _objectSpread({
       key: uuid()
     }, componentProps)) : addContextForReactNode(content, dialogContext);
-    var ret = dialogMethod.show(_objectSpread(_objectSpread({
+    var ret = container.show(_objectSpread(_objectSpread({
       // @ts-ignore
       onOk: onOk,
       title: addContextForReactNode(title, dialogContext),
@@ -165,10 +230,15 @@ export function useDialogAction(action, context) {
         className: "teamix-pro-dialog-before-content"
       }, beforeContent), dialogContent, afterContent && /*#__PURE__*/React.createElement("div", {
         className: "teamix-pro-dialog-after-content"
-      }, afterContent)),
-      closeable: !loading
-    }, dialogProps), dialogOtherProps));
+      }, afterContent), footerDescription && /*#__PURE__*/React.createElement("div", {
+        className: classnames('teamix-pro-dialog-footer-description', getFooterAlignClass(isDrawer, footerAlign))
+      }, renderDialogFooterDescription(footerDescription))),
+      closeable: !loading,
+      footerAlign: footerAlign
+    }, containerOtherProps), containerProps));
     store.hide = ret.hide;
-  }));
+  };
+
+  return _objectSpread({}, eventHandler(action, onActionStart));
 }
 export default useDialogAction;

package/es/actions/index.scss

@@ -29,6 +29,31 @@
   }
 }
 
+.teamix-pro-dialog-footer-description {
+  position: absolute;
+  z-index: 5;
+  display: flex;
+  align-items: center;
+  bottom: var(--dialog-footer-padding-top, 16px);
+  height: var(--btn-size-m-height, 32px);
+
+  &.footer-align-right {
+    left: var(--dialog-footer-padding-left-right, 20px);
+  }
+  &.footer-align-center {
+    left: var(--dialog-footer-padding-left-right, 20px);
+  }
+  &.footer-align-left {
+    right: var(--dialog-footer-padding-left-right, 20px);
+  }
+}
+
+.teamix-pro-action-dialog.has-footer-description {
+  .next-message {
+    position: static;
+  }
+}
+
 .teamix-pro-dialog-before-content {
   margin-bottom: var(--s-2);
 }
@@ -40,3 +65,9 @@
 .next-menu-divider + .next-menu-divider {
   display: none;
 }
+
+.next-dialog-body {
+  .teamix-pro-form {
+    margin-bottom: -20px;
+  }
+}

package/es/actions/link.js

@@ -5,11 +5,13 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 import { getTargetValue, goToLink } from '@teamix/utils';
+import { useHistory } from 'react-router-dom';
 import { eventHandler } from './base';
 export function useLinkAction(action, context) {
-  var linkAction = getTargetValue(action, context);
+  var history = useHistory();
   return _objectSpread({}, eventHandler(action, function () {
-    goToLink(linkAction);
+    var linkAction = getTargetValue(action, context);
+    goToLink(linkAction, history);
   }));
 }
 export default useLinkAction;

package/es/actions/request.d.ts

@@ -2,7 +2,7 @@ import { CommonRequestConfig } from '@teamix/utils';
 import { BaseAction } from './base';
 export interface RequestAction extends CommonRequestConfig, BaseAction {
 }
-export declare function doRequest(action: RequestAction, context?: any, history?: any): Promise<unknown>;
+export declare function doRequest(action: RequestAction, context?: any, history?: any, extraParams?: any): Promise<unknown>;
 export declare function useRequestAction(action: RequestAction, context?: any): {
     loading: boolean;
 };

package/es/actions/request.js

@@ -28,14 +28,14 @@ import { useHistory } from 'react-router-dom';
 import { doCommonRequest } from '@teamix/utils';
 import { eventHandler } from './base'; // action 里的数据请求都默认是 post 类型
 
-export function doRequest(action, context, history) {
+export function doRequest(action, context, history, extraParams) {
   var _action$method = action.method,
       method = _action$method === void 0 ? 'post' : _action$method,
       others = _objectWithoutProperties(action, _excluded);
 
   return doCommonRequest(_objectSpread({
     method: method
-  }, others), context, history);
+  }, others), context, history, extraParams);
 }
 export function useRequestAction(action, context) {
   var _useState = useState(false),

package/es/form/Components/ProField/index.d.ts

@@ -1,162 +1,79 @@
 import React from 'react';
 declare const _default: React.ForwardRefExoticComponent<(Partial<import("@teamix/pro-field/lib/components/FieldText").IProFieldText & {
     type: "text";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldTextArea").IProFieldTextArea & {
     type: "textarea";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldMoney").IProFieldMoney & {
     type: "money";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldCheckBox").IProFieldCheckBox & {
     type: "checkbox";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldRadio").IProFieldRadio & {
     type: "radio";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldSelect").IProFieldSelect & {
     type: "select";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldMultipleSelect").IProFieldMultipleSelect & {
     type: "multipleSelect";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldDate").IProFieldDate & {
     type: "date";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldDate").IProFieldDateWeek & {
     type: "dateWeek";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldDate").IProFieldDateMonth & {
     type: "dateMonth";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldDate").IProFieldDateYear & {
     type: "dateYear";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldDate").IProFieldDateQuarter & {
     type: "dateQuarter";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldDate").IProFieldDateRange & {
     type: "dateRange";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldDate").IProFieldDateWeekRange & {
     type: "dateWeekRange";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldDate").IProFieldDateMonthRange & {
     type: "dateMonthRange";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldDate").IProFieldDateYearRange & {
     type: "dateYearRange";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldDate").IProFieldDateQuarterRange & {
     type: "dateQuarterRange";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldDate").IProFieldDateTime & {
     type: "dateTime";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldDate").IProFieldDateTimeRange & {
     type: "dateTimeRange";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldDate").IProFieldTime & {
     type: "time";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldDate").IProFieldTimeRange & {
     type: "timeRange";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldNumber").IProFieldNumber & {
     type: "number";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldPercent").IProFieldPercent & {
     type: "percent";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldCascader").IProFieldCascader & {
     type: "cascader";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldCascader").IProFieldMultipleCascader & {
     type: "multipleCascader";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldCascader").IProFieldArbitraryCascader & {
     type: "arbitraryCascader";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldSwitch").IProFieldSwitch & {
     type: "switch";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldColor").IProFieldColor & {
     type: "color" | "colorSwatches" | "colorRadio" | "colorTwitter";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldIcon").IProFieldIcon & {
     type: "icon";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldTreeSelect").IProFieldTreeSelect & {
     type: "treeSelect";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldJson").IProFieldJson & {
     type: "json";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldTransfer").IProFieldTransfer & {
     type: "transfer";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldRange").IProFieldRange & {
     type: "range";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldPassword").IProFieldPassword & {
     type: "password";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldSearch").IProFieldSearch & {
     type: "search";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldTagFilter").IProFieldTagFilter & {
     type: "tagFilter";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldTagFilter").IProFieldMultipleTagFilter & {
     type: "multipleTagPicker";
-} & {
-    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldMenuSelect").IProFieldMenuSelect & {
     type: "menuSelect";
-} & {
-    children?: React.ReactNode;
-}> | Pick<Partial<{
-    [key: string]: any;
-    type: string;
-    value?: any;
-    initValue?: any;
-} & import("@teamix/pro-field").IProBaseField & {
-    children?: React.ReactNode;
-}>, string | number>) & React.RefAttributes<unknown>>;
+}> | Pick<Partial<import("@teamix/pro-field").IProFieldCustom>, keyof import("@teamix/pro-field").IProFieldCustom>) & React.RefAttributes<unknown>>;
 export default _default;

package/es/form/typing.d.ts

@@ -33,11 +33,11 @@ export interface IFormSchemaItem {
     tooltip?: string;
     required?: boolean;
     display?: FieldDisplayTypes;
-    visible?: boolean;
-    hidden?: boolean;
-    disabled?: boolean;
-    readOnly?: boolean;
-    readPretty?: boolean;
+    visible?: boolean | string;
+    hidden?: boolean | string;
+    disabled?: boolean | string;
+    readOnly?: boolean | string;
+    readPretty?: boolean | string;
     pattern?: FieldPatternTypes;
     default?: any;
     request?: IRequestConfig;

package/es/index.d.ts

@@ -21,5 +21,5 @@ export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
 export * from './table';
-declare const version = "1.1.34";
+declare const version = "1.1.38";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };

package/es/index.js

@@ -25,6 +25,6 @@ export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
 export * from './table';
-var version = '1.1.34';
+var version = '1.1.38';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils };

package/es/info/components/InfoValueItem/index.js

@@ -131,6 +131,9 @@ var InfoValueItem = function InfoValueItem(props) {
         type: "text",
         style: {
           marginLeft: '8px'
+        },
+        context: {
+          record: record
         }
       });
     }

package/es/info/components/baseInfo/index.js

@@ -19,28 +19,47 @@ var ProBaseInfo = function ProBaseInfo(props) {
       actionRef = props.actionRef,
       layout = props.layout,
       size = props.size;
-  var defaultLayout = defaultLayoutMap[getLayout((_size$width = size === null || size === void 0 ? void 0 : size.width) !== null && _size$width !== void 0 ? _size$width : 0)]; // 获取列的布局参数
+  var defaultLayout = defaultLayoutMap[getLayout((_size$width = size === null || size === void 0 ? void 0 : size.width) !== null && _size$width !== void 0 ? _size$width : 0)]; // 获取列内的布局参数
+
+  var getFormItemLayout = function getFormItemLayout(colspan) {
+    var formItemLayout = JSON.parse(JSON.stringify(defaultLayout.formItemLayout)); // 自定义布局
 
-  var getFormItemLayout = function getFormItemLayout() {
     if (layout) {
       var _layout$labelCol, _layout$wrapperCol;
 
-      return {
-        labelCol: (_layout$labelCol = layout === null || layout === void 0 ? void 0 : layout.labelCol) !== null && _layout$labelCol !== void 0 ? _layout$labelCol : defaultLayout.formItemLayout.labelCol,
-        wrapperCol: (_layout$wrapperCol = layout === null || layout === void 0 ? void 0 : layout.wrapperCol) !== null && _layout$wrapperCol !== void 0 ? _layout$wrapperCol : defaultLayout.formItemLayout.wrapperCol
-      };
+      var labelCol = (_layout$labelCol = layout === null || layout === void 0 ? void 0 : layout.labelCol) !== null && _layout$labelCol !== void 0 ? _layout$labelCol : defaultLayout.formItemLayout.labelCol;
+      var wrapperCol = (_layout$wrapperCol = layout === null || layout === void 0 ? void 0 : layout.wrapperCol) !== null && _layout$wrapperCol !== void 0 ? _layout$wrapperCol : defaultLayout.formItemLayout.wrapperCol;
+      formItemLayout.labelCol = labelCol;
+      formItemLayout.wrapperCol = wrapperCol;
+    }
+
+    var newLabelSpan = formItemLayout.labelCol.span;
+    var newWrapperSpan = formItemLayout.wrapperCol.span; // 计算合并列情况。label与wrapper需要重新计算
+
+    if (colspan) {
+      newLabelSpan = newLabelSpan / colspan;
+      newWrapperSpan = newWrapperSpan + (formItemLayout.labelCol.span - newLabelSpan);
     }
 
-    return defaultLayout.formItemLayout;
+    var newFormItemLayout = {
+      labelCol: {
+        span: newLabelSpan
+      },
+      wrapperCol: {
+        span: newWrapperSpan
+      }
+    };
+    return Object.assign(formItemLayout, newFormItemLayout);
   };
 
   var renderContent = function renderContent() {
     return columns.map(function (item, index) {
-      var _layout$span, _item$title, _item$valueType, _ref;
+      var _layout$span, _layout$span2, _item$title, _item$valueType, _ref, _item$colSpan;
 
       var span = item.colSpan ? defaultLayout.span * item.colSpan : defaultLayout.span;
+      var layoutSpan = item.colSpan ? ((_layout$span = layout === null || layout === void 0 ? void 0 : layout.span) !== null && _layout$span !== void 0 ? _layout$span : span) * item.colSpan : (_layout$span2 = layout === null || layout === void 0 ? void 0 : layout.span) !== null && _layout$span2 !== void 0 ? _layout$span2 : span;
       return /*#__PURE__*/React.createElement(Col, {
-        span: (_layout$span = layout === null || layout === void 0 ? void 0 : layout.span) !== null && _layout$span !== void 0 ? _layout$span : span,
+        span: layoutSpan,
         key: index
       }, /*#__PURE__*/React.createElement(ProInfoItem, {
         label: (_item$title = item === null || item === void 0 ? void 0 : item.title) !== null && _item$title !== void 0 ? _item$title : '',
@@ -54,7 +73,7 @@ var ProBaseInfo = function ProBaseInfo(props) {
           record: dataSource !== null && dataSource !== void 0 ? dataSource : result,
           actionRef: actionRef
         }),
-        baseInfoLayout: getFormItemLayout(),
+        baseInfoLayout: getFormItemLayout((_item$colSpan = item === null || item === void 0 ? void 0 : item.colSpan) !== null && _item$colSpan !== void 0 ? _item$colSpan : 0),
         tooltip: item.tooltip,
         tooltipIcon: item.tooltipIcon
       }));