Merge branch 'v2' of https://github.com/maxkb-dev/maxkb into v2

Author: liqiang-fit2cloud

apps/application/flow/step_node/data_source_web_node/impl/base_data_source_web_node.py

@@ -19,8 +19,10 @@
 
 
 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 handler(child_link: ChildLink, response: Fork.Response):
             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 @@ def execute(self, **kwargs) -> NodeResult:
         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,

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 ""

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"
+msgstr "默认为 body，可输入 .classname/#idname/tagname"
+
+msgid "Please enter the Web root address"
+msgstr "请输入Web根地址"

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"
+msgstr "默認為 body，可輸入 .classname/#idname/tagname"
+
+msgid "Please enter the Web root address"
+msgstr "請輸入Web根地址"

apps/system_manage/serializers/user_resource_permission.py

@@ -384,8 +384,10 @@ def get_queryset(self, instance, is_x_pack_ee: bool):
             })
             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(

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) => {

ui/src/views/tool/index.vue

@@ -92,6 +92,7 @@ function refreshFolder() {
 
 onMounted(() => {
   getFolder(folder.currentFolder?.id ? false : true)
+  radioChange()
 })
 </script>