@ccs-ui/rc-pro 1.1.1-rc11 → 1.1.1-rc12

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

@@ -7,7 +7,6 @@ interface ClassProps {
 }
 interface CcsProGridProps extends ClassProps {
     title?: string;
-    titleStyle?: CSSProperties;
     titleExtra?: ReactNode;
     bordered?: boolean;
     hideTitle?: boolean;

package/es/pro-grid/index.js

@@ -1,6 +1,6 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 var _excluded = ["colSpan", "colClassName", "colStyle"],
-  _excluded2 = ["title", "titleStyle", "titleExtra", "hideTitle", "bordered", "children"];
+  _excluded2 = ["title", "titleExtra", "hideTitle", "bordered", "children"];
 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; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 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; }
@@ -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 React from 'react';
 import { GridContext } from "./context";
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -39,8 +38,6 @@ var GridCol = function GridCol(_ref) {
 };
 var Grid = function Grid(_ref2) {
   var title = _ref2.title,
-    _ref2$titleStyle = _ref2.titleStyle,
-    titleStyle = _ref2$titleStyle === void 0 ? {} : _ref2$titleStyle,
     titleExtra = _ref2.titleExtra,
     hideTitle = _ref2.hideTitle,
     bordered = _ref2.bordered,
@@ -54,18 +51,16 @@ var Grid = function Grid(_ref2) {
       className: classNames({
         'ccs-pg-border': bordered
       }),
-      children: [!hideTitle && title ? /*#__PURE__*/_jsxs("div", {
-        style: _objectSpread({
-          display: 'flex',
-          justifyContent: 'space-between'
-        }, titleStyle),
-        className: "ccs-pl-title",
-        children: [/*#__PURE__*/_jsx("div", {
-          children: title
-        }), /*#__PURE__*/_jsx("div", {
-          className: "ccs-pg-extra",
-          children: titleExtra
-        })]
+      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", {

package/es/pro-table/index.js

@@ -14,7 +14,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 import { useEventEmitter } from 'ahooks';
-import { Empty, Form } from 'antd';
+import { Empty, Form, theme } from 'antd';
 import classNames from 'classnames';
 import _debounce from 'lodash/debounce';
 import _isArray from 'lodash/isArray';
@@ -139,6 +139,8 @@ var ProTable = function ProTable(props) {
     setData = _useState2[1];
   var event$ = useEventEmitter();
   var treeRef = useRef(null);
+  var _theme$useToken = theme.useToken(),
+    token = _theme$useToken.token;
 
   // 权限判断
   var isAuth = useMemo(function () {
@@ -458,7 +460,7 @@ var ProTable = function ProTable(props) {
     }));
   };
   var render = /*#__PURE__*/_jsxs("div", {
-    className: classNames(classPrefix, className),
+    className: classNames(classPrefix, className, _defineProperty({}, 'dark-table', token._appTheme === 'dark')),
     style: style,
     children: [!(!formItems.length && !toolbar) && isAuth && /*#__PURE__*/_jsx(SearchComponent, {
       form: form,

package/es/pro-table/index.less

@@ -7,7 +7,7 @@
   }
 }
 
-.ccs-pl {
+.css-pl.dark-table {
   ::-webkit-scrollbar {
     width: 12px;
     height: 12px;
@@ -17,7 +17,9 @@
     background: rgb(42, 44, 44);
     border-radius: 3px;
   }
+}
 
+.ccs-pl {
   .ant-pagination {
     margin: 0 !important;
   }

package/package.json

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