diff --git a/ui/src/components/app-table-infinite-scroll/index.vue b/ui/src/components/app-table-infinite-scroll/index.vue
index 102401ee4..b71576cb1 100644
--- a/ui/src/components/app-table-infinite-scroll/index.vue
+++ b/ui/src/components/app-table-infinite-scroll/index.vue
@@ -41,11 +41,17 @@ const load = () => {
if (disabled.value) return
// props.paginationConfig.current_page++;
- if (props.paginationConfig.current_page <= props.paginationConfig.total) {
+ if (
+ props.paginationConfig.current_page * props.paginationConfig.page_size <=
+ props.paginationConfig.total
+ ) {
emit('changePage')
}
- if (props.paginationConfig.current_page === props.paginationConfig.total) {
+ if (
+ props.paginationConfig.current_page * props.paginationConfig.page_size ===
+ props.paginationConfig.total
+ ) {
disabled.value = true
}
}
diff --git a/ui/src/locales/lang/en-US/common.ts b/ui/src/locales/lang/en-US/common.ts
index c8785ea62..4d28a566c 100644
--- a/ui/src/locales/lang/en-US/common.ts
+++ b/ui/src/locales/lang/en-US/common.ts
@@ -74,6 +74,7 @@ export default {
success: 'Successful',
fail: 'Failed',
all: 'All',
+ padding: 'Padding',
},
param: {
outputParam: 'Output Parameters',
diff --git a/ui/src/locales/lang/en-US/workflow.ts b/ui/src/locales/lang/en-US/workflow.ts
index e2d342368..efb99fe84 100644
--- a/ui/src/locales/lang/en-US/workflow.ts
+++ b/ui/src/locales/lang/en-US/workflow.ts
@@ -81,9 +81,8 @@ export default {
},
nodes: {
knowledgeWriteNode: {
- text: 'Knowledge write',
- label:
- 'Write the input paragraph list into the current knowledge base and complete vectorization processing',
+ label: 'Knowledge write',
+ text: 'Write the input paragraph list into the current knowledge base and complete vectorization processing',
},
dataSourceWebNode: {
label: 'Web Site',
@@ -142,6 +141,9 @@ export default {
},
},
},
+ KnowledgeBaseNode: {
+ DocumentSetting: 'Document Processing Setting',
+ },
aiChatNode: {
label: 'AI Chat',
text: 'Chat with an AI model',
diff --git a/ui/src/locales/lang/zh-CN/common.ts b/ui/src/locales/lang/zh-CN/common.ts
index 747d50406..2c4ee9282 100644
--- a/ui/src/locales/lang/zh-CN/common.ts
+++ b/ui/src/locales/lang/zh-CN/common.ts
@@ -76,6 +76,7 @@ export default {
success: '成功',
fail: '失败',
all: '全部',
+ padding: '执行中',
},
param: {
outputParam: '输出参数',
diff --git a/ui/src/locales/lang/zh-CN/workflow.ts b/ui/src/locales/lang/zh-CN/workflow.ts
index ac90dc320..56618a158 100644
--- a/ui/src/locales/lang/zh-CN/workflow.ts
+++ b/ui/src/locales/lang/zh-CN/workflow.ts
@@ -85,8 +85,8 @@ export default {
},
nodes: {
knowledgeWriteNode: {
- text: '知识库写入',
- label: '将输入的分段列表写入当前知识库，并完成向量化处理',
+ label: '知识库写入',
+ text: '将输入的分段列表写入当前知识库，并完成向量化处理',
},
dataSourceWebNode: {
label: 'Web站点',
@@ -146,6 +146,9 @@ export default {
},
},
},
+ KnowledgeBaseNode: {
+ DocumentSetting: '文档处理设置',
+ },
aiChatNode: {
label: 'AI 对话',
text: '与 AI 大模型进行对话',
diff --git a/ui/src/locales/lang/zh-Hant/common.ts b/ui/src/locales/lang/zh-Hant/common.ts
index 134ae31de..d4c917a59 100644
--- a/ui/src/locales/lang/zh-Hant/common.ts
+++ b/ui/src/locales/lang/zh-Hant/common.ts
@@ -74,6 +74,7 @@ export default {
success: '成功',
fail: '失敗',
all: '全部',
+ padding: '執行中',
},
param: {
outputParam: '輸出參數',
diff --git a/ui/src/locales/lang/zh-Hant/workflow.ts b/ui/src/locales/lang/zh-Hant/workflow.ts
index b538770f9..948779469 100644
--- a/ui/src/locales/lang/zh-Hant/workflow.ts
+++ b/ui/src/locales/lang/zh-Hant/workflow.ts
@@ -81,8 +81,8 @@ export default {
},
nodes: {
knowledgeWriteNode: {
- text: '知識庫寫入',
- label: '將輸入的分段列表寫入當前知識庫，並完成向量化處理',
+ label: '知識庫寫入',
+ text: '將輸入的分段列表寫入當前知識庫，並完成向量化處理',
},
dataSourceWebNode: {
label: 'Web網站',
@@ -141,6 +141,9 @@ export default {
},
},
},
+ KnowledgeBaseNode: {
+ DocumentSetting: '文檔處理設置',
+ },
aiChatNode: {
label: 'AI 對話',
text: '與 AI 大模型進行對話',
diff --git a/ui/src/views/knowledge-workflow/component/execution-record/ExecutionRecordDrawer.vue b/ui/src/views/knowledge-workflow/component/execution-record/ExecutionRecordDrawer.vue
index 9b5da04a9..b6577e1c0 100644
--- a/ui/src/views/knowledge-workflow/component/execution-record/ExecutionRecordDrawer.vue
+++ b/ui/src/views/knowledge-workflow/component/execution-record/ExecutionRecordDrawer.vue
@@ -46,26 +46,42 @@
class="w-full"
v-loading="loading"
@changePage="changePage"
- :maxTableHeight="200"
+ :maxTableHeight="150"
+ :paginationConfig="paginationConfig"
>
- {{ row.user_name }}
+ {{ row.meta.user_name }}
-
+
- {{ row.state }}
+
+
+ {{ $t('common.status.success') }}
+
+
+
+ {{ $t('common.status.fail') }}
+
+
+
+ {{ $t('common.status.padding') }}
+
-
+
- {{ row.run_time }}
+ {{ row.run_time != undefined ? row.run_time + 's' : '-' }}
-
+
- 执行详情
+
+
+
+
+
@@ -106,6 +122,7 @@ const changeFilterHandle = () => {
}
const changePage = () => {
paginationConfig.current_page += 1
+ console.log(paginationConfig.current_page)
getList()
}
@@ -114,15 +131,18 @@ const getList = () => {
.getWorkflowActionPage(active_knowledge_id.value, paginationConfig, query.value, loading)
.then((ok: any) => {
paginationConfig.total = ok.data?.total
- data.value = ok.data.records
+ data.value = data.value.concat(ok.data.records)
})
}
const open = (knowledge_id: string) => {
- drawer.value = true
active_knowledge_id.value = knowledge_id
getList()
+ drawer.value = true
}
const close = () => {
+ paginationConfig.current_page = 1
+ paginationConfig.total = 0
+ data.value = []
drawer.value = false
}
defineExpose({ open, close })
diff --git a/ui/src/views/system/operate-log/index.vue b/ui/src/views/system/operate-log/index.vue
index c466c4b2e..5a2e27ed2 100644
--- a/ui/src/views/system/operate-log/index.vue
+++ b/ui/src/views/system/operate-log/index.vue
@@ -105,6 +105,7 @@
@sizeChange="handleSizeChange"
@changePage="getList"
v-loading="loading"
+ show-overflow-tooltip
>
@@ -158,23 +159,15 @@
prop="operate"
:label="$t('views.operateLog.table.detail')"
width="160"
+ :tooltip-formatter="
+ ({ row }: any) =>
+ row.operate + (row.operation_object?.name ? `【${row.operation_object.name}】` : '')
+ "
>
-
-
- {{
- row.operate +
- (row.operation_object?.name ? `【${row.operation_object.name}】` : '')
- }}
-
-
+ {{
+ row.operate + (row.operation_object?.name ? `【${row.operation_object.name}】` : '')
+ }}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -517,16 +506,4 @@ onMounted(() => {
changeDayHandle(history_day.value)
})
-
+
diff --git a/ui/src/workflow/common/template.ts b/ui/src/workflow/common/template.ts
index 8ccf6cd52..38b64de2b 100644
--- a/ui/src/workflow/common/template.ts
+++ b/ui/src/workflow/common/template.ts
@@ -786,21 +786,15 @@ export const knowledgeTemplate: any = {
nodes: [
{
x: 120,
- y: 114.94150000000002,
+ y: 115.05849999999998,
id: 'knowledge-base-node',
type: 'knowledge-base-node',
properties: {
config: {
- globalFields: [
- {
- label: 'a',
- value: 'a',
- globeLabel: '{{global.a}}',
- globeValue: "{{context['global'].a}}",
- },
- ],
+ fields: [],
+ globalFields: [],
},
- height: 384.266,
+ height: 394.383,
showNode: true,
stepName: '\u57fa\u672c\u4fe1\u606f',
node_data: {
@@ -812,32 +806,9 @@ export const knowledgeTemplate: any = {
},
input_field_list: [],
user_input_config: {
- title: '\u7528\u6237\u8f93\u5165',
+ title: '\u6587\u6863\u5904\u7406\u8bbe\u7f6e',
},
- user_input_field_list: [
- {
- attrs: {
- maxlength: 200,
- minlength: 1,
- 'show-word-limit': true,
- },
- field: 'a',
- label: 'a',
- required: false,
- input_type: 'TextInput',
- props_info: {
- rules: [
- {
- max: 200,
- min: 1,
- message: 'a\u957f\u5ea6\u5728 1 \u5230 200 \u4e2a\u5b57\u7b26',
- trigger: 'blur',
- },
- ],
- },
- show_default_value: true,
- },
- ],
+ user_input_field_list: [],
},
},
{
diff --git a/ui/src/workflow/nodes/knowledge-base-node/component/UserInputFieldTable.vue b/ui/src/workflow/nodes/knowledge-base-node/component/UserInputFieldTable.vue
index cc4cd3e84..77350fdf7 100644
--- a/ui/src/workflow/nodes/knowledge-base-node/component/UserInputFieldTable.vue
+++ b/ui/src/workflow/nodes/knowledge-base-node/component/UserInputFieldTable.vue
@@ -118,7 +118,7 @@ const tableRef = ref()
const UserFieldFormDialogRef = ref()
const UserInputTitleDialogRef = ref()
const inputFieldList = ref([])
-const inputFieldConfig = ref({ title: t('chat.userInput') })
+const inputFieldConfig = ref({ title: t('workflow.nodes.KnowledgeBaseNode.DocumentSetting') })
function openAddDialog(data?: any, index?: any) {
UserFieldFormDialogRef.value.open(data, index)