diff --git a/.gitmessage.txt b/.gitmessage.txt
new file mode 100644
index 00000000..07932f22
--- /dev/null
+++ b/.gitmessage.txt
@@ -0,0 +1,3 @@
+[일감번호] : [제목]
+
+[작업내용] :
\ No newline at end of file
diff --git a/src/components/floor-plan/modal/basic/step/Placement.jsx b/src/components/floor-plan/modal/basic/step/Placement.jsx
index c6556ea3..1d2545e6 100644
--- a/src/components/floor-plan/modal/basic/step/Placement.jsx
+++ b/src/components/floor-plan/modal/basic/step/Placement.jsx
@@ -330,20 +330,21 @@ const Placement = forwardRef((props, refs) => {
|
{selectedModules &&
selectedModules.itemList.map((item) => (
-
+ // |
+ |
{item.itemNm}
|
))}
- {colspan > 1 && {getMessage('total')} | }
+ {colspan > 1 && {getMessage('modal.module.basic.setting.module.placement.max.rows.multiple')} | }
{selectedModules.itemList.map((item) => (
<>
| {getMessage('modal.module.basic.setting.module.placement.max.row')} |
- {colspan > 1 && {getMessage('modal.module.basic.setting.module.placement.max.rows.multiple')} | }
+ {/* {colspan > 1 && {getMessage('modal.module.basic.setting.module.placement.max.rows.multiple')} | } */}
>
))}
@@ -360,7 +361,7 @@ const Placement = forwardRef((props, refs) => {
{moduleRowColArray[index]?.map((item, index2) => (
<>
{item.moduleMaxRows} |
- {colspan > 1 && {item.mixModuleMaxRows} | }
+ {/* {colspan > 1 && {item.mixModuleMaxRows} | } */}
{colspan > 1 && index2 === moduleRowColArray[index].length - 1 && {item.maxRow} | }
>
))}
diff --git a/src/hooks/module/useModuleBasicSetting.js b/src/hooks/module/useModuleBasicSetting.js
index c43477d7..c7173dca 100644
--- a/src/hooks/module/useModuleBasicSetting.js
+++ b/src/hooks/module/useModuleBasicSetting.js
@@ -2809,14 +2809,9 @@ export function useModuleBasicSetting(tabNum) {
/**
* 자동 레이아웃일떄 설치 가능한 애들은 설치 해주고 실패한 애들은 이름, 최대 설치 가능한 높이 알려줄라고
*/
- if (type === MODULE_SETUP_TYPE.LAYOUT && failAutoSetupRoof.length > 0) {
- const roofNamesList = failAutoSetupRoof.map((roof) => ({
- roofName: roof.roofMaterial.roofMatlNmJp,
- moduleMaxRows: roof.trestleDetail.moduleMaxRows,
- }))
-
- const alertString = roofNamesList.map((item, index) => `${item.roofName}(${item.moduleMaxRows})`)
- swalFire({ text: alertString, icon: 'warning' })
+ if (type === MODULE_SETUP_TYPE.LAYOUT && failAutoSetupRoof.length) {
+ const roofNames = failAutoSetupRoof.map((roof) => roof.roofMaterial.roofMatlNmJp).join(', ')
+ swalFire({ text: getMessage('modal.module.basic.setting.module.placement.over.max.row', [roofNames]), icon: 'warning' })
}
}
diff --git a/src/locales/ja.json b/src/locales/ja.json
index 44bf3bb4..343673d5 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -1075,5 +1075,6 @@
"modal.module.basic.setting.module.placement.max.rows.multiple": "2種混合時\rの最大段数",
"modal.module.basic.setting.module.placement.mix.asg.yn.error": "混合インストール不可能なモジュールです。 (JA)",
"modal.module.basic.setting.module.placement.mix.asg.yn": "混合",
- "modal.module.basic.setting.layoutpassivity.placement": "layout配置 (JA)"
+ "modal.module.basic.setting.layoutpassivity.placement": "layout配置 (JA)",
+ "modal.module.basic.setting.module.placement.over.max.row": "{0}의 최대단수를 초과했습니다. 최대단수표를 참고해 주세요.(JA)"
}
diff --git a/src/locales/ko.json b/src/locales/ko.json
index cd8b855b..b3e3e99b 100644
--- a/src/locales/ko.json
+++ b/src/locales/ko.json
@@ -1076,5 +1076,6 @@
"modal.module.basic.setting.module.placement.max.rows.multiple": "2종 혼합 최대단수",
"modal.module.basic.setting.module.placement.mix.asg.yn.error": "혼합 설치 불가능한 모듈입니다.",
"modal.module.basic.setting.module.placement.mix.asg.yn": "혼합",
- "modal.module.basic.setting.layoutpassivity.placement": "레이아웃 배치"
+ "modal.module.basic.setting.layoutpassivity.placement": "레이아웃 배치",
+ "modal.module.basic.setting.module.placement.over.max.row": "{0}의 최대단수를 초과했습니다. 최대단수표를 참고해 주세요."
}