@teamix/pro 1.5.24 → 1.5.26-beta-2

package/es/table/utils/columnRender.js

@@ -19,6 +19,7 @@ import { getTargetValue } from '@teamix/utils';
 import { ProActionGroup } from '../../actions';
 import ProField, { LabelIconTip } from '../../field';
 import Filter from '../components/Filter';
+import { getProFieldWidth } from '@teamix/pro-field';
 /**
  * 增加了 icon 的功能 render title
  */
@@ -183,9 +184,48 @@ dataTeamixSpm) {
     value: value,
     render: newRender,
     dataSource: newDataSource,
-    format: format
+    format: format,
+    proFieldWidthType: valueType
   }, props));
 };
+export var renderCellSmartWidth = function renderCellSmartWidth(value, item, index, record) {
+  var _item$valueType2 = item.valueType,
+    valueType = _item$valueType2 === void 0 ? 'text' : _item$valueType2,
+    render = item.render;
+  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
+      });
+    }
+  }
+  return getProFieldWidth(valueType, newRender);
+};
 /**
  * 处理 render 配置项是函数的情况
  * @param render ProFieldRender

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

@@ -0,0 +1,30 @@
+import { MutableRefObject } from 'react';
+import { ProTableColumnProps, ITableCellRender } from '../typing';
+/**
+ * @param fileteredColumns
+ * @param ref
+ * @param data
+ * @returns
+ */
+export declare function genAutoWidthColumns(fileteredColumns: ProTableColumnProps[], ref: MutableRefObject<HTMLDivElement | null>, data: any[], size: 'small' | 'medium', useRowSelection?: boolean | undefined, actionColumnRef?: MutableRefObject<HTMLDivElement | null>): ProTableColumnProps[];
+interface IShadowContainerProps {
+    columns: ProTableColumnProps[];
+    data: any[];
+    shadowContainerRef: MutableRefObject<null>;
+}
+export declare const shadowContainer: (props: IShadowContainerProps) => JSX.Element;
+export declare const shadowActionColumnContainer: (columns: ProTableColumnProps[], shadowActionColumnContainerRef: MutableRefObject<null>) => JSX.Element | undefined;
+export declare const computeableWidthTypeList: {
+    dateTime: (data: any[], render: ITableCellRender) => any;
+};
+export declare const fixedWidthTypeList: {
+    dateWeekRange: number;
+    dateMonthRange: number;
+    dateYearRange: number;
+    dateQuarterRange: number;
+    dateTimeRange: number;
+    time: number;
+    timeRange: number;
+};
+export declare const fieldTypeShrink: any;
+export {};

package/es/table/utils/genAutoWidthColumns.js

@@ -0,0 +1,353 @@
+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 _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 _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 _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 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; }
+import React, { createRef } from 'react';
+import { getTargetValue } from '@teamix/utils';
+import { renderCell } from './pureColumnRender';
+import { renderColumnsTitle } from './columnRender';
+import { ProActionGroup } from '../../actions';
+import { getProFieldWidth } from '@teamix/pro-field';
+import { renderCellSmartWidth } from './columnRender';
+// 最大宽度
+var maxColumnWidth = 600;
+// 最小宽度
+var minColumnWidth = 48;
+// 每个列可以缩减的最大宽度
+var columnShrinkMaxWidth = 100;
+/**
+ * @param fileteredColumns
+ * @param ref
+ * @param data
+ * @returns
+ */
+export function genAutoWidthColumns(fileteredColumns, ref, data, size, useRowSelection, actionColumnRef) {
+  if (!ref.current) {
+    return fileteredColumns;
+  }
+  var hasLockFlag = false;
+  var dom = ref.current;
+  var actionColumnDom = actionColumnRef === null || actionColumnRef === void 0 ? void 0 : actionColumnRef.current;
+  var childNodes = dom.children;
+  var finalColumns = [];
+  fileteredColumns.forEach(function (column, index) {
+    var _childNodes$index;
+    var render = column.render,
+      _column$valueType = column.valueType,
+      valueType = _column$valueType === void 0 ? 'text' : _column$valueType,
+      _column$autoWidth = column.autoWidth,
+      autoWidth = _column$autoWidth === void 0 ? true : _column$autoWidth,
+      actionSchema = column.actionSchema,
+      sortable = column.sortable,
+      lock = column.lock;
+    if (lock) {
+      hasLockFlag = true;
+    }
+    //@ts-ignore
+    var type = render === null || render === void 0 ? void 0 : render.type;
+    var finalType = type || valueType || '';
+    var shrink = fieldTypeShrink[finalType];
+    column.shrink = column.shrink || (shrink !== undefined ? shrink : 1);
+    if (column.isAutoWidth === true) {
+      console.log(column.title, 'isAutoWidth');
+      finalColumns.push(column);
+      return;
+    }
+    ;
+    if ((column === null || column === void 0 ? void 0 : column.columnFilters) === false) {
+      finalColumns.push(column);
+      return;
+    }
+    // column.isAutoWidth = true
+    //@ts-ignore
+    // if (!autoWidth) {
+    //   finalColumns.push(column);
+    //   return;
+    // }
+    if (actionSchema) {
+      // TODO 操作列暂时未处理，但是应该根据actionSchema的数量直接推测出操作列的宽度
+      // console.log('column', column);
+      column.shrink = 0;
+      // column.width = 280;
+      // console.log(
+      //   'actionColumnDom',
+      //   actionColumnDom?.childNodes[0].scrollWidth,
+      // );
+      if (actionColumnDom === null || actionColumnDom === void 0 ? void 0 : actionColumnDom.childNodes[0]) {
+        //@ts-ignore
+        var width = actionColumnDom === null || actionColumnDom === void 0 ? void 0 : actionColumnDom.childNodes[0].scrollWidth;
+        if (width >= 280) {
+          width = 280;
+        }
+        column.isAutoWidth = true;
+        column.width = defaultPaddingFixer(width, size, false);
+      }
+      finalColumns.push(column);
+      return;
+    }
+    // 当列没出来的时候不比较
+    // @ts-ignore
+    if ((column === null || column === void 0 ? void 0 : column.columnFilters) === false) {
+      finalColumns.push(column);
+      return;
+    }
+    // @ts-ignore
+    var titleWidth = (_childNodes$index = childNodes[index]) === null || _childNodes$index === void 0 ? void 0 : _childNodes$index.children[0].scrollWidth;
+    // @ts-ignore
+    if (fixedWidthTypeList[finalType]) {
+      // console.log(
+      //   'fixedWidthTypeList[finalType]',
+      //   fixedWidthTypeList[finalType],
+      // );
+      // 固定宽度
+      column.isAutoWidth = true;
+      column.width = defaultPaddingFixer(
+      // @ts-ignore
+      Math.max(titleWidth, fixedWidthTypeList[finalType]), size, index === 0 && useRowSelection);
+      // @ts-ignore
+    } else if (computeableWidthTypeList[finalType]) {
+      // 可计算宽度
+      column.isAutoWidth = true;
+      column.width = defaultPaddingFixer(
+      // @ts-ignore
+      Math.max(titleWidth, computeableWidthTypeList[finalType](data, render)), size, index === 0 && useRowSelection);
+    } else {
+      // 直接根据 dom 计算
+      column.isAutoWidth = true;
+      column.width = defaultPaddingFixer(Math.max(titleWidth,
+      // @ts-ignore
+      calcWidthWithParentDOM(childNodes[index], column.shrink)), size, index === 0 && useRowSelection);
+      if ((column === null || column === void 0 ? void 0 : column.sortable) && (column === null || column === void 0 ? void 0 : column.tooltip)) {
+        // 检测有 sortable 和 tooltip 的时候增加宽度
+        column.width = column.width + 40;
+      }
+    }
+    if (index === 0) {
+      // 首列不会被挤占
+      column.shrink = 0;
+    }
+    finalColumns.push(column);
+  });
+  if (!hasLockFlag) {
+    // 如果没有锁列的情况，需要将所有列放到一屏内，此时需要将所有列放到一起计算一次
+    var containerWidth = dom.offsetWidth;
+    var comboColumns = calcMultiColumnLength(finalColumns, useRowSelection ? containerWidth - 50 : containerWidth);
+    return comboColumns;
+  }
+  return finalColumns;
+}
+export var shadowContainer = function shadowContainer(props) {
+  var ref = /*#__PURE__*/createRef();
+  var columns = props.columns,
+    data = props.data,
+    shadowContainerRef = props.shadowContainerRef;
+  return /*#__PURE__*/React.createElement("div", {
+    ref: shadowContainerRef,
+    className: "teamix-pro-table-shadow-container"
+  }, columns.map(function (column, index) {
+    var dataIndex = column.dataIndex,
+      valueType = column.valueType;
+    if (!(column === null || column === void 0 ? void 0 : column.actionSchema)) {
+      return /*#__PURE__*/React.createElement("div", {
+        className: "teamix-pro-table-shadow-container-columns",
+        key: index
+      }, /*#__PURE__*/React.createElement("div", null, renderColumnsTitle(column, ref)),
+      //@ts-ignore
+      !computeableWidthTypeList[valueType] &&
+      //@ts-ignore
+      !fixedWidthTypeList[valueType] && data.map(function (item, index) {
+        // @ts-ignore
+        column.smartWidth = renderCellSmartWidth(getValueFromRecord(dataIndex, item), column, index, item);
+        return renderCell(getValueFromRecord(dataIndex, item), column, index, item);
+      }));
+    }
+  }));
+};
+export var shadowActionColumnContainer = function shadowActionColumnContainer(columns, shadowActionColumnContainerRef) {
+  var actionColumn = columns.find(function (column) {
+    return column === null || column === void 0 ? void 0 : column.actionSchema;
+  });
+  if (actionColumn === null || actionColumn === void 0 ? void 0 : actionColumn.actionSchema) {
+    return /*#__PURE__*/React.createElement("div", {
+      ref: shadowActionColumnContainerRef,
+      className: "teamix-pro-table-action-column-shadow-container"
+    }, /*#__PURE__*/React.createElement(ProActionGroup, _objectSpread(_objectSpread({
+      type: "text"
+    }, actionColumn === null || actionColumn === void 0 ? void 0 : actionColumn.actionSchema), {}, {
+      context: _objectSpread({}, actionColumn === null || actionColumn === void 0 ? void 0 : actionColumn.actionSchema.context)
+    })));
+  }
+};
+// 计算操作列的宽度
+function getValueFromRecord(dataIndex, record) {
+  if (!dataIndex) {
+    return null;
+  }
+  if (Array.isArray(dataIndex)) {
+    var value = dataIndex.map(function (item) {
+      return getTargetValue("{{".concat(item, "}}"), _objectSpread(_objectSpread({}, record), {}, {
+        record: record
+      }));
+    });
+    return value;
+  } else {
+    var result = record;
+    var array = dataIndex.split('.');
+    array.forEach(function (item) {
+      return result = result ? result[item] : undefined;
+    });
+    return result;
+  }
+}
+// TODO 某些可以直接算出结果的 profield 类型白名单，待补充，每个类型下支持一个函数，用当前值和渲染类型算出一个结果
+export var computeableWidthTypeList = {
+  dateTime: function dateTime(data, render) {
+    var result = getProFieldWidth('dateTime', render);
+    // @ts-ignore
+    return (result === null || result === void 0 ? void 0 : result.minWidth) || 0;
+  }
+};
+// TODO 某些固定宽度的 profield 类型白名单，这里的数据可能需要综合考虑 dataFold 和 render.rows
+export var fixedWidthTypeList = {
+  // 时间日期
+  // dateTime: 142,
+  // dateMonth: 74, // 60
+  // dateWeek: 74,
+  // date: 100,
+  // dateYear: 46,
+  // dateQuarter: 64,
+  // dateRange: 212,
+  dateWeekRange: 156,
+  dateMonthRange: 156,
+  dateYearRange: 102,
+  dateQuarterRange: 136,
+  dateTimeRange: 326,
+  time: 38,
+  timeRange: 124
+};
+// TODO 不同类型的 profield 的 shrink，0表示不可以省略号，数字越大越容易被挤占空间
+export var fieldTypeShrink = {
+  tag: 0,
+  statusTag: 0,
+  statusIconTag: 0,
+  circle: 0,
+  rank: 0,
+  progress: 0,
+  money: 0,
+  number: 0,
+  percent: 0,
+  dateTime: 0,
+  ip: 0
+};
+function calcWidthWithParentDOM(dom, shrink) {
+  var childNodes = _toConsumableArray(dom.children);
+  childNodes.shift();
+  return calcSingleColumnLength(childNodes.map(function (node) {
+    return node.scrollWidth;
+  }), shrink);
+}
+function calcSingleColumnLength() {
+  var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var shrink = arguments.length > 1 ? arguments[1] : undefined;
+  if (shrink === 0) {
+    return Math.ceil(Math.max.apply(null, list));
+  }
+  return getConfidence90UpperBound(list);
+}
+/**
+ * 根据所有列的宽度和权重，结合总宽度，计算出各个列合适的宽度
+ * 目前算法：
+ * 当前需要的总宽度-总宽度=需要降低的宽度
+ * 从后往前，将shrink不为0的列，降低一些宽度到最小宽度
+ * 最小宽度可以用百分比去算
+ * TODO 当前shrink只用了0，其他的权重也要考虑一下
+ * @param list
+ * @param max
+ * @returns
+ */
+function calcMultiColumnLength() {
+  var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var max = arguments.length > 1 ? arguments[1] : undefined;
+  var result = _toConsumableArray(list);
+  var targetList = [];
+  var needWidth = 0;
+  var canShrink = 0;
+  list.forEach(function (item) {
+    //@ts-ignore
+    needWidth += item.width;
+    if (item.shrink !== 0) {
+      targetList.push(item);
+      //@ts-ignore
+      canShrink += Math.min(item.width - minColumnWidth, columnShrinkMaxWidth);
+    }
+  });
+  var widthToBeRemoved = needWidth - max;
+  if (widthToBeRemoved <= 0) {
+    return list;
+  }
+  // TODO 超过的特别多直接加锁列，这个逻辑怎么设计
+  // 目前用可以缩小的宽度加起来比较一下
+  if (canShrink < widthToBeRemoved) {
+    list[0].lock = 'left';
+    if (list[list.length - 1].actionSchema) {
+      list[list.length - 1].lock = 'right';
+    }
+    return list;
+  }
+  //@ts-ignore
+  var sortedList = targetList.sort(function (a, b) {
+    return a.width - b.width;
+  });
+  var shrinkedWidth = 0;
+  for (var i = sortedList.length - 1; i >= 0; i--) {
+    if (shrinkedWidth >= widthToBeRemoved) {
+      break;
+    }
+    var singleShrinkedWidth = Math.min(sortedList[i].width - minColumnWidth, columnShrinkMaxWidth, widthToBeRemoved - shrinkedWidth);
+    sortedList[i].width = sortedList[i].width - singleShrinkedWidth;
+    shrinkedWidth += singleShrinkedWidth;
+  }
+  return result;
+}
+/**
+ * 修正内容放在table中默认的padding
+ * @param width
+ * @returns
+ */
+function defaultPaddingFixer(width) {
+  var size = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'medium';
+  var half = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  return size === 'medium' ? width + (half ? 16 : 32) + 0.5 : width + (half ? 8 : 16) + 0.5;
+}
+function sum() {
+  var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  return list.reduce(function (a, b) {
+    return a + b;
+  });
+}
+/**
+ * 假设样本正态分布，取 90% 置信区间的上界
+ * 当上界与最大值差距不大(目前是20)的时候，直接用最大值
+ * TODO 这里没考虑是否可以直接用标准差做评判依据，如标准差过大时，直接排序并展示前90%，或标准差很小时直接用最大值
+ * TODO 这里极限情况是不是会挂？ 如：长度为9个100和2个10000，估计会挂，是否置信区间这个不靠谱。。。最差情况就直接展示90%的数据算了
+ */
+function getConfidence90UpperBound() {
+  var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var max = Math.max.apply(null, list);
+  var length = list.length;
+  var mean = sum(list) / length;
+  var std = Math.sqrt(sum(list.map(function (n) {
+    return (n - mean) * (n - mean);
+  })) / length);
+  var interval = length > 30 ? 1.65 * std / Math.sqrt(length) : 2.2622 * std / Math.sqrt(length);
+  var bound = Math.ceil(mean + interval);
+  if (max - bound < 20) {
+    return Math.min(max, maxColumnWidth);
+  }
+  return Math.min(bound, maxColumnWidth);
+}

package/es/table/utils/genProColumnToColumn.js

@@ -5,9 +5,10 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 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 React from 'react';
-import { renderColumnsTitle, renderCell } from './columnRender';
+import { renderColumnsTitle } from './columnRender';
 import { ProSkeletonRaw as Skeleton } from '../../skeleton';
 import { getLanguage } from '@teamix/utils';
+import Cell from '../components/Cell';
 /**
  * ProColumn => Column
  */
@@ -44,7 +45,15 @@ showSkeleton, actionRef) {
       dataIndex: dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.toString(),
       title: renderColumnsTitle(columnProps, actionRef, bindUrl, bindUrlProps),
       cell: function cell(value, index, record) {
-        return renderCell(value, columnProps, index, record, actionRef, context, dataTeamixSpm);
+        return /*#__PURE__*/React.createElement(Cell, {
+          value: value,
+          item: columnProps,
+          index: index,
+          record: record,
+          actionRef: actionRef,
+          context: context,
+          dataTeamixSpm: dataTeamixSpm
+        });
       }
     });
   });

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

@@ -0,0 +1,8 @@
+import { ProTableColumnProps } from '../typing';
+/**
+ * 处理原生传入的 columns 以便于 选择列 方便处理
+ * @param columns 原生传入的 columns
+ * @returns
+ */
+declare const processColumns: (columns: ProTableColumnProps[], initialColumns: ProTableColumnProps[]) => ProTableColumnProps[];
+export default processColumns;

package/es/table/utils/processColumns.js

@@ -0,0 +1,39 @@
+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; }
+import { getGlobalConfig } from '@teamix/utils';
+/**
+ * 处理原生传入的 columns 以便于 选择列 方便处理
+ * @param columns 原生传入的 columns
+ * @returns
+ */
+var processColumns = function processColumns(columns, initialColumns) {
+  var _getGlobalConfig;
+  var globalFilterColumns = (_getGlobalConfig = getGlobalConfig('ProTable')) === null || _getGlobalConfig === void 0 ? void 0 : _getGlobalConfig.filterColumns;
+  var filterColumns = columns.filter(function (item) {
+    return item.columnFilters !== false && (item === null || item === void 0 ? void 0 : item.hidden) !== true && (!globalFilterColumns || globalFilterColumns(_objectSpread({}, item)));
+  });
+  // 处理只剩一列批量选择的情况下宽度错乱问题
+  if (filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) {
+    var _initialColumns$;
+    if ((filterColumns === null || filterColumns === void 0 ? void 0 : filterColumns.length) === 1) {
+      var _filterColumns$, _filterColumns$2;
+      if ((_filterColumns$ = filterColumns[0]) === null || _filterColumns$ === void 0 ? void 0 : _filterColumns$.width) {
+        delete filterColumns[0].width;
+      }
+      if ((_filterColumns$2 = filterColumns[0]) === null || _filterColumns$2 === void 0 ? void 0 : _filterColumns$2.lock) {
+        filterColumns[0].lock = false;
+      }
+    } else if (((_initialColumns$ = initialColumns[0]) === null || _initialColumns$ === void 0 ? void 0 : _initialColumns$.columnFilters) !== false) {
+      var _initialColumns$2, _initialColumns$3;
+      if ((_initialColumns$2 = initialColumns[0]) === null || _initialColumns$2 === void 0 ? void 0 : _initialColumns$2.width) {
+        filterColumns[0].width = initialColumns[0].width;
+      }
+      if ((_initialColumns$3 = initialColumns[0]) === null || _initialColumns$3 === void 0 ? void 0 : _initialColumns$3.lock) {
+        filterColumns[0].lock = initialColumns[0].lock;
+      }
+    }
+  }
+  return filterColumns;
+};
+export default processColumns;

package/es/table/xconsole.scss

@@ -0,0 +1,6 @@
+.theme-xconsole {
+  .next-menu-item-inner {
+    display: flex;
+    align-items: center;
+  }
+}

package/lib/card/index.scss

@@ -310,4 +310,8 @@
     background: transparent;
   }
 
+  .next-card-content-container:has(.cloud-wnumbercard-data-overview-container) {
+    margin-top: -16px;
+  }
+
 }

package/lib/form/Components/FormItem2/index.js

@@ -153,8 +153,7 @@ var BaseItem = function BaseItem(props) {
   }
   var prefixCls = (0, _builtins__.usePrefixCls)('formily-item', props);
   var prefix = (0, _builtins__.usePrefixCls)();
-  console.log('feedbackLayout', feedbackLayout);
-  var formatChildren = feedbackLayout === 'popover' || feedbackLayout === 'hover-popover' ? /*#__PURE__*/_react.default.createElement(_components.Balloon, _objectSpread({
+  var formatChildren = (feedbackLayout === 'popover' || feedbackLayout === 'hover-popover') && !!feedbackText ? /*#__PURE__*/_react.default.createElement(_components.Balloon, _objectSpread({
     needAdjust: true,
     align: "t",
     closable: false,

package/lib/form/SchemaForm/adapterType.js

@@ -18,7 +18,10 @@ var typeMap = (_typeMap = {
   Money: 'number',
   Select: 'string',
   MenuSelect: 'string',
+  MultipleMenuSelect: 'array',
   MultipleSelect: 'array',
+  MenuCascaderSelect: 'string',
+  MultipleMenuCascaderSelect: 'array',
   TreeSelect: 'string',
   Cascader: 'string',
   MultipleCascader: 'array',

package/lib/form/fieldTypeMap.js

@@ -13,6 +13,9 @@ var fieldTypeMap = {
   Money: 'money',
   Select: 'select',
   MenuSelect: 'menuSelect',
+  MultipleMenuSelect: 'multipleMenuSelect',
+  MenuCascaderSelect: 'menuCascaderSelect',
+  MultipleMenuCascaderSelect: 'multipleMenuCascaderSelect',
   MultipleSelect: 'multipleSelect',
   TreeSelect: 'treeSelect',
   Cascader: 'cascader',

package/lib/form/global.scss

@@ -12,3 +12,10 @@ $inset-font-weight-medium: calc(
 $noborder-font-weight-medium: calc(
   var(--form-element-medium-height, 32px) - var(--input-border-width, 1px) * 2
 );
+.next-formily-item.next-formily-item.next-formily-item {
+  display: flex;
+  font-size: var(--font-size-body-1,12px);
+}
+.next-formily-item-inset.next-formily-item-inset.next-formily-item-inset {
+  line-height: calc(var(--form-element-medium-height, 32px) - var(--input-border-width, 1px)*2);
+}

package/lib/index.d.ts

@@ -30,5 +30,5 @@ export * from './sidebar';
 export * from './utils';
 export * from './timeline';
 export * from './image';
-declare const version = "1.5.24";
+declare const version = "1.5.26-beta-2";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, ProImage, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -299,7 +299,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 if (!((_window = window) === null || _window === void 0 ? void 0 : _window.TEAMIXPRO_WITHOUT_ICON)) {
   _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 }
-var version = '1.5.24';
+var version = '1.5.26-beta-2';
 // By TeamixTest
 exports.version = version;
 window.postMessage({
@@ -310,4 +310,13 @@ window.postMessage({
   moduleVersion: version,
   moduleType: 'TeamixPro',
   componentName: 'TeamixPro'
-}, '*');
+}, '*');
+// window.TeamixMaterial = {
+//   ...window.TeamixMaterial,
+//   ProTable: ProTable
+// }
+// window.TeamixPro = {
+//   ...window.TeamixPro,
+//   ProTable: ProTable
+// }
+// console.log('TeamixPro')

package/lib/table/components/Cell/index.d.ts

@@ -0,0 +1,17 @@
+/**
+ * 渲染列的逻辑函数
+ */
+import React from 'react';
+import { ProTableColumnProps, ProTableActionType } from '../../typing';
+interface ICellProps {
+    value: any;
+    item: ProTableColumnProps;
+    index: number;
+    record: any;
+    actionRef: React.MutableRefObject<ProTableActionType | undefined>;
+    /** 接收外部比如 dialog-table 传过来的 context，用于弹窗关闭等 */
+    context?: any;
+    dataTeamixSpm?: string;
+}
+declare const _default: React.MemoExoticComponent<(props: ICellProps) => JSX.Element>;
+export default _default;