@chaoswise/ui 3.0.7 → 3.0.8

package/lib/CWMessage/index.js

@@ -107,6 +107,13 @@ function Message(props) {
     _useState10 = _slicedToArray(_useState9, 2),
     pageInfo = _useState10[0],
     setPageInfo = _useState10[1];
+  var _notification$useNoti = _notification.useNotification({
+      top: headerHeight,
+      maxCount: mode === "windows" ? 1 : null
+    }),
+    _notification$useNoti2 = _slicedToArray(_notification$useNoti, 2),
+    api = _notification$useNoti2[0],
+    contextHolder = _notification$useNoti2[1];
   // 初始化条件
   var conditionsRef = useRef({
     current: 1,
@@ -118,14 +125,6 @@ function Message(props) {
     getMessageQuerySettings();
     connectSocket();
   }, []);
-  useEffect(function () {
-    _notification.destroy();
-    _notification.config({
-      top: headerHeight,
-      maxCount: mode === "windows" ? 1 : null,
-      prefixCls: "".concat(prefixCls, "-notification")
-    });
-  }, [mode]);
   useEffect(function () {
     setPageInfo(function (pre) {
       return _objectSpread(_objectSpread({}, pre), {}, {
@@ -150,6 +149,9 @@ function Message(props) {
         current: 1
       });
     });
+    conditionsRef.current = _objectSpread(_objectSpread({}, conditionsRef.current), {}, {
+      current: 1
+    });
   };
   var onClickBell = function onClickBell() {
     setVisible(true);
@@ -172,7 +174,7 @@ function Message(props) {
             if (res && res.status == "success") {
               data = res.data;
               _ref2 = data || {}, userMessageId = _ref2.userMessageId, title = _ref2.title, summary = _ref2.summary;
-              _notification.open(_objectSpread({
+              api.open(_objectSpread({
                 message: title,
                 description: summary,
                 onClick: function onClick() {
@@ -182,10 +184,9 @@ function Message(props) {
                   };
                   readInnerMessage(params);
                   onClickStrongMessageItem(data);
-                  _notification.close(id);
+                  api.destroy(id);
                 },
                 duration: time,
-                prefixCls: "".concat(prefixCls, "-notification"),
                 className: "".concat(messagePrefixCls, "-notification-wrapper"),
                 key: id
               }, restStrongMessageOption));
@@ -343,7 +344,7 @@ function Message(props) {
   }();
   return wrapCSSVar( /*#__PURE__*/React.createElement("div", {
     className: classnames(hashId, cssVarCls, "".concat(messagePrefixCls, "-wrapper"))
-  }, /*#__PURE__*/React.createElement(_Badge, _extends({
+  }, contextHolder, /*#__PURE__*/React.createElement(_Badge, _extends({
     count: messageTotal,
     offset: [6, 5]
   }, _badgeOption), /*#__PURE__*/React.createElement(CommonIcon, {

package/lib/CWMessage/index.style.js

@@ -15,9 +15,21 @@ var genCustomCWMessageStyle = function genCustomCWMessageStyle(token) {
   var drawerPrefix = "".concat(prefixCls, "-drawer");
   var emptyPrefix = "".concat(prefixCls, "-empty");
   var tabPrefix = "".concat(prefixCls, "-tabs");
-  return _defineProperty(_defineProperty(_defineProperty({}, "".concat(prefixCls, "-notification"), _defineProperty({}, "".concat(prefixCls, "-notification:has(").concat(messagePrefixCls, "-notification-wrapper)"), {
+  return _defineProperty(_defineProperty(_defineProperty({}, "".concat(prefixCls, "-notification"), _defineProperty(_defineProperty({}, "&:has(".concat(messagePrefixCls, "-notification-wrapper)"), {
     margin: "0"
-  })), "".concat(messagePrefixCls, "-wrapper"), _defineProperty({
+  }), "".concat(messagePrefixCls, "-notification-wrapper"), _defineProperty(_defineProperty({}, "".concat(prefixCls, "-notification-notice-message"), {
+    width: "100%",
+    textOverflow: "ellipsis",
+    overflow: "hidden",
+    whiteSpace: "nowrap"
+  }), "".concat(prefixCls, "-notification-notice-description"), {
+    textOverflow: "ellipsis",
+    overflow: "hidden",
+    display: "-webkit-box",
+    WebkitLineClamp: "2",
+    WebkitBoxOrient: "vertical",
+    whiteSpace: "pre-wrap"
+  }))), "".concat(messagePrefixCls, "-wrapper"), _defineProperty({
     display: "inline-flex",
     ".business-message-icon": {
       cursor: "pointer",
@@ -136,6 +148,6 @@ var genCustomCWMessageStyle = function genCustomCWMessageStyle(token) {
 // ============================== Export ==============================
 export default genStyleHooks("CWMessage", function (token) {
   return [
-  // 
+  //
   genCustomCWMessageStyle(token)];
 }, prepareComponentToken);

package/lib/ConfigProvider/customTheme.js

@@ -159,6 +159,9 @@ export default {
       lineHeight: 1.5714285,
       fontSize: 14
     },
+    Notification: {
+      zIndexPopup: 950
+    },
     // Empty: {
     //   // 组件内部需要调整符合UI规范的样式
     //   // 1.空状态默认图标替换

package/lib/ConfigProvider/customToken.js

@@ -10,6 +10,9 @@ export default {
     // 自定义分割线颜色
     topNavMenuBg: "#FAFBFE" // 自定义头部下拉导航背景色
   },
+  Notification: {
+    zIndexPopup: 950 // 不要删除
+  },
   Button: {
     btnMainPadding: "0 23px" // 主操作按钮padding
   },

package/lib/TooltipText/index.style.js

@@ -13,7 +13,8 @@ var genCustomTooltipTextStyle = function genCustomTooltipTextStyle(token) {
     overflow: "hidden",
     whiteSpace: "nowrap",
     display: "inline-block",
-    verticalAlign: "top"
+    verticalAlign: "top",
+    fontSize: "inherit"
   }, "".concat(toolTipTextPrefix, "-clone"), {
     position: "absolute",
     height: "0",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chaoswise/ui",
   "packageName": "chaoswiseUI",
-  "version": "3.0.7",
+  "version": "3.0.8",
   "description": "公共UI库",
   "keywords": [
     "ui",