Commit 7f5507bd61cc5d9995c93caa6543e72fd4232601
1 parent
cae021bb
fix: 修复图表组件绑定数据类型无效(其他组件存在dataType属性)
Showing
1 changed file
with
6 additions
and
6 deletions
... | ... | @@ -5075,7 +5075,7 @@ DataFormatPanel.prototype.addDataFont = function (container) { |
5075 | 5075 | |
5076 | 5076 | /** |
5077 | 5077 | * @description 用于在其他位置获取数据源绑定的数据,在生成数据源面板中进行了改写 |
5078 | - * @return {{orgId: string, attr: string, deviceId: string, deviceType: string, deviceProfileId: string, deviceCode: string, registerAddress: string, method: string, dataType: string}} | |
5078 | + * @return {{orgId: string, attr: string, deviceId: string, deviceType: string, deviceProfileId: string, deviceCode: string, registerAddress: string, method: string, thingsModelDataType: string}} | |
5079 | 5079 | */ |
5080 | 5080 | function getDataSourceBindValue() { |
5081 | 5081 | |
... | ... | @@ -6371,7 +6371,7 @@ DataFormatPanel.prototype.addDataFont = function (container) { |
6371 | 6371 | const { additional = {} } = dataSources[0] || {} |
6372 | 6372 | const { [enumBindKey.EFFECT_SCOPE]: effectScope = 1000 } = additional |
6373 | 6373 | linkageIntervalSelect(effectScope) |
6374 | - form.val(CONTAINER_FILTER, additional) | |
6374 | + form.val(CONTAINER_FILTER, additional) | |
6375 | 6375 | } |
6376 | 6376 | |
6377 | 6377 | const refresh = echoRefreshFn |
... | ... | @@ -6586,7 +6586,7 @@ DataFormatPanel.prototype.addDataFont = function (container) { |
6586 | 6586 | function getSwitchSubmitValue(field) { |
6587 | 6587 | const dataSources = getDataSourceBindValue() |
6588 | 6588 | const enableStatus = getEnableStatus(field) |
6589 | - return { configurationId, contentId: currentPageId.id, nodeId: graphId, dataSources: { ...dataSources, additional: { deviceCode: dataSources?.deviceCode, method: dataSources?.method, registerAddress: dataSources?.registerAddress, dataType: dataSources?.dataType } }, ...enableStatus } | |
6589 | + return { configurationId, contentId: currentPageId.id, nodeId: graphId, dataSources: { ...dataSources, additional: { deviceCode: dataSources?.deviceCode, method: dataSources?.method, registerAddress: dataSources?.registerAddress, thingsModelDataType: dataSources?.thingsModelDataType } }, ...enableStatus } | |
6590 | 6590 | } |
6591 | 6591 | |
6592 | 6592 | |
... | ... | @@ -8719,7 +8719,7 @@ DataFormatPanel.prototype.addDataFont = function (container) { |
8719 | 8719 | METHOD: 'method', |
8720 | 8720 | DEVICE_COED: 'deviceCode', |
8721 | 8721 | REGISTER_ADDRESS: 'registerAddress', |
8722 | - DATA_TYPE: 'dataType', | |
8722 | + DATA_TYPE: 'thingsModelDataType', | |
8723 | 8723 | ACTION_TYPE: 'actionType' |
8724 | 8724 | } |
8725 | 8725 | |
... | ... | @@ -8999,7 +8999,7 @@ DataFormatPanel.prototype.addDataFont = function (container) { |
8999 | 8999 | * @param {{orgId: string, deviceId: string, slaveDeviceId?: string, attr: string}} dataSource |
9000 | 9000 | */ |
9001 | 9001 | function echoDataSource(dataSource = {}) { |
9002 | - const { orgId, deviceId, deviceProfileId, deviceType, attr, method, deviceCode, registerAddress, dataType, actionType } = dataSource | |
9002 | + const { orgId, deviceId, deviceProfileId, deviceType, attr, method, deviceCode, registerAddress, thingsModelDataType, actionType } = dataSource | |
9003 | 9003 | const queue = [] |
9004 | 9004 | currentDataSource = { organizationId: orgId, deviceProfileId, deviceType } |
9005 | 9005 | queue.push(getProduct(deviceType)) |
... | ... | @@ -9020,7 +9020,7 @@ DataFormatPanel.prototype.addDataFont = function (container) { |
9020 | 9020 | method, |
9021 | 9021 | deviceCode, |
9022 | 9022 | registerAddress, |
9023 | - dataType, | |
9023 | + thingsModelDataType, | |
9024 | 9024 | actionType |
9025 | 9025 | }) |
9026 | 9026 | ... | ... |