@titaui/pc 1.11.7 → 1.11.10

package/lib/components/e-priority/index.js

@@ -72,7 +72,7 @@ function _default(props) {
     name: "2"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(preCls, "__e-task-node-priority-p2 ").concat(preCls, "__e-task-node-select-priority"))
-  }), (0, _getLocale.getLocale)("OKR_MyO_E_Butt_Highest")), /*#__PURE__*/_react["default"].createElement(_dropSelector["default"].IconItem, {
+  }), (0, _getLocale.getLocale)("OKR_MyO_E_Butt_High")), /*#__PURE__*/_react["default"].createElement(_dropSelector["default"].IconItem, {
     name: "3"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(preCls, "__e-task-node-priority-p3 ").concat(preCls, "__e-task-node-select-priority"))

package/lib/components/survey-model/index.js

@@ -29,6 +29,8 @@ var _tools = require("../../utils/tools");
 
 require("./index.css");
 
+var _window$BSGlobal, _window$BSGlobal$tena, _window$BSGlobal2, _window$BSGlobal2$ten;
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -53,6 +55,7 @@ var preCls = 'tita-survey-model';
 var Rect = _button["default"].Rect;
 var loginUserInfo = window.BSGlobal.loginUserInfo;
 var Role = new _auth.MyRole();
+var Version = ((_window$BSGlobal = window.BSGlobal) === null || _window$BSGlobal === void 0 ? void 0 : (_window$BSGlobal$tena = _window$BSGlobal.tenantAuthentication) === null || _window$BSGlobal$tena === void 0 ? void 0 : _window$BSGlobal$tena.version) || ((_window$BSGlobal2 = window.BSGlobal) === null || _window$BSGlobal2 === void 0 ? void 0 : (_window$BSGlobal2$ten = _window$BSGlobal2.tenantAuthentication) === null || _window$BSGlobal2$ten === void 0 ? void 0 : _window$BSGlobal2$ten.Version) || 1;
 
 var SurveyModel = function SurveyModel(_ref) {
   var activityName = _ref.activityName,
@@ -100,6 +103,7 @@ var SurveyModel = function SurveyModel(_ref) {
   };
 
   (0, _react.useEffect)(function () {
+    if (Version === 1) return;
     if (!!window.location.hostname.match(/.work/)) return;
     var newDate = (0, _dayjs["default"])();
     var oldDate = localStorage.getItem("survey_model_date__".concat(loginUserInfo.Id));
@@ -125,7 +129,7 @@ var SurveyModel = function SurveyModel(_ref) {
         if (!(res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && (_res$data$list = _res$data.list) !== null && _res$data$list !== void 0 && _res$data$list.length)) {
           setTimeout(function () {
             setDialogVisible(true);
-          }, 1000 * 60);
+          }, 15000);
         } else {
           setDialogVisible(false);
         }
@@ -156,12 +160,9 @@ var SurveyModel = function SurveyModel(_ref) {
   };
 
   var handleSubmit = function handleSubmit(contact) {
-    var _window$BSGlobal, _window$BSGlobal$tena, _window$BSGlobal2, _window$BSGlobal2$ten;
-
     var tenantInfo = window.BSGlobal.tenantInfo;
     var npsStartTime = (0, _dayjs["default"])(startTime).unix();
     var npsEndTime = (0, _dayjs["default"])(endTime).unix();
-    var Version = ((_window$BSGlobal = window.BSGlobal) === null || _window$BSGlobal === void 0 ? void 0 : (_window$BSGlobal$tena = _window$BSGlobal.tenantAuthentication) === null || _window$BSGlobal$tena === void 0 ? void 0 : _window$BSGlobal$tena.version) || ((_window$BSGlobal2 = window.BSGlobal) === null || _window$BSGlobal2 === void 0 ? void 0 : (_window$BSGlobal2$ten = _window$BSGlobal2.tenantAuthentication) === null || _window$BSGlobal2$ten === void 0 ? void 0 : _window$BSGlobal2$ten.Version) || 1;
     var result = {
       fields: {
         nps_activity_name: activityName,

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

@@ -45,6 +45,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var preCls = 'titaui-wechat-btn';
 var userId = (0, _bsGlobal.getUserInfo)().Id;
+var isDingDing = (0, _bsGlobal.getSource)() === 861;
 
 var WeChatBtn = function WeChatBtn(props) {
   var id = props.id,
@@ -127,7 +128,7 @@ var WeChatBtn = function WeChatBtn(props) {
     if (isWx) {
       //有群了，判断没在群就先进群再打开群
       if (chatId !== null && chatId !== 'chatId') {
-        window.WeixinJSBridge.invoke('openExistedChatWithMsg', {
+        wx.invoke('openExistedChatWithMsg', {
           chatId: chatId
         }, function (res) {
           if (res.err_msg === 'openExistedChatWithMsg:ok') {
@@ -136,14 +137,14 @@ var WeChatBtn = function WeChatBtn(props) {
             if (isMac) {
               setMacWarnModalVisible(true);
             } else {
-              window.WeixinJSBridge.invoke('updateEnterpriseChat', {
+              wx.invoke('updateEnterpriseChat', {
                 chatId: chatId,
                 userIdsToAdd: loginUserOpenId
               }, function (res) {
                 console.log(chatId);
 
                 if (res.err_msg == 'updateEnterpriseChat:ok') {
-                  window.WeixinJSBridge.invoke('openExistedChatWithMsg', {
+                  wx.invoke('openExistedChatWithMsg', {
                     chatId: chatId
                   }, function (res) {
                     if (res.err_msg == 'openExistedChatWithMsg:ok') {
@@ -173,7 +174,7 @@ var WeChatBtn = function WeChatBtn(props) {
 
 
   var handleCreateGroupChat = function handleCreateGroupChat() {
-    window.WeixinJSBridge.invoke('createChatWithMsg', {
+    wx.invoke('createChatWithMsg', {
       selectedOpenUserIds: weChatGroupMember,
       chatName: "\u300C".concat(apply, "\u7FA4\u300D").concat(name),
       msg: {
@@ -193,7 +194,7 @@ var WeChatBtn = function WeChatBtn(props) {
             objType: objType,
             chatId: res.chatId
           });
-          window.WeixinJSBridge.invoke('openExistedChatWithMsg', {
+          wx.invoke('openExistedChatWithMsg', {
             chatId: res.chatId
           });
         }
@@ -217,42 +218,46 @@ var WeChatBtn = function WeChatBtn(props) {
 
 
   (0, _react.useEffect)(function () {
-    (0, _request.rpost)('v1')('chat/info', {
-      objId: id,
-      objType: objType
-    }).then(function (res) {
-      if (res.Message === '没有权限') {
-        setIsShowWeChat(false);
-        return;
-      } else {
-        setIsShowWeChat(true);
-
-        if (res.Data.obj) {
-          setIsHasGroup(true);
-        }
-
-        if (isWx) {
-          console.log(res.Data.obj);
-          setChatId(res.Data.obj);
-          (0, _request.rpost)('v1')('chat/users', {
-            objId: id,
-            objType: objType
-          }).then(function (res) {
-            setWeChatGroupMember(res.Data.openUserIds);
-            setUrl(res.Data.link);
-          });
-          (0, _request.rpost)('v1')('chat/user', {
-            objId: id,
-            objType: objType
-          }).then(function (res) {
-            setLoginUserOpenId(res.Data.obj);
-          });
+    if (isDingDing) {
+      return;
+    } else {
+      (0, _request.rpost)('v1')('chat/info', {
+        objId: id,
+        objType: objType
+      }).then(function (res) {
+        if (res.Message === '没有权限') {
+          setIsShowWeChat(false);
+          return;
         } else {
           setIsShowWeChat(true);
-          return;
+
+          if (res.Data.obj) {
+            setIsHasGroup(true);
+          }
+
+          if (isWx) {
+            console.log(res.Data.obj);
+            setChatId(res.Data.obj);
+            (0, _request.rpost)('v1')('chat/users', {
+              objId: id,
+              objType: objType
+            }).then(function (res) {
+              setWeChatGroupMember(res.Data.openUserIds);
+              setUrl(res.Data.link);
+            });
+            (0, _request.rpost)('v1')('chat/user', {
+              objId: id,
+              objType: objType
+            }).then(function (res) {
+              setLoginUserOpenId(res.Data.obj);
+            });
+          } else {
+            setIsShowWeChat(true);
+            return;
+          }
         }
-      }
-    });
+      });
+    }
   }, [chatId]);
   (0, _react.useEffect)(function () {
     if (isShowWeChat && chatId === null) {

package/package.json

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