@steedos-widgets/antd 6.10.52-beta.1 → 6.10.52-beta.11

package/dist/antd.umd.js

@@ -22,7 +22,26 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
   OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
   PERFORMANCE OF THIS SOFTWARE.
   ***************************************************************************** */
+  /* global Reflect, Promise, SuppressedError, Symbol, Iterator */
 
+  var _extendStatics = function extendStatics(d, b) {
+    _extendStatics = Object.setPrototypeOf || {
+      __proto__: []
+    } instanceof Array && function (d, b) {
+      d.__proto__ = b;
+    } || function (d, b) {
+      for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p];
+    };
+    return _extendStatics(d, b);
+  };
+  function __extends(d, b) {
+    if (typeof b !== "function" && b !== null) throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+    _extendStatics(d, b);
+    function __() {
+      this.constructor = d;
+    }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+  }
   var _assign = function __assign() {
     _assign = Object.assign || function __assign(t) {
       for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -341,28 +360,92 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
     return flattened;
   }
   // --- 组件实现 ---
-  var LiquidComponent = function LiquidComponent(_a) {
-    var _b;
-    var template = _a.template,
-      tpl = _a.tpl,
-      data = _a.data,
-      className = _a.className,
-      $schema = _a.$schema,
-      amisRender = _a.render,
-      dispatchEvent = _a.dispatchEvent,
-      propsPartials = _a.partials;
-    __rest(_a, ["template", "tpl", "data", "className", "$schema", "render", "dispatchEvent", "partials"]);
-    var doAction = (_b = data._scoped) === null || _b === void 0 ? void 0 : _b.doAction;
+  // --- 错误边界组件 ---
+  var ErrorBoundary = /** @class */function (_super) {
+    __extends(ErrorBoundary, _super);
+    function ErrorBoundary(props) {
+      var _this = _super.call(this, props) || this;
+      _this.state = {
+        hasError: false,
+        error: null
+      };
+      return _this;
+    }
+    ErrorBoundary.getDerivedStateFromError = function (error) {
+      return {
+        hasError: true,
+        error: error
+      };
+    };
+    ErrorBoundary.prototype.componentDidCatch = function (error, errorInfo) {
+      console.error("Liquid Component ErrorBoundary caught error:", error, errorInfo);
+    };
+    ErrorBoundary.prototype.render = function () {
+      if (this.state.hasError) {
+        // 如果提供了 fallback 则使用 fallback，否则不显示（静默失败，符合“不影响整体显示”的要求）
+        // 但对于顶层错误，可能需要显示。这里用于 amisRender 的局部包裹。
+        return this.props.fallback || null;
+      }
+      return this.props.children;
+    };
+    return ErrorBoundary;
+  }(React__default["default"].Component);
+  // --- 错误显示组件 ---
+  var ErrorDisplay = function ErrorDisplay(_a) {
+    var error = _a.error;
+    var _b = __read(React.useState(false), 2),
+      expanded = _b[0],
+      setExpanded = _b[1];
+    if (!error) return null;
+    return React__default["default"].createElement("div", {
+      className: "border border-red-500 bg-red-50 text-red-700 p-4 rounded mb-4 text-sm font-mono"
+    }, React__default["default"].createElement("div", {
+      className: "flex justify-between items-start"
+    }, React__default["default"].createElement("div", {
+      className: "font-bold"
+    }, "Template Render Error"), React__default["default"].createElement("button", {
+      onClick: function onClick() {
+        return setExpanded(!expanded);
+      },
+      className: "text-blue-600 hover:underline text-xs ml-4 whitespace-nowrap"
+    }, expanded ? 'Hide Details' : 'Show Details')), React__default["default"].createElement("div", {
+      className: "mt-1"
+    }, error.message), expanded && React__default["default"].createElement("div", {
+      className: "mt-2 pt-2 border-t border-red-200 text-xs overflow-auto max-h-60"
+    }, React__default["default"].createElement("pre", null, error.stack)));
+  };
+  var LiquidComponent = function LiquidComponent(props) {
+    var _a;
+    var template = props.template,
+      tpl = props.tpl,
+      data = props.data,
+      className = props.className,
+      $schema = props.$schema,
+      amisRender = props.render,
+      dispatchEvent = props.dispatchEvent,
+      propsPartials = props.partials;
+    __rest(props, ["template", "tpl", "data", "className", "$schema", "render", "dispatchEvent", "partials"]);
+    var doAction = (_a = data._scoped) === null || _a === void 0 ? void 0 : _a.doAction;
     // 支持 tpl 作为 template 的别名
     if (tpl && !template) {
       template = tpl;
     }
-    var _c = __read(React.useState(''), 2),
-      html = _c[0],
-      setHtml = _c[1];
-    var _d = __read(React.useState({}), 2),
-      mountNodes = _d[0],
-      setMountNodes = _d[1];
+    if (!template) {
+      template = props.$schema.template;
+    }
+    // console.log('template =============>', template, props);
+    var _b = __read(React.useState(''), 2),
+      html = _b[0],
+      setHtml = _b[1];
+    var _c = __read(React.useState(null), 2),
+      error = _c[0],
+      setError = _c[1];
+    var _d = __read(React.useState([]), 2),
+      parsedTemplates = _d[0],
+      setParsedTemplates = _d[1];
+    var _e = __read(React.useState({}), 2),
+      mountNodes = _e[0],
+      setMountNodes = _e[1];
     var containerRef = React.useRef(null);
     // 用于存储脚本清理函数的引用，以便在组件卸载或更新时清理副作用
     var scriptCleanupsRef = React.useRef([]);
@@ -414,6 +497,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
         parse: function parse(tagToken, remainTokens) {
           var _this = this;
           this.templates = [];
+          this.id = generateId();
           var stream = liq.parser.parseStream(remainTokens);
           stream.on('tag:endamis', function () {
             return stream.stop();
@@ -437,7 +521,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
               }
               try {
                 schema = looseJsonParse(rawStr);
-                id = generateId();
+                id = this.id;
                 register = ctx.get(['__registerInlineSchema']);
                 if (!register && ctx.environments) {
                   register = ctx.environments['__registerInlineSchema'];
@@ -460,8 +544,36 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
     }, []);
     var dataFingerprint = JSON.stringify(data);
     var partialsFingerprint = JSON.stringify(finalPartials);
+    React.useEffect(function () {
+      // console.log('template', template)
+      var isMounted = true;
+      try {
+        if (!template) {
+          if (isMounted) {
+            setParsedTemplates([]);
+            setError(null);
+          }
+          return;
+        }
+        var tpl_1 = engine.parse(template);
+        if (isMounted) {
+          setParsedTemplates(tpl_1);
+          setError(null);
+        }
+      } catch (e) {
+        console.error("Liquid Parse Error:", e);
+        if (isMounted) {
+          setError(e);
+          setParsedTemplates(null);
+        }
+      }
+      return function () {
+        isMounted = false;
+      };
+    }, [engine, template]);
     // 2. Liquid 渲染 HTML
     React.useEffect(function () {
+      if (!parsedTemplates) return;
       var isMounted = true;
       inlineSchemasRef.current = {};
       var contextData = _assign(_assign({}, flattenObjectChain(data)), {
@@ -469,33 +581,47 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
           inlineSchemasRef.current[id] = schema;
         }
       });
-      engine.parseAndRender(template, contextData).then(function (result) {
+      // console.debug('[Liquid] Start render with context:', parsedTemplates, contextData);
+      engine.render(parsedTemplates, contextData).then(function (result) {
         if (isMounted) {
+          // console.debug('[Liquid] Render success, content length:', result?.length, result);
           setHtml(function (prev) {
             return prev !== result ? result : prev;
           });
+          setError(null);
         }
       })["catch"](function (err) {
-        if (isMounted) console.error("Liquid Render Error:", err);
+        // console.log(`render error: `, template, contextData)
+        if (isMounted) {
+          console.error("Liquid Render Error:", err);
+          setError(err);
+        }
       });
       return function () {
         isMounted = false;
       };
-    }, [engine, template, dataFingerprint, partialsFingerprint]);
+    }, [engine, parsedTemplates, dataFingerprint, partialsFingerprint]);
     // 3. Portals 挂载检测
     React.useEffect(function () {
       if (!containerRef.current) return;
       var nodes = {};
       var elements = containerRef.current.querySelectorAll('[data-amis-partial]');
-      var hasChanges = false;
       elements.forEach(function (el) {
         var key = el.getAttribute('data-amis-partial');
         if (key && (inlineSchemasRef.current[key] || partialsRef.current[key])) {
           nodes[key] = el;
-          hasChanges = true;
         }
       });
-      if (hasChanges) setMountNodes(nodes);
+      // 只有在节点实际发生变化时才更新，防止死循环
+      // 简单的 key 比较
+      setMountNodes(function (prev) {
+        var prevKeys = Object.keys(prev).sort().join(',');
+        var newKeys = Object.keys(nodes).sort().join(',');
+        if (prevKeys !== newKeys) return nodes;
+        // 如果想要更精确，还得对比 dom 引用，通常 key 变了 dom 也就变了
+        // 这里只是为了避免不必要的 set
+        return prev;
+      });
     }, [html]);
     // 4. 创建 Portals
     var portals = React.useMemo(function () {
@@ -504,9 +630,11 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
         var schema = inlineSchemasRef.current[key] || partialsRef.current[key];
         if (!schema || !domNode) return null;
         try {
-          return reactDom.createPortal(amisRender("partial-".concat(key), schema, {
+          return reactDom.createPortal(React__default["default"].createElement(ErrorBoundary, {
+            fallback: null
+          }, amisRender("partial-".concat(key), schema, {
             data: data
-          }), domNode);
+          })), domNode);
         } catch (e) {
           return null;
         }
@@ -558,7 +686,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
           // 标记当前节点已处理，防止下次 render 重复
           scriptNode.dataset.executed = "true";
           if (isGlobalLoaded) {
-            console.log("[Liquid] Script already loaded: ".concat(src));
+            // console.log(`[Liquid] Script already loaded: ${src}`);
             resolve(); // 已存在，直接视为成功
             return;
           }
@@ -573,7 +701,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
             }
           });
           newScript.onload = function () {
-            console.log("[Liquid] Loaded: ".concat(src));
+            // console.log(`[Liquid] Loaded: ${src}`);
             resolve();
           };
           newScript.onerror = function () {
@@ -618,6 +746,13 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
         });
       };
     }, [html, dataFingerprint]);
+    if (error) {
+      return React__default["default"].createElement("div", {
+        className: "liquid-amis-container flex flex-col w-full overflow-auto p-4 ".concat(className || '')
+      }, React__default["default"].createElement(ErrorDisplay, {
+        error: error
+      }));
+    }
     return React__default["default"].createElement(React__default["default"].Fragment, null, React__default["default"].createElement("div", {
       className: "liquid-amis-container flex flex-col h-full w-full overflow-hidden ".concat(className || ''),
       ref: containerRef,

package/dist/assets.json

@@ -31,8 +31,8 @@
         {
             "package": "@steedos-widgets/antd",
             "urls": [
-                "https://unpkg.com/@steedos-widgets/antd@6.10.52-beta.1/dist/antd.umd.js",
-                "https://unpkg.com/@steedos-widgets/antd@6.10.52-beta.1/dist/antd.umd.css"
+                "https://unpkg.com/@steedos-widgets/antd@6.10.52-beta.11/dist/antd.umd.js",
+                "https://unpkg.com/@steedos-widgets/antd@6.10.52-beta.11/dist/antd.umd.css"
             ],
             "library": "BuilderAntd"
         }
@@ -43,10 +43,10 @@
             "npm": {
                 "package": "@steedos-widgets/antd"
             },
-            "url": "https://unpkg.com/@steedos-widgets/antd@6.10.52-beta.1/dist/meta.js",
+            "url": "https://unpkg.com/@steedos-widgets/antd@6.10.52-beta.11/dist/meta.js",
             "urls": {
-                "default": "https://unpkg.com/@steedos-widgets/antd@6.10.52-beta.1/dist/meta.js",
-                "design": "https://unpkg.com/@steedos-widgets/antd@6.10.52-beta.1/dist/meta.js"
+                "default": "https://unpkg.com/@steedos-widgets/antd@6.10.52-beta.11/dist/meta.js",
+                "design": "https://unpkg.com/@steedos-widgets/antd@6.10.52-beta.11/dist/meta.js"
             }
         }
     ]

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@steedos-widgets/antd",
   "private": false,
-  "version": "6.10.52-beta.1",
+  "version": "6.10.52-beta.11",
   "main": "dist/antd.cjs.js",
   "module": "dist/antd.esm.js",
   "unpkg": "dist/antd.umd.js",
@@ -47,7 +47,7 @@
     "rollup-plugin-tslib-resolve-id": "^0.0.0",
     "rollup-plugin-visualizer": "^5.8.0"
   },
-  "gitHead": "8a2fa16f1c8dd4d4de41c4365d40c9c711da6ccb",
+  "gitHead": "762c9da84236c73a0826193eb5c3f2c9d4cc102b",
   "dependencies": {
     "liquidjs": "^10.24.0"
   }