@teamix/pro 1.1.37 → 1.1.38

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

@@ -155,6 +155,9 @@ var InfoValueItem = function InfoValueItem(props) {
         type: "text",
         style: {
           marginLeft: '8px'
+        },
+        context: {
+          record: record
         }
       });
     }

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

@@ -37,29 +37,48 @@ var ProBaseInfo = function ProBaseInfo(props) {
       layout = props.layout,
       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)]; // 获取列的布局参数
+  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() {
+  var getFormItemLayout = function getFormItemLayout(colspan) {
+    var formItemLayout = JSON.parse(JSON.stringify(defaultLayout.formItemLayout)); // 自定义布局
+
     if (layout) {
       var _layout$labelCol, _layout$wrapperCol;
 
-      return {
-        labelCol: (_layout$labelCol = layout === null || layout === void 0 ? void 0 : layout.labelCol) !== null && _layout$labelCol !== void 0 ? _layout$labelCol : defaultLayout.formItemLayout.labelCol,
-        wrapperCol: (_layout$wrapperCol = layout === null || layout === void 0 ? void 0 : layout.wrapperCol) !== null && _layout$wrapperCol !== void 0 ? _layout$wrapperCol : defaultLayout.formItemLayout.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需要重新计算
+
+    if (colspan) {
+      newLabelSpan = newLabelSpan / colspan;
+      newWrapperSpan = newWrapperSpan + (formItemLayout.labelCol.span - newLabelSpan);
     }
 
-    return defaultLayout.formItemLayout;
+    var newFormItemLayout = {
+      labelCol: {
+        span: newLabelSpan
+      },
+      wrapperCol: {
+        span: newWrapperSpan
+      }
+    };
+    return Object.assign(formItemLayout, newFormItemLayout);
   };
 
   var renderContent = function renderContent() {
     return columns.map(function (item, index) {
-      var _layout$span, _item$title, _item$valueType, _ref;
+      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 || layout === void 0 ? void 0 : layout.span) !== null && _layout$span !== void 0 ? _layout$span : span) * item.colSpan : (_layout$span2 = layout === null || layout === void 0 ? void 0 : layout.span) !== null && _layout$span2 !== void 0 ? _layout$span2 : span;
       return /*#__PURE__*/_react.default.createElement(Col, {
-        span: (_layout$span = layout === null || layout === void 0 ? void 0 : layout.span) !== null && _layout$span !== void 0 ? _layout$span : span,
+        span: layoutSpan,
         key: index
       }, /*#__PURE__*/_react.default.createElement(_ProInfoItem.default, {
         label: (_item$title = item === null || item === void 0 ? void 0 : item.title) !== null && _item$title !== void 0 ? _item$title : '',
@@ -73,7 +92,7 @@ var ProBaseInfo = function ProBaseInfo(props) {
           record: dataSource !== null && dataSource !== void 0 ? dataSource : result,
           actionRef: actionRef
         }),
-        baseInfoLayout: getFormItemLayout(),
+        baseInfoLayout: getFormItemLayout((_item$colSpan = item === null || item === void 0 ? void 0 : item.colSpan) !== null && _item$colSpan !== void 0 ? _item$colSpan : 0),
         tooltip: item.tooltip,
         tooltipIcon: item.tooltipIcon
       }));

package/lib/info/index.js

@@ -41,7 +41,7 @@ Object.keys(_typing).forEach(function (key) {
     }
   });
 });
-var _excluded = ["type", "url", "method", "formatResult", "params", "actionRef", "header", "onError", "className", "style", "columns", "layout", "dataSource"];
+var _excluded = ["type", "url", "method", "formatResult", "params", "actionRef", "header", "onError", "className", "style", "columns", "layout", "dataSource", "loading", "extra"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -88,6 +88,8 @@ var ProInfo = function ProInfo(props) {
       columns = props.columns,
       layout = props.layout,
       dataSource = props.dataSource,
+      userLoading = props.loading,
+      extra = props.extra,
       others = _objectWithoutProperties(props, _excluded);
 
   var _useContext = (0, _react.useContext)(_utils.ProInfoGroupContext),
@@ -164,19 +166,38 @@ var ProInfo = function ProInfo(props) {
       getData.run({});
     }
   });
+
+  var getExtra = function getExtra() {
+    if (!extra) {
+      return undefined;
+    }
+
+    if ( /*#__PURE__*/(0, _react.isValidElement)(extra)) {
+      return extra;
+    }
+
+    return _objectSpread(_objectSpread({}, extra), {}, {
+      context: {
+        record: dataSource !== null && dataSource !== void 0 ? dataSource : getDataSource(getData.data)
+      }
+    });
+  };
+
   return /*#__PURE__*/_react.default.createElement("div", {
     ref: ref,
     className: "teamix-pro-info ".concat(className !== null && className !== void 0 ? className : ''),
     style: style
-  }, /*#__PURE__*/_react.default.createElement(_.ProCard, _objectSpread(_objectSpread({
+  }, /*#__PURE__*/_react.default.createElement(_.ProCard, _objectSpread(_objectSpread(_objectSpread({
     compacted: true,
     hoveredShadow: false,
     bordered: false,
     backgroundColor: "transparent"
-  }, header), others), type === 'table' && /*#__PURE__*/_react.default.createElement(_tableInfo.default, {
+  }, header), others), {}, {
+    extra: getExtra()
+  }), type === 'table' && /*#__PURE__*/_react.default.createElement(_tableInfo.default, {
     dataSource: dataSource,
     columns: columns,
-    loading: loading || getData.loading,
+    loading: userLoading || loading || getData.loading,
     result: getDataSource(getData.data),
     actionRef: actionRef,
     layout: layout
@@ -184,7 +205,7 @@ var ProInfo = function ProInfo(props) {
     dataSource: dataSource,
     columns: columns,
     header: header,
-    loading: loading || getData.loading,
+    loading: userLoading || loading || getData.loading,
     result: getDataSource(getData.data),
     actionRef: actionRef,
     layout: layout,
@@ -192,7 +213,7 @@ var ProInfo = function ProInfo(props) {
   }), type === 'base' && /*#__PURE__*/_react.default.createElement(_baseInfo.default, {
     dataSource: dataSource,
     columns: columns,
-    loading: loading || getData.loading,
+    loading: userLoading || loading || getData.loading,
     result: getDataSource(getData.data),
     actionRef: actionRef,
     layout: layout,

package/lib/info/typing.d.ts

@@ -41,6 +41,8 @@ export declare type ProInfoBaseProps = {
     };
     /** 布局值 */
     layout?: BaseInfoLayoutProps;
+    /** 加载动画 */
+    loading?: boolean;
 } & ProInfoHeaderProps;
 /** ProInfoItemProps info 单元格 定义 */
 export interface ProInfoItemProps {
@@ -147,7 +149,7 @@ export declare type InfoValueItemProps = {
     render?: ProInfoCellRender;
     dataSource?: IProFieldOptionItem[] | ProInfoCellFunProp;
 } & Omit<IProFieldProps, 'render' | 'dataSource'>;
-export declare type ProInfoHeaderProps = CardProps;
+export declare type ProInfoHeaderProps = Omit<CardProps, 'loading'>;
 /** ProInfoGroupContextProps */
 export declare type ProInfoGroupContextProps = {
     /** 因为其他数据都为异步。visible 只用作标识 */

package/lib/table/components/Filter/index.js

@@ -55,7 +55,9 @@ var RadioItem = _components.Menu.RadioItem;
 
 var Filter = function Filter(props) {
   var column = props.column,
-      actionRef = props.actionRef; // 选中过滤项
+      actionRef = props.actionRef;
+  var _column$filtersWidth = column.filtersWidth,
+      filtersWidth = _column$filtersWidth === void 0 ? 130 : _column$filtersWidth; // 选中过滤项
 
   var _useState = (0, _react.useState)([]),
       _useState2 = _slicedToArray(_useState, 2),
@@ -174,7 +176,10 @@ var Filter = function Filter(props) {
       return setVisible(false);
     }
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: cls()
+    className: cls(),
+    style: {
+      width: filtersWidth
+    }
   }, /*#__PURE__*/_react.default.createElement(_components.Menu, null, renderSelect(), /*#__PURE__*/_react.default.createElement("div", {
     className: cls({
       'btn-box': true

package/lib/table/components/Filter/index.scss

@@ -1,5 +1,5 @@
 .teamix-pro-table-toolbar-filter {
-  width: 130px;
+  min-width: 130px;
   max-height: 350px;
   overflow-y: auto;
   box-shadow: var(--popup-local-shadow, 0px 6px 24px 0px rgba(0, 0, 0, 0.1));

package/lib/table/typing.d.ts

@@ -47,6 +47,8 @@ export declare type ProColumnProps = {
     filtersMode?: 'single' | 'multiple';
     /** 表头的过滤菜单项在搜索之前的参数操作 */
     beforeFilter?: (rules: string[]) => string;
+    /** 表头的过滤菜单宽度 */
+    filtersWidth?: string | number;
     /** 操作组配置 */
     actionSchema?: ActionGroupProps;
     /** 指定列对应的字段，支持`a.b`形式的快速取值 和 数组取值 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.1.37",
+  "version": "1.1.38",
   "description": "TeamixPro大包",
   "repository": "http://gitlab.alibaba-inc.com/teamix/pro",
   "author": "Velociraptor(迅猛龙)",