@teamix/pro 1.5.36 → 1.5.38

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

@@ -9,7 +9,71 @@ export declare function off(key: string): void;
 /** table 组件内触发事件 不对外暴露 */
 export declare function emit(key: string, ...args: any): void;
 export declare function initActionRef(ref: React.MutableRefObject<ProTableActionType | undefined>, action: ProTableActionType): void;
-export declare function useActionType<T>(ref: React.MutableRefObject<ProTableActionType | undefined>, action: ProTableActionType): void;
+export declare function useActionType<T>(ref: React.MutableRefObject<ProTableActionType | undefined>, action: ProTableActionType): {
+    fullScreen?: (() => boolean) | undefined;
+    setColumn?: ((newColumns: ProTableColumnProps[], update?: boolean | undefined) => void) | undefined;
+    size?: "medium" | "small" | undefined;
+    setSize?: ((mode: "medium" | "small") => void) | undefined;
+    refresh?: ((params?: any) => void) | undefined;
+    request?: ((params?: any) => void) | undefined;
+    reset?: (() => void) | undefined;
+    rowSelection?: import("..").innerRowSelectionType | ({
+        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;
+    clearRowSelection?: (() => void) | undefined;
+    filterDataSource?: ((dataIndex: string) => void) | undefined;
+    pageInfo?: {
+        total?: number | undefined;
+        current?: number | undefined;
+        pageSize?: number | undefined;
+        targetPageKey?: string | undefined;
+        targetPageSizeKey?: string | undefined;
+    } | undefined;
+    resetPage?: (() => void) | undefined;
+    nextPage?: (() => void) | undefined;
+    dataFilterForm?: import("../..").ProFormType | undefined;
+    dataFilterFormRef?: import("react").MutableRefObject<import("../..").ProFormType> | undefined;
+    normalDataFilterForm?: import("../..").ProFormType | undefined;
+    fullscreenDataFilterForm?: import("../..").ProFormType | undefined;
+    filterEnableRef?: any;
+    data?: any[] | undefined;
+    switchView?: ((view: "table" | "card") => void) | undefined;
+    setData?: ((data: any[]) => void) | undefined;
+    setCardViewScrollPosition?: ((scrollTop: number) => void) | undefined;
+    setAutoRefreshTimers?: ((timers: number) => void) | undefined;
+    clearAutoRefreshTimers?: (() => void) | undefined;
+    getState?: (() => import("..").ProTableActionTypeState) | undefined;
+    setState?: ((key: string, value: any) => void) | undefined;
+    setFullScreenState?: ((state: boolean) => void) | undefined;
+    on?: ((...args: any) => void) | undefined;
+    off?: ((...args: any) => void) | undefined;
+    setFilterRules?: ((rules: import("..").ProTableColumnsFilterRulesItem) => void) | undefined;
+    getFilterRules?: (() => object) | undefined;
+    resetTableMaxBodyHeight?: ((offset: number) => void) | undefined;
+    filterColumns?: any[] | undefined;
+    getCallback?: (() => any) | undefined;
+};
 export declare function cloneDeep<T>(obj: T): T;
 /**
  * 处理默认过滤参数

package/lib/table/utils/index.js

@@ -106,6 +106,7 @@ function initActionRef(ref, action) {
 }
 function useActionType(ref, action) {
   ref.current = _objectSpread(_objectSpread({}, ref.current), action);
+  return _objectSpread(_objectSpread({}, ref.current), action);
 }
 function cloneDeep(obj) {
   return (0, _lodash.default)(obj);

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,12 +29,13 @@ 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,
     defaultSelectedRowKeys = _config$defaultSelect2 === void 0 ? [] : _config$defaultSelect2;
-  var _useState = (0, _react.useState)(defaultSelectedRowKeys),
+  var _useState = (0, _react.useState)(config.selectedRowKeys || defaultSelectedRowKeys),
     _useState2 = _slicedToArray(_useState, 2),
     selectedRowKeys = _useState2[0],
     setSelectedRowKeys = _useState2[1];
@@ -42,6 +43,10 @@ function useTableSelection() {
     _useState4 = _slicedToArray(_useState3, 2),
     selectedRecords = _useState4[0],
     setSelectedRecords = _useState4[1];
+  (0, _react.useEffect)(function () {
+    var _config$selectedRowKe;
+    setSelectedRowKeys((_config$selectedRowKe = config === null || config === void 0 ? void 0 : config.selectedRowKeys) !== null && _config$selectedRowKe !== void 0 ? _config$selectedRowKe : []);
+  }, [config.selectedRowKeys]);
   function _onChange(value, records) {
     if (primaryKey) {
       var newValue = value.filter(function (v) {
@@ -77,18 +82,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 +117,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.38",
   "description": "TeamixPro大包",
   "keywords": [
     "aliyun",