@ccs-ui/rc-pro 1.1.1-rc25 → 1.1.1-rc27

package/es/theme-dialog.d.ts

@@ -1,9 +1,23 @@
 import { MessageInstance } from 'antd/es/message/interface';
 import { HookAPI } from 'antd/es/modal/useModal';
 import { NotificationInstance } from 'antd/es/notification/interface';
+import CCS from '.';
 export default class ThemeDialog {
     static message: MessageInstance;
     static notice: NotificationInstance;
     static modal: HookAPI;
     static setConfig(message: MessageInstance, notice: NotificationInstance, modal: HookAPI): void;
+    /**
+     * 接口结果反馈
+     * @param result // 结果
+     * @param successText // 成功提示
+     * @param failText // 失败提示
+     */
+    static easyMessage(result: CCS.HttpResult, successText?: string, failText?: string): void;
+    /**
+     * 确认提示框
+     * @param content
+     * @returns
+     */
+    static easyConfirm: (content?: string) => Promise<unknown>;
 }

package/es/theme-dialog.js

@@ -16,10 +16,51 @@ var ThemeDialog = /*#__PURE__*/function () {
       this.notice = notice;
       this.modal = modal;
     }
+
+    /**
+     * 接口结果反馈
+     * @param result // 结果
+     * @param successText // 成功提示
+     * @param failText // 失败提示
+     */
+  }, {
+    key: "easyMessage",
+    value: function easyMessage(result, successText, failText) {
+      if (result.success) {
+        ThemeDialog.message.success(successText || '操作成功');
+      } else {
+        ThemeDialog.message.error(failText || result.msg || '操作失败');
+      }
+    }
+
+    /**
+     * 确认提示框
+     * @param content
+     * @returns
+     */
   }]);
   return ThemeDialog;
 }();
 _defineProperty(ThemeDialog, "message", void 0);
 _defineProperty(ThemeDialog, "notice", void 0);
 _defineProperty(ThemeDialog, "modal", void 0);
+_defineProperty(ThemeDialog, "easyConfirm", function () {
+  var content = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  return new Promise(function (resolve) {
+    ThemeDialog.modal.confirm({
+      title: '操作确认',
+      content: content,
+      okText: '确定',
+      okType: 'danger',
+      cancelText: '取消',
+      centered: true,
+      onOk: function onOk() {
+        resolve(true);
+      },
+      onCancel: function onCancel() {
+        resolve(false);
+      }
+    });
+  });
+});
 export { ThemeDialog as default };

package/es/theme.d.ts

@@ -7,5 +7,11 @@ interface AppThemeProps {
     children: ReactElement;
 }
 /** 主题设置 */
+interface AppThemeProps {
+    theme: GlobalConfig['AppTheme'];
+    themeConfig?: ThemeConfig;
+    children: ReactElement;
+}
+/** 主题设置 */
 export default function AppTheme({ theme, themeConfig, children, }: AppThemeProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/es/theme.js

@@ -13,9 +13,10 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { darkTheme, defaultTheme } from '@ant-design/compatible';
 import { App, ConfigProvider, Modal, message, notification } from 'antd';
 import zhCN from 'antd/locale/zh_CN';
-import _merge from 'lodash/merge';
 import { useEffect } from 'react';
 import ThemeDialog from "./theme-dialog";
+
+/** 主题设置 */
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
 /** 主题设置 */
@@ -41,21 +42,20 @@ export default function AppTheme(_ref) {
 
   // 主题
   var appTheme = theme === 'default' ? defaultTheme : darkTheme;
+
   // 合并token
-  var token = _objectSpread(_objectSpread({}, themeConfig === null || themeConfig === void 0 ? void 0 : themeConfig.token), {}, {
+  var token = _objectSpread(_objectSpread(_objectSpread({}, appTheme.token), themeConfig === null || themeConfig === void 0 ? void 0 : themeConfig.token), {}, {
     _appTheme: theme
   });
 
   // 暗黑模式背景色
   if (theme === 'dark') token.colorBgContainer = 'rgb(36, 37, 37)';
-
-  // 合并主题
-  var themes = _merge(appTheme, _objectSpread(_objectSpread({}, themeConfig), {}, {
-    token: token
-  }));
   return /*#__PURE__*/_jsx(ConfigProvider, {
     locale: zhCN,
-    theme: themes,
+    theme: _objectSpread(_objectSpread({}, appTheme), {}, {
+      token: token,
+      components: _objectSpread(_objectSpread({}, appTheme.components), themeConfig === null || themeConfig === void 0 ? void 0 : themeConfig.components)
+    }),
     children: /*#__PURE__*/_jsxs(App, {
       style: {
         height: '100%'

package/es/utils/index.d.ts

@@ -1,5 +1,4 @@
 import dayjs from 'dayjs';
-import CCS from '..';
 interface DayjsType extends dayjs.Dayjs {
     fromNow(withoutSuffix?: boolean): string;
     from(compared: dayjs.ConfigType, withoutSuffix?: boolean): string;
@@ -83,13 +82,6 @@ export default class utils {
      * @param {*} str
      */
     static stringToHex(str: string): string;
-    /**
-     * 根据HttpResult返回结果提示成功或失败
-     * @param result
-     * @param successText
-     * @param failText
-     */
-    static messageInfo(result: CCS.HttpResult, successText?: string, failText?: string): void;
     /**
      * string to dayjs
      * @param val
@@ -97,13 +89,6 @@ export default class utils {
      * @returns
      */
     static dayjsFmt(val: string | undefined, formartType?: string): dayjs.Dayjs | undefined;
-    /**
-     * 确认提示框
-     * @param title
-     * @param content
-     * @returns
-     */
-    static showConfirm: (title: string, content?: string) => Promise<unknown>;
     /**
      * 空对象？
      * @param obj

package/es/utils/index.js

@@ -5,7 +5,6 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 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(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-import { Modal } from 'antd';
 import _dayjs from 'dayjs';
 import zhCn from 'dayjs/locale/zh-cn';
 import relativeTime from 'dayjs/plugin/relativeTime';
@@ -15,8 +14,6 @@ import _isArray from 'lodash/isArray';
 import _empty from 'lodash/isEmpty';
 import _isObject from 'lodash/isObject';
 import devWarning from 'rc-util/lib/warning';
-import ThemeDialog from "../theme-dialog";
-var confirm = Modal.confirm;
 _dayjs.locale(zhCn);
 _dayjs.extend(relativeTime);
 var utils = /*#__PURE__*/function () {
@@ -177,22 +174,6 @@ var utils = /*#__PURE__*/function () {
       return hexCharCode.join('').toUpperCase();
     }
 
-    /**
-     * 根据HttpResult返回结果提示成功或失败
-     * @param result
-     * @param successText
-     * @param failText
-     */
-  }, {
-    key: "messageInfo",
-    value: function messageInfo(result, successText, failText) {
-      if (result.success) {
-        ThemeDialog.message.success(successText || '操作成功');
-      } else {
-        ThemeDialog.message.error(failText || result.msg || '操作失败');
-      }
-    }
-
     /**
      * string to dayjs
      * @param val
@@ -209,21 +190,14 @@ var utils = /*#__PURE__*/function () {
       return _dayjs(val);
     }
 
-    /**
-     * 确认提示框
-     * @param title
-     * @param content
-     * @returns
-     */
-  }, {
-    key: "objIsEmpty",
-    value:
     /**
      * 空对象？
      * @param obj
      * @returns
      */
-    function objIsEmpty(obj) {
+  }, {
+    key: "objIsEmpty",
+    value: function objIsEmpty(obj) {
       if (!obj) return true;
       return Object.keys(obj).length === 0;
     }
@@ -262,23 +236,4 @@ _defineProperty(utils, "isEmpty", function (val) {
 _defineProperty(utils, "isNotEmpty", function (val) {
   return !utils.isEmpty(val);
 });
-_defineProperty(utils, "showConfirm", function (title) {
-  var content = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
-  return new Promise(function (resolve) {
-    confirm({
-      title: title,
-      content: content,
-      okText: '确定',
-      okType: 'danger',
-      cancelText: '取消',
-      centered: true,
-      onOk: function onOk() {
-        resolve(true);
-      },
-      onCancel: function onCancel() {
-        resolve(false);
-      }
-    });
-  });
-});
 export { utils as default };

package/package.json

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