@nocobase/client 0.13.0-alpha.7 → 0.13.0-alpha.9

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, 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 { 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 * 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";
@@ -906,8 +906,8 @@ const nocobaseClient = /* @__PURE__ */ _mergeNamespaces({
   get PluginManagerLink() {
     return PluginManagerLink;
   },
-  get Popover() {
-    return Popover;
+  get PopoverWithStopPropagation() {
+    return PopoverWithStopPropagation;
   },
   get PoweredBy() {
     return PoweredBy;
@@ -2046,7 +2046,7 @@ class APIClient extends APIClient$1 {
           }
           if (this.app.maintaining) {
             this.app.error = (_i = (_h = error2 == null ? void 0 : error2.response) == null ? void 0 : _h.data) == null ? void 0 : _i.error;
-            return;
+            throw error2;
           } else if (this.app.error) {
             this.app.error = null;
           }
@@ -4011,12 +4011,6 @@ 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 {
@@ -10400,6 +10394,12 @@ class SchemaComponentPlugin extends Plugin {
     });
   }
 }
+const PopoverWithStopPropagation = (props) => {
+  const avoidClose = useCallback((e) => {
+    e.stopPropagation();
+  }, []);
+  return /* @__PURE__ */ jsx("div", { onClick: avoidClose, children: /* @__PURE__ */ jsx(Popover, __spreadValues({}, props)) });
+};
 const FilterActionContext = createContext(null);
 const FilterAction = observer(
   (props) => {
@@ -10414,7 +10414,7 @@ const FilterAction = observer(
       setVisible(visible2);
     }, []);
     return /* @__PURE__ */ jsx(FilterActionContext.Provider, { value: { field, fieldSchema, designable, dn }, children: /* @__PURE__ */ jsx(
-      Popover,
+      PopoverWithStopPropagation,
       {
         destroyTooltipOnHide: true,
         placement: "bottomLeft",
@@ -27914,7 +27914,8 @@ const defaultTheme = {
     // UI 配置组件
     colorSettings: "#F18B62",
     colorBgSettingsHover: "rgba(241, 139, 98, 0.06)",
-    colorBorderSettingsHover: "rgba(241, 139, 98, 0.3)"
+    colorBorderSettingsHover: "rgba(241, 139, 98, 0.3)",
+    motionUnit: 0.03
   }
 };
 function compatOldTheme(theme2) {
@@ -28121,9 +28122,6 @@ function useAppPluginLoad(app) {
   const [loading2, setLoading] = useState(true);
   const [error2, setError] = useState(null);
   useEffect(() => {
-    app.ws.on("message", (event) => {
-      console.log(event.data);
-    });
     function run() {
       return __async(this, null, function* () {
         try {
@@ -29840,6 +29838,7 @@ class Application {
   }
   load() {
     return __async(this, null, function* () {
+      let loadFailed = false;
       this.ws.on("message", (event) => {
         var _a, _b, _c;
         const data = JSON.parse(event.data);
@@ -29857,6 +29856,10 @@ class Application {
           this.maintaining = true;
           this.error = data.payload;
         } else {
+          console.log("loadFailed", loadFailed);
+          if (loadFailed) {
+            window.location.reload();
+          }
           this.maintaining = false;
           this.maintained = true;
           this.error = null;
@@ -29870,6 +29873,7 @@ class Application {
         this.loading = true;
         yield this.pm.load();
       } catch (error2) {
+        loadFailed = true;
         this.error = {
           code: "LOAD_ERROR",
           message: error2.message
@@ -32899,7 +32903,7 @@ const InternaPopoverNester = observer(
     };
     return /* @__PURE__ */ jsxs(ActionContextProvider, { value: __spreadProps(__spreadValues({}, ctx), { modalProps }), children: [
       /* @__PURE__ */ jsx(
-        Popover,
+        PopoverWithStopPropagation,
         {
           overlayStyle: { padding: "0px" },
           content,
@@ -41275,7 +41279,7 @@ function IconField(props) {
   const { t } = useTranslation();
   return /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsxs(Input$4.Group, { compact: true, children: [
     /* @__PURE__ */ jsx(
-      Popover,
+      PopoverWithStopPropagation,
       {
         placement: "bottom",
         open: visible,
@@ -44573,7 +44577,7 @@ const Editable = observer((props) => {
     return child;
   });
   return /* @__PURE__ */ jsx(FormItem$1, __spreadProps(__spreadValues({}, props), { labelStyle: { display: "none" }, children: /* @__PURE__ */ jsx(
-    Popover,
+    PopoverWithStopPropagation,
     {
       content: /* @__PURE__ */ jsx("div", { style: { width: "100%", height: "100%", minWidth: 500 }, children: /* @__PURE__ */ jsx("div", { ref: containerRef, children: modifiedChildren }) }),
       trigger: "click",
@@ -47439,7 +47443,7 @@ const components$3 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.define
   Pagination,
   Password,
   Percent,
-  Popover,
+  PopoverWithStopPropagation,
   Preview,
   QuickEdit,
   Radio,
@@ -61647,6 +61651,7 @@ const getProps = (app) => {
     };
     return __spreadValues(__spreadValues({}, props), commands[(_k = (_j = app.error) == null ? void 0 : _j.command) == null ? void 0 : _k.name]);
   }
+  return {};
 };
 const AppMaintaining = observer$1(({ app }) => {
   const { icon: icon2, status, title, subTitle } = getProps(app);
@@ -62002,7 +62007,7 @@ export {
   Plugin,
   PluginManagerContext,
   PluginManagerLink,
-  Popover,
+  PopoverWithStopPropagation,
   PoweredBy,
   Preview,
   PrintActionInitializer,

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

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

package/lib/index.js

@@ -929,8 +929,8 @@ const nocobaseClient = /* @__PURE__ */ _mergeNamespaces({
   get PluginManagerLink() {
     return PluginManagerLink;
   },
-  get Popover() {
-    return Popover;
+  get PopoverWithStopPropagation() {
+    return PopoverWithStopPropagation;
   },
   get PoweredBy() {
     return PoweredBy;
@@ -2069,7 +2069,7 @@ class APIClient extends sdk.APIClient {
           }
           if (this.app.maintaining) {
             this.app.error = (_i = (_h = error == null ? void 0 : error.response) == null ? void 0 : _h.data) == null ? void 0 : _i.error;
-            return;
+            throw error;
           } else if (this.app.error) {
             this.app.error = null;
           }
@@ -4034,12 +4034,6 @@ 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 {
@@ -10423,6 +10417,12 @@ class SchemaComponentPlugin extends Plugin {
     });
   }
 }
+const PopoverWithStopPropagation = (props) => {
+  const avoidClose = React.useCallback((e) => {
+    e.stopPropagation();
+  }, []);
+  return /* @__PURE__ */ jsxRuntime.jsx("div", { onClick: avoidClose, children: /* @__PURE__ */ jsxRuntime.jsx(antd.Popover, __spreadValues({}, props)) });
+};
 const FilterActionContext = React.createContext(null);
 const FilterAction = formilyReact.observer(
   (props) => {
@@ -10437,7 +10437,7 @@ const FilterAction = formilyReact.observer(
       setVisible(visible2);
     }, []);
     return /* @__PURE__ */ jsxRuntime.jsx(FilterActionContext.Provider, { value: { field, fieldSchema, designable, dn }, children: /* @__PURE__ */ jsxRuntime.jsx(
-      Popover,
+      PopoverWithStopPropagation,
       {
         destroyTooltipOnHide: true,
         placement: "bottomLeft",
@@ -11992,7 +11992,7 @@ const EllipsisWithTooltip = React.forwardRef((props, ref) => {
     return contentWidth > offsetWidth;
   };
   return /* @__PURE__ */ jsxRuntime.jsx(
-    Popover,
+    antd.Popover,
     {
       open: ellipsis && visible,
       onOpenChange: (visible2) => {
@@ -22407,7 +22407,7 @@ Action.Popover = formilyReact.observer(
   (props) => {
     const { button, visible, setVisible } = useActionContext();
     return /* @__PURE__ */ jsxRuntime.jsx(
-      Popover,
+      antd.Popover,
       __spreadProps(__spreadValues({}, props), {
         destroyTooltipOnHide: true,
         open: visible,
@@ -27937,7 +27937,8 @@ const defaultTheme = {
     // UI 配置组件
     colorSettings: "#F18B62",
     colorBgSettingsHover: "rgba(241, 139, 98, 0.06)",
-    colorBorderSettingsHover: "rgba(241, 139, 98, 0.3)"
+    colorBorderSettingsHover: "rgba(241, 139, 98, 0.3)",
+    motionUnit: 0.03
   }
 };
 function compatOldTheme(theme) {
@@ -28144,9 +28145,6 @@ function useAppPluginLoad(app) {
   const [loading2, setLoading] = React.useState(true);
   const [error, setError] = React.useState(null);
   React.useEffect(() => {
-    app.ws.on("message", (event) => {
-      console.log(event.data);
-    });
     function run() {
       return __async(this, null, function* () {
         try {
@@ -29863,6 +29861,7 @@ class Application {
   }
   load() {
     return __async(this, null, function* () {
+      let loadFailed = false;
       this.ws.on("message", (event) => {
         var _a, _b, _c;
         const data = JSON.parse(event.data);
@@ -29880,6 +29879,10 @@ class Application {
           this.maintaining = true;
           this.error = data.payload;
         } else {
+          console.log("loadFailed", loadFailed);
+          if (loadFailed) {
+            window.location.reload();
+          }
           this.maintaining = false;
           this.maintained = true;
           this.error = null;
@@ -29893,6 +29896,7 @@ class Application {
         this.loading = true;
         yield this.pm.load();
       } catch (error) {
+        loadFailed = true;
         this.error = {
           code: "LOAD_ERROR",
           message: error.message
@@ -32922,7 +32926,7 @@ const InternaPopoverNester = formilyReact.observer(
     };
     return /* @__PURE__ */ jsxRuntime.jsxs(ActionContextProvider, { value: __spreadProps(__spreadValues({}, ctx), { modalProps }), children: [
       /* @__PURE__ */ jsxRuntime.jsx(
-        Popover,
+        PopoverWithStopPropagation,
         {
           overlayStyle: { padding: "0px" },
           content,
@@ -41298,7 +41302,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(
-      Popover,
+      PopoverWithStopPropagation,
       {
         placement: "bottom",
         open: visible,
@@ -44596,7 +44600,7 @@ const Editable = formilyReact.observer((props) => {
     return child;
   });
   return /* @__PURE__ */ jsxRuntime.jsx(formilyAntdV5.FormItem, __spreadProps(__spreadValues({}, props), { labelStyle: { display: "none" }, children: /* @__PURE__ */ jsxRuntime.jsx(
-    Popover,
+    PopoverWithStopPropagation,
     {
       content: /* @__PURE__ */ jsxRuntime.jsx("div", { style: { width: "100%", height: "100%", minWidth: 500 }, children: /* @__PURE__ */ jsxRuntime.jsx("div", { ref: containerRef, children: modifiedChildren }) }),
       trigger: "click",
@@ -47462,7 +47466,7 @@ const components$3 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.define
   Pagination,
   Password,
   Percent,
-  Popover,
+  PopoverWithStopPropagation,
   Preview,
   QuickEdit,
   Radio,
@@ -61670,6 +61674,7 @@ const getProps = (app) => {
     };
     return __spreadValues(__spreadValues({}, props), commands[(_k = (_j = app.error) == null ? void 0 : _j.command) == null ? void 0 : _k.name]);
   }
+  return {};
 };
 const AppMaintaining = formilyReactiveReact.observer(({ app }) => {
   const { icon: icon2, status, title, subTitle } = getProps(app);
@@ -62028,7 +62033,7 @@ exports.PinnedPluginListProvider = PinnedPluginListProvider;
 exports.Plugin = Plugin;
 exports.PluginManagerContext = PluginManagerContext;
 exports.PluginManagerLink = PluginManagerLink;
-exports.Popover = Popover;
+exports.PopoverWithStopPropagation = PopoverWithStopPropagation;
 exports.PoweredBy = PoweredBy;
 exports.Preview = Preview;
 exports.PrintActionInitializer = PrintActionInitializer;

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@nocobase/client",
-  "version": "0.13.0-alpha.7",
+  "version": "0.13.0-alpha.9",
   "license": "Apache-2.0",
-  "main": "lib",
-  "module": "es/index.js",
+  "main": "lib/index.js",
+  "module": "es/index.mjs",
   "types": "es/index.d.ts",
   "dependencies": {
     "@ant-design/cssinjs": "^1.11.1",
@@ -25,9 +25,9 @@
     "@formily/reactive-react": "^2.2.27",
     "@formily/shared": "^2.2.27",
     "@formily/validator": "^2.2.27",
-    "@nocobase/evaluators": "0.13.0-alpha.7",
-    "@nocobase/sdk": "0.13.0-alpha.7",
-    "@nocobase/utils": "0.13.0-alpha.7",
+    "@nocobase/evaluators": "0.13.0-alpha.9",
+    "@nocobase/sdk": "0.13.0-alpha.9",
+    "@nocobase/utils": "0.13.0-alpha.9",
     "@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": "5cd58b0b56718e525d4deca7e25e5e5172022212"
+  "gitHead": "ee5825377d8bec05f968a8365a0cdcd49878ada6"
 }