Skip to content

Commit f55f38b

Browse files
Merge branch 'v2' of https://github.com/maxkb-dev/maxkb into v2
2 parents 6960262 + fb2c1b0 commit f55f38b

File tree

7 files changed

+57
-4
lines changed

7 files changed

+57
-4
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020

2121
class BaseDataSourceWebNodeForm(BaseForm):
22-
source_url = forms.TextInputField('source url', required=True)
23-
selector = forms.TextInputField('knowledge selector', required=False,default_value="body")
22+
source_url = forms.TextInputField(_('Web source url'), required=True)
23+
selector = forms.TextInputField(_('Web knowledge selector'), required=False,attrs={'placeholder': _('The default is body, you can enter .classname/#idname/tagname')})
2424

2525

2626
def get_collect_handler():

apps/common/utils/tool_code.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ def get_tool_mcp_config(self, code, params):
211211
'-c',
212212
f'import base64,gzip; exec(gzip.decompress(base64.b64decode(\'{compressed_and_base64_encoded_code_str}\')).decode())',
213213
],
214+
'cwd': self.sandbox_path,
214215
'env': {
215216
'LD_PRELOAD': self.sandbox_so_path,
216217
},

apps/locales/en_US/LC_MESSAGES/django.po

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8784,4 +8784,13 @@ msgid "SAML2 SSO"
87848784
msgstr ""
87858785

87868786
msgid "Workflow"
8787+
msgstr ""
8788+
8789+
msgid "Web source url"
8790+
msgstr ""
8791+
8792+
msgid "Web knowledge selector"
8793+
msgstr ""
8794+
8795+
msgid "The default is body, you can enter .classname/#idname/tagname"
87878796
msgstr ""

apps/locales/zh_CN/LC_MESSAGES/django.po

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8911,3 +8911,12 @@ msgstr "SAML2 单点登录"
89118911

89128912
msgid "Workflow"
89138913
msgstr "工作流"
8914+
8915+
msgid "Web source url"
8916+
msgstr "Web 根地址"
8917+
8918+
msgid "Web knowledge selector"
8919+
msgstr "选择器"
8920+
8921+
msgid "The default is body, you can enter .classname/#idname/tagname"
8922+
msgstr "默认为 body,可输入 .classname/#idname/tagname"

apps/locales/zh_Hant/LC_MESSAGES/django.po

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8910,4 +8910,13 @@ msgid "SAML2 SSO"
89108910
msgstr "SAML2 單點登入"
89118911

89128912
msgid "Workflow"
8913-
msgstr "工作流"
8913+
msgstr "工作流"
8914+
8915+
msgid "Web source url"
8916+
msgstr "Web 根地址"
8917+
8918+
msgid "Web knowledge selector"
8919+
msgstr "選擇器"
8920+
8921+
msgid "The default is body, you can enter .classname/#idname/tagname"
8922+
msgstr "默認為 body,可輸入 .classname/#idname/tagname"

ui/src/components/app-icon/icons/document.ts

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,4 +96,29 @@ export default {
9696
])
9797
},
9898
},
99+
'app-import-doc': {
100+
iconReader: () => {
101+
return h('i', [
102+
h(
103+
'svg',
104+
{
105+
style: { height: '100%', width: '100%' },
106+
viewBox: '0 0 1024 1024',
107+
version: '1.1',
108+
xmlns: 'http://www.w3.org/2000/svg',
109+
},
110+
[
111+
h('path', {
112+
d: 'M128 935.594667A45.653333 45.653333 0 0 0 173.482667 981.333333h338.346666v-85.76H213.248V128H810.24v426.666667h85.333333V87.978667A45.653333 45.653333 0 0 0 850.005333 42.24H173.482667A45.653333 45.653333 0 0 0 128 87.978667v847.616z',
113+
fill: 'currentColor',
114+
}),
115+
h('path', {
116+
d: 'M298.922667 480.768c0-6.314667 5.12-11.434667 11.392-11.434667h403.626666c6.314667 0 11.392 5.12 11.392 11.434667v62.890667c0 6.314667-5.12 11.434667-11.392 11.434666h-403.626666a11.392 11.392 0 0 1-11.392-11.434666v-62.890667zM310.4 298.666667a11.392 11.392 0 0 0-11.392 11.434666v62.890667c0 6.314667 5.12 11.434667 11.392 11.434667h190.208c6.314667 0 11.392-5.12 11.392-11.434667V310.101333A11.392 11.392 0 0 0 500.608 298.666667H310.4zM725.333333 661.333333a21.333333 21.333333 0 0 1 21.333334-21.333333h42.666666a21.333333 21.333333 0 0 1 21.333334 21.333333V768h106.666666a21.333333 21.333333 0 0 1 21.333334 21.333333v42.666667a21.333333 21.333333 0 0 1-21.333334 21.333333H810.666667v106.666667a21.333333 21.333333 0 0 1-21.333334 21.333333h-42.666666a21.333333 21.333333 0 0 1-21.333334-21.333333V853.333333h-106.666666a21.333333 21.333333 0 0 1-21.333334-21.333333v-42.666667a21.333333 21.333333 0 0 1 21.333334-21.333333H725.333333v-106.666667z',
117+
fill: 'currentColor',
118+
}),
119+
],
120+
),
121+
])
122+
},
123+
},
99124
}

ui/src/views/knowledge-workflow/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<template #dropdown>
5151
<el-dropdown-menu>
5252
<el-dropdown-item @click="toImportDoc">
53-
<AppIcon iconName="app-create-chat" class="color-secondary"></AppIcon>
53+
<AppIcon iconName="app-import-doc" class="color-secondary"></AppIcon>
5454
{{ $t('views.workflow.operation.toImportDoc') }}
5555
</el-dropdown-item>
5656

0 commit comments

Comments
 (0)