@steedos-widgets/antd 6.10.44 → 6.10.46

package/dist/antd.umd.js

@@ -290,27 +290,16 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
   var generateId = function generateId() {
     return "amis-inline-".concat(Math.random().toString(36).substr(2, 9));
   };
-  /**
-   * 宽松 JSON 解析器
-   * 允许无引号 Key、单引号 String，并自动修复 HTML 转义字符。
-   * 注意：使用 new Function 有安全风险，仅适用于受信任的模板来源。
-   */
   var looseJsonParse = function looseJsonParse(str) {
     if (!str) return null;
-    // 1. 基础清洗：修复 HTML 转义
     var cleanStr = str.replace(/&quot;/g, '"').replace(/&#39;/g, "'").replace(/&amp;/g, '&').replace(/&lt;/g, '<').replace(/&gt;/g, '>');
-    // 2. 清洗隐形字符 (Web 复制粘贴常见问题)
     cleanStr = cleanStr.replace(/[\u00A0\u1680\u180e\u2000-\u2009\u200a\u2028\u2029\u202f\u205f\u3000]/g, ' ');
     try {
-      // 优先尝试标准 JSON 解析 (性能最好)
       return JSON.parse(cleanStr);
     } catch (e) {
       try {
-        // 降级策略: 使用 Function 解析 (支持 {key: 'value'} 写法)
-        // 如果你的环境支持，推荐替换为 'json5' 库以获得更安全的解析
         return new Function("return " + cleanStr)();
       } catch (e2) {
-        // 抛出原始错误以便上层捕获显示
         throw new Error("JSON Parse Error: ".concat(e.message));
       }
     }
@@ -318,11 +307,16 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
   // --- 组件实现 ---
   var LiquidComponent = function LiquidComponent(_a) {
     var template = _a.template,
+      tpl = _a.tpl,
       data = _a.data,
       className = _a.className,
       $schema = _a.$schema,
       amisRender = _a.render,
       propsPartials = _a.partials;
+    // 支持 tpl 作为 template 的别名
+    if (tpl && !template) {
+      template = tpl;
+    }
     var _b = __read(React.useState(''), 2),
       html = _b[0],
       setHtml = _b[1];
@@ -330,24 +324,21 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
       mountNodes = _c[0],
       setMountNodes = _c[1];
     var containerRef = React.useRef(null);
-    // 1. 合并 Partials (优先 props 传入的，其次是 schema 定义的)
+    // 用于存储脚本清理函数的引用，以便在组件卸载或更新时清理副作用
+    var scriptCleanupsRef = React.useRef([]);
     var finalPartials = React.useMemo(function () {
       return _assign(_assign({}, $schema || {}), propsPartials);
     }, [$schema, propsPartials]);
-    // 使用 Ref 保持 Partials 最新引用，避免 engine 重建
     var partialsRef = React.useRef(finalPartials);
     partialsRef.current = finalPartials;
-    // 存储内联解析出来的 Schema，用于 Portal 渲染
     var inlineSchemasRef = React.useRef({});
-    // 2. 初始化 Liquid Engine (单次初始化)
+    // 1. 初始化 Liquid Engine
     var engine = React.useMemo(function () {
       var liq = new liquidjs.Liquid({
-        // 自定义文件系统以支持内存 Partials
         fs: {
           readFileSync: function readFileSync(file) {
             var content = partialsRef.current[file];
             if (_typeof(content) === 'object' && content !== null) {
-              // 如果 Partial 是对象，说明是 AMIS Schema，直接占位
               return "<div data-amis-partial=\"".concat(file, "\"></div>");
             }
             return typeof content === 'string' ? content : "[Template '".concat(file, "' not found]");
@@ -365,7 +356,6 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
           resolve: function resolve(root, file) {
             return file;
           },
-          sep: '/',
           readFile: function readFile(file) {
             return __awaiter(void 0, void 0, void 0, function () {
               var content;
@@ -380,7 +370,6 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
           }
         }
       });
-      // 注册自定义标签 {% amis %}
       liq.registerTag('amis', {
         parse: function parse(tagToken, remainTokens) {
           var _this = this;
@@ -403,30 +392,24 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
               });
               rawStr = chunks.join('').trim();
               if (!rawStr) return [2 /*return*/, ''];
-              // 开发者体验优化：检测 [object Object]
               if (rawStr.includes('[object Object]')) {
-                return [2 /*return*/, "<div class=\"text-red-500 border border-red-500 p-2 text-sm bg-red-50\">\n             <strong>Error:</strong> Detected \"[object Object]\" in schema. \n             Did you forget to use the <code>| json</code> filter?\n           </div>"];
+                return [2 /*return*/, "<div class=\"text-red-500 border border-red-500 p-2 text-sm bg-red-50\">Error: [object Object] detected. Use | json filter.</div>"];
               }
               try {
                 schema = looseJsonParse(rawStr);
                 id = generateId();
                 register = ctx.get(['__registerInlineSchema']);
-                // 兼容性处理：防止 Liquid 版本差异导致 get 获取不到
                 if (!register && ctx.environments) {
                   register = ctx.environments['__registerInlineSchema'];
                 }
                 if (typeof register === 'function') {
                   register(id, schema);
-                  // 返回占位符 DIV
                   return [2 /*return*/, "<div data-amis-partial=\"".concat(id, "\" style=\"display: contents;\"></div>")];
                 } else {
-                  console.warn('LiquidAMIS: __registerInlineSchema hook not found in context.');
                   return [2 /*return*/, ""];
                 }
               } catch (e) {
-                console.error("Liquid Inline AMIS Parse Error:", e, "\nSource:", rawStr);
-                // 错误 UI
-                return [2 /*return*/, "<div style=\"border:2px solid red; background:#fff0f0; padding:8px; font-family:monospace; border-radius: 4px; font-size: 12px;\">\n            <strong style=\"color:#d32f2f;\">JSON Parse Failed</strong>\n            <div style=\"margin-top:4px; white-space:pre-wrap; background:white; border:1px solid #ddd; padding:4px; color:#333;\">".concat(rawStr.replace(/</g, '&lt;'), "</div>\n            <div style=\"color:#d32f2f; margin-top:4px;\">").concat(e.message, "</div>\n          </div>")];
+                return [2 /*return*/, "<div style=\"color:red\">JSON Parse Error: ".concat(e.message, "</div>")];
               }
               return [2 /*return*/];
             });
@@ -434,16 +417,14 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
         }
       });
       return liq;
-    }, []); // 依赖为空，确保 Engine 只初始化一次
-    // 用于触发重渲染的指纹
+    }, []);
     var dataFingerprint = JSON.stringify(data);
     var partialsFingerprint = JSON.stringify(finalPartials);
-    // 3. 执行 Liquid 渲染
+    // 2. Liquid 渲染 HTML
     React.useEffect(function () {
       var isMounted = true;
-      inlineSchemasRef.current = {}; // 重置内联 Schema 缓存
+      inlineSchemasRef.current = {};
       var contextData = _assign(_assign({}, data), {
-        // 注入回调函数，允许 Liquid 标签内部向 React 组件回传数据
         __registerInlineSchema: function __registerInlineSchema(id, schema) {
           inlineSchemasRef.current[id] = schema;
         }
@@ -455,16 +436,13 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
           });
         }
       })["catch"](function (err) {
-        if (isMounted) {
-          console.error("Liquid Render Error:", err);
-          setHtml("<div style=\"color:red; padding:10px; border:1px solid red;\">Global Render Error: ".concat(err.message, "</div>"));
-        }
+        if (isMounted) console.error("Liquid Render Error:", err);
       });
       return function () {
         isMounted = false;
       };
     }, [engine, template, dataFingerprint, partialsFingerprint]);
-    // 4. DOM 挂载检测 (查找占位符)
+    // 3. Portals 挂载检测
     React.useEffect(function () {
       if (!containerRef.current) return;
       var nodes = {};
@@ -472,40 +450,134 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
       var hasChanges = false;
       elements.forEach(function (el) {
         var key = el.getAttribute('data-amis-partial');
-        if (key) {
-          // 确保我们有这个 key 对应的 Schema (不管是内联的还是 props 传入的)
-          var hasSchema = inlineSchemasRef.current[key] || partialsRef.current[key];
-          if (hasSchema) {
-            nodes[key] = el;
-            hasChanges = true;
-          }
+        if (key && (inlineSchemasRef.current[key] || partialsRef.current[key])) {
+          nodes[key] = el;
+          hasChanges = true;
         }
       });
-      // 只有当节点数量或引用变化时才更新状态，避免无限渲染
-      // 这里简化处理，只要检测到有效节点就更新。React 的 diff 算法会处理多余的 render
-      if (hasChanges) {
-        setMountNodes(nodes);
-      }
-    }, [html]); // 当 HTML 字符串变化后，重新扫描 DOM
-    // 5. 创建 React Portals
+      if (hasChanges) setMountNodes(nodes);
+    }, [html]);
+    // 4. 创建 Portals
     var portals = React.useMemo(function () {
       return Object.keys(mountNodes).map(function (key) {
         var domNode = mountNodes[key];
-        // 优先取内联 Schema，其次取 Partials 定义的 Schema
         var schema = inlineSchemasRef.current[key] || partialsRef.current[key];
         if (!schema || !domNode) return null;
         try {
-          // 使用 createPortal 将 AMIS 组件挂载到 Liquid 生成的 div 中
-          // 传递 data 作为 props，确保 AMIS 能获取到数据
           return reactDom.createPortal(amisRender("partial-".concat(key), schema, {
             data: data
           }), domNode);
         } catch (e) {
-          console.error("Portal Render Error for key ".concat(key, ":"), e);
           return null;
         }
       });
     }, [mountNodes, partialsFingerprint, dataFingerprint, amisRender, data]);
+    // ==================================================================================
+    // 5. 核心逻辑：顺序加载器 (等待外部脚本加载完再执行内联脚本)
+    // ==================================================================================
+    React.useEffect(function () {
+      if (!containerRef.current) return;
+      // 清理旧副作用
+      scriptCleanupsRef.current.forEach(function (cleanup) {
+        return cleanup && cleanup();
+      });
+      scriptCleanupsRef.current = [];
+      var allScriptNodes = Array.from(containerRef.current.querySelectorAll('script'));
+      // 如果没有脚本，直接返回
+      if (allScriptNodes.length === 0) return;
+      // 1. 分类：找出需要加载的外部脚本 和 需要执行的内联脚本
+      var externalNodes = [];
+      var inlineNodes = [];
+      allScriptNodes.forEach(function (node) {
+        if (node.dataset.executed) return; // 跳过已处理的
+        if (node.src) {
+          externalNodes.push(node);
+        } else {
+          inlineNodes.push(node);
+        }
+      });
+      // 2. 定义加载外部脚本的函数（返回 Promise）
+      var loadExternalScript = function loadExternalScript(scriptNode) {
+        return new Promise(function (resolve) {
+          var src = scriptNode.getAttribute('src');
+          if (!src) {
+            resolve();
+            return;
+          }
+          var newScriptUrl = new URL(src, window.location.href).href;
+          // --- 查重逻辑：检查全局是否已存在该脚本（排除自身） ---
+          var isGlobalLoaded = false;
+          var allDocScripts = document.getElementsByTagName('script');
+          for (var i = 0; i < allDocScripts.length; i++) {
+            var s = allDocScripts[i];
+            if (s.src === newScriptUrl && s !== scriptNode) {
+              isGlobalLoaded = true;
+              break;
+            }
+          }
+          // 标记当前节点已处理，防止下次 render 重复
+          scriptNode.dataset.executed = "true";
+          if (isGlobalLoaded) {
+            console.log("[Liquid] Script already loaded: ".concat(src));
+            resolve(); // 已存在，直接视为成功
+            return;
+          }
+          // --- 创建新脚本加载 ---
+          var newScript = document.createElement('script');
+          newScript.src = src;
+          newScript.async = false; // 尝试保持顺序，虽然动态插入通常默认 async
+          // 复制属性
+          Array.from(scriptNode.attributes).forEach(function (attr) {
+            if (attr.name !== 'src' && attr.name !== 'data-executed') {
+              newScript.setAttribute(attr.name, attr.value);
+            }
+          });
+          newScript.onload = function () {
+            console.log("[Liquid] Loaded: ".concat(src));
+            resolve();
+          };
+          newScript.onerror = function () {
+            console.error("[Liquid] Failed to load: ".concat(src));
+            // 即使失败也 resolve，避免阻塞后续内联脚本执行（或者你可以选择 reject 来阻断）
+            resolve();
+          };
+          document.body.appendChild(newScript);
+        });
+      };
+      // 3. 定义执行内联脚本的函数
+      var runInlineScripts = function runInlineScripts() {
+        inlineNodes.forEach(function (scriptNode) {
+          // 双重检查，防止重入
+          if (scriptNode.dataset.executed) return;
+          var code = scriptNode.innerHTML;
+          if (code) {
+            try {
+              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', debuggableCode);
+              var cleanupResult = func(data, scriptNode.parentElement);
+              if (typeof cleanupResult === 'function') {
+                scriptCleanupsRef.current.push(cleanupResult);
+              }
+            } catch (err) {
+              console.error("[Liquid] Inline Script Error:", err);
+            }
+          }
+          scriptNode.dataset.executed = "true";
+        });
+      };
+      // 4. 执行流程：先并行加载所有外部脚本 -> 全部完成后 -> 执行内联脚本
+      var loadingPromises = externalNodes.map(loadExternalScript);
+      Promise.all(loadingPromises).then(function () {
+        // 所有外部脚本（src）都已加载完毕（或失败），现在执行内联代码
+        runInlineScripts();
+      });
+      return function () {
+        scriptCleanupsRef.current.forEach(function (cleanup) {
+          return cleanup && cleanup();
+        });
+      };
+    }, [html, dataFingerprint]);
     return React__default["default"].createElement("div", {
       className: "liquid-amis-container ".concat(className || ''),
       ref: containerRef

package/dist/assets-dev.json

@@ -21,6 +21,13 @@
             ],
             "library": "liquidjs"
         },
+        {
+            "package": "sortablejs",
+            "urls": [
+                "http://127.0.0.1:8080/sortablejs@1.15.6/Sortable.min.js"
+            ],
+            "library": "Sortable"
+        },
         {
             "package": "@steedos-widgets/antd",
             "urls": [

package/dist/assets.json

@@ -21,11 +21,18 @@
             ],
             "library": "liquidjs"
         },
+        {
+            "package": "sortablejs",
+            "urls": [
+                "https://unpkg.com/sortablejs@1.15.6/Sortable.min.js"
+            ],
+            "library": "Sortable"
+        },
         {
             "package": "@steedos-widgets/antd",
             "urls": [
-                "https://unpkg.com/@steedos-widgets/antd@6.10.44/dist/antd.umd.js",
-                "https://unpkg.com/@steedos-widgets/antd@6.10.44/dist/antd.umd.css"
+                "https://unpkg.com/@steedos-widgets/antd@6.10.46/dist/antd.umd.js",
+                "https://unpkg.com/@steedos-widgets/antd@6.10.46/dist/antd.umd.css"
             ],
             "library": "BuilderAntd"
         }
@@ -36,10 +43,10 @@
             "npm": {
                 "package": "@steedos-widgets/antd"
             },
-            "url": "https://unpkg.com/@steedos-widgets/antd@6.10.44/dist/meta.js",
+            "url": "https://unpkg.com/@steedos-widgets/antd@6.10.46/dist/meta.js",
             "urls": {
-                "default": "https://unpkg.com/@steedos-widgets/antd@6.10.44/dist/meta.js",
-                "design": "https://unpkg.com/@steedos-widgets/antd@6.10.44/dist/meta.js"
+                "default": "https://unpkg.com/@steedos-widgets/antd@6.10.46/dist/meta.js",
+                "design": "https://unpkg.com/@steedos-widgets/antd@6.10.46/dist/meta.js"
             }
         }
     ]

package/dist/components/Liquid.d.ts

@@ -2,6 +2,7 @@ import React from 'react';
 type SchemaObject = Record<string, any>;
 interface LiquidTemplateProps {
     template: string;
+    tpl: string;
     data: Record<string, any>;
     $schema?: Record<string, string | object>;
     partials?: Record<string, string | object>;

package/dist/meta.js

@@ -288,6 +288,14 @@
                 tags: [config.group],
                 order: 99,
                 icon: config.amis.icon,
+                // 容器类组件必需字段
+                regions: [
+                    {
+                        key: 'body',
+                        label: 'Partials',
+                        insertPosition: 'inner',
+                    },
+                ],
                 scaffold: {
                     type: config.amis.name,
                     template: "Hello {{name}}",

package/dist/metas/Liquid.d.ts

@@ -28,6 +28,11 @@ declare const _default: {
             tags: string[];
             order: number;
             icon: string;
+            regions: {
+                key: string;
+                label: string;
+                insertPosition: string;
+            }[];
             scaffold: {
                 type: string;
                 template: string;

package/dist/types/components/Liquid.d.ts

@@ -2,6 +2,7 @@ import React from 'react';
 type SchemaObject = Record<string, any>;
 interface LiquidTemplateProps {
     template: string;
+    tpl: string;
     data: Record<string, any>;
     $schema?: Record<string, string | object>;
     partials?: Record<string, string | object>;

package/dist/types/metas/Liquid.d.ts

@@ -28,6 +28,11 @@ declare const _default: {
             tags: string[];
             order: number;
             icon: string;
+            regions: {
+                key: string;
+                label: string;
+                insertPosition: string;
+            }[];
             scaffold: {
                 type: string;
                 template: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@steedos-widgets/antd",
   "private": false,
-  "version": "6.10.44",
+  "version": "6.10.46",
   "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": "1e8d98d0464b25aaeba9175a8aa91b6e7359003f",
+  "gitHead": "2ebefd488865d813809c593a41728873eebe6d51",
   "dependencies": {
     "liquidjs": "^10.24.0"
   }