@teamix/pro 1.1.31 → 1.1.35

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

@@ -1,44 +1,24 @@
-var _excluded = ["header", "columns", "dataSource", "layout", "loading", "result", "actionRef", "className"];
-
-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; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _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; }
-
 import { Grid } from '@alicloudfe/components';
-import ProCard from '../../../card';
-import React, { useContext, useRef } from 'react';
+import React from 'react';
 import ProInfoItem from '../ProInfoItem';
 import './index.scss';
 import defaultLayoutMap from '../../utils/layout';
-import { useSize } from '@teamix/hooks';
 import { getLayout } from '../../utils/utils';
 import InfoValueItem from '../InfoValueItem';
-import { getDataIndexValue, ProInfoGroupContext } from '../../utils';
+import { getDataIndexValue } from '../../utils';
 var Row = Grid.Row,
     Col = Grid.Col;
 
 var ProHeaderInfo = function ProHeaderInfo(props) {
   var _size$width;
 
-  var header = props.header,
-      columns = props.columns,
+  var columns = props.columns,
       dataSource = props.dataSource,
       layout = props.layout,
       loading = props.loading,
       result = props.result,
       actionRef = props.actionRef,
-      className = props.className,
-      others = _objectWithoutProperties(props, _excluded);
-
-  var context = useContext(ProInfoGroupContext);
-  var ref = useRef();
-  var size = context.visible ? context.size : useSize(ref);
+      size = props.size;
   var defaultLayout = defaultLayoutMap[getLayout((_size$width = size === null || size === void 0 ? void 0 : size.width) !== null && _size$width !== void 0 ? _size$width : 0)];
 
   var renderContent = function renderContent() {
@@ -79,21 +59,10 @@ var ProHeaderInfo = function ProHeaderInfo(props) {
     });
   };
 
-  return (
-    /*#__PURE__*/
-    // TODO 优化透传方式
-    React.createElement("div", _objectSpread({
-      ref: ref,
-      className: "teamix-pro-info ".concat(className !== null && className !== void 0 ? className : '')
-    }, others), (size === null || size === void 0 ? void 0 : size.width) && /*#__PURE__*/React.createElement(ProCard, _objectSpread({
-      compacted: true,
-      hoveredShadow: false,
-      bordered: false
-    }, header), /*#__PURE__*/React.createElement(Row, {
-      wrap: true,
-      className: "teamix-pro-info-content-row"
-    }, renderContent())))
-  );
+  return /*#__PURE__*/React.createElement(React.Fragment, null, (size === null || size === void 0 ? void 0 : size.width) && /*#__PURE__*/React.createElement(Row, {
+    wrap: true,
+    className: "teamix-pro-info-content-row"
+  }, renderContent()));
 };
 
 export default ProHeaderInfo;

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

@@ -1,5 +1,3 @@
-var _excluded = ["header", "columns", "dataSource", "layout", "loading", "result", "actionRef", "className"];
-
 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; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -18,32 +16,23 @@ 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; }
-
 import React, { useMemo } from 'react';
 import './index.scss';
 import { Table } from '@alicloudfe/components';
 import './index.scss';
-import ProCard from '../../../card';
 import { LabelIconTip } from '@teamix/utils';
 import InfoValueItem from '../InfoValueItem';
 import { BaseSkeleton } from '../../..';
 import { getDataIndexValue } from '../../utils';
 
 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,
@@ -173,20 +162,14 @@ var ProTableInfo = function ProTableInfo(props) {
     }
   };
 
-  return /*#__PURE__*/React.createElement("div", _objectSpread({
-    className: "teamix-pro-info ".concat(className)
-  }, others), /*#__PURE__*/React.createElement(ProCard, _objectSpread({
-    compacted: true,
-    hoveredShadow: false,
-    bordered: false
-  }, header), /*#__PURE__*/React.createElement(Table.StickyLock, {
+  return /*#__PURE__*/React.createElement(Table.StickyLock, {
     className: "teamix-pro-info-table",
     cellProps: setCellProps,
     columns: newColumns(),
     hasHeader: false,
     hasBorder: true,
     dataSource: newDataSource
-  })));
+  });
 };
 
 export default ProTableInfo;

package/es/info/index.js

@@ -1,4 +1,4 @@
-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 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; }
 
@@ -23,17 +23,20 @@ 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 ProTableInfo from './components/tableInfo';
-import ProHeaderInfo from './components/headerInfo';
-import ProBaseInfo from './components/baseInfo';
+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 { useSize } from '@teamix/hooks';
+import { ProCard } from '..';
 export * from './typing';
 
 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,
@@ -43,15 +46,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 = useContext(ProInfoGroupContext),
       contextUrl = _useContext.url,
       contextMethod = _useContext.method,
       contextParams = _useContext.params,
-      contextFormatResult = _useContext.formatResult; // 请求数据
+      contextFormatResult = _useContext.formatResult,
+      contextVisible = _useContext.visible,
+      contextSize = _useContext.size; // 获取容器宽度
 
 
+  var ref = useRef();
+  var size = contextVisible ? contextSize : useSize(ref); // 请求数据
+
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
       loading = _useState2[0],
@@ -114,31 +127,40 @@ var ProInfo = function ProInfo(props) {
       getData.run({});
     }
   });
-
-  if (type === 'table') {
-    return /*#__PURE__*/React.createElement(ProTableInfo, _objectSpread(_objectSpread({}, others), {}, {
-      header: header,
-      loading: loading || getData.loading,
-      result: getDataSource(getData.data),
-      actionRef: actionRef
-    }));
-  }
-
-  if (type === 'header') {
-    return /*#__PURE__*/React.createElement(ProHeaderInfo, _objectSpread(_objectSpread({}, others), {}, {
-      header: header,
-      loading: loading || getData.loading,
-      result: getDataSource(getData.data),
-      actionRef: actionRef
-    }));
-  }
-
-  return /*#__PURE__*/React.createElement(ProBaseInfo, _objectSpread(_objectSpread({}, others), {}, {
+  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({
+    compacted: true,
+    hoveredShadow: false,
+    bordered: false,
+    backgroundColor: "transparent"
+  }, header), others), type === 'table' && /*#__PURE__*/React.createElement(ProTableInfo, {
+    dataSource: dataSource,
+    columns: columns,
+    loading: loading || getData.loading,
+    result: getDataSource(getData.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),
-    actionRef: actionRef
-  }));
+    actionRef: actionRef,
+    layout: layout,
+    size: size
+  }), type === 'base' && /*#__PURE__*/React.createElement(ProBaseInfo, {
+    dataSource: dataSource,
+    columns: columns,
+    loading: loading || getData.loading,
+    result: getDataSource(getData.data),
+    actionRef: actionRef,
+    layout: layout,
+    size: size
+  })));
 };
 
 ProInfo.Group = ProInfoGroup;

package/es/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/es/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/es/page-header/index.js

@@ -92,7 +92,7 @@ var getColorAndStyle = function getColorAndStyle(color, backgroundColor, backgro
 
   var isColorPresetColor = isPresetColor(color);
   var isBgColorPresetColor = isPresetColor(backgroundColor);
-  var className = classnames((_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 = classnames((_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/es/table/components/Filter/index.js

@@ -86,9 +86,11 @@ var Filter = function Filter(props) {
 
   var renderSingle = function renderSingle() {
     return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref3) {
+      var _value$toString;
+
       var label = _ref3.label,
           value = _ref3.value;
-      var valueStr = value.toString();
+      var valueStr = (_value$toString = value === null || value === void 0 ? void 0 : value.toString()) !== null && _value$toString !== void 0 ? _value$toString : '';
       return /*#__PURE__*/React.createElement(RadioItem, {
         id: valueStr,
         checked: selected.includes(valueStr),
@@ -103,9 +105,11 @@ var Filter = function Filter(props) {
 
   var renderMultiple = function renderMultiple() {
     return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref4) {
+      var _value$toString2;
+
       var label = _ref4.label,
           value = _ref4.value;
-      var valueStr = value.toString();
+      var valueStr = (_value$toString2 = value === null || value === void 0 ? void 0 : value.toString()) !== null && _value$toString2 !== void 0 ? _value$toString2 : '';
       return /*#__PURE__*/React.createElement(CheckboxItem, {
         key: valueStr,
         checked: selected.includes(valueStr),

package/es/table/index.js

@@ -624,10 +624,12 @@ var ProTable = function ProTable(props) {
     }
 
     function onChangePaginationSize(currentPageSize) {
+      var _request5;
+
       setPageSize(currentPageSize);
       setCurrentPage(1);
 
-      _request(_defineProperty({}, targetPageSizeKey, currentPageSize));
+      _request((_request5 = {}, _defineProperty(_request5, targetPageSizeKey, currentPageSize), _defineProperty(_request5, targetPageKey, 1), _request5));
     }
 
     function renderRowSelection() {

package/es/table/typing.d.ts

@@ -11,8 +11,10 @@ import { Method } from 'axios';
 import React from 'react';
 import type { Form as FormType } from '@formily/core';
 declare type IFieldRenderProps = keyof IProFieldFormatterProps;
+/** 列record函数 */
+declare type ProTableCellFunProp = (value: any, index: number, record: any) => any;
 declare type ITableCellRender = {
-    [key in IFieldRenderProps]?: IProFieldFormatterProps[key] | ((...props: any) => void);
+    [key in IFieldRenderProps]?: IProFieldFormatterProps[key] | ProTableCellFunProp;
 } | ((...other: any) => React.ReactNode);
 declare type TDataService = {
     /** 翻页器总数 */
@@ -31,14 +33,14 @@ export declare type ProColumnProps = {
     tooltipIcon?: React.ReactNode;
     /** 对应 ProField 里面的 type */
     valueType?: IProFieldType;
-    /** 是否默认隐藏列 */
+    /** 【列配置】是否默认隐藏列 */
     columnFilters?: boolean;
-    /** 是否禁用隐藏列 */
+    /** 【列配置】是否禁用隐藏列 */
     columnFiltersDisabled?: boolean;
     /** 渲染单元格内容字段 */
     render?: ITableCellRender;
     /** 枚举值 */
-    dataSource?: IProFieldOptionItem[];
+    dataSource?: IProFieldOptionItem[] | ProTableCellFunProp;
     /** 表头的过滤菜单项，当值为 true 时，自动使用 dataSource 生成 */
     filters?: boolean | ProTableColumnsFilterItemProps[];
     /** 表头的过滤菜单项过滤方式 single 单选 multiple 多选 */
@@ -49,6 +51,8 @@ export declare type ProColumnProps = {
     actionSchema?: ActionGroupProps;
     /** 指定列对应的字段，支持`a.b`形式的快速取值 和 数组取值 */
     dataIndex?: string | string[];
+    /** 指定 valueType 为日期时间格式时，可以格式化日期时间 */
+    format?: string;
 } & Omit<ColumnProps, 'filters' | 'dataIndex' | 'filtersMode'>;
 export declare type ProTableProps = {
     /** ProColums 定义，取代 Table 的 columns */

package/es/table/utils/columnRender.js

@@ -57,7 +57,8 @@ export var renderCell = function renderCell(value, item, index, record, actionRe
       valueType = _item$valueType === void 0 ? 'text' : _item$valueType,
       render = item.render,
       actionSchema = item.actionSchema,
-      dataIndex = item.dataIndex; // 如果没传 dataIndex，返回 null
+      dataIndex = item.dataIndex,
+      format = item.format; // 如果没传 dataIndex，返回 null
 
   if (!dataIndex) {
     value = null;
@@ -72,7 +73,8 @@ export var renderCell = function renderCell(value, item, index, record, actionRe
     });
   }
 
-  var newRender = null; // 如果 render 直接传函数
+  var newRender = null;
+  var newDataSource = null; // 如果 render 直接传函数
 
   if (typeof render === 'function') {
     newRender = function newRender() {
@@ -96,6 +98,29 @@ export var renderCell = function renderCell(value, item, index, record, actionRe
     }, actionSchema), {}, {
       context: _objectSpread(_objectSpread({}, defaultContext), actionSchema.context)
     }));
+  } // dataSource可传函数
+
+
+  if (typeof item.dataSource === 'function') {
+    var _item$dataSource;
+
+    newDataSource = (_item$dataSource = item.dataSource) === null || _item$dataSource === void 0 ? void 0 : _item$dataSource.call(item, value, index, record);
+  } else {
+    var _item$dataSource2;
+
+    newDataSource = ((_item$dataSource2 = item.dataSource) !== null && _item$dataSource2 !== void 0 ? _item$dataSource2 : []).map(function (item) {
+      return Object.fromEntries(Object.entries(item).map(function (_ref) {
+        var _ref2 = _slicedToArray(_ref, 2),
+            k = _ref2[0],
+            v = _ref2[1];
+
+        return [k, getTargetValue(v, _objectSpread(_objectSpread({}, record), {}, {
+          record: record,
+          value: value,
+          index: index
+        }))];
+      }));
+    });
   } // 渲染 ProField
 
 
@@ -103,7 +128,8 @@ export var renderCell = function renderCell(value, item, index, record, actionRe
     type: valueType || 'text',
     value: value,
     render: newRender,
-    dataSource: item.dataSource
+    dataSource: newDataSource,
+    format: format
   });
 };
 /**
@@ -121,10 +147,10 @@ var processRenderFunction = function processRenderFunction() {
   var index = arguments.length > 2 ? arguments[2] : undefined;
   var record = arguments.length > 3 ? arguments[3] : undefined;
   var external = ['linkOnClick', 'link', 'value'];
-  return Object.fromEntries(Object.entries(render).map(function (_ref) {
-    var _ref2 = _slicedToArray(_ref, 2),
-        k = _ref2[0],
-        v = _ref2[1];
+  return Object.fromEntries(Object.entries(render).map(function (_ref3) {
+    var _ref4 = _slicedToArray(_ref3, 2),
+        k = _ref4[0],
+        v = _ref4[1];
 
     if (typeof v === 'function') {
       var _v;
@@ -159,10 +185,11 @@ var processBuriedPoint = function processBuriedPoint() {
   var value = arguments.length > 2 ? arguments[2] : undefined;
   var index = arguments.length > 3 ? arguments[3] : undefined;
   return Object.fromEntries([// 默认 ellipsis、descriptionEllipsis 为 true
-  ['ellipsis', true], ['descriptionEllipsis', true]].concat(_toConsumableArray(Object.entries(render).map(function (_ref3) {
-    var _ref4 = _slicedToArray(_ref3, 2),
-        k = _ref4[0],
-        v = _ref4[1];
+  // emptyText 默认为 '-'
+  ['ellipsis', true], ['descriptionEllipsis', true], ['emptyText', '-']].concat(_toConsumableArray(Object.entries(render).map(function (_ref5) {
+    var _ref6 = _slicedToArray(_ref5, 2),
+        k = _ref6[0],
+        v = _ref6[1];
 
     return [k, getTargetValue(v, _objectSpread(_objectSpread({}, record), {}, {
       record: record,

package/lib/actions/dialog-form.d.ts

@@ -3,11 +3,18 @@ import { IFormProps, IFormSchema } from '../form';
 import { RequestAction } from './request';
 import { DialogAction } from './dialog';
 export interface DialogFormAction extends DialogAction {
+    /** 表单初始值 */
     initialValues?: any;
+    /** 表单初始化数据请求 */
     initialRequest?: RequestAction;
+    /** 表单提交发送数据请求时，是否携带全部表单数据。默认携带 */
     useFieldValuesForRequest?: boolean;
+    /**
+     * @deprecated 建议使用 schema 配置 IFormProps 代替
+     */
     formProps?: Omit<IFormProps, 'schema'>;
-    schema: IFormSchema;
+    /** 同时支持两种配置方式，如果想完整定制表单，可使用完整的表单配置项 IFormProps，否则可以只配置 IFormSchema */
+    schema: IFormSchema | IFormProps;
 }
 export declare function useDialogFormAction(action: DialogFormAction, context?: any): {
     [x: string]: (e: React.MouseEvent<HTMLElement, MouseEvent>) => void;

package/lib/actions/dialog-form.js

@@ -22,7 +22,8 @@ var _request = require("./request");
 
 var _dialog = _interopRequireDefault(require("./dialog"));
 
-var _excluded = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish", "onCancel"];
+var _excluded = ["schema"],
+    _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish", "onCancel"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -30,16 +31,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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 _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; }
-
-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; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -52,6 +43,16 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+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; }
+
+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; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 getDefaultFormPropsByDialogSize(size) {
   if (size === 'small') {
     return {
@@ -84,15 +85,31 @@ function getDefaultFormPropsByDialogSize(size) {
   };
 }
 
+function getSchemaAndFormProps(schema, formProps) {
+  if (schema instanceof Array) {
+    return _objectSpread({
+      schema: schema
+    }, formProps);
+  }
+
+  var formSchema = schema;
+  return formSchema;
+}
+
 var DialogForm = function DialogForm(props) {
   var initialValues = props.initialValues,
       initialRequest = props.initialRequest,
-      schema = props.schema,
       _props$size = props.size,
       size = _props$size === void 0 ? 'small' : _props$size,
+      schema = props.schema,
       formProps = props.formProps,
       context = props.context,
       formRef = props.formRef;
+
+  var _getSchemaAndFormProp = getSchemaAndFormProps(schema, formProps),
+      formSchema = _getSchemaAndFormProp.schema,
+      others = _objectWithoutProperties(_getSchemaAndFormProp, _excluded);
+
   var form = (0, _form.createForm)({
     initialValues: (0, _utils.getTargetValue)(initialValues, context)
   });
@@ -123,8 +140,8 @@ var DialogForm = function DialogForm(props) {
     }
   }, /*#__PURE__*/_react.default.createElement(_form.default, _objectSpread(_objectSpread({
     form: form,
-    schema: (0, _utils.getTargetValue)(schema, context)
-  }, getDefaultFormPropsByDialogSize(size)), (0, _utils.getTargetValue)(formProps, context))));
+    schema: (0, _utils.getTargetValue)(formSchema, context)
+  }, getDefaultFormPropsByDialogSize(size)), (0, _utils.getTargetValue)(others, context))));
 };
 
 function useDialogFormAction(action, context) {
@@ -139,7 +156,7 @@ function useDialogFormAction(action, context) {
       size = _action$size === void 0 ? 'small' : _action$size,
       _onFinish = action.onFinish,
       _onCancel = action.onCancel,
-      others = _objectWithoutProperties(action, _excluded);
+      others = _objectWithoutProperties(action, _excluded2);
 
   var formRef = (0, _react.useRef)();
   return (0, _dialog.default)(Object.assign({

package/lib/actions/dialog-info.d.ts

@@ -0,0 +1,9 @@
+import { DialogAction } from './dialog';
+import { ProInfoProps } from '..';
+export interface DialogInfoAction extends DialogAction {
+    schema: ProInfoProps;
+}
+export declare function useDialogInfoAction(action: DialogInfoAction, context?: any): {
+    [x: string]: (e: import("react").MouseEvent<HTMLElement, MouseEvent>) => void;
+};
+export default useDialogInfoAction;