@chaoswise/ui 3.0.11 → 3.0.12

package/lib/CWMessage/MessageContent/TabList/index.js

@@ -1,5 +1,6 @@
 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); }
 import _Button from "@chaoswise/ui/lib/Button";
+import _Tag from "@chaoswise/ui/lib/Tag";
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 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; }
@@ -8,10 +9,11 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
-import React from "react";
-import moment from "moment";
-import { readInnerMessageApi } from "../../service";
-import { useIntl } from "../../../locales";
+import React from 'react';
+import moment from 'moment';
+import classnames from 'classnames';
+import { readInnerMessageApi } from '../../service';
+import { useIntl } from '../../../locales';
 var TabList = function TabList(props) {
   var _props$messages = props.messages,
     messages = _props$messages === void 0 ? [] : _props$messages,
@@ -31,12 +33,15 @@ var TabList = function TabList(props) {
   var _readInnerMessageApi = requestOption.readInnerMessageApi;
   var onHandleMessage = function onHandleMessage(message) {
     var userMessageId = message.userMessageId,
-      url = message.url;
+      url = message.url,
+      showMode = message.showMode;
     var params = {
       userMessageIds: [userMessageId],
       all: false
     };
     readInnerMessage(params);
+    // 撤回消息不操作
+    if (showMode === 'invalid') return;
     var _isClose = onTabListItem(message);
     if (isClose || _isClose) {
       setVisible(false);
@@ -64,7 +69,7 @@ var TabList = function TabList(props) {
             return resRequestApi;
           case 3:
             res = _context.sent;
-            if (res.status == "success") {
+            if (res.status == 'success') {
               _params = {};
               if (pageInfo.current > 1 && messages.length === 1) {
                 _params = {
@@ -92,22 +97,24 @@ var TabList = function TabList(props) {
   var messageList = messages.map(function (message) {
     var _message$title, _message$summary;
     return /*#__PURE__*/React.createElement("div", {
-      className: "".concat(messagePrefixCls, "-content-tabs-list"),
+      className: classnames("".concat(messagePrefixCls, "-content-tabs-list"), _defineProperty({}, "".concat(messagePrefixCls, "-content-tabs-list-invalid"), message.showMode === 'invalid')),
       key: message.userMessageId
     }, /*#__PURE__*/React.createElement("div", {
       className: "".concat(messagePrefixCls, "-content-tabs-list-title"),
       onClick: function onClick() {
         return onHandleMessage(message);
       }
-    }, (_message$title = message.title) !== null && _message$title !== void 0 ? _message$title : ""), /*#__PURE__*/React.createElement("div", {
+    }, message.showMode === 'top' && /*#__PURE__*/React.createElement(_Tag, {
+      className: "".concat(messagePrefixCls, "-content-tabs-list-title-top")
+    }, intl.get('5cc44ee5-8da3-446b-b962-3fe7f77d4f38').d('置顶')), (_message$title = message.title) !== null && _message$title !== void 0 ? _message$title : ''), /*#__PURE__*/React.createElement("div", {
       className: "".concat(messagePrefixCls, "-content-tabs-list-desc")
-    }, (_message$summary = message.summary) !== null && _message$summary !== void 0 ? _message$summary : ""), /*#__PURE__*/React.createElement("div", {
+    }, (_message$summary = message.summary) !== null && _message$summary !== void 0 ? _message$summary : ''), /*#__PURE__*/React.createElement("div", {
       className: "".concat(messagePrefixCls, "-content-tabs-list-date")
-    }, message.time ? moment(Number(message.time)).format("YYYY/MM/DD HH:mm:ss") : ""));
+    }, message.time ? moment(Number(message.time)).format('YYYY/MM/DD HH:mm:ss') : ''));
   });
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_Button, {
     className: "".concat(messagePrefixCls, "-content-all-read"),
     onClick: onHandleReadAllMessage
-  }, intl.get("58bc27cb-aac5-49f8-8c9e-3b0fbb9d9c61").d("全部已读")), messageList);
+  }, intl.get('58bc27cb-aac5-49f8-8c9e-3b0fbb9d9c61').d('全部已读')), messageList);
 };
 export default TabList;

package/lib/CWMessage/index.js

@@ -253,7 +253,7 @@ function Message(props) {
               });
               socket.on("push", /*#__PURE__*/function () {
                 var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(data) {
-                  var _JSON$parse, count, message, _ref6, _ref6$total, total, noticeMessage, userMessageId, type, _ref7, enable, _mode, _ref7$time, time;
+                  var _JSON$parse, count, message, _ref6, _ref6$total, total, noticeMessage, action, _ref7, userMessageId, type, _ref8, enable, _mode, _ref8$time, time;
                   return _regeneratorRuntime().wrap(function _callee3$(_context3) {
                     while (1) switch (_context3.prev = _context3.next) {
                       case 0:
@@ -261,20 +261,32 @@ function Message(props) {
                         _ref6 = count || {}, _ref6$total = _ref6.total, total = _ref6$total === void 0 ? 0 : _ref6$total;
                         setMessageTotal(total);
                         onSocketChange(JSON.parse(data));
-                        if (message) {
-                          noticeMessage = message.noticeMessage;
-                          if (noticeMessage) {
-                            userMessageId = noticeMessage.id, type = noticeMessage.type;
-                            if (userMessageId) {
-                              _ref7 = messageOptionRef.current[type] || {}, enable = _ref7.enable, _mode = _ref7.mode, _ref7$time = _ref7.time, time = _ref7$time === void 0 ? 5 : _ref7$time;
-                              setMode(_mode);
-                              if (enable) {
-                                openNotification(time, userMessageId);
-                              }
-                            }
+                        if (!message) {
+                          _context3.next = 10;
+                          break;
+                        }
+                        noticeMessage = message.noticeMessage, action = message.action;
+                        _ref7 = noticeMessage || {}, userMessageId = _ref7.id, type = _ref7.type;
+                        if (userMessageId) {
+                          _context3.next = 9;
+                          break;
+                        }
+                        return _context3.abrupt("return");
+                      case 9:
+                        if (action && action.mode === "recall") {
+                          // 销毁强提醒
+                          api.destroy(userMessageId);
+                          // 销毁后如果弹窗开启关闭弹窗
+                          setVisible(false);
+                        } else {
+                          // 生成强提醒
+                          _ref8 = messageOptionRef.current[type] || {}, enable = _ref8.enable, _mode = _ref8.mode, _ref8$time = _ref8.time, time = _ref8$time === void 0 ? 5 : _ref8$time;
+                          setMode(_mode);
+                          if (enable) {
+                            openNotification(time, userMessageId);
                           }
                         }
-                      case 5:
+                      case 10:
                       case "end":
                         return _context3.stop();
                     }
@@ -318,7 +330,7 @@ function Message(props) {
     };
   }();
   var getMessageQuerySettings = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
       var resRequestApi, res, data;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
@@ -339,7 +351,7 @@ function Message(props) {
       }, _callee6);
     }));
     return function getMessageQuerySettings() {
-      return _ref9.apply(this, arguments);
+      return _ref10.apply(this, arguments);
     };
   }();
   return wrapCSSVar( /*#__PURE__*/React.createElement("div", {

package/lib/CWMessage/index.style.js

@@ -124,9 +124,16 @@ var genCustomCWMessageStyle = function genCustomCWMessageStyle(token) {
       lineHeight: "20px",
       marginRight: "16px"
     }
-  })), "".concat(messagePrefixCls, "-content-tabs-list"), _defineProperty(_defineProperty(_defineProperty({
+  })), "".concat(messagePrefixCls, "-content-tabs-list"), _defineProperty(_defineProperty(_defineProperty(_defineProperty({
     paddingTop: "16px"
-  }, "".concat(messagePrefixCls, "-content-tabs-list-title"), {
+  }, "&".concat(messagePrefixCls, "-content-tabs-list-invalid"), _defineProperty({
+    color: "red"
+  }, "".concat(messagePrefixCls, "-content-tabs-list-title,").concat(messagePrefixCls, "-content-tabs-list-desc,").concat(messagePrefixCls, "-content-tabs-list-date"), {
+    color: token.colorTextDisabled,
+    "&:hover": {
+      color: token.colorTextDisabled
+    }
+  })), "".concat(messagePrefixCls, "-content-tabs-list-title"), _defineProperty(_defineProperty({
     color: token.colorText,
     height: "20px",
     lineHeight: "20px",
@@ -134,10 +141,15 @@ var genCustomCWMessageStyle = function genCustomCWMessageStyle(token) {
     whiteSpace: "nowrap",
     overflow: "hidden",
     textOverflow: "ellipsis",
-    "&:hover": {
-      cursor: "pointer"
-    }
-  }), "".concat(messagePrefixCls, "-content-tabs-list-desc"), {
+    display: "flex"
+  }, "".concat(messagePrefixCls, "-content-tabs-list-title-top"), {
+    color: token.colorPrimary,
+    backgroundColor: token.colorPrimaryBg,
+    marginRight: "10px",
+    borderColor: token.colorPrimaryBorder
+  }), "&:hover", {
+    cursor: "pointer"
+  })), "".concat(messagePrefixCls, "-content-tabs-list-desc"), {
     overflow: "hidden",
     textOverflow: "ellipsis",
     display: "-webkit-box",

package/lib/locales/en_US.json

@@ -23,6 +23,7 @@
   "54653cf2-ee7e-4091-b778-30d21facc877": "The page is lost and the platform is retrieving it",
   "56a89179-5086-4c43-8814-06eac1ba9983": "Increase the time span by {span} times",
   "58bc27cb-aac5-49f8-8c9e-3b0fbb9d9c61": "Mark all read",
+  "5cc44ee5-8da3-446b-b962-3fe7f77d4f38": "Top",
   "5fe60774-0f08-450f-a9d9-998996485fec": "Drag Move",
   "627a6799-d6da-421d-a2c4-d6982c27a258": "Do you want to continue?",
   "6356dd5c-b99d-4b34-acb3-683e4d5edb40": "Skip",

package/lib/locales/index.js

@@ -43,7 +43,7 @@ export var useIntl = function useIntl() {
   var forceUpdate = useForceUpdate();
   var initLocale = function initLocale() {
     if (!TagInitInstance.getInit()) {
-      injectLocale('zh_CH', function () {
+      injectLocale('zh_CN', function () {
         TagInitInstance.setInit();
         forceUpdate();
       });

package/lib/locales/zh_CN.json

@@ -23,6 +23,7 @@
   "54653cf2-ee7e-4091-b778-30d21facc877": "页面走丢了，平台正在找回页面",
   "56a89179-5086-4c43-8814-06eac1ba9983": "按{span}倍增加时间跨度",
   "58bc27cb-aac5-49f8-8c9e-3b0fbb9d9c61": "全部已读",
+  "5cc44ee5-8da3-446b-b962-3fe7f77d4f38": "置顶",
   "5fe60774-0f08-450f-a9d9-998996485fec": "拖拽移动",
   "627a6799-d6da-421d-a2c4-d6982c27a258": "需要继续下一个任务吗?",
   "6356dd5c-b99d-4b34-acb3-683e4d5edb40": "跳过",

package/lib/locales/zh_TW.json

@@ -23,6 +23,7 @@
   "54653cf2-ee7e-4091-b778-30d21facc877": "頁面走丟了，平臺正在找回頁面",
   "56a89179-5086-4c43-8814-06eac1ba9983": "按{span}倍增加時間跨度",
   "58bc27cb-aac5-49f8-8c9e-3b0fbb9d9c61": "全部已讀",
+  "5cc44ee5-8da3-446b-b962-3fe7f77d4f38": "置頂",
   "5fe60774-0f08-450f-a9d9-998996485fec": "拖拽移動",
   "627a6799-d6da-421d-a2c4-d6982c27a258": "需要繼續下一個任務嗎?",
   "6356dd5c-b99d-4b34-acb3-683e4d5edb40": "跳過",

package/package.json

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