From 5fcc66b2dcd50ca1e2db8f4d2678a3ca31212b3e Mon Sep 17 00:00:00 2001
From: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Wed, 27 Mar 2024 13:47:31 +0800
Subject: [PATCH] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 0a2641c20fada35b21627c8b42eb1ba796666061
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Mar 27 13:43:00 2024 +0800

    一键生成继电器修改：增加边界条件的判断

commit e2ac7e4ae546e7dd501f9f7c5f7086dd97217189
Author: joylink_zhaoerwei <Bob_Engineer@163.com>
Date:   Wed Mar 27 12:14:15 2024 +0800

    继电器K变大写
---
 src/drawApp/relayCabinetLayoutApp.ts                        | 6 +++++-
 src/layouts/RelayCabinetLayout/GeneraterCiCjConfig.ts       | 2 +-
 src/layouts/RelayCabinetLayout/GeneraterCiQdConfig.ts       | 2 +-
 .../RelayCabinetLayout/GeneraterRelayLayoutConfig.ts        | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/drawApp/relayCabinetLayoutApp.ts b/src/drawApp/relayCabinetLayoutApp.ts
index 488d0ff..4ce2a6d 100644
--- a/src/drawApp/relayCabinetLayoutApp.ts
+++ b/src/drawApp/relayCabinetLayoutApp.ts
@@ -435,7 +435,11 @@ export function creatCiCjListByCombinationtype(
     ciCjList.cjList[i] = new relayCabinetGraphicData.CjDataSet();
     ciCjList.cjList[i].name = 'D' + (i + 1);
     for (let j = 0; j < rows; j++) {
-      if (i < cols - 1 || (i == cols - 1 && j < allCjData.length % rows)) {
+      if (
+        i < cols - 1 ||
+        (i == cols - 1 && j < allCjData.length % rows) ||
+        (i == cols - 1 && allCjData.length % rows == 0)
+      ) {
         ciCjList.cjList[i].bitList[j] = allCjData[i * rows + j];
       } else {
         ciCjList.cjList[i].bitList[j] = new relayCabinetGraphicData.CjData();
diff --git a/src/layouts/RelayCabinetLayout/GeneraterCiCjConfig.ts b/src/layouts/RelayCabinetLayout/GeneraterCiCjConfig.ts
index 51db77b..cb5224d 100644
--- a/src/layouts/RelayCabinetLayout/GeneraterCiCjConfig.ts
+++ b/src/layouts/RelayCabinetLayout/GeneraterCiCjConfig.ts
@@ -684,7 +684,7 @@ const garageDoorCjList = [
       ],
       [
         {
-          code: 'kMJ',
+          code: 'KMJ',
           position: PostionType.Q,
         },
       ],
diff --git a/src/layouts/RelayCabinetLayout/GeneraterCiQdConfig.ts b/src/layouts/RelayCabinetLayout/GeneraterCiQdConfig.ts
index 087b2b0..0b60b11 100644
--- a/src/layouts/RelayCabinetLayout/GeneraterCiQdConfig.ts
+++ b/src/layouts/RelayCabinetLayout/GeneraterCiQdConfig.ts
@@ -99,7 +99,7 @@ upScreenDoorQdList.forEach((qdData) => {
 const garageDoorQdList = [
   {
     code: 'CKM',
-    refDeviceCodes: [['kMJ'], ['GMJ']],
+    refDeviceCodes: [['KMJ'], ['GMJ']],
   },
 ];
 
diff --git a/src/layouts/RelayCabinetLayout/GeneraterRelayLayoutConfig.ts b/src/layouts/RelayCabinetLayout/GeneraterRelayLayoutConfig.ts
index 9a7904c..77cd90b 100644
--- a/src/layouts/RelayCabinetLayout/GeneraterRelayLayoutConfig.ts
+++ b/src/layouts/RelayCabinetLayout/GeneraterRelayLayoutConfig.ts
@@ -453,7 +453,7 @@ const garageDoorCombinations = [
         model: RelayModelType.JWXC_1700,
       },
       {
-        code: 'kMJ',
+        code: 'KMJ',
         model: RelayModelType.JWXC_1700,
       },
       {