cnhis-design-vue 3.4.0-beta.4 → 3.4.0-beta.7

package/es/components/iho-chat/src/hooks/useVideo.d.ts

@@ -79,17 +79,17 @@ export declare function useVideo(config?: VideoConfig): {
         };
         isForward: boolean;
     };
-    trtcProxy: Ref<any, any>;
+    trtcProxy: Ref<any>;
     sendMessage: (message: {
         chatType?: string | undefined;
         content: import("../../../../shared/types").AnyObject;
         receiver?: string | undefined;
     }) => Promise<void>;
     trtc: TRTC;
-    timing: Ref<string, string>;
-    voiceClose: Ref<boolean, boolean>;
-    videocamClose: Ref<boolean, boolean>;
-    isConnect: Ref<boolean, boolean>;
+    timing: Ref<string>;
+    voiceClose: Ref<boolean>;
+    videocamClose: Ref<boolean>;
+    isConnect: Ref<boolean>;
     isAudio: import("vue").ComputedRef<boolean>;
     isCall: import("vue").ComputedRef<boolean>;
     messageTypeText: import("vue").ComputedRef<"语音" | "视频">;
@@ -102,13 +102,8 @@ export declare function useVideo(config?: VideoConfig): {
         name: string;
         hasVideo?: boolean | undefined;
         hasAudio?: boolean | undefined;
-    }[], RemoteUser[] | {
-        id: string;
-        name: string;
-        hasVideo?: boolean | undefined;
-        hasAudio?: boolean | undefined;
     }[]>;
-    videoRefs: Ref<Map<string, HTMLElement>, Map<string, HTMLElement>>;
+    videoRefs: Ref<Map<string, HTMLElement>>;
     startTimer: () => void;
     resetTimer: () => void;
     toggleAudio: () => Promise<void>;

package/es/components/iho-chat/src/hooks/useVideo.js

@@ -1,3 +1,4 @@
+import { i18n } from '../../../../_virtual/_virtual_i18n-methods.js';
 import { ref, computed, onBeforeUnmount, nextTick } from 'vue';
 import { useData } from './useData.js';
 import 'stompjs';
@@ -28,21 +29,7 @@ function useVideo(config = {}) {
   const retryCount = ref(/* @__PURE__ */ new Map());
   const isAudio = computed(() => state.currentAVMsg.chatMessageType === MESSAGE_TYPE.AUDIO);
   const isCall = computed(() => state.currentAVMsg.callMode === "call");
-  const messageTypeText = computed(() => isAudio.value ? function() {
-    var _a, _b, _c;
-    try {
-      return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.130")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.130")) || "\u8BED\u97F3";
-    } catch (e) {
-      return "\u8BED\u97F3";
-    }
-  }() : function() {
-    var _a, _b, _c;
-    try {
-      return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.131")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.131")) || "\u89C6\u9891";
-    } catch (e) {
-      return "\u89C6\u9891";
-    }
-  }());
+  const messageTypeText = computed(() => isAudio.value ? i18n("10010.1.130", "\u8BED\u97F3") : i18n("10010.1.131", "\u89C6\u9891"));
   const trtc = TRTC.create();
   const MAIN_STREAM_TYPE = TRTC.TYPE.STREAM_TYPE_MAIN;
   function startTimer() {

package/es/components/iho-chat/src/hooks/useWebSocket.js

@@ -6,23 +6,12 @@ import { isAudioOrVideoMessage } from '../utils/index.js';
 import { remove } from 'lodash-es';
 
 function useWebSocket(props, data) {
-  const {
-    stompClient,
-    state,
-    openSession,
-    closeSession,
-    setSessionList,
-    setUpdateSessionItem,
-    setCurrentSessionItem
-  } = data;
+  const { stompClient, state, openSession, closeSession, setSessionList, setUpdateSessionItem, setCurrentSessionItem } = data;
   const groupSessionList = [];
   initWebSocket();
   function initWebSocket() {
     const options = {
-      headers: {
-        AccessToken: props.token,
-        UserId: props.userId
-      },
+      headers: { AccessToken: props.token, UserId: props.userId },
       heartbeatFn() {
         {
           try {
@@ -44,30 +33,28 @@ function useWebSocket(props, data) {
     stompClient.value = new ChatSock("/fdp-chat/websocket", options);
   }
   function subscribeSessionList() {
-    stompClient.value.subscribe("/app/sessionList", ({
-      body
-    }) => {
-      try {
-        const data2 = JSON.parse(body);
-        const {
-          authentication,
-          currentUser,
-          sessionVos
-        } = data2;
-        Object.assign(state.userInfo, currentUser, authentication);
-        if (!(sessionVos == null ? void 0 : sessionVos.length))
-          return;
-        setSessionList(sessionVos);
-        groupSessionList.splice(0, groupSessionList.length);
-        groupSessionList.push(...sessionVos.filter((session) => session.chatType === CHAT_TYPE.GROUP));
-        subscribeGroupMessage();
-        handleDefaultSession();
-      } catch (error) {
-        console.log(error);
+    stompClient.value.subscribe(
+      "/app/sessionList",
+      ({ body }) => {
+        try {
+          const data2 = JSON.parse(body);
+          const { authentication, currentUser, sessionVos } = data2;
+          Object.assign(state.userInfo, currentUser, authentication);
+          if (!(sessionVos == null ? void 0 : sessionVos.length))
+            return;
+          setSessionList(sessionVos);
+          groupSessionList.splice(0, groupSessionList.length);
+          groupSessionList.push(...sessionVos.filter((session) => session.chatType === CHAT_TYPE.GROUP));
+          subscribeGroupMessage();
+          handleDefaultSession();
+        } catch (error) {
+          console.log(error);
+        }
+      },
+      {
+        extraConfig: JSON.stringify(props.extraParams)
       }
-    }, {
-      extraConfig: JSON.stringify(props.extraParams)
-    });
+    );
   }
   function handleDefaultSession() {
     const session = state.sessionList.find((_session) => _session.id === props.defaultSessionId);
@@ -77,21 +64,17 @@ function useWebSocket(props, data) {
   }
   function subscribeGroupMessage() {
     groupSessionList.forEach((groupSession) => {
-      stompClient.value.subscribe(`/topic/group/${groupSession.receiver}`, ({
-        body
-      }) => handleSubscribeMessage({
-        body,
-        chatType: CHAT_TYPE.GROUP
-      }));
+      stompClient.value.subscribe(
+        `/topic/group/${groupSession.receiver}`,
+        ({ body }) => handleSubscribeMessage({ body, chatType: CHAT_TYPE.GROUP })
+      );
     });
   }
   function subscribeMessage() {
-    stompClient.value.subscribe("/user/topic/single", ({
-      body
-    }) => handleSubscribeMessage({
-      body,
-      chatType: CHAT_TYPE.SINGLE
-    }));
+    stompClient.value.subscribe(
+      "/user/topic/single",
+      ({ body }) => handleSubscribeMessage({ body, chatType: CHAT_TYPE.SINGLE })
+    );
   }
   async function handleMessage(messageVo, chatType) {
     state.currentMsg = messageVo;
@@ -124,17 +107,10 @@ function useWebSocket(props, data) {
     };
     setUpdateSessionItem(updateSessionItem);
   }
-  async function handleSubscribeMessage({
-    body,
-    chatType
-  }) {
+  async function handleSubscribeMessage({ body, chatType }) {
     try {
       const data2 = JSON.parse(body);
-      const {
-        messageVo,
-        sessionVo,
-        chatAvStatusVo
-      } = data2;
+      const { messageVo, sessionVo, chatAvStatusVo } = data2;
       switch (data2.event) {
         case SUBSCRIBE_MESSAGE_TYPE.MESSAGE: {
           if (isAudioOrVideoMessage(messageVo.content)) {
@@ -152,14 +128,18 @@ function useWebSocket(props, data) {
                 handleMessage(messageVo, chatType);
               }
             } else {
-              stompClient.value.send("/app/chat/send", {}, JSON.stringify({
-                chatType: CHAT_TYPE.SINGLE,
-                receiver: messageVo.sender,
-                content: {
-                  chatMessageType: messageVo.content.chatMessageType,
-                  avStatus: AV_STATUS.CALL_BUSY
-                }
-              }));
+              stompClient.value.send(
+                "/app/chat/send",
+                {},
+                JSON.stringify({
+                  chatType: CHAT_TYPE.SINGLE,
+                  receiver: messageVo.sender,
+                  content: {
+                    chatMessageType: messageVo.content.chatMessageType,
+                    avStatus: AV_STATUS.CALL_BUSY
+                  }
+                })
+              );
               console.log("\u7528\u6237\u5FD9\uFF01");
             }
           } else {
@@ -190,12 +170,10 @@ function useWebSocket(props, data) {
           if (chatType === CHAT_TYPE.GROUP)
             return;
           setUpdateSessionItem(sessionVo);
-          stompClient.value.subscribe(`/topic/group/${sessionVo.receiver}`, ({
-            body: body2
-          }) => handleSubscribeMessage({
-            body: body2,
-            chatType: CHAT_TYPE.GROUP
-          }));
+          stompClient.value.subscribe(
+            `/topic/group/${sessionVo.receiver}`,
+            ({ body: body2 }) => handleSubscribeMessage({ body: body2, chatType: CHAT_TYPE.GROUP })
+          );
           break;
         }
         case SUBSCRIBE_MESSAGE_TYPE.LEAVE_GROUP: {

package/es/components/iho-chat/src/utils/chatSock.js

@@ -16,25 +16,24 @@ class ChatSock {
     const socket = new SockJS(this.url);
     this.stompClient = Stomp.over(socket);
     this.stompClient.debug = null;
-    this.stompClient.connect(this.options.headers || {}, () => {
-      const {
-        connectCb
-      } = this.options;
-      connectCb && connectCb(this.reconnectionCount > 0);
-      this.startHeartbeat();
-      this.subscribe(this.options.subscribeCbs);
-      this.reconnectionCount = 0;
-    }, (err) => {
-      const reconnectionCount = this.reconnectionCount;
-      const {
-        errorCb,
-        reconnectMaxCount = 10
-      } = this.options;
-      errorCb && errorCb(err, reconnectionCount);
-      if (reconnectionCount < reconnectMaxCount) {
-        this.reconnect();
+    this.stompClient.connect(
+      this.options.headers || {},
+      () => {
+        const { connectCb } = this.options;
+        connectCb && connectCb(this.reconnectionCount > 0);
+        this.startHeartbeat();
+        this.subscribe(this.options.subscribeCbs);
+        this.reconnectionCount = 0;
+      },
+      (err) => {
+        const reconnectionCount = this.reconnectionCount;
+        const { errorCb, reconnectMaxCount = 10 } = this.options;
+        errorCb && errorCb(err, reconnectionCount);
+        if (reconnectionCount < reconnectMaxCount) {
+          this.reconnect();
+        }
       }
-    });
+    );
   }
   disconnect() {
     var _a;

package/es/components/iho-chat/src/utils/index.d.ts

@@ -1,5 +1,5 @@
 import { AnyObject } from '../../../../shared/types';
-export declare const $message: import("naive-ui/es/message").MessageApi;
+export declare const $message: import("naive-ui").MessageApi;
 export declare function formatTime(dateStr: string): {
     siderMsgTime: any;
     msgTime: any;

package/es/components/iho-chat/src/utils/index.js

@@ -1,3 +1,4 @@
+import { i18n } from '../../../../_virtual/_virtual_i18n-methods.js';
 import { isToday, format, isYesterday, startOfDay } from 'date-fns';
 import { cloneDeep, isNumber, isNaN, isArray, uniqBy } from 'lodash-es';
 import { MESSAGE_TYPE, CHAT_TYPE, ROLE_TYPE } from '../constants/index.js';
@@ -14,14 +15,7 @@ function formatTime(dateStr) {
   if (isToday(date)) {
     siderMsgTime = msgTime = format(date, "HH:mm");
   } else {
-    siderMsgTime = isYesterday(date) ? function() {
-      var _a, _b, _c;
-      try {
-        return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.132")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.132")) || "\u6628\u5929";
-      } catch (e) {
-        return "\u6628\u5929";
-      }
-    }() : format(date, "MM-dd");
+    siderMsgTime = isYesterday(date) ? i18n("10010.1.132", "\u6628\u5929") : format(date, "MM-dd");
     const dateYear = date.getFullYear();
     const currentYear = new Date().getFullYear();
     msgTime = format(date, dateYear < currentYear ? "yyyy\u5E74M\u6708d\u65E5 HH:mm" : "M\u6708d\u65E5 HH:mm");
@@ -34,41 +28,13 @@ function formatTime(dateStr) {
     const oneMinuteAgo = 60 * 1e3;
     const oneHourAgo = 60 * 60 * 1e3;
     if (distance < oneMinuteAgo) {
-      return function() {
-        var _a, _b, _c;
-        try {
-          return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.133")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.133")) || "\u521A\u521A";
-        } catch (e) {
-          return "\u521A\u521A";
-        }
-      }();
+      return i18n("10010.1.133", "\u521A\u521A");
     } else if (distance < oneHourAgo) {
-      return Math.ceil(distance / 1e3 / 60) + function() {
-        var _a, _b, _c;
-        try {
-          return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.136")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.136")) || "\u5206\u949F\u524D";
-        } catch (e) {
-          return "\u5206\u949F\u524D";
-        }
-      }();
+      return Math.ceil(distance / 1e3 / 60) + i18n("10010.1.136", "\u5206\u949F\u524D");
     } else if (isToday(currentTime)) {
-      return function() {
-        var _a, _b, _c;
-        try {
-          return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.134")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.134")) || "\u4ECA\u5929";
-        } catch (e) {
-          return "\u4ECA\u5929";
-        }
-      }() + format(currentTime, "HH:mm");
+      return i18n("10010.1.134", "\u4ECA\u5929") + format(currentTime, "HH:mm");
     } else if (isYesterday(currentTime)) {
-      return function() {
-        var _a, _b, _c;
-        try {
-          return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.132")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.132")) || "\u6628\u5929";
-        } catch (e) {
-          return "\u6628\u5929";
-        }
-      }() + format(currentTime, "HH:mm");
+      return i18n("10010.1.132", "\u6628\u5929") + format(currentTime, "HH:mm");
     } else {
       const dateYear = currentTime.getFullYear();
       const currentYear = new Date().getFullYear();
@@ -130,23 +96,9 @@ function getAVTime(msg) {
     if (timeArray.length === 3 && timeArray[0] === "00") {
       _timeStr = `${timeArray[1]}:${timeArray[2]}`;
     }
-    return function() {
-      var _a, _b, _c;
-      try {
-        return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.137")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.137")) || "\u901A\u8BDD\u65F6\u957F";
-      } catch (e) {
-        return "\u901A\u8BDD\u65F6\u957F";
-      }
-    }() + _timeStr;
+    return i18n("10010.1.137", "\u901A\u8BDD\u65F6\u957F") + _timeStr;
   }
-  return function() {
-    var _a, _b, _c;
-    try {
-      return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.138")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.138")) || "\u5DF2\u53D6\u6D88";
-    } catch (e) {
-      return "\u5DF2\u53D6\u6D88";
-    }
-  }();
+  return i18n("10010.1.138", "\u5DF2\u53D6\u6D88");
 }
 function simplifyMessage(lastMessage) {
   var _a;
@@ -239,14 +191,7 @@ function getRoleName(type) {
       break;
     }
     case ROLE_TYPE.PATIENT: {
-      roleName = function() {
-        var _a, _b, _c;
-        try {
-          return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.200")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.200")) || "\u60A3\u8005";
-        } catch (e) {
-          return "\u60A3\u8005";
-        }
-      }();
+      roleName = i18n("10010.1.200", "\u60A3\u8005");
       break;
     }
   }
@@ -274,21 +219,7 @@ function getDetail(item, isShowSize) {
   return details;
 }
 function showAudioAndVideoRecord(chatMessageType) {
-  return chatMessageType === MESSAGE_TYPE.AUDIO ? function() {
-    var _a, _b, _c;
-    try {
-      return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.57")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.57")) || "\u8BED\u97F3\u901A\u8BDD";
-    } catch (e) {
-      return "\u8BED\u97F3\u901A\u8BDD";
-    }
-  }() : function() {
-    var _a, _b, _c;
-    try {
-      return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.59")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.59")) || "\u89C6\u9891\u901A\u8BDD";
-    } catch (e) {
-      return "\u89C6\u9891\u901A\u8BDD";
-    }
-  }();
+  return chatMessageType === MESSAGE_TYPE.AUDIO ? i18n("10010.1.57", "\u8BED\u97F3\u901A\u8BDD") : i18n("10010.1.59", "\u89C6\u9891\u901A\u8BDD");
 }
 function formatJsonstr(obj, type) {
   try {