@teamix/pro 1.5.24 → 1.5.26

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

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

package/es/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";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, ProImage, hooks, nocode, templates, utils, };

package/es/index.js

@@ -37,7 +37,7 @@ export * from './sidebar';
 export * from './utils';
 export * from './timeline';
 export * from './image';
-var version = '1.5.24';
+var version = '1.5.26';
 // By TeamixTest
 window.postMessage({
   source: 'teamix-test-devtools',

package/es/table/components/ToolBar/index.js

@@ -166,7 +166,7 @@ var ToolBar = function ToolBar(props) {
       flat: flat
     }),
     ref: toolBarRef
-  }, !flat && !fullScreenState ? renderUnFlatShape() : renderFlatShape, /*#__PURE__*/React.createElement("div", {
+  }, !flat && !fullScreenState ? renderUnFlatShape() : renderFlatShape, toolBarAutoWidth && /*#__PURE__*/React.createElement("div", {
     className: cls('shadow'),
     ref: toolBarContentRef
   }, renderFlatShape));

package/es/table/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "afterDataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestConfig", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "autoRefreshProps", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll", "context", "fixedTableBody", "isTree", "toolBarAutoWidth", "data-teamix-spm", "switchCardView", "cardViewProps", "defaultView", "emptyProps", "bindUrlProps", "bindUrl", "autoRedirect", "useMaxData"],
+var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "afterDataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestConfig", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "autoRefreshProps", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll", "context", "autoWidth", "fixedTableBody", "isTree", "toolBarAutoWidth", "data-teamix-spm", "switchCardView", "cardViewProps", "defaultView", "emptyProps", "bindUrlProps", "bindUrl", "autoRedirect", "useMaxData"],
   _excluded2 = ["onChange"];
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -33,6 +33,7 @@ import { EmptyContent } from '@teamix/pro-field';
 import { ProActionGroup } from '../actions';
 import classNames from 'classnames';
 import ProPageContainer from '../page-container';
+import { genAutoWidthColumns, shadowContainer, shadowActionColumnContainer } from './utils/genAutoWidthColumns';
 import debounce from 'lodash.debounce';
 import CardView from './components/CardView';
 import { useUrlState } from '@teamix/hooks';
@@ -146,6 +147,8 @@ var ProTable = function ProTable(props) {
     propsSize = _props$size === void 0 ? 'medium' : _props$size,
     disableSelectAll = props.disableSelectAll,
     context = props.context,
+    _props$autoWidth = props.autoWidth,
+    autoWidth = _props$autoWidth === void 0 ? false : _props$autoWidth,
     _props$fixedTableBody = props.fixedTableBody,
     fixedTableBody = _props$fixedTableBody === void 0 ? false : _props$fixedTableBody,
     isTree = props.isTree,
@@ -209,6 +212,14 @@ var ProTable = function ProTable(props) {
     _useState16 = _slicedToArray(_useState15, 2),
     filteredColumns = _useState16[0],
     setFilteredColumns = _useState16[1];
+  // 判断是否有操作列，有的话则渲染一个 shadow dom
+  var hasActionColumn = false;
+  if (autoWidth) {
+    hasActionColumn = filteredColumns.some(function (column) {
+      var _column$actionSchema, _column$actionSchema$;
+      return (column === null || column === void 0 ? void 0 : column.actionSchema) && ((_column$actionSchema = column.actionSchema) === null || _column$actionSchema === void 0 ? void 0 : (_column$actionSchema$ = _column$actionSchema.actions) === null || _column$actionSchema$ === void 0 ? void 0 : _column$actionSchema$.length) > 0;
+    });
+  }
   var _useState17 = useState(propsSize),
     _useState18 = _slicedToArray(_useState17, 2),
     size = _useState18[0],
@@ -217,6 +228,13 @@ var ProTable = function ProTable(props) {
     _useState20 = _slicedToArray(_useState19, 2),
     showLoading = _useState20[0],
     setShowLoading = _useState20[1];
+  // 自动计算列宽需要的一些hook
+  var _useState21 = useState(false),
+    _useState22 = _slicedToArray(_useState21, 2),
+    showShadowContainer = _useState22[0],
+    setShowShadowContainer = _useState22[1];
+  var shadowContainerRef = useRef(null);
+  var shadowActionColumnContainerRef = useRef(null);
   // 表格内部用作存储的 Ref，标识 Table 组件是否被第一次渲染。用作 useUrlState filter 第一次渲染时使用 state 数据请求
   var dataRef = useRef({
     flag: true
@@ -237,19 +255,19 @@ var ProTable = function ProTable(props) {
   }, [currentPage, pageSize, urlState]);
   // 存储能够被 on 监听到的 ProTable 状态
   // 因为只做存储用。不需要更新视图以及需要同步更改。所以不使用 setState 更新
-  var _useState21 = useState({
+  var _useState23 = useState({
       fullScreenState: false,
       filterRules: {},
       filterColumns: []
     }),
-    _useState22 = _slicedToArray(_useState21, 1),
-    actionRefState = _useState22[0];
+    _useState24 = _slicedToArray(_useState23, 1),
+    actionRefState = _useState24[0];
   // 存储 on 监听事件
-  var _useState23 = useState({
+  var _useState25 = useState({
       fullScreenState: {}
     }),
-    _useState24 = _slicedToArray(_useState23, 1),
-    actionRefCallback = _useState24[0];
+    _useState26 = _slicedToArray(_useState25, 1),
+    actionRefCallback = _useState26[0];
   // 存储定时器 id
   var autoRefreshTimerRef = useRef();
   var onResize = null;
@@ -361,20 +379,20 @@ var ProTable = function ProTable(props) {
     }, 50);
   };
   // header 区域高度。用作全屏计算吸顶吸底高度。默认不做计算
-  var _useState25 = useState(0),
-    _useState26 = _slicedToArray(_useState25, 2),
-    headerHeight = _useState26[0],
-    setHeaderHeight = _useState26[1];
-  // 全屏显示 className
-  var _useState27 = useState(false),
+  var _useState27 = useState(0),
     _useState28 = _slicedToArray(_useState27, 2),
-    fullscreenState = _useState28[0],
-    setFullscreenState = _useState28[1];
-  // 切换视角
-  var _useState29 = useState(defaultView !== null && defaultView !== void 0 ? defaultView : 'table'),
+    headerHeight = _useState28[0],
+    setHeaderHeight = _useState28[1];
+  // 全屏显示 className
+  var _useState29 = useState(false),
     _useState30 = _slicedToArray(_useState29, 2),
-    switchViewState = _useState30[0],
-    setSwitchViewState = _useState30[1];
+    fullscreenState = _useState30[0],
+    setFullscreenState = _useState30[1];
+  // 切换视角
+  var _useState31 = useState(defaultView !== null && defaultView !== void 0 ? defaultView : 'table'),
+    _useState32 = _slicedToArray(_useState31, 2),
+    switchViewState = _useState32[0],
+    setSwitchViewState = _useState32[1];
   // 切换全屏搜索开关
   var filterEnableRef = useRef({
     fullscreen: false,
@@ -394,10 +412,10 @@ var ProTable = function ProTable(props) {
   var dataFilterFormRef = !fullscreenState ? normalDataFilterFormRef : fullscreenDataFilterFormRef;
   // let dataFilterForm = dataFilterFormRef.current;
   // 整个内容区是否超过一屏。用于表格在非全屏模式下的吸底
-  var _useState31 = useState(false),
-    _useState32 = _slicedToArray(_useState31, 2),
-    footerSuctionState = _useState32[0],
-    setFooterSuctionState = _useState32[1];
+  var _useState33 = useState(false),
+    _useState34 = _slicedToArray(_useState33, 2),
+    footerSuctionState = _useState34[0],
+    setFooterSuctionState = _useState34[1];
   // TODO 获取内容区是否超出一屏（暂时仅支持全家桶）
   var getFooterSuctionState = function getFooterSuctionState() {
     if (!footerSuction) {
@@ -548,6 +566,9 @@ var ProTable = function ProTable(props) {
       setFullscreenState(state);
       getHeaderHeight(state);
       actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$s = _actionRef$current2.setState) === null || _actionRef$current2$s === void 0 ? void 0 : _actionRef$current2$s.call(_actionRef$current2, 'fullScreenState', state);
+      if (autoWidth) {
+        reGenFilteredColumnsByAutoWidth();
+      }
       return state;
     },
     setColumn: function setColumn(newColumns) {
@@ -559,10 +580,16 @@ var ProTable = function ProTable(props) {
       if (update) {
         emit('refreshFilterState', newColumns);
       }
+      if (autoWidth) {
+        reGenFilteredColumnsByAutoWidth();
+      }
     },
     size: size,
     setSize: function setSize(mode) {
       _setSize(mode);
+      if (autoWidth) {
+        reGenFilteredColumnsByAutoWidth();
+      }
     },
     refresh: function refresh(params) {
       // card视角的刷新等于重新请求
@@ -672,6 +699,21 @@ var ProTable = function ProTable(props) {
   if (propsActionRef) {
     propsActionRef.current = actionRef.current;
   }
+  function reGenFilteredColumnsByAutoWidth() {
+    if (!autoWidth) {
+      return;
+    }
+    setShowShadowContainer(true);
+    var authWidthedColumns = genAutoWidthColumns(filteredColumns, shadowContainerRef, data, size, useRowSelection, shadowActionColumnContainerRef);
+    setFilteredColumns(authWidthedColumns);
+    // 移除 shadow dom
+    // setTimeout(() => {
+    //   if (document.querySelector('.teamix-pro-table-shadow-container')) {
+    //     document.querySelector('.teamix-pro-table-shadow-container')?.remove();
+    //   }
+    // }, 0);
+  }
+
   function onFormatResult(next) {
     props.onFormatResult && props.onFormatResult(next);
     // 如果开启了 autoRedirect 当当前页数不为1，并且data为空的时候，重定向到第一页
@@ -711,6 +753,9 @@ var ProTable = function ProTable(props) {
       setTotal(total + (next.total || ((_next$data3 = next.data) === null || _next$data3 === void 0 ? void 0 : _next$data3.length)));
     }
     setShowSkeleton(false);
+    if (autoWidth) {
+      reGenFilteredColumnsByAutoWidth();
+    }
   }
   // 请求表格数据工具函数
   var getData = useRequest(function (params) {
@@ -857,6 +902,9 @@ var ProTable = function ProTable(props) {
               _setData([].concat(_toConsumableArray(data), _toConsumableArray(dataRes || [])));
               setTotal(total + (totalRes || (dataRes === null || dataRes === void 0 ? void 0 : dataRes.length)));
             }
+            if (autoWidth) {
+              reGenFilteredColumnsByAutoWidth();
+            }
             setShowSkeleton(false);
             setCustomTableLoading(false);
           }
@@ -1147,7 +1195,11 @@ var ProTable = function ProTable(props) {
         // 'footer-suction': footerSuctionState && footerSuction,
       }),
       ref: tableRef
-    }, renderTable(isFullScreen), fixFooterState && /*#__PURE__*/React.createElement(ProPageContainer.FixedFooter, null, renderFooter()), !fixFooterState && renderFooter());
+    }, showShadowContainer && shadowContainer({
+      columns: filteredColumns,
+      data: data,
+      shadowContainerRef: shadowContainerRef
+    }), hasActionColumn && shadowActionColumnContainer(filteredColumns, shadowActionColumnContainerRef), renderTable(isFullScreen), fixFooterState && /*#__PURE__*/React.createElement(ProPageContainer.FixedFooter, null, renderFooter()), !fixFooterState && renderFooter());
   });
 };
 export default ProTable;

package/es/table/index.scss

@@ -1,3 +1,4 @@
+@import "xconsole";
 $prefix: 'teamix-pro-table';
 $fullscreenPadding: 24px;
 
@@ -77,6 +78,32 @@ $fullscreenPadding: 24px;
       transition: all 0.1s;
     }
   }
+  &-shadow-container {
+    overflow: hidden;
+    position: absolute;
+    right: 0;
+    left: 0;
+    top: 0;
+    visibility: hidden;
+    pointer-events: none;
+  }
+  &-shadow-container-columns {
+    display: flex;
+    >* {
+      flex-shrink: 0;
+    }
+  }
+  &-action-column-shadow-container {
+    overflow: hidden;
+    position: absolute;
+    right: 0;
+    left: 0;
+    top: 0;
+    visibility: hidden;
+    pointer-events: none;
+    display: flex;
+  }
+  
   // sort icon
   .next-table-sort.next-table-header-icon {
     line-height: 16px;

package/es/table/typing.d.ts

@@ -13,7 +13,7 @@ import { ProCardProps } from '../card';
 declare type IFieldRenderProps = keyof ProFieldRenderProps;
 /** 列record函数 */
 declare type ProTableCellFunProp = (value: any, index: number, record: any, ...others: any) => any;
-declare type ITableCellRender = {
+export declare type ITableCellRender = {
     [key in IFieldRenderProps]?: ProFieldRenderProps[key] | ProTableCellFunProp;
 } | ((...other: any) => React.ReactNode);
 declare type TDataService = {
@@ -24,6 +24,10 @@ declare type TDataService = {
 };
 export declare type responsivePaginationType = 'mini' | 'small' | 'simple' | 'normal';
 export declare type ProTableColumnProps = {
+    /** 自动计算宽度时的被挤占的情况 */
+    shrink?: number;
+    /** 是否自动适应该列宽度 */
+    autoWidth?: boolean;
     /**
      * 会在 title 之后展示一个 icon，hover 之后提示一些信息
      */
@@ -65,6 +69,8 @@ export declare type ProTableColumnProps = {
 } & Omit<ColumnProps, 'filters' | 'dataIndex' | 'filtersMode' | 'children'>;
 export declare type ProColumnProps = ProTableColumnProps;
 export declare type ProTableProps = {
+    /** 表格是否自适应宽度 */
+    autoWidth?: boolean;
     /** ProColums 定义，取代 Table 的 columns */
     columns: ProTableColumnProps[];
     /** 请求地址 */

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

@@ -11,3 +11,4 @@ export declare const renderColumnsTitle: (item: ProTableColumnProps, actionRef:
  * 负责单元格的具体渲染
  */
 export declare const renderCell: (value: any, item: ProTableColumnProps, index: number, record: any, actionRef: React.MutableRefObject<ProTableActionType | undefined>, context?: any, dataTeamixSpm?: string) => JSX.Element;
+export declare const renderCellSmartWidth: (value: any, item: ProTableColumnProps, index: number, record: any) => 0 | import("@teamix/pro-field/lib/autoWidth/typing").ProFieldAutoWidthPropsItem;

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 {};