diff --git a/src/mes/common/commonModelComponent/index.js b/src/mes/common/commonModelComponent/index.js index d6ddc51..5873815 100644 --- a/src/mes/common/commonModelComponent/index.js +++ b/src/mes/common/commonModelComponent/index.js @@ -256,6 +256,7 @@ const useCommonModelEvent = props => { }; const [refreshCount, setRefreshCount] = useState(0); + const [copyToInitialized, setCopyToInitialized] = useState(false); const sModelType = Array.isArray(formData) && formData.length > 0 ? (formData[0]?.sName || formData[0]?.sModelType || '') @@ -985,17 +986,20 @@ const useCommonModelEvent = props => { } - if (!commonUtils.isEmptyObject(copyTo) && copyTo?.isTmpinfobysql) { + // 只有弹窗首次打开时才执行 copyTo 数据回填,防止后续刷新覆盖当前数据 + if (!copyToInitialized && !commonUtils.isEmptyObject(copyTo) && copyTo?.isTmpinfobysql) { tableList.forEach((item, index) => { addState = { ...addState, + enabled: true, [`${tableList[index]}Data`]: index === 0 ? copyTo.masterData : copyTo['slave' + (index - 1 === 0 ? '' : index - 1) + 'Data'], } }) - + setCopyToInitialized(true); } props.setTempRef({}, true); + if (isWait) { return addState; } else { @@ -1904,7 +1908,7 @@ const CommonModel = baseProps => { }; const CommonModelComponent = props => { - const { tabConfig = [], level, modelStyle, app, bMesBill, enabled, masterData, sModelsType, formData } = props; + const { tabConfig = [], level, modelStyle, app, bMesBill, bMesSubBill, enabled, masterData, sModelsType, formData } = props; const { userinfo } = app; const sLanguage = userinfo.sLanguage; const pageRoute = formData?.[0]?.sName @@ -1944,7 +1948,7 @@ const CommonModelComponent = props => { let componentProps = { ...props, showType, // 展示类型(表单/表格) - enabled: !bMesBill ? defaultEnabled : enabled, // 是否可编辑 + enabled: !bMesSubBill ? defaultEnabled : enabled, // 是否可编辑 sTabName, // 标题名称 sName: slaveChild ? 'slaveChild' : sName, // 配置对应的sGrd bHideTitle, //隐藏标题 diff --git a/src/mes/common/commonOperationBarComponent/index.js b/src/mes/common/commonOperationBarComponent/index.js index 8d116ce..4d8be4c 100644 --- a/src/mes/common/commonOperationBarComponent/index.js +++ b/src/mes/common/commonOperationBarComponent/index.js @@ -813,7 +813,7 @@ const useCommonOperationBarComponentEvent = props => { } catch (error) { console.log("=====err", { tempData, str: sDefault, strNew, error }); } - } else if (props.bMesBill) { + } else if (props.bMesBill || props.bMesSubBill) { const btnName = sControlName.replace('BtnLeft.', '').replace('BtnRight.', '').toLowerCase(); let enabled = props.enabled