@nocobase/client 0.15.0-alpha.1 → 0.15.0-alpha.2

package/es/application/PluginSettingsManager.d.ts

@@ -5,14 +5,16 @@ export declare const ADMIN_SETTINGS_PATH = "/admin/settings/";
 export declare const SNIPPET_PREFIX = "pm.";
 export interface PluginSettingsManagerSettingOptionsType {
     title: string;
-    Component: RouteType['Component'];
+    /**
+     * @default Outlet
+     */
+    Component?: RouteType['Component'];
     icon?: string;
     /**
      * sort, the smaller the number, the higher the priority
      * @default 0
      */
     sort?: number;
-    isBookmark?: boolean;
     aclSnippet?: string;
     [index: string]: any;
 }
@@ -24,8 +26,9 @@ export interface PluginSettingsPageType {
     path: string;
     sort?: number;
     name?: string;
-    pluginName?: string;
-    isBookmark?: boolean;
+    isAllow?: boolean;
+    topLevelName?: string;
+    aclSnippet: string;
     children?: PluginSettingsPageType[];
     [index: string]: any;
 }

package/es/index.mjs

@@ -77,7 +77,7 @@ import * as formilyReact from "@formily/react";
 import { useForm, observer, useField, useFieldSchema, Schema, RecursionField, connect, mapProps, SchemaOptionsContext, SchemaComponentsContext, ExpressionScope, SchemaExpressionScopeContext, FormProvider as FormProvider$1, FormContext, FieldContext, ObjectField, ArrayField, Observer, mapReadPretty, useFormEffects, createSchemaField, SchemaContext } from "@formily/react";
 import React, { createContext, useContext, useState, useMemo, useCallback, useRef, useEffect, createElement, Fragment as Fragment$1, isValidElement, useTransition, forwardRef, useImperativeHandle, createRef, memo, useLayoutEffect } from "react";
 import * as ReactRouterDom from "react-router-dom";
-import { useNavigate, useParams, useLocation, Router, UNSAFE_RouteContext, UNSAFE_LocationContext, useRoutes, HashRouter, BrowserRouter, MemoryRouter, Link as Link$1, Navigate, NavLink, useSearchParams, Outlet, useMatch } from "react-router-dom";
+import { useNavigate, useParams, useLocation, Router, UNSAFE_RouteContext, UNSAFE_LocationContext, useRoutes, HashRouter, BrowserRouter, MemoryRouter, Outlet, Link as Link$1, Navigate, NavLink, useSearchParams, useMatch } from "react-router-dom";
 import * as nocobaseSDK from "@nocobase/sdk";
 import { APIClient as APIClient$1, getSubAppName } from "@nocobase/sdk";
 import * as antd from "antd";
@@ -9016,7 +9016,7 @@ const useProps = (originalProps = {}) => {
 const useTableSize = () => {
   const [height, setTableHeight] = useState(0);
   const [width, setTableWidth] = useState(0);
-  const elementRef = useRef();
+  const elementRef = useRef(null);
   const calcTableSize = useCallback(() => {
     var _a, _b, _c;
     if (!elementRef.current)
@@ -9033,7 +9033,7 @@ const useTableSize = () => {
     setTableHeight(tableHeight - headerHeight - paginationHeight);
   }, []);
   const tableSizeRefCallback = (ref) => {
-    elementRef.current = ref;
+    elementRef.current = ref && ref.children ? ref.children[0] : null;
     calcTableSize();
   };
   useEventListener("resize", calcTableSize);
@@ -22638,6 +22638,7 @@ function RemoveButton(props = {}) {
 }
 function WorkflowSelect(_a) {
   var _b = _a, { types: types2 } = _b, props = __objRest(_b, ["types"]);
+  const { t } = useTranslation();
   const index2 = ArrayTable.useIndex();
   const { setValuesIn } = useForm();
   const baseCollection = useCollection();
@@ -22662,7 +22663,13 @@ function WorkflowSelect(_a) {
   });
   return /* @__PURE__ */ jsx(
     RemoteSelect,
-    __spreadProps(__spreadValues({}, props), {
+    __spreadValues({
+      manual: false,
+      placeholder: t("Select workflow", { ns: "workflow" }),
+      fieldNames: {
+        label: "title",
+        value: "key"
+      },
       service: {
         resource: "workflows",
         action: "list",
@@ -22674,7 +22681,7 @@ function WorkflowSelect(_a) {
           }
         }
       }
-    })
+    }, props)
   );
 }
 function WorkflowConfig() {
@@ -22766,11 +22773,6 @@ function WorkflowConfig() {
                       "x-decorator": "FormItem",
                       "x-component": "WorkflowSelect",
                       "x-component-props": {
-                        placeholder: t("Select workflow", { ns: "workflow" }),
-                        fieldNames: {
-                          label: "title",
-                          value: "key"
-                        },
                         types: workflowTypes.map((item) => item.value)
                       },
                       required: true
@@ -29385,14 +29387,14 @@ class PluginSettingsManager {
   }
   add(name, options) {
     const nameArr = name.split(".");
-    const pluginName = nameArr[0];
-    this.settings[name] = __spreadProps(__spreadValues({}, options), { name, pluginName });
+    const topLevelName = nameArr[0];
+    this.settings[name] = __spreadProps(__spreadValues({ Component: Outlet }, options), { name, topLevelName });
     if (nameArr.length > 1) {
       set$1(this.settings, nameArr.join(".children."), this.settings[name]);
     }
     this.app.router.add(this.getRouteName(name), {
       path: this.getRoutePath(name),
-      Component: options.Component
+      Component: this.settings[name].Component
     });
   }
   remove(name) {
@@ -29434,7 +29436,7 @@ class PluginSettingsManager {
     });
   }
   getList(filterAuth = true) {
-    return Object.keys(this.settings).filter((item) => !item.includes(".")).sort((a, b) => a.localeCompare(b)).map((name) => this.get(name, filterAuth)).filter(Boolean).sort((a, b) => (a.sort || 0) - (b.sort || 0));
+    return Array.from(new Set(Object.values(this.settings).map((item) => item.topLevelName))).sort((a, b) => a.localeCompare(b)).map((name) => this.get(name, filterAuth)).filter(Boolean).sort((a, b) => (a.sort || 0) - (b.sort || 0));
   }
   getAclSnippets() {
     return Object.keys(this.settings).map((name) => this.getAclSnippet(name));
@@ -63225,7 +63227,7 @@ const SettingsCenterDropdown = () => {
                 }
               )
             },
-            setting.pluginName
+            setting.name
           ))
         }
       ) }),
@@ -63353,11 +63355,11 @@ const SettingsCenterComponent = () => {
     return map;
   }, [settings]);
   const currentSetting = useMemo(() => settingsMapByPath[location2.pathname], [location2.pathname, settingsMapByPath]);
-  const currentPlugin = useMemo(() => {
+  const currentTopLevelSetting = useMemo(() => {
     if (!currentSetting) {
       return null;
     }
-    return settings.find((item) => item.name === currentSetting.pluginName);
+    return settings.find((item) => item.name === currentSetting.topLevelName);
   }, [currentSetting, settings]);
   const sidebarMenus = useMemo(() => {
     return getMenuItems(settings.map((item) => __spreadProps(__spreadValues({}, item), { children: null })));
@@ -63365,8 +63367,8 @@ const SettingsCenterComponent = () => {
   if (!currentSetting || location2.pathname === ADMIN_SETTINGS_PATH || location2.pathname === ADMIN_SETTINGS_PATH + "/") {
     return /* @__PURE__ */ jsx(Navigate, { replace: true, to: getFirstDeepChildPath(settings) });
   }
-  if (location2.pathname === currentPlugin.path && ((_a = currentPlugin.children) == null ? void 0 : _a.length) > 0) {
-    return /* @__PURE__ */ jsx(Navigate, { replace: true, to: getFirstDeepChildPath(currentPlugin.children) });
+  if (location2.pathname === currentTopLevelSetting.path && ((_a = currentTopLevelSetting.children) == null ? void 0 : _a.length) > 0) {
+    return /* @__PURE__ */ jsx(Navigate, { replace: true, to: getFirstDeepChildPath(currentTopLevelSetting.children) });
   }
   return /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsxs(Layout, { children: [
     /* @__PURE__ */ jsx(
@@ -63389,7 +63391,7 @@ const SettingsCenterComponent = () => {
         children: /* @__PURE__ */ jsx(
           Menu$1,
           {
-            selectedKeys: [currentSetting == null ? void 0 : currentSetting.pluginName],
+            selectedKeys: [currentSetting == null ? void 0 : currentSetting.topLevelName],
             style: { height: "calc(100vh - 46px)", overflowY: "auto", overflowX: "hidden" },
             onClick: ({ key }) => {
               var _a2;
@@ -63411,11 +63413,11 @@ const SettingsCenterComponent = () => {
         {
           className: styles.pageHeader,
           style: {
-            paddingBottom: ((_b = currentPlugin.children) == null ? void 0 : _b.length) > 0 ? 0 : theme2.paddingSM
+            paddingBottom: ((_b = currentTopLevelSetting.children) == null ? void 0 : _b.length) > 0 ? 0 : theme2.paddingSM
           },
           ghost: false,
-          title: currentPlugin.title,
-          footer: ((_c = currentPlugin.children) == null ? void 0 : _c.length) > 0 && /* @__PURE__ */ jsx(
+          title: currentTopLevelSetting.title,
+          footer: ((_c = currentTopLevelSetting.children) == null ? void 0 : _c.length) > 0 && /* @__PURE__ */ jsx(
             Menu$1,
             {
               style: { marginLeft: -theme2.margin },
@@ -63424,7 +63426,7 @@ const SettingsCenterComponent = () => {
               },
               selectedKeys: [currentSetting == null ? void 0 : currentSetting.name],
               mode: "horizontal",
-              items: getMenuItems(currentPlugin.children)
+              items: getMenuItems(currentTopLevelSetting.children)
             }
           )
         }
@@ -64380,28 +64382,23 @@ class PMPlugin extends Plugin {
       title: '{{t("ACL")}}',
       icon: "LockOutlined",
       Component: ACLPane,
-      aclSnippet: "pm.acl.roles",
-      isBookmark: true
+      aclSnippet: "pm.acl.roles"
     });
     this.app.pluginSettingsManager.add("ui-schema-storage", {
       title: '{{t("Block templates")}}',
       icon: "LayoutOutlined",
       Component: BlockTemplatesPane,
-      isBookmark: true,
       aclSnippet: "pm.ui-schema-storage.block-templates"
     });
     this.app.pluginSettingsManager.add("system-settings", {
       icon: "SettingOutlined",
       title: '{{t("System settings")}}',
       Component: SystemSettingsPane,
-      isBookmark: true,
       aclSnippet: "pm.system-settings.system-settings"
     });
     this.app.pluginSettingsManager.add("collection-manager", {
       icon: "DatabaseOutlined",
-      title: '{{t("Collection manager")}}',
-      Component: () => /* @__PURE__ */ jsx(Outlet, {}),
-      isBookmark: true
+      title: '{{t("Collection manager")}}'
     });
     this.app.pluginSettingsManager.add("collection-manager.collections", {
       title: '{{t("Collections & Fields")}}',

package/lib/index.js

@@ -9666,7 +9666,7 @@ const useProps = (originalProps = {}) => {
 const useTableSize = () => {
   const [height, setTableHeight] = (0, import_react2.useState)(0);
   const [width, setTableWidth] = (0, import_react2.useState)(0);
-  const elementRef = (0, import_react2.useRef)();
+  const elementRef = (0, import_react2.useRef)(null);
   const calcTableSize = (0, import_react2.useCallback)(() => {
     var _a, _b, _c;
     if (!elementRef.current)
@@ -9683,7 +9683,7 @@ const useTableSize = () => {
     setTableHeight(tableHeight - headerHeight - paginationHeight);
   }, []);
   const tableSizeRefCallback = (ref) => {
-    elementRef.current = ref;
+    elementRef.current = ref && ref.children ? ref.children[0] : null;
     calcTableSize();
   };
   (0, import_ahooks.useEventListener)("resize", calcTableSize);
@@ -23288,6 +23288,7 @@ function RemoveButton(props = {}) {
 }
 function WorkflowSelect(_a) {
   var _b = _a, { types: types2 } = _b, props = __objRest(_b, ["types"]);
+  const { t } = (0, import_react_i18next.useTranslation)();
   const index2 = import_antd_v5.ArrayTable.useIndex();
   const { setValuesIn } = (0, import_react.useForm)();
   const baseCollection = useCollection();
@@ -23312,7 +23313,13 @@ function WorkflowSelect(_a) {
   });
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
     RemoteSelect,
-    __spreadProps(__spreadValues({}, props), {
+    __spreadValues({
+      manual: false,
+      placeholder: t("Select workflow", { ns: "workflow" }),
+      fieldNames: {
+        label: "title",
+        value: "key"
+      },
       service: {
         resource: "workflows",
         action: "list",
@@ -23324,7 +23331,7 @@ function WorkflowSelect(_a) {
           }
         }
       }
-    })
+    }, props)
   );
 }
 function WorkflowConfig() {
@@ -23416,11 +23423,6 @@ function WorkflowConfig() {
                       "x-decorator": "FormItem",
                       "x-component": "WorkflowSelect",
                       "x-component-props": {
-                        placeholder: t("Select workflow", { ns: "workflow" }),
-                        fieldNames: {
-                          label: "title",
-                          value: "key"
-                        },
                         types: workflowTypes.map((item) => item.value)
                       },
                       required: true
@@ -30035,14 +30037,14 @@ class PluginSettingsManager {
   }
   add(name, options) {
     const nameArr = name.split(".");
-    const pluginName = nameArr[0];
-    this.settings[name] = __spreadProps(__spreadValues({}, options), { name, pluginName });
+    const topLevelName = nameArr[0];
+    this.settings[name] = __spreadProps(__spreadValues({ Component: import_react_router_dom.Outlet }, options), { name, topLevelName });
     if (nameArr.length > 1) {
       (0, import_lodash.set)(this.settings, nameArr.join(".children."), this.settings[name]);
     }
     this.app.router.add(this.getRouteName(name), {
       path: this.getRoutePath(name),
-      Component: options.Component
+      Component: this.settings[name].Component
     });
   }
   remove(name) {
@@ -30084,7 +30086,7 @@ class PluginSettingsManager {
     });
   }
   getList(filterAuth = true) {
-    return Object.keys(this.settings).filter((item) => !item.includes(".")).sort((a, b) => a.localeCompare(b)).map((name) => this.get(name, filterAuth)).filter(Boolean).sort((a, b) => (a.sort || 0) - (b.sort || 0));
+    return Array.from(new Set(Object.values(this.settings).map((item) => item.topLevelName))).sort((a, b) => a.localeCompare(b)).map((name) => this.get(name, filterAuth)).filter(Boolean).sort((a, b) => (a.sort || 0) - (b.sort || 0));
   }
   getAclSnippets() {
     return Object.keys(this.settings).map((name) => this.getAclSnippet(name));
@@ -63874,7 +63876,7 @@ const SettingsCenterDropdown = () => {
                 }
               )
             },
-            setting.pluginName
+            setting.name
           ))
         }
       ) }),
@@ -64002,11 +64004,11 @@ const SettingsCenterComponent = () => {
     return map;
   }, [settings]);
   const currentSetting = (0, import_react2.useMemo)(() => settingsMapByPath[location2.pathname], [location2.pathname, settingsMapByPath]);
-  const currentPlugin = (0, import_react2.useMemo)(() => {
+  const currentTopLevelSetting = (0, import_react2.useMemo)(() => {
     if (!currentSetting) {
       return null;
     }
-    return settings.find((item) => item.name === currentSetting.pluginName);
+    return settings.find((item) => item.name === currentSetting.topLevelName);
   }, [currentSetting, settings]);
   const sidebarMenus = (0, import_react2.useMemo)(() => {
     return getMenuItems(settings.map((item) => __spreadProps(__spreadValues({}, item), { children: null })));
@@ -64014,8 +64016,8 @@ const SettingsCenterComponent = () => {
   if (!currentSetting || location2.pathname === ADMIN_SETTINGS_PATH || location2.pathname === ADMIN_SETTINGS_PATH + "/") {
     return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Navigate, { replace: true, to: getFirstDeepChildPath(settings) });
   }
-  if (location2.pathname === currentPlugin.path && ((_a = currentPlugin.children) == null ? void 0 : _a.length) > 0) {
-    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Navigate, { replace: true, to: getFirstDeepChildPath(currentPlugin.children) });
+  if (location2.pathname === currentTopLevelSetting.path && ((_a = currentTopLevelSetting.children) == null ? void 0 : _a.length) > 0) {
+    return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Navigate, { replace: true, to: getFirstDeepChildPath(currentTopLevelSetting.children) });
   }
   return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_antd.Layout, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
@@ -64038,7 +64040,7 @@ const SettingsCenterComponent = () => {
         children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
           import_antd.Menu,
           {
-            selectedKeys: [currentSetting == null ? void 0 : currentSetting.pluginName],
+            selectedKeys: [currentSetting == null ? void 0 : currentSetting.topLevelName],
             style: { height: "calc(100vh - 46px)", overflowY: "auto", overflowX: "hidden" },
             onClick: ({ key }) => {
               var _a2;
@@ -64060,11 +64062,11 @@ const SettingsCenterComponent = () => {
         {
           className: styles.pageHeader,
           style: {
-            paddingBottom: ((_b = currentPlugin.children) == null ? void 0 : _b.length) > 0 ? 0 : theme2.paddingSM
+            paddingBottom: ((_b = currentTopLevelSetting.children) == null ? void 0 : _b.length) > 0 ? 0 : theme2.paddingSM
           },
           ghost: false,
-          title: currentPlugin.title,
-          footer: ((_c = currentPlugin.children) == null ? void 0 : _c.length) > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
+          title: currentTopLevelSetting.title,
+          footer: ((_c = currentTopLevelSetting.children) == null ? void 0 : _c.length) > 0 && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
             import_antd.Menu,
             {
               style: { marginLeft: -theme2.margin },
@@ -64073,7 +64075,7 @@ const SettingsCenterComponent = () => {
               },
               selectedKeys: [currentSetting == null ? void 0 : currentSetting.name],
               mode: "horizontal",
-              items: getMenuItems(currentPlugin.children)
+              items: getMenuItems(currentTopLevelSetting.children)
             }
           )
         }
@@ -65029,28 +65031,23 @@ class PMPlugin extends Plugin {
       title: '{{t("ACL")}}',
       icon: "LockOutlined",
       Component: ACLPane,
-      aclSnippet: "pm.acl.roles",
-      isBookmark: true
+      aclSnippet: "pm.acl.roles"
     });
     this.app.pluginSettingsManager.add("ui-schema-storage", {
       title: '{{t("Block templates")}}',
       icon: "LayoutOutlined",
       Component: BlockTemplatesPane,
-      isBookmark: true,
       aclSnippet: "pm.ui-schema-storage.block-templates"
     });
     this.app.pluginSettingsManager.add("system-settings", {
       icon: "SettingOutlined",
       title: '{{t("System settings")}}',
       Component: SystemSettingsPane,
-      isBookmark: true,
       aclSnippet: "pm.system-settings.system-settings"
     });
     this.app.pluginSettingsManager.add("collection-manager", {
       icon: "DatabaseOutlined",
-      title: '{{t("Collection manager")}}',
-      Component: () => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_react_router_dom.Outlet, {}),
-      isBookmark: true
+      title: '{{t("Collection manager")}}'
     });
     this.app.pluginSettingsManager.add("collection-manager.collections", {
       title: '{{t("Collections & Fields")}}',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client",
-  "version": "0.15.0-alpha.1",
+  "version": "0.15.0-alpha.2",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.mjs",
@@ -25,9 +25,9 @@
     "@formily/reactive-react": "^2.2.27",
     "@formily/shared": "^2.2.27",
     "@formily/validator": "^2.2.27",
-    "@nocobase/evaluators": "0.15.0-alpha.1",
-    "@nocobase/sdk": "0.15.0-alpha.1",
-    "@nocobase/utils": "0.15.0-alpha.1",
+    "@nocobase/evaluators": "0.15.0-alpha.2",
+    "@nocobase/sdk": "0.15.0-alpha.2",
+    "@nocobase/utils": "0.15.0-alpha.2",
     "@types/requirejs": "^2.1.34",
     "ahooks": "^3.7.2",
     "antd": "^5.8.6",
@@ -76,5 +76,5 @@
     "dumi": "^2.2.0",
     "dumi-theme-nocobase": "^0.2.14"
   },
-  "gitHead": "8bbeab858a818fbe0a1f954ecf1f61337d06c065"
+  "gitHead": "2504887cf82935200bf546b28adf2872cab3e452"
 }