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

package/lib/table/utils/columnRender.js

@@ -1,174 +1,156 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __getProtoOf = Object.getPrototypeOf;
-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));
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/table/utils/columnRender.tsx
-var columnRender_exports = {};
-__export(columnRender_exports, {
-  columnRender: () => columnRender,
-  defaultOnFilter: () => defaultOnFilter,
-  renderColumnsTitle: () => renderColumnsTitle
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(columnRender_exports);
-var import_get = __toESM(require("rc-util/lib/utils/get"));
-var import_react = __toESM(require("react"));
-var import__ = require(".");
-var import_utils = require("../../utils");
-var import_cellRenderToFromItem = __toESM(require("./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__ */ import_react.default.createElement(import_utils.LabelIconTip, { label: null, tooltip: item.tooltip })
-    );
+exports.columnRender = columnRender;
+exports.renderColumnsTitle = exports.defaultOnFilter = void 0;
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _util = require("@rc-component/util");
+var _react = _interopRequireDefault(require("react"));
+var _ = require(".");
+var _utils = require("../../utils");
+var _cellRenderToFromItem = _interopRequireDefault(require("./cellRenderToFromItem"));
+var _jsxRuntime = require("react/jsx-runtime");
+/** 转化列的定义 */
+
+/**
+ * 增加了 icon 的功能 render title
+ *
+ * @param item
+ */
+var renderColumnsTitle = exports.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__*/(0, _jsxRuntime.jsx)(_utils.LabelIconTip, {
+      label: null,
+      tooltip: item.tooltip
+    }));
   }
-  return /* @__PURE__ */ import_react.default.createElement(import_utils.LabelIconTip, { label: title, tooltip: item.tooltip, ellipsis });
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_utils.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) ? (0, import_get.default)(record, dataIndex) : record[dataIndex];
-  const itemValue = String(recordElement);
+
+/**
+ * 默认的 filter 方法
+ *
+ * @param value
+ * @param record
+ * @param dataIndex
+ * @returns
+ */
+var defaultOnFilter = exports.defaultOnFilter = function defaultOnFilter(value, record, dataIndex) {
+  var recordElement = Array.isArray(dataIndex) ? (0, _util.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 = (0, import_cellRenderToFromItem.default)({
+
+/**
+ * 这个组件负责单元格的具体渲染
+ *
+ * @param param0
+ */
+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((0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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 = (0, _cellRenderToFromItem.default)({
     text: renderTextStr,
-    valueType: columnProps.valueType || "text",
-    index,
-    rowData,
-    subName,
-    columnProps: __spreadProps(__spreadValues({}, columnProps), {
+    valueType: columnProps.valueType || 'text',
+    index: index,
+    rowData: rowData,
+    subName: subName,
+    columnProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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 : (0, import_utils.genCopyable)(textDom, columnProps, renderTextStr);
-  if (mode === "edit") {
-    if (columnProps.valueType === "option") {
-      return /* @__PURE__ */ import_react.default.createElement(
-        "div",
-        {
-          style: {
-            display: "flex",
-            alignItems: "center",
-            gap: marginSM,
-            justifyContent: columnProps.align === "center" ? "center" : "flex-start"
-          }
+  var dom = mode === 'edit' ? textDom : (0, _utils.genCopyable)(textDom, columnProps, renderTextStr);
+
+  /** 如果是编辑模式，并且 formItemRender 存在直接走 formItemRender */
+  if (mode === 'edit') {
+    if (columnProps.valueType === 'option') {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+        style: {
+          display: 'flex',
+          alignItems: 'center',
+          gap: marginSM,
+          justifyContent: columnProps.align === 'center' ? 'center' : 'flex-start'
         },
-        editableUtils.actionRender(__spreadProps(__spreadValues({}, rowData), {
+        children: editableUtils.actionRender((0, _objectSpread2.default)((0, _objectSpread2.default)({}, rowData), {}, {
           index: columnProps.index || index
         }))
-      );
+      });
     }
     return dom;
   }
   if (!columnProps.render) {
-    const isReactRenderNode = import_react.default.isValidElement(dom) || ["string", "number"].includes(typeof dom);
-    return !(0, import_utils.isNil)(dom) && isReactRenderNode ? dom : null;
+    var isReactRenderNode = /*#__PURE__*/_react.default.isValidElement(dom) || ['string', 'number'].includes((0, _typeof2.default)(dom));
+    return !(0, _utils.isNil)(dom) && isReactRenderNode ? dom : null;
   }
-  const renderDom = columnProps.render(
-    dom,
-    rowData,
-    index,
-    __spreadValues(__spreadValues({}, action), editableUtils),
-    __spreadProps(__spreadValues({}, columnProps), {
-      isEditable,
-      type: "table"
-    })
-  );
-  if ((0, import__.isMergeCell)(renderDom)) {
+  var renderDom = columnProps.render(dom, rowData, index, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, action), editableUtils), (0, _objectSpread2.default)((0, _objectSpread2.default)({}, columnProps), {}, {
+    isEditable: isEditable,
+    type: 'table'
+  }));
+
+  // 如果是合并单元格的，直接返回对象
+  if ((0, _.isMergeCell)(renderDom)) {
     return renderDom;
   }
-  if (renderDom && columnProps.valueType === "option" && Array.isArray(renderDom)) {
-    return /* @__PURE__ */ import_react.default.createElement(
-      "div",
-      {
-        style: {
-          display: "flex",
-          alignItems: "center",
-          justifyContent: "flex-start",
-          gap: 8
-        }
+  if (renderDom && columnProps.valueType === 'option' && Array.isArray(renderDom)) {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      style: {
+        display: 'flex',
+        alignItems: 'center',
+        justifyContent: 'flex-start',
+        gap: 8
       },
-      renderDom
-    );
+      children: renderDom
+    });
   }
   return renderDom;
-}
+}

package/lib/table/utils/columnSort.js

@@ -1,41 +1,29 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/table/utils/columnSort.ts
-var columnSort_exports = {};
-__export(columnSort_exports, {
-  columnSort: () => columnSort
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(columnSort_exports);
-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);
-};
+exports.columnSort = void 0;
+var columnSort = exports.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);
+  };
+};