perf: load members；perf: yuque load；fix: workflow llm params cannot c…

…lose (#3594) * chat openapi doc * feat: dataset openapi doc * perf: load members * perf: member load code * perf: yuque load * fix: workflow llm params cannot close
labring · Jan 15, 2025 · 80e6706 · 80e6706
1 parent 68f5afe
commit 80e6706
Show file tree

Hide file tree

Showing 31 changed files with 346 additions and 318 deletions.
diff --git a/docSite/content/zh-cn/docs/development/openapi/chat.md b/docSite/content/zh-cn/docs/development/openapi/chat.md
@@ -686,7 +686,7 @@ curl --location --request POST 'http://localhost:3000/api/core/chat/getHistories
 - appId - 应用 Id
 - offset - 偏移量，即从第几条数据开始取
 - pageSize - 记录数量
-- source - 对话源
+- source - 对话源。source=api，表示获取通过 API 创建的对话（不会获取到页面上的对话记录）
 {{% /alert %}}
 
 {{< /markdownify >}}

diff --git a/docSite/content/zh-cn/docs/development/openapi/dataset.md b/docSite/content/zh-cn/docs/development/openapi/dataset.md
@@ -733,6 +733,21 @@ data 为集合的 ID。
 {{< tab tabName="请求示例" >}}
 {{< markdownify >}}
 
+**4.8.19+**
+```bash
+curl --location --request POST 'http://localhost:3000/api/core/dataset/collection/listv2' \
+--header 'Authorization: Bearer {{authorization}}' \
+--header 'Content-Type: application/json' \
+--data-raw '{
+    "offset":0,
+    "pageSize": 10,
+    "datasetId":"6593e137231a2be9c5603ba7",
+    "parentId": null,
+    "searchText":""
+}'
+```
+
+**4.8.19-(不再维护)**
 ```bash
 curl --location --request POST 'http://localhost:3000/api/core/dataset/collection/list' \
 --header 'Authorization: Bearer {{authorization}}' \
@@ -753,7 +768,7 @@ curl --location --request POST 'http://localhost:3000/api/core/dataset/collectio
 {{< markdownify >}}
 
 {{% alert icon=" " context="success" %}}
-- pageNum: 页码（选填）
+- offset: 偏移量
 - pageSize: 每页数量，最大30（选填）
 - datasetId: 知识库的ID(必填)
 - parentId: 父级Id（选填）
@@ -773,9 +788,7 @@ curl --location --request POST 'http://localhost:3000/api/core/dataset/collectio
     "statusText": "",
     "message": "",
     "data": {
-        "pageNum": 1,
-        "pageSize": 10,
-        "data": [
+        "list": [
             {
                 "_id": "6593e137231a2be9c5603ba9",
                 "parentId": null,

diff --git a/docSite/content/zh-cn/docs/development/upgrading/4819.md b/docSite/content/zh-cn/docs/development/upgrading/4819.md
@@ -10,4 +10,8 @@ weight: 806
 
 ## 完整更新内容
 
-1. 新增 - 工作流知识库检索支持按知识库权限进行过滤
+1. 新增 - 工作流知识库检索支持按知识库权限进行过滤。
+2. 优化 - 成员列表分页加载。
+3. 优化 - 统一分页加载代码。
+4. 修复 - 语雀文件库导入时，嵌套文件内容无法展开的问题。
+5. 修复 - 工作流编排中，LLM 参数无法关闭问题。
diff --git a/packages/global/core/dataset/apiDataset.d.ts b/packages/global/core/dataset/apiDataset.d.ts
@@ -5,7 +5,7 @@ export type APIFileItem = {
   type: 'file' | 'folder';
   updateTime: Date;
   createTime: Date;
-  canEnter?: boolean;
+  hasChild?: boolean;
 };
 
 export type APIFileServer = {

diff --git a/packages/global/support/user/team/org/type.d.ts b/packages/global/support/user/team/org/type.d.ts
@@ -13,13 +13,14 @@ type OrgSchemaType = {
 };
 
 type OrgMemberSchemaType = {
+  _id: string;
   teamId: string;
   orgId: string;
   tmbId: string;
 };
 
 type OrgType = Omit<OrgSchemaType, 'avatar'> & {
   avatar: string;
-  members: OrgMemberSchemaType[];
   permission: TeamPermission;
+  members: OrgMemberSchemaType[];
 };
diff --git a/packages/service/core/dataset/apiDataset/api.ts b/packages/service/core/dataset/apiDataset/api.ts
@@ -102,7 +102,7 @@ export const useApiDatasetRequest = ({ apiServer }: { apiServer: APIFileServer }
 
     const formattedFiles = files.map((file) => ({
       ...file,
-      canEnter: file.type === 'folder'
+      hasChild: file.type === 'folder'
     }));
 
     return formattedFiles;

diff --git a/packages/service/support/permission/org/orgSchema.ts b/packages/service/support/permission/org/orgSchema.ts
@@ -47,14 +47,11 @@ export const OrgSchema = new Schema(
 OrgSchema.virtual('members', {
   ref: OrgMemberCollectionName,
   localField: '_id',
-  foreignField: 'orgId'
+  foreignField: 'orgId',
+  match: function (this: OrgSchemaType) {
+    return { teamId: this.teamId };
+  }
 });
-// OrgSchema.virtual('permission', {
-//   ref: ResourcePermissionCollectionName,
-//   localField: '_id',
-//   foreignField: 'orgId',
-//   justOne: true
-// });
 
 try {
   OrgSchema.index({

diff --git a/packages/web/components/common/Avatar/AvatarGroup.tsx b/packages/web/components/common/Avatar/AvatarGroup.tsx
@@ -23,7 +23,7 @@ function AvatarGroup({
     <Flex position="relative">
       {avatars.slice(0, max).map((avatar, index) => (
         <Avatar
-          key={avatar + groupId}
+          key={index}
           src={avatar}
           position={index > 0 ? 'absolute' : 'relative'}
           left={index > 0 ? `${index * 15}px` : 0}

diff --git a/packages/web/hooks/useScrollPagination.tsx b/packages/web/hooks/useScrollPagination.tsx
@@ -16,7 +16,7 @@ import MyBox from '../components/common/MyBox';
 import { useTranslation } from 'next-i18next';
 
 type ItemHeight<T> = (index: number, data: T) => number;
-const thresholdVal = 200;
+const thresholdVal = 100;
 
 export type ScrollListType = ({
   children,

diff --git a/projects/app/package.json b/projects/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "app",
-  "version": "4.8.18",
+  "version": "4.8.19",
   "private": false,
   "scripts": {
     "dev": "next dev",