@tachybase/client 1.6.10 → 1.6.11

package/es/block-provider/hooks/index.mjs

@@ -14,7 +14,7 @@ import { useAPIClient, useRequest } from "../../api-client/index.mjs";
 import { PathHandler } from "../../built-in/dynamic-page/utils.mjs";
 import { useCollectionManager_deprecated, useCollection_deprecated } from "../../collection-manager/index.mjs";
 import { useFilterBlock } from "../../filter-provider/FilterProvider.mjs";
-import { mergeFilter as utils_mjs_mergeFilter, transformToFilter } from "../../filter-provider/utils.mjs";
+import { FILTER_OPERATORS_WITH_ARRAY_VALUES, mergeFilter as utils_mjs_mergeFilter, transformToFilter } from "../../filter-provider/utils.mjs";
 import { useRecord } from "../../record-provider/index.mjs";
 import { getCustomCondition, removeNullCondition, useActionContext, useCompile, useDesignable } from "../../schema-component/index.mjs";
 import { isSubMode } from "../../schema-component/antd/association-field/util.mjs";
@@ -43,10 +43,18 @@ function filterByCleanedFields(mergeFilter) {
         const value = items[key];
         if (void 0 === value) continue;
         const pathParts = key.split('.');
-        const filteredParts = pathParts.filter((p)=>!/^\d+$/.test(p) && ![
+        const filteredParts = pathParts.filter((p, i, arr)=>{
+            if ([
                 '$and',
                 '$or'
-            ].includes(p));
+            ].includes(p)) return false;
+            if (/^\d+$/.test(p)) {
+                const prev = i > 0 ? arr[i - 1] : '';
+                if (FILTER_OPERATORS_WITH_ARRAY_VALUES.has(prev)) return true;
+                return false;
+            }
+            return true;
+        });
         const fieldPath = filteredParts.join('.');
         const uniqueKey = "".concat(fieldPath);
         if (!seen.has(uniqueKey)) {

package/es/filter-provider/utils.d.ts

@@ -9,6 +9,10 @@ export declare enum FilterBlockType {
     COLLAPSE = 3
 }
 export declare const mergeFilter: (filters: any[], op?: string) => any;
+/**
+ * 筛选值为数组的操作符；与 transformToFilter 的 flatten breakOn、filterByCleanedFields 路径去重共用，避免两处列表漂移。
+ */
+export declare const FILTER_OPERATORS_WITH_ARRAY_VALUES: Set<string>;
 export declare const getSupportFieldsByAssociation: (inheritCollectionsChain: string[], block: DataBlock) => CollectionFieldOptions_deprecated[];
 export declare const getSupportFieldsByForeignKey: (filterBlockCollection: ReturnType<typeof useCollection_deprecated>, block: DataBlock) => import("./FilterProvider").ForeignKeyField[];
 /**

package/es/filter-provider/utils.mjs

@@ -26,6 +26,17 @@ const mergeFilter = function(filters) {
         [op]: items
     };
 };
+const FILTER_OPERATORS_WITH_ARRAY_VALUES = new Set([
+    '$match',
+    '$notMatch',
+    '$anyOf',
+    '$noneOf',
+    '$childIn',
+    '$childNotIn',
+    '$dateBetween',
+    '$in',
+    '$notIn'
+]);
 const getSupportFieldsByAssociation = (inheritCollectionsChain, block)=>{
     var _block_associatedFields;
     return null == (_block_associatedFields = block.associatedFields) ? void 0 : _block_associatedFields.filter((field)=>null == inheritCollectionsChain ? void 0 : inheritCollectionsChain.some((collectionName)=>collectionName === field.target));
@@ -50,17 +61,7 @@ const transformToFilter = (values, fieldSchema, getCollectionJoinField, collecti
     values = flatten(values, {
         breakOn (param) {
             let { value, path } = param;
-            if ([
-                '$match',
-                '$notMatch',
-                '$anyOf',
-                '$noneOf',
-                '$childIn',
-                '$childNotIn',
-                '$dateBetween',
-                '$in',
-                '$notIn'
-            ].includes(operators[path])) return true;
+            if (FILTER_OPERATORS_WITH_ARRAY_VALUES.has(operators[path])) return true;
             const collectionField = getCollectionJoinField("".concat(collectionName, ".").concat(path));
             if (null == collectionField ? void 0 : collectionField.target) {
                 if (Array.isArray(value)) return true;
@@ -93,9 +94,21 @@ const transformToFilter = (values, fieldSchema, getCollectionJoinField, collecti
                 };
             } else if ('$dateBetween' === operators[key]) {
                 if (Array.isArray(value)) {
-                    for(const index in value)if (value[index]) {
-                        if ('string' != typeof value[index] && !(value[index] instanceof Date)) value[index] = dayjs(value[index]).toISOString();
+                    const normalized = [];
+                    for(const index in value){
+                        if (!value[index]) continue;
+                        let v = value[index];
+                        if ('string' != typeof v && !(v instanceof Date)) v = dayjs(v).toISOString();
+                        normalized.push(v);
                     }
+                    if (0 === normalized.length) return null;
+                    value = 1 === normalized.length ? [
+                        normalized[0],
+                        normalized[0]
+                    ] : [
+                        normalized[0],
+                        normalized[normalized.length - 1]
+                    ];
                 }
             }
             return {
@@ -184,4 +197,4 @@ const isInFilterFormBlock = (fieldSchema)=>{
     }
     return false;
 };
-export { utils_FilterBlockType as FilterBlockType, getSupportFieldsByAssociation, getSupportFieldsByForeignKey, isAssocField, isInFilterFormBlock, isSameCollection, mergeFilter, transformToFilter, useAssociatedFields, useFilterAPI, useSupportedBlocks };
+export { FILTER_OPERATORS_WITH_ARRAY_VALUES, utils_FilterBlockType as FilterBlockType, getSupportFieldsByAssociation, getSupportFieldsByForeignKey, isAssocField, isInFilterFormBlock, isSameCollection, mergeFilter, transformToFilter, useAssociatedFields, useFilterAPI, useSupportedBlocks };

package/es/schema-component/antd/filter/useFilterActionProps.mjs

@@ -141,6 +141,13 @@ const removeNullCondition = function(filter) {
         const value = items[key];
         if (null != value && !isEmpty(value)) values[key] = value;
     }
+    for (const key of Object.keys(values))if (key.endsWith('$dateBetween.0')) {
+        const key1 = key.replace(/\$dateBetween\.0$/, '$dateBetween.1');
+        if (!(key1 in values)) values[key1] = values[key];
+    } else if (key.endsWith('$dateBetween.1')) {
+        const key0 = key.replace(/\$dateBetween\.1$/, '$dateBetween.0');
+        if (!(key0 in values)) values[key0] = values[key];
+    }
     return customFlat.unflatten(values);
 };
 const useFilterActionProps = ()=>{

package/lib/block-provider/hooks/index.js

@@ -356,10 +356,18 @@ var __webpack_exports__ = {};
             const value = items[key];
             if (void 0 === value) continue;
             const pathParts = key.split('.');
-            const filteredParts = pathParts.filter((p)=>!/^\d+$/.test(p) && ![
+            const filteredParts = pathParts.filter((p, i, arr)=>{
+                if ([
                     '$and',
                     '$or'
-                ].includes(p));
+                ].includes(p)) return false;
+                if (/^\d+$/.test(p)) {
+                    const prev = i > 0 ? arr[i - 1] : '';
+                    if (_filter_provider_utils__WEBPACK_IMPORTED_MODULE_16__.FILTER_OPERATORS_WITH_ARRAY_VALUES.has(prev)) return true;
+                    return false;
+                }
+                return true;
+            });
             const fieldPath = filteredParts.join('.');
             const uniqueKey = "".concat(fieldPath);
             if (!seen.has(uniqueKey)) {

package/lib/filter-provider/utils.js

@@ -34,6 +34,7 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     mergeFilter: ()=>mergeFilter,
+    FILTER_OPERATORS_WITH_ARRAY_VALUES: ()=>FILTER_OPERATORS_WITH_ARRAY_VALUES,
     transformToFilter: ()=>transformToFilter,
     isSameCollection: ()=>isSameCollection,
     getSupportFieldsByForeignKey: ()=>getSupportFieldsByForeignKey,
@@ -75,6 +76,17 @@ const mergeFilter = function(filters) {
         [op]: items
     };
 };
+const FILTER_OPERATORS_WITH_ARRAY_VALUES = new Set([
+    '$match',
+    '$notMatch',
+    '$anyOf',
+    '$noneOf',
+    '$childIn',
+    '$childNotIn',
+    '$dateBetween',
+    '$in',
+    '$notIn'
+]);
 const getSupportFieldsByAssociation = (inheritCollectionsChain, block)=>{
     var _block_associatedFields;
     return null == (_block_associatedFields = block.associatedFields) ? void 0 : _block_associatedFields.filter((field)=>null == inheritCollectionsChain ? void 0 : inheritCollectionsChain.some((collectionName)=>collectionName === field.target));
@@ -99,17 +111,7 @@ const transformToFilter = (values, fieldSchema, getCollectionJoinField, collecti
     values = (0, client_namespaceObject.flatten)(values, {
         breakOn (param) {
             let { value, path } = param;
-            if ([
-                '$match',
-                '$notMatch',
-                '$anyOf',
-                '$noneOf',
-                '$childIn',
-                '$childNotIn',
-                '$dateBetween',
-                '$in',
-                '$notIn'
-            ].includes(operators[path])) return true;
+            if (FILTER_OPERATORS_WITH_ARRAY_VALUES.has(operators[path])) return true;
             const collectionField = getCollectionJoinField("".concat(collectionName, ".").concat(path));
             if (null == collectionField ? void 0 : collectionField.target) {
                 if (Array.isArray(value)) return true;
@@ -142,9 +144,21 @@ const transformToFilter = (values, fieldSchema, getCollectionJoinField, collecti
                 };
             } else if ('$dateBetween' === operators[key]) {
                 if (Array.isArray(value)) {
-                    for(const index in value)if (value[index]) {
-                        if ('string' != typeof value[index] && !(value[index] instanceof Date)) value[index] = external_dayjs_default()(value[index]).toISOString();
+                    const normalized = [];
+                    for(const index in value){
+                        if (!value[index]) continue;
+                        let v = value[index];
+                        if ('string' != typeof v && !(v instanceof Date)) v = external_dayjs_default()(v).toISOString();
+                        normalized.push(v);
                     }
+                    if (0 === normalized.length) return null;
+                    value = 1 === normalized.length ? [
+                        normalized[0],
+                        normalized[0]
+                    ] : [
+                        normalized[0],
+                        normalized[normalized.length - 1]
+                    ];
                 }
             }
             return {
@@ -233,6 +247,7 @@ const isInFilterFormBlock = (fieldSchema)=>{
     }
     return false;
 };
+exports.FILTER_OPERATORS_WITH_ARRAY_VALUES = __webpack_exports__.FILTER_OPERATORS_WITH_ARRAY_VALUES;
 exports.FilterBlockType = __webpack_exports__.FilterBlockType;
 exports.getSupportFieldsByAssociation = __webpack_exports__.getSupportFieldsByAssociation;
 exports.getSupportFieldsByForeignKey = __webpack_exports__.getSupportFieldsByForeignKey;
@@ -245,6 +260,7 @@ exports.useAssociatedFields = __webpack_exports__.useAssociatedFields;
 exports.useFilterAPI = __webpack_exports__.useFilterAPI;
 exports.useSupportedBlocks = __webpack_exports__.useSupportedBlocks;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
+    "FILTER_OPERATORS_WITH_ARRAY_VALUES",
     "FilterBlockType",
     "getSupportFieldsByAssociation",
     "getSupportFieldsByForeignKey",

package/lib/schema-component/antd/filter/useFilterActionProps.js

@@ -187,6 +187,13 @@ const removeNullCondition = function(filter) {
         const value = items[key];
         if (null != value && !isEmpty(value)) values[key] = value;
     }
+    for (const key of Object.keys(values))if (key.endsWith('$dateBetween.0')) {
+        const key1 = key.replace(/\$dateBetween\.0$/, '$dateBetween.1');
+        if (!(key1 in values)) values[key1] = values[key];
+    } else if (key.endsWith('$dateBetween.1')) {
+        const key0 = key.replace(/\$dateBetween\.1$/, '$dateBetween.0');
+        if (!(key0 in values)) values[key0] = values[key];
+    }
     return customFlat.unflatten(values);
 };
 const useFilterActionProps = ()=>{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/client",
-  "version": "1.6.10",
+  "version": "1.6.11",
   "homepage": "https://github.com/tegojs/tego-standard#readme",
   "bugs": {
     "url": "https://github.com/tegojs/tego-standard/issues"