@teamix/pro 1.5.26-beta-3 → 1.5.26-beta-5

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.26-beta-2";
+declare const version = "1.5.26-beta-5";
 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,8 @@ export * from './sidebar';
 export * from './utils';
 export * from './timeline';
 export * from './image';
-var version = '1.5.26-beta-2';
+var version = '1.5.26-beta-5';
+console.log('Pro版本', version);
 // By TeamixTest
 window.postMessage({
   source: 'teamix-test-devtools',
@@ -48,14 +49,6 @@ window.postMessage({
   moduleType: 'TeamixPro',
   componentName: 'TeamixPro'
 }, '*');
-// window.TeamixMaterial = {
-//   ...window.TeamixMaterial,
-//   ProTable: ProTable
-// }
-// window.TeamixPro = {
-//   ...window.TeamixPro,
-//   ProTable: ProTable
-// }
 // console.log('TeamixPro')
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo,
 // ProLayout,

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

@@ -186,6 +186,24 @@ var processBuriedPoint = function processBuriedPoint() {
     }))];
   }))));
 };
-export default /*#__PURE__*/React.memo(Cell, function () {
-  return true;
-});
+var equalColumns = function equalColumns(prevProps, nextProps) {
+  var preValue = prevProps.value;
+  var nextValue = nextProps.value;
+  if (preValue === nextValue) {
+    return true;
+  }
+  // 针对 value 是数组类型的判断 value 是否和原来相等，相等则不渲染
+  if (Array.isArray(nextValue) && Array.isArray(preValue)) {
+    var nextValueStr = nextValue.map(function (item) {
+      return item.TagValue;
+    });
+    var preValueStr = preValue.map(function (item) {
+      return item.TagValue;
+    });
+    if (nextValueStr.toString() === preValueStr.toString()) {
+      return true;
+    }
+  }
+  return false;
+};
+export default /*#__PURE__*/React.memo(Cell, equalColumns);

package/es/table/components/TableContent/index.d.ts

@@ -1,8 +1,7 @@
-import React from 'react';
 import { EmptyContentProps } from '@teamix/pro-field';
 import { TableProps } from '@alicloudfe/components/types/table';
 export interface ITableContentProps extends TableProps {
     emptyProps?: EmptyContentProps;
 }
-declare const _default: React.MemoExoticComponent<(props: ITableContentProps) => JSX.Element>;
-export default _default;
+declare const TableContent: (props: ITableContentProps) => JSX.Element;
+export default TableContent;

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

@@ -20,4 +20,4 @@ var TableContent = function TableContent(props) {
     emptyContent: memorizedEmptyContent
   }, rest));
 };
-export default /*#__PURE__*/React.memo(TableContent);
+export default TableContent;

package/es/table/index.js

@@ -53,7 +53,6 @@ var globalFormatSort = function globalFormatSort(sort) {
 };
 var ProTable = function ProTable(props) {
   var _urlState$currentPage, _rowSelection$selecte;
-  console.log('ProTable 代理成功');
   var header = props.header,
     className = props.className,
     tableClassName = props.tableClassName,
@@ -714,7 +713,9 @@ var ProTable = function ProTable(props) {
     if (Number.isInteger(time) && time >= 1000) {
       autoRefreshTimerRef.current = setTimeout(function () {
         // 自动刷新不显示 loading
-        _request({}, true);
+        // 当表格自适应时，自动刷新要显示 loading ，否则表格自适应会出问题
+        // setShowLoading(true)
+        _request({}, !autoWidth);
       }, Number(time));
       emit('PRO_TABLE_REFRESH_TIMER_FLAG', Number(time));
     }
@@ -903,7 +904,7 @@ var ProTable = function ProTable(props) {
           if (Number.isInteger(time) && time >= 1000) {
             autoRefreshTimerRef.current = setTimeout(function () {
               // 自动刷新不显示 loading
-              _request(params, true);
+              _request(params, !autoWidth);
             }, Number(time));
             emit('PRO_TABLE_REFRESH_TIMER_FLAG', Number(time));
           }
@@ -968,10 +969,9 @@ var ProTable = function ProTable(props) {
     }
   }, [customRequest, showLoading, showSkeleton, customTableLoading, props.loading, getData]);
   var memorizedGenProColumnToColumn = useMemo(function () {
-    return genProColumnToColumn(filteredColumns, showSkeleton, actionRef, context, dataTeamixSpm, bindUrl, bindUrlProps);
-  }, [
-  // filteredColumns,
-  showSkeleton, actionRef, context, dataTeamixSpm, bindUrl, bindUrlProps]);
+    var result = genProColumnToColumn(filteredColumns, showSkeleton, actionRef, context, dataTeamixSpm, bindUrl, bindUrlProps);
+    return result;
+  }, [filteredColumns, showSkeleton, actionRef, context, dataTeamixSpm, bindUrl, bindUrlProps]);
   var renderTable = function renderTable(isFullScreen) {
     if (propsColumns) {
       return /*#__PURE__*/React.createElement("div", {

package/es/table/index.scss

@@ -103,7 +103,7 @@ $fullscreenPadding: 24px;
     pointer-events: none;
     display: flex;
   }
-  
+
   // sort icon
   .next-table-sort.next-table-header-icon {
     line-height: 16px;

package/es/table/utils/genAutoWidthColumns.js

@@ -54,7 +54,7 @@ export function genAutoWidthColumns(fileteredColumns, ref, data, size, useRowSel
     var shrink = fieldTypeShrink[finalType];
     column.shrink = column.shrink || (shrink !== undefined ? shrink : 1);
     if (column.isAutoWidth === true) {
-      console.log(column.title, 'isAutoWidth');
+      // console.log(column.title, 'isAutoWidth')
       finalColumns.push(column);
       return;
     }
@@ -105,6 +105,7 @@ export function genAutoWidthColumns(fileteredColumns, ref, data, size, useRowSel
       //   fixedWidthTypeList[finalType],
       // );
       // 固定宽度
+      // console.log(column.title, '固定宽度')
       column.isAutoWidth = true;
       column.width = defaultPaddingFixer(
       // @ts-ignore
@@ -112,17 +113,19 @@ export function genAutoWidthColumns(fileteredColumns, ref, data, size, useRowSel
       // @ts-ignore
     } else if (computeableWidthTypeList[finalType]) {
       // 可计算宽度
+      // console.log(column.title, '可计算宽度')
       column.isAutoWidth = true;
       column.width = defaultPaddingFixer(
       // @ts-ignore
       Math.max(titleWidth, computeableWidthTypeList[finalType](data, render)), size, index === 0 && useRowSelection);
     } else {
       // 直接根据 dom 计算
+      // console.log(column.title, '可计算 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)) {
+      if ((column === null || column === void 0 ? void 0 : column.sortable) && ((column === null || column === void 0 ? void 0 : column.tooltip) || (column === null || column === void 0 ? void 0 : column.filters))) {
         // 检测有 sortable 和 tooltip 的时候增加宽度
         column.width = column.width + 40;
       }
@@ -162,8 +165,12 @@ export var shadowContainer = function shadowContainer(props) {
       //@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);
+        var newColumn = _.cloneDeep(column);
+        newColumn.smartWidth = renderCellSmartWidth(getValueFromRecord(dataIndex, item), column, index, item);
+        newColumn.render = _objectSpread(_objectSpread({}, column.render), {}, {
+          description: ''
+        });
+        return renderCell(getValueFromRecord(dataIndex, item), newColumn, index, item);
       }));
     }
   }));
@@ -326,7 +333,8 @@ function defaultPaddingFixer(width) {
 }
 function sum() {
   var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  return list.reduce(function (a, b) {
+  if (list.length === 0) return 0;
+  return list === null || list === void 0 ? void 0 : list.reduce(function (a, b) {
     return a + b;
   });
 }

package/es/table/utils/genProColumnToColumn.js

@@ -54,6 +54,15 @@ showSkeleton, actionRef) {
           context: context,
           dataTeamixSpm: dataTeamixSpm
         });
+        // return renderCell(
+        //   value,
+        //   columnProps,
+        //   index,
+        //   record,
+        //   actionRef,
+        //   context,
+        //   dataTeamixSpm
+        // )
       }
     });
   });

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.26-beta-2";
+declare const version = "1.5.26-beta-5";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, ProImage, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -299,9 +299,10 @@ 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.26-beta-2';
-// By TeamixTest
+var version = '1.5.26-beta-5';
 exports.version = version;
+console.log('Pro版本', version);
+// By TeamixTest
 window.postMessage({
   source: 'teamix-test-devtools',
   url: window.location.href,
@@ -311,12 +312,4 @@ window.postMessage({
   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.js

@@ -190,7 +190,25 @@ var processBuriedPoint = function processBuriedPoint() {
     }))];
   }))));
 };
-var _default = /*#__PURE__*/_react.default.memo(Cell, function () {
-  return true;
-});
+var equalColumns = function equalColumns(prevProps, nextProps) {
+  var preValue = prevProps.value;
+  var nextValue = nextProps.value;
+  if (preValue === nextValue) {
+    return true;
+  }
+  // 针对 value 是数组类型的判断 value 是否和原来相等，相等则不渲染
+  if (Array.isArray(nextValue) && Array.isArray(preValue)) {
+    var nextValueStr = nextValue.map(function (item) {
+      return item.TagValue;
+    });
+    var preValueStr = preValue.map(function (item) {
+      return item.TagValue;
+    });
+    if (nextValueStr.toString() === preValueStr.toString()) {
+      return true;
+    }
+  }
+  return false;
+};
+var _default = /*#__PURE__*/_react.default.memo(Cell, equalColumns);
 exports.default = _default;

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

@@ -1,8 +1,7 @@
-import React from 'react';
 import { EmptyContentProps } from '@teamix/pro-field';
 import { TableProps } from '@alicloudfe/components/types/table';
 export interface ITableContentProps extends TableProps {
     emptyProps?: EmptyContentProps;
 }
-declare const _default: React.MemoExoticComponent<(props: ITableContentProps) => JSX.Element>;
-export default _default;
+declare const TableContent: (props: ITableContentProps) => JSX.Element;
+export default TableContent;

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

@@ -30,5 +30,5 @@ var TableContent = function TableContent(props) {
     emptyContent: memorizedEmptyContent
   }, rest));
 };
-var _default = /*#__PURE__*/_react.default.memo(TableContent);
+var _default = TableContent;
 exports.default = _default;

package/lib/table/index.js

@@ -74,7 +74,6 @@ var globalFormatSort = function globalFormatSort(sort) {
 };
 var ProTable = function ProTable(props) {
   var _urlState$currentPage, _rowSelection$selecte;
-  console.log('ProTable 代理成功');
   var header = props.header,
     className = props.className,
     tableClassName = props.tableClassName,
@@ -735,7 +734,9 @@ var ProTable = function ProTable(props) {
     if (Number.isInteger(time) && time >= 1000) {
       autoRefreshTimerRef.current = setTimeout(function () {
         // 自动刷新不显示 loading
-        _request({}, true);
+        // 当表格自适应时，自动刷新要显示 loading ，否则表格自适应会出问题
+        // setShowLoading(true)
+        _request({}, !autoWidth);
       }, Number(time));
       (0, _utils2.emit)('PRO_TABLE_REFRESH_TIMER_FLAG', Number(time));
     }
@@ -924,7 +925,7 @@ var ProTable = function ProTable(props) {
           if (Number.isInteger(time) && time >= 1000) {
             autoRefreshTimerRef.current = setTimeout(function () {
               // 自动刷新不显示 loading
-              _request(params, true);
+              _request(params, !autoWidth);
             }, Number(time));
             (0, _utils2.emit)('PRO_TABLE_REFRESH_TIMER_FLAG', Number(time));
           }
@@ -989,10 +990,9 @@ var ProTable = function ProTable(props) {
     }
   }, [customRequest, showLoading, showSkeleton, customTableLoading, props.loading, getData]);
   var memorizedGenProColumnToColumn = (0, _react.useMemo)(function () {
-    return (0, _genProColumnToColumn.default)(filteredColumns, showSkeleton, actionRef, context, dataTeamixSpm, bindUrl, bindUrlProps);
-  }, [
-  // filteredColumns,
-  showSkeleton, actionRef, context, dataTeamixSpm, bindUrl, bindUrlProps]);
+    var result = (0, _genProColumnToColumn.default)(filteredColumns, showSkeleton, actionRef, context, dataTeamixSpm, bindUrl, bindUrlProps);
+    return result;
+  }, [filteredColumns, showSkeleton, actionRef, context, dataTeamixSpm, bindUrl, bindUrlProps]);
   var renderTable = function renderTable(isFullScreen) {
     if (propsColumns) {
       return /*#__PURE__*/_react.default.createElement("div", {

package/lib/table/index.scss

@@ -103,7 +103,7 @@ $fullscreenPadding: 24px;
     pointer-events: none;
     display: flex;
   }
-  
+
   // sort icon
   .next-table-sort.next-table-header-icon {
     line-height: 16px;

package/lib/table/utils/genAutoWidthColumns.js

@@ -64,7 +64,7 @@ function genAutoWidthColumns(fileteredColumns, ref, data, size, useRowSelection,
     var shrink = fieldTypeShrink[finalType];
     column.shrink = column.shrink || (shrink !== undefined ? shrink : 1);
     if (column.isAutoWidth === true) {
-      console.log(column.title, 'isAutoWidth');
+      // console.log(column.title, 'isAutoWidth')
       finalColumns.push(column);
       return;
     }
@@ -115,6 +115,7 @@ function genAutoWidthColumns(fileteredColumns, ref, data, size, useRowSelection,
       //   fixedWidthTypeList[finalType],
       // );
       // 固定宽度
+      // console.log(column.title, '固定宽度')
       column.isAutoWidth = true;
       column.width = defaultPaddingFixer(
       // @ts-ignore
@@ -122,17 +123,19 @@ function genAutoWidthColumns(fileteredColumns, ref, data, size, useRowSelection,
       // @ts-ignore
     } else if (computeableWidthTypeList[finalType]) {
       // 可计算宽度
+      // console.log(column.title, '可计算宽度')
       column.isAutoWidth = true;
       column.width = defaultPaddingFixer(
       // @ts-ignore
       Math.max(titleWidth, computeableWidthTypeList[finalType](data, render)), size, index === 0 && useRowSelection);
     } else {
       // 直接根据 dom 计算
+      // console.log(column.title, '可计算 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)) {
+      if ((column === null || column === void 0 ? void 0 : column.sortable) && ((column === null || column === void 0 ? void 0 : column.tooltip) || (column === null || column === void 0 ? void 0 : column.filters))) {
         // 检测有 sortable 和 tooltip 的时候增加宽度
         column.width = column.width + 40;
       }
@@ -172,8 +175,12 @@ var shadowContainer = function shadowContainer(props) {
       //@ts-ignore
       !fixedWidthTypeList[valueType] && data.map(function (item, index) {
         // @ts-ignore
-        column.smartWidth = (0, _columnRender.renderCellSmartWidth)(getValueFromRecord(dataIndex, item), column, index, item);
-        return (0, _pureColumnRender.renderCell)(getValueFromRecord(dataIndex, item), column, index, item);
+        var newColumn = _.cloneDeep(column);
+        newColumn.smartWidth = (0, _columnRender.renderCellSmartWidth)(getValueFromRecord(dataIndex, item), column, index, item);
+        newColumn.render = _objectSpread(_objectSpread({}, column.render), {}, {
+          description: ''
+        });
+        return (0, _pureColumnRender.renderCell)(getValueFromRecord(dataIndex, item), newColumn, index, item);
       }));
     }
   }));
@@ -341,7 +348,8 @@ function defaultPaddingFixer(width) {
 }
 function sum() {
   var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  return list.reduce(function (a, b) {
+  if (list.length === 0) return 0;
+  return list === null || list === void 0 ? void 0 : list.reduce(function (a, b) {
     return a + b;
   });
 }

package/lib/table/utils/genProColumnToColumn.js

@@ -61,6 +61,15 @@ showSkeleton, actionRef) {
           context: context,
           dataTeamixSpm: dataTeamixSpm
         });
+        // return renderCell(
+        //   value,
+        //   columnProps,
+        //   index,
+        //   record,
+        //   actionRef,
+        //   context,
+        //   dataTeamixSpm
+        // )
       }
     });
   });

package/package.json

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