@teamix/pro 1.5.26-beta-2 → 1.5.26-beta-4

package/dist/pro.js

@@ -112715,6 +112715,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _templates__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(3397);
 /* harmony import */ var _teamix_icon__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(89227);
 var _window;
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 
 
@@ -112754,8 +112755,8 @@ if (!((_window = window) != null && _window.TEAMIXPRO_WITHOUT_ICON)) {
 
 
 
-var version = '1.5.26-beta-2';
-
+var version = '1.5.26-beta-4';
+console.log('Pro版本', version);
 // By TeamixTest
 window.postMessage({
   source: 'teamix-test-devtools',
@@ -112766,15 +112767,12 @@ window.postMessage({
   moduleType: 'TeamixPro',
   componentName: 'TeamixPro'
 }, '*');
-// window.TeamixMaterial = {
-//   ...window.TeamixMaterial,
-//   ProTable: ProTable
-// }
-
-// window.TeamixPro = {
-//   ...window.TeamixPro,
-//   ProTable: ProTable
-// }
+window.TeamixMaterial = _extends({}, window.TeamixMaterial, {
+  ProTable: _table__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z
+});
+window.TeamixPro = _extends({}, window.TeamixPro, {
+  ProTable: _table__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z
+});
 
 // console.log('TeamixPro')
 
@@ -117832,9 +117830,28 @@ var processBuriedPoint = function processBuriedPoint(render, record, value, inde
     }))];
   }))));
 };
-/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (/*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___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;
+};
+/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (/*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().memo(Cell, equalColumns));
 
 /***/ }),
 
@@ -118751,7 +118768,7 @@ var TableContent = function TableContent(props) {
     emptyContent: memorizedEmptyContent
   }, rest));
 };
-/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (/*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().memo(TableContent));
+/* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (TableContent);
 
 /***/ }),
 
@@ -119950,7 +119967,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,
@@ -120625,7 +120641,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,_utils__WEBPACK_IMPORTED_MODULE_8__/* .emit */ .j8)('PRO_TABLE_REFRESH_TIMER_FLAG', Number(time));
     }
@@ -120823,7 +120841,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,_utils__WEBPACK_IMPORTED_MODULE_8__/* .emit */ .j8)('PRO_TABLE_REFRESH_TIMER_FLAG', Number(time));
           }
@@ -120889,10 +120907,9 @@ var ProTable = function ProTable(props) {
     }
   }, [customRequest, showLoading, showSkeleton, customTableLoading, props.loading, getData]);
   var memorizedGenProColumnToColumn = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
-    return (0,_utils_genProColumnToColumn__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(filteredColumns, showSkeleton, actionRef, context, dataTeamixSpm, bindUrl, bindUrlProps);
-  }, [
-  // filteredColumns,
-  showSkeleton, actionRef, context, dataTeamixSpm, bindUrl, bindUrlProps]);
+    var result = (0,_utils_genProColumnToColumn__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(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__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
@@ -121495,7 +121512,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;
     }
@@ -121547,6 +121564,7 @@ function genAutoWidthColumns(fileteredColumns, ref, data, size, useRowSelection,
       //   fixedWidthTypeList[finalType],
       // );
       // 固定宽度
+      // console.log(column.title, '固定宽度')
       column.isAutoWidth = true;
       column.width = defaultPaddingFixer(
       // @ts-ignore
@@ -121555,17 +121573,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.sortable && column != null && column.tooltip) {
+      if (column != null && column.sortable && (column != null && column.tooltip || column != null && column.filters)) {
         // 检测有 sortable 和 tooltip 的时候增加宽度
         column.width = column.width + 40;
       }
@@ -121605,8 +121625,12 @@ var shadowContainer = function shadowContainer(props) {
       //@ts-ignore
       !fixedWidthTypeList[valueType] && data.map(function (item, index) {
         // @ts-ignore
-        column.smartWidth = (0,_columnRender__WEBPACK_IMPORTED_MODULE_3__/* .renderCellSmartWidth */ .mn)(getValueFromRecord(dataIndex, item), column, index, item);
-        return (0,_pureColumnRender__WEBPACK_IMPORTED_MODULE_2__/* .renderCell */ .c)(getValueFromRecord(dataIndex, item), column, index, item);
+        var newColumn = _.cloneDeep(column);
+        newColumn.smartWidth = (0,_columnRender__WEBPACK_IMPORTED_MODULE_3__/* .renderCellSmartWidth */ .mn)(getValueFromRecord(dataIndex, item), column, index, item);
+        newColumn.render = _extends({}, column.render, {
+          description: ''
+        });
+        return (0,_pureColumnRender__WEBPACK_IMPORTED_MODULE_2__/* .renderCell */ .c)(getValueFromRecord(dataIndex, item), newColumn, index, item);
       }));
     }
   }));
@@ -121781,10 +121805,12 @@ function defaultPaddingFixer(width, size, half) {
   return size === 'medium' ? width + (half ? 16 : 32) + 0.5 : width + (half ? 8 : 16) + 0.5;
 }
 function sum(list) {
+  var _list;
   if (list === void 0) {
     list = [];
   }
-  return list.reduce(function (a, b) {
+  if (list.length === 0) return 0;
+  return (_list = list) == null ? void 0 : _list.reduce(function (a, b) {
     return a + b;
   });
 }
@@ -121880,6 +121906,15 @@ dataTeamixSpm, bindUrl, bindUrlProps) {
           context: context,
           dataTeamixSpm: dataTeamixSpm
         });
+        // return renderCell(
+        //   value,
+        //   columnProps,
+        //   index,
+        //   record,
+        //   actionRef,
+        //   context,
+        //   dataTeamixSpm
+        // )
       }
     });
   });