@nocobase/client-v2 2.3.0-alpha.1 → 3.0.0-alpha.1

package/src/flow/models/base/CollectionBlockModel.tsx

@@ -569,9 +569,13 @@ export class CollectionBlockModel<T = DefaultStructure> extends DataBlockModel<T
     }
     if (fieldPath.includes('.')) {
       // 关系数据
+      const collection = this.collection;
+      if (!collection) {
+        return;
+      }
       const [field1, field2] = fieldPath.split('.');
       const associationField = this.context.dataSourceManager.getCollectionField(
-        `${this.collection.dataSourceKey}.${this.collection.name}.${field1}`,
+        `${collection.dataSourceKey}.${collection.name}.${field1}`,
       ) as CollectionField;
       if (!associationField) {
         return;
@@ -583,7 +587,7 @@ export class CollectionBlockModel<T = DefaultStructure> extends DataBlockModel<T
       }
 
       const collectionField = this.context.dataSourceManager.getCollectionField(
-        `${this.collection.dataSourceKey}.${targetCollectionName}.${field2}`,
+        `${collection.dataSourceKey}.${targetCollectionName}.${field2}`,
       ) as CollectionField;
 
       if (collectionField && collectionField.isAssociationField()) {

package/src/flow/models/base/PageModel/PageTabModel.tsx

@@ -9,6 +9,7 @@
 
 import { FlowModel, FlowModelRenderer, observable, type ParamObject, tExpr } from '@nocobase/flow-engine';
 import { Icon, type NocoBaseDesktopRoute } from '../../../../flow-compat';
+import type { RouteRepository } from '../../../../RouteRepository';
 import { useRequest } from 'ahooks';
 import _ from 'lodash';
 import React from 'react';
@@ -71,6 +72,25 @@ function isLinkageRulesStepParams(value: unknown): value is LinkageRulesStepPara
   return isRecord(value);
 }
 
+type RefreshableRouteRepository = Pick<RouteRepository, 'refreshAccessible'>;
+
+const routeRefreshQueues = new WeakMap<RefreshableRouteRepository, Promise<unknown>>();
+
+async function refreshRouteRepository(repository: RefreshableRouteRepository) {
+  const previous = routeRefreshQueues.get(repository) || Promise.resolve();
+  const current = previous.catch(() => undefined).then(() => repository.refreshAccessible());
+
+  routeRefreshQueues.set(repository, current);
+
+  try {
+    await current;
+  } finally {
+    if (routeRefreshQueues.get(repository) === current) {
+      routeRefreshQueues.delete(repository);
+    }
+  }
+}
+
 export class BasePageTabModel extends FlowModel<{
   subModels: {
     grid: BlockGridModel;
@@ -282,23 +302,36 @@ export class RootPageTabModel extends BasePageTabModel {
   async save() {
     const json = this.serialize();
     const documentTitle = this.stepParams?.pageTabSettings?.tab?.documentTitle;
-    const response = await this.context.api.request({
-      method: 'post',
-      url: 'desktopRoutes:updateOrCreate',
-      params: {
-        filterKeys: ['schemaUid'],
+    const route = this.props.route || {};
+    const persisted = route.id != null;
+    const currentRoute =
+      persisted && route.schemaUid ? this.context.routeRepository?.getRouteBySchemaUid?.(route.schemaUid) : undefined;
+    const data = {
+      ...(persisted ? { schemaUid: route.schemaUid } : route),
+      title: this.getTabTitle(''),
+      icon: this.getTabIcon(),
+      options: {
+        ...(currentRoute ? currentRoute.options : route.options),
+        flowRegistry: json.flowRegistry,
+        documentTitle,
       },
-      data: {
-        ...this.props.route,
-        title: this.getTabTitle(''),
-        icon: this.getTabIcon(),
-        options: {
-          ...(this.props.route?.options || {}),
-          flowRegistry: json.flowRegistry,
-          documentTitle,
-        },
-      },
-    });
+    };
+    const response = await this.context.api.request(
+      persisted
+        ? {
+            method: 'post',
+            url: `desktopRoutes:update?filter[id]=${route.id}`,
+            data,
+          }
+        : {
+            method: 'post',
+            url: 'desktopRoutes:updateOrCreate',
+            params: {
+              filterKeys: ['schemaUid'],
+            },
+            data,
+          },
+    );
     const persistedRoute = normalizePersistedRoute(response?.data?.data);
 
     // 新建 tab 首次保存后需要立即拿到持久化 route id，拖拽排序会直接依赖它。
@@ -312,6 +345,20 @@ export class RootPageTabModel extends BasePageTabModel {
         },
       });
     }
+
+    // 后续保存会从 RouteRepository 读取扩展 options，当前写入完成后必须先同步最新路由快照。
+    try {
+      if (this.context.routeRepository?.refreshAccessible) {
+        await refreshRouteRepository(this.context.routeRepository);
+      } else {
+        await this.context.refreshDesktopRoutes?.();
+      }
+    } catch (error) {
+      this.context.logger?.warn?.(
+        { err: error },
+        '[client-v2] Failed to refresh desktop routes after saving a page tab',
+      );
+    }
   }
 
   private buildAnchorPayload(latestAnchor: PersistedFlowModelAnchor | undefined, linkageRules: LinkageRulesStepParams) {
@@ -359,8 +406,11 @@ export class RootPageTabModel extends BasePageTabModel {
       throw new Error('Route repository is unavailable while persisting the page tab FlowModel marker.');
     }
 
+    const currentRoute = route.schemaUid
+      ? this.context.routeRepository.getRouteBySchemaUid?.(route.schemaUid)
+      : undefined;
     const nextOptions = {
-      ...(route.options || {}),
+      ...(currentRoute?.options || route.options || {}),
     };
     if (hasRules) {
       nextOptions.hasPersistedPageTabFlowModel = true;