Commit 72a2c5451f461fca49843f6177b0aa9cd28c4dee
Merge branch 'build/build-package-faild' into 'main_dev'
fix: 修复ant编译不通过打包失败 See merge request yunteng/thingskit-scada!70
Showing
1 changed file
with
1 additions
and
2 deletions
| @@ -864,7 +864,7 @@ | @@ -864,7 +864,7 @@ | ||
| 864 | Sidebar.prototype.resetFlowmeter = function (graph) { | 864 | Sidebar.prototype.resetFlowmeter = function (graph) { |
| 865 | const { COMPONENT_TYPE, UUID, WIDTH, HEIGHT } = getFlowmeterAttrKey() | 865 | const { COMPONENT_TYPE, UUID, WIDTH, HEIGHT } = getFlowmeterAttrKey() |
| 866 | const componentType = Sidebar.prototype.enumComponentType | 866 | const componentType = Sidebar.prototype.enumComponentType |
| 867 | - const cells = Object.entries(graph?.getModel()?.cells || {}).map(([_, item]) => item) || [] | 867 | + const cells = Object.entries(graph.getModel().cells || {}).map(([_, item]) => item) || [] |
| 868 | const needReset = cells.filter(item => item.value && item.getAttribute(COMPONENT_TYPE) === componentType.FLOWMETER) | 868 | const needReset = cells.filter(item => item.value && item.getAttribute(COMPONENT_TYPE) === componentType.FLOWMETER) |
| 869 | 869 | ||
| 870 | needReset.forEach(item => { | 870 | needReset.forEach(item => { |
| @@ -933,7 +933,6 @@ function getFlowmeterAttrKey() { | @@ -933,7 +933,6 @@ function getFlowmeterAttrKey() { | ||
| 933 | WAVE_FIRST_COLOR: flowmeterAttr.WAVE_FIRST_COLOR, | 933 | WAVE_FIRST_COLOR: flowmeterAttr.WAVE_FIRST_COLOR, |
| 934 | WAVE_SECOND_COLOR: flowmeterAttr.WAVE_SECOND_COLOR, | 934 | WAVE_SECOND_COLOR: flowmeterAttr.WAVE_SECOND_COLOR, |
| 935 | WAVE_THIRD_COLOR: flowmeterAttr.WAVE_THIRD_COLOR, | 935 | WAVE_THIRD_COLOR: flowmeterAttr.WAVE_THIRD_COLOR, |
| 936 | - UUID: flowmeterAttr.UUID, | ||
| 937 | COMPONENT_TYPE: basicAttr.COMPONENT_TYPE, | 936 | COMPONENT_TYPE: basicAttr.COMPONENT_TYPE, |
| 938 | } | 937 | } |
| 939 | } | 938 | } |