cnhis-design-vue 2.1.125 → 2.1.127

package/es/ellipsis/index.js

@@ -846,7 +846,7 @@ var es_promise_finally = __webpack_require__("a79d");
 // EXTERNAL MODULE: external "core-js/modules/es.function.name.js"
 var es_function_name_js_ = __webpack_require__("db0a");
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"77d0f074-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/ellipsis/src/Ellipsis.vue?vue&type=template&id=2e802586&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7abca1d8-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/ellipsis/src/Ellipsis.vue?vue&type=template&id=2e802586&scoped=true&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('a-tooltip',{attrs:{"placement":"top","visible":_vm.visible}},[_c('template',{slot:"title"},[_c('span',[_vm._v(_vm._s(_vm.content))])]),_c('span',{ref:"contentRef",staticClass:"ellipsis-content",on:{"mouseenter":_vm.show,"mouseleave":_vm.hidden}},[_c('span',{ref:"contentInnerRef"},[_vm._v(_vm._s(_vm.content))])])],2)}
 var staticRenderFns = []
 

package/es/fabric-chart/index.js

@@ -295,7 +295,7 @@ var es_promise_finally = __webpack_require__("a79d");
 // EXTERNAL MODULE: external "core-js/modules/es.function.name.js"
 var es_function_name_js_ = __webpack_require__("db0a");
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"77d0f074-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/FabricChart.vue?vue&type=template&id=76395f46&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7abca1d8-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/FabricChart.vue?vue&type=template&id=76395f46&scoped=true&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"c-fabric-chart",style:({ width: _vm.canvasWidth })},[(_vm.rendercanvas)?_c('fabric-canvas',_vm._b({ref:"canvasEle",attrs:{"templateData":_vm.templateData}},'fabric-canvas',_vm.$attrs,false),[_c('fabric-grid'),(_vm.hasXScalevalue)?_c('fabric-text-group',_vm._g({ref:"otherGroups",attrs:{"templateData":_vm.templateData}},_vm.$listeners)):_vm._e(),(_vm.hasTable)?_c('fabric-scale-value',{attrs:{"templateData":_vm.templateData}}):_vm._e(),(_vm.hasTopTable)?_c('fabric-lines',_vm._g({ref:"lines",attrs:{"linesObj":_vm.templateData.top}},_vm.$listeners)):_vm._e(),(_vm.hasTable)?_c('fabric-polylines',_vm._g({ref:"polylines",attrs:{"polyline":_vm.polylines,"other":_vm.templateData.left.other || {},"timeRangeStyle":_vm.templateData.timeRangeStyle || {}},on:{"pointOperation":_vm.pointOperation}},_vm.$listeners)):_vm._e()],1):_vm._e()],1)}
 var staticRenderFns = []
 
@@ -308,7 +308,7 @@ var objectSpread2 = __webpack_require__("5530");
 // EXTERNAL MODULE: ./src/core/create.js
 var create = __webpack_require__("8aef");
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"77d0f074-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricCanvas.vue?vue&type=template&id=37bd438c&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7abca1d8-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricCanvas.vue?vue&type=template&id=37bd438c&
 var FabricCanvasvue_type_template_id_37bd438c_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('canvas',{attrs:{"id":_vm.id}}),_vm._t("default")],2)}
 var FabricCanvasvue_type_template_id_37bd438c_staticRenderFns = []
 
@@ -968,7 +968,7 @@ var component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var FabricCanvas = (component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"77d0f074-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricPolylines.vue?vue&type=template&id=6078d968&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7abca1d8-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricPolylines.vue?vue&type=template&id=6078d968&
 var FabricPolylinesvue_type_template_id_6078d968_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"poly-line"},[_c('MouseRightClick',{directives:[{name:"show",rawName:"v-show",value:(_vm.isRightVisible),expression:"isRightVisible"}],attrs:{"getContainer":_vm.getContainer,"nodeList":_vm.rightClickNode,"rightPos":_vm.rightPos},on:{"nodeClick":_vm.handleRightClick,"closeRight":function($event){_vm.isRightVisible = false}}}),_c('DropPopup',{directives:[{name:"show",rawName:"v-show",value:(_vm.isDropVisible),expression:"isDropVisible"}],attrs:{"val":_vm.dropVal,"dropPos":_vm.dropPos}})],1)}
 var FabricPolylinesvue_type_template_id_6078d968_staticRenderFns = []
 
@@ -1229,6 +1229,13 @@ function getIntersectionPoint(a, b, c, d) {
 
   return false;
 }
+function sortByTime() {
+  var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  list.sort(function (a, b) {
+    return Date.parse(a[0]) - Date.parse(b[0]);
+  });
+  return list;
+}
 // CONCATENATED MODULE: ./packages/fabric-chart/src/mixins/draw.js
 
 
@@ -1838,7 +1845,7 @@ function getIntersectionPoint(a, b, c, d) {
     }
   }
 });
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"77d0f074-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/components/MouseRightClick.vue?vue&type=template&id=25d4407a&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7abca1d8-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/components/MouseRightClick.vue?vue&type=template&id=25d4407a&scoped=true&
 var MouseRightClickvue_type_template_id_25d4407a_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"c-mouse-right-menu-popup c-animation-in",style:(_vm.dialogStyle)},[_c('div',{staticClass:"c-mouse-right-menu"},_vm._l((_vm.nodeList),function(item,index){return _c('div',{key:index,staticClass:"c-mouse-menu-item",on:{"click":function($event){return _vm.handleNodeClick(item)}}},[_c('span',[_vm._v(_vm._s(item.name))])])}),0)])}
 var MouseRightClickvue_type_template_id_25d4407a_scoped_true_staticRenderFns = []
 
@@ -1946,7 +1953,7 @@ var MouseRightClick_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var MouseRightClick = (MouseRightClick_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"77d0f074-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/components/DropPopup.vue?vue&type=template&id=c4db0ace&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7abca1d8-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/components/DropPopup.vue?vue&type=template&id=c4db0ace&scoped=true&
 var DropPopupvue_type_template_id_c4db0ace_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"c-drop-popup",style:(_vm.dialogStyle)},[_c('div',{staticClass:"c-drop-popup-list"},[_c('span',[_vm._v(_vm._s(_vm.val.title))]),_vm._l((_vm.val.list),function(item){return _c('span',{key:item.id},[_vm._v(" "+_vm._s(((item.name) + ": " + (item.value)))+" ")])})],2)])}
 var DropPopupvue_type_template_id_c4db0ace_scoped_true_staticRenderFns = []
 
@@ -4135,12 +4142,12 @@ var FabricGrid_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var FabricGrid = (FabricGrid_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"77d0f074-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricTextGroup.vue?vue&type=template&id=92bb118e&
-var FabricTextGroupvue_type_template_id_92bb118e_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"text-group"},[_c('MouseRightClick',{directives:[{name:"show",rawName:"v-show",value:(_vm.isRightVisible),expression:"isRightVisible"}],attrs:{"getContainer":_vm.getContainer,"nodeList":_vm.rightClickNode,"rightPos":_vm.rightPos},on:{"nodeClick":_vm.handleRightClick,"closeRight":function($event){_vm.isRightVisible = false}}}),_c('DropPopup',{directives:[{name:"show",rawName:"v-show",value:(_vm.isDropVisible),expression:"isDropVisible"}],attrs:{"val":_vm.dropVal,"dropPos":_vm.dropPos}})],1)}
-var FabricTextGroupvue_type_template_id_92bb118e_staticRenderFns = []
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7abca1d8-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricTextGroup.vue?vue&type=template&id=7f8a6f64&
+var FabricTextGroupvue_type_template_id_7f8a6f64_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"text-group"},[_c('MouseRightClick',{directives:[{name:"show",rawName:"v-show",value:(_vm.isRightVisible),expression:"isRightVisible"}],attrs:{"getContainer":_vm.getContainer,"nodeList":_vm.rightClickNode,"rightPos":_vm.rightPos},on:{"nodeClick":_vm.handleRightClick,"closeRight":function($event){_vm.isRightVisible = false}}}),_c('DropPopup',{directives:[{name:"show",rawName:"v-show",value:(_vm.isDropVisible),expression:"isDropVisible"}],attrs:{"val":_vm.dropVal,"dropPos":_vm.dropPos}})],1)}
+var FabricTextGroupvue_type_template_id_7f8a6f64_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricTextGroup.vue?vue&type=template&id=92bb118e&
+// CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricTextGroup.vue?vue&type=template&id=7f8a6f64&
 
 // EXTERNAL MODULE: external "core-js/modules/es.reflect.has.js"
 var es_reflect_has_js_ = __webpack_require__("bfdc");
@@ -4369,14 +4376,12 @@ var cloneDeep_default = /*#__PURE__*/__webpack_require__.n(cloneDeep_);
               data = params.data;
           _this2.extracorporealCirculation.list[index][key] = data;
 
-          _this2.drawExtracorporealCirculation(_this2.extracorporealCirculation);
+          _this2.drawExtracorporealCirculation();
 
           _this2.canvas.discardActiveObject();
 
-          _this2.canvas.forEachObject(function (obj) {
-            if (obj.type && obj.type === 'mark') {
-              obj.bringForward();
-            }
+          _this2.markObjs.forEach(function (obj) {
+            return obj.bringForward();
           });
         });
       }
@@ -4463,6 +4468,9 @@ var cloneDeep_default = /*#__PURE__*/__webpack_require__.n(cloneDeep_);
     }
   }
 });
+// EXTERNAL MODULE: external "lodash"
+var external_lodash_ = __webpack_require__("60bb");
+
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js??ref--12-0!./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricTextGroup.vue?vue&type=script&lang=js&
 
 
@@ -4486,6 +4494,7 @@ var cloneDeep_default = /*#__PURE__*/__webpack_require__.n(cloneDeep_);
 
 
 
+
 
 
 //
@@ -4503,6 +4512,8 @@ var cloneDeep_default = /*#__PURE__*/__webpack_require__.n(cloneDeep_);
 
 
 
+
+
 var FabricTextGroupvue_type_script_lang_js_rightClickNode = [{
   name: '修改',
   type: 'edit'
@@ -4561,6 +4572,10 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
     }
   },
   data: function data() {
+    var _this$templateData$bo;
+
+    this.markData = sortByTime(Object(external_lodash_["cloneDeep"])((_this$templateData$bo = this.templateData.bottom) === null || _this$templateData$bo === void 0 ? void 0 : _this$templateData$bo.list));
+    this.markObjs = [];
     return {
       leftStartX: 0,
       isDropVisible: false,
@@ -4610,7 +4625,7 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
 
       if (this.templateData.bottom) {
         this.drawExtracorporealCirculation();
-        this.drawBottomTextDataGroup(this.templateData.bottom);
+        this.drawBottomTextDataGroup();
       }
     },
     drawBorder: function drawBorder() {
@@ -5138,20 +5153,14 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
     removeMark: function removeMark() {
       var _this12 = this;
 
-      this.canvas.forEachObject(function (obj) {
-        if (obj.type && obj.type === 'mark') {
-          _this12.canvas.remove(obj);
-        }
+      this.markObjs.forEach(function (obj) {
+        return _this12.canvas.remove(obj);
       });
     },
-    // 底部标记
-    drawBottomTextDataGroup: function drawBottomTextDataGroup(obj) {
-      var _obj$style,
-          _obj$iconStyle,
-          _obj$seqStyle,
-          _obj$seqStyle$circle,
-          _this13 = this;
-
+    drawTopTotalLineAndTitle: function drawTopTotalLineAndTitle() {
+      var _this$templateData = this.templateData,
+          obj = _this$templateData.bottom,
+          leftData = _this$templateData.left;
       var _this$propItems6 = this.propItems,
           endX = _this$propItems6.endX,
           originX = _this$propItems6.originX,
@@ -5159,14 +5168,13 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
           topTotal = _this$propItems6.topTotal,
           markHeight = _this$propItems6.markHeight;
 
-      if (!markHeight || !obj.list) {
+      if (!topTotal.width) {
         return;
       }
 
-      topTotal.width && this.canvas.add(this.drawLine([endX, endY - 1, endX, endY + markHeight], Object(objectSpread2["a" /* default */])({}, this.defaultRectStyle)));
-      topTotal.width && this.canvas.add(this.drawLine([originX, endY + markHeight, endX, endY + markHeight], Object(objectSpread2["a" /* default */])({}, this.defaultRectStyle))); // const textList = [];
-
-      var marginLeft = this.templateData.left.leftYScalevalue.spaceGridNumber || defaultVaule.spaceGridNumber;
+      var line1 = this.drawLine([endX, endY - 1, endX, endY + markHeight], Object(objectSpread2["a" /* default */])({}, this.defaultRectStyle));
+      var line2 = this.drawLine([originX, endY + markHeight, endX, endY + markHeight], Object(objectSpread2["a" /* default */])({}, this.defaultRectStyle));
+      var marginLeft = leftData.leftYScalevalue.spaceGridNumber || defaultVaule.spaceGridNumber;
       var left = originX - marginLeft * 4; // 默认减去4倍的左边距，防止最左边的数据与名称显示重合了
 
       var title = new this.fabric.Text(String(obj.title), Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, defaultVaule.style), defaultVaule.textStyle), obj.style), {}, {
@@ -5176,7 +5184,38 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
         top: endY + markHeight / 2,
         type: 'mark'
       }));
-      this.canvas.add(title); // textList.push(title);
+      this.markObjs.push(title, line1, line2);
+      this.canvas.add(title, line1, line2);
+    },
+    // 底部标记
+    drawBottomTextDataGroup: function drawBottomTextDataGroup() {
+      var _this$markData,
+          _this13 = this,
+          _obj$style,
+          _obj$iconStyle,
+          _obj$seqStyle,
+          _obj$seqStyle$circle;
+
+      var obj = this.templateData.bottom;
+      var _this$propItems7 = this.propItems,
+          originX = _this$propItems7.originX,
+          endY = _this$propItems7.endY,
+          markHeight = _this$propItems7.markHeight,
+          xCellWidth = _this$propItems7.xCellWidth;
+
+      if (!markHeight || !((_this$markData = this.markData) !== null && _this$markData !== void 0 && _this$markData.length)) {
+        return;
+      }
+
+      if (this.markObjs.length) {
+        Object(toConsumableArray["a" /* default */])(this.markObjs).forEach(function (obj) {
+          return _this13.canvas.remove(obj);
+        });
+
+        this.markObjs = [];
+      }
+
+      this.drawTopTotalLineAndTitle();
 
       var _endY = this.extracorporealCirculationHeight ? endY + this.extracorporealCirculationHeight : endY;
 
@@ -5187,6 +5226,8 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
       var lineHeightText = (((_obj$style = obj.style) === null || _obj$style === void 0 ? void 0 : _obj$style.fontSize) || 12) + 2;
       var lineHeightImg = (((_obj$iconStyle = obj.iconStyle) === null || _obj$iconStyle === void 0 ? void 0 : _obj$iconStyle.height) || 12) + 2;
       var lineHeightSeq = (((_obj$seqStyle = obj.seqStyle) === null || _obj$seqStyle === void 0 ? void 0 : (_obj$seqStyle$circle = _obj$seqStyle.circle) === null || _obj$seqStyle$circle === void 0 ? void 0 : _obj$seqStyle$circle.radius) || 9) * 2 + 2;
+      var prevLeft = originX;
+      var prevCondition;
 
       var setTop = function setTop(lineHeight, i, condition) {
         if (!~condition.limitIndex) {
@@ -5207,14 +5248,19 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
         return condition.y;
       };
 
-      obj.list.forEach(function (item, index) {
+      this.markData.forEach(function (item, index) {
         var condition = {
           limitIndex: -1,
           // 标志点是否往上排列的标志，大于-1则表示需要往上排列
           y: baseY
         };
 
-        var x = _this13.computedX(item[0]);
+        var x = _this13.computedX(item[0]); // 相隔小于或等于一个小格的宽度就继承上个时间标记的高度继续计算定位，即错位显示
+
+
+        if (x - prevLeft <= xCellWidth) {
+          Object.assign(condition, prevCondition);
+        }
 
         if (_this13.isLimit(item[0])) {
           var pointList = [];
@@ -5263,10 +5309,14 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
               return _ref3.apply(this, arguments);
             };
           }());
+          prevLeft = x;
+          prevCondition = condition;
           Promise.all(pointList).then(function (res) {
-            var _this13$canvas;
+            var _this13$markObjs, _this13$canvas;
 
-            return (_this13$canvas = _this13.canvas).add.apply(_this13$canvas, Object(toConsumableArray["a" /* default */])(res));
+            (_this13$markObjs = _this13.markObjs).push.apply(_this13$markObjs, Object(toConsumableArray["a" /* default */])(res));
+
+            (_this13$canvas = _this13.canvas).add.apply(_this13$canvas, Object(toConsumableArray["a" /* default */])(res));
           });
         }
       });
@@ -5386,19 +5436,56 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
           };
 
           _this15.$emit('markChange', value);
+
+          _this15.updateMarkData(value);
+
+          _this15.drawBottomTextDataGroup();
+
+          _this15.canvas.discardActiveObject();
         });
       }
     },
+    updateMarkData: function updateMarkData(_ref4) {
+      var data = _ref4.data,
+          newVal = _ref4.newVal;
+      var id = data.id;
+      var listIndex, index;
+      listIndex = this.markData.findIndex(function (v) {
+        var i = v[1].findIndex(function (k) {
+          var _k$data;
+
+          return ((_k$data = k.data) === null || _k$data === void 0 ? void 0 : _k$data.id) === id;
+        });
+        i > -1 && (index = i);
+        return i > -1;
+      });
+      var obj = this.markData[listIndex][1].splice(index, 1)[0];
+      var newIndex = this.markData.findIndex(function (v) {
+        return v[0] === newVal;
+      });
+
+      if (!~newIndex) {
+        this.markData.push([newVal, [obj]]);
+      } else {
+        this.markData[newIndex][1].push(obj);
+      }
+
+      var emptyIndex = this.markData.findIndex(function (v) {
+        return v[1].length === 0;
+      });
+      !!~emptyIndex && this.markData.splice(emptyIndex, 1);
+      sortByTime(this.markData);
+    },
     moveLimit: function moveLimit(point) {
       var _point$other;
 
       point.setCoords();
-      var _this$propItems7 = this.propItems,
-          originX = _this$propItems7.originX,
-          endX = _this$propItems7.endX,
-          originY = _this$propItems7.originY,
-          endY = _this$propItems7.endY,
-          markHeight = _this$propItems7.markHeight;
+      var _this$propItems8 = this.propItems,
+          originX = _this$propItems8.originX,
+          endX = _this$propItems8.endX,
+          originY = _this$propItems8.originY,
+          endY = _this$propItems8.endY,
+          markHeight = _this$propItems8.markHeight;
       var bottom = this.templateData.bottom; // 如果是起始标记，如入手术室时间
 
       if ((_point$other = point.other) !== null && _point$other !== void 0 && _point$other.isStart) {
@@ -5435,17 +5522,17 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
         var leftId = (_point$other2 = point.other) === null || _point$other2 === void 0 ? void 0 : _point$other2.limitLeft;
         var limitLeftTime = leftId ? bottom.list.find(function (v) {
           return v[1].some(function (k) {
-            var _k$data, _k$data2;
+            var _k$data2, _k$data3;
 
-            return ((_k$data = k.data) === null || _k$data === void 0 ? void 0 : _k$data.id) && ((_k$data2 = k.data) === null || _k$data2 === void 0 ? void 0 : _k$data2.id) === leftId;
+            return ((_k$data2 = k.data) === null || _k$data2 === void 0 ? void 0 : _k$data2.id) && ((_k$data3 = k.data) === null || _k$data3 === void 0 ? void 0 : _k$data3.id) === leftId;
           });
         })[0] : null;
         var rightId = (_point$other3 = point.other) === null || _point$other3 === void 0 ? void 0 : _point$other3.limitRight;
         var limitRightTime = rightId ? bottom.list.find(function (v) {
           return v[1].some(function (k) {
-            var _k$data3, _k$data4;
+            var _k$data4, _k$data5;
 
-            return ((_k$data3 = k.data) === null || _k$data3 === void 0 ? void 0 : _k$data3.id) && ((_k$data4 = k.data) === null || _k$data4 === void 0 ? void 0 : _k$data4.id) === rightId;
+            return ((_k$data4 = k.data) === null || _k$data4 === void 0 ? void 0 : _k$data4.id) && ((_k$data5 = k.data) === null || _k$data5 === void 0 ? void 0 : _k$data5.id) === rightId;
           });
         })[0] : null;
         var limitLeft = limitLeftTime && !startList || limitLeftTime && startList && new Date(limitLeftTime).getTime() >= new Date(startList[0]).getTime() ? this.computedX(limitLeftTime) : !limitLeftTime && startList || limitLeftTime && startList && new Date(limitLeftTime).getTime() < new Date(startList[0]).getTime() ? this.computedX(startList[0]) : originX;
@@ -5492,12 +5579,12 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
     },
     drawLeftScaleGroup: function drawLeftScaleGroup(dataLeft) {
       this.drawLeftTitle(dataLeft);
-      var _this$propItems8 = this.propItems,
-          endY = _this$propItems8.endY,
-          markHeight = _this$propItems8.markHeight,
-          originX = _this$propItems8.originX,
-          originY = _this$propItems8.originY,
-          treeTableminCellWidth = _this$propItems8.treeTableminCellWidth;
+      var _this$propItems9 = this.propItems,
+          endY = _this$propItems9.endY,
+          markHeight = _this$propItems9.markHeight,
+          originX = _this$propItems9.originX,
+          originY = _this$propItems9.originY,
+          treeTableminCellWidth = _this$propItems9.treeTableminCellWidth;
       var rect = new this.fabric.Rect(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({
         left: treeTableminCellWidth,
         top: originY,
@@ -5513,11 +5600,11 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
     },
     drawLeftTitle: function drawLeftTitle(dataLeft) {
       if (dataLeft.title) {
-        var _this$propItems9 = this.propItems,
-            endY = _this$propItems9.endY,
-            markHeight = _this$propItems9.markHeight,
-            treeTableminCellWidth = _this$propItems9.treeTableminCellWidth,
-            originY = _this$propItems9.originY;
+        var _this$propItems10 = this.propItems,
+            endY = _this$propItems10.endY,
+            markHeight = _this$propItems10.markHeight,
+            treeTableminCellWidth = _this$propItems10.treeTableminCellWidth,
+            originY = _this$propItems10.originY;
         this.canvas.add(this.drawTextGroup({
           width: treeTableminCellWidth,
           height: endY + markHeight - originY
@@ -5543,8 +5630,8 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
 
 var FabricTextGroup_component = Object(componentNormalizer["a" /* default */])(
   fabric_chart_FabricTextGroupvue_type_script_lang_js_,
-  FabricTextGroupvue_type_template_id_92bb118e_render,
-  FabricTextGroupvue_type_template_id_92bb118e_staticRenderFns,
+  FabricTextGroupvue_type_template_id_7f8a6f64_render,
+  FabricTextGroupvue_type_template_id_7f8a6f64_staticRenderFns,
   false,
   null,
   null,
@@ -5553,14 +5640,14 @@ var FabricTextGroup_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var FabricTextGroup = (FabricTextGroup_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"77d0f074-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricScaleValue.vue?vue&type=template&id=68258044&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7abca1d8-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricScaleValue.vue?vue&type=template&id=68258044&
 var FabricScaleValuevue_type_template_id_68258044_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.show)?_c('TimeScaleValue',{attrs:{"times":_vm.timeList,"templateData":_vm.templateData}}):_vm._e()}
 var FabricScaleValuevue_type_template_id_68258044_staticRenderFns = []
 
 
 // CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricScaleValue.vue?vue&type=template&id=68258044&
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"77d0f074-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/components/TimeScaleValue.vue?vue&type=template&id=3492877c&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7abca1d8-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/components/TimeScaleValue.vue?vue&type=template&id=3492877c&scoped=true&
 var TimeScaleValuevue_type_template_id_3492877c_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.isShow),expression:"isShow"}],staticClass:"c-time-scalevalue",style:({ '--left': _vm.popupStyle.left, '--top': _vm.popupStyle.top, '--height': _vm.popupStyle.height, '--width': _vm.popupStyle.width })},_vm._l((_vm.times),function(item,index){return _c('span',{directives:[{name:"show",rawName:"v-show",value:(index % 2 == 0),expression:"index % 2 == 0"}],key:item.left,staticClass:"c-time-scalevalue-list",style:({ left: ((item.left - item.width / 2) + "px"), '--font-size': _vm.popupStyle.fontSize })},[_vm._v(" "+_vm._s(item.time)+" ")])}),0)}
 var TimeScaleValuevue_type_template_id_3492877c_scoped_true_staticRenderFns = []
 
@@ -5944,7 +6031,7 @@ var FabricScaleValue_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var FabricScaleValue = (FabricScaleValue_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"77d0f074-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricLines.vue?vue&type=template&id=74aef744&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7abca1d8-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricLines.vue?vue&type=template&id=74aef744&
 var FabricLinesvue_type_template_id_74aef744_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"line"},[_c('MouseRightClick',{directives:[{name:"show",rawName:"v-show",value:(_vm.isRightVisible),expression:"isRightVisible"}],attrs:{"getContainer":_vm.getContainer,"nodeList":_vm.rightClickNode,"rightPos":_vm.rightPos},on:{"nodeClick":_vm.handleRightClick,"closeRight":function($event){_vm.isRightVisible = false}}}),_c('DropPopup',{directives:[{name:"show",rawName:"v-show",value:(_vm.isDropVisible),expression:"isDropVisible"}],attrs:{"val":_vm.dropVal,"dropPos":_vm.dropPos}})],1)}
 var FabricLinesvue_type_template_id_74aef744_staticRenderFns = []
 
@@ -8345,6 +8432,13 @@ module.exports = classof(global.process) == 'process';
 module.exports = typeof window == 'object';
 
 
+/***/ }),
+
+/***/ "60bb":
+/***/ (function(module, exports) {
+
+module.exports = require("lodash");
+
 /***/ }),
 
 /***/ "60da":