@nocobase/client 0.13.0-alpha.5 → 0.13.0-alpha.6

package/es/global-theme/type.d.ts

@@ -1,4 +1,4 @@
-import { MappingAlgorithm } from 'antd/es/config-provider/context';
+import { MappingAlgorithm } from 'antd-style';
 import { OverrideToken } from 'antd/es/theme/interface';
 import { AliasToken } from 'antd/es/theme/internal';
 export interface CustomToken extends AliasToken {

package/es/index.mjs

@@ -80,7 +80,7 @@ import * as ReactRouterDom from "react-router-dom";
 import { useNavigate, useParams, UNSAFE_RouteContext, UNSAFE_LocationContext, useRoutes, HashRouter, BrowserRouter, MemoryRouter, Link as Link$1, Navigate, NavLink, useSearchParams, useLocation, Outlet, useMatch } from "react-router-dom";
 import { APIClient as APIClient$1, getSubAppName } from "@nocobase/sdk";
 import * as antd from "antd";
-import { notification, Spin, Select as Select$1, message, ConfigProvider, theme, Space as Space$1, Checkbox as Checkbox$1, Dropdown, Button, App, Input as Input$4, Divider, DatePicker as DatePicker$1, Tooltip as Tooltip$1, Popover, Cascader as Cascader$1, InputNumber as InputNumber$1, Tag, Typography, Switch, Card as Card$1, Empty, Collapse, Badge, Tree as Tree$2, Radio as Radio$1, Modal, Alert, Drawer as Drawer$1, Progress, Upload as Upload$1, Row, Col, TreeSelect as TreeSelect$2, Table as Table$2, AutoComplete as AutoComplete$1, ColorPicker as ColorPicker$1, Slider, List as List$1, Result as Result$1, Tabs as Tabs$1, Menu as Menu$1, Pagination as Pagination$1, TimePicker as TimePicker$1, Popconfirm, Avatar, Layout } from "antd";
+import { notification, Spin, Select as Select$1, message, ConfigProvider, theme, Popover as Popover$1, Space as Space$1, Checkbox as Checkbox$1, Dropdown, Button, App, Input as Input$4, Divider, DatePicker as DatePicker$1, Tooltip as Tooltip$1, Cascader as Cascader$1, InputNumber as InputNumber$1, Tag, Typography, Switch, Card as Card$1, Empty, Collapse, Badge, Tree as Tree$2, Radio as Radio$1, Modal, Alert, Drawer as Drawer$1, Progress, Upload as Upload$1, Row, Col, TreeSelect as TreeSelect$2, Table as Table$2, AutoComplete as AutoComplete$1, ColorPicker as ColorPicker$1, Slider, List as List$1, Result as Result$1, Tabs as Tabs$1, Menu as Menu$1, Pagination as Pagination$1, TimePicker as TimePicker$1, Popconfirm, Avatar, Layout } from "antd";
 import * as formilyShared from "@formily/shared";
 import { merge, uid, clone, isArr, toArr as toArr$3, isValid, isPlainObj, each, isFn, applyMiddleware, isNum as isNum$1, isStr, isBool } from "@formily/shared";
 import * as ahooks from "ahooks";
@@ -121,7 +121,7 @@ import * as dndKitSortable from "@dnd-kit/sortable";
 import { SortableContext as SortableContext$1, useSortable } from "@dnd-kit/sortable";
 import * as dndKitUtilities from "@dnd-kit/utilities";
 import * as formilyAntdV5 from "@formily/antd-v5";
-import { FormItem as FormItem$1, ArrayCollapse as ArrayCollapse$2, FormLayout, ArrayBase, TreeSelect as TreeSelect$1, ArrayItems, Input as Input$5, ArrayTable, useFormLayout, Cascader as Cascader$2 } from "@formily/antd-v5";
+import { FormItem as FormItem$1, ArrayCollapse as ArrayCollapse$2, FormLayout, ArrayBase, TreeSelect as TreeSelect$1, ArrayItems, Input as Input$5, ArrayTable, useFormLayout } from "@formily/antd-v5";
 import * as formilyCore from "@formily/core";
 import { createForm, onFormValuesChange, onFieldValueChange, isArrayField, onFormInputChange, onFieldInit, onFieldChange, onFieldReact, registerValidateFormats, registerValidateRules, onFormSubmitValidateStart } from "@formily/core";
 import * as formilyJsonSchema from "@formily/json-schema";
@@ -906,6 +906,9 @@ const nocobaseClient = /* @__PURE__ */ _mergeNamespaces({
   get PluginManagerLink() {
     return PluginManagerLink;
   },
+  get Popover() {
+    return Popover;
+  },
   get PoweredBy() {
     return PoweredBy;
   },
@@ -4008,6 +4011,12 @@ const common = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProper
   SortableItem,
   SortableProvider
 }, Symbol.toStringTag, { value: "Module" }));
+const Popover = (props) => {
+  const avoidClose = useCallback((e) => {
+    e.stopPropagation();
+  }, []);
+  return /* @__PURE__ */ jsx("div", { onClick: avoidClose, children: /* @__PURE__ */ jsx(Popover$1, __spreadValues({}, props)) });
+};
 const useStyles$o = genStyleHook("nb-action-drawer", (token) => {
   const { componentCls } = token;
   return {
@@ -10401,15 +10410,16 @@ const FilterAction = observer(
     const fieldSchema = useFieldSchema();
     const form = useMemo(() => props.form || createForm(), []);
     const _a = useProps(props), { options, onSubmit, onReset } = _a, others = __objRest(_a, ["options", "onSubmit", "onReset"]);
+    const onOpenChange = useCallback((visible2) => {
+      setVisible(visible2);
+    }, []);
     return /* @__PURE__ */ jsx(FilterActionContext.Provider, { value: { field, fieldSchema, designable, dn }, children: /* @__PURE__ */ jsx(
       Popover,
       {
         destroyTooltipOnHide: true,
         placement: "bottomLeft",
         open: visible,
-        onOpenChange: (visible2) => {
-          setVisible(visible2);
-        },
+        onOpenChange,
         trigger: "click",
         content: /* @__PURE__ */ jsx("form", { children: /* @__PURE__ */ jsxs(FormProvider, { form, children: [
           /* @__PURE__ */ jsx(
@@ -42152,7 +42162,10 @@ const useStyles$5 = genStyleHook("nb-page", (token) => {
           ".ant-page-header-heading-left": {},
           ".ant-page-header-footer": { marginBlockStart: "0" }
         },
-        ".ant-tabs-nav": { marginBottom: "0" }
+        ".ant-tabs-nav": { marginBottom: "0" },
+        ".ant-page-header-heading-title": {
+          color: token.colorText
+        }
       },
       ".height0": {
         fontSize: 0,
@@ -46314,7 +46327,7 @@ const TableBlockDesigner = () => {
   const template2 = useSchemaTemplate();
   const collection2 = useCollection();
   const { dragSort, resource } = field.decoratorProps;
-  const collectionField = getCollectionField(resource);
+  const collectionField = resource && getCollectionField(resource);
   const treeCollection = (resource == null ? void 0 : resource.includes(".")) ? (_g = getCollection(collectionField == null ? void 0 : collectionField.target)) == null ? void 0 : _g.tree : !!(collection2 == null ? void 0 : collection2.tree);
   const dataScopeSchema = useMemo(() => {
     return {
@@ -47426,6 +47439,7 @@ const components$3 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.define
   Pagination,
   Password,
   Percent,
+  Popover,
   Preview,
   QuickEdit,
   Radio,
@@ -52670,7 +52684,7 @@ const PreviewCom = (props) => {
       width: 200,
       render: (text2, record, index2) => {
         return /* @__PURE__ */ jsx(
-          Cascader$2,
+          Cascader$1,
           {
             defaultValue: typeof text2 === "string" ? text2 == null ? void 0 : text2.split(".") : text2,
             allowClear: true,
@@ -59512,6 +59526,9 @@ const useStyles = createStyles(({ token }) => {
       ".ant-page-header-footer": { marginBlockStart: "0" },
       "& .ant-tabs-nav": {
         marginBottom: 0
+      },
+      ".ant-page-header-heading-title": {
+        color: token.colorText
       }
     },
     pageContent: {
@@ -61985,6 +62002,7 @@ export {
   Plugin,
   PluginManagerContext,
   PluginManagerLink,
+  Popover,
   PoweredBy,
   Preview,
   PrintActionInitializer,

package/es/pm/style.d.ts

@@ -10,6 +10,9 @@ export declare const useStyles: (props?: unknown) => import("antd-style").Return
         '& .ant-tabs-nav': {
             marginBottom: number;
         };
+        '.ant-page-header-heading-title': {
+            color: string;
+        };
     };
     pageContent: {
         margin: number;

package/es/schema-component/antd/index.d.ts

@@ -35,6 +35,7 @@ export * from './page';
 export * from './pagination';
 export * from './password';
 export * from './percent';
+export * from './popover';
 export * from './preview';
 export * from './quick-edit';
 export * from './radio';

package/es/schema-component/antd/popover/Popover.d.ts

@@ -0,0 +1,3 @@
+import { PopoverProps } from 'antd';
+import React from 'react';
+export declare const Popover: (props: PopoverProps) => React.JSX.Element;

package/es/schema-component/antd/popover/index.d.ts

@@ -0,0 +1 @@
+export * from './Popover';

package/lib/index.js

@@ -929,6 +929,9 @@ const nocobaseClient = /* @__PURE__ */ _mergeNamespaces({
   get PluginManagerLink() {
     return PluginManagerLink;
   },
+  get Popover() {
+    return Popover;
+  },
   get PoweredBy() {
     return PoweredBy;
   },
@@ -4031,6 +4034,12 @@ const common = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProper
   SortableItem,
   SortableProvider
 }, Symbol.toStringTag, { value: "Module" }));
+const Popover = (props) => {
+  const avoidClose = React.useCallback((e) => {
+    e.stopPropagation();
+  }, []);
+  return /* @__PURE__ */ jsxRuntime.jsx("div", { onClick: avoidClose, children: /* @__PURE__ */ jsxRuntime.jsx(antd.Popover, __spreadValues({}, props)) });
+};
 const useStyles$o = genStyleHook("nb-action-drawer", (token) => {
   const { componentCls } = token;
   return {
@@ -10424,15 +10433,16 @@ const FilterAction = formilyReact.observer(
     const fieldSchema = formilyReact.useFieldSchema();
     const form = React.useMemo(() => props.form || formilyCore.createForm(), []);
     const _a = useProps(props), { options, onSubmit, onReset } = _a, others = __objRest(_a, ["options", "onSubmit", "onReset"]);
+    const onOpenChange = React.useCallback((visible2) => {
+      setVisible(visible2);
+    }, []);
     return /* @__PURE__ */ jsxRuntime.jsx(FilterActionContext.Provider, { value: { field, fieldSchema, designable, dn }, children: /* @__PURE__ */ jsxRuntime.jsx(
-      antd.Popover,
+      Popover,
       {
         destroyTooltipOnHide: true,
         placement: "bottomLeft",
         open: visible,
-        onOpenChange: (visible2) => {
-          setVisible(visible2);
-        },
+        onOpenChange,
         trigger: "click",
         content: /* @__PURE__ */ jsxRuntime.jsx("form", { children: /* @__PURE__ */ jsxRuntime.jsxs(FormProvider, { form, children: [
           /* @__PURE__ */ jsxRuntime.jsx(
@@ -11982,7 +11992,7 @@ const EllipsisWithTooltip = React.forwardRef((props, ref) => {
     return contentWidth > offsetWidth;
   };
   return /* @__PURE__ */ jsxRuntime.jsx(
-    antd.Popover,
+    Popover,
     {
       open: ellipsis && visible,
       onOpenChange: (visible2) => {
@@ -22397,7 +22407,7 @@ Action.Popover = formilyReact.observer(
   (props) => {
     const { button, visible, setVisible } = useActionContext();
     return /* @__PURE__ */ jsxRuntime.jsx(
-      antd.Popover,
+      Popover,
       __spreadProps(__spreadValues({}, props), {
         destroyTooltipOnHide: true,
         open: visible,
@@ -32912,7 +32922,7 @@ const InternaPopoverNester = formilyReact.observer(
     };
     return /* @__PURE__ */ jsxRuntime.jsxs(ActionContextProvider, { value: __spreadProps(__spreadValues({}, ctx), { modalProps }), children: [
       /* @__PURE__ */ jsxRuntime.jsx(
-        antd.Popover,
+        Popover,
         {
           overlayStyle: { padding: "0px" },
           content,
@@ -41288,7 +41298,7 @@ function IconField(props) {
   const { t } = reactI18next.useTranslation();
   return /* @__PURE__ */ jsxRuntime.jsx("div", { children: /* @__PURE__ */ jsxRuntime.jsxs(antd.Input.Group, { compact: true, children: [
     /* @__PURE__ */ jsxRuntime.jsx(
-      antd.Popover,
+      Popover,
       {
         placement: "bottom",
         open: visible,
@@ -42175,7 +42185,10 @@ const useStyles$5 = genStyleHook("nb-page", (token) => {
           ".ant-page-header-heading-left": {},
           ".ant-page-header-footer": { marginBlockStart: "0" }
         },
-        ".ant-tabs-nav": { marginBottom: "0" }
+        ".ant-tabs-nav": { marginBottom: "0" },
+        ".ant-page-header-heading-title": {
+          color: token.colorText
+        }
       },
       ".height0": {
         fontSize: 0,
@@ -44583,7 +44596,7 @@ const Editable = formilyReact.observer((props) => {
     return child;
   });
   return /* @__PURE__ */ jsxRuntime.jsx(formilyAntdV5.FormItem, __spreadProps(__spreadValues({}, props), { labelStyle: { display: "none" }, children: /* @__PURE__ */ jsxRuntime.jsx(
-    antd.Popover,
+    Popover,
     {
       content: /* @__PURE__ */ jsxRuntime.jsx("div", { style: { width: "100%", height: "100%", minWidth: 500 }, children: /* @__PURE__ */ jsxRuntime.jsx("div", { ref: containerRef, children: modifiedChildren }) }),
       trigger: "click",
@@ -46337,7 +46350,7 @@ const TableBlockDesigner = () => {
   const template2 = useSchemaTemplate();
   const collection2 = useCollection();
   const { dragSort, resource } = field.decoratorProps;
-  const collectionField = getCollectionField(resource);
+  const collectionField = resource && getCollectionField(resource);
   const treeCollection = (resource == null ? void 0 : resource.includes(".")) ? (_g = getCollection(collectionField == null ? void 0 : collectionField.target)) == null ? void 0 : _g.tree : !!(collection2 == null ? void 0 : collection2.tree);
   const dataScopeSchema = React.useMemo(() => {
     return {
@@ -47449,6 +47462,7 @@ const components$3 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.define
   Pagination,
   Password,
   Percent,
+  Popover,
   Preview,
   QuickEdit,
   Radio,
@@ -52693,7 +52707,7 @@ const PreviewCom = (props) => {
       width: 200,
       render: (text2, record, index2) => {
         return /* @__PURE__ */ jsxRuntime.jsx(
-          formilyAntdV5.Cascader,
+          antd.Cascader,
           {
             defaultValue: typeof text2 === "string" ? text2 == null ? void 0 : text2.split(".") : text2,
             allowClear: true,
@@ -59535,6 +59549,9 @@ const useStyles = antdStyle.createStyles(({ token }) => {
       ".ant-page-header-footer": { marginBlockStart: "0" },
       "& .ant-tabs-nav": {
         marginBottom: 0
+      },
+      ".ant-page-header-heading-title": {
+        color: token.colorText
       }
     },
     pageContent: {
@@ -62011,6 +62028,7 @@ exports.PinnedPluginListProvider = PinnedPluginListProvider;
 exports.Plugin = Plugin;
 exports.PluginManagerContext = PluginManagerContext;
 exports.PluginManagerLink = PluginManagerLink;
+exports.Popover = Popover;
 exports.PoweredBy = PoweredBy;
 exports.Preview = Preview;
 exports.PrintActionInitializer = PrintActionInitializer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client",
-  "version": "0.13.0-alpha.5",
+  "version": "0.13.0-alpha.6",
   "license": "Apache-2.0",
   "main": "lib",
   "module": "es/index.js",
@@ -8,14 +8,14 @@
   "dependencies": {
     "@ant-design/cssinjs": "^1.11.1",
     "@ant-design/icons": "^5.1.4",
-    "@ant-design/pro-layout": "^7.14.3",
+    "@ant-design/pro-layout": "^7.16.11",
     "@antv/g2plot": "^2.4.18",
     "@ctrl/tinycolor": "^3.6.0",
     "@dnd-kit/core": "^5.0.1",
     "@dnd-kit/modifiers": "^6.0.0",
     "@dnd-kit/sortable": "^6.0.0",
     "@emotion/css": "^11.7.1",
-    "@formily/antd-v5": "^1.1.0",
+    "@formily/antd-v5": "1.1.1",
     "@formily/core": "^2.2.27",
     "@formily/grid": "^2.2.27",
     "@formily/json-schema": "^2.2.27",
@@ -25,13 +25,13 @@
     "@formily/reactive-react": "^2.2.27",
     "@formily/shared": "^2.2.27",
     "@formily/validator": "^2.2.27",
-    "@nocobase/evaluators": "0.13.0-alpha.5",
-    "@nocobase/sdk": "0.13.0-alpha.5",
-    "@nocobase/utils": "0.13.0-alpha.5",
+    "@nocobase/evaluators": "0.13.0-alpha.6",
+    "@nocobase/sdk": "0.13.0-alpha.6",
+    "@nocobase/utils": "0.13.0-alpha.6",
     "@types/requirejs": "^2.1.34",
     "ahooks": "^3.7.2",
-    "antd": "^5.7.3",
-    "antd-style": "^3.3.0",
+    "antd": "5.8.6",
+    "antd-style": "3.4.5",
     "axios": "^0.26.1",
     "classnames": "^2.3.1",
     "cron-parser": "^4.6.0",
@@ -76,5 +76,5 @@
     "dumi": "^2.2.0",
     "dumi-theme-nocobase": "^0.2.14"
   },
-  "gitHead": "9eabe607b4a20c356fdb2fd95e40fa476986dcb0"
+  "gitHead": "49ef71c8bdaab986f47c8a84bcf15e2123ba9b59"
 }