Commit 2ff47c8349a72d4209e160bad34ed4f4528171b4
1 parent
86ed29b8
1.五彩：工艺作业指导书，参数显示问题
Showing
1 changed file
with
4 additions
and
0 deletions
src/components/Common/CommonViewDragable/rglUtils.js
| @@ -137,6 +137,10 @@ export function getReactGridLayout( | @@ -137,6 +137,10 @@ export function getReactGridLayout( | ||
| 137 | ? record | 137 | ? record |
| 138 | : { ...recordDefault, ...record }; | 138 | : { ...recordDefault, ...record }; |
| 139 | 139 | ||
| 140 | + if(commonUtils.isNotEmptyObject(recordDefault)) { | ||
| 141 | + record = { ...recordDefault, ...record }; | ||
| 142 | + } | ||
| 143 | + | ||
| 140 | const configs = paramsConfig.gdsconfigformslave.filter(item => item.bVisible); | 144 | const configs = paramsConfig.gdsconfigformslave.filter(item => item.bVisible); |
| 141 | const panel = commonUtils.convertStrToObj(panelOld, []); | 145 | const panel = commonUtils.convertStrToObj(panelOld, []); |
| 142 | let layout = []; | 146 | let layout = []; |