@teamix/pro 1.1.37 → 1.2.0

package/es/info/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["type", "url", "method", "formatResult", "params", "actionRef", "header", "onError", "className", "style", "columns", "layout", "dataSource"];
+var _excluded = ["type", "url", "method", "formatResult", "formatParams", "params", "actionRef", "header", "onSuccess", "onError", "beforeRequest", "extendParams", "className", "style", "columns", "layout", "dataSource", "loading", "extra"];
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
@@ -22,35 +22,43 @@ 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; }
 
-import React, { useContext, useEffect, useRef, useState } from 'react';
+import React, { isValidElement, useContext, useEffect, useRef, useState } from 'react';
 import ProTableInfo from './components/tableInfo';
 import ProHeaderInfo from './components/headerInfo';
 import ProBaseInfo from './components/baseInfo';
 import ProInfoGroup from './components/InfoGroup';
 import './index.scss';
 import { ProInfoGroupContext, useActionType } from './utils';
-import { getDeepValue, request as utilResquest, useRequest } from '@teamix/utils';
+import { doCommonRequest } from '@teamix/utils';
 import { useSize } from '@teamix/hooks';
 import { ProCard } from '..';
 export * from './typing';
 
 var ProInfo = function ProInfo(props) {
+  var _ref;
+
   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,
       formatResult = props.formatResult,
+      formatParams = props.formatParams,
       params = props.params,
       propsActionRef = props.actionRef,
       _props$header = props.header,
       header = _props$header === void 0 ? {} : _props$header,
-      _onError = props.onError,
+      onSuccess = props.onSuccess,
+      onError = props.onError,
+      beforeRequest = props.beforeRequest,
+      extendParams = props.extendParams,
       className = props.className,
       style = props.style,
       columns = props.columns,
       layout = props.layout,
       dataSource = props.dataSource,
+      userLoading = props.loading,
+      extra = props.extra,
       others = _objectWithoutProperties(props, _excluded);
 
   var _useContext = useContext(ProInfoGroupContext),
@@ -59,62 +67,59 @@ var ProInfo = function ProInfo(props) {
       contextParams = _useContext.params,
       contextFormatResult = _useContext.formatResult,
       contextVisible = _useContext.visible,
-      contextSize = _useContext.size; // 获取容器宽度
+      contextSize = _useContext.size,
+      contextOnSuccess = _useContext.onSuccess,
+      contextOnError = _useContext.onError,
+      contextFormatParams = _useContext.formatParams,
+      contextBeforeRequest = _useContext.beforeRequest,
+      contextExtendParams = _useContext.extendParams; // 获取容器宽度
 
 
   var ref = useRef();
-  var size = contextVisible ? contextSize : useSize(ref); // 请求数据
+  var size = contextVisible ? contextSize : useSize(ref);
 
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
       loading = _useState2[0],
-      setLoading = _useState2[1]; // 获取数据
+      setLoading = _useState2[1]; // 请求数据
 
 
-  var getDataSource = function getDataSource(result) {
-    if (formatResult) {
-      if (typeof formatResult === 'function') {
-        return formatResult === null || formatResult === void 0 ? void 0 : formatResult(result);
-      } else if (formatResult) {
-        return getDeepValue(formatResult.data, result);
-      } else {
-        return result;
-      }
-    }
-
-    return result;
-  };
+  var _useState3 = useState(),
+      _useState4 = _slicedToArray(_useState3, 2),
+      data = _useState4[0],
+      setData = _useState4[1];
 
   var requestDataKey = (contextMethod !== null && contextMethod !== void 0 ? contextMethod : method).toLowerCase() === 'get' ? 'params' : 'data';
+
+  var requestConfig = _defineProperty({
+    url: (_ref = contextUrl !== null && contextUrl !== void 0 ? contextUrl : url) !== null && _ref !== void 0 ? _ref : '',
+    method: contextMethod !== null && contextMethod !== void 0 ? contextMethod : method,
+    formatResult: contextFormatResult !== null && contextFormatResult !== void 0 ? contextFormatResult : formatResult,
+    onSuccess: contextOnSuccess !== null && contextOnSuccess !== void 0 ? contextOnSuccess : onSuccess,
+    onError: contextOnError !== null && contextOnError !== void 0 ? contextOnError : onError,
+    formatParams: contextFormatParams !== null && contextFormatParams !== void 0 ? contextFormatParams : formatParams,
+    beforeRequest: contextBeforeRequest !== null && contextBeforeRequest !== void 0 ? contextBeforeRequest : beforeRequest,
+    extendParams: contextExtendParams !== null && contextExtendParams !== void 0 ? contextExtendParams : extendParams
+  }, requestDataKey, contextParams !== null && contextParams !== void 0 ? contextParams : params);
+
   useEffect(function () {
     if (url || contextUrl) {
       setLoading(false);
-      getData.run({});
+      request();
     } else {
       setLoading(false);
     }
-  }, []);
-  var getData = useRequest(function (params) {
-    var _ref;
-
-    return _defineProperty({
-      url: (_ref = contextUrl !== null && contextUrl !== void 0 ? contextUrl : url) !== null && _ref !== void 0 ? _ref : '',
-      method: contextMethod !== null && contextMethod !== void 0 ? contextMethod : method
-    }, requestDataKey, contextParams !== null && contextParams !== void 0 ? contextParams : params);
-  }, {
-    // 使用 request 方法代替 fetch
-    requestMethod: function requestMethod(params) {
-      return utilResquest(params);
-    },
-    manual: true,
-    onSuccess: function onSuccess(result) {
-      props.onSuccess && props.onSuccess(result);
-    },
-    onError: function onError(error) {
+  }, []); // 获取数据
+
+  var request = function request() {
+    setLoading(true);
+    doCommonRequest(requestConfig).then(function (resp) {
+      setData(resp);
+    }).finally(function () {
       setLoading(false);
-      _onError === null || _onError === void 0 ? void 0 : _onError(error);
-    }
-  });
+    });
+  };
+
   var actionRef = useRef(); // 将 Actions 绑定到传入的 propsActionRef 中
 
   if (propsActionRef) {
@@ -124,39 +129,58 @@ var ProInfo = function ProInfo(props) {
 
   useActionType(actionRef, {
     refresh: function refresh() {
-      getData.run({});
+      request();
     }
   });
+
+  var getExtra = function getExtra() {
+    if (!extra) {
+      return undefined;
+    }
+
+    if ( /*#__PURE__*/isValidElement(extra)) {
+      return extra;
+    }
+
+    return _objectSpread(_objectSpread({}, extra), {}, {
+      context: {
+        record: dataSource !== null && dataSource !== void 0 ? dataSource : data
+      }
+    });
+  };
+
   return /*#__PURE__*/React.createElement("div", {
     ref: ref,
     className: "teamix-pro-info ".concat(className !== null && className !== void 0 ? className : ''),
     style: style
-  }, /*#__PURE__*/React.createElement(ProCard, _objectSpread(_objectSpread({
+  }, /*#__PURE__*/React.createElement(ProCard, _objectSpread(_objectSpread(_objectSpread({
     compacted: true,
     hoveredShadow: false,
     bordered: false,
     backgroundColor: "transparent"
-  }, header), others), type === 'table' && /*#__PURE__*/React.createElement(ProTableInfo, {
+  }, header), others), {}, {
+    extra: getExtra()
+  }), type === 'table' && /*#__PURE__*/React.createElement(ProTableInfo, {
     dataSource: dataSource,
     columns: columns,
-    loading: loading || getData.loading,
-    result: getDataSource(getData.data),
+    loading: userLoading || loading,
+    result: data,
     actionRef: actionRef,
     layout: layout
   }), type === 'header' && /*#__PURE__*/React.createElement(ProHeaderInfo, {
     dataSource: dataSource,
     columns: columns,
     header: header,
-    loading: loading || getData.loading,
-    result: getDataSource(getData.data),
+    loading: userLoading || loading,
+    result: data,
     actionRef: actionRef,
     layout: layout,
     size: size
   }), type === 'base' && /*#__PURE__*/React.createElement(ProBaseInfo, {
     dataSource: dataSource,
     columns: columns,
-    loading: loading || getData.loading,
-    result: getDataSource(getData.data),
+    loading: userLoading || loading,
+    result: data,
     actionRef: actionRef,
     layout: layout,
     size: size

package/es/info/typing.d.ts

@@ -1,18 +1,16 @@
-import { IProFieldFormatterProps, IProFieldOptionItem, IProFieldProps, IProFieldType } from '../field';
-import { ActionGroupProps, IActionButton } from '../actions';
+import { ProFieldRenderProps, ProFieldDataSourceItem, ProFieldProps, ProFieldType } from '../field';
+import { ActionGroupProps, ProActionButtonProps } from '../actions';
 import { Method } from 'axios';
 import React from 'react';
-import { CardProps } from '../card';
+import { CommonRequestConfig } from '@teamix/utils';
+import { ProCardProps } from '../card';
 /** 列record函数 */
 declare type ProInfoCellFunProp = (value: any, record: any) => any;
-declare type FieldRenderProps = keyof IProFieldFormatterProps;
+declare type FieldRenderProps = keyof ProFieldRenderProps;
 declare type ProInfoCellRender = {
-    [key in FieldRenderProps]?: IProFieldFormatterProps[key] | ProInfoCellFunProp;
+    [key in FieldRenderProps]?: ProFieldRenderProps[key] | ProInfoCellFunProp;
 } | ((...other: any) => React.ReactNode);
-/** ProInfoBaseProps info 基础定义 */
-export declare type ProInfoBaseProps = {
-    /** ProColums 定义，取代 Table 的 columns */
-    columns: ProInfoItemProps[];
+export declare type PropInfoRequestProps = {
     /** 请求地址 */
     url?: string;
     /** 请求方法 */
@@ -31,6 +29,13 @@ export declare type ProInfoBaseProps = {
     onSuccess?: (res: any) => void;
     /** 内部请求失败时的回调 */
     onError?: (error: Error) => void;
+};
+export interface ProInfoRequestProps extends Partial<CommonRequestConfig> {
+}
+/** ProInfoBaseProps info 基础定义 */
+export declare type ProInfoBaseProps = {
+    /** ProColums 定义，取代 Table 的 columns */
+    columns: ProInfoColumnsProps[];
     /** ProInfo action 的引用，便于手动触发一些方法  */
     actionRef?: React.MutableRefObject<ProInfoActionType | undefined>;
     /** 标题区 推荐将header中的内容平铺到ProCard中。即将不支持此写法 */
@@ -40,10 +45,13 @@ export declare type ProInfoBaseProps = {
         [key: string]: any;
     };
     /** 布局值 */
-    layout?: BaseInfoLayoutProps;
-} & ProInfoHeaderProps;
-/** ProInfoItemProps info 单元格 定义 */
-export interface ProInfoItemProps {
+    layout?: ProBaseInfoLayoutProps;
+    /** 加载动画 */
+    loading?: boolean;
+} & ProInfoHeaderProps & ProInfoRequestProps;
+/** ProInfoColumnsProps info 单元格 定义 */
+export declare type ProInfoItemProps = ProInfoColumnsProps;
+export interface ProInfoColumnsProps {
     /** 标题 */
     title: string;
     /** 列表项展示的Tooltip */
@@ -53,11 +61,11 @@ export interface ProInfoItemProps {
      */
     tooltipIcon?: React.ReactNode;
     /** 对应 ProField 里面的 type */
-    valueType?: IProFieldType;
+    valueType?: ProFieldType;
     /** 渲染单元格内容字段 */
     render?: ProInfoCellRender;
     /** 枚举值 */
-    dataSource?: IProFieldOptionItem[] | ProInfoCellFunProp;
+    dataSource?: ProFieldDataSourceItem[] | ProInfoCellFunProp;
     /** 表头的筛选菜单项，当值为 true 时，自动使用 dataSource 生成 */
     filters?: boolean;
     /** 操作组配置 */
@@ -81,7 +89,7 @@ export interface ProInfoItemProps {
     /** 编辑请求成功提示文案 */
     successMessage?: string;
     /** 列 actions 配置 */
-    actions?: IActionButton[];
+    actions?: ProActionButtonProps[];
     /** 追加在列后 */
     extra?: React.ReactNode;
 }
@@ -96,31 +104,33 @@ export declare type IProProInfoItem = {
     /** 值 */
     value: React.ReactNode;
     /** 基础详情布局值 */
-    baseInfoLayout?: BaseInfoLayoutProps;
+    baseInfoLayout?: ProBaseInfoLayoutProps;
     /** 头部详情布局值 */
-    headerInfoLayout?: HeaderInfoLayoutProps;
+    headerInfoLayout?: ProHeaderInfoLayoutProps;
     /** loading 状态 */
     loading?: boolean;
-} & Pick<ProInfoItemProps, 'tooltip' | 'tooltipIcon'>;
+} & Pick<ProInfoColumnsProps, 'tooltip' | 'tooltipIcon'>;
 /** header info 定义 */
 export declare type IProHeaderInfo = {
     /** 布局值 */
-    layout?: HeaderInfoLayoutProps;
+    layout?: ProHeaderInfoLayoutProps;
 } & Omit<ProInfoBaseProps, 'layout'>;
 /** table info 定义 */
 export declare type IProTableInfo = {
     /** 布局值 */
     layout?: TableInfoLayoutProps;
 } & Omit<ProInfoBaseProps, 'layout'>;
+declare type ProInfoBasePropsOmitLayout = Omit<ProInfoBaseProps, 'layout'>;
 /** ProInfo */
 export declare type ProInfoProps = {
     /** 布局值 */
-    layout?: TableInfoLayoutProps | HeaderInfoLayoutProps | BaseInfoLayoutProps;
+    layout?: TableInfoLayoutProps | ProHeaderInfoLayoutProps | ProBaseInfoLayoutProps;
     /** 类型 */
     type?: 'base' | 'header' | 'table';
-} & Omit<ProInfoBaseProps, 'layout'> & ProInfoTransparentBase;
+} & ProInfoBasePropsOmitLayout & ProInfoTransparentBase;
 export declare type IProHeaderInfoItem = {};
-export declare type BaseInfoLayoutProps = {
+export declare type BaseInfoLayoutProps = ProBaseInfoLayoutProps;
+export declare type ProBaseInfoLayoutProps = {
     span?: number;
     labelCol?: {
         span: number;
@@ -129,7 +139,8 @@ export declare type BaseInfoLayoutProps = {
         span: number;
     };
 };
-export declare type HeaderInfoLayoutProps = {
+export declare type headerInfoLayout = ProHeaderInfoLayoutProps;
+export declare type ProHeaderInfoLayoutProps = {
     /** label 间隔 */
     labelGutter?: number | string;
     /** 列数 宽度 */
@@ -137,31 +148,33 @@ export declare type HeaderInfoLayoutProps = {
 };
 /** infoGroup */
 export declare type ProInfoGroupProps = {
-    children?: React.ReactNode[] | React.ReactNode;
-} & Pick<ProInfoBaseProps, 'params' | 'method' | 'url' | 'onSuccess' | 'onError' | 'formatResult'>;
-export declare type TableInfoLayoutProps = {} & HeaderInfoLayoutProps;
+    children?: React.ReactNode[] | React.ReactNode | ProInfoBaseProps[];
+    /** 是否有有分割线 */
+    divider?: boolean;
+    /** 是否是紧凑模式 */
+    compacted?: ProCardProps['compacted'];
+    /** 背景颜色 */
+    backgroundColor?: ProCardProps['backgroundColor'];
+} & ProInfoRequestProps & React.HTMLAttributes<HTMLElement>;
+export declare type TableInfoLayoutProps = {} & ProHeaderInfoLayoutProps;
 export declare type InfoValueItemProps = {
-    infoItem: ProInfoItemProps;
+    infoItem: ProInfoColumnsProps;
     record: any;
     actionRef?: React.MutableRefObject<ProInfoActionType | undefined>;
     render?: ProInfoCellRender;
-    dataSource?: IProFieldOptionItem[] | ProInfoCellFunProp;
-} & Omit<IProFieldProps, 'render' | 'dataSource'>;
-export declare type ProInfoHeaderProps = CardProps;
+    dataSource?: ProFieldDataSourceItem[] | ProInfoCellFunProp;
+} & Omit<ProFieldProps, 'render' | 'dataSource'>;
+export declare type ProInfoHeaderProps = Omit<ProCardProps, 'loading'>;
 /** ProInfoGroupContextProps */
 export declare type ProInfoGroupContextProps = {
     /** 因为其他数据都为异步。visible 只用作标识 */
     visible?: boolean;
     layout?: ProInfoBaseProps['layout'];
-    url?: ProInfoBaseProps['url'];
-    params?: ProInfoBaseProps['params'];
-    method?: ProInfoBaseProps['method'];
-    formatResult?: ProInfoBaseProps['formatResult'];
     size?: {
         width?: number;
         height?: number;
     };
-};
+} & ProInfoRequestProps;
 /** 基本透传类型 */
 export declare type ProInfoTransparentBase = {
     /**
@@ -181,4 +194,9 @@ export declare type ProInfoTransparentBase = {
     /** style */
     style?: React.CSSProperties;
 };
+export declare type ProInfoTransRequestResult = {
+    loading: boolean;
+    result: any;
+    refresh?: () => void;
+};
 export {};

package/es/info/utils/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ProInfoActionType, ProInfoGroupContextProps, ProInfoItemProps } from '../typing';
+import { ProInfoActionType, ProInfoGroupContextProps, ProInfoColumnsProps } from '../typing';
 export declare function useActionType<T>(ref: React.MutableRefObject<ProInfoActionType | undefined>, action: ProInfoActionType): void;
 /** ProInfoGroupContext */
 export declare const ProInfoGroupContext: React.Context<ProInfoGroupContextProps>;
@@ -9,4 +9,4 @@ export declare const ProInfoGroupContext: React.Context<ProInfoGroupContextProps
  * @param dataSource
  * @returns
  */
-export declare function getDataIndexValue(dataIndex: ProInfoItemProps['dataIndex'], dataSource: object): any;
+export declare function getDataIndexValue(dataIndex: ProInfoColumnsProps['dataIndex'], dataSource: object): any;

package/es/info/utils/utils.d.ts

@@ -1 +1 @@
-export declare function getLayout(width: number): "l" | "xs" | "xl" | "s" | "m";
+export declare function getLayout(width: number): "xs" | "xl" | "l" | "s" | "m";

package/es/nocode/pages/renderer.js

@@ -37,7 +37,7 @@ import Helmet from 'react-helmet';
 import SVG from '@teamix/svg';
 import PageContainer from '../../page-container';
 import PageHeader from '../../page-header';
-import { BaseSkeleton } from '../../skeleton';
+import { ProSkeletonRaw } from '../../skeleton';
 import { baseClass } from '@teamix/utils';
 import { PageMap } from '.';
 var cls = baseClass('teamix-nocode');
@@ -49,7 +49,7 @@ var Loading = function Loading(props) {
       title: "",
       breadcrumb: []
     }),
-    content: /*#__PURE__*/React.createElement(BaseSkeleton.Content, null)
+    content: /*#__PURE__*/React.createElement(ProSkeletonRaw.Content, null)
   }, props));
 };
 

package/es/page-header/index.d.ts

@@ -1,19 +1,16 @@
 import React from 'react';
 import { TagProps, CloseableProps } from '@alicloudfe/components/types/tag';
-import { ActionGroupProps } from '../actions';
+import { ItemProps } from '@alicloudfe/components/types/breadcrumb';
+import { ProActionGroupProps } from '../actions';
 import { ProInfoProps } from '../info';
 import './index.scss';
-export interface BreadcrumbItem {
-    link?: string;
-    text: string;
-}
-export interface LinkItem {
-    link?: string;
-    icon?: string;
-    text: string;
-    onClick?: (e?: React.MouseEvent<Element, MouseEvent>) => void;
+export interface ProPageHeaderBreadcrumbItem extends ItemProps {
+    /**
+     * @deprecated 建议使用 children 代替
+     */
+    text?: string;
 }
-export declare type TagItem = (TagProps | (CloseableProps & {
+export declare type ProPageHeaderTagItem = (TagProps | (CloseableProps & {
     closable: true;
 })) & {
     /**
@@ -22,12 +19,12 @@ export declare type TagItem = (TagProps | (CloseableProps & {
     text?: string;
 };
 declare type Color = 'blue' | 'green' | 'orange' | 'red' | 'yellow' | string;
-export interface DataItem {
+export declare type ProPageHeaderDataItem = {
     title: string;
     num: number;
     color?: Color;
-}
-export declare type PageHeaderProps = {
+} & React.HTMLAttributes<HTMLElement>;
+export declare type ProPageHeaderProps = {
     title?: React.ReactNode;
     description?: React.ReactNode;
     icon?: string;
@@ -37,12 +34,28 @@ export declare type PageHeaderProps = {
     goback?: string | boolean;
     image?: string;
     loading?: boolean;
-    breadcrumb?: BreadcrumbItem[];
-    extra?: ActionGroupProps | React.ReactNode;
-    operation?: ActionGroupProps | React.ReactNode;
-    tags?: TagItem[];
-    data?: DataItem[];
+    breadcrumb?: ProPageHeaderBreadcrumbItem[];
+    extra?: ProActionGroupProps | React.ReactNode;
+    operation?: ProActionGroupProps | React.ReactNode;
+    tags?: ProPageHeaderTagItem[];
+    data?: ProPageHeaderDataItem[];
     info?: ProInfoProps | React.ReactNode;
 } & Omit<React.HTMLAttributes<HTMLElement>, 'title'>;
-declare const PageHeader: React.FC<PageHeaderProps>;
-export default PageHeader;
+declare const ProPageHeader: React.FC<ProPageHeaderProps>;
+export default ProPageHeader;
+/**
+ * @deprecated 建议使用 ProPageHeaderBreadcrumbItem 代替
+ */
+export declare type BreadcrumbItem = ProPageHeaderBreadcrumbItem;
+/**
+ * @deprecated 建议使用 ProPageHeaderTagItem 代替
+ */
+export declare type TagItem = ProPageHeaderTagItem;
+/**
+ * @deprecated 建议使用 ProPageHeaderDataItem 代替
+ */
+export declare type DataItem = ProPageHeaderDataItem;
+/**
+ * @deprecated 建议使用 ProPageHeaderProps 代替
+ */
+export declare type PageHeaderProps = ProPageHeaderProps;