cnhis-design-vue 0.2.18-beta → 0.2.22-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "0.2.18-beta",
+  "version": "0.2.22-beta",
   "description": "基于 Ant Desgin Vue 的UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",
@@ -40,7 +40,7 @@
     "spark-md5": "^3.0.1",
     "stompjs": "^2.3.3",
     "text-security": "^3.2.1",
-    "trtc-js-sdk": "^4.11.7",
+    "trtc-js-sdk": "^4.11.4",
     "v-viewer": "1.5.1",
     "video.js": "^7.8.4",
     "vue-dom-portal": "^0.1.6",
@@ -93,4 +93,4 @@
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
   }
-}
+}

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

@@ -3,7 +3,7 @@
     class="big-table"
     :class="{
       mt: visibleCheckAllWrap || visibleTreeCheck || hasRefresh,
-      'expand-padding': isExpandTable
+      'expand-padding': !isNestTable
     }"
     :style="{ height: tableHeight }"
   >
@@ -147,7 +147,7 @@
 <script>
 import Vue from 'vue';
 import TextOverTooltip from './components/TextOverTooltip.vue';
-import { Icon, Tooltip, Progress, Switch, Popover, Button, Dropdown, Menu, Checkbox, Input } from 'ant-design-vue';
+import { Icon, Tooltip, Progress, Switch, Popover, Button, Dropdown, Menu, Checkbox, Input, Popconfirm } from 'ant-design-vue';
 import format from './utils/format';
 import { parseDurationValue, parseCombinationValue, formatFieldText, imgs2imgArr } from './utils/tableParse';
 import passwordCom from './components/password-com.vue';
@@ -167,6 +167,7 @@ import EditForm from './components/edit-form/EditForm.vue';
 
 import nestTable from './utils/nestTable';
 import bigTableProps from './utils/bigTableProps';
+import SvgIcon from '@/component/svg/index.vue';
 
 let addInlineEditPrimaryKey = '';
 export default create({
@@ -182,9 +183,11 @@ export default create({
     [Switch.name]: Switch,
     [Popover.name]: Popover,
     [Dropdown.name]: Dropdown,
+    [Popconfirm.name]: Popconfirm,
     [Menu.name]: Menu,
     [Grid.name]: Grid,
-    [VideoList.name]: VideoList
+    [VideoList.name]: VideoList,
+    SvgIcon
   },
   mixins: [format, batchEditing, nestTable],
   props: Object.assign({}, bigTableProps),
@@ -347,6 +350,13 @@ export default create({
       }
       let startIndex = (this.pageVO.pageIndex - 1) * this.pageVO.pageSize;
       return { startIndex: startIndex < 0 ? 0 : startIndex };
+    },
+    isScanMultiTable() {
+      return this.columnConfig?.isScanMultiTable
+    },
+    tableNoSetting(){
+      let { noSetting } = this.getOtherConfigInit() || {};
+      return noSetting || this.showSettings?.hideSettingBtn == 1;
     }
   },
   watch: {
@@ -468,6 +478,10 @@ export default create({
     }
   },
   methods: {
+    customerInit(){
+      this.loadColumn(this.columnConfig);
+      this.loadData(this.data);
+    },
     setTalbeScrollTo() {
       let table = this.$refs.xGrid;
       if (!table) return;
@@ -1289,8 +1303,9 @@ export default create({
        * sortable: 是否允许列排序
        */
       // 配置列表
-      let { selectType, noSetting } = this.getOtherConfigInit() || {};
-      let { isBatchSelect, fieldList, showButtonTop } = map;
+      let { selectType } = this.getOtherConfigInit() || {};
+      let { tableNoSetting } = this;
+      let { isBatchSelect, fieldList, showButtonTop, isScanMultiTable } = map;
       if (selectType) {
         // 有设置 selectType 强制可选。
         isBatchSelect = 1;
@@ -1313,7 +1328,20 @@ export default create({
           );
         }
       };
-      const columns = [
+      let checkVisible = isBatchSelect == 1 && !this.isNestTable && !isScanMultiTable || false;
+      let columns = [
+        {
+          fixed: 'left',
+          align: 'center',
+          visible: isScanMultiTable || false,
+          width: '50',
+          slots: {
+            header: () => {
+              return "操作";
+            },
+            default: this.scanMultiOperate
+          }
+        },
         {
           type: 'seq',
           fixed: this.isNestTable ? '' : 'left',
@@ -1323,7 +1351,7 @@ export default create({
           showOverflow: true,
           slots: {
             header: () => {
-              return [noSetting ? null : <a-icon class="setting" type="setting" onClick={() => this.showDrawer()} />];
+              return [tableNoSetting ? null : <a-icon class="setting" type="setting" onClick={() => this.showDrawer()} />];
             }
           }
         },
@@ -1331,7 +1359,7 @@ export default create({
           type: selectType,
           fixed: this.isNestTable ? '' : 'left',
           align: 'center',
-          visible: isBatchSelect == 1 && !this.isNestTable,
+          visible: checkVisible,
           resizable: false,
           width: checkMinWidth,
           // slots: selectType === 'checkbox' ? checkboxSlot : null,
@@ -1360,6 +1388,14 @@ export default create({
         let treeNode = this.isNestTable ? false : this.isTree != 0 ? index === 0 : false;
         let type = index === 0 && this.showNestTable ? 'expand' : '';
 
+        // 扫码打开的table只展示
+        if(isScanMultiTable) {
+          fixed = "";
+          sortable = false;
+          treeNode = false;
+          type = "";
+        }
+
         const col = Object.assign(item, {
           visible: item.columnName == 'operatorColumn' ? showButtonTop == 0 : item.isShow == 1,
           field: item.columnName,
@@ -1384,7 +1420,7 @@ export default create({
           editRender: this.generateEditRender(item)
         });
 
-        if (filterField && !this.isNestTable) {
+        if (filterField && !this.isNestTable && !isScanMultiTable) {
           this.$set(
             this.filterFields,
             item.columnName,
@@ -1407,7 +1443,10 @@ export default create({
           col.slots.header = this.toolTipTitle(item);
         }
 
-        col.slots.footer = 'tooltip_footer';
+
+        if (!isScanMultiTable) {
+          col.slots.footer = 'tooltip_footer';
+        }
 
         // 主表设置expand
         if (this.showNestTable && this.isTree == 0 && this.curNestColumnConfig?.isTree == 0) {
@@ -1691,7 +1730,7 @@ export default create({
       if (this.tableOptions?.dataSourceType == 'guage') {
         tooltipTitle = item.alias || item.title;
       }
-      if (name && name !== tooltipTitle) {
+      if (name&& tooltipTitle && name !== tooltipTitle) {
         isAlias = !!tooltipTitle;
       }
       if (type === 'format') return <text-over-tooltip refName={'item-' + item[this.handleRowId]} tooltipTitle={tooltipTitle} content={name} isAlias={isAlias} />;
@@ -1971,6 +2010,23 @@ export default create({
       field.indeterminate = !!len && len !== field.setting.showSetting.length;
       field.searchFilterText = '';
     },
+    scanMultiOperate(params){
+      return [
+        <a-popconfirm ok-text={'确认'} cancel-text={'取消'} title={'是否确认删除？'} on-confirm={() =>this.confirmScanMulti(params)}>
+          <svg-icon class="scan-multi-delete" iconClass="shanchu" />
+        </a-popconfirm>
+      ]
+    },
+    /**
+     * 删除选中scan数据
+     */
+    confirmScanMulti(params){
+      let{row, $rowIndex} = params || {}
+      if(!row) return;
+      this.$emit("scanMultiRemove", $rowIndex, params)
+      let vxeTable = this.$refs.xGrid;
+      vxeTable.remove(row);
+    },
     // 表格渲染逻辑
     formatter(params, col) {
       let { row, column, $rowIndex } = params;
@@ -2065,7 +2121,7 @@ export default create({
         ];
       }
 
-      if (this.isLink(own, row)) {
+      if (this.isLink(own, row) && !this.isScanMultiTable) {
         if (own.btnLinkSwitch) {
           let disabled = false;
           let curBtn = row.btnList?.find(v => v.name == own.columnName);
@@ -2093,6 +2149,7 @@ export default create({
       if (!imageArr || !imageArr.length) return curSrc;
       let matchItem = imageArr.find(item => item.type === type);
       if (!matchItem) return curSrc;
+      if(matchItem.suffix) return curSrc + matchItem.suffix
       let h = matchItem.h;
       let w = matchItem.w;
       if (matchItem.h === 'adaptive' && matchItem.w != 'adaptive') {
@@ -2225,14 +2282,14 @@ export default create({
     },
     // 行双击
     rowdblclick({ row, column }) {
-      if (this.isInlineOperating) return false;
+      if (this.isScanMultiTable || this.isInlineOperating) return false;
       if (vexutils.has(row, GROUP_TITLE_KEY)) return false;
       this.$emit('setNestTableClick', this.isNestTable);
       this.$emit('rowdblclick', row, column, true, true);
     },
     // 行单击
     handlerClickRow(data) {
-      if (this.isInlineOperating) return false;
+      if (this.isScanMultiTable || this.isInlineOperating) return false;
       if (vexutils.has(data?.row, GROUP_TITLE_KEY)) return false;
       if (this.isTriggerSelectionChange && this.isTree == 0) return false;
       let table = this.$refs.xGrid;
@@ -2242,7 +2299,7 @@ export default create({
       let { row, $event = {}, $rowIndex } = data;
       // 点击主表格展开行按钮 不需要触发选中行
       let { className } = $event.target || {};
-      if (className && className.includes('vxe-table--expand-btn')) return;
+      if (className && vexutils.isString(className) && className.includes('vxe-table--expand-btn')) return;
 
       // 记录上次点击table信息 用于清除
       this.isAboutNestTable && this.$emit('setNestLastClickTable', table, this.isNestTable, row[this.handleRowId], row);
@@ -2812,7 +2869,6 @@ export default create({
       const config = tableOptions?.config || {};
       return config || undefined;
     },
-
     // 单选
     radioOnChange(rowData = {}) {
       let { data, row, $rowIndex } = rowData;

package/packages/big-table/src/assets/style/table-base.less

@@ -17,6 +17,7 @@ body {
     img {
       max-height: 100%;
       object-fit: contain;
+      cursor: pointer;
     }
     &.img-circle {
       img {
@@ -179,11 +180,16 @@ body {
       height: 100%;
     }
 
+    .scan-multi-delete {
+      color: #F06F64;
+    }
+
     .vxe-table--header {
       background-color: #f2f2f2;
       .vxe-header--column .vxe-cell--title {
         height: 100%;
         line-height: unset;
+        width: 100%;
       }
     }
     .vxe-table--footer-wrapper.body--wrapper,
@@ -214,6 +220,10 @@ body {
   /deep/ .filter-box {
     display: flex;
     align-items: center;
+    width: 100%;
+    .text-over-tooltip-components {
+      max-width: calc(100% - 20px);
+    }
     .vxe-filter--btn {
       border-top-color: #c0c4cc;
       border-right-color: #c0c4cc;

package/packages/big-table/src/components/TextOverTooltip.vue

@@ -1,7 +1,17 @@
 <template>
   <div class="text-over-tooltip-components">
-    <a-tooltip :effect="effect" :disabled="isDisabledTooltip" :title="curContent" :placement="placement">
-      <div class="ellipsis" :class="className" @mouseover="onMouseOver(refName)">
+    <a-tooltip
+      :effect="effect"
+      :visible="isDisabledTooltip"
+      :title="curContent"
+      :placement="placement"
+    >
+      <div
+        class="ellipsis"
+        :class="className"
+        @mouseover="onMouseOver(refName)"
+        @mouseout="onMouseOut"
+      >
         <i :ref="refName">
           <slot></slot>
           <i>{{ content }}</i>
@@ -12,10 +22,10 @@
 </template>
 
 <script>
-import { Tooltip } from 'ant-design-vue';
+import { Tooltip } from "ant-design-vue";
 import vexutils from '@/utils/vexutils';
 export default {
-  name: 'TextOverTooltip',
+  name: "TextOverTooltip",
   components: {
     [Tooltip.name]: Tooltip
   },
@@ -30,27 +40,27 @@ export default {
     effect: {
       type: String,
       default: () => {
-        return 'dark';
+        return "dark";
       }
     },
     // Tooltip 的出现位置top/top-start/top-end/bottom/bottom-start/bottom-end/left/left-start/left-end/right/right-start/right-end
     placement: {
       type: String,
       default: () => {
-        return 'top';
+        return "top";
       }
     },
-    tooltipTitle: { type: [Number, String], default: '' },
+    tooltipTitle: { type: [Number, String], default: "" },
     isAlias: Boolean
   },
   data() {
     return {
-      isDisabledTooltip: true // 是否需要禁止提示
+      isDisabledTooltip: false // 是否需要禁止提示
     };
   },
   computed: {
     curContent() {
-      let res = this.tooltipTitle || this.content || '';
+      let res = this.tooltipTitle || this.content || "";
       if (vexutils.isNumber(res)) {
         return res.toString();
       }
@@ -67,7 +77,10 @@ export default {
       let parentWidth = this.$refs[str].parentNode.offsetWidth;
       let contentWidth = this.$refs[str].offsetWidth;
       // 判断是否禁用tooltip功能
-      this.isDisabledTooltip = contentWidth <= parentWidth;
+      this.isDisabledTooltip = contentWidth > parentWidth;
+    },
+    onMouseOut() {
+      this.isDisabledTooltip = false;
     }
   }
 };
@@ -76,7 +89,7 @@ export default {
 <style lang="less" scoped>
 .text-over-tooltip-components {
   display: inline-block;
-  max-width: 100%;
+  max-width: 98%;
   /* 文字超出宽度显示省略号 单行 */
   .ellipsis {
     font-size: 14px;

package/packages/big-table/src/utils/batchEditing.js

@@ -296,7 +296,7 @@ export default {
      * @returns
      */
     showEditForm(row, column, $rowIndex) {
-      if (!this.isMatchComponent || this.isNestTable) return false;
+      if (!this.isMatchComponent || this.isNestTable || this.isScanMultiTable) return false;
       if (this.isBatchEditing || this.isInlineEditing || this.isInlineAdding) {
         let matchObj = this.editColumnMap[column.property];
         if (!matchObj || !matchObj.matchItem || !matchObj.fieldItem) return false;

package/packages/big-table/src/utils/bigTableProps.js

@@ -76,7 +76,8 @@ const bigTableProps = {
   },
   submitForm: Function,
   isMatchComponent: Boolean,
-  asyncCount: Boolean
+  asyncCount: Boolean,
+  showSettings: { type: Object, default: () => ({}) }
 };
 
 export default bigTableProps;

package/packages/button/src/ButtonPrint/index.vue

@@ -100,6 +100,9 @@ export default create({
     params: {
       type: Array
     },
+    hisParams: {
+      type: Object
+    },
     /*  */
     prevFn: {
       type: Function,
@@ -290,7 +293,6 @@ export default create({
       const { templateNumber, authorizationKey, baseUrl, getPrintFormatByNumberUrl, versionType } = this;
       const suffix = versionType == 1 ? `jsessionids=${vexutils.cookie.get('jsessionids') || '31e5fc0e-955f-4c89-9679-39c43d0171321636163291241'}` : `authorizationKey=${authorizationKey}`;
       const url = `${baseUrl}${getPrintFormatByNumberUrl}?number=${templateNumber}&${suffix}`;
-
       return httpFn
         .get(url)
         .then(async ({ data }) => {
@@ -450,15 +452,29 @@ export default create({
         })
         .then(() => {
           if (this.versionType == 1) {
-            const params = this.getHisParams();
-            printInstance
-              .handleHisPrint(7, params)
-              .then(res => {
-                console.log(res, '777777777777');
-              })
-              .catch(error => {
-                console.log(error, 'error777');
-              });
+            if (this.strategy === 'MULTI') {
+              for (let i = 0; i < this.params.length; i++) {
+                const params = this.getHisParams(i);
+                printInstance
+                  .handleHisPrint(7, params)
+                  .then(res => {
+                    console.log(res, '777777777777');
+                  })
+                  .catch(error => {
+                    console.log(error, 'error777');
+                  });
+              }
+            } else {
+              const params = this.getOnceHisParams();
+              printInstance
+                .handleHisPrint(7, params)
+                .then(res => {
+                  console.log(res, '777777777777');
+                })
+                .catch(error => {
+                  console.log(error, 'error777');
+                });
+            }
           } else {
             if (this.strategy === 'MULTI') {
               // 循环多条
@@ -491,7 +507,7 @@ export default create({
           this.visible = false;
         });
     },
-    getHisParams() {
+    getHisParams(index = 0) {
       const { templateParams, hisParams, params } = this;
       const { reportid = '280' } = hisParams;
       const { id, name } = templateParams;
@@ -499,7 +515,26 @@ export default create({
         reportid,
         formatid: id,
         formatname: name,
-        param: params[0]
+        param: params[index]
+      };
+    },
+    getOnceHisParams() {
+      const { templateParams, hisParams, params } = this;
+      const { reportid = '280' } = hisParams;
+      const { id, name } = templateParams;
+      const obj = {}
+      Object.keys(params[0]).forEach(v => {
+        obj[v] = [];
+        params.forEach(k => {
+          obj[v].push(k[v]);
+        });
+        obj[v] = obj[v].join(',');
+      });
+      return {
+        reportid,
+        formatid: id,
+        formatname: name,
+        param: obj
       };
     },
     async handleClickPreview(e) {
@@ -512,7 +547,7 @@ export default create({
         })
         .then(() => {
           if (this.versionType == 1) {
-            const params = this.getHisParams();
+            const params = this.strategy === 'MULTI' ? this.getHisParams() : this.getOnceHisParams();
             printInstance
               .handleHisPrint(8, params)
               .then(res => {
@@ -551,7 +586,7 @@ export default create({
         })
         .then(() => {
           if (this.versionType == 1) {
-            const params = this.getHisParams();
+            const params = this.strategy === 'MULTI' ? this.getHisParams() : this.getOnceHisParams();
             printInstance
               .handleHisPrint(9, params)
               .then(res => {

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

@@ -73,8 +73,10 @@ import { mapGetters, mapActions, mapMutations } from '../store/helper';
 import fetch, { qs } from '@/utils/chatFetch';
 import RtcClient from '../utils/rtc-client-multi';
 import { getSipUserId } from '@/utils/sip-device';
+import uniRTCAPI from './mixins/uniRTCAPI';
 export default {
   inject: ['store', 'i18nText'],
+  mixins: [uniRTCAPI],
   components: {
     SvgIcon,
     [Icon.name]: Icon,
@@ -255,6 +257,12 @@ export default {
           this.$message.success(this.i18nText('1.9.386'));
           // this.appendVideoMessage();
           this.setVideoData(data.map);
+          // 江苏省
+          if (this.uniRTC || data.map?.vendor == 3) {
+            const targetList = data.map?.targetList || []; 
+            this.checkStatus(targetList);
+            this.startCall(targetList);
+          }
         } else {
           this.$message.warning(data.resultMsg);
           this.setShowAudio(false);
@@ -288,6 +296,8 @@ export default {
           if (this.videoData?.roomId) {
             this.handleLeaveRoom();
             this.setMuteAudio(false);
+            
+            this.uniRTC && this.hangUp();
           }
         } else {
           this.$message.warning(data.resultMsg);
@@ -313,6 +323,15 @@ export default {
             this.setMuteAudio(false);
             this.setVideoMembers([]);
             this.setVideoData({});
+            // 江苏省
+            if (this.uniRTC) {
+              if (this.videoData.isCaller || this.videoData.inviteResult == 1) {
+                this.stopCall();
+              } else {
+                // 拒接
+                this.refuseCall();
+              }
+            }
           } else {
             if (data.map.type == 1 && data.map.mode == 2) {
               this.setShowVideo(true);
@@ -322,6 +341,9 @@ export default {
             this.$nextTick(() => {
               this.setRecordId(data.map.recordId);
             });
+            // 江苏省接听
+            console.log('江苏省接听->videoInviteEnter', this.incoming);
+            this.uniRTC && this.acceptCall();
           }
         }
       });

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

@@ -14,9 +14,11 @@
 <script>
 import { mapGetters, mapMutations } from "../store/helper";
 import fetch, { qs } from "@/utils/chatFetch";
+import uniRTCAPI from './mixins/uniRTCAPI';
 
 export default {
   inject: ["store", "i18nText"],
+  mixins: [uniRTCAPI],
   props: {
     validTalkingEnv: {
       type: Function
@@ -119,6 +121,8 @@ export default {
           }
           this.disabled = false;
           if (!accept) {
+            // 江苏省拒接
+            this.uniRTC && this.refuseCall();
             return;
           }
           let res = data.obj || data.map;
@@ -153,6 +157,8 @@ export default {
               "1.9.21"
             )}!`
           );
+          // 江苏省接听
+          this.uniRTC && this.acceptCall();
         } else {
           let realIndex = this.callings.findIndex(item => item.sessionId === sessionId);
           if (realIndex !== -1) {

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

@@ -1357,6 +1357,45 @@ export default {
 };
 </script>
 
+<style lang="less">
+.chat-footer-modal-big {
+  padding: 10px;
+  &.ant-modal-wrap {
+    overflow: none;
+  }
+  .ant-modal {
+    width: 100%;
+    height: 100%;
+    top: 0;
+    padding-bottom: 0;
+  }
+  .ant-modal-content {
+    height: 100%;
+  }
+  .ant-modal-body {
+    height: calc(100% - 55px);
+  }
+}
+.chat-footer-modal-small {
+  &.ant-modal-wrap {
+    overflow: none;
+  }
+  .ant-modal {
+    width: 80%;
+    height: 80%;
+    padding-bottom: 0;
+    top: 60px;
+  }
+  .ant-modal-content {
+    height: 100%;
+  }
+  .ant-modal-body {
+    height: 100%;
+    padding: 0;
+  }
+}
+
+</style>
 <style lang="less" scoped>
 .message-operate {
   display: flex;
@@ -1370,8 +1409,8 @@ export default {
   &::-webkit-scrollbar {
     height: 5px;
   }
-  > img,
-  > .operate-icon {
+  > img {
+  // > .operate-icon {
     margin-left: 10px;
   }
   /deep/ .ant-tabs .ant-tabs-top-content > .ant-tabs-tabpane {
@@ -1531,7 +1570,8 @@ export default {
   }
 }
 .toolbar {
-  margin-left: 10px;
+  // margin-left: 10px;
+  margin: 0 5px;
   font-size: 20px;
   outline: none;
   padding: 6px;