@teamix/pro 1.1.31 → 1.1.35

package/lib/form/index.js

@@ -13,6 +13,7 @@ var _exportNames = {
   setValidateLanguage: true,
   formilyCore: true,
   FormConsumer: true,
+  useForm: true,
   formilyReact: true,
   formilyReactive: true,
   FormDialog: true,
@@ -21,7 +22,7 @@ var _exportNames = {
   FormTab: true,
   FormCollapse: true,
   formilyTeamix: true,
-  getDisplayValues: true,
+  useFormDisplayValues: true,
   AdvancedFilter: true,
   SimpleFilter: true,
   QueryFilter: true
@@ -87,12 +88,6 @@ Object.defineProperty(exports, "createForm", {
   }
 });
 exports.formilyTeamix = exports.formilyReactive = exports.formilyReact = exports.formilyCore = exports.default = void 0;
-Object.defineProperty(exports, "getDisplayValues", {
-  enumerable: true,
-  get: function get() {
-    return _utils.getDisplayValues;
-  }
-});
 Object.defineProperty(exports, "registerFormats", {
   enumerable: true,
   get: function get() {
@@ -117,6 +112,18 @@ Object.defineProperty(exports, "setValidateLanguage", {
     return _formilyCore.setValidateLanguage;
   }
 });
+Object.defineProperty(exports, "useForm", {
+  enumerable: true,
+  get: function get() {
+    return _formilyReact.useForm;
+  }
+});
+Object.defineProperty(exports, "useFormDisplayValues", {
+  enumerable: true,
+  get: function get() {
+    return _useFormDisplayValues.default;
+  }
+});
 
 var _typing = require("./typing");
 
@@ -148,7 +155,7 @@ var _formilyTeamix = _interopRequireWildcard(require("@teamix/formily"));
 
 exports.formilyTeamix = _formilyTeamix;
 
-var _utils = require("./utils");
+var _useFormDisplayValues = _interopRequireDefault(require("./ProForm/useFormDisplayValues"));
 
 var _Filter = require("./Filter");
 

package/lib/form/typing.d.ts

@@ -6,7 +6,7 @@ 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' | 'IconPicker' | 'JsonInput' | 'TagPicker' | 'Range' | 'Search';
+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' | 'MultipleTagPicker' | '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';
@@ -57,7 +57,7 @@ export interface IFormProps extends IFormLayoutProps {
     initialValues?: anyObject;
     initialRequest?: CommonRequestConfig;
     previewTextPlaceholder?: ReactNode;
-    onChange?: (values: any, displayValues: any) => any;
+    onChange?: (values: any, displayValues?: any) => any;
     onSubmit?: ((values: any) => any) | CommonRequestConfig;
     onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;
 }

package/lib/form/utils.d.ts

@@ -1,14 +1,37 @@
-import { getValueByValue } from '@teamix/utils';
+/**
+ * 映射字段size，主要是default转medium
+ * @param props component的props
+ * @param field 当前字段实例
+ * @returns 映射后的字段属性
+ */
+declare const mapSize: (props: any, field: any) => any;
+/**
+ * 映射字段state
+ * @param props component的props
+ * @param field 当前字段实例
+ * @returns 映射后的字段属性
+ */
+declare const mapStatus: (props: any, field: any) => any;
+/**
+ * 为未配置name的字段添加随机字段名称
+ * @param prefix 随机字段名称前缀，默认为name
+ * @returns 随机字段名称
+ */
 interface IGetRandomName {
     (prefix?: string): string;
 }
-declare const mapSize: (props: any, field: any) => any;
-declare const mapStatus: (props: any, field: any) => any;
 declare const getRandomName: IGetRandomName;
+/**
+ * 将ProForm的key映射为formily的key，然后筛除掉无效的key/value
+ * @param obj
+ * @returns
+ */
 declare const mapSchemaName: (obj: any) => any;
+/**
+ * 合并数组或非数组，不移除无效值
+ * @param arr 数组
+ * @param v 数组或其他
+ * @returns 合并数组或合并其他值
+ */
 declare const mergeArrayValue: (arr: any[], v?: any) => any[];
-interface IGetDisplayValues {
-    (form: any, values: any, prefix?: string): any;
-}
-declare const getDisplayValues: IGetDisplayValues;
-export { getRandomName, getValueByValue, getDisplayValues, mapSize, mapStatus, mergeArrayValue, mapSchemaName, };
+export { getRandomName, mapSize, mapStatus, mergeArrayValue, mapSchemaName };

package/lib/form/utils.js

@@ -3,14 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getRandomName = exports.getDisplayValues = void 0;
-Object.defineProperty(exports, "getValueByValue", {
-  enumerable: true,
-  get: function get() {
-    return _utils.getValueByValue;
-  }
-});
-exports.mergeArrayValue = exports.mapStatus = exports.mapSize = exports.mapSchemaName = void 0;
+exports.mergeArrayValue = exports.mapStatus = exports.mapSize = exports.mapSchemaName = exports.getRandomName = void 0;
 
 var _formily = require("@teamix/formily");
 
@@ -46,6 +39,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; }
 
+/**
+ * 映射字段size，主要是default转medium
+ * @param props component的props
+ * @param field 当前字段实例
+ * @returns 映射后的字段属性
+ */
 var mapSize = function mapSize(props, field) {
   var layout = _objectSpread(_objectSpread({}, (0, _formily.useFormShallowLayout)()), (0, _formily.useFormLayout)());
 
@@ -57,6 +56,13 @@ var mapSize = function mapSize(props, field) {
     size: props.size || takeSize()
   });
 };
+/**
+ * 映射字段state
+ * @param props component的props
+ * @param field 当前字段实例
+ * @returns 映射后的字段属性
+ */
+
 
 exports.mapSize = mapSize;
 
@@ -88,7 +94,12 @@ exports.mapStatus = mapStatus;
 var getRandomName = function getRandomName() {
   var prefix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'name';
   return "".concat(prefix, "_").concat(Math.floor(Math.random() * Math.pow(10, 18)));
-}; // 将ProForm的key映射为formily的key，然后筛除掉无效的keyvalue
+};
+/**
+ * 将ProForm的key映射为formily的key，然后筛除掉无效的key/value
+ * @param obj
+ * @returns
+ */
 
 
 exports.getRandomName = getRandomName;
@@ -121,6 +132,13 @@ var mapSchemaName = function mapSchemaName(obj) {
   });
   return temp;
 };
+/**
+ * 合并数组或非数组，不移除无效值
+ * @param arr 数组
+ * @param v 数组或其他
+ * @returns 合并数组或合并其他值
+ */
+
 
 exports.mapSchemaName = mapSchemaName;
 
@@ -130,50 +148,6 @@ var mergeArrayValue = function mergeArrayValue(arr, v) {
   }
 
   return [].concat(_toConsumableArray(arr), [v]);
-}; // 获取form的displayValues
-
-
-exports.mergeArrayValue = mergeArrayValue;
-
-var getDisplayValues = function getDisplayValues(form, values) {
-  var prefix = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
-  var displayValues = {}; // 在form实例中，通过name获取该field的值在dataSource对应的label
-
-  var getLabelByKey = function getLabelByKey(name, value) {
-    var address = form.indexes[name] || '';
-    var field = form.query(address).take() || {};
-    var dataSource = field.dataSource;
-    return (0, _utils.getValueByValue)(dataSource, value);
-  };
-
-  Object.entries(values).forEach(function (_ref3) {
-    var _ref4 = _slicedToArray(_ref3, 2),
-        key = _ref4[0],
-        value = _ref4[1];
-
-    var label;
-
-    if ((0, _utils.isArr)(value)) {
-      value.map(function (v, i) {
-        if ((0, _utils.isObj)(v)) {
-          // 值是对象数组
-          label = getDisplayValues(form, v, "".concat(prefix).concat(key, ".").concat(i, "."));
-        } else if ((0, _utils.isArr)(v)) {
-          // 值是多重数组
-          console.warn('Multiple array, Please dingding qilou.zhl.');
-        } else if (v !== undefined && v !== null) {
-          label = getLabelByKey("".concat(prefix).concat(key, ".").concat(i), value);
-        }
-      });
-    } else if ((0, _utils.isObj)(value)) {
-      label = getDisplayValues(form, value, "".concat(key, "."));
-    } else {
-      label = getLabelByKey("".concat(prefix).concat(key), value);
-    }
-
-    displayValues[key] = label;
-  });
-  return displayValues;
 };
 
-exports.getDisplayValues = getDisplayValues;
+exports.mergeArrayValue = mergeArrayValue;

package/lib/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.30";
+declare const version = "1.1.34";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -251,5 +251,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // 设置图标源
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
-var version = '1.1.30';
+var version = '1.1.34';
 exports.version = version;

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

@@ -25,7 +25,7 @@ var _components = require("@alicloudfe/components");
 
 var _actions = require("../../../actions");
 
-var _excluded = ["type", "value", "render", "infoItem", "record", "actionRef"];
+var _excluded = ["type", "value", "render", "infoItem", "record", "actionRef", "dataSource"];
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -33,6 +33,20 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+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 _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."); }
@@ -45,12 +59,6 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-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; }
@@ -66,6 +74,7 @@ var InfoValueItem = function InfoValueItem(props) {
       infoItem = props.infoItem,
       record = props.record,
       actionRef = props.actionRef,
+      dataSource = props.dataSource,
       others = _objectWithoutProperties(props, _excluded);
 
   var dataIndex = infoItem.dataIndex,
@@ -79,28 +88,41 @@ var InfoValueItem = function InfoValueItem(props) {
       _infoItem$successMess = infoItem.successMessage,
       successMessage = _infoItem$successMess === void 0 ? 'success' : _infoItem$successMess,
       actions = infoItem.actions,
-      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);
-  //   }
-  // }
-  // 获取render
+      extra = infoItem.extra; // 获取处理过的 render
 
   var getRender = function getRender() {
+    var _processRenderFunctio;
+
     if (typeof render === 'function') {
       return render;
     }
 
-    return _objectSpread({
-      ellipsis: true,
-      emptyText: '-'
-    }, render);
+    var newRender = processBuriedPoint((_processRenderFunctio = processRenderFunction(render !== null && render !== void 0 ? render : {}, value, record)) !== null && _processRenderFunctio !== void 0 ? _processRenderFunctio : {}, value, record);
+    return newRender;
+  }; // 获取处理过的 dataSource
+
+
+  var getDataSource = function getDataSource() {
+    var newDataSource = null;
+
+    if (typeof dataSource === 'function') {
+      newDataSource = dataSource === null || dataSource === void 0 ? void 0 : dataSource(value, record);
+    } else {
+      newDataSource = (dataSource !== null && dataSource !== void 0 ? dataSource : []).map(function (item) {
+        return Object.fromEntries(Object.entries(item).map(function (_ref) {
+          var _ref2 = _slicedToArray(_ref, 2),
+              k = _ref2[0],
+              v = _ref2[1];
+
+          return [k, (0, _utils.getTargetValue)(v, _objectSpread(_objectSpread({}, record), {}, {
+            record: record,
+            value: value
+          }))];
+        }));
+      });
+    }
+
+    return newDataSource;
   }; // 浮层的显隐状态
 
 
@@ -139,6 +161,64 @@ var InfoValueItem = function InfoValueItem(props) {
 
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
   };
+  /**
+   * 处理 render 配置项是函数的情况
+   * @param render ProFieldRender
+   * @param value table cell value
+   * @param record table cell record
+   * @returns
+   */
+
+
+  var processRenderFunction = function processRenderFunction(render, value, record) {
+    var external = ['linkOnClick', 'link', 'value'];
+    return Object.fromEntries(Object.entries(render).map(function (_ref3) {
+      var _ref4 = _slicedToArray(_ref3, 2),
+          k = _ref4[0],
+          v = _ref4[1];
+
+      if (typeof v === 'function') {
+        var _v;
+
+        if (external.includes(k)) {
+          return [k, function () {
+            for (var _len = arguments.length, others = new Array(_len), _key = 0; _key < _len; _key++) {
+              others[_key] = arguments[_key];
+            }
+
+            return v === null || v === void 0 ? void 0 : v.apply(void 0, [value, record].concat(others));
+          }];
+        }
+
+        return [k, (_v = v === null || v === void 0 ? void 0 : v(value, record)) !== null && _v !== void 0 ? _v : ''];
+      }
+
+      return [k, v];
+    }));
+  };
+  /**
+   * 处理 render 数据，取出 {{xxx}} 匹配值
+   * @param render ProFieldRender
+   * @param record table cell record
+   * @returns
+   */
+
+
+  var processBuriedPoint = function processBuriedPoint(render, value, record) {
+    return Object.fromEntries([// 默认 ellipsis、descriptionEllipsis 为 true
+    // emptyText 默认为 '-'
+    ['ellipsis', true], ['descriptionEllipsis', true], ['emptyText', '-']].concat(_toConsumableArray(Object.entries(render).map(function (_ref5) {
+      var _ref6 = _slicedToArray(_ref5, 2),
+          k = _ref6[0],
+          v = _ref6[1];
+
+      return [k, (0, _utils.getTargetValue)(v, _objectSpread(_objectSpread({}, record), {}, {
+        record: record,
+        value: value
+      }))];
+    }))));
+  }; // 重写编辑逻辑替代field原有逻辑
+
 
   if (isEdit) {
     // 渲染表单
@@ -220,7 +300,8 @@ var InfoValueItem = function InfoValueItem(props) {
     }, /*#__PURE__*/_react.default.createElement(_field.default, _objectSpread({
       type: type,
       value: value,
-      render: getRender()
+      render: getRender(),
+      dataSource: getDataSource()
     }, others)), /*#__PURE__*/_react.default.createElement(_popConfirm.default, {
       visible: popConfirmVisible,
       content: renderContent(),
@@ -251,7 +332,8 @@ var InfoValueItem = function InfoValueItem(props) {
   }, /*#__PURE__*/_react.default.createElement(_field.default, _objectSpread({
     type: type,
     value: value,
-    render: getRender()
+    render: getRender(),
+    dataSource: getDataSource()
   }, others)), renderAction(), extra && extra);
 };
 

package/lib/info/components/baseInfo/index.d.ts

@@ -2,6 +2,8 @@ import React from 'react';
 import { ProInfoBaseProps, ProInfoTransparentBase } from '../../typing';
 import './index.scss';
 import { IUseInfoRequestResult } from '../../utils/useInfoRequest';
-declare type ProBaseInfoProps = ProInfoBaseProps & IUseInfoRequestResult & ProInfoTransparentBase;
+declare type ProBaseInfoProps = ProInfoBaseProps & IUseInfoRequestResult & ProInfoTransparentBase & {
+    size?: any;
+};
 declare const ProBaseInfo: React.FC<ProBaseInfoProps>;
 export default ProBaseInfo;

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

@@ -1,7 +1,5 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,16 +7,12 @@ exports.default = void 0;
 
 var _components = require("@alicloudfe/components");
 
-var _ = require("../../../");
-
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 var _ProInfoItem = _interopRequireDefault(require("../ProInfoItem"));
 
 require("./index.scss");
 
-var _hooks = require("@teamix/hooks");
-
 var _utils = require("../../utils/utils");
 
 var _layout = _interopRequireDefault(require("../../utils/layout"));
@@ -27,43 +21,21 @@ var _InfoValueItem = _interopRequireDefault(require("../InfoValueItem"));
 
 var _utils2 = require("../../utils");
 
-var _excluded = ["header", "columns", "dataSource", "loading", "result", "actionRef", "className", "layout"];
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-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; }
-
 var Row = _components.Grid.Row,
     Col = _components.Grid.Col;
 
 var ProBaseInfo = function ProBaseInfo(props) {
   var _size$width;
 
-  var header = props.header,
-      columns = props.columns,
+  var columns = props.columns,
       dataSource = props.dataSource,
       loading = props.loading,
       result = props.result,
       actionRef = props.actionRef,
-      className = props.className,
       layout = props.layout,
-      others = _objectWithoutProperties(props, _excluded);
-
-  var context = (0, _react.useContext)(_utils2.ProInfoGroupContext);
-  var ref = (0, _react.useRef)();
-  var size = context.visible ? context.size : (0, _hooks.useSize)(ref);
+      size = props.size;
 
   var defaultLayout = _layout.default[(0, _utils.getLayout)((_size$width = size === null || size === void 0 ? void 0 : size.width) !== null && _size$width !== void 0 ? _size$width : 0)]; // 获取列的布局参数
 
@@ -108,17 +80,10 @@ var ProBaseInfo = function ProBaseInfo(props) {
     });
   };
 
-  return /*#__PURE__*/_react.default.createElement("div", _objectSpread({
-    ref: ref,
-    className: "teamix-pro-info ".concat(className !== null && className !== void 0 ? className : '')
-  }, others), (size === null || size === void 0 ? void 0 : size.width) && /*#__PURE__*/_react.default.createElement(_.ProCard, _objectSpread({
-    compacted: true,
-    hoveredShadow: false,
-    bordered: false
-  }, header), /*#__PURE__*/_react.default.createElement(Row, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (size === null || size === void 0 ? void 0 : size.width) && /*#__PURE__*/_react.default.createElement(Row, {
     wrap: true,
     className: "teamix-pro-info-content-row"
-  }, renderContent())));
+  }, renderContent()));
 };
 
 var _default = ProBaseInfo;

package/lib/info/components/headerInfo/index.d.ts

@@ -2,6 +2,8 @@ import React from 'react';
 import { IProHeaderInfo, ProInfoTransparentBase } from '../../typing';
 import { IUseInfoRequestResult } from '../../utils/useInfoRequest';
 import './index.scss';
-declare type ProHeaderInfoProps = IProHeaderInfo & IUseInfoRequestResult & ProInfoTransparentBase;
+declare type ProHeaderInfoProps = IProHeaderInfo & IUseInfoRequestResult & ProInfoTransparentBase & {
+    size?: any;
+};
 declare const ProHeaderInfo: React.FC<ProHeaderInfoProps>;
 export default ProHeaderInfo;