@nocobase/client 2.0.0-beta.5 → 2.0.0-beta.6

package/es/application/RouteRepository.d.ts

@@ -0,0 +1,23 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+type RouteOptions = {
+    id: string;
+    schemaUid: string;
+    children?: RouteOptions[];
+};
+export declare class RouteRepository {
+    protected ctx: any;
+    routes: Array<RouteOptions>;
+    constructor(ctx: any);
+    setRoutes(routes: Array<any>): void;
+    listAccessible(): RouteOptions[];
+    getRouteBySchemaUid(schemaUid: string): RouteOptions | undefined;
+    private findRoute;
+}
+export {};

package/es/index.mjs

@@ -106,7 +106,7 @@ import { evaluators } from "@nocobase/evaluators/client";
 import * as formilyAntdV5 from "@formily/antd-v5";
 import { FormLayout, ArrayCollapse as ArrayCollapse$2, ArrayItems, ArrayBase, TreeSelect as TreeSelect$1, Input as Input$4, FormItem as FormItem$1, useFormLayout, ArrayTable, NumberPicker, Select as Select$2, FormButtonGroup, Upload as Upload$2 } from "@formily/antd-v5";
 import * as nocobaseFlowEngine from "@nocobase/flow-engine";
-import { observer, useFlowEngine, createCollectionContextMeta, FlowEngine, FlowEngineProvider, FlowEngineGlobalsContextProvider, useFlowEngineContext, useFlowContext, FlowContextSelector, defineAction, tExpr, useFlowViewContext, parseValueToPath, VariableInput as VariableInput$1, createEphemeralContext, useFlowSettingsContext, pruneFilter, FlowModel, observable as observable$1, defineFlow, useFlowModelById, FlowModelRenderer, reaction as reaction$1, parsePathnameToViewParams, ViewNavigation, useFlowModel, buildSubModelItems, buildSubModelItem, DisplayItemModel, FilterItem as FilterItem$2, FilterGroup as FilterGroup$3, EMPTY_COLUMN_UID, DragHandler as DragHandler$1, findModelUidPosition, buildLayoutSnapshot, getSlotKey, simulateLayoutForSlot, resolveDropIntent, DndProvider, Droppable, MemoFlowModelRenderer, AddSubModelButton, FlowSettingsButton, setupRunJSContexts, getRunJSDocFor, listSnippetsForContext, FlowRunJSContext, compileRunJs, JSRunner, createSafeNavigator, createSafeWindow, createSafeDocument, getRunJSScenesForContext, getPageActive, MobilePopup, SingleRecordResource, MultiRecordResource, escapeT, createAssociationAwareObjectMetaFactory, createAssociationSubpathResolver, createCurrentRecordMetaFactory, createRecordResolveOnServerWithLocal, EditableItemModel, FormItem as FormItem$2, FieldModelRenderer, isVariableExpression, ModelRenderMode, buildWrapperFieldChildren, FilterableItemModel, FlowModelContext, ElementProxy, FlowsFloatContextMenu, FlowModelProvider, FlowErrorFallback, createRecordMetaFactory, autorun as autorun$1, useFlowModelContext, largeField, ActionScene, jioToJoiSchema, FlowRuntimeContext, extractPropertyPath, VariableTag, FlowStepContext, untracked as untracked$1, isBeforeRenderFlow } from "@nocobase/flow-engine";
+import { observer, useFlowEngine, createCollectionContextMeta, useFlowEngineContext, FlowEngine, FlowEngineProvider, FlowEngineGlobalsContextProvider, useFlowContext, FlowContextSelector, defineAction, tExpr, useFlowViewContext, parseValueToPath, VariableInput as VariableInput$1, createEphemeralContext, useFlowSettingsContext, pruneFilter, FlowModel, observable as observable$1, defineFlow, useFlowModelById, FlowModelRenderer, reaction as reaction$1, parsePathnameToViewParams, ViewNavigation, useFlowModel, buildSubModelItems, buildSubModelItem, DisplayItemModel, FilterItem as FilterItem$2, FilterGroup as FilterGroup$3, EMPTY_COLUMN_UID, DragHandler as DragHandler$1, findModelUidPosition, buildLayoutSnapshot, getSlotKey, simulateLayoutForSlot, resolveDropIntent, DndProvider, Droppable, MemoFlowModelRenderer, AddSubModelButton, FlowSettingsButton, setupRunJSContexts, getRunJSDocFor, listSnippetsForContext, FlowRunJSContext, compileRunJs, JSRunner, createSafeNavigator, createSafeWindow, createSafeDocument, getRunJSScenesForContext, getPageActive, MobilePopup, SingleRecordResource, MultiRecordResource, escapeT, createAssociationAwareObjectMetaFactory, createAssociationSubpathResolver, createCurrentRecordMetaFactory, createRecordResolveOnServerWithLocal, EditableItemModel, FormItem as FormItem$2, FieldModelRenderer, isVariableExpression, ModelRenderMode, buildWrapperFieldChildren, FilterableItemModel, FlowModelContext, ElementProxy, FlowsFloatContextMenu, FlowModelProvider, FlowErrorFallback, createRecordMetaFactory, autorun as autorun$1, useFlowModelContext, largeField, ActionScene, jioToJoiSchema, FlowRuntimeContext, extractPropertyPath, VariableTag, FlowStepContext, untracked as untracked$1, isBeforeRenderFlow } from "@nocobase/flow-engine";
 import { FieldModelRenderer as on } from "@nocobase/flow-engine";
 import ignore from "ignore";
 import cronstrue from "cronstrue";
@@ -9682,7 +9682,7 @@ function addAppVersion(e, t) {
       addAppVersion((n = e.properties) == null ? void 0 : n[o], t);
     }), e;
 }
-const name = "@nocobase/client", version = "2.0.0-beta.5", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
+const name = "@nocobase/client", version = "2.0.0-beta.6", license = "AGPL-3.0", main = "lib/index.js", module = "es/index.mjs", types = "es/index.d.ts", dependencies = {
   "@ahooksjs/use-url-state": "3.5.1",
   "@ant-design/cssinjs": "^1.11.1",
   "@ant-design/icons": "^5.6.1",
@@ -9705,10 +9705,10 @@ const name = "@nocobase/client", version = "2.0.0-beta.5", license = "AGPL-3.0",
   "@formily/reactive-react": "^2.2.27",
   "@formily/shared": "^2.2.27",
   "@formily/validator": "^2.2.27",
-  "@nocobase/evaluators": "2.0.0-beta.5",
-  "@nocobase/flow-engine": "2.0.0-beta.5",
-  "@nocobase/sdk": "2.0.0-beta.5",
-  "@nocobase/utils": "2.0.0-beta.5",
+  "@nocobase/evaluators": "2.0.0-beta.6",
+  "@nocobase/flow-engine": "2.0.0-beta.6",
+  "@nocobase/sdk": "2.0.0-beta.6",
+  "@nocobase/utils": "2.0.0-beta.6",
   "@tanstack/react-table": "^8.21.3",
   "@types/tabulator-tables": "^6.2.6",
   "acorn-jsx": "^5.3.2",
@@ -26096,14 +26096,21 @@ const CurrentRouteProvider = memo(({ children: e, uid: t }) => {
 });
 AllAccessDesktopRoutesContext.displayName = "AllAccessDesktopRoutesContext";
 const useAllAccessDesktopRoutes = () => useContext(AllAccessDesktopRoutesContext), RoutesRequestProvider = ({ children: e }) => {
-  const t = useRef(!1), { data: o, refresh: n, loading: r } = useRequest({
-    url: "/desktopRoutes:listAccessible",
-    params: { tree: !0, sort: "sort" }
-  }), i = useMemo(() => ({
-    allAccessRoutes: (o == null ? void 0 : o.data) || emptyArray,
-    refresh: n
-  }), [o == null ? void 0 : o.data, n]);
-  return r && !t.current ? null : (t.current = !0, /* @__PURE__ */ jsx(AllAccessDesktopRoutesContext.Provider, { value: i, children: e }));
+  const t = useFlowEngineContext(), o = useRef(!1), { data: n, refresh: r, loading: i } = useRequest(
+    {
+      url: "/desktopRoutes:listAccessible",
+      params: { tree: !0, sort: "sort" }
+    },
+    {
+      onSuccess(l) {
+        t.routeRepository.setRoutes((l == null ? void 0 : l.data) || emptyArray);
+      }
+    }
+  ), a = useMemo(() => ({
+    allAccessRoutes: (n == null ? void 0 : n.data) || emptyArray,
+    refresh: r
+  }), [n == null ? void 0 : n.data, r]);
+  return i && !o.current ? null : (o.current = !0, /* @__PURE__ */ jsx(AllAccessDesktopRoutesContext.Provider, { value: a, children: e }));
 }, noAccessPermission = (e, t) => e ? !findRouteBySchemaUid(e, t) : !1, AdminDynamicPage = () => {
   const e = useCurrentPageUid(), { allAccessRoutes: t } = useAllAccessDesktopRoutes();
   return isGroup(e, t) ? null : noAccessPermission(e, t) ? /* @__PURE__ */ jsx(AppNotFound, {}) : /* @__PURE__ */ jsx(KeepAlive, { uid: e, children: (o) => /* @__PURE__ */ jsx(CurrentPageUidContext.Provider, { value: o, children: /* @__PURE__ */ jsx(CurrentRouteProvider, { uid: o, children: /* @__PURE__ */ jsx(RemoteSchemaComponent, { uid: o }) }) }) });
@@ -29123,6 +29130,32 @@ function parseDate(e) {
   let t = Array.isArray(e) ? (o = e[1]) != null ? o : e[0] : e;
   return /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/.test(t) ? new Date(t) : /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(t) ? new Date(t.replace(" ", "T")) : /^\d{4}-\d{2}-\d{2}$/.test(t) ? parseFullDate(t) : /^\d{4}-\d{2}$/.test(t) ? parseMonth(t) : /^\d{4}Q[1-4]$/.test(t) ? parseQuarter(t) : /^\d{4}$/.test(t) ? parseYear(t) : null;
 }
+class RouteRepository {
+  constructor(t) {
+    I(this, "routes", []);
+    this.ctx = t;
+  }
+  setRoutes(t) {
+    this.routes = t;
+  }
+  listAccessible() {
+    return this.routes;
+  }
+  getRouteBySchemaUid(t) {
+    return this.findRoute(this.routes, t);
+  }
+  findRoute(t, o) {
+    for (const n of t) {
+      if (n.schemaUid === o)
+        return n;
+      if (n.children) {
+        const r = this.findRoute(n.children, o);
+        if (r)
+          return r;
+      }
+    }
+  }
+}
 class Application {
   constructor(t = {}) {
     I(this, "eventBus", new EventTarget());
@@ -29234,6 +29267,8 @@ class Application {
       scope: this.scopes
     }), this.use(AntdAppProvider), this.use(DataSourceApplicationProvider, { dataSourceManager: this.dataSourceManager }), this.use(OpenModeProvider), this.flowEngine.context.defineProperty("app", {
       value: this
+    }), this.flowEngine.context.defineProperty("routeRepository", {
+      value: new RouteRepository(this.flowEngine.context)
     }), this.flowEngine.context.defineProperty("appInfo", {
       get: () => N(this, null, function* () {
         var n;
@@ -32680,7 +32715,8 @@ const DragHandler = (e) => {
     const S = {
       name: "$nForm",
       ctx: x,
-      collectionName: e
+      collectionName: e,
+      dataSource: m.current.dataSourceKey
     }, F = `{{ $nForm.${p} }}`;
     if (C == null)
       return;
@@ -71297,45 +71333,36 @@ RootPageModel.registerFlow({
     init: {
       handler(e, t) {
         return N(this, null, function* () {
-          var r, i, a;
+          var r;
           if (e.model.hasSubModel("tabs"))
             return;
-          const { data: o } = yield e.api.request({
-            url: "desktopRoutes:getAccessible",
-            params: {
-              sort: "sort",
-              filter: {
-                schemaUid: e.model.parentId
-              },
-              appends: ["children"]
-            }
-          });
-          e.model.setProps("routeId", (r = o == null ? void 0 : o.data) == null ? void 0 : r.id);
-          const n = _.castArray((i = o == null ? void 0 : o.data) == null ? void 0 : i.children);
-          for (const l of n.sort((c, u) => c.sort - u.sort)) {
-            if (l.hideInMenu)
+          const o = e.routeRepository.getRouteBySchemaUid(e.model.parentId);
+          e.model.setProps("routeId", o == null ? void 0 : o.id);
+          const n = _.castArray(o == null ? void 0 : o.children);
+          for (const i of n.sort((a, l) => a.sort - l.sort)) {
+            if (i.hideInMenu)
               continue;
-            const c = e.engine.createModel({
+            const a = e.engine.createModel({
               parentId: e.model.uid,
-              uid: l.schemaUid,
+              uid: i.schemaUid,
               subKey: "tabs",
               subType: "array",
               use: "RootPageTabModel",
-              sortIndex: l.sort,
+              sortIndex: i.sort,
               props: {
-                route: l
+                route: i
               },
-              flowRegistry: (a = l.options) == null ? void 0 : a.flowRegistry,
+              flowRegistry: (r = i.options) == null ? void 0 : r.flowRegistry,
               stepParams: {
                 pageTabSettings: {
                   tab: {
-                    title: l.title,
-                    icon: l.icon
+                    title: i.title,
+                    icon: i.icon
                   }
                 }
               }
             });
-            e.model.addSubModel("tabs", c);
+            e.model.addSubModel("tabs", a);
           }
         });
       }