oak-domain 5.1.24 → 5.1.25

package/lib/store/IntrinsicCheckers.js

@@ -350,30 +350,33 @@ function createAttrUpdateCheckers(schema, attrUpdateMatrix) {
                 }
                 const filters = condition.map(ele => {
                     if (typeof ele?.filter === 'function') {
-                        return ele.filter(action || 'select');
+                        return (ele.filter)({ action: action || 'select', data: data, filter }, context);
                     }
                     return ele?.filter;
-                }).filter(ele => !!ele);
-                const f = filters.length > 0 && (0, filter_1.combineFilters)(entity, schema, filters);
-                if (f) {
-                    const result = (0, filter_1.checkFilterContains)(entity, context, f, filter, true);
-                    if (result instanceof Promise) {
-                        return result.then((v) => {
-                            if (!v) {
-                                if (attrs.length > 1) {
-                                    return cascadelyCheckUpdateFilters(entity, schema, action || 'select', data, filter, matrix, attrs, context);
-                                }
-                                throw new types_1.OakAttrCantUpdateException(entity, attrs);
+                });
+                const checkFiltersInner = (filters2) => {
+                    const filters3 = filters2.filter(ele => !!ele);
+                    const f = filters3.length > 0 && (0, filter_1.combineFilters)(entity, schema, filters3);
+                    const checkResultInner = (result2) => {
+                        if (!result2) {
+                            if (attrs.length > 1) {
+                                return cascadelyCheckUpdateFilters(entity, schema, action || 'select', data, filter, matrix, attrs, context);
                             }
-                        });
-                    }
-                    if (!result) {
-                        if (attrs.length > 1) {
-                            return cascadelyCheckUpdateFilters(entity, schema, action || 'select', data, filter, matrix, attrs, context);
+                            throw new types_1.OakAttrCantUpdateException(entity, attrs);
                         }
-                        throw new types_1.OakAttrCantUpdateException(entity, attrs, '更新的行当前属性不满足约束，请仔细检查数据');
+                    };
+                    if (f) {
+                        const result = (0, filter_1.checkFilterContains)(entity, context, f, filter, true);
+                        if (result instanceof Promise) {
+                            return result.then((r) => checkResultInner(r));
+                        }
+                        return checkResultInner(result);
                     }
+                };
+                if (filters.find(ele => ele instanceof Promise)) {
+                    return Promise.all(filters).then((ff) => checkFiltersInner(ff));
                 }
+                return checkFiltersInner(filters);
             }
         };
         checkers.push(updateChecker);

package/lib/types/Configuration.d.ts

@@ -46,6 +46,7 @@ export type ServerConfiguration = {
         methods?: string[];
     };
     ui?: {
+        path?: string;
         disable?: boolean;
         username?: string;
         password?: string;

package/lib/utils/SimpleConnector.js

@@ -189,7 +189,7 @@ class SimpleConnector {
         };
     }
     async serializeResult(result, opRecords, headers, body, message) {
-        if (result instanceof stream_1.Stream || result instanceof Buffer || result instanceof ReadableStream) {
+        if (result instanceof stream_1.Stream || result instanceof Buffer) {
             return {
                 body: result,
                 headers: {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oak-domain",
-    "version": "5.1.24",
+    "version": "5.1.25",
     "author": {
         "name": "XuChang"
     },