@titaui/pc 1.10.82-beta.6 → 1.10.82-beta.9

package/.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-# npm run lint-staged
+npm run lint-staged

package/lib/components/okr-detail/detail-header/index.js

@@ -371,7 +371,8 @@ function OkrDetailHeader(_ref) {
     actionComponent: /*#__PURE__*/_react["default"].createElement(_wechatBtn["default"], {
       id: detailInfo.workId,
       objType: 62,
-      name: detailInfo.workName
+      name: detailInfo.workName,
+      principalUser: detailInfo.principalUser
     }),
     content: parent ? /*#__PURE__*/_react["default"].createElement("span", {
       className: "okr-detail-head-parent"

package/lib/components/wechat-btn/index.js

@@ -46,7 +46,8 @@ var preCls = 'titaui-wechat-btn';
 var WeChatBtn = function WeChatBtn(props) {
   var id = props.id,
       objType = props.objType,
-      name = props.name;
+      name = props.name,
+      principalUser = props.principalUser;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -83,7 +84,7 @@ var WeChatBtn = function WeChatBtn(props) {
       tooltip = _useState14[0],
       setTooltip = _useState14[1];
 
-  var _useState15 = (0, _react.useState)("目标"),
+  var _useState15 = (0, _react.useState)('目标'),
       _useState16 = _slicedToArray(_useState15, 2),
       apply = _useState16[0],
       setApply = _useState16[1];
@@ -93,37 +94,53 @@ var WeChatBtn = function WeChatBtn(props) {
       isHasGroup = _useState18[0],
       setIsHasGroup = _useState18[1];
 
+  var _useState19 = (0, _react.useState)(false),
+      _useState20 = _slicedToArray(_useState19, 2),
+      macWarnModalVisible = _useState20[0],
+      setMacWarnModalVisible = _useState20[1];
+
+  var _useState21 = (0, _react.useState)(false),
+      _useState22 = _slicedToArray(_useState21, 2),
+      principalUserModalVisible = _useState22[0],
+      setPrincipalUserModalVisible = _useState22[1];
+
+  var _useState23 = (0, _react.useState)(false),
+      _useState24 = _slicedToArray(_useState23, 2),
+      memberVisible = _useState24[0],
+      setMemberVisible = _useState24[1];
+
   var isWx = navigator.userAgent.match(/wxwork/);
+  var isMac = navigator.userAgent.match(/Mac/);
 
   var handleClickWechatBtn = function handleClickWechatBtn() {
     if (isWx) {
       //有群了，判断没在群就先进群再打开群
       if (chatId !== null && chatId !== 'chatId') {
-        // wx.invoke(
-        //   'openExistedChatWithMsg',
-        //   {
-        //     chatId: chatId,
-        //   },
-        //   function (res) {
-        //     if (
-        //       res.err_msg === 'openExistedChatWithMsg:fail_fail_Invalid_chatId'
-        //     ) {
-        //       wx.invoke(
-        //         'updateEnterpriseChat',
-        //         {
-        //           chatId: chatId,
-        //           userIdsToAdd: loginUserOpenId,
-        //         },
-        //       )
-        //     }
-        //   },
-        // )
-        wx.invoke('updateEnterpriseChat', {
-          chatId: chatId,
-          userIdsToAdd: loginUserOpenId
+        wx.invoke('openExistedChatWithMsg', {
+          chatId: chatId
         }, function (res) {
-          console.log(res);
-          console.log(res.err_msg);
+          if (res.err_msg === 'openExistedChatWithMsg:ok') {
+            console.log("打开群成功");
+          } else {
+            if (isMac) {
+              setMacWarnModalVisible(true);
+            } else {
+              wx.invoke('updateEnterpriseChat', {
+                chatId: chatId,
+                userIdsToAdd: loginUserOpenId
+              }, function (res) {
+                if (res.err_msg == 'updateEnterpriseChat:ok') {
+                  console.log('加入成功');
+                } else {
+                  if (loginUserOpenId !== principalUser.userId) {
+                    setPrincipalUserModalVisible(true);
+                  } else {
+                    setMemberVisible(true);
+                  }
+                }
+              });
+            }
+          }
         });
       } else {
         setCreateWechatVisible(true);
@@ -164,6 +181,19 @@ var WeChatBtn = function WeChatBtn(props) {
       }
     });
     setCreateWechatVisible(false);
+    setPrincipalUserModalVisible(false);
+  };
+
+  var handleKnowMacWarn = function handleKnowMacWarn() {
+    setMacWarnModalVisible(false);
+  };
+
+  var closeprincipalUserModal = function closeprincipalUserModal() {
+    setPrincipalUserModalVisible(false);
+  };
+
+  var handleMemberVisible = function handleMemberVisible() {
+    setMemberVisible(false);
   }; //chatId 为null表示未创建群聊 chatId为默认值chatId表示不是企业微信工作台，可能是其他浏览器等 chatId有值，表示创建了群聊
 
 
@@ -215,16 +245,16 @@ var WeChatBtn = function WeChatBtn(props) {
   }, [chatId, isShowWeChat]);
   (0, _react.useEffect)(function () {
     if (objType === 62) {
-      setApply("目标");
+      setApply('目标');
     } else {
-      setApply("任务");
+      setApply('任务');
     }
   }, []);
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
     overlay: tooltip,
     placement: "bottom"
   }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])(preCls, 'tu-icon-qw-chat', _defineProperty({}, "".concat(preCls, "__chat"), isHasGroup)),
+    className: (0, _classnames["default"])(preCls, _defineProperty({}, "".concat(preCls, "__chat"), isHasGroup), _defineProperty({}, 'tu-icon-qw-chat', isShowWeChat)),
     onMouseDown: handleClickWechatBtn
   })), /*#__PURE__*/_react["default"].createElement(_dialogConfirm["default"], {
     zIndex: 1200,
@@ -240,7 +270,43 @@ var WeChatBtn = function WeChatBtn(props) {
   }, "\u53D6\u6D88"), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.SureButton, {
     type: "button",
     onClick: handleCreateGroupChat
-  }, "\u53D1\u8D77\u7FA4\u804A")));
+  }, "\u53D1\u8D77\u7FA4\u804A")), /*#__PURE__*/_react["default"].createElement(_dialogConfirm["default"], {
+    zIndex: 1200,
+    visible: macWarnModalVisible,
+    type: "warning"
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    type: "title"
+  }, "\u8BF7\u6CE8\u610F"), /*#__PURE__*/_react["default"].createElement("span", {
+    type: "content"
+  }, "\u8BE5\u4F01\u4E1A\u5FAE\u4FE1\u7248\u672C\u4E0D\u652F\u6301\u81EA\u52A8\u52A0\u5165\uFF0C\u8BF7\u8054\u7CFB".concat(apply, "\u8D1F\u8D23\u4EBA\u624B\u52A8\u52A0\u4F60\u5165\u7FA4")), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.SureButton, {
+    type: "button",
+    onClick: handleKnowMacWarn
+  }, "\u6211\u77E5\u9053\u4E86")), /*#__PURE__*/_react["default"].createElement(_dialogConfirm["default"], {
+    zIndex: 1200,
+    visible: principalUserModalVisible,
+    type: "warning"
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    type: "title"
+  }, "\u8BF7\u6CE8\u610F"), /*#__PURE__*/_react["default"].createElement("span", {
+    type: "content"
+  }, "\u4F60\u5DF2\u9000\u7FA4\u6216\u8BE5\u7FA4\u5DF2\u89E3\u6563\u3002\u53EF\u4EE5\u8054\u7CFB".concat(apply, "\u6210\u5458\u62C9\u4F60\u5165\u7FA4\u3002\u4F60\u4E5F\u53EF\u4EE5\u91CD\u65B0\u5EFA\u7FA4\u3002")), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.CancelButton, {
+    type: "button",
+    onClick: closeprincipalUserModal
+  }, "\u53D6\u6D88"), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.SureButton, {
+    type: "button",
+    onClick: handleCreateGroupChat
+  }, "\u53D1\u8D77\u7FA4\u804A")), /*#__PURE__*/_react["default"].createElement(_dialogConfirm["default"], {
+    zIndex: 1200,
+    visible: memberVisible,
+    type: "warning"
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    type: "title"
+  }, "\u8BF7\u6CE8\u610F"), /*#__PURE__*/_react["default"].createElement("span", {
+    type: "content"
+  }, "\u4F60\u5DF2\u9000\u7FA4\u6216\u8BE5\u7FA4\u5DF2\u89E3\u6563\u3002\u53EF\u4EE5\u8054\u7CFB".concat(apply, "\u6210\u5458\u62C9\u4F60\u5165\u7FA4\u3002")), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.SureButton, {
+    type: "button",
+    onClick: handleMemberVisible
+  }, "\u6211\u77E5\u9053\u4E86")));
 };
 
 var _default = WeChatBtn;

package/package.json

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