From 44ff544e358ed943d82cff09ded798258a21f345 Mon Sep 17 00:00:00 2001 From: CaptainB Date: Wed, 3 Dec 2025 12:51:01 +0800 Subject: [PATCH 1/4] feat: call radioChange on component mount MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1063991 --user=刘瑞斌 【工具】- 选择【数据源】后，切换到应用或知识库菜单，再切换回工具列表，数据显示不准确 https://www.tapd.cn/62980211/s/1805110 --- ui/src/views/tool/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/src/views/tool/index.vue b/ui/src/views/tool/index.vue index 5252f3c56..d55babbab 100644 --- a/ui/src/views/tool/index.vue +++ b/ui/src/views/tool/index.vue @@ -92,6 +92,7 @@ function refreshFolder() { onMounted(() => { getFolder(folder.currentFolder?.id ? false : true) + radioChange() }) From 1d2919094b9e11942d925c30a1829c1d50d7e2a5 Mon Sep 17 00:00:00 2001 From: wxg0103 <727495428@qq.com> Date: Wed, 3 Dec 2025 14:03:17 +0800 Subject: [PATCH 2/4] fix: correct error handling in URL processing function --- ui/src/components/ai-chat/component/chat-input-operate/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/src/components/ai-chat/component/chat-input-operate/index.vue b/ui/src/components/ai-chat/component/chat-input-operate/index.vue index 390823fbc..e548dcf8b 100644 --- a/ui/src/components/ai-chat/component/chat-input-operate/index.vue +++ b/ui/src/components/ai-chat/component/chat-input-operate/index.vue @@ -583,6 +583,7 @@ const uploadFile = async (file: any, fileList: any) => { inner.file_id = split_path[split_path.length - 1] delete filePromisionDict.value[file.uid] }) + showURLSetting.value = false } // 粘贴处理 const handlePaste = (event: ClipboardEvent) => { From e626e0e0e4229e5bd25206dc343ea5c56d3ffb67 Mon Sep 17 00:00:00 2001 From: zhangzhanwei Date: Wed, 3 Dec 2025 14:08:38 +0800 Subject: [PATCH 3/4] fix: Resource permission list does not display non-regular user roles --- apps/system_manage/serializers/user_resource_permission.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/system_manage/serializers/user_resource_permission.py b/apps/system_manage/serializers/user_resource_permission.py index 2efaa5a62..093f75457 100644 --- a/apps/system_manage/serializers/user_resource_permission.py +++ b/apps/system_manage/serializers/user_resource_permission.py @@ -384,8 +384,10 @@ class ResourceUserPermissionSerializer(serializers.Serializer): }) role_name_and_type_query_set = QuerySet(model=get_dynamics_model({ 'user_role_relation.workspace_id': models.CharField(), + 'role_setting.type': models.CharField(), })).filter(**{ "user_role_relation.workspace_id": self.data.get('workspace_id'), + "role_setting.type": "USER", }) if role_name: user_query_set = user_query_set.filter( From b2d20638434e31393755b9dad8e5580b2f2298f3 Mon Sep 17 00:00:00 2001 From: zhangzhanwei Date: Wed, 3 Dec 2025 14:27:04 +0800 Subject: [PATCH 4/4] feat: Locales --- .../impl/base_data_source_web_node.py | 18 +++++++++--------- apps/locales/en_US/LC_MESSAGES/django.po | 3 +++ apps/locales/zh_CN/LC_MESSAGES/django.po | 5 ++++- apps/locales/zh_Hant/LC_MESSAGES/django.po | 5 ++++- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/apps/application/flow/step_node/data_source_web_node/impl/base_data_source_web_node.py b/apps/application/flow/step_node/data_source_web_node/impl/base_data_source_web_node.py index 9a5b6c604..e51ac4d56 100644 --- a/apps/application/flow/step_node/data_source_web_node/impl/base_data_source_web_node.py +++ b/apps/application/flow/step_node/data_source_web_node/impl/base_data_source_web_node.py @@ -19,8 +19,10 @@ from common.utils.logger import maxkb_logger class BaseDataSourceWebNodeForm(BaseForm): - source_url = forms.TextInputField(_('Web source url'), required=True) - selector = forms.TextInputField(_('Web knowledge selector'), required=False,attrs={'placeholder': _('The default is body, you can enter .classname/#idname/tagname')}) + source_url = forms.TextInputField(_('Web source url'), required=True, attrs={ + 'placeholder': _('Please enter the Web root address')}) + selector = forms.TextInputField(_('Web knowledge selector'), required=False, attrs={ + 'placeholder': _('The default is body, you can enter .classname/#idname/tagname')}) def get_collect_handler(): @@ -38,7 +40,7 @@ def get_collect_handler(): except Exception as e: maxkb_logger.error(f'{str(e)}:{traceback.format_exc()}') - return handler,results + return handler, results class BaseDataSourceWebNode(IDataSourceWebNode): @@ -61,24 +63,22 @@ class BaseDataSourceWebNode(IDataSourceWebNode): collect_handler, document_list = get_collect_handler() try: - ForkManage(source_url,selector.split(" ") if selector is not None else []).fork(3,set(),collect_handler) + ForkManage(source_url, selector.split(" ") if selector is not None else []).fork(3, set(), collect_handler) - return NodeResult({'document_list': document_list}, - self.workflow_manage.params.get('knowledge_base') or {}) + return NodeResult({'document_list': document_list}, + self.workflow_manage.params.get('knowledge_base') or {}) except Exception as e: maxkb_logger.error(_('data source web node:{node_id} error{error}{traceback}').format( knowledge_id=node_id, error=str(e), traceback=traceback.format_exc())) - - def get_details(self, index: int, **kwargs): return { 'name': self.node.properties.get('stepName'), "index": index, 'run_time': self.context.get('run_time'), 'type': self.node.type, - 'input_params': {"source_url": self.context.get("source_url"),"selector": self.context.get('selector')}, + 'input_params': {"source_url": self.context.get("source_url"), "selector": self.context.get('selector')}, 'output_params': self.context.get('document_list'), 'knowledge_base': self.workflow_params.get('knowledge_base'), 'status': self.status, diff --git a/apps/locales/en_US/LC_MESSAGES/django.po b/apps/locales/en_US/LC_MESSAGES/django.po index 15f25abfc..ecdd6ac1d 100644 --- a/apps/locales/en_US/LC_MESSAGES/django.po +++ b/apps/locales/en_US/LC_MESSAGES/django.po @@ -8793,4 +8793,7 @@ msgid "Web knowledge selector" msgstr "" msgid "The default is body, you can enter .classname/#idname/tagname" +msgstr "" + +msgid "Please enter the Web root address" msgstr "" \ No newline at end of file diff --git a/apps/locales/zh_CN/LC_MESSAGES/django.po b/apps/locales/zh_CN/LC_MESSAGES/django.po index ed82821cd..196a9ea49 100644 --- a/apps/locales/zh_CN/LC_MESSAGES/django.po +++ b/apps/locales/zh_CN/LC_MESSAGES/django.po @@ -8919,4 +8919,7 @@ msgid "Web knowledge selector" msgstr "选择器" msgid "The default is body, you can enter .classname/#idname/tagname" -msgstr "默认为 body，可输入 .classname/#idname/tagname" \ No newline at end of file +msgstr "默认为 body，可输入 .classname/#idname/tagname" + +msgid "Please enter the Web root address" +msgstr "请输入Web根地址" \ No newline at end of file diff --git a/apps/locales/zh_Hant/LC_MESSAGES/django.po b/apps/locales/zh_Hant/LC_MESSAGES/django.po index 4c58fecfb..aedd0f0a3 100644 --- a/apps/locales/zh_Hant/LC_MESSAGES/django.po +++ b/apps/locales/zh_Hant/LC_MESSAGES/django.po @@ -8919,4 +8919,7 @@ msgid "Web knowledge selector" msgstr "選擇器" msgid "The default is body, you can enter .classname/#idname/tagname" -msgstr "默認為 body，可輸入 .classname/#idname/tagname" \ No newline at end of file +msgstr "默認為 body，可輸入 .classname/#idname/tagname" + +msgid "Please enter the Web root address" +msgstr "請輸入Web根地址" \ No newline at end of file