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

package/es/button/group.d.ts

@@ -1,2 +1,2 @@
 import { CcsButtonGroupProps } from '.';
-export default function CssButtonGroup({ size, isLink, showCount, moreIcon, moreText, showRowsCount, items, onClick, }: CcsButtonGroupProps): import("react/jsx-runtime").JSX.Element | null;
+export default function CssButtonGroup({ size, isLink, showCount, moreIcon, moreText, items, onClick, }: CcsButtonGroupProps): import("react/jsx-runtime").JSX.Element | null;

package/es/button/group.js

@@ -1,7 +1,7 @@
 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); }
 var _excluded = ["onDisabled", "onHidden"],
-  _excluded2 = ["key", "label", "auth", "confirm", "onDisabled", "onHidden"],
-  _excluded3 = ["key", "label", "disabled", "auth", "confirm", "onDisabled", "onHidden"];
+  _excluded2 = ["key", "label", "auth", "confirm", "showRowsCount", "onDisabled", "onHidden"],
+  _excluded3 = ["key", "label", "disabled", "auth", "confirm", "showRowsCount", "onDisabled", "onHidden"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -25,7 +25,6 @@ export default function CssButtonGroup(_ref) {
     showCount = _ref.showCount,
     moreIcon = _ref.moreIcon,
     moreText = _ref.moreText,
-    showRowsCount = _ref.showRowsCount,
     _ref$items = _ref.items,
     items = _ref$items === void 0 ? [] : _ref$items,
     onClick = _ref.onClick;
@@ -35,7 +34,6 @@ export default function CssButtonGroup(_ref) {
   var _ref3 = useContext(TableSelectionContext) || {},
     selectedRows = _ref3.selectedRows;
   var authButtons = [];
-  var showSelectedRows = showRowsCount && selectedRows !== null && selectedRows !== void 0 && selectedRows.length ? "(".concat(selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length, ")") : '';
 
   // 过滤隐藏按钮
   authButtons = items.filter(function (item) {
@@ -86,7 +84,6 @@ export default function CssButtonGroup(_ref) {
     }
     onClick(key, selectedRows);
   };
-
   // link类型按钮
   if (isLink) {
     return /*#__PURE__*/_jsxs(_Fragment, {
@@ -102,6 +99,7 @@ export default function CssButtonGroup(_ref) {
             label = _ref5.label,
             auth = _ref5.auth,
             confirm = _ref5.confirm,
+            showRowsCount = _ref5.showRowsCount,
             onDisabled = _ref5.onDisabled,
             onHidden = _ref5.onHidden,
             restProps = _objectWithoutProperties(_ref5, _excluded2);
@@ -115,7 +113,7 @@ export default function CssButtonGroup(_ref) {
             onClick: function onClick() {
               return handleOnClick(key);
             },
-            children: [label, showSelectedRows]
+            children: [label, showRowsCount && selectedRows !== null && selectedRows !== void 0 && selectedRows.length ? "(".concat(selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length, ")") : '']
           }), key);
         })
       }), authButtons.length > 0 && /*#__PURE__*/_jsx(Dropdown, {
@@ -147,6 +145,7 @@ export default function CssButtonGroup(_ref) {
           disabled = _ref6.disabled,
           auth = _ref6.auth,
           confirm = _ref6.confirm,
+          showRowsCount = _ref6.showRowsCount,
           onDisabled = _ref6.onDisabled,
           onHidden = _ref6.onHidden,
           restProps = _objectWithoutProperties(_ref6, _excluded3);
@@ -162,7 +161,7 @@ export default function CssButtonGroup(_ref) {
                 return handleOnClick(key);
               },
               disabled: isDisabled,
-              children: [label, showRowsCount]
+              children: [label, showRowsCount && selectedRows !== null && selectedRows !== void 0 && selectedRows.length ? "(".concat(selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length, ")") : '']
             })), /*#__PURE__*/_jsx(Dropdown, {
               menu: {
                 items: authButtons,
@@ -183,7 +182,7 @@ export default function CssButtonGroup(_ref) {
           onClick: function onClick() {
             return handleOnClick(key);
           },
-          children: [label, showSelectedRows]
+          children: [label, showRowsCount && selectedRows !== null && selectedRows !== void 0 && selectedRows.length ? "(".concat(selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length, ")") : '']
         }), key);
       })
     }), items.find(function (i) {

package/es/button/index.d.ts

@@ -36,8 +36,6 @@ export type CcsButtonGroupProps = {
     moreIcon?: ReactNode;
     /** 更多文字 */
     moreText?: string;
-    /** 显示当前选中的记录条数 */
-    showRowsCount?: boolean;
     /** 点击事件 */
     onClick?: (key: string, selectedRows?: any[]) => void;
 };

package/es/ccs.d.ts

@@ -84,6 +84,8 @@ type AuthButtonItem = {
     icon?: ReactNode;
     /** 按钮操作确认消息 */
     confirm?: string;
+    /** 显示当前选中的记录条数 */
+    showRowsCount?: boolean;
 };
 type TriggerChildrenProps<T = any> = {
     /** 选中值 */

package/es/context/index.d.ts

@@ -51,10 +51,10 @@ type FnContextType<T = Store> = {
     close: () => void;
 };
 type CcsFieldNamesType = {
-    dataSource: string[];
-    total: string[];
-    current: string[];
-    pageSize: string[];
+    dataSource?: string[];
+    total?: string[];
+    current?: string[];
+    pageSize?: string[];
 };
 type CcsDialogFieldNames = {
     /** 成功标识字段 */

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>, "onClose" | "auth" | "onOk" | "request" | "extraBtn" | "requestFieldNames" | "preventRequestHandle"> & {
+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"> & {
     formRef: React.RefObject<DialogFormRef<TParams>>;
     formInitialValues: FormProps['initialValues'];
     buttonRef: RefObject<DialogButtonRef>;

package/es/table/index.js

@@ -141,7 +141,7 @@ var CustomTable = function CustomTable(props) {
         c.ellipsis = !isMultiRow;
         c.render = function (e) {
           return /*#__PURE__*/_jsx(Tooltip, {
-            zIndex: 2020,
+            zIndex: 9999,
             title: e,
             placement: "bottomLeft",
             destroyTooltipOnHide: true,

package/es/upload/index.js

@@ -87,15 +87,16 @@ function CcsUpload(_ref) {
       return f.status === 'uploading';
     })) return;
     if (maxCount === 1) {
-      var _fileList$;
+      var _fileList$, _fileList$2;
       // 只能上传一个文件
-      onChange((_fileList$ = fileList[0]) === null || _fileList$ === void 0 ? void 0 : _fileList$.fileId);
+      onChange(((_fileList$ = fileList[0]) === null || _fileList$ === void 0 || (_fileList$ = _fileList$.response) === null || _fileList$ === void 0 ? void 0 : _fileList$.data) || ((_fileList$2 = fileList[0]) === null || _fileList$2 === void 0 ? void 0 : _fileList$2.fileId));
     } else {
       // 上传完成的文件,返回上传结果集
-      onChange(fileList.filter(function (f) {
-        return !!f.fileId;
-      }).map(function (f) {
-        return f.fileId;
+      onChange(fileList.map(function (f) {
+        var _f$response;
+        return ((_f$response = f.response) === null || _f$response === void 0 ? void 0 : _f$response.data) || f.fileId;
+      }).filter(function (s) {
+        return s !== undefined;
       }));
     }
   };

package/package.json

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