@steedos-widgets/antd 6.10.52-beta.10 → 6.10.52-beta.12

package/dist/antd.umd.js

@@ -1,7 +1,7 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 (function (global, factory) {
-  (typeof exports === "undefined" ? "undefined" : _typeof(exports)) === 'object' && typeof module !== 'undefined' ? factory(exports, require('react'), require('antd'), require('react-dom'), require('liquidjs')) : typeof define === 'function' && define.amd ? define(['exports', 'react', 'antd', 'react-dom', 'liquidjs'], factory) : (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.BuilderAntd = {}, global.React, global.antd, global.ReactDOM, global.liquidjs));
-})(this, function (exports, React, antd, reactDom, liquidjs) {
+  (typeof exports === "undefined" ? "undefined" : _typeof(exports)) === 'object' && typeof module !== 'undefined' ? factory(exports, require('react'), require('antd'), require('react-dom'), require('liquidjs'), require('lodash')) : typeof define === 'function' && define.amd ? define(['exports', 'react', 'antd', 'react-dom', 'liquidjs', 'lodash'], factory) : (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.BuilderAntd = {}, global.React, global.antd, global.ReactDOM, global.liquidjs, global._));
+})(this, function (exports, React, antd, reactDom, liquidjs, lodash) {
   var global = window;
   function _interopDefaultLegacy(e) {
     return e && _typeof(e) === 'object' && 'default' in e ? e : {
@@ -447,6 +447,10 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
       mountNodes = _e[0],
       setMountNodes = _e[1];
     var containerRef = React.useRef(null);
+    // 防抖的数据状态，用于减少 HTML 重建频率
+    // 保持最新 data 的引用，供脚本使用
+    var dataRef = React.useRef(data);
+    dataRef.current = data;
     // 用于存储脚本清理函数的引用，以便在组件卸载或更新时清理副作用
     var scriptCleanupsRef = React.useRef([]);
     var finalPartials = React.useMemo(function () {
@@ -542,8 +546,9 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
       });
       return liq;
     }, []);
-    var dataFingerprint = JSON.stringify(data);
-    var partialsFingerprint = JSON.stringify(finalPartials);
+    // Track previous values for comparison (初始化为 undefined 以确保首次渲染)
+    var prevPartialsRef = React.useRef(undefined);
+    var prevParsedTemplatesRef = React.useRef(undefined);
     React.useEffect(function () {
       // console.log('template', template)
       var isMounted = true;
@@ -571,27 +576,37 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
         isMounted = false;
       };
     }, [engine, template]);
-    // 2. Liquid 渲染 HTML
+    // 2. Liquid 渲染 HTML（仅在模板或 partials 变化时，不在数据变化时重新渲染）
     React.useEffect(function () {
-      if (!parsedTemplates) return;
+      // 跳过空模板或未解析的模板（parsedTemplates 为 null、undefined 或空数组时）
+      if (!parsedTemplates || parsedTemplates.length === 0) return;
+      // 检查 parsedTemplates 是否发生变化（模板重新解析时需要强制渲染）
+      var templatesChanged = prevParsedTemplatesRef.current !== parsedTemplates;
+      // 只在 partials 实际变化时才重新渲染
+      // 但如果 parsedTemplates 变化了（模板重新解析），必须渲染
+      // 注意：不再依赖 data 变化来重新渲染 HTML，data 变化只更新 Portal 组件
+      if (!templatesChanged && lodash.isEqual(prevPartialsRef.current, finalPartials)) {
+        return;
+      }
+      prevPartialsRef.current = finalPartials;
+      prevParsedTemplatesRef.current = parsedTemplates;
       var isMounted = true;
-      inlineSchemasRef.current = {};
+      // Don't clear schemas here - let them accumulate and be overwritten
+      // Clearing causes race conditions with Portal detection
+      // inlineSchemasRef.current = {}; 
+      // 使用当前 data 进行初始渲染 - HTML 结构不会因为数据变化而重新渲染
+      // Portal 组件会通过 props 获取实时数据更新
       var contextData = _assign(_assign({}, flattenObjectChain(data)), {
         __registerInlineSchema: function __registerInlineSchema(id, schema) {
           inlineSchemasRef.current[id] = schema;
         }
       });
-      // 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;
-          });
+          setHtml(result); // Always set to ensure Portal detection runs with fresh schemas
           setError(null);
         }
       })["catch"](function (err) {
-        // console.log(`render error: `, template, contextData)
         if (isMounted) {
           console.error("Liquid Render Error:", err);
           setError(err);
@@ -600,7 +615,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
       return function () {
         isMounted = false;
       };
-    }, [engine, parsedTemplates, dataFingerprint, partialsFingerprint]);
+    }, [engine, parsedTemplates, finalPartials]); // 移除 data 依赖，只在模板变化时重新渲染
     // 3. Portals 挂载检测
     React.useEffect(function () {
       if (!containerRef.current) return;
@@ -608,18 +623,30 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
       var elements = containerRef.current.querySelectorAll('[data-amis-partial]');
       elements.forEach(function (el) {
         var key = el.getAttribute('data-amis-partial');
-        if (key && (inlineSchemasRef.current[key] || partialsRef.current[key])) {
+        var hasInlineSchema = key && inlineSchemasRef.current[key];
+        var hasPartialSchema = key && partialsRef.current[key];
+        if (key && (hasInlineSchema || hasPartialSchema)) {
           nodes[key] = el;
         }
       });
-      // 只有在节点实际发生变化时才更新，防止死循环
-      // 简单的 key 比较
+      // 每次 html 变化都需要更新 DOM 节点引用，因为 dangerouslySetInnerHTML 会销毁并重建节点
+      // 但仅在节点实际变化时更新，避免不必要的 Portal 重新创建
       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
+        var keysChanged = prevKeys !== newKeys;
+        // 仅在 keys 实际变化时更新（新增或删除了 Portal 挂载点）
+        if (keysChanged) {
+          return nodes;
+        }
+        // Keys 相同但 html 变了，需要更新 DOM 节点引用（dangerouslySetInnerHTML 销毁重建了节点）
+        // 但不能创建新对象，否则会触发 Portal useMemo 重新执行
+        // 所以我们更新 prev 对象中的节点引用
+        Object.keys(nodes).forEach(function (key) {
+          if (prev[key] !== nodes[key]) {
+            prev[key] = nodes[key];
+          }
+        });
         return prev;
       });
     }, [html]);
@@ -628,18 +655,25 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
       return Object.keys(mountNodes).map(function (key) {
         var domNode = mountNodes[key];
         var schema = inlineSchemasRef.current[key] || partialsRef.current[key];
-        if (!schema || !domNode) return null;
+        if (!schema || !domNode) {
+          return null;
+        }
         try {
           return reactDom.createPortal(React__default["default"].createElement(ErrorBoundary, {
             fallback: null
           }, amisRender("partial-".concat(key), schema, {
-            data: data
-          })), domNode);
+            data: dataRef.current
+          })), domNode, key // 使用稳定的 key 基于 Partial ID
+          );
         } catch (e) {
+          console.error('[Liquid] Portal creation error:', {
+            key: key,
+            error: e
+          });
           return null;
         }
       });
-    }, [mountNodes, partialsFingerprint, dataFingerprint, amisRender, data]);
+    }, [mountNodes, finalPartials, amisRender]); // Removed data dependency - use dataRef to avoid Portal recreation on data changes
     // ==================================================================================
     // 5. 核心逻辑：顺序加载器 (等待外部脚本加载完再执行内联脚本)
     // ==================================================================================
@@ -723,7 +757,8 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
               var debugName = "steedos-liquid-".concat(Math.random().toString(36).slice(2), ".js");
               var debuggableCode = code + "\n//# sourceURL=".concat(debugName);
               var func = new Function('data', 'dom', 'doAction', 'dispatchEvent', debuggableCode);
-              var cleanupResult = func(data, scriptNode.parentElement, doAction, dispatchEvent);
+              // 使用 dataRef.current 获取最新的 data
+              var cleanupResult = func(dataRef.current, scriptNode.parentElement, doAction, dispatchEvent);
               if (typeof cleanupResult === 'function') {
                 scriptCleanupsRef.current.push(cleanupResult);
               }
@@ -745,7 +780,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
           return cleanup && cleanup();
         });
       };
-    }, [html, dataFingerprint]);
+    }, [html]); // 仅依赖 html 变化，不依赖 data 变化
     if (error) {
       return React__default["default"].createElement("div", {
         className: "liquid-amis-container flex flex-col w-full overflow-auto p-4 ".concat(className || '')

package/dist/assets.json

@@ -31,8 +31,8 @@
         {
             "package": "@steedos-widgets/antd",
             "urls": [
-                "https://unpkg.com/@steedos-widgets/antd@6.10.52-beta.10/dist/antd.umd.js",
-                "https://unpkg.com/@steedos-widgets/antd@6.10.52-beta.10/dist/antd.umd.css"
+                "https://unpkg.com/@steedos-widgets/antd@6.10.52-beta.12/dist/antd.umd.js",
+                "https://unpkg.com/@steedos-widgets/antd@6.10.52-beta.12/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.10/dist/meta.js",
+            "url": "https://unpkg.com/@steedos-widgets/antd@6.10.52-beta.12/dist/meta.js",
             "urls": {
-                "default": "https://unpkg.com/@steedos-widgets/antd@6.10.52-beta.10/dist/meta.js",
-                "design": "https://unpkg.com/@steedos-widgets/antd@6.10.52-beta.10/dist/meta.js"
+                "default": "https://unpkg.com/@steedos-widgets/antd@6.10.52-beta.12/dist/meta.js",
+                "design": "https://unpkg.com/@steedos-widgets/antd@6.10.52-beta.12/dist/meta.js"
             }
         }
     ]

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@steedos-widgets/antd",
   "private": false,
-  "version": "6.10.52-beta.10",
+  "version": "6.10.52-beta.12",
   "main": "dist/antd.cjs.js",
   "module": "dist/antd.esm.js",
   "unpkg": "dist/antd.umd.js",
@@ -25,11 +25,13 @@
     "@rollup/plugin-commonjs": "^29.0.0",
     "@rollup/plugin-node-resolve": "^13.1.3",
     "@rollup/plugin-typescript": "^8.4.0",
+    "@types/lodash": "^4.17.23",
     "@types/react": "^18.0.8",
     "@types/react-dom": "^18.0.6",
     "antd": "^5.29.2",
     "react": "18.2.0",
     "react-dom": "18.2.0",
+    "rimraf": "^6.1.2",
     "rollup": "^2.79.2",
     "rollup-plugin-alias": "^2.2.0",
     "rollup-plugin-external-globals": "^0.6.1",
@@ -45,10 +47,12 @@
     "rollup-plugin-svg": "^2.0.0",
     "rollup-plugin-terser": "^7.0.2",
     "rollup-plugin-tslib-resolve-id": "^0.0.0",
-    "rollup-plugin-visualizer": "^5.8.0"
+    "rollup-plugin-visualizer": "^5.8.0",
+    "typescript": "^5.9.3"
   },
-  "gitHead": "02305b6c955cd75f6bfaa68be6255ab9c24e959f",
+  "gitHead": "7ed47ff7681033700651da8f172016a44ed7389e",
   "dependencies": {
-    "liquidjs": "^10.24.0"
+    "liquidjs": "^10.24.0",
+    "lodash": "^4.17.23"
   }
 }