@teamix/pro 1.3.11 → 1.3.14

package/es/form/ProForm/index.scss

@@ -317,6 +317,13 @@
   }
 }
 
+// SelectTable
+.#{$teamix-pro-form}-select-table-column-tree
+  > .#{$css-prefix}table-cell-wrapper {
+  display: flex;
+  align-items: center;
+}
+
 /* hack todo remove */
 .#{$form-item-cls}-control-content-component {
   .#{$teamix-pro-field}-tooltip.#{$teamix-pro-field}-checkbox {

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

@@ -0,0 +1,7 @@
+declare const _default: ({ children, schema }: any) => any;
+/**
+ * 获取 ProForm 的 schema 配置，通过合并 Field 字段 或者 schema 配置
+ * @param props ProForm 组件的 props
+ * @returns schema 配置
+ */
+export default _default;

package/es/form/ProForm/useFieldSchema.js

@@ -0,0 +1,88 @@
+var _excluded = ["id", "children", "reactions"],
+    _excluded2 = ["id", "children", "reactions"];
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : 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 { getValueByValue, deepMerge } from '@teamix/utils';
+/**
+ * 合并 Field 字段 props 和 ProForm schema 配置，生成完整的 Field 字段 schema
+ * @param field Field 字段
+ * @param extra 额外的 schema 配置（存在递归，可能是子级 schema ）
+ * @param wholeExtra 完整的额外 schema 配置
+ * @returns schema 配置
+ */
+
+var getMergedSchema = function getMergedSchema(field, extra, wholeExtra) {
+  return field.reduce(function (prev, curr, index) {
+    var _ref = curr.props || {},
+        id = _ref.id,
+        _ref$children = _ref.children,
+        children = _ref$children === void 0 ? [] : _ref$children,
+        _ref$reactions = _ref.reactions,
+        reactions = _ref$reactions === void 0 ? [] : _ref$reactions,
+        rest = _objectWithoutProperties(_ref, _excluded); // 获取字段额外的 schema 配置（From ProForm）
+
+
+    var extraFieldProps = extra[index] || {};
+
+    if (id !== extraFieldProps.id) {
+      // 索引不匹配，通过 id 查找获取
+      extraFieldProps = getValueByValue(extra, id, {
+        inputKey: 'id',
+        outputKey: '__whole__'
+      }) || getValueByValue(wholeExtra, id, {
+        inputKey: 'id',
+        outputKey: '__whole__'
+      });
+
+      if (extraFieldProps) {
+        console.warn("Field id \"".concat(id, "\" is not found by index in ProForm schema props, Please pay attention to the order."));
+      }
+    }
+
+    var _ref2 = extraFieldProps || {},
+        extraId = _ref2.id,
+        _ref2$children = _ref2.children,
+        extraChildren = _ref2$children === void 0 ? [] : _ref2$children,
+        _ref2$reactions = _ref2.reactions,
+        extraReactions = _ref2$reactions === void 0 ? [] : _ref2$reactions,
+        extraRest = _objectWithoutProperties(_ref2, _excluded2);
+
+    prev.push(_objectSpread(_objectSpread({}, deepMerge(rest, extraRest)), {}, {
+      reactions: [].concat(reactions, extraReactions),
+      children: (children === null || children === void 0 ? void 0 : children.length) ? getMergedSchema(children, extraChildren, wholeExtra) : []
+    }));
+    return prev;
+  }, []);
+};
+/**
+ * 获取 ProForm 的 schema 配置，通过合并 Field 字段 或者 schema 配置
+ * @param props ProForm 组件的 props
+ * @returns schema 配置
+ */
+
+
+export default (function (_ref3) {
+  var children = _ref3.children,
+      schema = _ref3.schema;
+  var field = [].concat(children !== null && children !== void 0 ? children : []).filter(function (item) {
+    var _item$type, _item$props;
+
+    return (item === null || item === void 0 ? void 0 : (_item$type = item.type) === null || _item$type === void 0 ? void 0 : _item$type.name) === '' && (item === null || item === void 0 ? void 0 : (_item$props = item.props) === null || _item$props === void 0 ? void 0 : _item$props.component);
+  }); // 如果 ProForm 的 children 含有 Field 字段，则优先使用 Field 渲染表单（仅合并 ProForm 的 schema 属性 ）
+
+  if (field.length) {
+    return getMergedSchema(field, schema !== null && schema !== void 0 ? schema : [], schema !== null && schema !== void 0 ? schema : []);
+  } // 正常使用 ProForm 的 schema 渲染表单
+
+
+  return schema;
+});

package/es/form/SchemaForm/index.js

@@ -32,13 +32,6 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import React, { memo, useCallback, useRef, useMemo } from 'react';
 import { createSchemaField } from '@formily/react';
-import { Affix } from '@alicloudfe/components';
-import { Upload, SelectTable, FormLayout, FormItem, ArrayCollapse, ArrayCards, ArrayItems, ArrayTable, Space, FormGrid, FormTab, FormCollapse, FormStep, Editable, FormDialog, FormDrawer, FormButtonGroup, Submit, Reset } from '@teamix/formily';
-import ProFieldComponents from '../Components/ProField';
-import { EditableDialog, EditableDrawer, EditablePopover } from '../Components/Editable';
-import FormGroup from '../Components/FormGroup';
-import LightFilter from '../Components/LightFilter';
-import Text from '../Components/Text/index';
 import adapterType from './adapterType';
 import adapterComponent from './adapterComponent';
 import adapterDecorator from './adapterDecorator';
@@ -64,39 +57,10 @@ export default /*#__PURE__*/memo(function (_ref) {
   var schema = _ref.schema,
       scope = _ref.scope,
       components = _ref.components;
-  var schemaScopeRef = useRef({}); // 创建 SchemaField，添加内置组件
+  var schemaScopeRef = useRef({}); // 创建 SchemaField
 
   var SchemaField = useMemo(function () {
-    return createSchemaField({
-      components: _objectSpread(_objectSpread({}, ProFieldComponents), {}, {
-        FormLayout: FormLayout,
-        FormItem: FormItem,
-        ArrayCollapse: ArrayCollapse,
-        ArrayCards: ArrayCards,
-        ArrayItems: ArrayItems,
-        ArrayTable: ArrayTable,
-        Space: Space,
-        FormGrid: FormGrid,
-        FormTab: FormTab,
-        FormCollapse: FormCollapse,
-        FormStep: FormStep,
-        Editable: Editable,
-        FormDialogFooter: FormDialog.Footer,
-        FormDrawerFooter: FormDrawer.Footer,
-        FormButtonGroup: FormButtonGroup,
-        Submit: Submit,
-        Reset: Reset,
-        EditableDialog: EditableDialog,
-        EditableDrawer: EditableDrawer,
-        EditablePopover: EditablePopover,
-        FormGroup: FormGroup,
-        Upload: Upload,
-        SelectTable: SelectTable,
-        Affix: Affix,
-        LightFilter: LightFilter,
-        Text: Text
-      })
-    });
+    return createSchemaField();
   }, []); // 格式化 schema
 
   var formatSchema = useCallback(function (schema) {

package/es/form/SchemaForm/initializeSelectTable.js

@@ -1,4 +1,4 @@
-var _excluded = ["name", "title", "children"];
+var _excluded = ["name", "children", "props"];
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -10,25 +10,99 @@ 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; }
 
+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 cls from 'classnames';
+import { usePrefixCls, isStr, isPlainObj, isArr } from '@teamix/utils';
+import pureGenProColumnToColumn from '../../table/utils/pureGenProColumnToColumn';
+/**
+ * 将可被 ProForm 识别的上下文转换为仅被 ProTable 识别的上下文
+ * @param value
+ * @returns
+ */
+
+var adapterContext = function adapterContext(value) {
+  if (isStr(value)) {
+    var contextReg = /^\{\{.*?\}\}$/;
+
+    if (contextReg.test(value)) {
+      return "\0".concat(value, "\0");
+    }
+
+    return value;
+  }
+
+  if (isPlainObj(value)) {
+    var temp = {};
+    Object.entries(value).forEach(function (_ref) {
+      var _ref2 = _slicedToArray(_ref, 2),
+          key = _ref2[0],
+          val = _ref2[1];
+
+      temp[key] = adapterContext(val);
+    });
+    return temp;
+  }
+
+  if (isArr(value)) {
+    return value.map(function (item) {
+      return adapterContext(item);
+    });
+  }
+
+  return value;
+};
+
 var initializeTableColumn = function initializeTableColumn(item) {
   var name = item.name,
-      title = item.title,
       children = item.children,
+      props = item.props,
       otherProps = _objectWithoutProperties(item, _excluded);
 
   return {
     name: name,
-    title: title,
     component: 'SelectTable.Column',
-    children: children,
-    props: _objectSpread({}, otherProps)
+    children: children === null || children === void 0 ? void 0 : children.map(function (item) {
+      return initializeTableColumn(item);
+    }),
+    props: _objectSpread(_objectSpread({}, otherProps), props)
   };
 };
 
 var initialize = function initialize(item) {
+  var _props$columns;
+
   var _item$children = item.children,
-      children = _item$children === void 0 ? [] : _item$children;
+      children = _item$children === void 0 ? [] : _item$children,
+      props = item.props;
+  var prefixCls = usePrefixCls('', {
+    prefix: 'teamix-pro-form-select-table-column-tree'
+  });
+  var columns = props === null || props === void 0 ? void 0 : (_props$columns = props.columns) === null || _props$columns === void 0 ? void 0 : _props$columns.map(function (value, index) {
+    var column = adapterContext(value);
+
+    if ((props === null || props === void 0 ? void 0 : props.isTree) && index === 0) {
+      return _objectSpread(_objectSpread({}, column), {}, {
+        className: cls(column.className, prefixCls)
+      });
+    }
+
+    return column;
+  });
   return _objectSpread(_objectSpread({}, item), {}, {
+    props: _objectSpread(_objectSpread({}, props), {}, {
+      columns: columns && pureGenProColumnToColumn(columns)
+    }),
     children: children.map(function (item) {
       return initializeTableColumn(item);
     })

package/es/form/typing.d.ts

@@ -56,7 +56,7 @@ export interface ProFormSchemaItem {
 export declare type ProFormSchema = ProFormSchemaItem[];
 export interface ProFormProps extends IFormLayoutProps {
     form?: FormType | false;
-    schema: ProFormSchema;
+    schema?: ProFormSchema;
     scope?: any;
     context?: any;
     components?: {
@@ -67,11 +67,15 @@ export interface ProFormProps extends IFormLayoutProps {
     initialRequest?: ProFormRequestConfig;
     previewTextPlaceholder?: ReactNode;
     validateFirst?: boolean;
+    onChangeType?: 'form';
     onChange?: (values: any, fieldValue?: any, fieldName?: any) => any;
     onSubmit?: ((values: any) => any) | CommonRequestConfig;
     onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;
     onInitialComplete?: (form: FormType) => void;
 }
+export declare type ComposedProForm = React.FC<ProFormProps> & {
+    Field?: React.FC<any>;
+};
 export interface FilterProps extends ProFormProps {
     form: FormType;
     defaultFilterValue?: string;

package/es/index.d.ts

@@ -26,5 +26,5 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.3.11";
+declare const version = "1.3.14";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, hooks, nocode, templates, utils, };

package/es/index.js

@@ -31,6 +31,6 @@ export * from './sidebar';
 export * from './utils'; // export * from './sidebar';
 
 export * from './timeline';
-var version = '1.3.11';
+var version = '1.3.14';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, hooks, nocode, templates, utils };

package/es/table/components/ToolBar/Fullscreen.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import './index.scss';
 import { ProTableActionType } from '../../typing';
 declare type ProTableFullScreenProps = {
-    children: React.ReactNode;
+    children: (isFullScreen: boolean) => React.ReactNode | React.ReactNode;
     visible: boolean;
     actionRef: React.MutableRefObject<ProTableActionType | undefined>;
 };

package/es/table/index.js

@@ -752,12 +752,14 @@ var ProTable = function ProTable(props) {
     mode: 'inline',
     forceClear: true
   }, propsDataFilter), {}, {
-    onInit: function onInit(values) {
+    onInit: (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onInit) || requestWhenMount ? function (values) {
+      var _propsDataFilter$onIn;
+
       // 表单初始化请求处理
-      (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onInit) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onInit(values));
+      propsDataFilter === null || propsDataFilter === void 0 ? void 0 : (_propsDataFilter$onIn = propsDataFilter.onInit) === null || _propsDataFilter$onIn === void 0 ? void 0 : _propsDataFilter$onIn.call(propsDataFilter, values);
       !fullscreenState && requestWhenMount && _request({}, false, values);
       return true;
-    },
+    } : undefined,
     onFilter: function onFilter(values) {
       var _actionRef$current6, _actionRef$current6$c;
 

package/es/table/utils/pureColumnRender.d.ts

@@ -0,0 +1,9 @@
+import { ProTableColumnProps } from '../typing';
+/**
+ * 增加了 icon 的功能 render title
+ */
+export declare const renderColumnsTitle: (item: ProTableColumnProps) => JSX.Element;
+/**
+ * 负责单元格的具体渲染
+ */
+export declare const renderCell: (value: any, item: ProTableColumnProps, index: number, record: any) => JSX.Element;

package/es/table/utils/pureColumnRender.js

@@ -0,0 +1,201 @@
+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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+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; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : 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; }
+
+/**
+ * 渲染列的逻辑函数，用于非 ProTable 比如 selectTable
+ */
+import React from 'react';
+import { getTargetValue, LabelIconTip } from '@teamix/utils';
+import ProField from '../../field';
+/**
+ * 增加了 icon 的功能 render title
+ */
+
+export var renderColumnsTitle = function renderColumnsTitle(item) {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(LabelIconTip, {
+    label: item.title,
+    tooltip: item.tooltip,
+    icon: item.tooltipIcon
+  }));
+};
+/**
+ * 负责单元格的具体渲染
+ */
+
+export var renderCell = function renderCell(value, item, index, record) {
+  var _item$valueType = item.valueType,
+      valueType = _item$valueType === void 0 ? 'text' : _item$valueType,
+      render = item.render,
+      dataIndex = item.dataIndex,
+      format = item.format; // 如果没传 dataIndex，返回 null
+
+  if (!dataIndex) {
+    value = null;
+  } // 处理 dataIndex 为数组的情况
+
+
+  if (Array.isArray(dataIndex)) {
+    value = dataIndex.map(function (item) {
+      return getTargetValue("{{".concat(item, "}}"), _objectSpread(_objectSpread({}, record), {}, {
+        record: record
+      }));
+    });
+  }
+
+  var newRender = null;
+  var newDataSource = null;
+  var props = item.props; // 如果 render 直接传函数
+
+  if (typeof render === 'function') {
+    newRender = function newRender() {
+      return render === null || render === void 0 ? void 0 : render(value, index, record);
+    };
+  } else {
+    newRender = processBuriedPoint(processRenderFunction(render, value, index, record), record, value, index);
+
+    if (valueType === 'selectGroup') {
+      newRender = _objectSpread(_objectSpread({
+        maxShowNumber: 'auto',
+        foldText: 'more',
+        editOnClick: function editOnClick() {},
+        edit: true
+      }, newRender), {}, {
+        ellipsis: false
+      });
+      props = _objectSpread({
+        valueAlias: {
+          value: 'TagValue',
+          key: 'TagKey'
+        }
+      }, props);
+    }
+
+    if ((render === null || render === void 0 ? void 0 : render.type) === 'step') {
+      newRender = _objectSpread(_objectSpread({}, newRender), {}, {
+        ellipsis: false
+      });
+    }
+  } // 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
+
+
+  return /*#__PURE__*/React.createElement(ProField, _objectSpread({
+    type: valueType || 'text',
+    value: value,
+    render: newRender,
+    dataSource: newDataSource,
+    format: format
+  }, props));
+};
+/**
+ * 处理 render 配置项是函数的情况
+ * @param render ProFieldRender
+ * @param value table cell value
+ * @param index table cell index
+ * @param record table cell record
+ * @returns
+ */
+
+var processRenderFunction = function processRenderFunction() {
+  var render = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var value = arguments.length > 1 ? arguments[1] : undefined;
+  var index = arguments.length > 2 ? arguments[2] : undefined;
+  var record = arguments.length > 3 ? arguments[3] : undefined;
+  // 当 ProField render 类型为 function 时。需要表格预先处理以塞入 record
+  var external = ['linkOnClick', 'link', 'value', 'renderEdit', 'descriptionRenderEdit', 'editPopConfirmProps', 'descriptionEditPopConfirmProps', 'editOnClick', 'descriptionEditOnClick', 'extra', 'prefixExtra'];
+  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;
+
+      if (external.includes(k)) {
+        return [k, function () {
+          for (var _len = arguments.length, others = new Array(_len), _key = 0; _key < _len; _key++) {
+            others[_key] = arguments[_key];
+          }
+
+          return v === null || v === void 0 ? void 0 : v.apply(void 0, [value, index, record].concat(others));
+        }];
+      }
+
+      return [k, (_v = v === null || v === void 0 ? void 0 : v(value, index, record)) !== null && _v !== void 0 ? _v : ''];
+    }
+
+    return [k, v];
+  }));
+};
+/**
+ * 处理 render 数据，取出 {{xxx}} 匹配值
+ * @param render ProFieldRender
+ * @param record table cell record
+ * @returns
+ */
+
+
+var processBuriedPoint = function processBuriedPoint() {
+  var render = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var record = arguments.length > 1 ? arguments[1] : undefined;
+  var value = arguments.length > 2 ? arguments[2] : undefined;
+  var index = arguments.length > 3 ? arguments[3] : undefined;
+  return Object.fromEntries([// 默认 ellipsis、descriptionEllipsis 为 true
+  // 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,
+      value: value,
+      index: index
+    }))];
+  }))));
+};

package/es/table/utils/pureGenProColumnToColumn.d.ts

@@ -0,0 +1,7 @@
+import { ProTableColumnProps } from '../typing';
+import { ColumnProps } from '@alicloudfe/components/types/table';
+/**
+ * ProColumn => Column，去掉操作列，过滤器相关逻辑
+ * 用于非 ProTable 比如 selectTable
+ */
+export default function genProColumnToColumn(columns: ProTableColumnProps[]): ColumnProps[];

package/es/table/utils/pureGenProColumnToColumn.js

@@ -0,0 +1,36 @@
+var _excluded = ["filters", "dataIndex"];
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : 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 { renderColumnsTitle, renderCell } from './pureColumnRender';
+/**
+ * ProColumn => Column，去掉操作列，过滤器相关逻辑
+ * 用于非 ProTable 比如 selectTable
+ */
+
+export default function genProColumnToColumn(columns) {
+  return columns.map(function (columnProps) {
+    var filters = columnProps.filters,
+        dataIndex = columnProps.dataIndex,
+        others = _objectWithoutProperties(columnProps, _excluded);
+
+    return _objectSpread(_objectSpread({
+      // 金钱样式默认右对齐
+      align: columnProps.valueType === 'money' ? 'right' : 'left'
+    }, others), {}, {
+      dataIndex: dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.toString(),
+      title: renderColumnsTitle(columnProps),
+      cell: function cell(value, index, record) {
+        return renderCell(value, columnProps, index, record);
+      }
+    });
+  });
+}

package/es/timeline/ProTimeLineItem/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["_comment", "_shape", "status", "image", "icon", "title", "subTitle", "timeLeft", "content", "animation", "discription", "tags", "collapsible", "defaultCollapsed", "collapsed", "onCollapse", "dotRender"];
+var _excluded = ["_comment", "_shape", "status", "image", "icon", "title", "subTitle", "time", "timeLeft", "content", "animation", "discription", "tags", "collapsible", "defaultCollapsed", "collapsed", "onCollapse", "dotRender"];
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -43,6 +43,7 @@ var ProTimeLineItem = function ProTimeLineItem(props) {
       icon = props.icon,
       title = props.title,
       subTitle = props.subTitle,
+      time = props.time,
       timeLeft = props.timeLeft,
       content = props.content,
       animation = props.animation,
@@ -54,8 +55,10 @@ var ProTimeLineItem = function ProTimeLineItem(props) {
       onCollapse = props.onCollapse,
       dotRender = props.dotRender,
       others = _objectWithoutProperties(props, _excluded);
-  /** 内容去折叠相关 */
 
+  var timeRight = time !== null && time !== void 0 ? time : subTitle; // 兼容 subTitle
+
+  /** 内容去折叠相关 */
 
   var _useState = useState(defaultCollapsed !== undefined ? defaultCollapsed : false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -165,9 +168,9 @@ var ProTimeLineItem = function ProTimeLineItem(props) {
       }))
     }, title), tags && /*#__PURE__*/React.createElement("div", {
       className: classnames(cls('wrapper-right-top-tag-info'))
-    }, renderTag()), subTitle && /*#__PURE__*/React.createElement("div", {
+    }, renderTag()), timeRight && /*#__PURE__*/React.createElement("div", {
       className: classnames(cls('wrapper-right-top-subTitle-info'))
-    }, formatTime(subTitle))), discription && /*#__PURE__*/React.createElement("div", {
+    }, formatTime(timeRight))), discription && /*#__PURE__*/React.createElement("div", {
       className: classnames(cls('wrapper-right-discribe-info'))
     }, discription), /*#__PURE__*/React.createElement("div", {
       className: classnames(cls('wrapper-right-content-info'))
@@ -177,7 +180,7 @@ var ProTimeLineItem = function ProTimeLineItem(props) {
         'wrapper-right-content-info-open': showContent
       }))
     }, content))));
-  }, [_shape, timeLeft, image, title, tags, subTitle, discription, content, collapsible, collapsed, defaultCollapsed, onCollapseChanged]);
+  }, [_shape, timeLeft, image, title, tags, timeRight, discription, content, collapsible, collapsed, defaultCollapsed, onCollapseChanged]);
   /**
    * 重新渲染 timeline 节点
    * */