@ant-design/pro-components 3.1.0-0 → 3.1.1-1

package/es/table/utils/cellRenderToFromItem.js

@@ -1,8 +1,3 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-var _excluded = ["children"];
 import { get } from '@rc-component/util';
 import { Form } from 'antd';
 import React, { useCallback, useContext, useEffect, useMemo, useState } from 'react';
@@ -10,113 +5,101 @@ import { FieldContext, ProForm, ProFormField } from "../../form";
 import { InlineErrorFormItem, getFieldPropsOrFormItemProps, runFunction } from "../../utils";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
-var SHOW_EMPTY_TEXT_LIST = ['', null, undefined];
+const SHOW_EMPTY_TEXT_LIST = ['', null, undefined];
 
 /**
  * 拼接用于编辑的 key
  */
-export var spellNamePath = function spellNamePath() {
-  for (var _len = arguments.length, rest = new Array(_len), _key = 0; _key < _len; _key++) {
-    rest[_key] = arguments[_key];
-  }
-  return rest.filter(function (index) {
-    return index !== undefined;
-  }).map(function (item) {
+export const spellNamePath = (...rest) => {
+  return rest.filter(index => index !== undefined).map(item => {
     if (typeof item === 'number') {
       return item.toString();
     }
     return item;
   }).flat(1);
 };
-var CellRenderFromItem = function CellRenderFromItem(props) {
-  var formContext = useContext(FieldContext);
-  var columnProps = props.columnProps,
-    prefixName = props.prefixName,
-    text = props.text,
-    counter = props.counter,
-    rowData = props.rowData,
-    index = props.index,
-    recordKey = props.recordKey,
-    subName = props.subName,
-    proFieldProps = props.proFieldProps,
-    editableUtils = props.editableUtils;
-  var editableForm = ProForm.useFormInstance();
-  var key = recordKey || index;
-  var realIndex = useMemo(function () {
-    var _editableUtils$getRea, _editableUtils$getRea2;
-    return (_editableUtils$getRea = editableUtils === null || editableUtils === void 0 || (_editableUtils$getRea2 = editableUtils.getRealIndex) === null || _editableUtils$getRea2 === void 0 ? void 0 : _editableUtils$getRea2.call(editableUtils, rowData)) !== null && _editableUtils$getRea !== void 0 ? _editableUtils$getRea : index;
-  }, [editableUtils, index, rowData]);
-  var _useState = useState(function () {
-      var _ref, _columnProps$key;
-      return spellNamePath(prefixName, prefixName ? subName : [], prefixName ? realIndex : key, (_ref = (_columnProps$key = columnProps === null || columnProps === void 0 ? void 0 : columnProps.key) !== null && _columnProps$key !== void 0 ? _columnProps$key : columnProps === null || columnProps === void 0 ? void 0 : columnProps.dataIndex) !== null && _ref !== void 0 ? _ref : index);
-    }),
-    _useState2 = _slicedToArray(_useState, 2),
-    formItemName = _useState2[0],
-    setName = _useState2[1];
-  var rowName = useMemo(function () {
+const CellRenderFromItem = props => {
+  const formContext = useContext(FieldContext);
+  const {
+    columnProps,
+    prefixName,
+    text,
+    counter,
+    rowData,
+    index,
+    recordKey,
+    subName,
+    proFieldProps,
+    editableUtils
+  } = props;
+  const editableForm = ProForm.useFormInstance();
+  const key = recordKey || index;
+  const realIndex = useMemo(() => editableUtils?.getRealIndex?.(rowData) ?? index, [editableUtils, index, rowData]);
+  const [formItemName, setName] = useState(() => spellNamePath(prefixName, prefixName ? subName : [], prefixName ? realIndex : key, columnProps?.key ?? columnProps?.dataIndex ?? index));
+  const rowName = useMemo(() => {
     return formItemName.slice(0, -1);
   }, [formItemName]);
-  useEffect(function () {
-    var _ref2, _columnProps$key2;
-    var value = spellNamePath(prefixName, prefixName ? subName : [], prefixName ? realIndex : key, (_ref2 = (_columnProps$key2 = columnProps === null || columnProps === void 0 ? void 0 : columnProps.key) !== null && _columnProps$key2 !== void 0 ? _columnProps$key2 : columnProps === null || columnProps === void 0 ? void 0 : columnProps.dataIndex) !== null && _ref2 !== void 0 ? _ref2 : index);
+  useEffect(() => {
+    const value = spellNamePath(prefixName, prefixName ? subName : [], prefixName ? realIndex : key, columnProps?.key ?? columnProps?.dataIndex ?? index);
     if (value.join('-') !== formItemName.join('-')) setName(value);
-  }, [columnProps === null || columnProps === void 0 ? void 0 : columnProps.dataIndex, columnProps === null || columnProps === void 0 ? void 0 : columnProps.key, index, recordKey, prefixName, key, subName, formItemName, realIndex]);
-  var needProps = useMemo(function () {
-    return [editableForm, _objectSpread(_objectSpread({}, columnProps), {}, {
-      rowKey: rowName,
-      rowIndex: index,
-      isEditable: true
-    })];
-  }, [columnProps, editableForm, index, rowName]);
-  var InlineItem = useCallback(function (_ref3) {
-    var children = _ref3.children,
-      restProps = _objectWithoutProperties(_ref3, _excluded);
-    return /*#__PURE__*/_jsx(InlineErrorFormItem, _objectSpread(_objectSpread({
-      popoverProps: {
-        getPopupContainer: formContext.getPopupContainer || function () {
-          return counter.rootDomRef.current || document.body;
-        }
-      },
-      errorType: "popover",
-      name: formItemName
-    }, restProps), {}, {
-      children: children
-    }), key);
-  },
+  }, [columnProps?.dataIndex, columnProps?.key, index, recordKey, prefixName, key, subName, formItemName, realIndex]);
+  const needProps = useMemo(() => [editableForm, {
+    ...columnProps,
+    rowKey: rowName,
+    rowIndex: index,
+    isEditable: true
+  }], [columnProps, editableForm, index, rowName]);
+  const InlineItem = useCallback(({
+    children,
+    ...restProps
+  }) => /*#__PURE__*/_jsx(InlineErrorFormItem, {
+    popoverProps: {
+      getPopupContainer: formContext.getPopupContainer || (() => counter.rootDomRef.current || document.body)
+    },
+    errorType: "popover",
+    name: formItemName,
+    ...restProps,
+    children: children
+  }, key),
   // eslint-disable-next-line react-hooks/exhaustive-deps
   [key, formItemName]);
-  var generateFormItem = useCallback(function () {
-    var _ref4, _ref5;
-    var formItemProps = _objectSpread({}, getFieldPropsOrFormItemProps.apply(void 0, [columnProps === null || columnProps === void 0 ? void 0 : columnProps.formItemProps].concat(_toConsumableArray(needProps))));
-    formItemProps.messageVariables = _objectSpread({
-      label: (columnProps === null || columnProps === void 0 ? void 0 : columnProps.title) || '此项',
-      type: (columnProps === null || columnProps === void 0 ? void 0 : columnProps.valueType) || '文本'
-    }, formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.messageVariables);
-    formItemProps.initialValue = (_ref4 = (_ref5 = prefixName ? null : text) !== null && _ref5 !== void 0 ? _ref5 : formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.initialValue) !== null && _ref4 !== void 0 ? _ref4 : columnProps === null || columnProps === void 0 ? void 0 : columnProps.initialValue;
-    var fieldDom = /*#__PURE__*/_jsx(ProFormField, _objectSpread({
+  const generateFormItem = useCallback(() => {
+    const formItemProps = {
+      ...getFieldPropsOrFormItemProps(columnProps?.formItemProps, ...needProps)
+    };
+    formItemProps.messageVariables = {
+      label: columnProps?.title || '此项',
+      type: columnProps?.valueType || '文本',
+      ...formItemProps?.messageVariables
+    };
+    formItemProps.initialValue = (prefixName ? null : text) ?? formItemProps?.initialValue ?? columnProps?.initialValue;
+    let fieldDom = /*#__PURE__*/_jsx(ProFormField, {
       cacheForSwr: true,
       name: formItemName,
       proFormFieldKey: key,
       ignoreFormItem: true,
-      fieldProps: getFieldPropsOrFormItemProps.apply(void 0, [columnProps === null || columnProps === void 0 ? void 0 : columnProps.fieldProps].concat(_toConsumableArray(needProps)))
-    }, proFieldProps), formItemName.join('-'));
+      fieldProps: getFieldPropsOrFormItemProps(columnProps?.fieldProps, ...needProps),
+      ...proFieldProps
+    }, formItemName.join('-'));
     /**
      * 如果没有自定义直接返回
      */
-    if (columnProps !== null && columnProps !== void 0 && columnProps.formItemRender) {
-      fieldDom = columnProps.formItemRender(_objectSpread(_objectSpread({}, columnProps), {}, {
-        index: index,
+    if (columnProps?.formItemRender) {
+      fieldDom = columnProps.formItemRender({
+        ...columnProps,
+        index,
         isEditable: true,
         type: 'table'
-      }), {
-        defaultRender: function defaultRender() {
-          return /*#__PURE__*/_jsx(_Fragment, {
-            children: fieldDom
-          });
-        },
+      }, {
+        defaultRender: () => /*#__PURE__*/_jsx(_Fragment, {
+          children: fieldDom
+        }),
         type: 'form',
-        recordKey: recordKey,
-        record: _objectSpread(_objectSpread({}, rowData), editableForm === null || editableForm === void 0 ? void 0 : editableForm.getFieldValue([key])),
+        recordKey,
+        record: {
+          ...rowData,
+          ...editableForm?.getFieldValue([key])
+        },
         isEditable: true
       }, editableForm, props.editableUtils);
       // 如果需要完全自定义可以不要name
@@ -124,26 +107,25 @@ var CellRenderFromItem = function CellRenderFromItem(props) {
         children: fieldDom
       });
     }
-    return /*#__PURE__*/_jsx(InlineItem, _objectSpread(_objectSpread({}, formItemProps), {}, {
+    return /*#__PURE__*/_jsx(InlineItem, {
+      ...formItemProps,
       children: fieldDom
-    }), formItemName.join('-'));
+    }, formItemName.join('-'));
   }, [columnProps, needProps, prefixName, text, key, formItemName, proFieldProps, InlineItem, index, recordKey, rowData, editableForm, props.editableUtils]);
   if (formItemName.length === 0) return null;
-  if (typeof (columnProps === null || columnProps === void 0 ? void 0 : columnProps.formItemRender) === 'function' || typeof (columnProps === null || columnProps === void 0 ? void 0 : columnProps.fieldProps) === 'function' || typeof (columnProps === null || columnProps === void 0 ? void 0 : columnProps.formItemProps) === 'function') {
+  if (typeof columnProps?.formItemRender === 'function' || typeof columnProps?.fieldProps === 'function' || typeof columnProps?.formItemProps === 'function') {
     return /*#__PURE__*/_jsx(Form.Item, {
       noStyle: true,
-      shouldUpdate: function shouldUpdate(pre, next) {
+      shouldUpdate: (pre, next) => {
         if (pre === next) return false;
-        var shouldName = [rowName].flat(1);
+        const shouldName = [rowName].flat(1);
         try {
           return JSON.stringify(get(pre, shouldName)) !== JSON.stringify(get(next, shouldName));
         } catch (error) {
           return true;
         }
       },
-      children: function children() {
-        return generateFormItem();
-      }
+      children: () => generateFormItem()
     });
   }
   return generateFormItem();
@@ -156,38 +138,40 @@ var CellRenderFromItem = function CellRenderFromItem(props) {
  * @param valueType
  */
 function cellRenderToFromItem(config) {
-  var _columnProps$dataInde, _config$recordKey;
-  var text = config.text,
-    valueType = config.valueType,
-    rowData = config.rowData,
-    columnProps = config.columnProps,
-    index = config.index;
+  const {
+    text,
+    valueType,
+    rowData,
+    columnProps,
+    index
+  } = config;
 
   // 如果 valueType === text ，没必要多走一次 render
   if ((!valueType || ['textarea', 'text'].includes(valueType.toString())) &&
   // valueEnum 存在说明是个select
-  !(columnProps !== null && columnProps !== void 0 && columnProps.valueEnum) && config.mode === 'read') {
+  !columnProps?.valueEnum && config.mode === 'read') {
     // 如果是''、null、undefined 显示columnEmptyText
     return SHOW_EMPTY_TEXT_LIST.includes(text) ? config.columnEmptyText : text;
   }
   if (typeof valueType === 'function' && rowData) {
     // 防止valueType是函数,并且text是''、null、undefined跳过显式设置的columnEmptyText
-    return cellRenderToFromItem(_objectSpread(_objectSpread({}, config), {}, {
+    return cellRenderToFromItem({
+      ...config,
       valueType: valueType(rowData, config.type) || 'text'
-    }));
+    });
   }
-  var columnKey = (columnProps === null || columnProps === void 0 ? void 0 : columnProps.key) || (columnProps === null || columnProps === void 0 || (_columnProps$dataInde = columnProps.dataIndex) === null || _columnProps$dataInde === void 0 ? void 0 : _columnProps$dataInde.toString());
-  var dependencies = columnProps !== null && columnProps !== void 0 && columnProps.dependencies ? [config.prefixName, config.prefixName ? index === null || index === void 0 ? void 0 : index.toString() : (_config$recordKey = config.recordKey) === null || _config$recordKey === void 0 ? void 0 : _config$recordKey.toString(), columnProps === null || columnProps === void 0 ? void 0 : columnProps.dependencies].filter(Boolean).flat(1) : [];
+  const columnKey = columnProps?.key || columnProps?.dataIndex?.toString();
+  const dependencies = columnProps?.dependencies ? [config.prefixName, config.prefixName ? index?.toString() : config.recordKey?.toString(), columnProps?.dependencies].filter(Boolean).flat(1) : [];
   /**
    * 生成公用的 proField dom 配置
    */
-  var proFieldProps = {
-    valueEnum: runFunction(columnProps === null || columnProps === void 0 ? void 0 : columnProps.valueEnum, rowData),
-    request: columnProps === null || columnProps === void 0 ? void 0 : columnProps.request,
-    dependencies: columnProps !== null && columnProps !== void 0 && columnProps.dependencies ? [dependencies] : undefined,
-    originDependencies: columnProps !== null && columnProps !== void 0 && columnProps.dependencies ? [columnProps === null || columnProps === void 0 ? void 0 : columnProps.dependencies] : undefined,
-    params: runFunction(columnProps === null || columnProps === void 0 ? void 0 : columnProps.params, rowData, columnProps),
-    readonly: columnProps === null || columnProps === void 0 ? void 0 : columnProps.readonly,
+  const proFieldProps = {
+    valueEnum: runFunction(columnProps?.valueEnum, rowData),
+    request: columnProps?.request,
+    dependencies: columnProps?.dependencies ? [dependencies] : undefined,
+    originDependencies: columnProps?.dependencies ? [columnProps?.dependencies] : undefined,
+    params: runFunction(columnProps?.params, rowData, columnProps),
+    readonly: columnProps?.readonly,
     text: valueType === 'index' || valueType === 'indexBorder' ? config.index : text,
     mode: config.mode,
     formItemRender: undefined,
@@ -196,20 +180,22 @@ function cellRenderToFromItem(config) {
     record: rowData,
     proFieldProps: {
       emptyText: config.columnEmptyText,
-      proFieldKey: columnKey ? "table-field-".concat(columnKey) : undefined
+      proFieldKey: columnKey ? `table-field-${columnKey}` : undefined
     }
   };
 
   /** 只读模式直接返回就好了，不需要处理 formItem */
   if (config.mode !== 'edit') {
-    return /*#__PURE__*/_jsx(ProFormField, _objectSpread({
+    return /*#__PURE__*/_jsx(ProFormField, {
       mode: "read",
       ignoreFormItem: true,
-      fieldProps: getFieldPropsOrFormItemProps(columnProps === null || columnProps === void 0 ? void 0 : columnProps.fieldProps, null, columnProps)
-    }, proFieldProps));
+      fieldProps: getFieldPropsOrFormItemProps(columnProps?.fieldProps, null, columnProps),
+      ...proFieldProps
+    });
   }
-  return /*#__PURE__*/_jsx(CellRenderFromItem, _objectSpread(_objectSpread({}, config), {}, {
+  return /*#__PURE__*/_jsx(CellRenderFromItem, {
+    ...config,
     proFieldProps: proFieldProps
-  }), config.recordKey);
+  }, config.recordKey);
 }
 export default cellRenderToFromItem;

package/es/table/utils/columnRender.js

@@ -1,5 +1,3 @@
-import _typeof from "@babel/runtime/helpers/esm/typeof";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { get } from '@rc-component/util';
 import React from 'react';
 import { isMergeCell } from '.';
@@ -13,10 +11,11 @@ import { jsx as _jsx } from "react/jsx-runtime";
  *
  * @param item
  */
-export var renderColumnsTitle = function renderColumnsTitle(item) {
-  var _item$ellipsis;
-  var title = item.title;
-  var ellipsis = typeof (item === null || item === void 0 ? void 0 : item.ellipsis) === 'boolean' ? item === null || item === void 0 ? void 0 : item.ellipsis : item === null || item === void 0 || (_item$ellipsis = item.ellipsis) === null || _item$ellipsis === void 0 ? void 0 : _item$ellipsis.showTitle;
+export const renderColumnsTitle = item => {
+  const {
+    title
+  } = item;
+  const ellipsis = typeof item?.ellipsis === 'boolean' ? item?.ellipsis : item?.ellipsis?.showTitle;
   if (title && typeof title === 'function') {
     return title(item, 'table', /*#__PURE__*/_jsx(LabelIconTip, {
       label: null,
@@ -35,7 +34,7 @@ function isNotEditableCell(text, rowData, index, editable) {
   if (typeof editable === 'boolean') {
     return editable === false;
   }
-  return (editable === null || editable === void 0 ? void 0 : editable(text, rowData, index)) === false;
+  return editable?.(text, rowData, index) === false;
 }
 
 /**
@@ -46,9 +45,9 @@ function isNotEditableCell(text, rowData, index, editable) {
  * @param dataIndex
  * @returns
  */
-export var defaultOnFilter = function defaultOnFilter(value, record, dataIndex) {
-  var recordElement = Array.isArray(dataIndex) ? get(record, dataIndex) : record[dataIndex];
-  var itemValue = String(recordElement);
+export const defaultOnFilter = (value, record, dataIndex) => {
+  const recordElement = Array.isArray(dataIndex) ? get(record, dataIndex) : record[dataIndex];
+  const itemValue = String(recordElement);
   return String(itemValue) === String(value);
 };
 
@@ -57,51 +56,56 @@ export var defaultOnFilter = function defaultOnFilter(value, record, dataIndex)
  *
  * @param param0
  */
-export function columnRender(_ref) {
-  var columnProps = _ref.columnProps,
-    text = _ref.text,
-    rowData = _ref.rowData,
-    index = _ref.index,
-    columnEmptyText = _ref.columnEmptyText,
-    counter = _ref.counter,
-    type = _ref.type,
-    subName = _ref.subName,
-    marginSM = _ref.marginSM,
-    editableUtils = _ref.editableUtils;
-  var action = counter.action,
-    prefixName = counter.prefixName;
-  var _editableUtils$isEdit = editableUtils.isEditable(_objectSpread(_objectSpread({}, rowData), {}, {
-      index: index
-    })),
-    isEditable = _editableUtils$isEdit.isEditable,
-    recordKey = _editableUtils$isEdit.recordKey;
-  var _columnProps$renderTe = columnProps.renderText,
-    renderText = _columnProps$renderTe === void 0 ? function (val) {
-      return val;
-    } : _columnProps$renderTe;
-  var renderTextStr = renderText(text, rowData, index, action);
-  var mode = isEditable && !isNotEditableCell(text, rowData, index, columnProps === null || columnProps === void 0 ? void 0 : columnProps.editable) ? 'edit' : 'read';
-  var textDom = cellRenderToFromItem({
+export function columnRender({
+  columnProps,
+  text,
+  rowData,
+  index,
+  columnEmptyText,
+  counter,
+  type,
+  subName,
+  marginSM,
+  editableUtils
+}) {
+  const {
+    action,
+    prefixName
+  } = counter;
+  const {
+    isEditable,
+    recordKey
+  } = editableUtils.isEditable({
+    ...rowData,
+    index
+  });
+  const {
+    renderText = val => val
+  } = columnProps;
+  const renderTextStr = renderText(text, rowData, index, action);
+  const mode = isEditable && !isNotEditableCell(text, rowData, index, columnProps?.editable) ? 'edit' : 'read';
+  const textDom = cellRenderToFromItem({
     text: renderTextStr,
     valueType: columnProps.valueType || 'text',
-    index: index,
-    rowData: rowData,
-    subName: subName,
-    columnProps: _objectSpread(_objectSpread({}, columnProps), {}, {
+    index,
+    rowData,
+    subName,
+    columnProps: {
+      ...columnProps,
       // 为了兼容性，原来写了个错别字
       // @ts-ignore
       entry: rowData,
       entity: rowData
-    }),
-    counter: counter,
-    columnEmptyText: columnEmptyText,
-    type: type,
-    recordKey: recordKey,
-    mode: mode,
-    prefixName: prefixName,
-    editableUtils: editableUtils
+    },
+    counter,
+    columnEmptyText,
+    type,
+    recordKey,
+    mode,
+    prefixName,
+    editableUtils
   });
-  var dom = mode === 'edit' ? textDom : genCopyable(textDom, columnProps, renderTextStr);
+  const dom = mode === 'edit' ? textDom : genCopyable(textDom, columnProps, renderTextStr);
 
   /** 如果是编辑模式，并且 formItemRender 存在直接走 formItemRender */
   if (mode === 'edit') {
@@ -113,21 +117,26 @@ export function columnRender(_ref) {
           gap: marginSM,
           justifyContent: columnProps.align === 'center' ? 'center' : 'flex-start'
         },
-        children: editableUtils.actionRender(_objectSpread(_objectSpread({}, rowData), {}, {
+        children: editableUtils.actionRender({
+          ...rowData,
           index: columnProps.index || index
-        }))
+        })
       });
     }
     return dom;
   }
   if (!columnProps.render) {
-    var isReactRenderNode = /*#__PURE__*/React.isValidElement(dom) || ['string', 'number'].includes(_typeof(dom));
+    const isReactRenderNode = /*#__PURE__*/React.isValidElement(dom) || ['string', 'number'].includes(typeof dom);
     return !isNil(dom) && isReactRenderNode ? dom : null;
   }
-  var renderDom = columnProps.render(dom, rowData, index, _objectSpread(_objectSpread({}, action), editableUtils), _objectSpread(_objectSpread({}, columnProps), {}, {
-    isEditable: isEditable,
+  const renderDom = columnProps.render(dom, rowData, index, {
+    ...action,
+    ...editableUtils
+  }, {
+    ...columnProps,
+    isEditable,
     type: 'table'
-  }));
+  });
 
   // 如果是合并单元格的，直接返回对象
   if (isMergeCell(renderDom)) {

package/es/table/utils/columnSort.js

@@ -1,23 +1,23 @@
-export var columnSort = function columnSort(columnsMap) {
-  return function (a, b) {
-    var _columnsMap$aKey, _columnsMap$bKey;
-    var aFixed = a.fixed,
-      aIndex = a.index;
-    var bFixed = b.fixed,
-      bIndex = b.index;
-    if (aFixed === 'left' && bFixed !== 'left' || bFixed === 'right' && aFixed !== 'right') {
-      return -2;
-    }
-    if (bFixed === 'left' && aFixed !== 'left' || aFixed === 'right' && bFixed !== 'right') {
-      return 2;
-    }
-    // 如果没有index，在 dataIndex 或者 key 不存在的时候他会报错
-    var aKey = a.key || "".concat(aIndex);
-    var bKey = b.key || "".concat(bIndex);
-    if ((_columnsMap$aKey = columnsMap[aKey]) !== null && _columnsMap$aKey !== void 0 && _columnsMap$aKey.order || (_columnsMap$bKey = columnsMap[bKey]) !== null && _columnsMap$bKey !== void 0 && _columnsMap$bKey.order) {
-      var _columnsMap$aKey2, _columnsMap$bKey2;
-      return (((_columnsMap$aKey2 = columnsMap[aKey]) === null || _columnsMap$aKey2 === void 0 ? void 0 : _columnsMap$aKey2.order) || 0) - (((_columnsMap$bKey2 = columnsMap[bKey]) === null || _columnsMap$bKey2 === void 0 ? void 0 : _columnsMap$bKey2.order) || 0);
-    }
-    return (a.index || 0) - (b.index || 0);
-  };
+export const columnSort = columnsMap => (a, b) => {
+  const {
+    fixed: aFixed,
+    index: aIndex
+  } = a;
+  const {
+    fixed: bFixed,
+    index: bIndex
+  } = b;
+  if (aFixed === 'left' && bFixed !== 'left' || bFixed === 'right' && aFixed !== 'right') {
+    return -2;
+  }
+  if (bFixed === 'left' && aFixed !== 'left' || aFixed === 'right' && bFixed !== 'right') {
+    return 2;
+  }
+  // 如果没有index，在 dataIndex 或者 key 不存在的时候他会报错
+  const aKey = a.key || `${aIndex}`;
+  const bKey = b.key || `${bIndex}`;
+  if (columnsMap?.[aKey]?.order || columnsMap?.[bKey]?.order) {
+    return (columnsMap?.[aKey]?.order || 0) - (columnsMap?.[bKey]?.order || 0);
+  }
+  return (a.index || 0) - (b.index || 0);
 };

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

@@ -8,23 +8,27 @@ import type { FilterValue, ProColumns } from '../typing';
 type ColumnToColumnReturnType<T> = (TableColumnType<T> & {
     index?: number;
 })[];
-type ColumnToColumnParams<T> = {
-    columns: ProColumns<T, any>[];
+export type TableColumnContext<T> = {
     counter: ReturnType<ContainerType>;
     columnEmptyText: ProFieldEmptyText;
     type: ProSchemaComponentTypes;
     editableUtils: UseEditableUtilType;
+    marginSM: number;
+    rowKey: TableProps<T>['rowKey'];
+    childrenColumnName: string;
     proFilter: Record<string, FilterValue>;
     proSort: Record<string, SortOrder>;
-} & Pick<TableProps<T>, 'rowKey' | 'childrenColumnName'>;
+};
 /**
  * 转化 columns 到 pro 的格式 主要是 render 方法的自行实现
  *
- * @param columns
- * @param map
- * @param columnEmptyText
+ * @param params.columns 列配置
+ * @param params.context 列计算上下文（表级配置与状态）
+ * @param params.parents 父列，递归子列时传入
  */
-export declare function genProColumnToColumn<T extends AnyObject>(params: ColumnToColumnParams<T> & {
-    marginSM: number;
-}, parents?: ProColumns<T, any>): ColumnToColumnReturnType<T>;
+export declare function genProColumnToColumn<T extends AnyObject>(params: {
+    columns: ProColumns<T, any>[];
+    context: TableColumnContext<T>;
+    parents?: ProColumns<T, any>;
+}): ColumnToColumnReturnType<T>;
 export {};