@teamix/pro 1.5.33-beta-2 → 1.5.33-beta-3

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.33-beta";
+declare const version = "1.5.33-beta-3";
 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.33-beta';
+var version = '1.5.33-beta-3';
 // By TeamixTest
 window.postMessage({
   source: 'teamix-test-devtools',

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

@@ -124,7 +124,9 @@ var Cell = function Cell(props) {
     value: value,
     render: newRender,
     dataSource: newDataSource,
-    format: format
+    format: format,
+    // 预留 context 位置
+    context: context
   }, itemProps));
 };
 /**
@@ -189,6 +191,10 @@ var processBuriedPoint = function processBuriedPoint() {
 var equalColumns = function equalColumns(prevProps, nextProps) {
   var preValue = prevProps.value;
   var nextValue = nextProps.value;
+  // 操作列的时候强制刷新
+  if (preValue === false && nextValue === false) {
+    return false;
+  }
   if (preValue === nextValue) {
     return true;
   }

package/es/table/index.js

@@ -490,11 +490,22 @@ var ProTable = function ProTable(props) {
     var columns = processColumns(propsColumns !== null && propsColumns !== void 0 ? propsColumns : [], propsColumns);
     setFilteredColumns(columns);
     (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$se = _actionRef$current.setState) === null || _actionRef$current$se === void 0 ? void 0 : _actionRef$current$se.call(_actionRef$current, 'filterColumns', columns);
+    if (autoWidth) {
+      reGenFilteredColumnsByAutoWidth(columns);
+    }
   }, [propsColumns]);
   // dataSource 受控
   useEffect(function () {
     if (propsDataSource) {
       _setData(propsDataSource);
+      if (autoWidth) {
+        shadowContainer({
+          columns: filteredColumns,
+          data: propsDataSource,
+          shadowContainerRef: shadowContainerRef
+        });
+        reGenFilteredColumnsByAutoWidth();
+      }
     }
   }, [propsDataSource]);
   // 初始化 ActionRef。
@@ -914,7 +925,7 @@ var ProTable = function ProTable(props) {
         getData.run(requestData);
       }
     }
-  }, [bindUrl, bindUrlProps, dataRef, url, customRequest]);
+  }, [bindUrl, bindUrlProps, dataRef, url, customRequest, currentPage, pageSize, propsParams]);
   var onSort = useCallback(function (dataIndex, order) {
     var nextSort = _defineProperty({}, dataIndex, order);
     setSort(nextSort);
@@ -967,6 +978,11 @@ var ProTable = function ProTable(props) {
       return showLoading && !showSkeleton && (customTableLoading || props.loading);
     }
   }, [customRequest, showLoading, showSkeleton, customTableLoading, props.loading, getData]);
+  useEffect(function () {
+    if (autoWidth) {
+      reGenFilteredColumnsByAutoWidth();
+    }
+  }, [shadowContainerRef === null || shadowContainerRef === void 0 ? void 0 : shadowContainerRef.current]);
   var memorizedGenProColumnToColumn = useMemo(function () {
     var result = genProColumnToColumn(filteredColumns, showSkeleton, actionRef, context, dataTeamixSpm, bindUrl, bindUrlProps);
     return result;
@@ -997,7 +1013,11 @@ var ProTable = function ProTable(props) {
         autoRefreshProps: autoRefreshProps,
         bindUrlProps: bindUrlProps,
         bindUrl: bindUrl
-      }), switchViewState === 'table' && /*#__PURE__*/React.createElement(TableContent, _objectSpread({
+      }), autoWidth && shadowContainer({
+        columns: filteredColumns,
+        data: data,
+        shadowContainerRef: shadowContainerRef
+      }), hasActionColumn && shadowActionColumnContainer(filteredColumns, shadowActionColumnContainerRef), switchViewState === 'table' && /*#__PURE__*/React.createElement(TableContent, _objectSpread({
         hasBorder: false,
         dataSource: showSkeleton ? skeletonDataSource : data || props.dataSource,
         columns: memorizedGenProColumnToColumn,
@@ -1175,7 +1195,7 @@ var ProTable = function ProTable(props) {
         // 'footer-suction': footerSuctionState && footerSuction,
       }),
       ref: tableRef
-    }, showShadowContainer && shadowContainer({
+    }, autoWidth && shadowContainer({
       columns: filteredColumns,
       data: data,
       shadowContainerRef: shadowContainerRef

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

@@ -12,7 +12,7 @@ interface IShadowContainerProps {
     data: any[];
     shadowContainerRef: MutableRefObject<null>;
 }
-export declare const shadowContainer: (props: IShadowContainerProps) => JSX.Element;
+export declare const shadowContainer: (props: IShadowContainerProps) => JSX.Element | null;
 export declare const shadowActionColumnContainer: (columns: ProTableColumnProps[], shadowActionColumnContainerRef: MutableRefObject<null>) => JSX.Element | undefined;
 export declare const computeableWidthTypeList: {
     dateTime: (data: any[], render: ITableCellRender) => any;

package/es/table/utils/genAutoWidthColumns.js

@@ -27,13 +27,16 @@ var columnShrinkMaxWidth = 100;
  * @returns
  */
 export function genAutoWidthColumns(fileteredColumns, ref, data, size, useRowSelection, actionColumnRef) {
-  if (!ref.current) {
+  if (!(ref === null || ref === void 0 ? void 0 : 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;
+  if (dom.children.length === 0) {
+    return fileteredColumns;
+  }
   var finalColumns = [];
   fileteredColumns.forEach(function (column, index) {
     var _childNodes$index;
@@ -119,6 +122,7 @@ export function genAutoWidthColumns(fileteredColumns, ref, data, size, useRowSel
       // @ts-ignore
       Math.max(titleWidth, computeableWidthTypeList[finalType](data, render)), size, index === 0 && useRowSelection);
     } else {
+      var _column$render;
       // 直接根据 dom 计算
       // console.log(column.title, '可计算 dom')
       column.isAutoWidth = false;
@@ -131,6 +135,10 @@ export function genAutoWidthColumns(fileteredColumns, ref, data, size, useRowSel
       } else if (column === null || column === void 0 ? void 0 : column.sortable) {
         column.width = column.width + 24;
       }
+      // @ts-ignore
+      if (column === null || column === void 0 ? void 0 : (_column$render = column.render) === null || _column$render === void 0 ? void 0 : _column$render.copy) {
+        column.width = column.width + 16;
+      }
     }
     if (index === 0) {
       // 首列不会被挤占
@@ -151,6 +159,7 @@ export var shadowContainer = function shadowContainer(props) {
   var columns = props.columns,
     data = props.data,
     shadowContainerRef = props.shadowContainerRef;
+  if (data.length === 0) return null;
   return /*#__PURE__*/React.createElement("div", {
     ref: shadowContainerRef,
     className: "teamix-pro-table-shadow-container"

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.33-beta";
+declare const version = "1.5.33-beta-3";
 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.33-beta';
+var version = '1.5.33-beta-3';
 // By TeamixTest
 exports.version = version;
 window.postMessage({

package/lib/table/components/Cell/index.js

@@ -128,7 +128,9 @@ var Cell = function Cell(props) {
     value: value,
     render: newRender,
     dataSource: newDataSource,
-    format: format
+    format: format,
+    // 预留 context 位置
+    context: context
   }, itemProps));
 };
 /**
@@ -193,6 +195,10 @@ var processBuriedPoint = function processBuriedPoint() {
 var equalColumns = function equalColumns(prevProps, nextProps) {
   var preValue = prevProps.value;
   var nextValue = nextProps.value;
+  // 操作列的时候强制刷新
+  if (preValue === false && nextValue === false) {
+    return false;
+  }
   if (preValue === nextValue) {
     return true;
   }

package/lib/table/index.js

@@ -511,11 +511,22 @@ var ProTable = function ProTable(props) {
     var columns = (0, _processColumns.default)(propsColumns !== null && propsColumns !== void 0 ? propsColumns : [], propsColumns);
     setFilteredColumns(columns);
     (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$se = _actionRef$current.setState) === null || _actionRef$current$se === void 0 ? void 0 : _actionRef$current$se.call(_actionRef$current, 'filterColumns', columns);
+    if (autoWidth) {
+      reGenFilteredColumnsByAutoWidth(columns);
+    }
   }, [propsColumns]);
   // dataSource 受控
   (0, _react.useEffect)(function () {
     if (propsDataSource) {
       _setData(propsDataSource);
+      if (autoWidth) {
+        (0, _genAutoWidthColumns.shadowContainer)({
+          columns: filteredColumns,
+          data: propsDataSource,
+          shadowContainerRef: shadowContainerRef
+        });
+        reGenFilteredColumnsByAutoWidth();
+      }
     }
   }, [propsDataSource]);
   // 初始化 ActionRef。
@@ -935,7 +946,7 @@ var ProTable = function ProTable(props) {
         getData.run(requestData);
       }
     }
-  }, [bindUrl, bindUrlProps, dataRef, url, customRequest]);
+  }, [bindUrl, bindUrlProps, dataRef, url, customRequest, currentPage, pageSize, propsParams]);
   var onSort = (0, _react.useCallback)(function (dataIndex, order) {
     var nextSort = _defineProperty({}, dataIndex, order);
     setSort(nextSort);
@@ -988,6 +999,11 @@ var ProTable = function ProTable(props) {
       return showLoading && !showSkeleton && (customTableLoading || props.loading);
     }
   }, [customRequest, showLoading, showSkeleton, customTableLoading, props.loading, getData]);
+  (0, _react.useEffect)(function () {
+    if (autoWidth) {
+      reGenFilteredColumnsByAutoWidth();
+    }
+  }, [shadowContainerRef === null || shadowContainerRef === void 0 ? void 0 : shadowContainerRef.current]);
   var memorizedGenProColumnToColumn = (0, _react.useMemo)(function () {
     var result = (0, _genProColumnToColumn.default)(filteredColumns, showSkeleton, actionRef, context, dataTeamixSpm, bindUrl, bindUrlProps);
     return result;
@@ -1018,7 +1034,11 @@ var ProTable = function ProTable(props) {
         autoRefreshProps: autoRefreshProps,
         bindUrlProps: bindUrlProps,
         bindUrl: bindUrl
-      }), switchViewState === 'table' && /*#__PURE__*/_react.default.createElement(_TableContent.default, _objectSpread({
+      }), autoWidth && (0, _genAutoWidthColumns.shadowContainer)({
+        columns: filteredColumns,
+        data: data,
+        shadowContainerRef: shadowContainerRef
+      }), hasActionColumn && (0, _genAutoWidthColumns.shadowActionColumnContainer)(filteredColumns, shadowActionColumnContainerRef), switchViewState === 'table' && /*#__PURE__*/_react.default.createElement(_TableContent.default, _objectSpread({
         hasBorder: false,
         dataSource: showSkeleton ? skeletonDataSource : data || props.dataSource,
         columns: memorizedGenProColumnToColumn,
@@ -1196,7 +1216,7 @@ var ProTable = function ProTable(props) {
         // 'footer-suction': footerSuctionState && footerSuction,
       }),
       ref: tableRef
-    }, showShadowContainer && (0, _genAutoWidthColumns.shadowContainer)({
+    }, autoWidth && (0, _genAutoWidthColumns.shadowContainer)({
       columns: filteredColumns,
       data: data,
       shadowContainerRef: shadowContainerRef

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

@@ -12,7 +12,7 @@ interface IShadowContainerProps {
     data: any[];
     shadowContainerRef: MutableRefObject<null>;
 }
-export declare const shadowContainer: (props: IShadowContainerProps) => JSX.Element;
+export declare const shadowContainer: (props: IShadowContainerProps) => JSX.Element | null;
 export declare const shadowActionColumnContainer: (columns: ProTableColumnProps[], shadowActionColumnContainerRef: MutableRefObject<null>) => JSX.Element | undefined;
 export declare const computeableWidthTypeList: {
     dateTime: (data: any[], render: ITableCellRender) => any;

package/lib/table/utils/genAutoWidthColumns.js

@@ -37,13 +37,16 @@ var columnShrinkMaxWidth = 100;
  * @returns
  */
 function genAutoWidthColumns(fileteredColumns, ref, data, size, useRowSelection, actionColumnRef) {
-  if (!ref.current) {
+  if (!(ref === null || ref === void 0 ? void 0 : 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;
+  if (dom.children.length === 0) {
+    return fileteredColumns;
+  }
   var finalColumns = [];
   fileteredColumns.forEach(function (column, index) {
     var _childNodes$index;
@@ -129,6 +132,7 @@ function genAutoWidthColumns(fileteredColumns, ref, data, size, useRowSelection,
       // @ts-ignore
       Math.max(titleWidth, computeableWidthTypeList[finalType](data, render)), size, index === 0 && useRowSelection);
     } else {
+      var _column$render;
       // 直接根据 dom 计算
       // console.log(column.title, '可计算 dom')
       column.isAutoWidth = false;
@@ -141,6 +145,10 @@ function genAutoWidthColumns(fileteredColumns, ref, data, size, useRowSelection,
       } else if (column === null || column === void 0 ? void 0 : column.sortable) {
         column.width = column.width + 24;
       }
+      // @ts-ignore
+      if (column === null || column === void 0 ? void 0 : (_column$render = column.render) === null || _column$render === void 0 ? void 0 : _column$render.copy) {
+        column.width = column.width + 16;
+      }
     }
     if (index === 0) {
       // 首列不会被挤占
@@ -161,6 +169,7 @@ var shadowContainer = function shadowContainer(props) {
   var columns = props.columns,
     data = props.data,
     shadowContainerRef = props.shadowContainerRef;
+  if (data.length === 0) return null;
   return /*#__PURE__*/_react.default.createElement("div", {
     ref: shadowContainerRef,
     className: "teamix-pro-table-shadow-container"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.5.33-beta-2",
+  "version": "1.5.33-beta-3",
   "description": "TeamixPro大包",
   "keywords": [
     "aliyun",