data-ops-cli 0.2.3__tar.gz → 0.2.4__tar.gz

{data_ops_cli-0.2.3 → data_ops_cli-0.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: data-ops-cli
-Version: 0.2.3
+Version: 0.2.4
 Requires-Python: <3.14,>=3.11
 Requires-Dist: requests
 Requires-Dist: pydantic-core

{data_ops_cli-0.2.3 → data_ops_cli-0.2.4}/src/data_ops_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: data-ops-cli
-Version: 0.2.3
+Version: 0.2.4
 Requires-Python: <3.14,>=3.11
 Requires-Dist: requests
 Requires-Dist: pydantic-core

{data_ops_cli-0.2.3 → data_ops_cli-0.2.4}/src/data_ops_cli.egg-info/SOURCES.txt

@@ -12,6 +12,7 @@ src/dataops_cli/exceptions.py
 src/dataops_cli/session.py
 src/dataops_cli/utils.py
 src/dataops_cli/cli/__init__.py
+src/dataops_cli/cli/api.py
 src/dataops_cli/cli/auth.py
 src/dataops_cli/cli/data_table.py
 src/dataops_cli/cli/dataset.py
@@ -45,6 +46,7 @@ src/dataops_cli/runner/utils/log.py
 src/dataops_cli/runner/utils/nacos.py
 src/dataops_cli/runner/utils/neo4j_sync.py
 src/dataops_cli/schems/__init__.py
+src/dataops_cli/schems/api.py
 src/dataops_cli/schems/data_table.py
 src/dataops_cli/schems/datasource.py
 src/dataops_cli/schems/dict_.py
@@ -58,6 +60,7 @@ src/dataops_cli/schems/user.py
 src/dataops_cli/schems/widget.py
 src/dataops_cli/schems/workflow.py
 src/dataops_cli/sdk/__init__.py
+src/dataops_cli/sdk/api.py
 src/dataops_cli/sdk/auth.py
 src/dataops_cli/sdk/data_table.py
 src/dataops_cli/sdk/dataset.py
@@ -67,6 +70,7 @@ src/dataops_cli/sdk/meta.py
 src/dataops_cli/sdk/ref.py
 src/dataops_cli/sdk/report.py
 src/dataops_cli/sdk/table.py
+src/dataops_cli/sdk/widget.py
 src/dataops_cli/sdk/workflow.py
 src/dataops_cli/tiptap/__init__.py
 src/dataops_cli/tiptap/builder.py

data_ops_cli-0.2.4/src/dataops_cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.4"

data_ops_cli-0.2.4/src/dataops_cli/cli/api.py

@@ -0,0 +1,227 @@
+"""API 接口管理模块.
+
+提供 API 接口的列表查询和详情功能。
+
+- 服务层函数 (service_*)：纯 Python 接口，返回原始数据
+- CLI 命令：基于服务层的薄包装，负责格式化输出
+"""
+
+import shutil
+from typing import Annotated
+
+import typer
+
+from dataops_cli.exceptions import DataOpsError
+from dataops_cli.schems import MetaType
+from dataops_cli.sdk.api import service_get_api_by_code
+from dataops_cli.sdk.meta import release_list_list
+from dataops_cli.utils import filter_nodes_by_pattern
+
+# ---------------------------------------------------------------------------
+# 常量
+# ---------------------------------------------------------------------------
+
+_STATUS_MAP: dict[str, str] = {
+    "dev": "开发中",
+    "test": "测试中",
+    "prod": "已发布",
+    "deprecated": "将弃用",
+}
+
+_SCOPE_MAP: dict[str, str] = {
+    "public": "公开接口",
+    "internal": "内部接口",
+    "external": "外部接口",
+}
+
+# ---------------------------------------------------------------------------
+# CLI 命令
+# ---------------------------------------------------------------------------
+
+api_typer = typer.Typer(
+    name="api",
+    help="Manage APIs",
+    no_args_is_help=True,
+)
+
+
+def _first_line(text: str) -> str:
+    """取文本的第一行."""
+    return text.split("\n")[0]
+
+
+@api_typer.command("list", rich_help_panel="API 查询")
+def list_apis(
+    query: Annotated[
+        str | None, typer.Option("-q", "--query", help="按名称/标题/备注正则过滤")
+    ] = None,
+) -> None:
+    """列出所有 API 接口.
+
+    从元数据服务获取 API 接口列表，支持通过正则表达式按名称、标题或备注进行过滤。
+
+    示例:
+        列出所有 API 接口
+        >>> data-ops-cli api list
+
+        按名称/标题/备注过滤
+        >>> data-ops-cli api list --query ".*用户.*"
+        >>> data-ops-cli api list -q "用户"
+    """
+    try:
+        group_nodes = release_list_list(MetaType.API)
+    except DataOpsError as e:
+        typer.echo(f"错误: {e.message}")
+        raise typer.Exit(code=1) from None
+
+    if query:
+        group_nodes = filter_nodes_by_pattern(group_nodes, query)
+
+    if not group_nodes:
+        print("(无结果)")
+        return
+
+    print("code title remark")
+
+    for node in group_nodes:
+        code = node.CODE
+        title = node.TITLE
+        remark_raw = node.REMARK or ""
+        remark = _first_line(remark_raw.strip())
+        print(code, title, remark)
+
+
+@api_typer.command("detail", rich_help_panel="API 查询", no_args_is_help=True)
+def get_api_detail(
+    code: Annotated[str, typer.Argument(help="API 接口编码")],
+    simplify: Annotated[
+        bool,
+        typer.Option("-s", "--simplify", help="仅显示基本信息，不展示请求/响应参数"),
+    ] = False,
+) -> None:
+    """获取 API 接口详情.
+
+    根据 API 接口编码获取详细信息，包括请求方法、路径、状态、请求参数和响应参数。
+
+    示例:
+        获取 API 接口完整信息
+        >>> data-ops-cli api detail user_login
+
+        仅显示基本信息
+        >>> data-ops-cli api detail user_login --simplify
+        >>> data-ops-cli api detail user_login -s
+    """
+    try:
+        meta = service_get_api_by_code(code)
+    except DataOpsError as e:
+        typer.echo(f"错误: {e.message}")
+        raise typer.Exit(code=1) from None
+
+    d = meta.data
+    method = d.method
+    status_label = _STATUS_MAP.get(d.status, d.status)
+    scope_label = _SCOPE_MAP.get(d.scope, d.scope)
+
+    # 基本信息
+    print(f"方法: {method}")
+    print(f"路径: {d.endpoint}")
+    print(f"状态: {status_label}")
+    print(f"范围: {scope_label}")
+    if d.charger:
+        print(f"负责人: {d.charger}")
+    if d.env_code:
+        print(f"API 环境: {d.env_code}")
+    if d.description:
+        print(f"\n说明:\n{d.description}")
+
+    if simplify:
+        return
+
+    # 请求参数
+    rp = d.requestParam
+    print("\n--- 请求参数 ---")
+
+    # 认证
+    auth = rp.get("authParam", {})
+    if auth:
+        auth_type = auth.get("type", "none")
+        print(f"  认证: {auth_type}")
+
+    # Headers
+    headers = rp.get("headers", [])
+    if headers:
+        print(f"  请求头 ({len(headers)}):")
+        for h in headers:
+            required = " *" if h.get("required") else ""
+            print(f"    - {h.get('name', '?')}: {h.get('title', '')}{required}")
+
+    # Path params
+    path_params = rp.get("pathParams", [])
+    if path_params:
+        print(f"  路径参数 ({len(path_params)}):")
+        for p in path_params:
+            required = " *" if p.get("required") else ""
+            print(
+                f"    - {p.get('name', '?')}: {p.get('title', '')} ({p.get('type', '?')}){required}"
+            )
+
+    # Query params
+    query_params = rp.get("queryParams", [])
+    if query_params:
+        print(f"  Query 参数 ({len(query_params)}):")
+        for q in query_params:
+            required = " *" if q.get("required") else ""
+            print(
+                f"    - {q.get('name', '?')}: {q.get('title', '')} ({q.get('type', '?')}){required}"
+            )
+
+    # Body
+    body = rp.get("bodyParams", {})
+    if body:
+        mine_type = body.get("mineType", "none")
+        if mine_type != "none":
+            structure = body.get("structure", [])
+            print(f"  请求体: {mine_type}")
+            if structure:
+                _print_params_tree(structure, indent=4)
+
+    # Cookies
+    cookies = rp.get("cookies", [])
+    if cookies:
+        print(f"  Cookie ({len(cookies)}):")
+        for c in cookies:
+            print(f"    - {c.get('name', '?')}: {c.get('title', '')}")
+
+    # 响应参数
+    response_params = d.responseParams
+    if response_params:
+        print("\n--- 响应参数 ---")
+        for rp_item in response_params:
+            status_code = rp_item.get("status_code", "?")
+            title = rp_item.get("title", "")
+            mine_type = rp_item.get("mineType", "")
+            structure = rp_item.get("structure", [])
+            print(f"  [{status_code}] {title} ({mine_type})")
+            if structure:
+                _print_params_tree(structure, indent=4)
+
+
+def _print_params_tree(params: list[dict], indent: int = 0, prefix: str = "") -> None:
+    """递归打印参数树结构."""
+    for p in params:
+        ptype = p.get("type", "?")
+        name = p.get("name", "?")
+        title = p.get("title", "")
+        required = " *" if p.get("required") else ""
+        desc = p.get("description", "")
+        line = f"{' ' * indent}- {prefix}{name}: {title} ({ptype}){required}"
+        if desc:
+            line += f"  # {desc}"
+        print(line)
+        if ptype in ("object", "array"):
+            children = p.get("children", [])
+            if children:
+                if ptype == "array":
+                    _print_params_tree(children, indent + 2)
+                else:
+                    _print_params_tree(children, indent + 2)

{data_ops_cli-0.2.3 → data_ops_cli-0.2.4}/src/dataops_cli/cli/auth.py

@@ -12,6 +12,7 @@ import typer
 from rich.console import Console
 from rich.table import Table
 
+from dataops_cli.cli.utils import print_list
 from dataops_cli.constants import USER_INFO_FILE
 from dataops_cli.exceptions import AuthenticationError
 from dataops_cli.schems import UserInfo
@@ -135,11 +136,13 @@ def application_list(query: Annotated[str | None, typer.Argument(help="关键字
         typer.echo(f"错误: {e}")
         raise typer.Exit(code=1) from None
 
-    table = Table("code", "title", "remark", title="应用列表")
-    for application in applications:
-        table.add_row(application.CODE, application.LABEL_CN, application.REMARK or "")
-    console = Console(no_color=True)
-    console.print(table)
+    print_list(
+        ["code", "title", "remark"],
+        [
+            [application.CODE, application.LABEL_CN, application.REMARK]
+            for application in applications
+        ],
+    )
 
 
 @application_typer.command("set")

{data_ops_cli-0.2.3 → data_ops_cli-0.2.4}/src/dataops_cli/cli/data_table.py

@@ -11,7 +11,7 @@ import typer
 from rich.console import Console
 from rich.table import Table
 
-from dataops_cli.cli.utils import render_table
+from dataops_cli.cli.utils import print_list, render_table
 from dataops_cli.exceptions import DataOpsError
 from dataops_cli.schems import MetaType, PageParam, SqlQueryParam
 from dataops_cli.sdk import (
@@ -63,11 +63,10 @@ def list_datatable(
     if query:
         group_nodes = filter_nodes_by_pattern(group_nodes, query, include_digest=True)
 
-    table = Table("code", "title", "remark")
-    console = Console(no_color=True)
-    for column in group_nodes:
-        table.add_row(column.CODE, column.TITLE, column.REMARK or "")
-    console.print(table)
+    print_list(
+        ["code", "title", "remark"],
+        [[column.CODE, column.TITLE, column.REMARK] for column in group_nodes],
+    )
 
 
 @data_table_typer.command("detail", no_args_is_help=True)

{data_ops_cli-0.2.3 → data_ops_cli-0.2.4}/src/dataops_cli/cli/dataset.py

@@ -4,6 +4,7 @@ import typer
 from rich.console import Console
 from rich.table import Table
 
+from dataops_cli.cli.utils import print_list
 from dataops_cli.exceptions import DataOpsError
 from dataops_cli.sdk import service_get_dataset_detail_by_code, service_list_datasets
 from dataops_cli.utils import filter_nodes_by_pattern
@@ -35,11 +36,10 @@ def list_dataset(
     if query:
         group_nodes = filter_nodes_by_pattern(group_nodes, query, include_digest=True)
 
-    table = Table("code", "name", "alias", "remark", title="dataset list")
-    console = Console(no_color=True)
-    for column in group_nodes:
-        table.add_row(column.CODE, column.NAME, column.TITLE, column.REMARK or "")
-    console.print(table)
+    print_list(
+        ["code", "name", "alias", "remark"],
+        [[column.CODE, column.NAME, column.TITLE, column.REMARK] for column in group_nodes],
+    )
 
 
 @dataset_typer.command("detail", no_args_is_help=True)

{data_ops_cli-0.2.3 → data_ops_cli-0.2.4}/src/dataops_cli/cli/datasource.py

@@ -19,19 +19,18 @@ from dataops_cli.schems import (
     DataDataSource,
     InnerMetaType,
     MetaCreate,
-    MetaUpdate,
 )
 from dataops_cli.schems.enums import DataSourceType
-from dataops_cli.sdk.datasource import get_application_datasource_config, get_datasource
+from dataops_cli.sdk.datasource import (
+    get_application_datasource_config,
+    service_get_datasource_by_name,
+)
 from dataops_cli.sdk.meta import (
     release_list_create,
     release_list_get_by_name,
     release_list_list,
     release_list_update,
 )
-from dataops_cli.sdk.table import (
-    service_get_table_data_by_name,
-)
 from dataops_cli.session import get_application
 from dataops_cli.utils import filter_nodes_by_pattern
 
@@ -113,7 +112,7 @@ def get_datasource_detail(
     Args:
         name: 数据源名称
     """
-    meta = release_list_get_by_name(InnerMetaType.DATASOURCE.value, name, _class=DataDataSource)
+    meta = service_get_datasource_by_name(name)
     table = Table("field", "value", show_header=False)
     table.add_row("name", meta.name)
     table.add_row("title", meta.title)

{data_ops_cli-0.2.3 → data_ops_cli-0.2.4}/src/dataops_cli/cli/dict_.py

@@ -4,6 +4,7 @@ import typer
 from rich.console import Console
 from rich.table import Table
 
+from dataops_cli.cli.utils import print_list
 from dataops_cli.exceptions import DataOpsError
 from dataops_cli.sdk.dict_ import (
     service_get_dict_detail_by_code,
@@ -47,11 +48,10 @@ def list_dict(
     if query:
         group_nodes = filter_nodes_by_pattern(group_nodes, query)
 
-    table = Table("code", "name", "alias", "remark", title="dict list")
-    console = Console(no_color=True)
-    for column in group_nodes:
-        table.add_row(column.CODE, column.NAME, column.TITLE)
-    console.print(table)
+    print_list(
+        ["code", "name", "alias"],
+        [[column.CODE, column.NAME, column.TITLE] for column in group_nodes],
+    )
 
 
 @dict_typer.command("detail", no_args_is_help=True)

{data_ops_cli-0.2.3 → data_ops_cli-0.2.4}/src/dataops_cli/cli/factory.py

@@ -25,6 +25,7 @@ def main(
 
 
 def create_app():
+    from dataops_cli.cli.api import api_typer
     from dataops_cli.cli.auth import auth_typer
     from dataops_cli.cli.data_table import data_table_typer
     from dataops_cli.cli.dataset import dataset_typer
@@ -44,6 +45,7 @@ def create_app():
         short_help=True,
     )
     app.add_typer(auth_typer)
+    app.add_typer(api_typer)
     app.add_typer(datasource_typer)
     app.add_typer(dataset_typer)
     app.add_typer(table_typer)

{data_ops_cli-0.2.3 → data_ops_cli-0.2.4}/src/dataops_cli/cli/metrics.py

@@ -12,6 +12,7 @@ import typer
 from rich.console import Console
 from rich.table import Table
 
+from dataops_cli.cli.utils import print_list
 from dataops_cli.schems.enums import MetaType
 from dataops_cli.schems.query import SqlQueryParam
 from dataops_cli.sdk.meta import (
@@ -56,11 +57,10 @@ def list_metrics(
 
     if query:
         group_nodes = filter_nodes_by_pattern(group_nodes, query)
-    table = Table("code", "title", "subType", title="metrics")
-    console = Console(no_color=True)
-    for column in group_nodes:
-        table.add_row(column.CODE, column.TITLE, column.SUB_TYPE or "atomic")
-    console.print(table)
+    print_list(
+        ["code", "title", "subType"],
+        [[column.CODE, column.TITLE, column.SUB_TYPE or "atomic"] for column in group_nodes],
+    )
 
 
 @metrics_typer.command("detail", no_args_is_help=True)

{data_ops_cli-0.2.3 → data_ops_cli-0.2.4}/src/dataops_cli/cli/report.py

@@ -12,6 +12,7 @@ import typer
 from rich.console import Console
 from rich.table import Table
 
+from dataops_cli.cli.utils import print_list
 from dataops_cli.exceptions import DataOpsError
 from dataops_cli.schems import MetaType
 from dataops_cli.sdk.meta import (
@@ -51,11 +52,10 @@ def list_reports(
     if query:
         group_nodes = filter_nodes_by_pattern(group_nodes, query)
 
-    table = Table("code", "title", "subType", title="report")
-    console = Console(no_color=True)
-    for column in group_nodes:
-        table.add_row(column.CODE, column.TITLE, column.SUB_TYPE or "doc")
-    console.print(table)
+    print_list(
+        ["code", "title", "subType"],
+        [[column.CODE, column.TITLE, column.SUB_TYPE or "doc"] for column in group_nodes],
+    )
 
 
 @report_typer.command("detail", rich_help_panel="报告查询")

{data_ops_cli-0.2.3 → data_ops_cli-0.2.4}/src/dataops_cli/cli/table.py

@@ -1,18 +1,19 @@
 from typing import Annotated, Optional
 
 import typer
-from rich.console import Console
-from rich.table import Table
+from pydantic import BaseModel
 
-from dataops_cli.cli.utils import render_table
+from dataops_cli.cli.utils import print_list, render_table
 from dataops_cli.exceptions import DataOpsError
 from dataops_cli.schems import (
+    DataBaseColumnDictExternal,
     DataBaseColumnReference,
     DataBaseColumnReferenceValue,
-    DataBaseColumnTypeExternal,
+    DataBaseColumnTableExternal,
     PageParam,
     SqlQueryParam,
 )
+from dataops_cli.schems.table import ColumnItem
 from dataops_cli.sdk import (
     release_list_update,
     service_count_table_by_code,
@@ -24,6 +25,7 @@ from dataops_cli.sdk import (
     service_get_table_detail_by_name,
     service_list_tables,
 )
+from dataops_cli.sdk.table import service_exec_sql_by_datasource
 from dataops_cli.utils import filter_nodes_by_pattern
 
 table_typer = typer.Typer(name="table", help="Manage table.", no_args_is_help=True)
@@ -64,19 +66,17 @@ def list_table(
 
     if query:
         group_nodes = filter_nodes_by_pattern(group_nodes, query)
-
-    table = Table("code", "name", "alias", "remark", title="table list")
-    console = Console(no_color=True)
-    for column in group_nodes:
-        table.add_row(column.CODE, column.NAME, column.TITLE, column.REMARK or "")
-    console.print(table)
+    print_list(
+        ["code", "name", "alias", "remark"],
+        [[column.CODE, column.NAME, column.TITLE, column.REMARK] for column in group_nodes],
+    )
 
 
 @table_typer.command("detail", no_args_is_help=True)
 def get_table_detail(
     arg1: Annotated[str, typer.Argument(help="编码或数据源")],
     name: Annotated[Optional[str], typer.Argument(help="表名")] = None,
-    full: Annotated[bool, typer.Option(help="是否显示完整信息")] = False,
+    full: Annotated[bool, typer.Option("--full", help="显示完整DDL信息")] = False,
 ) -> None:
     """获取表详情(DDL)信息.
 
@@ -109,26 +109,58 @@ def get_table_detail(
 
     datasource = meta.subSystem
 
-    console = Console(no_color=True)
-    if full:
-        table = Table("column", "alias", "dbType", "relation", title=f"{datasource} {name} DDL")
-        for column in meta.data.columns:
-            relation = None
-            if column.typeExt is not None:
-                relation = column.typeExt.ref__dict or column.typeExt.ref__valueField
-            if relation is not None:
-                relation = relation.model_dump_json()
-            table.add_row(column.name, column.title, column.dbType, relation)
-        console.print(table)
-        for column in filter(lambda c: c.typeExt is not None, meta.data.columns):
-            relation = column.typeExt.ref__dict or column.typeExt.ref__valueField
-            if relation is not None:
-                console.print(f"{column.name} -> {relation.model_dump_json()}")
+    print(datasource, meta.name)
+
+    def show_column(column: ColumnItem):
+        if column.pk and column.labelKey:
+            return f"{column.name}(√,√)"
+        elif column.pk:
+            return f"{column.name}(√,x)"
+        elif column.labelKey:
+            return f"{column.name}(x,√)"
+        else:
+            return column.name
+
+    def show_extend(column: ColumnItem):
+        output = []
+        if column.decimalPlace:
+            output.append(f"{column.decimalPlace}dp")
+        if column.nullable:
+            output.append("nullable")
+        else:
+            output.append("not-null")
+        return ",".join(output)
+
+    if not full:
+        print("column(pk,labelKey)", "alias", "dbType(length)")
+        print(
+            "\n".join(
+                (
+                    f"{show_column(column)} {column.title} {column.dbType}({column.length})"
+                    if column.pk
+                    else ""
+                    for column in meta.data.columns
+                )
+            )
+        )
     else:
-        table = Table("column", "alias", "dbType", title=f"{datasource} {name} DDL")
+        print("columns info\ncolumn(pk,labelKey)", "alias", "dbType(length)", "extend", "relation")
         for column in meta.data.columns:
-            table.add_row(column.name, column.title, column.dbType)
-        console.print(table)
+            relation = None
+            if isinstance(column.typeExt, BaseModel):
+                relation = column.typeExt.model_dump_json()
+            print(
+                show_column(column),
+                column.title,
+                f"{column.dbType}({column.length})",
+                show_extend(column),
+                relation,
+            )
+        if meta.data.indexes:
+            print("\nindexes info\nname columns")
+            print("\n".join((f"{index.name} {index.columns}" for index in meta.data.indexes)))
+        else:
+            print("\nindexes info\n无索引信息")
 
 
 @table_typer.command("count", no_args_is_help=True)
@@ -222,6 +254,46 @@ def get_table_data(
     print(render_table(data))
 
 
+@table_typer.command("exec", no_args_is_help=True)
+def exec_sql(
+    datasource: Annotated[str, typer.Argument(help="数据源")],
+    sql: Annotated[str, typer.Argument(help="SQL 查询语句")],
+    page_num: Annotated[int, typer.Option("-n", "--page-num", help="页码")] = 0,
+    page_size: Annotated[int, typer.Option("-s", "--page-size", help="每页大小")] = 20,
+) -> None:
+    """执行任意 SQL 查询语句.
+
+    支持两种查询方式:
+    1. 通过表编码(CODE)直接查询
+    2. 通过数据源名称和表名组合查询
+
+    示例:
+        # 通过数据源 SQL
+        >>> data-ops-cli table exec-sql mydatasource "SELECT * FROM table LIMIT 10"
+
+        # 分页查询
+        >>> data-ops-cli table exec-sql mydatasource "SELECT * FROM table" --page-num 1 --page-size 50
+
+        # 以字典格式输出
+        >>> data-ops-cli table exec-sql mydatasource "SELECT * FROM table" --map
+    """
+    if not sql:
+        typer.echo("请输入 SQL 查询语句")
+        raise typer.Exit(code=1)
+    try:
+        datas = service_exec_sql_by_datasource(datasource, sql, page_num, page_size)
+    except DataOpsError as e:
+        typer.echo(f"错误: {e.message}")
+        raise typer.Exit(code=1) from None
+    if not datas:
+        print("未查询到数据")
+        return
+    columns_name = datas[0].keys()
+    print(*columns_name)
+    for data in datas:
+        print(*data.values())
+
+
 @column_typer.command("base", no_args_is_help=True)
 def set_column_config(
     datasource: Annotated[str, typer.Argument(help="编数据源")],
@@ -262,7 +334,7 @@ def set_column_dict_config(
     column_item = next(filter(lambda c: c.name == column, table_meta.data.columns))
     dict_meta = service_get_dict_detail_by_name(datasource, dict_name)
     column_item.type = "dict"
-    column_item.typeExt = DataBaseColumnTypeExternal(
+    column_item.typeExt = DataBaseColumnDictExternal(
         ref__dict=DataBaseColumnReference(type="dict", code=dict_meta.code)
     )
     result = release_list_update(table_meta)
@@ -283,7 +355,7 @@ def set_column_dict_config(
     dst_table_meta = service_get_table_detail_by_name(datasource, r_name)
     dst_column_item = next(filter(lambda c: c.name == r_col_name, dst_table_meta.data.columns))
     column_item.type = "relation"
-    column_item.typeExt = DataBaseColumnTypeExternal(
+    column_item.typeExt = DataBaseColumnTableExternal(
         ref__table=DataBaseColumnReference(type="table", code=dst_table_meta.code),
         ref__valueField=DataBaseColumnReferenceValue(
             type="table", code=dst_table_meta.code, subtype="column", subcode=dst_column_item.id