cnhis-design-vue 2.1.18 → 2.1.19

package/es/fabric-chart/index.js

@@ -299,7 +299,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":"5d550778-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=cb500674&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"3fd9a2cc-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=cb500674&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(("FabricCanvas" + (_vm.templateData.type || '')),{ref:"canvasEle",tag:"component",attrs:{"id":_vm.id,"templateData":_vm.templateData}},[(_vm.templateData.type)?[_c('fabric-grid'),_c('fabric-top2',{attrs:{"templateData":_vm.templateData}}),_c('fabric-left2',{attrs:{"templateData":_vm.templateData}}),_c('fabric-right2',{attrs:{"templateData":_vm.templateData}}),_c('fabric-bottom2',{attrs:{"templateData":_vm.templateData}}),_c('fabric-center2',_vm._g({attrs:{"other":_vm.templateData.other,"polyline":_vm.templateData.left.leftYScalevalue},on:{"pointOperation":_vm.pointOperation}},_vm.$listeners))]:[(_vm.hasXScalevalue)?_c('fabric-text-group',_vm._g({attrs:{"templateData":_vm.templateData}},_vm.$listeners)):_vm._e(),_c('fabric-grid'),(_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 || {}},on:{"pointOperation":_vm.pointOperation}},_vm.$listeners)):_vm._e()]],2):_vm._e()],1)}
 var staticRenderFns = []
 
@@ -312,7 +312,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":"5d550778-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=8b6630b2&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"3fd9a2cc-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=8b6630b2&
 var FabricCanvasvue_type_template_id_8b6630b2_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_8b6630b2_staticRenderFns = []
 
@@ -798,7 +798,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":"5d550778-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-chart2/FabricCanvas.vue?vue&type=template&id=d9708486&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"3fd9a2cc-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-chart2/FabricCanvas.vue?vue&type=template&id=d9708486&
 var FabricCanvasvue_type_template_id_d9708486_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_d9708486_staticRenderFns = []
 
@@ -1038,12 +1038,12 @@ var FabricCanvas_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var fabric_chart2_FabricCanvas = (FabricCanvas_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5d550778-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=1031ec15&
-var FabricPolylinesvue_type_template_id_1031ec15_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"poly-line"},[(_vm.isRightVisible)?_c('MouseRightClick',{attrs:{"getContainer":_vm.getContainer,"nodeList":_vm.rightClickNode,"rightPos":_vm.rightPos},on:{"nodeClick":_vm.handleRightClick,"closeRight":function($event){_vm.isRightVisible = false}}}):_vm._e(),_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_1031ec15_staticRenderFns = []
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"3fd9a2cc-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=638600a8&
+var FabricPolylinesvue_type_template_id_638600a8_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"poly-line"},[(_vm.isRightVisible)?_c('MouseRightClick',{attrs:{"getContainer":_vm.getContainer,"nodeList":_vm.rightClickNode,"rightPos":_vm.rightPos},on:{"nodeClick":_vm.handleRightClick,"closeRight":function($event){_vm.isRightVisible = false}}}):_vm._e(),_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_638600a8_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricPolylines.vue?vue&type=template&id=1031ec15&
+// CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricPolylines.vue?vue&type=template&id=638600a8&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/arrayWithHoles.js
 var arrayWithHoles = __webpack_require__("0d21");
@@ -1107,15 +1107,15 @@ var es_array_splice_js_ = __webpack_require__("f3b8");
 // EXTERNAL MODULE: external "core-js/modules/es.array.slice.js"
 var es_array_slice_js_ = __webpack_require__("ea12");
 
+// EXTERNAL MODULE: external "core-js/modules/es.array.find-index.js"
+var es_array_find_index_js_ = __webpack_require__("4c7f");
+
 // EXTERNAL MODULE: external "core-js/modules/es.regexp.to-string.js"
 var es_regexp_to_string_js_ = __webpack_require__("30df");
 
 // EXTERNAL MODULE: external "core-js/modules/es.object.freeze.js"
 var es_object_freeze_js_ = __webpack_require__("030b");
 
-// EXTERNAL MODULE: external "core-js/modules/es.array.find-index.js"
-var es_array_find_index_js_ = __webpack_require__("4c7f");
-
 // EXTERNAL MODULE: external "vxe-table"
 var external_vxe_table_ = __webpack_require__("f906");
 
@@ -1449,11 +1449,12 @@ var type_isObject = function isObject(obj) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
+                data.hoverCursor = 'pointer';
                 _context.t0 = type;
-                _context.next = _context.t0 === 'triangle' ? 3 : _context.t0 === 'circle' ? 4 : _context.t0 === 'img' ? 5 : _context.t0 === 'arrow' ? 8 : _context.t0 === '+' ? 9 : _context.t0 === 'shjs' ? 10 : _context.t0 === 'shks' ? 13 : _context.t0 === 'cg' ? 16 : _context.t0 === 'jxtq' ? 19 : 20;
+                _context.next = _context.t0 === 'triangle' ? 4 : _context.t0 === 'circle' ? 5 : _context.t0 === 'img' ? 6 : _context.t0 === 'arrow' ? 9 : _context.t0 === '+' ? 10 : _context.t0 === 'shjs' ? 11 : _context.t0 === 'shks' ? 14 : _context.t0 === 'cg' ? 17 : _context.t0 === 'jxtq' ? 20 : 21;
                 break;
 
-              case 3:
+              case 4:
                 return _context.abrupt("return", new _this.fabric.Triangle(Object(objectSpread2["a" /* default */])({
                   width: 20,
                   height: 20,
@@ -1461,7 +1462,7 @@ var type_isObject = function isObject(obj) {
                   scale: 1
                 }, data)));
 
-              case 4:
+              case 5:
                 return _context.abrupt("return", new _this.fabric.Circle(Object(objectSpread2["a" /* default */])({
                   objectCaching: false,
                   strokeWidth: 1,
@@ -1469,8 +1470,8 @@ var type_isObject = function isObject(obj) {
                   scale: 1
                 }, data)));
 
-              case 5:
-                _context.next = 7;
+              case 6:
+                _context.next = 8;
                 return new Promise(function (resolve, reject) {
                   var common = Object(objectSpread2["a" /* default */])({
                     originX: 'center',
@@ -1499,16 +1500,16 @@ var type_isObject = function isObject(obj) {
                   }
                 });
 
-              case 7:
+              case 8:
                 return _context.abrupt("return", _context.sent);
 
-              case 8:
+              case 9:
                 return _context.abrupt("return", _this.createArrow(data));
 
-              case 9:
+              case 10:
                 return _context.abrupt("return", _this.createAdd(data));
 
-              case 10:
+              case 11:
                 obj1 = _this.createAdd(data);
                 obj2 = _this.createCircleBorder(data);
                 return _context.abrupt("return", new _this.fabric.Group([obj2, obj1], Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({
@@ -1517,7 +1518,7 @@ var type_isObject = function isObject(obj) {
                   angle: 0
                 })));
 
-              case 13:
+              case 14:
                 obj1 = new _this.fabric.Circle({
                   objectCaching: false,
                   radius: data.width / 5,
@@ -1532,17 +1533,17 @@ var type_isObject = function isObject(obj) {
                   scale: 1
                 }, data)));
 
-              case 16:
+              case 17:
                 obj1 = _this.ceateLineArrow(data);
                 obj2 = _this.createCircleBorder(data);
                 return _context.abrupt("return", new _this.fabric.Group([obj2, obj1], Object(objectSpread2["a" /* default */])({
                   scale: 1
                 }, data)));
 
-              case 19:
+              case 20:
                 return _context.abrupt("return", _this.createJXTQ(data));
 
-              case 20:
+              case 21:
                 // 文字(默认:比如 type === x)
                 data.stroke && delete data.stroke;
                 return _context.abrupt("return", new _this.fabric.Text(String(type), Object(objectSpread2["a" /* default */])({
@@ -1552,7 +1553,7 @@ var type_isObject = function isObject(obj) {
                   fill: '#000'
                 }, data)));
 
-              case 22:
+              case 23:
               case "end":
                 return _context.stop();
             }
@@ -1577,18 +1578,26 @@ var type_isObject = function isObject(obj) {
   methods: {
     // 折线点移动限制 目前仅限制不能移动出画布
     pointMoveLimit: function pointMoveLimit(point) {
+      var _point$prevPoint, _point$nextPoint;
+
+      var isLimit = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
       point.setCoords(); // 需调用setCoords()才能重新计算控制位置(改变Object状态)
       // const objBoundingBox = point.getBoundingRect(); // 此方式会导致结果不精准，应该用point的top值判断
 
-      var leftLimit = point.prevPoint ? point.prevPoint.get('left') : this.propItems.originX;
-      var rightLimit = point.nextPoint ? point.nextPoint.get('left') : this.propItems.endX;
+      var _this$propItems = this.propItems,
+          originX = _this$propItems.originX,
+          endX = _this$propItems.endX,
+          originY = _this$propItems.originY,
+          endY = _this$propItems.endY;
+      var leftLimit = ((_point$prevPoint = point.prevPoint) === null || _point$prevPoint === void 0 ? void 0 : _point$prevPoint.get('left')) || originX;
+      var rightLimit = isLimit && ((_point$nextPoint = point.nextPoint) === null || _point$nextPoint === void 0 ? void 0 : _point$nextPoint.get('left')) || endX;
 
-      if (point.top < this.propItems.originY) {
-        point.set('top', this.propItems.originY);
+      if (point.top < originY) {
+        point.set('top', originY);
       }
 
-      if (point.top > this.propItems.endY) {
-        point.set('top', this.propItems.endY);
+      if (point.top > endY) {
+        point.set('top', endY);
       }
 
       if (point.left < leftLimit) {
@@ -1649,7 +1658,7 @@ var type_isObject = function isObject(obj) {
     }
   }
 });
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5d550778-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":"3fd9a2cc-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 = []
 
@@ -1757,7 +1766,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":"5d550778-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":"3fd9a2cc-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 = []
 
@@ -1959,7 +1968,11 @@ var rightClickNodeConnect = [{
       // 快速新增的节点list
       isSelectArea: false,
       // 是否正在选区
-      selectArea: null // 选区矩形对象
+      selectArea: null,
+      // 选区矩形对象
+      currentDelPoint: null,
+      // 缓存当前可批量删除的项目线段上的点
+      polylinePointList: [] // 缓存折线项目节点
 
     };
   },
@@ -1970,21 +1983,23 @@ var rightClickNodeConnect = [{
   },
   watch: {},
   mounted: function mounted() {
-    var _this = this;
+    var _this2 = this;
 
     this.$nextTick(function () {
-      _this.drawPolylineTitle();
+      _this2.drawPolylineTitle();
 
-      _this.polyline.forEach(function (polylineType, polylineTypeId) {
-        _this.createPolyline(polylineType, polylineTypeId);
+      _this2.polylinePointList = [];
+
+      _this2.polyline.forEach(function (polylineType, polylineTypeId) {
+        _this2.createPolyline(polylineType, polylineTypeId);
       });
 
-      _this.eventStyle.evented && _this.createEvent();
+      _this2.eventStyle.evented && _this2.createEvent();
     });
   },
   methods: {
     createEvent: function createEvent() {
-      var _this2 = this;
+      var _this3 = this;
 
       this.canvas.on('mouse:up', function (event) {
         if (event.button === 3) {
@@ -1992,29 +2007,34 @@ var rightClickNodeConnect = [{
               x = _event$pointer.x,
               y = _event$pointer.y;
 
-          var _this2$$propItems = _this2.$propItems(),
-              originX = _this2$$propItems.originX,
-              originY = _this2$$propItems.originY,
-              endX = _this2$$propItems.endX,
-              endY = _this2$$propItems.endY;
+          var _this3$$propItems = _this3.$propItems(),
+              originX = _this3$$propItems.originX,
+              originY = _this3$$propItems.originY,
+              endX = _this3$$propItems.endX,
+              endY = _this3$$propItems.endY;
 
           if (!(x < originX || x > endX || y < originY || y > endY)) {
-            _this2.activeEvent = event;
-            document.querySelector('.upper-canvas').addEventListener('contextmenu', _this2.addEventListenerContextmenu, true);
+            _this3.activeEvent = event;
+            document.querySelector('.upper-canvas').addEventListener('contextmenu', _this3.addEventListenerContextmenu, true);
           } // this.willUpdateLine = line;
 
         } // 左键松开鼠标-批量删除
 
 
-        _this2.isSelectArea = false;
+        _this3.isSelectArea = false;
 
-        if (event.button === 1 && !event.target && _this2.selectArea) {
-          var points = _this2.selectArea.ponits;
+        if (event.button === 1 && !event.target && _this3.selectArea) {
+          var points = _this3.selectArea.ponits;
 
-          var delList = _this2.getAreaPonits(points);
+          var delList = _this3.getAreaPonits(points);
 
-          delList.length === 0 && _this2.removeSelectArea();
-          delList.length > 0 && _this2.selectArea && _this2.$emit('pointOperation', 'delete', delList);
+          delList.length === 0 && _this3.removeSelectArea();
+
+          if (delList.length > 0 && _this3.selectArea) {
+            _this3.$emit('pointOperation', 'delete', delList);
+
+            _this3.currentDelPoint = null;
+          }
         }
       });
       var selectAreaOrigin = {
@@ -2023,18 +2043,18 @@ var rightClickNodeConnect = [{
       };
       this.canvas.on('mouse:down', function (event) {
         if (event.button === 1 && !event.target) {
-          _this2.isSelectArea = true;
+          _this3.isSelectArea = true;
           selectAreaOrigin.left = event.pointer.x;
           selectAreaOrigin.top = event.pointer.y;
         }
       });
       this.canvas.on('mouse:move', function (event) {
-        _this2.isSelectArea && _this2.createSelectArea(event, selectAreaOrigin);
+        _this3.isSelectArea && _this3.createSelectArea(event, selectAreaOrigin);
       });
     },
     // 获取选区内包含的节点
     getAreaPonits: function getAreaPonits(points) {
-      var _this3 = this;
+      var _this4 = this;
 
       var delList = [];
 
@@ -2051,7 +2071,15 @@ var rightClickNodeConnect = [{
         var isArea = left >= x1 && left <= x2 && top >= y1 && top <= y2;
 
         if (id && /_polyline(Point)_/.test(id) && !id.includes('isTitle') && isArea) {
-          delList.push(_this3.getDataById(id));
+          if (_this4.currentDelPoint) {
+            var polylineIndex = _this4.currentDelPoint.polylineIndex;
+
+            if (polylineIndex == obj.polylineIndex) {
+              delList.push(_this4.getDataById(id));
+            }
+          } else {
+            delList.push(_this4.getDataById(id));
+          }
         }
       });
       return delList;
@@ -2073,16 +2101,16 @@ var rightClickNodeConnect = [{
     },
     // 每一个折线类别
     createPolyline: function createPolyline(polylineType, polylineTypeId) {
-      var _this4 = this;
+      var _this5 = this;
 
       polylineType.dataList.forEach(function (polylineItem, polylineIndex) {
-        _this4.drawPolyline(polylineItem, polylineIndex, polylineType, polylineTypeId);
+        _this5.drawPolyline(polylineItem, polylineIndex, polylineType, polylineTypeId);
       });
     },
     // 绘制左侧折线标题
     drawPolylineTitle: function drawPolylineTitle() {
       var _this$other,
-          _this5 = this;
+          _this6 = this;
 
       var _this$propItems = this.propItems,
           canvasHeight = _this$propItems.canvasHeight,
@@ -2132,28 +2160,21 @@ var rightClickNodeConnect = [{
       }); // 配置左侧title图标（但不是折线项目）
 
       if ((_this$other = this.other) !== null && _this$other !== void 0 && _this$other.list && Array.isArray(this.other.list)) {
+        var otherList = this.other.list.map(function (v) {
+          return {
+            title: v.name,
+            type: v.type,
+            pointAttr: v,
+            isAdd: false,
+            polylineTypeId: -1,
+            polylineIndex: -1
+          };
+        });
+
         if (this.other.position && this.other.position === 'top') {
-          leftTitleList.push.apply(leftTitleList, Object(toConsumableArray["a" /* default */])(this.other.list.map(function (v) {
-            return {
-              title: v.name,
-              type: v.type,
-              pointAttr: v,
-              isAdd: false,
-              polylineTypeId: -1,
-              polylineIndex: -1
-            };
-          })));
+          leftTitleList.push.apply(leftTitleList, Object(toConsumableArray["a" /* default */])(otherList));
         } else {
-          leftTitleList.unshift.apply(leftTitleList, Object(toConsumableArray["a" /* default */])(this.other.list.map(function (v) {
-            return {
-              title: v.name,
-              type: v.type,
-              pointAttr: v,
-              isAdd: false,
-              polylineTypeId: -1,
-              polylineIndex: -1
-            };
-          })));
+          leftTitleList.unshift.apply(leftTitleList, Object(toConsumableArray["a" /* default */])(otherList));
         }
       }
 
@@ -2177,7 +2198,7 @@ var rightClickNodeConnect = [{
                   left = lableMargin[0] + treeTableminCellWidth;
                   pointId = "".concat(v.polylineTypeId, "_").concat(v.polylineIndex, "_-1_polylinePoint_'").concat(new Date().getTime(), "_isTitle");
                   _v$pointAttr = v.pointAttr, _v$pointAttr$fill = _v$pointAttr.fill, fillColor = _v$pointAttr$fill === void 0 ? '#000' : _v$pointAttr$fill, stroke = _v$pointAttr.stroke;
-                  text = new _this5.fabric.Text(String(v.title), Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({
+                  text = new _this6.fabric.Text(String(v.title), Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({
                     fontSize: style.fontSize,
                     fill: fillColor && stroke ? stroke : fillColor,
                     left: left,
@@ -2199,7 +2220,7 @@ var rightClickNodeConnect = [{
                     id: pointId,
                     polylineTypeId: v.polylineTypeId,
                     polylineIndex: v.polylineIndex
-                  }, v.isAdd && _this5.eventStyle.evented ? {} : eventStyle), {}, {
+                  }, v.isAdd && _this6.eventStyle.evented ? {} : eventStyle), {}, {
                     rightLimit: v.rightLimit || ''
                   });
 
@@ -2209,14 +2230,14 @@ var rightClickNodeConnect = [{
                   }
 
                   _context.next = 12;
-                  return _this5.createImage(v.pointAttr.iconClassName, v.pointAttr);
+                  return _this6.createImage(v.pointAttr.iconClassName, v.pointAttr);
 
                 case 12:
                   ele = _context.sent;
 
                 case 13:
                   _context.next = 15;
-                  return _this5.createPoint(v.type, Object(objectSpread2["a" /* default */])({
+                  return _this6.createPoint(v.type, Object(objectSpread2["a" /* default */])({
                     ele: ele || ''
                   }, option));
 
@@ -2232,7 +2253,7 @@ var rightClickNodeConnect = [{
                         scaleY: 1
                       });
 
-                      _this5.canvas.renderAll();
+                      _this6.canvas.renderAll();
                     }
 
                     if (!cloneIconId) {
@@ -2244,9 +2265,9 @@ var rightClickNodeConnect = [{
                         });
                         clonedObj.bringForward();
 
-                        _this5.canvas.add(clonedObj);
+                        _this6.canvas.add(clonedObj);
 
-                        _this5.canvas.renderAll();
+                        _this6.canvas.renderAll();
                       });
                     }
 
@@ -2254,18 +2275,18 @@ var rightClickNodeConnect = [{
                       originX: 'center'
                     });
 
-                    _this5.moveLimit(icon);
+                    _this6.moveLimit(icon);
 
                     icon.left >= originX && icon.left < originX + 5 && (originTop = icon.top);
 
                     if (icon.left >= originX) {
                       // this.addPoint(icon, originX, originTop);
-                      _this5.showDrapPopup(icon);
+                      _this6.showDrapPopup(icon);
                     } else {
-                      _this5.isDropVisible = false;
+                      _this6.isDropVisible = false;
                     }
 
-                    _this5.canvas.renderAll();
+                    _this6.canvas.renderAll();
                   }); // 标题折线点停止拖拽后 更新
 
                   icon.on('moved', function () {
@@ -2273,29 +2294,29 @@ var rightClickNodeConnect = [{
                       id: icon.id.replace('_isTitle', '')
                     });
 
-                    _this5.canvas.renderAll();
+                    _this6.canvas.renderAll();
 
-                    _this5.removeTitle();
+                    _this6.removeTitle();
 
-                    _this5.removePolyline(cloneIconId);
+                    _this6.removePolyline(cloneIconId);
 
-                    if (icon.id.includes('_polylinePoint_') && _this5.isDropVisible) {
-                      _this5.isDropVisible = false;
+                    if (icon.id.includes('_polylinePoint_') && _this6.isDropVisible) {
+                      _this6.isDropVisible = false;
 
                       if (icon.left >= originX) {
                         // this.setEmitFunction(icon);
-                        _this5.setAddPointList(icon);
+                        _this6.setAddPointList(icon);
 
-                        _this5.$emit('pointOperation', 'increasePointBatch', _this5.addPointList);
+                        _this6.$emit('pointOperation', 'increasePointBatch', _this6.addPointList);
 
-                        _this5.addPointList = [];
+                        _this6.addPointList = [];
                       }
                     }
 
-                    _this5.removePolyline(icon.id); // 重绘折线标题
+                    _this6.removePolyline(icon.id); // 重绘折线标题
 
 
-                    _this5.drawPolylineTitle();
+                    _this6.drawPolylineTitle();
                   }); // 优化左侧图标太小不容易选中的问题
 
                   if (icon.evented && !icon.url) {
@@ -2309,9 +2330,9 @@ var rightClickNodeConnect = [{
                     }
                   }
 
-                  _this5.canvas.add(text, icon);
+                  _this6.canvas.add(text, icon);
 
-                  _this5.canvas.requestRenderAll();
+                  _this6.canvas.requestRenderAll();
 
                 case 23:
                 case "end":
@@ -2349,11 +2370,11 @@ var rightClickNodeConnect = [{
       }
     },
     removeTitle: function removeTitle() {
-      var _this6 = this;
+      var _this7 = this;
 
       this.canvas.forEachObject(function (obj) {
         if (obj.id && obj.id.includes('isTitle')) {
-          _this6.canvas.remove(obj);
+          _this7.canvas.remove(obj);
         }
       });
     },
@@ -2367,7 +2388,7 @@ var rightClickNodeConnect = [{
     createAttrVaule: function createAttrVaule(attr, polyline, polylineIndex, polylineType, polylineTypeId) {
       var _valueObj$max,
           _valueObj$max2,
-          _this7 = this,
+          _this8 = this,
           _valueObj$min,
           _valueObj$min2,
           _this$canvas;
@@ -2379,10 +2400,10 @@ var rightClickNodeConnect = [{
           originX = _this$propItems2.originX,
           endX = _this$propItems2.endX;
       var isMax = ((_valueObj$max = valueObj.max) === null || _valueObj$max === void 0 ? void 0 : _valueObj$max.show) && ((_valueObj$max2 = valueObj.max) === null || _valueObj$max2 === void 0 ? void 0 : _valueObj$max2.value) && list.some(function (v) {
-        return +v.value >= +valueObj.max.value && _this7.isLimit(v.time);
+        return +v.value >= +valueObj.max.value && _this8.isLimit(v.time);
       });
       var isMin = ((_valueObj$min = valueObj.min) === null || _valueObj$min === void 0 ? void 0 : _valueObj$min.show) && ((_valueObj$min2 = valueObj.min) === null || _valueObj$min2 === void 0 ? void 0 : _valueObj$min2.value) && list.some(function (v) {
-        return +v.value <= +valueObj.min.value && _this7.isLimit(v.time);
+        return +v.value <= +valueObj.min.value && _this8.isLimit(v.time);
       });
       var lines = [];
 
@@ -2390,9 +2411,9 @@ var rightClickNodeConnect = [{
         var value = _ref2.value,
             lineStyle = _ref2.lineStyle;
 
-        var top = _this7.cumputedY(polylineType, +value);
+        var top = _this8.cumputedY(polylineType, +value);
 
-        return _this7.drawLine([originX, top, endX, top], Object(objectSpread2["a" /* default */])({
+        return _this8.drawLine([originX, top, endX, top], Object(objectSpread2["a" /* default */])({
           polylineIndex: polylineIndex,
           lineIndex: 0,
           polylineTypeId: polylineTypeId
@@ -2402,7 +2423,7 @@ var rightClickNodeConnect = [{
       var drawText = function drawText(_ref3, top) {
         var name = _ref3.name,
             nameStyle = _ref3.nameStyle;
-        return new _this7.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), {}, {
+        return new _this8.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,
           top: top - 5
@@ -2430,16 +2451,16 @@ var rightClickNodeConnect = [{
       this.canvas.renderAll();
     },
 
-    /**
-     * 绘制一条折线
-     * @param {polyline} 折线属性
-     * @param {polyline.type} 折线点形状 circle: 圆 | triangle: 三角
-     * @param {polyline.pointAttr} 参数 fill: 填充色 | stroke: 描边色 | strokeWidth: 宽度 | radius: 半径 | width: 宽度 | height: 高度
-     * @param {polyline.list} 折线点坐标数组
-     * @param {polylineIndex} 当前折线 index
+    /**
+     * 绘制一条折线
+     * @param {polyline} 折线属性
+     * @param {polyline.type} 折线点形状 circle: 圆 | triangle: 三角
+     * @param {polyline.pointAttr} 参数 fill: 填充色 | stroke: 描边色 | strokeWidth: 宽度 | radius: 半径 | width: 宽度 | height: 高度
+     * @param {polyline.list} 折线点坐标数组
+     * @param {polylineIndex} 当前折线 index
      */
     drawPolyline: function drawPolyline(polyline, polylineIndex, polylineType, polylineTypeId) {
-      var _this8 = this;
+      var _this9 = this;
 
       var _this$propItems3 = this.propItems,
           originY = _this$propItems3.originY,
@@ -2450,36 +2471,44 @@ var rightClickNodeConnect = [{
       var list = polyline.list;
       var pointList = [];
       var lineList = [];
-      list.forEach(function (linePoints, index) {
-        // 当前点
-        var points = null;
+
+      var _this = this;
+
+      function getPointer(point) {
         var isInit = false;
+        var points = null;
 
-        if (isEffectiveNode(linePoints)) {
-          var x = _this8.cumputedX(linePoints.time);
+        if (isEffectiveNode(point) && _this.isLimit(point.time)) {
+          var x = _this.cumputedX(point.time);
 
-          var y = _this8.cumputedY(polylineType, linePoints.value);
+          var y = _this.cumputedY(polylineType, point.value);
 
           isInit = y < originY || y > endY;
-          if (_this8.isLimit(linePoints.time)) points = [x, y < originY ? originY : y > endY ? endY : y];
-        } // 下一个点
+          points = [x, y < originY ? originY : y > endY ? endY : y];
+        }
 
+        return {
+          isInit: isInit,
+          points: points
+        };
+      }
 
-        var nextPoints = list[index + 1];
-        var nextPoint = null;
+      list.forEach(function (linePoints, index) {
+        // 当前点
+        var _getPointer = getPointer(linePoints),
+            points = _getPointer.points,
+            isInit = _getPointer.isInit; // 下一个点
 
-        if (isEffectiveNode(nextPoints)) {
-          var nextX = _this8.cumputedX(nextPoints.time);
 
-          var nextY = _this8.cumputedY(polylineType, nextPoints.value);
+        var nextPoints = list[index + 1];
 
-          if (_this8.isLimit(nextPoints.time)) nextPoint = [nextX, nextY < originY ? originY : nextY > endY ? endY : nextY];
-        }
+        var _getPointer2 = getPointer(nextPoints),
+            nextPoint = _getPointer2.points;
 
         var line;
         var point;
         var previousLine;
-        line = points && nextPoint ? _this8.drawLine([].concat(Object(toConsumableArray["a" /* default */])(points), Object(toConsumableArray["a" /* default */])(nextPoint)), Object(objectSpread2["a" /* default */])({
+        line = points && nextPoint ? _this9.drawLine([].concat(Object(toConsumableArray["a" /* default */])(points), Object(toConsumableArray["a" /* default */])(nextPoint)), Object(objectSpread2["a" /* default */])({
           polylineIndex: polylineIndex,
           polylineTypeId: polylineTypeId,
           lineIndex: index
@@ -2496,14 +2525,37 @@ var rightClickNodeConnect = [{
 
         if (points) {
           pointOthers.time = linePoints.time;
-          point = previousLine ? _this8.drawPoint.apply(_this8, Object(toConsumableArray["a" /* default */])(points).concat([previousLine, line, polyline.type, pointOthers, isInit])) : _this8.drawPoint.apply(_this8, Object(toConsumableArray["a" /* default */])(points).concat([null, line, polyline.type, pointOthers, isInit]));
+          point = previousLine ? _this9.drawPoint.apply(_this9, Object(toConsumableArray["a" /* default */])(points).concat([previousLine, line, polyline.type, pointOthers, isInit])) : _this9.drawPoint.apply(_this9, Object(toConsumableArray["a" /* default */])(points).concat([null, line, polyline.type, pointOthers, isInit]));
         }
 
         lineList.push(line);
         point && pointList.push(point);
       });
       Promise.all(pointList).then(function (res) {
-        var _this8$canvas;
+        var _this9$canvas;
+
+        var polylineObj = _this9.polylinePointList.find(function (v) {
+          return v.polylineTypeId == polylineTypeId && v.polylineIndex == polylineIndex;
+        });
+
+        var pointerList = res.map(function (v) {
+          return v.left;
+        });
+
+        if (polylineObj) {
+          Object.assign(polylineObj, {
+            pointerList: pointerList,
+            pointList: res
+          });
+          polylineObj.pointerList = pointerList;
+        } else {
+          _this9.polylinePointList.push({
+            polylineTypeId: polylineTypeId,
+            polylineIndex: polylineIndex,
+            pointerList: pointerList,
+            pointList: res
+          });
+        }
 
         lineList = lineList.filter(function (v) {
           return v;
@@ -2520,9 +2572,9 @@ var rightClickNodeConnect = [{
           return v;
         });
 
-        (_this8$canvas = _this8.canvas).add.apply(_this8$canvas, Object(toConsumableArray["a" /* default */])(lineList).concat(Object(toConsumableArray["a" /* default */])(res)));
+        (_this9$canvas = _this9.canvas).add.apply(_this9$canvas, Object(toConsumableArray["a" /* default */])(lineList).concat(Object(toConsumableArray["a" /* default */])(res)));
 
-        _this8.canvas.requestRenderAll();
+        _this9.canvas.requestRenderAll();
       });
       this.createAttrVaule('critical', polyline, polylineIndex, polylineType, polylineTypeId);
       this.createAttrVaule('diffValue', polyline, polylineIndex, polylineType, polylineTypeId);
@@ -2539,15 +2591,15 @@ var rightClickNodeConnect = [{
       return this.propItems.endY - yScaleCell * yCellUnit;
     },
 
-    /**
-     * 绘制折线点
-     * @param {left, top} 折线点坐标
-     * @param {line1, line2} 与折线点关联的线
-     * @param {type} 折线点类型
-     * @param {others} 参数 polylineIndex | pointIndex | ...polyline.pointAttr
+    /**
+     * 绘制折线点
+     * @param {left, top} 折线点坐标
+     * @param {line1, line2} 与折线点关联的线
+     * @param {type} 折线点类型
+     * @param {others} 参数 polylineIndex | pointIndex | ...polyline.pointAttr
      */
     drawPoint: function drawPoint(left, top, line1, line2, type, others, isInit) {
-      var _this9 = this;
+      var _this10 = this;
 
       return Object(asyncToGenerator["a" /* default */])( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
         var pointId, ele, point;
@@ -2556,7 +2608,7 @@ var rightClickNodeConnect = [{
             switch (_context2.prev = _context2.next) {
               case 0:
                 pointId = "".concat(others.polylineTypeId, "_").concat(others.polylineIndex, "_").concat(others.pointIndex, "_polylinePoint_").concat(new Date().getTime());
-                _context2.t0 = _this9._iconClassName;
+                _context2.t0 = _this10._iconClassName;
 
                 if (!_context2.t0) {
                   _context2.next = 6;
@@ -2564,7 +2616,7 @@ var rightClickNodeConnect = [{
                 }
 
                 _context2.next = 5;
-                return _this9.createImage(_this9._iconClassName, others);
+                return _this10.createImage(_this10._iconClassName, others);
 
               case 5:
                 _context2.t0 = _context2.sent;
@@ -2572,12 +2624,12 @@ var rightClickNodeConnect = [{
               case 6:
                 ele = _context2.t0;
                 _context2.next = 9;
-                return _this9.createPoint(type, Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({
+                return _this10.createPoint(type, Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({
                   id: pointId,
                   left: left,
                   top: top,
                   ele: ele || ''
-                }, defaultVaule.pointStyle), others), !_this9.eventStyle.evented ? {
+                }, defaultVaule.pointStyle), others), !_this10.eventStyle.evented ? {
                   lockMovementX: true,
                   lockMovementY: true
                 } : {}));
@@ -2588,50 +2640,47 @@ var rightClickNodeConnect = [{
                 line1 && (point.line1 = line1);
                 line2 && (point.line2 = line2);
                 point.on('mouseover', function () {
-                  _this9.showDrapPopup(point); // 将当条线段以及点层级置顶
-                  // 线段不能先置顶，会挡住其他线段上的点
-                  // this.canvas.forEachObject(obj => {
-                  //   if (this.isOnePolyLine(obj, point.polylineTypeId, point.polylineIndex)) {
-                  //     obj.line1 && this.canvas.bringToFront(obj.line1);
-                  //     obj.line2 && this.canvas.bringToFront(obj.line2);
-                  //   }
-                  // });
-
-
-                  _this9.canvas.forEachObject(function (obj) {
-                    if (_this9.isOnePolyLine(obj, point.polylineTypeId, point.polylineIndex)) {
-                      _this9.canvas.bringToFront(obj);
-                    }
-                  });
+                  _this10.showDrapPopup(point);
+
+                  _this10.pointToFront(point);
                 });
                 point.on('mouseout', function () {
-                  _this9.isDropVisible = false;
+                  _this10.isDropVisible = false;
                 }); // 折线点移动中 实时更新相关联的线的坐标
 
-                if (_this9.eventStyle.evented) {
+                if (_this10.eventStyle.evented) {
                   point.on('moving', function () {
-                    _this9.pointMoveLimit(point);
+                    _this10.pointMoveLimit(point, false);
 
-                    _this9.pointMoveUpdateLine(point);
+                    _this10.pointMoveUpdateLine(point);
 
-                    _this9.addPoint(point, left, top);
+                    _this10.addPoint(point, left, top);
 
-                    _this9.canvas.renderAll();
+                    _this10.canvas.renderAll();
 
-                    _this9.showDrapPopup(point);
+                    _this10.showDrapPopup(point);
                   }); // 折线点停止拖拽后 更新polyline中对应的坐标
 
                   point.on('moved', function () {
                     if (point && point.id.includes('_polylinePoint_')) {
-                      _this9.isDropVisible = false;
+                      _this10.isDropVisible = false;
+
+                      _this10.setEmitFunction(point);
+                    }
+                  });
+                  point.on('mouseup', function (event) {
+                    var button = event.button,
+                        isClick = event.isClick;
 
-                      _this9.setEmitFunction(point);
+                    if (button == 1 && isClick) {
+                      // 可配置批量删除当前项目上的点了
+                      _this10.currentDelPoint = point;
                     }
                   });
                 } // 超出表格最高或最低值则需要触发pointChange事件并且不能更新视图，否则连接节点判断不会成功
 
 
-                isInit && _this9.setEmitFunction(point, isInit);
+                isInit && _this10.setEmitFunction(point, isInit);
                 return _context2.abrupt("return", point);
 
               case 18:
@@ -2662,7 +2711,7 @@ var rightClickNodeConnect = [{
       if (this.addPointList.length === 0) {
         this.$emit('pointChange', data);
       } else {
-        var last = this.addPointList[this.addPointList.length - 1]; // 如果是重合/连线节点
+        var last = this.addPointList.at(-1); // 如果是重合/连线节点
 
         if (point.get('scaleX') !== point.scale) {
           var value = Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, last), {}, {
@@ -2672,23 +2721,40 @@ var rightClickNodeConnect = [{
             }
           });
 
-          if (last.left === point.left) {
-            this.addPointList.splice(-1, 1, value);
+          if (point.line2) {
+            this.addPointList.splice(-1, 1, Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, last), {}, {
+              value: {
+                time: this.getXValue(this._currentPoint.left),
+                value: this.getYValue(this.polyline[point.polylineTypeId].position, this._currentPoint.top)
+              }
+            }));
+            this.addPointList.forEach(function (v) {
+              return v.isConcat = true;
+            });
           } else {
-            this.addPointList.push(value);
+            if (last.left === point.left) {
+              this.addPointList.splice(-1, 1, value);
+            } else {
+              this.addPointList.push(value);
 
-            var _JSON$parse$reverse = JSON.parse(JSON.stringify(this.addPointList)).reverse(),
-                _JSON$parse$reverse2 = _toArray(_JSON$parse$reverse),
-                lastPoint = _JSON$parse$reverse2[0],
-                prePoint = _JSON$parse$reverse2[1],
-                list = _JSON$parse$reverse2.slice(2);
+              var _JSON$parse$reverse = JSON.parse(JSON.stringify(this.addPointList)).reverse(),
+                  _JSON$parse$reverse2 = _toArray(_JSON$parse$reverse),
+                  lastPoint = _JSON$parse$reverse2[0],
+                  prePoint = _JSON$parse$reverse2[1],
+                  list = _JSON$parse$reverse2.slice(2);
 
-            if (prePoint.value.time == lastPoint.value.time) {
-              this.addPointList.splice(-2, 1);
+              if (prePoint.value.time == lastPoint.value.time) {
+                this.addPointList.splice(-2, 1);
+              }
             }
           }
+        } else if (point.line2) {
+          this.addPointList = [];
+          this.repaintPolyline(this.polyline[point.polylineTypeId].position, point.polylineIndex);
+          return;
         }
 
+        !point.line2 && this.addPointList.splice(0, 1);
         !point.id.includes('isTitle') && this.removePolyline(point.id);
         this.$emit('pointOperation', 'increasePointBatch', this.addPointList);
         this.addPointList = [];
@@ -2710,37 +2776,59 @@ var rightClickNodeConnect = [{
       this.addPointList.push(data);
     },
 
-    /**
-     * @description: 滑动批量新增节点
-     * @param {*} point 拖动的最后一个节点
-     * @param {*} originLeft 拖动的源节点的left值
-     * @param {*} originTop 拖动的源节点的top值
-     * @return {*}
+    /**
+     * @description: 滑动批量新增节点
+     * @param {*} point 拖动的最后一个节点
+     * @param {*} originLeft 拖动的源节点的left值
+     * @param {*} originTop 拖动的源节点的top值
+     * @return {*}
      */
     addPoint: function addPoint(point, originLeft, originTop) {
-      var _this10 = this;
+      var _this11 = this;
 
       return Object(asyncToGenerator["a" /* default */])( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
-        var _this10$propItems, xCellWidth, table, originX, addPointSpaceGridNumber, left, top, currentLeft, startLength, n, spaceWidth, residue, condition, checkPoints, points1, _this10$getValue, data, x, y, endLength;
+        var _this11$propItems, xCellWidth, table, originX, addPointSpaceGridNumber, left, top, currentLeft, startLength, n, spaceWidth, residue, condition, conditionNoLine2, conditionHasLine2, checkPoints, _point$line, _point$line2, points1, _this11$getValue, data, x, y, concatPoint, polylineTypeId, polylineIndex, polylineObj, pointObjI, endLength, _point$line3, _point$line4;
 
         return regeneratorRuntime.wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
-                _this10$propItems = _this10.propItems, xCellWidth = _this10$propItems.xCellWidth, table = _this10$propItems.table, originX = _this10$propItems.originX; // const addPointSpaceGridNumbers = table.addPointSpaceGridNumbers || [];
+                concatPoint = function _concatPoint(target) {
+                  var targetLeft = target.left,
+                      targetTop = target.top;
+                  point.setCoords();
+
+                  if (left >= targetLeft - n && left <= targetLeft + n && top <= targetTop + n && top >= targetTop - n) {
+                    point.set({
+                      left: targetLeft,
+                      top: targetTop,
+                      scaleX: point.scale === 1 ? 2.5 : 0.1,
+                      scaleY: point.scale === 1 ? 2.5 : 0.1
+                    });
+                  } else {
+                    point.set({
+                      scaleX: point.scale,
+                      scaleY: point.scale
+                    });
+                  }
+                };
+
+                _this11$propItems = _this11.propItems, xCellWidth = _this11$propItems.xCellWidth, table = _this11$propItems.table, originX = _this11$propItems.originX; // const addPointSpaceGridNumbers = table.addPointSpaceGridNumbers || [];
 
                 addPointSpaceGridNumber = table.addPointSpaceGridNumber || 1;
                 left = point.left, top = point.top;
                 currentLeft = left;
-                startLength = _this10.addPointList.length;
+                startLength = _this11.addPointList.length;
                 n = 6; // 拖动范围，在需要增加节点的刻度左右吸入的范围值
 
                 spaceWidth = xCellWidth * addPointSpaceGridNumber;
                 residue = (left - originLeft) % spaceWidth;
                 condition = residue > spaceWidth - n || residue < n;
+                conditionNoLine2 = !point.line2 && left > originLeft;
+                conditionHasLine2 = point.line2 && left > originLeft + spaceWidth; // if (!point.line2 && left > originLeft && condition) {
 
-                if (!(!point.line2 && left > originLeft && condition)) {
-                  _context3.next = 32;
+                if (!(condition && (conditionNoLine2 || conditionHasLine2))) {
+                  _context3.next = 36;
                   break;
                 }
 
@@ -2751,24 +2839,24 @@ var rightClickNodeConnect = [{
                 });
 
                 checkPoints = function checkPoints() {
-                  var _this10$addPointList;
+                  var _this11$addPointList;
 
                   var PointLens = Math.floor((left - originLeft) / spaceWidth);
 
-                  if (PointLens > 1 && ((_this10$addPointList = _this10.addPointList) === null || _this10$addPointList === void 0 ? void 0 : _this10$addPointList.length) < PointLens) {
+                  if (PointLens > 1 && ((_this11$addPointList = _this11.addPointList) === null || _this11$addPointList === void 0 ? void 0 : _this11$addPointList.length) < PointLens) {
                     for (var k = 0; k < PointLens; k++) {
                       if (k > 0) {
                         (function () {
                           var curLeft = originLeft + spaceWidth * k; // 判断this.addPointList中的left是否包含curLeft，不包含就说明是漏了
 
-                          var isNoLack = _this10.addPointList.some(function (v) {
+                          var isNoLack = _this11.addPointList.some(function (v) {
                             return v.left === curLeft;
                           });
 
                           if (!isNoLack) {
                             var index;
 
-                            var pointObj = _this10.addPointList.find(function (v, i) {
+                            var pointObj = _this11.addPointList.find(function (v, i) {
                               if (v.left > curLeft) {
                                 index = i;
                               }
@@ -2778,10 +2866,10 @@ var rightClickNodeConnect = [{
 
                             if (pointObj) {
                               var cloneObj = JSON.parse(JSON.stringify(pointObj));
-                              cloneObj.value.time = _this10.getXValue(curLeft);
+                              cloneObj.value.time = _this11.getXValue(curLeft);
                               cloneObj.left = curLeft;
 
-                              _this10.addPointList.splice(index, 0, cloneObj);
+                              _this11.addPointList.splice(index, 0, cloneObj);
                             }
                           }
                         })();
@@ -2792,47 +2880,53 @@ var rightClickNodeConnect = [{
                 // 复制点和线
 
 
-                if (!(left > originLeft)) {
-                  _context3.next = 32;
+                if (!(conditionNoLine2 || conditionHasLine2)) {
+                  _context3.next = 36;
                   break;
                 }
 
-                point.line1 && _this10.removePolyline(point.line1.id); // if (i === 1) {
+                // point.line1 && this.removePolyline(point.line1.id);
+                (_point$line = point.line1) === null || _point$line === void 0 ? void 0 : _point$line.set({
+                  stroke: 'transparent'
+                });
+                conditionHasLine2 && ((_point$line2 = point.line2) === null || _point$line2 === void 0 ? void 0 : _point$line2.set({
+                  stroke: 'transparent'
+                })); // if (i === 1) {
 
-                _context3.t0 = _this10.addPointList.length == 0;
+                _context3.t0 = _this11.addPointList.length == 0;
 
                 if (!_context3.t0) {
-                  _context3.next = 20;
+                  _context3.next = 24;
                   break;
                 }
 
-                _context3.next = 20;
-                return _this10.clonePoint(point, [point.line1 ? point.line1.x1 : originLeft, point.line1 ? point.line1.y1 : originTop, originLeft, originTop]);
+                _context3.next = 24;
+                return _this11.clonePoint(point, [point.line1 ? point.line1.x1 : originLeft, point.line1 ? point.line1.y1 : originTop, originLeft, originTop]);
 
-              case 20:
-                if (!_this10.addPointList.every(function (v) {
+              case 24:
+                if (!_this11.addPointList.every(function (v) {
                   return v.left !== left;
                 })) {
-                  _context3.next = 31;
+                  _context3.next = 35;
                   break;
                 }
 
                 // const points1 = i === 1 ? [originLeft, originTop] : point.prePoints;
-                points1 = _this10.addPointList.length == 0 ? [originLeft, originTop] : point.prePoints;
+                points1 = _this11.addPointList.length == 0 ? [originLeft, originTop] : point.prePoints;
                 _context3.t1 = points1;
 
                 if (!_context3.t1) {
-                  _context3.next = 26;
+                  _context3.next = 30;
                   break;
                 }
 
-                _context3.next = 26;
-                return _this10.clonePoint(point, [].concat(Object(toConsumableArray["a" /* default */])(points1), [left, top]));
+                _context3.next = 30;
+                return _this11.clonePoint(point, [].concat(Object(toConsumableArray["a" /* default */])(points1), [left, top]));
 
-              case 26:
+              case 30:
                 // this.setAddPointList(point);
                 // 调用上面方法就会导致线段绘制失败，目前还不知道为啥子
-                _this10$getValue = _this10.getValue(point), data = _this10$getValue.data, x = _this10$getValue.x, y = _this10$getValue.y;
+                _this11$getValue = _this11.getValue(point), data = _this11$getValue.data, x = _this11$getValue.x, y = _this11$getValue.y;
                 data.value = {
                   time: x,
                   value: y
@@ -2840,45 +2934,55 @@ var rightClickNodeConnect = [{
                 data.left = point.left;
                 data.top = top;
 
-                _this10.addPointList.push(data);
+                _this11.addPointList.push(data);
 
-              case 31:
+              case 35:
                 checkPoints();
 
-              case 32:
-                // 断点相连
-                if (point.nextPoint && left >= point.nextPoint.left - n && top <= point.nextPoint.top + n && top >= point.nextPoint.top - n) {
-                  point.set({
-                    left: point.nextPoint.get('left'),
-                    top: point.nextPoint.get('top'),
-                    scaleX: point.scale === 1 ? 2.5 : 0.1,
-                    scaleY: point.scale === 1 ? 2.5 : 0.1
+              case 36:
+                // 检查是否显示重合连线放大节点的标识
+                if (conditionHasLine2) {
+                  polylineTypeId = point.polylineTypeId, polylineIndex = point.polylineIndex;
+                  polylineObj = _this11.polylinePointList.find(function (v) {
+                    return v.polylineTypeId == polylineTypeId && v.polylineIndex == polylineIndex;
                   });
-                } else if (point.nextPoint) {
-                  point.set({
-                    scaleX: point.scale,
-                    scaleY: point.scale
+                  pointObjI = polylineObj === null || polylineObj === void 0 ? void 0 : polylineObj.pointerList.findIndex(function (v) {
+                    return v + n > left;
                   });
+                  pointObjI > -1 && concatPoint(polylineObj === null || polylineObj === void 0 ? void 0 : polylineObj.pointList[pointObjI]);
+                  _this11._currentPoint = polylineObj === null || polylineObj === void 0 ? void 0 : polylineObj.pointList[pointObjI];
+                } else {
+                  point.nextPoint && concatPoint(point.nextPoint);
                 } // 如果往回拖动则删除经过的已存在的节点
 
 
-                if (startLength > 0 && currentLeft <= _this10.addPointList[startLength - 1].left) {
-                  _this10.removePolyline('increasePointBatch', left);
+                if (startLength > 0 && currentLeft <= _this11.addPointList[startLength - 1].left) {
+                  _this11.removePolyline('increasePointBatch', left);
 
-                  _this10.addPointList = _this10.addPointList.filter(function (v) {
+                  _this11.addPointList = _this11.addPointList.filter(function (v) {
                     return v.left < left;
                   });
-                  endLength = _this10.addPointList.length;
-                  if (endLength === 0) _this10.removePolyline('increasePointBatch', originLeft);
+                  endLength = _this11.addPointList.length;
+
+                  if (endLength === 0) {
+                    (_point$line3 = point.line1) === null || _point$line3 === void 0 ? void 0 : _point$line3.set({
+                      stroke: point.stroke
+                    });
+                    conditionHasLine2 && ((_point$line4 = point.line2) === null || _point$line4 === void 0 ? void 0 : _point$line4.set({
+                      stroke: point.stroke
+                    }));
+
+                    _this11.removePolyline('increasePointBatch', originLeft);
+                  }
 
                   if (endLength > 0) {
                     point.set({
-                      prePoints: [_this10.addPointList[endLength - 1].left, _this10.addPointList[endLength - 1].top]
+                      prePoints: [_this11.addPointList[endLength - 1].left, _this11.addPointList[endLength - 1].top]
                     });
                   }
                 }
 
-              case 34:
+              case 38:
               case "end":
                 return _context3.stop();
             }
@@ -2887,7 +2991,7 @@ var rightClickNodeConnect = [{
       }))();
     },
     clonePoint: function clonePoint(point, points) {
-      var _this11 = this;
+      var _this12 = this;
 
       var evented, selectable, lineIndex, polylineIndex, lineAttr, polylineTypeId;
       evented = selectable = false;
@@ -2904,14 +3008,16 @@ var rightClickNodeConnect = [{
             id: '_polylinePoint_' + new Date().getTime(),
             // 此id必须，用于remove节点的时候
             polylineTypeId: polylineTypeId,
-            polylineIndex: point.polylineIndex
+            polylineIndex: point.polylineIndex,
+            scaleX: point.scale,
+            scaleY: point.scale
           });
           clonedObj.hasControls = clonedObj.hasBorders = false;
           point.set({
             prePoints: [point.left, point.top]
           });
 
-          var line = _this11.drawLine(Object(toConsumableArray["a" /* default */])(points), Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({
+          var line = _this12.drawLine(Object(toConsumableArray["a" /* default */])(points), Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({
             evented: evented,
             selectable: selectable
           }, lineAttr), {}, {
@@ -2922,13 +3028,13 @@ var rightClickNodeConnect = [{
 
           clonedObj.line1 = line;
 
-          _this11.canvas.sendBackwards(line);
+          _this12.canvas.sendBackwards(line);
 
           clonedObj.bringForward();
 
-          _this11.canvas.add(clonedObj);
+          _this12.canvas.add(clonedObj);
 
-          _this11.canvas.renderAll();
+          _this12.canvas.renderAll();
 
           resolve(clonedObj);
         });
@@ -2969,10 +3075,10 @@ var rightClickNodeConnect = [{
       return y;
     },
 
-    /**
-     * 绘制折线点
-     * @param {lines} 线坐标 [x1, y1, x2, y2]
-     * @param {others} 参数 polylineIndex | pointIndex | ...polyline.lineAttr
+    /**
+     * 绘制折线点
+     * @param {lines} 线坐标 [x1, y1, x2, y2]
+     * @param {others} 参数 polylineIndex | pointIndex | ...polyline.lineAttr
      */
     drawLine: function drawLine(lines, others) {
       var lineId = "".concat(others.lineIndex, "_").concat(others.polylineIndex, "_polylineLine_").concat(new Date().getTime());
@@ -3011,9 +3117,9 @@ var rightClickNodeConnect = [{
             var _y$toString$split = y.toString().split('.'),
                 _y$toString$split2 = Object(slicedToArray["a" /* default */])(_y$toString$split, 2),
                 m = _y$toString$split2[0],
-                n = _y$toString$split2[1];
+                _n = _y$toString$split2[1];
 
-            return parseFloat("".concat(m, ".").concat(n.slice(0, 1))) * 10 / 10;
+            return parseFloat("".concat(m, ".").concat(_n.slice(0, 1))) * 10 / 10;
           }
 
           return y;
@@ -3055,7 +3161,7 @@ var rightClickNodeConnect = [{
     },
     // 打开右键菜单
     openRightModal: function openRightModal(event) {
-      var _this12 = this;
+      var _this13 = this;
 
       this.rightPos = {
         clientX: event.e.clientX || event.e.pageX,
@@ -3066,10 +3172,10 @@ var rightClickNodeConnect = [{
       var id = target ? target.id : '';
       this.$nextTick(function () {
         if (id && id.includes('_polylinePoint_')) {
-          _this12._currentPoint = target;
+          _this13._currentPoint = target;
           var nodeConnect = [];
 
-          if (_this12.propItems.operable.connect) {
+          if (_this13.propItems.operable.connect) {
             if (!target.line2 && target.nextPoint) {
               nodeConnect = rightClickNodeConnect.slice(0, 1);
             }
@@ -3083,13 +3189,13 @@ var rightClickNodeConnect = [{
             }
           }
 
-          _this12.rightClickNode = Object.freeze(rightClickNode.slice(0, 1).concat(nodeConnect).concat(rightClickNode.slice(-1)));
-          _this12.isRightVisible = true;
+          _this13.rightClickNode = Object.freeze(rightClickNode.slice(0, 1).concat(nodeConnect).concat(rightClickNode.slice(-1)));
+          _this13.isRightVisible = true;
         } else if (!id) {
-          var operable = _this12.propItems.operable;
-          _this12._currentPoint = null;
-          _this12.rightClickNode = Object.freeze(operable.set ? rightClickNode.slice(0, 2) : rightClickNode.slice(0, 1));
-          _this12.isRightVisible = true;
+          var operable = _this13.propItems.operable;
+          _this13._currentPoint = null;
+          _this13.rightClickNode = Object.freeze(operable.set ? rightClickNode.slice(0, 2) : rightClickNode.slice(0, 1));
+          _this13.isRightVisible = true;
         }
       });
     },
@@ -3154,8 +3260,19 @@ var rightClickNodeConnect = [{
       if (obj.id && /_polyline(Point|Line)_/.test(obj.id) && !obj.id.includes('isTitle') && isPolyLine) return true;
       return;
     },
+    // 将当条线段以及点层级置顶
+    // 线段不能先置顶，会挡住其他线段上的点
+    pointToFront: function pointToFront(point) {
+      var _this14 = this;
+
+      this.canvas.forEachObject(function (obj) {
+        if (_this14.isOnePolyLine(obj, point.polylineTypeId, point.polylineIndex)) {
+          _this14.canvas.bringToFront(obj);
+        }
+      });
+    },
     removePolyline: function removePolyline(id, left, position, polylineIndex) {
-      var _this13 = this;
+      var _this15 = this;
 
       // 根据id或者idClone删除
       if (id) {
@@ -3167,13 +3284,13 @@ var rightClickNodeConnect = [{
         if (point && point.length > 0) {
           point.forEach(function (v) {
             if (left && v.left >= left) {
-              _this13.canvas.remove(v);
+              _this15.canvas.remove(v);
 
-              v.line1 && _this13.canvas.remove(v.line1);
+              v.line1 && _this15.canvas.remove(v.line1);
             } else if (!left) {
-              _this13.canvas.remove(v);
+              _this15.canvas.remove(v);
 
-              v.line1 && _this13.canvas.remove(v.line1);
+              v.line1 && _this15.canvas.remove(v.line1);
             }
           });
         }
@@ -3187,12 +3304,12 @@ var rightClickNodeConnect = [{
           return v.position === position;
         });
         this.canvas.forEachObject(function (obj) {
-          if (_this13.isOnePolyLine(obj, polylineTypeId, polylineIndex)) {
-            obj.text && _this13.canvas.remove(obj.text);
-            obj.line1 && _this13.canvas.remove(obj.line1);
-            obj.line2 && _this13.canvas.remove(obj.line2);
+          if (_this15.isOnePolyLine(obj, polylineTypeId, polylineIndex)) {
+            obj.text && _this15.canvas.remove(obj.text);
+            obj.line1 && _this15.canvas.remove(obj.line1);
+            obj.line2 && _this15.canvas.remove(obj.line2);
 
-            _this13.canvas.remove(obj);
+            _this15.canvas.remove(obj);
           }
         });
         return;
@@ -3201,9 +3318,9 @@ var rightClickNodeConnect = [{
 
       this.canvas.forEachObject(function (obj) {
         if (obj.id && /_polyline(Point|Line)_/.test(obj.id) && !obj.id.includes('isTitle')) {
-          obj.text && _this13.canvas.remove(obj.text);
+          obj.text && _this15.canvas.remove(obj.text);
 
-          _this13.canvas.remove(obj);
+          _this15.canvas.remove(obj);
         }
       });
     },
@@ -3214,15 +3331,16 @@ var rightClickNodeConnect = [{
       }
     },
     repaintPolyline: function repaintPolyline(position, dadaIndex) {
-      var _this14 = this;
+      var _this16 = this;
 
       if (arguments.length < 2) {
         if (this.polyline.length) {
           this.removePolyline();
         }
 
+        this.polylinePointList = [];
         this.polyline.forEach(function (polylineType, polylineTypeId) {
-          _this14.createPolyline(polylineType, polylineTypeId);
+          _this16.createPolyline(polylineType, polylineTypeId);
         });
         this.removeTitle();
         this.drawPolylineTitle();
@@ -3248,8 +3366,8 @@ var rightClickNodeConnect = [{
 
 var FabricPolylines_component = Object(componentNormalizer["a" /* default */])(
   fabric_chart_FabricPolylinesvue_type_script_lang_js_,
-  FabricPolylinesvue_type_template_id_1031ec15_render,
-  FabricPolylinesvue_type_template_id_1031ec15_staticRenderFns,
+  FabricPolylinesvue_type_template_id_638600a8_render,
+  FabricPolylinesvue_type_template_id_638600a8_staticRenderFns,
   false,
   null,
   null,
@@ -3353,7 +3471,7 @@ 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":"5d550778-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=84b14bd8&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"3fd9a2cc-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=84b14bd8&
 var FabricTextGroupvue_type_template_id_84b14bd8_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"text-group"},[(_vm.isRightVisible)?_c('MouseRightClick',{attrs:{"getContainer":_vm.getContainer,"nodeList":_vm.rightClickNode,"rightPos":_vm.rightPos},on:{"nodeClick":_vm.handleRightClick,"closeRight":function($event){_vm.isRightVisible = false}}}):_vm._e(),(_vm.isDropVisible)?_c('DropPopup',{attrs:{"val":_vm.dropVal,"dropPos":_vm.dropPos}}):_vm._e()],1)}
 var FabricTextGroupvue_type_template_id_84b14bd8_staticRenderFns = []
 
@@ -4145,19 +4263,19 @@ 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":"5d550778-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=e702a32a&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"3fd9a2cc-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=e702a32a&
 var FabricScaleValuevue_type_template_id_e702a32a_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.templateData.top.xScalevalue.popupTop)?_c('TimeScaleValue',{attrs:{"times":_vm.timeList,"templateData":_vm.templateData}}):_vm._e()}
 var FabricScaleValuevue_type_template_id_e702a32a_staticRenderFns = []
 
 
 // CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricScaleValue.vue?vue&type=template&id=e702a32a&
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5d550778-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=64942e54&scoped=true&
-var TimeScaleValuevue_type_template_id_64942e54_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_64942e54_scoped_true_staticRenderFns = []
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"3fd9a2cc-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=a10b6e3e&scoped=true&
+var TimeScaleValuevue_type_template_id_a10b6e3e_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_a10b6e3e_scoped_true_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/fabric-chart/src/components/TimeScaleValue.vue?vue&type=template&id=64942e54&scoped=true&
+// CONCATENATED MODULE: ./packages/fabric-chart/src/components/TimeScaleValue.vue?vue&type=template&id=a10b6e3e&scoped=true&
 
 // EXTERNAL MODULE: external "cnhis-design-vue/es/utils/vexutils"
 var vexutils_ = __webpack_require__("9715");
@@ -4261,12 +4379,7 @@ var vexutils_default = /*#__PURE__*/__webpack_require__.n(vexutils_);
             xScalevalue = _ref2.xScalevalue;
 
         var popupTop = (xScalevalue === null || xScalevalue === void 0 ? void 0 : xScalevalue.popupTop) || 0;
-
-        if (top + newOriginY < popupTop) {
-          this.isShow = true;
-        } else {
-          this.isShow = false;
-        }
+        this.isShow = top + newOriginY < popupTop ? true : false;
       }
     }
   },
@@ -4276,8 +4389,8 @@ var vexutils_default = /*#__PURE__*/__webpack_require__.n(vexutils_);
 });
 // CONCATENATED MODULE: ./packages/fabric-chart/src/components/TimeScaleValue.vue?vue&type=script&lang=js&
  /* harmony default export */ var components_TimeScaleValuevue_type_script_lang_js_ = (TimeScaleValuevue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./packages/fabric-chart/src/components/TimeScaleValue.vue?vue&type=style&index=0&id=64942e54&lang=less&scoped=true&
-var TimeScaleValuevue_type_style_index_0_id_64942e54_lang_less_scoped_true_ = __webpack_require__("c8fe");
+// EXTERNAL MODULE: ./packages/fabric-chart/src/components/TimeScaleValue.vue?vue&type=style&index=0&id=a10b6e3e&lang=less&scoped=true&
+var TimeScaleValuevue_type_style_index_0_id_a10b6e3e_lang_less_scoped_true_ = __webpack_require__("e350");
 
 // CONCATENATED MODULE: ./packages/fabric-chart/src/components/TimeScaleValue.vue
 
@@ -4290,11 +4403,11 @@ var TimeScaleValuevue_type_style_index_0_id_64942e54_lang_less_scoped_true_ = __
 
 var TimeScaleValue_component = Object(componentNormalizer["a" /* default */])(
   components_TimeScaleValuevue_type_script_lang_js_,
-  TimeScaleValuevue_type_template_id_64942e54_scoped_true_render,
-  TimeScaleValuevue_type_template_id_64942e54_scoped_true_staticRenderFns,
+  TimeScaleValuevue_type_template_id_a10b6e3e_scoped_true_render,
+  TimeScaleValuevue_type_template_id_a10b6e3e_scoped_true_staticRenderFns,
   false,
   null,
-  "64942e54",
+  "a10b6e3e",
   null
   
 )
@@ -4491,7 +4604,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":"5d550778-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=229d2d58&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"3fd9a2cc-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=229d2d58&
 var FabricLinesvue_type_template_id_229d2d58_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"line"},[(_vm.isRightVisible)?_c('MouseRightClick',{attrs:{"getContainer":_vm.getContainer,"nodeList":_vm.rightClickNode,"rightPos":_vm.rightPos},on:{"nodeClick":_vm.handleRightClick,"closeRight":function($event){_vm.isRightVisible = false}}}):_vm._e(),(_vm.isDropVisible)?_c('DropPopup',{attrs:{"val":_vm.dropVal,"dropPos":_vm.dropPos}}):_vm._e()],1)}
 var FabricLinesvue_type_template_id_229d2d58_staticRenderFns = []
 
@@ -5866,7 +5979,7 @@ var FabricBottom_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var FabricBottom = (FabricBottom_component.exports);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5d550778-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-chart2/FabricCenter.vue?vue&type=template&id=4d90e644&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"3fd9a2cc-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-chart2/FabricCenter.vue?vue&type=template&id=4d90e644&
 var FabricCentervue_type_template_id_4d90e644_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"poly-line"},[(_vm.isRightVisible)?_c('MouseRightClick',{attrs:{"getContainer":_vm.getContainer,"nodeList":_vm.rightClickNode,"rightPos":_vm.rightPos},on:{"nodeClick":_vm.handleRightClick,"closeRight":function($event){_vm.isRightVisible = false}}}):_vm._e(),(_vm.isDropVisible)?_c('DropPopup',{attrs:{"val":_vm.dropVal,"dropPos":_vm.dropPos}}):_vm._e()],1)}
 var FabricCentervue_type_template_id_4d90e644_staticRenderFns = []
 
@@ -7348,13 +7461,6 @@ module.exports = function (CONSTRUCTOR_NAME) {
 /* unused harmony reexport * */
 
 
-/***/ }),
-
-/***/ "2794":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
 /***/ }),
 
 /***/ "2871":
@@ -8857,6 +8963,13 @@ module.exports = require("core-js/modules/es.object.to-string.js");
 
 /***/ }),
 
+/***/ "98a5":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
+/***/ }),
+
 /***/ "9b22":
 /***/ (function(module, exports) {
 
@@ -9320,17 +9433,6 @@ try {
 module.exports = g;
 
 
-/***/ }),
-
-/***/ "c8fe":
-/***/ (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_TimeScaleValue_vue_vue_type_style_index_0_id_64942e54_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("2794");
-/* 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_TimeScaleValue_vue_vue_type_style_index_0_id_64942e54_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_TimeScaleValue_vue_vue_type_style_index_0_id_64942e54_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "ca84":
@@ -9788,6 +9890,17 @@ module.exports = function (target, src, options) {
 };
 
 
+/***/ }),
+
+/***/ "e350":
+/***/ (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_TimeScaleValue_vue_vue_type_style_index_0_id_a10b6e3e_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("98a5");
+/* 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_TimeScaleValue_vue_vue_type_style_index_0_id_a10b6e3e_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_TimeScaleValue_vue_vue_type_style_index_0_id_a10b6e3e_lang_less_scoped_true___WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "e667":