Commit 0e7b126eaf8da2e93c0d21e60d6721ef170dad5f
1 parent
0582a5b6
优化指令集可视化功能;
Showing
2 changed files
with
3 additions
and
1 deletions
src/components/Common/CommonView/index.js
| @@ -431,6 +431,7 @@ export default class CommonView extends Component { | @@ -431,6 +431,7 @@ export default class CommonView extends Component { | ||
| 431 | app, | 431 | app, |
| 432 | iColValue, | 432 | iColValue, |
| 433 | slaveData: this.props.slaveData, | 433 | slaveData: this.props.slaveData, |
| 434 | + slave0Data: this.props.slave0Data, | ||
| 434 | record: masterData, | 435 | record: masterData, |
| 435 | name: 'master', | 436 | name: 'master', |
| 436 | form: this.props.form, | 437 | form: this.props.form, |
src/components/Common/InstructSetSetting/index.js
| @@ -12,7 +12,7 @@ const InstructSetSetting = (props = {}) => { | @@ -12,7 +12,7 @@ const InstructSetSetting = (props = {}) => { | ||
| 12 | const { instructSetSettingVisible } = props; | 12 | const { instructSetSettingVisible } = props; |
| 13 | if (!instructSetSettingVisible) return ""; | 13 | if (!instructSetSettingVisible) return ""; |
| 14 | 14 | ||
| 15 | - const { onCancelInstructSetSettingModal, showConfig, dataValue, instructSetSettingId } = props; | 15 | + const { onCancelInstructSetSettingModal, showConfig, dataValue, instructSetSettingId, slave0Data } = props; |
| 16 | const { showName, sName } = showConfig; | 16 | const { showName, sName } = showConfig; |
| 17 | 17 | ||
| 18 | const instructSet = commonUtils.convertStrToObj(dataValue, {}); | 18 | const instructSet = commonUtils.convertStrToObj(dataValue, {}); |
| @@ -44,6 +44,7 @@ const InstructSetSetting = (props = {}) => { | @@ -44,6 +44,7 @@ const InstructSetSetting = (props = {}) => { | ||
| 44 | { | 44 | { |
| 45 | command: "initData", | 45 | command: "initData", |
| 46 | value: instructSet.change || instructSet.blur || (instructSet ? [instructSet] : []), | 46 | value: instructSet.change || instructSet.blur || (instructSet ? [instructSet] : []), |
| 47 | + slave0Data, | ||
| 47 | }, | 48 | }, |
| 48 | IFRAMEURL | 49 | IFRAMEURL |
| 49 | ); | 50 | ); |