@ccs-ui/rc-pro 2.3.3-beta-10 → 2.3.3

package/es/breadcrumb.d.ts

@@ -0,0 +1,8 @@
+import { BreadcrumbProps } from 'antd/lib';
+import { CSSProperties } from 'react';
+export default function CcsBreadcrumb({ items, style, className, history, }: {
+    style?: CSSProperties;
+    className?: string;
+    history: any;
+    items: BreadcrumbProps['items'];
+}): import("react/jsx-runtime").JSX.Element;

package/es/breadcrumb.js

@@ -0,0 +1,37 @@
+import { Space } from 'antd';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+export default function CcsBreadcrumb(_ref) {
+  var _ref$items = _ref.items,
+    items = _ref$items === void 0 ? [] : _ref$items,
+    style = _ref.style,
+    className = _ref.className,
+    history = _ref.history;
+  var _onClick = function onClick(href) {
+    if (!href || !history) return;
+    history.push(href);
+  };
+  return /*#__PURE__*/_jsx(Space, {
+    className: className,
+    style: style,
+    children: items.map(function (item, index) {
+      return /*#__PURE__*/_jsxs(_Fragment, {
+        children: [/*#__PURE__*/_jsx("div", {
+          style: item.href ? {
+            color: 'rgba(0, 0, 0, 0.45)'
+          } : {},
+          onClick: function onClick() {
+            return _onClick(item.href);
+          },
+          children: item.title
+        }, index), index !== items.length - 1 && /*#__PURE__*/_jsx("div", {
+          style: {
+            color: 'rgba(0, 0, 0, 0.45)'
+          },
+          children: "/"
+        })]
+      });
+    })
+  });
+}

package/es/button/group.js

@@ -37,7 +37,7 @@ export default function CssButtonGroup(_ref) {
 
   // 过滤隐藏按钮
   authButtons = items.filter(function (item) {
-    return !item.hidden && !(item.onHidden && item.onHidden(selectedRows));
+    return !item.hidden && !(item.onHidden && item.onHidden(selectedRows || []));
   });
 
   // link按钮删除无用参数
@@ -150,7 +150,7 @@ export default function CssButtonGroup(_ref) {
           onHidden = _ref6.onHidden,
           restProps = _objectWithoutProperties(_ref6, _excluded3);
         // 按钮禁用
-        var isDisabled = disabled || onDisabled && onDisabled(selectedRows);
+        var isDisabled = disabled || onDisabled && onDisabled(selectedRows || []);
 
         // 更多按钮
         if (index === showBtns.length - 1 && authButtons.length > 0) {

package/es/ccs.d.ts

@@ -73,9 +73,9 @@ type AuthButtonItem = {
     /** 按钮禁用 */
     disabled?: boolean;
     /** 根据选中数据判断是否禁用 */
-    onDisabled?: (selectedRows?: any[]) => boolean;
+    onDisabled?: (selectedRows: any[]) => boolean;
     /** 根据选中数据判断是否隐藏 */
-    onHidden?: (selectedRows?: any[]) => boolean;
+    onHidden?: (selectedRows: any[]) => boolean;
     /** 按钮隐藏 */
     hidden?: boolean;
     /** 警告按钮 */

package/es/dialog/button.d.ts

@@ -16,7 +16,7 @@ export type DialogButtonsProps<T> = Pick<CcsDialogModalProps, 'okText' | 'onClos
 export type DialogButtonRef = {
     onSetButtons: (e: React.ReactElement) => void;
 };
-export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<CcsDialogModalProps<TParams, TData>, "auth" | "request" | "onClose" | "onOk" | "extraBtn" | "requestFieldNames" | "preventRequestHandle"> & {
+export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<CcsDialogModalProps<TParams, TData>, "onClose" | "onOk" | "auth" | "extraBtn" | "request" | "requestFieldNames" | "preventRequestHandle"> & {
     formRef: React.RefObject<DialogFormRef<TParams>>;
     formInitialValues: FormProps['initialValues'];
     buttonRef: RefObject<DialogButtonRef>;

package/es/layout-keep-alive/index.js

@@ -23,6 +23,7 @@ import { useMemo, useRef } from 'react';
 import { useLocation } from 'react-router';
 import { useOutlet } from 'react-router-dom';
 import { useAppConfig } from '..';
+import CcsBreadcrumb from "../breadcrumb";
 import "./index.less";
 import Page from "./page";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -343,7 +344,11 @@ export default function KeepAliveTabs(_ref) {
         onDestroy: onDestroy,
         urlAuthList: urlAuthList,
         timestamp: timestamp,
-        breadcrumb: breadcrumb,
+        breadcrumbNode: /*#__PURE__*/_jsx(CcsBreadcrumb, {
+          history: history,
+          className: "ccs-breadcrumb",
+          items: breadcrumb
+        }),
         children: outlet
       }, key);
     })]

package/es/layout-keep-alive/page.d.ts

@@ -1,11 +1,13 @@
-/// <reference types="react" />
+import { ReactNode } from 'react';
 import { Location } from 'react-router';
 import { CacheComponent } from '.';
-export type CachePageProps = Pick<CacheComponent, 'breadcrumb' | 'urlAuthList' | 'children' | 'timestamp'> & {
+export type CachePageProps = Pick<CacheComponent, 'urlAuthList' | 'children' | 'timestamp'> & {
     /** 选中状态 */
     active: boolean;
     /** router location */
     location: Location;
+    /** 面包屑 */
+    breadcrumbNode: ReactNode;
     /** 销毁页面 */
     onDestroy: (path: string) => void;
 };

package/es/layout-keep-alive/page.js

@@ -1,4 +1,3 @@
-import { Breadcrumb } from 'antd';
 import classNames from 'classnames';
 import { memo, useRef } from 'react';
 import Scrollbars from 'react-custom-scrollbars';
@@ -12,7 +11,7 @@ export default /*#__PURE__*/memo(function (props) {
     active = props.active,
     urlAuthList = props.urlAuthList,
     onDestroy = props.onDestroy,
-    breadcrumb = props.breadcrumb;
+    breadcrumbNode = props.breadcrumbNode;
   var id = "_tab_content_".concat(locationRef.current.key);
   var dialogHolderRef = useRef(null);
   return /*#__PURE__*/_jsx(PageContext.Provider, {
@@ -38,10 +37,7 @@ export default /*#__PURE__*/memo(function (props) {
         className: classNames('ccs-sticky-scroll', {
           'route-avtive': active
         }),
-        children: [/*#__PURE__*/_jsx(Breadcrumb, {
-          items: breadcrumb,
-          className: "ccs-breadcrumb"
-        }), children, /*#__PURE__*/_jsx(DialogElementsHolder, {
+        children: [breadcrumbNode, children, /*#__PURE__*/_jsx(DialogElementsHolder, {
           ref: dialogHolderRef
         }, "modal-drawer-holder")]
       })

package/es/layout-single-page/index.js

@@ -2,6 +2,7 @@ import classnames from 'classnames';
 import { useMemo } from 'react';
 import { useLocation } from 'react-router';
 import { useOutlet } from 'react-router-dom';
+import CcsBreadcrumb from "../breadcrumb";
 import { findMenusByUrl } from "../layout-keep-alive";
 import CcsResult from "../result";
 import "./index.less";
@@ -52,7 +53,11 @@ export default function SinglePage(_ref) {
     children: menuInfo !== null && menuInfo !== void 0 && menuInfo.auth ? /*#__PURE__*/_jsx(Page, {
       location: location,
       urlAuthList: menuInfo.auth,
-      breadcrumb: menuInfo.breadcrumb,
+      breadcrumbNode: /*#__PURE__*/_jsx(CcsBreadcrumb, {
+        history: history,
+        className: "ccs-breadcrumb",
+        items: menuInfo.breadcrumb
+      }),
       children: outlet
     }) : /*#__PURE__*/_jsx(CcsResult.NotFound, {
       style: {

package/es/layout-single-page/page.d.ts

@@ -1,9 +1,11 @@
-import { JSXElementConstructor, ReactElement } from 'react';
+import { JSXElementConstructor, ReactElement, ReactNode } from 'react';
 import { Location } from 'react-router';
 import { CacheComponent } from '../layout-keep-alive';
-export type SinglePageProps = Pick<CacheComponent, 'breadcrumb' | 'urlAuthList'> & {
+export type SinglePageProps = Pick<CacheComponent, 'urlAuthList'> & {
     /** router location */
     location: Location;
+    /** 面包屑 */
+    breadcrumbNode: ReactNode;
     /** children */
     children: ReactElement<any, string | JSXElementConstructor<any>> | null;
 };

package/es/layout-single-page/page.js

@@ -1,4 +1,3 @@
-import { Breadcrumb } from 'antd';
 import { memo, useRef } from 'react';
 import Scrollbars from 'react-custom-scrollbars';
 import { PageContext } from "../context";
@@ -10,8 +9,7 @@ export default /*#__PURE__*/memo(function (props) {
   var children = props.children,
     _props$urlAuthList = props.urlAuthList,
     urlAuthList = _props$urlAuthList === void 0 ? [] : _props$urlAuthList,
-    _props$breadcrumb = props.breadcrumb,
-    breadcrumb = _props$breadcrumb === void 0 ? [] : _props$breadcrumb;
+    breadcrumbNode = props.breadcrumbNode;
   var dialogHolderRef = useRef(null);
   return /*#__PURE__*/_jsx(PageContext.Provider, {
     value: {
@@ -29,10 +27,7 @@ export default /*#__PURE__*/memo(function (props) {
     children: /*#__PURE__*/_jsxs(Scrollbars, {
       autoHide: true,
       className: "ccs-sticky-scroll",
-      children: [/*#__PURE__*/_jsx(Breadcrumb, {
-        items: breadcrumb,
-        className: "ccs-breadcrumb"
-      }), children, /*#__PURE__*/_jsx(DialogElementsHolder, {
+      children: [breadcrumbNode, children, /*#__PURE__*/_jsx(DialogElementsHolder, {
         ref: dialogHolderRef
       }, "modal-drawer-holder")]
     })

package/es/pro-table/table.js

@@ -1,3 +1,6 @@
+var _excluded = ["type"];
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
@@ -15,7 +18,7 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import CcsUtils from '@ccs-ui/utils';
 import { useSize, useUpdateEffect } from 'ahooks';
-import { Empty, Form, theme as antTheme } from 'antd';
+import { theme as antTheme, Empty, Form } from 'antd';
 import classNames from 'classnames';
 import React, { useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { useAppConfig, useCcsPage } from '..';
@@ -73,8 +76,32 @@ var InternalProTable = function InternalProTable(props) {
     rowKey = _ref.rowKey;
   // table sticky
   var stickyRef = useRef(false);
+
+  // 字段默认过滤，排序值
+  var defaultColumnValues = useMemo(function () {
+    var defaultValue = {
+      filters: {},
+      orderProps: []
+    };
+    columns === null || columns === void 0 || columns.forEach(function (c) {
+      // 排序
+      if (c.sorter && c.defaultSortOrder !== undefined) {
+        defaultValue.orderProps.push({
+          prop: c.dataIndex,
+          ascending: c.defaultSortOrder === 'ascend'
+        });
+      }
+
+      // 过滤
+      if (c.filters && c.defaultFilteredValue !== undefined) {
+        defaultValue.filters[c.dataIndex] = c.defaultFilteredValue;
+      }
+    });
+    return defaultValue;
+  }, []);
+
   // column filter
-  var filtersRef = useRef({});
+  var filtersRef = useRef(defaultColumnValues);
   // table content
   var tableContentRef = useRef(null);
   // container
@@ -330,14 +357,14 @@ var InternalProTable = function InternalProTable(props) {
     // 清空columns显示filter和sort值
     columns === null || columns === void 0 || columns.forEach(function (c) {
       if (c.filterDropdown || c.filters) {
-        c.filteredValue = null;
+        c.filteredValue = c.defaultFilteredValue;
       }
       if (c.sorter) {
-        c.sortOrder = undefined;
+        c.sortOrder = c.defaultSortOrder;
       }
     });
     // 清空filter请求值
-    filtersRef.current = {};
+    filtersRef.current = defaultColumnValues;
     onRequest('reset');
   };
 
@@ -386,18 +413,17 @@ var InternalProTable = function InternalProTable(props) {
         filters: filters
       });
     }
-
-    // @ts-ignore
     if (sorter) {
       columns === null || columns === void 0 || columns.forEach(function (c) {
         if (c.sorter) {
+          var curSorter = Array.isArray(sorter) ?
           // @ts-ignore
-          if (c.dataIndex !== sorter.field) {
-            c.sortOrder = undefined;
-            return;
-          }
+          sorter.find(function (sort) {
+            return sort.field === c.dataIndex;
+          }) : sorter;
+
           // @ts-ignore
-          c.sortOrder = sorter === null || sorter === void 0 ? void 0 : sorter.order;
+          c.sortOrder = curSorter === null || curSorter === void 0 ? void 0 : curSorter.order;
         }
       });
 
@@ -449,8 +475,14 @@ var InternalProTable = function InternalProTable(props) {
       }
     }
 
-    // selection
-    var rowSelection = table.rowSelection && CcsUtils.isEmpty(table.rowSelection) ? {
+    // 选择,只传入一个type参数或不传，封装选择行为
+    var _ref4 = table.rowSelection || {},
+      _ref4$type = _ref4.type,
+      type = _ref4$type === void 0 ? 'checkbox' : _ref4$type,
+      restSelection = _objectWithoutProperties(_ref4, _excluded);
+    var hasSelection = table.rowSelection && CcsUtils.isEmpty(restSelection);
+    var rowSelection = hasSelection ? {
+      type: type,
       selectedRowKeys: selectedRows.map(function (k) {
         return k[rowKey];
       }),
@@ -532,9 +564,9 @@ var InternalProTable = function InternalProTable(props) {
     }, rootStyle);
   }
   var onFullScreen = function onFullScreen(isFull) {
-    var _ref4 = containerRef.current || {},
-      classList = _ref4.classList,
-      style = _ref4.style;
+    var _ref5 = containerRef.current || {},
+      classList = _ref5.classList,
+      style = _ref5.style;
     if (isFull) {
       classList === null || classList === void 0 || classList.add('css-table-full');
       style.backgroundColor = token.colorBgContainer;

package/es/upload/index.d.ts

@@ -20,7 +20,14 @@ export type CcsUploadProps = Pick<UploadProps, 'maxCount' | 'data' | 'multiple'
     /** 上传change事件 */
     onChange?: (value: any) => void;
     /** 上传请求 */
-    uploadRequest: <T = any>(file: File, options?: RecordType) => Promise<T>;
+    uploadRequest: (file: File, options?: RecordType) => Promise<{
+        /** 成功标识 */
+        success: boolean;
+        /** 返回文件id */
+        data: string;
+        /** 异常消息 */
+        msg?: string;
+    }>;
 };
 export type FileUploadList = UploadChangeParam['fileList'][0] & {
     fileId?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "2.3.3-beta-10",
+  "version": "2.3.3",
   "description": "",
   "license": "MIT",
   "author": {