@teamix/pro 1.1.32 → 1.1.33

package/es/actions/index.js

@@ -33,7 +33,7 @@ import React from 'react';
 import cls from 'classnames';
 import { Button, MenuButton, Menu, Divider } from '@alicloudfe/components';
 import Icon from '@teamix/icon';
-import { getTargetValue } from '@teamix/utils';
+import { getTargetValue, getMessage } from '@teamix/utils';
 import { useLinkAction } from './link';
 import { useRequestAction } from './request';
 import { useDialogAction } from './dialog';
@@ -121,16 +121,18 @@ export var useAction = function useAction(config, context) {
   }, registedAction.defaultConfig), others), context);
 };
 
-var buttonContent = function buttonContent(content, iconType, iconSize) {
+var buttonContent = function buttonContent(content, iconType, iconSize, context) {
+  var renderedContent = typeof content === 'function' ? content(context) : content;
+
   if (!iconType) {
-    return content;
+    return renderedContent;
   }
 
   return [/*#__PURE__*/React.createElement(Icon, {
     type: iconType,
     size: iconSize,
     key: "teamix-button-icon"
-  }), content];
+  }), renderedContent];
 };
 
 export var ActionButton = function ActionButton(props) {
@@ -154,7 +156,7 @@ export var ActionButton = function ActionButton(props) {
   }) : _objectSpread(_objectSpread({}, actionProps), others);
   return /*#__PURE__*/React.createElement(Button, _objectSpread({
     type: type
-  }, buttonProps), buttonContent(children, icon, iconSize));
+  }, buttonProps), buttonContent(children, icon, iconSize, context));
 };
 
 function renderMenuButtonItem(item, key, context) {
@@ -173,7 +175,7 @@ function renderMenuButtonItem(item, key, context) {
   }) : _objectSpread({}, menuItemProps);
   return /*#__PURE__*/React.createElement(MenuButton.Item, _objectSpread({
     key: key
-  }, buttonProps), buttonContent(item.children, item.icon));
+  }, buttonProps), buttonContent(item.children, item.icon, undefined, context));
 }
 
 function renderCommonActionButtonMenuItem(action, key, context) {
@@ -209,8 +211,11 @@ export var ActionMenuButton = function ActionMenuButton(props) {
       mode: 'popup',
       triggerType: 'hover'
     },
+    popupProps: {
+      shouldUpdatePosition: true
+    },
     type: type,
-    label: buttonContent(label || children, icon, iconSize)
+    label: buttonContent(label || children, icon, iconSize, context)
   }, others), actions.map(function (action, i) {
     return renderCommonActionButtonMenuItem(action, i, context);
   }));
@@ -255,7 +260,7 @@ function renderCommonActionButton(button, context, isTypeText) {
 function getDefaultMoreButton(type, moreText) {
   if (type === 'button') {
     return {
-      label: moreText || '更多'
+      label: moreText || getMessage('more')
     };
   }
 

package/es/form/Components/ProField/index.d.ts

@@ -143,6 +143,10 @@ declare const _default: React.ForwardRefExoticComponent<(Partial<import("@teamix
     type: "tagFilter";
 } & {
     children?: React.ReactNode;
+}> | Partial<import("@teamix/pro-field/lib/components/FieldTagFilter").IProFieldMultipleTagFilter & {
+    type: "multipleTagPicker";
+} & {
+    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldMenuSelect").IProFieldMenuSelect & {
     type: "menuSelect";
 } & {

package/es/form/ProForm/index.js

@@ -18,7 +18,7 @@ import { Form, FormLayout } from '@teamix/formily';
 import TeamixIcon from '@teamix/icon';
 import { usePrefixCls } from '@teamix/utils';
 import SchemaForm from '../SchemaForm';
-import { mergeArrayValue, getDisplayValues } from '../utils';
+import { mergeArrayValue } from '../utils';
 import useAutoSubmit from './useAutoSubmit';
 import useInitialRequest from './useInitialRequest';
 import './index.scss';
@@ -71,7 +71,7 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
     form.addEffects('onChange', function () {
       onFormValuesChange(function (form) {
         if (onChange) {
-          onChange(toJS(form.values), getDisplayValues(form, form.values));
+          onChange(toJS(form.values));
         }
       });
     });

package/es/form/ProForm/useFormDisplayValues.d.ts

@@ -0,0 +1,6 @@
+/**
+ * 获取表单值的可显示值
+ * @returns 如果某字段有dataSource，则返回value对应label
+ */
+declare const useFormDisplayValues: () => any;
+export default useFormDisplayValues;

package/es/form/ProForm/useFormDisplayValues.js

@@ -0,0 +1,65 @@
+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."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+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 _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import { useForm } from '@formily/react';
+import { isArr, isPlainObj, getValueByValue } from '@teamix/utils';
+/**
+ * 获取表单值的可显示值
+ * @returns 如果某字段有dataSource，则返回value对应label
+ */
+
+var useFormDisplayValues = function useFormDisplayValues() {
+  var form = useForm();
+  var values = form.values; // 判断值的类型，递归获取每个值在该结构中的完整路径
+
+  var getDisplayValues = function getDisplayValues(values) {
+    var prefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+    var displayValues;
+
+    if (isPlainObj(values)) {
+      displayValues = {};
+      Object.entries(values).forEach(function (_ref) {
+        var _ref2 = _slicedToArray(_ref, 2),
+            key = _ref2[0],
+            value = _ref2[1];
+
+        var path = prefix ? "".concat(prefix, ".").concat(key) : "".concat(key);
+        displayValues[key] = getDisplayValues(value, path);
+      });
+    } else if (isArr(values)) {
+      displayValues = [];
+      values.map(function (value, index) {
+        var path = prefix ? "".concat(prefix, ".").concat(index) : "".concat(index);
+        displayValues[index] = getDisplayValues(value, path);
+      });
+    } else {
+      // 通过值的完整路径获取字段address（从form实例的indexes中），然后获取该字段的value在该字段dataSource中对应的label
+      var address = form.indexes[prefix];
+      var field = form.query(address).take();
+      displayValues = getValueByValue(field === null || field === void 0 ? void 0 : field.dataSource, values) || values;
+    }
+
+    return displayValues;
+  }; // 测试样例
+  // const example = {
+  //   a: [
+  //     [{ b: 'a.0.0.b', c: 'a.0.0.c' }, { d: 'a.0.1.d' }],
+  //     { e: [{ f: { g: [{ h: 'a.1.e.0.f.g.0.h' }] } }, 'a.1.e.1'] },
+  //   ],
+  // };
+  // console.log(getDisplayValues(example));
+
+
+  return getDisplayValues(values);
+};
+
+export default useFormDisplayValues;

package/es/form/SchemaForm/adapterType.js

@@ -41,7 +41,8 @@ var typeMap = (_typeMap = {
   ColorRadio: 'string',
   IconPicker: 'string',
   JsonInput: 'object',
-  TagPicker: 'array',
+  TagPicker: 'string',
+  MultipleTagPicker: 'array',
   Range: 'string',
   Search: 'array',
   ArrayCollapse: 'array',

package/es/form/SchemaForm/initializeProField.js

@@ -46,6 +46,7 @@ var proFieldTypeMap = {
   IconPicker: 'icon',
   JsonInput: 'json',
   TagPicker: 'tagPicker',
+  MultipleTagPicker: 'multipleTagPicker',
   Range: 'range',
   Search: 'search' // Upload: 'upload',
 

package/es/form/SchemaForm/initializeReactions.js

@@ -1,13 +1,89 @@
+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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _toArray(arr) { return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableRest(); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+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."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+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 _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import { isPlainObj, getValueByValue } from '@teamix/utils';
 import { mergeArrayValue } from '../utils';
+import schemaNameMap from '../schemaNameMap';
 
-var initializeReactions = function initializeReactions(reactions, innerReactions) {
-  if (reactions && innerReactions.length) {
-    return mergeArrayValue(innerReactions, reactions);
-  } else if (innerReactions.length) {
-    return innerReactions;
+var mapSchemaName = function mapSchemaName(schema) {
+  if (isPlainObj(schema)) {
+    var newSchema = {};
+    Object.entries(schema).forEach(function (_ref) {
+      var _ref2 = _slicedToArray(_ref, 2),
+          key = _ref2[0],
+          value = _ref2[1];
+
+      var _key$split = key.split('.'),
+          _key$split2 = _toArray(_key$split),
+          firstKey = _key$split2[0],
+          otherKey = _key$split2.slice(1);
+
+      var newFirstKey = getValueByValue(schemaNameMap, firstKey, {
+        inputKey: 'proForm',
+        outputKey: 'formily'
+      }) || firstKey;
+      var newKey = [newFirstKey].concat(_toConsumableArray(otherKey)).join('.');
+      newSchema[newKey] = value;
+    });
+    return newSchema;
   }
 
-  return reactions;
+  return schema;
+};
+
+var initializeReactions = function initializeReactions(reactions, innerReactions) {
+  var temp = innerReactions; // 合并reactions
+
+  if (reactions) {
+    temp = mergeArrayValue(innerReactions, reactions);
+  } // schema名称映射，由ProFormSchema映射为formilySchema
+
+
+  temp = temp.map(function (item) {
+    var _item$fulfill, _item$otherwise;
+
+    var fulfillSchema = mapSchemaName(item === null || item === void 0 ? void 0 : (_item$fulfill = item.fulfill) === null || _item$fulfill === void 0 ? void 0 : _item$fulfill.schema);
+    var otherwiseSchema = mapSchemaName(item === null || item === void 0 ? void 0 : (_item$otherwise = item.otherwise) === null || _item$otherwise === void 0 ? void 0 : _item$otherwise.schema);
+
+    if (fulfillSchema || otherwiseSchema) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        fulfill: _objectSpread(_objectSpread({}, item === null || item === void 0 ? void 0 : item.fulfill), {}, {
+          schema: fulfillSchema
+        }),
+        otherwise: _objectSpread(_objectSpread({}, item === null || item === void 0 ? void 0 : item.otherwise), {}, {
+          schema: otherwiseSchema
+        })
+      });
+    }
+
+    return item;
+  });
+  return temp;
 };
 
 export default initializeReactions;

package/es/form/index.d.ts

@@ -13,10 +13,10 @@ export * as formilyTeamix from '@teamix/formily';
  * 导出常用formily内容，需谨慎限制
  */
 import { createForm, registerValidateRules as registerRules, registerValidateFormats as registerFormats, registerValidateLocale, setValidateLanguage } from '@formily/core';
-import { FormConsumer } from '@formily/react';
+import { FormConsumer, useForm } from '@formily/react';
 import { FormDialog, FormDrawer, FormStep, FormTab, FormCollapse } from '@teamix/formily';
-import { getDisplayValues } from './utils';
-export { createForm, FormConsumer, FormDialog, FormDrawer, FormStep, FormTab, FormCollapse, registerRules, registerFormats, registerValidateLocale, setValidateLanguage, getDisplayValues, };
+import useFormDisplayValues from './ProForm/useFormDisplayValues';
+export { createForm, FormConsumer, FormDialog, FormDrawer, FormStep, FormTab, FormCollapse, registerRules, registerFormats, registerValidateLocale, setValidateLanguage, useForm, useFormDisplayValues, };
 /**
  * 导出 Filter 组件
  */

package/es/form/index.js

@@ -19,10 +19,10 @@ export { _formilyTeamix as formilyTeamix };
  */
 
 import { createForm, registerValidateRules as registerRules, registerValidateFormats as registerFormats, registerValidateLocale, setValidateLanguage } from '@formily/core';
-import { FormConsumer } from '@formily/react';
+import { FormConsumer, useForm } from '@formily/react';
 import { FormDialog, FormDrawer, FormStep, FormTab, FormCollapse } from '@teamix/formily';
-import { getDisplayValues } from './utils';
-export { createForm, FormConsumer, FormDialog, FormDrawer, FormStep, FormTab, FormCollapse, registerRules, registerFormats, registerValidateLocale, setValidateLanguage, getDisplayValues };
+import useFormDisplayValues from './ProForm/useFormDisplayValues';
+export { createForm, FormConsumer, FormDialog, FormDrawer, FormStep, FormTab, FormCollapse, registerRules, registerFormats, registerValidateLocale, setValidateLanguage, useForm, useFormDisplayValues };
 /**
  * 导出 Filter 组件
  */

package/es/form/typing.d.ts

@@ -6,7 +6,7 @@ export interface anyObject {
     [propName: string]: any;
 }
 declare type FieldDisplayTypes = 'none' | 'hidden' | 'visible';
-export declare type IBaseComponent = 'Input' | 'Password' | 'TextArea' | 'NumberPicker' | 'Percent' | 'Money' | 'Select' | 'MultipleSelect' | 'TreeSelect' | 'Cascader' | 'MultipleCascader' | 'ArbitraryCascader' | 'Radio' | 'Checkbox' | 'Switch' | 'DatePicker' | 'TimePicker' | 'DateTimePicker' | 'WeekPicker' | 'MonthPicker' | 'YearPicker' | 'QuarterPicker' | 'DateRangePicker' | 'TimeRangePicker' | 'DateTimeRangePicker' | 'WeekRangePicker' | 'MonthRangePicker' | 'YearRangePicker' | 'QuarterRangePicker' | 'Transfer' | 'Upload' | 'ColorPicker' | 'ColorRadio' | 'IconPicker' | 'JsonInput' | 'TagPicker' | 'Range' | 'Search';
+export declare type IBaseComponent = 'Input' | 'Password' | 'TextArea' | 'NumberPicker' | 'Percent' | 'Money' | 'Select' | 'MultipleSelect' | 'TreeSelect' | 'Cascader' | 'MultipleCascader' | 'ArbitraryCascader' | 'Radio' | 'Checkbox' | 'Switch' | 'DatePicker' | 'TimePicker' | 'DateTimePicker' | 'WeekPicker' | 'MonthPicker' | 'YearPicker' | 'QuarterPicker' | 'DateRangePicker' | 'TimeRangePicker' | 'DateTimeRangePicker' | 'WeekRangePicker' | 'MonthRangePicker' | 'YearRangePicker' | 'QuarterRangePicker' | 'Transfer' | 'Upload' | 'ColorPicker' | 'ColorRadio' | 'IconPicker' | 'JsonInput' | 'TagPicker' | 'MultipleTagPicker' | 'Range' | 'Search';
 export declare type IButtonComponent = 'Submit' | 'Reset';
 export declare type IComboComponent = 'ArrayCards' | 'ArrayCards.Addition' | 'ArrayCards.Remove' | 'ArrayCards.MoveUp' | 'ArrayCards.MoveDown' | 'ArrayCards.Index' | 'ArrayCollapse' | 'ArrayCollapse.CollapsePanel' | 'ArrayCollapse.Addition' | 'ArrayCollapse.Remove' | 'ArrayCollapse.MoveUp' | 'ArrayCollapse.MoveDown' | 'ArrayCollapse.Index' | 'ArrayTable' | 'ArrayTable.Column' | 'ArrayTable.SortHandle' | 'ArrayTable.Addition' | 'ArrayTable.Remove' | 'ArrayTable.MoveDown' | 'ArrayTable.MoveUp' | 'ArrayTable.Index' | 'ArrayItems' | 'ArrayItems.Item' | 'ArrayItems.SortHandle' | 'ArrayItems.Addition' | 'ArrayItems.Remove' | 'ArrayItems.MoveDown' | 'ArrayItems.MoveUp' | 'ArrayItems.Index' | 'Editable' | 'Editable.Popover' | 'Editable.Dialog' | 'Editable.Drawer';
 export declare type ILayoutComponent = 'FormFlex' | 'FormGrid' | 'FormGroup' | 'FormGroup.GroupPanel' | 'Search' | 'Search.SearchPanel' | 'FormTab' | 'FormTab.TabPane' | 'FormStep' | 'FormStep.StepPane' | 'FormCollapse' | 'FormCollapse.CollapsePanel' | 'FormButtonGroup' | 'FormDialog' | 'FormDrawer' | 'FormDialog.Footer' | 'FormDrawer.Footer';
@@ -57,7 +57,7 @@ export interface IFormProps extends IFormLayoutProps {
     initialValues?: anyObject;
     initialRequest?: CommonRequestConfig;
     previewTextPlaceholder?: ReactNode;
-    onChange?: (values: any, displayValues: any) => any;
+    onChange?: (values: any, displayValues?: any) => any;
     onSubmit?: ((values: any) => any) | CommonRequestConfig;
     onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;
 }

package/es/form/utils.d.ts

@@ -1,14 +1,37 @@
-import { getValueByValue } from '@teamix/utils';
+/**
+ * 映射字段size，主要是default转medium
+ * @param props component的props
+ * @param field 当前字段实例
+ * @returns 映射后的字段属性
+ */
+declare const mapSize: (props: any, field: any) => any;
+/**
+ * 映射字段state
+ * @param props component的props
+ * @param field 当前字段实例
+ * @returns 映射后的字段属性
+ */
+declare const mapStatus: (props: any, field: any) => any;
+/**
+ * 为未配置name的字段添加随机字段名称
+ * @param prefix 随机字段名称前缀，默认为name
+ * @returns 随机字段名称
+ */
 interface IGetRandomName {
     (prefix?: string): string;
 }
-declare const mapSize: (props: any, field: any) => any;
-declare const mapStatus: (props: any, field: any) => any;
 declare const getRandomName: IGetRandomName;
+/**
+ * 将ProForm的key映射为formily的key，然后筛除掉无效的key/value
+ * @param obj
+ * @returns
+ */
 declare const mapSchemaName: (obj: any) => any;
+/**
+ * 合并数组或非数组，不移除无效值
+ * @param arr 数组
+ * @param v 数组或其他
+ * @returns 合并数组或合并其他值
+ */
 declare const mergeArrayValue: (arr: any[], v?: any) => any[];
-interface IGetDisplayValues {
-    (form: any, values: any, prefix?: string): any;
-}
-declare const getDisplayValues: IGetDisplayValues;
-export { getRandomName, getValueByValue, getDisplayValues, mapSize, mapStatus, mergeArrayValue, mapSchemaName, };
+export { getRandomName, mapSize, mapStatus, mergeArrayValue, mapSchemaName };

package/es/form/utils.js

@@ -27,6 +27,12 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import { useFormLayout, useFormShallowLayout } from '@teamix/formily';
 import { isArr, isObj, getValueByValue } from '@teamix/utils';
 import schemaNameMap from './schemaNameMap';
+/**
+ * 映射字段size，主要是default转medium
+ * @param props component的props
+ * @param field 当前字段实例
+ * @returns 映射后的字段属性
+ */
 
 var mapSize = function mapSize(props, field) {
   var layout = _objectSpread(_objectSpread({}, useFormShallowLayout()), useFormLayout());
@@ -39,6 +45,13 @@ var mapSize = function mapSize(props, field) {
     size: props.size || takeSize()
   });
 };
+/**
+ * 映射字段state
+ * @param props component的props
+ * @param field 当前字段实例
+ * @returns 映射后的字段属性
+ */
+
 
 var mapStatus = function mapStatus(props, field) {
   var takeStatus = function takeStatus() {
@@ -66,7 +79,12 @@ var mapStatus = function mapStatus(props, field) {
 var getRandomName = function getRandomName() {
   var prefix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'name';
   return "".concat(prefix, "_").concat(Math.floor(Math.random() * Math.pow(10, 18)));
-}; // 将ProForm的key映射为formily的key，然后筛除掉无效的keyvalue
+};
+/**
+ * 将ProForm的key映射为formily的key，然后筛除掉无效的key/value
+ * @param obj
+ * @returns
+ */
 
 
 var mapSchemaName = function mapSchemaName(obj) {
@@ -97,6 +115,13 @@ var mapSchemaName = function mapSchemaName(obj) {
   });
   return temp;
 };
+/**
+ * 合并数组或非数组，不移除无效值
+ * @param arr 数组
+ * @param v 数组或其他
+ * @returns 合并数组或合并其他值
+ */
+
 
 var mergeArrayValue = function mergeArrayValue(arr, v) {
   if (isArr(v)) {
@@ -104,48 +129,6 @@ var mergeArrayValue = function mergeArrayValue(arr, v) {
   }
 
   return [].concat(_toConsumableArray(arr), [v]);
-}; // 获取form的displayValues
-
-
-var getDisplayValues = function getDisplayValues(form, values) {
-  var prefix = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
-  var displayValues = {}; // 在form实例中，通过name获取该field的值在dataSource对应的label
-
-  var getLabelByKey = function getLabelByKey(name, value) {
-    var address = form.indexes[name] || '';
-    var field = form.query(address).take() || {};
-    var dataSource = field.dataSource;
-    return getValueByValue(dataSource, value);
-  };
-
-  Object.entries(values).forEach(function (_ref3) {
-    var _ref4 = _slicedToArray(_ref3, 2),
-        key = _ref4[0],
-        value = _ref4[1];
-
-    var label;
-
-    if (isArr(value)) {
-      value.map(function (v, i) {
-        if (isObj(v)) {
-          // 值是对象数组
-          label = getDisplayValues(form, v, "".concat(prefix).concat(key, ".").concat(i, "."));
-        } else if (isArr(v)) {
-          // 值是多重数组
-          console.warn('Multiple array, Please dingding qilou.zhl.');
-        } else if (v !== undefined && v !== null) {
-          label = getLabelByKey("".concat(prefix).concat(key, ".").concat(i), value);
-        }
-      });
-    } else if (isObj(value)) {
-      label = getDisplayValues(form, value, "".concat(key, "."));
-    } else {
-      label = getLabelByKey("".concat(prefix).concat(key), value);
-    }
-
-    displayValues[key] = label;
-  });
-  return displayValues;
 };
 
-export { getRandomName, getValueByValue, getDisplayValues, mapSize, mapStatus, mergeArrayValue, mapSchemaName };
+export { getRandomName, mapSize, mapStatus, mergeArrayValue, mapSchemaName };

package/es/index.d.ts

@@ -21,5 +21,5 @@ export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
 export * from './table';
-declare const version = "1.1.31";
+declare const version = "1.1.32";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };

package/es/index.js

@@ -25,6 +25,6 @@ export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
 export * from './table';
-var version = '1.1.31';
+var version = '1.1.32';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils };

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/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 */