From 3ab32820e991bcebba12ba815893c5dc002d9d0e Mon Sep 17 00:00:00 2001
From: kjs <kjs@wace.me>
Date: Thu, 4 Dec 2025 10:39:07 +0900
Subject: [PATCH 1/5] =?UTF-8?q?next.js=20=EB=B2=84=EC=A0=84=2015.4.8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lib/registry/DynamicComponentRenderer.tsx |  6 +-
 .../select-basic/SelectBasicComponent.tsx     | 71 +++++++++-------
 frontend/package-lock.json                    | 80 +++++++++----------
 frontend/package.json                         |  2 +-
 4 files changed, 88 insertions(+), 71 deletions(-)

diff --git a/frontend/lib/registry/DynamicComponentRenderer.tsx b/frontend/lib/registry/DynamicComponentRenderer.tsx
index c0e0c87e..8609623b 100644
--- a/frontend/lib/registry/DynamicComponentRenderer.tsx
+++ b/frontend/lib/registry/DynamicComponentRenderer.tsx
@@ -170,8 +170,9 @@ export const DynamicComponentRenderer: React.FC<DynamicComponentRendererProps> =
         }
       };
 
-      // 🆕 disabledFields 체크
-      const isFieldDisabled = props.disabledFields?.includes(columnName) || (component as any).readonly;
+      // 🆕 disabledFields 체크 + readonly 체크
+      const isFieldDisabled = props.disabledFields?.includes(columnName) || (component as any).disabled;
+      const isFieldReadonly = (component as any).readonly || (component as any).componentConfig?.readonly;
 
       return (
         <CategorySelectComponent
@@ -182,6 +183,7 @@ export const DynamicComponentRenderer: React.FC<DynamicComponentRendererProps> =
           placeholder={component.componentConfig?.placeholder || "선택하세요"}
           required={(component as any).required}
           disabled={isFieldDisabled}
+          readonly={isFieldReadonly}
           className="w-full"
         />
       );
diff --git a/frontend/lib/registry/components/select-basic/SelectBasicComponent.tsx b/frontend/lib/registry/components/select-basic/SelectBasicComponent.tsx
index f19fafdc..30eef51b 100644
--- a/frontend/lib/registry/components/select-basic/SelectBasicComponent.tsx
+++ b/frontend/lib/registry/components/select-basic/SelectBasicComponent.tsx
@@ -52,6 +52,10 @@ const SelectBasicComponent: React.FC<SelectBasicComponentProps> = ({
   menuObjid, // 🆕 메뉴 OBJID
   ...props
 }) => {
+  // 🆕 읽기전용/비활성화 상태 확인
+  const isReadonly = (component as any).readonly || (props as any).readonly || componentConfig?.readonly || false;
+  const isDisabled = (component as any).disabled || (props as any).disabled || componentConfig?.disabled || false;
+  const isFieldDisabled = isDesignMode || isReadonly || isDisabled;
   // 화면 컨텍스트 (데이터 제공자로 등록)
   const screenContext = useScreenContextOptional();
 
@@ -327,7 +331,7 @@ const SelectBasicComponent: React.FC<SelectBasicComponentProps> = ({
 
   // 클릭 이벤트 핸들러 (React Query로 간소화)
   const handleToggle = () => {
-    if (isDesignMode) return;
+    if (isFieldDisabled) return; // 🆕 읽기전용/비활성화 상태에서는 토글 불가
 
     // React Query가 자동으로 캐시 관리하므로 수동 새로고침 불필요
     setIsOpen(!isOpen);
@@ -425,7 +429,7 @@ const SelectBasicComponent: React.FC<SelectBasicComponentProps> = ({
                 value={option.value}
                 checked={selectedValue === option.value}
                 onChange={() => handleOptionSelect(option.value, option.label)}
-                disabled={isDesignMode}
+                disabled={isFieldDisabled}
                 className="border-input text-primary focus:ring-ring h-4 w-4"
               />
               <span className="text-sm">{option.label}</span>
@@ -456,12 +460,14 @@ const SelectBasicComponent: React.FC<SelectBasicComponentProps> = ({
             placeholder="코드 또는 코드명 입력..."
             className={cn(
               "h-10 w-full rounded-lg border border-gray-300 bg-white px-3 py-2 transition-all outline-none",
-              !isDesignMode && "hover:border-orange-400 focus:border-orange-500 focus:ring-2 focus:ring-orange-200",
+              !isFieldDisabled && "hover:border-orange-400 focus:border-orange-500 focus:ring-2 focus:ring-orange-200",
               isSelected && "ring-2 ring-orange-500",
+              isFieldDisabled && "bg-gray-100 cursor-not-allowed",
             )}
-            readOnly={isDesignMode}
+            readOnly={isFieldDisabled}
+            disabled={isFieldDisabled}
           />
-          {isOpen && !isDesignMode && filteredOptions.length > 0 && (
+          {isOpen && !isFieldDisabled && filteredOptions.length > 0 && (
             <div className="absolute z-[99999] mt-1 max-h-60 w-full overflow-auto rounded-md border border-gray-300 bg-white shadow-lg">
               {filteredOptions.map((option, index) => (
                 <div
@@ -490,13 +496,14 @@ const SelectBasicComponent: React.FC<SelectBasicComponentProps> = ({
         <div className="w-full">
           <div
             className={cn(
-              "flex h-10 w-full cursor-pointer items-center justify-between rounded-lg border border-gray-300 bg-white px-3 py-2",
-              !isDesignMode && "hover:border-orange-400",
+              "flex h-10 w-full items-center justify-between rounded-lg border border-gray-300 bg-white px-3 py-2",
+              !isFieldDisabled && "cursor-pointer hover:border-orange-400",
               isSelected && "ring-2 ring-orange-500",
               isOpen && "border-orange-500",
+              isFieldDisabled && "bg-gray-100 cursor-not-allowed",
             )}
             onClick={handleToggle}
-            style={{ pointerEvents: isDesignMode ? "none" : "auto" }}
+            style={{ pointerEvents: isFieldDisabled ? "none" : "auto" }}
           >
             <span className={selectedLabel ? "text-gray-900" : "text-gray-500"}>{selectedLabel || placeholder}</span>
             <svg
@@ -508,7 +515,7 @@ const SelectBasicComponent: React.FC<SelectBasicComponentProps> = ({
               <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 9l-7 7-7-7" />
             </svg>
           </div>
-          {isOpen && !isDesignMode && (
+          {isOpen && !isFieldDisabled && (
             <div className="absolute z-[99999] mt-1 max-h-60 w-full overflow-auto rounded-md border border-gray-300 bg-white shadow-lg">
               {isLoadingCodes ? (
                 <div className="bg-white px-3 py-2 text-gray-900">로딩 중...</div>
@@ -538,8 +545,9 @@ const SelectBasicComponent: React.FC<SelectBasicComponentProps> = ({
           <div
             className={cn(
               "box-border flex h-full w-full flex-wrap gap-2 rounded-lg border border-gray-300 bg-white px-3 py-2",
-              !isDesignMode && "hover:border-orange-400",
+              !isFieldDisabled && "hover:border-orange-400",
               isSelected && "ring-2 ring-orange-500",
+              isFieldDisabled && "bg-gray-100 cursor-not-allowed",
             )}
           >
             {selectedValues.map((val, idx) => {
@@ -567,8 +575,9 @@ const SelectBasicComponent: React.FC<SelectBasicComponentProps> = ({
               type="text"
               placeholder={selectedValues.length > 0 ? "" : placeholder}
               className="min-w-[100px] flex-1 border-none bg-transparent outline-none"
-              onClick={() => setIsOpen(true)}
-              readOnly={isDesignMode}
+              onClick={() => !isFieldDisabled && setIsOpen(true)}
+              readOnly={isFieldDisabled}
+              disabled={isFieldDisabled}
             />
           </div>
         </div>
@@ -589,19 +598,22 @@ const SelectBasicComponent: React.FC<SelectBasicComponentProps> = ({
             type="text"
             value={searchQuery}
             onChange={(e) => {
+              if (isFieldDisabled) return;
               setSearchQuery(e.target.value);
               setIsOpen(true);
             }}
-            onFocus={() => setIsOpen(true)}
+            onFocus={() => !isFieldDisabled && setIsOpen(true)}
             placeholder={placeholder}
             className={cn(
               "h-10 w-full rounded-lg border border-gray-300 bg-white px-3 py-2 transition-all outline-none",
-              !isDesignMode && "hover:border-orange-400 focus:border-orange-500 focus:ring-2 focus:ring-orange-200",
+              !isFieldDisabled && "hover:border-orange-400 focus:border-orange-500 focus:ring-2 focus:ring-orange-200",
               isSelected && "ring-2 ring-orange-500",
+              isFieldDisabled && "bg-gray-100 cursor-not-allowed",
             )}
-            readOnly={isDesignMode}
+            readOnly={isFieldDisabled}
+            disabled={isFieldDisabled}
           />
-          {isOpen && !isDesignMode && filteredOptions.length > 0 && (
+          {isOpen && !isFieldDisabled && filteredOptions.length > 0 && (
             <div className="absolute z-[99999] mt-1 max-h-60 w-full overflow-auto rounded-md border border-gray-300 bg-white shadow-lg">
               {filteredOptions.map((option, index) => (
                 <div
@@ -632,13 +644,14 @@ const SelectBasicComponent: React.FC<SelectBasicComponentProps> = ({
         <div className="w-full">
           <div
             className={cn(
-              "flex h-10 w-full cursor-pointer items-center justify-between rounded-lg border border-gray-300 bg-white px-3 py-2",
-              !isDesignMode && "hover:border-orange-400",
+              "flex h-10 w-full items-center justify-between rounded-lg border border-gray-300 bg-white px-3 py-2",
+              !isFieldDisabled && "cursor-pointer hover:border-orange-400",
               isSelected && "ring-2 ring-orange-500",
               isOpen && "border-orange-500",
+              isFieldDisabled && "bg-gray-100 cursor-not-allowed",
             )}
             onClick={handleToggle}
-            style={{ pointerEvents: isDesignMode ? "none" : "auto" }}
+            style={{ pointerEvents: isFieldDisabled ? "none" : "auto" }}
           >
             <span className={selectedLabel ? "text-gray-900" : "text-gray-500"}>{selectedLabel || placeholder}</span>
             <svg
@@ -650,7 +663,7 @@ const SelectBasicComponent: React.FC<SelectBasicComponentProps> = ({
               <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 9l-7 7-7-7" />
             </svg>
           </div>
-          {isOpen && !isDesignMode && (
+          {isOpen && !isFieldDisabled && (
             <div className="absolute z-[99999] mt-1 w-full rounded-md border border-gray-300 bg-white shadow-lg">
               <input
                 type="text"
@@ -690,12 +703,13 @@ const SelectBasicComponent: React.FC<SelectBasicComponentProps> = ({
           <div
             className={cn(
               "box-border flex w-full flex-wrap items-center gap-2 rounded-lg border border-gray-300 bg-white px-3 py-2",
-              !isDesignMode && "hover:border-orange-400",
+              !isFieldDisabled && "hover:border-orange-400",
               isSelected && "ring-2 ring-orange-500",
+              isFieldDisabled && "bg-gray-100 cursor-not-allowed",
             )}
-            onClick={() => !isDesignMode && setIsOpen(true)}
+            onClick={() => !isFieldDisabled && setIsOpen(true)}
             style={{ 
-              pointerEvents: isDesignMode ? "none" : "auto",
+              pointerEvents: isFieldDisabled ? "none" : "auto",
               height: "100%"
             }}
           >
@@ -726,7 +740,7 @@ const SelectBasicComponent: React.FC<SelectBasicComponentProps> = ({
               <span className="text-gray-500">{placeholder}</span>
             )}
           </div>
-          {isOpen && !isDesignMode && (
+          {isOpen && !isFieldDisabled && (
             <div className="absolute z-[99999] mt-1 max-h-60 w-full overflow-auto rounded-md border border-gray-300 bg-white shadow-lg">
               {(isLoadingCodes || isLoadingCategories) ? (
                 <div className="bg-white px-3 py-2 text-gray-900">로딩 중...</div>
@@ -789,13 +803,14 @@ const SelectBasicComponent: React.FC<SelectBasicComponentProps> = ({
       <div className="w-full">
         <div
           className={cn(
-            "flex h-10 w-full cursor-pointer items-center justify-between rounded-lg border border-gray-300 bg-white px-3 py-2",
-            !isDesignMode && "hover:border-orange-400",
+            "flex h-10 w-full items-center justify-between rounded-lg border border-gray-300 bg-white px-3 py-2",
+            !isFieldDisabled && "cursor-pointer hover:border-orange-400",
             isSelected && "ring-2 ring-orange-500",
             isOpen && "border-orange-500",
+            isFieldDisabled && "bg-gray-100 cursor-not-allowed",
           )}
           onClick={handleToggle}
-          style={{ pointerEvents: isDesignMode ? "none" : "auto" }}
+          style={{ pointerEvents: isFieldDisabled ? "none" : "auto" }}
         >
           <span className={selectedLabel ? "text-gray-900" : "text-gray-500"}>{selectedLabel || placeholder}</span>
           <svg
@@ -807,7 +822,7 @@ const SelectBasicComponent: React.FC<SelectBasicComponentProps> = ({
             <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 9l-7 7-7-7" />
           </svg>
         </div>
-        {isOpen && !isDesignMode && (
+        {isOpen && !isFieldDisabled && (
           <div className="absolute z-[99999] mt-1 max-h-60 w-full overflow-auto rounded-md border border-gray-300 bg-white shadow-lg">
             {isLoadingCodes ? (
               <div className="bg-white px-3 py-2 text-gray-900">로딩 중...</div>
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 08f030e2..78d65fbb 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -60,7 +60,7 @@
         "leaflet": "^1.9.4",
         "lucide-react": "^0.525.0",
         "mammoth": "^1.11.0",
-        "next": "15.4.4",
+        "next": "^15.4.8",
         "react": "19.1.0",
         "react-day-picker": "^9.11.1",
         "react-dnd": "^16.0.1",
@@ -1145,9 +1145,9 @@
       }
     },
     "node_modules/@next/env": {
-      "version": "15.4.4",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-15.4.4.tgz",
-      "integrity": "sha512-SJKOOkULKENyHSYXE5+KiFU6itcIb6wSBjgM92meK0HVKpo94dNOLZVdLLuS7/BxImROkGoPsjR4EnuDucqiiA==",
+      "version": "15.4.8",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-15.4.8.tgz",
+      "integrity": "sha512-LydLa2MDI1NMrOFSkO54mTc8iIHSttj6R6dthITky9ylXV2gCGi0bHQjVCtLGRshdRPjyh2kXbxJukDtBWQZtQ==",
       "license": "MIT"
     },
     "node_modules/@next/eslint-plugin-next": {
@@ -1161,9 +1161,9 @@
       }
     },
     "node_modules/@next/swc-darwin-arm64": {
-      "version": "15.4.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.4.4.tgz",
-      "integrity": "sha512-eVG55dnGwfUuG+TtnUCt+mEJ+8TGgul6nHEvdb8HEH7dmJIFYOCApAaFrIrxwtEq2Cdf+0m5sG1Np8cNpw9EAw==",
+      "version": "15.4.8",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-15.4.8.tgz",
+      "integrity": "sha512-Pf6zXp7yyQEn7sqMxur6+kYcywx5up1J849psyET7/8pG2gQTVMjU3NzgIt8SeEP5to3If/SaWmaA6H6ysBr1A==",
       "cpu": [
         "arm64"
       ],
@@ -1177,9 +1177,9 @@
       }
     },
     "node_modules/@next/swc-darwin-x64": {
-      "version": "15.4.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-15.4.4.tgz",
-      "integrity": "sha512-zqG+/8apsu49CltEj4NAmCGZvHcZbOOOsNoTVeIXphYWIbE4l6A/vuQHyqll0flU2o3dmYCXsBW5FmbrGDgljQ==",
+      "version": "15.4.8",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-15.4.8.tgz",
+      "integrity": "sha512-xla6AOfz68a6kq3gRQccWEvFC/VRGJmA/QuSLENSO7CZX5WIEkSz7r1FdXUjtGCQ1c2M+ndUAH7opdfLK1PQbw==",
       "cpu": [
         "x64"
       ],
@@ -1193,9 +1193,9 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "15.4.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.4.4.tgz",
-      "integrity": "sha512-LRD4l2lq4R+2QCHBQVC0wjxxkLlALGJCwigaJ5FSRSqnje+MRKHljQNZgDCaKUZQzO/TXxlmUdkZP/X3KNGZaw==",
+      "version": "15.4.8",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-15.4.8.tgz",
+      "integrity": "sha512-y3fmp+1Px/SJD+5ntve5QLZnGLycsxsVPkTzAc3zUiXYSOlTPqT8ynfmt6tt4fSo1tAhDPmryXpYKEAcoAPDJw==",
       "cpu": [
         "arm64"
       ],
@@ -1209,9 +1209,9 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "15.4.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.4.4.tgz",
-      "integrity": "sha512-LsGUCTvuZ0690fFWerA4lnQvjkYg9gHo12A3wiPUR4kCxbx/d+SlwmonuTH2SWZI+RVGA9VL3N0S03WTYv6bYg==",
+      "version": "15.4.8",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-15.4.8.tgz",
+      "integrity": "sha512-DX/L8VHzrr1CfwaVjBQr3GWCqNNFgyWJbeQ10Lx/phzbQo3JNAxUok1DZ8JHRGcL6PgMRgj6HylnLNndxn4Z6A==",
       "cpu": [
         "arm64"
       ],
@@ -1225,9 +1225,9 @@
       }
     },
     "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "15.4.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.4.4.tgz",
-      "integrity": "sha512-aOy5yNRpLL3wNiJVkFYl6w22hdREERNjvegE6vvtix8LHRdsTHhWTpgvcYdCK7AIDCQW5ATmzr9XkPHvSoAnvg==",
+      "version": "15.4.8",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-15.4.8.tgz",
+      "integrity": "sha512-9fLAAXKAL3xEIFdKdzG5rUSvSiZTLLTCc6JKq1z04DR4zY7DbAPcRvNm3K1inVhTiQCs19ZRAgUerHiVKMZZIA==",
       "cpu": [
         "x64"
       ],
@@ -1241,9 +1241,9 @@
       }
     },
     "node_modules/@next/swc-linux-x64-musl": {
-      "version": "15.4.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.4.4.tgz",
-      "integrity": "sha512-FL7OAn4UkR8hKQRGBmlHiHinzOb07tsfARdGh7v0Z0jEJ3sz8/7L5bR23ble9E6DZMabSStqlATHlSxv1fuzAg==",
+      "version": "15.4.8",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-15.4.8.tgz",
+      "integrity": "sha512-s45V7nfb5g7dbS7JK6XZDcapicVrMMvX2uYgOHP16QuKH/JA285oy6HcxlKqwUNaFY/UC6EvQ8QZUOo19cBKSA==",
       "cpu": [
         "x64"
       ],
@@ -1257,9 +1257,9 @@
       }
     },
     "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "15.4.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.4.4.tgz",
-      "integrity": "sha512-eEdNW/TXwjYhOulQh0pffTMMItWVwKCQpbziSBmgBNFZIIRn2GTXrhrewevs8wP8KXWYMx8Z+mNU0X+AfvtrRg==",
+      "version": "15.4.8",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-15.4.8.tgz",
+      "integrity": "sha512-KjgeQyOAq7t/HzAJcWPGA8X+4WY03uSCZ2Ekk98S9OgCFsb6lfBE3dbUzUuEQAN2THbwYgFfxX2yFTCMm8Kehw==",
       "cpu": [
         "arm64"
       ],
@@ -1273,9 +1273,9 @@
       }
     },
     "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "15.4.4",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.4.4.tgz",
-      "integrity": "sha512-SE5pYNbn/xZKMy1RE3pAs+4xD32OI4rY6mzJa4XUkp/ItZY+OMjIgilskmErt8ls/fVJ+Ihopi2QIeW6O3TrMw==",
+      "version": "15.4.8",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-15.4.8.tgz",
+      "integrity": "sha512-Exsmf/+42fWVnLMaZHzshukTBxZrSwuuLKFvqhGHJ+mC1AokqieLY/XzAl3jc/CqhXLqLY3RRjkKJ9YnLPcRWg==",
       "cpu": [
         "x64"
       ],
@@ -10876,12 +10876,12 @@
       "license": "MIT"
     },
     "node_modules/next": {
-      "version": "15.4.4",
-      "resolved": "https://registry.npmjs.org/next/-/next-15.4.4.tgz",
-      "integrity": "sha512-kNcubvJjOL9yUOfwtZF3HfDhuhp+kVD+FM2A6Tyua1eI/xfmY4r/8ZS913MMz+oWKDlbps/dQOWdDricuIkXLw==",
+      "version": "15.4.8",
+      "resolved": "https://registry.npmjs.org/next/-/next-15.4.8.tgz",
+      "integrity": "sha512-jwOXTz/bo0Pvlf20FSb6VXVeWRssA2vbvq9SdrOPEg9x8E1B27C2rQtvriAn600o9hH61kjrVRexEffv3JybuA==",
       "license": "MIT",
       "dependencies": {
-        "@next/env": "15.4.4",
+        "@next/env": "15.4.8",
         "@swc/helpers": "0.5.15",
         "caniuse-lite": "^1.0.30001579",
         "postcss": "8.4.31",
@@ -10894,14 +10894,14 @@
         "node": "^18.18.0 || ^19.8.0 || >= 20.0.0"
       },
       "optionalDependencies": {
-        "@next/swc-darwin-arm64": "15.4.4",
-        "@next/swc-darwin-x64": "15.4.4",
-        "@next/swc-linux-arm64-gnu": "15.4.4",
-        "@next/swc-linux-arm64-musl": "15.4.4",
-        "@next/swc-linux-x64-gnu": "15.4.4",
-        "@next/swc-linux-x64-musl": "15.4.4",
-        "@next/swc-win32-arm64-msvc": "15.4.4",
-        "@next/swc-win32-x64-msvc": "15.4.4",
+        "@next/swc-darwin-arm64": "15.4.8",
+        "@next/swc-darwin-x64": "15.4.8",
+        "@next/swc-linux-arm64-gnu": "15.4.8",
+        "@next/swc-linux-arm64-musl": "15.4.8",
+        "@next/swc-linux-x64-gnu": "15.4.8",
+        "@next/swc-linux-x64-musl": "15.4.8",
+        "@next/swc-win32-arm64-msvc": "15.4.8",
+        "@next/swc-win32-x64-msvc": "15.4.8",
         "sharp": "^0.34.3"
       },
       "peerDependencies": {
diff --git a/frontend/package.json b/frontend/package.json
index 6d4f3369..8241df53 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -68,7 +68,7 @@
     "leaflet": "^1.9.4",
     "lucide-react": "^0.525.0",
     "mammoth": "^1.11.0",
-    "next": "15.4.4",
+    "next": "^15.4.8",
     "react": "19.1.0",
     "react-day-picker": "^9.11.1",
     "react-dnd": "^16.0.1",
-- 
2.43.0


From 127f4dc783d035dc94285c80289235fb54325e72 Mon Sep 17 00:00:00 2001
From: kjs <kjs@wace.me>
Date: Thu, 4 Dec 2025 13:37:17 +0900
Subject: [PATCH 2/5] =?UTF-8?q?=EC=88=AB=EC=9E=90=EC=BB=AC=EB=9F=BC=20?=
 =?UTF-8?q?=EC=B2=9C=EB=8B=A8=EC=9C=84=20=EA=B5=AC=EB=B6=84=EC=9E=90=20?=
 =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../table-list/TableListComponent.tsx         |  25 ++-
 .../table-list/TableListConfigPanel.tsx       | 179 ++++++++++--------
 .../registry/components/table-list/types.ts   |   3 +
 3 files changed, 124 insertions(+), 83 deletions(-)

diff --git a/frontend/lib/registry/components/table-list/TableListComponent.tsx b/frontend/lib/registry/components/table-list/TableListComponent.tsx
index 261fa108..7f6fded5 100644
--- a/frontend/lib/registry/components/table-list/TableListComponent.tsx
+++ b/frontend/lib/registry/components/table-list/TableListComponent.tsx
@@ -1906,12 +1906,16 @@ export const TableListComponent: React.FC<TableListComponentProps> = ({
         return "-";
       }
 
-      // 숫자 타입 포맷팅
+      // 숫자 타입 포맷팅 (천단위 구분자 설정 확인)
       if (inputType === "number" || inputType === "decimal") {
         if (value !== null && value !== undefined && value !== "") {
           const numValue = typeof value === "string" ? parseFloat(value) : value;
           if (!isNaN(numValue)) {
-            return numValue.toLocaleString("ko-KR");
+            // thousandSeparator가 false가 아닌 경우(기본값 true) 천단위 구분자 적용
+            if (column.thousandSeparator !== false) {
+              return numValue.toLocaleString("ko-KR");
+            }
+            return String(numValue);
           }
         }
         return String(value);
@@ -1922,7 +1926,11 @@ export const TableListComponent: React.FC<TableListComponentProps> = ({
           if (value !== null && value !== undefined && value !== "") {
             const numValue = typeof value === "string" ? parseFloat(value) : value;
             if (!isNaN(numValue)) {
-              return numValue.toLocaleString("ko-KR");
+              // thousandSeparator가 false가 아닌 경우(기본값 true) 천단위 구분자 적용
+              if (column.thousandSeparator !== false) {
+                return numValue.toLocaleString("ko-KR");
+              }
+              return String(numValue);
             }
           }
           return String(value);
@@ -1939,10 +1947,15 @@ export const TableListComponent: React.FC<TableListComponentProps> = ({
             }
           }
           return "-";
-        case "number":
-          return typeof value === "number" ? value.toLocaleString() : value;
         case "currency":
-          return typeof value === "number" ? `₩${value.toLocaleString()}` : value;
+          if (typeof value === "number") {
+            // thousandSeparator가 false가 아닌 경우(기본값 true) 천단위 구분자 적용
+            if (column.thousandSeparator !== false) {
+              return `₩${value.toLocaleString()}`;
+            }
+            return `₩${value}`;
+          }
+          return value;
         case "boolean":
           return value ? "예" : "아니오";
         default:
diff --git a/frontend/lib/registry/components/table-list/TableListConfigPanel.tsx b/frontend/lib/registry/components/table-list/TableListConfigPanel.tsx
index 9de2f6d8..6e6c414f 100644
--- a/frontend/lib/registry/components/table-list/TableListConfigPanel.tsx
+++ b/frontend/lib/registry/components/table-list/TableListConfigPanel.tsx
@@ -1074,86 +1074,111 @@ export const TableListConfigPanel: React.FC<TableListConfigPanelProps> = ({
 
             {/* 간결한 리스트 형식 컬럼 설정 */}
             <div className="space-y-1">
-              {config.columns?.map((column, index) => (
-                <div
-                  key={column.columnName}
-                  className="hover:bg-muted/30 flex h-6 items-center justify-between rounded border px-2"
-                >
-                  {/* 컬럼명 */}
-                  <span className="flex-1 truncate text-xs" style={{ fontSize: "12px" }}>
-                    {availableColumns.find((col) => col.columnName === column.columnName)?.label ||
-                      column.displayName ||
-                      column.columnName}
-                  </span>
+              {config.columns?.map((column, index) => {
+                // 해당 컬럼의 input_type 확인
+                const columnInfo = availableColumns.find((col) => col.columnName === column.columnName);
+                const isNumberType = columnInfo?.input_type === "number" || columnInfo?.input_type === "decimal";
+                
+                return (
+                  <div
+                    key={column.columnName}
+                    className="hover:bg-muted/30 flex items-center justify-between rounded border px-2 py-1"
+                    style={{ minHeight: "28px" }}
+                  >
+                    <div className="flex flex-1 flex-col gap-0.5 overflow-hidden">
+                      {/* 컬럼명 */}
+                      <span className="truncate text-xs" style={{ fontSize: "12px" }}>
+                        {columnInfo?.label || column.displayName || column.columnName}
+                      </span>
+                      
+                      {/* 숫자 타입인 경우 천단위 구분자 설정 */}
+                      {isNumberType && (
+                        <div className="flex items-center gap-1">
+                          <Checkbox
+                            id={`thousand-sep-${column.columnName}`}
+                            checked={column.thousandSeparator !== false}
+                            onCheckedChange={(checked) => {
+                              updateColumn(column.columnName, { thousandSeparator: checked as boolean });
+                            }}
+                            className="h-3 w-3"
+                          />
+                          <Label 
+                            htmlFor={`thousand-sep-${column.columnName}`} 
+                            className="text-[10px] text-muted-foreground cursor-pointer"
+                          >
+                            천단위 구분자
+                          </Label>
+                        </div>
+                      )}
+                    </div>
 
-                  {/* 필터 체크박스 + 순서 변경 + 삭제 버튼 */}
-                  <div className="flex shrink-0 items-center gap-1">
-                    <Checkbox
-                      checked={config.filter?.filters?.some((f) => f.columnName === column.columnName) || false}
-                      onCheckedChange={(checked) => {
-                        const currentFilters = config.filter?.filters || [];
-                        const columnLabel =
-                          availableColumns.find((col) => col.columnName === column.columnName)?.label ||
-                          column.displayName ||
-                          column.columnName;
+                    {/* 필터 체크박스 + 순서 변경 + 삭제 버튼 */}
+                    <div className="flex shrink-0 items-center gap-1">
+                      <Checkbox
+                        checked={config.filter?.filters?.some((f) => f.columnName === column.columnName) || false}
+                        onCheckedChange={(checked) => {
+                          const currentFilters = config.filter?.filters || [];
+                          const columnLabel =
+                            columnInfo?.label || column.displayName || column.columnName;
 
-                        if (checked) {
-                          // 필터 추가
-                          handleChange("filter", {
-                            ...config.filter,
-                            enabled: true,
-                            filters: [
-                              ...currentFilters,
-                              {
-                                columnName: column.columnName,
-                                label: columnLabel,
-                                type: "text",
-                              },
-                            ],
-                          });
-                        } else {
-                          // 필터 제거
-                          handleChange("filter", {
-                            ...config.filter,
-                            filters: currentFilters.filter((f) => f.columnName !== column.columnName),
-                          });
-                        }
-                      }}
-                      className="h-3 w-3"
-                    />
+                          if (checked) {
+                            // 필터 추가
+                            handleChange("filter", {
+                              ...config.filter,
+                              enabled: true,
+                              filters: [
+                                ...currentFilters,
+                                {
+                                  columnName: column.columnName,
+                                  label: columnLabel,
+                                  type: "text",
+                                },
+                              ],
+                            });
+                          } else {
+                            // 필터 제거
+                            handleChange("filter", {
+                              ...config.filter,
+                              filters: currentFilters.filter((f) => f.columnName !== column.columnName),
+                            });
+                          }
+                        }}
+                        className="h-3 w-3"
+                      />
+                    </div>
+
+                    {/* 순서 변경 + 삭제 버튼 */}
+                    <div className="flex shrink-0 items-center gap-1">
+                      <Button
+                        variant="ghost"
+                        size="sm"
+                        onClick={() => moveColumn(column.columnName, "up")}
+                        disabled={index === 0}
+                        className="h-6 w-6 p-0"
+                      >
+                        <ArrowUp className="h-3 w-3" />
+                      </Button>
+                      <Button
+                        variant="ghost"
+                        size="sm"
+                        onClick={() => moveColumn(column.columnName, "down")}
+                        disabled={index === (config.columns?.length || 0) - 1}
+                        className="h-6 w-6 p-0"
+                      >
+                        <ArrowDown className="h-3 w-3" />
+                      </Button>
+                      <Button
+                        variant="ghost"
+                        size="sm"
+                        onClick={() => removeColumn(column.columnName)}
+                        className="h-6 w-6 p-0 text-red-500 hover:text-red-600"
+                      >
+                        <Trash2 className="h-3 w-3" />
+                      </Button>
+                    </div>
                   </div>
-
-                  {/* 순서 변경 + 삭제 버튼 */}
-                  <div className="flex shrink-0 items-center gap-1">
-                    <Button
-                      variant="ghost"
-                      size="sm"
-                      onClick={() => moveColumn(column.columnName, "up")}
-                      disabled={index === 0}
-                      className="h-6 w-6 p-0"
-                    >
-                      <ArrowUp className="h-3 w-3" />
-                    </Button>
-                    <Button
-                      variant="ghost"
-                      size="sm"
-                      onClick={() => moveColumn(column.columnName, "down")}
-                      disabled={index === (config.columns?.length || 0) - 1}
-                      className="h-6 w-6 p-0"
-                    >
-                      <ArrowDown className="h-3 w-3" />
-                    </Button>
-                    <Button
-                      variant="ghost"
-                      size="sm"
-                      onClick={() => removeColumn(column.columnName)}
-                      className="h-6 w-6 p-0 text-red-500 hover:text-red-600"
-                    >
-                      <Trash2 className="h-3 w-3" />
-                    </Button>
-                  </div>
-                </div>
-              ))}
+                );
+              })}
             </div>
           </div>
         )}
diff --git a/frontend/lib/registry/components/table-list/types.ts b/frontend/lib/registry/components/table-list/types.ts
index 0322926b..b69b9238 100644
--- a/frontend/lib/registry/components/table-list/types.ts
+++ b/frontend/lib/registry/components/table-list/types.ts
@@ -59,6 +59,9 @@ export interface ColumnConfig {
   isEntityJoin?: boolean; // Entity 조인된 컬럼인지 여부
   entityJoinInfo?: EntityJoinInfo; // Entity 조인 상세 정보
 
+  // 숫자 포맷팅 설정
+  thousandSeparator?: boolean; // 천단위 구분자 사용 여부 (기본: true)
+
   // 🎯 엔티티 컬럼 표시 설정 (화면별 동적 설정)
   entityDisplayConfig?: {
     displayColumns: string[]; // 표시할 컬럼들 (기본 테이블 + 조인 테이블)
-- 
2.43.0


From 2cddb4225520e99f999eb0ca7950f00d2b667408 Mon Sep 17 00:00:00 2001
From: kjs <kjs@wace.me>
Date: Thu, 4 Dec 2025 14:30:52 +0900
Subject: [PATCH 3/5] =?UTF-8?q?=EC=97=94=ED=8B=B0=ED=8B=B0=20=ED=91=9C?=
 =?UTF-8?q?=EC=8B=9C=EA=B8=B0=EB=8A=A5=20=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../table-list/TableListComponent.tsx         |  63 ++--
 .../table-list/TableListConfigPanel.tsx       | 326 +++++++++---------
 2 files changed, 198 insertions(+), 191 deletions(-)

diff --git a/frontend/lib/registry/components/table-list/TableListComponent.tsx b/frontend/lib/registry/components/table-list/TableListComponent.tsx
index 7f6fded5..6a1f01fe 100644
--- a/frontend/lib/registry/components/table-list/TableListComponent.tsx
+++ b/frontend/lib/registry/components/table-list/TableListComponent.tsx
@@ -1183,13 +1183,20 @@ export const TableListComponent: React.FC<TableListComponentProps> = ({
             referenceTable: col.additionalJoinInfo!.referenceTable,
           }));
 
-      // console.log("🔍 [TableList] API 호출 시작", {
-      //   tableName: tableConfig.selectedTable,
-      //   page,
-      //   pageSize,
-      //   sortBy,
-      //   sortOrder,
-      // });
+        // 🎯 화면별 엔티티 표시 설정 수집
+        const screenEntityConfigs: Record<string, any> = {};
+        (tableConfig.columns || [])
+          .filter((col) => col.entityDisplayConfig && col.entityDisplayConfig.displayColumns?.length > 0)
+          .forEach((col) => {
+            screenEntityConfigs[col.columnName] = {
+              displayColumns: col.entityDisplayConfig!.displayColumns,
+              separator: col.entityDisplayConfig!.separator || " - ",
+              sourceTable: col.entityDisplayConfig!.sourceTable || tableConfig.selectedTable,
+              joinTable: col.entityDisplayConfig!.joinTable,
+            };
+          });
+
+        console.log("🎯 [TableList] 화면별 엔티티 설정:", screenEntityConfigs);
 
       // 🎯 항상 entityJoinApi 사용 (writer 컬럼 자동 조인 지원)
       response = await entityJoinApi.getTableDataWithJoins(tableConfig.selectedTable, {
@@ -1200,6 +1207,7 @@ export const TableListComponent: React.FC<TableListComponentProps> = ({
         search: hasFilters ? filters : undefined,
         enableEntityJoin: true,
         additionalJoinColumns: entityJoinColumns.length > 0 ? entityJoinColumns : undefined,
+        screenEntityConfigs: Object.keys(screenEntityConfigs).length > 0 ? screenEntityConfigs : undefined, // 🎯 화면별 엔티티 설정 전달
         dataFilter: tableConfig.dataFilter, // 🆕 데이터 필터 전달
       });
 
@@ -1756,33 +1764,46 @@ export const TableListComponent: React.FC<TableListComponentProps> = ({
 
   const formatCellValue = useCallback(
     (value: any, column: ColumnConfig, rowData?: Record<string, any>) => {
-      if (value === null || value === undefined) return "-";
-
-      // 🎯 writer 컬럼 자동 변환: user_id -> user_name
-      if (column.columnName === "writer" && rowData && rowData.writer_name) {
-        return rowData.writer_name;
-      }
-
-      // 🎯 엔티티 컬럼 표시 설정이 있는 경우
+      // 🎯 엔티티 컬럼 표시 설정이 있는 경우 - value가 null이어도 rowData에서 조합 가능
+      // 이 체크를 가장 먼저 수행 (null 체크보다 앞에)
       if (column.entityDisplayConfig && rowData) {
-        // displayColumns 또는 selectedColumns 둘 다 체크
-        const displayColumns = column.entityDisplayConfig.displayColumns || column.entityDisplayConfig.selectedColumns;
+        const displayColumns = column.entityDisplayConfig.displayColumns || (column.entityDisplayConfig as any).selectedColumns;
         const separator = column.entityDisplayConfig.separator;
 
         if (displayColumns && displayColumns.length > 0) {
           // 선택된 컬럼들의 값을 구분자로 조합
           const values = displayColumns
-            .map((colName) => {
-              const cellValue = rowData[colName];
+            .map((colName: string) => {
+              // 1. 먼저 직접 컬럼명으로 시도 (기본 테이블 컬럼인 경우)
+              let cellValue = rowData[colName];
+              
+              // 2. 없으면 ${sourceColumn}_${colName} 형식으로 시도 (조인 테이블 컬럼인 경우)
+              if (cellValue === null || cellValue === undefined) {
+                const joinedKey = `${column.columnName}_${colName}`;
+                cellValue = rowData[joinedKey];
+              }
+              
               if (cellValue === null || cellValue === undefined) return "";
               return String(cellValue);
             })
-            .filter((v) => v !== ""); // 빈 값 제외
+            .filter((v: string) => v !== ""); // 빈 값 제외
 
-          return values.join(separator || " - ");
+          const result = values.join(separator || " - ");
+          if (result) {
+            return result; // 결과가 있으면 반환
+          }
+          // 결과가 비어있으면 아래로 계속 진행 (원래 값 사용)
         }
       }
 
+      // value가 null/undefined면 "-" 반환
+      if (value === null || value === undefined) return "-";
+
+      // 🎯 writer 컬럼 자동 변환: user_id -> user_name
+      if (column.columnName === "writer" && rowData && rowData.writer_name) {
+        return rowData.writer_name;
+      }
+
       const meta = columnMeta[column.columnName];
 
       // inputType 기반 포맷팅 (columnMeta에서 가져온 inputType 우선)
diff --git a/frontend/lib/registry/components/table-list/TableListConfigPanel.tsx b/frontend/lib/registry/components/table-list/TableListConfigPanel.tsx
index 6e6c414f..823424cc 100644
--- a/frontend/lib/registry/components/table-list/TableListConfigPanel.tsx
+++ b/frontend/lib/registry/components/table-list/TableListConfigPanel.tsx
@@ -467,42 +467,22 @@ export const TableListConfigPanel: React.FC<TableListConfigPanelProps> = ({
 
   // 🎯 엔티티 컬럼의 표시 컬럼 정보 로드
   const loadEntityDisplayConfig = async (column: ColumnConfig) => {
-    if (!column.isEntityJoin || !column.entityJoinInfo) {
-      return;
-    }
+    const configKey = `${column.columnName}`;
+    
+    // 이미 로드된 경우 스킵
+    if (entityDisplayConfigs[configKey]) return;
 
-    // entityDisplayConfig가 없으면 초기화
-    if (!column.entityDisplayConfig) {
-      // sourceTable을 결정: entityJoinInfo -> config.selectedTable -> screenTableName 순서
-      const initialSourceTable = column.entityJoinInfo?.sourceTable || config.selectedTable || screenTableName;
-
-      if (!initialSourceTable) {
-        return;
-      }
-
-      const updatedColumns = config.columns?.map((col) => {
-        if (col.columnName === column.columnName) {
-          return {
-            ...col,
-            entityDisplayConfig: {
-              displayColumns: [],
-              separator: " - ",
-              sourceTable: initialSourceTable,
-              joinTable: "",
-            },
-          };
-        }
-        return col;
-      });
-
-      if (updatedColumns) {
-        handleChange("columns", updatedColumns);
-        // 업데이트된 컬럼으로 다시 시도
-        const updatedColumn = updatedColumns.find((col) => col.columnName === column.columnName);
-        if (updatedColumn) {
-          return loadEntityDisplayConfig(updatedColumn);
-        }
-      }
+    if (!column.isEntityJoin) {
+      // 엔티티 컬럼이 아니면 빈 상태로 설정하여 로딩 상태 해제
+      setEntityDisplayConfigs((prev) => ({
+        ...prev,
+        [configKey]: {
+          sourceColumns: [],
+          joinColumns: [],
+          selectedColumns: [],
+          separator: " - ",
+        },
+      }));
       return;
     }
 
@@ -512,32 +492,56 @@ export const TableListConfigPanel: React.FC<TableListConfigPanelProps> = ({
     // 3. config.selectedTable
     // 4. screenTableName
     const sourceTable =
-      column.entityDisplayConfig.sourceTable ||
+      column.entityDisplayConfig?.sourceTable ||
       column.entityJoinInfo?.sourceTable ||
       config.selectedTable ||
       screenTableName;
 
-    let joinTable = column.entityDisplayConfig.joinTable;
-
-    // sourceTable이 여전히 비어있으면 에러
+    // sourceTable이 비어있으면 빈 상태로 설정
     if (!sourceTable) {
+      console.warn("⚠️ sourceTable을 찾을 수 없음:", column.columnName);
+      setEntityDisplayConfigs((prev) => ({
+        ...prev,
+        [configKey]: {
+          sourceColumns: [],
+          joinColumns: [],
+          selectedColumns: column.entityDisplayConfig?.displayColumns || [],
+          separator: column.entityDisplayConfig?.separator || " - ",
+        },
+      }));
       return;
     }
 
-    if (!joinTable && sourceTable) {
-      // joinTable이 없으면 tableTypeApi로 조회해서 설정
+    let joinTable = column.entityDisplayConfig?.joinTable;
+
+    // joinTable이 없으면 tableTypeApi로 조회해서 설정
+    if (!joinTable) {
       try {
+        console.log("🔍 tableTypeApi로 컬럼 정보 조회:", {
+          tableName: sourceTable,
+          columnName: column.columnName,
+        });
+
         const columnList = await tableTypeApi.getColumns(sourceTable);
         const columnInfo = columnList.find((col: any) => (col.column_name || col.columnName) === column.columnName);
 
+        console.log("🔍 컬럼 정보 조회 결과:", {
+          columnInfo: columnInfo,
+          referenceTable: columnInfo?.reference_table || columnInfo?.referenceTable,
+          referenceColumn: columnInfo?.reference_column || columnInfo?.referenceColumn,
+        });
+
         if (columnInfo?.reference_table || columnInfo?.referenceTable) {
           joinTable = columnInfo.reference_table || columnInfo.referenceTable;
+          console.log("✅ tableTypeApi에서 조인 테이블 정보 찾음:", joinTable);
 
           // entityDisplayConfig 업데이트
           const updatedConfig = {
             ...column.entityDisplayConfig,
             sourceTable: sourceTable,
             joinTable: joinTable,
+            displayColumns: column.entityDisplayConfig?.displayColumns || [],
+            separator: column.entityDisplayConfig?.separator || " - ",
           };
 
           // 컬럼 설정 업데이트
@@ -553,74 +557,27 @@ export const TableListConfigPanel: React.FC<TableListConfigPanelProps> = ({
         }
       } catch (error) {
         console.error("tableTypeApi 컬럼 정보 조회 실패:", error);
-        console.log("❌ 조회 실패 상세:", { sourceTable, columnName: column.columnName });
       }
-    } else if (!joinTable) {
-      console.warn("⚠️ sourceTable이 없어서 joinTable 조회 불가:", column.columnName);
     }
 
     console.log("🔍 최종 추출한 값:", { sourceTable, joinTable });
-    const configKey = `${column.columnName}`;
-
-    // 이미 로드된 경우 스킵
-    if (entityDisplayConfigs[configKey]) return;
-
-    // joinTable이 비어있으면 tableTypeApi로 컬럼 정보를 다시 가져와서 referenceTable 정보를 찾기
-    let actualJoinTable = joinTable;
-    if (!actualJoinTable && sourceTable) {
-      try {
-        console.log("🔍 tableTypeApi로 컬럼 정보 다시 조회:", {
-          tableName: sourceTable,
-          columnName: column.columnName,
-        });
-
-        const columnList = await tableTypeApi.getColumns(sourceTable);
-        const columnInfo = columnList.find((col: any) => (col.column_name || col.columnName) === column.columnName);
-
-        console.log("🔍 컬럼 정보 조회 결과:", {
-          columnInfo: columnInfo,
-          referenceTable: columnInfo?.reference_table || columnInfo?.referenceTable,
-          referenceColumn: columnInfo?.reference_column || columnInfo?.referenceColumn,
-        });
-
-        if (columnInfo?.reference_table || columnInfo?.referenceTable) {
-          actualJoinTable = columnInfo.reference_table || columnInfo.referenceTable;
-          console.log("✅ tableTypeApi에서 조인 테이블 정보 찾음:", actualJoinTable);
-
-          // entityDisplayConfig 업데이트
-          const updatedConfig = {
-            ...column.entityDisplayConfig,
-            joinTable: actualJoinTable,
-          };
-
-          // 컬럼 설정 업데이트
-          const updatedColumns = config.columns?.map((col) =>
-            col.columnName === column.columnName ? { ...col, entityDisplayConfig: updatedConfig } : col,
-          );
-
-          if (updatedColumns) {
-            handleChange("columns", updatedColumns);
-          }
-        }
-      } catch (error) {
-        console.error("tableTypeApi 컬럼 정보 조회 실패:", error);
-      }
-    }
-
-    // sourceTable과 joinTable이 모두 있어야 로드
-    if (!sourceTable || !actualJoinTable) {
-      return;
-    }
 
     try {
-      // 기본 테이블과 조인 테이블의 컬럼 정보를 병렬로 로드
-      const [sourceResult, joinResult] = await Promise.all([
-        entityJoinApi.getReferenceTableColumns(sourceTable),
-        entityJoinApi.getReferenceTableColumns(actualJoinTable),
-      ]);
-
+      // 기본 테이블 컬럼 정보는 항상 로드
+      const sourceResult = await entityJoinApi.getReferenceTableColumns(sourceTable);
       const sourceColumns = sourceResult.columns || [];
-      const joinColumns = joinResult.columns || [];
+      
+      // joinTable이 있으면 조인 테이블 컬럼도 로드
+      let joinColumns: Array<{ columnName: string; displayName: string; dataType: string }> = [];
+      if (joinTable) {
+        try {
+          const joinResult = await entityJoinApi.getReferenceTableColumns(joinTable);
+          joinColumns = joinResult.columns || [];
+        } catch (joinError) {
+          console.warn("⚠️ 조인 테이블 컬럼 로드 실패:", joinTable, joinError);
+          // 조인 테이블 로드 실패해도 소스 테이블 컬럼은 표시
+        }
+      }
 
       setEntityDisplayConfigs((prev) => ({
         ...prev,
@@ -633,6 +590,16 @@ export const TableListConfigPanel: React.FC<TableListConfigPanelProps> = ({
       }));
     } catch (error) {
       console.error("엔티티 표시 컬럼 정보 로드 실패:", error);
+      // 에러 발생 시에도 빈 상태로 설정하여 로딩 상태 해제
+      setEntityDisplayConfigs((prev) => ({
+        ...prev,
+        [configKey]: {
+          sourceColumns: [],
+          joinColumns: [],
+          selectedColumns: column.entityDisplayConfig?.displayColumns || [],
+          separator: column.entityDisplayConfig?.separator || " - ",
+        },
+      }));
     }
   };
 
@@ -873,76 +840,95 @@ export const TableListConfigPanel: React.FC<TableListConfigPanelProps> = ({
                       {/* 표시 컬럼 선택 (다중 선택) */}
                       <div className="space-y-1">
                         <Label className="text-xs">표시할 컬럼 선택</Label>
-                        <Popover>
-                          <PopoverTrigger asChild>
-                            <Button
-                              variant="outline"
-                              className="h-6 w-full justify-between text-xs"
-                              style={{ fontSize: "12px" }}
-                            >
-                              {entityDisplayConfigs[column.columnName].selectedColumns.length > 0
-                                ? `${entityDisplayConfigs[column.columnName].selectedColumns.length}개 선택됨`
-                                : "컬럼 선택"}
-                              <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
-                            </Button>
-                          </PopoverTrigger>
-                          <PopoverContent className="w-full p-0" align="start">
-                            <Command>
-                              <CommandInput placeholder="컬럼 검색..." className="text-xs" />
-                              <CommandList>
-                                <CommandEmpty className="text-xs">컬럼을 찾을 수 없습니다.</CommandEmpty>
-                                {entityDisplayConfigs[column.columnName].sourceColumns.length > 0 && (
-                                  <CommandGroup heading={`기본: ${column.entityDisplayConfig?.sourceTable}`}>
-                                    {entityDisplayConfigs[column.columnName].sourceColumns.map((col) => (
-                                      <CommandItem
-                                        key={`source-${col.columnName}`}
-                                        onSelect={() => toggleEntityDisplayColumn(column.columnName, col.columnName)}
-                                        className="text-xs"
-                                      >
-                                        <Check
-                                          className={cn(
-                                            "mr-2 h-4 w-4",
-                                            entityDisplayConfigs[column.columnName].selectedColumns.includes(
-                                              col.columnName,
-                                            )
-                                              ? "opacity-100"
-                                              : "opacity-0",
-                                          )}
-                                        />
-                                        {col.displayName}
-                                      </CommandItem>
-                                    ))}
-                                  </CommandGroup>
-                                )}
-                                {entityDisplayConfigs[column.columnName].joinColumns.length > 0 && (
-                                  <CommandGroup heading={`조인: ${column.entityDisplayConfig?.joinTable}`}>
-                                    {entityDisplayConfigs[column.columnName].joinColumns.map((col) => (
-                                      <CommandItem
-                                        key={`join-${col.columnName}`}
-                                        onSelect={() => toggleEntityDisplayColumn(column.columnName, col.columnName)}
-                                        className="text-xs"
-                                      >
-                                        <Check
-                                          className={cn(
-                                            "mr-2 h-4 w-4",
-                                            entityDisplayConfigs[column.columnName].selectedColumns.includes(
-                                              col.columnName,
-                                            )
-                                              ? "opacity-100"
-                                              : "opacity-0",
-                                          )}
-                                        />
-                                        {col.displayName}
-                                      </CommandItem>
-                                    ))}
-                                  </CommandGroup>
-                                )}
-                              </CommandList>
-                            </Command>
-                          </PopoverContent>
-                        </Popover>
+                        {entityDisplayConfigs[column.columnName].sourceColumns.length === 0 &&
+                        entityDisplayConfigs[column.columnName].joinColumns.length === 0 ? (
+                          <div className="py-2 text-center text-xs text-gray-400">
+                            표시 가능한 컬럼이 없습니다.
+                            {!column.entityDisplayConfig?.joinTable && (
+                              <p className="mt-1 text-[10px]">
+                                테이블 타입 관리에서 참조 테이블을 설정하면 더 많은 컬럼을 선택할 수 있습니다.
+                              </p>
+                            )}
+                          </div>
+                        ) : (
+                          <Popover>
+                            <PopoverTrigger asChild>
+                              <Button
+                                variant="outline"
+                                className="h-6 w-full justify-between text-xs"
+                                style={{ fontSize: "12px" }}
+                              >
+                                {entityDisplayConfigs[column.columnName].selectedColumns.length > 0
+                                  ? `${entityDisplayConfigs[column.columnName].selectedColumns.length}개 선택됨`
+                                  : "컬럼 선택"}
+                                <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+                              </Button>
+                            </PopoverTrigger>
+                            <PopoverContent className="w-full p-0" align="start">
+                              <Command>
+                                <CommandInput placeholder="컬럼 검색..." className="text-xs" />
+                                <CommandList>
+                                  <CommandEmpty className="text-xs">컬럼을 찾을 수 없습니다.</CommandEmpty>
+                                  {entityDisplayConfigs[column.columnName].sourceColumns.length > 0 && (
+                                    <CommandGroup heading={`기본 테이블: ${column.entityDisplayConfig?.sourceTable || config.selectedTable || screenTableName}`}>
+                                      {entityDisplayConfigs[column.columnName].sourceColumns.map((col) => (
+                                        <CommandItem
+                                          key={`source-${col.columnName}`}
+                                          onSelect={() => toggleEntityDisplayColumn(column.columnName, col.columnName)}
+                                          className="text-xs"
+                                        >
+                                          <Check
+                                            className={cn(
+                                              "mr-2 h-4 w-4",
+                                              entityDisplayConfigs[column.columnName].selectedColumns.includes(
+                                                col.columnName,
+                                              )
+                                                ? "opacity-100"
+                                                : "opacity-0",
+                                            )}
+                                          />
+                                          {col.displayName}
+                                        </CommandItem>
+                                      ))}
+                                    </CommandGroup>
+                                  )}
+                                  {entityDisplayConfigs[column.columnName].joinColumns.length > 0 && (
+                                    <CommandGroup heading={`참조 테이블: ${column.entityDisplayConfig?.joinTable}`}>
+                                      {entityDisplayConfigs[column.columnName].joinColumns.map((col) => (
+                                        <CommandItem
+                                          key={`join-${col.columnName}`}
+                                          onSelect={() => toggleEntityDisplayColumn(column.columnName, col.columnName)}
+                                          className="text-xs"
+                                        >
+                                          <Check
+                                            className={cn(
+                                              "mr-2 h-4 w-4",
+                                              entityDisplayConfigs[column.columnName].selectedColumns.includes(
+                                                col.columnName,
+                                              )
+                                                ? "opacity-100"
+                                                : "opacity-0",
+                                            )}
+                                          />
+                                          {col.displayName}
+                                        </CommandItem>
+                                      ))}
+                                    </CommandGroup>
+                                  )}
+                                </CommandList>
+                              </Command>
+                            </PopoverContent>
+                          </Popover>
+                        )}
                       </div>
 
+                      {/* 참조 테이블 미설정 안내 */}
+                      {!column.entityDisplayConfig?.joinTable && entityDisplayConfigs[column.columnName].sourceColumns.length > 0 && (
+                        <div className="rounded bg-blue-50 p-2 text-[10px] text-blue-600">
+                          현재 기본 테이블 컬럼만 표시됩니다. 테이블 타입 관리에서 참조 테이블을 설정하면 조인된 테이블의 컬럼도 선택할 수 있습니다.
+                        </div>
+                      )}
+
                       {/* 선택된 컬럼 미리보기 */}
                       {entityDisplayConfigs[column.columnName].selectedColumns.length > 0 && (
                         <div className="space-y-1">
-- 
2.43.0


From 93d99373434f3244214c3f2b214e5184f12f2749 Mon Sep 17 00:00:00 2001
From: kjs <kjs@wace.me>
Date: Thu, 4 Dec 2025 16:02:00 +0900
Subject: [PATCH 4/5] =?UTF-8?q?=EC=9E=90=EB=8F=99=EC=99=84=EC=84=B1=20?=
 =?UTF-8?q?=EA=B2=80=EC=83=89=20=EC=9E=85=EB=A0=A5=20=EC=BB=B4=ED=8F=AC?=
 =?UTF-8?q?=EB=84=8C=ED=8A=B8=20=EB=8B=A4=EC=A4=91=20=EC=BB=AC=EB=9F=BC=20?=
 =?UTF-8?q?=ED=91=9C=EC=8B=9C=20=EA=B8=B0=EB=8A=A5=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AutocompleteSearchInputComponent.tsx      |  22 ++-
 .../AutocompleteSearchInputConfigPanel.tsx    | 156 +++++++++++++-----
 .../autocomplete-search-input/types.ts        |   3 +
 3 files changed, 134 insertions(+), 47 deletions(-)

diff --git a/frontend/lib/registry/components/autocomplete-search-input/AutocompleteSearchInputComponent.tsx b/frontend/lib/registry/components/autocomplete-search-input/AutocompleteSearchInputComponent.tsx
index 1c5920f0..7a115ea3 100644
--- a/frontend/lib/registry/components/autocomplete-search-input/AutocompleteSearchInputComponent.tsx
+++ b/frontend/lib/registry/components/autocomplete-search-input/AutocompleteSearchInputComponent.tsx
@@ -42,10 +42,26 @@ export function AutocompleteSearchInputComponent({
   // config prop 우선, 없으면 개별 prop 사용
   const tableName = config?.tableName || propTableName || "";
   const displayField = config?.displayField || propDisplayField || "";
+  const displayFields = config?.displayFields || (displayField ? [displayField] : []); // 다중 표시 필드
+  const displaySeparator = config?.displaySeparator || " → "; // 구분자
   const valueField = config?.valueField || propValueField || "";
-  const searchFields = config?.searchFields || propSearchFields || [displayField];
+  const searchFields = config?.searchFields || propSearchFields || displayFields; // 검색 필드도 다중 표시 필드 사용
   const placeholder = config?.placeholder || propPlaceholder || "검색...";
   
+  // 다중 필드 값을 조합하여 표시 문자열 생성
+  const getDisplayValue = (item: EntitySearchResult): string => {
+    if (displayFields.length > 1) {
+      // 여러 필드를 구분자로 조합
+      const values = displayFields
+        .map((field) => item[field])
+        .filter((v) => v !== null && v !== undefined && v !== "")
+        .map((v) => String(v));
+      return values.join(displaySeparator);
+    }
+    // 단일 필드
+    return item[displayField] || "";
+  };
+  
   const [inputValue, setInputValue] = useState("");
   const [isOpen, setIsOpen] = useState(false);
   const [selectedData, setSelectedData] = useState<EntitySearchResult | null>(null);
@@ -115,7 +131,7 @@ export function AutocompleteSearchInputComponent({
 
   const handleSelect = (item: EntitySearchResult) => {
     setSelectedData(item);
-    setInputValue(item[displayField] || "");
+    setInputValue(getDisplayValue(item));
     
     console.log("🔍 AutocompleteSearchInput handleSelect:", {
       item,
@@ -239,7 +255,7 @@ export function AutocompleteSearchInputComponent({
                   onClick={() => handleSelect(item)}
                   className="w-full px-3 py-2 text-left text-xs transition-colors hover:bg-accent sm:text-sm"
                 >
-                  <div className="font-medium">{item[displayField]}</div>
+                  <div className="font-medium">{getDisplayValue(item)}</div>
                 </button>
               ))}
             </div>
diff --git a/frontend/lib/registry/components/autocomplete-search-input/AutocompleteSearchInputConfigPanel.tsx b/frontend/lib/registry/components/autocomplete-search-input/AutocompleteSearchInputConfigPanel.tsx
index d2290c2f..bb0b8175 100644
--- a/frontend/lib/registry/components/autocomplete-search-input/AutocompleteSearchInputConfigPanel.tsx
+++ b/frontend/lib/registry/components/autocomplete-search-input/AutocompleteSearchInputConfigPanel.tsx
@@ -184,52 +184,118 @@ export function AutocompleteSearchInputConfigPanel({
         </Popover>
       </div>
 
-      {/* 2. 표시 필드 선택 */}
+      {/* 2. 표시 필드 선택 (다중 선택 가능) */}
       <div className="space-y-2">
-        <Label className="text-xs font-semibold sm:text-sm">2. 표시 필드 *</Label>
-        <Popover open={openDisplayFieldCombo} onOpenChange={setOpenDisplayFieldCombo}>
-          <PopoverTrigger asChild>
-            <Button
-              variant="outline"
-              role="combobox"
-              aria-expanded={openDisplayFieldCombo}
-              className="h-8 w-full justify-between text-xs sm:h-10 sm:text-sm"
-              disabled={!localConfig.tableName || isLoadingSourceColumns}
-            >
-              {localConfig.displayField
-                ? sourceTableColumns.find((c) => c.columnName === localConfig.displayField)?.displayName || localConfig.displayField
-                : isLoadingSourceColumns ? "로딩 중..." : "사용자에게 보여줄 필드"}
-              <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
-            </Button>
-          </PopoverTrigger>
-          <PopoverContent className="p-0" style={{ width: "var(--radix-popover-trigger-width)" }} align="start">
-            <Command>
-              <CommandInput placeholder="필드 검색..." className="text-xs sm:text-sm" />
-              <CommandList>
-                <CommandEmpty className="text-xs sm:text-sm">필드를 찾을 수 없습니다.</CommandEmpty>
-                <CommandGroup>
-                  {sourceTableColumns.map((column) => (
-                    <CommandItem
-                      key={column.columnName}
-                      value={column.columnName}
-                      onSelect={() => {
-                        updateConfig({ displayField: column.columnName });
-                        setOpenDisplayFieldCombo(false);
+        <Label className="text-xs font-semibold sm:text-sm">2. 표시 필드 * (여러 개 선택 가능)</Label>
+        <div className="space-y-2">
+          {/* 선택된 필드 표시 */}
+          {(localConfig.displayFields && localConfig.displayFields.length > 0) ? (
+            <div className="flex flex-wrap gap-1 rounded-md border p-2 min-h-[40px]">
+              {localConfig.displayFields.map((fieldName) => {
+                const col = sourceTableColumns.find((c) => c.columnName === fieldName);
+                return (
+                  <span
+                    key={fieldName}
+                    className="inline-flex items-center gap-1 rounded-md bg-primary/10 px-2 py-1 text-xs"
+                  >
+                    {col?.displayName || fieldName}
+                    <button
+                      type="button"
+                      onClick={() => {
+                        const newFields = localConfig.displayFields?.filter((f) => f !== fieldName) || [];
+                        updateConfig({ 
+                          displayFields: newFields,
+                          displayField: newFields[0] || "", // 첫 번째 필드를 기본 displayField로
+                        });
                       }}
-                      className="text-xs sm:text-sm"
+                      className="hover:text-destructive"
                     >
-                      <Check className={cn("mr-2 h-4 w-4", localConfig.displayField === column.columnName ? "opacity-100" : "opacity-0")} />
-                      <div className="flex flex-col">
-                        <span className="font-medium">{column.displayName || column.columnName}</span>
-                        {column.displayName && <span className="text-[10px] text-gray-500">{column.columnName}</span>}
-                      </div>
-                    </CommandItem>
-                  ))}
-                </CommandGroup>
-              </CommandList>
-            </Command>
-          </PopoverContent>
-        </Popover>
+                      <X className="h-3 w-3" />
+                    </button>
+                  </span>
+                );
+              })}
+            </div>
+          ) : (
+            <div className="rounded-md border border-dashed p-2 text-center text-xs text-muted-foreground">
+              아래에서 표시할 필드를 선택하세요
+            </div>
+          )}
+          
+          {/* 필드 선택 드롭다운 */}
+          <Popover open={openDisplayFieldCombo} onOpenChange={setOpenDisplayFieldCombo}>
+            <PopoverTrigger asChild>
+              <Button
+                variant="outline"
+                role="combobox"
+                aria-expanded={openDisplayFieldCombo}
+                className="h-8 w-full justify-between text-xs sm:h-10 sm:text-sm"
+                disabled={!localConfig.tableName || isLoadingSourceColumns}
+              >
+                {isLoadingSourceColumns ? "로딩 중..." : "필드 추가..."}
+                <ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
+              </Button>
+            </PopoverTrigger>
+            <PopoverContent className="p-0" style={{ width: "var(--radix-popover-trigger-width)" }} align="start">
+              <Command>
+                <CommandInput placeholder="필드 검색..." className="text-xs sm:text-sm" />
+                <CommandList>
+                  <CommandEmpty className="text-xs sm:text-sm">필드를 찾을 수 없습니다.</CommandEmpty>
+                  <CommandGroup>
+                    {sourceTableColumns.map((column) => {
+                      const isSelected = localConfig.displayFields?.includes(column.columnName);
+                      return (
+                        <CommandItem
+                          key={column.columnName}
+                          value={column.columnName}
+                          onSelect={() => {
+                            const currentFields = localConfig.displayFields || [];
+                            let newFields: string[];
+                            if (isSelected) {
+                              newFields = currentFields.filter((f) => f !== column.columnName);
+                            } else {
+                              newFields = [...currentFields, column.columnName];
+                            }
+                            updateConfig({ 
+                              displayFields: newFields,
+                              displayField: newFields[0] || "", // 첫 번째 필드를 기본 displayField로
+                            });
+                          }}
+                          className="text-xs sm:text-sm"
+                        >
+                          <Check className={cn("mr-2 h-4 w-4", isSelected ? "opacity-100" : "opacity-0")} />
+                          <div className="flex flex-col">
+                            <span className="font-medium">{column.displayName || column.columnName}</span>
+                            {column.displayName && <span className="text-[10px] text-gray-500">{column.columnName}</span>}
+                          </div>
+                        </CommandItem>
+                      );
+                    })}
+                  </CommandGroup>
+                </CommandList>
+              </Command>
+            </PopoverContent>
+          </Popover>
+          
+          {/* 구분자 설정 */}
+          {localConfig.displayFields && localConfig.displayFields.length > 1 && (
+            <div className="flex items-center gap-2">
+              <Label className="text-xs whitespace-nowrap">구분자:</Label>
+              <Input
+                value={localConfig.displaySeparator || " → "}
+                onChange={(e) => updateConfig({ displaySeparator: e.target.value })}
+                placeholder=" → "
+                className="h-7 w-20 text-xs text-center"
+              />
+              <span className="text-xs text-muted-foreground">
+                미리보기: {localConfig.displayFields.map((f) => {
+                  const col = sourceTableColumns.find((c) => c.columnName === f);
+                  return col?.displayName || f;
+                }).join(localConfig.displaySeparator || " → ")}
+              </span>
+            </div>
+          )}
+        </div>
       </div>
 
       {/* 3. 저장 대상 테이블 선택 */}
@@ -419,7 +485,9 @@ export function AutocompleteSearchInputConfigPanel({
               <strong>외부 테이블:</strong> {localConfig.tableName}
             </p>
             <p>
-              <strong>표시 필드:</strong> {localConfig.displayField}
+              <strong>표시 필드:</strong> {localConfig.displayFields?.length 
+                ? localConfig.displayFields.join(localConfig.displaySeparator || " → ")
+                : localConfig.displayField}
             </p>
             <p>
               <strong>저장 테이블:</strong> {localConfig.targetTable}
diff --git a/frontend/lib/registry/components/autocomplete-search-input/types.ts b/frontend/lib/registry/components/autocomplete-search-input/types.ts
index 85101e89..ea1c3734 100644
--- a/frontend/lib/registry/components/autocomplete-search-input/types.ts
+++ b/frontend/lib/registry/components/autocomplete-search-input/types.ts
@@ -29,5 +29,8 @@ export interface AutocompleteSearchInputConfig {
   fieldMappings?: FieldMapping[]; // 매핑할 필드 목록
   // 저장 대상 테이블 (간소화 버전)
   targetTable?: string;
+  // 🆕 다중 표시 필드 설정 (여러 컬럼 조합)
+  displayFields?: string[]; // 여러 컬럼을 조합하여 표시
+  displaySeparator?: string; // 구분자 (기본값: " - ")
 }
 
-- 
2.43.0


From bc66f3bba1b92c62e5de44f46cee48547ca58dd7 Mon Sep 17 00:00:00 2001
From: kjs <kjs@wace.me>
Date: Thu, 4 Dec 2025 18:26:35 +0900
Subject: [PATCH 5/5] =?UTF-8?q?=EA=B1=B0=EB=9E=98=EC=B2=98=20=EC=97=90?=
 =?UTF-8?q?=EB=9F=AC=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/controllers/entityJoinController.ts   |  15 +
 .../src/services/tableManagementService.ts    |  46 +++
 frontend/lib/api/entityJoin.ts                |   9 +
 .../button-primary/ButtonPrimaryComponent.tsx |  26 +-
 .../SplitPanelLayoutComponent.tsx             | 112 ++++--
 .../table-list/TableListComponent.tsx         |  56 +++
 .../table-list/TableListConfigPanel.tsx       | 335 ++++++++++++++++++
 .../registry/components/table-list/types.ts   |  18 +
 frontend/lib/utils/buttonActions.ts           |  19 +
 ..._임베딩_및_데이터_전달_시스템_구현_계획서.md |   1 +
 화면_임베딩_시스템_Phase1-4_구현_완료.md      |   1 +
 화면_임베딩_시스템_충돌_분석_보고서.md        |   1 +
 12 files changed, 600 insertions(+), 39 deletions(-)

diff --git a/backend-node/src/controllers/entityJoinController.ts b/backend-node/src/controllers/entityJoinController.ts
index 66e20ccd..00727f1d 100644
--- a/backend-node/src/controllers/entityJoinController.ts
+++ b/backend-node/src/controllers/entityJoinController.ts
@@ -29,6 +29,7 @@ export class EntityJoinController {
         screenEntityConfigs, // 화면별 엔티티 설정 (JSON 문자열)
         autoFilter, // 🔒 멀티테넌시 자동 필터
         dataFilter, // 🆕 데이터 필터 (JSON 문자열)
+        excludeFilter, // 🆕 제외 필터 (JSON 문자열) - 다른 테이블에 이미 존재하는 데이터 제외
         userLang, // userLang은 별도로 분리하여 search에 포함되지 않도록 함
         ...otherParams
       } = req.query;
@@ -125,6 +126,19 @@ export class EntityJoinController {
         }
       }
 
+      // 🆕 제외 필터 처리 (다른 테이블에 이미 존재하는 데이터 제외)
+      let parsedExcludeFilter: any = undefined;
+      if (excludeFilter) {
+        try {
+          parsedExcludeFilter =
+            typeof excludeFilter === "string" ? JSON.parse(excludeFilter) : excludeFilter;
+          logger.info("제외 필터 파싱 완료:", parsedExcludeFilter);
+        } catch (error) {
+          logger.warn("제외 필터 파싱 오류:", error);
+          parsedExcludeFilter = undefined;
+        }
+      }
+
       const result = await tableManagementService.getTableDataWithEntityJoins(
         tableName,
         {
@@ -141,6 +155,7 @@ export class EntityJoinController {
           additionalJoinColumns: parsedAdditionalJoinColumns,
           screenEntityConfigs: parsedScreenEntityConfigs,
           dataFilter: parsedDataFilter, // 🆕 데이터 필터 전달
+          excludeFilter: parsedExcludeFilter, // 🆕 제외 필터 전달
         }
       );
 
diff --git a/backend-node/src/services/tableManagementService.ts b/backend-node/src/services/tableManagementService.ts
index 8e01903b..781a9498 100644
--- a/backend-node/src/services/tableManagementService.ts
+++ b/backend-node/src/services/tableManagementService.ts
@@ -2462,6 +2462,14 @@ export class TableManagementService {
       }>;
       screenEntityConfigs?: Record<string, any>; // 화면별 엔티티 설정
       dataFilter?: any; // 🆕 데이터 필터
+      excludeFilter?: {
+        enabled: boolean;
+        referenceTable: string;
+        referenceColumn: string;
+        sourceColumn: string;
+        filterColumn?: string;
+        filterValue?: any;
+      }; // 🆕 제외 필터 (다른 테이블에 이미 존재하는 데이터 제외)
     }
   ): Promise<EntityJoinResponse> {
     const startTime = Date.now();
@@ -2716,6 +2724,44 @@ export class TableManagementService {
         }
       }
 
+      // 🆕 제외 필터 적용 (다른 테이블에 이미 존재하는 데이터 제외)
+      if (options.excludeFilter && options.excludeFilter.enabled) {
+        const {
+          referenceTable,
+          referenceColumn,
+          sourceColumn,
+          filterColumn,
+          filterValue,
+        } = options.excludeFilter;
+
+        if (referenceTable && referenceColumn && sourceColumn) {
+          // 서브쿼리로 이미 존재하는 데이터 제외
+          let excludeSubquery = `main."${sourceColumn}" NOT IN (
+            SELECT "${referenceColumn}" FROM "${referenceTable}"
+            WHERE "${referenceColumn}" IS NOT NULL`;
+
+          // 추가 필터 조건이 있으면 적용 (예: 특정 거래처의 품목만 제외)
+          if (filterColumn && filterValue !== undefined && filterValue !== null) {
+            excludeSubquery += ` AND "${filterColumn}" = '${String(filterValue).replace(/'/g, "''")}'`;
+          }
+
+          excludeSubquery += ")";
+
+          whereClause = whereClause
+            ? `${whereClause} AND ${excludeSubquery}`
+            : excludeSubquery;
+
+          logger.info(`🚫 제외 필터 적용 (Entity 조인):`, {
+            referenceTable,
+            referenceColumn,
+            sourceColumn,
+            filterColumn,
+            filterValue,
+            excludeSubquery,
+          });
+        }
+      }
+
       // ORDER BY 절 구성
       const orderBy = options.sortBy
         ? `main.${options.sortBy} ${options.sortOrder === "desc" ? "DESC" : "ASC"}`
diff --git a/frontend/lib/api/entityJoin.ts b/frontend/lib/api/entityJoin.ts
index a84f3355..a3206df9 100644
--- a/frontend/lib/api/entityJoin.ts
+++ b/frontend/lib/api/entityJoin.ts
@@ -69,6 +69,14 @@ export const entityJoinApi = {
       }>;
       screenEntityConfigs?: Record<string, any>; // 🎯 화면별 엔티티 설정
       dataFilter?: any; // 🆕 데이터 필터
+      excludeFilter?: {
+        enabled: boolean;
+        referenceTable: string;
+        referenceColumn: string;
+        sourceColumn: string;
+        filterColumn?: string;
+        filterValue?: any;
+      }; // 🆕 제외 필터 (다른 테이블에 이미 존재하는 데이터 제외)
     } = {},
   ): Promise<EntityJoinResponse> => {
     // 🔒 멀티테넌시: company_code 자동 필터링 활성화
@@ -90,6 +98,7 @@ export const entityJoinApi = {
         screenEntityConfigs: params.screenEntityConfigs ? JSON.stringify(params.screenEntityConfigs) : undefined, // 🎯 화면별 엔티티 설정
         autoFilter: JSON.stringify(autoFilter), // 🔒 멀티테넌시 필터링
         dataFilter: params.dataFilter ? JSON.stringify(params.dataFilter) : undefined, // 🆕 데이터 필터
+        excludeFilter: params.excludeFilter ? JSON.stringify(params.excludeFilter) : undefined, // 🆕 제외 필터
       },
     });
     return response.data.data;
diff --git a/frontend/lib/registry/components/button-primary/ButtonPrimaryComponent.tsx b/frontend/lib/registry/components/button-primary/ButtonPrimaryComponent.tsx
index 0bf8bea2..5816940a 100644
--- a/frontend/lib/registry/components/button-primary/ButtonPrimaryComponent.tsx
+++ b/frontend/lib/registry/components/button-primary/ButtonPrimaryComponent.tsx
@@ -663,9 +663,29 @@ export const ButtonPrimaryComponent: React.FC<ButtonPrimaryComponentProps> = ({
         return;
       }
 
+      // 🆕 modalDataStore에서 선택된 데이터 가져오기 (분할 패널 등에서 선택한 데이터)
+      let effectiveSelectedRowsData = selectedRowsData;
+      if ((!selectedRowsData || selectedRowsData.length === 0) && effectiveTableName) {
+        try {
+          const { useModalDataStore } = await import("@/stores/modalDataStore");
+          const dataRegistry = useModalDataStore.getState().dataRegistry;
+          const modalData = dataRegistry[effectiveTableName];
+          if (modalData && modalData.length > 0) {
+            effectiveSelectedRowsData = modalData;
+            console.log("🔗 [ButtonPrimaryComponent] modalDataStore에서 선택된 데이터 가져옴:", {
+              tableName: effectiveTableName,
+              count: modalData.length,
+              data: modalData,
+            });
+          }
+        } catch (error) {
+          console.warn("modalDataStore 접근 실패:", error);
+        }
+      }
+
       // 삭제 액션인데 선택된 데이터가 없으면 경고 메시지 표시하고 중단
       const hasDataToDelete =
-        (selectedRowsData && selectedRowsData.length > 0) || (flowSelectedData && flowSelectedData.length > 0);
+        (effectiveSelectedRowsData && effectiveSelectedRowsData.length > 0) || (flowSelectedData && flowSelectedData.length > 0);
 
       if (processedConfig.action.type === "delete" && !hasDataToDelete) {
         toast.warning("삭제할 항목을 먼저 선택해주세요.");
@@ -724,9 +744,9 @@ export const ButtonPrimaryComponent: React.FC<ButtonPrimaryComponentProps> = ({
         onClose,
         onFlowRefresh, // 플로우 새로고침 콜백 추가
         onSave: finalOnSave, // 🆕 EditModal의 handleSave 콜백 (props에서도 추출)
-        // 테이블 선택된 행 정보 추가
+        // 테이블 선택된 행 정보 추가 (modalDataStore에서 가져온 데이터 우선)
         selectedRows,
-        selectedRowsData,
+        selectedRowsData: effectiveSelectedRowsData,
         // 테이블 정렬 정보 추가
         sortBy, // 🆕 정렬 컬럼
         sortOrder, // 🆕 정렬 방향
diff --git a/frontend/lib/registry/components/split-panel-layout/SplitPanelLayoutComponent.tsx b/frontend/lib/registry/components/split-panel-layout/SplitPanelLayoutComponent.tsx
index fdaddfc3..ac44eded 100644
--- a/frontend/lib/registry/components/split-panel-layout/SplitPanelLayoutComponent.tsx
+++ b/frontend/lib/registry/components/split-panel-layout/SplitPanelLayoutComponent.tsx
@@ -293,8 +293,17 @@ export const SplitPanelLayoutComponent: React.FC<SplitPanelLayoutComponentProps>
     ) => {
       if (value === null || value === undefined) return "-";
 
-      // 카테고리 매핑이 있는지 확인
-      const mapping = categoryMappings[columnName];
+      // 🆕 카테고리 매핑 찾기 (여러 키 형태 시도)
+      // 1. 전체 컬럼명 (예: "item_info.material")
+      // 2. 컬럼명만 (예: "material")
+      let mapping = categoryMappings[columnName];
+      
+      if (!mapping && columnName.includes(".")) {
+        // 조인된 컬럼의 경우 컬럼명만으로 다시 시도
+        const simpleColumnName = columnName.split(".").pop() || columnName;
+        mapping = categoryMappings[simpleColumnName];
+      }
+      
       if (mapping && mapping[String(value)]) {
         const categoryData = mapping[String(value)];
         const displayLabel = categoryData.label || String(value);
@@ -690,43 +699,69 @@ export const SplitPanelLayoutComponent: React.FC<SplitPanelLayoutComponentProps>
     loadLeftCategoryMappings();
   }, [componentConfig.leftPanel?.tableName, isDesignMode]);
 
-  // 우측 테이블 카테고리 매핑 로드
+  // 우측 테이블 카테고리 매핑 로드 (조인된 테이블 포함)
   useEffect(() => {
     const loadRightCategoryMappings = async () => {
       const rightTableName = componentConfig.rightPanel?.tableName;
       if (!rightTableName || isDesignMode) return;
 
       try {
-        // 1. 컬럼 메타 정보 조회
-        const columnsResponse = await tableTypeApi.getColumns(rightTableName);
-        const categoryColumns = columnsResponse.filter((col: any) => col.inputType === "category");
-
-        if (categoryColumns.length === 0) {
-          setRightCategoryMappings({});
-          return;
-        }
-
-        // 2. 각 카테고리 컬럼에 대한 값 조회
         const mappings: Record<string, Record<string, { label: string; color?: string }>> = {};
 
-        for (const col of categoryColumns) {
-          const columnName = col.columnName || col.column_name;
-          try {
-            const response = await apiClient.get(`/table-categories/${rightTableName}/${columnName}/values`);
+        // 🆕 우측 패널 컬럼 설정에서 조인된 테이블 추출
+        const rightColumns = componentConfig.rightPanel?.columns || [];
+        const tablesToLoad = new Set<string>([rightTableName]);
+        
+        // 컬럼명에서 테이블명 추출 (예: "item_info.material" -> "item_info")
+        rightColumns.forEach((col: any) => {
+          const colName = col.name || col.columnName;
+          if (colName && colName.includes(".")) {
+            const joinTableName = colName.split(".")[0];
+            tablesToLoad.add(joinTableName);
+          }
+        });
 
-            if (response.data.success && response.data.data) {
-              const valueMap: Record<string, { label: string; color?: string }> = {};
-              response.data.data.forEach((item: any) => {
-                valueMap[item.value_code || item.valueCode] = {
-                  label: item.value_label || item.valueLabel,
-                  color: item.color,
-                };
-              });
-              mappings[columnName] = valueMap;
-              console.log(`✅ 우측 카테고리 매핑 로드 [${columnName}]:`, valueMap);
+        console.log("🔍 우측 패널 카테고리 로드 대상 테이블:", Array.from(tablesToLoad));
+
+        // 각 테이블에 대해 카테고리 매핑 로드
+        for (const tableName of tablesToLoad) {
+          try {
+            // 1. 컬럼 메타 정보 조회
+            const columnsResponse = await tableTypeApi.getColumns(tableName);
+            const categoryColumns = columnsResponse.filter((col: any) => col.inputType === "category");
+
+            // 2. 각 카테고리 컬럼에 대한 값 조회
+            for (const col of categoryColumns) {
+              const columnName = col.columnName || col.column_name;
+              try {
+                const response = await apiClient.get(`/table-categories/${tableName}/${columnName}/values`);
+
+                if (response.data.success && response.data.data) {
+                  const valueMap: Record<string, { label: string; color?: string }> = {};
+                  response.data.data.forEach((item: any) => {
+                    valueMap[item.value_code || item.valueCode] = {
+                      label: item.value_label || item.valueLabel,
+                      color: item.color,
+                    };
+                  });
+                  
+                  // 조인된 테이블의 경우 "테이블명.컬럼명" 형태로 저장
+                  const mappingKey = tableName === rightTableName ? columnName : `${tableName}.${columnName}`;
+                  mappings[mappingKey] = valueMap;
+                  
+                  // 🆕 컬럼명만으로도 접근할 수 있도록 추가 저장 (모든 테이블)
+                  // 기존 매핑이 있으면 병합, 없으면 새로 생성
+                  mappings[columnName] = { ...(mappings[columnName] || {}), ...valueMap };
+                  
+                  console.log(`✅ 우측 카테고리 매핑 로드 [${mappingKey}]:`, valueMap);
+                  console.log(`✅ 우측 카테고리 매핑 (컬럼명만) [${columnName}]:`, mappings[columnName]);
+                }
+              } catch (error) {
+                console.error(`우측 카테고리 값 조회 실패 [${tableName}.${columnName}]:`, error);
+              }
             }
           } catch (error) {
-            console.error(`우측 카테고리 값 조회 실패 [${columnName}]:`, error);
+            console.error(`테이블 ${tableName} 컬럼 정보 조회 실패:`, error);
           }
         }
 
@@ -737,7 +772,7 @@ export const SplitPanelLayoutComponent: React.FC<SplitPanelLayoutComponentProps>
     };
 
     loadRightCategoryMappings();
-  }, [componentConfig.rightPanel?.tableName, isDesignMode]);
+  }, [componentConfig.rightPanel?.tableName, componentConfig.rightPanel?.columns, isDesignMode]);
 
   // 항목 펼치기/접기 토글
   const toggleExpand = useCallback((itemId: any) => {
@@ -2149,9 +2184,12 @@ export const SplitPanelLayoutComponent: React.FC<SplitPanelLayoutComponentProps>
                                       const format = colConfig?.format;
                                       const boldValue = colConfig?.bold ?? false;
                                       
-                                      // 숫자 포맷 적용
-                                      let displayValue = String(value || "-");
-                                      if (value !== null && value !== undefined && value !== "" && format) {
+                                      // 🆕 카테고리 매핑 적용
+                                      const formattedValue = formatCellValue(key, value, rightCategoryMappings);
+                                      
+                                      // 숫자 포맷 적용 (카테고리가 아닌 경우만)
+                                      let displayValue: React.ReactNode = formattedValue;
+                                      if (typeof formattedValue === 'string' && value !== null && value !== undefined && value !== "" && format) {
                                         const numValue = typeof value === 'number' ? value : parseFloat(String(value));
                                         if (!isNaN(numValue)) {
                                           displayValue = numValue.toLocaleString('ko-KR', {
@@ -2175,7 +2213,6 @@ export const SplitPanelLayoutComponent: React.FC<SplitPanelLayoutComponentProps>
                                           )}
                                           <span 
                                             className={`text-foreground text-sm ${boldValue ? 'font-semibold' : ''}`}
-                                            title={displayValue}
                                           >
                                             {displayValue}
                                           </span>
@@ -2240,9 +2277,12 @@ export const SplitPanelLayoutComponent: React.FC<SplitPanelLayoutComponentProps>
                                         const colConfig = rightColumns?.find(c => c.name === key);
                                         const format = colConfig?.format;
                                         
-                                        // 숫자 포맷 적용
-                                        let displayValue = String(value);
-                                        if (value !== null && value !== undefined && value !== "" && format) {
+                                        // 🆕 카테고리 매핑 적용
+                                        const formattedValue = formatCellValue(key, value, rightCategoryMappings);
+                                        
+                                        // 숫자 포맷 적용 (카테고리가 아닌 경우만)
+                                        let displayValue: React.ReactNode = formattedValue;
+                                        if (typeof formattedValue === 'string' && value !== null && value !== undefined && value !== "" && format) {
                                           const numValue = typeof value === 'number' ? value : parseFloat(String(value));
                                           if (!isNaN(numValue)) {
                                             displayValue = numValue.toLocaleString('ko-KR', {
diff --git a/frontend/lib/registry/components/table-list/TableListComponent.tsx b/frontend/lib/registry/components/table-list/TableListComponent.tsx
index 6a1f01fe..4f78ed23 100644
--- a/frontend/lib/registry/components/table-list/TableListComponent.tsx
+++ b/frontend/lib/registry/components/table-list/TableListComponent.tsx
@@ -179,6 +179,7 @@ export const TableListComponent: React.FC<TableListComponentProps> = ({
   config,
   className,
   style,
+  formData: propFormData, // 🆕 부모에서 전달받은 formData
   onFormDataChange,
   componentConfig,
   onSelectedRowsChange,
@@ -1198,6 +1199,60 @@ export const TableListComponent: React.FC<TableListComponentProps> = ({
 
         console.log("🎯 [TableList] 화면별 엔티티 설정:", screenEntityConfigs);
 
+      // 🆕 제외 필터 처리 (다른 테이블에 이미 존재하는 데이터 제외)
+      let excludeFilterParam: any = undefined;
+      if (tableConfig.excludeFilter?.enabled) {
+        const excludeConfig = tableConfig.excludeFilter;
+        let filterValue: any = undefined;
+        
+        // 필터 값 소스에 따라 값 가져오기 (우선순위: formData > URL > 분할패널)
+        if (excludeConfig.filterColumn && excludeConfig.filterValueField) {
+          const fieldName = excludeConfig.filterValueField;
+          
+          // 1순위: props로 전달받은 formData에서 값 가져오기 (모달에서 사용)
+          if (propFormData && propFormData[fieldName]) {
+            filterValue = propFormData[fieldName];
+            console.log("🔗 [TableList] formData에서 excludeFilter 값 가져오기:", {
+              field: fieldName,
+              value: filterValue,
+            });
+          }
+          // 2순위: URL 파라미터에서 값 가져오기
+          else if (typeof window !== "undefined") {
+            const urlParams = new URLSearchParams(window.location.search);
+            filterValue = urlParams.get(fieldName);
+            if (filterValue) {
+              console.log("🔗 [TableList] URL에서 excludeFilter 값 가져오기:", {
+                field: fieldName,
+                value: filterValue,
+              });
+            }
+          }
+          // 3순위: 분할 패널 부모 데이터에서 값 가져오기
+          if (!filterValue && splitPanelContext?.selectedLeftData) {
+            filterValue = splitPanelContext.selectedLeftData[fieldName];
+            if (filterValue) {
+              console.log("🔗 [TableList] 분할패널에서 excludeFilter 값 가져오기:", {
+                field: fieldName,
+                value: filterValue,
+              });
+            }
+          }
+        }
+        
+        if (filterValue || !excludeConfig.filterColumn) {
+          excludeFilterParam = {
+            enabled: true,
+            referenceTable: excludeConfig.referenceTable,
+            referenceColumn: excludeConfig.referenceColumn,
+            sourceColumn: excludeConfig.sourceColumn,
+            filterColumn: excludeConfig.filterColumn,
+            filterValue: filterValue,
+          };
+          console.log("🚫 [TableList] 제외 필터 적용:", excludeFilterParam);
+        }
+      }
+
       // 🎯 항상 entityJoinApi 사용 (writer 컬럼 자동 조인 지원)
       response = await entityJoinApi.getTableDataWithJoins(tableConfig.selectedTable, {
         page,
@@ -1209,6 +1264,7 @@ export const TableListComponent: React.FC<TableListComponentProps> = ({
         additionalJoinColumns: entityJoinColumns.length > 0 ? entityJoinColumns : undefined,
         screenEntityConfigs: Object.keys(screenEntityConfigs).length > 0 ? screenEntityConfigs : undefined, // 🎯 화면별 엔티티 설정 전달
         dataFilter: tableConfig.dataFilter, // 🆕 데이터 필터 전달
+        excludeFilter: excludeFilterParam, // 🆕 제외 필터 전달
       });
 
       // 실제 데이터의 item_number만 추출하여 중복 확인
diff --git a/frontend/lib/registry/components/table-list/TableListConfigPanel.tsx b/frontend/lib/registry/components/table-list/TableListConfigPanel.tsx
index 823424cc..209b3d2d 100644
--- a/frontend/lib/registry/components/table-list/TableListConfigPanel.tsx
+++ b/frontend/lib/registry/components/table-list/TableListConfigPanel.tsx
@@ -9,6 +9,7 @@ import { Badge } from "@/components/ui/badge";
 import { TableListConfig, ColumnConfig } from "./types";
 import { entityJoinApi } from "@/lib/api/entityJoin";
 import { tableTypeApi } from "@/lib/api/screen";
+import { tableManagementApi } from "@/lib/api/tableManagement";
 import { Plus, Trash2, ArrowUp, ArrowDown, ChevronsUpDown, Check } from "lucide-react";
 import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
 import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem, CommandList } from "@/components/ui/command";
@@ -73,6 +74,12 @@ export const TableListConfigPanel: React.FC<TableListConfigPanelProps> = ({
 
   const [loadingEntityJoins, setLoadingEntityJoins] = useState(false);
 
+  // 🆕 제외 필터용 참조 테이블 컬럼 목록
+  const [referenceTableColumns, setReferenceTableColumns] = useState<
+    Array<{ columnName: string; dataType: string; label?: string }>
+  >([]);
+  const [loadingReferenceColumns, setLoadingReferenceColumns] = useState(false);
+
   // 🔄 외부에서 config가 변경될 때 내부 상태 동기화 (표의 페이지네이션 변경 감지)
   useEffect(() => {
     // console.log("🔄 TableListConfigPanel - 외부 config 변경 감지:", {
@@ -237,6 +244,42 @@ export const TableListConfigPanel: React.FC<TableListConfigPanelProps> = ({
     fetchEntityJoinColumns();
   }, [config.selectedTable, screenTableName]);
 
+  // 🆕 제외 필터용 참조 테이블 컬럼 가져오기
+  useEffect(() => {
+    const fetchReferenceColumns = async () => {
+      const refTable = config.excludeFilter?.referenceTable;
+      if (!refTable) {
+        setReferenceTableColumns([]);
+        return;
+      }
+
+      setLoadingReferenceColumns(true);
+      try {
+        console.log("🔗 참조 테이블 컬럼 정보 가져오기:", refTable);
+        const result = await tableManagementApi.getColumnList(refTable);
+        if (result.success && result.data) {
+          // result.data는 { columns: [], total, page, size, totalPages } 형태
+          const columns = result.data.columns || [];
+          setReferenceTableColumns(
+            columns.map((col: any) => ({
+              columnName: col.columnName || col.column_name,
+              dataType: col.dataType || col.data_type || "text",
+              label: col.displayName || col.columnLabel || col.column_label || col.columnName || col.column_name,
+            }))
+          );
+          console.log("✅ 참조 테이블 컬럼 로드 완료:", columns.length, "개");
+        }
+      } catch (error) {
+        console.error("❌ 참조 테이블 컬럼 조회 오류:", error);
+        setReferenceTableColumns([]);
+      } finally {
+        setLoadingReferenceColumns(false);
+      }
+    };
+
+    fetchReferenceColumns();
+  }, [config.excludeFilter?.referenceTable]);
+
   // 🎯 엔티티 컬럼 자동 로드
   useEffect(() => {
     const entityColumns = config.columns?.filter((col) => col.isEntityJoin && col.entityDisplayConfig);
@@ -1333,6 +1376,298 @@ export const TableListConfigPanel: React.FC<TableListConfigPanelProps> = ({
             </p>
           </div>
         </div>
+
+        {/* 🆕 제외 필터 설정 (다른 테이블에 이미 존재하는 데이터 제외) */}
+        <div className="space-y-3">
+          <div>
+            <h3 className="text-sm font-semibold">제외 필터</h3>
+            <p className="text-xs text-muted-foreground mt-1">
+              다른 테이블에 이미 존재하는 데이터를 목록에서 제외합니다
+            </p>
+          </div>
+          <hr className="border-border" />
+          
+          {/* 제외 필터 활성화 */}
+          <div className="flex items-center gap-2">
+            <Checkbox
+              id="excludeFilter-enabled"
+              checked={config.excludeFilter?.enabled || false}
+              onCheckedChange={(checked) => {
+                handleChange("excludeFilter", {
+                  ...config.excludeFilter,
+                  enabled: checked as boolean,
+                });
+              }}
+            />
+            <Label htmlFor="excludeFilter-enabled" className="text-xs">
+              제외 필터 활성화
+            </Label>
+          </div>
+          
+          {config.excludeFilter?.enabled && (
+            <div className="space-y-3 rounded border p-3">
+              {/* 참조 테이블 선택 */}
+              <div className="space-y-1">
+                <Label className="text-xs font-medium">참조 테이블 (매핑 테이블)</Label>
+                <Popover>
+                  <PopoverTrigger asChild>
+                    <Button
+                      variant="outline"
+                      role="combobox"
+                      className="h-8 w-full justify-between text-xs"
+                    >
+                      {config.excludeFilter?.referenceTable || "테이블 선택..."}
+                      <ChevronsUpDown className="ml-2 h-3 w-3 shrink-0 opacity-50" />
+                    </Button>
+                  </PopoverTrigger>
+                  <PopoverContent className="w-[300px] p-0">
+                    <Command>
+                      <CommandInput placeholder="테이블 검색..." className="h-8 text-xs" />
+                      <CommandList>
+                        <CommandEmpty className="text-xs py-2">테이블을 찾을 수 없습니다</CommandEmpty>
+                        <CommandGroup>
+                          {availableTables.map((table) => (
+                            <CommandItem
+                              key={table.tableName}
+                              value={table.tableName}
+                              onSelect={() => {
+                                handleChange("excludeFilter", {
+                                  ...config.excludeFilter,
+                                  referenceTable: table.tableName,
+                                  referenceColumn: undefined,
+                                  sourceColumn: undefined,
+                                  filterColumn: undefined,
+                                  filterValueField: undefined,
+                                });
+                              }}
+                              className="text-xs"
+                            >
+                              <Check
+                                className={cn(
+                                  "mr-2 h-3 w-3",
+                                  config.excludeFilter?.referenceTable === table.tableName ? "opacity-100" : "opacity-0"
+                                )}
+                              />
+                              {table.displayName || table.tableName}
+                            </CommandItem>
+                          ))}
+                        </CommandGroup>
+                      </CommandList>
+                    </Command>
+                  </PopoverContent>
+                </Popover>
+              </div>
+              
+              {config.excludeFilter?.referenceTable && (
+                <>
+                  {/* 비교 컬럼 설정 - 한 줄에 두 개 */}
+                  <div className="grid grid-cols-2 gap-2">
+                    {/* 참조 컬럼 (매핑 테이블) */}
+                    <div className="space-y-1">
+                      <Label className="text-xs">비교 컬럼 (매핑)</Label>
+                      <Popover>
+                        <PopoverTrigger asChild>
+                          <Button
+                            variant="outline"
+                            role="combobox"
+                            disabled={loadingReferenceColumns}
+                            className="h-8 w-full justify-between text-xs"
+                          >
+                            {loadingReferenceColumns 
+                              ? "..." 
+                              : config.excludeFilter?.referenceColumn || "선택"}
+                            <ChevronsUpDown className="ml-1 h-3 w-3 shrink-0 opacity-50" />
+                          </Button>
+                        </PopoverTrigger>
+                        <PopoverContent className="w-[200px] p-0">
+                          <Command>
+                            <CommandInput placeholder="검색..." className="h-8 text-xs" />
+                            <CommandList>
+                              <CommandEmpty className="text-xs py-2">없음</CommandEmpty>
+                              <CommandGroup>
+                                {referenceTableColumns.map((col) => (
+                                  <CommandItem
+                                    key={col.columnName}
+                                    value={col.columnName}
+                                    onSelect={() => {
+                                      handleChange("excludeFilter", {
+                                        ...config.excludeFilter,
+                                        referenceColumn: col.columnName,
+                                      });
+                                    }}
+                                    className="text-xs"
+                                  >
+                                    <Check
+                                      className={cn(
+                                        "mr-2 h-3 w-3",
+                                        config.excludeFilter?.referenceColumn === col.columnName ? "opacity-100" : "opacity-0"
+                                      )}
+                                    />
+                                    {col.label || col.columnName}
+                                  </CommandItem>
+                                ))}
+                              </CommandGroup>
+                            </CommandList>
+                          </Command>
+                        </PopoverContent>
+                      </Popover>
+                    </div>
+                    
+                    {/* 소스 컬럼 (현재 테이블) */}
+                    <div className="space-y-1">
+                      <Label className="text-xs">비교 컬럼 (현재)</Label>
+                      <Popover>
+                        <PopoverTrigger asChild>
+                          <Button
+                            variant="outline"
+                            role="combobox"
+                            className="h-8 w-full justify-between text-xs"
+                          >
+                            {config.excludeFilter?.sourceColumn || "선택"}
+                            <ChevronsUpDown className="ml-1 h-3 w-3 shrink-0 opacity-50" />
+                          </Button>
+                        </PopoverTrigger>
+                        <PopoverContent className="w-[200px] p-0">
+                          <Command>
+                            <CommandInput placeholder="검색..." className="h-8 text-xs" />
+                            <CommandList>
+                              <CommandEmpty className="text-xs py-2">없음</CommandEmpty>
+                              <CommandGroup>
+                                {availableColumns.map((col) => (
+                                  <CommandItem
+                                    key={col.columnName}
+                                    value={col.columnName}
+                                    onSelect={() => {
+                                      handleChange("excludeFilter", {
+                                        ...config.excludeFilter,
+                                        sourceColumn: col.columnName,
+                                      });
+                                    }}
+                                    className="text-xs"
+                                  >
+                                    <Check
+                                      className={cn(
+                                        "mr-2 h-3 w-3",
+                                        config.excludeFilter?.sourceColumn === col.columnName ? "opacity-100" : "opacity-0"
+                                      )}
+                                    />
+                                    {col.label || col.columnName}
+                                  </CommandItem>
+                                ))}
+                              </CommandGroup>
+                            </CommandList>
+                          </Command>
+                        </PopoverContent>
+                      </Popover>
+                    </div>
+                  </div>
+                  
+                  {/* 조건 필터 - 특정 조건의 데이터만 제외 */}
+                  <div className="space-y-1">
+                    <Label className="text-xs">조건 필터 (선택사항)</Label>
+                    <p className="text-[10px] text-muted-foreground mb-1">
+                      특정 조건의 데이터만 제외하려면 설정하세요 (예: 특정 거래처의 품목만)
+                    </p>
+                    <div className="grid grid-cols-2 gap-2">
+                      {/* 필터 컬럼 (매핑 테이블) */}
+                      <Popover>
+                        <PopoverTrigger asChild>
+                          <Button
+                            variant="outline"
+                            role="combobox"
+                            disabled={loadingReferenceColumns}
+                            className="h-8 w-full justify-between text-xs"
+                          >
+                            {loadingReferenceColumns 
+                              ? "..." 
+                              : config.excludeFilter?.filterColumn 
+                                ? `매핑: ${config.excludeFilter.filterColumn}`
+                                : "매핑 테이블 컬럼"}
+                            <ChevronsUpDown className="ml-1 h-3 w-3 shrink-0 opacity-50" />
+                          </Button>
+                        </PopoverTrigger>
+                        <PopoverContent className="w-[200px] p-0">
+                          <Command>
+                            <CommandInput placeholder="검색..." className="h-8 text-xs" />
+                            <CommandList>
+                              <CommandEmpty className="text-xs py-2">없음</CommandEmpty>
+                              <CommandGroup>
+                                <CommandItem
+                                  value=""
+                                  onSelect={() => {
+                                    handleChange("excludeFilter", {
+                                      ...config.excludeFilter,
+                                      filterColumn: undefined,
+                                      filterValueField: undefined,
+                                    });
+                                  }}
+                                  className="text-xs text-muted-foreground"
+                                >
+                                  <Check className={cn("mr-2 h-3 w-3", !config.excludeFilter?.filterColumn ? "opacity-100" : "opacity-0")} />
+                                  사용 안함
+                                </CommandItem>
+                                {referenceTableColumns.map((col) => (
+                                  <CommandItem
+                                    key={col.columnName}
+                                    value={col.columnName}
+                                    onSelect={() => {
+                                      // 필터 컬럼 선택 시 같은 이름의 필드를 자동으로 설정
+                                      handleChange("excludeFilter", {
+                                        ...config.excludeFilter,
+                                        filterColumn: col.columnName,
+                                        filterValueField: col.columnName, // 같은 이름으로 자동 설정
+                                        filterValueSource: "url",
+                                      });
+                                    }}
+                                    className="text-xs"
+                                  >
+                                    <Check
+                                      className={cn(
+                                        "mr-2 h-3 w-3",
+                                        config.excludeFilter?.filterColumn === col.columnName ? "opacity-100" : "opacity-0"
+                                      )}
+                                    />
+                                    {col.label || col.columnName}
+                                  </CommandItem>
+                                ))}
+                              </CommandGroup>
+                            </CommandList>
+                          </Command>
+                        </PopoverContent>
+                      </Popover>
+                      
+                      {/* 필터 값 필드명 (부모 화면에서 전달받는 필드) */}
+                      <Input
+                        placeholder="예: customer_code"
+                        value={config.excludeFilter?.filterValueField || ""}
+                        onChange={(e) => {
+                          handleChange("excludeFilter", {
+                            ...config.excludeFilter,
+                            filterValueField: e.target.value,
+                          });
+                        }}
+                        disabled={!config.excludeFilter?.filterColumn}
+                        className="h-8 text-xs"
+                      />
+                    </div>
+                  </div>
+                </>
+              )}
+              
+              {/* 설정 요약 */}
+              {config.excludeFilter?.referenceTable && config.excludeFilter?.referenceColumn && config.excludeFilter?.sourceColumn && (
+                <div className="rounded bg-muted/50 p-2 text-[10px] text-muted-foreground">
+                  <strong>설정 요약:</strong> {config.selectedTable || screenTableName}.{config.excludeFilter.sourceColumn} 가 
+                  {" "}{config.excludeFilter.referenceTable}.{config.excludeFilter.referenceColumn} 에 
+                  {config.excludeFilter.filterColumn && config.excludeFilter.filterValueField && (
+                    <> ({config.excludeFilter.filterColumn}=URL의 {config.excludeFilter.filterValueField}일 때)</>
+                  )}
+                  {" "}이미 있으면 제외
+                </div>
+              )}
+            </div>
+          )}
+        </div>
       </div>
     </div>
   );
diff --git a/frontend/lib/registry/components/table-list/types.ts b/frontend/lib/registry/components/table-list/types.ts
index b69b9238..2475f58f 100644
--- a/frontend/lib/registry/components/table-list/types.ts
+++ b/frontend/lib/registry/components/table-list/types.ts
@@ -185,6 +185,21 @@ export interface LinkedFilterConfig {
   enabled?: boolean; // 활성화 여부 (기본: true)
 }
 
+/**
+ * 제외 필터 설정
+ * 다른 테이블에 이미 존재하는 데이터를 제외하고 표시
+ * 예: 거래처에 이미 등록된 품목을 품목 선택 모달에서 제외
+ */
+export interface ExcludeFilterConfig {
+  enabled: boolean; // 제외 필터 활성화 여부
+  referenceTable: string; // 참조 테이블 (예: customer_item_mapping)
+  referenceColumn: string; // 참조 테이블의 비교 컬럼 (예: item_id)
+  sourceColumn: string; // 현재 테이블의 비교 컬럼 (예: item_number)
+  filterColumn?: string; // 참조 테이블의 필터 컬럼 (예: customer_id)
+  filterValueSource?: "url" | "formData" | "parentData"; // 필터 값 소스 (기본: url)
+  filterValueField?: string; // 필터 값 필드명 (예: customer_code)
+}
+
 /**
  * TableList 컴포넌트 설정 타입
  */
@@ -249,6 +264,9 @@ export interface TableListConfig extends ComponentConfig {
   // 🆕 연결된 필터 (다른 컴포넌트 값으로 필터링)
   linkedFilters?: LinkedFilterConfig[];
 
+  // 🆕 제외 필터 (다른 테이블에 이미 존재하는 데이터 제외)
+  excludeFilter?: ExcludeFilterConfig;
+
   // 이벤트 핸들러
   onRowClick?: (row: any) => void;
   onRowDoubleClick?: (row: any) => void;
diff --git a/frontend/lib/utils/buttonActions.ts b/frontend/lib/utils/buttonActions.ts
index 522f8651..22e491f6 100644
--- a/frontend/lib/utils/buttonActions.ts
+++ b/frontend/lib/utils/buttonActions.ts
@@ -1236,8 +1236,13 @@ export class ButtonActionExecutor {
         } else {
           console.log("🔄 테이블 데이터 삭제 완료, 테이블 새로고침 호출");
           context.onRefresh?.(); // 테이블 새로고침
+          
+          // 🆕 분할 패널 등 전역 테이블 새로고침 이벤트 발생
+          window.dispatchEvent(new CustomEvent("refreshTable"));
+          console.log("🔄 refreshTable 전역 이벤트 발생");
         }
 
+        toast.success(config.successMessage || `${dataToDelete.length}개 항목이 삭제되었습니다.`);
         return true;
       }
 
@@ -1258,6 +1263,12 @@ export class ButtonActionExecutor {
       }
 
       context.onRefresh?.();
+      
+      // 🆕 분할 패널 등 전역 테이블 새로고침 이벤트 발생
+      window.dispatchEvent(new CustomEvent("refreshTable"));
+      console.log("🔄 refreshTable 전역 이벤트 발생 (단일 삭제)");
+      
+      toast.success(config.successMessage || "삭제되었습니다.");
       return true;
     } catch (error) {
       console.error("삭제 오류:", error);
@@ -1536,6 +1547,13 @@ export class ButtonActionExecutor {
         }
       }
 
+      // 🆕 부모 화면의 선택된 데이터 가져오기 (excludeFilter에서 사용)
+      const parentData = dataRegistry[dataSourceId]?.[0]?.originalData || dataRegistry[dataSourceId]?.[0] || {};
+      console.log("📦 [openModalWithData] 부모 데이터 전달:", {
+        dataSourceId,
+        parentData,
+      });
+
       // 🆕 전역 모달 상태 업데이트를 위한 이벤트 발생 (URL 파라미터 포함)
       const modalEvent = new CustomEvent("openScreenModal", {
         detail: {
@@ -1544,6 +1562,7 @@ export class ButtonActionExecutor {
           description: description,
           size: config.modalSize || "lg", // 데이터 입력 화면은 기본 large
           urlParams: { dataSourceId }, // 🆕 주 데이터 소스만 전달 (나머지는 modalDataStore에서 자동으로 찾음)
+          splitPanelParentData: parentData, // 🆕 부모 데이터 전달 (excludeFilter에서 사용)
         },
       });
 
diff --git a/화면_임베딩_및_데이터_전달_시스템_구현_계획서.md b/화면_임베딩_및_데이터_전달_시스템_구현_계획서.md
index f8f84f1f..74d9d0ed 100644
--- a/화면_임베딩_및_데이터_전달_시스템_구현_계획서.md
+++ b/화면_임베딩_및_데이터_전달_시스템_구현_계획서.md
@@ -1679,3 +1679,4 @@ const 출고등록_설정: ScreenSplitPanel = {
 
 화면 임베딩 및 데이터 전달 시스템은 복잡한 업무 워크플로우를 효율적으로 처리할 수 있는 강력한 기능입니다. 단계별로 체계적으로 구현하면 약 3.5개월 내에 완성할 수 있으며, 이를 통해 사용자 경험을 크게 향상시킬 수 있습니다.
 
+
diff --git a/화면_임베딩_시스템_Phase1-4_구현_완료.md b/화면_임베딩_시스템_Phase1-4_구현_완료.md
index 2a3e16de..47526bb1 100644
--- a/화면_임베딩_시스템_Phase1-4_구현_완료.md
+++ b/화면_임베딩_시스템_Phase1-4_구현_완료.md
@@ -526,3 +526,4 @@ const { data: config } = await getScreenSplitPanel(screenId);
 
 이제 입고 등록과 같은 복잡한 워크플로우를 구현할 수 있습니다. 다음 단계는 각 컴포넌트 타입별 DataReceivable 인터페이스 구현과 설정 UI 개발입니다.
 
+
diff --git a/화면_임베딩_시스템_충돌_분석_보고서.md b/화면_임베딩_시스템_충돌_분석_보고서.md
index 7334e8b3..135d36d8 100644
--- a/화면_임베딩_시스템_충돌_분석_보고서.md
+++ b/화면_임베딩_시스템_충돌_분석_보고서.md
@@ -513,3 +513,4 @@ function ScreenViewPage() {
 
 새로운 시스템은 기존 시스템과 **독립적으로 동작**하며, 최소한의 수정만으로 통합 가능합니다. 화면 페이지에 조건 분기만 추가하면 바로 사용할 수 있습니다.
 
+
-- 
2.43.0