@teamix/pro 1.1.30 → 1.1.34

package/lib/form/index.js

@@ -13,6 +13,7 @@ var _exportNames = {
   setValidateLanguage: true,
   formilyCore: true,
   FormConsumer: true,
+  useForm: true,
   formilyReact: true,
   formilyReactive: true,
   FormDialog: true,
@@ -21,7 +22,7 @@ var _exportNames = {
   FormTab: true,
   FormCollapse: true,
   formilyTeamix: true,
-  getDisplayValues: true,
+  useFormDisplayValues: true,
   AdvancedFilter: true,
   SimpleFilter: true,
   QueryFilter: true
@@ -87,12 +88,6 @@ Object.defineProperty(exports, "createForm", {
   }
 });
 exports.formilyTeamix = exports.formilyReactive = exports.formilyReact = exports.formilyCore = exports.default = void 0;
-Object.defineProperty(exports, "getDisplayValues", {
-  enumerable: true,
-  get: function get() {
-    return _utils.getDisplayValues;
-  }
-});
 Object.defineProperty(exports, "registerFormats", {
   enumerable: true,
   get: function get() {
@@ -117,6 +112,18 @@ Object.defineProperty(exports, "setValidateLanguage", {
     return _formilyCore.setValidateLanguage;
   }
 });
+Object.defineProperty(exports, "useForm", {
+  enumerable: true,
+  get: function get() {
+    return _formilyReact.useForm;
+  }
+});
+Object.defineProperty(exports, "useFormDisplayValues", {
+  enumerable: true,
+  get: function get() {
+    return _useFormDisplayValues.default;
+  }
+});
 
 var _typing = require("./typing");
 
@@ -148,7 +155,7 @@ var _formilyTeamix = _interopRequireWildcard(require("@teamix/formily"));
 
 exports.formilyTeamix = _formilyTeamix;
 
-var _utils = require("./utils");
+var _useFormDisplayValues = _interopRequireDefault(require("./ProForm/useFormDisplayValues"));
 
 var _Filter = require("./Filter");
 

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

@@ -3,14 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getRandomName = exports.getDisplayValues = void 0;
-Object.defineProperty(exports, "getValueByValue", {
-  enumerable: true,
-  get: function get() {
-    return _utils.getValueByValue;
-  }
-});
-exports.mergeArrayValue = exports.mapStatus = exports.mapSize = exports.mapSchemaName = void 0;
+exports.mergeArrayValue = exports.mapStatus = exports.mapSize = exports.mapSchemaName = exports.getRandomName = void 0;
 
 var _formily = require("@teamix/formily");
 
@@ -46,6 +39,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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; }
 
+/**
+ * 映射字段size，主要是default转medium
+ * @param props component的props
+ * @param field 当前字段实例
+ * @returns 映射后的字段属性
+ */
 var mapSize = function mapSize(props, field) {
   var layout = _objectSpread(_objectSpread({}, (0, _formily.useFormShallowLayout)()), (0, _formily.useFormLayout)());
 
@@ -57,6 +56,13 @@ var mapSize = function mapSize(props, field) {
     size: props.size || takeSize()
   });
 };
+/**
+ * 映射字段state
+ * @param props component的props
+ * @param field 当前字段实例
+ * @returns 映射后的字段属性
+ */
+
 
 exports.mapSize = mapSize;
 
@@ -88,7 +94,12 @@ exports.mapStatus = mapStatus;
 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
+ */
 
 
 exports.getRandomName = getRandomName;
@@ -121,6 +132,13 @@ var mapSchemaName = function mapSchemaName(obj) {
   });
   return temp;
 };
+/**
+ * 合并数组或非数组，不移除无效值
+ * @param arr 数组
+ * @param v 数组或其他
+ * @returns 合并数组或合并其他值
+ */
+
 
 exports.mapSchemaName = mapSchemaName;
 
@@ -130,50 +148,6 @@ var mergeArrayValue = function mergeArrayValue(arr, v) {
   }
 
   return [].concat(_toConsumableArray(arr), [v]);
-}; // 获取form的displayValues
-
-
-exports.mergeArrayValue = mergeArrayValue;
-
-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 (0, _utils.getValueByValue)(dataSource, value);
-  };
-
-  Object.entries(values).forEach(function (_ref3) {
-    var _ref4 = _slicedToArray(_ref3, 2),
-        key = _ref4[0],
-        value = _ref4[1];
-
-    var label;
-
-    if ((0, _utils.isArr)(value)) {
-      value.map(function (v, i) {
-        if ((0, _utils.isObj)(v)) {
-          // 值是对象数组
-          label = getDisplayValues(form, v, "".concat(prefix).concat(key, ".").concat(i, "."));
-        } else if ((0, _utils.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 ((0, _utils.isObj)(value)) {
-      label = getDisplayValues(form, value, "".concat(key, "."));
-    } else {
-      label = getLabelByKey("".concat(prefix).concat(key), value);
-    }
-
-    displayValues[key] = label;
-  });
-  return displayValues;
 };
 
-exports.getDisplayValues = getDisplayValues;
+exports.mergeArrayValue = mergeArrayValue;

package/lib/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.29";
+declare const version = "1.1.33";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -251,5 +251,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // 设置图标源
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
-var version = '1.1.29';
+var version = '1.1.33';
 exports.version = version;

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/index.js

@@ -666,9 +666,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/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.30",
+  "version": "1.1.34",
   "description": "TeamixPro大包",
   "repository": "http://gitlab.alibaba-inc.com/teamix/pro",
   "author": "Velociraptor(迅猛龙)",