@steedos-widgets/sortable 3.6.11-beta.7 → 3.6.11

package/dist/assets.json

@@ -3,8 +3,8 @@
         {
             "package": "@steedos-widgets/sortable",
             "urls": [
-                "https://unpkg.com/@steedos-widgets/sortable@3.6.11-beta.7/dist/sortable.umd.js",
-                "https://unpkg.com/@steedos-widgets/sortable@3.6.11-beta.7/dist/sortable.umd.css"
+                "https://unpkg.com/@steedos-widgets/sortable@3.6.11/dist/sortable.umd.js",
+                "https://unpkg.com/@steedos-widgets/sortable@3.6.11/dist/sortable.umd.css"
             ],
             "library": "BuilderSortable"
         }
@@ -15,10 +15,10 @@
             "npm": {
                 "package": "@steedos-widgets/sortable"
             },
-            "url": "https://unpkg.com/@steedos-widgets/sortable@3.6.11-beta.7/dist/meta.js",
+            "url": "https://unpkg.com/@steedos-widgets/sortable@3.6.11/dist/meta.js",
             "urls": {
-                "default": "https://unpkg.com/@steedos-widgets/sortable@3.6.11-beta.7/dist/meta.js",
-                "design": "https://unpkg.com/@steedos-widgets/sortable@3.6.11-beta.7/dist/meta.js"
+                "default": "https://unpkg.com/@steedos-widgets/sortable@3.6.11/dist/meta.js",
+                "design": "https://unpkg.com/@steedos-widgets/sortable@3.6.11/dist/meta.js"
             }
         }
     ]

package/dist/sortable.cjs.js

@@ -58430,7 +58430,7 @@ function getObjectHeaderToolbar(mainObject, fields, formFactor, {
     // listView.handleChangePage(1);
 
 
-    // 触发搜索，而不是reload，因为使用search-box可以在amissdk是3.6.3-patch.8+实现快速搜索输入框中过滤条件变更时再点刷新可以自动跳转到第一页面
+    // 触发搜索，而不是reload，因为使用search-box可以在amissdk是3.6.3-patch.8+实现在非第一页的情况下，快速搜索输入框中过滤条件变更时再点刷新可以自动跳转翻页到第一页
     const scope = event.context.scoped;
     const sb = SteedosUI.getClosestAmisComponentByType(scope, "search-box");
     sb.handleSearch();
@@ -59698,12 +59698,24 @@ async function lookupToAmisPicker(field, readonly, ctx){
         }
 
         var fieldFilters = ${JSON.stringify(field.filters)};
-        if(fieldFilters && fieldFilters.length){
-            var filtersForString = JSON.stringify(fieldFilters);
-            if(filtersForString.indexOf('$') > -1) {
-                var currentAmis = amisRequire('amis');
-                fieldFilters = JSON.parse(currentAmis.evaluate(filtersForString, api.data.$self.__super))
+        var currentAmis = amisRequire('amis');
+        //递归fieldFilters数组，检查每一个元素，判断若是公式，就仅把它解析
+        function traverseNestedArray(arr) {
+            for (let i = 0; i < arr.length; i++) {
+                if (Array.isArray(arr[i])) {
+                    // 如果当前元素是数组，则递归调用自身继续遍历
+                    traverseNestedArray(arr[i]);
+                } else {
+                    // 如果当前元素不是数组，则处理该元素
+                    // 下面正则用于匹配amis公式\${}
+                    if(/\\\$\\\{([^}]*)\\\}/.test(arr[i])) {
+                        arr[i] = currentAmis.evaluate(arr[i], api.data.$);
+                    }
+                }
             }
+        }
+        if(fieldFilters && fieldFilters.length){
+            traverseNestedArray(fieldFilters);
             filters.push(fieldFilters);
         }
         
@@ -60103,12 +60115,24 @@ async function lookupToAmisSelect(field, readonly, ctx){
         // }
 
         var fieldFilters = ${JSON.stringify(field.filters)};
-        if(fieldFilters && fieldFilters.length){
-            var filtersForString = JSON.stringify(fieldFilters);
-            if(filtersForString.indexOf('$') > -1) {
-                var currentAmis = amisRequire('amis');
-                fieldFilters = JSON.parse(currentAmis.evaluate(filtersForString, api.data.$))
+        var currentAmis = amisRequire('amis');
+        //递归fieldFilters数组，检查每一个元素，判断若是公式，就仅把它解析
+        function traverseNestedArray(arr) {
+            for (let i = 0; i < arr.length; i++) {
+                if (Array.isArray(arr[i])) {
+                    // 如果当前元素是数组，则递归调用自身继续遍历
+                    traverseNestedArray(arr[i]);
+                } else {
+                    // 如果当前元素不是数组，则处理该元素
+                    // 下面正则用于匹配amis公式\${}
+                    if(/\\\$\\\{([^}]*)\\\}/.test(arr[i])) {
+                        arr[i] = currentAmis.evaluate(arr[i], api.data.$);
+                    }
+                }
             }
+        }
+        if(fieldFilters && fieldFilters.length){
+            traverseNestedArray(fieldFilters);
             filters.push(fieldFilters);
         }