cnhis-design-vue 2.1.128 → 2.1.130

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "2.1.128",
+  "version": "2.1.130",
   "description": "前端业务UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",

package/packages/big-table/index.js

@@ -1,6 +1,10 @@
 // 导入组件
+import Vue from 'vue';
 import BigTable from './src/BigTable.vue';
 import Fieldset from './src/Fieldset.vue';
+import Ellipsis from '../ellipsis';
+
+Vue.use(Ellipsis);
 
 // 为组件提供 install 安装方法，供按需引入
 BigTable.install = function(Vue) {

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

@@ -2143,13 +2143,11 @@ export default create({
       let forbiddenBatchSelect = !this.checkMethod(data);
       // 如果该行禁止批量多选，则选择/取消单行 并触发单击事件
       if (this.selectType == 'checkbox' && forbiddenBatchSelect) {
-        /* 存在问题注释的代码
-         选中“禁用”行，会把之前的选中数据清空
-         table?.setAllCheckboxRow(false);
-        */
-        const value = this.getRowClassName({ row }) == 'single--checked' ? [] : [row];
+        // 选中“禁用”行，需要清空其它选择数据, 并且再次点击不要取消选中
+        table?.setAllCheckboxRow(false);
+        const value = [row];
         this.$set(this, 'checkedRows', value);
-        this.pubCheckChange(value);
+        this.pubCheckChange(value, { forbiddenBatchSelect });
         this.$emit('handlerClickRow', row, rowIndex, { source, column, trigger });
         return;
       }
@@ -2493,13 +2491,13 @@ export default create({
 
       this.setCurrentCheckedLength();
     },
-    pubCheckChange(rows = []) {
+    pubCheckChange(rows = [], config = {}) {
       this.treeTableLength = rows.filter(item => {
         let isGroupRow = vexutils.has(item, GROUP_TITLE_KEY);
         return !isGroupRow;
       }).length;
       this.visibleTreeCheck = rows.length > 1;
-      this.$emit('selectionChange', rows);
+      this.$emit('selectionChange', rows, config);
     },
     setCurrentPageRowChecked() {
       let table = this.$refs.xGrid;

package/packages/big-table/src/components/edit-form/edit-component/edit-search/edit-search.vue

@@ -3,7 +3,7 @@
     <a-select
       v-model="item.useFormValue"
       :ref="'search-' + item.val_key"
-      :dropdownMatchSelectWidth="(item.elem_width || 6) > 11"
+      :dropdownMatchSelectWidth="true"
       class="formItem-select editItem-search"
       :placeholder="item.placeholder || '请输入关键字'"
       :autoFocus="false"
@@ -16,10 +16,12 @@
       @dropdownVisibleChange="handlerDropdownVisibleChange($event, item)"
       @select="handleSearchSelect($event, item, 'select')"
       @change="handleSearchSelect($event, item)"
-      :dropdownClassName="selectIsOpen ? 'form-default-select' : 'hide-select-drop'"
+      :dropdownClassName="selectIsOpen ? 'form-default-select edit-table-default-select' : 'hide-select-drop edit-table-default-select'"
       :notFoundContent="fetching ? undefined : '暂无数据'"
       :dropdownStyle="{
-        maxWidth: optionsMaxWidth
+        maxWidth: optionsMaxWidth,
+        background: 'transparent',
+        'box-shadow': 'none'
       }"
       optionLabelProp="label"
     >
@@ -31,7 +33,7 @@
         :label="hanlderGetSearchLabel(item, v)"
         :disabled="k === 0 && item.wordbook.render_key && item.wordbook.render_key.length > 1"
       >
-        <div
+        <!-- <div
           :class="{
             'title-line': k === 0 && item.wordbook.render_key && item.wordbook.render_key.length > 1
           }"
@@ -40,17 +42,64 @@
         >
           <span style="flex: 1;" v-for="(v1, k1) in v['showLabel'].split('≌')" :key="k1" class="select-content-item">{{ v1 }}</span>
         </div>
-        <span v-else>{{ v[item.wordbook.value_key] }}</span>
+        <span v-else>{{ v[item.wordbook.value_key] }}</span> -->
       </a-select-option>
+      <scale-container 
+        slot="dropdownRender" 
+        :class="`search-menu-${item.val_key}`" 
+        slot-scope="menu" 
+        style="background: #fff; box-shadow: 0 2px 8px rgb(0 0 0 / 15%);"
+        @mousedown.native="e => e.preventDefault()"
+        :minW="optionsMaxWidthNew || 160"
+        :minH="45"
+        :defaultMaxH="300"
+      >
+        <a-spin
+          v-if="fetching"
+          class="loading-wrapper"
+          :spinning="fetching"
+          :tip="`${$t('1.1.7.14')}...`"
+        />
+        <div
+          v-else
+          style="display: flex; flex-direction: column; max-height: inherit; height: 100%;"
+        >
+          <SelectOptions
+            style="flex: 1; overflow: hidden;"
+            :rows="optionRows"
+            :freeAddItem="freeAddItem"
+            :fields="fieldListConfig"
+            :wordbook="item.wordbook"
+            :context="menu && menu.context"
+          />
+          <!-- <slot v-if="curOptions && curOptions.length">
+            <select-pages
+              v-if="!isnoPages"
+              style="flex-shrink: 0;"
+              :searchPageConfig="searchPageConfig"
+              :handleSearchChangePage="handleSearchChangePage"
+            />
+          </slot> -->
+        </div>
+      </scale-container>
     </a-select>
   </div>
 </template>
 <script>
 import itemDefault from '../mixins/item-default';
 import search from '../mixins/search';
+import { Select, Spin } from 'ant-design-vue';
+import SelectOptions from '@/component/select-options';
+import ScaleContainer from '~/scale-container/src/ScaleContainer';
 export default {
   name: 'editSearch',
-  components: {},
+  components: {
+    [Select.name]: Select,
+		[Select.Option.name]: Select.Option,
+    [Spin.name]: Spin,
+    SelectOptions,
+    ScaleContainer
+  },
   props: {
     item: Object
   },
@@ -79,4 +128,29 @@ export default {
   methods: {}
 };
 </script>
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.loading-wrapper {
+  height: 100%;
+  min-height: 100px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+}
+</style>
+
+<style lang="less">
+.edit-table-default-select {
+  .title-line {
+    font-weight: 700;
+    color: #000;
+    font-size: 14px;
+  }
+  .select-content-item {
+    padding: 0 5px;
+  }
+  .ant-select-dropdown-menu-item-selected {
+    color: #5585f5;
+  }
+}
+</style>

package/packages/big-table/src/components/edit-form/edit-component/edit-search-more/edit-search-more.vue

@@ -4,8 +4,8 @@
     ref="form_a_select"
     :showArrow="true"
     class="formItem-select formItem-select-multiple formItem-search-more"
-    :dropdownMatchSelectWidth="(item.elem_width || 6) > 11"
-    :dropdownClassName="selectIsOpen ? 'form-default-select' : 'hide-select-drop'"
+    :dropdownMatchSelectWidth="true"
+    :dropdownClassName="selectIsOpen ? 'form-default-select edit-table-default-select-more' : 'hide-select-drop edit-table-default-select-more'"
     :disabled="item.is_edit == 0"
     :defaultActiveFirstOption="true"
     mode="multiple"
@@ -22,7 +22,9 @@
     @change="searchMoreOnChange($event, item)"
     :notFoundContent="fetching ? undefined : '暂无数据'"
     :dropdownStyle="{
-      maxWidth: optionsMaxWidth
+      maxWidth: optionsMaxWidth,
+      background: 'transparent',
+      'box-shadow': 'none'
     }"
     optionLabelProp="label"
   >
@@ -34,8 +36,7 @@
       :label="hanlderGetSearchLabel(item, v)"
       :disabled="k === 0 && item.wordbook.render_key && item.wordbook.render_key.length > 1"
     >
-      <!-- {{ v["showLabel"] || v[item.wordbook.value_key] }} -->
-      <div
+      <!-- <div
         :class="{
           'title-line': k === 0 && item.wordbook.render_key && item.wordbook.render_key.length > 1
         }"
@@ -44,16 +45,56 @@
       >
         <span style="flex: 1;" v-for="(v1, k1) in v['showLabel'].split('≌')" :key="k1">{{ v1 }}</span>
       </div>
-      <span v-else>{{ v[item.wordbook.value_key] }}</span>
+      <span v-else>{{ v[item.wordbook.value_key] }}</span> -->
     </a-select-option>
+    <scale-container 
+      slot="dropdownRender" 
+      :class="`search-menu-${item.val_key}`" 
+      slot-scope="menu" 
+      style="background: #fff; box-shadow: 0 2px 8px rgb(0 0 0 / 15%);"
+      @mousedown.native="e => e.preventDefault()"
+      :minW="optionsMaxWidthNew ||160"
+      :minH="45"
+      :defaultMaxH="300"
+    >
+      <a-spin
+        v-if="fetching"
+        class="loading-wrapper"
+        :spinning="fetching"
+        :tip="`${$t('1.1.7.14')}...`"
+      />
+      <div
+        v-else
+        style="display: flex; flex-direction: column; max-height: inherit; height: 100%;"
+      >
+        <SelectOptions
+          style="flex: 1; overflow: hidden;"
+          :rows="optionRows"
+          :freeAddItem="freeAddItem"
+          :fields="fieldListConfig"
+          :wordbook="item.wordbook"
+          :context="menu && menu.context"
+          separate="-"
+        />
+      </div>
+    </scale-container>
   </a-select>
 </template>
 <script>
 import itemDefault from '../mixins/item-default';
 import search from '../mixins/search';
+import { Select, Spin } from 'ant-design-vue';
+import SelectOptions from '@/component/select-options';
+import ScaleContainer from '~/scale-container/src/ScaleContainer';
 export default {
   name: 'editSearchMore',
-  components: {},
+  components: {
+    [Select.name]: Select,
+		[Select.Option.name]: Select.Option,
+    [Spin.name]: Spin,
+    SelectOptions,
+    ScaleContainer
+  },
   props: {
     item: Object
   },
@@ -92,4 +133,19 @@ export default {
     top: 50%;
   }
 }
+.loading-wrapper {
+  height: 100%;
+  min-height: 100px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+}
+</style>
+<style lang="less">
+.edit-table-default-select-more {
+  .ant-select-dropdown-menu-item-selected {
+    color: #5585f5;
+  }
+}
 </style>

package/packages/big-table/src/components/edit-form/edit-component/mixins/search.js

@@ -31,8 +31,10 @@ export default {
         page: 1, // 当前页
         total: 1 // 总页数
       },
+      fieldListConfig: [],
 
       optionsMaxWidth: '100%',
+      optionsMaxWidthNew: 160,
 
       cacheReqOptionsParams: '',
 
@@ -56,6 +58,23 @@ export default {
     formType() {
       const { formType } = this.mainForm || {};
       return formType || {};
+    },
+    selectIsOpen() {
+      const { html_type, show_type } = this.item;
+      if (['SEARCH_MORE', 'SEARCH'].includes(html_type)) {
+        return !['pop', 'dialog'].includes(show_type);
+      }
+      return true;
+    },
+    isnoPages() {
+      const { searchPageConfig } = this;
+      return searchPageConfig.page <= 1 && !searchPageConfig.hasNextPage;
+    },
+    freeAddItem() {
+      return this.curOptions.find(v => v.is_free_entry_input__add);
+    },
+    optionRows() {
+      return this.curOptions.filter((v, i) => !(i === 0 && this.item.wordbook.render_key && this.item.wordbook.render_key.length > 1) && !v.is_free_entry_input__add);
     }
   },
   mounted() {
@@ -436,6 +455,7 @@ export default {
             if (!data) return [];
             this.searchAddObj[`${itemData.val_key}_${itemData.name}`] = true;
             let { rows, fieldList, page, total } = data.map;
+            this.fieldListConfig = fieldList;
             this.searchPageConfig = Object.assign(this.searchPageConfig, {
               page,
               total,
@@ -921,6 +941,7 @@ export default {
 
         res = parseInt(res, 10);
         this.optionsMaxWidth = `${res}px`;
+        this.optionsMaxWidthNew = res || 160;
       });
     },
 

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

@@ -443,7 +443,8 @@ export default {
               this.$set(set, 'value', JSON.stringify(set.filter));
             });
             this.$set(el, 'CONVERT', []);
-            if (!this.isApiTable) {
+            let isHandleFilterSettingMap = !this.isApiTable && (!el.filterSettingMap || !Object.keys(el.filterSettingMap).length);
+            if (isHandleFilterSettingMap) {
               let filterSettingMap = this.handleFieldListFilter(el);
               this.$set(el, 'filterSettingMap', filterSettingMap);
             }

package/packages/card-reader-sdk/src/cardReaderSDK.js

@@ -101,6 +101,18 @@ export default class CardReaderSDK {
     return this.readHealthCardDialog.show(options);
   }
 
+  async getCardType() {
+		await this.checkLoading();
+
+		const requestParams = this.createParams(TRANS_CMD.CARD_TYPE_READ, {
+			transsystem: '10',
+			transtype: 'IDCARD',
+			interfaceid: '0'
+		});
+
+		return this.checkResCodeAndLoading(this.insurance.getInsuranceInfoPromise(requestParams));
+	}
+
   async generalRequest(params = {}) {
     await this.checkLoading();
     const requestParams = this.createParams(TRANS_CMD.NS_GETPERSONALINFO, {}, params);

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

@@ -265,7 +265,10 @@ export default {
           const [preItem0] = lineList[j + 1];
           if (preItem0) {
             const preStartMinute = new Date(preItem0).getTime();
-            if (preStartMinute > minMinute && preStartMinute <= maxMinute) rightLimit.x2 = this.computedX(preItem0);
+            if (preStartMinute > minMinute && preStartMinute <= maxMinute) {
+              rightLimit.x2 = this.computedX(preItem0);
+              if (!x2) leftLimit.x2 = rightLimit.x2;
+            }
           }
         }
 

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

@@ -14,6 +14,7 @@ import MouseRightClick from '../components/MouseRightClick';
 import DropPopup from '../components/DropPopup';
 import defaultVaule from '../const/defaultVaule';
 import Bus from '../utils/bus';
+import { nearlyEqual } from '../utils';
 
 /**
  * @description: 递归遍历节点，设置颜色属性
@@ -609,7 +610,7 @@ export default {
      * @param {polylineIndex} 当前折线 index
      */
     drawPolyline(polyline, polylineIndex, polylineType, polylineTypeId) {
-      const { originY, endY } = this.propItems;
+      const { originY, endY, xCellWidth, table } = this.propItems;
       const { list = [], critical = {}, diffValue = {} } = polyline;
 
       const pointList = [];
@@ -648,7 +649,10 @@ export default {
         let line;
         let point;
         let previousLine;
-        line = points && nextPoint && !linePoints.data?.breakpoint ? this.drawLine([...points, ...nextPoint], { polylineIndex, polylineTypeId, lineIndex: index, ...lineAttr }) : null;
+        line =
+          !points || !nextPoint || linePoints.data?.breakpoint || (table.breakpoint && nextPoint[0] - points[0] > xCellWidth)
+            ? null
+            : this.drawLine([...points, ...nextPoint], { polylineIndex, polylineTypeId, lineIndex: index, ...lineAttr });
         previousLine = lineList[index - 1];
         const pointOthers = { polylineTypeId, polylineIndex, pointIndex: index, ...pointAttr, lineAttr };
         if (points) {
@@ -876,8 +880,8 @@ export default {
       for (let i = 0, len = this.addPointList.length; i < len; i++) {
         const currentPoint = this.addPointList[i];
         const prevPoint = this.addPointList[i - 1] || { left: point.prePoint?.left ?? originLeft, top: point.prePoint?.top ?? originTop };
-        const currentPointObj = this.addPointObjList.find(obj => obj.left === currentPoint.left);
-        if (currentPointObj?.line1?.x1 !== prevPoint.left) {
+        const currentPointObj = this.addPointObjList.find(obj => nearlyEqual(obj.left, currentPoint.left));
+        if (!nearlyEqual(currentPointObj?.line1?.x1, prevPoint.left)) {
           currentPointObj?.line1?.set({
             x1: prevPoint.left,
             y1: prevPoint.top,
@@ -897,7 +901,7 @@ export default {
           if (k > 0) {
             const curLeft = originLeft + this.spaceWidth * k;
             // 判断this.addPointList中的left是否包含curLeft，不包含就说明是漏了
-            const hasPoint = this.addPointList.some(p => Math.abs(p.left - curLeft) <= 0.001);
+            const hasPoint = this.addPointList.some(p => nearlyEqual(p.left, curLeft));
             // const hasPoint = this.addPointList.some(v => v.left == curLeft);
             if (!hasPoint) {
               let index;
@@ -940,7 +944,7 @@ export default {
       const currentLeft = left;
 
       const startLength = this.addPointList.length;
-      const n = 6; // 拖动范围，在需要增加节点的刻度左右吸入的范围值
+      const n = Math.min(this.spaceWidth / 2, 6); // 拖动范围，在需要增加节点的刻度左右吸入的范围值
       const residue = (left - originLeft) % this.spaceWidth;
 
       const condition = residue > 0 && (residue > this.spaceWidth - n || residue < n);
@@ -961,7 +965,7 @@ export default {
           // point.line1 && this.removePolyline(point.line1.id);
           setPointLineColor(point, 'transparent', conditionHasLine2);
           this.addPointList.length == 0 && 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)) {
+          if (this.addPointList.every(v => !nearlyEqual(v.left, left))) {
             // const points1 = i === 1 ? [originLeft, originTop] : point.prePoints;
             const points1 = this.addPointList.length == 0 ? [originLeft, originTop] : point.prePoints;
             if (points1) {
@@ -973,7 +977,7 @@ export default {
               data.left = left;
               data.top = top;
               // 避免重复添加
-              if (this.addPointObjList.every(o => o.left !== left)) {
+              if (this.addPointObjList.every(o => !nearlyEqual(o.left, left))) {
                 this.addPointList.push(data);
                 this.clonePoint(point, [...points1, left, top]);
               }