diff --git a/.vscode/i18n-ally-custom-framework.yml b/.vscode/i18n-ally-custom-framework.yml index a2d4fe0cc..3f810155a 100644 --- a/.vscode/i18n-ally-custom-framework.yml +++ b/.vscode/i18n-ally-custom-framework.yml @@ -16,9 +16,6 @@ usageMatchRegex: # the `{key}` will be placed by a proper keypath matching regex, # you can ignore it and use your own matching rules as well - "[^\\w\\d]t\\(['\"`]({key})['\"`]" - - "[^\\w\\d]commonT\\(['\"`]({key})['\"`]" - - "[^\\w\\d]fileT\\(['\"`]({key})['\"`]" - - "[^\\w\\d]workflowT\\(['\"`]({key})['\"`]" - "[^\\w\\d]i18nT\\(['\"`]({key})['\"`]" # A RegEx to set a custom scope range. This scope will be used as a prefix when detecting keys diff --git a/docSite/content/zh-cn/docs/development/upgrading/498.md b/docSite/content/zh-cn/docs/development/upgrading/498.md index 4fc0b0d2c..3b638afa2 100644 --- a/docSite/content/zh-cn/docs/development/upgrading/498.md +++ b/docSite/content/zh-cn/docs/development/upgrading/498.md @@ -17,7 +17,10 @@ weight: 792 ## ⚙️ 优化 1. Chat log list 优化,避免大数据时超出内存限制。 +2. 预加载 token 计算 worker,避免主任务中并发创建导致线程阻塞。 ## 🐛 修复 +1. 应用列表/知识库列表,删除行权限展示问题。 +2. 打开知识库搜索参数后,重排选项自动被打开。 diff --git a/env.d.ts b/env.d.ts index 1430a3a44..1eb9a5770 100644 --- a/env.d.ts +++ b/env.d.ts @@ -35,6 +35,7 @@ declare global { ALLOWED_ORIGINS?: string; SHOW_COUPON?: string; CONFIG_JSON_PATH?: string; + PASSWORD_LOGIN_LOCK_SECONDS?: string; } } } diff --git a/packages/global/core/dataset/constants.ts b/packages/global/core/dataset/constants.ts index 4ec67db14..1f50aadf5 100644 --- a/packages/global/core/dataset/constants.ts +++ b/packages/global/core/dataset/constants.ts @@ -19,32 +19,32 @@ export const DatasetTypeMap = { [DatasetTypeEnum.dataset]: { icon: 'core/dataset/commonDatasetOutline', label: i18nT('dataset:common_dataset'), - collectionLabel: i18nT('common:common.File') + collectionLabel: i18nT('common:File') }, [DatasetTypeEnum.websiteDataset]: { icon: 'core/dataset/websiteDatasetOutline', label: i18nT('dataset:website_dataset'), - collectionLabel: i18nT('common:common.Website') + collectionLabel: i18nT('common:Website') }, [DatasetTypeEnum.externalFile]: { icon: 'core/dataset/externalDatasetOutline', label: i18nT('dataset:external_file'), - collectionLabel: i18nT('common:common.File') + collectionLabel: i18nT('common:File') }, [DatasetTypeEnum.apiDataset]: { icon: 'core/dataset/externalDatasetOutline', label: i18nT('dataset:api_file'), - collectionLabel: i18nT('common:common.File') + collectionLabel: i18nT('common:File') }, [DatasetTypeEnum.feishu]: { icon: 'core/dataset/feishuDatasetOutline', label: i18nT('dataset:feishu_dataset'), - collectionLabel: i18nT('common:common.File') + collectionLabel: i18nT('common:File') }, [DatasetTypeEnum.yuque]: { icon: 'core/dataset/yuqueDatasetOutline', label: i18nT('dataset:yuque_dataset'), - collectionLabel: i18nT('common:common.File') + collectionLabel: i18nT('common:File') } }; diff --git a/packages/service/core/workflow/dispatch/dataset/concat.ts b/packages/service/core/workflow/dispatch/dataset/concat.ts index 0177ca8c8..fe8d58fbb 100644 --- a/packages/service/core/workflow/dispatch/dataset/concat.ts +++ b/packages/service/core/workflow/dispatch/dataset/concat.ts @@ -21,7 +21,7 @@ export async function dispatchDatasetConcat( props: DatasetConcatProps ): Promise { const { - params: { limit = 6000, ...quoteMap } + params: { limit = 5000, ...quoteMap } } = props as DatasetConcatProps; const quoteList = Object.values(quoteMap).filter((list) => Array.isArray(list)); diff --git a/packages/web/components/common/DateRangePicker/index.tsx b/packages/web/components/common/DateRangePicker/index.tsx index f62766dde..52e5caff0 100644 --- a/packages/web/components/common/DateRangePicker/index.tsx +++ b/packages/web/components/common/DateRangePicker/index.tsx @@ -118,7 +118,7 @@ const DateRangePicker = ({ mr={2} onClick={() => setShowSelected(false)} > - {t('common:common.Close')} + {t('common:Close')} } diff --git a/packages/web/components/common/EmptyTip/index.tsx b/packages/web/components/common/EmptyTip/index.tsx index e8f450281..043e02561 100644 --- a/packages/web/components/common/EmptyTip/index.tsx +++ b/packages/web/components/common/EmptyTip/index.tsx @@ -14,7 +14,7 @@ const EmptyTip = ({ text, iconSize = '48px', ...props }: Props) => { - {text || t('common:common.empty.Common Tip')} + {text || t('common:no_more_data')} ); diff --git a/packages/web/components/common/MyModal/EditFolderModal.tsx b/packages/web/components/common/MyModal/EditFolderModal.tsx index 4647066c6..58f404c97 100644 --- a/packages/web/components/common/MyModal/EditFolderModal.tsx +++ b/packages/web/components/common/MyModal/EditFolderModal.tsx @@ -67,7 +67,7 @@ const EditFolderModal = ({ - {t('common:common.Input name')} + {t('common:input_name')} - {t('common:common.Input folder description')} + {t('common:folder_description')}