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

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

@@ -4,66 +4,50 @@ 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;
-
-  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,
+    _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)];
+  // 获取列内的布局参数
   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()
@@ -74,17 +58,13 @@ 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, {
@@ -113,13 +93,11 @@ var ProBaseInfo = function ProBaseInfo(props) {
       }));
     });
   };
-
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (size === null || size === void 0 ? void 0 : size.width) && /*#__PURE__*/_react.default.createElement(Row, {
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, ((size === null || size === void 0 ? void 0 : size.width) || disabledAutoSize) && /*#__PURE__*/_react.default.createElement(Row, {
     wrap: true,
     className: "teamix-pro-info-content-row",
     gutter: 20
   }, renderContent()));
 };
-
 var _default = ProBaseInfo;
 exports.default = _default;

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

@@ -4,64 +4,43 @@ 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 _layout = _interopRequireDefault(require("../../utils/layout"));
-
 var _utils = require("../../utils/utils");
-
 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 ProHeaderInfo = function ProHeaderInfo(props) {
   var _size$width;
-
   var columns = props.columns,
-      dataSource = props.dataSource,
-      layout = props.layout,
-      loading = props.loading,
-      result = props.result,
-      actionRef = props.actionRef,
-      size = props.size,
-      context = props.context;
-
+    dataSource = props.dataSource,
+    layout = props.layout,
+    loading = props.loading,
+    result = props.result,
+    actionRef = props.actionRef,
+    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 renderContent = function renderContent() {
     return columns.map(function (item, index) {
       var _ref, _ref2, _item$title, _item$valueType;
-
       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 = 24;
-
       if (layout === null || layout === void 0 ? void 0 : layout.colNum) {
         var _item$colSpan;
-
         span = 24 / (layout === null || layout === void 0 ? void 0 : layout.colNum) * ((_item$colSpan = item === null || item === void 0 ? void 0 : item.colSpan) !== null && _item$colSpan !== void 0 ? _item$colSpan : 1);
       } else {
         var _item$colSpan2;
-
         span = defaultLayout.span * ((_item$colSpan2 = item === null || item === void 0 ? void 0 : item.colSpan) !== null && _item$colSpan2 !== void 0 ? _item$colSpan2 : 1);
       }
-
       return /*#__PURE__*/_react.default.createElement(Col, {
         span: span,
         key: index
@@ -88,12 +67,10 @@ var ProHeaderInfo = function ProHeaderInfo(props) {
       }));
     });
   };
-
   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()));
 };
-
 var _default = ProHeaderInfo;
 exports.default = _default;

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

@@ -1,66 +1,43 @@
 "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 _react = _interopRequireWildcard(require("react"));
-
 require("./index.scss");
-
 var _components = require("@alicloudfe/components");
-
 var _field = require("../../../field");
-
 var _InfoValueItem = _interopRequireDefault(require("../InfoValueItem"));
-
 var _2 = require("../../..");
-
 var _utils = require("../../utils");
-
 var _lodash = _interopRequireDefault(require("lodash.clonedeep"));
-
 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); 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 _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 _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 _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 _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; }
-
 var ProTableInfo = function ProTableInfo(props) {
   var columns = props.columns,
-      dataSource = props.dataSource,
-      _props$layout = props.layout,
-      layout = _props$layout === void 0 ? {} : _props$layout,
-      loading = props.loading,
-      result = props.result,
-      actionRef = props.actionRef,
-      context = props.context;
+    dataSource = props.dataSource,
+    _props$layout = props.layout,
+    layout = _props$layout === void 0 ? {} : _props$layout,
+    loading = props.loading,
+    result = props.result,
+    actionRef = props.actionRef,
+    context = props.context;
   var _layout$colNum = layout.colNum,
-      colNum = _layout$colNum === void 0 ? 2 : _layout$colNum,
-      _layout$labelGutter = layout.labelGutter,
-      labelGutter = _layout$labelGutter === void 0 ? '80px' : _layout$labelGutter;
-
+    colNum = _layout$colNum === void 0 ? 2 : _layout$colNum,
+    _layout$labelGutter = layout.labelGutter,
+    labelGutter = _layout$labelGutter === void 0 ? '80px' : _layout$labelGutter;
   var getNewColumns = function getNewColumns() {
     // 需要 fill 填充 否则有可能不执行
     return _toConsumableArray(new Array(colNum)).fill(1).map(function (_, index) {
@@ -77,10 +54,8 @@ var ProTableInfo = function ProTableInfo(props) {
       return [].concat(_toConsumableArray(acc), _toConsumableArray(cur));
     }, []);
   };
-
   var getInfoValueItem = function getInfoValueItem(item) {
     var _item$valueType;
-
     return /*#__PURE__*/_react.default.createElement(_InfoValueItem.default, {
       type: (_item$valueType = item === null || item === void 0 ? void 0 : item.valueType) !== null && _item$valueType !== void 0 ? _item$valueType : 'text',
       value: (0, _utils.getDataIndexValue)(item.dataIndex, dataSource !== null && dataSource !== void 0 ? dataSource : result),
@@ -92,77 +67,66 @@ var ProTableInfo = function ProTableInfo(props) {
       props: item.props
     });
   };
-
   var newDataSource = (0, _react.useMemo)(function () {
     var nResult = [];
     var columnsCopy = (0, _lodash.default)(columns).filter(function (item) {
       return !(0, _utils.isHidden)(item.hidden, (0, _utils.getDataIndexValue)(item.dataIndex, dataSource !== null && dataSource !== void 0 ? dataSource : result), dataSource !== null && dataSource !== void 0 ? dataSource : result, context);
-    }); // 取当前行的数据。直到取完
-
+    });
+    // 取当前行的数据。直到取完
     while (columnsCopy.length > 0) {
       var filterColumns = [];
-      var col = colNum * 2; // 需要判断是否有合并行情况
-
+      var col = colNum * 2;
+      // 需要判断是否有合并行情况
       while (col >= 2) {
         if (columnsCopy.length > 0) {
           var _columnsItem$colSpan;
-
           var columnsItem = columnsCopy.shift();
-          var needCol = 1 + ((_columnsItem$colSpan = columnsItem === null || columnsItem === void 0 ? void 0 : columnsItem.colSpan) !== null && _columnsItem$colSpan !== void 0 ? _columnsItem$colSpan : 1); // 如果剩余的col能满足下一组数据那么就放在这一组
-
+          var needCol = 1 + ((_columnsItem$colSpan = columnsItem === null || columnsItem === void 0 ? void 0 : columnsItem.colSpan) !== null && _columnsItem$colSpan !== void 0 ? _columnsItem$colSpan : 1);
+          // 如果剩余的col能满足下一组数据那么就放在这一组
           if (needCol <= col) {
             col = col - needCol;
             filterColumns.push(columnsItem);
           } else {
             var _filterColumns$0$colS;
-
             // 不满足条件。再安回去。。。
-            columnsCopy.unshift(columnsItem); // 并且把剩余的col都分配给前一组数据
-
-            filterColumns[0].colSpan = ((_filterColumns$0$colS = filterColumns[0].colSpan) !== null && _filterColumns$0$colS !== void 0 ? _filterColumns$0$colS : 1) + col; // 置0
-
+            columnsCopy.unshift(columnsItem);
+            // 并且把剩余的col都分配给前一组数据
+            filterColumns[0].colSpan = ((_filterColumns$0$colS = filterColumns[0].colSpan) !== null && _filterColumns$0$colS !== void 0 ? _filterColumns$0$colS : 1) + col;
+            // 置0
             col = 0;
           }
         }
-
         if (columnsCopy.length === 0) {
           // 如果剩余仍有列数并且已经没有columns分配了
           col = 0;
         }
       }
-
       var itemData = filterColumns.map(function (item, index) {
         var _item$title, _data;
-
         var data = (_data = {}, _defineProperty(_data, "label_".concat(index), /*#__PURE__*/_react.default.createElement(_field.LabelIconTip, {
           label: (_item$title = item === null || item === void 0 ? void 0 : item.title) !== null && _item$title !== void 0 ? _item$title : '',
           tooltip: item.tooltip,
           icon: item.tooltipIcon
         })), _defineProperty(_data, "value_".concat(index), /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, loading && /*#__PURE__*/_react.default.createElement(_2.ProSkeletonRaw.Info.Item, null), !loading && getInfoValueItem(item))), _data);
-
         if (item.colSpan) {
           data['formatter'] = {
             colSpan: item.colSpan
           };
         }
-
         return data;
       }).reduce(function (acc, cur) {
         return _objectSpread(_objectSpread({}, acc), cur);
       }, {});
       nResult.push(itemData);
     }
-
     return nResult;
   }, [loading, result]);
-
   var setCellProps = function setCellProps(rowIndex, colIndex, dataIndex, record) {
     if (colIndex % 2 === 0) {
       return {
         className: 'key-type'
       };
     }
-
     if (record.formatter) {
       if (record.formatter.colSpan) {
         if (colIndex === record.formatter.colSpan) {
@@ -170,28 +134,23 @@ var ProTableInfo = function ProTableInfo(props) {
             colSpan: record.formatter.colSpan
           };
         }
-
         var length = Object.keys(record).length;
-
         if (length <= 3) {
           return {
             colSpan: record.formatter.colSpan
           };
         }
-
         if (length > 5) {
           return {
             colSpan: record.formatter.colSpan
           };
         }
       }
-
       return {
         rowSpan: record.formatter.rowSpan
       };
     }
   };
-
   return /*#__PURE__*/_react.default.createElement(_components.Table.StickyLock, {
     className: "teamix-pro-info-table",
     cellProps: setCellProps,
@@ -201,6 +160,5 @@ var ProTableInfo = function ProTableInfo(props) {
     dataSource: newDataSource
   });
 };
-
 var _default = ProTableInfo;
 exports.default = _default;