@teamix/pro 1.1.4 → 1.1.8

package/es/form/index.js

@@ -1,23 +1,35 @@
 /**
- * 导出全部 @teamix/formily 方法，支持完全自主定义表单
+ * 导出ProForm的TS
  */
+export * from './typing';
+/**
+ * 使用别名导出formily相关内容
+ */
+
 import * as _formilyCore from '@formily/core';
 export { _formilyCore as formilyCore };
 import * as _formilyReact from '@formily/react';
 export { _formilyReact as formilyReact };
-export * from '@teamix/formily';
-export * from './Filter';
-export * from './typing';
+import * as _formilyReactive from '@formily/reactive';
+export { _formilyReactive as formilyReactive };
+import * as _formilyTeamix from '@teamix/formily';
+export { _formilyTeamix as formilyTeamix };
 /**
- * 导出常用方法等
+ * 导出常用formily内容，需谨慎限制
  */
 
 import { createForm, registerValidateRules as registerRules, registerValidateFormats as registerFormats, registerValidateLocale, setValidateLanguage } from '@formily/core';
-import { createSchemaField, Field, FormConsumer } from '@formily/react';
-import { toJS } from '@formily/reactive';
-export { createForm, registerRules, registerFormats, registerValidateLocale, setValidateLanguage, Field, createSchemaField, FormConsumer, toJS };
+import { FormConsumer } from '@formily/react';
+import { FormDialog, FormDrawer, FormStep, FormTab, FormCollapse } from '@teamix/formily';
+export { createForm, FormConsumer, FormDialog, FormDrawer, FormStep, FormTab, FormCollapse, registerRules, registerFormats, registerValidateLocale, setValidateLanguage };
+/**
+ * 导出 Filter 组件
+ */
+
+import { AdvancedFilter, SimpleFilter, QueryFilter } from './Filter';
+export { AdvancedFilter, SimpleFilter, QueryFilter };
 /**
- * 导出封装的 ProForm 组件，支持快速搭建表单
+ * 导出 ProForm 组件，支持快速搭建表单
  */
 
 import ProForm from './ProForm';

package/es/form/typing.d.ts

@@ -1,28 +1,22 @@
 import type { ReactNode } from 'react';
-import type { Method } from 'axios';
 import type { IFormFeedback, Form as FormType, FieldPatternTypes } from '@formily/core';
 import type { IFormLayoutProps } from '@teamix/formily';
+import { CommonRequestConfig } from '@teamix/utils';
 export interface anyObject {
     [propName: string]: any;
 }
 declare type FieldDisplayTypes = 'none' | 'hidden' | 'visible';
-export declare type IBaseComponent = 'Input' | 'Password' | 'TextArea' | 'NumberPicker' | 'Percent' | 'Money' | 'Select' | 'MultipleSelect' | 'TreeSelect' | 'Cascader' | 'MultipleCascader' | 'ArbitraryCascader' | 'Radio' | 'Checkbox' | 'Switch' | 'DatePicker' | 'TimePicker' | 'DateTimePicker' | 'WeekPicker' | 'MonthPicker' | 'YearPicker' | 'QuarterPicker' | 'DateRangePicker' | 'TimeRangePicker' | 'DateTimeRangePicker' | 'WeekRangePicker' | 'MonthRangePicker' | 'YearRangePicker' | 'QuarterRangePicker' | 'Transfer' | 'Upload' | 'ColorPicker' | 'ColorRadio' | 'ColorSwatches' | 'ColorTwitter' | 'IconPicker' | 'JsonInput';
+export declare type IBaseComponent = 'Input' | 'Password' | 'TextArea' | 'NumberPicker' | 'Percent' | 'Money' | 'Select' | 'MultipleSelect' | 'TreeSelect' | 'Cascader' | 'MultipleCascader' | 'ArbitraryCascader' | 'Radio' | 'Checkbox' | 'Switch' | 'DatePicker' | 'TimePicker' | 'DateTimePicker' | 'WeekPicker' | 'MonthPicker' | 'YearPicker' | 'QuarterPicker' | 'DateRangePicker' | 'TimeRangePicker' | 'DateTimeRangePicker' | 'WeekRangePicker' | 'MonthRangePicker' | 'YearRangePicker' | 'QuarterRangePicker' | 'Transfer' | 'Upload' | 'ColorPicker' | 'ColorRadio' | 'IconPicker' | 'JsonInput' | 'TagPicker' | 'Range' | 'Search';
 export declare type IButtonComponent = 'Submit' | 'Reset';
 export declare type IComboComponent = 'ArrayCards' | 'ArrayCards.Addition' | 'ArrayCards.Remove' | 'ArrayCards.MoveUp' | 'ArrayCards.MoveDown' | 'ArrayCards.Index' | 'ArrayCollapse' | 'ArrayCollapse.CollapsePanel' | 'ArrayCollapse.Addition' | 'ArrayCollapse.Remove' | 'ArrayCollapse.MoveUp' | 'ArrayCollapse.MoveDown' | 'ArrayCollapse.Index' | 'ArrayTable' | 'ArrayTable.Column' | 'ArrayTable.SortHandle' | 'ArrayTable.Addition' | 'ArrayTable.Remove' | 'ArrayTable.MoveDown' | 'ArrayTable.MoveUp' | 'ArrayTable.Index' | 'ArrayItems' | 'ArrayItems.Item' | 'ArrayItems.SortHandle' | 'ArrayItems.Addition' | 'ArrayItems.Remove' | 'ArrayItems.MoveDown' | 'ArrayItems.MoveUp' | 'ArrayItems.Index' | 'Editable' | 'Editable.Popover' | 'Editable.Dialog' | 'Editable.Drawer';
 export declare type ILayoutComponent = 'FormFlex' | 'FormGrid' | 'FormGroup' | 'FormGroup.GroupPanel' | 'Search' | 'Search.SearchPanel' | 'FormTab' | 'FormTab.TabPane' | 'FormStep' | 'FormStep.StepPane' | 'FormCollapse' | 'FormCollapse.CollapsePanel' | 'FormButtonGroup' | 'FormDialog' | 'FormDrawer' | 'FormDialog.Footer' | 'FormDrawer.Footer';
-export interface IRequestConfig {
-    url?: string;
-    method?: Method;
-    params?: any;
-    data?: any;
+export interface IRequestConfig extends CommonRequestConfig {
     when?: (field: any) => any;
-    formatter?: (res: any, utils: any) => any;
-    successMsg?: string;
-    errorMsg?: string;
+    formatResult?: (res: any, utils?: any) => any;
     onSuccess?: (res: any, field?: any) => any;
-    onError?: (error: any) => any;
+    onError?: (res: any) => any;
 }
-export interface ISchemaProItem {
+export interface IFormSchemaItem {
     type?: string;
     name?: string;
     description?: React.ReactNode;
@@ -34,8 +28,8 @@ export interface ISchemaProItem {
     dataSource?: any[];
     reactions?: any;
     rules?: any;
-    items?: ISchemaProItem[];
-    children?: ISchemaProItem[];
+    items?: IFormSchemaItem;
+    children?: IFormSchemaItem[];
     content?: any;
     tooltip?: string;
     required?: boolean;
@@ -49,16 +43,13 @@ export interface ISchemaProItem {
     default?: any;
     request?: IRequestConfig;
 }
-export declare type ISchemaPro = ISchemaProItem[];
-export interface IInitialize {
-    (items: ISchemaProItem[], props?: any): ISchemaProItem[];
-}
+export declare type IFormSchema = IFormSchemaItem[];
 export interface IInitializeItem {
-    (items: ISchemaProItem, props?: any): ISchemaProItem;
+    (item: IFormSchemaItem, props?: any): IFormSchemaItem;
 }
-export interface IProFormProps extends IFormLayoutProps {
+export interface IFormProps extends IFormLayoutProps {
     form?: FormType | false;
-    schema: ISchemaPro;
+    schema: IFormSchema;
     scope?: any;
     components?: {
         [key: string]: React.FC | React.ComponentClass;
@@ -70,7 +61,7 @@ export interface IProFormProps extends IFormLayoutProps {
     onSubmit?: (values: any) => any;
     onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;
 }
-export interface IFilterProps extends IProFormProps {
+export interface IFilterProps extends IFormProps {
     triggerType?: 'keydown' | 'change' | 'submit';
     onFilter?: (values: any) => void;
     onReset?: (payload?: any) => void;

package/es/form/warning.js

@@ -5,12 +5,8 @@ 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; }
 
 var warning = function warning(item) {
-  var newItem = _objectSpread({}, item); // if (newItem.formItem) {
-  //   newItem.decorator = newItem.formItem;
-  //   delete newItem.formItem;
-  //   console.warn(
-  //     '请尽快将“formItem”属性名称升级为“decorator”，正式版将不再支持该名称。',
-  //   );
+  var newItem = _objectSpread({}, item); // if (xxx) {
+  //   console.warn('xxx');
   // }
 
 

package/es/index.d.ts

@@ -1,4 +1,4 @@
-import ProAction from './actions';
+import ProActions from './actions';
 import ProCard from './card';
 import ProField from './field';
 import ProForm from './form';
@@ -15,9 +15,10 @@ export * from './actions';
 export * from './card';
 export * from './field';
 export * from './form';
+export * from './info';
 export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
 export * from './table';
-declare const version = "1.1.3";
-export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };
+declare const version = "1.1.7";
+export { version, ProActions, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };

package/es/index.js

@@ -1,4 +1,4 @@
-import ProAction from './actions';
+import ProActions from './actions';
 import ProCard from './card';
 import ProField from './field';
 import ProForm from './form';
@@ -19,10 +19,11 @@ export * from './actions';
 export * from './card';
 export * from './field';
 export * from './form';
+export * from './info';
 export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
 export * from './table';
-var version = '1.1.3';
-export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
+var version = '1.1.7';
+export { version, ProActions, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils };

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

@@ -32,9 +32,7 @@ var FormItem = function FormItem(prop) {
       span: wrapperCol.span,
       className: cls('value')
     }, loading && /*#__PURE__*/React.createElement("div", {
-      style: {
-        width: '100%'
-      }
+      className: cls('base-skeleton-box')
     }, /*#__PURE__*/React.createElement(BaseSkeleton.Info, null)), !loading && /*#__PURE__*/React.createElement("div", null, value))));
   }
 
@@ -54,7 +52,9 @@ var FormItem = function FormItem(prop) {
       style: {
         marginLeft: labelGutter
       }
-    }, loading && /*#__PURE__*/React.createElement(BaseSkeleton.Info, null), !loading && /*#__PURE__*/React.createElement(React.Fragment, null, value))));
+    }, loading && /*#__PURE__*/React.createElement("div", {
+      className: cls('base-skeleton-box')
+    }, /*#__PURE__*/React.createElement(BaseSkeleton.Info, null)), !loading && /*#__PURE__*/React.createElement(React.Fragment, null, value))));
   }
 
   return /*#__PURE__*/React.createElement(React.Fragment, null);

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

@@ -31,6 +31,7 @@ $item-padding-bottom: 8px;
   font-size: $text-size;
   display: unset;
   width: 100%;
+  padding-right: 20px;
 }
 
 .teamix-pro-field-info-form-item-header-label {
@@ -47,3 +48,13 @@ $item-padding-bottom: 8px;
   display: inline-block;
   width: 100%;
 }
+
+.teamix-pro-field-info-form-item-base-skeleton-box {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  span {
+    width: 100%
+  }
+}

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

@@ -1,16 +1,47 @@
-import React from 'react';
+import React, { useRef } from 'react';
+import { ProInfoGroupContext } from '../../utils';
+import { useSize } from '@teamix/hooks';
 import './index.scss';
+import useInfoRequest from '../../utils/useInfoRequest';
 
 var ProInfoGroup = function ProInfoGroup(props) {
-  var children = props.children;
-  return /*#__PURE__*/React.createElement("div", {
-    className: "teamix-pro-info-group"
-  }, children === null || children === void 0 ? void 0 : children.map(function (item, index) {
+  var children = props.children,
+      url = props.url,
+      method = props.method,
+      params = props.params,
+      formatResult = props.formatResult;
+  var ref = useRef();
+  var size = useSize(ref); // 请求数据
+
+  var _useInfoRequest = useInfoRequest({
+    url: url,
+    method: method,
+    params: params,
+    formatResult: formatResult
+  }),
+      loading = _useInfoRequest.loading,
+      result = _useInfoRequest.result,
+      refresh = _useInfoRequest.refresh;
+
+  return /*#__PURE__*/React.createElement(ProInfoGroupContext.Provider, {
+    value: {
+      visible: true,
+      size: size,
+      loading: loading,
+      result: result,
+      refresh: refresh
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "teamix-pro-info-group",
+    ref: ref
+  }, Array.isArray(children) && (children === null || children === void 0 ? void 0 : children.map(function (item, index) {
     return /*#__PURE__*/React.createElement("div", {
       className: "teamix-pro-info-group-item",
       key: index
     }, item);
-  }));
+  })), !Array.isArray(children) && /*#__PURE__*/React.createElement("div", {
+    className: "teamix-pro-info-group-item"
+  }, children)));
 };
 
 export default ProInfoGroup;

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

@@ -1,8 +1,14 @@
 .teamix-pro-info-group {
   &-item {
+    margin-top: 16px;
     border-bottom: 1px solid var(--color-line1-1, #eaeaea);
+    margin-bottom: 16px;
   }
   .teamix-pro-info-group-item:last-child {
     border-bottom: 0;
+    margin-bottom: 0;
+  }
+  .teamix-pro-info-group-item:first-child {
+    margin-top: 0;
   }
 }

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

@@ -28,10 +28,11 @@ import { baseClass, request } from '@teamix/utils';
 import PopConfirm from '@teamix/pop-confirm';
 import React, { useMemo, useState } from 'react';
 import './index.scss';
-import ProForm, { createForm, toJS } from '../../../form';
+import ProForm, { createForm, formilyReactive } from '../../../form';
 import { Message } from '@alicloudfe/components';
 import { ActionGroup } from '../../../actions';
 var cls = baseClass('teamix-pro-info');
+var toJS = formilyReactive.toJS;
 
 var InfoValueItem = function InfoValueItem(props) {
   var _props$type = props.type,
@@ -54,7 +55,18 @@ var InfoValueItem = function InfoValueItem(props) {
       _infoItem$successMess = infoItem.successMessage,
       successMessage = _infoItem$successMess === void 0 ? 'success' : _infoItem$successMess,
       actions = infoItem.actions,
-      extra = infoItem.extra; // 浮层的显隐状态
+      extra = infoItem.extra; // 由info接管field中的value。重新实现
+  // let fieldRender = render;
+  // let newValue = value;
+  // if (render && typeof render !== 'function') {
+  //   const { value, ...others } = render;
+  //   fieldRender = others;
+  //   if (value) {
+  //     newValue = getTargetValue(`${value}`, { ...record, record });
+  //     console.log("newValue", newValue);
+  //   }
+  // }
+  // 浮层的显隐状态
 
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),

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

@@ -6,14 +6,14 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import { Grid } from '@alicloudfe/components';
 import { ProCard } from '../../../';
-import React, { useRef } from 'react';
+import React, { useContext, useRef } from 'react';
 import FormItem from '../FormItem';
 import './index.scss';
 import { useSize } from '@teamix/hooks';
 import { getLayout } from '../../utils/utils';
-import { getTargetValue } from '@teamix/utils';
 import defaultLayoutMap from '../../utils/layout';
 import InfoValueItem from '../InfoValueItem';
+import { getDataIndexValue, ProInfoGroupContext } from '../../utils';
 var Row = Grid.Row,
     Col = Grid.Col;
 
@@ -25,15 +25,15 @@ var ProBaseInfo = function ProBaseInfo(props) {
       dataSource = props.dataSource,
       loading = props.loading,
       result = props.result,
-      actionRef = props.actionRef; // TODO: 自动响应式。日后会更改成hooks
-
+      actionRef = props.actionRef;
+  var context = useContext(ProInfoGroupContext);
   var ref = useRef();
-  var size = useSize(ref);
-  var defaultLayout = defaultLayoutMap[getLayout((_size$width = size.width) !== null && _size$width !== void 0 ? _size$width : 0)];
+  var size = context.visible ? context.size : useSize(ref);
+  var defaultLayout = defaultLayoutMap[getLayout((_size$width = size === null || size === void 0 ? void 0 : size.width) !== null && _size$width !== void 0 ? _size$width : 0)];
 
   var renderContent = function renderContent() {
     return columns.map(function (item, index) {
-      var _item$title, _item$valueType, _item$dataIndex;
+      var _item$title, _item$valueType;
 
       var span = item.colSpan ? defaultLayout.span * item.colSpan : defaultLayout.span;
       return /*#__PURE__*/React.createElement(Col, {
@@ -44,7 +44,7 @@ var ProBaseInfo = function ProBaseInfo(props) {
         loading: loading,
         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: getTargetValue("{{".concat((_item$dataIndex = item === null || item === void 0 ? void 0 : item.dataIndex) !== null && _item$dataIndex !== void 0 ? _item$dataIndex : '', "}}"), dataSource !== null && dataSource !== void 0 ? dataSource : result),
+          value: getDataIndexValue(item.dataIndex, dataSource !== null && dataSource !== void 0 ? dataSource : result),
           render: item.render,
           dataSource: item.dataSource,
           infoItem: item,
@@ -61,7 +61,8 @@ var ProBaseInfo = function ProBaseInfo(props) {
   return /*#__PURE__*/React.createElement("div", {
     ref: ref,
     className: "teamix-pro-info"
-  }, size.width && /*#__PURE__*/React.createElement(ProCard, _objectSpread({
+  }, (size === null || size === void 0 ? void 0 : size.width) && /*#__PURE__*/React.createElement(ProCard, _objectSpread({
+    compacted: true,
     hoveredShadow: false,
     bordered: false
   }, header), /*#__PURE__*/React.createElement(Row, {

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

@@ -6,14 +6,14 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import { Grid } from '@alicloudfe/components';
 import ProCard from '../../../card';
-import { getTargetValue } from '@teamix/utils';
-import React, { useRef } from 'react';
+import React, { useContext, useRef } from 'react';
 import FormItem from '../FormItem';
 import './index.scss';
 import defaultLayoutMap from '../../utils/layout';
 import { useSize } from '@teamix/hooks';
 import { getLayout } from '../../utils/utils';
 import InfoValueItem from '../InfoValueItem';
+import { getDataIndexValue, ProInfoGroupContext } from '../../utils';
 var Row = Grid.Row,
     Col = Grid.Col;
 
@@ -26,15 +26,15 @@ var ProHeaderInfo = function ProHeaderInfo(props) {
       layout = props.layout,
       loading = props.loading,
       result = props.result,
-      actionRef = props.actionRef; // TODO: 自动响应式。日后会更改成hooks
-
+      actionRef = props.actionRef;
+  var context = useContext(ProInfoGroupContext);
   var ref = useRef();
-  var size = useSize(ref);
-  var defaultLayout = defaultLayoutMap[getLayout((_size$width = size.width) !== null && _size$width !== void 0 ? _size$width : 0)];
+  var size = context.visible ? context.size : useSize(ref);
+  var defaultLayout = defaultLayoutMap[getLayout((_size$width = size === null || size === void 0 ? void 0 : size.width) !== null && _size$width !== void 0 ? _size$width : 0)];
 
   var renderContent = function renderContent() {
     return columns.map(function (item, index) {
-      var _item$title, _item$valueType, _item$dataIndex;
+      var _item$title, _item$valueType;
 
       var span = 24;
 
@@ -56,7 +56,7 @@ var ProHeaderInfo = function ProHeaderInfo(props) {
         loading: loading,
         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: getTargetValue("{{".concat((_item$dataIndex = item === null || item === void 0 ? void 0 : item.dataIndex) !== null && _item$dataIndex !== void 0 ? _item$dataIndex : '', "}}"), dataSource !== null && dataSource !== void 0 ? dataSource : result),
+          value: getDataIndexValue(item.dataIndex, dataSource !== null && dataSource !== void 0 ? dataSource : result),
           render: item.render,
           dataSource: item.dataSource,
           infoItem: item,
@@ -73,7 +73,8 @@ var ProHeaderInfo = function ProHeaderInfo(props) {
   return /*#__PURE__*/React.createElement("div", {
     ref: ref,
     className: "teamix-pro-info"
-  }, size.width && /*#__PURE__*/React.createElement(ProCard, _objectSpread({
+  }, (size === null || size === void 0 ? void 0 : size.width) && /*#__PURE__*/React.createElement(ProCard, _objectSpread({
+    compacted: true,
     hoveredShadow: false,
     bordered: false
   }, header), /*#__PURE__*/React.createElement(Row, {

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

@@ -21,15 +21,17 @@ import './index.scss';
 import { Table } from '@alicloudfe/components';
 import './index.scss';
 import ProCard from '../../../card';
-import { getTargetValue, LabelIconTip } from '@teamix/utils';
+import { LabelIconTip } from '@teamix/utils';
 import InfoValueItem from '../InfoValueItem';
 import { BaseSkeleton } from '../../..';
+import { getDataIndexValue } from '../../utils';
 
 var ProTableInfo = function ProTableInfo(props) {
   var header = props.header,
       columns = props.columns,
       dataSource = props.dataSource,
-      layout = props.layout,
+      _props$layout = props.layout,
+      layout = _props$layout === void 0 ? {} : _props$layout,
       loading = props.loading,
       result = props.result,
       actionRef = props.actionRef;
@@ -88,7 +90,7 @@ var ProTableInfo = function ProTableInfo(props) {
       }
 
       var itemData = filterColumns.map(function (item, index) {
-        var _item$title, _item$valueType, _item$dataIndex, _data;
+        var _item$title, _item$valueType, _data;
 
         var data = (_data = {}, _defineProperty(_data, "label_".concat(index), /*#__PURE__*/React.createElement(LabelIconTip, {
           label: (_item$title = item === null || item === void 0 ? void 0 : item.title) !== null && _item$title !== void 0 ? _item$title : '',
@@ -96,7 +98,7 @@ var ProTableInfo = function ProTableInfo(props) {
           icon: item.tooltipIcon
         })), _defineProperty(_data, "value_".concat(index), /*#__PURE__*/React.createElement(React.Fragment, null, loading && /*#__PURE__*/React.createElement(BaseSkeleton.Info, null), !loading && /*#__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: getTargetValue("{{".concat((_item$dataIndex = item === null || item === void 0 ? void 0 : item.dataIndex) !== null && _item$dataIndex !== void 0 ? _item$dataIndex : '', "}}"), dataSource !== null && dataSource !== void 0 ? dataSource : result),
+          value: getDataIndexValue(item.dataIndex, dataSource !== null && dataSource !== void 0 ? dataSource : result),
           render: item.render,
           dataSource: item.dataSource,
           infoItem: item,
@@ -157,6 +159,7 @@ var ProTableInfo = function ProTableInfo(props) {
   };
 
   return /*#__PURE__*/React.createElement(ProCard, _objectSpread({
+    compacted: true,
     hoveredShadow: false,
     bordered: false
   }, header), /*#__PURE__*/React.createElement(Table.StickyLock, {

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

@@ -6,7 +6,7 @@
     padding: 16px 24px;
   }
   .next-table-row.hovered {
-    background-color:var(--color-white);
+    background-color:var(--color-fill1-1);
   }
   .next-table-row {
     color: var(--color-text1-3, #333333);

package/es/info/index.d.ts

@@ -4,6 +4,7 @@ import { ProInfoProps } from './typing';
 export * from './typing';
 declare const ProInfo: {
     (props: ProInfoProps): JSX.Element;
+    Group: React.FC<import("./typing").InfoGroupProps>;
     ProInfoGroup: React.FC<import("./typing").InfoGroupProps>;
 };
 export default ProInfo;

package/es/info/index.js

@@ -10,14 +10,14 @@ 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 React, { useRef } from 'react';
+import React, { useContext, useRef } from 'react';
 import ProTableInfo from './components/tableInfo';
 import ProHeaderInfo from './components/headerInfo';
 import ProBaseInfo from './components/baseInfo';
 import ProInfoGroup from './components/InfoGroup';
 import './index.scss';
 import useInfoRequest from './utils/useInfoRequest';
-import { useActionType } from './utils';
+import { ProInfoGroupContext, useActionType } from './utils';
 export * from './typing';
 
 var ProInfo = function ProInfo(props) {
@@ -29,18 +29,19 @@ var ProInfo = function ProInfo(props) {
       propsActionRef = props.actionRef,
       _props$header = props.header,
       header = _props$header === void 0 ? {} : _props$header,
-      others = _objectWithoutProperties(props, _excluded); // 请求数据
+      others = _objectWithoutProperties(props, _excluded);
 
+  var context = useContext(ProInfoGroupContext); // 请求数据
 
-  var _useInfoRequest = useInfoRequest({
+  var _ref = context.visible ? context : useInfoRequest({
     url: url,
     method: method,
     params: params,
     formatResult: formatResult
   }),
-      loading = _useInfoRequest.loading,
-      result = _useInfoRequest.result,
-      _refresh = _useInfoRequest.refresh;
+      loading = _ref.loading,
+      result = _ref.result,
+      _refresh = _ref.refresh;
 
   var actionRef = useRef(); // 将 Actions 绑定到传入的 propsActionRef 中
 
@@ -81,5 +82,6 @@ var ProInfo = function ProInfo(props) {
   }));
 };
 
+ProInfo.Group = ProInfoGroup;
 ProInfo.ProInfoGroup = ProInfoGroup;
 export default ProInfo;

package/es/info/index.scss

@@ -5,4 +5,8 @@
   .teamix-pro-card-content {
     padding-bottom: 8px;
   }
+
+  .next-card {
+    background: none;
+  }
 }

package/es/info/typing.d.ts

@@ -3,6 +3,7 @@ import { ActionGroupProps, IActionButton } from '../actions';
 import { Method } from 'axios';
 import React from 'react';
 import { CardProps } from '../card';
+import { IUseInfoRequestResult } from './utils/useInfoRequest';
 /** ProInfoBaseProps info 基础定义 */
 export declare type ProInfoBaseProps = {
     /** ProColums 定义，取代 Table 的 columns */
@@ -57,7 +58,7 @@ export interface ProInfoItemProps {
     /** 操作组配置 */
     actionSchema?: ActionGroupProps;
     /** 指定列对应的字段，支持`a.b`形式的快速取值 和 数组取值 */
-    dataIndex?: string;
+    dataIndex?: string | string[];
     /** 合并行 */
     colSpan?: number;
     /** 是否可被编辑 */
@@ -130,8 +131,8 @@ export declare type HeaderInfoLayoutProps = {
 };
 /** infoGroup */
 export declare type InfoGroupProps = {
-    children?: React.ReactNode[];
-};
+    children?: React.ReactNode[] | React.ReactNode;
+} & Pick<ProInfoBaseProps, 'params' | 'method' | 'url' | 'onSuccess' | 'onError' | 'formatResult'>;
 export declare type TableInfoLayoutProps = {} & HeaderInfoLayoutProps;
 export declare type InfoValueItemProps = {
     infoItem: ProInfoItemProps;
@@ -141,3 +142,16 @@ export declare type InfoValueItemProps = {
 export declare type ProInfoHeaderProps = {
     extra?: CardProps['extra'] | IActionButton[];
 } & Omit<CardProps, 'extra'>;
+/** ProInfoGroupContextProps */
+export declare type ProInfoGroupContextProps = {
+    /** 因为其他数据都为异步。visible 只用作标识 */
+    visible?: boolean;
+    result?: any;
+    layout?: ProInfoBaseProps['layout'];
+    loading?: IUseInfoRequestResult['loading'];
+    refresh?: IUseInfoRequestResult['refresh'];
+    size?: {
+        width?: number;
+        height?: number;
+    };
+};

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

@@ -1,3 +1,12 @@
-/// <reference types="react" />
-import { ProInfoActionType } from '../typing';
+import React from 'react';
+import { ProInfoActionType, ProInfoGroupContextProps, ProInfoItemProps } from '../typing';
 export declare function useActionType<T>(ref: React.MutableRefObject<ProInfoActionType | undefined>, action: ProInfoActionType): void;
+/** ProInfoGroupContext */
+export declare const ProInfoGroupContext: React.Context<ProInfoGroupContextProps>;
+/**
+ * 获取 dataIndex 值
+ * @param dataIndex
+ * @param dataSource
+ * @returns
+ */
+export declare function getDataIndexValue(dataIndex: ProInfoItemProps['dataIndex'], dataSource: object): any;