@teamix/pro 1.3.9 → 1.3.10

package/dist/pro.js

@@ -69288,7 +69288,7 @@ _teamix_icon__WEBPACK_IMPORTED_MODULE_15__/* ["default"].setConfig */ .Z.setConf
  // export * from './sidebar';
 
 
-var version = '1.3.9';
+var version = '1.3.10';
 
 
 /***/ }),
@@ -69869,33 +69869,23 @@ var ProBaseInfo = function ProBaseInfo(props) {
     var formItemLayout = JSON.parse(JSON.stringify(defaultLayout.formItemLayout)); // 自定义布局
 
     if (layout) {
-      var _layout$labelCol, _layout$wrapperCol, _layout$span;
+      var _layout$labelCol, _layout$wrapperCol;
 
       var labelCol = (_layout$labelCol = layout == null ? void 0 : layout.labelCol) != null ? _layout$labelCol : defaultLayout.formItemLayout.labelCol;
       var wrapperCol = (_layout$wrapperCol = layout == null ? void 0 : layout.wrapperCol) != null ? _layout$wrapperCol : defaultLayout.formItemLayout.wrapperCol;
-      var span = (_layout$span = layout == null ? void 0 : layout.span) != null ? _layout$span : defaultLayout.span;
-
-      if (layout != null && layout.colNum && layout.colNum > 0 && layout.colNum <= 4) {
-        span = 24 / layout.colNum;
-      }
-
-      formItemLayout.span = span;
       formItemLayout.labelCol = labelCol;
       formItemLayout.wrapperCol = wrapperCol;
     }
 
-    var newSpan = formItemLayout.span;
     var newLabelSpan = formItemLayout.labelCol.span;
     var newWrapperSpan = formItemLayout.wrapperCol.span; // 计算合并列情况。label与wrapper需要重新计算
 
     if (colspan) {
-      newSpan = newSpan * (colspan != null ? colspan : 1);
       newLabelSpan = newLabelSpan / colspan;
       newWrapperSpan = newWrapperSpan + (formItemLayout.labelCol.span - newLabelSpan);
     }
 
     var newFormItemLayout = {
-      span: newSpan,
       labelCol: {
         span: newLabelSpan
       },
@@ -69908,10 +69898,12 @@ var ProBaseInfo = function ProBaseInfo(props) {
 
   var renderContent = function renderContent() {
     return columns.map(function (item, index) {
-      var _getFormItemLayout, _item$colSpan, _item$title, _item$valueType, _ref, _item$colSpan2;
+      var _layout$span, _layout$span2, _item$title, _item$valueType, _ref, _item$colSpan;
 
+      var span = item.colSpan ? defaultLayout.span * item.colSpan : defaultLayout.span;
+      var layoutSpan = item.colSpan ? ((_layout$span = layout == null ? void 0 : layout.span) != null ? _layout$span : span) * item.colSpan : (_layout$span2 = layout == null ? void 0 : layout.span) != null ? _layout$span2 : span;
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(Col, {
-        span: (_getFormItemLayout = getFormItemLayout((_item$colSpan = item == null ? void 0 : item.colSpan) != null ? _item$colSpan : 0)) == null ? void 0 : _getFormItemLayout.span,
+        span: layoutSpan,
         key: index
       }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(_ProInfoItem__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z, {
         label: (_item$title = item == null ? void 0 : item.title) != null ? _item$title : '',
@@ -69927,7 +69919,7 @@ var ProBaseInfo = function ProBaseInfo(props) {
           context: context,
           props: item.props
         }),
-        baseInfoLayout: getFormItemLayout((_item$colSpan2 = item == null ? void 0 : item.colSpan) != null ? _item$colSpan2 : 0),
+        baseInfoLayout: getFormItemLayout((_item$colSpan = item == null ? void 0 : item.colSpan) != null ? _item$colSpan : 0),
         tooltip: item.tooltip,
         tooltipIcon: item.tooltipIcon
       }));
@@ -79401,6 +79393,31 @@ function getCookie(name) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "M": () => (/* binding */ autoWidth)
 /* harmony export */ });
+/**
+ * 获取某个宽度在宽度集中的无效空间
+ * @param array 宽度集
+ * @param used 使用此宽度计算宽度集无效空间
+ * @returns 使用此宽度的闲置空间和溢出空间
+ */
+var getInvalidSpace = function getInvalidSpace(array, used) {
+  return array.reduce(function (prev, current) {
+    if (used > current) {
+      prev[0] += used - current; // 闲置值
+    }
+
+    if (used < current) {
+      prev[1] += current - used; // 溢出值
+    }
+
+    return prev;
+  }, [0, 0]);
+};
+
+/**
+ * 根据宽度集获取合适的宽度
+ * @param array
+ * @returns
+ */
 var autoWidth = function autoWidth(array) {
   var consoleArray = []; // 日志记录
 
@@ -79408,56 +79425,30 @@ var autoWidth = function autoWidth(array) {
 
   var expectedWidth = 0; // 期望宽度
 
-  var getInvalidSpace = function getInvalidSpace(value) {
-    var idleflowRate = 0.7; // 闲置宽度权重，越大则内容紧密性越好，反之信息呈现性越好。
-
-    var overflowRate = 2; // 溢出宽度权重，越大则信息呈现性越好，反之内容紧密性越好。
-
-    var idleSpace = 0; // 空间闲置总量
-
-    var overflowSpace = 0; // 空间溢出总量
-
-    array.forEach(function (width) {
-      if (value > width) {
-        idleSpace += (value - width) * idleflowRate; // 闲置值
-      }
-
-      if (value < width) {
-        overflowSpace += (width - value) * overflowRate; // 溢出值
-      }
-    });
-    return {
-      idleSpace: idleSpace,
-      // 闲置空间
-      overflowSpace: overflowSpace,
-      // 溢出空间
-      invalidSpace: idleSpace + overflowSpace // 无效空间
-
-    };
-  };
-
   array == null ? void 0 : array.forEach(function (width, index) {
-    var _getInvalidSpace = getInvalidSpace(width),
-        idleSpace = _getInvalidSpace.idleSpace,
-        overflowSpace = _getInvalidSpace.overflowSpace,
-        invalidSpace = _getInvalidSpace.invalidSpace;
+    var _getInvalidSpace = getInvalidSpace(array, width),
+        idleSpace = _getInvalidSpace[0],
+        overflowSpace = _getInvalidSpace[1];
 
-    consoleArray.push({
-      width: Math.ceil(width),
-      idleSpace: idleSpace,
-      overflowSpace: overflowSpace,
-      invalidSpace: invalidSpace
-    });
+    var invalidSpace = idleSpace + overflowSpace; // 使用第一个作为比对基准
 
     if (index === 0) {
       minInvalidSpace = invalidSpace;
       expectedWidth = width;
-    }
+    } // 如果新宽度的无效空间小于等于缓存基准，则使用新的。
+
 
     if (invalidSpace <= minInvalidSpace) {
       minInvalidSpace = invalidSpace;
       expectedWidth = width;
     }
+
+    consoleArray.push({
+      width: Math.ceil(width),
+      idleSpace: idleSpace,
+      overflowSpace: overflowSpace,
+      invalidSpace: invalidSpace
+    });
   });
   return {
     expectedWidth: Math.ceil(expectedWidth),