@titaui/pc 1.10.82-beta.7 → 1.10.83-beta.1

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

@@ -47,7 +47,7 @@ var WeChatBtn = function WeChatBtn(props) {
   var id = props.id,
       objType = props.objType,
       name = props.name,
-      principalUserId = props.principalUserId;
+      principalUser = props.principalUser;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -116,29 +116,45 @@ var WeChatBtn = function WeChatBtn(props) {
     if (isWx) {
       //有群了，判断没在群就先进群再打开群
       if (chatId !== null && chatId !== 'chatId') {
-        wx.invoke('openExistedChatWithMsg', {
-          chatId: chatId
+        wx.invoke('updateEnterpriseChat', {
+          chatId: chatId,
+          userIdsToAdd: loginUserOpenId
         }, function (res) {
-          if (res.err_msg === 'openExistedChatWithMsg:fail_fail_Invalid_chatId') {
-            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 == principalUserId) {
-                    setPrincipalUserModalVisible(true);
-                  } else {
-                    setMemberVisible(true);
-                  }
-                }
-              });
-            }
-          }
+          console.log("1.\u4EBA\u5728\u7FA4\uFF0C\u8C03\u7528\u52A0\u4EBA\u63A5\u53E3\u8FD4\u56DE\u4FE1\u606F\uFF1B2.\u4EBA\u4E0D\u5728\u7FA4\uFF0C\u8C03\u7528\u52A0\u4EBA\u63A5\u53E3\u8FD4\u56DE\u4FE1\u606F\uFF1B 3.\u7FA4\u89E3\u6563\u4E86\uFF0C\u8C03\u7528\u52A0\u4EBA\u63A5\u53E3\u8FD4\u56DE\u4FE1\u606F 4.mac\u8C03\u7528\u52A0\u4EBA\u63A5\u53E3\u8FD4\u56DE\u4FE1\u606F ".concat(res.err_msg)); // if (res.err_msg === 'updateEnterpriseChat:ok') {
+          //   wx.invoke(
+          //     'openExistedChatWithMsg',
+          //     {
+          //       chatId: chatId,
+          //     },
+          //     function (res) {
+          //       if (res.err_msg === 'openExistedChatWithMsg:ok') {
+          //         console.log('打开群成功')
+          //       }
+          //     },
+          //   )
+          // } else if(res.err_msg !== 'updateEnterpriseChat:permission denied') {
+          //   wx.invoke(
+          //     'openExistedChatWithMsg',
+          //     {
+          //       chatId: chatId,
+          //     },
+          //     function (res) {
+          //       if (res.err_msg === 'openExistedChatWithMsg:ok') {
+          //         console.log('打开群成功')
+          //       } else {
+          //         if (loginUserOpenId === principalUser.userId) {
+          //           setPrincipalUserModalVisible(true)
+          //         } else {
+          //           setMemberVisible(true)
+          //         }
+          //       }
+          //     },
+          //   )
+          // } else {
+          //   if (isMac) {
+          //     setMacWarnModalVisible(true)
+          //   }
+          // }
         });
       } else {
         setCreateWechatVisible(true);
@@ -179,6 +195,7 @@ var WeChatBtn = function WeChatBtn(props) {
       }
     });
     setCreateWechatVisible(false);
+    setPrincipalUserModalVisible(false);
   };
 
   var handleKnowMacWarn = function handleKnowMacWarn() {
@@ -210,6 +227,7 @@ var WeChatBtn = function WeChatBtn(props) {
         }
 
         if (isWx) {
+          console.log(res.Data.obj);
           setChatId(res.Data.obj);
           (0, _request.rpost)('v1')('chat/users', {
             objId: id,

package/package.json

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