diff --git a/json/llm.json b/json/llm.json index be997f8..e8e1e67 100644 --- a/json/llm.json +++ b/json/llm.json @@ -38,11 +38,15 @@ }, "providerid": { "uitype": "code", - "dataurl": "{{entire_url('../api/get_search_providerid.dspy')}}" + "dataurl": "{{entire_url('../api/get_search_providerid.dspy')}}", + "valueField": "providerid", + "textField": "providerid_text" }, "upappid": { "uitype": "code", - "dataurl": "{{entire_url('../api/get_search_upappid.dspy')}}" + "dataurl": "{{entire_url('../api/get_search_upappid.dspy')}}", + "valueField": "upappid", + "textField": "upappid_text" } } }, diff --git a/json/llm_api_map.json b/json/llm_api_map.json index 84e8e87..c221c85 100644 --- a/json/llm_api_map.json +++ b/json/llm_api_map.json @@ -7,11 +7,15 @@ "alters": { "apiname": { "uitype": "code", - "dataurl": "{{entire_url('../api/get_search_apiname.dspy')}}?llmid={{params_kw.llmid}}" + "dataurl": "{{entire_url('../api/get_search_apiname.dspy')}}?llmid={{params_kw.llmid}}", + "valueField": "apiname", + "textField": "apiname_text" }, "query_apiname": { "uitype": "code", - "dataurl": "{{entire_url('../api/get_search_apiname.dspy?allow_empty=1')}}?llmid={{params_kw.llmid}}" + "dataurl": "{{entire_url('../api/get_search_apiname.dspy?allow_empty=1')}}?llmid={{params_kw.llmid}}", + "valueField": "apiname", + "textField": "apiname_text" } } }, diff --git a/wwwroot/api/get_search_apiname.dspy b/wwwroot/api/get_search_apiname.dspy index 85d8289..2630a80 100644 --- a/wwwroot/api/get_search_apiname.dspy +++ b/wwwroot/api/get_search_apiname.dspy @@ -3,7 +3,7 @@ allow_empty = params_kw.get('allow_empty', '') result = [] if allow_empty: - result = [{'value': '', 'text': '不指定'}] + result = [{'apiname': '', 'apiname_text': '不指定'}] try: if not llmid: @@ -23,7 +23,7 @@ try: # Query uapi table from uapi module's db async with get_sor_context(request._run_ns, 'uapi') as sor: apis = await sor.sqlExe( - "select name as value, name as text from uapi where upappid = ${upappid}$ order by name", + "select name as apiname, name as apiname_text from uapi where upappid = ${upappid}$ order by name", {'upappid': upappid} ) return json.dumps(result + list(apis), ensure_ascii=False) diff --git a/wwwroot/api/get_search_providerid.dspy b/wwwroot/api/get_search_providerid.dspy index cf273a3..766f06c 100644 --- a/wwwroot/api/get_search_providerid.dspy +++ b/wwwroot/api/get_search_providerid.dspy @@ -1,12 +1,12 @@ -result = [{'value': '', 'text': '全部'}] +result = [{'providerid': '', 'providerid_text': '全部'}] try: async with get_sor_context(request._run_ns, 'rbac') as sor: orgs = await sor.sqlExe( - "select id as value, orgname as text from organization order by orgname", + "select id as providerid, orgname as providerid_text from organization order by orgname", {} ) - return json.dumps([{'value': '', 'text': '全部'}] + list(orgs), ensure_ascii=False) + return json.dumps([{'providerid': '', 'providerid_text': '全部'}] + list(orgs), ensure_ascii=False) except Exception as e: debug(f'get_search_providerid error: {e}') diff --git a/wwwroot/api/get_search_upappid.dspy b/wwwroot/api/get_search_upappid.dspy index 2ecff01..f9f2feb 100644 --- a/wwwroot/api/get_search_upappid.dspy +++ b/wwwroot/api/get_search_upappid.dspy @@ -1,12 +1,12 @@ -result = [{'value': '', 'text': '全部'}] +result = [{'upappid': '', 'upappid_text': '全部'}] try: async with get_sor_context(request._run_ns, 'uapi') as sor: apps = await sor.sqlExe( - "select id as value, name as text from upapp order by name", + "select id as upappid, name as upappid_text from upapp order by name", {} ) - return json.dumps([{'value': '', 'text': '全部'}] + list(apps), ensure_ascii=False) + return json.dumps([{'upappid': '', 'upappid_text': '全部'}] + list(apps), ensure_ascii=False) except Exception as e: debug(f'get_search_upappid error: {e}')