cnhis-design-vue 2.1.126 → 2.1.128

package/package.json

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

package/packages/big-table/index.js

@@ -1,10 +1,6 @@
 // 导入组件
-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,11 +2143,13 @@ export default create({
       let forbiddenBatchSelect = !this.checkMethod(data);
       // 如果该行禁止批量多选，则选择/取消单行 并触发单击事件
       if (this.selectType == 'checkbox' && forbiddenBatchSelect) {
-        // 选中“禁用”行，需要清空其它选择数据, 并且再次点击不要取消选中
-        table?.setAllCheckboxRow(false);
-        const value = [row];
+        /* 存在问题注释的代码
+         选中“禁用”行，会把之前的选中数据清空
+         table?.setAllCheckboxRow(false);
+        */
+        const value = this.getRowClassName({ row }) == 'single--checked' ? [] : [row];
         this.$set(this, 'checkedRows', value);
-        this.pubCheckChange(value, { forbiddenBatchSelect });
+        this.pubCheckChange(value);
         this.$emit('handlerClickRow', row, rowIndex, { source, column, trigger });
         return;
       }
@@ -2491,13 +2493,13 @@ export default create({
 
       this.setCurrentCheckedLength();
     },
-    pubCheckChange(rows = [], config = {}) {
+    pubCheckChange(rows = []) {
       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, config);
+      this.$emit('selectionChange', rows);
     },
     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="true"
+      :dropdownMatchSelectWidth="(item.elem_width || 6) > 11"
       class="formItem-select editItem-search"
       :placeholder="item.placeholder || '请输入关键字'"
       :autoFocus="false"
@@ -16,12 +16,10 @@
       @dropdownVisibleChange="handlerDropdownVisibleChange($event, item)"
       @select="handleSearchSelect($event, item, 'select')"
       @change="handleSearchSelect($event, item)"
-      :dropdownClassName="selectIsOpen ? 'form-default-select edit-table-default-select' : 'hide-select-drop edit-table-default-select'"
+      :dropdownClassName="selectIsOpen ? 'form-default-select' : 'hide-select-drop'"
       :notFoundContent="fetching ? undefined : '暂无数据'"
       :dropdownStyle="{
-        maxWidth: optionsMaxWidth,
-        background: 'transparent',
-        'box-shadow': 'none'
+        maxWidth: optionsMaxWidth
       }"
       optionLabelProp="label"
     >
@@ -33,7 +31,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
           }"
@@ -42,64 +40,17 @@
         >
           <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: {
-    [Select.name]: Select,
-		[Select.Option.name]: Select.Option,
-    [Spin.name]: Spin,
-    SelectOptions,
-    ScaleContainer
-  },
+  components: {},
   props: {
     item: Object
   },
@@ -128,29 +79,4 @@ export default {
   methods: {}
 };
 </script>
-<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>
+<style lang="less" scoped></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="true"
-    :dropdownClassName="selectIsOpen ? 'form-default-select edit-table-default-select-more' : 'hide-select-drop edit-table-default-select-more'"
+    :dropdownMatchSelectWidth="(item.elem_width || 6) > 11"
+    :dropdownClassName="selectIsOpen ? 'form-default-select' : 'hide-select-drop'"
     :disabled="item.is_edit == 0"
     :defaultActiveFirstOption="true"
     mode="multiple"
@@ -22,9 +22,7 @@
     @change="searchMoreOnChange($event, item)"
     :notFoundContent="fetching ? undefined : '暂无数据'"
     :dropdownStyle="{
-      maxWidth: optionsMaxWidth,
-      background: 'transparent',
-      'box-shadow': 'none'
+      maxWidth: optionsMaxWidth
     }"
     optionLabelProp="label"
   >
@@ -36,7 +34,8 @@
       :label="hanlderGetSearchLabel(item, v)"
       :disabled="k === 0 && item.wordbook.render_key && item.wordbook.render_key.length > 1"
     >
-      <!-- <div
+      <!-- {{ v["showLabel"] || v[item.wordbook.value_key] }} -->
+      <div
         :class="{
           'title-line': k === 0 && item.wordbook.render_key && item.wordbook.render_key.length > 1
         }"
@@ -45,56 +44,16 @@
       >
         <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: {
-    [Select.name]: Select,
-		[Select.Option.name]: Select.Option,
-    [Spin.name]: Spin,
-    SelectOptions,
-    ScaleContainer
-  },
+  components: {},
   props: {
     item: Object
   },
@@ -133,19 +92,4 @@ 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,10 +31,8 @@ export default {
         page: 1, // 当前页
         total: 1 // 总页数
       },
-      fieldListConfig: [],
 
       optionsMaxWidth: '100%',
-      optionsMaxWidthNew: 160,
 
       cacheReqOptionsParams: '',
 
@@ -58,23 +56,6 @@ 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() {
@@ -455,7 +436,6 @@ 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,
@@ -941,7 +921,6 @@ export default {
 
         res = parseInt(res, 10);
         this.optionsMaxWidth = `${res}px`;
-        this.optionsMaxWidthNew = res || 160;
       });
     },
 

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

@@ -265,10 +265,7 @@ 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 (!x2) leftLimit.x2 = rightLimit.x2;
-            }
+            if (preStartMinute > minMinute && preStartMinute <= maxMinute) rightLimit.x2 = this.computedX(preItem0);
           }
         }
 

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

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

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

@@ -14,8 +14,6 @@ import DropPopup from '../components/DropPopup';
 import MouseRightClick from '../components/MouseRightClick';
 import eventCommon from '../mixins/eventCommon';
 import Bus from '../utils/bus';
-import { cloneDeep } from 'lodash';
-import { sortByTime } from '../utils';
 
 const rightClickNode = [
   { name: '修改', type: 'edit' },
@@ -67,8 +65,6 @@ export default {
     }
   },
   data() {
-    this.markData = sortByTime(cloneDeep(this.templateData.bottom?.list));
-    this.markObjs = [];
     return {
       leftStartX: 0,
       isDropVisible: false,
@@ -105,7 +101,7 @@ export default {
       // this.canvas.renderAll();
       if (this.templateData.bottom) {
         this.drawExtracorporealCirculation();
-        this.drawBottomTextDataGroup();
+        this.drawBottomTextDataGroup(this.templateData.bottom);
       }
     },
     drawBorder() {
@@ -326,33 +322,29 @@ export default {
             };
             const left = this.computedX(v.time);
             title.dataList.push(left);
-            const icon =
-              !Reflect.has(_icon, 'show') || _icon.show
-                ? await this.createPoint(_icon.type, {
-                    originX: 'center',
-                    left,
-                    ...item.style,
-                    ...(item.style ? { stroke: item.style.fill } : {}),
-                    ...(_icon.style || {}),
-                    ...commonOptions
-                  })
-                : null;
-            const iconHalfWidth = icon ? icon.width / 2 : 0;
+            const icon = await this.createPoint(_icon.type, {
+              originX: 'center',
+              left,
+              ...item.style,
+              ...(item.style ? { stroke: item.style.fill } : {}),
+              ...(_icon.style || {}),
+              ...commonOptions
+            });
             const text = new this.fabric.Text(String(v.value), {
               ...defaultVaule.style,
               ...defaultVaule.textStyle,
               ...item.style,
-              left: left + iconHalfWidth,
+              left: left + icon.width / 2,
               name: v.value,
               ...commonOptions
             });
-            const groupObj = new this.fabric.Group(icon ? [icon, text] : [text], {
+            const groupObj = new this.fabric.Group([icon, text], {
               id: `${index}_${i}_other_${Date.now()}`,
               lockMovementY: true,
               ...commonOptions,
               ...this.eventStyle,
               realLeft: left,
-              iconHalfWidth
+              iconHalfWidth: icon.width / 2
             });
             if (prevPoint) {
               prevPoint.nextPoint = groupObj;
@@ -463,19 +455,23 @@ export default {
       return time >= minTime && time <= maxTime;
     },
     removeMark() {
-      this.markObjs.forEach(obj => this.canvas.remove(obj));
+      this.canvas.forEachObject(obj => {
+        if (obj.type && obj.type === 'mark') {
+          this.canvas.remove(obj);
+        }
+      });
     },
-    drawTopTotalLineAndTitle() {
-      const { bottom: obj, left: leftData } = this.templateData;
+    // 底部标记
+    drawBottomTextDataGroup(obj) {
       const { endX, originX, endY, topTotal, markHeight } = this.propItems;
-      if (!topTotal.width) {
+      if (!markHeight || !obj.list) {
         return;
       }
 
-      const line1 = this.drawLine([endX, endY - 1, endX, endY + markHeight], { ...this.defaultRectStyle });
-      const line2 = this.drawLine([originX, endY + markHeight, endX, endY + markHeight], { ...this.defaultRectStyle });
-
-      const marginLeft = leftData.leftYScalevalue.spaceGridNumber || defaultVaule.spaceGridNumber;
+      topTotal.width && this.canvas.add(this.drawLine([endX, endY - 1, endX, endY + markHeight], { ...this.defaultRectStyle }));
+      topTotal.width && this.canvas.add(this.drawLine([originX, endY + markHeight, endX, endY + markHeight], { ...this.defaultRectStyle }));
+      // const textList = [];
+      const marginLeft = this.templateData.left.leftYScalevalue.spaceGridNumber || defaultVaule.spaceGridNumber;
       const left = originX - marginLeft * 4; // 默认减去4倍的左边距，防止最左边的数据与名称显示重合了
       const title = new this.fabric.Text(String(obj.title), {
         ...defaultVaule.style,
@@ -487,31 +483,14 @@ export default {
         top: endY + markHeight / 2,
         type: 'mark'
       });
-      this.markObjs.push(title, line1, line2);
-      this.canvas.add(title, line1, line2);
-    },
-    // 底部标记
-    drawBottomTextDataGroup() {
-      const { bottom: obj } = this.templateData;
-      const { originX, endY, markHeight, xCellWidth } = this.propItems;
-      if (!markHeight || !this.markData?.length) {
-        return;
-      }
-      if (this.markObjs.length) {
-        [...this.markObjs].forEach(obj => this.canvas.remove(obj));
-        this.markObjs = [];
-      }
-
-      this.drawTopTotalLineAndTitle();
-
+      this.canvas.add(title);
+      // textList.push(title);
       const _endY = this.extracorporealCirculationHeight ? endY + this.extracorporealCirculationHeight : endY;
       const baseY = _endY + 2; // 目前固定10像素的下边距
       const baseYLimit = endY - 2; // 目前固定10像素的上边距
       const lineHeightText = (obj.style?.fontSize || 12) + 2;
       const lineHeightImg = (obj.iconStyle?.height || 12) + 2;
       const lineHeightSeq = (obj.seqStyle?.circle?.radius || 9) * 2 + 2;
-      let prevLeft = originX;
-      let prevCondition;
 
       const setTop = (lineHeight, i, condition) => {
         if (!~condition.limitIndex) {
@@ -528,16 +507,12 @@ export default {
         }
         return condition.y;
       };
-      this.markData.forEach((item, index) => {
+      obj.list.forEach((item, index) => {
         const condition = {
           limitIndex: -1, // 标志点是否往上排列的标志，大于-1则表示需要往上排列
           y: baseY
         };
         const x = this.computedX(item[0]);
-        // 相隔小于或等于一个小格的宽度就继承上个时间标记的高度继续计算定位，即错位显示
-        if (x - prevLeft <= xCellWidth) {
-          Object.assign(condition, prevCondition);
-        }
         if (this.isLimit(item[0])) {
           const pointList = [];
           item[1].forEach(async (v, i) => {
@@ -571,12 +546,7 @@ export default {
               }
             }
           });
-          prevLeft = x;
-          prevCondition = condition;
-          Promise.all(pointList).then(res => {
-            this.markObjs.push(...res);
-            this.canvas.add(...res);
-          });
+          Promise.all(pointList).then(res => this.canvas.add(...res));
         }
       });
     },
@@ -650,31 +620,9 @@ export default {
             newVal: this.getXValue(point.left)
           };
           this.$emit('markChange', value);
-          this.updateMarkData(value);
-          this.drawBottomTextDataGroup();
-          this.canvas.discardActiveObject();
         });
       }
     },
-    updateMarkData({ data, newVal }) {
-      const id = data.id;
-      let listIndex, index;
-      listIndex = this.markData.findIndex(v => {
-        const i = v[1].findIndex(k => k.data?.id === id);
-        i > -1 && (index = i);
-        return i > -1;
-      });
-      const obj = this.markData[listIndex][1].splice(index, 1)[0];
-      const newIndex = this.markData.findIndex(v => v[0] === newVal);
-      if (!~newIndex) {
-        this.markData.push([newVal, [obj]]);
-      } else {
-        this.markData[newIndex][1].push(obj);
-      }
-      const emptyIndex = this.markData.findIndex(v => v[1].length === 0);
-      !!~emptyIndex && this.markData.splice(emptyIndex, 1);
-      sortByTime(this.markData);
-    },
     moveLimit(point) {
       point.setCoords();
       const { originX, endX, originY, endY, markHeight } = this.propItems;

package/packages/fabric-chart/src/mixins/drawExtracorporealCirculation.js

@@ -155,9 +155,13 @@ export default {
           this.$emit('extracorporealCirculationChange', params);
           const { index, key, data } = params;
           this.extracorporealCirculation.list[index][key] = data;
-          this.drawExtracorporealCirculation();
+          this.drawExtracorporealCirculation(this.extracorporealCirculation);
           this.canvas.discardActiveObject();
-          this.markObjs.forEach(obj => obj.bringForward());
+          this.canvas.forEachObject(obj => {
+            if (obj.type && obj.type === 'mark') {
+              obj.bringForward();
+            }
+          });
         });
       }
     },

package/packages/fabric-chart/src/utils/index.js

@@ -9,7 +9,7 @@ export function getTangent(angle) {
   return +Math.tan((angle * Math.PI) / 180);
 }
 
-export function nearlyEqual(v1, v2) {
+function nearlyEqual(v1, v2) {
   return Math.abs(v1 - v2) <= 0.0001;
 }
 
@@ -79,11 +79,3 @@ export function getIntersectionPoint(a, b, c, d) {
   // 否则不相交
   return false;
 }
-
-export function sortByTime(list = []) {
-  list.sort((a, b) => {
-    return Date.parse(a[0]) - Date.parse(b[0]);
-  });
-
-  return list;
-}