cnhis-design-vue 2.1.61 → 2.1.62
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +18 -0
- package/es/age/index.js +2 -2
- package/es/big-table/index.js +49 -47
- package/es/big-table/style.css +1 -1
- package/es/button/index.js +2 -2
- package/es/captcha/index.js +3 -3
- package/es/checkbox/index.js +1 -1
- package/es/color-picker/index.js +1 -1
- package/es/drag-layout/index.js +3 -3
- package/es/editor/index.js +1 -1
- package/es/ellipsis/index.js +1 -1
- package/es/fabric-chart/index.js +269 -203
- package/es/form-table/index.js +20 -20
- package/es/index/index.js +472 -407
- package/es/index/style.css +1 -1
- package/es/input/index.js +1 -1
- package/es/map/index.js +1 -1
- package/es/multi-chat/index.js +25 -25
- package/es/multi-chat-client/index.js +19 -19
- package/es/multi-chat-history/index.js +4 -4
- package/es/multi-chat-record/index.js +4 -4
- package/es/multi-chat-setting/index.js +20 -20
- package/es/multi-chat-sip/index.js +1 -1
- package/es/radio/index.js +1 -1
- package/es/scale-container/index.js +1 -1
- package/es/scale-view/index.js +27 -27
- package/es/select/index.js +4 -4
- package/es/select-label/index.js +3 -3
- package/es/select-person/index.js +2 -2
- package/es/shortcut-setter/index.js +2 -2
- package/es/table-filter/index.js +48 -44
- package/es/table-filter/style.css +1 -1
- package/es/tag/index.js +1 -1
- package/es/verification-code/index.js +2 -2
- package/lib/cui.common.js +518 -457
- package/lib/cui.umd.js +518 -457
- package/lib/cui.umd.min.js +12 -12
- package/package.json +2 -2
- package/packages/big-table/src/BigTable.vue +4 -2
- package/packages/fabric-chart/src/fabric-chart/FabricLines.vue +19 -7
- package/packages/fabric-chart/src/fabric-chart/FabricPolylines.vue +11 -3
- package/packages/fabric-chart/src/fabric-chart/FabricTextGroup.vue +29 -17
- package/packages/fabric-chart/src/mixins/draw.js +1 -1
- package/packages/fabric-chart/src/mixins/eventCommon.js +8 -2
- package/packages/fabric-chart/src/utils/bus.js +2 -0
- package/packages/table-filter/src/quick-search/QuickSearch.vue +5 -1
package/es/fabric-chart/index.js
CHANGED
|
@@ -295,7 +295,7 @@ var es_promise_finally = __webpack_require__("a79d");
|
|
|
295
295
|
// EXTERNAL MODULE: external "core-js/modules/es.function.name.js"
|
|
296
296
|
var es_function_name_js_ = __webpack_require__("db0a");
|
|
297
297
|
|
|
298
|
-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"
|
|
298
|
+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"3a223fa1-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=3a1ac827&scoped=true&
|
|
299
299
|
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),[(_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()],1):_vm._e()],1)}
|
|
300
300
|
var staticRenderFns = []
|
|
301
301
|
|
|
@@ -308,7 +308,7 @@ var objectSpread2 = __webpack_require__("5530");
|
|
|
308
308
|
// EXTERNAL MODULE: ./src/core/create.js
|
|
309
309
|
var create = __webpack_require__("8aef");
|
|
310
310
|
|
|
311
|
-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"
|
|
311
|
+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"3a223fa1-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=42503925&
|
|
312
312
|
var FabricCanvasvue_type_template_id_42503925_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)}
|
|
313
313
|
var FabricCanvasvue_type_template_id_42503925_staticRenderFns = []
|
|
314
314
|
|
|
@@ -893,12 +893,12 @@ var component = Object(componentNormalizer["a" /* default */])(
|
|
|
893
893
|
)
|
|
894
894
|
|
|
895
895
|
/* harmony default export */ var FabricCanvas = (component.exports);
|
|
896
|
-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"
|
|
897
|
-
var
|
|
898
|
-
var
|
|
896
|
+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"3a223fa1-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=9369030e&
|
|
897
|
+
var FabricPolylinesvue_type_template_id_9369030e_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)}
|
|
898
|
+
var FabricPolylinesvue_type_template_id_9369030e_staticRenderFns = []
|
|
899
899
|
|
|
900
900
|
|
|
901
|
-
// CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricPolylines.vue?vue&type=template&id=
|
|
901
|
+
// CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricPolylines.vue?vue&type=template&id=9369030e&
|
|
902
902
|
|
|
903
903
|
// EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/asyncToGenerator.js
|
|
904
904
|
var asyncToGenerator = __webpack_require__("1da1");
|
|
@@ -1275,7 +1275,7 @@ var type_isObject = function isObject(obj) {
|
|
|
1275
1275
|
stroke: data.stroke,
|
|
1276
1276
|
originX: 'center',
|
|
1277
1277
|
originY: 'center',
|
|
1278
|
-
left: data.left + data.width - data.arrowwidth,
|
|
1278
|
+
left: data.left + data.width - data.arrowwidth + 1,
|
|
1279
1279
|
top: data.top,
|
|
1280
1280
|
angle: 270
|
|
1281
1281
|
});
|
|
@@ -1439,7 +1439,8 @@ var type_isObject = function isObject(obj) {
|
|
|
1439
1439
|
x: 0,
|
|
1440
1440
|
y: 0
|
|
1441
1441
|
},
|
|
1442
|
-
dropTimer: null
|
|
1442
|
+
dropTimer: null,
|
|
1443
|
+
isRightVisible: false
|
|
1443
1444
|
};
|
|
1444
1445
|
},
|
|
1445
1446
|
watch: {
|
|
@@ -1447,7 +1448,7 @@ var type_isObject = function isObject(obj) {
|
|
|
1447
1448
|
handler: function handler(value) {
|
|
1448
1449
|
var _this = this;
|
|
1449
1450
|
|
|
1450
|
-
if (value) {
|
|
1451
|
+
if (value && !this.isMovingToOtherTarget && !this.isRightVisible) {
|
|
1451
1452
|
this.isDropVisible = true;
|
|
1452
1453
|
clearTimeout(this.dropTimer);
|
|
1453
1454
|
this.dropTimer = setTimeout(function () {
|
|
@@ -1456,6 +1457,11 @@ var type_isObject = function isObject(obj) {
|
|
|
1456
1457
|
}
|
|
1457
1458
|
},
|
|
1458
1459
|
deep: true
|
|
1460
|
+
},
|
|
1461
|
+
isRightVisible: {
|
|
1462
|
+
handler: function handler(value) {
|
|
1463
|
+
if (value) this.isDropVisible = false;
|
|
1464
|
+
}
|
|
1459
1465
|
}
|
|
1460
1466
|
},
|
|
1461
1467
|
mounted: function mounted() {
|
|
@@ -1564,7 +1570,7 @@ var type_isObject = function isObject(obj) {
|
|
|
1564
1570
|
}
|
|
1565
1571
|
}
|
|
1566
1572
|
});
|
|
1567
|
-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"
|
|
1573
|
+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"3a223fa1-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&
|
|
1568
1574
|
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)])}
|
|
1569
1575
|
var MouseRightClickvue_type_template_id_25d4407a_scoped_true_staticRenderFns = []
|
|
1570
1576
|
|
|
@@ -1672,7 +1678,7 @@ var MouseRightClick_component = Object(componentNormalizer["a" /* default */])(
|
|
|
1672
1678
|
)
|
|
1673
1679
|
|
|
1674
1680
|
/* harmony default export */ var MouseRightClick = (MouseRightClick_component.exports);
|
|
1675
|
-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"
|
|
1681
|
+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"3a223fa1-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&
|
|
1676
1682
|
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)])}
|
|
1677
1683
|
var DropPopupvue_type_template_id_c4db0ace_scoped_true_staticRenderFns = []
|
|
1678
1684
|
|
|
@@ -1773,6 +1779,13 @@ var DropPopup_component = Object(componentNormalizer["a" /* default */])(
|
|
|
1773
1779
|
)
|
|
1774
1780
|
|
|
1775
1781
|
/* harmony default export */ var DropPopup = (DropPopup_component.exports);
|
|
1782
|
+
// EXTERNAL MODULE: external "vue"
|
|
1783
|
+
var external_vue_ = __webpack_require__("8bbf");
|
|
1784
|
+
var external_vue_default = /*#__PURE__*/__webpack_require__.n(external_vue_);
|
|
1785
|
+
|
|
1786
|
+
// CONCATENATED MODULE: ./packages/fabric-chart/src/utils/bus.js
|
|
1787
|
+
|
|
1788
|
+
/* harmony default export */ var bus = (new external_vue_default.a());
|
|
1776
1789
|
// 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/FabricPolylines.vue?vue&type=script&lang=js&
|
|
1777
1790
|
|
|
1778
1791
|
|
|
@@ -1813,6 +1826,7 @@ var DropPopup_component = Object(componentNormalizer["a" /* default */])(
|
|
|
1813
1826
|
|
|
1814
1827
|
|
|
1815
1828
|
|
|
1829
|
+
|
|
1816
1830
|
/**
|
|
1817
1831
|
* @description: 递归遍历节点,设置颜色属性
|
|
1818
1832
|
* @param {fabric.Object[]} pointArr
|
|
@@ -1903,7 +1917,6 @@ var rightClickNodeConnect = [{
|
|
|
1903
1917
|
clientX: 0,
|
|
1904
1918
|
clientY: 0
|
|
1905
1919
|
},
|
|
1906
|
-
isRightVisible: false,
|
|
1907
1920
|
rightPos: {
|
|
1908
1921
|
clientX: 0,
|
|
1909
1922
|
clientY: 0
|
|
@@ -1921,8 +1934,9 @@ var rightClickNodeConnect = [{
|
|
|
1921
1934
|
// 选区矩形对象
|
|
1922
1935
|
currentDelPoint: null,
|
|
1923
1936
|
// 缓存当前可批量删除的项目线段上的点
|
|
1924
|
-
polylinePointList: []
|
|
1925
|
-
|
|
1937
|
+
polylinePointList: [],
|
|
1938
|
+
// 缓存折线项目节点
|
|
1939
|
+
isMovingToOtherTarget: false
|
|
1926
1940
|
};
|
|
1927
1941
|
},
|
|
1928
1942
|
computed: {
|
|
@@ -1940,20 +1954,27 @@ var rightClickNodeConnect = [{
|
|
|
1940
1954
|
}
|
|
1941
1955
|
},
|
|
1942
1956
|
watch: {},
|
|
1943
|
-
mounted: function mounted() {
|
|
1957
|
+
mounted: function mounted() {
|
|
1958
|
+
var _this2 = this;
|
|
1959
|
+
|
|
1960
|
+
bus.$on('mouseoverTarget', function (isMovingToOtherTarget) {
|
|
1961
|
+
_this2.isMovingToOtherTarget = isMovingToOtherTarget;
|
|
1962
|
+
if (isMovingToOtherTarget) _this2.isDropVisible = false;
|
|
1963
|
+
});
|
|
1964
|
+
},
|
|
1944
1965
|
methods: {
|
|
1945
1966
|
init: function init() {
|
|
1946
|
-
var
|
|
1967
|
+
var _this3 = this;
|
|
1947
1968
|
|
|
1948
1969
|
this.drawPolylineTitle();
|
|
1949
1970
|
this.polylinePointList = [];
|
|
1950
1971
|
this.polyline.forEach(function (polylineType, polylineTypeId) {
|
|
1951
|
-
|
|
1972
|
+
_this3.createPolyline(polylineType, polylineTypeId);
|
|
1952
1973
|
});
|
|
1953
1974
|
this.eventStyle.evented && this.createEvent();
|
|
1954
1975
|
},
|
|
1955
1976
|
createEvent: function createEvent() {
|
|
1956
|
-
var
|
|
1977
|
+
var _this4 = this;
|
|
1957
1978
|
|
|
1958
1979
|
this.canvas.on('mouse:up', function (event) {
|
|
1959
1980
|
if (event.button === 3) {
|
|
@@ -1961,33 +1982,33 @@ var rightClickNodeConnect = [{
|
|
|
1961
1982
|
x = _event$pointer.x,
|
|
1962
1983
|
y = _event$pointer.y;
|
|
1963
1984
|
|
|
1964
|
-
var
|
|
1965
|
-
originX =
|
|
1966
|
-
originY =
|
|
1967
|
-
endX =
|
|
1968
|
-
endY =
|
|
1985
|
+
var _this4$$propItems = _this4.$propItems(),
|
|
1986
|
+
originX = _this4$$propItems.originX,
|
|
1987
|
+
originY = _this4$$propItems.originY,
|
|
1988
|
+
endX = _this4$$propItems.endX,
|
|
1989
|
+
endY = _this4$$propItems.endY;
|
|
1969
1990
|
|
|
1970
1991
|
if (!(x < originX || x > endX || y < originY || y > endY)) {
|
|
1971
|
-
|
|
1972
|
-
document.querySelector('.upper-canvas').addEventListener('contextmenu',
|
|
1992
|
+
_this4.activeEvent = event;
|
|
1993
|
+
document.querySelector('.upper-canvas').addEventListener('contextmenu', _this4.addEventListenerContextmenu, true);
|
|
1973
1994
|
} // this.willUpdateLine = line;
|
|
1974
1995
|
|
|
1975
1996
|
} // 左键松开鼠标-批量删除
|
|
1976
1997
|
|
|
1977
1998
|
|
|
1978
|
-
|
|
1999
|
+
_this4.isSelectArea = false;
|
|
1979
2000
|
|
|
1980
|
-
if (event.button === 1 && !event.target &&
|
|
1981
|
-
var points =
|
|
2001
|
+
if (event.button === 1 && !event.target && _this4.selectArea) {
|
|
2002
|
+
var points = _this4.selectArea.ponits;
|
|
1982
2003
|
|
|
1983
|
-
var delList =
|
|
2004
|
+
var delList = _this4.getAreaPonits(points);
|
|
1984
2005
|
|
|
1985
|
-
delList.length === 0 &&
|
|
2006
|
+
delList.length === 0 && _this4.removeSelectArea();
|
|
1986
2007
|
|
|
1987
|
-
if (delList.length > 0 &&
|
|
1988
|
-
|
|
2008
|
+
if (delList.length > 0 && _this4.selectArea) {
|
|
2009
|
+
_this4.$emit('pointOperation', 'delete', delList);
|
|
1989
2010
|
|
|
1990
|
-
|
|
2011
|
+
_this4.currentDelPoint = null;
|
|
1991
2012
|
}
|
|
1992
2013
|
}
|
|
1993
2014
|
});
|
|
@@ -1997,16 +2018,18 @@ var rightClickNodeConnect = [{
|
|
|
1997
2018
|
};
|
|
1998
2019
|
this.canvas.on('mouse:down', function (event) {
|
|
1999
2020
|
if (event.button === 1 && !event.target) {
|
|
2000
|
-
|
|
2021
|
+
_this4.isSelectArea = true;
|
|
2001
2022
|
selectAreaOrigin.left = event.pointer.x;
|
|
2002
2023
|
selectAreaOrigin.top = event.pointer.y;
|
|
2003
2024
|
}
|
|
2004
2025
|
});
|
|
2005
2026
|
this.canvas.on('mouse:move', function (event) {
|
|
2006
|
-
|
|
2027
|
+
_this4.isSelectArea && _this4.createSelectArea(event, selectAreaOrigin);
|
|
2007
2028
|
});
|
|
2008
2029
|
},
|
|
2009
2030
|
handleMoving: function handleMoving(event) {
|
|
2031
|
+
// 如果移动到其他节点如气血分析、标记位节点上时需要隐藏折线组件中的提示弹框
|
|
2032
|
+
if (this.isMovingToOtherTarget) return;
|
|
2010
2033
|
var pointer = event.pointer;
|
|
2011
2034
|
var x = pointer.x,
|
|
2012
2035
|
y = pointer.y;
|
|
@@ -2026,7 +2049,7 @@ var rightClickNodeConnect = [{
|
|
|
2026
2049
|
},
|
|
2027
2050
|
// 获取选区内包含的节点
|
|
2028
2051
|
getAreaPonits: function getAreaPonits(points) {
|
|
2029
|
-
var
|
|
2052
|
+
var _this5 = this;
|
|
2030
2053
|
|
|
2031
2054
|
var delList = [];
|
|
2032
2055
|
|
|
@@ -2043,14 +2066,14 @@ var rightClickNodeConnect = [{
|
|
|
2043
2066
|
var isArea = left >= x1 && left <= x2 && top >= y1 && top <= y2;
|
|
2044
2067
|
|
|
2045
2068
|
if (id && /_polyline(Point)_/.test(id) && !id.includes('isTitle') && isArea) {
|
|
2046
|
-
if (
|
|
2047
|
-
var polylineIndex =
|
|
2069
|
+
if (_this5.currentDelPoint) {
|
|
2070
|
+
var polylineIndex = _this5.currentDelPoint.polylineIndex;
|
|
2048
2071
|
|
|
2049
2072
|
if (polylineIndex == obj.polylineIndex) {
|
|
2050
|
-
delList.push(
|
|
2073
|
+
delList.push(_this5.getDataById(id));
|
|
2051
2074
|
}
|
|
2052
2075
|
} else {
|
|
2053
|
-
delList.push(
|
|
2076
|
+
delList.push(_this5.getDataById(id));
|
|
2054
2077
|
}
|
|
2055
2078
|
}
|
|
2056
2079
|
});
|
|
@@ -2072,15 +2095,15 @@ var rightClickNodeConnect = [{
|
|
|
2072
2095
|
},
|
|
2073
2096
|
// 每一个折线类别
|
|
2074
2097
|
createPolyline: function createPolyline(polylineType, polylineTypeId) {
|
|
2075
|
-
var
|
|
2098
|
+
var _this6 = this;
|
|
2076
2099
|
|
|
2077
2100
|
polylineType.dataList.forEach(function (polylineItem, polylineIndex) {
|
|
2078
|
-
|
|
2101
|
+
_this6.drawPolyline(polylineItem, polylineIndex, polylineType, polylineTypeId);
|
|
2079
2102
|
});
|
|
2080
2103
|
},
|
|
2081
2104
|
// 绘制左侧折线标题
|
|
2082
2105
|
drawPolylineTitle: function drawPolylineTitle() {
|
|
2083
|
-
var
|
|
2106
|
+
var _this7 = this,
|
|
2084
2107
|
_this$other;
|
|
2085
2108
|
|
|
2086
2109
|
var _this$propItems2 = this.propItems,
|
|
@@ -2107,10 +2130,10 @@ var rightClickNodeConnect = [{
|
|
|
2107
2130
|
var point = v.list.find(function (k) {
|
|
2108
2131
|
return isEffectiveNode(k) && new Date(k.time).getTime() >= minTime && new Date(k.time).getTime() <= maxTime;
|
|
2109
2132
|
});
|
|
2110
|
-
var firstPointLeft = point ?
|
|
2111
|
-
var rightLimit = point ? firstPointLeft -
|
|
2133
|
+
var firstPointLeft = point ? _this7.cumputedX(point.time) : 0;
|
|
2134
|
+
var rightLimit = point ? firstPointLeft - _this7.spaceWidth : ''; // 配置是否可拖动标题图标批量增加-
|
|
2112
2135
|
|
|
2113
|
-
var isAdd = (firstPointLeft || endX) -
|
|
2136
|
+
var isAdd = (firstPointLeft || endX) - _this7.spaceWidth >= originX;
|
|
2114
2137
|
leftTitleList.push({
|
|
2115
2138
|
title: v.title,
|
|
2116
2139
|
type: v.type,
|
|
@@ -2162,7 +2185,7 @@ var rightClickNodeConnect = [{
|
|
|
2162
2185
|
left = lableMargin[0] + treeTableminCellWidth;
|
|
2163
2186
|
pointId = "".concat(v.polylineTypeId, "_").concat(v.polylineIndex, "_-1_polylinePoint_'").concat(new Date().getTime(), "_isTitle");
|
|
2164
2187
|
_v$pointAttr = v.pointAttr, _v$pointAttr$fill = _v$pointAttr.fill, fillColor = _v$pointAttr$fill === void 0 ? '#000' : _v$pointAttr$fill, stroke = _v$pointAttr.stroke;
|
|
2165
|
-
text = new
|
|
2188
|
+
text = new _this7.fabric.Text(String(v.title), Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({
|
|
2166
2189
|
fontSize: style.fontSize,
|
|
2167
2190
|
fill: fillColor && stroke ? stroke : fillColor,
|
|
2168
2191
|
left: left,
|
|
@@ -2183,7 +2206,7 @@ var rightClickNodeConnect = [{
|
|
|
2183
2206
|
id: pointId,
|
|
2184
2207
|
polylineTypeId: v.polylineTypeId,
|
|
2185
2208
|
polylineIndex: v.polylineIndex
|
|
2186
|
-
}, v.isAdd &&
|
|
2209
|
+
}, v.isAdd && _this7.eventStyle.evented ? {} : eventStyle), {}, {
|
|
2187
2210
|
rightLimit: v.rightLimit || ''
|
|
2188
2211
|
});
|
|
2189
2212
|
|
|
@@ -2193,14 +2216,14 @@ var rightClickNodeConnect = [{
|
|
|
2193
2216
|
}
|
|
2194
2217
|
|
|
2195
2218
|
_context.next = 11;
|
|
2196
|
-
return
|
|
2219
|
+
return _this7.createImage(v.pointAttr.iconClassName, v.pointAttr);
|
|
2197
2220
|
|
|
2198
2221
|
case 11:
|
|
2199
2222
|
ele = _context.sent;
|
|
2200
2223
|
|
|
2201
2224
|
case 12:
|
|
2202
2225
|
_context.next = 14;
|
|
2203
|
-
return
|
|
2226
|
+
return _this7.createPoint(v.type, Object(objectSpread2["a" /* default */])({
|
|
2204
2227
|
ele: ele || ''
|
|
2205
2228
|
}, option));
|
|
2206
2229
|
|
|
@@ -2226,7 +2249,7 @@ var rightClickNodeConnect = [{
|
|
|
2226
2249
|
});
|
|
2227
2250
|
clonedObj.bringForward();
|
|
2228
2251
|
|
|
2229
|
-
|
|
2252
|
+
_this7.canvas.add(clonedObj);
|
|
2230
2253
|
});
|
|
2231
2254
|
}
|
|
2232
2255
|
|
|
@@ -2234,46 +2257,46 @@ var rightClickNodeConnect = [{
|
|
|
2234
2257
|
originX: 'center'
|
|
2235
2258
|
});
|
|
2236
2259
|
|
|
2237
|
-
|
|
2260
|
+
_this7.moveLimit(icon);
|
|
2238
2261
|
|
|
2239
2262
|
icon.left >= originX && icon.left < originX + 5 && (originTop = icon.top);
|
|
2240
2263
|
|
|
2241
2264
|
if (icon.left >= originX) {
|
|
2242
|
-
|
|
2265
|
+
_this7.showDrapPopup(icon);
|
|
2243
2266
|
} else {
|
|
2244
|
-
|
|
2267
|
+
_this7.isDropVisible = false;
|
|
2245
2268
|
} // this.canvas.renderAll();
|
|
2246
2269
|
|
|
2247
2270
|
}); // 标题折线点停止拖拽后 更新
|
|
2248
2271
|
|
|
2249
2272
|
icon.on('moved', function () {
|
|
2250
|
-
|
|
2273
|
+
_this7.setLeft(icon);
|
|
2251
2274
|
|
|
2252
2275
|
icon.set({
|
|
2253
2276
|
id: icon.id.replace('_isTitle', '')
|
|
2254
2277
|
}); // this.canvas.renderAll();
|
|
2255
2278
|
|
|
2256
|
-
|
|
2279
|
+
_this7.removeTitle();
|
|
2257
2280
|
|
|
2258
|
-
|
|
2281
|
+
_this7.removePolyline(cloneIconId);
|
|
2259
2282
|
|
|
2260
|
-
if (icon.id.includes('_polylinePoint_') &&
|
|
2261
|
-
|
|
2283
|
+
if (icon.id.includes('_polylinePoint_') && _this7.isDropVisible) {
|
|
2284
|
+
_this7.isDropVisible = false;
|
|
2262
2285
|
|
|
2263
2286
|
if (icon.left >= originX) {
|
|
2264
2287
|
// this.setEmitFunction(icon);
|
|
2265
|
-
|
|
2288
|
+
_this7.setAddPointList(icon);
|
|
2266
2289
|
|
|
2267
|
-
|
|
2290
|
+
_this7.$emit('pointOperation', 'increasePointBatch', _this7.addPointList);
|
|
2268
2291
|
|
|
2269
|
-
|
|
2292
|
+
_this7.addPointList = [];
|
|
2270
2293
|
}
|
|
2271
2294
|
}
|
|
2272
2295
|
|
|
2273
|
-
|
|
2296
|
+
_this7.removePolyline(icon.id); // 重绘折线标题
|
|
2274
2297
|
|
|
2275
2298
|
|
|
2276
|
-
|
|
2299
|
+
_this7.drawPolylineTitle();
|
|
2277
2300
|
}); // 优化左侧图标太小不容易选中的问题
|
|
2278
2301
|
|
|
2279
2302
|
if (icon.evented && !icon.url) {
|
|
@@ -2287,7 +2310,7 @@ var rightClickNodeConnect = [{
|
|
|
2287
2310
|
}
|
|
2288
2311
|
}
|
|
2289
2312
|
|
|
2290
|
-
|
|
2313
|
+
_this7.canvas.add(text, icon); // this.canvas.requestRenderAll();
|
|
2291
2314
|
|
|
2292
2315
|
|
|
2293
2316
|
case 21:
|
|
@@ -2344,11 +2367,11 @@ var rightClickNodeConnect = [{
|
|
|
2344
2367
|
}
|
|
2345
2368
|
},
|
|
2346
2369
|
removeTitle: function removeTitle() {
|
|
2347
|
-
var
|
|
2370
|
+
var _this8 = this;
|
|
2348
2371
|
|
|
2349
2372
|
this.canvas.forEachObject(function (obj) {
|
|
2350
2373
|
if (obj.id && obj.id.includes('isTitle')) {
|
|
2351
|
-
|
|
2374
|
+
_this8.canvas.remove(obj);
|
|
2352
2375
|
}
|
|
2353
2376
|
});
|
|
2354
2377
|
},
|
|
@@ -2362,7 +2385,7 @@ var rightClickNodeConnect = [{
|
|
|
2362
2385
|
createAttrVaule: function createAttrVaule(attr, polyline, polylineIndex, polylineType, polylineTypeId) {
|
|
2363
2386
|
var _valueObj$max,
|
|
2364
2387
|
_valueObj$max2,
|
|
2365
|
-
|
|
2388
|
+
_this9 = this,
|
|
2366
2389
|
_valueObj$min,
|
|
2367
2390
|
_valueObj$min2,
|
|
2368
2391
|
_this$canvas;
|
|
@@ -2374,10 +2397,10 @@ var rightClickNodeConnect = [{
|
|
|
2374
2397
|
originX = _this$propItems4.originX,
|
|
2375
2398
|
endX = _this$propItems4.endX;
|
|
2376
2399
|
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) {
|
|
2377
|
-
return +v.value >= +valueObj.max.value &&
|
|
2400
|
+
return +v.value >= +valueObj.max.value && _this9.isLimit(v.time);
|
|
2378
2401
|
});
|
|
2379
2402
|
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) {
|
|
2380
|
-
return +v.value <= +valueObj.min.value &&
|
|
2403
|
+
return +v.value <= +valueObj.min.value && _this9.isLimit(v.time);
|
|
2381
2404
|
});
|
|
2382
2405
|
var lines = [];
|
|
2383
2406
|
|
|
@@ -2385,9 +2408,9 @@ var rightClickNodeConnect = [{
|
|
|
2385
2408
|
var value = _ref2.value,
|
|
2386
2409
|
lineStyle = _ref2.lineStyle;
|
|
2387
2410
|
|
|
2388
|
-
var top =
|
|
2411
|
+
var top = _this9.cumputedY(polylineType, +value);
|
|
2389
2412
|
|
|
2390
|
-
return
|
|
2413
|
+
return _this9.drawLine([originX, top, endX, top], Object(objectSpread2["a" /* default */])({
|
|
2391
2414
|
polylineIndex: polylineIndex,
|
|
2392
2415
|
lineIndex: 0,
|
|
2393
2416
|
polylineTypeId: polylineTypeId
|
|
@@ -2397,7 +2420,7 @@ var rightClickNodeConnect = [{
|
|
|
2397
2420
|
var drawText = function drawText(_ref3, top) {
|
|
2398
2421
|
var name = _ref3.name,
|
|
2399
2422
|
nameStyle = _ref3.nameStyle;
|
|
2400
|
-
return new
|
|
2423
|
+
return new _this9.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), {}, {
|
|
2401
2424
|
originY: 'bottom',
|
|
2402
2425
|
left: originX + 5,
|
|
2403
2426
|
top: top - 5
|
|
@@ -2433,7 +2456,7 @@ var rightClickNodeConnect = [{
|
|
|
2433
2456
|
* @param {polylineIndex} 当前折线 index
|
|
2434
2457
|
*/
|
|
2435
2458
|
drawPolyline: function drawPolyline(polyline, polylineIndex, polylineType, polylineTypeId) {
|
|
2436
|
-
var
|
|
2459
|
+
var _this10 = this;
|
|
2437
2460
|
|
|
2438
2461
|
var _this$propItems5 = this.propItems,
|
|
2439
2462
|
originY = _this$propItems5.originY,
|
|
@@ -2481,7 +2504,7 @@ var rightClickNodeConnect = [{
|
|
|
2481
2504
|
var line;
|
|
2482
2505
|
var point;
|
|
2483
2506
|
var previousLine;
|
|
2484
|
-
line = points && nextPoint ?
|
|
2507
|
+
line = points && nextPoint ? _this10.drawLine([].concat(Object(toConsumableArray["a" /* default */])(points), Object(toConsumableArray["a" /* default */])(nextPoint)), Object(objectSpread2["a" /* default */])({
|
|
2485
2508
|
polylineIndex: polylineIndex,
|
|
2486
2509
|
polylineTypeId: polylineTypeId,
|
|
2487
2510
|
lineIndex: index
|
|
@@ -2502,16 +2525,16 @@ var rightClickNodeConnect = [{
|
|
|
2502
2525
|
originTop: points[1],
|
|
2503
2526
|
time: linePoints.time
|
|
2504
2527
|
});
|
|
2505
|
-
point = previousLine ?
|
|
2528
|
+
point = previousLine ? _this10.drawPoint.apply(_this10, Object(toConsumableArray["a" /* default */])(points).concat([previousLine, line, polyline.type, pointOthers, isInit])) : _this10.drawPoint.apply(_this10, Object(toConsumableArray["a" /* default */])(points).concat([null, line, polyline.type, pointOthers, isInit]));
|
|
2506
2529
|
}
|
|
2507
2530
|
|
|
2508
2531
|
lineList.push(line);
|
|
2509
2532
|
point && pointList.push(point);
|
|
2510
2533
|
});
|
|
2511
2534
|
Promise.all(pointList).then(function (res) {
|
|
2512
|
-
var
|
|
2535
|
+
var _this10$canvas;
|
|
2513
2536
|
|
|
2514
|
-
var polylineObj =
|
|
2537
|
+
var polylineObj = _this10.polylinePointList.find(function (v) {
|
|
2515
2538
|
return v.polylineTypeId == polylineTypeId && v.polylineIndex == polylineIndex;
|
|
2516
2539
|
});
|
|
2517
2540
|
|
|
@@ -2526,7 +2549,7 @@ var rightClickNodeConnect = [{
|
|
|
2526
2549
|
});
|
|
2527
2550
|
polylineObj.pointerList = pointerList;
|
|
2528
2551
|
} else {
|
|
2529
|
-
|
|
2552
|
+
_this10.polylinePointList.push({
|
|
2530
2553
|
polylineTypeId: polylineTypeId,
|
|
2531
2554
|
polylineIndex: polylineIndex,
|
|
2532
2555
|
pointerList: pointerList,
|
|
@@ -2550,7 +2573,7 @@ var rightClickNodeConnect = [{
|
|
|
2550
2573
|
return v;
|
|
2551
2574
|
});
|
|
2552
2575
|
|
|
2553
|
-
(
|
|
2576
|
+
(_this10$canvas = _this10.canvas).add.apply(_this10$canvas, Object(toConsumableArray["a" /* default */])(lineList).concat(Object(toConsumableArray["a" /* default */])(res))); // this.canvas.requestRenderAll();
|
|
2554
2577
|
|
|
2555
2578
|
});
|
|
2556
2579
|
this.createAttrVaule('critical', polyline, polylineIndex, polylineType, polylineTypeId);
|
|
@@ -2576,7 +2599,7 @@ var rightClickNodeConnect = [{
|
|
|
2576
2599
|
* @param {others} 参数 polylineIndex | pointIndex | ...polyline.pointAttr
|
|
2577
2600
|
*/
|
|
2578
2601
|
drawPoint: function drawPoint(left, top, line1, line2, type, others, isInit) {
|
|
2579
|
-
var
|
|
2602
|
+
var _this11 = this;
|
|
2580
2603
|
|
|
2581
2604
|
return Object(asyncToGenerator["a" /* default */])( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
|
|
2582
2605
|
var pointId, ele, point;
|
|
@@ -2585,7 +2608,7 @@ var rightClickNodeConnect = [{
|
|
|
2585
2608
|
switch (_context2.prev = _context2.next) {
|
|
2586
2609
|
case 0:
|
|
2587
2610
|
pointId = "".concat(others.polylineTypeId, "_").concat(others.polylineIndex, "_").concat(others.pointIndex, "_polylinePoint_").concat(new Date().getTime());
|
|
2588
|
-
_context2.t0 =
|
|
2611
|
+
_context2.t0 = _this11._iconClassName;
|
|
2589
2612
|
|
|
2590
2613
|
if (!_context2.t0) {
|
|
2591
2614
|
_context2.next = 6;
|
|
@@ -2593,7 +2616,7 @@ var rightClickNodeConnect = [{
|
|
|
2593
2616
|
}
|
|
2594
2617
|
|
|
2595
2618
|
_context2.next = 5;
|
|
2596
|
-
return
|
|
2619
|
+
return _this11.createImage(_this11._iconClassName, others);
|
|
2597
2620
|
|
|
2598
2621
|
case 5:
|
|
2599
2622
|
_context2.t0 = _context2.sent;
|
|
@@ -2601,12 +2624,12 @@ var rightClickNodeConnect = [{
|
|
|
2601
2624
|
case 6:
|
|
2602
2625
|
ele = _context2.t0;
|
|
2603
2626
|
_context2.next = 9;
|
|
2604
|
-
return
|
|
2627
|
+
return _this11.createPoint(type, Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({
|
|
2605
2628
|
id: pointId,
|
|
2606
2629
|
left: left,
|
|
2607
2630
|
top: top,
|
|
2608
2631
|
ele: ele || ''
|
|
2609
|
-
}, defaultVaule.pointStyle), others), !
|
|
2632
|
+
}, defaultVaule.pointStyle), others), !_this11.eventStyle.evented ? {
|
|
2610
2633
|
lockMovementX: true,
|
|
2611
2634
|
lockMovementY: true
|
|
2612
2635
|
} : {}));
|
|
@@ -2617,33 +2640,33 @@ var rightClickNodeConnect = [{
|
|
|
2617
2640
|
line1 && (point.line1 = line1);
|
|
2618
2641
|
line2 && (point.line2 = line2);
|
|
2619
2642
|
point.on('mouseover', function () {
|
|
2620
|
-
|
|
2643
|
+
_this11.showDrapPopup(point);
|
|
2621
2644
|
|
|
2622
|
-
|
|
2645
|
+
_this11.pointToFront(point);
|
|
2623
2646
|
});
|
|
2624
2647
|
point.on('mouseout', function () {
|
|
2625
|
-
|
|
2648
|
+
_this11.isDropVisible = false;
|
|
2626
2649
|
}); // 折线点移动中 实时更新相关联的线的坐标
|
|
2627
2650
|
|
|
2628
|
-
if (
|
|
2651
|
+
if (_this11.eventStyle.evented) {
|
|
2629
2652
|
point.on('moving', function () {
|
|
2630
|
-
|
|
2653
|
+
_this11.pointMoveLimit(point, false);
|
|
2631
2654
|
|
|
2632
|
-
|
|
2655
|
+
_this11.pointMoveUpdateLine(point);
|
|
2633
2656
|
|
|
2634
|
-
|
|
2657
|
+
_this11.addPoint(point); // this.canvas.renderAll();
|
|
2635
2658
|
|
|
2636
2659
|
|
|
2637
|
-
|
|
2660
|
+
_this11.showDrapPopup(point);
|
|
2638
2661
|
}); // 折线点停止拖拽后 更新polyline中对应的坐标
|
|
2639
2662
|
|
|
2640
2663
|
point.on('moved', function () {
|
|
2641
2664
|
if (point && point.id.includes('_polylinePoint_')) {
|
|
2642
|
-
|
|
2665
|
+
_this11.isDropVisible = false;
|
|
2643
2666
|
|
|
2644
|
-
|
|
2667
|
+
_this11.setEmitFunction(point);
|
|
2645
2668
|
|
|
2646
|
-
|
|
2669
|
+
_this11.addPointObjList = [];
|
|
2647
2670
|
}
|
|
2648
2671
|
});
|
|
2649
2672
|
point.on('mouseup', function (event) {
|
|
@@ -2652,13 +2675,13 @@ var rightClickNodeConnect = [{
|
|
|
2652
2675
|
|
|
2653
2676
|
if (button == 1 && isClick) {
|
|
2654
2677
|
// 可配置批量删除当前项目上的点了
|
|
2655
|
-
|
|
2678
|
+
_this11.currentDelPoint = point;
|
|
2656
2679
|
}
|
|
2657
2680
|
});
|
|
2658
2681
|
} // 超出表格最高或最低值则需要触发pointChange事件并且不能更新视图,否则连接节点判断不会成功
|
|
2659
2682
|
|
|
2660
2683
|
|
|
2661
|
-
isInit &&
|
|
2684
|
+
isInit && _this11.setEmitFunction(point, isInit);
|
|
2662
2685
|
return _context2.abrupt("return", point);
|
|
2663
2686
|
|
|
2664
2687
|
case 18:
|
|
@@ -2671,7 +2694,7 @@ var rightClickNodeConnect = [{
|
|
|
2671
2694
|
},
|
|
2672
2695
|
// 拖动停止后 设置回调触发方法
|
|
2673
2696
|
setEmitFunction: function setEmitFunction(point) {
|
|
2674
|
-
var
|
|
2697
|
+
var _this12 = this;
|
|
2675
2698
|
|
|
2676
2699
|
var isInit = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
|
|
2677
2700
|
var operable = this.propItems.operable;
|
|
@@ -2709,7 +2732,7 @@ var rightClickNodeConnect = [{
|
|
|
2709
2732
|
} else {
|
|
2710
2733
|
this.$nextTick(function () {
|
|
2711
2734
|
// 拖动新增节点时默认所有节点可删除
|
|
2712
|
-
|
|
2735
|
+
_this12.currentDelPoint = null;
|
|
2713
2736
|
});
|
|
2714
2737
|
var lastPoint = this.addPointList[this.addPointList.length - 1];
|
|
2715
2738
|
var position = this.polyline[point.polylineTypeId].position;
|
|
@@ -2737,7 +2760,7 @@ var rightClickNodeConnect = [{
|
|
|
2737
2760
|
this.addPointList.forEach(function (v) {
|
|
2738
2761
|
return Object.assign(v, {
|
|
2739
2762
|
isConcat: true,
|
|
2740
|
-
concatIndex:
|
|
2763
|
+
concatIndex: _this12._concatIndex
|
|
2741
2764
|
});
|
|
2742
2765
|
});
|
|
2743
2766
|
} else if (point.line2 || point.nextPoint && lastPoint.left >= point.nextPoint.left) {
|
|
@@ -2775,7 +2798,7 @@ var rightClickNodeConnect = [{
|
|
|
2775
2798
|
},
|
|
2776
2799
|
// 纠正线段坐标
|
|
2777
2800
|
setLinePatch: function setLinePatch(point) {
|
|
2778
|
-
var
|
|
2801
|
+
var _this13 = this;
|
|
2779
2802
|
|
|
2780
2803
|
var originLeft = point.originLeft,
|
|
2781
2804
|
originTop = point.originTop;
|
|
@@ -2783,13 +2806,13 @@ var rightClickNodeConnect = [{
|
|
|
2783
2806
|
var _loop = function _loop(i, len) {
|
|
2784
2807
|
var _point$prePoint$left, _point$prePoint, _point$prePoint$top, _point$prePoint2, _currentPointObj$line;
|
|
2785
2808
|
|
|
2786
|
-
var currentPoint =
|
|
2787
|
-
var prevPoint =
|
|
2809
|
+
var currentPoint = _this13.addPointList[i];
|
|
2810
|
+
var prevPoint = _this13.addPointList[i - 1] || {
|
|
2788
2811
|
left: (_point$prePoint$left = (_point$prePoint = point.prePoint) === null || _point$prePoint === void 0 ? void 0 : _point$prePoint.left) !== null && _point$prePoint$left !== void 0 ? _point$prePoint$left : originLeft,
|
|
2789
2812
|
top: (_point$prePoint$top = (_point$prePoint2 = point.prePoint) === null || _point$prePoint2 === void 0 ? void 0 : _point$prePoint2.top) !== null && _point$prePoint$top !== void 0 ? _point$prePoint$top : originTop
|
|
2790
2813
|
};
|
|
2791
2814
|
|
|
2792
|
-
var currentPointObj =
|
|
2815
|
+
var currentPointObj = _this13.addPointObjList.find(function (obj) {
|
|
2793
2816
|
return obj.left === currentPoint.left;
|
|
2794
2817
|
});
|
|
2795
2818
|
|
|
@@ -2810,7 +2833,7 @@ var rightClickNodeConnect = [{
|
|
|
2810
2833
|
// 检查批量新增拖动过程中是否存在漏点的情况
|
|
2811
2834
|
checkPoints: function checkPoints(point) {
|
|
2812
2835
|
var _this$addPointList2,
|
|
2813
|
-
|
|
2836
|
+
_this14 = this;
|
|
2814
2837
|
|
|
2815
2838
|
var originLeft = point.originLeft,
|
|
2816
2839
|
originTop = point.originTop,
|
|
@@ -2824,9 +2847,9 @@ var rightClickNodeConnect = [{
|
|
|
2824
2847
|
for (var k = 0; k <= PointLens; k++) {
|
|
2825
2848
|
if (k > 0) {
|
|
2826
2849
|
(function () {
|
|
2827
|
-
var curLeft = originLeft +
|
|
2850
|
+
var curLeft = originLeft + _this14.spaceWidth * k; // 判断this.addPointList中的left是否包含curLeft,不包含就说明是漏了
|
|
2828
2851
|
|
|
2829
|
-
var hasPoint =
|
|
2852
|
+
var hasPoint = _this14.addPointList.some(function (p) {
|
|
2830
2853
|
return Math.abs(p.left - curLeft) <= 0.001;
|
|
2831
2854
|
}); // const hasPoint = this.addPointList.some(v => v.left == curLeft);
|
|
2832
2855
|
|
|
@@ -2834,7 +2857,7 @@ var rightClickNodeConnect = [{
|
|
|
2834
2857
|
if (!hasPoint) {
|
|
2835
2858
|
var index;
|
|
2836
2859
|
|
|
2837
|
-
var pointObj =
|
|
2860
|
+
var pointObj = _this14.addPointList.find(function (v, i) {
|
|
2838
2861
|
if (v.left > curLeft) {
|
|
2839
2862
|
index = i;
|
|
2840
2863
|
}
|
|
@@ -2844,20 +2867,20 @@ var rightClickNodeConnect = [{
|
|
|
2844
2867
|
|
|
2845
2868
|
if (pointObj) {
|
|
2846
2869
|
var cloneObj = JSON.parse(JSON.stringify(pointObj));
|
|
2847
|
-
var prePoint =
|
|
2870
|
+
var prePoint = _this14.addPointList[index - 1] || {
|
|
2848
2871
|
left: originLeft,
|
|
2849
2872
|
top: originTop
|
|
2850
2873
|
};
|
|
2851
|
-
var len = ~~((pointObj.left - (curLeft -
|
|
2874
|
+
var len = ~~((pointObj.left - (curLeft - _this14.spaceWidth)) / _this14.spaceWidth);
|
|
2852
2875
|
var spaceHeight = (pointObj.top - prePoint.top) / len;
|
|
2853
2876
|
cloneObj.top = prePoint.top + spaceHeight;
|
|
2854
|
-
cloneObj.value.time =
|
|
2855
|
-
cloneObj.value.value =
|
|
2877
|
+
cloneObj.value.time = _this14.getXValue(curLeft);
|
|
2878
|
+
cloneObj.value.value = _this14.getYValue(position, cloneObj.top);
|
|
2856
2879
|
cloneObj.left = curLeft;
|
|
2857
2880
|
|
|
2858
|
-
|
|
2881
|
+
_this14.addPointList.splice(index, 0, cloneObj);
|
|
2859
2882
|
|
|
2860
|
-
|
|
2883
|
+
_this14.clonePoint(point, [prePoint.left, prePoint.top, cloneObj.left, cloneObj.top]);
|
|
2861
2884
|
}
|
|
2862
2885
|
}
|
|
2863
2886
|
})();
|
|
@@ -3033,7 +3056,7 @@ var rightClickNodeConnect = [{
|
|
|
3033
3056
|
}
|
|
3034
3057
|
},
|
|
3035
3058
|
clonePoint: function clonePoint(point, points) {
|
|
3036
|
-
var
|
|
3059
|
+
var _this15 = this;
|
|
3037
3060
|
|
|
3038
3061
|
var evented, selectable, lineIndex, polylineIndex, lineAttr, polylineTypeId;
|
|
3039
3062
|
evented = selectable = false;
|
|
@@ -3057,7 +3080,7 @@ var rightClickNodeConnect = [{
|
|
|
3057
3080
|
clonedObj.hasControls = clonedObj.hasBorders = false;
|
|
3058
3081
|
point.prePoints = [point.left, point.top];
|
|
3059
3082
|
|
|
3060
|
-
var line =
|
|
3083
|
+
var line = _this15.drawLine(Object(toConsumableArray["a" /* default */])(points), Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({
|
|
3061
3084
|
evented: evented,
|
|
3062
3085
|
selectable: selectable
|
|
3063
3086
|
}, lineAttr), {}, {
|
|
@@ -3068,13 +3091,13 @@ var rightClickNodeConnect = [{
|
|
|
3068
3091
|
|
|
3069
3092
|
clonedObj.line1 = line;
|
|
3070
3093
|
|
|
3071
|
-
|
|
3094
|
+
_this15.canvas.sendBackwards(line);
|
|
3072
3095
|
|
|
3073
3096
|
clonedObj.bringForward();
|
|
3074
3097
|
|
|
3075
|
-
|
|
3098
|
+
_this15.canvas.add(clonedObj);
|
|
3076
3099
|
|
|
3077
|
-
|
|
3100
|
+
_this15.addPointObjList.push(clonedObj); // resolve(clonedObj);
|
|
3078
3101
|
|
|
3079
3102
|
}); // });
|
|
3080
3103
|
},
|
|
@@ -3192,7 +3215,7 @@ var rightClickNodeConnect = [{
|
|
|
3192
3215
|
},
|
|
3193
3216
|
// 打开右键菜单
|
|
3194
3217
|
openRightModal: function openRightModal(event) {
|
|
3195
|
-
var
|
|
3218
|
+
var _this16 = this;
|
|
3196
3219
|
|
|
3197
3220
|
this.rightPos = {
|
|
3198
3221
|
clientX: event.e.clientX || event.e.pageX,
|
|
@@ -3203,10 +3226,10 @@ var rightClickNodeConnect = [{
|
|
|
3203
3226
|
var id = target ? target.id : '';
|
|
3204
3227
|
this.$nextTick(function () {
|
|
3205
3228
|
if (id && id.includes('_polylinePoint_')) {
|
|
3206
|
-
|
|
3229
|
+
_this16._currentPoint = target;
|
|
3207
3230
|
var nodeConnect = [];
|
|
3208
3231
|
|
|
3209
|
-
if (
|
|
3232
|
+
if (_this16.propItems.operable.connect) {
|
|
3210
3233
|
if (!target.line2 && target.nextPoint) {
|
|
3211
3234
|
nodeConnect = rightClickNodeConnect.slice(0, 1);
|
|
3212
3235
|
}
|
|
@@ -3220,13 +3243,13 @@ var rightClickNodeConnect = [{
|
|
|
3220
3243
|
}
|
|
3221
3244
|
}
|
|
3222
3245
|
|
|
3223
|
-
|
|
3224
|
-
|
|
3246
|
+
_this16.rightClickNode = Object.freeze(rightClickNode.slice(0, 1).concat(nodeConnect).concat(rightClickNode.slice(-1)));
|
|
3247
|
+
_this16.isRightVisible = true;
|
|
3225
3248
|
} else if (!id) {
|
|
3226
|
-
var operable =
|
|
3227
|
-
|
|
3228
|
-
|
|
3229
|
-
|
|
3249
|
+
var operable = _this16.propItems.operable;
|
|
3250
|
+
_this16._currentPoint = null;
|
|
3251
|
+
_this16.rightClickNode = Object.freeze(operable.set ? rightClickNode.slice(0, 2) : rightClickNode.slice(0, 1));
|
|
3252
|
+
_this16.isRightVisible = true;
|
|
3230
3253
|
}
|
|
3231
3254
|
});
|
|
3232
3255
|
},
|
|
@@ -3294,16 +3317,16 @@ var rightClickNodeConnect = [{
|
|
|
3294
3317
|
// 将当条线段以及点层级置顶
|
|
3295
3318
|
// 线段不能先置顶,会挡住其他线段上的点
|
|
3296
3319
|
pointToFront: function pointToFront(point) {
|
|
3297
|
-
var
|
|
3320
|
+
var _this17 = this;
|
|
3298
3321
|
|
|
3299
3322
|
this.canvas.forEachObject(function (obj) {
|
|
3300
|
-
if (
|
|
3301
|
-
|
|
3323
|
+
if (_this17.isOnePolyLine(obj, point.polylineTypeId, point.polylineIndex)) {
|
|
3324
|
+
_this17.canvas.bringToFront(obj);
|
|
3302
3325
|
}
|
|
3303
3326
|
});
|
|
3304
3327
|
},
|
|
3305
3328
|
removePolyline: function removePolyline(id, left, position, polylineIndex) {
|
|
3306
|
-
var
|
|
3329
|
+
var _this18 = this;
|
|
3307
3330
|
|
|
3308
3331
|
// 根据id或者idClone删除
|
|
3309
3332
|
if (id) {
|
|
@@ -3312,9 +3335,9 @@ var rightClickNodeConnect = [{
|
|
|
3312
3335
|
if (pointId === 'idClone') {
|
|
3313
3336
|
this.addPointObjList.forEach(function (obj) {
|
|
3314
3337
|
if (obj.left >= left) {
|
|
3315
|
-
|
|
3338
|
+
_this18.canvas.remove(obj);
|
|
3316
3339
|
|
|
3317
|
-
obj.line1 &&
|
|
3340
|
+
obj.line1 && _this18.canvas.remove(obj.line1);
|
|
3318
3341
|
}
|
|
3319
3342
|
});
|
|
3320
3343
|
this.addPointObjList = this.addPointObjList.filter(function (obj) {
|
|
@@ -3328,9 +3351,9 @@ var rightClickNodeConnect = [{
|
|
|
3328
3351
|
if (point && point.length > 0) {
|
|
3329
3352
|
point.forEach(function (v) {
|
|
3330
3353
|
if (!left) {
|
|
3331
|
-
|
|
3354
|
+
_this18.canvas.remove(v);
|
|
3332
3355
|
|
|
3333
|
-
v.line1 &&
|
|
3356
|
+
v.line1 && _this18.canvas.remove(v.line1);
|
|
3334
3357
|
}
|
|
3335
3358
|
});
|
|
3336
3359
|
}
|
|
@@ -3345,12 +3368,12 @@ var rightClickNodeConnect = [{
|
|
|
3345
3368
|
return v.position === position;
|
|
3346
3369
|
});
|
|
3347
3370
|
this.canvas.forEachObject(function (obj) {
|
|
3348
|
-
if (
|
|
3349
|
-
obj.text &&
|
|
3350
|
-
obj.line1 &&
|
|
3351
|
-
obj.line2 &&
|
|
3371
|
+
if (_this18.isOnePolyLine(obj, polylineTypeId, polylineIndex)) {
|
|
3372
|
+
obj.text && _this18.canvas.remove(obj.text);
|
|
3373
|
+
obj.line1 && _this18.canvas.remove(obj.line1);
|
|
3374
|
+
obj.line2 && _this18.canvas.remove(obj.line2);
|
|
3352
3375
|
|
|
3353
|
-
|
|
3376
|
+
_this18.canvas.remove(obj);
|
|
3354
3377
|
}
|
|
3355
3378
|
});
|
|
3356
3379
|
return;
|
|
@@ -3359,9 +3382,9 @@ var rightClickNodeConnect = [{
|
|
|
3359
3382
|
|
|
3360
3383
|
this.canvas.forEachObject(function (obj) {
|
|
3361
3384
|
if (obj.id && /_polyline(Point|Line)_/.test(obj.id) && !obj.id.includes('isTitle')) {
|
|
3362
|
-
obj.text &&
|
|
3385
|
+
obj.text && _this18.canvas.remove(obj.text);
|
|
3363
3386
|
|
|
3364
|
-
|
|
3387
|
+
_this18.canvas.remove(obj);
|
|
3365
3388
|
}
|
|
3366
3389
|
});
|
|
3367
3390
|
},
|
|
@@ -3372,7 +3395,7 @@ var rightClickNodeConnect = [{
|
|
|
3372
3395
|
}
|
|
3373
3396
|
},
|
|
3374
3397
|
repaintPolyline: function repaintPolyline(position, dadaIndex) {
|
|
3375
|
-
var
|
|
3398
|
+
var _this19 = this;
|
|
3376
3399
|
|
|
3377
3400
|
if (arguments.length < 2) {
|
|
3378
3401
|
if (this.polyline.length) {
|
|
@@ -3381,7 +3404,7 @@ var rightClickNodeConnect = [{
|
|
|
3381
3404
|
|
|
3382
3405
|
this.polylinePointList = [];
|
|
3383
3406
|
this.polyline.forEach(function (polylineType, polylineTypeId) {
|
|
3384
|
-
|
|
3407
|
+
_this19.createPolyline(polylineType, polylineTypeId);
|
|
3385
3408
|
});
|
|
3386
3409
|
this.removeTitle();
|
|
3387
3410
|
this.drawPolylineTitle();
|
|
@@ -3407,8 +3430,8 @@ var rightClickNodeConnect = [{
|
|
|
3407
3430
|
|
|
3408
3431
|
var FabricPolylines_component = Object(componentNormalizer["a" /* default */])(
|
|
3409
3432
|
fabric_chart_FabricPolylinesvue_type_script_lang_js_,
|
|
3410
|
-
|
|
3411
|
-
|
|
3433
|
+
FabricPolylinesvue_type_template_id_9369030e_render,
|
|
3434
|
+
FabricPolylinesvue_type_template_id_9369030e_staticRenderFns,
|
|
3412
3435
|
false,
|
|
3413
3436
|
null,
|
|
3414
3437
|
null,
|
|
@@ -3514,12 +3537,12 @@ var FabricGrid_component = Object(componentNormalizer["a" /* default */])(
|
|
|
3514
3537
|
)
|
|
3515
3538
|
|
|
3516
3539
|
/* harmony default export */ var FabricGrid = (FabricGrid_component.exports);
|
|
3517
|
-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"
|
|
3518
|
-
var
|
|
3519
|
-
var
|
|
3540
|
+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"3a223fa1-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=74876ab4&
|
|
3541
|
+
var FabricTextGroupvue_type_template_id_74876ab4_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)}
|
|
3542
|
+
var FabricTextGroupvue_type_template_id_74876ab4_staticRenderFns = []
|
|
3520
3543
|
|
|
3521
3544
|
|
|
3522
|
-
// CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricTextGroup.vue?vue&type=template&id=
|
|
3545
|
+
// CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricTextGroup.vue?vue&type=template&id=74876ab4&
|
|
3523
3546
|
|
|
3524
3547
|
// EXTERNAL MODULE: external "core-js/modules/es.array.sort.js"
|
|
3525
3548
|
var es_array_sort_js_ = __webpack_require__("4c07");
|
|
@@ -3555,6 +3578,7 @@ var es_array_sort_js_ = __webpack_require__("4c07");
|
|
|
3555
3578
|
|
|
3556
3579
|
|
|
3557
3580
|
|
|
3581
|
+
|
|
3558
3582
|
var FabricTextGroupvue_type_script_lang_js_rightClickNode = [{
|
|
3559
3583
|
name: '修改',
|
|
3560
3584
|
type: 'edit'
|
|
@@ -3605,6 +3629,11 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
|
|
|
3605
3629
|
}
|
|
3606
3630
|
},
|
|
3607
3631
|
deep: true
|
|
3632
|
+
},
|
|
3633
|
+
isRightVisible: {
|
|
3634
|
+
handler: function handler(value) {
|
|
3635
|
+
bus.$emit('mouseoverTarget', value);
|
|
3636
|
+
}
|
|
3608
3637
|
}
|
|
3609
3638
|
},
|
|
3610
3639
|
data: function data() {
|
|
@@ -3616,7 +3645,6 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
|
|
|
3616
3645
|
clientX: 0,
|
|
3617
3646
|
clientY: 0
|
|
3618
3647
|
},
|
|
3619
|
-
isRightVisible: false,
|
|
3620
3648
|
rightPos: {
|
|
3621
3649
|
clientX: 0,
|
|
3622
3650
|
clientY: 0
|
|
@@ -3864,7 +3892,7 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
|
|
|
3864
3892
|
return Object(asyncToGenerator["a" /* default */])( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
|
|
3865
3893
|
var _this8$canvas;
|
|
3866
3894
|
|
|
3867
|
-
var textList, _this8$propItems, originX, originY, top, index, len, _item$titleStyle, item, marginLeft, left, title, _ref2, _ref2$icon, _icon, dataList, i, _len, v, icon, text;
|
|
3895
|
+
var textList, _this8$propItems, originX, originY, top, index, len, _item$titleStyle, item, marginLeft, left, title, _ref2, _ref2$icon, _icon, dataList, i, _len, v, commonOptions, icon, text, groupObj;
|
|
3868
3896
|
|
|
3869
3897
|
return regeneratorRuntime.wrap(function _callee$(_context) {
|
|
3870
3898
|
while (1) {
|
|
@@ -3877,7 +3905,7 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
|
|
|
3877
3905
|
|
|
3878
3906
|
case 4:
|
|
3879
3907
|
if (!(index < len)) {
|
|
3880
|
-
_context.next =
|
|
3908
|
+
_context.next = 31;
|
|
3881
3909
|
break;
|
|
3882
3910
|
}
|
|
3883
3911
|
|
|
@@ -3904,61 +3932,63 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
|
|
|
3904
3932
|
|
|
3905
3933
|
case 13:
|
|
3906
3934
|
if (!(i < _len)) {
|
|
3907
|
-
_context.next =
|
|
3935
|
+
_context.next = 28;
|
|
3908
3936
|
break;
|
|
3909
3937
|
}
|
|
3910
3938
|
|
|
3911
3939
|
v = dataList[i];
|
|
3912
3940
|
|
|
3913
3941
|
if (!_this8.isLimit(v.time)) {
|
|
3914
|
-
_context.next =
|
|
3942
|
+
_context.next = 25;
|
|
3915
3943
|
break;
|
|
3916
3944
|
}
|
|
3917
3945
|
|
|
3918
|
-
|
|
3919
|
-
|
|
3920
|
-
left: _this8.cumputedX(v.time),
|
|
3946
|
+
commonOptions = {
|
|
3947
|
+
originY: 'center',
|
|
3921
3948
|
top: top,
|
|
3922
|
-
|
|
3949
|
+
dataIndex: index,
|
|
3950
|
+
index: i,
|
|
3951
|
+
type: 'list'
|
|
3952
|
+
};
|
|
3953
|
+
_context.next = 19;
|
|
3954
|
+
return _this8.createPoint(_icon.type, Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({
|
|
3955
|
+
originX: 'center',
|
|
3956
|
+
left: _this8.cumputedX(v.time)
|
|
3923
3957
|
}, item.style), item.style ? {
|
|
3924
3958
|
stroke: item.style.fill
|
|
3925
|
-
} : {}), _icon.style || {}),
|
|
3926
|
-
lockMovementX: true,
|
|
3927
|
-
lockMovementY: true
|
|
3928
|
-
}, _this8.eventStyle));
|
|
3959
|
+
} : {}), _icon.style || {}), commonOptions));
|
|
3929
3960
|
|
|
3930
|
-
case
|
|
3961
|
+
case 19:
|
|
3931
3962
|
icon = _context.sent;
|
|
3932
3963
|
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), {}, {
|
|
3933
|
-
|
|
3934
|
-
left: icon.left + icon.width,
|
|
3935
|
-
top: top,
|
|
3936
|
-
dataIndex: index,
|
|
3937
|
-
index: i,
|
|
3938
|
-
type: 'list',
|
|
3939
|
-
id: "".concat(index, "_").concat(i, "_other_").concat(Date.now()),
|
|
3964
|
+
left: icon.left + icon.width / 2,
|
|
3940
3965
|
name: v.value
|
|
3941
|
-
}));
|
|
3942
|
-
|
|
3966
|
+
}, commonOptions));
|
|
3967
|
+
groupObj = new _this8.fabric.Group([icon, text], Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({
|
|
3968
|
+
id: "".concat(index, "_").concat(i, "_other_").concat(Date.now()),
|
|
3969
|
+
lockMovementX: true,
|
|
3970
|
+
lockMovementY: true
|
|
3971
|
+
}, commonOptions), _this8.eventStyle));
|
|
3972
|
+
groupObj.hasControls = groupObj.hasBorders = false;
|
|
3943
3973
|
|
|
3944
|
-
_this8.setPopup(
|
|
3974
|
+
_this8.setPopup(groupObj);
|
|
3945
3975
|
|
|
3946
|
-
textList.push(
|
|
3976
|
+
textList.push(groupObj);
|
|
3947
3977
|
|
|
3948
|
-
case
|
|
3978
|
+
case 25:
|
|
3949
3979
|
i++;
|
|
3950
3980
|
_context.next = 13;
|
|
3951
3981
|
break;
|
|
3952
3982
|
|
|
3953
|
-
case
|
|
3983
|
+
case 28:
|
|
3954
3984
|
index++;
|
|
3955
3985
|
_context.next = 4;
|
|
3956
3986
|
break;
|
|
3957
3987
|
|
|
3958
|
-
case
|
|
3988
|
+
case 31:
|
|
3959
3989
|
(_this8$canvas = _this8.canvas).add.apply(_this8$canvas, textList);
|
|
3960
3990
|
|
|
3961
|
-
case
|
|
3991
|
+
case 32:
|
|
3962
3992
|
case "end":
|
|
3963
3993
|
return _context.stop();
|
|
3964
3994
|
}
|
|
@@ -3970,9 +4000,12 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
|
|
|
3970
4000
|
var _this9 = this;
|
|
3971
4001
|
|
|
3972
4002
|
point.on('mouseover', function () {
|
|
4003
|
+
bus.$emit('mouseoverTarget', true);
|
|
4004
|
+
|
|
3973
4005
|
_this9.showDrapPopup(point, true);
|
|
3974
4006
|
});
|
|
3975
4007
|
point.on('mouseout', function () {
|
|
4008
|
+
!_this9.isRightVisible && bus.$emit('mouseoverTarget', false);
|
|
3976
4009
|
_this9.isDropVisible = false;
|
|
3977
4010
|
});
|
|
3978
4011
|
},
|
|
@@ -4280,7 +4313,6 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
|
|
|
4280
4313
|
showDrapPopup: function showDrapPopup(point) {
|
|
4281
4314
|
var _point$other4;
|
|
4282
4315
|
|
|
4283
|
-
// 第二个参数表示需要展示提供的viewTime时间
|
|
4284
4316
|
this.isDropVisible = true;
|
|
4285
4317
|
this.dropPos = {
|
|
4286
4318
|
left: point.left,
|
|
@@ -4349,8 +4381,8 @@ var getTopTotalList = function getTopTotalList(tree, topTotalList) {
|
|
|
4349
4381
|
|
|
4350
4382
|
var FabricTextGroup_component = Object(componentNormalizer["a" /* default */])(
|
|
4351
4383
|
fabric_chart_FabricTextGroupvue_type_script_lang_js_,
|
|
4352
|
-
|
|
4353
|
-
|
|
4384
|
+
FabricTextGroupvue_type_template_id_74876ab4_render,
|
|
4385
|
+
FabricTextGroupvue_type_template_id_74876ab4_staticRenderFns,
|
|
4354
4386
|
false,
|
|
4355
4387
|
null,
|
|
4356
4388
|
null,
|
|
@@ -4359,14 +4391,14 @@ var FabricTextGroup_component = Object(componentNormalizer["a" /* default */])(
|
|
|
4359
4391
|
)
|
|
4360
4392
|
|
|
4361
4393
|
/* harmony default export */ var FabricTextGroup = (FabricTextGroup_component.exports);
|
|
4362
|
-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"
|
|
4394
|
+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"3a223fa1-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=f880e596&
|
|
4363
4395
|
var FabricScaleValuevue_type_template_id_f880e596_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()}
|
|
4364
4396
|
var FabricScaleValuevue_type_template_id_f880e596_staticRenderFns = []
|
|
4365
4397
|
|
|
4366
4398
|
|
|
4367
4399
|
// CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricScaleValue.vue?vue&type=template&id=f880e596&
|
|
4368
4400
|
|
|
4369
|
-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"
|
|
4401
|
+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"3a223fa1-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=3b20fb44&scoped=true&
|
|
4370
4402
|
var TimeScaleValuevue_type_template_id_3b20fb44_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)}
|
|
4371
4403
|
var TimeScaleValuevue_type_template_id_3b20fb44_scoped_true_staticRenderFns = []
|
|
4372
4404
|
|
|
@@ -4690,12 +4722,12 @@ var FabricScaleValue_component = Object(componentNormalizer["a" /* default */])(
|
|
|
4690
4722
|
)
|
|
4691
4723
|
|
|
4692
4724
|
/* harmony default export */ var FabricScaleValue = (FabricScaleValue_component.exports);
|
|
4693
|
-
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"
|
|
4694
|
-
var
|
|
4695
|
-
var
|
|
4725
|
+
// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"3a223fa1-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=6bcbb555&
|
|
4726
|
+
var FabricLinesvue_type_template_id_6bcbb555_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)}
|
|
4727
|
+
var FabricLinesvue_type_template_id_6bcbb555_staticRenderFns = []
|
|
4696
4728
|
|
|
4697
4729
|
|
|
4698
|
-
// CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricLines.vue?vue&type=template&id=
|
|
4730
|
+
// CONCATENATED MODULE: ./packages/fabric-chart/src/fabric-chart/FabricLines.vue?vue&type=template&id=6bcbb555&
|
|
4699
4731
|
|
|
4700
4732
|
// 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&
|
|
4701
4733
|
|
|
@@ -4755,7 +4787,6 @@ var FabricLinesvue_type_script_lang_js_rightClickNode = [{
|
|
|
4755
4787
|
},
|
|
4756
4788
|
data: function data() {
|
|
4757
4789
|
return {
|
|
4758
|
-
isRightVisible: false,
|
|
4759
4790
|
rightPos: {
|
|
4760
4791
|
clientX: 0,
|
|
4761
4792
|
clientY: 0
|
|
@@ -4948,7 +4979,7 @@ var FabricLinesvue_type_script_lang_js_rightClickNode = [{
|
|
|
4948
4979
|
return Object(asyncToGenerator["a" /* default */])( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
|
|
4949
4980
|
var _this5$canvas;
|
|
4950
4981
|
|
|
4951
|
-
var lineList, _this5$propItems, originX, endX, xScaleList, yCellHeightTop, originYTop, spaceHeight, minMinute, maxMinute, lineItemList, y1, y2, textArr, textList, j, len, item, startMinute, endMinute, x1, x2, textObj, textContent, leftLine, centerLine, centerRect, rightLine, textTop, textLimitRight, text, _lineList, leftLimit, _lineList2, preItem0, preItem1, preEndMinute, preStartMinute, rightLimt, _lineList3, _preItem, _preStartMinute;
|
|
4982
|
+
var lineList, _this5$propItems, originX, endX, xScaleList, yCellHeightTop, originYTop, spaceHeight, minMinute, maxMinute, lineItemList, y1, y2, textArr, textList, j, len, item, startMinute, endMinute, x1, x2, textObj, textContent, isContinue, leftLine, centerLine, centerRect, rightLine, textTop, textLimitRight, text, _lineList, leftLimit, _lineList2, preItem0, preItem1, preEndMinute, preStartMinute, rightLimt, _lineList3, _preItem, _preStartMinute;
|
|
4952
4983
|
|
|
4953
4984
|
return regeneratorRuntime.wrap(function _callee$(_context) {
|
|
4954
4985
|
while (1) {
|
|
@@ -4989,7 +5020,7 @@ var FabricLinesvue_type_script_lang_js_rightClickNode = [{
|
|
|
4989
5020
|
x2 = _this5.cumputedX(item[1]); // 数字文字
|
|
4990
5021
|
|
|
4991
5022
|
textObj = item[3] || {};
|
|
4992
|
-
textContent = textObj.content
|
|
5023
|
+
textContent = textObj.content, isContinue = textObj.continue; // 左边手柄竖线
|
|
4993
5024
|
|
|
4994
5025
|
leftLine = void 0;
|
|
4995
5026
|
|
|
@@ -5001,7 +5032,8 @@ var FabricLinesvue_type_script_lang_js_rightClickNode = [{
|
|
|
5001
5032
|
_context.next = 25;
|
|
5002
5033
|
return _this5.drawGroup(x1, x2, y1 + spaceHeight, y2 - spaceHeight, i, j, {
|
|
5003
5034
|
position: 'left',
|
|
5004
|
-
customIcon: !endMinute ? true : false
|
|
5035
|
+
customIcon: !endMinute && !isContinue ? true : false,
|
|
5036
|
+
isContinue: isContinue
|
|
5005
5037
|
});
|
|
5006
5038
|
|
|
5007
5039
|
case 25:
|
|
@@ -5231,14 +5263,14 @@ var FabricLinesvue_type_script_lang_js_rightClickNode = [{
|
|
|
5231
5263
|
var _this6 = this;
|
|
5232
5264
|
|
|
5233
5265
|
return Object(asyncToGenerator["a" /* default */])( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
|
|
5234
|
-
var id, point, left, position, customIcon, line, common, _this6$linesObj$dataL, dataLineStyle, _customIcon, rect;
|
|
5266
|
+
var id, point, left, position, customIcon, isContinue, line, arrow, common, _this6$linesObj$dataL, dataLineStyle, _customIcon, rect;
|
|
5235
5267
|
|
|
5236
5268
|
return regeneratorRuntime.wrap(function _callee2$(_context2) {
|
|
5237
5269
|
while (1) {
|
|
5238
5270
|
switch (_context2.prev = _context2.next) {
|
|
5239
5271
|
case 0:
|
|
5240
5272
|
id = '_lineGroup_' + Date.now();
|
|
5241
|
-
position = others.position, customIcon = others.customIcon;
|
|
5273
|
+
position = others.position, customIcon = others.customIcon, isContinue = others.isContinue;
|
|
5242
5274
|
|
|
5243
5275
|
if (position === 'left') {
|
|
5244
5276
|
point = [x1, y1, x1, y2];
|
|
@@ -5273,13 +5305,40 @@ var FabricLinesvue_type_script_lang_js_rightClickNode = [{
|
|
|
5273
5305
|
|
|
5274
5306
|
case 9:
|
|
5275
5307
|
line = _context2.sent;
|
|
5276
|
-
_context2.next =
|
|
5308
|
+
_context2.next = 21;
|
|
5277
5309
|
break;
|
|
5278
5310
|
|
|
5279
5311
|
case 12:
|
|
5280
5312
|
line = _this6.drawLine(point, Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({}, dataLineStyle), common));
|
|
5281
5313
|
|
|
5282
|
-
|
|
5314
|
+
if (!isContinue) {
|
|
5315
|
+
_context2.next = 19;
|
|
5316
|
+
break;
|
|
5317
|
+
}
|
|
5318
|
+
|
|
5319
|
+
_context2.next = 16;
|
|
5320
|
+
return _this6.ceateLineArrow(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({
|
|
5321
|
+
left: x1,
|
|
5322
|
+
top: y1 + (y2 - y1) / 2,
|
|
5323
|
+
originY: 'center',
|
|
5324
|
+
width: 14,
|
|
5325
|
+
height: 5,
|
|
5326
|
+
arrowwidth: 6,
|
|
5327
|
+
arrowheight: 5
|
|
5328
|
+
}, dataLineStyle), common));
|
|
5329
|
+
|
|
5330
|
+
case 16:
|
|
5331
|
+
_context2.t0 = _context2.sent;
|
|
5332
|
+
_context2.next = 20;
|
|
5333
|
+
break;
|
|
5334
|
+
|
|
5335
|
+
case 19:
|
|
5336
|
+
_context2.t0 = null;
|
|
5337
|
+
|
|
5338
|
+
case 20:
|
|
5339
|
+
arrow = _context2.t0;
|
|
5340
|
+
|
|
5341
|
+
case 21:
|
|
5283
5342
|
rect = new _this6.fabric.Rect({
|
|
5284
5343
|
width: _this6.propItems.xCellWidth,
|
|
5285
5344
|
height: y2 - y1,
|
|
@@ -5289,7 +5348,7 @@ var FabricLinesvue_type_script_lang_js_rightClickNode = [{
|
|
|
5289
5348
|
selectable: false,
|
|
5290
5349
|
evented: false
|
|
5291
5350
|
});
|
|
5292
|
-
return _context2.abrupt("return", new _this6.fabric.Group([line, rect], Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({
|
|
5351
|
+
return _context2.abrupt("return", new _this6.fabric.Group([line, rect].concat(Object(toConsumableArray["a" /* default */])(arrow ? [arrow] : [])), Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])(Object(objectSpread2["a" /* default */])({
|
|
5293
5352
|
selectable: true,
|
|
5294
5353
|
evented: true,
|
|
5295
5354
|
originX: 'center',
|
|
@@ -5302,7 +5361,7 @@ var FabricLinesvue_type_script_lang_js_rightClickNode = [{
|
|
|
5302
5361
|
|
|
5303
5362
|
})));
|
|
5304
5363
|
|
|
5305
|
-
case
|
|
5364
|
+
case 23:
|
|
5306
5365
|
case "end":
|
|
5307
5366
|
return _context2.stop();
|
|
5308
5367
|
}
|
|
@@ -5546,7 +5605,7 @@ var FabricLinesvue_type_script_lang_js_rightClickNode = [{
|
|
|
5546
5605
|
v = left + centerLine.width / 2 * (line.line2 ? -1 : 1);
|
|
5547
5606
|
originX = 'center';
|
|
5548
5607
|
} else {
|
|
5549
|
-
v = this.textMarginLeft + (centerLine ? centerLine.x2 : left);
|
|
5608
|
+
v = this.textMarginLeft + (centerLine ? centerLine.x2 : left + 3);
|
|
5550
5609
|
originX = 'left'; // 移动到最右边界时候文字超出当前线段可拖动的右边界的情况
|
|
5551
5610
|
|
|
5552
5611
|
if (line.textLimitRight && v + _limitWidth > line.textLimitRight) {
|
|
@@ -5599,8 +5658,8 @@ var FabricLinesvue_type_script_lang_js_rightClickNode = [{
|
|
|
5599
5658
|
|
|
5600
5659
|
var FabricLines_component = Object(componentNormalizer["a" /* default */])(
|
|
5601
5660
|
fabric_chart_FabricLinesvue_type_script_lang_js_,
|
|
5602
|
-
|
|
5603
|
-
|
|
5661
|
+
FabricLinesvue_type_template_id_6bcbb555_render,
|
|
5662
|
+
FabricLinesvue_type_template_id_6bcbb555_staticRenderFns,
|
|
5604
5663
|
false,
|
|
5605
5664
|
null,
|
|
5606
5665
|
null,
|
|
@@ -7619,6 +7678,13 @@ module.exports = store.inspectSource;
|
|
|
7619
7678
|
|
|
7620
7679
|
/***/ }),
|
|
7621
7680
|
|
|
7681
|
+
/***/ "8bbf":
|
|
7682
|
+
/***/ (function(module, exports) {
|
|
7683
|
+
|
|
7684
|
+
module.exports = require("vue");
|
|
7685
|
+
|
|
7686
|
+
/***/ }),
|
|
7687
|
+
|
|
7622
7688
|
/***/ "90e3":
|
|
7623
7689
|
/***/ (function(module, exports) {
|
|
7624
7690
|
|