@ccs-ui/rc-pro 2.3.6-alpha-13 → 2.3.6-alpha-16

package/es/config.js

@@ -1,9 +1,12 @@
-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 = ["token", "cssVar", "components"];
 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; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+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 _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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -13,7 +16,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { darkTheme, defaultTheme } from '@ant-design/compatible';
 import { theme as antTheme, App, ConfigProvider, message, Modal, notification } from 'antd';
 import zhCN from 'antd/locale/zh_CN';
-import React, { useState } from 'react';
+import { insertCss } from 'insert-css';
+import React, { useEffect, useState } from 'react';
 import { AppConfigContext } from "./context";
 import { DialogElementsHolder } from "./dialog/hook";
 import ThemeDialog from "./theme-dialog";
@@ -57,6 +61,13 @@ function AppConfig(_ref) {
   var dialogHolderRef = React.useRef(null);
   // 主题
   var appTheme = theme === 'dark' ? darkTheme : defaultTheme;
+
+  // 传入的配置参数
+  var _ref2 = themeConfig || {},
+    token = _ref2.token,
+    cssVar = _ref2.cssVar,
+    components = _ref2.components,
+    otherConfig = _objectWithoutProperties(_ref2, _excluded);
   var algorithm = function algorithm() {
     var algorithms = theme === 'dark' ? [antTheme.darkAlgorithm] : [antTheme.defaultAlgorithm];
     if (isCompact) {
@@ -64,17 +75,23 @@ function AppConfig(_ref) {
     }
     return algorithms;
   };
+  useEffect(function () {
+    var prefix = _typeof(cssVar) === 'object' ? cssVar.prefix : 'ant';
+    var csss = [".ccs-tabs-auto-height > .ant-tabs-content-holder,\n      .ccs-tabs-auto-height > .ant-tabs-content-holder > .ant-tabs-content,\n      .ccs-tabs-auto-height > .ant-tabs-content-holder > .ant-tabs-content > div,\n      .ccs-tabs-auto-height> .ant-tabs-content-holder> .ant-tabs-content> div> .ccs-pl { height: 100%;}", ".ccs-keep-alive-nav .".concat(prefix, "-tabs-tab {border: 0 !important;border-radius: 0 !important;}"), ".ccs-keep-alive-nav .".concat(prefix, "-tabs-tab-active {background-color: #f0f2f5 !important;}"), ".ccs-keep-alive .dark .ccs-keep-alive-nav .".concat(prefix, "-tabs-tab-active {background-color: #2b2c2c !important;} ")];
+    insertCss(csss.join(''));
+  }, []);
+  useEffect(function () {}, []);
 
   // 合并token
-  var token = _objectSpread(_objectSpread({}, appTheme.token), themeConfig === null || themeConfig === void 0 ? void 0 : themeConfig.token);
-
+  var newToken = _objectSpread(_objectSpread({}, appTheme.token), token);
   // 暗黑模式背景色
-  if (theme === 'dark') token.colorBgContainer = 'rgb(36, 37, 37)';
+  if (theme === 'dark') newToken.colorBgContainer = 'rgb(36, 37, 37)';
   return /*#__PURE__*/_jsx(ConfigProvider, {
     locale: zhCN,
-    theme: _objectSpread(_objectSpread({}, appTheme), {}, {
-      token: token,
-      components: _objectSpread(_objectSpread({}, appTheme.components), themeConfig === null || themeConfig === void 0 ? void 0 : themeConfig.components),
+    theme: _objectSpread(_objectSpread(_objectSpread({}, appTheme), otherConfig), {}, {
+      cssVar: cssVar,
+      token: newToken,
+      components: _objectSpread(_objectSpread({}, appTheme.components), components),
       algorithm: algorithm()
     }),
     children: /*#__PURE__*/_jsxs(AppConfigContext.Provider, {

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>, "onOk" | "onClose" | "auth" | "extraBtn" | "request" | "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/layout-keep-alive/index.js

@@ -18,11 +18,9 @@ import { MoreOutlined } from '@ant-design/icons';
 import CcsUtils from '@ccs-ui/utils';
 import { useUpdate, useUpdateEffect } from 'ahooks';
 import { Button, Dropdown, Tabs } from 'antd';
-import { ConfigContext } from 'antd/es/config-provider';
 import classnames from 'classnames';
 import updateHelper from 'immutability-helper';
-import { insertCss } from 'insert-css';
-import { useContext, useEffect, useMemo, useRef } from 'react';
+import { useMemo, useRef } from 'react';
 import { useLocation } from 'react-router';
 import { useOutlet } from 'react-router-dom';
 import { CcsResult, useAppConfig } from '..';
@@ -137,7 +135,6 @@ function KeepAliveTabs(_ref) {
   var routers = useRef([]);
   var location = useLocation();
   var pathname = location.pathname;
-  var config = useContext(ConfigContext);
   var outlet = useOutlet();
   var update = useUpdate();
   var _useAppConfig = useAppConfig(),
@@ -149,11 +146,6 @@ function KeepAliveTabs(_ref) {
   if (routers.current.length >= maxLen) {
     routers.current = routers.current.slice(1);
   }
-  useEffect(function () {
-    var prefix = config.getPrefixCls();
-    var csss = [".ccs-keep-alive-nav .".concat(prefix, "-tabs-tab {border: 0 !important;border-radius: 0 !important;}"), ".ccs-keep-alive-nav .".concat(prefix, "-tabs-tab-active {background-color: #f0f2f5 !important;}"), ".ccs-keep-alive .dark .ccs-keep-alive-nav .".concat(prefix, "-tabs-tab-active {background-color: #2b2c2c !important;} ")];
-    insertCss(csss.join(''));
-  }, []);
 
   // 菜单改变，更新用户权限信息
   useUpdateEffect(function () {
@@ -363,7 +355,6 @@ function KeepAliveTabs(_ref) {
       type: "text"
     })
   });
-  console.log('routers', routers);
   return /*#__PURE__*/_jsxs("div", {
     className: classnames(className, "ccs-keep-alive"),
     children: [/*#__PURE__*/_jsx(Tabs, {

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

@@ -53,21 +53,24 @@
   }
   &-tabs {
     background-color: #fff;
-    border-bottom: 1px solid #f1f2f5;
 
-    .ccs-tab-item {
-      flex: 1 1 auto;
-      position: relative;
+    &.dark {
+      background-color: rgb(37, 37, 37);
     }
+  }
 
-    .ccs-sticky-scroll > div {
-      padding: 10px 16px 16px;
-      flex-direction: column;
-      display: none;
-    }
+  .ccs-tab-item {
+    flex: 1 1 auto;
+    position: relative;
+  }
 
-    .ccs-sticky-scroll.route-avtive > div {
-      display: flex;
-    }
+  .ccs-sticky-scroll > div {
+    padding: 10px 16px 16px;
+    flex-direction: column;
+    display: none;
+  }
+
+  .ccs-sticky-scroll.route-avtive > div {
+    display: flex;
   }
 }

package/es/pro-table/selection-alert.js

@@ -22,9 +22,6 @@ export default function SelectionAlert(_ref) {
   }
   return /*#__PURE__*/_jsxs(Space, {
     size: 4,
-    style: {
-      padding: '6px 12px'
-    },
     wrap: true,
     children: [data.map(function () {
       var row = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};

package/es/pro-table/table.js

@@ -631,6 +631,8 @@ var InternalProTable = function InternalProTable(props) {
 
   // 有查询条件
   var hasFormItem = formItems.length > 0;
+  // 头部间距
+  var tokenPadding = (table === null || table === void 0 ? void 0 : table.size) === 'small' ? token.paddingSM : token.padding;
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsx(CcsResizeObserver.Target, {
       targetRef: tableContentRef,
@@ -642,13 +644,13 @@ var InternalProTable = function InternalProTable(props) {
       }),
       ref: containerRef,
       children: [/*#__PURE__*/_jsx(Card, {
-        className: "ccs-pl-adaptation",
         style: {
-          boxShadow: 'none'
+          boxShadow: 'none',
+          borderRadius: 0
         },
         styles: {
           body: {
-            padding: hasFormItem ? 16 : 0
+            padding: hasFormItem ? tokenPadding : 0
           }
         },
         variant: "borderless",
@@ -672,7 +674,7 @@ var InternalProTable = function InternalProTable(props) {
             display: 'flex',
             justifyContent: 'space-between',
             width: '100%',
-            padding: '12px 16px',
+            padding: "".concat(token.paddingSM, "px ").concat(tokenPadding, "px"),
             alignContent: 'center'
           }
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "2.3.6-alpha-13",
+  "version": "2.3.6-alpha-16",
   "description": "",
   "license": "MIT",
   "author": {