@teamix/pro 1.1.32 → 1.1.33

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

@@ -106,9 +106,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.default.createElement(RadioItem, {
         id: valueStr,
         checked: selected.includes(valueStr),
@@ -123,9 +125,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.default.createElement(CheckboxItem, {
         key: valueStr,
         checked: selected.includes(valueStr),

package/lib/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/lib/table/utils/columnRender.js

@@ -70,7 +70,8 @@ var renderCell = function renderCell(value, item, index, record, actionRef) {
       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;
@@ -85,7 +86,8 @@ var renderCell = function renderCell(value, item, index, record, actionRef) {
     });
   }
 
-  var newRender = null; // 如果 render 直接传函数
+  var newRender = null;
+  var newDataSource = null; // 如果 render 直接传函数
 
   if (typeof render === 'function') {
     newRender = function newRender() {
@@ -109,6 +111,29 @@ var renderCell = function renderCell(value, item, index, record, actionRef) {
     }, 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, (0, _utils.getTargetValue)(v, _objectSpread(_objectSpread({}, record), {}, {
+          record: record,
+          value: value,
+          index: index
+        }))];
+      }));
+    });
   } // 渲染 ProField
 
 
@@ -116,7 +141,8 @@ var renderCell = function renderCell(value, item, index, record, actionRef) {
     type: valueType || 'text',
     value: value,
     render: newRender,
-    dataSource: item.dataSource
+    dataSource: newDataSource,
+    format: format
   });
 };
 /**
@@ -137,10 +163,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;
@@ -175,10 +201,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, (0, _utils.getTargetValue)(v, _objectSpread(_objectSpread({}, record), {}, {
       record: record,

package/package.json

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