@teamix/pro 1.5.36 → 1.5.37

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

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

@@ -15,7 +15,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * 渲染列的逻辑函数
  */
 import React from 'react';
-import { getTargetValue } from '@teamix/utils';
+import { getTargetValue, _ } from '@teamix/utils';
 import { ProActionGroup } from '../../../actions';
 import ProField from '../../../field';
 /**
@@ -200,6 +200,10 @@ var equalColumns = function equalColumns(prevProps, nextProps) {
   if (preValue === false && nextValue === false || nextValue === undefined) {
     return false;
   }
+  // 如果不是 string 类型，全部刷新
+  if (!_.isString(nextValue)) {
+    return false;
+  }
   if (preValue === nextValue) {
     return true;
   }

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

@@ -130,7 +130,7 @@ var Layout = function Layout(props) {
     }
   }, [
   //todo: 重复render 问题都在这里
-  dataFilter, mainAction, dataFilterFormRef, afterDataFilter]);
+  dataFilter, mainAction, dataFilterFormRef, afterDataFilter, rowSelection]);
   // 区域组合渲染
   var renderLayout = function renderLayout() {
     if (header && mainAction) {

package/es/table/index.js

@@ -422,9 +422,9 @@ var ProTable = function ProTable(props) {
       if (showSkeleton && result) {
         result.disabled = true;
       }
-      return _objectSpread(_objectSpread({
+      return _objectSpread({
         _primaryKey: props.primaryKey
-      }, record), result);
+      }, result);
     },
     titleProps: function titleProps() {
       var result = {};
@@ -437,7 +437,7 @@ var ProTable = function ProTable(props) {
       return result;
     },
     onChange: onChangeRowSelection
-  }), primaryKey);
+  }), data !== null && data !== void 0 ? data : propsDataSource, primaryKey);
   var rowSelection = useRowSelection ? rowSelectionHook.rowSelection : propsRowSelection;
   var selectedCount = (rowSelection === null || rowSelection === void 0 ? void 0 : (_rowSelection$selecte = rowSelection.selectedRowKeys) === null || _rowSelection$selecte === void 0 ? void 0 : _rowSelection$selecte.length) || 0;
   useEffect(function () {

package/es/table/utils/genAutoWidthColumns.js

@@ -61,7 +61,6 @@ export function genAutoWidthColumns(columns, ref, data, size, useRowSelection, a
       finalColumns.push(column);
       return;
     }
-    ;
     if ((column === null || column === void 0 ? void 0 : column.columnFilters) === false) {
       finalColumns.push(column);
       return;
@@ -100,7 +99,8 @@ export function genAutoWidthColumns(columns, ref, data, size, useRowSelection, a
       return;
     }
     // @ts-ignore
-    var titleWidth = _.get(childNodes, '[index]?.children[0].scrollWidth', 0);
+    var titleWidth = _.get(childNodes[index], "children[0].scrollWidth", 0);
+    // const titleWidth = childNodes[index]?.children[0].scrollWidth
     // @ts-ignore
     if (fixedWidthTypeList[finalType]) {
       // console.log(

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

@@ -1,3 +1,26 @@
-import { rowSelectionType, innerRowSelectionType } from '../typing';
-declare function useTableSelection(config?: rowSelectionType, primaryKey?: string): innerRowSelectionType;
+import { innerRowSelectionType } from '../typing';
+declare function useTableSelection(config: ({
+    getProps?: ((record: any, index: number) => any) | undefined;
+    onChange?: ((selectedRowKeys: any[], records: any[]) => void) | undefined;
+    onSelect?: ((selected: boolean, record: any, records: any[]) => void) | undefined;
+    onSelectAll?: ((selected: boolean, records: any[]) => void) | undefined;
+    selectedRowKeys?: any[] | undefined;
+    selectedRecords?: any[] | undefined;
+    mode?: "multiple" | "single" | undefined;
+    titleProps?: (() => any) | undefined;
+    columnProps?: (() => any) | undefined;
+    titleAddons?: (() => any) | undefined;
+    defaultSelectedRowKeys?: any[] | undefined;
+    defaultSelectedRecords?: any[] | undefined;
+} & {
+    getProps?: ((record: any, index: number) => void) | undefined;
+    onChange?: ((selectedRowKeys: any[], records: any[]) => void) | undefined;
+    onSelect?: ((selected: boolean, record: any, records: any[]) => void) | undefined;
+    onSelectAll?: ((selected: boolean, records: any[]) => void) | undefined;
+    selectedRowKeys?: any[] | undefined;
+    mode?: "multiple" | "single" | undefined;
+    titleProps?: (() => any) | undefined;
+    columnProps?: (() => any) | undefined;
+    titleAddons?: (() => any) | undefined;
+}) | undefined, records: any, primaryKey?: string): innerRowSelectionType;
 export default useTableSelection;

package/es/table/utils/useTableSelection.js

@@ -1,4 +1,4 @@
-var _excluded = ["primaryKey"];
+var _excluded = ["primaryKey", "_primaryKey"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -24,7 +24,8 @@ import { Balloon, Checkbox } from '@alicloudfe/components';
 var Tooltip = Balloon.Tooltip;
 function useTableSelection() {
   var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var primaryKey = arguments.length > 1 ? arguments[1] : undefined;
+  var records = arguments.length > 1 ? arguments[1] : undefined;
+  var primaryKey = arguments.length > 2 ? arguments[2] : undefined;
   var _config$defaultSelect = config.defaultSelectedRecords,
     defaultSelectedRecords = _config$defaultSelect === void 0 ? [] : _config$defaultSelect,
     _config$defaultSelect2 = config.defaultSelectedRowKeys,
@@ -72,18 +73,21 @@ function useTableSelection() {
       config.onChange(value, records);
     }
   }
-  var renderCheckBox = function renderCheckBox(props) {
+  var renderCheckBox = function renderCheckBox(props, record) {
     var primaryKey = props.primaryKey,
+      _primaryKey = props._primaryKey,
       others = _objectWithoutProperties(props, _excluded);
     return /*#__PURE__*/React.createElement(Checkbox, _objectSpread({
       checked: selectedRowKeys.includes(primaryKey),
       onChange: function onChange(checked) {
+        var _config$onSelect;
+        config === null || config === void 0 ? void 0 : (_config$onSelect = config.onSelect) === null || _config$onSelect === void 0 ? void 0 : _config$onSelect.call(config, checked, record, records);
         if (checked) {
-          _onChange === null || _onChange === void 0 ? void 0 : _onChange([].concat(_toConsumableArray(selectedRowKeys), [primaryKey]), [props]);
+          _onChange === null || _onChange === void 0 ? void 0 : _onChange([].concat(_toConsumableArray(selectedRowKeys), [primaryKey]), [record]);
         } else {
           _onChange === null || _onChange === void 0 ? void 0 : _onChange(selectedRowKeys.filter(function (item) {
             return item !== primaryKey;
-          }), [props]);
+          }), [record]);
         }
       }
     }, others));
@@ -104,13 +108,13 @@ function useTableSelection() {
           return /*#__PURE__*/React.createElement(Tooltip, {
             trigger: renderCheckBox(_objectSpread(_objectSpread({}, propResult), {}, {
               primaryKey: primaryKey
-            })),
+            }), record),
             align: "t"
           }, propResult.disabledTooltip);
         }
         return renderCheckBox(_objectSpread(_objectSpread({}, propResult), {}, {
           primaryKey: primaryKey
-        }));
+        }), record);
       }
     });
   };

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

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

@@ -204,6 +204,10 @@ var equalColumns = function equalColumns(prevProps, nextProps) {
   if (preValue === false && nextValue === false || nextValue === undefined) {
     return false;
   }
+  // 如果不是 string 类型，全部刷新
+  if (!_utils._.isString(nextValue)) {
+    return false;
+  }
   if (preValue === nextValue) {
     return true;
   }

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

@@ -139,7 +139,7 @@ var Layout = function Layout(props) {
     }
   }, [
   //todo: 重复render 问题都在这里
-  dataFilter, mainAction, dataFilterFormRef, afterDataFilter]);
+  dataFilter, mainAction, dataFilterFormRef, afterDataFilter, rowSelection]);
   // 区域组合渲染
   var renderLayout = function renderLayout() {
     if (header && mainAction) {

package/lib/table/index.js

@@ -443,9 +443,9 @@ var ProTable = function ProTable(props) {
       if (showSkeleton && result) {
         result.disabled = true;
       }
-      return _objectSpread(_objectSpread({
+      return _objectSpread({
         _primaryKey: props.primaryKey
-      }, record), result);
+      }, result);
     },
     titleProps: function titleProps() {
       var result = {};
@@ -458,7 +458,7 @@ var ProTable = function ProTable(props) {
       return result;
     },
     onChange: onChangeRowSelection
-  }), primaryKey);
+  }), data !== null && data !== void 0 ? data : propsDataSource, primaryKey);
   var rowSelection = useRowSelection ? rowSelectionHook.rowSelection : propsRowSelection;
   var selectedCount = (rowSelection === null || rowSelection === void 0 ? void 0 : (_rowSelection$selecte = rowSelection.selectedRowKeys) === null || _rowSelection$selecte === void 0 ? void 0 : _rowSelection$selecte.length) || 0;
   (0, _react.useEffect)(function () {

package/lib/table/utils/genAutoWidthColumns.js

@@ -71,7 +71,6 @@ function genAutoWidthColumns(columns, ref, data, size, useRowSelection, actionCo
       finalColumns.push(column);
       return;
     }
-    ;
     if ((column === null || column === void 0 ? void 0 : column.columnFilters) === false) {
       finalColumns.push(column);
       return;
@@ -110,7 +109,8 @@ function genAutoWidthColumns(columns, ref, data, size, useRowSelection, actionCo
       return;
     }
     // @ts-ignore
-    var titleWidth = _utils._.get(childNodes, '[index]?.children[0].scrollWidth', 0);
+    var titleWidth = _utils._.get(childNodes[index], "children[0].scrollWidth", 0);
+    // const titleWidth = childNodes[index]?.children[0].scrollWidth
     // @ts-ignore
     if (fixedWidthTypeList[finalType]) {
       // console.log(

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

@@ -1,3 +1,26 @@
-import { rowSelectionType, innerRowSelectionType } from '../typing';
-declare function useTableSelection(config?: rowSelectionType, primaryKey?: string): innerRowSelectionType;
+import { innerRowSelectionType } from '../typing';
+declare function useTableSelection(config: ({
+    getProps?: ((record: any, index: number) => any) | undefined;
+    onChange?: ((selectedRowKeys: any[], records: any[]) => void) | undefined;
+    onSelect?: ((selected: boolean, record: any, records: any[]) => void) | undefined;
+    onSelectAll?: ((selected: boolean, records: any[]) => void) | undefined;
+    selectedRowKeys?: any[] | undefined;
+    selectedRecords?: any[] | undefined;
+    mode?: "multiple" | "single" | undefined;
+    titleProps?: (() => any) | undefined;
+    columnProps?: (() => any) | undefined;
+    titleAddons?: (() => any) | undefined;
+    defaultSelectedRowKeys?: any[] | undefined;
+    defaultSelectedRecords?: any[] | undefined;
+} & {
+    getProps?: ((record: any, index: number) => void) | undefined;
+    onChange?: ((selectedRowKeys: any[], records: any[]) => void) | undefined;
+    onSelect?: ((selected: boolean, record: any, records: any[]) => void) | undefined;
+    onSelectAll?: ((selected: boolean, records: any[]) => void) | undefined;
+    selectedRowKeys?: any[] | undefined;
+    mode?: "multiple" | "single" | undefined;
+    titleProps?: (() => any) | undefined;
+    columnProps?: (() => any) | undefined;
+    titleAddons?: (() => any) | undefined;
+}) | undefined, records: any, primaryKey?: string): innerRowSelectionType;
 export default useTableSelection;

package/lib/table/utils/useTableSelection.js

@@ -8,7 +8,7 @@ exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _utils = require("@teamix/utils");
 var _components = require("@alicloudfe/components");
-var _excluded = ["primaryKey"];
+var _excluded = ["primaryKey", "_primaryKey"];
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -29,7 +29,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var Tooltip = _components.Balloon.Tooltip;
 function useTableSelection() {
   var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var primaryKey = arguments.length > 1 ? arguments[1] : undefined;
+  var records = arguments.length > 1 ? arguments[1] : undefined;
+  var primaryKey = arguments.length > 2 ? arguments[2] : undefined;
   var _config$defaultSelect = config.defaultSelectedRecords,
     defaultSelectedRecords = _config$defaultSelect === void 0 ? [] : _config$defaultSelect,
     _config$defaultSelect2 = config.defaultSelectedRowKeys,
@@ -77,18 +78,21 @@ function useTableSelection() {
       config.onChange(value, records);
     }
   }
-  var renderCheckBox = function renderCheckBox(props) {
+  var renderCheckBox = function renderCheckBox(props, record) {
     var primaryKey = props.primaryKey,
+      _primaryKey = props._primaryKey,
       others = _objectWithoutProperties(props, _excluded);
     return /*#__PURE__*/_react.default.createElement(_components.Checkbox, _objectSpread({
       checked: selectedRowKeys.includes(primaryKey),
       onChange: function onChange(checked) {
+        var _config$onSelect;
+        config === null || config === void 0 ? void 0 : (_config$onSelect = config.onSelect) === null || _config$onSelect === void 0 ? void 0 : _config$onSelect.call(config, checked, record, records);
         if (checked) {
-          _onChange === null || _onChange === void 0 ? void 0 : _onChange([].concat(_toConsumableArray(selectedRowKeys), [primaryKey]), [props]);
+          _onChange === null || _onChange === void 0 ? void 0 : _onChange([].concat(_toConsumableArray(selectedRowKeys), [primaryKey]), [record]);
         } else {
           _onChange === null || _onChange === void 0 ? void 0 : _onChange(selectedRowKeys.filter(function (item) {
             return item !== primaryKey;
-          }), [props]);
+          }), [record]);
         }
       }
     }, others));
@@ -109,13 +113,13 @@ function useTableSelection() {
           return /*#__PURE__*/_react.default.createElement(Tooltip, {
             trigger: renderCheckBox(_objectSpread(_objectSpread({}, propResult), {}, {
               primaryKey: primaryKey
-            })),
+            }), record),
             align: "t"
           }, propResult.disabledTooltip);
         }
         return renderCheckBox(_objectSpread(_objectSpread({}, propResult), {}, {
           primaryKey: primaryKey
-        }));
+        }), record);
       }
     });
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.5.36",
+  "version": "1.5.37",
   "description": "TeamixPro大包",
   "keywords": [
     "aliyun",