cnhis-design-vue 2.1.29 → 2.1.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "2.1.29",
+  "version": "2.1.31",
   "description": "前端业务UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",
@@ -104,4 +104,4 @@
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
   }
-}
+}

package/packages/fabric-chart/src/fabric-chart/FabricPolylines.vue

@@ -705,6 +705,8 @@ export default {
                     let cloneObj = JSON.parse(JSON.stringify(pointObj));
                     cloneObj.value.time = this.getXValue(curLeft);
                     cloneObj.left = curLeft;
+                    // 补充的节点会和滑动的线条对应不上
+                    // await this.clonePoint(point, [curLeft, cloneObj.top, cloneObj.left, cloneObj.top])
                     this.addPointList.splice(index, 0, cloneObj);
                   }
                 }
@@ -718,9 +720,7 @@ export default {
         if (conditionNoLine2 || conditionHasLine2) {
           // point.line1 && this.removePolyline(point.line1.id);
           setPointLineColor(point, 'transparent', conditionHasLine2);
-          // if (i === 1) {
           this.addPointList.length == 0 && (await this.clonePoint(point, [point.line1 ? point.line1.x1 : originLeft, point.line1 ? point.line1.y1 : originTop, originLeft, originTop]));
-          // }
           if (this.addPointList.every(v => v.left !== left)) {
             // const points1 = i === 1 ? [originLeft, originTop] : point.prePoints;
             const points1 = this.addPointList.length == 0 ? [originLeft, originTop] : point.prePoints;
@@ -876,11 +876,6 @@ export default {
         evented: false,
         ...others
       });
-      // line.hasControls = line.hasBorders = false;
-      // line.on('mouseover', () => {
-      //   // 将当条线段以及点层级置顶
-      //   // 此处有问题，线段定位是斜角形成的整个矩形，会挡住其他点或线段的mouseover事件
-      // });
 
       return line;
     },
@@ -1019,10 +1014,7 @@ export default {
         const point = this.canvas.getObjects().filter(item => item[pointId] === id);
         if (point && point.length > 0) {
           point.forEach(v => {
-            if (left && v.left >= left) {
-              this.canvas.remove(v);
-              v.line1 && this.canvas.remove(v.line1);
-            } else if (!left) {
+            if ((left && v.left >= left) || !left) {
               this.canvas.remove(v);
               v.line1 && this.canvas.remove(v.line1);
             }

package/packages/form-table/src/FormTable.vue

@@ -344,7 +344,10 @@ export default create({
       ];
     },
     async loadData(list) {
-      if (!list || !list.length) return;
+      if (!list || !list.length) {
+        this.$refs[this.formTableGridRef]?.loadData([]);
+        return
+      }
       this.tableList = vexutils.clone(list, true);
       this.fullTableList = vexutils.clone(list, true);
       this.handlerFieldToggleList(this.tableList);

package/packages/multi-chat/chat/audio.vue

@@ -35,7 +35,9 @@
             padding: size === 'big' ? '24px 18px 7px' : '0 0 0 6px'
           }"
         >
-          <span :style="{ fontSize: size === 'big' ? '24px' : '14px' }">{{ name }}</span>
+          <span :style="{ fontSize: size === 'big' ? '24px' : '14px' }">
+            {{ name }}
+            <span v-if="sdkInfo.vendor == 3">（{{callerStatus}}）</span></span>
           <span
             class="status"
             :style="{
@@ -74,6 +76,7 @@ import fetch, { qs } from '@/utils/chatFetch';
 import RtcClient from '../utils/rtc-client-multi';
 import { getSipUserId } from '@/utils/sip-device';
 import uniRTCAPI from './mixins/uniRTCAPI';
+import { getClientDeviceToken } from '../utils/index';
 export default {
   inject: ['store', 'i18nText'],
   mixins: [uniRTCAPI],
@@ -113,7 +116,10 @@ export default {
       'accessParams',
       'queryParams',
       'chatUserId',
-      'muteAudio'
+      'muteAudio',
+      'curScrollItem',
+      'outing',
+      'callerStatus'
     ]),
     mySipName() {
       const videoData = this.videoData;
@@ -259,9 +265,18 @@ export default {
           this.setVideoData(data.map);
           // 江苏省
           if (this.uniRTC || data.map?.vendor == 3) {
-            const targetList = data.map?.targetList || [];
-            this.checkStatus(targetList);
-            this.startCall(targetList);
+            console.log('this.curScrollItem', this.curScrollItem);
+            const curScrollItemParams = JSON.parse(this.curScrollItem?.params)
+            getClientDeviceToken(curScrollItemParams.customerId).then(tokenRes => {
+              if (!tokenRes) {
+                return
+              }
+              const targetInfo = data.map?.targetList || [];
+              // const targetList = data.map?.targetList || [];
+              const targetList = [{deviceToken: tokenRes.deviceToken, username: targetInfo[0].username, token: targetInfo[0].token}]
+              this.checkStatus(targetList);
+              this.startCall(targetList);
+            })
           }
         } else {
           this.$message.warning(data.resultMsg);
@@ -325,7 +340,8 @@ export default {
             this.setVideoData({});
             // 江苏省
             if (this.uniRTC) {
-              if (this.videoData.isCaller || this.videoData.inviteResult == 1) {
+              if (accept === '0') {
+                console.log('this.outing', this.outing);
                 this.stopCall();
               } else {
                 // 拒接

package/packages/multi-chat/chat/chatHeader.vue

@@ -452,11 +452,14 @@ export default {
       color: #2d7aff;
       border: 1px solid #2d7aff;
     }
-    /deep/ .avatar-logo {
+    /deep/ .avatar-wrap {
       font-size: 12px;
       position: absolute;
       left: 0;
       top: 50%;
+    }
+    /deep/ .avatar-logo {
+      font-size: 12px;
       margin-top: -15px;
     }
   }

package/packages/multi-chat/chat/chatHistory.vue

@@ -36,6 +36,7 @@
                 <div class="content">
                   <img style="width:16px;" src="../img/video_consult.png" />
                   {{ item.content.content }}
+                  <img v-if="item.content.name" @click="openReplayVideo(item.content.name)" style="width: 20px;margin-left: 12px;cursor:pointer" src="../img/replay.png" />
                 </div>
               </div>
               <div class="content-wrap" v-else-if="item.content.type === 6">
@@ -92,7 +93,7 @@ import MsgDescribe from '../components/msg-describe';
 import MsgPicture from '../components/msg-picture';
 import MsgPrescription from '../components/msg-prescription';
 import viewerOptions from './mixins/viewerOptions';
-import InfiniteScroll from 'vue-infinite-scroll';
+import InfiniteScroll from '@/directive/scroll';
 import vexutils from '@/utils/vexutils';
 import fetch from '@/utils/chatFetch';
 import { Icon, Spin } from 'ant-design-vue';
@@ -108,6 +109,7 @@ export default {
     MsgDescribe
   },
   data() {
+    this.handleInfiniteOnLoad = vexutils.debounce(this.handleInfiniteOnLoad, 200)
     return {
       msgList: [],
       historySessionId: '',
@@ -116,7 +118,8 @@ export default {
       visible: false,
       images: [],
       curAudioUrl: '',
-      lastAudioItem: null
+      lastAudioItem: null,
+      loadFinished: false
     };
   },
   props: ['params', 'i18nText'],
@@ -138,6 +141,9 @@ export default {
     this.handleInfiniteOnLoad();
   },
   methods: {
+    openReplayVideo(url) {
+      window.open(url)
+    },
     getMessageItemClass(item) {
       return {
         right: item.senderFlag === 2,
@@ -146,6 +152,11 @@ export default {
     },
     /* 向上滚动刷新 */
     handleInfiniteOnLoad() {
+      console.log('加载记录');
+      if (this.loadFinished) {
+        console.log('loadFinished')
+        return
+      }
       this.loading = true;
       let id = this.msgList[0] && this.msgList[0].id;
       // let params = {
@@ -169,6 +180,7 @@ export default {
           if (data.result === 'SUCCESS') {
             this.loading = false;
             if (id && data.list.length === 0) {
+              this.loadFinished = true
               return '没有更多消息了';
             }
             this.msgList = [...data.list, ...this.msgList];
@@ -176,6 +188,8 @@ export default {
               .filter(v => !v.recallFlag && v.content.type == 1)
               ?.map(v => v.content?.content);
             this.handleScrollTo('current');
+          } else {
+            console.log('加载失败');
           }
         });
     },

package/packages/multi-chat/chat/chatMain.vue

@@ -640,6 +640,11 @@ export default {
           return;
         }
         if (openMode === 'EJECT') {
+          // 打开云his页面需要从cookie内获取最新的jsessionids
+          if (address.includes('jsessionidsFlag=1')) {
+            let jsessionids = vexutils.cookie.get('jsessionids')
+            address = address + `&jsessionids=${jsessionids}`
+          }
           this.modalShow = true;
           this.modalData = Object.assign({}, data, {
             address

package/packages/multi-chat/chat/index.vue

@@ -645,7 +645,8 @@ export default {
       'setLastCurrentTab',
       'setQueueItem',
       'setCurScrollItem',
-      'setSessionType'
+      'setSessionType',
+      'setCallerStatus'
     ]),
     ...mapActions(['setChatTimer', 'getVideoHistoryList', 'initUniRTC']),
     ...mapActions({
@@ -849,6 +850,7 @@ export default {
           this.subscribeVideoRecord();
           this.subscribeOfflineSessionStatistic();
           this.subscribeMessageRecord();
+          this.subscribeUserStatus();
         },
         errorCb: (_err, count) => {
           this.reConnention = count;
@@ -864,6 +866,16 @@ export default {
       });
     },
 
+    /* 订阅客服状态更新 */
+    subscribeUserStatus() {
+      this.stompClient.subscribe(`/topic/updateStatus/${this.serviceId}`, response => {
+        // let res = JSON.parse(response.body);
+        console.log('客服状态改变');
+        let refDom = this.$refs['scrollList-session'][0];
+        refDom?.getSessionList();
+      });
+    },
+
     /* 订阅排队列表人数及未读消息数 */
     subscribeQueueStatistic() {
       this.stompClient.subscribe(`/topic/queueStatistic/${this.queueKey}`, response => {
@@ -1089,6 +1101,15 @@ export default {
         // });
       });
     },
+    // 江苏通app接通
+    subscribeAcceptedJST(res) {
+      this.setShowVideo(true);
+      this.setShowAudio(false);
+      this.setVideoData(res);
+      this.$nextTick(() => {
+        this.setRecordId(res.recordId);
+      });
+    },
     /**
      * 视频通话记录变更
      */
@@ -1280,6 +1301,14 @@ export default {
           }
         });
     },
+    getRefuseParam() {
+      const curScrollItemParams = JSON.parse(this.curScrollItem?.params)
+      return {
+        userId: curScrollItemParams.vaa01,
+        orgId: curScrollItemParams.orgId,
+        assemblyId: this.assemblyId
+      }
+    },
     // 获取视频sdk
     getSdkAppId() {
       fetch
@@ -1296,6 +1325,7 @@ export default {
             if (vendor == 3) {
               this.initUniRTC({
                 ...data.obj,
+                vueSelf: this,
                 params: {
                   assemblyId: this.assemblyId
                 }

package/packages/multi-chat/chat/mixins/uniRTCAPI.js

@@ -2,7 +2,7 @@ import { mapGetters, mapMutations, mapActions } from '../../store/helper';
 
 export default {
   computed: {
-    ...mapGetters(['uniRTC', 'incoming', 'outing']),
+    ...mapGetters(['uniRTC', 'incoming', 'outing', 'sdkAppId']),
   },
   data() {
     return {
@@ -26,17 +26,19 @@ export default {
         let outings = [];
         for (let i = 0; i < targetList.length; i++) {
           const item = targetList[i];
-          const outing = this.uniRTC.startCall(item.deviceToken, '腾讯', 'tencent', {
-            sdkAppId: this.uniRTC.appId,
-            userId: this.userId,
+          const outing = this.uniRTC.startCall(item.deviceToken, '腾讯视频', 'tencent', {
+            sdkAppId: Number(this.sdkAppId),
+            userId: this.isServer ? this.serviceId : this.clientId,
             userSig: this.videoData.token,
-            roomId: this.videoData.roomId,
+            roomId: Number(this.videoData.roomId),
+            videoData: this.videoData
             // privateMapKey
           }, {
-            sdkAppId: this.uniRTC.appId,
+            sdkAppId: Number(this.sdkAppId),
             userId: item.username,
             userSig: item.token,
-            roomId: this.videoData.roomId,
+            roomId: Number(this.videoData.roomId),
+            videoData: this.videoData
             // privateMapKey
           });
           outings.push(outing);
@@ -47,6 +49,7 @@ export default {
     stopCall() {
       for (let i = 0; i < this.outing.length; i++) {
         const item = this.outing[i];
+        console.log('江苏省主动挂断', item);
         // 江苏省主动挂断
         this.uniRTC.stopCall(item);
       }

package/packages/multi-chat/chat/multiVideo.vue

@@ -185,6 +185,7 @@ import fetch, { qs } from '@/utils/chatFetch';
 import { Button, Modal, Popover, Tooltip } from 'ant-design-vue';
 import SvgIcon from '@/component/svg/index.vue';
 import uniRTCAPI from './mixins/uniRTCAPI';
+import { getClientDeviceToken } from '../utils/index';
 
 const videoStatus = {
   1: '未接听',
@@ -249,7 +250,10 @@ export default {
       'sessionId',
       'videoListChange',
       'videoData',
-      'videoMode'
+      'videoMode',
+      'curScrollItem',
+      'clientId',
+      'isServer'
     ]),
     serviceName() {
       return this.userInfo?.sysParams?.userName;
@@ -472,9 +476,17 @@ export default {
           // this.appendVideoMessage();
           // 江苏省
           if (this.uniRTC) {
-            const targetList = data.map?.targetList || [];
-            this.checkStatus(targetList);
-            this.startCall(targetList);
+            console.log('this.curScrollItem', this.curScrollItem);
+            const curScrollItemParams = JSON.parse(this.curScrollItem?.params)
+            getClientDeviceToken(curScrollItemParams.customerId).then(tokenRes => {
+              const targetInfo = data.map?.targetList || [];
+              if (!tokenRes) {
+                return
+              }
+              const targetList = [{deviceToken: tokenRes.deviceToken, username: targetInfo[0].username, token: targetInfo[0].token}]
+              this.checkStatus(targetList);
+              this.startCall(targetList);
+            })
           }
         } else {
           data.resultMsg && this.$message.warning(data.resultMsg);

package/packages/multi-chat/chat/scrollList.vue

@@ -47,7 +47,8 @@ export default {
       'clientParams',
       'serviceId',
       'msgList',
-      'queueItem'
+      'queueItem',
+      'sdkInfo'
     ]),
     foldTheme() {
       return this.theme === 'fold';
@@ -823,7 +824,10 @@ export default {
       // if (item.type == 2) {
       //   return item.toName;
       // }
-      const name = JSON.parse(item.params || {})?.name || "";
+      let name = ''
+      if (item.params) {
+        name = JSON.parse(item.params || {})?.name || "";
+      }
       return item.titleSetting || item.name || name;
     },
     formatTime(item) {
@@ -910,8 +914,10 @@ export default {
         value: handleInfiniteOnLoad
       }
     ];
+    const _this = this
+    // 默认不显示在线状态，只有南通瑞慈显示
     function getAvatar(item) {
-      return <Avatar className="avatar" src={item.portrait} name={item.name || item.toName || item.title || item.titleSetting} len={2} />;
+      return <Avatar className="avatar" src={item.portrait} name={item.name || item.toName || item.title || item.titleSetting} len={2} status={item.onlineStatus} isShowStatus={_this.currentTab === 'session' && _this.sdkInfo?.vendor == 3} />;
     }
     function getContent(item, filters, fold, classifyIcon) {
       const { formatName, formatCount } = filters;

package/packages/multi-chat/components/avatar.vue

@@ -25,6 +25,14 @@ export default {
     name: {
       type: String,
       default: ''
+    },
+    status: {
+      type: String,
+      default: ''
+    },
+    isShowStatus: {
+      type: Boolean,
+      default: false
     }
   },
   render(_h, { props }) {
@@ -32,45 +40,74 @@ export default {
     const size = props.size + 'px';
     const className = props.className;
     const customStyle = props.customStyle;
+    const isShowStatus = props.isShowStatus;
+    const onlineStatus = props.status === 'ON-LINE' ? 'online' : 'offline';
     let name = '';
     if (!src) {
       name = (props.name || '').slice(-1 * props.len);
     }
     return src ? (
-      <img class={['avatar-logo', className]} src={src} style={`width:${size};height:${size};${customStyle}`}></img>
+      <div class="avatar-wrap">
+        <img class={['avatar-logo', className]} src={src} style={`width:${size};height:${size};${customStyle}`}></img>
+        {isShowStatus ? <span class={['user-status', onlineStatus]}></span> : ''}
+      </div>
     ) : (
-      <div class={['avatar-logo', className]} style={`width:${size};${customStyle}`}>
-        <div class="avatar-logo-content" data-name={name}></div>
+      <div class="avatar-wrap">
+        <div class={['avatar-logo', className]} style={`width:${size};${customStyle}`}>
+          <div class="avatar-logo-content" data-name={name}></div>
+        </div>
+        {isShowStatus ? <span class={['user-status', onlineStatus]}></span> : ''}
       </div>
     );
   }
 };
 </script>
 <style lang="less" scoped>
-.avatar-logo {
-  width: 50px;
-  border-radius: 50%;
-  font-size: 18px;
-  line-height: 1;
-  overflow: hidden;
-  display: inline-block;
-  vertical-align: middle;
-  &-content {
-    width: 100%;
-    padding-top: 100%;
-    height: 0;
-    text-align: center;
-    position: relative;
-    color: #fff;
-    background-color: #5585f5;
-    &::after {
-      content: attr(data-name);
-      position: absolute;
-      left: 50%;
-      top: 50%;
-      transform: translate(-50%, -50%);
-      white-space: nowrap;
+.avatar-wrap {
+  position: relative;
+  .user-status {
+    display: inline-block;
+    width: 12px;
+    height: 12px;
+    border-radius: 50%;
+    border: 1px solid #fff;
+    position: absolute;
+    background-color: #ccc;
+    right: 22px;
+    bottom: 2px;
+    &.online {
+      background-color: rgb(12, 198, 133);
+    }
+    &.offline {
+      background-color: rgb(217, 0, 27);
+    }
+  }
+  .avatar-logo {
+    width: 50px;
+    border-radius: 50%;
+    font-size: 18px;
+    line-height: 1;
+    overflow: hidden;
+    display: inline-block;
+    vertical-align: middle;
+    &-content {
+      width: 100%;
+      padding-top: 100%;
+      height: 0;
+      text-align: center;
+      position: relative;
+      color: #fff;
+      background-color: #5585f5;
+      &::after {
+        content: attr(data-name);
+        position: absolute;
+        left: 50%;
+        top: 50%;
+        transform: translate(-50%, -50%);
+        white-space: nowrap;
+      }
     }
   }
 }
+
 </style>

package/packages/multi-chat/setting/sessionList/messageRecord.vue

@@ -22,6 +22,7 @@
             <p class="content" v-else-if="item.content.type === 2">
               <img style="width:16px;" src="../../img/video_consult.png" />
               {{ item.content.content }}
+              <img v-if="item.content.name" @click="openReplayVideo(item.content.name)" style="width: 20px;margin-left: 12px;cursor:pointer" src="../../img/replay.png" />
             </p>
             <p class="content" v-else-if="item.content.type === 6">
               <span v-for="(item, index) in item.content.content" :key="index" class="bot-message">{{ item }}</span>
@@ -66,6 +67,8 @@ import { chatAuthentication } from '../../utils/index';
 import fetch from '@/utils/chatFetch';
 import vexutils from '@/utils/vexutils';
 import { Icon, Spin } from 'ant-design-vue';
+import VueXss from "vue-xss";
+import Vue from 'vue'
 
 export default {
   name: 'c-chat-msg-record',
@@ -99,6 +102,9 @@ export default {
       }
     }
   },
+  beforeCreate() {
+    !this.$xss && Vue.use(VueXss);
+  },
   async created() {
     // 聊天安全整改 增加权限校验
     if (this.cid) {
@@ -107,6 +113,9 @@ export default {
     this.getMessageRecord();
   },
   methods: {
+    openReplayVideo(url) {
+      window.open(url)
+    },
     formatDate(date) {
       return vexutils.formatDate(date, true);
     },

package/packages/multi-chat/store/actions.js

@@ -373,15 +373,17 @@ export default {
       });
   },
   async initUniRTC({ commit, state }, obj) {
-    const { uniAppId, uniSecretKey, params } = obj;
+    const { uniAppId, uniSecretKey, params, vueSelf } = obj;
     let uniRTC = null;
     const getLoginToken = async () => {
       let appSign;
       const paramsData = {
         clientType: '1',
         deviceToken: uniRTC.deviceToken,
-        appId: uniAppId,
-        secretKey: uniSecretKey
+        // appId: uniAppId,
+        // secretKey: uniSecretKey
+        appId: 'hangchuang', // 测试（9997）账号
+        secretKey: 'hangchuang' // // 测试（9997）秘钥
       };
       try {
         const { data } = await fetch.get('/chat/access/getMediaAuthSign', { params: paramsData });
@@ -394,7 +396,9 @@ export default {
         return;
       }
     };
-    uniRTC = new UniRTCObject(uniAppId, getLoginToken);
+    // uniRTC = new UniRTCObject(uniAppId, getLoginToken);
+    uniRTC = new UniRTCObject('hangchuang', getLoginToken, vueSelf);
+    console.log('uniRTC', uniRTC);
     uniRTC.onCallComing = incoming => {
       commit("setIncoming", incoming);
       console.log('onCallComing->', incoming);

package/packages/multi-chat/store/getters.js

@@ -352,5 +352,8 @@ export default {
   },
   outing(state) {
     return state.outing;
+  },
+  callerStatus(state) {
+    return state.callerStatus;
   }
 };

package/packages/multi-chat/store/mutation.js

@@ -277,5 +277,8 @@ export default {
   },
   setOuting(state, outing) {
     state.outing = outing;
+  },
+  setCallerStatus(state, callerStatus) {
+    state.callerStatus = callerStatus;
   }
 };

package/packages/multi-chat/store/state.js

@@ -107,6 +107,7 @@ export default () => {
     userStatus: '',
     uniRTC: null,
     incoming: null,
-    outing: []
+    outing: [],
+    callerStatus: '' // 呼叫人在线离线状态（江苏通）
   };
 };