From dbb1703dffe05b3f97acd8bde76563b8a62569c1 Mon Sep 17 00:00:00 2001 From: sealday Date: Tue, 2 Apr 2024 18:13:33 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20@formily/*=20=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E6=88=90=20@nocobase/schema=EF=BC=8C=E6=B8=85=E7=90=86?= =?UTF-8?q?=E6=89=80=E6=9C=89=E7=9A=84=20ts=20build=20=E6=8A=A5=E9=94=99?= =?UTF-8?q?=20(#566)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: sealday Reviewed-on: https://git.daoyoucloud.com/daoyoucloud/tachycode/pulls/566 --- package.json | 36 +- packages/core/acl/package.json | 3 + packages/core/app/src/config/cache.ts | 2 +- packages/core/build/package.json | 2 +- packages/core/build/src/buildPlugin.ts | 1 + .../src/bloom-filter/redis-bloom-filter.ts | 3 +- ...sociation-table-list-and-parent-record.tsx | 2 +- .../association-table-list-and-source-id.tsx | 2 +- .../collection-form-create.tsx | 2 +- .../collection-form-get-and-update.tsx | 2 +- .../collection-form-record-and-update.tsx | 2 +- .../collection-table-list.tsx | 2 +- .../data-block-provider/complete-demo.tsx | 4 +- .../core/data-block/demos/settings/demo1.tsx | 2 +- .../demos/collection-field/demo1.tsx | 2 +- .../demos/collection-field/demo2.tsx | 2 +- .../demos/schema-initializer-basic.tsx | 4 +- .../demos/schema-initializer-component.tsx | 4 +- .../schema-initializer-components-item.tsx | 2 +- .../schema-initializer-components-select.tsx | 2 +- .../demos/schema-initializer-items.tsx | 4 +- .../demos/schema-initializer-popover.tsx | 4 +- .../demos/schema-initializer-render.tsx | 4 +- ...chema-settings-components-action-modal.tsx | 2 +- .../demos/schema-settings-components-item.tsx | 2 +- .../schema-settings-components-modal.tsx | 2 +- .../schema-settings-components-select.tsx | 2 +- .../schema-settings-components-switch.tsx | 2 +- .../demos/schema-settings-render.tsx | 2 +- ...sociation-table-list-and-parent-record.tsx | 2 +- .../association-table-list-and-source-id.tsx | 2 +- .../collection-form-create.tsx | 2 +- .../collection-form-get-and-update.tsx | 2 +- .../collection-form-record-and-update.tsx | 2 +- .../collection-table-list.tsx | 2 +- .../data-block-provider/complete-demo.tsx | 4 +- .../core/data-block/demos/settings/demo1.tsx | 2 +- .../demos/collection-field/demo1.tsx | 2 +- .../demos/collection-field/demo2.tsx | 2 +- .../demos/schema-initializer-basic.tsx | 4 +- .../demos/schema-initializer-component.tsx | 4 +- .../schema-initializer-components-item.tsx | 2 +- .../schema-initializer-components-select.tsx | 2 +- .../demos/schema-initializer-items.tsx | 4 +- .../demos/schema-initializer-popover.tsx | 4 +- .../demos/schema-initializer-render.tsx | 4 +- ...chema-settings-components-action-modal.tsx | 2 +- .../demos/schema-settings-components-item.tsx | 2 +- .../schema-settings-components-modal.tsx | 2 +- .../schema-settings-components-select.tsx | 2 +- .../schema-settings-components-switch.tsx | 2 +- .../demos/schema-settings-render.tsx | 2 +- packages/core/client/package.json | 15 +- packages/core/client/src/acl/ACLProvider.tsx | 4 +- packages/core/client/src/acl/ACLShortcut.tsx | 4 +- .../src/acl/Configuration/RoleConfigure.tsx | 4 +- .../Configuration/RolesResourcesActions.tsx | 4 +- .../src/acl/Configuration/ScopeSelect.tsx | 2 +- .../src/acl/Configuration/StrategyActions.tsx | 4 +- .../Configuration/schemas/roleCollections.ts | 4 +- .../src/acl/Configuration/schemas/roles.ts | 4 +- .../src/acl/Configuration/schemas/scopes.ts | 2 +- .../schemas/useSaveRoleResourceAction.ts | 2 +- .../core/client/src/api-client/context.ts | 2 +- .../client/src/api-client/demos/demo3.tsx | 2 +- .../client/src/api-client/hooks/useRequest.ts | 2 +- .../client/src/application/Application.tsx | 2 +- .../client/src/application/WebSocketClient.ts | 2 +- .../__tests__/SchemaToolbar.test.tsx | 2 +- .../application/components/AppComponent.tsx | 2 +- .../hoc/withDynamicSchemaProps.tsx | 2 +- .../SchemaInitializerActionModal.tsx | 2 +- .../components/SchemaInitializerItem.tsx | 2 +- .../components/SchemaInitializerSubMenu.tsx | 2 +- .../schema-initializer/hoc/index.tsx | 2 +- .../application/schema-initializer/types.ts | 2 +- .../components/SchemaSettingsWrapper.tsx | 2 +- .../schema-settings/hooks/index.tsx | 4 +- .../schema-toolbar/hooks/index.tsx | 2 +- .../src/application/utils/globalDeps.ts | 18 +- .../src/block-provider/BlockProvider.tsx | 4 +- .../block-provider/DetailsBlockProvider.tsx | 4 +- .../src/block-provider/FormBlockProvider.tsx | 4 +- .../src/block-provider/FormFieldProvider.tsx | 6 +- .../src/block-provider/TableBlockProvider.tsx | 4 +- .../src/block-provider/TableFieldProvider.tsx | 4 +- .../block-provider/TableSelectorProvider.tsx | 4 +- .../client/src/block-provider/hooks/index.ts | 6 +- .../block-provider/hooks/useParsedFilter.ts | 2 +- .../core/client/src/china-region/index.tsx | 4 +- .../Configuration/AddCollectionAction.tsx | 4 +- .../Configuration/AddFieldAction.tsx | 4 +- .../Configuration/AddSubFieldAction.tsx | 4 +- .../Configuration/DeleteCollectionAction.tsx | 2 +- .../Configuration/EditCollectionAction.tsx | 4 +- .../Configuration/EditFieldAction.tsx | 4 +- .../Configuration/EditSubFieldAction.tsx | 4 +- .../OverridingCollectionField.tsx | 4 +- .../Configuration/SyncFieldsAction.tsx | 4 +- .../Configuration/SyncSQLFieldsAction.tsx | 6 +- .../Configuration/ViewInheritedField.tsx | 4 +- .../components/CollectionCategory.tsx | 2 +- .../CollectionFieldInterfaceTag.tsx | 2 +- .../components/CollectionTemplateTag.tsx | 2 +- .../Configuration/components/Summary.tsx | 2 +- .../Configuration/components/index.tsx | 4 +- .../Configuration/index.tsx | 2 +- .../ResourceActionProvider.tsx | 2 +- .../src/collection-manager/action-hooks.ts | 2 +- .../src/collection-manager/demos/demo2.tsx | 2 +- .../src/collection-manager/demos/demo4.tsx | 2 +- .../src/collection-manager/demos/demo5.tsx | 8 +- .../hooks/useCollectionDataSource.ts | 2 +- .../hooks/useCollectionManager_deprecated.ts | 2 +- .../hooks/useCollection_deprecated.ts | 2 +- .../collection-manager/interfaces/checkbox.ts | 2 +- .../interfaces/checkboxGroup.ts | 2 +- .../interfaces/chinaRegion.ts | 2 +- .../interfaces/collection.ts | 2 +- .../interfaces/createdBy.ts | 2 +- .../collection-manager/interfaces/email.ts | 2 +- .../collection-manager/interfaces/input.ts | 4 +- .../collection-manager/interfaces/integer.ts | 2 +- .../collection-manager/interfaces/json.tsx | 2 +- .../collection-manager/interfaces/linkTo.ts | 4 +- .../src/collection-manager/interfaces/m2m.tsx | 4 +- .../src/collection-manager/interfaces/m2o.tsx | 2 +- .../collection-manager/interfaces/markdown.ts | 2 +- .../interfaces/multipleSelect.ts | 2 +- .../src/collection-manager/interfaces/o2m.tsx | 2 +- .../src/collection-manager/interfaces/o2o.tsx | 2 +- .../collection-manager/interfaces/percent.ts | 4 +- .../interfaces/properties/index.ts | 6 +- .../collection-manager/interfaces/richText.ts | 2 +- .../collection-manager/interfaces/select.ts | 2 +- .../collection-manager/interfaces/subTable.ts | 4 +- .../collection-manager/interfaces/textarea.ts | 2 +- .../collection-manager/interfaces/types.ts | 2 +- .../interfaces/updatedBy.ts | 2 +- .../src/collection-manager/interfaces/url.ts | 2 +- .../src/collection-manager/sub-table.tsx | 2 +- .../templates/components/PresetFields.tsx | 2 +- .../templates/components/PreviewFields.tsx | 2 +- .../templates/components/PreviewTable.tsx | 2 +- .../sql-collection/FieldsConfigure.tsx | 4 +- .../sql-collection/PreviewTable.tsx | 2 +- .../components/sql-collection/SQLInput.tsx | 4 +- .../sql-collection/SQLRequestProvider.tsx | 2 +- .../src/collection-manager/templates/sql.tsx | 2 +- .../src/collection-manager/templates/types.ts | 2 +- .../client/src/collection-manager/types.ts | 2 +- .../src/common/useFieldComponentName.tsx | 4 +- ...sociation-table-list-and-parent-record.tsx | 2 +- .../association-table-list-and-source-id.tsx | 2 +- .../collection-form-create.tsx | 2 +- .../collection-form-get-and-update.tsx | 2 +- .../collection-form-record-and-update.tsx | 2 +- .../collection-table-list.tsx | 2 +- .../CollectionFieldInterface.ts | 2 +- .../collection-field/CollectionField.tsx | 6 +- .../CollectionFieldProvider.tsx | 2 +- .../collection-template/CollectionTemplate.ts | 2 +- .../src/data-source/collection/Collection.ts | 2 +- .../collection/CollectionManager.ts | 2 +- .../src/filter-provider/FilterProvider.tsx | 4 +- .../core/client/src/filter-provider/utils.ts | 2 +- .../core/client/src/formula/Expression.tsx | 4 +- packages/core/client/src/formula/Result.tsx | 4 +- .../core/client/src/formula/demos/demo2.tsx | 2 +- packages/core/client/src/index.ts | 1 + .../add-child/addChildActionSettings.tsx | 2 +- .../expendableActionSettings.tsx | 2 +- .../actions/filter/filterActionSettings.tsx | 2 +- .../customizeSaveRecordActionSettings.tsx | 4 +- .../submit/createSubmitActionSettings.tsx | 4 +- .../submit/updateSubmitActionSettings.tsx | 4 +- .../customizeUpdateRecordActionSettings.tsx | 4 +- .../createDetailsWithPaginationUISchema.ts | 4 +- .../detailsWithPaginationSettings.tsx | 2 +- .../setDataLoadingModeSettingsItem.tsx | 2 +- .../details-single/createDetailsUISchema.ts | 4 +- .../details-single/detailsBlockSettings.ts | 2 +- .../form-create/schemaInitializer.test.ts | 2 +- .../createEditFormBlockUISchema.test.ts | 2 +- .../form/createCreateFormBlockUISchema.ts | 4 +- .../form/createEditFormBlockUISchema.ts | 4 +- .../form/createFormBlockSettings.tsx | 2 +- .../data-blocks/form/editFormBlockSettings.ts | 2 +- .../form/fieldSettingsFormItem.tsx | 4 +- .../grid-card/createGridCardBlockSchema.ts | 2 +- .../grid-card/gridCardBlockSettings.ts | 4 +- .../data-blocks/list/createListBlockSchema.ts | 2 +- .../data-blocks/list/listBlockSettings.ts | 2 +- .../createTableSelectorUISchema.ts | 4 +- .../tableSelectorBlockSettings.ts | 2 +- .../table/TableActionColumnInitializers.tsx | 2 +- .../table/TableActionInitializers.tsx | 2 +- .../table/TableColumnInitializers.tsx | 2 +- .../table/createTableBlockUISchema.ts | 4 +- .../hooks/useTableBlockDecoratorProps.ts | 2 +- .../table/hooks/useTableBlockProps.tsx | 4 +- .../data-blocks/table/tableBlockSettings.tsx | 4 +- .../data-blocks/table/tableColumnSettings.tsx | 4 +- .../blocks/data-blocks/table/utils.tsx | 4 +- .../createFilterCollapseBlockSchema.ts | 4 +- .../collapse/filterCollapseBlockSettings.ts | 2 +- .../filterCollapseItemFieldSettings.ts | 2 +- .../form/createFilterFormBlockSchema.ts | 4 +- .../form/filterFormBlockSettings.ts | 2 +- .../form/filterFormItemFieldSettings.ts | 4 +- .../markdown/markdownBlockSettings.ts | 2 +- .../cascadeSelectComponentFieldSettings.tsx | 4 +- .../cascaderComponentFieldSettings.tsx | 4 +- .../datePickerComponentFieldSettings.tsx | 2 +- .../fileManagerComponentFieldSettings.tsx | 4 +- ...uploadAttachmentComponentFieldSettings.tsx | 4 +- .../inputNumberComponentFieldSettings.tsx | 2 +- .../Nester/subformComponentFieldSettings.tsx | 4 +- .../recordPickerComponentFieldSettings.tsx | 4 +- .../subformPopoverComponentFieldSettings.tsx | 4 +- .../Select/selectComponentFieldSettings.tsx | 4 +- .../subTablePopoverComponentFieldSettings.tsx | 4 +- .../Tag/tagComponentFieldSettings.tsx | 4 +- .../unixTimestampComponentFieldSettings.tsx | 2 +- .../CollectionFieldInitializer.tsx | 2 +- .../TableCollectionFieldInitializer.tsx | 2 +- .../client/src/modules/menu/GroupItem.tsx | 2 +- .../client/src/modules/menu/LinkMenuItem.tsx | 2 +- .../client/src/modules/menu/PageMenuItem.tsx | 4 +- .../src/nocobase-buildin-plugin/index.tsx | 2 +- .../plugins/LocalePlugin.ts | 2 +- .../PinnedPluginListProvider.tsx | 2 +- .../src/pm/PluginForm/form/PluginNpmForm.tsx | 6 +- .../pm/PluginForm/form/PluginUploadForm.tsx | 6 +- .../src/pm/PluginForm/form/PluginUrlForm.tsx | 6 +- .../antd/__builtins__/portal.tsx | 4 +- .../antd/__builtins__/style.ts | 2 +- .../antd/action/Action.Container.tsx | 2 +- .../antd/action/Action.Designer.tsx | 6 +- .../antd/action/Action.Drawer.tsx | 2 +- .../antd/action/Action.Link.tsx | 2 +- .../antd/action/Action.Modal.tsx | 2 +- .../antd/action/Action.Page.tsx | 2 +- .../schema-component/antd/action/Action.tsx | 2 +- .../antd/action/ActionBar.tsx | 2 +- .../schema-component/antd/action/context.tsx | 2 +- .../antd/action/demos/demo1.tsx | 2 +- .../antd/action/demos/demo2.tsx | 2 +- .../antd/action/demos/demo3.tsx | 4 +- .../antd/action/demos/demo4.tsx | 2 +- .../antd/action/demos/demo5.tsx | 4 +- .../antd/action/demos/demo6.tsx | 4 +- .../src/schema-component/antd/action/hooks.ts | 2 +- .../action/hooks/useGetAriaLabelOfAction.ts | 2 +- .../action/hooks/useGetAriaLabelOfDrawer.ts | 2 +- .../action/hooks/useGetAriaLabelOfModal.ts | 2 +- .../action/hooks/useGetAriaLabelOfPopover.ts | 2 +- .../src/schema-component/antd/action/utils.ts | 2 +- .../AssociationFieldProvider.tsx | 4 +- .../association-field/AssociationSelect.tsx | 6 +- .../antd/association-field/Editable.tsx | 4 +- .../antd/association-field/FileManager.tsx | 2 +- .../InternalCascadeSelect.tsx | 6 +- .../association-field/InternalCascader.tsx | 6 +- .../InternalDrawerSubTable.tsx | 2 +- .../antd/association-field/InternalNester.tsx | 2 +- .../antd/association-field/InternalPicker.tsx | 2 +- .../InternalPopoverNester.tsx | 2 +- .../association-field/InternalSubTable.tsx | 2 +- .../antd/association-field/InternalTag.tsx | 4 +- .../antd/association-field/InternalViewer.tsx | 4 +- .../antd/association-field/Nester.tsx | 10 +- .../antd/association-field/ReadPretty.tsx | 2 +- .../antd/association-field/SubTable.tsx | 10 +- .../components/CreateRecordAction.tsx | 2 +- .../antd/association-field/context.ts | 2 +- .../antd/association-field/hooks.ts | 6 +- .../antd/association-field/index.ts | 2 +- .../antd/association-field/util.ts | 6 +- .../ActionBarAssociationFilterAction.tsx | 2 +- .../AssociationFilter.BlockDesigner.tsx | 2 +- .../AssociationFilter.Item.Designer.tsx | 2 +- .../AssociationFilter.Item.tsx | 2 +- .../association-filter/AssociationFilter.tsx | 2 +- .../AssociationFilterDesignerDelete.tsx | 2 +- .../AssociationFilterDesignerDisplayField.tsx | 2 +- .../association-select/AssociationSelect.tsx | 6 +- .../antd/association-select/ReadPretty.tsx | 2 +- .../association-select/useServiceOptions.ts | 2 +- .../antd/auto-complete/AutoComplete.tsx | 2 +- .../antd/block-item/BlockItem.tsx | 2 +- .../antd/block-item/demos/demo1.tsx | 4 +- .../hooks/useGetAriaLabelOfBlockItem.ts | 2 +- .../antd/card-item/CardItem.tsx | 2 +- .../antd/cascader/Cascader.tsx | 6 +- .../antd/cascader/ReadPretty.tsx | 6 +- .../antd/cascader/demos/demo2.tsx | 6 +- .../antd/checkbox/Checkbox.tsx | 4 +- .../collection-select/CollectionSelect.tsx | 2 +- .../antd/color-picker/ColorPicker.tsx | 2 +- .../antd/color-select/ColorSelect.tsx | 2 +- .../src/schema-component/antd/cron/Cron.tsx | 2 +- .../schema-component/antd/cron/CronSet.tsx | 2 +- .../antd/custom-cascader/CustomCascader.tsx | 6 +- .../antd/custom-cascader/ReadPretty.tsx | 6 +- .../antd/date-picker/DatePicker.tsx | 2 +- .../antd/date-picker/ReadPretty.tsx | 2 +- .../expand-action/Expand.Action.Design.tsx | 2 +- .../antd/expand-action/Expand.Action.tsx | 2 +- .../antd/filter/DynamicComponent.tsx | 6 +- .../antd/filter/Filter.Action.Designer.tsx | 2 +- .../schema-component/antd/filter/Filter.tsx | 4 +- .../antd/filter/FilterAction.tsx | 4 +- .../antd/filter/FilterGroup.tsx | 4 +- .../antd/filter/FilterItem.tsx | 2 +- .../antd/filter/FilterItems.tsx | 4 +- .../antd/filter/SaveDefaultValue.tsx | 2 +- .../schema-component/antd/filter/context.ts | 4 +- .../antd/filter/demos/demo3.tsx | 2 +- .../antd/filter/demos/demo4.tsx | 2 +- .../antd/filter/demos/demo5.tsx | 2 +- .../antd/filter/useFilterActionProps.ts | 4 +- .../antd/filter/useOperators.ts | 2 +- .../schema-component/antd/filter/useValues.ts | 4 +- .../antd/form-dialog/index.tsx | 8 +- .../form-item/FormItem.FilterFormSettings.tsx | 2 +- .../antd/form-item/FormItem.Settings.tsx | 4 +- .../antd/form-item/FormItem.tsx | 4 +- .../antd/form-item/SchemaSettingOptions.tsx | 6 +- ...eLazyLoadDisplayAssociationFieldsOfForm.ts | 4 +- .../form-item/hooks/useParseDefaultValue.ts | 6 +- .../antd/form-item/hooks/useSpecialCase.ts | 4 +- .../antd/form-v2/Form.Settings.tsx | 2 +- .../schema-component/antd/form-v2/Form.tsx | 8 +- .../antd/form-v2/FormField.tsx | 2 +- .../antd/form-v2/Templates.tsx | 2 +- .../antd/form-v2/demos/demo1.tsx | 2 +- .../antd/form-v2/demos/demo2.tsx | 2 +- .../antd/form-v2/demos/demo3.tsx | 2 +- .../schema-component/antd/form-v2/utils.tsx | 2 +- .../src/schema-component/antd/form/Form.tsx | 4 +- .../antd/form/demos/demo1.tsx | 2 +- .../antd/form/demos/demo2.tsx | 2 +- .../antd/form/demos/demo3.tsx | 2 +- .../antd/form/demos/demo4.tsx | 2 +- .../antd/form/demos/demo5.tsx | 2 +- .../antd/form/demos/demo6.tsx | 2 +- .../antd/form/demos/demo7.tsx | 2 +- .../antd/form/demos/demo8.tsx | 2 +- .../schema-component/antd/g2plot/G2Plot.tsx | 4 +- .../antd/g2plot/G2PlotDesigner.tsx | 2 +- .../antd/grid-card/GridCard.Decorator.tsx | 4 +- .../antd/grid-card/GridCard.Designer.tsx | 2 +- .../antd/grid-card/GridCard.Item.tsx | 4 +- .../antd/grid-card/GridCard.tsx | 4 +- .../src/schema-component/antd/grid/Block.tsx | 2 +- .../src/schema-component/antd/grid/Grid.tsx | 4 +- .../antd/grid/demos/demo1.tsx | 2 +- .../antd/grid/demos/demo2.tsx | 4 +- .../antd/grid/demos/demo3.tsx | 4 +- .../antd/icon-picker/IconPicker.tsx | 4 +- .../antd/input-number/InputNumber.tsx | 2 +- .../antd/input-number/ReadPretty.tsx | 2 +- .../src/schema-component/antd/input/Input.tsx | 2 +- .../src/schema-component/antd/input/Json.tsx | 4 +- .../antd/list/List.Decorator.tsx | 4 +- .../antd/list/List.Designer.tsx | 2 +- .../schema-component/antd/list/List.Item.tsx | 4 +- .../src/schema-component/antd/list/List.tsx | 4 +- .../antd/markdown/Markdown.Void.Designer.tsx | 2 +- .../antd/markdown/Markdown.Void.tsx | 2 +- .../antd/markdown/Markdown.tsx | 2 +- .../antd/markdown/demos/demo2.tsx | 2 +- .../antd/menu/Menu.Designer.tsx | 4 +- .../src/schema-component/antd/menu/Menu.tsx | 4 +- .../antd/menu/demos/demo1.tsx | 2 +- .../antd/menu/demos/demo2.tsx | 2 +- .../antd/menu/demos/demo3.tsx | 2 +- .../src/schema-component/antd/menu/util.ts | 2 +- .../antd/nanoIDInput/NanoIDInput.tsx | 2 +- .../schema-component/antd/page/FixedBlock.tsx | 2 +- .../antd/page/FixedBlockDesignerItem.tsx | 2 +- .../antd/page/Page.Settings.tsx | 2 +- .../src/schema-component/antd/page/Page.tsx | 2 +- .../antd/page/PageTab.Settings.tsx | 2 +- .../antd/page/PageTabDesigner.tsx | 2 +- .../antd/page/demos/demo1.tsx | 2 +- .../antd/pagination/index.tsx | 2 +- .../antd/password/Password.tsx | 2 +- .../antd/password/PasswordStrength.tsx | 2 +- .../schema-component/antd/percent/Percent.tsx | 4 +- .../schema-component/antd/preview/Preview.tsx | 2 +- .../antd/quick-edit/QuickEdit.tsx | 4 +- .../src/schema-component/antd/radio/Radio.tsx | 4 +- .../antd/record-picker/InputRecordPicker.tsx | 4 +- .../record-picker/ReadPrettyRecordPicker.tsx | 4 +- .../antd/record-picker/RecordPicker.tsx | 2 +- .../antd/record-picker/demos/demo1.tsx | 2 +- .../antd/record-picker/useFieldNames.ts | 2 +- .../antd/record-picker/util.ts | 4 +- .../antd/remote-select/ReadPretty.tsx | 2 +- .../antd/remote-select/RemoteSelect.tsx | 2 +- .../antd/rich-text/RichText.tsx | 2 +- .../antd/select/FormulaSelect.tsx | 7 +- .../antd/select/ReadPretty.tsx | 6 +- .../schema-component/antd/select/Select.tsx | 4 +- .../antd/select/demos/demo3.tsx | 2 +- .../table-v2/Table.ActionColumnDesigner.tsx | 2 +- .../antd/table-v2/Table.Column.ActionBar.tsx | 2 +- .../antd/table-v2/Table.Column.Decorator.tsx | 2 +- .../antd/table-v2/Table.Column.Designer.tsx | 2 +- .../antd/table-v2/Table.Column.tsx | 2 +- .../schema-component/antd/table-v2/Table.tsx | 10 +- .../antd/table-v2/TableBlockDesigner.tsx | 4 +- .../antd/table-v2/TableField.tsx | 4 +- .../antd/table-v2/TableSelectorDesigner.tsx | 2 +- .../components/ColumnFieldProvider.tsx | 2 +- .../antd/table-v2/demos/demo1.tsx | 2 +- .../antd/table-v2/demos/demo2.tsx | 4 +- .../schema-component/antd/table-v2/utils.ts | 2 +- .../antd/table/Table.Array.tsx | 4 +- .../antd/table/Table.Column.ActionBar.tsx | 2 +- .../antd/table/Table.Column.Decorator.tsx | 2 +- .../antd/table/Table.Column.Designer.tsx | 2 +- .../antd/table/Table.Column.tsx | 2 +- .../antd/table/Table.RowActionDesigner.tsx | 2 +- .../antd/table/Table.RowSelection.tsx | 6 +- .../antd/table/Table.Void.Designer.tsx | 2 +- .../antd/table/Table.Void.tsx | 4 +- .../antd/table/demos/demo1.tsx | 2 +- .../antd/table/demos/demo2.tsx | 2 +- .../antd/table/demos/demo3.tsx | 2 +- .../antd/table/demos/demo4.tsx | 4 +- .../antd/tabs/Tabs.Designer.tsx | 2 +- .../src/schema-component/antd/tabs/Tabs.tsx | 2 +- .../antd/tabs/demos/demo1.tsx | 2 +- .../antd/time-picker/ReadPretty.tsx | 2 +- .../antd/time-picker/TimePicker.tsx | 2 +- .../antd/tree-select/ReadPretty.tsx | 6 +- .../antd/tree-select/TreeSelect.tsx | 2 +- .../antd/unixTimestamp/UnixTimestamp.tsx | 2 +- .../antd/upload/ReadPretty.tsx | 4 +- .../schema-component/antd/upload/Upload.tsx | 2 +- .../schema-component/antd/upload/shared.ts | 8 +- .../schema-component/antd/variable/Input.tsx | 2 +- .../antd/variable/TextArea.tsx | 2 +- .../antd/variable/Variable.tsx | 2 +- .../common/dnd-context/index.tsx | 2 +- .../common/sortable-item/SortableItem.tsx | 2 +- .../schema-component/core/FormProvider.tsx | 4 +- .../core/RemoteSchemaComponent.tsx | 4 +- .../schema-component/core/SchemaComponent.tsx | 2 +- .../core/SchemaComponentOptions.tsx | 2 +- .../core/SchemaComponentProvider.tsx | 6 +- .../src/schema-component/demos/demo1.tsx | 4 +- .../hooks/__tests__/designable.test.ts | 2 +- .../hooks/__tests__/splitWrapSchema.test.ts | 2 +- .../src/schema-component/hooks/useCompile.ts | 2 +- .../schema-component/hooks/useComponent.ts | 2 +- .../schema-component/hooks/useDesignable.tsx | 6 +- .../src/schema-component/hooks/useDesigner.ts | 2 +- .../hooks/useFieldComponentOptions.ts | 2 +- .../hooks/useFieldModeOptions.tsx | 2 +- .../schema-component/hooks/useFieldProps.ts | 2 +- .../schema-component/hooks/useFieldTitle.ts | 4 +- .../core/client/src/schema-component/types.ts | 4 +- .../buttons/RecordBlockInitializers.tsx | 2 +- .../buttons/TabPaneInitializers.tsx | 2 +- .../components/CreateRecordAction.tsx | 2 +- .../assigned-field/AssignedField.tsx | 6 +- .../demos/insert-schema-basic.tsx | 4 +- .../useGetAriaLabelOfSchemaInitializer.ts | 2 +- .../items/BlockInitializer.tsx | 2 +- .../items/InitializerWithSwitch.tsx | 2 +- .../items/TableActionColumnInitializer.tsx | 2 +- .../client/src/schema-initializer/utils.ts | 6 +- .../src/schema-items/GeneralSchemaItems.tsx | 4 +- .../src/schema-items/GeneralSettings.tsx | 4 +- .../src/schema-items/OpenModeSchemaItems.tsx | 2 +- .../DataTemplates/FormDataTemplates.tsx | 6 +- .../components/DataTemplateTitle.tsx | 6 +- .../DataTemplates/components/Designer.tsx | 4 +- .../DataTemplates/hooks/useCollectionState.ts | 4 +- .../schema-settings/DataTemplates/utils.tsx | 2 +- .../DateFormat/ExpiresRadio.tsx | 2 +- .../DynamicComponent.tsx | 2 +- .../EnableChildCollections/index.tsx | 4 +- .../schema-settings/GeneralSchemaDesigner.tsx | 2 +- .../LinkageRules/DynamicComponent.tsx | 6 +- .../LinkageRules/LinkageRuleAction.tsx | 4 +- .../LinkageRules/LinkageRuleActionGroup.tsx | 9 +- .../LinkageRules/components/LinkageHeader.tsx | 6 +- .../schema-settings/LinkageRules/context.ts | 4 +- .../schema-settings/LinkageRules/index.tsx | 4 +- .../schema-settings/LinkageRules/useValues.ts | 2 +- .../src/schema-settings/SchemaSettings.tsx | 6 +- .../SchemaSettingsDataScope.tsx | 2 +- .../SchemaSettingsDateFormat.tsx | 2 +- .../SchemaSettingsDefaultValue.tsx | 4 +- .../SchemaSettingsNumberFormat.tsx | 2 +- .../SchemaSettingsSortingRule.tsx | 2 +- .../VariableInput/VariableInput.tsx | 4 +- .../VariableInput/hooks/useBaseVariable.tsx | 2 +- .../VariableInput/hooks/useFormVariable.ts | 4 +- .../hooks/useIterationVariable.ts | 2 +- .../hooks/useParentRecordVariable.ts | 2 +- .../VariableInput/hooks/useRecordVariable.ts | 2 +- .../VariableInput/hooks/useRoleVariable.ts | 2 +- .../VariableInput/hooks/useUserVariable.ts | 2 +- .../VariableInput/hooks/useVariableOptions.ts | 4 +- .../src/schema-settings/VariableInput/type.ts | 2 +- .../schema-settings/demos/schema-basic.tsx | 2 +- .../hooks/useGetAriaLabelOfDesigner.ts | 2 +- .../hooks/useIsAllowToSetDefaultValue.tsx | 4 +- .../hooks/useIsShowMultipleSwitch.ts | 2 +- .../src/schema-settings/isPatternDisabled.tsx | 2 +- .../core/client/src/schema-settings/types.ts | 2 +- .../src/schema-templates/BlockTemplate.tsx | 2 +- .../SchemaTemplateManagerProvider.tsx | 4 +- .../schemas/uiSchemaTemplates.ts | 4 +- packages/core/client/src/style/index.ts | 5 +- .../SystemSettingsShortcut.tsx | 4 +- .../core/client/src/user/ChangePassword.tsx | 4 +- packages/core/client/src/user/EditProfile.tsx | 4 +- packages/core/client/src/user/Help.tsx | 2 +- .../core/client/src/user/VerificationCode.tsx | 2 +- .../src/variables/VariablesProvider.tsx | 2 +- .../variables/__tests__/useVariables.test.tsx | 2 +- .../src/variables/hooks/useLocalVariables.tsx | 2 +- packages/core/database/package.json | 3 +- packages/core/database/src/database.ts | 9 +- packages/core/devtools/package.json | 12 +- packages/core/schema/.npmignore | 2 + packages/core/schema/LICENSE | 201 + packages/core/schema/package.json | 19 + packages/core/schema/src/index.ts | 42 + packages/core/schema/tsconfig.json | 6 + packages/core/sdk/package.json | 3 +- packages/core/sdk/tsconfig.json | 6 +- packages/core/server/package.json | 5 +- packages/core/server/src/application.ts | 1 + packages/core/test/package.json | 3 +- packages/core/test/src/client/index.ts | 2 + packages/core/test/src/e2e/e2eUtils.ts | 2 +- packages/core/utils/client.d.ts | 2 + packages/core/utils/package.json | 3 +- .../@hera/plugin-audit-logs/package.json | 7 +- .../src/client/AuditLogsBlockInitializer.tsx | 2 +- .../src/client/components/AuditLogsField.tsx | 2 +- .../src/client/components/AuditLogsValue.tsx | 2 +- .../src/client/deplicated/AuditLogs.tsx | 2 +- .../client/deplicated/AuditLogsDesigner.tsx | 2 +- ...AuditLogsTableActionColumnInitializers.tsx | 2 +- .../AuditLogsTableActionInitializers.tsx | 1 + .../plugin-audit-logs/src/client/utils.ts | 2 +- .../plugins/@hera/plugin-core/package.json | 9 +- .../src/client/components/PDFViewer.tsx | 2 +- .../src/client/components/SignatureInput.tsx | 2 +- .../CustomComponentDispatcher.tsx | 2 +- .../custom-components/custom-components.ts | 2 +- .../components/fields/AssociatedField.tsx | 2 +- .../client/components/fields/CalcResult.tsx | 4 +- .../filter-form/FormFilterScope.tsx | 4 +- .../components/filter-form/VariableInput.tsx | 6 +- .../client/components/filter-form/context.ts | 4 +- .../components/system/OnlineUserProvider.tsx | 2 +- .../hooks/useFilterBlockActionProps.tsx | 4 +- .../@hera/plugin-core/src/client/index.tsx | 6 +- .../AssociationCascader.tsx | 2 +- .../auto-complete/AutoComplete.tsx | 2 +- .../schema-components/blocks/GroupBlock.tsx | 2 +- .../actions/OutboundLinkActionInitializer.tsx | 2 +- .../actions/hooks/useCreateActionProps.tsx | 2 +- .../actions/hooks/useOutboundActionProps.ts | 2 +- .../blocks/GroupBlockInitializer.tsx | 2 +- .../blocks/SettingBlockInitializer.tsx | 2 +- .../blocks/SheetBlockInitializer.tsx | 2 +- .../items/CustomFilterFormItemInitializer.tsx | 6 +- .../schema-settings/GroupBlockConfigure.tsx | 2 +- .../SchemaSettingsDatePickerType.tsx | 2 +- .../SchemaSettingsDatePresets.tsx | 2 +- .../schema-settings/SchemaSettingsRemove.tsx | 4 +- .../src/client/schema-settings/index.tsx | 4 +- .../plugins/@hera/plugin-mobile/package.json | 2 +- .../NoticeBlockInitializer.tsx | 2 +- .../SwiperBlockInitializer.tsx | 2 +- .../TabSearchBlockInitializer.tsx | 2 +- .../plugins/@hera/plugin-rental/package.json | 9 +- .../client/custom-components/DetailChecks.tsx | 4 +- .../custom-components/RecordDetails.tsx | 4 +- .../custom-components/RecordFeeConverted.tsx | 4 +- .../RecordFeeConvertedRead.tsx | 4 +- .../custom-components/RecordFeeScope.tsx | 2 +- .../custom-components/RecordItemCount.tsx | 2 +- .../RecordItemValuationQuantity.tsx | 2 +- .../custom-components/RecordItemWeight.tsx | 2 +- .../custom-components/RecordProductScope.tsx | 2 +- .../custom-components/RecordSummary.tsx | 2 +- .../custom-components/RecordTotalPrice.tsx | 4 +- .../hooks/useAddToChecklistActionProps.tsx | 2 +- ...SettlementExcelExportActionInitializer.tsx | 2 +- .../blocks/UnusedRecordsBlockInitializer.tsx | 2 +- .../@hera/plugin-websocket/package.json | 7 +- .../WebsocketBlockInitializer.tsx | 2 +- .../plugins/@nocobase/plugin-acl/package.json | 8 +- .../plugin-acl/src/client/NewRole.tsx | 2 +- .../plugin-acl/src/client/RolesManagement.tsx | 2 +- .../plugin-acl/src/client/RolesMenu.tsx | 2 +- .../client/permissions/ActionPermissions.tsx | 2 +- .../client/permissions/GeneralPermissions.tsx | 6 +- .../client/permissions/MenuPermissions.tsx | 4 +- .../permissions/RolesResourcesActions.tsx | 4 +- .../src/client/permissions/ScopeSelect.tsx | 2 +- .../client/permissions/StrategyActions.tsx | 4 +- .../plugin-acl/src/client/schemas/roles.ts | 4 +- .../plugin-acl/src/client/schemas/scopes.ts | 2 +- .../plugin-action-bulk-edit/package.json | 8 +- .../src/client/BulkEditAction.Settings.tsx | 2 +- .../src/client/bulkEditFormItemSettings.ts | 4 +- .../src/client/component/BulkEditField.tsx | 6 +- .../src/client/createBulkEditBlockUISchema.ts | 4 +- .../src/client/utils.tsx | 2 +- .../plugin-action-bulk-update/package.json | 5 +- .../src/client/BulkUpdateAction.Settings.tsx | 4 +- .../src/client/utils.tsx | 2 +- .../plugin-action-duplicate/package.json | 5 +- .../src/client/DuplicateAction.Settings.tsx | 4 +- .../src/client/DuplicateAction.tsx | 2 +- .../@nocobase/plugin-api-doc/package.json | 4 +- .../@nocobase/plugin-api-keys/package.json | 5 +- .../client/Configuration/ExpiresSelect.tsx | 2 +- .../src/client/Configuration/index.tsx | 2 +- .../src/client/Configuration/schema.tsx | 4 +- .../@nocobase/plugin-audit-logs/package.json | 5 +- .../src/client/AuditLogsBlockInitializer.tsx | 2 +- .../createAuditLogsBlockSchema.test.ts | 2 +- .../src/client/components/AuditLogsField.tsx | 2 +- .../src/client/components/AuditLogsValue.tsx | 2 +- .../src/client/createAuditLogsBlockSchema.tsx | 2 +- .../src/client/deplicated/AuditLogs.tsx | 2 +- .../client/deplicated/AuditLogsDesigner.tsx | 2 +- ...AuditLogsTableActionColumnInitializers.tsx | 2 +- .../plugin-audit-logs/src/client/utils.ts | 2 +- .../@nocobase/plugin-auth/package.json | 7 +- .../src/client/basic/SignInForm.tsx | 4 +- .../src/client/basic/SignUpForm.tsx | 6 +- .../src/client/settings/Options.tsx | 2 +- .../client/settings/schemas/authenticators.ts | 4 +- .../plugin-backup-restore/package.json | 5 +- .../@nocobase/plugin-calendar/package.json | 8 +- .../src/client/calendar/Calendar.tsx | 2 +- .../src/client/calendar/Calender.Settings.tsx | 2 +- .../src/client/calendar/DeleteEvent.tsx | 2 +- .../src/client/calendar/Event.tsx | 2 +- .../src/client/calendar/Nav.tsx | 2 +- .../src/client/calendar/Title.tsx | 2 +- .../src/client/calendar/Today.tsx | 2 +- .../src/client/calendar/ViewSelect.tsx | 2 +- .../src/client/calendar/demos/demo2.tsx | 2 +- .../CalendarBlockProvider.tsx | 4 +- .../createCalendarBlockUISchema.ts | 4 +- .../items/CalendarBlockInitializer.tsx | 2 +- ...ordAssociationCalendarBlockInitializer.tsx | 2 +- .../plugins/@nocobase/plugin-cas/package.json | 4 +- .../@nocobase/plugin-cas/src/server/auth.ts | 3 +- .../@nocobase/plugin-charts/package.json | 8 +- .../src/client/ChartBlockEngineDesigner.tsx | 2 +- .../src/client/ChartBlockInitializer.tsx | 4 +- .../src/client/ChartQueryBlockInitializer.tsx | 2 +- .../src/client/DataSetPreviewTable.tsx | 2 +- .../plugin-charts/src/client/index.tsx | 2 +- .../src/client/select/CustomSelect.tsx | 2 +- .../src/client/select/ReadPretty.tsx | 6 +- .../src/client/settings/AddNewQuery.tsx | 6 +- .../src/client/settings/queryTypes.ts | 2 +- .../client/settings/schemas/chartsQueries.ts | 4 +- .../plugin-charts/src/client/utils.ts | 2 +- .../plugin-china-region/package.json | 3 +- .../src/client/ChinaRegionProvider.tsx | 4 +- .../@nocobase/plugin-client/package.json | 2 +- .../plugin-collection-manager/package.json | 1 + .../src/server/models/field.ts | 4 +- .../repositories/collection-repository.ts | 33 +- .../plugin-custom-request/package.json | 8 +- .../client/components/CustomRequestAction.tsx | 2 +- .../CustomRequestActionDesigner.tsx | 2 +- .../client/hooks/useCustomRequestsResource.ts | 1 + .../hooks/useCustomizeRequestActionProps.ts | 2 +- .../src/client/hooks/useGetCustomRequest.ts | 2 +- .../initializer/CustomRequestInitializer.tsx | 2 +- .../plugin-data-source-manager/package.json | 9 +- .../CollectionsManager/AddFieldAction.tsx | 4 +- .../CollectionsManager/CollectionFields.tsx | 4 +- .../CollectionsManager/ConfigurationTable.tsx | 6 +- .../CollectionsManager/ConfigurationTabs.tsx | 2 +- .../EditCollectionAction.tsx | 4 +- .../CollectionsManager/EditFieldAction.tsx | 4 +- .../CollectionFieldInterfaceSelect.tsx | 2 +- .../components/CollectionName.tsx | 2 +- .../components/FieldTitleInput.tsx | 2 +- .../components/FieldType.tsx | 2 +- .../CollectionsManager/components/index.tsx | 2 +- .../component/CollectionsManager/index.tsx | 4 +- .../schema/collectionFields.ts | 4 +- .../CollectionsManager/schema/collections.ts | 4 +- .../component/CreateDatabaseConnectAction.tsx | 2 +- .../component/DatabaseConnectionManager.tsx | 2 +- .../EditDatabaseConnectionAction.tsx | 4 +- .../Configuration/AddCategoryAction.tsx | 2 +- .../Configuration/CollectionFields.tsx | 4 +- .../Configuration/CollectionFieldsTable.tsx | 6 +- .../CollectionFieldsTableArray.tsx | 4 +- .../Configuration/ConfigurationTable.tsx | 6 +- .../Configuration/ConfigurationTabs.tsx | 4 +- .../Configuration/EditCategoryAction.tsx | 2 +- .../Configuration/index.tsx | 2 +- .../Configuration/schemas/collectionFields.ts | 2 +- .../Configuration/schemas/collections.ts | 4 +- .../component/MainDataSourceManager/index.tsx | 4 +- .../PermissionManager/RoleConfigure.tsx | 2 +- .../RolesResourcesActions.tsx | 4 +- .../PermissionManager/ScopeSelect.tsx | 2 +- .../PermissionManager/StrategyActions.tsx | 4 +- .../component/PermissionManager/index.tsx | 4 +- .../schemas/dataSourceTable.ts | 2 +- .../schemas/roleCollections.ts | 4 +- .../PermissionManager/schemas/scopes.ts | 2 +- .../schemas/useSaveRoleResourceAction.ts | 2 +- .../src/client/hooks/index.ts | 2 +- .../src/client/schema/index.ts | 4 +- .../plugin-data-visualization/package.json | 8 +- .../client/block/ChartBlockInitializer.tsx | 2 +- .../src/client/chart/chart.ts | 2 +- .../src/client/chart/configs.ts | 2 +- .../client/configure/ChartConfigProvider.tsx | 2 +- .../src/client/configure/ChartConfigure.tsx | 4 +- .../src/client/configure/schemas/configure.ts | 4 +- .../filter/CollectionFieldInitializer.tsx | 2 +- .../filter/FilterActionInitializers.tsx | 2 +- .../client/filter/FilterBlockInitializer.tsx | 2 +- .../src/client/filter/FilterCheckbox.tsx | 4 +- .../src/client/filter/FilterForm.tsx | 2 +- .../src/client/filter/FilterItemDesigner.tsx | 4 +- .../client/filter/FilterItemInitializers.tsx | 6 +- .../src/client/filter/utils.ts | 2 +- .../src/client/hooks/filter.ts | 2 +- .../src/client/hooks/query.ts | 4 +- .../src/client/hooks/useUserVariable.ts | 2 +- .../src/client/hooks/useVariableOptions.ts | 2 +- .../src/client/renderer/ChartRenderer.tsx | 2 +- .../client/renderer/ChartRendererProvider.tsx | 2 +- .../src/client/utils.ts | 4 +- .../plugin-error-handler/package.json | 2 +- .../plugin-error-handler/src/server/server.ts | 2 +- .../plugin-excel-formula-field/package.json | 2 +- .../src/client/ExcelFormula/index.ts | 2 +- .../@nocobase/plugin-export/package.json | 3 +- .../src/client/ExportActionInitializer.tsx | 4 +- .../src/client/ExportDesigner.tsx | 4 +- .../src/client/schemaSettings.ts | 2 +- .../src/client/useExportAction.ts | 2 +- .../plugin-export/src/client/useFields.ts | 2 +- .../plugin-file-manager/package.json | 8 +- .../src/client/FileStorage.tsx | 2 +- .../src/client/StorageOptions.tsx | 4 +- .../src/client/interfaces/attachment.ts | 4 +- .../src/client/schemas/storage.ts | 4 +- .../plugin-formula-field/package.json | 4 +- .../src/client/components/Formula/Result.tsx | 6 +- .../client/components/Formula/demos/demo2.tsx | 2 +- .../src/client/components/Formula/index.tsx | 2 +- .../@nocobase/plugin-gantt/package.json | 7 +- .../src/client/Gantt.Settings.tsx | 2 +- .../src/client/GanttActionInitializers.tsx | 2 +- .../src/client/GanttBlockInitializer.tsx | 2 +- .../src/client/GanttBlockProvider.tsx | 2 +- .../src/client/components/gantt/Event.tsx | 2 +- .../src/client/components/gantt/gantt.tsx | 2 +- .../src/client/createGanttBlockUISchema.tsx | 4 +- .../package.json | 8 +- .../src/client/GraphCollectionShortcut.tsx | 2 +- .../src/client/GraphDrawPage.tsx | 2 +- .../src/client/action-hooks.tsx | 4 +- .../src/client/components/Entity.tsx | 4 +- .../src/client/components/FieldSummary.tsx | 2 +- .../plugin-iframe-block/package.json | 7 +- .../src/client/Iframe.Designer.tsx | 4 +- .../plugin-iframe-block/src/client/Iframe.tsx | 2 +- .../src/client/schemaSettings.ts | 4 +- .../@nocobase/plugin-import/package.json | 8 +- .../src/client/ImportActionInitializer.tsx | 6 +- .../src/client/ImportDesigner.tsx | 4 +- .../src/client/schemaSettings.ts | 2 +- .../src/client/useImportAction.ts | 2 +- .../plugin-import/src/client/useShared.ts | 2 +- .../@nocobase/plugin-kanban/package.json | 8 +- .../src/client/CreateAndSelectSort/index.tsx | 4 +- .../src/client/Kanban.Card.Designer.tsx | 4 +- .../plugin-kanban/src/client/Kanban.Card.tsx | 2 +- .../src/client/Kanban.CardViewer.tsx | 2 +- .../src/client/Kanban.Settings.tsx | 2 +- .../plugin-kanban/src/client/Kanban.tsx | 4 +- .../src/client/KanbanBlockInitializer.tsx | 2 +- .../src/client/KanbanBlockProvider.tsx | 4 +- .../src/client/createKanbanBlockUISchema.ts | 4 +- .../package.json | 7 +- .../src/client/Localization.tsx | 4 +- .../src/client/schemas/localization.tsx | 2 +- .../@nocobase/plugin-logger/package.json | 4 +- .../plugins/@nocobase/plugin-map/package.json | 16 +- .../src/client/block/MapBlock.Settings.tsx | 2 +- .../src/client/block/MapBlockInitializer.tsx | 2 +- .../src/client/block/MapBlockProvider.tsx | 2 +- .../client/block/createMapBlockUISchema.ts | 4 +- .../src/client/components/AMap/Block.tsx | 2 +- .../src/client/components/AMap/Map.tsx | 2 +- .../src/client/components/Designer.tsx | 4 +- .../client/components/GoogleMaps/Block.tsx | 2 +- .../src/client/components/GoogleMaps/Map.tsx | 2 +- .../plugin-map/src/client/components/Map.tsx | 2 +- .../src/client/components/ReadPretty.tsx | 2 +- .../plugin-map/src/client/fields/schema.ts | 2 +- .../plugin-math-formula-field/package.json | 4 +- .../src/client/MathFormula/index.tsx | 2 +- .../plugin-mobile-client/package.json | 15 +- .../container/Container.Designer.tsx | 4 +- .../schema/components/container/Container.tsx | 2 +- .../components/header/Header.Designer.tsx | 2 +- .../core/schema/components/header/Header.tsx | 2 +- .../schema/components/menu/Menu.Designer.tsx | 2 +- .../core/schema/components/menu/Menu.Item.tsx | 2 +- .../core/schema/components/menu/Menu.tsx | 2 +- .../schema/components/page/Page.Designer.tsx | 4 +- .../core/schema/components/page/Page.tsx | 2 +- .../schema/components/tab-bar/TabBar.Item.tsx | 2 +- .../core/schema/components/tab-bar/TabBar.tsx | 4 +- .../src/client/core/schema/helpers/index.ts | 4 +- .../core/schema/hooks/useSchemaPatch.ts | 2 +- .../plugin-multi-app-manager/package.json | 7 +- .../src/client/AppNameInput.tsx | 2 +- .../client/settings/schemas/applications.ts | 4 +- .../package.json | 6 +- .../MultiAppShareCollectionProvider.tsx | 2 +- .../src/client/TableTransfer.tsx | 2 +- .../@nocobase/plugin-oidc/package.json | 8 +- .../plugin-oidc/src/client/Options.tsx | 2 +- .../plugin-oidc/src/server/oidc-auth.ts | 1 + .../@nocobase/plugin-saml/package.json | 8 +- .../plugin-saml/src/client/Options.tsx | 2 +- .../plugin-saml/src/client/schemas/saml.ts | 2 +- .../plugin-saml/src/server/saml-auth.ts | 1 + .../plugin-sample-hello/package.json | 6 +- .../plugin-sequence-field/package.json | 7 +- .../src/client/sequence.tsx | 4 +- .../@nocobase/plugin-sms-auth/package.json | 6 +- .../plugin-sms-auth/src/client/SigninPage.tsx | 2 +- .../src/client/VerificationCode.tsx | 2 +- .../plugin-snapshot-field/package.json | 10 +- .../SnapshotBlockInitializersDetailItem.tsx | 4 +- .../SnapshotBlock/SnapshotBlockProvider.tsx | 4 +- .../src/client/SnapshotRecordPicker.tsx | 2 +- .../src/client/interface.ts | 4 +- .../plugin-theme-editor/package.json | 5 +- .../plugin-ui-schema-storage/package.json | 2 +- .../src/server/__tests__/ui-schema.test.ts | 2 +- .../migrations/20230510235247-form-field.ts | 2 +- .../@nocobase/plugin-users/package.json | 6 +- .../plugin-users/src/client/PasswordField.tsx | 4 +- .../src/client/UserRolesField.tsx | 4 +- .../plugin-users/src/client/schemas/users.ts | 4 +- .../plugin-verification/package.json | 8 +- .../src/client/ProviderOptions.tsx | 4 +- .../src/client/providerTypes/index.ts | 2 +- .../src/client/providerTypes/sms-aliyun.ts | 2 +- .../src/client/providerTypes/sms-tencent.ts | 2 +- .../src/client/schemas/providers.ts | 2 +- .../package.json | 6 +- .../src/client/ActionTrigger.tsx | 2 +- .../plugin-workflow-aggregate/package.json | 6 +- .../src/client/AggregateInstruction.tsx | 2 +- .../plugin-workflow-delay/package.json | 4 +- .../package.json | 9 +- .../src/client/DynamicExpression.tsx | 4 +- .../plugin-workflow-loop/package.json | 4 +- .../plugin-workflow-manual/package.json | 9 +- .../src/client/WorkflowTodo.tsx | 2 +- .../client/instruction/FormBlockProvider.tsx | 4 +- .../src/client/instruction/SchemaConfig.tsx | 4 +- .../src/client/instruction/forms/custom.tsx | 4 +- .../src/client/instruction/forms/update.tsx | 2 +- .../plugin-workflow-parallel/package.json | 6 +- .../plugin-workflow-request/package.json | 4 +- .../plugin-workflow-sql/package.json | 4 +- .../@nocobase/plugin-workflow/package.json | 10 +- .../src/client/WorkflowPane.tsx | 4 +- .../components/CollectionBlockInitializer.tsx | 2 +- .../client/components/CollectionFieldset.tsx | 2 +- .../components/DetailsBlockProvider.tsx | 4 +- .../src/client/components/DrawerForm.tsx | 4 +- .../src/client/components/FieldsSelect.tsx | 2 +- .../src/client/components/OpenDrawer.tsx | 2 +- .../src/client/components/SimpleDesigner.tsx | 2 +- .../src/client/components/ValueBlock.tsx | 2 +- .../hooks/useTriggerWorkflowActionProps.ts | 2 +- .../src/client/nodes/index.tsx | 4 +- .../src/client/nodes/query.tsx | 2 +- .../src/client/nodes/update.tsx | 2 +- .../src/client/schemas/collection.ts | 2 +- .../src/client/schemas/executions.tsx | 2 +- .../src/client/schemas/workflows.ts | 2 +- ...ustomizeSubmitToWorkflowActionSettings.tsx | 4 +- .../src/client/triggers/index.tsx | 4 +- .../triggers/schedule/ScheduleConfig.tsx | 4 +- packages/presets/nocobase/package.json | 2 +- pnpm-lock.yaml | 3475 ++++++++++------- tsconfig.json | 1 + 916 files changed, 3830 insertions(+), 2866 deletions(-) create mode 100644 packages/core/schema/.npmignore create mode 100644 packages/core/schema/LICENSE create mode 100644 packages/core/schema/package.json create mode 100644 packages/core/schema/src/index.ts create mode 100644 packages/core/schema/tsconfig.json create mode 100644 packages/core/utils/client.d.ts diff --git a/package.json b/package.json index 5cf9af94f..e6b082dde 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,8 @@ } }, "dependencies": { - "pm2": "^5.2.0" + "pm2": "^5.2.0", + "rimraf": "^3.0.0" }, "devDependencies": { "@changesets/cli": "^2.27.1", @@ -55,8 +56,9 @@ "@nocobase/build": "workspace:*", "@nocobase/cli": "workspace:*", "@nocobase/preset-nocobase": "workspace:*", - "@types/react": "^17.0.0", - "@types/react-dom": "^17.0.0", + "@nocobase/test": "workspace:*", + "@types/react": "^18.2.73", + "@types/react-dom": "^18.2.23", "auto-changelog": "^2.4.0", "axios": "^1.6.2", "commander": "^9.2.0", @@ -69,10 +71,10 @@ "prettier-plugin-sql": "^0.17.0", "pretty-format": "^24.0.0", "pretty-quick": "^3.1.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.2.0", + "react-dom": "^18.2.0", "tsx": "^4.6.2", - "typescript": "5.1.3", + "typescript": "5.4.3", "umi": "^4.0.69" }, "packageManager": "pnpm@8.15.5", @@ -86,18 +88,28 @@ }, "pnpm": { "overrides": { + "@formily/core": "2.2.27", + "@formily/grid": "2.2.27", + "@formily/json-schema": "2.2.27", + "@formily/path": "2.2.27", + "@formily/react": "2.2.27", + "@formily/reactive": "2.2.27", + "@formily/reactive-react": "2.2.27", + "@formily/shared": "2.2.27", + "@formily/validator": "2.2.27", "@types/node": "^20.12.2", - "@types/react": "^17.0.0", - "@types/react-dom": "^17.0.0", + "@types/react": "18.2.73", + "@types/react-dom": "18.2.23", "@typescript-eslint/parser": "^6.2.0", - "antd": "5.12.8", + "antd": "5.16.0", "nwsapi": "2.2.7", "prettier": "^3.1.1", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "18.2.0", + "react-dom": "18.2.0", "react-router": "^6.11.2", "react-router-dom": "^6.11.2", - "tsx": "^4.6.2" + "tsx": "^4.6.2", + "typescript": "5.4.3" } }, "licenses": [ diff --git a/packages/core/acl/package.json b/packages/core/acl/package.json index ca034e8a3..180a75597 100644 --- a/packages/core/acl/package.json +++ b/packages/core/acl/package.json @@ -17,5 +17,8 @@ "lodash": "4.17.21", "minimatch": "^5.1.1" }, + "devDependencies": { + "@types/lodash": "4.17.0" + }, "gitHead": "d0b4efe4be55f8c79a98a331d99d9f8cf99021a1" } diff --git a/packages/core/app/src/config/cache.ts b/packages/core/app/src/config/cache.ts index 09287bac8..5659a226d 100644 --- a/packages/core/app/src/config/cache.ts +++ b/packages/core/app/src/config/cache.ts @@ -15,4 +15,4 @@ export const cacheManager = { } : {}), }, -} as CacheManagerOptions; +}; diff --git a/packages/core/build/package.json b/packages/core/build/package.json index d8d933f87..efd828935 100755 --- a/packages/core/build/package.json +++ b/packages/core/build/package.json @@ -32,7 +32,7 @@ "gulp-typescript": "6.0.0-alpha.1", "tar": "^6.2.0", "tsup": "7.2.0", - "typescript": "5.1.3", + "typescript": "5.4.3", "update-notifier": "3.0.0", "vite": "^5.0.0", "vite-plugin-css-injected-by-js": "^3.2.1", diff --git a/packages/core/build/src/buildPlugin.ts b/packages/core/build/src/buildPlugin.ts index d217cf2a4..276270198 100644 --- a/packages/core/build/src/buildPlugin.ts +++ b/packages/core/build/src/buildPlugin.ts @@ -39,6 +39,7 @@ const external = [ '@nocobase/logger', '@nocobase/resourcer', '@nocobase/sdk', + '@nocobase/schema', '@nocobase/server', '@nocobase/test', '@nocobase/utils', diff --git a/packages/core/cache/src/bloom-filter/redis-bloom-filter.ts b/packages/core/cache/src/bloom-filter/redis-bloom-filter.ts index 9cfc401f8..0cea1563e 100644 --- a/packages/core/cache/src/bloom-filter/redis-bloom-filter.ts +++ b/packages/core/cache/src/bloom-filter/redis-bloom-filter.ts @@ -1,4 +1,5 @@ -import { RedisStore } from 'cache-manager-redis-yet'; +import type { RedisStore } from 'cache-manager-redis-yet'; +import type { RedisClientType } from 'redis'; import { BloomFilter } from '.'; import { Cache } from '../cache'; diff --git a/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/association-table-list-and-parent-record.tsx b/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/association-table-list-and-parent-record.tsx index 27af6235f..13964b35b 100644 --- a/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/association-table-list-and-parent-record.tsx +++ b/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/association-table-list-and-parent-record.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { Table, TableProps } from 'antd'; import { SchemaComponent, UseDataBlockProps, useDataBlockRequest, withDynamicSchemaProps } from '@nocobase/client'; -import { ISchema } from '@formily/json-schema'; +import { ISchema } from '@nocobase/schema'; import { createApp } from '../../../data-source/demos/createApp'; diff --git a/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/association-table-list-and-source-id.tsx b/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/association-table-list-and-source-id.tsx index a7594c7b5..e82fde3db 100644 --- a/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/association-table-list-and-source-id.tsx +++ b/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/association-table-list-and-source-id.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { Select, Table, TableProps } from 'antd'; import { SchemaComponent, UseDataBlockProps, useDataBlockRequest, withDynamicSchemaProps } from '@nocobase/client'; -import { ISchema } from '@formily/json-schema'; +import { ISchema } from '@nocobase/schema'; import { createApp } from '../../../data-source/demos/createApp'; import useUrlState from '@ahooksjs/use-url-state'; diff --git a/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/collection-form-create.tsx b/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/collection-form-create.tsx index 078c7dd7a..cddd88c89 100644 --- a/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/collection-form-create.tsx +++ b/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/collection-form-create.tsx @@ -1,7 +1,7 @@ import React, { FC } from 'react'; import { Button, Form, FormProps, Input, InputNumber, notification } from 'antd'; import { SchemaComponent, useDataBlockResource, withDynamicSchemaProps } from '@nocobase/client'; -import { ISchema } from '@formily/json-schema'; +import { ISchema } from '@nocobase/schema'; import { createApp } from '../../../data-source/demos/createApp'; diff --git a/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/collection-form-get-and-update.tsx b/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/collection-form-get-and-update.tsx index 1383a5180..ac5ecc5e5 100644 --- a/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/collection-form-get-and-update.tsx +++ b/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/collection-form-get-and-update.tsx @@ -7,7 +7,7 @@ import { useCollectionRecordData, withDynamicSchemaProps, } from '@nocobase/client'; -import { ISchema } from '@formily/json-schema'; +import { ISchema } from '@nocobase/schema'; import useUrlState from '@ahooksjs/use-url-state'; import { createApp } from '../../../data-source/demos/createApp'; diff --git a/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/collection-form-record-and-update.tsx b/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/collection-form-record-and-update.tsx index 2cd8518e0..98cb58170 100644 --- a/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/collection-form-record-and-update.tsx +++ b/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/collection-form-record-and-update.tsx @@ -8,7 +8,7 @@ import { useCollectionRecordData, withDynamicSchemaProps, } from '@nocobase/client'; -import { ISchema } from '@formily/json-schema'; +import { ISchema } from '@nocobase/schema'; import { createApp } from '../../../data-source/demos/createApp'; diff --git a/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/collection-table-list.tsx b/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/collection-table-list.tsx index 278152be4..6da749168 100644 --- a/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/collection-table-list.tsx +++ b/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/collection-table-list.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { Table, TableProps } from 'antd'; import { SchemaComponent, useDataBlockRequest, withDynamicSchemaProps } from '@nocobase/client'; -import { ISchema } from '@formily/json-schema'; +import { ISchema } from '@nocobase/schema'; import { createApp } from '../../../data-source/demos/createApp'; diff --git a/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/complete-demo.tsx b/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/complete-demo.tsx index 93bfcfa3a..8135d9310 100644 --- a/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/complete-demo.tsx +++ b/packages/core/client/docs/en-US/core/data-block/demos/data-block-provider/complete-demo.tsx @@ -17,8 +17,8 @@ import { import { createApp } from '../../../data-source/demos/createApp'; import { Table, TableProps } from 'antd'; -import { ISchema } from '@formily/json-schema'; -import { observer, useFieldSchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; +import { observer, useFieldSchema } from '@nocobase/schema'; const schema: ISchema = { type: 'void', diff --git a/packages/core/client/docs/en-US/core/data-block/demos/settings/demo1.tsx b/packages/core/client/docs/en-US/core/data-block/demos/settings/demo1.tsx index fe3852422..2bfc15af2 100644 --- a/packages/core/client/docs/en-US/core/data-block/demos/settings/demo1.tsx +++ b/packages/core/client/docs/en-US/core/data-block/demos/settings/demo1.tsx @@ -9,7 +9,7 @@ import { import { createApp } from '../../../data-source/demos/createApp'; import { Table, TableProps } from 'antd'; -import { ISchema } from '@formily/json-schema'; +import { ISchema } from '@nocobase/schema'; const schema: ISchema = { type: 'void', diff --git a/packages/core/client/docs/en-US/core/data-source/demos/collection-field/demo1.tsx b/packages/core/client/docs/en-US/core/data-source/demos/collection-field/demo1.tsx index 385554a57..0ec4ddb40 100644 --- a/packages/core/client/docs/en-US/core/data-source/demos/collection-field/demo1.tsx +++ b/packages/core/client/docs/en-US/core/data-source/demos/collection-field/demo1.tsx @@ -1,4 +1,4 @@ -import { ISchema, observer, useForm } from '@formily/react'; +import { ISchema, observer, useForm } from '@nocobase/schema'; import { Action, Application, diff --git a/packages/core/client/docs/en-US/core/data-source/demos/collection-field/demo2.tsx b/packages/core/client/docs/en-US/core/data-source/demos/collection-field/demo2.tsx index 31df89f79..6ead1b09a 100644 --- a/packages/core/client/docs/en-US/core/data-source/demos/collection-field/demo2.tsx +++ b/packages/core/client/docs/en-US/core/data-source/demos/collection-field/demo2.tsx @@ -1,4 +1,4 @@ -import { ISchema, observer } from '@formily/react'; +import { ISchema, observer } from '@nocobase/schema'; import { Application, CollectionProvider, diff --git a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-basic.tsx b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-basic.tsx index e285d6ccd..7c67b3b24 100644 --- a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-basic.tsx +++ b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-basic.tsx @@ -9,8 +9,8 @@ import { useSchemaInitializerItem, useSchemaInitializerRender, } from '@nocobase/client'; -import { observer, useField, useFieldSchema } from '@formily/react'; -import { Field } from '@formily/core'; +import { observer, useField, useFieldSchema } from '@nocobase/schema'; +import { Field } from '@nocobase/schema'; const Hello = observer(() => { const field = useField(); diff --git a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-component.tsx b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-component.tsx index 4fe9c9f7b..06796b827 100644 --- a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-component.tsx +++ b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-component.tsx @@ -9,8 +9,8 @@ import { useSchemaInitializerItem, useSchemaInitializerRender, } from '@nocobase/client'; -import { observer, useField, useFieldSchema } from '@formily/react'; -import { Field } from '@formily/core'; +import { observer, useField, useFieldSchema } from '@nocobase/schema'; +import { Field } from '@nocobase/schema'; import { Avatar } from 'antd'; const Hello = observer(() => { diff --git a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-components-item.tsx b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-components-item.tsx index 825e81586..05e6f983a 100644 --- a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-components-item.tsx +++ b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-components-item.tsx @@ -11,7 +11,7 @@ import { } from '@nocobase/client'; import React from 'react'; import { appOptions } from './schema-initializer-common'; -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; const Demo = () => { const { insert } = useSchemaInitializer(); diff --git a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-components-select.tsx b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-components-select.tsx index 69590dab4..620dc40c5 100644 --- a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-components-select.tsx +++ b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-components-select.tsx @@ -4,7 +4,7 @@ import { Grid, SchemaInitializer, Application, SchemaInitializerSelect, useDesignable } from '@nocobase/client'; import React from 'react'; import { appOptions } from './schema-initializer-common'; -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; const OpenModeSelect = () => { const fieldSchema = useFieldSchema(); diff --git a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-items.tsx b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-items.tsx index 33ca587a9..78657d332 100644 --- a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-items.tsx +++ b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-items.tsx @@ -11,8 +11,8 @@ import { useSchemaInitializerItem, useSchemaInitializerRender, } from '@nocobase/client'; -import { observer, useField, useFieldSchema } from '@formily/react'; -import { Field } from '@formily/core'; +import { observer, useField, useFieldSchema } from '@nocobase/schema'; +import { Field } from '@nocobase/schema'; import { ButtonProps, ListProps, List, Card } from 'antd'; const Hello = observer(() => { diff --git a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-popover.tsx b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-popover.tsx index 3db26240b..87fec2666 100644 --- a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-popover.tsx +++ b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-popover.tsx @@ -7,8 +7,8 @@ import { useDesignable, useSchemaInitializerRender, } from '@nocobase/client'; -import { observer, useField, useFieldSchema } from '@formily/react'; -import { Field } from '@formily/core'; +import { observer, useField, useFieldSchema } from '@nocobase/schema'; +import { Field } from '@nocobase/schema'; import { Button } from 'antd'; const Hello = observer(() => { diff --git a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-render.tsx b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-render.tsx index 214a17cec..eea87b77d 100644 --- a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-render.tsx +++ b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-initializer-render.tsx @@ -9,8 +9,8 @@ import { useSchemaInitializerItem, useSchemaInitializerRender, } from '@nocobase/client'; -import { observer, useField, useFieldSchema } from '@formily/react'; -import { Field } from '@formily/core'; +import { observer, useField, useFieldSchema } from '@nocobase/schema'; +import { Field } from '@nocobase/schema'; const Hello = observer(() => { const field = useField(); diff --git a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-components-action-modal.tsx b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-components-action-modal.tsx index 1a7076c92..25b94e5c3 100644 --- a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-components-action-modal.tsx +++ b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-components-action-modal.tsx @@ -11,7 +11,7 @@ import { useDesignable, } from '@nocobase/client'; import { appOptions } from './schema-settings-common'; -import { ISchema, useField } from '@formily/react'; +import { ISchema, useField } from '@nocobase/schema'; export const SchemaSettingsBlockTitleItem = function BlockTitleItem() { const filed = useField(); diff --git a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-components-item.tsx b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-components-item.tsx index 376ff7701..3aae57b2f 100644 --- a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-components-item.tsx +++ b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-components-item.tsx @@ -4,7 +4,7 @@ import React, { FC, useState } from 'react'; import { Application, SchemaSettings, SchemaSettingsItem, useDesignable } from '@nocobase/client'; import { appOptions } from './schema-settings-common'; -import { observer, useField } from '@formily/react'; +import { observer, useField } from '@nocobase/schema'; import { Button, Input, Space } from 'antd'; const MarkdownEdit = () => { diff --git a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-components-modal.tsx b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-components-modal.tsx index 2f35e8887..6dac4f24d 100644 --- a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-components-modal.tsx +++ b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-components-modal.tsx @@ -1,7 +1,7 @@ /** * defaultShowCode: true */ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { Application, FormItem, diff --git a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-components-select.tsx b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-components-select.tsx index c14dfaff4..e9f80c243 100644 --- a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-components-select.tsx +++ b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-components-select.tsx @@ -4,7 +4,7 @@ import React, { FC } from 'react'; import { Application, SchemaSettings, SchemaSettingsSelectItem, useDesignable } from '@nocobase/client'; import { appOptions } from './schema-settings-common'; -import { observer, useField } from '@formily/react'; +import { observer, useField } from '@nocobase/schema'; import { Table } from 'antd'; const PageSize = () => { diff --git a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-components-switch.tsx b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-components-switch.tsx index 7569ecddf..ef8a22619 100644 --- a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-components-switch.tsx +++ b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-components-switch.tsx @@ -4,7 +4,7 @@ import React, { FC } from 'react'; import { Application, SchemaSettings, SchemaSettingsSwitchItem, useDesignable } from '@nocobase/client'; import { appOptions } from './schema-settings-common'; -import { observer, useField } from '@formily/react'; +import { observer, useField } from '@nocobase/schema'; import { Form, Input } from 'antd'; const FormItemRequired = () => { diff --git a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-render.tsx b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-render.tsx index 089b17cd2..5993b128b 100644 --- a/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-render.tsx +++ b/packages/core/client/docs/en-US/core/ui-schema/demos/schema-settings-render.tsx @@ -1,4 +1,4 @@ -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import { Application, CardItem, diff --git a/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/association-table-list-and-parent-record.tsx b/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/association-table-list-and-parent-record.tsx index 27af6235f..13964b35b 100644 --- a/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/association-table-list-and-parent-record.tsx +++ b/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/association-table-list-and-parent-record.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { Table, TableProps } from 'antd'; import { SchemaComponent, UseDataBlockProps, useDataBlockRequest, withDynamicSchemaProps } from '@nocobase/client'; -import { ISchema } from '@formily/json-schema'; +import { ISchema } from '@nocobase/schema'; import { createApp } from '../../../data-source/demos/createApp'; diff --git a/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/association-table-list-and-source-id.tsx b/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/association-table-list-and-source-id.tsx index a7594c7b5..e82fde3db 100644 --- a/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/association-table-list-and-source-id.tsx +++ b/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/association-table-list-and-source-id.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { Select, Table, TableProps } from 'antd'; import { SchemaComponent, UseDataBlockProps, useDataBlockRequest, withDynamicSchemaProps } from '@nocobase/client'; -import { ISchema } from '@formily/json-schema'; +import { ISchema } from '@nocobase/schema'; import { createApp } from '../../../data-source/demos/createApp'; import useUrlState from '@ahooksjs/use-url-state'; diff --git a/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/collection-form-create.tsx b/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/collection-form-create.tsx index 078c7dd7a..cddd88c89 100644 --- a/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/collection-form-create.tsx +++ b/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/collection-form-create.tsx @@ -1,7 +1,7 @@ import React, { FC } from 'react'; import { Button, Form, FormProps, Input, InputNumber, notification } from 'antd'; import { SchemaComponent, useDataBlockResource, withDynamicSchemaProps } from '@nocobase/client'; -import { ISchema } from '@formily/json-schema'; +import { ISchema } from '@nocobase/schema'; import { createApp } from '../../../data-source/demos/createApp'; diff --git a/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/collection-form-get-and-update.tsx b/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/collection-form-get-and-update.tsx index 1383a5180..ac5ecc5e5 100644 --- a/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/collection-form-get-and-update.tsx +++ b/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/collection-form-get-and-update.tsx @@ -7,7 +7,7 @@ import { useCollectionRecordData, withDynamicSchemaProps, } from '@nocobase/client'; -import { ISchema } from '@formily/json-schema'; +import { ISchema } from '@nocobase/schema'; import useUrlState from '@ahooksjs/use-url-state'; import { createApp } from '../../../data-source/demos/createApp'; diff --git a/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/collection-form-record-and-update.tsx b/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/collection-form-record-and-update.tsx index 2cd8518e0..98cb58170 100644 --- a/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/collection-form-record-and-update.tsx +++ b/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/collection-form-record-and-update.tsx @@ -8,7 +8,7 @@ import { useCollectionRecordData, withDynamicSchemaProps, } from '@nocobase/client'; -import { ISchema } from '@formily/json-schema'; +import { ISchema } from '@nocobase/schema'; import { createApp } from '../../../data-source/demos/createApp'; diff --git a/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/collection-table-list.tsx b/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/collection-table-list.tsx index 278152be4..6da749168 100644 --- a/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/collection-table-list.tsx +++ b/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/collection-table-list.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { Table, TableProps } from 'antd'; import { SchemaComponent, useDataBlockRequest, withDynamicSchemaProps } from '@nocobase/client'; -import { ISchema } from '@formily/json-schema'; +import { ISchema } from '@nocobase/schema'; import { createApp } from '../../../data-source/demos/createApp'; diff --git a/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/complete-demo.tsx b/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/complete-demo.tsx index 93bfcfa3a..8135d9310 100644 --- a/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/complete-demo.tsx +++ b/packages/core/client/docs/zh-CN/core/data-block/demos/data-block-provider/complete-demo.tsx @@ -17,8 +17,8 @@ import { import { createApp } from '../../../data-source/demos/createApp'; import { Table, TableProps } from 'antd'; -import { ISchema } from '@formily/json-schema'; -import { observer, useFieldSchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; +import { observer, useFieldSchema } from '@nocobase/schema'; const schema: ISchema = { type: 'void', diff --git a/packages/core/client/docs/zh-CN/core/data-block/demos/settings/demo1.tsx b/packages/core/client/docs/zh-CN/core/data-block/demos/settings/demo1.tsx index fe3852422..2bfc15af2 100644 --- a/packages/core/client/docs/zh-CN/core/data-block/demos/settings/demo1.tsx +++ b/packages/core/client/docs/zh-CN/core/data-block/demos/settings/demo1.tsx @@ -9,7 +9,7 @@ import { import { createApp } from '../../../data-source/demos/createApp'; import { Table, TableProps } from 'antd'; -import { ISchema } from '@formily/json-schema'; +import { ISchema } from '@nocobase/schema'; const schema: ISchema = { type: 'void', diff --git a/packages/core/client/docs/zh-CN/core/data-source/demos/collection-field/demo1.tsx b/packages/core/client/docs/zh-CN/core/data-source/demos/collection-field/demo1.tsx index 385554a57..0ec4ddb40 100644 --- a/packages/core/client/docs/zh-CN/core/data-source/demos/collection-field/demo1.tsx +++ b/packages/core/client/docs/zh-CN/core/data-source/demos/collection-field/demo1.tsx @@ -1,4 +1,4 @@ -import { ISchema, observer, useForm } from '@formily/react'; +import { ISchema, observer, useForm } from '@nocobase/schema'; import { Action, Application, diff --git a/packages/core/client/docs/zh-CN/core/data-source/demos/collection-field/demo2.tsx b/packages/core/client/docs/zh-CN/core/data-source/demos/collection-field/demo2.tsx index 31df89f79..6ead1b09a 100644 --- a/packages/core/client/docs/zh-CN/core/data-source/demos/collection-field/demo2.tsx +++ b/packages/core/client/docs/zh-CN/core/data-source/demos/collection-field/demo2.tsx @@ -1,4 +1,4 @@ -import { ISchema, observer } from '@formily/react'; +import { ISchema, observer } from '@nocobase/schema'; import { Application, CollectionProvider, diff --git a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-basic.tsx b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-basic.tsx index e285d6ccd..7c67b3b24 100644 --- a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-basic.tsx +++ b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-basic.tsx @@ -9,8 +9,8 @@ import { useSchemaInitializerItem, useSchemaInitializerRender, } from '@nocobase/client'; -import { observer, useField, useFieldSchema } from '@formily/react'; -import { Field } from '@formily/core'; +import { observer, useField, useFieldSchema } from '@nocobase/schema'; +import { Field } from '@nocobase/schema'; const Hello = observer(() => { const field = useField(); diff --git a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-component.tsx b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-component.tsx index 4fe9c9f7b..06796b827 100644 --- a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-component.tsx +++ b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-component.tsx @@ -9,8 +9,8 @@ import { useSchemaInitializerItem, useSchemaInitializerRender, } from '@nocobase/client'; -import { observer, useField, useFieldSchema } from '@formily/react'; -import { Field } from '@formily/core'; +import { observer, useField, useFieldSchema } from '@nocobase/schema'; +import { Field } from '@nocobase/schema'; import { Avatar } from 'antd'; const Hello = observer(() => { diff --git a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-components-item.tsx b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-components-item.tsx index 825e81586..05e6f983a 100644 --- a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-components-item.tsx +++ b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-components-item.tsx @@ -11,7 +11,7 @@ import { } from '@nocobase/client'; import React from 'react'; import { appOptions } from './schema-initializer-common'; -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; const Demo = () => { const { insert } = useSchemaInitializer(); diff --git a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-components-select.tsx b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-components-select.tsx index 69590dab4..620dc40c5 100644 --- a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-components-select.tsx +++ b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-components-select.tsx @@ -4,7 +4,7 @@ import { Grid, SchemaInitializer, Application, SchemaInitializerSelect, useDesignable } from '@nocobase/client'; import React from 'react'; import { appOptions } from './schema-initializer-common'; -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; const OpenModeSelect = () => { const fieldSchema = useFieldSchema(); diff --git a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-items.tsx b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-items.tsx index 33ca587a9..78657d332 100644 --- a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-items.tsx +++ b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-items.tsx @@ -11,8 +11,8 @@ import { useSchemaInitializerItem, useSchemaInitializerRender, } from '@nocobase/client'; -import { observer, useField, useFieldSchema } from '@formily/react'; -import { Field } from '@formily/core'; +import { observer, useField, useFieldSchema } from '@nocobase/schema'; +import { Field } from '@nocobase/schema'; import { ButtonProps, ListProps, List, Card } from 'antd'; const Hello = observer(() => { diff --git a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-popover.tsx b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-popover.tsx index 3db26240b..87fec2666 100644 --- a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-popover.tsx +++ b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-popover.tsx @@ -7,8 +7,8 @@ import { useDesignable, useSchemaInitializerRender, } from '@nocobase/client'; -import { observer, useField, useFieldSchema } from '@formily/react'; -import { Field } from '@formily/core'; +import { observer, useField, useFieldSchema } from '@nocobase/schema'; +import { Field } from '@nocobase/schema'; import { Button } from 'antd'; const Hello = observer(() => { diff --git a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-render.tsx b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-render.tsx index 214a17cec..eea87b77d 100644 --- a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-render.tsx +++ b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-initializer-render.tsx @@ -9,8 +9,8 @@ import { useSchemaInitializerItem, useSchemaInitializerRender, } from '@nocobase/client'; -import { observer, useField, useFieldSchema } from '@formily/react'; -import { Field } from '@formily/core'; +import { observer, useField, useFieldSchema } from '@nocobase/schema'; +import { Field } from '@nocobase/schema'; const Hello = observer(() => { const field = useField(); diff --git a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-components-action-modal.tsx b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-components-action-modal.tsx index 1a7076c92..25b94e5c3 100644 --- a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-components-action-modal.tsx +++ b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-components-action-modal.tsx @@ -11,7 +11,7 @@ import { useDesignable, } from '@nocobase/client'; import { appOptions } from './schema-settings-common'; -import { ISchema, useField } from '@formily/react'; +import { ISchema, useField } from '@nocobase/schema'; export const SchemaSettingsBlockTitleItem = function BlockTitleItem() { const filed = useField(); diff --git a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-components-item.tsx b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-components-item.tsx index 376ff7701..3aae57b2f 100644 --- a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-components-item.tsx +++ b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-components-item.tsx @@ -4,7 +4,7 @@ import React, { FC, useState } from 'react'; import { Application, SchemaSettings, SchemaSettingsItem, useDesignable } from '@nocobase/client'; import { appOptions } from './schema-settings-common'; -import { observer, useField } from '@formily/react'; +import { observer, useField } from '@nocobase/schema'; import { Button, Input, Space } from 'antd'; const MarkdownEdit = () => { diff --git a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-components-modal.tsx b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-components-modal.tsx index 2f35e8887..6dac4f24d 100644 --- a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-components-modal.tsx +++ b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-components-modal.tsx @@ -1,7 +1,7 @@ /** * defaultShowCode: true */ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { Application, FormItem, diff --git a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-components-select.tsx b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-components-select.tsx index c14dfaff4..e9f80c243 100644 --- a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-components-select.tsx +++ b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-components-select.tsx @@ -4,7 +4,7 @@ import React, { FC } from 'react'; import { Application, SchemaSettings, SchemaSettingsSelectItem, useDesignable } from '@nocobase/client'; import { appOptions } from './schema-settings-common'; -import { observer, useField } from '@formily/react'; +import { observer, useField } from '@nocobase/schema'; import { Table } from 'antd'; const PageSize = () => { diff --git a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-components-switch.tsx b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-components-switch.tsx index 7569ecddf..ef8a22619 100644 --- a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-components-switch.tsx +++ b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-components-switch.tsx @@ -4,7 +4,7 @@ import React, { FC } from 'react'; import { Application, SchemaSettings, SchemaSettingsSwitchItem, useDesignable } from '@nocobase/client'; import { appOptions } from './schema-settings-common'; -import { observer, useField } from '@formily/react'; +import { observer, useField } from '@nocobase/schema'; import { Form, Input } from 'antd'; const FormItemRequired = () => { diff --git a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-render.tsx b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-render.tsx index 089b17cd2..5993b128b 100644 --- a/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-render.tsx +++ b/packages/core/client/docs/zh-CN/core/ui-schema/demos/schema-settings-render.tsx @@ -1,4 +1,4 @@ -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import { Application, CardItem, diff --git a/packages/core/client/package.json b/packages/core/client/package.json index c7cdde7bc..7026b74db 100644 --- a/packages/core/client/package.json +++ b/packages/core/client/package.json @@ -8,7 +8,7 @@ "dependencies": { "@ahooksjs/use-url-state": "3.5.1", "@ant-design/cssinjs": "^1.11.1", - "@ant-design/icons": "^5.1.4", + "@ant-design/icons": "^5.3.6", "@ant-design/pro-layout": "^7.16.11", "@antv/g2plot": "^2.4.18", "@ctrl/tinycolor": "^3.6.0", @@ -19,20 +19,12 @@ "@dnd-kit/utilities": "^3.2.2", "@emotion/css": "^11.7.1", "@formily/antd-v5": "^1.1.9", - "@formily/core": "^2.2.27", - "@formily/grid": "^2.2.27", - "@formily/json-schema": "^2.2.27", - "@formily/path": "^2.2.27", - "@formily/react": "^2.2.27", - "@formily/reactive": "^2.2.27", - "@formily/reactive-react": "^2.2.27", - "@formily/shared": "^2.2.27", - "@formily/validator": "^2.2.27", "@nocobase/evaluators": "workspace:*", + "@nocobase/schema": "workspace:*", "@nocobase/sdk": "workspace:*", "@nocobase/utils": "workspace:*", "ahooks": "^3.7.2", - "antd": "^5.12.8", + "antd": "5.16.0", "antd-style": "3.4.5", "axios": "^1.6.2", "classnames": "^2.3.1", @@ -71,6 +63,7 @@ }, "devDependencies": { "@testing-library/react": "^14.0.0", + "@types/lodash": "^4.17.0", "@types/markdown-it": "12.2.3", "@types/markdown-it-highlightjs": "3.3.1", "@types/react-big-calendar": "^1.6.4", diff --git a/packages/core/client/src/acl/ACLProvider.tsx b/packages/core/client/src/acl/ACLProvider.tsx index 35698ea8d..a0d9b8c37 100644 --- a/packages/core/client/src/acl/ACLProvider.tsx +++ b/packages/core/client/src/acl/ACLProvider.tsx @@ -1,5 +1,5 @@ -import { Field } from '@formily/core'; -import { Schema, useField, useFieldSchema } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { Schema, useField, useFieldSchema } from '@nocobase/schema'; import React, { createContext, useContext, useEffect } from 'react'; import { Navigate } from 'react-router-dom'; import { omit } from 'lodash'; diff --git a/packages/core/client/src/acl/ACLShortcut.tsx b/packages/core/client/src/acl/ACLShortcut.tsx index 0ba8e1df9..8027035e0 100644 --- a/packages/core/client/src/acl/ACLShortcut.tsx +++ b/packages/core/client/src/acl/ACLShortcut.tsx @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { Card } from 'antd'; import React from 'react'; import { SchemaComponent } from '../schema-component'; diff --git a/packages/core/client/src/acl/Configuration/RoleConfigure.tsx b/packages/core/client/src/acl/Configuration/RoleConfigure.tsx index b793971f5..a90d3ae6a 100644 --- a/packages/core/client/src/acl/Configuration/RoleConfigure.tsx +++ b/packages/core/client/src/acl/Configuration/RoleConfigure.tsx @@ -1,5 +1,5 @@ -import { onFieldChange } from '@formily/core'; -import { connect } from '@formily/react'; +import { onFieldChange } from '@nocobase/schema'; +import { connect } from '@nocobase/schema'; import { Checkbox } from 'antd'; import uniq from 'lodash/uniq'; import React, { useContext } from 'react'; diff --git a/packages/core/client/src/acl/Configuration/RolesResourcesActions.tsx b/packages/core/client/src/acl/Configuration/RolesResourcesActions.tsx index ffd18139c..231e1f0a6 100644 --- a/packages/core/client/src/acl/Configuration/RolesResourcesActions.tsx +++ b/packages/core/client/src/acl/Configuration/RolesResourcesActions.tsx @@ -1,6 +1,6 @@ import { FormItem, FormLayout } from '@formily/antd-v5'; -import { ArrayField } from '@formily/core'; -import { connect, useField, useForm } from '@formily/react'; +import { ArrayField } from '@nocobase/schema'; +import { connect, useField, useForm } from '@nocobase/schema'; import { Checkbox, Table, Tag } from 'antd'; import { isEmpty } from 'lodash'; import React, { createContext } from 'react'; diff --git a/packages/core/client/src/acl/Configuration/ScopeSelect.tsx b/packages/core/client/src/acl/Configuration/ScopeSelect.tsx index 1d4c6e484..0b9ba8383 100644 --- a/packages/core/client/src/acl/Configuration/ScopeSelect.tsx +++ b/packages/core/client/src/acl/Configuration/ScopeSelect.tsx @@ -1,4 +1,4 @@ -import { createForm } from '@formily/core'; +import { createForm } from '@nocobase/schema'; import React, { createContext, useContext, useMemo, useState } from 'react'; import { FormProvider, SchemaComponent } from '../../schema-component'; import { scopesSchema } from './schemas/scopes'; diff --git a/packages/core/client/src/acl/Configuration/StrategyActions.tsx b/packages/core/client/src/acl/Configuration/StrategyActions.tsx index 8dc9cbc88..a56f4214d 100644 --- a/packages/core/client/src/acl/Configuration/StrategyActions.tsx +++ b/packages/core/client/src/acl/Configuration/StrategyActions.tsx @@ -1,5 +1,5 @@ -import { ArrayField } from '@formily/core'; -import { connect, useField } from '@formily/react'; +import { ArrayField } from '@nocobase/schema'; +import { connect, useField } from '@nocobase/schema'; import { Checkbox, Select, Table, Tag } from 'antd'; import React from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/acl/Configuration/schemas/roleCollections.ts b/packages/core/client/src/acl/Configuration/schemas/roleCollections.ts index 60f448dbe..31f96e09b 100644 --- a/packages/core/client/src/acl/Configuration/schemas/roleCollections.ts +++ b/packages/core/client/src/acl/Configuration/schemas/roleCollections.ts @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { useRoleResourceValues } from './useRoleResourceValues'; import { useSaveRoleResourceAction } from './useSaveRoleResourceAction'; diff --git a/packages/core/client/src/acl/Configuration/schemas/roles.ts b/packages/core/client/src/acl/Configuration/schemas/roles.ts index b06999c1d..c64de583b 100644 --- a/packages/core/client/src/acl/Configuration/schemas/roles.ts +++ b/packages/core/client/src/acl/Configuration/schemas/roles.ts @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import pick from 'lodash/pick'; import { useEffect } from 'react'; import { useRequest } from '../../../api-client'; diff --git a/packages/core/client/src/acl/Configuration/schemas/scopes.ts b/packages/core/client/src/acl/Configuration/schemas/scopes.ts index 1960c28fc..004a2ae81 100644 --- a/packages/core/client/src/acl/Configuration/schemas/scopes.ts +++ b/packages/core/client/src/acl/Configuration/schemas/scopes.ts @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { useContext, useEffect } from 'react'; import { useFormBlockContext } from '../../../block-provider'; import { useFilterOptions } from '../../../schema-component'; diff --git a/packages/core/client/src/acl/Configuration/schemas/useSaveRoleResourceAction.ts b/packages/core/client/src/acl/Configuration/schemas/useSaveRoleResourceAction.ts index 342b1a725..85d3916e3 100644 --- a/packages/core/client/src/acl/Configuration/schemas/useSaveRoleResourceAction.ts +++ b/packages/core/client/src/acl/Configuration/schemas/useSaveRoleResourceAction.ts @@ -1,4 +1,4 @@ -import { useForm } from '@formily/react'; +import { useForm } from '@nocobase/schema'; import { useActionContext, useAPIClient, useRecord, useResourceActionContext } from '../../../'; export const useSaveRoleResourceAction = () => { diff --git a/packages/core/client/src/api-client/context.ts b/packages/core/client/src/api-client/context.ts index 1e70ac3ca..71906a306 100644 --- a/packages/core/client/src/api-client/context.ts +++ b/packages/core/client/src/api-client/context.ts @@ -1,4 +1,4 @@ -import { createContext } from 'react'; +import React, { createContext } from 'react'; import { APIClient } from './APIClient'; export const APIClientContext = createContext(new APIClient()); diff --git a/packages/core/client/src/api-client/demos/demo3.tsx b/packages/core/client/src/api-client/demos/demo3.tsx index d27bf0470..edb9f99a5 100644 --- a/packages/core/client/src/api-client/demos/demo3.tsx +++ b/packages/core/client/src/api-client/demos/demo3.tsx @@ -1,4 +1,4 @@ -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; import { APIClient, APIClientProvider, useAPIClient, useRequest } from '@nocobase/client'; import { Button, Input, Space, Table } from 'antd'; import MockAdapter from 'axios-mock-adapter'; diff --git a/packages/core/client/src/api-client/hooks/useRequest.ts b/packages/core/client/src/api-client/hooks/useRequest.ts index 04bd8ea41..37fad4c35 100644 --- a/packages/core/client/src/api-client/hooks/useRequest.ts +++ b/packages/core/client/src/api-client/hooks/useRequest.ts @@ -1,4 +1,4 @@ -import { merge } from '@formily/shared'; +import { merge } from '@nocobase/schema'; import { useRequest as useReq, useSetState } from 'ahooks'; import { Options, Result } from 'ahooks/es/useRequest/src/types'; import { AxiosRequestConfig } from 'axios'; diff --git a/packages/core/client/src/application/Application.tsx b/packages/core/client/src/application/Application.tsx index 471ec5216..416681ed4 100644 --- a/packages/core/client/src/application/Application.tsx +++ b/packages/core/client/src/application/Application.tsx @@ -1,4 +1,4 @@ -import { define, observable } from '@formily/reactive'; +import { define, observable } from '@nocobase/schema'; import { APIClientOptions, getSubAppName } from '@nocobase/sdk'; import { i18n as i18next } from 'i18next'; import get from 'lodash/get'; diff --git a/packages/core/client/src/application/WebSocketClient.ts b/packages/core/client/src/application/WebSocketClient.ts index cdadcd6fd..941fcaeed 100644 --- a/packages/core/client/src/application/WebSocketClient.ts +++ b/packages/core/client/src/application/WebSocketClient.ts @@ -1,4 +1,4 @@ -import { define, observable } from '@formily/reactive'; +import { define, observable } from '@nocobase/schema'; import { getSubAppName } from '@nocobase/sdk'; import { Application } from './Application'; diff --git a/packages/core/client/src/application/__tests__/SchemaToolbar.test.tsx b/packages/core/client/src/application/__tests__/SchemaToolbar.test.tsx index ce51b2eab..604ff32a8 100644 --- a/packages/core/client/src/application/__tests__/SchemaToolbar.test.tsx +++ b/packages/core/client/src/application/__tests__/SchemaToolbar.test.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { fireEvent, render, screen, waitFor } from '@nocobase/test/client'; import { SchemaToolbarProvider, useSchemaToolbar, useSchemaToolbarRender } from '../schema-toolbar'; import { SchemaComponent, SchemaComponentProvider, SortableContext, SortableProvider } from '../../schema-component'; -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { Application, ApplicationContext } from '@nocobase/client'; describe('SchemaToolbar', () => { diff --git a/packages/core/client/src/application/components/AppComponent.tsx b/packages/core/client/src/application/components/AppComponent.tsx index 686c0213a..5d6d49dce 100644 --- a/packages/core/client/src/application/components/AppComponent.tsx +++ b/packages/core/client/src/application/components/AppComponent.tsx @@ -1,4 +1,4 @@ -import { observer } from '@formily/reactive-react'; +import { observer } from '@nocobase/schema'; import React, { FC, useCallback, useEffect } from 'react'; import { ErrorBoundary } from 'react-error-boundary'; import type { Application } from '../Application'; diff --git a/packages/core/client/src/application/hoc/withDynamicSchemaProps.tsx b/packages/core/client/src/application/hoc/withDynamicSchemaProps.tsx index 4d5daf178..71b9f01de 100644 --- a/packages/core/client/src/application/hoc/withDynamicSchemaProps.tsx +++ b/packages/core/client/src/application/hoc/withDynamicSchemaProps.tsx @@ -1,4 +1,4 @@ -import { useExpressionScope } from '@formily/react'; +import { useExpressionScope } from '@nocobase/schema'; import { merge, omit } from 'lodash'; import React, { ComponentType, useMemo } from 'react'; import { useDesignable } from '../../schema-component'; diff --git a/packages/core/client/src/application/schema-initializer/components/SchemaInitializerActionModal.tsx b/packages/core/client/src/application/schema-initializer/components/SchemaInitializerActionModal.tsx index 1b2f0210b..4bc85820f 100644 --- a/packages/core/client/src/application/schema-initializer/components/SchemaInitializerActionModal.tsx +++ b/packages/core/client/src/application/schema-initializer/components/SchemaInitializerActionModal.tsx @@ -1,4 +1,4 @@ -import { useForm } from '@formily/react'; +import { useForm } from '@nocobase/schema'; import React, { FC, useCallback, useMemo } from 'react'; import { useActionContext, SchemaComponent } from '../../../schema-component'; import { useSchemaInitializerItem } from '../context'; diff --git a/packages/core/client/src/application/schema-initializer/components/SchemaInitializerItem.tsx b/packages/core/client/src/application/schema-initializer/components/SchemaInitializerItem.tsx index 51aec3641..85d6c4bb9 100644 --- a/packages/core/client/src/application/schema-initializer/components/SchemaInitializerItem.tsx +++ b/packages/core/client/src/application/schema-initializer/components/SchemaInitializerItem.tsx @@ -1,4 +1,4 @@ -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; import classNames from 'classnames'; import React, { ReactNode, memo, useMemo } from 'react'; import { Icon } from '../../../icon'; diff --git a/packages/core/client/src/application/schema-initializer/components/SchemaInitializerSubMenu.tsx b/packages/core/client/src/application/schema-initializer/components/SchemaInitializerSubMenu.tsx index b67ed37ab..e2c0056ce 100644 --- a/packages/core/client/src/application/schema-initializer/components/SchemaInitializerSubMenu.tsx +++ b/packages/core/client/src/application/schema-initializer/components/SchemaInitializerSubMenu.tsx @@ -1,6 +1,6 @@ import Icon, { RightOutlined } from '@ant-design/icons'; import { css } from '@emotion/css'; -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; import { Menu, MenuProps, theme } from 'antd'; import React, { FC, ReactNode, useMemo } from 'react'; import { useCompile } from '../../../schema-component'; diff --git a/packages/core/client/src/application/schema-initializer/hoc/index.tsx b/packages/core/client/src/application/schema-initializer/hoc/index.tsx index 0309a4659..3d5bd7386 100644 --- a/packages/core/client/src/application/schema-initializer/hoc/index.tsx +++ b/packages/core/client/src/application/schema-initializer/hoc/index.tsx @@ -1,4 +1,4 @@ -import { ISchema, observer } from '@formily/react'; +import { ISchema, observer } from '@nocobase/schema'; import { ConfigProvider, Popover, theme } from 'antd'; import React, { ComponentType, useCallback, useMemo, useState } from 'react'; diff --git a/packages/core/client/src/application/schema-initializer/types.ts b/packages/core/client/src/application/schema-initializer/types.ts index d57e03186..d35bf25aa 100644 --- a/packages/core/client/src/application/schema-initializer/types.ts +++ b/packages/core/client/src/application/schema-initializer/types.ts @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/json-schema'; +import { ISchema } from '@nocobase/schema'; import { ButtonProps, PopoverProps } from 'antd'; import { ComponentType, ReactNode } from 'react'; import type { diff --git a/packages/core/client/src/application/schema-settings/components/SchemaSettingsWrapper.tsx b/packages/core/client/src/application/schema-settings/components/SchemaSettingsWrapper.tsx index ff0e8e81e..f73d111bc 100644 --- a/packages/core/client/src/application/schema-settings/components/SchemaSettingsWrapper.tsx +++ b/packages/core/client/src/application/schema-settings/components/SchemaSettingsWrapper.tsx @@ -5,7 +5,7 @@ import { SchemaSettingsChildren } from './SchemaSettingsChildren'; import { SchemaSettingsIcon } from './SchemaSettingsIcon'; import React from 'react'; import { useDesignable } from '../../../schema-component'; -import { useField, useFieldSchema } from '@formily/react'; +import { useField, useFieldSchema } from '@nocobase/schema'; /** * @internal diff --git a/packages/core/client/src/application/schema-settings/hooks/index.tsx b/packages/core/client/src/application/schema-settings/hooks/index.tsx index e5643ebf7..60103a69a 100644 --- a/packages/core/client/src/application/schema-settings/hooks/index.tsx +++ b/packages/core/client/src/application/schema-settings/hooks/index.tsx @@ -4,8 +4,8 @@ import { SchemaSettingOptions } from '../types'; import React from 'react'; import { SchemaSettingsWrapper } from '../components'; import { SchemaSettingsProps } from '../../../schema-settings'; -import { Schema } from '@formily/json-schema'; -import { GeneralField } from '@formily/core'; +import { Schema } from '@nocobase/schema'; +import { GeneralField } from '@nocobase/schema'; import { Designable } from '../../../schema-component'; type UseSchemaSettingsRenderOptions = Omit, 'name' | 'items'> & diff --git a/packages/core/client/src/application/schema-toolbar/hooks/index.tsx b/packages/core/client/src/application/schema-toolbar/hooks/index.tsx index 429ee853e..00568fedf 100644 --- a/packages/core/client/src/application/schema-toolbar/hooks/index.tsx +++ b/packages/core/client/src/application/schema-toolbar/hooks/index.tsx @@ -1,5 +1,5 @@ import React, { useMemo } from 'react'; -import { ISchema } from '@formily/json-schema'; +import { ISchema } from '@nocobase/schema'; import { useComponent, useDesignable } from '../../../schema-component'; import { SchemaToolbar, SchemaToolbarProps } from '../../../schema-settings/GeneralSchemaDesigner'; diff --git a/packages/core/client/src/application/utils/globalDeps.ts b/packages/core/client/src/application/utils/globalDeps.ts index 177e6f474..3e7539361 100644 --- a/packages/core/client/src/application/utils/globalDeps.ts +++ b/packages/core/client/src/application/utils/globalDeps.ts @@ -7,17 +7,18 @@ import * as dndKitSortable from '@dnd-kit/sortable'; import * as dndKitUtilities from '@dnd-kit/utilities'; import * as emotionCss from '@emotion/css'; import * as formilyAntdV5 from '@formily/antd-v5'; -import * as formilyCore from '@formily/core'; -import * as formilyJsonSchema from '@formily/json-schema'; -import * as formilyPath from '@formily/path'; -import * as formilyReact from '@formily/react'; -import * as formilyJsonReactive from '@formily/reactive'; -import * as formilyReactiveReact from '@formily/reactive-react'; -import * as formilyShared from '@formily/shared'; -import * as formilyValidator from '@formily/validator'; +import * as formilyCore from '@nocobase/schema'; +import * as formilyJsonSchema from '@nocobase/schema'; +import * as formilyPath from '@nocobase/schema'; +import * as formilyReact from '@nocobase/schema'; +import * as formilyJsonReactive from '@nocobase/schema'; +import * as formilyReactiveReact from '@nocobase/schema'; +import * as formilyShared from '@nocobase/schema'; +import * as formilyValidator from '@nocobase/schema'; import * as nocobaseEvaluators from '@nocobase/evaluators/client'; import * as nocobaseClientUtils from '@nocobase/utils/client'; import * as nocobaseSDK from '@nocobase/sdk'; +import * as nocobaseSchema from '@nocobase/schema'; import { dayjs } from '@nocobase/utils/client'; import * as ahooks from 'ahooks'; import * as antd from 'antd'; @@ -77,6 +78,7 @@ export function defineGlobalDeps(requirejs: RequireJS) { requirejs.define('@nocobase/evaluators', () => nocobaseEvaluators); requirejs.define('@nocobase/evaluators/client', () => nocobaseEvaluators); requirejs.define('@nocobase/sdk', () => nocobaseSDK); + requirejs.define('@nocobase/schema', () => nocobaseSchema); // dnd-kit 相关 requirejs.define('@dnd-kit/accessibility', () => dndKitAccessibility); diff --git a/packages/core/client/src/block-provider/BlockProvider.tsx b/packages/core/client/src/block-provider/BlockProvider.tsx index 48cfe0732..051131a93 100644 --- a/packages/core/client/src/block-provider/BlockProvider.tsx +++ b/packages/core/client/src/block-provider/BlockProvider.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/css'; -import { Field, GeneralField } from '@formily/core'; -import { RecursionField, useField, useFieldSchema } from '@formily/react'; +import { Field, GeneralField } from '@nocobase/schema'; +import { RecursionField, useField, useFieldSchema } from '@nocobase/schema'; import { Col, Row } from 'antd'; import merge from 'deepmerge'; import template from 'lodash/template'; diff --git a/packages/core/client/src/block-provider/DetailsBlockProvider.tsx b/packages/core/client/src/block-provider/DetailsBlockProvider.tsx index 83c27bf29..52ed4aad7 100644 --- a/packages/core/client/src/block-provider/DetailsBlockProvider.tsx +++ b/packages/core/client/src/block-provider/DetailsBlockProvider.tsx @@ -1,5 +1,5 @@ -import { createForm } from '@formily/core'; -import { useField } from '@formily/react'; +import { createForm } from '@nocobase/schema'; +import { useField } from '@nocobase/schema'; import { Spin } from 'antd'; import _ from 'lodash'; import React, { createContext, useContext, useEffect, useMemo, useRef } from 'react'; diff --git a/packages/core/client/src/block-provider/FormBlockProvider.tsx b/packages/core/client/src/block-provider/FormBlockProvider.tsx index 1ebbb0584..e691a5912 100644 --- a/packages/core/client/src/block-provider/FormBlockProvider.tsx +++ b/packages/core/client/src/block-provider/FormBlockProvider.tsx @@ -1,5 +1,5 @@ -import { createForm } from '@formily/core'; -import { RecursionField, Schema, useField, useFieldSchema } from '@formily/react'; +import { createForm } from '@nocobase/schema'; +import { RecursionField, Schema, useField, useFieldSchema } from '@nocobase/schema'; import { Spin } from 'antd'; import React, { createContext, useContext, useEffect, useMemo, useRef } from 'react'; import { useCollection_deprecated } from '../collection-manager'; diff --git a/packages/core/client/src/block-provider/FormFieldProvider.tsx b/packages/core/client/src/block-provider/FormFieldProvider.tsx index 58e253f45..0b51feb96 100644 --- a/packages/core/client/src/block-provider/FormFieldProvider.tsx +++ b/packages/core/client/src/block-provider/FormFieldProvider.tsx @@ -1,6 +1,6 @@ -import { createForm, onFormValuesChange } from '@formily/core'; -import { useField } from '@formily/react'; -import { autorun } from '@formily/reactive'; +import { createForm, onFormValuesChange } from '@nocobase/schema'; +import { useField } from '@nocobase/schema'; +import { autorun } from '@nocobase/schema'; import { forEach } from '@nocobase/utils/client'; import { Spin } from 'antd'; import React, { createContext, useContext, useEffect, useMemo } from 'react'; diff --git a/packages/core/client/src/block-provider/TableBlockProvider.tsx b/packages/core/client/src/block-provider/TableBlockProvider.tsx index 252e396a1..45d613d3b 100644 --- a/packages/core/client/src/block-provider/TableBlockProvider.tsx +++ b/packages/core/client/src/block-provider/TableBlockProvider.tsx @@ -1,5 +1,5 @@ -import { createForm } from '@formily/core'; -import { FormContext, useField, useFieldSchema } from '@formily/react'; +import { createForm } from '@nocobase/schema'; +import { FormContext, useField, useFieldSchema } from '@nocobase/schema'; import React, { createContext, useContext, useMemo, useState } from 'react'; import { useCollectionManager_deprecated } from '../collection-manager'; import { FixedBlockWrapper, SchemaComponentOptions } from '../schema-component'; diff --git a/packages/core/client/src/block-provider/TableFieldProvider.tsx b/packages/core/client/src/block-provider/TableFieldProvider.tsx index 18966e757..36bec8b14 100644 --- a/packages/core/client/src/block-provider/TableFieldProvider.tsx +++ b/packages/core/client/src/block-provider/TableFieldProvider.tsx @@ -1,5 +1,5 @@ -import { ArrayField, Field } from '@formily/core'; -import { useField, useFieldSchema } from '@formily/react'; +import { ArrayField, Field } from '@nocobase/schema'; +import { useField, useFieldSchema } from '@nocobase/schema'; import React, { createContext, useContext, useEffect } from 'react'; import { APIClient } from '../api-client'; import { BlockProvider, useBlockRequestContext } from './BlockProvider'; diff --git a/packages/core/client/src/block-provider/TableSelectorProvider.tsx b/packages/core/client/src/block-provider/TableSelectorProvider.tsx index 506c70e0e..4b26e7154 100644 --- a/packages/core/client/src/block-provider/TableSelectorProvider.tsx +++ b/packages/core/client/src/block-provider/TableSelectorProvider.tsx @@ -1,5 +1,5 @@ -import { ArrayField } from '@formily/core'; -import { Schema, useField, useFieldSchema } from '@formily/react'; +import { ArrayField } from '@nocobase/schema'; +import { Schema, useField, useFieldSchema } from '@nocobase/schema'; import _ from 'lodash'; import uniq from 'lodash/uniq'; import React, { createContext, useContext, useEffect, useState } from 'react'; diff --git a/packages/core/client/src/block-provider/hooks/index.ts b/packages/core/client/src/block-provider/hooks/index.ts index 836bc1479..acbc5d1d5 100644 --- a/packages/core/client/src/block-provider/hooks/index.ts +++ b/packages/core/client/src/block-provider/hooks/index.ts @@ -1,6 +1,6 @@ -import { Field, Form } from '@formily/core'; -import { SchemaExpressionScopeContext, useField, useFieldSchema, useForm } from '@formily/react'; -import { untracked } from '@formily/reactive'; +import { Field, Form } from '@nocobase/schema'; +import { SchemaExpressionScopeContext, useField, useFieldSchema, useForm } from '@nocobase/schema'; +import { untracked } from '@nocobase/schema'; import { isURL, parse } from '@nocobase/utils/client'; import { App, message } from 'antd'; import _ from 'lodash'; diff --git a/packages/core/client/src/block-provider/hooks/useParsedFilter.ts b/packages/core/client/src/block-provider/hooks/useParsedFilter.ts index aa732654d..d2a368b06 100644 --- a/packages/core/client/src/block-provider/hooks/useParsedFilter.ts +++ b/packages/core/client/src/block-provider/hooks/useParsedFilter.ts @@ -1,4 +1,4 @@ -import { reaction } from '@formily/reactive'; +import { reaction } from '@nocobase/schema'; import { flatten, getValuesByPath } from '@nocobase/utils/client'; import _ from 'lodash'; import { useEffect, useState } from 'react'; diff --git a/packages/core/client/src/china-region/index.tsx b/packages/core/client/src/china-region/index.tsx index dcbe51d92..0ca8f676f 100644 --- a/packages/core/client/src/china-region/index.tsx +++ b/packages/core/client/src/china-region/index.tsx @@ -1,5 +1,5 @@ -import { ArrayField } from '@formily/core'; -import { useField } from '@formily/react'; +import { ArrayField } from '@nocobase/schema'; +import { useField } from '@nocobase/schema'; import { error } from '@nocobase/utils/client'; import React from 'react'; import { SchemaComponentOptions } from '..'; diff --git a/packages/core/client/src/collection-manager/Configuration/AddCollectionAction.tsx b/packages/core/client/src/collection-manager/Configuration/AddCollectionAction.tsx index 82ea4e993..263099170 100644 --- a/packages/core/client/src/collection-manager/Configuration/AddCollectionAction.tsx +++ b/packages/core/client/src/collection-manager/Configuration/AddCollectionAction.tsx @@ -1,7 +1,7 @@ import { DownOutlined, PlusOutlined } from '@ant-design/icons'; import { ArrayTable } from '@formily/antd-v5'; -import { ISchema, useField, useForm } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema, useField, useForm } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { Button, Dropdown, MenuProps } from 'antd'; import { cloneDeep } from 'lodash'; import React, { useMemo, useState } from 'react'; diff --git a/packages/core/client/src/collection-manager/Configuration/AddFieldAction.tsx b/packages/core/client/src/collection-manager/Configuration/AddFieldAction.tsx index 74156fe1d..4d9d91368 100644 --- a/packages/core/client/src/collection-manager/Configuration/AddFieldAction.tsx +++ b/packages/core/client/src/collection-manager/Configuration/AddFieldAction.tsx @@ -1,7 +1,7 @@ import { PlusOutlined } from '@ant-design/icons'; import { ArrayTable } from '@formily/antd-v5'; -import { useField, useForm } from '@formily/react'; -import { uid } from '@formily/shared'; +import { useField, useForm } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { Button, Dropdown, MenuProps } from 'antd'; import { cloneDeep } from 'lodash'; import React, { useCallback, useMemo, useState } from 'react'; diff --git a/packages/core/client/src/collection-manager/Configuration/AddSubFieldAction.tsx b/packages/core/client/src/collection-manager/Configuration/AddSubFieldAction.tsx index a8a723344..5f398f856 100644 --- a/packages/core/client/src/collection-manager/Configuration/AddSubFieldAction.tsx +++ b/packages/core/client/src/collection-manager/Configuration/AddSubFieldAction.tsx @@ -1,7 +1,7 @@ import { PlusOutlined } from '@ant-design/icons'; import { ArrayTable } from '@formily/antd-v5'; -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { Button, Dropdown, MenuProps } from 'antd'; import { cloneDeep } from 'lodash'; import React, { useMemo, useState } from 'react'; diff --git a/packages/core/client/src/collection-manager/Configuration/DeleteCollectionAction.tsx b/packages/core/client/src/collection-manager/Configuration/DeleteCollectionAction.tsx index a6bedb048..e97af4013 100644 --- a/packages/core/client/src/collection-manager/Configuration/DeleteCollectionAction.tsx +++ b/packages/core/client/src/collection-manager/Configuration/DeleteCollectionAction.tsx @@ -1,6 +1,6 @@ import { DeleteOutlined, ExclamationCircleFilled } from '@ant-design/icons'; import { css } from '@emotion/css'; -import { useForm } from '@formily/react'; +import { useForm } from '@nocobase/schema'; import { Button, message } from 'antd'; import React, { useState } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/collection-manager/Configuration/EditCollectionAction.tsx b/packages/core/client/src/collection-manager/Configuration/EditCollectionAction.tsx index 7595e29c5..62fbfcab4 100644 --- a/packages/core/client/src/collection-manager/Configuration/EditCollectionAction.tsx +++ b/packages/core/client/src/collection-manager/Configuration/EditCollectionAction.tsx @@ -1,6 +1,6 @@ import { ArrayTable } from '@formily/antd-v5'; -import { ISchema, useForm } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema, useForm } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import cloneDeep from 'lodash/cloneDeep'; import omit from 'lodash/omit'; import React, { useEffect, useState } from 'react'; diff --git a/packages/core/client/src/collection-manager/Configuration/EditFieldAction.tsx b/packages/core/client/src/collection-manager/Configuration/EditFieldAction.tsx index 98a175f50..a64129d8c 100644 --- a/packages/core/client/src/collection-manager/Configuration/EditFieldAction.tsx +++ b/packages/core/client/src/collection-manager/Configuration/EditFieldAction.tsx @@ -1,6 +1,6 @@ import { ArrayTable } from '@formily/antd-v5'; -import { ISchema, useForm } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema, useForm } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import cloneDeep from 'lodash/cloneDeep'; import omit from 'lodash/omit'; import set from 'lodash/set'; diff --git a/packages/core/client/src/collection-manager/Configuration/EditSubFieldAction.tsx b/packages/core/client/src/collection-manager/Configuration/EditSubFieldAction.tsx index dbd9d1e30..f72134555 100644 --- a/packages/core/client/src/collection-manager/Configuration/EditSubFieldAction.tsx +++ b/packages/core/client/src/collection-manager/Configuration/EditSubFieldAction.tsx @@ -1,6 +1,6 @@ import { ArrayTable } from '@formily/antd-v5'; -import { ISchema, useForm } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema, useForm } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import cloneDeep from 'lodash/cloneDeep'; import React, { useState } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/collection-manager/Configuration/OverridingCollectionField.tsx b/packages/core/client/src/collection-manager/Configuration/OverridingCollectionField.tsx index 709e05ec6..354aa50c9 100644 --- a/packages/core/client/src/collection-manager/Configuration/OverridingCollectionField.tsx +++ b/packages/core/client/src/collection-manager/Configuration/OverridingCollectionField.tsx @@ -1,6 +1,6 @@ import { ArrayTable } from '@formily/antd-v5'; -import { ISchema, useForm } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema, useForm } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { omit, set } from 'lodash'; import cloneDeep from 'lodash/cloneDeep'; import React, { useMemo, useState } from 'react'; diff --git a/packages/core/client/src/collection-manager/Configuration/SyncFieldsAction.tsx b/packages/core/client/src/collection-manager/Configuration/SyncFieldsAction.tsx index b4019f8ab..4135a918a 100644 --- a/packages/core/client/src/collection-manager/Configuration/SyncFieldsAction.tsx +++ b/packages/core/client/src/collection-manager/Configuration/SyncFieldsAction.tsx @@ -1,7 +1,7 @@ import { PlusOutlined } from '@ant-design/icons'; import { ArrayTable } from '@formily/antd-v5'; -import { useField, useForm } from '@formily/react'; -import { uid } from '@formily/shared'; +import { useField, useForm } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { Button } from 'antd'; import { cloneDeep } from 'lodash'; import React, { useState } from 'react'; diff --git a/packages/core/client/src/collection-manager/Configuration/SyncSQLFieldsAction.tsx b/packages/core/client/src/collection-manager/Configuration/SyncSQLFieldsAction.tsx index f8fd3904e..25822c7f3 100644 --- a/packages/core/client/src/collection-manager/Configuration/SyncSQLFieldsAction.tsx +++ b/packages/core/client/src/collection-manager/Configuration/SyncSQLFieldsAction.tsx @@ -1,8 +1,8 @@ import { SyncOutlined } from '@ant-design/icons'; import { FormLayout } from '@formily/antd-v5'; -import { createForm } from '@formily/core'; -import { useField, useForm } from '@formily/react'; -import { uid } from '@formily/shared'; +import { createForm } from '@nocobase/schema'; +import { useField, useForm } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { Button } from 'antd'; import React, { useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/collection-manager/Configuration/ViewInheritedField.tsx b/packages/core/client/src/collection-manager/Configuration/ViewInheritedField.tsx index 256ece6cd..d78b4672d 100644 --- a/packages/core/client/src/collection-manager/Configuration/ViewInheritedField.tsx +++ b/packages/core/client/src/collection-manager/Configuration/ViewInheritedField.tsx @@ -1,6 +1,6 @@ import { ArrayTable } from '@formily/antd-v5'; -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import cloneDeep from 'lodash/cloneDeep'; import set from 'lodash/set'; import React, { useMemo, useState } from 'react'; diff --git a/packages/core/client/src/collection-manager/Configuration/components/CollectionCategory.tsx b/packages/core/client/src/collection-manager/Configuration/components/CollectionCategory.tsx index 0be90cce1..ed323cb2e 100644 --- a/packages/core/client/src/collection-manager/Configuration/components/CollectionCategory.tsx +++ b/packages/core/client/src/collection-manager/Configuration/components/CollectionCategory.tsx @@ -1,4 +1,4 @@ -import { observer } from '@formily/react'; +import { observer } from '@nocobase/schema'; import { Tag } from 'antd'; import React from 'react'; import { useCompile } from '../../../schema-component'; diff --git a/packages/core/client/src/collection-manager/Configuration/components/CollectionFieldInterfaceTag.tsx b/packages/core/client/src/collection-manager/Configuration/components/CollectionFieldInterfaceTag.tsx index 1bebb5f90..a526ef2ac 100644 --- a/packages/core/client/src/collection-manager/Configuration/components/CollectionFieldInterfaceTag.tsx +++ b/packages/core/client/src/collection-manager/Configuration/components/CollectionFieldInterfaceTag.tsx @@ -1,4 +1,4 @@ -import { observer } from '@formily/react'; +import { observer } from '@nocobase/schema'; import { Tag } from 'antd'; import React from 'react'; import { useCompile } from '../../../schema-component'; diff --git a/packages/core/client/src/collection-manager/Configuration/components/CollectionTemplateTag.tsx b/packages/core/client/src/collection-manager/Configuration/components/CollectionTemplateTag.tsx index 9e3ada12e..589528db7 100644 --- a/packages/core/client/src/collection-manager/Configuration/components/CollectionTemplateTag.tsx +++ b/packages/core/client/src/collection-manager/Configuration/components/CollectionTemplateTag.tsx @@ -1,4 +1,4 @@ -import { observer } from '@formily/react'; +import { observer } from '@nocobase/schema'; import { Tag } from 'antd'; import React from 'react'; import { useCompile } from '../../../schema-component'; diff --git a/packages/core/client/src/collection-manager/Configuration/components/Summary.tsx b/packages/core/client/src/collection-manager/Configuration/components/Summary.tsx index eb0e8255f..1f17d7aab 100644 --- a/packages/core/client/src/collection-manager/Configuration/components/Summary.tsx +++ b/packages/core/client/src/collection-manager/Configuration/components/Summary.tsx @@ -1,4 +1,4 @@ -import { observer } from '@formily/react'; +import { observer } from '@nocobase/schema'; import { Tag } from 'antd'; import { useAntdToken } from 'antd-style'; import React, { useMemo } from 'react'; diff --git a/packages/core/client/src/collection-manager/Configuration/components/index.tsx b/packages/core/client/src/collection-manager/Configuration/components/index.tsx index cdae91815..77984637b 100644 --- a/packages/core/client/src/collection-manager/Configuration/components/index.tsx +++ b/packages/core/client/src/collection-manager/Configuration/components/index.tsx @@ -1,5 +1,5 @@ -import { Field } from '@formily/core'; -import { observer, useField, useForm } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { observer, useField, useForm } from '@nocobase/schema'; import { Select, AutoComplete } from 'antd'; import React, { useState, useEffect } from 'react'; import { useRecord } from '../../../record-provider'; diff --git a/packages/core/client/src/collection-manager/Configuration/index.tsx b/packages/core/client/src/collection-manager/Configuration/index.tsx index 8c8c9ef29..6f627edd4 100644 --- a/packages/core/client/src/collection-manager/Configuration/index.tsx +++ b/packages/core/client/src/collection-manager/Configuration/index.tsx @@ -1,4 +1,4 @@ -import { registerValidateFormats } from '@formily/core'; +import { registerValidateFormats } from '@nocobase/schema'; export * from './AddFieldAction'; export * from './EditFieldAction'; diff --git a/packages/core/client/src/collection-manager/ResourceActionProvider.tsx b/packages/core/client/src/collection-manager/ResourceActionProvider.tsx index df0cfb8dd..eaab4c15c 100644 --- a/packages/core/client/src/collection-manager/ResourceActionProvider.tsx +++ b/packages/core/client/src/collection-manager/ResourceActionProvider.tsx @@ -1,4 +1,4 @@ -import { useField } from '@formily/react'; +import { useField } from '@nocobase/schema'; import { Result } from 'ahooks/es/useRequest/src/types'; import React, { createContext, useContext, useEffect } from 'react'; import { useCollectionManager_deprecated } from '.'; diff --git a/packages/core/client/src/collection-manager/action-hooks.ts b/packages/core/client/src/collection-manager/action-hooks.ts index d7b6b0418..a5e2f5f19 100644 --- a/packages/core/client/src/collection-manager/action-hooks.ts +++ b/packages/core/client/src/collection-manager/action-hooks.ts @@ -1,4 +1,4 @@ -import { useField, useForm } from '@formily/react'; +import { useField, useForm } from '@nocobase/schema'; import { message } from 'antd'; import _ from 'lodash'; import cloneDeep from 'lodash/cloneDeep'; diff --git a/packages/core/client/src/collection-manager/demos/demo2.tsx b/packages/core/client/src/collection-manager/demos/demo2.tsx index da8923ae9..645446a13 100644 --- a/packages/core/client/src/collection-manager/demos/demo2.tsx +++ b/packages/core/client/src/collection-manager/demos/demo2.tsx @@ -1,5 +1,5 @@ import { FormItem, Input } from '@formily/antd-v5'; -import { ISchema, observer, useForm } from '@formily/react'; +import { ISchema, observer, useForm } from '@nocobase/schema'; import { Action, CollectionField, diff --git a/packages/core/client/src/collection-manager/demos/demo4.tsx b/packages/core/client/src/collection-manager/demos/demo4.tsx index c4daf8d64..3c09d139e 100644 --- a/packages/core/client/src/collection-manager/demos/demo4.tsx +++ b/packages/core/client/src/collection-manager/demos/demo4.tsx @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { AntdSchemaComponentProvider, ExtendCollectionsProvider, diff --git a/packages/core/client/src/collection-manager/demos/demo5.tsx b/packages/core/client/src/collection-manager/demos/demo5.tsx index bddfbbcad..ec2be53a1 100644 --- a/packages/core/client/src/collection-manager/demos/demo5.tsx +++ b/packages/core/client/src/collection-manager/demos/demo5.tsx @@ -1,8 +1,8 @@ import { FormDrawer, FormLayout } from '@formily/antd-v5'; -import { createForm } from '@formily/core'; -import { ISchema } from '@formily/json-schema'; -import { FormContext, SchemaOptionsContext } from '@formily/react'; -import { uid } from '@formily/shared'; +import { createForm } from '@nocobase/schema'; +import { ISchema } from '@nocobase/schema'; +import { FormContext, SchemaOptionsContext } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { AntdSchemaComponentProvider, Application, diff --git a/packages/core/client/src/collection-manager/hooks/useCollectionDataSource.ts b/packages/core/client/src/collection-manager/hooks/useCollectionDataSource.ts index dd2ecb7fe..1fadd53e5 100644 --- a/packages/core/client/src/collection-manager/hooks/useCollectionDataSource.ts +++ b/packages/core/client/src/collection-manager/hooks/useCollectionDataSource.ts @@ -1,4 +1,4 @@ -import { action } from '@formily/reactive'; +import { action } from '@nocobase/schema'; import { useCollectionManager_deprecated } from '.'; import { useCompile } from '../../schema-component'; diff --git a/packages/core/client/src/collection-manager/hooks/useCollectionManager_deprecated.ts b/packages/core/client/src/collection-manager/hooks/useCollectionManager_deprecated.ts index a05b6fc99..c01c747f8 100644 --- a/packages/core/client/src/collection-manager/hooks/useCollectionManager_deprecated.ts +++ b/packages/core/client/src/collection-manager/hooks/useCollectionManager_deprecated.ts @@ -4,7 +4,7 @@ import { useCallback, useMemo, useState } from 'react'; import { useCompile, useSchemaComponentContext } from '../../schema-component'; import { CollectionFieldOptions_deprecated, CollectionOptions } from '../types'; import { InheritanceCollectionMixin } from '../mixins/InheritanceCollectionMixin'; -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; import { useDataSourceManager } from '../../data-source/data-source/DataSourceManagerProvider'; import { useDataSource } from '../../data-source/data-source/DataSourceProvider'; import { DEFAULT_DATA_SOURCE_KEY } from '../../data-source/data-source/DataSourceManager'; diff --git a/packages/core/client/src/collection-manager/hooks/useCollection_deprecated.ts b/packages/core/client/src/collection-manager/hooks/useCollection_deprecated.ts index 710acafe8..1848ab144 100644 --- a/packages/core/client/src/collection-manager/hooks/useCollection_deprecated.ts +++ b/packages/core/client/src/collection-manager/hooks/useCollection_deprecated.ts @@ -1,4 +1,4 @@ -import { SchemaKey } from '@formily/react'; +import { SchemaKey } from '@nocobase/schema'; import { useAPIClient } from '../../api-client'; import { InheritanceCollectionMixin } from '../mixins/InheritanceCollectionMixin'; import { useCallback, useMemo } from 'react'; diff --git a/packages/core/client/src/collection-manager/interfaces/checkbox.ts b/packages/core/client/src/collection-manager/interfaces/checkbox.ts index 8dcd722e4..51d4f8aab 100644 --- a/packages/core/client/src/collection-manager/interfaces/checkbox.ts +++ b/packages/core/client/src/collection-manager/interfaces/checkbox.ts @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { defaultProps, operators } from '../'; import { CollectionFieldInterface } from '../../data-source/collection-field-interface/CollectionFieldInterface'; diff --git a/packages/core/client/src/collection-manager/interfaces/checkboxGroup.ts b/packages/core/client/src/collection-manager/interfaces/checkboxGroup.ts index b55aff59d..4bd5215ea 100644 --- a/packages/core/client/src/collection-manager/interfaces/checkboxGroup.ts +++ b/packages/core/client/src/collection-manager/interfaces/checkboxGroup.ts @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { dataSource, defaultProps, operators } from './properties'; import { CollectionFieldInterface } from '../../data-source/collection-field-interface/CollectionFieldInterface'; diff --git a/packages/core/client/src/collection-manager/interfaces/chinaRegion.ts b/packages/core/client/src/collection-manager/interfaces/chinaRegion.ts index 9365784c8..18cccac88 100644 --- a/packages/core/client/src/collection-manager/interfaces/chinaRegion.ts +++ b/packages/core/client/src/collection-manager/interfaces/chinaRegion.ts @@ -1,4 +1,4 @@ -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; import { defaultProps, operators } from './properties'; import { CollectionFieldInterface } from '../../data-source/collection-field-interface/CollectionFieldInterface'; diff --git a/packages/core/client/src/collection-manager/interfaces/collection.ts b/packages/core/client/src/collection-manager/interfaces/collection.ts index f12d787db..333ac060e 100644 --- a/packages/core/client/src/collection-manager/interfaces/collection.ts +++ b/packages/core/client/src/collection-manager/interfaces/collection.ts @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { collectionDataSource, defaultProps, operators } from './properties'; import { CollectionFieldInterface } from '../../data-source/collection-field-interface/CollectionFieldInterface'; diff --git a/packages/core/client/src/collection-manager/interfaces/createdBy.ts b/packages/core/client/src/collection-manager/interfaces/createdBy.ts index 0f564ef67..1f51d8dd4 100644 --- a/packages/core/client/src/collection-manager/interfaces/createdBy.ts +++ b/packages/core/client/src/collection-manager/interfaces/createdBy.ts @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { cloneDeep } from 'lodash'; import { CollectionFieldInterface } from '../../data-source/collection-field-interface/CollectionFieldInterface'; import { defaultProps, recordPickerViewer } from './properties'; diff --git a/packages/core/client/src/collection-manager/interfaces/email.ts b/packages/core/client/src/collection-manager/interfaces/email.ts index ffde8f55d..38e0dabb6 100644 --- a/packages/core/client/src/collection-manager/interfaces/email.ts +++ b/packages/core/client/src/collection-manager/interfaces/email.ts @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { defaultProps, operators, unique } from './properties'; import { CollectionFieldInterface } from '../../data-source/collection-field-interface/CollectionFieldInterface'; diff --git a/packages/core/client/src/collection-manager/interfaces/input.ts b/packages/core/client/src/collection-manager/interfaces/input.ts index 7433df3d9..0052f4f99 100644 --- a/packages/core/client/src/collection-manager/interfaces/input.ts +++ b/packages/core/client/src/collection-manager/interfaces/input.ts @@ -1,7 +1,7 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { defaultProps, operators, unique, primaryKey } from './properties'; import { i18n } from '../../i18n'; -import { registerValidateRules } from '@formily/validator'; +import { registerValidateRules } from '@nocobase/schema'; import { CollectionFieldInterface } from '../../data-source/collection-field-interface/CollectionFieldInterface'; registerValidateRules({ diff --git a/packages/core/client/src/collection-manager/interfaces/integer.ts b/packages/core/client/src/collection-manager/interfaces/integer.ts index bc66b2eae..e03bdb9e6 100644 --- a/packages/core/client/src/collection-manager/interfaces/integer.ts +++ b/packages/core/client/src/collection-manager/interfaces/integer.ts @@ -1,4 +1,4 @@ -import { registerValidateFormats } from '@formily/core'; +import { registerValidateFormats } from '@nocobase/schema'; import { i18n } from '../../i18n'; import { defaultProps, operators, unique, autoIncrement, primaryKey } from './properties'; import { CollectionFieldInterface } from '../../data-source/collection-field-interface/CollectionFieldInterface'; diff --git a/packages/core/client/src/collection-manager/interfaces/json.tsx b/packages/core/client/src/collection-manager/interfaces/json.tsx index 00249c224..1aa077373 100644 --- a/packages/core/client/src/collection-manager/interfaces/json.tsx +++ b/packages/core/client/src/collection-manager/interfaces/json.tsx @@ -1,5 +1,5 @@ import { FormItem, FormLayout } from '@formily/antd-v5'; -import { registerValidateRules } from '@formily/core'; +import { registerValidateRules } from '@nocobase/schema'; import React from 'react'; import { defaultProps, operators } from './properties'; import { CollectionFieldInterface } from '../../data-source/collection-field-interface/CollectionFieldInterface'; diff --git a/packages/core/client/src/collection-manager/interfaces/linkTo.ts b/packages/core/client/src/collection-manager/interfaces/linkTo.ts index 5b8134580..65548ca5b 100644 --- a/packages/core/client/src/collection-manager/interfaces/linkTo.ts +++ b/packages/core/client/src/collection-manager/interfaces/linkTo.ts @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { CollectionFieldInterface } from '../../data-source/collection-field-interface/CollectionFieldInterface'; import { defaultProps } from './properties'; diff --git a/packages/core/client/src/collection-manager/interfaces/m2m.tsx b/packages/core/client/src/collection-manager/interfaces/m2m.tsx index ae8be1459..126d976b4 100644 --- a/packages/core/client/src/collection-manager/interfaces/m2m.tsx +++ b/packages/core/client/src/collection-manager/interfaces/m2m.tsx @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { CollectionFieldInterface } from '../../data-source/collection-field-interface/CollectionFieldInterface'; import { getUniqueKeyFromCollection } from './o2m'; import { defaultProps, relationshipType, reverseFieldProperties } from './properties'; diff --git a/packages/core/client/src/collection-manager/interfaces/m2o.tsx b/packages/core/client/src/collection-manager/interfaces/m2o.tsx index b80c37288..2b196c5e9 100644 --- a/packages/core/client/src/collection-manager/interfaces/m2o.tsx +++ b/packages/core/client/src/collection-manager/interfaces/m2o.tsx @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { CollectionFieldInterface } from '../../data-source/collection-field-interface/CollectionFieldInterface'; import { getUniqueKeyFromCollection } from './o2m'; import { constraintsProps, relationshipType, reverseFieldProperties } from './properties'; diff --git a/packages/core/client/src/collection-manager/interfaces/markdown.ts b/packages/core/client/src/collection-manager/interfaces/markdown.ts index 9565394a0..5f22d0c36 100644 --- a/packages/core/client/src/collection-manager/interfaces/markdown.ts +++ b/packages/core/client/src/collection-manager/interfaces/markdown.ts @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { i18n } from '../../i18n'; import { defaultProps, operators } from './properties'; import { CollectionFieldInterface } from '../../data-source/collection-field-interface/CollectionFieldInterface'; diff --git a/packages/core/client/src/collection-manager/interfaces/multipleSelect.ts b/packages/core/client/src/collection-manager/interfaces/multipleSelect.ts index 8407d79ba..9ec4cacb7 100644 --- a/packages/core/client/src/collection-manager/interfaces/multipleSelect.ts +++ b/packages/core/client/src/collection-manager/interfaces/multipleSelect.ts @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { dataSource, defaultProps, operators } from './properties'; import { CollectionFieldInterface } from '../../data-source/collection-field-interface/CollectionFieldInterface'; diff --git a/packages/core/client/src/collection-manager/interfaces/o2m.tsx b/packages/core/client/src/collection-manager/interfaces/o2m.tsx index 0232a61b6..fbfb0c89e 100644 --- a/packages/core/client/src/collection-manager/interfaces/o2m.tsx +++ b/packages/core/client/src/collection-manager/interfaces/o2m.tsx @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { Collection } from '../../data-source'; import { CollectionFieldInterface } from '../../data-source/collection-field-interface/CollectionFieldInterface'; import { constraintsProps, relationshipType, reverseFieldProperties } from './properties'; diff --git a/packages/core/client/src/collection-manager/interfaces/o2o.tsx b/packages/core/client/src/collection-manager/interfaces/o2o.tsx index 5bd7c44dd..75073fbbc 100644 --- a/packages/core/client/src/collection-manager/interfaces/o2o.tsx +++ b/packages/core/client/src/collection-manager/interfaces/o2o.tsx @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { CollectionFieldInterface } from '../../data-source/collection-field-interface/CollectionFieldInterface'; import { getUniqueKeyFromCollection } from './o2m'; import { constraintsProps, relationshipType, reverseFieldProperties } from './properties'; diff --git a/packages/core/client/src/collection-manager/interfaces/percent.ts b/packages/core/client/src/collection-manager/interfaces/percent.ts index 40af90af0..74b8a3df2 100644 --- a/packages/core/client/src/collection-manager/interfaces/percent.ts +++ b/packages/core/client/src/collection-manager/interfaces/percent.ts @@ -1,5 +1,5 @@ -import { registerValidateRules } from '@formily/core'; -import { ISchema } from '@formily/react'; +import { registerValidateRules } from '@nocobase/schema'; +import { ISchema } from '@nocobase/schema'; import { i18n } from '../../i18n'; import { defaultProps, operators, unique } from './properties'; import { CollectionFieldInterface } from '../../data-source/collection-field-interface/CollectionFieldInterface'; diff --git a/packages/core/client/src/collection-manager/interfaces/properties/index.ts b/packages/core/client/src/collection-manager/interfaces/properties/index.ts index 2ee0485df..b11c860ed 100644 --- a/packages/core/client/src/collection-manager/interfaces/properties/index.ts +++ b/packages/core/client/src/collection-manager/interfaces/properties/index.ts @@ -1,6 +1,6 @@ -import { Field } from '@formily/core'; -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { Field } from '@nocobase/schema'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; export * as operators from './operators'; export const type: ISchema = { diff --git a/packages/core/client/src/collection-manager/interfaces/richText.ts b/packages/core/client/src/collection-manager/interfaces/richText.ts index 3c2d58355..018c7c5ef 100644 --- a/packages/core/client/src/collection-manager/interfaces/richText.ts +++ b/packages/core/client/src/collection-manager/interfaces/richText.ts @@ -1,4 +1,4 @@ -import type { ISchema } from '@formily/react'; +import type { ISchema } from '@nocobase/schema'; import { i18n } from '../../i18n'; import { defaultProps, operators } from './properties'; import { CollectionFieldInterface } from '../../data-source/collection-field-interface/CollectionFieldInterface'; diff --git a/packages/core/client/src/collection-manager/interfaces/select.ts b/packages/core/client/src/collection-manager/interfaces/select.ts index d36320da0..4d03112d9 100644 --- a/packages/core/client/src/collection-manager/interfaces/select.ts +++ b/packages/core/client/src/collection-manager/interfaces/select.ts @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { dataSource, defaultProps, operators } from './properties'; import { CollectionFieldInterface } from '../../data-source/collection-field-interface/CollectionFieldInterface'; diff --git a/packages/core/client/src/collection-manager/interfaces/subTable.ts b/packages/core/client/src/collection-manager/interfaces/subTable.ts index 3000836cb..474ec1da8 100644 --- a/packages/core/client/src/collection-manager/interfaces/subTable.ts +++ b/packages/core/client/src/collection-manager/interfaces/subTable.ts @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { defaultProps } from './properties'; import { CollectionFieldInterface } from '../../data-source/collection-field-interface/CollectionFieldInterface'; diff --git a/packages/core/client/src/collection-manager/interfaces/textarea.ts b/packages/core/client/src/collection-manager/interfaces/textarea.ts index c2e9411f4..00ab498d1 100644 --- a/packages/core/client/src/collection-manager/interfaces/textarea.ts +++ b/packages/core/client/src/collection-manager/interfaces/textarea.ts @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { i18n } from '../../i18n'; import { defaultProps, operators } from './properties'; import { CollectionFieldInterface } from '../../data-source/collection-field-interface/CollectionFieldInterface'; diff --git a/packages/core/client/src/collection-manager/interfaces/types.ts b/packages/core/client/src/collection-manager/interfaces/types.ts index 4b8a24032..03eb9276c 100644 --- a/packages/core/client/src/collection-manager/interfaces/types.ts +++ b/packages/core/client/src/collection-manager/interfaces/types.ts @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; interface IDefault { type: string; diff --git a/packages/core/client/src/collection-manager/interfaces/updatedBy.ts b/packages/core/client/src/collection-manager/interfaces/updatedBy.ts index d19546192..28a7c4a3a 100644 --- a/packages/core/client/src/collection-manager/interfaces/updatedBy.ts +++ b/packages/core/client/src/collection-manager/interfaces/updatedBy.ts @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { cloneDeep } from 'lodash'; import { CollectionFieldInterface } from '../../data-source/collection-field-interface/CollectionFieldInterface'; import { defaultProps, recordPickerViewer } from './properties'; diff --git a/packages/core/client/src/collection-manager/interfaces/url.ts b/packages/core/client/src/collection-manager/interfaces/url.ts index 1dc17297c..2f211523a 100644 --- a/packages/core/client/src/collection-manager/interfaces/url.ts +++ b/packages/core/client/src/collection-manager/interfaces/url.ts @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { defaultProps, operators } from './properties'; import { CollectionFieldInterface } from '../../data-source/collection-field-interface/CollectionFieldInterface'; diff --git a/packages/core/client/src/collection-manager/sub-table.tsx b/packages/core/client/src/collection-manager/sub-table.tsx index cc908cba0..0ac2c7a39 100644 --- a/packages/core/client/src/collection-manager/sub-table.tsx +++ b/packages/core/client/src/collection-manager/sub-table.tsx @@ -1,4 +1,4 @@ -import { observer, useForm } from '@formily/react'; +import { observer, useForm } from '@nocobase/schema'; import { cloneDeep } from 'lodash'; import React, { createContext, useContext, useState } from 'react'; import { diff --git a/packages/core/client/src/collection-manager/templates/components/PresetFields.tsx b/packages/core/client/src/collection-manager/templates/components/PresetFields.tsx index 39b682323..4915ca585 100644 --- a/packages/core/client/src/collection-manager/templates/components/PresetFields.tsx +++ b/packages/core/client/src/collection-manager/templates/components/PresetFields.tsx @@ -1,4 +1,4 @@ -import { observer, useForm } from '@formily/react'; +import { observer, useForm } from '@nocobase/schema'; import { Table, Tag } from 'antd'; import React, { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/collection-manager/templates/components/PreviewFields.tsx b/packages/core/client/src/collection-manager/templates/components/PreviewFields.tsx index 9a2209167..93d028e9b 100644 --- a/packages/core/client/src/collection-manager/templates/components/PreviewFields.tsx +++ b/packages/core/client/src/collection-manager/templates/components/PreviewFields.tsx @@ -1,4 +1,4 @@ -import { useField, useForm } from '@formily/react'; +import { useField, useForm } from '@nocobase/schema'; import { Cascader, Input, Select, Spin, Table, Tag } from 'antd'; import { last, omit } from 'lodash'; import React, { useContext, useEffect, useState } from 'react'; diff --git a/packages/core/client/src/collection-manager/templates/components/PreviewTable.tsx b/packages/core/client/src/collection-manager/templates/components/PreviewTable.tsx index 8b442d119..c58cd9196 100644 --- a/packages/core/client/src/collection-manager/templates/components/PreviewTable.tsx +++ b/packages/core/client/src/collection-manager/templates/components/PreviewTable.tsx @@ -1,4 +1,4 @@ -import { RecursionField, useForm } from '@formily/react'; +import { RecursionField, useForm } from '@nocobase/schema'; import { Spin, Table } from 'antd'; import React, { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/collection-manager/templates/components/sql-collection/FieldsConfigure.tsx b/packages/core/client/src/collection-manager/templates/components/sql-collection/FieldsConfigure.tsx index 432526ec1..d2dddaf49 100644 --- a/packages/core/client/src/collection-manager/templates/components/sql-collection/FieldsConfigure.tsx +++ b/packages/core/client/src/collection-manager/templates/components/sql-collection/FieldsConfigure.tsx @@ -2,8 +2,8 @@ import { useTranslation } from 'react-i18next'; import { useAsyncData } from '../../../../async-data-provider'; import React, { useContext, useEffect, useMemo, useRef, useState } from 'react'; import { Alert, Cascader, Input, Select, Spin, Table, Tag } from 'antd'; -import { observer, useField, useForm } from '@formily/react'; -import { ArrayField } from '@formily/core'; +import { observer, useField, useForm } from '@nocobase/schema'; +import { ArrayField } from '@nocobase/schema'; import { useFieldInterfaceOptions } from '../../../Configuration/interfaces'; import { useCompile } from '../../../../schema-component'; import { useCollectionManager_deprecated } from '../../../hooks'; diff --git a/packages/core/client/src/collection-manager/templates/components/sql-collection/PreviewTable.tsx b/packages/core/client/src/collection-manager/templates/components/sql-collection/PreviewTable.tsx index 3da50fab1..fd4233e26 100644 --- a/packages/core/client/src/collection-manager/templates/components/sql-collection/PreviewTable.tsx +++ b/packages/core/client/src/collection-manager/templates/components/sql-collection/PreviewTable.tsx @@ -1,7 +1,7 @@ import { useAsyncData } from '../../../../async-data-provider'; import React, { useEffect } from 'react'; import { Table } from 'antd'; -import { Schema, observer, useForm } from '@formily/react'; +import { Schema, observer, useForm } from '@nocobase/schema'; import { useTranslation } from 'react-i18next'; export const PreviewTable = observer( diff --git a/packages/core/client/src/collection-manager/templates/components/sql-collection/SQLInput.tsx b/packages/core/client/src/collection-manager/templates/components/sql-collection/SQLInput.tsx index 1a98c85fb..c68d7e2c6 100644 --- a/packages/core/client/src/collection-manager/templates/components/sql-collection/SQLInput.tsx +++ b/packages/core/client/src/collection-manager/templates/components/sql-collection/SQLInput.tsx @@ -1,4 +1,4 @@ -import { useField, useForm } from '@formily/react'; +import { useField, useForm } from '@nocobase/schema'; import { useAsyncData } from '../../../../async-data-provider'; import React, { useEffect } from 'react'; import { Input, SchemaComponent } from '../../../../schema-component'; @@ -6,7 +6,7 @@ import { css } from '@emotion/css'; import { Button } from 'antd'; import { EditOutlined, RightSquareOutlined } from '@ant-design/icons'; import { useTranslation } from 'react-i18next'; -import { Field } from '@formily/core'; +import { Field } from '@nocobase/schema'; export const SQLInput = ({ disabled }) => { const { t } = useTranslation(); diff --git a/packages/core/client/src/collection-manager/templates/components/sql-collection/SQLRequestProvider.tsx b/packages/core/client/src/collection-manager/templates/components/sql-collection/SQLRequestProvider.tsx index bdd4fb49b..53321d350 100644 --- a/packages/core/client/src/collection-manager/templates/components/sql-collection/SQLRequestProvider.tsx +++ b/packages/core/client/src/collection-manager/templates/components/sql-collection/SQLRequestProvider.tsx @@ -1,7 +1,7 @@ import { useAPIClient, useRequest } from '../../../../api-client'; import { AsyncDataProvider } from '../../../../async-data-provider'; import React, { useEffect, useRef } from 'react'; -import { useForm } from '@formily/react'; +import { useForm } from '@nocobase/schema'; import { useRecord } from '../../../../record-provider'; export const SQLRequestProvider: React.FC<{ diff --git a/packages/core/client/src/collection-manager/templates/sql.tsx b/packages/core/client/src/collection-manager/templates/sql.tsx index 9fd7b11f4..e460e00ee 100644 --- a/packages/core/client/src/collection-manager/templates/sql.tsx +++ b/packages/core/client/src/collection-manager/templates/sql.tsx @@ -1,4 +1,4 @@ -import { Field } from '@formily/core'; +import { Field } from '@nocobase/schema'; import { SQLInput, PreviewTable, FieldsConfigure, SQLRequestProvider } from './components/sql-collection'; import { getConfigurableProperties } from './properties'; import { i18n } from '../../i18n'; diff --git a/packages/core/client/src/collection-manager/templates/types.ts b/packages/core/client/src/collection-manager/templates/types.ts index b7937e9a0..eb5846193 100644 --- a/packages/core/client/src/collection-manager/templates/types.ts +++ b/packages/core/client/src/collection-manager/templates/types.ts @@ -1,4 +1,4 @@ -import type { ISchema } from '@formily/react'; +import type { ISchema } from '@nocobase/schema'; import type { FieldOptions } from '../types'; import type { Application } from '../../application'; import type { CollectionOptions, Collection } from '../../data-source/collection/Collection'; diff --git a/packages/core/client/src/collection-manager/types.ts b/packages/core/client/src/collection-manager/types.ts index 00729d200..bc4c44d52 100644 --- a/packages/core/client/src/collection-manager/types.ts +++ b/packages/core/client/src/collection-manager/types.ts @@ -1,4 +1,4 @@ -import type { ISchema } from '@formily/react'; +import type { ISchema } from '@nocobase/schema'; import type { ReactNode } from 'react'; import type { CollectionManager, CollectionOptions } from '../data-source'; diff --git a/packages/core/client/src/common/useFieldComponentName.tsx b/packages/core/client/src/common/useFieldComponentName.tsx index f993220b0..0e73ebe51 100644 --- a/packages/core/client/src/common/useFieldComponentName.tsx +++ b/packages/core/client/src/common/useFieldComponentName.tsx @@ -1,5 +1,5 @@ -import { Field } from '@formily/core'; -import { useField, useFieldSchema } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { useIsFileField } from '../schema-component/antd/form-item/FormItem.Settings'; import { useColumnSchema } from '../schema-component/antd/table-v2/Table.Column.Decorator'; import { useCollectionField } from '../data-source'; diff --git a/packages/core/client/src/data-source/__tests__/data-block/data-block-demos/association-table-list-and-parent-record.tsx b/packages/core/client/src/data-source/__tests__/data-block/data-block-demos/association-table-list-and-parent-record.tsx index 0d30c69b9..31734d01a 100644 --- a/packages/core/client/src/data-source/__tests__/data-block/data-block-demos/association-table-list-and-parent-record.tsx +++ b/packages/core/client/src/data-source/__tests__/data-block/data-block-demos/association-table-list-and-parent-record.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { Table, TableProps } from 'antd'; import { SchemaComponent, UseDataBlockProps, useDataBlockRequest, withDynamicSchemaProps } from '@nocobase/client'; -import { ISchema } from '@formily/json-schema'; +import { ISchema } from '@nocobase/schema'; import { createApp } from './createApp'; const collection = 'users'; diff --git a/packages/core/client/src/data-source/__tests__/data-block/data-block-demos/association-table-list-and-source-id.tsx b/packages/core/client/src/data-source/__tests__/data-block/data-block-demos/association-table-list-and-source-id.tsx index 68d4293bb..4d5fe1fdd 100644 --- a/packages/core/client/src/data-source/__tests__/data-block/data-block-demos/association-table-list-and-source-id.tsx +++ b/packages/core/client/src/data-source/__tests__/data-block/data-block-demos/association-table-list-and-source-id.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { Select, Table, TableProps } from 'antd'; import { SchemaComponent, UseDataBlockProps, useDataBlockRequest, withDynamicSchemaProps } from '@nocobase/client'; -import { ISchema } from '@formily/json-schema'; +import { ISchema } from '@nocobase/schema'; import useUrlState from '@ahooksjs/use-url-state'; import { createApp } from './createApp'; diff --git a/packages/core/client/src/data-source/__tests__/data-block/data-block-demos/collection-form-create.tsx b/packages/core/client/src/data-source/__tests__/data-block/data-block-demos/collection-form-create.tsx index b678a48be..a591367d0 100644 --- a/packages/core/client/src/data-source/__tests__/data-block/data-block-demos/collection-form-create.tsx +++ b/packages/core/client/src/data-source/__tests__/data-block/data-block-demos/collection-form-create.tsx @@ -1,7 +1,7 @@ import React, { FC } from 'react'; import { Button, Form, FormProps, Input, InputNumber, notification } from 'antd'; import { SchemaComponent, useDataBlockResource, withDynamicSchemaProps } from '@nocobase/client'; -import { ISchema } from '@formily/json-schema'; +import { ISchema } from '@nocobase/schema'; import { createApp } from './createApp'; interface DemoFormFieldType { diff --git a/packages/core/client/src/data-source/__tests__/data-block/data-block-demos/collection-form-get-and-update.tsx b/packages/core/client/src/data-source/__tests__/data-block/data-block-demos/collection-form-get-and-update.tsx index 7ed2daa87..78da69ef6 100644 --- a/packages/core/client/src/data-source/__tests__/data-block/data-block-demos/collection-form-get-and-update.tsx +++ b/packages/core/client/src/data-source/__tests__/data-block/data-block-demos/collection-form-get-and-update.tsx @@ -7,7 +7,7 @@ import { useCollectionRecordData, withDynamicSchemaProps, } from '@nocobase/client'; -import { ISchema } from '@formily/json-schema'; +import { ISchema } from '@nocobase/schema'; import useUrlState from '@ahooksjs/use-url-state'; import { createApp } from './createApp'; diff --git a/packages/core/client/src/data-source/__tests__/data-block/data-block-demos/collection-form-record-and-update.tsx b/packages/core/client/src/data-source/__tests__/data-block/data-block-demos/collection-form-record-and-update.tsx index 423cc88d3..278a173b3 100644 --- a/packages/core/client/src/data-source/__tests__/data-block/data-block-demos/collection-form-record-and-update.tsx +++ b/packages/core/client/src/data-source/__tests__/data-block/data-block-demos/collection-form-record-and-update.tsx @@ -8,7 +8,7 @@ import { useCollectionRecordData, withDynamicSchemaProps, } from '@nocobase/client'; -import { ISchema } from '@formily/json-schema'; +import { ISchema } from '@nocobase/schema'; import { createApp } from './createApp'; interface DemoFormFieldType { diff --git a/packages/core/client/src/data-source/__tests__/data-block/data-block-demos/collection-table-list.tsx b/packages/core/client/src/data-source/__tests__/data-block/data-block-demos/collection-table-list.tsx index 0e0240bab..272351c7c 100644 --- a/packages/core/client/src/data-source/__tests__/data-block/data-block-demos/collection-table-list.tsx +++ b/packages/core/client/src/data-source/__tests__/data-block/data-block-demos/collection-table-list.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { SchemaComponent, useDataBlockRequest, withDynamicSchemaProps } from '@nocobase/client'; import { Table, TableProps } from 'antd'; -import { ISchema } from '@formily/json-schema'; +import { ISchema } from '@nocobase/schema'; import { createApp } from './createApp'; const schema: ISchema = { diff --git a/packages/core/client/src/data-source/collection-field-interface/CollectionFieldInterface.ts b/packages/core/client/src/data-source/collection-field-interface/CollectionFieldInterface.ts index 51e281204..f066c9625 100644 --- a/packages/core/client/src/data-source/collection-field-interface/CollectionFieldInterface.ts +++ b/packages/core/client/src/data-source/collection-field-interface/CollectionFieldInterface.ts @@ -1,4 +1,4 @@ -import type { ISchema } from '@formily/react'; +import type { ISchema } from '@nocobase/schema'; import type { CollectionFieldOptions } from '../collection'; import { CollectionFieldInterfaceManager } from './CollectionFieldInterfaceManager'; diff --git a/packages/core/client/src/data-source/collection-field/CollectionField.tsx b/packages/core/client/src/data-source/collection-field/CollectionField.tsx index 514cfa31c..a5e84b10a 100644 --- a/packages/core/client/src/data-source/collection-field/CollectionField.tsx +++ b/packages/core/client/src/data-source/collection-field/CollectionField.tsx @@ -1,6 +1,6 @@ -import { Field } from '@formily/core'; -import { connect, useField, useFieldSchema } from '@formily/react'; -import { merge } from '@formily/shared'; +import { Field } from '@nocobase/schema'; +import { connect, useField, useFieldSchema } from '@nocobase/schema'; +import { merge } from '@nocobase/schema'; import { concat } from 'lodash'; import React, { useEffect, useMemo } from 'react'; import { useFormBlockContext } from '../../block-provider/FormBlockProvider'; diff --git a/packages/core/client/src/data-source/collection-field/CollectionFieldProvider.tsx b/packages/core/client/src/data-source/collection-field/CollectionFieldProvider.tsx index bf186bd9f..af1fd09be 100644 --- a/packages/core/client/src/data-source/collection-field/CollectionFieldProvider.tsx +++ b/packages/core/client/src/data-source/collection-field/CollectionFieldProvider.tsx @@ -1,6 +1,6 @@ import React, { FC, ReactNode, createContext, useContext, useMemo } from 'react'; -import { useFieldSchema, type SchemaKey } from '@formily/react'; +import { useFieldSchema, type SchemaKey } from '@nocobase/schema'; import type { CollectionFieldOptions } from '../collection'; import { useCollection, useCollectionManager } from '../collection'; diff --git a/packages/core/client/src/data-source/collection-template/CollectionTemplate.ts b/packages/core/client/src/data-source/collection-template/CollectionTemplate.ts index af6bfc823..bbe3ab766 100644 --- a/packages/core/client/src/data-source/collection-template/CollectionTemplate.ts +++ b/packages/core/client/src/data-source/collection-template/CollectionTemplate.ts @@ -1,5 +1,5 @@ import type { CollectionOptions, Collection } from '../collection'; -import type { ISchema } from '@formily/react'; +import type { ISchema } from '@nocobase/schema'; import type { CollectionTemplateManager } from './CollectionTemplateManager'; import type { Application } from '../../application/Application'; diff --git a/packages/core/client/src/data-source/collection/Collection.ts b/packages/core/client/src/data-source/collection/Collection.ts index 27763b019..42ae365ba 100644 --- a/packages/core/client/src/data-source/collection/Collection.ts +++ b/packages/core/client/src/data-source/collection/Collection.ts @@ -1,4 +1,4 @@ -import { SchemaKey } from '@formily/react'; +import { SchemaKey } from '@nocobase/schema'; import { filter } from 'lodash'; import type { CollectionManager } from './CollectionManager'; diff --git a/packages/core/client/src/data-source/collection/CollectionManager.ts b/packages/core/client/src/data-source/collection/CollectionManager.ts index e1b0b851e..bcfd68394 100644 --- a/packages/core/client/src/data-source/collection/CollectionManager.ts +++ b/packages/core/client/src/data-source/collection/CollectionManager.ts @@ -1,4 +1,4 @@ -import type { SchemaKey } from '@formily/json-schema'; +import type { SchemaKey } from '@nocobase/schema'; import type { DataSource } from '../data-source'; import type { CollectionFieldOptions, CollectionOptions, GetCollectionFieldPredicate } from './Collection'; diff --git a/packages/core/client/src/filter-provider/FilterProvider.tsx b/packages/core/client/src/filter-provider/FilterProvider.tsx index cf24dba71..daa6e8b8a 100644 --- a/packages/core/client/src/filter-provider/FilterProvider.tsx +++ b/packages/core/client/src/filter-provider/FilterProvider.tsx @@ -1,4 +1,4 @@ -import { useField, useFieldSchema } from '@formily/react'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { uniqBy } from 'lodash'; import React, { createContext, useCallback, useEffect, useRef } from 'react'; import { useBlockRequestContext } from '../block-provider/BlockProvider'; @@ -6,7 +6,7 @@ import { CollectionFieldOptions_deprecated, useCollection_deprecated } from '../ import { removeNullCondition } from '../schema-component'; import { mergeFilter, useAssociatedFields } from './utils'; import { useDataLoadingMode } from '../modules/blocks/data-blocks/details-multi/setDataLoadingModeSettingsItem'; -import { GeneralField } from '@formily/core'; +import { GeneralField } from '@nocobase/schema'; enum FILTER_OPERATOR { AND = '$and', diff --git a/packages/core/client/src/filter-provider/utils.ts b/packages/core/client/src/filter-provider/utils.ts index 65d3f7b75..c80966363 100644 --- a/packages/core/client/src/filter-provider/utils.ts +++ b/packages/core/client/src/filter-provider/utils.ts @@ -1,4 +1,4 @@ -import { Schema, useFieldSchema } from '@formily/react'; +import { Schema, useFieldSchema } from '@nocobase/schema'; import { flatten, getValuesByPath } from '@nocobase/utils/client'; import _ from 'lodash'; import { useCallback, useEffect, useState } from 'react'; diff --git a/packages/core/client/src/formula/Expression.tsx b/packages/core/client/src/formula/Expression.tsx index a6e3eb0e6..34b4e0bff 100644 --- a/packages/core/client/src/formula/Expression.tsx +++ b/packages/core/client/src/formula/Expression.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/css'; -import { Field, onFormSubmitValidateStart } from '@formily/core'; -import { useField, useFormEffects } from '@formily/react'; +import { Field, onFormSubmitValidateStart } from '@nocobase/schema'; +import { useField, useFormEffects } from '@nocobase/schema'; import { Dropdown, MenuProps } from 'antd'; import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/formula/Result.tsx b/packages/core/client/src/formula/Result.tsx index f64687ab3..6d174ba35 100644 --- a/packages/core/client/src/formula/Result.tsx +++ b/packages/core/client/src/formula/Result.tsx @@ -1,5 +1,5 @@ -import { onFormValuesChange } from '@formily/core'; -import { useField, useFieldSchema, useForm, useFormEffects } from '@formily/react'; +import { onFormValuesChange } from '@nocobase/schema'; +import { useField, useFieldSchema, useForm, useFormEffects } from '@nocobase/schema'; import { toFixedByStep } from '@nocobase/utils/client'; import cloneDeep from 'lodash/cloneDeep'; import * as math from 'mathjs'; diff --git a/packages/core/client/src/formula/demos/demo2.tsx b/packages/core/client/src/formula/demos/demo2.tsx index acab9073e..da5bd9eed 100644 --- a/packages/core/client/src/formula/demos/demo2.tsx +++ b/packages/core/client/src/formula/demos/demo2.tsx @@ -1,7 +1,7 @@ /** * title: Formula */ -import { connect } from '@formily/react'; +import { connect } from '@nocobase/schema'; import { Formula, SchemaComponent, SchemaComponentProvider } from '@nocobase/client'; import React from 'react'; diff --git a/packages/core/client/src/index.ts b/packages/core/client/src/index.ts index 8b3ea63d8..eb23cc2e2 100644 --- a/packages/core/client/src/index.ts +++ b/packages/core/client/src/index.ts @@ -47,6 +47,7 @@ export * from './schema-items'; export * from './schema-settings'; export * from './schema-templates'; export * from './style'; +export type { CustomToken } from './global-theme'; export * from './system-settings'; export * from './testUtils'; export * from './user'; diff --git a/packages/core/client/src/modules/actions/add-child/addChildActionSettings.tsx b/packages/core/client/src/modules/actions/add-child/addChildActionSettings.tsx index 0298db713..5a7589a0f 100644 --- a/packages/core/client/src/modules/actions/add-child/addChildActionSettings.tsx +++ b/packages/core/client/src/modules/actions/add-child/addChildActionSettings.tsx @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { useMemo } from 'react'; import { useSchemaToolbar } from '../../../application'; import { SchemaSettings } from '../../../application/schema-settings/SchemaSettings'; diff --git a/packages/core/client/src/modules/actions/expand-collapse/expendableActionSettings.tsx b/packages/core/client/src/modules/actions/expand-collapse/expendableActionSettings.tsx index 7d2274a5a..c1f2c04dd 100644 --- a/packages/core/client/src/modules/actions/expand-collapse/expendableActionSettings.tsx +++ b/packages/core/client/src/modules/actions/expand-collapse/expendableActionSettings.tsx @@ -1,4 +1,4 @@ -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import React from 'react'; import { useTranslation } from 'react-i18next'; import { useDesignable } from '../../..'; diff --git a/packages/core/client/src/modules/actions/filter/filterActionSettings.tsx b/packages/core/client/src/modules/actions/filter/filterActionSettings.tsx index a57248b94..23342ee2f 100644 --- a/packages/core/client/src/modules/actions/filter/filterActionSettings.tsx +++ b/packages/core/client/src/modules/actions/filter/filterActionSettings.tsx @@ -1,4 +1,4 @@ -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import { useTranslation } from 'react-i18next'; import { SchemaSettings } from '../../../application/schema-settings/SchemaSettings'; import { FilterableFieldsSchemaSettingsItem } from '../../../schema-component/antd/filter/Filter.Action.Designer'; diff --git a/packages/core/client/src/modules/actions/save-record/customizeSaveRecordActionSettings.tsx b/packages/core/client/src/modules/actions/save-record/customizeSaveRecordActionSettings.tsx index 0c5762131..33f7ee29d 100644 --- a/packages/core/client/src/modules/actions/save-record/customizeSaveRecordActionSettings.tsx +++ b/packages/core/client/src/modules/actions/save-record/customizeSaveRecordActionSettings.tsx @@ -1,5 +1,5 @@ -import { useFieldSchema } from '@formily/react'; -import { isValid } from '@formily/shared'; +import { useFieldSchema } from '@nocobase/schema'; +import { isValid } from '@nocobase/schema'; import { useSchemaToolbar } from '../../../application'; import { SchemaSettings } from '../../../application/schema-settings/SchemaSettings'; import { diff --git a/packages/core/client/src/modules/actions/submit/createSubmitActionSettings.tsx b/packages/core/client/src/modules/actions/submit/createSubmitActionSettings.tsx index a7ec64efb..198e63722 100644 --- a/packages/core/client/src/modules/actions/submit/createSubmitActionSettings.tsx +++ b/packages/core/client/src/modules/actions/submit/createSubmitActionSettings.tsx @@ -1,5 +1,5 @@ -import { useFieldSchema, useField, connect, mapProps, ISchema } from '@formily/react'; -import { isValid } from '@formily/shared'; +import { useFieldSchema, useField, connect, mapProps, ISchema } from '@nocobase/schema'; +import { isValid } from '@nocobase/schema'; import React, { useEffect, useState } from 'react'; import { Tree as AntdTree } from 'antd'; import { useSchemaToolbar } from '../../../application'; diff --git a/packages/core/client/src/modules/actions/submit/updateSubmitActionSettings.tsx b/packages/core/client/src/modules/actions/submit/updateSubmitActionSettings.tsx index c1adee749..92d272c5c 100644 --- a/packages/core/client/src/modules/actions/submit/updateSubmitActionSettings.tsx +++ b/packages/core/client/src/modules/actions/submit/updateSubmitActionSettings.tsx @@ -1,5 +1,5 @@ -import { useFieldSchema } from '@formily/react'; -import { isValid } from '@formily/shared'; +import { useFieldSchema } from '@nocobase/schema'; +import { isValid } from '@nocobase/schema'; import { isInitializersSame, useSchemaToolbar } from '../../../application'; import { SchemaSettings } from '../../../application/schema-settings/SchemaSettings'; import { diff --git a/packages/core/client/src/modules/actions/update-record/customizeUpdateRecordActionSettings.tsx b/packages/core/client/src/modules/actions/update-record/customizeUpdateRecordActionSettings.tsx index 86ed008fe..6207462ee 100644 --- a/packages/core/client/src/modules/actions/update-record/customizeUpdateRecordActionSettings.tsx +++ b/packages/core/client/src/modules/actions/update-record/customizeUpdateRecordActionSettings.tsx @@ -1,5 +1,5 @@ -import { isValid } from '@formily/shared'; -import { useFieldSchema } from '@formily/react'; +import { isValid } from '@nocobase/schema'; +import { useFieldSchema } from '@nocobase/schema'; import { useSchemaToolbar } from '../../../application'; import { SchemaSettings } from '../../../application/schema-settings/SchemaSettings'; import { useCollection_deprecated } from '../../../collection-manager'; diff --git a/packages/core/client/src/modules/blocks/data-blocks/details-multi/createDetailsWithPaginationUISchema.ts b/packages/core/client/src/modules/blocks/data-blocks/details-multi/createDetailsWithPaginationUISchema.ts index 009162592..f554a9a2e 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/details-multi/createDetailsWithPaginationUISchema.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/details-multi/createDetailsWithPaginationUISchema.ts @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; export function createDetailsWithPaginationUISchema(options: { dataSource: string; diff --git a/packages/core/client/src/modules/blocks/data-blocks/details-multi/detailsWithPaginationSettings.tsx b/packages/core/client/src/modules/blocks/data-blocks/details-multi/detailsWithPaginationSettings.tsx index adea06e58..cdce21f09 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/details-multi/detailsWithPaginationSettings.tsx +++ b/packages/core/client/src/modules/blocks/data-blocks/details-multi/detailsWithPaginationSettings.tsx @@ -1,5 +1,5 @@ import { ArrayItems } from '@formily/antd-v5'; -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import { useTranslation } from 'react-i18next'; import { SchemaSettings } from '../../../../application/schema-settings/SchemaSettings'; import { useFormBlockContext } from '../../../../block-provider'; diff --git a/packages/core/client/src/modules/blocks/data-blocks/details-multi/setDataLoadingModeSettingsItem.tsx b/packages/core/client/src/modules/blocks/data-blocks/details-multi/setDataLoadingModeSettingsItem.tsx index 20707d7c1..3ef8cb3aa 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/details-multi/setDataLoadingModeSettingsItem.tsx +++ b/packages/core/client/src/modules/blocks/data-blocks/details-multi/setDataLoadingModeSettingsItem.tsx @@ -1,4 +1,4 @@ -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import _ from 'lodash'; import React from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/modules/blocks/data-blocks/details-single/createDetailsUISchema.ts b/packages/core/client/src/modules/blocks/data-blocks/details-single/createDetailsUISchema.ts index 963c489e8..6c8aeab53 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/details-single/createDetailsUISchema.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/details-single/createDetailsUISchema.ts @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; export function createDetailsUISchema(options: { dataSource: string; diff --git a/packages/core/client/src/modules/blocks/data-blocks/details-single/detailsBlockSettings.ts b/packages/core/client/src/modules/blocks/data-blocks/details-single/detailsBlockSettings.ts index 999109fff..8e60b76e9 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/details-single/detailsBlockSettings.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/details-single/detailsBlockSettings.ts @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { SchemaSettings } from '../../../../application/schema-settings/SchemaSettings'; import { useCollection_deprecated } from '../../../../collection-manager'; import { SchemaSettingsBlockTitleItem, SchemaSettingsFormItemTemplate } from '../../../../schema-settings'; diff --git a/packages/core/client/src/modules/blocks/data-blocks/form/__e2e__/form-create/schemaInitializer.test.ts b/packages/core/client/src/modules/blocks/data-blocks/form/__e2e__/form-create/schemaInitializer.test.ts index d7b9b99be..242c4b0d5 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/form/__e2e__/form-create/schemaInitializer.test.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/form/__e2e__/form-create/schemaInitializer.test.ts @@ -1,6 +1,6 @@ import { createBlockInPage, expect, oneEmptyForm, test } from '@nocobase/test/e2e'; import { T3106, T3469 } from './templatesOfBug'; -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; test.describe('where creation form block can be added', () => { test('page', async ({ page, mockPage }) => { diff --git a/packages/core/client/src/modules/blocks/data-blocks/form/__tests__/createEditFormBlockUISchema.test.ts b/packages/core/client/src/modules/blocks/data-blocks/form/__tests__/createEditFormBlockUISchema.test.ts index 8082b18d3..2297254f2 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/form/__tests__/createEditFormBlockUISchema.test.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/form/__tests__/createEditFormBlockUISchema.test.ts @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { vi } from 'vitest'; import { createEditFormBlockUISchema } from '../createEditFormBlockUISchema'; diff --git a/packages/core/client/src/modules/blocks/data-blocks/form/createCreateFormBlockUISchema.ts b/packages/core/client/src/modules/blocks/data-blocks/form/createCreateFormBlockUISchema.ts index cd399656e..fbde05e9e 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/form/createCreateFormBlockUISchema.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/form/createCreateFormBlockUISchema.ts @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; export interface CreateFormBlockUISchemaOptions { dataSource: string; diff --git a/packages/core/client/src/modules/blocks/data-blocks/form/createEditFormBlockUISchema.ts b/packages/core/client/src/modules/blocks/data-blocks/form/createEditFormBlockUISchema.ts index 509b0183b..7a8372d0c 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/form/createEditFormBlockUISchema.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/form/createEditFormBlockUISchema.ts @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; interface EditFormBlockOptions { dataSource: string; diff --git a/packages/core/client/src/modules/blocks/data-blocks/form/createFormBlockSettings.tsx b/packages/core/client/src/modules/blocks/data-blocks/form/createFormBlockSettings.tsx index c93d35087..4a5bbd494 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/form/createFormBlockSettings.tsx +++ b/packages/core/client/src/modules/blocks/data-blocks/form/createFormBlockSettings.tsx @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { SchemaSettings } from '../../../../application/schema-settings/SchemaSettings'; import { useFormBlockContext } from '../../../../block-provider'; import { useCollection_deprecated } from '../../../../collection-manager'; diff --git a/packages/core/client/src/modules/blocks/data-blocks/form/editFormBlockSettings.ts b/packages/core/client/src/modules/blocks/data-blocks/form/editFormBlockSettings.ts index f12f6a9a8..87d34c83a 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/form/editFormBlockSettings.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/form/editFormBlockSettings.ts @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { SchemaSettings } from '../../../../application/schema-settings/SchemaSettings'; import { useFormBlockContext } from '../../../../block-provider'; import { useCollection_deprecated } from '../../../../collection-manager'; diff --git a/packages/core/client/src/modules/blocks/data-blocks/form/fieldSettingsFormItem.tsx b/packages/core/client/src/modules/blocks/data-blocks/form/fieldSettingsFormItem.tsx index 5cf95d7f5..999ecaa78 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/form/fieldSettingsFormItem.tsx +++ b/packages/core/client/src/modules/blocks/data-blocks/form/fieldSettingsFormItem.tsx @@ -1,6 +1,6 @@ import { ArrayCollapse, FormLayout } from '@formily/antd-v5'; -import { Field } from '@formily/core'; -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import _ from 'lodash'; import { useTranslation } from 'react-i18next'; import { useApp, useSchemaToolbar } from '../../../../application'; diff --git a/packages/core/client/src/modules/blocks/data-blocks/grid-card/createGridCardBlockSchema.ts b/packages/core/client/src/modules/blocks/data-blocks/grid-card/createGridCardBlockSchema.ts index 3f69b8846..91fd63299 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/grid-card/createGridCardBlockSchema.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/grid-card/createGridCardBlockSchema.ts @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; export const createGridCardBlockSchema = (options: { dataSource: string; diff --git a/packages/core/client/src/modules/blocks/data-blocks/grid-card/gridCardBlockSettings.ts b/packages/core/client/src/modules/blocks/data-blocks/grid-card/gridCardBlockSettings.ts index ce626c00c..db7dc7de9 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/grid-card/gridCardBlockSettings.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/grid-card/gridCardBlockSettings.ts @@ -1,6 +1,6 @@ import { ArrayItems } from '@formily/antd-v5'; -import { ISchema } from '@formily/json-schema'; -import { useField, useFieldSchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; +import { useField, useFieldSchema } from '@nocobase/schema'; import _ from 'lodash'; import { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/modules/blocks/data-blocks/list/createListBlockSchema.ts b/packages/core/client/src/modules/blocks/data-blocks/list/createListBlockSchema.ts index fe56872c1..bd0f5a0b4 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/list/createListBlockSchema.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/list/createListBlockSchema.ts @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; export const createListBlockSchema = (options: { dataSource: string; diff --git a/packages/core/client/src/modules/blocks/data-blocks/list/listBlockSettings.ts b/packages/core/client/src/modules/blocks/data-blocks/list/listBlockSettings.ts index 627700a88..4d6fed775 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/list/listBlockSettings.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/list/listBlockSettings.ts @@ -1,5 +1,5 @@ import { ArrayItems } from '@formily/antd-v5'; -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import _ from 'lodash'; import { useTranslation } from 'react-i18next'; import { SchemaSettings } from '../../../../application/schema-settings/SchemaSettings'; diff --git a/packages/core/client/src/modules/blocks/data-blocks/table-selector/createTableSelectorUISchema.ts b/packages/core/client/src/modules/blocks/data-blocks/table-selector/createTableSelectorUISchema.ts index 3fb226e4b..f2ba6c3e0 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/table-selector/createTableSelectorUISchema.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/table-selector/createTableSelectorUISchema.ts @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; export const createTableSelectorUISchema = (options: { collectionName: string; diff --git a/packages/core/client/src/modules/blocks/data-blocks/table-selector/tableSelectorBlockSettings.ts b/packages/core/client/src/modules/blocks/data-blocks/table-selector/tableSelectorBlockSettings.ts index 3960b9ff6..0e42f984e 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/table-selector/tableSelectorBlockSettings.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/table-selector/tableSelectorBlockSettings.ts @@ -1,5 +1,5 @@ import { ArrayItems } from '@formily/antd-v5'; -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import { cloneDeep } from 'lodash'; import { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/modules/blocks/data-blocks/table/TableActionColumnInitializers.tsx b/packages/core/client/src/modules/blocks/data-blocks/table/TableActionColumnInitializers.tsx index 3edb4f219..fbb28cf7f 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/table/TableActionColumnInitializers.tsx +++ b/packages/core/client/src/modules/blocks/data-blocks/table/TableActionColumnInitializers.tsx @@ -1,5 +1,5 @@ import { MenuOutlined } from '@ant-design/icons'; -import { ISchema, useFieldSchema } from '@formily/react'; +import { ISchema, useFieldSchema } from '@nocobase/schema'; import _ from 'lodash'; import React from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/modules/blocks/data-blocks/table/TableActionInitializers.tsx b/packages/core/client/src/modules/blocks/data-blocks/table/TableActionInitializers.tsx index 512679908..9999bd1b3 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/table/TableActionInitializers.tsx +++ b/packages/core/client/src/modules/blocks/data-blocks/table/TableActionInitializers.tsx @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { CompatibleSchemaInitializer } from '../../../../application/schema-initializer/CompatibleSchemaInitializer'; import { useCollection_deprecated } from '../../../../collection-manager/hooks/useCollection_deprecated'; diff --git a/packages/core/client/src/modules/blocks/data-blocks/table/TableColumnInitializers.tsx b/packages/core/client/src/modules/blocks/data-blocks/table/TableColumnInitializers.tsx index dcc8d31e4..f16e23c47 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/table/TableColumnInitializers.tsx +++ b/packages/core/client/src/modules/blocks/data-blocks/table/TableColumnInitializers.tsx @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import React, { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import { useCompile } from '../../../../schema-component'; diff --git a/packages/core/client/src/modules/blocks/data-blocks/table/createTableBlockUISchema.ts b/packages/core/client/src/modules/blocks/data-blocks/table/createTableBlockUISchema.ts index ca5da9dbd..06debae22 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/table/createTableBlockUISchema.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/table/createTableBlockUISchema.ts @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; export const createTableBlockUISchema = (options: { dataSource: string; diff --git a/packages/core/client/src/modules/blocks/data-blocks/table/hooks/useTableBlockDecoratorProps.ts b/packages/core/client/src/modules/blocks/data-blocks/table/hooks/useTableBlockDecoratorProps.ts index 55650748a..b36a8cbed 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/table/hooks/useTableBlockDecoratorProps.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/table/hooks/useTableBlockDecoratorProps.ts @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { useParsedFilter } from '../../../../../block-provider/hooks/useParsedFilter'; import { useMemo } from 'react'; import { useDataBlockSourceId } from '../../../../../block-provider/hooks/useDataBlockSourceId'; diff --git a/packages/core/client/src/modules/blocks/data-blocks/table/hooks/useTableBlockProps.tsx b/packages/core/client/src/modules/blocks/data-blocks/table/hooks/useTableBlockProps.tsx index d30dfe2f6..7c20b5324 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/table/hooks/useTableBlockProps.tsx +++ b/packages/core/client/src/modules/blocks/data-blocks/table/hooks/useTableBlockProps.tsx @@ -1,5 +1,5 @@ -import { ArrayField } from '@formily/core'; -import { useField, useFieldSchema } from '@formily/react'; +import { ArrayField } from '@nocobase/schema'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { useEffect } from 'react'; import { useFilterBlock } from '../../../../../filter-provider/FilterProvider'; import { mergeFilter } from '../../../../../filter-provider/utils'; diff --git a/packages/core/client/src/modules/blocks/data-blocks/table/tableBlockSettings.tsx b/packages/core/client/src/modules/blocks/data-blocks/table/tableBlockSettings.tsx index 2e8b96699..b799cb892 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/table/tableBlockSettings.tsx +++ b/packages/core/client/src/modules/blocks/data-blocks/table/tableBlockSettings.tsx @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/json-schema'; -import { useField, useFieldSchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { useAPIClient } from '../../../../api-client'; import { useTableBlockContext, useFormBlockContext } from '../../../../block-provider'; import { diff --git a/packages/core/client/src/modules/blocks/data-blocks/table/tableColumnSettings.tsx b/packages/core/client/src/modules/blocks/data-blocks/table/tableColumnSettings.tsx index e3f93c109..0ed78a2cc 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/table/tableColumnSettings.tsx +++ b/packages/core/client/src/modules/blocks/data-blocks/table/tableColumnSettings.tsx @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/json-schema'; -import { useField, useFieldSchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { useTranslation } from 'react-i18next'; import { useApp } from '../../../../application'; import { SchemaSettings } from '../../../../application/schema-settings/SchemaSettings'; diff --git a/packages/core/client/src/modules/blocks/data-blocks/table/utils.tsx b/packages/core/client/src/modules/blocks/data-blocks/table/utils.tsx index de54e3c7a..cde321fbc 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/table/utils.tsx +++ b/packages/core/client/src/modules/blocks/data-blocks/table/utils.tsx @@ -1,5 +1,5 @@ -import { Field } from '@formily/core'; -import { useField, useFieldSchema } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { useIsFileField } from '../../../../schema-component'; import { useColumnSchema } from '../../../../schema-component/antd/table-v2/Table.Column.Decorator'; diff --git a/packages/core/client/src/modules/blocks/filter-blocks/collapse/createFilterCollapseBlockSchema.ts b/packages/core/client/src/modules/blocks/filter-blocks/collapse/createFilterCollapseBlockSchema.ts index 2d713a61b..69d861b2a 100644 --- a/packages/core/client/src/modules/blocks/filter-blocks/collapse/createFilterCollapseBlockSchema.ts +++ b/packages/core/client/src/modules/blocks/filter-blocks/collapse/createFilterCollapseBlockSchema.ts @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; export const createCollapseBlockSchema = (options: { collectionName: string; diff --git a/packages/core/client/src/modules/blocks/filter-blocks/collapse/filterCollapseBlockSettings.ts b/packages/core/client/src/modules/blocks/filter-blocks/collapse/filterCollapseBlockSettings.ts index 0ad5faaec..58af629e0 100644 --- a/packages/core/client/src/modules/blocks/filter-blocks/collapse/filterCollapseBlockSettings.ts +++ b/packages/core/client/src/modules/blocks/filter-blocks/collapse/filterCollapseBlockSettings.ts @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { useTranslation } from 'react-i18next'; import { SchemaSettings } from '../../../../application/schema-settings/SchemaSettings'; import { useCollection_deprecated } from '../../../../collection-manager'; diff --git a/packages/core/client/src/modules/blocks/filter-blocks/collapse/filterCollapseItemFieldSettings.ts b/packages/core/client/src/modules/blocks/filter-blocks/collapse/filterCollapseItemFieldSettings.ts index 8a88cf141..7d62e4409 100644 --- a/packages/core/client/src/modules/blocks/filter-blocks/collapse/filterCollapseItemFieldSettings.ts +++ b/packages/core/client/src/modules/blocks/filter-blocks/collapse/filterCollapseItemFieldSettings.ts @@ -1,4 +1,4 @@ -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import _ from 'lodash'; import { useTranslation } from 'react-i18next'; import { SchemaSettings } from '../../../../application/schema-settings/SchemaSettings'; diff --git a/packages/core/client/src/modules/blocks/filter-blocks/form/createFilterFormBlockSchema.ts b/packages/core/client/src/modules/blocks/filter-blocks/form/createFilterFormBlockSchema.ts index 85ab058de..1ccbd00ef 100644 --- a/packages/core/client/src/modules/blocks/filter-blocks/form/createFilterFormBlockSchema.ts +++ b/packages/core/client/src/modules/blocks/filter-blocks/form/createFilterFormBlockSchema.ts @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; export const createFilterFormBlockSchema = (options: { collectionName: string; diff --git a/packages/core/client/src/modules/blocks/filter-blocks/form/filterFormBlockSettings.ts b/packages/core/client/src/modules/blocks/filter-blocks/form/filterFormBlockSettings.ts index 46761790e..aec0b8931 100644 --- a/packages/core/client/src/modules/blocks/filter-blocks/form/filterFormBlockSettings.ts +++ b/packages/core/client/src/modules/blocks/filter-blocks/form/filterFormBlockSettings.ts @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { useTranslation } from 'react-i18next'; import { SchemaSettings } from '../../../../application/schema-settings/SchemaSettings'; import { useCollection_deprecated } from '../../../../collection-manager'; diff --git a/packages/core/client/src/modules/blocks/filter-blocks/form/filterFormItemFieldSettings.ts b/packages/core/client/src/modules/blocks/filter-blocks/form/filterFormItemFieldSettings.ts index 1bb204988..84a20c461 100644 --- a/packages/core/client/src/modules/blocks/filter-blocks/form/filterFormItemFieldSettings.ts +++ b/packages/core/client/src/modules/blocks/filter-blocks/form/filterFormItemFieldSettings.ts @@ -1,6 +1,6 @@ import { ArrayCollapse, FormLayout } from '@formily/antd-v5'; -import { Field } from '@formily/core'; -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import _ from 'lodash'; import { useTranslation } from 'react-i18next'; import { useApp } from '../../../../application'; diff --git a/packages/core/client/src/modules/blocks/other-blocks/markdown/markdownBlockSettings.ts b/packages/core/client/src/modules/blocks/other-blocks/markdown/markdownBlockSettings.ts index 477d00805..111f4087d 100644 --- a/packages/core/client/src/modules/blocks/other-blocks/markdown/markdownBlockSettings.ts +++ b/packages/core/client/src/modules/blocks/other-blocks/markdown/markdownBlockSettings.ts @@ -1,4 +1,4 @@ -import { useField } from '@formily/react'; +import { useField } from '@nocobase/schema'; import { useTranslation } from 'react-i18next'; import { SchemaSettings } from '../../../../application/schema-settings/SchemaSettings'; diff --git a/packages/core/client/src/modules/fields/component/CascadeSelect/cascadeSelectComponentFieldSettings.tsx b/packages/core/client/src/modules/fields/component/CascadeSelect/cascadeSelectComponentFieldSettings.tsx index 5d24fe83c..201e5de1d 100644 --- a/packages/core/client/src/modules/fields/component/CascadeSelect/cascadeSelectComponentFieldSettings.tsx +++ b/packages/core/client/src/modules/fields/component/CascadeSelect/cascadeSelectComponentFieldSettings.tsx @@ -1,5 +1,5 @@ -import { Field } from '@formily/core'; -import { useField, useFieldSchema } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { useTranslation } from 'react-i18next'; import { SchemaSettings } from '../../../../application/schema-settings/SchemaSettings'; import { useFieldComponentName } from '../../../../common/useFieldComponentName'; diff --git a/packages/core/client/src/modules/fields/component/Cascader/cascaderComponentFieldSettings.tsx b/packages/core/client/src/modules/fields/component/Cascader/cascaderComponentFieldSettings.tsx index 31933f39d..460127ff7 100644 --- a/packages/core/client/src/modules/fields/component/Cascader/cascaderComponentFieldSettings.tsx +++ b/packages/core/client/src/modules/fields/component/Cascader/cascaderComponentFieldSettings.tsx @@ -1,5 +1,5 @@ -import { Field } from '@formily/core'; -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import _ from 'lodash'; import React from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/modules/fields/component/DatePicker/datePickerComponentFieldSettings.tsx b/packages/core/client/src/modules/fields/component/DatePicker/datePickerComponentFieldSettings.tsx index 62488de03..8400564a7 100644 --- a/packages/core/client/src/modules/fields/component/DatePicker/datePickerComponentFieldSettings.tsx +++ b/packages/core/client/src/modules/fields/component/DatePicker/datePickerComponentFieldSettings.tsx @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { SchemaSettings } from '../../../../application/schema-settings/SchemaSettings'; import { SchemaSettingsDateFormat } from '../../../../schema-settings/SchemaSettingsDateFormat'; import { useColumnSchema } from '../../../../schema-component/antd/table-v2/Table.Column.Decorator'; diff --git a/packages/core/client/src/modules/fields/component/FileManager/fileManagerComponentFieldSettings.tsx b/packages/core/client/src/modules/fields/component/FileManager/fileManagerComponentFieldSettings.tsx index 1ee48795b..040a5ceff 100644 --- a/packages/core/client/src/modules/fields/component/FileManager/fileManagerComponentFieldSettings.tsx +++ b/packages/core/client/src/modules/fields/component/FileManager/fileManagerComponentFieldSettings.tsx @@ -1,5 +1,5 @@ -import { Field } from '@formily/core'; -import { useField, useFieldSchema, useForm } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { useField, useFieldSchema, useForm } from '@nocobase/schema'; import { useTranslation } from 'react-i18next'; import { SchemaSettings } from '../../../../application/schema-settings/SchemaSettings'; import { useFieldComponentName } from '../../../../common/useFieldComponentName'; diff --git a/packages/core/client/src/modules/fields/component/FileManager/uploadAttachmentComponentFieldSettings.tsx b/packages/core/client/src/modules/fields/component/FileManager/uploadAttachmentComponentFieldSettings.tsx index 25a6db2f8..ec4b239e3 100644 --- a/packages/core/client/src/modules/fields/component/FileManager/uploadAttachmentComponentFieldSettings.tsx +++ b/packages/core/client/src/modules/fields/component/FileManager/uploadAttachmentComponentFieldSettings.tsx @@ -1,5 +1,5 @@ -import { Field } from '@formily/core'; -import { useField, useFieldSchema } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { useTranslation } from 'react-i18next'; import { SchemaSettings } from '../../../../application/schema-settings/SchemaSettings'; import { useDesignable } from '../../../../schema-component'; diff --git a/packages/core/client/src/modules/fields/component/InputNumber/inputNumberComponentFieldSettings.tsx b/packages/core/client/src/modules/fields/component/InputNumber/inputNumberComponentFieldSettings.tsx index 0a890813d..1f84678ac 100644 --- a/packages/core/client/src/modules/fields/component/InputNumber/inputNumberComponentFieldSettings.tsx +++ b/packages/core/client/src/modules/fields/component/InputNumber/inputNumberComponentFieldSettings.tsx @@ -1,4 +1,4 @@ -import { useField, useFieldSchema, useForm } from '@formily/react'; +import { useField, useFieldSchema, useForm } from '@nocobase/schema'; import { SchemaSettings } from '../../../../application/schema-settings/SchemaSettings'; import { SchemaSettingsNumberFormat } from '../../../../schema-settings/SchemaSettingsNumberFormat'; import { useColumnSchema } from '../../../../schema-component/antd/table-v2/Table.Column.Decorator'; diff --git a/packages/core/client/src/modules/fields/component/Nester/subformComponentFieldSettings.tsx b/packages/core/client/src/modules/fields/component/Nester/subformComponentFieldSettings.tsx index a525d6ef8..c269458e1 100644 --- a/packages/core/client/src/modules/fields/component/Nester/subformComponentFieldSettings.tsx +++ b/packages/core/client/src/modules/fields/component/Nester/subformComponentFieldSettings.tsx @@ -1,5 +1,5 @@ -import { Field } from '@formily/core'; -import { useField, useFieldSchema } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { useTranslation } from 'react-i18next'; import { SchemaSettings } from '../../../../application/schema-settings/SchemaSettings'; import { useFieldComponentName } from '../../../../common/useFieldComponentName'; diff --git a/packages/core/client/src/modules/fields/component/Picker/recordPickerComponentFieldSettings.tsx b/packages/core/client/src/modules/fields/component/Picker/recordPickerComponentFieldSettings.tsx index e3ea77a52..c5896a9d9 100644 --- a/packages/core/client/src/modules/fields/component/Picker/recordPickerComponentFieldSettings.tsx +++ b/packages/core/client/src/modules/fields/component/Picker/recordPickerComponentFieldSettings.tsx @@ -1,5 +1,5 @@ -import { Field } from '@formily/core'; -import { useField, useFieldSchema } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { useTranslation } from 'react-i18next'; import { SchemaSettings } from '../../../../application/schema-settings/SchemaSettings'; import { useFieldComponentName } from '../../../../common/useFieldComponentName'; diff --git a/packages/core/client/src/modules/fields/component/PopoverNester/subformPopoverComponentFieldSettings.tsx b/packages/core/client/src/modules/fields/component/PopoverNester/subformPopoverComponentFieldSettings.tsx index 725c76b72..e7af03137 100644 --- a/packages/core/client/src/modules/fields/component/PopoverNester/subformPopoverComponentFieldSettings.tsx +++ b/packages/core/client/src/modules/fields/component/PopoverNester/subformPopoverComponentFieldSettings.tsx @@ -1,5 +1,5 @@ -import { Field } from '@formily/core'; -import { useField, useFieldSchema } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { useTranslation } from 'react-i18next'; import { SchemaSettings } from '../../../../application/schema-settings/SchemaSettings'; import { useFieldComponentName } from '../../../../common/useFieldComponentName'; diff --git a/packages/core/client/src/modules/fields/component/Select/selectComponentFieldSettings.tsx b/packages/core/client/src/modules/fields/component/Select/selectComponentFieldSettings.tsx index 5c4c8f860..289c344ab 100644 --- a/packages/core/client/src/modules/fields/component/Select/selectComponentFieldSettings.tsx +++ b/packages/core/client/src/modules/fields/component/Select/selectComponentFieldSettings.tsx @@ -1,5 +1,5 @@ -import { Field } from '@formily/core'; -import { useField, useFieldSchema } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { useField, useFieldSchema } from '@nocobase/schema'; import _ from 'lodash'; import React from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/modules/fields/component/SubTable/subTablePopoverComponentFieldSettings.tsx b/packages/core/client/src/modules/fields/component/SubTable/subTablePopoverComponentFieldSettings.tsx index 50ab3ebf6..b3346d668 100644 --- a/packages/core/client/src/modules/fields/component/SubTable/subTablePopoverComponentFieldSettings.tsx +++ b/packages/core/client/src/modules/fields/component/SubTable/subTablePopoverComponentFieldSettings.tsx @@ -1,5 +1,5 @@ -import { Field } from '@formily/core'; -import { useField, useFieldSchema } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { useTranslation } from 'react-i18next'; import { SchemaSettings } from '../../../../application/schema-settings/SchemaSettings'; import { useFieldComponentName } from '../../../../common/useFieldComponentName'; diff --git a/packages/core/client/src/modules/fields/component/Tag/tagComponentFieldSettings.tsx b/packages/core/client/src/modules/fields/component/Tag/tagComponentFieldSettings.tsx index 6d5d9c69f..f70d564db 100644 --- a/packages/core/client/src/modules/fields/component/Tag/tagComponentFieldSettings.tsx +++ b/packages/core/client/src/modules/fields/component/Tag/tagComponentFieldSettings.tsx @@ -1,5 +1,5 @@ -import { Field } from '@formily/core'; -import { useField, useFieldSchema } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { useTranslation } from 'react-i18next'; import { SchemaSettings } from '../../../../application/schema-settings/SchemaSettings'; import { useFieldComponentName } from '../../../../common/useFieldComponentName'; diff --git a/packages/core/client/src/modules/fields/component/UnixTimestamp/unixTimestampComponentFieldSettings.tsx b/packages/core/client/src/modules/fields/component/UnixTimestamp/unixTimestampComponentFieldSettings.tsx index 5bc587c9d..04b34c6a8 100644 --- a/packages/core/client/src/modules/fields/component/UnixTimestamp/unixTimestampComponentFieldSettings.tsx +++ b/packages/core/client/src/modules/fields/component/UnixTimestamp/unixTimestampComponentFieldSettings.tsx @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { SchemaSettings } from '../../../../application/schema-settings/SchemaSettings'; import { SchemaSettingsDateFormat } from '../../../../schema-settings/SchemaSettingsDateFormat'; import { useColumnSchema } from '../../../../schema-component/antd/table-v2/Table.Column.Decorator'; diff --git a/packages/core/client/src/modules/fields/initializer/CollectionFieldInitializer.tsx b/packages/core/client/src/modules/fields/initializer/CollectionFieldInitializer.tsx index 15316f56d..f8570a660 100644 --- a/packages/core/client/src/modules/fields/initializer/CollectionFieldInitializer.tsx +++ b/packages/core/client/src/modules/fields/initializer/CollectionFieldInitializer.tsx @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import React from 'react'; import { InitializerWithSwitch } from '../../../schema-initializer/items/InitializerWithSwitch'; diff --git a/packages/core/client/src/modules/fields/initializer/TableCollectionFieldInitializer.tsx b/packages/core/client/src/modules/fields/initializer/TableCollectionFieldInitializer.tsx index a4886d380..e2265e8a4 100644 --- a/packages/core/client/src/modules/fields/initializer/TableCollectionFieldInitializer.tsx +++ b/packages/core/client/src/modules/fields/initializer/TableCollectionFieldInitializer.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { InitializerWithSwitch } from '../../../schema-initializer/items/InitializerWithSwitch'; import { useSchemaInitializerItem } from '../../../application'; diff --git a/packages/core/client/src/modules/menu/GroupItem.tsx b/packages/core/client/src/modules/menu/GroupItem.tsx index 98775e850..103aadfb1 100644 --- a/packages/core/client/src/modules/menu/GroupItem.tsx +++ b/packages/core/client/src/modules/menu/GroupItem.tsx @@ -1,5 +1,5 @@ import { FormLayout } from '@formily/antd-v5'; -import { SchemaOptionsContext } from '@formily/react'; +import { SchemaOptionsContext } from '@nocobase/schema'; import React, { useCallback, useContext } from 'react'; import { useTranslation } from 'react-i18next'; import { FormDialog, SchemaComponent, SchemaComponentOptions } from '../../schema-component'; diff --git a/packages/core/client/src/modules/menu/LinkMenuItem.tsx b/packages/core/client/src/modules/menu/LinkMenuItem.tsx index b9fc2a707..6f888193b 100644 --- a/packages/core/client/src/modules/menu/LinkMenuItem.tsx +++ b/packages/core/client/src/modules/menu/LinkMenuItem.tsx @@ -1,5 +1,5 @@ import { FormLayout } from '@formily/antd-v5'; -import { SchemaOptionsContext } from '@formily/react'; +import { SchemaOptionsContext } from '@nocobase/schema'; import React, { useCallback, useContext } from 'react'; import { useTranslation } from 'react-i18next'; import { FormDialog, SchemaComponent, SchemaComponentOptions } from '../../schema-component'; diff --git a/packages/core/client/src/modules/menu/PageMenuItem.tsx b/packages/core/client/src/modules/menu/PageMenuItem.tsx index 494bfcd7b..c63a034dc 100644 --- a/packages/core/client/src/modules/menu/PageMenuItem.tsx +++ b/packages/core/client/src/modules/menu/PageMenuItem.tsx @@ -1,6 +1,6 @@ import { FormLayout } from '@formily/antd-v5'; -import { SchemaOptionsContext } from '@formily/react'; -import { uid } from '@formily/shared'; +import { SchemaOptionsContext } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import React, { useCallback, useContext } from 'react'; import { useTranslation } from 'react-i18next'; import { SchemaInitializerItem, useSchemaInitializer } from '../../application'; diff --git a/packages/core/client/src/nocobase-buildin-plugin/index.tsx b/packages/core/client/src/nocobase-buildin-plugin/index.tsx index 38f533561..957e33b62 100644 --- a/packages/core/client/src/nocobase-buildin-plugin/index.tsx +++ b/packages/core/client/src/nocobase-buildin-plugin/index.tsx @@ -1,6 +1,6 @@ import { DisconnectOutlined, LoadingOutlined } from '@ant-design/icons'; import { css } from '@emotion/css'; -import { observer } from '@formily/reactive-react'; +import { observer } from '@nocobase/schema'; import { getSubAppName } from '@nocobase/sdk'; import { Button, Modal, Result, Spin } from 'antd'; import React, { FC } from 'react'; diff --git a/packages/core/client/src/nocobase-buildin-plugin/plugins/LocalePlugin.ts b/packages/core/client/src/nocobase-buildin-plugin/plugins/LocalePlugin.ts index c09feabe5..2c276a4ba 100644 --- a/packages/core/client/src/nocobase-buildin-plugin/plugins/LocalePlugin.ts +++ b/packages/core/client/src/nocobase-buildin-plugin/plugins/LocalePlugin.ts @@ -1,4 +1,4 @@ -import { setValidateLanguage } from '@formily/validator'; +import { setValidateLanguage } from '@nocobase/schema'; import { App, ConfigProvider } from 'antd'; import dayjs from 'dayjs'; import { loadConstrueLocale } from '../../antd-config-provider/loadConstrueLocale'; diff --git a/packages/core/client/src/plugin-manager/PinnedPluginListProvider.tsx b/packages/core/client/src/plugin-manager/PinnedPluginListProvider.tsx index 8269568d4..2737a3d28 100644 --- a/packages/core/client/src/plugin-manager/PinnedPluginListProvider.tsx +++ b/packages/core/client/src/plugin-manager/PinnedPluginListProvider.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/css'; -import { SchemaOptionsContext } from '@formily/react'; +import { SchemaOptionsContext } from '@nocobase/schema'; import { get } from 'lodash'; import React, { useContext } from 'react'; import { useACLRoleContext } from '../acl/ACLProvider'; diff --git a/packages/core/client/src/pm/PluginForm/form/PluginNpmForm.tsx b/packages/core/client/src/pm/PluginForm/form/PluginNpmForm.tsx index dd136887f..e04f1bb8a 100644 --- a/packages/core/client/src/pm/PluginForm/form/PluginNpmForm.tsx +++ b/packages/core/client/src/pm/PluginForm/form/PluginNpmForm.tsx @@ -1,6 +1,6 @@ -import { ISchema } from '@formily/json-schema'; -import { useForm } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { useForm } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { App } from 'antd'; import React, { FC, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/pm/PluginForm/form/PluginUploadForm.tsx b/packages/core/client/src/pm/PluginForm/form/PluginUploadForm.tsx index 75822eeb8..c486b2fb5 100644 --- a/packages/core/client/src/pm/PluginForm/form/PluginUploadForm.tsx +++ b/packages/core/client/src/pm/PluginForm/form/PluginUploadForm.tsx @@ -1,6 +1,6 @@ -import { ISchema } from '@formily/json-schema'; -import { useForm } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { useForm } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { App } from 'antd'; import type { RcFile } from 'antd/es/upload'; import React, { FC, useMemo } from 'react'; diff --git a/packages/core/client/src/pm/PluginForm/form/PluginUrlForm.tsx b/packages/core/client/src/pm/PluginForm/form/PluginUrlForm.tsx index 5d1cd8c1c..0a00697df 100644 --- a/packages/core/client/src/pm/PluginForm/form/PluginUrlForm.tsx +++ b/packages/core/client/src/pm/PluginForm/form/PluginUrlForm.tsx @@ -1,6 +1,6 @@ -import { ISchema } from '@formily/json-schema'; -import { useForm } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { useForm } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { App } from 'antd'; import React, { FC, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/schema-component/antd/__builtins__/portal.tsx b/packages/core/client/src/schema-component/antd/__builtins__/portal.tsx index fb060dcbd..e4c307267 100644 --- a/packages/core/client/src/schema-component/antd/__builtins__/portal.tsx +++ b/packages/core/client/src/schema-component/antd/__builtins__/portal.tsx @@ -1,5 +1,5 @@ -import { Observer, ReactFC } from '@formily/react'; -import { observable } from '@formily/reactive'; +import { Observer, ReactFC } from '@nocobase/schema'; +import { observable } from '@nocobase/schema'; import React, { Fragment } from 'react'; import { createPortal } from 'react-dom'; import { render as reactRender, unmount as reactUnmount } from './render'; diff --git a/packages/core/client/src/schema-component/antd/__builtins__/style.ts b/packages/core/client/src/schema-component/antd/__builtins__/style.ts index bbe439102..bfd7dd015 100644 --- a/packages/core/client/src/schema-component/antd/__builtins__/style.ts +++ b/packages/core/client/src/schema-component/antd/__builtins__/style.ts @@ -1,6 +1,6 @@ import type { CSSInterpolation, CSSObject } from '@ant-design/cssinjs'; import { useStyleRegister } from '@ant-design/cssinjs'; -import { merge } from '@formily/shared'; +import { merge } from '@nocobase/schema'; import type { ComponentTokenMap, GlobalToken } from 'antd/es/theme/interface'; import { CustomToken } from '../../../global-theme'; import { useConfig, usePrefixCls, useToken } from './hooks'; diff --git a/packages/core/client/src/schema-component/antd/action/Action.Container.tsx b/packages/core/client/src/schema-component/antd/action/Action.Container.tsx index 3671855c9..bda253268 100644 --- a/packages/core/client/src/schema-component/antd/action/Action.Container.tsx +++ b/packages/core/client/src/schema-component/antd/action/Action.Container.tsx @@ -1,4 +1,4 @@ -import { observer, RecursionField, useField, useFieldSchema } from '@formily/react'; +import { observer, RecursionField, useField, useFieldSchema } from '@nocobase/schema'; import React from 'react'; import { useActionContext } from '.'; import { ActionDrawer } from './Action.Drawer'; diff --git a/packages/core/client/src/schema-component/antd/action/Action.Designer.tsx b/packages/core/client/src/schema-component/antd/action/Action.Designer.tsx index 1de66c99e..365f307ef 100644 --- a/packages/core/client/src/schema-component/antd/action/Action.Designer.tsx +++ b/packages/core/client/src/schema-component/antd/action/Action.Designer.tsx @@ -1,7 +1,7 @@ import { ArrayTable } from '@formily/antd-v5'; -import { Field, onFieldValueChange } from '@formily/core'; -import { ISchema, useField, useFieldSchema, useForm, useFormEffects } from '@formily/react'; -import { isValid, uid } from '@formily/shared'; +import { Field, onFieldValueChange } from '@nocobase/schema'; +import { ISchema, useField, useFieldSchema, useForm, useFormEffects } from '@nocobase/schema'; +import { isValid, uid } from '@nocobase/schema'; import { Alert, Flex, ModalProps, Tag } from 'antd'; import React, { useCallback, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/schema-component/antd/action/Action.Drawer.tsx b/packages/core/client/src/schema-component/antd/action/Action.Drawer.tsx index 0dbb6a04c..aeb3d830b 100644 --- a/packages/core/client/src/schema-component/antd/action/Action.Drawer.tsx +++ b/packages/core/client/src/schema-component/antd/action/Action.Drawer.tsx @@ -1,4 +1,4 @@ -import { observer, RecursionField, useField, useFieldSchema } from '@formily/react'; +import { observer, RecursionField, useField, useFieldSchema } from '@nocobase/schema'; import { Drawer } from 'antd'; import classNames from 'classnames'; import React from 'react'; diff --git a/packages/core/client/src/schema-component/antd/action/Action.Link.tsx b/packages/core/client/src/schema-component/antd/action/Action.Link.tsx index 84a9253d9..09560aadb 100644 --- a/packages/core/client/src/schema-component/antd/action/Action.Link.tsx +++ b/packages/core/client/src/schema-component/antd/action/Action.Link.tsx @@ -1,4 +1,4 @@ -import { observer } from '@formily/react'; +import { observer } from '@nocobase/schema'; import React from 'react'; import classnames from 'classnames'; import Action from './Action'; diff --git a/packages/core/client/src/schema-component/antd/action/Action.Modal.tsx b/packages/core/client/src/schema-component/antd/action/Action.Modal.tsx index d67444c85..6110fcfa2 100644 --- a/packages/core/client/src/schema-component/antd/action/Action.Modal.tsx +++ b/packages/core/client/src/schema-component/antd/action/Action.Modal.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/css'; -import { observer, RecursionField, useField, useFieldSchema } from '@formily/react'; +import { observer, RecursionField, useField, useFieldSchema } from '@nocobase/schema'; import { Modal, ModalProps } from 'antd'; import classNames from 'classnames'; import React from 'react'; diff --git a/packages/core/client/src/schema-component/antd/action/Action.Page.tsx b/packages/core/client/src/schema-component/antd/action/Action.Page.tsx index 55d9d9300..a8885a8cf 100644 --- a/packages/core/client/src/schema-component/antd/action/Action.Page.tsx +++ b/packages/core/client/src/schema-component/antd/action/Action.Page.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/css'; -import { observer, RecursionField, SchemaExpressionScopeContext, useField, useFieldSchema } from '@formily/react'; +import { observer, RecursionField, SchemaExpressionScopeContext, useField, useFieldSchema } from '@nocobase/schema'; import React, { useContext } from 'react'; import { createPortal } from 'react-dom'; import { useActionContext } from '.'; diff --git a/packages/core/client/src/schema-component/antd/action/Action.tsx b/packages/core/client/src/schema-component/antd/action/Action.tsx index 61979bdbc..74521f8f8 100644 --- a/packages/core/client/src/schema-component/antd/action/Action.tsx +++ b/packages/core/client/src/schema-component/antd/action/Action.tsx @@ -1,4 +1,4 @@ -import { observer, RecursionField, useField, useFieldSchema, useForm } from '@formily/react'; +import { observer, RecursionField, useField, useFieldSchema, useForm } from '@nocobase/schema'; import { isPortalInBody } from '@nocobase/utils/client'; import { App, Button } from 'antd'; import classnames from 'classnames'; diff --git a/packages/core/client/src/schema-component/antd/action/ActionBar.tsx b/packages/core/client/src/schema-component/antd/action/ActionBar.tsx index bd6da7fee..330cbe33c 100644 --- a/packages/core/client/src/schema-component/antd/action/ActionBar.tsx +++ b/packages/core/client/src/schema-component/antd/action/ActionBar.tsx @@ -1,5 +1,5 @@ import { cx } from '@emotion/css'; -import { RecursionField, observer, useFieldSchema } from '@formily/react'; +import { RecursionField, observer, useFieldSchema } from '@nocobase/schema'; import { Space } from 'antd'; import React, { CSSProperties, useContext } from 'react'; import { createPortal } from 'react-dom'; diff --git a/packages/core/client/src/schema-component/antd/action/context.tsx b/packages/core/client/src/schema-component/antd/action/context.tsx index fc29d737d..024a660f3 100644 --- a/packages/core/client/src/schema-component/antd/action/context.tsx +++ b/packages/core/client/src/schema-component/antd/action/context.tsx @@ -1,4 +1,4 @@ -import { Schema } from '@formily/react'; +import { Schema } from '@nocobase/schema'; import { DrawerProps, ModalProps } from 'antd'; import React, { createContext } from 'react'; import { useActionContext } from './hooks'; diff --git a/packages/core/client/src/schema-component/antd/action/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/action/demos/demo1.tsx index 982c057dc..370103288 100644 --- a/packages/core/client/src/schema-component/antd/action/demos/demo1.tsx +++ b/packages/core/client/src/schema-component/antd/action/demos/demo1.tsx @@ -1,4 +1,4 @@ -import { ISchema, observer, useForm } from '@formily/react'; +import { ISchema, observer, useForm } from '@nocobase/schema'; import { Action, Form, diff --git a/packages/core/client/src/schema-component/antd/action/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/action/demos/demo2.tsx index af86cb78f..c348b55cf 100644 --- a/packages/core/client/src/schema-component/antd/action/demos/demo2.tsx +++ b/packages/core/client/src/schema-component/antd/action/demos/demo2.tsx @@ -1,4 +1,4 @@ -import { ISchema, observer, useForm } from '@formily/react'; +import { ISchema, observer, useForm } from '@nocobase/schema'; import { Action, ActionContextProvider, diff --git a/packages/core/client/src/schema-component/antd/action/demos/demo3.tsx b/packages/core/client/src/schema-component/antd/action/demos/demo3.tsx index 04cae185a..25b78dd2c 100644 --- a/packages/core/client/src/schema-component/antd/action/demos/demo3.tsx +++ b/packages/core/client/src/schema-component/antd/action/demos/demo3.tsx @@ -1,5 +1,5 @@ -import { Field } from '@formily/core'; -import { ISchema, observer, useField, useFieldSchema } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { ISchema, observer, useField, useFieldSchema } from '@nocobase/schema'; import { Action, SchemaComponent, SchemaComponentProvider, useActionContext } from '@nocobase/client'; import { Radio } from 'antd'; import React, { useRef } from 'react'; diff --git a/packages/core/client/src/schema-component/antd/action/demos/demo4.tsx b/packages/core/client/src/schema-component/antd/action/demos/demo4.tsx index ea9a5a5cd..05d897ced 100644 --- a/packages/core/client/src/schema-component/antd/action/demos/demo4.tsx +++ b/packages/core/client/src/schema-component/antd/action/demos/demo4.tsx @@ -1,4 +1,4 @@ -import { ISchema, observer, useForm } from '@formily/react'; +import { ISchema, observer, useForm } from '@nocobase/schema'; import { Action, Form, diff --git a/packages/core/client/src/schema-component/antd/action/demos/demo5.tsx b/packages/core/client/src/schema-component/antd/action/demos/demo5.tsx index 9a3a708f2..aebf5a9ba 100644 --- a/packages/core/client/src/schema-component/antd/action/demos/demo5.tsx +++ b/packages/core/client/src/schema-component/antd/action/demos/demo5.tsx @@ -10,8 +10,8 @@ import { NumberPicker, Submit, } from '@formily/antd-v5'; -import { Field, createForm, onFieldValueChange } from '@formily/core'; -import { connect, createSchemaField, observer, useField, useForm, useFormEffects } from '@formily/react'; +import { Field, createForm, onFieldValueChange } from '@nocobase/schema'; +import { connect, createSchemaField, observer, useField, useForm, useFormEffects } from '@nocobase/schema'; import { Select } from 'antd'; import React from 'react'; diff --git a/packages/core/client/src/schema-component/antd/action/demos/demo6.tsx b/packages/core/client/src/schema-component/antd/action/demos/demo6.tsx index 9f7fc3146..a52b3f1a9 100644 --- a/packages/core/client/src/schema-component/antd/action/demos/demo6.tsx +++ b/packages/core/client/src/schema-component/antd/action/demos/demo6.tsx @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { Action, ActionBar, diff --git a/packages/core/client/src/schema-component/antd/action/hooks.ts b/packages/core/client/src/schema-component/antd/action/hooks.ts index bc0a34f59..87316c0fd 100644 --- a/packages/core/client/src/schema-component/antd/action/hooks.ts +++ b/packages/core/client/src/schema-component/antd/action/hooks.ts @@ -1,4 +1,4 @@ -import { useFieldSchema, useForm } from '@formily/react'; +import { useFieldSchema, useForm } from '@nocobase/schema'; import { App } from 'antd'; import { useContext } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/schema-component/antd/action/hooks/useGetAriaLabelOfAction.ts b/packages/core/client/src/schema-component/antd/action/hooks/useGetAriaLabelOfAction.ts index b387bf7ce..dd755f2fa 100644 --- a/packages/core/client/src/schema-component/antd/action/hooks/useGetAriaLabelOfAction.ts +++ b/packages/core/client/src/schema-component/antd/action/hooks/useGetAriaLabelOfAction.ts @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { useCallback } from 'react'; import { useBlockContext } from '../../../../block-provider/BlockProvider'; import { useCollection_deprecated } from '../../../../collection-manager'; diff --git a/packages/core/client/src/schema-component/antd/action/hooks/useGetAriaLabelOfDrawer.ts b/packages/core/client/src/schema-component/antd/action/hooks/useGetAriaLabelOfDrawer.ts index e8aa649de..c0354553f 100644 --- a/packages/core/client/src/schema-component/antd/action/hooks/useGetAriaLabelOfDrawer.ts +++ b/packages/core/client/src/schema-component/antd/action/hooks/useGetAriaLabelOfDrawer.ts @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { useCallback } from 'react'; import { useCollection_deprecated } from '../../../../collection-manager'; import { useCompile } from '../../../hooks'; diff --git a/packages/core/client/src/schema-component/antd/action/hooks/useGetAriaLabelOfModal.ts b/packages/core/client/src/schema-component/antd/action/hooks/useGetAriaLabelOfModal.ts index 4b3a10fdd..5d3893d71 100644 --- a/packages/core/client/src/schema-component/antd/action/hooks/useGetAriaLabelOfModal.ts +++ b/packages/core/client/src/schema-component/antd/action/hooks/useGetAriaLabelOfModal.ts @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { useCallback } from 'react'; import { useCollection_deprecated } from '../../../../collection-manager'; import { useCompile } from '../../../hooks'; diff --git a/packages/core/client/src/schema-component/antd/action/hooks/useGetAriaLabelOfPopover.ts b/packages/core/client/src/schema-component/antd/action/hooks/useGetAriaLabelOfPopover.ts index 722b4916f..f977e521e 100644 --- a/packages/core/client/src/schema-component/antd/action/hooks/useGetAriaLabelOfPopover.ts +++ b/packages/core/client/src/schema-component/antd/action/hooks/useGetAriaLabelOfPopover.ts @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { useCallback } from 'react'; import { useCollection_deprecated } from '../../../../collection-manager'; import { useCompile } from '../../../hooks'; diff --git a/packages/core/client/src/schema-component/antd/action/utils.ts b/packages/core/client/src/schema-component/antd/action/utils.ts index 50b348a81..3285aab24 100644 --- a/packages/core/client/src/schema-component/antd/action/utils.ts +++ b/packages/core/client/src/schema-component/antd/action/utils.ts @@ -1,4 +1,4 @@ -import type { ISchema } from '@formily/react'; +import type { ISchema } from '@nocobase/schema'; import { last } from 'lodash'; import { ActionType } from '../../../schema-settings/LinkageRules/type'; import { VariableOption, VariablesContextType } from '../../../variables/types'; diff --git a/packages/core/client/src/schema-component/antd/association-field/AssociationFieldProvider.tsx b/packages/core/client/src/schema-component/antd/association-field/AssociationFieldProvider.tsx index ce683b271..34f0cd534 100644 --- a/packages/core/client/src/schema-component/antd/association-field/AssociationFieldProvider.tsx +++ b/packages/core/client/src/schema-component/antd/association-field/AssociationFieldProvider.tsx @@ -1,5 +1,5 @@ -import { Field } from '@formily/core'; -import { observer, useField, useFieldSchema } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { observer, useField, useFieldSchema } from '@nocobase/schema'; import React, { useEffect, useMemo, useState } from 'react'; import { useCollectionManager_deprecated } from '../../../collection-manager'; import { AssociationFieldContext } from './context'; diff --git a/packages/core/client/src/schema-component/antd/association-field/AssociationSelect.tsx b/packages/core/client/src/schema-component/antd/association-field/AssociationSelect.tsx index 54fdb617a..37b6a91ea 100644 --- a/packages/core/client/src/schema-component/antd/association-field/AssociationSelect.tsx +++ b/packages/core/client/src/schema-component/antd/association-field/AssociationSelect.tsx @@ -1,7 +1,7 @@ import { LoadingOutlined, PlusOutlined } from '@ant-design/icons'; -import { onFieldChange } from '@formily/core'; -import { RecursionField, connect, mapProps, observer, useField, useFieldSchema, useForm } from '@formily/react'; -import { uid } from '@formily/shared'; +import { onFieldChange } from '@nocobase/schema'; +import { RecursionField, connect, mapProps, observer, useField, useFieldSchema, useForm } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { Space, message } from 'antd'; import { isFunction } from 'mathjs'; import React, { useEffect, useMemo, useState } from 'react'; diff --git a/packages/core/client/src/schema-component/antd/association-field/Editable.tsx b/packages/core/client/src/schema-component/antd/association-field/Editable.tsx index 8d838ad08..dc53961e5 100644 --- a/packages/core/client/src/schema-component/antd/association-field/Editable.tsx +++ b/packages/core/client/src/schema-component/antd/association-field/Editable.tsx @@ -1,5 +1,5 @@ -import { Field } from '@formily/core'; -import { observer, useField, useForm } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { observer, useField, useForm } from '@nocobase/schema'; import React from 'react'; import { SchemaComponentOptions } from '../../'; import { useAssociationCreateActionProps as useCAP } from '../../../block-provider/hooks'; diff --git a/packages/core/client/src/schema-component/antd/association-field/FileManager.tsx b/packages/core/client/src/schema-component/antd/association-field/FileManager.tsx index 7bf0ba43d..707b41c6e 100644 --- a/packages/core/client/src/schema-component/antd/association-field/FileManager.tsx +++ b/packages/core/client/src/schema-component/antd/association-field/FileManager.tsx @@ -1,4 +1,4 @@ -import { RecursionField, connect, useField, useFieldSchema } from '@formily/react'; +import { RecursionField, connect, useField, useFieldSchema } from '@nocobase/schema'; import { differenceBy, unionBy } from 'lodash'; import React, { useContext, useEffect, useState } from 'react'; import { diff --git a/packages/core/client/src/schema-component/antd/association-field/InternalCascadeSelect.tsx b/packages/core/client/src/schema-component/antd/association-field/InternalCascadeSelect.tsx index 96b8bb1b8..8f0f5ad93 100644 --- a/packages/core/client/src/schema-component/antd/association-field/InternalCascadeSelect.tsx +++ b/packages/core/client/src/schema-component/antd/association-field/InternalCascadeSelect.tsx @@ -1,7 +1,7 @@ import { ArrayItems, FormItem } from '@formily/antd-v5'; -import { createForm, onFormValuesChange } from '@formily/core'; -import { FormProvider, connect, createSchemaField, observer, useField, useFieldSchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { createForm, onFormValuesChange } from '@nocobase/schema'; +import { FormProvider, connect, createSchemaField, observer, useField, useFieldSchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { Select as AntdSelect, Input, Space, Spin, Tag } from 'antd'; import dayjs from 'dayjs'; import React, { useCallback, useEffect, useMemo, useState } from 'react'; diff --git a/packages/core/client/src/schema-component/antd/association-field/InternalCascader.tsx b/packages/core/client/src/schema-component/antd/association-field/InternalCascader.tsx index 4bb1ab11b..c163fc702 100644 --- a/packages/core/client/src/schema-component/antd/association-field/InternalCascader.tsx +++ b/packages/core/client/src/schema-component/antd/association-field/InternalCascader.tsx @@ -1,7 +1,7 @@ import { ArrayItems, FormItem } from '@formily/antd-v5'; -import { createForm, onFormValuesChange } from '@formily/core'; -import { FormProvider, connect, createSchemaField, observer, useField, useFieldSchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { createForm, onFormValuesChange } from '@nocobase/schema'; +import { FormProvider, connect, createSchemaField, observer, useField, useFieldSchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { Input, Space, Spin, Tag } from 'antd'; import dayjs from 'dayjs'; import React, { useEffect, useMemo, useState } from 'react'; diff --git a/packages/core/client/src/schema-component/antd/association-field/InternalDrawerSubTable.tsx b/packages/core/client/src/schema-component/antd/association-field/InternalDrawerSubTable.tsx index 19bc5e161..5c229a149 100644 --- a/packages/core/client/src/schema-component/antd/association-field/InternalDrawerSubTable.tsx +++ b/packages/core/client/src/schema-component/antd/association-field/InternalDrawerSubTable.tsx @@ -1,6 +1,6 @@ import { EditOutlined } from '@ant-design/icons'; import { css } from '@emotion/css'; -import { observer } from '@formily/react'; +import { observer } from '@nocobase/schema'; import React, { useContext, useRef, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { InternalSubTable } from './InternalSubTable'; diff --git a/packages/core/client/src/schema-component/antd/association-field/InternalNester.tsx b/packages/core/client/src/schema-component/antd/association-field/InternalNester.tsx index ec713c636..dba3280d6 100644 --- a/packages/core/client/src/schema-component/antd/association-field/InternalNester.tsx +++ b/packages/core/client/src/schema-component/antd/association-field/InternalNester.tsx @@ -1,6 +1,6 @@ import { css, cx } from '@emotion/css'; import { FormLayout } from '@formily/antd-v5'; -import { RecursionField, useField, useFieldSchema, observer } from '@formily/react'; +import { RecursionField, useField, useFieldSchema, observer } from '@nocobase/schema'; import React, { useEffect } from 'react'; import { CollectionProvider_deprecated } from '../../../collection-manager'; import { useAssociationFieldContext, useInsertSchema } from './hooks'; diff --git a/packages/core/client/src/schema-component/antd/association-field/InternalPicker.tsx b/packages/core/client/src/schema-component/antd/association-field/InternalPicker.tsx index 12a45d9ab..6b6f04aca 100644 --- a/packages/core/client/src/schema-component/antd/association-field/InternalPicker.tsx +++ b/packages/core/client/src/schema-component/antd/association-field/InternalPicker.tsx @@ -1,4 +1,4 @@ -import { observer, RecursionField, useField, useFieldSchema } from '@formily/react'; +import { observer, RecursionField, useField, useFieldSchema } from '@nocobase/schema'; import { Input, Select } from 'antd'; import { differenceBy, unionBy } from 'lodash'; import React, { useContext, useMemo, useState } from 'react'; diff --git a/packages/core/client/src/schema-component/antd/association-field/InternalPopoverNester.tsx b/packages/core/client/src/schema-component/antd/association-field/InternalPopoverNester.tsx index 7fb5135b9..4a882f821 100644 --- a/packages/core/client/src/schema-component/antd/association-field/InternalPopoverNester.tsx +++ b/packages/core/client/src/schema-component/antd/association-field/InternalPopoverNester.tsx @@ -1,6 +1,6 @@ import { EditOutlined } from '@ant-design/icons'; import { css } from '@emotion/css'; -import { observer, useFieldSchema } from '@formily/react'; +import { observer, useFieldSchema } from '@nocobase/schema'; import React, { useContext, useRef, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { ActionContext, ActionContextProvider } from '../action/context'; diff --git a/packages/core/client/src/schema-component/antd/association-field/InternalSubTable.tsx b/packages/core/client/src/schema-component/antd/association-field/InternalSubTable.tsx index 108866170..75c17da4d 100644 --- a/packages/core/client/src/schema-component/antd/association-field/InternalSubTable.tsx +++ b/packages/core/client/src/schema-component/antd/association-field/InternalSubTable.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/css'; import { FormLayout } from '@formily/antd-v5'; -import { RecursionField, SchemaOptionsContext, observer, useField, useFieldSchema } from '@formily/react'; +import { RecursionField, SchemaOptionsContext, observer, useField, useFieldSchema } from '@nocobase/schema'; import React, { useEffect } from 'react'; import { ACLCollectionProvider, useACLActionParamsContext } from '../../../acl'; import { CollectionProvider_deprecated } from '../../../collection-manager'; diff --git a/packages/core/client/src/schema-component/antd/association-field/InternalTag.tsx b/packages/core/client/src/schema-component/antd/association-field/InternalTag.tsx index 278713fac..102ee3f85 100644 --- a/packages/core/client/src/schema-component/antd/association-field/InternalTag.tsx +++ b/packages/core/client/src/schema-component/antd/association-field/InternalTag.tsx @@ -1,5 +1,5 @@ -import { observer, RecursionField, useField, useFieldSchema } from '@formily/react'; -import { toArr } from '@formily/shared'; +import { observer, RecursionField, useField, useFieldSchema } from '@nocobase/schema'; +import { toArr } from '@nocobase/schema'; import React, { Fragment, useRef, useState } from 'react'; import { useDesignable } from '../../'; import { BlockAssociationContext, WithoutTableFieldResource } from '../../../block-provider'; diff --git a/packages/core/client/src/schema-component/antd/association-field/InternalViewer.tsx b/packages/core/client/src/schema-component/antd/association-field/InternalViewer.tsx index f881453a4..48731235c 100644 --- a/packages/core/client/src/schema-component/antd/association-field/InternalViewer.tsx +++ b/packages/core/client/src/schema-component/antd/association-field/InternalViewer.tsx @@ -1,5 +1,5 @@ -import { observer, RecursionField, useField, useFieldSchema } from '@formily/react'; -import { toArr } from '@formily/shared'; +import { observer, RecursionField, useField, useFieldSchema } from '@nocobase/schema'; +import { toArr } from '@nocobase/schema'; import React, { Fragment, useRef, useState } from 'react'; import { useDesignable } from '../../'; import { BlockAssociationContext, WithoutTableFieldResource } from '../../../block-provider'; diff --git a/packages/core/client/src/schema-component/antd/association-field/Nester.tsx b/packages/core/client/src/schema-component/antd/association-field/Nester.tsx index 960c069d3..824e41fe5 100644 --- a/packages/core/client/src/schema-component/antd/association-field/Nester.tsx +++ b/packages/core/client/src/schema-component/antd/association-field/Nester.tsx @@ -1,10 +1,10 @@ import { CloseOutlined, PlusOutlined } from '@ant-design/icons'; import { css } from '@emotion/css'; -import { ArrayField } from '@formily/core'; -import { spliceArrayState } from '@formily/core/esm/shared/internals'; -import { RecursionField, observer, useFieldSchema } from '@formily/react'; -import { action } from '@formily/reactive'; -import { each } from '@formily/shared'; +import { ArrayField } from '@nocobase/schema'; +import { spliceArrayState } from '@nocobase/schema'; +import { RecursionField, observer, useFieldSchema } from '@nocobase/schema'; +import { action } from '@nocobase/schema'; +import { each } from '@nocobase/schema'; import { Button, Card, Divider, Tooltip } from 'antd'; import _ from 'lodash'; import React, { useCallback, useContext } from 'react'; diff --git a/packages/core/client/src/schema-component/antd/association-field/ReadPretty.tsx b/packages/core/client/src/schema-component/antd/association-field/ReadPretty.tsx index e6f12b642..5f026c3ff 100644 --- a/packages/core/client/src/schema-component/antd/association-field/ReadPretty.tsx +++ b/packages/core/client/src/schema-component/antd/association-field/ReadPretty.tsx @@ -1,4 +1,4 @@ -import { observer } from '@formily/react'; +import { observer } from '@nocobase/schema'; import React from 'react'; import { AssociationFieldProvider } from './AssociationFieldProvider'; import { FileManageReadPretty } from './FileManager'; diff --git a/packages/core/client/src/schema-component/antd/association-field/SubTable.tsx b/packages/core/client/src/schema-component/antd/association-field/SubTable.tsx index 14a860916..827d83b5b 100644 --- a/packages/core/client/src/schema-component/antd/association-field/SubTable.tsx +++ b/packages/core/client/src/schema-component/antd/association-field/SubTable.tsx @@ -1,9 +1,9 @@ import { css } from '@emotion/css'; -import { ArrayField } from '@formily/core'; -import { exchangeArrayState } from '@formily/core/esm/shared/internals'; -import { observer, RecursionField, useFieldSchema } from '@formily/react'; -import { action } from '@formily/reactive'; -import { isArr } from '@formily/shared'; +import { ArrayField } from '@nocobase/schema'; +import { exchangeArrayState } from '@nocobase/schema'; +import { observer, RecursionField, useFieldSchema } from '@nocobase/schema'; +import { action } from '@nocobase/schema'; +import { isArr } from '@nocobase/schema'; import { Button } from 'antd'; import { unionBy, uniqBy } from 'lodash'; import React, { useContext, useMemo, useState } from 'react'; diff --git a/packages/core/client/src/schema-component/antd/association-field/components/CreateRecordAction.tsx b/packages/core/client/src/schema-component/antd/association-field/components/CreateRecordAction.tsx index a5aa6f2ef..82e7fc77a 100644 --- a/packages/core/client/src/schema-component/antd/association-field/components/CreateRecordAction.tsx +++ b/packages/core/client/src/schema-component/antd/association-field/components/CreateRecordAction.tsx @@ -1,4 +1,4 @@ -import { RecursionField, observer, useField, useFieldSchema } from '@formily/react'; +import { RecursionField, observer, useField, useFieldSchema } from '@nocobase/schema'; import React, { useState } from 'react'; import { CollectionProvider_deprecated, useCollectionManager_deprecated } from '../../../../collection-manager'; import { CreateAction } from '../../../../schema-initializer/components'; diff --git a/packages/core/client/src/schema-component/antd/association-field/context.ts b/packages/core/client/src/schema-component/antd/association-field/context.ts index 6cdd03a17..fc7d4a37c 100644 --- a/packages/core/client/src/schema-component/antd/association-field/context.ts +++ b/packages/core/client/src/schema-component/antd/association-field/context.ts @@ -1,4 +1,4 @@ -import { GeneralField } from '@formily/core'; +import { GeneralField } from '@nocobase/schema'; import { createContext } from 'react'; export interface AssociationFieldContextProps { diff --git a/packages/core/client/src/schema-component/antd/association-field/hooks.ts b/packages/core/client/src/schema-component/antd/association-field/hooks.ts index cd15de8c7..03b800b98 100644 --- a/packages/core/client/src/schema-component/antd/association-field/hooks.ts +++ b/packages/core/client/src/schema-component/antd/association-field/hooks.ts @@ -1,6 +1,6 @@ -import { GeneralField } from '@formily/core'; -import { useField, useFieldSchema } from '@formily/react'; -import { reaction } from '@formily/reactive'; +import { GeneralField } from '@nocobase/schema'; +import { useField, useFieldSchema } from '@nocobase/schema'; +import { reaction } from '@nocobase/schema'; import { flatten, getValuesByPath } from '@nocobase/utils/client'; import _, { isString } from 'lodash'; import cloneDeep from 'lodash/cloneDeep'; diff --git a/packages/core/client/src/schema-component/antd/association-field/index.ts b/packages/core/client/src/schema-component/antd/association-field/index.ts index 11e667e34..c10bffffc 100644 --- a/packages/core/client/src/schema-component/antd/association-field/index.ts +++ b/packages/core/client/src/schema-component/antd/association-field/index.ts @@ -1,4 +1,4 @@ -import { connect, mapReadPretty } from '@formily/react'; +import { connect, mapReadPretty } from '@nocobase/schema'; import { Action } from '../action'; import { Editable } from './Editable'; import { InternalPicker } from './InternalPicker'; diff --git a/packages/core/client/src/schema-component/antd/association-field/util.ts b/packages/core/client/src/schema-component/antd/association-field/util.ts index a5dc2ec1a..d01da97d9 100644 --- a/packages/core/client/src/schema-component/antd/association-field/util.ts +++ b/packages/core/client/src/schema-component/antd/association-field/util.ts @@ -1,11 +1,11 @@ -import { ISchema, Schema } from '@formily/react'; -import { isArr } from '@formily/shared'; +import { ISchema, Schema } from '@nocobase/schema'; +import { isArr } from '@nocobase/schema'; import { getDefaultFormat, str2moment } from '@nocobase/utils/client'; import { Tag } from 'antd'; import dayjs from 'dayjs'; import React from 'react'; import { CollectionFieldOptions_deprecated, useCollectionManager_deprecated } from '../../../collection-manager'; -import { Field } from '@formily/core'; +import { Field } from '@nocobase/schema'; export const useLabelUiSchemaV2 = () => { const { getCollectionJoinField } = useCollectionManager_deprecated(); diff --git a/packages/core/client/src/schema-component/antd/association-filter/ActionBarAssociationFilterAction.tsx b/packages/core/client/src/schema-component/antd/association-filter/ActionBarAssociationFilterAction.tsx index 29443a477..f90d7b617 100644 --- a/packages/core/client/src/schema-component/antd/association-filter/ActionBarAssociationFilterAction.tsx +++ b/packages/core/client/src/schema-component/antd/association-filter/ActionBarAssociationFilterAction.tsx @@ -1,4 +1,4 @@ -import { Schema, useFieldSchema } from '@formily/react'; +import { Schema, useFieldSchema } from '@nocobase/schema'; import React, { useContext } from 'react'; import { useTranslation } from 'react-i18next'; import { SchemaComponentContext, createDesignable } from '../..'; diff --git a/packages/core/client/src/schema-component/antd/association-filter/AssociationFilter.BlockDesigner.tsx b/packages/core/client/src/schema-component/antd/association-filter/AssociationFilter.BlockDesigner.tsx index 2bf44589e..e83dde074 100644 --- a/packages/core/client/src/schema-component/antd/association-filter/AssociationFilter.BlockDesigner.tsx +++ b/packages/core/client/src/schema-component/antd/association-filter/AssociationFilter.BlockDesigner.tsx @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import React from 'react'; import { useTranslation } from 'react-i18next'; import { useCollection_deprecated } from '../../../collection-manager'; diff --git a/packages/core/client/src/schema-component/antd/association-filter/AssociationFilter.Item.Designer.tsx b/packages/core/client/src/schema-component/antd/association-filter/AssociationFilter.Item.Designer.tsx index d43290533..2bf5ef9a2 100644 --- a/packages/core/client/src/schema-component/antd/association-filter/AssociationFilter.Item.Designer.tsx +++ b/packages/core/client/src/schema-component/antd/association-filter/AssociationFilter.Item.Designer.tsx @@ -1,4 +1,4 @@ -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import _ from 'lodash'; import React from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/schema-component/antd/association-filter/AssociationFilter.Item.tsx b/packages/core/client/src/schema-component/antd/association-filter/AssociationFilter.Item.tsx index 22b07a13d..0f3017828 100644 --- a/packages/core/client/src/schema-component/antd/association-filter/AssociationFilter.Item.tsx +++ b/packages/core/client/src/schema-component/antd/association-filter/AssociationFilter.Item.tsx @@ -1,5 +1,5 @@ import { CloseOutlined, SearchOutlined } from '@ant-design/icons'; -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { Col, Collapse, Input, Row, Tree } from 'antd'; import cls from 'classnames'; import React, { ChangeEvent, MouseEvent, useMemo, useState } from 'react'; diff --git a/packages/core/client/src/schema-component/antd/association-filter/AssociationFilter.tsx b/packages/core/client/src/schema-component/antd/association-filter/AssociationFilter.tsx index ce5551cc4..ff97746a8 100644 --- a/packages/core/client/src/schema-component/antd/association-filter/AssociationFilter.tsx +++ b/packages/core/client/src/schema-component/antd/association-filter/AssociationFilter.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/css'; -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import cls from 'classnames'; import React from 'react'; import { useCollection_deprecated } from '../../../collection-manager'; diff --git a/packages/core/client/src/schema-component/antd/association-filter/AssociationFilterDesignerDelete.tsx b/packages/core/client/src/schema-component/antd/association-filter/AssociationFilterDesignerDelete.tsx index 09ec5860c..aa92e0e2f 100644 --- a/packages/core/client/src/schema-component/antd/association-filter/AssociationFilterDesignerDelete.tsx +++ b/packages/core/client/src/schema-component/antd/association-filter/AssociationFilterDesignerDelete.tsx @@ -1,5 +1,5 @@ import React, { useContext } from 'react'; -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { createDesignable, SchemaComponentContext } from '../..'; import { useAPIClient } from '../../../api-client'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/schema-component/antd/association-filter/AssociationFilterDesignerDisplayField.tsx b/packages/core/client/src/schema-component/antd/association-filter/AssociationFilterDesignerDisplayField.tsx index 7bc870509..3f988d035 100644 --- a/packages/core/client/src/schema-component/antd/association-filter/AssociationFilterDesignerDisplayField.tsx +++ b/packages/core/client/src/schema-component/antd/association-filter/AssociationFilterDesignerDisplayField.tsx @@ -1,4 +1,4 @@ -import { merge } from '@formily/shared'; +import { merge } from '@nocobase/schema'; import React from 'react'; import { useCurrentSchema } from '../../../schema-initializer/utils'; diff --git a/packages/core/client/src/schema-component/antd/association-select/AssociationSelect.tsx b/packages/core/client/src/schema-component/antd/association-select/AssociationSelect.tsx index 238e83989..15ee704c0 100644 --- a/packages/core/client/src/schema-component/antd/association-select/AssociationSelect.tsx +++ b/packages/core/client/src/schema-component/antd/association-select/AssociationSelect.tsx @@ -1,8 +1,8 @@ import { LoadingOutlined } from '@ant-design/icons'; import { ArrayCollapse, ArrayItems, FormLayout } from '@formily/antd-v5'; -import { Field } from '@formily/core'; -import { ISchema, connect, mapProps, mapReadPretty, useField, useFieldSchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { Field } from '@nocobase/schema'; +import { ISchema, connect, mapProps, mapReadPretty, useField, useFieldSchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import _ from 'lodash'; import React, { useCallback, useEffect, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/schema-component/antd/association-select/ReadPretty.tsx b/packages/core/client/src/schema-component/antd/association-select/ReadPretty.tsx index 66cbdd103..3e5ca61fe 100644 --- a/packages/core/client/src/schema-component/antd/association-select/ReadPretty.tsx +++ b/packages/core/client/src/schema-component/antd/association-select/ReadPretty.tsx @@ -1,4 +1,4 @@ -import { observer } from '@formily/react'; +import { observer } from '@nocobase/schema'; import React from 'react'; import { useFieldTitle } from '../../hooks'; import { RemoteSelect } from '../remote-select'; diff --git a/packages/core/client/src/schema-component/antd/association-select/useServiceOptions.ts b/packages/core/client/src/schema-component/antd/association-select/useServiceOptions.ts index ecb4a7ed4..e9cdaae0d 100644 --- a/packages/core/client/src/schema-component/antd/association-select/useServiceOptions.ts +++ b/packages/core/client/src/schema-component/antd/association-select/useServiceOptions.ts @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { useCallback, useMemo } from 'react'; import { useCollection_deprecated, useCollectionManager_deprecated } from '../../../collection-manager'; import { isInFilterFormBlock } from '../../../filter-provider'; diff --git a/packages/core/client/src/schema-component/antd/auto-complete/AutoComplete.tsx b/packages/core/client/src/schema-component/antd/auto-complete/AutoComplete.tsx index 81d1b9e6d..50fb36a4f 100644 --- a/packages/core/client/src/schema-component/antd/auto-complete/AutoComplete.tsx +++ b/packages/core/client/src/schema-component/antd/auto-complete/AutoComplete.tsx @@ -1,4 +1,4 @@ -import { connect, mapProps, mapReadPretty } from '@formily/react'; +import { connect, mapProps, mapReadPretty } from '@nocobase/schema'; import { AutoComplete as AntdAutoComplete } from 'antd'; import { ReadPretty } from '../input'; diff --git a/packages/core/client/src/schema-component/antd/block-item/BlockItem.tsx b/packages/core/client/src/schema-component/antd/block-item/BlockItem.tsx index 01f47df86..81658b067 100644 --- a/packages/core/client/src/schema-component/antd/block-item/BlockItem.tsx +++ b/packages/core/client/src/schema-component/antd/block-item/BlockItem.tsx @@ -4,7 +4,7 @@ import React from 'react'; import { SortableItem } from '../../common'; import { useDesigner, useProps } from '../../hooks'; import { useGetAriaLabelOfBlockItem } from './hooks/useGetAriaLabelOfBlockItem'; -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { withDynamicSchemaProps } from '../../../application/hoc/withDynamicSchemaProps'; export const BlockItem: React.FC = withDynamicSchemaProps((props) => { diff --git a/packages/core/client/src/schema-component/antd/block-item/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/block-item/demos/demo1.tsx index be46dd984..d6621c0f1 100644 --- a/packages/core/client/src/schema-component/antd/block-item/demos/demo1.tsx +++ b/packages/core/client/src/schema-component/antd/block-item/demos/demo1.tsx @@ -1,5 +1,5 @@ -import { observer, useFieldSchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { observer, useFieldSchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { BlockItem, DndContext, DragHandler, SchemaComponent, SchemaComponentProvider } from '@nocobase/client'; import React from 'react'; diff --git a/packages/core/client/src/schema-component/antd/block-item/hooks/useGetAriaLabelOfBlockItem.ts b/packages/core/client/src/schema-component/antd/block-item/hooks/useGetAriaLabelOfBlockItem.ts index 91dce780d..54a7373e2 100644 --- a/packages/core/client/src/schema-component/antd/block-item/hooks/useGetAriaLabelOfBlockItem.ts +++ b/packages/core/client/src/schema-component/antd/block-item/hooks/useGetAriaLabelOfBlockItem.ts @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import _ from 'lodash'; import { useCallback } from 'react'; import { useBlockContext } from '../../../../block-provider/BlockProvider'; diff --git a/packages/core/client/src/schema-component/antd/card-item/CardItem.tsx b/packages/core/client/src/schema-component/antd/card-item/CardItem.tsx index f6b29d5bb..b8ed3b8b3 100644 --- a/packages/core/client/src/schema-component/antd/card-item/CardItem.tsx +++ b/packages/core/client/src/schema-component/antd/card-item/CardItem.tsx @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { Card } from 'antd'; import React from 'react'; import { useSchemaTemplate } from '../../../schema-templates'; diff --git a/packages/core/client/src/schema-component/antd/cascader/Cascader.tsx b/packages/core/client/src/schema-component/antd/cascader/Cascader.tsx index f5dccc375..b922bd5e9 100644 --- a/packages/core/client/src/schema-component/antd/cascader/Cascader.tsx +++ b/packages/core/client/src/schema-component/antd/cascader/Cascader.tsx @@ -1,7 +1,7 @@ import { LoadingOutlined } from '@ant-design/icons'; -import { ArrayField } from '@formily/core'; -import { connect, mapProps, mapReadPretty, useField } from '@formily/react'; -import { toArr } from '@formily/shared'; +import { ArrayField } from '@nocobase/schema'; +import { connect, mapProps, mapReadPretty, useField } from '@nocobase/schema'; +import { toArr } from '@nocobase/schema'; import { Cascader as AntdCascader, Space } from 'antd'; import { isBoolean, omit } from 'lodash'; import React from 'react'; diff --git a/packages/core/client/src/schema-component/antd/cascader/ReadPretty.tsx b/packages/core/client/src/schema-component/antd/cascader/ReadPretty.tsx index aa4457e96..df39d47f6 100644 --- a/packages/core/client/src/schema-component/antd/cascader/ReadPretty.tsx +++ b/packages/core/client/src/schema-component/antd/cascader/ReadPretty.tsx @@ -1,6 +1,6 @@ -import { ArrayField } from '@formily/core'; -import { useField } from '@formily/react'; -import { toArr } from '@formily/shared'; +import { ArrayField } from '@nocobase/schema'; +import { useField } from '@nocobase/schema'; +import { toArr } from '@nocobase/schema'; import React from 'react'; import { defaultFieldNames } from './defaultFieldNames'; diff --git a/packages/core/client/src/schema-component/antd/cascader/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/cascader/demos/demo2.tsx index 5e8e35e07..a4bee17fd 100644 --- a/packages/core/client/src/schema-component/antd/cascader/demos/demo2.tsx +++ b/packages/core/client/src/schema-component/antd/cascader/demos/demo2.tsx @@ -1,7 +1,7 @@ import { FormItem } from '@formily/antd-v5'; -import { ArrayField } from '@formily/core'; -import { useField } from '@formily/react'; -import { action } from '@formily/reactive'; +import { ArrayField } from '@nocobase/schema'; +import { useField } from '@nocobase/schema'; +import { action } from '@nocobase/schema'; import { APIClient, APIClientProvider, diff --git a/packages/core/client/src/schema-component/antd/checkbox/Checkbox.tsx b/packages/core/client/src/schema-component/antd/checkbox/Checkbox.tsx index 567b4f53b..a7d96c861 100644 --- a/packages/core/client/src/schema-component/antd/checkbox/Checkbox.tsx +++ b/packages/core/client/src/schema-component/antd/checkbox/Checkbox.tsx @@ -1,6 +1,6 @@ import { CheckOutlined, CloseOutlined } from '@ant-design/icons'; -import { connect, mapProps, mapReadPretty, useField } from '@formily/react'; -import { isValid } from '@formily/shared'; +import { connect, mapProps, mapReadPretty, useField } from '@nocobase/schema'; +import { isValid } from '@nocobase/schema'; import { Checkbox as AntdCheckbox, Tag } from 'antd'; import type { CheckboxGroupProps, CheckboxProps } from 'antd/es/checkbox'; import uniq from 'lodash/uniq'; diff --git a/packages/core/client/src/schema-component/antd/collection-select/CollectionSelect.tsx b/packages/core/client/src/schema-component/antd/collection-select/CollectionSelect.tsx index ad0dd3c14..3906348dd 100644 --- a/packages/core/client/src/schema-component/antd/collection-select/CollectionSelect.tsx +++ b/packages/core/client/src/schema-component/antd/collection-select/CollectionSelect.tsx @@ -1,4 +1,4 @@ -import { connect, mapReadPretty, observer, useField } from '@formily/react'; +import { connect, mapReadPretty, observer, useField } from '@nocobase/schema'; import { Cascader, Select, SelectProps, Tag } from 'antd'; import React, { useCallback, useContext, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/schema-component/antd/color-picker/ColorPicker.tsx b/packages/core/client/src/schema-component/antd/color-picker/ColorPicker.tsx index 01e292ecd..18e7e9b7d 100644 --- a/packages/core/client/src/schema-component/antd/color-picker/ColorPicker.tsx +++ b/packages/core/client/src/schema-component/antd/color-picker/ColorPicker.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/css'; import { usePrefixCls } from '@formily/antd-v5/esm/__builtins__'; -import { connect, mapProps, mapReadPretty } from '@formily/react'; +import { connect, mapProps, mapReadPretty } from '@nocobase/schema'; import { ColorPicker as AntdColorPicker } from 'antd'; import cls from 'classnames'; import React from 'react'; diff --git a/packages/core/client/src/schema-component/antd/color-select/ColorSelect.tsx b/packages/core/client/src/schema-component/antd/color-select/ColorSelect.tsx index 97cdb13fc..612f23c4a 100644 --- a/packages/core/client/src/schema-component/antd/color-select/ColorSelect.tsx +++ b/packages/core/client/src/schema-component/antd/color-select/ColorSelect.tsx @@ -1,5 +1,5 @@ import { LoadingOutlined } from '@ant-design/icons'; -import { connect, mapProps, mapReadPretty } from '@formily/react'; +import { connect, mapProps, mapReadPretty } from '@nocobase/schema'; import { Select, Tag } from 'antd'; import React from 'react'; import { useCompile } from '../../hooks/useCompile'; diff --git a/packages/core/client/src/schema-component/antd/cron/Cron.tsx b/packages/core/client/src/schema-component/antd/cron/Cron.tsx index e09ca56ad..b9b5a0028 100644 --- a/packages/core/client/src/schema-component/antd/cron/Cron.tsx +++ b/packages/core/client/src/schema-component/antd/cron/Cron.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/css'; -import { connect, mapReadPretty } from '@formily/react'; +import { connect, mapReadPretty } from '@nocobase/schema'; import { error } from '@nocobase/utils/client'; import cronstrue from 'cronstrue'; import React, { useMemo } from 'react'; diff --git a/packages/core/client/src/schema-component/antd/cron/CronSet.tsx b/packages/core/client/src/schema-component/antd/cron/CronSet.tsx index e01279878..922e0113f 100644 --- a/packages/core/client/src/schema-component/antd/cron/CronSet.tsx +++ b/packages/core/client/src/schema-component/antd/cron/CronSet.tsx @@ -1,4 +1,4 @@ -import { connect, mapReadPretty, useFieldSchema } from '@formily/react'; +import { connect, mapReadPretty, useFieldSchema } from '@nocobase/schema'; import { Select, SelectProps } from 'antd'; import React, { useEffect, useMemo, useState } from 'react'; import { useCollection_deprecated } from '../../../collection-manager'; diff --git a/packages/core/client/src/schema-component/antd/custom-cascader/CustomCascader.tsx b/packages/core/client/src/schema-component/antd/custom-cascader/CustomCascader.tsx index c5570c626..e38d39ce0 100644 --- a/packages/core/client/src/schema-component/antd/custom-cascader/CustomCascader.tsx +++ b/packages/core/client/src/schema-component/antd/custom-cascader/CustomCascader.tsx @@ -1,7 +1,7 @@ import { LoadingOutlined } from '@ant-design/icons'; -import { ArrayField } from '@formily/core'; -import { connect, mapProps, mapReadPretty, useField } from '@formily/react'; -import { toArr } from '@formily/shared'; +import { ArrayField } from '@nocobase/schema'; +import { connect, mapProps, mapReadPretty, useField } from '@nocobase/schema'; +import { toArr } from '@nocobase/schema'; import { Cascader as AntdCascader, Space } from 'antd'; import { isBoolean, omit } from 'lodash'; import React from 'react'; diff --git a/packages/core/client/src/schema-component/antd/custom-cascader/ReadPretty.tsx b/packages/core/client/src/schema-component/antd/custom-cascader/ReadPretty.tsx index aa4457e96..df39d47f6 100644 --- a/packages/core/client/src/schema-component/antd/custom-cascader/ReadPretty.tsx +++ b/packages/core/client/src/schema-component/antd/custom-cascader/ReadPretty.tsx @@ -1,6 +1,6 @@ -import { ArrayField } from '@formily/core'; -import { useField } from '@formily/react'; -import { toArr } from '@formily/shared'; +import { ArrayField } from '@nocobase/schema'; +import { useField } from '@nocobase/schema'; +import { toArr } from '@nocobase/schema'; import React from 'react'; import { defaultFieldNames } from './defaultFieldNames'; diff --git a/packages/core/client/src/schema-component/antd/date-picker/DatePicker.tsx b/packages/core/client/src/schema-component/antd/date-picker/DatePicker.tsx index 60dfe93bf..142feeb32 100644 --- a/packages/core/client/src/schema-component/antd/date-picker/DatePicker.tsx +++ b/packages/core/client/src/schema-component/antd/date-picker/DatePicker.tsx @@ -1,4 +1,4 @@ -import { connect, mapProps, mapReadPretty } from '@formily/react'; +import { connect, mapProps, mapReadPretty } from '@nocobase/schema'; import { DatePicker as AntdDatePicker } from 'antd'; import type { DatePickerProps as AntdDatePickerProps, diff --git a/packages/core/client/src/schema-component/antd/date-picker/ReadPretty.tsx b/packages/core/client/src/schema-component/antd/date-picker/ReadPretty.tsx index 64c8f5780..bf9216dbc 100644 --- a/packages/core/client/src/schema-component/antd/date-picker/ReadPretty.tsx +++ b/packages/core/client/src/schema-component/antd/date-picker/ReadPretty.tsx @@ -1,5 +1,5 @@ import { usePrefixCls } from '@formily/antd-v5/esm/__builtins__'; -import { isArr } from '@formily/shared'; +import { isArr } from '@nocobase/schema'; import { getDefaultFormat, str2moment } from '@nocobase/utils/client'; import type { DatePickerProps as AntdDatePickerProps, diff --git a/packages/core/client/src/schema-component/antd/expand-action/Expand.Action.Design.tsx b/packages/core/client/src/schema-component/antd/expand-action/Expand.Action.Design.tsx index 8ba9a60bf..2f390f9fd 100644 --- a/packages/core/client/src/schema-component/antd/expand-action/Expand.Action.Design.tsx +++ b/packages/core/client/src/schema-component/antd/expand-action/Expand.Action.Design.tsx @@ -1,4 +1,4 @@ -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import React from 'react'; import { useTranslation } from 'react-i18next'; import { useDesignable } from '../..'; diff --git a/packages/core/client/src/schema-component/antd/expand-action/Expand.Action.tsx b/packages/core/client/src/schema-component/antd/expand-action/Expand.Action.tsx index 2744ba40a..f4fb7d1b6 100644 --- a/packages/core/client/src/schema-component/antd/expand-action/Expand.Action.tsx +++ b/packages/core/client/src/schema-component/antd/expand-action/Expand.Action.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/css'; -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { Button } from 'antd'; import React, { forwardRef, createRef } from 'react'; import { composeRef } from 'rc-util/lib/ref'; diff --git a/packages/core/client/src/schema-component/antd/filter/DynamicComponent.tsx b/packages/core/client/src/schema-component/antd/filter/DynamicComponent.tsx index cb08edcda..4befcc5a4 100644 --- a/packages/core/client/src/schema-component/antd/filter/DynamicComponent.tsx +++ b/packages/core/client/src/schema-component/antd/filter/DynamicComponent.tsx @@ -1,6 +1,6 @@ -import { createForm, onFieldValueChange } from '@formily/core'; -import { FieldContext, FormContext } from '@formily/react'; -import { merge } from '@formily/shared'; +import { createForm, onFieldValueChange } from '@nocobase/schema'; +import { FieldContext, FormContext } from '@nocobase/schema'; +import { merge } from '@nocobase/schema'; import React, { useCallback, useContext, useMemo } from 'react'; import { CollectionFieldOptions_deprecated } from '../../../collection-manager'; import { SchemaComponent } from '../../core'; diff --git a/packages/core/client/src/schema-component/antd/filter/Filter.Action.Designer.tsx b/packages/core/client/src/schema-component/antd/filter/Filter.Action.Designer.tsx index 5a95ee5a7..8abce08c3 100644 --- a/packages/core/client/src/schema-component/antd/filter/Filter.Action.Designer.tsx +++ b/packages/core/client/src/schema-component/antd/filter/Filter.Action.Designer.tsx @@ -1,4 +1,4 @@ -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import React from 'react'; import { useTranslation } from 'react-i18next'; import { useDesignable } from '../..'; diff --git a/packages/core/client/src/schema-component/antd/filter/Filter.tsx b/packages/core/client/src/schema-component/antd/filter/Filter.tsx index 9bc62f45f..61d4b15a0 100644 --- a/packages/core/client/src/schema-component/antd/filter/Filter.tsx +++ b/packages/core/client/src/schema-component/antd/filter/Filter.tsx @@ -1,5 +1,5 @@ -import { ObjectField as ObjectFieldModel } from '@formily/core'; -import { observer, useField, useFieldSchema } from '@formily/react'; +import { ObjectField as ObjectFieldModel } from '@nocobase/schema'; +import { observer, useField, useFieldSchema } from '@nocobase/schema'; import React, { useEffect } from 'react'; import { useRequest } from '../../../api-client'; import { useProps } from '../../hooks/useProps'; diff --git a/packages/core/client/src/schema-component/antd/filter/FilterAction.tsx b/packages/core/client/src/schema-component/antd/filter/FilterAction.tsx index 271ac8adf..7f188a8fb 100644 --- a/packages/core/client/src/schema-component/antd/filter/FilterAction.tsx +++ b/packages/core/client/src/schema-component/antd/filter/FilterAction.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/css'; -import { createForm, Field, Form } from '@formily/core'; -import { observer, useField, useFieldSchema, useForm } from '@formily/react'; +import { createForm, Field, Form } from '@nocobase/schema'; +import { observer, useField, useFieldSchema, useForm } from '@nocobase/schema'; import { flatten, unflatten } from '@nocobase/utils/client'; import { Button, Space } from 'antd'; import React, { createContext, useCallback, useContext, useMemo, useState } from 'react'; diff --git a/packages/core/client/src/schema-component/antd/filter/FilterGroup.tsx b/packages/core/client/src/schema-component/antd/filter/FilterGroup.tsx index 5a60b0486..53a27aa7f 100644 --- a/packages/core/client/src/schema-component/antd/filter/FilterGroup.tsx +++ b/packages/core/client/src/schema-component/antd/filter/FilterGroup.tsx @@ -1,6 +1,6 @@ import { CloseCircleOutlined } from '@ant-design/icons'; -import { ObjectField as ObjectFieldModel } from '@formily/core'; -import { ArrayField, connect, useField } from '@formily/react'; +import { ObjectField as ObjectFieldModel } from '@nocobase/schema'; +import { ArrayFieldComponent as ArrayField, connect, useField } from '@nocobase/schema'; import { Select, Space } from 'antd'; import React, { useContext } from 'react'; import { Trans, useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/schema-component/antd/filter/FilterItem.tsx b/packages/core/client/src/schema-component/antd/filter/FilterItem.tsx index a7fe50a60..3b9a3b1b0 100644 --- a/packages/core/client/src/schema-component/antd/filter/FilterItem.tsx +++ b/packages/core/client/src/schema-component/antd/filter/FilterItem.tsx @@ -1,6 +1,6 @@ import { CloseCircleOutlined } from '@ant-design/icons'; import { css } from '@emotion/css'; -import { observer } from '@formily/react'; +import { observer } from '@nocobase/schema'; import { Cascader, Select, Space } from 'antd'; import React, { useCallback, useContext, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/schema-component/antd/filter/FilterItems.tsx b/packages/core/client/src/schema-component/antd/filter/FilterItems.tsx index c197d564b..7571e4db1 100644 --- a/packages/core/client/src/schema-component/antd/filter/FilterItems.tsx +++ b/packages/core/client/src/schema-component/antd/filter/FilterItems.tsx @@ -1,5 +1,5 @@ -import { ArrayField as ArrayFieldModel } from '@formily/core'; -import { ObjectField, observer, useField } from '@formily/react'; +import { ArrayField as ArrayFieldModel } from '@nocobase/schema'; +import { ObjectFieldComponent as ObjectField, observer, useField } from '@nocobase/schema'; import React from 'react'; import { FilterGroup } from './FilterGroup'; import { FilterItem } from './FilterItem'; diff --git a/packages/core/client/src/schema-component/antd/filter/SaveDefaultValue.tsx b/packages/core/client/src/schema-component/antd/filter/SaveDefaultValue.tsx index dbfc264d4..07032f418 100644 --- a/packages/core/client/src/schema-component/antd/filter/SaveDefaultValue.tsx +++ b/packages/core/client/src/schema-component/antd/filter/SaveDefaultValue.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/css'; -import { useFieldSchema, useForm } from '@formily/react'; +import { useFieldSchema, useForm } from '@nocobase/schema'; import { Button } from 'antd'; import React from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/schema-component/antd/filter/context.ts b/packages/core/client/src/schema-component/antd/filter/context.ts index c502f5399..caad7eb7c 100644 --- a/packages/core/client/src/schema-component/antd/filter/context.ts +++ b/packages/core/client/src/schema-component/antd/filter/context.ts @@ -1,5 +1,5 @@ -import { ObjectField } from '@formily/core'; -import { Schema } from '@formily/react'; +import { ObjectField } from '@nocobase/schema'; +import { Schema } from '@nocobase/schema'; import { createContext } from 'react'; export interface FilterContextProps { diff --git a/packages/core/client/src/schema-component/antd/filter/demos/demo3.tsx b/packages/core/client/src/schema-component/antd/filter/demos/demo3.tsx index 05aa6fe5d..37f8c007b 100644 --- a/packages/core/client/src/schema-component/antd/filter/demos/demo3.tsx +++ b/packages/core/client/src/schema-component/antd/filter/demos/demo3.tsx @@ -1,4 +1,4 @@ -import { ISchema, useForm } from '@formily/react'; +import { ISchema, useForm } from '@nocobase/schema'; import { AntdSchemaComponentProvider, Application, diff --git a/packages/core/client/src/schema-component/antd/filter/demos/demo4.tsx b/packages/core/client/src/schema-component/antd/filter/demos/demo4.tsx index a9655f62f..0949d1243 100644 --- a/packages/core/client/src/schema-component/antd/filter/demos/demo4.tsx +++ b/packages/core/client/src/schema-component/antd/filter/demos/demo4.tsx @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { AntdSchemaComponentProvider, Filter, diff --git a/packages/core/client/src/schema-component/antd/filter/demos/demo5.tsx b/packages/core/client/src/schema-component/antd/filter/demos/demo5.tsx index baa96a99c..87019f108 100644 --- a/packages/core/client/src/schema-component/antd/filter/demos/demo5.tsx +++ b/packages/core/client/src/schema-component/antd/filter/demos/demo5.tsx @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/json-schema'; +import { ISchema } from '@nocobase/schema'; import { Filter, FilterAction, Input, SchemaComponent, SchemaComponentProvider } from '@nocobase/client'; import React from 'react'; diff --git a/packages/core/client/src/schema-component/antd/filter/useFilterActionProps.ts b/packages/core/client/src/schema-component/antd/filter/useFilterActionProps.ts index 6deb6d2a4..a5f863861 100644 --- a/packages/core/client/src/schema-component/antd/filter/useFilterActionProps.ts +++ b/packages/core/client/src/schema-component/antd/filter/useFilterActionProps.ts @@ -1,5 +1,5 @@ -import { Field } from '@formily/core'; -import { useField, useFieldSchema } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { useField, useFieldSchema } from '@nocobase/schema'; import flat from 'flat'; import { useTranslation } from 'react-i18next'; import { useBlockRequestContext } from '../../../block-provider'; diff --git a/packages/core/client/src/schema-component/antd/filter/useOperators.ts b/packages/core/client/src/schema-component/antd/filter/useOperators.ts index 6bc243ea9..d69d3003b 100644 --- a/packages/core/client/src/schema-component/antd/filter/useOperators.ts +++ b/packages/core/client/src/schema-component/antd/filter/useOperators.ts @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { useCollection_deprecated, useCollectionManager_deprecated } from '../../../collection-manager'; import { useMemo } from 'react'; diff --git a/packages/core/client/src/schema-component/antd/filter/useValues.ts b/packages/core/client/src/schema-component/antd/filter/useValues.ts index b9bad47ef..1ad9f8ce7 100644 --- a/packages/core/client/src/schema-component/antd/filter/useValues.ts +++ b/packages/core/client/src/schema-component/antd/filter/useValues.ts @@ -1,5 +1,5 @@ -import { useField } from '@formily/react'; -import { merge } from '@formily/shared'; +import { useField } from '@nocobase/schema'; +import { merge } from '@nocobase/schema'; import flat, { unflatten } from 'flat'; import cloneDeep from 'lodash/cloneDeep'; import get from 'lodash/get'; diff --git a/packages/core/client/src/schema-component/antd/form-dialog/index.tsx b/packages/core/client/src/schema-component/antd/form-dialog/index.tsx index 917e6e08f..43956b4ff 100644 --- a/packages/core/client/src/schema-component/antd/form-dialog/index.tsx +++ b/packages/core/client/src/schema-component/antd/form-dialog/index.tsx @@ -1,7 +1,7 @@ -import { createForm, Form, IFormProps } from '@formily/core'; -import { FormProvider, Observer, observer, ReactFC } from '@formily/react'; -import { toJS } from '@formily/reactive'; -import { applyMiddleware, IMiddleware, isBool, isFn, isNum, isStr } from '@formily/shared'; +import { createForm, Form, IFormProps } from '@nocobase/schema'; +import { FormProvider, Observer, observer, ReactFC } from '@nocobase/schema'; +import { toJS } from '@nocobase/schema'; +import { applyMiddleware, IMiddleware, isBool, isFn, isNum, isStr } from '@nocobase/schema'; import { Modal, ModalProps, ThemeConfig } from 'antd'; import React, { Fragment, useLayoutEffect, useRef, useState } from 'react'; import { createPortal } from 'react-dom'; diff --git a/packages/core/client/src/schema-component/antd/form-item/FormItem.FilterFormSettings.tsx b/packages/core/client/src/schema-component/antd/form-item/FormItem.FilterFormSettings.tsx index 187608ba5..8d544f4dc 100644 --- a/packages/core/client/src/schema-component/antd/form-item/FormItem.FilterFormSettings.tsx +++ b/packages/core/client/src/schema-component/antd/form-item/FormItem.FilterFormSettings.tsx @@ -1,4 +1,4 @@ -import { useField, useFieldSchema } from '@formily/react'; +import { useField, useFieldSchema } from '@nocobase/schema'; import _ from 'lodash'; import React from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/schema-component/antd/form-item/FormItem.Settings.tsx b/packages/core/client/src/schema-component/antd/form-item/FormItem.Settings.tsx index adcf7aed1..3636b3eb9 100644 --- a/packages/core/client/src/schema-component/antd/form-item/FormItem.Settings.tsx +++ b/packages/core/client/src/schema-component/antd/form-item/FormItem.Settings.tsx @@ -1,6 +1,6 @@ import { ArrayCollapse, FormLayout } from '@formily/antd-v5'; -import { Field } from '@formily/core'; -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import _ from 'lodash'; import React from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx b/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx index c228165d0..0eac6d3ed 100644 --- a/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx +++ b/packages/core/client/src/schema-component/antd/form-item/FormItem.tsx @@ -1,7 +1,7 @@ import { css, cx } from '@emotion/css'; import { FormItem as Item } from '@formily/antd-v5'; -import { Field } from '@formily/core'; -import { observer, useField, useFieldSchema } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { observer, useField, useFieldSchema } from '@nocobase/schema'; import React, { useEffect, useMemo } from 'react'; import { ACLCollectionFieldProvider } from '../../../acl/ACLProvider'; import { useApp } from '../../../application'; diff --git a/packages/core/client/src/schema-component/antd/form-item/SchemaSettingOptions.tsx b/packages/core/client/src/schema-component/antd/form-item/SchemaSettingOptions.tsx index 56630169e..a0fbfe7ff 100644 --- a/packages/core/client/src/schema-component/antd/form-item/SchemaSettingOptions.tsx +++ b/packages/core/client/src/schema-component/antd/form-item/SchemaSettingOptions.tsx @@ -1,7 +1,7 @@ import { ArrayCollapse, FormLayout } from '@formily/antd-v5'; -import { Field } from '@formily/core'; -import { ISchema, Schema, useField, useFieldSchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { Field } from '@nocobase/schema'; +import { ISchema, Schema, useField, useFieldSchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import _ from 'lodash'; import React from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/schema-component/antd/form-item/hooks/useLazyLoadDisplayAssociationFieldsOfForm.ts b/packages/core/client/src/schema-component/antd/form-item/hooks/useLazyLoadDisplayAssociationFieldsOfForm.ts index ee342463f..8df586379 100644 --- a/packages/core/client/src/schema-component/antd/form-item/hooks/useLazyLoadDisplayAssociationFieldsOfForm.ts +++ b/packages/core/client/src/schema-component/antd/form-item/hooks/useLazyLoadDisplayAssociationFieldsOfForm.ts @@ -1,5 +1,5 @@ -import { Field } from '@formily/core'; -import { useField, useFieldSchema, useForm } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { useField, useFieldSchema, useForm } from '@nocobase/schema'; import { nextTick } from '@nocobase/utils/client'; import _ from 'lodash'; import { useEffect, useMemo, useRef } from 'react'; diff --git a/packages/core/client/src/schema-component/antd/form-item/hooks/useParseDefaultValue.ts b/packages/core/client/src/schema-component/antd/form-item/hooks/useParseDefaultValue.ts index ad2dfb2a4..054b6849d 100644 --- a/packages/core/client/src/schema-component/antd/form-item/hooks/useParseDefaultValue.ts +++ b/packages/core/client/src/schema-component/antd/form-item/hooks/useParseDefaultValue.ts @@ -1,6 +1,6 @@ -import { Field } from '@formily/core'; -import { useField, useFieldSchema } from '@formily/react'; -import { reaction } from '@formily/reactive'; +import { Field } from '@nocobase/schema'; +import { useField, useFieldSchema } from '@nocobase/schema'; +import { reaction } from '@nocobase/schema'; import { getValuesByPath } from '@nocobase/utils/client'; import _ from 'lodash'; import { useCallback, useEffect } from 'react'; diff --git a/packages/core/client/src/schema-component/antd/form-item/hooks/useSpecialCase.ts b/packages/core/client/src/schema-component/antd/form-item/hooks/useSpecialCase.ts index 07c815d60..42b61d6e8 100644 --- a/packages/core/client/src/schema-component/antd/form-item/hooks/useSpecialCase.ts +++ b/packages/core/client/src/schema-component/antd/form-item/hooks/useSpecialCase.ts @@ -1,5 +1,5 @@ -import { Field } from '@formily/core'; -import { Schema, useFieldSchema, useForm } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { Schema, useFieldSchema, useForm } from '@nocobase/schema'; import _ from 'lodash'; import { useCallback, useEffect, useMemo } from 'react'; import { diff --git a/packages/core/client/src/schema-component/antd/form-v2/Form.Settings.tsx b/packages/core/client/src/schema-component/antd/form-v2/Form.Settings.tsx index d6e033988..9badf3419 100644 --- a/packages/core/client/src/schema-component/antd/form-v2/Form.Settings.tsx +++ b/packages/core/client/src/schema-component/antd/form-v2/Form.Settings.tsx @@ -1,5 +1,5 @@ import { ArrayItems } from '@formily/antd-v5'; -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import { useTranslation } from 'react-i18next'; import { SchemaSettings } from '../../../application/schema-settings'; import { useFormBlockContext } from '../../../block-provider'; diff --git a/packages/core/client/src/schema-component/antd/form-v2/Form.tsx b/packages/core/client/src/schema-component/antd/form-v2/Form.tsx index 9f84098ab..e48f2c63d 100644 --- a/packages/core/client/src/schema-component/antd/form-v2/Form.tsx +++ b/packages/core/client/src/schema-component/antd/form-v2/Form.tsx @@ -1,9 +1,9 @@ import { css } from '@emotion/css'; import { FormLayout } from '@formily/antd-v5'; -import { createForm, Field, Form as FormilyForm, onFieldInit, onFormInputChange } from '@formily/core'; -import { FieldContext, FormContext, observer, RecursionField, useField, useFieldSchema } from '@formily/react'; -import { reaction } from '@formily/reactive'; -import { uid } from '@formily/shared'; +import { createForm, Field, Form as FormilyForm, onFieldInit, onFormInputChange } from '@nocobase/schema'; +import { FieldContext, FormContext, observer, RecursionField, useField, useFieldSchema } from '@nocobase/schema'; +import { reaction } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { getValuesByPath } from '@nocobase/utils/client'; import { ConfigProvider, Spin } from 'antd'; import React, { useEffect, useMemo } from 'react'; diff --git a/packages/core/client/src/schema-component/antd/form-v2/FormField.tsx b/packages/core/client/src/schema-component/antd/form-v2/FormField.tsx index 45ee929fb..9c7e819c2 100644 --- a/packages/core/client/src/schema-component/antd/form-v2/FormField.tsx +++ b/packages/core/client/src/schema-component/antd/form-v2/FormField.tsx @@ -1,4 +1,4 @@ -import { observer, useField, useFieldSchema } from '@formily/react'; +import { observer, useField, useFieldSchema } from '@nocobase/schema'; import React, { useEffect } from 'react'; import { useFormBlockContext } from '../../../block-provider'; import { useCollection_deprecated } from '../../../collection-manager'; diff --git a/packages/core/client/src/schema-component/antd/form-v2/Templates.tsx b/packages/core/client/src/schema-component/antd/form-v2/Templates.tsx index 6d86eba9b..92db3f7e8 100644 --- a/packages/core/client/src/schema-component/antd/form-v2/Templates.tsx +++ b/packages/core/client/src/schema-component/antd/form-v2/Templates.tsx @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { error, forEach } from '@nocobase/utils/client'; import { Select, Space } from 'antd'; import _ from 'lodash'; diff --git a/packages/core/client/src/schema-component/antd/form-v2/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/form-v2/demos/demo1.tsx index 23544840c..3074a095e 100644 --- a/packages/core/client/src/schema-component/antd/form-v2/demos/demo1.tsx +++ b/packages/core/client/src/schema-component/antd/form-v2/demos/demo1.tsx @@ -1,4 +1,4 @@ -import { ISchema, useForm } from '@formily/react'; +import { ISchema, useForm } from '@nocobase/schema'; import { Action, Application, diff --git a/packages/core/client/src/schema-component/antd/form-v2/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/form-v2/demos/demo2.tsx index e4be9ff5a..cd2db6c0e 100644 --- a/packages/core/client/src/schema-component/antd/form-v2/demos/demo2.tsx +++ b/packages/core/client/src/schema-component/antd/form-v2/demos/demo2.tsx @@ -1,4 +1,4 @@ -import { ISchema, useForm } from '@formily/react'; +import { ISchema, useForm } from '@nocobase/schema'; import { Action, Application, diff --git a/packages/core/client/src/schema-component/antd/form-v2/demos/demo3.tsx b/packages/core/client/src/schema-component/antd/form-v2/demos/demo3.tsx index 674ce9bf7..c877c8574 100644 --- a/packages/core/client/src/schema-component/antd/form-v2/demos/demo3.tsx +++ b/packages/core/client/src/schema-component/antd/form-v2/demos/demo3.tsx @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { Action, Application, diff --git a/packages/core/client/src/schema-component/antd/form-v2/utils.tsx b/packages/core/client/src/schema-component/antd/form-v2/utils.tsx index 3972c9925..0cf7db0b4 100644 --- a/packages/core/client/src/schema-component/antd/form-v2/utils.tsx +++ b/packages/core/client/src/schema-component/antd/form-v2/utils.tsx @@ -1,4 +1,4 @@ -import { Field } from '@formily/core'; +import { Field } from '@nocobase/schema'; import { evaluators } from '@nocobase/evaluators/client'; import { uid } from '@nocobase/utils/client'; import _ from 'lodash'; diff --git a/packages/core/client/src/schema-component/antd/form/Form.tsx b/packages/core/client/src/schema-component/antd/form/Form.tsx index 3f3c20469..da2d141da 100644 --- a/packages/core/client/src/schema-component/antd/form/Form.tsx +++ b/packages/core/client/src/schema-component/antd/form/Form.tsx @@ -1,6 +1,6 @@ import { FormLayout } from '@formily/antd-v5'; -import { createForm } from '@formily/core'; -import { FieldContext, FormContext, observer, RecursionField, useField, useFieldSchema } from '@formily/react'; +import { createForm } from '@nocobase/schema'; +import { FieldContext, FormContext, observer, RecursionField, useField, useFieldSchema } from '@nocobase/schema'; import { Options, Result } from 'ahooks/es/useRequest/src/types'; import { ConfigProvider, Spin } from 'antd'; import React, { createContext, useContext, useEffect, useMemo } from 'react'; diff --git a/packages/core/client/src/schema-component/antd/form/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/form/demos/demo1.tsx index fab7d67e4..059f33907 100644 --- a/packages/core/client/src/schema-component/antd/form/demos/demo1.tsx +++ b/packages/core/client/src/schema-component/antd/form/demos/demo1.tsx @@ -1,5 +1,5 @@ import { FormItem, Input } from '@formily/antd-v5'; -import { ISchema, observer, useForm } from '@formily/react'; +import { ISchema, observer, useForm } from '@nocobase/schema'; import { Action, Form, SchemaComponent, SchemaComponentProvider, useCloseAction } from '@nocobase/client'; import React from 'react'; diff --git a/packages/core/client/src/schema-component/antd/form/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/form/demos/demo2.tsx index 23d2033cc..5110d3991 100644 --- a/packages/core/client/src/schema-component/antd/form/demos/demo2.tsx +++ b/packages/core/client/src/schema-component/antd/form/demos/demo2.tsx @@ -1,5 +1,5 @@ import { FormItem, Input } from '@formily/antd-v5'; -import { ISchema, observer, useForm } from '@formily/react'; +import { ISchema, observer, useForm } from '@nocobase/schema'; import { Action, Form, SchemaComponent, SchemaComponentProvider } from '@nocobase/client'; import { Card } from 'antd'; import React from 'react'; diff --git a/packages/core/client/src/schema-component/antd/form/demos/demo3.tsx b/packages/core/client/src/schema-component/antd/form/demos/demo3.tsx index cfd4d96fa..f4a185bf1 100644 --- a/packages/core/client/src/schema-component/antd/form/demos/demo3.tsx +++ b/packages/core/client/src/schema-component/antd/form/demos/demo3.tsx @@ -1,5 +1,5 @@ import { FormItem, Input } from '@formily/antd-v5'; -import { ISchema, observer, useForm } from '@formily/react'; +import { ISchema, observer, useForm } from '@nocobase/schema'; import { Action, Form, SchemaComponent, SchemaComponentProvider } from '@nocobase/client'; import { Card } from 'antd'; import React from 'react'; diff --git a/packages/core/client/src/schema-component/antd/form/demos/demo4.tsx b/packages/core/client/src/schema-component/antd/form/demos/demo4.tsx index 2bb7c87b9..fbf8cb606 100644 --- a/packages/core/client/src/schema-component/antd/form/demos/demo4.tsx +++ b/packages/core/client/src/schema-component/antd/form/demos/demo4.tsx @@ -1,5 +1,5 @@ import { FormItem, Input } from '@formily/antd-v5'; -import { ISchema, observer, useForm } from '@formily/react'; +import { ISchema, observer, useForm } from '@nocobase/schema'; import { Action, Form, SchemaComponent, SchemaComponentProvider, useCloseAction } from '@nocobase/client'; import React from 'react'; diff --git a/packages/core/client/src/schema-component/antd/form/demos/demo5.tsx b/packages/core/client/src/schema-component/antd/form/demos/demo5.tsx index 7100e2ee1..614a1a78b 100644 --- a/packages/core/client/src/schema-component/antd/form/demos/demo5.tsx +++ b/packages/core/client/src/schema-component/antd/form/demos/demo5.tsx @@ -1,5 +1,5 @@ import { FormItem, Input } from '@formily/antd-v5'; -import { ISchema, observer, useForm } from '@formily/react'; +import { ISchema, observer, useForm } from '@nocobase/schema'; import { APIClientProvider, Action, diff --git a/packages/core/client/src/schema-component/antd/form/demos/demo6.tsx b/packages/core/client/src/schema-component/antd/form/demos/demo6.tsx index cd73343f1..33bcc82d3 100644 --- a/packages/core/client/src/schema-component/antd/form/demos/demo6.tsx +++ b/packages/core/client/src/schema-component/antd/form/demos/demo6.tsx @@ -1,5 +1,5 @@ import { FormItem, Input } from '@formily/antd-v5'; -import { ISchema, observer, useForm } from '@formily/react'; +import { ISchema, observer, useForm } from '@nocobase/schema'; import { Action, Form, SchemaComponent, SchemaComponentProvider } from '@nocobase/client'; import { Card } from 'antd'; import React from 'react'; diff --git a/packages/core/client/src/schema-component/antd/form/demos/demo7.tsx b/packages/core/client/src/schema-component/antd/form/demos/demo7.tsx index 79c182a73..1fa9ecff2 100644 --- a/packages/core/client/src/schema-component/antd/form/demos/demo7.tsx +++ b/packages/core/client/src/schema-component/antd/form/demos/demo7.tsx @@ -1,5 +1,5 @@ import { FormItem, Input } from '@formily/antd-v5'; -import { ISchema, observer, useForm } from '@formily/react'; +import { ISchema, observer, useForm } from '@nocobase/schema'; import { Action, Form, FormUseValues, SchemaComponent, SchemaComponentProvider, useRequest } from '@nocobase/client'; import { Card } from 'antd'; import React from 'react'; diff --git a/packages/core/client/src/schema-component/antd/form/demos/demo8.tsx b/packages/core/client/src/schema-component/antd/form/demos/demo8.tsx index ac6bd081b..6de5e28a7 100644 --- a/packages/core/client/src/schema-component/antd/form/demos/demo8.tsx +++ b/packages/core/client/src/schema-component/antd/form/demos/demo8.tsx @@ -1,5 +1,5 @@ import { FormItem } from '@formily/antd-v5'; -import { ISchema, observer } from '@formily/react'; +import { ISchema, observer } from '@nocobase/schema'; import { Action, ActionContextProvider, diff --git a/packages/core/client/src/schema-component/antd/g2plot/G2Plot.tsx b/packages/core/client/src/schema-component/antd/g2plot/G2Plot.tsx index 02ab18398..1b3f9f294 100644 --- a/packages/core/client/src/schema-component/antd/g2plot/G2Plot.tsx +++ b/packages/core/client/src/schema-component/antd/g2plot/G2Plot.tsx @@ -35,8 +35,8 @@ import { Waterfall, WordCloud, } from '@antv/g2plot'; -import { Field } from '@formily/core'; -import { observer, useField } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { observer, useField } from '@nocobase/schema'; import { Spin } from 'antd'; import cls from 'classnames'; import React, { forwardRef, useEffect, useRef } from 'react'; diff --git a/packages/core/client/src/schema-component/antd/g2plot/G2PlotDesigner.tsx b/packages/core/client/src/schema-component/antd/g2plot/G2PlotDesigner.tsx index 61a93249d..2d3f5fff8 100644 --- a/packages/core/client/src/schema-component/antd/g2plot/G2PlotDesigner.tsx +++ b/packages/core/client/src/schema-component/antd/g2plot/G2PlotDesigner.tsx @@ -1,4 +1,4 @@ -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import React from 'react'; import { useTranslation } from 'react-i18next'; import { useAPIClient } from '../../../api-client'; diff --git a/packages/core/client/src/schema-component/antd/grid-card/GridCard.Decorator.tsx b/packages/core/client/src/schema-component/antd/grid-card/GridCard.Decorator.tsx index 00dc5c748..c12bfe63a 100644 --- a/packages/core/client/src/schema-component/antd/grid-card/GridCard.Decorator.tsx +++ b/packages/core/client/src/schema-component/antd/grid-card/GridCard.Decorator.tsx @@ -1,6 +1,6 @@ import { FormLayout } from '@formily/antd-v5'; -import { createForm } from '@formily/core'; -import { FormContext, useField, useFieldSchema } from '@formily/react'; +import { createForm } from '@nocobase/schema'; +import { FormContext, useField, useFieldSchema } from '@nocobase/schema'; import React, { createContext, useContext, useEffect, useMemo } from 'react'; import { BlockProvider, useBlockRequestContext, useParsedFilter } from '../../../block-provider'; import useStyles from './GridCard.Decorator.style'; diff --git a/packages/core/client/src/schema-component/antd/grid-card/GridCard.Designer.tsx b/packages/core/client/src/schema-component/antd/grid-card/GridCard.Designer.tsx index d48bc8a01..220b595dc 100644 --- a/packages/core/client/src/schema-component/antd/grid-card/GridCard.Designer.tsx +++ b/packages/core/client/src/schema-component/antd/grid-card/GridCard.Designer.tsx @@ -1,5 +1,5 @@ import { ArrayItems } from '@formily/antd-v5'; -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import { Slider } from 'antd'; import _ from 'lodash'; import React, { useMemo } from 'react'; diff --git a/packages/core/client/src/schema-component/antd/grid-card/GridCard.Item.tsx b/packages/core/client/src/schema-component/antd/grid-card/GridCard.Item.tsx index c005d82d8..f841b0a77 100644 --- a/packages/core/client/src/schema-component/antd/grid-card/GridCard.Item.tsx +++ b/packages/core/client/src/schema-component/antd/grid-card/GridCard.Item.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/css'; -import { ObjectField } from '@formily/core'; -import { useField } from '@formily/react'; +import { ObjectField } from '@nocobase/schema'; +import { useField } from '@nocobase/schema'; import { Card } from 'antd'; import React from 'react'; import { useCollectionParentRecordData } from '../../../data-source/collection-record/CollectionRecordProvider'; diff --git a/packages/core/client/src/schema-component/antd/grid-card/GridCard.tsx b/packages/core/client/src/schema-component/antd/grid-card/GridCard.tsx index 63104ad2d..7e428e36c 100644 --- a/packages/core/client/src/schema-component/antd/grid-card/GridCard.tsx +++ b/packages/core/client/src/schema-component/antd/grid-card/GridCard.tsx @@ -1,6 +1,6 @@ import { css, cx } from '@emotion/css'; -import { ArrayField } from '@formily/core'; -import { RecursionField, Schema, useField, useFieldSchema } from '@formily/react'; +import { ArrayField } from '@nocobase/schema'; +import { RecursionField, Schema, useField, useFieldSchema } from '@nocobase/schema'; import { List as AntdList, Col, PaginationProps } from 'antd'; import React, { useCallback, useState } from 'react'; import { SortableItem } from '../../common'; diff --git a/packages/core/client/src/schema-component/antd/grid/Block.tsx b/packages/core/client/src/schema-component/antd/grid/Block.tsx index 410c77a56..4e399e73f 100644 --- a/packages/core/client/src/schema-component/antd/grid/Block.tsx +++ b/packages/core/client/src/schema-component/antd/grid/Block.tsx @@ -1,4 +1,4 @@ -import { observer, useFieldSchema } from '@formily/react'; +import { observer, useFieldSchema } from '@nocobase/schema'; import React from 'react'; import { DragHandler } from '../../'; diff --git a/packages/core/client/src/schema-component/antd/grid/Grid.tsx b/packages/core/client/src/schema-component/antd/grid/Grid.tsx index 5c886b0ad..2a5550379 100644 --- a/packages/core/client/src/schema-component/antd/grid/Grid.tsx +++ b/packages/core/client/src/schema-component/antd/grid/Grid.tsx @@ -1,7 +1,7 @@ import { TinyColor } from '@ctrl/tinycolor'; import { useDndContext, useDndMonitor, useDraggable, useDroppable } from '@dnd-kit/core'; -import { ISchema, RecursionField, Schema, observer, useField, useFieldSchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema, RecursionField, Schema, observer, useField, useFieldSchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import cls from 'classnames'; import React, { createContext, useContext, useEffect, useMemo, useRef, useState } from 'react'; import { useDesignable, useFormBlockContext, useSchemaInitializerRender } from '../../../'; diff --git a/packages/core/client/src/schema-component/antd/grid/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/grid/demos/demo1.tsx index a387ddc08..cb1e94efb 100644 --- a/packages/core/client/src/schema-component/antd/grid/demos/demo1.tsx +++ b/packages/core/client/src/schema-component/antd/grid/demos/demo1.tsx @@ -1,4 +1,4 @@ -import { observer, useFieldSchema } from '@formily/react'; +import { observer, useFieldSchema } from '@nocobase/schema'; import { Application, BlockItem, diff --git a/packages/core/client/src/schema-component/antd/grid/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/grid/demos/demo2.tsx index 4dabb9a42..5e3d76f4b 100644 --- a/packages/core/client/src/schema-component/antd/grid/demos/demo2.tsx +++ b/packages/core/client/src/schema-component/antd/grid/demos/demo2.tsx @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { APIClientProvider, CurrentUserProvider, diff --git a/packages/core/client/src/schema-component/antd/grid/demos/demo3.tsx b/packages/core/client/src/schema-component/antd/grid/demos/demo3.tsx index 03f6e560c..c82fc3f54 100644 --- a/packages/core/client/src/schema-component/antd/grid/demos/demo3.tsx +++ b/packages/core/client/src/schema-component/antd/grid/demos/demo3.tsx @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { Application, CardItem, diff --git a/packages/core/client/src/schema-component/antd/icon-picker/IconPicker.tsx b/packages/core/client/src/schema-component/antd/icon-picker/IconPicker.tsx index 5ff332ec8..4528d7b13 100644 --- a/packages/core/client/src/schema-component/antd/icon-picker/IconPicker.tsx +++ b/packages/core/client/src/schema-component/antd/icon-picker/IconPicker.tsx @@ -1,7 +1,7 @@ import { CloseOutlined, LoadingOutlined } from '@ant-design/icons'; import { useFormLayout } from '@formily/antd-v5'; -import { connect, mapProps, mapReadPretty } from '@formily/react'; -import { isValid } from '@formily/shared'; +import { connect, mapProps, mapReadPretty } from '@nocobase/schema'; +import { isValid } from '@nocobase/schema'; import { Button, Space } from 'antd'; import React, { useState } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/schema-component/antd/input-number/InputNumber.tsx b/packages/core/client/src/schema-component/antd/input-number/InputNumber.tsx index 19b10b05e..b03575424 100644 --- a/packages/core/client/src/schema-component/antd/input-number/InputNumber.tsx +++ b/packages/core/client/src/schema-component/antd/input-number/InputNumber.tsx @@ -1,4 +1,4 @@ -import { connect, mapReadPretty } from '@formily/react'; +import { connect, mapReadPretty } from '@nocobase/schema'; import { InputNumber as AntdNumber, InputNumberProps } from 'antd'; import React from 'react'; import { ReadPretty } from './ReadPretty'; diff --git a/packages/core/client/src/schema-component/antd/input-number/ReadPretty.tsx b/packages/core/client/src/schema-component/antd/input-number/ReadPretty.tsx index 0f5debc66..37aac84da 100644 --- a/packages/core/client/src/schema-component/antd/input-number/ReadPretty.tsx +++ b/packages/core/client/src/schema-component/antd/input-number/ReadPretty.tsx @@ -1,4 +1,4 @@ -import { isValid } from '@formily/shared'; +import { isValid } from '@nocobase/schema'; import { toFixedByStep } from '@nocobase/utils/client'; import type { InputProps } from 'antd/es/input'; import type { InputNumberProps } from 'antd/es/input-number'; diff --git a/packages/core/client/src/schema-component/antd/input/Input.tsx b/packages/core/client/src/schema-component/antd/input/Input.tsx index 6d32fc52e..c22052aa3 100644 --- a/packages/core/client/src/schema-component/antd/input/Input.tsx +++ b/packages/core/client/src/schema-component/antd/input/Input.tsx @@ -1,5 +1,5 @@ import { LoadingOutlined } from '@ant-design/icons'; -import { connect, mapProps, mapReadPretty } from '@formily/react'; +import { connect, mapProps, mapReadPretty } from '@nocobase/schema'; import { Input as AntdInput } from 'antd'; import { InputProps, TextAreaProps } from 'antd/es/input'; import React from 'react'; diff --git a/packages/core/client/src/schema-component/antd/input/Json.tsx b/packages/core/client/src/schema-component/antd/input/Json.tsx index ed25206cc..52a440664 100644 --- a/packages/core/client/src/schema-component/antd/input/Json.tsx +++ b/packages/core/client/src/schema-component/antd/input/Json.tsx @@ -1,5 +1,5 @@ -import { Field } from '@formily/core'; -import { useField } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { useField } from '@nocobase/schema'; import { Input } from 'antd'; import { TextAreaProps } from 'antd/es/input'; import React, { useState, useEffect, Ref } from 'react'; diff --git a/packages/core/client/src/schema-component/antd/list/List.Decorator.tsx b/packages/core/client/src/schema-component/antd/list/List.Decorator.tsx index e014f3f40..2e42a931d 100644 --- a/packages/core/client/src/schema-component/antd/list/List.Decorator.tsx +++ b/packages/core/client/src/schema-component/antd/list/List.Decorator.tsx @@ -1,7 +1,7 @@ import { css, cx } from '@emotion/css'; import { FormLayout } from '@formily/antd-v5'; -import { createForm } from '@formily/core'; -import { FormContext, useField } from '@formily/react'; +import { createForm } from '@nocobase/schema'; +import { FormContext, useField } from '@nocobase/schema'; import _ from 'lodash'; import React, { createContext, useContext, useEffect, useMemo } from 'react'; import { BlockProvider, useBlockRequestContext, useParsedFilter } from '../../../block-provider'; diff --git a/packages/core/client/src/schema-component/antd/list/List.Designer.tsx b/packages/core/client/src/schema-component/antd/list/List.Designer.tsx index ed8de4bcf..2694428c5 100644 --- a/packages/core/client/src/schema-component/antd/list/List.Designer.tsx +++ b/packages/core/client/src/schema-component/antd/list/List.Designer.tsx @@ -1,5 +1,5 @@ import { ArrayItems } from '@formily/antd-v5'; -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import _ from 'lodash'; import React from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/schema-component/antd/list/List.Item.tsx b/packages/core/client/src/schema-component/antd/list/List.Item.tsx index d5d83a99b..62d58aa97 100644 --- a/packages/core/client/src/schema-component/antd/list/List.Item.tsx +++ b/packages/core/client/src/schema-component/antd/list/List.Item.tsx @@ -1,5 +1,5 @@ -import { ObjectField } from '@formily/core'; -import { useField } from '@formily/react'; +import { ObjectField } from '@nocobase/schema'; +import { useField } from '@nocobase/schema'; import classnames from 'classnames'; import React from 'react'; import { css, cx } from '@emotion/css'; diff --git a/packages/core/client/src/schema-component/antd/list/List.tsx b/packages/core/client/src/schema-component/antd/list/List.tsx index 694be37a4..8bd7d7a07 100644 --- a/packages/core/client/src/schema-component/antd/list/List.tsx +++ b/packages/core/client/src/schema-component/antd/list/List.tsx @@ -1,6 +1,6 @@ import { cx } from '@emotion/css'; -import { ArrayField } from '@formily/core'; -import { RecursionField, Schema, useField, useFieldSchema } from '@formily/react'; +import { ArrayField } from '@nocobase/schema'; +import { RecursionField, Schema, useField, useFieldSchema } from '@nocobase/schema'; import { List as AntdList, PaginationProps } from 'antd'; import React, { useCallback, useState } from 'react'; import { SortableItem } from '../../common'; diff --git a/packages/core/client/src/schema-component/antd/markdown/Markdown.Void.Designer.tsx b/packages/core/client/src/schema-component/antd/markdown/Markdown.Void.Designer.tsx index 35a96f24f..b8a374812 100644 --- a/packages/core/client/src/schema-component/antd/markdown/Markdown.Void.Designer.tsx +++ b/packages/core/client/src/schema-component/antd/markdown/Markdown.Void.Designer.tsx @@ -1,4 +1,4 @@ -import { useField } from '@formily/react'; +import { useField } from '@nocobase/schema'; import React from 'react'; import { useTranslation } from 'react-i18next'; import { diff --git a/packages/core/client/src/schema-component/antd/markdown/Markdown.Void.tsx b/packages/core/client/src/schema-component/antd/markdown/Markdown.Void.tsx index 8bb996f7c..3f5b4894f 100644 --- a/packages/core/client/src/schema-component/antd/markdown/Markdown.Void.tsx +++ b/packages/core/client/src/schema-component/antd/markdown/Markdown.Void.tsx @@ -1,4 +1,4 @@ -import { observer, useField, useFieldSchema } from '@formily/react'; +import { observer, useField, useFieldSchema } from '@nocobase/schema'; import { Input as AntdInput, Button, Space, Spin } from 'antd'; import cls from 'classnames'; import React, { useState } from 'react'; diff --git a/packages/core/client/src/schema-component/antd/markdown/Markdown.tsx b/packages/core/client/src/schema-component/antd/markdown/Markdown.tsx index b2dd62a1d..e29deb579 100644 --- a/packages/core/client/src/schema-component/antd/markdown/Markdown.tsx +++ b/packages/core/client/src/schema-component/antd/markdown/Markdown.tsx @@ -1,5 +1,5 @@ import { LoadingOutlined } from '@ant-design/icons'; -import { connect, mapProps, mapReadPretty } from '@formily/react'; +import { connect, mapProps, mapReadPretty } from '@nocobase/schema'; import { Input as AntdInput, Spin } from 'antd'; import React from 'react'; import { useGlobalTheme } from '../../../global-theme'; diff --git a/packages/core/client/src/schema-component/antd/markdown/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/markdown/demos/demo2.tsx index d55bc6120..eaeccb3e3 100644 --- a/packages/core/client/src/schema-component/antd/markdown/demos/demo2.tsx +++ b/packages/core/client/src/schema-component/antd/markdown/demos/demo2.tsx @@ -2,7 +2,7 @@ * title: Markdown.Void */ import { FormItem } from '@formily/antd-v5'; -import { observer, useField } from '@formily/react'; +import { observer, useField } from '@nocobase/schema'; import { Markdown, SchemaComponent, SchemaComponentProvider } from '@nocobase/client'; import { Button } from 'antd'; import React from 'react'; diff --git a/packages/core/client/src/schema-component/antd/menu/Menu.Designer.tsx b/packages/core/client/src/schema-component/antd/menu/Menu.Designer.tsx index 795546da2..afbaef992 100644 --- a/packages/core/client/src/schema-component/antd/menu/Menu.Designer.tsx +++ b/packages/core/client/src/schema-component/antd/menu/Menu.Designer.tsx @@ -1,6 +1,6 @@ import { TreeSelect } from '@formily/antd-v5'; -import { Field, onFieldChange } from '@formily/core'; -import { ISchema, Schema, useField, useFieldSchema } from '@formily/react'; +import { Field, onFieldChange } from '@nocobase/schema'; +import { ISchema, Schema, useField, useFieldSchema } from '@nocobase/schema'; import React from 'react'; import { useTranslation } from 'react-i18next'; import { findByUid } from '.'; diff --git a/packages/core/client/src/schema-component/antd/menu/Menu.tsx b/packages/core/client/src/schema-component/antd/menu/Menu.tsx index a203ae217..0a3cd6c23 100644 --- a/packages/core/client/src/schema-component/antd/menu/Menu.tsx +++ b/packages/core/client/src/schema-component/antd/menu/Menu.tsx @@ -7,8 +7,8 @@ import { SchemaExpressionScopeContext, useField, useFieldSchema, -} from '@formily/react'; -import { uid } from '@formily/shared'; +} from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { error } from '@nocobase/utils/client'; import { Menu as AntdMenu, MenuProps } from 'antd'; import React, { createContext, useContext, useEffect, useMemo, useRef, useState } from 'react'; diff --git a/packages/core/client/src/schema-component/antd/menu/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/menu/demos/demo1.tsx index bcfcb3553..ec760c9f3 100644 --- a/packages/core/client/src/schema-component/antd/menu/demos/demo1.tsx +++ b/packages/core/client/src/schema-component/antd/menu/demos/demo1.tsx @@ -1,7 +1,7 @@ /** * title: Menu */ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { Application, Menu, SchemaComponent, SchemaComponentProvider } from '@nocobase/client'; import React from 'react'; diff --git a/packages/core/client/src/schema-component/antd/menu/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/menu/demos/demo2.tsx index 98c5b24bd..63a13254e 100644 --- a/packages/core/client/src/schema-component/antd/menu/demos/demo2.tsx +++ b/packages/core/client/src/schema-component/antd/menu/demos/demo2.tsx @@ -1,7 +1,7 @@ /** * title: Menu */ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { Application, Menu, SchemaComponent, SchemaComponentProvider } from '@nocobase/client'; import React from 'react'; diff --git a/packages/core/client/src/schema-component/antd/menu/demos/demo3.tsx b/packages/core/client/src/schema-component/antd/menu/demos/demo3.tsx index 053432a15..26bfdd77e 100644 --- a/packages/core/client/src/schema-component/antd/menu/demos/demo3.tsx +++ b/packages/core/client/src/schema-component/antd/menu/demos/demo3.tsx @@ -1,7 +1,7 @@ /** * title: Menu */ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { Application, Menu, SchemaComponent, SchemaComponentProvider } from '@nocobase/client'; import { Layout } from 'antd'; import React, { useRef } from 'react'; diff --git a/packages/core/client/src/schema-component/antd/menu/util.ts b/packages/core/client/src/schema-component/antd/menu/util.ts index 72156c018..b3150d1fa 100644 --- a/packages/core/client/src/schema-component/antd/menu/util.ts +++ b/packages/core/client/src/schema-component/antd/menu/util.ts @@ -1,4 +1,4 @@ -import { Schema } from '@formily/react'; +import { Schema } from '@nocobase/schema'; export function findByUid(schema: Schema, uid: string) { if (!Schema.isSchemaInstance(schema)) { diff --git a/packages/core/client/src/schema-component/antd/nanoIDInput/NanoIDInput.tsx b/packages/core/client/src/schema-component/antd/nanoIDInput/NanoIDInput.tsx index 48deba759..4907573c2 100644 --- a/packages/core/client/src/schema-component/antd/nanoIDInput/NanoIDInput.tsx +++ b/packages/core/client/src/schema-component/antd/nanoIDInput/NanoIDInput.tsx @@ -1,7 +1,7 @@ import { customAlphabet as Alphabet } from 'nanoid'; import React, { useEffect } from 'react'; import { LoadingOutlined } from '@ant-design/icons'; -import { connect, mapProps, mapReadPretty, useForm } from '@formily/react'; +import { connect, mapProps, mapReadPretty, useForm } from '@nocobase/schema'; import { Input as AntdInput } from 'antd'; import { ReadPretty } from '../input'; import { useCollectionField } from '../../../data-source/collection-field/CollectionFieldProvider'; diff --git a/packages/core/client/src/schema-component/antd/page/FixedBlock.tsx b/packages/core/client/src/schema-component/antd/page/FixedBlock.tsx index bd08cb02f..ace046d27 100644 --- a/packages/core/client/src/schema-component/antd/page/FixedBlock.tsx +++ b/packages/core/client/src/schema-component/antd/page/FixedBlock.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/css'; -import { useField, useFieldSchema } from '@formily/react'; +import { useField, useFieldSchema } from '@nocobase/schema'; import React, { useContext, useEffect, useRef, useState } from 'react'; import { useRecord } from '../../../record-provider'; diff --git a/packages/core/client/src/schema-component/antd/page/FixedBlockDesignerItem.tsx b/packages/core/client/src/schema-component/antd/page/FixedBlockDesignerItem.tsx index e786db8b9..77c289728 100644 --- a/packages/core/client/src/schema-component/antd/page/FixedBlockDesignerItem.tsx +++ b/packages/core/client/src/schema-component/antd/page/FixedBlockDesignerItem.tsx @@ -1,4 +1,4 @@ -import { useField, useFieldSchema } from '@formily/react'; +import { useField, useFieldSchema } from '@nocobase/schema'; import React from 'react'; import { useTranslation } from 'react-i18next'; import { useDesignable } from '../../hooks'; diff --git a/packages/core/client/src/schema-component/antd/page/Page.Settings.tsx b/packages/core/client/src/schema-component/antd/page/Page.Settings.tsx index 4d9576cf9..c9d058db2 100644 --- a/packages/core/client/src/schema-component/antd/page/Page.Settings.tsx +++ b/packages/core/client/src/schema-component/antd/page/Page.Settings.tsx @@ -1,5 +1,5 @@ import { useTranslation } from 'react-i18next'; -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import { useDesignable } from '../..'; import { SchemaSettings } from '../../../application/schema-settings'; import { useSchemaToolbar } from '../../../application/schema-toolbar'; diff --git a/packages/core/client/src/schema-component/antd/page/Page.tsx b/packages/core/client/src/schema-component/antd/page/Page.tsx index 95133313d..d7ec7872e 100644 --- a/packages/core/client/src/schema-component/antd/page/Page.tsx +++ b/packages/core/client/src/schema-component/antd/page/Page.tsx @@ -1,7 +1,7 @@ import { PlusOutlined } from '@ant-design/icons'; import { PageHeader as AntdPageHeader } from '@ant-design/pro-layout'; import { FormLayout } from '@formily/antd-v5'; -import { Schema, SchemaOptionsContext, useFieldSchema } from '@formily/react'; +import { Schema, SchemaOptionsContext, useFieldSchema } from '@nocobase/schema'; import { Button, Tabs } from 'antd'; import classNames from 'classnames'; import React, { useContext, useEffect, useMemo, useState } from 'react'; diff --git a/packages/core/client/src/schema-component/antd/page/PageTab.Settings.tsx b/packages/core/client/src/schema-component/antd/page/PageTab.Settings.tsx index 8c5ae397c..0756a1382 100644 --- a/packages/core/client/src/schema-component/antd/page/PageTab.Settings.tsx +++ b/packages/core/client/src/schema-component/antd/page/PageTab.Settings.tsx @@ -1,6 +1,6 @@ import { App } from 'antd'; import { useTranslation } from 'react-i18next'; -import { ISchema } from '@formily/json-schema'; +import { ISchema } from '@nocobase/schema'; import { useDesignable } from '../../hooks'; import { useSchemaToolbar } from '../../../application/schema-toolbar'; import { SchemaSettings } from '../../../application/schema-settings/SchemaSettings'; diff --git a/packages/core/client/src/schema-component/antd/page/PageTabDesigner.tsx b/packages/core/client/src/schema-component/antd/page/PageTabDesigner.tsx index 9d69bf1b3..fd0a008e6 100644 --- a/packages/core/client/src/schema-component/antd/page/PageTabDesigner.tsx +++ b/packages/core/client/src/schema-component/antd/page/PageTabDesigner.tsx @@ -1,5 +1,5 @@ import { DragOutlined } from '@ant-design/icons'; -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { Space } from 'antd'; import React from 'react'; import { DragHandler, useDesignable } from '../..'; diff --git a/packages/core/client/src/schema-component/antd/page/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/page/demos/demo1.tsx index 4ed02b45c..589856ad4 100644 --- a/packages/core/client/src/schema-component/antd/page/demos/demo1.tsx +++ b/packages/core/client/src/schema-component/antd/page/demos/demo1.tsx @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { DocumentTitleProvider, Page, SchemaComponent, SchemaComponentProvider, Application } from '@nocobase/client'; import React from 'react'; diff --git a/packages/core/client/src/schema-component/antd/pagination/index.tsx b/packages/core/client/src/schema-component/antd/pagination/index.tsx index ab20df15b..4c8a6692e 100644 --- a/packages/core/client/src/schema-component/antd/pagination/index.tsx +++ b/packages/core/client/src/schema-component/antd/pagination/index.tsx @@ -1,4 +1,4 @@ -import { observer } from '@formily/react'; +import { observer } from '@nocobase/schema'; import { Pagination as AntdPagination } from 'antd'; import React, { KeyboardEventHandler } from 'react'; import { useProps } from '../../hooks/useProps'; diff --git a/packages/core/client/src/schema-component/antd/password/Password.tsx b/packages/core/client/src/schema-component/antd/password/Password.tsx index 89f206921..1d4c471ee 100644 --- a/packages/core/client/src/schema-component/antd/password/Password.tsx +++ b/packages/core/client/src/schema-component/antd/password/Password.tsx @@ -1,4 +1,4 @@ -import { connect, mapReadPretty } from '@formily/react'; +import { connect, mapReadPretty } from '@nocobase/schema'; import { Input } from 'antd'; import { PasswordProps } from 'antd/es/input'; import React from 'react'; diff --git a/packages/core/client/src/schema-component/antd/password/PasswordStrength.tsx b/packages/core/client/src/schema-component/antd/password/PasswordStrength.tsx index 80bb0759b..1c30ed800 100644 --- a/packages/core/client/src/schema-component/antd/password/PasswordStrength.tsx +++ b/packages/core/client/src/schema-component/antd/password/PasswordStrength.tsx @@ -1,4 +1,4 @@ -import { isFn } from '@formily/shared'; +import { isFn } from '@nocobase/schema'; import React, { Fragment } from 'react'; import { getStrength } from './utils'; diff --git a/packages/core/client/src/schema-component/antd/percent/Percent.tsx b/packages/core/client/src/schema-component/antd/percent/Percent.tsx index c76dd3da5..6da142646 100644 --- a/packages/core/client/src/schema-component/antd/percent/Percent.tsx +++ b/packages/core/client/src/schema-component/antd/percent/Percent.tsx @@ -1,5 +1,5 @@ -import { connect, mapReadPretty } from '@formily/react'; -import { isNum } from '@formily/shared'; +import { connect, mapReadPretty } from '@nocobase/schema'; +import { isNum } from '@nocobase/schema'; import { InputNumber } from 'antd'; import * as math from 'mathjs'; import React, { useMemo } from 'react'; diff --git a/packages/core/client/src/schema-component/antd/preview/Preview.tsx b/packages/core/client/src/schema-component/antd/preview/Preview.tsx index 049c8f142..9a6a3f061 100644 --- a/packages/core/client/src/schema-component/antd/preview/Preview.tsx +++ b/packages/core/client/src/schema-component/antd/preview/Preview.tsx @@ -1,5 +1,5 @@ import { DeleteOutlined, DownloadOutlined, PlusOutlined } from '@ant-design/icons'; -import { connect, mapReadPretty } from '@formily/react'; +import { connect, mapReadPretty } from '@nocobase/schema'; import { Upload as AntdUpload, Button, Progress, Space, UploadFile } from 'antd'; import cls from 'classnames'; import { saveAs } from 'file-saver'; diff --git a/packages/core/client/src/schema-component/antd/quick-edit/QuickEdit.tsx b/packages/core/client/src/schema-component/antd/quick-edit/QuickEdit.tsx index 9ce9c5d24..03a3eaa0e 100644 --- a/packages/core/client/src/schema-component/antd/quick-edit/QuickEdit.tsx +++ b/packages/core/client/src/schema-component/antd/quick-edit/QuickEdit.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/css'; import { FormItem } from '@formily/antd-v5'; -import { Field, createForm } from '@formily/core'; -import { FormContext, RecursionField, observer, useField, useFieldSchema } from '@formily/react'; +import { Field, createForm } from '@nocobase/schema'; +import { FormContext, RecursionField, observer, useField, useFieldSchema } from '@nocobase/schema'; import React, { useMemo, useRef } from 'react'; import { useCollectionManager_deprecated } from '../../../collection-manager'; import { StablePopover } from '../popover'; diff --git a/packages/core/client/src/schema-component/antd/radio/Radio.tsx b/packages/core/client/src/schema-component/antd/radio/Radio.tsx index e59deacd5..9bad30080 100644 --- a/packages/core/client/src/schema-component/antd/radio/Radio.tsx +++ b/packages/core/client/src/schema-component/antd/radio/Radio.tsx @@ -1,5 +1,5 @@ -import { connect, mapProps, mapReadPretty, useField } from '@formily/react'; -import { isValid } from '@formily/shared'; +import { connect, mapProps, mapReadPretty, useField } from '@nocobase/schema'; +import { isValid } from '@nocobase/schema'; import { Radio as AntdRadio, Tag } from 'antd'; import type { RadioGroupProps, RadioProps } from 'antd/es/radio'; import React, { useState, useEffect } from 'react'; diff --git a/packages/core/client/src/schema-component/antd/record-picker/InputRecordPicker.tsx b/packages/core/client/src/schema-component/antd/record-picker/InputRecordPicker.tsx index 8f91d16fa..7916cbf06 100644 --- a/packages/core/client/src/schema-component/antd/record-picker/InputRecordPicker.tsx +++ b/packages/core/client/src/schema-component/antd/record-picker/InputRecordPicker.tsx @@ -1,5 +1,5 @@ -import { ArrayField } from '@formily/core'; -import { RecursionField, useField, useFieldSchema } from '@formily/react'; +import { ArrayField } from '@nocobase/schema'; +import { RecursionField, useField, useFieldSchema } from '@nocobase/schema'; import { Select } from 'antd'; import { differenceBy, unionBy } from 'lodash'; import React, { createContext, useContext, useEffect, useState } from 'react'; diff --git a/packages/core/client/src/schema-component/antd/record-picker/ReadPrettyRecordPicker.tsx b/packages/core/client/src/schema-component/antd/record-picker/ReadPrettyRecordPicker.tsx index 7f4d08ef1..4a6718b50 100644 --- a/packages/core/client/src/schema-component/antd/record-picker/ReadPrettyRecordPicker.tsx +++ b/packages/core/client/src/schema-component/antd/record-picker/ReadPrettyRecordPicker.tsx @@ -1,5 +1,5 @@ -import { observer, RecursionField, useFieldSchema } from '@formily/react'; -import { toArr } from '@formily/shared'; +import { observer, RecursionField, useFieldSchema } from '@nocobase/schema'; +import { toArr } from '@nocobase/schema'; import React, { Fragment, useRef, useState } from 'react'; import { WithoutTableFieldResource } from '../../../block-provider'; // TODO: 不要使用 '../../../block-provider' 这个路径引用 BlockAssociationContext，在 Vitest 中会报错，待修复 diff --git a/packages/core/client/src/schema-component/antd/record-picker/RecordPicker.tsx b/packages/core/client/src/schema-component/antd/record-picker/RecordPicker.tsx index 5b72ee26a..7fa4debc5 100644 --- a/packages/core/client/src/schema-component/antd/record-picker/RecordPicker.tsx +++ b/packages/core/client/src/schema-component/antd/record-picker/RecordPicker.tsx @@ -1,4 +1,4 @@ -import { connect, mapReadPretty } from '@formily/react'; +import { connect, mapReadPretty } from '@nocobase/schema'; import { InputRecordPicker } from './InputRecordPicker'; import { ReadPrettyRecordPicker } from './ReadPrettyRecordPicker'; diff --git a/packages/core/client/src/schema-component/antd/record-picker/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/record-picker/demos/demo1.tsx index 4a30c407c..74e068b13 100644 --- a/packages/core/client/src/schema-component/antd/record-picker/demos/demo1.tsx +++ b/packages/core/client/src/schema-component/antd/record-picker/demos/demo1.tsx @@ -1,7 +1,7 @@ /** * title: 勾选 */ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { APIClientProvider, Action, diff --git a/packages/core/client/src/schema-component/antd/record-picker/useFieldNames.ts b/packages/core/client/src/schema-component/antd/record-picker/useFieldNames.ts index d4fb39e33..1efeca7ee 100644 --- a/packages/core/client/src/schema-component/antd/record-picker/useFieldNames.ts +++ b/packages/core/client/src/schema-component/antd/record-picker/useFieldNames.ts @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; export const useFieldNames = (props) => { const fieldSchema = useFieldSchema(); diff --git a/packages/core/client/src/schema-component/antd/record-picker/util.ts b/packages/core/client/src/schema-component/antd/record-picker/util.ts index 1bf726a28..660b42be4 100644 --- a/packages/core/client/src/schema-component/antd/record-picker/util.ts +++ b/packages/core/client/src/schema-component/antd/record-picker/util.ts @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { isArr } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { isArr } from '@nocobase/schema'; import { dayjs, getDefaultFormat, str2moment } from '@nocobase/utils/client'; import { Tag } from 'antd'; import React from 'react'; diff --git a/packages/core/client/src/schema-component/antd/remote-select/ReadPretty.tsx b/packages/core/client/src/schema-component/antd/remote-select/ReadPretty.tsx index 0b8848474..281ca70ce 100644 --- a/packages/core/client/src/schema-component/antd/remote-select/ReadPretty.tsx +++ b/packages/core/client/src/schema-component/antd/remote-select/ReadPretty.tsx @@ -1,4 +1,4 @@ -import { observer, useField, useFieldSchema } from '@formily/react'; +import { observer, useField, useFieldSchema } from '@nocobase/schema'; import React from 'react'; import { useRequest } from '../../../api-client'; import { useRecord } from '../../../record-provider'; diff --git a/packages/core/client/src/schema-component/antd/remote-select/RemoteSelect.tsx b/packages/core/client/src/schema-component/antd/remote-select/RemoteSelect.tsx index 82d8bfe89..1af998f5c 100644 --- a/packages/core/client/src/schema-component/antd/remote-select/RemoteSelect.tsx +++ b/packages/core/client/src/schema-component/antd/remote-select/RemoteSelect.tsx @@ -1,5 +1,5 @@ import { LoadingOutlined } from '@ant-design/icons'; -import { connect, mapProps, mapReadPretty, useFieldSchema } from '@formily/react'; +import { connect, mapProps, mapReadPretty, useFieldSchema } from '@nocobase/schema'; import { Divider, SelectProps, Tag } from 'antd'; import dayjs from 'dayjs'; import { uniqBy } from 'lodash'; diff --git a/packages/core/client/src/schema-component/antd/rich-text/RichText.tsx b/packages/core/client/src/schema-component/antd/rich-text/RichText.tsx index b6e43a1f2..2f3530338 100644 --- a/packages/core/client/src/schema-component/antd/rich-text/RichText.tsx +++ b/packages/core/client/src/schema-component/antd/rich-text/RichText.tsx @@ -1,4 +1,4 @@ -import { connect, mapProps, mapReadPretty } from '@formily/react'; +import { connect, mapProps, mapReadPretty } from '@nocobase/schema'; import React from 'react'; import ReactQuill from 'react-quill'; import { isVariable } from '../../../variables/utils/isVariable'; diff --git a/packages/core/client/src/schema-component/antd/select/FormulaSelect.tsx b/packages/core/client/src/schema-component/antd/select/FormulaSelect.tsx index 555966305..8b9c61bec 100644 --- a/packages/core/client/src/schema-component/antd/select/FormulaSelect.tsx +++ b/packages/core/client/src/schema-component/antd/select/FormulaSelect.tsx @@ -1,13 +1,14 @@ import { CloseCircleFilled, CloseOutlined } from '@ant-design/icons'; -import { useFieldSchema, useForm } from '@formily/react'; -import { isValid, toArr } from '@formily/shared'; +import { useFieldSchema, useForm } from '@nocobase/schema'; +import { isValid, toArr } from '@nocobase/schema'; import { isPlainObject } from '@nocobase/utils/client'; import type { SelectProps } from 'antd'; import { Select as AntdSelect, Empty, Spin, Tag } from 'antd'; import React, { useEffect, useMemo, useState } from 'react'; import { FieldNames, getCurrentOptions } from './utils'; -import { useAPIClient, useCollection_deprecated, useRequest } from '@nocobase/client'; import { useAsyncEffect } from 'ahooks'; +import { useCollection_deprecated } from '../../../collection-manager'; +import { useAPIClient, useRequest } from '../../../api-client'; type Props = SelectProps & { objectValue?: boolean; diff --git a/packages/core/client/src/schema-component/antd/select/ReadPretty.tsx b/packages/core/client/src/schema-component/antd/select/ReadPretty.tsx index 2cb894014..bd7965443 100644 --- a/packages/core/client/src/schema-component/antd/select/ReadPretty.tsx +++ b/packages/core/client/src/schema-component/antd/select/ReadPretty.tsx @@ -1,6 +1,6 @@ -import { isArrayField } from '@formily/core'; -import { observer, useField } from '@formily/react'; -import { isValid } from '@formily/shared'; +import { isArrayField } from '@nocobase/schema'; +import { observer, useField } from '@nocobase/schema'; +import { isValid } from '@nocobase/schema'; import { Tag } from 'antd'; import React from 'react'; import { EllipsisWithTooltip } from '../input/EllipsisWithTooltip'; diff --git a/packages/core/client/src/schema-component/antd/select/Select.tsx b/packages/core/client/src/schema-component/antd/select/Select.tsx index a1473336a..147891da8 100644 --- a/packages/core/client/src/schema-component/antd/select/Select.tsx +++ b/packages/core/client/src/schema-component/antd/select/Select.tsx @@ -1,6 +1,6 @@ import { CloseCircleFilled, CloseOutlined, LoadingOutlined } from '@ant-design/icons'; -import { connect, mapProps, mapReadPretty } from '@formily/react'; -import { isValid, toArr } from '@formily/shared'; +import { connect, mapProps, mapReadPretty } from '@nocobase/schema'; +import { isValid, toArr } from '@nocobase/schema'; import { isPlainObject } from '@nocobase/utils/client'; import type { SelectProps } from 'antd'; import { Select as AntdSelect, Empty, Spin, Tag } from 'antd'; diff --git a/packages/core/client/src/schema-component/antd/select/demos/demo3.tsx b/packages/core/client/src/schema-component/antd/select/demos/demo3.tsx index be9dfbc43..ec20ff461 100644 --- a/packages/core/client/src/schema-component/antd/select/demos/demo3.tsx +++ b/packages/core/client/src/schema-component/antd/select/demos/demo3.tsx @@ -2,7 +2,7 @@ * title: Select */ import { FormItem } from '@formily/antd-v5'; -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { SchemaComponent, SchemaComponentProvider, Select } from '@nocobase/client'; import React from 'react'; diff --git a/packages/core/client/src/schema-component/antd/table-v2/Table.ActionColumnDesigner.tsx b/packages/core/client/src/schema-component/antd/table-v2/Table.ActionColumnDesigner.tsx index 4acbe45d1..9dca9972a 100644 --- a/packages/core/client/src/schema-component/antd/table-v2/Table.ActionColumnDesigner.tsx +++ b/packages/core/client/src/schema-component/antd/table-v2/Table.ActionColumnDesigner.tsx @@ -1,5 +1,5 @@ import { DragOutlined } from '@ant-design/icons'; -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { Space } from 'antd'; import React from 'react'; import { useSchemaInitializerRender } from '../../../application'; diff --git a/packages/core/client/src/schema-component/antd/table-v2/Table.Column.ActionBar.tsx b/packages/core/client/src/schema-component/antd/table-v2/Table.Column.ActionBar.tsx index 1e3d4f4ea..2b325d86a 100644 --- a/packages/core/client/src/schema-component/antd/table-v2/Table.Column.ActionBar.tsx +++ b/packages/core/client/src/schema-component/antd/table-v2/Table.Column.ActionBar.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/css'; -import { observer } from '@formily/react'; +import { observer } from '@nocobase/schema'; import React from 'react'; import { SortableItem, useDesigner } from '../..'; import { useFlag } from '../../../flag-provider/hooks/useFlag'; diff --git a/packages/core/client/src/schema-component/antd/table-v2/Table.Column.Decorator.tsx b/packages/core/client/src/schema-component/antd/table-v2/Table.Column.Decorator.tsx index e26bed37c..6f4d4df78 100644 --- a/packages/core/client/src/schema-component/antd/table-v2/Table.Column.Decorator.tsx +++ b/packages/core/client/src/schema-component/antd/table-v2/Table.Column.Decorator.tsx @@ -1,4 +1,4 @@ -import { useField, useFieldSchema } from '@formily/react'; +import { useField, useFieldSchema } from '@nocobase/schema'; import React, { useLayoutEffect } from 'react'; import { SortableItem, diff --git a/packages/core/client/src/schema-component/antd/table-v2/Table.Column.Designer.tsx b/packages/core/client/src/schema-component/antd/table-v2/Table.Column.Designer.tsx index 99850fc9a..c166d71d2 100644 --- a/packages/core/client/src/schema-component/antd/table-v2/Table.Column.Designer.tsx +++ b/packages/core/client/src/schema-component/antd/table-v2/Table.Column.Designer.tsx @@ -1,4 +1,4 @@ -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import { set } from 'lodash'; import React from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/schema-component/antd/table-v2/Table.Column.tsx b/packages/core/client/src/schema-component/antd/table-v2/Table.Column.tsx index e57f84752..aa2f0fcc2 100644 --- a/packages/core/client/src/schema-component/antd/table-v2/Table.Column.tsx +++ b/packages/core/client/src/schema-component/antd/table-v2/Table.Column.tsx @@ -1,4 +1,4 @@ -import { useField } from '@formily/react'; +import { useField } from '@nocobase/schema'; import React from 'react'; export const TableColumn = (props) => { diff --git a/packages/core/client/src/schema-component/antd/table-v2/Table.tsx b/packages/core/client/src/schema-component/antd/table-v2/Table.tsx index 30a15da15..dd976e233 100644 --- a/packages/core/client/src/schema-component/antd/table-v2/Table.tsx +++ b/packages/core/client/src/schema-component/antd/table-v2/Table.tsx @@ -2,11 +2,11 @@ import { DeleteOutlined, MenuOutlined, CopyOutlined } from '@ant-design/icons'; import { TinyColor } from '@ctrl/tinycolor'; import { SortableContext, SortableContextProps, useSortable } from '@dnd-kit/sortable'; import { css } from '@emotion/css'; -import { ArrayField } from '@formily/core'; -import { spliceArrayState } from '@formily/core/esm/shared/internals'; -import { RecursionField, Schema, observer, useField, useFieldSchema } from '@formily/react'; -import { action } from '@formily/reactive'; -import { uid } from '@formily/shared'; +import { ArrayField } from '@nocobase/schema'; +import { spliceArrayState } from '@nocobase/schema'; +import { RecursionField, Schema, observer, useField, useFieldSchema } from '@nocobase/schema'; +import { action } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { isPortalInBody } from '@nocobase/utils/client'; import { useMemoizedFn } from 'ahooks'; import { Table as AntdTable, TableColumnProps } from 'antd'; diff --git a/packages/core/client/src/schema-component/antd/table-v2/TableBlockDesigner.tsx b/packages/core/client/src/schema-component/antd/table-v2/TableBlockDesigner.tsx index c823057da..c7d103037 100644 --- a/packages/core/client/src/schema-component/antd/table-v2/TableBlockDesigner.tsx +++ b/packages/core/client/src/schema-component/antd/table-v2/TableBlockDesigner.tsx @@ -1,6 +1,6 @@ import { ArrayItems } from '@formily/antd-v5'; -import { ISchema, useField, useFieldSchema } from '@formily/react'; -import { Field } from '@formily/core'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; +import { Field } from '@nocobase/schema'; import React, { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { useAPIClient } from '../../../api-client'; diff --git a/packages/core/client/src/schema-component/antd/table-v2/TableField.tsx b/packages/core/client/src/schema-component/antd/table-v2/TableField.tsx index b594cbbde..3895fe2b8 100644 --- a/packages/core/client/src/schema-component/antd/table-v2/TableField.tsx +++ b/packages/core/client/src/schema-component/antd/table-v2/TableField.tsx @@ -1,5 +1,5 @@ -import { Field } from '@formily/core'; -import { observer, useField, useFieldSchema, useForm } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { observer, useField, useFieldSchema, useForm } from '@nocobase/schema'; import React, { useEffect } from 'react'; import { useFormBlockContext } from '../../../block-provider'; import { useCollection_deprecated } from '../../../collection-manager'; diff --git a/packages/core/client/src/schema-component/antd/table-v2/TableSelectorDesigner.tsx b/packages/core/client/src/schema-component/antd/table-v2/TableSelectorDesigner.tsx index b325a5fb3..63552ff16 100644 --- a/packages/core/client/src/schema-component/antd/table-v2/TableSelectorDesigner.tsx +++ b/packages/core/client/src/schema-component/antd/table-v2/TableSelectorDesigner.tsx @@ -1,5 +1,5 @@ import { ArrayItems } from '@formily/antd-v5'; -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import _ from 'lodash'; import React, { useContext } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/schema-component/antd/table-v2/components/ColumnFieldProvider.tsx b/packages/core/client/src/schema-component/antd/table-v2/components/ColumnFieldProvider.tsx index f41b8bdd2..41deab217 100644 --- a/packages/core/client/src/schema-component/antd/table-v2/components/ColumnFieldProvider.tsx +++ b/packages/core/client/src/schema-component/antd/table-v2/components/ColumnFieldProvider.tsx @@ -1,4 +1,4 @@ -import { observer, RecursionField } from '@formily/react'; +import { observer, RecursionField } from '@nocobase/schema'; import React from 'react'; import { useCollectionManager_deprecated } from '../../../../collection-manager'; import { useRecord } from '../../../../record-provider'; diff --git a/packages/core/client/src/schema-component/antd/table-v2/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/table-v2/demos/demo1.tsx index b1db206b5..90a3c88c9 100644 --- a/packages/core/client/src/schema-component/antd/table-v2/demos/demo1.tsx +++ b/packages/core/client/src/schema-component/antd/table-v2/demos/demo1.tsx @@ -1,4 +1,4 @@ -import { ISchema, useForm } from '@formily/react'; +import { ISchema, useForm } from '@nocobase/schema'; import { APIClientProvider, AntdSchemaComponentProvider, diff --git a/packages/core/client/src/schema-component/antd/table-v2/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/table-v2/demos/demo2.tsx index 05122f50b..2d12a45f9 100644 --- a/packages/core/client/src/schema-component/antd/table-v2/demos/demo2.tsx +++ b/packages/core/client/src/schema-component/antd/table-v2/demos/demo2.tsx @@ -1,5 +1,5 @@ -import { ArrayField } from '@formily/core'; -import { connect, ISchema, observer, RecursionField, useField, useFieldSchema } from '@formily/react'; +import { ArrayField } from '@nocobase/schema'; +import { connect, ISchema, observer, RecursionField, useField, useFieldSchema } from '@nocobase/schema'; import { SchemaComponent, SchemaComponentProvider } from '@nocobase/client'; import { Table, TableColumnType } from 'antd'; import React from 'react'; diff --git a/packages/core/client/src/schema-component/antd/table-v2/utils.ts b/packages/core/client/src/schema-component/antd/table-v2/utils.ts index d0153bf4a..e3e142664 100644 --- a/packages/core/client/src/schema-component/antd/table-v2/utils.ts +++ b/packages/core/client/src/schema-component/antd/table-v2/utils.ts @@ -1,4 +1,4 @@ -import { ISchema, Schema } from '@formily/react'; +import { ISchema, Schema } from '@nocobase/schema'; export const isCollectionFieldComponent = (schema: ISchema) => { return schema['x-component'] === 'CollectionField'; diff --git a/packages/core/client/src/schema-component/antd/table/Table.Array.tsx b/packages/core/client/src/schema-component/antd/table/Table.Array.tsx index 2c3740719..b4c9fec6b 100644 --- a/packages/core/client/src/schema-component/antd/table/Table.Array.tsx +++ b/packages/core/client/src/schema-component/antd/table/Table.Array.tsx @@ -1,7 +1,7 @@ import { MenuOutlined } from '@ant-design/icons'; import { TinyColor } from '@ctrl/tinycolor'; import { css } from '@emotion/css'; -import { ArrayField, Field } from '@formily/core'; +import { ArrayField, Field } from '@nocobase/schema'; import { RecursionField, Schema, @@ -9,7 +9,7 @@ import { observer, useField, useFieldSchema, -} from '@formily/react'; +} from '@nocobase/schema'; import { Table, TableColumnProps } from 'antd'; import { default as classNames, default as cls } from 'classnames'; import React, { useContext, useState } from 'react'; diff --git a/packages/core/client/src/schema-component/antd/table/Table.Column.ActionBar.tsx b/packages/core/client/src/schema-component/antd/table/Table.Column.ActionBar.tsx index 2a991ca7f..84177657b 100644 --- a/packages/core/client/src/schema-component/antd/table/Table.Column.ActionBar.tsx +++ b/packages/core/client/src/schema-component/antd/table/Table.Column.ActionBar.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/css'; -import { observer } from '@formily/react'; +import { observer } from '@nocobase/schema'; import React from 'react'; import { SortableItem, useDesigner } from '../..'; diff --git a/packages/core/client/src/schema-component/antd/table/Table.Column.Decorator.tsx b/packages/core/client/src/schema-component/antd/table/Table.Column.Decorator.tsx index 5e89f46de..51484048a 100644 --- a/packages/core/client/src/schema-component/antd/table/Table.Column.Decorator.tsx +++ b/packages/core/client/src/schema-component/antd/table/Table.Column.Decorator.tsx @@ -1,4 +1,4 @@ -import { useField, useFieldSchema } from '@formily/react'; +import { useField, useFieldSchema } from '@nocobase/schema'; import React, { useLayoutEffect } from 'react'; import { SortableItem, useCollection_deprecated, useCompile, useDesignable, useDesigner } from '../../../'; import { designerCss } from './Table.Column.ActionBar'; diff --git a/packages/core/client/src/schema-component/antd/table/Table.Column.Designer.tsx b/packages/core/client/src/schema-component/antd/table/Table.Column.Designer.tsx index b5ba5908d..43987f8d3 100644 --- a/packages/core/client/src/schema-component/antd/table/Table.Column.Designer.tsx +++ b/packages/core/client/src/schema-component/antd/table/Table.Column.Designer.tsx @@ -1,4 +1,4 @@ -import { ISchema, useField, useFieldSchema, useForm } from '@formily/react'; +import { ISchema, useField, useFieldSchema, useForm } from '@nocobase/schema'; import React from 'react'; import { useCollectionManager_deprecated } from '../../../collection-manager'; import { diff --git a/packages/core/client/src/schema-component/antd/table/Table.Column.tsx b/packages/core/client/src/schema-component/antd/table/Table.Column.tsx index 7c360ca5a..7e057bdbe 100644 --- a/packages/core/client/src/schema-component/antd/table/Table.Column.tsx +++ b/packages/core/client/src/schema-component/antd/table/Table.Column.tsx @@ -1,4 +1,4 @@ -import { useField } from '@formily/react'; +import { useField } from '@nocobase/schema'; import React from 'react'; export const TableColumn = (props) => { diff --git a/packages/core/client/src/schema-component/antd/table/Table.RowActionDesigner.tsx b/packages/core/client/src/schema-component/antd/table/Table.RowActionDesigner.tsx index 4f2a0aeb1..6c01c93ed 100644 --- a/packages/core/client/src/schema-component/antd/table/Table.RowActionDesigner.tsx +++ b/packages/core/client/src/schema-component/antd/table/Table.RowActionDesigner.tsx @@ -1,5 +1,5 @@ import { DragOutlined } from '@ant-design/icons'; -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { Space } from 'antd'; import React from 'react'; import { useSchemaInitializerRender } from '../../../application'; diff --git a/packages/core/client/src/schema-component/antd/table/Table.RowSelection.tsx b/packages/core/client/src/schema-component/antd/table/Table.RowSelection.tsx index 46cdd256a..b0334097f 100644 --- a/packages/core/client/src/schema-component/antd/table/Table.RowSelection.tsx +++ b/packages/core/client/src/schema-component/antd/table/Table.RowSelection.tsx @@ -1,6 +1,6 @@ -import { Field } from '@formily/core'; -import { observer, useField } from '@formily/react'; -import { isArr, isValid } from '@formily/shared'; +import { Field } from '@nocobase/schema'; +import { observer, useField } from '@nocobase/schema'; +import { isArr, isValid } from '@nocobase/schema'; import { TableProps } from 'antd'; import React from 'react'; import { TableVoid } from './Table.Void'; diff --git a/packages/core/client/src/schema-component/antd/table/Table.Void.Designer.tsx b/packages/core/client/src/schema-component/antd/table/Table.Void.Designer.tsx index ce1425cf9..3ce7742ae 100644 --- a/packages/core/client/src/schema-component/antd/table/Table.Void.Designer.tsx +++ b/packages/core/client/src/schema-component/antd/table/Table.Void.Designer.tsx @@ -1,5 +1,5 @@ import { ArrayItems } from '@formily/antd-v5'; -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import React from 'react'; import { useTranslation } from 'react-i18next'; import { useCollection_deprecated, useResourceActionContext } from '../../../collection-manager'; diff --git a/packages/core/client/src/schema-component/antd/table/Table.Void.tsx b/packages/core/client/src/schema-component/antd/table/Table.Void.tsx index 5d6a450c0..c71bbd7bf 100644 --- a/packages/core/client/src/schema-component/antd/table/Table.Void.tsx +++ b/packages/core/client/src/schema-component/antd/table/Table.Void.tsx @@ -1,5 +1,5 @@ -import { createForm, Field } from '@formily/core'; -import { FieldContext, FormContext, observer, useField, useFieldSchema } from '@formily/react'; +import { createForm, Field } from '@nocobase/schema'; +import { FieldContext, FormContext, observer, useField, useFieldSchema } from '@nocobase/schema'; import { Options, Result } from 'ahooks/es/useRequest/src/types'; import { TablePaginationConfig, TableProps } from 'antd'; import { cloneDeep } from 'lodash'; diff --git a/packages/core/client/src/schema-component/antd/table/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/table/demos/demo1.tsx index d6bec14a9..b9368b944 100644 --- a/packages/core/client/src/schema-component/antd/table/demos/demo1.tsx +++ b/packages/core/client/src/schema-component/antd/table/demos/demo1.tsx @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { Application, Input, SchemaComponent, SchemaComponentProvider, Table } from '@nocobase/client'; import React from 'react'; diff --git a/packages/core/client/src/schema-component/antd/table/demos/demo2.tsx b/packages/core/client/src/schema-component/antd/table/demos/demo2.tsx index 684b54f5d..4eb88c40f 100644 --- a/packages/core/client/src/schema-component/antd/table/demos/demo2.tsx +++ b/packages/core/client/src/schema-component/antd/table/demos/demo2.tsx @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { Application, Input, SchemaComponent, SchemaComponentProvider, Table } from '@nocobase/client'; import React from 'react'; diff --git a/packages/core/client/src/schema-component/antd/table/demos/demo3.tsx b/packages/core/client/src/schema-component/antd/table/demos/demo3.tsx index cbe56ae80..6961fd9c5 100644 --- a/packages/core/client/src/schema-component/antd/table/demos/demo3.tsx +++ b/packages/core/client/src/schema-component/antd/table/demos/demo3.tsx @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { Application, Input, SchemaComponent, SchemaComponentProvider, Table } from '@nocobase/client'; import React from 'react'; diff --git a/packages/core/client/src/schema-component/antd/table/demos/demo4.tsx b/packages/core/client/src/schema-component/antd/table/demos/demo4.tsx index c84708a4e..446bdce37 100644 --- a/packages/core/client/src/schema-component/antd/table/demos/demo4.tsx +++ b/packages/core/client/src/schema-component/antd/table/demos/demo4.tsx @@ -1,5 +1,5 @@ -import { ISchema, observer } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema, observer } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { Action, Application, diff --git a/packages/core/client/src/schema-component/antd/tabs/Tabs.Designer.tsx b/packages/core/client/src/schema-component/antd/tabs/Tabs.Designer.tsx index e5e993baf..cced4deec 100644 --- a/packages/core/client/src/schema-component/antd/tabs/Tabs.Designer.tsx +++ b/packages/core/client/src/schema-component/antd/tabs/Tabs.Designer.tsx @@ -1,4 +1,4 @@ -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import React from 'react'; import { useTranslation } from 'react-i18next'; import { useDesignable } from '../..'; diff --git a/packages/core/client/src/schema-component/antd/tabs/Tabs.tsx b/packages/core/client/src/schema-component/antd/tabs/Tabs.tsx index 5f5216326..b4fe00d41 100644 --- a/packages/core/client/src/schema-component/antd/tabs/Tabs.tsx +++ b/packages/core/client/src/schema-component/antd/tabs/Tabs.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/css'; -import { observer, RecursionField, useField, useFieldSchema } from '@formily/react'; +import { observer, RecursionField, useField, useFieldSchema } from '@nocobase/schema'; import { Tabs as AntdTabs, TabPaneProps, TabsProps } from 'antd'; import classNames from 'classnames'; import React, { useMemo } from 'react'; diff --git a/packages/core/client/src/schema-component/antd/tabs/demos/demo1.tsx b/packages/core/client/src/schema-component/antd/tabs/demos/demo1.tsx index 01a55aadf..8ca0f140c 100644 --- a/packages/core/client/src/schema-component/antd/tabs/demos/demo1.tsx +++ b/packages/core/client/src/schema-component/antd/tabs/demos/demo1.tsx @@ -1,7 +1,7 @@ /** * title: Tabs */ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { Action, Application, SchemaComponent, SchemaComponentProvider, Tabs } from '@nocobase/client'; import React from 'react'; import { AntdSchemaComponentProvider } from '../../AntdSchemaComponentProvider'; diff --git a/packages/core/client/src/schema-component/antd/time-picker/ReadPretty.tsx b/packages/core/client/src/schema-component/antd/time-picker/ReadPretty.tsx index 1044621b2..e74b8fa9c 100644 --- a/packages/core/client/src/schema-component/antd/time-picker/ReadPretty.tsx +++ b/packages/core/client/src/schema-component/antd/time-picker/ReadPretty.tsx @@ -1,5 +1,5 @@ import { usePrefixCls } from '@formily/antd-v5/esm/__builtins__'; -import { toArr } from '@formily/shared'; +import { toArr } from '@nocobase/schema'; import dayjs from 'dayjs'; import { TimeRangePickerProps } from 'antd/es/time-picker'; import cls from 'classnames'; diff --git a/packages/core/client/src/schema-component/antd/time-picker/TimePicker.tsx b/packages/core/client/src/schema-component/antd/time-picker/TimePicker.tsx index 0ac87f539..ebe001ad9 100644 --- a/packages/core/client/src/schema-component/antd/time-picker/TimePicker.tsx +++ b/packages/core/client/src/schema-component/antd/time-picker/TimePicker.tsx @@ -1,5 +1,5 @@ import { dayjsable, formatDayjsValue } from '@formily/antd-v5/esm/__builtins__'; -import { connect, mapProps, mapReadPretty } from '@formily/react'; +import { connect, mapProps, mapReadPretty } from '@nocobase/schema'; import dayjs from 'dayjs'; import { TimePicker as AntdTimePicker } from 'antd'; import { TimePickerProps as AntdTimePickerProps, TimeRangePickerProps } from 'antd/es/time-picker'; diff --git a/packages/core/client/src/schema-component/antd/tree-select/ReadPretty.tsx b/packages/core/client/src/schema-component/antd/tree-select/ReadPretty.tsx index 53a11d335..56de09800 100644 --- a/packages/core/client/src/schema-component/antd/tree-select/ReadPretty.tsx +++ b/packages/core/client/src/schema-component/antd/tree-select/ReadPretty.tsx @@ -1,7 +1,7 @@ import { usePrefixCls } from '@formily/antd-v5/esm/__builtins__'; -import { Field } from '@formily/core'; -import { observer, useField } from '@formily/react'; -import { isArr } from '@formily/shared'; +import { Field } from '@nocobase/schema'; +import { observer, useField } from '@nocobase/schema'; +import { isArr } from '@nocobase/schema'; import { Tag } from 'antd'; import { TreeSelectProps } from 'antd/es/tree-select'; import cls from 'classnames'; diff --git a/packages/core/client/src/schema-component/antd/tree-select/TreeSelect.tsx b/packages/core/client/src/schema-component/antd/tree-select/TreeSelect.tsx index 201b6eab8..70e86d933 100644 --- a/packages/core/client/src/schema-component/antd/tree-select/TreeSelect.tsx +++ b/packages/core/client/src/schema-component/antd/tree-select/TreeSelect.tsx @@ -1,5 +1,5 @@ import { LoadingOutlined } from '@ant-design/icons'; -import { connect, mapProps, mapReadPretty } from '@formily/react'; +import { connect, mapProps, mapReadPretty } from '@nocobase/schema'; import { TreeSelect as AntdTreeSelect } from 'antd'; import React from 'react'; import { ReadPretty } from './ReadPretty'; diff --git a/packages/core/client/src/schema-component/antd/unixTimestamp/UnixTimestamp.tsx b/packages/core/client/src/schema-component/antd/unixTimestamp/UnixTimestamp.tsx index 4eeed12d3..34345a63a 100644 --- a/packages/core/client/src/schema-component/antd/unixTimestamp/UnixTimestamp.tsx +++ b/packages/core/client/src/schema-component/antd/unixTimestamp/UnixTimestamp.tsx @@ -1,4 +1,4 @@ -import { connect, mapReadPretty } from '@formily/react'; +import { connect, mapReadPretty } from '@nocobase/schema'; import React, { useMemo } from 'react'; import { DatePicker } from '../date-picker'; import dayjs from 'dayjs'; diff --git a/packages/core/client/src/schema-component/antd/upload/ReadPretty.tsx b/packages/core/client/src/schema-component/antd/upload/ReadPretty.tsx index 8f00abe2b..678540e18 100644 --- a/packages/core/client/src/schema-component/antd/upload/ReadPretty.tsx +++ b/packages/core/client/src/schema-component/antd/upload/ReadPretty.tsx @@ -1,6 +1,6 @@ import { DownloadOutlined } from '@ant-design/icons'; -import { Field } from '@formily/core'; -import { useField } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { useField } from '@nocobase/schema'; import { isString } from '@nocobase/utils/client'; import { Button, Modal, Space } from 'antd'; import useUploadStyle from 'antd/es/upload/style'; diff --git a/packages/core/client/src/schema-component/antd/upload/Upload.tsx b/packages/core/client/src/schema-component/antd/upload/Upload.tsx index 4bfc3eb0c..1d25a72fa 100644 --- a/packages/core/client/src/schema-component/antd/upload/Upload.tsx +++ b/packages/core/client/src/schema-component/antd/upload/Upload.tsx @@ -1,5 +1,5 @@ import { DeleteOutlined, DownloadOutlined, InboxOutlined, LoadingOutlined, PlusOutlined } from '@ant-design/icons'; -import { connect, mapProps, mapReadPretty } from '@formily/react'; +import { connect, mapProps, mapReadPretty } from '@nocobase/schema'; import { Upload as AntdUpload, Button, Modal, Progress, Space, UploadFile } from 'antd'; import cls from 'classnames'; import { saveAs } from 'file-saver'; diff --git a/packages/core/client/src/schema-component/antd/upload/shared.ts b/packages/core/client/src/schema-component/antd/upload/shared.ts index ab89c5040..ee07df6ac 100644 --- a/packages/core/client/src/schema-component/antd/upload/shared.ts +++ b/packages/core/client/src/schema-component/antd/upload/shared.ts @@ -1,7 +1,7 @@ -import { Field } from '@formily/core'; -import { useField } from '@formily/react'; -import { reaction } from '@formily/reactive'; -import { isArr, isValid, toArr as toArray } from '@formily/shared'; +import { Field } from '@nocobase/schema'; +import { useField } from '@nocobase/schema'; +import { reaction } from '@nocobase/schema'; +import { isArr, isValid, toArr as toArray } from '@nocobase/schema'; import { UploadFile } from 'antd/es/upload/interface'; import { useEffect } from 'react'; import { useAPIClient } from '../../../api-client'; diff --git a/packages/core/client/src/schema-component/antd/variable/Input.tsx b/packages/core/client/src/schema-component/antd/variable/Input.tsx index 818290add..01958f5ce 100644 --- a/packages/core/client/src/schema-component/antd/variable/Input.tsx +++ b/packages/core/client/src/schema-component/antd/variable/Input.tsx @@ -1,6 +1,6 @@ import { CloseCircleFilled } from '@ant-design/icons'; import { css, cx } from '@emotion/css'; -import { useForm } from '@formily/react'; +import { useForm } from '@nocobase/schema'; import { error } from '@nocobase/utils/client'; import { Input as AntInput, Cascader, DatePicker, InputNumber, Select, Space, Tag } from 'antd'; import useAntdInputStyle from 'antd/es/input/style'; diff --git a/packages/core/client/src/schema-component/antd/variable/TextArea.tsx b/packages/core/client/src/schema-component/antd/variable/TextArea.tsx index 4b17afbf2..ed766130f 100644 --- a/packages/core/client/src/schema-component/antd/variable/TextArea.tsx +++ b/packages/core/client/src/schema-component/antd/variable/TextArea.tsx @@ -1,5 +1,5 @@ import { css, cx } from '@emotion/css'; -import { useForm } from '@formily/react'; +import { useForm } from '@nocobase/schema'; import { Input, Space } from 'antd'; import { cloneDeep } from 'lodash'; import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'; diff --git a/packages/core/client/src/schema-component/antd/variable/Variable.tsx b/packages/core/client/src/schema-component/antd/variable/Variable.tsx index e6273cd0b..9d9b0b81d 100644 --- a/packages/core/client/src/schema-component/antd/variable/Variable.tsx +++ b/packages/core/client/src/schema-component/antd/variable/Variable.tsx @@ -1,4 +1,4 @@ -import { connect, mapReadPretty } from '@formily/react'; +import { connect, mapReadPretty } from '@nocobase/schema'; import React, { createContext, useContext } from 'react'; import { Input } from './Input'; diff --git a/packages/core/client/src/schema-component/common/dnd-context/index.tsx b/packages/core/client/src/schema-component/common/dnd-context/index.tsx index be7394b25..4c8df8547 100644 --- a/packages/core/client/src/schema-component/common/dnd-context/index.tsx +++ b/packages/core/client/src/schema-component/common/dnd-context/index.tsx @@ -1,6 +1,6 @@ import { DndContext as DndKitContext, DragEndEvent, DragOverlay, rectIntersection } from '@dnd-kit/core'; import { Props } from '@dnd-kit/core/dist/components/DndContext/DndContext'; -import { observer } from '@formily/react'; +import { observer } from '@nocobase/schema'; import React, { useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useAPIClient } from '../../../'; diff --git a/packages/core/client/src/schema-component/common/sortable-item/SortableItem.tsx b/packages/core/client/src/schema-component/common/sortable-item/SortableItem.tsx index 05fc2d2a3..0ee9638cf 100644 --- a/packages/core/client/src/schema-component/common/sortable-item/SortableItem.tsx +++ b/packages/core/client/src/schema-component/common/sortable-item/SortableItem.tsx @@ -1,7 +1,7 @@ import { TinyColor } from '@ctrl/tinycolor'; import { useDraggable, useDroppable } from '@dnd-kit/core'; import { cx } from '@emotion/css'; -import { Schema, observer, useField, useFieldSchema } from '@formily/react'; +import { Schema, observer, useField, useFieldSchema } from '@nocobase/schema'; import React, { HTMLAttributes, createContext, useContext, useMemo } from 'react'; import { useToken } from '../../antd/__builtins__'; diff --git a/packages/core/client/src/schema-component/core/FormProvider.tsx b/packages/core/client/src/schema-component/core/FormProvider.tsx index 75b2774bd..fc4a17238 100644 --- a/packages/core/client/src/schema-component/core/FormProvider.tsx +++ b/packages/core/client/src/schema-component/core/FormProvider.tsx @@ -1,9 +1,9 @@ -import { createForm } from '@formily/core'; +import { createForm } from '@nocobase/schema'; import { FormProvider as FormilyFormProvider, SchemaExpressionScopeContext, SchemaOptionsContext, -} from '@formily/react'; +} from '@nocobase/schema'; import React, { useContext, useMemo } from 'react'; import { SchemaComponentOptions } from './SchemaComponentOptions'; diff --git a/packages/core/client/src/schema-component/core/RemoteSchemaComponent.tsx b/packages/core/client/src/schema-component/core/RemoteSchemaComponent.tsx index 1056f9d7b..77f2c8e8e 100644 --- a/packages/core/client/src/schema-component/core/RemoteSchemaComponent.tsx +++ b/packages/core/client/src/schema-component/core/RemoteSchemaComponent.tsx @@ -1,5 +1,5 @@ -import { createForm } from '@formily/core'; -import { Schema } from '@formily/react'; +import { createForm } from '@nocobase/schema'; +import { Schema } from '@nocobase/schema'; import { Spin } from 'antd'; import React, { useMemo } from 'react'; import { useRequest } from '../../api-client'; diff --git a/packages/core/client/src/schema-component/core/SchemaComponent.tsx b/packages/core/client/src/schema-component/core/SchemaComponent.tsx index 91270a609..6cc3bdde4 100644 --- a/packages/core/client/src/schema-component/core/SchemaComponent.tsx +++ b/packages/core/client/src/schema-component/core/SchemaComponent.tsx @@ -1,4 +1,4 @@ -import { IRecursionFieldProps, ISchemaFieldProps, RecursionField, Schema } from '@formily/react'; +import { IRecursionFieldProps, ISchemaFieldProps, RecursionField, Schema } from '@nocobase/schema'; import React, { useContext, useMemo } from 'react'; import { SchemaComponentContext } from '../context'; import { SchemaComponentOptions } from './SchemaComponentOptions'; diff --git a/packages/core/client/src/schema-component/core/SchemaComponentOptions.tsx b/packages/core/client/src/schema-component/core/SchemaComponentOptions.tsx index 3bdd436ac..231ff51f1 100644 --- a/packages/core/client/src/schema-component/core/SchemaComponentOptions.tsx +++ b/packages/core/client/src/schema-component/core/SchemaComponentOptions.tsx @@ -1,4 +1,4 @@ -import { ExpressionScope, SchemaComponentsContext, SchemaOptionsContext } from '@formily/react'; +import { ExpressionScope, SchemaComponentsContext, SchemaOptionsContext } from '@nocobase/schema'; import React, { memo, useContext, useMemo } from 'react'; import { ISchemaComponentOptionsProps } from '../types'; diff --git a/packages/core/client/src/schema-component/core/SchemaComponentProvider.tsx b/packages/core/client/src/schema-component/core/SchemaComponentProvider.tsx index 39358a4e7..f3e1099bb 100644 --- a/packages/core/client/src/schema-component/core/SchemaComponentProvider.tsx +++ b/packages/core/client/src/schema-component/core/SchemaComponentProvider.tsx @@ -1,6 +1,6 @@ -import { createForm } from '@formily/core'; -import { FormProvider, Schema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { createForm } from '@nocobase/schema'; +import { FormProvider, Schema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import React, { useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { SchemaComponentContext } from '../context'; diff --git a/packages/core/client/src/schema-component/demos/demo1.tsx b/packages/core/client/src/schema-component/demos/demo1.tsx index a46f567b6..cc0357a0b 100644 --- a/packages/core/client/src/schema-component/demos/demo1.tsx +++ b/packages/core/client/src/schema-component/demos/demo1.tsx @@ -3,9 +3,9 @@ */ import React from 'react'; import { SchemaComponentProvider, SchemaComponent, useDesignable } from '@nocobase/client'; -import { observer, Schema, useFieldSchema } from '@formily/react'; +import { observer, Schema, useFieldSchema } from '@nocobase/schema'; import { Button, Space } from 'antd'; -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; const Hello = observer( (props) => { diff --git a/packages/core/client/src/schema-component/hooks/__tests__/designable.test.ts b/packages/core/client/src/schema-component/hooks/__tests__/designable.test.ts index 0e80f873b..31e49e47c 100644 --- a/packages/core/client/src/schema-component/hooks/__tests__/designable.test.ts +++ b/packages/core/client/src/schema-component/hooks/__tests__/designable.test.ts @@ -1,5 +1,5 @@ import { vi } from 'vitest'; -import { Schema } from '@formily/react'; +import { Schema } from '@nocobase/schema'; import { createDesignable, Designable } from '../useDesignable'; describe('createDesignable', () => { diff --git a/packages/core/client/src/schema-component/hooks/__tests__/splitWrapSchema.test.ts b/packages/core/client/src/schema-component/hooks/__tests__/splitWrapSchema.test.ts index 795bd34a1..afa1b354b 100644 --- a/packages/core/client/src/schema-component/hooks/__tests__/splitWrapSchema.test.ts +++ b/packages/core/client/src/schema-component/hooks/__tests__/splitWrapSchema.test.ts @@ -1,4 +1,4 @@ -import { Schema } from '@formily/react'; +import { Schema } from '@nocobase/schema'; import { splitWrapSchema } from '../useDesignable'; describe('splitWrapSchema', () => { diff --git a/packages/core/client/src/schema-component/hooks/useCompile.ts b/packages/core/client/src/schema-component/hooks/useCompile.ts index 2b51f9c91..ec962bbf9 100644 --- a/packages/core/client/src/schema-component/hooks/useCompile.ts +++ b/packages/core/client/src/schema-component/hooks/useCompile.ts @@ -1,4 +1,4 @@ -import { Schema, SchemaExpressionScopeContext, SchemaOptionsContext } from '@formily/react'; +import { Schema, SchemaExpressionScopeContext, SchemaOptionsContext } from '@nocobase/schema'; import { isValidElement, useContext } from 'react'; interface Props { diff --git a/packages/core/client/src/schema-component/hooks/useComponent.ts b/packages/core/client/src/schema-component/hooks/useComponent.ts index 880c04525..fd8d78817 100644 --- a/packages/core/client/src/schema-component/hooks/useComponent.ts +++ b/packages/core/client/src/schema-component/hooks/useComponent.ts @@ -1,4 +1,4 @@ -import { SchemaOptionsContext } from '@formily/react'; +import { SchemaOptionsContext } from '@nocobase/schema'; import { get } from 'lodash'; import { useContext } from 'react'; diff --git a/packages/core/client/src/schema-component/hooks/useDesignable.tsx b/packages/core/client/src/schema-component/hooks/useDesignable.tsx index d3918f246..0574fec5a 100644 --- a/packages/core/client/src/schema-component/hooks/useDesignable.tsx +++ b/packages/core/client/src/schema-component/hooks/useDesignable.tsx @@ -1,6 +1,6 @@ -import { GeneralField, Query } from '@formily/core'; -import { ISchema, Schema, SchemaOptionsContext, useField, useFieldSchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { GeneralField, Query } from '@nocobase/schema'; +import { ISchema, Schema, SchemaOptionsContext, useField, useFieldSchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { message } from 'antd'; import cloneDeep from 'lodash/cloneDeep'; import get from 'lodash/get'; diff --git a/packages/core/client/src/schema-component/hooks/useDesigner.ts b/packages/core/client/src/schema-component/hooks/useDesigner.ts index 160bed95f..159771d13 100644 --- a/packages/core/client/src/schema-component/hooks/useDesigner.ts +++ b/packages/core/client/src/schema-component/hooks/useDesigner.ts @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { useComponent, useDesignable } from '.'; import { useMemo } from 'react'; import { SchemaToolbar } from '../../schema-settings'; diff --git a/packages/core/client/src/schema-component/hooks/useFieldComponentOptions.ts b/packages/core/client/src/schema-component/hooks/useFieldComponentOptions.ts index 2eb328448..b6bc70a97 100644 --- a/packages/core/client/src/schema-component/hooks/useFieldComponentOptions.ts +++ b/packages/core/client/src/schema-component/hooks/useFieldComponentOptions.ts @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import { useCollection_deprecated, useCollectionManager_deprecated } from '../../collection-manager'; diff --git a/packages/core/client/src/schema-component/hooks/useFieldModeOptions.tsx b/packages/core/client/src/schema-component/hooks/useFieldModeOptions.tsx index 52824c30b..a338f7b1f 100644 --- a/packages/core/client/src/schema-component/hooks/useFieldModeOptions.tsx +++ b/packages/core/client/src/schema-component/hooks/useFieldModeOptions.tsx @@ -1,4 +1,4 @@ -import { useField, useFieldSchema, useForm } from '@formily/react'; +import { useField, useFieldSchema, useForm } from '@nocobase/schema'; import { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import { useCollection_deprecated, useCollectionManager_deprecated } from '../../collection-manager'; diff --git a/packages/core/client/src/schema-component/hooks/useFieldProps.ts b/packages/core/client/src/schema-component/hooks/useFieldProps.ts index ca494bcb4..846c9c404 100644 --- a/packages/core/client/src/schema-component/hooks/useFieldProps.ts +++ b/packages/core/client/src/schema-component/hooks/useFieldProps.ts @@ -1,5 +1,5 @@ import { useContext, useRef } from 'react'; -import { Schema, SchemaExpressionScopeContext, SchemaOptionsContext } from '@formily/react'; +import { Schema, SchemaExpressionScopeContext, SchemaOptionsContext } from '@nocobase/schema'; export const useFieldProps = (schema: Schema) => { const options = useContext(SchemaOptionsContext); diff --git a/packages/core/client/src/schema-component/hooks/useFieldTitle.ts b/packages/core/client/src/schema-component/hooks/useFieldTitle.ts index e18bcdd10..bfcb651c4 100644 --- a/packages/core/client/src/schema-component/hooks/useFieldTitle.ts +++ b/packages/core/client/src/schema-component/hooks/useFieldTitle.ts @@ -1,5 +1,5 @@ -import { Field } from '@formily/core'; -import { useField, useFieldSchema } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { useEffect } from 'react'; import { useCompile } from './useCompile'; import { useCollection_deprecated, useCollectionManager_deprecated } from '../../collection-manager'; diff --git a/packages/core/client/src/schema-component/types.ts b/packages/core/client/src/schema-component/types.ts index 16cafb36e..8cbd43f8b 100644 --- a/packages/core/client/src/schema-component/types.ts +++ b/packages/core/client/src/schema-component/types.ts @@ -1,5 +1,5 @@ -import { Form } from '@formily/core'; -import { IRecursionFieldProps, ISchemaFieldProps, SchemaReactComponents } from '@formily/react'; +import { Form } from '@nocobase/schema'; +import { IRecursionFieldProps, ISchemaFieldProps, SchemaReactComponents } from '@nocobase/schema'; import React from 'react'; export interface ISchemaComponentContext { diff --git a/packages/core/client/src/schema-initializer/buttons/RecordBlockInitializers.tsx b/packages/core/client/src/schema-initializer/buttons/RecordBlockInitializers.tsx index 16f5197b1..441d0271e 100644 --- a/packages/core/client/src/schema-initializer/buttons/RecordBlockInitializers.tsx +++ b/packages/core/client/src/schema-initializer/buttons/RecordBlockInitializers.tsx @@ -1,4 +1,4 @@ -import { Schema } from '@formily/react'; +import { Schema } from '@nocobase/schema'; import { useCallback, useMemo } from 'react'; import { useCollection, diff --git a/packages/core/client/src/schema-initializer/buttons/TabPaneInitializers.tsx b/packages/core/client/src/schema-initializer/buttons/TabPaneInitializers.tsx index b0bc396e2..3506d2c3c 100644 --- a/packages/core/client/src/schema-initializer/buttons/TabPaneInitializers.tsx +++ b/packages/core/client/src/schema-initializer/buttons/TabPaneInitializers.tsx @@ -1,4 +1,4 @@ -import { useForm } from '@formily/react'; +import { useForm } from '@nocobase/schema'; import React, { useMemo } from 'react'; import { SchemaComponent, useActionContext, useDesignable, useRecord } from '../..'; import { SchemaInitializer } from '../../application/schema-initializer/SchemaInitializer'; diff --git a/packages/core/client/src/schema-initializer/components/CreateRecordAction.tsx b/packages/core/client/src/schema-initializer/components/CreateRecordAction.tsx index 097945644..dd387ab7d 100644 --- a/packages/core/client/src/schema-initializer/components/CreateRecordAction.tsx +++ b/packages/core/client/src/schema-initializer/components/CreateRecordAction.tsx @@ -1,6 +1,6 @@ import { DownOutlined } from '@ant-design/icons'; import { css } from '@emotion/css'; -import { observer, RecursionField, useField, useFieldSchema, useForm } from '@formily/react'; +import { observer, RecursionField, useField, useFieldSchema, useForm } from '@nocobase/schema'; import { Button, Dropdown, MenuProps } from 'antd'; import React, { useEffect, useMemo, useState, forwardRef, createRef } from 'react'; import { composeRef } from 'rc-util/lib/ref'; diff --git a/packages/core/client/src/schema-initializer/components/assigned-field/AssignedField.tsx b/packages/core/client/src/schema-initializer/components/assigned-field/AssignedField.tsx index cd854a087..53e519a71 100644 --- a/packages/core/client/src/schema-initializer/components/assigned-field/AssignedField.tsx +++ b/packages/core/client/src/schema-initializer/components/assigned-field/AssignedField.tsx @@ -1,6 +1,6 @@ -import { Field } from '@formily/core'; -import { useField, useFieldSchema } from '@formily/react'; -import { merge } from '@formily/shared'; +import { Field } from '@nocobase/schema'; +import { useField, useFieldSchema } from '@nocobase/schema'; +import { merge } from '@nocobase/schema'; import _ from 'lodash'; import React, { useCallback, useEffect, useMemo } from 'react'; import { useFormBlockContext } from '../../../block-provider'; diff --git a/packages/core/client/src/schema-initializer/demos/insert-schema-basic.tsx b/packages/core/client/src/schema-initializer/demos/insert-schema-basic.tsx index 53f7ee5fb..61e5d37c6 100644 --- a/packages/core/client/src/schema-initializer/demos/insert-schema-basic.tsx +++ b/packages/core/client/src/schema-initializer/demos/insert-schema-basic.tsx @@ -9,8 +9,8 @@ import { useSchemaInitializerItem, useSchemaInitializerRender, } from '@nocobase/client'; -import { observer, useField } from '@formily/react'; -import { Field } from '@formily/core'; +import { observer, useField } from '@nocobase/schema'; +import { Field } from '@nocobase/schema'; const Hello = observer(() => { const field = useField(); diff --git a/packages/core/client/src/schema-initializer/hooks/useGetAriaLabelOfSchemaInitializer.ts b/packages/core/client/src/schema-initializer/hooks/useGetAriaLabelOfSchemaInitializer.ts index d73cdf072..4373f7799 100644 --- a/packages/core/client/src/schema-initializer/hooks/useGetAriaLabelOfSchemaInitializer.ts +++ b/packages/core/client/src/schema-initializer/hooks/useGetAriaLabelOfSchemaInitializer.ts @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { useCallback } from 'react'; import { useCollection_deprecated } from '../../collection-manager'; diff --git a/packages/core/client/src/schema-initializer/items/BlockInitializer.tsx b/packages/core/client/src/schema-initializer/items/BlockInitializer.tsx index 05de0d33e..d63f6ad4d 100644 --- a/packages/core/client/src/schema-initializer/items/BlockInitializer.tsx +++ b/packages/core/client/src/schema-initializer/items/BlockInitializer.tsx @@ -1,4 +1,4 @@ -import { merge } from '@formily/shared'; +import { merge } from '@nocobase/schema'; import React from 'react'; import { SchemaInitializerItem, useSchemaInitializer, useSchemaInitializerItem } from '../../application'; diff --git a/packages/core/client/src/schema-initializer/items/InitializerWithSwitch.tsx b/packages/core/client/src/schema-initializer/items/InitializerWithSwitch.tsx index 68a7823a4..1ef435a08 100644 --- a/packages/core/client/src/schema-initializer/items/InitializerWithSwitch.tsx +++ b/packages/core/client/src/schema-initializer/items/InitializerWithSwitch.tsx @@ -1,4 +1,4 @@ -import { merge } from '@formily/shared'; +import { merge } from '@nocobase/schema'; import React from 'react'; import { useCurrentSchema } from '../utils'; diff --git a/packages/core/client/src/schema-initializer/items/TableActionColumnInitializer.tsx b/packages/core/client/src/schema-initializer/items/TableActionColumnInitializer.tsx index 4c51c2bc7..c09a699ba 100644 --- a/packages/core/client/src/schema-initializer/items/TableActionColumnInitializer.tsx +++ b/packages/core/client/src/schema-initializer/items/TableActionColumnInitializer.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; import { useSchemaInitializerItem } from '../../application'; import { InitializerWithSwitch } from './InitializerWithSwitch'; diff --git a/packages/core/client/src/schema-initializer/utils.ts b/packages/core/client/src/schema-initializer/utils.ts index 8bae179d0..360e2ecfd 100644 --- a/packages/core/client/src/schema-initializer/utils.ts +++ b/packages/core/client/src/schema-initializer/utils.ts @@ -1,6 +1,6 @@ -import { Field, Form } from '@formily/core'; -import { ISchema, Schema, useFieldSchema, useForm } from '@formily/react'; -import { uid } from '@formily/shared'; +import { Field, Form } from '@nocobase/schema'; +import { ISchema, Schema, useFieldSchema, useForm } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import _ from 'lodash'; import { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/schema-items/GeneralSchemaItems.tsx b/packages/core/client/src/schema-items/GeneralSchemaItems.tsx index 02a541ce4..7ea799019 100644 --- a/packages/core/client/src/schema-items/GeneralSchemaItems.tsx +++ b/packages/core/client/src/schema-items/GeneralSchemaItems.tsx @@ -1,5 +1,5 @@ -import { Field } from '@formily/core'; -import { ISchema, observer, useField, useFieldSchema } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { ISchema, observer, useField, useFieldSchema } from '@nocobase/schema'; import _ from 'lodash'; import React from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/schema-items/GeneralSettings.tsx b/packages/core/client/src/schema-items/GeneralSettings.tsx index d576a87e7..4a3e2fd18 100644 --- a/packages/core/client/src/schema-items/GeneralSettings.tsx +++ b/packages/core/client/src/schema-items/GeneralSettings.tsx @@ -1,5 +1,5 @@ -import { Field } from '@formily/core'; -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import { useTranslation } from 'react-i18next'; import { useDesignable } from '../schema-component'; import { SchemaSettingOptions } from '../application'; diff --git a/packages/core/client/src/schema-items/OpenModeSchemaItems.tsx b/packages/core/client/src/schema-items/OpenModeSchemaItems.tsx index dfccc53bf..9458aa75c 100644 --- a/packages/core/client/src/schema-items/OpenModeSchemaItems.tsx +++ b/packages/core/client/src/schema-items/OpenModeSchemaItems.tsx @@ -1,4 +1,4 @@ -import { useField, useFieldSchema } from '@formily/react'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { Select } from 'antd'; import React from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/schema-settings/DataTemplates/FormDataTemplates.tsx b/packages/core/client/src/schema-settings/DataTemplates/FormDataTemplates.tsx index b823962e2..8245b021c 100644 --- a/packages/core/client/src/schema-settings/DataTemplates/FormDataTemplates.tsx +++ b/packages/core/client/src/schema-settings/DataTemplates/FormDataTemplates.tsx @@ -1,6 +1,6 @@ -import { Field } from '@formily/core'; -import { connect, mapProps, observer } from '@formily/react'; -import { observable } from '@formily/reactive'; +import { Field } from '@nocobase/schema'; +import { connect, mapProps, observer } from '@nocobase/schema'; +import { observable } from '@nocobase/schema'; import { Tree as AntdTree } from 'antd'; import _ from 'lodash'; import React, { useMemo } from 'react'; diff --git a/packages/core/client/src/schema-settings/DataTemplates/components/DataTemplateTitle.tsx b/packages/core/client/src/schema-settings/DataTemplates/components/DataTemplateTitle.tsx index bc4b0e5de..ebde414c9 100644 --- a/packages/core/client/src/schema-settings/DataTemplates/components/DataTemplateTitle.tsx +++ b/packages/core/client/src/schema-settings/DataTemplates/components/DataTemplateTitle.tsx @@ -1,8 +1,8 @@ import { CopyOutlined } from '@ant-design/icons'; import { ArrayBase } from '@formily/antd-v5'; -import { ArrayField } from '@formily/core'; -import { ISchema, RecursionField, observer, useField, useFieldSchema } from '@formily/react'; -import { toArr, uid } from '@formily/shared'; +import { ArrayField } from '@nocobase/schema'; +import { ISchema, RecursionField, observer, useField, useFieldSchema } from '@nocobase/schema'; +import { toArr, uid } from '@nocobase/schema'; import { Badge, Card, Collapse, CollapsePanelProps, CollapseProps, Empty, Input } from 'antd'; import cls from 'classnames'; import { clone } from 'lodash'; diff --git a/packages/core/client/src/schema-settings/DataTemplates/components/Designer.tsx b/packages/core/client/src/schema-settings/DataTemplates/components/Designer.tsx index c37fa00fc..2807e83a4 100644 --- a/packages/core/client/src/schema-settings/DataTemplates/components/Designer.tsx +++ b/packages/core/client/src/schema-settings/DataTemplates/components/Designer.tsx @@ -1,5 +1,5 @@ -import { Field } from '@formily/core'; -import { ISchema, observer, useField, useFieldSchema } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { ISchema, observer, useField, useFieldSchema } from '@nocobase/schema'; import { error } from '@nocobase/utils/client'; import { Select } from 'antd'; import _ from 'lodash'; diff --git a/packages/core/client/src/schema-settings/DataTemplates/hooks/useCollectionState.ts b/packages/core/client/src/schema-settings/DataTemplates/hooks/useCollectionState.ts index 5beb6deb8..1672ee36a 100644 --- a/packages/core/client/src/schema-settings/DataTemplates/hooks/useCollectionState.ts +++ b/packages/core/client/src/schema-settings/DataTemplates/hooks/useCollectionState.ts @@ -1,5 +1,5 @@ -import { ArrayField } from '@formily/core'; -import { useField } from '@formily/react'; +import { ArrayField } from '@nocobase/schema'; +import { useField } from '@nocobase/schema'; import React, { useCallback, useState } from 'react'; import { useCollectionManager_deprecated } from '../../../collection-manager'; import { useCompile } from '../../../schema-component'; diff --git a/packages/core/client/src/schema-settings/DataTemplates/utils.tsx b/packages/core/client/src/schema-settings/DataTemplates/utils.tsx index 2eba4e047..f3adc1f77 100644 --- a/packages/core/client/src/schema-settings/DataTemplates/utils.tsx +++ b/packages/core/client/src/schema-settings/DataTemplates/utils.tsx @@ -1,5 +1,5 @@ import { ArrayBase } from '@formily/antd-v5'; -import { useForm } from '@formily/react'; +import { useForm } from '@nocobase/schema'; import { message } from 'antd'; import React, { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/schema-settings/DateFormat/ExpiresRadio.tsx b/packages/core/client/src/schema-settings/DateFormat/ExpiresRadio.tsx index ffa5120d3..86f83af64 100644 --- a/packages/core/client/src/schema-settings/DateFormat/ExpiresRadio.tsx +++ b/packages/core/client/src/schema-settings/DateFormat/ExpiresRadio.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/css'; import dayjs from 'dayjs'; -import { connect, mapProps } from '@formily/react'; +import { connect, mapProps } from '@nocobase/schema'; import { useBoolean } from 'ahooks'; import { Input, Radio, Space } from 'antd'; import React, { useState } from 'react'; diff --git a/packages/core/client/src/schema-settings/EnableChildCollections/DynamicComponent.tsx b/packages/core/client/src/schema-settings/EnableChildCollections/DynamicComponent.tsx index c1825e9d0..ae131d9a6 100644 --- a/packages/core/client/src/schema-settings/EnableChildCollections/DynamicComponent.tsx +++ b/packages/core/client/src/schema-settings/EnableChildCollections/DynamicComponent.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/css'; -import { observer, useFieldSchema } from '@formily/react'; +import { observer, useFieldSchema } from '@nocobase/schema'; import React, { useEffect, useMemo } from 'react'; import { useCompile } from '../../schema-component'; import { Variable } from '.././../schema-component'; diff --git a/packages/core/client/src/schema-settings/EnableChildCollections/index.tsx b/packages/core/client/src/schema-settings/EnableChildCollections/index.tsx index b15fcf12d..1d2ea2243 100644 --- a/packages/core/client/src/schema-settings/EnableChildCollections/index.tsx +++ b/packages/core/client/src/schema-settings/EnableChildCollections/index.tsx @@ -1,5 +1,5 @@ -import { observer, useForm } from '@formily/react'; -import { action } from '@formily/reactive'; +import { observer, useForm } from '@nocobase/schema'; +import { action } from '@nocobase/schema'; import React from 'react'; import { useCollectionManager_deprecated } from '../../collection-manager'; import { SchemaComponent, useCompile } from '../../schema-component'; diff --git a/packages/core/client/src/schema-settings/GeneralSchemaDesigner.tsx b/packages/core/client/src/schema-settings/GeneralSchemaDesigner.tsx index 70400da02..f777bbd6a 100644 --- a/packages/core/client/src/schema-settings/GeneralSchemaDesigner.tsx +++ b/packages/core/client/src/schema-settings/GeneralSchemaDesigner.tsx @@ -1,6 +1,6 @@ import { DragOutlined, MenuOutlined, PlusOutlined } from '@ant-design/icons'; import { css } from '@emotion/css'; -import { useField, useFieldSchema } from '@formily/react'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { Space } from 'antd'; import classNames from 'classnames'; import React, { FC, useEffect, useMemo, useRef } from 'react'; diff --git a/packages/core/client/src/schema-settings/LinkageRules/DynamicComponent.tsx b/packages/core/client/src/schema-settings/LinkageRules/DynamicComponent.tsx index 2b5a5bfa8..42eabaf45 100644 --- a/packages/core/client/src/schema-settings/LinkageRules/DynamicComponent.tsx +++ b/packages/core/client/src/schema-settings/LinkageRules/DynamicComponent.tsx @@ -1,6 +1,6 @@ -import { createForm, onFieldValueChange } from '@formily/core'; -import { FieldContext, FormContext } from '@formily/react'; -import { merge } from '@formily/shared'; +import { createForm, onFieldValueChange } from '@nocobase/schema'; +import { FieldContext, FormContext } from '@nocobase/schema'; +import { merge } from '@nocobase/schema'; import React, { useContext, useMemo } from 'react'; import { SchemaComponent } from '../../schema-component/core'; import { useComponent } from '../../schema-component/hooks'; diff --git a/packages/core/client/src/schema-settings/LinkageRules/LinkageRuleAction.tsx b/packages/core/client/src/schema-settings/LinkageRules/LinkageRuleAction.tsx index d9b2a8f2c..75987a407 100644 --- a/packages/core/client/src/schema-settings/LinkageRules/LinkageRuleAction.tsx +++ b/packages/core/client/src/schema-settings/LinkageRules/LinkageRuleAction.tsx @@ -1,8 +1,8 @@ import { CloseCircleOutlined } from '@ant-design/icons'; import { css } from '@emotion/css'; import { TreeSelect } from '@formily/antd-v5'; -import { observer } from '@formily/react'; -import { uid } from '@formily/shared'; +import { observer } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { Select, Space } from 'antd'; import React, { useCallback, useContext, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/schema-settings/LinkageRules/LinkageRuleActionGroup.tsx b/packages/core/client/src/schema-settings/LinkageRules/LinkageRuleActionGroup.tsx index 8ad50a5d3..685b76a47 100644 --- a/packages/core/client/src/schema-settings/LinkageRules/LinkageRuleActionGroup.tsx +++ b/packages/core/client/src/schema-settings/LinkageRules/LinkageRuleActionGroup.tsx @@ -1,5 +1,10 @@ -import { ArrayField as ArrayFieldModel, VoidField } from '@formily/core'; -import { ArrayField, ObjectField, observer, useField } from '@formily/react'; +import { ArrayField as ArrayFieldModel, VoidField } from '@nocobase/schema'; +import { + ArrayFieldComponent as ArrayField, + ObjectFieldComponent as ObjectField, + observer, + useField, +} from '@nocobase/schema'; import { Space } from 'antd'; import React, { useCallback, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/schema-settings/LinkageRules/components/LinkageHeader.tsx b/packages/core/client/src/schema-settings/LinkageRules/components/LinkageHeader.tsx index 05b2ffc80..7eb39166b 100644 --- a/packages/core/client/src/schema-settings/LinkageRules/components/LinkageHeader.tsx +++ b/packages/core/client/src/schema-settings/LinkageRules/components/LinkageHeader.tsx @@ -1,8 +1,8 @@ import { CopyOutlined } from '@ant-design/icons'; import { ArrayBase } from '@formily/antd-v5'; -import { ArrayField } from '@formily/core'; -import { ISchema, RecursionField, observer, useField, useFieldSchema } from '@formily/react'; -import { toArr } from '@formily/shared'; +import { ArrayField } from '@nocobase/schema'; +import { ISchema, RecursionField, observer, useField, useFieldSchema } from '@nocobase/schema'; +import { toArr } from '@nocobase/schema'; import { Badge, Card, Collapse, CollapsePanelProps, CollapseProps, Empty, Input } from 'antd'; import cls from 'classnames'; import { cloneDeep } from 'lodash'; diff --git a/packages/core/client/src/schema-settings/LinkageRules/context.ts b/packages/core/client/src/schema-settings/LinkageRules/context.ts index 3899de9ef..a390a3abf 100644 --- a/packages/core/client/src/schema-settings/LinkageRules/context.ts +++ b/packages/core/client/src/schema-settings/LinkageRules/context.ts @@ -1,5 +1,5 @@ -import { ObjectField } from '@formily/core'; -import { Schema } from '@formily/react'; +import { ObjectField } from '@nocobase/schema'; +import { Schema } from '@nocobase/schema'; import { createContext } from 'react'; export interface FilterContextProps { diff --git a/packages/core/client/src/schema-settings/LinkageRules/index.tsx b/packages/core/client/src/schema-settings/LinkageRules/index.tsx index a44fbad76..636be74bb 100644 --- a/packages/core/client/src/schema-settings/LinkageRules/index.tsx +++ b/packages/core/client/src/schema-settings/LinkageRules/index.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/css'; -import { Form } from '@formily/core'; -import { observer, useFieldSchema } from '@formily/react'; +import { Form } from '@nocobase/schema'; +import { observer, useFieldSchema } from '@nocobase/schema'; import React, { useMemo } from 'react'; import { FormBlockContext } from '../../block-provider'; import { useCollectionManager_deprecated } from '../../collection-manager'; diff --git a/packages/core/client/src/schema-settings/LinkageRules/useValues.ts b/packages/core/client/src/schema-settings/LinkageRules/useValues.ts index c277354fb..12de544f4 100644 --- a/packages/core/client/src/schema-settings/LinkageRules/useValues.ts +++ b/packages/core/client/src/schema-settings/LinkageRules/useValues.ts @@ -1,4 +1,4 @@ -import { useField } from '@formily/react'; +import { useField } from '@nocobase/schema'; import { useEffect, useContext } from 'react'; import { LinkageLogicContext } from './context'; diff --git a/packages/core/client/src/schema-settings/SchemaSettings.tsx b/packages/core/client/src/schema-settings/SchemaSettings.tsx index cdc3c8ee9..10b246c8f 100644 --- a/packages/core/client/src/schema-settings/SchemaSettings.tsx +++ b/packages/core/client/src/schema-settings/SchemaSettings.tsx @@ -1,8 +1,8 @@ import { css } from '@emotion/css'; import { ArrayCollapse, ArrayItems, FormItem, FormLayout, Input } from '@formily/antd-v5'; -import { Field, GeneralField, createForm } from '@formily/core'; -import { ISchema, Schema, SchemaOptionsContext, useField, useFieldSchema, useForm } from '@formily/react'; -import { uid } from '@formily/shared'; +import { Field, GeneralField, createForm } from '@nocobase/schema'; +import { ISchema, Schema, SchemaOptionsContext, useField, useFieldSchema, useForm } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { error } from '@nocobase/utils/client'; import type { DropdownProps } from 'antd'; import { diff --git a/packages/core/client/src/schema-settings/SchemaSettingsDataScope.tsx b/packages/core/client/src/schema-settings/SchemaSettingsDataScope.tsx index 042393a58..0c6dec51a 100644 --- a/packages/core/client/src/schema-settings/SchemaSettingsDataScope.tsx +++ b/packages/core/client/src/schema-settings/SchemaSettingsDataScope.tsx @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import React, { FC, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { DatePickerProvider, useCollectionManager_deprecated, useRecord } from '..'; diff --git a/packages/core/client/src/schema-settings/SchemaSettingsDateFormat.tsx b/packages/core/client/src/schema-settings/SchemaSettingsDateFormat.tsx index 89ff1f31f..71bc100af 100644 --- a/packages/core/client/src/schema-settings/SchemaSettingsDateFormat.tsx +++ b/packages/core/client/src/schema-settings/SchemaSettingsDateFormat.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/css'; -import { ISchema, Schema, useField } from '@formily/react'; +import { ISchema, Schema, useField } from '@nocobase/schema'; import React from 'react'; import { useTranslation } from 'react-i18next'; import { useCollectionManager_deprecated, useDesignable } from '..'; diff --git a/packages/core/client/src/schema-settings/SchemaSettingsDefaultValue.tsx b/packages/core/client/src/schema-settings/SchemaSettingsDefaultValue.tsx index 5be4f99c3..0c83b415b 100644 --- a/packages/core/client/src/schema-settings/SchemaSettingsDefaultValue.tsx +++ b/packages/core/client/src/schema-settings/SchemaSettingsDefaultValue.tsx @@ -1,5 +1,5 @@ -import { Field } from '@formily/core'; -import { ISchema, Schema, useField, useFieldSchema } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { ISchema, Schema, useField, useFieldSchema } from '@nocobase/schema'; import _ from 'lodash'; import React, { useCallback, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/schema-settings/SchemaSettingsNumberFormat.tsx b/packages/core/client/src/schema-settings/SchemaSettingsNumberFormat.tsx index 2f578b0d3..b8faee9a1 100644 --- a/packages/core/client/src/schema-settings/SchemaSettingsNumberFormat.tsx +++ b/packages/core/client/src/schema-settings/SchemaSettingsNumberFormat.tsx @@ -1,5 +1,5 @@ import { css } from '@emotion/css'; -import { ISchema, Schema, useField, useForm } from '@formily/react'; +import { ISchema, Schema, useField, useForm } from '@nocobase/schema'; import React from 'react'; import { useTranslation } from 'react-i18next'; import { Select } from 'antd'; diff --git a/packages/core/client/src/schema-settings/SchemaSettingsSortingRule.tsx b/packages/core/client/src/schema-settings/SchemaSettingsSortingRule.tsx index c2bd2ba7f..1ae54351e 100644 --- a/packages/core/client/src/schema-settings/SchemaSettingsSortingRule.tsx +++ b/packages/core/client/src/schema-settings/SchemaSettingsSortingRule.tsx @@ -1,4 +1,4 @@ -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import _ from 'lodash'; import React from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/schema-settings/VariableInput/VariableInput.tsx b/packages/core/client/src/schema-settings/VariableInput/VariableInput.tsx index 647eb1655..494bced8e 100644 --- a/packages/core/client/src/schema-settings/VariableInput/VariableInput.tsx +++ b/packages/core/client/src/schema-settings/VariableInput/VariableInput.tsx @@ -1,6 +1,6 @@ -import { Form } from '@formily/core'; +import { Form } from '@nocobase/schema'; // @ts-ignore -import { Schema } from '@formily/json-schema'; +import { Schema } from '@nocobase/schema'; import _ from 'lodash'; import React, { useCallback } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/schema-settings/VariableInput/hooks/useBaseVariable.tsx b/packages/core/client/src/schema-settings/VariableInput/hooks/useBaseVariable.tsx index 937a399f2..172a79d77 100644 --- a/packages/core/client/src/schema-settings/VariableInput/hooks/useBaseVariable.tsx +++ b/packages/core/client/src/schema-settings/VariableInput/hooks/useBaseVariable.tsx @@ -1,4 +1,4 @@ -import { ISchema, Schema } from '@formily/json-schema'; +import { ISchema, Schema } from '@nocobase/schema'; import React, { useContext, useMemo } from 'react'; import { CollectionFieldOptions_deprecated, useCollectionManager_deprecated } from '../../../collection-manager'; import { useCompile, useGetFilterOptions } from '../../../schema-component'; diff --git a/packages/core/client/src/schema-settings/VariableInput/hooks/useFormVariable.ts b/packages/core/client/src/schema-settings/VariableInput/hooks/useFormVariable.ts index a053d6208..e741da290 100644 --- a/packages/core/client/src/schema-settings/VariableInput/hooks/useFormVariable.ts +++ b/packages/core/client/src/schema-settings/VariableInput/hooks/useFormVariable.ts @@ -1,5 +1,5 @@ -import { Form } from '@formily/core'; -import { Schema } from '@formily/json-schema'; +import { Form } from '@nocobase/schema'; +import { Schema } from '@nocobase/schema'; import { useTranslation } from 'react-i18next'; import { useFormBlockContext } from '../../../block-provider'; import { CollectionFieldOptions_deprecated } from '../../../collection-manager'; diff --git a/packages/core/client/src/schema-settings/VariableInput/hooks/useIterationVariable.ts b/packages/core/client/src/schema-settings/VariableInput/hooks/useIterationVariable.ts index 2808c97b8..fc780366a 100644 --- a/packages/core/client/src/schema-settings/VariableInput/hooks/useIterationVariable.ts +++ b/packages/core/client/src/schema-settings/VariableInput/hooks/useIterationVariable.ts @@ -1,4 +1,4 @@ -import { Schema } from '@formily/json-schema'; +import { Schema } from '@nocobase/schema'; import { useTranslation } from 'react-i18next'; import { CollectionFieldOptions_deprecated } from '../../../collection-manager'; import { CollectionFieldOptions } from '../../../data-source/collection/Collection'; diff --git a/packages/core/client/src/schema-settings/VariableInput/hooks/useParentRecordVariable.ts b/packages/core/client/src/schema-settings/VariableInput/hooks/useParentRecordVariable.ts index e4ef841c3..82d26a2a7 100644 --- a/packages/core/client/src/schema-settings/VariableInput/hooks/useParentRecordVariable.ts +++ b/packages/core/client/src/schema-settings/VariableInput/hooks/useParentRecordVariable.ts @@ -1,4 +1,4 @@ -import { Schema } from '@formily/json-schema'; +import { Schema } from '@nocobase/schema'; import { useTranslation } from 'react-i18next'; import { CollectionFieldOptions_deprecated } from '../../../collection-manager'; import { useParentCollection } from '../../../data-source/collection/AssociationProvider'; diff --git a/packages/core/client/src/schema-settings/VariableInput/hooks/useRecordVariable.ts b/packages/core/client/src/schema-settings/VariableInput/hooks/useRecordVariable.ts index 5078217f7..2819f0ff1 100644 --- a/packages/core/client/src/schema-settings/VariableInput/hooks/useRecordVariable.ts +++ b/packages/core/client/src/schema-settings/VariableInput/hooks/useRecordVariable.ts @@ -1,4 +1,4 @@ -import { Schema } from '@formily/json-schema'; +import { Schema } from '@nocobase/schema'; import _ from 'lodash'; import { useTranslation } from 'react-i18next'; import { CollectionFieldOptions_deprecated } from '../../../collection-manager'; diff --git a/packages/core/client/src/schema-settings/VariableInput/hooks/useRoleVariable.ts b/packages/core/client/src/schema-settings/VariableInput/hooks/useRoleVariable.ts index 6c853110c..bb11cd62c 100644 --- a/packages/core/client/src/schema-settings/VariableInput/hooks/useRoleVariable.ts +++ b/packages/core/client/src/schema-settings/VariableInput/hooks/useRoleVariable.ts @@ -1,4 +1,4 @@ -import { Schema } from '@formily/json-schema'; +import { Schema } from '@nocobase/schema'; import { useTranslation } from 'react-i18next'; import { useAPIClient } from '../../../api-client'; import { CollectionFieldOptions_deprecated } from '../../../collection-manager'; diff --git a/packages/core/client/src/schema-settings/VariableInput/hooks/useUserVariable.ts b/packages/core/client/src/schema-settings/VariableInput/hooks/useUserVariable.ts index e8dd74101..1ba13e203 100644 --- a/packages/core/client/src/schema-settings/VariableInput/hooks/useUserVariable.ts +++ b/packages/core/client/src/schema-settings/VariableInput/hooks/useUserVariable.ts @@ -1,4 +1,4 @@ -import { Schema } from '@formily/json-schema'; +import { Schema } from '@nocobase/schema'; import { useTranslation } from 'react-i18next'; import { CollectionFieldOptions_deprecated } from '../../../collection-manager'; import { CollectionFieldOptions } from '../../../data-source/collection/Collection'; diff --git a/packages/core/client/src/schema-settings/VariableInput/hooks/useVariableOptions.ts b/packages/core/client/src/schema-settings/VariableInput/hooks/useVariableOptions.ts index d2aaa1ae0..6c0ac2641 100644 --- a/packages/core/client/src/schema-settings/VariableInput/hooks/useVariableOptions.ts +++ b/packages/core/client/src/schema-settings/VariableInput/hooks/useVariableOptions.ts @@ -1,5 +1,5 @@ -import { Form } from '@formily/core'; -import { ISchema, Schema } from '@formily/react'; +import { Form } from '@nocobase/schema'; +import { ISchema, Schema } from '@nocobase/schema'; import { useMemo } from 'react'; import { CollectionFieldOptions_deprecated, useCollection_deprecated } from '../../../collection-manager'; import { useBlockCollection } from './useBlockCollection'; diff --git a/packages/core/client/src/schema-settings/VariableInput/type.ts b/packages/core/client/src/schema-settings/VariableInput/type.ts index 77e9ad145..0c083ec21 100644 --- a/packages/core/client/src/schema-settings/VariableInput/type.ts +++ b/packages/core/client/src/schema-settings/VariableInput/type.ts @@ -1,4 +1,4 @@ -import { Schema } from '@formily/react'; +import { Schema } from '@nocobase/schema'; import type { DefaultOptionType } from 'antd/lib/cascader'; export interface Option extends DefaultOptionType { diff --git a/packages/core/client/src/schema-settings/demos/schema-basic.tsx b/packages/core/client/src/schema-settings/demos/schema-basic.tsx index 8ee0eea3a..dc9943963 100644 --- a/packages/core/client/src/schema-settings/demos/schema-basic.tsx +++ b/packages/core/client/src/schema-settings/demos/schema-basic.tsx @@ -7,7 +7,7 @@ import { SchemaSettings, useSchemaSettingsRender, } from '@nocobase/client'; -import { observer, useFieldSchema } from '@formily/react'; +import { observer, useFieldSchema } from '@nocobase/schema'; const mySchemaSetting = new SchemaSettings({ name: 'MySchemaSetting', diff --git a/packages/core/client/src/schema-settings/hooks/useGetAriaLabelOfDesigner.ts b/packages/core/client/src/schema-settings/hooks/useGetAriaLabelOfDesigner.ts index fab7add10..a2e9b3195 100644 --- a/packages/core/client/src/schema-settings/hooks/useGetAriaLabelOfDesigner.ts +++ b/packages/core/client/src/schema-settings/hooks/useGetAriaLabelOfDesigner.ts @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { useCallback } from 'react'; import { useCollection_deprecated } from '../../collection-manager'; diff --git a/packages/core/client/src/schema-settings/hooks/useIsAllowToSetDefaultValue.tsx b/packages/core/client/src/schema-settings/hooks/useIsAllowToSetDefaultValue.tsx index 122bebbf5..a481f2fde 100644 --- a/packages/core/client/src/schema-settings/hooks/useIsAllowToSetDefaultValue.tsx +++ b/packages/core/client/src/schema-settings/hooks/useIsAllowToSetDefaultValue.tsx @@ -1,5 +1,5 @@ -import { Form } from '@formily/core'; -import { Schema, useFieldSchema } from '@formily/react'; +import { Form } from '@nocobase/schema'; +import { Schema, useFieldSchema } from '@nocobase/schema'; import React, { useContext, useMemo } from 'react'; import { CollectionFieldOptions_deprecated } from '../..'; import { isSystemField } from '../SchemaSettings'; diff --git a/packages/core/client/src/schema-settings/hooks/useIsShowMultipleSwitch.ts b/packages/core/client/src/schema-settings/hooks/useIsShowMultipleSwitch.ts index 67aab0708..bd54a77d8 100644 --- a/packages/core/client/src/schema-settings/hooks/useIsShowMultipleSwitch.ts +++ b/packages/core/client/src/schema-settings/hooks/useIsShowMultipleSwitch.ts @@ -1,4 +1,4 @@ -import { useField, useFieldSchema } from '@formily/react'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { useCollectionManager_deprecated } from '../../collection-manager'; import { useColumnSchema } from '../../schema-component/antd/table-v2/Table.Column.Decorator'; diff --git a/packages/core/client/src/schema-settings/isPatternDisabled.tsx b/packages/core/client/src/schema-settings/isPatternDisabled.tsx index cff5a220c..080cd7e8b 100644 --- a/packages/core/client/src/schema-settings/isPatternDisabled.tsx +++ b/packages/core/client/src/schema-settings/isPatternDisabled.tsx @@ -1,4 +1,4 @@ -import { Schema } from '@formily/react'; +import { Schema } from '@nocobase/schema'; export const isPatternDisabled = (fieldSchema: Schema) => { return fieldSchema?.['x-component-props']?.['pattern-disable'] == true; diff --git a/packages/core/client/src/schema-settings/types.ts b/packages/core/client/src/schema-settings/types.ts index 6a4857fe1..964ea04bf 100644 --- a/packages/core/client/src/schema-settings/types.ts +++ b/packages/core/client/src/schema-settings/types.ts @@ -1,4 +1,4 @@ -import { Form } from '@formily/core'; +import { Form } from '@nocobase/schema'; export interface DataScopeProps { /** diff --git a/packages/core/client/src/schema-templates/BlockTemplate.tsx b/packages/core/client/src/schema-templates/BlockTemplate.tsx index 9edb01346..7c4444384 100644 --- a/packages/core/client/src/schema-templates/BlockTemplate.tsx +++ b/packages/core/client/src/schema-templates/BlockTemplate.tsx @@ -1,4 +1,4 @@ -import { observer, useField, useFieldSchema } from '@formily/react'; +import { observer, useField, useFieldSchema } from '@nocobase/schema'; import React, { createContext, useContext, useMemo } from 'react'; import { RemoteSchemaComponent, useDesignable } from '..'; import { useSchemaTemplateManager } from './SchemaTemplateManagerProvider'; diff --git a/packages/core/client/src/schema-templates/SchemaTemplateManagerProvider.tsx b/packages/core/client/src/schema-templates/SchemaTemplateManagerProvider.tsx index 3f2ab4887..cd60413bd 100644 --- a/packages/core/client/src/schema-templates/SchemaTemplateManagerProvider.tsx +++ b/packages/core/client/src/schema-templates/SchemaTemplateManagerProvider.tsx @@ -1,5 +1,5 @@ -import { ISchema, useFieldSchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema, useFieldSchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { cloneDeep } from 'lodash'; import React, { ReactNode, createContext, useContext, useMemo } from 'react'; import { useLocation } from 'react-router-dom'; diff --git a/packages/core/client/src/schema-templates/schemas/uiSchemaTemplates.ts b/packages/core/client/src/schema-templates/schemas/uiSchemaTemplates.ts index f4fe3494c..c45f17ffb 100644 --- a/packages/core/client/src/schema-templates/schemas/uiSchemaTemplates.ts +++ b/packages/core/client/src/schema-templates/schemas/uiSchemaTemplates.ts @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { useBulkDestroyActionProps, useDestroyActionProps, useUpdateActionProps } from '../../block-provider/hooks'; import { useSchemaTemplateManager } from '../SchemaTemplateManagerProvider'; import { uiSchemaTemplatesCollection } from '../collections/uiSchemaTemplates'; diff --git a/packages/core/client/src/style/index.ts b/packages/core/client/src/style/index.ts index 3d15184a8..145d68517 100644 --- a/packages/core/client/src/style/index.ts +++ b/packages/core/client/src/style/index.ts @@ -1,3 +1,4 @@ -export { createStyles } from 'antd-style'; -export * from './useToken'; +export * from 'antd-style'; +export { type ClassNamesArg, css, cx, injectGlobal, keyframes } from '@emotion/css'; +export * from './useToken'; diff --git a/packages/core/client/src/system-settings/SystemSettingsShortcut.tsx b/packages/core/client/src/system-settings/SystemSettingsShortcut.tsx index 6362f6f0e..2555e32f1 100644 --- a/packages/core/client/src/system-settings/SystemSettingsShortcut.tsx +++ b/packages/core/client/src/system-settings/SystemSettingsShortcut.tsx @@ -1,5 +1,5 @@ -import { ISchema, useForm } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema, useForm } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { Card, message } from 'antd'; import cloneDeep from 'lodash/cloneDeep'; import React from 'react'; diff --git a/packages/core/client/src/user/ChangePassword.tsx b/packages/core/client/src/user/ChangePassword.tsx index c3ac598c6..eb7131cf3 100644 --- a/packages/core/client/src/user/ChangePassword.tsx +++ b/packages/core/client/src/user/ChangePassword.tsx @@ -1,5 +1,5 @@ -import { ISchema, useForm } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema, useForm } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { MenuProps } from 'antd'; import React, { useContext, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/user/EditProfile.tsx b/packages/core/client/src/user/EditProfile.tsx index 6aae561fc..6335303e4 100644 --- a/packages/core/client/src/user/EditProfile.tsx +++ b/packages/core/client/src/user/EditProfile.tsx @@ -1,5 +1,5 @@ -import { ISchema, useForm } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema, useForm } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { MenuProps } from 'antd'; import React, { useContext, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/core/client/src/user/Help.tsx b/packages/core/client/src/user/Help.tsx index 04ffea1ed..5d44021db 100644 --- a/packages/core/client/src/user/Help.tsx +++ b/packages/core/client/src/user/Help.tsx @@ -5,7 +5,7 @@ import React, { useState } from 'react'; import { useTranslation } from 'react-i18next'; import { DropdownVisibleContext, usePlugin, useToken } from '..'; import { useCurrentAppInfo } from '../appInfo/CurrentAppInfoProvider'; -import { observer } from '@formily/reactive-react'; +import { observer } from '@nocobase/schema'; import { parseHTML } from '@nocobase/utils/client'; /** diff --git a/packages/core/client/src/user/VerificationCode.tsx b/packages/core/client/src/user/VerificationCode.tsx index 4a33600d8..45b0aacc1 100644 --- a/packages/core/client/src/user/VerificationCode.tsx +++ b/packages/core/client/src/user/VerificationCode.tsx @@ -1,7 +1,7 @@ import { useTranslation } from 'react-i18next'; import { css } from '@emotion/css'; import { useAPIClient } from '../api-client'; -import { useForm } from '@formily/react'; +import { useForm } from '@nocobase/schema'; import { useEffect, useRef, useState } from 'react'; import { Button, Input, message } from 'antd'; import React from 'react'; diff --git a/packages/core/client/src/variables/VariablesProvider.tsx b/packages/core/client/src/variables/VariablesProvider.tsx index e375733dd..531d18477 100644 --- a/packages/core/client/src/variables/VariablesProvider.tsx +++ b/packages/core/client/src/variables/VariablesProvider.tsx @@ -1,4 +1,4 @@ -import { raw, untracked } from '@formily/reactive'; +import { raw, untracked } from '@nocobase/schema'; import { getValuesByPath } from '@nocobase/utils/client'; import _ from 'lodash'; import React, { createContext, useCallback, useEffect, useMemo, useRef } from 'react'; diff --git a/packages/core/client/src/variables/__tests__/useVariables.test.tsx b/packages/core/client/src/variables/__tests__/useVariables.test.tsx index c56e3277e..04faeaf52 100644 --- a/packages/core/client/src/variables/__tests__/useVariables.test.tsx +++ b/packages/core/client/src/variables/__tests__/useVariables.test.tsx @@ -1,4 +1,4 @@ -import { SchemaExpressionScopeContext, SchemaOptionsContext } from '@formily/react'; +import { SchemaExpressionScopeContext, SchemaOptionsContext } from '@nocobase/schema'; import { act, renderHook, waitFor } from '@nocobase/test/client'; import React from 'react'; import { APIClientProvider } from '../../api-client'; diff --git a/packages/core/client/src/variables/hooks/useLocalVariables.tsx b/packages/core/client/src/variables/hooks/useLocalVariables.tsx index fb19b81a5..93e557f9c 100644 --- a/packages/core/client/src/variables/hooks/useLocalVariables.tsx +++ b/packages/core/client/src/variables/hooks/useLocalVariables.tsx @@ -1,4 +1,4 @@ -import { Form } from '@formily/core'; +import { Form } from '@nocobase/schema'; import { useMemo } from 'react'; import { useCollection_deprecated } from '../../collection-manager'; import { useBlockCollection } from '../../schema-settings/VariableInput/hooks/useBlockCollection'; diff --git a/packages/core/database/package.json b/packages/core/database/package.json index 352a2f9a7..86678c90e 100644 --- a/packages/core/database/package.json +++ b/packages/core/database/package.json @@ -33,7 +33,8 @@ "umzug": "^3.1.1" }, "devDependencies": { - "@types/glob": "^7.2.0" + "@types/glob": "^7.2.0", + "@types/lodash": "4.17.0" }, "gitHead": "d0b4efe4be55f8c79a98a331d99d9f8cf99021a1" } diff --git a/packages/core/database/src/database.ts b/packages/core/database/src/database.ts index 106bb8828..53785daa7 100644 --- a/packages/core/database/src/database.ts +++ b/packages/core/database/src/database.ts @@ -993,7 +993,14 @@ export class Database extends EventEmitter implements AsyncEmitter { } } -export function extendCollection(collectionOptions: CollectionOptions, mergeOptions?: MergeOptions) { +// FIXME 为什么需要这个？ +export declare type CollectionDef = { + collectionOptions: CollectionOptions; + mergeOptions: MergeOptions; + extend: boolean; +}; + +export function extendCollection(collectionOptions: CollectionOptions, mergeOptions?: MergeOptions): CollectionDef { return { collectionOptions, mergeOptions, diff --git a/packages/core/devtools/package.json b/packages/core/devtools/package.json index 77b30413b..c05336136 100644 --- a/packages/core/devtools/package.json +++ b/packages/core/devtools/package.json @@ -15,10 +15,10 @@ "@nocobase/test": "workspace:*", "@types/koa": "^2.13.4", "@types/koa-bodyparser": "^4.3.4", - "@types/lodash": "^4.14.177", + "@types/lodash": "^4.17.0", "@types/node": "^20.12.2", - "@types/react": "^18.0.0", - "@types/react-dom": "^18.0.0", + "@types/react": "^18.2.73", + "@types/react-dom": "^18.2.23", "@typescript-eslint/eslint-plugin": "^6.2.0", "@typescript-eslint/parser": "^6.2.0", "concurrently": "^7.0.0", @@ -37,8 +37,8 @@ "prettier-plugin-sql": "^0.17.0", "pretty-format": "^24.0.0", "pretty-quick": "^3.1.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "react": "^18.2.0", + "react-dom": "^18.2.0", "rimraf": "^3.0.0", "serve": "^13.0.2", "ts-loader": "^7.0.4", @@ -46,7 +46,7 @@ "ts-node-dev": "1.1.8", "tsconfig-paths": "^3.12.0", "tsx": "^4.6.2", - "typescript": "5.1.3", + "typescript": "5.4.3", "umi": "^4.0.69" }, "gitHead": "d0b4efe4be55f8c79a98a331d99d9f8cf99021a1" diff --git a/packages/core/schema/.npmignore b/packages/core/schema/.npmignore new file mode 100644 index 000000000..c593fe9df --- /dev/null +++ b/packages/core/schema/.npmignore @@ -0,0 +1,2 @@ +/node_modules +/src \ No newline at end of file diff --git a/packages/core/schema/LICENSE b/packages/core/schema/LICENSE new file mode 100644 index 000000000..f49a4e16e --- /dev/null +++ b/packages/core/schema/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/packages/core/schema/package.json b/packages/core/schema/package.json new file mode 100644 index 000000000..f837414f2 --- /dev/null +++ b/packages/core/schema/package.json @@ -0,0 +1,19 @@ +{ + "name": "@nocobase/schema", + "version": "0.21.2-alpha.4", + "license": "Apache-2.0", + "main": "lib/index.js", + "types": "lib/index.d.ts", + "dependencies": { + "@formily/core": "2.2.27", + "@formily/grid": "2.2.27", + "@formily/json-schema": "2.2.27", + "@formily/path": "2.2.27", + "@formily/react": "2.2.27", + "@formily/reactive": "2.2.27", + "@formily/reactive-react": "2.2.27", + "@formily/shared": "2.2.27", + "@formily/validator": "2.2.27" + }, + "gitHead": "d0b4efe4be55f8c79a98a331d99d9f8cf99021a1" +} diff --git a/packages/core/schema/src/index.ts b/packages/core/schema/src/index.ts new file mode 100644 index 000000000..e18d98698 --- /dev/null +++ b/packages/core/schema/src/index.ts @@ -0,0 +1,42 @@ +export * from '@formily/core'; +export type { ArrayField, Field, FormPathPattern, GeneralField, ObjectField } from '@formily/core'; +export { exchangeArrayState, spliceArrayState } from '@formily/core/esm/shared/internals'; +export * from '@formily/grid'; +export * from '@formily/json-schema'; +export { + type IFieldProps, + type IRecursionFieldProps, + type ISchemaFieldProps, + type ISchemaFieldReactFactoryOptions, + type IVoidFieldProps, + type JSXComponent, + type SchemaReactComponents, + FormConsumer, + ArrayField as ArrayFieldComponent, + ExpressionScope, + Field as FieldComponent, + FieldContext, + FormContext, + FormProvider, + ObjectField as ObjectFieldComponent, + RecursionField, + SchemaComponentsContext, + SchemaContext, + SchemaExpressionScopeContext, + SchemaOptionsContext, + VoidField as VoidFieldComponent, + connect, + createSchemaField, + mapProps, + mapReadPretty, + useExpressionScope, + useField, + useFieldSchema, + useForm, + useFormEffects, +} from '@formily/react'; +export { useAttach } from '@formily/react/esm/hooks/useAttach'; +export * from '@formily/reactive'; +export * from '@formily/reactive-react'; +export * from '@formily/shared'; +export * from '@formily/validator'; diff --git a/packages/core/schema/tsconfig.json b/packages/core/schema/tsconfig.json new file mode 100644 index 000000000..aba87ced0 --- /dev/null +++ b/packages/core/schema/tsconfig.json @@ -0,0 +1,6 @@ +{ + "extends": "../../../tsconfig.json", + "compilerOptions": { + "types": [] + } +} diff --git a/packages/core/sdk/package.json b/packages/core/sdk/package.json index e0ae0ec86..e7fbd7627 100644 --- a/packages/core/sdk/package.json +++ b/packages/core/sdk/package.json @@ -9,7 +9,8 @@ "qs": "^6.10.1" }, "devDependencies": { - "axios-mock-adapter": "^1.20.0" + "axios-mock-adapter": "^1.20.0", + "vitest": "^1.4.0" }, "gitHead": "d0b4efe4be55f8c79a98a331d99d9f8cf99021a1" } diff --git a/packages/core/sdk/tsconfig.json b/packages/core/sdk/tsconfig.json index f7efa554d..764bf5506 100644 --- a/packages/core/sdk/tsconfig.json +++ b/packages/core/sdk/tsconfig.json @@ -1,8 +1,6 @@ { "extends": "../../../tsconfig.json", "compilerOptions": { - "types": [ - "vitest/globals" - ] - }, + "types": ["vitest/globals"] + } } diff --git a/packages/core/server/package.json b/packages/core/server/package.json index 4bc1a1557..aef945485 100644 --- a/packages/core/server/package.json +++ b/packages/core/server/package.json @@ -5,7 +5,6 @@ "main": "lib/index.js", "types": "./lib/index.d.ts", "dependencies": { - "@formily/json-schema": "2.2.27", "@hapi/topo": "^6.0.0", "@koa/cors": "^3.1.0", "@koa/multer": "^3.0.2", @@ -19,6 +18,7 @@ "@nocobase/evaluators": "workspace:*", "@nocobase/logger": "workspace:*", "@nocobase/resourcer": "workspace:*", + "@nocobase/schema": "workspace:*", "@nocobase/sdk": "workspace:*", "@nocobase/telemetry": "workspace:*", "@nocobase/utils": "workspace:*", @@ -48,10 +48,13 @@ "react": "^18.2.0", "semver": "^7.3.7", "serve-handler": "^6.1.5", + "winston": "^3.8.2", "ws": "^8.13.0", "xpipe": "^1.0.5" }, "devDependencies": { + "@types/koa": "^2.13.4", + "@types/lodash": "4.17.0", "@types/semver": "^7.3.9", "@types/serve-handler": "^6.1.1", "@types/ws": "^8.5.5", diff --git a/packages/core/server/src/application.ts b/packages/core/server/src/application.ts index d785a04f5..ebe85c517 100644 --- a/packages/core/server/src/application.ts +++ b/packages/core/server/src/application.ts @@ -2,6 +2,7 @@ import { registerActions } from '@nocobase/actions'; import { actions as authActions, AuthManager, AuthManagerOptions } from '@nocobase/auth'; import { Cache, CacheManager, CacheManagerOptions } from '@nocobase/cache'; import Database, { CollectionOptions, IDatabaseOptions } from '@nocobase/database'; +import winston from 'winston'; import { createLogger, createSystemLogger, diff --git a/packages/core/test/package.json b/packages/core/test/package.json index 5fcaf2e4a..1e20a24c4 100644 --- a/packages/core/test/package.json +++ b/packages/core/test/package.json @@ -41,10 +41,11 @@ "types": "./lib/index.d.ts", "dependencies": { "@faker-js/faker": "8.1.0", - "@formily/shared": "^2.2.27", "@nocobase/database": "workspace:*", + "@nocobase/schema": "workspace:*", "@nocobase/server": "workspace:*", "@playwright/test": "^1.42.1", + "@testing-library/dom": "^9.3.3", "@testing-library/jest-dom": "^6.4.2", "@testing-library/react": "^14.0.0", "@testing-library/react-hooks": "^8.0.1", diff --git a/packages/core/test/src/client/index.ts b/packages/core/test/src/client/index.ts index 0327ed254..5419aeb53 100644 --- a/packages/core/test/src/client/index.ts +++ b/packages/core/test/src/client/index.ts @@ -1,5 +1,7 @@ +import React from 'react'; import { render } from '@testing-library/react'; export { renderHook } from '@testing-library/react-hooks'; +export type { queries } from '@testing-library/dom'; function customRender(ui: React.ReactElement, options = {}) { return render(ui, { diff --git a/packages/core/test/src/e2e/e2eUtils.ts b/packages/core/test/src/e2e/e2eUtils.ts index 5f21adeb1..d8cacaab0 100644 --- a/packages/core/test/src/e2e/e2eUtils.ts +++ b/packages/core/test/src/e2e/e2eUtils.ts @@ -1,5 +1,5 @@ import { faker } from '@faker-js/faker'; -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; import { Page, test as base, expect, request } from '@playwright/test'; import _ from 'lodash'; import { defineConfig } from './defineConfig'; diff --git a/packages/core/utils/client.d.ts b/packages/core/utils/client.d.ts new file mode 100644 index 000000000..2cdddd926 --- /dev/null +++ b/packages/core/utils/client.d.ts @@ -0,0 +1,2 @@ +// @ts-nocheck +export * from './lib/client'; \ No newline at end of file diff --git a/packages/core/utils/package.json b/packages/core/utils/package.json index b7ed30ae1..792a3d9fe 100644 --- a/packages/core/utils/package.json +++ b/packages/core/utils/package.json @@ -7,7 +7,7 @@ "dependencies": { "@hapi/topo": "^6.0.0", "@rc-component/mini-decimal": "^1.1.0", - "antd": "^5.12.8", + "antd": "5.16.0", "dayjs": "^1.11.9", "dedupe": "^3.0.2", "deepmerge": "^4.2.2", @@ -18,6 +18,7 @@ "object-path": "^0.11.8" }, "devDependencies": { + "@types/lodash": "4.17.0", "@types/node": "^20.12.2" }, "gitHead": "d0b4efe4be55f8c79a98a331d99d9f8cf99021a1" diff --git a/packages/plugins/@hera/plugin-audit-logs/package.json b/packages/plugins/@hera/plugin-audit-logs/package.json index 30f934406..b1e1bd160 100644 --- a/packages/plugins/@hera/plugin-audit-logs/package.json +++ b/packages/plugins/@hera/plugin-audit-logs/package.json @@ -7,18 +7,17 @@ "System management" ], "main": "dist/server/index.js", - "dependencies": {}, "devDependencies": { - "@ant-design/icons": "5.x", + "@ant-design/icons": "~5.3.6", "@formily/antd-v5": "1.x", - "@formily/react": "2.x", - "@formily/shared": "2.x", + "antd": "5.16.0", "react": "^18.2.0", "react-i18next": "^11.15.1" }, "peerDependencies": { "@nocobase/client": "workspace:*", "@nocobase/database": "workspace:*", + "@nocobase/schema": "workspace:*", "@nocobase/server": "workspace:*", "@nocobase/test": "workspace:*", "@nocobase/utils": "workspace:*" diff --git a/packages/plugins/@hera/plugin-audit-logs/src/client/AuditLogsBlockInitializer.tsx b/packages/plugins/@hera/plugin-audit-logs/src/client/AuditLogsBlockInitializer.tsx index e6cd679d3..3375f3739 100644 --- a/packages/plugins/@hera/plugin-audit-logs/src/client/AuditLogsBlockInitializer.tsx +++ b/packages/plugins/@hera/plugin-audit-logs/src/client/AuditLogsBlockInitializer.tsx @@ -1,5 +1,5 @@ import { TableOutlined } from '@ant-design/icons'; -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { createTableBlockSchema, SchemaInitializerItem, diff --git a/packages/plugins/@hera/plugin-audit-logs/src/client/components/AuditLogsField.tsx b/packages/plugins/@hera/plugin-audit-logs/src/client/components/AuditLogsField.tsx index 314d1b048..d545e1a46 100644 --- a/packages/plugins/@hera/plugin-audit-logs/src/client/components/AuditLogsField.tsx +++ b/packages/plugins/@hera/plugin-audit-logs/src/client/components/AuditLogsField.tsx @@ -1,6 +1,6 @@ import { EllipsisWithTooltip, useCompile } from '@nocobase/client'; import React from 'react'; -import { observer, useField } from '@formily/react'; +import { observer, useField } from '@nocobase/schema'; export const AuditLogsField = observer( () => { diff --git a/packages/plugins/@hera/plugin-audit-logs/src/client/components/AuditLogsValue.tsx b/packages/plugins/@hera/plugin-audit-logs/src/client/components/AuditLogsValue.tsx index 1e2c1ac08..1c44af811 100644 --- a/packages/plugins/@hera/plugin-audit-logs/src/client/components/AuditLogsValue.tsx +++ b/packages/plugins/@hera/plugin-audit-logs/src/client/components/AuditLogsValue.tsx @@ -1,6 +1,6 @@ import { EllipsisWithTooltip, FormProvider, SchemaComponent, useRecord } from '@nocobase/client'; import React from 'react'; -import { observer, useField } from '@formily/react'; +import { observer, useField } from '@nocobase/schema'; export const AuditLogsValue = observer( () => { diff --git a/packages/plugins/@hera/plugin-audit-logs/src/client/deplicated/AuditLogs.tsx b/packages/plugins/@hera/plugin-audit-logs/src/client/deplicated/AuditLogs.tsx index 8840e885d..6fdece6a0 100644 --- a/packages/plugins/@hera/plugin-audit-logs/src/client/deplicated/AuditLogs.tsx +++ b/packages/plugins/@hera/plugin-audit-logs/src/client/deplicated/AuditLogs.tsx @@ -1,5 +1,5 @@ import { ArrayTable } from '@formily/antd-v5'; -import { observer, useField } from '@formily/react'; +import { observer, useField } from '@nocobase/schema'; import { ExtendCollectionsProvider, FormProvider, diff --git a/packages/plugins/@hera/plugin-audit-logs/src/client/deplicated/AuditLogsDesigner.tsx b/packages/plugins/@hera/plugin-audit-logs/src/client/deplicated/AuditLogsDesigner.tsx index f9558b9f9..d86ef58a5 100644 --- a/packages/plugins/@hera/plugin-audit-logs/src/client/deplicated/AuditLogsDesigner.tsx +++ b/packages/plugins/@hera/plugin-audit-logs/src/client/deplicated/AuditLogsDesigner.tsx @@ -1,4 +1,4 @@ -import { useField, useFieldSchema } from '@formily/react'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { GeneralSchemaDesigner, SchemaSettingsDataScope, diff --git a/packages/plugins/@hera/plugin-audit-logs/src/client/initializers/AuditLogsTableActionColumnInitializers.tsx b/packages/plugins/@hera/plugin-audit-logs/src/client/initializers/AuditLogsTableActionColumnInitializers.tsx index 42d9b39ed..5b3a2b87a 100644 --- a/packages/plugins/@hera/plugin-audit-logs/src/client/initializers/AuditLogsTableActionColumnInitializers.tsx +++ b/packages/plugins/@hera/plugin-audit-logs/src/client/initializers/AuditLogsTableActionColumnInitializers.tsx @@ -1,5 +1,5 @@ import { MenuOutlined } from '@ant-design/icons'; -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { createDesignable, Resizable, SchemaInitializer, useAPIClient, useDesignable } from '@nocobase/client'; import React from 'react'; import { tval, useAuditLogsTranslation } from '../locale'; diff --git a/packages/plugins/@hera/plugin-audit-logs/src/client/initializers/AuditLogsTableActionInitializers.tsx b/packages/plugins/@hera/plugin-audit-logs/src/client/initializers/AuditLogsTableActionInitializers.tsx index 0be39d9f2..0bc13ebf1 100644 --- a/packages/plugins/@hera/plugin-audit-logs/src/client/initializers/AuditLogsTableActionInitializers.tsx +++ b/packages/plugins/@hera/plugin-audit-logs/src/client/initializers/AuditLogsTableActionInitializers.tsx @@ -1,5 +1,6 @@ import { SchemaInitializer } from '@nocobase/client'; import { tval } from '../locale'; +export type { ButtonProps } from 'antd'; export const auditLogsTableActionInitializers = new SchemaInitializer({ name: 'auditLogsTable:configureActions', diff --git a/packages/plugins/@hera/plugin-audit-logs/src/client/utils.ts b/packages/plugins/@hera/plugin-audit-logs/src/client/utils.ts index 6b72b1c9b..763e70c1f 100644 --- a/packages/plugins/@hera/plugin-audit-logs/src/client/utils.ts +++ b/packages/plugins/@hera/plugin-audit-logs/src/client/utils.ts @@ -1,4 +1,4 @@ -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; import { tval } from './locale'; export const createSchema = () => { diff --git a/packages/plugins/@hera/plugin-core/package.json b/packages/plugins/@hera/plugin-core/package.json index 31bb66bae..3181fdcc3 100644 --- a/packages/plugins/@hera/plugin-core/package.json +++ b/packages/plugins/@hera/plugin-core/package.json @@ -9,17 +9,14 @@ "main": "dist/server/index.js", "devDependencies": { "@ant-design/cssinjs": "^1.11.1", - "@ant-design/icons": "5.x", + "@ant-design/icons": "~5.3.6", "@ant-design/pro-layout": "^7.16.11", "@emotion/css": "^11.11.2", "@formily/antd-v5": "1.x", - "@formily/core": "^2.2.27", - "@formily/react": "^2.2.27", - "@formily/reactive": "2.x", - "@formily/shared": "^2.2.27", + "@nocobase/schema": "workspace:*", "@react-pdf/renderer": "^3.3.2", "ahooks": "^3.7.2", - "antd": "5.12.8", + "antd": "5.16.0", "antd-style": "3.4.5", "classnames": "^2.3.1", "copy-to-clipboard": "^3.3.3", diff --git a/packages/plugins/@hera/plugin-core/src/client/components/PDFViewer.tsx b/packages/plugins/@hera/plugin-core/src/client/components/PDFViewer.tsx index 3aeb1a565..4db890d9a 100644 --- a/packages/plugins/@hera/plugin-core/src/client/components/PDFViewer.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/components/PDFViewer.tsx @@ -5,7 +5,7 @@ import { Document, Page, pdfjs } from 'react-pdf'; import { saveAs } from 'file-saver'; import 'react-pdf/dist/Page/AnnotationLayer.css'; import 'react-pdf/dist/Page/TextLayer.css'; -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; import { useRequest } from '@nocobase/client'; import { useTranslation } from '../locale'; diff --git a/packages/plugins/@hera/plugin-core/src/client/components/SignatureInput.tsx b/packages/plugins/@hera/plugin-core/src/client/components/SignatureInput.tsx index e7b8fa833..484f18a7e 100644 --- a/packages/plugins/@hera/plugin-core/src/client/components/SignatureInput.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/components/SignatureInput.tsx @@ -1,4 +1,4 @@ -import { connect, mapProps } from '@formily/react'; +import { connect, mapProps } from '@nocobase/schema'; import { Button } from 'antd'; import React, { useRef, useEffect } from 'react'; import SignaturePad from './SignaturePad'; diff --git a/packages/plugins/@hera/plugin-core/src/client/components/custom-components/CustomComponentDispatcher.tsx b/packages/plugins/@hera/plugin-core/src/client/components/custom-components/CustomComponentDispatcher.tsx index 21609869c..d786cde86 100644 --- a/packages/plugins/@hera/plugin-core/src/client/components/custom-components/CustomComponentDispatcher.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/components/custom-components/CustomComponentDispatcher.tsx @@ -2,7 +2,7 @@ import { SchemaComponent, SchemaSettings, useApp, useDesignable, usePlugin } fro import React from 'react'; import { ErrorBoundary } from 'react-error-boundary'; import { useTranslation } from '../../locale'; -import { useField, useFieldSchema } from '@formily/react'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { Field } from '@nocobase/database'; import { useCustomComponent } from '../../hooks/useCustomComponent'; import { CustomComponentType } from './custom-components'; diff --git a/packages/plugins/@hera/plugin-core/src/client/components/custom-components/custom-components.ts b/packages/plugins/@hera/plugin-core/src/client/components/custom-components/custom-components.ts index c82d3fc77..3e9eb5f78 100644 --- a/packages/plugins/@hera/plugin-core/src/client/components/custom-components/custom-components.ts +++ b/packages/plugins/@hera/plugin-core/src/client/components/custom-components/custom-components.ts @@ -1,4 +1,4 @@ -import { ReactFC } from '@formily/react'; +import { ReactFC } from '@nocobase/schema'; import { ComponentType, MemoExoticComponent } from 'react'; export interface CustomFunctionComponent

extends React.FunctionComponent

{ diff --git a/packages/plugins/@hera/plugin-core/src/client/components/fields/AssociatedField.tsx b/packages/plugins/@hera/plugin-core/src/client/components/fields/AssociatedField.tsx index 456262c86..893fd68b8 100644 --- a/packages/plugins/@hera/plugin-core/src/client/components/fields/AssociatedField.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/components/fields/AssociatedField.tsx @@ -1,5 +1,5 @@ import _ from 'lodash'; -import { ISchema, RecursionField, connect, observer, useField, useFieldSchema, useForm } from '@formily/react'; +import { ISchema, RecursionField, connect, observer, useField, useFieldSchema, useForm } from '@nocobase/schema'; import { ActionContextProvider, CollectionProvider_deprecated, diff --git a/packages/plugins/@hera/plugin-core/src/client/components/fields/CalcResult.tsx b/packages/plugins/@hera/plugin-core/src/client/components/fields/CalcResult.tsx index a97333163..d66a45f1f 100644 --- a/packages/plugins/@hera/plugin-core/src/client/components/fields/CalcResult.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/components/fields/CalcResult.tsx @@ -1,5 +1,5 @@ -import { onFormValuesChange } from '@formily/core'; -import { useField, useFieldSchema, useForm, useFormEffects } from '@formily/react'; +import { onFormValuesChange } from '@nocobase/schema'; +import { useField, useFieldSchema, useForm, useFormEffects } from '@nocobase/schema'; import { Input } from '@nocobase/client'; import { Descriptions, DescriptionsProps } from 'antd'; import _ from 'lodash'; diff --git a/packages/plugins/@hera/plugin-core/src/client/components/filter-form/FormFilterScope.tsx b/packages/plugins/@hera/plugin-core/src/client/components/filter-form/FormFilterScope.tsx index d0de17910..e7da338e5 100644 --- a/packages/plugins/@hera/plugin-core/src/client/components/filter-form/FormFilterScope.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/components/filter-form/FormFilterScope.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/css'; import { ArrayCollapse } from '@formily/antd-v5'; -import { Form } from '@formily/core'; -import { observer, useField, useFieldSchema } from '@formily/react'; +import { Form } from '@nocobase/schema'; +import { observer, useField, useFieldSchema } from '@nocobase/schema'; import { FormBlockContext, RecordProvider, diff --git a/packages/plugins/@hera/plugin-core/src/client/components/filter-form/VariableInput.tsx b/packages/plugins/@hera/plugin-core/src/client/components/filter-form/VariableInput.tsx index f66f6d87d..f51752209 100644 --- a/packages/plugins/@hera/plugin-core/src/client/components/filter-form/VariableInput.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/components/filter-form/VariableInput.tsx @@ -1,7 +1,7 @@ -import { Form } from '@formily/core'; +import { Form } from '@nocobase/schema'; // @ts-ignore -import { Schema } from '@formily/json-schema'; -import { SchemaOptionsContext, useField, useFieldSchema } from '@formily/react'; +import { Schema } from '@nocobase/schema'; +import { SchemaOptionsContext, useField, useFieldSchema } from '@nocobase/schema'; import { CollectionFieldOptions, useVariableScope, diff --git a/packages/plugins/@hera/plugin-core/src/client/components/filter-form/context.ts b/packages/plugins/@hera/plugin-core/src/client/components/filter-form/context.ts index 5e80dc964..8ce483c3f 100644 --- a/packages/plugins/@hera/plugin-core/src/client/components/filter-form/context.ts +++ b/packages/plugins/@hera/plugin-core/src/client/components/filter-form/context.ts @@ -1,5 +1,5 @@ -import { ObjectField } from '@formily/core'; -import { Schema } from '@formily/react'; +import { ObjectField } from '@nocobase/schema'; +import { Schema } from '@nocobase/schema'; import { createContext } from 'react'; export interface FilterContextProps { diff --git a/packages/plugins/@hera/plugin-core/src/client/components/system/OnlineUserProvider.tsx b/packages/plugins/@hera/plugin-core/src/client/components/system/OnlineUserProvider.tsx index e01e2e841..db53b4a18 100644 --- a/packages/plugins/@hera/plugin-core/src/client/components/system/OnlineUserProvider.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/components/system/OnlineUserProvider.tsx @@ -1,4 +1,4 @@ -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; import { css, useAPIClient, useApp } from '@nocobase/client'; import { Button, Dropdown } from 'antd'; import React, { useEffect, useState } from 'react'; diff --git a/packages/plugins/@hera/plugin-core/src/client/hooks/useFilterBlockActionProps.tsx b/packages/plugins/@hera/plugin-core/src/client/hooks/useFilterBlockActionProps.tsx index 1df47a931..bbf714661 100644 --- a/packages/plugins/@hera/plugin-core/src/client/hooks/useFilterBlockActionProps.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/hooks/useFilterBlockActionProps.tsx @@ -1,5 +1,5 @@ -import { useField, useFieldSchema, useForm } from '@formily/react'; -import { isEmpty } from '@formily/shared'; +import { useField, useFieldSchema, useForm } from '@nocobase/schema'; +import { isEmpty } from '@nocobase/schema'; import { findFilterTargets, mergeFilter, diff --git a/packages/plugins/@hera/plugin-core/src/client/index.tsx b/packages/plugins/@hera/plugin-core/src/client/index.tsx index 845c9e9ba..fb55b38c3 100644 --- a/packages/plugins/@hera/plugin-core/src/client/index.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/index.tsx @@ -1,9 +1,9 @@ import React from 'react'; import { Plugin, RemoteSchemaTemplateManagerProvider, EditTitleField, useCollection } from '@nocobase/client'; import { remove } from 'lodash'; -import { useFieldSchema } from '@formily/react'; -import { isValid } from '@formily/shared'; -import { autorun } from '@formily/reactive'; +import { useFieldSchema } from '@nocobase/schema'; +import { isValid } from '@nocobase/schema'; +import { autorun } from '@nocobase/schema'; import { Locale, tval } from './locale'; import { PageModeSetting, diff --git a/packages/plugins/@hera/plugin-core/src/client/schema-components/association-cascader/AssociationCascader.tsx b/packages/plugins/@hera/plugin-core/src/client/schema-components/association-cascader/AssociationCascader.tsx index 2cf535b15..2de2a82f8 100644 --- a/packages/plugins/@hera/plugin-core/src/client/schema-components/association-cascader/AssociationCascader.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/schema-components/association-cascader/AssociationCascader.tsx @@ -1,6 +1,6 @@ import React, { useMemo } from 'react'; import { Cascader } from 'antd'; -import { connect } from '@formily/react'; +import { connect } from '@nocobase/schema'; import { useCollectionManager, useRequest } from '@nocobase/client'; import _ from 'lodash'; diff --git a/packages/plugins/@hera/plugin-core/src/client/schema-components/auto-complete/AutoComplete.tsx b/packages/plugins/@hera/plugin-core/src/client/schema-components/auto-complete/AutoComplete.tsx index 65fbc413d..4079dcc76 100644 --- a/packages/plugins/@hera/plugin-core/src/client/schema-components/auto-complete/AutoComplete.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/schema-components/auto-complete/AutoComplete.tsx @@ -1,6 +1,6 @@ import React, { useState } from 'react'; import { AutoComplete as AntdAutoComplete } from 'antd'; -import { connect, useFieldSchema } from '@formily/react'; +import { connect, useFieldSchema } from '@nocobase/schema'; import { useAPIClient } from '@nocobase/client'; import { useAsyncEffect } from 'ahooks'; import { fuzzysearch } from '../../utils'; diff --git a/packages/plugins/@hera/plugin-core/src/client/schema-components/blocks/GroupBlock.tsx b/packages/plugins/@hera/plugin-core/src/client/schema-components/blocks/GroupBlock.tsx index a0bface47..b9e3c23e0 100644 --- a/packages/plugins/@hera/plugin-core/src/client/schema-components/blocks/GroupBlock.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/schema-components/blocks/GroupBlock.tsx @@ -1,5 +1,5 @@ import React, { useState } from 'react'; -import { useField, useFieldSchema } from '@formily/react'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { useAPIClient, useBlockRequestContext, useFilterBlock } from '@nocobase/client'; import { Descriptions, DescriptionsProps, Spin, Table } from 'antd'; import { transformers } from '../../schema-settings/GroupBlockConfigure'; diff --git a/packages/plugins/@hera/plugin-core/src/client/schema-initializer/actions/OutboundLinkActionInitializer.tsx b/packages/plugins/@hera/plugin-core/src/client/schema-initializer/actions/OutboundLinkActionInitializer.tsx index c3d42eda4..b643fcfa4 100644 --- a/packages/plugins/@hera/plugin-core/src/client/schema-initializer/actions/OutboundLinkActionInitializer.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/schema-initializer/actions/OutboundLinkActionInitializer.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { ActionInitializer, Application } from '@nocobase/client'; import { Popover, Space, Button, Input } from 'antd'; -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { useProps } from '@nocobase/client'; import { ShareAltOutlined } from '@ant-design/icons'; import { lang, tval, useTranslation } from '../../locale'; diff --git a/packages/plugins/@hera/plugin-core/src/client/schema-initializer/actions/hooks/useCreateActionProps.tsx b/packages/plugins/@hera/plugin-core/src/client/schema-initializer/actions/hooks/useCreateActionProps.tsx index 752ca0e02..c3282705d 100644 --- a/packages/plugins/@hera/plugin-core/src/client/schema-initializer/actions/hooks/useCreateActionProps.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/schema-initializer/actions/hooks/useCreateActionProps.tsx @@ -1,4 +1,4 @@ -import { ISchema, useField, useFieldSchema, useForm } from '@formily/react'; +import { ISchema, useField, useFieldSchema, useForm } from '@nocobase/schema'; import { __UNSAFE__, getFormValues, diff --git a/packages/plugins/@hera/plugin-core/src/client/schema-initializer/actions/hooks/useOutboundActionProps.ts b/packages/plugins/@hera/plugin-core/src/client/schema-initializer/actions/hooks/useOutboundActionProps.ts index de1e55f4a..178b863ac 100644 --- a/packages/plugins/@hera/plugin-core/src/client/schema-initializer/actions/hooks/useOutboundActionProps.ts +++ b/packages/plugins/@hera/plugin-core/src/client/schema-initializer/actions/hooks/useOutboundActionProps.ts @@ -1,5 +1,5 @@ import { message } from 'antd'; -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import copy from 'copy-to-clipboard'; import { useTranslation } from '../../../locale'; diff --git a/packages/plugins/@hera/plugin-core/src/client/schema-initializer/blocks/GroupBlockInitializer.tsx b/packages/plugins/@hera/plugin-core/src/client/schema-initializer/blocks/GroupBlockInitializer.tsx index 173eef7bb..71a92d005 100644 --- a/packages/plugins/@hera/plugin-core/src/client/schema-initializer/blocks/GroupBlockInitializer.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/schema-initializer/blocks/GroupBlockInitializer.tsx @@ -1,4 +1,4 @@ -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import { useSchemaInitializer, useSchemaInitializerItem, diff --git a/packages/plugins/@hera/plugin-core/src/client/schema-initializer/blocks/SettingBlockInitializer.tsx b/packages/plugins/@hera/plugin-core/src/client/schema-initializer/blocks/SettingBlockInitializer.tsx index d6a968493..1f3ef08f7 100644 --- a/packages/plugins/@hera/plugin-core/src/client/schema-initializer/blocks/SettingBlockInitializer.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/schema-initializer/blocks/SettingBlockInitializer.tsx @@ -1,6 +1,6 @@ import { FormOutlined } from '@ant-design/icons'; import { FormLayout } from '@formily/antd-v5'; -import { SchemaOptionsContext } from '@formily/react'; +import { SchemaOptionsContext } from '@nocobase/schema'; import { createFormBlockSchema, useAPIClient, useCollectionManager } from '@nocobase/client'; import { DataBlockInitializer, diff --git a/packages/plugins/@hera/plugin-core/src/client/schema-initializer/blocks/SheetBlockInitializer.tsx b/packages/plugins/@hera/plugin-core/src/client/schema-initializer/blocks/SheetBlockInitializer.tsx index 007fa86ff..833da60ad 100644 --- a/packages/plugins/@hera/plugin-core/src/client/schema-initializer/blocks/SheetBlockInitializer.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/schema-initializer/blocks/SheetBlockInitializer.tsx @@ -1,5 +1,5 @@ import { TableOutlined } from '@ant-design/icons'; -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import { useSchemaInitializer, useSchemaInitializerItem, diff --git a/packages/plugins/@hera/plugin-core/src/client/schema-initializer/items/CustomFilterFormItemInitializer.tsx b/packages/plugins/@hera/plugin-core/src/client/schema-initializer/items/CustomFilterFormItemInitializer.tsx index c3a9236be..a2058cd04 100644 --- a/packages/plugins/@hera/plugin-core/src/client/schema-initializer/items/CustomFilterFormItemInitializer.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/schema-initializer/items/CustomFilterFormItemInitializer.tsx @@ -28,9 +28,9 @@ import { } from '@nocobase/client'; import { ConfigProvider, Radio, Space } from 'antd'; import React, { memo, useCallback, useContext, useMemo, Profiler } from 'react'; -import { Schema, SchemaOptionsContext, observer, useField, useFieldSchema, useForm } from '@formily/react'; +import { Schema, SchemaOptionsContext, observer, useField, useFieldSchema, useForm } from '@nocobase/schema'; import { ArrayItems, FormLayout } from '@formily/antd-v5'; -import { Field, onFieldValueChange } from '@formily/core'; +import { Field, onFieldValueChange } from '@nocobase/schema'; import { EditDefaultValue, EditFormulaTitleField, @@ -42,7 +42,7 @@ import { import _ from 'lodash'; import { SchemaSettingsRemove } from '../../schema-settings/SchemaSettingsRemove'; import { tval, useTranslation } from '../../locale'; -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; const FieldComponentProps: React.FC = observer( (props) => { diff --git a/packages/plugins/@hera/plugin-core/src/client/schema-settings/GroupBlockConfigure.tsx b/packages/plugins/@hera/plugin-core/src/client/schema-settings/GroupBlockConfigure.tsx index 465967a87..aec05149d 100644 --- a/packages/plugins/@hera/plugin-core/src/client/schema-settings/GroupBlockConfigure.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/schema-settings/GroupBlockConfigure.tsx @@ -7,7 +7,7 @@ import { import React, { useContext } from 'react'; import { useTranslation } from '../locale'; import { GroupBlockContext } from '../schema-initializer/blocks/GroupBlockInitializer'; -import { ISchema, connect, useFieldSchema } from '@formily/react'; +import { ISchema, connect, useFieldSchema } from '@nocobase/schema'; import { ArrayItems, FormItem, Space } from '@formily/antd-v5'; import { PullRequestOutlined } from '@ant-design/icons'; diff --git a/packages/plugins/@hera/plugin-core/src/client/schema-settings/SchemaSettingsDatePickerType.tsx b/packages/plugins/@hera/plugin-core/src/client/schema-settings/SchemaSettingsDatePickerType.tsx index 6dcce8505..59f539149 100644 --- a/packages/plugins/@hera/plugin-core/src/client/schema-settings/SchemaSettingsDatePickerType.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/schema-settings/SchemaSettingsDatePickerType.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import { SchemaSettingsModalItem, useCollectionManager, useDesignable } from '@nocobase/client'; import { tval, useTranslation } from '../locale'; diff --git a/packages/plugins/@hera/plugin-core/src/client/schema-settings/SchemaSettingsDatePresets.tsx b/packages/plugins/@hera/plugin-core/src/client/schema-settings/SchemaSettingsDatePresets.tsx index 4735d5f5a..c28b87321 100644 --- a/packages/plugins/@hera/plugin-core/src/client/schema-settings/SchemaSettingsDatePresets.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/schema-settings/SchemaSettingsDatePresets.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { ISchema, useFieldSchema } from '@formily/react'; +import { ISchema, useFieldSchema } from '@nocobase/schema'; import { SchemaSettingsModalItem, useCollectionManager, useDesignable } from '@nocobase/client'; import { tval, useTranslation } from '../locale'; import { dayjs } from '@nocobase/utils/client'; diff --git a/packages/plugins/@hera/plugin-core/src/client/schema-settings/SchemaSettingsRemove.tsx b/packages/plugins/@hera/plugin-core/src/client/schema-settings/SchemaSettingsRemove.tsx index 1963c27cf..a487f9be5 100644 --- a/packages/plugins/@hera/plugin-core/src/client/schema-settings/SchemaSettingsRemove.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/schema-settings/SchemaSettingsRemove.tsx @@ -1,9 +1,9 @@ -import { ISchema, useField, useFieldSchema, useForm } from '@formily/react'; +import { ISchema, useField, useFieldSchema, useForm } from '@nocobase/schema'; import { SchemaSettingsItem, useFormActiveFields, useSchemaSettings } from '@nocobase/client'; import { App, ModalFuncProps } from 'antd'; import { FC } from 'react'; import { useTranslation } from '../locale'; -import { Field } from '@formily/core'; +import { Field } from '@nocobase/schema'; import React from 'react'; export interface SchemaSettingsRemoveProps { diff --git a/packages/plugins/@hera/plugin-core/src/client/schema-settings/index.tsx b/packages/plugins/@hera/plugin-core/src/client/schema-settings/index.tsx index ed486e579..05b8e05a3 100644 --- a/packages/plugins/@hera/plugin-core/src/client/schema-settings/index.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/schema-settings/index.tsx @@ -1,5 +1,5 @@ -import { Field } from '@formily/core'; -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import { getShouldChange, SchemaComponent, diff --git a/packages/plugins/@hera/plugin-mobile/package.json b/packages/plugins/@hera/plugin-mobile/package.json index 1fd4fb5fb..c590c3b27 100644 --- a/packages/plugins/@hera/plugin-mobile/package.json +++ b/packages/plugins/@hera/plugin-mobile/package.json @@ -3,7 +3,7 @@ "version": "1.0.3-alpha.4", "main": "dist/server/index.js", "dependencies": { - "@formily/react": "^2.2.27", + "@nocobase/schema": "workspace:*", "antd-mobile": "^5.29.1" }, "peerDependencies": { diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schema-initializer/NoticeBlockInitializer.tsx b/packages/plugins/@hera/plugin-mobile/src/client/schema-initializer/NoticeBlockInitializer.tsx index fa67805d4..e67384741 100644 --- a/packages/plugins/@hera/plugin-mobile/src/client/schema-initializer/NoticeBlockInitializer.tsx +++ b/packages/plugins/@hera/plugin-mobile/src/client/schema-initializer/NoticeBlockInitializer.tsx @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { Icon, DataBlockInitializer, diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schema-initializer/SwiperBlockInitializer.tsx b/packages/plugins/@hera/plugin-mobile/src/client/schema-initializer/SwiperBlockInitializer.tsx index 34c941f44..c9231839e 100644 --- a/packages/plugins/@hera/plugin-mobile/src/client/schema-initializer/SwiperBlockInitializer.tsx +++ b/packages/plugins/@hera/plugin-mobile/src/client/schema-initializer/SwiperBlockInitializer.tsx @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { DataBlockInitializer, css, diff --git a/packages/plugins/@hera/plugin-mobile/src/client/schema-initializer/TabSearchBlockInitializer.tsx b/packages/plugins/@hera/plugin-mobile/src/client/schema-initializer/TabSearchBlockInitializer.tsx index 4e5e87b0c..d84da3a2d 100644 --- a/packages/plugins/@hera/plugin-mobile/src/client/schema-initializer/TabSearchBlockInitializer.tsx +++ b/packages/plugins/@hera/plugin-mobile/src/client/schema-initializer/TabSearchBlockInitializer.tsx @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { DataBlockInitializer, Icon, diff --git a/packages/plugins/@hera/plugin-rental/package.json b/packages/plugins/@hera/plugin-rental/package.json index d0a1d3660..1c83fb549 100644 --- a/packages/plugins/@hera/plugin-rental/package.json +++ b/packages/plugins/@hera/plugin-rental/package.json @@ -8,11 +8,10 @@ ], "main": "dist/server/index.js", "devDependencies": { - "@ant-design/icons": "^5.1.4", - "@formily/core": "^2.2.27", - "@formily/react": "^2.2.27", + "@ant-design/icons": "^5.3.6", + "@nocobase/schema": "workspace:*", "ahooks": "^3.7.2", - "antd": "5.*", + "antd": "5.16.0", "dayjs": "^1.11.8", "exceljs": "^4.4.0", "file-saver": "^2.0.5", @@ -20,7 +19,7 @@ "lodash": "4.17.21", "qrcode": "^1.5.1", "qrcode.react": "^3.1.0", - "react": "18.*", + "react": "~18.2.0", "react-router-dom": "^6.11.2", "sequelize": "^6.26.0" }, diff --git a/packages/plugins/@hera/plugin-rental/src/client/custom-components/DetailChecks.tsx b/packages/plugins/@hera/plugin-rental/src/client/custom-components/DetailChecks.tsx index 039e65de2..79df61edb 100644 --- a/packages/plugins/@hera/plugin-rental/src/client/custom-components/DetailChecks.tsx +++ b/packages/plugins/@hera/plugin-rental/src/client/custom-components/DetailChecks.tsx @@ -1,8 +1,8 @@ import React from 'react'; import _ from 'lodash'; import { CustomComponentType, CustomFunctionComponent } from '@hera/plugin-core/client'; -import { useField, useFieldSchema, useForm } from '@formily/react'; -import { FormPath } from '@formily/core'; +import { useField, useFieldSchema, useForm } from '@nocobase/schema'; +import { FormPath } from '@nocobase/schema'; import { useRequest } from '@nocobase/client'; import { Space, Spin, Tag } from 'antd'; diff --git a/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordDetails.tsx b/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordDetails.tsx index beaa0df10..c95c8acd7 100644 --- a/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordDetails.tsx +++ b/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordDetails.tsx @@ -1,8 +1,8 @@ import React from 'react'; import _ from 'lodash'; import { CustomComponentType, CustomFunctionComponent } from '@hera/plugin-core/client'; -import { useField, useFieldSchema, useForm } from '@formily/react'; -import { FormPath } from '@formily/core'; +import { useField, useFieldSchema, useForm } from '@nocobase/schema'; +import { FormPath } from '@nocobase/schema'; import { useRequest } from '@nocobase/client'; import { Descriptions, Spin } from 'antd'; import { formatQuantity } from '../../utils/currencyUtils'; diff --git a/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordFeeConverted.tsx b/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordFeeConverted.tsx index 16d37ad62..27efefbb8 100644 --- a/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordFeeConverted.tsx +++ b/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordFeeConverted.tsx @@ -1,5 +1,5 @@ -import { onFieldInit, onFieldValueChange } from '@formily/core'; -import { useField, useForm, useFormEffects } from '@formily/react'; +import { onFieldInit, onFieldValueChange } from '@nocobase/schema'; +import { useField, useForm, useFormEffects } from '@nocobase/schema'; import { CustomComponentType, CustomFunctionComponent } from '@hera/plugin-core/client'; import { useRequest } from '@nocobase/client'; import _ from 'lodash'; diff --git a/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordFeeConvertedRead.tsx b/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordFeeConvertedRead.tsx index bd60f633e..8b96924f8 100644 --- a/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordFeeConvertedRead.tsx +++ b/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordFeeConvertedRead.tsx @@ -1,5 +1,5 @@ -import { onFieldInit, onFieldValueChange } from '@formily/core'; -import { useForm, useFormEffects } from '@formily/react'; +import { onFieldInit, onFieldValueChange } from '@nocobase/schema'; +import { useForm, useFormEffects } from '@nocobase/schema'; import { CustomComponentType, CustomFunctionComponent } from '@hera/plugin-core/client'; import { useRequest } from '@nocobase/client'; import _ from 'lodash'; diff --git a/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordFeeScope.tsx b/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordFeeScope.tsx index 61c360c57..ad7509359 100644 --- a/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordFeeScope.tsx +++ b/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordFeeScope.tsx @@ -1,7 +1,7 @@ import _ from 'lodash'; import { Spin } from 'antd'; import React from 'react'; -import { observer, useField, useFieldSchema, useForm } from '@formily/react'; +import { observer, useField, useFieldSchema, useForm } from '@nocobase/schema'; import { CustomComponentType, CustomFC } from '@hera/plugin-core/client'; import { useFeeItems } from '../hooks'; import { useDeepCompareEffect } from 'ahooks'; diff --git a/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordItemCount.tsx b/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordItemCount.tsx index d6d26d7a4..780e8a5d2 100644 --- a/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordItemCount.tsx +++ b/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordItemCount.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { CustomComponentType, CustomFC } from '@hera/plugin-core/client'; -import { observer, useField, useForm } from '@formily/react'; +import { observer, useField, useForm } from '@nocobase/schema'; import _ from 'lodash'; import { formatQuantity } from '../../utils/currencyUtils'; import { Spin } from 'antd'; diff --git a/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordItemValuationQuantity.tsx b/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordItemValuationQuantity.tsx index 5d945635e..0449c1621 100644 --- a/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordItemValuationQuantity.tsx +++ b/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordItemValuationQuantity.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { CustomComponentType, CustomFC } from '@hera/plugin-core/client'; -import { observer, useField, useForm } from '@formily/react'; +import { observer, useField, useForm } from '@nocobase/schema'; import _ from 'lodash'; import { ConversionLogics, RecordCategory } from '../../utils/constants'; import { formatQuantity } from '../../utils/currencyUtils'; diff --git a/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordItemWeight.tsx b/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordItemWeight.tsx index c61f43089..2a2e74fab 100644 --- a/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordItemWeight.tsx +++ b/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordItemWeight.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { CustomComponentType, CustomFC } from '@hera/plugin-core/client'; -import { observer, useField, useForm } from '@formily/react'; +import { observer, useField, useForm } from '@nocobase/schema'; import _ from 'lodash'; import { formatQuantity } from '../../utils/currencyUtils'; diff --git a/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordProductScope.tsx b/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordProductScope.tsx index 5bce1d6d7..5b6b22856 100644 --- a/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordProductScope.tsx +++ b/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordProductScope.tsx @@ -1,7 +1,7 @@ import _ from 'lodash'; import { Spin } from 'antd'; import React from 'react'; -import { observer, useForm } from '@formily/react'; +import { observer, useForm } from '@nocobase/schema'; import { RecordCategory } from '../../utils/constants'; import { CustomComponentType, CustomFC } from '@hera/plugin-core/client'; import { useCachedRequest, useLeaseItems, useProductFeeItems } from '../hooks'; diff --git a/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordSummary.tsx b/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordSummary.tsx index 30c711d2f..5758f1dda 100644 --- a/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordSummary.tsx +++ b/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordSummary.tsx @@ -1,4 +1,4 @@ -import { observer, useForm } from '@formily/react'; +import { observer, useForm } from '@nocobase/schema'; import { ConversionLogics, RecordCategory } from '../../utils/constants'; import { Descriptions, Tabs } from 'antd'; import { CustomComponentType, CustomFC, CustomFunctionComponent } from '@hera/plugin-core/client'; diff --git a/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordTotalPrice.tsx b/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordTotalPrice.tsx index c6317bade..9813a18e5 100644 --- a/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordTotalPrice.tsx +++ b/packages/plugins/@hera/plugin-rental/src/client/custom-components/RecordTotalPrice.tsx @@ -1,5 +1,5 @@ -import { onFieldValueChange, onFieldInit } from '@formily/core'; -import { useField, useForm, useFormEffects } from '@formily/react'; +import { onFieldValueChange, onFieldInit } from '@nocobase/schema'; +import { useField, useForm, useFormEffects } from '@nocobase/schema'; import React, { useEffect, useState } from 'react'; import { ConversionLogics } from '../../utils/constants'; import { useRequest } from '@nocobase/client'; diff --git a/packages/plugins/@hera/plugin-rental/src/client/hooks/useAddToChecklistActionProps.tsx b/packages/plugins/@hera/plugin-rental/src/client/hooks/useAddToChecklistActionProps.tsx index 99aae3f28..8fa8e6ea8 100644 --- a/packages/plugins/@hera/plugin-rental/src/client/hooks/useAddToChecklistActionProps.tsx +++ b/packages/plugins/@hera/plugin-rental/src/client/hooks/useAddToChecklistActionProps.tsx @@ -1,4 +1,4 @@ -import { useForm } from '@formily/react'; +import { useForm } from '@nocobase/schema'; import { useAPIClient, useBlockRequestContext, useRequest } from '@nocobase/client'; import { useChartFilter } from '@nocobase/plugin-data-visualization/client'; import { message } from 'antd'; diff --git a/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/SettlementExcelExportActionInitializer.tsx b/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/SettlementExcelExportActionInitializer.tsx index 57b626d06..7873df783 100644 --- a/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/SettlementExcelExportActionInitializer.tsx +++ b/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/SettlementExcelExportActionInitializer.tsx @@ -1,6 +1,6 @@ import React, { useContext } from 'react'; import { ActionInitializer, useAPIClient, useRecord } from '@nocobase/client'; -import { useField } from '@formily/react'; +import { useField } from '@nocobase/schema'; import { SettlementStyleContext } from './SettlementStyleSwitchActionInitializer'; import { ExportToExcel } from './SettlementExportExcel'; diff --git a/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/blocks/UnusedRecordsBlockInitializer.tsx b/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/blocks/UnusedRecordsBlockInitializer.tsx index 17609a950..4d37a2110 100644 --- a/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/blocks/UnusedRecordsBlockInitializer.tsx +++ b/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/blocks/UnusedRecordsBlockInitializer.tsx @@ -8,7 +8,7 @@ import { useSchemaInitializer, useSchemaInitializerItem, } from '@nocobase/client'; -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { ToolOutlined } from '@ant-design/icons'; import { Tag } from 'antd'; diff --git a/packages/plugins/@hera/plugin-websocket/package.json b/packages/plugins/@hera/plugin-websocket/package.json index 15ee06dd0..2aa01bdba 100644 --- a/packages/plugins/@hera/plugin-websocket/package.json +++ b/packages/plugins/@hera/plugin-websocket/package.json @@ -2,13 +2,10 @@ "name": "@hera/plugin-websocket", "version": "0.0.4-alpha.4", "main": "dist/server/index.js", - "dependencies": {}, "devDependencies": { - "@ant-design/icons": "^5.1.4", + "@ant-design/icons": "^5.3.6", "@formily/antd-v5": "1.x", - "@formily/core": "^2.2.27", - "@formily/react": "^2.2.27", - "@formily/shared": "^2.2.27", + "@nocobase/schema": "workspace:*", "react-use-websocket": "^4.8.1" }, "peerDependencies": { diff --git a/packages/plugins/@hera/plugin-websocket/src/client/schema-initializer/WebsocketBlockInitializer.tsx b/packages/plugins/@hera/plugin-websocket/src/client/schema-initializer/WebsocketBlockInitializer.tsx index dabfe0ec6..906088c84 100644 --- a/packages/plugins/@hera/plugin-websocket/src/client/schema-initializer/WebsocketBlockInitializer.tsx +++ b/packages/plugins/@hera/plugin-websocket/src/client/schema-initializer/WebsocketBlockInitializer.tsx @@ -10,7 +10,7 @@ import { useSchemaInitializerItem, } from '@nocobase/client'; import useWebSocket, { ReadyState } from 'react-use-websocket'; -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; export class WebsocketBlockHelper { constructor(private app: Application) {} diff --git a/packages/plugins/@nocobase/plugin-acl/package.json b/packages/plugins/@nocobase/plugin-acl/package.json index 05b9fb9de..cf40056df 100644 --- a/packages/plugins/@nocobase/plugin-acl/package.json +++ b/packages/plugins/@nocobase/plugin-acl/package.json @@ -15,14 +15,12 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "@ant-design/icons": "^5.1.4", + "@ant-design/icons": "^5.3.6", "@formily/antd-v5": "^1.1.9", - "@formily/core": "^2.2.27", - "@formily/react": "^2.2.27", - "@formily/shared": "^2.2.27", + "@nocobase/schema": "workspace:*", "@types/jsonwebtoken": "^8.5.8", "ahooks": "^3.7.2", - "antd": "^5.12.8", + "antd": "5.16.0", "antd-style": "3.4.5", "async-mutex": "^0.3.2", "jsonwebtoken": "^8.5.1", diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/NewRole.tsx b/packages/plugins/@nocobase/plugin-acl/src/client/NewRole.tsx index 103ca00e3..2bfa46248 100644 --- a/packages/plugins/@nocobase/plugin-acl/src/client/NewRole.tsx +++ b/packages/plugins/@nocobase/plugin-acl/src/client/NewRole.tsx @@ -1,7 +1,7 @@ import { SchemaComponent, useActionContext, useRequest } from '@nocobase/client'; import React from 'react'; import { useACLTranslation } from './locale'; -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; export const NewRole: React.FC = () => { const { t } = useACLTranslation(); diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/RolesManagement.tsx b/packages/plugins/@nocobase/plugin-acl/src/client/RolesManagement.tsx index 1b02749fc..a5089e1f4 100644 --- a/packages/plugins/@nocobase/plugin-acl/src/client/RolesManagement.tsx +++ b/packages/plugins/@nocobase/plugin-acl/src/client/RolesManagement.tsx @@ -8,7 +8,7 @@ import { usePlugin, useSchemaComponentContext, } from '@nocobase/client'; -import { ISchema, Schema } from '@formily/react'; +import { ISchema, Schema } from '@nocobase/schema'; import { RolesMenu } from './RolesMenu'; import { useACLTranslation } from './locale'; import ACLPlugin from '.'; diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/RolesMenu.tsx b/packages/plugins/@nocobase/plugin-acl/src/client/RolesMenu.tsx index 1c4b02db2..62117488c 100644 --- a/packages/plugins/@nocobase/plugin-acl/src/client/RolesMenu.tsx +++ b/packages/plugins/@nocobase/plugin-acl/src/client/RolesMenu.tsx @@ -9,7 +9,7 @@ import { Menu, Empty, Dropdown, App, Tag, Row, Col, Spin } from 'antd'; import { TagOutlined, MoreOutlined } from '@ant-design/icons'; import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react'; import { useACLTranslation } from './locale'; -import { Schema } from '@formily/react'; +import { Schema } from '@nocobase/schema'; import { RolesManagerContext } from './RolesManagerProvider'; import { roleEditSchema } from './schemas/roles'; import { useLoadMoreObserver } from './hooks/load-more-observer'; diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/ActionPermissions.tsx b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/ActionPermissions.tsx index e7038f66e..784b03db4 100644 --- a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/ActionPermissions.tsx +++ b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/ActionPermissions.tsx @@ -1,4 +1,4 @@ -import { ISchema, useForm } from '@formily/react'; +import { ISchema, useForm } from '@nocobase/schema'; import { CollectionContext, CollectionProvider_deprecated, diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/GeneralPermissions.tsx b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/GeneralPermissions.tsx index 57ab7b288..0b4e99120 100644 --- a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/GeneralPermissions.tsx +++ b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/GeneralPermissions.tsx @@ -1,11 +1,11 @@ -import { onFormValuesChange, createForm, Form } from '@formily/core'; -import { connect } from '@formily/react'; +import { onFormValuesChange, createForm, Form } from '@nocobase/schema'; +import { connect } from '@nocobase/schema'; import { SchemaComponent, useAPIClient, useRequest } from '@nocobase/client'; import { Checkbox, message } from 'antd'; import uniq from 'lodash/uniq'; import React, { useContext, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; import { useMemoizedFn } from 'ahooks'; import { RolesManagerContext } from '../RolesManagerProvider'; import { StrategyActions } from './StrategyActions'; diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/MenuPermissions.tsx b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/MenuPermissions.tsx index 0088e4902..c8af7292e 100644 --- a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/MenuPermissions.tsx +++ b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/MenuPermissions.tsx @@ -1,9 +1,9 @@ import { Checkbox, message, Table } from 'antd'; -import { onFormValuesChange, createForm, Form } from '@formily/core'; +import { onFormValuesChange, createForm, Form } from '@nocobase/schema'; import { uniq } from 'lodash'; import React, { useContext, useState, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; import { useAPIClient, SchemaComponent, useRequest } from '@nocobase/client'; import { useStyles } from './style'; import { useMemoizedFn } from 'ahooks'; diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/RolesResourcesActions.tsx b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/RolesResourcesActions.tsx index 13989cadd..6da447da7 100644 --- a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/RolesResourcesActions.tsx +++ b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/RolesResourcesActions.tsx @@ -1,6 +1,6 @@ import { FormItem, FormLayout } from '@formily/antd-v5'; -import { ArrayField } from '@formily/core'; -import { connect, useField, useForm } from '@formily/react'; +import { ArrayField } from '@nocobase/schema'; +import { connect, useField, useForm } from '@nocobase/schema'; import { useCollectionManager, useCollectionManager_deprecated, diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/ScopeSelect.tsx b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/ScopeSelect.tsx index c3aeb3aea..c7d035e06 100644 --- a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/ScopeSelect.tsx +++ b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/ScopeSelect.tsx @@ -1,4 +1,4 @@ -import { createForm } from '@formily/core'; +import { createForm } from '@nocobase/schema'; import React, { createContext, useContext, useMemo, useState } from 'react'; import { FormProvider, SchemaComponent } from '@nocobase/client'; import { scopesSchema } from '../schemas/scopes'; diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/StrategyActions.tsx b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/StrategyActions.tsx index 097b7a884..a0763e972 100644 --- a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/StrategyActions.tsx +++ b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/StrategyActions.tsx @@ -1,5 +1,5 @@ -import { ArrayField } from '@formily/core'; -import { connect, useField } from '@formily/react'; +import { ArrayField } from '@nocobase/schema'; +import { connect, useField } from '@nocobase/schema'; import { Checkbox, Select, Table, Tag } from 'antd'; import React from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/schemas/roles.ts b/packages/plugins/@nocobase/plugin-acl/src/client/schemas/roles.ts index 5e9321d22..a162416cc 100644 --- a/packages/plugins/@nocobase/plugin-acl/src/client/schemas/roles.ts +++ b/packages/plugins/@nocobase/plugin-acl/src/client/schemas/roles.ts @@ -1,8 +1,8 @@ -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; import { useActionContext, useCollectionRecord, useRecord, useRequest } from '@nocobase/client'; import { useEffect } from 'react'; import pick from 'lodash/pick'; -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; export const roleEditSchema = { type: 'object', diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/schemas/scopes.ts b/packages/plugins/@nocobase/plugin-acl/src/client/schemas/scopes.ts index 77c5b6234..90db59f9c 100644 --- a/packages/plugins/@nocobase/plugin-acl/src/client/schemas/scopes.ts +++ b/packages/plugins/@nocobase/plugin-acl/src/client/schemas/scopes.ts @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { VariableInput, useFilterOptions, useFormBlockContext } from '@nocobase/client'; import { useContext, useEffect } from 'react'; import { RoleResourceCollectionContext } from '../permissions/RolesResourcesActions'; diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json b/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json index 501e05e40..6a8a1f0c4 100644 --- a/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json +++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json @@ -10,13 +10,11 @@ "license": "AGPL-3.0", "main": "dist/server/index.js", "devDependencies": { - "@ant-design/icons": "^5.1.4", + "@ant-design/icons": "^5.3.6", "@emotion/css": "^11.7.1", "@formily/antd-v5": "^1.1.9", - "@formily/core": "^2.2.27", - "@formily/react": "^2.2.27", - "@formily/shared": "^2.2.27", - "antd": "^5.12.8", + "@nocobase/schema": "workspace:*", + "antd": "5.16.0", "lodash": "4.17.21", "react-i18next": "^11.15.1", "react-router-dom": "^6.11.2" diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditAction.Settings.tsx b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditAction.Settings.tsx index 2f53ac9c5..9c403d88d 100644 --- a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditAction.Settings.tsx +++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditAction.Settings.tsx @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { ActionDesigner, SchemaInitializerOpenModeSchemaItems, diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/bulkEditFormItemSettings.ts b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/bulkEditFormItemSettings.ts index 40b974f03..680adf0cb 100644 --- a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/bulkEditFormItemSettings.ts +++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/bulkEditFormItemSettings.ts @@ -1,6 +1,6 @@ import { ArrayCollapse, FormLayout } from '@formily/antd-v5'; -import { Field } from '@formily/core'; -import { useField, useFieldSchema } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { SchemaSettings, useApp, diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/component/BulkEditField.tsx b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/component/BulkEditField.tsx index 7f6ec631d..0542fd83e 100644 --- a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/component/BulkEditField.tsx +++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/component/BulkEditField.tsx @@ -1,7 +1,7 @@ import { css } from '@emotion/css'; -import { Field } from '@formily/core'; -import { connect, useField, useFieldSchema } from '@formily/react'; -import { merge } from '@formily/shared'; +import { Field } from '@nocobase/schema'; +import { connect, useField, useFieldSchema } from '@nocobase/schema'; +import { merge } from '@nocobase/schema'; import { CollectionFieldProvider, useCollection_deprecated, diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/createBulkEditBlockUISchema.ts b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/createBulkEditBlockUISchema.ts index 208e44e7b..d875595cd 100644 --- a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/createBulkEditBlockUISchema.ts +++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/createBulkEditBlockUISchema.ts @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; /** * 创建批量编辑表单的 UI Schema diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/utils.tsx b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/utils.tsx index ed7629cf3..3bb1ce045 100644 --- a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/utils.tsx +++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/utils.tsx @@ -12,7 +12,7 @@ import { import React, { useContext } from 'react'; import { App, message } from 'antd'; import { useNavigate } from 'react-router-dom'; -import { SchemaExpressionScopeContext, useField, useForm } from '@formily/react'; +import { SchemaExpressionScopeContext, useField, useForm } from '@nocobase/schema'; import { cloneDeep } from 'lodash'; import { isURL } from '@nocobase/utils/client'; import { useMemo } from 'react'; diff --git a/packages/plugins/@nocobase/plugin-action-bulk-update/package.json b/packages/plugins/@nocobase/plugin-action-bulk-update/package.json index 5959b505f..a1bf3249e 100644 --- a/packages/plugins/@nocobase/plugin-action-bulk-update/package.json +++ b/packages/plugins/@nocobase/plugin-action-bulk-update/package.json @@ -10,9 +10,8 @@ "license": "AGPL-3.0", "main": "dist/server/index.js", "devDependencies": { - "@formily/react": "^2.2.27", - "@formily/shared": "^2.2.27", - "antd": "^5.12.8", + "@nocobase/schema": "workspace:*", + "antd": "5.16.0", "react-i18next": "^11.15.1", "react-router-dom": "^6.11.2" }, diff --git a/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/BulkUpdateAction.Settings.tsx b/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/BulkUpdateAction.Settings.tsx index c78341585..aed357313 100644 --- a/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/BulkUpdateAction.Settings.tsx +++ b/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/BulkUpdateAction.Settings.tsx @@ -1,5 +1,5 @@ -import { ISchema, useFieldSchema } from '@formily/react'; -import { isValid } from '@formily/shared'; +import { ISchema, useFieldSchema } from '@nocobase/schema'; +import { isValid } from '@nocobase/schema'; import { ActionDesigner, SchemaSettings, diff --git a/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/utils.tsx b/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/utils.tsx index 4dbf563eb..a73c4054b 100644 --- a/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/utils.tsx +++ b/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/utils.tsx @@ -1,4 +1,4 @@ -import { SchemaExpressionScopeContext, useField, useFieldSchema } from '@formily/react'; +import { SchemaExpressionScopeContext, useField, useFieldSchema } from '@nocobase/schema'; import { TableFieldResource, isVariable, diff --git a/packages/plugins/@nocobase/plugin-action-duplicate/package.json b/packages/plugins/@nocobase/plugin-action-duplicate/package.json index 7bfbd6e04..7c65026bd 100644 --- a/packages/plugins/@nocobase/plugin-action-duplicate/package.json +++ b/packages/plugins/@nocobase/plugin-action-duplicate/package.json @@ -11,9 +11,8 @@ "main": "dist/server/index.js", "devDependencies": { "@emotion/css": "^11.7.1", - "@formily/core": "^2.2.27", - "@formily/react": "^2.2.27", - "antd": "^5.12.8", + "@nocobase/schema": "workspace:*", + "antd": "5.16.0", "lodash": "4.17.21", "react-i18next": "^11.15.1" }, diff --git a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateAction.Settings.tsx b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateAction.Settings.tsx index 9ec0b04cf..df7043022 100644 --- a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateAction.Settings.tsx +++ b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateAction.Settings.tsx @@ -1,5 +1,5 @@ -import { onFieldInputValueChange } from '@formily/core'; -import { ISchema, connect, mapProps, useField, useFieldSchema, useForm } from '@formily/react'; +import { onFieldInputValueChange } from '@nocobase/schema'; +import { ISchema, connect, mapProps, useField, useFieldSchema, useForm } from '@nocobase/schema'; import { ActionDesigner, SchemaSettingOpenModeSchemaItems, diff --git a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateAction.tsx b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateAction.tsx index 845128886..020602f0d 100644 --- a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateAction.tsx +++ b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateAction.tsx @@ -1,5 +1,5 @@ import { css, cx } from '@emotion/css'; -import { RecursionField, observer, useField, useFieldSchema } from '@formily/react'; +import { RecursionField, observer, useField, useFieldSchema } from '@nocobase/schema'; import { ActionContextProvider, CollectionProvider_deprecated, diff --git a/packages/plugins/@nocobase/plugin-api-doc/package.json b/packages/plugins/@nocobase/plugin-api-doc/package.json index 0f27aa13f..2aeda317b 100644 --- a/packages/plugins/@nocobase/plugin-api-doc/package.json +++ b/packages/plugins/@nocobase/plugin-api-doc/package.json @@ -13,8 +13,8 @@ "main": "./dist/server/index.js", "types": "./dist/server/index.d.ts", "devDependencies": { - "@ant-design/icons": "5.x", - "antd": "^5.12.8", + "@ant-design/icons": "~5.3.6", + "antd": "5.16.0", "antd-style": "3.4.5", "react-i18next": "^11.15.1", "swagger-ui-dist": "^5.3.1" diff --git a/packages/plugins/@nocobase/plugin-api-keys/package.json b/packages/plugins/@nocobase/plugin-api-keys/package.json index d7b1fcfce..a3b6afb50 100644 --- a/packages/plugins/@nocobase/plugin-api-keys/package.json +++ b/packages/plugins/@nocobase/plugin-api-keys/package.json @@ -10,10 +10,9 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "@formily/react": "2.x", - "@formily/shared": "2.x", + "@nocobase/schema": "workspace:*", "ahooks": "^3.7.2", - "antd": "5.x", + "antd": "5.16.0", "dayjs": "^1.11.8", "i18next": "^22.4.9", "react": "^18.2.0", diff --git a/packages/plugins/@nocobase/plugin-api-keys/src/client/Configuration/ExpiresSelect.tsx b/packages/plugins/@nocobase/plugin-api-keys/src/client/Configuration/ExpiresSelect.tsx index 91c07377f..61a8b5591 100644 --- a/packages/plugins/@nocobase/plugin-api-keys/src/client/Configuration/ExpiresSelect.tsx +++ b/packages/plugins/@nocobase/plugin-api-keys/src/client/Configuration/ExpiresSelect.tsx @@ -1,4 +1,4 @@ -import { connect, mapProps, mapReadPretty } from '@formily/react'; +import { connect, mapProps, mapReadPretty } from '@nocobase/schema'; import { css, useRecord } from '@nocobase/client'; import { useBoolean } from 'ahooks'; import { DatePicker, Select, Space, Typography } from 'antd'; diff --git a/packages/plugins/@nocobase/plugin-api-keys/src/client/Configuration/index.tsx b/packages/plugins/@nocobase/plugin-api-keys/src/client/Configuration/index.tsx index 91329dd13..4bfdbff77 100644 --- a/packages/plugins/@nocobase/plugin-api-keys/src/client/Configuration/index.tsx +++ b/packages/plugins/@nocobase/plugin-api-keys/src/client/Configuration/index.tsx @@ -1,4 +1,4 @@ -import { RecursionField } from '@formily/react'; +import { RecursionField } from '@nocobase/schema'; import { SchemaComponentOptions, useCurrentRoles } from '@nocobase/client'; import React from 'react'; import { ExpiresSelect } from './ExpiresSelect'; diff --git a/packages/plugins/@nocobase/plugin-api-keys/src/client/Configuration/schema.tsx b/packages/plugins/@nocobase/plugin-api-keys/src/client/Configuration/schema.tsx index aaf6072c4..7a7ba26a7 100644 --- a/packages/plugins/@nocobase/plugin-api-keys/src/client/Configuration/schema.tsx +++ b/packages/plugins/@nocobase/plugin-api-keys/src/client/Configuration/schema.tsx @@ -1,5 +1,5 @@ -import { ISchema, useForm } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema, useForm } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { useActionContext, useBlockRequestContext, useRecord } from '@nocobase/client'; import { Alert, Modal, Space, Typography } from 'antd'; import React from 'react'; diff --git a/packages/plugins/@nocobase/plugin-audit-logs/package.json b/packages/plugins/@nocobase/plugin-audit-logs/package.json index 773e67d71..7cae28ce0 100644 --- a/packages/plugins/@nocobase/plugin-audit-logs/package.json +++ b/packages/plugins/@nocobase/plugin-audit-logs/package.json @@ -10,10 +10,9 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "@ant-design/icons": "5.x", + "@ant-design/icons": "~5.3.6", "@formily/antd-v5": "1.x", - "@formily/react": "2.x", - "@formily/shared": "2.x", + "@nocobase/schema": "workspace:*", "react": "^18.2.0", "react-i18next": "^11.15.1" }, diff --git a/packages/plugins/@nocobase/plugin-audit-logs/src/client/AuditLogsBlockInitializer.tsx b/packages/plugins/@nocobase/plugin-audit-logs/src/client/AuditLogsBlockInitializer.tsx index 9607e1581..9d3f81535 100644 --- a/packages/plugins/@nocobase/plugin-audit-logs/src/client/AuditLogsBlockInitializer.tsx +++ b/packages/plugins/@nocobase/plugin-audit-logs/src/client/AuditLogsBlockInitializer.tsx @@ -1,5 +1,5 @@ import { TableOutlined } from '@ant-design/icons'; -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { SchemaInitializerItem, useSchemaInitializer, useSchemaInitializerItem } from '@nocobase/client'; import React from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/plugins/@nocobase/plugin-audit-logs/src/client/__tests__/createAuditLogsBlockSchema.test.ts b/packages/plugins/@nocobase/plugin-audit-logs/src/client/__tests__/createAuditLogsBlockSchema.test.ts index a950b9429..03b8607b8 100644 --- a/packages/plugins/@nocobase/plugin-audit-logs/src/client/__tests__/createAuditLogsBlockSchema.test.ts +++ b/packages/plugins/@nocobase/plugin-audit-logs/src/client/__tests__/createAuditLogsBlockSchema.test.ts @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { createAuditLogsBlockSchema } from '../createAuditLogsBlockSchema'; describe('createAuditLogsBlockSchema', () => { diff --git a/packages/plugins/@nocobase/plugin-audit-logs/src/client/components/AuditLogsField.tsx b/packages/plugins/@nocobase/plugin-audit-logs/src/client/components/AuditLogsField.tsx index 314d1b048..d545e1a46 100644 --- a/packages/plugins/@nocobase/plugin-audit-logs/src/client/components/AuditLogsField.tsx +++ b/packages/plugins/@nocobase/plugin-audit-logs/src/client/components/AuditLogsField.tsx @@ -1,6 +1,6 @@ import { EllipsisWithTooltip, useCompile } from '@nocobase/client'; import React from 'react'; -import { observer, useField } from '@formily/react'; +import { observer, useField } from '@nocobase/schema'; export const AuditLogsField = observer( () => { diff --git a/packages/plugins/@nocobase/plugin-audit-logs/src/client/components/AuditLogsValue.tsx b/packages/plugins/@nocobase/plugin-audit-logs/src/client/components/AuditLogsValue.tsx index 1e2c1ac08..1c44af811 100644 --- a/packages/plugins/@nocobase/plugin-audit-logs/src/client/components/AuditLogsValue.tsx +++ b/packages/plugins/@nocobase/plugin-audit-logs/src/client/components/AuditLogsValue.tsx @@ -1,6 +1,6 @@ import { EllipsisWithTooltip, FormProvider, SchemaComponent, useRecord } from '@nocobase/client'; import React from 'react'; -import { observer, useField } from '@formily/react'; +import { observer, useField } from '@nocobase/schema'; export const AuditLogsValue = observer( () => { diff --git a/packages/plugins/@nocobase/plugin-audit-logs/src/client/createAuditLogsBlockSchema.tsx b/packages/plugins/@nocobase/plugin-audit-logs/src/client/createAuditLogsBlockSchema.tsx index 2f7e1ef6b..03679773c 100644 --- a/packages/plugins/@nocobase/plugin-audit-logs/src/client/createAuditLogsBlockSchema.tsx +++ b/packages/plugins/@nocobase/plugin-audit-logs/src/client/createAuditLogsBlockSchema.tsx @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { uid } from '@nocobase/utils/client'; export function createAuditLogsBlockSchema(): ISchema { diff --git a/packages/plugins/@nocobase/plugin-audit-logs/src/client/deplicated/AuditLogs.tsx b/packages/plugins/@nocobase/plugin-audit-logs/src/client/deplicated/AuditLogs.tsx index 54e62873d..71a339723 100644 --- a/packages/plugins/@nocobase/plugin-audit-logs/src/client/deplicated/AuditLogs.tsx +++ b/packages/plugins/@nocobase/plugin-audit-logs/src/client/deplicated/AuditLogs.tsx @@ -1,5 +1,5 @@ import { ArrayTable } from '@formily/antd-v5'; -import { observer, useField } from '@formily/react'; +import { observer, useField } from '@nocobase/schema'; import { ExtendCollectionsProvider, FormProvider, diff --git a/packages/plugins/@nocobase/plugin-audit-logs/src/client/deplicated/AuditLogsDesigner.tsx b/packages/plugins/@nocobase/plugin-audit-logs/src/client/deplicated/AuditLogsDesigner.tsx index 03f57cd8a..05a778ec3 100644 --- a/packages/plugins/@nocobase/plugin-audit-logs/src/client/deplicated/AuditLogsDesigner.tsx +++ b/packages/plugins/@nocobase/plugin-audit-logs/src/client/deplicated/AuditLogsDesigner.tsx @@ -1,4 +1,4 @@ -import { useField, useFieldSchema } from '@formily/react'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { GeneralSchemaDesigner, SchemaSettingsDataScope, diff --git a/packages/plugins/@nocobase/plugin-audit-logs/src/client/initializers/AuditLogsTableActionColumnInitializers.tsx b/packages/plugins/@nocobase/plugin-audit-logs/src/client/initializers/AuditLogsTableActionColumnInitializers.tsx index 437f47899..42d315720 100644 --- a/packages/plugins/@nocobase/plugin-audit-logs/src/client/initializers/AuditLogsTableActionColumnInitializers.tsx +++ b/packages/plugins/@nocobase/plugin-audit-logs/src/client/initializers/AuditLogsTableActionColumnInitializers.tsx @@ -1,5 +1,5 @@ import { MenuOutlined } from '@ant-design/icons'; -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { CompatibleSchemaInitializer, createDesignable, diff --git a/packages/plugins/@nocobase/plugin-audit-logs/src/client/utils.ts b/packages/plugins/@nocobase/plugin-audit-logs/src/client/utils.ts index 1ecc63443..8af933ef2 100644 --- a/packages/plugins/@nocobase/plugin-audit-logs/src/client/utils.ts +++ b/packages/plugins/@nocobase/plugin-audit-logs/src/client/utils.ts @@ -1,4 +1,4 @@ -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; export const createSchema = () => { const filterSchema = { diff --git a/packages/plugins/@nocobase/plugin-auth/package.json b/packages/plugins/@nocobase/plugin-auth/package.json index 3cfc54358..03b00a25c 100644 --- a/packages/plugins/@nocobase/plugin-auth/package.json +++ b/packages/plugins/@nocobase/plugin-auth/package.json @@ -9,12 +9,11 @@ "homepage": "https://docs.nocobase.com/handbook/auth", "main": "./dist/server/index.js", "devDependencies": { - "@ant-design/icons": "5.x", + "@ant-design/icons": "~5.3.6", "@emotion/css": "^11.7.1", - "@formily/react": "2.x", - "@formily/shared": "2.x", + "@nocobase/schema": "workspace:*", "@types/cron": "^2.0.1", - "antd": "5.x", + "antd": "5.16.0", "cron": "^2.3.1", "react": "^18.2.0", "react-i18next": "^11.15.1", diff --git a/packages/plugins/@nocobase/plugin-auth/src/client/basic/SignInForm.tsx b/packages/plugins/@nocobase/plugin-auth/src/client/basic/SignInForm.tsx index e0639ffae..ddfde7589 100644 --- a/packages/plugins/@nocobase/plugin-auth/src/client/basic/SignInForm.tsx +++ b/packages/plugins/@nocobase/plugin-auth/src/client/basic/SignInForm.tsx @@ -1,9 +1,9 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { SchemaComponent, useAPIClient, useCurrentUserContext } from '@nocobase/client'; import React, { useCallback } from 'react'; import { useAuthTranslation } from '../locale'; import { useNavigate, useSearchParams } from 'react-router-dom'; -import { useForm } from '@formily/react'; +import { useForm } from '@nocobase/schema'; import { useSignUpForms } from '../pages'; import { Authenticator } from '../authenticator'; diff --git a/packages/plugins/@nocobase/plugin-auth/src/client/basic/SignUpForm.tsx b/packages/plugins/@nocobase/plugin-auth/src/client/basic/SignUpForm.tsx index dfbce92c8..5fd722719 100644 --- a/packages/plugins/@nocobase/plugin-auth/src/client/basic/SignUpForm.tsx +++ b/packages/plugins/@nocobase/plugin-auth/src/client/basic/SignUpForm.tsx @@ -1,10 +1,10 @@ import { SchemaComponent } from '@nocobase/client'; -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import React from 'react'; -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; import { useAuthTranslation } from '../locale'; import { useAPIClient } from '@nocobase/client'; -import { useForm } from '@formily/react'; +import { useForm } from '@nocobase/schema'; import { useNavigate, Navigate } from 'react-router-dom'; import { message } from 'antd'; import { useTranslation } from 'react-i18next'; diff --git a/packages/plugins/@nocobase/plugin-auth/src/client/settings/Options.tsx b/packages/plugins/@nocobase/plugin-auth/src/client/settings/Options.tsx index 3b6c14450..7d5fb60fa 100644 --- a/packages/plugins/@nocobase/plugin-auth/src/client/settings/Options.tsx +++ b/packages/plugins/@nocobase/plugin-auth/src/client/settings/Options.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { observer, useForm } from '@formily/react'; +import { observer, useForm } from '@nocobase/schema'; import { useActionContext, usePlugin, useRecord, useRequest } from '@nocobase/client'; import { useEffect } from 'react'; import AuthPlugin from '..'; diff --git a/packages/plugins/@nocobase/plugin-auth/src/client/settings/schemas/authenticators.ts b/packages/plugins/@nocobase/plugin-auth/src/client/settings/schemas/authenticators.ts index e9225fa5a..b779d0883 100644 --- a/packages/plugins/@nocobase/plugin-auth/src/client/settings/schemas/authenticators.ts +++ b/packages/plugins/@nocobase/plugin-auth/src/client/settings/schemas/authenticators.ts @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { i18n, useAPIClient, useActionContext, useRequest } from '@nocobase/client'; import { message } from 'antd'; import { useContext } from 'react'; diff --git a/packages/plugins/@nocobase/plugin-backup-restore/package.json b/packages/plugins/@nocobase/plugin-backup-restore/package.json index c0bdf89ea..ee9b56945 100644 --- a/packages/plugins/@nocobase/plugin-backup-restore/package.json +++ b/packages/plugins/@nocobase/plugin-backup-restore/package.json @@ -15,12 +15,13 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "@ant-design/icons": "^5.1.4", + "@ant-design/icons": "^5.3.6", "@formily/antd-v5": "^1.1.9", "@hapi/topo": "^6.0.0", "@koa/multer": "^3.0.2", "@types/archiver": "^5.3.1", - "antd": "5.x", + "@types/lodash": "4.17.0", + "antd": "5.16.0", "archiver": "^5.3.1", "content-disposition": "^0.5.4", "dayjs": "^1.11.8", diff --git a/packages/plugins/@nocobase/plugin-calendar/package.json b/packages/plugins/@nocobase/plugin-calendar/package.json index 6e830a43b..837461940 100644 --- a/packages/plugins/@nocobase/plugin-calendar/package.json +++ b/packages/plugins/@nocobase/plugin-calendar/package.json @@ -17,12 +17,10 @@ "main": "./dist/server/index.js", "types": "./dist/server/index.d.ts", "devDependencies": { - "@ant-design/icons": "5.x", + "@ant-design/icons": "~5.3.6", "@formily/antd-v5": "1.x", - "@formily/core": "2.x", - "@formily/react": "2.x", - "@formily/shared": "2.x", - "antd": "5.x", + "@nocobase/schema": "workspace:*", + "antd": "5.16.0", "antd-style": "3.4.5", "cron-parser": "4.4.0", "dayjs": "^1.11.8", diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calendar.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calendar.tsx index 244511a68..0826e61d9 100644 --- a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calendar.tsx +++ b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calendar.tsx @@ -1,5 +1,5 @@ import { LeftOutlined, RightOutlined } from '@ant-design/icons'; -import { RecursionField, Schema, observer, useFieldSchema } from '@formily/react'; +import { RecursionField, Schema, observer, useFieldSchema } from '@nocobase/schema'; import { ActionContextProvider, RecordProvider, diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calender.Settings.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calender.Settings.tsx index 2e3260b09..00157fc65 100644 --- a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calender.Settings.tsx +++ b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calender.Settings.tsx @@ -1,4 +1,4 @@ -import { useField, useFieldSchema } from '@formily/react'; +import { useField, useFieldSchema } from '@nocobase/schema'; import React from 'react'; import { SchemaSettings, diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/DeleteEvent.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/DeleteEvent.tsx index 2a3348737..1d0d2e263 100644 --- a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/DeleteEvent.tsx +++ b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/DeleteEvent.tsx @@ -1,4 +1,4 @@ -import { observer } from '@formily/react'; +import { observer } from '@nocobase/schema'; import { Modal, Radio, Space, Typography } from 'antd'; import dayjs from 'dayjs'; import React, { useContext, useState } from 'react'; diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Event.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Event.tsx index 4550041ba..9da9bac0e 100644 --- a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Event.tsx +++ b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Event.tsx @@ -1,4 +1,4 @@ -import { observer } from '@formily/react'; +import { observer } from '@nocobase/schema'; import React from 'react'; export const Event = observer( diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Nav.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Nav.tsx index 53736e9aa..c7c4e6c99 100644 --- a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Nav.tsx +++ b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Nav.tsx @@ -1,5 +1,5 @@ import { LeftOutlined, RightOutlined } from '@ant-design/icons'; -import { observer } from '@formily/react'; +import { observer } from '@nocobase/schema'; import { Button } from 'antd'; import React, { useContext } from 'react'; import { Navigate } from 'react-big-calendar/dist/react-big-calendar.esm'; diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Title.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Title.tsx index 6cc05f29c..cf211d0ae 100644 --- a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Title.tsx +++ b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Title.tsx @@ -1,4 +1,4 @@ -import { observer } from '@formily/react'; +import { observer } from '@nocobase/schema'; import { Button } from 'antd'; import React, { useContext, useMemo } from 'react'; import { CalendarToolbarContext } from './context'; diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Today.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Today.tsx index fa82c8a17..18e90aeeb 100644 --- a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Today.tsx +++ b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Today.tsx @@ -1,4 +1,4 @@ -import { observer } from '@formily/react'; +import { observer } from '@nocobase/schema'; import { Button } from 'antd'; import React, { useContext } from 'react'; import { Navigate } from 'react-big-calendar/dist/react-big-calendar.esm'; diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/ViewSelect.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/ViewSelect.tsx index 9db3c1084..837e81c4d 100644 --- a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/ViewSelect.tsx +++ b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/ViewSelect.tsx @@ -1,4 +1,4 @@ -import { observer } from '@formily/react'; +import { observer } from '@nocobase/schema'; import { Select } from 'antd'; import React, { useContext } from 'react'; import { CalendarToolbarContext } from './context'; diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/demos/demo2.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/demos/demo2.tsx index c18a3f897..ed8ad0e2b 100644 --- a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/demos/demo2.tsx +++ b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/demos/demo2.tsx @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { AntdSchemaComponentProvider, APIClient, diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/CalendarBlockProvider.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/CalendarBlockProvider.tsx index 04b2f18c7..8f3262275 100644 --- a/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/CalendarBlockProvider.tsx +++ b/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/CalendarBlockProvider.tsx @@ -1,5 +1,5 @@ -import { ArrayField } from '@formily/core'; -import { useField, useFieldSchema } from '@formily/react'; +import { ArrayField } from '@nocobase/schema'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { BlockProvider, FixedBlockWrapper, diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/createCalendarBlockUISchema.ts b/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/createCalendarBlockUISchema.ts index 872437377..943be55f7 100644 --- a/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/createCalendarBlockUISchema.ts +++ b/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/createCalendarBlockUISchema.ts @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { generateNTemplate } from '../../locale'; export const createCalendarBlockUISchema = (options: { diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/items/CalendarBlockInitializer.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/items/CalendarBlockInitializer.tsx index b2c726e51..8152388f7 100644 --- a/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/items/CalendarBlockInitializer.tsx +++ b/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/items/CalendarBlockInitializer.tsx @@ -1,6 +1,6 @@ import { FormOutlined } from '@ant-design/icons'; import { FormLayout } from '@formily/antd-v5'; -import { SchemaOptionsContext } from '@formily/react'; +import { SchemaOptionsContext } from '@nocobase/schema'; import { Collection, CollectionFieldOptions, diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/items/RecordAssociationCalendarBlockInitializer.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/items/RecordAssociationCalendarBlockInitializer.tsx index 97b0b327d..c45c5050c 100644 --- a/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/items/RecordAssociationCalendarBlockInitializer.tsx +++ b/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/items/RecordAssociationCalendarBlockInitializer.tsx @@ -1,6 +1,6 @@ import { TableOutlined } from '@ant-design/icons'; import { FormLayout } from '@formily/antd-v5'; -import { SchemaOptionsContext } from '@formily/react'; +import { SchemaOptionsContext } from '@nocobase/schema'; import React, { useContext } from 'react'; import { useSchemaTemplateManager, diff --git a/packages/plugins/@nocobase/plugin-cas/package.json b/packages/plugins/@nocobase/plugin-cas/package.json index 126fd667a..7356341b5 100644 --- a/packages/plugins/@nocobase/plugin-cas/package.json +++ b/packages/plugins/@nocobase/plugin-cas/package.json @@ -10,8 +10,8 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "@ant-design/icons": "5.x", - "antd": "5.x", + "@ant-design/icons": "~5.3.6", + "antd": "5.16.0", "react-i18next": "^11.15.1", "react-router-dom": "6.x" }, diff --git a/packages/plugins/@nocobase/plugin-cas/src/server/auth.ts b/packages/plugins/@nocobase/plugin-cas/src/server/auth.ts index 69c7a0e8c..8beeef0b4 100644 --- a/packages/plugins/@nocobase/plugin-cas/src/server/auth.ts +++ b/packages/plugins/@nocobase/plugin-cas/src/server/auth.ts @@ -1,5 +1,6 @@ import { AuthConfig, BaseAuth } from '@nocobase/auth'; import { AuthModel } from '@nocobase/plugin-auth'; +import { Model } from '@nocobase/database'; import axios from 'axios'; export class CASAuth extends BaseAuth { @@ -46,7 +47,7 @@ export class CASAuth extends BaseAuth { } } - async validate() { + async validate(): Promise { const ctx = this.ctx; const { autoSignup } = this.getOptions(); const { ticket } = ctx.action.params; diff --git a/packages/plugins/@nocobase/plugin-charts/package.json b/packages/plugins/@nocobase/plugin-charts/package.json index 89b32842c..3e8252b1f 100644 --- a/packages/plugins/@nocobase/plugin-charts/package.json +++ b/packages/plugins/@nocobase/plugin-charts/package.json @@ -6,12 +6,10 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "@ant-design/icons": "5.x", + "@ant-design/icons": "~5.3.6", "@formily/antd-v5": "1.x", - "@formily/core": "2.x", - "@formily/react": "2.x", - "@formily/shared": "2.x", - "antd": "5.x", + "@nocobase/schema": "workspace:*", + "antd": "5.16.0", "json5": "^2.2.3", "lodash": "4.17.21", "react": "^18.2.0", diff --git a/packages/plugins/@nocobase/plugin-charts/src/client/ChartBlockEngineDesigner.tsx b/packages/plugins/@nocobase/plugin-charts/src/client/ChartBlockEngineDesigner.tsx index 843e1a851..bae502b92 100644 --- a/packages/plugins/@nocobase/plugin-charts/src/client/ChartBlockEngineDesigner.tsx +++ b/packages/plugins/@nocobase/plugin-charts/src/client/ChartBlockEngineDesigner.tsx @@ -1,5 +1,5 @@ import { FormLayout } from '@formily/antd-v5'; -import { SchemaOptionsContext, useField, useFieldSchema } from '@formily/react'; +import { SchemaOptionsContext, useField, useFieldSchema } from '@nocobase/schema'; import { APIClientProvider, FormDialog, diff --git a/packages/plugins/@nocobase/plugin-charts/src/client/ChartBlockInitializer.tsx b/packages/plugins/@nocobase/plugin-charts/src/client/ChartBlockInitializer.tsx index c86a6ec1c..fce02c012 100644 --- a/packages/plugins/@nocobase/plugin-charts/src/client/ChartBlockInitializer.tsx +++ b/packages/plugins/@nocobase/plugin-charts/src/client/ChartBlockInitializer.tsx @@ -1,6 +1,6 @@ import { FormLayout } from '@formily/antd-v5'; -import { Field } from '@formily/core'; -import { RecursionField, Schema, SchemaOptionsContext, observer, useField, useForm } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { RecursionField, Schema, SchemaOptionsContext, observer, useField, useForm } from '@nocobase/schema'; import { APIClientProvider, FormDialog, diff --git a/packages/plugins/@nocobase/plugin-charts/src/client/ChartQueryBlockInitializer.tsx b/packages/plugins/@nocobase/plugin-charts/src/client/ChartQueryBlockInitializer.tsx index 432b17d9b..bc500d313 100644 --- a/packages/plugins/@nocobase/plugin-charts/src/client/ChartQueryBlockInitializer.tsx +++ b/packages/plugins/@nocobase/plugin-charts/src/client/ChartQueryBlockInitializer.tsx @@ -1,6 +1,6 @@ import { TableOutlined } from '@ant-design/icons'; import { FormLayout } from '@formily/antd-v5'; -import { SchemaOptionsContext } from '@formily/react'; +import { SchemaOptionsContext } from '@nocobase/schema'; import { FormDialog, SchemaInitializerItem, diff --git a/packages/plugins/@nocobase/plugin-charts/src/client/DataSetPreviewTable.tsx b/packages/plugins/@nocobase/plugin-charts/src/client/DataSetPreviewTable.tsx index 3fa2d83a3..97b7b1f08 100644 --- a/packages/plugins/@nocobase/plugin-charts/src/client/DataSetPreviewTable.tsx +++ b/packages/plugins/@nocobase/plugin-charts/src/client/DataSetPreviewTable.tsx @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { FormItem, Input, SchemaComponent, SchemaComponentProvider, TableV2 } from '@nocobase/client'; import { Empty, Spin } from 'antd'; import React from 'react'; diff --git a/packages/plugins/@nocobase/plugin-charts/src/client/index.tsx b/packages/plugins/@nocobase/plugin-charts/src/client/index.tsx index 0eff99b25..12fdcc9a9 100644 --- a/packages/plugins/@nocobase/plugin-charts/src/client/index.tsx +++ b/packages/plugins/@nocobase/plugin-charts/src/client/index.tsx @@ -1,4 +1,4 @@ -import { registerValidateRules } from '@formily/core'; +import { registerValidateRules } from '@nocobase/schema'; import { BlockSchemaComponentPlugin, Plugin, SchemaComponentOptions, useAPIClient } from '@nocobase/client'; import JSON5 from 'json5'; import React from 'react'; diff --git a/packages/plugins/@nocobase/plugin-charts/src/client/select/CustomSelect.tsx b/packages/plugins/@nocobase/plugin-charts/src/client/select/CustomSelect.tsx index ffda8f204..d0669239c 100644 --- a/packages/plugins/@nocobase/plugin-charts/src/client/select/CustomSelect.tsx +++ b/packages/plugins/@nocobase/plugin-charts/src/client/select/CustomSelect.tsx @@ -1,5 +1,5 @@ import { LoadingOutlined } from '@ant-design/icons'; -import { connect, mapProps, mapReadPretty } from '@formily/react'; +import { connect, mapProps, mapReadPretty } from '@nocobase/schema'; import { Icon, StablePopover, css } from '@nocobase/client'; import type { SelectProps } from 'antd'; import { Select as AntdSelect } from 'antd'; diff --git a/packages/plugins/@nocobase/plugin-charts/src/client/select/ReadPretty.tsx b/packages/plugins/@nocobase/plugin-charts/src/client/select/ReadPretty.tsx index 391cf7ffb..b6932f39c 100644 --- a/packages/plugins/@nocobase/plugin-charts/src/client/select/ReadPretty.tsx +++ b/packages/plugins/@nocobase/plugin-charts/src/client/select/ReadPretty.tsx @@ -1,6 +1,6 @@ -import { isArrayField } from '@formily/core'; -import { observer, useField } from '@formily/react'; -import { isValid } from '@formily/shared'; +import { isArrayField } from '@nocobase/schema'; +import { observer, useField } from '@nocobase/schema'; +import { isValid } from '@nocobase/schema'; import { Tag } from 'antd'; import React from 'react'; import { defaultFieldNames, getCurrentOptions } from './shared'; diff --git a/packages/plugins/@nocobase/plugin-charts/src/client/settings/AddNewQuery.tsx b/packages/plugins/@nocobase/plugin-charts/src/client/settings/AddNewQuery.tsx index d8728ec13..b4afe7ddb 100644 --- a/packages/plugins/@nocobase/plugin-charts/src/client/settings/AddNewQuery.tsx +++ b/packages/plugins/@nocobase/plugin-charts/src/client/settings/AddNewQuery.tsx @@ -1,7 +1,7 @@ import { DownOutlined, PlusOutlined } from '@ant-design/icons'; -import { createForm } from '@formily/core'; -import { ISchema, useForm } from '@formily/react'; -import { uid } from '@formily/shared'; +import { createForm } from '@nocobase/schema'; +import { ISchema, useForm } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { ActionContextProvider, SchemaComponent, diff --git a/packages/plugins/@nocobase/plugin-charts/src/client/settings/queryTypes.ts b/packages/plugins/@nocobase/plugin-charts/src/client/settings/queryTypes.ts index 0a378b67f..9a11bf82e 100644 --- a/packages/plugins/@nocobase/plugin-charts/src/client/settings/queryTypes.ts +++ b/packages/plugins/@nocobase/plugin-charts/src/client/settings/queryTypes.ts @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import lodash from 'lodash'; export const json: ISchema = { diff --git a/packages/plugins/@nocobase/plugin-charts/src/client/settings/schemas/chartsQueries.ts b/packages/plugins/@nocobase/plugin-charts/src/client/settings/schemas/chartsQueries.ts index fb2fefd5e..b5c9b0185 100644 --- a/packages/plugins/@nocobase/plugin-charts/src/client/settings/schemas/chartsQueries.ts +++ b/packages/plugins/@nocobase/plugin-charts/src/client/settings/schemas/chartsQueries.ts @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { useActionContext, useRecord, diff --git a/packages/plugins/@nocobase/plugin-charts/src/client/utils.ts b/packages/plugins/@nocobase/plugin-charts/src/client/utils.ts index 3bf0a3eef..d31fd4a20 100644 --- a/packages/plugins/@nocobase/plugin-charts/src/client/utils.ts +++ b/packages/plugins/@nocobase/plugin-charts/src/client/utils.ts @@ -1,5 +1,5 @@ import JSON5 from 'json5'; -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; const validateArray = (value) => { try { diff --git a/packages/plugins/@nocobase/plugin-china-region/package.json b/packages/plugins/@nocobase/plugin-china-region/package.json index dceddbf7a..40a95014a 100644 --- a/packages/plugins/@nocobase/plugin-china-region/package.json +++ b/packages/plugins/@nocobase/plugin-china-region/package.json @@ -10,8 +10,7 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "@formily/core": "2.x", - "@formily/react": "2.x", + "@nocobase/schema": "workspace:*", "@types/cross-spawn": "^6.0.2", "china-division": "^2.4.0", "cross-spawn": "^7.0.3" diff --git a/packages/plugins/@nocobase/plugin-china-region/src/client/ChinaRegionProvider.tsx b/packages/plugins/@nocobase/plugin-china-region/src/client/ChinaRegionProvider.tsx index 9211ae3d5..26f56a3b4 100644 --- a/packages/plugins/@nocobase/plugin-china-region/src/client/ChinaRegionProvider.tsx +++ b/packages/plugins/@nocobase/plugin-china-region/src/client/ChinaRegionProvider.tsx @@ -1,5 +1,5 @@ -import { ArrayField } from '@formily/core'; -import { useField } from '@formily/react'; +import { ArrayField } from '@nocobase/schema'; +import { useField } from '@nocobase/schema'; import { useAPIClient, useRequest } from '@nocobase/client'; export const useChinaRegionDataSource = (options) => { diff --git a/packages/plugins/@nocobase/plugin-client/package.json b/packages/plugins/@nocobase/plugin-client/package.json index 090894ae4..efb6f22a2 100644 --- a/packages/plugins/@nocobase/plugin-client/package.json +++ b/packages/plugins/@nocobase/plugin-client/package.json @@ -6,7 +6,7 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "antd": "5.x", + "antd": "5.16.0", "cronstrue": "^2.11.0", "koa-send": "^5.0.1", "koa-static": "^5.0.0" diff --git a/packages/plugins/@nocobase/plugin-collection-manager/package.json b/packages/plugins/@nocobase/plugin-collection-manager/package.json index 92588d552..b67e0f9f6 100644 --- a/packages/plugins/@nocobase/plugin-collection-manager/package.json +++ b/packages/plugins/@nocobase/plugin-collection-manager/package.json @@ -11,6 +11,7 @@ "main": "./dist/server/index.js", "devDependencies": { "@hapi/topo": "^6.0.0", + "@types/lodash": "4.17.0", "async-mutex": "^0.3.2", "lodash": "4.17.21", "sequelize": "^6.26.0", diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/models/field.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/models/field.ts index 819dd69db..cae0b64b0 100644 --- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/models/field.ts +++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/models/field.ts @@ -37,7 +37,9 @@ export class FieldModel extends MagicAttributeModel { const field = await (async () => { await new Promise((resolve) => setTimeout(resolve, 0)); - this.db.logger.debug('埋点debug———— collectionName：' + collectionName + 'options：' + JSON.stringify(options)); + if (process.env.DEBUG_COLLECTION_FIELD) { + this.db.logger.debug({ collectionName, options }); + } return collection.setField(name, options); })(); diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/repositories/collection-repository.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/repositories/collection-repository.ts index 962c8d9b0..1ffcf0d5a 100644 --- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/repositories/collection-repository.ts +++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/repositories/collection-repository.ts @@ -86,11 +86,12 @@ export class CollectionRepository extends Repository { lazyCollectionFields.set(instanceName, skipField); } - this.database.logger.debug(`load collection`, { - instanceName, - submodule: 'CollectionRepository', - method: 'load', - }); + process.env.DEBUG_LOAD_COLLECTION && + this.database.logger.debug(`load collection`, { + instanceName, + submodule: 'CollectionRepository', + method: 'load', + }); this.app.setMaintainingMessage(`load ${instanceName} collection`); await nameMap[instanceName].load({ skipField }); @@ -98,22 +99,24 @@ export class CollectionRepository extends Repository { // load view fields for (const viewCollectionName of viewCollections) { - this.database.logger.debug(`load collection fields`, { - submodule: 'CollectionRepository', - method: 'load', - viewCollectionName, - }); + process.env.DEBUG_LOAD_COLLECTION_FIELDS && + this.database.logger.debug(`load collection fields`, { + submodule: 'CollectionRepository', + method: 'load', + viewCollectionName, + }); this.app.setMaintainingMessage(`load ${viewCollectionName} collection fields`); await nameMap[viewCollectionName].loadFields({}); } // load lazy collection field for (const [collectionName, skipField] of lazyCollectionFields) { - this.database.logger.debug(`load collection fields`, { - submodule: 'CollectionRepository', - method: 'load', - collectionName, - }); + process.env.DEBUG_LOAD_COLLECTION_FIELDS && + this.database.logger.debug(`load collection fields`, { + submodule: 'CollectionRepository', + method: 'load', + collectionName, + }); this.app.setMaintainingMessage(`load ${collectionName} collection fields`); await nameMap[collectionName].loadFields({ includeFields: skipField }); } diff --git a/packages/plugins/@nocobase/plugin-custom-request/package.json b/packages/plugins/@nocobase/plugin-custom-request/package.json index 70b851986..33127b368 100644 --- a/packages/plugins/@nocobase/plugin-custom-request/package.json +++ b/packages/plugins/@nocobase/plugin-custom-request/package.json @@ -11,10 +11,9 @@ "main": "dist/server/index.js", "devDependencies": { "@formily/antd-v5": "^1.1.9", - "@formily/react": "2.x", - "@formily/shared": "2.x", - "antd": "5.x", - "lodash": "4.x", + "@nocobase/schema": "workspace:*", + "antd": "5.16.0", + "lodash": "~4.17.21", "react-i18next": "^11.15.1", "react-router-dom": "6.x" }, @@ -24,6 +23,7 @@ "@nocobase/database": "workspace:*", "@nocobase/evaluators": "workspace:*", "@nocobase/logger": "workspace:*", + "@nocobase/sdk": "workspace:*", "@nocobase/server": "workspace:*", "@nocobase/test": "workspace:*", "@nocobase/utils": "workspace:*" diff --git a/packages/plugins/@nocobase/plugin-custom-request/src/client/components/CustomRequestAction.tsx b/packages/plugins/@nocobase/plugin-custom-request/src/client/components/CustomRequestAction.tsx index 99eb35772..beffbcfde 100644 --- a/packages/plugins/@nocobase/plugin-custom-request/src/client/components/CustomRequestAction.tsx +++ b/packages/plugins/@nocobase/plugin-custom-request/src/client/components/CustomRequestAction.tsx @@ -1,6 +1,6 @@ import { Action, useAPIClient, useRequest } from '@nocobase/client'; import React from 'react'; -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { listByCurrentRoleUrl } from '../constants'; import { useCustomizeRequestActionProps } from '../hooks'; import { CustomRequestActionDesigner } from './CustomRequestActionDesigner'; diff --git a/packages/plugins/@nocobase/plugin-custom-request/src/client/components/CustomRequestActionDesigner.tsx b/packages/plugins/@nocobase/plugin-custom-request/src/client/components/CustomRequestActionDesigner.tsx index c0d24954b..61424abc0 100644 --- a/packages/plugins/@nocobase/plugin-custom-request/src/client/components/CustomRequestActionDesigner.tsx +++ b/packages/plugins/@nocobase/plugin-custom-request/src/client/components/CustomRequestActionDesigner.tsx @@ -1,5 +1,5 @@ import { ArrayItems } from '@formily/antd-v5'; -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { Action, SchemaSettings, diff --git a/packages/plugins/@nocobase/plugin-custom-request/src/client/hooks/useCustomRequestsResource.ts b/packages/plugins/@nocobase/plugin-custom-request/src/client/hooks/useCustomRequestsResource.ts index 0560ee34b..dc32bf0eb 100644 --- a/packages/plugins/@nocobase/plugin-custom-request/src/client/hooks/useCustomRequestsResource.ts +++ b/packages/plugins/@nocobase/plugin-custom-request/src/client/hooks/useCustomRequestsResource.ts @@ -1,4 +1,5 @@ import { useAPIClient } from '@nocobase/client'; +export type { IResource } from '@nocobase/sdk'; export const useCustomRequestsResource = () => { const apiClient = useAPIClient(); diff --git a/packages/plugins/@nocobase/plugin-custom-request/src/client/hooks/useCustomizeRequestActionProps.ts b/packages/plugins/@nocobase/plugin-custom-request/src/client/hooks/useCustomizeRequestActionProps.ts index 89028f7af..f7636df90 100644 --- a/packages/plugins/@nocobase/plugin-custom-request/src/client/hooks/useCustomizeRequestActionProps.ts +++ b/packages/plugins/@nocobase/plugin-custom-request/src/client/hooks/useCustomizeRequestActionProps.ts @@ -1,4 +1,4 @@ -import { useField, useFieldSchema, useForm } from '@formily/react'; +import { useField, useFieldSchema, useForm } from '@nocobase/schema'; import { TableFieldResource, useAPIClient, diff --git a/packages/plugins/@nocobase/plugin-custom-request/src/client/hooks/useGetCustomRequest.ts b/packages/plugins/@nocobase/plugin-custom-request/src/client/hooks/useGetCustomRequest.ts index c68a05f9c..b2dbba3f6 100644 --- a/packages/plugins/@nocobase/plugin-custom-request/src/client/hooks/useGetCustomRequest.ts +++ b/packages/plugins/@nocobase/plugin-custom-request/src/client/hooks/useGetCustomRequest.ts @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { useRequest } from '@nocobase/client'; export const useGetCustomRequest = () => { diff --git a/packages/plugins/@nocobase/plugin-custom-request/src/client/initializer/CustomRequestInitializer.tsx b/packages/plugins/@nocobase/plugin-custom-request/src/client/initializer/CustomRequestInitializer.tsx index 99d41f883..7ffdf6813 100644 --- a/packages/plugins/@nocobase/plugin-custom-request/src/client/initializer/CustomRequestInitializer.tsx +++ b/packages/plugins/@nocobase/plugin-custom-request/src/client/initializer/CustomRequestInitializer.tsx @@ -1,4 +1,4 @@ -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; import { BlockInitializer, useSchemaInitializerItem } from '@nocobase/client'; import React from 'react'; import { useCustomRequestsResource } from '../hooks/useCustomRequestsResource'; diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/package.json b/packages/plugins/@nocobase/plugin-data-source-manager/package.json index 35aa79cf5..5230a718e 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/package.json +++ b/packages/plugins/@nocobase/plugin-data-source-manager/package.json @@ -9,16 +9,13 @@ "homepage": "https://docs.nocobase.com/handbook/data-source-manager", "main": "dist/server/index.js", "devDependencies": { - "@ant-design/icons": "^5.1.4", + "@ant-design/icons": "^5.3.6", "@dnd-kit/core": "^5.0.1", "@emotion/css": "^11.7.1", "@formily/antd-v5": "^1.1.9", - "@formily/core": "^2.2.27", - "@formily/react": "^2.2.27", - "@formily/reactive": "^2.2.27", - "@formily/shared": "^2.2.27", + "@nocobase/schema": "workspace:*", "ahooks": "^3.7.2", - "antd": "^5.12.8", + "antd": "5.16.0", "antd-style": "3.4.5", "classnames": "^2.3.1", "lodash": "4.17.21", diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/AddFieldAction.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/AddFieldAction.tsx index b1d4c6cb2..f2b523efe 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/AddFieldAction.tsx +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/AddFieldAction.tsx @@ -1,7 +1,7 @@ import { PlusOutlined } from '@ant-design/icons'; import { ArrayTable } from '@formily/antd-v5'; -import { useField, useForm } from '@formily/react'; -import { uid } from '@formily/shared'; +import { useField, useForm } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { Button, Dropdown, MenuProps } from 'antd'; import { cloneDeep } from 'lodash'; import React, { useCallback, useMemo, useState } from 'react'; diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/CollectionFields.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/CollectionFields.tsx index c2675e764..22004102a 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/CollectionFields.tsx +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/CollectionFields.tsx @@ -1,5 +1,5 @@ -import { createForm, Field } from '@formily/core'; -import { FieldContext, FormContext, useField, RecursionField } from '@formily/react'; +import { createForm, Field } from '@nocobase/schema'; +import { FieldContext, FormContext, useField, RecursionField } from '@nocobase/schema'; import { message } from 'antd'; import React, { useContext, useMemo, useEffect, createContext, useState } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/ConfigurationTable.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/ConfigurationTable.tsx index 0af9314fe..7275e6f3c 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/ConfigurationTable.tsx +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/ConfigurationTable.tsx @@ -1,6 +1,6 @@ -import { useForm, useField } from '@formily/react'; -import { action } from '@formily/reactive'; -import { uid } from '@formily/shared'; +import { useForm, useField } from '@nocobase/schema'; +import { action } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import React, { useContext, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { useParams } from 'react-router-dom'; diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/ConfigurationTabs.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/ConfigurationTabs.tsx index 8aa572876..8cb03c5af 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/ConfigurationTabs.tsx +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/ConfigurationTabs.tsx @@ -1,5 +1,5 @@ import { DndContext, DragEndEvent, DragOverlay, MouseSensor, useSensor, useSensors } from '@dnd-kit/core'; -import { RecursionField, observer } from '@formily/react'; +import { RecursionField, observer } from '@nocobase/schema'; import { Badge, Card, Space } from 'antd'; import _ from 'lodash'; import React, { useContext, useState } from 'react'; diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/EditCollectionAction.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/EditCollectionAction.tsx index 7d7f4133c..6d6de7a3e 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/EditCollectionAction.tsx +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/EditCollectionAction.tsx @@ -1,6 +1,6 @@ import { ArrayTable } from '@formily/antd-v5'; -import { ISchema, useForm } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema, useForm } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { ActionContextProvider, IField, diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/EditFieldAction.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/EditFieldAction.tsx index 4a7647740..b0c92fd8f 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/EditFieldAction.tsx +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/EditFieldAction.tsx @@ -1,6 +1,6 @@ import { ArrayTable } from '@formily/antd-v5'; -import { ISchema, useForm } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema, useForm } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import cloneDeep from 'lodash/cloneDeep'; import omit from 'lodash/omit'; import set from 'lodash/set'; diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/CollectionFieldInterfaceSelect.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/CollectionFieldInterfaceSelect.tsx index cad9c93b0..3635bdc52 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/CollectionFieldInterfaceSelect.tsx +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/CollectionFieldInterfaceSelect.tsx @@ -1,4 +1,4 @@ -import { observer, useForm, useField } from '@formily/react'; +import { observer, useForm, useField } from '@nocobase/schema'; import { Select, Tag } from 'antd'; import React, { useState } from 'react'; import { useCompile, useCollectionManager_deprecated, useRecord, useFieldInterfaceOptions } from '@nocobase/client'; diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/CollectionName.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/CollectionName.tsx index 8dedad30a..4ddfd717e 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/CollectionName.tsx +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/CollectionName.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { LoadingOutlined } from '@ant-design/icons'; -import { connect, mapProps, mapReadPretty } from '@formily/react'; +import { connect, mapProps, mapReadPretty } from '@nocobase/schema'; import { Input as AntdInput } from 'antd'; import cls from 'classnames'; import { useCollectionRecord } from '@nocobase/client'; diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/FieldTitleInput.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/FieldTitleInput.tsx index 2f6904748..e2d5e0db0 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/FieldTitleInput.tsx +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/FieldTitleInput.tsx @@ -1,4 +1,4 @@ -import { observer } from '@formily/react'; +import { observer } from '@nocobase/schema'; import { Input } from 'antd'; import { debounce } from 'lodash'; import React, { useState, useMemo, useEffect } from 'react'; diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/FieldType.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/FieldType.tsx index 6683f9ee6..ff01c3671 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/FieldType.tsx +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/FieldType.tsx @@ -1,4 +1,4 @@ -import { observer } from '@formily/react'; +import { observer } from '@nocobase/schema'; import { useRecord } from '@nocobase/client'; import { Select, Tag } from 'antd'; import React from 'react'; diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/index.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/index.tsx index 24a8e578c..95ac6f71f 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/index.tsx +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/index.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from 'react'; import { Select } from 'antd'; -import { observer, useForm, useField } from '@formily/react'; +import { observer, useForm, useField } from '@nocobase/schema'; import { useParams } from 'react-router-dom'; import { useRecord, useCompile, useAPIClient, useCollectionManager_deprecated } from '@nocobase/client'; import { useRemoteCollectionContext } from '../CollectionFields'; diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/index.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/index.tsx index 7c1998f2a..9c2358bcd 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/index.tsx +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/index.tsx @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import React from 'react'; import { SchemaComponent, diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/schema/collectionFields.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/schema/collectionFields.ts index 2b4978e45..16749972b 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/schema/collectionFields.ts +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/schema/collectionFields.ts @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { CollectionOptions } from '@nocobase/client'; import { NAMESPACE } from '../../../locale'; diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/schema/collections.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/schema/collections.ts index d3170a0f2..24d8517d1 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/schema/collections.ts +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/schema/collections.ts @@ -1,5 +1,5 @@ -import { ISchema, Schema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema, Schema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { message } from 'antd'; import { useTranslation } from 'react-i18next'; import { useAPIClient, i18n, CollectionOptions } from '@nocobase/client'; diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CreateDatabaseConnectAction.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CreateDatabaseConnectAction.tsx index a2a731e99..bf2702a56 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CreateDatabaseConnectAction.tsx +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CreateDatabaseConnectAction.tsx @@ -1,5 +1,5 @@ import { DownOutlined, PlusOutlined } from '@ant-design/icons'; -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; import { ActionContext, SchemaComponent, useAPIClient, useCompile, usePlugin } from '@nocobase/client'; import { Button, Dropdown, Empty } from 'antd'; import React, { useState } from 'react'; diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/DatabaseConnectionManager.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/DatabaseConnectionManager.tsx index f93ae951a..0fad75e6b 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/DatabaseConnectionManager.tsx +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/DatabaseConnectionManager.tsx @@ -1,4 +1,4 @@ -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; import { SchemaComponent, usePlugin, diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/EditDatabaseConnectionAction.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/EditDatabaseConnectionAction.tsx index 94de0820e..91a799d81 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/EditDatabaseConnectionAction.tsx +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/EditDatabaseConnectionAction.tsx @@ -1,4 +1,4 @@ -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; import { ActionContext, SchemaComponent, @@ -13,7 +13,7 @@ import { import _ from 'lodash'; import React, { useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { useForm, useField } from '@formily/react'; +import { useForm, useField } from '@nocobase/schema'; import PluginDatabaseConnectionsClient from '../'; import { NAMESPACE } from '../locale'; diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/AddCategoryAction.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/AddCategoryAction.tsx index 10163c0ab..ee96ccbbd 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/AddCategoryAction.tsx +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/AddCategoryAction.tsx @@ -1,5 +1,5 @@ import { PlusOutlined } from '@ant-design/icons'; -import { useForm } from '@formily/react'; +import { useForm } from '@nocobase/schema'; import { cloneDeep } from 'lodash'; import React, { useContext, useState } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/CollectionFields.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/CollectionFields.tsx index ae0ccc8c0..65784eab4 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/CollectionFields.tsx +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/CollectionFields.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/css'; -import { createForm, Field } from '@formily/core'; -import { FieldContext, FormContext, useField } from '@formily/react'; +import { createForm, Field } from '@nocobase/schema'; +import { FieldContext, FormContext, useField } from '@nocobase/schema'; import { Space, Switch, Table, TableColumnProps, Tag, Tooltip } from 'antd'; import React, { useContext, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/CollectionFieldsTable.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/CollectionFieldsTable.tsx index c78d3a435..4db2840f1 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/CollectionFieldsTable.tsx +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/CollectionFieldsTable.tsx @@ -1,6 +1,6 @@ -import { createForm, Field } from '@formily/core'; -import { FieldContext, FormContext, observer, useField, useFieldSchema } from '@formily/react'; -import { useAttach } from '@formily/react/esm/hooks/useAttach'; +import { createForm, Field } from '@nocobase/schema'; +import { FieldContext, FormContext, observer, useField, useFieldSchema } from '@nocobase/schema'; +import { useAttach } from '@nocobase/schema'; import { Options, Result } from 'ahooks/es/useRequest/src/types'; import { TableProps } from 'antd'; import React, { useMemo } from 'react'; diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/CollectionFieldsTableArray.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/CollectionFieldsTableArray.tsx index b16eea40b..45c9fe4d8 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/CollectionFieldsTableArray.tsx +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/CollectionFieldsTableArray.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/css'; -import { ArrayField, Field } from '@formily/core'; -import { RecursionField, Schema, observer, useField, useFieldSchema } from '@formily/react'; +import { ArrayField, Field } from '@nocobase/schema'; +import { RecursionField, Schema, observer, useField, useFieldSchema } from '@nocobase/schema'; import { RecordIndexProvider, RecordProvider, diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/ConfigurationTable.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/ConfigurationTable.tsx index a77223ac3..e5c7edf19 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/ConfigurationTable.tsx +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/ConfigurationTable.tsx @@ -1,6 +1,6 @@ -import { useForm } from '@formily/react'; -import { action } from '@formily/reactive'; -import { uid } from '@formily/shared'; +import { useForm } from '@nocobase/schema'; +import { action } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import React, { useContext, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { CollectionFieldsTable } from '.'; diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/ConfigurationTabs.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/ConfigurationTabs.tsx index 0a1f9754a..ff726bae6 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/ConfigurationTabs.tsx +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/ConfigurationTabs.tsx @@ -9,8 +9,8 @@ import { useSensor, useSensors, } from '@dnd-kit/core'; -import { RecursionField, observer } from '@formily/react'; -import { uid } from '@formily/shared'; +import { RecursionField, observer } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { App, Badge, Card, Dropdown, Space, Tabs } from 'antd'; import _ from 'lodash'; import React, { useContext, useEffect, useMemo, useState } from 'react'; diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/EditCategoryAction.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/EditCategoryAction.tsx index 3a3349e67..634388de5 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/EditCategoryAction.tsx +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/EditCategoryAction.tsx @@ -1,4 +1,4 @@ -import { useForm } from '@formily/react'; +import { useForm } from '@nocobase/schema'; import { cloneDeep } from 'lodash'; import React, { useContext, useEffect, useState } from 'react'; import { diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/index.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/index.tsx index 1cca50b2c..3dc46a2e5 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/index.tsx +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/index.tsx @@ -1,4 +1,4 @@ -import { registerValidateFormats } from '@formily/core'; +import { registerValidateFormats } from '@nocobase/schema'; export * from './ConfigurationTable'; export * from './CollectionFieldsTable'; export * from './schemas/collections'; diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/schemas/collectionFields.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/schemas/collectionFields.ts index d383d8d23..75c8d500a 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/schemas/collectionFields.ts +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/schemas/collectionFields.ts @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { CollectionFieldInterfaceTag, CollectionOptions } from '@nocobase/client'; export const collection: CollectionOptions = { diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/schemas/collections.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/schemas/collections.ts index 627ebe840..b2ada3638 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/schemas/collections.ts +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/schemas/collections.ts @@ -1,5 +1,5 @@ -import { ISchema, Schema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema, Schema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { message } from 'antd'; import { useTranslation } from 'react-i18next'; import { useAPIClient, i18n } from '@nocobase/client'; diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/index.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/index.tsx index d64df4b25..12ad606ec 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/index.tsx +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/index.tsx @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import React from 'react'; import { SchemaComponent, diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/RoleConfigure.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/RoleConfigure.tsx index e25b4d3a0..7be8f42a0 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/RoleConfigure.tsx +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/RoleConfigure.tsx @@ -1,4 +1,4 @@ -import { onFieldChange } from '@formily/core'; +import { onFieldChange } from '@nocobase/schema'; import React, { useContext } from 'react'; import { useTranslation } from 'react-i18next'; import { useAPIClient, useRequest, SchemaComponent, useRecord } from '@nocobase/client'; diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/RolesResourcesActions.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/RolesResourcesActions.tsx index a47ce4a8d..5820a88f7 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/RolesResourcesActions.tsx +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/RolesResourcesActions.tsx @@ -1,6 +1,6 @@ import { FormItem, FormLayout } from '@formily/antd-v5'; -import { ArrayField } from '@formily/core'; -import { connect, useField } from '@formily/react'; +import { ArrayField } from '@nocobase/schema'; +import { connect, useField } from '@nocobase/schema'; import { Checkbox, Table, Tag } from 'antd'; import { isEmpty } from 'lodash'; import React, { createContext, useContext } from 'react'; diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/ScopeSelect.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/ScopeSelect.tsx index 036bfc0e7..19eb95586 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/ScopeSelect.tsx +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/ScopeSelect.tsx @@ -1,4 +1,4 @@ -import { createForm } from '@formily/core'; +import { createForm } from '@nocobase/schema'; import React, { createContext, useContext, useMemo, useState } from 'react'; import { FormProvider, SchemaComponent, useRecord } from '@nocobase/client'; import { getScopesSchema } from './schemas/scopes'; diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/StrategyActions.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/StrategyActions.tsx index 2743e5db9..8f118f65b 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/StrategyActions.tsx +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/StrategyActions.tsx @@ -1,5 +1,5 @@ -import { ArrayField } from '@formily/core'; -import { connect, useField } from '@formily/react'; +import { ArrayField } from '@nocobase/schema'; +import { connect, useField } from '@nocobase/schema'; import { Checkbox, Select, Table, Tag } from 'antd'; import React from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/index.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/index.tsx index 2c5de5344..5681608ad 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/index.tsx +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/index.tsx @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { Card } from 'antd'; import React, { createContext } from 'react'; import { diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/schemas/dataSourceTable.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/schemas/dataSourceTable.ts index 90620def0..d26dac6c5 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/schemas/dataSourceTable.ts +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/schemas/dataSourceTable.ts @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { roleCollectionsSchema } from './roleCollections'; const collection = { diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/schemas/roleCollections.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/schemas/roleCollections.ts index 97f026d61..313fbe3d5 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/schemas/roleCollections.ts +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/schemas/roleCollections.ts @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { useRoleResourceValues } from './useRoleResourceValues'; import { useSaveRoleResourceAction } from './useSaveRoleResourceAction'; diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/schemas/scopes.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/schemas/scopes.ts index 89e7c7bc5..b73eca039 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/schemas/scopes.ts +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/schemas/scopes.ts @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { useContext, useEffect } from 'react'; import { useFormBlockContext, VariableInput, useFilterFieldOptions } from '@nocobase/client'; import { RoleResourceCollectionContext } from '../RolesResourcesActions'; diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/schemas/useSaveRoleResourceAction.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/schemas/useSaveRoleResourceAction.ts index f8049f74f..edcb96334 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/schemas/useSaveRoleResourceAction.ts +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/schemas/useSaveRoleResourceAction.ts @@ -1,4 +1,4 @@ -import { useForm } from '@formily/react'; +import { useForm } from '@nocobase/schema'; import { useContext } from 'react'; import { useActionContext, useAPIClient, useRecord, useResourceActionContext } from '@nocobase/client'; import { PermissionContext } from '../PermisionProvider'; diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/hooks/index.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/hooks/index.ts index 3e3f5fbfc..5725e47e9 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/hooks/index.ts +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/hooks/index.ts @@ -1,4 +1,4 @@ -import { useForm, useField } from '@formily/react'; +import { useForm, useField } from '@nocobase/schema'; import { message } from 'antd'; import { useTranslation } from 'react-i18next'; import { useActionContext, useAPIClient } from '@nocobase/client'; diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/schema/index.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/schema/index.ts index b26199c28..6086f0a95 100644 --- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/schema/index.ts +++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/schema/index.ts @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { NAMESPACE } from '../locale'; export const statusEnum = [ { value: 'loading', label: `{{t("Loading",{ns:"${NAMESPACE}"})}}`, color: 'orange' }, diff --git a/packages/plugins/@nocobase/plugin-data-visualization/package.json b/packages/plugins/@nocobase/plugin-data-visualization/package.json index 09a42c4f9..320a08d6a 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/package.json +++ b/packages/plugins/@nocobase/plugin-data-visualization/package.json @@ -9,15 +9,13 @@ "homepage": "https://docs.nocobase.com/handbook/data-visualization", "main": "dist/server/index.js", "devDependencies": { - "@ant-design/icons": "5.x", + "@ant-design/icons": "~5.3.6", "@ant-design/plots": "^2.1.4", "@emotion/css": "^11.7.1", "@formily/antd-v5": "1.x", - "@formily/core": "2.x", - "@formily/react": "2.x", - "@formily/shared": "2.x", + "@nocobase/schema": "workspace:*", "ahooks": "^3.7.2", - "antd": "5.x", + "antd": "5.16.0", "classnames": "^2.3.1", "dayjs": "^1.11.8", "deepmerge": "^4.2.2", diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/block/ChartBlockInitializer.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/block/ChartBlockInitializer.tsx index 1bd527796..fe210f19c 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/block/ChartBlockInitializer.tsx +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/block/ChartBlockInitializer.tsx @@ -1,5 +1,5 @@ import { BarChartOutlined, LineChartOutlined } from '@ant-design/icons'; -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; import { CompatibleSchemaInitializer, DEFAULT_DATA_SOURCE_KEY, diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/chart/chart.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/client/chart/chart.ts index 19f2d8116..84ff911cf 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/chart/chart.ts +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/chart/chart.ts @@ -2,7 +2,7 @@ import React, { useContext } from 'react'; import { FieldOption } from '../hooks'; import { ChartRendererContext, QueryProps } from '../renderer'; import { parseField } from '../utils'; -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import configs, { AnySchemaProperties, Config } from './configs'; import { Transformer } from '../block/transformers'; diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/chart/configs.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/client/chart/configs.ts index f41f44fe1..892827df8 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/chart/configs.ts +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/chart/configs.ts @@ -1,4 +1,4 @@ -import { SchemaProperties } from '@formily/react'; +import { SchemaProperties } from '@nocobase/schema'; import { lang } from '../locale'; export type FieldConfigProps = Partial<{ diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/configure/ChartConfigProvider.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/configure/ChartConfigProvider.tsx index a18471a64..8486083e2 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/configure/ChartConfigProvider.tsx +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/configure/ChartConfigProvider.tsx @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import React, { createContext, useState } from 'react'; import { ChartRendererProvider } from '../renderer'; import { ChartConfigure } from './ChartConfigure'; diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/configure/ChartConfigure.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/configure/ChartConfigure.tsx index c8e87fdfb..a2f4731a7 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/configure/ChartConfigure.tsx +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/configure/ChartConfigure.tsx @@ -1,7 +1,7 @@ import { RightSquareOutlined } from '@ant-design/icons'; import { ArrayItems, Editable, FormCollapse, FormItem, FormLayout, Switch } from '@formily/antd-v5'; -import { Form as FormType, ObjectField, createForm, onFieldChange, onFormInit } from '@formily/core'; -import { FormConsumer, ISchema, Schema } from '@formily/react'; +import { Form as FormType, ObjectField, createForm, onFieldChange, onFormInit } from '@nocobase/schema'; +import { FormConsumer, ISchema, Schema } from '@nocobase/schema'; import { AutoComplete, FormProvider, SchemaComponent, gridRowColWrap, useDesignable } from '@nocobase/client'; import { Alert, App, Button, Card, Col, Modal, Row, Space, Table, Tabs, Typography } from 'antd'; import { cloneDeep, isEqual } from 'lodash'; diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/configure/schemas/configure.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/client/configure/schemas/configure.ts index da4fadf24..7bd5c9607 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/configure/schemas/configure.ts +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/configure/schemas/configure.ts @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { lang } from '../../locale'; const getArraySchema = (fields = {}, extra = {}) => ({ diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/CollectionFieldInitializer.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/CollectionFieldInitializer.tsx index 5d8c33c9a..3d11b1043 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/CollectionFieldInitializer.tsx +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/CollectionFieldInitializer.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { InitializerWithSwitch, useSchemaInitializerItem } from '@nocobase/client'; -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; export const CollectionFieldInitializer = () => { const schema: ISchema = {}; diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterActionInitializers.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterActionInitializers.tsx index 7e400fc47..83bbe6406 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterActionInitializers.tsx +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterActionInitializers.tsx @@ -1,5 +1,5 @@ import { DownOutlined } from '@ant-design/icons'; -import { useForm } from '@formily/react'; +import { useForm } from '@nocobase/schema'; import { Action, ActionInitializer, diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterBlockInitializer.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterBlockInitializer.tsx index 56cdb3cfb..9f6c20e7d 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterBlockInitializer.tsx +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterBlockInitializer.tsx @@ -8,7 +8,7 @@ import { SchemaInitializerSwitch, useSchemaInitializerItem, } from '@nocobase/client'; -import { uid, merge } from '@formily/shared'; +import { uid, merge } from '@nocobase/schema'; import { ChartFilterContext } from './FilterProvider'; import { css } from '@emotion/css'; import { theme } from 'antd'; diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterCheckbox.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterCheckbox.tsx index 9d6af5fcf..ed1246400 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterCheckbox.tsx +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterCheckbox.tsx @@ -1,7 +1,7 @@ import React from 'react'; -import { connect, useField } from '@formily/react'; +import { connect, useField } from '@nocobase/schema'; import { Checkbox } from 'antd'; -import { Field } from '@formily/core'; +import { Field } from '@nocobase/schema'; export const ChartFilterCheckbox = connect((props) => { const { content } = props; diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterForm.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterForm.tsx index b7fbd24e4..e3e60a8a8 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterForm.tsx +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterForm.tsx @@ -1,5 +1,5 @@ import React, { memo, useContext, useEffect, useMemo, useRef } from 'react'; -import { createForm, onFieldInit, onFieldMount, onFieldUnmount } from '@formily/core'; +import { createForm, onFieldInit, onFieldMount, onFieldUnmount } from '@nocobase/schema'; import { ChartFilterContext } from './FilterProvider'; import { DEFAULT_DATA_SOURCE_KEY, FormV2, VariablesContext } from '@nocobase/client'; import { setDefaultValue } from './utils'; diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterItemDesigner.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterItemDesigner.tsx index d5bf2211d..403b59f83 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterItemDesigner.tsx +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterItemDesigner.tsx @@ -20,8 +20,8 @@ import { useIsAssociationField, } from '@nocobase/client'; import { useChartsTranslation } from '../locale'; -import { Schema, useField, useFieldSchema } from '@formily/react'; -import { Field } from '@formily/core'; +import { Schema, useField, useFieldSchema } from '@nocobase/schema'; +import { Field } from '@nocobase/schema'; import _ from 'lodash'; import { ChartFilterContext } from './FilterProvider'; import { getPropsSchemaByComponent, setDefaultValue } from './utils'; diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterItemInitializers.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterItemInitializers.tsx index ab6a1ddde..2b566d4eb 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterItemInitializers.tsx +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterItemInitializers.tsx @@ -1,8 +1,8 @@ import { css, cx } from '@emotion/css'; import { FormItem, FormLayout } from '@formily/antd-v5'; -import { Field, onFieldValueChange } from '@formily/core'; -import { Schema, SchemaOptionsContext, observer, useField, useFieldSchema, useForm } from '@formily/react'; -import { uid } from '@formily/shared'; +import { Field, onFieldValueChange } from '@nocobase/schema'; +import { Schema, SchemaOptionsContext, observer, useField, useFieldSchema, useForm } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { ACLCollectionFieldProvider, BlockItem, diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/utils.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/utils.ts index 865ceda25..b81bb9194 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/utils.ts +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/utils.ts @@ -1,7 +1,7 @@ import { DEFAULT_DATA_SOURCE_KEY } from '@nocobase/client'; import { moment2str } from '@nocobase/utils/client'; import dayjs from 'dayjs'; -import { Schema } from '@formily/react'; +import { Schema } from '@nocobase/schema'; export const getOptionsSchema = () => { const options = { diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/filter.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/filter.ts index d10b68799..ec9fb1db1 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/filter.ts +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/filter.ts @@ -11,7 +11,7 @@ import { } from '@nocobase/client'; import { useCallback, useContext, useMemo } from 'react'; import { ChartDataContext } from '../block/ChartDataProvider'; -import { Schema } from '@formily/react'; +import { Schema } from '@nocobase/schema'; import { useChartsTranslation } from '../locale'; import { ChartFilterContext } from '../filter/FilterProvider'; import { useMemoizedFn } from 'ahooks'; diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/query.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/query.ts index 7d287ada6..f3250bedf 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/query.ts +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/query.ts @@ -1,5 +1,5 @@ -import { ArrayField } from '@formily/core'; -import { ISchema, Schema, useForm } from '@formily/react'; +import { ArrayField } from '@nocobase/schema'; +import { ISchema, Schema, useForm } from '@nocobase/schema'; import { CollectionFieldOptions, CollectionFieldOptions_deprecated, diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/useUserVariable.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/useUserVariable.ts index 4a7308d64..c9c92f2d9 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/useUserVariable.ts +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/useUserVariable.ts @@ -1,6 +1,6 @@ import { useCallback, useMemo } from 'react'; import { useTranslation } from 'react-i18next'; -import { Schema } from '@formily/react'; +import { Schema } from '@nocobase/schema'; import { useCollectionFieldsOptions } from '@nocobase/client'; import { useMemoizedFn } from 'ahooks'; diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/useVariableOptions.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/useVariableOptions.ts index 2c3dbc202..6269733c0 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/useVariableOptions.ts +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/useVariableOptions.ts @@ -1,4 +1,4 @@ -import { useField } from '@formily/react'; +import { useField } from '@nocobase/schema'; import { useCurrentUserVariable, useDatetimeVariable } from '@nocobase/client'; import { useMemo } from 'react'; import { useFilterVariable } from './filter'; diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/renderer/ChartRenderer.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/renderer/ChartRenderer.tsx index b5d38e3f6..8823b0992 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/renderer/ChartRenderer.tsx +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/renderer/ChartRenderer.tsx @@ -1,4 +1,4 @@ -import { useField, useFieldSchema } from '@formily/react'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { GeneralSchemaDesigner, SchemaSettingsBlockTitleItem, diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/renderer/ChartRendererProvider.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/renderer/ChartRendererProvider.tsx index 3a1edd69c..dada56338 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/renderer/ChartRendererProvider.tsx +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/renderer/ChartRendererProvider.tsx @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { CollectionManagerProvider, DEFAULT_DATA_SOURCE_KEY, diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/utils.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/client/utils.ts index 0d6d4d98b..7ee167546 100644 --- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/utils.ts +++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/utils.ts @@ -1,5 +1,5 @@ -import { Schema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { Schema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import lodash from 'lodash'; import { SelectedField } from './configure'; import { FieldOption } from './hooks'; diff --git a/packages/plugins/@nocobase/plugin-error-handler/package.json b/packages/plugins/@nocobase/plugin-error-handler/package.json index ee819a90d..bc34fa9f0 100644 --- a/packages/plugins/@nocobase/plugin-error-handler/package.json +++ b/packages/plugins/@nocobase/plugin-error-handler/package.json @@ -11,7 +11,7 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "@formily/json-schema": "2.x", + "@formily/core": "2.2.27", "lodash": "4.17.21", "supertest": "^6.1.6" }, diff --git a/packages/plugins/@nocobase/plugin-error-handler/src/server/server.ts b/packages/plugins/@nocobase/plugin-error-handler/src/server/server.ts index d9b1ddae4..e38963722 100644 --- a/packages/plugins/@nocobase/plugin-error-handler/src/server/server.ts +++ b/packages/plugins/@nocobase/plugin-error-handler/src/server/server.ts @@ -1,4 +1,4 @@ -import { Schema } from '@formily/json-schema'; +import { Schema } from '@formily/core'; import { BaseError } from '@nocobase/database'; import { Plugin } from '@nocobase/server'; import lodash from 'lodash'; diff --git a/packages/plugins/@nocobase/plugin-excel-formula-field/package.json b/packages/plugins/@nocobase/plugin-excel-formula-field/package.json index 6af0b61b4..da696e723 100644 --- a/packages/plugins/@nocobase/plugin-excel-formula-field/package.json +++ b/packages/plugins/@nocobase/plugin-excel-formula-field/package.json @@ -8,8 +8,8 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "@formily/react": "2.x", "@formulajs/formulajs": "^4.2.0", + "@nocobase/schema": "workspace:*", "react": "^18.2.0", "react-i18next": "^11.15.1" }, diff --git a/packages/plugins/@nocobase/plugin-excel-formula-field/src/client/ExcelFormula/index.ts b/packages/plugins/@nocobase/plugin-excel-formula-field/src/client/ExcelFormula/index.ts index 5ded81be6..4c13a7b9e 100644 --- a/packages/plugins/@nocobase/plugin-excel-formula-field/src/client/ExcelFormula/index.ts +++ b/packages/plugins/@nocobase/plugin-excel-formula-field/src/client/ExcelFormula/index.ts @@ -1,4 +1,4 @@ -import { connect, observer } from '@formily/react'; +import { connect, observer } from '@nocobase/schema'; import { Formula } from '@nocobase/client'; import React from 'react'; import { evaluate } from '../../utils/evaluate'; diff --git a/packages/plugins/@nocobase/plugin-export/package.json b/packages/plugins/@nocobase/plugin-export/package.json index 1220f1d7e..aeba4e277 100644 --- a/packages/plugins/@nocobase/plugin-export/package.json +++ b/packages/plugins/@nocobase/plugin-export/package.json @@ -11,8 +11,7 @@ "main": "./dist/server/index.js", "devDependencies": { "@formily/antd-v5": "1.x", - "@formily/react": "2.x", - "@formily/shared": "2.x", + "@nocobase/schema": "workspace:*", "@types/node-xlsx": "^0.15.1", "file-saver": "^2.0.5", "lodash": "4.17.21", diff --git a/packages/plugins/@nocobase/plugin-export/src/client/ExportActionInitializer.tsx b/packages/plugins/@nocobase/plugin-export/src/client/ExportActionInitializer.tsx index 71e0a79f8..2c6dc6d2a 100644 --- a/packages/plugins/@nocobase/plugin-export/src/client/ExportActionInitializer.tsx +++ b/packages/plugins/@nocobase/plugin-export/src/client/ExportActionInitializer.tsx @@ -1,5 +1,5 @@ -import { Schema, useFieldSchema } from '@formily/react'; -import { merge } from '@formily/shared'; +import { Schema, useFieldSchema } from '@nocobase/schema'; +import { merge } from '@nocobase/schema'; import { SchemaInitializerSwitch, useCollection_deprecated, diff --git a/packages/plugins/@nocobase/plugin-export/src/client/ExportDesigner.tsx b/packages/plugins/@nocobase/plugin-export/src/client/ExportDesigner.tsx index 8f02fa317..bdd9f6530 100644 --- a/packages/plugins/@nocobase/plugin-export/src/client/ExportDesigner.tsx +++ b/packages/plugins/@nocobase/plugin-export/src/client/ExportDesigner.tsx @@ -1,6 +1,6 @@ import { ArrayItems } from '@formily/antd-v5'; -import type { ISchema } from '@formily/react'; -import { useField, useFieldSchema } from '@formily/react'; +import type { ISchema } from '@nocobase/schema'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { GeneralSchemaDesigner, SchemaSettingsActionModalItem, diff --git a/packages/plugins/@nocobase/plugin-export/src/client/schemaSettings.ts b/packages/plugins/@nocobase/plugin-export/src/client/schemaSettings.ts index f0225e051..db80f5a8b 100644 --- a/packages/plugins/@nocobase/plugin-export/src/client/schemaSettings.ts +++ b/packages/plugins/@nocobase/plugin-export/src/client/schemaSettings.ts @@ -1,5 +1,5 @@ import { ArrayItems } from '@formily/antd-v5'; -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import { ButtonEditor, SchemaSettings, useDesignable, useSchemaToolbar } from '@nocobase/client'; import { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/plugins/@nocobase/plugin-export/src/client/useExportAction.ts b/packages/plugins/@nocobase/plugin-export/src/client/useExportAction.ts index ecb98aca4..68a13f07b 100644 --- a/packages/plugins/@nocobase/plugin-export/src/client/useExportAction.ts +++ b/packages/plugins/@nocobase/plugin-export/src/client/useExportAction.ts @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { useAPIClient, useBlockRequestContext, diff --git a/packages/plugins/@nocobase/plugin-export/src/client/useFields.ts b/packages/plugins/@nocobase/plugin-export/src/client/useFields.ts index 85832b55b..80845c1fc 100644 --- a/packages/plugins/@nocobase/plugin-export/src/client/useFields.ts +++ b/packages/plugins/@nocobase/plugin-export/src/client/useFields.ts @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { useCollectionManager_deprecated } from '@nocobase/client'; export const useFields = (collectionName: string) => { diff --git a/packages/plugins/@nocobase/plugin-file-manager/package.json b/packages/plugins/@nocobase/plugin-file-manager/package.json index 3677bbb42..1ec903ae9 100644 --- a/packages/plugins/@nocobase/plugin-file-manager/package.json +++ b/packages/plugins/@nocobase/plugin-file-manager/package.json @@ -11,16 +11,14 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "@ant-design/icons": "^5.1.4", + "@ant-design/icons": "^5.3.6", "@aws-sdk/client-s3": "^3.245.0", "@formily/antd-v5": "1.x", - "@formily/core": "2.x", - "@formily/react": "2.x", - "@formily/shared": "2.x", "@koa/multer": "^3.0.0", + "@nocobase/schema": "workspace:*", "@types/koa-multer": "^1.0.1", "@types/multer": "^1.4.5", - "antd": "5.x", + "antd": "5.16.0", "cos-nodejs-sdk-v5": "^2.11.14", "koa-static": "^5.0.0", "lodash": "4.17.21", diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/client/FileStorage.tsx b/packages/plugins/@nocobase/plugin-file-manager/src/client/FileStorage.tsx index 850e50e54..57fdf7211 100644 --- a/packages/plugins/@nocobase/plugin-file-manager/src/client/FileStorage.tsx +++ b/packages/plugins/@nocobase/plugin-file-manager/src/client/FileStorage.tsx @@ -1,5 +1,5 @@ import { PlusOutlined, DownOutlined } from '@ant-design/icons'; -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; import { ActionContext, SchemaComponent, useCompile, usePlugin, useRecord } from '@nocobase/client'; import { Button, Card, Dropdown } from 'antd'; import _ from 'lodash'; diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/client/StorageOptions.tsx b/packages/plugins/@nocobase/plugin-file-manager/src/client/StorageOptions.tsx index c57c6407b..3263e8603 100644 --- a/packages/plugins/@nocobase/plugin-file-manager/src/client/StorageOptions.tsx +++ b/packages/plugins/@nocobase/plugin-file-manager/src/client/StorageOptions.tsx @@ -1,6 +1,6 @@ import { FormLayout } from '@formily/antd-v5'; -import { Field } from '@formily/core'; -import { observer, RecursionField, Schema, useField, useForm } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { observer, RecursionField, Schema, useField, useForm } from '@nocobase/schema'; import React, { useEffect, useState } from 'react'; import { NAMESPACE } from './locale'; diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/client/interfaces/attachment.ts b/packages/plugins/@nocobase/plugin-file-manager/src/client/interfaces/attachment.ts index 3967b36ee..187ae558b 100644 --- a/packages/plugins/@nocobase/plugin-file-manager/src/client/interfaces/attachment.ts +++ b/packages/plugins/@nocobase/plugin-file-manager/src/client/interfaces/attachment.ts @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { CollectionFieldInterface, interfacesProperties } from '@nocobase/client'; import { NAMESPACE } from '../locale'; diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/client/schemas/storage.ts b/packages/plugins/@nocobase/plugin-file-manager/src/client/schemas/storage.ts index e99e14351..9563d0c32 100644 --- a/packages/plugins/@nocobase/plugin-file-manager/src/client/schemas/storage.ts +++ b/packages/plugins/@nocobase/plugin-file-manager/src/client/schemas/storage.ts @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { NAMESPACE } from '../locale'; const collection = { diff --git a/packages/plugins/@nocobase/plugin-formula-field/package.json b/packages/plugins/@nocobase/plugin-formula-field/package.json index f9fdc4b46..a17dd5957 100644 --- a/packages/plugins/@nocobase/plugin-formula-field/package.json +++ b/packages/plugins/@nocobase/plugin-formula-field/package.json @@ -11,9 +11,7 @@ "main": "./dist/server/index.js", "devDependencies": { "@formily/antd-v5": "1.x", - "@formily/core": "2.x", - "@formily/react": "2.x", - "@formily/reactive": "2.x", + "@nocobase/schema": "workspace:*", "react": "^18.2.0", "react-i18next": "^11.15.1" }, diff --git a/packages/plugins/@nocobase/plugin-formula-field/src/client/components/Formula/Result.tsx b/packages/plugins/@nocobase/plugin-formula-field/src/client/components/Formula/Result.tsx index 893d907fb..d7429d330 100644 --- a/packages/plugins/@nocobase/plugin-formula-field/src/client/components/Formula/Result.tsx +++ b/packages/plugins/@nocobase/plugin-formula-field/src/client/components/Formula/Result.tsx @@ -1,6 +1,6 @@ -import { onFormValuesChange } from '@formily/core'; -import { useField, useFieldSchema, useFormEffects } from '@formily/react'; -import { toJS } from '@formily/reactive'; +import { onFormValuesChange } from '@nocobase/schema'; +import { useField, useFieldSchema, useFormEffects } from '@nocobase/schema'; +import { toJS } from '@nocobase/schema'; import type { CollectionOptions } from '@nocobase/client'; import { Checkbox, diff --git a/packages/plugins/@nocobase/plugin-formula-field/src/client/components/Formula/demos/demo2.tsx b/packages/plugins/@nocobase/plugin-formula-field/src/client/components/Formula/demos/demo2.tsx index d809f9afa..2ea9d0112 100644 --- a/packages/plugins/@nocobase/plugin-formula-field/src/client/components/Formula/demos/demo2.tsx +++ b/packages/plugins/@nocobase/plugin-formula-field/src/client/components/Formula/demos/demo2.tsx @@ -1,7 +1,7 @@ /** * title: Formula */ -import { connect } from '@formily/react'; +import { connect } from '@nocobase/schema'; import { Formula, SchemaComponent, SchemaComponentProvider } from '@nocobase/client'; import React from 'react'; diff --git a/packages/plugins/@nocobase/plugin-formula-field/src/client/components/Formula/index.tsx b/packages/plugins/@nocobase/plugin-formula-field/src/client/components/Formula/index.tsx index 267330456..cfd6cb52f 100644 --- a/packages/plugins/@nocobase/plugin-formula-field/src/client/components/Formula/index.tsx +++ b/packages/plugins/@nocobase/plugin-formula-field/src/client/components/Formula/index.tsx @@ -1,4 +1,4 @@ -import { connect } from '@formily/react'; +import { connect } from '@nocobase/schema'; import Expression from './Expression'; import Result from './Result'; diff --git a/packages/plugins/@nocobase/plugin-gantt/package.json b/packages/plugins/@nocobase/plugin-gantt/package.json index b042f826f..3856681d7 100644 --- a/packages/plugins/@nocobase/plugin-gantt/package.json +++ b/packages/plugins/@nocobase/plugin-gantt/package.json @@ -10,13 +10,12 @@ "license": "AGPL-3.0", "main": "dist/server/index.js", "dependencies": { - "@ant-design/icons": "^5.1.4", + "@ant-design/icons": "^5.3.6", "@ctrl/tinycolor": "^3.6.0", "@emotion/css": "^11.7.1", "@formily/antd-v5": "^1.1.9", - "@formily/react": "^2.2.27", - "@formily/shared": "^2.2.27", - "antd": "^5.12.8", + "@nocobase/schema": "workspace:*", + "antd": "5.16.0", "antd-style": "3.4.5", "lodash": "4.17.21", "react-i18next": "^11.15.1" diff --git a/packages/plugins/@nocobase/plugin-gantt/src/client/Gantt.Settings.tsx b/packages/plugins/@nocobase/plugin-gantt/src/client/Gantt.Settings.tsx index c77615950..6b37b5db2 100644 --- a/packages/plugins/@nocobase/plugin-gantt/src/client/Gantt.Settings.tsx +++ b/packages/plugins/@nocobase/plugin-gantt/src/client/Gantt.Settings.tsx @@ -1,4 +1,4 @@ -import { useField, useFieldSchema } from '@formily/react'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { SchemaSettings, SchemaSettingsBlockTitleItem, diff --git a/packages/plugins/@nocobase/plugin-gantt/src/client/GanttActionInitializers.tsx b/packages/plugins/@nocobase/plugin-gantt/src/client/GanttActionInitializers.tsx index b7368dafa..632475e37 100644 --- a/packages/plugins/@nocobase/plugin-gantt/src/client/GanttActionInitializers.tsx +++ b/packages/plugins/@nocobase/plugin-gantt/src/client/GanttActionInitializers.tsx @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { CompatibleSchemaInitializer, useCollection_deprecated } from '@nocobase/client'; /** diff --git a/packages/plugins/@nocobase/plugin-gantt/src/client/GanttBlockInitializer.tsx b/packages/plugins/@nocobase/plugin-gantt/src/client/GanttBlockInitializer.tsx index 041cc2a22..9b958774e 100644 --- a/packages/plugins/@nocobase/plugin-gantt/src/client/GanttBlockInitializer.tsx +++ b/packages/plugins/@nocobase/plugin-gantt/src/client/GanttBlockInitializer.tsx @@ -1,6 +1,6 @@ import { FormOutlined } from '@ant-design/icons'; import { FormLayout } from '@formily/antd-v5'; -import { SchemaOptionsContext } from '@formily/react'; +import { SchemaOptionsContext } from '@nocobase/schema'; import React, { useContext } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/plugins/@nocobase/plugin-gantt/src/client/GanttBlockProvider.tsx b/packages/plugins/@nocobase/plugin-gantt/src/client/GanttBlockProvider.tsx index 98dcdf334..88c14f531 100644 --- a/packages/plugins/@nocobase/plugin-gantt/src/client/GanttBlockProvider.tsx +++ b/packages/plugins/@nocobase/plugin-gantt/src/client/GanttBlockProvider.tsx @@ -1,4 +1,4 @@ -import { useField } from '@formily/react'; +import { useField } from '@nocobase/schema'; import React, { createContext, useContext, useEffect, useState } from 'react'; import { useACLRoleContext, diff --git a/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/Event.tsx b/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/Event.tsx index 4550041ba..9da9bac0e 100644 --- a/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/Event.tsx +++ b/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/Event.tsx @@ -1,4 +1,4 @@ -import { observer } from '@formily/react'; +import { observer } from '@nocobase/schema'; import React from 'react'; export const Event = observer( diff --git a/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/gantt.tsx b/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/gantt.tsx index e38f8c428..46359fb50 100644 --- a/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/gantt.tsx +++ b/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/gantt.tsx @@ -1,5 +1,5 @@ import { css, cx } from '@emotion/css'; -import { RecursionField, Schema, useFieldSchema } from '@formily/react'; +import { RecursionField, Schema, useFieldSchema } from '@nocobase/schema'; import { ActionContextProvider, RecordProvider, diff --git a/packages/plugins/@nocobase/plugin-gantt/src/client/createGanttBlockUISchema.tsx b/packages/plugins/@nocobase/plugin-gantt/src/client/createGanttBlockUISchema.tsx index 8ba59d29c..e65dadb9a 100644 --- a/packages/plugins/@nocobase/plugin-gantt/src/client/createGanttBlockUISchema.tsx +++ b/packages/plugins/@nocobase/plugin-gantt/src/client/createGanttBlockUISchema.tsx @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; export const createGanttBlockUISchema = (options: { collectionName: string; diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/package.json b/packages/plugins/@nocobase/plugin-graph-collection-manager/package.json index 8028de1b8..597dc563b 100644 --- a/packages/plugins/@nocobase/plugin-graph-collection-manager/package.json +++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/package.json @@ -10,7 +10,7 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "@ant-design/icons": "5.x", + "@ant-design/icons": "~5.3.6", "@antv/x6": "^2.0.0", "@antv/x6-plugin-dnd": "^2.0.0", "@antv/x6-plugin-export": "^2.0.0", @@ -20,11 +20,9 @@ "@antv/x6-plugin-snapline": "^2.0.0", "@antv/x6-react-shape": "^2.0.0", "@emotion/css": "^11.7.1", - "@formily/react": "2.x", - "@formily/reactive": "2.x", - "@formily/shared": "2.x", + "@nocobase/schema": "workspace:*", "ahooks": "^3.7.2", - "antd": "5.x", + "antd": "5.16.0", "dagre": "^0.8.5", "lodash": "4.17.21", "react": "^18.2.0", diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/GraphCollectionShortcut.tsx b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/GraphCollectionShortcut.tsx index 6ada1fcb6..ec135ea0d 100644 --- a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/GraphCollectionShortcut.tsx +++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/GraphCollectionShortcut.tsx @@ -1,5 +1,5 @@ import { DeleteOutlined } from '@ant-design/icons'; -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; import { css, SchemaComponent, useActionContext, useRequest } from '@nocobase/client'; import React, { useEffect } from 'react'; import { useCreateActionAndRefreshCM } from './action-hooks'; diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/GraphDrawPage.tsx b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/GraphDrawPage.tsx index 7d6297fe4..c51783cdb 100644 --- a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/GraphDrawPage.tsx +++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/GraphDrawPage.tsx @@ -6,7 +6,7 @@ import { Selection } from '@antv/x6-plugin-selection'; import { Snapline } from '@antv/x6-plugin-snapline'; import { register } from '@antv/x6-react-shape'; import { cx } from '@emotion/css'; -import { SchemaOptionsContext } from '@formily/react'; +import { SchemaOptionsContext } from '@nocobase/schema'; import { APIClientProvider, ApplicationContext, diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/action-hooks.tsx b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/action-hooks.tsx index 6ea1e57e4..086946e7c 100644 --- a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/action-hooks.tsx +++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/action-hooks.tsx @@ -1,5 +1,5 @@ -import { observer, useForm } from '@formily/react'; -import { action } from '@formily/reactive'; +import { observer, useForm } from '@nocobase/schema'; +import { action } from '@nocobase/schema'; import { useAPIClient, useActionContext, diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/Entity.tsx b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/Entity.tsx index 8eed3429e..ff09b3485 100644 --- a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/Entity.tsx +++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/Entity.tsx @@ -1,7 +1,7 @@ import { DeleteOutlined, DownOutlined, EditOutlined, UpOutlined } from '@ant-design/icons'; import { css } from '@emotion/css'; -import { SchemaOptionsContext } from '@formily/react'; -import { uid } from '@formily/shared'; +import { SchemaOptionsContext } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { CollectionCategroriesContext, CollectionProvider_deprecated, diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/FieldSummary.tsx b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/FieldSummary.tsx index 12a4e29d8..c5bbc7a55 100644 --- a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/FieldSummary.tsx +++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/FieldSummary.tsx @@ -1,4 +1,4 @@ -import { observer } from '@formily/react'; +import { observer } from '@nocobase/schema'; import { css, useCollectionManager_deprecated, useCompile } from '@nocobase/client'; import { Tag } from 'antd'; import React from 'react'; diff --git a/packages/plugins/@nocobase/plugin-iframe-block/package.json b/packages/plugins/@nocobase/plugin-iframe-block/package.json index eaaae5110..2313a42f2 100644 --- a/packages/plugins/@nocobase/plugin-iframe-block/package.json +++ b/packages/plugins/@nocobase/plugin-iframe-block/package.json @@ -10,10 +10,9 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "@ant-design/icons": "5.x", - "@formily/react": "2.x", - "@formily/shared": "2.x", - "antd": "5.x", + "@ant-design/icons": "~5.3.6", + "@nocobase/schema": "workspace:*", + "antd": "5.16.0", "react": "^18.2.0", "react-i18next": "^11.15.1", "react-iframe": "~1.8.5" diff --git a/packages/plugins/@nocobase/plugin-iframe-block/src/client/Iframe.Designer.tsx b/packages/plugins/@nocobase/plugin-iframe-block/src/client/Iframe.Designer.tsx index d1857b6ec..fa154fca0 100644 --- a/packages/plugins/@nocobase/plugin-iframe-block/src/client/Iframe.Designer.tsx +++ b/packages/plugins/@nocobase/plugin-iframe-block/src/client/Iframe.Designer.tsx @@ -1,5 +1,5 @@ -import { ISchema, useField, useFieldSchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { GeneralSchemaDesigner, SchemaSettingsDivider, diff --git a/packages/plugins/@nocobase/plugin-iframe-block/src/client/Iframe.tsx b/packages/plugins/@nocobase/plugin-iframe-block/src/client/Iframe.tsx index 36bcb257d..bbc74f3a0 100644 --- a/packages/plugins/@nocobase/plugin-iframe-block/src/client/Iframe.tsx +++ b/packages/plugins/@nocobase/plugin-iframe-block/src/client/Iframe.tsx @@ -1,4 +1,4 @@ -import { observer, useField } from '@formily/react'; +import { observer, useField } from '@nocobase/schema'; import { useAPIClient, useApp } from '@nocobase/client'; import { Card } from 'antd'; import React from 'react'; diff --git a/packages/plugins/@nocobase/plugin-iframe-block/src/client/schemaSettings.ts b/packages/plugins/@nocobase/plugin-iframe-block/src/client/schemaSettings.ts index 771a14d6e..46a037d3a 100644 --- a/packages/plugins/@nocobase/plugin-iframe-block/src/client/schemaSettings.ts +++ b/packages/plugins/@nocobase/plugin-iframe-block/src/client/schemaSettings.ts @@ -1,5 +1,5 @@ -import { ISchema, useField, useFieldSchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { SchemaSettings, useAPIClient, useDesignable } from '@nocobase/client'; import { useTranslation } from 'react-i18next'; diff --git a/packages/plugins/@nocobase/plugin-import/package.json b/packages/plugins/@nocobase/plugin-import/package.json index 9f2cb94c9..66bf49b85 100644 --- a/packages/plugins/@nocobase/plugin-import/package.json +++ b/packages/plugins/@nocobase/plugin-import/package.json @@ -10,14 +10,12 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "@ant-design/icons": "5.x", + "@ant-design/icons": "~5.3.6", "@formily/antd-v5": "1.x", - "@formily/core": "2.x", - "@formily/react": "2.x", - "@formily/shared": "2.x", "@koa/multer": "^3.0.2", + "@nocobase/schema": "workspace:*", "@types/node-xlsx": "^0.15.1", - "antd": "5.x", + "antd": "5.16.0", "file-saver": "^2.0.5", "lodash": "4.17.21", "mathjs": "^10.6.0", diff --git a/packages/plugins/@nocobase/plugin-import/src/client/ImportActionInitializer.tsx b/packages/plugins/@nocobase/plugin-import/src/client/ImportActionInitializer.tsx index 1156e7f61..8fb23585d 100644 --- a/packages/plugins/@nocobase/plugin-import/src/client/ImportActionInitializer.tsx +++ b/packages/plugins/@nocobase/plugin-import/src/client/ImportActionInitializer.tsx @@ -1,6 +1,6 @@ -import type { ISchema } from '@formily/react'; -import { Schema, useFieldSchema } from '@formily/react'; -import { merge } from '@formily/shared'; +import type { ISchema } from '@nocobase/schema'; +import { Schema, useFieldSchema } from '@nocobase/schema'; +import { merge } from '@nocobase/schema'; import { SchemaInitializerSwitch, css, diff --git a/packages/plugins/@nocobase/plugin-import/src/client/ImportDesigner.tsx b/packages/plugins/@nocobase/plugin-import/src/client/ImportDesigner.tsx index 32dc2fbec..951e1c93d 100644 --- a/packages/plugins/@nocobase/plugin-import/src/client/ImportDesigner.tsx +++ b/packages/plugins/@nocobase/plugin-import/src/client/ImportDesigner.tsx @@ -1,6 +1,6 @@ import { ArrayItems } from '@formily/antd-v5'; -import type { ISchema } from '@formily/react'; -import { useField, useFieldSchema } from '@formily/react'; +import type { ISchema } from '@nocobase/schema'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { GeneralSchemaDesigner, SchemaSettingsActionModalItem, diff --git a/packages/plugins/@nocobase/plugin-import/src/client/schemaSettings.ts b/packages/plugins/@nocobase/plugin-import/src/client/schemaSettings.ts index 7e885cbb6..be43f3d22 100644 --- a/packages/plugins/@nocobase/plugin-import/src/client/schemaSettings.ts +++ b/packages/plugins/@nocobase/plugin-import/src/client/schemaSettings.ts @@ -1,5 +1,5 @@ import { ArrayItems } from '@formily/antd-v5'; -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import { ButtonEditor, SchemaSettings, useDesignable, useSchemaToolbar } from '@nocobase/client'; import { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/plugins/@nocobase/plugin-import/src/client/useImportAction.ts b/packages/plugins/@nocobase/plugin-import/src/client/useImportAction.ts index bf5baef34..a3cc8877c 100644 --- a/packages/plugins/@nocobase/plugin-import/src/client/useImportAction.ts +++ b/packages/plugins/@nocobase/plugin-import/src/client/useImportAction.ts @@ -1,4 +1,4 @@ -import { Schema, useFieldSchema, useForm } from '@formily/react'; +import { Schema, useFieldSchema, useForm } from '@nocobase/schema'; import { useActionContext, useAPIClient, diff --git a/packages/plugins/@nocobase/plugin-import/src/client/useShared.ts b/packages/plugins/@nocobase/plugin-import/src/client/useShared.ts index 1cc25de9a..a582e8fb2 100644 --- a/packages/plugins/@nocobase/plugin-import/src/client/useShared.ts +++ b/packages/plugins/@nocobase/plugin-import/src/client/useShared.ts @@ -1,4 +1,4 @@ -import type { VoidField } from '@formily/core'; +import type { VoidField } from '@nocobase/schema'; import { Cascader, css, useCollection_deprecated } from '@nocobase/client'; import { useTranslation } from 'react-i18next'; import { NAMESPACE } from './constants'; diff --git a/packages/plugins/@nocobase/plugin-kanban/package.json b/packages/plugins/@nocobase/plugin-kanban/package.json index 25ed060ab..138ea7d55 100644 --- a/packages/plugins/@nocobase/plugin-kanban/package.json +++ b/packages/plugins/@nocobase/plugin-kanban/package.json @@ -10,13 +10,11 @@ "license": "AGPL-3.0", "main": "dist/server/index.js", "devDependencies": { - "@ant-design/icons": "^5.1.4", + "@ant-design/icons": "^5.3.6", "@emotion/css": "^11.7.1", "@formily/antd-v5": "^1.1.9", - "@formily/core": "^2.2.27", - "@formily/react": "^2.2.27", - "@formily/shared": "^2.2.27", - "antd": "^5.12.8", + "@nocobase/schema": "workspace:*", + "antd": "5.16.0", "antd-style": "3.4.5", "classnames": "^2.3.1", "lodash": "4.17.21", diff --git a/packages/plugins/@nocobase/plugin-kanban/src/client/CreateAndSelectSort/index.tsx b/packages/plugins/@nocobase/plugin-kanban/src/client/CreateAndSelectSort/index.tsx index 453584333..ca3b05954 100644 --- a/packages/plugins/@nocobase/plugin-kanban/src/client/CreateAndSelectSort/index.tsx +++ b/packages/plugins/@nocobase/plugin-kanban/src/client/CreateAndSelectSort/index.tsx @@ -1,5 +1,5 @@ import { FormLayout } from '@formily/antd-v5'; -import { SchemaOptionsContext, useField } from '@formily/react'; +import { SchemaOptionsContext, useField } from '@nocobase/schema'; import { FormDialog, SchemaComponent, @@ -13,7 +13,7 @@ import { Button, Space } from 'antd'; import React, { useContext } from 'react'; import { useTranslation } from 'react-i18next'; -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; import { NAMESPACE } from '../locale'; export const CreateAndSelectSort = (props) => { diff --git a/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Card.Designer.tsx b/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Card.Designer.tsx index 1a51ce194..3aa89b018 100644 --- a/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Card.Designer.tsx +++ b/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Card.Designer.tsx @@ -1,6 +1,6 @@ import { MenuOutlined } from '@ant-design/icons'; -import { ISchema, useFieldSchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema, useFieldSchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { CompatibleSchemaInitializer, SchemaInitializerOpenModeSchemaItems, diff --git a/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Card.tsx b/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Card.tsx index 2bd9e8e3e..89da6b6e3 100644 --- a/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Card.tsx +++ b/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Card.tsx @@ -1,6 +1,6 @@ import { css } from '@emotion/css'; import { FormLayout } from '@formily/antd-v5'; -import { observer, RecursionField, useFieldSchema } from '@formily/react'; +import { observer, RecursionField, useFieldSchema } from '@nocobase/schema'; import { ActionContextProvider, DndContext, diff --git a/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.CardViewer.tsx b/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.CardViewer.tsx index 99fea76b5..75ce0c5d1 100644 --- a/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.CardViewer.tsx +++ b/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.CardViewer.tsx @@ -1,4 +1,4 @@ -import { observer } from '@formily/react'; +import { observer } from '@nocobase/schema'; export const KanbanCardViewer: any = observer( (props: any) => { diff --git a/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Settings.tsx b/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Settings.tsx index bd654df14..4fc80b99f 100644 --- a/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Settings.tsx +++ b/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Settings.tsx @@ -1,4 +1,4 @@ -import { useField, useFieldSchema } from '@formily/react'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { useFormBlockContext, SchemaSettingsDataScope, diff --git a/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.tsx b/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.tsx index bb4c933fe..c39fdc6e8 100644 --- a/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.tsx +++ b/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.tsx @@ -1,5 +1,5 @@ -import { ArrayField } from '@formily/core'; -import { observer, RecursionField, useField, useFieldSchema, useForm } from '@formily/react'; +import { ArrayField } from '@nocobase/schema'; +import { observer, RecursionField, useField, useFieldSchema, useForm } from '@nocobase/schema'; import { RecordProvider, SchemaComponentOptions, diff --git a/packages/plugins/@nocobase/plugin-kanban/src/client/KanbanBlockInitializer.tsx b/packages/plugins/@nocobase/plugin-kanban/src/client/KanbanBlockInitializer.tsx index 409a14fe0..ef451c930 100644 --- a/packages/plugins/@nocobase/plugin-kanban/src/client/KanbanBlockInitializer.tsx +++ b/packages/plugins/@nocobase/plugin-kanban/src/client/KanbanBlockInitializer.tsx @@ -1,6 +1,6 @@ import { FormOutlined } from '@ant-design/icons'; import { FormLayout } from '@formily/antd-v5'; -import { SchemaOptionsContext, useForm } from '@formily/react'; +import { SchemaOptionsContext, useForm } from '@nocobase/schema'; import React, { useContext } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/plugins/@nocobase/plugin-kanban/src/client/KanbanBlockProvider.tsx b/packages/plugins/@nocobase/plugin-kanban/src/client/KanbanBlockProvider.tsx index b5a59b6b7..94f8728d7 100644 --- a/packages/plugins/@nocobase/plugin-kanban/src/client/KanbanBlockProvider.tsx +++ b/packages/plugins/@nocobase/plugin-kanban/src/client/KanbanBlockProvider.tsx @@ -1,5 +1,5 @@ -import { ArrayField } from '@formily/core'; -import { Schema, useField, useFieldSchema } from '@formily/react'; +import { ArrayField } from '@nocobase/schema'; +import { Schema, useField, useFieldSchema } from '@nocobase/schema'; import { Spin } from 'antd'; import uniq from 'lodash/uniq'; import React, { createContext, useContext, useEffect, useState } from 'react'; diff --git a/packages/plugins/@nocobase/plugin-kanban/src/client/createKanbanBlockUISchema.ts b/packages/plugins/@nocobase/plugin-kanban/src/client/createKanbanBlockUISchema.ts index 88b5aef02..1a6096671 100644 --- a/packages/plugins/@nocobase/plugin-kanban/src/client/createKanbanBlockUISchema.ts +++ b/packages/plugins/@nocobase/plugin-kanban/src/client/createKanbanBlockUISchema.ts @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; export const createKanbanBlockUISchema = (options: { collectionName: string; diff --git a/packages/plugins/@nocobase/plugin-localization-management/package.json b/packages/plugins/@nocobase/plugin-localization-management/package.json index efa34796c..5e0698d8c 100644 --- a/packages/plugins/@nocobase/plugin-localization-management/package.json +++ b/packages/plugins/@nocobase/plugin-localization-management/package.json @@ -10,11 +10,10 @@ "license": "AGPL-3.0", "main": "dist/server/index.js", "devDependencies": { - "@ant-design/icons": "^5.1.4", - "@formily/core": "^2.2.27", - "@formily/react": "^2.2.27", + "@ant-design/icons": "^5.3.6", + "@nocobase/schema": "workspace:*", "ahooks": "^3.7.2", - "antd": "^5.12.8", + "antd": "5.16.0", "deepmerge": "^4.3.1", "react-i18next": "^11.15.1" }, diff --git a/packages/plugins/@nocobase/plugin-localization-management/src/client/Localization.tsx b/packages/plugins/@nocobase/plugin-localization-management/src/client/Localization.tsx index 88c688148..6440262d1 100644 --- a/packages/plugins/@nocobase/plugin-localization-management/src/client/Localization.tsx +++ b/packages/plugins/@nocobase/plugin-localization-management/src/client/Localization.tsx @@ -1,6 +1,6 @@ import { SyncOutlined } from '@ant-design/icons'; -import { Form, createForm } from '@formily/core'; -import { Field, useField, useForm } from '@formily/react'; +import { Form, createForm } from '@nocobase/schema'; +import { FieldComponent as Field, useField, useForm } from '@nocobase/schema'; import { FormProvider, Input, diff --git a/packages/plugins/@nocobase/plugin-localization-management/src/client/schemas/localization.tsx b/packages/plugins/@nocobase/plugin-localization-management/src/client/schemas/localization.tsx index eb7d1840e..718da762c 100644 --- a/packages/plugins/@nocobase/plugin-localization-management/src/client/schemas/localization.tsx +++ b/packages/plugins/@nocobase/plugin-localization-management/src/client/schemas/localization.tsx @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; const collection = { name: 'localization', diff --git a/packages/plugins/@nocobase/plugin-logger/package.json b/packages/plugins/@nocobase/plugin-logger/package.json index e778cfb71..ed49916d9 100644 --- a/packages/plugins/@nocobase/plugin-logger/package.json +++ b/packages/plugins/@nocobase/plugin-logger/package.json @@ -10,10 +10,10 @@ "license": "AGPL-3.0", "main": "dist/server/index.js", "devDependencies": { - "@ant-design/icons": "^5.1.4", + "@ant-design/icons": "^5.3.6", "@types/tar-fs": "^2.0.2", "ahooks": "^3.7.2", - "antd": "^5.12.8", + "antd": "5.16.0", "react-i18next": "^11.15.1", "tar-fs": "^3.0.4" }, diff --git a/packages/plugins/@nocobase/plugin-map/package.json b/packages/plugins/@nocobase/plugin-map/package.json index 43488370f..339ccee3b 100644 --- a/packages/plugins/@nocobase/plugin-map/package.json +++ b/packages/plugins/@nocobase/plugin-map/package.json @@ -12,20 +12,18 @@ "devDependencies": { "@amap/amap-jsapi-loader": "^1.0.1", "@amap/amap-jsapi-types": "^0.0.10", - "@ant-design/icons": "5.x", + "@ant-design/icons": "~5.3.6", "@formily/antd-v5": "1.x", - "@formily/core": "2.x", - "@formily/react": "2.x", - "@formily/shared": "2.x", "@googlemaps/js-api-loader": "^1.16.1", + "@nocobase/schema": "workspace:*", "@types/google.maps": "^3.53.4", - "@types/react": "^17.0.0", - "@types/react-dom": "^17.0.0", + "@types/react": "^18.2.73", + "@types/react-dom": "^18.2.23", "ahooks": "^3.7.2", - "antd": "5.x", + "antd": "5.16.0", "lodash": "4.17.21", - "react": "18.x", - "react-dom": "18.x", + "react": "~18.2.0", + "react-dom": "~18.2.0", "react-i18next": "^11.15.1", "react-router-dom": "^6.11.2" }, diff --git a/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlock.Settings.tsx b/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlock.Settings.tsx index 2244bc7ec..495504adc 100644 --- a/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlock.Settings.tsx +++ b/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlock.Settings.tsx @@ -1,4 +1,4 @@ -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import { FilterBlockType, FixedBlockDesignerItem, diff --git a/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlockInitializer.tsx b/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlockInitializer.tsx index f12504113..074dbf0ab 100644 --- a/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlockInitializer.tsx +++ b/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlockInitializer.tsx @@ -1,6 +1,6 @@ import { TableOutlined } from '@ant-design/icons'; import { FormLayout } from '@formily/antd-v5'; -import { SchemaOptionsContext } from '@formily/react'; +import { SchemaOptionsContext } from '@nocobase/schema'; import { DataBlockInitializer, FormDialog, diff --git a/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlockProvider.tsx b/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlockProvider.tsx index 23de587cd..df3211e7c 100644 --- a/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlockProvider.tsx +++ b/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlockProvider.tsx @@ -1,4 +1,4 @@ -import { useField, useFieldSchema } from '@formily/react'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { BlockProvider, FixedBlockWrapper, SchemaComponentOptions, useBlockRequestContext } from '@nocobase/client'; import React, { createContext, useContext, useState } from 'react'; diff --git a/packages/plugins/@nocobase/plugin-map/src/client/block/createMapBlockUISchema.ts b/packages/plugins/@nocobase/plugin-map/src/client/block/createMapBlockUISchema.ts index 112a40c5d..7cc3498ba 100644 --- a/packages/plugins/@nocobase/plugin-map/src/client/block/createMapBlockUISchema.ts +++ b/packages/plugins/@nocobase/plugin-map/src/client/block/createMapBlockUISchema.ts @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; export const createMapBlockUISchema = (options: { collectionName: string; diff --git a/packages/plugins/@nocobase/plugin-map/src/client/components/AMap/Block.tsx b/packages/plugins/@nocobase/plugin-map/src/client/components/AMap/Block.tsx index 9ad47f5c4..59105dc49 100644 --- a/packages/plugins/@nocobase/plugin-map/src/client/components/AMap/Block.tsx +++ b/packages/plugins/@nocobase/plugin-map/src/client/components/AMap/Block.tsx @@ -1,5 +1,5 @@ import { CheckOutlined, EnvironmentOutlined, ExpandOutlined } from '@ant-design/icons'; -import { RecursionField, useFieldSchema } from '@formily/react'; +import { RecursionField, useFieldSchema } from '@nocobase/schema'; import { ActionContextProvider, RecordProvider, diff --git a/packages/plugins/@nocobase/plugin-map/src/client/components/AMap/Map.tsx b/packages/plugins/@nocobase/plugin-map/src/client/components/AMap/Map.tsx index 7c4551ae7..988baa382 100644 --- a/packages/plugins/@nocobase/plugin-map/src/client/components/AMap/Map.tsx +++ b/packages/plugins/@nocobase/plugin-map/src/client/components/AMap/Map.tsx @@ -1,7 +1,7 @@ import AMapLoader from '@amap/amap-jsapi-loader'; import '@amap/amap-jsapi-types'; import { SyncOutlined } from '@ant-design/icons'; -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { css, useApp, useCollection_deprecated } from '@nocobase/client'; import { useMemoizedFn } from 'ahooks'; import { Alert, App, Button, Spin } from 'antd'; diff --git a/packages/plugins/@nocobase/plugin-map/src/client/components/Designer.tsx b/packages/plugins/@nocobase/plugin-map/src/client/components/Designer.tsx index 5498f5f1c..a26e5700a 100644 --- a/packages/plugins/@nocobase/plugin-map/src/client/components/Designer.tsx +++ b/packages/plugins/@nocobase/plugin-map/src/client/components/Designer.tsx @@ -1,5 +1,5 @@ -import { Field } from '@formily/core'; -import { ISchema, useField, useFieldSchema } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { ISchema, useField, useFieldSchema } from '@nocobase/schema'; import { GeneralSchemaDesigner, GeneralSchemaItems, diff --git a/packages/plugins/@nocobase/plugin-map/src/client/components/GoogleMaps/Block.tsx b/packages/plugins/@nocobase/plugin-map/src/client/components/GoogleMaps/Block.tsx index 976fd0b54..a0fe79a26 100644 --- a/packages/plugins/@nocobase/plugin-map/src/client/components/GoogleMaps/Block.tsx +++ b/packages/plugins/@nocobase/plugin-map/src/client/components/GoogleMaps/Block.tsx @@ -1,5 +1,5 @@ import { CheckOutlined, EnvironmentOutlined, ExpandOutlined } from '@ant-design/icons'; -import { RecursionField, Schema, useFieldSchema } from '@formily/react'; +import { RecursionField, Schema, useFieldSchema } from '@nocobase/schema'; import { ActionContextProvider, RecordProvider, diff --git a/packages/plugins/@nocobase/plugin-map/src/client/components/GoogleMaps/Map.tsx b/packages/plugins/@nocobase/plugin-map/src/client/components/GoogleMaps/Map.tsx index ef6fd7473..773fe8976 100644 --- a/packages/plugins/@nocobase/plugin-map/src/client/components/GoogleMaps/Map.tsx +++ b/packages/plugins/@nocobase/plugin-map/src/client/components/GoogleMaps/Map.tsx @@ -1,5 +1,5 @@ import { SyncOutlined } from '@ant-design/icons'; -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { Loader } from '@googlemaps/js-api-loader'; import { css, useAPIClient, useApp, useCollection_deprecated } from '@nocobase/client'; import { useMemoizedFn } from 'ahooks'; diff --git a/packages/plugins/@nocobase/plugin-map/src/client/components/Map.tsx b/packages/plugins/@nocobase/plugin-map/src/client/components/Map.tsx index 1eee2880e..1f846b7e4 100644 --- a/packages/plugins/@nocobase/plugin-map/src/client/components/Map.tsx +++ b/packages/plugins/@nocobase/plugin-map/src/client/components/Map.tsx @@ -1,4 +1,4 @@ -import { connect, mapReadPretty } from '@formily/react'; +import { connect, mapReadPretty } from '@nocobase/schema'; import { css } from '@nocobase/client'; import React from 'react'; import { AMapComponentProps } from './AMap'; diff --git a/packages/plugins/@nocobase/plugin-map/src/client/components/ReadPretty.tsx b/packages/plugins/@nocobase/plugin-map/src/client/components/ReadPretty.tsx index f6aa236ba..770eff5c2 100644 --- a/packages/plugins/@nocobase/plugin-map/src/client/components/ReadPretty.tsx +++ b/packages/plugins/@nocobase/plugin-map/src/client/components/ReadPretty.tsx @@ -1,4 +1,4 @@ -import { useFieldSchema, useForm } from '@formily/react'; +import { useFieldSchema, useForm } from '@nocobase/schema'; import { EllipsisWithTooltip, useCollection_deprecated, useFieldTitle } from '@nocobase/client'; import React from 'react'; import { MapComponent } from './MapComponent'; diff --git a/packages/plugins/@nocobase/plugin-map/src/client/fields/schema.ts b/packages/plugins/@nocobase/plugin-map/src/client/fields/schema.ts index d739a6f93..703820eba 100644 --- a/packages/plugins/@nocobase/plugin-map/src/client/fields/schema.ts +++ b/packages/plugins/@nocobase/plugin-map/src/client/fields/schema.ts @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { CollectionFieldInterface, interfacesProperties } from '@nocobase/client'; import { MapTypes } from '../constants'; import { generateNTemplate } from '../locale'; diff --git a/packages/plugins/@nocobase/plugin-math-formula-field/package.json b/packages/plugins/@nocobase/plugin-math-formula-field/package.json index c4c2f884a..2805d50b4 100644 --- a/packages/plugins/@nocobase/plugin-math-formula-field/package.json +++ b/packages/plugins/@nocobase/plugin-math-formula-field/package.json @@ -9,9 +9,9 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "@formily/react": "2.x", + "@nocobase/schema": "workspace:*", "mathjs": "^10.6.0", - "react": "18.x", + "react": "~18.2.0", "react-i18next": "^11.15.1" }, "peerDependencies": { diff --git a/packages/plugins/@nocobase/plugin-math-formula-field/src/client/MathFormula/index.tsx b/packages/plugins/@nocobase/plugin-math-formula-field/src/client/MathFormula/index.tsx index f66f7e6e1..8877d8581 100644 --- a/packages/plugins/@nocobase/plugin-math-formula-field/src/client/MathFormula/index.tsx +++ b/packages/plugins/@nocobase/plugin-math-formula-field/src/client/MathFormula/index.tsx @@ -1,4 +1,4 @@ -import { connect, observer } from '@formily/react'; +import { connect, observer } from '@nocobase/schema'; import { Formula } from '@nocobase/client'; import React from 'react'; import { evaluate } from '../../utils/evaluate'; diff --git a/packages/plugins/@nocobase/plugin-mobile-client/package.json b/packages/plugins/@nocobase/plugin-mobile-client/package.json index bebf463b3..9f69875c4 100644 --- a/packages/plugins/@nocobase/plugin-mobile-client/package.json +++ b/packages/plugins/@nocobase/plugin-mobile-client/package.json @@ -7,20 +7,19 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "@ant-design/icons": "5.x", + "@ant-design/icons": "~5.3.6", "@formily/antd-v5": "1.x", - "@formily/react": "2.x", - "@formily/shared": "2.x", - "@types/react": "17.x", - "@types/react-dom": "17.x", + "@nocobase/schema": "workspace:*", + "@types/react": "~18.2.73", + "@types/react-dom": "~18.2.23", "ahooks": "3.x", - "antd": "5.x", + "antd": "5.16.0", "antd-mobile": "^5.29.1", "antd-style": "3.x", "classnames": "2.x", "lodash": "4.17.21", - "react": "18.x", - "react-dom": "18.x", + "react": "~18.2.0", + "react-dom": "~18.2.0", "react-i18next": "11.x", "react-router-dom": "6.x" }, diff --git a/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/container/Container.Designer.tsx b/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/container/Container.Designer.tsx index ffc394865..92f76e5e9 100644 --- a/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/container/Container.Designer.tsx +++ b/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/container/Container.Designer.tsx @@ -1,6 +1,6 @@ import { MenuOutlined } from '@ant-design/icons'; -import { useField, useFieldSchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { useField, useFieldSchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { SchemaSettingsDropdown, SchemaSettingsSwitchItem, useDesignable } from '@nocobase/client'; import { Button } from 'antd'; import React from 'react'; diff --git a/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/container/Container.tsx b/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/container/Container.tsx index f5d726505..052507160 100644 --- a/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/container/Container.tsx +++ b/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/container/Container.tsx @@ -1,4 +1,4 @@ -import { useField, useFieldSchema } from '@formily/react'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { cx, SchemaComponent, SortableItem, useDesigner, useToken } from '@nocobase/client'; import React, { useEffect } from 'react'; import { Navigate, useLocation, useNavigate, useParams } from 'react-router-dom'; diff --git a/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/header/Header.Designer.tsx b/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/header/Header.Designer.tsx index 32966885f..5e4ec3e05 100644 --- a/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/header/Header.Designer.tsx +++ b/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/header/Header.Designer.tsx @@ -1,5 +1,5 @@ import { Switch } from '@formily/antd-v5'; -import { useField } from '@formily/react'; +import { useField } from '@nocobase/schema'; import { GeneralSchemaDesigner, SchemaSettingsModalItem } from '@nocobase/client'; import React from 'react'; import { useTranslation } from '../../../../locale'; diff --git a/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/header/Header.tsx b/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/header/Header.tsx index c66cf5937..ff348575d 100644 --- a/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/header/Header.tsx +++ b/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/header/Header.tsx @@ -1,4 +1,4 @@ -import { useField } from '@formily/react'; +import { useField } from '@nocobase/schema'; import { cx, SortableItem, useCompile, useDesigner, useDocumentTitle, useToken } from '@nocobase/client'; import { NavBar, NavBarProps } from 'antd-mobile'; import React, { useEffect, useMemo } from 'react'; diff --git a/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/menu/Menu.Designer.tsx b/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/menu/Menu.Designer.tsx index 1e7d620bb..adb21eb30 100644 --- a/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/menu/Menu.Designer.tsx +++ b/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/menu/Menu.Designer.tsx @@ -1,5 +1,5 @@ import { MenuOutlined } from '@ant-design/icons'; -import { useField, useFieldSchema } from '@formily/react'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { SchemaSettingsDropdown, SchemaSettingsRemove, useDesignable } from '@nocobase/client'; import { Button } from 'antd'; import React from 'react'; diff --git a/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/menu/Menu.Item.tsx b/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/menu/Menu.Item.tsx index d9d0d3298..228c639ac 100644 --- a/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/menu/Menu.Item.tsx +++ b/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/menu/Menu.Item.tsx @@ -1,4 +1,4 @@ -import { useField, useFieldSchema } from '@formily/react'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { GeneralSchemaDesigner, Icon, diff --git a/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/menu/Menu.tsx b/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/menu/Menu.tsx index c8ff04119..1002895a8 100644 --- a/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/menu/Menu.tsx +++ b/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/menu/Menu.tsx @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { cx, DndContext, diff --git a/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/page/Page.Designer.tsx b/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/page/Page.Designer.tsx index 5ab4834fe..e86742a08 100644 --- a/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/page/Page.Designer.tsx +++ b/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/page/Page.Designer.tsx @@ -1,6 +1,6 @@ import { MenuOutlined } from '@ant-design/icons'; -import { useField, useFieldSchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { useField, useFieldSchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { SchemaSettingsDropdown, SchemaSettingsSwitchItem, useDesignable } from '@nocobase/client'; import { Button } from 'antd'; import React from 'react'; diff --git a/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/page/Page.tsx b/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/page/Page.tsx index 87d9bc5a9..4ab15b4a5 100644 --- a/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/page/Page.tsx +++ b/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/page/Page.tsx @@ -1,4 +1,4 @@ -import { RecursionField, useField, useFieldSchema } from '@formily/react'; +import { RecursionField, useField, useFieldSchema } from '@nocobase/schema'; import { ActionBarProvider, SortableItem, TabsContextProvider, css, cx, useDesigner } from '@nocobase/client'; import { TabsProps } from 'antd'; import React, { useCallback } from 'react'; diff --git a/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/tab-bar/TabBar.Item.tsx b/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/tab-bar/TabBar.Item.tsx index 0f06ef7e8..5900a4fdf 100644 --- a/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/tab-bar/TabBar.Item.tsx +++ b/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/tab-bar/TabBar.Item.tsx @@ -1,4 +1,4 @@ -import { useField, useFieldSchema } from '@formily/react'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { css, cx, diff --git a/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/tab-bar/TabBar.tsx b/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/tab-bar/TabBar.tsx index 62a1131e5..3926d52f5 100644 --- a/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/tab-bar/TabBar.tsx +++ b/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/components/tab-bar/TabBar.tsx @@ -1,5 +1,5 @@ -import { useFieldSchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { useFieldSchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { css, cx, diff --git a/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/helpers/index.ts b/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/helpers/index.ts index 3e629d64e..6239ca8de 100644 --- a/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/helpers/index.ts +++ b/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/helpers/index.ts @@ -1,5 +1,5 @@ -import { ISchema, Schema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema, Schema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; export const gridItemWrap = (schema: ISchema) => { return { type: 'void', diff --git a/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/hooks/useSchemaPatch.ts b/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/hooks/useSchemaPatch.ts index 6ac432f53..9d9771927 100644 --- a/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/hooks/useSchemaPatch.ts +++ b/packages/plugins/@nocobase/plugin-mobile-client/src/client/core/schema/hooks/useSchemaPatch.ts @@ -1,4 +1,4 @@ -import { useField, useFieldSchema } from '@formily/react'; +import { useField, useFieldSchema } from '@nocobase/schema'; import { useDesignable } from '@nocobase/client'; import lodash from 'lodash'; import { useMemoizedFn } from 'ahooks'; diff --git a/packages/plugins/@nocobase/plugin-multi-app-manager/package.json b/packages/plugins/@nocobase/plugin-multi-app-manager/package.json index 203f0f1c6..3ac43c4b7 100644 --- a/packages/plugins/@nocobase/plugin-multi-app-manager/package.json +++ b/packages/plugins/@nocobase/plugin-multi-app-manager/package.json @@ -10,15 +10,14 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "@formily/react": "2.x", - "@formily/shared": "2.x", - "antd": "5.x", + "@nocobase/schema": "workspace:*", + "antd": "5.16.0", "antd-style": "3.x", "async-mutex": "^0.3.2", "lodash": "4.17.21", "mysql2": "^2.3.3", "pg": "^8.7.3", - "react": "18.x", + "react": "~18.2.0", "react-i18next": "^11.15.1", "react-router-dom": "^6.11.2" }, diff --git a/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/AppNameInput.tsx b/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/AppNameInput.tsx index a51026720..7dc7e9983 100644 --- a/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/AppNameInput.tsx +++ b/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/AppNameInput.tsx @@ -1,4 +1,4 @@ -import { connect, mapReadPretty } from '@formily/react'; +import { connect, mapReadPretty } from '@nocobase/schema'; import { useApp } from '@nocobase/client'; import { Input as AntdInput } from 'antd'; import React from 'react'; diff --git a/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/settings/schemas/applications.ts b/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/settings/schemas/applications.ts index d79625abd..8de4acc05 100644 --- a/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/settings/schemas/applications.ts +++ b/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/settings/schemas/applications.ts @@ -1,5 +1,5 @@ -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; import { SchemaComponentOptions, tval, diff --git a/packages/plugins/@nocobase/plugin-multi-app-share-collection/package.json b/packages/plugins/@nocobase/plugin-multi-app-share-collection/package.json index 7a0bd3b15..59c6f0b69 100644 --- a/packages/plugins/@nocobase/plugin-multi-app-share-collection/package.json +++ b/packages/plugins/@nocobase/plugin-multi-app-share-collection/package.json @@ -8,10 +8,10 @@ ], "main": "./dist/server/index.js", "devDependencies": { - "@formily/react": "2.x", - "antd": "5.x", + "@nocobase/schema": "workspace:*", + "antd": "5.16.0", "lodash": "4.17.21", - "react": "18.x", + "react": "~18.2.0", "react-i18next": "^11.15.1" }, "peerDependencies": { diff --git a/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/client/MultiAppShareCollectionProvider.tsx b/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/client/MultiAppShareCollectionProvider.tsx index ec3417105..2ff70704a 100644 --- a/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/client/MultiAppShareCollectionProvider.tsx +++ b/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/client/MultiAppShareCollectionProvider.tsx @@ -1,4 +1,4 @@ -import { useForm } from '@formily/react'; +import { useForm } from '@nocobase/schema'; import { useActionContext, useAPIClient, useRecord } from '@nocobase/client'; import { tableActionColumnSchema } from '@nocobase/plugin-multi-app-manager/client'; import { message } from 'antd'; diff --git a/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/client/TableTransfer.tsx b/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/client/TableTransfer.tsx index f1b10280a..74add98d6 100644 --- a/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/client/TableTransfer.tsx +++ b/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/client/TableTransfer.tsx @@ -1,4 +1,4 @@ -import { connect } from '@formily/react'; +import { connect } from '@nocobase/schema'; import { css, useCollectionManager_deprecated, useRecord, useRequest, useToken } from '@nocobase/client'; import { CollectionsGraph, lodash } from '@nocobase/utils/client'; import { App, Col, Input, Row, Select, Spin, Table, Tag } from 'antd'; diff --git a/packages/plugins/@nocobase/plugin-oidc/package.json b/packages/plugins/@nocobase/plugin-oidc/package.json index ac36ff9c2..d59d7494a 100644 --- a/packages/plugins/@nocobase/plugin-oidc/package.json +++ b/packages/plugins/@nocobase/plugin-oidc/package.json @@ -10,14 +10,14 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "@ant-design/icons": "5.x", + "@ant-design/icons": "~5.3.6", "@formily/antd-v5": "1.x", - "@formily/react": "2.x", + "@nocobase/schema": "workspace:*", "ahooks": "^3.7.2", - "antd": "5.x", + "antd": "5.16.0", "nanoid": "3.3.4", "openid-client": "^5.4.2", - "react": "18.x", + "react": "~18.2.0", "react-i18next": "^11.15.1", "react-router-dom": "^6.11.2" }, diff --git a/packages/plugins/@nocobase/plugin-oidc/src/client/Options.tsx b/packages/plugins/@nocobase/plugin-oidc/src/client/Options.tsx index 9dc2325d2..2dcf62a49 100644 --- a/packages/plugins/@nocobase/plugin-oidc/src/client/Options.tsx +++ b/packages/plugins/@nocobase/plugin-oidc/src/client/Options.tsx @@ -1,6 +1,6 @@ import { CopyOutlined } from '@ant-design/icons'; import { ArrayItems, FormTab } from '@formily/antd-v5'; -import { observer } from '@formily/react'; +import { observer } from '@nocobase/schema'; import { FormItem, Input, SchemaComponent, useApp } from '@nocobase/client'; import { Card, Space, message } from 'antd'; import React, { useMemo } from 'react'; diff --git a/packages/plugins/@nocobase/plugin-oidc/src/server/oidc-auth.ts b/packages/plugins/@nocobase/plugin-oidc/src/server/oidc-auth.ts index 021e5a591..180aa4868 100644 --- a/packages/plugins/@nocobase/plugin-oidc/src/server/oidc-auth.ts +++ b/packages/plugins/@nocobase/plugin-oidc/src/server/oidc-auth.ts @@ -2,6 +2,7 @@ import { AuthConfig, BaseAuth } from '@nocobase/auth'; import { AuthModel } from '@nocobase/plugin-auth'; import { Issuer } from 'openid-client'; import { cookieName } from '../constants'; +export { Model } from '@nocobase/database'; export class OIDCAuth extends BaseAuth { constructor(config: AuthConfig) { diff --git a/packages/plugins/@nocobase/plugin-saml/package.json b/packages/plugins/@nocobase/plugin-saml/package.json index a6cc5224b..239ee9c63 100644 --- a/packages/plugins/@nocobase/plugin-saml/package.json +++ b/packages/plugins/@nocobase/plugin-saml/package.json @@ -10,11 +10,11 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "@ant-design/icons": "5.x", - "@formily/react": "2.x", + "@ant-design/icons": "~5.3.6", + "@nocobase/schema": "workspace:*", "@node-saml/node-saml": "^4.0.2", - "antd": "5.x", - "react": "18.x", + "antd": "5.16.0", + "react": "~18.2.0", "react-i18next": "^11.15.1", "react-router-dom": "^6.11.2" }, diff --git a/packages/plugins/@nocobase/plugin-saml/src/client/Options.tsx b/packages/plugins/@nocobase/plugin-saml/src/client/Options.tsx index 061a69daf..68de6d225 100644 --- a/packages/plugins/@nocobase/plugin-saml/src/client/Options.tsx +++ b/packages/plugins/@nocobase/plugin-saml/src/client/Options.tsx @@ -1,5 +1,5 @@ import { CopyOutlined } from '@ant-design/icons'; -import { observer, useForm } from '@formily/react'; +import { observer, useForm } from '@nocobase/schema'; import { FormItem, Input, SchemaComponent, useApp, useRecord } from '@nocobase/client'; import { getSubAppName } from '@nocobase/sdk'; import { Card, message } from 'antd'; diff --git a/packages/plugins/@nocobase/plugin-saml/src/client/schemas/saml.ts b/packages/plugins/@nocobase/plugin-saml/src/client/schemas/saml.ts index a9594bf48..e9a88fbe0 100644 --- a/packages/plugins/@nocobase/plugin-saml/src/client/schemas/saml.ts +++ b/packages/plugins/@nocobase/plugin-saml/src/client/schemas/saml.ts @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { useActionContext, useRequest } from '@nocobase/client'; const collection = { diff --git a/packages/plugins/@nocobase/plugin-saml/src/server/saml-auth.ts b/packages/plugins/@nocobase/plugin-saml/src/server/saml-auth.ts index 51fd19eb4..6ee6f79d6 100644 --- a/packages/plugins/@nocobase/plugin-saml/src/server/saml-auth.ts +++ b/packages/plugins/@nocobase/plugin-saml/src/server/saml-auth.ts @@ -1,6 +1,7 @@ import { AuthConfig, BaseAuth } from '@nocobase/auth'; import { AuthModel } from '@nocobase/plugin-auth'; import { SAML, SamlConfig } from '@node-saml/node-saml'; +export { Model } from '@nocobase/database'; interface SAMLOptions { ssoUrl?: string; diff --git a/packages/plugins/@nocobase/plugin-sample-hello/package.json b/packages/plugins/@nocobase/plugin-sample-hello/package.json index 9b7cea730..982244b41 100644 --- a/packages/plugins/@nocobase/plugin-sample-hello/package.json +++ b/packages/plugins/@nocobase/plugin-sample-hello/package.json @@ -5,9 +5,9 @@ "description": "A simple NocoBase plugin example", "main": "./dist/server/index.js", "devDependencies": { - "@ant-design/icons": "5.x", - "@formily/react": "2.x", - "antd": "5.x", + "@ant-design/icons": "~5.3.6", + "@nocobase/schema": "workspace:*", + "antd": "5.16.0", "react": "^18.2.0", "react-i18next": "^11.15.1" }, diff --git a/packages/plugins/@nocobase/plugin-sequence-field/package.json b/packages/plugins/@nocobase/plugin-sequence-field/package.json index 6e3906599..165c5eb96 100644 --- a/packages/plugins/@nocobase/plugin-sequence-field/package.json +++ b/packages/plugins/@nocobase/plugin-sequence-field/package.json @@ -11,14 +11,13 @@ "main": "./dist/server/index.js", "devDependencies": { "@formily/antd-v5": "1.x", - "@formily/core": "2.x", - "@formily/react": "2.x", - "antd": "5.x", + "@nocobase/schema": "workspace:*", + "antd": "5.16.0", "classnames": "^2.3.1", "cron-parser": "4.4.0", "dayjs": "^1.11.8", "lodash": "4.17.21", - "react": "18.x", + "react": "~18.2.0", "react-i18next": "^11.15.1", "react-js-cron": "^3.1.0" }, diff --git a/packages/plugins/@nocobase/plugin-sequence-field/src/client/sequence.tsx b/packages/plugins/@nocobase/plugin-sequence-field/src/client/sequence.tsx index 20474c03e..883bc877e 100644 --- a/packages/plugins/@nocobase/plugin-sequence-field/src/client/sequence.tsx +++ b/packages/plugins/@nocobase/plugin-sequence-field/src/client/sequence.tsx @@ -1,6 +1,6 @@ import { ArrayTable, FormButtonGroup, FormDrawer, FormLayout, Submit } from '@formily/antd-v5'; -import { onFieldValueChange } from '@formily/core'; -import { ISchema, SchemaOptionsContext, useForm, useFormEffects } from '@formily/react'; +import { onFieldValueChange } from '@nocobase/schema'; +import { ISchema, SchemaOptionsContext, useForm, useFormEffects } from '@nocobase/schema'; import { CollectionFieldInterface, Cron, diff --git a/packages/plugins/@nocobase/plugin-sms-auth/package.json b/packages/plugins/@nocobase/plugin-sms-auth/package.json index 70279b239..98ceac04a 100644 --- a/packages/plugins/@nocobase/plugin-sms-auth/package.json +++ b/packages/plugins/@nocobase/plugin-sms-auth/package.json @@ -10,9 +10,9 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "@formily/react": "2.x", - "antd": "5.x", - "react": "18.x", + "@nocobase/schema": "workspace:*", + "antd": "5.16.0", + "react": "~18.2.0", "react-i18next": "^11.15.1" }, "peerDependencies": { diff --git a/packages/plugins/@nocobase/plugin-sms-auth/src/client/SigninPage.tsx b/packages/plugins/@nocobase/plugin-sms-auth/src/client/SigninPage.tsx index 53e9e777f..0f4556af3 100644 --- a/packages/plugins/@nocobase/plugin-sms-auth/src/client/SigninPage.tsx +++ b/packages/plugins/@nocobase/plugin-sms-auth/src/client/SigninPage.tsx @@ -1,5 +1,5 @@ import { SchemaComponent } from '@nocobase/client'; -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import React from 'react'; import VerificationCode from './VerificationCode'; import { Authenticator, useSignIn } from '@nocobase/plugin-auth/client'; diff --git a/packages/plugins/@nocobase/plugin-sms-auth/src/client/VerificationCode.tsx b/packages/plugins/@nocobase/plugin-sms-auth/src/client/VerificationCode.tsx index 1791c5dd0..a00651b63 100644 --- a/packages/plugins/@nocobase/plugin-sms-auth/src/client/VerificationCode.tsx +++ b/packages/plugins/@nocobase/plugin-sms-auth/src/client/VerificationCode.tsx @@ -1,4 +1,4 @@ -import { useForm } from '@formily/react'; +import { useForm } from '@nocobase/schema'; import { css, useAPIClient } from '@nocobase/client'; import { Button, Input, message } from 'antd'; import React, { useEffect, useRef, useState } from 'react'; diff --git a/packages/plugins/@nocobase/plugin-snapshot-field/package.json b/packages/plugins/@nocobase/plugin-snapshot-field/package.json index 47406c43e..401b8adcb 100644 --- a/packages/plugins/@nocobase/plugin-snapshot-field/package.json +++ b/packages/plugins/@nocobase/plugin-snapshot-field/package.json @@ -10,14 +10,12 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "@ant-design/icons": "5.x", - "@formily/core": "2.x", - "@formily/react": "2.x", - "@formily/shared": "2.x", - "antd": "5.x", + "@ant-design/icons": "~5.3.6", + "@nocobase/schema": "workspace:*", + "antd": "5.16.0", "lodash": "4.17.21", "rc-tree-select": "5.5.5", - "react": "18.x", + "react": "~18.2.0", "react-i18next": "^11.15.1" }, "peerDependencies": { diff --git a/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotBlock/SnapshotBlockInitializers/SnapshotBlockInitializersDetailItem.tsx b/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotBlock/SnapshotBlockInitializers/SnapshotBlockInitializersDetailItem.tsx index f7444dd30..e22920776 100644 --- a/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotBlock/SnapshotBlockInitializers/SnapshotBlockInitializersDetailItem.tsx +++ b/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotBlock/SnapshotBlockInitializers/SnapshotBlockInitializersDetailItem.tsx @@ -10,8 +10,8 @@ import { SchemaInitializerItem, useSchemaInitializerItem, } from '@nocobase/client'; -import { ISchema } from '@formily/react'; -import { uid } from '@formily/shared'; +import { ISchema } from '@nocobase/schema'; +import { uid } from '@nocobase/schema'; export const createSnapshotBlockSchema = (options) => { const { diff --git a/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotBlock/SnapshotBlockProvider.tsx b/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotBlock/SnapshotBlockProvider.tsx index eb4e4431b..f099c2152 100644 --- a/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotBlock/SnapshotBlockProvider.tsx +++ b/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotBlock/SnapshotBlockProvider.tsx @@ -1,5 +1,5 @@ -import { createForm } from '@formily/core'; -import { useField } from '@formily/react'; +import { createForm } from '@nocobase/schema'; +import { useField } from '@nocobase/schema'; import { BlockAssociationContext, BlockRequestContext_deprecated, diff --git a/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotRecordPicker.tsx b/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotRecordPicker.tsx index 36d683e95..e1bf02d85 100644 --- a/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotRecordPicker.tsx +++ b/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotRecordPicker.tsx @@ -1,4 +1,4 @@ -import { connect, mapReadPretty, useFieldSchema } from '@formily/react'; +import { connect, mapReadPretty, useFieldSchema } from '@nocobase/schema'; import { ReadPrettyRecordPicker, useCollection_deprecated } from '@nocobase/client'; import React from 'react'; import { SnapshotHistoryCollectionProvider } from './SnapshotHistoryCollectionProvider'; diff --git a/packages/plugins/@nocobase/plugin-snapshot-field/src/client/interface.ts b/packages/plugins/@nocobase/plugin-snapshot-field/src/client/interface.ts index 0ba81afd4..a2b40b292 100644 --- a/packages/plugins/@nocobase/plugin-snapshot-field/src/client/interface.ts +++ b/packages/plugins/@nocobase/plugin-snapshot-field/src/client/interface.ts @@ -1,5 +1,5 @@ -import type { Field } from '@formily/core'; -import { ISchema, useForm } from '@formily/react'; +import type { Field } from '@nocobase/schema'; +import { ISchema, useForm } from '@nocobase/schema'; import { CollectionFieldInterface, interfacesProperties, diff --git a/packages/plugins/@nocobase/plugin-theme-editor/package.json b/packages/plugins/@nocobase/plugin-theme-editor/package.json index 03c7aa1ea..f55ddc110 100644 --- a/packages/plugins/@nocobase/plugin-theme-editor/package.json +++ b/packages/plugins/@nocobase/plugin-theme-editor/package.json @@ -10,11 +10,12 @@ "main": "dist/server/index.js", "devDependencies": { "@ant-design/cssinjs": "^1.11.1", - "@ant-design/icons": "5.x", + "@ant-design/icons": "~5.3.6", "@arvinxu/layout-kit": "^1", "@ctrl/tinycolor": "^3.6.0", "@emotion/css": "^11.11.2", - "antd": "5.x", + "@types/lodash": "4.17.0", + "antd": "5.16.0", "classnames": "^2.3.1", "lodash": "4.17.21", "rc-util": "^5.32.0", diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/package.json b/packages/plugins/@nocobase/plugin-ui-schema-storage/package.json index b7bbaa8e5..aa1594a43 100644 --- a/packages/plugins/@nocobase/plugin-ui-schema-storage/package.json +++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/package.json @@ -10,7 +10,7 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "@formily/json-schema": "2.x", + "@nocobase/schema": "workspace:*", "lodash": "4.17.21" }, "peerDependencies": { diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/ui-schema.test.ts b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/ui-schema.test.ts index 59478e813..dd337049f 100644 --- a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/ui-schema.test.ts +++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/ui-schema.test.ts @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/json-schema'; +import { ISchema } from '@nocobase/schema'; import { Database } from '@nocobase/database'; import { createMockServer, MockServer } from '@nocobase/test'; import { UiSchemaRepository } from '..'; diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20230510235247-form-field.ts b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20230510235247-form-field.ts index a65925324..9d6316b49 100644 --- a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20230510235247-form-field.ts +++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20230510235247-form-field.ts @@ -1,4 +1,4 @@ -import { Schema } from '@formily/json-schema'; +import { Schema } from '@nocobase/schema'; import { Migration } from '@nocobase/server'; import { uid } from '@nocobase/utils'; import UiSchemaRepository from '../repository'; diff --git a/packages/plugins/@nocobase/plugin-users/package.json b/packages/plugins/@nocobase/plugin-users/package.json index 787d2645d..d562ba50d 100644 --- a/packages/plugins/@nocobase/plugin-users/package.json +++ b/packages/plugins/@nocobase/plugin-users/package.json @@ -10,11 +10,9 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "@formily/core": "^2.2.27", - "@formily/react": "^2.2.27", - "@formily/shared": "^2.2.27", + "@nocobase/schema": "workspace:*", "@types/jsonwebtoken": "^8.5.8", - "antd": "^5.12.8", + "antd": "5.16.0", "jsonwebtoken": "^8.5.1", "react-i18next": "^11.15.1" }, diff --git a/packages/plugins/@nocobase/plugin-users/src/client/PasswordField.tsx b/packages/plugins/@nocobase/plugin-users/src/client/PasswordField.tsx index 3e5f434cb..3272f6199 100644 --- a/packages/plugins/@nocobase/plugin-users/src/client/PasswordField.tsx +++ b/packages/plugins/@nocobase/plugin-users/src/client/PasswordField.tsx @@ -1,8 +1,8 @@ import React, { useEffect } from 'react'; import { Input, Row, Col, Button } from 'antd'; import { Password, useActionContext } from '@nocobase/client'; -import { useField } from '@formily/react'; -import { Field } from '@formily/core'; +import { useField } from '@nocobase/schema'; +import { Field } from '@nocobase/schema'; import { useUsersTranslation } from './locale'; import { generatePassword } from './utils'; diff --git a/packages/plugins/@nocobase/plugin-users/src/client/UserRolesField.tsx b/packages/plugins/@nocobase/plugin-users/src/client/UserRolesField.tsx index a9e278865..ef9e90bb7 100644 --- a/packages/plugins/@nocobase/plugin-users/src/client/UserRolesField.tsx +++ b/packages/plugins/@nocobase/plugin-users/src/client/UserRolesField.tsx @@ -1,6 +1,6 @@ import React from 'react'; -import { useField, Schema } from '@formily/react'; -import { Field } from '@formily/core'; +import { useField, Schema } from '@nocobase/schema'; +import { Field } from '@nocobase/schema'; import { useUsersTranslation } from './locale'; import { Tag } from 'antd'; diff --git a/packages/plugins/@nocobase/plugin-users/src/client/schemas/users.ts b/packages/plugins/@nocobase/plugin-users/src/client/schemas/users.ts index fe9f53c42..a9b226992 100644 --- a/packages/plugins/@nocobase/plugin-users/src/client/schemas/users.ts +++ b/packages/plugins/@nocobase/plugin-users/src/client/schemas/users.ts @@ -1,7 +1,7 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { useActionContext, useCollectionRecord, useRecord, useRequest } from '@nocobase/client'; import { useEffect } from 'react'; -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; export const userCollection = { name: 'users', diff --git a/packages/plugins/@nocobase/plugin-verification/package.json b/packages/plugins/@nocobase/plugin-verification/package.json index 0998902d2..53334257d 100644 --- a/packages/plugins/@nocobase/plugin-verification/package.json +++ b/packages/plugins/@nocobase/plugin-verification/package.json @@ -14,12 +14,10 @@ "@alicloud/openapi-client": "0.4.1", "@alicloud/tea-util": "1.4.4", "@formily/antd-v5": "1.x", - "@formily/core": "2.x", - "@formily/react": "2.x", - "@formily/shared": "2.x", - "antd": "5.x", + "@nocobase/schema": "workspace:*", + "antd": "5.16.0", "dayjs": "^1.11.8", - "react": "18.x", + "react": "~18.2.0", "react-i18next": "^11.15.1", "tencentcloud-sdk-nodejs": "^4.0.525" }, diff --git a/packages/plugins/@nocobase/plugin-verification/src/client/ProviderOptions.tsx b/packages/plugins/@nocobase/plugin-verification/src/client/ProviderOptions.tsx index 79f5c842f..6db2206da 100644 --- a/packages/plugins/@nocobase/plugin-verification/src/client/ProviderOptions.tsx +++ b/packages/plugins/@nocobase/plugin-verification/src/client/ProviderOptions.tsx @@ -1,6 +1,6 @@ import { FormLayout } from '@formily/antd-v5'; -import { Field } from '@formily/core'; -import { RecursionField, Schema, observer, useField, useForm } from '@formily/react'; +import { Field } from '@nocobase/schema'; +import { RecursionField, Schema, observer, useField, useForm } from '@nocobase/schema'; import React, { useEffect, useState } from 'react'; import providerTypes from './providerTypes'; diff --git a/packages/plugins/@nocobase/plugin-verification/src/client/providerTypes/index.ts b/packages/plugins/@nocobase/plugin-verification/src/client/providerTypes/index.ts index bfd73ca57..d54b67c28 100644 --- a/packages/plugins/@nocobase/plugin-verification/src/client/providerTypes/index.ts +++ b/packages/plugins/@nocobase/plugin-verification/src/client/providerTypes/index.ts @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { Registry } from '@nocobase/utils/client'; import SMSAliyun from './sms-aliyun'; import SMSTencent from './sms-tencent'; diff --git a/packages/plugins/@nocobase/plugin-verification/src/client/providerTypes/sms-aliyun.ts b/packages/plugins/@nocobase/plugin-verification/src/client/providerTypes/sms-aliyun.ts index 4bd65067c..7df55d8f3 100644 --- a/packages/plugins/@nocobase/plugin-verification/src/client/providerTypes/sms-aliyun.ts +++ b/packages/plugins/@nocobase/plugin-verification/src/client/providerTypes/sms-aliyun.ts @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { NAMESPACE } from '../locale'; diff --git a/packages/plugins/@nocobase/plugin-verification/src/client/providerTypes/sms-tencent.ts b/packages/plugins/@nocobase/plugin-verification/src/client/providerTypes/sms-tencent.ts index 4e9868780..53676a9e7 100644 --- a/packages/plugins/@nocobase/plugin-verification/src/client/providerTypes/sms-tencent.ts +++ b/packages/plugins/@nocobase/plugin-verification/src/client/providerTypes/sms-tencent.ts @@ -1,4 +1,4 @@ -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { NAMESPACE } from '../locale'; diff --git a/packages/plugins/@nocobase/plugin-verification/src/client/schemas/providers.ts b/packages/plugins/@nocobase/plugin-verification/src/client/schemas/providers.ts index 0549ab362..a4fe413c2 100644 --- a/packages/plugins/@nocobase/plugin-verification/src/client/schemas/providers.ts +++ b/packages/plugins/@nocobase/plugin-verification/src/client/schemas/providers.ts @@ -1,4 +1,4 @@ -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; import { useActionContext, useRequest } from '@nocobase/client'; import { NAMESPACE } from '../locale'; diff --git a/packages/plugins/@nocobase/plugin-workflow-action-trigger/package.json b/packages/plugins/@nocobase/plugin-workflow-action-trigger/package.json index 1ddd0dd27..2f74ddad4 100644 --- a/packages/plugins/@nocobase/plugin-workflow-action-trigger/package.json +++ b/packages/plugins/@nocobase/plugin-workflow-action-trigger/package.json @@ -10,10 +10,10 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "@formily/react": "^2.2.27", - "antd": "5.x", + "@nocobase/schema": "workspace:*", + "antd": "5.16.0", "lodash": "4.17.21", - "react": "18.x", + "react": "~18.2.0", "react-i18next": "^11.15.1", "sequelize": "^6.26.0" }, diff --git a/packages/plugins/@nocobase/plugin-workflow-action-trigger/src/client/ActionTrigger.tsx b/packages/plugins/@nocobase/plugin-workflow-action-trigger/src/client/ActionTrigger.tsx index a49e6ada5..c8f4a52ed 100644 --- a/packages/plugins/@nocobase/plugin-workflow-action-trigger/src/client/ActionTrigger.tsx +++ b/packages/plugins/@nocobase/plugin-workflow-action-trigger/src/client/ActionTrigger.tsx @@ -1,4 +1,4 @@ -import { useForm } from '@formily/react'; +import { useForm } from '@nocobase/schema'; import { SchemaInitializerItemType, diff --git a/packages/plugins/@nocobase/plugin-workflow-aggregate/package.json b/packages/plugins/@nocobase/plugin-workflow-aggregate/package.json index 204f4a078..940bafe08 100644 --- a/packages/plugins/@nocobase/plugin-workflow-aggregate/package.json +++ b/packages/plugins/@nocobase/plugin-workflow-aggregate/package.json @@ -10,9 +10,9 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "@formily/react": "^2.2.27", - "antd": "5.x", - "react": "18.x", + "@nocobase/schema": "workspace:*", + "antd": "5.16.0", + "react": "~18.2.0", "react-i18next": "^11.15.1" }, "peerDependencies": { diff --git a/packages/plugins/@nocobase/plugin-workflow-aggregate/src/client/AggregateInstruction.tsx b/packages/plugins/@nocobase/plugin-workflow-aggregate/src/client/AggregateInstruction.tsx index a2dc67c77..1f238b02d 100644 --- a/packages/plugins/@nocobase/plugin-workflow-aggregate/src/client/AggregateInstruction.tsx +++ b/packages/plugins/@nocobase/plugin-workflow-aggregate/src/client/AggregateInstruction.tsx @@ -1,4 +1,4 @@ -import { useForm } from '@formily/react'; +import { useForm } from '@nocobase/schema'; import { Cascader } from 'antd'; import React, { useCallback, useEffect, useState } from 'react'; diff --git a/packages/plugins/@nocobase/plugin-workflow-delay/package.json b/packages/plugins/@nocobase/plugin-workflow-delay/package.json index 38da102cf..9a893af32 100644 --- a/packages/plugins/@nocobase/plugin-workflow-delay/package.json +++ b/packages/plugins/@nocobase/plugin-workflow-delay/package.json @@ -10,8 +10,8 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "antd": "5.x", - "react": "18.x", + "antd": "5.16.0", + "react": "~18.2.0", "react-i18next": "^11.15.1" }, "peerDependencies": { diff --git a/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/package.json b/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/package.json index e3ec61c1f..a68174e58 100644 --- a/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/package.json +++ b/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/package.json @@ -11,13 +11,12 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "@ant-design/icons": "5.x", + "@ant-design/icons": "~5.3.6", "@formily/antd-v5": "1.x", - "@formily/core": "2.x", - "@formily/react": "2.x", - "antd": "5.x", + "@nocobase/schema": "workspace:*", + "antd": "5.16.0", "lodash": "4.17.21", - "react": "18.x", + "react": "~18.2.0", "react-i18next": "^11.15.1", "react-router-dom": "^6.11.2" }, diff --git a/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/src/client/DynamicExpression.tsx b/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/src/client/DynamicExpression.tsx index 217bf661f..e0a7e2e0b 100644 --- a/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/src/client/DynamicExpression.tsx +++ b/packages/plugins/@nocobase/plugin-workflow-dynamic-calculation/src/client/DynamicExpression.tsx @@ -1,5 +1,5 @@ -import { onFieldInputValueChange, onFormInitialValuesChange } from '@formily/core'; -import { connect, mapReadPretty, observer, useField, useForm, useFormEffects } from '@formily/react'; +import { onFieldInputValueChange, onFormInitialValuesChange } from '@nocobase/schema'; +import { connect, mapReadPretty, observer, useField, useForm, useFormEffects } from '@nocobase/schema'; import { Tag } from 'antd'; import React, { useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/plugins/@nocobase/plugin-workflow-loop/package.json b/packages/plugins/@nocobase/plugin-workflow-loop/package.json index 8f9c20eee..aacfbe80d 100644 --- a/packages/plugins/@nocobase/plugin-workflow-loop/package.json +++ b/packages/plugins/@nocobase/plugin-workflow-loop/package.json @@ -10,8 +10,8 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "@ant-design/icons": "5.x", - "react": "18.x", + "@ant-design/icons": "~5.3.6", + "react": "~18.2.0", "react-i18next": "^11.15.1" }, "peerDependencies": { diff --git a/packages/plugins/@nocobase/plugin-workflow-manual/package.json b/packages/plugins/@nocobase/plugin-workflow-manual/package.json index 76c723aa7..a1575a8e8 100644 --- a/packages/plugins/@nocobase/plugin-workflow-manual/package.json +++ b/packages/plugins/@nocobase/plugin-workflow-manual/package.json @@ -10,14 +10,13 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "@ant-design/icons": "5.x", + "@ant-design/icons": "~5.3.6", "@formily/antd-v5": "1.x", - "@formily/core": "2.x", - "@formily/react": "2.x", - "antd": "5.x", + "@nocobase/schema": "workspace:*", + "antd": "5.16.0", "dayjs": "^1.11.8", "lodash": "4.17.21", - "react": "18.x", + "react": "~18.2.0", "react-i18next": "^11.15.1", "react-router-dom": "^6.11.2" }, diff --git a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/WorkflowTodo.tsx b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/WorkflowTodo.tsx index 3ef15cdef..78501a55a 100644 --- a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/WorkflowTodo.tsx +++ b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/WorkflowTodo.tsx @@ -1,4 +1,4 @@ -import { observer, useField, useFieldSchema, useForm } from '@formily/react'; +import { observer, useField, useFieldSchema, useForm } from '@nocobase/schema'; import { Space, Spin, Tag } from 'antd'; import dayjs from 'dayjs'; import React, { createContext, useContext, useEffect, useState } from 'react'; diff --git a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/instruction/FormBlockProvider.tsx b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/instruction/FormBlockProvider.tsx index fca9b7f0a..98ffd88ba 100644 --- a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/instruction/FormBlockProvider.tsx +++ b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/instruction/FormBlockProvider.tsx @@ -1,5 +1,5 @@ -import { createForm } from '@formily/core'; -import { RecursionField, useField, useFieldSchema } from '@formily/react'; +import { createForm } from '@nocobase/schema'; +import { RecursionField, useField, useFieldSchema } from '@nocobase/schema'; import { BlockRequestContext_deprecated, CollectionManagerProvider, diff --git a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/instruction/SchemaConfig.tsx b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/instruction/SchemaConfig.tsx index 6af0e1b92..34b578e6c 100644 --- a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/instruction/SchemaConfig.tsx +++ b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/instruction/SchemaConfig.tsx @@ -1,6 +1,6 @@ import { FormLayout } from '@formily/antd-v5'; -import { createForm } from '@formily/core'; -import { FormProvider, ISchema, Schema, useFieldSchema, useForm } from '@formily/react'; +import { createForm } from '@nocobase/schema'; +import { FormProvider, ISchema, Schema, useFieldSchema, useForm } from '@nocobase/schema'; import { Alert, Button, Modal, Space } from 'antd'; import React, { useCallback, useContext, useEffect, useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; diff --git a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/instruction/forms/custom.tsx b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/instruction/forms/custom.tsx index 13a48ae2c..b913a1d0f 100644 --- a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/instruction/forms/custom.tsx +++ b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/instruction/forms/custom.tsx @@ -1,8 +1,8 @@ import React, { useContext, useMemo, useState } from 'react'; import { ArrayTable } from '@formily/antd-v5'; -import { Field, createForm } from '@formily/core'; -import { useField, useFieldSchema, useForm } from '@formily/react'; +import { Field, createForm } from '@nocobase/schema'; +import { useField, useFieldSchema, useForm } from '@nocobase/schema'; import { cloneDeep, pick, set } from 'lodash'; import { diff --git a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/instruction/forms/update.tsx b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/instruction/forms/update.tsx index 20443e907..b5f594b62 100644 --- a/packages/plugins/@nocobase/plugin-workflow-manual/src/client/instruction/forms/update.tsx +++ b/packages/plugins/@nocobase/plugin-workflow-manual/src/client/instruction/forms/update.tsx @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import React, { useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import _ from 'lodash'; diff --git a/packages/plugins/@nocobase/plugin-workflow-parallel/package.json b/packages/plugins/@nocobase/plugin-workflow-parallel/package.json index 1dcf30d42..ced756e55 100644 --- a/packages/plugins/@nocobase/plugin-workflow-parallel/package.json +++ b/packages/plugins/@nocobase/plugin-workflow-parallel/package.json @@ -10,9 +10,9 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "@ant-design/icons": "5.x", - "antd": "5.x", - "react": "18.x", + "@ant-design/icons": "~5.3.6", + "antd": "5.16.0", + "react": "~18.2.0", "react-i18next": "^11.15.1" }, "peerDependencies": { diff --git a/packages/plugins/@nocobase/plugin-workflow-request/package.json b/packages/plugins/@nocobase/plugin-workflow-request/package.json index 3e7e6fc04..f7ea14507 100644 --- a/packages/plugins/@nocobase/plugin-workflow-request/package.json +++ b/packages/plugins/@nocobase/plugin-workflow-request/package.json @@ -11,8 +11,8 @@ "main": "./dist/server/index.js", "devDependencies": { "@formily/antd-v5": "^1.1.9", - "antd": "5.x", - "react": "18.x", + "antd": "5.16.0", + "react": "~18.2.0", "react-i18next": "^11.15.1" }, "peerDependencies": { diff --git a/packages/plugins/@nocobase/plugin-workflow-sql/package.json b/packages/plugins/@nocobase/plugin-workflow-sql/package.json index d732eb71d..ac79139d3 100644 --- a/packages/plugins/@nocobase/plugin-workflow-sql/package.json +++ b/packages/plugins/@nocobase/plugin-workflow-sql/package.json @@ -10,8 +10,8 @@ "license": "AGPL-3.0", "main": "./dist/server/index.js", "devDependencies": { - "antd": "5.x", - "react": "18.x", + "antd": "5.16.0", + "react": "~18.2.0", "react-i18next": "^11.15.1" }, "peerDependencies": { diff --git a/packages/plugins/@nocobase/plugin-workflow/package.json b/packages/plugins/@nocobase/plugin-workflow/package.json index f54bfcae7..b64541eba 100644 --- a/packages/plugins/@nocobase/plugin-workflow/package.json +++ b/packages/plugins/@nocobase/plugin-workflow/package.json @@ -13,20 +13,18 @@ "@nocobase/plugin-workflow-test": "workspace:*" }, "devDependencies": { - "@ant-design/icons": "5.x", + "@ant-design/icons": "~5.3.6", "@formily/antd-v5": "1.x", - "@formily/core": "2.x", - "@formily/react": "2.x", - "@formily/shared": "^2.2.27", + "@nocobase/schema": "workspace:*", "@types/ejs": "^3.1.1", - "antd": "5.x", + "antd": "5.16.0", "axios": "^1.6.2", "classnames": "^2.3.1", "cron-parser": "4.4.0", "dayjs": "^1.11.8", "lodash": "4.17.21", "lru-cache": "8.0.5", - "react": "18.x", + "react": "~18.2.0", "react-i18next": "^11.15.1", "react-js-cron": "^3.1.0", "react-router-dom": "^6.11.2", diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/WorkflowPane.tsx b/packages/plugins/@nocobase/plugin-workflow/src/client/WorkflowPane.tsx index 3265fb799..f188c84d7 100644 --- a/packages/plugins/@nocobase/plugin-workflow/src/client/WorkflowPane.tsx +++ b/packages/plugins/@nocobase/plugin-workflow/src/client/WorkflowPane.tsx @@ -8,8 +8,8 @@ import OpenDrawer from './components/OpenDrawer'; import { workflowSchema } from './schemas/workflows'; import { ExecutionStatusSelect, ExecutionStatusColumn } from './components/ExecutionStatus'; import WorkflowPlugin, { RadioWithTooltip } from '.'; -import { onFieldChange } from '@formily/core'; -import { useField, useFormEffects } from '@formily/react'; +import { onFieldChange } from '@nocobase/schema'; +import { useField, useFormEffects } from '@nocobase/schema'; function SyncOptionSelect(props) { const field = useField(); diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/components/CollectionBlockInitializer.tsx b/packages/plugins/@nocobase/plugin-workflow/src/client/components/CollectionBlockInitializer.tsx index 3359b905d..9f9379328 100644 --- a/packages/plugins/@nocobase/plugin-workflow/src/client/components/CollectionBlockInitializer.tsx +++ b/packages/plugins/@nocobase/plugin-workflow/src/client/components/CollectionBlockInitializer.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { uid } from '@formily/shared'; +import { uid } from '@nocobase/schema'; import { CollectionProvider_deprecated, diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/components/CollectionFieldset.tsx b/packages/plugins/@nocobase/plugin-workflow/src/client/components/CollectionFieldset.tsx index 3c9d7bd3a..ccbafc23b 100644 --- a/packages/plugins/@nocobase/plugin-workflow/src/client/components/CollectionFieldset.tsx +++ b/packages/plugins/@nocobase/plugin-workflow/src/client/components/CollectionFieldset.tsx @@ -1,5 +1,5 @@ import { CloseCircleOutlined, PlusOutlined } from '@ant-design/icons'; -import { observer, useField, useForm } from '@formily/react'; +import { observer, useField, useForm } from '@nocobase/schema'; import { CollectionField, CollectionProvider_deprecated, diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/components/DetailsBlockProvider.tsx b/packages/plugins/@nocobase/plugin-workflow/src/client/components/DetailsBlockProvider.tsx index b378de71c..a0115e8a9 100644 --- a/packages/plugins/@nocobase/plugin-workflow/src/client/components/DetailsBlockProvider.tsx +++ b/packages/plugins/@nocobase/plugin-workflow/src/client/components/DetailsBlockProvider.tsx @@ -1,6 +1,6 @@ import React, { useMemo, useRef } from 'react'; -import { createForm } from '@formily/core'; -import { useField } from '@formily/react'; +import { createForm } from '@nocobase/schema'; +import { useField } from '@nocobase/schema'; import { get } from 'lodash'; import { BlockRequestContext_deprecated, diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/components/DrawerForm.tsx b/packages/plugins/@nocobase/plugin-workflow/src/client/components/DrawerForm.tsx index a48c6f76f..619e8e871 100644 --- a/packages/plugins/@nocobase/plugin-workflow/src/client/components/DrawerForm.tsx +++ b/packages/plugins/@nocobase/plugin-workflow/src/client/components/DrawerForm.tsx @@ -1,7 +1,7 @@ import React, { useCallback, useMemo, useState } from 'react'; import { cloneDeep } from 'lodash'; -import { createForm } from '@formily/core'; -import { useForm } from '@formily/react'; +import { createForm } from '@nocobase/schema'; +import { useForm } from '@nocobase/schema'; import { ActionContextProvider, FormProvider } from '@nocobase/client'; diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/components/FieldsSelect.tsx b/packages/plugins/@nocobase/plugin-workflow/src/client/components/FieldsSelect.tsx index c8b684e96..6844ca7f4 100644 --- a/packages/plugins/@nocobase/plugin-workflow/src/client/components/FieldsSelect.tsx +++ b/packages/plugins/@nocobase/plugin-workflow/src/client/components/FieldsSelect.tsx @@ -1,4 +1,4 @@ -import { observer, useForm } from '@formily/react'; +import { observer, useForm } from '@nocobase/schema'; import { Select } from 'antd'; import React from 'react'; diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/components/OpenDrawer.tsx b/packages/plugins/@nocobase/plugin-workflow/src/client/components/OpenDrawer.tsx index 7b2506dff..8435006af 100644 --- a/packages/plugins/@nocobase/plugin-workflow/src/client/components/OpenDrawer.tsx +++ b/packages/plugins/@nocobase/plugin-workflow/src/client/components/OpenDrawer.tsx @@ -1,5 +1,5 @@ import React, { useState } from 'react'; -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { ActionContextProvider, SchemaComponent } from '@nocobase/client'; diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/components/SimpleDesigner.tsx b/packages/plugins/@nocobase/plugin-workflow/src/client/components/SimpleDesigner.tsx index e724d3ad2..13494fd37 100644 --- a/packages/plugins/@nocobase/plugin-workflow/src/client/components/SimpleDesigner.tsx +++ b/packages/plugins/@nocobase/plugin-workflow/src/client/components/SimpleDesigner.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { GeneralSchemaDesigner, diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/components/ValueBlock.tsx b/packages/plugins/@nocobase/plugin-workflow/src/client/components/ValueBlock.tsx index 5362859f9..ac1bcb076 100644 --- a/packages/plugins/@nocobase/plugin-workflow/src/client/components/ValueBlock.tsx +++ b/packages/plugins/@nocobase/plugin-workflow/src/client/components/ValueBlock.tsx @@ -1,4 +1,4 @@ -import { useFieldSchema } from '@formily/react'; +import { useFieldSchema } from '@nocobase/schema'; import { css, SchemaInitializerItem, useSchemaInitializer, useSchemaInitializerItem } from '@nocobase/client'; import { parse } from '@nocobase/utils/client'; import React from 'react'; diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/hooks/useTriggerWorkflowActionProps.ts b/packages/plugins/@nocobase/plugin-workflow/src/client/hooks/useTriggerWorkflowActionProps.ts index c6070dcc1..73ecff612 100644 --- a/packages/plugins/@nocobase/plugin-workflow/src/client/hooks/useTriggerWorkflowActionProps.ts +++ b/packages/plugins/@nocobase/plugin-workflow/src/client/hooks/useTriggerWorkflowActionProps.ts @@ -1,6 +1,6 @@ import { useNavigate } from 'react-router-dom'; import { App, message } from 'antd'; -import { useField, useFieldSchema, useForm } from '@formily/react'; +import { useField, useFieldSchema, useForm } from '@nocobase/schema'; import { useAPIClient, diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/nodes/index.tsx b/packages/plugins/@nocobase/plugin-workflow/src/client/nodes/index.tsx index 33c96bd1c..0fd5b3f78 100644 --- a/packages/plugins/@nocobase/plugin-workflow/src/client/nodes/index.tsx +++ b/packages/plugins/@nocobase/plugin-workflow/src/client/nodes/index.tsx @@ -1,6 +1,6 @@ import { CloseOutlined, DeleteOutlined } from '@ant-design/icons'; -import { createForm } from '@formily/core'; -import { ISchema, useForm } from '@formily/react'; +import { createForm } from '@nocobase/schema'; +import { ISchema, useForm } from '@nocobase/schema'; import { App, Button, Dropdown, Input, Tag, Tooltip, message } from 'antd'; import { cloneDeep } from 'lodash'; import React, { useCallback, useContext, useMemo, useState } from 'react'; diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/nodes/query.tsx b/packages/plugins/@nocobase/plugin-workflow/src/client/nodes/query.tsx index d86a94b39..1602e4471 100644 --- a/packages/plugins/@nocobase/plugin-workflow/src/client/nodes/query.tsx +++ b/packages/plugins/@nocobase/plugin-workflow/src/client/nodes/query.tsx @@ -8,7 +8,7 @@ import { useCompile, } from '@nocobase/client'; -import { useForm } from '@formily/react'; +import { useForm } from '@nocobase/schema'; import { CollectionBlockInitializer } from '../components/CollectionBlockInitializer'; import { FilterDynamicComponent } from '../components/FilterDynamicComponent'; import { NAMESPACE } from '../locale'; diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/nodes/update.tsx b/packages/plugins/@nocobase/plugin-workflow/src/client/nodes/update.tsx index 5acbdd716..f3be67da9 100644 --- a/packages/plugins/@nocobase/plugin-workflow/src/client/nodes/update.tsx +++ b/packages/plugins/@nocobase/plugin-workflow/src/client/nodes/update.tsx @@ -1,4 +1,4 @@ -import { useField, useForm } from '@formily/react'; +import { useField, useForm } from '@nocobase/schema'; import React from 'react'; import { useCollectionDataSource, useCollectionManager_deprecated } from '@nocobase/client'; diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/schemas/collection.ts b/packages/plugins/@nocobase/plugin-workflow/src/client/schemas/collection.ts index 2765d2595..eeb5e2015 100644 --- a/packages/plugins/@nocobase/plugin-workflow/src/client/schemas/collection.ts +++ b/packages/plugins/@nocobase/plugin-workflow/src/client/schemas/collection.ts @@ -1,4 +1,4 @@ -import { useForm } from '@formily/react'; +import { useForm } from '@nocobase/schema'; import { css, parseCollectionName, useCollectionFilterOptions } from '@nocobase/client'; import { NAMESPACE } from '../locale'; diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/schemas/executions.tsx b/packages/plugins/@nocobase/plugin-workflow/src/client/schemas/executions.tsx index 554bcb02f..785b9d15a 100644 --- a/packages/plugins/@nocobase/plugin-workflow/src/client/schemas/executions.tsx +++ b/packages/plugins/@nocobase/plugin-workflow/src/client/schemas/executions.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { ISchema } from '@formily/react'; +import { ISchema } from '@nocobase/schema'; import { Link } from 'react-router-dom'; import { useTranslation } from 'react-i18next'; import { message } from 'antd'; diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/schemas/workflows.ts b/packages/plugins/@nocobase/plugin-workflow/src/client/schemas/workflows.ts index cb8174216..6765dcbc2 100644 --- a/packages/plugins/@nocobase/plugin-workflow/src/client/schemas/workflows.ts +++ b/packages/plugins/@nocobase/plugin-workflow/src/client/schemas/workflows.ts @@ -1,4 +1,4 @@ -import { ISchema, useForm } from '@formily/react'; +import { ISchema, useForm } from '@nocobase/schema'; import { useActionContext, useRecord, useResourceActionContext, useResourceContext } from '@nocobase/client'; import { message } from 'antd'; import { useTranslation } from 'react-i18next'; diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/settings/customizeSubmitToWorkflowActionSettings.tsx b/packages/plugins/@nocobase/plugin-workflow/src/client/settings/customizeSubmitToWorkflowActionSettings.tsx index 2576ea9cc..7d94cf1d9 100644 --- a/packages/plugins/@nocobase/plugin-workflow/src/client/settings/customizeSubmitToWorkflowActionSettings.tsx +++ b/packages/plugins/@nocobase/plugin-workflow/src/client/settings/customizeSubmitToWorkflowActionSettings.tsx @@ -1,5 +1,5 @@ -import { useFieldSchema } from '@formily/react'; -import { isValid } from '@formily/shared'; +import { useFieldSchema } from '@nocobase/schema'; +import { isValid } from '@nocobase/schema'; import { AfterSuccess, AssignedFieldValues, diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/triggers/index.tsx b/packages/plugins/@nocobase/plugin-workflow/src/client/triggers/index.tsx index 5149f6d0f..0374bab40 100644 --- a/packages/plugins/@nocobase/plugin-workflow/src/client/triggers/index.tsx +++ b/packages/plugins/@nocobase/plugin-workflow/src/client/triggers/index.tsx @@ -2,8 +2,8 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react'; import { Button, Input, Tag, message } from 'antd'; import { cloneDeep } from 'lodash'; import { InfoOutlined } from '@ant-design/icons'; -import { createForm } from '@formily/core'; -import { ISchema, useForm } from '@formily/react'; +import { createForm } from '@nocobase/schema'; +import { ISchema, useForm } from '@nocobase/schema'; import { ActionContextProvider, diff --git a/packages/plugins/@nocobase/plugin-workflow/src/client/triggers/schedule/ScheduleConfig.tsx b/packages/plugins/@nocobase/plugin-workflow/src/client/triggers/schedule/ScheduleConfig.tsx index 7cd999c88..8c1d88e76 100644 --- a/packages/plugins/@nocobase/plugin-workflow/src/client/triggers/schedule/ScheduleConfig.tsx +++ b/packages/plugins/@nocobase/plugin-workflow/src/client/triggers/schedule/ScheduleConfig.tsx @@ -1,5 +1,5 @@ -import { onFieldValueChange } from '@formily/core'; -import { useForm, useFormEffects, ISchema } from '@formily/react'; +import { onFieldValueChange } from '@nocobase/schema'; +import { useForm, useFormEffects, ISchema } from '@nocobase/schema'; import { css, SchemaComponent } from '@nocobase/client'; import React, { useState } from 'react'; import { NAMESPACE } from '../../locale'; diff --git a/packages/presets/nocobase/package.json b/packages/presets/nocobase/package.json index 9281878b3..036ca8196 100644 --- a/packages/presets/nocobase/package.json +++ b/packages/presets/nocobase/package.json @@ -9,7 +9,6 @@ "license": "AGPL-3.0", "main": "./lib/server/index.js", "dependencies": { - "@formily/json-schema": "2.x", "@nocobase/client": "workspace:*", "@nocobase/plugin-acl": "workspace:*", "@nocobase/plugin-action-bulk-edit": "workspace:*", @@ -66,6 +65,7 @@ "@nocobase/plugin-workflow-parallel": "workspace:*", "@nocobase/plugin-workflow-request": "workspace:*", "@nocobase/plugin-workflow-sql": "workspace:*", + "@nocobase/schema": "workspace:*", "@nocobase/server": "workspace:*", "cronstrue": "^2.11.0", "lodash": "4.17.21" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6b14e680e..8b2fe4105 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,18 +5,28 @@ settings: excludeLinksFromLockfile: false overrides: + '@formily/core': 2.2.27 + '@formily/grid': 2.2.27 + '@formily/json-schema': 2.2.27 + '@formily/path': 2.2.27 + '@formily/react': 2.2.27 + '@formily/reactive': 2.2.27 + '@formily/reactive-react': 2.2.27 + '@formily/shared': 2.2.27 + '@formily/validator': 2.2.27 '@types/node': ^20.12.2 - '@types/react': ^17.0.0 - '@types/react-dom': ^17.0.0 + '@types/react': 18.2.73 + '@types/react-dom': 18.2.23 '@typescript-eslint/parser': ^6.2.0 - antd: 5.12.8 + antd: 5.16.0 nwsapi: 2.2.7 prettier: ^3.1.1 - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 react-router: ^6.11.2 react-router-dom: ^6.11.2 tsx: ^4.6.2 + typescript: 5.4.3 importers: @@ -25,6 +35,9 @@ importers: pm2: specifier: ^5.2.0 version: 5.3.0 + rimraf: + specifier: ^3.0.0 + version: 3.0.2 devDependencies: '@changesets/cli': specifier: ^2.27.1 @@ -47,12 +60,15 @@ importers: '@nocobase/preset-nocobase': specifier: workspace:* version: link:packages/presets/nocobase + '@nocobase/test': + specifier: workspace:* + version: link:packages/core/test '@types/react': - specifier: ^17.0.0 - version: 17.0.73 + specifier: 18.2.73 + version: 18.2.73 '@types/react-dom': - specifier: ^17.0.0 - version: 17.0.25 + specifier: 18.2.23 + version: 18.2.23 auto-changelog: specifier: ^2.4.0 version: 2.4.0 @@ -64,10 +80,10 @@ importers: version: 9.5.0 eslint-plugin-jest-dom: specifier: ^5.0.1 - version: 5.1.0(eslint@8.55.0) + version: 5.1.0(eslint@8.57.0) eslint-plugin-testing-library: specifier: ^5.11.0 - version: 5.11.1(eslint@8.55.0)(typescript@5.1.3) + version: 5.11.1(eslint@8.57.0)(typescript@5.4.3) ghooks: specifier: ^2.0.4 version: 2.0.4 @@ -90,20 +106,20 @@ importers: specifier: ^3.1.0 version: 3.1.3(prettier@3.2.5) react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-dom: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0(react@18.2.0) tsx: specifier: ^4.6.2 version: 4.6.2 typescript: - specifier: 5.1.3 - version: 5.1.3 + specifier: 5.4.3 + version: 5.4.3 umi: specifier: ^4.0.69 - version: 4.0.89(@babel/core@7.22.10)(@types/node@20.12.2)(@types/react@17.0.73)(eslint@8.55.0)(prettier@3.2.5)(react-dom@18.2.0)(react@18.2.0)(sass@1.69.5)(stylelint@14.16.1)(typescript@5.1.3)(webpack@5.91.0) + version: 4.0.89(@babel/core@7.22.10)(@types/node@20.12.2)(@types/react@18.2.73)(eslint@8.57.0)(prettier@3.2.5)(react-dom@18.2.0)(react@18.2.0)(sass@1.69.5)(stylelint@14.16.1)(typescript@5.4.3)(webpack@5.91.0) packages/core/acl: dependencies: @@ -122,6 +138,10 @@ importers: minimatch: specifier: ^5.1.1 version: 5.1.6 + devDependencies: + '@types/lodash': + specifier: 4.17.0 + version: 4.17.0 packages/core/actions: dependencies: @@ -230,7 +250,7 @@ importers: version: 2.4.2 esbuild-register: specifier: ^3.4.2 - version: 3.5.0(esbuild@0.19.9) + version: 3.5.0(esbuild@0.20.2) execa: specifier: ^5.1.1 version: 5.1.1 @@ -245,16 +265,16 @@ importers: version: 4.0.2 gulp-typescript: specifier: 6.0.0-alpha.1 - version: 6.0.0-alpha.1(typescript@5.1.3) + version: 6.0.0-alpha.1(typescript@5.4.3) tar: specifier: ^6.2.0 version: 6.2.0 tsup: specifier: 7.2.0 - version: 7.2.0(postcss@8.4.35)(typescript@5.1.3) + version: 7.2.0(postcss@8.4.35)(typescript@5.4.3) typescript: - specifier: 5.1.3 - version: 5.1.3 + specifier: 5.4.3 + version: 5.4.3 update-notifier: specifier: 3.0.0 version: 3.0.0 @@ -357,11 +377,11 @@ importers: specifier: ^1.11.1 version: 1.18.2(react-dom@18.2.0)(react@18.2.0) '@ant-design/icons': - specifier: ^5.1.4 - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ^5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) '@ant-design/pro-layout': specifier: ^7.16.11 - version: 7.17.16(antd@5.12.8)(react-dom@18.2.0)(react@18.2.0) + version: 7.17.16(antd@5.16.0)(react-dom@18.2.0)(react@18.2.0) '@antv/g2plot': specifier: ^2.4.18 version: 2.4.31 @@ -388,40 +408,16 @@ importers: version: 11.11.2 '@formily/antd-v5': specifier: ^1.1.9 - version: 1.1.9(@types/react-dom@17.0.25)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/core': - specifier: ^2.2.27 - version: 2.3.0 - '@formily/grid': - specifier: ^2.2.27 - version: 2.3.0(typescript@5.1.3) - '@formily/json-schema': - specifier: ^2.2.27 - version: 2.3.0(typescript@5.1.3) - '@formily/path': - specifier: ^2.2.27 - version: 2.3.0 - '@formily/react': - specifier: ^2.2.27 - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/reactive': - specifier: ^2.2.27 - version: 2.3.0 - '@formily/reactive-react': - specifier: ^2.2.27 - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0) - '@formily/shared': - specifier: ^2.2.27 - version: 2.3.0 - '@formily/validator': - specifier: ^2.2.27 - version: 2.3.0 + version: 1.1.9(@types/react-dom@18.2.23)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3) '@nocobase/database': specifier: workspace:* version: link:../database '@nocobase/evaluators': specifier: workspace:* version: link:../evaluators + '@nocobase/schema': + specifier: workspace:* + version: link:../schema '@nocobase/sdk': specifier: workspace:* version: link:../sdk @@ -432,11 +428,11 @@ importers: specifier: ^3.7.2 version: 3.7.8(react@18.2.0) antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) antd-style: specifier: 3.4.5 - version: 3.4.5(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react@18.2.0) + version: 3.4.5(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react@18.2.0) axios: specifier: ^1.6.2 version: 1.6.7 @@ -495,13 +491,13 @@ importers: specifier: ^5.32.0 version: 5.38.1(react-dom@18.2.0)(react@18.2.0) react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-beautiful-dnd: specifier: ^13.1.0 version: 13.1.1(react-dom@18.2.0)(react@18.2.0) react-dom: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0(react@18.2.0) react-drag-listview: specifier: ^0.1.9 @@ -529,7 +525,7 @@ importers: version: 18.2.0 react-js-cron: specifier: ^3.1.0 - version: 3.2.0(antd@5.12.8)(react-dom@18.2.0)(react@18.2.0) + version: 3.2.0(antd@5.16.0)(react-dom@18.2.0)(react@18.2.0) react-quill: specifier: ^2.0.0 version: 2.0.0(react-dom@18.2.0)(react@18.2.0) @@ -552,6 +548,9 @@ importers: '@testing-library/react': specifier: ^14.0.0 version: 14.1.2(react-dom@18.2.0)(react@18.2.0) + '@types/lodash': + specifier: ^4.17.0 + version: 4.17.0 '@types/markdown-it': specifier: 12.2.3 version: 12.2.3 @@ -566,10 +565,10 @@ importers: version: 1.22.0(axios@1.6.7) dumi: specifier: ^2.2.0 - version: 2.2.16(@babel/core@7.22.10)(@types/node@20.12.2)(@types/react@17.0.73)(eslint@8.55.0)(prettier@3.2.5)(react-dom@18.2.0)(react@18.2.0)(stylelint@14.16.1)(typescript@5.1.3)(webpack@5.91.0) + version: 2.2.16(@babel/core@7.22.10)(@types/node@20.12.2)(@types/react@18.2.73)(eslint@8.57.0)(prettier@3.2.5)(react-dom@18.2.0)(react@18.2.0)(stylelint@14.16.1)(typescript@5.4.3)(webpack@5.91.0) dumi-theme-nocobase: specifier: ^0.2.19 - version: 0.2.21(@babel/core@7.22.10)(@types/react@17.0.73)(dumi@2.2.16)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0) + version: 0.2.21(@babel/core@7.22.10)(@types/react@18.2.73)(dumi@2.2.16)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0) packages/core/create-nocobase-app: dependencies: @@ -691,6 +690,9 @@ importers: '@types/glob': specifier: ^7.2.0 version: 7.2.0 + '@types/lodash': + specifier: 4.17.0 + version: 4.17.0 packages/core/devtools: dependencies: @@ -710,23 +712,23 @@ importers: specifier: ^4.3.4 version: 4.3.12 '@types/lodash': - specifier: ^4.14.177 - version: 4.14.202 + specifier: ^4.17.0 + version: 4.17.0 '@types/node': specifier: ^20.12.2 version: 20.12.2 '@types/react': - specifier: ^17.0.0 - version: 17.0.73 + specifier: 18.2.73 + version: 18.2.73 '@types/react-dom': - specifier: ^17.0.0 - version: 17.0.25 + specifier: 18.2.23 + version: 18.2.23 '@typescript-eslint/eslint-plugin': specifier: ^6.2.0 - version: 6.14.0(@typescript-eslint/parser@6.14.0)(eslint@8.55.0)(typescript@5.1.3) + version: 6.14.0(@typescript-eslint/parser@6.14.0)(eslint@8.55.0)(typescript@5.4.3) '@typescript-eslint/parser': specifier: ^6.2.0 - version: 6.14.0(eslint@8.55.0)(typescript@5.1.3) + version: 6.14.0(eslint@8.55.0)(typescript@5.4.3) concurrently: specifier: ^7.0.0 version: 7.6.0 @@ -776,10 +778,10 @@ importers: specifier: ^3.1.0 version: 3.1.3(prettier@3.2.5) react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-dom: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0(react@18.2.0) rimraf: specifier: ^3.0.0 @@ -789,13 +791,13 @@ importers: version: 13.0.4 ts-loader: specifier: ^7.0.4 - version: 7.0.5(typescript@5.1.3) + version: 7.0.5(typescript@5.4.3) ts-node: specifier: 9.1.1 - version: 9.1.1(typescript@5.1.3) + version: 9.1.1(typescript@5.4.3) ts-node-dev: specifier: 1.1.8 - version: 1.1.8(typescript@5.1.3) + version: 1.1.8(typescript@5.4.3) tsconfig-paths: specifier: ^3.12.0 version: 3.15.0 @@ -803,11 +805,11 @@ importers: specifier: ^4.6.2 version: 4.6.2 typescript: - specifier: 5.1.3 - version: 5.1.3 + specifier: 5.4.3 + version: 5.4.3 umi: specifier: ^4.0.69 - version: 4.0.89(@babel/core@7.22.10)(@types/node@20.12.2)(@types/react@17.0.73)(eslint@8.55.0)(prettier@3.2.5)(react-dom@18.2.0)(react@18.2.0)(sass@1.69.5)(stylelint@14.16.1)(typescript@5.1.3)(webpack@5.91.0) + version: 4.0.89(@babel/core@7.22.10)(@types/node@20.12.2)(@types/react@18.2.73)(eslint@8.55.0)(prettier@3.2.5)(react-dom@18.2.0)(react@18.2.0)(stylelint@14.16.1)(typescript@5.4.3)(webpack@5.91.0) packages/core/evaluators: dependencies: @@ -872,6 +874,36 @@ importers: specifier: ^6.9.4 version: 6.11.2 + packages/core/schema: + dependencies: + '@formily/core': + specifier: 2.2.27 + version: 2.2.27 + '@formily/grid': + specifier: 2.2.27 + version: 2.2.27(typescript@5.4.3) + '@formily/json-schema': + specifier: 2.2.27 + version: 2.2.27(typescript@5.4.3) + '@formily/path': + specifier: 2.2.27 + version: 2.2.27 + '@formily/react': + specifier: 2.2.27 + version: 2.2.27(@types/react-dom@18.2.23)(@types/react@18.2.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3) + '@formily/reactive': + specifier: 2.2.27 + version: 2.2.27 + '@formily/reactive-react': + specifier: 2.2.27 + version: 2.2.27(@types/react-dom@18.2.23)(@types/react@18.2.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0) + '@formily/shared': + specifier: 2.2.27 + version: 2.2.27 + '@formily/validator': + specifier: 2.2.27 + version: 2.2.27 + packages/core/sdk: dependencies: axios: @@ -884,12 +916,12 @@ importers: axios-mock-adapter: specifier: ^1.20.0 version: 1.22.0(axios@1.6.7) + vitest: + specifier: ^1.4.0 + version: 1.4.0(@types/node@20.12.2)(jsdom@16.7.0) packages/core/server: dependencies: - '@formily/json-schema': - specifier: 2.2.27 - version: 2.2.27(typescript@5.1.3) '@hapi/topo': specifier: ^6.0.0 version: 6.0.2 @@ -929,6 +961,9 @@ importers: '@nocobase/resourcer': specifier: workspace:* version: link:../resourcer + '@nocobase/schema': + specifier: workspace:* + version: link:../schema '@nocobase/sdk': specifier: workspace:* version: link:../sdk @@ -1008,7 +1043,7 @@ importers: specifier: 3.3.4 version: 3.3.4 react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 semver: specifier: ^7.3.7 @@ -1016,6 +1051,9 @@ importers: serve-handler: specifier: ^6.1.5 version: 6.1.5 + winston: + specifier: ^3.8.2 + version: 3.11.0 ws: specifier: ^8.13.0 version: 8.15.1 @@ -1023,6 +1061,12 @@ importers: specifier: ^1.0.5 version: 1.0.5 devDependencies: + '@types/koa': + specifier: ^2.13.4 + version: 2.13.12 + '@types/lodash': + specifier: 4.17.0 + version: 4.17.0 '@types/semver': specifier: ^7.3.9 version: 7.5.6 @@ -1086,18 +1130,21 @@ importers: '@faker-js/faker': specifier: 8.1.0 version: 8.1.0 - '@formily/shared': - specifier: ^2.2.27 - version: 2.3.0 '@nocobase/database': specifier: workspace:* version: link:../database + '@nocobase/schema': + specifier: workspace:* + version: link:../schema '@nocobase/server': specifier: workspace:* version: link:../server '@playwright/test': specifier: ^1.42.1 version: 1.42.1 + '@testing-library/dom': + specifier: ^9.3.3 + version: 9.3.3 '@testing-library/jest-dom': specifier: ^6.4.2 version: 6.4.2(vitest@1.4.0) @@ -1106,7 +1153,7 @@ importers: version: 14.1.2(react-dom@18.2.0)(react@18.2.0) '@testing-library/react-hooks': specifier: ^8.0.1 - version: 8.0.1(@types/react@17.0.73)(react-dom@18.2.0)(react@18.2.0) + version: 8.0.1(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0) '@testing-library/user-event': specifier: ^14.4.3 version: 14.5.1(@testing-library/dom@9.3.3) @@ -1174,8 +1221,8 @@ importers: specifier: ^1.1.0 version: 1.1.0 antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) dayjs: specifier: ^1.11.9 version: 1.11.10 @@ -1201,6 +1248,9 @@ importers: specifier: ^0.11.8 version: 0.11.8 devDependencies: + '@types/lodash': + specifier: 4.17.0 + version: 4.17.0 '@types/node': specifier: ^20.12.2 version: 20.12.2 @@ -1213,6 +1263,9 @@ importers: '@nocobase/database': specifier: workspace:* version: link:../../../core/database + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema '@nocobase/server': specifier: workspace:* version: link:../../../core/server @@ -1224,19 +1277,16 @@ importers: version: link:../../../core/utils devDependencies: '@ant-design/icons': - specifier: 5.x - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ~5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) '@formily/antd-v5': specifier: 1.x - version: 1.1.9(@types/react-dom@17.0.25)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/shared': - specifier: 2.x - version: 2.3.0 + version: 1.1.9(@types/react-dom@18.2.23)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3) + antd: + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 @@ -1270,29 +1320,20 @@ importers: specifier: ^1.11.1 version: 1.18.2(react-dom@18.2.0)(react@18.2.0) '@ant-design/icons': - specifier: 5.x - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ~5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) '@ant-design/pro-layout': specifier: ^7.16.11 - version: 7.17.16(antd@5.12.8)(react-dom@18.2.0)(react@18.2.0) + version: 7.17.16(antd@5.16.0)(react-dom@18.2.0)(react@18.2.0) '@emotion/css': specifier: ^11.11.2 version: 11.11.2 '@formily/antd-v5': specifier: 1.x - version: 1.1.9(@types/react-dom@17.0.25)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/core': - specifier: ^2.2.27 - version: 2.3.0 - '@formily/react': - specifier: ^2.2.27 - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/reactive': - specifier: 2.x - version: 2.3.0 - '@formily/shared': - specifier: ^2.2.27 - version: 2.3.0 + version: 1.1.9(@types/react-dom@18.2.23)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema '@react-pdf/renderer': specifier: ^3.3.2 version: 3.3.8(react@18.2.0) @@ -1300,11 +1341,11 @@ importers: specifier: ^3.7.2 version: 3.7.8(react@18.2.0) antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) antd-style: specifier: 3.4.5 - version: 3.4.5(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react@18.2.0) + version: 3.4.5(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react@18.2.0) classnames: specifier: ^2.3.1 version: 2.5.1 @@ -1342,7 +1383,7 @@ importers: specifier: ^3.1.0 version: 3.1.0(react@18.2.0) react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-error-boundary: specifier: ^4.0.10 @@ -1352,7 +1393,7 @@ importers: version: 11.18.6(i18next@22.5.1)(react-dom@18.2.0)(react@18.2.0) react-pdf: specifier: ^7.5.1 - version: 7.7.1(@types/react@17.0.73)(react-dom@18.2.0)(react@18.2.0) + version: 7.7.1(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0) react-router-dom: specifier: ^6.11.2 version: 6.21.0(react-dom@18.2.0)(react@18.2.0) @@ -1389,12 +1430,12 @@ importers: packages/plugins/@hera/plugin-mobile: dependencies: - '@formily/react': - specifier: ^2.2.27 - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) '@nocobase/client': specifier: workspace:* version: link:../../../core/client + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema '@nocobase/server': specifier: workspace:* version: link:../../../core/server @@ -1455,20 +1496,17 @@ importers: version: link:../../../core/utils devDependencies: '@ant-design/icons': - specifier: ^5.1.4 - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) - '@formily/core': - specifier: ^2.2.27 - version: 2.3.0 - '@formily/react': - specifier: ^2.2.27 - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) + specifier: ^5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema ahooks: specifier: ^3.7.2 version: 3.7.8(react@18.2.0) antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) dayjs: specifier: ^1.11.8 version: 1.11.10 @@ -1491,7 +1529,7 @@ importers: specifier: ^3.1.0 version: 3.1.0(react@18.2.0) react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-router-dom: specifier: ^6.11.2 @@ -1513,20 +1551,14 @@ importers: version: link:../../../core/test devDependencies: '@ant-design/icons': - specifier: ^5.1.4 - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ^5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) '@formily/antd-v5': specifier: 1.x - version: 1.1.9(@types/react-dom@17.0.25)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/core': - specifier: ^2.2.27 - version: 2.3.0 - '@formily/react': - specifier: ^2.2.27 - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/shared': - specifier: ^2.2.27 - version: 2.3.0 + version: 1.1.9(@types/react-dom@18.2.23)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema react-use-websocket: specifier: ^4.8.1 version: 4.8.1(react-dom@18.2.0)(react@18.2.0) @@ -1559,20 +1591,14 @@ importers: version: link:../../../core/utils devDependencies: '@ant-design/icons': - specifier: ^5.1.4 - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ^5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) '@formily/antd-v5': specifier: ^1.1.9 - version: 1.1.9(@types/react-dom@17.0.25)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/core': - specifier: ^2.2.27 - version: 2.3.0 - '@formily/react': - specifier: ^2.2.27 - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/shared': - specifier: ^2.2.27 - version: 2.3.0 + version: 1.1.9(@types/react-dom@18.2.23)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema '@types/jsonwebtoken': specifier: ^8.5.8 version: 8.5.9 @@ -1580,11 +1606,11 @@ importers: specifier: ^3.7.2 version: 3.7.8(react@18.2.0) antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) antd-style: specifier: 3.4.5 - version: 3.4.5(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react@18.2.0) + version: 3.4.5(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react@18.2.0) async-mutex: specifier: ^0.3.2 version: 0.3.2 @@ -1595,10 +1621,10 @@ importers: specifier: 4.17.21 version: 4.17.21 react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-dom: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0(react@18.2.0) react-i18next: specifier: ^11.15.1 @@ -1620,26 +1646,20 @@ importers: version: link:../../../core/utils devDependencies: '@ant-design/icons': - specifier: ^5.1.4 - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ^5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) '@emotion/css': specifier: ^11.7.1 version: 11.11.2 '@formily/antd-v5': specifier: ^1.1.9 - version: 1.1.9(@types/react-dom@17.0.25)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/core': - specifier: ^2.2.27 - version: 2.3.0 - '@formily/react': - specifier: ^2.2.27 - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/shared': - specifier: ^2.2.27 - version: 2.3.0 + version: 1.1.9(@types/react-dom@18.2.23)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) lodash: specifier: 4.17.21 version: 4.17.21 @@ -1665,15 +1685,12 @@ importers: specifier: workspace:* version: link:../../../core/utils devDependencies: - '@formily/react': - specifier: ^2.2.27 - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/shared': - specifier: ^2.2.27 - version: 2.3.0 + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) react-i18next: specifier: ^11.15.1 version: 11.18.6(i18next@22.5.1)(react-dom@18.2.0)(react@18.2.0) @@ -1696,15 +1713,12 @@ importers: '@emotion/css': specifier: ^11.7.1 version: 11.11.2 - '@formily/core': - specifier: ^2.2.27 - version: 2.3.0 - '@formily/react': - specifier: ^2.2.27 - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) lodash: specifier: 4.17.21 version: 4.17.21 @@ -1750,14 +1764,14 @@ importers: version: link:../../../core/utils devDependencies: '@ant-design/icons': - specifier: 5.x - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ~5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) antd-style: specifier: 3.4.5 - version: 3.4.5(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react@18.2.0) + version: 3.4.5(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react@18.2.0) react-i18next: specifier: ^11.15.1 version: 11.18.6(i18next@22.5.1)(react-dom@18.2.0)(react@18.2.0) @@ -1789,18 +1803,15 @@ importers: specifier: workspace:* version: link:../../../core/utils devDependencies: - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/shared': - specifier: 2.x - version: 2.3.0 + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema ahooks: specifier: ^3.7.2 version: 3.7.8(react@18.2.0) antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) dayjs: specifier: ^1.11.8 version: 1.11.10 @@ -1808,10 +1819,10 @@ importers: specifier: ^22.4.9 version: 22.5.1 react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-dom: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0(react@18.2.0) react-i18next: specifier: ^11.15.1 @@ -1836,19 +1847,16 @@ importers: version: link:../../../core/utils devDependencies: '@ant-design/icons': - specifier: 5.x - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ~5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) '@formily/antd-v5': specifier: 1.x - version: 1.1.9(@types/react-dom@17.0.25)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/shared': - specifier: 2.x - version: 2.3.0 + version: 1.1.9(@types/react-dom@18.2.23)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 @@ -1882,28 +1890,25 @@ importers: version: link:../../../core/utils devDependencies: '@ant-design/icons': - specifier: 5.x - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ~5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) '@emotion/css': specifier: ^11.7.1 version: 11.11.2 - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/shared': - specifier: 2.x - version: 2.3.0 + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema '@types/cron': specifier: ^2.0.1 version: 2.4.0 antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) cron: specifier: ^2.3.1 version: 2.4.4 react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 @@ -1934,11 +1939,11 @@ importers: version: link:../../../core/utils devDependencies: '@ant-design/icons': - specifier: ^5.1.4 - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ^5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) '@formily/antd-v5': specifier: ^1.1.9 - version: 1.1.9(@types/react-dom@17.0.25)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) + version: 1.1.9(@types/react-dom@18.2.23)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3) '@hapi/topo': specifier: ^6.0.0 version: 6.0.2 @@ -1948,9 +1953,12 @@ importers: '@types/archiver': specifier: ^5.3.1 version: 5.3.4 + '@types/lodash': + specifier: 4.17.0 + version: 4.17.0 antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) archiver: specifier: ^5.3.1 version: 5.3.2 @@ -1982,7 +1990,7 @@ importers: specifier: ^0.11.8 version: 0.11.8 react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 @@ -2010,26 +2018,20 @@ importers: version: link:../../../core/test devDependencies: '@ant-design/icons': - specifier: 5.x - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ~5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) '@formily/antd-v5': specifier: 1.x - version: 1.1.9(@types/react-dom@17.0.25)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/core': - specifier: 2.x - version: 2.3.0 - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/shared': - specifier: 2.x - version: 2.3.0 + version: 1.1.9(@types/react-dom@18.2.23)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) antd-style: specifier: 3.4.5 - version: 3.4.5(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react@18.2.0) + version: 3.4.5(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react@18.2.0) cron-parser: specifier: 4.4.0 version: 4.4.0 @@ -2040,7 +2042,7 @@ importers: specifier: ^4.17.21 version: 4.17.21 react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-big-calendar: specifier: ^1.8.1 @@ -2050,7 +2052,7 @@ importers: version: 11.18.6(i18next@22.5.1)(react-dom@18.2.0)(react@18.2.0) react-js-cron: specifier: ^3.1.0 - version: 3.2.0(antd@5.12.8)(react-dom@18.2.0)(react@18.2.0) + version: 3.2.0(antd@5.16.0)(react-dom@18.2.0)(react@18.2.0) solarlunar-es: specifier: ^1.0.9 version: 1.0.9 @@ -2083,11 +2085,11 @@ importers: version: link:../../../core/test devDependencies: '@ant-design/icons': - specifier: 5.x - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ~5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) react-i18next: specifier: ^11.15.1 version: 11.18.6(i18next@22.5.1)(react-dom@18.2.0)(react@18.2.0) @@ -2114,23 +2116,17 @@ importers: version: link:../../../core/utils devDependencies: '@ant-design/icons': - specifier: 5.x - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ~5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) '@formily/antd-v5': specifier: 1.x - version: 1.1.9(@types/react-dom@17.0.25)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/core': - specifier: 2.x - version: 2.3.0 - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/shared': - specifier: 2.x - version: 2.3.0 + version: 1.1.9(@types/react-dom@18.2.23)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) json5: specifier: ^2.2.3 version: 2.2.3 @@ -2138,7 +2134,7 @@ importers: specifier: 4.17.21 version: 4.17.21 react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 @@ -2162,12 +2158,9 @@ importers: specifier: workspace:* version: link:../../../core/test devDependencies: - '@formily/core': - specifier: 2.x - version: 2.3.0 - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema '@types/cross-spawn': specifier: ^6.0.2 version: 6.0.6 @@ -2197,8 +2190,8 @@ importers: version: link:../../../core/utils devDependencies: antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) cronstrue: specifier: ^2.11.0 version: 2.47.0 @@ -2236,6 +2229,9 @@ importers: '@hapi/topo': specifier: ^6.0.0 version: 6.0.2 + '@types/lodash': + specifier: 4.17.0 + version: 4.17.0 async-mutex: specifier: ^0.3.2 version: 0.3.2 @@ -2266,6 +2262,9 @@ importers: '@nocobase/logger': specifier: workspace:* version: link:../../../core/logger + '@nocobase/sdk': + specifier: workspace:* + version: link:../../../core/sdk '@nocobase/server': specifier: workspace:* version: link:../../../core/server @@ -2278,18 +2277,15 @@ importers: devDependencies: '@formily/antd-v5': specifier: ^1.1.9 - version: 1.1.9(@types/react-dom@17.0.25)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/shared': - specifier: 2.x - version: 2.3.0 + version: 1.1.9(@types/react-dom@18.2.23)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) lodash: - specifier: 4.x + specifier: ~4.17.21 version: 4.17.21 react-i18next: specifier: ^11.15.1 @@ -2320,8 +2316,8 @@ importers: version: link:../../../core/utils devDependencies: '@ant-design/icons': - specifier: ^5.1.4 - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ^5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) '@dnd-kit/core': specifier: ^5.0.1 version: 5.0.3(react-dom@18.2.0)(react@18.2.0) @@ -2330,28 +2326,19 @@ importers: version: 11.11.2 '@formily/antd-v5': specifier: ^1.1.9 - version: 1.1.9(@types/react-dom@17.0.25)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/core': - specifier: ^2.2.27 - version: 2.3.0 - '@formily/react': - specifier: ^2.2.27 - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/reactive': - specifier: ^2.2.27 - version: 2.3.0 - '@formily/shared': - specifier: ^2.2.27 - version: 2.3.0 + version: 1.1.9(@types/react-dom@18.2.23)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema ahooks: specifier: ^3.7.2 version: 3.7.8(react@18.2.0) antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) antd-style: specifier: 3.4.5 - version: 3.4.5(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react@18.2.0) + version: 3.4.5(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react@18.2.0) classnames: specifier: ^2.3.1 version: 2.5.1 @@ -2393,8 +2380,8 @@ importers: version: link:../../../core/utils devDependencies: '@ant-design/icons': - specifier: 5.x - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ~5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) '@ant-design/plots': specifier: ^2.1.4 version: 2.1.14(lodash-es@4.17.21)(react-dom@18.2.0)(react@18.2.0) @@ -2403,22 +2390,16 @@ importers: version: 11.11.2 '@formily/antd-v5': specifier: 1.x - version: 1.1.9(@types/react-dom@17.0.25)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/core': - specifier: 2.x - version: 2.3.0 - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/shared': - specifier: 2.x - version: 2.3.0 + version: 1.1.9(@types/react-dom@18.2.23)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema ahooks: specifier: ^3.7.2 version: 3.7.8(react@18.2.0) antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) classnames: specifier: ^2.3.1 version: 2.5.1 @@ -2435,7 +2416,7 @@ importers: specifier: ^4.17.21 version: 4.17.21 react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-error-boundary: specifier: ^4.0.10 @@ -2474,9 +2455,9 @@ importers: specifier: workspace:* version: link:../../../core/utils devDependencies: - '@formily/json-schema': - specifier: 2.x - version: 2.3.0(typescript@5.1.3) + '@formily/core': + specifier: 2.2.27 + version: 2.2.27 lodash: specifier: 4.17.21 version: 4.17.21 @@ -2499,14 +2480,14 @@ importers: specifier: workspace:* version: link:../../../core/test devDependencies: - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) '@formulajs/formulajs': specifier: ^4.2.0 version: 4.3.4 + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 @@ -2535,13 +2516,10 @@ importers: devDependencies: '@formily/antd-v5': specifier: 1.x - version: 1.1.9(@types/react-dom@17.0.25)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/shared': - specifier: 2.x - version: 2.3.0 + version: 1.1.9(@types/react-dom@18.2.23)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema '@types/node-xlsx': specifier: ^0.15.1 version: 0.15.3 @@ -2555,7 +2533,7 @@ importers: specifier: ^0.16.1 version: 0.16.2 react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 @@ -2583,26 +2561,20 @@ importers: version: link:../../../core/utils devDependencies: '@ant-design/icons': - specifier: ^5.1.4 - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ^5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) '@aws-sdk/client-s3': specifier: ^3.245.0 version: 3.474.0 '@formily/antd-v5': specifier: 1.x - version: 1.1.9(@types/react-dom@17.0.25)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/core': - specifier: 2.x - version: 2.3.0 - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/shared': - specifier: 2.x - version: 2.3.0 + version: 1.1.9(@types/react-dom@18.2.23)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3) '@koa/multer': specifier: ^3.0.0 version: 3.0.2(multer@1.4.4) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema '@types/koa-multer': specifier: ^1.0.1 version: 1.0.4 @@ -2610,8 +2582,8 @@ importers: specifier: ^1.4.5 version: 1.4.11 antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) cos-nodejs-sdk-v5: specifier: ^2.11.14 version: 2.12.6 @@ -2640,7 +2612,7 @@ importers: specifier: ^3.0.1 version: 3.0.1(@aws-sdk/client-s3@3.474.0) react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 @@ -2672,18 +2644,12 @@ importers: devDependencies: '@formily/antd-v5': specifier: 1.x - version: 1.1.9(@types/react-dom@17.0.25)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/core': - specifier: 2.x - version: 2.3.0 - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/reactive': - specifier: 2.x - version: 2.3.0 + version: 1.1.9(@types/react-dom@18.2.23)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 @@ -2692,8 +2658,8 @@ importers: packages/plugins/@nocobase/plugin-gantt: dependencies: '@ant-design/icons': - specifier: ^5.1.4 - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ^5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) '@ctrl/tinycolor': specifier: ^3.6.0 version: 3.6.1 @@ -2702,16 +2668,13 @@ importers: version: 11.11.2 '@formily/antd-v5': specifier: ^1.1.9 - version: 1.1.9(@types/react-dom@17.0.25)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/react': - specifier: ^2.2.27 - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/shared': - specifier: ^2.2.27 - version: 2.3.0 + version: 1.1.9(@types/react-dom@18.2.23)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3) '@nocobase/client': specifier: workspace:* version: link:../../../core/client + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema '@nocobase/server': specifier: workspace:* version: link:../../../core/server @@ -2722,11 +2685,11 @@ importers: specifier: workspace:* version: link:../../../core/utils antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) antd-style: specifier: 3.4.5 - version: 3.4.5(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react@18.2.0) + version: 3.4.5(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react@18.2.0) lodash: specifier: 4.17.21 version: 4.17.21 @@ -2753,8 +2716,8 @@ importers: version: link:../../../core/utils devDependencies: '@ant-design/icons': - specifier: 5.x - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ~5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) '@antv/x6': specifier: ^2.0.0 version: 2.16.1 @@ -2782,21 +2745,15 @@ importers: '@emotion/css': specifier: ^11.7.1 version: 11.11.2 - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/reactive': - specifier: 2.x - version: 2.3.0 - '@formily/shared': - specifier: 2.x - version: 2.3.0 + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema ahooks: specifier: ^3.7.2 version: 3.7.8(react@18.2.0) antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) dagre: specifier: ^0.8.5 version: 0.8.5 @@ -2804,7 +2761,7 @@ importers: specifier: 4.17.21 version: 4.17.21 react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 @@ -2832,19 +2789,16 @@ importers: version: link:../../../core/test devDependencies: '@ant-design/icons': - specifier: 5.x - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/shared': - specifier: 2.x - version: 2.3.0 + specifier: ~5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 @@ -2875,29 +2829,23 @@ importers: version: link:../../../core/utils devDependencies: '@ant-design/icons': - specifier: 5.x - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ~5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) '@formily/antd-v5': specifier: 1.x - version: 1.1.9(@types/react-dom@17.0.25)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/core': - specifier: 2.x - version: 2.3.0 - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/shared': - specifier: 2.x - version: 2.3.0 + version: 1.1.9(@types/react-dom@18.2.23)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3) '@koa/multer': specifier: ^3.0.2 version: 3.0.2(multer@1.4.4) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema '@types/node-xlsx': specifier: ^0.15.1 version: 0.15.3 antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) file-saver: specifier: ^2.0.5 version: 2.0.5 @@ -2911,10 +2859,10 @@ importers: specifier: ^0.16.1 version: 0.16.2 react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-dom: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0(react@18.2.0) react-i18next: specifier: ^11.15.1 @@ -2936,29 +2884,23 @@ importers: version: link:../../../core/test devDependencies: '@ant-design/icons': - specifier: ^5.1.4 - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ^5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) '@emotion/css': specifier: ^11.7.1 version: 11.11.2 '@formily/antd-v5': specifier: ^1.1.9 - version: 1.1.9(@types/react-dom@17.0.25)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/core': - specifier: ^2.2.27 - version: 2.3.0 - '@formily/react': - specifier: ^2.2.27 - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/shared': - specifier: ^2.2.27 - version: 2.3.0 + version: 1.1.9(@types/react-dom@18.2.23)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) antd-style: specifier: 3.4.5 - version: 3.4.5(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react@18.2.0) + version: 3.4.5(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react@18.2.0) classnames: specifier: ^2.3.1 version: 2.5.1 @@ -3000,20 +2942,17 @@ importers: version: link:../../../core/test devDependencies: '@ant-design/icons': - specifier: ^5.1.4 - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) - '@formily/core': - specifier: ^2.2.27 - version: 2.3.0 - '@formily/react': - specifier: ^2.2.27 - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) + specifier: ^5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema ahooks: specifier: ^3.7.2 version: 3.7.8(react@18.2.0) antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) deepmerge: specifier: ^4.3.1 version: 4.3.1 @@ -3040,8 +2979,8 @@ importers: version: link:../../../core/test devDependencies: '@ant-design/icons': - specifier: ^5.1.4 - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ^5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) '@types/tar-fs': specifier: ^2.0.2 version: 2.0.2 @@ -3049,8 +2988,8 @@ importers: specifier: ^3.7.2 version: 3.7.8(react@18.2.0) antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) react-i18next: specifier: ^11.15.1 version: 11.18.6(i18next@22.5.1)(react-dom@18.2.0)(react@18.2.0) @@ -3086,46 +3025,40 @@ importers: specifier: ^0.0.10 version: 0.0.10 '@ant-design/icons': - specifier: 5.x - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ~5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) '@formily/antd-v5': specifier: 1.x - version: 1.1.9(@types/react-dom@17.0.25)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/core': - specifier: 2.x - version: 2.3.0 - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/shared': - specifier: 2.x - version: 2.3.0 + version: 1.1.9(@types/react-dom@18.2.23)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3) '@googlemaps/js-api-loader': specifier: ^1.16.1 version: 1.16.2 + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema '@types/google.maps': specifier: ^3.53.4 version: 3.54.10 '@types/react': - specifier: ^17.0.0 - version: 17.0.73 + specifier: 18.2.73 + version: 18.2.73 '@types/react-dom': - specifier: ^17.0.0 - version: 17.0.25 + specifier: 18.2.23 + version: 18.2.23 ahooks: specifier: ^3.7.2 version: 3.7.8(react@18.2.0) antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) lodash: specifier: 4.17.21 version: 4.17.21 react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-dom: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0(react@18.2.0) react-i18next: specifier: ^11.15.1 @@ -3149,14 +3082,14 @@ importers: specifier: workspace:* version: link:../../../core/test devDependencies: - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema mathjs: specifier: ^10.6.0 version: 10.6.4 react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 @@ -3181,35 +3114,32 @@ importers: version: link:../../../core/utils devDependencies: '@ant-design/icons': - specifier: 5.x - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ~5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) '@formily/antd-v5': specifier: 1.x - version: 1.1.9(@types/react-dom@17.0.25)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/shared': - specifier: 2.x - version: 2.3.0 + version: 1.1.9(@types/react-dom@18.2.23)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema '@types/react': - specifier: ^17.0.0 - version: 17.0.73 + specifier: 18.2.73 + version: 18.2.73 '@types/react-dom': - specifier: ^17.0.0 - version: 17.0.25 + specifier: 18.2.23 + version: 18.2.23 ahooks: specifier: 3.x version: 3.7.8(react@18.2.0) antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) antd-mobile: specifier: ^5.29.1 version: 5.33.1(react-dom@18.2.0)(react@18.2.0) antd-style: specifier: 3.x - version: 3.6.1(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react@18.2.0) + version: 3.6.1(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react@18.2.0) classnames: specifier: 2.x version: 2.5.1 @@ -3217,10 +3147,10 @@ importers: specifier: 4.17.21 version: 4.17.21 react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-dom: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0(react@18.2.0) react-i18next: specifier: 11.x @@ -3278,18 +3208,15 @@ importers: specifier: workspace:* version: link:../../../core/utils devDependencies: - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/shared': - specifier: 2.x - version: 2.3.0 + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) antd-style: specifier: 3.x - version: 3.6.1(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react@18.2.0) + version: 3.6.1(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react@18.2.0) async-mutex: specifier: ^0.3.2 version: 0.3.2 @@ -3303,7 +3230,7 @@ importers: specifier: ^8.7.3 version: 8.11.3 react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 @@ -3342,17 +3269,17 @@ importers: specifier: workspace:* version: link:../../../core/utils devDependencies: - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) lodash: specifier: 4.17.21 version: 4.17.21 react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 @@ -3414,20 +3341,20 @@ importers: version: link:../../../core/test devDependencies: '@ant-design/icons': - specifier: 5.x - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ~5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) '@formily/antd-v5': specifier: 1.x - version: 1.1.9(@types/react-dom@17.0.25)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) + version: 1.1.9(@types/react-dom@18.2.23)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema ahooks: specifier: ^3.7.2 version: 3.7.8(react@18.2.0) antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) nanoid: specifier: 3.3.4 version: 3.3.4 @@ -3435,7 +3362,7 @@ importers: specifier: ^5.4.2 version: 5.6.1 react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 @@ -3472,19 +3399,19 @@ importers: version: link:../../../core/test devDependencies: '@ant-design/icons': - specifier: 5.x - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) + specifier: ~5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema '@node-saml/node-saml': specifier: ^4.0.2 version: 4.0.5 antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 @@ -3506,16 +3433,16 @@ importers: version: link:../../../core/test devDependencies: '@ant-design/icons': - specifier: 5.x - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) + specifier: ~5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 @@ -3547,16 +3474,13 @@ importers: devDependencies: '@formily/antd-v5': specifier: 1.x - version: 1.1.9(@types/react-dom@17.0.25)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/core': - specifier: 2.x - version: 2.3.0 - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) + version: 1.1.9(@types/react-dom@18.2.23)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) classnames: specifier: ^2.3.1 version: 2.5.1 @@ -3570,14 +3494,14 @@ importers: specifier: 4.17.21 version: 4.17.21 react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 version: 11.18.6(i18next@22.5.1)(react-dom@18.2.0)(react@18.2.0) react-js-cron: specifier: ^3.1.0 - version: 3.2.0(antd@5.12.8)(react-dom@18.2.0)(react@18.2.0) + version: 3.2.0(antd@5.16.0)(react-dom@18.2.0)(react@18.2.0) packages/plugins/@nocobase/plugin-sms-auth: dependencies: @@ -3606,14 +3530,14 @@ importers: specifier: workspace:* version: link:../../../core/test devDependencies: - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 @@ -3638,20 +3562,14 @@ importers: version: link:../../../core/utils devDependencies: '@ant-design/icons': - specifier: 5.x - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) - '@formily/core': - specifier: 2.x - version: 2.3.0 - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/shared': - specifier: 2.x - version: 2.3.0 + specifier: ~5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) lodash: specifier: 4.17.21 version: 4.17.21 @@ -3659,7 +3577,7 @@ importers: specifier: 5.5.5 version: 5.5.5(react-dom@18.2.0)(react@18.2.0) react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 @@ -3705,8 +3623,8 @@ importers: specifier: ^1.11.1 version: 1.18.2(react-dom@18.2.0)(react@18.2.0) '@ant-design/icons': - specifier: 5.x - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ~5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) '@arvinxu/layout-kit': specifier: ^1 version: 1.4.0(@babel/core@7.22.10)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0) @@ -3716,9 +3634,12 @@ importers: '@emotion/css': specifier: ^11.11.2 version: 11.11.2 + '@types/lodash': + specifier: 4.17.0 + version: 4.17.0 antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) classnames: specifier: ^2.3.1 version: 2.5.1 @@ -3729,7 +3650,7 @@ importers: specifier: ^5.32.0 version: 5.38.1(react-dom@18.2.0)(react@18.2.0) react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-colorful: specifier: ^5.5.1 @@ -3802,9 +3723,9 @@ importers: specifier: workspace:* version: link:../../../core/utils devDependencies: - '@formily/json-schema': - specifier: 2.x - version: 2.3.0(typescript@5.1.3) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema lodash: specifier: 4.17.21 version: 4.17.21 @@ -3842,21 +3763,15 @@ importers: specifier: workspace:* version: link:../../../core/utils devDependencies: - '@formily/core': - specifier: ^2.2.27 - version: 2.3.0 - '@formily/react': - specifier: ^2.2.27 - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/shared': - specifier: ^2.2.27 - version: 2.3.0 + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema '@types/jsonwebtoken': specifier: ^8.5.8 version: 8.5.9 antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) jsonwebtoken: specifier: ^8.5.1 version: 8.5.1 @@ -3899,24 +3814,18 @@ importers: version: 1.4.4 '@formily/antd-v5': specifier: 1.x - version: 1.1.9(@types/react-dom@17.0.25)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/core': - specifier: 2.x - version: 2.3.0 - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/shared': - specifier: 2.x - version: 2.3.0 + version: 1.1.9(@types/react-dom@18.2.23)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) dayjs: specifier: ^1.11.8 version: 1.11.10 react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 @@ -3971,26 +3880,20 @@ importers: version: link:../../../core/utils devDependencies: '@ant-design/icons': - specifier: 5.x - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ~5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) '@formily/antd-v5': specifier: 1.x - version: 1.1.9(@types/react-dom@17.0.25)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/core': - specifier: 2.x - version: 2.3.0 - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/shared': - specifier: ^2.2.27 - version: 2.3.0 + version: 1.1.9(@types/react-dom@18.2.23)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema '@types/ejs': specifier: ^3.1.1 version: 3.1.5 antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) axios: specifier: ^1.6.2 version: 1.6.7 @@ -4010,14 +3913,14 @@ importers: specifier: 8.0.5 version: 8.0.5 react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 version: 11.18.6(i18next@22.5.1)(react-dom@18.2.0)(react@18.2.0) react-js-cron: specifier: ^3.1.0 - version: 3.2.0(antd@5.12.8)(react-dom@18.2.0)(react@18.2.0) + version: 3.2.0(antd@5.16.0)(react-dom@18.2.0)(react@18.2.0) react-router-dom: specifier: ^6.11.2 version: 6.21.0(react-dom@18.2.0)(react@18.2.0) @@ -4049,17 +3952,17 @@ importers: specifier: workspace:* version: link:../../../core/test devDependencies: - '@formily/react': - specifier: ^2.2.27 - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) lodash: specifier: 4.17.21 version: 4.17.21 react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 @@ -4089,14 +3992,14 @@ importers: specifier: workspace:* version: link:../../../core/test devDependencies: - '@formily/react': - specifier: ^2.2.27 - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 @@ -4121,10 +4024,10 @@ importers: version: link:../../../core/test devDependencies: antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 @@ -4158,25 +4061,22 @@ importers: version: link:../../../core/utils devDependencies: '@ant-design/icons': - specifier: 5.x - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ~5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) '@formily/antd-v5': specifier: 1.x - version: 1.1.9(@types/react-dom@17.0.25)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/core': - specifier: 2.x - version: 2.3.0 - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) + version: 1.1.9(@types/react-dom@18.2.23)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) lodash: specifier: 4.17.21 version: 4.17.21 react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 @@ -4204,10 +4104,10 @@ importers: version: link:../../../core/test devDependencies: '@ant-design/icons': - specifier: 5.x - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ~5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 @@ -4247,20 +4147,17 @@ importers: version: link:../../../core/utils devDependencies: '@ant-design/icons': - specifier: 5.x - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ~5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) '@formily/antd-v5': specifier: 1.x - version: 1.1.9(@types/react-dom@17.0.25)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/core': - specifier: 2.x - version: 2.3.0 - '@formily/react': - specifier: 2.x - version: 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) + version: 1.1.9(@types/react-dom@18.2.23)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3) + '@nocobase/schema': + specifier: workspace:* + version: link:../../../core/schema antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) dayjs: specifier: ^1.11.8 version: 1.11.10 @@ -4268,7 +4165,7 @@ importers: specifier: 4.17.21 version: 4.17.21 react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 @@ -4296,13 +4193,13 @@ importers: version: link:../../../core/test devDependencies: '@ant-design/icons': - specifier: 5.x - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ~5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 @@ -4328,12 +4225,12 @@ importers: devDependencies: '@formily/antd-v5': specifier: ^1.1.9 - version: 1.1.9(@types/react-dom@17.0.25)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) + version: 1.1.9(@types/react-dom@18.2.23)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3) antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 @@ -4358,10 +4255,10 @@ importers: version: link:../../../core/test devDependencies: antd: - specifier: 5.12.8 - version: 5.12.8(react-dom@18.2.0)(react@18.2.0) + specifier: 5.16.0 + version: 5.16.0(react-dom@18.2.0)(react@18.2.0) react: - specifier: ^18.0.0 + specifier: 18.2.0 version: 18.2.0 react-i18next: specifier: ^11.15.1 @@ -4397,9 +4294,6 @@ importers: packages/presets/nocobase: dependencies: - '@formily/json-schema': - specifier: 2.x - version: 2.3.0(typescript@5.1.3) '@nocobase/client': specifier: workspace:* version: link:../../core/client @@ -4568,6 +4462,9 @@ importers: '@nocobase/plugin-workflow-sql': specifier: workspace:* version: link:../../plugins/@nocobase/plugin-workflow-sql + '@nocobase/schema': + specifier: workspace:* + version: link:../../core/schema '@nocobase/server': specifier: workspace:* version: link:../../core/server @@ -4591,7 +4488,7 @@ packages: /@ahooksjs/use-url-state@3.5.1(react-router@6.21.1)(react@18.2.0): resolution: {integrity: sha512-XTrOLZKOAXahDD1Evg+aSN6qNzoh/FuvRKbUtB/0RhYvz57tyXRPbED0KXK4h2C3ZyHUKBJcVCSDcd6EsTyMyQ==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 react-router: ^6.11.2 dependencies: ahooks: 3.7.8(react@18.2.0) @@ -4744,8 +4641,8 @@ packages: /@ant-design/charts-util@0.0.1-alpha.5(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-EwTUjRPhU2CUyI2e11pAi9aOQg9oEWdFEWxv1f4j+Ta4doYXd1yTl94Zy9JvigiEj4qv8dPGl0PUd3r+qMVrAg==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -4765,32 +4662,52 @@ packages: /@ant-design/cssinjs@1.18.2(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-514V9rjLaFYb3v4s55/8bg2E6fb81b99s3crDZf4nSwtiDLLXs8axnIph+q2TVkY2hbJPZOn/cVsVcnLkzFy7w==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 '@emotion/hash': 0.8.0 '@emotion/unitless': 0.7.5 classnames: 2.5.1 csstype: 3.1.3 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) stylis: 4.3.0 + /@ant-design/cssinjs@1.19.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-AL3qPvvt8nNTGZ0fpSdVwsQ+LfaoZ795xiapByAhVRggJBhBiNTROCG82Gwv5TI0mnmGZOc358o2d44LNxergQ==} + peerDependencies: + react: 18.2.0 + react-dom: 18.2.0 + dependencies: + '@babel/runtime': 7.24.1 + '@emotion/hash': 0.8.0 + '@emotion/unitless': 0.7.5 + classnames: 2.5.1 + csstype: 3.1.3 + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + stylis: 4.3.1 + /@ant-design/icons-svg@4.3.1: resolution: {integrity: sha512-4QBZg8ccyC6LPIRii7A0bZUk3+lEDCLnhB+FVsflGdcWPPmV+j3fire4AwwoqHV/BibgvBmR9ZIo4s867smv+g==} + dev: true - /@ant-design/icons@5.2.6(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-4wn0WShF43TrggskBJPRqCD0fcHbzTYjnaoskdiJrVHg86yxoZ8ZUqsXvyn4WUqehRiFKnaclOhqk9w4Ui2KVw==} + /@ant-design/icons-svg@4.4.2: + resolution: {integrity: sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA==} + + /@ant-design/icons@5.3.6(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-JeWsgNjvkTTC73YDPgWOgdScRku/iHN9JU0qk39OSEmJSCiRghQMLlxGTCY5ovbRRoXjxHXnUKgQEgBDnQfKmA==} engines: {node: '>=8'} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@ant-design/colors': 7.0.2 - '@ant-design/icons-svg': 4.3.1 - '@babel/runtime': 7.24.0 + '@ant-design/icons-svg': 4.4.2 + '@babel/runtime': 7.24.1 classnames: 2.5.1 rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -4800,8 +4717,8 @@ packages: resolution: {integrity: sha512-ZFhvlNUsPcvD8d+nX4bXA9djbEUDVfKm8/xvFplffWT68rWM37d32qI7EghSvLUreszqh60DZAy80wCA08lgoQ==} peerDependencies: lodash-es: ^4.17.21 - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@ant-design/charts-util': 0.0.1-alpha.5(react-dom@18.2.0)(react@18.2.0) '@antv/event-emitter': 0.1.3 @@ -4813,20 +4730,20 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: true - /@ant-design/pro-layout@7.17.16(antd@5.12.8)(react-dom@18.2.0)(react@18.2.0): + /@ant-design/pro-layout@7.17.16(antd@5.16.0)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-nBQbAJEUkGqQNBqT30FcbcNXHepxySj/O7est1+2iXPXeVeyQYLHBJXcdvCrUrMty6ev3loG8K+6L3DXQkJ/5Q==} peerDependencies: - antd: 5.12.8 - react: ^18.0.0 - react-dom: ^18.0.0 + antd: 5.16.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@ant-design/icons': 5.2.6(react-dom@18.2.0)(react@18.2.0) - '@ant-design/pro-provider': 2.13.5(antd@5.12.8)(react-dom@18.2.0)(react@18.2.0) - '@ant-design/pro-utils': 2.15.2(antd@5.12.8)(react-dom@18.2.0)(react@18.2.0) + '@ant-design/icons': 5.3.6(react-dom@18.2.0)(react@18.2.0) + '@ant-design/pro-provider': 2.13.5(antd@5.16.0)(react-dom@18.2.0)(react@18.2.0) + '@ant-design/pro-utils': 2.15.2(antd@5.16.0)(react-dom@18.2.0)(react@18.2.0) '@babel/runtime': 7.24.0 '@umijs/route-utils': 4.0.1 '@umijs/use-params': 1.0.9(react@18.2.0) - antd: 5.12.8(react-dom@18.2.0)(react@18.2.0) + antd: 5.16.0(react-dom@18.2.0)(react@18.2.0) classnames: 2.5.1 lodash.merge: 4.6.2 omit.js: 2.0.2 @@ -4838,33 +4755,33 @@ packages: swr: 2.2.4(react@18.2.0) warning: 4.0.3 - /@ant-design/pro-provider@2.13.5(antd@5.12.8)(react-dom@18.2.0)(react@18.2.0): + /@ant-design/pro-provider@2.13.5(antd@5.16.0)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-ZVmzY2cq4nUvgmAlfgyCAaSZYV2l3n/upIQPXPj8sYcT+N/Pt1CeSVkkgW6By3EqokF6apWdIFU7hZMK2rNhrg==} peerDependencies: - antd: 5.12.8 - react: ^18.0.0 - react-dom: ^18.0.0 + antd: 5.16.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@ant-design/cssinjs': 1.18.2(react-dom@18.2.0)(react@18.2.0) '@babel/runtime': 7.24.0 '@ctrl/tinycolor': 3.6.1 - antd: 5.12.8(react-dom@18.2.0)(react@18.2.0) + antd: 5.16.0(react-dom@18.2.0)(react@18.2.0) rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) swr: 2.2.4(react@18.2.0) - /@ant-design/pro-utils@2.15.2(antd@5.12.8)(react-dom@18.2.0)(react@18.2.0): + /@ant-design/pro-utils@2.15.2(antd@5.16.0)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-kzMT658CGrQqoihKPlZhbnRioovwMhM59vqqVXuT6A+IuyxJhs5pxN73C6sN2+ZoeYCo/Gewnfn9v1/2vHU2Zg==} peerDependencies: - antd: 5.12.8 - react: ^18.0.0 - react-dom: ^18.0.0 + antd: 5.16.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@ant-design/icons': 5.2.6(react-dom@18.2.0)(react@18.2.0) - '@ant-design/pro-provider': 2.13.5(antd@5.12.8)(react-dom@18.2.0)(react@18.2.0) + '@ant-design/icons': 5.3.6(react-dom@18.2.0)(react@18.2.0) + '@ant-design/pro-provider': 2.13.5(antd@5.16.0)(react-dom@18.2.0)(react@18.2.0) '@babel/runtime': 7.24.0 - antd: 5.12.8(react-dom@18.2.0)(react@18.2.0) + antd: 5.16.0(react-dom@18.2.0)(react@18.2.0) classnames: 2.5.1 dayjs: 1.11.10 lodash.merge: 4.6.2 @@ -4874,12 +4791,12 @@ packages: safe-stable-stringify: 2.4.3 swr: 2.2.4(react@18.2.0) - /@ant-design/react-slick@1.0.2(react@18.2.0): - resolution: {integrity: sha512-Wj8onxL/T8KQLFFiCA4t8eIRGpRR+UPgOdac2sYzonv+i0n3kXHmvHLLiOYL655DQx2Umii9Y9nNgL7ssu5haQ==} + /@ant-design/react-slick@1.1.2(react@18.2.0): + resolution: {integrity: sha512-EzlvzE6xQUBrZuuhSAFTdsr4P2bBBHGZwKFemEfq8gIGyIQCxalYfZW/T2ORbtQx5rU69o+WycP3exY/7T1hGA==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 classnames: 2.5.1 json2mq: 0.2.0 react: 18.2.0 @@ -5343,8 +5260,8 @@ packages: resolution: {integrity: sha512-uwehrdNCPkgBpVfsxEQk1M77Q+q9D7+HkqIm4Fm3Oz4kzkKCoc3KoxCIoLimbANAhqAPEJ40sRR0ZY+lzmP7WQ==} peerDependencies: '@antv/x6': ^2.x - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@antv/x6': 2.16.1 react: 18.2.0 @@ -6057,6 +5974,21 @@ packages: eslint: 8.55.0 eslint-visitor-keys: 2.1.0 semver: 6.3.1 + dev: false + + /@babel/eslint-parser@7.22.15(@babel/core@7.23.2)(eslint@8.57.0): + resolution: {integrity: sha512-yc8OOBIQk1EcRrpizuARSQS0TWAcOMpEJ1aafhNznaeYkeL+OhqnDObGFylB8ka8VFF/sZc+S4RzHyO+3LjQxg==} + engines: {node: ^10.13.0 || ^12.13.0 || >=14.0.0} + peerDependencies: + '@babel/core': ^7.11.0 + eslint: ^7.5.0 || ^8.0.0 + dependencies: + '@babel/core': 7.23.2 + '@nicolo-ribaudo/eslint-scope-5-internals': 5.1.1-v1 + eslint: 8.57.0 + eslint-visitor-keys: 2.1.0 + semver: 6.3.1 + dev: true /@babel/generator@7.23.6: resolution: {integrity: sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==} @@ -7232,6 +7164,12 @@ packages: dependencies: regenerator-runtime: 0.14.0 + /@babel/runtime@7.24.1: + resolution: {integrity: sha512-+BIznRzyqBf+2wCTxcKE3wDjfGeCoVE61KSHGpkzqrLi8qxqFwBeUFyId2cxkTmm55fzDGnm0+yCxaxygrLUnQ==} + engines: {node: '>=6.9.0'} + dependencies: + regenerator-runtime: 0.14.1 + /@babel/template@7.22.15: resolution: {integrity: sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==} engines: {node: '>=6.9.0'} @@ -7548,10 +7486,10 @@ packages: '@types/node': 20.12.2 chalk: 4.1.2 cosmiconfig: 7.1.0 - cosmiconfig-typescript-loader: 2.0.2(@types/node@20.12.2)(cosmiconfig@7.1.0)(typescript@4.9.5) + cosmiconfig-typescript-loader: 2.0.2(@types/node@20.12.2)(cosmiconfig@7.1.0)(typescript@5.4.3) lodash: 4.17.21 resolve-from: 5.0.0 - typescript: 4.9.5 + typescript: 5.4.3 transitivePeerDependencies: - '@swc/core' - '@swc/wasm' @@ -7759,6 +7697,14 @@ packages: dependencies: postcss-selector-parser: 6.0.13 + /@csstools/selector-specificity@2.2.0(postcss-selector-parser@6.0.16): + resolution: {integrity: sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==} + engines: {node: ^14 || ^16 || >=18} + peerDependencies: + postcss-selector-parser: ^6.0.10 + dependencies: + postcss-selector-parser: 6.0.16 + /@ctrl/tinycolor@3.6.1: resolution: {integrity: sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA==} engines: {node: '>=10'} @@ -7774,7 +7720,7 @@ packages: /@dnd-kit/accessibility@3.1.0(react@18.2.0): resolution: {integrity: sha512-ea7IkhKvlJUv9iSHJOnxinBcoOI3ppGnnL+VDJ75O45Nss6HtZd8IdN8touXPDtASfeI2T2LImb8VOZcL47wjQ==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: react: 18.2.0 tslib: 2.6.2 @@ -7782,8 +7728,8 @@ packages: /@dnd-kit/core@5.0.3(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-IribcBLsaPqHdYLpc5xG0TqwYIaD+65offdEYxoKh38WDjzRxUjDmrt7hj9oa/ooUKL0epux20u+mBTd92i/zw==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@dnd-kit/accessibility': 3.1.0(react@18.2.0) '@dnd-kit/utilities': 3.2.2(react@18.2.0) @@ -7794,8 +7740,8 @@ packages: /@dnd-kit/core@6.1.0(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-J3cQBClB4TVxwGo3KEjssGEXNJqGVWx17aRTZ1ob0FliR5IjYgTxl5YJbKTzA6IzrtelotH19v6y7uoIRUZPSg==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@dnd-kit/accessibility': 3.1.0(react@18.2.0) '@dnd-kit/utilities': 3.2.2(react@18.2.0) @@ -7807,7 +7753,7 @@ packages: resolution: {integrity: sha512-rbxcsg3HhzlcMHVHWDuh9LCjpOVAgqbV78wLGI8tziXY3+qcMQ61qVXIvNKQFuhj75dSfD+o+PYZQ/NUk2A23A==} peerDependencies: '@dnd-kit/core': ^6.0.6 - react: ^18.0.0 + react: 18.2.0 dependencies: '@dnd-kit/core': 5.0.3(react-dom@18.2.0)(react@18.2.0) '@dnd-kit/utilities': 3.2.2(react@18.2.0) @@ -7819,7 +7765,7 @@ packages: resolution: {integrity: sha512-FGpRHBcflpwWpSP8bMJ4zNcDywDXssZDJBwGYuHd1RqUU/+JX43pEU0u0OHw06LabEZMOLBbyWoIaZJ0abCOEA==} peerDependencies: '@dnd-kit/core': ^5.0.2 - react: ^18.0.0 + react: 18.2.0 dependencies: '@dnd-kit/core': 5.0.3(react-dom@18.2.0)(react@18.2.0) '@dnd-kit/utilities': 3.2.2(react@18.2.0) @@ -7831,7 +7777,7 @@ packages: resolution: {integrity: sha512-wDkBHHf9iCi1veM834Gbk1429bd4lHX4RpAwT0y2cHLf246GAvU2sVw/oxWNpPKQNQRQaeGXhAVgrOl1IT+iyA==} peerDependencies: '@dnd-kit/core': ^6.0.7 - react: ^18.0.0 + react: 18.2.0 dependencies: '@dnd-kit/core': 6.1.0(react-dom@18.2.0)(react@18.2.0) '@dnd-kit/utilities': 3.2.2(react@18.2.0) @@ -7841,7 +7787,7 @@ packages: /@dnd-kit/utilities@3.2.2(react@18.2.0): resolution: {integrity: sha512-+MKAJEOfaBe5SmV6t34p80MMKhjvUz0vRrvVJbPT0WElzaOJ/1xs+D+KDv+tD/NE5ujfrChEcshd4fLn0wpiqg==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: react: 18.2.0 tslib: 2.6.2 @@ -7894,11 +7840,11 @@ packages: /@emotion/memoize@0.8.1: resolution: {integrity: sha512-W2P2c/VRW1/1tLox0mVUalvnWXxavmv/Oum2aPsRcoDJuob75FC3Y8FbpfLwUegRcxINtGUMPq0tFCvYNTBXNA==} - /@emotion/react@11.11.1(@types/react@17.0.73)(react@18.2.0): + /@emotion/react@11.11.1(@types/react@18.2.73)(react@18.2.0): resolution: {integrity: sha512-5mlW1DquU5HaxjLkfkGN1GA/fvVGdyHURRiX/0FHl2cfIfRxSOfmxEH5YS43edp0OldZrZ+dkBKbngxcNCdZvA==} peerDependencies: '@types/react': '*' - react: ^18.0.0 + react: 18.2.0 peerDependenciesMeta: '@types/react': optional: true @@ -7910,7 +7856,7 @@ packages: '@emotion/use-insertion-effect-with-fallbacks': 1.0.1(react@18.2.0) '@emotion/utils': 1.2.1 '@emotion/weak-memoize': 0.3.1 - '@types/react': 17.0.73 + '@types/react': 18.2.73 hoist-non-react-statics: 3.3.2 react: 18.2.0 @@ -7953,7 +7899,7 @@ packages: /@emotion/use-insertion-effect-with-fallbacks@1.0.1(react@18.2.0): resolution: {integrity: sha512-jT/qyKZ9rzLErtrjGgdkMBn2OP8wl0G3sQlBb3YPryvKHsjvINUhVaPFfP+fpBcOkmrVOVEEHQFJ7nbj2TH2gw==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: react: 18.2.0 @@ -7963,6 +7909,15 @@ packages: /@emotion/weak-memoize@0.3.1: resolution: {integrity: sha512-EsBwpc7hBUJWAsNPBmJy4hxWx12v6bshQsldrVmjxJoc3isbxhOrF2IcCpaXxfvq03NwkI7sbsOLXbYuqF/8Ww==} + /@esbuild/aix-ppc64@0.20.2: + resolution: {integrity: sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [aix] + requiresBuild: true + dev: false + optional: true + /@esbuild/android-arm64@0.17.19: resolution: {integrity: sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==} engines: {node: '>=12'} @@ -7987,6 +7942,15 @@ packages: requiresBuild: true optional: true + /@esbuild/android-arm64@0.20.2: + resolution: {integrity: sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: false + optional: true + /@esbuild/android-arm@0.17.19: resolution: {integrity: sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==} engines: {node: '>=12'} @@ -8011,6 +7975,15 @@ packages: requiresBuild: true optional: true + /@esbuild/android-arm@0.20.2: + resolution: {integrity: sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + requiresBuild: true + dev: false + optional: true + /@esbuild/android-x64@0.17.19: resolution: {integrity: sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==} engines: {node: '>=12'} @@ -8035,6 +8008,15 @@ packages: requiresBuild: true optional: true + /@esbuild/android-x64@0.20.2: + resolution: {integrity: sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + requiresBuild: true + dev: false + optional: true + /@esbuild/darwin-arm64@0.17.19: resolution: {integrity: sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==} engines: {node: '>=12'} @@ -8059,6 +8041,15 @@ packages: requiresBuild: true optional: true + /@esbuild/darwin-arm64@0.20.2: + resolution: {integrity: sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: false + optional: true + /@esbuild/darwin-x64@0.17.19: resolution: {integrity: sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==} engines: {node: '>=12'} @@ -8083,6 +8074,15 @@ packages: requiresBuild: true optional: true + /@esbuild/darwin-x64@0.20.2: + resolution: {integrity: sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: false + optional: true + /@esbuild/freebsd-arm64@0.17.19: resolution: {integrity: sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==} engines: {node: '>=12'} @@ -8107,6 +8107,15 @@ packages: requiresBuild: true optional: true + /@esbuild/freebsd-arm64@0.20.2: + resolution: {integrity: sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + requiresBuild: true + dev: false + optional: true + /@esbuild/freebsd-x64@0.17.19: resolution: {integrity: sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==} engines: {node: '>=12'} @@ -8131,6 +8140,15 @@ packages: requiresBuild: true optional: true + /@esbuild/freebsd-x64@0.20.2: + resolution: {integrity: sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + requiresBuild: true + dev: false + optional: true + /@esbuild/linux-arm64@0.17.19: resolution: {integrity: sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==} engines: {node: '>=12'} @@ -8155,6 +8173,15 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-arm64@0.20.2: + resolution: {integrity: sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: false + optional: true + /@esbuild/linux-arm@0.17.19: resolution: {integrity: sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==} engines: {node: '>=12'} @@ -8179,6 +8206,15 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-arm@0.20.2: + resolution: {integrity: sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: false + optional: true + /@esbuild/linux-ia32@0.17.19: resolution: {integrity: sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==} engines: {node: '>=12'} @@ -8203,6 +8239,15 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-ia32@0.20.2: + resolution: {integrity: sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + requiresBuild: true + dev: false + optional: true + /@esbuild/linux-loong64@0.17.19: resolution: {integrity: sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==} engines: {node: '>=12'} @@ -8227,6 +8272,15 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-loong64@0.20.2: + resolution: {integrity: sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true + dev: false + optional: true + /@esbuild/linux-mips64el@0.17.19: resolution: {integrity: sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==} engines: {node: '>=12'} @@ -8251,6 +8305,15 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-mips64el@0.20.2: + resolution: {integrity: sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + requiresBuild: true + dev: false + optional: true + /@esbuild/linux-ppc64@0.17.19: resolution: {integrity: sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==} engines: {node: '>=12'} @@ -8275,6 +8338,15 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-ppc64@0.20.2: + resolution: {integrity: sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + requiresBuild: true + dev: false + optional: true + /@esbuild/linux-riscv64@0.17.19: resolution: {integrity: sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==} engines: {node: '>=12'} @@ -8299,6 +8371,15 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-riscv64@0.20.2: + resolution: {integrity: sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: false + optional: true + /@esbuild/linux-s390x@0.17.19: resolution: {integrity: sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==} engines: {node: '>=12'} @@ -8323,6 +8404,15 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-s390x@0.20.2: + resolution: {integrity: sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true + dev: false + optional: true + /@esbuild/linux-x64@0.17.19: resolution: {integrity: sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==} engines: {node: '>=12'} @@ -8347,6 +8437,15 @@ packages: requiresBuild: true optional: true + /@esbuild/linux-x64@0.20.2: + resolution: {integrity: sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: false + optional: true + /@esbuild/netbsd-x64@0.17.19: resolution: {integrity: sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==} engines: {node: '>=12'} @@ -8371,6 +8470,15 @@ packages: requiresBuild: true optional: true + /@esbuild/netbsd-x64@0.20.2: + resolution: {integrity: sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + requiresBuild: true + dev: false + optional: true + /@esbuild/openbsd-x64@0.17.19: resolution: {integrity: sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==} engines: {node: '>=12'} @@ -8395,6 +8503,15 @@ packages: requiresBuild: true optional: true + /@esbuild/openbsd-x64@0.20.2: + resolution: {integrity: sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + requiresBuild: true + dev: false + optional: true + /@esbuild/sunos-x64@0.17.19: resolution: {integrity: sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==} engines: {node: '>=12'} @@ -8419,6 +8536,15 @@ packages: requiresBuild: true optional: true + /@esbuild/sunos-x64@0.20.2: + resolution: {integrity: sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + requiresBuild: true + dev: false + optional: true + /@esbuild/win32-arm64@0.17.19: resolution: {integrity: sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==} engines: {node: '>=12'} @@ -8443,6 +8569,15 @@ packages: requiresBuild: true optional: true + /@esbuild/win32-arm64@0.20.2: + resolution: {integrity: sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: false + optional: true + /@esbuild/win32-ia32@0.17.19: resolution: {integrity: sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==} engines: {node: '>=12'} @@ -8467,6 +8602,15 @@ packages: requiresBuild: true optional: true + /@esbuild/win32-ia32@0.20.2: + resolution: {integrity: sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: false + optional: true + /@esbuild/win32-x64@0.17.19: resolution: {integrity: sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==} engines: {node: '>=12'} @@ -8491,6 +8635,15 @@ packages: requiresBuild: true optional: true + /@esbuild/win32-x64@0.20.2: + resolution: {integrity: sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: false + optional: true + /@eslint-community/eslint-utils@4.4.0(eslint@8.55.0): resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -8499,6 +8652,17 @@ packages: dependencies: eslint: 8.55.0 eslint-visitor-keys: 3.4.3 + dev: false + + /@eslint-community/eslint-utils@4.4.0(eslint@8.57.0): + resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 + dependencies: + eslint: 8.57.0 + eslint-visitor-keys: 3.4.3 + dev: true /@eslint-community/regexpp@4.10.0: resolution: {integrity: sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==} @@ -8523,6 +8687,12 @@ packages: /@eslint/js@8.55.0: resolution: {integrity: sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dev: false + + /@eslint/js@8.57.0: + resolution: {integrity: sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + dev: true /@faker-js/faker@8.1.0: resolution: {integrity: sha512-38DT60rumHfBYynif3lmtxMqMqmsOQIxQgEuPZxCk2yUYN0eqWpTACgxi0VpidvsJB8CRxCpvP7B3anK85FjtQ==} @@ -8570,29 +8740,29 @@ packages: '@floating-ui/core': 1.5.2 '@floating-ui/utils': 0.1.6 - /@floating-ui/react-dom-interactions@0.3.1(@types/react@17.0.73)(react-dom@18.2.0)(react@18.2.0): + /@floating-ui/react-dom-interactions@0.3.1(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-tP2KEh7EHJr5hokSBHcPGojb+AorDNUf0NYfZGg/M+FsMvCOOsSEeEF0O1NDfETIzDnpbHnCs0DuvCFhSMSStg==} deprecated: Package renamed to @floating-ui/react dependencies: - '@floating-ui/react-dom': 0.6.3(@types/react@17.0.73)(react-dom@18.2.0)(react@18.2.0) + '@floating-ui/react-dom': 0.6.3(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0) aria-hidden: 1.2.3 point-in-polygon: 1.1.0 - use-isomorphic-layout-effect: 1.1.2(@types/react@17.0.73)(react@18.2.0) + use-isomorphic-layout-effect: 1.1.2(@types/react@18.2.73)(react@18.2.0) transitivePeerDependencies: - '@types/react' - react - react-dom - /@floating-ui/react-dom@0.6.3(@types/react@17.0.73)(react-dom@18.2.0)(react@18.2.0): + /@floating-ui/react-dom@0.6.3(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-hC+pS5D6AgS2wWjbmSQ6UR6Kpy+drvWGJIri6e1EDGADTPsCaa4KzCgmCczHrQeInx9tqs81EyDmbKJYY2swKg==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@floating-ui/dom': 0.4.5 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - use-isomorphic-layout-effect: 1.1.2(@types/react@17.0.73)(react@18.2.0) + use-isomorphic-layout-effect: 1.1.2(@types/react@18.2.73)(react@18.2.0) transitivePeerDependencies: - '@types/react' @@ -8649,10 +8819,10 @@ packages: tslib: 2.6.2 dev: true - /@formatjs/intl@2.9.9(typescript@5.1.3): + /@formatjs/intl@2.9.9(typescript@5.4.3): resolution: {integrity: sha512-JI3CNgL2Zdg5lv9ncT2sYKqbAj2RGrCbdzaCckIxMPxn4QuHuOVvYUGmBAXVusBmfG/0sxLmMrnwnBioz+QKdA==} peerDependencies: - typescript: '5' + typescript: 5.4.3 peerDependenciesMeta: typescript: optional: true @@ -8664,34 +8834,34 @@ packages: '@formatjs/intl-listformat': 7.5.3 intl-messageformat: 10.5.8 tslib: 2.6.2 - typescript: 5.1.3 + typescript: 5.4.3 dev: true - /@formily/antd-v5@1.1.9(@types/react-dom@17.0.25)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3): + /@formily/antd-v5@1.1.9(@types/react-dom@18.2.23)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3): resolution: {integrity: sha512-Gw0wx6zERLJS8GvmTizV6UPNyxNrg2svbV1Dr38jwsw+dkEef7ZANNERfEpsl2TvCEDl4W3QVFNPws5woLGl8g==} engines: {npm: '>=3.0.0'} peerDependencies: - '@types/react': ^17.0.0 - '@types/react-dom': ^17.0.0 - antd: 5.12.8 - react: ^18.0.0 - react-dom: ^18.0.0 + '@types/react': 18.2.73 + '@types/react-dom': 18.2.23 + antd: 5.16.0 + react: 18.2.0 + react-dom: 18.2.0 react-is: '>=16.8.0 || >=17.0.0' dependencies: '@ant-design/cssinjs': 1.18.2(react-dom@18.2.0)(react@18.2.0) - '@ant-design/icons': 5.2.6(react-dom@18.2.0)(react@18.2.0) + '@ant-design/icons': 5.3.6(react-dom@18.2.0)(react@18.2.0) '@dnd-kit/core': 6.1.0(react-dom@18.2.0)(react@18.2.0) '@dnd-kit/sortable': 7.0.2(@dnd-kit/core@6.1.0)(react@18.2.0) - '@formily/core': 2.3.0 - '@formily/grid': 2.3.0(typescript@5.1.3) - '@formily/json-schema': 2.2.27(typescript@5.1.3) - '@formily/react': 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3) - '@formily/reactive': 2.3.0 - '@formily/reactive-react': 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0) - '@formily/shared': 2.3.0 - '@types/react': 17.0.73 - '@types/react-dom': 17.0.25 - antd: 5.12.8(react-dom@18.2.0)(react@18.2.0) + '@formily/core': 2.2.27 + '@formily/grid': 2.2.27(typescript@5.4.3) + '@formily/json-schema': 2.2.27(typescript@5.4.3) + '@formily/react': 2.2.27(@types/react-dom@18.2.23)(@types/react@18.2.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3) + '@formily/reactive': 2.2.27 + '@formily/reactive-react': 2.2.27(@types/react-dom@18.2.23)(@types/react@18.2.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0) + '@formily/shared': 2.2.27 + '@types/react': 18.2.73 + '@types/react-dom': 18.2.23 + antd: 5.16.0(react-dom@18.2.0)(react@18.2.0) classnames: 2.5.1 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -8708,62 +8878,39 @@ packages: '@formily/shared': 2.2.27 '@formily/validator': 2.2.27 - /@formily/core@2.3.0: - resolution: {integrity: sha512-kYMvASeycoS7i5L4Huu4iyNYzRJ4vqJ/MMhxdhpn21DgESlPmOhiTJCTMR9UOU3PDH0aN7dmF6zla1W8wojKFg==} - engines: {npm: '>=3.0.0'} - dependencies: - '@formily/reactive': 2.3.0 - '@formily/shared': 2.3.0 - '@formily/validator': 2.3.0 - - /@formily/grid@2.3.0(typescript@5.1.3): - resolution: {integrity: sha512-IkWunF19yG/HDy3qoAdQA2ziBe1CndFX7wsmcxr5mMdGDGcbrBTD9aJb8ALtC+5DXQ2t+slaFrLIQN9jPTPamQ==} + /@formily/grid@2.2.27(typescript@5.4.3): + resolution: {integrity: sha512-6m6+LUxay/O5MPMLPH4+0Pgsvk8IXnMUEaZAk7D2QC7km5No94AcHQFScmqwqRmQ16U3XyD86LvJz3pQUrdfvA==} engines: {npm: '>=3.0.0'} peerDependencies: - typescript: 4.x || 5.x + typescript: 5.4.3 dependencies: - '@formily/reactive': 2.3.0 + '@formily/reactive': 2.2.27 '@juggle/resize-observer': 3.4.0 - typescript: 5.1.3 + typescript: 5.4.3 - /@formily/json-schema@2.2.27(typescript@5.1.3): + /@formily/json-schema@2.2.27(typescript@5.4.3): resolution: {integrity: sha512-YqtpPp9bmXO28iw10ZLT5KCAqipr2SwPrzfskUJ/Oa8O3xZi64+9TMVPylX73cBe49lVaOgFiQPNAljLudeveg==} engines: {npm: '>=3.0.0'} peerDependencies: - typescript: '>4.1.5' + typescript: 5.4.3 dependencies: '@formily/core': 2.2.27 '@formily/reactive': 2.2.27 '@formily/shared': 2.2.27 - typescript: 5.1.3 - - /@formily/json-schema@2.3.0(typescript@5.1.3): - resolution: {integrity: sha512-xtkcBbHikzjRYLwYgaM7vF3fTjHPnAYHRhu6b+cPY8OZQRN7h6SiDKyyD0tgAb3HyDs49RP3wTKhIEH/5Jqn8Q==} - engines: {npm: '>=3.0.0'} - peerDependencies: - typescript: '>4.1.5' - dependencies: - '@formily/core': 2.3.0 - '@formily/reactive': 2.3.0 - '@formily/shared': 2.3.0 - typescript: 5.1.3 + typescript: 5.4.3 /@formily/path@2.2.27: resolution: {integrity: sha512-svpYARx1N72Rzg4l9D10SpDljUjCqkFD3ogbnsLNUxO8Rh2oSmn0dw63VDYOw43RX61qHmD3VYAnGxdCv5HJ8w==} engines: {npm: '>=3.0.0'} - /@formily/path@2.3.0: - resolution: {integrity: sha512-LbSW50ytAH9wPlZc2VkjRjMukoYWiDAII7HfGkSnkCDQYduhWzvbqpkKOd/W8l5VFrLrl2/7yWkfp5cChv0wjA==} - engines: {npm: '>=3.0.0'} - - /@formily/react@2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.1.3): - resolution: {integrity: sha512-bDi2YcRQXad2Qyytg39sP4jn5N0OR2772GszFfcdAiHEJLxYms6/2nw2KiYJx7Ohv4r3T4RhPttwuvkBKWJ1ow==} + /@formily/react@2.2.27(@types/react-dom@18.2.23)(@types/react@18.2.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0)(typescript@5.4.3): + resolution: {integrity: sha512-IVTZ0ILM4TmsydUcj8ZyXKJol1iAlqkWf1TZ+5BeZvmv1ToeluVpkv8/7RoRnr1sNi1K5THwT4AfcQCea0yV2g==} engines: {npm: '>=3.0.0'} peerDependencies: - '@types/react': ^17.0.0 - '@types/react-dom': ^17.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 + '@types/react': 18.2.73 + '@types/react-dom': 18.2.23 + react: 18.2.0 + react-dom: 18.2.0 react-is: '>=16.8.0' peerDependenciesMeta: '@types/react': @@ -8771,14 +8918,14 @@ packages: '@types/react-dom': optional: true dependencies: - '@formily/core': 2.3.0 - '@formily/json-schema': 2.3.0(typescript@5.1.3) - '@formily/reactive': 2.3.0 - '@formily/reactive-react': 2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0) - '@formily/shared': 2.3.0 - '@formily/validator': 2.3.0 - '@types/react': 17.0.73 - '@types/react-dom': 17.0.25 + '@formily/core': 2.2.27 + '@formily/json-schema': 2.2.27(typescript@5.4.3) + '@formily/reactive': 2.2.27 + '@formily/reactive-react': 2.2.27(@types/react-dom@18.2.23)(@types/react@18.2.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0) + '@formily/shared': 2.2.27 + '@formily/validator': 2.2.27 + '@types/react': 18.2.73 + '@types/react-dom': 18.2.23 hoist-non-react-statics: 3.3.2 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -8786,14 +8933,14 @@ packages: transitivePeerDependencies: - typescript - /@formily/reactive-react@2.3.0(@types/react-dom@17.0.25)(@types/react@17.0.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-d4uOF60/wtGsF63IuLTy2XFmL/fK0AMpl4mEyLXMpjdv7nZzSpi78EDwJjgAAySGSGHSHtUVOKCLCj9/0s1vQA==} + /@formily/reactive-react@2.2.27(@types/react-dom@18.2.23)(@types/react@18.2.73)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-LJefK/9g8MorhGexMiVF+FVWyMR/Vc4C63Djrj08XeXtTF0NUNUUKVBT1eZqmtdRHJSyDE7SSgUmpxcXP7QmQQ==} engines: {npm: '>=3.0.0'} peerDependencies: - '@types/react': ^17.0.0 - '@types/react-dom': ^17.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 + '@types/react': 18.2.73 + '@types/react-dom': 18.2.23 + react: 18.2.0 + react-dom: 18.2.0 react-is: '>=16.8.0' peerDependenciesMeta: '@types/react': @@ -8801,9 +8948,9 @@ packages: '@types/react-dom': optional: true dependencies: - '@formily/reactive': 2.3.0 - '@types/react': 17.0.73 - '@types/react-dom': 17.0.25 + '@formily/reactive': 2.2.27 + '@types/react': 18.2.73 + '@types/react-dom': 18.2.23 hoist-non-react-statics: 3.3.2 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -8813,10 +8960,6 @@ packages: resolution: {integrity: sha512-ksdA4uIw3WMo0FmHcGsyqZgPwhujVgtXqxiWPSV+Tc2eEoJrInZhr15Q0IeTQ6glMh8izNsb19YK+PphBHwXGg==} engines: {npm: '>=3.0.0'} - /@formily/reactive@2.3.0: - resolution: {integrity: sha512-8QYApPL/GvATIP/9K3UeICJNuCaLq99NLlNLEuBsE7cIk2hFiFhWP7vnLtWBdorqeQZNYZ6lzSuau2Ndogu+Dw==} - engines: {npm: '>=3.0.0'} - /@formily/shared@2.2.27: resolution: {integrity: sha512-3gMvcx0318VLkIgwdqYhHVE9uU6K5D0MKr75esDRL908jZ1wWy+/Qt/UNmBfdDdCtWBP6F/E/VGSBUBOue7Bqw==} engines: {npm: '>=3.0.0'} @@ -8829,30 +8972,12 @@ packages: pascal-case: 3.1.2 upper-case: 2.0.2 - /@formily/shared@2.3.0: - resolution: {integrity: sha512-sJiMLBmk4JMPI1CxzLawIc+ERTjcnWOm8u4cpmF+3XABdLNU3CxsIRT9CXiJnrS9ZR+OE12AW7cGp6A1hPm7ZA==} - engines: {npm: '>=3.0.0'} - dependencies: - '@formily/path': 2.3.0 - camel-case: 4.1.2 - lower-case: 2.0.2 - no-case: 3.0.4 - param-case: 3.0.4 - pascal-case: 3.1.2 - upper-case: 2.0.2 - /@formily/validator@2.2.27: resolution: {integrity: sha512-RSkNQY/IGtVKTYxqz6/64UO5RPAWBLOtKb2oRTLlWwEAaoMFkkZkdKERzv1z05oMCp53hGt6f9psgfLXaNUmMQ==} engines: {npm: '>=3.0.0'} dependencies: '@formily/shared': 2.2.27 - /@formily/validator@2.3.0: - resolution: {integrity: sha512-uh6rGjEZhCv+asDhkhKHVnN00tIQcb5wVFyAqtaHlUHGh2gBCiv0e3yb9H80UGQx/EiVuklmcVgR96gAMJfmDw==} - engines: {npm: '>=3.0.0'} - dependencies: - '@formily/shared': 2.3.0 - /@formulajs/formulajs@4.2.0: resolution: {integrity: sha512-egxyvwj08iwOznFgxv7dvjgHUC7C8jdtznAs+15uThIti7TwDGhB3wsbJt1dlfhSHKvlRAiW4MDYxNkvgmyjyg==} hasBin: true @@ -8903,6 +9028,18 @@ packages: minimatch: 3.1.2 transitivePeerDependencies: - supports-color + dev: false + + /@humanwhocodes/config-array@0.11.14: + resolution: {integrity: sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==} + engines: {node: '>=10.10.0'} + dependencies: + '@humanwhocodes/object-schema': 2.0.3 + debug: 4.3.4(supports-color@5.5.0) + minimatch: 3.1.2 + transitivePeerDependencies: + - supports-color + dev: true /@humanwhocodes/module-importer@1.0.1: resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==} @@ -8910,6 +9047,11 @@ packages: /@humanwhocodes/object-schema@2.0.1: resolution: {integrity: sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==} + dev: false + + /@humanwhocodes/object-schema@2.0.3: + resolution: {integrity: sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==} + dev: true /@iconify/types@2.0.0: resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==} @@ -9005,20 +9147,42 @@ packages: '@jridgewell/sourcemap-codec': 1.4.15 '@jridgewell/trace-mapping': 0.3.20 + /@jridgewell/gen-mapping@0.3.5: + resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==} + engines: {node: '>=6.0.0'} + dependencies: + '@jridgewell/set-array': 1.2.1 + '@jridgewell/sourcemap-codec': 1.4.15 + '@jridgewell/trace-mapping': 0.3.25 + /@jridgewell/resolve-uri@3.1.1: resolution: {integrity: sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==} engines: {node: '>=6.0.0'} + /@jridgewell/resolve-uri@3.1.2: + resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==} + engines: {node: '>=6.0.0'} + /@jridgewell/set-array@1.1.2: resolution: {integrity: sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==} engines: {node: '>=6.0.0'} + /@jridgewell/set-array@1.2.1: + resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==} + engines: {node: '>=6.0.0'} + /@jridgewell/source-map@0.3.5: resolution: {integrity: sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==} dependencies: '@jridgewell/gen-mapping': 0.3.3 '@jridgewell/trace-mapping': 0.3.20 + /@jridgewell/source-map@0.3.6: + resolution: {integrity: sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==} + dependencies: + '@jridgewell/gen-mapping': 0.3.5 + '@jridgewell/trace-mapping': 0.3.25 + /@jridgewell/sourcemap-codec@1.4.15: resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} @@ -9028,6 +9192,12 @@ packages: '@jridgewell/resolve-uri': 3.1.1 '@jridgewell/sourcemap-codec': 1.4.15 + /@jridgewell/trace-mapping@0.3.25: + resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==} + dependencies: + '@jridgewell/resolve-uri': 3.1.2 + '@jridgewell/sourcemap-codec': 1.4.15 + /@jridgewell/trace-mapping@0.3.9: resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==} dependencies: @@ -9085,9 +9255,9 @@ packages: resolution: {integrity: sha512-ryFAZOX5P2vFkUdzaAtTG88IGnr9qxSdvLRvJySXcUA4B4xVWurUNADu3AnKPksxOZajljqTrDEDcYjeL4lvLw==} engines: {node: '>=8'} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.23.2 hoist-non-react-statics: 3.3.2 react: 18.2.0 react-is: 16.13.1 @@ -9096,7 +9266,7 @@ packages: resolution: {integrity: sha512-LD6OeMv+yGjpYZNjh34yDTCIE1NegqOtJq5gm4wX6op3QL7K5psTVzMjkWzseBoYj0XOD4g+UJVIZTprfoOPGg==} engines: {node: '>=10'} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: react: 18.2.0 dev: true @@ -9815,27 +9985,27 @@ packages: resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==} dev: true - /@rc-component/color-picker@1.5.1(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-onyAFhWKXuG4P162xE+7IgaJkPkwM94XlOYnQuu69XdXWMfxpeFi6tpJBsieIMV7EnyLV5J3lDzdLiFeK0iEBA==} + /@rc-component/color-picker@1.5.3(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-+tGGH3nLmYXTalVe0L8hSZNs73VTP5ueSHwUlDC77KKRaN7G4DS4wcpG5DTDzdcV/Yas+rzA6UGgIyzd8fS4cw==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 '@ctrl/tinycolor': 3.6.1 classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) /@rc-component/context@1.4.0(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-kFcNxg9oLRMoL3qki0OMxK+7g5mypjgaaJp/pkOis/6rVxma9nJBF/8kCIuTYHUQNr0ii7MxqE33wirPZLJQ2w==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + '@babel/runtime': 7.24.1 + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -9849,12 +10019,12 @@ packages: resolution: {integrity: sha512-QjrOsDXQusNwGZPf4/qRQasg7UFEj06XiCJ8iuiq/Io7CrHrgVi6Uuetw60WAMG1799v+aM8kyc+1L/GBbHSlw==} engines: {node: '>=8.x'} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -9862,27 +10032,27 @@ packages: resolution: {integrity: sha512-6f813C0IsasTZms08kfA8kPAGxbbkYToa8ALaiDIGGECU4i9hj8Plgbx0sNJDrey3EtHO30hmdaxtT0138xZcg==} engines: {node: '>=8.x'} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - /@rc-component/tour@1.11.1(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-c9Lw3/oVinj5D64Rsp8aDLOXcgdViE+hq7bj0Qoo8fTuQEh9sSpUw5OZcum943JkjeIE4hLcc5FD4a5ANtMJ4w==} + /@rc-component/tour@1.14.2(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-A75DZ8LVvahBIvxooj3Gvf2sxe+CGOkmzPNX7ek0i0AJHyKZ1HXe5ieIGo3m0FMdZfVOlbCJ952Duq8VKAHk6g==} engines: {node: '>=8.x'} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 '@rc-component/portal': 1.1.2(react-dom@18.2.0)(react@18.2.0) - '@rc-component/trigger': 1.18.2(react-dom@18.2.0)(react@18.2.0) + '@rc-component/trigger': 2.0.0(react-dom@18.2.0)(react@18.2.0) classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -9890,8 +10060,8 @@ packages: resolution: {integrity: sha512-jRLYgFgjLEPq3MvS87fIhcfuywFSRDaDrYw1FLku7Cm4esszvzTbA0JBsyacAyLrK9rF3TiHFcvoEDMzoD3CTA==} engines: {node: '>=8.x'} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@babel/runtime': 7.24.0 '@rc-component/portal': 1.1.2(react-dom@18.2.0)(react@18.2.0) @@ -9901,6 +10071,40 @@ packages: rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) + dev: false + + /@rc-component/trigger@1.18.3(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-Ksr25pXreYe1gX6ayZ1jLrOrl9OAUHUqnuhEx6MeHnNa1zVM5Y2Aj3Q35UrER0ns8D2cJYtmJtVli+i+4eKrvA==} + engines: {node: '>=8.x'} + peerDependencies: + react: 18.2.0 + react-dom: 18.2.0 + dependencies: + '@babel/runtime': 7.24.0 + '@rc-component/portal': 1.1.2(react-dom@18.2.0)(react@18.2.0) + classnames: 2.5.1 + rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) + rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + dev: true + + /@rc-component/trigger@2.0.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-niwKADPdY5dhdIblV6uwSayVivwo2uUISfJqri+/ovYQcH/omxDYBJKo755QKeoIIsWptxnRpgr7reEnNEZGFg==} + engines: {node: '>=8.x'} + peerDependencies: + react: 18.2.0 + react-dom: 18.2.0 + dependencies: + '@babel/runtime': 7.24.1 + '@rc-component/portal': 1.1.2(react-dom@18.2.0)(react@18.2.0) + classnames: 2.5.1 + rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) + rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) /@react-pdf/fns@2.2.1: resolution: {integrity: sha512-s78aDg0vDYaijU5lLOCsUD+qinQbfOvcNeaoX9AiE7+kZzzCo6B/nX+l48cmt9OosJmvZvE9DWR9cLhrhOi2pA==} @@ -9990,7 +10194,7 @@ packages: /@react-pdf/renderer@3.3.8(react@18.2.0): resolution: {integrity: sha512-wJESEZCNNbog4MxDjRgKtgdmyGm+lDce9cMX2THRs1Jltckq3M8N0yt/fkvGyB8nwiDPtEBOsz9JKlw5vLidbw==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: '@babel/runtime': 7.24.0 '@react-pdf/font': 2.4.4 @@ -10038,7 +10242,7 @@ packages: /@react-spring/animated@9.6.1(react@18.2.0): resolution: {integrity: sha512-ls/rJBrAqiAYozjLo5EPPLLOb1LM0lNVQcXODTC1SMtS6DbuBCPaKco5svFUQFMP2dso3O+qcC4k9FsKc0KxMQ==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: '@react-spring/shared': 9.6.1(react@18.2.0) '@react-spring/types': 9.6.1 @@ -10047,7 +10251,7 @@ packages: /@react-spring/core@9.6.1(react@18.2.0): resolution: {integrity: sha512-3HAAinAyCPessyQNNXe5W0OHzRfa8Yo5P748paPcmMowZ/4sMfaZ2ZB6e5x5khQI8NusOHj8nquoutd6FRY5WQ==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: '@react-spring/animated': 9.6.1(react@18.2.0) '@react-spring/rafz': 9.6.1 @@ -10061,7 +10265,7 @@ packages: /@react-spring/shared@9.6.1(react@18.2.0): resolution: {integrity: sha512-PBFBXabxFEuF8enNLkVqMC9h5uLRBo6GQhRMQT/nRTnemVENimgRd+0ZT4yFnAQ0AxWNiJfX3qux+bW2LbG6Bw==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: '@react-spring/rafz': 9.6.1 '@react-spring/types': 9.6.1 @@ -10073,8 +10277,8 @@ packages: /@react-spring/web@9.6.1(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-X2zR6q2Z+FjsWfGAmAXlQaoUHbPmfuCaXpuM6TcwXPpLE1ZD4A1eys/wpXboFQmDkjnrlTmKvpVna1MjWpZ5Hw==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@react-spring/animated': 9.6.1(react@18.2.0) '@react-spring/core': 9.6.1(react@18.2.0) @@ -10083,43 +10287,43 @@ packages: react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - /@reactflow/background@11.3.6(@types/react@17.0.73)(react-dom@18.2.0)(react@18.2.0): + /@reactflow/background@11.3.6(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-06FPlSUOOMALEEs+2PqPAbpqmL7WDjrkbG2UsDr2d6mbcDDhHiV4tu9FYoz44SQvXo7ma9VRotlsaR4OiRcYsg==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@reactflow/core': 11.10.1(@types/react@17.0.73)(react-dom@18.2.0)(react@18.2.0) + '@reactflow/core': 11.10.1(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0) classcat: 5.0.4 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - zustand: 4.4.7(@types/react@17.0.73)(react@18.2.0) + zustand: 4.4.7(@types/react@18.2.73)(react@18.2.0) transitivePeerDependencies: - '@types/react' - immer dev: true - /@reactflow/controls@11.2.6(@types/react@17.0.73)(react-dom@18.2.0)(react@18.2.0): + /@reactflow/controls@11.2.6(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-4QHT92/ACVlZkvV+Hq44bAPV8WbMhkJl+/J0EbXcqQ1+an7cWJsF84eeelJw7R5J76RoaSSpKdsWsL2v7HAVlw==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@reactflow/core': 11.10.1(@types/react@17.0.73)(react-dom@18.2.0)(react@18.2.0) + '@reactflow/core': 11.10.1(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0) classcat: 5.0.4 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - zustand: 4.4.7(@types/react@17.0.73)(react@18.2.0) + zustand: 4.4.7(@types/react@18.2.73)(react@18.2.0) transitivePeerDependencies: - '@types/react' - immer dev: true - /@reactflow/core@11.10.1(@types/react@17.0.73)(react-dom@18.2.0)(react@18.2.0): + /@reactflow/core@11.10.1(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-GIh3usY1W3eVobx//OO9+Cwm+5evQBBdPGxDaeXwm25UqPMWRI240nXQA5F/5gL5Mwpf0DUC7DR2EmrKNQy+Rw==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@types/d3': 7.4.3 '@types/d3-drag': 3.0.7 @@ -10131,19 +10335,19 @@ packages: d3-zoom: 3.0.0 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - zustand: 4.4.7(@types/react@17.0.73)(react@18.2.0) + zustand: 4.4.7(@types/react@18.2.73)(react@18.2.0) transitivePeerDependencies: - '@types/react' - immer dev: true - /@reactflow/minimap@11.7.6(@types/react@17.0.73)(react-dom@18.2.0)(react@18.2.0): + /@reactflow/minimap@11.7.6(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-kJEtyeQkTZYViLGebVWHVUJROMAGcvejvT+iX4DqKnFb5yK8E8LWlXQpRx2FrL9gDy80mJJaciy7IxnnQKE1bg==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@reactflow/core': 11.10.1(@types/react@17.0.73)(react-dom@18.2.0)(react@18.2.0) + '@reactflow/core': 11.10.1(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0) '@types/d3-selection': 3.0.10 '@types/d3-zoom': 3.0.8 classcat: 5.0.4 @@ -10151,41 +10355,41 @@ packages: d3-zoom: 3.0.0 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - zustand: 4.4.7(@types/react@17.0.73)(react@18.2.0) + zustand: 4.4.7(@types/react@18.2.73)(react@18.2.0) transitivePeerDependencies: - '@types/react' - immer dev: true - /@reactflow/node-resizer@2.2.6(@types/react@17.0.73)(react-dom@18.2.0)(react@18.2.0): + /@reactflow/node-resizer@2.2.6(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-1Xb6q97uP7hRBLpog9sRCNfnsHdDgFRGEiU+lQqGgPEAeYwl4nRjWa/sXwH6ajniKxBhGEvrdzOgEFn6CRMcpQ==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@reactflow/core': 11.10.1(@types/react@17.0.73)(react-dom@18.2.0)(react@18.2.0) + '@reactflow/core': 11.10.1(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0) classcat: 5.0.4 d3-drag: 3.0.0 d3-selection: 3.0.0 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - zustand: 4.4.7(@types/react@17.0.73)(react@18.2.0) + zustand: 4.4.7(@types/react@18.2.73)(react@18.2.0) transitivePeerDependencies: - '@types/react' - immer dev: true - /@reactflow/node-toolbar@1.3.6(@types/react@17.0.73)(react-dom@18.2.0)(react@18.2.0): + /@reactflow/node-toolbar@1.3.6(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-JXDEuZ0wKjZ8z7qK2bIst0eZPzNyVEsiHL0e93EyuqT4fA9icoyE0fLq2ryNOOp7MXgId1h7LusnH6ta45F0yQ==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@reactflow/core': 11.10.1(@types/react@17.0.73)(react-dom@18.2.0)(react@18.2.0) + '@reactflow/core': 11.10.1(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0) classcat: 5.0.4 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - zustand: 4.4.7(@types/react@17.0.73)(react@18.2.0) + zustand: 4.4.7(@types/react@18.2.73)(react@18.2.0) transitivePeerDependencies: - '@types/react' - immer @@ -10245,7 +10449,7 @@ packages: /@restart/hooks@0.4.15(react@18.2.0): resolution: {integrity: sha512-cZFXYTxbpzYcieq/mBwSyXgqnGMHoBVh3J7MU0CCoIB4NRZxV9/TuwTBAaLMqpNhC3zTPMCgkQ5Ey07L02Xmcw==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: dequal: 2.0.3 react: 18.2.0 @@ -11149,13 +11353,13 @@ packages: vitest: 1.4.0(@types/node@20.12.2)(jsdom@16.7.0) dev: false - /@testing-library/react-hooks@8.0.1(@types/react@17.0.73)(react-dom@18.2.0)(react@18.2.0): + /@testing-library/react-hooks@8.0.1(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-Aqhl2IVmLt8IovEVarNDFuJDVWVvhnr9/GCU6UUnrYXwgDFF9h2L2o2P9KBni1AST5sT6riAyoukFLyjQUgD/g==} engines: {node: '>=12'} peerDependencies: - '@types/react': ^17.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 + '@types/react': 18.2.73 + react: 18.2.0 + react-dom: 18.2.0 react-test-renderer: ^16.9.0 || ^17.0.0 peerDependenciesMeta: '@types/react': @@ -11166,7 +11370,7 @@ packages: optional: true dependencies: '@babel/runtime': 7.24.0 - '@types/react': 17.0.73 + '@types/react': 18.2.73 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) react-error-boundary: 3.1.4(react@18.2.0) @@ -11176,12 +11380,12 @@ packages: resolution: {integrity: sha512-z4p7DVBTPjKM5qDZ0t5ZjzkpSNb+fZy1u6bzO7kk8oeGagpPCAtgh4cx1syrfp7a+QWkM021jGqjJaxJJnXAZg==} engines: {node: '>=14'} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@babel/runtime': 7.24.0 '@testing-library/dom': 9.3.3 - '@types/react-dom': 17.0.25 + '@types/react-dom': 18.2.23 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -11509,11 +11713,11 @@ packages: /@types/eslint-scope@3.7.7: resolution: {integrity: sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==} dependencies: - '@types/eslint': 8.56.6 + '@types/eslint': 8.56.7 '@types/estree': 1.0.5 - /@types/eslint@8.56.6: - resolution: {integrity: sha512-ymwc+qb1XkjT/gfoQwxIeHZ6ixH23A+tCT2ADSA/DPVKzAjwYkTXBMCQ/f6fe4wEa85Lhp26VPeUxI7wMhAi7A==} + /@types/eslint@8.56.7: + resolution: {integrity: sha512-SjDvI/x3zsZnOkYZ3lCt9lOZWZLB2jIlNKz+LBgCtDurK0JZcwucxYHn1w2BJkD34dgX9Tjnak0txtq4WTggEA==} dependencies: '@types/estree': 1.0.5 '@types/json-schema': 7.0.15 @@ -11609,7 +11813,7 @@ packages: /@types/hoist-non-react-statics@3.3.5: resolution: {integrity: sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==} dependencies: - '@types/react': 17.0.73 + '@types/react': 18.2.73 hoist-non-react-statics: 3.3.2 /@types/html-minifier-terser@6.1.0: @@ -11711,9 +11915,8 @@ packages: resolution: {integrity: sha512-yg6E+u0/+Zjva+buc3EIb+29XEg4wltq7cSmd4Uc2EE/1nUVmxyzpX6gUXD0V8jIrG0r7YeOGVIbYRkxeooCtw==} dev: true - /@types/lodash@4.14.202: - resolution: {integrity: sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ==} - dev: false + /@types/lodash@4.17.0: + resolution: {integrity: sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA==} /@types/luxon@3.3.7: resolution: {integrity: sha512-gKc9P2d4g5uYwmy4s/MO/yOVPmvHyvzka1YH6i5dM03UrFofHSmgc0D0ymbDRStFWHusk6cwwF6nhLm/ckBbbQ==} @@ -11837,27 +12040,26 @@ packages: dependencies: '@types/date-arithmetic': 4.1.4 '@types/prop-types': 15.7.11 - '@types/react': 17.0.73 + '@types/react': 18.2.73 dev: true - /@types/react-dom@17.0.25: - resolution: {integrity: sha512-urx7A7UxkZQmThYA4So0NelOVjx3V4rNFVJwp0WZlbIK5eM4rNJDiN3R/E9ix0MBh6kAEojk/9YL+Te6D9zHNA==} + /@types/react-dom@18.2.23: + resolution: {integrity: sha512-ZQ71wgGOTmDYpnav2knkjr3qXdAFu0vsk8Ci5w3pGAIdj7/kKAyn+VsQDhXsmzzzepAiI9leWMmubXz690AI/A==} dependencies: - '@types/react': 17.0.73 + '@types/react': 18.2.73 /@types/react-redux@7.1.33: resolution: {integrity: sha512-NF8m5AjWCkert+fosDsN3hAlHzpjSiXlVy9EgQEmLoBhaNXbmyeGs/aj5dQzKuF+/q+S7JQagorGDW8pJ28Hmg==} dependencies: '@types/hoist-non-react-statics': 3.3.5 - '@types/react': 17.0.73 + '@types/react': 18.2.73 hoist-non-react-statics: 3.3.2 redux: 4.2.1 - /@types/react@17.0.73: - resolution: {integrity: sha512-6AcjgPIVsXTIsFDgsGW0iQhvg0xb2vt2qAWgXyncnVNRaW9ZXTTwAh7RQoh7PzK1AhjPoGDvUBkdAREih9n5oQ==} + /@types/react@18.2.73: + resolution: {integrity: sha512-XcGdod0Jjv84HOC7N5ziY3x+qL0AfmubvKOZ9hJjJ2yd5EE+KYjWhdOjt387e9HPheHkdggF9atTifMRtyAaRA==} dependencies: '@types/prop-types': 15.7.11 - '@types/scheduler': 0.16.8 csstype: 3.1.3 /@types/readdir-glob@1.1.5: @@ -11877,9 +12079,6 @@ packages: '@types/node': 20.12.2 dev: true - /@types/scheduler@0.16.8: - resolution: {integrity: sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==} - /@types/semver@7.5.6: resolution: {integrity: sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==} @@ -12043,7 +12242,7 @@ packages: dependencies: '@types/yargs-parser': 21.0.3 - /@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@6.14.0)(eslint@8.55.0)(typescript@5.1.3): + /@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@6.14.0)(eslint@8.55.0)(typescript@5.4.3): resolution: {integrity: sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -12055,22 +12254,51 @@ packages: optional: true dependencies: '@eslint-community/regexpp': 4.10.0 - '@typescript-eslint/parser': 6.14.0(eslint@8.55.0)(typescript@5.1.3) + '@typescript-eslint/parser': 6.14.0(eslint@8.55.0)(typescript@5.4.3) '@typescript-eslint/scope-manager': 5.62.0 - '@typescript-eslint/type-utils': 5.62.0(eslint@8.55.0)(typescript@5.1.3) - '@typescript-eslint/utils': 5.62.0(eslint@8.55.0)(typescript@5.1.3) + '@typescript-eslint/type-utils': 5.62.0(eslint@8.55.0)(typescript@5.4.3) + '@typescript-eslint/utils': 5.62.0(eslint@8.55.0)(typescript@5.4.3) debug: 4.3.4(supports-color@5.5.0) eslint: 8.55.0 graphemer: 1.4.0 ignore: 5.3.0 natural-compare-lite: 1.4.0 semver: 7.6.0 - tsutils: 3.21.0(typescript@5.1.3) - typescript: 5.1.3 + tsutils: 3.21.0(typescript@5.4.3) + typescript: 5.4.3 transitivePeerDependencies: - supports-color + dev: false - /@typescript-eslint/eslint-plugin@6.14.0(@typescript-eslint/parser@6.14.0)(eslint@8.55.0)(typescript@5.1.3): + /@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@6.14.0)(eslint@8.57.0)(typescript@5.4.3): + resolution: {integrity: sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + '@typescript-eslint/parser': ^6.2.0 + eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@eslint-community/regexpp': 4.10.0 + '@typescript-eslint/parser': 6.14.0(eslint@8.57.0)(typescript@5.4.3) + '@typescript-eslint/scope-manager': 5.62.0 + '@typescript-eslint/type-utils': 5.62.0(eslint@8.57.0)(typescript@5.4.3) + '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@5.4.3) + debug: 4.3.4(supports-color@5.5.0) + eslint: 8.57.0 + graphemer: 1.4.0 + ignore: 5.3.0 + natural-compare-lite: 1.4.0 + semver: 7.6.0 + tsutils: 3.21.0(typescript@5.4.3) + typescript: 5.4.3 + transitivePeerDependencies: + - supports-color + dev: true + + /@typescript-eslint/eslint-plugin@6.14.0(@typescript-eslint/parser@6.14.0)(eslint@8.55.0)(typescript@5.4.3): resolution: {integrity: sha512-1ZJBykBCXaSHG94vMMKmiHoL0MhNHKSVlcHVYZNw+BKxufhqQVTOawNpwwI1P5nIFZ/4jLVop0mcY6mJJDFNaw==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -12082,10 +12310,10 @@ packages: optional: true dependencies: '@eslint-community/regexpp': 4.10.0 - '@typescript-eslint/parser': 6.14.0(eslint@8.55.0)(typescript@5.1.3) + '@typescript-eslint/parser': 6.14.0(eslint@8.55.0)(typescript@5.4.3) '@typescript-eslint/scope-manager': 6.14.0 - '@typescript-eslint/type-utils': 6.14.0(eslint@8.55.0)(typescript@5.1.3) - '@typescript-eslint/utils': 6.14.0(eslint@8.55.0)(typescript@5.1.3) + '@typescript-eslint/type-utils': 6.14.0(eslint@8.55.0)(typescript@5.4.3) + '@typescript-eslint/utils': 6.14.0(eslint@8.55.0)(typescript@5.4.3) '@typescript-eslint/visitor-keys': 6.14.0 debug: 4.3.4(supports-color@5.5.0) eslint: 8.55.0 @@ -12093,13 +12321,13 @@ packages: ignore: 5.3.0 natural-compare: 1.4.0 semver: 7.5.4 - ts-api-utils: 1.0.3(typescript@5.1.3) - typescript: 5.1.3 + ts-api-utils: 1.0.3(typescript@5.4.3) + typescript: 5.4.3 transitivePeerDependencies: - supports-color dev: false - /@typescript-eslint/parser@6.14.0(eslint@8.55.0)(typescript@5.1.3): + /@typescript-eslint/parser@6.14.0(eslint@8.55.0)(typescript@5.4.3): resolution: {integrity: sha512-QjToC14CKacd4Pa7JK4GeB/vHmWFJckec49FR4hmIRf97+KXole0T97xxu9IFiPxVQ1DBWrQ5wreLwAGwWAVQA==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -12111,13 +12339,35 @@ packages: dependencies: '@typescript-eslint/scope-manager': 6.14.0 '@typescript-eslint/types': 6.14.0 - '@typescript-eslint/typescript-estree': 6.14.0(typescript@5.1.3) + '@typescript-eslint/typescript-estree': 6.14.0(typescript@5.4.3) '@typescript-eslint/visitor-keys': 6.14.0 debug: 4.3.4(supports-color@5.5.0) eslint: 8.55.0 - typescript: 5.1.3 + typescript: 5.4.3 transitivePeerDependencies: - supports-color + dev: false + + /@typescript-eslint/parser@6.14.0(eslint@8.57.0)(typescript@5.4.3): + resolution: {integrity: sha512-QjToC14CKacd4Pa7JK4GeB/vHmWFJckec49FR4hmIRf97+KXole0T97xxu9IFiPxVQ1DBWrQ5wreLwAGwWAVQA==} + engines: {node: ^16.0.0 || >=18.0.0} + peerDependencies: + eslint: ^7.0.0 || ^8.0.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/scope-manager': 6.14.0 + '@typescript-eslint/types': 6.14.0 + '@typescript-eslint/typescript-estree': 6.14.0(typescript@5.4.3) + '@typescript-eslint/visitor-keys': 6.14.0 + debug: 4.3.4(supports-color@5.5.0) + eslint: 8.57.0 + typescript: 5.4.3 + transitivePeerDependencies: + - supports-color + dev: true /@typescript-eslint/scope-manager@5.62.0: resolution: {integrity: sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==} @@ -12133,7 +12383,7 @@ packages: '@typescript-eslint/types': 6.14.0 '@typescript-eslint/visitor-keys': 6.14.0 - /@typescript-eslint/type-utils@5.62.0(eslint@8.55.0)(typescript@5.1.3): + /@typescript-eslint/type-utils@5.62.0(eslint@8.55.0)(typescript@5.4.3): resolution: {integrity: sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -12143,16 +12393,37 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.1.3) - '@typescript-eslint/utils': 5.62.0(eslint@8.55.0)(typescript@5.1.3) + '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.4.3) + '@typescript-eslint/utils': 5.62.0(eslint@8.55.0)(typescript@5.4.3) debug: 4.3.4(supports-color@5.5.0) eslint: 8.55.0 - tsutils: 3.21.0(typescript@5.1.3) - typescript: 5.1.3 + tsutils: 3.21.0(typescript@5.4.3) + typescript: 5.4.3 transitivePeerDependencies: - supports-color + dev: false - /@typescript-eslint/type-utils@6.14.0(eslint@8.55.0)(typescript@5.1.3): + /@typescript-eslint/type-utils@5.62.0(eslint@8.57.0)(typescript@5.4.3): + resolution: {integrity: sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: '*' + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + dependencies: + '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.4.3) + '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@5.4.3) + debug: 4.3.4(supports-color@5.5.0) + eslint: 8.57.0 + tsutils: 3.21.0(typescript@5.4.3) + typescript: 5.4.3 + transitivePeerDependencies: + - supports-color + dev: true + + /@typescript-eslint/type-utils@6.14.0(eslint@8.55.0)(typescript@5.4.3): resolution: {integrity: sha512-x6OC9Q7HfYKqjnuNu5a7kffIYs3No30isapRBJl1iCHLitD8O0lFbRcVGiOcuyN837fqXzPZ1NS10maQzZMKqw==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -12162,12 +12433,12 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 6.14.0(typescript@5.1.3) - '@typescript-eslint/utils': 6.14.0(eslint@8.55.0)(typescript@5.1.3) + '@typescript-eslint/typescript-estree': 6.14.0(typescript@5.4.3) + '@typescript-eslint/utils': 6.14.0(eslint@8.55.0)(typescript@5.4.3) debug: 4.3.4(supports-color@5.5.0) eslint: 8.55.0 - ts-api-utils: 1.0.3(typescript@5.1.3) - typescript: 5.1.3 + ts-api-utils: 1.0.3(typescript@5.4.3) + typescript: 5.4.3 transitivePeerDependencies: - supports-color dev: false @@ -12180,7 +12451,7 @@ packages: resolution: {integrity: sha512-uty9H2K4Xs8E47z3SnXEPRNDfsis8JO27amp2GNCnzGETEW3yTqEIVg5+AI7U276oGF/tw6ZA+UesxeQ104ceA==} engines: {node: ^16.0.0 || >=18.0.0} - /@typescript-eslint/typescript-estree@5.62.0(typescript@5.1.3): + /@typescript-eslint/typescript-estree@5.62.0(typescript@5.4.3): resolution: {integrity: sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -12195,12 +12466,12 @@ packages: globby: 11.1.0 is-glob: 4.0.3 semver: 7.6.0 - tsutils: 3.21.0(typescript@5.1.3) - typescript: 5.1.3 + tsutils: 3.21.0(typescript@5.4.3) + typescript: 5.4.3 transitivePeerDependencies: - supports-color - /@typescript-eslint/typescript-estree@6.14.0(typescript@5.1.3): + /@typescript-eslint/typescript-estree@6.14.0(typescript@5.4.3): resolution: {integrity: sha512-yPkaLwK0yH2mZKFE/bXkPAkkFgOv15GJAUzgUVonAbv0Hr4PK/N2yaA/4XQbTZQdygiDkpt5DkxPELqHguNvyw==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -12215,12 +12486,12 @@ packages: globby: 11.1.0 is-glob: 4.0.3 semver: 7.6.0 - ts-api-utils: 1.0.3(typescript@5.1.3) - typescript: 5.1.3 + ts-api-utils: 1.0.3(typescript@5.4.3) + typescript: 5.4.3 transitivePeerDependencies: - supports-color - /@typescript-eslint/utils@5.62.0(eslint@8.55.0)(typescript@5.1.3): + /@typescript-eslint/utils@5.62.0(eslint@8.55.0)(typescript@5.4.3): resolution: {integrity: sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -12231,15 +12502,36 @@ packages: '@types/semver': 7.5.6 '@typescript-eslint/scope-manager': 5.62.0 '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.1.3) + '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.4.3) eslint: 8.55.0 eslint-scope: 5.1.1 semver: 7.5.4 transitivePeerDependencies: - supports-color - typescript + dev: false - /@typescript-eslint/utils@6.14.0(eslint@8.55.0)(typescript@5.1.3): + /@typescript-eslint/utils@5.62.0(eslint@8.57.0)(typescript@5.4.3): + resolution: {integrity: sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + peerDependencies: + eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + dependencies: + '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) + '@types/json-schema': 7.0.15 + '@types/semver': 7.5.6 + '@typescript-eslint/scope-manager': 5.62.0 + '@typescript-eslint/types': 5.62.0 + '@typescript-eslint/typescript-estree': 5.62.0(typescript@5.4.3) + eslint: 8.57.0 + eslint-scope: 5.1.1 + semver: 7.5.4 + transitivePeerDependencies: + - supports-color + - typescript + dev: true + + /@typescript-eslint/utils@6.14.0(eslint@8.55.0)(typescript@5.4.3): resolution: {integrity: sha512-XwRTnbvRr7Ey9a1NT6jqdKX8y/atWG+8fAIu3z73HSP8h06i3r/ClMhmaF/RGWGW1tHJEwij1uEg2GbEmPYvYg==} engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: @@ -12250,7 +12542,7 @@ packages: '@types/semver': 7.5.6 '@typescript-eslint/scope-manager': 6.14.0 '@typescript-eslint/types': 6.14.0 - '@typescript-eslint/typescript-estree': 6.14.0(typescript@5.1.3) + '@typescript-eslint/typescript-estree': 6.14.0(typescript@5.4.3) eslint: 8.55.0 semver: 7.6.0 transitivePeerDependencies: @@ -12338,7 +12630,7 @@ packages: - supports-color - terser - /@umijs/bundler-webpack@4.0.89(typescript@5.1.3)(webpack@5.91.0): + /@umijs/bundler-webpack@4.0.89(typescript@5.4.3)(webpack@5.91.0): resolution: {integrity: sha512-BfCpmxDIzhRa7wnEAODOj5auHXd/n954qt0QUkUUlGJYa5GrtgRiKsGtnwew+8uVX1vm0y7XDqnCU+trWAq0nQ==} hasBin: true dependencies: @@ -12355,7 +12647,7 @@ packages: cors: 2.8.5 css-loader: 6.7.1(webpack@5.91.0) es5-imcompatible-versions: 0.1.88 - fork-ts-checker-webpack-plugin: 8.0.0(typescript@5.1.3)(webpack@5.91.0) + fork-ts-checker-webpack-plugin: 8.0.0(typescript@5.4.3)(webpack@5.91.0) jest-worker: 29.4.3 lightningcss: 1.22.1 node-libs-browser: 2.2.1 @@ -12492,19 +12784,19 @@ packages: /@umijs/history@5.3.1: resolution: {integrity: sha512-/e0cEGrR2bIWQD7pRl3dl9dcyRGeC9hoW0OCvUTT/hjY0EfUrkd6G8ZanVghPMpDuY5usxq9GVcvrT8KNXLWvA==} dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.23.2 query-string: 6.14.1 - /@umijs/lint@4.0.89(eslint@8.55.0)(stylelint@14.16.1)(typescript@5.1.3): + /@umijs/lint@4.0.89(eslint@8.55.0)(stylelint@14.16.1)(typescript@5.4.3): resolution: {integrity: sha512-z7pSpZoAecTltLwBEiyyzZYY3wPlg7DA5U4llWJbkfz/U0TdKgeDAzH6cq1SpvuRBsLTO3aiD6+6DP0NDuU82g==} dependencies: '@babel/core': 7.23.2 '@babel/eslint-parser': 7.22.15(@babel/core@7.23.2)(eslint@8.55.0) '@stylelint/postcss-css-in-js': 0.38.0(postcss-syntax@0.36.2)(postcss@8.4.35) - '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@6.14.0)(eslint@8.55.0)(typescript@5.1.3) - '@typescript-eslint/parser': 6.14.0(eslint@8.55.0)(typescript@5.1.3) + '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@6.14.0)(eslint@8.55.0)(typescript@5.4.3) + '@typescript-eslint/parser': 6.14.0(eslint@8.55.0)(typescript@5.4.3) '@umijs/babel-preset-umi': 4.0.89 - eslint-plugin-jest: 27.2.3(@typescript-eslint/eslint-plugin@5.62.0)(eslint@8.55.0)(typescript@5.1.3) + eslint-plugin-jest: 27.2.3(@typescript-eslint/eslint-plugin@5.62.0)(eslint@8.55.0)(typescript@5.4.3) eslint-plugin-react: 7.33.2(eslint@8.55.0) eslint-plugin-react-hooks: 4.6.0(eslint@8.55.0) postcss: 8.4.35 @@ -12521,6 +12813,35 @@ packages: - stylelint - supports-color - typescript + dev: false + + /@umijs/lint@4.0.89(eslint@8.57.0)(stylelint@14.16.1)(typescript@5.4.3): + resolution: {integrity: sha512-z7pSpZoAecTltLwBEiyyzZYY3wPlg7DA5U4llWJbkfz/U0TdKgeDAzH6cq1SpvuRBsLTO3aiD6+6DP0NDuU82g==} + dependencies: + '@babel/core': 7.23.2 + '@babel/eslint-parser': 7.22.15(@babel/core@7.23.2)(eslint@8.57.0) + '@stylelint/postcss-css-in-js': 0.38.0(postcss-syntax@0.36.2)(postcss@8.4.35) + '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@6.14.0)(eslint@8.57.0)(typescript@5.4.3) + '@typescript-eslint/parser': 6.14.0(eslint@8.57.0)(typescript@5.4.3) + '@umijs/babel-preset-umi': 4.0.89 + eslint-plugin-jest: 27.2.3(@typescript-eslint/eslint-plugin@5.62.0)(eslint@8.57.0)(typescript@5.4.3) + eslint-plugin-react: 7.33.2(eslint@8.57.0) + eslint-plugin-react-hooks: 4.6.0(eslint@8.57.0) + postcss: 8.4.35 + postcss-syntax: 0.36.2(postcss@8.4.35) + stylelint-config-standard: 25.0.0(stylelint@14.16.1) + transitivePeerDependencies: + - eslint + - jest + - postcss-html + - postcss-jsx + - postcss-less + - postcss-markdown + - postcss-scss + - stylelint + - supports-color + - typescript + dev: true /@umijs/mfsu@4.0.89: resolution: {integrity: sha512-CcpIh88r5JaiYtPkr/Dnch6Pm8e02wHPy7BWW3A6ina0SZS4o5K2BPr/fbWoFRrfWLHQT4BGvwIkz1LavDieZQ==} @@ -12538,7 +12859,7 @@ packages: dependencies: tsx: 4.6.2 - /@umijs/preset-umi@4.0.89(@types/node@20.12.2)(@types/react@17.0.73)(sass@1.69.5)(typescript@5.1.3)(webpack@5.91.0): + /@umijs/preset-umi@4.0.89(@types/node@20.12.2)(@types/react@18.2.73)(sass@1.69.5)(typescript@5.4.3)(webpack@5.91.0): resolution: {integrity: sha512-S0dn0e9C5eD2IX8bGGrNEDd0EaQVGuAwyJw2ruIU/FCO9B1HwdjCdRMuEADCBOuXMzBRt4+wKToFgId5tz3gAA==} dependencies: '@iconify/utils': 2.1.1 @@ -12548,7 +12869,7 @@ packages: '@umijs/bundler-esbuild': 4.0.89 '@umijs/bundler-utils': 4.0.89 '@umijs/bundler-vite': 4.0.89(@types/node@20.12.2)(postcss@8.4.35)(sass@1.69.5) - '@umijs/bundler-webpack': 4.0.89(typescript@5.1.3)(webpack@5.91.0) + '@umijs/bundler-webpack': 4.0.89(typescript@5.4.3)(webpack@5.91.0) '@umijs/core': 4.0.89 '@umijs/did-you-know': 1.0.3 '@umijs/es-module-parser': 0.0.7 @@ -12561,7 +12882,7 @@ packages: '@umijs/utils': 4.0.89 '@umijs/zod2ts': 4.0.89 babel-plugin-dynamic-import-node: 2.3.3 - click-to-react-component: 1.1.0(@types/react@17.0.73)(react-dom@18.2.0)(react@18.2.0) + click-to-react-component: 1.1.0(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0) core-js: 3.28.0 current-script-polyfill: 1.0.0 enhanced-resolve: 5.9.3 @@ -12635,8 +12956,8 @@ packages: /@umijs/renderer-react@4.0.89(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-GDnUHzWzndT52gA8FnsHUOvO6wl6rQfrc9Q5O/cmWXtt1xMMk8H9bwR0rMYWE66ToKPTusP87YwSOtlGRtIPWg==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@babel/runtime': 7.23.2 '@loadable/component': 5.15.2(react@18.2.0) @@ -12681,7 +13002,7 @@ packages: /@umijs/use-params@1.0.9(react@18.2.0): resolution: {integrity: sha512-QlN0RJSBVQBwLRNxbxjQ5qzqYIGn+K7USppMoIOVlf7fxXHsnQZ2bEsa6Pm74bt6DVQxpUE8HqvdStn6Y9FV1w==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: react: 18.2.0 @@ -12709,7 +13030,7 @@ packages: /@use-gesture/react@10.3.0(react@18.2.0): resolution: {integrity: sha512-3zc+Ve99z4usVP6l9knYVbVnZgfqhKah7sIG+PS2w+vpig2v2OLct05vs+ZXMzwxdNCMka8B+8WlOo0z6Pn6DA==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: '@use-gesture/core': 10.3.0 react: 18.2.0 @@ -12911,6 +13232,7 @@ packages: /abbrev@1.1.1: resolution: {integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==} + requiresBuild: true /abs-svg-path@0.1.1: resolution: {integrity: sha512-d8XPSGjfyzlXC3Xx891DJRyZfqk5JU0BJrDQcsWomFIV1/BIzPW5HDH5iDdWpqWaav0YVIEzT1RHTwWr0FFshA==} @@ -13036,9 +13358,9 @@ packages: resolution: {integrity: sha512-e/NMlQWoCjaUtncNFIZk3FG1ImSkV/JhScQSkTqnftakRwdfZWSw6zzoWSG9OMYqPNs2MguDYBUFFC6THelWXA==} engines: {node: '>=8.0.0'} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 '@types/js-cookie': 2.2.7 ahooks-v3-count: 1.0.0 dayjs: 1.11.10 @@ -13277,7 +13599,7 @@ packages: /antd-mobile@5.33.1(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-CVoLhVlqyoUYopv8ZqZW64m+c8Nyp1l+AxGsYV8cFhhshyXO4lNjWuLJ4xwL4+2VDy16TW21gCItboWLqWP7Mg==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: '@floating-ui/dom': 1.5.3 '@rc-component/mini-decimal': 1.1.0 @@ -13300,42 +13622,42 @@ packages: transitivePeerDependencies: - react-dom - /antd-style@3.4.5(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react@18.2.0): + /antd-style@3.4.5(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-6aC4P9XyuVy0O7eZ+HZXd8GbbFX9HgzsXsJ341ihJhgqrfsQZNx8lDQvS2kCV6ao99QqtyTDphK9gWOgV2bHEw==} peerDependencies: - antd: 5.12.8 - react: ^18.0.0 + antd: 5.16.0 + react: 18.2.0 dependencies: '@ant-design/cssinjs': 1.18.2(react-dom@18.2.0)(react@18.2.0) '@babel/runtime': 7.24.0 '@emotion/cache': 11.11.0 '@emotion/css': 11.11.2 - '@emotion/react': 11.11.1(@types/react@17.0.73)(react@18.2.0) + '@emotion/react': 11.11.1(@types/react@18.2.73)(react@18.2.0) '@emotion/serialize': 1.1.2 '@emotion/server': 11.11.0(@emotion/css@11.11.2) '@emotion/utils': 1.2.1 - antd: 5.12.8(react-dom@18.2.0)(react@18.2.0) + antd: 5.16.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 use-merge-value: 1.2.0(react@18.2.0) transitivePeerDependencies: - '@types/react' - react-dom - /antd-style@3.6.1(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react@18.2.0): + /antd-style@3.6.1(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-KpKXiAIV3CAe6TfSh/m6ET2vGuhAof7qfqeaouh5WZ0JDl5jDXXSFPeEfqvZuHAckTl+A0NzArvIHKgKt/NZ9g==} peerDependencies: - antd: 5.12.8 - react: ^18.0.0 + antd: 5.16.0 + react: 18.2.0 dependencies: '@ant-design/cssinjs': 1.18.2(react-dom@18.2.0)(react@18.2.0) '@babel/runtime': 7.24.0 '@emotion/cache': 11.11.0 '@emotion/css': 11.11.2 - '@emotion/react': 11.11.1(@types/react@17.0.73)(react@18.2.0) + '@emotion/react': 11.11.1(@types/react@18.2.73)(react@18.2.0) '@emotion/serialize': 1.1.2 '@emotion/server': 11.11.0(@emotion/css@11.11.2) '@emotion/utils': 1.2.1 - antd: 5.12.8(react-dom@18.2.0)(react@18.2.0) + antd: 5.16.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 use-merge-value: 1.2.0(react@18.2.0) transitivePeerDependencies: @@ -13343,26 +13665,26 @@ packages: - react-dom dev: true - /antd-token-previewer@2.0.5(@babel/core@7.22.10)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0): + /antd-token-previewer@2.0.5(@babel/core@7.22.10)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0): resolution: {integrity: sha512-AIxkqI6nd1VJSNsd77tp1UhBQ0K0YdRcWan6E2aG9RTvapZf8hhwcDL/YVJaPaS/4V3iFeOtD2z12BMseemshg==} peerDependencies: - antd: 5.12.8 - react: ^18.0.0 - react-dom: ^18.0.0 + antd: 5.16.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@ant-design/colors': 6.0.0 '@ant-design/cssinjs': 1.18.2(react-dom@18.2.0)(react@18.2.0) - '@ant-design/icons': 5.2.6(react-dom@18.2.0)(react@18.2.0) + '@ant-design/icons': 5.3.6(react-dom@18.2.0)(react@18.2.0) '@arvinxu/layout-kit': 1.4.0(@babel/core@7.22.10)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0) '@babel/runtime': 7.24.0 '@ctrl/tinycolor': 3.6.1 - antd: 5.12.8(react-dom@18.2.0)(react@18.2.0) + antd: 5.16.0(react-dom@18.2.0)(react@18.2.0) classnames: 2.5.1 rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-colorful: 5.6.1(react-dom@18.2.0)(react@18.2.0) react-dom: 18.2.0(react@18.2.0) - reactflow: 11.10.1(@types/react@17.0.73)(react-dom@18.2.0)(react@18.2.0) + reactflow: 11.10.1(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0) use-debouncy: 4.3.1(react@18.2.0) vanilla-jsoneditor: 0.16.1 transitivePeerDependencies: @@ -13372,57 +13694,58 @@ packages: - react-is dev: true - /antd@5.12.8(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-R2CRcB+aaVZurb3J0IKpBRWq5kW4CLcSqDF58/QBsqYdzK7XjSvM8+eF3rWVRUDbSJfGmyW7I80ywNRYpW1+vA==} + /antd@5.16.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-2JcZSxTcX5J2Faro5PB85ETAP64cuU91pBqQ2NVHWelmhLXvN3q70R5Qht+E9k3WVsVO8ZbqBJciYqj8K/RbZw==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@ant-design/colors': 7.0.2 - '@ant-design/cssinjs': 1.18.2(react-dom@18.2.0)(react@18.2.0) - '@ant-design/icons': 5.2.6(react-dom@18.2.0)(react@18.2.0) - '@ant-design/react-slick': 1.0.2(react@18.2.0) + '@ant-design/cssinjs': 1.19.0(react-dom@18.2.0)(react@18.2.0) + '@ant-design/icons': 5.3.6(react-dom@18.2.0)(react@18.2.0) + '@ant-design/react-slick': 1.1.2(react@18.2.0) + '@babel/runtime': 7.24.1 '@ctrl/tinycolor': 3.6.1 - '@rc-component/color-picker': 1.5.1(react-dom@18.2.0)(react@18.2.0) + '@rc-component/color-picker': 1.5.3(react-dom@18.2.0)(react@18.2.0) '@rc-component/mutate-observer': 1.1.0(react-dom@18.2.0)(react@18.2.0) - '@rc-component/tour': 1.11.1(react-dom@18.2.0)(react@18.2.0) - '@rc-component/trigger': 1.18.2(react-dom@18.2.0)(react@18.2.0) + '@rc-component/tour': 1.14.2(react-dom@18.2.0)(react@18.2.0) + '@rc-component/trigger': 2.0.0(react-dom@18.2.0)(react@18.2.0) classnames: 2.5.1 copy-to-clipboard: 3.3.3 dayjs: 1.11.10 qrcode.react: 3.1.0(react@18.2.0) - rc-cascader: 3.20.0(react-dom@18.2.0)(react@18.2.0) - rc-checkbox: 3.1.0(react-dom@18.2.0)(react@18.2.0) - rc-collapse: 3.7.2(react-dom@18.2.0)(react@18.2.0) - rc-dialog: 9.3.4(react-dom@18.2.0)(react@18.2.0) - rc-drawer: 6.5.2(react-dom@18.2.0)(react@18.2.0) - rc-dropdown: 4.1.0(react-dom@18.2.0)(react@18.2.0) - rc-field-form: 1.41.0(react-dom@18.2.0)(react@18.2.0) - rc-image: 7.5.1(react-dom@18.2.0)(react@18.2.0) - rc-input: 1.3.11(react-dom@18.2.0)(react@18.2.0) - rc-input-number: 8.4.0(react-dom@18.2.0)(react@18.2.0) - rc-mentions: 2.9.1(react-dom@18.2.0)(react@18.2.0) - rc-menu: 9.12.4(react-dom@18.2.0)(react@18.2.0) + rc-cascader: 3.24.0(react-dom@18.2.0)(react@18.2.0) + rc-checkbox: 3.2.0(react-dom@18.2.0)(react@18.2.0) + rc-collapse: 3.7.3(react-dom@18.2.0)(react@18.2.0) + rc-dialog: 9.4.0(react-dom@18.2.0)(react@18.2.0) + rc-drawer: 7.1.0(react-dom@18.2.0)(react@18.2.0) + rc-dropdown: 4.2.0(react-dom@18.2.0)(react@18.2.0) + rc-field-form: 1.44.0(react-dom@18.2.0)(react@18.2.0) + rc-image: 7.6.0(react-dom@18.2.0)(react@18.2.0) + rc-input: 1.4.5(react-dom@18.2.0)(react@18.2.0) + rc-input-number: 9.0.0(react-dom@18.2.0)(react@18.2.0) + rc-mentions: 2.11.1(react-dom@18.2.0)(react@18.2.0) + rc-menu: 9.13.0(react-dom@18.2.0)(react@18.2.0) rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) - rc-notification: 5.3.0(react-dom@18.2.0)(react@18.2.0) + rc-notification: 5.4.0(react-dom@18.2.0)(react@18.2.0) rc-pagination: 4.0.4(react-dom@18.2.0)(react@18.2.0) - rc-picker: 3.14.6(dayjs@1.11.10)(react-dom@18.2.0)(react@18.2.0) - rc-progress: 3.5.1(react-dom@18.2.0)(react@18.2.0) + rc-picker: 4.3.0(dayjs@1.11.10)(react-dom@18.2.0)(react@18.2.0) + rc-progress: 4.0.0(react-dom@18.2.0)(react@18.2.0) rc-rate: 2.12.0(react-dom@18.2.0)(react@18.2.0) rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) - rc-segmented: 2.2.2(react-dom@18.2.0)(react@18.2.0) - rc-select: 14.10.0(react-dom@18.2.0)(react@18.2.0) + rc-segmented: 2.3.0(react-dom@18.2.0)(react@18.2.0) + rc-select: 14.13.0(react-dom@18.2.0)(react@18.2.0) rc-slider: 10.5.0(react-dom@18.2.0)(react@18.2.0) rc-steps: 6.0.1(react-dom@18.2.0)(react@18.2.0) rc-switch: 4.1.0(react-dom@18.2.0)(react@18.2.0) - rc-table: 7.36.1(react-dom@18.2.0)(react@18.2.0) - rc-tabs: 12.14.1(react-dom@18.2.0)(react@18.2.0) - rc-textarea: 1.5.3(react-dom@18.2.0)(react@18.2.0) - rc-tooltip: 6.1.3(react-dom@18.2.0)(react@18.2.0) - rc-tree: 5.8.2(react-dom@18.2.0)(react@18.2.0) - rc-tree-select: 5.15.0(react-dom@18.2.0)(react@18.2.0) + rc-table: 7.45.3(react-dom@18.2.0)(react@18.2.0) + rc-tabs: 14.1.1(react-dom@18.2.0)(react@18.2.0) + rc-textarea: 1.6.3(react-dom@18.2.0)(react@18.2.0) + rc-tooltip: 6.2.0(react-dom@18.2.0)(react@18.2.0) + rc-tree: 5.8.5(react-dom@18.2.0)(react@18.2.0) + rc-tree-select: 5.19.0(react-dom@18.2.0)(react@18.2.0) rc-upload: 4.5.2(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) scroll-into-view-if-needed: 3.1.0 @@ -14431,6 +14754,16 @@ packages: node-releases: 2.0.14 update-browserslist-db: 1.0.13(browserslist@4.22.2) + /browserslist@4.23.0: + resolution: {integrity: sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==} + engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} + hasBin: true + dependencies: + caniuse-lite: 1.0.30001605 + electron-to-chromium: 1.4.723 + node-releases: 2.0.14 + update-browserslist-db: 1.0.13(browserslist@4.23.0) + /bser@2.1.1: resolution: {integrity: sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==} dependencies: @@ -14742,6 +15075,9 @@ packages: /caniuse-lite@1.0.30001570: resolution: {integrity: sha512-+3e0ASu4sw1SWaoCtvPeyXp+5PsjigkSt8OXZbF9StH5pQWbxEjLAZE3n8Aup5udop1uRiKA7a4utUk/uoSpUw==} + /caniuse-lite@1.0.30001605: + resolution: {integrity: sha512-nXwGlFWo34uliI9z3n6Qc0wZaf7zaZWA1CPZ169La5mV3I/gem7bst0vr5XQH5TJXZIMfDeZyOrZnSlVzKxxHQ==} + /canvas@2.11.2: resolution: {integrity: sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==} engines: {node: '>=6'} @@ -15095,12 +15431,12 @@ packages: engines: {node: '>= 10'} dev: true - /click-to-react-component@1.1.0(@types/react@17.0.73)(react-dom@18.2.0)(react@18.2.0): + /click-to-react-component@1.1.0(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-/DjZemufS1BkxyRgZL3r7HXVVOFRWVQi5Xd4EBnjxZMwrHEh0OlUVA2N9CjXkZ0x8zMf8dL1cKnnx+xUWUg4VA==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: - '@floating-ui/react-dom-interactions': 0.3.1(@types/react@17.0.73)(react-dom@18.2.0)(react@18.2.0) + '@floating-ui/react-dom-interactions': 0.3.1(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0) htm: 3.1.1 react: 18.2.0 react-merge-refs: 1.1.0 @@ -15701,18 +16037,18 @@ packages: layout-base: 2.0.1 dev: false - /cosmiconfig-typescript-loader@2.0.2(@types/node@20.12.2)(cosmiconfig@7.1.0)(typescript@4.9.5): + /cosmiconfig-typescript-loader@2.0.2(@types/node@20.12.2)(cosmiconfig@7.1.0)(typescript@5.4.3): resolution: {integrity: sha512-KmE+bMjWMXJbkWCeY4FJX/npHuZPNr9XF9q9CIQ/bpFwi1qHfCmSiKarrCcRa0LO4fWjk93pVoeRtJAkTGcYNw==} engines: {node: '>=12', npm: '>=6'} peerDependencies: '@types/node': ^20.12.2 cosmiconfig: '>=7' - typescript: '>=3' + typescript: 5.4.3 dependencies: '@types/node': 20.12.2 cosmiconfig: 7.1.0 - ts-node: 10.9.2(@types/node@20.12.2)(typescript@4.9.5) - typescript: 4.9.5 + ts-node: 10.9.2(@types/node@20.12.2)(typescript@5.4.3) + typescript: 5.4.3 transitivePeerDependencies: - '@swc/core' - '@swc/wasm' @@ -16429,7 +16765,7 @@ packages: resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==} engines: {node: '>=0.11'} dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 dev: false /dateformat@2.2.0: @@ -17040,22 +17376,22 @@ packages: resolution: {integrity: sha512-a/Y5lf0G6gwsEQ9hop/n03CcjmHsGBk384Cz/AEX6mRYrfSpUx/lQvP9HLoXkCzScl9PL1sSmLPnMkgaXDCZLA==} dev: true - /dumi-theme-nocobase@0.2.21(@babel/core@7.22.10)(@types/react@17.0.73)(dumi@2.2.16)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0): + /dumi-theme-nocobase@0.2.21(@babel/core@7.22.10)(@types/react@18.2.73)(dumi@2.2.16)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0): resolution: {integrity: sha512-SEAE25VQOaYbY+maD5XEdDUqCQojqbfZYKkl0qVKCWHjTeQZHqptqxD/yi8KtypBJ7B+tdNKljppt0fSm/vJHw==} peerDependencies: dumi: ^2.2.0 - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@ant-design/icons': 5.2.6(react-dom@18.2.0)(react@18.2.0) + '@ant-design/icons': 5.3.6(react-dom@18.2.0)(react@18.2.0) '@babel/runtime': 7.24.0 '@ctrl/tinycolor': 3.6.1 - '@emotion/react': 11.11.1(@types/react@17.0.73)(react@18.2.0) - antd: 5.12.8(react-dom@18.2.0)(react@18.2.0) - antd-token-previewer: 2.0.5(@babel/core@7.22.10)(@types/react@17.0.73)(antd@5.12.8)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0) + '@emotion/react': 11.11.1(@types/react@18.2.73)(react@18.2.0) + antd: 5.16.0(react-dom@18.2.0)(react@18.2.0) + antd-token-previewer: 2.0.5(@babel/core@7.22.10)(@types/react@18.2.73)(antd@5.16.0)(react-dom@18.2.0)(react-is@18.2.0)(react@18.2.0) classnames: 2.5.1 dayjs: 1.11.10 - dumi: 2.2.16(@babel/core@7.22.10)(@types/node@20.12.2)(@types/react@17.0.73)(eslint@8.55.0)(prettier@3.2.5)(react-dom@18.2.0)(react@18.2.0)(stylelint@14.16.1)(typescript@5.1.3)(webpack@5.91.0) + dumi: 2.2.16(@babel/core@7.22.10)(@types/node@20.12.2)(@types/react@18.2.73)(eslint@8.57.0)(prettier@3.2.5)(react-dom@18.2.0)(react@18.2.0)(stylelint@14.16.1)(typescript@5.4.3)(webpack@5.91.0) rc-drawer: 6.5.2(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -17069,12 +17405,12 @@ packages: - react-is dev: true - /dumi@2.2.16(@babel/core@7.22.10)(@types/node@20.12.2)(@types/react@17.0.73)(eslint@8.55.0)(prettier@3.2.5)(react-dom@18.2.0)(react@18.2.0)(stylelint@14.16.1)(typescript@5.1.3)(webpack@5.91.0): + /dumi@2.2.16(@babel/core@7.22.10)(@types/node@20.12.2)(@types/react@18.2.73)(eslint@8.57.0)(prettier@3.2.5)(react-dom@18.2.0)(react@18.2.0)(stylelint@14.16.1)(typescript@5.4.3)(webpack@5.91.0): resolution: {integrity: sha512-r2x/CY0fR8/YZOwEnG4JsLEpn8jOg94Qyd1u+7pRD9SCx7dF9It+GwkGbdNEsyenGsO/ZU9wD+Kz7KO+HU7/EA==} hasBin: true peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@ant-design/icons-svg': 4.3.1 '@makotot/ghostui': 2.0.0(react@18.2.0) @@ -17122,7 +17458,7 @@ packages: react-copy-to-clipboard: 5.1.0(react@18.2.0) react-dom: 18.2.0(react@18.2.0) react-error-boundary: 4.0.11(react@18.2.0) - react-intl: 6.5.5(react@18.2.0)(typescript@5.1.3) + react-intl: 6.5.5(react@18.2.0)(typescript@5.4.3) rehype-autolink-headings: 6.1.1 rehype-remove-comments: 5.0.0 rehype-stringify: 9.0.4 @@ -17133,7 +17469,7 @@ packages: remark-rehype: 10.1.0 sass: 1.69.5 sitemap: 7.1.1 - umi: 4.0.89(@babel/core@7.22.10)(@types/node@20.12.2)(@types/react@17.0.73)(eslint@8.55.0)(prettier@3.2.5)(react-dom@18.2.0)(react@18.2.0)(sass@1.69.5)(stylelint@14.16.1)(typescript@5.1.3)(webpack@5.91.0) + umi: 4.0.89(@babel/core@7.22.10)(@types/node@20.12.2)(@types/react@18.2.73)(eslint@8.57.0)(prettier@3.2.5)(react-dom@18.2.0)(react@18.2.0)(sass@1.69.5)(stylelint@14.16.1)(typescript@5.4.3)(webpack@5.91.0) unified: 10.1.2 unist-util-visit: 4.1.2 unist-util-visit-parents: 5.1.3 @@ -17238,6 +17574,9 @@ packages: /electron-to-chromium@1.4.613: resolution: {integrity: sha512-r4x5+FowKG6q+/Wj0W9nidx7QO31BJwmR2uEo+Qh3YLGQ8SbBAFuDFpTxzly/I2gsbrFwBuIjrMp423L3O5U3w==} + /electron-to-chromium@1.4.723: + resolution: {integrity: sha512-rxFVtrMGMFROr4qqU6n95rUi9IlfIm+lIAt+hOToy/9r6CDv0XiEcQdC3VP71y1pE5CFTzKV0RvxOGYCPWWHPw==} + /elkjs@0.8.2: resolution: {integrity: sha512-L6uRgvZTH+4OF5NE/MBbzQx/WYpru1xCBE9respNj6qznEewGUIfhzmm7horWWxbNO2M0WckQypGctR8lH79xQ==} dev: false @@ -17545,13 +17884,13 @@ packages: es6-symbol: 3.1.3 dev: false - /esbuild-register@3.5.0(esbuild@0.19.9): + /esbuild-register@3.5.0(esbuild@0.20.2): resolution: {integrity: sha512-+4G/XmakeBAsvJuDugJvtyF1x+XJT4FMocynNpxrvEBViirpfUn2PgNpCHedfWhF4WokNsO/OvMKrmJOIJsI5A==} peerDependencies: esbuild: '>=0.12 <1' dependencies: debug: 4.3.4(supports-color@5.5.0) - esbuild: 0.19.9 + esbuild: 0.20.2 transitivePeerDependencies: - supports-color dev: false @@ -17649,6 +17988,37 @@ packages: '@esbuild/win32-ia32': 0.19.9 '@esbuild/win32-x64': 0.19.9 + /esbuild@0.20.2: + resolution: {integrity: sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==} + engines: {node: '>=12'} + hasBin: true + requiresBuild: true + optionalDependencies: + '@esbuild/aix-ppc64': 0.20.2 + '@esbuild/android-arm': 0.20.2 + '@esbuild/android-arm64': 0.20.2 + '@esbuild/android-x64': 0.20.2 + '@esbuild/darwin-arm64': 0.20.2 + '@esbuild/darwin-x64': 0.20.2 + '@esbuild/freebsd-arm64': 0.20.2 + '@esbuild/freebsd-x64': 0.20.2 + '@esbuild/linux-arm': 0.20.2 + '@esbuild/linux-arm64': 0.20.2 + '@esbuild/linux-ia32': 0.20.2 + '@esbuild/linux-loong64': 0.20.2 + '@esbuild/linux-mips64el': 0.20.2 + '@esbuild/linux-ppc64': 0.20.2 + '@esbuild/linux-riscv64': 0.20.2 + '@esbuild/linux-s390x': 0.20.2 + '@esbuild/linux-x64': 0.20.2 + '@esbuild/netbsd-x64': 0.20.2 + '@esbuild/openbsd-x64': 0.20.2 + '@esbuild/sunos-x64': 0.20.2 + '@esbuild/win32-arm64': 0.20.2 + '@esbuild/win32-ia32': 0.20.2 + '@esbuild/win32-x64': 0.20.2 + dev: false + /escalade@3.1.1: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} engines: {node: '>=6'} @@ -17723,7 +18093,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 6.14.0(eslint@8.55.0)(typescript@5.1.3) + '@typescript-eslint/parser': 6.14.0(eslint@8.55.0)(typescript@5.4.3) debug: 3.2.7 eslint: 8.55.0 eslint-import-resolver-node: 0.3.9 @@ -17752,7 +18122,7 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 6.14.0(eslint@8.55.0)(typescript@5.1.3) + '@typescript-eslint/parser': 6.14.0(eslint@8.55.0)(typescript@5.4.3) array-includes: 3.1.7 array.prototype.findlastindex: 1.2.3 array.prototype.flat: 1.3.2 @@ -17777,7 +18147,7 @@ packages: - supports-color dev: false - /eslint-plugin-jest-dom@5.1.0(eslint@8.55.0): + /eslint-plugin-jest-dom@5.1.0(eslint@8.57.0): resolution: {integrity: sha512-JIXZp+E/h/aGlP/rQc4tuOejiHlZXg65qw8JAJMIJA5VsdjOkss/SYcRSqBrQuEOytEM8JvngUjcz31d1RrCrA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0, npm: '>=6', yarn: '>=1'} peerDependencies: @@ -17788,11 +18158,11 @@ packages: optional: true dependencies: '@babel/runtime': 7.24.0 - eslint: 8.55.0 + eslint: 8.57.0 requireindex: 1.2.0 dev: true - /eslint-plugin-jest@27.2.3(@typescript-eslint/eslint-plugin@5.62.0)(eslint@8.55.0)(typescript@5.1.3): + /eslint-plugin-jest@27.2.3(@typescript-eslint/eslint-plugin@5.62.0)(eslint@8.55.0)(typescript@5.4.3): resolution: {integrity: sha512-sRLlSCpICzWuje66Gl9zvdF6mwD5X86I4u55hJyFBsxYOsBCmT5+kSUjf+fkFWVMMgpzNEupjW8WzUqi83hJAQ==} engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} peerDependencies: @@ -17805,12 +18175,34 @@ packages: jest: optional: true dependencies: - '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@6.14.0)(eslint@8.55.0)(typescript@5.1.3) - '@typescript-eslint/utils': 5.62.0(eslint@8.55.0)(typescript@5.1.3) + '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@6.14.0)(eslint@8.55.0)(typescript@5.4.3) + '@typescript-eslint/utils': 5.62.0(eslint@8.55.0)(typescript@5.4.3) eslint: 8.55.0 transitivePeerDependencies: - supports-color - typescript + dev: false + + /eslint-plugin-jest@27.2.3(@typescript-eslint/eslint-plugin@5.62.0)(eslint@8.57.0)(typescript@5.4.3): + resolution: {integrity: sha512-sRLlSCpICzWuje66Gl9zvdF6mwD5X86I4u55hJyFBsxYOsBCmT5+kSUjf+fkFWVMMgpzNEupjW8WzUqi83hJAQ==} + engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0} + peerDependencies: + '@typescript-eslint/eslint-plugin': ^5.0.0 || ^6.0.0 + eslint: ^7.0.0 || ^8.0.0 + jest: '*' + peerDependenciesMeta: + '@typescript-eslint/eslint-plugin': + optional: true + jest: + optional: true + dependencies: + '@typescript-eslint/eslint-plugin': 5.62.0(@typescript-eslint/parser@6.14.0)(eslint@8.57.0)(typescript@5.4.3) + '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@5.4.3) + eslint: 8.57.0 + transitivePeerDependencies: + - supports-color + - typescript + dev: true /eslint-plugin-markdown@3.0.1(eslint@8.55.0): resolution: {integrity: sha512-8rqoc148DWdGdmYF6WSQFT3uQ6PO7zXYgeBpHAOAakX/zpq+NvFYbDA/H7PYzHajwtmaOzAwfxyl++x0g1/N9A==} @@ -17876,6 +18268,16 @@ packages: eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 dependencies: eslint: 8.55.0 + dev: false + + /eslint-plugin-react-hooks@4.6.0(eslint@8.57.0): + resolution: {integrity: sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==} + engines: {node: '>=10'} + peerDependencies: + eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 + dependencies: + eslint: 8.57.0 + dev: true /eslint-plugin-react@7.33.2(eslint@8.55.0): resolution: {integrity: sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==} @@ -17900,15 +18302,41 @@ packages: resolve: 2.0.0-next.5 semver: 6.3.1 string.prototype.matchall: 4.0.10 + dev: false - /eslint-plugin-testing-library@5.11.1(eslint@8.55.0)(typescript@5.1.3): + /eslint-plugin-react@7.33.2(eslint@8.57.0): + resolution: {integrity: sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==} + engines: {node: '>=4'} + peerDependencies: + eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 + dependencies: + array-includes: 3.1.7 + array.prototype.flatmap: 1.3.2 + array.prototype.tosorted: 1.1.2 + doctrine: 2.1.0 + es-iterator-helpers: 1.0.15 + eslint: 8.57.0 + estraverse: 5.3.0 + jsx-ast-utils: 3.3.5 + minimatch: 3.1.2 + object.entries: 1.1.7 + object.fromentries: 2.0.7 + object.hasown: 1.1.3 + object.values: 1.1.7 + prop-types: 15.8.1 + resolve: 2.0.0-next.5 + semver: 6.3.1 + string.prototype.matchall: 4.0.10 + dev: true + + /eslint-plugin-testing-library@5.11.1(eslint@8.57.0)(typescript@5.4.3): resolution: {integrity: sha512-5eX9e1Kc2PqVRed3taaLnAAqPZGEX75C+M/rXzUAI3wIg/ZxzUm1OVAwfe/O+vE+6YXOLetSe9g5GKD2ecXipw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0, npm: '>=6'} peerDependencies: eslint: ^7.5.0 || ^8.0.0 dependencies: - '@typescript-eslint/utils': 5.62.0(eslint@8.55.0)(typescript@5.1.3) - eslint: 8.55.0 + '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@5.4.3) + eslint: 8.57.0 transitivePeerDependencies: - supports-color - typescript @@ -17993,6 +18421,54 @@ packages: text-table: 0.2.0 transitivePeerDependencies: - supports-color + dev: false + + /eslint@8.57.0: + resolution: {integrity: sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==} + engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + hasBin: true + dependencies: + '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.0) + '@eslint-community/regexpp': 4.10.0 + '@eslint/eslintrc': 2.1.4 + '@eslint/js': 8.57.0 + '@humanwhocodes/config-array': 0.11.14 + '@humanwhocodes/module-importer': 1.0.1 + '@nodelib/fs.walk': 1.2.8 + '@ungap/structured-clone': 1.2.0 + ajv: 6.12.6 + chalk: 4.1.2 + cross-spawn: 7.0.3 + debug: 4.3.4(supports-color@5.5.0) + doctrine: 3.0.0 + escape-string-regexp: 4.0.0 + eslint-scope: 7.2.2 + eslint-visitor-keys: 3.4.3 + espree: 9.6.1 + esquery: 1.5.0 + esutils: 2.0.3 + fast-deep-equal: 3.1.3 + file-entry-cache: 6.0.1 + find-up: 5.0.0 + glob-parent: 6.0.2 + globals: 13.24.0 + graphemer: 1.4.0 + ignore: 5.3.1 + imurmurhash: 0.1.4 + is-glob: 4.0.3 + is-path-inside: 3.0.3 + js-yaml: 4.1.0 + json-stable-stringify-without-jsonify: 1.0.1 + levn: 0.4.1 + lodash.merge: 4.6.2 + minimatch: 3.1.2 + natural-compare: 1.4.0 + optionator: 0.9.3 + strip-ansi: 6.0.1 + text-table: 0.2.0 + transitivePeerDependencies: + - supports-color + dev: true /espree@9.6.1: resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==} @@ -18720,11 +19196,11 @@ packages: resolution: {integrity: sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==} dev: true - /fork-ts-checker-webpack-plugin@8.0.0(typescript@5.1.3)(webpack@5.91.0): + /fork-ts-checker-webpack-plugin@8.0.0(typescript@5.4.3)(webpack@5.91.0): resolution: {integrity: sha512-mX3qW3idpueT2klaQXBzrIM/pHw+T0B/V9KHEvNrqijTq9NFnMZU6oreVxDYcf33P8a5cW+67PjodNHthGnNVg==} engines: {node: '>=12.13.0', yarn: '>=1.0.0'} peerDependencies: - typescript: '>3.6.0' + typescript: 5.4.3 webpack: ^5.11.0 dependencies: '@babel/code-frame': 7.23.5 @@ -18739,7 +19215,7 @@ packages: schema-utils: 3.3.0 semver: 7.6.0 tapable: 2.2.1 - typescript: 5.1.3 + typescript: 5.4.3 webpack: 5.91.0 /form-data@2.3.3: @@ -19483,17 +19959,17 @@ packages: - supports-color dev: false - /gulp-typescript@6.0.0-alpha.1(typescript@5.1.3): + /gulp-typescript@6.0.0-alpha.1(typescript@5.4.3): resolution: {integrity: sha512-KoT0TTfjfT7w3JItHkgFH1T/zK4oXWC+a8xxKfniRfVcA0Fa1bKrIhztYelYmb+95RB80OLMBreknYkdwzdi2Q==} engines: {node: '>= 8'} peerDependencies: - typescript: '~2.7.1 || >=2.8.0-dev || >=2.9.0-dev || ~3.0.0 || >=3.0.0-dev || >=3.1.0-dev || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.7.0-dev ' + typescript: 5.4.3 dependencies: ansi-colors: 4.1.3 plugin-error: 1.0.1 source-map: 0.7.4 through2: 3.0.2 - typescript: 5.1.3 + typescript: 5.4.3 vinyl: 2.2.1 vinyl-fs: 3.0.3 dev: false @@ -19823,7 +20299,7 @@ packages: /history@5.3.0: resolution: {integrity: sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==} dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.23.2 /hmac-drbg@1.0.1: resolution: {integrity: sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==} @@ -20199,6 +20675,10 @@ packages: resolution: {integrity: sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==} engines: {node: '>= 4'} + /ignore@5.3.1: + resolution: {integrity: sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==} + engines: {node: '>= 4'} + /image-size@0.5.5: resolution: {integrity: sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==} engines: {node: '>=0.10.0'} @@ -22581,15 +23061,15 @@ packages: resolution: {integrity: sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==} dev: true - /merge-refs@1.2.2(@types/react@17.0.73): + /merge-refs@1.2.2(@types/react@18.2.73): resolution: {integrity: sha512-RwcT7GsQR3KbuLw1rRuodq4Nt547BKEBkliZ0qqsrpyNne9bGTFtsFIsIpx82huWhcl3kOlOlH4H0xkPk/DqVw==} peerDependencies: - '@types/react': ^17.0.0 + '@types/react': 18.2.73 peerDependenciesMeta: '@types/react': optional: true dependencies: - '@types/react': 17.0.73 + '@types/react': 18.2.73 dev: true /merge-stream@2.0.0: @@ -24517,9 +24997,18 @@ packages: resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==} engines: {node: '>=8'} - /path2d-polyfill@2.0.1: - resolution: {integrity: sha512-ad/3bsalbbWhmBo0D6FZ4RNMwsLsPpL6gnvhuSaU5Vm7b06Kr5ubSltQQ0T7YKsiJQO+g22zJ4dJKNTXIyOXtA==} - engines: {node: '>=8'} + /path2d-polyfill@2.1.1: + resolution: {integrity: sha512-4Rka5lN+rY/p0CdD8+E+BFv51lFaFvJOrlOhyQ+zjzyQrzyh3ozmxd1vVGGDdIbUFSBtIZLSnspxTgPT0iJhvA==} + engines: {node: '>=18'} + requiresBuild: true + dependencies: + path2d: 0.1.1 + dev: true + optional: true + + /path2d@0.1.1: + resolution: {integrity: sha512-/+S03c8AGsDYKKBtRDqieTJv2GlkMb0bWjnqOgtF6MkjdUQ9a8ARAtxWf9NgKLGm2+WQr6+/tqJdU8HNGsIDoA==} + engines: {node: '>=6'} requiresBuild: true dev: true optional: true @@ -24554,7 +25043,7 @@ packages: engines: {node: '>=18'} optionalDependencies: canvas: 2.11.2 - path2d-polyfill: 2.0.1 + path2d-polyfill: 2.1.1 transitivePeerDependencies: - encoding - supports-color @@ -25258,13 +25747,13 @@ packages: /postcss-resolve-nested-selector@0.1.1: resolution: {integrity: sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==} - /postcss-safe-parser@6.0.0(postcss@8.4.35): + /postcss-safe-parser@6.0.0(postcss@8.4.38): resolution: {integrity: sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==} engines: {node: '>=12.0'} peerDependencies: postcss: ^8.3.3 dependencies: - postcss: 8.4.35 + postcss: 8.4.38 /postcss-selector-not@5.0.0(postcss@8.4.35): resolution: {integrity: sha512-/2K3A4TCP9orP4TNS7u3tGdRFVKqz/E6pX3aGnriPG0jU78of8wsUcqE4QAhWEU0d+WnMSF93Ah3F//vUtK+iQ==} @@ -25281,6 +25770,13 @@ packages: cssesc: 3.0.0 util-deprecate: 1.0.2 + /postcss-selector-parser@6.0.16: + resolution: {integrity: sha512-A0RVJrX+IUkVZbW3ClroRWurercFhieevHB38sr2+l9eUClMqome3LmEmnhlNy+5Mr2EYN6B2Kaw9wYdd+VHiw==} + engines: {node: '>=4'} + dependencies: + cssesc: 3.0.0 + util-deprecate: 1.0.2 + /postcss-syntax@0.36.2(postcss@8.4.35): resolution: {integrity: sha512-nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==} peerDependencies: @@ -25315,6 +25811,14 @@ packages: picocolors: 1.0.0 source-map-js: 1.0.2 + /postcss@8.4.38: + resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==} + engines: {node: ^10 || ^12 || >=14} + dependencies: + nanoid: 3.3.7 + picocolors: 1.0.0 + source-map-js: 1.2.0 + /postgres-array@2.0.0: resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==} engines: {node: '>=4'} @@ -25364,13 +25868,13 @@ packages: fast-diff: 1.3.0 dev: false - /prettier-plugin-organize-imports@3.2.4(prettier@3.2.5)(typescript@5.1.3): + /prettier-plugin-organize-imports@3.2.4(prettier@3.2.5)(typescript@5.4.3): resolution: {integrity: sha512-6m8WBhIp0dfwu0SkgfOxJqh+HpdyfqSSLfKKRZSFbDuEQXDDndb8fTpRWkUrX/uBenkex3MgnVk0J3b3Y5byog==} peerDependencies: '@volar/vue-language-plugin-pug': ^1.0.4 '@volar/vue-typescript': ^1.0.4 prettier: ^3.1.1 - typescript: '>=2.9' + typescript: 5.4.3 peerDependenciesMeta: '@volar/vue-language-plugin-pug': optional: true @@ -25378,7 +25882,7 @@ packages: optional: true dependencies: prettier: 3.2.5 - typescript: 5.1.3 + typescript: 5.4.3 /prettier-plugin-packagejson@2.4.14(prettier@3.2.5): resolution: {integrity: sha512-sli+gV5tW7uxvzDZQscaBtSfbyAW2ToL6n/HGt51PipwX9vI7M54vefG0mKSfklVkT29TNGO6Mo6g8c6Z79gmw==} @@ -25498,7 +26002,7 @@ packages: /prism-react-renderer@1.3.5(react@18.2.0): resolution: {integrity: sha512-IJ+MSwBWKG+SM3b2SUfdrhC+gu01QkV2KmRQgREThBfSQRoufqRfxfHUxpG1WcaFjP+kojcFyO9Qqtpgt3qLCg==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: react: 18.2.0 dev: true @@ -25662,7 +26166,7 @@ packages: /qrcode.react@3.1.0(react@18.2.0): resolution: {integrity: sha512-oyF+Urr3oAMUG/OiOuONL3HXM+53wvuH3mtIWQrYmsXoAq0DkvZp2RYUWFSMFtbdOpuS++9v+WAkzNVkMlNW6Q==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: react: 18.2.0 @@ -25817,8 +26321,8 @@ packages: /rc-align@4.0.15(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-wqJtVH60pka/nOX7/IspElA8gjPNQKIx/ZqJ6heATCkXpe1Zg4cPVrMD2vC96wjsFFL8WsmhPbx9tdMo1qqlIA==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@babel/runtime': 7.24.0 classnames: 2.5.1 @@ -25829,65 +26333,65 @@ packages: resize-observer-polyfill: 1.5.1 dev: true - /rc-cascader@3.20.0(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-lkT9EEwOcYdjZ/jvhLoXGzprK1sijT3/Tp4BLxQQcHDZkkOzzwYQC9HgmKoJz0K7CukMfgvO9KqHeBdgE+pELw==} + /rc-cascader@3.24.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-NwkYsVULA61S085jbOYbq8Z7leyIxVmLwf+71mWLjA3kCfUf/rAKC0WfjQbqBDaLGlU9d4z1EzyPaHBKLYWv6A==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 array-tree-filter: 2.1.0 classnames: 2.5.1 - rc-select: 14.10.0(react-dom@18.2.0)(react@18.2.0) - rc-tree: 5.8.2(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-select: 14.13.0(react-dom@18.2.0)(react@18.2.0) + rc-tree: 5.8.5(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - /rc-checkbox@3.1.0(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-PAwpJFnBa3Ei+5pyqMMXdcKYKNBMS+TvSDiLdDnARnMJHC8ESxwPfm4Ao1gJiKtWLdmGfigascnCpwrHFgoOBQ==} + /rc-checkbox@3.2.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-8inzw4y9dAhZmv/Ydl59Qdy5tdp9CKg4oPVcRigi+ga/yKPZS5m5SyyQPtYSgbcqHRYOdUhiPSeKfktc76du1A==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - /rc-collapse@3.7.2(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-ZRw6ipDyOnfLFySxAiCMdbHtb5ePAsB9mT17PA6y1mRD/W6KHRaZeb5qK/X9xDV1CqgyxMpzw0VdS74PCcUk4A==} + /rc-collapse@3.7.3(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-60FJcdTRn0X5sELF18TANwtVi7FtModq649H11mYF1jh83DniMoM4MqY627sEKRCTm4+WXfGDcB7hY5oW6xhyw==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 classnames: 2.5.1 rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - /rc-dialog@9.3.4(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-975X3018GhR+EjZFbxA2Z57SX5rnu0G0/OxFgMMvZK4/hQWEm3MHaNvP4wXpxYDoJsp+xUvVW+GB9CMMCm81jA==} + /rc-dialog@9.4.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-AScCexaLACvf8KZRqCPz12BJ8olszXOS4lKlkMyzDQHS1m0zj1KZMYgmMCh39ee0Dcv8kyrj8mTqxuLyhH+QuQ==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 '@rc-component/portal': 1.1.2(react-dom@18.2.0)(react@18.2.0) classnames: 2.5.1 rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) /rc-drawer@6.5.2(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-QckxAnQNdhh4vtmKN0ZwDf3iakO83W9eZcSKWYYTDv4qcD2fHhRAZJJ/OE6v2ZlQ2kSqCJX5gYssF4HJFvsEPQ==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@babel/runtime': 7.24.0 '@rc-component/portal': 1.1.2(react-dom@18.2.0)(react@18.2.0) @@ -25896,179 +26400,224 @@ packages: rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) + dev: true + + /rc-drawer@7.1.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-nBE1rF5iZvpavoyqhSSz2mk/yANltA7g3aF0U45xkx381n3we/RKs9cJfNKp9mSWCedOKWt9FLEwZDaAaOGn2w==} + peerDependencies: + react: 18.2.0 + react-dom: 18.2.0 + dependencies: + '@babel/runtime': 7.24.1 + '@rc-component/portal': 1.1.2(react-dom@18.2.0)(react@18.2.0) + classnames: 2.5.1 + rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) /rc-dropdown@4.1.0(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-VZjMunpBdlVzYpEdJSaV7WM7O0jf8uyDjirxXLZRNZ+tAC+NzD3PXPEtliFwGzVwBBdCmGuSqiS9DWcOLxQ9tw==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@babel/runtime': 7.24.0 - '@rc-component/trigger': 1.18.2(react-dom@18.2.0)(react@18.2.0) + '@rc-component/trigger': 1.18.3(react-dom@18.2.0)(react@18.2.0) classnames: 2.5.1 rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) + dev: true + + /rc-dropdown@4.2.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-odM8Ove+gSh0zU27DUj5cG1gNKg7mLWBYzB5E4nNLrLwBmYEgYP43vHKDGOVZcJSVElQBI0+jTQgjnq0NfLjng==} + peerDependencies: + react: 18.2.0 + react-dom: 18.2.0 + dependencies: + '@babel/runtime': 7.24.1 + '@rc-component/trigger': 2.0.0(react-dom@18.2.0)(react@18.2.0) + classnames: 2.5.1 + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) /rc-field-form@1.27.4(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-PQColQnZimGKArnOh8V2907+VzDCXcqtFvHgevDLtqWc/P7YASb/FqntSmdS8q3VND5SHX3Y1vgMIzY22/f/0Q==} engines: {node: '>=8.x'} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 async-validator: 4.2.5 rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - /rc-field-form@1.41.0(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-k9AS0wmxfJfusWDP/YXWTpteDNaQ4isJx9UKxx4/e8Dub4spFeZ54/EuN2sYrMRID/+hUznPgVZeg+Gf7XSYCw==} + /rc-field-form@1.44.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-el7w87fyDUsca63Y/s8qJcq9kNkf/J5h+iTdqG5WsSHLH0e6Usl7QuYSmSVzJMgtp40mOVZIY/W/QP9zwrp1FA==} engines: {node: '>=8.x'} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 async-validator: 4.2.5 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - /rc-image@7.5.1(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-Z9loECh92SQp0nSipc0MBuf5+yVC05H/pzC+Nf8xw1BKDFUJzUeehYBjaWlxly8VGBZJcTHYri61Fz9ng1G3Ag==} + /rc-image@7.6.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-tL3Rvd1sS+frZQ01i+tkeUPaOeFz2iG9/scAt/Cfs0hyCRVA/w0Pu1J/JxIX8blalvmHE0bZQRYdOmRAzWu4Hg==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 '@rc-component/portal': 1.1.2(react-dom@18.2.0)(react@18.2.0) classnames: 2.5.1 - rc-dialog: 9.3.4(react-dom@18.2.0)(react@18.2.0) + rc-dialog: 9.4.0(react-dom@18.2.0)(react@18.2.0) rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - /rc-input-number@8.4.0(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-B6rziPOLRmeP7kcS5qbdC5hXvvDHYKV4vUxmahevYx2E6crS2bRi0xLDjhJ0E1HtOWo8rTmaE2EBJAkTCZOLdA==} + /rc-input-number@9.0.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-RfcDBDdWFFetouWFXBA+WPEC8LzBXyngr9b+yTLVIygfFu7HiLRGn/s/v9wwno94X7KFvnb28FNynMGj9XJlDQ==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 '@rc-component/mini-decimal': 1.1.0 classnames: 2.5.1 - rc-input: 1.3.11(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-input: 1.4.5(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - /rc-input@1.3.11(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-jhH7QP5rILanSHCGSUkdoFE5DEtpv8FIseYhuYkOZzUBeiVAiwM3q26YqZ6xBB0QFEZ/yUAgms4xW4iuub3xFQ==} + /rc-input@1.4.5(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-AjzykhwnwYTRSwwgCu70CGKBIAv6bP2nqnFptnNTprph/TF1BAs0Qxl91mie/BR6n827WIJB6ZjaRf9iiMwAfw==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - /rc-mentions@2.9.1(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-cZuElWr/5Ws0PXx1uxobxfYh4mqUw2FitfabR62YnWgm+WAfDyXZXqZg5DxXW+M1cgVvntrQgDDd9LrihrXzew==} + /rc-mentions@2.11.1(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-upb4AK1SRFql7qGnbLEvJqLMugVVIyjmwBJW9L0eLoN9po4JmJZaBzmKA4089fNtsU8k6l/tdZiVafyooeKnLw==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 - '@rc-component/trigger': 1.18.2(react-dom@18.2.0)(react@18.2.0) + '@babel/runtime': 7.24.1 + '@rc-component/trigger': 2.0.0(react-dom@18.2.0)(react@18.2.0) classnames: 2.5.1 - rc-input: 1.3.11(react-dom@18.2.0)(react@18.2.0) - rc-menu: 9.12.4(react-dom@18.2.0)(react@18.2.0) - rc-textarea: 1.5.3(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-input: 1.4.5(react-dom@18.2.0)(react@18.2.0) + rc-menu: 9.13.0(react-dom@18.2.0)(react@18.2.0) + rc-textarea: 1.6.3(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) /rc-menu@9.12.4(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-t2NcvPLV1mFJzw4F21ojOoRVofK2rWhpKPx69q2raUsiHPDP6DDevsBILEYdsIegqBeSXoWs2bf6CueBKg3BFg==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@babel/runtime': 7.24.0 - '@rc-component/trigger': 1.18.2(react-dom@18.2.0)(react@18.2.0) + '@rc-component/trigger': 1.18.3(react-dom@18.2.0)(react@18.2.0) classnames: 2.5.1 rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) rc-overflow: 1.3.2(react-dom@18.2.0)(react@18.2.0) rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) + dev: true + + /rc-menu@9.13.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-1l8ooCB3HcYJKCltC/s7OxRKRjgymdl9htrCeGZcXNaMct0RxZRK6OPV3lPhVksIvAGMgzPd54ClpZ5J4b8cZA==} + peerDependencies: + react: 18.2.0 + react-dom: 18.2.0 + dependencies: + '@babel/runtime': 7.24.1 + '@rc-component/trigger': 2.0.0(react-dom@18.2.0)(react@18.2.0) + classnames: 2.5.1 + rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) + rc-overflow: 1.3.2(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) /rc-motion@2.9.0(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-XIU2+xLkdIr1/h6ohPZXyPBMvOmuyFZQ/T0xnawz+Rh+gh4FINcnZmMT5UTIj6hgI0VLDjTaPeRd+smJeSPqiQ==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - /rc-notification@5.3.0(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-WCf0uCOkZ3HGfF0p1H4Sgt7aWfipxORWTPp7o6prA3vxwtWhtug3GfpYls1pnBp4WA+j8vGIi5c2/hQRpGzPcQ==} + /rc-notification@5.4.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-li19y9RoYJciF3WRFvD+DvWS70jdL8Fr+Gfb/OshK+iY6iTkwzoigmSIp76/kWh5tF5i/i9im12X3nsF85GYdA==} engines: {node: '>=8.x'} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 classnames: 2.5.1 rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) /rc-overflow@1.3.2(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-nsUm78jkYAoPygDAcGZeC2VwIg/IBGSodtOY3pMof4W3M9qRJgqaDYm03ZayHlde3I6ipliAxbN0RUcGf5KOzw==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 classnames: 2.5.1 rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) /rc-pagination@4.0.4(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-GGrLT4NgG6wgJpT/hHIpL9nELv27A1XbSZzECIuQBQTVSf4xGKxWr6I/jhpRPauYEWEbWVw22ObG6tJQqwJqWQ==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - /rc-picker@3.14.6(dayjs@1.11.10)(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-AdKKW0AqMwZsKvIpwUWDUnpuGKZVrbxVTZTNjcO+pViGkjC1EBcjMgxVe8tomOEaIHJL5Gd13vS8Rr3zzxWmag==} + /rc-picker@4.3.0(dayjs@1.11.10)(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-bQNB/+NdW55jlQ5lPnNqF5J90Tq4SihLbAF7tzPBvGDJyoYmDgwLm4FN0ZB3Ot9i1v6vJY/1mgqZZTT9jbYc5w==} engines: {node: '>=8.x'} peerDependencies: date-fns: '>= 2.x' dayjs: '>= 1.x' luxon: '>= 3.x' moment: '>= 2.x' - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 peerDependenciesMeta: date-fns: optional: true @@ -26079,23 +26628,25 @@ packages: moment: optional: true dependencies: - '@babel/runtime': 7.24.0 - '@rc-component/trigger': 1.18.2(react-dom@18.2.0)(react@18.2.0) + '@babel/runtime': 7.24.1 + '@rc-component/trigger': 2.0.0(react-dom@18.2.0)(react@18.2.0) classnames: 2.5.1 dayjs: 1.11.10 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-overflow: 1.3.2(react-dom@18.2.0)(react@18.2.0) + rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - /rc-progress@3.5.1(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-V6Amx6SbLRwPin/oD+k1vbPrO8+9Qf8zW1T8A7o83HdNafEVvAxPV5YsgtKFP+Ud5HghLj33zKOcEHrcrUGkfw==} + /rc-progress@4.0.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-oofVMMafOCokIUIBnZLNcOZFsABaUw8PPrf1/y0ZBvKZNpOiu5h4AO9vv11Sw0p4Hb3D0yGWuEattcQGtNJ/aw==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -26103,38 +26654,38 @@ packages: resolution: {integrity: sha512-g092v5iZCdVzbjdn28FzvWebK2IutoVoiTeqoLTj9WM7SjA/gOJIw5/JFZMRyJYYVe1jLAU2UhAfstIpCNRozg==} engines: {node: '>=8.x'} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) /rc-resize-observer@1.4.0(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-PnMVyRid9JLxFavTjeDXEXo65HCRqbmLBw9xX9gfC4BZiSzbLXKzW3jPz+J0P71pLbD5tBMTT+mkstV5gD0c9Q==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) resize-observer-polyfill: 1.5.1 - /rc-segmented@2.2.2(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-Mq52M96QdHMsNdE/042ibT5vkcGcD5jxKp7HgPC2SRofpia99P5fkfHy1pEaajLMF/kj0+2Lkq1UZRvqzo9mSA==} + /rc-segmented@2.3.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-I3FtM5Smua/ESXutFfb8gJ8ZPcvFR+qUgeeGFQHBOvRiRKyAk4aBE5nfqrxXx+h8/vn60DQjOt6i4RNtrbOobg==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 classnames: 2.5.1 rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -26142,8 +26693,8 @@ packages: resolution: {integrity: sha512-4JgY3oG2Yz68ECMUSCON7mtxuJvCSj+LJpHEg/AONaaVBxIIrmI/ZTuMJkyojall/X50YdBe5oMKqHHPNiPzEg==} engines: {node: '>=8.x'} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@babel/runtime': 7.24.0 classnames: 2.5.1 @@ -26160,8 +26711,8 @@ packages: resolution: {integrity: sha512-TsIJTYafTTapCA32LLNpx/AD6ntepR1TG8jEVx35NiAAWCPymhUfuca8kRcUNd3WIGVMDcMKn9kkphoxEz+6Ag==} engines: {node: '>=8.x'} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@babel/runtime': 7.24.0 '@rc-component/trigger': 1.18.2(react-dom@18.2.0)(react@18.2.0) @@ -26172,17 +26723,35 @@ packages: rc-virtual-list: 3.11.3(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) + dev: false + + /rc-select@14.13.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-ew34FsaqHokK4dxVrcIxSYrgWJ2XJYlkk32eiOIiEo3GkHUExdCzmozMYaUc2P67c5QJRUvvY0uqCs3QG67h5A==} + engines: {node: '>=8.x'} + peerDependencies: + react: 18.2.0 + react-dom: 18.2.0 + dependencies: + '@babel/runtime': 7.24.1 + '@rc-component/trigger': 2.0.0(react-dom@18.2.0)(react@18.2.0) + classnames: 2.5.1 + rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) + rc-overflow: 1.3.2(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) + rc-virtual-list: 3.11.4(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) /rc-slider@10.5.0(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-xiYght50cvoODZYI43v3Ylsqiw14+D7ELsgzR40boDZaya1HFa1Etnv9MDkQE8X/UrXAffwv2AcNAhslgYuDTw==} engines: {node: '>=8.x'} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -26190,57 +26759,40 @@ packages: resolution: {integrity: sha512-lKHL+Sny0SeHkQKKDJlAjV5oZ8DwCdS2hFhAkIjuQt1/pB81M0cA0ErVFdHq9+jmPmFw1vJB2F5NBzFXLJxV+g==} engines: {node: '>=8.x'} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) /rc-switch@4.1.0(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-TI8ufP2Az9oEbvyCeVE4+90PDSljGyuwix3fV58p7HV2o4wBnVToEyomJRVyTaZeqNPAp+vqeo4Wnj5u0ZZQBg==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - /rc-table@7.36.1(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-9qMxEm/3Y8ukdW8I8ZvmhX0QImfNKzH0JEUlSbyaUlsYTB+/tQEbfaB8YkG4sHVZ1io4pxqK/BXoZYqebi/TIQ==} + /rc-table@7.45.3(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-ZrHMAc19VoiM42Via59FtPJWLXeSG5fAfhh7wGBa7DlnLt00Ywe3PAnA19pJuxU+aVtuzMHH6zRlV3BGnwFcBA==} engines: {node: '>=8.x'} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 '@rc-component/context': 1.4.0(react-dom@18.2.0)(react@18.2.0) classnames: 2.5.1 rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) - rc-virtual-list: 3.11.3(react-dom@18.2.0)(react@18.2.0) - react: 18.2.0 - react-dom: 18.2.0(react@18.2.0) - - /rc-tabs@12.14.1(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-1xlE7JQNYxD5RwBsM7jf2xSdUrkmTSDFLFEm2gqAgnsRlOGydEzXXNAVTOT6QcgM1G/gCm+AgG+FYPUGb4Hs4g==} - engines: {node: '>=8.x'} - peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 - dependencies: - '@babel/runtime': 7.24.0 - classnames: 2.5.1 - rc-dropdown: 4.1.0(react-dom@18.2.0)(react@18.2.0) - rc-menu: 9.12.4(react-dom@18.2.0)(react@18.2.0) - rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) - rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) + rc-virtual-list: 3.11.4(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -26248,8 +26800,8 @@ packages: resolution: {integrity: sha512-aXFLRo7jo531Jed1LgRqrF0VmRnzM/Qki25PknM3S04gqyxpDaHNFpPba05pHhn+d1N+54qIi0IcY1odrCrF2A==} engines: {node: '>=8.x'} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@babel/runtime': 7.24.0 classnames: 2.5.1 @@ -26262,28 +26814,45 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: true - /rc-textarea@1.5.3(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-oH682ghHx++stFNYrosPRBfwsypywrTXpaD0/5Z8MPkUOnyOQUaY9ueL9tMu6BP1LfsuYQ1VLpg5OtshViLNgA==} + /rc-tabs@14.1.1(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-5nOr9PVpJy2SWHTLgv1+kESDOb0tFzl0cYU9r9d8LfL0Wg9i/n1B558rmkxdQHgBwMqxmwoyPSAbQROxMQe8nw==} + engines: {node: '>=8.x'} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 classnames: 2.5.1 - rc-input: 1.3.11(react-dom@18.2.0)(react@18.2.0) + rc-dropdown: 4.2.0(react-dom@18.2.0)(react@18.2.0) + rc-menu: 9.13.0(react-dom@18.2.0)(react@18.2.0) + rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) - /rc-tooltip@6.1.3(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-HMSbSs5oieZ7XddtINUddBLSVgsnlaSb3bZrzzGWjXa7/B7nNedmsuz72s7EWFEro9mNa7RyF3gOXKYqvJiTcQ==} + /rc-textarea@1.6.3(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-8k7+8Y2GJ/cQLiClFMg8kUXOOdvcFQrnGeSchOvI2ZMIVvX5a3zQpLxoODL0HTrvU63fPkRmMuqaEcOF9dQemA==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 - '@rc-component/trigger': 1.18.2(react-dom@18.2.0)(react@18.2.0) + '@babel/runtime': 7.24.1 + classnames: 2.5.1 + rc-input: 1.4.5(react-dom@18.2.0)(react@18.2.0) + rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + + /rc-tooltip@6.2.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-iS/3iOAvtDh9GIx1ulY7EFUXUtktFccNLsARo3NPgLf0QW9oT0w3dA9cYWlhqAKmD+uriEwdWz1kH0Qs4zk2Aw==} + peerDependencies: + react: 18.2.0 + react-dom: 18.2.0 + dependencies: + '@babel/runtime': 7.24.1 + '@rc-component/trigger': 2.0.0(react-dom@18.2.0)(react@18.2.0) classnames: 2.5.1 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -26291,8 +26860,8 @@ packages: /rc-tree-select@5.15.0(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-YJHfdO6azFnR0/JuNBZLDptGE4/RGfVeHAafUIYcm2T3RBkL1O8aVqiHvwIyLzdK59ry0NLrByd+3TkfpRM+9Q==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@babel/runtime': 7.24.0 classnames: 2.5.1 @@ -26301,12 +26870,27 @@ packages: rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) + dev: false + + /rc-tree-select@5.19.0(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-f4l5EsmSGF3ggj76YTzKNPY9SnXfFaer7ZccTSGb3urUf54L+cCqyT+UsPr+S5TAr8mZSxJ7g3CgkCe+cVQ6sw==} + peerDependencies: + react: 18.2.0 + react-dom: 18.2.0 + dependencies: + '@babel/runtime': 7.24.1 + classnames: 2.5.1 + rc-select: 14.13.0(react-dom@18.2.0)(react@18.2.0) + rc-tree: 5.8.5(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) /rc-tree-select@5.5.5(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-k2av7jF6tW9bIO4mQhaVdV4kJ1c54oxV3/hHVU+oD251Gb5JN+m1RbJFTMf1o0rAFqkvto33rxMdpafaGKQRJw==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@babel/runtime': 7.24.0 classnames: 2.5.1 @@ -26321,8 +26905,8 @@ packages: resolution: {integrity: sha512-LXA5nY2hG5koIAlHW5sgXgLpOMz+bFRbnZZ+cCg0tQs4Wv1AmY7EDi1SK7iFXhslYockbqUerQan82jljoaItg==} engines: {node: '>=10.x'} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@babel/runtime': 7.24.0 classnames: 2.5.1 @@ -26337,8 +26921,8 @@ packages: resolution: {integrity: sha512-xH/fcgLHWTLmrSuNphU8XAqV7CdaOQgm4KywlLGNoTMhDAcNR3GVNP6cZzb0GrKmIZ9yae+QLot/cAgUdPRMzg==} engines: {node: '>=10.x'} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@babel/runtime': 7.24.0 classnames: 2.5.1 @@ -26348,12 +26932,27 @@ packages: react: 18.2.0 react-dom: 18.2.0(react@18.2.0) + /rc-tree@5.8.5(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-PRfcZtVDNkR7oh26RuNe1hpw11c1wfgzwmPFL0lnxGnYefe9lDAO6cg5wJKIAwyXFVt5zHgpjYmaz0CPy1ZtKg==} + engines: {node: '>=10.x'} + peerDependencies: + react: 18.2.0 + react-dom: 18.2.0 + dependencies: + '@babel/runtime': 7.24.1 + classnames: 2.5.1 + rc-motion: 2.9.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) + rc-virtual-list: 3.11.4(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + /rc-trigger@5.3.4(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-mQv+vas0TwKcjAO2izNPkqR4j86OemLRmvL2nOzdP9OWNWA1ivoTt5hzFqYNW9zACwmTezRiN8bttrC7cZzYSw==} engines: {node: '>=8.x'} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@babel/runtime': 7.24.0 classnames: 2.5.1 @@ -26367,22 +26966,33 @@ packages: /rc-upload@4.5.2(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-QO3ne77DwnAPKFn0bA5qJM81QBjQi0e0NHdkvpFyY73Bea2NfITiotqJqVjHgeYPOJu5lLVR32TNGP084aSoXA==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 classnames: 2.5.1 - rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) /rc-util@5.38.1(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-e4ZMs7q9XqwTuhIK7zBIVFltUtMSjphuPPQXHoHlzRzNdOwUxDejo0Zls5HYaJfRKNURcsS/ceKVULlhjBrxng==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + react-is: 18.2.0 + + /rc-util@5.39.1(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-OW/ERynNDgNr4y0oiFmtes3rbEamXw7GHGbkbNd9iRr7kgT03T6fT0b9WpJ3mbxKhyOcAHnGcIoh5u/cjrC2OQ==} + peerDependencies: + react: 18.2.0 + react-dom: 18.2.0 + dependencies: + '@babel/runtime': 7.24.1 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) react-is: 18.2.0 @@ -26391,8 +27001,8 @@ packages: resolution: {integrity: sha512-tu5UtrMk/AXonHwHxUogdXAWynaXsrx1i6dsgg+lOo/KJSF8oBAcprh1z5J3xgnPJD5hXxTL58F8s8onokdt0Q==} engines: {node: '>=8.x'} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@babel/runtime': 7.24.0 classnames: 2.5.1 @@ -26401,6 +27011,20 @@ packages: react: 18.2.0 react-dom: 18.2.0(react@18.2.0) + /rc-virtual-list@3.11.4(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-NbBi0fvyIu26gP69nQBiWgUMTPX3mr4FcuBQiVqagU0BnuX8WQkiivnMs105JROeuUIFczLrlgUhLQwTWV1XDA==} + engines: {node: '>=8.x'} + peerDependencies: + react: 18.2.0 + react-dom: 18.2.0 + dependencies: + '@babel/runtime': 7.24.1 + classnames: 2.5.1 + rc-resize-observer: 1.4.0(react-dom@18.2.0)(react@18.2.0) + rc-util: 5.39.1(react-dom@18.2.0)(react@18.2.0) + react: 18.2.0 + react-dom: 18.2.0(react@18.2.0) + /rc@1.2.8: resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==} hasBin: true @@ -26413,8 +27037,8 @@ packages: /react-beautiful-dnd@13.1.1(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-0Lvs4tq2VcrEjEgDXHjT98r+63drkKEgqyxdA7qD3mvKwga6a5SscbdLPO2IExotU1jW8L0Ksdl0Cj2AF67nPQ==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@babel/runtime': 7.24.0 css-box-model: 1.2.1 @@ -26431,8 +27055,8 @@ packages: /react-big-calendar@1.8.5(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-cra8WPfoTSQthFfqxi0k9xm/Shv5jWSw19LkNzpSJcnQhP6XGes/eJjd8P8g/iwaJjXIWPpg3+HB5wO5wabRyA==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@babel/runtime': 7.24.0 clsx: 1.2.1 @@ -26457,8 +27081,8 @@ packages: /react-colorful@5.6.1(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-1exovf0uGTGyq5mXQT0zgQ80uvj2PCwvF8zY1RN9/vbJVSjSo3fsB/4L3ObbF7u70NduSiK4xu4Y6q1MHoUGEw==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -26467,7 +27091,7 @@ packages: /react-copy-to-clipboard@5.1.0(react@18.2.0): resolution: {integrity: sha512-k61RsNgAayIJNoy9yDsYzDe/yAZAzEbEgcz3DZMhF686LEyukcE1hzurxe85JandPUG+yTfGVFzuEw3xt8WP/A==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: copy-to-clipboard: 3.3.3 prop-types: 15.8.1 @@ -26477,7 +27101,7 @@ packages: /react-dom@18.2.0(react@18.2.0): resolution: {integrity: sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: loose-envify: 1.4.0 react: 18.2.0 @@ -26494,7 +27118,7 @@ packages: resolution: {integrity: sha512-uM9uPzZJTF6wRQORmSrvOIgt4lJ9MC1sNgEOj2XGsDTRE4kmpWxg7ENK9EWNKJRMAOY9z0MuF4yIfl6gp4sotA==} engines: {node: '>=10', npm: '>=6'} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: '@babel/runtime': 7.24.0 react: 18.2.0 @@ -26503,7 +27127,7 @@ packages: /react-error-boundary@4.0.11(react@18.2.0): resolution: {integrity: sha512-U13ul67aP5DOSPNSCWQ/eO0AQEYzEFkVljULQIjMV0KlffTAhxuDoBKdO0pb/JZ8mDhMKFZ9NZi0BmLGUiNphw==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: '@babel/runtime': 7.24.0 react: 18.2.0 @@ -26517,10 +27141,10 @@ packages: /react-helmet-async@1.3.0(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-9jZ57/dAn9t3q6hneQS0wukqC2ENOBgMNVEhb/ZG9ZSxUetzVIw4iAmEU38IaVg3QGYauQPhSeUTuIUtFglWpg==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.23.2 invariant: 2.2.4 prop-types: 15.8.1 react: 18.2.0 @@ -26531,7 +27155,7 @@ packages: /react-helmet@6.1.0(react@18.2.0): resolution: {integrity: sha512-4uMzEY9nlDlgxr61NL3XbKRy1hEkXmKNXhjbAIOVw5vcFrsdYbH2FEwcNyWvWinl103nXgzYNlns9ca+8kFiWw==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: object-assign: 4.1.1 prop-types: 15.8.1 @@ -26543,8 +27167,8 @@ packages: /react-hotkeys-hook@3.4.7(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-+bbPmhPAl6ns9VkXkNNyxlmCAIyDAcWbB76O4I0ntr3uWCRuIQf/aRLartUahe9chVMPj+OEzzfk3CQSjclUEQ==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: hotkeys-js: 3.9.4 react: 18.2.0 @@ -26555,7 +27179,7 @@ packages: resolution: {integrity: sha512-yHb2F9BiT0lqoQDt8loZ5gWP331GwctHz9tYQ8A2EIEUu+CcEdjBLQWli1USG3RdWQt3W+jqQLg/d4rrQR96LA==} peerDependencies: i18next: '>= 19.0.0' - react: ^18.0.0 + react: 18.2.0 react-dom: '*' react-native: '*' peerDependenciesMeta: @@ -26573,7 +27197,7 @@ packages: /react-iframe@1.8.5(react@18.2.0): resolution: {integrity: sha512-F4cQJGs3ydaG6fJWfuz9yLwOU0Trzl6kttXuUG+vYwosH8enOOFxZWEDQCSbNVO8ayjfYZeqLxEvdvcsSy4GvA==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: object-assign: 4.1.1 react: 18.2.0 @@ -26582,8 +27206,8 @@ packages: resolution: {integrity: sha512-kTiAODz091bgT7SlWNHab0LSMZAPJtlNWDGKv7pLlLY1krmf7FuG1zxE0wyPpeA8gPdwfr3cu6sPwZRqWsc3Eg==} deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info. peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: prop-types: 15.8.1 react: 18.2.0 @@ -26591,27 +27215,27 @@ packages: react-modal: 3.16.1(react-dom@18.2.0)(react@18.2.0) dev: false - /react-intl@6.5.5(react@18.2.0)(typescript@5.1.3): + /react-intl@6.5.5(react@18.2.0)(typescript@5.4.3): resolution: {integrity: sha512-cI5UKvBh4tc1zxLIziHBYGMX3dhYWDEFlvUDVN6NfT2i96zTXz/zH2AmM8+2waqgOhwkFUzd+7kK1G9q7fiC2g==} peerDependencies: - react: ^18.0.0 - typescript: '5' + react: 18.2.0 + typescript: 5.4.3 peerDependenciesMeta: typescript: optional: true dependencies: '@formatjs/ecma402-abstract': 1.18.0 '@formatjs/icu-messageformat-parser': 2.7.3 - '@formatjs/intl': 2.9.9(typescript@5.1.3) + '@formatjs/intl': 2.9.9(typescript@5.4.3) '@formatjs/intl-displaynames': 6.6.4 '@formatjs/intl-listformat': 7.5.3 '@types/hoist-non-react-statics': 3.3.5 - '@types/react': 17.0.73 + '@types/react': 18.2.73 hoist-non-react-statics: 3.3.2 intl-messageformat: 10.5.8 react: 18.2.0 tslib: 2.6.2 - typescript: 5.1.3 + typescript: 5.4.3 dev: true /react-is@16.13.1: @@ -26623,14 +27247,14 @@ packages: /react-is@18.2.0: resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==} - /react-js-cron@3.2.0(antd@5.12.8)(react-dom@18.2.0)(react@18.2.0): + /react-js-cron@3.2.0(antd@5.16.0)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-DAluNX6ZpfsSDAIAfJKNyWIckTWTcQ/7IK91J4jaS4o4iihRJo/8gd7kf6ACDTE2RKt0PiSpOf1MBrrSdmdyUQ==} peerDependencies: - antd: 5.12.8 - react: ^18.0.0 - react-dom: ^18.0.0 + antd: 5.16.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - antd: 5.12.8(react-dom@18.2.0)(react@18.2.0) + antd: 5.16.0(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -26644,8 +27268,8 @@ packages: resolution: {integrity: sha512-VStHgI3BVcGo7OXczvnJN7yT2TWHJPDXZWyI/a0ssFNhGZWsPmB8cF0z33ewDXq4VfYMO1vXgiv/g8Nj9NDyWg==} engines: {node: '>=8'} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: exenv: 1.2.2 prop-types: 15.8.1 @@ -26658,8 +27282,8 @@ packages: /react-overlays@5.2.1(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-GLLSOLWr21CqtJn8geSwQfoJufdt3mfdsnIiQswouuQ2MMPns+ihZklxvsTDKD3cR2tF8ELbi5xUsvqVhR6WvA==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@babel/runtime': 7.24.0 '@popperjs/core': 2.11.8 @@ -26673,22 +27297,22 @@ packages: warning: 4.0.3 dev: true - /react-pdf@7.7.1(@types/react@17.0.73)(react-dom@18.2.0)(react@18.2.0): + /react-pdf@7.7.1(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-cbbf/PuRtGcPPw+HLhMI1f6NSka8OJgg+j/yPWTe95Owf0fK6gmVY7OXpTxMeh92O3T3K3EzfE0ML0eXPGwR5g==} peerDependencies: - '@types/react': ^17.0.0 - react: ^18.0.0 - react-dom: ^18.0.0 + '@types/react': 18.2.73 + react: 18.2.0 + react-dom: 18.2.0 peerDependenciesMeta: '@types/react': optional: true dependencies: - '@types/react': 17.0.73 + '@types/react': 18.2.73 clsx: 2.1.0 dequal: 2.0.3 make-cancellable-promise: 1.3.2 make-event-props: 1.6.2 - merge-refs: 1.2.2(@types/react@17.0.73) + merge-refs: 1.2.2(@types/react@18.2.73) pdfjs-dist: 3.11.174 prop-types: 15.8.1 react: 18.2.0 @@ -26703,8 +27327,8 @@ packages: /react-quill@2.0.0(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-4qQtv1FtCfLgoD3PXAur5RyxuUbPXQGOHgTlFie3jtxp43mXDtzCKaOgQ3mLyZfi1PUlyjycfivKelFhy13QUg==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@types/quill': 1.3.10 lodash: 4.17.21 @@ -26716,7 +27340,7 @@ packages: /react-redux@7.2.9(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 react-dom: '*' react-native: '*' peerDependenciesMeta: @@ -26742,8 +27366,8 @@ packages: resolution: {integrity: sha512-1dUdVj3cwc1npzJaf23gulB562ESNvxf7E4x8upNJycqyUm5BRRZ6dd3LrlzhtLaMrwOCO8R0zoiYxdaJx4LlQ==} engines: {node: '>=14.0.0'} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: '@remix-run/router': 1.14.0 react: 18.2.0 @@ -26754,7 +27378,7 @@ packages: resolution: {integrity: sha512-W0l13YlMTm1YrpVIOpjCADJqEUpz1vm+CMo47RuFX4Ftegwm6KOYsL5G3eiE52jnJpKvzm6uB/vTKTPKM8dmkA==} engines: {node: '>=14.0.0'} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: '@remix-run/router': 1.14.1 react: 18.2.0 @@ -26762,7 +27386,7 @@ packages: /react-side-effect@2.1.2(react@18.2.0): resolution: {integrity: sha512-PVjOcvVOyIILrYoyGEpDN3vmYNLdy1CajSFNt4TDsVQC5KpTijDvWVoR+/7Rz2xT978D8/ZtFceXxzsPwZEDvw==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: react: 18.2.0 dev: false @@ -26770,7 +27394,7 @@ packages: /react-sticky-box@1.0.2(react@18.2.0): resolution: {integrity: sha512-Kyvtppdtv1KqJyNU4DtrSMI0unyQRgtraZvVQ0GAazVbYiTsIVpyhpr+5R0Aavzu4uJNSe1awj2rk/qI7i6Zfw==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: react: 18.2.0 resize-observer-polyfill: 1.5.1 @@ -26778,8 +27402,8 @@ packages: /react-to-print@2.14.15(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-SKnwOzU2cJ8eaAkoJO7+gNhvfEDmm+Y34IdcHsjtHioUevUPhprqbVtvNJlZ2JkGJ8ExK2QNWM9pXECTDR5D8w==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -26787,8 +27411,8 @@ packages: /react-use-websocket@4.8.1(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-FTXuG5O+LFozmu1BRfrzl7UIQngECvGJmL7BHsK4TYXuVt+mCizVA8lT0hGSIF0Z0TedF7bOo1nRzOUdginhDw==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: react: 18.2.0 react-dom: 18.2.0(react@18.2.0) @@ -26800,18 +27424,18 @@ packages: dependencies: loose-envify: 1.4.0 - /reactflow@11.10.1(@types/react@17.0.73)(react-dom@18.2.0)(react@18.2.0): + /reactflow@11.10.1(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-Q616fElAc5/N37tMwjuRkkgm/VgmnLLTNNCj61z5mvJxae+/VXZQMfot1K6a5LLz9G3SVKqU97PMb9Ga1PRXew==} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 dependencies: - '@reactflow/background': 11.3.6(@types/react@17.0.73)(react-dom@18.2.0)(react@18.2.0) - '@reactflow/controls': 11.2.6(@types/react@17.0.73)(react-dom@18.2.0)(react@18.2.0) - '@reactflow/core': 11.10.1(@types/react@17.0.73)(react-dom@18.2.0)(react@18.2.0) - '@reactflow/minimap': 11.7.6(@types/react@17.0.73)(react-dom@18.2.0)(react@18.2.0) - '@reactflow/node-resizer': 2.2.6(@types/react@17.0.73)(react-dom@18.2.0)(react@18.2.0) - '@reactflow/node-toolbar': 1.3.6(@types/react@17.0.73)(react-dom@18.2.0)(react@18.2.0) + '@reactflow/background': 11.3.6(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0) + '@reactflow/controls': 11.2.6(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0) + '@reactflow/core': 11.10.1(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0) + '@reactflow/minimap': 11.7.6(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0) + '@reactflow/node-resizer': 2.2.6(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0) + '@reactflow/node-toolbar': 1.3.6(@types/react@18.2.73)(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) transitivePeerDependencies: @@ -27023,10 +27647,13 @@ packages: /regenerator-runtime@0.14.0: resolution: {integrity: sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==} + /regenerator-runtime@0.14.1: + resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==} + /regenerator-transform@0.15.2: resolution: {integrity: sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==} dependencies: - '@babel/runtime': 7.24.0 + '@babel/runtime': 7.24.1 dev: false /regex-not@1.0.2: @@ -28210,6 +28837,10 @@ packages: resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==} engines: {node: '>=0.10.0'} + /source-map-js@1.2.0: + resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==} + engines: {node: '>=0.10.0'} + /source-map-resolve@0.5.3: resolution: {integrity: sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==} deprecated: See https://github.com/lydell/source-map-resolve#deprecated @@ -28457,7 +29088,7 @@ packages: /staged-components@1.1.3(react@18.2.0): resolution: {integrity: sha512-9EIswzDqjwlEu+ymkV09TTlJfzSbKgEnNteUnZSTxkpMgr5Wx2CzzA9WcMFWBNCldqVPsHVnRGGrApduq2Se5A==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: react: 18.2.0 @@ -28780,8 +29411,8 @@ packages: resolution: {integrity: sha512-uuzIIfnVkagcVHv9nE0VPlHPSCmXIUGKfJ42LNjxCCTDTL5sgnJ8Z7GZBq0EnLYGln77tPpEpExt2+qa+cZqSw==} engines: {node: '>=10'} peerDependencies: - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.2.0 + react-dom: 18.2.0 react-is: '>= 16.8.0' dependencies: '@babel/helper-module-imports': 7.22.15 @@ -28821,7 +29452,7 @@ packages: engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} hasBin: true dependencies: - '@csstools/selector-specificity': 2.2.0(postcss-selector-parser@6.0.13) + '@csstools/selector-specificity': 2.2.0(postcss-selector-parser@6.0.16) balanced-match: 2.0.0 colord: 2.9.3 cosmiconfig: 7.1.0 @@ -28834,7 +29465,7 @@ packages: globby: 11.1.0 globjoin: 0.1.4 html-tags: 3.3.1 - ignore: 5.3.0 + ignore: 5.3.1 import-lazy: 4.0.0 imurmurhash: 0.1.4 is-plain-object: 5.0.0 @@ -28844,11 +29475,11 @@ packages: micromatch: 4.0.5 normalize-path: 3.0.0 picocolors: 1.0.0 - postcss: 8.4.35 + postcss: 8.4.38 postcss-media-query-parser: 0.2.3 postcss-resolve-nested-selector: 0.1.1 - postcss-safe-parser: 6.0.0(postcss@8.4.35) - postcss-selector-parser: 6.0.13 + postcss-safe-parser: 6.0.0(postcss@8.4.38) + postcss-selector-parser: 6.0.16 postcss-value-parser: 4.2.0 resolve-from: 5.0.0 string-width: 4.2.3 @@ -28868,6 +29499,9 @@ packages: /stylis@4.3.0: resolution: {integrity: sha512-E87pIogpwUsUwXw7dNyU4QDjdgVMy52m+XEOPEKUn161cCzWjjhPSQhByfd1CcNvrOLnXQ6OnnZDwnJrz/Z4YQ==} + /stylis@4.3.1: + resolution: {integrity: sha512-EQepAV+wMsIaGVGX1RECzgrcqRRU/0sYOHkeLsZ3fzHaHXZy4DaOOX0vOlGQdlsjkh3mFHAIlVimpwAs4dslyQ==} + /sucrase@3.34.0: resolution: {integrity: sha512-70/LQEZ07TEcxiU2dz51FKaE6hCTWC6vr7FOk3Gr0U60C3shtAN+H+BFr9XlYe5xqf3RA8nrc+VIwzCfnxuXJw==} engines: {node: '>=8'} @@ -29021,7 +29655,7 @@ packages: /swr@2.2.4(react@18.2.0): resolution: {integrity: sha512-njiZ/4RiIhoOlAaLYDqwz5qH/KZXVilRLvomrx83HjzCWTfa+InyfAjv05PSFxnmLzZkNO9ZfvgoqzAaEI4sGQ==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: client-only: 0.0.1 react: 18.2.0 @@ -29219,11 +29853,11 @@ packages: uglify-js: optional: true dependencies: - '@jridgewell/trace-mapping': 0.3.20 + '@jridgewell/trace-mapping': 0.3.25 jest-worker: 27.5.1 schema-utils: 3.3.0 serialize-javascript: 6.0.2 - terser: 5.26.0 + terser: 5.30.1 webpack: 5.91.0 /terser@5.26.0: @@ -29236,6 +29870,16 @@ packages: commander: 2.20.3 source-map-support: 0.5.21 + /terser@5.30.1: + resolution: {integrity: sha512-PJhOnRttZqqmIujxOQOMu4QuFGvh43lR7Youln3k6OJvmxwZ5FxK5rbCEh8XABRCpLf7ZnhrZuclCNCASsScnA==} + engines: {node: '>=10'} + hasBin: true + dependencies: + '@jridgewell/source-map': 0.3.6 + acorn: 8.11.3 + commander: 2.20.3 + source-map-support: 0.5.21 + /test-exclude@6.0.0: resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==} engines: {node: '>=8'} @@ -29512,13 +30156,13 @@ packages: resolution: {integrity: sha512-AqTiAOLcj85xS7vQ8QkAV41hPDIJ71XJB4RCUrzo/1GM2CQwhkJGaf9Hgr7BOugMRpgGUrqRg/DrBDl4H40+8g==} dev: true - /ts-api-utils@1.0.3(typescript@5.1.3): + /ts-api-utils@1.0.3(typescript@5.4.3): resolution: {integrity: sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==} engines: {node: '>=16.13.0'} peerDependencies: - typescript: '>=4.2.0' + typescript: 5.4.3 dependencies: - typescript: 5.1.3 + typescript: 5.4.3 /ts-dedent@2.2.0: resolution: {integrity: sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==} @@ -29529,27 +30173,27 @@ packages: resolution: {integrity: sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==} dev: false - /ts-loader@7.0.5(typescript@5.1.3): + /ts-loader@7.0.5(typescript@5.4.3): resolution: {integrity: sha512-zXypEIT6k3oTc+OZNx/cqElrsbBtYqDknf48OZos0NQ3RTt045fBIU8RRSu+suObBzYB355aIPGOe/3kj9h7Ig==} engines: {node: '>=10.0.0'} peerDependencies: - typescript: '*' + typescript: 5.4.3 dependencies: chalk: 2.4.2 enhanced-resolve: 4.5.0 loader-utils: 1.4.2 micromatch: 4.0.5 semver: 6.3.1 - typescript: 5.1.3 + typescript: 5.4.3 dev: false - /ts-node-dev@1.1.8(typescript@5.1.3): + /ts-node-dev@1.1.8(typescript@5.4.3): resolution: {integrity: sha512-Q/m3vEwzYwLZKmV6/0VlFxcZzVV/xcgOt+Tx/VjaaRHyiBcFlV0541yrT09QjzzCxlDZ34OzKjrFAynlmtflEg==} engines: {node: '>=0.8.0'} hasBin: true peerDependencies: node-notifier: '*' - typescript: '*' + typescript: 5.4.3 peerDependenciesMeta: node-notifier: optional: true @@ -29562,19 +30206,19 @@ packages: rimraf: 2.7.1 source-map-support: 0.5.21 tree-kill: 1.2.2 - ts-node: 9.1.1(typescript@5.1.3) + ts-node: 9.1.1(typescript@5.4.3) tsconfig: 7.0.0 - typescript: 5.1.3 + typescript: 5.4.3 dev: false - /ts-node@10.9.2(@types/node@20.12.2)(typescript@4.9.5): + /ts-node@10.9.2(@types/node@20.12.2)(typescript@5.4.3): resolution: {integrity: sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==} hasBin: true peerDependencies: '@swc/core': '>=1.2.50' '@swc/wasm': '>=1.2.50' '@types/node': ^20.12.2 - typescript: '>=2.7' + typescript: 5.4.3 peerDependenciesMeta: '@swc/core': optional: true @@ -29593,24 +30237,24 @@ packages: create-require: 1.1.1 diff: 4.0.2 make-error: 1.3.6 - typescript: 4.9.5 + typescript: 5.4.3 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 dev: true - /ts-node@9.1.1(typescript@5.1.3): + /ts-node@9.1.1(typescript@5.4.3): resolution: {integrity: sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==} engines: {node: '>=10.0.0'} hasBin: true peerDependencies: - typescript: '>=2.7' + typescript: 5.4.3 dependencies: arg: 4.1.3 create-require: 1.1.1 diff: 4.0.2 make-error: 1.3.6 source-map-support: 0.5.21 - typescript: 5.1.3 + typescript: 5.4.3 yn: 3.1.1 dev: false @@ -29655,14 +30299,14 @@ packages: engines: {node: '>=0.6.x'} dev: false - /tsup@7.2.0(postcss@8.4.35)(typescript@5.1.3): + /tsup@7.2.0(postcss@8.4.35)(typescript@5.4.3): resolution: {integrity: sha512-vDHlczXbgUvY3rWvqFEbSqmC1L7woozbzngMqTtL2PGBODTtWlRwGDDawhvWzr5c1QjKe4OAKqJGfE1xeXUvtQ==} engines: {node: '>=16.14'} hasBin: true peerDependencies: '@swc/core': ^1 postcss: ^8.4.12 - typescript: '>=4.1.0' + typescript: 5.4.3 peerDependenciesMeta: '@swc/core': optional: true @@ -29686,20 +30330,20 @@ packages: source-map: 0.8.0-beta.0 sucrase: 3.34.0 tree-kill: 1.2.2 - typescript: 5.1.3 + typescript: 5.4.3 transitivePeerDependencies: - supports-color - ts-node dev: false - /tsutils@3.21.0(typescript@5.1.3): + /tsutils@3.21.0(typescript@5.4.3): resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} engines: {node: '>= 6'} peerDependencies: - typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta' + typescript: 5.4.3 dependencies: tslib: 1.14.1 - typescript: 5.1.3 + typescript: 5.4.3 /tsx@4.6.2: resolution: {integrity: sha512-QPpBdJo+ZDtqZgAnq86iY/PD2KYCUPSUGIunHdGwyII99GKH+f3z3FZ8XNFLSGQIA4I365ui8wnQpl8OKLqcsg==} @@ -29864,14 +30508,8 @@ packages: ts-toolbelt: 9.6.0 dev: true - /typescript@4.9.5: - resolution: {integrity: sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==} - engines: {node: '>=4.2.0'} - hasBin: true - dev: true - - /typescript@5.1.3: - resolution: {integrity: sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==} + /typescript@5.4.3: + resolution: {integrity: sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==} engines: {node: '>=14.17'} hasBin: true @@ -29905,22 +30543,22 @@ packages: requiresBuild: true optional: true - /umi@4.0.89(@babel/core@7.22.10)(@types/node@20.12.2)(@types/react@17.0.73)(eslint@8.55.0)(prettier@3.2.5)(react-dom@18.2.0)(react@18.2.0)(sass@1.69.5)(stylelint@14.16.1)(typescript@5.1.3)(webpack@5.91.0): + /umi@4.0.89(@babel/core@7.22.10)(@types/node@20.12.2)(@types/react@18.2.73)(eslint@8.55.0)(prettier@3.2.5)(react-dom@18.2.0)(react@18.2.0)(stylelint@14.16.1)(typescript@5.4.3)(webpack@5.91.0): resolution: {integrity: sha512-bC62ctJ3wnymADnhE5nU7IZz4+XQ3MPWwoVW150OJazyAqEioZdjIZEBgB9pVfQEM819xMc6+eslnyuCNOQV+g==} engines: {node: '>=14'} hasBin: true dependencies: '@babel/runtime': 7.23.2 '@umijs/bundler-utils': 4.0.89 - '@umijs/bundler-webpack': 4.0.89(typescript@5.1.3)(webpack@5.91.0) + '@umijs/bundler-webpack': 4.0.89(typescript@5.4.3)(webpack@5.91.0) '@umijs/core': 4.0.89 - '@umijs/lint': 4.0.89(eslint@8.55.0)(stylelint@14.16.1)(typescript@5.1.3) - '@umijs/preset-umi': 4.0.89(@types/node@20.12.2)(@types/react@17.0.73)(sass@1.69.5)(typescript@5.1.3)(webpack@5.91.0) + '@umijs/lint': 4.0.89(eslint@8.55.0)(stylelint@14.16.1)(typescript@5.4.3) + '@umijs/preset-umi': 4.0.89(@types/node@20.12.2)(@types/react@18.2.73)(sass@1.69.5)(typescript@5.4.3)(webpack@5.91.0) '@umijs/renderer-react': 4.0.89(react-dom@18.2.0)(react@18.2.0) '@umijs/server': 4.0.89 '@umijs/test': 4.0.89(@babel/core@7.22.10) '@umijs/utils': 4.0.89 - prettier-plugin-organize-imports: 3.2.4(prettier@3.2.5)(typescript@5.1.3) + prettier-plugin-organize-imports: 3.2.4(prettier@3.2.5)(typescript@5.4.3) prettier-plugin-packagejson: 2.4.3(prettier@3.2.5) transitivePeerDependencies: - '@babel/core' @@ -29953,6 +30591,57 @@ packages: - webpack-dev-server - webpack-hot-middleware - webpack-plugin-serve + dev: false + + /umi@4.0.89(@babel/core@7.22.10)(@types/node@20.12.2)(@types/react@18.2.73)(eslint@8.57.0)(prettier@3.2.5)(react-dom@18.2.0)(react@18.2.0)(sass@1.69.5)(stylelint@14.16.1)(typescript@5.4.3)(webpack@5.91.0): + resolution: {integrity: sha512-bC62ctJ3wnymADnhE5nU7IZz4+XQ3MPWwoVW150OJazyAqEioZdjIZEBgB9pVfQEM819xMc6+eslnyuCNOQV+g==} + engines: {node: '>=14'} + hasBin: true + dependencies: + '@babel/runtime': 7.23.2 + '@umijs/bundler-utils': 4.0.89 + '@umijs/bundler-webpack': 4.0.89(typescript@5.4.3)(webpack@5.91.0) + '@umijs/core': 4.0.89 + '@umijs/lint': 4.0.89(eslint@8.57.0)(stylelint@14.16.1)(typescript@5.4.3) + '@umijs/preset-umi': 4.0.89(@types/node@20.12.2)(@types/react@18.2.73)(sass@1.69.5)(typescript@5.4.3)(webpack@5.91.0) + '@umijs/renderer-react': 4.0.89(react-dom@18.2.0)(react@18.2.0) + '@umijs/server': 4.0.89 + '@umijs/test': 4.0.89(@babel/core@7.22.10) + '@umijs/utils': 4.0.89 + prettier-plugin-organize-imports: 3.2.4(prettier@3.2.5)(typescript@5.4.3) + prettier-plugin-packagejson: 2.4.3(prettier@3.2.5) + transitivePeerDependencies: + - '@babel/core' + - '@types/node' + - '@types/react' + - '@types/webpack' + - '@volar/vue-language-plugin-pug' + - '@volar/vue-typescript' + - eslint + - jest + - postcss-html + - postcss-jsx + - postcss-less + - postcss-markdown + - postcss-scss + - prettier + - react + - react-dom + - rollup + - sass + - sockjs-client + - stylelint + - stylus + - sugarss + - supports-color + - terser + - type-fest + - typescript + - webpack + - webpack-dev-server + - webpack-hot-middleware + - webpack-plugin-serve + dev: true /umzug@3.5.0: resolution: {integrity: sha512-bL6JjH716l0kg7V2Acrw5UmUgeLxdAZv3drMhKrJCXxEfK/qyM+B5s3ai1BjG1NyEGeXTOkhFIUgkMFo6zqVBg==} @@ -29987,10 +30676,10 @@ packages: /uncontrollable@7.2.1(react@18.2.0): resolution: {integrity: sha512-svtcfoTADIB0nT9nltgjujTi7BzVmwjZClOmskKu/E8FW9BXzg9os8OLr4f8Dlnk0rYWJIWr4wv9eKUXiQvQwQ==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: '@babel/runtime': 7.24.0 - '@types/react': 17.0.73 + '@types/react': 18.2.73 invariant: 2.2.4 react: 18.2.0 react-lifecycles-compat: 3.0.4 @@ -30250,6 +30939,16 @@ packages: escalade: 3.1.1 picocolors: 1.0.0 + /update-browserslist-db@1.0.13(browserslist@4.23.0): + resolution: {integrity: sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==} + hasBin: true + peerDependencies: + browserslist: '>= 4.21.0' + dependencies: + browserslist: 4.23.0 + escalade: 3.1.1 + picocolors: 1.0.0 + /update-check@1.5.2: resolution: {integrity: sha512-1TrmYLuLj/5ZovwUS7fFd1jMH3NnFDN1y1A8dboedIDt7zs/zJMo6TwwlhYKkSeEwzleeiSBV5/3c9ufAQWDaQ==} dependencies: @@ -30362,7 +31061,7 @@ packages: /use-debouncy@4.3.1(react@18.2.0): resolution: {integrity: sha512-K+qtK89KojRB2GbTGtmJRysSii+wVg540bYeW9YBF7jqtwoGjIpY3m71BP0NeZzOMCcbZ6ZodLw6QeN3ascTZg==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: react: 18.2.0 dev: true @@ -30370,7 +31069,7 @@ packages: /use-debouncy@4.6.0(react@18.2.0): resolution: {integrity: sha512-5N3n/oQYMuU3QKLXDa9p/xtdPKBcNbGQdLqJJPrkT164IMpHdke5xqoehDZCmgDciy+wJC+iqyE3g8c+k03lGg==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: react: 18.2.0 dev: true @@ -30379,43 +31078,43 @@ packages: resolution: {integrity: sha512-kbeNVZ9Zkc0RFGpfMN3MNfaKNvcLNyxOAAd9O4CBZ+kCBXXscn9s/4I+8ytUER4RDpEYs5+O6Rs4PqiZ+rHr5Q==} engines: {node: '>=10', npm: '>=6'} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: '@babel/runtime': 7.24.0 dequal: 2.0.3 react: 18.2.0 dev: false - /use-isomorphic-layout-effect@1.1.2(@types/react@17.0.73)(react@18.2.0): + /use-isomorphic-layout-effect@1.1.2(@types/react@18.2.73)(react@18.2.0): resolution: {integrity: sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA==} peerDependencies: '@types/react': '*' - react: ^18.0.0 + react: 18.2.0 peerDependenciesMeta: '@types/react': optional: true dependencies: - '@types/react': 17.0.73 + '@types/react': 18.2.73 react: 18.2.0 /use-memo-one@1.1.3(react@18.2.0): resolution: {integrity: sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: react: 18.2.0 /use-merge-value@1.2.0(react@18.2.0): resolution: {integrity: sha512-DXgG0kkgJN45TcyoXL49vJnn55LehnrmoHc7MbKi+QDBvr8dsesqws8UlyIWGHMR+JXgxc1nvY+jDGMlycsUcw==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: react: 18.2.0 /use-sync-external-store@1.2.0(react@18.2.0): resolution: {integrity: sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==} peerDependencies: - react: ^18.0.0 + react: 18.2.0 dependencies: react: 18.2.0 @@ -30905,7 +31604,7 @@ packages: '@webassemblyjs/wasm-parser': 1.12.1 acorn: 8.11.3 acorn-import-assertions: 1.9.0(acorn@8.11.3) - browserslist: 4.22.2 + browserslist: 4.23.0 chrome-trace-event: 1.0.3 enhanced-resolve: 5.16.0 es-module-lexer: 1.5.0 @@ -31526,13 +32225,13 @@ packages: readable-stream: 3.6.2 dev: true - /zustand@4.4.7(@types/react@17.0.73)(react@18.2.0): + /zustand@4.4.7(@types/react@18.2.73)(react@18.2.0): resolution: {integrity: sha512-QFJWJMdlETcI69paJwhSMJz7PPWjVP8Sjhclxmxmxv/RYI7ZOvR5BHX+ktH0we9gTWQMxcne8q1OY8xxz604gw==} engines: {node: '>=12.7.0'} peerDependencies: - '@types/react': ^17.0.0 + '@types/react': 18.2.73 immer: '>=9.0' - react: ^18.0.0 + react: 18.2.0 peerDependenciesMeta: '@types/react': optional: true @@ -31541,7 +32240,7 @@ packages: react: optional: true dependencies: - '@types/react': 17.0.73 + '@types/react': 18.2.73 react: 18.2.0 use-sync-external-store: 1.2.0(react@18.2.0) dev: true diff --git a/tsconfig.json b/tsconfig.json index d4a29846f..2b5430e50 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,6 +1,7 @@ { "extends": "./tsconfig.paths.json", "compilerOptions": { + "lib": ["esnext", "DOM.Iterable", "DOM"], "esModuleInterop": true, "moduleResolution": "node", "outDir": "temp",