@teamix/pro 1.3.6 → 1.3.9

package/dist/pro.min.js.LICENSE.txt

@@ -26,15 +26,6 @@ object-assign
 
 /*! js-cookie v3.0.1 | MIT */
 
-/**
- * @license
- * Lodash <https://lodash.com/>
- * Copyright OpenJS Foundation and other contributors <https://openjsf.org/>
- * Released under MIT license <https://lodash.com/license>
- * Based on Underscore.js 1.8.3 <http://underscorejs.org/LICENSE>
- * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
- */
-
 /** @license React v16.13.1
  * react-is.production.min.js
  *

package/es/actions/dialog-form.d.ts

@@ -20,6 +20,8 @@ export interface DialogFormAction extends DialogAction {
     schema: ProFormSchema | Omit<ProFormProps, 'form'>;
     /** 外部传来的 formRef，用于获取内置 form 实例 */
     formRef?: React.MutableRefObject<ProFormType | undefined>;
+    /** 是否开启懒惰校验，只校验第一个非法规则，默认开启 */
+    validateFirst?: boolean;
 }
 export declare function useDialogFormAction(action: DialogFormAction, context?: any): {
     [x: string]: (e: React.MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;

package/es/actions/dialog-form.js

@@ -90,14 +90,17 @@ var DialogForm = function DialogForm(props) {
       formProps = props.formProps,
       context = props.context,
       formRef = props.formRef,
-      innerFormRef = props.innerFormRef;
+      innerFormRef = props.innerFormRef,
+      _props$validateFirst = props.validateFirst,
+      validateFirst = _props$validateFirst === void 0 ? true : _props$validateFirst;
 
   var _getSchemaAndFormProp = getSchemaAndFormProps(schema, formProps),
       formSchema = _getSchemaAndFormProp.schema,
       others = _objectWithoutProperties(_getSchemaAndFormProp, _excluded);
 
   var form = createForm({
-    initialValues: getTargetValue(initialValues, context)
+    initialValues: getTargetValue(initialValues, context),
+    validateFirst: validateFirst
   });
 
   var _useState = useState(false),

package/es/actions/dialog.js

@@ -174,17 +174,22 @@ export function useDialogAction(action, actionContext) {
                 case 6:
                   onFinish && onFinish();
                   resolve(true);
-                  _context.next = 15;
+                  _context.next = 16;
                   break;
 
                 case 10:
                   _context.prev = 10;
                   _context.t0 = _context["catch"](2);
-                  setLoading(false);
+                  setLoading(false); // 如果 beforeRequest 中返回了 false，则直接关闭弹窗
+
+                  if (beforeRequest) {
+                    resolve(true);
+                  }
+
                   resolve(false);
                   return _context.abrupt("return");
 
-                case 15:
+                case 16:
                 case "end":
                   return _context.stop();
               }

package/es/actions/index.d.ts

@@ -1,6 +1,7 @@
-import React from 'react';
+import React, { ReactNode } from 'react';
 import { ButtonProps } from '@alicloudfe/components/types/button';
 import { MenuButtonProps } from '@alicloudfe/components/types/menu-button';
+import { TooltipProps } from '@alicloudfe/components/types/balloon';
 import { LinkAction } from './link';
 import { RequestAction } from './request';
 import { DialogAction } from './dialog';
@@ -29,7 +30,10 @@ export declare function useAction(config?: ProActionConfig, context?: any): any;
 export interface ProActionButtonProps extends ProActionCommonProps, ButtonProps {
     config?: ProActionConfig;
     disabled?: any;
+    tooltip?: ReactNode;
+    disabledTooltip?: ReactNode;
     icon?: string;
+    tooltipProps?: TooltipProps;
     onClick?: (event: React.MouseEvent<Element, MouseEvent>, context?: any) => void;
 }
 export declare const ProActionButton: (props: ProActionButtonProps) => JSX.Element;

package/es/actions/index.js

@@ -1,5 +1,5 @@
 var _excluded = ["type"],
-    _excluded2 = ["config", "icon", "iconSize", "type", "context", "children", "visible", "onClick"],
+    _excluded2 = ["config", "icon", "iconSize", "type", "context", "children", "visible", "disabled", "onClick", "tooltip", "disabledTooltip", "tooltipProps"],
     _excluded3 = ["loading"],
     _excluded4 = ["icon", "iconSize", "label", "actions", "children", "context", "type", "className", "noArrow"],
     _excluded5 = ["context", "text"],
@@ -31,9 +31,9 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 import React from 'react';
 import cls from 'classnames';
-import { Button, MenuButton, Menu, Divider } from '@alicloudfe/components';
+import { Button, MenuButton, Menu, Divider, Balloon } from '@alicloudfe/components';
 import Icon from '@teamix/icon';
-import { getTargetValue, getMessage } from '@teamix/utils';
+import { getTargetValue, getMessage, usePrefixCls } from '@teamix/utils';
 import { useLinkAction } from './link';
 import { useRequestAction } from './request';
 import { useDialogAction } from './dialog';
@@ -165,18 +165,39 @@ export var ProActionButton = function ProActionButton(props) {
       context = props.context,
       children = props.children,
       visible = props.visible,
+      disabled = props.disabled,
       _onClick = props.onClick,
+      tooltip = props.tooltip,
+      disabledTooltip = props.disabledTooltip,
+      tooltipProps = props.tooltipProps,
       others = _objectWithoutProperties(props, _excluded2);
 
   var actionProps = useAction(config, context);
-  var buttonProps = _onClick ? _objectSpread(_objectSpread(_objectSpread({}, actionProps), others), {}, {
+  var buttonProps = _onClick ? _objectSpread(_objectSpread(_objectSpread({
+    disabled: disabled
+  }, actionProps), others), {}, {
     onClick: function onClick(e) {
       return _onClick(e, context);
     }
-  }) : _objectSpread(_objectSpread({}, actionProps), others);
-  return /*#__PURE__*/React.createElement(Button, _objectSpread({
+  }) : _objectSpread(_objectSpread({
+    disabled: disabled
+  }, actionProps), others);
+  var content = /*#__PURE__*/React.createElement(Button, _objectSpread({
     type: type
   }, buttonProps), buttonContent(children, icon, iconSize, context));
+
+  var baseToolTipProps = _objectSpread({
+    triggerType: 'hover',
+    align: 't',
+    trigger: content
+  }, tooltipProps);
+
+  if (tooltip || disabledTooltip) {
+    var showToolTip = disabled ? disabledTooltip : tooltip;
+    content = /*#__PURE__*/React.createElement(Balloon.Tooltip, _objectSpread({}, baseToolTipProps), showToolTip);
+  }
+
+  return content;
 };
 
 var ProActionMenuButtonItem = function ProActionMenuButtonItem(props) {
@@ -202,9 +223,7 @@ var ProActionMenuButtonItem = function ProActionMenuButtonItem(props) {
     }
   }) : _objectSpread({}, menuItemProps);
   return /*#__PURE__*/React.createElement("div", _objectSpread({
-    className: cls('teamix-pro-action-menu-item', 'next-menu-item', {
-      'next-disabled': disabled
-    })
+    className: cls('teamix-pro-action-menu-item', "".concat(usePrefixCls(), "menu-item"), _defineProperty({}, "".concat(usePrefixCls(), "disabled"), disabled))
   }, buttonProps), buttonContent(children, icon, undefined, context));
 };
 
@@ -363,6 +382,8 @@ function getActionConfig(action, index, context) {
       key: getKey(index, _key),
       actions: actions.map(function (a, j) {
         return getActionConfig(a, j, context);
+      }).filter(function (action) {
+        return action.visible !== false;
       })
     }, getTargetValue(_others, context));
   }

package/es/form/Components/LightFilter/index.js

@@ -16,12 +16,12 @@ 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 React, { useState, useCallback } from 'react';
-import { observer, useFieldSchema, RecursionField } from '@formily/react';
+import React, { useState, useCallback, useContext } from 'react';
+import { observer, useFieldSchema, RecursionField, SchemaExpressionScopeContext } from '@formily/react';
 import { Select, Button } from '@alicloudfe/components';
 import TeamixIcon from '@teamix/icon';
 import cls from 'classnames';
-import { usePrefixCls } from '@teamix/utils';
+import { usePrefixCls, getTargetValue } from '@teamix/utils';
 import { componentMap, inputCategory } from './componentMap';
 import './index.scss';
 
@@ -56,13 +56,14 @@ var useMain = function useMain(active) {
 }; // 筛选项数据
 
 
-var useFilterItems = function useFilterItems(filterValues) {
+var useFilterItems = function useFilterItems(filterValues, scope) {
   var schema = useFieldSchema();
   var filterItems = [];
   schema.mapProperties(function (schema, name) {
     if (!filterValues || filterValues && filterValues.includes(schema.name)) {
+      var label = /{{.*}}/.test(schema.title) ? getTargetValue(schema.title, scope) : schema.title;
       filterItems.push({
-        label: schema.title,
+        label: label,
         value: schema.name
       });
     }
@@ -85,7 +86,8 @@ var LightFilter = observer(function (props) {
       onFilterChange = props.onFilterChange,
       filterProps = props.filterProps,
       buttonProps = props.buttonProps;
-  var filterItems = useFilterItems(filterValues);
+  var scope = useContext(SchemaExpressionScopeContext);
+  var filterItems = useFilterItems(filterValues, scope);
 
   var _useState = useState(defaultFilterValue || ((_filterItems$ = filterItems[0]) === null || _filterItems$ === void 0 ? void 0 : _filterItems$.value)),
       _useState2 = _slicedToArray(_useState, 2),

package/es/form/Filter/LightFilter.js

@@ -12,8 +12,12 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 import React, { memo, useMemo, useCallback, useRef, useEffect } from 'react';
 import cls from 'classnames';
+import { observable } from '@formily/reactive';
 import { usePrefixCls } from '@teamix/utils';
 import ProForm from '../ProForm';
+var lightFilterObs = observable({
+  onFilter: function onFilter() {}
+});
 /**
  * 轻量筛选
  */
@@ -69,7 +73,7 @@ var LightFilter = /*#__PURE__*/memo(function (props) {
         filterValues: filterValues,
         onFilterChange: onFilterChange,
         buttonProps: {
-          onClick: onFilter
+          onClick: "{{lightFilterObs.onFilter}}"
         }
       },
       children: schema
@@ -81,8 +85,14 @@ var LightFilter = /*#__PURE__*/memo(function (props) {
         }
       }
     }];
-  }, [schema, onFilter, onFilterChange, defaultFilterValue]);
+  }, [schema, onFilterChange, defaultFilterValue]);
+  useEffect(function () {
+    lightFilterObs.onFilter = onFilter;
+  }, [onChange]);
   return /*#__PURE__*/React.createElement(ProForm, _objectSpread(_objectSpread({}, otherProps), {}, {
+    scope: _objectSpread(_objectSpread({}, otherProps === null || otherProps === void 0 ? void 0 : otherProps.scope), {}, {
+      lightFilterObs: lightFilterObs
+    }),
     form: form,
     className: cls(prefixCls, props.className),
     schema: LightSchema,

package/es/form/Filter/useSpecialProps.js

@@ -1,4 +1,4 @@
-import { isUsable, isStr, isPureObj } from '@teamix/utils'; // 获取Schema是否包含默认值、异步默认值、必选校验等
+import { isUsable, isStr, isPlainObj } from '@teamix/utils'; // 获取Schema是否包含默认值、异步默认值、必选校验等
 
 var useSpecialProps = function useSpecialProps(props) {
   var initialValues = props.initialValues,
@@ -16,7 +16,7 @@ var useSpecialProps = function useSpecialProps(props) {
           dataSource = item.dataSource,
           children = item.children; // 字符串变量配置default值会触发onChange
 
-      hasChangeDefault = hasChangeDefault || !!(isPureObj(dataSource) && isStr(value) && value.indexOf('.dataSource'));
+      hasChangeDefault = hasChangeDefault || !!(isPlainObj(dataSource) && isStr(value) && value.indexOf('.dataSource'));
       hasDefault = hasDefault || isUsable(value);
       hasRequired = hasRequired || required || !!rules;
 

package/es/form/ProForm/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["form", "initialValues", "initialRequest", "schema", "scope", "context", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onSubmit", "onSubmitFailed", "onInitialComplete", "className"];
+var _excluded = ["form", "initialValues", "initialRequest", "schema", "scope", "context", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onSubmit", "onSubmitFailed", "onInitialComplete", "className", "validateFirst"];
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -15,7 +15,7 @@ import cls from 'classnames';
 import { createForm, onFieldValueChange, registerValidateLocale, setValidateLanguage } from '@formily/core';
 import { toJS } from '@formily/reactive';
 import { Form } from '@teamix/formily';
-import { usePrefixCls, getLanguage } from '@teamix/utils';
+import { usePrefixCls, getLanguage, getGlobalConfig } from '@teamix/utils';
 import SchemaForm from '../SchemaForm';
 import { mergeArrayValue } from '../utils';
 import useAutoSubmit from './useAutoSubmit';
@@ -43,21 +43,30 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
       onSubmitFailed = _ref.onSubmitFailed,
       onInitialComplete = _ref.onInitialComplete,
       className = _ref.className,
+      validateFirst = _ref.validateFirst,
       otherProps = _objectWithoutProperties(_ref, _excluded);
 
+  // 获取全局配置
+  var _ref2 = getGlobalConfig('ProForm') || {},
+      globalComponents = _ref2.components,
+      globalScope = _ref2.scope;
+
   var form = useMemo(function () {
     return outerForm || createForm({
-      validateFirst: true
+      validateFirst: validateFirst
     });
   }, []);
   var prefixCls = usePrefixCls('', {
     prefix: 'teamix-pro-form'
   });
-  var mergedScope = useMemo(function () {
-    return _objectSpread(_objectSpread({}, scope), {}, {
-      context: context
-    });
-  }, [scope, context]);
+
+  var mergedScope = _objectSpread(_objectSpread(_objectSpread({}, globalScope), scope), {}, {
+    context: context
+  }); // context需要实名不能解构
+
+
+  var mergedComponents = _objectSpread(_objectSpread({}, globalComponents), components);
+
   var onAutoSubmit = useAutoSubmit(onSubmit); // todo 需要formily支持断点下的属性更新
 
   var getTeamixLayout = useMemo(function () {
@@ -114,11 +123,12 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
   }), /*#__PURE__*/React.createElement(SchemaForm, {
     schema: schema,
     scope: mergedScope,
-    components: components
+    components: mergedComponents
   }), children);
 });
 ProForm.defaultProps = {
   colon: false,
-  labelAlign: 'left'
+  labelAlign: 'left',
+  validateFirst: true
 };
 export default ProForm;

package/es/form/ProForm/index.scss

@@ -197,14 +197,15 @@
     margin-right: 4px;
   }
 }
-// 数组类ArrayItem Icon 居中（移除，通过align:center配置）
-// .#{$form-array}-items-item-inner {
-//   .#{$css-prefix}space-item {
-//     > .#{$css-prefix}formily-icon {
-//       margin-top: 9px;
-//     }
-//   }
-// }
+// 数组类ArrayItem Icon text 居中
+.#{$form-array}-items-item-inner {
+  .#{$css-prefix}space-item {
+    > .#{$css-prefix}formily-icon.#{$css-prefix}btn-text {
+      line-height: inherit !important;
+      margin-right: 0;
+    }
+  }
+}
 
 // Editable预览态行高
 .#{$css-prefix}formily-editable-content {
@@ -212,6 +213,13 @@
 }
 
 // 折叠面板
+.#{$css-prefix}formily-collapse {
+  .#{$css-prefix}collapse-panel-title {
+    .#{$css-prefix}badge-count {
+      transform: translateX(4px);
+    }
+  }
+}
 .#{$css-prefix}formily-collapse,
 .#{$form-array}-collapse-item {
   .#{$css-prefix}collapse-panel-hidden {

package/es/form/SchemaForm/index.js

@@ -30,7 +30,7 @@ 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 React, { memo, useCallback, useMemo } from 'react';
+import React, { memo, useCallback, useRef, useMemo } from 'react';
 import { createSchemaField } from '@formily/react';
 import { Affix } from '@alicloudfe/components';
 import { Upload, SelectTable, FormLayout, FormItem, ArrayCollapse, ArrayCards, ArrayItems, ArrayTable, Space, FormGrid, FormTab, FormCollapse, FormStep, Editable, FormDialog, FormDrawer, FormButtonGroup, Submit, Reset } from '@teamix/formily';
@@ -59,22 +59,16 @@ import initializeSelectTable from './initializeSelectTable';
 import { $request, $common, $dataSource, $validator } from './reactions';
 import fieldTypeMap from '../fieldTypeMap';
 import { getFieldName, mapSchemaName } from '../utils';
-import { getGlobalConfig } from '@teamix/utils';
 import warning from '../warning';
 export default /*#__PURE__*/memo(function (_ref) {
   var schema = _ref.schema,
       scope = _ref.scope,
       components = _ref.components;
-
-  // 获取全局配置
-  var _ref2 = getGlobalConfig('ProForm') || {},
-      globalComponents = _ref2.components,
-      globalScope = _ref2.scope; // 创建 SchemaField
-
+  var schemaScopeRef = useRef({}); // 创建 SchemaField，添加内置组件
 
   var SchemaField = useMemo(function () {
     return createSchemaField({
-      components: _objectSpread(_objectSpread(_objectSpread({}, globalComponents), ProFieldComponents), {}, {
+      components: _objectSpread(_objectSpread({}, ProFieldComponents), {}, {
         FormLayout: FormLayout,
         FormItem: FormItem,
         ArrayCollapse: ArrayCollapse,
@@ -103,16 +97,7 @@ export default /*#__PURE__*/memo(function (_ref) {
         Text: Text
       })
     });
-  }, []); // 合并 schema 中 request 的 scope
-
-  var mergedScope = useMemo(function () {
-    return _objectSpread(_objectSpread(_objectSpread({}, globalScope), scope), {}, {
-      $request: $request,
-      $common: $common,
-      $dataSource: $dataSource,
-      $validator: $validator
-    });
-  }, [scope]); // 格式化 schema
+  }, []); // 格式化 schema
 
   var formatSchema = useCallback(function (schema) {
     var parentSuffix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
@@ -231,12 +216,12 @@ export default /*#__PURE__*/memo(function (_ref) {
 
       var defaultReactions = initializeReactions(reactions, [].concat(_toConsumableArray(requestReactions), _toConsumableArray(dataSourceReactions))); // 合并scope
 
-      Object.entries(_objectSpread(_objectSpread(_objectSpread({}, requestScope), dataSourceScope), rulesScope)).map(function (_ref3) {
-        var _ref4 = _slicedToArray(_ref3, 2),
-            k = _ref4[0],
-            v = _ref4[1];
+      Object.entries(_objectSpread(_objectSpread(_objectSpread({}, requestScope), dataSourceScope), rulesScope)).map(function (_ref2) {
+        var _ref3 = _slicedToArray(_ref2, 2),
+            k = _ref3[0],
+            v = _ref3[1];
 
-        mergedScope[k] = v;
+        schemaScopeRef.current[k] = v;
       });
       var formatParam = mapSchemaName(_objectSpread(_objectSpread({}, otherProps), {}, {
         type: defaultType,
@@ -261,13 +246,20 @@ export default /*#__PURE__*/memo(function (_ref) {
       schemaProperties[name] = _objectSpread(_objectSpread(_objectSpread({}, formatParam), recursiveProperties), recursiveItems);
     });
     return schemaProperties;
-  }, [mergedScope]);
+  }, []);
   var formilySchema = useMemo(function () {
     return {
       type: 'object',
       properties: formatSchema(schema)
     };
-  }, [schema]); // console.log(formilySchema);
+  }, [schema]);
+
+  var mergedScope = _objectSpread(_objectSpread({}, scope), {}, {
+    $request: $request,
+    $common: $common,
+    $dataSource: $dataSource,
+    $validator: $validator
+  }, schemaScopeRef.current);
 
   return /*#__PURE__*/React.createElement(SchemaField, {
     schema: formilySchema,

package/es/form/SchemaForm/reactions.js

@@ -10,7 +10,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 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; }
 
-import { isFn, isPureObj, doCommonRequest, getValueByValue } from '@teamix/utils'; // 配置请求
+import { isFn, isPlainObj, doCommonRequest, getValueByValue } from '@teamix/utils'; // 配置请求
 
 var $request = function $request(field, _ref, context, type) {
   var _field$data;
@@ -29,7 +29,7 @@ var $request = function $request(field, _ref, context, type) {
   // 触发所有配置的请求
 
   var refresh = (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.refresh;
-  var refreshResult = isPureObj(refresh) ? refresh : {};
+  var refreshResult = isPlainObj(refresh) ? refresh : {};
   return doCommonRequest(_objectSpread(_objectSpread({}, requestConfig), {}, {
     params: _objectSpread(_objectSpread(_objectSpread({}, params), beforeRequestResult), refreshResult),
     beforeRequest: function beforeRequest() {

package/es/form/typing.d.ts

@@ -66,6 +66,7 @@ export interface ProFormProps extends IFormLayoutProps {
     initialValues?: AnyObject;
     initialRequest?: ProFormRequestConfig;
     previewTextPlaceholder?: ReactNode;
+    validateFirst?: boolean;
     onChange?: (values: any, fieldValue?: any, fieldName?: any) => any;
     onSubmit?: ((values: any) => any) | CommonRequestConfig;
     onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;

package/es/index.d.ts

@@ -26,5 +26,5 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.3.6";
+declare const version = "1.3.9";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, hooks, nocode, templates, utils, };

package/es/index.js

@@ -31,6 +31,6 @@ export * from './sidebar';
 export * from './utils'; // export * from './sidebar';
 
 export * from './timeline';
-var version = '1.3.6';
+var version = '1.3.9';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, hooks, nocode, templates, utils };

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

@@ -14,17 +14,13 @@ var ProInfoItem = function ProInfoItem(prop) {
       headerInfoLayout = prop.headerInfoLayout,
       loading = prop.loading,
       tooltip = prop.tooltip,
-      tooltipIcon = prop.tooltipIcon,
-      _isLastRow = prop._isLastRow;
+      tooltipIcon = prop.tooltipIcon;
 
   if (baseInfoLayout) {
     var labelCol = baseInfoLayout.labelCol,
         wrapperCol = baseInfoLayout.wrapperCol;
     return /*#__PURE__*/React.createElement("div", {
-      className: cls({
-        '': true,
-        isLastRow: _isLastRow
-      })
+      className: cls('')
     }, /*#__PURE__*/React.createElement(Row, {
       gutter: 10,
       className: cls('base-row')

package/es/info/components/ProInfoItem/index.scss

@@ -17,10 +17,6 @@ $item-padding-bottom: 8px;
 .teamix-pro-field-info-form-item {
   width: 100%;
   padding-bottom: $item-padding-bottom;
-  &-isLastRow{
-    padding-bottom: unset;
-  }
-
   &-header-row {
     display: flex;
     align-items: center;

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

@@ -5,7 +5,7 @@ import './index.scss';
 import { getLayout } from '../../utils/utils';
 import defaultLayoutMap from '../../utils/layout';
 import InfoValueItem from '../InfoValueItem';
-import { getDataIndexValue, isLastRow } from '../../utils';
+import { getDataIndexValue } from '../../utils';
 var Row = Grid.Row,
     Col = Grid.Col;
 
@@ -26,23 +26,33 @@ var ProBaseInfo = function ProBaseInfo(props) {
     var formItemLayout = JSON.parse(JSON.stringify(defaultLayout.formItemLayout)); // 自定义布局
 
     if (layout) {
-      var _layout$labelCol, _layout$wrapperCol;
+      var _layout$labelCol, _layout$wrapperCol, _layout$span;
 
       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;
+      var span = (_layout$span = layout === null || layout === void 0 ? void 0 : layout.span) !== null && _layout$span !== void 0 ? _layout$span : defaultLayout.span;
+
+      if ((layout === null || layout === void 0 ? void 0 : layout.colNum) && layout.colNum > 0 && layout.colNum <= 4) {
+        span = 24 / layout.colNum;
+      }
+
+      formItemLayout.span = span;
       formItemLayout.labelCol = labelCol;
       formItemLayout.wrapperCol = wrapperCol;
     }
 
+    var newSpan = formItemLayout.span;
     var newLabelSpan = formItemLayout.labelCol.span;
     var newWrapperSpan = formItemLayout.wrapperCol.span; // 计算合并列情况。label与wrapper需要重新计算
 
     if (colspan) {
+      newSpan = newSpan * (colspan !== null && colspan !== void 0 ? colspan : 1);
       newLabelSpan = newLabelSpan / colspan;
       newWrapperSpan = newWrapperSpan + (formItemLayout.labelCol.span - newLabelSpan);
     }
 
     var newFormItemLayout = {
+      span: newSpan,
       labelCol: {
         span: newLabelSpan
       },
@@ -55,17 +65,14 @@ var ProBaseInfo = function ProBaseInfo(props) {
 
   var renderContent = function renderContent() {
     return columns.map(function (item, index) {
-      var _layout$span, _layout$span2, _item$title, _item$valueType, _ref, _item$colSpan;
+      var _getFormItemLayout, _item$colSpan, _item$title, _item$valueType, _ref, _item$colSpan2;
 
-      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: layoutSpan,
+        span: (_getFormItemLayout = getFormItemLayout((_item$colSpan = item === null || item === void 0 ? void 0 : item.colSpan) !== null && _item$colSpan !== void 0 ? _item$colSpan : 0)) === null || _getFormItemLayout === void 0 ? void 0 : _getFormItemLayout.span,
         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 : '',
         loading: loading,
-        _isLastRow: !!isLastRow(columns.length, layoutSpan, index),
         value: /*#__PURE__*/React.createElement(InfoValueItem, {
           type: (_item$valueType = item === null || item === void 0 ? void 0 : item.valueType) !== null && _item$valueType !== void 0 ? _item$valueType : 'text',
           value: getDataIndexValue(item.dataIndex, (_ref = dataSource !== null && dataSource !== void 0 ? dataSource : result) !== null && _ref !== void 0 ? _ref : {}),
@@ -77,7 +84,7 @@ var ProBaseInfo = function ProBaseInfo(props) {
           context: context,
           props: item.props
         }),
-        baseInfoLayout: getFormItemLayout((_item$colSpan = item === null || item === void 0 ? void 0 : item.colSpan) !== null && _item$colSpan !== void 0 ? _item$colSpan : 0),
+        baseInfoLayout: getFormItemLayout((_item$colSpan2 = item === null || item === void 0 ? void 0 : item.colSpan) !== null && _item$colSpan2 !== void 0 ? _item$colSpan2 : 0),
         tooltip: item.tooltip,
         tooltipIcon: item.tooltipIcon
       }));

package/es/info/typing.d.ts

@@ -113,8 +113,6 @@ export declare type IProProInfoItem = {
     headerInfoLayout?: ProHeaderInfoLayoutProps;
     /** loading 状态 */
     loading?: boolean;
-    /** isLastRow 是否是最后一行的元素 */
-    _isLastRow?: boolean;
 } & Pick<ProInfoColumnsProps, 'tooltip' | 'tooltipIcon'>;
 /** header info 定义 */
 export declare type IProHeaderInfo = {
@@ -137,6 +135,7 @@ export declare type ProInfoProps = {
 export declare type IProHeaderInfoItem = {};
 export declare type BaseInfoLayoutProps = ProBaseInfoLayoutProps;
 export declare type ProBaseInfoLayoutProps = {
+    colNum?: number;
     span?: number;
     labelCol?: {
         span: number;

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

@@ -10,11 +10,3 @@ export declare const ProInfoGroupContext: React.Context<ProInfoGroupContextProps
  * @returns
  */
 export declare function getDataIndexValue(dataIndex: ProInfoColumnsProps['dataIndex'], dataSource: object): any;
-/**
- * 是否是最后一样的元素
- * @param columnsLength
- * @param layoutSpan
- * @params itemIndex
- * @returns
- */
-export declare const isLastRow: (columnsLength: number, layoutSpan: number, itemIndex: number) => boolean | undefined;