cnhis-design-vue 2.1.122 → 2.1.125

package/es/fabric-chart/index.js

@@ -295,7 +295,7 @@ var es_promise_finally = __webpack_require__("a79d");
 // EXTERNAL MODULE: external "core-js/modules/es.function.name.js"
 var es_function_name_js_ = __webpack_require__("db0a");
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"3c3eaeea-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/FabricChart.vue?vue&type=template&id=76395f46&scoped=true&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"77d0f074-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/FabricChart.vue?vue&type=template&id=76395f46&scoped=true&
 var render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"c-fabric-chart",style:({ width: _vm.canvasWidth })},[(_vm.rendercanvas)?_c('fabric-canvas',_vm._b({ref:"canvasEle",attrs:{"templateData":_vm.templateData}},'fabric-canvas',_vm.$attrs,false),[_c('fabric-grid'),(_vm.hasXScalevalue)?_c('fabric-text-group',_vm._g({ref:"otherGroups",attrs:{"templateData":_vm.templateData}},_vm.$listeners)):_vm._e(),(_vm.hasTable)?_c('fabric-scale-value',{attrs:{"templateData":_vm.templateData}}):_vm._e(),(_vm.hasTopTable)?_c('fabric-lines',_vm._g({ref:"lines",attrs:{"linesObj":_vm.templateData.top}},_vm.$listeners)):_vm._e(),(_vm.hasTable)?_c('fabric-polylines',_vm._g({ref:"polylines",attrs:{"polyline":_vm.polylines,"other":_vm.templateData.left.other || {},"timeRangeStyle":_vm.templateData.timeRangeStyle || {}},on:{"pointOperation":_vm.pointOperation}},_vm.$listeners)):_vm._e()],1):_vm._e()],1)}
 var staticRenderFns = []
 
@@ -308,7 +308,7 @@ var objectSpread2 = __webpack_require__("5530");
 // EXTERNAL MODULE: ./src/core/create.js
 var create = __webpack_require__("8aef");
 
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"3c3eaeea-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricCanvas.vue?vue&type=template&id=37bd438c&
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"77d0f074-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricCanvas.vue?vue&type=template&id=37bd438c&
 var FabricCanvasvue_type_template_id_37bd438c_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('canvas',{attrs:{"id":_vm.id}}),_vm._t("default")],2)}
 var FabricCanvasvue_type_template_id_37bd438c_staticRenderFns = []
 
@@ -968,12 +968,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":"3c3eaeea-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=6acaeef6&
-var FabricPolylinesvue_type_template_id_6acaeef6_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_6acaeef6_staticRenderFns = []
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"77d0f074-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricPolylines.vue?vue&type=template&id=6078d968&
+var FabricPolylinesvue_type_template_id_6078d968_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"poly-line"},[_c('MouseRightClick',{directives:[{name:"show",rawName:"v-show",value:(_vm.isRightVisible),expression:"isRightVisible"}],attrs:{"getContainer":_vm.getContainer,"nodeList":_vm.rightClickNode,"rightPos":_vm.rightPos},on:{"nodeClick":_vm.handleRightClick,"closeRight":function($event){_vm.isRightVisible = false}}}),_c('DropPopup',{directives:[{name:"show",rawName:"v-show",value:(_vm.isDropVisible),expression:"isDropVisible"}],attrs:{"val":_vm.dropVal,"dropPos":_vm.dropPos}})],1)}
+var FabricPolylinesvue_type_template_id_6078d968_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricPolylines.vue?vue&type=template&id=6acaeef6&
+// CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricPolylines.vue?vue&type=template&id=6078d968&
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/asyncToGenerator.js
 var asyncToGenerator = __webpack_require__("1da1");
@@ -1159,11 +1159,9 @@ var utils_isObject = function isObject(obj) {
 function getTangent(angle) {
   return +Math.tan(angle * Math.PI / 180);
 }
-
 function nearlyEqual(v1, v2) {
   return Math.abs(v1 - v2) <= 0.0001;
 }
-
 function sortPoints(points) {
   return points.sort(function (a, b) {
     return a[1] - b[1];
@@ -1840,7 +1838,7 @@ function getIntersectionPoint(a, b, c, d) {
     }
   }
 });
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"3c3eaeea-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":"77d0f074-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/components/MouseRightClick.vue?vue&type=template&id=25d4407a&scoped=true&
 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 = []
 
@@ -1948,7 +1946,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":"3c3eaeea-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":"77d0f074-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/components/DropPopup.vue?vue&type=template&id=c4db0ace&scoped=true&
 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 = []
 
@@ -2099,6 +2097,7 @@ var external_vue_default = /*#__PURE__*/__webpack_require__.n(external_vue_);
 
 
 
+
 /**
  * @description: 递归遍历节点，设置颜色属性
  * @param {fabric.Object[]} pointArr
@@ -2943,7 +2942,9 @@ var rightClickNodeConnect = [{
 
       var _this$propItems6 = this.propItems,
           originY = _this$propItems6.originY,
-          endY = _this$propItems6.endY;
+          endY = _this$propItems6.endY,
+          xCellWidth = _this$propItems6.xCellWidth,
+          table = _this$propItems6.table;
       var _polyline$list = polyline.list,
           list = _polyline$list === void 0 ? [] : _polyline$list,
           _polyline$critical = polyline.critical,
@@ -3011,11 +3012,11 @@ var rightClickNodeConnect = [{
         var line;
         var point;
         var previousLine;
-        line = points && nextPoint && !((_linePoints$data = linePoints.data) !== null && _linePoints$data !== void 0 && _linePoints$data.breakpoint) ? _this11.drawLine([].concat(Object(toConsumableArray["a" /* default */])(points), Object(toConsumableArray["a" /* default */])(nextPoint)), Object(objectSpread2["a" /* default */])({
+        line = !points || !nextPoint || (_linePoints$data = linePoints.data) !== null && _linePoints$data !== void 0 && _linePoints$data.breakpoint || table.breakpoint && nextPoint[0] - points[0] > xCellWidth ? null : _this11.drawLine([].concat(Object(toConsumableArray["a" /* default */])(points), Object(toConsumableArray["a" /* default */])(nextPoint)), Object(objectSpread2["a" /* default */])({
           polylineIndex: polylineIndex,
           polylineTypeId: polylineTypeId,
           lineIndex: index
-        }, lineAttr)) : null;
+        }, lineAttr));
         previousLine = lineList[index - 1];
 
         var pointOthers = Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({
@@ -3389,10 +3390,10 @@ var rightClickNodeConnect = [{
         };
 
         var currentPointObj = _this15.addPointObjList.find(function (obj) {
-          return obj.left === currentPoint.left;
+          return nearlyEqual(obj.left, currentPoint.left);
         });
 
-        if ((currentPointObj === null || currentPointObj === void 0 ? void 0 : (_currentPointObj$line = currentPointObj.line1) === null || _currentPointObj$line === void 0 ? void 0 : _currentPointObj$line.x1) !== prevPoint.left) {
+        if (!nearlyEqual(currentPointObj === null || currentPointObj === void 0 ? void 0 : (_currentPointObj$line = currentPointObj.line1) === null || _currentPointObj$line === void 0 ? void 0 : _currentPointObj$line.x1, prevPoint.left)) {
           var _currentPointObj$line2;
 
           currentPointObj === null || currentPointObj === void 0 ? void 0 : (_currentPointObj$line2 = currentPointObj.line1) === null || _currentPointObj$line2 === void 0 ? void 0 : _currentPointObj$line2.set({
@@ -3428,7 +3429,7 @@ var rightClickNodeConnect = [{
               var curLeft = originLeft + _this16.spaceWidth * k; // 判断this.addPointList中的left是否包含curLeft，不包含就说明是漏了
 
               var hasPoint = _this16.addPointList.some(function (p) {
-                return Math.abs(p.left - curLeft) <= 0.001;
+                return nearlyEqual(p.left, curLeft);
               }); // const hasPoint = this.addPointList.some(v => v.left == curLeft);
 
 
@@ -3483,7 +3484,7 @@ var rightClickNodeConnect = [{
           originTop = point.originTop;
       var currentLeft = left;
       var startLength = this.addPointList.length;
-      var n = 6; // 拖动范围，在需要增加节点的刻度左右吸入的范围值
+      var n = Math.min(this.spaceWidth / 2, 6); // 拖动范围，在需要增加节点的刻度左右吸入的范围值
 
       var residue = (left - originLeft) % this.spaceWidth;
       var condition = residue > 0 && (residue > this.spaceWidth - n || residue < n);
@@ -3504,7 +3505,7 @@ var rightClickNodeConnect = [{
           this.addPointList.length == 0 && this.clonePoint(point, [point.line1 ? point.line1.x1 : originLeft, point.line1 ? point.line1.y1 : originTop, originLeft, originTop]);
 
           if (this.addPointList.every(function (v) {
-            return v.left !== left;
+            return !nearlyEqual(v.left, left);
           })) {
             // const points1 = i === 1 ? [originLeft, originTop] : point.prePoints;
             var points1 = this.addPointList.length == 0 ? [originLeft, originTop] : point.prePoints;
@@ -3526,7 +3527,7 @@ var rightClickNodeConnect = [{
               data.top = top; // 避免重复添加
 
               if (this.addPointObjList.every(function (o) {
-                return o.left !== left;
+                return !nearlyEqual(o.left, left);
               })) {
                 this.addPointList.push(data);
                 this.clonePoint(point, [].concat(Object(toConsumableArray["a" /* default */])(points1), [left, top]));
@@ -4027,8 +4028,8 @@ var rightClickNodeConnect = [{
 
 var FabricPolylines_component = Object(componentNormalizer["a" /* default */])(
   fabric_chart_FabricPolylinesvue_type_script_lang_js_,
-  FabricPolylinesvue_type_template_id_6acaeef6_render,
-  FabricPolylinesvue_type_template_id_6acaeef6_staticRenderFns,
+  FabricPolylinesvue_type_template_id_6078d968_render,
+  FabricPolylinesvue_type_template_id_6078d968_staticRenderFns,
   false,
   null,
   null,
@@ -4134,12 +4135,15 @@ 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":"3c3eaeea-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=2d01f090&
-var FabricTextGroupvue_type_template_id_2d01f090_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_2d01f090_staticRenderFns = []
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"77d0f074-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricTextGroup.vue?vue&type=template&id=92bb118e&
+var FabricTextGroupvue_type_template_id_92bb118e_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"text-group"},[_c('MouseRightClick',{directives:[{name:"show",rawName:"v-show",value:(_vm.isRightVisible),expression:"isRightVisible"}],attrs:{"getContainer":_vm.getContainer,"nodeList":_vm.rightClickNode,"rightPos":_vm.rightPos},on:{"nodeClick":_vm.handleRightClick,"closeRight":function($event){_vm.isRightVisible = false}}}),_c('DropPopup',{directives:[{name:"show",rawName:"v-show",value:(_vm.isDropVisible),expression:"isDropVisible"}],attrs:{"val":_vm.dropVal,"dropPos":_vm.dropPos}})],1)}
+var FabricTextGroupvue_type_template_id_92bb118e_staticRenderFns = []
+
 
+// CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricTextGroup.vue?vue&type=template&id=92bb118e&
 
-// CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricTextGroup.vue?vue&type=template&id=2d01f090&
+// EXTERNAL MODULE: external "core-js/modules/es.reflect.has.js"
+var es_reflect_has_js_ = __webpack_require__("bfdc");
 
 // EXTERNAL MODULE: external "lodash/cloneDeep"
 var cloneDeep_ = __webpack_require__("13f2");
@@ -4481,6 +4485,7 @@ var cloneDeep_default = /*#__PURE__*/__webpack_require__.n(cloneDeep_);
 
 
 
+
 
 
 //
@@ -4841,7 +4846,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, prevPoint, 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, iconHalfWidth, text, groupObj;
 
         return regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
@@ -4854,7 +4859,7 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
 
               case 4:
                 if (!(index < len)) {
-                  _context.next = 37;
+                  _context.next = 43;
                   break;
                 }
 
@@ -4893,14 +4898,14 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
 
               case 16:
                 if (!(i < _len)) {
-                  _context.next = 34;
+                  _context.next = 40;
                   break;
                 }
 
                 v = dataList[i];
 
                 if (!_this8.isLimit(v.time)) {
-                  _context.next = 31;
+                  _context.next = 37;
                   break;
                 }
 
@@ -4915,7 +4920,13 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
                 };
                 _left2 = _this8.computedX(v.time);
                 title.dataList.push(_left2);
-                _context.next = 24;
+
+                if (!(!Reflect.has(_icon, 'show') || _icon.show)) {
+                  _context.next = 28;
+                  break;
+                }
+
+                _context.next = 25;
                 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
@@ -4923,18 +4934,27 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
                   stroke: item.style.fill
                 } : {}), _icon.style || {}), commonOptions));
 
-              case 24:
-                icon = _context.sent;
+              case 25:
+                _context.t0 = _context.sent;
+                _context.next = 29;
+                break;
+
+              case 28:
+                _context.t0 = null;
+
+              case 29:
+                icon = _context.t0;
+                iconHalfWidth = icon ? icon.width / 2 : 0;
                 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,
+                  left: _left2 + iconHalfWidth,
                   name: v.value
                 }, commonOptions));
-                groupObj = new _this8.fabric.Group([icon, text], Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({
+                groupObj = new _this8.fabric.Group(icon ? [icon, text] : [text], Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({
                   id: "".concat(index, "_").concat(i, "_other_").concat(Date.now()),
                   lockMovementY: true
                 }, commonOptions), _this8.eventStyle), {}, {
                   realLeft: _left2,
-                  iconHalfWidth: icon.width / 2
+                  iconHalfWidth: iconHalfWidth
                 }));
 
                 if (prevPoint) {
@@ -4948,20 +4968,20 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
 
                 textList.push(groupObj);
 
-              case 31:
+              case 37:
                 i++;
                 _context.next = 16;
                 break;
 
-              case 34:
+              case 40:
                 index++;
                 _context.next = 4;
                 break;
 
-              case 37:
+              case 43:
                 (_this8$canvas = _this8.canvas).add.apply(_this8$canvas, textList);
 
-              case 38:
+              case 44:
               case "end":
                 return _context.stop();
             }
@@ -5523,8 +5543,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_2d01f090_render,
-  FabricTextGroupvue_type_template_id_2d01f090_staticRenderFns,
+  FabricTextGroupvue_type_template_id_92bb118e_render,
+  FabricTextGroupvue_type_template_id_92bb118e_staticRenderFns,
   false,
   null,
   null,
@@ -5533,14 +5553,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":"3c3eaeea-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":"77d0f074-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricScaleValue.vue?vue&type=template&id=68258044&
 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":"3c3eaeea-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":"77d0f074-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/components/TimeScaleValue.vue?vue&type=template&id=3492877c&scoped=true&
 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 = []
 
@@ -5924,12 +5944,12 @@ 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":"3c3eaeea-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=3899ac60&
-var FabricLinesvue_type_template_id_3899ac60_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_3899ac60_staticRenderFns = []
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"77d0f074-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/fabric-chart/src/fabric-chart/FabricLines.vue?vue&type=template&id=74aef744&
+var FabricLinesvue_type_template_id_74aef744_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{staticClass:"line"},[_c('MouseRightClick',{directives:[{name:"show",rawName:"v-show",value:(_vm.isRightVisible),expression:"isRightVisible"}],attrs:{"getContainer":_vm.getContainer,"nodeList":_vm.rightClickNode,"rightPos":_vm.rightPos},on:{"nodeClick":_vm.handleRightClick,"closeRight":function($event){_vm.isRightVisible = false}}}),_c('DropPopup',{directives:[{name:"show",rawName:"v-show",value:(_vm.isDropVisible),expression:"isDropVisible"}],attrs:{"val":_vm.dropVal,"dropPos":_vm.dropPos}})],1)}
+var FabricLinesvue_type_template_id_74aef744_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricLines.vue?vue&type=template&id=3899ac60&
+// CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricLines.vue?vue&type=template&id=74aef744&
 
 // 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/FabricLines.vue?vue&type=script&lang=js&
 
@@ -6346,7 +6366,11 @@ var FabricLinesvue_type_script_lang_js_rightClickNode = [{
 
                   if (_preItem) {
                     _preStartMinute = new Date(_preItem).getTime();
-                    if (_preStartMinute > minMinute && _preStartMinute <= maxMinute) rightLimit.x2 = _this5.computedX(_preItem);
+
+                    if (_preStartMinute > minMinute && _preStartMinute <= maxMinute) {
+                      rightLimit.x2 = _this5.computedX(_preItem);
+                      if (!x2) leftLimit.x2 = rightLimit.x2;
+                    }
                   }
                 } // 文字内容
 
@@ -6869,8 +6893,8 @@ var FabricLinesvue_type_script_lang_js_rightClickNode = [{
 
 var FabricLines_component = Object(componentNormalizer["a" /* default */])(
   fabric_chart_FabricLinesvue_type_script_lang_js_,
-  FabricLinesvue_type_template_id_3899ac60_render,
-  FabricLinesvue_type_template_id_3899ac60_staticRenderFns,
+  FabricLinesvue_type_template_id_74aef744_render,
+  FabricLinesvue_type_template_id_74aef744_staticRenderFns,
   false,
   null,
   null,
@@ -9359,6 +9383,13 @@ module.exports = require("core-js/modules/es.array.join.js");
 
 /***/ }),
 
+/***/ "bfdc":
+/***/ (function(module, exports) {
+
+module.exports = require("core-js/modules/es.reflect.has.js");
+
+/***/ }),
+
 /***/ "c04e":
 /***/ (function(module, exports, __webpack_require__) {
 

package/es/form/index.js

@@ -726,14 +726,14 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var ant_design_vue_es_base_style__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(ant_design_vue_es_base_style__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var ant_design_vue_es_base__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("be79");
 /* harmony import */ var ant_design_vue_es_base__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(ant_design_vue_es_base__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var E_project_cnhis_design_vue2_cnhis_design_v2_node_modules_core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("e260");
-/* harmony import */ var E_project_cnhis_design_vue2_cnhis_design_v2_node_modules_core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(E_project_cnhis_design_vue2_cnhis_design_v2_node_modules_core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var E_project_cnhis_design_vue2_cnhis_design_v2_node_modules_core_js_modules_es_promise_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("e6cf");
-/* harmony import */ var E_project_cnhis_design_vue2_cnhis_design_v2_node_modules_core_js_modules_es_promise_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(E_project_cnhis_design_vue2_cnhis_design_v2_node_modules_core_js_modules_es_promise_js__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var E_project_cnhis_design_vue2_cnhis_design_v2_node_modules_core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("cca6");
-/* harmony import */ var E_project_cnhis_design_vue2_cnhis_design_v2_node_modules_core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(E_project_cnhis_design_vue2_cnhis_design_v2_node_modules_core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var E_project_cnhis_design_vue2_cnhis_design_v2_node_modules_core_js_modules_es_promise_finally_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("a79d");
-/* harmony import */ var E_project_cnhis_design_vue2_cnhis_design_v2_node_modules_core_js_modules_es_promise_finally_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(E_project_cnhis_design_vue2_cnhis_design_v2_node_modules_core_js_modules_es_promise_finally_js__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var F_project_crm_high_new_cnhis_design_v2_node_modules_core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("e260");
+/* harmony import */ var F_project_crm_high_new_cnhis_design_v2_node_modules_core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(F_project_crm_high_new_cnhis_design_v2_node_modules_core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var F_project_crm_high_new_cnhis_design_v2_node_modules_core_js_modules_es_promise_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("e6cf");
+/* harmony import */ var F_project_crm_high_new_cnhis_design_v2_node_modules_core_js_modules_es_promise_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(F_project_crm_high_new_cnhis_design_v2_node_modules_core_js_modules_es_promise_js__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var F_project_crm_high_new_cnhis_design_v2_node_modules_core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("cca6");
+/* harmony import */ var F_project_crm_high_new_cnhis_design_v2_node_modules_core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(F_project_crm_high_new_cnhis_design_v2_node_modules_core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var F_project_crm_high_new_cnhis_design_v2_node_modules_core_js_modules_es_promise_finally_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("a79d");
+/* harmony import */ var F_project_crm_high_new_cnhis_design_v2_node_modules_core_js_modules_es_promise_finally_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(F_project_crm_high_new_cnhis_design_v2_node_modules_core_js_modules_es_promise_finally_js__WEBPACK_IMPORTED_MODULE_5__);
 
 
 

package/es/form-model/index.js

@@ -799,14 +799,14 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var ant_design_vue_es_base_style__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(ant_design_vue_es_base_style__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var ant_design_vue_es_base__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("be79");
 /* harmony import */ var ant_design_vue_es_base__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(ant_design_vue_es_base__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var E_project_cnhis_design_vue2_cnhis_design_v2_node_modules_core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("e260");
-/* harmony import */ var E_project_cnhis_design_vue2_cnhis_design_v2_node_modules_core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(E_project_cnhis_design_vue2_cnhis_design_v2_node_modules_core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var E_project_cnhis_design_vue2_cnhis_design_v2_node_modules_core_js_modules_es_promise_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("e6cf");
-/* harmony import */ var E_project_cnhis_design_vue2_cnhis_design_v2_node_modules_core_js_modules_es_promise_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(E_project_cnhis_design_vue2_cnhis_design_v2_node_modules_core_js_modules_es_promise_js__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var E_project_cnhis_design_vue2_cnhis_design_v2_node_modules_core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("cca6");
-/* harmony import */ var E_project_cnhis_design_vue2_cnhis_design_v2_node_modules_core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(E_project_cnhis_design_vue2_cnhis_design_v2_node_modules_core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var E_project_cnhis_design_vue2_cnhis_design_v2_node_modules_core_js_modules_es_promise_finally_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("a79d");
-/* harmony import */ var E_project_cnhis_design_vue2_cnhis_design_v2_node_modules_core_js_modules_es_promise_finally_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(E_project_cnhis_design_vue2_cnhis_design_v2_node_modules_core_js_modules_es_promise_finally_js__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var F_project_crm_high_new_cnhis_design_v2_node_modules_core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("e260");
+/* harmony import */ var F_project_crm_high_new_cnhis_design_v2_node_modules_core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(F_project_crm_high_new_cnhis_design_v2_node_modules_core_js_modules_es_array_iterator_js__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var F_project_crm_high_new_cnhis_design_v2_node_modules_core_js_modules_es_promise_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("e6cf");
+/* harmony import */ var F_project_crm_high_new_cnhis_design_v2_node_modules_core_js_modules_es_promise_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(F_project_crm_high_new_cnhis_design_v2_node_modules_core_js_modules_es_promise_js__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var F_project_crm_high_new_cnhis_design_v2_node_modules_core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__("cca6");
+/* harmony import */ var F_project_crm_high_new_cnhis_design_v2_node_modules_core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(F_project_crm_high_new_cnhis_design_v2_node_modules_core_js_modules_es_object_assign_js__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var F_project_crm_high_new_cnhis_design_v2_node_modules_core_js_modules_es_promise_finally_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__("a79d");
+/* harmony import */ var F_project_crm_high_new_cnhis_design_v2_node_modules_core_js_modules_es_promise_finally_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(F_project_crm_high_new_cnhis_design_v2_node_modules_core_js_modules_es_promise_finally_js__WEBPACK_IMPORTED_MODULE_5__);