@tachybase/client 1.6.20 → 1.6.22

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

@@ -37,14 +37,12 @@ __webpack_require__.d(__webpack_exports__, {
     useFilterActionProps: ()=>useFilterActionProps,
     useFilterOptions: ()=>useFilterOptions,
     useFilterFieldOptions: ()=>useFilterFieldOptions,
-    getCustomCondition: ()=>getCustomCondition,
-    useGetFilterOptions: ()=>useGetFilterOptions,
-    removeNullCondition: ()=>removeNullCondition,
-    useGetFilterFieldOptions: ()=>useGetFilterFieldOptions
+    getCustomCondition: ()=>external_conditionUtils_js_namespaceObject.getCustomCondition,
+    useGetFilterOptions: ()=>external_useGetFilterOptions_js_namespaceObject.useGetFilterOptions,
+    removeNullCondition: ()=>external_conditionUtils_js_namespaceObject.removeNullCondition,
+    useGetFilterFieldOptions: ()=>external_useGetFilterOptions_js_namespaceObject.useGetFilterFieldOptions
 });
 const schema_namespaceObject = require("@tachybase/schema");
-const external_flat_namespaceObject = require("flat");
-var external_flat_default = /*#__PURE__*/ __webpack_require__.n(external_flat_namespaceObject);
 const external_lodash_namespaceObject = require("lodash");
 var external_lodash_default = /*#__PURE__*/ __webpack_require__.n(external_lodash_namespaceObject);
 const external_react_i18next_namespaceObject = require("react-i18next");
@@ -52,65 +50,14 @@ 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)();
-    const getFilterFieldOptions = useGetFilterFieldOptions();
-    return (collectionName, dataSource)=>{
-        const fields = getCollectionFields(collectionName, dataSource);
-        const options = getFilterFieldOptions(fields);
-        return options;
-    };
-};
+const external_conditionUtils_js_namespaceObject = require("./conditionUtils.js");
+const external_useGetFilterOptions_js_namespaceObject = require("./useGetFilterOptions.js");
 const useFilterOptions = (collectionName)=>{
     const { getCollectionFields } = (0, external_collection_manager_index_js_namespaceObject.useCollectionManager_deprecated)();
     const fields = getCollectionFields(collectionName);
     const options = useFilterFieldOptions(fields);
     return options;
 };
-const useGetFilterFieldOptions = ()=>{
-    var _fieldSchema_xcomponentprops;
-    const fieldSchema = (0, schema_namespaceObject.useFieldSchema)();
-    const nonfilterable = (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.nonfilterable) || [];
-    const { getCollectionFields, getInterface } = (0, external_collection_manager_index_js_namespaceObject.useCollectionManager_deprecated)();
-    const field2option = (field, depth)=>{
-        var _field_uiSchema, _operators_filter;
-        if (nonfilterable.length && 1 === depth && nonfilterable.includes(field.name)) return;
-        if (!field.interface) return;
-        const fieldInterface = getInterface(field.interface);
-        if (!(null == fieldInterface ? void 0 : fieldInterface.filterable)) return;
-        const { nested, children, operators } = fieldInterface.filterable;
-        const option = {
-            name: field.name,
-            type: field.type,
-            target: field.target,
-            title: (null == field ? void 0 : null == (_field_uiSchema = field.uiSchema) ? void 0 : _field_uiSchema.title) || field.name,
-            schema: null == field ? void 0 : field.uiSchema,
-            interface: field.interface,
-            operators: (null == operators ? void 0 : null == (_operators_filter = operators.filter) ? void 0 : _operators_filter.call(operators, (operator)=>!(null == operator ? void 0 : operator.visible) || operator.visible(field))) || []
-        };
-        if (field.target && depth > 2) return;
-        if (depth > 2) return option;
-        if (null == children ? void 0 : children.length) option['children'] = children;
-        if (nested) {
-            const targetFields = getCollectionFields(field.target);
-            const options = getOptions(targetFields, depth + 1).filter(Boolean);
-            option['children'] = option['children'] || [];
-            option['children'].push(...options);
-        }
-        return option;
-    };
-    const getOptions = (fields, depth)=>{
-        const options = [];
-        fields.forEach((field)=>{
-            const option = field2option(field, depth);
-            if (option) options.push(option);
-        });
-        return options;
-    };
-    return (fields)=>getOptions(fields, 1);
-};
 const useFilterFieldOptions = (fields)=>{
     var _fieldSchema_xcomponentprops;
     const fieldSchema = (0, schema_namespaceObject.useFieldSchema)();
@@ -152,132 +99,6 @@ 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;
-    if ((null == fieldSchema ? void 0 : fieldSchema['x-component']) === 'CollectionField') {
-        var _fieldSchema_xcomponentprops1;
-        return null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops1 = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops1.component;
-    }
-    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;
-    const filterSchema = fieldSchema ? fieldSchema['x-filter-rules'] : '';
-    const filterSchemaItem = customFlat(filterSchema || '');
-    const items = customFlat(filter || {});
-    const isCustomFilter = (null == filterSchema ? void 0 : null == (_filterSchema_$and = filterSchema.$and) ? void 0 : _filterSchema_$and.length) || (null == filterSchema ? void 0 : null == (_filterSchema_$or = filterSchema.$or) ? void 0 : _filterSchema_$or.length);
-    const isFilterCustom = isCustomFilter ? (0, external_utils_js_namespaceObject.hasDuplicateKeys)(items, filterSchemaItem) : false;
-    if (isFilterCustom) return customFlat.unflatten(items);
-    if (!isCustomFilter) return customFlat.unflatten({});
-    {
-        var _flatFieldSchema_$and, _flatFieldSchema_$or;
-        for(const filterKey in filterSchemaItem){
-            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);
-        flatFieldSchema['$and'] = null == flatFieldSchema ? void 0 : null == (_flatFieldSchema_$and = flatFieldSchema['$and']) ? void 0 : _flatFieldSchema_$and.filter(Boolean);
-        flatFieldSchema['$or'] = null == flatFieldSchema ? void 0 : null == (_flatFieldSchema_$or = flatFieldSchema['$or']) ? void 0 : _flatFieldSchema_$or.filter(Boolean);
-        return flatFieldSchema;
-    }
-};
-const removeNullCondition = function(filter) {
-    let customFlat = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : external_flat_default();
-    const items = customFlat(filter || {});
-    const values = {};
-    for(const key in items){
-        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 = ()=>{
     const { name } = (0, external_collection_manager_index_js_namespaceObject.useCollection_deprecated)();
     const options = useFilterOptions(name);
@@ -298,7 +119,7 @@ const useFilterFieldProps = (param)=>{
         onSubmit (values) {
             var _service_params_, _service_params, _service_params1;
             const defaultFilter = params.filter;
-            const filter = removeNullCondition(null == values ? void 0 : values.filter);
+            const filter = (0, external_conditionUtils_js_namespaceObject.removeNullCondition)(null == values ? void 0 : values.filter);
             if ('manual' === dataLoadingMode && external_lodash_default().isEmpty(filter)) return service.mutate(void 0);
             const filters = (null == (_service_params = service.params) ? void 0 : null == (_service_params_ = _service_params[1]) ? void 0 : _service_params_.filters) || {};
             filters["filterAction"] = filter;

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

@@ -0,0 +1,91 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ('undefined' != typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    useGetFilterOptions: ()=>useGetFilterOptions,
+    useGetFilterFieldOptions: ()=>useGetFilterFieldOptions
+});
+const schema_namespaceObject = require("@tachybase/schema");
+const index_js_namespaceObject = require("../../../collection-manager/index.js");
+const useGetFilterFieldOptions = ()=>{
+    var _fieldSchema_xcomponentprops;
+    const fieldSchema = (0, schema_namespaceObject.useFieldSchema)();
+    const nonfilterable = (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.nonfilterable) || [];
+    const { getCollectionFields, getInterface } = (0, index_js_namespaceObject.useCollectionManager_deprecated)();
+    const field2option = (field, depth)=>{
+        var _field_uiSchema, _operators_filter;
+        if (nonfilterable.length && 1 === depth && nonfilterable.includes(field.name)) return;
+        if (!field.interface) return;
+        const fieldInterface = getInterface(field.interface);
+        if (!(null == fieldInterface ? void 0 : fieldInterface.filterable)) return;
+        const { nested, children, operators } = fieldInterface.filterable;
+        const option = {
+            name: field.name,
+            type: field.type,
+            target: field.target,
+            title: (null == field ? void 0 : null == (_field_uiSchema = field.uiSchema) ? void 0 : _field_uiSchema.title) || field.name,
+            schema: null == field ? void 0 : field.uiSchema,
+            interface: field.interface,
+            operators: (null == operators ? void 0 : null == (_operators_filter = operators.filter) ? void 0 : _operators_filter.call(operators, (operator)=>!(null == operator ? void 0 : operator.visible) || operator.visible(field))) || []
+        };
+        if (field.target && depth > 2) return;
+        if (depth > 2) return option;
+        if (null == children ? void 0 : children.length) option['children'] = children;
+        if (nested) {
+            const targetFields = getCollectionFields(field.target);
+            const options = getOptions(targetFields, depth + 1).filter(Boolean);
+            option['children'] = option['children'] || [];
+            option['children'].push(...options);
+        }
+        return option;
+    };
+    const getOptions = (fields, depth)=>{
+        const options = [];
+        fields.forEach((field)=>{
+            const option = field2option(field, depth);
+            if (option) options.push(option);
+        });
+        return options;
+    };
+    return (fields)=>getOptions(fields, 1);
+};
+const useGetFilterOptions = ()=>{
+    const { getCollectionFields } = (0, index_js_namespaceObject.useCollectionManager_deprecated)();
+    const getFilterFieldOptions = useGetFilterFieldOptions();
+    return (collectionName, dataSource)=>{
+        const fields = getCollectionFields(collectionName, dataSource);
+        const options = getFilterFieldOptions(fields);
+        return options;
+    };
+};
+exports.useGetFilterFieldOptions = __webpack_exports__.useGetFilterFieldOptions;
+exports.useGetFilterOptions = __webpack_exports__.useGetFilterOptions;
+for(var __webpack_i__ in __webpack_exports__)if (-1 === [
+    "useGetFilterFieldOptions",
+    "useGetFilterOptions"
+].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/lib/schema-component/antd/form/Form.js

@@ -31,16 +31,16 @@ const external_react_namespaceObject = require("react");
 const schema_namespaceObject = require("@tachybase/schema");
 const client_namespaceObject = require("@tego/client");
 const external_antd_namespaceObject = require("antd");
-const external_index_js_namespaceObject = require("../../index.js");
 const index_js_namespaceObject = require("../../../api-client/index.js");
 const external_collection_manager_index_js_namespaceObject = require("../../../collection-manager/index.js");
 const external_schema_settings_index_js_namespaceObject = require("../../../schema-settings/index.js");
 const external_schema_templates_index_js_namespaceObject = require("../../../schema-templates/index.js");
+const external_hooks_index_js_namespaceObject = require("../../hooks/index.js");
 const FormComponent = (props)=>{
     const { form, children, ...others } = props;
     const field = (0, schema_namespaceObject.useField)();
     const fieldSchema = (0, schema_namespaceObject.useFieldSchema)();
-    const f = (0, external_index_js_namespaceObject.useAttach)(form.createVoidField({
+    const f = (0, external_hooks_index_js_namespaceObject.useAttach)(form.createVoidField({
         ...field.props,
         basePath: ''
     }));
@@ -65,11 +65,11 @@ const FormDecorator = (props)=>{
     const { form, children, disabled, ...others } = props;
     const field = (0, schema_namespaceObject.useField)();
     const fieldSchema = (0, schema_namespaceObject.useFieldSchema)();
-    const f = (0, external_index_js_namespaceObject.useAttach)(form.createVoidField({
+    const f = (0, external_hooks_index_js_namespaceObject.useAttach)(form.createVoidField({
         ...field.props,
         basePath: ''
     }));
-    const Component = (0, external_index_js_namespaceObject.useComponent)(fieldSchema['x-component'], Def);
+    const Component = (0, external_hooks_index_js_namespaceObject.useComponent)(fieldSchema['x-component'], Def);
     (0, external_react_namespaceObject.useEffect)(()=>{
         form.disabled = disabled || field.disabled;
     }, [

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

@@ -28,8 +28,8 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 require("react");
-const index_js_namespaceObject = require("../../../schema-settings/index.js");
-const FilterFormDesigner = ()=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(index_js_namespaceObject.GeneralSchemaDesigner, {
+const GeneralSchemaDesigner_js_namespaceObject = require("../../../schema-settings/GeneralSchemaDesigner.js");
+const FilterFormDesigner = ()=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(GeneralSchemaDesigner_js_namespaceObject.GeneralSchemaDesigner, {
         schemaSettings: "FilterFormItemSettings"
     });
 exports.FilterFormDesigner = __webpack_exports__.FilterFormDesigner;

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

@@ -43,22 +43,24 @@ const client_namespaceObject = require("@tego/client");
 const external_antd_style_namespaceObject = require("antd-style");
 const external_classnames_namespaceObject = require("classnames");
 var external_classnames_default = /*#__PURE__*/ __webpack_require__.n(external_classnames_namespaceObject);
-const index_js_namespaceObject = require("../../../application/index.js");
+const useApp_js_namespaceObject = require("../../../application/hooks/useApp.js");
 const useFormActiveFields_js_namespaceObject = require("../../../block-provider/hooks/useFormActiveFields.js");
-const acl_index_js_namespaceObject = require("../../../built-in/acl/index.js");
-const external_data_source_index_js_namespaceObject = require("../../../data-source/index.js");
-const external_schema_settings_index_js_namespaceObject = require("../../../schema-settings/index.js");
-const external_variables_index_js_namespaceObject = require("../../../variables/index.js");
+const ACLCollectionFieldProvider_js_namespaceObject = require("../../../built-in/acl/ACLCollectionFieldProvider.js");
+const CollectionFieldProvider_js_namespaceObject = require("../../../data-source/collection-field/CollectionFieldProvider.js");
+const ConfigSetting_provider_js_namespaceObject = require("../../../data-source/data-block/context/ConfigSetting.provider.js");
+const GeneralSchemaDesigner_js_namespaceObject = require("../../../schema-settings/GeneralSchemaDesigner.js");
 const useContextVariable_js_namespaceObject = require("../../../variables/hooks/useContextVariable.js");
 var useContextVariable_js_default = /*#__PURE__*/ __webpack_require__.n(useContextVariable_js_namespaceObject);
-const external_block_item_index_js_namespaceObject = require("../block-item/index.js");
+const useVariables_js_namespaceObject = require("../../../variables/hooks/useVariables.js");
+var useVariables_js_default = /*#__PURE__*/ __webpack_require__.n(useVariables_js_namespaceObject);
+const BlockItem_js_namespaceObject = require("../block-item/BlockItem.js");
 const shared_js_namespaceObject = require("../input/shared.js");
 const external_FormItem_FilterFormDesigner_js_namespaceObject = require("./FormItem.FilterFormDesigner.js");
 const useLazyLoadDisplayAssociationFieldsOfForm_js_namespaceObject = require("./hooks/useLazyLoadDisplayAssociationFieldsOfForm.js");
 var useLazyLoadDisplayAssociationFieldsOfForm_js_default = /*#__PURE__*/ __webpack_require__.n(useLazyLoadDisplayAssociationFieldsOfForm_js_namespaceObject);
 const useParseDefaultValue_js_namespaceObject = require("./hooks/useParseDefaultValue.js");
 var useParseDefaultValue_js_default = /*#__PURE__*/ __webpack_require__.n(useParseDefaultValue_js_namespaceObject);
-const external_SchemaSettingOptions_js_namespaceObject = require("./SchemaSettingOptions.js");
+const external_operatorUtils_js_namespaceObject = require("./operatorUtils.js");
 function _tagged_template_literal(strings, raw) {
     if (!raw) raw = strings.slice(0);
     return Object.freeze(Object.defineProperties(strings, {
@@ -109,11 +111,11 @@ const FormItem = (props)=>{
     const field = (0, schema_namespaceObject.useField)();
     const schema = (0, schema_namespaceObject.useFieldSchema)();
     const contextVariable = useContextVariable_js_default()();
-    const variables = (0, external_variables_index_js_namespaceObject.useVariables)();
+    const variables = useVariables_js_default()();
     const { addActiveFieldName } = (0, useFormActiveFields_js_namespaceObject.useFormActiveFields)() || {};
-    const { layoutDirection } = (0, external_data_source_index_js_namespaceObject.useContextConfigSetting)();
+    const { layoutDirection } = (0, ConfigSetting_provider_js_namespaceObject.useContextConfigSetting)();
     const finishLayoutDirection = null != selfLayoutDirection ? selfLayoutDirection : layoutDirection;
-    (0, external_SchemaSettingOptions_js_namespaceObject.useEnsureOperatorsValid)();
+    (0, external_operatorUtils_js_namespaceObject.useEnsureOperatorsValid)();
     (0, external_react_namespaceObject.useEffect)(()=>{
         null == variables || variables.registerVariable(contextVariable);
     }, [
@@ -151,28 +153,29 @@ const FormItem = (props)=>{
         }), [
         showTitle
     ]);
-    return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_data_source_index_js_namespaceObject.CollectionFieldProvider, {
+    const item = /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(client_namespaceObject.FormItem, {
+        className: className,
+        ...props,
+        extra: extra
+    });
+    return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(CollectionFieldProvider_js_namespaceObject.CollectionFieldProvider, {
         allowNull: true,
-        children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_block_item_index_js_namespaceObject.BlockItem, {
+        children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(BlockItem_js_namespaceObject.BlockItem, {
             className: 'tb-form-item',
-            children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(acl_index_js_namespaceObject.ACLCollectionFieldProvider, {
-                children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(client_namespaceObject.FormItem, {
-                    className: className,
-                    ...props,
-                    extra: extra
-                })
+            children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(ACLCollectionFieldProvider_js_namespaceObject.ACLCollectionFieldProvider, {
+                children: item
             })
         })
     });
 };
 FormItem.displayName = 'FormItem';
 FormItem.Designer = function() {
-    const app = (0, index_js_namespaceObject.useApp)();
+    const app = (0, useApp_js_namespaceObject.useApp)();
     const fieldSchema = (0, schema_namespaceObject.useFieldSchema)();
     const settingsName = "FormItemSettings:".concat(fieldSchema['x-interface']);
     const defaultActionSettings = 'FormItemSettings';
     const hasFieldItem = app.schemaSettingsManager.has(settingsName);
-    return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_schema_settings_index_js_namespaceObject.GeneralSchemaDesigner, {
+    return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(GeneralSchemaDesigner_js_namespaceObject.GeneralSchemaDesigner, {
         schemaSettings: hasFieldItem ? settingsName : defaultActionSettings
     });
 };

package/lib/schema-component/antd/form-item/SchemaSettingOptions.js

@@ -37,9 +37,9 @@ __webpack_require__.d(__webpack_exports__, {
     EditComponent: ()=>EditComponent,
     EditRequired: ()=>EditRequired,
     EditValidationRules: ()=>EditValidationRules,
-    findFilterOperators: ()=>findFilterOperators,
-    getDefaultFilterOperatorValue: ()=>getDefaultFilterOperatorValue,
-    useEnsureOperatorsValid: ()=>useEnsureOperatorsValid,
+    findFilterOperators: ()=>external_operatorUtils_js_namespaceObject.findFilterOperators,
+    getDefaultFilterOperatorValue: ()=>external_operatorUtils_js_namespaceObject.getDefaultFilterOperatorValue,
+    useEnsureOperatorsValid: ()=>external_operatorUtils_js_namespaceObject.useEnsureOperatorsValid,
     EditTooltip: ()=>EditTooltip,
     EditTitleField: ()=>EditTitleField,
     EditOperator: ()=>EditOperator,
@@ -61,33 +61,7 @@ const isPatternDisabled_js_namespaceObject = require("../../../schema-settings/i
 const external_hooks_index_js_namespaceObject = require("../../hooks/index.js");
 const useOperators_js_namespaceObject = require("../filter/useOperators.js");
 const external_FormItem_js_namespaceObject = require("./FormItem.js");
-const findFilterOperators = (schema)=>{
-    while(schema){
-        if (schema['x-filter-operators']) return {
-            operators: schema['x-filter-operators'],
-            uid: schema['x-uid']
-        };
-        schema = schema.parent;
-    }
-    return {};
-};
-const getSchemaFilterComponent = (schema)=>{
-    var _schema_xcomponentprops;
-    return (null == schema ? void 0 : null == (_schema_xcomponentprops = schema['x-component-props']) ? void 0 : _schema_xcomponentprops.component) || (null == schema ? void 0 : schema['x-component']);
-};
-const getDefaultFilterOperatorValue = function(schema) {
-    let operatorList = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : [];
-    var _operatorList_find, _operatorList_;
-    const component = getSchemaFilterComponent(schema);
-    if (component) {
-        const matched = operatorList.find((item)=>{
-            var _item_schema;
-            return (null == item ? void 0 : null == (_item_schema = item.schema) ? void 0 : _item_schema['x-component']) === component;
-        });
-        if (null == matched ? void 0 : matched.value) return matched.value;
-    }
-    return (null == (_operatorList_find = operatorList.find((item)=>null == item ? void 0 : item.selected)) ? void 0 : _operatorList_find.value) || (null == (_operatorList_ = operatorList[0]) ? void 0 : _operatorList_.value);
-};
+const external_operatorUtils_js_namespaceObject = require("./operatorUtils.js");
 const EditTitle = ()=>{
     var _collectionField_uiSchema;
     const { getCollectionJoinField } = (0, external_collection_manager_index_js_namespaceObject.useCollectionManager_deprecated)();
@@ -491,12 +465,6 @@ const EditPattern = ()=>{
         }
     }, "pattern");
 };
-const useEnsureOperatorsValid = ()=>{
-    const fieldSchema = (0, schema_namespaceObject.useFieldSchema)();
-    const operatorList = (0, useOperators_js_namespaceObject.useOperatorList)();
-    const { operators: storedOperators } = findFilterOperators(fieldSchema);
-    if (storedOperators && operatorList.length && !storedOperators[fieldSchema.name]) storedOperators[fieldSchema.name] = getDefaultFilterOperatorValue(fieldSchema, operatorList);
-};
 const EditOperator = ()=>{
     const compile = (0, external_hooks_index_js_namespaceObject.useCompile)();
     const fieldSchema = (0, schema_namespaceObject.useFieldSchema)();
@@ -504,8 +472,8 @@ const EditOperator = ()=>{
     const { t } = (0, external_react_i18next_namespaceObject.useTranslation)();
     const { dn } = (0, external_hooks_index_js_namespaceObject.useDesignable)();
     const operatorList = (0, useOperators_js_namespaceObject.useOperatorList)();
-    const { operators: storedOperators = {}, uid } = findFilterOperators(fieldSchema);
-    if (operatorList.length && !storedOperators[fieldSchema.name]) storedOperators[fieldSchema.name] = getDefaultFilterOperatorValue(fieldSchema, operatorList);
+    const { operators: storedOperators = {}, uid } = (0, external_operatorUtils_js_namespaceObject.findFilterOperators)(fieldSchema);
+    if (operatorList.length && !storedOperators[fieldSchema.name]) storedOperators[fieldSchema.name] = (0, external_operatorUtils_js_namespaceObject.getDefaultFilterOperatorValue)(fieldSchema, operatorList);
     return operatorList.length ? /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_schema_settings_index_js_namespaceObject.SchemaSettingsSelectItem, {
         title: t('Operator'),
         value: storedOperators[fieldSchema.name],

package/lib/schema-component/antd/form-item/hooks/useLazyLoadDisplayAssociationFieldsOfForm.js

@@ -41,24 +41,26 @@ const client_namespaceObject = require("@tego/client");
 const external_lodash_namespaceObject = require("lodash");
 var external_lodash_default = /*#__PURE__*/ __webpack_require__.n(external_lodash_namespaceObject);
 const index_js_namespaceObject = require("../../../../block-provider/hooks/index.js");
-const external_collection_manager_index_js_namespaceObject = require("../../../../collection-manager/index.js");
+const useCollection_deprecated_js_namespaceObject = require("../../../../collection-manager/hooks/useCollection_deprecated.js");
+const useCollectionManager_deprecated_js_namespaceObject = require("../../../../collection-manager/hooks/useCollectionManager_deprecated.js");
 const CollectionRecordProvider_js_namespaceObject = require("../../../../data-source/collection-record/CollectionRecordProvider.js");
-const external_flag_provider_index_js_namespaceObject = require("../../../../flag-provider/index.js");
-const external_variables_index_js_namespaceObject = require("../../../../variables/index.js");
+const useFlag_js_namespaceObject = require("../../../../flag-provider/hooks/useFlag.js");
+const useVariables_js_namespaceObject = require("../../../../variables/hooks/useVariables.js");
+var useVariables_js_default = /*#__PURE__*/ __webpack_require__.n(useVariables_js_namespaceObject);
 const transformVariableValue_js_namespaceObject = require("../../../../variables/utils/transformVariableValue.js");
 const hooks_js_namespaceObject = require("../../association-field/hooks.js");
 const external_utils_js_namespaceObject = require("../utils.js");
 const useLazyLoadDisplayAssociationFieldsOfForm_useLazyLoadDisplayAssociationFieldsOfForm = ()=>{
     var _sourceCollectionFieldRef_current;
-    const { name } = (0, external_collection_manager_index_js_namespaceObject.useCollection_deprecated)();
-    const { getCollectionJoinField } = (0, external_collection_manager_index_js_namespaceObject.useCollectionManager_deprecated)();
+    const { name } = (0, useCollection_deprecated_js_namespaceObject.useCollection_deprecated)();
+    const { getCollectionJoinField } = (0, useCollectionManager_deprecated_js_namespaceObject.useCollectionManager_deprecated)();
     const form = (0, schema_namespaceObject.useForm)();
     const recordData = (0, CollectionRecordProvider_js_namespaceObject.useCollectionRecordData)();
     const fieldSchema = (0, schema_namespaceObject.useFieldSchema)();
-    const variables = (0, external_variables_index_js_namespaceObject.useVariables)();
+    const variables = useVariables_js_default()();
     const field = (0, schema_namespaceObject.useField)();
     const { formValue: subFormValue } = (0, hooks_js_namespaceObject.useSubFormValue)();
-    const { isInSubForm, isInSubTable } = (0, external_flag_provider_index_js_namespaceObject.useFlag)() || {};
+    const { isInSubForm, isInSubTable } = (0, useFlag_js_namespaceObject.useFlag)() || {};
     const { getAssociationAppends } = (0, index_js_namespaceObject.useAssociationNames)();
     const schemaName = fieldSchema.name.toString();
     const formValue = external_lodash_default().cloneDeep(isInSubForm || isInSubTable ? subFormValue : form.values);

package/lib/schema-component/antd/form-item/hooks/useParseDefaultValue.js

@@ -41,10 +41,14 @@ const client_namespaceObject = require("@tego/client");
 const external_lodash_namespaceObject = require("lodash");
 var external_lodash_default = /*#__PURE__*/ __webpack_require__.n(external_lodash_namespaceObject);
 const index_js_namespaceObject = require("../../../../record-provider/index.js");
-const external_collection_manager_index_js_namespaceObject = require("../../../../collection-manager/index.js");
+const useCollection_deprecated_js_namespaceObject = require("../../../../collection-manager/hooks/useCollection_deprecated.js");
 const CollectionRecordProvider_js_namespaceObject = require("../../../../data-source/collection-record/CollectionRecordProvider.js");
-const external_flag_provider_index_js_namespaceObject = require("../../../../flag-provider/index.js");
-const external_variables_index_js_namespaceObject = require("../../../../variables/index.js");
+const useFlag_js_namespaceObject = require("../../../../flag-provider/hooks/useFlag.js");
+const constants_js_namespaceObject = require("../../../../variables/constants.js");
+const useLocalVariables_js_namespaceObject = require("../../../../variables/hooks/useLocalVariables.js");
+var useLocalVariables_js_default = /*#__PURE__*/ __webpack_require__.n(useLocalVariables_js_namespaceObject);
+const useVariables_js_namespaceObject = require("../../../../variables/hooks/useVariables.js");
+var useVariables_js_default = /*#__PURE__*/ __webpack_require__.n(useVariables_js_namespaceObject);
 const getPath_js_namespaceObject = require("../../../../variables/utils/getPath.js");
 const getVariableName_js_namespaceObject = require("../../../../variables/utils/getVariableName.js");
 const isVariable_js_namespaceObject = require("../../../../variables/utils/isVariable.js");
@@ -54,11 +58,11 @@ const external_useSpecialCase_js_namespaceObject = require("./useSpecialCase.js"
 const useParseDefaultValue = ()=>{
     const field = (0, schema_namespaceObject.useField)();
     const fieldSchema = (0, schema_namespaceObject.useFieldSchema)();
-    const variables = (0, external_variables_index_js_namespaceObject.useVariables)();
-    const localVariables = (0, external_variables_index_js_namespaceObject.useLocalVariables)();
+    const variables = useVariables_js_default()();
+    const localVariables = useLocalVariables_js_default()();
     const recordV2 = (0, CollectionRecordProvider_js_namespaceObject.useCollectionRecord)();
-    const { isInAssignFieldValues, isInSetDefaultValueDialog, isInFormDataTemplate, isInSubTable, isInSubForm } = (0, external_flag_provider_index_js_namespaceObject.useFlag)() || {};
-    const { getField } = (0, external_collection_manager_index_js_namespaceObject.useCollection_deprecated)();
+    const { isInAssignFieldValues, isInSetDefaultValueDialog, isInFormDataTemplate, isInSubTable, isInSubForm } = (0, useFlag_js_namespaceObject.useFlag)() || {};
+    const { getField } = (0, useCollection_deprecated_js_namespaceObject.useCollection_deprecated)();
     const { isSpecialCase, setDefaultValue } = (0, external_useSpecialCase_js_namespaceObject.useSpecialCase)();
     const index = (0, index_js_namespaceObject.useRecordIndex)();
     const findVariable = (0, external_react_namespaceObject.useCallback)((name)=>{
@@ -93,7 +97,7 @@ const useParseDefaultValue = ()=>{
                 field.loading = false;
             } else if (!/\{\{.+\}\}/g.test(fieldSchema.default) && field.setInitialValue) field.setInitialValue(fieldSchema.default);
         };
-        const run = external_lodash_default().debounce(_run, external_variables_index_js_namespaceObject.DEBOUNCE_WAIT);
+        const run = external_lodash_default().debounce(_run, constants_js_namespaceObject.DEBOUNCE_WAIT);
         if ((0, isVariable_js_namespaceObject.isVariable)(fieldSchema.default)) {
             const variableName = (0, getVariableName_js_namespaceObject.getVariableName)(fieldSchema.default);
             const variable = findVariable(variableName);