@nocobase/flow-engine 2.1.31 → 2.2.0-alpha.10

package/lib/JSRunner.d.ts

@@ -27,6 +27,7 @@ export interface JSRunnerOptions {
  * 3. Fallback keeps v1-compatible behavior (enabled).
  */
 export declare function shouldPreprocessRunJSTemplates(options?: Pick<JSRunnerOptions, 'preprocessTemplates' | 'version'>): boolean;
+export declare const RUNJS_ALLOWED_BARE_GLOBAL_NAMES: readonly ["ctx", "console", "window", "document", "navigator", "setTimeout", "clearTimeout", "setInterval", "clearInterval", "Array", "ArrayBuffer", "BigInt", "BigInt64Array", "BigUint64Array", "Boolean", "DataView", "Date", "Error", "EvalError", "FinalizationRegistry", "Float32Array", "Float64Array", "Int8Array", "Int16Array", "Int32Array", "Map", "Math", "Number", "Object", "Promise", "Proxy", "RangeError", "ReferenceError", "Reflect", "RegExp", "Set", "String", "Symbol", "SyntaxError", "TypeError", "URIError", "Uint8Array", "Uint8ClampedArray", "Uint16Array", "Uint32Array", "WeakMap", "WeakRef", "WeakSet", "JSON", "decodeURI", "decodeURIComponent", "encodeURI", "encodeURIComponent", "isFinite", "isNaN", "parseFloat", "parseInt", "undefined", "NaN", "Infinity", "fetch", "localStorage", "sessionStorage", "XMLHttpRequest", "WebSocket", "Worker", "SharedWorker", "ServiceWorker", "BroadcastChannel", "EventSource", "indexedDB", "caches", "Function", "eval", "globalThis", "Intl", "Blob", "URL", "location"];
 export declare class JSRunner {
     private globals;
     private timeoutMs;

package/lib/JSRunner.js

@@ -28,6 +28,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var JSRunner_exports = {};
 __export(JSRunner_exports, {
   JSRunner: () => JSRunner,
+  RUNJS_ALLOWED_BARE_GLOBAL_NAMES: () => RUNJS_ALLOWED_BARE_GLOBAL_NAMES,
   shouldPreprocessRunJSTemplates: () => shouldPreprocessRunJSTemplates
 });
 module.exports = __toCommonJS(JSRunner_exports);
@@ -40,6 +41,113 @@ function shouldPreprocessRunJSTemplates(options) {
   return (options == null ? void 0 : options.version) !== "v2";
 }
 __name(shouldPreprocessRunJSTemplates, "shouldPreprocessRunJSTemplates");
+const RUNJS_BROWSER_GLOBAL_NAMES = [
+  "fetch",
+  "localStorage",
+  "sessionStorage",
+  "XMLHttpRequest",
+  "WebSocket",
+  "Worker",
+  "SharedWorker",
+  "ServiceWorker",
+  "BroadcastChannel",
+  "EventSource",
+  "indexedDB",
+  "caches",
+  "Function",
+  "eval",
+  "globalThis",
+  "Intl",
+  "Blob",
+  "URL",
+  "location"
+];
+const RUNJS_ALLOWED_BARE_GLOBAL_NAMES = [
+  "ctx",
+  "console",
+  "window",
+  "document",
+  "navigator",
+  "setTimeout",
+  "clearTimeout",
+  "setInterval",
+  "clearInterval",
+  "Array",
+  "ArrayBuffer",
+  "BigInt",
+  "BigInt64Array",
+  "BigUint64Array",
+  "Boolean",
+  "DataView",
+  "Date",
+  "Error",
+  "EvalError",
+  "FinalizationRegistry",
+  "Float32Array",
+  "Float64Array",
+  "Int8Array",
+  "Int16Array",
+  "Int32Array",
+  "Map",
+  "Math",
+  "Number",
+  "Object",
+  "Promise",
+  "Proxy",
+  "RangeError",
+  "ReferenceError",
+  "Reflect",
+  "RegExp",
+  "Set",
+  "String",
+  "Symbol",
+  "SyntaxError",
+  "TypeError",
+  "URIError",
+  "Uint8Array",
+  "Uint8ClampedArray",
+  "Uint16Array",
+  "Uint32Array",
+  "WeakMap",
+  "WeakRef",
+  "WeakSet",
+  "JSON",
+  "decodeURI",
+  "decodeURIComponent",
+  "encodeURI",
+  "encodeURIComponent",
+  "isFinite",
+  "isNaN",
+  "parseFloat",
+  "parseInt",
+  "undefined",
+  "NaN",
+  "Infinity",
+  ...RUNJS_BROWSER_GLOBAL_NAMES
+];
+function collectRunJSBrowserGlobals(providedGlobals = {}) {
+  const windowGlobal = providedGlobals.window;
+  if (!windowGlobal || typeof windowGlobal !== "object") {
+    return {};
+  }
+  const windowRecord = windowGlobal;
+  const globals = {};
+  RUNJS_BROWSER_GLOBAL_NAMES.forEach((name) => {
+    if (Object.prototype.hasOwnProperty.call(providedGlobals, name)) {
+      return;
+    }
+    try {
+      const value = windowRecord[name];
+      if (typeof value === "undefined") {
+        return;
+      }
+      globals[name] = name === "fetch" && typeof value === "function" ? value.bind(windowGlobal) : value;
+    } catch {
+    }
+  });
+  return globals;
+}
+__name(collectRunJSBrowserGlobals, "collectRunJSBrowserGlobals");
 const BARE_CTX_TEMPLATE_RE = /(^|[=(:,[\s)])(\{\{\s*(ctx(?:\.|\[|\?\.)[^}]*)\s*\}\})/m;
 function extractDeprecatedCtxTemplateUsage(code) {
   const src = String(code || "");
@@ -78,7 +186,6 @@ const _JSRunner = class _JSRunner {
   globals;
   timeoutMs;
   constructor(options = {}) {
-    var _a, _b;
     const bindWindowFn = /* @__PURE__ */ __name((key) => {
       if (typeof window !== "undefined" && typeof window[key] === "function") {
         return window[key].bind(window);
@@ -87,25 +194,7 @@ const _JSRunner = class _JSRunner {
       return typeof fn === "function" ? fn.bind(globalThis) : fn;
     }, "bindWindowFn");
     const providedGlobals = options.globals || {};
-    const liftedGlobals = {};
-    if (!Object.prototype.hasOwnProperty.call(providedGlobals, "Blob")) {
-      try {
-        const blobCtor = (_a = providedGlobals.window) == null ? void 0 : _a.Blob;
-        if (typeof blobCtor !== "undefined") {
-          liftedGlobals.Blob = blobCtor;
-        }
-      } catch {
-      }
-    }
-    if (!Object.prototype.hasOwnProperty.call(providedGlobals, "URL")) {
-      try {
-        const urlCtor = (_b = providedGlobals.window) == null ? void 0 : _b.URL;
-        if (typeof urlCtor !== "undefined") {
-          liftedGlobals.URL = urlCtor;
-        }
-      } catch {
-      }
-    }
+    const liftedGlobals = collectRunJSBrowserGlobals(providedGlobals);
     this.globals = {
       console,
       setTimeout: bindWindowFn("setTimeout"),
@@ -169,5 +258,6 @@ let JSRunner = _JSRunner;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   JSRunner,
+  RUNJS_ALLOWED_BARE_GLOBAL_NAMES,
   shouldPreprocessRunJSTemplates
 });

package/lib/components/FlowContextSelector.js

@@ -57,6 +57,15 @@ const cascaderPopupAutoHeightClassName = import_css.css`
     max-height: 50vh;
   }
 `;
+function getMetaNodeTooltip(meta) {
+  if (!meta) {
+    return void 0;
+  }
+  const metaWithTooltip = meta;
+  const options = meta.options;
+  return metaWithTooltip.tooltip ?? (options == null ? void 0 : options.tooltip);
+}
+__name(getMetaNodeTooltip, "getMetaNodeTooltip");
 const normalizePath = /* @__PURE__ */ __name((path) => {
   if (!Array.isArray(path)) {
     return void 0;
@@ -90,6 +99,7 @@ const FlowContextSelectorComponent = /* @__PURE__ */ __name(({
   value,
   onChange,
   children,
+  active,
   metaTree,
   showSearch = false,
   parseValueToPath: customParseValueToPath = import_utils.parseValueToPath,
@@ -97,6 +107,7 @@ const FlowContextSelectorComponent = /* @__PURE__ */ __name(({
   open,
   onlyLeafSelectable = false,
   ignoreFieldNames,
+  dropdownFooter,
   ...cascaderProps
 }) => {
   const { token } = import_antd.theme.useToken();
@@ -111,15 +122,27 @@ const FlowContextSelectorComponent = /* @__PURE__ */ __name(({
         const disabled = meta ? !!(typeof meta.disabled === "function" ? meta.disabled() : meta.disabled) : false;
         const disabledReason = meta ? typeof meta.disabledReason === "function" ? meta.disabledReason() : meta.disabledReason : void 0;
         const baseLabel = typeof o.label === "string" ? flowCtx.t(o.label) : o.label;
-        const label = disabled ? /* @__PURE__ */ import_react.default.createElement("span", null, baseLabel, /* @__PURE__ */ import_react.default.createElement(
+        const labelText = typeof baseLabel === "string" ? baseLabel : String(o.value);
+        const tooltip = getMetaNodeTooltip(meta);
+        const tooltipTitle = disabled ? disabledReason || tooltip || flowCtx.t("This variable is not available") : tooltip;
+        const label = tooltipTitle ? /* @__PURE__ */ import_react.default.createElement("span", null, baseLabel, /* @__PURE__ */ import_react.default.createElement(
           import_antd.Tooltip,
           {
-            title: disabledReason || flowCtx.t("This variable is not available"),
-            placement: "right",
-            overlayClassName: "flow-variable-disabled-tip",
+            title: typeof tooltipTitle === "string" ? flowCtx.t(tooltipTitle) : tooltipTitle,
+            placement: "top",
+            classNames: { root: "flow-variable-tip" },
             destroyTooltipOnHide: true
           },
-          /* @__PURE__ */ import_react.default.createElement(import_icons.QuestionCircleOutlined, { style: { marginLeft: 6, color: "rgba(0,0,0,0.35)" } })
+          /* @__PURE__ */ import_react.default.createElement(
+            import_icons.QuestionCircleOutlined,
+            {
+              "aria-label": `${labelText} tooltip`,
+              style: {
+                marginLeft: token.marginXXS,
+                color: disabled ? token.colorTextDisabled : token.colorTextDescription
+              }
+            }
+          )
         )) : baseLabel;
         return {
           ...o,
@@ -129,7 +152,7 @@ const FlowContextSelectorComponent = /* @__PURE__ */ __name(({
         };
       });
     },
-    [flowCtx]
+    [flowCtx, token.colorTextDescription, token.colorTextDisabled, token.marginXXS]
   );
   const [updateFlag, setUpdateFlag] = (0, import_react.useState)(0);
   const [searchText, setSearchText] = (0, import_react.useState)("");
@@ -219,9 +242,9 @@ const FlowContextSelectorComponent = /* @__PURE__ */ __name(({
     (0, import_utils.preloadContextSelectorPath)(options, pathToPreload, triggerUpdate);
   }, [options, pathToPreload, triggerUpdate]);
   const defaultChildren = (0, import_react.useMemo)(() => {
-    const hasSelected = currentPath && currentPath.length > 0;
-    return /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: hasSelected ? "primary" : "default", style: defaultButtonStyle }, "x");
-  }, [currentPath]);
+    const hasSelected = active ?? Boolean(currentPath && currentPath.length > 0);
+    return /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: hasSelected ? "primary" : "default", style: defaultButtonStyle, disabled: cascaderProps.disabled }, "x");
+  }, [active, cascaderProps.disabled, currentPath]);
   const handleChange = (0, import_react.useCallback)(
     (selectedValues, selectedOptions) => {
       const lastOption = selectedOptions == null ? void 0 : selectedOptions[selectedOptions.length - 1];
@@ -289,12 +312,32 @@ const FlowContextSelectorComponent = /* @__PURE__ */ __name(({
     },
     [cascaderOnDropdownVisibleChange, open]
   );
+  const footerNode = (0, import_react.useMemo)(() => {
+    if (dropdownFooter !== void 0) {
+      return dropdownFooter;
+    }
+    if (onlyLeafSelectable) {
+      return null;
+    }
+    return /* @__PURE__ */ import_react.default.createElement(
+      "div",
+      {
+        className: import_css.css`
+          padding: 6px 12px;
+          color: ${token.colorTextDescription};
+          border-top: 1px solid ${token.colorSplit};
+          font-size: ${token.fontSizeSM}px;
+        `
+      },
+      flowCtx.t("Double click to choose entire object")
+    );
+  }, [dropdownFooter, onlyLeafSelectable, token, flowCtx]);
   const renderDropdown = (0, import_react.useCallback)(
     (menu) => {
       const cascaderMenuNode = cascaderDropdownRender ? cascaderDropdownRender(menu) : menu;
       const cascaderMenu = import_react.default.isValidElement(cascaderMenuNode) ? cascaderMenuNode : /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, cascaderMenuNode);
       if (!isSearchEnabled || children === null) {
-        return cascaderMenu;
+        return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, cascaderMenu, footerNode);
       }
       return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement("div", { className: cascaderSearchInputClassName }, /* @__PURE__ */ import_react.default.createElement(
         import_antd.Input,
@@ -306,9 +349,9 @@ const FlowContextSelectorComponent = /* @__PURE__ */ __name(({
           onChange: (e) => setSearchText(e.target.value),
           onKeyDown: (e) => e.stopPropagation()
         }
-      )), cascaderMenu);
+      )), cascaderMenu, footerNode);
     },
-    [cascaderDropdownRender, cascaderSearchInputClassName, children, flowCtx, isSearchEnabled, searchText]
+    [cascaderDropdownRender, cascaderSearchInputClassName, children, flowCtx, isSearchEnabled, searchText, footerNode]
   );
   const inlinePlaceholder = typeof restCascaderProps.placeholder === "string" ? restCascaderProps.placeholder : flowCtx.t("Search");
   const hasSelectedPath = Array.isArray(effectivePath) && effectivePath.length > 0;

package/lib/components/FormItem.js

@@ -77,14 +77,18 @@ const formItemPropKeys = [
   "required",
   "showLabel"
 ];
+const modelInternalPropKeys = ["globalSort"];
 const FormItem = /* @__PURE__ */ __name(({
   children,
   showLabel = true,
   labelWidth,
   ...rest
 }) => {
+  const forwardedRest = Object.fromEntries(
+    Object.entries(rest).filter(([key]) => !modelInternalPropKeys.includes(key))
+  );
   const childProps = Object.fromEntries(
-    Object.entries(rest).filter(([key]) => !formItemPropKeys.includes(key))
+    Object.entries(forwardedRest).filter(([key]) => !formItemPropKeys.includes(key))
   );
   const processedChildren = typeof children === "function" ? children : import_react.default.Children.map(children, (child) => {
     if (import_react.default.isValidElement(child)) {
@@ -92,7 +96,7 @@ const FormItem = /* @__PURE__ */ __name(({
     }
     return child;
   });
-  const { label, labelWrap, colon = true, layout } = rest;
+  const { label, labelWrap, colon = true, layout } = forwardedRest;
   const effectiveLabelWrap = !layout || layout === "vertical" ? true : labelWrap;
   const labelColStyle = layout === "vertical" ? { width: labelWidth, ...verticalFormItemLabelStyle } : { width: labelWidth };
   const renderLabel = /* @__PURE__ */ __name(() => {
@@ -136,15 +140,15 @@ const FormItem = /* @__PURE__ */ __name(({
   return /* @__PURE__ */ import_react.default.createElement(
     import_antd.Form.Item,
     {
-      ...rest,
-      style: { ...formItemStyle, ...rest.style },
+      ...forwardedRest,
+      style: { ...formItemStyle, ...forwardedRest.style },
       labelCol: { style: labelColStyle },
       layout,
       label: renderLabel(),
       colon: false,
-      extra: rest.extra && /* @__PURE__ */ import_react.default.createElement("span", { style: { whiteSpace: "pre-wrap" } }, rest.extra),
-      tooltip: rest.tooltip && {
-        title: rest.tooltip,
+      extra: forwardedRest.extra && /* @__PURE__ */ import_react.default.createElement("span", { style: { whiteSpace: "pre-wrap" } }, forwardedRest.extra),
+      tooltip: forwardedRest.tooltip && {
+        title: forwardedRest.tooltip,
         overlayInnerStyle: { whiteSpace: "pre-line" }
       }
     },

package/lib/components/MobilePopup.style.js

@@ -96,9 +96,17 @@ const genStyleHook = /* @__PURE__ */ __name((component, styleFn) => {
         return [genCommonStyle(token, prefixCls), styleInterpolation];
       }
     );
-    const memoizedWrapSSR = (0, import_react.useMemo)(() => {
-      return wrapSSR;
-    }, [wrapSSR]);
+    const wrapSSRDeps = [theme2, token, hashId, prefixCls, iconPrefixCls, rootPrefixCls, props];
+    const wrapSSRCacheRef = (0, import_react.useRef)();
+    const currentCache = wrapSSRCacheRef.current;
+    let memoizedWrapSSR = (currentCache == null ? void 0 : currentCache.wrapSSR) || wrapSSR;
+    if (!currentCache || wrapSSRDeps.some((dep, index) => dep !== currentCache.deps[index])) {
+      wrapSSRCacheRef.current = {
+        deps: wrapSSRDeps,
+        wrapSSR
+      };
+      memoizedWrapSSR = wrapSSR;
+    }
     return {
       wrapSSR: memoizedWrapSSR,
       hashId,
@@ -112,7 +120,7 @@ const useMobileActionDrawerStyle = genStyleHook("nb-mobile-action-drawer", (toke
   return {
     [componentCls]: {
       ".nb-mobile-action-drawer-header": {
-        height: "var(--nb-mobile-page-header-height)",
+        height: "var(--nb-mobile-page-header-height, 46px)",
         display: "flex",
         alignItems: "center",
         justifyContent: "space-between",
@@ -149,7 +157,10 @@ const useMobileActionDrawerStyle = genStyleHook("nb-mobile-action-drawer", (toke
       ".nb-mobile-action-drawer-body": {
         borderTopLeftRadius: 8,
         borderTopRightRadius: 8,
-        maxHeight: "calc(100% - var(--nb-mobile-page-header-height))",
+        maxHeight: "calc(100vh - var(--nb-mobile-page-header-height, 46px))",
+        "@supports (height: 100dvh)": {
+          maxHeight: "calc(100dvh - var(--nb-mobile-page-header-height, 46px))"
+        },
         overflowY: "auto",
         overflowX: "hidden",
         backgroundColor: token.colorBgLayout,

package/lib/components/variables/VariableHybridInput.d.ts

@@ -17,11 +17,20 @@ export interface VariableHybridInputProps {
     value?: string;
     onChange?: (value: string) => void;
     disabled?: boolean;
+    readOnly?: boolean;
     placeholder?: string;
     addonBefore?: React.ReactNode;
     metaTree?: MetaTreeNode[] | (() => MetaTreeNode[] | Promise<MetaTreeNode[]>);
     converters?: VariableHybridInputConverters;
     style?: React.CSSProperties;
     className?: string;
+    /**
+     * Validation status — turns the input border red (`error`) or amber
+     * (`warning`). Usually omitted: when rendered inside an antd `Form.Item`, the
+     * status is read automatically from `FormItemInputContext`, so dropping this
+     * into a `Form.Item` with failing rules colours the border with no extra
+     * wiring. An explicit prop wins over the inherited form status.
+     */
+    status?: 'error' | 'warning';
 }
 export declare const VariableHybridInput: React.NamedExoticComponent<VariableHybridInputProps>;