@titaui/pc 1.7.86 → 1.7.87

package/lib/components/dialog/index.css

@@ -50,7 +50,7 @@
 }
 
 .titaui-dialog .rc-dialog-header {
-  padding: 16px 32px 16px 32px;
+  padding: 18px 32px;
 }
 
 .titaui-dialog .rc-dialog-body {
@@ -58,7 +58,7 @@
 }
 
 .titaui-dialog .rc-dialog-footer {
-  padding: 12px 32px 18px;
+  padding: 20px 32px;
   display: flex;
   justify-content: flex-end;
 }

package/lib/components/nav-top/components/user-message/components/inform/inform-item.js

@@ -69,11 +69,13 @@ var Inform = function Inform(props) {
     }
 
     if (objType === _constant.EObjType.Task) {
+      // @ts-ignore
       window.Talent.app.vent.trigger('global-pull-screen', objId, 'task');
       return;
     }
 
     if (objType === _constant.EObjType.Remind) {
+      // @ts-ignore
       window.Talent.app.vent.trigger('global-daily-detail-pull-screen', objId);
       return;
     }
@@ -81,30 +83,12 @@ var Inform = function Inform(props) {
     if (messageType == 135) {
       var redisKey = item.content.match(/redisKey=(\S*?)"/)[1]; // @ts-ignore
 
-      Talent.app.vent.trigger("open-weekly-report-modal", redisKey);
-      return;
-    }
-
-    if (messageType === 99) {
-      var _options = {
-        width: 680,
-        showScroll: false,
-        type: 'message',
-        // 推屏类型
-        data: {
-          type: 'okrDashBoard',
-          // 消息类型
-          objId: item.messageId,
-          objType: messageType
-        }
-      }; // @ts-ignore
-
-      Talent.app.vent.trigger('openReactScreenPush', _options);
+      Talent.app.vent.trigger('open-weekly-report-modal', redisKey);
       return;
     } // 处理合并的消息
 
 
-    var isMessageMerging = messageType == 13018 || messageType == 30362 || messageType == 131;
+    var isMessageMerging = [83, 93, 94, 95, 96, 97, 98, 99, 100, 131, 136, 13018, 30362].includes(messageType);
 
     if (!isMessageMerging) {
       if (messageType === _constant.informType.details) {
@@ -145,7 +129,7 @@ var Inform = function Inform(props) {
         var _str = item.content.match(/\/\/.*?[\"|\']/gi);
 
         if (!_str) return;
-        _str = _str.join("");
+        _str = _str.join('');
 
         var _url2 = _str.slice(0, _str.length - 1);
 
@@ -155,7 +139,7 @@ var Inform = function Inform(props) {
         var _str2 = item.content.match(/https:.*?[\"|\']/gi);
 
         if (!_str2) return;
-        _str2 = _str2.join("");
+        _str2 = _str2.join('');
 
         var _url3 = _str2.slice(0, _str2.length - 1);
 
@@ -178,56 +162,37 @@ var Inform = function Inform(props) {
       }
     }
 
-    var type = 'eReport'; // E-周报提醒消息合并
+    var notificationType = 'e-report'; // E-周报提醒消息合并
+
+    var content = domRef.current.textContent;
 
     if (messageType == '83') {
       // 项目，目标进展提醒消息合并
-      type = 'objective';
+      notificationType = 'project-objective';
     } else if (Number(messageType) > 93 && Number(messageType) <= 100) {
       // OKR 仪表盘消息提醒
-      type = 'okrDashBoard';
-    } else if (messageType == 131) {
-      type = 'performance';
+      notificationType = 'okr-dashBoard';
+    } else if (messageType == 131 || messageType == 136) {
+      notificationType = 'performance';
+      content = item.content;
     }
 
-    var options = {
-      width: 680,
-      showScroll: true,
-      type: 'message',
-      // 推屏类型
-      data: {
-        type: type,
-        // 消息类型
-        objId: item.messageId,
-        objType: messageType,
-        startDate: '',
-        endDate: ''
+    _drawerManager["default"].open('NotificationMergeDetail', {
+      config: {
+        content: content,
+        messageId: item.messageId,
+        messageType: item.messageType,
+        notificationDate: item.createTime,
+        notificationType: notificationType,
+        objId: item.objId,
+        objType: item.objType
       }
-    };
-
-    if (messageType == 83) {
-      options.data.objType = messageType;
-      options.data.startDate = item.createTime;
-    } else if (messageType > 93 && messageType <= 100) {
-      options.data.startDate = item.createTime;
-    } else if (messageType == 131) {
-      options.data.objType = item.objId.split('_')[0];
-      options.data.startDate = item.objId.split('_')[1];
-      options.data.endDate = item.objId.split('_')[2];
-    } else {
-      var regex = /\（(.+?)\）/g,
-          content = domRef.current.textContent;
-      var date = [];
-      date = content.match(regex);
-      options.data.startDate = date[0].slice(1, date[0].length - 1).split('-')[0]; // @ts-ignore
-
-      options.data.endDate = date[0].slice(1, date[0].length - 1).split('-')[1];
-    } // @ts-ignore
-
-
-    Talent.app.vent.trigger('openReactScreenPush', options);
+    }, {
+      width: 680
+    });
   };
 
+  ;
   return /*#__PURE__*/_react["default"].createElement("li", {
     className: (0, _classnames["default"])("".concat(preCls, "__item"), _defineProperty({}, "".concat(preCls, "__item--scroll"), informs.length >= 4)),
     key: item.messageId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.7.86",
+  "version": "1.7.87",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",

package/yarn-error.log

@@ -1,103 +0,0 @@
-Arguments: 
-  /usr/local/bin/node /usr/local/bin/yarn
-
-PATH: 
-  /opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Apple/usr/bin:/opt/homebrew/bin:/opt/homebrew/sbin
-
-Yarn version: 
-  1.22.10
-
-Node version: 
-  12.22.1
-
-Platform: 
-  darwin x64
-
-Trace: 
-  SyntaxError: /Users/yang/tita/titaui-pc/package.json: Unexpected token < in JSON at position 26
-      at JSON.parse (<anonymous>)
-      at /usr/local/lib/node_modules/yarn/lib/cli.js:1625:59
-      at Generator.next (<anonymous>)
-      at step (/usr/local/lib/node_modules/yarn/lib/cli.js:310:30)
-      at /usr/local/lib/node_modules/yarn/lib/cli.js:321:13
-
-npm manifest: 
-  {
-    "name": "@titaui/pc",
-  <<<<<<< HEAD
-    "version": "1.2.22",
-  =======
-    "version": "1.2.13",
-  >>>>>>> master
-    "nameCN": "",
-    "description": "",
-    "main": "src/index.js",
-    "scripts": {
-      "storybook": "start-storybook -p 6006 --no-dll",
-      "start": "dev_server=on webpack-dev-server --disableHostCheck=true --progress --colors  --config webpack-stories.config.js",
-      "build-storybook": "build-storybook --docs --no-dll",
-      "build:es": "babel src -d es --ignore **/__tests__",
-      "build:lib": "cross-env OUTPUT_MODULE=commonjs babel src -d lib --ignore **/__tests__",
-      "build:umd": "webpack --config ./.scripts/webpack.umd.js",
-      "build": "npm run build:lib && npm run build:es && npm run build:umd"
-    },
-    "author": "",
-    "license": "ISC",
-    "devDependencies": {
-      "del": "^6.0.0",
-      "gulp": "^3.x",
-      "gulp-autoprefixer": "^7.0.1",
-      "gulp-babel": "^8.0.0",
-      "gulp-concat": "^2.6.1",
-      "gulp-cssbeautify": "^3.0.0",
-      "gulp-cssnano": "^2.1.3",
-      "gulp-filesize": "0.0.6",
-      "gulp-postcss": "^9.0.0",
-      "gulp-rename": "^2.0.0",
-      "gulp-replace": "^1.0.0",
-      "gulp-sass": "^4.1.0",
-      "gulp-sourcemaps": "^2.6.5",
-      "sass-resources-loader": "^2.2.1"
-    },
-    "dependencies": {
-      "@titaui/dagre": "^0.8.8-pre",
-      "@titaui/rc-tree2": "^4.1.15",
-      "@titaui/rc-trigger": "^5.2.5",
-      "@titaui/react-flow-renderer": "9.5.4",
-      "@titaui/toast": "^1.0.0",
-      "axios": "^0.21.1",
-      "classnames": "^2.2.6",
-      "clone-deep": "^4.0.1",
-      "d3-cloud": "^1.2.5",
-      "dayjs": "^1.10.4",
-      "html2canvas": "^1.0.0-rc.7",
-      "moment": "^2.29.1",
-      "qs": "^6.10.1",
-      "rc-checkbox": "^2.3.2",
-      "rc-dialog": "8.5.2",
-      "rc-drawer": "^4.3.1",
-      "rc-input-number": "^5.0.0",
-      "rc-pagination": "^3.1.6",
-      "rc-queue-anim": "1.4.1",
-      "rc-select": "^12.1.7",
-      "rc-switch": "^3.2.2",
-      "rc-table": "^7.13.2",
-      "rc-tabs": "^11.7.3",
-      "rc-tooltip": "^5.1.1",
-      "rc-tree": "^4.1.5",
-      "rc-trigger": "^5.2.3",
-      "rc-upload": "^4.2.0-alpha.0",
-      "rc-util": "^5.13.1",
-      "react-collapse": "^5.1.0",
-      "react-perfect-scrollbar": "^1.5.2",
-      "url-parse": "^1.5.1",
-      "uuid": "^3.1.0",
-      "wordcloud": "^1.2.2"
-    }
-  }
-
-yarn manifest: 
-  No manifest
-
-Lockfile: 
-  No lockfile