diff --git a/src/components/Common/CommonView/index.js b/src/components/Common/CommonView/index.js index 35597c8..7ef8a65 100644 --- a/src/components/Common/CommonView/index.js +++ b/src/components/Common/CommonView/index.js @@ -431,6 +431,7 @@ export default class CommonView extends Component { app, iColValue, slaveData: this.props.slaveData, + slave0Data: this.props.slave0Data, record: masterData, name: 'master', form: this.props.form, diff --git a/src/components/Common/InstructSetSetting/index.js b/src/components/Common/InstructSetSetting/index.js index da3500b..d8c09c9 100644 --- a/src/components/Common/InstructSetSetting/index.js +++ b/src/components/Common/InstructSetSetting/index.js @@ -12,7 +12,7 @@ const InstructSetSetting = (props = {}) => { const { instructSetSettingVisible } = props; if (!instructSetSettingVisible) return ""; - const { onCancelInstructSetSettingModal, showConfig, dataValue, instructSetSettingId } = props; + const { onCancelInstructSetSettingModal, showConfig, dataValue, instructSetSettingId, slave0Data } = props; const { showName, sName } = showConfig; const instructSet = commonUtils.convertStrToObj(dataValue, {}); @@ -44,6 +44,7 @@ const InstructSetSetting = (props = {}) => { { command: "initData", value: instructSet.change || instructSet.blur || (instructSet ? [instructSet] : []), + slave0Data, }, IFRAMEURL );