qcast3/qcast-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dev' (#525) from dev into dev-deploy

Browse Source 
Reviewed-on: #525
This commit is contained in:
ysCha 2025-12-24 14:25:17 +09:00
commit 290b75b276
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/floor-plan/modal/circuitTrestle/step/StepUp.jsx
View File

@ -634,7 +634,7 @@ export default function StepUp(props) {
<div className="slope-wrap"> <div className="slope-wrap">
<div className="circuit-overflow"> <div className="circuit-overflow">
{/* 3개일때 className = by-max */} {/* 3개일때 className = by-max */}
{originPcsVoltageStepUpList.map((stepUp, index) => ( {stepUpListData.map((stepUp, index) => (
<div key={index} className={`module-table-box ${stepUp.pcsItemList.length === 3 ? 'by-max' : ''}`}> <div key={index} className={`module-table-box ${stepUp.pcsItemList.length === 3 ? 'by-max' : ''}`}>
{stepUp?.pcsItemList.map((pcsItem, idx) => ( {stepUp?.pcsItemList.map((pcsItem, idx) => (
<div key={idx} className="module-table-inner"> <div key={idx} className="module-table-inner">
@ -681,7 +681,10 @@ export default function StepUp(props) {
0 0
</option> </option>
)} )}
{Array.from({ length: item.paralQty }, (_, i) => i + 1).map((num) => ( {Array.from(
{ length: originPcsVoltageStepUpList[index].pcsItemList[idx].serQtyList[serQtyIdx].paralQty },
(_, i) => i + 1,
).map((num) => (
<option key={num} value={num}> <option key={num} value={num}>
{num} {num}
</option> </option>

4
src/util/skeleton-utils.js
View File

@ -1003,8 +1003,8 @@ const createInnerLinesFromSkeleton = (roofId, canvas, skeleton, textMode) => {
if (isStartEnd.start) { if (isStartEnd.start) {
//x1 inside //x1 inside
const moveDist = Big(wallLine.x1).minus(wallBaseLine.x1).abs().toNumber() const moveDist = Big(wallLine.x1).minus(wallBaseLine.x1).abs().toNumber()
const aStartY = Big(roofLine.y1).plus(moveDist).abs().toNumber() const aStartY = Big(roofLine.y1).plus(moveDist).toNumber()
const bStartY = Big(wallLine.y1).plus(moveDist).abs().toNumber() const bStartY = Big(wallLine.y1).plus(moveDist).toNumber()
const inLine = findLineContainingPoint(innerLines, { y: aStartY, x: roofLine.x1 }) const inLine = findLineContainingPoint(innerLines, { y: aStartY, x: roofLine.x1 })
console.log('startLines:::::::', inLine) console.log('startLines:::::::', inLine)
const eLineY = Big(bStartY).minus(wallLine.y1).abs().toNumber() const eLineY = Big(bStartY).minus(wallLine.y1).abs().toNumber()