cnhis-design-vue 0.1.77-beta → 0.1.81-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "0.1.77-beta",
+  "version": "0.1.81-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

@@ -106,6 +106,18 @@
           <NoData :noDataImg="emptyItems.noDataImg" :noDataTip="emptyItems.noDataTip" :showImg="!isNestTable"></NoData>
         </div>
       </template>
+      <!-- 修复 vxe-table升级3.x版本 原自定义checkbox样式失效 -->
+      <template v-slot:tooltip_checkbox="{ row, checked }">
+        <a-tooltip
+          v-if="row.forbiddenBatchSelect"
+          :title="row.forbiddenBatchSelectReason"
+          placement="right"
+          trigger="hover"
+        >
+          <i class="disabled-checked-tips"></i>
+        </a-tooltip>
+        <a-checkbox class="tooltip-checkbox-item" v-else :checked="checked"></a-checkbox>
+      </template>
       <template v-slot:tooltip_footer="{ column }">
         <!-- 分组统计 -->
         <template v-if="groupCountFields && groupCountFields.length">
@@ -1319,7 +1331,14 @@ export default create({
           visible: isBatchSelect == 1 && !this.isNestTable,
           resizable: false,
           width: checkMinWidth,
-          slots: selectType === 'checkbox' ? checkboxSlot : null,
+          // slots: selectType === 'checkbox' ? checkboxSlot : null,
+          // 修复 vxe-table升级3.x版本 原自定义checkbox样式失效
+          slots:
+            selectType === "checkbox"
+              ? {
+                  checkbox: "tooltip_checkbox"
+                }
+              : null,
           showOverflow: true
         }
       ];

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

@@ -229,7 +229,7 @@ body {
   }
   /deep/ .disabled-checked-tips {
     position: absolute;
-    left: 0;
+    left: 6px;
     top: 50%;
     bottom: 0;
     right: 0;
@@ -325,3 +325,11 @@ body {
     width: var(--tableImageWidth);
   }
 }
+
+
+/deep/.vxe-table--body .tooltip-checkbox-item {
+  .ant-checkbox:not(.ant-checkbox-checked) .ant-checkbox-inner {
+    border-radius: 2px;
+    border: 2px solid #5585f5 !important;
+  }
+}

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

@@ -410,8 +410,9 @@ export default {
   },
   async created() {
     this.init();
-    this.registerEvent('searchCurrenChatList', keyword => {
+    this.registerEvent('searchCurrenChatList', ({type = 'change', keyword}) => {
       this.handleKeywordsChange({ target: { value: keyword } });
+      type == 'pressEnter' && this.handleKeywordsSearch({ target: { value: keyword } });
     });
     this.registerEvent('updatePanelTab', this.onlyGroup);
   },

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

@@ -84,7 +84,7 @@ export default {
           const data = {
             ...item,
             title,
-            width: w,
+            // width: w,
             field: `_${key}_`,
             showHeaderOverflow: true,
             showOverflow: true
@@ -416,7 +416,11 @@ export default {
           this.$set(item, 'count', '');
         });
       }
-      let params = { assemblyId: this.assemblyId };
+      // let params = { assemblyId: this.assemblyId };
+      let params = {
+        ...this.getDateParams(),
+        assemblyId: this.assemblyId,
+      };
       fetch
         .get('/chat/service/getQueueUsers', {
           params
@@ -891,6 +895,7 @@ export default {
     }
     const { theme, currentTab, processedScrollList, handleInfiniteOnLoad, busy, infiniteMsgShow, foldTheme, classifyIcon } = this;
     const isEnd = currentTab === 'end';
+    const isNoData = !processedScrollList?.length;
     const filters = this.$options.filters;
     const directives = [
       {
@@ -899,7 +904,7 @@ export default {
       }
     ];
     function getAvatar(item) {
-      return <Avatar className="avatar" src={item.portrait} name={item.name || item.toName || item.title} len={2} />;
+      return <Avatar className="avatar" src={item.portrait} name={item.name || item.toName || item.title || item.titleSetting} len={2} />;
     }
     function getContent(item, filters, fold, classifyIcon) {
       const { formatName, formatCount } = filters;
@@ -951,32 +956,41 @@ export default {
     }
     return (
       <div class={[theme, 'chat-scroll-container']}>
-        <ul class="chat-scroll-session__list">
-          {processedScrollList.map((item, index) => {
-            const msgCount = item.msgCount;
-            return (
-              <li class={{ 'scroll-item': true, active: this.isActive(item) }} key={item.id || item.bid || index} onClick={() => this.handleClick(item)} id={'item_id_' + item.id}>
-                {foldTheme
-                  ? [
-                      <a-popover overlayClassName="chat-list-popover--fold" placement="right" destroyTooltipOnHide={true}>
-                        <template slot="content">{getContent(item, filters, foldTheme, classifyIcon)}</template>
-                        {getAvatar(item)}
-                      </a-popover>,
-                      msgCount ? <div class="chat-scroll-session__num">{msgCount > 99 ? '99+' : msgCount}</div> : null
-                    ]
-                  : [getAvatar(item), getContent(item, filters, foldTheme, classifyIcon)]}
-              </li>
-            );
-          })}
-        </ul>
-        {isEnd ? (
-          <div {...{ directives }} infinite-scroll-immediate-check="immediate" infinite-scroll-disabled={busy} infinite-scroll-distance={10}>
-            <div class="infinite-wrap" style={infiniteMsgShow ? '' : 'display:none'}>
-              <a-spin size="small" />
-              {foldTheme ? '' : '加载中'}
-            </div>
+        {!isNoData ? (
+          [
+            <ul class="chat-scroll-session__list">
+              {processedScrollList.map((item, index) => {
+                const msgCount = item.msgCount;
+                return (
+                  <li class={{ 'scroll-item': true, active: this.isActive(item) }} key={item.id || item.bid || index} onClick={() => this.handleClick(item)} id={'item_id_' + item.id}>
+                    {foldTheme
+                      ? [
+                          <a-popover overlayClassName="chat-list-popover--fold" placement="right" destroyTooltipOnHide={true}>
+                            <template slot="content">{getContent(item, filters, foldTheme, classifyIcon)}</template>
+                            {getAvatar(item)}
+                          </a-popover>,
+                          msgCount ? <div class="chat-scroll-session__num">{msgCount > 99 ? '99+' : msgCount}</div> : null
+                        ]
+                      : [getAvatar(item), getContent(item, filters, foldTheme, classifyIcon)]}
+                  </li>
+                );
+              })}
+            </ul>,
+            isEnd ? (
+              <div {...{ directives }} infinite-scroll-immediate-check="immediate" infinite-scroll-disabled={busy} infinite-scroll-distance={10}>
+                <div class="infinite-wrap" style={infiniteMsgShow ? '' : 'display:none'}>
+                  <a-spin size="small" />
+                  {foldTheme ? '' : '加载中'}
+                </div>
+              </div>
+            ) : null
+          ]
+        ) : (
+          <div class="no-data">
+            <img src={require('../img/no-data2.png')} />
+            <span>{this.i18nText('1.1.6.11')}</span>
           </div>
-        ) : null}
+        )}
       </div>
     );
   }
@@ -984,6 +998,20 @@ export default {
 </script>
 
 <style lang="less">
+.no-data {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  & > img {
+    width: 160px;
+  }
+  span {
+    display: inline-block;
+    font-size: 14px;
+  }
+}
 .chat-scroll-container {
   height: 100%;
   overflow-y: auto;

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

@@ -8,6 +8,7 @@
           <a-form-item>
             <a-checkbox @change="handleTimeSettingShow" :checked="showTimeSetting">{{ i18nText('1.9.402') }}</a-checkbox>
             <a-checkbox v-model="readStatus">已读回执</a-checkbox>
+            <a-checkbox v-model="lineUpNotice">排队提醒</a-checkbox>
           </a-form-item>
           <template v-if="showTimeSetting">
             <a-row class="time-setting">
@@ -374,6 +375,7 @@ export default {
       showBotSetting: false,
       evaluate: false,
       readStatus: false,
+      lineUpNotice: false,
       evaluateId: '',
       timeLengths: [5, 10, 20, 30, 40, 50, 60],
       functionSetting: [], // 服务端功能
@@ -532,9 +534,11 @@ export default {
         chatPublicCategory,
         evaluate,
         readStatus,
+        lineUpNotice,
         broadcast
       } = setting;
       this.readStatus = readStatus === 'Y';
+      this.lineUpNotice = lineUpNotice === 'Y';
       this.showTimeSetting = timingSettingSwitch === '1';
       this.isListClassify = isListClassify;
       this.rightClickSetting = rightClickSetting;
@@ -837,6 +841,7 @@ export default {
         }
         setting.evaluate.isChecked = this.evaluate ? 'Y' : 'N';
         setting.readStatus = this.readStatus ? 'Y' : 'N';
+        setting.lineUpNotice = this.lineUpNotice ? 'Y' : 'N';
         this.submitData.setting = JSON.stringify(setting);
         this.submitData.type = 'BASE_INFORMATION';
         this.submitData.assemblyId = this.assemblyId;

package/packages/scale-view/scaleView.vue

@@ -1288,21 +1288,26 @@ export default create({
     },
     // 保存
     onSubmit() {
-      // 判断有无测评配置 并且在测评时间内
-      let { evaluateResultSetting } = this.config;
-      if (
-        (!evaluateResultSetting || !Object.keys(evaluateResultSetting).length) &&
-        !this.showEvaluateEntry
-      ) {
+      // 不包含测评组件，点击提交，弹出二次确认对话框，确认要提交吗？
+      let hasEvaluate = this.formArray.find(item => this.isEvaluation(item.type));
+      if (!hasEvaluate) {
         this.confirmSubmit("确认要提交吗？");
         return;
       }
+      // 包含测评组件，不包含考试时长，点击提交，弹出二次确认对话框，确认要结束测评吗？
+      // 判断有无测评配置 并且在测评时间内
+      // 无倒计时
+      let { evaluateResultSetting } = this.config;
       let countdownDom = this.$refs.evaluateCountdown;
-      if (!countdownDom?.showEvaluateCountdown) {
+      if (
+        !evaluateResultSetting ||
+        (!Object.keys(evaluateResultSetting).length && !this.showEvaluateEntry) ||
+        !countdownDom?.showEvaluateCountdown
+      ) {
         this.confirmSubmit("确认要结束测评吗？");
         return;
       }
-
+      // 在倒计时内
       let message = "确认要提前结束测评吗？";
       let setAnswered = this.$refs.evaluateCountdown?.setAnswered;
       let totalLen = this.$refs.evaluateCountdown?.totalLen;

package/packages/table-filter/src/base-search-com/BaseSearch.vue

@@ -8,7 +8,7 @@
               设置
               <!-- {{ $t("1.1.5.3") }} -->
             </a-button>
-            <a-dropdown overlayClassName="viewList-dropdown" v-if="editTableSource != 'relatedComponent'">
+            <a-dropdown overlayClassName="viewList-dropdown" v-if="showViewList">
               <a-button class="viewList-button">
                 <svg-icon :icon-class="'anniuqiehuanmoshi'" style="font-size: 22px"></svg-icon>
               </a-button>
@@ -29,31 +29,29 @@
           </li>
           <!-- start--筛选外显--start -->
           <template v-for="item in outSearchFieldList">
-            <outQuickSearch
-              :key="item.id"
-              :item="item"
-              :filterApiConfig="filterApiConfigOutSearch"
-              @outFilterChange="outFilterChange"
-            ></outQuickSearch>
+            <outQuickSearch :key="item.id" :item="item" :filterApiConfig="filterApiConfigOutSearch" @outFilterChange="outFilterChange"></outQuickSearch>
           </template>
           <!-- end--筛选外显--end -->
 
           <!-- start--筛选外显 跨表--start -->
           <template v-for="relationItem in outRelationQuickSearch">
             <template v-for="item in relationItem.fieldList">
-              <outQuickSearch
-                :key="item.id"
-                :item="item"
-                :filterApiConfig="filterApiConfigOutSearch"
-                @outFilterChange="outFilterChange"
-              ></outQuickSearch>
+              <outQuickSearch :key="item.id" :item="item" :filterApiConfig="filterApiConfigOutSearch" @outFilterChange="outFilterChange"></outQuickSearch>
             </template>
           </template>
           <!-- end--筛选外显 跨表--end -->
 
           <li v-if="isShowSetting('hideSearch') && !showRelatedTreeBtn" ref="inputSearchLi" class="baseSearch-input-search">
             <template v-if="outSearchFieldList && outSearchFieldList.length">
-              <a-input :style="{ width, margin: '0 8px 8px 0' }" allowClear placeholder="请输入关键字搜索" :value="currentValue" @input="$emit('input', $event.target.value)" @pressEnter="outFilterChange"> </a-input>
+              <a-input
+                :style="{ width, margin: '0 8px 8px 0' }"
+                allowClear
+                placeholder="请输入关键字搜索"
+                :value="currentValue"
+                @input="$emit('input', $event.target.value)"
+                @pressEnter="outFilterChange"
+              >
+              </a-input>
             </template>
             <a-input-search
               v-else
@@ -231,8 +229,11 @@
                       :baseUrl="printConfig.printBaseUrl"
                       :strategy="item.strategy"
                       :btnText="item.name"
+                      :versionType="item.__printConfig && item.__printConfig.versionType"
+                      :port="item.__printConfig && item.__printConfig.port"
                       :authorizationKey="item.__printConfig && item.__printConfig.authorizationKey"
                       :templateNumber="item.__printConfig && item.__printConfig.number"
+                      :hisParams="item.__printConfig && item.__printConfig.hisParams"
                       :params="getPrintBtnParams(item)"
                       :prevFn="() => printBtnPrevFn(clickRowData, item, 2, j)"
                       @success="receivePrintSuccess"
@@ -294,13 +295,7 @@
               </template>
               <!-- 行内编辑对应生成的（保存、取消）按钮 -->
               <template v-if="visibleInlineOperateBtn">
-                <a-button
-                  :style="{ display: isInlineOperating ? 'inline-block' : 'none' }"
-                  @click="inlineEditClick"
-                  class="btn-custom-class"
-                  style="margin: 0 8px 8px 0"
-                  type="primary"
-                >
+                <a-button :style="{ display: isInlineOperating ? 'inline-block' : 'none' }" @click="inlineEditClick" class="btn-custom-class" style="margin: 0 8px 8px 0" type="primary">
                   保存
                 </a-button>
                 <a-button :style="{ display: isInlineOperating ? 'inline-block' : 'none' }" @click="inlineEditCancel" class="btn-custom-class" style="margin: 0 8px 8px 0">
@@ -413,7 +408,7 @@ export default create({
     showButtonTop: [String, Number],
     showSettings: {
       type: Object,
-      default: ()=>({})
+      default: () => ({})
     },
     clickRowData: Object,
     value: String,
@@ -517,9 +512,9 @@ export default create({
       default: false
     },
 
-    tabConditionList:{
+    tabConditionList: {
       type: Array,
-      default: () =>([])
+      default: () => []
     },
 
     lastOutSearchFieldList: {
@@ -534,7 +529,7 @@ export default create({
       type: Array,
       default: () => []
     },
-     /**
+    /**
      * 筛选外显
      */
     filterApiConfigOutSearch: {
@@ -605,13 +600,7 @@ export default create({
         }
 
         // 只有一个按钮 分组按钮 非自适应
-        if (
-          list.length === 1 &&
-          list[0].buttonGroup &&
-          list[0].isButtonGroup &&
-          !list[0].isShowFoldGroupBtn
-        )
-          return false;
+        if (list.length === 1 && list[0].buttonGroup && list[0].isButtonGroup && !list[0].isShowFoldGroupBtn) return false;
 
         let visibleList = list.filter(item => item.isVisible && !item.buttonGroup);
         if (!visibleList || !visibleList.length) return false;
@@ -642,7 +631,7 @@ export default create({
     showRelatedSearchFold() {
       if (
         !this.isShowSettingBtn &&
-        !this.isShowSetting("hideQuickSearch") &&
+        !this.isShowSetting('hideQuickSearch') &&
         this.outSearchFieldList.length == 0 &&
         this.outRelationQuickSearch.length == 0 &&
         !this.showResetFilterBtn &&
@@ -713,6 +702,17 @@ export default create({
     // 是否有高级筛选外显
     showOutSearch() {
       return this.outSearchFieldList?.length || this.outRelationQuickSearch?.length;
+    },
+    showViewList(){
+      if (this.editTableSource === "relatedComponent") {
+        return this.relatedBaseInfo.showType != "TREE";
+      }
+      return !this.optionsValue('hideViewList');
+    },
+    optionsValue() {
+      return function(key) {
+        return this.$attrs.tableOptions?.[key];
+      }
     }
   },
   data() {
@@ -759,7 +759,7 @@ export default create({
       printBtn: {},
       groupBtnObj: {},
       btnObj: BTNOBJ,
-      printBtnStrategys: [],// 打印按钮组策略list
+      printBtnStrategys: [], // 打印按钮组策略list
       outRelationQuickSearch: [] // 关联表 筛选外显
     };
   },
@@ -1377,7 +1377,7 @@ export default create({
       // 添加批量打印策略：strategy: MULTI(循环多条, 默认值, 为空时使用该策略)  ONCE(聚合一条)
       this.rowPrintBtnList = rowPrintBtnList.map(item => {
         const obj = this.printBtnStrategys.find(v => v.id === item.settingObj[0].trigger_id);
-        item.strategy = obj?.setting ? JSON.parse(obj.setting).strategy : "MULTI";
+        item.strategy = obj?.setting ? JSON.parse(obj.setting).strategy : 'MULTI';
         return item;
       });
 
@@ -1601,10 +1601,7 @@ export default create({
       // 跨表
       let outRelationQuickSearch = this.relationTableList.map(item => {
         return {
-          fieldList:
-            item.fieldList.fieldList.filter(
-              item => item.isShowSearch == 1 && item.filterExplicit == 1
-            ) || [],
+          fieldList: item.fieldList.fieldList.filter(item => item.isShowSearch == 1 && item.filterExplicit == 1) || [],
           tableName: item.tableName,
           primaryField: item.primaryField,
           parameterConversionId: item.parameterConversionId,
@@ -1617,7 +1614,7 @@ export default create({
         };
       });
       outRelationQuickSearch = outRelationQuickSearch.filter(item => item.fieldList.length);
-      this.$set(this, "outRelationQuickSearch", outRelationQuickSearch);
+      this.$set(this, 'outRelationQuickSearch', outRelationQuickSearch);
       this.dealOutFilterHideBtn();
       this.handlerInitSearchItem(this.outSearchFieldList);
       this.outRelationQuickSearch.forEach(item => {
@@ -1626,7 +1623,7 @@ export default create({
       if (this.lastOutSearchFieldList.length > 0) {
         this.outSearchFieldList = _.cloneDeep(this.lastOutSearchFieldList);
       }
-       if (this.lastOutRelationQuickSearch.length) {
+      if (this.lastOutRelationQuickSearch.length) {
         this.outRelationQuickSearch = this.$utils.clone(this.lastOutRelationQuickSearch, true);
       }
     },
@@ -1714,7 +1711,7 @@ export default create({
         const obj = {
           table: i
         };
-        paramsArray.push(utils.setParamsValue(setData[0].params, Object.assign(paramsData,{obj})));
+        paramsArray.push(utils.setParamsValue(setData[0].params, Object.assign(paramsData, { obj })));
       });
 
       return paramsArray;
@@ -1725,7 +1722,10 @@ export default create({
       printNumberList.forEach((item, index) => {
         cloneList[index].__printConfig = {
           number: item.number,
-          authorizationKey: item.authorizationKey
+          authorizationKey: item.authorizationKey,
+          port: item.port,
+          versionType: item.versionType,
+          hisParams: { reportid: item.number }
         };
       });
 
@@ -1751,7 +1751,9 @@ export default create({
         list = data.list.map(item => {
           return {
             number: item.number,
-            authorizationKey: data.authorizationKey
+            authorizationKey: data.authorizationKey,
+            versionType: data.versionType,
+            port: data.port
           };
         });
         this.setPrintNumberCache({
@@ -1924,6 +1926,13 @@ export default create({
           // 查找默认值
           // let curItem = this.viewList.find(v => v.mark == 1);
           this.currentTempId = curItem || '0';
+
+          // 按钮打卡视图列表
+          let tableViewId= this.optionsValue('tableViewId')
+          let onlyOpenView = this.optionsValue('hideViewList') && tableViewId
+          if(onlyOpenView) {
+            this.currentTempId = tableViewId
+          }
           // this.handlerSelectTemp(this.currentTempId);
           this.$emit('handlerChangeView', this.currentTempId);
         } else {