@teamix/pro 1.4.25-bugfix.2 → 1.4.25-bugfix.3

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

@@ -1,83 +1,120 @@
 "use strict";
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
 var _icon = _interopRequireDefault(require("@teamix/icon"));
+
 var _field = _interopRequireDefault(require("../../../field"));
+
 var _utils = require("@teamix/utils");
+
 var _popConfirm = _interopRequireDefault(require("@teamix/pop-confirm"));
+
 var _react = _interopRequireWildcard(require("react"));
+
 require("./index.scss");
+
 var _form = _interopRequireWildcard(require("../../../form"));
+
 var _components = require("@alicloudfe/components");
+
 var _actions = require("../../../actions");
+
 var _excluded = ["type", "value", "render", "infoItem", "record", "actionRef", "dataSource", "context", "props"];
+
 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 _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 _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."); }
+
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
 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); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : 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 cls = (0, _utils.usePrefixCls)('teamix-pro-info');
 var toJS = _form.formilyReactive.toJS;
+
 var InfoValueItem = function InfoValueItem(props) {
   var _props$type = props.type,
-    type = _props$type === void 0 ? 'text' : _props$type,
-    value = props.value,
-    render = props.render,
-    infoItem = props.infoItem,
-    record = props.record,
-    actionRef = props.actionRef,
-    dataSource = props.dataSource,
-    context = props.context,
-    fieldProps = props.props,
-    others = _objectWithoutProperties(props, _excluded);
+      type = _props$type === void 0 ? 'text' : _props$type,
+      value = props.value,
+      render = props.render,
+      infoItem = props.infoItem,
+      record = props.record,
+      actionRef = props.actionRef,
+      dataSource = props.dataSource,
+      context = props.context,
+      fieldProps = props.props,
+      others = _objectWithoutProperties(props, _excluded);
+
   var dataIndex = infoItem.dataIndex,
-    isEdit = infoItem.isEdit,
-    editOnCancel = infoItem.editOnCancel,
-    editOnOk = infoItem.editOnOk,
-    editUrl = infoItem.editUrl,
-    editFormatParams = infoItem.editFormatParams,
-    _infoItem$editMethod = infoItem.editMethod,
-    editMethod = _infoItem$editMethod === void 0 ? 'post' : _infoItem$editMethod,
-    _infoItem$successMess = infoItem.successMessage,
-    successMessage = _infoItem$successMess === void 0 ? 'success' : _infoItem$successMess,
-    actions = infoItem.actions,
-    extra = infoItem.extra,
-    valueType = infoItem.valueType,
-    _infoItem$editProForm = infoItem.editProFormProps,
-    editProFormProps = _infoItem$editProForm === void 0 ? {} : _infoItem$editProForm;
-  // 获取配置
+      isEdit = infoItem.isEdit,
+      editOnCancel = infoItem.editOnCancel,
+      editOnOk = infoItem.editOnOk,
+      editUrl = infoItem.editUrl,
+      editFormatParams = infoItem.editFormatParams,
+      _infoItem$editMethod = infoItem.editMethod,
+      editMethod = _infoItem$editMethod === void 0 ? 'post' : _infoItem$editMethod,
+      _infoItem$successMess = infoItem.successMessage,
+      successMessage = _infoItem$successMess === void 0 ? 'success' : _infoItem$successMess,
+      actions = infoItem.actions,
+      extra = infoItem.extra,
+      valueType = infoItem.valueType,
+      _infoItem$editProForm = infoItem.editProFormProps,
+      editProFormProps = _infoItem$editProForm === void 0 ? {} : _infoItem$editProForm; // 获取配置
+
   var getInfoItemProps = function getInfoItemProps(prop) {
     if (typeof prop === 'function') {
       return prop === null || prop === void 0 ? void 0 : prop(value, record);
     }
+
     return prop;
-  };
-  // 获取处理过的 render
+  }; // 获取处理过的 render
+
+
   var getRender = function getRender() {
     var _processRenderFunctio;
+
     if (typeof render === 'function') {
       return function () {
         return render(value, record);
       };
     }
+
     var newRender = processBuriedPoint((_processRenderFunctio = processRenderFunction(render !== null && render !== void 0 ? render : {}, value, record)) !== null && _processRenderFunctio !== void 0 ? _processRenderFunctio : {}, value, record);
+
     if (valueType === 'selectGroup') {
       newRender = _objectSpread(_objectSpread({
         maxShowNumber: 'auto',
@@ -86,8 +123,10 @@ var InfoValueItem = function InfoValueItem(props) {
         ellipsis: false
       });
     }
+
     return newRender;
   };
+
   var getFieldProps = function getFieldProps() {
     if (valueType === 'selectGroup') {
       return _objectSpread({
@@ -98,46 +137,56 @@ var InfoValueItem = function InfoValueItem(props) {
         layout: 'compact'
       }, fieldProps);
     }
+
     return fieldProps;
-  };
-  // 获取处理过的 dataSource
+  }; // 获取处理过的 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];
+              k = _ref2[0],
+              v = _ref2[1];
+
           return [k, (0, _utils.getTargetValue)(v, _objectSpread(_objectSpread({}, record), {}, {
             value: value
           }, context))];
         }));
       });
     }
+
     return newDataSource;
-  };
-  // 浮层的显隐状态
+  }; // 浮层的显隐状态
+
+
   var _useState = (0, _react.useState)(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    popConfirmVisible = _useState2[0],
-    setPopConfirmVisible = _useState2[1];
-  // 确认按钮的loading状态
+      _useState2 = _slicedToArray(_useState, 2),
+      popConfirmVisible = _useState2[0],
+      setPopConfirmVisible = _useState2[1]; // 确认按钮的loading状态
+
+
   var _useState3 = (0, _react.useState)(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    confirmLoading = _useState4[0],
-    setConfirmLoading = _useState4[1];
-  // edit 的显隐状态
+      _useState4 = _slicedToArray(_useState3, 2),
+      confirmLoading = _useState4[0],
+      setConfirmLoading = _useState4[1]; // edit 的显隐状态
+
+
   var _useState5 = (0, _react.useState)(false),
-    _useState6 = _slicedToArray(_useState5, 2),
-    editVisible = _useState6[0],
-    setEditVisible = _useState6[1];
+      _useState6 = _slicedToArray(_useState5, 2),
+      editVisible = _useState6[0],
+      setEditVisible = _useState6[1];
+
   var requestDataKey = editMethod.toLowerCase() === 'get' ? 'params' : 'data';
   var dataFilterForm = (0, _react.useMemo)(function () {
     return (0, _form.createForm)();
   }, []);
+
   var renderAction = function renderAction() {
     if (actions) {
       return /*#__PURE__*/_react.default.createElement(_actions.ProActionGroup, {
@@ -149,6 +198,7 @@ var InfoValueItem = function InfoValueItem(props) {
         context: _objectSpread({}, context)
       });
     }
+
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
   };
   /**
@@ -158,24 +208,31 @@ var InfoValueItem = function InfoValueItem(props) {
    * @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];
+          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];
     }));
   };
@@ -185,21 +242,24 @@ var InfoValueItem = function InfoValueItem(props) {
    * @param record table cell record
    * @returns
    */
+
+
   var processBuriedPoint = function processBuriedPoint(render, value, record) {
-    return Object.fromEntries([
-    // 默认 ellipsis、descriptionEllipsis 为 true
+    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];
+          k = _ref6[0],
+          v = _ref6[1];
+
       return [k, (0, _utils.getTargetValue)(v, _objectSpread(_objectSpread({}, record), {}, {
         record: record,
         value: value
       }))];
     }))));
-  };
-  // 重写编辑逻辑替代field原有逻辑
+  }; // 重写编辑逻辑替代field原有逻辑
+
+
   if (getInfoItemProps(isEdit)) {
     // 渲染表单
     var renderContent = function renderContent() {
@@ -212,33 +272,36 @@ var InfoValueItem = function InfoValueItem(props) {
         }],
         form: dataFilterForm
       }, getInfoItemProps(editProFormProps)));
-    };
-    // 表单提交
+    }; // 表单提交
+
+
     var onConfirm = function onConfirm(e) {
-      var formData = toJS(dataFilterForm.values);
-      // 如果传入了 editUrl 则内置请求
+      var formData = toJS(dataFilterForm.values); // 如果传入了 editUrl 则内置请求
+
       if (editUrl) {
         setConfirmLoading(true);
         var params = formData;
+
         if (editFormatParams) {
           params = editFormatParams === null || editFormatParams === void 0 ? void 0 : editFormatParams(formData, record);
         }
+
         (0, _utils.request)(_defineProperty({
           url: editUrl,
           method: editMethod
         }, requestDataKey, params)).then(function (resp) {
           var _actionRef$current, _actionRef$current$re;
+
           _components.Message.success(successMessage);
-          actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$re = _actionRef$current.refresh) === null || _actionRef$current$re === void 0 ? void 0 : _actionRef$current$re.call(_actionRef$current);
-          // setEditVisible(!editVisible);
-        }).catch(function (error) {
-          // TODO 暂时不处理。是否需要开放函数？
-        }).finally(function () {
-          // setConfirmLoading(false);
+
+          actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$re = _actionRef$current.refresh) === null || _actionRef$current$re === void 0 ? void 0 : _actionRef$current$re.call(_actionRef$current); // setEditVisible(!editVisible);
+        }).catch(function (error) {// TODO 暂时不处理。是否需要开放函数？
+        }).finally(function () {// setConfirmLoading(false);
         });
       }
-      var okResult = editOnOk === null || editOnOk === void 0 ? void 0 : editOnOk(formData, e);
-      // 重写了 editOnOk
+
+      var okResult = editOnOk === null || editOnOk === void 0 ? void 0 : editOnOk(formData, e); // 重写了 editOnOk
+
       if (okResult instanceof Promise) {
         setConfirmLoading(true);
         okResult.then(function () {
@@ -250,10 +313,12 @@ var InfoValueItem = function InfoValueItem(props) {
         setPopConfirmVisible(!popConfirmVisible);
         setEditVisible(!editVisible);
       }
-    };
-    // 取消
+    }; // 取消
+
+
     var onCancel = function onCancel(e) {
       var formData = toJS(dataFilterForm.values);
+
       if (editOnCancel) {
         editOnCancel === null || editOnCancel === void 0 ? void 0 : editOnCancel(formData, e);
         setPopConfirmVisible(!popConfirmVisible);
@@ -263,6 +328,7 @@ var InfoValueItem = function InfoValueItem(props) {
         setEditVisible(!editVisible);
       }
     };
+
     return /*#__PURE__*/_react.default.createElement("div", {
       className: cls('edit'),
       onMouseEnter: function onMouseEnter() {
@@ -300,6 +366,7 @@ var InfoValueItem = function InfoValueItem(props) {
       })
     }), renderAction(), extra && extra);
   }
+
   return /*#__PURE__*/_react.default.createElement("div", {
     className: cls('item-value')
   }, /*#__PURE__*/_react.default.createElement(_field.default, _objectSpread(_objectSpread({
@@ -309,5 +376,6 @@ var InfoValueItem = function InfoValueItem(props) {
     dataSource: getDataSource()
   }, others), getFieldProps())), renderAction(), extra && extra);
 };
+
 var _default = InfoValueItem;
 exports.default = _default;

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

@@ -4,43 +4,56 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
 var _components = require("@alicloudfe/components");
+
 var _ = require("../../..");
+
 var _utils = require("@teamix/utils");
+
 var _react = _interopRequireDefault(require("react"));
+
 var _field = require("../../../field");
+
 require("./index.scss");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 var cls = (0, _utils.usePrefixCls)('teamix-pro-info-item');
 var Row = _components.Grid.Row,
-  Col = _components.Grid.Col;
+    Col = _components.Grid.Col;
+
 var ProInfoItem = function ProInfoItem(prop) {
   var value = prop.value,
-    label = prop.label,
-    baseInfoLayout = prop.baseInfoLayout,
-    headerInfoLayout = prop.headerInfoLayout,
-    loading = prop.loading,
-    tooltip = prop.tooltip,
-    tooltipIcon = prop.tooltipIcon,
-    valueType = prop.valueType,
-    render = prop.render,
-    alignItems = prop.alignItems;
-  // 判断是否需要居中
+      label = prop.label,
+      baseInfoLayout = prop.baseInfoLayout,
+      headerInfoLayout = prop.headerInfoLayout,
+      loading = prop.loading,
+      tooltip = prop.tooltip,
+      tooltipIcon = prop.tooltipIcon,
+      valueType = prop.valueType,
+      render = prop.render,
+      alignItems = prop.alignItems; // 判断是否需要居中
+
   var isAlignItemsCenter = function isAlignItemsCenter() {
     if (typeof render !== 'function') {
       var type = render === null || render === void 0 ? void 0 : render.type;
+
       if (valueType === 'selectGroup') {
         return true;
       }
+
       if (type === 'tag' || type === 'statusIconTag' || type === 'eventLevelTag' || type === 'warningLevelTag') {
         return true;
       }
     }
+
     return false;
   };
+
   if (baseInfoLayout) {
     var labelCol = baseInfoLayout.labelCol,
-      wrapperCol = baseInfoLayout.wrapperCol;
+        wrapperCol = baseInfoLayout.wrapperCol;
     return /*#__PURE__*/_react.default.createElement("div", {
       className: cls('')
     }, /*#__PURE__*/_react.default.createElement(Row, {
@@ -68,9 +81,10 @@ var ProInfoItem = function ProInfoItem(prop) {
       className: cls('base-skeleton-box')
     }, /*#__PURE__*/_react.default.createElement(_.ProSkeletonRaw.Info.Item, null)), !loading && value)));
   }
+
   if (headerInfoLayout) {
     var _headerInfoLayout$lab = headerInfoLayout.labelGutter,
-      labelGutter = _headerInfoLayout$lab === void 0 ? '16px' : _headerInfoLayout$lab;
+        labelGutter = _headerInfoLayout$lab === void 0 ? '16px' : _headerInfoLayout$lab;
     return /*#__PURE__*/_react.default.createElement("div", {
       className: cls()
     }, /*#__PURE__*/_react.default.createElement(Row, {
@@ -94,7 +108,9 @@ var ProInfoItem = function ProInfoItem(prop) {
       className: cls('base-skeleton-box')
     }, /*#__PURE__*/_react.default.createElement(_.ProSkeletonRaw.Info.Item, null)), !loading && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, value))));
   }
+
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
 };
+
 var _default = ProInfoItem;
 exports.default = _default;

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

@@ -4,50 +4,66 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+
 var _components = require("@alicloudfe/components");
+
 var _react = _interopRequireDefault(require("react"));
+
 var _ProInfoItem = _interopRequireDefault(require("../ProInfoItem"));
+
 require("./index.scss");
+
 var _utils = require("../../utils/utils");
+
 var _layout = _interopRequireDefault(require("../../utils/layout"));
+
 var _InfoValueItem = _interopRequireDefault(require("../InfoValueItem"));
+
 var _utils2 = require("../../utils");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 var Row = _components.Grid.Row,
-  Col = _components.Grid.Col;
+    Col = _components.Grid.Col;
+
 var ProBaseInfo = function ProBaseInfo(props) {
   var _size$width;
+
   var columns = props.columns,
-    dataSource = props.dataSource,
-    loading = props.loading,
-    result = props.result,
-    actionRef = props.actionRef,
-    layout = props.layout,
-    size = props.size,
-    context = props.context,
-    _props$disabledAutoSi = props.disabledAutoSize,
-    disabledAutoSize = _props$disabledAutoSi === void 0 ? false : _props$disabledAutoSi;
-  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)];
-  // 获取列内的布局参数
+      dataSource = props.dataSource,
+      loading = props.loading,
+      result = props.result,
+      actionRef = props.actionRef,
+      layout = props.layout,
+      size = props.size,
+      context = props.context;
+
+  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)]; // 获取列内的布局参数
+
+
   var getFormItemLayout = function getFormItemLayout(colspan) {
-    var formItemLayout = JSON.parse(JSON.stringify(defaultLayout.formItemLayout));
-    // 自定义布局
+    var formItemLayout = JSON.parse(JSON.stringify(defaultLayout.formItemLayout)); // 自定义布局
+
     if (layout) {
       var _layout$labelCol, _layout$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需要重新计算
+    var newWrapperSpan = formItemLayout.wrapperCol.span; // 计算合并列情况。label与wrapper需要重新计算
+
     if (colspan) {
       var _layout$span, _layout$span2;
+
       var realColspan = ((_layout$span = layout === null || layout === void 0 ? void 0 : layout.span) !== null && _layout$span !== void 0 ? _layout$span : 24 / defaultLayout.span > colspan) ? colspan : (_layout$span2 = layout === null || layout === void 0 ? void 0 : layout.span) !== null && _layout$span2 !== void 0 ? _layout$span2 : 24 / defaultLayout.span;
       newLabelSpan = newLabelSpan / realColspan;
       newWrapperSpan = newWrapperSpan + (formItemLayout.labelCol.span - newLabelSpan);
     }
+
     var newFormItemLayout = {
       labelCol: {
         span: newLabelSpan.toFixed()
@@ -58,13 +74,17 @@ var ProBaseInfo = function ProBaseInfo(props) {
     };
     return Object.assign(formItemLayout, newFormItemLayout);
   };
+
   var renderContent = function renderContent() {
     return columns.map(function (item, index) {
       var _ref, _ref2, _layout$span3, _layout$span4, _item$title, _item$valueType, _ref3, _item$colSpan;
+
       var hidden = (0, _utils2.isHidden)(item === null || item === void 0 ? void 0 : item.hidden, (0, _utils2.getDataIndexValue)(item.dataIndex, (_ref = dataSource !== null && dataSource !== void 0 ? dataSource : result) !== null && _ref !== void 0 ? _ref : {}), (_ref2 = dataSource !== null && dataSource !== void 0 ? dataSource : result) !== null && _ref2 !== void 0 ? _ref2 : {}, context);
+
       if (hidden) {
         return;
       }
+
       var span = item.colSpan ? defaultLayout.span : defaultLayout.span;
       var layoutSpan = item.colSpan ? ((_layout$span3 = layout === null || layout === void 0 ? void 0 : layout.span) !== null && _layout$span3 !== void 0 ? _layout$span3 : span) * item.colSpan : (_layout$span4 = layout === null || layout === void 0 ? void 0 : layout.span) !== null && _layout$span4 !== void 0 ? _layout$span4 : span;
       return /*#__PURE__*/_react.default.createElement(Col, {
@@ -93,11 +113,13 @@ var ProBaseInfo = function ProBaseInfo(props) {
       }));
     });
   };
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, ((size === null || size === void 0 ? void 0 : size.width) || disabledAutoSize) && /*#__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",
     gutter: 20
   }, renderContent()));
 };
+
 var _default = ProBaseInfo;
 exports.default = _default;