@tachybase/client 1.6.17 → 1.6.19

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

@@ -52,6 +52,7 @@ const index_js_namespaceObject = require("../../../block-provider/index.js");
 const external_collection_manager_index_js_namespaceObject = require("../../../collection-manager/index.js");
 const utils_js_namespaceObject = require("../../../filter-provider/utils.js");
 const setDataLoadingModeSettingsItem_js_namespaceObject = require("../../../modules/blocks/data-blocks/details-multi/setDataLoadingModeSettingsItem.js");
+const util_js_namespaceObject = require("../date-picker/util.js");
 const external_utils_js_namespaceObject = require("./utils.js");
 const useGetFilterOptions = ()=>{
     const { getCollectionFields } = (0, external_collection_manager_index_js_namespaceObject.useCollectionManager_deprecated)();
@@ -152,6 +153,81 @@ const useFilterFieldOptions = (fields)=>{
     return getOptions(fields, 1);
 };
 const isEmpty = (obj)=>Array.isArray(obj) && 0 === obj.length || obj && 0 === Object.keys(obj).length && Object.getPrototypeOf(obj) === Object.prototype;
+const CUSTOM_FILTER_VARIABLE_REGEXP = /^\{\{\$nFilter\.([^}]+)\}\}$/;
+const getCustomFilterValue = function(items, key) {
+    let rawItems = arguments.length > 2 && void 0 !== arguments[2] ? arguments[2] : {};
+    if (rawItems && key in rawItems) return rawItems[key];
+    if (key in items) return items[key];
+    const arrayItems = Object.keys(items).filter((itemKey)=>itemKey.startsWith("".concat(key, ".")) && /^\d+$/.test(itemKey.slice(key.length + 1))).sort((a, b)=>Number(a.slice(key.length + 1)) - Number(b.slice(key.length + 1))).map((itemKey)=>items[itemKey]);
+    return arrayItems.length ? arrayItems : void 0;
+};
+const findCustomFieldSchemaInTree = (schema, key)=>{
+    if (!schema) return null;
+    if (schema.name === "__custom.".concat(key) || schema.name === key) return schema;
+    const properties = schema.properties || {};
+    for (const propertyKey of Object.keys(properties)){
+        if (propertyKey === "__custom.".concat(key) || propertyKey === key) return properties[propertyKey];
+        const found = findCustomFieldSchemaInTree(properties[propertyKey], key);
+        if (found) return found;
+    }
+    return null;
+};
+const findCustomFieldSchema = (schema, key)=>{
+    let current = schema;
+    while(current){
+        const found = findCustomFieldSchemaInTree(current, key);
+        if (found) return found;
+        current = current.parent;
+    }
+    return null;
+};
+const getDatePickerComponent = (fieldSchema)=>{
+    var _fieldSchema_xcomponentprops;
+    return (null == fieldSchema ? void 0 : fieldSchema['x-component']) || (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.component);
+};
+const getDatePickerShowTime = (fieldSchema)=>{
+    var _fieldSchema_xcomponentprops;
+    return null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.showTime;
+};
+const expandArrayValueFilter = function(filterSchemaItem, filterKey, value, customFlat) {
+    let options = arguments.length > 4 && void 0 !== arguments[4] ? arguments[4] : {};
+    const pathParts = filterKey.split('.');
+    const operator = pathParts.pop();
+    if ('$dateBetween' === operator && Array.isArray(value)) {
+        const valueInfo = (0, util_js_namespaceObject.resolveDatePickerRangeValueInfo)(value, {
+            component: options.component,
+            showTime: options.showTime,
+            preferDateBoundaryFallback: options.useDefaultDateBoundary
+        });
+        filterSchemaItem[filterKey] = (0, utils_js_namespaceObject.normalizeDateBetweenValue)(value, {
+            useDefaultDateBoundary: options.useDefaultDateBoundary,
+            valueMode: valueInfo.mode,
+            valueSource: valueInfo.source,
+            preferDateBoundaryFallback: 'retained-date-boundary' === valueInfo.source
+        });
+        return;
+    }
+    if (!Array.isArray(value) || utils_js_namespaceObject.FILTER_OPERATORS_WITH_ARRAY_VALUES.has(operator || '')) {
+        filterSchemaItem[filterKey] = value;
+        return;
+    }
+    if (0 === value.length) return void delete filterSchemaItem[filterKey];
+    let branchEndIndex = -1;
+    for(let index = pathParts.length - 2; index >= 0; index--)if ([
+        '$and',
+        '$or'
+    ].includes(pathParts[index]) && /^\d+$/.test(pathParts[index + 1])) {
+        branchEndIndex = index;
+        break;
+    }
+    const branchPath = branchEndIndex >= 0 ? pathParts.slice(0, branchEndIndex + 2).join('.') : '';
+    const fieldPath = pathParts.slice(branchEndIndex + 2).join('.');
+    const conditions = value.map((item)=>customFlat.unflatten({
+            ["".concat(fieldPath, ".").concat(operator)]: item
+        }));
+    delete filterSchemaItem[filterKey];
+    filterSchemaItem[branchPath ? "".concat(branchPath, ".$or") : '$or'] = conditions;
+};
 const getCustomCondition = function(filter, fieldSchema) {
     let customFlat = arguments.length > 2 && void 0 !== arguments[2] ? arguments[2] : external_flat_default();
     var _filterSchema_$and, _filterSchema_$or;
@@ -165,12 +241,14 @@ const getCustomCondition = function(filter, fieldSchema) {
     {
         var _flatFieldSchema_$and, _flatFieldSchema_$or;
         for(const filterKey in filterSchemaItem){
-            var _filterSchemaItem_filterKey;
-            const match = null == (_filterSchemaItem_filterKey = filterSchemaItem[filterKey]) ? void 0 : _filterSchemaItem_filterKey.slice(11, -2);
-            const collection = null == match ? void 0 : match.split('.')[0];
-            const filterItems = Object.keys(items).filter((item)=>item.includes(collection));
-            if (filterItems.length > 1) filterSchemaItem[filterKey] = filterItems.map((key)=>items[key]);
-            else filterSchemaItem[filterKey] = items[filterItems[0]];
+            const match = 'string' == typeof filterSchemaItem[filterKey] && filterSchemaItem[filterKey].match(CUSTOM_FILTER_VARIABLE_REGEXP);
+            if (!match) continue;
+            const customFieldSchema = findCustomFieldSchema(fieldSchema, match[1]);
+            expandArrayValueFilter(filterSchemaItem, filterKey, getCustomFilterValue(items, match[1], filter || {}), customFlat, {
+                useDefaultDateBoundary: (0, utils_js_namespaceObject.shouldUseDefaultDateBoundary)(customFieldSchema),
+                component: getDatePickerComponent(customFieldSchema),
+                showTime: getDatePickerShowTime(customFieldSchema)
+            });
         }
         for(const item in filterSchemaItem)if (!filterSchemaItem[item] || filterSchemaItem[item].includes('$nFilter')) delete filterSchemaItem[item];
         const flatFieldSchema = customFlat.unflatten(filterSchemaItem);

package/lib/schema-component/antd/form-item/FormItem.Settings.js

@@ -885,14 +885,13 @@ const formItemSettings = new index_js_namespaceObject.SchemaSettings({
                 return isAssociationField && IsShowMultipleSwitch();
             },
             useComponentProps () {
-                var _fieldSchema_xcomponentprops;
                 const { t } = (0, external_react_i18next_namespaceObject.useTranslation)();
                 const field = (0, schema_namespaceObject.useField)();
                 const fieldSchema = (0, schema_namespaceObject.useFieldSchema)();
                 const { dn, refresh } = (0, external_hooks_index_js_namespaceObject.useDesignable)();
                 return {
                     title: t('Allow multiple'),
-                    checked: (null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.multiple) === void 0 ? true : fieldSchema['x-component-props'].multiple,
+                    checked: void 0 === (fieldSchema['x-component-props'] || {}).multiple ? true : fieldSchema['x-component-props'].multiple,
                     onChange (value) {
                         const schema = {
                             ['x-uid']: fieldSchema['x-uid']

package/lib/schema-initializer/utils.js

@@ -49,6 +49,7 @@ __webpack_require__.d(__webpack_exports__, {
     useAssociatedTableColumnInitializerFields: ()=>useAssociatedTableColumnInitializerFields,
     useFilterFormItemInitializerFields: ()=>useFilterFormItemInitializerFields,
     useFormItemInitializerFields: ()=>useFormItemInitializerFields,
+    createFilterAssociatedResultSchema: ()=>createFilterAssociatedResultSchema,
     gridRowColWrap: ()=>gridRowColWrap,
     useCustomFormItemInitializerFields: ()=>useCustomFormItemInitializerFields,
     useFilterInheritsFormItemInitializerFields: ()=>useFilterInheritsFormItemInitializerFields,
@@ -388,7 +389,7 @@ const useFilterFormItemInitializerFields = (options)=>{
                 'x-component': 'CollectionField',
                 'x-decorator': 'FormItem',
                 'x-collection-field': "".concat(name, ".").concat(field.name),
-                'x-component-props': null == (_field_uiSchema2 = field.uiSchema) ? void 0 : _field_uiSchema2['x-component-props']
+                'x-component-props': (null == (_field_uiSchema2 = field.uiSchema) ? void 0 : _field_uiSchema2['x-component-props']) || {}
             };
         }
         const resultItem = {
@@ -499,7 +500,7 @@ const getItem = (field, schemaName, collectionName, getCollectionFields, process
                 'oho',
                 'o2m',
                 'm2m'
-            ].includes(subField.interface)) options.push(getResultSchema("".concat(schemaName, ".").concat(subField.name), subField, collectionName, (fieldPath || '') + field.key));
+            ].includes(subField.interface)) options.push(createFilterAssociatedResultSchema("".concat(schemaName, ".").concat(subField.name), subField, collectionName, (fieldPath || '') + field.key));
             options.push(getItem(subField, "".concat(schemaName, ".").concat(subField.name), collectionName, getCollectionFields, [
                 ...processedCollections,
                 field.target
@@ -514,9 +515,9 @@ const getItem = (field, schemaName, collectionName, getCollectionFields, process
         };
     }
     if ((0, utils_js_namespaceObject.isAssocField)(field)) return null;
-    return getResultSchema(schemaName, field, collectionName, (fieldPath || '') + field.key);
+    return createFilterAssociatedResultSchema(schemaName, field, collectionName, (fieldPath || '') + field.key);
 };
-const getResultSchema = (schemaName, field, collectionName, fieldPath)=>{
+const createFilterAssociatedResultSchema = (schemaName, field, collectionName, fieldPath)=>{
     var _field_uiSchema, _field_uiSchema1, _field_uiSchema2;
     const schema = {
         type: 'string',
@@ -529,7 +530,8 @@ const getResultSchema = (schemaName, field, collectionName, fieldPath)=>{
         'x-component': 'CollectionField',
         'x-read-pretty': false,
         'x-decorator': 'FormItem',
-        'x-collection-field': "".concat(collectionName, ".").concat(schemaName)
+        'x-collection-field': "".concat(collectionName, ".").concat(schemaName),
+        'x-component-props': {}
     };
     const result = {
         name: (null == (_field_uiSchema = field.uiSchema) ? void 0 : _field_uiSchema.title) || field.name,
@@ -1436,6 +1438,7 @@ function useAssociationFields(param) {
     ]);
 }
 exports.createDetailsBlockSchema = __webpack_exports__.createDetailsBlockSchema;
+exports.createFilterAssociatedResultSchema = __webpack_exports__.createFilterAssociatedResultSchema;
 exports.createFormBlockSchema = __webpack_exports__.createFormBlockSchema;
 exports.createReadPrettyFormBlockSchema = __webpack_exports__.createReadPrettyFormBlockSchema;
 exports.createTableBlockSchema = __webpack_exports__.createTableBlockSchema;
@@ -1461,6 +1464,7 @@ exports.useRemoveGridFormItem = __webpack_exports__.useRemoveGridFormItem;
 exports.useTableColumnInitializerFields = __webpack_exports__.useTableColumnInitializerFields;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "createDetailsBlockSchema",
+    "createFilterAssociatedResultSchema",
     "createFormBlockSchema",
     "createReadPrettyFormBlockSchema",
     "createTableBlockSchema",

package/package.json

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