cnhis-design-vue 2.1.100 → 2.1.102

package/es/fabric-chart/index.js

@@ -288,12 +288,12 @@ 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":"7ebb9ffc-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=bbb2d972&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"0fee42d6-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=3aefcf44&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({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 = []
 
 
-// CONCATENATED MODULE: ./packages/fabric-chart/src/FabricChart.vue?vue&type=template&id=bbb2d972&scoped=true&
+// CONCATENATED MODULE: ./packages/fabric-chart/src/FabricChart.vue?vue&type=template&id=3aefcf44&scoped=true&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/objectSpread2.js
 var objectSpread2 = __webpack_require__("5530");
@@ -301,12 +301,12 @@ 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":"7ebb9ffc-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=198a3c0c&
-var FabricCanvasvue_type_template_id_198a3c0c_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_198a3c0c_staticRenderFns = []
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"0fee42d6-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=7911dd3e&
+var FabricCanvasvue_type_template_id_7911dd3e_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_7911dd3e_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricCanvas.vue?vue&type=template&id=198a3c0c&
+// CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricCanvas.vue?vue&type=template&id=7911dd3e&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/toConsumableArray.js + 3 modules
 var toConsumableArray = __webpack_require__("2909");
@@ -537,6 +537,7 @@ var vexutils_default = /*#__PURE__*/__webpack_require__.n(vexutils_);
     }
 
     this.throttleEvent = vexutils_default.a.throttle(function (event, componentInstance) {
+      if (!componentInstance) return;
       var _componentInstance$ev = componentInstance.eventStyle,
           eventStyle = _componentInstance$ev === void 0 ? null : _componentInstance$ev,
           _componentInstance$ha = componentInstance.handleMoving,
@@ -727,7 +728,7 @@ var vexutils_default = /*#__PURE__*/__webpack_require__.n(vexutils_);
       var _this$$slots$default$;
 
       return (_this$$slots$default$ = this.$slots.default.find(function (VNode) {
-        return /lines/.test(VNode.tag);
+        return /fabric-lines/.test(VNode.tag);
       })) === null || _this$$slots$default$ === void 0 ? void 0 : _this$$slots$default$.componentInstance;
     },
     fabricPolylinesInstances: function fabricPolylinesInstances() {
@@ -744,18 +745,21 @@ var vexutils_default = /*#__PURE__*/__webpack_require__.n(vexutils_);
   },
   methods: {
     init: function init() {
-      var _this$templateData$to13,
-          _this$templateData$to14,
+      var _top$list,
           _this3 = this;
 
+      var _this$templateData = this.templateData,
+          canvasWidth = _this$templateData.canvasWidth,
+          canvasHeight = _this$templateData.canvasHeight,
+          top = _this$templateData.top;
       this.canvas = new this.fabric.Canvas(this.id, Object(objectSpread2["a" /* default */])({
-        width: this.templateData.canvasWidth,
-        height: this.templateData.canvasHeight
+        width: canvasWidth,
+        height: canvasHeight
       }, this.canvasAttr));
 
-      if ((_this$templateData$to13 = this.templateData.top) !== null && _this$templateData$to13 !== void 0 && (_this$templateData$to14 = _this$templateData$to13.list) !== null && _this$templateData$to14 !== void 0 && _this$templateData$to14.length) {
-        this.getGridYnumberTop(this.templateData.top.list);
-        this.treeList = this.setTreeStyle(vexutils_default.a.clone(this.templateData.top.list, true));
+      if ((typeof (top === null || top === void 0 ? void 0 : top.show) === 'undefined' || top !== null && top !== void 0 && top.show) && top !== null && top !== void 0 && (_top$list = top.list) !== null && _top$list !== void 0 && _top$list.length) {
+        this.getGridYnumberTop(top.list);
+        this.treeList = this.setTreeStyle(vexutils_default.a.clone(top.list, true));
       }
 
       this.canvas.on('mouse:move', function (event) {
@@ -779,10 +783,10 @@ var vexutils_default = /*#__PURE__*/__webpack_require__.n(vexutils_);
           var _this3$throttleEvent2;
 
           (_this3$throttleEvent2 = _this3.throttleEvent) === null || _this3$throttleEvent2 === void 0 ? void 0 : _this3$throttleEvent2.call(_this3, event, _this3.fabricPolylinesInstances);
-          _this3.fabricLinesInstances.isDropVisible = false;
+          if (_this3.fabricLinesInstances) _this3.fabricLinesInstances.isDropVisible = false;
         } else if (x <= originX || x >= endX || !(y > originY && y < endY || y > originYTop && y < endYTop)) {
           _this3.fabricPolylinesInstances.isDropVisible = false;
-          _this3.fabricLinesInstances.isDropVisible = false;
+          if (_this3.fabricLinesInstances) _this3.fabricLinesInstances.isDropVisible = false;
         }
       });
     },
@@ -856,9 +860,9 @@ var vexutils_default = /*#__PURE__*/__webpack_require__.n(vexutils_);
       var _node = arguments.length > 2 ? arguments[2] : undefined;
 
       var arr = [];
-      var _this$templateData$to15 = this.templateData.top,
-          treeTableminCellWidth = _this$templateData$to15.treeTableminCellWidth,
-          treeTableminCellHeight = _this$templateData$to15.treeTableminCellHeight;
+      var _this$templateData$to13 = this.templateData.top,
+          treeTableminCellWidth = _this$templateData$to13.treeTableminCellWidth,
+          treeTableminCellHeight = _this$templateData$to13.treeTableminCellHeight;
 
       for (var i = 0; i < list.length; i++) {
         var _node$children;
@@ -946,8 +950,8 @@ var componentNormalizer = __webpack_require__("2877");
 
 var component = Object(componentNormalizer["a" /* default */])(
   fabric_chart_FabricCanvasvue_type_script_lang_js_,
-  FabricCanvasvue_type_template_id_198a3c0c_render,
-  FabricCanvasvue_type_template_id_198a3c0c_staticRenderFns,
+  FabricCanvasvue_type_template_id_7911dd3e_render,
+  FabricCanvasvue_type_template_id_7911dd3e_staticRenderFns,
   false,
   null,
   null,
@@ -956,12 +960,12 @@ 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":"7ebb9ffc-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=2dfd3d2b&
-var FabricPolylinesvue_type_template_id_2dfd3d2b_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_2dfd3d2b_staticRenderFns = []
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"0fee42d6-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=181e62f0&
+var FabricPolylinesvue_type_template_id_181e62f0_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_181e62f0_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricPolylines.vue?vue&type=template&id=2dfd3d2b&
+// CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricPolylines.vue?vue&type=template&id=181e62f0&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/asyncToGenerator.js
 var asyncToGenerator = __webpack_require__("1da1");
@@ -1277,7 +1281,7 @@ var type_isObject = function isObject(obj) {
       return new this.fabric.Circle(Object(objectSpread2["a" /* default */])({
         objectCaching: false,
         strokeWidth: 1,
-        radius: data.width / 2,
+        radius: data.width ? data.width / 2 : data.radius,
         scale: 1,
         fill: '#fff'
       }, data));
@@ -1629,7 +1633,7 @@ var type_isObject = function isObject(obj) {
     }
   }
 });
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7ebb9ffc-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":"0fee42d6-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 = []
 
@@ -1737,7 +1741,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":"7ebb9ffc-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":"0fee42d6-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 = []
 
@@ -1921,10 +1925,11 @@ function resetPointColor(pointArr, color) {
 }
 
 var setPointLineColor = function setPointLineColor(point, color, conditionHasLine2) {
-  var _point$line, _point$line2;
+  var _point$prevPoint, _point$prevPoint$__at, _point$prevPoint$__at2, _point$line, _point$line2;
 
+  var line1Color = color === 'transparent' ? color : ((_point$prevPoint = point.prevPoint) === null || _point$prevPoint === void 0 ? void 0 : (_point$prevPoint$__at = _point$prevPoint.__attrs) === null || _point$prevPoint$__at === void 0 ? void 0 : (_point$prevPoint$__at2 = _point$prevPoint$__at.lineAttr) === null || _point$prevPoint$__at2 === void 0 ? void 0 : _point$prevPoint$__at2.stroke) || color;
   (_point$line = point.line1) === null || _point$line === void 0 ? void 0 : _point$line.set({
-    stroke: color
+    stroke: line1Color
   });
   conditionHasLine2 && ((_point$line2 = point.line2) === null || _point$line2 === void 0 ? void 0 : _point$line2.set({
     stroke: color
@@ -2081,11 +2086,9 @@ var rightClickNodeConnect = [{
         _this4.isSelectArea = false;
 
         if (event.button === 1 && _this4.selectArea) {
-          var points = _this4.selectArea.ponits;
-
-          var _this4$getAreaPonits = _this4.getAreaPonits(points),
-              polylineList = _this4$getAreaPonits.polylineList,
-              otherList = _this4$getAreaPonits.otherList;
+          var _this4$getAreaPoints = _this4.getAreaPoints(),
+              polylineList = _this4$getAreaPoints.polylineList,
+              otherList = _this4$getAreaPoints.otherList;
 
           !polylineList.length && !otherList.length && _this4.removeSelectArea();
 
@@ -2101,10 +2104,7 @@ var rightClickNodeConnect = [{
           }
         }
       });
-      var selectAreaOrigin = {
-        left: 0,
-        top: 0
-      };
+      var startPos;
       this.canvas.on('mouse:down', function (event) {
         if (event.button !== 1) return; // 处理时间范围选区
 
@@ -2168,12 +2168,11 @@ var rightClickNodeConnect = [{
 
         if (!event.target) {
           _this4.isSelectArea = true;
-          selectAreaOrigin.left = event.pointer.x;
-          selectAreaOrigin.top = event.pointer.y;
+          startPos = event.pointer;
         }
       });
       this.canvas.on('mouse:move', function (event) {
-        _this4.isSelectArea && _this4.createSelectArea(event, selectAreaOrigin);
+        _this4.isSelectArea && _this4.createSelectArea(event, startPos);
 
         _this4.setTimeRange(event.pointer);
       });
@@ -2199,17 +2198,33 @@ var rightClickNodeConnect = [{
       this.movingShowPopup(movingPopupContentList);
     },
     // 获取选区内包含的节点
-    getAreaPonits: function getAreaPonits(points) {
-      var _this5 = this;
+    getAreaPoints: function getAreaPoints() {
+      var _this$selectArea,
+          _this5 = this;
 
       var polylineList = [];
       var otherList = [];
-
-      var _points = Object(slicedToArray["a" /* default */])(points, 4),
-          x1 = _points[0],
-          y1 = _points[1],
-          x2 = _points[2],
-          y2 = _points[3];
+      if (!((_this$selectArea = this.selectArea) !== null && _this$selectArea !== void 0 && _this$selectArea.areaPos)) return {
+        polylineList: polylineList,
+        otherList: otherList
+      };
+      var _this$selectArea$area = this.selectArea.areaPos,
+          startPos = _this$selectArea$area.startPos,
+          endPos = _this$selectArea$area.endPos;
+
+      var _sort3 = [startPos.x, endPos.x].sort(function (a, b) {
+        return a - b;
+      }),
+          _sort4 = Object(slicedToArray["a" /* default */])(_sort3, 2),
+          x1 = _sort4[0],
+          x2 = _sort4[1];
+
+      var _sort5 = [startPos.y, endPos.y].sort(function (a, b) {
+        return a - b;
+      }),
+          _sort6 = Object(slicedToArray["a" /* default */])(_sort5, 2),
+          y1 = _sort6[0],
+          y2 = _sort6[1];
 
       this.canvas.forEachObject(function (obj) {
         var id = obj.id,
@@ -2220,7 +2235,7 @@ var rightClickNodeConnect = [{
 
         if (isArea && _this5.isGridLimit(left, top) && id) {
           if (/_polyline(Point)_/.test(id)) {
-            var data = _this5.getDataById(id);
+            var data = _this5.getDataByPoint(obj);
 
             if (currentDelPoint) {
               if (currentDelPoint.polylineIndex == obj.polylineIndex) {
@@ -2232,12 +2247,12 @@ var rightClickNodeConnect = [{
           }
 
           if (id.includes('_other') && obj.type === 'list' && !_this5.currentDelPoint) {
-            var _data = {
+            var _data2 = {
               type: obj.type,
               index: obj.index,
               dataIndex: obj.dataIndex
             };
-            otherList.push(_data);
+            otherList.push(_data2);
           }
         }
       });
@@ -2252,23 +2267,25 @@ var rightClickNodeConnect = [{
       };
     },
     // 创建选区
-    createSelectArea: function createSelectArea(event, selectAreaOrigin) {
+    createSelectArea: function createSelectArea(event, startPos) {
       this.selectArea && this.canvas.remove(this.selectArea);
-      var _ref = [selectAreaOrigin.left, selectAreaOrigin.top],
-          x1 = _ref[0],
-          y1 = _ref[1];
-      var _ref2 = [event.pointer.x, event.pointer.y],
-          x2 = _ref2[0],
-          y2 = _ref2[1];
+      var x1 = startPos.x,
+          y1 = startPos.y;
+      var _event$pointer2 = event.pointer,
+          x2 = _event$pointer2.x,
+          y2 = _event$pointer2.y;
       this.selectArea = new this.fabric.Rect(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, defaultVaule.style), {}, {
         fill: '#CAF982',
         opacity: 0.4,
         left: x1,
         top: y1,
         width: x2 - x1,
-        height: y2 - y1,
-        ponits: x1 < x2 ? [x1, y1, x2, y2] : [x2, y2, x1, y1]
+        height: y2 - y1
       }));
+      this.selectArea.areaPos = {
+        startPos: startPos,
+        endPos: event.pointer
+      };
       this.canvas.add(this.selectArea);
     },
     createTimeRangeLine: function createTimeRangeLine(line, pointer) {
@@ -2333,7 +2350,21 @@ var rightClickNodeConnect = [{
       var maxTime = Math.max.apply(Math, Object(toConsumableArray["a" /* default */])(xScaleList));
       this.polyline.forEach(function (item, index) {
         item.dataList.forEach(function (v, i) {
-          var point = v.list.find(function (k) {
+          var targetList = v.list;
+          var linkKey = '';
+
+          if (v.linkKey) {
+            var target = item.dataList.find(function (_data) {
+              return _data.key === v.linkKey;
+            });
+
+            if (target) {
+              targetList = target.list;
+              linkKey = v.linkKey;
+            }
+          }
+
+          var point = targetList.find(function (k) {
             return isEffectiveNode(k) && new Date(k.time).getTime() >= minTime && new Date(k.time).getTime() <= maxTime;
           });
           var firstPointLeft = point ? _this7.cumputedX(point.time) : 0;
@@ -2348,7 +2379,14 @@ var rightClickNodeConnect = [{
             polylineTypeId: index,
             polylineIndex: i,
             isAdd: isAdd,
-            rightLimit: rightLimit
+            rightLimit: rightLimit,
+            __attrs: {
+              title: v.title,
+              pointAttr: v.pointAttr,
+              lineAttr: v.pointAttr,
+              key: v.key,
+              linkKey: linkKey
+            }
           });
         });
       }); // 配置左侧title图标（但不是折线项目）
@@ -2377,7 +2415,7 @@ var rightClickNodeConnect = [{
         evented: false
       };
       leftTitleList.forEach( /*#__PURE__*/function () {
-        var _ref3 = Object(asyncToGenerator["a" /* default */])( /*#__PURE__*/regeneratorRuntime.mark(function _callee(v, i) {
+        var _ref = Object(asyncToGenerator["a" /* default */])( /*#__PURE__*/regeneratorRuntime.mark(function _callee(v, i) {
           var _v$pointAttr2;
 
           var baseTop, top, left, pointId, _v$pointAttr, _v$pointAttr$fill, fillColor, stroke, text, iconLeft, option, ele, icon, originTop, cloneIconId, maxVal;
@@ -2413,7 +2451,8 @@ var rightClickNodeConnect = [{
                     polylineTypeId: v.polylineTypeId,
                     polylineIndex: v.polylineIndex
                   }, v.isAdd && _this7.eventStyle.evented ? {} : eventStyle), {}, {
-                    rightLimit: v.rightLimit || ''
+                    rightLimit: v.rightLimit || '',
+                    __attrs: v.__attrs
                   });
 
                   if (!(v.type === 'img' && (_v$pointAttr2 = v.pointAttr) !== null && _v$pointAttr2 !== void 0 && _v$pointAttr2.iconClassName)) {
@@ -2529,7 +2568,7 @@ var rightClickNodeConnect = [{
         }));
 
         return function (_x, _x2) {
-          return _ref3.apply(this, arguments);
+          return _ref.apply(this, arguments);
         };
       }());
     },
@@ -2609,20 +2648,20 @@ var rightClickNodeConnect = [{
       });
     },
     // 创建危急值和差异值
-    createAttrVaule: function createAttrVaule(_ref4) {
+    createAttrVaule: function createAttrVaule(_ref2) {
       var _this10 = this,
           _this$canvas;
 
-      var attr = _ref4.attr,
-          polyline = _ref4.polyline,
-          polylineIndex = _ref4.polylineIndex,
-          polylineType = _ref4.polylineType,
-          polylineTypeId = _ref4.polylineTypeId;
+      var attr = _ref2.attr,
+          polyline = _ref2.polyline,
+          polylineIndex = _ref2.polylineIndex,
+          polylineType = _ref2.polylineType,
+          polylineTypeId = _ref2.polylineTypeId;
       var list = polyline.list;
 
-      var _ref5 = polyline[attr] || {},
-          max = _ref5.max,
-          min = _ref5.min;
+      var _ref3 = polyline[attr] || {},
+          max = _ref3.max,
+          min = _ref3.min;
 
       if (!max && !min) return;
       var _this$propItems5 = this.propItems,
@@ -2636,9 +2675,9 @@ var rightClickNodeConnect = [{
       });
       var lines = [];
 
-      var drawLine = function drawLine(_ref6) {
-        var value = _ref6.value,
-            lineStyle = _ref6.lineStyle;
+      var drawLine = function drawLine(_ref4) {
+        var value = _ref4.value,
+            lineStyle = _ref4.lineStyle;
 
         var top = _this10.cumputedY(polylineType, +value);
 
@@ -2649,9 +2688,9 @@ var rightClickNodeConnect = [{
         }, lineStyle || defaultVaule.criticalStyle));
       };
 
-      var drawText = function drawText(_ref7, top) {
-        var name = _ref7.name,
-            nameStyle = _ref7.nameStyle;
+      var drawText = function drawText(_ref5, top) {
+        var name = _ref5.name,
+            nameStyle = _ref5.nameStyle;
         return new _this10.fabric.Text(String(name || ''), Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, defaultVaule.style), defaultVaule.textStyle), nameStyle), {}, {
           originY: 'bottom',
           left: originX + 5,
@@ -2696,15 +2735,12 @@ var rightClickNodeConnect = [{
       var _this$propItems6 = this.propItems,
           originY = _this$propItems6.originY,
           endY = _this$propItems6.endY;
-      var pointAttr = polyline.pointAttr,
-          lineAttr = polyline.lineAttr,
-          _polyline$list = polyline.list,
+      var _polyline$list = polyline.list,
           list = _polyline$list === void 0 ? [] : _polyline$list,
           _polyline$critical = polyline.critical,
           critical = _polyline$critical === void 0 ? {} : _polyline$critical,
           _polyline$diffValue = polyline.diffValue,
           diffValue = _polyline$diffValue === void 0 ? {} : _polyline$diffValue;
-      this._iconClassName = polyline.type === 'img' && pointAttr.iconClassName ? pointAttr.iconClassName : '';
       var pointList = [];
       var lineList = [];
 
@@ -2733,7 +2769,24 @@ var rightClickNodeConnect = [{
         return point.polylineTypeId !== polylineTypeId && point.polylineIndex !== polylineIndex;
       });
       list.forEach(function (linePoints, index) {
-        // 当前点
+        var pointAttr = polyline.pointAttr,
+            _polyline$lineAttr = polyline.lineAttr,
+            lineAttr = _polyline$lineAttr === void 0 ? {} : _polyline$lineAttr,
+            type = polyline.type,
+            title = polyline.title;
+        var target = polylineType.dataList.find(function (_data) {
+          return linePoints.key && _data.key === linePoints.key;
+        });
+
+        if (target) {
+          type = target.type;
+          pointAttr = target.pointAttr;
+          lineAttr = target.lineAttr;
+          title = target.title;
+        }
+
+        _this11._iconClassName = polyline.type === 'img' && pointAttr.iconClassName ? pointAttr.iconClassName : ''; // 当前点
+
         var _getPointer = getPointer(linePoints),
             points = _getPointer.points,
             isInit = _getPointer.isInit; // 下一个点
@@ -2767,9 +2820,16 @@ var rightClickNodeConnect = [{
             originLeft: points[0],
             originTop: points[1],
             time: linePoints.time,
-            __value: linePoints.value
+            __value: linePoints.value,
+            __attrs: {
+              type: type,
+              pointAttr: pointAttr,
+              lineAttr: lineAttr,
+              title: title,
+              key: linePoints.key
+            }
           });
-          point = previousLine ? _this11.drawPoint.apply(_this11, Object(toConsumableArray["a" /* default */])(points).concat([previousLine, line, polyline.type, pointOthers, isInit])) : _this11.drawPoint.apply(_this11, Object(toConsumableArray["a" /* default */])(points).concat([null, line, polyline.type, pointOthers, isInit]));
+          point = previousLine ? _this11.drawPoint.apply(_this11, Object(toConsumableArray["a" /* default */])(points).concat([previousLine, line, type, pointOthers, isInit])) : _this11.drawPoint.apply(_this11, Object(toConsumableArray["a" /* default */])(points).concat([null, line, type, pointOthers, isInit]));
         }
 
         lineList.push(line);
@@ -2797,7 +2857,6 @@ var rightClickNodeConnect = [{
             polylineTypeId: polylineTypeId,
             polylineIndex: polylineIndex,
             pointerList: pointerList,
-            color: lineAttr.stroke,
             pointList: res
           });
         }
@@ -2992,7 +3051,8 @@ var rightClickNodeConnect = [{
     },
     // 拖动停止后 设置回调触发方法
     setEmitFunction: function setEmitFunction(point) {
-      var _this14 = this;
+      var _point$__attrs,
+          _this14 = this;
 
       var isInit = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       var operable = this.propItems.operable;
@@ -3003,17 +3063,19 @@ var rightClickNodeConnect = [{
           y = _this$getValue.y;
 
       Object.assign(data, {
-        value: {
+        value: Object(objectSpread2["a" /* default */])({
           time: operable.lockMovementX ? point.time : x,
           value: y
-        },
+        }, (_point$__attrs = point.__attrs) !== null && _point$__attrs !== void 0 && _point$__attrs.key ? {
+          key: point.__attrs.key
+        } : {}),
         isInit: isInit
       });
 
       if (this.addPointList.length === 0) {
-        var _point$prevPoint, _point$nextPoint;
+        var _point$prevPoint2, _point$nextPoint;
 
-        if ((_point$prevPoint = point.prevPoint) !== null && _point$prevPoint !== void 0 && _point$prevPoint.time.includes(x) || (_point$nextPoint = point.nextPoint) !== null && _point$nextPoint !== void 0 && _point$nextPoint.time.includes(x)) {
+        if ((_point$prevPoint2 = point.prevPoint) !== null && _point$prevPoint2 !== void 0 && _point$prevPoint2.time.includes(x) || (_point$nextPoint = point.nextPoint) !== null && _point$nextPoint !== void 0 && _point$nextPoint.time.includes(x)) {
           // 此方法更新节点后其事件都失效了，暂时采用下方repaintPolyline方法更新整条节点
           // point.setCoords();
           // point.set('left', point.originLeft);
@@ -3040,13 +3102,15 @@ var rightClickNodeConnect = [{
 
 
         if (point.get('scaleX') !== point.scale) {
-          var _this$_concatPoint, _this$_concatPoint2;
+          var _this$_concatPoint, _this$_concatPoint2, _point$__attrs2;
 
           var addOjb = Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, lastPoint), {}, {
-            value: {
+            value: Object(objectSpread2["a" /* default */])({
               time: this.getXValue((_this$_concatPoint = this._concatPoint) === null || _this$_concatPoint === void 0 ? void 0 : _this$_concatPoint.left),
               value: this.getYValue(position, (_this$_concatPoint2 = this._concatPoint) === null || _this$_concatPoint2 === void 0 ? void 0 : _this$_concatPoint2.top)
-            }
+            }, (_point$__attrs2 = point.__attrs) !== null && _point$__attrs2 !== void 0 && _point$__attrs2.key ? {
+              key: point.__attrs.key
+            } : {})
           });
 
           if (lastPoint.value.time == addOjb.value.time) {
@@ -3086,12 +3150,15 @@ var rightClickNodeConnect = [{
           x = _this$getValue2.x,
           y = _this$getValue2.y;
 
-      data.value = {
+      data.value = Object(objectSpread2["a" /* default */])({
         time: x,
         value: y
-      };
+      }, point.__attrs.linkKey ? {
+        key: point.__attrs.key
+      } : {});
       data.left = point.left;
       data.top = top;
+      if (point.__attrs.linkKey) data.linkKey = point.__attrs.linkKey;
       this.addPointList.push(data);
     },
     // 纠正线段坐标
@@ -3176,6 +3243,7 @@ var rightClickNodeConnect = [{
                   cloneObj.top = prePoint.top + spaceHeight;
                   cloneObj.value.time = _this16.getXValue(curLeft);
                   cloneObj.value.value = _this16.getYValue(position, cloneObj.top);
+                  if (point.__attrs.key) cloneObj.value.key = point.__attrs.key;
                   cloneObj.left = curLeft;
 
                   _this16.addPointList.splice(index, 0, cloneObj);
@@ -3242,6 +3310,7 @@ var rightClickNodeConnect = [{
                 time: x,
                 value: y
               };
+              if (point.__attrs.key) data.value.key = point.__attrs.key;
               data.left = left;
               data.top = top; // 避免重复添加
 
@@ -3282,6 +3351,7 @@ var rightClickNodeConnect = [{
 
       var polylineTypeId = point.polylineTypeId,
           polylineIndex = point.polylineIndex;
+      var color = point.__attrs.lineAttr.stroke;
       var polylineObj = this.polylinePointList.find(function (v) {
         return v.polylineTypeId == polylineTypeId && v.polylineIndex == polylineIndex;
       });
@@ -3321,15 +3391,16 @@ var rightClickNodeConnect = [{
           } else {
             var _obj$line2;
 
-            resetPointColor([obj], polylineObj.color);
+            var _color = obj.__attrs.lineAttr.stroke;
+            resetPointColor([obj], _color);
             (_obj$line2 = obj.line2) === null || _obj$line2 === void 0 ? void 0 : _obj$line2.set({
-              stroke: polylineObj.color
+              stroke: _color
             });
           }
         });
 
         if ((point.line1 || point.line2) && left < originLeft + this.spaceWidth) {
-          setPointLineColor(point, polylineObj.color, true);
+          setPointLineColor(point, color, true);
         } else {
           setPointLineColor(point, 'transparent', true);
         }
@@ -3344,7 +3415,7 @@ var rightClickNodeConnect = [{
         var endLength = this.addPointList.length;
 
         if (endLength === 0) {
-          setPointLineColor(point, polylineObj === null || polylineObj === void 0 ? void 0 : polylineObj.color, conditionHasLine2);
+          setPointLineColor(point, color, conditionHasLine2);
           this.removePolyline('increasePointBatch', originLeft);
         }
 
@@ -3358,21 +3429,20 @@ var rightClickNodeConnect = [{
     clonePoint: function clonePoint(point, points) {
       var _this17 = this;
 
-      var evented, selectable, lineIndex, polylineIndex, lineAttr, polylineTypeId;
-      evented = selectable = false;
-      lineAttr = Object(objectSpread2["a" /* default */])({}, point.lineAttr);
-      lineIndex = point.pointIndex;
-      polylineIndex = point.polylineIndex;
-      polylineTypeId = point.polylineTypeId;
+      var lineIndex = point.lineIndex,
+          polylineIndex = point.polylineIndex,
+          lineAttr = point.lineAttr,
+          polylineTypeId = point.polylineTypeId,
+          originLeft = point.originLeft;
+      var currentLineAttr = originLeft === points[2] && point.prevPoint ? point.prevPoint.__attrs.lineAttr : lineAttr;
       point.clone(function (clonedObj) {
         clonedObj.set({
           left: points[2],
           top: points[3],
           idClone: 'increasePointBatch',
-          id: '_polylinePoint_' + new Date().getTime(),
-          // 此id必须，用于remove节点的时候
+          id: '_polylinePoint_',
           polylineTypeId: polylineTypeId,
-          polylineIndex: point.polylineIndex,
+          polylineIndex: polylineIndex,
           scaleX: point.scale || 1,
           scaleY: point.scale || 1
         });
@@ -3380,9 +3450,9 @@ var rightClickNodeConnect = [{
         point.prePoints = [point.left, point.top];
 
         var line = _this17.drawLine(Object(toConsumableArray["a" /* default */])(points), Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({
-          evented: evented,
-          selectable: selectable
-        }, lineAttr), {}, {
+          evented: false,
+          selectable: false
+        }, currentLineAttr), {}, {
           polylineIndex: polylineIndex,
           polylineTypeId: polylineTypeId,
           lineIndex: lineIndex
@@ -3403,7 +3473,7 @@ var rightClickNodeConnect = [{
       var x = this.getXValue(point.left);
 
       if (point.id) {
-        var data = this.getDataById(point.id);
+        var data = this.getDataByPoint(point);
         var position = data.position;
         var y = this.getYValue(position, point.top);
         return {
@@ -3556,17 +3626,16 @@ var rightClickNodeConnect = [{
       });
     },
     // 关闭右键菜单，打开添加节点弹窗表单
-    handleRightClick: function handleRightClick(_ref8) {
+    handleRightClick: function handleRightClick(_ref6) {
       var _this$_currentPoint;
 
-      var type = _ref8.type,
-          name = _ref8.name;
+      var type = _ref6.type,
+          name = _ref6.name;
       this.isRightVisible = false;
-      var id = (_this$_currentPoint = this._currentPoint) === null || _this$_currentPoint === void 0 ? void 0 : _this$_currentPoint.id;
       var _this$_active = this._active,
           left = _this$_active.left,
           top = _this$_active.top;
-      var data = id ? this.getDataById(id) : this.getValue({
+      var data = (_this$_currentPoint = this._currentPoint) !== null && _this$_currentPoint !== void 0 && _this$_currentPoint.id ? this.getDataByPoint(this._currentPoint) : this.getValue({
         left: left,
         top: top
       });
@@ -3590,10 +3659,10 @@ var rightClickNodeConnect = [{
       this.$emit('pointOperation', type, data);
       this._currentPoint = null;
     },
-    getDataById: function getDataById(id) {
-      var _data$dataList, _data$dataList$lineIn, _data$dataList$lineIn2, _data$dataList$lineIn3, _data$dataList2;
+    getDataByPoint: function getDataByPoint(point) {
+      var _data$dataList, _data$dataList$lineIn, _data$dataList$lineIn2, _data$dataList$lineIn3;
 
-      var arr = id.replace(/_?[a-zA-Z]+.+$/, '').split('_');
+      var arr = point.id.replace(/_?[a-zA-Z]+.+$/, '').split('_');
 
       var _arr = Object(slicedToArray["a" /* default */])(arr, 3),
           typeIndex = _arr[0],
@@ -3603,10 +3672,10 @@ var rightClickNodeConnect = [{
       var data = this.polyline[typeIndex];
       var value = (data === null || data === void 0 ? void 0 : (_data$dataList = data.dataList) === null || _data$dataList === void 0 ? void 0 : (_data$dataList$lineIn = _data$dataList[lineIndex]) === null || _data$dataList$lineIn === void 0 ? void 0 : (_data$dataList$lineIn2 = _data$dataList$lineIn.list) === null || _data$dataList$lineIn2 === void 0 ? void 0 : (_data$dataList$lineIn3 = _data$dataList$lineIn2[pointIndex]) === null || _data$dataList$lineIn3 === void 0 ? void 0 : _data$dataList$lineIn3.data) || '';
       return {
-        title: (data === null || data === void 0 ? void 0 : (_data$dataList2 = data.dataList) === null || _data$dataList2 === void 0 ? void 0 : _data$dataList2[lineIndex].title) || '',
+        title: point.__attrs.title,
         position: data.position,
-        dataIndex: lineIndex,
-        pointIndex: pointIndex,
+        dataIndex: +lineIndex,
+        pointIndex: +pointIndex,
         data: value
       };
     },
@@ -3737,8 +3806,8 @@ var rightClickNodeConnect = [{
 
 var FabricPolylines_component = Object(componentNormalizer["a" /* default */])(
   fabric_chart_FabricPolylinesvue_type_script_lang_js_,
-  FabricPolylinesvue_type_template_id_2dfd3d2b_render,
-  FabricPolylinesvue_type_template_id_2dfd3d2b_staticRenderFns,
+  FabricPolylinesvue_type_template_id_181e62f0_render,
+  FabricPolylinesvue_type_template_id_181e62f0_staticRenderFns,
   false,
   null,
   null,
@@ -3844,12 +3913,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":"7ebb9ffc-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=2d7ac043&
-var FabricTextGroupvue_type_template_id_2d7ac043_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_2d7ac043_staticRenderFns = []
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"0fee42d6-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=1a9302e8&
+var FabricTextGroupvue_type_template_id_1a9302e8_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_1a9302e8_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricTextGroup.vue?vue&type=template&id=2d7ac043&
+// CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricTextGroup.vue?vue&type=template&id=1a9302e8&
 
 // 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&
 
@@ -3867,6 +3936,11 @@ var FabricTextGroupvue_type_template_id_2d7ac043_staticRenderFns = []
 
 
 
+
+
+
+
+
 
 
 
@@ -4060,12 +4134,7 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
       this.isRightVisible = false;
       var text = this._currentPoint;
       this._currentPoint = '';
-      var obj = {
-        type: text.type,
-        index: text.index,
-        dataIndex: text.dataIndex
-      };
-      this.$emit("".concat(type, "Other"), obj);
+      this.$emit("".concat(type, "Other"), this.getOtherParams(text, false));
     },
     removeOther: function removeOther() {
       var _this4 = this;
@@ -4171,34 +4240,53 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
       var _this7 = this,
           _this$canvas2;
 
-      var originY = this.propItems.originY;
+      var _this$propItems3 = this.propItems,
+          originY = _this$propItems3.originY,
+          endX = _this$propItems3.endX;
       var textList = [];
       colList.forEach(function (item, index) {
         var baseTop = originY + (item.marginTop || 10);
 
         if (_this7.isLimit(item.scalevalue)) {
+          var textItemPoints = [];
+
+          var left = _this7.cumputedX(item.scalevalue);
+
           item.dataList.forEach(function (v, i) {
             var top = baseTop + i * (item.lineHeight || 15);
             var text = new _this7.fabric.Text(String(v.value), Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, defaultVaule.style), defaultVaule.textStyle), item.style), {}, {
               originX: 'left',
               originY: 'center',
-              left: _this7.cumputedX(item.scalevalue),
+              left: left,
               top: top,
-              lockMovementX: true,
               lockMovementY: true,
               dataIndex: index,
               index: i,
               type: 'colList',
               id: "".concat(index, "_").concat(i, "_other_").concat(Date.now()),
               name: v.value,
-              objectCaching: false
+              objectCaching: false,
+              origin: Object(objectSpread2["a" /* default */])({
+                time: item.scalevalue
+              }, v)
             }, _this7.eventStyle));
-            text.hasControls = text.hasBorders = false;
+            textItemPoints.push(text);
 
-            _this7.setPopup(text);
+            _this7.pointOtherEvent(text);
 
             textList.push(text);
           });
+          var maxTextWidth = Math.max.apply(Math, Object(toConsumableArray["a" /* default */])(textItemPoints.map(function (obj) {
+            return obj.width;
+          })));
+          var isOverstep = left > endX - maxTextWidth;
+          textItemPoints.forEach(function (point, _, arr) {
+            point.maxTextWidth = maxTextWidth;
+            point.siblingPoints = arr.filter(function (_point) {
+              return _point.index !== point.index;
+            });
+            if (isOverstep) point.setCoords().set('originX', 'right');
+          });
         }
       });
 
@@ -4210,7 +4298,7 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
       return Object(asyncToGenerator["a" /* default */])( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
         var _this8$canvas;
 
-        var textList, _this8$propItems, originX, originY, top, index, len, _item$titleStyle, item, marginLeft, left, originOptions, title, _ref2, _ref2$icon, _icon, dataList, i, _len, v, commonOptions, _left2, icon, text, groupObj;
+        var textList, _this8$propItems, originX, originY, top, index, len, _item$titleStyle, item, marginLeft, left, originOptions, title, _ref2, _ref2$icon, _icon, dataList, prevPoint, i, _len, v, commonOptions, _left2, icon, text, groupObj;
 
         return regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
@@ -4223,7 +4311,7 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
 
               case 4:
                 if (!(index < len)) {
-                  _context.next = 35;
+                  _context.next = 37;
                   break;
                 }
 
@@ -4257,18 +4345,19 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
                 _ref2 = item || {}, _ref2$icon = _ref2.icon, _icon = _ref2$icon === void 0 ? {
                   type: 'circle'
                 } : _ref2$icon, dataList = _ref2.dataList;
+                prevPoint = void 0;
                 i = 0, _len = dataList.length;
 
-              case 15:
+              case 16:
                 if (!(i < _len)) {
-                  _context.next = 32;
+                  _context.next = 34;
                   break;
                 }
 
                 v = dataList[i];
 
                 if (!_this8.isLimit(v.time)) {
-                  _context.next = 29;
+                  _context.next = 31;
                   break;
                 }
 
@@ -4278,11 +4367,12 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
                   dataIndex: index,
                   index: i,
                   type: 'list',
-                  objectCaching: false
+                  objectCaching: false,
+                  origin: v
                 };
                 _left2 = _this8.cumputedX(v.time);
                 title.dataList.push(_left2);
-                _context.next = 23;
+                _context.next = 24;
                 return _this8.createPoint(_icon.type, Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({
                   originX: 'center',
                   left: _left2
@@ -4290,7 +4380,7 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
                   stroke: item.style.fill
                 } : {}), _icon.style || {}), commonOptions));
 
-              case 23:
+              case 24:
                 icon = _context.sent;
                 text = new _this8.fabric.Text(String(v.value), Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, defaultVaule.style), defaultVaule.textStyle), item.style), {}, {
                   left: _left2 + icon.width / 2,
@@ -4298,31 +4388,37 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
                 }, commonOptions));
                 groupObj = new _this8.fabric.Group([icon, text], Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({
                   id: "".concat(index, "_").concat(i, "_other_").concat(Date.now()),
-                  lockMovementX: true,
                   lockMovementY: true
                 }, commonOptions), _this8.eventStyle), {}, {
-                  realLeft: _left2
+                  realLeft: _left2,
+                  iconHalfWidth: icon.width / 2
                 }));
-                groupObj.hasControls = groupObj.hasBorders = false;
 
-                _this8.setPopup(groupObj);
+                if (prevPoint) {
+                  prevPoint.nextPoint = groupObj;
+                  groupObj.prevPoint = prevPoint;
+                }
+
+                prevPoint = groupObj;
+
+                _this8.pointOtherEvent(groupObj);
 
                 textList.push(groupObj);
 
-              case 29:
+              case 31:
                 i++;
-                _context.next = 15;
+                _context.next = 16;
                 break;
 
-              case 32:
+              case 34:
                 index++;
                 _context.next = 4;
                 break;
 
-              case 35:
+              case 37:
                 (_this8$canvas = _this8.canvas).add.apply(_this8$canvas, textList);
 
-              case 36:
+              case 38:
               case "end":
                 return _context.stop();
             }
@@ -4330,14 +4426,23 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
         }, _callee);
       }))();
     },
+    emitMouseoverTarget: function emitMouseoverTarget(point) {
+      if (point) {
+        bus.$emit('mouseoverTarget', true);
+        this.showDrapPopup(point, true);
+      } else {
+        !this.isRightVisible && bus.$emit('mouseoverTarget', false);
+        this.isDropVisible = false;
+      }
+    },
     setMovingEvent: function setMovingEvent(point) {
       var _this9 = this;
 
-      var _this$propItems3 = this.propItems,
-          originX = _this$propItems3.originX,
-          originY = _this$propItems3.originY,
-          endX = _this$propItems3.endX,
-          endY = _this$propItems3.endY;
+      var _this$propItems4 = this.propItems,
+          originX = _this$propItems4.originX,
+          originY = _this$propItems4.originY,
+          endX = _this$propItems4.endX,
+          endY = _this$propItems4.endY;
 
       var isLimit = function isLimit() {
         return point.left >= originX && point.left <= endX && point.top >= originY && point.top <= endY;
@@ -4356,12 +4461,9 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
         });
 
         if (isLimit()) {
-          bus.$emit('mouseoverTarget', true);
-
-          _this9.showDrapPopup(point, true);
+          _this9.emitMouseoverTarget(point);
         } else {
-          !_this9.isRightVisible && bus.$emit('mouseoverTarget', false);
-          _this9.isDropVisible = false;
+          _this9.emitMouseoverTarget();
         }
       });
       point.on('moved', function () {
@@ -4373,45 +4475,93 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
 
         _this9.drawTextDataGroup(_this9.templateData.other);
 
-        !_this9.isRightVisible && bus.$emit('mouseoverTarget', false);
-        _this9.isDropVisible = false;
+        _this9.emitMouseoverTarget();
 
         if (isLimit()) {
-          var type = point.type,
-              dataIndex = point.dataIndex,
-              left = point.left,
+          var left = point.left,
               dataList = point.dataList;
-
-          var time = _this9.getXValue(left);
-
           var index = dataList.findIndex(function (_left) {
             return _left > left;
           }); // 使用定时器，是因为：防止上方移除重绘过慢新增完后再次触发移除重绘导致页面多次重绘节点
 
           setTimeout(function () {
-            _this9.$emit('addOhter', {
-              type: type,
-              dataIndex: dataIndex,
-              index: !~index ? dataList.length ? dataList.length - 1 : 0 : index,
-              data: {
-                time: time
-              }
-            });
+            _this9.$emit('addOhter', Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, _this9.getOtherParams(point)), {}, {
+              index: !~index ? dataList.length ? dataList.length - 1 : 0 : index
+            }));
           });
         }
       });
     },
-    setPopup: function setPopup(point) {
+    pointOtherEvent: function pointOtherEvent(point) {
       var _this10 = this;
 
-      point.on('mouseover', function () {
-        bus.$emit('mouseoverTarget', true);
+      point.hasControls = point.hasBorders = false;
+      this.setPopup(point); // 移动中 实时更新相关联的线的坐标
+
+      if (this.eventStyle.evented) {
+        var _this$propItems5 = this.propItems,
+            endX = _this$propItems5.endX,
+            originX = _this$propItems5.originX;
+        point.on('moving', function () {
+          point.setCoords();
+          var prevPoint = point.prevPoint,
+              nextPoint = point.nextPoint;
+          var limitLeft = (prevPoint === null || prevPoint === void 0 ? void 0 : prevPoint.left) || originX;
+          var limitRight = (nextPoint === null || nextPoint === void 0 ? void 0 : nextPoint.left) || endX;
+          if (point.left > limitRight) point.set('left', limitRight);
+          if (point.left < limitLeft) point.set('left', limitLeft);
+          if (point.realLeft && point.iconHalfWidth) point.realLeft = point.left + point.iconHalfWidth;
+
+          if (point.maxTextWidth) {
+            var isOverstep = point.left + point.maxTextWidth > limitRight;
+
+            var _originX = isOverstep ? 'right' : 'left';
+
+            point.setCoords().set({
+              originX: _originX
+            });
+            point.siblingPoints.forEach(function (_point) {
+              return _point.setCoords().set({
+                originX: _originX,
+                left: point.left
+              });
+            });
+          }
 
-        _this10.showDrapPopup(point, true);
+          _this10.showDrapPopup(point);
+        });
+        point.on('moved', function () {
+          _this10.isDropVisible = false;
+
+          _this10.$emit('otherChange', _this10.getOtherParams(point));
+        });
+      }
+    },
+    getOtherParams: function getOtherParams(point) {
+      var isChange = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+      var type = point.type,
+          dataIndex = point.dataIndex,
+          left = point.left,
+          realLeft = point.realLeft,
+          origin = point.origin,
+          index = point.index;
+      return {
+        type: type,
+        dataIndex: dataIndex,
+        index: index,
+        data: Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, origin), isChange ? {
+          time: this.getXValue(realLeft !== null && realLeft !== void 0 ? realLeft : left)
+        } : {})
+      };
+    },
+    setPopup: function setPopup(point) {
+      var _this11 = this;
+
+      point.on('mouseover', function () {
+        return _this11.emitMouseoverTarget(point);
       });
       point.on('mouseout', function () {
-        !_this10.isRightVisible && bus.$emit('mouseoverTarget', false);
-        _this10.isDropVisible = false;
+        return _this11.emitMouseoverTarget();
       });
     },
     // 判断当前时间是否超出网格区域
@@ -4423,11 +4573,11 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
       return time >= minTime && time <= maxTime;
     },
     removeMark: function removeMark() {
-      var _this11 = this;
+      var _this12 = this;
 
       this.canvas.forEachObject(function (obj) {
         if (obj.type && obj.type === 'mark') {
-          _this11.canvas.remove(obj);
+          _this12.canvas.remove(obj);
         }
       });
     },
@@ -4437,14 +4587,14 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
           _obj$iconStyle,
           _obj$seqStyle,
           _obj$seqStyle$circle,
-          _this12 = this;
+          _this13 = this;
 
-      var _this$propItems4 = this.propItems,
-          endX = _this$propItems4.endX,
-          originX = _this$propItems4.originX,
-          endY = _this$propItems4.endY,
-          topTotal = _this$propItems4.topTotal,
-          markHeight = _this$propItems4.markHeight;
+      var _this$propItems6 = this.propItems,
+          endX = _this$propItems6.endX,
+          originX = _this$propItems6.originX,
+          endY = _this$propItems6.endY,
+          topTotal = _this$propItems6.topTotal,
+          markHeight = _this$propItems6.markHeight;
 
       if (!markHeight || !obj.list) {
         return;
@@ -4473,15 +4623,6 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
       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 addCanvas = function addCanvas(point) {
-        point.hasControls = point.hasBorders = false;
-
-        _this12.pointEvent(point);
-
-        _this12.canvas.add(point); // this.canvas.requestRenderAll();
-
-      };
-
       var setTop = function setTop(lineHeight, i, condition) {
         if (!~condition.limitIndex) {
           condition.y += i === 0 ? lineHeight / 2 : lineHeight;
@@ -4508,13 +4649,13 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
           y: baseY
         };
 
-        var x = _this12.cumputedX(item[0]);
+        var x = _this13.cumputedX(item[0]);
 
-        if (_this12.isLimit(item[0])) {
+        if (_this13.isLimit(item[0])) {
+          var pointList = [];
           item[1].forEach( /*#__PURE__*/function () {
             var _ref3 = Object(asyncToGenerator["a" /* default */])( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(v, i) {
-              var common, eventStyle, option, ele, img, _obj$seqStyle2, _obj$seqStyle3, circle, text, group, _text;
-
+              var common, option;
               return regeneratorRuntime.wrap(function _callee2$(_context2) {
                 while (1) {
                   switch (_context2.prev = _context2.next) {
@@ -4530,77 +4671,22 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
                         type: 'mark',
                         objectCaching: false
                       };
-                      eventStyle = !_this12.eventStyle.evented ? {
-                        lockMovementX: true,
-                        lockMovementY: true
-                      } : {};
-
-                      if (!(_this12.isObject(v) && !v.value)) {
-                        _context2.next = 15;
-                        break;
-                      }
-
-                      common.top = setTop(lineHeightImg, i, condition);
-                      option = Object.assign({}, obj.iconStyle || {}, v || {}, Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, common), eventStyle));
 
-                      if (!(v !== null && v !== void 0 && v.iconClassName)) {
-                        _context2.next = 9;
-                        break;
+                      if (_this13.isObject(v) && !v.value) {
+                        common.top = setTop(lineHeightImg, i, condition);
+                        option = Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, obj.iconStyle), v), common);
+                        pointList.push(_this13.drawMarkPoint(v, option, obj));
+                      } else if (v.value) {
+                        if (v.seq) {
+                          common.top = setTop(lineHeightSeq, i, condition);
+                          pointList.push(_this13.drawMarkPoint(v, common, obj));
+                        } else {
+                          common.top = setTop(lineHeightText, i, condition);
+                          pointList.push(_this13.drawMarkPoint(v, common, obj));
+                        }
                       }
 
-                      _context2.next = 8;
-                      return _this12.createImage(v.iconClassName, v);
-
-                    case 8:
-                      ele = _context2.sent;
-
-                    case 9:
-                      _context2.next = 11;
-                      return _this12.createPoint(v !== null && v !== void 0 && v.url || v !== null && v !== void 0 && v.iconClassName ? 'img' : v.type, Object(objectSpread2["a" /* default */])({
-                        ele: ele || ''
-                      }, option));
-
-                    case 11:
-                      img = _context2.sent;
-                      addCanvas(img);
-                      _context2.next = 29;
-                      break;
-
-                    case 15:
-                      if (!v.value) {
-                        _context2.next = 29;
-                        break;
-                      }
-
-                      if (!v.seq) {
-                        _context2.next = 26;
-                        break;
-                      }
-
-                      common.top = setTop(lineHeightSeq, i, condition); // 标记增加序号
-
-                      _context2.next = 20;
-                      return _this12.createPoint('circle', Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, common), {}, {
-                        radius: 5,
-                        strokeWidth: 1,
-                        stroke: '#000',
-                        fill: 'transparent'
-                      }, ((_obj$seqStyle2 = obj.seqStyle) === null || _obj$seqStyle2 === void 0 ? void 0 : _obj$seqStyle2.circle) || {}));
-
-                    case 20:
-                      circle = _context2.sent;
-                      text = new _this12.fabric.Text(String(v.value), Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, defaultVaule.textStyle), common), ((_obj$seqStyle3 = obj.seqStyle) === null || _obj$seqStyle3 === void 0 ? void 0 : _obj$seqStyle3.text) || {}));
-                      group = new _this12.fabric.Group([circle, text], Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, common), eventStyle));
-                      addCanvas(group);
-                      _context2.next = 29;
-                      break;
-
-                    case 26:
-                      common.top = setTop(lineHeightText, i, condition);
-                      _text = new _this12.fabric.Text(String(v.value), Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, defaultVaule.textStyle), obj.style), common), eventStyle));
-                      addCanvas(_text);
-
-                    case 29:
+                    case 2:
                     case "end":
                       return _context2.stop();
                   }
@@ -4612,30 +4698,129 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
               return _ref3.apply(this, arguments);
             };
           }());
+          Promise.all(pointList).then(function (res) {
+            var _this13$canvas;
+
+            return (_this13$canvas = _this13.canvas).add.apply(_this13$canvas, Object(toConsumableArray["a" /* default */])(res));
+          });
         }
-      }); // this.canvas.add(...textList);
+      });
+    },
+    drawMarkPoint: function drawMarkPoint(v, option, obj) {
+      var _this14 = this;
+
+      return Object(asyncToGenerator["a" /* default */])( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
+        var point, eventStyle, ele, _obj$seqStyle2, _obj$seqStyle3, circle, text;
+
+        return regeneratorRuntime.wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                eventStyle = !_this14.eventStyle.evented ? {
+                  lockMovementX: true,
+                  lockMovementY: true
+                } : {};
+
+                if (!(_this14.isObject(v) && !v.value)) {
+                  _context3.next = 11;
+                  break;
+                }
+
+                if (!(v !== null && v !== void 0 && v.iconClassName)) {
+                  _context3.next = 6;
+                  break;
+                }
+
+                _context3.next = 5;
+                return _this14.createImage(v.iconClassName, v);
+
+              case 5:
+                ele = _context3.sent;
+
+              case 6:
+                _context3.next = 8;
+                return _this14.createPoint(v !== null && v !== void 0 && v.url || v !== null && v !== void 0 && v.iconClassName ? 'img' : v.type, Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({
+                  ele: ele || ''
+                }, option), eventStyle));
+
+              case 8:
+                point = _context3.sent;
+                _context3.next = 25;
+                break;
+
+              case 11:
+                if (!v.value) {
+                  _context3.next = 25;
+                  break;
+                }
+
+                if (!v.seq) {
+                  _context3.next = 22;
+                  break;
+                }
+
+                _context3.next = 15;
+                return _this14.createPoint('circle', Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, option), {}, {
+                  radius: 5,
+                  strokeWidth: 1,
+                  stroke: '#000',
+                  fill: 'transparent'
+                }, ((_obj$seqStyle2 = obj.seqStyle) === null || _obj$seqStyle2 === void 0 ? void 0 : _obj$seqStyle2.circle) || {}));
+
+              case 15:
+                circle = _context3.sent;
+                text = new _this14.fabric.Text(String(v.value), Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, defaultVaule.textStyle), option), ((_obj$seqStyle3 = obj.seqStyle) === null || _obj$seqStyle3 === void 0 ? void 0 : _obj$seqStyle3.text) || {}));
+                _context3.next = 19;
+                return new _this14.fabric.Group([circle, text], Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, option), eventStyle));
+
+              case 19:
+                point = _context3.sent;
+                _context3.next = 25;
+                break;
+
+              case 22:
+                _context3.next = 24;
+                return new _this14.fabric.Text(String(v.value), Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, defaultVaule.textStyle), obj.style), option), eventStyle));
+
+              case 24:
+                point = _context3.sent;
+
+              case 25:
+                point.hasControls = point.hasBorders = false;
+
+                _this14.pointEvent(point);
+
+                return _context3.abrupt("return", point);
+
+              case 28:
+              case "end":
+                return _context3.stop();
+            }
+          }
+        }, _callee3);
+      }))();
     },
     pointEvent: function pointEvent(point) {
-      var _this13 = this;
+      var _this15 = this;
 
       this.setPopup(point); // 移动中 实时更新相关联的线的坐标
 
       if (this.eventStyle.evented) {
         point.on('moving', function () {
-          _this13.moveLimit(point); // this.canvas.renderAll();
+          _this15.moveLimit(point); // this.canvas.renderAll();
 
 
-          _this13.showDrapPopup(point);
+          _this15.showDrapPopup(point);
         });
         point.on('moved', function () {
-          _this13.isDropVisible = false;
+          _this15.isDropVisible = false;
           var value = {
             data: point.data,
             oldVal: point.time,
-            newVal: _this13.getXValue(point.left)
+            newVal: _this15.getXValue(point.left)
           };
 
-          _this13.$emit('markChange', value);
+          _this15.$emit('markChange', value);
         });
       }
     },
@@ -4643,12 +4828,12 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
       var _point$other;
 
       point.setCoords();
-      var _this$propItems5 = this.propItems,
-          originX = _this$propItems5.originX,
-          endX = _this$propItems5.endX,
-          originY = _this$propItems5.originY,
-          endY = _this$propItems5.endY,
-          markHeight = _this$propItems5.markHeight;
+      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 bottom = this.templateData.bottom; // 如果是起始标记，如入手术室时间
 
       if ((_point$other = point.other) !== null && _point$other !== void 0 && _point$other.isStart) {
@@ -4742,12 +4927,12 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
     },
     drawLeftScaleGroup: function drawLeftScaleGroup(dataLeft) {
       this.drawLeftTitle(dataLeft);
-      var _this$propItems6 = this.propItems,
-          endY = _this$propItems6.endY,
-          markHeight = _this$propItems6.markHeight,
-          originX = _this$propItems6.originX,
-          originY = _this$propItems6.originY,
-          treeTableminCellWidth = _this$propItems6.treeTableminCellWidth;
+      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 rect = new this.fabric.Rect(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({
         left: treeTableminCellWidth,
         top: originY,
@@ -4763,11 +4948,11 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
     },
     drawLeftTitle: function drawLeftTitle(dataLeft) {
       if (dataLeft.title) {
-        var _this$propItems7 = this.propItems,
-            endY = _this$propItems7.endY,
-            markHeight = _this$propItems7.markHeight,
-            treeTableminCellWidth = _this$propItems7.treeTableminCellWidth,
-            originY = _this$propItems7.originY;
+        var _this$propItems9 = this.propItems,
+            endY = _this$propItems9.endY,
+            markHeight = _this$propItems9.markHeight,
+            treeTableminCellWidth = _this$propItems9.treeTableminCellWidth,
+            originY = _this$propItems9.originY;
         this.canvas.add(this.drawTextGroup({
           width: treeTableminCellWidth,
           height: endY + markHeight - originY
@@ -4779,10 +4964,7 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
         }));
       }
     }
-  } // render(h) {
-  //   return this.$slots.default ? h('div', this.$slots.default) : undefined;
-  // }
-
+  }
 });
 // CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricTextGroup.vue?vue&type=script&lang=js&
  /* harmony default export */ var fabric_chart_FabricTextGroupvue_type_script_lang_js_ = (FabricTextGroupvue_type_script_lang_js_); 
@@ -4796,8 +4978,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_2d7ac043_render,
-  FabricTextGroupvue_type_template_id_2d7ac043_staticRenderFns,
+  FabricTextGroupvue_type_template_id_1a9302e8_render,
+  FabricTextGroupvue_type_template_id_1a9302e8_staticRenderFns,
   false,
   null,
   null,
@@ -4806,14 +4988,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":"7ebb9ffc-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":"0fee42d6-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":"7ebb9ffc-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":"0fee42d6-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 = []
 
@@ -5197,7 +5379,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":"7ebb9ffc-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=02387c68&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"0fee42d6-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=02387c68&
 var FabricLinesvue_type_template_id_02387c68_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_02387c68_staticRenderFns = []
 
@@ -6233,7 +6415,7 @@ var FabricLines_component = Object(componentNormalizer["a" /* default */])(
     hasTopTable: function hasTopTable() {
       var _this$templateData$to, _this$templateData$to2;
 
-      return ((_this$templateData$to = this.templateData.top) === null || _this$templateData$to === void 0 ? void 0 : (_this$templateData$to2 = _this$templateData$to.list) === null || _this$templateData$to2 === void 0 ? void 0 : _this$templateData$to2.length) > 0;
+      return typeof ((_this$templateData$to = this.templateData.top) === null || _this$templateData$to === void 0 ? void 0 : _this$templateData$to.show) === 'undefined' || ((_this$templateData$to2 = this.templateData.top) === null || _this$templateData$to2 === void 0 ? void 0 : _this$templateData$to2.show);
     },
     hasTable: function hasTable() {
       var _this$templateData$le2, _this$templateData$le3, _this$templateData$le4, _this$templateData$ri5, _this$templateData$ri6, _this$templateData$ri7;
@@ -6320,8 +6502,8 @@ var FabricLines_component = Object(componentNormalizer["a" /* default */])(
 }));
 // CONCATENATED MODULE: ./packages/fabric-chart/src/FabricChart.vue?vue&type=script&lang=js&
  /* harmony default export */ var src_FabricChartvue_type_script_lang_js_ = (FabricChartvue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./packages/fabric-chart/src/FabricChart.vue?vue&type=style&index=0&id=bbb2d972&lang=less&scoped=true&
-var FabricChartvue_type_style_index_0_id_bbb2d972_lang_less_scoped_true_ = __webpack_require__("22aa");
+// EXTERNAL MODULE: ./packages/fabric-chart/src/FabricChart.vue?vue&type=style&index=0&id=3aefcf44&lang=less&scoped=true&
+var FabricChartvue_type_style_index_0_id_3aefcf44_lang_less_scoped_true_ = __webpack_require__("9e71");
 
 // CONCATENATED MODULE: ./packages/fabric-chart/src/FabricChart.vue
 
@@ -6338,7 +6520,7 @@ var FabricChart_component = Object(componentNormalizer["a" /* default */])(
   staticRenderFns,
   false,
   null,
-  "bbb2d972",
+  "3aefcf44",
   null
   
 )
@@ -6569,17 +6751,6 @@ module.exports = function (iterable, unboundFunction, options) {
 };
 
 
-/***/ }),
-
-/***/ "22aa":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_FabricChart_vue_vue_type_style_index_0_id_bbb2d972_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("6b68");
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_FabricChart_vue_vue_type_style_index_0_id_bbb2d972_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_FabricChart_vue_vue_type_style_index_0_id_bbb2d972_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "23cb":
@@ -7754,13 +7925,6 @@ module.exports = {
 };
 
 
-/***/ }),
-
-/***/ "6b68":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
 /***/ }),
 
 /***/ "6b75":
@@ -8299,6 +8463,17 @@ exports.f = DESCRIPTORS ? $defineProperty : function defineProperty(O, P, Attrib
 
 // extracted by mini-css-extract-plugin
 
+/***/ }),
+
+/***/ "9e71":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_FabricChart_vue_vue_type_style_index_0_id_3aefcf44_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("a28b");
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_FabricChart_vue_vue_type_style_index_0_id_3aefcf44_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_10_oneOf_1_0_node_modules_css_loader_dist_cjs_js_ref_10_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_postcss_loader_src_index_js_ref_10_oneOf_1_2_node_modules_less_loader_dist_cjs_js_ref_10_oneOf_1_3_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_FabricChart_vue_vue_type_style_index_0_id_3aefcf44_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "9ed3":
@@ -8346,6 +8521,13 @@ module.exports = function (argument) {
 };
 
 
+/***/ }),
+
+/***/ "a28b":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
 /***/ }),
 
 /***/ "a32b":