@ccs-ui/rc-pro 1.1.13 → 1.1.15

package/es/dialog/HookModal.d.ts

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

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

@@ -10,7 +10,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 import { MoreOutlined } from '@ant-design/icons';
 import { useUpdate, useUpdateEffect } from 'ahooks';
-import { Button, Dropdown, Empty, Tabs } from 'antd';
+import { Button, Dropdown, Empty, Tabs, theme } from 'antd';
 import classnames from 'classnames';
 import _debounce from 'lodash/debounce';
 import ResizeObserver from 'rc-resize-observer';
@@ -44,6 +44,9 @@ export default (function (_ref) {
     locationKey = location.key;
   var outlet = useOutlet();
   var update = useUpdate();
+  var _theme$useToken = theme.useToken(),
+    token = _theme$useToken.token;
+  var isDark = token._appTheme === 'dark';
 
   // 超过缓存数量，删除第一个
   if (components.current.length >= maxLen) {
@@ -219,12 +222,13 @@ export default (function (_ref) {
       children: /*#__PURE__*/_jsx("div", {})
     }), /*#__PURE__*/_jsx(Tabs, {
       id: "keep-alive-tabs",
-      hideAdd: true,
-      size: "small",
+      hideAdd: true
+      // size="small"
+      ,
       onChange: function onChange(e) {
         history.push(e);
       },
-      className: "ccs-keep-alive-tabs",
+      className: "ccs-keep-alive-tabs ".concat(isDark ? 'dark' : ''),
       activeKey: pathname,
       type: "editable-card",
       onEdit: function onEdit(e) {

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

@@ -5,7 +5,11 @@
   flex-direction: column;
 
   &-tabs {
-    // background: rgb(240 242 245);
+    background-color: #fff;
+
+    &.dark {
+      background-color: rgb(37, 37, 37);
+    }
 
     & > .ant-tabs-nav {
       margin: 0;
@@ -18,6 +22,15 @@
         border: 0;
         border-radius: 0 !important;
       }
+      .ant-tabs-tab-active {
+        background-color: #f0f2f5;
+      }
+    }
+
+    &.dark > .ant-tabs-nav {
+      .ant-tabs-tab-active {
+        background-color: #2b2c2c;
+      }
     }
   }
 }

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

@@ -23,7 +23,8 @@ export default /*#__PURE__*/memo(function (props) {
       style: {
         flex: '1 1 auto',
         display: active ? 'block' : 'none',
-        position: 'relative'
+        position: 'relative',
+        padding: 16
       },
       id: id,
       "data-display": active,

package/es/pro-grid/index.d.ts

@@ -0,0 +1,25 @@
+import { CardProps } from 'antd';
+import { CSSProperties, FC, ReactNode } from 'react';
+import './index.less';
+type ClassProps = {
+    className?: string;
+    style?: CSSProperties;
+};
+type CcsProGridProps = ClassProps & {
+    title?: string;
+    titleExtra?: ReactNode;
+    bordered?: boolean;
+    hideTitle?: boolean;
+    children?: ReactNode;
+};
+type ColProps = CardProps & {
+    colSpan?: string | number;
+    colStyle?: CSSProperties;
+    colClassName?: string;
+};
+type GridInstance = FC<CcsProGridProps> & {
+    Col: typeof GridCol;
+};
+declare const GridCol: ({ colSpan, colClassName, colStyle, ...otherProps }: ColProps) => import("react/jsx-runtime").JSX.Element;
+declare const ProGrid: GridInstance;
+export default ProGrid;

package/es/pro-grid/index.js

@@ -10,7 +10,6 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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; }
 import { Card } from 'antd';
 import classNames from 'classnames';
-import { GridContext } from "./context";
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -47,36 +46,31 @@ var Grid = function Grid(_ref2) {
     bordered = _ref2.bordered,
     children = _ref2.children,
     restProps = _objectWithoutProperties(_ref2, _excluded2);
-  return /*#__PURE__*/_jsx(GridContext.Provider, {
-    value: {
-      inProGrid: true
-    },
-    children: /*#__PURE__*/_jsxs("div", _objectSpread(_objectSpread({}, restProps), {}, {
-      className: classNames({
-        'ccs-pg-border': bordered
-      }),
-      children: [!hideTitle && title ? /*#__PURE__*/_jsx(Card, {
-        title: title,
-        extra: titleExtra,
-        bordered: false,
+  return /*#__PURE__*/_jsxs("div", _objectSpread(_objectSpread({}, restProps), {}, {
+    className: classNames({
+      'ccs-pg-border': bordered
+    }),
+    children: [!hideTitle && title ? /*#__PURE__*/_jsx(Card, {
+      title: title,
+      extra: titleExtra,
+      bordered: false,
+      style: {
+        borderRadius: 0
+      },
+      bodyStyle: {
+        padding: 0
+      }
+    }) : null, /*#__PURE__*/_jsx("div", {
+      className: "ccs-pl-table-content",
+      children: /*#__PURE__*/_jsx("div", {
         style: {
-          borderRadius: 0
+          display: 'flex',
+          padding: 10
         },
-        bodyStyle: {
-          padding: 0
-        }
-      }) : null, /*#__PURE__*/_jsx("div", {
-        className: "ccs-pl-table-content",
-        children: /*#__PURE__*/_jsx("div", {
-          style: {
-            display: 'flex',
-            padding: 10
-          },
-          children: children
-        })
-      })]
-    }))
-  });
+        children: children
+      })
+    })]
+  }));
 };
 var ProGrid = Grid;
 ProGrid.Col = GridCol;

package/es/pro-table/table.js

@@ -21,7 +21,6 @@ import _isArray from 'lodash/isArray';
 import React, { useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { CcsUtils, CcsWaterMark } from '..';
 import { useCcsPage } from "../";
-import useProGrid from "../pro-grid/useProGrid";
 import CcsTable from "../table";
 import "./index.less";
 import SearchComponent from "./search";
@@ -106,8 +105,6 @@ var InternalProTable = function InternalProTable(props) {
   var tableRef = useRef(null);
   var _useCcsPage = useCcsPage(),
     onAuth = _useCcsPage.onAuth;
-  var _useProGrid = useProGrid(),
-    inProGrid = _useProGrid.inProGrid;
   var _ref = table || {},
     pagination = _ref.pagination,
     request = _ref.request,
@@ -476,9 +473,7 @@ var InternalProTable = function InternalProTable(props) {
       children: toolbarExtra
     }), /*#__PURE__*/_jsxs("div", {
       className: "".concat(classPrefix, "-table-content"),
-      style: _objectSpread({
-        padding: isInModalOrDrawer || inProGrid ? 0 : 16
-      }, tableStyle),
+      style: tableStyle,
       ref: tableRef,
       children: [renderTable(), children]
     })]

package/es/table/index.js

@@ -60,7 +60,7 @@ var CustomTable = function CustomTable(props) {
         if (_pagination && _pagination.length > 0) {
           pageHeight = _pagination[0].clientHeight;
         }
-        var scrollHeight = bodyHeight - top - 16 - theadHeight - pageHeight - (restProps.title ? 46 : 0) - (restProps.footer ? 46 : 0);
+        var scrollHeight = bodyHeight - top - 32 - theadHeight - pageHeight - (restProps.title ? 46 : 0) - (restProps.footer ? 46 : 0);
 
         // 固定tbody高度
         var tbody = (_ref$current4 = ref.current) === null || _ref$current4 === void 0 ? void 0 : _ref$current4.getElementsByClassName('ant-table-body');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "1.1.13",
+  "version": "1.1.15",
   "description": "A react pro components",
   "license": "MIT",
   "module": "es/index.js",

package/es/pro-grid/context.js

@@ -1,4 +0,0 @@
-import React from 'react';
-export var GridContext = /*#__PURE__*/React.createContext({
-  inProGrid: false
-});

package/es/pro-grid/useProGrid.js

@@ -1,10 +0,0 @@
-import { useContext } from 'react';
-import { GridContext } from "./context";
-function useProGrid() {
-  var context = useContext(GridContext);
-  if (context === undefined) {
-    throw new Error('TabsContext must be used within a app page');
-  }
-  return context;
-}
-export default useProGrid;