Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -684,11 +684,8 @@ function isSelectionCompleteByOldShape (row) {
|
|||||||
if (!hasModel) return false
|
if (!hasModel) return false
|
||||||
|
|
||||||
const oldHasColor = String(row?.OldColor || '').trim().length > 0
|
const oldHasColor = String(row?.OldColor || '').trim().length > 0
|
||||||
const oldHasDim2 = String(row?.OldDim2 || '').trim().length > 0
|
|
||||||
const hasNewColor = normalizeShortCode(row?.NewColor, 3).length === 3
|
const hasNewColor = normalizeShortCode(row?.NewColor, 3).length === 3
|
||||||
const hasNewDim2 = normalizeShortCode(row?.NewDim2, 3).length === 3
|
|
||||||
|
|
||||||
if (oldHasDim2) return hasNewColor && hasNewDim2
|
|
||||||
if (oldHasColor) return hasNewColor
|
if (oldHasColor) return hasNewColor
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user