@blocklet/pages-kit-inner-components 0.6.20 → 0.6.22

package/lib/es/home.js

@@ -21,8 +21,8 @@ import "react-helmet";
 import "react-router-dom";
 import "react-use";
 import "ufo";
-import "./chunks/index-aeMNll_R.js";
-import { a as R, P as S, d as W, c as j, b as k, T as q, H as v } from "./chunks/home-Dmze9ay0.js";
+import "./chunks/index-BHQcp5eX.js";
+import { a as R, P as S, d as W, c as j, b as k, T as q, H as v } from "./chunks/home-pT8D7Ttx.js";
 import "./chunks/session-C72Dq8zg.js";
 export {
   R as HomeView,

package/lib/es/locales.js

@@ -224,10 +224,43 @@ const t = e({
       dark: "Dark",
       reverse: "Reverse",
       background: "Background",
+      ignoreMaxWidth: "Ignore Page Global Style Limit",
+      ignoreMaxWidthHelper: "Ignore the page global style limit, such as maxWidth, horizontalPadding, etc.",
       badge: "Badge",
       buttons: "Buttons",
       button: "Button",
-      border: "Border",
+      border: {
+        title: "Border",
+        helper: "Set the border style of the layout",
+        custom: "Custom Border",
+        width: "Border Width(px)",
+        style: "Border Style",
+        color: "Border Color",
+        preview: "Border Preview",
+        solid: "Solid",
+        dashed: "Dashed",
+        dotted: "Dotted",
+        double: "Double",
+        groove: "Groove",
+        ridge: "Ridge",
+        inset: "Inset",
+        outset: "Outset",
+        borderHelper: "Set the border style of the layout",
+        frame: {
+          borderFrame: "Border",
+          deviceFrame: "Device",
+          browserFrame: "Browser",
+          shadowFrame: "Shadow",
+          commonFrame: "Common"
+        }
+      },
+      borderRadius: {
+        title: "Border Radius",
+        helper: "Set the border radius of the layout",
+        custom: "Custom Border Radius",
+        value: "Radius Value(px)",
+        preview: "Radius Preview"
+      },
       shadow: "Shadow",
       color: "Color",
       variant: "Variant",
@@ -307,8 +340,14 @@ const t = e({
       gapUnit: "px",
       padding: "Padding",
       paddingHelper: "Set the padding of the layout",
-      alignContent: "Content Alignment",
-      alignContentHelper: "Set the alignment of the content in the layout",
+      alignContent: {
+        title: "Vertical Alignment",
+        helper: "Set the vertical alignment of content in the layout"
+      },
+      justifyContent: {
+        title: "Horizontal Alignment",
+        helper: "Set the horizontal alignment of content in the layout"
+      },
       visualGridLayout: "Configure Grid Layout",
       dragResizeInstructions: "Drag and resize cards to set layout, you can set different layouts for desktop and mobile",
       setAsBackgroundElement: "Set as background element (cannot drag and resize)",
@@ -740,10 +779,43 @@ const t = e({
       dark: "暗黑",
       reverse: "反转",
       background: "背景",
+      ignoreMaxWidth: "突破页面公共样式限制",
+      ignoreMaxWidthHelper: "突破页面公共样式限制，如 最大宽度、水平内边距等",
       badge: "标签",
       buttons: "按钮",
       button: "按钮",
-      border: "边框",
+      border: {
+        title: "边框",
+        helper: "设置布局的边框样式",
+        custom: "自定义边框",
+        width: "边框宽度 (px)",
+        style: "边框样式",
+        color: "边框颜色",
+        preview: "边框预览",
+        solid: "实线",
+        dashed: "虚线",
+        dotted: "点线",
+        double: "双线",
+        groove: "凹槽",
+        ridge: "凸槽",
+        inset: "内嵌",
+        outset: "外凸",
+        borderHelper: "设置布局的边框样式",
+        frame: {
+          borderFrame: "边框",
+          deviceFrame: "设备",
+          browserFrame: "浏览器",
+          shadowFrame: "阴影",
+          commonFrame: "通用"
+        }
+      },
+      borderRadius: {
+        title: "边框圆角",
+        helper: "设置布局的边框圆角",
+        custom: "自定义边框圆角",
+        value: "圆角大小 (px)",
+        preview: "圆角预览"
+      },
       shadow: "阴影",
       color: "颜色",
       variant: "样式",
@@ -822,8 +894,14 @@ const t = e({
       gapHelper: "设置组件之间的间距",
       padding: "内边距",
       paddingHelper: "设置布局的内边距",
-      alignContent: "内容对齐方式",
-      alignContentHelper: "设置布局中内容的对齐方式",
+      alignContent: {
+        title: "垂直内容对齐",
+        helper: "设置布局中垂直内容的对齐方式"
+      },
+      justifyContent: {
+        title: "水平内容对齐",
+        helper: "设置布局中水平内容的对齐方式"
+      },
       visualGridLayout: "配置网格布局",
       dragResizeInstructions: "通过调整卡片位置和大小调整布局，可以分别设置桌面端和移动端两种布局",
       setAsBackgroundElement: "设置为背景卡片（无法拖拽排序、无法设置大小）",
@@ -1039,7 +1117,7 @@ const t = e({
   style: {
     title: "公共样式"
   }
-}), n = { en: t, zh: a };
+}), r = { en: t, zh: a };
 export {
-  n as translations
+  r as translations
 };

package/lib/es/project-html.js

@@ -1,19 +1,19 @@
-import M from "@arcblock/did-auth-storage-nedb";
-import c, { getBlockletJs as B } from "@blocklet/sdk/lib/config";
-import H from "@blocklet/sdk/lib/service/auth";
-import K from "@blocklet/sdk/lib/wallet";
-import L from "@blocklet/sdk/lib/wallet-authenticator";
-import W from "@blocklet/sdk/lib/wallet-handler";
-import D, { resolve as I } from "path";
-import { l as S, g as N } from "./chunks/components-BWQM8y6L.js";
-import { createHash as U } from "crypto";
+import x from "@arcblock/did-auth-storage-nedb";
+import i, { getBlockletJs as L } from "@blocklet/sdk/lib/config";
+import M from "@blocklet/sdk/lib/service/auth";
+import B from "@blocklet/sdk/lib/wallet";
+import D from "@blocklet/sdk/lib/wallet-authenticator";
+import K from "@blocklet/sdk/lib/wallet-handler";
+import U, { resolve as C } from "path";
+import { l as v, g as W } from "./chunks/components-BWQM8y6L.js";
+import { e as H, i as N } from "./chunks/html-DfzaaIYa.js";
 import { createSnapshotMiddleware as O } from "@arcblock/crawler-middleware";
 import { PreloadComponentScriptModule as R } from "@blocklet/pages-kit/types";
 import { isMuiColorKey as F } from "@blocklet/pages-kit/utils/common";
 import { injectPreloadComponents as J, safeJSONStringify as z } from "@blocklet/pages-kit/utils/preload";
 import { getComponentMountPoint as G } from "@blocklet/sdk/lib/component";
 import { Router as Y } from "express";
-import { readFileSync as T } from "fs";
+import { readFileSync as I } from "fs";
 import Q from "lodash/get";
 import V from "mustache";
 import { withQuery as X, joinURL as j } from "ufo";
@@ -21,11 +21,11 @@ const Z = (o = {}) => {
   const e = {
     data: /* @__PURE__ */ new Map(),
     timers: /* @__PURE__ */ new Map(),
-    set: (t, n, s = o.ttl || 36e5) => {
+    set: (t, p, m = o.ttl || 36e5) => {
       o.max && e.data.size >= o.max && e.delete(e.data.keys().next().value), e.timers.has(t) && clearTimeout(e.timers.get(t)), e.timers.set(
         t,
-        setTimeout(() => e.delete(t), s)
-      ), e.data.set(t, n);
+        setTimeout(() => e.delete(t), m)
+      ), e.data.set(t, p);
     },
     get: (t) => e.data.get(t),
     has: (t) => e.data.has(t),
@@ -38,179 +38,139 @@ const Z = (o = {}) => {
     }
   };
   return e;
-}, E = Z({
+}, T = Z({
   max: 1,
   ttl: 1e3 * 30
   // 30 seconds
 });
-K();
-const q = new L();
-new W({
+B();
+const q = new D();
+new K({
   authenticator: q,
-  tokenStorage: new M({
-    dbPath: D.join(c.env.dataDir, "auth.db")
+  tokenStorage: new x({
+    dbPath: U.join(i.env.dataDir, "auth.db")
   })
 });
-const ee = new H(), te = async () => {
+const ee = new M(), te = async () => {
   try {
-    const o = E.get("blockletInfo");
+    const o = T.get("blockletInfo");
     if (o)
       return o;
     const { blocklet: e } = await ee.getBlocklet();
-    return E.set("blockletInfo", e), e;
+    return T.set("blockletInfo", e), e;
   } catch {
     return null;
   }
-}, oe = async () => await import("cheerio"), _ = {};
-function ne(o, e) {
-  const t = JSON.stringify([o, e]);
-  return U("md5").update(t).digest("hex");
-}
-async function re(o, e) {
-  {
-    let t = await oe();
-    try {
-      const n = t.load(o);
-      return e.forEach((s) => {
-        n(s.selector.cheerio).replaceWith(s.value);
-      }), n.html();
-    } catch {
-    } finally {
-      t = null;
-    }
-  }
-  return ce(o, e);
-}
-function ce(o, e) {
-  let t = o;
-  return e.forEach((n) => {
-    const s = typeof n.selector.pattern == "string" ? new RegExp(n.selector.pattern, "gis") : n.selector.pattern;
-    t = t.replace(s, n.value);
-  }), t;
-}
-async function se(o, e) {
-  if (!e || e.length === 0)
-    return o;
-  const t = ne(o, e);
-  return _[t] ??= re(o, e).finally(() => {
-    setTimeout(() => {
-      delete _[t];
-    }, 10 * 1e3);
-  }), _[t];
-}
-function ae(o) {
-  return o.match(/<body[^>]*>(.*?)<\/body>/s)?.[1] || "";
-}
-const ie = ["/assets/"];
-function Ae({
+}, oe = ["/assets/"];
+function Ce({
   app: o,
   viteDevServer: e,
   // projectId,
   state: t
 }) {
-  let n;
+  let p;
   if (e) {
-    const r = T(I(process.cwd(), "./index.html"), "utf-8");
-    o.use(async (f, b, v) => {
-      const m = f.originalUrl;
-      n = await e.transformIndexHtml(m, r), v();
+    const n = I(C(process.cwd(), "./index.html"), "utf-8");
+    o.use(async (f, k, _) => {
+      const l = f.originalUrl;
+      p = await e.transformIndexHtml(l, n), _();
     });
   } else
-    n = T(I(process.env.BLOCKLET_APP_DIR, "dist/index.html"), "utf-8");
-  const s = Y();
-  s.use((r, f, b) => {
-    if (r.headers["x-unique-record"] === "dial_http") {
-      S.info("[html] dial http request, return 200 status code"), f.status(200).send("ok");
+    p = I(C(process.env.BLOCKLET_APP_DIR, "dist/index.html"), "utf-8");
+  const m = Y();
+  m.use((n, f, k) => {
+    if (n.headers["x-unique-record"] === "dial_http") {
+      v.info("[html] dial http request, return 200 status code"), f.status(200).send("ok");
       return;
     }
-    b();
-  }), c.env.preferences.snapkitEnabled && c.env.preferences.snapkitEndpoint && c.env.SNAP_KIT_ACCESS_KEY && s.use(
+    k();
+  }), i.env.preferences.snapkitEnabled && i.env.preferences.snapkitEndpoint && i.env.SNAP_KIT_ACCESS_KEY && m.use(
     O({
-      endpoint: c.env.preferences.snapkitEndpoint,
-      accessKey: c.env.SNAP_KIT_ACCESS_KEY,
-      cacheMax: c.env.preferences.snapkitCacheSize || 100
+      endpoint: i.env.preferences.snapkitEndpoint,
+      accessKey: i.env.SNAP_KIT_ACCESS_KEY,
+      cacheMax: i.env.preferences.snapkitCacheSize || 100
     })
-  ), s.get("/:path(*)?", async (r, f, b) => {
-    if (ie.some((a) => r.path?.startsWith(a))) {
-      b();
+  ), m.get("/:path(*)?", async (n, f, k) => {
+    if (oe.some((s) => n.path?.startsWith(s))) {
+      k();
       return;
     }
-    const v = "production";
-    let m, k, g = n;
-    if (r.path.startsWith("/pages")) {
-      const a = r.params.lang, y = r.cookies.nf_lang, w = /* @__PURE__ */ new Set([...c.env.languages.map((h) => h.code)]);
-      let u = (a && w.has(a) ? a : void 0) || (w.has(y) ? y : void 0) || [...w][0];
+    const _ = "production";
+    let l, b, g = p;
+    if (n.path.startsWith("/pages")) {
+      const s = n.params.lang, y = n.cookies.nf_lang, w = /* @__PURE__ */ new Set([...i.env.languages.map((h) => h.code)]);
+      let u = (s && w.has(s) ? s : void 0) || (w.has(y) ? y : void 0) || [...w][0];
       if ((!u || !t.supportedLocales?.find((h) => h.locale === u)) && (u = t.supportedLocales?.[0]?.locale || ""), u) {
         const h = [];
-        Object.values(t.pages).forEach((i) => {
-          const x = Object.values(i?.sections ?? {}).filter(
-            (p) => p.component === "custom-component" && p.config?.componentId
-          ).map((p) => ({
-            id: p.id,
-            componentId: p.config.componentId,
-            useCache: p.config.useCache,
-            cacheDuration: p.config.cacheDuration,
-            properties: i?.dataSource?.[p.id]?.[u]
+        Object.values(t.pages).forEach((r) => {
+          const $ = Object.values(r?.sections ?? {}).filter(
+            (c) => c.component === "custom-component" && c.config?.componentId
+          ).map((c) => ({
+            id: c.id,
+            componentId: c.config.componentId,
+            useCache: c.config.useCache,
+            cacheDuration: c.config.cacheDuration,
+            properties: r?.dataSource?.[c.id]?.[u]
             //  ?? i.locales?.[respectLocale!]?.properties,
           }));
-          h.push(...x);
+          h.push(...$);
         });
-        const $ = new Promise((i) => {
+        const E = new Promise((r) => {
           setTimeout(() => {
-            i({});
+            r({});
           }, 30 * 1e3);
         });
         try {
           await Promise.race([
-            $,
-            N({
-              mode: v,
-              req: r,
+            E,
+            W({
+              mode: _,
+              req: n,
               state: t,
               locale: u,
               instances: h,
               module: R.UMD_FN
-            }).then((i) => {
-              i && (k = J(i));
+            }).then((r) => {
+              r && (b = J(r));
             })
           ]);
-        } catch (i) {
-          S.warn("getPreloadComponents timeout in promise race, skip inject html elements", i);
+        } catch (r) {
+          v.warn("getPreloadComponents timeout in promise race, skip inject html elements", r);
         }
       }
     }
     try {
-      const a = m?.title || c.env.appName, y = m?.description || c.env.appDescription, w = X(j(c.env.appUrl, "/.well-known/service/blocklet/og.png"), {
-        title: a,
+      const s = l?.title || i.env.appName, y = l?.description || i.env.appDescription, w = X(j(i.env.appUrl, "/.well-known/service/blocklet/og.png"), {
+        title: s,
         description: y
       });
-      g = V.render(n, {
-        ogTitle: a,
+      g = V.render(p, {
+        ogTitle: s,
         ogDescription: y,
-        ogImage: le(m?.image) || w,
+        ogImage: ne(l?.image) || w,
         pagesPublishedAt: t?.config.publishedAt || (/* @__PURE__ */ new Date()).getTime()
       });
     } catch {
     }
-    const d = t?.config.fontFamily, P = r.query.mode === "draft" || r.url.includes("preview") || r.path?.startsWith("/admin");
-    let l = m?.backgroundColor;
-    if (l && F(l)) {
-      const a = await te();
-      l = Q(
-        a,
+    const d = t?.config.fontFamily, P = n.query.mode === "draft" || n.url.includes("preview") || n.path?.startsWith("/admin");
+    let a = l?.backgroundColor;
+    if (a && F(a)) {
+      const s = await te();
+      a = Q(
+        s,
         // 目前 dark 和 light 还是前端行为，后端通过 从 light 中获取
-        `settings.theme.light.palette.${l}`,
-        l
+        `settings.theme.light.palette.${a}`,
+        a
       );
     }
-    const C = B(), A = [
+    const S = L(), A = [
       {
         selector: {
           cheerio: "#injected-head-elements",
           pattern: /<script[^>]*id=["']injected-head-elements["'][^>]*><\/script>/gis
         },
         value: `
-        ${l ? `<meta name="theme-color" content="${l}" /><style>html,body,#app {background-color: ${l};}</style>` : ""}
+        ${a ? `<meta name="theme-color" content="${a}" /><style>html,body,#app {background-color: ${a};}</style>` : ""}
         ${d?.title ? `<link rel="preload" as="style" href="https://fonts.googleapis.com/css?family=${d.title}&display=swap">` : ""}
         ${d?.description && d?.description !== d?.title ? `<link rel="preload" as="style" href="https://fonts.googleapis.com/css?family=${d.description}&display=swap">` : ""}
       
@@ -238,37 +198,37 @@ function Ae({
         `
       },
       // blocklet.js script
-      C && {
+      S && {
         selector: {
           cheerio: 'script[src="__blocklet__.js"]',
           pattern: /<script[^>]*src=["']__blocklet__\.js["'][^>]*><\/script>/gis
         },
-        value: `<script>${C}<\/script>`
+        value: `<script>${S}<\/script>`
       },
       // injected-html-elements
-      k?.html && {
+      b?.html && {
         selector: {
           cheerio: "#injected-html-elements",
           pattern: /<script[^>]*id=["']injected-html-elements["'][^>]*><\/script>/gis
         },
-        value: k.html
+        value: b.html
       },
       // cachedHtml body content
-      r.cachedHtml && {
+      n.cachedHtml && {
         selector: {
           cheerio: "body",
           pattern: /(<body[^>]*>).*?(<\/body>)/gis
         },
-        value: `<body>${ae(r.cachedHtml)}</body>`
+        value: `<body>${H(n.cachedHtml)}</body>`
       }
     ].filter(Boolean);
-    g = await se(g, A), f.send(g), S.info(`[html] render: ${r.path}`), g = null, m = null, k = null;
-  }), o.use(s);
+    g = await N(g, A), f.send(g), v.info(`[html] render: ${n.path}`), g = null, l = null, b = null;
+  }), o.use(m);
 }
-function le(o) {
+function ne(o) {
   const e = G("image-bin");
-  return e && o && !/^(https?:\/\/|\/)/.test(o) ? c.env.appUrl + j(e, "uploads", o) : o;
+  return e && o && !/^(https?:\/\/|\/)/.test(o) ? i.env.appUrl + j(e, "uploads", o) : o;
 }
 export {
-  Ae as default
+  Ce as default
 };

package/lib/es/resources.js

@@ -1,5 +1,5 @@
 import { i as A, a as M, l as b } from "./chunks/components-BWQM8y6L.js";
-import { P as w, C as J, R as X, S as x, t as W, g as G } from "./chunks/site-state-Dt2__Byi.js";
+import { P as w, C as J, R as X, S as x, t as W, g as G } from "./chunks/site-state-CqlS8v17.js";
 import { Router as K } from "express";
 import a from "fs";
 import m from "joi";