@ccs-ui/rc-pro 2.3.6-alpha-17 → 2.3.6-alpha-19

package/es/config.js

@@ -1,10 +1,11 @@
-var _excluded = ["token", "cssVar", "components"];
+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 = ["theme", "prefixCls"],
+  _excluded2 = ["token", "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(); }
@@ -56,19 +57,24 @@ function AppConfig(_ref) {
     theme = _ref$theme === void 0 ? 'light' : _ref$theme,
     isCompact = _ref.isCompact,
     watermark = _ref.watermark,
-    themeConfig = _ref.themeConfig,
+    antConfig = _ref.antConfig,
     fieldNames = _ref.fieldNames;
   var dialogHolderRef = React.useRef(null);
   // 主题
   var appTheme = theme === 'dark' ? darkTheme : defaultTheme;
+  var _ref2 = antConfig || {},
+    themeConfig = _ref2.theme,
+    _ref2$prefixCls = _ref2.prefixCls,
+    prefixCls = _ref2$prefixCls === void 0 ? 'ant' : _ref2$prefixCls,
+    otherAntConfig = _objectWithoutProperties(_ref2, _excluded);
 
   // 传入的配置参数
-  var _ref2 = themeConfig || {},
-    token = _ref2.token,
-    cssVar = _ref2.cssVar,
-    components = _ref2.components,
-    otherConfig = _objectWithoutProperties(_ref2, _excluded);
-  console.log('themeConfig', themeConfig);
+  var _ref3 = themeConfig || {},
+    token = _ref3.token,
+    components = _ref3.components,
+    otherThemeConfig = _objectWithoutProperties(_ref3, _excluded2);
+
+  // 主题算法
   var algorithm = function algorithm() {
     var algorithms = theme === 'dark' ? [antTheme.darkAlgorithm] : [antTheme.defaultAlgorithm];
     if (isCompact) {
@@ -77,21 +83,19 @@ function AppConfig(_ref) {
     return algorithms;
   };
   useEffect(function () {
-    var prefix = _typeof(cssVar) === 'object' ? cssVar.prefix : 'ant';
-    console.log('prefix', prefix);
-    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;} "), ".ccs-pl .".concat(prefix, "-table-title {padding:0} ")];
+    var csss = [".ccs-tabs-auto-height > .".concat(prefixCls, "-tabs-content-holder,\n      .ccs-tabs-auto-height > .").concat(prefixCls, "-tabs-content-holder > .").concat(prefixCls, "-tabs-content,\n      .ccs-tabs-auto-height > .").concat(prefixCls, "-tabs-content-holder > .").concat(prefixCls, "-tabs-content > div,\n      .ccs-tabs-auto-height> .").concat(prefixCls, "-tabs-content-holder> .").concat(prefixCls, "-tabs-content> div> .ccs-pl { height: 100%;}"), ".ccs-keep-alive-nav .".concat(prefixCls, "-tabs-tab {border: 0 !important;border-radius: 0 !important;}"), ".ccs-keep-alive-nav .".concat(prefixCls, "-tabs-tab-active {background-color: #f0f2f5 !important;}"), ".ccs-keep-alive .dark .ccs-keep-alive-nav .".concat(prefixCls, "-tabs-tab-active {background-color: #2b2c2c !important;} "), ".ccs-pl .".concat(prefixCls, "-table-title {padding: 0 !important;} ")];
     insertCss(csss.join(''));
   }, []);
-  useEffect(function () {}, []);
 
   // 合并token
   var newToken = _objectSpread(_objectSpread({}, appTheme.token), token);
   // 暗黑模式背景色
   if (theme === 'dark') newToken.colorBgContainer = 'rgb(36, 37, 37)';
-  return /*#__PURE__*/_jsx(ConfigProvider, {
+  return /*#__PURE__*/_jsx(ConfigProvider, _objectSpread(_objectSpread({
     locale: zhCN,
-    theme: _objectSpread(_objectSpread(_objectSpread({}, appTheme), otherConfig), {}, {
-      cssVar: cssVar,
+    prefixCls: prefixCls
+  }, otherAntConfig), {}, {
+    theme: _objectSpread(_objectSpread(_objectSpread({}, appTheme), otherThemeConfig), {}, {
       token: newToken,
       components: _objectSpread(_objectSpread({}, appTheme.components), components),
       algorithm: algorithm()
@@ -99,7 +103,6 @@ function AppConfig(_ref) {
     children: /*#__PURE__*/_jsxs(AppConfigContext.Provider, {
       value: {
         theme: theme,
-        themeConfig: themeConfig,
         dialogHolderRef: dialogHolderRef,
         fieldNames: fieldNames
       },
@@ -111,7 +114,7 @@ function AppConfig(_ref) {
         zIndex: 105
       })]
     })
-  });
+  }));
 }
 export default function CssAppConfig(props) {
   return /*#__PURE__*/_jsx(App, {

package/es/context/index.d.ts

@@ -1,4 +1,4 @@
-import { TabPaneProps, ThemeConfig } from 'antd';
+import { ConfigProviderProps, TabPaneProps } from 'antd';
 import { Store } from 'antd/es/form/interface';
 import React from 'react';
 import { Location } from 'react-router';
@@ -90,7 +90,7 @@ type CssAppConfigType = {
     /** 主题 */
     theme?: 'dark' | 'light' | 'colorful';
     /** 主题参数配置 */
-    themeConfig?: ThemeConfig;
+    antConfig?: ConfigProviderProps;
     /** 紧凑模式 */
     isCompact?: boolean;
     /** 全局水印 */

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

package/package.json

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