Commit 0461f377364a4494819a9f0f68d8328100735bd9

Authored by xp.Huang
2 parents 4aaa47fa 46ac529d

Merge branch 'ww' into 'main'

fix: DEFECT-1047 commondType is service will json editor value is service value

See merge request yunteng/thingskit-front!483
@@ -399,7 +399,9 @@ @@ -399,7 +399,9 @@
399 }); 399 });
400 // 如果是设备输出设置脚本值 400 // 如果是设备输出设置脚本值
401 if (action.outTarget === 'DEVICE_OUT') { 401 if (action.outTarget === 'DEVICE_OUT') {
402 - unref(skipUnwrap.actionItemRefs)[index].setJsonValue(action.doContext.params); 402 + if (action.commandType.toString() === '0') {
  403 + unref(skipUnwrap.actionItemRefs)[index].setJsonValue(action.doContext.params);
  404 + }
403 } 405 }
404 // 清除告警有值?{数组} 406 // 清除告警有值?{数组}
405 if (action?.doContext?.clearRule?.length) { 407 if (action?.doContext?.clearRule?.length) {