@ant-design/pro-components 3.0.0-beta.1 → 3.0.0-beta.3

package/es/table/utils/columnRender.js

@@ -1,147 +1,148 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-
-// src/table/utils/columnRender.tsx
-import get from "rc-util/lib/utils/get";
-import React from "react";
-import { isMergeCell } from ".";
+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 '.';
 import { LabelIconTip, genCopyable, isNil } from "../../utils";
 import cellRenderToFromItem from "./cellRenderToFromItem";
-var renderColumnsTitle = (item) => {
-  var _a;
-  const { title } = item;
-  const ellipsis = typeof (item == null ? void 0 : item.ellipsis) === "boolean" ? item == null ? void 0 : item.ellipsis : (_a = item == null ? void 0 : item.ellipsis) == null ? void 0 : _a.showTitle;
-  if (title && typeof title === "function") {
-    return title(
-      item,
-      "table",
-      /* @__PURE__ */ React.createElement(LabelIconTip, { label: null, tooltip: item.tooltip })
-    );
+
+/** 转化列的定义 */
+import { jsx as _jsx } from "react/jsx-runtime";
+/**
+ * 增加了 icon 的功能 render title
+ *
+ * @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;
+  if (title && typeof title === 'function') {
+    return title(item, 'table', /*#__PURE__*/_jsx(LabelIconTip, {
+      label: null,
+      tooltip: item.tooltip
+    }));
   }
-  return /* @__PURE__ */ React.createElement(LabelIconTip, { label: title, tooltip: item.tooltip, ellipsis });
+  return /*#__PURE__*/_jsx(LabelIconTip, {
+    label: title,
+    tooltip: item.tooltip,
+    ellipsis: ellipsis
+  });
 };
+
+/** 判断是否为不可编辑的单元格 */
 function isNotEditableCell(text, rowData, index, editable) {
-  if (typeof editable === "boolean") {
+  if (typeof editable === 'boolean') {
     return editable === false;
   }
-  return (editable == null ? void 0 : editable(text, rowData, index)) === false;
+  return (editable === null || editable === void 0 ? void 0 : editable(text, rowData, index)) === false;
 }
-var defaultOnFilter = (value, record, dataIndex) => {
-  const recordElement = Array.isArray(dataIndex) ? get(record, dataIndex) : record[dataIndex];
-  const itemValue = String(recordElement);
+
+/**
+ * 默认的 filter 方法
+ *
+ * @param value
+ * @param record
+ * @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);
   return String(itemValue) === String(value);
 };
-function columnRender({
-  columnProps,
-  text,
-  rowData,
-  index,
-  columnEmptyText,
-  counter,
-  type,
-  subName,
-  marginSM,
-  editableUtils
-}) {
-  const { action, prefixName } = counter;
-  const { isEditable, recordKey } = editableUtils.isEditable(__spreadProps(__spreadValues({}, rowData), {
-    index
-  }));
-  const { renderText = (val) => val } = columnProps;
-  const renderTextStr = renderText(text, rowData, index, action);
-  const mode = isEditable && !isNotEditableCell(text, rowData, index, columnProps == null ? void 0 : columnProps.editable) ? "edit" : "read";
-  const textDom = cellRenderToFromItem({
+
+/**
+ * 这个组件负责单元格的具体渲染
+ *
+ * @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({
     text: renderTextStr,
-    valueType: columnProps.valueType || "text",
-    index,
-    rowData,
-    subName,
-    columnProps: __spreadProps(__spreadValues({}, columnProps), {
+    valueType: columnProps.valueType || 'text',
+    index: index,
+    rowData: rowData,
+    subName: subName,
+    columnProps: _objectSpread(_objectSpread({}, columnProps), {}, {
       // 为了兼容性，原来写了个错别字
       // @ts-ignore
       entry: rowData,
       entity: rowData
     }),
-    counter,
-    columnEmptyText,
-    type,
-    recordKey,
-    mode,
-    prefixName,
-    editableUtils
+    counter: counter,
+    columnEmptyText: columnEmptyText,
+    type: type,
+    recordKey: recordKey,
+    mode: mode,
+    prefixName: prefixName,
+    editableUtils: editableUtils
   });
-  const dom = mode === "edit" ? textDom : genCopyable(textDom, columnProps, renderTextStr);
-  if (mode === "edit") {
-    if (columnProps.valueType === "option") {
-      return /* @__PURE__ */ React.createElement(
-        "div",
-        {
-          style: {
-            display: "flex",
-            alignItems: "center",
-            gap: marginSM,
-            justifyContent: columnProps.align === "center" ? "center" : "flex-start"
-          }
+  var dom = mode === 'edit' ? textDom : genCopyable(textDom, columnProps, renderTextStr);
+
+  /** 如果是编辑模式，并且 formItemRender 存在直接走 formItemRender */
+  if (mode === 'edit') {
+    if (columnProps.valueType === 'option') {
+      return /*#__PURE__*/_jsx("div", {
+        style: {
+          display: 'flex',
+          alignItems: 'center',
+          gap: marginSM,
+          justifyContent: columnProps.align === 'center' ? 'center' : 'flex-start'
         },
-        editableUtils.actionRender(__spreadProps(__spreadValues({}, rowData), {
+        children: editableUtils.actionRender(_objectSpread(_objectSpread({}, rowData), {}, {
           index: columnProps.index || index
         }))
-      );
+      });
     }
     return dom;
   }
   if (!columnProps.render) {
-    const isReactRenderNode = React.isValidElement(dom) || ["string", "number"].includes(typeof dom);
+    var isReactRenderNode = /*#__PURE__*/React.isValidElement(dom) || ['string', 'number'].includes(_typeof(dom));
     return !isNil(dom) && isReactRenderNode ? dom : null;
   }
-  const renderDom = columnProps.render(
-    dom,
-    rowData,
-    index,
-    __spreadValues(__spreadValues({}, action), editableUtils),
-    __spreadProps(__spreadValues({}, columnProps), {
-      isEditable,
-      type: "table"
-    })
-  );
+  var renderDom = columnProps.render(dom, rowData, index, _objectSpread(_objectSpread({}, action), editableUtils), _objectSpread(_objectSpread({}, columnProps), {}, {
+    isEditable: isEditable,
+    type: 'table'
+  }));
+
+  // 如果是合并单元格的，直接返回对象
   if (isMergeCell(renderDom)) {
     return renderDom;
   }
-  if (renderDom && columnProps.valueType === "option" && Array.isArray(renderDom)) {
-    return /* @__PURE__ */ React.createElement(
-      "div",
-      {
-        style: {
-          display: "flex",
-          alignItems: "center",
-          justifyContent: "flex-start",
-          gap: 8
-        }
+  if (renderDom && columnProps.valueType === 'option' && Array.isArray(renderDom)) {
+    return /*#__PURE__*/_jsx("div", {
+      style: {
+        display: 'flex',
+        alignItems: 'center',
+        justifyContent: 'flex-start',
+        gap: 8
       },
-      renderDom
-    );
+      children: renderDom
+    });
   }
   return renderDom;
-}
-export {
-  columnRender,
-  defaultOnFilter,
-  renderColumnsTitle
-};
+}

package/es/table/utils/columnSort.js

@@ -1,21 +1,23 @@
-// src/table/utils/columnSort.ts
-var columnSort = (columnsMap) => (a, b) => {
-  var _a, _b, _c, _d;
-  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;
-  }
-  const aKey = a.key || `${aIndex}`;
-  const bKey = b.key || `${bIndex}`;
-  if (((_a = columnsMap[aKey]) == null ? void 0 : _a.order) || ((_b = columnsMap[bKey]) == null ? void 0 : _b.order)) {
-    return (((_c = columnsMap[aKey]) == null ? void 0 : _c.order) || 0) - (((_d = columnsMap[bKey]) == null ? void 0 : _d.order) || 0);
-  }
-  return (a.index || 0) - (b.index || 0);
-};
-export {
-  columnSort
-};
+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);
+  };
+};

package/es/table/utils/genProColumnToColumn.js

@@ -1,157 +1,129 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
-
-// src/table/utils/genProColumnToColumn.tsx
-import { Table } from "antd";
+import _typeof from "@babel/runtime/helpers/esm/typeof";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import { Table } from 'antd';
 import { proFieldParsingValueEnumToArray } from "../../field";
-import {
-  omitBoolean,
-  omitUndefinedAndEmptyArr,
-  runFunction
-} from "../../utils";
-import {
-  columnRender,
-  defaultOnFilter,
-  renderColumnsTitle
-} from "./columnRender";
+import { omitBoolean, omitUndefinedAndEmptyArr, runFunction } from "../../utils";
+import { columnRender, defaultOnFilter, renderColumnsTitle } from "./columnRender";
 import { genColumnKey } from "./index";
-function genProColumnToColumn(params, parents) {
-  var _a;
-  const {
-    columns,
-    counter,
-    columnEmptyText,
-    type,
-    editableUtils,
-    marginSM,
-    rowKey = "id",
-    childrenColumnName = "children",
-    proFilter = {},
-    proSort
-  } = params;
-  const subNameRecord = /* @__PURE__ */ new Map();
-  return (_a = columns == null ? void 0 : columns.map((columnProps, columnsIndex) => {
-    if (columnProps === Table.EXPAND_COLUMN)
-      return columnProps;
-    if (columnProps === Table.SELECTION_COLUMN)
-      return columnProps;
-    const {
-      key,
-      dataIndex,
-      valueEnum,
-      valueType = "text",
-      children,
-      onFilter,
-      filters = [],
-      sorter,
-      filteredValue: columnFilteredValue
-    } = columnProps;
-    const columnKey = genColumnKey(
-      key || (dataIndex == null ? void 0 : dataIndex.toString()),
-      [parents == null ? void 0 : parents.key, columnsIndex].filter(Boolean).join("-")
-    );
-    const noNeedPro = !valueEnum && !valueType && !children;
+/**
+ * 转化 columns 到 pro 的格式 主要是 render 方法的自行实现
+ *
+ * @param columns
+ * @param map
+ * @param columnEmptyText
+ */
+export function genProColumnToColumn(params, parents) {
+  var _columns$map;
+  var columns = params.columns,
+    counter = params.counter,
+    columnEmptyText = params.columnEmptyText,
+    type = params.type,
+    editableUtils = params.editableUtils,
+    marginSM = params.marginSM,
+    _params$rowKey = params.rowKey,
+    rowKey = _params$rowKey === void 0 ? 'id' : _params$rowKey,
+    _params$childrenColum = params.childrenColumnName,
+    childrenColumnName = _params$childrenColum === void 0 ? 'children' : _params$childrenColum,
+    _params$proFilter = params.proFilter,
+    proFilter = _params$proFilter === void 0 ? {} : _params$proFilter,
+    proSort = params.proSort;
+  var subNameRecord = new Map();
+  return columns === null || columns === void 0 || (_columns$map = columns.map(function (columnProps, columnsIndex) {
+    if (columnProps === Table.EXPAND_COLUMN) return columnProps;
+    if (columnProps === Table.SELECTION_COLUMN) return columnProps;
+    var _ref = columnProps,
+      key = _ref.key,
+      dataIndex = _ref.dataIndex,
+      valueEnum = _ref.valueEnum,
+      _ref$valueType = _ref.valueType,
+      valueType = _ref$valueType === void 0 ? 'text' : _ref$valueType,
+      children = _ref.children,
+      onFilter = _ref.onFilter,
+      _ref$filters = _ref.filters,
+      filters = _ref$filters === void 0 ? [] : _ref$filters,
+      sorter = _ref.sorter,
+      columnFilteredValue = _ref.filteredValue;
+    var columnKey = genColumnKey(key || (dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.toString()), [parents === null || parents === void 0 ? void 0 : parents.key, columnsIndex].filter(Boolean).join('-'));
+    // 这些都没有，说明是普通的表格不需要 pro 管理
+    var noNeedPro = !valueEnum && !valueType && !children;
     if (noNeedPro) {
-      return __spreadValues({
+      return _objectSpread({
         index: columnsIndex
       }, columnProps);
     }
-    const config = counter.columnsMap[columnKey] || {
+    var config = counter.columnsMap[columnKey] || {
       fixed: columnProps.fixed
     };
-    const genOnFilter = () => {
+    var genOnFilter = function genOnFilter() {
       if (onFilter === true) {
-        return (value, row) => defaultOnFilter(value, row, dataIndex);
+        return function (value, row) {
+          return defaultOnFilter(value, row, dataIndex);
+        };
       }
       return omitBoolean(onFilter);
     };
-    const filteredValue = columnKey && (proFilter == null ? void 0 : proFilter[columnKey]) !== void 0 ? proFilter == null ? void 0 : proFilter[columnKey] : null;
-    const sortOrder = columnKey && proSort[columnKey] !== void 0 ? proSort[columnKey] : null;
-    let keyName = rowKey;
-    const tempColumns = __spreadProps(__spreadValues({
+
+    // 对应筛选值，用作双向绑定
+    var filteredValue = columnKey && (proFilter === null || proFilter === void 0 ? void 0 : proFilter[columnKey]) !== undefined ? proFilter === null || proFilter === void 0 ? void 0 : proFilter[columnKey] : null;
+    // 对应排序值，用作双向绑定
+    var sortOrder = columnKey && proSort[columnKey] !== undefined ? proSort[columnKey] : null;
+    var keyName = rowKey;
+    var tempColumns = _objectSpread(_objectSpread({
       index: columnsIndex,
       key: columnKey
-    }, columnProps), {
+    }, columnProps), {}, {
       title: renderColumnsTitle(columnProps),
-      valueEnum,
-      filters: filters === true ? proFieldParsingValueEnumToArray(
-        runFunction(valueEnum, void 0)
-      ).filter((valueItem) => valueItem && valueItem.value !== "all") : filters,
+      valueEnum: valueEnum,
+      filters: filters === true ? proFieldParsingValueEnumToArray(runFunction(valueEnum, undefined)).filter(function (valueItem) {
+        return valueItem && valueItem.value !== 'all';
+      }) : filters,
       onFilter: genOnFilter(),
-      filteredValue: (
-        // 优先使用用户明确设置的 filteredValue
-        columnFilteredValue !== void 0 ? columnFilteredValue : (
-          // 否则，只有在服务端筛选时才使用计算的 filteredValue
-          filters && genOnFilter() == null && filteredValue !== null ? filteredValue : void 0
-        )
-      ),
-      sortOrder: sorter === true ? sortOrder : void 0,
+      filteredValue:
+      // 优先使用用户明确设置的 filteredValue
+      columnFilteredValue !== undefined ? columnFilteredValue :
+      // 否则，只有在服务端筛选时才使用计算的 filteredValue
+      filters && genOnFilter() == null && filteredValue !== null ? filteredValue : undefined,
+      sortOrder: sorter === true ? sortOrder : undefined,
       fixed: config.fixed,
-      width: columnProps.width || (columnProps.fixed ? 200 : void 0),
-      children: columnProps.children ? genProColumnToColumn(
-        __spreadProps(__spreadValues({}, params), {
-          columns: (columnProps == null ? void 0 : columnProps.children) || []
-        }),
-        __spreadProps(__spreadValues({}, columnProps), { key: columnKey })
-      ) : void 0,
-      render: (text, rowData, index) => {
-        var _a2;
-        if (typeof rowKey === "function") {
+      width: columnProps.width || (columnProps.fixed ? 200 : undefined),
+      children: columnProps.children ? genProColumnToColumn(_objectSpread(_objectSpread({}, params), {}, {
+        columns: (columnProps === null || columnProps === void 0 ? void 0 : columnProps.children) || []
+      }), _objectSpread(_objectSpread({}, columnProps), {}, {
+        key: columnKey
+      })) : undefined,
+      render: function render(text, rowData, index) {
+        if (typeof rowKey === 'function') {
           keyName = rowKey(rowData, index);
         }
-        let uniqueKey;
-        if (typeof rowData === "object" && rowData !== null && Reflect.has(rowData, keyName)) {
+        var uniqueKey;
+        if (_typeof(rowData) === 'object' && rowData !== null && Reflect.has(rowData, keyName)) {
+          var _childrenColumnName;
           uniqueKey = rowData[keyName];
-          const parentInfo = subNameRecord.get(uniqueKey) || [];
-          (_a2 = rowData[childrenColumnName]) == null ? void 0 : _a2.forEach(
-            (item) => {
-              const itemUniqueKey = item[keyName];
-              if (!subNameRecord.has(itemUniqueKey)) {
-                subNameRecord.set(
-                  itemUniqueKey,
-                  parentInfo.concat([index, childrenColumnName])
-                );
-              }
+          var parentInfo = subNameRecord.get(uniqueKey) || [];
+          (_childrenColumnName = rowData[childrenColumnName]) === null || _childrenColumnName === void 0 || _childrenColumnName.forEach(function (item) {
+            var itemUniqueKey = item[keyName];
+            if (!subNameRecord.has(itemUniqueKey)) {
+              subNameRecord.set(itemUniqueKey, parentInfo.concat([index, childrenColumnName]));
             }
-          );
+          });
         }
-        const renderProps = {
-          columnProps,
-          text,
-          rowData,
-          index,
-          columnEmptyText,
-          counter,
-          type,
-          marginSM,
+        var renderProps = {
+          columnProps: columnProps,
+          text: text,
+          rowData: rowData,
+          index: index,
+          columnEmptyText: columnEmptyText,
+          counter: counter,
+          type: type,
+          marginSM: marginSM,
           subName: subNameRecord.get(uniqueKey),
-          editableUtils
+          editableUtils: editableUtils
         };
         return columnRender(renderProps);
       }
     });
     return omitUndefinedAndEmptyArr(tempColumns);
-  })) == null ? void 0 : _a.filter(
-    (item) => !item.hideInTable
-  );
-}
-export {
-  genProColumnToColumn
-};
+  })) === null || _columns$map === void 0 ? void 0 : _columns$map.filter(function (item) {
+    return !item.hideInTable;
+  });
+}