@teamix/pro 1.1.34 → 1.1.35

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

@@ -13,8 +13,6 @@ require("./index.scss");
 
 var _components = require("@alicloudfe/components");
 
-var _card = _interopRequireDefault(require("../../../card"));
-
 var _utils = require("@teamix/utils");
 
 var _InfoValueItem = _interopRequireDefault(require("../InfoValueItem"));
@@ -23,8 +21,6 @@ var _2 = require("../../..");
 
 var _utils2 = require("../../utils");
 
-var _excluded = ["header", "columns", "dataSource", "layout", "loading", "result", "actionRef", "className"];
-
 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); }
@@ -49,22 +45,14 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 
 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 _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 ProTableInfo = function ProTableInfo(props) {
-  var header = props.header,
-      columns = props.columns,
+  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,
-      className = props.className,
-      others = _objectWithoutProperties(props, _excluded);
-
+      actionRef = props.actionRef;
   var _layout$colNum = layout.colNum,
       colNum = _layout$colNum === void 0 ? 2 : _layout$colNum,
       _layout$labelGutter = layout.labelGutter,
@@ -194,20 +182,14 @@ var ProTableInfo = function ProTableInfo(props) {
     }
   };
 
-  return /*#__PURE__*/_react.default.createElement("div", _objectSpread({
-    className: "teamix-pro-info ".concat(className)
-  }, others), /*#__PURE__*/_react.default.createElement(_card.default, _objectSpread({
-    compacted: true,
-    hoveredShadow: false,
-    bordered: false
-  }, header), /*#__PURE__*/_react.default.createElement(_components.Table.StickyLock, {
+  return /*#__PURE__*/_react.default.createElement(_components.Table.StickyLock, {
     className: "teamix-pro-info-table",
     cellProps: setCellProps,
     columns: newColumns(),
     hasHeader: false,
     hasBorder: true,
     dataSource: newDataSource
-  })));
+  });
 };
 
 var _default = ProTableInfo;

package/lib/info/index.js

@@ -10,11 +10,11 @@ exports.default = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _tableInfo = _interopRequireDefault(require("./components/tableInfo"));
+var _TableInfo = _interopRequireDefault(require("./components/TableInfo"));
 
-var _headerInfo = _interopRequireDefault(require("./components/headerInfo"));
+var _HeaderInfo = _interopRequireDefault(require("./components/HeaderInfo"));
 
-var _baseInfo = _interopRequireDefault(require("./components/baseInfo"));
+var _BaseInfo = _interopRequireDefault(require("./components/BaseInfo"));
 
 var _InfoGroup = _interopRequireDefault(require("./components/InfoGroup"));
 
@@ -24,6 +24,10 @@ var _utils = require("./utils");
 
 var _utils2 = require("@teamix/utils");
 
+var _hooks = require("@teamix/hooks");
+
+var _ = require("..");
+
 var _typing = require("./typing");
 
 Object.keys(_typing).forEach(function (key) {
@@ -37,7 +41,7 @@ Object.keys(_typing).forEach(function (key) {
     }
   });
 });
-var _excluded = ["type", "url", "method", "formatResult", "params", "actionRef", "header", "onError"];
+var _excluded = ["type", "url", "method", "formatResult", "params", "actionRef", "header", "onError", "className", "style", "columns", "layout", "dataSource"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -68,7 +72,8 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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 ProInfo = function ProInfo(props) {
-  var type = props.type,
+  var _props$type = props.type,
+      type = _props$type === void 0 ? 'base' : _props$type,
       url = props.url,
       _props$method = props.method,
       method = _props$method === void 0 ? 'post' : _props$method,
@@ -78,15 +83,25 @@ var ProInfo = function ProInfo(props) {
       _props$header = props.header,
       header = _props$header === void 0 ? {} : _props$header,
       _onError = props.onError,
+      className = props.className,
+      style = props.style,
+      columns = props.columns,
+      layout = props.layout,
+      dataSource = props.dataSource,
       others = _objectWithoutProperties(props, _excluded);
 
   var _useContext = (0, _react.useContext)(_utils.ProInfoGroupContext),
       contextUrl = _useContext.url,
       contextMethod = _useContext.method,
       contextParams = _useContext.params,
-      contextFormatResult = _useContext.formatResult; // 请求数据
+      contextFormatResult = _useContext.formatResult,
+      contextVisible = _useContext.visible,
+      contextSize = _useContext.size; // 获取容器宽度
 
 
+  var ref = (0, _react.useRef)();
+  var size = contextVisible ? contextSize : (0, _hooks.useSize)(ref); // 请求数据
+
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
       loading = _useState2[0],
@@ -149,31 +164,40 @@ var ProInfo = function ProInfo(props) {
       getData.run({});
     }
   });
-
-  if (type === 'table') {
-    return /*#__PURE__*/_react.default.createElement(_tableInfo.default, _objectSpread(_objectSpread({}, others), {}, {
-      header: header,
-      loading: loading || getData.loading,
-      result: getDataSource(getData.data),
-      actionRef: actionRef
-    }));
-  }
-
-  if (type === 'header') {
-    return /*#__PURE__*/_react.default.createElement(_headerInfo.default, _objectSpread(_objectSpread({}, others), {}, {
-      header: header,
-      loading: loading || getData.loading,
-      result: getDataSource(getData.data),
-      actionRef: actionRef
-    }));
-  }
-
-  return /*#__PURE__*/_react.default.createElement(_baseInfo.default, _objectSpread(_objectSpread({}, others), {}, {
+  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({
+    compacted: true,
+    hoveredShadow: false,
+    bordered: false,
+    backgroundColor: "transparent"
+  }, header), others), type === 'table' && /*#__PURE__*/_react.default.createElement(_TableInfo.default, {
+    dataSource: dataSource,
+    columns: columns,
+    loading: loading || getData.loading,
+    result: getDataSource(getData.data),
+    actionRef: actionRef,
+    layout: layout
+  }), type === 'header' && /*#__PURE__*/_react.default.createElement(_HeaderInfo.default, {
+    dataSource: dataSource,
+    columns: columns,
     header: header,
     loading: loading || getData.loading,
     result: getDataSource(getData.data),
-    actionRef: actionRef
-  }));
+    actionRef: actionRef,
+    layout: layout,
+    size: size
+  }), type === 'base' && /*#__PURE__*/_react.default.createElement(_BaseInfo.default, {
+    dataSource: dataSource,
+    columns: columns,
+    loading: loading || getData.loading,
+    result: getDataSource(getData.data),
+    actionRef: actionRef,
+    layout: layout,
+    size: size
+  })));
 };
 
 ProInfo.Group = _InfoGroup.default;

package/lib/info/index.scss

@@ -1,10 +1,6 @@
 .teamix-pro-info {
   color: var(--color-brand1-6);
   
-  .next-card {
-    background: none;
-  }
-
   .teamix-pro-info-content-row {
     width: 100%;
   }

package/lib/info/typing.d.ts

@@ -3,6 +3,12 @@ import { ActionGroupProps, IActionButton } from '../actions';
 import { Method } from 'axios';
 import React from 'react';
 import { CardProps } from '../card';
+/** 列record函数 */
+declare type ProInfoCellFunProp = (value: any, record: any) => any;
+declare type FieldRenderProps = keyof IProFieldFormatterProps;
+declare type ProInfoCellRender = {
+    [key in FieldRenderProps]?: IProFieldFormatterProps[key] | ProInfoCellFunProp;
+} | ((...other: any) => React.ReactNode);
 /** ProInfoBaseProps info 基础定义 */
 export declare type ProInfoBaseProps = {
     /** ProColums 定义，取代 Table 的 columns */
@@ -27,7 +33,7 @@ export declare type ProInfoBaseProps = {
     onError?: (error: Error) => void;
     /** ProInfo action 的引用，便于手动触发一些方法  */
     actionRef?: React.MutableRefObject<ProInfoActionType | undefined>;
-    /** 标题区 */
+    /** 标题区 推荐将header中的内容平铺到ProCard中。即将不支持此写法 */
     header?: ProInfoHeaderProps;
     /** info 数据源 */
     dataSource?: {
@@ -35,7 +41,7 @@ export declare type ProInfoBaseProps = {
     };
     /** 布局值 */
     layout?: BaseInfoLayoutProps;
-};
+} & ProInfoHeaderProps;
 /** ProInfoItemProps info 单元格 定义 */
 export interface ProInfoItemProps {
     /** 标题 */
@@ -49,9 +55,9 @@ export interface ProInfoItemProps {
     /** 对应 ProField 里面的 type */
     valueType?: IProFieldType;
     /** 渲染单元格内容字段 */
-    render?: IProFieldFormatterProps | ((...other: any) => React.ReactNode);
+    render?: ProInfoCellRender;
     /** 枚举值 */
-    dataSource?: IProFieldOptionItem[];
+    dataSource?: IProFieldOptionItem[] | ProInfoCellFunProp;
     /** 表头的筛选菜单项，当值为 true 时，自动使用 dataSource 生成 */
     filters?: boolean;
     /** 操作组配置 */
@@ -138,7 +144,9 @@ export declare type InfoValueItemProps = {
     infoItem: ProInfoItemProps;
     record: any;
     actionRef?: React.MutableRefObject<ProInfoActionType | undefined>;
-} & IProFieldProps;
+    render?: ProInfoCellRender;
+    dataSource?: IProFieldOptionItem[] | ProInfoCellFunProp;
+} & Omit<IProFieldProps, 'render' | 'dataSource'>;
 export declare type ProInfoHeaderProps = CardProps;
 /** ProInfoGroupContextProps */
 export declare type ProInfoGroupContextProps = {
@@ -173,3 +181,4 @@ export declare type ProInfoTransparentBase = {
     /** style */
     style?: React.CSSProperties;
 };
+export {};

package/lib/page-header/index.js

@@ -111,7 +111,7 @@ var getColorAndStyle = function getColorAndStyle(color, backgroundColor, backgro
 
   var isColorPresetColor = isPresetColor(color);
   var isBgColorPresetColor = isPresetColor(backgroundColor);
-  var className = (0, _classnames2.default)((_classnames = {}, _defineProperty(_classnames, "".concat(cls("color-".concat(color))), isColorPresetColor), _defineProperty(_classnames, "".concat(cls("color-bg-".concat(color))), isBgColorPresetColor), _defineProperty(_classnames, "".concat(cls("bg-type-".concat(backgroundType))), !!backgroundType), _classnames));
+  var className = (0, _classnames2.default)((_classnames = {}, _defineProperty(_classnames, "".concat(cls("color-".concat(color))), isColorPresetColor), _defineProperty(_classnames, "".concat(cls("bg-color-".concat(backgroundColor))), isBgColorPresetColor), _defineProperty(_classnames, "".concat(cls("bg-type-".concat(backgroundType))), !!backgroundType), _classnames));
   var styleColor = isColorPresetColor ? undefined : color;
   var styleBgColor = isBgColorPresetColor ? undefined : backgroundColor;
   var style = {

package/package.json

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