@ccs-ui/rc-pro 2.0.6 → 2.0.8

package/es/dialog/DialogRequestButton.d.ts

@@ -1,7 +1,7 @@
 import { FormProps } from 'antd';
 import { DialogFormRef } from './form';
 import { CcsDialogModalProps } from './hook';
-declare const DialogRequestButton: ({ auth, formRef, extraBtn, formInitialValues, request, onCancel, onRequestBefore, }: Pick<CcsDialogModalProps, "request" | "auth" | "onCancel" | "extraBtn" | "onRequestBefore"> & {
+declare const DialogRequestButton: ({ auth, formRef, extraBtn, formInitialValues, request, onCancel, onRequestBefore, }: Pick<CcsDialogModalProps, "auth" | "request" | "onCancel" | "extraBtn" | "onRequestBefore"> & {
     formRef: React.RefObject<DialogFormRef>;
     formInitialValues: FormProps['initialValues'];
 }) => import("react/jsx-runtime").JSX.Element;

package/es/full-screen/index.d.ts

@@ -1 +1,3 @@
-export default function FullScreen(): import("react/jsx-runtime").JSX.Element;
+export default function FullScreen({ onFullScreen, }: {
+    onFullScreen: (isFull: boolean) => void;
+}): import("react/jsx-runtime").JSX.Element;

package/es/full-screen/index.js

@@ -9,30 +9,21 @@ import { Button, Tooltip } from 'antd';
 import { useState } from 'react';
 import { classPrefix } from "../pro-table/table";
 import { jsx as _jsx } from "react/jsx-runtime";
-export default function FullScreen() {
+export default function FullScreen(_ref) {
+  var onFullScreen = _ref.onFullScreen;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     isFull = _useState2[0],
     setIsFull = _useState2[1];
-  var handleOnFullScreen = function handleOnFullScreen(full) {
-    var display = full ? 'none' : '';
-    var header = document.getElementsByClassName('ccs-layout-header');
-    if (header && header.length > 0) header[0].style.display = display;
-    var menu = document.getElementsByClassName('ccs-layout-menu');
-    if (menu && menu.length > 0) menu[0].style.display = display;
-    var alive = document.getElementsByClassName('ccs-keep-alive');
-    if (alive && alive.length > 0) {
-      var tabs = alive[0].getElementsByClassName('ant-tabs');
-      if (tabs && tabs.length > 0) tabs[0].style.display = display;
-    }
-    var inf = !isFull;
-    setIsFull(inf);
+  var handleOnFullScreen = function handleOnFullScreen() {
+    setIsFull(!isFull);
+    onFullScreen(!isFull);
   };
   return /*#__PURE__*/_jsx(Tooltip, {
     title: isFull ? '取消全屏' : '全屏',
     children: isFull ? /*#__PURE__*/_jsx(Button, {
       onClick: function onClick() {
-        return handleOnFullScreen(false);
+        return handleOnFullScreen();
       },
       icon: /*#__PURE__*/_jsx(FullscreenExitOutlined, {
         className: "".concat(classPrefix, "-icon")
@@ -43,7 +34,7 @@ export default function FullScreen() {
       }
     }) : /*#__PURE__*/_jsx(Button, {
       onClick: function onClick() {
-        return handleOnFullScreen(true);
+        return handleOnFullScreen();
       },
       icon: /*#__PURE__*/_jsx(FullscreenOutlined, {
         className: "".concat(classPrefix, "-icon")

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

@@ -35,9 +35,11 @@
 
   &-tabs {
     background-color: #fff;
+    border-bottom: 1px solid #f1f2f5;
 
     &.dark {
       background-color: rgb(37, 37, 37);
+      border-bottom: 0;
     }
 
     & > .ant-tabs-nav {
@@ -70,7 +72,7 @@
   }
 
   .ccs-table-item-scroll > div {
-    padding: 16px;
+    padding: 10px 16px 16px 16px;
     flex-direction: column;
     display: none;
   }

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

@@ -6,7 +6,7 @@
   .ccs-table-item-scroll > div {
     display: flex;
     flex-direction: column;
-    padding: 16px;
+    padding: 10px 16px 16px 16px;
   }
 }
 

package/es/pro-table/index.less

@@ -19,6 +19,15 @@
   }
 }
 
+.ccs-pl.css-table-full {
+  position: fixed;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  z-index: 9999;
+}
+
 .ccs-pl {
   flex: auto;
   display: flex;

package/es/pro-table/operation.d.ts

@@ -5,10 +5,10 @@ type PropsType = {
     /** 显示列 */
     columns?: any;
     tableRowSize: TableProps['size'];
-    isInModalOrDrawer: boolean;
     tableRef: React.MutableRefObject<TableRefType | undefined>;
     onReset: () => void;
+    onFullScreen: (isFull: boolean) => void;
     onChangeRowSize: (e: TableProps['size']) => void;
 };
-export default function TableOperation({ columns, tableRef, tableRowSize, isInModalOrDrawer, onReset, onChangeRowSize, }: PropsType): import("react/jsx-runtime").JSX.Element;
+export default function TableOperation({ columns, tableRef, tableRowSize, onReset, onFullScreen, onChangeRowSize, }: PropsType): import("react/jsx-runtime").JSX.Element;
 export {};

package/es/pro-table/operation.js

@@ -20,8 +20,8 @@ export default function TableOperation(_ref) {
   var columns = _ref.columns,
     tableRef = _ref.tableRef,
     tableRowSize = _ref.tableRowSize,
-    isInModalOrDrawer = _ref.isInModalOrDrawer,
     onReset = _ref.onReset,
+    onFullScreen = _ref.onFullScreen,
     onChangeRowSize = _ref.onChangeRowSize;
   var _useState = useState(columns),
     _useState2 = _slicedToArray(_useState, 2),
@@ -187,6 +187,8 @@ export default function TableOperation(_ref) {
           }
         })
       })
-    }), !isInModalOrDrawer && /*#__PURE__*/_jsx(CcsFullScreenButton, {})]
+    }), /*#__PURE__*/_jsx(CcsFullScreenButton, {
+      onFullScreen: onFullScreen
+    })]
   });
 }

package/es/pro-table/table.js

@@ -409,9 +409,6 @@ var InternalProTable = function InternalProTable(props) {
     }
     onRequest('changePage', paginationTable.current || 0, paginationTable.pageSize || 10);
   };
-
-  // 判断是否在弹出框中
-  var isInModalOrDrawer = _typeof(stickyRef.current) === 'object' && stickyRef.current.isInDialog || false;
   var renderTable = function renderTable() {
     if (!table) return null;
     if (!isAuth) {
@@ -516,6 +513,15 @@ var InternalProTable = function InternalProTable(props) {
       borderRadius: 4
     }, rootStyle);
   }
+  var onFullScreen = function onFullScreen(isFull) {
+    var _ref4 = containerRef.current || {},
+      classList = _ref4.classList;
+    if (isFull) {
+      classList === null || classList === void 0 || classList.add('css-table-full');
+    } else {
+      classList === null || classList === void 0 || classList.remove('css-table-full');
+    }
+  };
   return /*#__PURE__*/_jsxs("div", {
     className: classNames(classPrefix, className, _defineProperty({}, 'dark-table', isDark)),
     style: _objectSpread(_objectSpread({}, rootStyle), {}, {
@@ -535,14 +541,14 @@ var InternalProTable = function InternalProTable(props) {
       formItemLabelWidth: props.formItemLabelWidth,
       onSearch: _onSearch,
       tableOperation: (table === null || table === void 0 ? void 0 : table.isEnableToolbar) !== false ? /*#__PURE__*/_jsx(TableOperation, {
-        isInModalOrDrawer: isInModalOrDrawer,
         onChangeRowSize: function onChangeRowSize(e) {
           return setTableRowSize(e);
         },
         tableRowSize: tableRowSize,
         onReset: _onReset,
         columns: columns,
-        tableRef: tableRef
+        tableRef: tableRef,
+        onFullScreen: onFullScreen
       }) : /*#__PURE__*/_jsx(_Fragment, {}),
       children: newToolbarExtra
     }), /*#__PURE__*/_jsxs("div", {

package/package.json

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