@steedos/webapp 3.0.7-beta.3 → 3.0.7

package/dist/assets/{browser-ponyfill-C-i5StIu.js → browser-ponyfill-1f0ORRk4.js}

@@ -1,4 +1,4 @@
-import { c as commonjsGlobal, g as getDefaultExportFromCjs } from "./index-K_xwMI-B.js";
+import { c as commonjsGlobal, g as getDefaultExportFromCjs } from "./index-CIjj35sk.js";
 function _mergeNamespaces(n, m) {
   for (var i = 0; i < m.length; i++) {
     const e = m[i];

package/dist/assets/{index-K_xwMI-B.js → index-CIjj35sk.js}

@@ -29192,6 +29192,52 @@ function useRouteError() {
   }
   return state.errors?.[routeId];
 }
+var blockerId = 0;
+function useBlocker(shouldBlock) {
+  let { router, basename: basename2 } = useDataRouterContext(
+    "useBlocker"
+    /* UseBlocker */
+  );
+  let state = useDataRouterState(
+    "useBlocker"
+    /* UseBlocker */
+  );
+  let [blockerKey, setBlockerKey] = reactExports.useState("");
+  let blockerFunction = reactExports.useCallback(
+    (arg) => {
+      if (typeof shouldBlock !== "function") {
+        return !!shouldBlock;
+      }
+      if (basename2 === "/") {
+        return shouldBlock(arg);
+      }
+      let { currentLocation, nextLocation, historyAction } = arg;
+      return shouldBlock({
+        currentLocation: {
+          ...currentLocation,
+          pathname: stripBasename(currentLocation.pathname, basename2) || currentLocation.pathname
+        },
+        nextLocation: {
+          ...nextLocation,
+          pathname: stripBasename(nextLocation.pathname, basename2) || nextLocation.pathname
+        },
+        historyAction
+      });
+    },
+    [basename2, shouldBlock]
+  );
+  reactExports.useEffect(() => {
+    let key2 = String(++blockerId);
+    setBlockerKey(key2);
+    return () => router.deleteBlocker(key2);
+  }, [router]);
+  reactExports.useEffect(() => {
+    if (blockerKey !== "") {
+      router.getBlocker(blockerKey, blockerFunction);
+    }
+  }, [router, blockerKey, blockerFunction]);
+  return blockerKey && state.blockers.has(blockerKey) ? state.blockers.get(blockerKey) : IDLE_BLOCKER;
+}
 function useNavigateStable() {
   let { router } = useDataRouterContext(
     "useNavigate"
@@ -54766,6 +54812,25 @@ const GlobalLinkInterceptor = () => {
 function RouteChangeHandler() {
   const location2 = useLocation();
   const navigationType = useNavigationType();
+  const blocker = useBlocker(
+    ({ currentLocation, nextLocation }) => {
+      console.log(`blocker`, currentLocation, nextLocation);
+      return currentLocation.pathname !== nextLocation.pathname;
+    }
+  );
+  reactExports.useEffect(() => {
+    if (blocker.state === "blocked") {
+      const handleNavigation = async () => {
+        const result = await window.SteedosUI?.navigationGuard?.executeHandlers(blocker);
+        if (result.allowed) {
+          blocker.proceed();
+        } else {
+          blocker.reset();
+        }
+      };
+      handleNavigation();
+    }
+  }, [blocker]);
   reactExports.useEffect(() => {
     const routeChangeData = {
       type: "ROUTE_CHANGE",
@@ -54894,14 +54959,17 @@ const ObjectDetail = () => {
 };
 const isString = (val) => typeof val === "string";
 function injectServerCss(cssString) {
-  const styleTag = document.createElement("style");
-  styleTag.id = "app-page-styles";
-  styleTag.innerHTML = cssString;
-  const oldStyle = document.getElementById("app-page-styles");
+  const oldStyle = document.getElementById("dynamic-page-styles");
   if (oldStyle) {
     oldStyle.remove();
   }
-  document.head.appendChild(styleTag);
+  if (cssString == null || cssString.trim() === "") {
+    return;
+  }
+  const styleTag = document.createElement("style");
+  styleTag.id = "dynamic-page-styles";
+  styleTag.innerHTML = cssString;
+  document.head.prepend(styleTag);
 }
 const PageView = () => {
   const { appId, pageId } = useParams();
@@ -54926,7 +54994,7 @@ const PageView = () => {
           throw new Error(`HTTP error! status: ${response.status}`);
         }
         const payload = await response.json();
-        if (payload && payload.css) {
+        if (payload) {
           injectServerCss(payload.css);
         }
         let finalSchema = payload.schema;
@@ -77129,16 +77197,6 @@ window.waitForThing = (obj, path2, func) => {
   return _innerWaitForThing(obj, path2, func);
 };
 window.signOut = Steedos$1.logout;
-var i18next_1;
-var hasRequiredI18next;
-function requireI18next() {
-  if (hasRequiredI18next) return i18next_1;
-  hasRequiredI18next = 1;
-  i18next_1 = i18next;
-  return i18next_1;
-}
-var i18nextExports = requireI18next();
-const i18n = /* @__PURE__ */ getDefaultExportFromCjs(i18nextExports);
 const PACKET_TYPES = /* @__PURE__ */ Object.create(null);
 PACKET_TYPES["open"] = "0";
 PACKET_TYPES["close"] = "1";
@@ -80445,28 +80503,6 @@ _window.io = lookup;
 _window["axios"] = axios;
 _window["Builder"] = Builder$1;
 _window["builder"] = builder;
-_window["t"] = function(key2, parameters, locale) {
-  if (!key2) {
-    return key2;
-  }
-  if (locale === "zh-cn") {
-    locale = "zh-CN";
-  }
-  if (!locale) {
-    locale = Builder$1.settings.context?.user?.language || Builder$1.settings.default_language || "zh-CN";
-  }
-  let keys2;
-  if (lodash.isArray(key2)) {
-    keys2 = key2;
-  } else {
-    keys2 = [`CustomLabels.${key2}`, key2];
-  }
-  if (parameters != null && !lodash.isObject(parameters)) {
-    return i18nextExports.t(keys2, { lng: locale, postProcess: "sprintf", sprintf: [parameters], keySeparator: false });
-  } else {
-    return i18nextExports.t(keys2, Object.assign({ lng: locale }, { keySeparator: false }, parameters));
-  }
-};
 if (_window["Steedos"]) {
   _window["Steedos"] = Object.assign(_window["Steedos"], Steedos$1);
 } else {
@@ -80668,6 +80704,16 @@ function mapDispatchToProps(dispatch2) {
   };
 }
 const IntlProvider = connect(mapStateToProps, mapDispatchToProps)(IntlProvider$1);
+var i18next_1;
+var hasRequiredI18next;
+function requireI18next() {
+  if (hasRequiredI18next) return i18next_1;
+  hasRequiredI18next = 1;
+  i18next_1 = i18next;
+  return i18next_1;
+}
+var i18nextExports = requireI18next();
+const i18n = /* @__PURE__ */ getDefaultExportFromCjs(i18nextExports);
 const {
   slice: slice$1,
   forEach
@@ -81175,7 +81221,7 @@ if (typeof ActiveXObject === "function") {
 if (typeof fetchApi !== "function") fetchApi = void 0;
 if (!fetchApi && !XmlHttpRequestApi && !ActiveXObjectApi) {
   try {
-    __vitePreload(() => import("./browser-ponyfill-C-i5StIu.js").then((n) => n.b), true ? [] : void 0).then(function(mod) {
+    __vitePreload(() => import("./browser-ponyfill-1f0ORRk4.js").then((n) => n.b), true ? [] : void 0).then(function(mod) {
       fetchApi = mod.default;
     }).catch(function() {
     });
@@ -81958,8 +82004,9 @@ const sprintf = {
   }
 };
 i18n.use(sprintf).use(ICU).use(Backend).use(Browser).use(initReactI18next).init({
+  load: "currentOnly",
   fallbackLng: "en",
-  supportedLngs: ["en", "zh-CN"],
+  // supportedLngs: ["en", "zh-CN"],
   debug: false,
   interpolation: {
     escapeValue: false

package/dist/assets/{index-DucDe4Dz.css → index-CvjS7Xyp.css}

@@ -1811,6 +1811,9 @@ video {
 .font-medium {
   font-weight: 500;
 }
+.font-normal {
+  font-weight: 400;
+}
 .font-semibold {
   font-weight: 600;
 }

package/dist/index.html

@@ -26,9 +26,9 @@
         window['AmisUI'] = amis.require('amis-ui');
       });
 
-      window['Amis'].registerFilter('t', function (key,param) {
-          return typeof key === 'string' ? window.t(key,param) : key;
-        })
+      // window['Amis'].registerFilter('t', function (key,param) {
+      //     return typeof key === 'string' ? window.t(key,param) : key;
+      //   })
 
       // 监听窗口的 load 事件，确保所有脚本都加载完成
       window.addEventListener('load', function() {
@@ -66,8 +66,8 @@
     <link rel="stylesheet" href="https://unpkg.com/@steedos-widgets/amis@6.3.0-patch.8/lib/themes/antd.css">
     <link rel="stylesheet" href="https://unpkg.com/@steedos-widgets/amis@6.3.0-patch.8/lib/helper.css">
     <link rel="stylesheet" href="https://unpkg.com/@steedos-widgets/amis@6.3.0-patch.8/sdk/iconfont.css">
-    <script type="module" crossorigin src="/assets/index-K_xwMI-B.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-DucDe4Dz.css">
+    <script type="module" crossorigin src="/assets/index-CIjj35sk.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-CvjS7Xyp.css">
   </head>
   <body class="skin-blue-light fixed steedos sidebar-mini three-columns" >
     <div id="root" class="steedos skin-blue-light creator h-full flex flex-col relative overflow-hidden bg-slate-50"></div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/webapp",
-  "version": "3.0.7-beta.3",
+  "version": "3.0.7",
   "files": [
     "dist"
   ],
@@ -74,9 +74,9 @@
     "access": "public"
   },
   "repository": "https://github.com/steedos/app-builder/tree/master/apps/accounts",
-  "gitHead": "ef6ed92d244835fae9ca3436e7be6f9eb362ffdd",
+  "gitHead": "313eb9122450ffaaa06b8d6c6f21795cc703b340",
   "dependencies": {
-    "@steedos-widgets/amis-object": "^6.10.40",
+    "@steedos-widgets/amis-object": "^6.10.44",
     "autoprefixer": "^10.4.23"
   }
 }