cnhis-design-vue 0.1.83-beta → 0.1.87-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "0.1.83-beta",
+  "version": "0.1.87-beta",
   "description": "基于 Ant Desgin Vue 的UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",
@@ -93,4 +93,4 @@
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
   }
-}
+}

package/packages/big-table/src/BigTable.vue

@@ -285,6 +285,9 @@ export default create({
       }
       return this.primaryKey || 'theUniqueKey';
     },
+    handlePrimaryKey() {
+      return this.isTree > 0 ? this.primaryKey || "theUniqueKey" : "theUniqueKey";
+    },
     handleName() {
       return function(item, key = 'name') {
         return item.alias || item[key];
@@ -845,7 +848,7 @@ export default create({
           key = temp.tooltip || temp.value; // temp.tooltip 日期的处理
         }
       }
-      return [<a-switch checked={key == item.btnLinkSwitchDefVal} disabled={disabled} on-change={e => this.switchBtnOnChange(e, row, item)} />];
+      return [<a-switch checked={key == item.btnLinkSwitchDefVal} disabled={disabled} on-change={e => this.switchBtnOnChange(e, row, item, index)} />];
     },
     // 字段显示 jsx
     getField(row, item, index, isLink) {
@@ -1465,6 +1468,8 @@ export default create({
       };
     },
     setFilterStatus() {
+      // 表头没有过滤字段 不需要设置
+      if(!this.filterFields || !Object.keys(this.filterFields).length) return;
       let val = this.quickSearchConfig;
 
       if (!val || !val.length) {
@@ -1477,17 +1482,22 @@ export default create({
       // 修复 val长度和this.filterFields个数对不上 会少清空选中项
       for (let key in this.filterFields) {
         let item = this.filterFields[key];
-        this.$set(item, 'CONVERT', []);
+        item && this.$set(item, 'CONVERT', []);
       }
 
       val.forEach(item => {
-        if (!this.filterFields[item.field_key]) {
-          this.$set(this.filterFields[item.field_key], 'CONVERT', []);
-          return false;
-        }
+        let itemKey = item.field_key;
+        // 参与搜索的字段必须在 filterFields中
+        if (itemKey in this.filterFields) {
 
-        let value = item.value.map(item => JSON.stringify(item));
-        this.$set(this.filterFields[item.field_key], 'CONVERT', value);
+          if (!this.filterFields[item.field_key]) {
+            this.$set(this.filterFields[item.field_key], 'CONVERT', []);
+            return false;
+          }
+  
+          let value = item.value.map(item => JSON.stringify(item));
+          this.$set(this.filterFields[item.field_key], 'CONVERT', value);
+        }
       });
     },
     handlerInitSearchItem(arr) {
@@ -2603,8 +2613,8 @@ export default create({
       if (!data) data = require('./assets/img/xb_big.png');
       this.$emit('handlePreView', data, i);
     },
-    switchBtnOnChange(e, r, i) {
-      this.$emit('switchBtnOnChange', e, r, i);
+    switchBtnOnChange(e, r, i, index) {
+      this.$emit('switchBtnOnChange', e, r, i, index);
     },
     hanldeCopyContent(e, value) {
       e.preventDefault();
@@ -2614,12 +2624,18 @@ export default create({
     // 链接按钮详情
     linkDetail(row, col, index, e) {
       if (this.isInlineOperating) return false;
+      let vxeTable = this.$refs.xGrid;
       e.preventDefault();
       // e.stopPropagation();
-      this.$refs.xGrid.setCurrentRow(row);
+      // 方晶晶验收2.5.12需求, 要求link字段第一次可选中checkbox, 第二次点击不取消选中
+      let isCheckedByCheckboxRow = vxeTable.isCheckedByCheckboxRow(row);
+      if (isCheckedByCheckboxRow) {
+        e.stopPropagation();
+      }
+      vxeTable.setCurrentRow(row);
       this.$emit('setNestTableClick', this.isNestTable);
       this.$emit('setCurRowIndex', index);
-      this.$emit('linkDetail', row, col, row[this.handleRowId], null, false, index);
+      this.$emit('linkDetail', row, col, row[this.handlePrimaryKey], null, false, index);
     },
     // 按钮事件
     clickBtn(row, btn, index, e, j) {
@@ -2628,7 +2644,7 @@ export default create({
       this.recordClickBtnInfo(row, index);
       this.$emit('setNestTableClick', this.isNestTable);
       this.$emit('setCurRowIndex', index);
-      this.$emit('clickBtn', row, btn, row[this.handleRowId], index);
+      this.$emit('clickBtn', row, btn, row[this.handlePrimaryKey], index);
       // this.handleTopBtnTracher(btn, j);
     },
     recordClickBtnInfo(row, index) {

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

@@ -24,7 +24,8 @@
       <div>
         <a-button v-if="isShow('TRANSFER') && sessionType == 1 && onChating" @click="handleConvertShow" :disabled="!onChating && !!convertButtonTitle">{{ convertButtonTitle }}</a-button>
         <!-- 状态切换 -->
-        <a-dropdown placement="bottomCenter">
+        <UserStatus :assemblyId="assemblyId" :statusList="statusList" :curStatus="status" @changeStatus="changeStatus" />
+        <!-- <a-dropdown placement="bottomCenter">
           <a-button>
             <svg-icon v-if="statusIcon" :icon-class="statusIcon" style="font-size:16px;"></svg-icon>
             <img v-else :src="getImg(status)" height="16" />
@@ -56,7 +57,7 @@
               >
             </a-menu-item>
           </a-menu>
-        </a-dropdown>
+        </a-dropdown> -->
         <a-button @click="handleConfirm" :disabled="!onChating" v-if="isSessionOwner && !isStaff">{{ endSessionTitle }}</a-button>
       </div>
     </div>
@@ -100,6 +101,7 @@ import { mapState, mapGetters, mapMutations, mapActions } from '../store/helper'
 import { Layout, Button, Tooltip, Dropdown, Icon, Menu, Alert, Modal, Select, Input } from 'ant-design-vue';
 import SvgIcon from '@/component/svg/index.vue';
 import Avatar from '../components/avatar';
+import UserStatus from '../components/user-status';
 import fetch, { qs } from '@/utils/chatFetch';
 
 export default {
@@ -118,7 +120,8 @@ export default {
     [Select.Option.name]: Select.Option,
     [Input.TextArea.name]: Input.TextArea,
     SvgIcon,
-    Avatar
+    Avatar,
+    UserStatus,
   },
   props: {
     hideHeader: {
@@ -132,7 +135,7 @@ export default {
       serviceList: [],
       converUserId: '',
       converMark: '',
-      status: 'ON-LINE' // 客服状态
+      // status: 'ON-LINE' // 客服状态
     };
   },
   computed: {
@@ -149,6 +152,7 @@ export default {
       'convertButtonTitle',
       'clientId',
       'statusList',
+      'status',
       'endSessionTitle',
       'isServer',
       'clientParams',
@@ -169,15 +173,15 @@ export default {
     isStaff() {
       return this.assemblySetting?.type === 'staff';
     },
-    statusObj() {
-      return this.statusList.find(item => item.status === this.status);
-    },
-    statusDesc() {
-      return this.statusObj?.title;
-    },
-    statusIcon() {
-      return this.statusObj?.icon || '';
-    },
+    // statusObj() {
+    //   return this.statusList.find(item => item.status === this.status);
+    // },
+    // statusDesc() {
+    //   return this.statusObj?.title;
+    // },
+    // statusIcon() {
+    //   return this.statusObj?.icon || '';
+    // },
     formatedSessionTime() {
       let sessionTime = this.sessionTime;
       const totalTime = this.sessionTotalTime;
@@ -215,9 +219,13 @@ export default {
       'setSessionHistoryList',
       'setClientParams',
       'setClientId',
-      'setVoiceAlert'
+      'setVoiceAlert',
+      'setStatus'
     ]),
     ...mapActions(['setChatTimer']),
+    changeStatus(status) {
+      this.setStatus(status);
+    },
     /**
      * 剔除延时提醒
      */
@@ -322,25 +330,25 @@ export default {
           this.converUserId = '';
         });
     },
-    getImg(name) {
-      try {
-        return require(`../img/${name}.png`);
-      } catch {
-        return '';
-      }
-    },
-    handleStatusChange(status) {
-      this.status = status;
-      let params = {
-        assemblyId: this.assemblyId,
-        status
-      };
-      fetch.post('/chat/service/updateServiceState', qs.stringify(params)).then(({ data }) => {
-        if (data.result === 'SUCCESS') {
-          this.$message.success(`${this.i18nText('1.9.334')}!`);
-        }
-      });
-    },
+    // getImg(name) {
+    //   try {
+    //     return require(`../img/${name}.png`);
+    //   } catch {
+    //     return '';
+    //   }
+    // },
+    // handleStatusChange(status) {
+    //   this.status = status;
+    //   let params = {
+    //     assemblyId: this.assemblyId,
+    //     status
+    //   };
+    //   fetch.post('/chat/service/updateServiceState', qs.stringify(params)).then(({ data }) => {
+    //     if (data.result === 'SUCCESS') {
+    //       this.$message.success(`${this.i18nText('1.9.334')}!`);
+    //     }
+    //   });
+    // },
     handleConfirm() {
       let that = this;
       this.$confirm({

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

@@ -130,47 +130,55 @@
           </template>
         </a-tabs>
         <div v-if="isNormalStyle" class="footer-operate">
-          <span v-if="showSetting" class="setting-span">
-            <svg-icon icon-class="a-xitongtubiaoliaotianshezhi" @click="handleSetting" />
-          </span>
-          <span>
-            <a-tooltip placement="bottom">
-              <template slot="title">
-                <span>声音提醒</span>
-              </template>
-              <svg-icon :icon-class="voiceAlert ? 'a-xitongtubiaoliaotianlaba' : 'a-xitongtubiaoliaotianjingyin'" style="margin-right: 10px" @click="toggleVoiceAlert" />
-            </a-tooltip>
-          </span>
-          <span>
-            <a-tooltip placement="top">
-              <template slot="title">
-                <span>语音历史</span>
-              </template>
-              <svg-icon @click="toggleVideoVoiceList" icon-class="a-xitongtubiaoliaotiantonghua" />
-            </a-tooltip>
-          </span>
+          <!-- 状态切换 -->
+          <UserStatus v-if="hideHeader" type="left-bottom" :assemblyId="assemblyId" :statusList="statusList" :curStatus="status" @changeStatus="changeStatus" />
+          <div class="footer-operate-right">
+            <span v-if="showSetting" class="setting-span">
+              <svg-icon icon-class="a-xitongtubiaoliaotianshezhi" @click="handleSetting" />
+            </span>
+            <span>
+              <a-tooltip placement="bottom">
+                <template slot="title">
+                  <span>声音提醒</span>
+                </template>
+                <svg-icon :icon-class="voiceAlert ? 'a-xitongtubiaoliaotianlaba' : 'a-xitongtubiaoliaotianjingyin'" style="margin-right: 10px" @click="toggleVoiceAlert" />
+              </a-tooltip>
+            </span>
+            <span>
+              <a-tooltip placement="top">
+                <template slot="title">
+                  <span>语音历史</span>
+                </template>
+                <svg-icon @click="toggleVideoVoiceList" icon-class="a-xitongtubiaoliaotiantonghua" />
+              </a-tooltip>
+            </span>
+          </div>
         </div>
-        <a-popover v-else placement="rightBottom" arrowPointAtCenter>
-          <template slot="content">
-            <div class="chat-operate-group">
-              <div v-if="showSetting" class="chat-operate-item" @click="handleSetting">
-                <svg-icon icon-class="a-xitongtubiaoliaotianshezhi" />
-                <span>设置</span>
-              </div>
-              <div class="chat-operate-item" @click="toggleVoiceAlert">
-                <svg-icon :icon-class="voiceAlert ? 'a-xitongtubiaoliaotianlaba' : 'a-xitongtubiaoliaotianjingyin'" />
-                <span>静音</span>
-              </div>
-              <div class="chat-operate-item" @click="toggleVideoVoiceList">
-                <svg-icon icon-class="a-xitongtubiaoliaotiantonghua" />
-                <span>通话</span>
+        <template v-else>
+          <a-popover placement="rightBottom" arrowPointAtCenter>
+            <template slot="content">
+              <div class="chat-operate-group">
+                <div v-if="showSetting" class="chat-operate-item" @click="handleSetting">
+                  <svg-icon icon-class="a-xitongtubiaoliaotianshezhi" />
+                  <span>设置</span>
+                </div>
+                <div class="chat-operate-item" @click="toggleVoiceAlert">
+                  <svg-icon :icon-class="voiceAlert ? 'a-xitongtubiaoliaotianlaba' : 'a-xitongtubiaoliaotianjingyin'" />
+                  <span>静音</span>
+                </div>
+                <div class="chat-operate-item" @click="toggleVideoVoiceList">
+                  <svg-icon icon-class="a-xitongtubiaoliaotiantonghua" />
+                  <span>通话</span>
+                </div>
               </div>
+            </template>
+            <div class="chat-operate-more">
+              <i class="operate-more-icon"></i>
             </div>
-          </template>
-          <div class="chat-operate-more">
-            <i class="operate-more-icon"></i>
-          </div>
-        </a-popover>
+          </a-popover>
+          <!-- 状态切换 -->
+          <UserStatus v-if="hideHeader" type="left-bottom" :assemblyId="assemblyId" :statusList="statusList" :curStatus="status"  @changeStatus="changeStatus" style="margin: -10px 0 8px; width: 100px;text-align: center;" />
+        </template>
       </a-layout-sider>
       <a-row style="width: 100%;height: 100%;overflow: hidden;">
         <a-col :span="mainSpan" style="height: 100%;position: relative">
@@ -327,6 +335,7 @@ import VideoVoiceList from './videoVoiceList';
 import addConference from './addConference';
 import ClassifyTabs from '../components/classify-tabs';
 import ChatTabsHeader from '../components/chat-tabs-header';
+import UserStatus from '../components/user-status';
 import { checkTalkingEnv } from '../utils/index';
 
 export default {
@@ -432,6 +441,7 @@ export default {
       'callings',
       'assemblySetting',
       'statusList',
+      'status',
       'tabList',
       'chatMainTitle',
       'endSessionTitle',
@@ -625,12 +635,16 @@ export default {
       'setLastCurrentTab',
       'setQueueItem',
       'setCurScrollItem',
-      'setSessionType'
+      'setSessionType',
+      'setStatus'
     ]),
     ...mapActions(['setChatTimer', 'getVideoHistoryList']),
     ...mapActions({
       getMsgList: 'setMsgList'
     }),
+    changeStatus(status) {
+      this.setStatus(status);
+    },
     handleDateOpenChange(v) {
       this.dateOpenStatus = v;
     },
@@ -1621,7 +1635,8 @@ export default {
     VideoVoiceList,
     addConference,
     ChatTabsHeader,
-    ClassifyTabs
+    ClassifyTabs,
+    UserStatus
   },
   beforeDestroy() {
     if (this.stompClient) {
@@ -1932,40 +1947,52 @@ export default {
     }
     .footer-operate {
       display: inline-flex;
+      justify-content: space-around;
+      align-items: center;
       width: 100%;
+      box-sizing: border-box;
+      padding: 0 0 0 8px;
       height: 55px;
       line-height: 55px;
       border-top: 1px solid #f0f0f5;
-      .setting-span {
-        position: relative;
-        z-index: 2;
-      }
-      span {
-        position: relative;
+      &-right {
         flex: 1;
         display: inline-flex;
-        justify-content: center;
-        align-items: center;
-        &::after {
-          content: '';
-          position: absolute;
-          right: 0;
-          top: 50%;
-          transform: translateY(-50%);
-          width: 1px;
-          background: #ccc;
-          height: 22px;
+        justify-content: flex-end;
+        height: 100%;
+        line-height: 55px;
+        .setting-span {
+          position: relative;
+          z-index: 2;
         }
-        .svg-icon {
-          font-size: 20px;
-          cursor: pointer;
-          outline: none;
-          color: #b5b5b5;
+        span {
+          position: relative;
+          // flex: 1;
+          display: inline-flex;
+          justify-content: center;
+          padding: 0 10px;
+          align-items: center;
+          &::after {
+            content: '';
+            position: absolute;
+            right: 0;
+            top: 50%;
+            transform: translateY(-50%);
+            width: 1px;
+            background: #ccc;
+            height: 22px;
+          }
+          .svg-icon {
+            font-size: 20px;
+            cursor: pointer;
+            outline: none;
+            color: #b5b5b5;
+          }
         }
-      }
-      span:last-child {
-        &::after {
-          width: 0;
+        span:last-child {
+          &::after {
+            width: 0;
+          }
         }
       }
     }

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

@@ -167,7 +167,8 @@ export default {
             if (aLevel === bLevel) {
               return Number(a.createdTime) - Number(b.createdTime);
             }
-            return descOrAsc === 'desc' ? aLevel - bLevel : bLevel - aLevel;
+            // return descOrAsc === 'desc' ? aLevel - bLevel : bLevel - aLevel;
+            return descOrAsc === 'desc' ? bLevel - aLevel : aLevel - bLevel;
           });
           noLevel.sort((a, b) => Number(a.createdTime) - Number(b.createdTime));
           processedScrollList = [...hasLevel, ...noLevel];
@@ -380,7 +381,7 @@ export default {
       const dateParams = this.dateParams;
       if (dateParams?.length) {
         const fmt = 'YYYY-MM-DD';
-        params.beginDate = dateParams[0].format(fmt) + ' 00:00:00';
+        params.startDate = dateParams[0].format(fmt) + ' 00:00:00';
         params.endDate = dateParams[1].format(fmt) + ' 23:59:59';
       }
       return params;
@@ -592,6 +593,7 @@ export default {
       fetch.get('/chat/service/getQueueUser', { params }).then(({ data }) => {
         if (data.result === 'SUCCESS') {
           const obj = data.obj || {};
+          this.currentTab === 'queue' && this.dispatchEvent('click_queueListUser', JSON.parse(JSON.stringify(obj.messages || [])));
           let messages = (obj.messages || []).map(item => {
             item.fromName = obj.name;
             item.content = JSON.parse(JSON.stringify(item));