From de24fb09d58ecac9321f5f2f2532c50dadb9b22c Mon Sep 17 00:00:00 2001 From: gbpark Date: Mon, 6 Apr 2026 15:54:31 +0900 Subject: [PATCH] 123 --- .../src/main/resources/mapper/admin.xml | 24 +- .../src/main/resources/mapper/nodeFlow.xml | 40 +- .../main/resources/mapper/screenEmbedding.xml | 48 +- .../src/main/resources/mapper/screenGroup.xml | 4 +- .../resources/mapper/tableCategoryValue.xml | 410 +++++++++--------- .../main/resources/mapper/tableManagement.xml | 242 +++++------ .../admin/systemMng/tableMngList/page.tsx | 336 +++++++------- .../admin/table-type/ColumnDetailPanel.tsx | 128 +++--- .../admin/table-type/ColumnGrid.tsx | 86 ++-- .../admin/table-type/TypeOverviewStrip.tsx | 2 +- frontend/components/admin/table-type/types.ts | 56 +-- frontend/components/dataflow/DataFlowList.tsx | 48 +- .../AddCategoryColumnDialog.tsx | 56 +-- .../table-category/CategoryColumnList.tsx | 130 +++--- .../config-panels/V2TableListConfigPanel.tsx | 22 +- frontend/hooks/queries/useCodes.ts | 75 ++-- frontend/lib/api/entityJoin.ts | 7 +- .../split-panel-layout2/ColumnConfigModal.tsx | 24 +- .../table-list/TableListConfigPanel.tsx | 22 +- .../V2CategoryManagerComponent.tsx | 16 +- .../v2-table-list/TableListConfigPanel.tsx | 22 +- 21 files changed, 899 insertions(+), 899 deletions(-) diff --git a/backend-spring/src/main/resources/mapper/admin.xml b/backend-spring/src/main/resources/mapper/admin.xml index 72779487..00621fd4 100644 --- a/backend-spring/src/main/resources/mapper/admin.xml +++ b/backend-spring/src/main/resources/mapper/admin.xml @@ -387,21 +387,21 @@ SELECT - FLOW_ID AS "flowId" - , FLOW_NAME AS "flowName" - , FLOW_DESCRIPTION AS "flowDescription" - , COMPANY_CODE AS "companyCode" - , CREATED_DATE AS "createdAt" - , UPDATED_DATE AS "updatedAt" + FLOW_ID + , FLOW_NAME + , FLOW_DESCRIPTION + , COMPANY_CODE + , CREATED_DATE + , UPDATED_DATE FROM NODE_FLOWS WHERE 1=1 @@ -35,12 +35,12 @@ SELECT - FLOW_ID AS "flowId" - , FLOW_NAME AS "flowName" - , FLOW_DATA AS "flowData" + FLOW_ID + , FLOW_NAME + , FLOW_DATA FROM NODE_FLOWS WHERE FLOW_ID = #{flow_id} @@ -63,9 +63,9 @@ @@ -74,7 +74,7 @@ + useGeneratedKeys="true" keyProperty="flow_id" keyColumn="flow_id"> INSERT INTO NODE_FLOWS ( FLOW_NAME , FLOW_DESCRIPTION diff --git a/backend-spring/src/main/resources/mapper/screenEmbedding.xml b/backend-spring/src/main/resources/mapper/screenEmbedding.xml index cf547d84..4a333652 100644 --- a/backend-spring/src/main/resources/mapper/screenEmbedding.xml +++ b/backend-spring/src/main/resources/mapper/screenEmbedding.xml @@ -122,30 +122,30 @@ SELECT SGS.ID, - SGS.GROUP_ID AS "groupId", - SGS.SCREEN_ID AS "screen_id", + SGS.GROUP_ID, + SGS.SCREEN_ID, SD.SCREEN_NAME, SGS.SCREEN_ROLE, SGS.DISPLAY_ORDER, diff --git a/backend-spring/src/main/resources/mapper/tableCategoryValue.xml b/backend-spring/src/main/resources/mapper/tableCategoryValue.xml index 7c6969b3..414dd51a 100644 --- a/backend-spring/src/main/resources/mapper/tableCategoryValue.xml +++ b/backend-spring/src/main/resources/mapper/tableCategoryValue.xml @@ -9,56 +9,56 @@ - INSERT INTO category_values ( - table_name, column_name, value_code, value_label, value_order, - parent_value_id, depth, description, color, icon, - is_active, is_default, company_code, menu_objid, created_by + INSERT INTO CATEGORY_VALUES ( + TABLE_NAME, COLUMN_NAME, VALUE_CODE, VALUE_LABEL, VALUE_ORDER, + PARENT_VALUE_ID, DEPTH, DESCRIPTION, COLOR, ICON, + IS_ACTIVE, IS_DEFAULT, COMPANY_CODE, MENU_OBJID, CREATED_BY ) VALUES ( #{table_name}, #{column_name}, #{value_code}, #{value_label}, #{value_order}, #{parent_value_id}, #{depth}, #{description}, #{color}, #{icon}, @@ -212,21 +212,21 @@ - UPDATE category_values + UPDATE CATEGORY_VALUES - value_label = #{value_label}, - value_order = #{value_order}, - description = #{description}, - color = #{color}, - icon = #{icon}, - is_active = #{is_active}, - is_default = #{is_default}, + VALUE_LABEL = #{value_label}, + VALUE_ORDER = #{value_order}, + DESCRIPTION = #{description}, + COLOR = #{color}, + ICON = #{icon}, + IS_ACTIVE = #{is_active}, + IS_DEFAULT = #{is_default}, UPDATED_DATE = NOW(), - updated_by = #{user_id} + UPDATED_BY = #{user_id} - WHERE value_id = #{value_id} + WHERE VALUE_ID = #{value_id} - AND (company_code = #{company_code} OR company_code = '*') + AND (COMPANY_CODE = #{company_code} OR COMPANY_CODE = '*') @@ -251,52 +251,52 @@ WHERE ${safeColumnName} = #{value_code} - AND (company_code = #{company_code} OR company_code = '*') + AND (COMPANY_CODE = #{company_code} OR COMPANY_CODE = '*') - DELETE FROM category_values - WHERE value_id = #{value_id} + DELETE FROM CATEGORY_VALUES + WHERE VALUE_ID = #{value_id} - AND (company_code = #{company_code} OR company_code = '*') + AND (COMPANY_CODE = #{company_code} OR COMPANY_CODE = '*') @@ -305,26 +305,26 @@ ══════════════════════════════════════════════════════════════ --> - UPDATE category_values - SET is_active = FALSE, + UPDATE CATEGORY_VALUES + SET IS_ACTIVE = FALSE, UPDATED_DATE = NOW(), - updated_by = #{user_id} - WHERE value_id IN + UPDATED_BY = #{user_id} + WHERE VALUE_ID IN #{id} - AND (company_code = #{company_code} OR company_code = '*') + AND (COMPANY_CODE = #{company_code} OR COMPANY_CODE = '*') - UPDATE category_values - SET value_order = #{value_order}, + UPDATE CATEGORY_VALUES + SET VALUE_ORDER = #{value_order}, UPDATED_DATE = NOW() - WHERE value_id = #{value_id} + WHERE VALUE_ID = #{value_id} - AND (company_code = #{company_code} OR company_code = '*') + AND (COMPANY_CODE = #{company_code} OR COMPANY_CODE = '*') @@ -334,34 +334,34 @@ SELECT * - FROM category_column_mapping + FROM CATEGORY_COLUMN_MAPPING - WHERE table_name = #{table_name} - AND logical_column_name = #{logical_column_name} - AND menu_objid = #{menu_objid} - AND (company_code = #{company_code} OR company_code = '*') + WHERE TABLE_NAME = #{table_name} + AND LOGICAL_COLUMN_NAME = #{logical_column_name} + AND MENU_OBJID = #{menu_objid} + AND (COMPANY_CODE = #{company_code} OR COMPANY_CODE = '*') - DELETE FROM category_column_mapping - WHERE mapping_id = #{mapping_id} + DELETE FROM CATEGORY_COLUMN_MAPPING + WHERE MAPPING_ID = #{mapping_id} - AND (company_code = #{company_code} OR company_code = '*') + AND (COMPANY_CODE = #{company_code} OR COMPANY_CODE = '*') - DELETE FROM category_column_mapping - WHERE table_name = #{table_name} - AND logical_column_name = #{column_name} + DELETE FROM CATEGORY_COLUMN_MAPPING + WHERE TABLE_NAME = #{table_name} + AND LOGICAL_COLUMN_NAME = #{column_name} - AND (company_code = #{company_code} OR company_code = '*') + AND (COMPANY_CODE = #{company_code} OR COMPANY_CODE = '*') @@ -422,17 +422,17 @@ @@ -448,23 +448,23 @@ diff --git a/backend-spring/src/main/resources/mapper/tableManagement.xml b/backend-spring/src/main/resources/mapper/tableManagement.xml index f183fb9a..239f6c8d 100644 --- a/backend-spring/src/main/resources/mapper/tableManagement.xml +++ b/backend-spring/src/main/resources/mapper/tableManagement.xml @@ -8,11 +8,11 @@ ═══════════════════════════════════════════════════ --> SELECT - C.COLUMN_NAME AS "columnName" - , COALESCE(CL.COLUMN_LABEL, C.COLUMN_NAME) AS "displayName" - , C.DATA_TYPE AS "dataType" - , C.DATA_TYPE AS "dbType" - , COALESCE(CL.INPUT_TYPE, 'text') AS "webType" - , COALESCE(CL.INPUT_TYPE, 'direct') AS "inputType" - , COALESCE(CL.DETAIL_SETTINGS::TEXT, '') AS "detailSettings" - , COALESCE(CL.DESCRIPTION, '') AS "description" + C.COLUMN_NAME + , COALESCE(CL.COLUMN_LABEL, C.COLUMN_NAME) AS DISPLAY_NAME + , C.DATA_TYPE + , C.DATA_TYPE AS DB_TYPE + , COALESCE(CL.INPUT_TYPE, 'text') AS WEB_TYPE + , COALESCE(CL.INPUT_TYPE, 'direct') AS INPUT_TYPE + , COALESCE(CL.DETAIL_SETTINGS::TEXT, '') AS DETAIL_SETTINGS + , COALESCE(CL.DESCRIPTION, '') AS DESCRIPTION , CASE WHEN CL.IS_NULLABLE IS NOT NULL THEN CASE WHEN CL.IS_NULLABLE = 'N' THEN 'NO' ELSE 'YES' END ELSE C.IS_NULLABLE - END AS "isNullable" - , CASE WHEN CL.IS_UNIQUE = 'Y' THEN 'YES' ELSE 'NO' END AS "isUnique" - , CASE WHEN PK.COLUMN_NAME IS NOT NULL THEN TRUE ELSE FALSE END AS "isPrimaryKey" - , C.COLUMN_DEFAULT AS "defaultValue" - , C.CHARACTER_MAXIMUM_LENGTH AS "maxLength" - , C.NUMERIC_PRECISION AS "numericPrecision" - , C.NUMERIC_SCALE AS "numericScale" - , CL.CODE_CATEGORY AS "codeCategory" - , CL.CODE_VALUE AS "codeValue" - , CL.REFERENCE_TABLE AS "referenceTable" - , CL.REFERENCE_COLUMN AS "referenceColumn" - , CL.DISPLAY_COLUMN AS "displayColumn" - , CL.DISPLAY_ORDER AS "displayOrder" - , CL.IS_VISIBLE AS "isVisible" - , DCL.COLUMN_LABEL AS "displayColumnLabel" + END AS IS_NULLABLE + , CASE WHEN CL.IS_UNIQUE = 'Y' THEN 'YES' ELSE 'NO' END AS IS_UNIQUE + , CASE WHEN PK.COLUMN_NAME IS NOT NULL THEN TRUE ELSE FALSE END AS IS_PRIMARY_KEY + , C.COLUMN_DEFAULT AS DEFAULT_VALUE + , C.CHARACTER_MAXIMUM_LENGTH AS MAX_LENGTH + , C.NUMERIC_PRECISION + , C.NUMERIC_SCALE + , CL.CODE_CATEGORY + , CL.CODE_VALUE + , CL.REFERENCE_TABLE + , CL.REFERENCE_COLUMN + , CL.DISPLAY_COLUMN + , CL.DISPLAY_ORDER + , CL.IS_VISIBLE + , DCL.COLUMN_LABEL AS DISPLAY_COLUMN_LABEL FROM INFORMATION_SCHEMA.COLUMNS C LEFT JOIN TABLE_TYPE_COLUMNS CL ON C.TABLE_NAME = CL.TABLE_NAME AND C.COLUMN_NAME = CL.COLUMN_NAME AND CL.COMPANY_CODE = '*' @@ -91,33 +91,33 @@ ═══════════════════════════════════════════════════ --> SELECT - C.COLUMN_NAME AS "columnName" - , C.COLUMN_NAME AS "displayName" - , C.DATA_TYPE AS "dataType" - , C.UDT_NAME AS "dbType" - , C.IS_NULLABLE AS "isNullable" - , C.COLUMN_DEFAULT AS "defaultValue" - , C.CHARACTER_MAXIMUM_LENGTH AS "maxLength" - , C.NUMERIC_PRECISION AS "numericPrecision" - , C.NUMERIC_SCALE AS "numericScale" + C.COLUMN_NAME + , C.COLUMN_NAME AS DISPLAY_NAME + , C.DATA_TYPE + , C.UDT_NAME AS DB_TYPE + , C.IS_NULLABLE + , C.COLUMN_DEFAULT AS DEFAULT_VALUE + , C.CHARACTER_MAXIMUM_LENGTH AS MAX_LENGTH + , C.NUMERIC_PRECISION + , C.NUMERIC_SCALE , CASE WHEN C.COLUMN_NAME IN ( SELECT KCU.COLUMN_NAME FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE KCU WHERE KCU.TABLE_NAME = #{table_name} AND KCU.CONSTRAINT_NAME LIKE '%_pkey' ) THEN TRUE ELSE FALSE - END AS "isPrimaryKey" + END AS IS_PRIMARY_KEY , COL_DESCRIPTION( (SELECT OID FROM PG_CLASS WHERE RELNAME = #{table_name} AND RELNAMESPACE = (SELECT OID FROM PG_NAMESPACE WHERE NSPNAME = 'public')), C.ORDINAL_POSITION - ) AS "columnComment" + ) AS COLUMN_COMMENT FROM INFORMATION_SCHEMA.COLUMNS C WHERE C.TABLE_NAME = #{table_name} AND C.TABLE_SCHEMA = 'public' @@ -184,7 +184,7 @@ WHERE TABLE_NAME = #{table_name} AND TABLE_SCHEMA = 'public' AND TABLE_TYPE = 'BASE TABLE' - ) AS "exists" + ) AS EXISTS @@ -245,20 +245,20 @@ SELECT DISTINCT ON (TTC.COLUMN_NAME) - TTC.COLUMN_NAME AS "columnName" - , COALESCE(TTC.COLUMN_LABEL, TTC.COLUMN_NAME) AS "displayName" - , TTC.INPUT_TYPE AS "inputType" - , COALESCE(TTC.DETAIL_SETTINGS::TEXT, '{}') AS "detailSettings" - , TTC.IS_NULLABLE AS "isNullable" - , IC.DATA_TYPE AS "dataType" - , TTC.COMPANY_CODE AS "companyCode" - , TTC.CATEGORY_REF AS "categoryRef" + TTC.COLUMN_NAME + , COALESCE(TTC.COLUMN_LABEL, TTC.COLUMN_NAME) AS DISPLAY_NAME + , TTC.INPUT_TYPE + , COALESCE(TTC.DETAIL_SETTINGS::TEXT, '{}') AS DETAIL_SETTINGS + , TTC.IS_NULLABLE + , IC.DATA_TYPE + , TTC.COMPANY_CODE + , TTC.CATEGORY_REF FROM TABLE_TYPE_COLUMNS TTC LEFT JOIN INFORMATION_SCHEMA.COLUMNS IC ON TTC.TABLE_NAME = IC.TABLE_NAME AND TTC.COLUMN_NAME = IC.COLUMN_NAME @@ -521,12 +521,12 @@ ═══════════════════════════════════════════════════ --> SELECT DISTINCT ON (TTC.TABLE_NAME, TTC.COLUMN_NAME) - TTC.TABLE_NAME AS "tableName" - , TTC.COLUMN_NAME AS "columnName" - , COALESCE(TTC.COLUMN_LABEL, TTC.COLUMN_NAME) AS "columnLabel" - , TTC.COMPANY_CODE AS "companyCode" - , TL.TABLE_LABEL AS "tableLabel" + TTC.TABLE_NAME + , TTC.COLUMN_NAME + , COALESCE(TTC.COLUMN_LABEL, TTC.COLUMN_NAME) AS COLUMN_LABEL + , TTC.COMPANY_CODE + , TL.TABLE_LABEL FROM TABLE_TYPE_COLUMNS TTC LEFT JOIN TABLE_LABELS TL ON TTC.TABLE_NAME = TL.TABLE_NAME @@ -560,11 +560,11 @@ ═══════════════════════════════════════════════════ --> SELECT - LEFT_COL.COLUMN_NAME AS "leftColumn" - , LEFT_COL.REFERENCE_TABLE AS "rightTable" - , LEFT_COL.REFERENCE_COLUMN AS "rightColumn" - , LEFT_COL.DISPLAY_COLUMN AS "displayColumn" - , COALESCE(LEFT_COL.COLUMN_LABEL, LEFT_COL.COLUMN_NAME) AS "columnLabel" + LEFT_COL.COLUMN_NAME AS LEFT_COLUMN + , LEFT_COL.REFERENCE_TABLE AS RIGHT_TABLE + , LEFT_COL.REFERENCE_COLUMN AS RIGHT_COLUMN + , LEFT_COL.DISPLAY_COLUMN + , COALESCE(LEFT_COL.COLUMN_LABEL, LEFT_COL.COLUMN_NAME) AS COLUMN_LABEL FROM TABLE_TYPE_COLUMNS LEFT_COL WHERE LEFT_COL.TABLE_NAME = #{left_table} AND LEFT_COL.REFERENCE_TABLE = #{right_table} @@ -600,12 +600,12 @@ ═══════════════════════════════════════════════════ --> SELECT - TABLE_NAME AS "tableName" - , IS_ACTIVE AS "isActive" - , LOG_COLUMNS AS "logColumns" - , CREATED_DATE AS "createdDate" - , UPDATED_DATE AS "updatedDate" + TABLE_NAME + , IS_ACTIVE + , LOG_COLUMNS + , CREATED_DATE + , UPDATED_DATE FROM LOG_TABLES WHERE TABLE_NAME = #{table_name} @@ -655,8 +655,8 @@ ═══════════════════════════════════════════════════ -->