@teamix/pro 1.5.44 → 1.5.46-beat.2

package/lib/sidebar/utils/index.d.ts

@@ -152,7 +152,7 @@ export declare function getTreeNodeProps(item: ProSidebarDataSourceItem): {
         'aria-colindex'?: number | undefined;
         'aria-colspan'?: number | undefined;
         'aria-controls'?: string | undefined;
-        'aria-current'?: boolean | "date" | "time" | "page" | "false" | "true" | "step" | "location" | undefined;
+        'aria-current'?: boolean | "location" | "date" | "time" | "page" | "false" | "true" | "step" | undefined;
         'aria-describedby'?: string | undefined;
         'aria-details'?: string | undefined;
         'aria-disabled'?: (boolean | "false" | "true") | undefined;

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

@@ -193,11 +193,31 @@ var processBuriedPoint = function processBuriedPoint() {
   }))));
 };
 var equalColumns = function equalColumns(prevProps, nextProps) {
-  var preValue = prevProps.value;
+  var preValue = prevProps.value,
+    preItem = prevProps.item,
+    preRecord = prevProps.record,
+    preContext = prevProps.context;
   var nextValue = nextProps.value,
-    item = nextProps.item;
+    nextItem = nextProps.item,
+    nextRecord = nextProps.record,
+    nextContext = nextProps.context;
+  // if (nextItem?.render) {
+  //   let renderCache = true;
+  //   Object.keys(nextItem?.render).forEach((key) => {
+  //     // 如果 preItem 不包含 render 的属性，则强制刷新
+  //     if (!preItem?.render[key]) {
+  //       renderCache = false;
+  //       return false
+  //     }
+  //     let preRenderValue = getTargetValue(preItem?.render[key], {...preRecord, ...preContext});
+  //     let nextRenderValue = getTargetValue(nextItem?.render[key], {...nextRecord, ...nextContext})
+  //     if (preRenderValue !== nextRenderValue) {
+  //       renderCache = false;
+  //     }
+  //   })
+  // }
   // columns 强制更新参数
-  if (item === null || item === void 0 ? void 0 : item.forcedUpdate) {
+  if (nextItem === null || nextItem === void 0 ? void 0 : nextItem.forcedUpdate) {
     return false;
   }
   // 操作列的时候强制刷新 || 当 value 值拿不到的时候

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

@@ -42,7 +42,9 @@ var Filter = function Filter(props) {
     filtersWidth = _column$filtersWidth === void 0 ? 130 : _column$filtersWidth,
     _column$defaultFilter = column.defaultFilterSelectedKeys,
     defaultFilterSelectedKeys = _column$defaultFilter === void 0 ? [] : _column$defaultFilter;
-  var _ref = bindUrl ? (0, _hooks.useUrlState)() : [],
+  var _ref = bindUrl ? (0, _hooks.useUrlState)({}, {
+      navigateMode: 'replace'
+    }) : [],
     _ref2 = _slicedToArray(_ref, 2),
     urlState = _ref2[0],
     setUrlState = _ref2[1];

package/lib/table/components/ToolBar/RefreshIcon.js

@@ -66,6 +66,7 @@ var LayoutIcon = function LayoutIcon(props) {
       setTimes(timer);
       timerRef.current.remain = timer / 1000;
       if (timerRef.current.timer) {
+        //@ts-ignore
         clearInterval(timerRef.current.timer);
         timerRef.current.timer = undefined;
       }
@@ -91,6 +92,7 @@ var LayoutIcon = function LayoutIcon(props) {
       var _actionRef$current2, _actionRef$current2$c;
       (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$c = _actionRef$current2.clearAutoRefreshTimers) === null || _actionRef$current2$c === void 0 ? void 0 : _actionRef$current2$c.call(_actionRef$current2);
       if (timerRef.current.timer) {
+        //@ts-ignore
         clearInterval(timerRef.current.timer);
         timerRef.current.timer = undefined;
         timerRef.current.remain = times / 1000;

package/lib/table/index.js

@@ -156,7 +156,9 @@ var ProTable = function ProTable(props) {
   var targetPageKey = pageKey || globalPageKey;
   var targetPageSizeKey = pageSizeKey || globalPageSizeKey;
   var targetFormatSort = formatSort || globalFormatSort;
-  var _ref = bindUrl ? (0, _hooks.useUrlState)() : [],
+  var _ref = bindUrl ? (0, _hooks.useUrlState)({}, {
+      navigateMode: 'replace'
+    }) : [],
     _ref2 = _slicedToArray(_ref, 2),
     urlState = _ref2[0],
     setUrlState = _ref2[1];
@@ -358,9 +360,9 @@ var ProTable = function ProTable(props) {
           setFooterSuctionState(false);
         }
         // 如果有切换区tab，那么重新计算
-        if (headerFixedTopSectionDom.clientHeight) {
+        if (headerFixedTopSectionDom === null || headerFixedTopSectionDom === void 0 ? void 0 : headerFixedTopSectionDom.clientHeight) {
           var _headerFixedTopSectio;
-          var headerFixedTopSectionHeight = (_headerFixedTopSectio = headerFixedTopSectionDom.clientHeight) !== null && _headerFixedTopSectio !== void 0 ? _headerFixedTopSectio : 0;
+          var headerFixedTopSectionHeight = (_headerFixedTopSectio = headerFixedTopSectionDom === null || headerFixedTopSectionDom === void 0 ? void 0 : headerFixedTopSectionDom.clientHeight) !== null && _headerFixedTopSectio !== void 0 ? _headerFixedTopSectio : 0;
           // const clientTableBodyHeight =
           //   document.body.clientHeight - offsetHeaderHeight;
           setHeaderHeight(headerFixedTopSectionHeight + teamixNavHeight + footerRowSelectionHeight + tableHeaderHeight + 1);
@@ -1220,7 +1222,8 @@ var ProTable = function ProTable(props) {
   }, [fullscreenState, fixedTableBody, footerSuction, footerSuctionState]);
   return /*#__PURE__*/_react.default.createElement(_Fullscreen.default, {
     visible: fullscreenState,
-    actionRef: actionRef
+    actionRef: actionRef,
+    key: props.key
   }, function (isFullScreen) {
     return /*#__PURE__*/_react.default.createElement("div", {
       className: cls({

package/lib/table/typing.d.ts

@@ -189,6 +189,8 @@ export declare type ProTableProps = {
     /** 使用超大数据模式 **/
     useMaxData?: boolean;
     rowSelection?: rowSelectionType;
+    /** React Key **/
+    key?: React.Key | null;
 } & Omit<TableProps, 'columns' | 'rowSelection'> & ProTableTopAreaProps;
 export declare type rowSelectionType = {
     getProps?: (record: any, index: number) => any;

package/lib/table/utils/genAutoWidthColumns.js

@@ -48,7 +48,10 @@ function genAutoWidthColumns(columns, ref, data, size, useRowSelection, actionCo
     return columns;
   }
   var finalColumns = [];
-  var filterdColumnsResult = _utils._.cloneDeep(columns);
+  // @FIXME: lodash 的 cloneDeep 无法正确处理 columns 内部含有 ReactNode 的情况。我们也不该用 React 以外的工具来复制 ReactNode
+  // 因为它里面的 fiber node id 等等的在复制后并不会变，对于 React 来讲这就意味着两个 ReactNode 有相同的 fiber node id，不符合预期。
+  // 先注释掉，后续再想办法
+  var filterdColumnsResult = columns; // _.cloneDeep(columns);
   filterdColumnsResult.forEach(function (column, index) {
     var render = column.render,
       _column$valueType = column.valueType,

package/lib/table/utils/useTableSelection.js

@@ -46,6 +46,10 @@ function useTableSelection() {
   var dataRef = (0, _react.useRef)({
     selectedRowKeys: config.selectedRowKeys || defaultSelectedRowKeys
   });
+  var onSetSelectedRowKeys = function onSetSelectedRowKeys(keys) {
+    setSelectedRowKeys(keys);
+    dataRef.current.selectedRowKeys = keys;
+  };
   (0, _react.useEffect)(function () {
     var _config$selectedRowKe, _config$selectedRowKe2;
     setSelectedRowKeys((_config$selectedRowKe = config === null || config === void 0 ? void 0 : config.selectedRowKeys) !== null && _config$selectedRowKe !== void 0 ? _config$selectedRowKe : []);
@@ -153,7 +157,7 @@ function useTableSelection() {
   return {
     rowSelection: rowSelection,
     selectedRowKeys: selectedRowKeys,
-    setSelectedRowKeys: setSelectedRowKeys,
+    setSelectedRowKeys: onSetSelectedRowKeys,
     selectedRecords: selectedRecords,
     setSelectedRecords: setSelectedRecords
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.5.44",
+  "version": "1.5.46-beat.2",
   "description": "TeamixPro大包",
   "keywords": [
     "aliyun",
@@ -39,7 +39,7 @@
     "@teamix/formily": "2.2.4",
     "@teamix/hooks": "^0.1.0",
     "@teamix/pop-confirm": "^1.2.4",
-    "@teamix/pro-field": "^1.0.0",
+    "@teamix/pro-field": "1.0.107-beta.2",
     "@teamix/pro-page-container": "^1.0.0",
     "@teamix/pro-skeleton": "^1.0.0",
     "@teamix/result": "^1.0.29",