From 701266390ddabc23fa7cb20f5b84f7877e53a467 Mon Sep 17 00:00:00 2001 From: ng-nest-moon Date: Sat, 9 Dec 2023 12:21:56 +0800 Subject: [PATCH] refactor(standalone): update all components to standalone components includes: other all components --- .../13__ui/src/layout/index/index.module.ts | 4 +- .../9__ui/src/layout/index/index.module.ts | 4 +- .../src/main/system/users/user.module.ts | 4 +- .../src/main/system/users/user.module.ts | 4 +- .../src/main/system/users/user.module.ts | 4 +- .../src/main/system/users/user.module.ts | 6 +- .../src/main/system/users/user.module.ts | 8 +- .../course/rbac/5-user-manage/readme.en_US.md | 2 +- .../course/rbac/5-user-manage/readme.zh_CN.md | 2 +- lib/ng-nest/ui/affix/affix.component.spec.ts | 4 +- lib/ng-nest/ui/affix/affix.property.ts | 2 +- lib/ng-nest/ui/alert/alert.component.spec.ts | 8 +- lib/ng-nest/ui/alert/alert.property.ts | 2 +- .../en_US/default/custom/custom.component.ts | 4 +- .../zh_CN/default/custom/custom.component.ts | 4 +- .../ui/anchor/anchor.component.spec.ts | 4 +- lib/ng-nest/ui/anchor/anchor.component.ts | 4 +- lib/ng-nest/ui/anchor/anchor.property.ts | 4 +- .../auto-complete.component.spec.ts | 16 +-- .../auto-complete/auto-complete.property.ts | 2 +- .../en_US/default/size/size.component.ts | 4 +- .../zh_CN/default/size/size.component.ts | 4 +- .../ui/avatar/avatar-group.component.ts | 1 - .../ui/avatar/avatar.component.spec.ts | 4 +- lib/ng-nest/ui/avatar/avatar.property.ts | 4 +- .../ui/back-top/back-top.component.spec.ts | 9 +- lib/ng-nest/ui/badge/badge.component.spec.ts | 4 +- lib/ng-nest/ui/badge/badge.property.ts | 2 +- .../ui/base-form/base-form.property.ts | 2 +- .../ui/border/border.component.spec.ts | 4 +- .../ui/button/button.component.spec.ts | 4 +- lib/ng-nest/ui/button/button.property.ts | 4 +- .../ui/calendar/calendar.component.spec.ts | 4 +- lib/ng-nest/ui/calendar/calendar.component.ts | 8 +- lib/ng-nest/ui/calendar/calendar.property.ts | 2 +- lib/ng-nest/ui/card/card.component.spec.ts | 4 +- lib/ng-nest/ui/card/card.property.ts | 2 +- .../ui/carousel/carousel.component.spec.ts | 9 +- lib/ng-nest/ui/carousel/carousel.component.ts | 4 +- lib/ng-nest/ui/carousel/carousel.property.ts | 4 +- .../ui/cascade/cascade.component.spec.ts | 8 +- lib/ng-nest/ui/cascade/cascade.module.ts | 5 +- .../en_US/default/size/size.component.ts | 4 +- .../zh_CN/default/size/size.component.ts | 4 +- .../ui/checkbox/checkbox.component.spec.ts | 16 +-- lib/ng-nest/ui/checkbox/checkbox.component.ts | 4 +- .../default/perpost/perpost.component.ts | 4 +- .../en_US/default/tag/tag.component.ts | 4 +- .../default/perpost/perpost.component.ts | 4 +- .../zh_CN/default/tag/tag.component.ts | 4 +- .../ui/collapse/collapse.component.spec.ts | 4 +- .../color-picker-portal.component.ts | 24 ++-- .../color-picker.component.spec.ts | 8 +- .../ui/color-picker/color-picker.module.ts | 5 +- .../ui/color-picker/color-picker.property.ts | 2 +- .../en_US/default/size/size.component.ts | 4 +- .../zh_CN/default/size/size.component.ts | 4 +- lib/ng-nest/ui/color/color.component.spec.ts | 4 +- lib/ng-nest/ui/color/color.property.ts | 2 +- .../ui/comment/comment.component.spec.ts | 4 +- lib/ng-nest/ui/comment/comment.component.ts | 8 +- lib/ng-nest/ui/comment/comment.property.ts | 4 +- .../ui/container/container.component.spec.ts | 4 +- lib/ng-nest/ui/container/container.module.ts | 6 +- .../ui/container/container.property.ts | 8 +- .../services/preloading-strategy.service.ts | 2 +- lib/ng-nest/ui/crumb/crumb.component.spec.ts | 8 +- lib/ng-nest/ui/crumb/crumb.property.ts | 2 +- .../en_US/default/custom/custom.component.ts | 4 +- .../zh_CN/default/custom/custom.component.ts | 4 +- .../date-picker/date-picker.component.spec.ts | 12 +- .../ui/date-picker/date-picker.module.ts | 28 +--- .../en_US/default/size/size.component.ts | 4 +- .../zh_CN/default/size/size.component.ts | 4 +- .../description/description.component.spec.ts | 8 +- .../en_US/default/size/size.component.ts | 4 +- .../zh_CN/default/size/size.component.ts | 4 +- .../ui/dialog/dialog.component.spec.ts | 13 +- lib/ng-nest/ui/dialog/dialog.module.ts | 7 +- .../default/container/container.component.ts | 4 +- .../default/default/default.component.ts | 6 +- .../default/resizable/resizable.component.ts | 4 +- .../default/container/container.component.ts | 4 +- .../default/default/default.component.ts | 4 +- .../default/resizable/resizable.component.ts | 4 +- lib/ng-nest/ui/doc/doc.component.spec.ts | 9 +- .../ui/drawer/drawer.component.spec.ts | 8 +- lib/ng-nest/ui/drawer/drawer.module.ts | 3 - .../default/container/container.component.ts | 4 +- .../en_US/default/custom/custom.component.ts | 4 +- .../default/default/default.component.ts | 4 +- .../default/container/container.component.ts | 4 +- .../zh_CN/default/custom/custom.component.ts | 4 +- .../default/default/default.component.ts | 4 +- .../ui/dropdown/dropdown.component.spec.ts | 4 +- lib/ng-nest/ui/dropdown/dropdown.module.ts | 6 +- lib/ng-nest/ui/empty/empty.component.spec.ts | 4 +- lib/ng-nest/ui/empty/empty.component.ts | 2 +- lib/ng-nest/ui/empty/empty.property.ts | 2 +- .../ui/examples/examples.component.spec.ts | 29 ++-- .../en_US/default/size/size.component.ts | 4 +- .../zh_CN/default/size/size.component.ts | 4 +- lib/ng-nest/ui/find/find.component.spec.ts | 8 +- lib/ng-nest/ui/find/find.component.ts | 12 +- lib/ng-nest/ui/form/control.component.ts | 24 ++-- lib/ng-nest/ui/form/form.component.spec.ts | 2 - .../ui/highlight/highlight.component.spec.ts | 4 +- .../ant-design/ant-design.component.ts | 4 +- .../en_US/default/eva/eva.component.ts | 4 +- .../default/feather/feather.component.ts | 4 +- .../font-awesome/font-awesome.component.ts | 4 +- .../material-design.component.ts | 4 +- .../ant-design/ant-design.component.ts | 4 +- .../zh_CN/default/eva/eva.component.ts | 4 +- .../default/feather/feather.component.ts | 4 +- .../font-awesome/font-awesome.component.ts | 4 +- .../material-design.component.ts | 4 +- lib/ng-nest/ui/icon/icon.component.spec.ts | 4 +- lib/ng-nest/ui/icon/icon.component.ts | 2 +- lib/ng-nest/ui/icon/icon.property.ts | 2 +- lib/ng-nest/ui/image/image.component.spec.ts | 6 +- .../en_US/default/size/size.component.ts | 4 +- .../zh_CN/default/size/size.component.ts | 4 +- .../input-number.component.spec.ts | 8 +- .../en_US/default/group/group.component.ts | 8 +- .../default/perpost/perpost.component.ts | 4 +- .../en_US/default/size/size.component.ts | 4 +- .../zh_CN/default/group/group.component.ts | 8 +- .../default/perpost/perpost.component.ts | 4 +- .../zh_CN/default/size/size.component.ts | 4 +- lib/ng-nest/ui/input/input.component.spec.ts | 16 +-- .../ui/layout/layout.component.spec.ts | 4 +- lib/ng-nest/ui/layout/layout.property.ts | 2 +- lib/ng-nest/ui/link/link.component.spec.ts | 4 +- lib/ng-nest/ui/link/link.property.ts | 2 +- .../en_US/default/scroll/scroll.component.ts | 4 +- .../en_US/default/size/size.component.ts | 4 +- .../zh_CN/default/scroll/scroll.component.ts | 4 +- .../zh_CN/default/size/size.component.ts | 4 +- lib/ng-nest/ui/list/list.component.spec.ts | 8 +- lib/ng-nest/ui/list/list.component.ts | 16 ++- .../ui/loading/loading.component.spec.ts | 4 +- lib/ng-nest/ui/menu/menu-node.component.ts | 2 +- lib/ng-nest/ui/menu/menu.component.spec.ts | 4 +- lib/ng-nest/ui/menu/menu.component.ts | 4 +- .../default/confirm/confirm.component.ts | 4 + .../en_US/default/custom/custom.component.ts | 4 + .../default/default/default.component.ts | 4 + .../en_US/default/prompt/prompt.component.ts | 11 +- lib/ng-nest/ui/message-box/examples/index.ts | 4 + .../default/confirm/confirm.component.ts | 4 + .../zh_CN/default/custom/custom.component.ts | 4 + .../default/default/default.component.ts | 4 + .../zh_CN/default/prompt/prompt.component.ts | 11 +- .../message-box/message-box.component.spec.ts | 22 +-- .../ui/message-box/message-box.component.ts | 20 ++- .../ui/message-box/message-box.module.ts | 27 +--- .../ui/message-box/message-box.service.ts | 7 +- .../ui/message/message.component.spec.ts | 5 +- lib/ng-nest/ui/message/message.module.ts | 5 +- .../default/default/default.component.ts | 6 +- .../en_US/default/type/type.component.ts | 4 + lib/ng-nest/ui/notification/examples/index.ts | 2 + .../default/default/default.component.ts | 9 +- .../zh_CN/default/type/type.component.ts | 7 +- .../notification.component.spec.ts | 48 +++++-- .../ui/notification/notification.component.ts | 8 +- .../ui/notification/notification.module.ts | 10 +- .../ui/notification/notification.service.ts | 11 +- .../default/default/default.component.ts | 4 + lib/ng-nest/ui/outlet/examples/index.ts | 1 + .../default/default/default.component.ts | 4 + .../default/default/default.component.ts | 3 + lib/ng-nest/ui/page-header/examples/index.ts | 1 + .../default/default/default.component.ts | 3 + .../page-header/page-header.component.spec.ts | 8 +- .../ui/page-header/page-header.component.ts | 12 +- .../ui/page-header/page-header.module.ts | 6 +- .../default/default/default.component.ts | 3 + .../en_US/default/style/style.component.ts | 3 + lib/ng-nest/ui/pagination/examples/index.ts | 2 + .../default/default/default.component.html | 8 +- .../default/default/default.component.ts | 3 + .../zh_CN/default/style/style.component.ts | 3 + .../pagination/pagination.component.spec.ts | 6 +- .../ui/pagination/pagination.component.ts | 42 ++++-- .../ui/pagination/pagination.module.ts | 20 +-- lib/ng-nest/ui/pattern/pattern.component.ts | 2 + .../async-close/async-close.component.ts | 4 + .../default/condition/condition.component.ts | 6 + .../default/default/default.component.ts | 4 + lib/ng-nest/ui/popconfirm/examples/index.ts | 3 + .../async-close/async-close.component.ts | 4 + .../default/condition/condition.component.ts | 6 + .../default/default/default.component.ts | 4 + .../popconfirm/popconfirm.component.spec.ts | 16 +-- .../ui/popconfirm/popconfirm.component.ts | 28 ++-- .../ui/popconfirm/popconfirm.module.ts | 9 +- .../default/default/default.component.ts | 4 + lib/ng-nest/ui/popover/examples/index.ts | 1 + .../default/default/default.component.ts | 4 + .../ui/popover/popover-portal.component.ts | 11 +- .../ui/popover/popover.directive.spec.ts | 8 +- lib/ng-nest/ui/popover/popover.directive.ts | 35 +++-- lib/ng-nest/ui/popover/popover.module.ts | 9 +- .../en_US/default/circle/circle.component.ts | 3 + .../en_US/default/color/color.component.ts | 5 + .../default/dashboard/dashboard.component.ts | 5 +- .../default/default/default.component.ts | 3 + .../en_US/default/format/format.component.ts | 3 + .../default/gradient/gradient.component.ts | 5 +- .../en_US/default/inside/inside.component.ts | 3 + .../en_US/default/steps/steps.component.ts | 5 +- .../subsection/subsection.component.ts | 5 + lib/ng-nest/ui/progress/examples/index.ts | 9 ++ .../zh_CN/default/circle/circle.component.ts | 5 +- .../zh_CN/default/color/color.component.ts | 5 + .../default/dashboard/dashboard.component.ts | 5 +- .../default/default/default.component.ts | 3 + .../zh_CN/default/format/format.component.ts | 3 + .../default/gradient/gradient.component.ts | 5 +- .../zh_CN/default/inside/inside.component.ts | 3 + .../zh_CN/default/steps/steps.component.ts | 5 +- .../subsection/subsection.component.ts | 5 + .../ui/progress/progress.component.spec.ts | 10 +- lib/ng-nest/ui/progress/progress.component.ts | 26 ++-- lib/ng-nest/ui/progress/progress.module.ts | 7 +- .../en_US/default/async/async.component.html | 20 ++- .../en_US/default/async/async.component.scss | 2 +- .../en_US/default/async/async.component.ts | 7 +- .../default/button/button.component.html | 32 ++--- .../default/button/button.component.scss | 2 +- .../en_US/default/button/button.component.ts | 5 +- .../default/default/default.component.html | 14 +- .../default/default/default.component.scss | 2 +- .../default/default/default.component.ts | 5 +- .../default/disabled/disabled.component.html | 20 ++- .../default/disabled/disabled.component.scss | 2 +- .../default/disabled/disabled.component.ts | 5 +- .../en_US/default/icon/icon.component.html | 32 ++--- .../en_US/default/icon/icon.component.scss | 2 +- .../en_US/default/icon/icon.component.ts | 5 +- .../default/perpost/perpost.component.html | 111 +++++++------- .../default/perpost/perpost.component.scss | 2 +- .../default/perpost/perpost.component.ts | 26 +++- .../en_US/default/tag/tag.component.html | 63 +++++++- .../en_US/default/tag/tag.component.ts | 6 + lib/ng-nest/ui/radio/examples/index.ts | 7 + .../zh_CN/default/async/async.component.html | 20 ++- .../zh_CN/default/async/async.component.scss | 2 +- .../zh_CN/default/async/async.component.ts | 7 +- .../default/button/button.component.html | 32 ++--- .../default/button/button.component.scss | 2 +- .../zh_CN/default/button/button.component.ts | 5 +- .../default/default/default.component.html | 14 +- .../default/default/default.component.scss | 2 +- .../default/default/default.component.ts | 5 +- .../default/disabled/disabled.component.html | 20 ++- .../default/disabled/disabled.component.scss | 2 +- .../default/disabled/disabled.component.ts | 5 +- .../zh_CN/default/icon/icon.component.html | 32 ++--- .../zh_CN/default/icon/icon.component.scss | 2 +- .../zh_CN/default/icon/icon.component.ts | 5 +- .../default/perpost/perpost.component.html | 110 +++++++------- .../default/perpost/perpost.component.scss | 4 +- .../default/perpost/perpost.component.ts | 26 +++- .../zh_CN/default/tag/tag.component.ts | 6 + lib/ng-nest/ui/radio/radio.component.spec.ts | 22 ++- lib/ng-nest/ui/radio/radio.component.ts | 25 ++-- lib/ng-nest/ui/radio/radio.module.ts | 18 +-- .../en_US/default/color/color.component.html | 54 ++++--- .../en_US/default/color/color.component.scss | 2 +- .../en_US/default/color/color.component.ts | 5 + .../default/custom/custom.component.html | 24 ++-- .../default/custom/custom.component.scss | 5 +- .../en_US/default/custom/custom.component.ts | 5 + .../default/default/default.component.html | 16 +-- .../default/default/default.component.scss | 5 +- .../default/default/default.component.ts | 4 + .../default/disabled/disabled.component.html | 16 +-- .../default/disabled/disabled.component.scss | 5 +- .../default/disabled/disabled.component.ts | 4 + .../en_US/default/half/half.component.html | 16 +-- .../en_US/default/half/half.component.scss | 5 +- .../en_US/default/half/half.component.ts | 4 + lib/ng-nest/ui/rate/examples/index.ts | 5 + .../zh_CN/default/color/color.component.html | 54 ++++--- .../zh_CN/default/color/color.component.scss | 2 +- .../zh_CN/default/color/color.component.ts | 5 + .../default/custom/custom.component.html | 24 ++-- .../default/custom/custom.component.scss | 5 +- .../zh_CN/default/custom/custom.component.ts | 5 + .../default/default/default.component.html | 16 +-- .../default/default/default.component.scss | 5 +- .../default/default/default.component.ts | 4 + .../default/disabled/disabled.component.html | 16 +-- .../default/disabled/disabled.component.scss | 5 +- .../default/disabled/disabled.component.ts | 4 + .../zh_CN/default/half/half.component.html | 16 +-- .../zh_CN/default/half/half.component.scss | 5 +- .../zh_CN/default/half/half.component.ts | 4 + lib/ng-nest/ui/rate/rate.component.spec.ts | 27 +--- lib/ng-nest/ui/rate/rate.component.ts | 32 +++-- lib/ng-nest/ui/rate/rate.module.ts | 9 +- .../en_US/default/error/error.component.ts | 7 +- .../en_US/default/icon/icon.component.ts | 7 +- .../en_US/default/img/img.component.ts | 8 +- .../en_US/default/info/info.component.ts | 8 +- .../default/result403/result403.component.ts | 7 +- .../default/result404/result404.component.ts | 7 +- .../default/result500/result500.component.ts | 7 +- .../default/success/success.component.ts | 7 +- .../default/warning/warning.component.ts | 7 +- lib/ng-nest/ui/result/examples/index.ts | 9 ++ .../zh_CN/default/error/error.component.ts | 7 +- .../zh_CN/default/icon/icon.component.ts | 7 +- .../zh_CN/default/img/img.component.ts | 8 +- .../zh_CN/default/info/info.component.ts | 8 +- .../result403/result403.component.html | 2 +- .../default/result403/result403.component.ts | 7 +- .../default/result404/result404.component.ts | 7 +- .../default/result500/result500.component.ts | 7 +- .../default/success/success.component.ts | 7 +- .../default/warning/warning.component.ts | 7 +- .../ui/result/result.component.spec.ts | 10 +- lib/ng-nest/ui/result/result.component.ts | 22 +-- lib/ng-nest/ui/result/result.module.ts | 7 +- lib/ng-nest/ui/ripple/ripple.directive.ts | 8 +- .../en_US/default/async/async.component.html | 6 +- .../en_US/default/async/async.component.scss | 6 - .../en_US/default/async/async.component.ts | 4 + .../default/bordered/bordered.component.html | 32 ++--- .../default/bordered/bordered.component.scss | 5 +- .../default/bordered/bordered.component.ts | 4 +- .../default/custom/custom.component.html | 16 +-- .../default/custom/custom.component.scss | 5 +- .../en_US/default/custom/custom.component.ts | 5 + .../default/default/default.component.html | 16 +-- .../default/default/default.component.scss | 5 +- .../default/default/default.component.ts | 4 + .../default/disabled/disabled.component.html | 16 +-- .../default/disabled/disabled.component.scss | 5 +- .../default/disabled/disabled.component.ts | 5 +- .../en_US/default/label/label.component.html | 32 ++--- .../en_US/default/label/label.component.scss | 5 +- .../en_US/default/label/label.component.ts | 5 +- .../default/multiple/multiple.component.html | 50 +++---- .../default/multiple/multiple.component.scss | 4 +- .../default/multiple/multiple.component.ts | 4 + .../default/required/required.component.html | 16 +-- .../default/required/required.component.scss | 5 +- .../default/required/required.component.ts | 5 +- .../default/search/search.component.html | 118 ++++++++------- .../default/search/search.component.scss | 4 +- .../en_US/default/search/search.component.ts | 23 ++- .../en_US/default/size/size.component.html | 38 +++-- .../en_US/default/size/size.component.scss | 6 +- .../en_US/default/size/size.component.ts | 6 +- lib/ng-nest/ui/select/examples/index.ts | 10 ++ .../zh_CN/default/async/async.component.html | 6 +- .../zh_CN/default/async/async.component.scss | 6 - .../zh_CN/default/async/async.component.ts | 4 + .../default/bordered/bordered.component.html | 32 ++--- .../default/bordered/bordered.component.scss | 5 +- .../default/bordered/bordered.component.ts | 4 +- .../default/custom/custom.component.html | 16 +-- .../default/custom/custom.component.scss | 5 +- .../zh_CN/default/custom/custom.component.ts | 5 + .../default/default/default.component.html | 16 +-- .../default/default/default.component.scss | 5 +- .../default/default/default.component.ts | 4 + .../default/disabled/disabled.component.html | 16 +-- .../default/disabled/disabled.component.scss | 5 +- .../default/disabled/disabled.component.ts | 5 +- .../zh_CN/default/label/label.component.html | 32 ++--- .../zh_CN/default/label/label.component.scss | 5 +- .../zh_CN/default/label/label.component.ts | 5 +- .../default/multiple/multiple.component.html | 50 +++---- .../default/multiple/multiple.component.scss | 4 +- .../default/multiple/multiple.component.ts | 4 + .../default/required/required.component.html | 16 +-- .../default/required/required.component.scss | 5 +- .../default/required/required.component.ts | 5 +- .../default/search/search.component.html | 116 ++++++++------- .../default/search/search.component.scss | 4 +- .../zh_CN/default/search/search.component.ts | 23 ++- .../zh_CN/default/size/size.component.html | 38 +++-- .../zh_CN/default/size/size.component.scss | 6 +- .../zh_CN/default/size/size.component.ts | 6 +- .../ui/select/select-portal.component.ts | 4 + .../ui/select/select.component.spec.ts | 60 ++------ lib/ng-nest/ui/select/select.component.ts | 70 ++++++--- lib/ng-nest/ui/select/select.module.ts | 25 +--- .../en_US/default/active/active.component.ts | 3 + .../default/complex/complex.component.ts | 4 +- .../default/default/default.component.ts | 3 + .../en_US/default/list/list.component.ts | 19 ++- .../default/loading/loading.component.ts | 5 + .../en_US/default/table/table.component.ts | 4 +- lib/ng-nest/ui/skeleton/examples/index.ts | 6 + .../zh_CN/default/active/active.component.ts | 3 + .../default/complex/complex.component.ts | 4 +- .../default/default/default.component.ts | 3 + .../zh_CN/default/list/list.component.html | 5 +- .../zh_CN/default/list/list.component.ts | 19 ++- .../default/loading/loading.component.ts | 5 + .../zh_CN/default/table/table.component.ts | 4 +- .../ui/skeleton/skeleton.component.spec.ts | 19 +-- lib/ng-nest/ui/skeleton/skeleton.component.ts | 19 ++- lib/ng-nest/ui/skeleton/skeleton.module.ts | 6 +- .../custom-value/custom-value.component.html | 18 +-- .../custom-value/custom-value.component.scss | 2 +- .../custom-value/custom-value.component.ts | 5 + .../default/default/default.component.html | 16 +-- .../default/default/default.component.scss | 2 +- .../default/default/default.component.ts | 4 + .../default/disabled/disabled.component.html | 16 +-- .../default/disabled/disabled.component.scss | 2 +- .../default/disabled/disabled.component.ts | 4 + .../en_US/default/icon/icon.component.html | 20 ++- .../en_US/default/icon/icon.component.scss | 2 +- .../en_US/default/icon/icon.component.ts | 6 + .../en_US/default/label/label.component.html | 32 ++--- .../en_US/default/label/label.component.scss | 2 +- .../en_US/default/label/label.component.ts | 4 + .../en_US/default/limit/limit.component.html | 24 ++-- .../en_US/default/limit/limit.component.scss | 2 +- .../en_US/default/limit/limit.component.ts | 4 + .../en_US/default/marks/marks.component.html | 42 ++---- .../en_US/default/marks/marks.component.scss | 2 +- .../en_US/default/marks/marks.component.ts | 5 +- .../precision/precision.component.html | 16 +-- .../precision/precision.component.scss | 2 +- .../default/precision/precision.component.ts | 4 + .../en_US/default/range/range.component.html | 22 ++- .../en_US/default/range/range.component.scss | 2 +- .../en_US/default/range/range.component.ts | 4 + .../default/reverse/reverse.component.html | 14 +- .../default/reverse/reverse.component.scss | 2 +- .../default/reverse/reverse.component.ts | 4 + .../default/vertical/vertical.component.html | 14 +- .../default/vertical/vertical.component.scss | 5 +- .../default/vertical/vertical.component.ts | 4 + .../ui/slider-select/examples/index.ts | 11 ++ .../custom-value/custom-value.component.html | 18 +-- .../custom-value/custom-value.component.scss | 2 +- .../custom-value/custom-value.component.ts | 5 + .../default/default/default.component.html | 16 +-- .../default/default/default.component.scss | 2 +- .../default/default/default.component.ts | 4 + .../default/disabled/disabled.component.html | 16 +-- .../default/disabled/disabled.component.scss | 2 +- .../default/disabled/disabled.component.ts | 4 + .../zh_CN/default/icon/icon.component.html | 20 ++- .../zh_CN/default/icon/icon.component.scss | 2 +- .../zh_CN/default/icon/icon.component.ts | 6 + .../zh_CN/default/label/label.component.html | 32 ++--- .../zh_CN/default/label/label.component.scss | 2 +- .../zh_CN/default/label/label.component.ts | 4 + .../zh_CN/default/limit/limit.component.html | 24 ++-- .../zh_CN/default/limit/limit.component.scss | 2 +- .../zh_CN/default/limit/limit.component.ts | 4 + .../zh_CN/default/marks/marks.component.html | 42 ++---- .../zh_CN/default/marks/marks.component.scss | 2 +- .../zh_CN/default/marks/marks.component.ts | 5 +- .../precision/precision.component.html | 16 +-- .../precision/precision.component.scss | 2 +- .../default/precision/precision.component.ts | 4 + .../zh_CN/default/range/range.component.html | 22 ++- .../zh_CN/default/range/range.component.scss | 2 +- .../zh_CN/default/range/range.component.ts | 4 + .../default/reverse/reverse.component.html | 14 +- .../default/reverse/reverse.component.scss | 4 +- .../default/reverse/reverse.component.ts | 4 + .../default/vertical/vertical.component.html | 14 +- .../default/vertical/vertical.component.scss | 2 +- .../default/vertical/vertical.component.ts | 4 + .../slider-select.component.spec.ts | 21 ++- .../slider-select/slider-select.component.ts | 59 ++++---- .../ui/slider-select/slider-select.module.ts | 20 +-- .../default/activated/activated.component.ts | 4 +- .../en_US/default/custom/custom.component.ts | 6 +- .../default/default/default.component.ts | 4 +- .../en_US/default/expand/expand.component.ts | 4 +- .../en_US/default/scroll/scroll.component.ts | 4 +- .../en_US/default/size/size.component.ts | 4 +- lib/ng-nest/ui/slider/examples/index.ts | 6 + .../default/activated/activated.component.ts | 4 +- .../zh_CN/default/custom/custom.component.ts | 6 +- .../default/default/default.component.ts | 4 +- .../zh_CN/default/expand/expand.component.ts | 4 +- .../zh_CN/default/scroll/scroll.component.ts | 4 +- .../zh_CN/default/size/size.component.ts | 4 +- .../ui/slider/slider.component.spec.ts | 18 ++- lib/ng-nest/ui/slider/slider.component.ts | 50 ++++--- lib/ng-nest/ui/slider/slider.module.ts | 10 +- .../ui/statistic/countdown.component.ts | 18 ++- .../default/default/default.component.html | 22 ++- .../default/default/default.component.scss | 5 + .../default/default/default.component.ts | 8 +- .../en_US/default/down/down.component.html | 32 ++--- .../en_US/default/down/down.component.scss | 5 + .../en_US/default/down/down.component.ts | 8 +- .../default/prefix/prefix.component.html | 54 ++++--- .../default/prefix/prefix.component.scss | 5 + .../en_US/default/prefix/prefix.component.ts | 9 +- lib/ng-nest/ui/statistic/examples/index.ts | 3 + .../default/default/default.component.html | 22 ++- .../default/default/default.component.scss | 5 + .../default/default/default.component.ts | 8 +- .../zh_CN/default/down/down.component.html | 32 ++--- .../zh_CN/default/down/down.component.scss | 5 + .../zh_CN/default/down/down.component.ts | 8 +- .../default/prefix/prefix.component.html | 54 ++++--- .../default/prefix/prefix.component.scss | 5 + .../zh_CN/default/prefix/prefix.component.ts | 9 +- .../ui/statistic/statistic.component.spec.ts | 26 ++-- .../ui/statistic/statistic.component.ts | 11 +- lib/ng-nest/ui/statistic/statistic.module.ts | 7 +- .../en_US/default/custom/custom.component.ts | 4 + .../default/default/default.component.ts | 5 + .../description/description.component.ts | 4 +- .../en_US/default/icon/icon.component.ts | 4 +- .../en_US/default/index/index.component.ts | 4 +- .../en_US/default/layout/layout.component.ts | 4 +- .../node-status/node-status.component.ts | 4 +- .../en_US/default/status/status.component.ts | 4 +- .../en_US/default/tabs/tabs.component.ts | 6 + lib/ng-nest/ui/steps/examples/index.ts | 9 ++ .../zh_CN/default/custom/custom.component.ts | 4 + .../default/default/default.component.ts | 5 + .../description/description.component.ts | 4 +- .../zh_CN/default/icon/icon.component.ts | 4 +- .../zh_CN/default/index/index.component.ts | 4 +- .../zh_CN/default/layout/layout.component.ts | 4 +- .../node-status/node-status.component.ts | 4 +- .../zh_CN/default/status/status.component.ts | 4 +- .../zh_CN/default/tabs/tabs.component.ts | 6 + lib/ng-nest/ui/steps/steps.component.spec.ts | 15 +- lib/ng-nest/ui/steps/steps.component.ts | 24 ++-- lib/ng-nest/ui/steps/steps.module.ts | 7 +- .../default/default/default.component.html | 14 +- .../default/default/default.component.scss | 2 +- .../default/default/default.component.ts | 4 + .../default/disabled/disabled.component.html | 16 +-- .../default/disabled/disabled.component.scss | 2 +- .../default/disabled/disabled.component.ts | 4 + .../en_US/default/label/label.component.html | 28 ++-- .../en_US/default/label/label.component.scss | 2 +- .../en_US/default/label/label.component.ts | 4 + .../default/loading/loading.component.ts | 4 + .../en_US/default/size/size.component.ts | 5 + .../en_US/default/text/text.component.ts | 5 + lib/ng-nest/ui/switch/examples/index.ts | 6 + .../default/default/default.component.html | 16 +-- .../default/default/default.component.scss | 2 +- .../default/default/default.component.ts | 4 + .../default/disabled/disabled.component.html | 16 +-- .../default/disabled/disabled.component.scss | 2 +- .../default/disabled/disabled.component.ts | 4 + .../zh_CN/default/label/label.component.html | 32 ++--- .../zh_CN/default/label/label.component.scss | 2 +- .../zh_CN/default/label/label.component.ts | 4 + .../default/loading/loading.component.ts | 4 + .../zh_CN/default/size/size.component.ts | 5 + .../zh_CN/default/text/text.component.ts | 5 + .../ui/switch/switch.component.spec.ts | 14 +- lib/ng-nest/ui/switch/switch.component.ts | 19 ++- lib/ng-nest/ui/switch/switch.module.ts | 9 +- .../default/adaption/adaption.component.ts | 6 +- .../default/bordered/bordered.component.ts | 4 +- .../default/checkbox/checkbox.component.ts | 4 +- .../en_US/default/config/config.component.ts | 4 +- .../en_US/default/custom/custom.component.ts | 5 +- .../default/default/default.component.ts | 4 +- .../drag-column/drag-column.component.ts | 4 +- .../drag-width/drag-width.component.ts | 4 +- .../en_US/default/edit/edit.component.ts | 20 ++- .../en_US/default/expand/expand.component.ts | 7 +- .../en_US/default/fix/fix.component.ts | 5 +- .../en_US/default/head/head.component.ts | 4 +- .../en_US/default/header/header.component.ts | 6 +- .../default/row-size/row-size.component.ts | 4 +- .../default/rowclass/rowclass.component.ts | 4 +- .../en_US/default/scroll/scroll.component.ts | 4 +- .../en_US/default/search/search.component.ts | 6 + lib/ng-nest/ui/table/examples/index.ts | 17 +++ .../default/adaption/adaption.component.ts | 8 +- .../default/bordered/bordered.component.ts | 6 +- .../default/checkbox/checkbox.component.ts | 4 +- .../zh_CN/default/config/config.component.ts | 4 +- .../zh_CN/default/custom/custom.component.ts | 5 +- .../default/default/default.component.ts | 4 +- .../drag-column/drag-column.component.ts | 4 +- .../drag-width/drag-width.component.ts | 4 +- .../zh_CN/default/edit/edit.component.ts | 24 +++- .../zh_CN/default/expand/expand.component.ts | 7 +- .../zh_CN/default/fix/fix.component.ts | 5 +- .../zh_CN/default/head/head.component.ts | 4 +- .../zh_CN/default/header/header.component.ts | 6 +- .../default/row-size/row-size.component.ts | 4 +- .../default/rowclass/rowclass.component.ts | 4 +- .../zh_CN/default/scroll/scroll.component.ts | 4 +- .../zh_CN/default/search/search.component.ts | 6 + lib/ng-nest/ui/table/table-body.component.ts | 30 +++- lib/ng-nest/ui/table/table-foot.component.ts | 18 +-- lib/ng-nest/ui/table/table-head.component.ts | 50 +++++-- lib/ng-nest/ui/table/table.component.spec.ts | 68 +++------ lib/ng-nest/ui/table/table.component.ts | 28 +++- lib/ng-nest/ui/table/table.module.ts | 43 +----- .../en_US/default/action/action.component.ts | 7 +- .../en_US/default/card/card.component.ts | 4 + .../en_US/default/custom/custom.component.ts | 5 + .../default/default/default.component.ts | 4 + .../en_US/default/expand/expand.component.ts | 4 + .../en_US/default/layout/layout.component.ts | 7 +- .../en_US/default/router/router.component.ts | 5 + .../en_US/default/tag/tag.component.ts | 4 + lib/ng-nest/ui/tabs/examples/index.ts | 8 ++ .../zh_CN/default/action/action.component.ts | 7 +- .../zh_CN/default/card/card.component.ts | 4 + .../zh_CN/default/custom/custom.component.ts | 5 + .../default/default/default.component.ts | 4 + .../zh_CN/default/expand/expand.component.ts | 4 + .../zh_CN/default/layout/layout.component.ts | 7 +- .../zh_CN/default/router/router.component.ts | 5 + .../zh_CN/default/tag/tag.component.html | 2 +- .../zh_CN/default/tag/tag.component.ts | 4 + lib/ng-nest/ui/tabs/tab-content.component.ts | 14 +- lib/ng-nest/ui/tabs/tab-link.directive.ts | 6 +- lib/ng-nest/ui/tabs/tab.component.ts | 18 ++- lib/ng-nest/ui/tabs/tabs.component.spec.ts | 15 +- lib/ng-nest/ui/tabs/tabs.component.ts | 38 +++-- lib/ng-nest/ui/tabs/tabs.module.ts | 25 +--- .../default/bordered/bordered.component.ts | 3 + .../default/checked/checked.component.ts | 3 + .../en_US/default/close/close.component.ts | 4 + .../en_US/default/color/color.component.ts | 5 +- .../default/default/default.component.ts | 3 + .../en_US/default/size/size.component.ts | 3 + lib/ng-nest/ui/tag/examples/index.ts | 6 + .../default/bordered/bordered.component.ts | 3 + .../default/checked/checked.component.ts | 3 + .../zh_CN/default/close/close.component.ts | 4 + .../zh_CN/default/color/color.component.ts | 5 +- .../default/default/default.component.ts | 3 + .../zh_CN/default/size/size.component.ts | 3 + lib/ng-nest/ui/tag/tag.component.spec.ts | 14 +- lib/ng-nest/ui/tag/tag.component.ts | 23 ++- lib/ng-nest/ui/tag/tag.module.ts | 7 +- .../default/default/default.component.ts | 3 + lib/ng-nest/ui/text-retract/examples/index.ts | 1 + .../default/default/default.component.ts | 3 + .../text-retract.component.spec.ts | 6 +- .../ui/text-retract/text-retract.component.ts | 28 ++-- .../ui/text-retract/text-retract.module.ts | 8 +- .../en_US/default/clear/clear.component.html | 32 ++--- .../en_US/default/clear/clear.component.scss | 5 +- .../en_US/default/clear/clear.component.ts | 4 + .../default/default/default.component.html | 16 +-- .../default/default/default.component.scss | 5 +- .../default/default/default.component.ts | 3 + .../default/disabled/disabled.component.html | 32 ++--- .../default/disabled/disabled.component.scss | 5 +- .../default/disabled/disabled.component.ts | 4 + .../en_US/default/icon/icon.component.html | 16 +-- .../en_US/default/icon/icon.component.scss | 5 +- .../en_US/default/icon/icon.component.ts | 3 + .../en_US/default/label/label.component.html | 32 ++--- .../en_US/default/label/label.component.scss | 5 +- .../en_US/default/label/label.component.ts | 3 + .../default/length/length.component.html | 40 ++---- .../default/length/length.component.scss | 5 +- .../en_US/default/length/length.component.ts | 4 + .../default/required/required.component.html | 24 ++-- .../default/required/required.component.scss | 5 +- .../default/required/required.component.ts | 4 + lib/ng-nest/ui/textarea/examples/index.ts | 7 + .../zh_CN/default/clear/clear.component.html | 32 ++--- .../zh_CN/default/clear/clear.component.scss | 5 +- .../zh_CN/default/clear/clear.component.ts | 4 + .../default/default/default.component.html | 16 +-- .../default/default/default.component.scss | 5 +- .../default/default/default.component.ts | 3 + .../default/disabled/disabled.component.html | 32 ++--- .../default/disabled/disabled.component.scss | 5 +- .../default/disabled/disabled.component.ts | 4 + .../zh_CN/default/icon/icon.component.html | 16 +-- .../zh_CN/default/icon/icon.component.scss | 5 +- .../zh_CN/default/icon/icon.component.ts | 3 + .../zh_CN/default/label/label.component.html | 32 ++--- .../zh_CN/default/label/label.component.scss | 5 +- .../zh_CN/default/label/label.component.ts | 3 + .../default/length/length.component.html | 40 ++---- .../default/length/length.component.scss | 5 +- .../zh_CN/default/length/length.component.ts | 4 + .../default/required/required.component.html | 24 ++-- .../default/required/required.component.scss | 5 +- .../default/required/required.component.ts | 4 + .../ui/textarea/textarea.component.spec.ts | 41 ++++-- lib/ng-nest/ui/textarea/textarea.component.ts | 19 +-- lib/ng-nest/ui/textarea/textarea.module.ts | 8 +- .../default/default/default.component.ts | 5 + lib/ng-nest/ui/theme/examples/index.ts | 1 + .../default/default/default.component.ts | 5 + lib/ng-nest/ui/theme/theme.component.spec.ts | 18 +-- lib/ng-nest/ui/theme/theme.component.ts | 58 ++++++-- lib/ng-nest/ui/theme/theme.module.ts | 23 +-- .../default/default/default.component.ts | 11 +- lib/ng-nest/ui/time-ago/examples/index.ts | 1 + .../default/default/default.component.ts | 11 +- lib/ng-nest/ui/time-ago/time-ago.module.ts | 4 +- lib/ng-nest/ui/time-ago/time-ago.pipe.spec.ts | 4 +- lib/ng-nest/ui/time-ago/time-ago.pipe.ts | 29 ++-- .../default/bordered/bordered.component.html | 27 ++-- .../default/bordered/bordered.component.scss | 5 +- .../default/bordered/bordered.component.ts | 4 + .../default/default/default.component.html | 16 +-- .../default/default/default.component.scss | 5 +- .../default/default/default.component.ts | 4 + .../default/disabled/disabled.component.html | 16 +-- .../default/disabled/disabled.component.scss | 5 +- .../default/disabled/disabled.component.ts | 4 + .../hour-minute/hour-minute.component.html | 13 +- .../hour-minute/hour-minute.component.scss | 5 +- .../hour-minute/hour-minute.component.ts | 4 + .../en_US/default/label/label.component.html | 28 ++-- .../en_US/default/label/label.component.scss | 5 +- .../en_US/default/label/label.component.ts | 4 + .../default/preset/preset.component.scss | 2 - .../en_US/default/preset/preset.component.ts | 7 +- .../default/required/required.component.html | 14 +- .../default/required/required.component.scss | 5 +- .../default/required/required.component.ts | 4 + .../en_US/default/size/size.component.html | 32 ++--- .../en_US/default/size/size.component.scss | 6 +- .../en_US/default/size/size.component.ts | 5 + .../en_US/default/step/step.component.scss | 2 - .../en_US/default/step/step.component.ts | 7 +- .../use12hours/use12hours.component.html | 16 +-- .../use12hours/use12hours.component.scss | 5 +- .../use12hours/use12hours.component.ts | 4 + lib/ng-nest/ui/time-picker/examples/index.ts | 10 ++ .../default/bordered/bordered.component.html | 38 ++--- .../default/bordered/bordered.component.scss | 5 +- .../default/bordered/bordered.component.ts | 4 + .../default/default/default.component.html | 16 +-- .../default/default/default.component.scss | 5 +- .../default/default/default.component.ts | 4 + .../default/disabled/disabled.component.html | 16 +-- .../default/disabled/disabled.component.scss | 5 +- .../default/disabled/disabled.component.ts | 4 + .../hour-minute/hour-minute.component.html | 16 +-- .../hour-minute/hour-minute.component.scss | 5 +- .../hour-minute/hour-minute.component.ts | 4 + .../zh_CN/default/label/label.component.html | 32 ++--- .../zh_CN/default/label/label.component.scss | 5 +- .../zh_CN/default/label/label.component.ts | 4 + .../default/preset/preset.component.scss | 2 - .../zh_CN/default/preset/preset.component.ts | 7 +- .../default/required/required.component.html | 16 +-- .../default/required/required.component.scss | 5 +- .../default/required/required.component.ts | 4 + .../zh_CN/default/size/size.component.html | 32 ++--- .../zh_CN/default/size/size.component.scss | 6 +- .../zh_CN/default/size/size.component.ts | 5 + .../zh_CN/default/step/step.component.scss | 2 - .../zh_CN/default/step/step.component.ts | 7 +- .../use12hours/use12hours.component.html | 16 +-- .../use12hours/use12hours.component.scss | 5 +- .../use12hours/use12hours.component.ts | 4 + .../time-picker-frame.component.ts | 39 ++++- .../time-picker-portal.component.ts | 20 ++- .../time-picker/time-picker.component.spec.ts | 8 +- .../ui/time-picker/time-picker.component.ts | 41 +++--- .../ui/time-picker/time-picker.module.ts | 25 +--- .../default/default/default.component.ts | 3 + lib/ng-nest/ui/time-range/examples/index.ts | 1 + .../default/default/default.component.ts | 3 + .../ui/time-range/time-range.module.ts | 4 +- .../ui/time-range/time-range.pipe.spec.ts | 4 +- lib/ng-nest/ui/time-range/time-range.pipe.ts | 2 +- .../en_US/default/color/color.component.ts | 4 +- .../en_US/default/custom/custom.component.ts | 6 +- .../default/default/default.component.ts | 4 +- .../en_US/default/icon/icon.component.ts | 5 +- .../default/loading/loading.component.ts | 4 +- .../en_US/default/mode/mode.component.ts | 7 +- .../en_US/default/size/size.component.ts | 4 +- .../en_US/default/type/type.component.ts | 5 +- lib/ng-nest/ui/timeline/examples/index.ts | 8 ++ .../zh_CN/default/color/color.component.ts | 4 +- .../zh_CN/default/custom/custom.component.ts | 6 +- .../default/default/default.component.ts | 4 +- .../zh_CN/default/icon/icon.component.ts | 5 +- .../default/loading/loading.component.ts | 6 +- .../zh_CN/default/mode/mode.component.ts | 7 +- .../zh_CN/default/size/size.component.ts | 4 +- .../zh_CN/default/type/type.component.ts | 5 +- .../ui/timeline/timeline.component.spec.ts | 18 ++- lib/ng-nest/ui/timeline/timeline.component.ts | 25 ++-- lib/ng-nest/ui/timeline/timeline.module.ts | 9 +- .../default/default/default.component.ts | 4 + lib/ng-nest/ui/tooltip/examples/index.ts | 1 + .../default/default/default.component.ts | 4 + .../ui/tooltip/tooltip-portal.component.ts | 11 +- .../ui/tooltip/tooltip.directive.spec.ts | 19 ++- lib/ng-nest/ui/tooltip/tooltip.directive.ts | 28 ++-- lib/ng-nest/ui/tooltip/tooltip.module.ts | 9 +- .../en_US/default/custom/custom.component.ts | 6 +- .../default/default/default.component.ts | 5 +- .../en_US/default/drag/drag.component.ts | 5 +- .../en_US/default/footer/footer.component.ts | 6 +- .../default/inverse/inverse.component.ts | 5 +- .../examples/en_US/default/inverse/readme.md | 6 +- .../en_US/default/search/search.component.ts | 6 + .../en_US/default/table/table.component.ts | 3 + .../en_US/default/tree/tree.component.ts | 5 +- lib/ng-nest/ui/transfer/examples/index.ts | 8 ++ .../zh_CN/default/custom/custom.component.ts | 6 +- .../default/default/default.component.ts | 5 +- .../zh_CN/default/drag/drag.component.ts | 5 +- .../zh_CN/default/footer/footer.component.ts | 6 +- .../default/inverse/inverse.component.ts | 5 +- .../zh_CN/default/search/search.component.ts | 6 + .../zh_CN/default/table/table.component.ts | 3 + .../zh_CN/default/tree/tree.component.ts | 5 +- .../ui/transfer/transfer.component.spec.ts | 18 ++- lib/ng-nest/ui/transfer/transfer.component.ts | 74 ++++++---- lib/ng-nest/ui/transfer/transfer.module.ts | 31 +--- .../default/content/content.component.ts | 4 +- .../default/default/default.component.html | 3 +- .../default/default/default.component.ts | 12 +- lib/ng-nest/ui/tree-file/examples/index.ts | 2 + .../default/content/content.component.ts | 4 +- .../default/default/default.component.html | 3 +- .../default/default/default.component.ts | 12 +- .../ui/tree-file/tree-file.component.spec.ts | 13 +- .../ui/tree-file/tree-file.component.ts | 45 +++--- lib/ng-nest/ui/tree-file/tree-file.module.ts | 11 +- .../en_US/default/async/async.component.html | 38 +++-- .../en_US/default/async/async.component.scss | 2 +- .../en_US/default/async/async.component.ts | 5 +- .../default/bordered/bordered.component.html | 32 ++--- .../default/bordered/bordered.component.scss | 2 +- .../default/bordered/bordered.component.ts | 4 +- .../default/custom/custom.component.html | 14 +- .../default/custom/custom.component.scss | 2 +- .../en_US/default/custom/custom.component.ts | 6 +- .../default/default/default.component.html | 14 +- .../default/default/default.component.scss | 2 +- .../default/default/default.component.ts | 5 +- .../default/disabled/disabled.component.html | 14 +- .../default/disabled/disabled.component.scss | 2 +- .../default/disabled/disabled.component.ts | 5 +- .../en_US/default/label/label.component.html | 26 ++-- .../en_US/default/label/label.component.scss | 2 +- .../en_US/default/label/label.component.ts | 4 +- .../en_US/default/leaf/leaf.component.html | 36 ++--- .../en_US/default/leaf/leaf.component.scss | 2 +- .../en_US/default/leaf/leaf.component.ts | 5 +- .../default/multiple/multiple.component.html | 134 ++++++++--------- .../default/multiple/multiple.component.scss | 2 +- .../default/multiple/multiple.component.ts | 4 + .../en_US/default/path/path.component.html | 46 +++--- .../en_US/default/path/path.component.scss | 2 +- .../en_US/default/path/path.component.ts | 5 +- .../default/required/required.component.html | 14 +- .../default/required/required.component.scss | 2 +- .../default/required/required.component.ts | 5 +- .../default/scroll/scroll.component.scss | 2 - .../en_US/default/scroll/scroll.component.ts | 6 +- .../default/search/search.component.html | 90 ++++++------ .../default/search/search.component.scss | 2 +- .../en_US/default/search/search.component.ts | 5 +- .../en_US/default/size/size.component.html | 38 +++-- .../en_US/default/size/size.component.scss | 6 +- .../en_US/default/size/size.component.ts | 6 +- lib/ng-nest/ui/tree-select/examples/index.ts | 13 ++ .../zh_CN/default/async/async.component.html | 32 +++-- .../zh_CN/default/async/async.component.scss | 2 +- .../zh_CN/default/async/async.component.ts | 5 +- .../default/bordered/bordered.component.html | 32 ++--- .../default/bordered/bordered.component.scss | 2 +- .../default/bordered/bordered.component.ts | 4 +- .../default/custom/custom.component.html | 14 +- .../default/custom/custom.component.scss | 2 +- .../zh_CN/default/custom/custom.component.ts | 6 +- .../default/default/default.component.html | 14 +- .../default/default/default.component.scss | 2 +- .../default/default/default.component.ts | 5 +- .../default/disabled/disabled.component.html | 14 +- .../default/disabled/disabled.component.scss | 2 +- .../default/disabled/disabled.component.ts | 5 +- .../zh_CN/default/label/label.component.html | 26 ++-- .../zh_CN/default/label/label.component.scss | 2 +- .../zh_CN/default/label/label.component.ts | 4 +- .../zh_CN/default/leaf/leaf.component.html | 36 ++--- .../zh_CN/default/leaf/leaf.component.scss | 2 +- .../zh_CN/default/leaf/leaf.component.ts | 5 +- .../default/multiple/multiple.component.html | 134 ++++++++--------- .../default/multiple/multiple.component.scss | 2 +- .../default/multiple/multiple.component.ts | 4 + .../zh_CN/default/path/path.component.html | 46 +++--- .../zh_CN/default/path/path.component.scss | 2 +- .../zh_CN/default/path/path.component.ts | 5 +- .../default/required/required.component.html | 14 +- .../default/required/required.component.scss | 2 +- .../default/required/required.component.ts | 5 +- .../default/scroll/scroll.component.scss | 2 - .../zh_CN/default/scroll/scroll.component.ts | 6 +- .../default/search/search.component.html | 90 ++++++------ .../default/search/search.component.scss | 2 +- .../zh_CN/default/search/search.component.ts | 5 +- .../zh_CN/default/size/size.component.html | 38 +++-- .../zh_CN/default/size/size.component.scss | 6 +- .../zh_CN/default/size/size.component.ts | 6 +- .../tree-select-portal.component.ts | 11 +- .../tree-select/tree-select.component.spec.ts | 14 +- .../ui/tree-select/tree-select.component.ts | 54 ++++--- .../ui/tree-select/tree-select.module.ts | 30 +--- .../activated/activated.component.html | 18 ++- .../default/activated/activated.component.ts | 5 +- .../default/checkbox/checkbox.component.html | 6 +- .../default/checkbox/checkbox.component.ts | 4 +- .../default/control/control.component.html | 31 ++-- .../default/control/control.component.scss | 3 + .../default/control/control.component.ts | 4 + .../default/custom/custom.component.html | 26 ++-- .../en_US/default/custom/custom.component.ts | 6 +- .../default/default/default.component.html | 6 +- .../default/default/default.component.ts | 4 +- .../en_US/default/drag/drag.component.ts | 4 +- .../default/height/height.component.html | 22 ++- .../default/height/height.component.scss | 8 ++ .../en_US/default/height/height.component.ts | 7 +- .../en_US/default/icon/icon.component.ts | 5 +- .../en_US/default/lazy/lazy.component.html | 6 +- .../en_US/default/lazy/lazy.component.scss | 0 .../en_US/default/lazy/lazy.component.ts | 7 +- .../en_US/default/line/line.component.ts | 4 +- .../en_US/default/open/open.component.html | 6 +- .../en_US/default/open/open.component.ts | 4 +- .../default/status/status.component.html | 6 +- .../en_US/default/status/status.component.ts | 4 +- .../virtual-scroll.component.html | 3 +- .../virtual-scroll.component.ts | 5 + lib/ng-nest/ui/tree/examples/index.ts | 13 ++ .../activated/activated.component.html | 18 ++- .../default/activated/activated.component.ts | 5 +- .../default/checkbox/checkbox.component.html | 6 +- .../default/checkbox/checkbox.component.ts | 4 +- .../default/control/control.component.html | 31 ++-- .../default/control/control.component.scss | 3 + .../default/control/control.component.ts | 4 + .../default/custom/custom.component.html | 26 ++-- .../zh_CN/default/custom/custom.component.ts | 6 +- .../default/default/default.component.html | 6 +- .../default/default/default.component.ts | 4 +- .../zh_CN/default/drag/drag.component.ts | 8 +- .../default/height/height.component.html | 22 ++- .../default/height/height.component.scss | 8 ++ .../zh_CN/default/height/height.component.ts | 14 +- .../zh_CN/default/icon/icon.component.ts | 5 +- .../zh_CN/default/lazy/lazy.component.html | 6 +- .../zh_CN/default/lazy/lazy.component.scss | 0 .../zh_CN/default/lazy/lazy.component.ts | 7 +- .../zh_CN/default/line/line.component.ts | 4 +- .../zh_CN/default/open/open.component.html | 6 +- .../zh_CN/default/open/open.component.ts | 4 +- .../default/status/status.component.html | 6 +- .../zh_CN/default/status/status.component.ts | 4 +- .../virtual-scroll.component.ts | 5 + lib/ng-nest/ui/tree/tree-node.component.ts | 36 +++-- lib/ng-nest/ui/tree/tree.component.spec.ts | 29 ++-- lib/ng-nest/ui/tree/tree.component.ts | 26 ++-- lib/ng-nest/ui/tree/tree.module.ts | 23 +-- lib/ng-nest/ui/tree/tree.service.ts | 2 +- .../default/default/default.component.html | 4 +- .../default/default/default.component.ts | 3 + .../line-height/line-height.component.html | 58 ++++---- .../line-height/line-height.component.ts | 1 + .../en_US/default/size/size.component.html | 64 ++++----- .../en_US/default/size/size.component.ts | 1 + lib/ng-nest/ui/typography/examples/index.ts | 3 + .../default/default/default.component.html | 4 +- .../default/default/default.component.ts | 3 + .../line-height/line-height.component.html | 58 ++++---- .../line-height/line-height.component.ts | 1 + .../zh_CN/default/size/size.component.html | 64 ++++----- .../zh_CN/default/size/size.component.ts | 1 + .../typography/typography.component.spec.ts | 15 +- .../ui/typography/typography.component.ts | 19 ++- .../ui/typography/typography.module.ts | 5 +- .../default/custom/custom.component.scss | 14 -- .../en_US/default/custom/custom.component.ts | 8 +- .../default/default/default.component.html | 6 +- .../default/default/default.component.scss | 8 -- .../default/default/default.component.ts | 6 +- .../default/disabled/disabled.component.html | 6 +- .../default/disabled/disabled.component.scss | 8 -- .../default/disabled/disabled.component.ts | 6 +- .../en_US/default/img/img.component.html | 12 +- .../en_US/default/img/img.component.scss | 6 + .../en_US/default/img/img.component.ts | 5 + lib/ng-nest/ui/upload/examples/index.ts | 4 + .../default/custom/custom.component.scss | 14 -- .../zh_CN/default/custom/custom.component.ts | 9 +- .../default/default/default.component.html | 6 +- .../default/default/default.component.scss | 8 -- .../default/default/default.component.ts | 6 +- .../default/disabled/disabled.component.html | 6 +- .../default/disabled/disabled.component.scss | 8 -- .../default/disabled/disabled.component.ts | 6 +- .../zh_CN/default/img/img.component.html | 37 ++--- .../zh_CN/default/img/img.component.scss | 6 + .../zh_CN/default/img/img.component.ts | 10 +- .../ui/upload/upload-portal.component.ts | 23 +-- .../ui/upload/upload.component.spec.ts | 25 +++- lib/ng-nest/ui/upload/upload.component.ts | 48 ++++--- lib/ng-nest/ui/upload/upload.module.ts | 26 +--- scripts/main/generate/docs/index.ts | 3 +- scripts/main/interfaces/module.ts | 17 +++ scripts/main/templates/component.template.ts | 3 + .../main/templates/routes-module.template.ts | 11 +- scripts/main/utils/generate-menu.ts | 4 +- scripts/main/utils/handler-cates.ts | 20 +-- scripts/main/utils/handler-component.ts | 81 ++++------- scripts/main/utils/handler-demo.ts | 10 +- scripts/main/utils/handler-module.ts | 57 ++++++++ scripts/main/utils/handler-page.ts | 4 +- scripts/main/utils/index.ts | 3 +- src/app/app.component.ts | 3 + src/app/app.config.server.ts | 9 ++ src/app/app.config.ts | 31 ++++ .../menus.ts => app/app.menus.ts} | 2 +- src/app/app.module.ts | 28 ---- src/app/app.routes.ts | 56 ++++++++ src/app/app.server.module.ts | 14 -- src/environments/environment.development.ts | 8 +- src/environments/index.ts | 2 - src/environments/routes.ts | 71 --------- src/interfaces/index.ts | 1 + src/interfaces/menu.interface.ts | 14 ++ src/main.server.ts | 8 +- src/main.ts | 16 +-- src/main/demo/demo-routes.module.ts | 11 +- src/main/demo/demo.component.ts | 10 +- src/main/demo/demo.module.ts | 10 -- src/main/docs/docs-routes.module.ts | 27 ++-- src/main/docs/docs.component.ts | 10 +- src/main/docs/docs.module.ts | 12 -- src/main/exception/404-routes.module.ts | 11 +- src/main/exception/404.component.ts | 4 + src/main/exception/404.module.ts | 12 -- src/main/home/home-routes.module.ts | 11 +- src/main/home/home.component.ts | 13 +- src/main/home/home.module.ts | 11 -- src/main/layout/affix/affix.component.ts | 10 +- src/main/layout/content/content.component.ts | 3 + src/main/layout/footer/footer.component.ts | 3 + src/main/layout/header/header.component.html | 30 +++- src/main/layout/header/header.component.ts | 17 +++ src/main/layout/layout-routes.module.ts | 15 +- src/main/layout/layout.component.ts | 3 + src/main/layout/layout.module.ts | 63 -------- src/main/layout/layout.service.ts | 13 +- src/main/layout/logo/logo.component.ts | 8 +- src/main/layout/nav/nav.component.ts | 12 +- src/main/layout/search/search.component.ts | 6 +- src/main/layout/sider/sider.component.ts | 5 +- src/main/news/news-routes.module.ts | 11 +- src/main/news/news.component.scss | 6 - src/main/news/news.component.ts | 13 +- src/main/news/news.module.ts | 12 -- src/main/no-auth/no-auth-routes.module.ts | 13 +- src/main/no-auth/no-auth.component.ts | 10 +- src/main/no-auth/no-auth.module.ts | 10 -- src/main/routes.module.ts | 23 --- .../message-box/message-box.component.html | 4 + .../test/message-box/message-box.component.ts | 15 ++ .../notification/notification.component.html | 2 + .../notification/notification.component.ts | 10 ++ src/main/test/outlet/outlet.component.html | 1 + src/main/test/outlet/outlet.component.ts | 10 ++ .../page-header/page-header.component.html | 1 + .../test/page-header/page-header.component.ts | 10 ++ .../test/pagination/pagination.component.html | 2 + .../test/pagination/pagination.component.ts | 10 ++ .../test/popconfirm/popconfirm.component.html | 3 + .../test/popconfirm/popconfirm.component.ts | 10 ++ src/main/test/popover/popover.component.html | 1 + src/main/test/popover/popover.component.ts | 10 ++ .../test/progress/progress.component.html | 9 ++ src/main/test/progress/progress.component.ts | 30 ++++ src/main/test/radio/radio.component.html | 7 + src/main/test/radio/radio.component.ts | 26 ++++ src/main/test/rate/rate.component.html | 5 + src/main/test/rate/rate.component.ts | 16 +++ src/main/test/result/result.component.html | 9 ++ src/main/test/result/result.component.ts | 30 ++++ src/main/test/select/select.component.html | 10 ++ src/main/test/select/select.component.ts | 32 +++++ .../test/skeleton/skeleton.component.html | 6 + src/main/test/skeleton/skeleton.component.ts | 24 ++++ .../slider-select.component.html | 11 ++ .../slider-select/slider-select.component.ts | 34 +++++ src/main/test/slider/slider.component.html | 6 + src/main/test/slider/slider.component.ts | 24 ++++ .../test/statistic/statistic.component.html | 3 + .../test/statistic/statistic.component.ts | 10 ++ src/main/test/steps/steps.component.html | 9 ++ src/main/test/steps/steps.component.ts | 30 ++++ src/main/test/switch/switch.component.html | 6 + src/main/test/switch/switch.component.ts | 24 ++++ src/main/test/table/table.component.html | 17 +++ src/main/test/table/table.component.ts | 46 ++++++ src/main/test/tabs/tabs.component.html | 8 ++ src/main/test/tabs/tabs.component.ts | 28 ++++ src/main/test/tag/tag.component.html | 6 + src/main/test/tag/tag.component.ts | 24 ++++ ...outes.modules.ts => test-routes.module.ts} | 136 ++++++++++++++++++ .../text-retract/text-retract.component.html | 1 + .../text-retract/text-retract.component.ts | 10 ++ .../test/textarea/textarea.component.html | 7 + src/main/test/textarea/textarea.component.ts | 26 ++++ src/main/test/theme/theme.component.html | 1 + src/main/test/theme/theme.component.ts | 10 ++ .../test/time-ago/time-ago.component.html | 1 + src/main/test/time-ago/time-ago.component.ts | 10 ++ .../time-picker/time-picker.component.html | 9 ++ .../test/time-picker/time-picker.component.ts | 32 +++++ .../test/time-range/time-range.component.html | 1 + .../test/time-range/time-range.component.ts | 10 ++ .../test/timeline/timeline.component.html | 8 ++ src/main/test/timeline/timeline.component.ts | 28 ++++ src/main/test/tooltip/tooltip.component.html | 1 + src/main/test/tooltip/tooltip.component.ts | 10 ++ .../test/transfer/transfer.component.html | 8 ++ src/main/test/transfer/transfer.component.ts | 28 ++++ .../test/tree-file/tree-file.component.html | 2 + .../test/tree-file/tree-file.component.ts | 10 ++ .../tree-select/tree-select.component.html | 13 ++ .../test/tree-select/tree-select.component.ts | 38 +++++ src/main/test/tree/tree.component.html | 13 ++ src/main/test/tree/tree.component.ts | 38 +++++ .../test/typography/typography.component.html | 3 + .../test/typography/typography.component.ts | 10 ++ src/main/test/upload/upload.component.html | 4 + src/main/test/upload/upload.component.ts | 15 ++ src/share/adaption/adaption.directive.ts | 9 +- src/share/adaption/adaption.module.ts | 8 -- src/share/developing/developing.component.ts | 6 +- src/share/index.ts | 2 + src/share/share.module.ts | 23 +-- tsconfig.json | 4 +- 1156 files changed, 7357 insertions(+), 5493 deletions(-) create mode 100644 lib/ng-nest/ui/message-box/examples/index.ts create mode 100644 lib/ng-nest/ui/notification/examples/index.ts create mode 100644 lib/ng-nest/ui/outlet/examples/index.ts create mode 100644 lib/ng-nest/ui/page-header/examples/index.ts create mode 100644 lib/ng-nest/ui/pagination/examples/index.ts create mode 100644 lib/ng-nest/ui/popconfirm/examples/index.ts create mode 100644 lib/ng-nest/ui/popover/examples/index.ts create mode 100644 lib/ng-nest/ui/progress/examples/index.ts create mode 100644 lib/ng-nest/ui/radio/examples/index.ts create mode 100644 lib/ng-nest/ui/rate/examples/index.ts create mode 100644 lib/ng-nest/ui/result/examples/index.ts create mode 100644 lib/ng-nest/ui/select/examples/index.ts create mode 100644 lib/ng-nest/ui/skeleton/examples/index.ts create mode 100644 lib/ng-nest/ui/slider-select/examples/index.ts create mode 100644 lib/ng-nest/ui/slider/examples/index.ts create mode 100644 lib/ng-nest/ui/statistic/examples/en_US/default/default/default.component.scss create mode 100644 lib/ng-nest/ui/statistic/examples/en_US/default/down/down.component.scss create mode 100644 lib/ng-nest/ui/statistic/examples/en_US/default/prefix/prefix.component.scss create mode 100644 lib/ng-nest/ui/statistic/examples/index.ts create mode 100644 lib/ng-nest/ui/statistic/examples/zh_CN/default/default/default.component.scss create mode 100644 lib/ng-nest/ui/statistic/examples/zh_CN/default/down/down.component.scss create mode 100644 lib/ng-nest/ui/statistic/examples/zh_CN/default/prefix/prefix.component.scss create mode 100644 lib/ng-nest/ui/steps/examples/index.ts create mode 100644 lib/ng-nest/ui/switch/examples/index.ts create mode 100644 lib/ng-nest/ui/table/examples/index.ts create mode 100644 lib/ng-nest/ui/tabs/examples/index.ts create mode 100644 lib/ng-nest/ui/tag/examples/index.ts create mode 100644 lib/ng-nest/ui/text-retract/examples/index.ts create mode 100644 lib/ng-nest/ui/textarea/examples/index.ts create mode 100644 lib/ng-nest/ui/theme/examples/index.ts create mode 100644 lib/ng-nest/ui/time-ago/examples/index.ts delete mode 100644 lib/ng-nest/ui/time-picker/examples/en_US/default/preset/preset.component.scss delete mode 100644 lib/ng-nest/ui/time-picker/examples/en_US/default/step/step.component.scss create mode 100644 lib/ng-nest/ui/time-picker/examples/index.ts delete mode 100644 lib/ng-nest/ui/time-picker/examples/zh_CN/default/preset/preset.component.scss delete mode 100644 lib/ng-nest/ui/time-picker/examples/zh_CN/default/step/step.component.scss create mode 100644 lib/ng-nest/ui/time-range/examples/index.ts create mode 100644 lib/ng-nest/ui/timeline/examples/index.ts create mode 100644 lib/ng-nest/ui/tooltip/examples/index.ts create mode 100644 lib/ng-nest/ui/transfer/examples/index.ts create mode 100644 lib/ng-nest/ui/tree-file/examples/index.ts delete mode 100644 lib/ng-nest/ui/tree-select/examples/en_US/default/scroll/scroll.component.scss create mode 100644 lib/ng-nest/ui/tree-select/examples/index.ts delete mode 100644 lib/ng-nest/ui/tree-select/examples/zh_CN/default/scroll/scroll.component.scss create mode 100644 lib/ng-nest/ui/tree/examples/en_US/default/height/height.component.scss delete mode 100644 lib/ng-nest/ui/tree/examples/en_US/default/lazy/lazy.component.scss create mode 100644 lib/ng-nest/ui/tree/examples/index.ts create mode 100644 lib/ng-nest/ui/tree/examples/zh_CN/default/height/height.component.scss delete mode 100644 lib/ng-nest/ui/tree/examples/zh_CN/default/lazy/lazy.component.scss create mode 100644 lib/ng-nest/ui/typography/examples/index.ts delete mode 100644 lib/ng-nest/ui/upload/examples/en_US/default/custom/custom.component.scss delete mode 100644 lib/ng-nest/ui/upload/examples/en_US/default/default/default.component.scss delete mode 100644 lib/ng-nest/ui/upload/examples/en_US/default/disabled/disabled.component.scss create mode 100644 lib/ng-nest/ui/upload/examples/index.ts delete mode 100644 lib/ng-nest/ui/upload/examples/zh_CN/default/custom/custom.component.scss delete mode 100644 lib/ng-nest/ui/upload/examples/zh_CN/default/default/default.component.scss delete mode 100644 lib/ng-nest/ui/upload/examples/zh_CN/default/disabled/disabled.component.scss create mode 100644 scripts/main/interfaces/module.ts create mode 100644 scripts/main/utils/handler-module.ts create mode 100644 src/app/app.config.server.ts create mode 100644 src/app/app.config.ts rename src/{environments/menus.ts => app/app.menus.ts} (99%) delete mode 100644 src/app/app.module.ts create mode 100644 src/app/app.routes.ts delete mode 100644 src/app/app.server.module.ts delete mode 100644 src/environments/routes.ts create mode 100644 src/interfaces/index.ts create mode 100644 src/interfaces/menu.interface.ts delete mode 100644 src/main/demo/demo.module.ts delete mode 100644 src/main/docs/docs.module.ts delete mode 100644 src/main/exception/404.module.ts delete mode 100644 src/main/home/home.module.ts delete mode 100644 src/main/layout/layout.module.ts delete mode 100644 src/main/news/news.component.scss delete mode 100644 src/main/news/news.module.ts delete mode 100644 src/main/no-auth/no-auth.module.ts delete mode 100644 src/main/routes.module.ts create mode 100644 src/main/test/message-box/message-box.component.html create mode 100644 src/main/test/message-box/message-box.component.ts create mode 100644 src/main/test/notification/notification.component.html create mode 100644 src/main/test/notification/notification.component.ts create mode 100644 src/main/test/outlet/outlet.component.html create mode 100644 src/main/test/outlet/outlet.component.ts create mode 100644 src/main/test/page-header/page-header.component.html create mode 100644 src/main/test/page-header/page-header.component.ts create mode 100644 src/main/test/pagination/pagination.component.html create mode 100644 src/main/test/pagination/pagination.component.ts create mode 100644 src/main/test/popconfirm/popconfirm.component.html create mode 100644 src/main/test/popconfirm/popconfirm.component.ts create mode 100644 src/main/test/popover/popover.component.html create mode 100644 src/main/test/popover/popover.component.ts create mode 100644 src/main/test/progress/progress.component.html create mode 100644 src/main/test/progress/progress.component.ts create mode 100644 src/main/test/radio/radio.component.html create mode 100644 src/main/test/radio/radio.component.ts create mode 100644 src/main/test/rate/rate.component.html create mode 100644 src/main/test/rate/rate.component.ts create mode 100644 src/main/test/result/result.component.html create mode 100644 src/main/test/result/result.component.ts create mode 100644 src/main/test/select/select.component.html create mode 100644 src/main/test/select/select.component.ts create mode 100644 src/main/test/skeleton/skeleton.component.html create mode 100644 src/main/test/skeleton/skeleton.component.ts create mode 100644 src/main/test/slider-select/slider-select.component.html create mode 100644 src/main/test/slider-select/slider-select.component.ts create mode 100644 src/main/test/slider/slider.component.html create mode 100644 src/main/test/slider/slider.component.ts create mode 100644 src/main/test/statistic/statistic.component.html create mode 100644 src/main/test/statistic/statistic.component.ts create mode 100644 src/main/test/steps/steps.component.html create mode 100644 src/main/test/steps/steps.component.ts create mode 100644 src/main/test/switch/switch.component.html create mode 100644 src/main/test/switch/switch.component.ts create mode 100644 src/main/test/table/table.component.html create mode 100644 src/main/test/table/table.component.ts create mode 100644 src/main/test/tabs/tabs.component.html create mode 100644 src/main/test/tabs/tabs.component.ts create mode 100644 src/main/test/tag/tag.component.html create mode 100644 src/main/test/tag/tag.component.ts rename src/main/test/{test-routes.modules.ts => test-routes.module.ts} (52%) create mode 100644 src/main/test/text-retract/text-retract.component.html create mode 100644 src/main/test/text-retract/text-retract.component.ts create mode 100644 src/main/test/textarea/textarea.component.html create mode 100644 src/main/test/textarea/textarea.component.ts create mode 100644 src/main/test/theme/theme.component.html create mode 100644 src/main/test/theme/theme.component.ts create mode 100644 src/main/test/time-ago/time-ago.component.html create mode 100644 src/main/test/time-ago/time-ago.component.ts create mode 100644 src/main/test/time-picker/time-picker.component.html create mode 100644 src/main/test/time-picker/time-picker.component.ts create mode 100644 src/main/test/time-range/time-range.component.html create mode 100644 src/main/test/time-range/time-range.component.ts create mode 100644 src/main/test/timeline/timeline.component.html create mode 100644 src/main/test/timeline/timeline.component.ts create mode 100644 src/main/test/tooltip/tooltip.component.html create mode 100644 src/main/test/tooltip/tooltip.component.ts create mode 100644 src/main/test/transfer/transfer.component.html create mode 100644 src/main/test/transfer/transfer.component.ts create mode 100644 src/main/test/tree-file/tree-file.component.html create mode 100644 src/main/test/tree-file/tree-file.component.ts create mode 100644 src/main/test/tree-select/tree-select.component.html create mode 100644 src/main/test/tree-select/tree-select.component.ts create mode 100644 src/main/test/tree/tree.component.html create mode 100644 src/main/test/tree/tree.component.ts create mode 100644 src/main/test/typography/typography.component.html create mode 100644 src/main/test/typography/typography.component.ts create mode 100644 src/main/test/upload/upload.component.html create mode 100644 src/main/test/upload/upload.component.ts delete mode 100644 src/share/adaption/adaption.module.ts diff --git a/docs/course/rbac/4-ui-navigation/demo/13__ui/src/layout/index/index.module.ts b/docs/course/rbac/4-ui-navigation/demo/13__ui/src/layout/index/index.module.ts index b7f5e28cb..8ecbfa6df 100644 --- a/docs/course/rbac/4-ui-navigation/demo/13__ui/src/layout/index/index.module.ts +++ b/docs/course/rbac/4-ui-navigation/demo/13__ui/src/layout/index/index.module.ts @@ -9,7 +9,7 @@ import { TabsComponent } from './tabs/tabs.component'; import { RouterModule } from '@angular/router'; import { mainRoutes } from 'src/environments/routes'; import { XMenuComponent } from '@ng-nest/ui/menu'; -import { XSliderModule } from '@ng-nest/ui/slider'; +import { XSliderComponent } from '@ng-nest/ui/slider'; import { XIconComponent } from '@ng-nest/ui/icon'; import { XCrumbModule } from '@ng-nest/ui/crumb'; @@ -18,7 +18,7 @@ import { XCrumbModule } from '@ng-nest/ui/crumb'; imports: [ CommonModule, XMenuComponent, - XSliderModule, + XSliderComponent, XIconComponent, XCrumbModule, RouterModule.forChild([ diff --git a/docs/course/rbac/4-ui-navigation/demo/9__ui/src/layout/index/index.module.ts b/docs/course/rbac/4-ui-navigation/demo/9__ui/src/layout/index/index.module.ts index 36f025fe6..0e1018bed 100644 --- a/docs/course/rbac/4-ui-navigation/demo/9__ui/src/layout/index/index.module.ts +++ b/docs/course/rbac/4-ui-navigation/demo/9__ui/src/layout/index/index.module.ts @@ -9,7 +9,7 @@ import { TabsComponent } from './tabs/tabs.component'; import { RouterModule } from '@angular/router'; import { mainRoutes } from 'src/environments/routes'; import { XMenuComponent } from '@ng-nest/ui/menu'; -import { XSliderModule } from '@ng-nest/ui/slider'; +import { XSliderComponent } from '@ng-nest/ui/slider'; import { XIconComponent } from '@ng-nest/ui/icon'; @NgModule({ @@ -17,7 +17,7 @@ import { XIconComponent } from '@ng-nest/ui/icon'; imports: [ CommonModule, XMenuComponent, - XSliderModule, + XSliderComponent, XIconComponent, RouterModule.forChild([ { diff --git a/docs/course/rbac/5-user-manage/demo/17__ui/src/main/system/users/user.module.ts b/docs/course/rbac/5-user-manage/demo/17__ui/src/main/system/users/user.module.ts index b19d994c1..936302c47 100644 --- a/docs/course/rbac/5-user-manage/demo/17__ui/src/main/system/users/user.module.ts +++ b/docs/course/rbac/5-user-manage/demo/17__ui/src/main/system/users/user.module.ts @@ -2,13 +2,13 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { UserComponent } from './user.component'; import { RouterModule } from '@angular/router'; -import { XTableModule } from '@ng-nest/ui/table'; +import { XTableComponent } from '@ng-nest/ui/table'; @NgModule({ declarations: [UserComponent], imports: [ CommonModule, - XTableModule, + XTableComponent, RouterModule.forChild([ { path: '', diff --git a/docs/course/rbac/5-user-manage/demo/22__ui/src/main/system/users/user.module.ts b/docs/course/rbac/5-user-manage/demo/22__ui/src/main/system/users/user.module.ts index 2165dadba..4983a7ecc 100644 --- a/docs/course/rbac/5-user-manage/demo/22__ui/src/main/system/users/user.module.ts +++ b/docs/course/rbac/5-user-manage/demo/22__ui/src/main/system/users/user.module.ts @@ -2,14 +2,14 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { UserComponent } from './user.component'; import { RouterModule } from '@angular/router'; -import { XTableModule } from '@ng-nest/ui/table'; +import { XTableComponent } from '@ng-nest/ui/table'; import { UserDetailComponent } from './user-detail/user-detail.component'; @NgModule({ declarations: [UserComponent, UserDetailComponent], imports: [ CommonModule, - XTableModule, + XTableComponent, RouterModule.forChild([ { path: '', component: UserComponent }, { path: ':type', component: UserDetailComponent }, diff --git a/docs/course/rbac/5-user-manage/demo/23__ui/src/main/system/users/user.module.ts b/docs/course/rbac/5-user-manage/demo/23__ui/src/main/system/users/user.module.ts index 9da753a0c..52913b7c0 100644 --- a/docs/course/rbac/5-user-manage/demo/23__ui/src/main/system/users/user.module.ts +++ b/docs/course/rbac/5-user-manage/demo/23__ui/src/main/system/users/user.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { UserComponent } from './user.component'; import { RouterModule } from '@angular/router'; -import { XTableModule } from '@ng-nest/ui/table'; +import { XTableComponent } from '@ng-nest/ui/table'; import { UserDetailComponent } from './user-detail/user-detail.component'; import { XButtonComponent } from '@ng-nest/ui/button'; @@ -10,7 +10,7 @@ import { XButtonComponent } from '@ng-nest/ui/button'; declarations: [UserComponent, UserDetailComponent], imports: [ CommonModule, - XTableModule, + XTableComponent, XButtonComponent, RouterModule.forChild([ { path: '', component: UserComponent }, diff --git a/docs/course/rbac/5-user-manage/demo/24__ui/src/main/system/users/user.module.ts b/docs/course/rbac/5-user-manage/demo/24__ui/src/main/system/users/user.module.ts index f1c08fd40..162d854dc 100644 --- a/docs/course/rbac/5-user-manage/demo/24__ui/src/main/system/users/user.module.ts +++ b/docs/course/rbac/5-user-manage/demo/24__ui/src/main/system/users/user.module.ts @@ -2,20 +2,18 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { UserComponent } from './user.component'; import { RouterModule } from '@angular/router'; -import { XTableModule } from '@ng-nest/ui/table'; +import { XTableComponent } from '@ng-nest/ui/table'; import { UserDetailComponent } from './user-detail/user-detail.component'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XFormComponent } from '@ng-nest/ui/form'; -import { XMessageModule } from '@ng-nest/ui/message'; @NgModule({ declarations: [UserComponent, UserDetailComponent], imports: [ CommonModule, - XTableModule, + XTableComponent, XButtonComponent, XFormComponent, - XMessageModule, RouterModule.forChild([ { path: '', component: UserComponent }, { path: ':type', component: UserDetailComponent }, diff --git a/docs/course/rbac/5-user-manage/demo/25__ui/src/main/system/users/user.module.ts b/docs/course/rbac/5-user-manage/demo/25__ui/src/main/system/users/user.module.ts index b5e0636c4..278f83b71 100644 --- a/docs/course/rbac/5-user-manage/demo/25__ui/src/main/system/users/user.module.ts +++ b/docs/course/rbac/5-user-manage/demo/25__ui/src/main/system/users/user.module.ts @@ -2,24 +2,20 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { UserComponent } from './user.component'; import { RouterModule } from '@angular/router'; -import { XTableModule } from '@ng-nest/ui/table'; +import { XTableComponent } from '@ng-nest/ui/table'; import { UserDetailComponent } from './user-detail/user-detail.component'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XFormComponent } from '@ng-nest/ui/form'; -import { XMessageModule } from '@ng-nest/ui/message'; import { XLinkComponent } from '@ng-nest/ui/link'; -import { XMessageBoxModule } from '@ng-nest/ui/message-box'; @NgModule({ declarations: [UserComponent, UserDetailComponent], imports: [ CommonModule, - XTableModule, + XTableComponent, XButtonComponent, XFormComponent, - XMessageModule, XLinkComponent, - XMessageBoxModule, RouterModule.forChild([ { path: '', component: UserComponent }, { path: ':type', component: UserDetailComponent }, diff --git a/docs/course/rbac/5-user-manage/readme.en_US.md b/docs/course/rbac/5-user-manage/readme.en_US.md index 42c7e24d4..7cec743f0 100644 --- a/docs/course/rbac/5-user-manage/readme.en_US.md +++ b/docs/course/rbac/5-user-manage/readme.en_US.md @@ -126,7 +126,7 @@ Open the front-end project, here we use the `table` component to create our list {{ __17\__ui:src/main/system/users/user.component.ts:true:true }} -- Adding a `XTableModule` module in `user.module.ts` +- Adding a `XTableComponent` component in `user.module.ts` - Using `table` components in `user.component.html` and `uesr.component.ts` - `columns` configuration - `data` specify the `table` display data, configure it to a return type to `Observable` Observe the function of the object diff --git a/docs/course/rbac/5-user-manage/readme.zh_CN.md b/docs/course/rbac/5-user-manage/readme.zh_CN.md index 6793e5e05..7096a932a 100644 --- a/docs/course/rbac/5-user-manage/readme.zh_CN.md +++ b/docs/course/rbac/5-user-manage/readme.zh_CN.md @@ -126,7 +126,7 @@ DTO 用于展示层与服务层之间的数据传输，我们在 `users` 中定 {{ __17\__ui:src/main/system/users/user.component.ts:true:true }} -- 在 `user.module.ts` 中添加 `XTableModule` 模块的引入 +- 在 `user.module.ts` 中添加 `XTableComponent` 模块的引入 - 在 `user.component.html` 和 `uesr.component.ts` 中使用 `table` 组件 - `columns` 配置 `table` 列 - `data` 指定 `table` 显示数据，此处配置为一个返回类型为 `Observable` 可观察对象的函数 diff --git a/lib/ng-nest/ui/affix/affix.component.spec.ts b/lib/ng-nest/ui/affix/affix.component.spec.ts index d03b3ac0b..a93c3b383 100644 --- a/lib/ng-nest/ui/affix/affix.component.spec.ts +++ b/lib/ng-nest/ui/affix/affix.component.spec.ts @@ -5,7 +5,7 @@ import { By } from '@angular/platform-browser'; import { XAffixComponent } from '@ng-nest/ui/affix'; import { XAffixPrefix } from './affix.property'; import { XButtonComponent } from '@ng-nest/ui/button'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { HttpClientTestingModule } from '@angular/common/http/testing'; @@ -17,7 +17,7 @@ describe(XAffixPrefix, () => { HttpClientTestingModule, XAffixComponent, XButtonComponent, - XThemeModule + XThemeComponent ], declarations: [TestXAffixComponent] }).compileComponents(); diff --git a/lib/ng-nest/ui/affix/affix.property.ts b/lib/ng-nest/ui/affix/affix.property.ts index 2e55e54f4..80417709e 100644 --- a/lib/ng-nest/ui/affix/affix.property.ts +++ b/lib/ng-nest/ui/affix/affix.property.ts @@ -12,7 +12,7 @@ const X_CONFIG_NAME = 'affix'; /** * Affix Property */ -@Component({ selector: `${XAffixPrefix}-property`, template: '', standalone: true }) +@Component({ selector: `${XAffixPrefix}-property`, template: '' }) export class XAffixProperty extends XProperty { /** * @zh_CN 距离顶部距离 diff --git a/lib/ng-nest/ui/alert/alert.component.spec.ts b/lib/ng-nest/ui/alert/alert.component.spec.ts index 8a7201d62..b80962291 100644 --- a/lib/ng-nest/ui/alert/alert.component.spec.ts +++ b/lib/ng-nest/ui/alert/alert.component.spec.ts @@ -5,10 +5,10 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { XAlertComponent } from '@ng-nest/ui/alert'; import { FormsModule } from '@angular/forms'; import { XAlertPrefix } from './alert.property'; -import { XStatisticModule } from '@ng-nest/ui/statistic'; +import { XCountdownComponent } from '@ng-nest/ui/statistic'; import { XAddSeconds } from '@ng-nest/ui/core'; import { XButtonComponent } from '@ng-nest/ui/button'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XAlertPrefix, () => { @@ -21,8 +21,8 @@ describe(XAlertPrefix, () => { BrowserAnimationsModule, XButtonComponent, XAlertComponent, - XStatisticModule, - XThemeModule + XCountdownComponent, + XThemeComponent ], declarations: [TestXAlertComponent] }).compileComponents(); diff --git a/lib/ng-nest/ui/alert/alert.property.ts b/lib/ng-nest/ui/alert/alert.property.ts index 198755afe..c2974300a 100644 --- a/lib/ng-nest/ui/alert/alert.property.ts +++ b/lib/ng-nest/ui/alert/alert.property.ts @@ -24,7 +24,7 @@ const X_CONFIG_NAME = 'alert'; /** * Alert Property */ -@Component({ selector: `${XAlertPrefix}-property`, template: '', standalone: true }) +@Component({ selector: `${XAlertPrefix}-property`, template: '' }) export class XAlertProperty extends XProperty { /** * @zh_CN 隐藏 diff --git a/lib/ng-nest/ui/alert/examples/en_US/default/custom/custom.component.ts b/lib/ng-nest/ui/alert/examples/en_US/default/custom/custom.component.ts index 277c950f4..a2a7d2cc0 100644 --- a/lib/ng-nest/ui/alert/examples/en_US/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/alert/examples/en_US/default/custom/custom.component.ts @@ -1,12 +1,12 @@ import { Component } from '@angular/core'; import { XAlertComponent } from '@ng-nest/ui/alert'; import { XAddSeconds } from '@ng-nest/ui/core'; -import { XStatisticModule } from '@ng-nest/ui/statistic'; +import { XCountdownComponent } from '@ng-nest/ui/statistic'; @Component({ selector: 'ex-custom', standalone: true, - imports: [XAlertComponent, XStatisticModule], + imports: [XAlertComponent, XCountdownComponent], templateUrl: './custom.component.html', styleUrls: ['./custom.component.scss'] }) diff --git a/lib/ng-nest/ui/alert/examples/zh_CN/default/custom/custom.component.ts b/lib/ng-nest/ui/alert/examples/zh_CN/default/custom/custom.component.ts index 277c950f4..a2a7d2cc0 100644 --- a/lib/ng-nest/ui/alert/examples/zh_CN/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/alert/examples/zh_CN/default/custom/custom.component.ts @@ -1,12 +1,12 @@ import { Component } from '@angular/core'; import { XAlertComponent } from '@ng-nest/ui/alert'; import { XAddSeconds } from '@ng-nest/ui/core'; -import { XStatisticModule } from '@ng-nest/ui/statistic'; +import { XCountdownComponent } from '@ng-nest/ui/statistic'; @Component({ selector: 'ex-custom', standalone: true, - imports: [XAlertComponent, XStatisticModule], + imports: [XAlertComponent, XCountdownComponent], templateUrl: './custom.component.html', styleUrls: ['./custom.component.scss'] }) diff --git a/lib/ng-nest/ui/anchor/anchor.component.spec.ts b/lib/ng-nest/ui/anchor/anchor.component.spec.ts index 6cc4227a4..c69e4e95a 100644 --- a/lib/ng-nest/ui/anchor/anchor.component.spec.ts +++ b/lib/ng-nest/ui/anchor/anchor.component.spec.ts @@ -4,7 +4,7 @@ import { Component, DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; import { XAnchorComponent } from '@ng-nest/ui/anchor'; import { XAnchorPrefix } from './anchor.property'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { XButtonComponent } from '@ng-nest/ui/button'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { HttpClientTestingModule } from '@angular/common/http/testing'; @@ -16,7 +16,7 @@ describe(XAnchorPrefix, () => { BrowserAnimationsModule, HttpClientTestingModule, XAnchorComponent, - XThemeModule, + XThemeComponent, XButtonComponent ], declarations: [TestXAnchorComponent] diff --git a/lib/ng-nest/ui/anchor/anchor.component.ts b/lib/ng-nest/ui/anchor/anchor.component.ts index 000442c13..27ea9d4ff 100644 --- a/lib/ng-nest/ui/anchor/anchor.component.ts +++ b/lib/ng-nest/ui/anchor/anchor.component.ts @@ -21,7 +21,7 @@ import { XIsUndefined, XConfigService } from '@ng-nest/ui/core'; -import { XSliderNode, XSliderModule } from '@ng-nest/ui/slider'; +import { XSliderNode, XSliderComponent } from '@ng-nest/ui/slider'; import { XAffixComponent } from '@ng-nest/ui/affix'; import { CommonModule, DOCUMENT } from '@angular/common'; import { fromEvent, Subject } from 'rxjs'; @@ -30,7 +30,7 @@ import { throttleTime, takeUntil, distinctUntilChanged } from 'rxjs/operators'; @Component({ selector: `${XAnchorPrefix}`, standalone: true, - imports: [CommonModule, XAffixComponent, XSliderModule], + imports: [CommonModule, XAffixComponent, XSliderComponent], templateUrl: './anchor.component.html', styleUrls: ['./anchor.component.scss'], encapsulation: ViewEncapsulation.None, diff --git a/lib/ng-nest/ui/anchor/anchor.property.ts b/lib/ng-nest/ui/anchor/anchor.property.ts index b40e5bf1f..173a4aac6 100644 --- a/lib/ng-nest/ui/anchor/anchor.property.ts +++ b/lib/ng-nest/ui/anchor/anchor.property.ts @@ -19,7 +19,7 @@ const X_CONFIG_NAME = 'anchor'; /** * Anchor Property */ -@Component({ selector: `${XAnchorPrefix}-property`, template: '', standalone: true }) +@Component({ selector: `${XAnchorPrefix}-property`, template: '' }) export class XAnchorProperty extends XProperty { /** * @zh_CN 滚动区域对象 @@ -58,7 +58,7 @@ export const XAnchorInnerPrefix = 'x-anchor-inner'; /** * Anchor inner Property */ -@Component({ selector: `${XAnchorInnerPrefix}-property`, template: '', standalone: true }) +@Component({ selector: `${XAnchorInnerPrefix}-property`, template: '' }) export class XAnchorInnerProperty {} /** diff --git a/lib/ng-nest/ui/auto-complete/auto-complete.component.spec.ts b/lib/ng-nest/ui/auto-complete/auto-complete.component.spec.ts index e54633dad..6ff39ed3d 100644 --- a/lib/ng-nest/ui/auto-complete/auto-complete.component.spec.ts +++ b/lib/ng-nest/ui/auto-complete/auto-complete.component.spec.ts @@ -9,14 +9,14 @@ import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { Observable, interval } from 'rxjs'; import { XData } from '@ng-nest/ui/core'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XThemeComponent } from '@ng-nest/ui/theme'; +import { XRadioComponent } from '@ng-nest/ui/radio'; import { XInputComponent } from '@ng-nest/ui/input'; -import { XSelectModule } from '@ng-nest/ui/select'; +import { XSelectComponent } from '@ng-nest/ui/select'; import { XCascadeComponent } from '@ng-nest/ui/cascade'; import { XColorPickerComponent } from '@ng-nest/ui/color-picker'; import { XFindComponent } from '@ng-nest/ui/find'; -import { XTextareaModule } from '@ng-nest/ui/textarea'; +import { XTextareaComponent } from '@ng-nest/ui/textarea'; import { XTimePickerModule } from '@ng-nest/ui/time-picker'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XDatePickerComponent } from '@ng-nest/ui/date-picker'; @@ -29,20 +29,20 @@ describe(XAutoCompletePrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, XAutoCompleteComponent, FormsModule, ReactiveFormsModule, XRowComponent, XColComponent, - XRadioModule, - XSelectModule, + XRadioComponent, + XSelectComponent, XButtonComponent, XInputComponent, XCascadeComponent, XColorPickerComponent, XFindComponent, - XTextareaModule, + XTextareaComponent, XTimePickerModule, XDatePickerComponent, XIconComponent diff --git a/lib/ng-nest/ui/auto-complete/auto-complete.property.ts b/lib/ng-nest/ui/auto-complete/auto-complete.property.ts index b17ad95ef..d5b640f9e 100644 --- a/lib/ng-nest/ui/auto-complete/auto-complete.property.ts +++ b/lib/ng-nest/ui/auto-complete/auto-complete.property.ts @@ -22,7 +22,7 @@ const X_CONFIG_NAME = 'autoComplete'; /** * AutoComplete Property */ -@Component({ selector: `${XAutoCompletePrefix}-property`, template: '', standalone: true }) +@Component({ selector: `${XAutoCompletePrefix}-property`, template: '' }) export class XAutoCompleteProperty extends XControlValueAccessor { /** * @zh_CN 节点数据 diff --git a/lib/ng-nest/ui/auto-complete/examples/en_US/default/size/size.component.ts b/lib/ng-nest/ui/auto-complete/examples/en_US/default/size/size.component.ts index 768984516..c99005a75 100644 --- a/lib/ng-nest/ui/auto-complete/examples/en_US/default/size/size.component.ts +++ b/lib/ng-nest/ui/auto-complete/examples/en_US/default/size/size.component.ts @@ -3,12 +3,12 @@ import { FormsModule } from '@angular/forms'; import { XAutoCompleteComponent, XAutoCompleteNode } from '@ng-nest/ui/auto-complete'; import { XData, XSize } from '@ng-nest/ui/core'; import { XColComponent, XRowComponent } from '@ng-nest/ui/layout'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; @Component({ selector: 'ex-size', standalone: true, - imports: [FormsModule, XRadioModule, XRowComponent, XColComponent, XAutoCompleteComponent], + imports: [FormsModule, XRadioComponent, XRowComponent, XColComponent, XAutoCompleteComponent], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/auto-complete/examples/zh_CN/default/size/size.component.ts b/lib/ng-nest/ui/auto-complete/examples/zh_CN/default/size/size.component.ts index c40d6bf50..92889d633 100644 --- a/lib/ng-nest/ui/auto-complete/examples/zh_CN/default/size/size.component.ts +++ b/lib/ng-nest/ui/auto-complete/examples/zh_CN/default/size/size.component.ts @@ -3,12 +3,12 @@ import { FormsModule } from '@angular/forms'; import { XAutoCompleteComponent, XAutoCompleteNode } from '@ng-nest/ui/auto-complete'; import { XData, XSize } from '@ng-nest/ui/core'; import { XColComponent, XRowComponent } from '@ng-nest/ui/layout'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; @Component({ selector: 'ex-size', standalone: true, - imports: [FormsModule, XRadioModule, XRowComponent, XColComponent, XAutoCompleteComponent], + imports: [FormsModule, XRadioComponent, XRowComponent, XColComponent, XAutoCompleteComponent], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/avatar/avatar-group.component.ts b/lib/ng-nest/ui/avatar/avatar-group.component.ts index 3c6674bff..58671c0b8 100644 --- a/lib/ng-nest/ui/avatar/avatar-group.component.ts +++ b/lib/ng-nest/ui/avatar/avatar-group.component.ts @@ -4,7 +4,6 @@ import { XAvatarGroupPrefix, XAvatarGroupProperty } from './avatar.property'; @Component({ selector: `${XAvatarGroupPrefix}`, standalone: true, - imports: [XAvatarGroupProperty], templateUrl: './avatar-group.component.html', styleUrls: ['./avatar-group.component.scss'], encapsulation: ViewEncapsulation.None, diff --git a/lib/ng-nest/ui/avatar/avatar.component.spec.ts b/lib/ng-nest/ui/avatar/avatar.component.spec.ts index 03bdaa970..a747b1a15 100644 --- a/lib/ng-nest/ui/avatar/avatar.component.spec.ts +++ b/lib/ng-nest/ui/avatar/avatar.component.spec.ts @@ -7,7 +7,7 @@ import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { XAvatarComponent } from '@ng-nest/ui/avatar'; import { FormsModule } from '@angular/forms'; import { XAvatarPrefix } from './avatar.property'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { XBadgeComponent } from '@ng-nest/ui/badge'; import { HttpClientTestingModule } from '@angular/common/http/testing'; @@ -24,7 +24,7 @@ describe(XAvatarPrefix, () => { XColComponent, XIconComponent, XBadgeComponent, - XThemeModule + XThemeComponent ], declarations: [TestXAvatarComponent] }).compileComponents(); diff --git a/lib/ng-nest/ui/avatar/avatar.property.ts b/lib/ng-nest/ui/avatar/avatar.property.ts index a14b84fbf..ea78667d8 100644 --- a/lib/ng-nest/ui/avatar/avatar.property.ts +++ b/lib/ng-nest/ui/avatar/avatar.property.ts @@ -22,7 +22,7 @@ const X_CONFIG_NAME = 'avatar'; /** * Avatar Property */ -@Component({ selector: `${XAvatarPrefix}-property`, template: '', standalone: true }) +@Component({ selector: `${XAvatarPrefix}-property`, template: '' }) export class XAvatarProperty extends XProperty { /** * @zh_CN 显示字符 @@ -94,5 +94,5 @@ export const XAvatarGroupPrefix = 'x-avatar-group'; /** * Avatar Group Property */ -@Component({ selector: `${XAvatarGroupPrefix}-property`, template: '', standalone: true }) +@Component({ selector: `${XAvatarGroupPrefix}-property`, template: '' }) export class XAvatarGroupProperty extends XProperty {} diff --git a/lib/ng-nest/ui/back-top/back-top.component.spec.ts b/lib/ng-nest/ui/back-top/back-top.component.spec.ts index 503a7f0d2..b5673f502 100644 --- a/lib/ng-nest/ui/back-top/back-top.component.spec.ts +++ b/lib/ng-nest/ui/back-top/back-top.component.spec.ts @@ -6,8 +6,8 @@ import { XBackTopComponent } from '@ng-nest/ui/back-top'; import { XBackTopPrefix } from './back-top.property'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { XButtonComponent } from '@ng-nest/ui/button'; -import { XTabsModule } from '@ng-nest/ui/tabs'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XTabsComponent, XTabComponent } from '@ng-nest/ui/tabs'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XBackTopPrefix, () => { @@ -19,8 +19,9 @@ describe(XBackTopPrefix, () => { XBackTopComponent, XButtonComponent, BrowserAnimationsModule, - XTabsModule, - XThemeModule + XTabsComponent, + XTabComponent, + XThemeComponent ], declarations: [TestXBackTopComponent, TestXBackTopTabsComponent] }).compileComponents(); diff --git a/lib/ng-nest/ui/badge/badge.component.spec.ts b/lib/ng-nest/ui/badge/badge.component.spec.ts index fb3380adf..d88dc11bc 100644 --- a/lib/ng-nest/ui/badge/badge.component.spec.ts +++ b/lib/ng-nest/ui/badge/badge.component.spec.ts @@ -9,7 +9,7 @@ import { FormsModule } from '@angular/forms'; import { XBadgePrefix } from './badge.property'; import { XButtonComponent } from '@ng-nest/ui/button'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XBadgePrefix, () => { @@ -18,7 +18,7 @@ describe(XBadgePrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, FormsModule, XBadgeComponent, XButtonComponent, diff --git a/lib/ng-nest/ui/badge/badge.property.ts b/lib/ng-nest/ui/badge/badge.property.ts index f6affea93..de2f7a1d6 100644 --- a/lib/ng-nest/ui/badge/badge.property.ts +++ b/lib/ng-nest/ui/badge/badge.property.ts @@ -12,7 +12,7 @@ const X_CONFIG_NAME = 'badge'; /** * Badge Property */ -@Component({ selector: `${XBadgePrefix}-property`, template: '', standalone: true }) +@Component({ selector: `${XBadgePrefix}-property`, template: '' }) export class XBadgeProperty extends XProperty { /** * @zh_CN 背景颜色 diff --git a/lib/ng-nest/ui/base-form/base-form.property.ts b/lib/ng-nest/ui/base-form/base-form.property.ts index efc89e171..77d7a63a0 100644 --- a/lib/ng-nest/ui/base-form/base-form.property.ts +++ b/lib/ng-nest/ui/base-form/base-form.property.ts @@ -13,7 +13,7 @@ import { /** * 表单对象共有的参数 */ -@Component({ selector: 'x-form-prop', template: '', standalone: true }) +@Component({ selector: 'x-form-prop', template: '' }) export class XFormProp extends XProperty { /** * 标签 diff --git a/lib/ng-nest/ui/border/border.component.spec.ts b/lib/ng-nest/ui/border/border.component.spec.ts index 68a8bf7f8..3b4664731 100644 --- a/lib/ng-nest/ui/border/border.component.spec.ts +++ b/lib/ng-nest/ui/border/border.component.spec.ts @@ -6,7 +6,7 @@ import { By } from '@angular/platform-browser'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { XBorderComponent } from '@ng-nest/ui/border'; import { XBorderPrefix } from './border.property'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { HttpClientTestingModule } from '@angular/common/http/testing'; @@ -16,7 +16,7 @@ describe(XBorderPrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, XBorderComponent, XRowComponent, XColComponent, diff --git a/lib/ng-nest/ui/button/button.component.spec.ts b/lib/ng-nest/ui/button/button.component.spec.ts index 152fb0004..5b2956486 100644 --- a/lib/ng-nest/ui/button/button.component.spec.ts +++ b/lib/ng-nest/ui/button/button.component.spec.ts @@ -4,13 +4,13 @@ import { Component, DebugElement, ChangeDetectorRef } from '@angular/core'; import { By } from '@angular/platform-browser'; import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; import { XButtonPrefix } from './button.property'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XButtonPrefix, () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, XButtonComponent, XButtonsComponent, XThemeModule], + imports: [HttpClientTestingModule, XButtonComponent, XButtonsComponent, XThemeComponent], declarations: [ TestXButtonComponent, TestXButtonDiabledComponent, diff --git a/lib/ng-nest/ui/button/button.property.ts b/lib/ng-nest/ui/button/button.property.ts index 3ba27d837..b83a630d7 100644 --- a/lib/ng-nest/ui/button/button.property.ts +++ b/lib/ng-nest/ui/button/button.property.ts @@ -22,7 +22,7 @@ const X_CONFIG_NAME = 'button'; /** * Button Property */ -@Component({ selector: `${XButtonPrefix}-property`, template: '', standalone: true }) +@Component({ selector: `${XButtonPrefix}-property`, template: '' }) export class XButtonProperty extends XProperty implements XButtonOption { /** * @zh_CN 类型 @@ -196,7 +196,7 @@ const X_CONFIG_NAME_BUTTONS = 'buttons'; /** * Buttons Property */ -@Component({ selector: `${XButtonsPrefix}-property`, template: '', standalone: true }) +@Component({ selector: `${XButtonsPrefix}-property`, template: '' }) export class XButtonsProperty extends XProperty { /** * @zh_CN 按钮间距，单位 rem （按 1rem = 16px 比例来计算） diff --git a/lib/ng-nest/ui/calendar/calendar.component.spec.ts b/lib/ng-nest/ui/calendar/calendar.component.spec.ts index 1360fa036..5e2af7a57 100644 --- a/lib/ng-nest/ui/calendar/calendar.component.spec.ts +++ b/lib/ng-nest/ui/calendar/calendar.component.spec.ts @@ -12,7 +12,7 @@ import { XContainerComponent } from '@ng-nest/ui/container'; import { interval } from 'rxjs'; import { DatePipe } from '@angular/common'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { XI18nService, en_US, zh_CN } from '@ng-nest/ui/i18n'; import { HttpClientTestingModule } from '@angular/common/http/testing'; @@ -22,7 +22,7 @@ describe(XCalendarPrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, FormsModule, XCalendarComponent, XButtonComponent, diff --git a/lib/ng-nest/ui/calendar/calendar.component.ts b/lib/ng-nest/ui/calendar/calendar.component.ts index f7bfed564..ac17f0e60 100644 --- a/lib/ng-nest/ui/calendar/calendar.component.ts +++ b/lib/ng-nest/ui/calendar/calendar.component.ts @@ -16,8 +16,8 @@ import { XI18nService, XI18nCalendar, XI18nDirective } from '@ng-nest/ui/i18n'; import { XLinkComponent } from '@ng-nest/ui/link'; import { XDatePickerComponent, XPickerDateComponent, XPickerMonthComponent } from '@ng-nest/ui/date-picker'; import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; -import { XRadioModule } from '@ng-nest/ui/radio'; -import { XTooltipModule } from '@ng-nest/ui/tooltip'; +import { XRadioComponent } from '@ng-nest/ui/radio'; +import { XTooltipDirective } from '@ng-nest/ui/tooltip'; import { takeUntil, map } from 'rxjs/operators'; import { Subject } from 'rxjs'; import { FormsModule } from '@angular/forms'; @@ -29,8 +29,8 @@ import { FormsModule } from '@angular/forms'; CommonModule, FormsModule, XLinkComponent, - XTooltipModule, - XRadioModule, + XTooltipDirective, + XRadioComponent, XDatePickerComponent, XPickerDateComponent, XPickerMonthComponent, diff --git a/lib/ng-nest/ui/calendar/calendar.property.ts b/lib/ng-nest/ui/calendar/calendar.property.ts index d7f70842d..a6fa78b36 100644 --- a/lib/ng-nest/ui/calendar/calendar.property.ts +++ b/lib/ng-nest/ui/calendar/calendar.property.ts @@ -11,7 +11,7 @@ export const XCalendarPrefix = 'x-calendar'; /** * Calendar Property */ -@Component({ selector: `${XCalendarPrefix}-property`, template: '', standalone: true }) +@Component({ selector: `${XCalendarPrefix}-property`, template: '' }) export class XCalendarProperty extends XProperty { /** * @zh_CN 事务数据对象 diff --git a/lib/ng-nest/ui/card/card.component.spec.ts b/lib/ng-nest/ui/card/card.component.spec.ts index a9ccd3d07..895278659 100644 --- a/lib/ng-nest/ui/card/card.component.spec.ts +++ b/lib/ng-nest/ui/card/card.component.spec.ts @@ -10,7 +10,7 @@ import { XCardPrefix } from './card.property'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XContainerComponent } from '@ng-nest/ui/container'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XCardPrefix, () => { @@ -19,7 +19,7 @@ describe(XCardPrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, FormsModule, XCardComponent, XButtonComponent, diff --git a/lib/ng-nest/ui/card/card.property.ts b/lib/ng-nest/ui/card/card.property.ts index 251b69831..38a163c5e 100644 --- a/lib/ng-nest/ui/card/card.property.ts +++ b/lib/ng-nest/ui/card/card.property.ts @@ -12,7 +12,7 @@ const X_CONFIG_NAME = 'card'; /** * Card Property */ -@Component({ selector: `${XCardPrefix}-property`, template: '', standalone: true }) +@Component({ selector: `${XCardPrefix}-property`, template: '' }) export class XCardProperty extends XProperty { /** * @zh_CN 卡片宽度 diff --git a/lib/ng-nest/ui/carousel/carousel.component.spec.ts b/lib/ng-nest/ui/carousel/carousel.component.spec.ts index ea5c4551d..f86a404aa 100644 --- a/lib/ng-nest/ui/carousel/carousel.component.spec.ts +++ b/lib/ng-nest/ui/carousel/carousel.component.spec.ts @@ -9,9 +9,9 @@ import { FormsModule } from '@angular/forms'; import { XCarouselPrefix } from './carousel.property'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XContainerComponent } from '@ng-nest/ui/container'; -import { XTabsModule } from '@ng-nest/ui/tabs'; +import { XTabsComponent, XTabComponent } from '@ng-nest/ui/tabs'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XCarouselPrefix, () => { @@ -20,7 +20,7 @@ describe(XCarouselPrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, FormsModule, XCarouselComponent, XCarouselPanelComponent, @@ -29,7 +29,8 @@ describe(XCarouselPrefix, () => { XRowComponent, XColComponent, XIconComponent, - XTabsModule + XTabsComponent, + XTabComponent ], declarations: [ TestXCarouselComponent, diff --git a/lib/ng-nest/ui/carousel/carousel.component.ts b/lib/ng-nest/ui/carousel/carousel.component.ts index 3cb2a296f..7bfc8192e 100644 --- a/lib/ng-nest/ui/carousel/carousel.component.ts +++ b/lib/ng-nest/ui/carousel/carousel.component.ts @@ -25,12 +25,12 @@ import { BehaviorSubject, Subject } from 'rxjs'; import { takeUntil, debounceTime } from 'rxjs/operators'; import { CommonModule, isPlatformBrowser } from '@angular/common'; import { XButtonComponent } from '@ng-nest/ui/button'; -import { XProgressModule } from '@ng-nest/ui/progress'; +import { XProgressComponent } from '@ng-nest/ui/progress'; @Component({ selector: `${XCarouselPrefix}`, standalone: true, - imports: [CommonModule, XButtonComponent, XProgressModule], + imports: [CommonModule, XButtonComponent, XProgressComponent], templateUrl: './carousel.component.html', styleUrls: ['./carousel.component.scss'], encapsulation: ViewEncapsulation.None, diff --git a/lib/ng-nest/ui/carousel/carousel.property.ts b/lib/ng-nest/ui/carousel/carousel.property.ts index bc8983fd6..1dfbb08f6 100644 --- a/lib/ng-nest/ui/carousel/carousel.property.ts +++ b/lib/ng-nest/ui/carousel/carousel.property.ts @@ -22,7 +22,7 @@ const X_CONFIG_NAME = 'carousel'; /** * Carousel Property */ -@Component({ selector: `${XCarouselPrefix}-property`, template: '', standalone: true }) +@Component({ selector: `${XCarouselPrefix}-property`, template: '' }) export class XCarouselProperty extends XProperty { /** * @zh_CN 当前激活的幻灯片索引 @@ -126,7 +126,7 @@ export const XCarouselPanelPrefix = 'x-carousel-panel'; /** * Carousel Panel Property */ -@Component({ selector: `${XCarouselPanelPrefix}-property`, template: '', standalone: true }) +@Component({ selector: `${XCarouselPanelPrefix}-property`, template: '' }) export class XCarouselPanelProperty extends XProperty { /** * @zh_CN 激活当前幻灯片 diff --git a/lib/ng-nest/ui/cascade/cascade.component.spec.ts b/lib/ng-nest/ui/cascade/cascade.component.spec.ts index dde1bd26a..8a995c144 100644 --- a/lib/ng-nest/ui/cascade/cascade.component.spec.ts +++ b/lib/ng-nest/ui/cascade/cascade.component.spec.ts @@ -7,8 +7,8 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { XCascadePrefix, XCascadeNode } from './cascade.property'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XThemeComponent } from '@ng-nest/ui/theme'; +import { XRadioComponent } from '@ng-nest/ui/radio'; import { XIconComponent } from '@ng-nest/ui/icon'; import { HttpClientTestingModule } from '@angular/common/http/testing'; @@ -18,13 +18,13 @@ describe(XCascadePrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, XCascadeComponent, FormsModule, ReactiveFormsModule, XRowComponent, XColComponent, - XRadioModule, + XRadioComponent, XIconComponent ], declarations: [ diff --git a/lib/ng-nest/ui/cascade/cascade.module.ts b/lib/ng-nest/ui/cascade/cascade.module.ts index 33e31bd2c..2be967a44 100644 --- a/lib/ng-nest/ui/cascade/cascade.module.ts +++ b/lib/ng-nest/ui/cascade/cascade.module.ts @@ -1,9 +1,8 @@ import { NgModule } from '@angular/core'; import { XCascadeComponent } from './cascade.component'; -import { XCascadePortalComponent } from './cascade-portal.component'; @NgModule({ - exports: [XCascadeComponent, XCascadePortalComponent], - imports: [XCascadeComponent, XCascadePortalComponent] + exports: [XCascadeComponent], + imports: [XCascadeComponent] }) export class XCascadeModule {} diff --git a/lib/ng-nest/ui/cascade/examples/en_US/default/size/size.component.ts b/lib/ng-nest/ui/cascade/examples/en_US/default/size/size.component.ts index 2b649a975..a894ee1c7 100644 --- a/lib/ng-nest/ui/cascade/examples/en_US/default/size/size.component.ts +++ b/lib/ng-nest/ui/cascade/examples/en_US/default/size/size.component.ts @@ -3,12 +3,12 @@ import { FormsModule } from '@angular/forms'; import { XCascadeComponent, XCascadeNode } from '@ng-nest/ui/cascade'; import { XData, XSize } from '@ng-nest/ui/core'; import { XColComponent, XRowComponent } from '@ng-nest/ui/layout'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; @Component({ selector: 'ex-size', standalone: true, - imports: [XRowComponent, XColComponent, FormsModule, XCascadeComponent, XRadioModule], + imports: [XRowComponent, XColComponent, FormsModule, XCascadeComponent, XRadioComponent], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/cascade/examples/zh_CN/default/size/size.component.ts b/lib/ng-nest/ui/cascade/examples/zh_CN/default/size/size.component.ts index 2b649a975..a894ee1c7 100644 --- a/lib/ng-nest/ui/cascade/examples/zh_CN/default/size/size.component.ts +++ b/lib/ng-nest/ui/cascade/examples/zh_CN/default/size/size.component.ts @@ -3,12 +3,12 @@ import { FormsModule } from '@angular/forms'; import { XCascadeComponent, XCascadeNode } from '@ng-nest/ui/cascade'; import { XData, XSize } from '@ng-nest/ui/core'; import { XColComponent, XRowComponent } from '@ng-nest/ui/layout'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; @Component({ selector: 'ex-size', standalone: true, - imports: [XRowComponent, XColComponent, FormsModule, XCascadeComponent, XRadioModule], + imports: [XRowComponent, XColComponent, FormsModule, XCascadeComponent, XRadioComponent], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/checkbox/checkbox.component.spec.ts b/lib/ng-nest/ui/checkbox/checkbox.component.spec.ts index 82cc9dddd..381ebde20 100644 --- a/lib/ng-nest/ui/checkbox/checkbox.component.spec.ts +++ b/lib/ng-nest/ui/checkbox/checkbox.component.spec.ts @@ -9,18 +9,18 @@ import { FormsModule } from '@angular/forms'; import { XCheckboxPrefix, XCheckboxNode } from './checkbox.property'; import { XData } from '@ng-nest/ui/core'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; -import { XSelectModule } from '@ng-nest/ui/select'; +import { XThemeComponent } from '@ng-nest/ui/theme'; +import { XSelectComponent } from '@ng-nest/ui/select'; import { XDatePickerComponent } from '@ng-nest/ui/date-picker'; import { XAutoCompleteComponent } from '@ng-nest/ui/auto-complete'; import { XCascadeComponent } from '@ng-nest/ui/cascade'; import { XColorPickerComponent } from '@ng-nest/ui/color-picker'; import { XFindComponent } from '@ng-nest/ui/find'; -import { XTextareaModule } from '@ng-nest/ui/textarea'; +import { XTextareaComponent } from '@ng-nest/ui/textarea'; import { XTimePickerModule } from '@ng-nest/ui/time-picker'; import { XInputComponent } from '@ng-nest/ui/input'; import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { XTagModule } from '@ng-nest/ui/tag'; +import { XTagComponent } from '@ng-nest/ui/tag'; describe(XCheckboxPrefix, () => { beforeEach(() => { @@ -28,22 +28,22 @@ describe(XCheckboxPrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, FormsModule, XCheckboxComponent, XButtonComponent, XAutoCompleteComponent, - XSelectModule, + XSelectComponent, XDatePickerComponent, XRowComponent, XColComponent, XCascadeComponent, XColorPickerComponent, XFindComponent, - XTextareaModule, + XTextareaComponent, XTimePickerModule, XInputComponent, - XTagModule + XTagComponent ], declarations: [ TestXCheckboxComponent, diff --git a/lib/ng-nest/ui/checkbox/checkbox.component.ts b/lib/ng-nest/ui/checkbox/checkbox.component.ts index 3db8283a5..d2a4acbf5 100644 --- a/lib/ng-nest/ui/checkbox/checkbox.component.ts +++ b/lib/ng-nest/ui/checkbox/checkbox.component.ts @@ -26,7 +26,7 @@ import { XDirection } from '@ng-nest/ui/core'; import { XValueAccessor, XControlValueAccessor } from '@ng-nest/ui/base-form'; -import { XTagModule } from '@ng-nest/ui/tag'; +import { XTagComponent } from '@ng-nest/ui/tag'; import { FormsModule } from '@angular/forms'; import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; import { XOutletDirective } from '@ng-nest/ui/outlet'; @@ -40,7 +40,7 @@ import { CommonModule } from '@angular/common'; FormsModule, XButtonComponent, XButtonsComponent, - XTagModule, + XTagComponent, XOutletDirective, XControlValueAccessor ], diff --git a/lib/ng-nest/ui/checkbox/examples/en_US/default/perpost/perpost.component.ts b/lib/ng-nest/ui/checkbox/examples/en_US/default/perpost/perpost.component.ts index cffb358bc..4eefcd390 100644 --- a/lib/ng-nest/ui/checkbox/examples/en_US/default/perpost/perpost.component.ts +++ b/lib/ng-nest/ui/checkbox/examples/en_US/default/perpost/perpost.component.ts @@ -2,7 +2,7 @@ import { Component } from '@angular/core'; import { XData } from '@ng-nest/ui/core'; import { XCheckboxComponent, XCheckboxNode } from '@ng-nest/ui/checkbox'; import { FormsModule } from '@angular/forms'; -import { XSelectModule } from '@ng-nest/ui/select'; +import { XSelectComponent } from '@ng-nest/ui/select'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XInputComponent } from '@ng-nest/ui/input'; import { XDatePickerComponent } from '@ng-nest/ui/date-picker'; @@ -17,7 +17,7 @@ import { XTimePickerModule } from '@ng-nest/ui/time-picker'; imports: [ FormsModule, XCheckboxComponent, - XSelectModule, + XSelectComponent, XButtonComponent, XInputComponent, XDatePickerComponent, diff --git a/lib/ng-nest/ui/checkbox/examples/en_US/default/tag/tag.component.ts b/lib/ng-nest/ui/checkbox/examples/en_US/default/tag/tag.component.ts index 1afac66be..a2899c331 100644 --- a/lib/ng-nest/ui/checkbox/examples/en_US/default/tag/tag.component.ts +++ b/lib/ng-nest/ui/checkbox/examples/en_US/default/tag/tag.component.ts @@ -2,12 +2,12 @@ import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { XCheckboxComponent } from '@ng-nest/ui/checkbox'; -import { XTagModule } from '@ng-nest/ui/tag'; +import { XTagComponent } from '@ng-nest/ui/tag'; @Component({ selector: 'ex-tag', standalone: true, - imports: [CommonModule, FormsModule, XCheckboxComponent, XTagModule], + imports: [CommonModule, FormsModule, XCheckboxComponent, XTagComponent], templateUrl: './tag.component.html', styleUrls: ['./tag.component.scss'] }) diff --git a/lib/ng-nest/ui/checkbox/examples/zh_CN/default/perpost/perpost.component.ts b/lib/ng-nest/ui/checkbox/examples/zh_CN/default/perpost/perpost.component.ts index cffb358bc..4eefcd390 100644 --- a/lib/ng-nest/ui/checkbox/examples/zh_CN/default/perpost/perpost.component.ts +++ b/lib/ng-nest/ui/checkbox/examples/zh_CN/default/perpost/perpost.component.ts @@ -2,7 +2,7 @@ import { Component } from '@angular/core'; import { XData } from '@ng-nest/ui/core'; import { XCheckboxComponent, XCheckboxNode } from '@ng-nest/ui/checkbox'; import { FormsModule } from '@angular/forms'; -import { XSelectModule } from '@ng-nest/ui/select'; +import { XSelectComponent } from '@ng-nest/ui/select'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XInputComponent } from '@ng-nest/ui/input'; import { XDatePickerComponent } from '@ng-nest/ui/date-picker'; @@ -17,7 +17,7 @@ import { XTimePickerModule } from '@ng-nest/ui/time-picker'; imports: [ FormsModule, XCheckboxComponent, - XSelectModule, + XSelectComponent, XButtonComponent, XInputComponent, XDatePickerComponent, diff --git a/lib/ng-nest/ui/checkbox/examples/zh_CN/default/tag/tag.component.ts b/lib/ng-nest/ui/checkbox/examples/zh_CN/default/tag/tag.component.ts index 95fb5c279..33917ba66 100644 --- a/lib/ng-nest/ui/checkbox/examples/zh_CN/default/tag/tag.component.ts +++ b/lib/ng-nest/ui/checkbox/examples/zh_CN/default/tag/tag.component.ts @@ -2,12 +2,12 @@ import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { XCheckboxComponent } from '@ng-nest/ui/checkbox'; -import { XTagModule } from '@ng-nest/ui/tag'; +import { XTagComponent } from '@ng-nest/ui/tag'; @Component({ selector: 'ex-tag', standalone: true, - imports: [CommonModule, FormsModule, XCheckboxComponent, XTagModule], + imports: [CommonModule, FormsModule, XCheckboxComponent, XTagComponent], templateUrl: './tag.component.html', styleUrls: ['./tag.component.scss'] }) diff --git a/lib/ng-nest/ui/collapse/collapse.component.spec.ts b/lib/ng-nest/ui/collapse/collapse.component.spec.ts index 57f8e4377..1bf72a4f5 100644 --- a/lib/ng-nest/ui/collapse/collapse.component.spec.ts +++ b/lib/ng-nest/ui/collapse/collapse.component.spec.ts @@ -10,14 +10,14 @@ import { XCollapsePrefix } from './collapse.property'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XContainerComponent } from '@ng-nest/ui/container'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XCollapsePrefix, () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ - XThemeModule, + XThemeComponent, FormsModule, BrowserAnimationsModule, HttpClientTestingModule, diff --git a/lib/ng-nest/ui/color-picker/color-picker-portal.component.ts b/lib/ng-nest/ui/color-picker/color-picker-portal.component.ts index 603815b06..8ba4cd7c2 100644 --- a/lib/ng-nest/ui/color-picker/color-picker-portal.component.ts +++ b/lib/ng-nest/ui/color-picker/color-picker-portal.component.ts @@ -21,8 +21,7 @@ import { CommonModule, DOCUMENT, DecimalPipe, PercentPipe } from '@angular/commo import { takeUntil } from 'rxjs/operators'; import { XInputComponent } from '@ng-nest/ui/input'; import { DragDropModule } from '@angular/cdk/drag-drop'; -import { XSliderSelectModule } from '@ng-nest/ui/slider-select'; -import { XTabsModule } from '@ng-nest/ui/tabs'; +import { XTabsComponent, XTabComponent } from '@ng-nest/ui/tabs'; import { FormsModule } from '@angular/forms'; @Component({ @@ -32,8 +31,9 @@ import { FormsModule } from '@angular/forms'; CommonModule, FormsModule, DragDropModule, - XSliderSelectModule, - XTabsModule, + XSliderSelectComponent, + XTabsComponent, + XTabComponent, XInputComponent ], templateUrl: './color-picker-portal.component.html', @@ -111,9 +111,7 @@ export class XColorPickerPortalComponent implements OnInit, OnDestroy { this.panel = this.panelRef.nativeElement.getBoundingClientRect(); this.plate = this.plateRef.nativeElement.getBoundingClientRect(); this.offset = (this.panel.width - this.plate.width) / 2; - this.transparentRail = this.transparentCom.elementRef.nativeElement.querySelector( - '.x-slider-select-rail div' - )!; + this.transparentRail = this.transparentCom.elementRef.nativeElement.querySelector('.x-slider-select-rail div')!; this.setTransform(); this.setPlateBackground(); this.setRailBackground(); @@ -267,10 +265,8 @@ export class XColorPickerPortalComponent implements OnInit, OnDestroy { } setHslaPercent() { - this.hsla.sp = - this.hsla.s === 0 ? '0%' : (this.percent.transform(this.hsla.s, '1.0-0') as string); - this.hsla.lp = - this.hsla.l === 0 ? '0%' : (this.percent.transform(this.hsla.l, '1.0-0') as string); + this.hsla.sp = this.hsla.s === 0 ? '0%' : (this.percent.transform(this.hsla.s, '1.0-0') as string); + this.hsla.lp = this.hsla.l === 0 ? '0%' : (this.percent.transform(this.hsla.l, '1.0-0') as string); } getPrimary() { @@ -285,11 +281,7 @@ export class XColorPickerPortalComponent implements OnInit, OnDestroy { } setPlateBackground() { - this.renderer.setStyle( - this.plateRef.nativeElement, - 'background-color', - `hsl(${this.hsla.h}, 100%, 50%)` - ); + this.renderer.setStyle(this.plateRef.nativeElement, 'background-color', `hsl(${this.hsla.h}, 100%, 50%)`); } setRailBackground() { diff --git a/lib/ng-nest/ui/color-picker/color-picker.component.spec.ts b/lib/ng-nest/ui/color-picker/color-picker.component.spec.ts index 4d4f807eb..bf02aedc6 100644 --- a/lib/ng-nest/ui/color-picker/color-picker.component.spec.ts +++ b/lib/ng-nest/ui/color-picker/color-picker.component.spec.ts @@ -8,8 +8,8 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { XColorPickerPrefix } from './color-picker.property'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XThemeComponent } from '@ng-nest/ui/theme'; +import { XRadioComponent } from '@ng-nest/ui/radio'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XColorPickerPrefix, () => { @@ -18,13 +18,13 @@ describe(XColorPickerPrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, XColorPickerComponent, FormsModule, ReactiveFormsModule, XRowComponent, XColComponent, - XRadioModule + XRadioComponent ], declarations: [ TestXColorPickerComponent, diff --git a/lib/ng-nest/ui/color-picker/color-picker.module.ts b/lib/ng-nest/ui/color-picker/color-picker.module.ts index 52ed38c69..8c996fa48 100644 --- a/lib/ng-nest/ui/color-picker/color-picker.module.ts +++ b/lib/ng-nest/ui/color-picker/color-picker.module.ts @@ -1,9 +1,8 @@ import { NgModule } from '@angular/core'; import { XColorPickerComponent } from './color-picker.component'; -import { XColorPickerPortalComponent } from './color-picker-portal.component'; @NgModule({ - imports: [XColorPickerComponent, XColorPickerPortalComponent], - exports: [XColorPickerComponent, XColorPickerPortalComponent] + imports: [XColorPickerComponent], + exports: [XColorPickerComponent] }) export class XColorPickerModule {} diff --git a/lib/ng-nest/ui/color-picker/color-picker.property.ts b/lib/ng-nest/ui/color-picker/color-picker.property.ts index 4a1750b4e..c654ef619 100644 --- a/lib/ng-nest/ui/color-picker/color-picker.property.ts +++ b/lib/ng-nest/ui/color-picker/color-picker.property.ts @@ -14,7 +14,7 @@ const X_CONFIG_NAME = 'colorPicker'; /** * ColorPicker Property */ -@Component({ selector: `${XColorPickerPrefix}-property`, template: '', standalone: true }) +@Component({ selector: `${XColorPickerPrefix}-property`, template: '' }) export class XColorPickerProperty extends XControlValueAccessor implements XColorPickerOption { /** * @zh_CN 展示方位 diff --git a/lib/ng-nest/ui/color-picker/examples/en_US/default/size/size.component.ts b/lib/ng-nest/ui/color-picker/examples/en_US/default/size/size.component.ts index e57cd8b30..c9c0573f8 100644 --- a/lib/ng-nest/ui/color-picker/examples/en_US/default/size/size.component.ts +++ b/lib/ng-nest/ui/color-picker/examples/en_US/default/size/size.component.ts @@ -2,12 +2,12 @@ import { Component } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { XColorPickerComponent } from '@ng-nest/ui/color-picker'; import { XSize } from '@ng-nest/ui/core'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; @Component({ selector: 'ex-size', standalone: true, - imports: [FormsModule, XColorPickerComponent, XRadioModule], + imports: [FormsModule, XColorPickerComponent, XRadioComponent], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/color-picker/examples/zh_CN/default/size/size.component.ts b/lib/ng-nest/ui/color-picker/examples/zh_CN/default/size/size.component.ts index e57cd8b30..c9c0573f8 100644 --- a/lib/ng-nest/ui/color-picker/examples/zh_CN/default/size/size.component.ts +++ b/lib/ng-nest/ui/color-picker/examples/zh_CN/default/size/size.component.ts @@ -2,12 +2,12 @@ import { Component } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { XColorPickerComponent } from '@ng-nest/ui/color-picker'; import { XSize } from '@ng-nest/ui/core'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; @Component({ selector: 'ex-size', standalone: true, - imports: [FormsModule, XColorPickerComponent, XRadioModule], + imports: [FormsModule, XColorPickerComponent, XRadioComponent], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/color/color.component.spec.ts b/lib/ng-nest/ui/color/color.component.spec.ts index 741bdd1b5..b3023ac89 100644 --- a/lib/ng-nest/ui/color/color.component.spec.ts +++ b/lib/ng-nest/ui/color/color.component.spec.ts @@ -6,7 +6,7 @@ import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { XColorComponent } from '@ng-nest/ui/color'; import { XColorPrefix } from './color.property'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XColorPrefix, () => { @@ -15,7 +15,7 @@ describe(XColorPrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, XColorComponent, XRowComponent, XColComponent diff --git a/lib/ng-nest/ui/color/color.property.ts b/lib/ng-nest/ui/color/color.property.ts index a405305d5..aee358085 100644 --- a/lib/ng-nest/ui/color/color.property.ts +++ b/lib/ng-nest/ui/color/color.property.ts @@ -15,7 +15,7 @@ export const XAmounts = [-0.1, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9]; /** * Color Property */ -@Component({ selector: `${XColorPrefix}-property`, template: '', standalone: true }) +@Component({ selector: `${XColorPrefix}-property`, template: '' }) export class XColorProperty extends XProperty { /** * @zh_CN 颜色名称 diff --git a/lib/ng-nest/ui/comment/comment.component.spec.ts b/lib/ng-nest/ui/comment/comment.component.spec.ts index b07bda505..d52daf126 100644 --- a/lib/ng-nest/ui/comment/comment.component.spec.ts +++ b/lib/ng-nest/ui/comment/comment.component.spec.ts @@ -12,7 +12,7 @@ import { XContainerComponent } from '@ng-nest/ui/container'; import { XAddMinutes, XAddHours } from '@ng-nest/ui/core'; import { DatePipe } from '@angular/common'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XCommentPrefix, () => { @@ -21,7 +21,7 @@ describe(XCommentPrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, FormsModule, XCommentComponent, XButtonComponent, diff --git a/lib/ng-nest/ui/comment/comment.component.ts b/lib/ng-nest/ui/comment/comment.component.ts index 1acf0b5e2..bdc04cf28 100644 --- a/lib/ng-nest/ui/comment/comment.component.ts +++ b/lib/ng-nest/ui/comment/comment.component.ts @@ -15,8 +15,8 @@ import { takeUntil } from 'rxjs/operators'; import { XAvatarComponent } from '@ng-nest/ui/avatar'; import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; import { XLinkComponent } from '@ng-nest/ui/link'; -import { XTextRetractModule } from '@ng-nest/ui/text-retract'; -import { XTimeAgoModule } from '@ng-nest/ui/time-ago'; +import { XTextRetractComponent } from '@ng-nest/ui/text-retract'; +import { XTimeAgoPipe } from '@ng-nest/ui/time-ago'; import { CommonModule } from '@angular/common'; import { XCommentReplyComponent } from './comment-reply.component'; @@ -30,8 +30,8 @@ import { XCommentReplyComponent } from './comment-reply.component'; XAvatarComponent, XButtonComponent, XButtonsComponent, - XTextRetractModule, - XTimeAgoModule, + XTextRetractComponent, + XTimeAgoPipe, XCommentReplyComponent ], templateUrl: './comment.component.html', diff --git a/lib/ng-nest/ui/comment/comment.property.ts b/lib/ng-nest/ui/comment/comment.property.ts index bd629b2da..8fb02f2d3 100644 --- a/lib/ng-nest/ui/comment/comment.property.ts +++ b/lib/ng-nest/ui/comment/comment.property.ts @@ -21,7 +21,7 @@ const X_CONFIG_NAME = 'comment'; /** * Comment Property */ -@Component({ selector: `${XCommentPrefix}-property`, template: '', standalone: true }) +@Component({ selector: `${XCommentPrefix}-property`, template: '' }) export class XCommentProperty extends XProperty { /** * @zh_CN 评论数据 @@ -122,7 +122,7 @@ export const XCommentReplyPrefix = 'x-comment-reply'; /** * Comment Reply Property */ -@Component({ selector: `${XCommentReplyPrefix}-property`, template: '', standalone: true }) +@Component({ selector: `${XCommentReplyPrefix}-property`, template: '' }) export class XCommentReplyProperty extends XProperty { /** * @zh_CN 回复的最大字数 diff --git a/lib/ng-nest/ui/container/container.component.spec.ts b/lib/ng-nest/ui/container/container.component.spec.ts index 5713e96af..ac980af63 100644 --- a/lib/ng-nest/ui/container/container.component.spec.ts +++ b/lib/ng-nest/ui/container/container.component.spec.ts @@ -11,7 +11,7 @@ import { } from '@ng-nest/ui/container'; import { XContainerPrefix } from './container.property'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XContainerPrefix, () => { @@ -20,7 +20,7 @@ describe(XContainerPrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, XContainerComponent, XAsideComponent, XHeaderComponent, diff --git a/lib/ng-nest/ui/container/container.module.ts b/lib/ng-nest/ui/container/container.module.ts index 29baaaa6f..3acaefbd7 100644 --- a/lib/ng-nest/ui/container/container.module.ts +++ b/lib/ng-nest/ui/container/container.module.ts @@ -5,10 +5,8 @@ import { XMainComponent } from './main.component'; import { XAsideComponent } from './aside.component'; import { XHeaderComponent } from './header.component'; -const components = [XContainerComponent, XHeaderComponent, XAsideComponent, XMainComponent, XFooterComponent]; - @NgModule({ - imports: [...components], - exports: [...components] + imports: [XContainerComponent, XHeaderComponent, XAsideComponent, XMainComponent, XFooterComponent], + exports: [XContainerComponent, XHeaderComponent, XAsideComponent, XMainComponent, XFooterComponent] }) export class XContainerModule {} diff --git a/lib/ng-nest/ui/container/container.property.ts b/lib/ng-nest/ui/container/container.property.ts index ff0f218ea..aaed4b0e9 100644 --- a/lib/ng-nest/ui/container/container.property.ts +++ b/lib/ng-nest/ui/container/container.property.ts @@ -12,7 +12,7 @@ const X_CONFIG_NAME = 'container'; /** * Container Property */ -@Component({ selector: `${XContainerPrefix}-property`, template: '', standalone: true }) +@Component({ selector: `${XContainerPrefix}-property`, template: '' }) export class XContainerProperty extends XProperty { /** * @zh_CN flex 布局下的子元素排列方向，子元素中有 x-header 或 x-footer 时为 column @@ -32,7 +32,7 @@ const X_CONFIG_NAME_HEADER = 'header'; /** * Header Property */ -@Component({ selector: `${XHeaderPrefix}-property`, template: '', standalone: true }) +@Component({ selector: `${XHeaderPrefix}-property`, template: '' }) export class XHeaderProperty extends XProperty { /** * @zh_CN 高度，rem @@ -52,7 +52,7 @@ const X_CONFIG_NAME_ASIDE = 'aside'; /** * Aside Property */ -@Component({ selector: `${XAsidePrefix}-property`, template: '', standalone: true }) +@Component({ selector: `${XAsidePrefix}-property`, template: '' }) export class XAsideProperty extends XProperty { /** * @zh_CN 宽度，rem @@ -79,7 +79,7 @@ const X_CONFIG_NAME_FOOTER = 'footer'; /** * Footer Property */ -@Component({ selector: `${XFooterPrefix}-property`, template: '', standalone: true }) +@Component({ selector: `${XFooterPrefix}-property`, template: '' }) export class XFooterProperty extends XProperty { /** * @zh_CN 高度，rem diff --git a/lib/ng-nest/ui/core/services/preloading-strategy.service.ts b/lib/ng-nest/ui/core/services/preloading-strategy.service.ts index cc4348a8b..491c6c8ad 100644 --- a/lib/ng-nest/ui/core/services/preloading-strategy.service.ts +++ b/lib/ng-nest/ui/core/services/preloading-strategy.service.ts @@ -3,7 +3,7 @@ import { PreloadingStrategy, Route } from '@angular/router'; import { Observable, of } from 'rxjs'; // @dynamic -@Injectable() +@Injectable({ providedIn: 'root' }) export class XPreloadingStrategyService implements PreloadingStrategy { // 需要预加载的模块 preloadedModules: string[] = []; diff --git a/lib/ng-nest/ui/crumb/crumb.component.spec.ts b/lib/ng-nest/ui/crumb/crumb.component.spec.ts index eaef51a8c..d9fbcf8d2 100644 --- a/lib/ng-nest/ui/crumb/crumb.component.spec.ts +++ b/lib/ng-nest/ui/crumb/crumb.component.spec.ts @@ -4,9 +4,9 @@ import { By } from '@angular/platform-browser'; import { XCrumbComponent } from '@ng-nest/ui/crumb'; import { XCrumbPrefix } from './crumb.property'; import { XIconComponent } from '@ng-nest/ui/icon'; -import { XTagModule } from '@ng-nest/ui/tag'; +import { XTagComponent } from '@ng-nest/ui/tag'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XCrumbPrefix, () => { @@ -15,10 +15,10 @@ describe(XCrumbPrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, XCrumbComponent, XIconComponent, - XTagModule + XTagComponent ], declarations: [TestXCrumbComponent] }).compileComponents(); diff --git a/lib/ng-nest/ui/crumb/crumb.property.ts b/lib/ng-nest/ui/crumb/crumb.property.ts index 50609649c..8d545c49d 100644 --- a/lib/ng-nest/ui/crumb/crumb.property.ts +++ b/lib/ng-nest/ui/crumb/crumb.property.ts @@ -12,7 +12,7 @@ const X_CONFIG_NAME = 'crumb'; /** * Crumb Property */ -@Component({ selector: `${XCrumbPrefix}-property`, template: '', standalone: true }) +@Component({ selector: `${XCrumbPrefix}-property`, template: '' }) export class XCrumbProperty extends XProperty { /** * @zh_CN 节点数据 diff --git a/lib/ng-nest/ui/crumb/examples/en_US/default/custom/custom.component.ts b/lib/ng-nest/ui/crumb/examples/en_US/default/custom/custom.component.ts index e8614c2fd..34b3f9c36 100644 --- a/lib/ng-nest/ui/crumb/examples/en_US/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/crumb/examples/en_US/default/custom/custom.component.ts @@ -1,12 +1,12 @@ import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; import { XCrumbComponent } from '@ng-nest/ui/crumb'; -import { XTagModule } from '@ng-nest/ui/tag'; +import { XTagComponent } from '@ng-nest/ui/tag'; @Component({ selector: 'ex-custom', standalone: true, - imports: [CommonModule, XCrumbComponent, XTagModule], + imports: [CommonModule, XCrumbComponent, XTagComponent], templateUrl: './custom.component.html' }) export class ExCustomComponent { diff --git a/lib/ng-nest/ui/crumb/examples/zh_CN/default/custom/custom.component.ts b/lib/ng-nest/ui/crumb/examples/zh_CN/default/custom/custom.component.ts index e73485562..ac0ea1fe1 100644 --- a/lib/ng-nest/ui/crumb/examples/zh_CN/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/crumb/examples/zh_CN/default/custom/custom.component.ts @@ -1,12 +1,12 @@ import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; import { XCrumbComponent } from '@ng-nest/ui/crumb'; -import { XTagModule } from '@ng-nest/ui/tag'; +import { XTagComponent } from '@ng-nest/ui/tag'; @Component({ selector: 'ex-custom', standalone: true, - imports: [CommonModule, XCrumbComponent, XTagModule], + imports: [CommonModule, XCrumbComponent, XTagComponent], templateUrl: './custom.component.html' }) export class ExCustomComponent { diff --git a/lib/ng-nest/ui/date-picker/date-picker.component.spec.ts b/lib/ng-nest/ui/date-picker/date-picker.component.spec.ts index 513e1ea94..4ac0a2ede 100644 --- a/lib/ng-nest/ui/date-picker/date-picker.component.spec.ts +++ b/lib/ng-nest/ui/date-picker/date-picker.component.spec.ts @@ -10,13 +10,13 @@ import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XI18nService, en_US, zh_CN } from '@ng-nest/ui/i18n'; -import { XRadioModule } from '@ng-nest/ui/radio'; -import { XSelectModule } from '@ng-nest/ui/select'; +import { XRadioComponent } from '@ng-nest/ui/radio'; +import { XSelectComponent } from '@ng-nest/ui/select'; import { XAutoCompleteComponent } from '@ng-nest/ui/auto-complete'; import { XCascadeComponent } from '@ng-nest/ui/cascade'; import { XColorPickerComponent } from '@ng-nest/ui/color-picker'; import { XFindComponent } from '@ng-nest/ui/find'; -import { XTextareaModule } from '@ng-nest/ui/textarea'; +import { XTextareaComponent } from '@ng-nest/ui/textarea'; import { XTimePickerModule } from '@ng-nest/ui/time-picker'; import { XInputComponent } from '@ng-nest/ui/input'; import { XAddDays } from '@ng-nest/ui/core'; @@ -35,14 +35,14 @@ describe(XDatePickerPrefix, () => { XRowComponent, XColComponent, XButtonComponent, - XRadioModule, - XSelectModule, + XRadioComponent, + XSelectComponent, XInputComponent, XAutoCompleteComponent, XCascadeComponent, XColorPickerComponent, XFindComponent, - XTextareaModule, + XTextareaComponent, XTimePickerModule ], declarations: [ diff --git a/lib/ng-nest/ui/date-picker/date-picker.module.ts b/lib/ng-nest/ui/date-picker/date-picker.module.ts index 39e905b38..fe270d687 100644 --- a/lib/ng-nest/ui/date-picker/date-picker.module.ts +++ b/lib/ng-nest/ui/date-picker/date-picker.module.ts @@ -1,33 +1,9 @@ import { NgModule } from '@angular/core'; import { XDatePickerComponent } from './date-picker.component'; -import { XDatePickerPortalComponent } from './date-picker-portal.component'; -import { XPickerDateComponent } from './picker-date.component'; -import { XPickerMonthComponent } from './picker-month.component'; -import { XPickerYearComponent } from './picker-year.component'; import { XDateRangeComponent } from './date-range.component'; -import { XPickerQuarterComponent } from './picker-quarter.component'; -import { XDateQuarterPipe } from './date-quarter.pipe'; @NgModule({ - exports: [ - XDatePickerComponent, - XDateRangeComponent, - XDatePickerPortalComponent, - XPickerDateComponent, - XPickerMonthComponent, - XPickerQuarterComponent, - XPickerYearComponent, - XDateQuarterPipe - ], - imports: [ - XDatePickerComponent, - XDateRangeComponent, - XDatePickerPortalComponent, - XPickerDateComponent, - XPickerMonthComponent, - XPickerQuarterComponent, - XPickerYearComponent, - XDateQuarterPipe - ] + exports: [XDatePickerComponent, XDateRangeComponent], + imports: [XDatePickerComponent, XDateRangeComponent] }) export class XDatePickerModule {} diff --git a/lib/ng-nest/ui/date-picker/examples/en_US/default/size/size.component.ts b/lib/ng-nest/ui/date-picker/examples/en_US/default/size/size.component.ts index 730eacca0..7bb98ffdd 100644 --- a/lib/ng-nest/ui/date-picker/examples/en_US/default/size/size.component.ts +++ b/lib/ng-nest/ui/date-picker/examples/en_US/default/size/size.component.ts @@ -2,12 +2,12 @@ import { Component } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { XSize } from '@ng-nest/ui/core'; import { XDatePickerComponent } from '@ng-nest/ui/date-picker'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; @Component({ selector: 'ex-size', standalone: true, - imports: [FormsModule, XDatePickerComponent, XRadioModule], + imports: [FormsModule, XDatePickerComponent, XRadioComponent], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/date-picker/examples/zh_CN/default/size/size.component.ts b/lib/ng-nest/ui/date-picker/examples/zh_CN/default/size/size.component.ts index 730eacca0..7bb98ffdd 100644 --- a/lib/ng-nest/ui/date-picker/examples/zh_CN/default/size/size.component.ts +++ b/lib/ng-nest/ui/date-picker/examples/zh_CN/default/size/size.component.ts @@ -2,12 +2,12 @@ import { Component } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { XSize } from '@ng-nest/ui/core'; import { XDatePickerComponent } from '@ng-nest/ui/date-picker'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; @Component({ selector: 'ex-size', standalone: true, - imports: [FormsModule, XDatePickerComponent, XRadioModule], + imports: [FormsModule, XDatePickerComponent, XRadioComponent], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/description/description.component.spec.ts b/lib/ng-nest/ui/description/description.component.spec.ts index 69df24876..bbd276ada 100644 --- a/lib/ng-nest/ui/description/description.component.spec.ts +++ b/lib/ng-nest/ui/description/description.component.spec.ts @@ -7,9 +7,9 @@ import { By } from '@angular/platform-browser'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { XDescriptionModule } from '@ng-nest/ui/description'; import { XDescriptionPrefix } from './description.property'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; import { FormsModule } from '@angular/forms'; import { HttpClientTestingModule } from '@angular/common/http/testing'; @@ -20,9 +20,9 @@ describe(XDescriptionPrefix, () => { BrowserAnimationsModule, HttpClientTestingModule, FormsModule, - XThemeModule, + XThemeComponent, XDescriptionModule, - XRadioModule, + XRadioComponent, XRowComponent, XColComponent, XDocComponent diff --git a/lib/ng-nest/ui/description/examples/en_US/default/size/size.component.ts b/lib/ng-nest/ui/description/examples/en_US/default/size/size.component.ts index 1d02bfdda..87185b977 100644 --- a/lib/ng-nest/ui/description/examples/en_US/default/size/size.component.ts +++ b/lib/ng-nest/ui/description/examples/en_US/default/size/size.component.ts @@ -2,12 +2,12 @@ import { Component } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { XSize } from '@ng-nest/ui/core'; import { XDescriptionComponent, XDescriptionItemComponent } from '@ng-nest/ui/description'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; @Component({ selector: 'ex-size', standalone: true, - imports: [FormsModule, XDescriptionComponent, XDescriptionItemComponent, XRadioModule], + imports: [FormsModule, XDescriptionComponent, XDescriptionItemComponent, XRadioComponent], templateUrl: './size.component.html', styles: [ ` diff --git a/lib/ng-nest/ui/description/examples/zh_CN/default/size/size.component.ts b/lib/ng-nest/ui/description/examples/zh_CN/default/size/size.component.ts index 1d02bfdda..87185b977 100644 --- a/lib/ng-nest/ui/description/examples/zh_CN/default/size/size.component.ts +++ b/lib/ng-nest/ui/description/examples/zh_CN/default/size/size.component.ts @@ -2,12 +2,12 @@ import { Component } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { XSize } from '@ng-nest/ui/core'; import { XDescriptionComponent, XDescriptionItemComponent } from '@ng-nest/ui/description'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; @Component({ selector: 'ex-size', standalone: true, - imports: [FormsModule, XDescriptionComponent, XDescriptionItemComponent, XRadioModule], + imports: [FormsModule, XDescriptionComponent, XDescriptionItemComponent, XRadioComponent], templateUrl: './size.component.html', styles: [ ` diff --git a/lib/ng-nest/ui/dialog/dialog.component.spec.ts b/lib/ng-nest/ui/dialog/dialog.component.spec.ts index c855ecc2f..653bdb98f 100644 --- a/lib/ng-nest/ui/dialog/dialog.component.spec.ts +++ b/lib/ng-nest/ui/dialog/dialog.component.spec.ts @@ -5,13 +5,13 @@ import { XButtonComponent } from '@ng-nest/ui/button'; import { XDialogPrefix } from './dialog.property'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { XPlace } from '@ng-nest/ui/core'; -import { XMessageBoxService, XMessageBoxModule, XMessageBoxAction } from '@ng-nest/ui/message-box'; +import { XMessageBoxService, XMessageBoxAction } from '@ng-nest/ui/message-box'; import { FormsModule } from '@angular/forms'; import { XInputComponent } from '@ng-nest/ui/input'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; import { XIconComponent } from '@ng-nest/ui/icon'; import { XLinkComponent } from '@ng-nest/ui/link'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { XI18nService, en_US, zh_CN } from '@ng-nest/ui/i18n'; import { interval } from 'rxjs'; import { XFormComponent } from '@ng-nest/ui/form'; @@ -24,16 +24,15 @@ describe(XDialogPrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, FormsModule, XInputComponent, - XRadioModule, + XRadioComponent, XDialogComponent, XButtonComponent, XIconComponent, XLinkComponent, - XFormComponent, - XMessageBoxModule + XFormComponent ], declarations: [TestXDialogComponent, TestXDialogDraggableComponent] }).compileComponents(); diff --git a/lib/ng-nest/ui/dialog/dialog.module.ts b/lib/ng-nest/ui/dialog/dialog.module.ts index 91e6402b8..e119020e4 100644 --- a/lib/ng-nest/ui/dialog/dialog.module.ts +++ b/lib/ng-nest/ui/dialog/dialog.module.ts @@ -8,7 +8,6 @@ import { XDialogFullscreenDirective, XDialogTitleDirective } from './dialog-portal.directives'; -import { XDialogPortalComponent } from './dialog-portal.component'; import { XDialogContainerComponent } from './dialog-container.component'; @NgModule({ @@ -20,8 +19,7 @@ import { XDialogContainerComponent } from './dialog-container.component'; XDialogContentDirective, XDialogActionsDirective, XDialogDragHandleDirective, - XDialogFullscreenDirective, - XDialogPortalComponent + XDialogFullscreenDirective ], imports: [ XDialogComponent, @@ -31,8 +29,7 @@ import { XDialogContainerComponent } from './dialog-container.component'; XDialogContentDirective, XDialogActionsDirective, XDialogDragHandleDirective, - XDialogFullscreenDirective, - XDialogPortalComponent + XDialogFullscreenDirective ] }) export class XDialogModule {} diff --git a/lib/ng-nest/ui/dialog/examples/en_US/default/container/container.component.ts b/lib/ng-nest/ui/dialog/examples/en_US/default/container/container.component.ts index 970e1fe08..31b78f766 100644 --- a/lib/ng-nest/ui/dialog/examples/en_US/default/container/container.component.ts +++ b/lib/ng-nest/ui/dialog/examples/en_US/default/container/container.component.ts @@ -3,12 +3,12 @@ import { Component } from '@angular/core'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XPlace } from '@ng-nest/ui/core'; import { XDialogAction, XDialogComponent, XDialogContainerComponent } from '@ng-nest/ui/dialog'; -import { XMessageBoxAction, XMessageBoxModule, XMessageBoxService } from '@ng-nest/ui/message-box'; +import { XMessageBoxAction, XMessageBoxService } from '@ng-nest/ui/message-box'; @Component({ selector: 'ex-container', standalone: true, - imports: [CommonModule, XDialogContainerComponent, XDialogComponent, XButtonComponent, XMessageBoxModule], + imports: [CommonModule, XDialogContainerComponent, XDialogComponent, XButtonComponent], templateUrl: './container.component.html', styleUrls: ['./container.component.scss'] }) diff --git a/lib/ng-nest/ui/dialog/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/dialog/examples/en_US/default/default/default.component.ts index 9263cb282..edbbd7dd2 100644 --- a/lib/ng-nest/ui/dialog/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/dialog/examples/en_US/default/default/default.component.ts @@ -2,13 +2,13 @@ import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; import { XButtonModule } from '@ng-nest/ui/button'; import { XPlace } from '@ng-nest/ui/core'; -import { XDialogAction, XDialogComponent } from '@ng-nest/ui/dialog'; -import { XMessageBoxService, XMessageBoxAction, XMessageBoxModule } from '@ng-nest/ui/message-box'; +import { XDialogComponent } from '@ng-nest/ui/dialog'; +import { XMessageBoxService, XMessageBoxAction } from '@ng-nest/ui/message-box'; @Component({ selector: 'ex-default', standalone: true, - imports: [CommonModule, XMessageBoxModule, XButtonModule, XDialogComponent], + imports: [CommonModule, XButtonModule, XDialogComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/dialog/examples/en_US/default/resizable/resizable.component.ts b/lib/ng-nest/ui/dialog/examples/en_US/default/resizable/resizable.component.ts index 429ee35df..5b347dfea 100644 --- a/lib/ng-nest/ui/dialog/examples/en_US/default/resizable/resizable.component.ts +++ b/lib/ng-nest/ui/dialog/examples/en_US/default/resizable/resizable.component.ts @@ -2,12 +2,12 @@ import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XDialogComponent } from '@ng-nest/ui/dialog'; -import { XMessageBoxService, XMessageBoxAction, XMessageBoxModule } from '@ng-nest/ui/message-box'; +import { XMessageBoxService, XMessageBoxAction } from '@ng-nest/ui/message-box'; @Component({ selector: 'ex-resizable', standalone: true, - imports: [CommonModule, XMessageBoxModule, XDialogComponent, XButtonComponent], + imports: [CommonModule, XDialogComponent, XButtonComponent], templateUrl: './resizable.component.html', styleUrls: ['./resizable.component.scss'] }) diff --git a/lib/ng-nest/ui/dialog/examples/zh_CN/default/container/container.component.ts b/lib/ng-nest/ui/dialog/examples/zh_CN/default/container/container.component.ts index 970e1fe08..31b78f766 100644 --- a/lib/ng-nest/ui/dialog/examples/zh_CN/default/container/container.component.ts +++ b/lib/ng-nest/ui/dialog/examples/zh_CN/default/container/container.component.ts @@ -3,12 +3,12 @@ import { Component } from '@angular/core'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XPlace } from '@ng-nest/ui/core'; import { XDialogAction, XDialogComponent, XDialogContainerComponent } from '@ng-nest/ui/dialog'; -import { XMessageBoxAction, XMessageBoxModule, XMessageBoxService } from '@ng-nest/ui/message-box'; +import { XMessageBoxAction, XMessageBoxService } from '@ng-nest/ui/message-box'; @Component({ selector: 'ex-container', standalone: true, - imports: [CommonModule, XDialogContainerComponent, XDialogComponent, XButtonComponent, XMessageBoxModule], + imports: [CommonModule, XDialogContainerComponent, XDialogComponent, XButtonComponent], templateUrl: './container.component.html', styleUrls: ['./container.component.scss'] }) diff --git a/lib/ng-nest/ui/dialog/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/dialog/examples/zh_CN/default/default/default.component.ts index 5fb7a70f1..d3ede1e9c 100644 --- a/lib/ng-nest/ui/dialog/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/dialog/examples/zh_CN/default/default/default.component.ts @@ -3,12 +3,12 @@ import { Component } from '@angular/core'; import { XButtonModule } from '@ng-nest/ui/button'; import { XPlace } from '@ng-nest/ui/core'; import { XDialogAction, XDialogComponent } from '@ng-nest/ui/dialog'; -import { XMessageBoxService, XMessageBoxAction, XMessageBoxModule } from '@ng-nest/ui/message-box'; +import { XMessageBoxService, XMessageBoxAction } from '@ng-nest/ui/message-box'; @Component({ selector: 'ex-default', standalone: true, - imports: [CommonModule, XMessageBoxModule, XButtonModule, XDialogComponent], + imports: [CommonModule, XButtonModule, XDialogComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/dialog/examples/zh_CN/default/resizable/resizable.component.ts b/lib/ng-nest/ui/dialog/examples/zh_CN/default/resizable/resizable.component.ts index d4b612833..0ac7fcf78 100644 --- a/lib/ng-nest/ui/dialog/examples/zh_CN/default/resizable/resizable.component.ts +++ b/lib/ng-nest/ui/dialog/examples/zh_CN/default/resizable/resizable.component.ts @@ -2,12 +2,12 @@ import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XDialogComponent } from '@ng-nest/ui/dialog'; -import { XMessageBoxService, XMessageBoxAction, XMessageBoxModule } from '@ng-nest/ui/message-box'; +import { XMessageBoxService, XMessageBoxAction } from '@ng-nest/ui/message-box'; @Component({ selector: 'ex-resizable', standalone: true, - imports: [CommonModule, XMessageBoxModule, XDialogComponent, XButtonComponent], + imports: [CommonModule, XDialogComponent, XButtonComponent], templateUrl: './resizable.component.html', styleUrls: ['./resizable.component.scss'] }) diff --git a/lib/ng-nest/ui/doc/doc.component.spec.ts b/lib/ng-nest/ui/doc/doc.component.spec.ts index dd3b1b593..06abb6eed 100644 --- a/lib/ng-nest/ui/doc/doc.component.spec.ts +++ b/lib/ng-nest/ui/doc/doc.component.spec.ts @@ -4,14 +4,14 @@ import { By } from '@angular/platform-browser'; import { XDocComponent } from '@ng-nest/ui/doc'; import { XDocPrefix } from './doc.property'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { XIconComponent } from '@ng-nest/ui/icon'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { XBadgeComponent } from '@ng-nest/ui/badge'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XExamplesComponent } from '@ng-nest/ui/examples'; import { XApiComponent } from '@ng-nest/ui/api'; -import { XTabsModule } from '@ng-nest/ui/tabs'; +import { XTabsComponent, XTabComponent } from '@ng-nest/ui/tabs'; import { XHighlightComponent } from '@ng-nest/ui/highlight'; import { XPatternComponent } from '@ng-nest/ui/pattern'; import { HttpClientTestingModule } from '@angular/common/http/testing'; @@ -22,7 +22,7 @@ describe(XDocPrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, XDocComponent, XIconComponent, XRowComponent, @@ -31,7 +31,8 @@ describe(XDocPrefix, () => { XButtonComponent, XExamplesComponent, XApiComponent, - XTabsModule, + XTabsComponent, + XTabComponent, XHighlightComponent, XPatternComponent ], diff --git a/lib/ng-nest/ui/drawer/drawer.component.spec.ts b/lib/ng-nest/ui/drawer/drawer.component.spec.ts index d5ba68826..390017e6c 100644 --- a/lib/ng-nest/ui/drawer/drawer.component.spec.ts +++ b/lib/ng-nest/ui/drawer/drawer.component.spec.ts @@ -6,12 +6,12 @@ import { By } from '@angular/platform-browser'; import { FormsModule } from '@angular/forms'; import { XDrawerComponent } from '@ng-nest/ui/drawer'; import { XDrawerPrefix } from './drawer.property'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; import { XIconComponent } from '@ng-nest/ui/icon'; import { XInputComponent } from '@ng-nest/ui/input'; import { XPosition } from '@ng-nest/ui/core'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XDrawerPrefix, () => { @@ -20,12 +20,12 @@ describe(XDrawerPrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, XDrawerComponent, FormsModule, XInputComponent, XIconComponent, - XRadioModule, + XRadioComponent, XButtonComponent, XButtonsComponent ], diff --git a/lib/ng-nest/ui/drawer/drawer.module.ts b/lib/ng-nest/ui/drawer/drawer.module.ts index 4120ee668..c30f0331d 100644 --- a/lib/ng-nest/ui/drawer/drawer.module.ts +++ b/lib/ng-nest/ui/drawer/drawer.module.ts @@ -1,6 +1,5 @@ import { NgModule } from '@angular/core'; import { XDrawerComponent } from './drawer.component'; -import { XDrawerPortalComponent } from './drawer-portal.component'; import { XDrawerCloseDirective, XDrawerContentDirective, XDrawerTitleDirective } from './drawer-portal.directives'; import { XDrawerContainerComponent } from './drawer-container.component'; @@ -10,7 +9,6 @@ import { XDrawerContainerComponent } from './drawer-container.component'; XDrawerCloseDirective, XDrawerTitleDirective, XDrawerContentDirective, - XDrawerPortalComponent, XDrawerContainerComponent ], imports: [ @@ -18,7 +16,6 @@ import { XDrawerContainerComponent } from './drawer-container.component'; XDrawerCloseDirective, XDrawerTitleDirective, XDrawerContentDirective, - XDrawerPortalComponent, XDrawerContainerComponent ] }) diff --git a/lib/ng-nest/ui/drawer/examples/en_US/default/container/container.component.ts b/lib/ng-nest/ui/drawer/examples/en_US/default/container/container.component.ts index 0a594648e..bb8afaa2d 100644 --- a/lib/ng-nest/ui/drawer/examples/en_US/default/container/container.component.ts +++ b/lib/ng-nest/ui/drawer/examples/en_US/default/container/container.component.ts @@ -3,12 +3,12 @@ import { FormsModule } from '@angular/forms'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XPosition } from '@ng-nest/ui/core'; import { XDrawerComponent, XDrawerContainerComponent } from '@ng-nest/ui/drawer'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; @Component({ selector: 'ex-container', standalone: true, - imports: [FormsModule, XDrawerComponent, XDrawerContainerComponent, XRadioModule, XButtonComponent], + imports: [FormsModule, XDrawerComponent, XDrawerContainerComponent, XRadioComponent, XButtonComponent], templateUrl: './container.component.html', styleUrls: ['./container.component.scss'] }) diff --git a/lib/ng-nest/ui/drawer/examples/en_US/default/custom/custom.component.ts b/lib/ng-nest/ui/drawer/examples/en_US/default/custom/custom.component.ts index aeec5741d..bb0901218 100644 --- a/lib/ng-nest/ui/drawer/examples/en_US/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/drawer/examples/en_US/default/custom/custom.component.ts @@ -5,7 +5,7 @@ import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; import { XDrawerComponent } from '@ng-nest/ui/drawer/drawer.component'; import { XIconComponent } from '@ng-nest/ui/icon'; import { XInputComponent } from '@ng-nest/ui/input'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; @Component({ selector: 'ex-custom', @@ -16,7 +16,7 @@ import { XRadioModule } from '@ng-nest/ui/radio'; XButtonComponent, XButtonsComponent, XInputComponent, - XRadioModule, + XRadioComponent, XDrawerComponent, XIconComponent ], diff --git a/lib/ng-nest/ui/drawer/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/drawer/examples/en_US/default/default/default.component.ts index e634a3d61..93f51c166 100644 --- a/lib/ng-nest/ui/drawer/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/drawer/examples/en_US/default/default/default.component.ts @@ -3,12 +3,12 @@ import { FormsModule } from '@angular/forms'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XPosition } from '@ng-nest/ui/core'; import { XDrawerComponent } from '@ng-nest/ui/drawer'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; @Component({ selector: 'ex-default', standalone: true, - imports: [FormsModule, XRadioModule, XButtonComponent, XDrawerComponent], + imports: [FormsModule, XRadioComponent, XButtonComponent, XDrawerComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/drawer/examples/zh_CN/default/container/container.component.ts b/lib/ng-nest/ui/drawer/examples/zh_CN/default/container/container.component.ts index 3d31cc66c..5497d8e2c 100644 --- a/lib/ng-nest/ui/drawer/examples/zh_CN/default/container/container.component.ts +++ b/lib/ng-nest/ui/drawer/examples/zh_CN/default/container/container.component.ts @@ -3,12 +3,12 @@ import { FormsModule } from '@angular/forms'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XPosition } from '@ng-nest/ui/core'; import { XDrawerComponent, XDrawerContainerComponent } from '@ng-nest/ui/drawer'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; @Component({ selector: 'ex-container', standalone: true, - imports: [FormsModule, XDrawerComponent, XDrawerContainerComponent, XRadioModule, XButtonComponent], + imports: [FormsModule, XDrawerComponent, XDrawerContainerComponent, XRadioComponent, XButtonComponent], templateUrl: './container.component.html', styleUrls: ['./container.component.scss'] }) diff --git a/lib/ng-nest/ui/drawer/examples/zh_CN/default/custom/custom.component.ts b/lib/ng-nest/ui/drawer/examples/zh_CN/default/custom/custom.component.ts index aeec5741d..bb0901218 100644 --- a/lib/ng-nest/ui/drawer/examples/zh_CN/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/drawer/examples/zh_CN/default/custom/custom.component.ts @@ -5,7 +5,7 @@ import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; import { XDrawerComponent } from '@ng-nest/ui/drawer/drawer.component'; import { XIconComponent } from '@ng-nest/ui/icon'; import { XInputComponent } from '@ng-nest/ui/input'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; @Component({ selector: 'ex-custom', @@ -16,7 +16,7 @@ import { XRadioModule } from '@ng-nest/ui/radio'; XButtonComponent, XButtonsComponent, XInputComponent, - XRadioModule, + XRadioComponent, XDrawerComponent, XIconComponent ], diff --git a/lib/ng-nest/ui/drawer/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/drawer/examples/zh_CN/default/default/default.component.ts index c3b11a740..a2ea2ac42 100644 --- a/lib/ng-nest/ui/drawer/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/drawer/examples/zh_CN/default/default/default.component.ts @@ -3,12 +3,12 @@ import { FormsModule } from '@angular/forms'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XPosition } from '@ng-nest/ui/core'; import { XDrawerComponent } from '@ng-nest/ui/drawer'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; @Component({ selector: 'ex-default', standalone: true, - imports: [FormsModule, XRadioModule, XButtonComponent, XDrawerComponent], + imports: [FormsModule, XRadioComponent, XButtonComponent, XDrawerComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/dropdown/dropdown.component.spec.ts b/lib/ng-nest/ui/dropdown/dropdown.component.spec.ts index 18639c796..b1e7c5428 100644 --- a/lib/ng-nest/ui/dropdown/dropdown.component.spec.ts +++ b/lib/ng-nest/ui/dropdown/dropdown.component.spec.ts @@ -7,7 +7,7 @@ import { XLinkComponent } from '@ng-nest/ui/link'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XDropdownPrefix, () => { @@ -16,7 +16,7 @@ describe(XDropdownPrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, XDropdownComponent, XButtonComponent, XLinkComponent, diff --git a/lib/ng-nest/ui/dropdown/dropdown.module.ts b/lib/ng-nest/ui/dropdown/dropdown.module.ts index effbf5821..14e281593 100644 --- a/lib/ng-nest/ui/dropdown/dropdown.module.ts +++ b/lib/ng-nest/ui/dropdown/dropdown.module.ts @@ -1,9 +1,7 @@ import { NgModule } from '@angular/core'; import { XDropdownComponent } from './dropdown.component'; -import { XDropdownPortalComponent } from './dropdown-portal.component'; - @NgModule({ - imports: [XDropdownComponent, XDropdownPortalComponent], - exports: [XDropdownComponent, XDropdownPortalComponent] + imports: [XDropdownComponent], + exports: [XDropdownComponent] }) export class XDropdownModule {} diff --git a/lib/ng-nest/ui/empty/empty.component.spec.ts b/lib/ng-nest/ui/empty/empty.component.spec.ts index 5f6f8b08f..f2ca4cf8e 100644 --- a/lib/ng-nest/ui/empty/empty.component.spec.ts +++ b/lib/ng-nest/ui/empty/empty.component.spec.ts @@ -10,7 +10,7 @@ import { XEmptyPrefix } from './empty.property'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XContainerComponent } from '@ng-nest/ui/container'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { XI18nService, en_US, zh_CN } from '@ng-nest/ui/i18n'; import { HttpClientTestingModule } from '@angular/common/http/testing'; @@ -20,7 +20,7 @@ describe(XEmptyPrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, FormsModule, XEmptyComponent, XButtonComponent, diff --git a/lib/ng-nest/ui/empty/empty.component.ts b/lib/ng-nest/ui/empty/empty.component.ts index ba64e8a14..966d1f147 100644 --- a/lib/ng-nest/ui/empty/empty.component.ts +++ b/lib/ng-nest/ui/empty/empty.component.ts @@ -18,7 +18,7 @@ import { CommonModule } from '@angular/common'; @Component({ selector: `${XEmptyPrefix}`, standalone: true, - imports: [CommonModule, XOutletDirective, XIconComponent, XI18nPipe, XEmptyProperty], + imports: [CommonModule, XOutletDirective, XIconComponent, XI18nPipe], templateUrl: './empty.component.html', styleUrls: ['./empty.component.scss'], encapsulation: ViewEncapsulation.None, diff --git a/lib/ng-nest/ui/empty/empty.property.ts b/lib/ng-nest/ui/empty/empty.property.ts index 039f3abcc..c7c0bb1ca 100644 --- a/lib/ng-nest/ui/empty/empty.property.ts +++ b/lib/ng-nest/ui/empty/empty.property.ts @@ -12,7 +12,7 @@ const X_CONFIG_NAME = 'empty'; /** * Empty Property */ -@Component({ selector: `${XEmptyPrefix}-property`, template: '', standalone: true }) +@Component({ selector: `${XEmptyPrefix}-property`, template: '' }) export class XEmptyProperty { /** * @zh_CN 图片地址或自定义模板 diff --git a/lib/ng-nest/ui/examples/examples.component.spec.ts b/lib/ng-nest/ui/examples/examples.component.spec.ts index 599517118..924214d0c 100644 --- a/lib/ng-nest/ui/examples/examples.component.spec.ts +++ b/lib/ng-nest/ui/examples/examples.component.spec.ts @@ -3,13 +3,13 @@ import { Component, DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; import { XExamplesComponent } from '@ng-nest/ui/examples'; import { XExamplesPrefix } from './examples.property'; -import { XTabsModule } from '@ng-nest/ui/tabs'; +import { XTabsComponent, XTabComponent } from '@ng-nest/ui/tabs'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XExamplesPrefix, () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [XExamplesComponent, HttpClientTestingModule, XTabsModule], + imports: [XExamplesComponent, HttpClientTestingModule, XTabsComponent, XTabComponent], declarations: [TestXExamplesComponent] }).compileComponents(); }); @@ -41,8 +41,8 @@ describe(XExamplesPrefix, () => {

基础的按钮用法。

  • - 使用 type 、 plain、 round 和 - circle 属性来定义 Button 的样式。 + 使用 type 、 plain、 round 和 circle 属性来定义 + Button 的样式。
@@ -62,8 +62,8 @@ describe(XExamplesPrefix, () => {

基础的按钮用法。

  • - 使用 type 、 plain、 round 和 - circle 属性来定义 Button 的样式。 + 使用 type 、 plain、 round 和 circle 属性来定义 + Button 的样式。
@@ -83,8 +83,8 @@ describe(XExamplesPrefix, () => {

基础的按钮用法。

  • - 使用 type 、 plain、 round 和 - circle 属性来定义 Button 的样式。 + 使用 type 、 plain、 round 和 circle 属性来定义 + Button 的样式。
@@ -107,10 +107,7 @@ describe(XExamplesPrefix, () => {

按钮不可用状态。

    -
  • - 你可以使用 disabled 属性来定义按钮是否可用，它接受一个 - Boolean 值。 -
    • +
  • 你可以使用 disabled 属性来定义按钮是否可用，它接受一个 Boolean 值。
@@ -153,10 +150,7 @@ describe(XExamplesPrefix, () => {

带图标的按钮可增强辨识度（有文字）或节省空间（无文字）。

    -
  • - 使用 icon 属性即可，icon 的列表可以参考 - icon 组件。 -
    • +
  • 使用 icon 属性即可，icon 的列表可以参考 icon 组件。
  • 使用 direction 可以设置在文字右边的图标 。
@@ -202,8 +196,7 @@ describe(XExamplesPrefix, () => {

点击按钮后进行数据加载操作，在按钮上显示加载状态。

  • - 要设置为 loading 状态，只要设置 loading 属性为 - true 即可。 + 要设置为 loading 状态，只要设置 loading 属性为 true 即可。
diff --git a/lib/ng-nest/ui/find/examples/en_US/default/size/size.component.ts b/lib/ng-nest/ui/find/examples/en_US/default/size/size.component.ts index fba3d8044..0c1ba9dd0 100644 --- a/lib/ng-nest/ui/find/examples/en_US/default/size/size.component.ts +++ b/lib/ng-nest/ui/find/examples/en_US/default/size/size.component.ts @@ -2,12 +2,12 @@ import { Component } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { XSize } from '@ng-nest/ui/core'; import { XFindComponent } from '@ng-nest/ui/find'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; @Component({ selector: 'ex-size', standalone: true, - imports: [FormsModule, XFindComponent, XRadioModule], + imports: [FormsModule, XFindComponent, XRadioComponent], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/find/examples/zh_CN/default/size/size.component.ts b/lib/ng-nest/ui/find/examples/zh_CN/default/size/size.component.ts index fba3d8044..0c1ba9dd0 100644 --- a/lib/ng-nest/ui/find/examples/zh_CN/default/size/size.component.ts +++ b/lib/ng-nest/ui/find/examples/zh_CN/default/size/size.component.ts @@ -2,12 +2,12 @@ import { Component } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { XSize } from '@ng-nest/ui/core'; import { XFindComponent } from '@ng-nest/ui/find'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; @Component({ selector: 'ex-size', standalone: true, - imports: [FormsModule, XFindComponent, XRadioModule], + imports: [FormsModule, XFindComponent, XRadioComponent], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/find/find.component.spec.ts b/lib/ng-nest/ui/find/find.component.spec.ts index 90409affb..fdea9913b 100644 --- a/lib/ng-nest/ui/find/find.component.spec.ts +++ b/lib/ng-nest/ui/find/find.component.spec.ts @@ -21,8 +21,8 @@ import { } from '@ng-nest/ui/core'; import { Observable } from 'rxjs'; import { XTreeNode } from '@ng-nest/ui/tree'; -import { XThemeModule } from '@ng-nest/ui/theme'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XThemeComponent } from '@ng-nest/ui/theme'; +import { XRadioComponent } from '@ng-nest/ui/radio'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XFindPrefix, () => { @@ -31,13 +31,13 @@ describe(XFindPrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, XFindComponent, FormsModule, ReactiveFormsModule, XRowComponent, XColComponent, - XRadioModule + XRadioComponent ], declarations: [ TestXFindComponent, diff --git a/lib/ng-nest/ui/find/find.component.ts b/lib/ng-nest/ui/find/find.component.ts index 130138ba8..fc78d19b7 100644 --- a/lib/ng-nest/ui/find/find.component.ts +++ b/lib/ng-nest/ui/find/find.component.ts @@ -23,14 +23,14 @@ import { XIsEmpty, XResizeObserver } from '@ng-nest/ui/core'; -import { XTableComponent, XTableRow, XTableModule } from '@ng-nest/ui/table'; +import { XTableComponent, XTableRow } from '@ng-nest/ui/table'; import { XDialogComponent } from '@ng-nest/ui/dialog'; import { XButtonComponent } from '@ng-nest/ui/button'; import { debounceTime, takeUntil } from 'rxjs/operators'; import { Subject, Observable } from 'rxjs'; -import { XTreeNode, XTreeComponent, XTreeModule } from '@ng-nest/ui/tree'; +import { XTreeNode, XTreeComponent } from '@ng-nest/ui/tree'; import { XValueAccessor, XControlValueAccessor } from '@ng-nest/ui/base-form'; -import { XTagModule } from '@ng-nest/ui/tag'; +import { XTagComponent } from '@ng-nest/ui/tag'; import { XEmptyComponent } from '@ng-nest/ui/empty'; import { XIconComponent } from '@ng-nest/ui/icon'; import { XInputComponent } from '@ng-nest/ui/input'; @@ -44,11 +44,11 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; CommonModule, FormsModule, ReactiveFormsModule, - XTagModule, + XTagComponent, XButtonComponent, XDialogComponent, - XTableModule, - XTreeModule, + XTableComponent, + XTreeComponent, XIconComponent, XEmptyComponent, XInputComponent, diff --git a/lib/ng-nest/ui/form/control.component.ts b/lib/ng-nest/ui/form/control.component.ts index 6848291bf..5b80dc7ec 100644 --- a/lib/ng-nest/ui/form/control.component.ts +++ b/lib/ng-nest/ui/form/control.component.ts @@ -64,18 +64,18 @@ import { XI18nForm, XI18nService } from '@ng-nest/ui/i18n'; import { XFormInputValidator } from '@ng-nest/ui/base-form'; import { CommonModule } from '@angular/common'; import { XInputComponent } from '@ng-nest/ui/input'; -import { XSelectModule } from '@ng-nest/ui/select'; +import { XSelectComponent } from '@ng-nest/ui/select'; import { XCascadeComponent } from '@ng-nest/ui/cascade'; import { XCheckboxComponent } from '@ng-nest/ui/checkbox'; import { XColorPickerComponent } from '@ng-nest/ui/color-picker'; import { XDatePickerComponent } from '@ng-nest/ui/date-picker'; import { XInputNumberComponent } from '@ng-nest/ui/input-number'; -import { XRadioModule } from '@ng-nest/ui/radio'; -import { XRateModule } from '@ng-nest/ui/rate'; -import { XSliderSelectModule } from '@ng-nest/ui/slider-select'; -import { XSwitchModule } from '@ng-nest/ui/switch'; +import { XRadioComponent } from '@ng-nest/ui/radio'; +import { XRateComponent } from '@ng-nest/ui/rate'; +import { XSliderSelectComponent } from '@ng-nest/ui/slider-select'; +import { XSwitchComponent } from '@ng-nest/ui/switch'; import { XTimePickerModule } from '@ng-nest/ui/time-picker'; -import { XTextareaModule } from '@ng-nest/ui/textarea'; +import { XTextareaComponent } from '@ng-nest/ui/textarea'; import { XFindComponent } from '@ng-nest/ui/find'; import { XAutoCompleteComponent } from '@ng-nest/ui/auto-complete'; @@ -87,18 +87,18 @@ import { XAutoCompleteComponent } from '@ng-nest/ui/auto-complete'; FormsModule, ReactiveFormsModule, XInputComponent, - XSelectModule, + XSelectComponent, XCascadeComponent, XCheckboxComponent, XColorPickerComponent, XDatePickerComponent, XInputNumberComponent, - XRadioModule, - XRateModule, - XSliderSelectModule, - XSwitchModule, + XRadioComponent, + XRateComponent, + XSliderSelectComponent, + XSwitchComponent, XTimePickerModule, - XTextareaModule, + XTextareaComponent, XFindComponent, XAutoCompleteComponent ], diff --git a/lib/ng-nest/ui/form/form.component.spec.ts b/lib/ng-nest/ui/form/form.component.spec.ts index 7cb3db254..063a5799d 100644 --- a/lib/ng-nest/ui/form/form.component.spec.ts +++ b/lib/ng-nest/ui/form/form.component.spec.ts @@ -1,6 +1,4 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XFormComponent } from './form.component'; import { Component, DebugElement, ViewChild, Injectable, ChangeDetectorRef } from '@angular/core'; import { By } from '@angular/platform-browser'; import { XFormComponent } from '@ng-nest/ui/form'; diff --git a/lib/ng-nest/ui/highlight/highlight.component.spec.ts b/lib/ng-nest/ui/highlight/highlight.component.spec.ts index 7e3f42ad3..53e02e2d3 100644 --- a/lib/ng-nest/ui/highlight/highlight.component.spec.ts +++ b/lib/ng-nest/ui/highlight/highlight.component.spec.ts @@ -4,7 +4,7 @@ import { By } from '@angular/platform-browser'; import { XHighlightComponent } from '@ng-nest/ui/highlight'; import { XHighlightPrefix, XHighlightLines } from './highlight.property'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XHighlightPrefix, () => { @@ -13,7 +13,7 @@ describe(XHighlightPrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, XHighlightComponent ], declarations: [TestXHighlightComponent] diff --git a/lib/ng-nest/ui/icon/examples/en_US/default/ant-design/ant-design.component.ts b/lib/ng-nest/ui/icon/examples/en_US/default/ant-design/ant-design.component.ts index 77519ab0a..2f0a628fb 100644 --- a/lib/ng-nest/ui/icon/examples/en_US/default/ant-design/ant-design.component.ts +++ b/lib/ng-nest/ui/icon/examples/en_US/default/ant-design/ant-design.component.ts @@ -2,12 +2,12 @@ import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; import { XIconComponent } from '@ng-nest/ui/icon'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; -import { XTabsModule } from '@ng-nest/ui/tabs'; +import { XTabsComponent, XTabComponent } from '@ng-nest/ui/tabs'; @Component({ selector: 'ex-ant-design', standalone: true, - imports: [CommonModule, XIconComponent, XTabsModule, XRowComponent, XColComponent], + imports: [CommonModule, XIconComponent, XTabsComponent, XTabComponent, XRowComponent, XColComponent], templateUrl: './ant-design.component.html', styleUrls: ['./ant-design.component.scss'] }) diff --git a/lib/ng-nest/ui/icon/examples/en_US/default/eva/eva.component.ts b/lib/ng-nest/ui/icon/examples/en_US/default/eva/eva.component.ts index 7cc2f95d3..38b453a91 100644 --- a/lib/ng-nest/ui/icon/examples/en_US/default/eva/eva.component.ts +++ b/lib/ng-nest/ui/icon/examples/en_US/default/eva/eva.component.ts @@ -2,12 +2,12 @@ import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; import { XIconComponent } from '@ng-nest/ui/icon'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; -import { XTabsModule } from '@ng-nest/ui/tabs'; +import { XTabsComponent, XTabComponent } from '@ng-nest/ui/tabs'; @Component({ selector: 'ex-eva', standalone: true, - imports: [CommonModule, XIconComponent, XTabsModule, XRowComponent, XColComponent], + imports: [CommonModule, XIconComponent, XTabsComponent, XTabComponent, XRowComponent, XColComponent], templateUrl: './eva.component.html', styleUrls: ['./eva.component.scss'] }) diff --git a/lib/ng-nest/ui/icon/examples/en_US/default/feather/feather.component.ts b/lib/ng-nest/ui/icon/examples/en_US/default/feather/feather.component.ts index 098de0872..553bf02dd 100644 --- a/lib/ng-nest/ui/icon/examples/en_US/default/feather/feather.component.ts +++ b/lib/ng-nest/ui/icon/examples/en_US/default/feather/feather.component.ts @@ -2,12 +2,12 @@ import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; import { XIconComponent } from '@ng-nest/ui/icon'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; -import { XTabsModule } from '@ng-nest/ui/tabs'; +import { XTabsComponent, XTabComponent } from '@ng-nest/ui/tabs'; @Component({ selector: 'ex-feather', standalone: true, - imports: [CommonModule, XIconComponent, XTabsModule, XRowComponent, XColComponent], + imports: [CommonModule, XIconComponent, XTabsComponent, XTabComponent, XRowComponent, XColComponent], templateUrl: './feather.component.html', styleUrls: ['./feather.component.scss'] }) diff --git a/lib/ng-nest/ui/icon/examples/en_US/default/font-awesome/font-awesome.component.ts b/lib/ng-nest/ui/icon/examples/en_US/default/font-awesome/font-awesome.component.ts index 710af79a4..5c8d3a706 100644 --- a/lib/ng-nest/ui/icon/examples/en_US/default/font-awesome/font-awesome.component.ts +++ b/lib/ng-nest/ui/icon/examples/en_US/default/font-awesome/font-awesome.component.ts @@ -2,12 +2,12 @@ import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; import { XIconComponent } from '@ng-nest/ui/icon'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; -import { XTabsModule } from '@ng-nest/ui/tabs'; +import { XTabsComponent, XTabComponent } from '@ng-nest/ui/tabs'; @Component({ selector: 'ex-font-awesome', standalone: true, - imports: [CommonModule, XIconComponent, XTabsModule, XRowComponent, XColComponent], + imports: [CommonModule, XIconComponent, XTabsComponent, XTabComponent, XRowComponent, XColComponent], templateUrl: './font-awesome.component.html', styleUrls: ['./font-awesome.component.scss'] }) diff --git a/lib/ng-nest/ui/icon/examples/en_US/default/material-design/material-design.component.ts b/lib/ng-nest/ui/icon/examples/en_US/default/material-design/material-design.component.ts index bd0adf5ea..53491378a 100644 --- a/lib/ng-nest/ui/icon/examples/en_US/default/material-design/material-design.component.ts +++ b/lib/ng-nest/ui/icon/examples/en_US/default/material-design/material-design.component.ts @@ -2,12 +2,12 @@ import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; import { XIconComponent } from '@ng-nest/ui/icon'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; -import { XTabsModule } from '@ng-nest/ui/tabs'; +import { XTabsComponent, XTabComponent } from '@ng-nest/ui/tabs'; @Component({ selector: 'ex-material-design', standalone: true, - imports: [CommonModule, XIconComponent, XTabsModule, XRowComponent, XColComponent], + imports: [CommonModule, XIconComponent, XTabsComponent, XTabComponent, XRowComponent, XColComponent], templateUrl: './material-design.component.html', styleUrls: ['./material-design.component.scss'] }) diff --git a/lib/ng-nest/ui/icon/examples/zh_CN/default/ant-design/ant-design.component.ts b/lib/ng-nest/ui/icon/examples/zh_CN/default/ant-design/ant-design.component.ts index 77519ab0a..2f0a628fb 100644 --- a/lib/ng-nest/ui/icon/examples/zh_CN/default/ant-design/ant-design.component.ts +++ b/lib/ng-nest/ui/icon/examples/zh_CN/default/ant-design/ant-design.component.ts @@ -2,12 +2,12 @@ import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; import { XIconComponent } from '@ng-nest/ui/icon'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; -import { XTabsModule } from '@ng-nest/ui/tabs'; +import { XTabsComponent, XTabComponent } from '@ng-nest/ui/tabs'; @Component({ selector: 'ex-ant-design', standalone: true, - imports: [CommonModule, XIconComponent, XTabsModule, XRowComponent, XColComponent], + imports: [CommonModule, XIconComponent, XTabsComponent, XTabComponent, XRowComponent, XColComponent], templateUrl: './ant-design.component.html', styleUrls: ['./ant-design.component.scss'] }) diff --git a/lib/ng-nest/ui/icon/examples/zh_CN/default/eva/eva.component.ts b/lib/ng-nest/ui/icon/examples/zh_CN/default/eva/eva.component.ts index 7cc2f95d3..38b453a91 100644 --- a/lib/ng-nest/ui/icon/examples/zh_CN/default/eva/eva.component.ts +++ b/lib/ng-nest/ui/icon/examples/zh_CN/default/eva/eva.component.ts @@ -2,12 +2,12 @@ import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; import { XIconComponent } from '@ng-nest/ui/icon'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; -import { XTabsModule } from '@ng-nest/ui/tabs'; +import { XTabsComponent, XTabComponent } from '@ng-nest/ui/tabs'; @Component({ selector: 'ex-eva', standalone: true, - imports: [CommonModule, XIconComponent, XTabsModule, XRowComponent, XColComponent], + imports: [CommonModule, XIconComponent, XTabsComponent, XTabComponent, XRowComponent, XColComponent], templateUrl: './eva.component.html', styleUrls: ['./eva.component.scss'] }) diff --git a/lib/ng-nest/ui/icon/examples/zh_CN/default/feather/feather.component.ts b/lib/ng-nest/ui/icon/examples/zh_CN/default/feather/feather.component.ts index 098de0872..553bf02dd 100644 --- a/lib/ng-nest/ui/icon/examples/zh_CN/default/feather/feather.component.ts +++ b/lib/ng-nest/ui/icon/examples/zh_CN/default/feather/feather.component.ts @@ -2,12 +2,12 @@ import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; import { XIconComponent } from '@ng-nest/ui/icon'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; -import { XTabsModule } from '@ng-nest/ui/tabs'; +import { XTabsComponent, XTabComponent } from '@ng-nest/ui/tabs'; @Component({ selector: 'ex-feather', standalone: true, - imports: [CommonModule, XIconComponent, XTabsModule, XRowComponent, XColComponent], + imports: [CommonModule, XIconComponent, XTabsComponent, XTabComponent, XRowComponent, XColComponent], templateUrl: './feather.component.html', styleUrls: ['./feather.component.scss'] }) diff --git a/lib/ng-nest/ui/icon/examples/zh_CN/default/font-awesome/font-awesome.component.ts b/lib/ng-nest/ui/icon/examples/zh_CN/default/font-awesome/font-awesome.component.ts index 710af79a4..5c8d3a706 100644 --- a/lib/ng-nest/ui/icon/examples/zh_CN/default/font-awesome/font-awesome.component.ts +++ b/lib/ng-nest/ui/icon/examples/zh_CN/default/font-awesome/font-awesome.component.ts @@ -2,12 +2,12 @@ import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; import { XIconComponent } from '@ng-nest/ui/icon'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; -import { XTabsModule } from '@ng-nest/ui/tabs'; +import { XTabsComponent, XTabComponent } from '@ng-nest/ui/tabs'; @Component({ selector: 'ex-font-awesome', standalone: true, - imports: [CommonModule, XIconComponent, XTabsModule, XRowComponent, XColComponent], + imports: [CommonModule, XIconComponent, XTabsComponent, XTabComponent, XRowComponent, XColComponent], templateUrl: './font-awesome.component.html', styleUrls: ['./font-awesome.component.scss'] }) diff --git a/lib/ng-nest/ui/icon/examples/zh_CN/default/material-design/material-design.component.ts b/lib/ng-nest/ui/icon/examples/zh_CN/default/material-design/material-design.component.ts index bd0adf5ea..53491378a 100644 --- a/lib/ng-nest/ui/icon/examples/zh_CN/default/material-design/material-design.component.ts +++ b/lib/ng-nest/ui/icon/examples/zh_CN/default/material-design/material-design.component.ts @@ -2,12 +2,12 @@ import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; import { XIconComponent } from '@ng-nest/ui/icon'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; -import { XTabsModule } from '@ng-nest/ui/tabs'; +import { XTabsComponent, XTabComponent } from '@ng-nest/ui/tabs'; @Component({ selector: 'ex-material-design', standalone: true, - imports: [CommonModule, XIconComponent, XTabsModule, XRowComponent, XColComponent], + imports: [CommonModule, XIconComponent, XTabsComponent, XTabComponent, XRowComponent, XColComponent], templateUrl: './material-design.component.html', styleUrls: ['./material-design.component.scss'] }) diff --git a/lib/ng-nest/ui/icon/icon.component.spec.ts b/lib/ng-nest/ui/icon/icon.component.spec.ts index f5959e892..454771e83 100644 --- a/lib/ng-nest/ui/icon/icon.component.spec.ts +++ b/lib/ng-nest/ui/icon/icon.component.spec.ts @@ -6,13 +6,13 @@ import { XIconComponent } from '@ng-nest/ui/icon'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { XIconPrefix } from './icon.property'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XIconPrefix, () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [BrowserAnimationsModule, HttpClientTestingModule, XThemeModule, XIconComponent, XRowComponent, XColComponent], + imports: [BrowserAnimationsModule, HttpClientTestingModule, XThemeComponent, XIconComponent, XRowComponent, XColComponent], declarations: [TestXIconComponent] }).compileComponents(); }); diff --git a/lib/ng-nest/ui/icon/icon.component.ts b/lib/ng-nest/ui/icon/icon.component.ts index 4a5166ef8..6a74bed23 100644 --- a/lib/ng-nest/ui/icon/icon.component.ts +++ b/lib/ng-nest/ui/icon/icon.component.ts @@ -46,7 +46,7 @@ export const XViewBox = [ @Component({ selector: `${XIconPrefix}`, standalone: true, - imports: [CommonModule, XIconProperty], + imports: [CommonModule], templateUrl: './icon.component.html', styleUrls: ['./style/index.scss'], encapsulation: ViewEncapsulation.None, diff --git a/lib/ng-nest/ui/icon/icon.property.ts b/lib/ng-nest/ui/icon/icon.property.ts index fd4bb2039..0f3348dc2 100644 --- a/lib/ng-nest/ui/icon/icon.property.ts +++ b/lib/ng-nest/ui/icon/icon.property.ts @@ -22,7 +22,7 @@ export const XIconHref = 'https://ngnest.com/static/icons/'; /** * Icon Property */ -@Component({ selector: `${XIconPrefix}-property`, template: '', standalone: true }) +@Component({ selector: `${XIconPrefix}-property`, template: '' }) export class XIconProperty extends XProperty { /** * @zh_CN SVG 图标根路径地址，可以通过全局只配置一次，所有图标资源在 github 上的 ng-nest-icon 中 diff --git a/lib/ng-nest/ui/image/image.component.spec.ts b/lib/ng-nest/ui/image/image.component.spec.ts index 046cfb8ee..3443ac211 100644 --- a/lib/ng-nest/ui/image/image.component.spec.ts +++ b/lib/ng-nest/ui/image/image.component.spec.ts @@ -1,7 +1,5 @@ import { XIconComponent } from '@ng-nest/ui/icon'; import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XImageComponent } from './image.component'; import { Component, DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; @@ -11,7 +9,7 @@ import { XImagePrefix } from './image.property'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XContainerComponent } from '@ng-nest/ui/container'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XImagePrefix, () => { @@ -20,7 +18,7 @@ describe(XImagePrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, FormsModule, XImageComponent, XButtonComponent, diff --git a/lib/ng-nest/ui/input-number/examples/en_US/default/size/size.component.ts b/lib/ng-nest/ui/input-number/examples/en_US/default/size/size.component.ts index fab4756a5..248c177c2 100644 --- a/lib/ng-nest/ui/input-number/examples/en_US/default/size/size.component.ts +++ b/lib/ng-nest/ui/input-number/examples/en_US/default/size/size.component.ts @@ -2,12 +2,12 @@ import { Component } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { XSize } from '@ng-nest/ui/core'; import { XInputNumberComponent } from '@ng-nest/ui/input-number'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; @Component({ selector: 'ex-size', standalone: true, - imports: [FormsModule, XInputNumberComponent, XRadioModule], + imports: [FormsModule, XInputNumberComponent, XRadioComponent], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/input-number/examples/zh_CN/default/size/size.component.ts b/lib/ng-nest/ui/input-number/examples/zh_CN/default/size/size.component.ts index fab4756a5..248c177c2 100644 --- a/lib/ng-nest/ui/input-number/examples/zh_CN/default/size/size.component.ts +++ b/lib/ng-nest/ui/input-number/examples/zh_CN/default/size/size.component.ts @@ -2,12 +2,12 @@ import { Component } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { XSize } from '@ng-nest/ui/core'; import { XInputNumberComponent } from '@ng-nest/ui/input-number'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; @Component({ selector: 'ex-size', standalone: true, - imports: [FormsModule, XInputNumberComponent, XRadioModule], + imports: [FormsModule, XInputNumberComponent, XRadioComponent], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/input-number/input-number.component.spec.ts b/lib/ng-nest/ui/input-number/input-number.component.spec.ts index 81023007e..247be16bc 100644 --- a/lib/ng-nest/ui/input-number/input-number.component.spec.ts +++ b/lib/ng-nest/ui/input-number/input-number.component.spec.ts @@ -6,8 +6,8 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { XInputNumberPrefix } from './input-number.property'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XThemeComponent } from '@ng-nest/ui/theme'; +import { XRadioComponent } from '@ng-nest/ui/radio'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XInputNumberPrefix, () => { @@ -16,13 +16,13 @@ describe(XInputNumberPrefix, () => { imports: [ HttpClientTestingModule, BrowserAnimationsModule, - XThemeModule, + XThemeComponent, XInputNumberComponent, FormsModule, ReactiveFormsModule, XRowComponent, XColComponent, - XRadioModule + XRadioComponent ], declarations: [ TestXInputNumberComponent, diff --git a/lib/ng-nest/ui/input/examples/en_US/default/group/group.component.ts b/lib/ng-nest/ui/input/examples/en_US/default/group/group.component.ts index b5338ea8b..2c40b51df 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/group/group.component.ts +++ b/lib/ng-nest/ui/input/examples/en_US/default/group/group.component.ts @@ -7,8 +7,8 @@ import { XColorPickerComponent } from '@ng-nest/ui/color-picker'; import { XDatePickerComponent } from '@ng-nest/ui/date-picker'; import { XFindComponent } from '@ng-nest/ui/find'; import { XInputComponent, XInputGroupComponent } from '@ng-nest/ui/input'; -import { XSelectModule } from '@ng-nest/ui/select'; -import { XTextareaModule } from '@ng-nest/ui/textarea'; +import { XSelectComponent } from '@ng-nest/ui/select'; +import { XTextareaComponent } from '@ng-nest/ui/textarea'; import { XTimePickerModule } from '@ng-nest/ui/time-picker'; @Component({ @@ -18,7 +18,7 @@ import { XTimePickerModule } from '@ng-nest/ui/time-picker'; CommonModule, XInputComponent, XInputGroupComponent, - XSelectModule, + XSelectComponent, XButtonComponent, XDatePickerComponent, XAutoCompleteComponent, @@ -26,7 +26,7 @@ import { XTimePickerModule } from '@ng-nest/ui/time-picker'; XColorPickerComponent, XFindComponent, XTimePickerModule, - XTextareaModule + XTextareaComponent ], templateUrl: './group.component.html', styleUrls: ['./group.component.scss'] diff --git a/lib/ng-nest/ui/input/examples/en_US/default/perpost/perpost.component.ts b/lib/ng-nest/ui/input/examples/en_US/default/perpost/perpost.component.ts index 08fa114fe..9c959baee 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/perpost/perpost.component.ts +++ b/lib/ng-nest/ui/input/examples/en_US/default/perpost/perpost.component.ts @@ -6,7 +6,7 @@ import { XCascadeComponent } from '@ng-nest/ui/cascade'; import { XColorPickerComponent } from '@ng-nest/ui/color-picker'; import { XDatePickerComponent } from '@ng-nest/ui/date-picker'; import { XInputComponent } from '@ng-nest/ui/input'; -import { XSelectModule } from '@ng-nest/ui/select'; +import { XSelectComponent } from '@ng-nest/ui/select'; import { XTimePickerModule } from '@ng-nest/ui/time-picker'; @Component({ @@ -15,7 +15,7 @@ import { XTimePickerModule } from '@ng-nest/ui/time-picker'; imports: [ CommonModule, XInputComponent, - XSelectModule, + XSelectComponent, XButtonComponent, XDatePickerComponent, XAutoCompleteComponent, diff --git a/lib/ng-nest/ui/input/examples/en_US/default/size/size.component.ts b/lib/ng-nest/ui/input/examples/en_US/default/size/size.component.ts index 0accb38a6..9b1c1af8c 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/size/size.component.ts +++ b/lib/ng-nest/ui/input/examples/en_US/default/size/size.component.ts @@ -2,12 +2,12 @@ import { Component } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { XSize } from '@ng-nest/ui/core'; import { XInputComponent } from '@ng-nest/ui/input'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; @Component({ selector: 'ex-size', standalone: true, - imports: [FormsModule, XInputComponent, XRadioModule], + imports: [FormsModule, XInputComponent, XRadioComponent], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/input/examples/zh_CN/default/group/group.component.ts b/lib/ng-nest/ui/input/examples/zh_CN/default/group/group.component.ts index b5338ea8b..2c40b51df 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/group/group.component.ts +++ b/lib/ng-nest/ui/input/examples/zh_CN/default/group/group.component.ts @@ -7,8 +7,8 @@ import { XColorPickerComponent } from '@ng-nest/ui/color-picker'; import { XDatePickerComponent } from '@ng-nest/ui/date-picker'; import { XFindComponent } from '@ng-nest/ui/find'; import { XInputComponent, XInputGroupComponent } from '@ng-nest/ui/input'; -import { XSelectModule } from '@ng-nest/ui/select'; -import { XTextareaModule } from '@ng-nest/ui/textarea'; +import { XSelectComponent } from '@ng-nest/ui/select'; +import { XTextareaComponent } from '@ng-nest/ui/textarea'; import { XTimePickerModule } from '@ng-nest/ui/time-picker'; @Component({ @@ -18,7 +18,7 @@ import { XTimePickerModule } from '@ng-nest/ui/time-picker'; CommonModule, XInputComponent, XInputGroupComponent, - XSelectModule, + XSelectComponent, XButtonComponent, XDatePickerComponent, XAutoCompleteComponent, @@ -26,7 +26,7 @@ import { XTimePickerModule } from '@ng-nest/ui/time-picker'; XColorPickerComponent, XFindComponent, XTimePickerModule, - XTextareaModule + XTextareaComponent ], templateUrl: './group.component.html', styleUrls: ['./group.component.scss'] diff --git a/lib/ng-nest/ui/input/examples/zh_CN/default/perpost/perpost.component.ts b/lib/ng-nest/ui/input/examples/zh_CN/default/perpost/perpost.component.ts index 08fa114fe..9c959baee 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/perpost/perpost.component.ts +++ b/lib/ng-nest/ui/input/examples/zh_CN/default/perpost/perpost.component.ts @@ -6,7 +6,7 @@ import { XCascadeComponent } from '@ng-nest/ui/cascade'; import { XColorPickerComponent } from '@ng-nest/ui/color-picker'; import { XDatePickerComponent } from '@ng-nest/ui/date-picker'; import { XInputComponent } from '@ng-nest/ui/input'; -import { XSelectModule } from '@ng-nest/ui/select'; +import { XSelectComponent } from '@ng-nest/ui/select'; import { XTimePickerModule } from '@ng-nest/ui/time-picker'; @Component({ @@ -15,7 +15,7 @@ import { XTimePickerModule } from '@ng-nest/ui/time-picker'; imports: [ CommonModule, XInputComponent, - XSelectModule, + XSelectComponent, XButtonComponent, XDatePickerComponent, XAutoCompleteComponent, diff --git a/lib/ng-nest/ui/input/examples/zh_CN/default/size/size.component.ts b/lib/ng-nest/ui/input/examples/zh_CN/default/size/size.component.ts index 0accb38a6..9b1c1af8c 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/size/size.component.ts +++ b/lib/ng-nest/ui/input/examples/zh_CN/default/size/size.component.ts @@ -2,12 +2,12 @@ import { Component } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { XSize } from '@ng-nest/ui/core'; import { XInputComponent } from '@ng-nest/ui/input'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; @Component({ selector: 'ex-size', standalone: true, - imports: [FormsModule, XInputComponent, XRadioModule], + imports: [FormsModule, XInputComponent, XRadioComponent], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/input/input.component.spec.ts b/lib/ng-nest/ui/input/input.component.spec.ts index 5587b73c5..59533691e 100644 --- a/lib/ng-nest/ui/input/input.component.spec.ts +++ b/lib/ng-nest/ui/input/input.component.spec.ts @@ -7,16 +7,16 @@ import { XInputPrefix } from './input.property'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { interval } from 'rxjs'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; -import { XRadioModule } from '@ng-nest/ui/radio'; -import { XSelectModule } from '@ng-nest/ui/select'; +import { XThemeComponent } from '@ng-nest/ui/theme'; +import { XRadioComponent } from '@ng-nest/ui/radio'; +import { XSelectComponent } from '@ng-nest/ui/select'; import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; import { XDatePickerComponent } from '@ng-nest/ui/date-picker'; import { XAutoCompleteComponent } from '@ng-nest/ui/auto-complete'; import { XCascadeComponent } from '@ng-nest/ui/cascade'; import { XColorPickerComponent } from '@ng-nest/ui/color-picker'; import { XFindComponent } from '@ng-nest/ui/find'; -import { XTextareaModule } from '@ng-nest/ui/textarea'; +import { XTextareaComponent } from '@ng-nest/ui/textarea'; import { XTimePickerModule } from '@ng-nest/ui/time-picker'; import { HttpClientTestingModule } from '@angular/common/http/testing'; @@ -26,15 +26,15 @@ describe(XInputPrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, XInputComponent, XInputGroupComponent, FormsModule, ReactiveFormsModule, XRowComponent, XColComponent, - XRadioModule, - XSelectModule, + XRadioComponent, + XSelectComponent, XButtonComponent, XButtonsComponent, XDatePickerComponent, @@ -42,7 +42,7 @@ describe(XInputPrefix, () => { XCascadeComponent, XColorPickerComponent, XFindComponent, - XTextareaModule, + XTextareaComponent, XTimePickerModule ], declarations: [ diff --git a/lib/ng-nest/ui/layout/layout.component.spec.ts b/lib/ng-nest/ui/layout/layout.component.spec.ts index bbd5a37ef..937df0165 100644 --- a/lib/ng-nest/ui/layout/layout.component.spec.ts +++ b/lib/ng-nest/ui/layout/layout.component.spec.ts @@ -5,7 +5,7 @@ import { By } from '@angular/platform-browser'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { XRowPrefix } from './layout.property'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(`${XRowPrefix}`, () => { @@ -14,7 +14,7 @@ describe(`${XRowPrefix}`, () => { imports: [ HttpClientTestingModule, BrowserAnimationsModule, - XThemeModule, + XThemeComponent, XRowComponent, XColComponent ], diff --git a/lib/ng-nest/ui/layout/layout.property.ts b/lib/ng-nest/ui/layout/layout.property.ts index a1f2674a6..22e541834 100644 --- a/lib/ng-nest/ui/layout/layout.property.ts +++ b/lib/ng-nest/ui/layout/layout.property.ts @@ -19,7 +19,7 @@ export const XRowPrefix = 'x-row'; /** * Row Property */ -@Component({ selector: `${XRowPrefix}-property`, template: '', standalone: true }) +@Component({ selector: `${XRowPrefix}-property`, template: '' }) export class XRowProperty extends XProperty { /** * @zh_CN 列间隔，rem diff --git a/lib/ng-nest/ui/link/link.component.spec.ts b/lib/ng-nest/ui/link/link.component.spec.ts index 2e09f1005..604b60f77 100644 --- a/lib/ng-nest/ui/link/link.component.spec.ts +++ b/lib/ng-nest/ui/link/link.component.spec.ts @@ -8,7 +8,7 @@ import { XLinkComponent } from '@ng-nest/ui/link'; import { FormsModule } from '@angular/forms'; import { XLinkPrefix } from './link.property'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XLinkPrefix, () => { @@ -17,7 +17,7 @@ describe(XLinkPrefix, () => { imports: [ HttpClientTestingModule, BrowserAnimationsModule, - XThemeModule, + XThemeComponent, FormsModule, XLinkComponent, XRowComponent, diff --git a/lib/ng-nest/ui/link/link.property.ts b/lib/ng-nest/ui/link/link.property.ts index 8c2d160cc..2b71df2d1 100644 --- a/lib/ng-nest/ui/link/link.property.ts +++ b/lib/ng-nest/ui/link/link.property.ts @@ -12,7 +12,7 @@ const X_CONFIG_NAME = 'link'; /** * Link Property */ -@Component({ selector: `${XLinkPrefix}-property`, template: '', standalone: true }) +@Component({ selector: `${XLinkPrefix}-property`, template: '' }) export class XLinkProperty extends XProperty { /** * @zh_CN 链接 diff --git a/lib/ng-nest/ui/list/examples/en_US/default/scroll/scroll.component.ts b/lib/ng-nest/ui/list/examples/en_US/default/scroll/scroll.component.ts index 2194c9682..1e8036be1 100644 --- a/lib/ng-nest/ui/list/examples/en_US/default/scroll/scroll.component.ts +++ b/lib/ng-nest/ui/list/examples/en_US/default/scroll/scroll.component.ts @@ -4,12 +4,12 @@ import { FormsModule } from '@angular/forms'; import { XSize } from '@ng-nest/ui/core'; import { XInputNumberComponent } from '@ng-nest/ui/input-number'; import { XListComponent } from '@ng-nest/ui/list'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; @Component({ selector: 'ex-scroll', standalone: true, - imports: [CommonModule, FormsModule, XListComponent, XRadioModule, XInputNumberComponent], + imports: [CommonModule, FormsModule, XListComponent, XRadioComponent, XInputNumberComponent], templateUrl: './scroll.component.html', styleUrls: ['./scroll.component.scss'] }) diff --git a/lib/ng-nest/ui/list/examples/en_US/default/size/size.component.ts b/lib/ng-nest/ui/list/examples/en_US/default/size/size.component.ts index 564378202..eba922f0e 100644 --- a/lib/ng-nest/ui/list/examples/en_US/default/size/size.component.ts +++ b/lib/ng-nest/ui/list/examples/en_US/default/size/size.component.ts @@ -1,13 +1,13 @@ import { Component } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { XSize } from '@ng-nest/ui/core'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; import { XListComponent } from '@ng-nest/ui/list'; @Component({ selector: 'ex-size', standalone: true, - imports: [FormsModule, XListComponent, XRadioModule], + imports: [FormsModule, XListComponent, XRadioComponent], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/list/examples/zh_CN/default/scroll/scroll.component.ts b/lib/ng-nest/ui/list/examples/zh_CN/default/scroll/scroll.component.ts index 83fb7585c..b600a1d96 100644 --- a/lib/ng-nest/ui/list/examples/zh_CN/default/scroll/scroll.component.ts +++ b/lib/ng-nest/ui/list/examples/zh_CN/default/scroll/scroll.component.ts @@ -4,12 +4,12 @@ import { FormsModule } from '@angular/forms'; import { XSize } from '@ng-nest/ui/core'; import { XInputNumberComponent } from '@ng-nest/ui/input-number'; import { XListComponent } from '@ng-nest/ui/list'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; @Component({ selector: 'ex-scroll', standalone: true, - imports: [CommonModule, FormsModule, XListComponent, XRadioModule, XInputNumberComponent], + imports: [CommonModule, FormsModule, XListComponent, XRadioComponent, XInputNumberComponent], templateUrl: './scroll.component.html', styleUrls: ['./scroll.component.scss'] }) diff --git a/lib/ng-nest/ui/list/examples/zh_CN/default/size/size.component.ts b/lib/ng-nest/ui/list/examples/zh_CN/default/size/size.component.ts index 564378202..eba922f0e 100644 --- a/lib/ng-nest/ui/list/examples/zh_CN/default/size/size.component.ts +++ b/lib/ng-nest/ui/list/examples/zh_CN/default/size/size.component.ts @@ -1,13 +1,13 @@ import { Component } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { XSize } from '@ng-nest/ui/core'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; import { XListComponent } from '@ng-nest/ui/list'; @Component({ selector: 'ex-size', standalone: true, - imports: [FormsModule, XListComponent, XRadioModule], + imports: [FormsModule, XListComponent, XRadioComponent], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/list/list.component.spec.ts b/lib/ng-nest/ui/list/list.component.spec.ts index b45375218..f47a2d662 100644 --- a/lib/ng-nest/ui/list/list.component.spec.ts +++ b/lib/ng-nest/ui/list/list.component.spec.ts @@ -8,8 +8,8 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { XListPrefix, XListNode } from './list.property'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { XData } from '@ng-nest/ui/core'; -import { XThemeModule } from '@ng-nest/ui/theme'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XThemeComponent } from '@ng-nest/ui/theme'; +import { XRadioComponent } from '@ng-nest/ui/radio'; import { XInputNumberComponent } from '@ng-nest/ui/input-number'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { HttpClientTestingModule } from '@angular/common/http/testing'; @@ -20,8 +20,8 @@ describe(XListPrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, - XRadioModule, + XThemeComponent, + XRadioComponent, XListComponent, FormsModule, ReactiveFormsModule, diff --git a/lib/ng-nest/ui/list/list.component.ts b/lib/ng-nest/ui/list/list.component.ts index 614d3aed3..1163158a5 100644 --- a/lib/ng-nest/ui/list/list.component.ts +++ b/lib/ng-nest/ui/list/list.component.ts @@ -13,7 +13,9 @@ import { HostBinding, HostListener, ViewChildren, - inject + inject, + AfterRenderPhase, + afterRender } from '@angular/core'; import { XListPrefix, XListNode, XListProperty } from './list.property'; import { @@ -147,6 +149,18 @@ export class XListComponent extends XListProperty implements OnInit, OnChanges { private group = inject(X_LIST_DROP_GROUP, { optional: true, skipSelf: true }); configService = inject(XConfigService); + constructor() { + super(); + afterRender( + () => { + if (this.virtualScroll && this.scrollHeight) { + this.virtualBody?.checkViewportSize(); + } + }, + { phase: AfterRenderPhase.MixedReadWrite } + ); + } + ngOnInit() { this.i18n.localeChange .pipe( diff --git a/lib/ng-nest/ui/loading/loading.component.spec.ts b/lib/ng-nest/ui/loading/loading.component.spec.ts index 124b3571d..73d6fc813 100644 --- a/lib/ng-nest/ui/loading/loading.component.spec.ts +++ b/lib/ng-nest/ui/loading/loading.component.spec.ts @@ -11,7 +11,7 @@ import { XContainerComponent } from '@ng-nest/ui/container'; import { of } from 'rxjs'; import { delay } from 'rxjs/operators'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XLoadingPrefix, () => { @@ -20,7 +20,7 @@ describe(XLoadingPrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, FormsModule, BrowserAnimationsModule, XLoadingComponent, diff --git a/lib/ng-nest/ui/menu/menu-node.component.ts b/lib/ng-nest/ui/menu/menu-node.component.ts index 2fb5ef158..0cc436082 100644 --- a/lib/ng-nest/ui/menu/menu-node.component.ts +++ b/lib/ng-nest/ui/menu/menu-node.component.ts @@ -10,7 +10,7 @@ import { } from '@angular/core'; import { XMenuNodeProperty, XMenuNodePrefix } from './menu.property'; import { XConfigService } from '@ng-nest/ui/core'; -import { XIconComponent } from '../icon'; +import { XIconComponent } from '@ng-nest/ui/icon'; import { CommonModule } from '@angular/common'; import { RouterModule } from '@angular/router'; diff --git a/lib/ng-nest/ui/menu/menu.component.spec.ts b/lib/ng-nest/ui/menu/menu.component.spec.ts index 8ac39d224..f5e437794 100644 --- a/lib/ng-nest/ui/menu/menu.component.spec.ts +++ b/lib/ng-nest/ui/menu/menu.component.spec.ts @@ -5,7 +5,7 @@ import { XMenuComponent } from '@ng-nest/ui/menu'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XMenuPrefix, XMenuNode } from './menu.property'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { RouterModule, Routes } from '@angular/router'; import { APP_BASE_HREF } from '@angular/common'; import { interval } from 'rxjs'; @@ -17,7 +17,7 @@ describe(XMenuPrefix, () => { imports: [ HttpClientTestingModule, BrowserAnimationsModule, - XThemeModule, + XThemeComponent, XMenuComponent, XButtonComponent, TestMenuRoutesModule diff --git a/lib/ng-nest/ui/menu/menu.component.ts b/lib/ng-nest/ui/menu/menu.component.ts index 40a24bfc6..fb8142a1d 100644 --- a/lib/ng-nest/ui/menu/menu.component.ts +++ b/lib/ng-nest/ui/menu/menu.component.ts @@ -15,14 +15,14 @@ import { XMenuPrefix, XMenuNode, XMenuProperty } from './menu.property'; import { XClassMap, XIsChange, XIsEmpty, XSetData, XGroupBy, XConfigService } from '@ng-nest/ui/core'; import { Subject } from 'rxjs'; import { CommonModule, DOCUMENT } from '@angular/common'; -import { XSliderModule } from '@ng-nest/ui/slider'; +import { XSliderComponent } from '@ng-nest/ui/slider'; import { XDropdownComponent } from '@ng-nest/ui/dropdown'; import { XMenuNodeComponent } from './menu-node.component'; @Component({ selector: `${XMenuPrefix}`, standalone: true, - imports: [CommonModule, XSliderModule, XDropdownComponent, XMenuNodeComponent], + imports: [CommonModule, XSliderComponent, XDropdownComponent, XMenuNodeComponent], templateUrl: './menu.component.html', styleUrls: ['./menu.component.scss'], encapsulation: ViewEncapsulation.None, diff --git a/lib/ng-nest/ui/message-box/examples/en_US/default/confirm/confirm.component.ts b/lib/ng-nest/ui/message-box/examples/en_US/default/confirm/confirm.component.ts index ec10fe94a..a8addba24 100644 --- a/lib/ng-nest/ui/message-box/examples/en_US/default/confirm/confirm.component.ts +++ b/lib/ng-nest/ui/message-box/examples/en_US/default/confirm/confirm.component.ts @@ -1,9 +1,13 @@ import { Component } from '@angular/core'; import { XMessageBoxService, XMessageBoxAction } from '@ng-nest/ui/message-box'; import { XMessageService } from '@ng-nest/ui/message'; +import { CommonModule } from '@angular/common'; +import { XButtonComponent } from '@ng-nest/ui/button'; @Component({ selector: 'ex-confirm', + standalone: true, + imports: [CommonModule, XButtonComponent], templateUrl: './confirm.component.html' }) export class ExConfirmComponent { diff --git a/lib/ng-nest/ui/message-box/examples/en_US/default/custom/custom.component.ts b/lib/ng-nest/ui/message-box/examples/en_US/default/custom/custom.component.ts index 50855fcd7..cab23b4c3 100644 --- a/lib/ng-nest/ui/message-box/examples/en_US/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/message-box/examples/en_US/default/custom/custom.component.ts @@ -1,9 +1,13 @@ import { Component, ViewChild, TemplateRef } from '@angular/core'; import { XMessageBoxService, XMessageBoxAction } from '@ng-nest/ui/message-box'; import { XMessageService } from '@ng-nest/ui/message'; +import { CommonModule } from '@angular/common'; +import { XButtonComponent } from '@ng-nest/ui/button'; @Component({ selector: 'ex-custom', + standalone: true, + imports: [CommonModule, XButtonComponent], templateUrl: './custom.component.html', styleUrls: ['./custom.component.scss'] }) diff --git a/lib/ng-nest/ui/message-box/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/message-box/examples/en_US/default/default/default.component.ts index 44e376ddc..5225c7ad8 100644 --- a/lib/ng-nest/ui/message-box/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/message-box/examples/en_US/default/default/default.component.ts @@ -2,9 +2,13 @@ import { Component } from '@angular/core'; import { XMessageBoxService, XMessageBoxAction } from '@ng-nest/ui/message-box'; import { XMessageService } from '@ng-nest/ui/message'; import { XPlace } from '@ng-nest/ui/core'; +import { CommonModule } from '@angular/common'; +import { XButtonComponent } from '@ng-nest/ui/button'; @Component({ selector: 'ex-default', + standalone: true, + imports: [CommonModule, XButtonComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/message-box/examples/en_US/default/prompt/prompt.component.ts b/lib/ng-nest/ui/message-box/examples/en_US/default/prompt/prompt.component.ts index 229b09cc4..772e02add 100644 --- a/lib/ng-nest/ui/message-box/examples/en_US/default/prompt/prompt.component.ts +++ b/lib/ng-nest/ui/message-box/examples/en_US/default/prompt/prompt.component.ts @@ -1,9 +1,13 @@ import { Component } from '@angular/core'; import { XMessageBoxService, XMessageBoxAction } from '@ng-nest/ui/message-box'; import { XMessageService } from '@ng-nest/ui/message'; +import { CommonModule } from '@angular/common'; +import { XButtonComponent } from '@ng-nest/ui/button'; @Component({ selector: 'ex-prompt', + standalone: true, + imports: [CommonModule, XButtonComponent], templateUrl: './prompt.component.html' }) export class ExPromptComponent { @@ -13,7 +17,8 @@ export class ExPromptComponent { title: 'Submit content', content: 'Please enter email', inputValue: 'ngnest@163', - inputPattern: /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/, + inputPattern: + /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/, inputInvalidMessage: 'Incorrect email format', callback: (action: XMessageBoxAction, msg) => { if (action === 'confirm') { @@ -33,7 +38,9 @@ export class ExPromptComponent { content: 'Please enter email', inputValue: 'ngnest@163', inputValidator: (value: string) => { - let reg = new RegExp(/[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/); + let reg = new RegExp( + /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/ + ); return reg.test(value); }, inputInvalidMessage: 'Incorrect email format', diff --git a/lib/ng-nest/ui/message-box/examples/index.ts b/lib/ng-nest/ui/message-box/examples/index.ts new file mode 100644 index 000000000..16cb95cb4 --- /dev/null +++ b/lib/ng-nest/ui/message-box/examples/index.ts @@ -0,0 +1,4 @@ +export * from './zh_CN/default/confirm/confirm.component'; +export * from './zh_CN/default/custom/custom.component'; +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/prompt/prompt.component'; diff --git a/lib/ng-nest/ui/message-box/examples/zh_CN/default/confirm/confirm.component.ts b/lib/ng-nest/ui/message-box/examples/zh_CN/default/confirm/confirm.component.ts index ec8afd327..3818b06e6 100644 --- a/lib/ng-nest/ui/message-box/examples/zh_CN/default/confirm/confirm.component.ts +++ b/lib/ng-nest/ui/message-box/examples/zh_CN/default/confirm/confirm.component.ts @@ -1,9 +1,13 @@ import { Component } from '@angular/core'; import { XMessageBoxService, XMessageBoxAction } from '@ng-nest/ui/message-box'; import { XMessageService } from '@ng-nest/ui/message'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { CommonModule } from '@angular/common'; @Component({ selector: 'ex-confirm', + standalone: true, + imports: [CommonModule, XButtonComponent], templateUrl: './confirm.component.html' }) export class ExConfirmComponent { diff --git a/lib/ng-nest/ui/message-box/examples/zh_CN/default/custom/custom.component.ts b/lib/ng-nest/ui/message-box/examples/zh_CN/default/custom/custom.component.ts index 74ce0213a..9fa539f0e 100644 --- a/lib/ng-nest/ui/message-box/examples/zh_CN/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/message-box/examples/zh_CN/default/custom/custom.component.ts @@ -1,9 +1,13 @@ import { Component, ViewChild, TemplateRef } from '@angular/core'; import { XMessageBoxService, XMessageBoxAction } from '@ng-nest/ui/message-box'; import { XMessageService } from '@ng-nest/ui/message'; +import { CommonModule } from '@angular/common'; +import { XButtonComponent } from '@ng-nest/ui/button'; @Component({ selector: 'ex-custom', + standalone: true, + imports: [CommonModule, XButtonComponent], templateUrl: './custom.component.html', styleUrls: ['./custom.component.scss'] }) diff --git a/lib/ng-nest/ui/message-box/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/message-box/examples/zh_CN/default/default/default.component.ts index 60cd39d17..575fb7d9c 100644 --- a/lib/ng-nest/ui/message-box/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/message-box/examples/zh_CN/default/default/default.component.ts @@ -2,9 +2,13 @@ import { Component } from '@angular/core'; import { XMessageBoxService, XMessageBoxAction } from '@ng-nest/ui/message-box'; import { XMessageService } from '@ng-nest/ui/message'; import { XPlace } from '@ng-nest/ui/core'; +import { CommonModule } from '@angular/common'; +import { XButtonComponent } from '@ng-nest/ui/button'; @Component({ selector: 'ex-default', + standalone: true, + imports: [CommonModule, XButtonComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/message-box/examples/zh_CN/default/prompt/prompt.component.ts b/lib/ng-nest/ui/message-box/examples/zh_CN/default/prompt/prompt.component.ts index 8f1dfee22..14682e174 100644 --- a/lib/ng-nest/ui/message-box/examples/zh_CN/default/prompt/prompt.component.ts +++ b/lib/ng-nest/ui/message-box/examples/zh_CN/default/prompt/prompt.component.ts @@ -1,9 +1,13 @@ import { Component } from '@angular/core'; import { XMessageBoxService, XMessageBoxAction } from '@ng-nest/ui/message-box'; import { XMessageService } from '@ng-nest/ui/message'; +import { CommonModule } from '@angular/common'; +import { XButtonComponent } from '@ng-nest/ui/button'; @Component({ selector: 'ex-prompt', + standalone: true, + imports: [CommonModule, XButtonComponent], templateUrl: './prompt.component.html' }) export class ExPromptComponent { @@ -13,7 +17,8 @@ export class ExPromptComponent { title: '提交内容', content: '请输入邮箱', inputValue: 'ngnest@163', - inputPattern: /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/, + inputPattern: + /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/, inputInvalidMessage: '邮箱格式不正确', callback: (action: XMessageBoxAction, msg) => { if (action === 'confirm') { @@ -33,7 +38,9 @@ export class ExPromptComponent { content: '请输入邮箱', inputValue: 'ngnest@163', inputValidator: (value: string) => { - let reg = new RegExp(/[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/); + let reg = new RegExp( + /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/ + ); return reg.test(value); }, inputInvalidMessage: '邮箱格式不正确', diff --git a/lib/ng-nest/ui/message-box/message-box.component.spec.ts b/lib/ng-nest/ui/message-box/message-box.component.spec.ts index 08e222bb4..729a7f20a 100644 --- a/lib/ng-nest/ui/message-box/message-box.component.spec.ts +++ b/lib/ng-nest/ui/message-box/message-box.component.spec.ts @@ -1,23 +1,27 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XMessageBoxComponent } from './message-box.component'; import { Component, DebugElement, ViewChild, TemplateRef, ChangeDetectorRef } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { XMessageBoxModule } from '@ng-nest/ui/message-box'; +import { XMessageBoxComponent } from '@ng-nest/ui/message-box'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XMessageBoxPrefix, XMessageBoxAction } from './message-box.property'; import { XMessageBoxService } from './message-box.service'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { XPlace } from '@ng-nest/ui/core'; -import { XMessageModule, XMessageService } from '@ng-nest/ui/message'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XMessageService } from '@ng-nest/ui/message'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { XI18nService, en_US, zh_CN } from '@ng-nest/ui/i18n'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XMessageBoxPrefix, () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, BrowserAnimationsModule, XThemeModule, XMessageBoxModule, XButtonComponent, XMessageModule], + imports: [ + HttpClientTestingModule, + BrowserAnimationsModule, + XThemeComponent, + XMessageBoxComponent, + XButtonComponent + ], declarations: [TestXMessageBoxComponent] }).compileComponents(); }); @@ -145,7 +149,8 @@ class TestXMessageBoxComponent { alert(place: XPlace, title: string) { this.msgBox.alert({ title: '弹框 ' + title, - content: '天将降大任于是人也，必先苦其心志，劳其筋骨，饿其体肤，空乏其身，行拂乱其所为也，所以动心忍性，增益其所不能。', + content: + '天将降大任于是人也，必先苦其心志，劳其筋骨，饿其体肤，空乏其身，行拂乱其所为也，所以动心忍性，增益其所不能。', placement: place, callback: (action: XMessageBoxAction) => this.message.info('action: ' + action) }); @@ -172,7 +177,8 @@ class TestXMessageBoxComponent { title: '提交内容', content: '请输入邮箱', inputValue: 'ngnest@163', - inputPattern: /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/, + inputPattern: + /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/, inputInvalidMessage: '邮箱格式不正确', callback: (action: XMessageBoxAction, msg) => { if (action === 'confirm') { diff --git a/lib/ng-nest/ui/message-box/message-box.component.ts b/lib/ng-nest/ui/message-box/message-box.component.ts index 253049cb0..b9fbf080f 100644 --- a/lib/ng-nest/ui/message-box/message-box.component.ts +++ b/lib/ng-nest/ui/message-box/message-box.component.ts @@ -1,11 +1,29 @@ import { Component, ViewEncapsulation, Renderer2, ElementRef, ChangeDetectorRef, ChangeDetectionStrategy, OnInit } from '@angular/core'; import { XIsFunction, XMoveBoxAnimation } from '@ng-nest/ui/core'; import { XMessageBoxPrefix, XMessageBoxRef, XMessageBoxAction } from './message-box.property'; -import { UntypedFormGroup, UntypedFormControl, Validators } from '@angular/forms'; +import { UntypedFormGroup, UntypedFormControl, Validators, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { XFormInputValidator } from '@ng-nest/ui/base-form'; +import { CommonModule } from '@angular/common'; +import { XAlertComponent } from '@ng-nest/ui/alert'; +import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XInputComponent } from '@ng-nest/ui/input'; +import { XOutletDirective } from '@ng-nest/ui/outlet'; @Component({ selector: `${XMessageBoxPrefix}`, + standalone: true, + imports: [ + CommonModule, + FormsModule, + ReactiveFormsModule, + XInputComponent, + XButtonComponent, + XButtonsComponent, + XIconComponent, + XAlertComponent, + XOutletDirective, + ], templateUrl: './message-box.component.html', styleUrls: ['./message-box.component.scss'], encapsulation: ViewEncapsulation.None, diff --git a/lib/ng-nest/ui/message-box/message-box.module.ts b/lib/ng-nest/ui/message-box/message-box.module.ts index 7931ea561..496fc49d5 100644 --- a/lib/ng-nest/ui/message-box/message-box.module.ts +++ b/lib/ng-nest/ui/message-box/message-box.module.ts @@ -1,30 +1,7 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { XMessageBoxComponent } from './message-box.component'; -import { XAlertComponent } from '@ng-nest/ui/alert'; -import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; -import { XIconComponent } from '@ng-nest/ui/icon'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { XInputComponent } from '@ng-nest/ui/input'; -import { XOutletDirective } from '@ng-nest/ui/outlet'; -import { XMessageBoxService } from './message-box.service'; -import { XControlValueAccessor } from '@ng-nest/ui/base-form'; @NgModule({ - declarations: [XMessageBoxComponent], - exports: [XMessageBoxComponent], - imports: [ - CommonModule, - FormsModule, - ReactiveFormsModule, - XInputComponent, - XButtonComponent, - XButtonsComponent, - XIconComponent, - XAlertComponent, - XOutletDirective, - XControlValueAccessor - ], - providers: [XMessageBoxService] + exports: [], + imports: [] }) export class XMessageBoxModule {} diff --git a/lib/ng-nest/ui/message-box/message-box.service.ts b/lib/ng-nest/ui/message-box/message-box.service.ts index 70d240ce1..5fc0f3f56 100644 --- a/lib/ng-nest/ui/message-box/message-box.service.ts +++ b/lib/ng-nest/ui/message-box/message-box.service.ts @@ -1,11 +1,11 @@ -import { ComponentRef, Injectable } from '@angular/core'; +import { ComponentRef, Injectable, inject } from '@angular/core'; import { XTemplate, XIsXTemplate, fillDefault, XIsString } from '@ng-nest/ui/core'; import { XMessageBoxOption, XMessageBoxOverlayRef, XMessageBoxRef, XMessageBoxPortal } from './message-box.property'; import { XMessageBoxComponent } from './message-box.component'; import { XPortalService } from '@ng-nest/ui/portal'; import { XI18nService } from '@ng-nest/ui/i18n'; -@Injectable() +@Injectable({ providedIn: 'root' }) export class XMessageBoxService { default: XMessageBoxOption = { type: 'info', @@ -23,7 +23,8 @@ export class XMessageBoxService { hide: false }; - constructor(public portal: XPortalService, public i18n: XI18nService) {} + private portal = inject(XPortalService); + private i18n = inject(XI18nService); alert(option: XTemplate | XMessageBoxOption): XMessageBoxRef { return this.createMessageBox(option, { showIcon: false, showCancel: false, showInput: false }); diff --git a/lib/ng-nest/ui/message/message.component.spec.ts b/lib/ng-nest/ui/message/message.component.spec.ts index cd4e2bfe9..a678de504 100644 --- a/lib/ng-nest/ui/message/message.component.spec.ts +++ b/lib/ng-nest/ui/message/message.component.spec.ts @@ -3,13 +3,12 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { XMessageComponent } from './message.component'; import { Component, DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { XMessageModule } from '@ng-nest/ui/message'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XMessagePrefix } from './message.property'; import { XMessageService } from './message.service'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { XConfig, XPlace, X_CONFIG } from '@ng-nest/ui/core'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XMessagePrefix, () => { @@ -22,7 +21,7 @@ describe(XMessagePrefix, () => { }; beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, BrowserAnimationsModule, XThemeModule, XMessageModule, XButtonComponent], + imports: [HttpClientTestingModule, BrowserAnimationsModule, XThemeComponent, XButtonComponent], declarations: [TestXMessageComponent, TestXMessageTypeComponent, TestXMessageDisplayTypeComponent], providers: [ { diff --git a/lib/ng-nest/ui/message/message.module.ts b/lib/ng-nest/ui/message/message.module.ts index 4718ddab3..9f1e5711b 100644 --- a/lib/ng-nest/ui/message/message.module.ts +++ b/lib/ng-nest/ui/message/message.module.ts @@ -1,8 +1,7 @@ import { NgModule } from '@angular/core'; -import { XMessageComponent } from './message.component'; @NgModule({ - exports: [XMessageComponent], - imports: [XMessageComponent] + exports: [], + imports: [] }) export class XMessageModule {} diff --git a/lib/ng-nest/ui/notification/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/notification/examples/en_US/default/default/default.component.ts index 36041be0e..1e0ba3349 100644 --- a/lib/ng-nest/ui/notification/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/notification/examples/en_US/default/default/default.component.ts @@ -1,9 +1,13 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; import { XCorner } from '@ng-nest/ui/core'; import { XNotificationService } from '@ng-nest/ui/notification'; @Component({ selector: 'ex-default', + standalone: true, + imports: [CommonModule, XButtonComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) @@ -11,7 +15,7 @@ export class ExDefaultComponent { constructor(private notification: XNotificationService) {} open(place: XCorner, title: string) { this.notification.info({ - title: title+ 'news', + title: title + 'news', content: `The more you learn, the more you don't know.`, placement: place }); diff --git a/lib/ng-nest/ui/notification/examples/en_US/default/type/type.component.ts b/lib/ng-nest/ui/notification/examples/en_US/default/type/type.component.ts index 6a5c87105..93deef50a 100644 --- a/lib/ng-nest/ui/notification/examples/en_US/default/type/type.component.ts +++ b/lib/ng-nest/ui/notification/examples/en_US/default/type/type.component.ts @@ -1,8 +1,12 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; import { XNotificationService } from '@ng-nest/ui/notification'; @Component({ selector: 'ex-type', + standalone: true, + imports: [CommonModule, XButtonComponent], templateUrl: './type.component.html', styleUrls: ['./type.component.scss'] }) diff --git a/lib/ng-nest/ui/notification/examples/index.ts b/lib/ng-nest/ui/notification/examples/index.ts new file mode 100644 index 000000000..fa154168b --- /dev/null +++ b/lib/ng-nest/ui/notification/examples/index.ts @@ -0,0 +1,2 @@ +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/type/type.component'; diff --git a/lib/ng-nest/ui/notification/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/notification/examples/zh_CN/default/default/default.component.ts index 48efc1ed0..c8c855a13 100644 --- a/lib/ng-nest/ui/notification/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/notification/examples/zh_CN/default/default/default.component.ts @@ -1,9 +1,13 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; import { XCorner } from '@ng-nest/ui/core'; import { XNotificationService } from '@ng-nest/ui/notification'; @Component({ selector: 'ex-default', + standalone: true, + imports: [CommonModule, XButtonComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) @@ -11,8 +15,9 @@ export class ExDefaultComponent { constructor(private notification: XNotificationService) {} open(place: XCorner, title: string) { this.notification.info({ - title: title+ '消息', - content: '天将降大任于是人也，必先苦其心志，劳其筋骨，饿其体肤，空乏其身，行拂乱其所为也，所以动心忍性，增益其所不能。', + title: title + '消息', + content: + '天将降大任于是人也，必先苦其心志，劳其筋骨，饿其体肤，空乏其身，行拂乱其所为也，所以动心忍性，增益其所不能。', placement: place }); } diff --git a/lib/ng-nest/ui/notification/examples/zh_CN/default/type/type.component.ts b/lib/ng-nest/ui/notification/examples/zh_CN/default/type/type.component.ts index 76bceec89..f0834f0c9 100644 --- a/lib/ng-nest/ui/notification/examples/zh_CN/default/type/type.component.ts +++ b/lib/ng-nest/ui/notification/examples/zh_CN/default/type/type.component.ts @@ -1,12 +1,17 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; import { XNotificationService } from '@ng-nest/ui/notification'; @Component({ selector: 'ex-type', + standalone: true, + imports: [CommonModule, XButtonComponent], templateUrl: './type.component.html', styleUrls: ['./type.component.scss'] }) export class ExTypeComponent { - content = '天将降大任于是人也，必先苦其心志，劳其筋骨，饿其体肤，空乏其身，行拂乱其所为也，所以动心忍性，增益其所不能。'; + content = + '天将降大任于是人也，必先苦其心志，劳其筋骨，饿其体肤，空乏其身，行拂乱其所为也，所以动心忍性，增益其所不能。'; constructor(public notification: XNotificationService) {} } diff --git a/lib/ng-nest/ui/notification/notification.component.spec.ts b/lib/ng-nest/ui/notification/notification.component.spec.ts index b641c7930..98580756b 100644 --- a/lib/ng-nest/ui/notification/notification.component.spec.ts +++ b/lib/ng-nest/ui/notification/notification.component.spec.ts @@ -1,21 +1,20 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { XNotificationComponent } from './notification.component'; import { Component, DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { XNotificationModule } from '@ng-nest/ui/notification'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XNotificationPrefix } from './notification.property'; import { XNotificationService } from './notification.service'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { XCorner } from '@ng-nest/ui/core'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { XNotificationComponent } from '@ng-nest/ui/notification'; describe(XNotificationPrefix, () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, BrowserAnimationsModule, XThemeModule, XNotificationModule, XButtonComponent], + imports: [HttpClientTestingModule, BrowserAnimationsModule, XThemeComponent, XButtonComponent], declarations: [TestXNotificationComponent, TestXNotificationTypeComponent] }).compileComponents(); }); @@ -91,7 +90,8 @@ class TestXNotificationComponent { open(place: XCorner, title: string) { this.notification.info({ title: `${title} 消息`, - content: '天将降大任于是人也，必先苦其心志，劳其筋骨，饿其体肤，空乏其身，行拂乱其所为也，所以动心忍性，增益其所不能。', + content: + '天将降大任于是人也，必先苦其心志，劳其筋骨，饿其体肤，空乏其身，行拂乱其所为也，所以动心忍性，增益其所不能。', placement: place }); } @@ -107,22 +107,41 @@ class TestXNotificationComponent { 错误提示
- 成功提示 - 消息提示 - 消息提示 + 警告提示 - 错误提示
- 成功提示 - 消息提示 - 警告提示 - 错误提示 + 成功提示 + 消息提示 + 警告提示 + 错误提示
`, styles: [ @@ -142,6 +161,7 @@ class TestXNotificationComponent { ] }) class TestXNotificationTypeComponent { - content = '天将降大任于是人也，必先苦其心志，劳其筋骨，饿其体肤，空乏其身，行拂乱其所为也，所以动心忍性，增益其所不能。'; + content = + '天将降大任于是人也，必先苦其心志，劳其筋骨，饿其体肤，空乏其身，行拂乱其所为也，所以动心忍性，增益其所不能。'; constructor() {} } diff --git a/lib/ng-nest/ui/notification/notification.component.ts b/lib/ng-nest/ui/notification/notification.component.ts index 1e66463d0..1b4e7dfa9 100644 --- a/lib/ng-nest/ui/notification/notification.component.ts +++ b/lib/ng-nest/ui/notification/notification.component.ts @@ -1,11 +1,15 @@ -import { Component, ViewEncapsulation, Renderer2, ElementRef, ChangeDetectorRef, ChangeDetectionStrategy } from '@angular/core'; +import { Component, ViewEncapsulation, ChangeDetectorRef, ChangeDetectionStrategy, inject } from '@angular/core'; import { XMoveAnimation, XIsEmpty } from '@ng-nest/ui/core'; import { XNotificationPrefix, XNotificationOption, XNotificationRef } from './notification.property'; import { of } from 'rxjs'; import { delay } from 'rxjs/operators'; +import { CommonModule } from '@angular/common'; +import { XAlertComponent } from '@ng-nest/ui/alert'; @Component({ selector: `${XNotificationPrefix}`, + standalone: true, + imports: [CommonModule, XAlertComponent], templateUrl: './notification.component.html', styleUrls: ['./notification.component.scss'], encapsulation: ViewEncapsulation.None, @@ -15,7 +19,7 @@ import { delay } from 'rxjs/operators'; export class XNotificationComponent { notification: XNotificationRef = { list: [] }; - constructor(public renderer: Renderer2, public elementRef: ElementRef, public cdr: ChangeDetectorRef) {} + cdr = inject(ChangeDetectorRef); onClose(item: XNotificationOption) { this.notification.list?.splice(this.notification.list.indexOf(item), 1); diff --git a/lib/ng-nest/ui/notification/notification.module.ts b/lib/ng-nest/ui/notification/notification.module.ts index c33f1fad3..9ac3e6c67 100644 --- a/lib/ng-nest/ui/notification/notification.module.ts +++ b/lib/ng-nest/ui/notification/notification.module.ts @@ -1,13 +1,7 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { XNotificationComponent } from './notification.component'; -import { XAlertComponent } from '@ng-nest/ui/alert'; -import { XNotificationService } from './notification.service'; @NgModule({ - declarations: [XNotificationComponent], - exports: [XNotificationComponent], - imports: [CommonModule, XAlertComponent], - providers: [XNotificationService] + exports: [], + imports: [] }) export class XNotificationModule {} diff --git a/lib/ng-nest/ui/notification/notification.service.ts b/lib/ng-nest/ui/notification/notification.service.ts index 1e8fbb8b5..b122d5937 100644 --- a/lib/ng-nest/ui/notification/notification.service.ts +++ b/lib/ng-nest/ui/notification/notification.service.ts @@ -1,4 +1,4 @@ -import { Injectable } from '@angular/core'; +import { Injectable, inject } from '@angular/core'; import { XTemplate, XIsXTemplate, fillDefault, XIsEmpty, XIsString } from '@ng-nest/ui/core'; import { XNotificationOption, @@ -13,7 +13,7 @@ import { of } from 'rxjs'; import { delay } from 'rxjs/operators'; import { XPortalService } from '@ng-nest/ui/portal'; -@Injectable() +@Injectable({ providedIn: 'root' }) export class XNotificationService { notifications: XNotificationPlacement = {}; @@ -27,7 +27,7 @@ export class XNotificationService { showIcon: true }; - constructor(public portal: XPortalService) {} + private portal = inject(XPortalService); info(option: XTemplate | XNotificationOption): XNotificationRef { return this.createNotification(option, 'info'); @@ -80,7 +80,10 @@ export class XNotificationService { list: [option] }; } else { - this.notifications[option.placement].list = [...(this.notifications[option.placement].list as XNotificationOption[]), option]; + this.notifications[option.placement].list = [ + ...(this.notifications[option.placement].list as XNotificationOption[]), + option + ]; } this.notificationChange(this.notifications[option.placement]); diff --git a/lib/ng-nest/ui/outlet/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/outlet/examples/en_US/default/default/default.component.ts index dea3d505b..e27fa50bf 100644 --- a/lib/ng-nest/ui/outlet/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/outlet/examples/en_US/default/default/default.component.ts @@ -1,7 +1,11 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XOutletDirective } from '@ng-nest/ui/outlet'; @Component({ selector: 'ex-default', + standalone: true, + imports: [CommonModule, XOutletDirective], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/outlet/examples/index.ts b/lib/ng-nest/ui/outlet/examples/index.ts new file mode 100644 index 000000000..b94cf3f92 --- /dev/null +++ b/lib/ng-nest/ui/outlet/examples/index.ts @@ -0,0 +1 @@ +export * from './zh_CN/default/default/default.component'; diff --git a/lib/ng-nest/ui/outlet/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/outlet/examples/zh_CN/default/default/default.component.ts index 1d7c7746a..7ea506098 100644 --- a/lib/ng-nest/ui/outlet/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/outlet/examples/zh_CN/default/default/default.component.ts @@ -1,7 +1,11 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XOutletDirective } from '@ng-nest/ui/outlet'; @Component({ selector: 'ex-default', + standalone: true, + imports: [CommonModule, XOutletDirective], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/page-header/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/page-header/examples/en_US/default/default/default.component.ts index 77efc793a..b124de108 100644 --- a/lib/ng-nest/ui/page-header/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/page-header/examples/en_US/default/default/default.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XPageHeaderComponent } from '@ng-nest/ui/page-header'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XPageHeaderComponent], templateUrl: './default.component.html' }) export class ExDefaultComponent {} diff --git a/lib/ng-nest/ui/page-header/examples/index.ts b/lib/ng-nest/ui/page-header/examples/index.ts new file mode 100644 index 000000000..b94cf3f92 --- /dev/null +++ b/lib/ng-nest/ui/page-header/examples/index.ts @@ -0,0 +1 @@ +export * from './zh_CN/default/default/default.component'; diff --git a/lib/ng-nest/ui/page-header/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/page-header/examples/zh_CN/default/default/default.component.ts index 77efc793a..b124de108 100644 --- a/lib/ng-nest/ui/page-header/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/page-header/examples/zh_CN/default/default/default.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XPageHeaderComponent } from '@ng-nest/ui/page-header'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XPageHeaderComponent], templateUrl: './default.component.html' }) export class ExDefaultComponent {} diff --git a/lib/ng-nest/ui/page-header/page-header.component.spec.ts b/lib/ng-nest/ui/page-header/page-header.component.spec.ts index b3a9c857a..bba31f343 100644 --- a/lib/ng-nest/ui/page-header/page-header.component.spec.ts +++ b/lib/ng-nest/ui/page-header/page-header.component.spec.ts @@ -1,18 +1,16 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XPageHeaderComponent } from './page-header.component'; import { Component, DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { XPageHeaderModule } from '@ng-nest/ui/page-header'; +import { XPageHeaderComponent } from '@ng-nest/ui/page-header'; import { XPageHeaderPrefix } from './page-header.property'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XPageHeaderPrefix, () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, BrowserAnimationsModule, XThemeModule, XPageHeaderModule], + imports: [HttpClientTestingModule, BrowserAnimationsModule, XThemeComponent, XPageHeaderComponent], declarations: [TestXPageHeaderComponent] }).compileComponents(); }); diff --git a/lib/ng-nest/ui/page-header/page-header.component.ts b/lib/ng-nest/ui/page-header/page-header.component.ts index ec02255e6..03eba8ba9 100644 --- a/lib/ng-nest/ui/page-header/page-header.component.ts +++ b/lib/ng-nest/ui/page-header/page-header.component.ts @@ -1,12 +1,16 @@ -import { Component, ViewEncapsulation, ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core'; +import { Component, ViewEncapsulation, ChangeDetectionStrategy, ChangeDetectorRef, inject } from '@angular/core'; import { XPageHeaderPrefix, XPageHeaderProperty } from './page-header.property'; import { XConfigService } from '@ng-nest/ui/core'; import { XI18nService, XI18nPageHeader } from '@ng-nest/ui/i18n'; import { Subject } from 'rxjs'; import { takeUntil, map } from 'rxjs/operators'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { CommonModule } from '@angular/common'; @Component({ selector: `${XPageHeaderPrefix}`, + standalone: true, + imports: [CommonModule, XButtonComponent], templateUrl: './page-header.component.html', styleUrls: ['./page-header.component.scss'], encapsulation: ViewEncapsulation.None, @@ -20,9 +24,9 @@ export class XPageHeaderComponent extends XPageHeaderProperty { return this.backText || this.locale.back; } - constructor(public configService: XConfigService, public cdr: ChangeDetectorRef, public i18n: XI18nService) { - super(); - } + private cdr = inject(ChangeDetectorRef); + private i18n = inject(XI18nService); + configService = inject(XConfigService); ngOnInit() { this.i18n.localeChange diff --git a/lib/ng-nest/ui/page-header/page-header.module.ts b/lib/ng-nest/ui/page-header/page-header.module.ts index d90e26e94..17af41e09 100644 --- a/lib/ng-nest/ui/page-header/page-header.module.ts +++ b/lib/ng-nest/ui/page-header/page-header.module.ts @@ -1,12 +1,8 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { XPageHeaderComponent } from './page-header.component'; -import { XButtonComponent } from '@ng-nest/ui/button'; -import { XPageHeaderProperty } from './page-header.property'; @NgModule({ - declarations: [XPageHeaderComponent, XPageHeaderProperty], exports: [XPageHeaderComponent], - imports: [CommonModule, XButtonComponent] + imports: [XPageHeaderComponent] }) export class XPageHeaderModule {} diff --git a/lib/ng-nest/ui/pagination/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/pagination/examples/en_US/default/default/default.component.ts index 56ad1a1d5..7ef36ad15 100644 --- a/lib/ng-nest/ui/pagination/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/pagination/examples/en_US/default/default/default.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XPaginationComponent } from '@ng-nest/ui/pagination'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XPaginationComponent], templateUrl: './default.component.html', styles: [ ` diff --git a/lib/ng-nest/ui/pagination/examples/en_US/default/style/style.component.ts b/lib/ng-nest/ui/pagination/examples/en_US/default/style/style.component.ts index e6f3fc9e6..bfa1281ec 100644 --- a/lib/ng-nest/ui/pagination/examples/en_US/default/style/style.component.ts +++ b/lib/ng-nest/ui/pagination/examples/en_US/default/style/style.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XPaginationComponent } from '@ng-nest/ui/pagination'; @Component({ selector: 'ex-style', + standalone: true, + imports: [XPaginationComponent], templateUrl: './style.component.html', styles: [ ` diff --git a/lib/ng-nest/ui/pagination/examples/index.ts b/lib/ng-nest/ui/pagination/examples/index.ts new file mode 100644 index 000000000..f38b86bad --- /dev/null +++ b/lib/ng-nest/ui/pagination/examples/index.ts @@ -0,0 +1,2 @@ +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/style/style.component'; diff --git a/lib/ng-nest/ui/pagination/examples/zh_CN/default/default/default.component.html b/lib/ng-nest/ui/pagination/examples/zh_CN/default/default/default.component.html index 5b63ddf87..9772fc94a 100644 --- a/lib/ng-nest/ui/pagination/examples/zh_CN/default/default/default.component.html +++ b/lib/ng-nest/ui/pagination/examples/zh_CN/default/default/default.component.html @@ -2,7 +2,13 @@
- +
{ beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, BrowserAnimationsModule, XPaginationModule, XButtonComponent], + imports: [HttpClientTestingModule, BrowserAnimationsModule, XPaginationComponent, XButtonComponent], declarations: [TestXPaginationComponent, TestXPaginationStyleComponent] }).compileComponents(); }); diff --git a/lib/ng-nest/ui/pagination/pagination.component.ts b/lib/ng-nest/ui/pagination/pagination.component.ts index 645983e96..e14649c08 100644 --- a/lib/ng-nest/ui/pagination/pagination.component.ts +++ b/lib/ng-nest/ui/pagination/pagination.component.ts @@ -6,23 +6,43 @@ import { SimpleChanges, ElementRef, Renderer2, - ChangeDetectorRef + ChangeDetectorRef, + inject, + OnInit, + OnDestroy } from '@angular/core'; import { XPaginationPrefix, XPaginationProperty } from './pagination.property'; import { XIsChange, XConfigService } from '@ng-nest/ui/core'; import { Subject } from 'rxjs'; -import { XI18nService } from '@ng-nest/ui/i18n'; +import { XI18nPipe, XI18nService } from '@ng-nest/ui/i18n'; import { takeUntil } from 'rxjs/operators'; import { ENTER } from '@angular/cdk/keycodes'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; +import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; +import { XSelectComponent } from '@ng-nest/ui/select'; +import { XInputComponent } from '@ng-nest/ui/input'; +import { XOutletDirective } from '@ng-nest/ui/outlet'; @Component({ selector: `${XPaginationPrefix}`, + standalone: true, + imports: [ + CommonModule, + FormsModule, + XButtonComponent, + XButtonsComponent, + XI18nPipe, + XSelectComponent, + XInputComponent, + XOutletDirective + ], templateUrl: './pagination.component.html', styleUrls: ['./style/index.scss'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush }) -export class XPaginationComponent extends XPaginationProperty implements OnChanges { +export class XPaginationComponent extends XPaginationProperty implements OnInit, OnChanges, OnDestroy { lastIndex!: number; indexes: number[] = []; indexFirst: number = 1; @@ -48,18 +68,14 @@ export class XPaginationComponent extends XPaginationProperty implements OnChang return Number(this.index) === this.lastIndex; } - constructor( - public configService: XConfigService, - public elementRef: ElementRef, - public renderer: Renderer2, - public cdr: ChangeDetectorRef, - public i18n: XI18nService - ) { - super(); - this.renderer.addClass(this.elementRef.nativeElement, XPaginationPrefix); - } + private elementRef = inject(ElementRef); + private renderer = inject(Renderer2); + private cdr = inject(ChangeDetectorRef); + private i18n = inject(XI18nService); + configService = inject(XConfigService); ngOnInit() { + this.renderer.addClass(this.elementRef.nativeElement, XPaginationPrefix); this.i18n.localeChange.pipe(takeUntil(this._unSubject)).subscribe(() => this.cdr.markForCheck()); this.inputSize = Number(this.size); } diff --git a/lib/ng-nest/ui/pagination/pagination.module.ts b/lib/ng-nest/ui/pagination/pagination.module.ts index 60fe14a2a..98d8fa7cd 100644 --- a/lib/ng-nest/ui/pagination/pagination.module.ts +++ b/lib/ng-nest/ui/pagination/pagination.module.ts @@ -1,26 +1,8 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { XPaginationComponent } from './pagination.component'; -import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; -import { XPaginationProperty } from './pagination.property'; -import { XI18nPipe } from '@ng-nest/ui/i18n'; -import { XSelectModule } from '@ng-nest/ui/select'; -import { FormsModule } from '@angular/forms'; -import { XInputComponent } from '@ng-nest/ui/input'; -import { XOutletDirective } from '@ng-nest/ui/outlet'; @NgModule({ - declarations: [XPaginationComponent, XPaginationProperty], exports: [XPaginationComponent], - imports: [ - CommonModule, - FormsModule, - XButtonComponent, - XButtonsComponent, - XI18nPipe, - XSelectModule, - XInputComponent, - XOutletDirective - ] + imports: [XPaginationComponent] }) export class XPaginationModule {} diff --git a/lib/ng-nest/ui/pattern/pattern.component.ts b/lib/ng-nest/ui/pattern/pattern.component.ts index 8de46bd50..dc2c236cf 100644 --- a/lib/ng-nest/ui/pattern/pattern.component.ts +++ b/lib/ng-nest/ui/pattern/pattern.component.ts @@ -8,10 +8,12 @@ import { OnInit } from '@angular/core'; import { PatternPrefix } from './pattern.property'; +import { CommonModule } from '@angular/common'; @Component({ selector: 'x-pattern', standalone: true, + imports: [CommonModule], templateUrl: './pattern.component.html', styleUrls: ['./style/index.scss'], encapsulation: ViewEncapsulation.None, diff --git a/lib/ng-nest/ui/popconfirm/examples/en_US/default/async-close/async-close.component.ts b/lib/ng-nest/ui/popconfirm/examples/en_US/default/async-close/async-close.component.ts index 5f369b943..54305c6de 100644 --- a/lib/ng-nest/ui/popconfirm/examples/en_US/default/async-close/async-close.component.ts +++ b/lib/ng-nest/ui/popconfirm/examples/en_US/default/async-close/async-close.component.ts @@ -1,8 +1,12 @@ import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XPopconfirmComponent } from '@ng-nest/ui/popconfirm'; import { Observable } from 'rxjs'; @Component({ selector: 'ex-async-close', + standalone: true, + imports: [XPopconfirmComponent, XButtonComponent], templateUrl: './async-close.component.html' }) export class ExAsyncCloseComponent { diff --git a/lib/ng-nest/ui/popconfirm/examples/en_US/default/condition/condition.component.ts b/lib/ng-nest/ui/popconfirm/examples/en_US/default/condition/condition.component.ts index 6ad9195dc..00bfb42f8 100644 --- a/lib/ng-nest/ui/popconfirm/examples/en_US/default/condition/condition.component.ts +++ b/lib/ng-nest/ui/popconfirm/examples/en_US/default/condition/condition.component.ts @@ -1,8 +1,14 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XButtonComponent } from '@ng-nest/ui/button'; import { XMessageService } from '@ng-nest/ui/message'; +import { XPopconfirmComponent } from '@ng-nest/ui/popconfirm'; +import { XSwitchComponent } from '@ng-nest/ui/switch'; @Component({ selector: 'ex-condition', + standalone: true, + imports: [FormsModule, XPopconfirmComponent, XButtonComponent, XSwitchComponent], templateUrl: './condition.component.html' }) export class ExConditionComponent { diff --git a/lib/ng-nest/ui/popconfirm/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/popconfirm/examples/en_US/default/default/default.component.ts index 2df64266d..d14afbb8f 100644 --- a/lib/ng-nest/ui/popconfirm/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/popconfirm/examples/en_US/default/default/default.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XPopconfirmComponent } from '@ng-nest/ui/popconfirm'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XPopconfirmComponent, XButtonComponent], templateUrl: './default.component.html' }) export class ExDefaultComponent { diff --git a/lib/ng-nest/ui/popconfirm/examples/index.ts b/lib/ng-nest/ui/popconfirm/examples/index.ts new file mode 100644 index 000000000..8902a81d0 --- /dev/null +++ b/lib/ng-nest/ui/popconfirm/examples/index.ts @@ -0,0 +1,3 @@ +export * from './zh_CN/default/async-close/async-close.component'; +export * from './zh_CN/default/condition/condition.component'; +export * from './zh_CN/default/default/default.component'; diff --git a/lib/ng-nest/ui/popconfirm/examples/zh_CN/default/async-close/async-close.component.ts b/lib/ng-nest/ui/popconfirm/examples/zh_CN/default/async-close/async-close.component.ts index 5f369b943..54305c6de 100644 --- a/lib/ng-nest/ui/popconfirm/examples/zh_CN/default/async-close/async-close.component.ts +++ b/lib/ng-nest/ui/popconfirm/examples/zh_CN/default/async-close/async-close.component.ts @@ -1,8 +1,12 @@ import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XPopconfirmComponent } from '@ng-nest/ui/popconfirm'; import { Observable } from 'rxjs'; @Component({ selector: 'ex-async-close', + standalone: true, + imports: [XPopconfirmComponent, XButtonComponent], templateUrl: './async-close.component.html' }) export class ExAsyncCloseComponent { diff --git a/lib/ng-nest/ui/popconfirm/examples/zh_CN/default/condition/condition.component.ts b/lib/ng-nest/ui/popconfirm/examples/zh_CN/default/condition/condition.component.ts index 2368936b4..5eaeb86be 100644 --- a/lib/ng-nest/ui/popconfirm/examples/zh_CN/default/condition/condition.component.ts +++ b/lib/ng-nest/ui/popconfirm/examples/zh_CN/default/condition/condition.component.ts @@ -1,8 +1,14 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XButtonComponent } from '@ng-nest/ui/button'; import { XMessageService } from '@ng-nest/ui/message'; +import { XPopconfirmComponent } from '@ng-nest/ui/popconfirm'; +import { XSwitchComponent } from '@ng-nest/ui/switch'; @Component({ selector: 'ex-condition', + standalone: true, + imports: [FormsModule, XPopconfirmComponent, XButtonComponent, XSwitchComponent], templateUrl: './condition.component.html' }) export class ExConditionComponent { diff --git a/lib/ng-nest/ui/popconfirm/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/popconfirm/examples/zh_CN/default/default/default.component.ts index 2df64266d..d14afbb8f 100644 --- a/lib/ng-nest/ui/popconfirm/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/popconfirm/examples/zh_CN/default/default/default.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XPopconfirmComponent } from '@ng-nest/ui/popconfirm'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XPopconfirmComponent, XButtonComponent], templateUrl: './default.component.html' }) export class ExDefaultComponent { diff --git a/lib/ng-nest/ui/popconfirm/popconfirm.component.spec.ts b/lib/ng-nest/ui/popconfirm/popconfirm.component.spec.ts index a24bcad73..746909c7a 100644 --- a/lib/ng-nest/ui/popconfirm/popconfirm.component.spec.ts +++ b/lib/ng-nest/ui/popconfirm/popconfirm.component.spec.ts @@ -1,20 +1,17 @@ import { XIconComponent } from '@ng-nest/ui/icon'; import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XPopconfirmComponent } from './popconfirm.component'; import { Component, DebugElement, ChangeDetectorRef } from '@angular/core'; import { By } from '@angular/platform-browser'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; -import { XPopconfirmModule } from '@ng-nest/ui/popconfirm'; +import { XPopconfirmComponent } from '@ng-nest/ui/popconfirm'; import { FormsModule } from '@angular/forms'; import { XPopconfirmPrefix } from './popconfirm.property'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XContainerComponent } from '@ng-nest/ui/container'; import { interval } from 'rxjs'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; -import { XSwitchModule } from '@ng-nest/ui/switch'; -import { XMessageModule } from '@ng-nest/ui/message'; +import { XThemeComponent } from '@ng-nest/ui/theme'; +import { XSwitchComponent } from '@ng-nest/ui/switch'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XPopconfirmPrefix, () => { @@ -23,16 +20,15 @@ describe(XPopconfirmPrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, FormsModule, - XPopconfirmModule, + XPopconfirmComponent, XButtonComponent, XContainerComponent, XRowComponent, XColComponent, XIconComponent, - XSwitchModule, - XMessageModule + XSwitchComponent ], declarations: [TestXPopconfirmComponent] }).compileComponents(); diff --git a/lib/ng-nest/ui/popconfirm/popconfirm.component.ts b/lib/ng-nest/ui/popconfirm/popconfirm.component.ts index c89fac355..c6d0a0ea8 100644 --- a/lib/ng-nest/ui/popconfirm/popconfirm.component.ts +++ b/lib/ng-nest/ui/popconfirm/popconfirm.component.ts @@ -1,12 +1,26 @@ -import { Renderer2, ElementRef, ChangeDetectorRef, Component, ChangeDetectionStrategy, ViewEncapsulation, OnDestroy } from '@angular/core'; +import { + ChangeDetectorRef, + Component, + ChangeDetectionStrategy, + ViewEncapsulation, + OnDestroy, + inject +} from '@angular/core'; import { XPopconfirmProperty, XPopconfirmPrefix } from './popconfirm.property'; import { XBoolean, XConfigService } from '@ng-nest/ui/core'; import { Subject } from 'rxjs'; import { XI18nService, XI18nPopconfirm } from '@ng-nest/ui/i18n'; import { map, takeUntil } from 'rxjs/operators'; +import { CommonModule } from '@angular/common'; +import { XPopoverDirective } from '@ng-nest/ui/popover'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XOutletDirective } from '@ng-nest/ui/outlet'; @Component({ selector: `${XPopconfirmPrefix}`, + standalone: true, + imports: [CommonModule, XPopoverDirective, XButtonComponent, XIconComponent, XOutletDirective], templateUrl: './popconfirm.component.html', styleUrls: ['./popconfirm.component.scss'], encapsulation: ViewEncapsulation.None, @@ -28,15 +42,9 @@ export class XPopconfirmComponent extends XPopconfirmProperty implements OnDestr return this.confirmText || this.locale.confirmText; } - constructor( - public renderer: Renderer2, - public elementRef: ElementRef, - public cdr: ChangeDetectorRef, - public configService: XConfigService, - public i18n: XI18nService - ) { - super(); - } + private cdr = inject(ChangeDetectorRef); + private i18n = inject(XI18nService); + configService = inject(XConfigService); ngOnInit() { this.i18n.localeChange diff --git a/lib/ng-nest/ui/popconfirm/popconfirm.module.ts b/lib/ng-nest/ui/popconfirm/popconfirm.module.ts index 331374b68..5d41a0f7e 100644 --- a/lib/ng-nest/ui/popconfirm/popconfirm.module.ts +++ b/lib/ng-nest/ui/popconfirm/popconfirm.module.ts @@ -1,15 +1,8 @@ import { NgModule } from '@angular/core'; import { XPopconfirmComponent } from './popconfirm.component'; -import { XPopoverModule } from '@ng-nest/ui/popover'; -import { XButtonComponent } from '@ng-nest/ui/button'; -import { XIconComponent } from '@ng-nest/ui/icon'; -import { XOutletDirective } from '@ng-nest/ui/outlet'; -import { CommonModule } from '@angular/common'; -import { XPopconfirmProperty } from './popconfirm.property'; @NgModule({ - declarations: [XPopconfirmComponent, XPopconfirmProperty], exports: [XPopconfirmComponent], - imports: [CommonModule, XPopoverModule, XButtonComponent, XIconComponent, XOutletDirective] + imports: [XPopconfirmComponent] }) export class XPopconfirmModule {} diff --git a/lib/ng-nest/ui/popover/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/popover/examples/en_US/default/default/default.component.ts index cae54f2a5..9400aafd6 100644 --- a/lib/ng-nest/ui/popover/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/popover/examples/en_US/default/default/default.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XPopoverDirective } from '@ng-nest/ui/popover'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XPopoverDirective, XButtonComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/popover/examples/index.ts b/lib/ng-nest/ui/popover/examples/index.ts new file mode 100644 index 000000000..b94cf3f92 --- /dev/null +++ b/lib/ng-nest/ui/popover/examples/index.ts @@ -0,0 +1 @@ +export * from './zh_CN/default/default/default.component'; diff --git a/lib/ng-nest/ui/popover/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/popover/examples/zh_CN/default/default/default.component.ts index cae54f2a5..9400aafd6 100644 --- a/lib/ng-nest/ui/popover/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/popover/examples/zh_CN/default/default/default.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XPopoverDirective } from '@ng-nest/ui/popover'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XPopoverDirective, XButtonComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/popover/popover-portal.component.ts b/lib/ng-nest/ui/popover/popover-portal.component.ts index 9ad87c835..c610b3d0c 100644 --- a/lib/ng-nest/ui/popover/popover-portal.component.ts +++ b/lib/ng-nest/ui/popover/popover-portal.component.ts @@ -9,15 +9,20 @@ import { ViewChild, Renderer2, HostListener, - HostBinding + HostBinding, + inject } from '@angular/core'; import { BehaviorSubject, Subject } from 'rxjs'; import { XPopoverPortalPrefix, XPopoverTrigger } from './popover.property'; import { XTemplate, XPlacement, XClassMap, XFadeAnimation } from '@ng-nest/ui/core'; import { takeUntil } from 'rxjs/operators'; +import { CommonModule } from '@angular/common'; +import { XOutletDirective } from '@ng-nest/ui/outlet'; @Component({ selector: `${XPopoverPortalPrefix}`, + standalone: true, + imports: [CommonModule, XOutletDirective], templateUrl: './popover-portal.component.html', styleUrls: ['./popover-portal.component.scss'], encapsulation: ViewEncapsulation.None, @@ -60,8 +65,8 @@ export class XPopoverPortalComponent implements OnInit, OnDestroy { width!: string; positionChange: Subject = new Subject(); private _unSubject = new Subject(); - - constructor(private renderer: Renderer2, public cdr: ChangeDetectorRef) {} + private renderer = inject(Renderer2); + private cdr = inject(ChangeDetectorRef); ngOnInit(): void { this.contentChange.pipe(takeUntil(this._unSubject)).subscribe((x) => { diff --git a/lib/ng-nest/ui/popover/popover.directive.spec.ts b/lib/ng-nest/ui/popover/popover.directive.spec.ts index 3be80dc27..0ef7280a5 100644 --- a/lib/ng-nest/ui/popover/popover.directive.spec.ts +++ b/lib/ng-nest/ui/popover/popover.directive.spec.ts @@ -1,21 +1,19 @@ import { XButtonComponent } from '@ng-nest/ui/button'; import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XPopoverDirective } from './popover.directive'; import { Component, DebugElement, ChangeDetectorRef } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { XPopoverModule } from '@ng-nest/ui/popover'; +import { XPopoverDirective } from '@ng-nest/ui/popover'; import { XPopoverPrefix } from './popover.property'; import { interval } from 'rxjs'; import { XIconComponent } from '@ng-nest/ui/icon'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XPopoverPrefix, () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, BrowserAnimationsModule, XThemeModule, XPopoverModule, XButtonComponent, XIconComponent], + imports: [HttpClientTestingModule, BrowserAnimationsModule, XThemeComponent, XPopoverDirective, XButtonComponent, XIconComponent], declarations: [TestXPopoverComponent] }).compileComponents(); }); diff --git a/lib/ng-nest/ui/popover/popover.directive.ts b/lib/ng-nest/ui/popover/popover.directive.ts index 38023f790..4b2f0704d 100644 --- a/lib/ng-nest/ui/popover/popover.directive.ts +++ b/lib/ng-nest/ui/popover/popover.directive.ts @@ -1,13 +1,27 @@ -import { ElementRef, ViewContainerRef, Directive, HostListener, OnChanges, SimpleChanges, HostBinding } from '@angular/core'; +import { + ElementRef, + ViewContainerRef, + Directive, + HostListener, + OnChanges, + SimpleChanges, + HostBinding, + inject +} from '@angular/core'; import { XPortalService, XPortalOverlayRef, XPortalConnectedPosition } from '@ng-nest/ui/portal'; import { XPopoverPortalComponent } from './popover-portal.component'; import { XPopoverPrefix, XPopoverProperty } from './popover.property'; import { BehaviorSubject, Subject } from 'rxjs'; -import { OverlayConfig, FlexibleConnectedPositionStrategy, ConnectedOverlayPositionChange, Overlay } from '@angular/cdk/overlay'; +import { + OverlayConfig, + FlexibleConnectedPositionStrategy, + ConnectedOverlayPositionChange, + Overlay +} from '@angular/cdk/overlay'; import { takeUntil } from 'rxjs/operators'; import { XPlacement, XIsChange, XConfigService } from '@ng-nest/ui/core'; -@Directive({ selector: `[${XPopoverPrefix}], ${XPopoverPrefix}` }) +@Directive({ selector: `[${XPopoverPrefix}], ${XPopoverPrefix}`, standalone: true }) export class XPopoverDirective extends XPopoverProperty implements OnChanges { portal!: XPortalOverlayRef; box!: DOMRect; @@ -17,16 +31,11 @@ export class XPopoverDirective extends XPopoverProperty implements OnChanges { timeoutShow: any; private _unSubject = new Subject(); private realPlacement!: XPlacement; - - constructor( - private elementRef: ElementRef, - private portalService: XPortalService, - private viewContainerRef: ViewContainerRef, - private overlay: Overlay, - public configService: XConfigService - ) { - super(); - } + private elementRef = inject(ElementRef); + private portalService = inject(XPortalService); + private viewContainerRef = inject(ViewContainerRef); + private overlay = inject(Overlay); + configService = inject(XConfigService); @HostBinding('class.x-popover-show') get _show() { return this.visible; diff --git a/lib/ng-nest/ui/popover/popover.module.ts b/lib/ng-nest/ui/popover/popover.module.ts index c98504610..56624b521 100644 --- a/lib/ng-nest/ui/popover/popover.module.ts +++ b/lib/ng-nest/ui/popover/popover.module.ts @@ -1,13 +1,8 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { XPopoverDirective } from './popover.directive'; -import { XPopoverPortalComponent } from './popover-portal.component'; -import { XOutletDirective } from '@ng-nest/ui/outlet'; -import { XPopoverProperty } from './popover.property'; @NgModule({ - declarations: [XPopoverDirective, XPopoverPortalComponent, XPopoverProperty], - exports: [XPopoverDirective, XPopoverPortalComponent], - imports: [CommonModule, XOutletDirective] + exports: [XPopoverDirective], + imports: [XPopoverDirective] }) export class XPopoverModule {} diff --git a/lib/ng-nest/ui/progress/examples/en_US/default/circle/circle.component.ts b/lib/ng-nest/ui/progress/examples/en_US/default/circle/circle.component.ts index 6184c54e6..dc00a3a2b 100644 --- a/lib/ng-nest/ui/progress/examples/en_US/default/circle/circle.component.ts +++ b/lib/ng-nest/ui/progress/examples/en_US/default/circle/circle.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XProgressComponent } from '@ng-nest/ui/progress'; @Component({ selector: 'ex-circle', + standalone: true, + imports: [XProgressComponent], templateUrl: './circle.component.html', styleUrls: ['./circle.component.scss'] }) diff --git a/lib/ng-nest/ui/progress/examples/en_US/default/color/color.component.ts b/lib/ng-nest/ui/progress/examples/en_US/default/color/color.component.ts index b2549aa68..6563e4a2e 100644 --- a/lib/ng-nest/ui/progress/examples/en_US/default/color/color.component.ts +++ b/lib/ng-nest/ui/progress/examples/en_US/default/color/color.component.ts @@ -1,7 +1,12 @@ +import { CommonModule } from '@angular/common'; import { Component, OnInit } from '@angular/core'; +import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; +import { XProgressComponent } from '@ng-nest/ui/progress'; @Component({ selector: 'ex-color', + standalone: true, + imports: [CommonModule, XProgressComponent, XButtonComponent, XButtonsComponent], templateUrl: './color.component.html', styleUrls: ['./color.component.scss'] }) diff --git a/lib/ng-nest/ui/progress/examples/en_US/default/dashboard/dashboard.component.ts b/lib/ng-nest/ui/progress/examples/en_US/default/dashboard/dashboard.component.ts index 02b0915cd..fc19b106b 100644 --- a/lib/ng-nest/ui/progress/examples/en_US/default/dashboard/dashboard.component.ts +++ b/lib/ng-nest/ui/progress/examples/en_US/default/dashboard/dashboard.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; +import { XProgressComponent } from '@ng-nest/ui/progress'; @Component({ selector: 'ex-dashboard', + standalone: true, + imports: [XProgressComponent], templateUrl: './dashboard.component.html', styleUrls: ['./dashboard.component.scss'] }) -export class ExDashboardComponent {} \ No newline at end of file +export class ExDashboardComponent {} diff --git a/lib/ng-nest/ui/progress/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/progress/examples/en_US/default/default/default.component.ts index cae54f2a5..8e9bd8197 100644 --- a/lib/ng-nest/ui/progress/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/progress/examples/en_US/default/default/default.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XProgressComponent } from '@ng-nest/ui/progress'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XProgressComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/progress/examples/en_US/default/format/format.component.ts b/lib/ng-nest/ui/progress/examples/en_US/default/format/format.component.ts index b12bc1529..eb625d22a 100644 --- a/lib/ng-nest/ui/progress/examples/en_US/default/format/format.component.ts +++ b/lib/ng-nest/ui/progress/examples/en_US/default/format/format.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XProgressComponent } from '@ng-nest/ui/progress'; @Component({ selector: 'ex-format', + standalone: true, + imports: [XProgressComponent], templateUrl: './format.component.html', styleUrls: ['./format.component.scss'] }) diff --git a/lib/ng-nest/ui/progress/examples/en_US/default/gradient/gradient.component.ts b/lib/ng-nest/ui/progress/examples/en_US/default/gradient/gradient.component.ts index 9e2dca4a1..19f266506 100644 --- a/lib/ng-nest/ui/progress/examples/en_US/default/gradient/gradient.component.ts +++ b/lib/ng-nest/ui/progress/examples/en_US/default/gradient/gradient.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; +import { XProgressComponent } from '@ng-nest/ui/progress'; @Component({ selector: 'ex-gradient', + standalone: true, + imports: [XProgressComponent], templateUrl: './gradient.component.html', styleUrls: ['./gradient.component.scss'] }) -export class ExGradientComponent {} \ No newline at end of file +export class ExGradientComponent {} diff --git a/lib/ng-nest/ui/progress/examples/en_US/default/inside/inside.component.ts b/lib/ng-nest/ui/progress/examples/en_US/default/inside/inside.component.ts index b31c86488..5969b7c0b 100644 --- a/lib/ng-nest/ui/progress/examples/en_US/default/inside/inside.component.ts +++ b/lib/ng-nest/ui/progress/examples/en_US/default/inside/inside.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XProgressComponent } from '@ng-nest/ui/progress'; @Component({ selector: 'ex-inside', + standalone: true, + imports: [XProgressComponent], templateUrl: './inside.component.html', styleUrls: ['./inside.component.scss'] }) diff --git a/lib/ng-nest/ui/progress/examples/en_US/default/steps/steps.component.ts b/lib/ng-nest/ui/progress/examples/en_US/default/steps/steps.component.ts index 5119e7363..12116b758 100644 --- a/lib/ng-nest/ui/progress/examples/en_US/default/steps/steps.component.ts +++ b/lib/ng-nest/ui/progress/examples/en_US/default/steps/steps.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; +import { XProgressComponent } from '@ng-nest/ui/progress'; @Component({ selector: 'ex-steps', + standalone: true, + imports: [XProgressComponent], templateUrl: './steps.component.html', styleUrls: ['./steps.component.scss'] }) -export class ExStepsComponent {} \ No newline at end of file +export class ExStepsComponent {} diff --git a/lib/ng-nest/ui/progress/examples/en_US/default/subsection/subsection.component.ts b/lib/ng-nest/ui/progress/examples/en_US/default/subsection/subsection.component.ts index 9269838c8..dcf7ed46d 100644 --- a/lib/ng-nest/ui/progress/examples/en_US/default/subsection/subsection.component.ts +++ b/lib/ng-nest/ui/progress/examples/en_US/default/subsection/subsection.component.ts @@ -1,7 +1,12 @@ +import { CommonModule } from '@angular/common'; import { Component, OnInit } from '@angular/core'; +import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; +import { XProgressComponent } from '@ng-nest/ui/progress'; @Component({ selector: 'ex-subsection', + standalone: true, + imports: [CommonModule, XProgressComponent, XButtonComponent, XButtonsComponent], templateUrl: './subsection.component.html', styleUrls: ['./subsection.component.scss'] }) diff --git a/lib/ng-nest/ui/progress/examples/index.ts b/lib/ng-nest/ui/progress/examples/index.ts new file mode 100644 index 000000000..d0b9a301a --- /dev/null +++ b/lib/ng-nest/ui/progress/examples/index.ts @@ -0,0 +1,9 @@ +export * from './zh_CN/default/circle/circle.component'; +export * from './zh_CN/default/color/color.component'; +export * from './zh_CN/default/dashboard/dashboard.component'; +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/format/format.component'; +export * from './zh_CN/default/gradient/gradient.component'; +export * from './zh_CN/default/inside/inside.component'; +export * from './zh_CN/default/steps/steps.component'; +export * from './zh_CN/default/subsection/subsection.component'; diff --git a/lib/ng-nest/ui/progress/examples/zh_CN/default/circle/circle.component.ts b/lib/ng-nest/ui/progress/examples/zh_CN/default/circle/circle.component.ts index 6184c54e6..5e9c11d90 100644 --- a/lib/ng-nest/ui/progress/examples/zh_CN/default/circle/circle.component.ts +++ b/lib/ng-nest/ui/progress/examples/zh_CN/default/circle/circle.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; +import { XProgressComponent } from '@ng-nest/ui/progress'; @Component({ selector: 'ex-circle', + standalone: true, + imports: [XProgressComponent], templateUrl: './circle.component.html', styleUrls: ['./circle.component.scss'] }) -export class ExCircleComponent {} \ No newline at end of file +export class ExCircleComponent {} diff --git a/lib/ng-nest/ui/progress/examples/zh_CN/default/color/color.component.ts b/lib/ng-nest/ui/progress/examples/zh_CN/default/color/color.component.ts index b2549aa68..6563e4a2e 100644 --- a/lib/ng-nest/ui/progress/examples/zh_CN/default/color/color.component.ts +++ b/lib/ng-nest/ui/progress/examples/zh_CN/default/color/color.component.ts @@ -1,7 +1,12 @@ +import { CommonModule } from '@angular/common'; import { Component, OnInit } from '@angular/core'; +import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; +import { XProgressComponent } from '@ng-nest/ui/progress'; @Component({ selector: 'ex-color', + standalone: true, + imports: [CommonModule, XProgressComponent, XButtonComponent, XButtonsComponent], templateUrl: './color.component.html', styleUrls: ['./color.component.scss'] }) diff --git a/lib/ng-nest/ui/progress/examples/zh_CN/default/dashboard/dashboard.component.ts b/lib/ng-nest/ui/progress/examples/zh_CN/default/dashboard/dashboard.component.ts index 02b0915cd..fc19b106b 100644 --- a/lib/ng-nest/ui/progress/examples/zh_CN/default/dashboard/dashboard.component.ts +++ b/lib/ng-nest/ui/progress/examples/zh_CN/default/dashboard/dashboard.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; +import { XProgressComponent } from '@ng-nest/ui/progress'; @Component({ selector: 'ex-dashboard', + standalone: true, + imports: [XProgressComponent], templateUrl: './dashboard.component.html', styleUrls: ['./dashboard.component.scss'] }) -export class ExDashboardComponent {} \ No newline at end of file +export class ExDashboardComponent {} diff --git a/lib/ng-nest/ui/progress/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/progress/examples/zh_CN/default/default/default.component.ts index cae54f2a5..8e9bd8197 100644 --- a/lib/ng-nest/ui/progress/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/progress/examples/zh_CN/default/default/default.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XProgressComponent } from '@ng-nest/ui/progress'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XProgressComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/progress/examples/zh_CN/default/format/format.component.ts b/lib/ng-nest/ui/progress/examples/zh_CN/default/format/format.component.ts index aca1bdd64..da13bd6da 100644 --- a/lib/ng-nest/ui/progress/examples/zh_CN/default/format/format.component.ts +++ b/lib/ng-nest/ui/progress/examples/zh_CN/default/format/format.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XProgressComponent } from '@ng-nest/ui/progress'; @Component({ selector: 'ex-format', + standalone: true, + imports: [XProgressComponent], templateUrl: './format.component.html', styleUrls: ['./format.component.scss'] }) diff --git a/lib/ng-nest/ui/progress/examples/zh_CN/default/gradient/gradient.component.ts b/lib/ng-nest/ui/progress/examples/zh_CN/default/gradient/gradient.component.ts index 9e2dca4a1..19f266506 100644 --- a/lib/ng-nest/ui/progress/examples/zh_CN/default/gradient/gradient.component.ts +++ b/lib/ng-nest/ui/progress/examples/zh_CN/default/gradient/gradient.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; +import { XProgressComponent } from '@ng-nest/ui/progress'; @Component({ selector: 'ex-gradient', + standalone: true, + imports: [XProgressComponent], templateUrl: './gradient.component.html', styleUrls: ['./gradient.component.scss'] }) -export class ExGradientComponent {} \ No newline at end of file +export class ExGradientComponent {} diff --git a/lib/ng-nest/ui/progress/examples/zh_CN/default/inside/inside.component.ts b/lib/ng-nest/ui/progress/examples/zh_CN/default/inside/inside.component.ts index b31c86488..5969b7c0b 100644 --- a/lib/ng-nest/ui/progress/examples/zh_CN/default/inside/inside.component.ts +++ b/lib/ng-nest/ui/progress/examples/zh_CN/default/inside/inside.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XProgressComponent } from '@ng-nest/ui/progress'; @Component({ selector: 'ex-inside', + standalone: true, + imports: [XProgressComponent], templateUrl: './inside.component.html', styleUrls: ['./inside.component.scss'] }) diff --git a/lib/ng-nest/ui/progress/examples/zh_CN/default/steps/steps.component.ts b/lib/ng-nest/ui/progress/examples/zh_CN/default/steps/steps.component.ts index 5119e7363..12116b758 100644 --- a/lib/ng-nest/ui/progress/examples/zh_CN/default/steps/steps.component.ts +++ b/lib/ng-nest/ui/progress/examples/zh_CN/default/steps/steps.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; +import { XProgressComponent } from '@ng-nest/ui/progress'; @Component({ selector: 'ex-steps', + standalone: true, + imports: [XProgressComponent], templateUrl: './steps.component.html', styleUrls: ['./steps.component.scss'] }) -export class ExStepsComponent {} \ No newline at end of file +export class ExStepsComponent {} diff --git a/lib/ng-nest/ui/progress/examples/zh_CN/default/subsection/subsection.component.ts b/lib/ng-nest/ui/progress/examples/zh_CN/default/subsection/subsection.component.ts index 9269838c8..dcf7ed46d 100644 --- a/lib/ng-nest/ui/progress/examples/zh_CN/default/subsection/subsection.component.ts +++ b/lib/ng-nest/ui/progress/examples/zh_CN/default/subsection/subsection.component.ts @@ -1,7 +1,12 @@ +import { CommonModule } from '@angular/common'; import { Component, OnInit } from '@angular/core'; +import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; +import { XProgressComponent } from '@ng-nest/ui/progress'; @Component({ selector: 'ex-subsection', + standalone: true, + imports: [CommonModule, XProgressComponent, XButtonComponent, XButtonsComponent], templateUrl: './subsection.component.html', styleUrls: ['./subsection.component.scss'] }) diff --git a/lib/ng-nest/ui/progress/progress.component.spec.ts b/lib/ng-nest/ui/progress/progress.component.spec.ts index 80b83da4f..edaa9cc58 100644 --- a/lib/ng-nest/ui/progress/progress.component.spec.ts +++ b/lib/ng-nest/ui/progress/progress.component.spec.ts @@ -1,17 +1,15 @@ import { XIconComponent } from '@ng-nest/ui/icon'; import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XProgressComponent } from './progress.component'; import { Component, DebugElement, ChangeDetectorRef } from '@angular/core'; import { By } from '@angular/platform-browser'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; -import { XProgressModule } from '@ng-nest/ui/progress'; +import { XProgressComponent } from '@ng-nest/ui/progress'; import { FormsModule } from '@angular/forms'; import { XProgressPrefix } from './progress.property'; import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; import { XContainerComponent } from '@ng-nest/ui/container'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XProgressPrefix, () => { @@ -20,9 +18,9 @@ describe(XProgressPrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, FormsModule, - XProgressModule, + XProgressComponent, XButtonComponent, XButtonsComponent, XContainerComponent, diff --git a/lib/ng-nest/ui/progress/progress.component.ts b/lib/ng-nest/ui/progress/progress.component.ts index 485725751..fcbebffe4 100644 --- a/lib/ng-nest/ui/progress/progress.component.ts +++ b/lib/ng-nest/ui/progress/progress.component.ts @@ -1,12 +1,10 @@ import { Component, ViewEncapsulation, - Renderer2, - ElementRef, - ChangeDetectorRef, ChangeDetectionStrategy, SimpleChanges, - OnChanges + OnChanges, + inject } from '@angular/core'; import { XProgressPrefix, XProgressProperty } from './progress.property'; import { @@ -20,9 +18,14 @@ import { XIsNumber } from '@ng-nest/ui/core'; import { XProgressColorNode } from './progress.property'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; +import { XIconComponent } from '@ng-nest/ui/icon'; @Component({ selector: `${XProgressPrefix}`, + standalone: true, + imports: [CommonModule, FormsModule, XIconComponent], templateUrl: './progress.component.html', styleUrls: ['./progress.component.scss'], encapsulation: ViewEncapsulation.None, @@ -41,14 +44,7 @@ export class XProgressComponent extends XProgressProperty implements OnChanges { return XIsNumber(this.percent) ? 100 - Number(this.percent) : 100; } - constructor( - public renderer: Renderer2, - public elementRef: ElementRef, - public cdr: ChangeDetectorRef, - public configService: XConfigService - ) { - super(); - } + configService = inject(XConfigService); ngOnChanges(simples: SimpleChanges) { const { status, percent, gradient, steps, type, notchAngle } = simples; @@ -99,9 +95,9 @@ export class XProgressComponent extends XProgressProperty implements OnChanges { } else { const { from, to, direction = 'to right', ...percents } = this.gradient || {}; if (Object.keys(percents).length !== 0) { - this.linearGradient = `linear-gradient(${direction}, ${this.sortGradient(percents as { [percent: string]: string }).map( - ({ key, value }) => `${value} ${key}%` - )})`; + this.linearGradient = `linear-gradient(${direction}, ${this.sortGradient( + percents as { [percent: string]: string } + ).map(({ key, value }) => `${value} ${key}%`)})`; return; } this.linearGradient = `linear-gradient(${direction}, ${from}, ${to})`; diff --git a/lib/ng-nest/ui/progress/progress.module.ts b/lib/ng-nest/ui/progress/progress.module.ts index 152f9adf3..07e6ee76f 100644 --- a/lib/ng-nest/ui/progress/progress.module.ts +++ b/lib/ng-nest/ui/progress/progress.module.ts @@ -1,13 +1,8 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { XProgressComponent } from './progress.component'; -import { FormsModule } from '@angular/forms'; -import { XIconComponent } from '@ng-nest/ui/icon'; -import { XProgressProperty } from './progress.property'; @NgModule({ - declarations: [XProgressComponent, XProgressProperty], exports: [XProgressComponent], - imports: [CommonModule, FormsModule, XIconComponent] + imports: [XProgressComponent] }) export class XProgressModule {} diff --git a/lib/ng-nest/ui/radio/examples/en_US/default/async/async.component.html b/lib/ng-nest/ui/radio/examples/en_US/default/async/async.component.html index d8e1647ad..d7c7a3124 100644 --- a/lib/ng-nest/ui/radio/examples/en_US/default/async/async.component.html +++ b/lib/ng-nest/ui/radio/examples/en_US/default/async/async.component.html @@ -1,11 +1,9 @@ - - - request - - - - - - - - +
+ request +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/radio/examples/en_US/default/async/async.component.scss b/lib/ng-nest/ui/radio/examples/en_US/default/async/async.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/radio/examples/en_US/default/async/async.component.scss +++ b/lib/ng-nest/ui/radio/examples/en_US/default/async/async.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/radio/examples/en_US/default/async/async.component.ts b/lib/ng-nest/ui/radio/examples/en_US/default/async/async.component.ts index 082805aa3..28d33b317 100644 --- a/lib/ng-nest/ui/radio/examples/en_US/default/async/async.component.ts +++ b/lib/ng-nest/ui/radio/examples/en_US/default/async/async.component.ts @@ -1,10 +1,15 @@ import { Component, OnInit } from '@angular/core'; -import { XRadioNode } from '@ng-nest/ui/radio'; +import { XRadioComponent, XRadioNode } from '@ng-nest/ui/radio'; import { XData } from '@ng-nest/ui/core'; import { Observable } from 'rxjs'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { FormsModule } from '@angular/forms'; +import { CommonModule } from '@angular/common'; @Component({ selector: 'ex-async', + standalone: true, + imports: [CommonModule, FormsModule, XButtonComponent, XRadioComponent], templateUrl: './async.component.html', styleUrls: ['./async.component.scss'] }) diff --git a/lib/ng-nest/ui/radio/examples/en_US/default/button/button.component.html b/lib/ng-nest/ui/radio/examples/en_US/default/button/button.component.html index 4bebf779f..4af75a7f9 100644 --- a/lib/ng-nest/ui/radio/examples/en_US/default/button/button.component.html +++ b/lib/ng-nest/ui/radio/examples/en_US/default/button/button.component.html @@ -1,17 +1,15 @@ - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/radio/examples/en_US/default/button/button.component.scss b/lib/ng-nest/ui/radio/examples/en_US/default/button/button.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/radio/examples/en_US/default/button/button.component.scss +++ b/lib/ng-nest/ui/radio/examples/en_US/default/button/button.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/radio/examples/en_US/default/button/button.component.ts b/lib/ng-nest/ui/radio/examples/en_US/default/button/button.component.ts index 7d7c67163..89260cbb4 100644 --- a/lib/ng-nest/ui/radio/examples/en_US/default/button/button.component.ts +++ b/lib/ng-nest/ui/radio/examples/en_US/default/button/button.component.ts @@ -1,9 +1,12 @@ import { Component } from '@angular/core'; -import { XRadioNode } from '@ng-nest/ui/radio'; +import { XRadioComponent, XRadioNode } from '@ng-nest/ui/radio'; import { XData } from '@ng-nest/ui/core'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'ex-button', + standalone: true, + imports: [FormsModule, XRadioComponent], templateUrl: './button.component.html', styleUrls: ['./button.component.scss'] }) diff --git a/lib/ng-nest/ui/radio/examples/en_US/default/default/default.component.html b/lib/ng-nest/ui/radio/examples/en_US/default/default/default.component.html index 4a5ca50b8..95fa033a9 100644 --- a/lib/ng-nest/ui/radio/examples/en_US/default/default/default.component.html +++ b/lib/ng-nest/ui/radio/examples/en_US/default/default/default.component.html @@ -1,8 +1,6 @@ - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/radio/examples/en_US/default/default/default.component.scss b/lib/ng-nest/ui/radio/examples/en_US/default/default/default.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/radio/examples/en_US/default/default/default.component.scss +++ b/lib/ng-nest/ui/radio/examples/en_US/default/default/default.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/radio/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/radio/examples/en_US/default/default/default.component.ts index 3cc4f24a2..c0c6f5cb1 100644 --- a/lib/ng-nest/ui/radio/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/radio/examples/en_US/default/default/default.component.ts @@ -1,9 +1,12 @@ import { Component } from '@angular/core'; -import { XRadioNode } from '@ng-nest/ui/radio'; +import { XRadioComponent, XRadioNode } from '@ng-nest/ui/radio'; import { XData } from '@ng-nest/ui/core'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'ex-default', + standalone: true, + imports: [FormsModule, XRadioComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/radio/examples/en_US/default/disabled/disabled.component.html b/lib/ng-nest/ui/radio/examples/en_US/default/disabled/disabled.component.html index 4f268351c..788be800b 100644 --- a/lib/ng-nest/ui/radio/examples/en_US/default/disabled/disabled.component.html +++ b/lib/ng-nest/ui/radio/examples/en_US/default/disabled/disabled.component.html @@ -1,11 +1,9 @@ - - - - - - - - - - - +
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/radio/examples/en_US/default/disabled/disabled.component.scss b/lib/ng-nest/ui/radio/examples/en_US/default/disabled/disabled.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/radio/examples/en_US/default/disabled/disabled.component.scss +++ b/lib/ng-nest/ui/radio/examples/en_US/default/disabled/disabled.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/radio/examples/en_US/default/disabled/disabled.component.ts b/lib/ng-nest/ui/radio/examples/en_US/default/disabled/disabled.component.ts index c34664d74..e5929b621 100644 --- a/lib/ng-nest/ui/radio/examples/en_US/default/disabled/disabled.component.ts +++ b/lib/ng-nest/ui/radio/examples/en_US/default/disabled/disabled.component.ts @@ -1,9 +1,12 @@ import { Component } from '@angular/core'; -import { XRadioNode } from '@ng-nest/ui/radio'; +import { XRadioComponent, XRadioNode } from '@ng-nest/ui/radio'; import { XData } from '@ng-nest/ui/core'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'ex-disabled', + standalone: true, + imports: [FormsModule, XRadioComponent], templateUrl: './disabled.component.html', styleUrls: ['./disabled.component.scss'] }) diff --git a/lib/ng-nest/ui/radio/examples/en_US/default/icon/icon.component.html b/lib/ng-nest/ui/radio/examples/en_US/default/icon/icon.component.html index 15c1fe690..92c2d8dbf 100644 --- a/lib/ng-nest/ui/radio/examples/en_US/default/icon/icon.component.html +++ b/lib/ng-nest/ui/radio/examples/en_US/default/icon/icon.component.html @@ -1,17 +1,15 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/radio/examples/en_US/default/icon/icon.component.scss b/lib/ng-nest/ui/radio/examples/en_US/default/icon/icon.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/radio/examples/en_US/default/icon/icon.component.scss +++ b/lib/ng-nest/ui/radio/examples/en_US/default/icon/icon.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/radio/examples/en_US/default/icon/icon.component.ts b/lib/ng-nest/ui/radio/examples/en_US/default/icon/icon.component.ts index c3158f81f..c9cfb51da 100644 --- a/lib/ng-nest/ui/radio/examples/en_US/default/icon/icon.component.ts +++ b/lib/ng-nest/ui/radio/examples/en_US/default/icon/icon.component.ts @@ -1,9 +1,12 @@ import { Component, OnInit } from '@angular/core'; -import { XRadioNode } from '@ng-nest/ui/radio'; +import { XRadioComponent, XRadioNode } from '@ng-nest/ui/radio'; import { XData } from '@ng-nest/ui/core'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'ex-icon', + standalone: true, + imports: [FormsModule, XRadioComponent], templateUrl: './icon.component.html', styleUrls: ['./icon.component.scss'] }) diff --git a/lib/ng-nest/ui/radio/examples/en_US/default/perpost/perpost.component.html b/lib/ng-nest/ui/radio/examples/en_US/default/perpost/perpost.component.html index 10f711a6b..eaacc39be 100644 --- a/lib/ng-nest/ui/radio/examples/en_US/default/perpost/perpost.component.html +++ b/lib/ng-nest/ui/radio/examples/en_US/default/perpost/perpost.component.html @@ -1,59 +1,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ diff --git a/lib/ng-nest/ui/radio/examples/en_US/default/perpost/perpost.component.scss b/lib/ng-nest/ui/radio/examples/en_US/default/perpost/perpost.component.scss index 8f68af560..9fe6d3984 100644 --- a/lib/ng-nest/ui/radio/examples/en_US/default/perpost/perpost.component.scss +++ b/lib/ng-nest/ui/radio/examples/en_US/default/perpost/perpost.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } \ No newline at end of file diff --git a/lib/ng-nest/ui/radio/examples/en_US/default/perpost/perpost.component.ts b/lib/ng-nest/ui/radio/examples/en_US/default/perpost/perpost.component.ts index ed0eb71de..c0d6eb261 100644 --- a/lib/ng-nest/ui/radio/examples/en_US/default/perpost/perpost.component.ts +++ b/lib/ng-nest/ui/radio/examples/en_US/default/perpost/perpost.component.ts @@ -1,9 +1,33 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XAutoCompleteComponent } from '@ng-nest/ui/auto-complete'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XCascadeComponent } from '@ng-nest/ui/cascade'; +import { XColorPickerComponent } from '@ng-nest/ui/color-picker'; import { XData } from '@ng-nest/ui/core'; -import { XRadioNode } from '@ng-nest/ui/radio'; +import { XDatePickerComponent } from '@ng-nest/ui/date-picker'; +import { XInputComponent } from '@ng-nest/ui/input'; +import { XRadioComponent, XRadioNode } from '@ng-nest/ui/radio'; +import { XSelectComponent } from '@ng-nest/ui/select'; +import { XTimePickerModule } from '@ng-nest/ui/time-picker'; @Component({ selector: 'ex-perpost', + standalone: true, + imports: [ + CommonModule, + FormsModule, + XRadioComponent, + XSelectComponent, + XButtonComponent, + XInputComponent, + XDatePickerComponent, + XAutoCompleteComponent, + XCascadeComponent, + XColorPickerComponent, + XTimePickerModule + ], templateUrl: './perpost.component.html', styleUrls: ['./perpost.component.scss'] }) diff --git a/lib/ng-nest/ui/radio/examples/en_US/default/tag/tag.component.html b/lib/ng-nest/ui/radio/examples/en_US/default/tag/tag.component.html index b385b8861..022423954 100644 --- a/lib/ng-nest/ui/radio/examples/en_US/default/tag/tag.component.html +++ b/lib/ng-nest/ui/radio/examples/en_US/default/tag/tag.component.html @@ -2,7 +2,14 @@

Style

- +
Style >
- +
- +
- +
- +
- +

Example

@@ -71,5 +118,7 @@

Example

Selected Data: - {{ item }} + {{ + item + }}
diff --git a/lib/ng-nest/ui/radio/examples/en_US/default/tag/tag.component.ts b/lib/ng-nest/ui/radio/examples/en_US/default/tag/tag.component.ts index 9408729ee..a8938d713 100644 --- a/lib/ng-nest/ui/radio/examples/en_US/default/tag/tag.component.ts +++ b/lib/ng-nest/ui/radio/examples/en_US/default/tag/tag.component.ts @@ -1,8 +1,14 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; import { XIsEmpty } from '@ng-nest/ui/core'; +import { XRadioComponent } from '@ng-nest/ui/radio'; +import { XTagComponent } from '@ng-nest/ui/tag'; @Component({ selector: 'ex-tag', + standalone: true, + imports: [CommonModule, FormsModule, XRadioComponent, XTagComponent], templateUrl: './tag.component.html', styleUrls: ['./tag.component.scss'] }) diff --git a/lib/ng-nest/ui/radio/examples/index.ts b/lib/ng-nest/ui/radio/examples/index.ts new file mode 100644 index 000000000..3636387ce --- /dev/null +++ b/lib/ng-nest/ui/radio/examples/index.ts @@ -0,0 +1,7 @@ +export * from './zh_CN/default/async/async.component'; +export * from './zh_CN/default/button/button.component'; +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/disabled/disabled.component'; +export * from './zh_CN/default/icon/icon.component'; +export * from './zh_CN/default/perpost/perpost.component'; +export * from './zh_CN/default/tag/tag.component'; diff --git a/lib/ng-nest/ui/radio/examples/zh_CN/default/async/async.component.html b/lib/ng-nest/ui/radio/examples/zh_CN/default/async/async.component.html index 6c92f65e9..a8590d406 100644 --- a/lib/ng-nest/ui/radio/examples/zh_CN/default/async/async.component.html +++ b/lib/ng-nest/ui/radio/examples/zh_CN/default/async/async.component.html @@ -1,11 +1,9 @@ - - - 请求 - - - - - - - - +
+ 请求 +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/radio/examples/zh_CN/default/async/async.component.scss b/lib/ng-nest/ui/radio/examples/zh_CN/default/async/async.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/radio/examples/zh_CN/default/async/async.component.scss +++ b/lib/ng-nest/ui/radio/examples/zh_CN/default/async/async.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/radio/examples/zh_CN/default/async/async.component.ts b/lib/ng-nest/ui/radio/examples/zh_CN/default/async/async.component.ts index 1fe646aa7..c822f69ca 100644 --- a/lib/ng-nest/ui/radio/examples/zh_CN/default/async/async.component.ts +++ b/lib/ng-nest/ui/radio/examples/zh_CN/default/async/async.component.ts @@ -1,10 +1,15 @@ import { Component, OnInit } from '@angular/core'; -import { XRadioNode } from '@ng-nest/ui/radio'; +import { XRadioComponent, XRadioNode } from '@ng-nest/ui/radio'; import { XData } from '@ng-nest/ui/core'; import { Observable } from 'rxjs'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { FormsModule } from '@angular/forms'; +import { CommonModule } from '@angular/common'; @Component({ selector: 'ex-async', + standalone: true, + imports: [CommonModule, FormsModule, XButtonComponent, XRadioComponent], templateUrl: './async.component.html', styleUrls: ['./async.component.scss'] }) diff --git a/lib/ng-nest/ui/radio/examples/zh_CN/default/button/button.component.html b/lib/ng-nest/ui/radio/examples/zh_CN/default/button/button.component.html index 4bebf779f..4af75a7f9 100644 --- a/lib/ng-nest/ui/radio/examples/zh_CN/default/button/button.component.html +++ b/lib/ng-nest/ui/radio/examples/zh_CN/default/button/button.component.html @@ -1,17 +1,15 @@ - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/radio/examples/zh_CN/default/button/button.component.scss b/lib/ng-nest/ui/radio/examples/zh_CN/default/button/button.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/radio/examples/zh_CN/default/button/button.component.scss +++ b/lib/ng-nest/ui/radio/examples/zh_CN/default/button/button.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/radio/examples/zh_CN/default/button/button.component.ts b/lib/ng-nest/ui/radio/examples/zh_CN/default/button/button.component.ts index dff5975ba..a43893952 100644 --- a/lib/ng-nest/ui/radio/examples/zh_CN/default/button/button.component.ts +++ b/lib/ng-nest/ui/radio/examples/zh_CN/default/button/button.component.ts @@ -1,9 +1,12 @@ import { Component } from '@angular/core'; -import { XRadioNode } from '@ng-nest/ui/radio'; +import { XRadioComponent, XRadioNode } from '@ng-nest/ui/radio'; import { XData } from '@ng-nest/ui/core'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'ex-button', + standalone: true, + imports: [FormsModule, XRadioComponent], templateUrl: './button.component.html', styleUrls: ['./button.component.scss'] }) diff --git a/lib/ng-nest/ui/radio/examples/zh_CN/default/default/default.component.html b/lib/ng-nest/ui/radio/examples/zh_CN/default/default/default.component.html index 4a5ca50b8..95fa033a9 100644 --- a/lib/ng-nest/ui/radio/examples/zh_CN/default/default/default.component.html +++ b/lib/ng-nest/ui/radio/examples/zh_CN/default/default/default.component.html @@ -1,8 +1,6 @@ - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/radio/examples/zh_CN/default/default/default.component.scss b/lib/ng-nest/ui/radio/examples/zh_CN/default/default/default.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/radio/examples/zh_CN/default/default/default.component.scss +++ b/lib/ng-nest/ui/radio/examples/zh_CN/default/default/default.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/radio/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/radio/examples/zh_CN/default/default/default.component.ts index f95b98d7d..e0d14cf49 100644 --- a/lib/ng-nest/ui/radio/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/radio/examples/zh_CN/default/default/default.component.ts @@ -1,9 +1,12 @@ import { Component } from '@angular/core'; -import { XRadioNode } from '@ng-nest/ui/radio'; +import { XRadioComponent, XRadioNode } from '@ng-nest/ui/radio'; import { XData } from '@ng-nest/ui/core'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'ex-default', + standalone: true, + imports: [FormsModule, XRadioComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/radio/examples/zh_CN/default/disabled/disabled.component.html b/lib/ng-nest/ui/radio/examples/zh_CN/default/disabled/disabled.component.html index 4f268351c..788be800b 100644 --- a/lib/ng-nest/ui/radio/examples/zh_CN/default/disabled/disabled.component.html +++ b/lib/ng-nest/ui/radio/examples/zh_CN/default/disabled/disabled.component.html @@ -1,11 +1,9 @@ - - - - - - - - - - - +
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/radio/examples/zh_CN/default/disabled/disabled.component.scss b/lib/ng-nest/ui/radio/examples/zh_CN/default/disabled/disabled.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/radio/examples/zh_CN/default/disabled/disabled.component.scss +++ b/lib/ng-nest/ui/radio/examples/zh_CN/default/disabled/disabled.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/radio/examples/zh_CN/default/disabled/disabled.component.ts b/lib/ng-nest/ui/radio/examples/zh_CN/default/disabled/disabled.component.ts index da33243b7..129a95546 100644 --- a/lib/ng-nest/ui/radio/examples/zh_CN/default/disabled/disabled.component.ts +++ b/lib/ng-nest/ui/radio/examples/zh_CN/default/disabled/disabled.component.ts @@ -1,9 +1,12 @@ import { Component } from '@angular/core'; -import { XRadioNode } from '@ng-nest/ui/radio'; +import { XRadioComponent, XRadioNode } from '@ng-nest/ui/radio'; import { XData } from '@ng-nest/ui/core'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'ex-disabled', + standalone: true, + imports: [FormsModule, XRadioComponent], templateUrl: './disabled.component.html', styleUrls: ['./disabled.component.scss'] }) diff --git a/lib/ng-nest/ui/radio/examples/zh_CN/default/icon/icon.component.html b/lib/ng-nest/ui/radio/examples/zh_CN/default/icon/icon.component.html index 15c1fe690..92c2d8dbf 100644 --- a/lib/ng-nest/ui/radio/examples/zh_CN/default/icon/icon.component.html +++ b/lib/ng-nest/ui/radio/examples/zh_CN/default/icon/icon.component.html @@ -1,17 +1,15 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/radio/examples/zh_CN/default/icon/icon.component.scss b/lib/ng-nest/ui/radio/examples/zh_CN/default/icon/icon.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/radio/examples/zh_CN/default/icon/icon.component.scss +++ b/lib/ng-nest/ui/radio/examples/zh_CN/default/icon/icon.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/radio/examples/zh_CN/default/icon/icon.component.ts b/lib/ng-nest/ui/radio/examples/zh_CN/default/icon/icon.component.ts index eb720a55c..da09c2279 100644 --- a/lib/ng-nest/ui/radio/examples/zh_CN/default/icon/icon.component.ts +++ b/lib/ng-nest/ui/radio/examples/zh_CN/default/icon/icon.component.ts @@ -1,9 +1,12 @@ import { Component, OnInit } from '@angular/core'; -import { XRadioNode } from '@ng-nest/ui/radio'; +import { XRadioComponent, XRadioNode } from '@ng-nest/ui/radio'; import { XData } from '@ng-nest/ui/core'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'ex-icon', + standalone: true, + imports: [FormsModule, XRadioComponent], templateUrl: './icon.component.html', styleUrls: ['./icon.component.scss'] }) diff --git a/lib/ng-nest/ui/radio/examples/zh_CN/default/perpost/perpost.component.html b/lib/ng-nest/ui/radio/examples/zh_CN/default/perpost/perpost.component.html index 55f27b314..0db301c34 100644 --- a/lib/ng-nest/ui/radio/examples/zh_CN/default/perpost/perpost.component.html +++ b/lib/ng-nest/ui/radio/examples/zh_CN/default/perpost/perpost.component.html @@ -1,59 +1,57 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/radio/examples/zh_CN/default/perpost/perpost.component.scss b/lib/ng-nest/ui/radio/examples/zh_CN/default/perpost/perpost.component.scss index 8f68af560..b4943baa0 100644 --- a/lib/ng-nest/ui/radio/examples/zh_CN/default/perpost/perpost.component.scss +++ b/lib/ng-nest/ui/radio/examples/zh_CN/default/perpost/perpost.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } -} \ No newline at end of file +} diff --git a/lib/ng-nest/ui/radio/examples/zh_CN/default/perpost/perpost.component.ts b/lib/ng-nest/ui/radio/examples/zh_CN/default/perpost/perpost.component.ts index ed0eb71de..c0d6eb261 100644 --- a/lib/ng-nest/ui/radio/examples/zh_CN/default/perpost/perpost.component.ts +++ b/lib/ng-nest/ui/radio/examples/zh_CN/default/perpost/perpost.component.ts @@ -1,9 +1,33 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XAutoCompleteComponent } from '@ng-nest/ui/auto-complete'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XCascadeComponent } from '@ng-nest/ui/cascade'; +import { XColorPickerComponent } from '@ng-nest/ui/color-picker'; import { XData } from '@ng-nest/ui/core'; -import { XRadioNode } from '@ng-nest/ui/radio'; +import { XDatePickerComponent } from '@ng-nest/ui/date-picker'; +import { XInputComponent } from '@ng-nest/ui/input'; +import { XRadioComponent, XRadioNode } from '@ng-nest/ui/radio'; +import { XSelectComponent } from '@ng-nest/ui/select'; +import { XTimePickerModule } from '@ng-nest/ui/time-picker'; @Component({ selector: 'ex-perpost', + standalone: true, + imports: [ + CommonModule, + FormsModule, + XRadioComponent, + XSelectComponent, + XButtonComponent, + XInputComponent, + XDatePickerComponent, + XAutoCompleteComponent, + XCascadeComponent, + XColorPickerComponent, + XTimePickerModule + ], templateUrl: './perpost.component.html', styleUrls: ['./perpost.component.scss'] }) diff --git a/lib/ng-nest/ui/radio/examples/zh_CN/default/tag/tag.component.ts b/lib/ng-nest/ui/radio/examples/zh_CN/default/tag/tag.component.ts index 53d21e6e3..10b2a33e2 100644 --- a/lib/ng-nest/ui/radio/examples/zh_CN/default/tag/tag.component.ts +++ b/lib/ng-nest/ui/radio/examples/zh_CN/default/tag/tag.component.ts @@ -1,8 +1,14 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; import { XIsEmpty } from '@ng-nest/ui/core'; +import { XRadioComponent } from '@ng-nest/ui/radio'; +import { XTagComponent } from '@ng-nest/ui/tag'; @Component({ selector: 'ex-tag', + standalone: true, + imports: [CommonModule, FormsModule, XRadioComponent, XTagComponent], templateUrl: './tag.component.html', styleUrls: ['./tag.component.scss'] }) diff --git a/lib/ng-nest/ui/radio/radio.component.spec.ts b/lib/ng-nest/ui/radio/radio.component.spec.ts index c3ce32c6a..41e286628 100644 --- a/lib/ng-nest/ui/radio/radio.component.spec.ts +++ b/lib/ng-nest/ui/radio/radio.component.spec.ts @@ -1,27 +1,25 @@ import { XButtonComponent } from '@ng-nest/ui/button'; import { Observable } from 'rxjs'; import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XRadioComponent } from './radio.component'; import { Component, DebugElement, ChangeDetectorRef } from '@angular/core'; import { By } from '@angular/platform-browser'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; import { FormsModule } from '@angular/forms'; import { XRadioPrefix, XRadioNode } from './radio.property'; import { XData } from '@ng-nest/ui/core'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; -import { XSelectModule } from '@ng-nest/ui/select'; +import { XThemeComponent } from '@ng-nest/ui/theme'; +import { XSelectComponent } from '@ng-nest/ui/select'; import { XDatePickerComponent } from '@ng-nest/ui/date-picker'; import { XAutoCompleteComponent } from '@ng-nest/ui/auto-complete'; import { XCascadeComponent } from '@ng-nest/ui/cascade'; import { XColorPickerComponent } from '@ng-nest/ui/color-picker'; import { XFindComponent } from '@ng-nest/ui/find'; -import { XTextareaModule } from '@ng-nest/ui/textarea'; +import { XTextareaComponent } from '@ng-nest/ui/textarea'; import { XTimePickerModule } from '@ng-nest/ui/time-picker'; import { XInputComponent } from '@ng-nest/ui/input'; -import { XTagModule } from '@ng-nest/ui/tag'; +import { XTagComponent } from '@ng-nest/ui/tag'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XRadioPrefix, () => { @@ -30,11 +28,11 @@ describe(XRadioPrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, FormsModule, - XRadioModule, + XRadioComponent, XAutoCompleteComponent, - XSelectModule, + XSelectComponent, XDatePickerComponent, XButtonComponent, XRowComponent, @@ -42,10 +40,10 @@ describe(XRadioPrefix, () => { XCascadeComponent, XColorPickerComponent, XFindComponent, - XTextareaModule, + XTextareaComponent, XTimePickerModule, XInputComponent, - XTagModule + XTagComponent ], declarations: [ TestXRadioComponent, diff --git a/lib/ng-nest/ui/radio/radio.component.ts b/lib/ng-nest/ui/radio/radio.component.ts index 5e245d2cc..d7f43f8c1 100644 --- a/lib/ng-nest/ui/radio/radio.component.ts +++ b/lib/ng-nest/ui/radio/radio.component.ts @@ -8,22 +8,32 @@ import { OnChanges, SimpleChanges, ViewChild, - TemplateRef + TemplateRef, + inject, + OnDestroy, + OnInit } from '@angular/core'; import { XRadioPrefix, XRadioNode, XRadioProperty } from './radio.property'; import { Subject } from 'rxjs'; import { XIsChange, XSetData, XClearClass, XConfigService } from '@ng-nest/ui/core'; import { XValueAccessor } from '@ng-nest/ui/base-form'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; +import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; +import { XTagComponent } from '@ng-nest/ui/tag'; +import { XOutletDirective } from '@ng-nest/ui/outlet'; @Component({ selector: `${XRadioPrefix}`, + standalone: true, + imports: [CommonModule, FormsModule, XButtonComponent, XButtonsComponent, XTagComponent, XOutletDirective], templateUrl: './radio.component.html', styleUrls: ['./radio.component.scss'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, providers: [XValueAccessor(XRadioComponent)] }) -export class XRadioComponent extends XRadioProperty implements OnChanges { +export class XRadioComponent extends XRadioProperty implements OnInit, OnChanges, OnDestroy { @ViewChild('radio', { static: true }) radio!: ElementRef; nodes: XRadioNode[] = []; radioType!: 'initial' | 'button' | 'icon' | 'tag'; @@ -37,14 +47,9 @@ export class XRadioComponent extends XRadioProperty implements OnChanges { return this.after instanceof TemplateRef; } - constructor( - public renderer: Renderer2, - public elementRef: ElementRef, - public override cdr: ChangeDetectorRef, - public configService: XConfigService - ) { - super(); - } + private renderer = inject(Renderer2); + override cdr = inject(ChangeDetectorRef); + configService = inject(XConfigService); ngOnInit() { this.setFlex(this.radio.nativeElement, this.renderer, this.justify, this.align, this.direction); diff --git a/lib/ng-nest/ui/radio/radio.module.ts b/lib/ng-nest/ui/radio/radio.module.ts index 4dc70e7c6..a85bfd361 100644 --- a/lib/ng-nest/ui/radio/radio.module.ts +++ b/lib/ng-nest/ui/radio/radio.module.ts @@ -1,24 +1,8 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { XRadioComponent } from './radio.component'; -import { FormsModule } from '@angular/forms'; -import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; -import { XRadioProperty } from './radio.property'; -import { XControlValueAccessor } from '@ng-nest/ui/base-form'; -import { XOutletDirective } from '@ng-nest/ui/outlet'; -import { XTagModule } from '@ng-nest/ui/tag'; @NgModule({ - declarations: [XRadioComponent, XRadioProperty], exports: [XRadioComponent], - imports: [ - CommonModule, - FormsModule, - XButtonComponent, - XButtonsComponent, - XTagModule, - XOutletDirective, - XControlValueAccessor - ] + imports: [XRadioComponent] }) export class XRadioModule {} diff --git a/lib/ng-nest/ui/rate/examples/en_US/default/color/color.component.html b/lib/ng-nest/ui/rate/examples/en_US/default/color/color.component.html index 402b430b6..a1c264e56 100644 --- a/lib/ng-nest/ui/rate/examples/en_US/default/color/color.component.html +++ b/lib/ng-nest/ui/rate/examples/en_US/default/color/color.component.html @@ -1,28 +1,26 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ +
+ +
+0 diff --git a/lib/ng-nest/ui/rate/examples/en_US/default/color/color.component.scss b/lib/ng-nest/ui/rate/examples/en_US/default/color/color.component.scss index c06f63edb..5ce40fc67 100644 --- a/lib/ng-nest/ui/rate/examples/en_US/default/color/color.component.scss +++ b/lib/ng-nest/ui/rate/examples/en_US/default/color/color.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 0.5rem; } } diff --git a/lib/ng-nest/ui/rate/examples/en_US/default/color/color.component.ts b/lib/ng-nest/ui/rate/examples/en_US/default/color/color.component.ts index b820cd22a..4876cf2c3 100644 --- a/lib/ng-nest/ui/rate/examples/en_US/default/color/color.component.ts +++ b/lib/ng-nest/ui/rate/examples/en_US/default/color/color.component.ts @@ -1,7 +1,12 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XRateComponent } from '@ng-nest/ui/rate'; @Component({ selector: 'ex-color', + standalone: true, + imports: [FormsModule, XRateComponent, XIconComponent], templateUrl: './color.component.html', styleUrls: ['./color.component.scss'] }) diff --git a/lib/ng-nest/ui/rate/examples/en_US/default/custom/custom.component.html b/lib/ng-nest/ui/rate/examples/en_US/default/custom/custom.component.html index a3889366c..f77b6b946 100644 --- a/lib/ng-nest/ui/rate/examples/en_US/default/custom/custom.component.html +++ b/lib/ng-nest/ui/rate/examples/en_US/default/custom/custom.component.html @@ -1,18 +1,12 @@ - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
X 田 diff --git a/lib/ng-nest/ui/rate/examples/en_US/default/custom/custom.component.scss b/lib/ng-nest/ui/rate/examples/en_US/default/custom/custom.component.scss index 20401c970..b4943baa0 100644 --- a/lib/ng-nest/ui/rate/examples/en_US/default/custom/custom.component.scss +++ b/lib/ng-nest/ui/rate/examples/en_US/default/custom/custom.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } - x-row > x-col { - width: 14rem; - } } diff --git a/lib/ng-nest/ui/rate/examples/en_US/default/custom/custom.component.ts b/lib/ng-nest/ui/rate/examples/en_US/default/custom/custom.component.ts index 0b33e2aa0..16210dcde 100644 --- a/lib/ng-nest/ui/rate/examples/en_US/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/rate/examples/en_US/default/custom/custom.component.ts @@ -1,7 +1,12 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XRateComponent } from '@ng-nest/ui/rate'; @Component({ selector: 'ex-custom', + standalone: true, + imports: [FormsModule, XRateComponent, XIconComponent], templateUrl: './custom.component.html', styleUrls: ['./custom.component.scss'] }) diff --git a/lib/ng-nest/ui/rate/examples/en_US/default/default/default.component.html b/lib/ng-nest/ui/rate/examples/en_US/default/default/default.component.html index d04b76451..bda38edf5 100644 --- a/lib/ng-nest/ui/rate/examples/en_US/default/default/default.component.html +++ b/lib/ng-nest/ui/rate/examples/en_US/default/default/default.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/rate/examples/en_US/default/default/default.component.scss b/lib/ng-nest/ui/rate/examples/en_US/default/default/default.component.scss index 20401c970..b4943baa0 100644 --- a/lib/ng-nest/ui/rate/examples/en_US/default/default/default.component.scss +++ b/lib/ng-nest/ui/rate/examples/en_US/default/default/default.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } - x-row > x-col { - width: 14rem; - } } diff --git a/lib/ng-nest/ui/rate/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/rate/examples/en_US/default/default/default.component.ts index a586910a8..d883d9a33 100644 --- a/lib/ng-nest/ui/rate/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/rate/examples/en_US/default/default/default.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XRateComponent } from '@ng-nest/ui/rate'; @Component({ selector: 'ex-default', + standalone: true, + imports: [FormsModule, XRateComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/rate/examples/en_US/default/disabled/disabled.component.html b/lib/ng-nest/ui/rate/examples/en_US/default/disabled/disabled.component.html index 536fcffa3..e28acc923 100644 --- a/lib/ng-nest/ui/rate/examples/en_US/default/disabled/disabled.component.html +++ b/lib/ng-nest/ui/rate/examples/en_US/default/disabled/disabled.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/rate/examples/en_US/default/disabled/disabled.component.scss b/lib/ng-nest/ui/rate/examples/en_US/default/disabled/disabled.component.scss index 20401c970..b4943baa0 100644 --- a/lib/ng-nest/ui/rate/examples/en_US/default/disabled/disabled.component.scss +++ b/lib/ng-nest/ui/rate/examples/en_US/default/disabled/disabled.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } - x-row > x-col { - width: 14rem; - } } diff --git a/lib/ng-nest/ui/rate/examples/en_US/default/disabled/disabled.component.ts b/lib/ng-nest/ui/rate/examples/en_US/default/disabled/disabled.component.ts index f764fcb41..7716c0b1d 100644 --- a/lib/ng-nest/ui/rate/examples/en_US/default/disabled/disabled.component.ts +++ b/lib/ng-nest/ui/rate/examples/en_US/default/disabled/disabled.component.ts @@ -1,7 +1,11 @@ import { Component, OnInit } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XRateComponent } from '@ng-nest/ui/rate'; @Component({ selector: 'ex-disabled', + standalone: true, + imports: [FormsModule, XRateComponent], templateUrl: './disabled.component.html', styleUrls: ['./disabled.component.scss'] }) diff --git a/lib/ng-nest/ui/rate/examples/en_US/default/half/half.component.html b/lib/ng-nest/ui/rate/examples/en_US/default/half/half.component.html index 929cb446c..65f8fd21c 100644 --- a/lib/ng-nest/ui/rate/examples/en_US/default/half/half.component.html +++ b/lib/ng-nest/ui/rate/examples/en_US/default/half/half.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/rate/examples/en_US/default/half/half.component.scss b/lib/ng-nest/ui/rate/examples/en_US/default/half/half.component.scss index 20401c970..b4943baa0 100644 --- a/lib/ng-nest/ui/rate/examples/en_US/default/half/half.component.scss +++ b/lib/ng-nest/ui/rate/examples/en_US/default/half/half.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } - x-row > x-col { - width: 14rem; - } } diff --git a/lib/ng-nest/ui/rate/examples/en_US/default/half/half.component.ts b/lib/ng-nest/ui/rate/examples/en_US/default/half/half.component.ts index e74007317..8c853ac0b 100644 --- a/lib/ng-nest/ui/rate/examples/en_US/default/half/half.component.ts +++ b/lib/ng-nest/ui/rate/examples/en_US/default/half/half.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XRateComponent } from '@ng-nest/ui/rate'; @Component({ selector: 'ex-half', + standalone: true, + imports: [FormsModule, XRateComponent], templateUrl: './half.component.html', styleUrls: ['./half.component.scss'] }) diff --git a/lib/ng-nest/ui/rate/examples/index.ts b/lib/ng-nest/ui/rate/examples/index.ts new file mode 100644 index 000000000..713fedb54 --- /dev/null +++ b/lib/ng-nest/ui/rate/examples/index.ts @@ -0,0 +1,5 @@ +export * from './zh_CN/default/color/color.component'; +export * from './zh_CN/default/custom/custom.component'; +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/disabled/disabled.component'; +export * from './zh_CN/default/half/half.component'; diff --git a/lib/ng-nest/ui/rate/examples/zh_CN/default/color/color.component.html b/lib/ng-nest/ui/rate/examples/zh_CN/default/color/color.component.html index 402b430b6..a1c264e56 100644 --- a/lib/ng-nest/ui/rate/examples/zh_CN/default/color/color.component.html +++ b/lib/ng-nest/ui/rate/examples/zh_CN/default/color/color.component.html @@ -1,28 +1,26 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ +
+ +
+0 diff --git a/lib/ng-nest/ui/rate/examples/zh_CN/default/color/color.component.scss b/lib/ng-nest/ui/rate/examples/zh_CN/default/color/color.component.scss index c06f63edb..5ce40fc67 100644 --- a/lib/ng-nest/ui/rate/examples/zh_CN/default/color/color.component.scss +++ b/lib/ng-nest/ui/rate/examples/zh_CN/default/color/color.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 0.5rem; } } diff --git a/lib/ng-nest/ui/rate/examples/zh_CN/default/color/color.component.ts b/lib/ng-nest/ui/rate/examples/zh_CN/default/color/color.component.ts index b820cd22a..4876cf2c3 100644 --- a/lib/ng-nest/ui/rate/examples/zh_CN/default/color/color.component.ts +++ b/lib/ng-nest/ui/rate/examples/zh_CN/default/color/color.component.ts @@ -1,7 +1,12 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XRateComponent } from '@ng-nest/ui/rate'; @Component({ selector: 'ex-color', + standalone: true, + imports: [FormsModule, XRateComponent, XIconComponent], templateUrl: './color.component.html', styleUrls: ['./color.component.scss'] }) diff --git a/lib/ng-nest/ui/rate/examples/zh_CN/default/custom/custom.component.html b/lib/ng-nest/ui/rate/examples/zh_CN/default/custom/custom.component.html index a3889366c..f77b6b946 100644 --- a/lib/ng-nest/ui/rate/examples/zh_CN/default/custom/custom.component.html +++ b/lib/ng-nest/ui/rate/examples/zh_CN/default/custom/custom.component.html @@ -1,18 +1,12 @@ - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
X 田 diff --git a/lib/ng-nest/ui/rate/examples/zh_CN/default/custom/custom.component.scss b/lib/ng-nest/ui/rate/examples/zh_CN/default/custom/custom.component.scss index 20401c970..b4943baa0 100644 --- a/lib/ng-nest/ui/rate/examples/zh_CN/default/custom/custom.component.scss +++ b/lib/ng-nest/ui/rate/examples/zh_CN/default/custom/custom.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } - x-row > x-col { - width: 14rem; - } } diff --git a/lib/ng-nest/ui/rate/examples/zh_CN/default/custom/custom.component.ts b/lib/ng-nest/ui/rate/examples/zh_CN/default/custom/custom.component.ts index 0b33e2aa0..16210dcde 100644 --- a/lib/ng-nest/ui/rate/examples/zh_CN/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/rate/examples/zh_CN/default/custom/custom.component.ts @@ -1,7 +1,12 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XRateComponent } from '@ng-nest/ui/rate'; @Component({ selector: 'ex-custom', + standalone: true, + imports: [FormsModule, XRateComponent, XIconComponent], templateUrl: './custom.component.html', styleUrls: ['./custom.component.scss'] }) diff --git a/lib/ng-nest/ui/rate/examples/zh_CN/default/default/default.component.html b/lib/ng-nest/ui/rate/examples/zh_CN/default/default/default.component.html index d04b76451..bda38edf5 100644 --- a/lib/ng-nest/ui/rate/examples/zh_CN/default/default/default.component.html +++ b/lib/ng-nest/ui/rate/examples/zh_CN/default/default/default.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/rate/examples/zh_CN/default/default/default.component.scss b/lib/ng-nest/ui/rate/examples/zh_CN/default/default/default.component.scss index 20401c970..b4943baa0 100644 --- a/lib/ng-nest/ui/rate/examples/zh_CN/default/default/default.component.scss +++ b/lib/ng-nest/ui/rate/examples/zh_CN/default/default/default.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } - x-row > x-col { - width: 14rem; - } } diff --git a/lib/ng-nest/ui/rate/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/rate/examples/zh_CN/default/default/default.component.ts index a586910a8..d883d9a33 100644 --- a/lib/ng-nest/ui/rate/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/rate/examples/zh_CN/default/default/default.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XRateComponent } from '@ng-nest/ui/rate'; @Component({ selector: 'ex-default', + standalone: true, + imports: [FormsModule, XRateComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/rate/examples/zh_CN/default/disabled/disabled.component.html b/lib/ng-nest/ui/rate/examples/zh_CN/default/disabled/disabled.component.html index 536fcffa3..e28acc923 100644 --- a/lib/ng-nest/ui/rate/examples/zh_CN/default/disabled/disabled.component.html +++ b/lib/ng-nest/ui/rate/examples/zh_CN/default/disabled/disabled.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/rate/examples/zh_CN/default/disabled/disabled.component.scss b/lib/ng-nest/ui/rate/examples/zh_CN/default/disabled/disabled.component.scss index 20401c970..b4943baa0 100644 --- a/lib/ng-nest/ui/rate/examples/zh_CN/default/disabled/disabled.component.scss +++ b/lib/ng-nest/ui/rate/examples/zh_CN/default/disabled/disabled.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } - x-row > x-col { - width: 14rem; - } } diff --git a/lib/ng-nest/ui/rate/examples/zh_CN/default/disabled/disabled.component.ts b/lib/ng-nest/ui/rate/examples/zh_CN/default/disabled/disabled.component.ts index f764fcb41..7716c0b1d 100644 --- a/lib/ng-nest/ui/rate/examples/zh_CN/default/disabled/disabled.component.ts +++ b/lib/ng-nest/ui/rate/examples/zh_CN/default/disabled/disabled.component.ts @@ -1,7 +1,11 @@ import { Component, OnInit } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XRateComponent } from '@ng-nest/ui/rate'; @Component({ selector: 'ex-disabled', + standalone: true, + imports: [FormsModule, XRateComponent], templateUrl: './disabled.component.html', styleUrls: ['./disabled.component.scss'] }) diff --git a/lib/ng-nest/ui/rate/examples/zh_CN/default/half/half.component.html b/lib/ng-nest/ui/rate/examples/zh_CN/default/half/half.component.html index 929cb446c..65f8fd21c 100644 --- a/lib/ng-nest/ui/rate/examples/zh_CN/default/half/half.component.html +++ b/lib/ng-nest/ui/rate/examples/zh_CN/default/half/half.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/rate/examples/zh_CN/default/half/half.component.scss b/lib/ng-nest/ui/rate/examples/zh_CN/default/half/half.component.scss index 20401c970..b4943baa0 100644 --- a/lib/ng-nest/ui/rate/examples/zh_CN/default/half/half.component.scss +++ b/lib/ng-nest/ui/rate/examples/zh_CN/default/half/half.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } - x-row > x-col { - width: 14rem; - } } diff --git a/lib/ng-nest/ui/rate/examples/zh_CN/default/half/half.component.ts b/lib/ng-nest/ui/rate/examples/zh_CN/default/half/half.component.ts index e74007317..8c853ac0b 100644 --- a/lib/ng-nest/ui/rate/examples/zh_CN/default/half/half.component.ts +++ b/lib/ng-nest/ui/rate/examples/zh_CN/default/half/half.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XRateComponent } from '@ng-nest/ui/rate'; @Component({ selector: 'ex-half', + standalone: true, + imports: [FormsModule, XRateComponent], templateUrl: './half.component.html', styleUrls: ['./half.component.scss'] }) diff --git a/lib/ng-nest/ui/rate/rate.component.spec.ts b/lib/ng-nest/ui/rate/rate.component.spec.ts index 9ade06674..01e69ce34 100644 --- a/lib/ng-nest/ui/rate/rate.component.spec.ts +++ b/lib/ng-nest/ui/rate/rate.component.spec.ts @@ -1,15 +1,9 @@ import { XButtonComponent } from '@ng-nest/ui/button'; -import { - ComponentFixture, - TestBed, - __core_private_testing_placeholder__ -} from '@angular/core/testing'; - -import { XRateComponent } from './rate.component'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; import { Component, DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; -import { XRateModule } from '@ng-nest/ui/rate'; +import { XRateComponent } from '@ng-nest/ui/rate'; import { FormsModule } from '@angular/forms'; import { XRatePrefix } from './rate.property'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; @@ -23,18 +17,13 @@ describe(XRatePrefix, () => { HttpClientTestingModule, BrowserAnimationsModule, FormsModule, - XRateModule, + XRateComponent, XButtonComponent, XRowComponent, XColComponent, XIconComponent ], - declarations: [ - TestXRateComponent, - TestXRateHalfComponent, - TestXRateDisabledComponent, - TestXRateCustomComponent - ] + declarations: [TestXRateComponent, TestXRateHalfComponent, TestXRateDisabledComponent, TestXRateCustomComponent] }).compileComponents(); }); describe(`default.`, () => { @@ -129,13 +118,7 @@ class TestXRateComponent { - + `, diff --git a/lib/ng-nest/ui/rate/rate.component.ts b/lib/ng-nest/ui/rate/rate.component.ts index 202642f5f..3945e2d16 100644 --- a/lib/ng-nest/ui/rate/rate.component.ts +++ b/lib/ng-nest/ui/rate/rate.component.ts @@ -1,17 +1,33 @@ -import { Component, ViewEncapsulation, ChangeDetectionStrategy, Renderer2, ElementRef, ChangeDetectorRef, ViewChild } from '@angular/core'; +import { + Component, + ViewEncapsulation, + ChangeDetectionStrategy, + Renderer2, + ElementRef, + ChangeDetectorRef, + ViewChild, + OnInit, + inject +} from '@angular/core'; import { XIsEmpty, XClearClass, XConfigService, XIsString, XIsObject } from '@ng-nest/ui/core'; import { XRatePrefix, XRateProperty } from './rate.property'; import { XValueAccessor } from '@ng-nest/ui/base-form'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XIconComponent } from '@ng-nest/ui/icon'; @Component({ selector: `${XRatePrefix}`, + standalone: true, + imports: [CommonModule, FormsModule, XButtonComponent, XIconComponent], templateUrl: './rate.component.html', styleUrls: ['./rate.component.scss'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, providers: [XValueAccessor(XRateComponent)] }) -export class XRateComponent extends XRateProperty { +export class XRateComponent extends XRateProperty implements OnInit { @ViewChild('rate', { static: true }) rate!: ElementRef; rates: number[] = []; @@ -48,14 +64,10 @@ export class XRateComponent extends XRateProperty { } rateNodes: any = []; - constructor( - public renderer: Renderer2, - public elementRef: ElementRef, - public override cdr: ChangeDetectorRef, - public configService: XConfigService - ) { - super(); - } + + private renderer = inject(Renderer2); + override cdr = inject(ChangeDetectorRef); + configService = inject(XConfigService); ngOnInit() { this.setRates(); diff --git a/lib/ng-nest/ui/rate/rate.module.ts b/lib/ng-nest/ui/rate/rate.module.ts index be49257cb..37c64773c 100644 --- a/lib/ng-nest/ui/rate/rate.module.ts +++ b/lib/ng-nest/ui/rate/rate.module.ts @@ -1,15 +1,8 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { XRateComponent } from './rate.component'; -import { FormsModule } from '@angular/forms'; -import { XButtonComponent } from '@ng-nest/ui/button'; -import { XRateProperty } from './rate.property'; -import { XIconComponent } from '@ng-nest/ui/icon'; -import { XControlValueAccessor } from '@ng-nest/ui/base-form'; @NgModule({ - declarations: [XRateComponent, XRateProperty], exports: [XRateComponent], - imports: [CommonModule, FormsModule, XButtonComponent, XIconComponent, XControlValueAccessor] + imports: [XRateComponent] }) export class XRateModule {} diff --git a/lib/ng-nest/ui/result/examples/en_US/default/error/error.component.ts b/lib/ng-nest/ui/result/examples/en_US/default/error/error.component.ts index 5ef69ac7d..303535664 100644 --- a/lib/ng-nest/ui/result/examples/en_US/default/error/error.component.ts +++ b/lib/ng-nest/ui/result/examples/en_US/default/error/error.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XResultComponent } from '@ng-nest/ui/result'; @Component({ selector: 'ex-error', + standalone: true, + imports: [XButtonComponent, XResultComponent], templateUrl: './error.component.html' }) -export class ExErrorComponent { -} +export class ExErrorComponent {} diff --git a/lib/ng-nest/ui/result/examples/en_US/default/icon/icon.component.ts b/lib/ng-nest/ui/result/examples/en_US/default/icon/icon.component.ts index e3dcf568e..ee5f60d3f 100644 --- a/lib/ng-nest/ui/result/examples/en_US/default/icon/icon.component.ts +++ b/lib/ng-nest/ui/result/examples/en_US/default/icon/icon.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XResultComponent } from '@ng-nest/ui/result'; @Component({ selector: 'ex-icon', + standalone: true, + imports: [XButtonComponent, XResultComponent], templateUrl: './icon.component.html' }) -export class ExIconComponent { -} +export class ExIconComponent {} diff --git a/lib/ng-nest/ui/result/examples/en_US/default/img/img.component.ts b/lib/ng-nest/ui/result/examples/en_US/default/img/img.component.ts index 87fbce9cc..f51819e46 100644 --- a/lib/ng-nest/ui/result/examples/en_US/default/img/img.component.ts +++ b/lib/ng-nest/ui/result/examples/en_US/default/img/img.component.ts @@ -1,8 +1,12 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XResultComponent } from '@ng-nest/ui/result'; @Component({ selector: 'ex-img', + standalone: true, + imports: [CommonModule, XButtonComponent, XResultComponent], templateUrl: './img.component.html' }) -export class ExImgComponent { -} +export class ExImgComponent {} diff --git a/lib/ng-nest/ui/result/examples/en_US/default/info/info.component.ts b/lib/ng-nest/ui/result/examples/en_US/default/info/info.component.ts index fdeeb7941..80a2f9f70 100644 --- a/lib/ng-nest/ui/result/examples/en_US/default/info/info.component.ts +++ b/lib/ng-nest/ui/result/examples/en_US/default/info/info.component.ts @@ -1,8 +1,12 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XResultComponent } from '@ng-nest/ui/result'; @Component({ selector: 'ex-info', + standalone: true, + imports: [CommonModule, XButtonComponent, XResultComponent], templateUrl: './info.component.html' }) -export class ExInfoComponent { -} +export class ExInfoComponent {} diff --git a/lib/ng-nest/ui/result/examples/en_US/default/result403/result403.component.ts b/lib/ng-nest/ui/result/examples/en_US/default/result403/result403.component.ts index 5ec63b580..21e378c5c 100644 --- a/lib/ng-nest/ui/result/examples/en_US/default/result403/result403.component.ts +++ b/lib/ng-nest/ui/result/examples/en_US/default/result403/result403.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XResultComponent } from '@ng-nest/ui/result'; @Component({ selector: 'ex-result403', + standalone: true, + imports: [XButtonComponent, XResultComponent], templateUrl: './result403.component.html' }) -export class ExResult403Component { -} +export class ExResult403Component {} diff --git a/lib/ng-nest/ui/result/examples/en_US/default/result404/result404.component.ts b/lib/ng-nest/ui/result/examples/en_US/default/result404/result404.component.ts index 59a67b666..8a5820619 100644 --- a/lib/ng-nest/ui/result/examples/en_US/default/result404/result404.component.ts +++ b/lib/ng-nest/ui/result/examples/en_US/default/result404/result404.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XResultComponent } from '@ng-nest/ui/result'; @Component({ selector: 'ex-result404', + standalone: true, + imports: [XButtonComponent, XResultComponent], templateUrl: './result404.component.html' }) -export class ExResult404Component { -} +export class ExResult404Component {} diff --git a/lib/ng-nest/ui/result/examples/en_US/default/result500/result500.component.ts b/lib/ng-nest/ui/result/examples/en_US/default/result500/result500.component.ts index da7ed18fe..54c50f403 100644 --- a/lib/ng-nest/ui/result/examples/en_US/default/result500/result500.component.ts +++ b/lib/ng-nest/ui/result/examples/en_US/default/result500/result500.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XResultComponent } from '@ng-nest/ui/result'; @Component({ selector: 'ex-result500', + standalone: true, + imports: [XButtonComponent, XResultComponent], templateUrl: './result500.component.html' }) -export class ExResult500Component { -} +export class ExResult500Component {} diff --git a/lib/ng-nest/ui/result/examples/en_US/default/success/success.component.ts b/lib/ng-nest/ui/result/examples/en_US/default/success/success.component.ts index 9f8e5caae..961ff1df8 100644 --- a/lib/ng-nest/ui/result/examples/en_US/default/success/success.component.ts +++ b/lib/ng-nest/ui/result/examples/en_US/default/success/success.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; +import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; +import { XResultComponent } from '@ng-nest/ui/result'; @Component({ selector: 'ex-success', + standalone: true, + imports: [XButtonComponent, XButtonsComponent, XResultComponent], templateUrl: './success.component.html' }) -export class ExSuccessComponent { -} +export class ExSuccessComponent {} diff --git a/lib/ng-nest/ui/result/examples/en_US/default/warning/warning.component.ts b/lib/ng-nest/ui/result/examples/en_US/default/warning/warning.component.ts index 8a1e25e15..09b1812be 100644 --- a/lib/ng-nest/ui/result/examples/en_US/default/warning/warning.component.ts +++ b/lib/ng-nest/ui/result/examples/en_US/default/warning/warning.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XResultComponent } from '@ng-nest/ui/result'; @Component({ selector: 'ex-warning', + standalone: true, + imports: [XButtonComponent, XResultComponent], templateUrl: './warning.component.html' }) -export class ExWarningComponent { -} +export class ExWarningComponent {} diff --git a/lib/ng-nest/ui/result/examples/index.ts b/lib/ng-nest/ui/result/examples/index.ts new file mode 100644 index 000000000..51a73e50b --- /dev/null +++ b/lib/ng-nest/ui/result/examples/index.ts @@ -0,0 +1,9 @@ +export * from './zh_CN/default/error/error.component'; +export * from './zh_CN/default/icon/icon.component'; +export * from './zh_CN/default/img/img.component'; +export * from './zh_CN/default/info/info.component'; +export * from './zh_CN/default/result403/result403.component'; +export * from './zh_CN/default/result404/result404.component'; +export * from './zh_CN/default/result500/result500.component'; +export * from './zh_CN/default/success/success.component'; +export * from './zh_CN/default/warning/warning.component'; diff --git a/lib/ng-nest/ui/result/examples/zh_CN/default/error/error.component.ts b/lib/ng-nest/ui/result/examples/zh_CN/default/error/error.component.ts index 5ef69ac7d..303535664 100644 --- a/lib/ng-nest/ui/result/examples/zh_CN/default/error/error.component.ts +++ b/lib/ng-nest/ui/result/examples/zh_CN/default/error/error.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XResultComponent } from '@ng-nest/ui/result'; @Component({ selector: 'ex-error', + standalone: true, + imports: [XButtonComponent, XResultComponent], templateUrl: './error.component.html' }) -export class ExErrorComponent { -} +export class ExErrorComponent {} diff --git a/lib/ng-nest/ui/result/examples/zh_CN/default/icon/icon.component.ts b/lib/ng-nest/ui/result/examples/zh_CN/default/icon/icon.component.ts index e3dcf568e..ee5f60d3f 100644 --- a/lib/ng-nest/ui/result/examples/zh_CN/default/icon/icon.component.ts +++ b/lib/ng-nest/ui/result/examples/zh_CN/default/icon/icon.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XResultComponent } from '@ng-nest/ui/result'; @Component({ selector: 'ex-icon', + standalone: true, + imports: [XButtonComponent, XResultComponent], templateUrl: './icon.component.html' }) -export class ExIconComponent { -} +export class ExIconComponent {} diff --git a/lib/ng-nest/ui/result/examples/zh_CN/default/img/img.component.ts b/lib/ng-nest/ui/result/examples/zh_CN/default/img/img.component.ts index 87fbce9cc..f51819e46 100644 --- a/lib/ng-nest/ui/result/examples/zh_CN/default/img/img.component.ts +++ b/lib/ng-nest/ui/result/examples/zh_CN/default/img/img.component.ts @@ -1,8 +1,12 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XResultComponent } from '@ng-nest/ui/result'; @Component({ selector: 'ex-img', + standalone: true, + imports: [CommonModule, XButtonComponent, XResultComponent], templateUrl: './img.component.html' }) -export class ExImgComponent { -} +export class ExImgComponent {} diff --git a/lib/ng-nest/ui/result/examples/zh_CN/default/info/info.component.ts b/lib/ng-nest/ui/result/examples/zh_CN/default/info/info.component.ts index fdeeb7941..80a2f9f70 100644 --- a/lib/ng-nest/ui/result/examples/zh_CN/default/info/info.component.ts +++ b/lib/ng-nest/ui/result/examples/zh_CN/default/info/info.component.ts @@ -1,8 +1,12 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XResultComponent } from '@ng-nest/ui/result'; @Component({ selector: 'ex-info', + standalone: true, + imports: [CommonModule, XButtonComponent, XResultComponent], templateUrl: './info.component.html' }) -export class ExInfoComponent { -} +export class ExInfoComponent {} diff --git a/lib/ng-nest/ui/result/examples/zh_CN/default/result403/result403.component.html b/lib/ng-nest/ui/result/examples/zh_CN/default/result403/result403.component.html index 9c20e416e..e05e93808 100644 --- a/lib/ng-nest/ui/result/examples/zh_CN/default/result403/result403.component.html +++ b/lib/ng-nest/ui/result/examples/zh_CN/default/result403/result403.component.html @@ -2,4 +2,4 @@ 返回列表 - \ No newline at end of file + diff --git a/lib/ng-nest/ui/result/examples/zh_CN/default/result403/result403.component.ts b/lib/ng-nest/ui/result/examples/zh_CN/default/result403/result403.component.ts index 5ec63b580..21e378c5c 100644 --- a/lib/ng-nest/ui/result/examples/zh_CN/default/result403/result403.component.ts +++ b/lib/ng-nest/ui/result/examples/zh_CN/default/result403/result403.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XResultComponent } from '@ng-nest/ui/result'; @Component({ selector: 'ex-result403', + standalone: true, + imports: [XButtonComponent, XResultComponent], templateUrl: './result403.component.html' }) -export class ExResult403Component { -} +export class ExResult403Component {} diff --git a/lib/ng-nest/ui/result/examples/zh_CN/default/result404/result404.component.ts b/lib/ng-nest/ui/result/examples/zh_CN/default/result404/result404.component.ts index 59a67b666..8a5820619 100644 --- a/lib/ng-nest/ui/result/examples/zh_CN/default/result404/result404.component.ts +++ b/lib/ng-nest/ui/result/examples/zh_CN/default/result404/result404.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XResultComponent } from '@ng-nest/ui/result'; @Component({ selector: 'ex-result404', + standalone: true, + imports: [XButtonComponent, XResultComponent], templateUrl: './result404.component.html' }) -export class ExResult404Component { -} +export class ExResult404Component {} diff --git a/lib/ng-nest/ui/result/examples/zh_CN/default/result500/result500.component.ts b/lib/ng-nest/ui/result/examples/zh_CN/default/result500/result500.component.ts index da7ed18fe..54c50f403 100644 --- a/lib/ng-nest/ui/result/examples/zh_CN/default/result500/result500.component.ts +++ b/lib/ng-nest/ui/result/examples/zh_CN/default/result500/result500.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XResultComponent } from '@ng-nest/ui/result'; @Component({ selector: 'ex-result500', + standalone: true, + imports: [XButtonComponent, XResultComponent], templateUrl: './result500.component.html' }) -export class ExResult500Component { -} +export class ExResult500Component {} diff --git a/lib/ng-nest/ui/result/examples/zh_CN/default/success/success.component.ts b/lib/ng-nest/ui/result/examples/zh_CN/default/success/success.component.ts index 9f8e5caae..961ff1df8 100644 --- a/lib/ng-nest/ui/result/examples/zh_CN/default/success/success.component.ts +++ b/lib/ng-nest/ui/result/examples/zh_CN/default/success/success.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; +import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; +import { XResultComponent } from '@ng-nest/ui/result'; @Component({ selector: 'ex-success', + standalone: true, + imports: [XButtonComponent, XButtonsComponent, XResultComponent], templateUrl: './success.component.html' }) -export class ExSuccessComponent { -} +export class ExSuccessComponent {} diff --git a/lib/ng-nest/ui/result/examples/zh_CN/default/warning/warning.component.ts b/lib/ng-nest/ui/result/examples/zh_CN/default/warning/warning.component.ts index 8a1e25e15..09b1812be 100644 --- a/lib/ng-nest/ui/result/examples/zh_CN/default/warning/warning.component.ts +++ b/lib/ng-nest/ui/result/examples/zh_CN/default/warning/warning.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XResultComponent } from '@ng-nest/ui/result'; @Component({ selector: 'ex-warning', + standalone: true, + imports: [XButtonComponent, XResultComponent], templateUrl: './warning.component.html' }) -export class ExWarningComponent { -} +export class ExWarningComponent {} diff --git a/lib/ng-nest/ui/result/result.component.spec.ts b/lib/ng-nest/ui/result/result.component.spec.ts index 8b293c73d..dda654af4 100644 --- a/lib/ng-nest/ui/result/result.component.spec.ts +++ b/lib/ng-nest/ui/result/result.component.spec.ts @@ -1,17 +1,15 @@ import { XIconComponent } from '@ng-nest/ui/icon'; import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XResultComponent } from './result.component'; import { Component, DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; -import { XResultModule } from '@ng-nest/ui/result'; +import { XResultComponent } from '@ng-nest/ui/result'; import { FormsModule } from '@angular/forms'; import { XResultPrefix } from './result.property'; import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; import { XContainerComponent } from '@ng-nest/ui/container'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XResultPrefix, () => { @@ -20,9 +18,9 @@ describe(XResultPrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, FormsModule, - XResultModule, + XResultComponent, XButtonComponent, XButtonsComponent, XContainerComponent, diff --git a/lib/ng-nest/ui/result/result.component.ts b/lib/ng-nest/ui/result/result.component.ts index a14e6b9fe..1dbefaba9 100644 --- a/lib/ng-nest/ui/result/result.component.ts +++ b/lib/ng-nest/ui/result/result.component.ts @@ -1,9 +1,20 @@ -import { Component, OnInit, ViewEncapsulation, Renderer2, ElementRef, ChangeDetectorRef, ChangeDetectionStrategy } from '@angular/core'; +import { + Component, + OnInit, + ViewEncapsulation, + ChangeDetectionStrategy, + inject +} from '@angular/core'; import { XResultPrefix, XResultProperty } from './result.property'; import { XIsEmpty, XConfigService } from '@ng-nest/ui/core'; +import { CommonModule } from '@angular/common'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XOutletDirective } from '@ng-nest/ui/outlet'; @Component({ selector: `${XResultPrefix}`, + standalone: true, + imports: [CommonModule, XIconComponent, XOutletDirective], templateUrl: './result.component.html', styleUrls: ['./result.component.scss'], encapsulation: ViewEncapsulation.None, @@ -13,14 +24,7 @@ export class XResultComponent extends XResultProperty implements OnInit { get strIcon() { return this.icon as string; } - constructor( - public renderer: Renderer2, - public elementRef: ElementRef, - public cdr: ChangeDetectorRef, - public configService: XConfigService - ) { - super(); - } + configService = inject(XConfigService); ngOnInit() { this.setClassMap(); diff --git a/lib/ng-nest/ui/result/result.module.ts b/lib/ng-nest/ui/result/result.module.ts index 3fd3a5d89..a8d4ae4f6 100644 --- a/lib/ng-nest/ui/result/result.module.ts +++ b/lib/ng-nest/ui/result/result.module.ts @@ -1,13 +1,8 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { XResultComponent } from './result.component'; -import { XIconComponent } from '@ng-nest/ui/icon'; -import { XOutletDirective } from '@ng-nest/ui/outlet'; -import { XResultProperty } from './result.property'; @NgModule({ - declarations: [XResultComponent, XResultProperty], exports: [XResultComponent], - imports: [CommonModule, XIconComponent, XOutletDirective] + imports: [XResultComponent] }) export class XResultModule {} diff --git a/lib/ng-nest/ui/ripple/ripple.directive.ts b/lib/ng-nest/ui/ripple/ripple.directive.ts index 4631f8ded..8117ba2e9 100644 --- a/lib/ng-nest/ui/ripple/ripple.directive.ts +++ b/lib/ng-nest/ui/ripple/ripple.directive.ts @@ -1,4 +1,4 @@ -import { OnInit, Renderer2, ElementRef, Directive, OnDestroy } from '@angular/core'; +import { OnInit, Renderer2, ElementRef, Directive, OnDestroy, inject } from '@angular/core'; import { fromEvent, of, Subject } from 'rxjs'; import { delay, takeUntil, tap } from 'rxjs/operators'; import { XRipplePrefix, XRippleProperty } from './ripple.property'; @@ -11,10 +11,8 @@ import { XComputed } from '@ng-nest/ui/core'; export class XRippleDirective extends XRippleProperty implements OnInit, OnDestroy { duration = 800; private _unSub = new Subject(); - - constructor(private renderer: Renderer2, private elementRef: ElementRef) { - super(); - } + private renderer = inject(Renderer2); + private elementRef = inject(ElementRef); ngOnInit() { if (this.disabled) return; diff --git a/lib/ng-nest/ui/select/examples/en_US/default/async/async.component.html b/lib/ng-nest/ui/select/examples/en_US/default/async/async.component.html index 8a0231696..57c4f4faa 100644 --- a/lib/ng-nest/ui/select/examples/en_US/default/async/async.component.html +++ b/lib/ng-nest/ui/select/examples/en_US/default/async/async.component.html @@ -1,5 +1 @@ - - - - - + diff --git a/lib/ng-nest/ui/select/examples/en_US/default/async/async.component.scss b/lib/ng-nest/ui/select/examples/en_US/default/async/async.component.scss index 388331f62..dc9093b45 100644 --- a/lib/ng-nest/ui/select/examples/en_US/default/async/async.component.scss +++ b/lib/ng-nest/ui/select/examples/en_US/default/async/async.component.scss @@ -1,8 +1,2 @@ :host { - x-row > x-col { - width: 15rem; - } - x-row:not(:first-child) { - margin-top: 1rem; - } } diff --git a/lib/ng-nest/ui/select/examples/en_US/default/async/async.component.ts b/lib/ng-nest/ui/select/examples/en_US/default/async/async.component.ts index 75e063924..3cb43cb3e 100644 --- a/lib/ng-nest/ui/select/examples/en_US/default/async/async.component.ts +++ b/lib/ng-nest/ui/select/examples/en_US/default/async/async.component.ts @@ -1,8 +1,12 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSelectComponent } from '@ng-nest/ui/select'; import { Observable } from 'rxjs'; @Component({ selector: 'ex-async', + standalone: true, + imports: [FormsModule, XSelectComponent], templateUrl: './async.component.html', styleUrls: ['./async.component.scss'] }) diff --git a/lib/ng-nest/ui/select/examples/en_US/default/bordered/bordered.component.html b/lib/ng-nest/ui/select/examples/en_US/default/bordered/bordered.component.html index e5deb9945..80d45d3b5 100644 --- a/lib/ng-nest/ui/select/examples/en_US/default/bordered/bordered.component.html +++ b/lib/ng-nest/ui/select/examples/en_US/default/bordered/bordered.component.html @@ -1,17 +1,15 @@ - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/select/examples/en_US/default/bordered/bordered.component.scss b/lib/ng-nest/ui/select/examples/en_US/default/bordered/bordered.component.scss index 3b85eac28..b4943baa0 100644 --- a/lib/ng-nest/ui/select/examples/en_US/default/bordered/bordered.component.scss +++ b/lib/ng-nest/ui/select/examples/en_US/default/bordered/bordered.component.scss @@ -1,8 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } - x-row > x-col { - width: 15rem; - } } diff --git a/lib/ng-nest/ui/select/examples/en_US/default/bordered/bordered.component.ts b/lib/ng-nest/ui/select/examples/en_US/default/bordered/bordered.component.ts index 24e0efda3..1896c3227 100644 --- a/lib/ng-nest/ui/select/examples/en_US/default/bordered/bordered.component.ts +++ b/lib/ng-nest/ui/select/examples/en_US/default/bordered/bordered.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; import { XData } from '@ng-nest/ui/core'; -import { XSelectNode } from '@ng-nest/ui/select'; +import { XSelectComponent, XSelectNode } from '@ng-nest/ui/select'; @Component({ selector: 'ex-bordered', + standalone: true, + imports: [XSelectComponent], templateUrl: './bordered.component.html', styleUrls: ['./bordered.component.scss'] }) diff --git a/lib/ng-nest/ui/select/examples/en_US/default/custom/custom.component.html b/lib/ng-nest/ui/select/examples/en_US/default/custom/custom.component.html index 7752052a4..7f97b1ecc 100644 --- a/lib/ng-nest/ui/select/examples/en_US/default/custom/custom.component.html +++ b/lib/ng-nest/ui/select/examples/en_US/default/custom/custom.component.html @@ -1,13 +1,9 @@ - - - - - - - - - - +
+ +
+
+ +
{{ node?.label }}2 diff --git a/lib/ng-nest/ui/select/examples/en_US/default/custom/custom.component.scss b/lib/ng-nest/ui/select/examples/en_US/default/custom/custom.component.scss index 797a61180..18f1e65f1 100644 --- a/lib/ng-nest/ui/select/examples/en_US/default/custom/custom.component.scss +++ b/lib/ng-nest/ui/select/examples/en_US/default/custom/custom.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 15rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/select/examples/en_US/default/custom/custom.component.ts b/lib/ng-nest/ui/select/examples/en_US/default/custom/custom.component.ts index 9d8b4946d..a477d3e3b 100644 --- a/lib/ng-nest/ui/select/examples/en_US/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/select/examples/en_US/default/custom/custom.component.ts @@ -1,7 +1,12 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSelectComponent } from '@ng-nest/ui/select'; @Component({ selector: 'ex-custom', + standalone: true, + imports: [CommonModule, FormsModule, XSelectComponent], templateUrl: './custom.component.html', styleUrls: ['./custom.component.scss'] }) diff --git a/lib/ng-nest/ui/select/examples/en_US/default/default/default.component.html b/lib/ng-nest/ui/select/examples/en_US/default/default/default.component.html index efd9763f0..ae086bfc2 100644 --- a/lib/ng-nest/ui/select/examples/en_US/default/default/default.component.html +++ b/lib/ng-nest/ui/select/examples/en_US/default/default/default.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/select/examples/en_US/default/default/default.component.scss b/lib/ng-nest/ui/select/examples/en_US/default/default/default.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/select/examples/en_US/default/default/default.component.scss +++ b/lib/ng-nest/ui/select/examples/en_US/default/default/default.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 15rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/select/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/select/examples/en_US/default/default/default.component.ts index c8a649076..b51df8ff4 100644 --- a/lib/ng-nest/ui/select/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/select/examples/en_US/default/default/default.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSelectComponent } from '@ng-nest/ui/select'; @Component({ selector: 'ex-default', + standalone: true, + imports: [FormsModule, XSelectComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/select/examples/en_US/default/disabled/disabled.component.html b/lib/ng-nest/ui/select/examples/en_US/default/disabled/disabled.component.html index d6a4c34fd..47b66503f 100644 --- a/lib/ng-nest/ui/select/examples/en_US/default/disabled/disabled.component.html +++ b/lib/ng-nest/ui/select/examples/en_US/default/disabled/disabled.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/select/examples/en_US/default/disabled/disabled.component.scss b/lib/ng-nest/ui/select/examples/en_US/default/disabled/disabled.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/select/examples/en_US/default/disabled/disabled.component.scss +++ b/lib/ng-nest/ui/select/examples/en_US/default/disabled/disabled.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 15rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/select/examples/en_US/default/disabled/disabled.component.ts b/lib/ng-nest/ui/select/examples/en_US/default/disabled/disabled.component.ts index b32dc731a..75fb118d9 100644 --- a/lib/ng-nest/ui/select/examples/en_US/default/disabled/disabled.component.ts +++ b/lib/ng-nest/ui/select/examples/en_US/default/disabled/disabled.component.ts @@ -1,9 +1,12 @@ import { Component } from '@angular/core'; -import { XSelectNode } from '@ng-nest/ui/select'; +import { XSelectComponent, XSelectNode } from '@ng-nest/ui/select'; import { XData } from '@ng-nest/ui/core'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'ex-disabled', + standalone: true, + imports: [FormsModule, XSelectComponent], templateUrl: './disabled.component.html', styleUrls: ['./disabled.component.scss'] }) diff --git a/lib/ng-nest/ui/select/examples/en_US/default/label/label.component.html b/lib/ng-nest/ui/select/examples/en_US/default/label/label.component.html index a10144bf7..f82b7cb7f 100644 --- a/lib/ng-nest/ui/select/examples/en_US/default/label/label.component.html +++ b/lib/ng-nest/ui/select/examples/en_US/default/label/label.component.html @@ -1,20 +1,12 @@ - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/select/examples/en_US/default/label/label.component.scss b/lib/ng-nest/ui/select/examples/en_US/default/label/label.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/select/examples/en_US/default/label/label.component.scss +++ b/lib/ng-nest/ui/select/examples/en_US/default/label/label.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 15rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/select/examples/en_US/default/label/label.component.ts b/lib/ng-nest/ui/select/examples/en_US/default/label/label.component.ts index 8a9857fbe..20b0a0721 100644 --- a/lib/ng-nest/ui/select/examples/en_US/default/label/label.component.ts +++ b/lib/ng-nest/ui/select/examples/en_US/default/label/label.component.ts @@ -1,9 +1,12 @@ import { Component } from '@angular/core'; -import { XSelectNode } from '@ng-nest/ui/select'; +import { XSelectComponent, XSelectNode } from '@ng-nest/ui/select'; import { XData } from '@ng-nest/ui/core'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'ex-label', + standalone: true, + imports: [FormsModule, XSelectComponent], templateUrl: './label.component.html', styleUrls: ['./label.component.scss'] }) diff --git a/lib/ng-nest/ui/select/examples/en_US/default/multiple/multiple.component.html b/lib/ng-nest/ui/select/examples/en_US/default/multiple/multiple.component.html index 197c946c4..34b7540b1 100644 --- a/lib/ng-nest/ui/select/examples/en_US/default/multiple/multiple.component.html +++ b/lib/ng-nest/ui/select/examples/en_US/default/multiple/multiple.component.html @@ -1,30 +1,20 @@ - - - - - - - - - - - - Select all - - - - - - - - - - - +
+ +
+
+ +
+
Select all
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/select/examples/en_US/default/multiple/multiple.component.scss b/lib/ng-nest/ui/select/examples/en_US/default/multiple/multiple.component.scss index 99dcc67e0..9d9b1e873 100644 --- a/lib/ng-nest/ui/select/examples/en_US/default/multiple/multiple.component.scss +++ b/lib/ng-nest/ui/select/examples/en_US/default/multiple/multiple.component.scss @@ -1,8 +1,8 @@ :host { - x-row > x-col > x-select { + .row > x-select { width: 25rem; } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/select/examples/en_US/default/multiple/multiple.component.ts b/lib/ng-nest/ui/select/examples/en_US/default/multiple/multiple.component.ts index a9664aa14..ce9bd6270 100644 --- a/lib/ng-nest/ui/select/examples/en_US/default/multiple/multiple.component.ts +++ b/lib/ng-nest/ui/select/examples/en_US/default/multiple/multiple.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSelectComponent } from '@ng-nest/ui/select'; @Component({ selector: 'ex-multiple', + standalone: true, + imports: [FormsModule, XSelectComponent], templateUrl: './multiple.component.html', styleUrls: ['./multiple.component.scss'] }) diff --git a/lib/ng-nest/ui/select/examples/en_US/default/required/required.component.html b/lib/ng-nest/ui/select/examples/en_US/default/required/required.component.html index b19c940da..7a52d5a74 100644 --- a/lib/ng-nest/ui/select/examples/en_US/default/required/required.component.html +++ b/lib/ng-nest/ui/select/examples/en_US/default/required/required.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/select/examples/en_US/default/required/required.component.scss b/lib/ng-nest/ui/select/examples/en_US/default/required/required.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/select/examples/en_US/default/required/required.component.scss +++ b/lib/ng-nest/ui/select/examples/en_US/default/required/required.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 15rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/select/examples/en_US/default/required/required.component.ts b/lib/ng-nest/ui/select/examples/en_US/default/required/required.component.ts index adcc1a44e..f4529d380 100644 --- a/lib/ng-nest/ui/select/examples/en_US/default/required/required.component.ts +++ b/lib/ng-nest/ui/select/examples/en_US/default/required/required.component.ts @@ -1,9 +1,12 @@ import { Component } from '@angular/core'; -import { XSelectNode } from '@ng-nest/ui/select'; +import { XSelectComponent, XSelectNode } from '@ng-nest/ui/select'; import { XData } from '@ng-nest/ui/core'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'ex-required', + standalone: true, + imports: [FormsModule, XSelectComponent], templateUrl: './required.component.html', styleUrls: ['./required.component.scss'] }) diff --git a/lib/ng-nest/ui/select/examples/en_US/default/search/search.component.html b/lib/ng-nest/ui/select/examples/en_US/default/search/search.component.html index 5314fa4f7..591f0a269 100644 --- a/lib/ng-nest/ui/select/examples/en_US/default/search/search.component.html +++ b/lib/ng-nest/ui/select/examples/en_US/default/search/search.component.html @@ -1,52 +1,66 @@ - - - - - - - - - - - - - - - - - - - more{{ surplus }},total{{ total }} - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + more{{ surplus }},total{{ total }} +
diff --git a/lib/ng-nest/ui/select/examples/en_US/default/search/search.component.scss b/lib/ng-nest/ui/select/examples/en_US/default/search/search.component.scss index 52eaa8024..067c34795 100644 --- a/lib/ng-nest/ui/select/examples/en_US/default/search/search.component.scss +++ b/lib/ng-nest/ui/select/examples/en_US/default/search/search.component.scss @@ -1,8 +1,8 @@ :host { - x-row > x-col > x-select { + .row > x-select { width: 20rem; } - x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/select/examples/en_US/default/search/search.component.ts b/lib/ng-nest/ui/select/examples/en_US/default/search/search.component.ts index 0e138d175..f0fe6103e 100644 --- a/lib/ng-nest/ui/select/examples/en_US/default/search/search.component.ts +++ b/lib/ng-nest/ui/select/examples/en_US/default/search/search.component.ts @@ -1,14 +1,35 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; import { XIsEmpty } from '@ng-nest/ui/core'; +import { XSelectComponent } from '@ng-nest/ui/select'; import { Observable } from 'rxjs'; @Component({ selector: 'ex-search', + standalone: true, + imports: [CommonModule, FormsModule, XSelectComponent], templateUrl: './search.component.html', styleUrls: ['./search.component.scss'] }) export class ExSearchComponent { - default = ['AAAA', 'BBBB', 'CCCC', 'DDDD', 'EEEE', 'FFFF', 'GGGG', 'HHHH', 'IIII', 'JJJJ', 'KKKK', 'LLLL', 'MMMM', 'NNNN', 'VVVV']; + default = [ + 'AAAA', + 'BBBB', + 'CCCC', + 'DDDD', + 'EEEE', + 'FFFF', + 'GGGG', + 'HHHH', + 'IIII', + 'JJJJ', + 'KKKK', + 'LLLL', + 'MMMM', + 'NNNN', + 'VVVV' + ]; data = [...this.default]; model = ''; diff --git a/lib/ng-nest/ui/select/examples/en_US/default/size/size.component.html b/lib/ng-nest/ui/select/examples/en_US/default/size/size.component.html index a61c5d593..a4155204f 100644 --- a/lib/ng-nest/ui/select/examples/en_US/default/size/size.component.html +++ b/lib/ng-nest/ui/select/examples/en_US/default/size/size.component.html @@ -1,21 +1,19 @@ - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/select/examples/en_US/default/size/size.component.scss b/lib/ng-nest/ui/select/examples/en_US/default/size/size.component.scss index db47dab4e..5e83058ed 100644 --- a/lib/ng-nest/ui/select/examples/en_US/default/size/size.component.scss +++ b/lib/ng-nest/ui/select/examples/en_US/default/size/size.component.scss @@ -1,9 +1,5 @@ :host { - x-row { - width: 20rem; - } - x-row > x-col { + .row { margin-top: 1rem; - width: 15rem; } } diff --git a/lib/ng-nest/ui/select/examples/en_US/default/size/size.component.ts b/lib/ng-nest/ui/select/examples/en_US/default/size/size.component.ts index d4458196c..54c535bf1 100644 --- a/lib/ng-nest/ui/select/examples/en_US/default/size/size.component.ts +++ b/lib/ng-nest/ui/select/examples/en_US/default/size/size.component.ts @@ -1,9 +1,13 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; import { XData, XSize } from '@ng-nest/ui/core'; -import { XSelectNode } from '@ng-nest/ui/select'; +import { XRadioComponent } from '@ng-nest/ui/radio'; +import { XSelectComponent, XSelectNode } from '@ng-nest/ui/select'; @Component({ selector: 'ex-size', + standalone: true, + imports: [FormsModule, XSelectComponent, XRadioComponent], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/select/examples/index.ts b/lib/ng-nest/ui/select/examples/index.ts new file mode 100644 index 000000000..a56fb23ea --- /dev/null +++ b/lib/ng-nest/ui/select/examples/index.ts @@ -0,0 +1,10 @@ +export * from './zh_CN/default/async/async.component'; +export * from './zh_CN/default/bordered/bordered.component'; +export * from './zh_CN/default/custom/custom.component'; +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/disabled/disabled.component'; +export * from './zh_CN/default/label/label.component'; +export * from './zh_CN/default/multiple/multiple.component'; +export * from './zh_CN/default/required/required.component'; +export * from './zh_CN/default/search/search.component'; +export * from './zh_CN/default/size/size.component'; diff --git a/lib/ng-nest/ui/select/examples/zh_CN/default/async/async.component.html b/lib/ng-nest/ui/select/examples/zh_CN/default/async/async.component.html index 8a0231696..57c4f4faa 100644 --- a/lib/ng-nest/ui/select/examples/zh_CN/default/async/async.component.html +++ b/lib/ng-nest/ui/select/examples/zh_CN/default/async/async.component.html @@ -1,5 +1 @@ - - - - - + diff --git a/lib/ng-nest/ui/select/examples/zh_CN/default/async/async.component.scss b/lib/ng-nest/ui/select/examples/zh_CN/default/async/async.component.scss index 388331f62..dc9093b45 100644 --- a/lib/ng-nest/ui/select/examples/zh_CN/default/async/async.component.scss +++ b/lib/ng-nest/ui/select/examples/zh_CN/default/async/async.component.scss @@ -1,8 +1,2 @@ :host { - x-row > x-col { - width: 15rem; - } - x-row:not(:first-child) { - margin-top: 1rem; - } } diff --git a/lib/ng-nest/ui/select/examples/zh_CN/default/async/async.component.ts b/lib/ng-nest/ui/select/examples/zh_CN/default/async/async.component.ts index c67cdad8e..d60c772b5 100644 --- a/lib/ng-nest/ui/select/examples/zh_CN/default/async/async.component.ts +++ b/lib/ng-nest/ui/select/examples/zh_CN/default/async/async.component.ts @@ -1,8 +1,12 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSelectComponent } from '@ng-nest/ui/select'; import { Observable } from 'rxjs'; @Component({ selector: 'ex-async', + standalone: true, + imports: [FormsModule, XSelectComponent], templateUrl: './async.component.html', styleUrls: ['./async.component.scss'] }) diff --git a/lib/ng-nest/ui/select/examples/zh_CN/default/bordered/bordered.component.html b/lib/ng-nest/ui/select/examples/zh_CN/default/bordered/bordered.component.html index eda7fa31f..478c9bf19 100644 --- a/lib/ng-nest/ui/select/examples/zh_CN/default/bordered/bordered.component.html +++ b/lib/ng-nest/ui/select/examples/zh_CN/default/bordered/bordered.component.html @@ -1,17 +1,15 @@ - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/select/examples/zh_CN/default/bordered/bordered.component.scss b/lib/ng-nest/ui/select/examples/zh_CN/default/bordered/bordered.component.scss index 3b85eac28..b4943baa0 100644 --- a/lib/ng-nest/ui/select/examples/zh_CN/default/bordered/bordered.component.scss +++ b/lib/ng-nest/ui/select/examples/zh_CN/default/bordered/bordered.component.scss @@ -1,8 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } - x-row > x-col { - width: 15rem; - } } diff --git a/lib/ng-nest/ui/select/examples/zh_CN/default/bordered/bordered.component.ts b/lib/ng-nest/ui/select/examples/zh_CN/default/bordered/bordered.component.ts index 24e0efda3..1896c3227 100644 --- a/lib/ng-nest/ui/select/examples/zh_CN/default/bordered/bordered.component.ts +++ b/lib/ng-nest/ui/select/examples/zh_CN/default/bordered/bordered.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; import { XData } from '@ng-nest/ui/core'; -import { XSelectNode } from '@ng-nest/ui/select'; +import { XSelectComponent, XSelectNode } from '@ng-nest/ui/select'; @Component({ selector: 'ex-bordered', + standalone: true, + imports: [XSelectComponent], templateUrl: './bordered.component.html', styleUrls: ['./bordered.component.scss'] }) diff --git a/lib/ng-nest/ui/select/examples/zh_CN/default/custom/custom.component.html b/lib/ng-nest/ui/select/examples/zh_CN/default/custom/custom.component.html index 7752052a4..7f97b1ecc 100644 --- a/lib/ng-nest/ui/select/examples/zh_CN/default/custom/custom.component.html +++ b/lib/ng-nest/ui/select/examples/zh_CN/default/custom/custom.component.html @@ -1,13 +1,9 @@ - - - - - - - - - - +
+ +
+
+ +
{{ node?.label }}2 diff --git a/lib/ng-nest/ui/select/examples/zh_CN/default/custom/custom.component.scss b/lib/ng-nest/ui/select/examples/zh_CN/default/custom/custom.component.scss index 797a61180..18f1e65f1 100644 --- a/lib/ng-nest/ui/select/examples/zh_CN/default/custom/custom.component.scss +++ b/lib/ng-nest/ui/select/examples/zh_CN/default/custom/custom.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 15rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/select/examples/zh_CN/default/custom/custom.component.ts b/lib/ng-nest/ui/select/examples/zh_CN/default/custom/custom.component.ts index 9d8b4946d..a477d3e3b 100644 --- a/lib/ng-nest/ui/select/examples/zh_CN/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/select/examples/zh_CN/default/custom/custom.component.ts @@ -1,7 +1,12 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSelectComponent } from '@ng-nest/ui/select'; @Component({ selector: 'ex-custom', + standalone: true, + imports: [CommonModule, FormsModule, XSelectComponent], templateUrl: './custom.component.html', styleUrls: ['./custom.component.scss'] }) diff --git a/lib/ng-nest/ui/select/examples/zh_CN/default/default/default.component.html b/lib/ng-nest/ui/select/examples/zh_CN/default/default/default.component.html index efd9763f0..ae086bfc2 100644 --- a/lib/ng-nest/ui/select/examples/zh_CN/default/default/default.component.html +++ b/lib/ng-nest/ui/select/examples/zh_CN/default/default/default.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/select/examples/zh_CN/default/default/default.component.scss b/lib/ng-nest/ui/select/examples/zh_CN/default/default/default.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/select/examples/zh_CN/default/default/default.component.scss +++ b/lib/ng-nest/ui/select/examples/zh_CN/default/default/default.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 15rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/select/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/select/examples/zh_CN/default/default/default.component.ts index c8a649076..b51df8ff4 100644 --- a/lib/ng-nest/ui/select/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/select/examples/zh_CN/default/default/default.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSelectComponent } from '@ng-nest/ui/select'; @Component({ selector: 'ex-default', + standalone: true, + imports: [FormsModule, XSelectComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/select/examples/zh_CN/default/disabled/disabled.component.html b/lib/ng-nest/ui/select/examples/zh_CN/default/disabled/disabled.component.html index d6a4c34fd..47b66503f 100644 --- a/lib/ng-nest/ui/select/examples/zh_CN/default/disabled/disabled.component.html +++ b/lib/ng-nest/ui/select/examples/zh_CN/default/disabled/disabled.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/select/examples/zh_CN/default/disabled/disabled.component.scss b/lib/ng-nest/ui/select/examples/zh_CN/default/disabled/disabled.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/select/examples/zh_CN/default/disabled/disabled.component.scss +++ b/lib/ng-nest/ui/select/examples/zh_CN/default/disabled/disabled.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 15rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/select/examples/zh_CN/default/disabled/disabled.component.ts b/lib/ng-nest/ui/select/examples/zh_CN/default/disabled/disabled.component.ts index b32dc731a..75fb118d9 100644 --- a/lib/ng-nest/ui/select/examples/zh_CN/default/disabled/disabled.component.ts +++ b/lib/ng-nest/ui/select/examples/zh_CN/default/disabled/disabled.component.ts @@ -1,9 +1,12 @@ import { Component } from '@angular/core'; -import { XSelectNode } from '@ng-nest/ui/select'; +import { XSelectComponent, XSelectNode } from '@ng-nest/ui/select'; import { XData } from '@ng-nest/ui/core'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'ex-disabled', + standalone: true, + imports: [FormsModule, XSelectComponent], templateUrl: './disabled.component.html', styleUrls: ['./disabled.component.scss'] }) diff --git a/lib/ng-nest/ui/select/examples/zh_CN/default/label/label.component.html b/lib/ng-nest/ui/select/examples/zh_CN/default/label/label.component.html index b88a08898..520b87fb1 100644 --- a/lib/ng-nest/ui/select/examples/zh_CN/default/label/label.component.html +++ b/lib/ng-nest/ui/select/examples/zh_CN/default/label/label.component.html @@ -1,20 +1,12 @@ - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/select/examples/zh_CN/default/label/label.component.scss b/lib/ng-nest/ui/select/examples/zh_CN/default/label/label.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/select/examples/zh_CN/default/label/label.component.scss +++ b/lib/ng-nest/ui/select/examples/zh_CN/default/label/label.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 15rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/select/examples/zh_CN/default/label/label.component.ts b/lib/ng-nest/ui/select/examples/zh_CN/default/label/label.component.ts index 8a9857fbe..20b0a0721 100644 --- a/lib/ng-nest/ui/select/examples/zh_CN/default/label/label.component.ts +++ b/lib/ng-nest/ui/select/examples/zh_CN/default/label/label.component.ts @@ -1,9 +1,12 @@ import { Component } from '@angular/core'; -import { XSelectNode } from '@ng-nest/ui/select'; +import { XSelectComponent, XSelectNode } from '@ng-nest/ui/select'; import { XData } from '@ng-nest/ui/core'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'ex-label', + standalone: true, + imports: [FormsModule, XSelectComponent], templateUrl: './label.component.html', styleUrls: ['./label.component.scss'] }) diff --git a/lib/ng-nest/ui/select/examples/zh_CN/default/multiple/multiple.component.html b/lib/ng-nest/ui/select/examples/zh_CN/default/multiple/multiple.component.html index 79cd745f6..8fcd410b1 100644 --- a/lib/ng-nest/ui/select/examples/zh_CN/default/multiple/multiple.component.html +++ b/lib/ng-nest/ui/select/examples/zh_CN/default/multiple/multiple.component.html @@ -1,30 +1,20 @@ - - - - - - - - - - - - 全选 - - - - - - - - - - - +
+ +
+
+ +
+
全选
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/select/examples/zh_CN/default/multiple/multiple.component.scss b/lib/ng-nest/ui/select/examples/zh_CN/default/multiple/multiple.component.scss index 99dcc67e0..9d9b1e873 100644 --- a/lib/ng-nest/ui/select/examples/zh_CN/default/multiple/multiple.component.scss +++ b/lib/ng-nest/ui/select/examples/zh_CN/default/multiple/multiple.component.scss @@ -1,8 +1,8 @@ :host { - x-row > x-col > x-select { + .row > x-select { width: 25rem; } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/select/examples/zh_CN/default/multiple/multiple.component.ts b/lib/ng-nest/ui/select/examples/zh_CN/default/multiple/multiple.component.ts index a9664aa14..ce9bd6270 100644 --- a/lib/ng-nest/ui/select/examples/zh_CN/default/multiple/multiple.component.ts +++ b/lib/ng-nest/ui/select/examples/zh_CN/default/multiple/multiple.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSelectComponent } from '@ng-nest/ui/select'; @Component({ selector: 'ex-multiple', + standalone: true, + imports: [FormsModule, XSelectComponent], templateUrl: './multiple.component.html', styleUrls: ['./multiple.component.scss'] }) diff --git a/lib/ng-nest/ui/select/examples/zh_CN/default/required/required.component.html b/lib/ng-nest/ui/select/examples/zh_CN/default/required/required.component.html index c80c30cb4..6c223f510 100644 --- a/lib/ng-nest/ui/select/examples/zh_CN/default/required/required.component.html +++ b/lib/ng-nest/ui/select/examples/zh_CN/default/required/required.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/select/examples/zh_CN/default/required/required.component.scss b/lib/ng-nest/ui/select/examples/zh_CN/default/required/required.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/select/examples/zh_CN/default/required/required.component.scss +++ b/lib/ng-nest/ui/select/examples/zh_CN/default/required/required.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 15rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/select/examples/zh_CN/default/required/required.component.ts b/lib/ng-nest/ui/select/examples/zh_CN/default/required/required.component.ts index adcc1a44e..f4529d380 100644 --- a/lib/ng-nest/ui/select/examples/zh_CN/default/required/required.component.ts +++ b/lib/ng-nest/ui/select/examples/zh_CN/default/required/required.component.ts @@ -1,9 +1,12 @@ import { Component } from '@angular/core'; -import { XSelectNode } from '@ng-nest/ui/select'; +import { XSelectComponent, XSelectNode } from '@ng-nest/ui/select'; import { XData } from '@ng-nest/ui/core'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'ex-required', + standalone: true, + imports: [FormsModule, XSelectComponent], templateUrl: './required.component.html', styleUrls: ['./required.component.scss'] }) diff --git a/lib/ng-nest/ui/select/examples/zh_CN/default/search/search.component.html b/lib/ng-nest/ui/select/examples/zh_CN/default/search/search.component.html index 5113e576b..1df0f2248 100644 --- a/lib/ng-nest/ui/select/examples/zh_CN/default/search/search.component.html +++ b/lib/ng-nest/ui/select/examples/zh_CN/default/search/search.component.html @@ -1,52 +1,64 @@ - - - - - - - - - - - - - - - - - - - 更多{{ surplus }},共{{ total }} - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + 更多{{ surplus }},共{{ total }} +
diff --git a/lib/ng-nest/ui/select/examples/zh_CN/default/search/search.component.scss b/lib/ng-nest/ui/select/examples/zh_CN/default/search/search.component.scss index 52eaa8024..067c34795 100644 --- a/lib/ng-nest/ui/select/examples/zh_CN/default/search/search.component.scss +++ b/lib/ng-nest/ui/select/examples/zh_CN/default/search/search.component.scss @@ -1,8 +1,8 @@ :host { - x-row > x-col > x-select { + .row > x-select { width: 20rem; } - x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/select/examples/zh_CN/default/search/search.component.ts b/lib/ng-nest/ui/select/examples/zh_CN/default/search/search.component.ts index 0e138d175..f0fe6103e 100644 --- a/lib/ng-nest/ui/select/examples/zh_CN/default/search/search.component.ts +++ b/lib/ng-nest/ui/select/examples/zh_CN/default/search/search.component.ts @@ -1,14 +1,35 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; import { XIsEmpty } from '@ng-nest/ui/core'; +import { XSelectComponent } from '@ng-nest/ui/select'; import { Observable } from 'rxjs'; @Component({ selector: 'ex-search', + standalone: true, + imports: [CommonModule, FormsModule, XSelectComponent], templateUrl: './search.component.html', styleUrls: ['./search.component.scss'] }) export class ExSearchComponent { - default = ['AAAA', 'BBBB', 'CCCC', 'DDDD', 'EEEE', 'FFFF', 'GGGG', 'HHHH', 'IIII', 'JJJJ', 'KKKK', 'LLLL', 'MMMM', 'NNNN', 'VVVV']; + default = [ + 'AAAA', + 'BBBB', + 'CCCC', + 'DDDD', + 'EEEE', + 'FFFF', + 'GGGG', + 'HHHH', + 'IIII', + 'JJJJ', + 'KKKK', + 'LLLL', + 'MMMM', + 'NNNN', + 'VVVV' + ]; data = [...this.default]; model = ''; diff --git a/lib/ng-nest/ui/select/examples/zh_CN/default/size/size.component.html b/lib/ng-nest/ui/select/examples/zh_CN/default/size/size.component.html index ed1951a39..1ef3ffd50 100644 --- a/lib/ng-nest/ui/select/examples/zh_CN/default/size/size.component.html +++ b/lib/ng-nest/ui/select/examples/zh_CN/default/size/size.component.html @@ -1,21 +1,19 @@ - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/select/examples/zh_CN/default/size/size.component.scss b/lib/ng-nest/ui/select/examples/zh_CN/default/size/size.component.scss index db47dab4e..5e83058ed 100644 --- a/lib/ng-nest/ui/select/examples/zh_CN/default/size/size.component.scss +++ b/lib/ng-nest/ui/select/examples/zh_CN/default/size/size.component.scss @@ -1,9 +1,5 @@ :host { - x-row { - width: 20rem; - } - x-row > x-col { + .row { margin-top: 1rem; - width: 15rem; } } diff --git a/lib/ng-nest/ui/select/examples/zh_CN/default/size/size.component.ts b/lib/ng-nest/ui/select/examples/zh_CN/default/size/size.component.ts index d4458196c..54c535bf1 100644 --- a/lib/ng-nest/ui/select/examples/zh_CN/default/size/size.component.ts +++ b/lib/ng-nest/ui/select/examples/zh_CN/default/size/size.component.ts @@ -1,9 +1,13 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; import { XData, XSize } from '@ng-nest/ui/core'; -import { XSelectNode } from '@ng-nest/ui/select'; +import { XRadioComponent } from '@ng-nest/ui/radio'; +import { XSelectComponent, XSelectNode } from '@ng-nest/ui/select'; @Component({ selector: 'ex-size', + standalone: true, + imports: [FormsModule, XSelectComponent, XRadioComponent], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/select/select-portal.component.ts b/lib/ng-nest/ui/select/select-portal.component.ts index d1934ac0d..fee10f1c3 100644 --- a/lib/ng-nest/ui/select/select-portal.component.ts +++ b/lib/ng-nest/ui/select/select-portal.component.ts @@ -18,9 +18,13 @@ import { map, takeUntil } from 'rxjs/operators'; import { XListComponent } from '@ng-nest/ui/list'; import { XInputComponent } from '@ng-nest/ui/input'; import { XI18nSelect, XI18nService } from '@ng-nest/ui/i18n'; +import { FormsModule } from '@angular/forms'; +import { CommonModule } from '@angular/common'; @Component({ selector: `${XSelectPortalPrefix}`, + standalone: true, + imports: [CommonModule, FormsModule, XListComponent], templateUrl: './select-portal.component.html', styleUrls: ['./select-portal.component.scss'], encapsulation: ViewEncapsulation.None, diff --git a/lib/ng-nest/ui/select/select.component.spec.ts b/lib/ng-nest/ui/select/select.component.spec.ts index 07d3e0ddc..11e9c95cf 100644 --- a/lib/ng-nest/ui/select/select.component.spec.ts +++ b/lib/ng-nest/ui/select/select.component.spec.ts @@ -1,17 +1,15 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XSelectComponent } from './select.component'; import { Component, DebugElement, ChangeDetectorRef } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { XSelectModule } from '@ng-nest/ui/select'; +import { XSelectComponent } from '@ng-nest/ui/select'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { XSelectPrefix, XSelectNode } from './select.property'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { Observable, interval } from 'rxjs'; import { XData } from '@ng-nest/ui/core'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XThemeComponent } from '@ng-nest/ui/theme'; +import { XRadioComponent } from '@ng-nest/ui/radio'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XSelectPrefix, () => { @@ -20,13 +18,13 @@ describe(XSelectPrefix, () => { imports: [ HttpClientTestingModule, BrowserAnimationsModule, - XThemeModule, - XSelectModule, + XThemeComponent, + XSelectComponent, FormsModule, ReactiveFormsModule, XRowComponent, XColComponent, - XRadioModule + XRadioComponent ], declarations: [ TestXSelectComponent, @@ -213,12 +211,7 @@ class TestXSelectComponent { - + @@ -411,12 +404,7 @@ class TestXSelectMultipleComponent { - + {{ node?.label }}2 @@ -482,31 +470,13 @@ class TestXSelectCustomNodeComponent { - + - + - + @@ -551,13 +521,7 @@ class TestXSelectSizeComponent { - + diff --git a/lib/ng-nest/ui/select/select.component.ts b/lib/ng-nest/ui/select/select.component.ts index 6000f4cde..dedd2cb88 100644 --- a/lib/ng-nest/ui/select/select.component.ts +++ b/lib/ng-nest/ui/select/select.component.ts @@ -12,7 +12,9 @@ import { ViewContainerRef, ViewChild, TemplateRef, - inject + inject, + AfterViewInit, + OnDestroy } from '@angular/core'; import { XSelectNode, XSelectProperty, XSelectPrefix } from './select.property'; import { @@ -37,22 +39,42 @@ import { import { XPortalService, XPortalOverlayRef, XPortalConnectedPosition } from '@ng-nest/ui/portal'; import { XInputComponent } from '@ng-nest/ui/input'; import { XSelectPortalComponent } from './select-portal.component'; -import { Overlay, FlexibleConnectedPositionStrategy, ConnectedOverlayPositionChange, OverlayConfig } from '@angular/cdk/overlay'; +import { + Overlay, + FlexibleConnectedPositionStrategy, + ConnectedOverlayPositionChange, + OverlayConfig +} from '@angular/cdk/overlay'; import { takeUntil, throttleTime, debounceTime, distinctUntilChanged, map, filter } from 'rxjs/operators'; -import { DOWN_ARROW, UP_ARROW, ENTER, MAC_ENTER, ESCAPE, LEFT_ARROW, RIGHT_ARROW, TAB, BACKSPACE } from '@angular/cdk/keycodes'; +import { + DOWN_ARROW, + UP_ARROW, + ENTER, + MAC_ENTER, + ESCAPE, + LEFT_ARROW, + RIGHT_ARROW, + TAB, + BACKSPACE +} from '@angular/cdk/keycodes'; import { XValueAccessor } from '@ng-nest/ui/base-form'; import { XI18nSelect, XI18nService } from '@ng-nest/ui/i18n'; -import { DOCUMENT } from '@angular/common'; +import { CommonModule, DOCUMENT } from '@angular/common'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { XTagComponent } from '@ng-nest/ui/tag'; +import { XOutletDirective } from '@ng-nest/ui/outlet'; @Component({ selector: `${XSelectPrefix}`, + standalone: true, + imports: [CommonModule, FormsModule, ReactiveFormsModule, XTagComponent, XInputComponent, XOutletDirective], templateUrl: './select.component.html', styleUrls: ['./select.component.scss'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, providers: [XValueAccessor(XSelectComponent)] }) -export class XSelectComponent extends XSelectProperty implements OnInit, OnChanges { +export class XSelectComponent extends XSelectProperty implements OnInit, OnChanges, AfterViewInit, OnDestroy { @ViewChild('inputCom', { static: true }) inputCom!: XInputComponent; @ViewChild('select', { static: true }) select!: ElementRef; @ViewChild('multipleValueTpl', { static: true }) multipleValueTpl!: TemplateRef; @@ -123,19 +145,14 @@ export class XSelectComponent extends XSelectProperty implements OnInit, OnChang private _unSubject = new Subject(); private _resizeObserver!: XResizeObserver; document = inject(DOCUMENT); - - constructor( - public renderer: Renderer2, - public override cdr: ChangeDetectorRef, - private portalService: XPortalService, - private viewContainerRef: ViewContainerRef, - public elementRef: ElementRef, - private overlay: Overlay, - public i18n: XI18nService, - public configService: XConfigService - ) { - super(); - } + private renderer = inject(Renderer2); + override cdr = inject(ChangeDetectorRef); + private portalService = inject(XPortalService); + private viewContainerRef = inject(ViewContainerRef); + private elementRef = inject(ElementRef); + private overlay = inject(Overlay); + private i18n = inject(XI18nService); + configService = inject(XConfigService); ngOnInit() { this.setFlex(this.select.nativeElement, this.renderer, this.justify, this.align, this.direction); @@ -207,12 +224,17 @@ export class XSelectComponent extends XSelectProperty implements OnInit, OnChang this.closeSubject.pipe(takeUntil(this._unSubject)).subscribe(() => { this.closePortal(); }); - this.inputChange.pipe(debounceTime(this.debounceTime as number), distinctUntilChanged(), takeUntil(this._unSubject)).subscribe((x) => { - this.modelChange(x); - }); + this.inputChange + .pipe(debounceTime(this.debounceTime as number), distinctUntilChanged(), takeUntil(this._unSubject)) + .subscribe((x) => { + this.modelChange(x); + }); this.keydownSubject.pipe(throttleTime(10), takeUntil(this._unSubject)).subscribe((x) => { const keyCode = x.keyCode; - if (!this.portalAttached() && [DOWN_ARROW, UP_ARROW, LEFT_ARROW, RIGHT_ARROW, ENTER, MAC_ENTER, BACKSPACE].includes(keyCode)) { + if ( + !this.portalAttached() && + [DOWN_ARROW, UP_ARROW, LEFT_ARROW, RIGHT_ARROW, ENTER, MAC_ENTER, BACKSPACE].includes(keyCode) + ) { this.inputChange.next(this.displayValue); } if (this.portalAttached() && [ESCAPE].includes(keyCode)) { @@ -323,7 +345,9 @@ export class XSelectComponent extends XSelectProperty implements OnInit, OnChang if (this.caseSensitive) { this.searchNodes = this.nodes.filter((x) => String(x.label).indexOf(String(value)) >= 0); } else { - this.searchNodes = this.nodes.filter((x) => String(x.label).toLowerCase().indexOf(String(value).toLowerCase()) >= 0); + this.searchNodes = this.nodes.filter( + (x) => String(x.label).toLowerCase().indexOf(String(value).toLowerCase()) >= 0 + ); } } diff --git a/lib/ng-nest/ui/select/select.module.ts b/lib/ng-nest/ui/select/select.module.ts index 36d27dc7d..a85e51335 100644 --- a/lib/ng-nest/ui/select/select.module.ts +++ b/lib/ng-nest/ui/select/select.module.ts @@ -1,29 +1,8 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { XSelectComponent } from './select.component'; -import { XInputComponent } from '@ng-nest/ui/input'; -import { XListComponent } from '@ng-nest/ui/list'; -import { XSelectPortalComponent } from './select-portal.component'; -import { XSelectProperty } from './select.property'; -import { XControlValueAccessor } from '@ng-nest/ui/base-form'; -import { XI18nDirective } from '@ng-nest/ui/i18n'; -import { XTagModule } from '@ng-nest/ui/tag'; -import { XOutletDirective } from '@ng-nest/ui/outlet'; @NgModule({ - declarations: [XSelectComponent, XSelectPortalComponent, XSelectProperty], - exports: [XSelectComponent, XSelectPortalComponent], - imports: [ - CommonModule, - FormsModule, - ReactiveFormsModule, - XInputComponent, - XListComponent, - XControlValueAccessor, - XTagModule, - XI18nDirective, - XOutletDirective - ] + exports: [XSelectComponent], + imports: [XSelectComponent] }) export class XSelectModule {} diff --git a/lib/ng-nest/ui/skeleton/examples/en_US/default/active/active.component.ts b/lib/ng-nest/ui/skeleton/examples/en_US/default/active/active.component.ts index 182800e43..53c8c9b55 100644 --- a/lib/ng-nest/ui/skeleton/examples/en_US/default/active/active.component.ts +++ b/lib/ng-nest/ui/skeleton/examples/en_US/default/active/active.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XSkeletonComponent } from '@ng-nest/ui/skeleton'; @Component({ selector: 'ex-active', + standalone: true, + imports: [XSkeletonComponent], templateUrl: './active.component.html' }) export class ExActiveComponent {} diff --git a/lib/ng-nest/ui/skeleton/examples/en_US/default/complex/complex.component.ts b/lib/ng-nest/ui/skeleton/examples/en_US/default/complex/complex.component.ts index 67502338b..15adaf435 100644 --- a/lib/ng-nest/ui/skeleton/examples/en_US/default/complex/complex.component.ts +++ b/lib/ng-nest/ui/skeleton/examples/en_US/default/complex/complex.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; -import { XSkeletonRow } from '@ng-nest/ui/skeleton'; +import { XSkeletonComponent, XSkeletonRow } from '@ng-nest/ui/skeleton'; @Component({ selector: 'ex-complex', + standalone: true, + imports: [XSkeletonComponent], templateUrl: './complex.component.html' }) export class ExComplexComponent { diff --git a/lib/ng-nest/ui/skeleton/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/skeleton/examples/en_US/default/default/default.component.ts index 77efc793a..dbf011b7f 100644 --- a/lib/ng-nest/ui/skeleton/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/skeleton/examples/en_US/default/default/default.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XSkeletonComponent } from '@ng-nest/ui/skeleton'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XSkeletonComponent], templateUrl: './default.component.html' }) export class ExDefaultComponent {} diff --git a/lib/ng-nest/ui/skeleton/examples/en_US/default/list/list.component.ts b/lib/ng-nest/ui/skeleton/examples/en_US/default/list/list.component.ts index 8c2c32f27..7125ad291 100644 --- a/lib/ng-nest/ui/skeleton/examples/en_US/default/list/list.component.ts +++ b/lib/ng-nest/ui/skeleton/examples/en_US/default/list/list.component.ts @@ -1,8 +1,25 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; -import { XSkeletonRow } from '@ng-nest/ui/skeleton'; +import { FormsModule } from '@angular/forms'; +import { XAvatarComponent } from '@ng-nest/ui/avatar'; +import { XColComponent, XRowComponent } from '@ng-nest/ui/layout'; +import { XLinkComponent } from '@ng-nest/ui/link'; +import { XSkeletonComponent, XSkeletonRow } from '@ng-nest/ui/skeleton'; +import { XSwitchComponent } from '@ng-nest/ui/switch'; @Component({ selector: 'ex-list', + standalone: true, + imports: [ + CommonModule, + FormsModule, + XSkeletonComponent, + XSwitchComponent, + XLinkComponent, + XRowComponent, + XColComponent, + XAvatarComponent + ], templateUrl: './list.component.html', styleUrls: ['./list.component.scss'] }) diff --git a/lib/ng-nest/ui/skeleton/examples/en_US/default/loading/loading.component.ts b/lib/ng-nest/ui/skeleton/examples/en_US/default/loading/loading.component.ts index 75abc79d2..da94566f6 100644 --- a/lib/ng-nest/ui/skeleton/examples/en_US/default/loading/loading.component.ts +++ b/lib/ng-nest/ui/skeleton/examples/en_US/default/loading/loading.component.ts @@ -1,7 +1,12 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSkeletonComponent } from '@ng-nest/ui/skeleton'; +import { XSwitchComponent } from '@ng-nest/ui/switch'; @Component({ selector: 'ex-loading', + standalone: true, + imports: [FormsModule, XSwitchComponent, XSkeletonComponent], templateUrl: './loading.component.html', styleUrls: ['./loading.component.scss'] }) diff --git a/lib/ng-nest/ui/skeleton/examples/en_US/default/table/table.component.ts b/lib/ng-nest/ui/skeleton/examples/en_US/default/table/table.component.ts index 990167213..08b1bad07 100644 --- a/lib/ng-nest/ui/skeleton/examples/en_US/default/table/table.component.ts +++ b/lib/ng-nest/ui/skeleton/examples/en_US/default/table/table.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; -import { XSkeletonRow } from '@ng-nest/ui/skeleton'; +import { XSkeletonComponent, XSkeletonRow } from '@ng-nest/ui/skeleton'; @Component({ selector: 'ex-table', + standalone: true, + imports: [XSkeletonComponent], templateUrl: './table.component.html' }) export class ExTableComponent { diff --git a/lib/ng-nest/ui/skeleton/examples/index.ts b/lib/ng-nest/ui/skeleton/examples/index.ts new file mode 100644 index 000000000..a5148ed76 --- /dev/null +++ b/lib/ng-nest/ui/skeleton/examples/index.ts @@ -0,0 +1,6 @@ +export * from './zh_CN/default/active/active.component'; +export * from './zh_CN/default/complex/complex.component'; +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/list/list.component'; +export * from './zh_CN/default/loading/loading.component'; +export * from './zh_CN/default/table/table.component'; diff --git a/lib/ng-nest/ui/skeleton/examples/zh_CN/default/active/active.component.ts b/lib/ng-nest/ui/skeleton/examples/zh_CN/default/active/active.component.ts index 182800e43..53c8c9b55 100644 --- a/lib/ng-nest/ui/skeleton/examples/zh_CN/default/active/active.component.ts +++ b/lib/ng-nest/ui/skeleton/examples/zh_CN/default/active/active.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XSkeletonComponent } from '@ng-nest/ui/skeleton'; @Component({ selector: 'ex-active', + standalone: true, + imports: [XSkeletonComponent], templateUrl: './active.component.html' }) export class ExActiveComponent {} diff --git a/lib/ng-nest/ui/skeleton/examples/zh_CN/default/complex/complex.component.ts b/lib/ng-nest/ui/skeleton/examples/zh_CN/default/complex/complex.component.ts index 67502338b..15adaf435 100644 --- a/lib/ng-nest/ui/skeleton/examples/zh_CN/default/complex/complex.component.ts +++ b/lib/ng-nest/ui/skeleton/examples/zh_CN/default/complex/complex.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; -import { XSkeletonRow } from '@ng-nest/ui/skeleton'; +import { XSkeletonComponent, XSkeletonRow } from '@ng-nest/ui/skeleton'; @Component({ selector: 'ex-complex', + standalone: true, + imports: [XSkeletonComponent], templateUrl: './complex.component.html' }) export class ExComplexComponent { diff --git a/lib/ng-nest/ui/skeleton/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/skeleton/examples/zh_CN/default/default/default.component.ts index 77efc793a..dbf011b7f 100644 --- a/lib/ng-nest/ui/skeleton/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/skeleton/examples/zh_CN/default/default/default.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XSkeletonComponent } from '@ng-nest/ui/skeleton'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XSkeletonComponent], templateUrl: './default.component.html' }) export class ExDefaultComponent {} diff --git a/lib/ng-nest/ui/skeleton/examples/zh_CN/default/list/list.component.html b/lib/ng-nest/ui/skeleton/examples/zh_CN/default/list/list.component.html index 746421d41..a64152eb3 100644 --- a/lib/ng-nest/ui/skeleton/examples/zh_CN/default/list/list.component.html +++ b/lib/ng-nest/ui/skeleton/examples/zh_CN/default/list/list.component.html @@ -4,10 +4,7 @@ - + diff --git a/lib/ng-nest/ui/skeleton/examples/zh_CN/default/list/list.component.ts b/lib/ng-nest/ui/skeleton/examples/zh_CN/default/list/list.component.ts index 8c2c32f27..7125ad291 100644 --- a/lib/ng-nest/ui/skeleton/examples/zh_CN/default/list/list.component.ts +++ b/lib/ng-nest/ui/skeleton/examples/zh_CN/default/list/list.component.ts @@ -1,8 +1,25 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; -import { XSkeletonRow } from '@ng-nest/ui/skeleton'; +import { FormsModule } from '@angular/forms'; +import { XAvatarComponent } from '@ng-nest/ui/avatar'; +import { XColComponent, XRowComponent } from '@ng-nest/ui/layout'; +import { XLinkComponent } from '@ng-nest/ui/link'; +import { XSkeletonComponent, XSkeletonRow } from '@ng-nest/ui/skeleton'; +import { XSwitchComponent } from '@ng-nest/ui/switch'; @Component({ selector: 'ex-list', + standalone: true, + imports: [ + CommonModule, + FormsModule, + XSkeletonComponent, + XSwitchComponent, + XLinkComponent, + XRowComponent, + XColComponent, + XAvatarComponent + ], templateUrl: './list.component.html', styleUrls: ['./list.component.scss'] }) diff --git a/lib/ng-nest/ui/skeleton/examples/zh_CN/default/loading/loading.component.ts b/lib/ng-nest/ui/skeleton/examples/zh_CN/default/loading/loading.component.ts index 75abc79d2..da94566f6 100644 --- a/lib/ng-nest/ui/skeleton/examples/zh_CN/default/loading/loading.component.ts +++ b/lib/ng-nest/ui/skeleton/examples/zh_CN/default/loading/loading.component.ts @@ -1,7 +1,12 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSkeletonComponent } from '@ng-nest/ui/skeleton'; +import { XSwitchComponent } from '@ng-nest/ui/switch'; @Component({ selector: 'ex-loading', + standalone: true, + imports: [FormsModule, XSwitchComponent, XSkeletonComponent], templateUrl: './loading.component.html', styleUrls: ['./loading.component.scss'] }) diff --git a/lib/ng-nest/ui/skeleton/examples/zh_CN/default/table/table.component.ts b/lib/ng-nest/ui/skeleton/examples/zh_CN/default/table/table.component.ts index 990167213..08b1bad07 100644 --- a/lib/ng-nest/ui/skeleton/examples/zh_CN/default/table/table.component.ts +++ b/lib/ng-nest/ui/skeleton/examples/zh_CN/default/table/table.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; -import { XSkeletonRow } from '@ng-nest/ui/skeleton'; +import { XSkeletonComponent, XSkeletonRow } from '@ng-nest/ui/skeleton'; @Component({ selector: 'ex-table', + standalone: true, + imports: [XSkeletonComponent], templateUrl: './table.component.html' }) export class ExTableComponent { diff --git a/lib/ng-nest/ui/skeleton/skeleton.component.spec.ts b/lib/ng-nest/ui/skeleton/skeleton.component.spec.ts index c53ddce07..c7e4969fc 100644 --- a/lib/ng-nest/ui/skeleton/skeleton.component.spec.ts +++ b/lib/ng-nest/ui/skeleton/skeleton.component.spec.ts @@ -1,20 +1,18 @@ import { XIconComponent } from '@ng-nest/ui/icon'; import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XSkeletonComponent } from './skeleton.component'; import { Component, DebugElement, ChangeDetectorRef, ViewEncapsulation } from '@angular/core'; import { By } from '@angular/platform-browser'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; -import { XSkeletonModule } from '@ng-nest/ui/skeleton'; +import { XSkeletonComponent } from '@ng-nest/ui/skeleton'; import { FormsModule } from '@angular/forms'; import { XSkeletonPrefix, XSkeletonRow } from './skeleton.property'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XContainerComponent } from '@ng-nest/ui/container'; -import { XSwitchModule } from '@ng-nest/ui/switch'; +import { XSwitchComponent } from '@ng-nest/ui/switch'; import { XAvatarComponent } from '@ng-nest/ui/avatar'; import { XLinkComponent } from '@ng-nest/ui/link'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XSkeletonPrefix, () => { @@ -23,10 +21,10 @@ describe(XSkeletonPrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, FormsModule, - XSkeletonModule, - XSwitchModule, + XSkeletonComponent, + XSwitchComponent, XButtonComponent, XContainerComponent, XRowComponent, @@ -85,10 +83,7 @@ describe(XSkeletonPrefix, () => { - + diff --git a/lib/ng-nest/ui/skeleton/skeleton.component.ts b/lib/ng-nest/ui/skeleton/skeleton.component.ts index 2308417cd..f9ebdbb1c 100644 --- a/lib/ng-nest/ui/skeleton/skeleton.component.ts +++ b/lib/ng-nest/ui/skeleton/skeleton.component.ts @@ -2,32 +2,29 @@ import { Component, OnInit, ViewEncapsulation, - Renderer2, - ElementRef, ChangeDetectorRef, ChangeDetectionStrategy, SimpleChanges, - OnChanges + OnChanges, + inject } from '@angular/core'; import { XSkeletonPrefix, XSkeletonProperty } from './skeleton.property'; import { XIsChange, XConfigService } from '@ng-nest/ui/core'; +import { CommonModule } from '@angular/common'; +import { XColComponent, XRowComponent } from '@ng-nest/ui/layout'; @Component({ selector: `${XSkeletonPrefix}`, + standalone: true, + imports: [CommonModule, XRowComponent, XColComponent], templateUrl: './skeleton.component.html', styleUrls: ['./skeleton.component.scss'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush }) export class XSkeletonComponent extends XSkeletonProperty implements OnInit, OnChanges { - constructor( - public renderer: Renderer2, - public elementRef: ElementRef, - public cdr: ChangeDetectorRef, - public configService: XConfigService - ) { - super(); - } + private cdr = inject(ChangeDetectorRef); + configService = inject(XConfigService); ngOnInit() { this.setClassMap(); diff --git a/lib/ng-nest/ui/skeleton/skeleton.module.ts b/lib/ng-nest/ui/skeleton/skeleton.module.ts index ff3db3c9c..56b0ca09d 100644 --- a/lib/ng-nest/ui/skeleton/skeleton.module.ts +++ b/lib/ng-nest/ui/skeleton/skeleton.module.ts @@ -1,12 +1,8 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { XSkeletonComponent } from './skeleton.component'; -import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; -import { XSkeletonProperty } from './skeleton.property'; @NgModule({ - declarations: [XSkeletonComponent, XSkeletonProperty], exports: [XSkeletonComponent], - imports: [CommonModule, XRowComponent, XColComponent] + imports: [XSkeletonComponent] }) export class XSkeletonModule {} diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/custom-value/custom-value.component.html b/lib/ng-nest/ui/slider-select/examples/en_US/default/custom-value/custom-value.component.html index 22ff36dca..9bdd72e03 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/custom-value/custom-value.component.html +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/custom-value/custom-value.component.html @@ -1,12 +1,8 @@ - - - - - - - - +
+ +
+
+ +
- - {{ value }} % - + {{ value }} % diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/custom-value/custom-value.component.scss b/lib/ng-nest/ui/slider-select/examples/en_US/default/custom-value/custom-value.component.scss index e668b09a9..9fe6d3984 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/custom-value/custom-value.component.scss +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/custom-value/custom-value.component.scss @@ -1,5 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } \ No newline at end of file diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/custom-value/custom-value.component.ts b/lib/ng-nest/ui/slider-select/examples/en_US/default/custom-value/custom-value.component.ts index f621f0912..6f48a8d59 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/custom-value/custom-value.component.ts +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/custom-value/custom-value.component.ts @@ -1,7 +1,12 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XSliderSelectComponent } from '@ng-nest/ui/slider-select'; @Component({ selector: 'ex-custom-value', + standalone: true, + imports: [FormsModule, XSliderSelectComponent, XIconComponent], templateUrl: './custom-value.component.html', styleUrls: ['./custom-value.component.scss'] }) diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/default/default.component.html b/lib/ng-nest/ui/slider-select/examples/en_US/default/default/default.component.html index 3385952f9..0ee240271 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/default/default.component.html +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/default/default.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/default/default.component.scss b/lib/ng-nest/ui/slider-select/examples/en_US/default/default/default.component.scss index 3ec576c8c..b4943baa0 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/default/default.component.scss +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/default/default.component.scss @@ -1,5 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/slider-select/examples/en_US/default/default/default.component.ts index f0bbb3ba6..52eb8d45b 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/default/default.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSliderSelectComponent } from '@ng-nest/ui/slider-select'; @Component({ selector: 'ex-default', + standalone: true, + imports: [FormsModule, XSliderSelectComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/disabled/disabled.component.html b/lib/ng-nest/ui/slider-select/examples/en_US/default/disabled/disabled.component.html index 42b37856d..ae78e7db9 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/disabled/disabled.component.html +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/disabled/disabled.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/disabled/disabled.component.scss b/lib/ng-nest/ui/slider-select/examples/en_US/default/disabled/disabled.component.scss index 3ec576c8c..b4943baa0 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/disabled/disabled.component.scss +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/disabled/disabled.component.scss @@ -1,5 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/disabled/disabled.component.ts b/lib/ng-nest/ui/slider-select/examples/en_US/default/disabled/disabled.component.ts index 8455c5b26..75fafc9e2 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/disabled/disabled.component.ts +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/disabled/disabled.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSliderSelectComponent } from '@ng-nest/ui/slider-select'; @Component({ selector: 'ex-disabled', + standalone: true, + imports: [FormsModule, XSliderSelectComponent], templateUrl: './disabled.component.html', styleUrls: ['./disabled.component.scss'] }) diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/icon/icon.component.html b/lib/ng-nest/ui/slider-select/examples/en_US/default/icon/icon.component.html index e34da0067..925212ec7 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/icon/icon.component.html +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/icon/icon.component.html @@ -1,11 +1,9 @@ - - - - - - - - - - - +
+ +
+
+ + + + +
diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/icon/icon.component.scss b/lib/ng-nest/ui/slider-select/examples/en_US/default/icon/icon.component.scss index e668b09a9..9fe6d3984 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/icon/icon.component.scss +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/icon/icon.component.scss @@ -1,5 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } \ No newline at end of file diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/icon/icon.component.ts b/lib/ng-nest/ui/slider-select/examples/en_US/default/icon/icon.component.ts index 6f65d3ee1..9985c9f22 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/icon/icon.component.ts +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/icon/icon.component.ts @@ -1,7 +1,13 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XSliderSelectComponent } from '@ng-nest/ui/slider-select'; @Component({ selector: 'ex-icon', + standalone: true, + imports: [CommonModule, FormsModule, XSliderSelectComponent, XButtonComponent], templateUrl: './icon.component.html', styleUrls: ['./icon.component.scss'] }) diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/label/label.component.html b/lib/ng-nest/ui/slider-select/examples/en_US/default/label/label.component.html index 357362dec..18cddf697 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/label/label.component.html +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/label/label.component.html @@ -1,20 +1,12 @@ - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/label/label.component.scss b/lib/ng-nest/ui/slider-select/examples/en_US/default/label/label.component.scss index 3ec576c8c..b4943baa0 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/label/label.component.scss +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/label/label.component.scss @@ -1,5 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/label/label.component.ts b/lib/ng-nest/ui/slider-select/examples/en_US/default/label/label.component.ts index 1395d0b49..1392bd9e2 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/label/label.component.ts +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/label/label.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSliderSelectComponent } from '@ng-nest/ui/slider-select'; @Component({ selector: 'ex-label', + standalone: true, + imports: [FormsModule, XSliderSelectComponent], templateUrl: './label.component.html', styleUrls: ['./label.component.scss'] }) diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/limit/limit.component.html b/lib/ng-nest/ui/slider-select/examples/en_US/default/limit/limit.component.html index 4b2a5cd1b..d08e1f03e 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/limit/limit.component.html +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/limit/limit.component.html @@ -1,15 +1,9 @@ - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/limit/limit.component.scss b/lib/ng-nest/ui/slider-select/examples/en_US/default/limit/limit.component.scss index 3ec576c8c..b4943baa0 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/limit/limit.component.scss +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/limit/limit.component.scss @@ -1,5 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/limit/limit.component.ts b/lib/ng-nest/ui/slider-select/examples/en_US/default/limit/limit.component.ts index e72640acf..3c434676f 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/limit/limit.component.ts +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/limit/limit.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSliderSelectComponent } from '@ng-nest/ui/slider-select'; @Component({ selector: 'ex-limit', + standalone: true, + imports: [FormsModule, XSliderSelectComponent], templateUrl: './limit.component.html', styleUrls: ['./limit.component.scss'] }) diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/marks/marks.component.html b/lib/ng-nest/ui/slider-select/examples/en_US/default/marks/marks.component.html index a56c1ffef..ce2cf4933 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/marks/marks.component.html +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/marks/marks.component.html @@ -1,30 +1,12 @@ - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/marks/marks.component.scss b/lib/ng-nest/ui/slider-select/examples/en_US/default/marks/marks.component.scss index 679a19b47..b4943baa0 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/marks/marks.component.scss +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/marks/marks.component.scss @@ -1,5 +1,5 @@ :host { - x-col { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/marks/marks.component.ts b/lib/ng-nest/ui/slider-select/examples/en_US/default/marks/marks.component.ts index 5d39db6b5..878ba11fa 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/marks/marks.component.ts +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/marks/marks.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; -import { XSliderSelectMark } from '@ng-nest/ui/slider-select'; +import { FormsModule } from '@angular/forms'; +import { XSliderSelectComponent, XSliderSelectMark } from '@ng-nest/ui/slider-select'; @Component({ selector: 'ex-marks', + standalone: true, + imports: [FormsModule, XSliderSelectComponent], templateUrl: './marks.component.html', styleUrls: ['./marks.component.scss'] }) diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/precision/precision.component.html b/lib/ng-nest/ui/slider-select/examples/en_US/default/precision/precision.component.html index f768f5bdb..6d5d71a73 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/precision/precision.component.html +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/precision/precision.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/precision/precision.component.scss b/lib/ng-nest/ui/slider-select/examples/en_US/default/precision/precision.component.scss index 3ec576c8c..b4943baa0 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/precision/precision.component.scss +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/precision/precision.component.scss @@ -1,5 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/precision/precision.component.ts b/lib/ng-nest/ui/slider-select/examples/en_US/default/precision/precision.component.ts index 217dd1d91..284e70836 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/precision/precision.component.ts +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/precision/precision.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSliderSelectComponent } from '@ng-nest/ui/slider-select'; @Component({ selector: 'ex-precision', + standalone: true, + imports: [FormsModule, XSliderSelectComponent], templateUrl: './precision.component.html', styleUrls: ['./precision.component.scss'] }) diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/range/range.component.html b/lib/ng-nest/ui/slider-select/examples/en_US/default/range/range.component.html index 7f7cbfbc4..c15cdd0fa 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/range/range.component.html +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/range/range.component.html @@ -1,12 +1,10 @@ - - - - - - - - - - - - +
+ + +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/range/range.component.scss b/lib/ng-nest/ui/slider-select/examples/en_US/default/range/range.component.scss index 3ec576c8c..b4943baa0 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/range/range.component.scss +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/range/range.component.scss @@ -1,5 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/range/range.component.ts b/lib/ng-nest/ui/slider-select/examples/en_US/default/range/range.component.ts index 9de647a9d..308b45382 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/range/range.component.ts +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/range/range.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSliderSelectComponent } from '@ng-nest/ui/slider-select'; @Component({ selector: 'ex-range', + standalone: true, + imports: [FormsModule, XSliderSelectComponent], templateUrl: './range.component.html', styleUrls: ['./range.component.scss'] }) diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/reverse/reverse.component.html b/lib/ng-nest/ui/slider-select/examples/en_US/default/reverse/reverse.component.html index d164c0c12..a26ec598c 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/reverse/reverse.component.html +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/reverse/reverse.component.html @@ -1,8 +1,6 @@ - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/reverse/reverse.component.scss b/lib/ng-nest/ui/slider-select/examples/en_US/default/reverse/reverse.component.scss index e668b09a9..9fe6d3984 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/reverse/reverse.component.scss +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/reverse/reverse.component.scss @@ -1,5 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } \ No newline at end of file diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/reverse/reverse.component.ts b/lib/ng-nest/ui/slider-select/examples/en_US/default/reverse/reverse.component.ts index 39c4a0455..2a64eb8b2 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/reverse/reverse.component.ts +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/reverse/reverse.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSliderSelectComponent } from '@ng-nest/ui/slider-select'; @Component({ selector: 'ex-reverse', + standalone: true, + imports: [FormsModule, XSliderSelectComponent], templateUrl: './reverse.component.html', styleUrls: ['./reverse.component.scss'] }) diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/vertical/vertical.component.html b/lib/ng-nest/ui/slider-select/examples/en_US/default/vertical/vertical.component.html index 3e0414f2b..1365ddd0e 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/vertical/vertical.component.html +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/vertical/vertical.component.html @@ -1,8 +1,6 @@ - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/vertical/vertical.component.scss b/lib/ng-nest/ui/slider-select/examples/en_US/default/vertical/vertical.component.scss index 56640f9a7..b4943baa0 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/vertical/vertical.component.scss +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/vertical/vertical.component.scss @@ -1,8 +1,5 @@ :host { - x-row { - margin-top: 10rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/slider-select/examples/en_US/default/vertical/vertical.component.ts b/lib/ng-nest/ui/slider-select/examples/en_US/default/vertical/vertical.component.ts index 0c0d618e6..a7543297f 100644 --- a/lib/ng-nest/ui/slider-select/examples/en_US/default/vertical/vertical.component.ts +++ b/lib/ng-nest/ui/slider-select/examples/en_US/default/vertical/vertical.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSliderSelectComponent } from '@ng-nest/ui/slider-select'; @Component({ selector: 'ex-vertical', + standalone: true, + imports: [FormsModule, XSliderSelectComponent], templateUrl: './vertical.component.html', styleUrls: ['./vertical.component.scss'] }) diff --git a/lib/ng-nest/ui/slider-select/examples/index.ts b/lib/ng-nest/ui/slider-select/examples/index.ts new file mode 100644 index 000000000..d586874ff --- /dev/null +++ b/lib/ng-nest/ui/slider-select/examples/index.ts @@ -0,0 +1,11 @@ +export * from './zh_CN/default/custom-value/custom-value.component'; +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/disabled/disabled.component'; +export * from './zh_CN/default/icon/icon.component'; +export * from './zh_CN/default/label/label.component'; +export * from './zh_CN/default/limit/limit.component'; +export * from './zh_CN/default/marks/marks.component'; +export * from './zh_CN/default/precision/precision.component'; +export * from './zh_CN/default/range/range.component'; +export * from './zh_CN/default/reverse/reverse.component'; +export * from './zh_CN/default/vertical/vertical.component'; diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/custom-value/custom-value.component.html b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/custom-value/custom-value.component.html index 22ff36dca..9bdd72e03 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/custom-value/custom-value.component.html +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/custom-value/custom-value.component.html @@ -1,12 +1,8 @@ - - - - - - - - +
+ +
+
+ +
- - {{ value }} % - + {{ value }} % diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/custom-value/custom-value.component.scss b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/custom-value/custom-value.component.scss index e668b09a9..9fe6d3984 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/custom-value/custom-value.component.scss +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/custom-value/custom-value.component.scss @@ -1,5 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } \ No newline at end of file diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/custom-value/custom-value.component.ts b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/custom-value/custom-value.component.ts index f621f0912..6f48a8d59 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/custom-value/custom-value.component.ts +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/custom-value/custom-value.component.ts @@ -1,7 +1,12 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XSliderSelectComponent } from '@ng-nest/ui/slider-select'; @Component({ selector: 'ex-custom-value', + standalone: true, + imports: [FormsModule, XSliderSelectComponent, XIconComponent], templateUrl: './custom-value.component.html', styleUrls: ['./custom-value.component.scss'] }) diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/default/default.component.html b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/default/default.component.html index 3385952f9..0ee240271 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/default/default.component.html +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/default/default.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/default/default.component.scss b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/default/default.component.scss index 3ec576c8c..b4943baa0 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/default/default.component.scss +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/default/default.component.scss @@ -1,5 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/default/default.component.ts index f0bbb3ba6..52eb8d45b 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/default/default.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSliderSelectComponent } from '@ng-nest/ui/slider-select'; @Component({ selector: 'ex-default', + standalone: true, + imports: [FormsModule, XSliderSelectComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/disabled/disabled.component.html b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/disabled/disabled.component.html index 42b37856d..ae78e7db9 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/disabled/disabled.component.html +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/disabled/disabled.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/disabled/disabled.component.scss b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/disabled/disabled.component.scss index 3ec576c8c..b4943baa0 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/disabled/disabled.component.scss +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/disabled/disabled.component.scss @@ -1,5 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/disabled/disabled.component.ts b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/disabled/disabled.component.ts index 8455c5b26..75fafc9e2 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/disabled/disabled.component.ts +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/disabled/disabled.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSliderSelectComponent } from '@ng-nest/ui/slider-select'; @Component({ selector: 'ex-disabled', + standalone: true, + imports: [FormsModule, XSliderSelectComponent], templateUrl: './disabled.component.html', styleUrls: ['./disabled.component.scss'] }) diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/icon/icon.component.html b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/icon/icon.component.html index e34da0067..925212ec7 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/icon/icon.component.html +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/icon/icon.component.html @@ -1,11 +1,9 @@ - - - - - - - - - - - +
+ +
+
+ + + + +
diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/icon/icon.component.scss b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/icon/icon.component.scss index e668b09a9..9fe6d3984 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/icon/icon.component.scss +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/icon/icon.component.scss @@ -1,5 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } \ No newline at end of file diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/icon/icon.component.ts b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/icon/icon.component.ts index 6f65d3ee1..9985c9f22 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/icon/icon.component.ts +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/icon/icon.component.ts @@ -1,7 +1,13 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XSliderSelectComponent } from '@ng-nest/ui/slider-select'; @Component({ selector: 'ex-icon', + standalone: true, + imports: [CommonModule, FormsModule, XSliderSelectComponent, XButtonComponent], templateUrl: './icon.component.html', styleUrls: ['./icon.component.scss'] }) diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/label/label.component.html b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/label/label.component.html index a11d9c8ea..207d8f419 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/label/label.component.html +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/label/label.component.html @@ -1,20 +1,12 @@ - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/label/label.component.scss b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/label/label.component.scss index 3ec576c8c..b4943baa0 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/label/label.component.scss +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/label/label.component.scss @@ -1,5 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/label/label.component.ts b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/label/label.component.ts index 1395d0b49..1392bd9e2 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/label/label.component.ts +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/label/label.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSliderSelectComponent } from '@ng-nest/ui/slider-select'; @Component({ selector: 'ex-label', + standalone: true, + imports: [FormsModule, XSliderSelectComponent], templateUrl: './label.component.html', styleUrls: ['./label.component.scss'] }) diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/limit/limit.component.html b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/limit/limit.component.html index 4b2a5cd1b..d08e1f03e 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/limit/limit.component.html +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/limit/limit.component.html @@ -1,15 +1,9 @@ - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/limit/limit.component.scss b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/limit/limit.component.scss index 3ec576c8c..b4943baa0 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/limit/limit.component.scss +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/limit/limit.component.scss @@ -1,5 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/limit/limit.component.ts b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/limit/limit.component.ts index e72640acf..3c434676f 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/limit/limit.component.ts +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/limit/limit.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSliderSelectComponent } from '@ng-nest/ui/slider-select'; @Component({ selector: 'ex-limit', + standalone: true, + imports: [FormsModule, XSliderSelectComponent], templateUrl: './limit.component.html', styleUrls: ['./limit.component.scss'] }) diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/marks/marks.component.html b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/marks/marks.component.html index a56c1ffef..ce2cf4933 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/marks/marks.component.html +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/marks/marks.component.html @@ -1,30 +1,12 @@ - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/marks/marks.component.scss b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/marks/marks.component.scss index 679a19b47..b4943baa0 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/marks/marks.component.scss +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/marks/marks.component.scss @@ -1,5 +1,5 @@ :host { - x-col { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/marks/marks.component.ts b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/marks/marks.component.ts index 5d39db6b5..878ba11fa 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/marks/marks.component.ts +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/marks/marks.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; -import { XSliderSelectMark } from '@ng-nest/ui/slider-select'; +import { FormsModule } from '@angular/forms'; +import { XSliderSelectComponent, XSliderSelectMark } from '@ng-nest/ui/slider-select'; @Component({ selector: 'ex-marks', + standalone: true, + imports: [FormsModule, XSliderSelectComponent], templateUrl: './marks.component.html', styleUrls: ['./marks.component.scss'] }) diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/precision/precision.component.html b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/precision/precision.component.html index f768f5bdb..6d5d71a73 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/precision/precision.component.html +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/precision/precision.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/precision/precision.component.scss b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/precision/precision.component.scss index 3ec576c8c..b4943baa0 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/precision/precision.component.scss +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/precision/precision.component.scss @@ -1,5 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/precision/precision.component.ts b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/precision/precision.component.ts index 217dd1d91..284e70836 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/precision/precision.component.ts +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/precision/precision.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSliderSelectComponent } from '@ng-nest/ui/slider-select'; @Component({ selector: 'ex-precision', + standalone: true, + imports: [FormsModule, XSliderSelectComponent], templateUrl: './precision.component.html', styleUrls: ['./precision.component.scss'] }) diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/range/range.component.html b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/range/range.component.html index 7f7cbfbc4..c15cdd0fa 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/range/range.component.html +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/range/range.component.html @@ -1,12 +1,10 @@ - - - - - - - - - - - - +
+ + +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/range/range.component.scss b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/range/range.component.scss index 3ec576c8c..b4943baa0 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/range/range.component.scss +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/range/range.component.scss @@ -1,5 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/range/range.component.ts b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/range/range.component.ts index 9de647a9d..308b45382 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/range/range.component.ts +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/range/range.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSliderSelectComponent } from '@ng-nest/ui/slider-select'; @Component({ selector: 'ex-range', + standalone: true, + imports: [FormsModule, XSliderSelectComponent], templateUrl: './range.component.html', styleUrls: ['./range.component.scss'] }) diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/reverse/reverse.component.html b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/reverse/reverse.component.html index d164c0c12..a26ec598c 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/reverse/reverse.component.html +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/reverse/reverse.component.html @@ -1,8 +1,6 @@ - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/reverse/reverse.component.scss b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/reverse/reverse.component.scss index e668b09a9..b4943baa0 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/reverse/reverse.component.scss +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/reverse/reverse.component.scss @@ -1,5 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } -} \ No newline at end of file +} diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/reverse/reverse.component.ts b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/reverse/reverse.component.ts index 39c4a0455..2a64eb8b2 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/reverse/reverse.component.ts +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/reverse/reverse.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSliderSelectComponent } from '@ng-nest/ui/slider-select'; @Component({ selector: 'ex-reverse', + standalone: true, + imports: [FormsModule, XSliderSelectComponent], templateUrl: './reverse.component.html', styleUrls: ['./reverse.component.scss'] }) diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/vertical/vertical.component.html b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/vertical/vertical.component.html index 3e0414f2b..5cddfc9ca 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/vertical/vertical.component.html +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/vertical/vertical.component.html @@ -1,8 +1,6 @@ - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/vertical/vertical.component.scss b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/vertical/vertical.component.scss index 3ec576c8c..b4943baa0 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/vertical/vertical.component.scss +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/vertical/vertical.component.scss @@ -1,5 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/vertical/vertical.component.ts b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/vertical/vertical.component.ts index 0c0d618e6..a7543297f 100644 --- a/lib/ng-nest/ui/slider-select/examples/zh_CN/default/vertical/vertical.component.ts +++ b/lib/ng-nest/ui/slider-select/examples/zh_CN/default/vertical/vertical.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSliderSelectComponent } from '@ng-nest/ui/slider-select'; @Component({ selector: 'ex-vertical', + standalone: true, + imports: [FormsModule, XSliderSelectComponent], templateUrl: './vertical.component.html', styleUrls: ['./vertical.component.scss'] }) diff --git a/lib/ng-nest/ui/slider-select/slider-select.component.spec.ts b/lib/ng-nest/ui/slider-select/slider-select.component.spec.ts index 076ab2737..a1dd06422 100644 --- a/lib/ng-nest/ui/slider-select/slider-select.component.spec.ts +++ b/lib/ng-nest/ui/slider-select/slider-select.component.spec.ts @@ -1,15 +1,13 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XSliderSelectComponent } from './slider-select.component'; import { Component, DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { XSliderSelectModule } from '@ng-nest/ui/slider-select'; +import { XSliderSelectComponent } from '@ng-nest/ui/slider-select'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { XSliderSelectPrefix } from './slider-select.property'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; -import { XTabsModule } from '@ng-nest/ui/tabs'; +import { XTabsComponent, XTabComponent } from '@ng-nest/ui/tabs'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { XIconComponent } from '@ng-nest/ui/icon'; import { XButtonComponent } from '@ng-nest/ui/button'; @@ -20,13 +18,14 @@ describe(XSliderSelectPrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, - XSliderSelectModule, + XThemeComponent, + XSliderSelectComponent, FormsModule, ReactiveFormsModule, XRowComponent, XColComponent, - XTabsModule, + XTabsComponent, + XTabComponent, XIconComponent, XButtonComponent ], @@ -222,11 +221,7 @@ class TestXSliderSelectPrecisionComponent {} - + diff --git a/lib/ng-nest/ui/slider-select/slider-select.component.ts b/lib/ng-nest/ui/slider-select/slider-select.component.ts index a19d8ab99..e6d52b15d 100644 --- a/lib/ng-nest/ui/slider-select/slider-select.component.ts +++ b/lib/ng-nest/ui/slider-select/slider-select.component.ts @@ -12,13 +12,10 @@ import { AfterViewInit, HostBinding, ViewChildren, - QueryList + QueryList, + inject } from '@angular/core'; -import { - XSliderSelectProperty, - XSliderSelectPrefix, - XSliderSelectMark -} from './slider-select.property'; +import { XSliderSelectProperty, XSliderSelectPrefix, XSliderSelectMark } from './slider-select.property'; import { XIsEmpty, XIsUndefined, @@ -30,23 +27,34 @@ import { XIsArray, XIsNull } from '@ng-nest/ui/core'; -import { CdkDragMove, CdkDragStart, CdkDragEnd, CdkDrag } from '@angular/cdk/drag-drop'; +import { CdkDragMove, CdkDragStart, CdkDragEnd, CdkDrag, DragDropModule } from '@angular/cdk/drag-drop'; import { Subject } from 'rxjs'; import { debounceTime, takeUntil } from 'rxjs/operators'; import { XValueAccessor } from '@ng-nest/ui/base-form'; +import { CommonModule } from '@angular/common'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { XDragDirective } from '@ng-nest/ui/drag'; +import { XOutletDirective } from '@ng-nest/ui/outlet'; @Component({ selector: `${XSliderSelectPrefix}`, + standalone: true, + imports: [ + CommonModule, + FormsModule, + ReactiveFormsModule, + DragDropModule, + XTooltipDirective, + XDragDirective, + XOutletDirective + ], templateUrl: './slider-select.component.html', styleUrls: ['./slider-select.component.scss'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, providers: [XValueAccessor(XSliderSelectComponent)] }) -export class XSliderSelectComponent - extends XSliderSelectProperty - implements OnInit, OnDestroy, AfterViewInit -{ +export class XSliderSelectComponent extends XSliderSelectProperty implements OnInit, OnDestroy, AfterViewInit { @ViewChild('sliderSelect', { static: true }) sliderSelect!: ElementRef; @ViewChild('dragStartRef', { static: true }) dragStartRef!: ElementRef; @ViewChild('dragEndRef', { static: true }) dragEndRef!: ElementRef; @@ -103,23 +111,13 @@ export class XSliderSelectComponent this.setDisplayValue(); } - constructor( - public renderer: Renderer2, - public elementRef: ElementRef, - public override cdr: ChangeDetectorRef, - public configService: XConfigService - ) { - super(); - } + private renderer = inject(Renderer2); + override cdr = inject(ChangeDetectorRef); + elementRef = inject(ElementRef); + configService = inject(XConfigService); ngOnInit() { - this.setFlex( - this.sliderSelect.nativeElement, - this.renderer, - this.justify, - this.align, - this.direction - ); + this.setFlex(this.sliderSelect.nativeElement, this.renderer, this.justify, this.align, this.direction); this.setPrecision(); this.setMarks(); this.setClassMap(); @@ -152,9 +150,9 @@ export class XSliderSelectComponent change() { const getVal = (offset: number) => { return parseFloat( - Number( - ((Number(this.max) - Number(this.min)) * Number(offset)) / 100 + Number(this.min) - ).toFixed(Number(this.precision)) + Number(((Number(this.max) - Number(this.min)) * Number(offset)) / 100 + Number(this.min)).toFixed( + Number(this.precision) + ) ); }; const startVal = getVal(this.startOffset); @@ -181,8 +179,7 @@ export class XSliderSelectComponent getOffset(val: number) { return Math.abs( Math.round( - ((val + (this.reverse ? -Number(this.min) : Number(this.min))) * 100) / - (Number(this.max) - Number(this.min)) + ((val + (this.reverse ? -Number(this.min) : Number(this.min))) * 100) / (Number(this.max) - Number(this.min)) ) ); } diff --git a/lib/ng-nest/ui/slider-select/slider-select.module.ts b/lib/ng-nest/ui/slider-select/slider-select.module.ts index 9bd371eb5..84c58bcdb 100644 --- a/lib/ng-nest/ui/slider-select/slider-select.module.ts +++ b/lib/ng-nest/ui/slider-select/slider-select.module.ts @@ -1,26 +1,8 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { XSliderSelectComponent } from './slider-select.component'; -import { XTooltipModule } from '@ng-nest/ui/tooltip'; -import { DragDropModule } from '@angular/cdk/drag-drop'; -import { XSliderSelectProperty } from './slider-select.property'; -import { XControlValueAccessor } from '@ng-nest/ui/base-form'; -import { XDragDirective } from '@ng-nest/ui/drag'; -import { XOutletDirective } from '@ng-nest/ui/outlet'; @NgModule({ - declarations: [XSliderSelectComponent, XSliderSelectProperty], exports: [XSliderSelectComponent], - imports: [ - CommonModule, - FormsModule, - ReactiveFormsModule, - DragDropModule, - XTooltipModule, - XControlValueAccessor, - XDragDirective, - XOutletDirective - ] + imports: [XSliderSelectComponent] }) export class XSliderSelectModule {} diff --git a/lib/ng-nest/ui/slider/examples/en_US/default/activated/activated.component.ts b/lib/ng-nest/ui/slider/examples/en_US/default/activated/activated.component.ts index 4dfb2c5ae..04d3ab59c 100644 --- a/lib/ng-nest/ui/slider/examples/en_US/default/activated/activated.component.ts +++ b/lib/ng-nest/ui/slider/examples/en_US/default/activated/activated.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; import { XData } from '@ng-nest/ui/core'; -import { XSliderNode } from '@ng-nest/ui/slider'; +import { XSliderComponent, XSliderNode } from '@ng-nest/ui/slider'; @Component({ selector: 'ex-activated', + standalone: true, + imports: [XSliderComponent], templateUrl: './activated.component.html' }) export class ExActivatedComponent { diff --git a/lib/ng-nest/ui/slider/examples/en_US/default/custom/custom.component.ts b/lib/ng-nest/ui/slider/examples/en_US/default/custom/custom.component.ts index 8d4b66878..d0efaf6fb 100644 --- a/lib/ng-nest/ui/slider/examples/en_US/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/slider/examples/en_US/default/custom/custom.component.ts @@ -1,9 +1,13 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; import { XData } from '@ng-nest/ui/core'; -import { XSliderNode } from '@ng-nest/ui/slider'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XSliderComponent, XSliderNode } from '@ng-nest/ui/slider'; @Component({ selector: 'ex-custom', + standalone: true, + imports: [CommonModule, XSliderComponent, XIconComponent], templateUrl: './custom.component.html', styleUrls: ['./custom.component.scss'] }) diff --git a/lib/ng-nest/ui/slider/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/slider/examples/en_US/default/default/default.component.ts index 5f8867fc2..2c1aec9b7 100644 --- a/lib/ng-nest/ui/slider/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/slider/examples/en_US/default/default/default.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; import { XData } from '@ng-nest/ui/core'; -import { XSliderNode } from '@ng-nest/ui/slider'; +import { XSliderComponent, XSliderNode } from '@ng-nest/ui/slider'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XSliderComponent], templateUrl: './default.component.html' }) export class ExDefaultComponent { diff --git a/lib/ng-nest/ui/slider/examples/en_US/default/expand/expand.component.ts b/lib/ng-nest/ui/slider/examples/en_US/default/expand/expand.component.ts index ffafb2604..171d8de27 100644 --- a/lib/ng-nest/ui/slider/examples/en_US/default/expand/expand.component.ts +++ b/lib/ng-nest/ui/slider/examples/en_US/default/expand/expand.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; import { XData } from '@ng-nest/ui/core'; -import { XSliderNode } from '@ng-nest/ui/slider'; +import { XSliderComponent, XSliderNode } from '@ng-nest/ui/slider'; @Component({ selector: 'ex-expand', + standalone: true, + imports: [XSliderComponent], templateUrl: './expand.component.html' }) export class ExExpandComponent { diff --git a/lib/ng-nest/ui/slider/examples/en_US/default/scroll/scroll.component.ts b/lib/ng-nest/ui/slider/examples/en_US/default/scroll/scroll.component.ts index dbb6498e1..f21403dd2 100644 --- a/lib/ng-nest/ui/slider/examples/en_US/default/scroll/scroll.component.ts +++ b/lib/ng-nest/ui/slider/examples/en_US/default/scroll/scroll.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; import { XData } from '@ng-nest/ui/core'; -import { XSliderNode } from '@ng-nest/ui/slider'; +import { XSliderComponent, XSliderNode } from '@ng-nest/ui/slider'; @Component({ selector: 'ex-scroll', + standalone: true, + imports: [XSliderComponent], templateUrl: './scroll.component.html' }) export class ExScrollComponent { diff --git a/lib/ng-nest/ui/slider/examples/en_US/default/size/size.component.ts b/lib/ng-nest/ui/slider/examples/en_US/default/size/size.component.ts index 40ae2d41a..ec78dbe26 100644 --- a/lib/ng-nest/ui/slider/examples/en_US/default/size/size.component.ts +++ b/lib/ng-nest/ui/slider/examples/en_US/default/size/size.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; import { XData } from '@ng-nest/ui/core'; -import { XSliderNode } from '@ng-nest/ui/slider'; +import { XSliderComponent, XSliderNode } from '@ng-nest/ui/slider'; @Component({ selector: 'ex-size', + standalone: true, + imports: [XSliderComponent], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/slider/examples/index.ts b/lib/ng-nest/ui/slider/examples/index.ts new file mode 100644 index 000000000..3268a8b98 --- /dev/null +++ b/lib/ng-nest/ui/slider/examples/index.ts @@ -0,0 +1,6 @@ +export * from './zh_CN/default/activated/activated.component'; +export * from './zh_CN/default/custom/custom.component'; +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/expand/expand.component'; +export * from './zh_CN/default/scroll/scroll.component'; +export * from './zh_CN/default/size/size.component'; diff --git a/lib/ng-nest/ui/slider/examples/zh_CN/default/activated/activated.component.ts b/lib/ng-nest/ui/slider/examples/zh_CN/default/activated/activated.component.ts index 80c3c1d8f..cfd260807 100644 --- a/lib/ng-nest/ui/slider/examples/zh_CN/default/activated/activated.component.ts +++ b/lib/ng-nest/ui/slider/examples/zh_CN/default/activated/activated.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; import { XData } from '@ng-nest/ui/core'; -import { XSliderNode } from '@ng-nest/ui/slider'; +import { XSliderComponent, XSliderNode } from '@ng-nest/ui/slider'; @Component({ selector: 'ex-activated', + standalone: true, + imports: [XSliderComponent], templateUrl: './activated.component.html' }) export class ExActivatedComponent { diff --git a/lib/ng-nest/ui/slider/examples/zh_CN/default/custom/custom.component.ts b/lib/ng-nest/ui/slider/examples/zh_CN/default/custom/custom.component.ts index 66f81a471..4f25163cd 100644 --- a/lib/ng-nest/ui/slider/examples/zh_CN/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/slider/examples/zh_CN/default/custom/custom.component.ts @@ -1,9 +1,13 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; import { XData } from '@ng-nest/ui/core'; -import { XSliderNode } from '@ng-nest/ui/slider'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XSliderComponent, XSliderNode } from '@ng-nest/ui/slider'; @Component({ selector: 'ex-custom', + standalone: true, + imports: [CommonModule, XSliderComponent, XIconComponent], templateUrl: './custom.component.html', styleUrls: ['./custom.component.scss'] }) diff --git a/lib/ng-nest/ui/slider/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/slider/examples/zh_CN/default/default/default.component.ts index 52dd32b80..0996e80e2 100644 --- a/lib/ng-nest/ui/slider/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/slider/examples/zh_CN/default/default/default.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; import { XData } from '@ng-nest/ui/core'; -import { XSliderNode } from '@ng-nest/ui/slider'; +import { XSliderComponent, XSliderNode } from '@ng-nest/ui/slider'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XSliderComponent], templateUrl: './default.component.html' }) export class ExDefaultComponent { diff --git a/lib/ng-nest/ui/slider/examples/zh_CN/default/expand/expand.component.ts b/lib/ng-nest/ui/slider/examples/zh_CN/default/expand/expand.component.ts index a5beb92c4..d3c600db9 100644 --- a/lib/ng-nest/ui/slider/examples/zh_CN/default/expand/expand.component.ts +++ b/lib/ng-nest/ui/slider/examples/zh_CN/default/expand/expand.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; import { XData } from '@ng-nest/ui/core'; -import { XSliderNode } from '@ng-nest/ui/slider'; +import { XSliderComponent, XSliderNode } from '@ng-nest/ui/slider'; @Component({ selector: 'ex-expand', + standalone: true, + imports: [XSliderComponent], templateUrl: './expand.component.html' }) export class ExExpandComponent { diff --git a/lib/ng-nest/ui/slider/examples/zh_CN/default/scroll/scroll.component.ts b/lib/ng-nest/ui/slider/examples/zh_CN/default/scroll/scroll.component.ts index 33a471ffa..d7484c478 100644 --- a/lib/ng-nest/ui/slider/examples/zh_CN/default/scroll/scroll.component.ts +++ b/lib/ng-nest/ui/slider/examples/zh_CN/default/scroll/scroll.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; import { XData } from '@ng-nest/ui/core'; -import { XSliderNode } from '@ng-nest/ui/slider'; +import { XSliderComponent, XSliderNode } from '@ng-nest/ui/slider'; @Component({ selector: 'ex-scroll', + standalone: true, + imports: [XSliderComponent], templateUrl: './scroll.component.html' }) export class ExScrollComponent { diff --git a/lib/ng-nest/ui/slider/examples/zh_CN/default/size/size.component.ts b/lib/ng-nest/ui/slider/examples/zh_CN/default/size/size.component.ts index cdbe5850e..460e796b6 100644 --- a/lib/ng-nest/ui/slider/examples/zh_CN/default/size/size.component.ts +++ b/lib/ng-nest/ui/slider/examples/zh_CN/default/size/size.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; import { XData } from '@ng-nest/ui/core'; -import { XSliderNode } from '@ng-nest/ui/slider'; +import { XSliderComponent, XSliderNode } from '@ng-nest/ui/slider'; @Component({ selector: 'ex-size', + standalone: true, + imports: [XSliderComponent], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/slider/slider.component.spec.ts b/lib/ng-nest/ui/slider/slider.component.spec.ts index fcda25370..24b9f11a3 100644 --- a/lib/ng-nest/ui/slider/slider.component.spec.ts +++ b/lib/ng-nest/ui/slider/slider.component.spec.ts @@ -1,21 +1,27 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XSliderComponent } from './slider.component'; import { Component, DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { XSliderModule } from '@ng-nest/ui/slider'; +import { XSliderComponent } from '@ng-nest/ui/slider'; import { XSliderPrefix, XSliderNode } from './slider.property'; import { XData } from '@ng-nest/ui/core'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { XIconComponent } from '@ng-nest/ui/icon'; -import { XTabsModule } from '@ng-nest/ui/tabs'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XTabsComponent, XTabComponent } from '@ng-nest/ui/tabs'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XSliderPrefix, () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, XSliderModule, XThemeModule, BrowserAnimationsModule, XIconComponent, XTabsModule], + imports: [ + HttpClientTestingModule, + XSliderComponent, + XThemeComponent, + BrowserAnimationsModule, + XIconComponent, + XTabsComponent, + XTabComponent + ], declarations: [TestXSliderComponent] }).compileComponents(); }); diff --git a/lib/ng-nest/ui/slider/slider.component.ts b/lib/ng-nest/ui/slider/slider.component.ts index 64bddcd60..4f757fd89 100644 --- a/lib/ng-nest/ui/slider/slider.component.ts +++ b/lib/ng-nest/ui/slider/slider.component.ts @@ -2,7 +2,6 @@ import { Component, OnInit, ViewEncapsulation, - Renderer2, ElementRef, ChangeDetectorRef, ChangeDetectionStrategy, @@ -11,15 +10,33 @@ import { ViewChild, AfterViewInit, OnDestroy, - SimpleChange + SimpleChange, + inject } from '@angular/core'; import { XSliderPrefix, XSliderNode, XSliderProperty } from './slider.property'; -import { XClassMap, XIsChange, XResize, XPosition, XIsUndefined, XIsEmpty, XSetData, XConfigService, XResizeObserver } from '@ng-nest/ui/core'; +import { + XClassMap, + XIsChange, + XResize, + XPosition, + XIsUndefined, + XIsEmpty, + XSetData, + XConfigService, + XResizeObserver +} from '@ng-nest/ui/core'; import { Subject, of } from 'rxjs'; import { takeUntil, debounceTime, delay } from 'rxjs/operators'; +import { CommonModule } from '@angular/common'; +import { XLinkComponent } from '@ng-nest/ui/link'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XOutletDirective } from '@ng-nest/ui/outlet'; +import { XDropdownComponent } from '@ng-nest/ui/dropdown'; @Component({ selector: `${XSliderPrefix}`, + standalone: true, + imports: [CommonModule, XLinkComponent, XButtonComponent, XOutletDirective, XDropdownComponent], templateUrl: './slider.component.html', styleUrls: ['./slider.component.scss'], encapsulation: ViewEncapsulation.None, @@ -63,15 +80,9 @@ export class XSliderComponent extends XSliderProperty implements OnInit, OnChang }; private _unSubject = new Subject(); private _resizeObserver!: XResizeObserver; - - constructor( - public renderer: Renderer2, - public elementRef: ElementRef, - public cdr: ChangeDetectorRef, - public configService: XConfigService - ) { - super(); - } + private cdr = inject(ChangeDetectorRef); + elementRef = inject(ElementRef); + configService = inject(XConfigService); ngOnInit() { this.setClassMap(); @@ -83,7 +94,9 @@ export class XSliderComponent extends XSliderProperty implements OnInit, OnChang XIsChange(layout) && this.setChange(this.classMap, layout); XIsChange(justify) && this.setChange(this.scrollClassMap, justify, 'x-justify'); XIsChange(nodeJustify) && this.setChange(this.nodeClassMap, nodeJustify, 'x-justify'); - XIsChange(activatedIndex) && this.setDirection(activatedIndex.currentValue, activatedIndex.previousValue) && this.setActivated(); + XIsChange(activatedIndex) && + this.setDirection(activatedIndex.currentValue, activatedIndex.previousValue) && + this.setActivated(); } ngOnDestroy(): void { @@ -133,7 +146,7 @@ export class XSliderComponent extends XSliderProperty implements OnInit, OnChang clearTimeout(this.timeoutHide); this.timeoutHide = null; } - this.nodeClick(event, node, index) + this.nodeClick(event, node, index); }); } @@ -197,7 +210,10 @@ export class XSliderComponent extends XSliderProperty implements OnInit, OnChang return; const sliderRect = this.sliderScroll.nativeElement?.getBoundingClientRect(); const sliderNodesRect = this.sliderNodes.nativeElement?.getBoundingClientRect(); - let moveIndex = ['bottom', 'right'].indexOf(this.direction) !== -1 ? Number(this.activatedIndex) + 2 : Number(this.activatedIndex); + let moveIndex = + ['bottom', 'right'].indexOf(this.direction) !== -1 + ? Number(this.activatedIndex) + 2 + : Number(this.activatedIndex); moveIndex = moveIndex > this.nodes.length ? this.nodes.length : moveIndex === 0 ? 1 : moveIndex; let moveEle = this.sliderNodes.nativeElement?.querySelector(`li:nth-child(${moveIndex})`); let maxOffset = 0; @@ -260,7 +276,9 @@ export class XSliderComponent extends XSliderProperty implements OnInit, OnChang setHighlight() { if (XIsUndefined(this.sliderNodes)) return; - const activeEle: HTMLElement = this.sliderNodes.nativeElement.querySelector(`li:nth-child(${Number(this.activatedIndex) + 1})`)!; + const activeEle: HTMLElement = this.sliderNodes.nativeElement.querySelector( + `li:nth-child(${Number(this.activatedIndex) + 1})` + )!; if (!activeEle) return; this.highlightBox = { width: `${activeEle.offsetWidth}px`, diff --git a/lib/ng-nest/ui/slider/slider.module.ts b/lib/ng-nest/ui/slider/slider.module.ts index 2413e4ec8..1a3c4848c 100644 --- a/lib/ng-nest/ui/slider/slider.module.ts +++ b/lib/ng-nest/ui/slider/slider.module.ts @@ -1,15 +1,9 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { XSliderComponent } from './slider.component'; -import { XLinkComponent } from '@ng-nest/ui/link'; -import { XButtonComponent } from '@ng-nest/ui/button'; -import { XOutletDirective } from '@ng-nest/ui/outlet'; -import { XSliderProperty } from './slider.property'; -import { XDropdownComponent } from '@ng-nest/ui/dropdown'; @NgModule({ - declarations: [XSliderComponent, XSliderProperty], + declarations: [], exports: [XSliderComponent], - imports: [CommonModule, XLinkComponent, XButtonComponent, XOutletDirective, XDropdownComponent] + imports: [XSliderComponent] }) export class XSliderModule {} diff --git a/lib/ng-nest/ui/statistic/countdown.component.ts b/lib/ng-nest/ui/statistic/countdown.component.ts index b0a14b39d..8673abb44 100644 --- a/lib/ng-nest/ui/statistic/countdown.component.ts +++ b/lib/ng-nest/ui/statistic/countdown.component.ts @@ -8,31 +8,35 @@ import { OnChanges, NgZone, inject, - PLATFORM_ID + PLATFORM_ID, + OnDestroy } from '@angular/core'; import { XCountdownPrefix, XCountdownProperty } from './statistic.property'; import { interval, Subscription } from 'rxjs'; import { XConfigService } from '@ng-nest/ui/core'; import { isPlatformBrowser } from '@angular/common'; +import { XTimeRangePipe } from '@ng-nest/ui/time-range'; +import { XStatisticComponent } from './statistic.component'; @Component({ selector: `${XCountdownPrefix}`, + standalone: true, + imports: [XStatisticComponent, XTimeRangePipe], templateUrl: './countdown.component.html', styleUrls: ['./countdown.component.scss'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush }) -export class XCountdownComponent extends XCountdownProperty implements OnInit, OnChanges { +export class XCountdownComponent extends XCountdownProperty implements OnInit, OnChanges, OnDestroy { diff!: number; period = 1000 / 30; private _target!: number; private _updater!: Subscription | null; platformId = inject(PLATFORM_ID); - isBrowser = true; - constructor(private cdr: ChangeDetectorRef, private ngZone: NgZone, public configService: XConfigService) { - super(); - this.isBrowser = isPlatformBrowser(this.platformId); - } + isBrowser = isPlatformBrowser(this.platformId); + private cdr = inject(ChangeDetectorRef); + private ngZone = inject(NgZone); + configService = inject(XConfigService); ngOnInit(): void { this.syncTimer(); diff --git a/lib/ng-nest/ui/statistic/examples/en_US/default/default/default.component.html b/lib/ng-nest/ui/statistic/examples/en_US/default/default/default.component.html index af98fdad5..820a0afc4 100644 --- a/lib/ng-nest/ui/statistic/examples/en_US/default/default/default.component.html +++ b/lib/ng-nest/ui/statistic/examples/en_US/default/default/default.component.html @@ -1,12 +1,10 @@ - - - - - - - - - - - - +
+ + + +
+
+ + + +
diff --git a/lib/ng-nest/ui/statistic/examples/en_US/default/default/default.component.scss b/lib/ng-nest/ui/statistic/examples/en_US/default/default/default.component.scss new file mode 100644 index 000000000..b4943baa0 --- /dev/null +++ b/lib/ng-nest/ui/statistic/examples/en_US/default/default/default.component.scss @@ -0,0 +1,5 @@ +:host { + .row:not(:first-child) { + margin-top: 1rem; + } +} diff --git a/lib/ng-nest/ui/statistic/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/statistic/examples/en_US/default/default/default.component.ts index 77efc793a..f95755bd5 100644 --- a/lib/ng-nest/ui/statistic/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/statistic/examples/en_US/default/default/default.component.ts @@ -1,7 +1,13 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XCardComponent } from '@ng-nest/ui/card'; +import { XStatisticComponent } from '@ng-nest/ui/statistic'; @Component({ selector: 'ex-default', - templateUrl: './default.component.html' + standalone: true, + imports: [CommonModule, XCardComponent, XStatisticComponent], + templateUrl: './default.component.html', + styleUrls: ['./default.component.scss'] }) export class ExDefaultComponent {} diff --git a/lib/ng-nest/ui/statistic/examples/en_US/default/down/down.component.html b/lib/ng-nest/ui/statistic/examples/en_US/default/down/down.component.html index 8755f5b3a..a837419ee 100644 --- a/lib/ng-nest/ui/statistic/examples/en_US/default/down/down.component.html +++ b/lib/ng-nest/ui/statistic/examples/en_US/default/down/down.component.html @@ -1,17 +1,15 @@ - - - - - - - - - - - - - - - - - +
+ + + +
+
+ + + +
+
+ + + +
diff --git a/lib/ng-nest/ui/statistic/examples/en_US/default/down/down.component.scss b/lib/ng-nest/ui/statistic/examples/en_US/default/down/down.component.scss new file mode 100644 index 000000000..b4943baa0 --- /dev/null +++ b/lib/ng-nest/ui/statistic/examples/en_US/default/down/down.component.scss @@ -0,0 +1,5 @@ +:host { + .row:not(:first-child) { + margin-top: 1rem; + } +} diff --git a/lib/ng-nest/ui/statistic/examples/en_US/default/down/down.component.ts b/lib/ng-nest/ui/statistic/examples/en_US/default/down/down.component.ts index 34dc0f74d..ed2b8cff3 100644 --- a/lib/ng-nest/ui/statistic/examples/en_US/default/down/down.component.ts +++ b/lib/ng-nest/ui/statistic/examples/en_US/default/down/down.component.ts @@ -1,9 +1,15 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XCardComponent } from '@ng-nest/ui/card'; import { XAddDays } from '@ng-nest/ui/core'; +import { XCountdownComponent } from '@ng-nest/ui/statistic'; @Component({ selector: 'ex-down', - templateUrl: './down.component.html' + standalone: true, + imports: [CommonModule, XCardComponent, XCountdownComponent], + templateUrl: './down.component.html', + styleUrls: ['./down.component.scss'] }) export class ExDownComponent { deadline = XAddDays(new Date(), 2).getTime(); diff --git a/lib/ng-nest/ui/statistic/examples/en_US/default/prefix/prefix.component.html b/lib/ng-nest/ui/statistic/examples/en_US/default/prefix/prefix.component.html index 21f8b3059..f062c1a10 100644 --- a/lib/ng-nest/ui/statistic/examples/en_US/default/prefix/prefix.component.html +++ b/lib/ng-nest/ui/statistic/examples/en_US/default/prefix/prefix.component.html @@ -1,28 +1,26 @@ - - - - - - - - - - - - - - - - +
+ + + + + +
+
+ + + + + +
diff --git a/lib/ng-nest/ui/statistic/examples/en_US/default/prefix/prefix.component.scss b/lib/ng-nest/ui/statistic/examples/en_US/default/prefix/prefix.component.scss new file mode 100644 index 000000000..b4943baa0 --- /dev/null +++ b/lib/ng-nest/ui/statistic/examples/en_US/default/prefix/prefix.component.scss @@ -0,0 +1,5 @@ +:host { + .row:not(:first-child) { + margin-top: 1rem; + } +} diff --git a/lib/ng-nest/ui/statistic/examples/en_US/default/prefix/prefix.component.ts b/lib/ng-nest/ui/statistic/examples/en_US/default/prefix/prefix.component.ts index e06f333ec..b61b34b64 100644 --- a/lib/ng-nest/ui/statistic/examples/en_US/default/prefix/prefix.component.ts +++ b/lib/ng-nest/ui/statistic/examples/en_US/default/prefix/prefix.component.ts @@ -1,7 +1,14 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XCardComponent } from '@ng-nest/ui/card'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XStatisticComponent } from '@ng-nest/ui/statistic'; @Component({ selector: 'ex-prefix', - templateUrl: './prefix.component.html' + standalone: true, + imports: [CommonModule, XCardComponent, XStatisticComponent, XIconComponent], + templateUrl: './prefix.component.html', + styleUrls: ['./prefix.component.scss'] }) export class ExPrefixComponent {} diff --git a/lib/ng-nest/ui/statistic/examples/index.ts b/lib/ng-nest/ui/statistic/examples/index.ts new file mode 100644 index 000000000..9227c0a53 --- /dev/null +++ b/lib/ng-nest/ui/statistic/examples/index.ts @@ -0,0 +1,3 @@ +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/down/down.component'; +export * from './zh_CN/default/prefix/prefix.component'; diff --git a/lib/ng-nest/ui/statistic/examples/zh_CN/default/default/default.component.html b/lib/ng-nest/ui/statistic/examples/zh_CN/default/default/default.component.html index 60ec28401..1780c257d 100644 --- a/lib/ng-nest/ui/statistic/examples/zh_CN/default/default/default.component.html +++ b/lib/ng-nest/ui/statistic/examples/zh_CN/default/default/default.component.html @@ -1,12 +1,10 @@ - - - - - - - - - - - - +
+ + + +
+
+ + + +
diff --git a/lib/ng-nest/ui/statistic/examples/zh_CN/default/default/default.component.scss b/lib/ng-nest/ui/statistic/examples/zh_CN/default/default/default.component.scss new file mode 100644 index 000000000..b4943baa0 --- /dev/null +++ b/lib/ng-nest/ui/statistic/examples/zh_CN/default/default/default.component.scss @@ -0,0 +1,5 @@ +:host { + .row:not(:first-child) { + margin-top: 1rem; + } +} diff --git a/lib/ng-nest/ui/statistic/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/statistic/examples/zh_CN/default/default/default.component.ts index 77efc793a..f95755bd5 100644 --- a/lib/ng-nest/ui/statistic/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/statistic/examples/zh_CN/default/default/default.component.ts @@ -1,7 +1,13 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XCardComponent } from '@ng-nest/ui/card'; +import { XStatisticComponent } from '@ng-nest/ui/statistic'; @Component({ selector: 'ex-default', - templateUrl: './default.component.html' + standalone: true, + imports: [CommonModule, XCardComponent, XStatisticComponent], + templateUrl: './default.component.html', + styleUrls: ['./default.component.scss'] }) export class ExDefaultComponent {} diff --git a/lib/ng-nest/ui/statistic/examples/zh_CN/default/down/down.component.html b/lib/ng-nest/ui/statistic/examples/zh_CN/default/down/down.component.html index 19edd31b2..2bbb134fb 100644 --- a/lib/ng-nest/ui/statistic/examples/zh_CN/default/down/down.component.html +++ b/lib/ng-nest/ui/statistic/examples/zh_CN/default/down/down.component.html @@ -1,17 +1,15 @@ - - - - - - - - - - - - - - - - - +
+ + + +
+
+ + + +
+
+ + + +
diff --git a/lib/ng-nest/ui/statistic/examples/zh_CN/default/down/down.component.scss b/lib/ng-nest/ui/statistic/examples/zh_CN/default/down/down.component.scss new file mode 100644 index 000000000..b4943baa0 --- /dev/null +++ b/lib/ng-nest/ui/statistic/examples/zh_CN/default/down/down.component.scss @@ -0,0 +1,5 @@ +:host { + .row:not(:first-child) { + margin-top: 1rem; + } +} diff --git a/lib/ng-nest/ui/statistic/examples/zh_CN/default/down/down.component.ts b/lib/ng-nest/ui/statistic/examples/zh_CN/default/down/down.component.ts index 34dc0f74d..ed2b8cff3 100644 --- a/lib/ng-nest/ui/statistic/examples/zh_CN/default/down/down.component.ts +++ b/lib/ng-nest/ui/statistic/examples/zh_CN/default/down/down.component.ts @@ -1,9 +1,15 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XCardComponent } from '@ng-nest/ui/card'; import { XAddDays } from '@ng-nest/ui/core'; +import { XCountdownComponent } from '@ng-nest/ui/statistic'; @Component({ selector: 'ex-down', - templateUrl: './down.component.html' + standalone: true, + imports: [CommonModule, XCardComponent, XCountdownComponent], + templateUrl: './down.component.html', + styleUrls: ['./down.component.scss'] }) export class ExDownComponent { deadline = XAddDays(new Date(), 2).getTime(); diff --git a/lib/ng-nest/ui/statistic/examples/zh_CN/default/prefix/prefix.component.html b/lib/ng-nest/ui/statistic/examples/zh_CN/default/prefix/prefix.component.html index cd8f51667..0be3b809e 100644 --- a/lib/ng-nest/ui/statistic/examples/zh_CN/default/prefix/prefix.component.html +++ b/lib/ng-nest/ui/statistic/examples/zh_CN/default/prefix/prefix.component.html @@ -1,28 +1,26 @@ - - - - - - - - - - - - - - - - +
+ + + + + +
+
+ + + + + +
diff --git a/lib/ng-nest/ui/statistic/examples/zh_CN/default/prefix/prefix.component.scss b/lib/ng-nest/ui/statistic/examples/zh_CN/default/prefix/prefix.component.scss new file mode 100644 index 000000000..b4943baa0 --- /dev/null +++ b/lib/ng-nest/ui/statistic/examples/zh_CN/default/prefix/prefix.component.scss @@ -0,0 +1,5 @@ +:host { + .row:not(:first-child) { + margin-top: 1rem; + } +} diff --git a/lib/ng-nest/ui/statistic/examples/zh_CN/default/prefix/prefix.component.ts b/lib/ng-nest/ui/statistic/examples/zh_CN/default/prefix/prefix.component.ts index e06f333ec..b61b34b64 100644 --- a/lib/ng-nest/ui/statistic/examples/zh_CN/default/prefix/prefix.component.ts +++ b/lib/ng-nest/ui/statistic/examples/zh_CN/default/prefix/prefix.component.ts @@ -1,7 +1,14 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XCardComponent } from '@ng-nest/ui/card'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XStatisticComponent } from '@ng-nest/ui/statistic'; @Component({ selector: 'ex-prefix', - templateUrl: './prefix.component.html' + standalone: true, + imports: [CommonModule, XCardComponent, XStatisticComponent, XIconComponent], + templateUrl: './prefix.component.html', + styleUrls: ['./prefix.component.scss'] }) export class ExPrefixComponent {} diff --git a/lib/ng-nest/ui/statistic/statistic.component.spec.ts b/lib/ng-nest/ui/statistic/statistic.component.spec.ts index 5e956ad24..0b741f6a2 100644 --- a/lib/ng-nest/ui/statistic/statistic.component.spec.ts +++ b/lib/ng-nest/ui/statistic/statistic.component.spec.ts @@ -1,11 +1,9 @@ import { XIconComponent } from '@ng-nest/ui/icon'; import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XStatisticComponent } from './statistic.component'; import { Component, DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; -import { XStatisticModule } from '@ng-nest/ui/statistic'; +import { XStatisticComponent, XCountdownComponent } from '@ng-nest/ui/statistic'; import { FormsModule } from '@angular/forms'; import { XStatisticPrefix } from './statistic.property'; import { XButtonComponent } from '@ng-nest/ui/button'; @@ -13,7 +11,7 @@ import { XContainerComponent } from '@ng-nest/ui/container'; import { XCardComponent } from '@ng-nest/ui/card'; import { XAddDays } from '@ng-nest/ui/core'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XStatisticPrefix, () => { @@ -22,9 +20,10 @@ describe(XStatisticPrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, FormsModule, - XStatisticModule, + XStatisticComponent, + XCountdownComponent, XButtonComponent, XCardComponent, XContainerComponent, @@ -60,8 +59,7 @@ describe(XStatisticPrefix, () => { - - + @@ -97,20 +95,12 @@ describe(XStatisticPrefix, () => { - + - + diff --git a/lib/ng-nest/ui/statistic/statistic.component.ts b/lib/ng-nest/ui/statistic/statistic.component.ts index 73a89dda6..680cc2d12 100644 --- a/lib/ng-nest/ui/statistic/statistic.component.ts +++ b/lib/ng-nest/ui/statistic/statistic.component.ts @@ -1,9 +1,13 @@ -import { Component, ViewEncapsulation, ChangeDetectionStrategy, SimpleChanges, OnChanges } from '@angular/core'; +import { Component, ViewEncapsulation, ChangeDetectionStrategy, SimpleChanges, OnChanges, inject } from '@angular/core'; import { XStatisticPrefix, XStatisticProperty } from './statistic.property'; import { XIsChange, XConfigService } from '@ng-nest/ui/core'; +import { CommonModule } from '@angular/common'; +import { XOutletDirective } from '@ng-nest/ui/outlet'; @Component({ selector: `${XStatisticPrefix}`, + standalone: true, + imports: [CommonModule, XOutletDirective], templateUrl: './statistic.component.html', styleUrls: ['./statistic.component.scss'], encapsulation: ViewEncapsulation.None, @@ -12,10 +16,7 @@ import { XIsChange, XConfigService } from '@ng-nest/ui/core'; export class XStatisticComponent extends XStatisticProperty implements OnChanges { displayInt = ''; displayDecimal = ''; - - constructor(public configService: XConfigService) { - super(); - } + configService = inject(XConfigService); ngOnChanges(simples: SimpleChanges) { const { value } = simples; diff --git a/lib/ng-nest/ui/statistic/statistic.module.ts b/lib/ng-nest/ui/statistic/statistic.module.ts index e7f92c1a9..2b798a12e 100644 --- a/lib/ng-nest/ui/statistic/statistic.module.ts +++ b/lib/ng-nest/ui/statistic/statistic.module.ts @@ -1,14 +1,9 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { XStatisticComponent } from './statistic.component'; -import { XOutletDirective } from '@ng-nest/ui/outlet'; import { XCountdownComponent } from './countdown.component'; -import { XTimeRangeModule } from '@ng-nest/ui/time-range'; -import { XStatisticProperty, XCountdownProperty } from './statistic.property'; @NgModule({ - declarations: [XStatisticComponent, XCountdownComponent, XStatisticProperty, XCountdownProperty], exports: [XStatisticComponent, XCountdownComponent], - imports: [CommonModule, XOutletDirective, XTimeRangeModule] + imports: [XStatisticComponent, XCountdownComponent] }) export class XStatisticModule {} diff --git a/lib/ng-nest/ui/steps/examples/en_US/default/custom/custom.component.ts b/lib/ng-nest/ui/steps/examples/en_US/default/custom/custom.component.ts index aa580d16e..e3779b1e4 100644 --- a/lib/ng-nest/ui/steps/examples/en_US/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/steps/examples/en_US/default/custom/custom.component.ts @@ -1,7 +1,11 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XStepsComponent } from '@ng-nest/ui/steps'; @Component({ selector: 'ex-custom', + standalone: true, + imports: [CommonModule, XStepsComponent], templateUrl: './custom.component.html', styleUrls: ['./custom.component.html'] }) diff --git a/lib/ng-nest/ui/steps/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/steps/examples/en_US/default/default/default.component.ts index 07bf0db29..624b1c266 100644 --- a/lib/ng-nest/ui/steps/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/steps/examples/en_US/default/default/default.component.ts @@ -1,7 +1,12 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XStepsComponent } from '@ng-nest/ui/steps'; @Component({ selector: 'ex-default', + standalone: true, + imports: [CommonModule, XStepsComponent, XButtonComponent], templateUrl: './default.component.html' }) export class ExDefaultComponent { diff --git a/lib/ng-nest/ui/steps/examples/en_US/default/description/description.component.ts b/lib/ng-nest/ui/steps/examples/en_US/default/description/description.component.ts index a797878f4..bc7d07a28 100644 --- a/lib/ng-nest/ui/steps/examples/en_US/default/description/description.component.ts +++ b/lib/ng-nest/ui/steps/examples/en_US/default/description/description.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; import { XData } from '@ng-nest/ui/core'; -import { XStepsNode } from '@ng-nest/ui/steps'; +import { XStepsComponent, XStepsNode } from '@ng-nest/ui/steps'; @Component({ selector: 'ex-description', + standalone: true, + imports: [XStepsComponent], templateUrl: './description.component.html' }) export class ExDescriptionComponent { diff --git a/lib/ng-nest/ui/steps/examples/en_US/default/icon/icon.component.ts b/lib/ng-nest/ui/steps/examples/en_US/default/icon/icon.component.ts index 1da559505..0dcd73daa 100644 --- a/lib/ng-nest/ui/steps/examples/en_US/default/icon/icon.component.ts +++ b/lib/ng-nest/ui/steps/examples/en_US/default/icon/icon.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; import { XData } from '@ng-nest/ui/core'; -import { XStepsNode } from '@ng-nest/ui/steps'; +import { XStepsComponent, XStepsNode } from '@ng-nest/ui/steps'; @Component({ selector: 'ex-icon', + standalone: true, + imports: [XStepsComponent], templateUrl: './icon.component.html' }) export class ExIconComponent { diff --git a/lib/ng-nest/ui/steps/examples/en_US/default/index/index.component.ts b/lib/ng-nest/ui/steps/examples/en_US/default/index/index.component.ts index 08cdfbd02..0d9218075 100644 --- a/lib/ng-nest/ui/steps/examples/en_US/default/index/index.component.ts +++ b/lib/ng-nest/ui/steps/examples/en_US/default/index/index.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; import { XData } from '@ng-nest/ui/core'; -import { XStepsNode } from '@ng-nest/ui/steps'; +import { XStepsComponent, XStepsNode } from '@ng-nest/ui/steps'; @Component({ selector: 'ex-index', + standalone: true, + imports: [XStepsComponent], templateUrl: './index.component.html' }) export class ExIndexComponent { diff --git a/lib/ng-nest/ui/steps/examples/en_US/default/layout/layout.component.ts b/lib/ng-nest/ui/steps/examples/en_US/default/layout/layout.component.ts index 035af3fbe..2fcf5b91f 100644 --- a/lib/ng-nest/ui/steps/examples/en_US/default/layout/layout.component.ts +++ b/lib/ng-nest/ui/steps/examples/en_US/default/layout/layout.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; import { XData } from '@ng-nest/ui/core'; -import { XStepsNode } from '@ng-nest/ui/steps'; +import { XStepsComponent, XStepsNode } from '@ng-nest/ui/steps'; @Component({ selector: 'ex-layout', + standalone: true, + imports: [XStepsComponent], templateUrl: './layout.component.html' }) export class ExLayoutComponent { diff --git a/lib/ng-nest/ui/steps/examples/en_US/default/node-status/node-status.component.ts b/lib/ng-nest/ui/steps/examples/en_US/default/node-status/node-status.component.ts index 1ad722c3f..227b730b1 100644 --- a/lib/ng-nest/ui/steps/examples/en_US/default/node-status/node-status.component.ts +++ b/lib/ng-nest/ui/steps/examples/en_US/default/node-status/node-status.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; -import { XStepsNode } from '@ng-nest/ui/steps'; +import { XStepsComponent, XStepsNode } from '@ng-nest/ui/steps'; @Component({ selector: 'ex-node-status', + standalone: true, + imports: [XStepsComponent], templateUrl: './node-status.component.html' }) export class ExNodeStatusComponent { diff --git a/lib/ng-nest/ui/steps/examples/en_US/default/status/status.component.ts b/lib/ng-nest/ui/steps/examples/en_US/default/status/status.component.ts index 4f0f334ad..d10648526 100644 --- a/lib/ng-nest/ui/steps/examples/en_US/default/status/status.component.ts +++ b/lib/ng-nest/ui/steps/examples/en_US/default/status/status.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; import { XData } from '@ng-nest/ui/core'; -import { XStepsNode } from '@ng-nest/ui/steps'; +import { XStepsComponent, XStepsNode } from '@ng-nest/ui/steps'; @Component({ selector: 'ex-status', + standalone: true, + imports: [XStepsComponent], templateUrl: './status.component.html' }) export class ExStatusComponent { diff --git a/lib/ng-nest/ui/steps/examples/en_US/default/tabs/tabs.component.ts b/lib/ng-nest/ui/steps/examples/en_US/default/tabs/tabs.component.ts index 7b2854dad..85693c35b 100644 --- a/lib/ng-nest/ui/steps/examples/en_US/default/tabs/tabs.component.ts +++ b/lib/ng-nest/ui/steps/examples/en_US/default/tabs/tabs.component.ts @@ -1,7 +1,13 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; +import { XStepsComponent } from '@ng-nest/ui/steps'; +import { XTabsComponent, XTabComponent } from '@ng-nest/ui/tabs'; @Component({ selector: 'ex-tabs', + standalone: true, + imports: [CommonModule, XStepsComponent, XTabsComponent, XTabComponent, XButtonComponent, XButtonsComponent], templateUrl: './tabs.component.html', styleUrls: ['./tabs.component.scss'] }) diff --git a/lib/ng-nest/ui/steps/examples/index.ts b/lib/ng-nest/ui/steps/examples/index.ts new file mode 100644 index 000000000..273a3b8e7 --- /dev/null +++ b/lib/ng-nest/ui/steps/examples/index.ts @@ -0,0 +1,9 @@ +export * from './zh_CN/default/custom/custom.component'; +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/description/description.component'; +export * from './zh_CN/default/icon/icon.component'; +export * from './zh_CN/default/index/index.component'; +export * from './zh_CN/default/layout/layout.component'; +export * from './zh_CN/default/node-status/node-status.component'; +export * from './zh_CN/default/status/status.component'; +export * from './zh_CN/default/tabs/tabs.component'; diff --git a/lib/ng-nest/ui/steps/examples/zh_CN/default/custom/custom.component.ts b/lib/ng-nest/ui/steps/examples/zh_CN/default/custom/custom.component.ts index aa580d16e..e3779b1e4 100644 --- a/lib/ng-nest/ui/steps/examples/zh_CN/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/steps/examples/zh_CN/default/custom/custom.component.ts @@ -1,7 +1,11 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XStepsComponent } from '@ng-nest/ui/steps'; @Component({ selector: 'ex-custom', + standalone: true, + imports: [CommonModule, XStepsComponent], templateUrl: './custom.component.html', styleUrls: ['./custom.component.html'] }) diff --git a/lib/ng-nest/ui/steps/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/steps/examples/zh_CN/default/default/default.component.ts index d31a274a9..d79206008 100644 --- a/lib/ng-nest/ui/steps/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/steps/examples/zh_CN/default/default/default.component.ts @@ -1,7 +1,12 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XStepsComponent } from '@ng-nest/ui/steps'; @Component({ selector: 'ex-default', + standalone: true, + imports: [CommonModule, XStepsComponent, XButtonComponent], templateUrl: './default.component.html' }) export class ExDefaultComponent { diff --git a/lib/ng-nest/ui/steps/examples/zh_CN/default/description/description.component.ts b/lib/ng-nest/ui/steps/examples/zh_CN/default/description/description.component.ts index 5c5fac5ca..da9fb19dc 100644 --- a/lib/ng-nest/ui/steps/examples/zh_CN/default/description/description.component.ts +++ b/lib/ng-nest/ui/steps/examples/zh_CN/default/description/description.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; import { XData } from '@ng-nest/ui/core'; -import { XStepsNode } from '@ng-nest/ui/steps'; +import { XStepsComponent, XStepsNode } from '@ng-nest/ui/steps'; @Component({ selector: 'ex-description', + standalone: true, + imports: [XStepsComponent], templateUrl: './description.component.html' }) export class ExDescriptionComponent { diff --git a/lib/ng-nest/ui/steps/examples/zh_CN/default/icon/icon.component.ts b/lib/ng-nest/ui/steps/examples/zh_CN/default/icon/icon.component.ts index 016ad2c99..9c958480a 100644 --- a/lib/ng-nest/ui/steps/examples/zh_CN/default/icon/icon.component.ts +++ b/lib/ng-nest/ui/steps/examples/zh_CN/default/icon/icon.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; import { XData } from '@ng-nest/ui/core'; -import { XStepsNode } from '@ng-nest/ui/steps'; +import { XStepsComponent, XStepsNode } from '@ng-nest/ui/steps'; @Component({ selector: 'ex-icon', + standalone: true, + imports: [XStepsComponent], templateUrl: './icon.component.html' }) export class ExIconComponent { diff --git a/lib/ng-nest/ui/steps/examples/zh_CN/default/index/index.component.ts b/lib/ng-nest/ui/steps/examples/zh_CN/default/index/index.component.ts index 547600fc6..5a5365d7c 100644 --- a/lib/ng-nest/ui/steps/examples/zh_CN/default/index/index.component.ts +++ b/lib/ng-nest/ui/steps/examples/zh_CN/default/index/index.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; import { XData } from '@ng-nest/ui/core'; -import { XStepsNode } from '@ng-nest/ui/steps'; +import { XStepsComponent, XStepsNode } from '@ng-nest/ui/steps'; @Component({ selector: 'ex-index', + standalone: true, + imports: [XStepsComponent], templateUrl: './index.component.html' }) export class ExIndexComponent { diff --git a/lib/ng-nest/ui/steps/examples/zh_CN/default/layout/layout.component.ts b/lib/ng-nest/ui/steps/examples/zh_CN/default/layout/layout.component.ts index 8d1312fa7..406115c00 100644 --- a/lib/ng-nest/ui/steps/examples/zh_CN/default/layout/layout.component.ts +++ b/lib/ng-nest/ui/steps/examples/zh_CN/default/layout/layout.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; import { XData } from '@ng-nest/ui/core'; -import { XStepsNode } from '@ng-nest/ui/steps'; +import { XStepsComponent, XStepsNode } from '@ng-nest/ui/steps'; @Component({ selector: 'ex-layout', + standalone: true, + imports: [XStepsComponent], templateUrl: './layout.component.html' }) export class ExLayoutComponent { diff --git a/lib/ng-nest/ui/steps/examples/zh_CN/default/node-status/node-status.component.ts b/lib/ng-nest/ui/steps/examples/zh_CN/default/node-status/node-status.component.ts index 1ad722c3f..227b730b1 100644 --- a/lib/ng-nest/ui/steps/examples/zh_CN/default/node-status/node-status.component.ts +++ b/lib/ng-nest/ui/steps/examples/zh_CN/default/node-status/node-status.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; -import { XStepsNode } from '@ng-nest/ui/steps'; +import { XStepsComponent, XStepsNode } from '@ng-nest/ui/steps'; @Component({ selector: 'ex-node-status', + standalone: true, + imports: [XStepsComponent], templateUrl: './node-status.component.html' }) export class ExNodeStatusComponent { diff --git a/lib/ng-nest/ui/steps/examples/zh_CN/default/status/status.component.ts b/lib/ng-nest/ui/steps/examples/zh_CN/default/status/status.component.ts index 16a87c13d..015c2e04f 100644 --- a/lib/ng-nest/ui/steps/examples/zh_CN/default/status/status.component.ts +++ b/lib/ng-nest/ui/steps/examples/zh_CN/default/status/status.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; import { XData } from '@ng-nest/ui/core'; -import { XStepsNode } from '@ng-nest/ui/steps'; +import { XStepsComponent, XStepsNode } from '@ng-nest/ui/steps'; @Component({ selector: 'ex-status', + standalone: true, + imports: [XStepsComponent], templateUrl: './status.component.html' }) export class ExStatusComponent { diff --git a/lib/ng-nest/ui/steps/examples/zh_CN/default/tabs/tabs.component.ts b/lib/ng-nest/ui/steps/examples/zh_CN/default/tabs/tabs.component.ts index 5fcad688a..779ccc1db 100644 --- a/lib/ng-nest/ui/steps/examples/zh_CN/default/tabs/tabs.component.ts +++ b/lib/ng-nest/ui/steps/examples/zh_CN/default/tabs/tabs.component.ts @@ -1,7 +1,13 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; +import { XStepsComponent } from '@ng-nest/ui/steps'; +import { XTabsComponent, XTabComponent } from '@ng-nest/ui/tabs'; @Component({ selector: 'ex-tabs', + standalone: true, + imports: [CommonModule, XStepsComponent, XTabsComponent, XTabComponent, XButtonComponent, XButtonsComponent], templateUrl: './tabs.component.html', styleUrls: ['./tabs.component.scss'] }) diff --git a/lib/ng-nest/ui/steps/steps.component.spec.ts b/lib/ng-nest/ui/steps/steps.component.spec.ts index c15ebae13..a18db8733 100644 --- a/lib/ng-nest/ui/steps/steps.component.spec.ts +++ b/lib/ng-nest/ui/steps/steps.component.spec.ts @@ -1,14 +1,12 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XStepsComponent } from './steps.component'; import { Component, DebugElement, ChangeDetectorRef } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { XStepsModule } from '@ng-nest/ui/steps'; +import { XStepsComponent } from '@ng-nest/ui/steps'; import { XStepsPrefix } from './steps.property'; import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; -import { XTabsModule } from '@ng-nest/ui/tabs'; +import { XTabsComponent, XTabComponent } from '@ng-nest/ui/tabs'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XStepsPrefix, () => { @@ -17,11 +15,12 @@ describe(XStepsPrefix, () => { imports: [ HttpClientTestingModule, BrowserAnimationsModule, - XThemeModule, - XStepsModule, + XThemeComponent, + XStepsComponent, XButtonComponent, XButtonsComponent, - XTabsModule + XTabsComponent, + XTabComponent ], declarations: [TestXStepsComponent, TestXStepsDotComponent] }).compileComponents(); diff --git a/lib/ng-nest/ui/steps/steps.component.ts b/lib/ng-nest/ui/steps/steps.component.ts index 1d9af6ea0..a0f7ed39a 100644 --- a/lib/ng-nest/ui/steps/steps.component.ts +++ b/lib/ng-nest/ui/steps/steps.component.ts @@ -2,22 +2,26 @@ import { Component, OnInit, ViewEncapsulation, - Renderer2, - ElementRef, ChangeDetectorRef, ChangeDetectionStrategy, SimpleChanges, OnChanges, OnDestroy, - AfterViewInit + AfterViewInit, + inject } from '@angular/core'; import { XStepsPrefix, XStepsNode, XStepsProperty } from './steps.property'; import { XIsChange, XIsUndefined, XIsNumber, XSetData, XIsEmpty, XConfigService } from '@ng-nest/ui/core'; import { Subject } from 'rxjs'; import { map } from 'rxjs/operators'; +import { CommonModule } from '@angular/common'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XOutletDirective } from '@ng-nest/ui/outlet'; @Component({ selector: `${XStepsPrefix}`, + standalone: true, + imports: [CommonModule, XIconComponent, XOutletDirective], templateUrl: './steps.component.html', styleUrls: ['./steps.component.scss'], encapsulation: ViewEncapsulation.None, @@ -26,15 +30,8 @@ import { map } from 'rxjs/operators'; export class XStepsComponent extends XStepsProperty implements OnInit, OnChanges, OnDestroy, AfterViewInit { nodes: XStepsNode[] = []; private _unSubject = new Subject(); - - constructor( - public renderer: Renderer2, - public elementRef: ElementRef, - public cdr: ChangeDetectorRef, - public configService: XConfigService - ) { - super(); - } + private cdr = inject(ChangeDetectorRef); + configService = inject(XConfigService); ngOnInit() { this.setClassMap(); @@ -82,7 +79,8 @@ export class XStepsComponent extends XStepsProperty implements OnInit, OnChanges if (XIsUndefined(this.activatedIndex)) { x.status = 'wait'; } else if (XIsNumber(this.activatedIndex)) { - x.status = index < Number(this.activatedIndex) ? 'finish' : index === this.activatedIndex ? 'process' : 'wait'; + x.status = + index < Number(this.activatedIndex) ? 'finish' : index === this.activatedIndex ? 'process' : 'wait'; } if (this.status && index === this.activatedIndex) x.status = this.status; } diff --git a/lib/ng-nest/ui/steps/steps.module.ts b/lib/ng-nest/ui/steps/steps.module.ts index ac39b51af..dab80a448 100644 --- a/lib/ng-nest/ui/steps/steps.module.ts +++ b/lib/ng-nest/ui/steps/steps.module.ts @@ -1,13 +1,8 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { XStepsComponent } from './steps.component'; -import { XIconComponent } from '@ng-nest/ui/icon'; -import { XStepsProperty } from './steps.property'; -import { XOutletDirective } from '@ng-nest/ui/outlet'; @NgModule({ - declarations: [XStepsComponent, XStepsProperty], exports: [XStepsComponent], - imports: [CommonModule, XIconComponent, XOutletDirective] + imports: [XStepsComponent] }) export class XStepsModule {} diff --git a/lib/ng-nest/ui/switch/examples/en_US/default/default/default.component.html b/lib/ng-nest/ui/switch/examples/en_US/default/default/default.component.html index 52f931660..4496bd85e 100644 --- a/lib/ng-nest/ui/switch/examples/en_US/default/default/default.component.html +++ b/lib/ng-nest/ui/switch/examples/en_US/default/default/default.component.html @@ -1,10 +1,8 @@ - - +
- - - - +
+
+ - - +
+ diff --git a/lib/ng-nest/ui/switch/examples/en_US/default/default/default.component.scss b/lib/ng-nest/ui/switch/examples/en_US/default/default/default.component.scss index 3ec576c8c..b4943baa0 100644 --- a/lib/ng-nest/ui/switch/examples/en_US/default/default/default.component.scss +++ b/lib/ng-nest/ui/switch/examples/en_US/default/default/default.component.scss @@ -1,5 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/switch/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/switch/examples/en_US/default/default/default.component.ts index 3e9cdf33b..37bf4f661 100644 --- a/lib/ng-nest/ui/switch/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/switch/examples/en_US/default/default/default.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSwitchComponent } from '@ng-nest/ui/switch'; @Component({ selector: 'ex-default', + standalone: true, + imports: [FormsModule, XSwitchComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/switch/examples/en_US/default/disabled/disabled.component.html b/lib/ng-nest/ui/switch/examples/en_US/default/disabled/disabled.component.html index 77268856c..60e2db732 100644 --- a/lib/ng-nest/ui/switch/examples/en_US/default/disabled/disabled.component.html +++ b/lib/ng-nest/ui/switch/examples/en_US/default/disabled/disabled.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/switch/examples/en_US/default/disabled/disabled.component.scss b/lib/ng-nest/ui/switch/examples/en_US/default/disabled/disabled.component.scss index 3ec576c8c..b4943baa0 100644 --- a/lib/ng-nest/ui/switch/examples/en_US/default/disabled/disabled.component.scss +++ b/lib/ng-nest/ui/switch/examples/en_US/default/disabled/disabled.component.scss @@ -1,5 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/switch/examples/en_US/default/disabled/disabled.component.ts b/lib/ng-nest/ui/switch/examples/en_US/default/disabled/disabled.component.ts index 0fc173ca7..c085677a4 100644 --- a/lib/ng-nest/ui/switch/examples/en_US/default/disabled/disabled.component.ts +++ b/lib/ng-nest/ui/switch/examples/en_US/default/disabled/disabled.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSwitchComponent } from '@ng-nest/ui/switch'; @Component({ selector: 'ex-disabled', + standalone: true, + imports: [FormsModule, XSwitchComponent], templateUrl: './disabled.component.html', styleUrls: ['./disabled.component.scss'] }) diff --git a/lib/ng-nest/ui/switch/examples/en_US/default/label/label.component.html b/lib/ng-nest/ui/switch/examples/en_US/default/label/label.component.html index 14a6bada4..8e727c72e 100644 --- a/lib/ng-nest/ui/switch/examples/en_US/default/label/label.component.html +++ b/lib/ng-nest/ui/switch/examples/en_US/default/label/label.component.html @@ -1,20 +1,16 @@ - - +
- - - - +
+
+ - - - - +
+
+ - - - - +
+
+ - - +
+ diff --git a/lib/ng-nest/ui/switch/examples/en_US/default/label/label.component.scss b/lib/ng-nest/ui/switch/examples/en_US/default/label/label.component.scss index 3ec576c8c..b4943baa0 100644 --- a/lib/ng-nest/ui/switch/examples/en_US/default/label/label.component.scss +++ b/lib/ng-nest/ui/switch/examples/en_US/default/label/label.component.scss @@ -1,5 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/switch/examples/en_US/default/label/label.component.ts b/lib/ng-nest/ui/switch/examples/en_US/default/label/label.component.ts index 3423f5829..a28358a6c 100644 --- a/lib/ng-nest/ui/switch/examples/en_US/default/label/label.component.ts +++ b/lib/ng-nest/ui/switch/examples/en_US/default/label/label.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSwitchComponent } from '@ng-nest/ui/switch'; @Component({ selector: 'ex-label', + standalone: true, + imports: [FormsModule, XSwitchComponent], templateUrl: './label.component.html', styleUrls: ['./label.component.scss'] }) diff --git a/lib/ng-nest/ui/switch/examples/en_US/default/loading/loading.component.ts b/lib/ng-nest/ui/switch/examples/en_US/default/loading/loading.component.ts index 8965dfb71..7309646c1 100644 --- a/lib/ng-nest/ui/switch/examples/en_US/default/loading/loading.component.ts +++ b/lib/ng-nest/ui/switch/examples/en_US/default/loading/loading.component.ts @@ -1,9 +1,13 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSwitchComponent } from '@ng-nest/ui/switch'; import { of } from 'rxjs/internal/observable/of'; import { delay } from 'rxjs/operators'; @Component({ selector: 'ex-loading', + standalone: true, + imports: [FormsModule, XSwitchComponent], templateUrl: './loading.component.html', styleUrls: ['./loading.component.scss'] }) diff --git a/lib/ng-nest/ui/switch/examples/en_US/default/size/size.component.ts b/lib/ng-nest/ui/switch/examples/en_US/default/size/size.component.ts index 7840212ca..819b61afb 100644 --- a/lib/ng-nest/ui/switch/examples/en_US/default/size/size.component.ts +++ b/lib/ng-nest/ui/switch/examples/en_US/default/size/size.component.ts @@ -1,8 +1,13 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; import { XSize } from '@ng-nest/ui/core'; +import { XRadioComponent } from '@ng-nest/ui/radio'; +import { XSwitchComponent } from '@ng-nest/ui/switch'; @Component({ selector: 'ex-size', + standalone: true, + imports: [FormsModule, XSwitchComponent, XRadioComponent], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/switch/examples/en_US/default/text/text.component.ts b/lib/ng-nest/ui/switch/examples/en_US/default/text/text.component.ts index 99483d21a..4603022cc 100644 --- a/lib/ng-nest/ui/switch/examples/en_US/default/text/text.component.ts +++ b/lib/ng-nest/ui/switch/examples/en_US/default/text/text.component.ts @@ -1,7 +1,12 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XSwitchComponent } from '@ng-nest/ui/switch'; @Component({ selector: 'ex-text', + standalone: true, + imports: [FormsModule, XSwitchComponent, XIconComponent], templateUrl: './text.component.html', styleUrls: ['./text.component.scss'] }) diff --git a/lib/ng-nest/ui/switch/examples/index.ts b/lib/ng-nest/ui/switch/examples/index.ts new file mode 100644 index 000000000..06910d536 --- /dev/null +++ b/lib/ng-nest/ui/switch/examples/index.ts @@ -0,0 +1,6 @@ +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/disabled/disabled.component'; +export * from './zh_CN/default/label/label.component'; +export * from './zh_CN/default/loading/loading.component'; +export * from './zh_CN/default/size/size.component'; +export * from './zh_CN/default/text/text.component'; diff --git a/lib/ng-nest/ui/switch/examples/zh_CN/default/default/default.component.html b/lib/ng-nest/ui/switch/examples/zh_CN/default/default/default.component.html index 22d0df69f..b9515407b 100644 --- a/lib/ng-nest/ui/switch/examples/zh_CN/default/default/default.component.html +++ b/lib/ng-nest/ui/switch/examples/zh_CN/default/default/default.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/switch/examples/zh_CN/default/default/default.component.scss b/lib/ng-nest/ui/switch/examples/zh_CN/default/default/default.component.scss index 3ec576c8c..b4943baa0 100644 --- a/lib/ng-nest/ui/switch/examples/zh_CN/default/default/default.component.scss +++ b/lib/ng-nest/ui/switch/examples/zh_CN/default/default/default.component.scss @@ -1,5 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/switch/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/switch/examples/zh_CN/default/default/default.component.ts index 3e9cdf33b..37bf4f661 100644 --- a/lib/ng-nest/ui/switch/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/switch/examples/zh_CN/default/default/default.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSwitchComponent } from '@ng-nest/ui/switch'; @Component({ selector: 'ex-default', + standalone: true, + imports: [FormsModule, XSwitchComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/switch/examples/zh_CN/default/disabled/disabled.component.html b/lib/ng-nest/ui/switch/examples/zh_CN/default/disabled/disabled.component.html index 77268856c..60e2db732 100644 --- a/lib/ng-nest/ui/switch/examples/zh_CN/default/disabled/disabled.component.html +++ b/lib/ng-nest/ui/switch/examples/zh_CN/default/disabled/disabled.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/switch/examples/zh_CN/default/disabled/disabled.component.scss b/lib/ng-nest/ui/switch/examples/zh_CN/default/disabled/disabled.component.scss index 3ec576c8c..b4943baa0 100644 --- a/lib/ng-nest/ui/switch/examples/zh_CN/default/disabled/disabled.component.scss +++ b/lib/ng-nest/ui/switch/examples/zh_CN/default/disabled/disabled.component.scss @@ -1,5 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/switch/examples/zh_CN/default/disabled/disabled.component.ts b/lib/ng-nest/ui/switch/examples/zh_CN/default/disabled/disabled.component.ts index 0fc173ca7..c085677a4 100644 --- a/lib/ng-nest/ui/switch/examples/zh_CN/default/disabled/disabled.component.ts +++ b/lib/ng-nest/ui/switch/examples/zh_CN/default/disabled/disabled.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSwitchComponent } from '@ng-nest/ui/switch'; @Component({ selector: 'ex-disabled', + standalone: true, + imports: [FormsModule, XSwitchComponent], templateUrl: './disabled.component.html', styleUrls: ['./disabled.component.scss'] }) diff --git a/lib/ng-nest/ui/switch/examples/zh_CN/default/label/label.component.html b/lib/ng-nest/ui/switch/examples/zh_CN/default/label/label.component.html index a31acdc4a..2f16b3b5b 100644 --- a/lib/ng-nest/ui/switch/examples/zh_CN/default/label/label.component.html +++ b/lib/ng-nest/ui/switch/examples/zh_CN/default/label/label.component.html @@ -1,20 +1,12 @@ - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/switch/examples/zh_CN/default/label/label.component.scss b/lib/ng-nest/ui/switch/examples/zh_CN/default/label/label.component.scss index 3ec576c8c..b4943baa0 100644 --- a/lib/ng-nest/ui/switch/examples/zh_CN/default/label/label.component.scss +++ b/lib/ng-nest/ui/switch/examples/zh_CN/default/label/label.component.scss @@ -1,5 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/switch/examples/zh_CN/default/label/label.component.ts b/lib/ng-nest/ui/switch/examples/zh_CN/default/label/label.component.ts index 3423f5829..a28358a6c 100644 --- a/lib/ng-nest/ui/switch/examples/zh_CN/default/label/label.component.ts +++ b/lib/ng-nest/ui/switch/examples/zh_CN/default/label/label.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSwitchComponent } from '@ng-nest/ui/switch'; @Component({ selector: 'ex-label', + standalone: true, + imports: [FormsModule, XSwitchComponent], templateUrl: './label.component.html', styleUrls: ['./label.component.scss'] }) diff --git a/lib/ng-nest/ui/switch/examples/zh_CN/default/loading/loading.component.ts b/lib/ng-nest/ui/switch/examples/zh_CN/default/loading/loading.component.ts index 8965dfb71..7309646c1 100644 --- a/lib/ng-nest/ui/switch/examples/zh_CN/default/loading/loading.component.ts +++ b/lib/ng-nest/ui/switch/examples/zh_CN/default/loading/loading.component.ts @@ -1,9 +1,13 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XSwitchComponent } from '@ng-nest/ui/switch'; import { of } from 'rxjs/internal/observable/of'; import { delay } from 'rxjs/operators'; @Component({ selector: 'ex-loading', + standalone: true, + imports: [FormsModule, XSwitchComponent], templateUrl: './loading.component.html', styleUrls: ['./loading.component.scss'] }) diff --git a/lib/ng-nest/ui/switch/examples/zh_CN/default/size/size.component.ts b/lib/ng-nest/ui/switch/examples/zh_CN/default/size/size.component.ts index 7840212ca..819b61afb 100644 --- a/lib/ng-nest/ui/switch/examples/zh_CN/default/size/size.component.ts +++ b/lib/ng-nest/ui/switch/examples/zh_CN/default/size/size.component.ts @@ -1,8 +1,13 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; import { XSize } from '@ng-nest/ui/core'; +import { XRadioComponent } from '@ng-nest/ui/radio'; +import { XSwitchComponent } from '@ng-nest/ui/switch'; @Component({ selector: 'ex-size', + standalone: true, + imports: [FormsModule, XSwitchComponent, XRadioComponent], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/switch/examples/zh_CN/default/text/text.component.ts b/lib/ng-nest/ui/switch/examples/zh_CN/default/text/text.component.ts index 99483d21a..4603022cc 100644 --- a/lib/ng-nest/ui/switch/examples/zh_CN/default/text/text.component.ts +++ b/lib/ng-nest/ui/switch/examples/zh_CN/default/text/text.component.ts @@ -1,7 +1,12 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XSwitchComponent } from '@ng-nest/ui/switch'; @Component({ selector: 'ex-text', + standalone: true, + imports: [FormsModule, XSwitchComponent, XIconComponent], templateUrl: './text.component.html', styleUrls: ['./text.component.scss'] }) diff --git a/lib/ng-nest/ui/switch/switch.component.spec.ts b/lib/ng-nest/ui/switch/switch.component.spec.ts index 8cf06703b..07e395bd2 100644 --- a/lib/ng-nest/ui/switch/switch.component.spec.ts +++ b/lib/ng-nest/ui/switch/switch.component.spec.ts @@ -1,16 +1,14 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XSwitchComponent } from './switch.component'; import { Component, DebugElement, ChangeDetectorRef } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { XSwitchModule } from '@ng-nest/ui/switch'; +import { XSwitchComponent } from '@ng-nest/ui/switch'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { XSwitchPrefix } from './switch.property'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; import { XInputComponent } from '@ng-nest/ui/input'; import { XIconComponent } from '@ng-nest/ui/icon'; @@ -20,13 +18,13 @@ describe(XSwitchPrefix, () => { imports: [ HttpClientTestingModule, BrowserAnimationsModule, - XThemeModule, - XSwitchModule, + XThemeComponent, + XSwitchComponent, FormsModule, ReactiveFormsModule, XRowComponent, XColComponent, - XRadioModule, + XRadioComponent, XInputComponent, XIconComponent ], diff --git a/lib/ng-nest/ui/switch/switch.component.ts b/lib/ng-nest/ui/switch/switch.component.ts index f708ae417..46e3b6966 100644 --- a/lib/ng-nest/ui/switch/switch.component.ts +++ b/lib/ng-nest/ui/switch/switch.component.ts @@ -7,31 +7,38 @@ import { Renderer2, ElementRef, ViewChild, - SimpleChanges + SimpleChanges, + inject, + OnChanges } from '@angular/core'; import { XSwitchProperty, XSwitchPrefix } from './switch.property'; import { XClearClass, XConfigService, XIsChange } from '@ng-nest/ui/core'; import { XValueAccessor } from '@ng-nest/ui/base-form'; +import { CommonModule } from '@angular/common'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { XLoadingComponent } from '@ng-nest/ui/loading'; +import { XOutletDirective } from '@ng-nest/ui/outlet'; @Component({ selector: `${XSwitchPrefix}`, + standalone: true, + imports: [CommonModule, FormsModule, ReactiveFormsModule, XLoadingComponent, XOutletDirective], templateUrl: './switch.component.html', styleUrls: ['./switch.component.scss'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, providers: [XValueAccessor(XSwitchComponent)] }) -export class XSwitchComponent extends XSwitchProperty implements OnInit { +export class XSwitchComponent extends XSwitchProperty implements OnInit, OnChanges { @ViewChild('switch', { static: true }) switch!: ElementRef; override writeValue(value: any) { this.value = value; this.cdr.detectChanges(); } - - constructor(public renderer: Renderer2, public override cdr: ChangeDetectorRef, public configService: XConfigService) { - super(); - } + private renderer = inject(Renderer2); + override cdr = inject(ChangeDetectorRef); + configService = inject(XConfigService); ngOnChanges(changes: SimpleChanges): void { const { size, labelAlign } = changes; diff --git a/lib/ng-nest/ui/switch/switch.module.ts b/lib/ng-nest/ui/switch/switch.module.ts index 535064b9e..9a7c7a1c6 100644 --- a/lib/ng-nest/ui/switch/switch.module.ts +++ b/lib/ng-nest/ui/switch/switch.module.ts @@ -1,15 +1,8 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { XSwitchComponent } from './switch.component'; -import { XSwitchProperty } from './switch.property'; -import { XControlValueAccessor } from '@ng-nest/ui/base-form'; -import { XLoadingComponent } from '@ng-nest/ui/loading'; -import { XOutletDirective } from '@ng-nest/ui/outlet'; @NgModule({ - declarations: [XSwitchComponent, XSwitchProperty], exports: [XSwitchComponent], - imports: [CommonModule, FormsModule, ReactiveFormsModule, XControlValueAccessor, XLoadingComponent, XOutletDirective] + imports: [XSwitchComponent] }) export class XSwitchModule {} diff --git a/lib/ng-nest/ui/table/examples/en_US/default/adaption/adaption.component.ts b/lib/ng-nest/ui/table/examples/en_US/default/adaption/adaption.component.ts index 94317768f..820702e3e 100644 --- a/lib/ng-nest/ui/table/examples/en_US/default/adaption/adaption.component.ts +++ b/lib/ng-nest/ui/table/examples/en_US/default/adaption/adaption.component.ts @@ -1,10 +1,14 @@ import { Component } from '@angular/core'; import { AdaptionService, User } from './adaption.service'; import { XQuery, XSort } from '@ng-nest/ui/core'; -import { XTableColumn } from '@ng-nest/ui/table'; +import { XTableColumn, XTableComponent } from '@ng-nest/ui/table'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XDialogComponent } from '@ng-nest/ui/dialog'; @Component({ selector: 'ex-adaption', + standalone: true, + imports: [XTableComponent, XButtonComponent, XDialogComponent], templateUrl: './adaption.component.html', providers: [AdaptionService] }) diff --git a/lib/ng-nest/ui/table/examples/en_US/default/bordered/bordered.component.ts b/lib/ng-nest/ui/table/examples/en_US/default/bordered/bordered.component.ts index 752c6f60c..1239d4e9e 100644 --- a/lib/ng-nest/ui/table/examples/en_US/default/bordered/bordered.component.ts +++ b/lib/ng-nest/ui/table/examples/en_US/default/bordered/bordered.component.ts @@ -1,11 +1,13 @@ import { Component } from '@angular/core'; import { BorderedService } from './bordered.service'; import { XQuery } from '@ng-nest/ui/core'; -import { XTableColumn } from '@ng-nest/ui/table'; +import { XTableColumn, XTableComponent } from '@ng-nest/ui/table'; import { delay } from 'rxjs/operators'; @Component({ selector: 'ex-bordered', + standalone: true, + imports: [XTableComponent], templateUrl: './bordered.component.html', providers: [BorderedService] }) diff --git a/lib/ng-nest/ui/table/examples/en_US/default/checkbox/checkbox.component.ts b/lib/ng-nest/ui/table/examples/en_US/default/checkbox/checkbox.component.ts index 120ca6158..96098170d 100644 --- a/lib/ng-nest/ui/table/examples/en_US/default/checkbox/checkbox.component.ts +++ b/lib/ng-nest/ui/table/examples/en_US/default/checkbox/checkbox.component.ts @@ -1,11 +1,13 @@ import { Component } from '@angular/core'; import { CheckboxService } from './checkbox.service'; import { XQuery } from '@ng-nest/ui/core'; -import { XTableColumn, XTableHeadCheckbox, XTableRow } from '@ng-nest/ui/table'; +import { XTableColumn, XTableComponent, XTableHeadCheckbox, XTableRow } from '@ng-nest/ui/table'; import { delay } from 'rxjs/operators'; @Component({ selector: 'ex-checkbox', + standalone: true, + imports: [XTableComponent], templateUrl: './checkbox.component.html', providers: [CheckboxService] }) diff --git a/lib/ng-nest/ui/table/examples/en_US/default/config/config.component.ts b/lib/ng-nest/ui/table/examples/en_US/default/config/config.component.ts index 9979472bb..6cd100e7a 100644 --- a/lib/ng-nest/ui/table/examples/en_US/default/config/config.component.ts +++ b/lib/ng-nest/ui/table/examples/en_US/default/config/config.component.ts @@ -1,11 +1,13 @@ import { Component } from '@angular/core'; import { ConfigService } from './config.service'; import { XQuery } from '@ng-nest/ui/core'; -import { XTableCellConfig, XTableColumn } from '@ng-nest/ui/table'; +import { XTableCellConfig, XTableColumn, XTableComponent } from '@ng-nest/ui/table'; import { delay } from 'rxjs/operators'; @Component({ selector: 'ex-config', + standalone: true, + imports: [XTableComponent], templateUrl: './config.component.html', providers: [ConfigService] }) diff --git a/lib/ng-nest/ui/table/examples/en_US/default/custom/custom.component.ts b/lib/ng-nest/ui/table/examples/en_US/default/custom/custom.component.ts index dcef712de..5361c4229 100644 --- a/lib/ng-nest/ui/table/examples/en_US/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/table/examples/en_US/default/custom/custom.component.ts @@ -1,11 +1,14 @@ import { Component } from '@angular/core'; import { CustomService } from './custom.service'; import { XQuery } from '@ng-nest/ui/core'; -import { XTableColumn } from '@ng-nest/ui/table'; +import { XTableColumn, XTableComponent } from '@ng-nest/ui/table'; import { delay } from 'rxjs/operators'; +import { XAvatarComponent } from '@ng-nest/ui/avatar'; @Component({ selector: 'ex-custom', + standalone: true, + imports: [XTableComponent, XAvatarComponent], templateUrl: './custom.component.html', styleUrls: ['./custom.component.scss'], providers: [CustomService] diff --git a/lib/ng-nest/ui/table/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/table/examples/en_US/default/default/default.component.ts index e26946e61..41e1910c6 100644 --- a/lib/ng-nest/ui/table/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/table/examples/en_US/default/default/default.component.ts @@ -1,11 +1,13 @@ import { Component } from '@angular/core'; import { DefaultService } from './default.service'; import { XQuery } from '@ng-nest/ui/core'; -import { XTableColumn } from '@ng-nest/ui/table'; +import { XTableColumn, XTableComponent } from '@ng-nest/ui/table'; import { delay } from 'rxjs/operators'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XTableComponent], templateUrl: './default.component.html', providers: [DefaultService] }) diff --git a/lib/ng-nest/ui/table/examples/en_US/default/drag-column/drag-column.component.ts b/lib/ng-nest/ui/table/examples/en_US/default/drag-column/drag-column.component.ts index 7bc73b8b8..eec6ebd5a 100644 --- a/lib/ng-nest/ui/table/examples/en_US/default/drag-column/drag-column.component.ts +++ b/lib/ng-nest/ui/table/examples/en_US/default/drag-column/drag-column.component.ts @@ -1,11 +1,13 @@ import { Component } from '@angular/core'; import { DragColumnService } from './drag-column.service'; import { XQuery } from '@ng-nest/ui/core'; -import { XTableColumn } from '@ng-nest/ui/table'; +import { XTableColumn, XTableComponent } from '@ng-nest/ui/table'; import { delay } from 'rxjs/operators'; @Component({ selector: 'ex-drag-column', + standalone: true, + imports: [XTableComponent], templateUrl: './drag-column.component.html', providers: [DragColumnService] }) diff --git a/lib/ng-nest/ui/table/examples/en_US/default/drag-width/drag-width.component.ts b/lib/ng-nest/ui/table/examples/en_US/default/drag-width/drag-width.component.ts index 633a8714a..5ad3ef932 100644 --- a/lib/ng-nest/ui/table/examples/en_US/default/drag-width/drag-width.component.ts +++ b/lib/ng-nest/ui/table/examples/en_US/default/drag-width/drag-width.component.ts @@ -1,11 +1,13 @@ import { Component } from '@angular/core'; import { DragWidthService } from './drag-width.service'; import { XQuery } from '@ng-nest/ui/core'; -import { XTableColumn, XTableDragWidthEvent } from '@ng-nest/ui/table'; +import { XTableComponent, XTableColumn, XTableDragWidthEvent } from '@ng-nest/ui/table'; import { delay } from 'rxjs/operators'; @Component({ selector: 'ex-drag-width', + standalone: true, + imports: [XTableComponent], templateUrl: './drag-width.component.html', providers: [DragWidthService] }) diff --git a/lib/ng-nest/ui/table/examples/en_US/default/edit/edit.component.ts b/lib/ng-nest/ui/table/examples/en_US/default/edit/edit.component.ts index 7a15ee7a2..54b061a2f 100644 --- a/lib/ng-nest/ui/table/examples/en_US/default/edit/edit.component.ts +++ b/lib/ng-nest/ui/table/examples/en_US/default/edit/edit.component.ts @@ -1,9 +1,27 @@ import { Component } from '@angular/core'; -import { XTableColumn, XTableRow } from '@ng-nest/ui/table'; +import { XTableColumn, XTableComponent, XTableRow } from '@ng-nest/ui/table'; import { XGuid } from '@ng-nest/ui/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XLinkComponent } from '@ng-nest/ui/link'; +import { CommonModule } from '@angular/common'; +import { XInputComponent } from '@ng-nest/ui/input'; +import { XSelectComponent } from '@ng-nest/ui/select'; +import { XSwitchComponent } from '@ng-nest/ui/switch'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'ex-edit', + standalone: true, + imports: [ + CommonModule, + FormsModule, + XTableComponent, + XButtonComponent, + XLinkComponent, + XInputComponent, + XSelectComponent, + XSwitchComponent + ], templateUrl: './edit.component.html' }) export class ExEditComponent { diff --git a/lib/ng-nest/ui/table/examples/en_US/default/expand/expand.component.ts b/lib/ng-nest/ui/table/examples/en_US/default/expand/expand.component.ts index c90ae937f..0a58ed308 100644 --- a/lib/ng-nest/ui/table/examples/en_US/default/expand/expand.component.ts +++ b/lib/ng-nest/ui/table/examples/en_US/default/expand/expand.component.ts @@ -1,8 +1,13 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; -import { XTableColumn, XTableRow } from '@ng-nest/ui/table'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XDescriptionComponent, XDescriptionItemComponent } from '@ng-nest/ui/description'; +import { XTableColumn, XTableComponent, XTableRow } from '@ng-nest/ui/table'; @Component({ selector: 'ex-expand', + standalone: true, + imports: [CommonModule, XTableComponent, XButtonComponent, XDescriptionComponent, XDescriptionItemComponent], templateUrl: './expand.component.html', styleUrls: ['./expand.component.scss'] }) diff --git a/lib/ng-nest/ui/table/examples/en_US/default/fix/fix.component.ts b/lib/ng-nest/ui/table/examples/en_US/default/fix/fix.component.ts index ac53417a2..13c4b3a68 100644 --- a/lib/ng-nest/ui/table/examples/en_US/default/fix/fix.component.ts +++ b/lib/ng-nest/ui/table/examples/en_US/default/fix/fix.component.ts @@ -1,11 +1,14 @@ import { Component } from '@angular/core'; import { FixService } from './fix.service'; import { XQuery } from '@ng-nest/ui/core'; -import { XTableColumn, XTableRow } from '@ng-nest/ui/table'; +import { XTableColumn, XTableComponent, XTableRow } from '@ng-nest/ui/table'; import { delay } from 'rxjs/operators'; +import { XLinkComponent } from '@ng-nest/ui/link'; @Component({ selector: 'ex-fix', + standalone: true, + imports: [XTableComponent, XLinkComponent], templateUrl: './fix.component.html', providers: [FixService] }) diff --git a/lib/ng-nest/ui/table/examples/en_US/default/head/head.component.ts b/lib/ng-nest/ui/table/examples/en_US/default/head/head.component.ts index 8673a7185..8c01f122c 100644 --- a/lib/ng-nest/ui/table/examples/en_US/default/head/head.component.ts +++ b/lib/ng-nest/ui/table/examples/en_US/default/head/head.component.ts @@ -1,11 +1,13 @@ import { Component } from '@angular/core'; import { HeadService } from './head.service'; import { XQuery } from '@ng-nest/ui/core'; -import { XTableColumn } from '@ng-nest/ui/table'; +import { XTableColumn, XTableComponent } from '@ng-nest/ui/table'; import { delay } from 'rxjs/operators'; @Component({ selector: 'ex-head', + standalone: true, + imports: [XTableComponent], templateUrl: './head.component.html', providers: [HeadService] }) diff --git a/lib/ng-nest/ui/table/examples/en_US/default/header/header.component.ts b/lib/ng-nest/ui/table/examples/en_US/default/header/header.component.ts index d701e2e08..e73de8941 100644 --- a/lib/ng-nest/ui/table/examples/en_US/default/header/header.component.ts +++ b/lib/ng-nest/ui/table/examples/en_US/default/header/header.component.ts @@ -1,11 +1,15 @@ import { Component } from '@angular/core'; import { HeaderService } from './header.service'; import { XQuery } from '@ng-nest/ui/core'; -import { XTableColumn } from '@ng-nest/ui/table'; +import { XTableColumn, XTableComponent } from '@ng-nest/ui/table'; import { delay } from 'rxjs/operators'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XIconComponent } from '@ng-nest/ui/icon'; @Component({ selector: 'ex-header', + standalone: true, + imports: [XTableComponent, XButtonComponent, XIconComponent], templateUrl: './header.component.html', providers: [HeaderService] }) diff --git a/lib/ng-nest/ui/table/examples/en_US/default/row-size/row-size.component.ts b/lib/ng-nest/ui/table/examples/en_US/default/row-size/row-size.component.ts index 224f4367f..f32e21166 100644 --- a/lib/ng-nest/ui/table/examples/en_US/default/row-size/row-size.component.ts +++ b/lib/ng-nest/ui/table/examples/en_US/default/row-size/row-size.component.ts @@ -1,11 +1,13 @@ import { Component } from '@angular/core'; import { RowSizeService } from './row-size.service'; import { XQuery } from '@ng-nest/ui/core'; -import { XTableColumn } from '@ng-nest/ui/table'; +import { XTableColumn, XTableComponent } from '@ng-nest/ui/table'; import { delay } from 'rxjs/operators'; @Component({ selector: 'ex-row-size', + standalone: true, + imports: [XTableComponent], templateUrl: './row-size.component.html', providers: [RowSizeService] }) diff --git a/lib/ng-nest/ui/table/examples/en_US/default/rowclass/rowclass.component.ts b/lib/ng-nest/ui/table/examples/en_US/default/rowclass/rowclass.component.ts index 4e2d70127..2d7b391e2 100644 --- a/lib/ng-nest/ui/table/examples/en_US/default/rowclass/rowclass.component.ts +++ b/lib/ng-nest/ui/table/examples/en_US/default/rowclass/rowclass.component.ts @@ -1,11 +1,13 @@ import { Component } from '@angular/core'; import { RowclassService } from './rowclass.service'; import { XQuery } from '@ng-nest/ui/core'; -import { XTableColumn, XTableRow } from '@ng-nest/ui/table'; +import { XTableColumn, XTableComponent, XTableRow } from '@ng-nest/ui/table'; import { delay } from 'rxjs/operators'; @Component({ selector: 'ex-rowclass', + standalone: true, + imports: [XTableComponent], templateUrl: './rowclass.component.html', styleUrls: ['./rowclass.component.scss'], providers: [RowclassService] diff --git a/lib/ng-nest/ui/table/examples/en_US/default/scroll/scroll.component.ts b/lib/ng-nest/ui/table/examples/en_US/default/scroll/scroll.component.ts index 7e2eb1d5e..6471c60da 100644 --- a/lib/ng-nest/ui/table/examples/en_US/default/scroll/scroll.component.ts +++ b/lib/ng-nest/ui/table/examples/en_US/default/scroll/scroll.component.ts @@ -1,11 +1,13 @@ import { Component } from '@angular/core'; import { ScrollService } from './scroll.service'; import { XQuery } from '@ng-nest/ui/core'; -import { XTableColumn } from '@ng-nest/ui/table'; +import { XTableColumn, XTableComponent } from '@ng-nest/ui/table'; import { delay } from 'rxjs/operators'; @Component({ selector: 'ex-scroll', + standalone: true, + imports: [XTableComponent], templateUrl: './scroll.component.html', providers: [ScrollService] }) diff --git a/lib/ng-nest/ui/table/examples/en_US/default/search/search.component.ts b/lib/ng-nest/ui/table/examples/en_US/default/search/search.component.ts index 0f8c62c3a..486e8a88b 100644 --- a/lib/ng-nest/ui/table/examples/en_US/default/search/search.component.ts +++ b/lib/ng-nest/ui/table/examples/en_US/default/search/search.component.ts @@ -2,9 +2,15 @@ import { Component, ViewChild } from '@angular/core'; import { SearchService } from './search.service'; import { XQuery } from '@ng-nest/ui/core'; import { XTableColumn, XTableComponent } from '@ng-nest/ui/table'; +import { XInputComponent } from '@ng-nest/ui/input'; +import { XSelectComponent } from '@ng-nest/ui/select'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'ex-search', + standalone: true, + imports: [CommonModule, FormsModule, XTableComponent, XInputComponent, XSelectComponent], templateUrl: './search.component.html', providers: [SearchService] }) diff --git a/lib/ng-nest/ui/table/examples/index.ts b/lib/ng-nest/ui/table/examples/index.ts new file mode 100644 index 000000000..bb40eb50c --- /dev/null +++ b/lib/ng-nest/ui/table/examples/index.ts @@ -0,0 +1,17 @@ +export * from './zh_CN/default/adaption/adaption.component'; +export * from './zh_CN/default/bordered/bordered.component'; +export * from './zh_CN/default/checkbox/checkbox.component'; +export * from './zh_CN/default/config/config.component'; +export * from './zh_CN/default/custom/custom.component'; +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/drag-column/drag-column.component'; +export * from './zh_CN/default/drag-width/drag-width.component'; +export * from './zh_CN/default/edit/edit.component'; +export * from './zh_CN/default/expand/expand.component'; +export * from './zh_CN/default/fix/fix.component'; +export * from './zh_CN/default/head/head.component'; +export * from './zh_CN/default/header/header.component'; +export * from './zh_CN/default/row-size/row-size.component'; +export * from './zh_CN/default/rowclass/rowclass.component'; +export * from './zh_CN/default/scroll/scroll.component'; +export * from './zh_CN/default/search/search.component'; diff --git a/lib/ng-nest/ui/table/examples/zh_CN/default/adaption/adaption.component.ts b/lib/ng-nest/ui/table/examples/zh_CN/default/adaption/adaption.component.ts index a49df0386..635f6e493 100644 --- a/lib/ng-nest/ui/table/examples/zh_CN/default/adaption/adaption.component.ts +++ b/lib/ng-nest/ui/table/examples/zh_CN/default/adaption/adaption.component.ts @@ -1,10 +1,14 @@ import { Component } from '@angular/core'; import { AdaptionService, User } from './adaption.service'; import { XQuery, XSort } from '@ng-nest/ui/core'; -import { XTableColumn } from '@ng-nest/ui/table'; +import { XTableColumn, XTableComponent } from '@ng-nest/ui/table'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XDialogComponent } from '@ng-nest/ui/dialog'; @Component({ selector: 'ex-adaption', + standalone: true, + imports: [XTableComponent, XButtonComponent, XDialogComponent], templateUrl: './adaption.component.html', providers: [AdaptionService] }) @@ -27,8 +31,6 @@ export class ExAdaptionComponent { constructor(private service: AdaptionService) {} - ngOnInit() {} - getData() { this.service.getList(this.index, this.size, this.query).subscribe((x) => { [this.data, this.total] = [x.list as User[], Number(x.total)]; diff --git a/lib/ng-nest/ui/table/examples/zh_CN/default/bordered/bordered.component.ts b/lib/ng-nest/ui/table/examples/zh_CN/default/bordered/bordered.component.ts index 319de0089..970d79ac1 100644 --- a/lib/ng-nest/ui/table/examples/zh_CN/default/bordered/bordered.component.ts +++ b/lib/ng-nest/ui/table/examples/zh_CN/default/bordered/bordered.component.ts @@ -1,11 +1,13 @@ import { Component } from '@angular/core'; import { BorderedService } from './bordered.service'; import { XQuery } from '@ng-nest/ui/core'; -import { XTableColumn } from '@ng-nest/ui/table'; +import { XTableColumn, XTableComponent } from '@ng-nest/ui/table'; import { delay } from 'rxjs/operators'; @Component({ selector: 'ex-bordered', + standalone: true, + imports: [XTableComponent], templateUrl: './bordered.component.html', providers: [BorderedService] }) @@ -22,6 +24,4 @@ export class ExBorderedComponent { ]; constructor(private service: BorderedService) {} - - ngOnInit() {} } diff --git a/lib/ng-nest/ui/table/examples/zh_CN/default/checkbox/checkbox.component.ts b/lib/ng-nest/ui/table/examples/zh_CN/default/checkbox/checkbox.component.ts index 8310202c1..21b2f7402 100644 --- a/lib/ng-nest/ui/table/examples/zh_CN/default/checkbox/checkbox.component.ts +++ b/lib/ng-nest/ui/table/examples/zh_CN/default/checkbox/checkbox.component.ts @@ -1,11 +1,13 @@ import { Component } from '@angular/core'; import { CheckboxService } from './checkbox.service'; import { XQuery } from '@ng-nest/ui/core'; -import { XTableColumn, XTableHeadCheckbox, XTableRow } from '@ng-nest/ui/table'; +import { XTableColumn, XTableComponent, XTableHeadCheckbox, XTableRow } from '@ng-nest/ui/table'; import { delay } from 'rxjs/operators'; @Component({ selector: 'ex-checkbox', + standalone: true, + imports: [XTableComponent], templateUrl: './checkbox.component.html', providers: [CheckboxService] }) diff --git a/lib/ng-nest/ui/table/examples/zh_CN/default/config/config.component.ts b/lib/ng-nest/ui/table/examples/zh_CN/default/config/config.component.ts index 875411c26..82a865c6b 100644 --- a/lib/ng-nest/ui/table/examples/zh_CN/default/config/config.component.ts +++ b/lib/ng-nest/ui/table/examples/zh_CN/default/config/config.component.ts @@ -1,11 +1,13 @@ import { Component } from '@angular/core'; import { ConfigService } from './config.service'; import { XQuery } from '@ng-nest/ui/core'; -import { XTableCellConfig, XTableColumn } from '@ng-nest/ui/table'; +import { XTableCellConfig, XTableColumn, XTableComponent } from '@ng-nest/ui/table'; import { delay } from 'rxjs/operators'; @Component({ selector: 'ex-config', + standalone: true, + imports: [XTableComponent], templateUrl: './config.component.html', providers: [ConfigService] }) diff --git a/lib/ng-nest/ui/table/examples/zh_CN/default/custom/custom.component.ts b/lib/ng-nest/ui/table/examples/zh_CN/default/custom/custom.component.ts index 4290b4cb8..61a4cceba 100644 --- a/lib/ng-nest/ui/table/examples/zh_CN/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/table/examples/zh_CN/default/custom/custom.component.ts @@ -1,11 +1,14 @@ import { Component } from '@angular/core'; import { CustomService } from './custom.service'; import { XQuery } from '@ng-nest/ui/core'; -import { XTableColumn } from '@ng-nest/ui/table'; +import { XTableColumn, XTableComponent } from '@ng-nest/ui/table'; import { delay } from 'rxjs/operators'; +import { XAvatarComponent } from '@ng-nest/ui/avatar'; @Component({ selector: 'ex-custom', + standalone: true, + imports: [XTableComponent, XAvatarComponent], templateUrl: './custom.component.html', styleUrls: ['./custom.component.scss'], providers: [CustomService] diff --git a/lib/ng-nest/ui/table/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/table/examples/zh_CN/default/default/default.component.ts index 68b17659e..2b2de3591 100644 --- a/lib/ng-nest/ui/table/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/table/examples/zh_CN/default/default/default.component.ts @@ -1,11 +1,13 @@ import { Component } from '@angular/core'; import { DefaultService } from './default.service'; import { XQuery } from '@ng-nest/ui/core'; -import { XTableColumn } from '@ng-nest/ui/table'; +import { XTableColumn, XTableComponent } from '@ng-nest/ui/table'; import { delay } from 'rxjs/operators'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XTableComponent], templateUrl: './default.component.html', providers: [DefaultService] }) diff --git a/lib/ng-nest/ui/table/examples/zh_CN/default/drag-column/drag-column.component.ts b/lib/ng-nest/ui/table/examples/zh_CN/default/drag-column/drag-column.component.ts index 91c31dacf..88977655e 100644 --- a/lib/ng-nest/ui/table/examples/zh_CN/default/drag-column/drag-column.component.ts +++ b/lib/ng-nest/ui/table/examples/zh_CN/default/drag-column/drag-column.component.ts @@ -1,11 +1,13 @@ import { Component } from '@angular/core'; import { DragColumnService } from './drag-column.service'; import { XQuery } from '@ng-nest/ui/core'; -import { XTableColumn } from '@ng-nest/ui/table'; +import { XTableColumn, XTableComponent } from '@ng-nest/ui/table'; import { delay } from 'rxjs/operators'; @Component({ selector: 'ex-drag-column', + standalone: true, + imports: [XTableComponent], templateUrl: './drag-column.component.html', providers: [DragColumnService] }) diff --git a/lib/ng-nest/ui/table/examples/zh_CN/default/drag-width/drag-width.component.ts b/lib/ng-nest/ui/table/examples/zh_CN/default/drag-width/drag-width.component.ts index a81907741..beadebb2d 100644 --- a/lib/ng-nest/ui/table/examples/zh_CN/default/drag-width/drag-width.component.ts +++ b/lib/ng-nest/ui/table/examples/zh_CN/default/drag-width/drag-width.component.ts @@ -1,11 +1,13 @@ import { Component } from '@angular/core'; import { DragWidthService } from './drag-width.service'; import { XQuery } from '@ng-nest/ui/core'; -import { XTableColumn, XTableDragWidthEvent } from '@ng-nest/ui/table'; +import { XTableComponent, XTableColumn, XTableDragWidthEvent } from '@ng-nest/ui/table'; import { delay } from 'rxjs/operators'; @Component({ selector: 'ex-drag-width', + standalone: true, + imports: [XTableComponent], templateUrl: './drag-width.component.html', providers: [DragWidthService] }) diff --git a/lib/ng-nest/ui/table/examples/zh_CN/default/edit/edit.component.ts b/lib/ng-nest/ui/table/examples/zh_CN/default/edit/edit.component.ts index 140417738..903a32101 100644 --- a/lib/ng-nest/ui/table/examples/zh_CN/default/edit/edit.component.ts +++ b/lib/ng-nest/ui/table/examples/zh_CN/default/edit/edit.component.ts @@ -1,9 +1,27 @@ import { Component } from '@angular/core'; -import { XTableColumn, XTableRow } from '@ng-nest/ui/table'; +import { XTableColumn, XTableComponent, XTableRow } from '@ng-nest/ui/table'; import { XGuid } from '@ng-nest/ui/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XLinkComponent } from '@ng-nest/ui/link'; +import { CommonModule } from '@angular/common'; +import { XInputComponent } from '@ng-nest/ui/input'; +import { XSelectComponent } from '@ng-nest/ui/select'; +import { XSwitchComponent } from '@ng-nest/ui/switch'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'ex-edit', + standalone: true, + imports: [ + CommonModule, + FormsModule, + XTableComponent, + XButtonComponent, + XLinkComponent, + XInputComponent, + XSelectComponent, + XSwitchComponent + ], templateUrl: './edit.component.html' }) export class ExEditComponent { @@ -23,10 +41,6 @@ export class ExEditComponent { positionOptions = ['技术员', '销售', '经理', '总监', '生产员']; - constructor() {} - - ngOnInit() {} - add() { this.data = [...this.data, { id: XGuid(), name: '', position: '', status: false }]; } diff --git a/lib/ng-nest/ui/table/examples/zh_CN/default/expand/expand.component.ts b/lib/ng-nest/ui/table/examples/zh_CN/default/expand/expand.component.ts index c92e17134..911b768b1 100644 --- a/lib/ng-nest/ui/table/examples/zh_CN/default/expand/expand.component.ts +++ b/lib/ng-nest/ui/table/examples/zh_CN/default/expand/expand.component.ts @@ -1,8 +1,13 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; -import { XTableColumn, XTableRow } from '@ng-nest/ui/table'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XDescriptionComponent, XDescriptionItemComponent } from '@ng-nest/ui/description'; +import { XTableColumn, XTableComponent, XTableRow } from '@ng-nest/ui/table'; @Component({ selector: 'ex-expand', + standalone: true, + imports: [CommonModule, XTableComponent, XButtonComponent, XDescriptionComponent, XDescriptionItemComponent], templateUrl: './expand.component.html', styleUrls: ['./expand.component.scss'] }) diff --git a/lib/ng-nest/ui/table/examples/zh_CN/default/fix/fix.component.ts b/lib/ng-nest/ui/table/examples/zh_CN/default/fix/fix.component.ts index 8e8be6ca8..e84014b3a 100644 --- a/lib/ng-nest/ui/table/examples/zh_CN/default/fix/fix.component.ts +++ b/lib/ng-nest/ui/table/examples/zh_CN/default/fix/fix.component.ts @@ -1,11 +1,14 @@ import { Component } from '@angular/core'; import { FixService } from './fix.service'; import { XQuery } from '@ng-nest/ui/core'; -import { XTableColumn, XTableRow } from '@ng-nest/ui/table'; +import { XTableColumn, XTableComponent, XTableRow } from '@ng-nest/ui/table'; import { delay } from 'rxjs/operators'; +import { XLinkComponent } from '@ng-nest/ui/link'; @Component({ selector: 'ex-fix', + standalone: true, + imports: [XTableComponent, XLinkComponent], templateUrl: './fix.component.html', providers: [FixService] }) diff --git a/lib/ng-nest/ui/table/examples/zh_CN/default/head/head.component.ts b/lib/ng-nest/ui/table/examples/zh_CN/default/head/head.component.ts index 853a05866..816e436e1 100644 --- a/lib/ng-nest/ui/table/examples/zh_CN/default/head/head.component.ts +++ b/lib/ng-nest/ui/table/examples/zh_CN/default/head/head.component.ts @@ -1,11 +1,13 @@ import { Component } from '@angular/core'; import { HeadService } from './head.service'; import { XQuery } from '@ng-nest/ui/core'; -import { XTableColumn } from '@ng-nest/ui/table'; +import { XTableColumn, XTableComponent } from '@ng-nest/ui/table'; import { delay } from 'rxjs/operators'; @Component({ selector: 'ex-head', + standalone: true, + imports: [XTableComponent], templateUrl: './head.component.html', providers: [HeadService] }) diff --git a/lib/ng-nest/ui/table/examples/zh_CN/default/header/header.component.ts b/lib/ng-nest/ui/table/examples/zh_CN/default/header/header.component.ts index d14583ffc..e055c8048 100644 --- a/lib/ng-nest/ui/table/examples/zh_CN/default/header/header.component.ts +++ b/lib/ng-nest/ui/table/examples/zh_CN/default/header/header.component.ts @@ -1,11 +1,15 @@ import { Component } from '@angular/core'; import { HeaderService } from './header.service'; import { XQuery } from '@ng-nest/ui/core'; -import { XTableColumn } from '@ng-nest/ui/table'; +import { XTableColumn, XTableComponent } from '@ng-nest/ui/table'; import { delay } from 'rxjs/operators'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XIconComponent } from '@ng-nest/ui/icon'; @Component({ selector: 'ex-header', + standalone: true, + imports: [XTableComponent, XButtonComponent, XIconComponent], templateUrl: './header.component.html', providers: [HeaderService] }) diff --git a/lib/ng-nest/ui/table/examples/zh_CN/default/row-size/row-size.component.ts b/lib/ng-nest/ui/table/examples/zh_CN/default/row-size/row-size.component.ts index a0b446ea4..98ca660c5 100644 --- a/lib/ng-nest/ui/table/examples/zh_CN/default/row-size/row-size.component.ts +++ b/lib/ng-nest/ui/table/examples/zh_CN/default/row-size/row-size.component.ts @@ -1,11 +1,13 @@ import { Component } from '@angular/core'; import { RowSizeService } from './row-size.service'; import { XQuery } from '@ng-nest/ui/core'; -import { XTableColumn } from '@ng-nest/ui/table'; +import { XTableColumn, XTableComponent } from '@ng-nest/ui/table'; import { delay } from 'rxjs/operators'; @Component({ selector: 'ex-row-size', + standalone: true, + imports: [XTableComponent], templateUrl: './row-size.component.html', providers: [RowSizeService] }) diff --git a/lib/ng-nest/ui/table/examples/zh_CN/default/rowclass/rowclass.component.ts b/lib/ng-nest/ui/table/examples/zh_CN/default/rowclass/rowclass.component.ts index 66dcd9f3c..3eb13b576 100644 --- a/lib/ng-nest/ui/table/examples/zh_CN/default/rowclass/rowclass.component.ts +++ b/lib/ng-nest/ui/table/examples/zh_CN/default/rowclass/rowclass.component.ts @@ -1,11 +1,13 @@ import { Component } from '@angular/core'; import { RowclassService } from './rowclass.service'; import { XQuery } from '@ng-nest/ui/core'; -import { XTableColumn, XTableRow } from '@ng-nest/ui/table'; +import { XTableColumn, XTableComponent, XTableRow } from '@ng-nest/ui/table'; import { delay } from 'rxjs/operators'; @Component({ selector: 'ex-rowclass', + standalone: true, + imports: [XTableComponent], templateUrl: './rowclass.component.html', styleUrls: ['./rowclass.component.scss'], providers: [RowclassService] diff --git a/lib/ng-nest/ui/table/examples/zh_CN/default/scroll/scroll.component.ts b/lib/ng-nest/ui/table/examples/zh_CN/default/scroll/scroll.component.ts index 8046a332f..e309878f5 100644 --- a/lib/ng-nest/ui/table/examples/zh_CN/default/scroll/scroll.component.ts +++ b/lib/ng-nest/ui/table/examples/zh_CN/default/scroll/scroll.component.ts @@ -1,11 +1,13 @@ import { Component } from '@angular/core'; import { ScrollService } from './scroll.service'; import { XQuery } from '@ng-nest/ui/core'; -import { XTableColumn } from '@ng-nest/ui/table'; +import { XTableColumn, XTableComponent } from '@ng-nest/ui/table'; import { delay } from 'rxjs/operators'; @Component({ selector: 'ex-scroll', + standalone: true, + imports: [XTableComponent], templateUrl: './scroll.component.html', providers: [ScrollService] }) diff --git a/lib/ng-nest/ui/table/examples/zh_CN/default/search/search.component.ts b/lib/ng-nest/ui/table/examples/zh_CN/default/search/search.component.ts index c0e6fe8a4..89de48e2e 100644 --- a/lib/ng-nest/ui/table/examples/zh_CN/default/search/search.component.ts +++ b/lib/ng-nest/ui/table/examples/zh_CN/default/search/search.component.ts @@ -2,9 +2,15 @@ import { Component, ViewChild } from '@angular/core'; import { SearchService } from './search.service'; import { XQuery } from '@ng-nest/ui/core'; import { XTableColumn, XTableComponent } from '@ng-nest/ui/table'; +import { XInputComponent } from '@ng-nest/ui/input'; +import { XSelectComponent } from '@ng-nest/ui/select'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'ex-search', + standalone: true, + imports: [CommonModule, FormsModule, XTableComponent, XInputComponent, XSelectComponent], templateUrl: './search.component.html', providers: [SearchService] }) diff --git a/lib/ng-nest/ui/table/table-body.component.ts b/lib/ng-nest/ui/table/table-body.component.ts index 6acd389c7..dcf161f2c 100644 --- a/lib/ng-nest/ui/table/table-body.component.ts +++ b/lib/ng-nest/ui/table/table-body.component.ts @@ -13,14 +13,38 @@ import { inject } from '@angular/core'; import { XTableBodyPrefix, XTableBodyProperty, XTableRow, XTableColumn, XTableCell } from './table.property'; -import { removeNgTag, XIsChange, XResize, XConfigService, XNumber, stripTags, XParentPath, XResizeObserver } from '@ng-nest/ui/core'; +import { + removeNgTag, + XIsChange, + XResize, + XConfigService, + XNumber, + stripTags, + XParentPath, + XResizeObserver +} from '@ng-nest/ui/core'; import { Subject, fromEvent } from 'rxjs'; -import { DOCUMENT } from '@angular/common'; -import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling'; +import { CommonModule, DOCUMENT } from '@angular/common'; +import { CdkVirtualScrollViewport, ScrollingModule } from '@angular/cdk/scrolling'; import { takeUntil } from 'rxjs/operators'; +import { XEmptyComponent } from '@ng-nest/ui/empty'; +import { XOutletDirective } from '@ng-nest/ui/outlet'; +import { XCheckboxComponent } from '@ng-nest/ui/checkbox'; +import { FormsModule } from '@angular/forms'; +import { XButtonComponent } from '@ng-nest/ui/button'; @Component({ selector: `${XTableBodyPrefix}`, + standalone: true, + imports: [ + CommonModule, + FormsModule, + XEmptyComponent, + ScrollingModule, + XOutletDirective, + XCheckboxComponent, + XButtonComponent + ], templateUrl: './table-body.component.html', encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush diff --git a/lib/ng-nest/ui/table/table-foot.component.ts b/lib/ng-nest/ui/table/table-foot.component.ts index 57d7d5a4f..05219d936 100644 --- a/lib/ng-nest/ui/table/table-foot.component.ts +++ b/lib/ng-nest/ui/table/table-foot.component.ts @@ -2,18 +2,21 @@ import { Component, OnInit, ViewEncapsulation, - Renderer2, ElementRef, - ChangeDetectorRef, ChangeDetectionStrategy, ViewChild, - Input + Input, + inject } from '@angular/core'; import { XTableFootPrefix, XTableFootProperty } from './table.property'; import { removeNgTag } from '@ng-nest/ui/core'; +import { XOutletDirective } from '@ng-nest/ui/outlet'; +import { CommonModule } from '@angular/common'; @Component({ selector: `${XTableFootPrefix}`, + standalone: true, + imports: [CommonModule, XOutletDirective], templateUrl: './table-foot.component.html', encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush @@ -24,14 +27,7 @@ export class XTableFootComponent extends XTableFootProperty implements OnInit { get getRowHeight() { return this.rowHeight == 0 ? '' : this.rowHeight; } - constructor( - // @Optional() @Host() public table: XTableComponent, - public renderer: Renderer2, - public elementRef: ElementRef, - public cdr: ChangeDetectorRef - ) { - super(); - } + private elementRef = inject(ElementRef); ngOnInit() { removeNgTag(this.elementRef.nativeElement); diff --git a/lib/ng-nest/ui/table/table-head.component.ts b/lib/ng-nest/ui/table/table-head.component.ts index 4401bb9b7..7fa738eb6 100644 --- a/lib/ng-nest/ui/table/table-head.component.ts +++ b/lib/ng-nest/ui/table/table-head.component.ts @@ -2,19 +2,44 @@ import { Component, OnInit, ViewEncapsulation, - Renderer2, ElementRef, ChangeDetectorRef, SimpleChanges, ViewChild, - Input + Input, + inject } from '@angular/core'; import { XTableHeadPrefix, XTableHeadProperty, XTableColumn, XTableCell, XTablePrefix } from './table.property'; -import { removeNgTag, XIsEmpty, XSort, XIsChange, XConfigService, XNumber, XClassMap, XIsFunction } from '@ng-nest/ui/core'; -import { CdkDragDrop, CdkDragSortEvent, CdkDragStart, moveItemInArray } from '@angular/cdk/drag-drop'; +import { + removeNgTag, + XIsEmpty, + XSort, + XIsChange, + XConfigService, + XNumber, + XClassMap, + XIsFunction +} from '@ng-nest/ui/core'; +import { CdkDragDrop, CdkDragSortEvent, CdkDragStart, DragDropModule, moveItemInArray } from '@angular/cdk/drag-drop'; +import { CommonModule } from '@angular/common'; +import { XDragDirective } from '@ng-nest/ui/drag'; +import { XCheckboxComponent } from '@ng-nest/ui/checkbox'; +import { XOutletDirective } from '@ng-nest/ui/outlet'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { FormsModule } from '@angular/forms'; @Component({ selector: `${XTableHeadPrefix}`, + standalone: true, + imports: [ + CommonModule, + FormsModule, + XDragDirective, + DragDropModule, + XCheckboxComponent, + XOutletDirective, + XIconComponent + ], templateUrl: './table-head.component.html', encapsulation: ViewEncapsulation.None }) @@ -28,15 +53,9 @@ export class XTableHeadComponent extends XTableHeadProperty implements OnInit { get getRowHeight() { return this.rowHeight == 0 ? '' : this.rowHeight; } - constructor( - // @Optional() @Host() public table: XTableComponent, - public renderer: Renderer2, - public elementRef: ElementRef, - public cdr: ChangeDetectorRef, - public configService: XConfigService - ) { - super(); - } + private elementRef = inject(ElementRef); + private cdr = inject(ChangeDetectorRef); + configService = inject(XConfigService); ngOnChanges(simples: SimpleChanges) { const { columns, scrollYWidth, scrollXWidth, cellConfig } = simples; @@ -124,7 +143,10 @@ export class XTableHeadComponent extends XTableHeadProperty implements OnInit { this.cdr.detectChanges(); } - dragWidthMoved(position: { x: number; y: number; offsetX: number; offsetY: number }, column: XTableColumn | XTableCell) { + dragWidthMoved( + position: { x: number; y: number; offsetX: number; offsetY: number }, + column: XTableColumn | XTableCell + ) { if (column.width) { (column.width as number) += position.offsetX; if (column.width < 60) column.width = 60; diff --git a/lib/ng-nest/ui/table/table.component.spec.ts b/lib/ng-nest/ui/table/table.component.spec.ts index 5a68900ab..50f14078d 100644 --- a/lib/ng-nest/ui/table/table.component.spec.ts +++ b/lib/ng-nest/ui/table/table.component.spec.ts @@ -1,9 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XTableComponent } from './table.component'; import { Component, DebugElement, Injectable, ChangeDetectorRef } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { XTableModule } from '@ng-nest/ui/table'; +import { XTableComponent } from '@ng-nest/ui/table'; import { FormsModule } from '@angular/forms'; import { XTablePrefix, XTableColumn, XTableCellConfig } from './table.property'; import { @@ -24,8 +22,8 @@ import { XIconComponent } from '@ng-nest/ui/icon'; import { XAvatarComponent } from '@ng-nest/ui/avatar'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XInputComponent } from '@ng-nest/ui/input'; -import { XSelectModule } from '@ng-nest/ui/select'; -import { XSwitchModule } from '@ng-nest/ui/switch'; +import { XSelectComponent } from '@ng-nest/ui/select'; +import { XSwitchComponent } from '@ng-nest/ui/switch'; import { XLinkComponent } from '@ng-nest/ui/link'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { XDescriptionModule } from '@ng-nest/ui/description'; @@ -40,14 +38,14 @@ describe(XTablePrefix, () => { HttpClientTestingModule, FormsModule, XDescriptionModule, - XTableModule, + XTableComponent, XIconComponent, XAvatarComponent, XButtonComponent, XLinkComponent, XInputComponent, - XSelectModule, - XSwitchModule, + XSelectComponent, + XSwitchComponent, XDialogComponent ], declarations: [ @@ -295,8 +293,7 @@ interface User extends XId { providers: [UsersServiceTest] }) class TestXTableComponent { - data = (index: number, size: number, query: XQuery) => - this.service.getList(index, size, query).pipe(delay(2000)); + data = (index: number, size: number, query: XQuery) => this.service.getList(index, size, query).pipe(delay(2000)); columns: XTableColumn[] = [ { id: 'index', label: '序号', type: 'index' }, { id: 'name', label: '用户', sort: true }, @@ -345,8 +342,7 @@ class TestXTableComponent { providers: [UsersServiceTest] }) class TestXTableScrollComponent { - data = (index: number, size: number, query: XQuery) => - this.service.getList(index, size, query).pipe(delay(2000)); + data = (index: number, size: number, query: XQuery) => this.service.getList(index, size, query).pipe(delay(2000)); columns: XTableColumn[] = [ { id: 'index', label: '序号', width: 100, left: 0, type: 'index' }, { id: 'name', label: '用户', width: 200, sort: true }, @@ -395,8 +391,7 @@ class TestXTableScrollComponent { providers: [UsersServiceTest] }) class TestXTableBorderedComponent { - data = (index: number, size: number, query: XQuery) => - this.service.getList(index, size, query).pipe(delay(2000)); + data = (index: number, size: number, query: XQuery) => this.service.getList(index, size, query).pipe(delay(2000)); columns: XTableColumn[] = [ { id: 'index', label: '序号', width: 100, left: 0, type: 'index' }, { id: 'name', label: '用户', width: 200, sort: true }, @@ -445,8 +440,7 @@ class TestXTableBorderedComponent { providers: [UsersServiceTest] }) class TestXTableWidthDragComponent { - data = (index: number, size: number, query: XQuery) => - this.service.getList(index, size, query).pipe(delay(2000)); + data = (index: number, size: number, query: XQuery) => this.service.getList(index, size, query).pipe(delay(2000)); columns: XTableColumn[] = [ { id: 'index', label: '序号', width: 100, left: 0, type: 'index' }, { id: 'name', label: '用户', width: 150, sort: true, dragWidth: true }, @@ -708,8 +702,7 @@ class TestXTableMergeColumnComponent { providers: [UsersServiceTest] }) class TestXTableCheckboxComponent { - data = (index: number, size: number, query: XQuery) => - this.service.getList(index, size, query).pipe(delay(1000)); + data = (index: number, size: number, query: XQuery) => this.service.getList(index, size, query).pipe(delay(1000)); columns: XTableColumn[] = [ { id: 'checked', label: '', rowChecked: true, headChecked: true, type: 'checkbox', width: 60 }, { id: 'index', label: '序号', flex: 0.5, type: 'index' }, @@ -728,44 +721,19 @@ class TestXTableCheckboxComponent { @Component({ template: `
- - +
- - +
- - +
- - +
`, styles: [ @@ -786,8 +754,7 @@ class TestXTableCheckboxComponent { providers: [UsersServiceTest] }) class TestXTableRowSizeComponent { - data = (index: number, size: number, query: XQuery) => - this.service.getList(index, size, query).pipe(delay(2000)); + data = (index: number, size: number, query: XQuery) => this.service.getList(index, size, query).pipe(delay(2000)); columns: XTableColumn[] = [ { id: 'index', label: '序号', flex: 0.5, left: 0, type: 'index' }, { id: 'name', label: '用户', flex: 1.5, sort: true }, @@ -870,8 +837,7 @@ class TestXTableRowSizeComponent { }) class TestXTablePaginationComponent { size = 100; - data = (index: number, size: number, query: XQuery) => - this.service.getList(index, size, query).pipe(delay(2000)); + data = (index: number, size: number, query: XQuery) => this.service.getList(index, size, query).pipe(delay(2000)); columns: XTableColumn[] = [{ id: 'name', label: '用户', flex: 1.5, sort: true }]; constructor(private service: UsersServiceTest) {} diff --git a/lib/ng-nest/ui/table/table.component.ts b/lib/ng-nest/ui/table/table.component.ts index 3238803f8..ba7ce066b 100644 --- a/lib/ng-nest/ui/table/table.component.ts +++ b/lib/ng-nest/ui/table/table.component.ts @@ -10,15 +10,38 @@ import { ViewChild, OnDestroy } from '@angular/core'; -import { XTablePrefix, XTableProperty, XTableColumn, XTableRow, XTableCell, XTableCellConfigRule } from './table.property'; +import { + XTablePrefix, + XTableProperty, + XTableColumn, + XTableRow, + XTableCell, + XTableCellConfigRule +} from './table.property'; import { XIsChange, XIsEmpty, XResultList, XNumber, XSort, XConfigService, XIsUndefined } from '@ng-nest/ui/core'; import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling'; import { XPaginationComponent } from '@ng-nest/ui/pagination'; import { takeUntil } from 'rxjs/operators'; import { Subject } from 'rxjs'; +import { CommonModule } from '@angular/common'; +import { XLoadingComponent } from '@ng-nest/ui/loading'; +import { XTableHeadComponent } from './table-head.component'; +import { XTableFootComponent } from './table-foot.component'; +import { XTableBodyComponent } from './table-body.component'; +import { XOutletDirective } from '@ng-nest/ui/outlet'; @Component({ selector: `${XTablePrefix}`, + standalone: true, + imports: [ + CommonModule, + XOutletDirective, + XLoadingComponent, + XTableHeadComponent, + XTableFootComponent, + XTableBodyComponent, + XPaginationComponent + ], templateUrl: './table.component.html', styleUrls: ['./table.component.scss'], encapsulation: ViewEncapsulation.None, @@ -310,7 +333,8 @@ export class XTableComponent extends XTableProperty implements OnInit, OnDestroy setExpand(data: XTableRow[]) { const getChildren = (node: XTableRow, level: number) => { node.level = level; - node.expanded = Boolean(this.expandedAll) || level <= Number(this.expandedLevel) || this.expanded.includes(node.id); + node.expanded = + Boolean(this.expandedAll) || level <= Number(this.expandedLevel) || this.expanded.includes(node.id); if (XIsUndefined(node.children)) node.children = data.filter((y) => y.pid === node.id); if (XIsUndefined(node.leaf)) node.leaf = (node.children?.length as number) > 0; if (node.leaf) node.children?.map((y) => getChildren(y, level + 1)); diff --git a/lib/ng-nest/ui/table/table.module.ts b/lib/ng-nest/ui/table/table.module.ts index 74e34a3e6..3e19a3f08 100644 --- a/lib/ng-nest/ui/table/table.module.ts +++ b/lib/ng-nest/ui/table/table.module.ts @@ -1,52 +1,11 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { XPaginationModule } from '@ng-nest/ui/pagination'; -import { XOutletDirective } from '@ng-nest/ui/outlet'; -import { XIconComponent } from '@ng-nest/ui/icon'; -import { ScrollingModule } from '@angular/cdk/scrolling'; -import { XEmptyComponent } from '@ng-nest/ui/empty'; -import { XCheckboxComponent } from '@ng-nest/ui/checkbox'; -import { XLoadingComponent } from '@ng-nest/ui/loading'; -import { FormsModule } from '@angular/forms'; -import { - XTableProperty, - XTableHeadProperty, - XTableBodyProperty, - XTableFootProperty -} from './table.property'; import { XTableComponent } from './table.component'; import { XTableHeadComponent } from './table-head.component'; import { XTableBodyComponent } from './table-body.component'; import { XTableFootComponent } from './table-foot.component'; -import { XButtonComponent } from '@ng-nest/ui/button'; -import { DragDropModule } from '@angular/cdk/drag-drop'; -import { XDragDirective } from '@ng-nest/ui/drag'; @NgModule({ - declarations: [ - XTableComponent, - XTableProperty, - XTableHeadComponent, - XTableHeadProperty, - XTableBodyComponent, - XTableBodyProperty, - XTableFootComponent, - XTableFootProperty - ], exports: [XTableComponent], - imports: [ - CommonModule, - FormsModule, - XPaginationModule, - XOutletDirective, - XCheckboxComponent, - XIconComponent, - XButtonComponent, - ScrollingModule, - DragDropModule, - XEmptyComponent, - XLoadingComponent, - XDragDirective - ] + imports: [XTableComponent, XTableHeadComponent, XTableBodyComponent, XTableFootComponent] }) export class XTableModule {} diff --git a/lib/ng-nest/ui/tabs/examples/en_US/default/action/action.component.ts b/lib/ng-nest/ui/tabs/examples/en_US/default/action/action.component.ts index afc1f0c47..00d88226b 100644 --- a/lib/ng-nest/ui/tabs/examples/en_US/default/action/action.component.ts +++ b/lib/ng-nest/ui/tabs/examples/en_US/default/action/action.component.ts @@ -1,8 +1,13 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; -import { XTabsNode } from '@ng-nest/ui/tabs'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XTabComponent, XTabsComponent, XTabsNode } from '@ng-nest/ui/tabs'; @Component({ selector: 'ex-action', + standalone: true, + imports: [CommonModule, XTabComponent, XTabsComponent, XIconComponent, XButtonComponent], templateUrl: './action.component.html', styleUrls: ['./action.component.scss'] }) diff --git a/lib/ng-nest/ui/tabs/examples/en_US/default/card/card.component.ts b/lib/ng-nest/ui/tabs/examples/en_US/default/card/card.component.ts index d1140a777..c8838146e 100644 --- a/lib/ng-nest/ui/tabs/examples/en_US/default/card/card.component.ts +++ b/lib/ng-nest/ui/tabs/examples/en_US/default/card/card.component.ts @@ -1,7 +1,11 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XTabComponent, XTabsComponent } from '@ng-nest/ui/tabs'; @Component({ selector: 'ex-card', + standalone: true, + imports: [CommonModule, XTabsComponent, XTabComponent], templateUrl: './card.component.html' }) export class ExCardComponent { diff --git a/lib/ng-nest/ui/tabs/examples/en_US/default/custom/custom.component.ts b/lib/ng-nest/ui/tabs/examples/en_US/default/custom/custom.component.ts index 7915d8beb..d3bbfcdfa 100644 --- a/lib/ng-nest/ui/tabs/examples/en_US/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/tabs/examples/en_US/default/custom/custom.component.ts @@ -1,7 +1,12 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XTabComponent, XTabsComponent } from '@ng-nest/ui/tabs'; @Component({ selector: 'ex-custom', + standalone: true, + imports: [CommonModule, XTabsComponent, XTabComponent, XIconComponent], templateUrl: './custom.component.html', styleUrls: ['./custom.component.scss'] }) diff --git a/lib/ng-nest/ui/tabs/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/tabs/examples/en_US/default/default/default.component.ts index 84c105fbd..48579d640 100644 --- a/lib/ng-nest/ui/tabs/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/tabs/examples/en_US/default/default/default.component.ts @@ -1,7 +1,11 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XTabComponent, XTabsComponent } from '@ng-nest/ui/tabs'; @Component({ selector: 'ex-default', + standalone: true, + imports: [CommonModule, XTabsComponent, XTabComponent], templateUrl: './default.component.html' }) export class ExDefaultComponent { diff --git a/lib/ng-nest/ui/tabs/examples/en_US/default/expand/expand.component.ts b/lib/ng-nest/ui/tabs/examples/en_US/default/expand/expand.component.ts index 38e5e7b67..2ecd10d92 100644 --- a/lib/ng-nest/ui/tabs/examples/en_US/default/expand/expand.component.ts +++ b/lib/ng-nest/ui/tabs/examples/en_US/default/expand/expand.component.ts @@ -1,7 +1,11 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XTabComponent, XTabsComponent } from '@ng-nest/ui/tabs'; @Component({ selector: 'ex-expand', + standalone: true, + imports: [CommonModule, XTabsComponent, XTabComponent], templateUrl: './expand.component.html' }) export class ExExpandComponent { diff --git a/lib/ng-nest/ui/tabs/examples/en_US/default/layout/layout.component.ts b/lib/ng-nest/ui/tabs/examples/en_US/default/layout/layout.component.ts index f01b740d8..d50bca7b8 100644 --- a/lib/ng-nest/ui/tabs/examples/en_US/default/layout/layout.component.ts +++ b/lib/ng-nest/ui/tabs/examples/en_US/default/layout/layout.component.ts @@ -1,9 +1,14 @@ import { Component } from '@angular/core'; -import { XTabsLayout } from '@ng-nest/ui/tabs'; +import { XTabComponent, XTabsComponent, XTabsLayout } from '@ng-nest/ui/tabs'; import { XJustify } from '@ng-nest/ui/core'; +import { CommonModule } from '@angular/common'; +import { XRadioComponent } from '@ng-nest/ui/radio'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'ex-layout', + standalone: true, + imports: [CommonModule, FormsModule, XTabsComponent, XTabComponent, XRadioComponent], templateUrl: './layout.component.html', styleUrls: ['./layout.component.scss'] }) diff --git a/lib/ng-nest/ui/tabs/examples/en_US/default/router/router.component.ts b/lib/ng-nest/ui/tabs/examples/en_US/default/router/router.component.ts index 7ecd34eeb..bf6058e8e 100644 --- a/lib/ng-nest/ui/tabs/examples/en_US/default/router/router.component.ts +++ b/lib/ng-nest/ui/tabs/examples/en_US/default/router/router.component.ts @@ -1,7 +1,12 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { RouterModule } from '@angular/router'; +import { XTabComponent, XTabLinkDirective, XTabLinkTemplateDirective, XTabsComponent } from '@ng-nest/ui/tabs'; @Component({ selector: 'ex-router', + standalone: true, + imports: [CommonModule, RouterModule, XTabsComponent, XTabComponent, XTabLinkDirective, XTabLinkTemplateDirective], templateUrl: './router.component.html' }) export class ExRouterComponent { diff --git a/lib/ng-nest/ui/tabs/examples/en_US/default/tag/tag.component.ts b/lib/ng-nest/ui/tabs/examples/en_US/default/tag/tag.component.ts index 0ad74d3d8..226292532 100644 --- a/lib/ng-nest/ui/tabs/examples/en_US/default/tag/tag.component.ts +++ b/lib/ng-nest/ui/tabs/examples/en_US/default/tag/tag.component.ts @@ -1,7 +1,11 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XTabComponent, XTabsComponent } from '@ng-nest/ui/tabs'; @Component({ selector: 'ex-tag', + standalone: true, + imports: [CommonModule, XTabsComponent, XTabComponent], templateUrl: './tag.component.html' }) export class ExTagComponent { diff --git a/lib/ng-nest/ui/tabs/examples/index.ts b/lib/ng-nest/ui/tabs/examples/index.ts new file mode 100644 index 000000000..dff5276bd --- /dev/null +++ b/lib/ng-nest/ui/tabs/examples/index.ts @@ -0,0 +1,8 @@ +export * from './zh_CN/default/action/action.component'; +export * from './zh_CN/default/card/card.component'; +export * from './zh_CN/default/custom/custom.component'; +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/expand/expand.component'; +export * from './zh_CN/default/layout/layout.component'; +export * from './zh_CN/default/router/router.component'; +export * from './zh_CN/default/tag/tag.component'; diff --git a/lib/ng-nest/ui/tabs/examples/zh_CN/default/action/action.component.ts b/lib/ng-nest/ui/tabs/examples/zh_CN/default/action/action.component.ts index 282936dc4..bf08c054f 100644 --- a/lib/ng-nest/ui/tabs/examples/zh_CN/default/action/action.component.ts +++ b/lib/ng-nest/ui/tabs/examples/zh_CN/default/action/action.component.ts @@ -1,8 +1,13 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; -import { XTabsNode } from '@ng-nest/ui/tabs'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XTabComponent, XTabsComponent, XTabsNode } from '@ng-nest/ui/tabs'; @Component({ selector: 'ex-action', + standalone: true, + imports: [CommonModule, XTabComponent, XTabsComponent, XIconComponent, XButtonComponent], templateUrl: './action.component.html', styleUrls: ['./action.component.scss'] }) diff --git a/lib/ng-nest/ui/tabs/examples/zh_CN/default/card/card.component.ts b/lib/ng-nest/ui/tabs/examples/zh_CN/default/card/card.component.ts index 7ecceac8e..0e4818ca7 100644 --- a/lib/ng-nest/ui/tabs/examples/zh_CN/default/card/card.component.ts +++ b/lib/ng-nest/ui/tabs/examples/zh_CN/default/card/card.component.ts @@ -1,7 +1,11 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XTabComponent, XTabsComponent } from '@ng-nest/ui/tabs'; @Component({ selector: 'ex-card', + standalone: true, + imports: [CommonModule, XTabsComponent, XTabComponent], templateUrl: './card.component.html' }) export class ExCardComponent { diff --git a/lib/ng-nest/ui/tabs/examples/zh_CN/default/custom/custom.component.ts b/lib/ng-nest/ui/tabs/examples/zh_CN/default/custom/custom.component.ts index 7915d8beb..d3bbfcdfa 100644 --- a/lib/ng-nest/ui/tabs/examples/zh_CN/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/tabs/examples/zh_CN/default/custom/custom.component.ts @@ -1,7 +1,12 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XTabComponent, XTabsComponent } from '@ng-nest/ui/tabs'; @Component({ selector: 'ex-custom', + standalone: true, + imports: [CommonModule, XTabsComponent, XTabComponent, XIconComponent], templateUrl: './custom.component.html', styleUrls: ['./custom.component.scss'] }) diff --git a/lib/ng-nest/ui/tabs/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/tabs/examples/zh_CN/default/default/default.component.ts index b808e7aec..ba381fe01 100644 --- a/lib/ng-nest/ui/tabs/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/tabs/examples/zh_CN/default/default/default.component.ts @@ -1,7 +1,11 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XTabComponent, XTabsComponent } from '@ng-nest/ui/tabs'; @Component({ selector: 'ex-default', + standalone: true, + imports: [CommonModule, XTabsComponent, XTabComponent], templateUrl: './default.component.html' }) export class ExDefaultComponent { diff --git a/lib/ng-nest/ui/tabs/examples/zh_CN/default/expand/expand.component.ts b/lib/ng-nest/ui/tabs/examples/zh_CN/default/expand/expand.component.ts index b3fb33247..69a2387d9 100644 --- a/lib/ng-nest/ui/tabs/examples/zh_CN/default/expand/expand.component.ts +++ b/lib/ng-nest/ui/tabs/examples/zh_CN/default/expand/expand.component.ts @@ -1,7 +1,11 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XTabComponent, XTabsComponent } from '@ng-nest/ui/tabs'; @Component({ selector: 'ex-expand', + standalone: true, + imports: [CommonModule, XTabsComponent, XTabComponent], templateUrl: './expand.component.html' }) export class ExExpandComponent { diff --git a/lib/ng-nest/ui/tabs/examples/zh_CN/default/layout/layout.component.ts b/lib/ng-nest/ui/tabs/examples/zh_CN/default/layout/layout.component.ts index 16d2335db..86a6085e1 100644 --- a/lib/ng-nest/ui/tabs/examples/zh_CN/default/layout/layout.component.ts +++ b/lib/ng-nest/ui/tabs/examples/zh_CN/default/layout/layout.component.ts @@ -1,9 +1,14 @@ import { Component } from '@angular/core'; -import { XTabsLayout } from '@ng-nest/ui/tabs'; +import { XTabComponent, XTabsComponent, XTabsLayout } from '@ng-nest/ui/tabs'; import { XJustify } from '@ng-nest/ui/core'; +import { CommonModule } from '@angular/common'; +import { XRadioComponent } from '@ng-nest/ui/radio'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'ex-layout', + standalone: true, + imports: [CommonModule, FormsModule, XTabsComponent, XTabComponent, XRadioComponent], templateUrl: './layout.component.html', styleUrls: ['./layout.component.scss'] }) diff --git a/lib/ng-nest/ui/tabs/examples/zh_CN/default/router/router.component.ts b/lib/ng-nest/ui/tabs/examples/zh_CN/default/router/router.component.ts index 7ecd34eeb..bf6058e8e 100644 --- a/lib/ng-nest/ui/tabs/examples/zh_CN/default/router/router.component.ts +++ b/lib/ng-nest/ui/tabs/examples/zh_CN/default/router/router.component.ts @@ -1,7 +1,12 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { RouterModule } from '@angular/router'; +import { XTabComponent, XTabLinkDirective, XTabLinkTemplateDirective, XTabsComponent } from '@ng-nest/ui/tabs'; @Component({ selector: 'ex-router', + standalone: true, + imports: [CommonModule, RouterModule, XTabsComponent, XTabComponent, XTabLinkDirective, XTabLinkTemplateDirective], templateUrl: './router.component.html' }) export class ExRouterComponent { diff --git a/lib/ng-nest/ui/tabs/examples/zh_CN/default/tag/tag.component.html b/lib/ng-nest/ui/tabs/examples/zh_CN/default/tag/tag.component.html index 5f3af9fb4..0cba67505 100644 --- a/lib/ng-nest/ui/tabs/examples/zh_CN/default/tag/tag.component.html +++ b/lib/ng-nest/ui/tabs/examples/zh_CN/default/tag/tag.component.html @@ -2,4 +2,4 @@
{{ label }}
 - \ No newline at end of file + diff --git a/lib/ng-nest/ui/tabs/examples/zh_CN/default/tag/tag.component.ts b/lib/ng-nest/ui/tabs/examples/zh_CN/default/tag/tag.component.ts index 8080a92ab..7cb62180e 100644 --- a/lib/ng-nest/ui/tabs/examples/zh_CN/default/tag/tag.component.ts +++ b/lib/ng-nest/ui/tabs/examples/zh_CN/default/tag/tag.component.ts @@ -1,7 +1,11 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XTabComponent, XTabsComponent } from '@ng-nest/ui/tabs'; @Component({ selector: 'ex-tag', + standalone: true, + imports: [CommonModule, XTabsComponent, XTabComponent], templateUrl: './tag.component.html' }) export class ExTagComponent { diff --git a/lib/ng-nest/ui/tabs/tab-content.component.ts b/lib/ng-nest/ui/tabs/tab-content.component.ts index ccd145d8c..3c4731f42 100644 --- a/lib/ng-nest/ui/tabs/tab-content.component.ts +++ b/lib/ng-nest/ui/tabs/tab-content.component.ts @@ -1,3 +1,4 @@ +import { CommonModule } from '@angular/common'; import { ChangeDetectionStrategy, Component, @@ -5,21 +6,28 @@ import { TemplateRef, ViewEncapsulation, ElementRef, - Renderer2 + Renderer2, + OnInit, + inject } from '@angular/core'; import { XBoolean } from '@ng-nest/ui/core'; @Component({ selector: 'x-tab-content', preserveWhitespaces: false, + standalone: true, + imports: [CommonModule], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, templateUrl: './tab-content.component.html' }) -export class XTabContentComponent { +export class XTabContentComponent implements OnInit { @Input() content!: TemplateRef; @Input() active: XBoolean = false; - constructor(private elementRef: ElementRef, private renderer: Renderer2) { + private elementRef = inject(ElementRef); + private renderer = inject(Renderer2); + + ngOnInit(): void { this.renderer.addClass(this.elementRef.nativeElement, 'x-tab-content'); } } diff --git a/lib/ng-nest/ui/tabs/tab-link.directive.ts b/lib/ng-nest/ui/tabs/tab-link.directive.ts index aa29f22e8..c91611469 100644 --- a/lib/ng-nest/ui/tabs/tab-link.directive.ts +++ b/lib/ng-nest/ui/tabs/tab-link.directive.ts @@ -3,7 +3,8 @@ import { RouterLink } from '@angular/router'; @Directive({ selector: 'ng-template[xTabLink]', - exportAs: 'xTabLinkTemplate' + exportAs: 'xTabLinkTemplate', + standalone: true, }) export class XTabLinkTemplateDirective { constructor(@Host() public templateRef: TemplateRef) {} @@ -11,7 +12,8 @@ export class XTabLinkTemplateDirective { @Directive({ selector: 'a[x-tab-link]', - exportAs: 'xTabLink' + exportAs: 'xTabLink', + standalone: true, }) export class XTabLinkDirective { constructor( diff --git a/lib/ng-nest/ui/tabs/tab.component.ts b/lib/ng-nest/ui/tabs/tab.component.ts index 81d71713e..7134179b0 100644 --- a/lib/ng-nest/ui/tabs/tab.component.ts +++ b/lib/ng-nest/ui/tabs/tab.component.ts @@ -1,10 +1,21 @@ -import { ChangeDetectionStrategy, Component, ContentChild, TemplateRef, ViewChild, ViewEncapsulation } from '@angular/core'; +import { + ChangeDetectionStrategy, + Component, + ContentChild, + TemplateRef, + ViewChild, + ViewEncapsulation, + inject +} from '@angular/core'; import { XTabPrefix, XTabProperty } from './tabs.property'; import { XConfigService } from '@ng-nest/ui/core'; import { XTabLinkDirective, XTabLinkTemplateDirective } from './tab-link.directive'; +import { CommonModule } from '@angular/common'; @Component({ selector: `${XTabPrefix}`, + standalone: true, + imports: [CommonModule], templateUrl: './tab.component.html', encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush @@ -13,8 +24,5 @@ export class XTabComponent extends XTabProperty { @ViewChild('contentTpl', { static: true }) content!: TemplateRef; @ContentChild(XTabLinkTemplateDirective) linkTemplateDirective!: XTabLinkTemplateDirective; @ContentChild(XTabLinkDirective) linkDirective!: XTabLinkDirective; - - constructor(public configService: XConfigService) { - super(); - } + configService = inject(XConfigService); } diff --git a/lib/ng-nest/ui/tabs/tabs.component.spec.ts b/lib/ng-nest/ui/tabs/tabs.component.spec.ts index 755a22e4a..3d85c7c5d 100644 --- a/lib/ng-nest/ui/tabs/tabs.component.spec.ts +++ b/lib/ng-nest/ui/tabs/tabs.component.spec.ts @@ -1,16 +1,14 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XTabsComponent } from './tabs.component'; import { Component, DebugElement, ChangeDetectorRef } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { XTabsModule } from '@ng-nest/ui/tabs'; +import { XTabsComponent, XTabComponent } from '@ng-nest/ui/tabs'; import { XTabsPrefix, XTabsLayout } from './tabs.property'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XRadioComponent } from '@ng-nest/ui/radio'; import { FormsModule } from '@angular/forms'; import { XIconComponent } from '@ng-nest/ui/icon'; import { XJustify } from '@ng-nest/ui/core'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { XButtonComponent } from '@ng-nest/ui/button'; import { HttpClientTestingModule } from '@angular/common/http/testing'; @@ -20,10 +18,11 @@ describe(XTabsPrefix, () => { imports: [ HttpClientTestingModule, BrowserAnimationsModule, - XThemeModule, + XThemeComponent, FormsModule, - XTabsModule, - XRadioModule, + XTabsComponent, + XTabComponent, + XRadioComponent, XIconComponent, XButtonComponent ], diff --git a/lib/ng-nest/ui/tabs/tabs.component.ts b/lib/ng-nest/ui/tabs/tabs.component.ts index 47e68dfdc..9b74ef029 100644 --- a/lib/ng-nest/ui/tabs/tabs.component.ts +++ b/lib/ng-nest/ui/tabs/tabs.component.ts @@ -12,7 +12,10 @@ import { QueryList, ElementRef, Renderer2, - Optional + inject, + OnDestroy, + AfterContentChecked, + AfterViewInit } from '@angular/core'; import { XTabsPrefix, XTabsNode, XTabsProperty } from './tabs.property'; import { XIsChange, XSetData, XIsEmpty, XConfigService, XResize, XResizeObserver } from '@ng-nest/ui/core'; @@ -20,15 +23,22 @@ import { Subject, takeUntil, distinctUntilChanged, filter, startWith, delay } fr import { XSliderComponent, XSliderProperty } from '@ng-nest/ui/slider'; import { XTabComponent } from './tab.component'; import { NavigationEnd, Router, RouterLink } from '@angular/router'; +import { CommonModule } from '@angular/common'; +import { XTabContentComponent } from './tab-content.component'; @Component({ selector: `${XTabsPrefix}`, + standalone: true, + imports: [CommonModule, XSliderComponent, XTabContentComponent], templateUrl: './tabs.component.html', styleUrls: ['./style/index.scss'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush }) -export class XTabsComponent extends XTabsProperty implements OnInit, OnChanges { +export class XTabsComponent + extends XTabsProperty + implements OnInit, OnChanges, OnDestroy, AfterContentChecked, AfterViewInit +{ sliderOption = new XSliderProperty(); tabs: XTabsNode[] = []; private _unSubject = new Subject(); @@ -44,14 +54,10 @@ export class XTabsComponent extends XTabsProperty implements OnInit, OnChanges { @ViewChild(XSliderComponent) slider!: XSliderComponent; @ViewChild('actionsRef') actionsRef!: ElementRef; - constructor( - private cdr: ChangeDetectorRef, - public configService: XConfigService, - public renderer: Renderer2, - @Optional() private router: Router - ) { - super(); - } + private cdr = inject(ChangeDetectorRef); + private renderer = inject(Renderer2); + private router = inject(Router, { optional: true }); + configService = inject(XConfigService); ngOnInit() { this.setClassMap(); @@ -129,7 +135,7 @@ export class XTabsComponent extends XTabsProperty implements OnInit, OnChanges { } updateRouterActive() { - if (!this.router.navigated) return; + if (!this.router?.navigated) return; const index = this.findShouldActiveTabIndex(); if (index !== -1 && index !== this.activeIndex) { this.activatedIndex = index; @@ -139,7 +145,7 @@ export class XTabsComponent extends XTabsProperty implements OnInit, OnChanges { findShouldActiveTabIndex(): number { const tabs = this.listTabs.toArray(); - const isActive = this.isLinkActive(this.router); + const isActive = this.isLinkActive(this.router!); return tabs.findIndex((tab) => { const c = tab.linkDirective; @@ -187,7 +193,13 @@ export class XTabsComponent extends XTabsProperty implements OnInit, OnChanges { } private setNodeJustify() { - this.nodeJustify = this.nodeJustify ? this.nodeJustify : this.layout === 'left' ? 'end' : this.layout === 'right' ? 'start' : 'center'; + this.nodeJustify = this.nodeJustify + ? this.nodeJustify + : this.layout === 'left' + ? 'end' + : this.layout === 'right' + ? 'start' + : 'center'; } private setData() { diff --git a/lib/ng-nest/ui/tabs/tabs.module.ts b/lib/ng-nest/ui/tabs/tabs.module.ts index 4846945d2..532f69292 100644 --- a/lib/ng-nest/ui/tabs/tabs.module.ts +++ b/lib/ng-nest/ui/tabs/tabs.module.ts @@ -1,31 +1,10 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { XTabsComponent } from './tabs.component'; -import { XIconComponent } from '@ng-nest/ui/icon'; -import { XSliderModule } from '@ng-nest/ui/slider'; import { XTabComponent } from './tab.component'; -import { XTabContentComponent } from './tab-content.component'; -import { XTabsProperty, XTabProperty } from './tabs.property'; -import { XButtonComponent } from '@ng-nest/ui/button'; import { XTabLinkTemplateDirective, XTabLinkDirective } from './tab-link.directive'; @NgModule({ - declarations: [ - XTabsComponent, - XTabContentComponent, - XTabComponent, - XTabLinkDirective, - XTabLinkTemplateDirective, - XTabsProperty, - XTabProperty - ], - exports: [ - XTabsComponent, - XTabContentComponent, - XTabComponent, - XTabLinkDirective, - XTabLinkTemplateDirective - ], - imports: [CommonModule, XSliderModule, XButtonComponent, XIconComponent] + exports: [XTabsComponent, XTabComponent, XTabLinkDirective, XTabLinkTemplateDirective], + imports: [XTabsComponent, XTabComponent, XTabLinkDirective, XTabLinkTemplateDirective] }) export class XTabsModule {} diff --git a/lib/ng-nest/ui/tag/examples/en_US/default/bordered/bordered.component.ts b/lib/ng-nest/ui/tag/examples/en_US/default/bordered/bordered.component.ts index 89ce67091..2f84771b4 100644 --- a/lib/ng-nest/ui/tag/examples/en_US/default/bordered/bordered.component.ts +++ b/lib/ng-nest/ui/tag/examples/en_US/default/bordered/bordered.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XTagComponent } from '@ng-nest/ui/tag'; @Component({ selector: 'ex-bordered', + standalone: true, + imports: [XTagComponent], templateUrl: './bordered.component.html', styleUrls: ['./bordered.component.scss'] }) diff --git a/lib/ng-nest/ui/tag/examples/en_US/default/checked/checked.component.ts b/lib/ng-nest/ui/tag/examples/en_US/default/checked/checked.component.ts index 8b31c63ac..a10dccaaf 100644 --- a/lib/ng-nest/ui/tag/examples/en_US/default/checked/checked.component.ts +++ b/lib/ng-nest/ui/tag/examples/en_US/default/checked/checked.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XTagComponent } from '@ng-nest/ui/tag'; @Component({ selector: 'ex-checked', + standalone: true, + imports: [XTagComponent], templateUrl: './checked.component.html', styleUrls: ['./checked.component.scss'] }) diff --git a/lib/ng-nest/ui/tag/examples/en_US/default/close/close.component.ts b/lib/ng-nest/ui/tag/examples/en_US/default/close/close.component.ts index 75f303e04..ab6f294db 100644 --- a/lib/ng-nest/ui/tag/examples/en_US/default/close/close.component.ts +++ b/lib/ng-nest/ui/tag/examples/en_US/default/close/close.component.ts @@ -1,7 +1,11 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XTagComponent } from '@ng-nest/ui/tag'; @Component({ selector: 'ex-close', + standalone: true, + imports: [CommonModule, XTagComponent], templateUrl: './close.component.html', styleUrls: ['./close.component.scss'] }) diff --git a/lib/ng-nest/ui/tag/examples/en_US/default/color/color.component.ts b/lib/ng-nest/ui/tag/examples/en_US/default/color/color.component.ts index 180f98a63..c3c5ed12e 100644 --- a/lib/ng-nest/ui/tag/examples/en_US/default/color/color.component.ts +++ b/lib/ng-nest/ui/tag/examples/en_US/default/color/color.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; +import { XTagComponent } from '@ng-nest/ui/tag'; @Component({ selector: 'ex-color', + standalone: true, + imports: [XTagComponent], templateUrl: './color.component.html', styleUrls: ['./color.component.scss'] }) -export class ExColorComponent {} \ No newline at end of file +export class ExColorComponent {} diff --git a/lib/ng-nest/ui/tag/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/tag/examples/en_US/default/default/default.component.ts index cae54f2a5..4b6b21ec9 100644 --- a/lib/ng-nest/ui/tag/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/tag/examples/en_US/default/default/default.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XTagComponent } from '@ng-nest/ui/tag'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XTagComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/tag/examples/en_US/default/size/size.component.ts b/lib/ng-nest/ui/tag/examples/en_US/default/size/size.component.ts index 28ec1ffa8..019d8df01 100644 --- a/lib/ng-nest/ui/tag/examples/en_US/default/size/size.component.ts +++ b/lib/ng-nest/ui/tag/examples/en_US/default/size/size.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XTagComponent } from '@ng-nest/ui/tag'; @Component({ selector: 'ex-size', + standalone: true, + imports: [XTagComponent], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/tag/examples/index.ts b/lib/ng-nest/ui/tag/examples/index.ts new file mode 100644 index 000000000..16b3019bd --- /dev/null +++ b/lib/ng-nest/ui/tag/examples/index.ts @@ -0,0 +1,6 @@ +export * from './zh_CN/default/bordered/bordered.component'; +export * from './zh_CN/default/checked/checked.component'; +export * from './zh_CN/default/close/close.component'; +export * from './zh_CN/default/color/color.component'; +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/size/size.component'; diff --git a/lib/ng-nest/ui/tag/examples/zh_CN/default/bordered/bordered.component.ts b/lib/ng-nest/ui/tag/examples/zh_CN/default/bordered/bordered.component.ts index 89ce67091..2f84771b4 100644 --- a/lib/ng-nest/ui/tag/examples/zh_CN/default/bordered/bordered.component.ts +++ b/lib/ng-nest/ui/tag/examples/zh_CN/default/bordered/bordered.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XTagComponent } from '@ng-nest/ui/tag'; @Component({ selector: 'ex-bordered', + standalone: true, + imports: [XTagComponent], templateUrl: './bordered.component.html', styleUrls: ['./bordered.component.scss'] }) diff --git a/lib/ng-nest/ui/tag/examples/zh_CN/default/checked/checked.component.ts b/lib/ng-nest/ui/tag/examples/zh_CN/default/checked/checked.component.ts index 8b31c63ac..a10dccaaf 100644 --- a/lib/ng-nest/ui/tag/examples/zh_CN/default/checked/checked.component.ts +++ b/lib/ng-nest/ui/tag/examples/zh_CN/default/checked/checked.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XTagComponent } from '@ng-nest/ui/tag'; @Component({ selector: 'ex-checked', + standalone: true, + imports: [XTagComponent], templateUrl: './checked.component.html', styleUrls: ['./checked.component.scss'] }) diff --git a/lib/ng-nest/ui/tag/examples/zh_CN/default/close/close.component.ts b/lib/ng-nest/ui/tag/examples/zh_CN/default/close/close.component.ts index 01dc3461b..29165fc0b 100644 --- a/lib/ng-nest/ui/tag/examples/zh_CN/default/close/close.component.ts +++ b/lib/ng-nest/ui/tag/examples/zh_CN/default/close/close.component.ts @@ -1,7 +1,11 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XTagComponent } from '@ng-nest/ui/tag'; @Component({ selector: 'ex-close', + standalone: true, + imports: [CommonModule, XTagComponent], templateUrl: './close.component.html', styleUrls: ['./close.component.scss'] }) diff --git a/lib/ng-nest/ui/tag/examples/zh_CN/default/color/color.component.ts b/lib/ng-nest/ui/tag/examples/zh_CN/default/color/color.component.ts index 180f98a63..c3c5ed12e 100644 --- a/lib/ng-nest/ui/tag/examples/zh_CN/default/color/color.component.ts +++ b/lib/ng-nest/ui/tag/examples/zh_CN/default/color/color.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; +import { XTagComponent } from '@ng-nest/ui/tag'; @Component({ selector: 'ex-color', + standalone: true, + imports: [XTagComponent], templateUrl: './color.component.html', styleUrls: ['./color.component.scss'] }) -export class ExColorComponent {} \ No newline at end of file +export class ExColorComponent {} diff --git a/lib/ng-nest/ui/tag/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/tag/examples/zh_CN/default/default/default.component.ts index cae54f2a5..4b6b21ec9 100644 --- a/lib/ng-nest/ui/tag/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/tag/examples/zh_CN/default/default/default.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XTagComponent } from '@ng-nest/ui/tag'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XTagComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/tag/examples/zh_CN/default/size/size.component.ts b/lib/ng-nest/ui/tag/examples/zh_CN/default/size/size.component.ts index 28ec1ffa8..019d8df01 100644 --- a/lib/ng-nest/ui/tag/examples/zh_CN/default/size/size.component.ts +++ b/lib/ng-nest/ui/tag/examples/zh_CN/default/size/size.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XTagComponent } from '@ng-nest/ui/tag'; @Component({ selector: 'ex-size', + standalone: true, + imports: [XTagComponent], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/tag/tag.component.spec.ts b/lib/ng-nest/ui/tag/tag.component.spec.ts index cd8f08252..a7e54daf5 100644 --- a/lib/ng-nest/ui/tag/tag.component.spec.ts +++ b/lib/ng-nest/ui/tag/tag.component.spec.ts @@ -1,17 +1,15 @@ import { XIconComponent } from '@ng-nest/ui/icon'; import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XTagComponent } from './tag.component'; import { Component, DebugElement, ChangeDetectorRef } from '@angular/core'; import { By } from '@angular/platform-browser'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; -import { XTagModule } from '@ng-nest/ui/tag'; +import { XTagComponent } from '@ng-nest/ui/tag'; import { FormsModule } from '@angular/forms'; import { XTagPrefix } from './tag.property'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XContainerComponent } from '@ng-nest/ui/container'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XTagPrefix, () => { @@ -20,9 +18,9 @@ describe(XTagPrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, FormsModule, - XTagModule, + XTagComponent, XButtonComponent, XContainerComponent, XRowComponent, @@ -141,9 +139,7 @@ describe(XTagPrefix, () => { 标签
- {{ - tag - }} + {{ tag }}
标签 diff --git a/lib/ng-nest/ui/tag/tag.component.ts b/lib/ng-nest/ui/tag/tag.component.ts index d5c21c969..b79a677ad 100644 --- a/lib/ng-nest/ui/tag/tag.component.ts +++ b/lib/ng-nest/ui/tag/tag.component.ts @@ -2,26 +2,29 @@ import { Component, OnInit, ViewEncapsulation, - Renderer2, - ElementRef, - ChangeDetectorRef, ChangeDetectionStrategy, SimpleChanges, HostBinding, - HostListener + HostListener, + inject, + OnChanges } from '@angular/core'; import { XTagPrefix, XTagProperty } from './tag.property'; import { XIsEmpty, XConfigService, XIsChange, XClearClass, XBaseAnimation } from '@ng-nest/ui/core'; +import { CommonModule } from '@angular/common'; +import { XIconComponent } from '@ng-nest/ui/icon'; @Component({ selector: `${XTagPrefix}`, + standalone: true, + imports: [CommonModule, XIconComponent], templateUrl: './tag.component.html', styleUrls: ['./tag.component.scss'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, animations: [XBaseAnimation] }) -export class XTagComponent extends XTagProperty implements OnInit { +export class XTagComponent extends XTagProperty implements OnInit, OnChanges { @HostBinding('@x-base-animation') public animation = true; animating = false; @HostListener('@x-base-animation.done', ['$event']) done() { @@ -32,15 +35,7 @@ export class XTagComponent extends XTagProperty implements OnInit { @HostListener('@x-base-animation.start', ['$event']) start() { this.animating = true; } - - constructor( - public renderer: Renderer2, - public elementRef: ElementRef, - public cdr: ChangeDetectorRef, - public configService: XConfigService - ) { - super(); - } + configService = inject(XConfigService); ngOnInit() { this.setClassMap(); diff --git a/lib/ng-nest/ui/tag/tag.module.ts b/lib/ng-nest/ui/tag/tag.module.ts index f83915702..61d8155ad 100644 --- a/lib/ng-nest/ui/tag/tag.module.ts +++ b/lib/ng-nest/ui/tag/tag.module.ts @@ -1,13 +1,8 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { XTagComponent } from './tag.component'; -import { XIconComponent } from '@ng-nest/ui/icon'; -import { XOutletDirective } from '@ng-nest/ui/outlet'; -import { XTagProperty } from './tag.property'; @NgModule({ - declarations: [XTagComponent, XTagProperty], exports: [XTagComponent], - imports: [CommonModule, XIconComponent, XOutletDirective] + imports: [XTagComponent] }) export class XTagModule {} diff --git a/lib/ng-nest/ui/text-retract/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/text-retract/examples/en_US/default/default/default.component.ts index 2b43e5c37..17119aef4 100644 --- a/lib/ng-nest/ui/text-retract/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/text-retract/examples/en_US/default/default/default.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XTextRetractComponent } from '@ng-nest/ui/text-retract'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XTextRetractComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/text-retract/examples/index.ts b/lib/ng-nest/ui/text-retract/examples/index.ts new file mode 100644 index 000000000..b94cf3f92 --- /dev/null +++ b/lib/ng-nest/ui/text-retract/examples/index.ts @@ -0,0 +1 @@ +export * from './zh_CN/default/default/default.component'; diff --git a/lib/ng-nest/ui/text-retract/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/text-retract/examples/zh_CN/default/default/default.component.ts index f825a19d3..c981e36d6 100644 --- a/lib/ng-nest/ui/text-retract/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/text-retract/examples/zh_CN/default/default/default.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XTextRetractComponent } from '@ng-nest/ui/text-retract'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XTextRetractComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/text-retract/text-retract.component.spec.ts b/lib/ng-nest/ui/text-retract/text-retract.component.spec.ts index 9c87a3c79..f81a38846 100644 --- a/lib/ng-nest/ui/text-retract/text-retract.component.spec.ts +++ b/lib/ng-nest/ui/text-retract/text-retract.component.spec.ts @@ -1,11 +1,9 @@ import { XIconComponent } from '@ng-nest/ui/icon'; import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XTextRetractComponent } from './text-retract.component'; import { Component, DebugElement, ChangeDetectorRef } from '@angular/core'; import { By } from '@angular/platform-browser'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; -import { XTextRetractModule } from '@ng-nest/ui/text-retract'; +import { XTextRetractComponent } from '@ng-nest/ui/text-retract'; import { FormsModule } from '@angular/forms'; import { XTextRetractPrefix } from './text-retract.property'; import { XI18nService, en_US, zh_CN } from '@ng-nest/ui/i18n'; @@ -18,7 +16,7 @@ describe(XTextRetractPrefix, () => { imports: [ HttpClientTestingModule, FormsModule, - XTextRetractModule, + XTextRetractComponent, XRowComponent, XColComponent, XButtonComponent, diff --git a/lib/ng-nest/ui/text-retract/text-retract.component.ts b/lib/ng-nest/ui/text-retract/text-retract.component.ts index 50b2b7183..cb2e8a014 100644 --- a/lib/ng-nest/ui/text-retract/text-retract.component.ts +++ b/lib/ng-nest/ui/text-retract/text-retract.component.ts @@ -2,42 +2,40 @@ import { Component, OnInit, ViewEncapsulation, - Renderer2, - ElementRef, ChangeDetectorRef, ChangeDetectionStrategy, OnChanges, - SimpleChanges + SimpleChanges, + inject, + OnDestroy } from '@angular/core'; import { XTextRetractPrefix, XTextRetractProperty } from './text-retract.property'; import { XIsChange, XConfigService } from '@ng-nest/ui/core'; -import { XI18nService } from '@ng-nest/ui/i18n'; +import { XI18nPipe, XI18nService } from '@ng-nest/ui/i18n'; import { takeUntil } from 'rxjs/operators'; import { Subject } from 'rxjs'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; +import { XLinkComponent } from '@ng-nest/ui/link'; @Component({ selector: `${XTextRetractPrefix}`, + standalone: true, + imports: [CommonModule, FormsModule, XLinkComponent, XI18nPipe], templateUrl: './text-retract.component.html', styleUrls: ['./text-retract.component.scss'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush }) -export class XTextRetractComponent extends XTextRetractProperty implements OnInit, OnChanges { +export class XTextRetractComponent extends XTextRetractProperty implements OnInit, OnChanges, OnDestroy { displayValue!: string; retract: boolean = false; unfold: boolean = true; private _unSubject = new Subject(); - - constructor( - public renderer: Renderer2, - public elementRef: ElementRef, - public cdr: ChangeDetectorRef, - public configService: XConfigService, - public i18n: XI18nService - ) { - super(); - } + private cdr = inject(ChangeDetectorRef); + private i18n = inject(XI18nService); + configService = inject(XConfigService); ngOnInit() { this.setDisplayValue(); diff --git a/lib/ng-nest/ui/text-retract/text-retract.module.ts b/lib/ng-nest/ui/text-retract/text-retract.module.ts index 84d015097..ae0c2fa26 100644 --- a/lib/ng-nest/ui/text-retract/text-retract.module.ts +++ b/lib/ng-nest/ui/text-retract/text-retract.module.ts @@ -1,14 +1,8 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { XTextRetractComponent } from './text-retract.component'; -import { FormsModule } from '@angular/forms'; -import { XLinkComponent } from '@ng-nest/ui/link'; -import { XTextRetractProperty } from './text-retract.property'; -import { XI18nPipe } from '@ng-nest/ui/i18n'; @NgModule({ - declarations: [XTextRetractComponent, XTextRetractProperty], exports: [XTextRetractComponent], - imports: [CommonModule, FormsModule, XLinkComponent, XI18nPipe] + imports: [XTextRetractComponent] }) export class XTextRetractModule {} diff --git a/lib/ng-nest/ui/textarea/examples/en_US/default/clear/clear.component.html b/lib/ng-nest/ui/textarea/examples/en_US/default/clear/clear.component.html index 32c13643d..5ec0507af 100644 --- a/lib/ng-nest/ui/textarea/examples/en_US/default/clear/clear.component.html +++ b/lib/ng-nest/ui/textarea/examples/en_US/default/clear/clear.component.html @@ -1,20 +1,12 @@ - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/textarea/examples/en_US/default/clear/clear.component.scss b/lib/ng-nest/ui/textarea/examples/en_US/default/clear/clear.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/textarea/examples/en_US/default/clear/clear.component.scss +++ b/lib/ng-nest/ui/textarea/examples/en_US/default/clear/clear.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 15rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/textarea/examples/en_US/default/clear/clear.component.ts b/lib/ng-nest/ui/textarea/examples/en_US/default/clear/clear.component.ts index f5af437d1..3b4cd33f7 100644 --- a/lib/ng-nest/ui/textarea/examples/en_US/default/clear/clear.component.ts +++ b/lib/ng-nest/ui/textarea/examples/en_US/default/clear/clear.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XTextareaComponent } from '@ng-nest/ui/textarea'; @Component({ selector: 'ex-clear', + standalone: true, + imports: [FormsModule, XTextareaComponent], templateUrl: './clear.component.html', styleUrls: ['./clear.component.scss'] }) diff --git a/lib/ng-nest/ui/textarea/examples/en_US/default/default/default.component.html b/lib/ng-nest/ui/textarea/examples/en_US/default/default/default.component.html index bf15fab7d..8ffa2e8dd 100644 --- a/lib/ng-nest/ui/textarea/examples/en_US/default/default/default.component.html +++ b/lib/ng-nest/ui/textarea/examples/en_US/default/default/default.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/textarea/examples/en_US/default/default/default.component.scss b/lib/ng-nest/ui/textarea/examples/en_US/default/default/default.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/textarea/examples/en_US/default/default/default.component.scss +++ b/lib/ng-nest/ui/textarea/examples/en_US/default/default/default.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 15rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/textarea/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/textarea/examples/en_US/default/default/default.component.ts index cae54f2a5..9b1f92563 100644 --- a/lib/ng-nest/ui/textarea/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/textarea/examples/en_US/default/default/default.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XTextareaComponent } from '@ng-nest/ui/textarea'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XTextareaComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/textarea/examples/en_US/default/disabled/disabled.component.html b/lib/ng-nest/ui/textarea/examples/en_US/default/disabled/disabled.component.html index 1dec1bd24..b7c8effd6 100644 --- a/lib/ng-nest/ui/textarea/examples/en_US/default/disabled/disabled.component.html +++ b/lib/ng-nest/ui/textarea/examples/en_US/default/disabled/disabled.component.html @@ -1,20 +1,12 @@ - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/textarea/examples/en_US/default/disabled/disabled.component.scss b/lib/ng-nest/ui/textarea/examples/en_US/default/disabled/disabled.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/textarea/examples/en_US/default/disabled/disabled.component.scss +++ b/lib/ng-nest/ui/textarea/examples/en_US/default/disabled/disabled.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 15rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/textarea/examples/en_US/default/disabled/disabled.component.ts b/lib/ng-nest/ui/textarea/examples/en_US/default/disabled/disabled.component.ts index 5ad80ed1b..f09c78e19 100644 --- a/lib/ng-nest/ui/textarea/examples/en_US/default/disabled/disabled.component.ts +++ b/lib/ng-nest/ui/textarea/examples/en_US/default/disabled/disabled.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XTextareaComponent } from '@ng-nest/ui/textarea'; @Component({ selector: 'ex-disabled', + standalone: true, + imports: [FormsModule, XTextareaComponent], templateUrl: './disabled.component.html', styleUrls: ['./disabled.component.scss'] }) diff --git a/lib/ng-nest/ui/textarea/examples/en_US/default/icon/icon.component.html b/lib/ng-nest/ui/textarea/examples/en_US/default/icon/icon.component.html index 97cb99eb8..c1b529a85 100644 --- a/lib/ng-nest/ui/textarea/examples/en_US/default/icon/icon.component.html +++ b/lib/ng-nest/ui/textarea/examples/en_US/default/icon/icon.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/textarea/examples/en_US/default/icon/icon.component.scss b/lib/ng-nest/ui/textarea/examples/en_US/default/icon/icon.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/textarea/examples/en_US/default/icon/icon.component.scss +++ b/lib/ng-nest/ui/textarea/examples/en_US/default/icon/icon.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 15rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/textarea/examples/en_US/default/icon/icon.component.ts b/lib/ng-nest/ui/textarea/examples/en_US/default/icon/icon.component.ts index 7ad46cf35..9a117b1cb 100644 --- a/lib/ng-nest/ui/textarea/examples/en_US/default/icon/icon.component.ts +++ b/lib/ng-nest/ui/textarea/examples/en_US/default/icon/icon.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XTextareaComponent } from '@ng-nest/ui/textarea'; @Component({ selector: 'ex-icon', + standalone: true, + imports: [XTextareaComponent], templateUrl: './icon.component.html', styleUrls: ['./icon.component.scss'] }) diff --git a/lib/ng-nest/ui/textarea/examples/en_US/default/label/label.component.html b/lib/ng-nest/ui/textarea/examples/en_US/default/label/label.component.html index c3c1c574a..0d8f73c02 100644 --- a/lib/ng-nest/ui/textarea/examples/en_US/default/label/label.component.html +++ b/lib/ng-nest/ui/textarea/examples/en_US/default/label/label.component.html @@ -1,20 +1,12 @@ - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/textarea/examples/en_US/default/label/label.component.scss b/lib/ng-nest/ui/textarea/examples/en_US/default/label/label.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/textarea/examples/en_US/default/label/label.component.scss +++ b/lib/ng-nest/ui/textarea/examples/en_US/default/label/label.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 15rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/textarea/examples/en_US/default/label/label.component.ts b/lib/ng-nest/ui/textarea/examples/en_US/default/label/label.component.ts index 64c8a7056..4b9e6afc1 100644 --- a/lib/ng-nest/ui/textarea/examples/en_US/default/label/label.component.ts +++ b/lib/ng-nest/ui/textarea/examples/en_US/default/label/label.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XTextareaComponent } from '@ng-nest/ui/textarea'; @Component({ selector: 'ex-label', + standalone: true, + imports: [XTextareaComponent], templateUrl: './label.component.html', styleUrls: ['./label.component.scss'] }) diff --git a/lib/ng-nest/ui/textarea/examples/en_US/default/length/length.component.html b/lib/ng-nest/ui/textarea/examples/en_US/default/length/length.component.html index 7c0eefbe8..a69cdbf7d 100644 --- a/lib/ng-nest/ui/textarea/examples/en_US/default/length/length.component.html +++ b/lib/ng-nest/ui/textarea/examples/en_US/default/length/length.component.html @@ -1,25 +1,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/textarea/examples/en_US/default/length/length.component.scss b/lib/ng-nest/ui/textarea/examples/en_US/default/length/length.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/textarea/examples/en_US/default/length/length.component.scss +++ b/lib/ng-nest/ui/textarea/examples/en_US/default/length/length.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 15rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/textarea/examples/en_US/default/length/length.component.ts b/lib/ng-nest/ui/textarea/examples/en_US/default/length/length.component.ts index a690f4157..20f5b5953 100644 --- a/lib/ng-nest/ui/textarea/examples/en_US/default/length/length.component.ts +++ b/lib/ng-nest/ui/textarea/examples/en_US/default/length/length.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XTextareaComponent } from '@ng-nest/ui/textarea'; @Component({ selector: 'ex-length', + standalone: true, + imports: [FormsModule, XTextareaComponent], templateUrl: './length.component.html', styleUrls: ['./length.component.scss'] }) diff --git a/lib/ng-nest/ui/textarea/examples/en_US/default/required/required.component.html b/lib/ng-nest/ui/textarea/examples/en_US/default/required/required.component.html index 30d3dc4bc..84fbaded0 100644 --- a/lib/ng-nest/ui/textarea/examples/en_US/default/required/required.component.html +++ b/lib/ng-nest/ui/textarea/examples/en_US/default/required/required.component.html @@ -1,15 +1,9 @@ - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/textarea/examples/en_US/default/required/required.component.scss b/lib/ng-nest/ui/textarea/examples/en_US/default/required/required.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/textarea/examples/en_US/default/required/required.component.scss +++ b/lib/ng-nest/ui/textarea/examples/en_US/default/required/required.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 15rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/textarea/examples/en_US/default/required/required.component.ts b/lib/ng-nest/ui/textarea/examples/en_US/default/required/required.component.ts index c8debbb95..fc016f906 100644 --- a/lib/ng-nest/ui/textarea/examples/en_US/default/required/required.component.ts +++ b/lib/ng-nest/ui/textarea/examples/en_US/default/required/required.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XTextareaComponent } from '@ng-nest/ui/textarea'; @Component({ selector: 'ex-required', + standalone: true, + imports: [FormsModule, XTextareaComponent], templateUrl: './required.component.html', styleUrls: ['./required.component.scss'] }) diff --git a/lib/ng-nest/ui/textarea/examples/index.ts b/lib/ng-nest/ui/textarea/examples/index.ts new file mode 100644 index 000000000..9b05dd82c --- /dev/null +++ b/lib/ng-nest/ui/textarea/examples/index.ts @@ -0,0 +1,7 @@ +export * from './zh_CN/default/clear/clear.component'; +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/disabled/disabled.component'; +export * from './zh_CN/default/icon/icon.component'; +export * from './zh_CN/default/label/label.component'; +export * from './zh_CN/default/length/length.component'; +export * from './zh_CN/default/required/required.component'; diff --git a/lib/ng-nest/ui/textarea/examples/zh_CN/default/clear/clear.component.html b/lib/ng-nest/ui/textarea/examples/zh_CN/default/clear/clear.component.html index 32c13643d..5ec0507af 100644 --- a/lib/ng-nest/ui/textarea/examples/zh_CN/default/clear/clear.component.html +++ b/lib/ng-nest/ui/textarea/examples/zh_CN/default/clear/clear.component.html @@ -1,20 +1,12 @@ - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/textarea/examples/zh_CN/default/clear/clear.component.scss b/lib/ng-nest/ui/textarea/examples/zh_CN/default/clear/clear.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/textarea/examples/zh_CN/default/clear/clear.component.scss +++ b/lib/ng-nest/ui/textarea/examples/zh_CN/default/clear/clear.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 15rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/textarea/examples/zh_CN/default/clear/clear.component.ts b/lib/ng-nest/ui/textarea/examples/zh_CN/default/clear/clear.component.ts index 9cdcdc7f8..ec7a10f92 100644 --- a/lib/ng-nest/ui/textarea/examples/zh_CN/default/clear/clear.component.ts +++ b/lib/ng-nest/ui/textarea/examples/zh_CN/default/clear/clear.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XTextareaComponent } from '@ng-nest/ui/textarea'; @Component({ selector: 'ex-clear', + standalone: true, + imports: [FormsModule, XTextareaComponent], templateUrl: './clear.component.html', styleUrls: ['./clear.component.scss'] }) diff --git a/lib/ng-nest/ui/textarea/examples/zh_CN/default/default/default.component.html b/lib/ng-nest/ui/textarea/examples/zh_CN/default/default/default.component.html index 7aaee2618..0178d6d22 100644 --- a/lib/ng-nest/ui/textarea/examples/zh_CN/default/default/default.component.html +++ b/lib/ng-nest/ui/textarea/examples/zh_CN/default/default/default.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/textarea/examples/zh_CN/default/default/default.component.scss b/lib/ng-nest/ui/textarea/examples/zh_CN/default/default/default.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/textarea/examples/zh_CN/default/default/default.component.scss +++ b/lib/ng-nest/ui/textarea/examples/zh_CN/default/default/default.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 15rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/textarea/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/textarea/examples/zh_CN/default/default/default.component.ts index cae54f2a5..9b1f92563 100644 --- a/lib/ng-nest/ui/textarea/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/textarea/examples/zh_CN/default/default/default.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XTextareaComponent } from '@ng-nest/ui/textarea'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XTextareaComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/textarea/examples/zh_CN/default/disabled/disabled.component.html b/lib/ng-nest/ui/textarea/examples/zh_CN/default/disabled/disabled.component.html index 1dec1bd24..b7c8effd6 100644 --- a/lib/ng-nest/ui/textarea/examples/zh_CN/default/disabled/disabled.component.html +++ b/lib/ng-nest/ui/textarea/examples/zh_CN/default/disabled/disabled.component.html @@ -1,20 +1,12 @@ - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/textarea/examples/zh_CN/default/disabled/disabled.component.scss b/lib/ng-nest/ui/textarea/examples/zh_CN/default/disabled/disabled.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/textarea/examples/zh_CN/default/disabled/disabled.component.scss +++ b/lib/ng-nest/ui/textarea/examples/zh_CN/default/disabled/disabled.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 15rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/textarea/examples/zh_CN/default/disabled/disabled.component.ts b/lib/ng-nest/ui/textarea/examples/zh_CN/default/disabled/disabled.component.ts index dd37d0972..b46ec5cba 100644 --- a/lib/ng-nest/ui/textarea/examples/zh_CN/default/disabled/disabled.component.ts +++ b/lib/ng-nest/ui/textarea/examples/zh_CN/default/disabled/disabled.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XTextareaComponent } from '@ng-nest/ui/textarea'; @Component({ selector: 'ex-disabled', + standalone: true, + imports: [FormsModule, XTextareaComponent], templateUrl: './disabled.component.html', styleUrls: ['./disabled.component.scss'] }) diff --git a/lib/ng-nest/ui/textarea/examples/zh_CN/default/icon/icon.component.html b/lib/ng-nest/ui/textarea/examples/zh_CN/default/icon/icon.component.html index 97cb99eb8..c1b529a85 100644 --- a/lib/ng-nest/ui/textarea/examples/zh_CN/default/icon/icon.component.html +++ b/lib/ng-nest/ui/textarea/examples/zh_CN/default/icon/icon.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/textarea/examples/zh_CN/default/icon/icon.component.scss b/lib/ng-nest/ui/textarea/examples/zh_CN/default/icon/icon.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/textarea/examples/zh_CN/default/icon/icon.component.scss +++ b/lib/ng-nest/ui/textarea/examples/zh_CN/default/icon/icon.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 15rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/textarea/examples/zh_CN/default/icon/icon.component.ts b/lib/ng-nest/ui/textarea/examples/zh_CN/default/icon/icon.component.ts index 7ad46cf35..9a117b1cb 100644 --- a/lib/ng-nest/ui/textarea/examples/zh_CN/default/icon/icon.component.ts +++ b/lib/ng-nest/ui/textarea/examples/zh_CN/default/icon/icon.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XTextareaComponent } from '@ng-nest/ui/textarea'; @Component({ selector: 'ex-icon', + standalone: true, + imports: [XTextareaComponent], templateUrl: './icon.component.html', styleUrls: ['./icon.component.scss'] }) diff --git a/lib/ng-nest/ui/textarea/examples/zh_CN/default/label/label.component.html b/lib/ng-nest/ui/textarea/examples/zh_CN/default/label/label.component.html index 068d7352b..6235c8a85 100644 --- a/lib/ng-nest/ui/textarea/examples/zh_CN/default/label/label.component.html +++ b/lib/ng-nest/ui/textarea/examples/zh_CN/default/label/label.component.html @@ -1,20 +1,12 @@ - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/textarea/examples/zh_CN/default/label/label.component.scss b/lib/ng-nest/ui/textarea/examples/zh_CN/default/label/label.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/textarea/examples/zh_CN/default/label/label.component.scss +++ b/lib/ng-nest/ui/textarea/examples/zh_CN/default/label/label.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 15rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/textarea/examples/zh_CN/default/label/label.component.ts b/lib/ng-nest/ui/textarea/examples/zh_CN/default/label/label.component.ts index 64c8a7056..4b9e6afc1 100644 --- a/lib/ng-nest/ui/textarea/examples/zh_CN/default/label/label.component.ts +++ b/lib/ng-nest/ui/textarea/examples/zh_CN/default/label/label.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XTextareaComponent } from '@ng-nest/ui/textarea'; @Component({ selector: 'ex-label', + standalone: true, + imports: [XTextareaComponent], templateUrl: './label.component.html', styleUrls: ['./label.component.scss'] }) diff --git a/lib/ng-nest/ui/textarea/examples/zh_CN/default/length/length.component.html b/lib/ng-nest/ui/textarea/examples/zh_CN/default/length/length.component.html index f58672e46..9db7d05cf 100644 --- a/lib/ng-nest/ui/textarea/examples/zh_CN/default/length/length.component.html +++ b/lib/ng-nest/ui/textarea/examples/zh_CN/default/length/length.component.html @@ -1,25 +1,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/textarea/examples/zh_CN/default/length/length.component.scss b/lib/ng-nest/ui/textarea/examples/zh_CN/default/length/length.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/textarea/examples/zh_CN/default/length/length.component.scss +++ b/lib/ng-nest/ui/textarea/examples/zh_CN/default/length/length.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 15rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/textarea/examples/zh_CN/default/length/length.component.ts b/lib/ng-nest/ui/textarea/examples/zh_CN/default/length/length.component.ts index a690f4157..20f5b5953 100644 --- a/lib/ng-nest/ui/textarea/examples/zh_CN/default/length/length.component.ts +++ b/lib/ng-nest/ui/textarea/examples/zh_CN/default/length/length.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XTextareaComponent } from '@ng-nest/ui/textarea'; @Component({ selector: 'ex-length', + standalone: true, + imports: [FormsModule, XTextareaComponent], templateUrl: './length.component.html', styleUrls: ['./length.component.scss'] }) diff --git a/lib/ng-nest/ui/textarea/examples/zh_CN/default/required/required.component.html b/lib/ng-nest/ui/textarea/examples/zh_CN/default/required/required.component.html index c9b7d37f2..518bb770b 100644 --- a/lib/ng-nest/ui/textarea/examples/zh_CN/default/required/required.component.html +++ b/lib/ng-nest/ui/textarea/examples/zh_CN/default/required/required.component.html @@ -1,15 +1,9 @@ - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/textarea/examples/zh_CN/default/required/required.component.scss b/lib/ng-nest/ui/textarea/examples/zh_CN/default/required/required.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/textarea/examples/zh_CN/default/required/required.component.scss +++ b/lib/ng-nest/ui/textarea/examples/zh_CN/default/required/required.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 15rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/textarea/examples/zh_CN/default/required/required.component.ts b/lib/ng-nest/ui/textarea/examples/zh_CN/default/required/required.component.ts index c8debbb95..fc016f906 100644 --- a/lib/ng-nest/ui/textarea/examples/zh_CN/default/required/required.component.ts +++ b/lib/ng-nest/ui/textarea/examples/zh_CN/default/required/required.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XTextareaComponent } from '@ng-nest/ui/textarea'; @Component({ selector: 'ex-required', + standalone: true, + imports: [FormsModule, XTextareaComponent], templateUrl: './required.component.html', styleUrls: ['./required.component.scss'] }) diff --git a/lib/ng-nest/ui/textarea/textarea.component.spec.ts b/lib/ng-nest/ui/textarea/textarea.component.spec.ts index d6f57393b..aa7a4443b 100644 --- a/lib/ng-nest/ui/textarea/textarea.component.spec.ts +++ b/lib/ng-nest/ui/textarea/textarea.component.spec.ts @@ -1,21 +1,28 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XTextareaComponent } from './textarea.component'; import { Component, DebugElement, ChangeDetectorRef } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { XTextareaModule } from '@ng-nest/ui/textarea'; +import { XTextareaComponent } from '@ng-nest/ui/textarea'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { XTextareaPrefix } from './textarea.property'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { interval } from 'rxjs'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XTextareaPrefix, () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, BrowserAnimationsModule, XThemeModule, XTextareaModule, FormsModule, ReactiveFormsModule, XRowComponent, XColComponent], + imports: [ + HttpClientTestingModule, + BrowserAnimationsModule, + XThemeComponent, + XTextareaComponent, + FormsModule, + ReactiveFormsModule, + XRowComponent, + XColComponent + ], declarations: [ TestXTextareaComponent, TestXTextareaLabelComponent, @@ -226,7 +233,13 @@ class TestXTextareaIconComponent {} - + `, @@ -346,13 +359,25 @@ class TestXTextareaRequiredComponent { - + - + `, diff --git a/lib/ng-nest/ui/textarea/textarea.component.ts b/lib/ng-nest/ui/textarea/textarea.component.ts index 8de76a96f..3d32c0202 100644 --- a/lib/ng-nest/ui/textarea/textarea.component.ts +++ b/lib/ng-nest/ui/textarea/textarea.component.ts @@ -8,14 +8,20 @@ import { ElementRef, ViewChild, OnChanges, - SimpleChanges + SimpleChanges, + inject } from '@angular/core'; import { XTextareaPrefix, XTextareaProperty } from './textarea.property'; import { XIsEmpty, XIsChange, XClearClass, XConfigService } from '@ng-nest/ui/core'; import { XValueAccessor } from '@ng-nest/ui/base-form'; +import { CommonModule } from '@angular/common'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { XIconComponent } from '@ng-nest/ui/icon'; @Component({ selector: `${XTextareaPrefix}`, + standalone: true, + imports: [CommonModule, FormsModule, ReactiveFormsModule, XIconComponent], templateUrl: './textarea.component.html', styleUrls: ['./style/index.scss'], encapsulation: ViewEncapsulation.None, @@ -51,14 +57,9 @@ export class XTextareaComponent extends XTextareaProperty implements OnInit, OnC return !XIsEmpty(this.icon) && this.iconLayout === 'right'; } - constructor( - public renderer: Renderer2, - public elementRef: ElementRef, - public override cdr: ChangeDetectorRef, - public configService: XConfigService - ) { - super(); - } + private renderer = inject(Renderer2); + override cdr = inject(ChangeDetectorRef); + configService = inject(XConfigService); ngOnInit() { this.setPadding(); diff --git a/lib/ng-nest/ui/textarea/textarea.module.ts b/lib/ng-nest/ui/textarea/textarea.module.ts index f676cba07..c601bdf4a 100644 --- a/lib/ng-nest/ui/textarea/textarea.module.ts +++ b/lib/ng-nest/ui/textarea/textarea.module.ts @@ -1,14 +1,8 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { XTextareaComponent } from './textarea.component'; -import { XIconComponent } from '@ng-nest/ui/icon'; -import { XTextareaProperty } from './textarea.property'; -import { XControlValueAccessor } from '@ng-nest/ui/base-form'; @NgModule({ - declarations: [XTextareaComponent, XTextareaProperty], exports: [XTextareaComponent], - imports: [CommonModule, FormsModule, ReactiveFormsModule, XIconComponent, XControlValueAccessor] + imports: [XTextareaComponent] }) export class XTextareaModule {} diff --git a/lib/ng-nest/ui/theme/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/theme/examples/en_US/default/default/default.component.ts index e92df7a19..3d9fc7c32 100644 --- a/lib/ng-nest/ui/theme/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/theme/examples/en_US/default/default/default.component.ts @@ -1,7 +1,12 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XThemeComponent } from '@ng-nest/ui/theme'; @Component({ selector: 'ex-default', + standalone: true, + imports: [FormsModule, XThemeComponent, XButtonComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/theme/examples/index.ts b/lib/ng-nest/ui/theme/examples/index.ts new file mode 100644 index 000000000..b94cf3f92 --- /dev/null +++ b/lib/ng-nest/ui/theme/examples/index.ts @@ -0,0 +1 @@ +export * from './zh_CN/default/default/default.component'; diff --git a/lib/ng-nest/ui/theme/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/theme/examples/zh_CN/default/default/default.component.ts index e92df7a19..3d9fc7c32 100644 --- a/lib/ng-nest/ui/theme/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/theme/examples/zh_CN/default/default/default.component.ts @@ -1,7 +1,12 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XThemeComponent } from '@ng-nest/ui/theme'; @Component({ selector: 'ex-default', + standalone: true, + imports: [FormsModule, XThemeComponent, XButtonComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/theme/theme.component.spec.ts b/lib/ng-nest/ui/theme/theme.component.spec.ts index 4da1671b0..6f9e83a93 100644 --- a/lib/ng-nest/ui/theme/theme.component.spec.ts +++ b/lib/ng-nest/ui/theme/theme.component.spec.ts @@ -1,15 +1,13 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XThemeComponent } from './theme.component'; import { Component, DebugElement, ChangeDetectorRef } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { XThemePrefix } from './theme.property'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { XFormComponent } from '@ng-nest/ui/form'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; -import { XSwitchModule } from '@ng-nest/ui/switch'; +import { XSwitchComponent } from '@ng-nest/ui/switch'; import { XI18nService, en_US, zh_CN } from '@ng-nest/ui/i18n'; import { HttpClientTestingModule } from '@angular/common/http/testing'; @@ -23,8 +21,8 @@ describe(XThemePrefix, () => { ReactiveFormsModule, XButtonComponent, XButtonsComponent, - XThemeModule, - XSwitchModule, + XThemeComponent, + XSwitchComponent, XFormComponent ], declarations: [TestXThemeComponent] @@ -190,9 +188,7 @@ describe(XThemePrefix, () => { 上一页 - 下一页 + 下一页 @@ -226,9 +222,7 @@ describe(XThemePrefix, () => { 上一页 - 下一页 + 下一页 diff --git a/lib/ng-nest/ui/theme/theme.component.ts b/lib/ng-nest/ui/theme/theme.component.ts index 49a555c1e..e98db2f16 100644 --- a/lib/ng-nest/ui/theme/theme.component.ts +++ b/lib/ng-nest/ui/theme/theme.component.ts @@ -1,30 +1,54 @@ -import { Component, OnInit, ViewEncapsulation, ChangeDetectionStrategy, ChangeDetectorRef, OnDestroy } from '@angular/core'; +import { + Component, + OnInit, + ViewEncapsulation, + ChangeDetectionStrategy, + ChangeDetectorRef, + OnDestroy, + inject, + AfterViewInit +} from '@angular/core'; import { XThemeProperty } from './theme.property'; import { XConfigService, - XThemeService, XColorsTheme, XTheme, X_THEME_COLOR_KEYS, X_THEME_COLORS, X_THEME_DARK_COLORS } from '@ng-nest/ui/core'; -import { UntypedFormGroup } from '@angular/forms'; -import { XControl } from '@ng-nest/ui/form'; +import { FormsModule, ReactiveFormsModule, UntypedFormGroup } from '@angular/forms'; +import { XControl, XFormComponent } from '@ng-nest/ui/form'; import { debounceTime, takeUntil, map } from 'rxjs/operators'; import { Subject } from 'rxjs'; -import { XI18nService, XI18nTheme } from '@ng-nest/ui/i18n'; +import { XI18nDirective, XI18nService, XI18nTheme } from '@ng-nest/ui/i18n'; import { XValueAccessor } from '@ng-nest/ui/base-form'; +import { CommonModule } from '@angular/common'; +import { XSwitchComponent } from '@ng-nest/ui/switch'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XColComponent, XRowComponent } from '@ng-nest/ui/layout'; @Component({ selector: 'x-theme', + standalone: true, + imports: [ + CommonModule, + FormsModule, + ReactiveFormsModule, + XSwitchComponent, + XButtonComponent, + XRowComponent, + XColComponent, + XFormComponent, + XI18nDirective + ], templateUrl: './theme.component.html', styleUrls: ['./style/index.scss'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, providers: [XValueAccessor(XThemeComponent)] }) -export class XThemeComponent extends XThemeProperty implements OnInit, OnDestroy { +export class XThemeComponent extends XThemeProperty implements OnInit, AfterViewInit, OnDestroy { formGroup = new UntypedFormGroup({}); theme: XTheme = { @@ -47,8 +71,6 @@ export class XThemeComponent extends XThemeProperty implements OnInit, OnDestroy override value: XColorsTheme = {}; - themeService: XThemeService; - locale: XI18nTheme = {}; private _unSubject = new Subject(); @@ -56,16 +78,22 @@ export class XThemeComponent extends XThemeProperty implements OnInit, OnDestroy override writeValue(value: XColorsTheme) { this.value = value; if (this.value && Object.keys(this.value).length > 0) { - this.theme = { colors: this.themeService.getDefineColors(Object.assign({}, X_THEME_COLORS, this.value), '', this.dark as boolean) }; + this.theme = { + colors: this.themeService.getDefineColors( + Object.assign({}, X_THEME_COLORS, this.value), + '', + this.dark as boolean + ) + }; this.formGroup.patchValue(this.theme.colors as XColorsTheme); } this.cdr.detectChanges(); } - constructor(public configService: XConfigService, public i18n: XI18nService, public override cdr: ChangeDetectorRef) { - super(); - this.themeService = this.configService.themeService; - } + override cdr = inject(ChangeDetectorRef); + public i18n = inject(XI18nService); + configService = inject(XConfigService); + themeService = this.configService.themeService; ngOnInit() { this.theme = this.configService.getTheme(true); @@ -92,7 +120,9 @@ export class XThemeComponent extends XThemeProperty implements OnInit, OnDestroy let changes = this.getChanges(x); if (this.isOneAndInColorKeys(changes)) { let [key, value] = Object.entries(changes)[0]; - let colors = !this.dark ? this.themeService.setRoot(key, value, '') : this.themeService.setDarkRoot(key, value, ''); + let colors = !this.dark + ? this.themeService.setRoot(key, value, '') + : this.themeService.setDarkRoot(key, value, ''); Object.assign(x, colors); this.currentColors = x; this.formGroup.patchValue(x); diff --git a/lib/ng-nest/ui/theme/theme.module.ts b/lib/ng-nest/ui/theme/theme.module.ts index 60620105a..2f8cad78e 100644 --- a/lib/ng-nest/ui/theme/theme.module.ts +++ b/lib/ng-nest/ui/theme/theme.module.ts @@ -1,29 +1,8 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { XThemeComponent } from './theme.component'; -import { XThemeProperty } from './theme.property'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { XButtonComponent } from '@ng-nest/ui/button'; -import { XFormComponent } from '@ng-nest/ui/form'; -import { XSwitchModule } from '@ng-nest/ui/switch'; -import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; -import { XI18nDirective } from '@ng-nest/ui/i18n'; -import { XControlValueAccessor } from '@ng-nest/ui/base-form'; @NgModule({ - declarations: [XThemeComponent, XThemeProperty], exports: [XThemeComponent], - imports: [ - CommonModule, - FormsModule, - ReactiveFormsModule, - XSwitchModule, - XButtonComponent, - XRowComponent, - XColComponent, - XFormComponent, - XI18nDirective, - XControlValueAccessor - ] + imports: [XThemeComponent] }) export class XThemeModule {} diff --git a/lib/ng-nest/ui/time-ago/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/time-ago/examples/en_US/default/default/default.component.ts index 8755eb72d..6240492c3 100644 --- a/lib/ng-nest/ui/time-ago/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/time-ago/examples/en_US/default/default/default.component.ts @@ -1,12 +1,16 @@ -import { Component, OnInit } from '@angular/core'; +import { DatePipe } from '@angular/common'; +import { Component } from '@angular/core'; import { XAddSeconds, XAddMinutes, XAddHours, XAddDays, XAddMonths, XAddYears } from '@ng-nest/ui/core'; +import { XTimeAgoPipe } from '@ng-nest/ui/time-ago'; @Component({ selector: 'ex-default', + standalone: true, + imports: [DatePipe, XTimeAgoPipe], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) -export class ExDefaultComponent implements OnInit { +export class ExDefaultComponent { format = 'yyyy-MM-dd HH:mm:ss'; date = new Date(); dateSeconds = XAddSeconds(this.date, -5); @@ -15,7 +19,4 @@ export class ExDefaultComponent implements OnInit { dateDays = XAddDays(this.date, -5); dateMonths = XAddMonths(this.date, -5); dateYears = XAddYears(this.date, -5); - constructor() {} - - ngOnInit() {} } diff --git a/lib/ng-nest/ui/time-ago/examples/index.ts b/lib/ng-nest/ui/time-ago/examples/index.ts new file mode 100644 index 000000000..b94cf3f92 --- /dev/null +++ b/lib/ng-nest/ui/time-ago/examples/index.ts @@ -0,0 +1 @@ +export * from './zh_CN/default/default/default.component'; diff --git a/lib/ng-nest/ui/time-ago/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/time-ago/examples/zh_CN/default/default/default.component.ts index 8755eb72d..6240492c3 100644 --- a/lib/ng-nest/ui/time-ago/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/time-ago/examples/zh_CN/default/default/default.component.ts @@ -1,12 +1,16 @@ -import { Component, OnInit } from '@angular/core'; +import { DatePipe } from '@angular/common'; +import { Component } from '@angular/core'; import { XAddSeconds, XAddMinutes, XAddHours, XAddDays, XAddMonths, XAddYears } from '@ng-nest/ui/core'; +import { XTimeAgoPipe } from '@ng-nest/ui/time-ago'; @Component({ selector: 'ex-default', + standalone: true, + imports: [DatePipe, XTimeAgoPipe], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) -export class ExDefaultComponent implements OnInit { +export class ExDefaultComponent { format = 'yyyy-MM-dd HH:mm:ss'; date = new Date(); dateSeconds = XAddSeconds(this.date, -5); @@ -15,7 +19,4 @@ export class ExDefaultComponent implements OnInit { dateDays = XAddDays(this.date, -5); dateMonths = XAddMonths(this.date, -5); dateYears = XAddYears(this.date, -5); - constructor() {} - - ngOnInit() {} } diff --git a/lib/ng-nest/ui/time-ago/time-ago.module.ts b/lib/ng-nest/ui/time-ago/time-ago.module.ts index c7d0c2976..1dcd29563 100644 --- a/lib/ng-nest/ui/time-ago/time-ago.module.ts +++ b/lib/ng-nest/ui/time-ago/time-ago.module.ts @@ -1,10 +1,8 @@ import { NgModule } from '@angular/core'; -import { DatePipe } from '@angular/common'; import { XTimeAgoPipe } from './time-ago.pipe'; @NgModule({ - declarations: [XTimeAgoPipe], exports: [XTimeAgoPipe], - providers: [DatePipe] + imports: [XTimeAgoPipe] }) export class XTimeAgoModule {} diff --git a/lib/ng-nest/ui/time-ago/time-ago.pipe.spec.ts b/lib/ng-nest/ui/time-ago/time-ago.pipe.spec.ts index 46834f432..e966ebb0b 100644 --- a/lib/ng-nest/ui/time-ago/time-ago.pipe.spec.ts +++ b/lib/ng-nest/ui/time-ago/time-ago.pipe.spec.ts @@ -1,6 +1,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { Component, ChangeDetectorRef } from '@angular/core'; -import { XTimeAgoModule } from '@ng-nest/ui/time-ago'; +import { XTimeAgoPipe } from '@ng-nest/ui/time-ago'; import { XTimeAgoPrefix } from './time-ago.property'; import { XAddSeconds, XAddMinutes, XAddHours, XAddDays, XAddMonths, XAddYears } from '@ng-nest/ui/core'; import { XButtonComponent } from '@ng-nest/ui/button'; @@ -10,7 +10,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XTimeAgoPrefix, () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, XTimeAgoModule, XButtonComponent], + imports: [HttpClientTestingModule, XTimeAgoPipe, XButtonComponent], declarations: [TestXTimeAgoComponent] }).compileComponents(); }); diff --git a/lib/ng-nest/ui/time-ago/time-ago.pipe.ts b/lib/ng-nest/ui/time-ago/time-ago.pipe.ts index 4a23c4d1c..cb57d08e0 100644 --- a/lib/ng-nest/ui/time-ago/time-ago.pipe.ts +++ b/lib/ng-nest/ui/time-ago/time-ago.pipe.ts @@ -1,21 +1,22 @@ -import { Pipe, PipeTransform } from '@angular/core'; -import { XToDate, XDate } from '@ng-nest/ui/core'; +import { Pipe, PipeTransform, inject } from '@angular/core'; +import { XToDate } from '@ng-nest/ui/core'; import { DatePipe } from '@angular/common'; import { XTimeAgoPrefix } from './time-ago.property'; import { XI18nService, XI18nTimeAgo } from '@ng-nest/ui/i18n'; -@Pipe({ name: `${XTimeAgoPrefix}`, pure: false }) -export class XTimeAgoPipe implements PipeTransform { - locale: XI18nTimeAgo = {}; +@Pipe({ name: `${XTimeAgoPrefix}`, standalone: true }) +export class XTimeAgoPipe extends DatePipe implements PipeTransform { + localeI18n: XI18nTimeAgo = {}; private catchContent: any; - constructor(private datePipe: DatePipe, private i18n: XI18nService) {} - transform(input?: XDate): string { + private i18n = inject(XI18nService); + + override transform(input?: any): any { if (!input) return ''; const date = XToDate(input); if (isNaN(date.valueOf())) { return input as string; } - this.locale = this.i18n.getLocale().timeAgo as XI18nTimeAgo; + this.localeI18n = this.i18n.getLocale().timeAgo as XI18nTimeAgo; const content = this.getDiff(date); if (this.catchContent !== content) { this.catchContent = content; @@ -40,16 +41,16 @@ export class XTimeAgoPipe implements PipeTransform { const secondDiff = diffValue / second; let result = ''; if (date.getFullYear() !== now.getFullYear()) { - result = this.datePipe.transform(time, 'yyyy-MM-dd') as string; + result = super.transform(time, 'yyyy-MM-dd') as string; } else if (dayDiff >= 1) { - result = this.datePipe.transform(time, 'MM-dd HH:mm') as string; + result = super.transform(time, 'MM-dd HH:mm') as string; } else if (hourDiff >= 1) { - result = `${Math.floor(hourDiff)}${this.locale.hoursAgo}`; + result = `${Math.floor(hourDiff)}${this.localeI18n.hoursAgo}`; } else if (minDiff >= 1) { - result = `${Math.floor(minDiff)}${this.locale.minutesAgo}`; + result = `${Math.floor(minDiff)}${this.localeI18n.minutesAgo}`; } else if (secondDiff >= 1) { - result = `${Math.floor(secondDiff)}${this.locale.secondsAgo}`; - } else result = this.locale.just as string; + result = `${Math.floor(secondDiff)}${this.localeI18n.secondsAgo}`; + } else result = this.localeI18n.just as string; return result; } } diff --git a/lib/ng-nest/ui/time-picker/examples/en_US/default/bordered/bordered.component.html b/lib/ng-nest/ui/time-picker/examples/en_US/default/bordered/bordered.component.html index 885ed0a19..ee438bb3f 100644 --- a/lib/ng-nest/ui/time-picker/examples/en_US/default/bordered/bordered.component.html +++ b/lib/ng-nest/ui/time-picker/examples/en_US/default/bordered/bordered.component.html @@ -1,17 +1,20 @@ - - +
- - +
+
+ - - +
+
+ - - +
+
+ - - +
+
+ - - +
+ diff --git a/lib/ng-nest/ui/time-picker/examples/en_US/default/bordered/bordered.component.scss b/lib/ng-nest/ui/time-picker/examples/en_US/default/bordered/bordered.component.scss index 3b85eac28..b4943baa0 100644 --- a/lib/ng-nest/ui/time-picker/examples/en_US/default/bordered/bordered.component.scss +++ b/lib/ng-nest/ui/time-picker/examples/en_US/default/bordered/bordered.component.scss @@ -1,8 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } - x-row > x-col { - width: 15rem; - } } diff --git a/lib/ng-nest/ui/time-picker/examples/en_US/default/bordered/bordered.component.ts b/lib/ng-nest/ui/time-picker/examples/en_US/default/bordered/bordered.component.ts index 92c38bb55..65cb02e6d 100644 --- a/lib/ng-nest/ui/time-picker/examples/en_US/default/bordered/bordered.component.ts +++ b/lib/ng-nest/ui/time-picker/examples/en_US/default/bordered/bordered.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XTimePickerComponent } from '@ng-nest/ui/time-picker'; @Component({ selector: 'ex-bordered', + standalone: true, + imports: [FormsModule, XTimePickerComponent], templateUrl: './bordered.component.html', styleUrls: ['./bordered.component.scss'] }) diff --git a/lib/ng-nest/ui/time-picker/examples/en_US/default/default/default.component.html b/lib/ng-nest/ui/time-picker/examples/en_US/default/default/default.component.html index b912be868..b6e7cd354 100644 --- a/lib/ng-nest/ui/time-picker/examples/en_US/default/default/default.component.html +++ b/lib/ng-nest/ui/time-picker/examples/en_US/default/default/default.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/time-picker/examples/en_US/default/default/default.component.scss b/lib/ng-nest/ui/time-picker/examples/en_US/default/default/default.component.scss index 587bbfb85..b4943baa0 100644 --- a/lib/ng-nest/ui/time-picker/examples/en_US/default/default/default.component.scss +++ b/lib/ng-nest/ui/time-picker/examples/en_US/default/default/default.component.scss @@ -1,8 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } - x-row > x-col { - width: 7rem; - } } diff --git a/lib/ng-nest/ui/time-picker/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/time-picker/examples/en_US/default/default/default.component.ts index 2faa60f32..17a0742e3 100644 --- a/lib/ng-nest/ui/time-picker/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/time-picker/examples/en_US/default/default/default.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XTimePickerComponent } from '@ng-nest/ui/time-picker'; @Component({ selector: 'ex-default', + standalone: true, + imports: [FormsModule, XTimePickerComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/time-picker/examples/en_US/default/disabled/disabled.component.html b/lib/ng-nest/ui/time-picker/examples/en_US/default/disabled/disabled.component.html index 5c81bf67f..81ff49e6b 100644 --- a/lib/ng-nest/ui/time-picker/examples/en_US/default/disabled/disabled.component.html +++ b/lib/ng-nest/ui/time-picker/examples/en_US/default/disabled/disabled.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/time-picker/examples/en_US/default/disabled/disabled.component.scss b/lib/ng-nest/ui/time-picker/examples/en_US/default/disabled/disabled.component.scss index 587bbfb85..b4943baa0 100644 --- a/lib/ng-nest/ui/time-picker/examples/en_US/default/disabled/disabled.component.scss +++ b/lib/ng-nest/ui/time-picker/examples/en_US/default/disabled/disabled.component.scss @@ -1,8 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } - x-row > x-col { - width: 7rem; - } } diff --git a/lib/ng-nest/ui/time-picker/examples/en_US/default/disabled/disabled.component.ts b/lib/ng-nest/ui/time-picker/examples/en_US/default/disabled/disabled.component.ts index 292576ae7..ce011bb56 100644 --- a/lib/ng-nest/ui/time-picker/examples/en_US/default/disabled/disabled.component.ts +++ b/lib/ng-nest/ui/time-picker/examples/en_US/default/disabled/disabled.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XTimePickerComponent } from '@ng-nest/ui/time-picker'; @Component({ selector: 'ex-disabled', + standalone: true, + imports: [FormsModule, XTimePickerComponent], templateUrl: './disabled.component.html', styleUrls: ['./disabled.component.scss'] }) diff --git a/lib/ng-nest/ui/time-picker/examples/en_US/default/hour-minute/hour-minute.component.html b/lib/ng-nest/ui/time-picker/examples/en_US/default/hour-minute/hour-minute.component.html index 8a7bab338..5b3d922cc 100644 --- a/lib/ng-nest/ui/time-picker/examples/en_US/default/hour-minute/hour-minute.component.html +++ b/lib/ng-nest/ui/time-picker/examples/en_US/default/hour-minute/hour-minute.component.html @@ -1,10 +1,7 @@ - - +
- - - - +
+
+ - - +
\ No newline at end of file diff --git a/lib/ng-nest/ui/time-picker/examples/en_US/default/hour-minute/hour-minute.component.scss b/lib/ng-nest/ui/time-picker/examples/en_US/default/hour-minute/hour-minute.component.scss index 587bbfb85..b4943baa0 100644 --- a/lib/ng-nest/ui/time-picker/examples/en_US/default/hour-minute/hour-minute.component.scss +++ b/lib/ng-nest/ui/time-picker/examples/en_US/default/hour-minute/hour-minute.component.scss @@ -1,8 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } - x-row > x-col { - width: 7rem; - } } diff --git a/lib/ng-nest/ui/time-picker/examples/en_US/default/hour-minute/hour-minute.component.ts b/lib/ng-nest/ui/time-picker/examples/en_US/default/hour-minute/hour-minute.component.ts index 1e737c9c9..8f0c971ce 100644 --- a/lib/ng-nest/ui/time-picker/examples/en_US/default/hour-minute/hour-minute.component.ts +++ b/lib/ng-nest/ui/time-picker/examples/en_US/default/hour-minute/hour-minute.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XTimePickerComponent } from '@ng-nest/ui/time-picker'; @Component({ selector: 'ex-hour-minute', + standalone: true, + imports: [FormsModule, XTimePickerComponent], templateUrl: './hour-minute.component.html', styleUrls: ['./hour-minute.component.scss'] }) diff --git a/lib/ng-nest/ui/time-picker/examples/en_US/default/label/label.component.html b/lib/ng-nest/ui/time-picker/examples/en_US/default/label/label.component.html index 946663499..3b404bdc5 100644 --- a/lib/ng-nest/ui/time-picker/examples/en_US/default/label/label.component.html +++ b/lib/ng-nest/ui/time-picker/examples/en_US/default/label/label.component.html @@ -1,20 +1,16 @@ - - +
- - - - +
+
+ - - - - +
+
+ - - - - +
+
+ - - +
+ diff --git a/lib/ng-nest/ui/time-picker/examples/en_US/default/label/label.component.scss b/lib/ng-nest/ui/time-picker/examples/en_US/default/label/label.component.scss index f36cc6951..b4943baa0 100644 --- a/lib/ng-nest/ui/time-picker/examples/en_US/default/label/label.component.scss +++ b/lib/ng-nest/ui/time-picker/examples/en_US/default/label/label.component.scss @@ -1,8 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } - x-row > x-col { - width: 10rem; - } } diff --git a/lib/ng-nest/ui/time-picker/examples/en_US/default/label/label.component.ts b/lib/ng-nest/ui/time-picker/examples/en_US/default/label/label.component.ts index cd229f9d6..5dbe917cc 100644 --- a/lib/ng-nest/ui/time-picker/examples/en_US/default/label/label.component.ts +++ b/lib/ng-nest/ui/time-picker/examples/en_US/default/label/label.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XTimePickerComponent } from '@ng-nest/ui/time-picker'; @Component({ selector: 'ex-label', + standalone: true, + imports: [FormsModule, XTimePickerComponent], templateUrl: './label.component.html', styleUrls: ['./label.component.scss'] }) diff --git a/lib/ng-nest/ui/time-picker/examples/en_US/default/preset/preset.component.scss b/lib/ng-nest/ui/time-picker/examples/en_US/default/preset/preset.component.scss deleted file mode 100644 index dc9093b45..000000000 --- a/lib/ng-nest/ui/time-picker/examples/en_US/default/preset/preset.component.scss +++ /dev/null @@ -1,2 +0,0 @@ -:host { -} diff --git a/lib/ng-nest/ui/time-picker/examples/en_US/default/preset/preset.component.ts b/lib/ng-nest/ui/time-picker/examples/en_US/default/preset/preset.component.ts index f0f9891f1..97a602d23 100644 --- a/lib/ng-nest/ui/time-picker/examples/en_US/default/preset/preset.component.ts +++ b/lib/ng-nest/ui/time-picker/examples/en_US/default/preset/preset.component.ts @@ -1,10 +1,13 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; import { XAddHours } from '@ng-nest/ui/core'; +import { XTimePickerComponent } from '@ng-nest/ui/time-picker'; @Component({ selector: 'ex-preset', - templateUrl: './preset.component.html', - styleUrls: ['./preset.component.scss'] + standalone: true, + imports: [FormsModule, XTimePickerComponent], + templateUrl: './preset.component.html' }) export class ExPresetComponent { model: any; diff --git a/lib/ng-nest/ui/time-picker/examples/en_US/default/required/required.component.html b/lib/ng-nest/ui/time-picker/examples/en_US/default/required/required.component.html index d0d68d271..6b9f2f1ea 100644 --- a/lib/ng-nest/ui/time-picker/examples/en_US/default/required/required.component.html +++ b/lib/ng-nest/ui/time-picker/examples/en_US/default/required/required.component.html @@ -1,10 +1,8 @@ - - +
- - - - +
+
+ - - +
+ diff --git a/lib/ng-nest/ui/time-picker/examples/en_US/default/required/required.component.scss b/lib/ng-nest/ui/time-picker/examples/en_US/default/required/required.component.scss index 587bbfb85..b4943baa0 100644 --- a/lib/ng-nest/ui/time-picker/examples/en_US/default/required/required.component.scss +++ b/lib/ng-nest/ui/time-picker/examples/en_US/default/required/required.component.scss @@ -1,8 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } - x-row > x-col { - width: 7rem; - } } diff --git a/lib/ng-nest/ui/time-picker/examples/en_US/default/required/required.component.ts b/lib/ng-nest/ui/time-picker/examples/en_US/default/required/required.component.ts index 4ac889b8b..1c7e01017 100644 --- a/lib/ng-nest/ui/time-picker/examples/en_US/default/required/required.component.ts +++ b/lib/ng-nest/ui/time-picker/examples/en_US/default/required/required.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XTimePickerComponent } from '@ng-nest/ui/time-picker'; @Component({ selector: 'ex-required', + standalone: true, + imports: [FormsModule, XTimePickerComponent], templateUrl: './required.component.html', styleUrls: ['./required.component.scss'] }) diff --git a/lib/ng-nest/ui/time-picker/examples/en_US/default/size/size.component.html b/lib/ng-nest/ui/time-picker/examples/en_US/default/size/size.component.html index c5cedb34d..784cc0a8c 100644 --- a/lib/ng-nest/ui/time-picker/examples/en_US/default/size/size.component.html +++ b/lib/ng-nest/ui/time-picker/examples/en_US/default/size/size.component.html @@ -1,18 +1,16 @@ - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/time-picker/examples/en_US/default/size/size.component.scss b/lib/ng-nest/ui/time-picker/examples/en_US/default/size/size.component.scss index db47dab4e..5e83058ed 100644 --- a/lib/ng-nest/ui/time-picker/examples/en_US/default/size/size.component.scss +++ b/lib/ng-nest/ui/time-picker/examples/en_US/default/size/size.component.scss @@ -1,9 +1,5 @@ :host { - x-row { - width: 20rem; - } - x-row > x-col { + .row { margin-top: 1rem; - width: 15rem; } } diff --git a/lib/ng-nest/ui/time-picker/examples/en_US/default/size/size.component.ts b/lib/ng-nest/ui/time-picker/examples/en_US/default/size/size.component.ts index 2ea3351ce..aff1db6ba 100644 --- a/lib/ng-nest/ui/time-picker/examples/en_US/default/size/size.component.ts +++ b/lib/ng-nest/ui/time-picker/examples/en_US/default/size/size.component.ts @@ -1,8 +1,13 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; import { XSize } from '@ng-nest/ui/core'; +import { XRadioComponent } from '@ng-nest/ui/radio'; +import { XTimePickerComponent } from '@ng-nest/ui/time-picker'; @Component({ selector: 'ex-size', + standalone: true, + imports: [FormsModule, XTimePickerComponent, XRadioComponent], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/time-picker/examples/en_US/default/step/step.component.scss b/lib/ng-nest/ui/time-picker/examples/en_US/default/step/step.component.scss deleted file mode 100644 index dc9093b45..000000000 --- a/lib/ng-nest/ui/time-picker/examples/en_US/default/step/step.component.scss +++ /dev/null @@ -1,2 +0,0 @@ -:host { -} diff --git a/lib/ng-nest/ui/time-picker/examples/en_US/default/step/step.component.ts b/lib/ng-nest/ui/time-picker/examples/en_US/default/step/step.component.ts index 4e64ba3fb..654e2baf6 100644 --- a/lib/ng-nest/ui/time-picker/examples/en_US/default/step/step.component.ts +++ b/lib/ng-nest/ui/time-picker/examples/en_US/default/step/step.component.ts @@ -1,9 +1,12 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XTimePickerComponent } from '@ng-nest/ui/time-picker'; @Component({ selector: 'ex-step', - templateUrl: './step.component.html', - styleUrls: ['./step.component.scss'] + standalone: true, + imports: [FormsModule, XTimePickerComponent], + templateUrl: './step.component.html' }) export class ExStepComponent { model: any; diff --git a/lib/ng-nest/ui/time-picker/examples/en_US/default/use12hours/use12hours.component.html b/lib/ng-nest/ui/time-picker/examples/en_US/default/use12hours/use12hours.component.html index 761772b63..ceeae4ac2 100644 --- a/lib/ng-nest/ui/time-picker/examples/en_US/default/use12hours/use12hours.component.html +++ b/lib/ng-nest/ui/time-picker/examples/en_US/default/use12hours/use12hours.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/time-picker/examples/en_US/default/use12hours/use12hours.component.scss b/lib/ng-nest/ui/time-picker/examples/en_US/default/use12hours/use12hours.component.scss index 587bbfb85..b4943baa0 100644 --- a/lib/ng-nest/ui/time-picker/examples/en_US/default/use12hours/use12hours.component.scss +++ b/lib/ng-nest/ui/time-picker/examples/en_US/default/use12hours/use12hours.component.scss @@ -1,8 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } - x-row > x-col { - width: 7rem; - } } diff --git a/lib/ng-nest/ui/time-picker/examples/en_US/default/use12hours/use12hours.component.ts b/lib/ng-nest/ui/time-picker/examples/en_US/default/use12hours/use12hours.component.ts index 8e785632e..540c58de3 100644 --- a/lib/ng-nest/ui/time-picker/examples/en_US/default/use12hours/use12hours.component.ts +++ b/lib/ng-nest/ui/time-picker/examples/en_US/default/use12hours/use12hours.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XTimePickerComponent } from '@ng-nest/ui/time-picker'; @Component({ selector: 'ex-use12hours', + standalone: true, + imports: [FormsModule, XTimePickerComponent], templateUrl: './use12hours.component.html', styleUrls: ['./use12hours.component.scss'] }) diff --git a/lib/ng-nest/ui/time-picker/examples/index.ts b/lib/ng-nest/ui/time-picker/examples/index.ts new file mode 100644 index 000000000..074ec6683 --- /dev/null +++ b/lib/ng-nest/ui/time-picker/examples/index.ts @@ -0,0 +1,10 @@ +export * from './zh_CN/default/bordered/bordered.component'; +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/disabled/disabled.component'; +export * from './zh_CN/default/hour-minute/hour-minute.component'; +export * from './zh_CN/default/label/label.component'; +export * from './zh_CN/default/preset/preset.component'; +export * from './zh_CN/default/required/required.component'; +export * from './zh_CN/default/size/size.component'; +export * from './zh_CN/default/step/step.component'; +export * from './zh_CN/default/use12hours/use12hours.component'; diff --git a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/bordered/bordered.component.html b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/bordered/bordered.component.html index d8dc8a651..330cc6539 100644 --- a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/bordered/bordered.component.html +++ b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/bordered/bordered.component.html @@ -1,17 +1,21 @@ - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/bordered/bordered.component.scss b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/bordered/bordered.component.scss index 3b85eac28..b4943baa0 100644 --- a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/bordered/bordered.component.scss +++ b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/bordered/bordered.component.scss @@ -1,8 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } - x-row > x-col { - width: 15rem; - } } diff --git a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/bordered/bordered.component.ts b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/bordered/bordered.component.ts index 92c38bb55..65cb02e6d 100644 --- a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/bordered/bordered.component.ts +++ b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/bordered/bordered.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XTimePickerComponent } from '@ng-nest/ui/time-picker'; @Component({ selector: 'ex-bordered', + standalone: true, + imports: [FormsModule, XTimePickerComponent], templateUrl: './bordered.component.html', styleUrls: ['./bordered.component.scss'] }) diff --git a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/default/default.component.html b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/default/default.component.html index b912be868..b6e7cd354 100644 --- a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/default/default.component.html +++ b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/default/default.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/default/default.component.scss b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/default/default.component.scss index 587bbfb85..b4943baa0 100644 --- a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/default/default.component.scss +++ b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/default/default.component.scss @@ -1,8 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } - x-row > x-col { - width: 7rem; - } } diff --git a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/default/default.component.ts index 2faa60f32..17a0742e3 100644 --- a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/default/default.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XTimePickerComponent } from '@ng-nest/ui/time-picker'; @Component({ selector: 'ex-default', + standalone: true, + imports: [FormsModule, XTimePickerComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/disabled/disabled.component.html b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/disabled/disabled.component.html index 5c81bf67f..81ff49e6b 100644 --- a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/disabled/disabled.component.html +++ b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/disabled/disabled.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/disabled/disabled.component.scss b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/disabled/disabled.component.scss index 587bbfb85..b4943baa0 100644 --- a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/disabled/disabled.component.scss +++ b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/disabled/disabled.component.scss @@ -1,8 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } - x-row > x-col { - width: 7rem; - } } diff --git a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/disabled/disabled.component.ts b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/disabled/disabled.component.ts index 292576ae7..ce011bb56 100644 --- a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/disabled/disabled.component.ts +++ b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/disabled/disabled.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XTimePickerComponent } from '@ng-nest/ui/time-picker'; @Component({ selector: 'ex-disabled', + standalone: true, + imports: [FormsModule, XTimePickerComponent], templateUrl: './disabled.component.html', styleUrls: ['./disabled.component.scss'] }) diff --git a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/hour-minute/hour-minute.component.html b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/hour-minute/hour-minute.component.html index 09db529db..4281b0e4d 100644 --- a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/hour-minute/hour-minute.component.html +++ b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/hour-minute/hour-minute.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/hour-minute/hour-minute.component.scss b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/hour-minute/hour-minute.component.scss index 587bbfb85..b4943baa0 100644 --- a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/hour-minute/hour-minute.component.scss +++ b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/hour-minute/hour-minute.component.scss @@ -1,8 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } - x-row > x-col { - width: 7rem; - } } diff --git a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/hour-minute/hour-minute.component.ts b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/hour-minute/hour-minute.component.ts index 1e737c9c9..8f0c971ce 100644 --- a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/hour-minute/hour-minute.component.ts +++ b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/hour-minute/hour-minute.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XTimePickerComponent } from '@ng-nest/ui/time-picker'; @Component({ selector: 'ex-hour-minute', + standalone: true, + imports: [FormsModule, XTimePickerComponent], templateUrl: './hour-minute.component.html', styleUrls: ['./hour-minute.component.scss'] }) diff --git a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/label/label.component.html b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/label/label.component.html index c7bdcba01..b439bff70 100644 --- a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/label/label.component.html +++ b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/label/label.component.html @@ -1,20 +1,12 @@ - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/label/label.component.scss b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/label/label.component.scss index f36cc6951..b4943baa0 100644 --- a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/label/label.component.scss +++ b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/label/label.component.scss @@ -1,8 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } - x-row > x-col { - width: 10rem; - } } diff --git a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/label/label.component.ts b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/label/label.component.ts index cd229f9d6..5dbe917cc 100644 --- a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/label/label.component.ts +++ b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/label/label.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XTimePickerComponent } from '@ng-nest/ui/time-picker'; @Component({ selector: 'ex-label', + standalone: true, + imports: [FormsModule, XTimePickerComponent], templateUrl: './label.component.html', styleUrls: ['./label.component.scss'] }) diff --git a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/preset/preset.component.scss b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/preset/preset.component.scss deleted file mode 100644 index dc9093b45..000000000 --- a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/preset/preset.component.scss +++ /dev/null @@ -1,2 +0,0 @@ -:host { -} diff --git a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/preset/preset.component.ts b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/preset/preset.component.ts index 5255d147c..0c903ef5b 100644 --- a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/preset/preset.component.ts +++ b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/preset/preset.component.ts @@ -1,10 +1,13 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; import { XAddHours } from '@ng-nest/ui/core'; +import { XTimePickerComponent } from '@ng-nest/ui/time-picker'; @Component({ selector: 'ex-preset', - templateUrl: './preset.component.html', - styleUrls: ['./preset.component.scss'] + standalone: true, + imports: [FormsModule, XTimePickerComponent], + templateUrl: './preset.component.html' }) export class ExPresetComponent { model: any; diff --git a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/required/required.component.html b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/required/required.component.html index 7cb09e12e..966f01ec9 100644 --- a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/required/required.component.html +++ b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/required/required.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/required/required.component.scss b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/required/required.component.scss index 587bbfb85..b4943baa0 100644 --- a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/required/required.component.scss +++ b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/required/required.component.scss @@ -1,8 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } - x-row > x-col { - width: 7rem; - } } diff --git a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/required/required.component.ts b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/required/required.component.ts index 4ac889b8b..1c7e01017 100644 --- a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/required/required.component.ts +++ b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/required/required.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XTimePickerComponent } from '@ng-nest/ui/time-picker'; @Component({ selector: 'ex-required', + standalone: true, + imports: [FormsModule, XTimePickerComponent], templateUrl: './required.component.html', styleUrls: ['./required.component.scss'] }) diff --git a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/size/size.component.html b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/size/size.component.html index 855afbdb8..66b032e20 100644 --- a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/size/size.component.html +++ b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/size/size.component.html @@ -1,18 +1,16 @@ - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/size/size.component.scss b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/size/size.component.scss index db47dab4e..5e83058ed 100644 --- a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/size/size.component.scss +++ b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/size/size.component.scss @@ -1,9 +1,5 @@ :host { - x-row { - width: 20rem; - } - x-row > x-col { + .row { margin-top: 1rem; - width: 15rem; } } diff --git a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/size/size.component.ts b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/size/size.component.ts index 2ea3351ce..aff1db6ba 100644 --- a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/size/size.component.ts +++ b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/size/size.component.ts @@ -1,8 +1,13 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; import { XSize } from '@ng-nest/ui/core'; +import { XRadioComponent } from '@ng-nest/ui/radio'; +import { XTimePickerComponent } from '@ng-nest/ui/time-picker'; @Component({ selector: 'ex-size', + standalone: true, + imports: [FormsModule, XTimePickerComponent, XRadioComponent], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/step/step.component.scss b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/step/step.component.scss deleted file mode 100644 index dc9093b45..000000000 --- a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/step/step.component.scss +++ /dev/null @@ -1,2 +0,0 @@ -:host { -} diff --git a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/step/step.component.ts b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/step/step.component.ts index 4e64ba3fb..654e2baf6 100644 --- a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/step/step.component.ts +++ b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/step/step.component.ts @@ -1,9 +1,12 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XTimePickerComponent } from '@ng-nest/ui/time-picker'; @Component({ selector: 'ex-step', - templateUrl: './step.component.html', - styleUrls: ['./step.component.scss'] + standalone: true, + imports: [FormsModule, XTimePickerComponent], + templateUrl: './step.component.html' }) export class ExStepComponent { model: any; diff --git a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/use12hours/use12hours.component.html b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/use12hours/use12hours.component.html index 761772b63..ceeae4ac2 100644 --- a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/use12hours/use12hours.component.html +++ b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/use12hours/use12hours.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/use12hours/use12hours.component.scss b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/use12hours/use12hours.component.scss index 587bbfb85..b4943baa0 100644 --- a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/use12hours/use12hours.component.scss +++ b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/use12hours/use12hours.component.scss @@ -1,8 +1,5 @@ :host { - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } - x-row > x-col { - width: 7rem; - } } diff --git a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/use12hours/use12hours.component.ts b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/use12hours/use12hours.component.ts index 8e785632e..540c58de3 100644 --- a/lib/ng-nest/ui/time-picker/examples/zh_CN/default/use12hours/use12hours.component.ts +++ b/lib/ng-nest/ui/time-picker/examples/zh_CN/default/use12hours/use12hours.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XTimePickerComponent } from '@ng-nest/ui/time-picker'; @Component({ selector: 'ex-use12hours', + standalone: true, + imports: [FormsModule, XTimePickerComponent], templateUrl: './use12hours.component.html', styleUrls: ['./use12hours.component.scss'] }) diff --git a/lib/ng-nest/ui/time-picker/time-picker-frame.component.ts b/lib/ng-nest/ui/time-picker/time-picker-frame.component.ts index f9a1271e5..69af58fd2 100644 --- a/lib/ng-nest/ui/time-picker/time-picker-frame.component.ts +++ b/lib/ng-nest/ui/time-picker/time-picker-frame.component.ts @@ -8,16 +8,31 @@ import { Output, SimpleChanges, ViewChild, - ViewEncapsulation + ViewEncapsulation, + inject } from '@angular/core'; import { XTimePickerDisabledTime, XTimePickerFramePrefix, XTimePickerType } from './time-picker.property'; -import { reqAnimFrame, XBoolean, XIdentity, XIsChange, XIsEmpty, XIsFunction, XIsNull, XIsNumber } from '@ng-nest/ui/core'; +import { + reqAnimFrame, + XBoolean, + XIdentity, + XIsChange, + XIsEmpty, + XIsFunction, + XIsNull, + XIsNumber +} from '@ng-nest/ui/core'; import { XI18nService, XI18nTimePicker } from '@ng-nest/ui/i18n'; import { takeUntil, map } from 'rxjs/operators'; import { Subject } from 'rxjs'; +import { XListComponent } from '@ng-nest/ui/list'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; @Component({ selector: `${XTimePickerFramePrefix}`, + standalone: true, + imports: [CommonModule, FormsModule, XListComponent], templateUrl: './time-picker-frame.component.html', styleUrls: ['./time-picker-frame.component.scss'], encapsulation: ViewEncapsulation.None, @@ -51,6 +66,8 @@ export class XTimePickerFrameComponent { locale: XI18nTimePicker = {}; isInit = false; private _unSubject = new Subject(); + private cdr = inject(ChangeDetectorRef); + private i18n = inject(XI18nService); ngOnChanges(changes: SimpleChanges): void { const { value, disabledTimeParam } = changes; @@ -83,8 +100,6 @@ export class XTimePickerFrameComponent { this.setScrollTop(); } - constructor(private cdr: ChangeDetectorRef, private i18n: XI18nService) {} - setDataInit() { this.setHourData(); this.setMinuteData(); @@ -189,7 +204,14 @@ export class XTimePickerFrameComponent { setNow() { const def = new Date('1970-01-01'); const now = new Date(); - return new Date(def.getFullYear(), def.getMonth(), def.getDate(), now.getHours(), now.getMinutes(), now.getSeconds()); + return new Date( + def.getFullYear(), + def.getMonth(), + def.getDate(), + now.getHours(), + now.getMinutes(), + now.getSeconds() + ); } setZero() { @@ -228,7 +250,12 @@ export class XTimePickerFrameComponent { this.selected('use12Hour', this.use12HoursRef?.nativeElement, this.use12Hour, animating); } - selected(type: 'hour' | 'minute' | 'second' | 'use12Hour', ele?: HTMLElement, num?: number | string, animating = false) { + selected( + type: 'hour' | 'minute' | 'second' | 'use12Hour', + ele?: HTMLElement, + num?: number | string, + animating = false + ) { if (!ele || XIsNull(num)) return; if (this.scrollAnimating[ele.className]) return; let len = Number(num); diff --git a/lib/ng-nest/ui/time-picker/time-picker-portal.component.ts b/lib/ng-nest/ui/time-picker/time-picker-portal.component.ts index d6c826529..559a32d14 100644 --- a/lib/ng-nest/ui/time-picker/time-picker-portal.component.ts +++ b/lib/ng-nest/ui/time-picker/time-picker-portal.component.ts @@ -4,20 +4,30 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, OnInit, - Renderer2, OnDestroy, HostBinding, - HostListener + HostListener, + inject } from '@angular/core'; -import { XTimePickerDisabledTime, XTimePickerPortalPrefix, XTimePickerPreset, XTimePickerType } from './time-picker.property'; +import { + XTimePickerDisabledTime, + XTimePickerPortalPrefix, + XTimePickerPreset, + XTimePickerType +} from './time-picker.property'; import { XBoolean, XConnectBaseAnimation, XPositionTopBottom } from '@ng-nest/ui/core'; import { Subject } from 'rxjs'; import { map, takeUntil } from 'rxjs/operators'; import { XInputComponent } from '@ng-nest/ui/input'; import { XI18nService, XI18nTimePicker } from '@ng-nest/ui/i18n'; +import { XTimePickerFrameComponent } from './time-picker-frame.component'; +import { CommonModule } from '@angular/common'; +import { XButtonComponent } from '@ng-nest/ui/button'; @Component({ selector: `${XTimePickerPortalPrefix}`, + standalone: true, + imports: [CommonModule, XTimePickerFrameComponent, XButtonComponent], templateUrl: './time-picker-portal.component.html', styleUrls: ['./time-picker-portal.component.scss'], encapsulation: ViewEncapsulation.None, @@ -51,8 +61,8 @@ export class XTimePickerPortalComponent implements OnInit, OnDestroy { locale: XI18nTimePicker = {}; private _unSubject = new Subject(); - - constructor(public renderer: Renderer2, public cdr: ChangeDetectorRef, private i18n: XI18nService) {} + private cdr = inject(ChangeDetectorRef); + private i18n = inject(XI18nService); ngOnInit(): void { this.valueChange.pipe(takeUntil(this._unSubject)).subscribe((x: any) => { diff --git a/lib/ng-nest/ui/time-picker/time-picker.component.spec.ts b/lib/ng-nest/ui/time-picker/time-picker.component.spec.ts index ee3282360..ff7269e22 100644 --- a/lib/ng-nest/ui/time-picker/time-picker.component.spec.ts +++ b/lib/ng-nest/ui/time-picker/time-picker.component.spec.ts @@ -9,8 +9,8 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { XTimePickerPrefix } from './time-picker.property'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XThemeComponent } from '@ng-nest/ui/theme'; +import { XRadioComponent } from '@ng-nest/ui/radio'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XTimePickerPrefix, () => { @@ -19,13 +19,13 @@ describe(XTimePickerPrefix, () => { imports: [ HttpClientTestingModule, BrowserAnimationsModule, - XThemeModule, + XThemeComponent, XTimePickerModule, FormsModule, ReactiveFormsModule, XRowComponent, XColComponent, - XRadioModule + XRadioComponent ], declarations: [ TestXTimePickerComponent, diff --git a/lib/ng-nest/ui/time-picker/time-picker.component.ts b/lib/ng-nest/ui/time-picker/time-picker.component.ts index 3299c3f98..04fee9842 100644 --- a/lib/ng-nest/ui/time-picker/time-picker.component.ts +++ b/lib/ng-nest/ui/time-picker/time-picker.component.ts @@ -11,26 +11,36 @@ import { ElementRef, ViewContainerRef, ViewChild, - inject + inject, + AfterViewInit, + OnDestroy } from '@angular/core'; import { XTimePickerPrefix, XTimePickerProperty } from './time-picker.property'; import { XIsEmpty, XIsDate, XIsNumber, XCorner, XClearClass, XIsString, XParents } from '@ng-nest/ui/core'; import { XInputComponent } from '@ng-nest/ui/input'; import { DOCUMENT, DatePipe } from '@angular/common'; -import { Overlay, OverlayConfig, FlexibleConnectedPositionStrategy, ConnectedOverlayPositionChange } from '@angular/cdk/overlay'; +import { + Overlay, + OverlayConfig, + FlexibleConnectedPositionStrategy, + ConnectedOverlayPositionChange +} from '@angular/cdk/overlay'; import { takeUntil, map, filter } from 'rxjs/operators'; import { XValueAccessor } from '@ng-nest/ui/base-form'; import { XI18nService, XI18nTimePicker } from '@ng-nest/ui/i18n'; +import { FormsModule } from '@angular/forms'; @Component({ selector: `${XTimePickerPrefix}`, + standalone: true, + imports: [FormsModule, XInputComponent], templateUrl: './time-picker.component.html', styleUrls: ['./time-picker.component.scss'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, providers: [XValueAccessor(XTimePickerComponent), DatePipe] }) -export class XTimePickerComponent extends XTimePickerProperty implements OnInit { +export class XTimePickerComponent extends XTimePickerProperty implements OnInit, AfterViewInit, OnDestroy { @ViewChild('datePicker', { static: true }) datePicker!: ElementRef; @ViewChild('inputCom', { static: true }) inputCom!: XInputComponent; @@ -85,18 +95,14 @@ export class XTimePickerComponent extends XTimePickerProperty implements OnInit } } - constructor( - public renderer: Renderer2, - public elementRef: ElementRef, - public override cdr: ChangeDetectorRef, - private portalService: XPortalService, - private viewContainerRef: ViewContainerRef, - private datePipe: DatePipe, - private overlay: Overlay, - private i18n: XI18nService - ) { - super(); - } + private renderer = inject(Renderer2); + private elementRef = inject(ElementRef); + override cdr = inject(ChangeDetectorRef); + private portalService = inject(XPortalService); + private viewContainerRef = inject(ViewContainerRef); + private datePipe = inject(DatePipe); + private overlay = inject(Overlay); + private i18n = inject(XI18nService); ngOnInit() { this.setFlex(this.datePicker.nativeElement, this.renderer, this.justify, this.align, this.direction); @@ -295,7 +301,10 @@ export class XTimePickerComponent extends XTimePickerProperty implements OnInit let dt = new Date(date); let hour = dt.getHours(); let suffix = hour >= 12 ? this.locale.pm : this.locale.am; - this.displayValue = `${this.datePipe.transform(dt.setHours(hour === 0 ? 12 : hour > 12 ? hour - 12 : hour), this.format)} ${suffix}`; + this.displayValue = `${this.datePipe.transform( + dt.setHours(hour === 0 ? 12 : hour > 12 ? hour - 12 : hour), + this.format + )} ${suffix}`; } else { this.displayValue = this.datePipe.transform(date, this.format); } diff --git a/lib/ng-nest/ui/time-picker/time-picker.module.ts b/lib/ng-nest/ui/time-picker/time-picker.module.ts index 0907d8b7a..82884628c 100644 --- a/lib/ng-nest/ui/time-picker/time-picker.module.ts +++ b/lib/ng-nest/ui/time-picker/time-picker.module.ts @@ -1,30 +1,9 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { XInputComponent } from '@ng-nest/ui/input'; -import { XIconComponent } from '@ng-nest/ui/icon'; -import { XButtonComponent } from '@ng-nest/ui/button'; -import { XListComponent } from '@ng-nest/ui/list'; -import { XControlValueAccessor } from '@ng-nest/ui/base-form'; import { XTimePickerComponent } from './time-picker.component'; -import { XTimePickerPortalComponent } from './time-picker-portal.component'; -import { XTimePickerProperty } from './time-picker.property'; import { XTimePickerFrameComponent } from './time-picker-frame.component'; -import { XI18nDirective } from '@ng-nest/ui/i18n'; @NgModule({ - declarations: [XTimePickerComponent, XTimePickerPortalComponent, XTimePickerFrameComponent, XTimePickerProperty], - exports: [XTimePickerComponent, XTimePickerPortalComponent, XTimePickerFrameComponent], - imports: [ - CommonModule, - FormsModule, - ReactiveFormsModule, - XInputComponent, - XListComponent, - XButtonComponent, - XIconComponent, - XControlValueAccessor, - XI18nDirective - ] + exports: [XTimePickerComponent, XTimePickerFrameComponent], + imports: [XTimePickerComponent, XTimePickerFrameComponent] }) export class XTimePickerModule {} diff --git a/lib/ng-nest/ui/time-range/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/time-range/examples/en_US/default/default/default.component.ts index e41d8970b..91e89b221 100644 --- a/lib/ng-nest/ui/time-range/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/time-range/examples/en_US/default/default/default.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XTimeRangePipe } from '@ng-nest/ui/time-range'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XTimeRangePipe], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/time-range/examples/index.ts b/lib/ng-nest/ui/time-range/examples/index.ts new file mode 100644 index 000000000..b94cf3f92 --- /dev/null +++ b/lib/ng-nest/ui/time-range/examples/index.ts @@ -0,0 +1 @@ +export * from './zh_CN/default/default/default.component'; diff --git a/lib/ng-nest/ui/time-range/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/time-range/examples/zh_CN/default/default/default.component.ts index e41d8970b..91e89b221 100644 --- a/lib/ng-nest/ui/time-range/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/time-range/examples/zh_CN/default/default/default.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XTimeRangePipe } from '@ng-nest/ui/time-range'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XTimeRangePipe], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/time-range/time-range.module.ts b/lib/ng-nest/ui/time-range/time-range.module.ts index a1fee6124..62ffc741a 100644 --- a/lib/ng-nest/ui/time-range/time-range.module.ts +++ b/lib/ng-nest/ui/time-range/time-range.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { XTimeRangePipe } from './time-range.pipe'; @NgModule({ - declarations: [XTimeRangePipe], - exports: [XTimeRangePipe] + exports: [XTimeRangePipe], + imports: [XTimeRangePipe] }) export class XTimeRangeModule {} diff --git a/lib/ng-nest/ui/time-range/time-range.pipe.spec.ts b/lib/ng-nest/ui/time-range/time-range.pipe.spec.ts index 3ae3cc694..7cc345a7c 100644 --- a/lib/ng-nest/ui/time-range/time-range.pipe.spec.ts +++ b/lib/ng-nest/ui/time-range/time-range.pipe.spec.ts @@ -1,13 +1,13 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { Component } from '@angular/core'; -import { XTimeRangeModule } from '@ng-nest/ui/time-range'; +import { XTimeRangePipe } from '@ng-nest/ui/time-range'; import { XTimeRangePrefix } from './time-range.property'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XTimeRangePrefix, () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, XTimeRangeModule], + imports: [HttpClientTestingModule, XTimeRangePipe], declarations: [TestXTimeRangeComponent] }).compileComponents(); }); diff --git a/lib/ng-nest/ui/time-range/time-range.pipe.ts b/lib/ng-nest/ui/time-range/time-range.pipe.ts index 68158326e..1d16be644 100644 --- a/lib/ng-nest/ui/time-range/time-range.pipe.ts +++ b/lib/ng-nest/ui/time-range/time-range.pipe.ts @@ -11,7 +11,7 @@ export const timeUnits: Array<[string, number]> = [ ['S', 1] // million seconds ]; -@Pipe({ name: `${XTimeRangePrefix}` }) +@Pipe({ name: `${XTimeRangePrefix}`, standalone: true }) export class XTimeRangePipe implements PipeTransform { transform(value: string | number, format: string = 'HH:mm:ss'): string { let duration = Number(value || 0); diff --git a/lib/ng-nest/ui/timeline/examples/en_US/default/color/color.component.ts b/lib/ng-nest/ui/timeline/examples/en_US/default/color/color.component.ts index a56eea385..0c7359576 100644 --- a/lib/ng-nest/ui/timeline/examples/en_US/default/color/color.component.ts +++ b/lib/ng-nest/ui/timeline/examples/en_US/default/color/color.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; -import { XTimelineNode } from '@ng-nest/ui/timeline'; +import { XTimelineComponent, XTimelineNode } from '@ng-nest/ui/timeline'; import { XAddDays, XAddHours } from '@ng-nest/ui/core'; @Component({ selector: 'ex-color', + standalone: true, + imports: [XTimelineComponent], templateUrl: './color.component.html' }) export class ExColorComponent { diff --git a/lib/ng-nest/ui/timeline/examples/en_US/default/custom/custom.component.ts b/lib/ng-nest/ui/timeline/examples/en_US/default/custom/custom.component.ts index f5c2b9abf..32a9c2bc0 100644 --- a/lib/ng-nest/ui/timeline/examples/en_US/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/timeline/examples/en_US/default/custom/custom.component.ts @@ -1,9 +1,13 @@ import { Component } from '@angular/core'; -import { XTimelineNode } from '@ng-nest/ui/timeline'; +import { XTimelineComponent, XTimelineNode } from '@ng-nest/ui/timeline'; import { XAddDays, XAddHours } from '@ng-nest/ui/core'; +import { XCardComponent } from '@ng-nest/ui/card'; +import { XTimeAgoPipe } from '@ng-nest/ui/time-ago'; @Component({ selector: 'ex-custom', + standalone: true, + imports: [XTimelineComponent, XCardComponent, XTimeAgoPipe], templateUrl: './custom.component.html', styleUrls: ['./custom.component.scss'] }) diff --git a/lib/ng-nest/ui/timeline/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/timeline/examples/en_US/default/default/default.component.ts index 94355b1f8..6c3e64c1b 100644 --- a/lib/ng-nest/ui/timeline/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/timeline/examples/en_US/default/default/default.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; -import { XTimelineNode } from '@ng-nest/ui/timeline'; +import { XTimelineComponent, XTimelineNode } from '@ng-nest/ui/timeline'; import { XAddDays, XAddHours } from '@ng-nest/ui/core'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XTimelineComponent], templateUrl: './default.component.html' }) export class ExDefaultComponent { diff --git a/lib/ng-nest/ui/timeline/examples/en_US/default/icon/icon.component.ts b/lib/ng-nest/ui/timeline/examples/en_US/default/icon/icon.component.ts index 2b3547367..18a37d862 100644 --- a/lib/ng-nest/ui/timeline/examples/en_US/default/icon/icon.component.ts +++ b/lib/ng-nest/ui/timeline/examples/en_US/default/icon/icon.component.ts @@ -1,9 +1,12 @@ import { Component } from '@angular/core'; -import { XTimelineNode } from '@ng-nest/ui/timeline'; +import { XTimelineComponent, XTimelineNode } from '@ng-nest/ui/timeline'; import { XAddDays, XAddHours } from '@ng-nest/ui/core'; +import { XCardComponent } from '@ng-nest/ui/card'; @Component({ selector: 'ex-icon', + standalone: true, + imports: [XTimelineComponent, XCardComponent], templateUrl: './icon.component.html' }) export class ExIconComponent { diff --git a/lib/ng-nest/ui/timeline/examples/en_US/default/loading/loading.component.ts b/lib/ng-nest/ui/timeline/examples/en_US/default/loading/loading.component.ts index fce8658f3..3ec56694f 100644 --- a/lib/ng-nest/ui/timeline/examples/en_US/default/loading/loading.component.ts +++ b/lib/ng-nest/ui/timeline/examples/en_US/default/loading/loading.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; -import { XTimelineNode } from '@ng-nest/ui/timeline'; +import { XTimelineComponent, XTimelineNode } from '@ng-nest/ui/timeline'; import { XAddDays, XAddHours } from '@ng-nest/ui/core'; @Component({ selector: 'ex-loading', + standalone: true, + imports: [XTimelineComponent], templateUrl: './loading.component.html' }) export class ExLoadingComponent { diff --git a/lib/ng-nest/ui/timeline/examples/en_US/default/mode/mode.component.ts b/lib/ng-nest/ui/timeline/examples/en_US/default/mode/mode.component.ts index 2a0079709..d4472e58c 100644 --- a/lib/ng-nest/ui/timeline/examples/en_US/default/mode/mode.component.ts +++ b/lib/ng-nest/ui/timeline/examples/en_US/default/mode/mode.component.ts @@ -1,9 +1,14 @@ import { Component } from '@angular/core'; -import { XTimelineMode, XTimelineNode } from '@ng-nest/ui/timeline'; +import { XTimelineComponent, XTimelineMode, XTimelineNode } from '@ng-nest/ui/timeline'; import { XAddDays, XAddHours } from '@ng-nest/ui/core'; +import { XRadioComponent } from '@ng-nest/ui/radio'; +import { FormsModule } from '@angular/forms'; +import { XTimeAgoPipe } from '@ng-nest/ui/time-ago'; @Component({ selector: 'ex-mode', + standalone: true, + imports: [FormsModule, XTimelineComponent, XRadioComponent, XTimeAgoPipe], templateUrl: './mode.component.html' }) export class ExModeComponent { diff --git a/lib/ng-nest/ui/timeline/examples/en_US/default/size/size.component.ts b/lib/ng-nest/ui/timeline/examples/en_US/default/size/size.component.ts index bb7376ce9..f49948168 100644 --- a/lib/ng-nest/ui/timeline/examples/en_US/default/size/size.component.ts +++ b/lib/ng-nest/ui/timeline/examples/en_US/default/size/size.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; -import { XTimelineNode } from '@ng-nest/ui/timeline'; +import { XTimelineComponent, XTimelineNode } from '@ng-nest/ui/timeline'; import { XAddDays, XAddHours } from '@ng-nest/ui/core'; @Component({ selector: 'ex-size', + standalone: true, + imports: [XTimelineComponent], templateUrl: './size.component.html' }) export class ExSizeComponent { diff --git a/lib/ng-nest/ui/timeline/examples/en_US/default/type/type.component.ts b/lib/ng-nest/ui/timeline/examples/en_US/default/type/type.component.ts index c7013b31d..1c9c4ab5c 100644 --- a/lib/ng-nest/ui/timeline/examples/en_US/default/type/type.component.ts +++ b/lib/ng-nest/ui/timeline/examples/en_US/default/type/type.component.ts @@ -1,9 +1,12 @@ import { Component } from '@angular/core'; -import { XTimelineNode } from '@ng-nest/ui/timeline'; +import { XTimelineComponent, XTimelineNode } from '@ng-nest/ui/timeline'; import { XAddDays, XAddHours } from '@ng-nest/ui/core'; +import { XCardComponent } from '@ng-nest/ui/card'; @Component({ selector: 'ex-type', + standalone: true, + imports: [XTimelineComponent, XCardComponent], templateUrl: './type.component.html' }) export class ExTypeComponent { diff --git a/lib/ng-nest/ui/timeline/examples/index.ts b/lib/ng-nest/ui/timeline/examples/index.ts new file mode 100644 index 000000000..0ed7ce8fe --- /dev/null +++ b/lib/ng-nest/ui/timeline/examples/index.ts @@ -0,0 +1,8 @@ +export * from './zh_CN/default/color/color.component'; +export * from './zh_CN/default/custom/custom.component'; +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/icon/icon.component'; +export * from './zh_CN/default/loading/loading.component'; +export * from './zh_CN/default/mode/mode.component'; +export * from './zh_CN/default/size/size.component'; +export * from './zh_CN/default/type/type.component'; diff --git a/lib/ng-nest/ui/timeline/examples/zh_CN/default/color/color.component.ts b/lib/ng-nest/ui/timeline/examples/zh_CN/default/color/color.component.ts index 9f5c288ae..c674d98d5 100644 --- a/lib/ng-nest/ui/timeline/examples/zh_CN/default/color/color.component.ts +++ b/lib/ng-nest/ui/timeline/examples/zh_CN/default/color/color.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; -import { XTimelineNode } from '@ng-nest/ui/timeline'; +import { XTimelineComponent, XTimelineNode } from '@ng-nest/ui/timeline'; import { XAddDays, XAddHours } from '@ng-nest/ui/core'; @Component({ selector: 'ex-color', + standalone: true, + imports: [XTimelineComponent], templateUrl: './color.component.html' }) export class ExColorComponent { diff --git a/lib/ng-nest/ui/timeline/examples/zh_CN/default/custom/custom.component.ts b/lib/ng-nest/ui/timeline/examples/zh_CN/default/custom/custom.component.ts index 70f0285f4..01f30cba2 100644 --- a/lib/ng-nest/ui/timeline/examples/zh_CN/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/timeline/examples/zh_CN/default/custom/custom.component.ts @@ -1,9 +1,13 @@ import { Component } from '@angular/core'; -import { XTimelineNode } from '@ng-nest/ui/timeline'; +import { XTimelineComponent, XTimelineNode } from '@ng-nest/ui/timeline'; import { XAddDays, XAddHours } from '@ng-nest/ui/core'; +import { XCardComponent } from '@ng-nest/ui/card'; +import { XTimeAgoPipe } from '@ng-nest/ui/time-ago'; @Component({ selector: 'ex-custom', + standalone: true, + imports: [XTimelineComponent, XCardComponent, XTimeAgoPipe], templateUrl: './custom.component.html', styleUrls: ['./custom.component.scss'] }) diff --git a/lib/ng-nest/ui/timeline/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/timeline/examples/zh_CN/default/default/default.component.ts index 811650d1c..5f8059126 100644 --- a/lib/ng-nest/ui/timeline/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/timeline/examples/zh_CN/default/default/default.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; -import { XTimelineNode } from '@ng-nest/ui/timeline'; +import { XTimelineComponent, XTimelineNode } from '@ng-nest/ui/timeline'; import { XAddDays, XAddHours } from '@ng-nest/ui/core'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XTimelineComponent], templateUrl: './default.component.html' }) export class ExDefaultComponent { diff --git a/lib/ng-nest/ui/timeline/examples/zh_CN/default/icon/icon.component.ts b/lib/ng-nest/ui/timeline/examples/zh_CN/default/icon/icon.component.ts index 7fb24be06..b0c8de2d4 100644 --- a/lib/ng-nest/ui/timeline/examples/zh_CN/default/icon/icon.component.ts +++ b/lib/ng-nest/ui/timeline/examples/zh_CN/default/icon/icon.component.ts @@ -1,9 +1,12 @@ import { Component } from '@angular/core'; -import { XTimelineNode } from '@ng-nest/ui/timeline'; +import { XTimelineComponent, XTimelineNode } from '@ng-nest/ui/timeline'; import { XAddDays, XAddHours } from '@ng-nest/ui/core'; +import { XCardComponent } from '@ng-nest/ui/card'; @Component({ selector: 'ex-icon', + standalone: true, + imports: [XTimelineComponent, XCardComponent], templateUrl: './icon.component.html' }) export class ExIconComponent { diff --git a/lib/ng-nest/ui/timeline/examples/zh_CN/default/loading/loading.component.ts b/lib/ng-nest/ui/timeline/examples/zh_CN/default/loading/loading.component.ts index a6a23cd60..da26184f4 100644 --- a/lib/ng-nest/ui/timeline/examples/zh_CN/default/loading/loading.component.ts +++ b/lib/ng-nest/ui/timeline/examples/zh_CN/default/loading/loading.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; -import { XTimelineNode } from '@ng-nest/ui/timeline'; +import { XTimelineComponent, XTimelineNode } from '@ng-nest/ui/timeline'; import { XAddDays, XAddHours } from '@ng-nest/ui/core'; @Component({ selector: 'ex-loading', + standalone: true, + imports: [XTimelineComponent], templateUrl: './loading.component.html' }) export class ExLoadingComponent { @@ -34,4 +36,4 @@ export class ExLoadingComponent { loading: true } ]; -} \ No newline at end of file +} diff --git a/lib/ng-nest/ui/timeline/examples/zh_CN/default/mode/mode.component.ts b/lib/ng-nest/ui/timeline/examples/zh_CN/default/mode/mode.component.ts index 52579cbcd..96675eefc 100644 --- a/lib/ng-nest/ui/timeline/examples/zh_CN/default/mode/mode.component.ts +++ b/lib/ng-nest/ui/timeline/examples/zh_CN/default/mode/mode.component.ts @@ -1,9 +1,14 @@ import { Component } from '@angular/core'; -import { XTimelineMode, XTimelineNode } from '@ng-nest/ui/timeline'; +import { XTimelineComponent, XTimelineMode, XTimelineNode } from '@ng-nest/ui/timeline'; import { XAddDays, XAddHours } from '@ng-nest/ui/core'; +import { XRadioComponent } from '@ng-nest/ui/radio'; +import { FormsModule } from '@angular/forms'; +import { XTimeAgoPipe } from '@ng-nest/ui/time-ago'; @Component({ selector: 'ex-mode', + standalone: true, + imports: [FormsModule, XTimelineComponent, XRadioComponent, XTimeAgoPipe], templateUrl: './mode.component.html' }) export class ExModeComponent { diff --git a/lib/ng-nest/ui/timeline/examples/zh_CN/default/size/size.component.ts b/lib/ng-nest/ui/timeline/examples/zh_CN/default/size/size.component.ts index 688eb054b..26ff49867 100644 --- a/lib/ng-nest/ui/timeline/examples/zh_CN/default/size/size.component.ts +++ b/lib/ng-nest/ui/timeline/examples/zh_CN/default/size/size.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; -import { XTimelineNode } from '@ng-nest/ui/timeline'; +import { XTimelineComponent, XTimelineNode } from '@ng-nest/ui/timeline'; import { XAddDays, XAddHours } from '@ng-nest/ui/core'; @Component({ selector: 'ex-size', + standalone: true, + imports: [XTimelineComponent], templateUrl: './size.component.html' }) export class ExSizeComponent { diff --git a/lib/ng-nest/ui/timeline/examples/zh_CN/default/type/type.component.ts b/lib/ng-nest/ui/timeline/examples/zh_CN/default/type/type.component.ts index c2350d43f..7a8faf86a 100644 --- a/lib/ng-nest/ui/timeline/examples/zh_CN/default/type/type.component.ts +++ b/lib/ng-nest/ui/timeline/examples/zh_CN/default/type/type.component.ts @@ -1,9 +1,12 @@ import { Component } from '@angular/core'; -import { XTimelineNode } from '@ng-nest/ui/timeline'; +import { XTimelineComponent, XTimelineNode } from '@ng-nest/ui/timeline'; import { XAddDays, XAddHours } from '@ng-nest/ui/core'; +import { XCardComponent } from '@ng-nest/ui/card'; @Component({ selector: 'ex-type', + standalone: true, + imports: [XTimelineComponent, XCardComponent], templateUrl: './type.component.html' }) export class ExTypeComponent { diff --git a/lib/ng-nest/ui/timeline/timeline.component.spec.ts b/lib/ng-nest/ui/timeline/timeline.component.spec.ts index 91cb4d6f5..992bf0607 100644 --- a/lib/ng-nest/ui/timeline/timeline.component.spec.ts +++ b/lib/ng-nest/ui/timeline/timeline.component.spec.ts @@ -1,16 +1,14 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XTimelineComponent } from './timeline.component'; import { Component, DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { XTimelineModule } from '@ng-nest/ui/timeline'; +import { XTimelineComponent } from '@ng-nest/ui/timeline'; import { XTimelinePrefix, XTimelineNode } from './timeline.property'; import { XAddDays, XAddHours } from '@ng-nest/ui/core'; import { XCardComponent } from '@ng-nest/ui/card'; -import { XTimeAgoModule } from '@ng-nest/ui/time-ago'; +import { XTimeAgoPipe } from '@ng-nest/ui/time-ago'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XThemeComponent } from '@ng-nest/ui/theme'; +import { XRadioComponent } from '@ng-nest/ui/radio'; import { FormsModule } from '@angular/forms'; import { HttpClientTestingModule } from '@angular/common/http/testing'; @@ -21,11 +19,11 @@ describe(XTimelinePrefix, () => { HttpClientTestingModule, BrowserAnimationsModule, FormsModule, - XThemeModule, - XTimelineModule, + XThemeComponent, + XTimelineComponent, XCardComponent, - XTimeAgoModule, - XRadioModule + XTimeAgoPipe, + XRadioComponent ], declarations: [TestXTimelineComponent] }).compileComponents(); diff --git a/lib/ng-nest/ui/timeline/timeline.component.ts b/lib/ng-nest/ui/timeline/timeline.component.ts index b4c98f252..084cf63b3 100644 --- a/lib/ng-nest/ui/timeline/timeline.component.ts +++ b/lib/ng-nest/ui/timeline/timeline.component.ts @@ -2,35 +2,36 @@ import { Component, OnInit, ViewEncapsulation, - Renderer2, - ElementRef, ChangeDetectorRef, ChangeDetectionStrategy, SimpleChanges, - OnChanges + OnChanges, + inject, + OnDestroy } from '@angular/core'; import { XTimelinePrefix, XTimelineNode, XTimelineProperty } from './timeline.property'; import { XIsChange, XSetData, XConfigService, XClearClass } from '@ng-nest/ui/core'; import { Subject } from 'rxjs'; +import { CommonModule } from '@angular/common'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XTimeAgoPipe } from '@ng-nest/ui/time-ago'; +import { XLinkComponent } from '@ng-nest/ui/link'; +import { XOutletDirective } from '@ng-nest/ui/outlet'; @Component({ selector: `${XTimelinePrefix}`, + standalone: true, + imports: [CommonModule, XIconComponent, XTimeAgoPipe, XLinkComponent, XOutletDirective], templateUrl: './timeline.component.html', styleUrls: ['./timeline.component.scss'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush }) -export class XTimelineComponent extends XTimelineProperty implements OnInit, OnChanges { +export class XTimelineComponent extends XTimelineProperty implements OnInit, OnChanges, OnDestroy { nodes: XTimelineNode[] = []; private _unSubject = new Subject(); - constructor( - public renderer: Renderer2, - public elementRef: ElementRef, - public cdr: ChangeDetectorRef, - public configService: XConfigService - ) { - super(); - } + private cdr = inject(ChangeDetectorRef); + configService = inject(XConfigService); ngOnInit() { this.setClassMap(); diff --git a/lib/ng-nest/ui/timeline/timeline.module.ts b/lib/ng-nest/ui/timeline/timeline.module.ts index e40a80bdd..a2ef8d570 100644 --- a/lib/ng-nest/ui/timeline/timeline.module.ts +++ b/lib/ng-nest/ui/timeline/timeline.module.ts @@ -1,15 +1,8 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { XTimelineComponent } from './timeline.component'; -import { XIconComponent } from '@ng-nest/ui/icon'; -import { XTimeAgoModule } from '@ng-nest/ui/time-ago'; -import { XLinkComponent } from '@ng-nest/ui/link'; -import { XOutletDirective } from '@ng-nest/ui/outlet'; -import { XTimelineProperty } from './timeline.property'; @NgModule({ - declarations: [XTimelineComponent, XTimelineProperty], exports: [XTimelineComponent], - imports: [CommonModule, XIconComponent, XTimeAgoModule, XLinkComponent, XOutletDirective] + imports: [XTimelineComponent] }) export class XTimelineModule {} diff --git a/lib/ng-nest/ui/tooltip/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/tooltip/examples/en_US/default/default/default.component.ts index cae54f2a5..0d29c45d6 100644 --- a/lib/ng-nest/ui/tooltip/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/tooltip/examples/en_US/default/default/default.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XTooltipDirective } from '@ng-nest/ui/tooltip'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XTooltipDirective, XButtonComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/tooltip/examples/index.ts b/lib/ng-nest/ui/tooltip/examples/index.ts new file mode 100644 index 000000000..b94cf3f92 --- /dev/null +++ b/lib/ng-nest/ui/tooltip/examples/index.ts @@ -0,0 +1 @@ +export * from './zh_CN/default/default/default.component'; diff --git a/lib/ng-nest/ui/tooltip/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/tooltip/examples/zh_CN/default/default/default.component.ts index cae54f2a5..0d29c45d6 100644 --- a/lib/ng-nest/ui/tooltip/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/tooltip/examples/zh_CN/default/default/default.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XTooltipDirective } from '@ng-nest/ui/tooltip'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XTooltipDirective, XButtonComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/tooltip/tooltip-portal.component.ts b/lib/ng-nest/ui/tooltip/tooltip-portal.component.ts index 506f42fd7..1a1d12e13 100644 --- a/lib/ng-nest/ui/tooltip/tooltip-portal.component.ts +++ b/lib/ng-nest/ui/tooltip/tooltip-portal.component.ts @@ -10,15 +10,20 @@ import { Renderer2, HostListener, AfterViewInit, - HostBinding + HostBinding, + inject } from '@angular/core'; import { BehaviorSubject, Subject } from 'rxjs'; import { XTooltipPortalPrefix } from './tooltip.property'; import { XPlacement, XClassMap, XFadeAnimation, XTemplate } from '@ng-nest/ui/core'; import { takeUntil } from 'rxjs/operators'; +import { XOutletDirective } from '@ng-nest/ui/outlet'; +import { CommonModule } from '@angular/common'; @Component({ selector: `${XTooltipPortalPrefix}`, + standalone: true, + imports: [CommonModule, XOutletDirective], templateUrl: './tooltip-portal.component.html', styleUrls: ['./tooltip-portal.component.scss'], encapsulation: ViewEncapsulation.None, @@ -54,8 +59,8 @@ export class XTooltipPortalComponent implements OnInit, OnDestroy, OnDestroy, Af backgroundColor!: string; positionChange: Subject = new Subject(); private _unSubject = new Subject(); - - constructor(private renderer: Renderer2, public cdr: ChangeDetectorRef) {} + private renderer = inject(Renderer2); + private cdr = inject(ChangeDetectorRef); ngOnInit(): void { this.contentChange.pipe(takeUntil(this._unSubject)).subscribe((x) => { diff --git a/lib/ng-nest/ui/tooltip/tooltip.directive.spec.ts b/lib/ng-nest/ui/tooltip/tooltip.directive.spec.ts index e509bd0d9..34d307a78 100644 --- a/lib/ng-nest/ui/tooltip/tooltip.directive.spec.ts +++ b/lib/ng-nest/ui/tooltip/tooltip.directive.spec.ts @@ -1,19 +1,24 @@ import { XButtonComponent } from '@ng-nest/ui/button'; import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XTooltipDirective } from './tooltip.directive'; import { Component, DebugElement, ChangeDetectorRef } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { XTooltipModule } from '@ng-nest/ui/tooltip'; +import { XTooltipDirective } from '@ng-nest/ui/tooltip'; import { XTooltipPrefix } from './tooltip.property'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XTooltipPrefix, () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, BrowserAnimationsModule, XThemeModule, BrowserAnimationsModule, XTooltipModule, XButtonComponent], + imports: [ + HttpClientTestingModule, + BrowserAnimationsModule, + XThemeComponent, + BrowserAnimationsModule, + XTooltipDirective, + XButtonComponent + ], declarations: [TestXTooltipComponent] }).compileComponents(); }); @@ -58,7 +63,9 @@ describe(XTooltipPrefix, () => {
- 自定义控制显示/隐藏 + 自定义控制显示/隐藏
`, styles: [ diff --git a/lib/ng-nest/ui/tooltip/tooltip.directive.ts b/lib/ng-nest/ui/tooltip/tooltip.directive.ts index 63e71e211..4df879c51 100644 --- a/lib/ng-nest/ui/tooltip/tooltip.directive.ts +++ b/lib/ng-nest/ui/tooltip/tooltip.directive.ts @@ -6,7 +6,8 @@ import { OnChanges, SimpleChanges, OnDestroy, - HostBinding + HostBinding, + inject } from '@angular/core'; import { XPortalService, XPortalOverlayRef, XPortalConnectedPosition } from '@ng-nest/ui/portal'; import { XTooltipPortalComponent } from './tooltip-portal.component'; @@ -21,7 +22,7 @@ import { Overlay } from '@angular/cdk/overlay'; -@Directive({ selector: `[${XTooltipPrefix}], ${XTooltipPrefix}` }) +@Directive({ selector: `[${XTooltipPrefix}], ${XTooltipPrefix}`, standalone: true }) export class XTooltipDirective extends XTooltipProperty implements OnChanges, OnDestroy { portal!: XPortalOverlayRef; box!: DOMRect; @@ -30,15 +31,10 @@ export class XTooltipDirective extends XTooltipProperty implements OnChanges, On timeoutHide: any; timeoutShow: any; private _unSubject = new Subject(); - - constructor( - private elementRef: ElementRef, - private portalService: XPortalService, - private viewContainerRef: ViewContainerRef, - private overlay: Overlay - ) { - super(); - } + private elementRef = inject(ElementRef); + private portalService = inject(XPortalService); + private viewContainerRef = inject(ViewContainerRef); + private overlay = inject(Overlay); @HostBinding('class.x-tooltip-show') get _show() { return this.visible; @@ -112,12 +108,10 @@ export class XTooltipDirective extends XTooltipProperty implements OnChanges, On setPosition(config: OverlayConfig) { let position = config.positionStrategy as FlexibleConnectedPositionStrategy; - position.positionChanges - .pipe(takeUntil(this._unSubject)) - .subscribe((pos: ConnectedOverlayPositionChange) => { - const place = XPortalConnectedPosition.get(pos.connectionPair) as XPlacement; - place !== this.placement && this.positionChange.next(place); - }); + position.positionChanges.pipe(takeUntil(this._unSubject)).subscribe((pos: ConnectedOverlayPositionChange) => { + const place = XPortalConnectedPosition.get(pos.connectionPair) as XPlacement; + place !== this.placement && this.positionChange.next(place); + }); } setInstance() { diff --git a/lib/ng-nest/ui/tooltip/tooltip.module.ts b/lib/ng-nest/ui/tooltip/tooltip.module.ts index 51d4b1faf..03903259e 100644 --- a/lib/ng-nest/ui/tooltip/tooltip.module.ts +++ b/lib/ng-nest/ui/tooltip/tooltip.module.ts @@ -1,13 +1,8 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { XTooltipDirective } from './tooltip.directive'; -import { XTooltipPortalComponent } from './tooltip-portal.component'; -import { XTooltipProperty } from './tooltip.property'; -import { XOutletDirective } from '@ng-nest/ui/outlet'; @NgModule({ - declarations: [XTooltipDirective, XTooltipPortalComponent, XTooltipProperty], - exports: [XTooltipDirective, XTooltipPortalComponent], - imports: [CommonModule, XOutletDirective] + exports: [XTooltipDirective], + imports: [XTooltipDirective] }) export class XTooltipModule {} diff --git a/lib/ng-nest/ui/transfer/examples/en_US/default/custom/custom.component.ts b/lib/ng-nest/ui/transfer/examples/en_US/default/custom/custom.component.ts index 4f4d6a9e5..57a0fda57 100644 --- a/lib/ng-nest/ui/transfer/examples/en_US/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/transfer/examples/en_US/default/custom/custom.component.ts @@ -1,8 +1,12 @@ import { Component } from '@angular/core'; -import { XTransferNode } from '@ng-nest/ui/transfer'; +import { FormsModule } from '@angular/forms'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XTransferComponent, XTransferNode } from '@ng-nest/ui/transfer'; @Component({ selector: 'ex-custom', + standalone: true, + imports: [FormsModule, XTransferComponent, XIconComponent], templateUrl: './custom.component.html', styleUrls: ['./custom.component.scss'] }) diff --git a/lib/ng-nest/ui/transfer/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/transfer/examples/en_US/default/default/default.component.ts index 7ec6b9fed..a407256b1 100644 --- a/lib/ng-nest/ui/transfer/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/transfer/examples/en_US/default/default/default.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; -import { XTransferNode } from '@ng-nest/ui/transfer'; +import { FormsModule } from '@angular/forms'; +import { XTransferComponent, XTransferNode } from '@ng-nest/ui/transfer'; @Component({ selector: 'ex-default', + standalone: true, + imports: [FormsModule, XTransferComponent], templateUrl: './default.component.html' }) export class ExDefaultComponent { diff --git a/lib/ng-nest/ui/transfer/examples/en_US/default/drag/drag.component.ts b/lib/ng-nest/ui/transfer/examples/en_US/default/drag/drag.component.ts index 151da65f5..9409692bd 100644 --- a/lib/ng-nest/ui/transfer/examples/en_US/default/drag/drag.component.ts +++ b/lib/ng-nest/ui/transfer/examples/en_US/default/drag/drag.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; -import { XTransferNode } from '@ng-nest/ui/transfer'; +import { FormsModule } from '@angular/forms'; +import { XTransferComponent, XTransferNode } from '@ng-nest/ui/transfer'; @Component({ selector: 'ex-drag', + standalone: true, + imports: [FormsModule, XTransferComponent], templateUrl: './drag.component.html' }) export class ExDragComponent { diff --git a/lib/ng-nest/ui/transfer/examples/en_US/default/footer/footer.component.ts b/lib/ng-nest/ui/transfer/examples/en_US/default/footer/footer.component.ts index 6573f1426..f58b712c5 100644 --- a/lib/ng-nest/ui/transfer/examples/en_US/default/footer/footer.component.ts +++ b/lib/ng-nest/ui/transfer/examples/en_US/default/footer/footer.component.ts @@ -1,8 +1,12 @@ import { Component } from '@angular/core'; -import { XTransferNode } from '@ng-nest/ui/transfer'; +import { FormsModule } from '@angular/forms'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XTransferComponent, XTransferNode } from '@ng-nest/ui/transfer'; @Component({ selector: 'ex-footer', + standalone: true, + imports: [FormsModule, XTransferComponent, XButtonComponent], templateUrl: './footer.component.html' }) export class ExFooterComponent { diff --git a/lib/ng-nest/ui/transfer/examples/en_US/default/inverse/inverse.component.ts b/lib/ng-nest/ui/transfer/examples/en_US/default/inverse/inverse.component.ts index b53d8e588..5bf3074b4 100644 --- a/lib/ng-nest/ui/transfer/examples/en_US/default/inverse/inverse.component.ts +++ b/lib/ng-nest/ui/transfer/examples/en_US/default/inverse/inverse.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; -import { XTransferNode } from '@ng-nest/ui/transfer'; +import { FormsModule } from '@angular/forms'; +import { XTransferComponent, XTransferNode } from '@ng-nest/ui/transfer'; @Component({ selector: 'ex-inverse', + standalone: true, + imports: [FormsModule, XTransferComponent], templateUrl: './inverse.component.html' }) export class ExInverseComponent { diff --git a/lib/ng-nest/ui/transfer/examples/en_US/default/inverse/readme.md b/lib/ng-nest/ui/transfer/examples/en_US/default/inverse/readme.md index 8c2ca9438..377516089 100644 --- a/lib/ng-nest/ui/transfer/examples/en_US/default/inverse/readme.md +++ b/lib/ng-nest/ui/transfer/examples/en_US/default/inverse/readme.md @@ -1,7 +1,7 @@ --- order: 8 -label: '反选' +label: 'Inverse' --- -- 使用 `inverse` 可以开启添加反选按钮 -- 反选操作只支持 `list` 类型 +- Use `inverse` to enable the add reverse selection button +- The reverse selection operation only supports the `list` type diff --git a/lib/ng-nest/ui/transfer/examples/en_US/default/search/search.component.ts b/lib/ng-nest/ui/transfer/examples/en_US/default/search/search.component.ts index c8fa9f34a..64d1265fd 100644 --- a/lib/ng-nest/ui/transfer/examples/en_US/default/search/search.component.ts +++ b/lib/ng-nest/ui/transfer/examples/en_US/default/search/search.component.ts @@ -3,9 +3,15 @@ import { XQuery } from '@ng-nest/ui/core'; import { XTableColumn } from '@ng-nest/ui/table'; import { XTransferComponent, XTransferNode } from '@ng-nest/ui/transfer'; import { SearchService } from './search.service'; +import { FormsModule } from '@angular/forms'; +import { CommonModule } from '@angular/common'; +import { XSelectComponent } from '@ng-nest/ui/select'; +import { XInputComponent } from '@ng-nest/ui/input'; @Component({ selector: 'ex-search', + standalone: true, + imports: [CommonModule, FormsModule, XTransferComponent, XInputComponent, XSelectComponent], templateUrl: './search.component.html', providers: [SearchService] }) diff --git a/lib/ng-nest/ui/transfer/examples/en_US/default/table/table.component.ts b/lib/ng-nest/ui/transfer/examples/en_US/default/table/table.component.ts index fa7bdd4ee..53bcd12e5 100644 --- a/lib/ng-nest/ui/transfer/examples/en_US/default/table/table.component.ts +++ b/lib/ng-nest/ui/transfer/examples/en_US/default/table/table.component.ts @@ -3,9 +3,12 @@ import { XQuery } from '@ng-nest/ui/core'; import { XTableColumn } from '@ng-nest/ui/table'; import { XTransferComponent } from '@ng-nest/ui/transfer'; import { TableService } from './table.service'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'ex-table', + standalone: true, + imports: [FormsModule, XTransferComponent], templateUrl: './table.component.html', providers: [TableService] }) diff --git a/lib/ng-nest/ui/transfer/examples/en_US/default/tree/tree.component.ts b/lib/ng-nest/ui/transfer/examples/en_US/default/tree/tree.component.ts index 35dafe9d3..99dc5e9b1 100644 --- a/lib/ng-nest/ui/transfer/examples/en_US/default/tree/tree.component.ts +++ b/lib/ng-nest/ui/transfer/examples/en_US/default/tree/tree.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; -import { XTransferNode } from '@ng-nest/ui/transfer'; +import { FormsModule } from '@angular/forms'; +import { XTransferComponent, XTransferNode } from '@ng-nest/ui/transfer'; @Component({ selector: 'ex-tree', + standalone: true, + imports: [FormsModule, XTransferComponent], templateUrl: './tree.component.html' }) export class ExTreeComponent { diff --git a/lib/ng-nest/ui/transfer/examples/index.ts b/lib/ng-nest/ui/transfer/examples/index.ts new file mode 100644 index 000000000..05dfc5396 --- /dev/null +++ b/lib/ng-nest/ui/transfer/examples/index.ts @@ -0,0 +1,8 @@ +export * from './zh_CN/default/custom/custom.component'; +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/drag/drag.component'; +export * from './zh_CN/default/footer/footer.component'; +export * from './zh_CN/default/inverse/inverse.component'; +export * from './zh_CN/default/search/search.component'; +export * from './zh_CN/default/tree/tree.component'; +export * from './zh_CN/default/table/table.component'; diff --git a/lib/ng-nest/ui/transfer/examples/zh_CN/default/custom/custom.component.ts b/lib/ng-nest/ui/transfer/examples/zh_CN/default/custom/custom.component.ts index aecf9f533..edcb77b8f 100644 --- a/lib/ng-nest/ui/transfer/examples/zh_CN/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/transfer/examples/zh_CN/default/custom/custom.component.ts @@ -1,8 +1,12 @@ import { Component } from '@angular/core'; -import { XTransferNode } from '@ng-nest/ui/transfer'; +import { FormsModule } from '@angular/forms'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XTransferComponent, XTransferNode } from '@ng-nest/ui/transfer'; @Component({ selector: 'ex-custom', + standalone: true, + imports: [FormsModule, XTransferComponent, XIconComponent], templateUrl: './custom.component.html', styleUrls: ['./custom.component.scss'] }) diff --git a/lib/ng-nest/ui/transfer/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/transfer/examples/zh_CN/default/default/default.component.ts index cd0307dbd..c28409090 100644 --- a/lib/ng-nest/ui/transfer/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/transfer/examples/zh_CN/default/default/default.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; -import { XTransferNode } from '@ng-nest/ui/transfer'; +import { FormsModule } from '@angular/forms'; +import { XTransferComponent, XTransferNode } from '@ng-nest/ui/transfer'; @Component({ selector: 'ex-default', + standalone: true, + imports: [FormsModule, XTransferComponent], templateUrl: './default.component.html' }) export class ExDefaultComponent { diff --git a/lib/ng-nest/ui/transfer/examples/zh_CN/default/drag/drag.component.ts b/lib/ng-nest/ui/transfer/examples/zh_CN/default/drag/drag.component.ts index aaf049758..98e587954 100644 --- a/lib/ng-nest/ui/transfer/examples/zh_CN/default/drag/drag.component.ts +++ b/lib/ng-nest/ui/transfer/examples/zh_CN/default/drag/drag.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; -import { XTransferNode } from '@ng-nest/ui/transfer'; +import { FormsModule } from '@angular/forms'; +import { XTransferComponent, XTransferNode } from '@ng-nest/ui/transfer'; @Component({ selector: 'ex-drag', + standalone: true, + imports: [FormsModule, XTransferComponent], templateUrl: './drag.component.html' }) export class ExDragComponent { diff --git a/lib/ng-nest/ui/transfer/examples/zh_CN/default/footer/footer.component.ts b/lib/ng-nest/ui/transfer/examples/zh_CN/default/footer/footer.component.ts index 5ad396f38..2a2036ad2 100644 --- a/lib/ng-nest/ui/transfer/examples/zh_CN/default/footer/footer.component.ts +++ b/lib/ng-nest/ui/transfer/examples/zh_CN/default/footer/footer.component.ts @@ -1,8 +1,12 @@ import { Component } from '@angular/core'; -import { XTransferNode } from '@ng-nest/ui/transfer'; +import { FormsModule } from '@angular/forms'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XTransferComponent, XTransferNode } from '@ng-nest/ui/transfer'; @Component({ selector: 'ex-footer', + standalone: true, + imports: [FormsModule, XTransferComponent, XButtonComponent], templateUrl: './footer.component.html' }) export class ExFooterComponent { diff --git a/lib/ng-nest/ui/transfer/examples/zh_CN/default/inverse/inverse.component.ts b/lib/ng-nest/ui/transfer/examples/zh_CN/default/inverse/inverse.component.ts index 5166f4502..3a23ee52e 100644 --- a/lib/ng-nest/ui/transfer/examples/zh_CN/default/inverse/inverse.component.ts +++ b/lib/ng-nest/ui/transfer/examples/zh_CN/default/inverse/inverse.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; -import { XTransferNode } from '@ng-nest/ui/transfer'; +import { FormsModule } from '@angular/forms'; +import { XTransferComponent, XTransferNode } from '@ng-nest/ui/transfer'; @Component({ selector: 'ex-inverse', + standalone: true, + imports: [FormsModule, XTransferComponent], templateUrl: './inverse.component.html' }) export class ExInverseComponent { diff --git a/lib/ng-nest/ui/transfer/examples/zh_CN/default/search/search.component.ts b/lib/ng-nest/ui/transfer/examples/zh_CN/default/search/search.component.ts index e23c6d354..7b2784c59 100644 --- a/lib/ng-nest/ui/transfer/examples/zh_CN/default/search/search.component.ts +++ b/lib/ng-nest/ui/transfer/examples/zh_CN/default/search/search.component.ts @@ -3,9 +3,15 @@ import { XQuery } from '@ng-nest/ui/core'; import { XTableColumn } from '@ng-nest/ui/table'; import { XTransferComponent, XTransferNode } from '@ng-nest/ui/transfer'; import { SearchService } from './search.service'; +import { FormsModule } from '@angular/forms'; +import { CommonModule } from '@angular/common'; +import { XSelectComponent } from '@ng-nest/ui/select'; +import { XInputComponent } from '@ng-nest/ui/input'; @Component({ selector: 'ex-search', + standalone: true, + imports: [CommonModule, FormsModule, XTransferComponent, XInputComponent, XSelectComponent], templateUrl: './search.component.html', providers: [SearchService] }) diff --git a/lib/ng-nest/ui/transfer/examples/zh_CN/default/table/table.component.ts b/lib/ng-nest/ui/transfer/examples/zh_CN/default/table/table.component.ts index bc69e16b6..d22df7cc5 100644 --- a/lib/ng-nest/ui/transfer/examples/zh_CN/default/table/table.component.ts +++ b/lib/ng-nest/ui/transfer/examples/zh_CN/default/table/table.component.ts @@ -3,9 +3,12 @@ import { XQuery } from '@ng-nest/ui/core'; import { XTableColumn } from '@ng-nest/ui/table'; import { XTransferComponent } from '@ng-nest/ui/transfer'; import { TableService } from './table.service'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'ex-table', + standalone: true, + imports: [FormsModule, XTransferComponent], templateUrl: './table.component.html', providers: [TableService] }) diff --git a/lib/ng-nest/ui/transfer/examples/zh_CN/default/tree/tree.component.ts b/lib/ng-nest/ui/transfer/examples/zh_CN/default/tree/tree.component.ts index 73ebfcbee..160409867 100644 --- a/lib/ng-nest/ui/transfer/examples/zh_CN/default/tree/tree.component.ts +++ b/lib/ng-nest/ui/transfer/examples/zh_CN/default/tree/tree.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; -import { XTransferNode } from '@ng-nest/ui/transfer'; +import { FormsModule } from '@angular/forms'; +import { XTransferComponent, XTransferNode } from '@ng-nest/ui/transfer'; @Component({ selector: 'ex-tree', + standalone: true, + imports: [FormsModule, XTransferComponent], templateUrl: './tree.component.html' }) export class ExTreeComponent { diff --git a/lib/ng-nest/ui/transfer/transfer.component.spec.ts b/lib/ng-nest/ui/transfer/transfer.component.spec.ts index c4c89ae4c..9a792b0c0 100644 --- a/lib/ng-nest/ui/transfer/transfer.component.spec.ts +++ b/lib/ng-nest/ui/transfer/transfer.component.spec.ts @@ -1,20 +1,18 @@ import { XIconComponent } from '@ng-nest/ui/icon'; import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XTransferComponent } from './transfer.component'; import { Component, DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; -import { XTransferModule } from '@ng-nest/ui/transfer'; +import { XTransferComponent } from '@ng-nest/ui/transfer'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { XTransferPrefix, XTransferNode } from './transfer.property'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XContainerComponent } from '@ng-nest/ui/container'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; -import { XTreeModule } from '@ng-nest/ui/tree'; +import { XThemeComponent } from '@ng-nest/ui/theme'; +import { XTreeComponent } from '@ng-nest/ui/tree'; import { HttpClientTestingModule } from '@angular/common/http/testing'; -import { XSelectModule } from '@ng-nest/ui/select'; +import { XSelectComponent } from '@ng-nest/ui/select'; import { XInputComponent } from '@ng-nest/ui/input'; describe(XTransferPrefix, () => { @@ -23,17 +21,17 @@ describe(XTransferPrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, + XThemeComponent, FormsModule, ReactiveFormsModule, - XTransferModule, + XTransferComponent, XButtonComponent, XContainerComponent, XRowComponent, XColComponent, XIconComponent, - XTreeModule, - XSelectModule, + XTreeComponent, + XSelectComponent, XInputComponent ], declarations: [TestXTransferComponent] diff --git a/lib/ng-nest/ui/transfer/transfer.component.ts b/lib/ng-nest/ui/transfer/transfer.component.ts index dd6082cc5..1876f9616 100644 --- a/lib/ng-nest/ui/transfer/transfer.component.ts +++ b/lib/ng-nest/ui/transfer/transfer.component.ts @@ -2,14 +2,13 @@ import { Component, OnInit, ViewEncapsulation, - Renderer2, - ElementRef, ChangeDetectorRef, ChangeDetectionStrategy, SimpleChanges, OnChanges, OnDestroy, - ViewChild + ViewChild, + inject } from '@angular/core'; import { XTransferPrefix, XTransferNode, XTransferSource, XTransferProperty, XTransferType } from './transfer.property'; import { @@ -28,14 +27,37 @@ import { } from '@ng-nest/ui/core'; import { Subject } from 'rxjs'; import { debounceTime, distinctUntilChanged, map, takeUntil } from 'rxjs/operators'; -import { transferArrayItem, moveItemInArray, CdkDragDrop, CdkDrag } from '@angular/cdk/drag-drop'; +import { transferArrayItem, moveItemInArray, CdkDragDrop, CdkDrag, DragDropModule } from '@angular/cdk/drag-drop'; import { XValueAccessor } from '@ng-nest/ui/base-form'; -import { XI18nService, XI18nTransfer } from '@ng-nest/ui/i18n'; -import { XTreeNode } from '@ng-nest/ui/tree'; +import { XI18nPipe, XI18nService, XI18nTransfer } from '@ng-nest/ui/i18n'; +import { XTreeComponent, XTreeNode } from '@ng-nest/ui/tree'; import { XTableColumn, XTableComponent, XTableHeadCheckbox } from '@ng-nest/ui/table'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; +import { XOutletDirective } from '@ng-nest/ui/outlet'; +import { XCheckboxComponent } from '@ng-nest/ui/checkbox'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XInputComponent } from '@ng-nest/ui/input'; +import { XKeywordDirective } from '@ng-nest/ui/keyword'; +import { XLinkComponent } from '@ng-nest/ui/link'; @Component({ selector: `${XTransferPrefix}`, + standalone: true, + imports: [ + CommonModule, + FormsModule, + DragDropModule, + XOutletDirective, + XCheckboxComponent, + XButtonComponent, + XInputComponent, + XTreeComponent, + XTableComponent, + XKeywordDirective, + XLinkComponent, + XI18nPipe + ], templateUrl: './transfer.component.html', styleUrls: ['./transfer.component.scss'], encapsulation: ViewEncapsulation.None, @@ -95,16 +117,10 @@ export class XTransferComponent extends XTransferProperty implements OnInit, OnC return this.value; } } - - constructor( - public renderer: Renderer2, - public elementRef: ElementRef, - public override cdr: ChangeDetectorRef, - public configService: XConfigService, - public i18n: XI18nService - ) { - super(); - } + + override cdr = inject(ChangeDetectorRef) + private i18n = inject(XI18nService) + configService = inject(XConfigService) ngOnInit() { this.setTitles(); @@ -196,7 +212,9 @@ export class XTransferComponent extends XTransferProperty implements OnInit, OnC return x; }); if (this.type === 'tree' && source.direction === 'left') { - this.treeActivatedId = $event ? source.list!.map((x) => x.id)! : source.list!.filter((x) => x.disabled).map((x) => x.id); + this.treeActivatedId = $event + ? source.list!.map((x) => x.id)! + : source.list!.filter((x) => x.disabled).map((x) => x.id); } source.checkedCount = $event ? list.length : 0; source.indeterminate = $event; @@ -253,7 +271,9 @@ export class XTransferComponent extends XTransferProperty implements OnInit, OnC private moveTree(from: XTransferSource, to: XTransferSource) { let checkedItems: XTransferNode[] = []; if (to.direction === 'right') { - checkedItems = from.list?.filter((x) => !x.disabled && !XIsEmpty(this.treeActivatedId) && this.treeActivatedId.includes(x.id))!; + checkedItems = from.list?.filter( + (x) => !x.disabled && !XIsEmpty(this.treeActivatedId) && this.treeActivatedId.includes(x.id) + )!; checkedItems.forEach((x: XTreeNode) => { x.disabled = true; x.change && x.change(); @@ -541,11 +561,13 @@ export class XTransferComponent extends XTransferProperty implements OnInit, OnC getTableData() { if (XIsFunction(this.data)) { - (this.data as Function)(this.tableIndex, this.tableSize, this.tableQuery).subscribe((x: XResultList) => { - this.tableTotal = x.total!; - this.tableData = x.list!; - this.setList(x.list!); - }); + (this.data as Function)(this.tableIndex, this.tableSize, this.tableQuery).subscribe( + (x: XResultList) => { + this.tableTotal = x.total!; + this.tableData = x.list!; + this.setList(x.list!); + } + ); } } @@ -596,8 +618,10 @@ export class XTransferComponent extends XTransferProperty implements OnInit, OnC private setHiddenCheckAll() { if (XIsEmpty(this.hiddenCheckAll)) return; - if (this.hiddenCheckAll!.length > 0 && XIsBoolean(this.hiddenCheckAll![0])) this.left.hiddenCheckAll = this.hiddenCheckAll![0]; - if (this.hiddenCheckAll!.length > 1 && XIsBoolean(this.hiddenCheckAll![1])) this.right.hiddenCheckAll = this.hiddenCheckAll![1]; + if (this.hiddenCheckAll!.length > 0 && XIsBoolean(this.hiddenCheckAll![0])) + this.left.hiddenCheckAll = this.hiddenCheckAll![0]; + if (this.hiddenCheckAll!.length > 1 && XIsBoolean(this.hiddenCheckAll![1])) + this.right.hiddenCheckAll = this.hiddenCheckAll![1]; this.cdr.detectChanges(); } diff --git a/lib/ng-nest/ui/transfer/transfer.module.ts b/lib/ng-nest/ui/transfer/transfer.module.ts index 4cd65cde0..8e81236f8 100644 --- a/lib/ng-nest/ui/transfer/transfer.module.ts +++ b/lib/ng-nest/ui/transfer/transfer.module.ts @@ -1,37 +1,8 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { XTransferComponent } from './transfer.component'; -import { FormsModule } from '@angular/forms'; -import { XCheckboxComponent } from '@ng-nest/ui/checkbox'; -import { XButtonComponent } from '@ng-nest/ui/button'; -import { DragDropModule } from '@angular/cdk/drag-drop'; -import { XInputComponent } from '@ng-nest/ui/input'; -import { XOutletDirective } from '@ng-nest/ui/outlet'; -import { XTransferProperty } from './transfer.property'; -import { XControlValueAccessor } from '@ng-nest/ui/base-form'; -import { XTreeModule } from '@ng-nest/ui/tree'; -import { XTableModule } from '@ng-nest/ui/table'; -import { XKeywordDirective } from '@ng-nest/ui/keyword'; -import { XLinkComponent } from '@ng-nest/ui/link'; -import { XI18nPipe } from '@ng-nest/ui/i18n'; @NgModule({ - declarations: [XTransferComponent, XTransferProperty], exports: [XTransferComponent], - imports: [ - CommonModule, - FormsModule, - DragDropModule, - XOutletDirective, - XCheckboxComponent, - XButtonComponent, - XInputComponent, - XControlValueAccessor, - XTreeModule, - XTableModule, - XKeywordDirective, - XLinkComponent, - XI18nPipe - ] + imports: [XTransferComponent] }) export class XTransferModule {} diff --git a/lib/ng-nest/ui/tree-file/examples/en_US/default/content/content.component.ts b/lib/ng-nest/ui/tree-file/examples/en_US/default/content/content.component.ts index 7b42cd41e..15bf152ad 100644 --- a/lib/ng-nest/ui/tree-file/examples/en_US/default/content/content.component.ts +++ b/lib/ng-nest/ui/tree-file/examples/en_US/default/content/content.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; -import { XTreeFileNode } from '@ng-nest/ui/tree-file'; +import { XTreeFileComponent, XTreeFileNode } from '@ng-nest/ui/tree-file'; @Component({ selector: 'ex-content', + standalone: true, + imports: [XTreeFileComponent], templateUrl: './content.component.html', styleUrls: ['./content.component.scss'] }) diff --git a/lib/ng-nest/ui/tree-file/examples/en_US/default/default/default.component.html b/lib/ng-nest/ui/tree-file/examples/en_US/default/default/default.component.html index 28823ae05..3da977e3d 100644 --- a/lib/ng-nest/ui/tree-file/examples/en_US/default/default/default.component.html +++ b/lib/ng-nest/ui/tree-file/examples/en_US/default/default/default.component.html @@ -1 +1,2 @@ - + + diff --git a/lib/ng-nest/ui/tree-file/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/tree-file/examples/en_US/default/default/default.component.ts index 166985d45..b60b42fe2 100644 --- a/lib/ng-nest/ui/tree-file/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/tree-file/examples/en_US/default/default/default.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; -import { XTreeFileNode } from '@ng-nest/ui/tree-file'; +import { XTreeFileComponent, XTreeFileNode } from '@ng-nest/ui/tree-file'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XTreeFileComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) @@ -56,7 +58,13 @@ export class ExDefaultComponent { label: 'app.component.html', url: 'docs/ui/getting-started/demo/3.2__my-app/src/app/app.component.html', type: 'html', - highlightLines: { primary: '5,13,21', success: '6,14,22', warning: '7,15,23', danger: '8,16,24', info: '9,17,25,28-33' } + highlightLines: { + primary: '5,13,21', + success: '6,14,22', + warning: '7,15,23', + danger: '8,16,24', + info: '9,17,25,28-33' + } }, { id: '1__my-app/src/app/app.component.scss', diff --git a/lib/ng-nest/ui/tree-file/examples/index.ts b/lib/ng-nest/ui/tree-file/examples/index.ts new file mode 100644 index 000000000..3282e63f3 --- /dev/null +++ b/lib/ng-nest/ui/tree-file/examples/index.ts @@ -0,0 +1,2 @@ +export * from './zh_CN/default/content/content.component'; +export * from './zh_CN/default/default/default.component'; diff --git a/lib/ng-nest/ui/tree-file/examples/zh_CN/default/content/content.component.ts b/lib/ng-nest/ui/tree-file/examples/zh_CN/default/content/content.component.ts index 7b42cd41e..15bf152ad 100644 --- a/lib/ng-nest/ui/tree-file/examples/zh_CN/default/content/content.component.ts +++ b/lib/ng-nest/ui/tree-file/examples/zh_CN/default/content/content.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; -import { XTreeFileNode } from '@ng-nest/ui/tree-file'; +import { XTreeFileComponent, XTreeFileNode } from '@ng-nest/ui/tree-file'; @Component({ selector: 'ex-content', + standalone: true, + imports: [XTreeFileComponent], templateUrl: './content.component.html', styleUrls: ['./content.component.scss'] }) diff --git a/lib/ng-nest/ui/tree-file/examples/zh_CN/default/default/default.component.html b/lib/ng-nest/ui/tree-file/examples/zh_CN/default/default/default.component.html index 28823ae05..3da977e3d 100644 --- a/lib/ng-nest/ui/tree-file/examples/zh_CN/default/default/default.component.html +++ b/lib/ng-nest/ui/tree-file/examples/zh_CN/default/default/default.component.html @@ -1 +1,2 @@ - + + diff --git a/lib/ng-nest/ui/tree-file/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/tree-file/examples/zh_CN/default/default/default.component.ts index 166985d45..b60b42fe2 100644 --- a/lib/ng-nest/ui/tree-file/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/tree-file/examples/zh_CN/default/default/default.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; -import { XTreeFileNode } from '@ng-nest/ui/tree-file'; +import { XTreeFileComponent, XTreeFileNode } from '@ng-nest/ui/tree-file'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XTreeFileComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) @@ -56,7 +58,13 @@ export class ExDefaultComponent { label: 'app.component.html', url: 'docs/ui/getting-started/demo/3.2__my-app/src/app/app.component.html', type: 'html', - highlightLines: { primary: '5,13,21', success: '6,14,22', warning: '7,15,23', danger: '8,16,24', info: '9,17,25,28-33' } + highlightLines: { + primary: '5,13,21', + success: '6,14,22', + warning: '7,15,23', + danger: '8,16,24', + info: '9,17,25,28-33' + } }, { id: '1__my-app/src/app/app.component.scss', diff --git a/lib/ng-nest/ui/tree-file/tree-file.component.spec.ts b/lib/ng-nest/ui/tree-file/tree-file.component.spec.ts index a7b9ac307..67436f675 100644 --- a/lib/ng-nest/ui/tree-file/tree-file.component.spec.ts +++ b/lib/ng-nest/ui/tree-file/tree-file.component.spec.ts @@ -1,17 +1,15 @@ import { XIconComponent } from '@ng-nest/ui/icon'; import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XTreeFileComponent } from './tree-file.component'; import { Component, DebugElement, Injectable } from '@angular/core'; import { By } from '@angular/platform-browser'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; -import { XTreeFileModule } from '@ng-nest/ui/tree-file'; +import { XTreeFileComponent } from '@ng-nest/ui/tree-file'; import { FormsModule } from '@angular/forms'; import { XTreeFilePrefix, XTreeFileNode } from './tree-file.property'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XContainerComponent } from '@ng-nest/ui/container'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XTreeFilePrefix, () => { @@ -19,10 +17,10 @@ describe(XTreeFilePrefix, () => { TestBed.configureTestingModule({ imports: [ FormsModule, - XThemeModule, + XThemeComponent, BrowserAnimationsModule, HttpClientTestingModule, - XTreeFileModule, + XTreeFileComponent, XButtonComponent, XContainerComponent, XRowComponent, @@ -136,8 +134,7 @@ class TreeFileServiceTest { template: `
- - +
`, styles: [ diff --git a/lib/ng-nest/ui/tree-file/tree-file.component.ts b/lib/ng-nest/ui/tree-file/tree-file.component.ts index afcbfdf88..9852dfd40 100644 --- a/lib/ng-nest/ui/tree-file/tree-file.component.ts +++ b/lib/ng-nest/ui/tree-file/tree-file.component.ts @@ -1,13 +1,28 @@ -import { Component, ViewEncapsulation, Renderer2, ElementRef, ChangeDetectorRef, ChangeDetectionStrategy, Optional } from '@angular/core'; +import { Component, ViewEncapsulation, ChangeDetectorRef, ChangeDetectionStrategy, inject } from '@angular/core'; import { XTreeFilePrefix, XTreeFileProperty, XTreeFileNode, XTreeFileImgs } from './tree-file.property'; import { HttpClient } from '@angular/common/http'; import { XIsEmpty, XConfigService } from '@ng-nest/ui/core'; -import { XCrumbNode } from '@ng-nest/ui/crumb'; +import { XCrumbComponent, XCrumbNode } from '@ng-nest/ui/crumb'; import { delay, finalize } from 'rxjs/operators'; -import { XHighlightLines } from '@ng-nest/ui/highlight'; +import { XHighlightComponent, XHighlightLines } from '@ng-nest/ui/highlight'; +import { CommonModule } from '@angular/common'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XLinkComponent } from '@ng-nest/ui/link'; +import { XLoadingComponent } from '@ng-nest/ui/loading'; +import { XTreeComponent } from '@ng-nest/ui/tree'; @Component({ selector: `${XTreeFilePrefix}`, + standalone: true, + imports: [ + CommonModule, + XTreeComponent, + XLinkComponent, + XCrumbComponent, + XIconComponent, + XLoadingComponent, + XHighlightComponent + ], templateUrl: './tree-file.component.html', styleUrls: ['./tree-file.component.scss'], encapsulation: ViewEncapsulation.None, @@ -35,20 +50,16 @@ export class XTreeFileComponent extends XTreeFileProperty { return this.activatedNode?.highlightLines as XHighlightLines; } - constructor( - public renderer: Renderer2, - public elementRef: ElementRef, - public cdr: ChangeDetectorRef, - @Optional() public http: HttpClient, - public configService: XConfigService - ) { - super(); - if (!http) { - throw new Error(`${XTreeFilePrefix}: Not found 'HttpClient', You can import 'HttpClientModule' in your root module.`); - } - } + private cdr = inject(ChangeDetectorRef); + private http = inject(HttpClient, { optional: true })!; + configService = inject(XConfigService); ngOnInit() { + if (!this.http) { + throw new Error( + `${XTreeFilePrefix}: Not found 'HttpClient', You can import 'HttpClientModule' in your root module.` + ); + } if (!this.showTree && this.activatedId) { this.catalogChange((this.data as XTreeFileNode[]).find((x) => x.id == this.activatedId) as XTreeFileNode); } @@ -68,7 +79,9 @@ export class XTreeFileComponent extends XTreeFileProperty { this.http .get(node.url, { responseType: 'text' }) .pipe( - delay(new Date().getTime() - this.time > this.timeout ? 0 : this.timeout - new Date().getTime() + this.time), + delay( + new Date().getTime() - this.time > this.timeout ? 0 : this.timeout - new Date().getTime() + this.time + ), finalize(() => { this.loading = false; this.cdr.detectChanges(); diff --git a/lib/ng-nest/ui/tree-file/tree-file.module.ts b/lib/ng-nest/ui/tree-file/tree-file.module.ts index 9a39c31af..938559e2d 100644 --- a/lib/ng-nest/ui/tree-file/tree-file.module.ts +++ b/lib/ng-nest/ui/tree-file/tree-file.module.ts @@ -1,17 +1,8 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { XTreeFileComponent } from './tree-file.component'; -import { XTreeFileProperty } from './tree-file.property'; -import { XTreeModule } from '@ng-nest/ui/tree'; -import { XHighlightComponent } from '@ng-nest/ui/highlight'; -import { XCrumbComponent } from '@ng-nest/ui/crumb'; -import { XIconComponent } from '@ng-nest/ui/icon'; -import { XLinkComponent } from '@ng-nest/ui/link'; -import { XLoadingComponent } from '@ng-nest/ui/loading'; @NgModule({ - declarations: [XTreeFileComponent, XTreeFileProperty], exports: [XTreeFileComponent], - imports: [CommonModule, XTreeModule, XLinkComponent, XCrumbComponent, XIconComponent, XLoadingComponent, XHighlightComponent] + imports: [XTreeFileComponent] }) export class XTreeFileModule {} diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/async/async.component.html b/lib/ng-nest/ui/tree-select/examples/en_US/default/async/async.component.html index da1ec7594..4ef0e0de8 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/async/async.component.html +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/async/async.component.html @@ -1,20 +1,18 @@ - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/async/async.component.scss b/lib/ng-nest/ui/tree-select/examples/en_US/default/async/async.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/async/async.component.scss +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/async/async.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/async/async.component.ts b/lib/ng-nest/ui/tree-select/examples/en_US/default/async/async.component.ts index b1c6e6287..a97838a8d 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/async/async.component.ts +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/async/async.component.ts @@ -1,9 +1,12 @@ import { Component } from '@angular/core'; -import { XTreeSelectNode } from '@ng-nest/ui/tree-select'; +import { FormsModule } from '@angular/forms'; +import { XTreeSelectComponent, XTreeSelectNode } from '@ng-nest/ui/tree-select'; import { Observable } from 'rxjs'; @Component({ selector: 'ex-async', + standalone: true, + imports: [FormsModule, XTreeSelectComponent], templateUrl: './async.component.html', styleUrls: ['./async.component.scss'] }) diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/bordered/bordered.component.html b/lib/ng-nest/ui/tree-select/examples/en_US/default/bordered/bordered.component.html index fb43c67ef..b77a36431 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/bordered/bordered.component.html +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/bordered/bordered.component.html @@ -1,17 +1,15 @@ - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/bordered/bordered.component.scss b/lib/ng-nest/ui/tree-select/examples/en_US/default/bordered/bordered.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/bordered/bordered.component.scss +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/bordered/bordered.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/bordered/bordered.component.ts b/lib/ng-nest/ui/tree-select/examples/en_US/default/bordered/bordered.component.ts index 83dda194c..32ae4bd8f 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/bordered/bordered.component.ts +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/bordered/bordered.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; -import { XTreeSelectNode } from '@ng-nest/ui/tree-select'; +import { XTreeSelectComponent, XTreeSelectNode } from '@ng-nest/ui/tree-select'; @Component({ selector: 'ex-bordered', + standalone: true, + imports: [XTreeSelectComponent], templateUrl: './bordered.component.html', styleUrls: ['./bordered.component.scss'] }) diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/custom/custom.component.html b/lib/ng-nest/ui/tree-select/examples/en_US/default/custom/custom.component.html index e02975993..5fe94b45a 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/custom/custom.component.html +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/custom/custom.component.html @@ -1,11 +1,9 @@ - - - - - - - - +
+ +
+
+ +
{{ node?.label }}[{{ node.id }}] diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/custom/custom.component.scss b/lib/ng-nest/ui/tree-select/examples/en_US/default/custom/custom.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/custom/custom.component.scss +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/custom/custom.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/custom/custom.component.ts b/lib/ng-nest/ui/tree-select/examples/en_US/default/custom/custom.component.ts index c49633873..b02c2ca7f 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/custom/custom.component.ts @@ -1,8 +1,12 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; -import { XTreeSelectNode } from '@ng-nest/ui/tree-select'; +import { FormsModule } from '@angular/forms'; +import { XTreeSelectComponent, XTreeSelectNode } from '@ng-nest/ui/tree-select'; @Component({ selector: 'ex-custom', + standalone: true, + imports: [CommonModule, FormsModule, XTreeSelectComponent], templateUrl: './custom.component.html', styleUrls: ['./custom.component.scss'] }) diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/default/default.component.html b/lib/ng-nest/ui/tree-select/examples/en_US/default/default/default.component.html index b42b67b29..70045d409 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/default/default.component.html +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/default/default.component.html @@ -1,8 +1,6 @@ - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/default/default.component.scss b/lib/ng-nest/ui/tree-select/examples/en_US/default/default/default.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/default/default.component.scss +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/default/default.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/tree-select/examples/en_US/default/default/default.component.ts index b8b29cafc..04a9843c6 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/default/default.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; -import { XTreeSelectNode } from '@ng-nest/ui/tree-select'; +import { FormsModule } from '@angular/forms'; +import { XTreeSelectComponent, XTreeSelectNode } from '@ng-nest/ui/tree-select'; @Component({ selector: 'ex-default', + standalone: true, + imports: [FormsModule, XTreeSelectComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/disabled/disabled.component.html b/lib/ng-nest/ui/tree-select/examples/en_US/default/disabled/disabled.component.html index 78254db4a..3836c6da6 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/disabled/disabled.component.html +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/disabled/disabled.component.html @@ -1,8 +1,6 @@ - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/disabled/disabled.component.scss b/lib/ng-nest/ui/tree-select/examples/en_US/default/disabled/disabled.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/disabled/disabled.component.scss +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/disabled/disabled.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/disabled/disabled.component.ts b/lib/ng-nest/ui/tree-select/examples/en_US/default/disabled/disabled.component.ts index f4c043cb8..49b16586e 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/disabled/disabled.component.ts +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/disabled/disabled.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; -import { XTreeSelectNode } from '@ng-nest/ui/tree-select'; +import { FormsModule } from '@angular/forms'; +import { XTreeSelectComponent, XTreeSelectNode } from '@ng-nest/ui/tree-select'; @Component({ selector: 'ex-disabled', + standalone: true, + imports: [FormsModule, XTreeSelectComponent], templateUrl: './disabled.component.html', styleUrls: ['./disabled.component.scss'] }) diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/label/label.component.html b/lib/ng-nest/ui/tree-select/examples/en_US/default/label/label.component.html index 45444aa85..a7ecbab7f 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/label/label.component.html +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/label/label.component.html @@ -1,14 +1,12 @@ - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/label/label.component.scss b/lib/ng-nest/ui/tree-select/examples/en_US/default/label/label.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/label/label.component.scss +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/label/label.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/label/label.component.ts b/lib/ng-nest/ui/tree-select/examples/en_US/default/label/label.component.ts index 0fde7c70d..cf49dacea 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/label/label.component.ts +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/label/label.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; -import { XTreeSelectNode } from '@ng-nest/ui/tree-select'; +import { XTreeSelectComponent, XTreeSelectNode } from '@ng-nest/ui/tree-select'; @Component({ selector: 'ex-label', + standalone: true, + imports: [XTreeSelectComponent], templateUrl: './label.component.html', styleUrls: ['./label.component.scss'] }) diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/leaf/leaf.component.html b/lib/ng-nest/ui/tree-select/examples/en_US/default/leaf/leaf.component.html index 25e360655..94836a814 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/leaf/leaf.component.html +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/leaf/leaf.component.html @@ -1,16 +1,20 @@ - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/leaf/leaf.component.scss b/lib/ng-nest/ui/tree-select/examples/en_US/default/leaf/leaf.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/leaf/leaf.component.scss +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/leaf/leaf.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/leaf/leaf.component.ts b/lib/ng-nest/ui/tree-select/examples/en_US/default/leaf/leaf.component.ts index b51038ba0..06d79b135 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/leaf/leaf.component.ts +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/leaf/leaf.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; -import { XTreeSelectNode } from '@ng-nest/ui/tree-select'; +import { FormsModule } from '@angular/forms'; +import { XTreeSelectComponent, XTreeSelectNode } from '@ng-nest/ui/tree-select'; @Component({ selector: 'ex-leaf', + standalone: true, + imports: [FormsModule, XTreeSelectComponent], templateUrl: './leaf.component.html', styleUrls: ['./leaf.component.scss'] }) diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/multiple/multiple.component.html b/lib/ng-nest/ui/tree-select/examples/en_US/default/multiple/multiple.component.html index 21408071e..022d8e430 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/multiple/multiple.component.html +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/multiple/multiple.component.html @@ -1,67 +1,67 @@ - - - - - - - - - - - - - - - - - - - 更多 {{ surplus }} 个，共选中 {{ total }} 个 - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + More {{ surplus }} . Total {{ total }} + +
diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/multiple/multiple.component.scss b/lib/ng-nest/ui/tree-select/examples/en_US/default/multiple/multiple.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/multiple/multiple.component.scss +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/multiple/multiple.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/multiple/multiple.component.ts b/lib/ng-nest/ui/tree-select/examples/en_US/default/multiple/multiple.component.ts index 01465be4e..2e69f7b88 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/multiple/multiple.component.ts +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/multiple/multiple.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XTreeSelectComponent } from '@ng-nest/ui/tree-select'; @Component({ selector: 'ex-multiple', + standalone: true, + imports: [FormsModule, XTreeSelectComponent], templateUrl: './multiple.component.html', styleUrls: ['./multiple.component.scss'] }) diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/path/path.component.html b/lib/ng-nest/ui/tree-select/examples/en_US/default/path/path.component.html index 6d13b06d2..37959e70d 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/path/path.component.html +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/path/path.component.html @@ -1,18 +1,28 @@ - - - - - - - - - - - +
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/path/path.component.scss b/lib/ng-nest/ui/tree-select/examples/en_US/default/path/path.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/path/path.component.scss +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/path/path.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/path/path.component.ts b/lib/ng-nest/ui/tree-select/examples/en_US/default/path/path.component.ts index 96e3da459..a93445f1c 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/path/path.component.ts +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/path/path.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; -import { XTreeSelectNode } from '@ng-nest/ui/tree-select'; +import { FormsModule } from '@angular/forms'; +import { XTreeSelectComponent, XTreeSelectNode } from '@ng-nest/ui/tree-select'; @Component({ selector: 'ex-path', + standalone: true, + imports: [FormsModule, XTreeSelectComponent], templateUrl: './path.component.html', styleUrls: ['./path.component.scss'] }) diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/required/required.component.html b/lib/ng-nest/ui/tree-select/examples/en_US/default/required/required.component.html index cd95cbab2..d67beca27 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/required/required.component.html +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/required/required.component.html @@ -1,8 +1,6 @@ - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/required/required.component.scss b/lib/ng-nest/ui/tree-select/examples/en_US/default/required/required.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/required/required.component.scss +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/required/required.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/required/required.component.ts b/lib/ng-nest/ui/tree-select/examples/en_US/default/required/required.component.ts index 5f1f17ffb..96a33a6af 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/required/required.component.ts +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/required/required.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; -import { XTreeSelectNode } from '@ng-nest/ui/tree-select'; +import { FormsModule } from '@angular/forms'; +import { XTreeSelectComponent, XTreeSelectNode } from '@ng-nest/ui/tree-select'; @Component({ selector: 'ex-required', + standalone: true, + imports: [FormsModule, XTreeSelectComponent], templateUrl: './required.component.html', styleUrls: ['./required.component.scss'] }) diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/scroll/scroll.component.scss b/lib/ng-nest/ui/tree-select/examples/en_US/default/scroll/scroll.component.scss deleted file mode 100644 index dc9093b45..000000000 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/scroll/scroll.component.scss +++ /dev/null @@ -1,2 +0,0 @@ -:host { -} diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/scroll/scroll.component.ts b/lib/ng-nest/ui/tree-select/examples/en_US/default/scroll/scroll.component.ts index de9c1852e..194599f46 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/scroll/scroll.component.ts +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/scroll/scroll.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; +import { XTreeSelectComponent } from '@ng-nest/ui/tree-select'; @Component({ selector: 'ex-scroll', - templateUrl: './scroll.component.html', - styleUrls: ['./scroll.component.scss'] + standalone: true, + imports: [XTreeSelectComponent], + templateUrl: './scroll.component.html' }) export class ExScrollComponent { data = [ diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/search/search.component.html b/lib/ng-nest/ui/tree-select/examples/en_US/default/search/search.component.html index bf587684f..0a62e9ee9 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/search/search.component.html +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/search/search.component.html @@ -1,46 +1,44 @@ - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/search/search.component.scss b/lib/ng-nest/ui/tree-select/examples/en_US/default/search/search.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/search/search.component.scss +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/search/search.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/search/search.component.ts b/lib/ng-nest/ui/tree-select/examples/en_US/default/search/search.component.ts index 945330a3e..faa02d3ab 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/search/search.component.ts +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/search/search.component.ts @@ -1,10 +1,13 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; import { XIsEmpty } from '@ng-nest/ui/core'; -import { XTreeSelectNode } from '@ng-nest/ui/tree-select'; +import { XTreeSelectComponent, XTreeSelectNode } from '@ng-nest/ui/tree-select'; import { Observable } from 'rxjs'; @Component({ selector: 'ex-search', + standalone: true, + imports: [FormsModule, XTreeSelectComponent], templateUrl: './search.component.html', styleUrls: ['./search.component.scss'] }) diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/size/size.component.html b/lib/ng-nest/ui/tree-select/examples/en_US/default/size/size.component.html index f53582712..e65c51701 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/size/size.component.html +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/size/size.component.html @@ -1,21 +1,19 @@ - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/size/size.component.scss b/lib/ng-nest/ui/tree-select/examples/en_US/default/size/size.component.scss index db47dab4e..5e83058ed 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/size/size.component.scss +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/size/size.component.scss @@ -1,9 +1,5 @@ :host { - x-row { - width: 20rem; - } - x-row > x-col { + .row { margin-top: 1rem; - width: 15rem; } } diff --git a/lib/ng-nest/ui/tree-select/examples/en_US/default/size/size.component.ts b/lib/ng-nest/ui/tree-select/examples/en_US/default/size/size.component.ts index 9bd3722d6..a400435cc 100644 --- a/lib/ng-nest/ui/tree-select/examples/en_US/default/size/size.component.ts +++ b/lib/ng-nest/ui/tree-select/examples/en_US/default/size/size.component.ts @@ -1,9 +1,13 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; import { XSize } from '@ng-nest/ui/core'; -import { XTreeSelectNode } from '@ng-nest/ui/tree-select'; +import { XRadioComponent } from '@ng-nest/ui/radio'; +import { XTreeSelectComponent, XTreeSelectNode } from '@ng-nest/ui/tree-select'; @Component({ selector: 'ex-size', + standalone: true, + imports: [FormsModule, XTreeSelectComponent, XRadioComponent], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/tree-select/examples/index.ts b/lib/ng-nest/ui/tree-select/examples/index.ts new file mode 100644 index 000000000..ee903404b --- /dev/null +++ b/lib/ng-nest/ui/tree-select/examples/index.ts @@ -0,0 +1,13 @@ +export * from './zh_CN/default/async/async.component'; +export * from './zh_CN/default/bordered/bordered.component'; +export * from './zh_CN/default/custom/custom.component'; +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/disabled/disabled.component'; +export * from './zh_CN/default/label/label.component'; +export * from './zh_CN/default/leaf/leaf.component'; +export * from './zh_CN/default/multiple/multiple.component'; +export * from './zh_CN/default/path/path.component'; +export * from './zh_CN/default/required/required.component'; +export * from './zh_CN/default/scroll/scroll.component'; +export * from './zh_CN/default/search/search.component'; +export * from './zh_CN/default/size/size.component'; diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/async/async.component.html b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/async/async.component.html index ce7d83980..9c05f1cde 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/async/async.component.html +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/async/async.component.html @@ -1,14 +1,18 @@ - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/async/async.component.scss b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/async/async.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/async/async.component.scss +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/async/async.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/async/async.component.ts b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/async/async.component.ts index d9a9c91b1..0affb0163 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/async/async.component.ts +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/async/async.component.ts @@ -1,9 +1,12 @@ import { Component } from '@angular/core'; -import { XTreeSelectNode } from '@ng-nest/ui/tree-select'; +import { FormsModule } from '@angular/forms'; +import { XTreeSelectComponent, XTreeSelectNode } from '@ng-nest/ui/tree-select'; import { Observable } from 'rxjs'; @Component({ selector: 'ex-async', + standalone: true, + imports: [FormsModule, XTreeSelectComponent], templateUrl: './async.component.html', styleUrls: ['./async.component.scss'] }) diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/bordered/bordered.component.html b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/bordered/bordered.component.html index fb43c67ef..4f892d08e 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/bordered/bordered.component.html +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/bordered/bordered.component.html @@ -1,17 +1,15 @@ - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/bordered/bordered.component.scss b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/bordered/bordered.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/bordered/bordered.component.scss +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/bordered/bordered.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/bordered/bordered.component.ts b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/bordered/bordered.component.ts index 49c866e36..2dffe7ffd 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/bordered/bordered.component.ts +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/bordered/bordered.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; -import { XTreeSelectNode } from '@ng-nest/ui/tree-select'; +import { XTreeSelectComponent, XTreeSelectNode } from '@ng-nest/ui/tree-select'; @Component({ selector: 'ex-bordered', + standalone: true, + imports: [XTreeSelectComponent], templateUrl: './bordered.component.html', styleUrls: ['./bordered.component.scss'] }) diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/custom/custom.component.html b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/custom/custom.component.html index e02975993..5fe94b45a 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/custom/custom.component.html +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/custom/custom.component.html @@ -1,11 +1,9 @@ - - - - - - - - +
+ +
+
+ +
{{ node?.label }}[{{ node.id }}] diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/custom/custom.component.scss b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/custom/custom.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/custom/custom.component.scss +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/custom/custom.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/custom/custom.component.ts b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/custom/custom.component.ts index 420d7563b..199a662f3 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/custom/custom.component.ts @@ -1,8 +1,12 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; -import { XTreeSelectNode } from '@ng-nest/ui/tree-select'; +import { FormsModule } from '@angular/forms'; +import { XTreeSelectComponent, XTreeSelectNode } from '@ng-nest/ui/tree-select'; @Component({ selector: 'ex-custom', + standalone: true, + imports: [CommonModule, FormsModule, XTreeSelectComponent], templateUrl: './custom.component.html', styleUrls: ['./custom.component.scss'] }) diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/default/default.component.html b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/default/default.component.html index b42b67b29..70045d409 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/default/default.component.html +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/default/default.component.html @@ -1,8 +1,6 @@ - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/default/default.component.scss b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/default/default.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/default/default.component.scss +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/default/default.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/default/default.component.ts index 4ef64696d..91ae13ccf 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/default/default.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; -import { XTreeSelectNode } from '@ng-nest/ui/tree-select'; +import { FormsModule } from '@angular/forms'; +import { XTreeSelectComponent, XTreeSelectNode } from '@ng-nest/ui/tree-select'; @Component({ selector: 'ex-default', + standalone: true, + imports: [FormsModule, XTreeSelectComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/disabled/disabled.component.html b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/disabled/disabled.component.html index 78254db4a..3836c6da6 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/disabled/disabled.component.html +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/disabled/disabled.component.html @@ -1,8 +1,6 @@ - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/disabled/disabled.component.scss b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/disabled/disabled.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/disabled/disabled.component.scss +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/disabled/disabled.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/disabled/disabled.component.ts b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/disabled/disabled.component.ts index e2376c4df..717c1ba75 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/disabled/disabled.component.ts +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/disabled/disabled.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; -import { XTreeSelectNode } from '@ng-nest/ui/tree-select'; +import { FormsModule } from '@angular/forms'; +import { XTreeSelectComponent, XTreeSelectNode } from '@ng-nest/ui/tree-select'; @Component({ selector: 'ex-disabled', + standalone: true, + imports: [FormsModule, XTreeSelectComponent], templateUrl: './disabled.component.html', styleUrls: ['./disabled.component.scss'] }) diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/label/label.component.html b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/label/label.component.html index 45444aa85..879b19986 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/label/label.component.html +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/label/label.component.html @@ -1,14 +1,12 @@ - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/label/label.component.scss b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/label/label.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/label/label.component.scss +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/label/label.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/label/label.component.ts b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/label/label.component.ts index 85a332012..c84f9ecc1 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/label/label.component.ts +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/label/label.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; -import { XTreeSelectNode } from '@ng-nest/ui/tree-select'; +import { XTreeSelectComponent, XTreeSelectNode } from '@ng-nest/ui/tree-select'; @Component({ selector: 'ex-label', + standalone: true, + imports: [XTreeSelectComponent], templateUrl: './label.component.html', styleUrls: ['./label.component.scss'] }) diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/leaf/leaf.component.html b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/leaf/leaf.component.html index 25e360655..19564ae0b 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/leaf/leaf.component.html +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/leaf/leaf.component.html @@ -1,16 +1,20 @@ - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/leaf/leaf.component.scss b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/leaf/leaf.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/leaf/leaf.component.scss +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/leaf/leaf.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/leaf/leaf.component.ts b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/leaf/leaf.component.ts index b51038ba0..06d79b135 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/leaf/leaf.component.ts +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/leaf/leaf.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; -import { XTreeSelectNode } from '@ng-nest/ui/tree-select'; +import { FormsModule } from '@angular/forms'; +import { XTreeSelectComponent, XTreeSelectNode } from '@ng-nest/ui/tree-select'; @Component({ selector: 'ex-leaf', + standalone: true, + imports: [FormsModule, XTreeSelectComponent], templateUrl: './leaf.component.html', styleUrls: ['./leaf.component.scss'] }) diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/multiple/multiple.component.html b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/multiple/multiple.component.html index 21408071e..1244bab03 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/multiple/multiple.component.html +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/multiple/multiple.component.html @@ -1,67 +1,67 @@ - - - - - - - - - - - - - - - - - - - 更多 {{ surplus }} 个，共选中 {{ total }} 个 - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + 更多 {{ surplus }} 个，共选中 {{ total }} 个 + +
diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/multiple/multiple.component.scss b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/multiple/multiple.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/multiple/multiple.component.scss +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/multiple/multiple.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/multiple/multiple.component.ts b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/multiple/multiple.component.ts index e42529ede..576b643c1 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/multiple/multiple.component.ts +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/multiple/multiple.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XTreeSelectComponent } from '@ng-nest/ui/tree-select'; @Component({ selector: 'ex-multiple', + standalone: true, + imports: [FormsModule, XTreeSelectComponent], templateUrl: './multiple.component.html', styleUrls: ['./multiple.component.scss'] }) diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/path/path.component.html b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/path/path.component.html index 6d13b06d2..37959e70d 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/path/path.component.html +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/path/path.component.html @@ -1,18 +1,28 @@ - - - - - - - - - - - +
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/path/path.component.scss b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/path/path.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/path/path.component.scss +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/path/path.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/path/path.component.ts b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/path/path.component.ts index ccdf27a63..4b79f8f96 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/path/path.component.ts +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/path/path.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; -import { XTreeSelectNode } from '@ng-nest/ui/tree-select'; +import { FormsModule } from '@angular/forms'; +import { XTreeSelectComponent, XTreeSelectNode } from '@ng-nest/ui/tree-select'; @Component({ selector: 'ex-path', + standalone: true, + imports: [FormsModule, XTreeSelectComponent], templateUrl: './path.component.html', styleUrls: ['./path.component.scss'] }) diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/required/required.component.html b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/required/required.component.html index cd95cbab2..a772838d5 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/required/required.component.html +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/required/required.component.html @@ -1,8 +1,6 @@ - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/required/required.component.scss b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/required/required.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/required/required.component.scss +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/required/required.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/required/required.component.ts b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/required/required.component.ts index c2272bf74..6be9b535b 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/required/required.component.ts +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/required/required.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; -import { XTreeSelectNode } from '@ng-nest/ui/tree-select'; +import { FormsModule } from '@angular/forms'; +import { XTreeSelectComponent, XTreeSelectNode } from '@ng-nest/ui/tree-select'; @Component({ selector: 'ex-required', + standalone: true, + imports: [FormsModule, XTreeSelectComponent], templateUrl: './required.component.html', styleUrls: ['./required.component.scss'] }) diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/scroll/scroll.component.scss b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/scroll/scroll.component.scss deleted file mode 100644 index dc9093b45..000000000 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/scroll/scroll.component.scss +++ /dev/null @@ -1,2 +0,0 @@ -:host { -} diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/scroll/scroll.component.ts b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/scroll/scroll.component.ts index 29a899c2e..a15374899 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/scroll/scroll.component.ts +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/scroll/scroll.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; +import { XTreeSelectComponent } from '@ng-nest/ui/tree-select'; @Component({ selector: 'ex-scroll', - templateUrl: './scroll.component.html', - styleUrls: ['./scroll.component.scss'] + standalone: true, + imports: [XTreeSelectComponent], + templateUrl: './scroll.component.html' }) export class ExScrollComponent { data = [ diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/search/search.component.html b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/search/search.component.html index bf587684f..68de7d473 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/search/search.component.html +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/search/search.component.html @@ -1,46 +1,44 @@ - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/search/search.component.scss b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/search/search.component.scss index 0fdf75e48..b4943baa0 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/search/search.component.scss +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/search/search.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/search/search.component.ts b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/search/search.component.ts index 5888ff1ff..4c4a27b7f 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/search/search.component.ts +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/search/search.component.ts @@ -1,10 +1,13 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; import { XIsEmpty } from '@ng-nest/ui/core'; -import { XTreeSelectNode } from '@ng-nest/ui/tree-select'; +import { XTreeSelectComponent, XTreeSelectNode } from '@ng-nest/ui/tree-select'; import { Observable } from 'rxjs'; @Component({ selector: 'ex-search', + standalone: true, + imports: [FormsModule, XTreeSelectComponent], templateUrl: './search.component.html', styleUrls: ['./search.component.scss'] }) diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/size/size.component.html b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/size/size.component.html index f53582712..254b12e42 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/size/size.component.html +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/size/size.component.html @@ -1,21 +1,19 @@ - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/size/size.component.scss b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/size/size.component.scss index db47dab4e..5e83058ed 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/size/size.component.scss +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/size/size.component.scss @@ -1,9 +1,5 @@ :host { - x-row { - width: 20rem; - } - x-row > x-col { + .row { margin-top: 1rem; - width: 15rem; } } diff --git a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/size/size.component.ts b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/size/size.component.ts index 5062ba6e8..39caf1554 100644 --- a/lib/ng-nest/ui/tree-select/examples/zh_CN/default/size/size.component.ts +++ b/lib/ng-nest/ui/tree-select/examples/zh_CN/default/size/size.component.ts @@ -1,9 +1,13 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; import { XSize } from '@ng-nest/ui/core'; -import { XTreeSelectNode } from '@ng-nest/ui/tree-select'; +import { XRadioComponent } from '@ng-nest/ui/radio'; +import { XTreeSelectComponent, XTreeSelectNode } from '@ng-nest/ui/tree-select'; @Component({ selector: 'ex-size', + standalone: true, + imports: [FormsModule, XTreeSelectComponent, XRadioComponent], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/tree-select/tree-select-portal.component.ts b/lib/ng-nest/ui/tree-select/tree-select-portal.component.ts index b20fe5f59..65e5d59d7 100644 --- a/lib/ng-nest/ui/tree-select/tree-select-portal.component.ts +++ b/lib/ng-nest/ui/tree-select/tree-select-portal.component.ts @@ -5,11 +5,11 @@ import { ChangeDetectorRef, OnInit, OnDestroy, - Renderer2, HostBinding, HostListener, TemplateRef, - ViewChild + ViewChild, + inject } from '@angular/core'; import { XTreeSelectNode, XTreeSelectPortalPrefix } from './tree-select.property'; import { BehaviorSubject, Subject } from 'rxjs'; @@ -18,9 +18,13 @@ import { map, takeUntil } from 'rxjs/operators'; import { XInputComponent } from '@ng-nest/ui/input'; import { XI18nService, XI18nTreeSelect } from '@ng-nest/ui/i18n'; import { XTreeComponent } from '@ng-nest/ui/tree'; +import { XEmptyComponent } from '@ng-nest/ui/empty'; +import { CommonModule } from '@angular/common'; @Component({ selector: `${XTreeSelectPortalPrefix}`, + standalone: true, + imports: [CommonModule, XTreeComponent, XEmptyComponent], templateUrl: './tree-select-portal.component.html', styleUrls: ['./tree-select-portal.component.scss'], encapsulation: ViewEncapsulation.None, @@ -81,7 +85,8 @@ export class XTreeSelectPortalComponent implements OnInit, OnDestroy { return this.selectAllText || this.locale.selectAllText; } - constructor(public renderer: Renderer2, public cdr: ChangeDetectorRef, public i18n: XI18nService) {} + private cdr = inject(ChangeDetectorRef); + private i18n = inject(XI18nService); ngOnInit(): void { this.valueChange.pipe(takeUntil(this._unSubject)).subscribe((x) => { diff --git a/lib/ng-nest/ui/tree-select/tree-select.component.spec.ts b/lib/ng-nest/ui/tree-select/tree-select.component.spec.ts index bcc240d0b..57744b351 100644 --- a/lib/ng-nest/ui/tree-select/tree-select.component.spec.ts +++ b/lib/ng-nest/ui/tree-select/tree-select.component.spec.ts @@ -1,16 +1,14 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XTreeSelectComponent } from './tree-select.component'; import { Component, DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { XTreeSelectModule } from '@ng-nest/ui/tree-select'; +import { XTreeSelectComponent } from '@ng-nest/ui/tree-select'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { XTreeSelectPrefix, XTreeSelectNode } from './tree-select.property'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { XData } from '@ng-nest/ui/core'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XThemeModule } from '@ng-nest/ui/theme'; -import { XRadioModule } from '@ng-nest/ui/radio'; +import { XThemeComponent } from '@ng-nest/ui/theme'; +import { XRadioComponent } from '@ng-nest/ui/radio'; import { XInputComponent } from '@ng-nest/ui/input'; import { HttpClientTestingModule } from '@angular/common/http/testing'; @@ -20,14 +18,14 @@ describe(XTreeSelectPrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, - XTreeSelectModule, + XThemeComponent, + XTreeSelectComponent, FormsModule, ReactiveFormsModule, XInputComponent, XRowComponent, XColComponent, - XRadioModule + XRadioComponent ], declarations: [TestXTreeSelectComponent] }).compileComponents(); diff --git a/lib/ng-nest/ui/tree-select/tree-select.component.ts b/lib/ng-nest/ui/tree-select/tree-select.component.ts index fa78fe1fe..1922bcc59 100644 --- a/lib/ng-nest/ui/tree-select/tree-select.component.ts +++ b/lib/ng-nest/ui/tree-select/tree-select.component.ts @@ -12,7 +12,9 @@ import { ViewContainerRef, ViewChild, TemplateRef, - inject + inject, + AfterViewInit, + OnDestroy } from '@angular/core'; import { XTreeSelectNode, XTreeSelectProperty, XTreeSelectPrefix } from './tree-select.property'; import { @@ -36,22 +38,32 @@ import { import { XPortalService, XPortalOverlayRef, XPortalConnectedPosition } from '@ng-nest/ui/portal'; import { XInputComponent } from '@ng-nest/ui/input'; import { XTreeSelectPortalComponent } from './tree-select-portal.component'; -import { Overlay, FlexibleConnectedPositionStrategy, ConnectedOverlayPositionChange, OverlayConfig } from '@angular/cdk/overlay'; +import { + Overlay, + FlexibleConnectedPositionStrategy, + ConnectedOverlayPositionChange, + OverlayConfig +} from '@angular/cdk/overlay'; import { takeUntil, throttleTime, debounceTime, distinctUntilChanged, map, filter } from 'rxjs/operators'; import { DOWN_ARROW, UP_ARROW, ENTER, MAC_ENTER, LEFT_ARROW, RIGHT_ARROW, TAB, BACKSPACE } from '@angular/cdk/keycodes'; import { XValueAccessor } from '@ng-nest/ui/base-form'; import { XI18nTreeSelect, XI18nService } from '@ng-nest/ui/i18n'; -import { DOCUMENT } from '@angular/common'; +import { CommonModule, DOCUMENT } from '@angular/common'; +import { XTagComponent } from '@ng-nest/ui/tag'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { XOutletDirective } from '@ng-nest/ui/outlet'; @Component({ selector: `${XTreeSelectPrefix}`, + standalone: true, + imports: [CommonModule, FormsModule, ReactiveFormsModule, XInputComponent, XTagComponent, XOutletDirective], templateUrl: './tree-select.component.html', styleUrls: ['./tree-select.component.scss'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, providers: [XValueAccessor(XTreeSelectComponent)] }) -export class XTreeSelectComponent extends XTreeSelectProperty implements OnInit, OnChanges { +export class XTreeSelectComponent extends XTreeSelectProperty implements OnInit, OnChanges, AfterViewInit, OnDestroy { @ViewChild('inputCom', { static: true }) inputCom!: XInputComponent; @ViewChild('treeSelect', { static: true }) treeSelect!: ElementRef; @ViewChild('multipleValueTpl', { static: true }) multipleValueTpl!: TemplateRef; @@ -119,19 +131,14 @@ export class XTreeSelectComponent extends XTreeSelectProperty implements OnInit, private _unSubject = new Subject(); private _resizeObserver!: XResizeObserver; document = inject(DOCUMENT); - - constructor( - public renderer: Renderer2, - public override cdr: ChangeDetectorRef, - private portalService: XPortalService, - private viewContainerRef: ViewContainerRef, - private overlay: Overlay, - public i18n: XI18nService, - public configService: XConfigService, - public elementRef: ElementRef - ) { - super(); - } + private renderer = inject(Renderer2); + override cdr = inject(ChangeDetectorRef); + private portalService = inject(XPortalService); + private viewContainerRef = inject(ViewContainerRef); + private overlay = inject(Overlay); + private i18n = inject(XI18nService); + private elementRef = inject(ElementRef); + configService = inject(XConfigService); ngOnInit() { this.setFlex(this.treeSelect.nativeElement, this.renderer, this.justify, this.align, this.direction); @@ -196,12 +203,17 @@ export class XTreeSelectComponent extends XTreeSelectProperty implements OnInit, this.closeSubject.pipe(takeUntil(this._unSubject)).subscribe(() => { this.closePortal(); }); - this.inputChange.pipe(debounceTime(this.debounceTime as number), distinctUntilChanged(), takeUntil(this._unSubject)).subscribe((x) => { - this.modelChange(x); - }); + this.inputChange + .pipe(debounceTime(this.debounceTime as number), distinctUntilChanged(), takeUntil(this._unSubject)) + .subscribe((x) => { + this.modelChange(x); + }); this.keydownSubject.pipe(throttleTime(10), takeUntil(this._unSubject)).subscribe((x) => { const keyCode = x.keyCode; - if (!this.portalAttached() && [DOWN_ARROW, UP_ARROW, LEFT_ARROW, RIGHT_ARROW, ENTER, MAC_ENTER, BACKSPACE].includes(keyCode)) { + if ( + !this.portalAttached() && + [DOWN_ARROW, UP_ARROW, LEFT_ARROW, RIGHT_ARROW, ENTER, MAC_ENTER, BACKSPACE].includes(keyCode) + ) { this.inputChange.next(this.displayValue); } // if (this.portalAttached() && [ESCAPE].includes(keyCode)) { diff --git a/lib/ng-nest/ui/tree-select/tree-select.module.ts b/lib/ng-nest/ui/tree-select/tree-select.module.ts index 701542eee..336c1679d 100644 --- a/lib/ng-nest/ui/tree-select/tree-select.module.ts +++ b/lib/ng-nest/ui/tree-select/tree-select.module.ts @@ -1,33 +1,9 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { XTreeSelectComponent } from './tree-select.component'; -import { XInputComponent } from '@ng-nest/ui/input'; -import { XListComponent } from '@ng-nest/ui/list'; -import { XTreeSelectPortalComponent } from './tree-select-portal.component'; -import { XTreeSelectProperty } from './tree-select.property'; -import { XControlValueAccessor } from '@ng-nest/ui/base-form'; -import { XI18nDirective } from '@ng-nest/ui/i18n'; -import { XTagModule } from '@ng-nest/ui/tag'; -import { XOutletDirective } from '@ng-nest/ui/outlet'; -import { XTreeModule } from '@ng-nest/ui/tree'; -import { XEmptyComponent } from '@ng-nest/ui/empty'; @NgModule({ - declarations: [XTreeSelectComponent, XTreeSelectPortalComponent, XTreeSelectProperty], - exports: [XTreeSelectComponent, XTreeSelectPortalComponent], - imports: [ - CommonModule, - FormsModule, - ReactiveFormsModule, - XInputComponent, - XListComponent, - XControlValueAccessor, - XTagModule, - XI18nDirective, - XOutletDirective, - XTreeModule, - XEmptyComponent - ] + declarations: [], + exports: [XTreeSelectComponent], + imports: [XTreeSelectComponent] }) export class XTreeSelectModule {} diff --git a/lib/ng-nest/ui/tree/examples/en_US/default/activated/activated.component.html b/lib/ng-nest/ui/tree/examples/en_US/default/activated/activated.component.html index f63c58b87..1aabbd5a9 100644 --- a/lib/ng-nest/ui/tree/examples/en_US/default/activated/activated.component.html +++ b/lib/ng-nest/ui/tree/examples/en_US/default/activated/activated.component.html @@ -1,10 +1,8 @@ - - - Selected：{{ activatedId1 | json }} - - - - Selected：{{ activatedId2 | json }} - - - +
+ Selected：{{ activatedId1 | json }} + +
+
+ Selected：{{ activatedId2 | json }} + +
diff --git a/lib/ng-nest/ui/tree/examples/en_US/default/activated/activated.component.ts b/lib/ng-nest/ui/tree/examples/en_US/default/activated/activated.component.ts index fcc399105..1247e304c 100644 --- a/lib/ng-nest/ui/tree/examples/en_US/default/activated/activated.component.ts +++ b/lib/ng-nest/ui/tree/examples/en_US/default/activated/activated.component.ts @@ -1,8 +1,11 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; -import { XTreeNode } from '@ng-nest/ui/tree'; +import { XTreeNode, XTreeComponent } from '@ng-nest/ui/tree'; @Component({ selector: 'ex-activated', + standalone: true, + imports: [CommonModule, XTreeComponent], templateUrl: './activated.component.html' }) export class ExActivatedComponent { diff --git a/lib/ng-nest/ui/tree/examples/en_US/default/checkbox/checkbox.component.html b/lib/ng-nest/ui/tree/examples/en_US/default/checkbox/checkbox.component.html index 80faa7445..32f0657c5 100644 --- a/lib/ng-nest/ui/tree/examples/en_US/default/checkbox/checkbox.component.html +++ b/lib/ng-nest/ui/tree/examples/en_US/default/checkbox/checkbox.component.html @@ -1,5 +1 @@ - - - - - + diff --git a/lib/ng-nest/ui/tree/examples/en_US/default/checkbox/checkbox.component.ts b/lib/ng-nest/ui/tree/examples/en_US/default/checkbox/checkbox.component.ts index ccd9a4488..df0203761 100644 --- a/lib/ng-nest/ui/tree/examples/en_US/default/checkbox/checkbox.component.ts +++ b/lib/ng-nest/ui/tree/examples/en_US/default/checkbox/checkbox.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; -import { XTreeNode } from '@ng-nest/ui/tree'; +import { XTreeComponent, XTreeNode } from '@ng-nest/ui/tree'; @Component({ selector: 'ex-checkbox', + standalone: true, + imports: [XTreeComponent], templateUrl: './checkbox.component.html' }) export class ExCheckboxComponent { diff --git a/lib/ng-nest/ui/tree/examples/en_US/default/control/control.component.html b/lib/ng-nest/ui/tree/examples/en_US/default/control/control.component.html index 3da90ade1..552c5ee0f 100644 --- a/lib/ng-nest/ui/tree/examples/en_US/default/control/control.component.html +++ b/lib/ng-nest/ui/tree/examples/en_US/default/control/control.component.html @@ -1,16 +1,15 @@ - - -
    -
  • Currently active node:{{ activatedNode?.label }}
    • -
  • Set the selected node by Key value
    • -
  • Get the Key value of the selected node
    • -
  • - {{ expandedAll ? 'Collapse all' : 'Expand all' }} -
    • -
  • {{ content | json }}
    • -
- - - - - +
+
    +
  • Currently active node:{{ activatedNode?.label }}
    • +
  • Set the selected node by Key value
    • +
  • Get the Key value of the selected node
    • +
  • + {{ expandedAll ? 'Collapse all' : 'Expand all' }} +
    • +
  • {{ content | json }}
    • +
+
+
+ + +
diff --git a/lib/ng-nest/ui/tree/examples/en_US/default/control/control.component.scss b/lib/ng-nest/ui/tree/examples/en_US/default/control/control.component.scss index 3c5088b20..3a67be242 100644 --- a/lib/ng-nest/ui/tree/examples/en_US/default/control/control.component.scss +++ b/lib/ng-nest/ui/tree/examples/en_US/default/control/control.component.scss @@ -1,4 +1,7 @@ :host { + .row:not(:first-child) { + margin-top: 1rem; + } .operations > li:not(:first-child) { margin-top: 1rem; } diff --git a/lib/ng-nest/ui/tree/examples/en_US/default/control/control.component.ts b/lib/ng-nest/ui/tree/examples/en_US/default/control/control.component.ts index d2e36dfe1..e8010ca43 100644 --- a/lib/ng-nest/ui/tree/examples/en_US/default/control/control.component.ts +++ b/lib/ng-nest/ui/tree/examples/en_US/default/control/control.component.ts @@ -1,8 +1,12 @@ +import { CommonModule } from '@angular/common'; import { Component, ViewChild } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; import { XTreeNode, XTreeComponent } from '@ng-nest/ui/tree'; @Component({ selector: 'ex-control', + standalone: true, + imports: [CommonModule, XTreeComponent, XButtonComponent], templateUrl: './control.component.html', styleUrls: ['./control.component.scss'] }) diff --git a/lib/ng-nest/ui/tree/examples/en_US/default/custom/custom.component.html b/lib/ng-nest/ui/tree/examples/en_US/default/custom/custom.component.html index a8a09e878..615bca92a 100644 --- a/lib/ng-nest/ui/tree/examples/en_US/default/custom/custom.component.html +++ b/lib/ng-nest/ui/tree/examples/en_US/default/custom/custom.component.html @@ -1,15 +1,11 @@ - - - - -
- {{ node.label }} - - Add - Modify - Delete - -
- - - + + +
+ {{ node.label }} + + Add + Modify + Delete + +
+ diff --git a/lib/ng-nest/ui/tree/examples/en_US/default/custom/custom.component.ts b/lib/ng-nest/ui/tree/examples/en_US/default/custom/custom.component.ts index 80cfb977b..86c995ddd 100644 --- a/lib/ng-nest/ui/tree/examples/en_US/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/tree/examples/en_US/default/custom/custom.component.ts @@ -1,8 +1,12 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; -import { XTreeNode } from '@ng-nest/ui/tree'; +import { XLinkComponent } from '@ng-nest/ui/link'; +import { XTreeComponent, XTreeNode } from '@ng-nest/ui/tree'; @Component({ selector: 'ex-custom', + standalone: true, + imports: [CommonModule, XTreeComponent, XLinkComponent], templateUrl: './custom.component.html', styleUrls: ['./custom.component.scss'] }) diff --git a/lib/ng-nest/ui/tree/examples/en_US/default/default/default.component.html b/lib/ng-nest/ui/tree/examples/en_US/default/default/default.component.html index 2e4683064..b8a16f582 100644 --- a/lib/ng-nest/ui/tree/examples/en_US/default/default/default.component.html +++ b/lib/ng-nest/ui/tree/examples/en_US/default/default/default.component.html @@ -1,5 +1 @@ - - - - - + diff --git a/lib/ng-nest/ui/tree/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/tree/examples/en_US/default/default/default.component.ts index e200c1b8c..b48ee7136 100644 --- a/lib/ng-nest/ui/tree/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/tree/examples/en_US/default/default/default.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; -import { XTreeNode } from '@ng-nest/ui/tree'; +import { XTreeComponent, XTreeNode } from '@ng-nest/ui/tree'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XTreeComponent], templateUrl: './default.component.html' }) export class ExDefaultComponent { diff --git a/lib/ng-nest/ui/tree/examples/en_US/default/drag/drag.component.ts b/lib/ng-nest/ui/tree/examples/en_US/default/drag/drag.component.ts index a7a0327cd..c6614f4e7 100644 --- a/lib/ng-nest/ui/tree/examples/en_US/default/drag/drag.component.ts +++ b/lib/ng-nest/ui/tree/examples/en_US/default/drag/drag.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; -import { XTreeNode, XTreeNodeDragEvent } from '@ng-nest/ui/tree'; +import { XTreeComponent, XTreeNode, XTreeNodeDragEvent } from '@ng-nest/ui/tree'; @Component({ selector: 'ex-drag', + standalone: true, + imports: [XTreeComponent], templateUrl: './drag.component.html' }) export class ExDragComponent { diff --git a/lib/ng-nest/ui/tree/examples/en_US/default/height/height.component.html b/lib/ng-nest/ui/tree/examples/en_US/default/height/height.component.html index 963e29247..d34e59d3e 100644 --- a/lib/ng-nest/ui/tree/examples/en_US/default/height/height.component.html +++ b/lib/ng-nest/ui/tree/examples/en_US/default/height/height.component.html @@ -1,13 +1,9 @@ - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/tree/examples/en_US/default/height/height.component.scss b/lib/ng-nest/ui/tree/examples/en_US/default/height/height.component.scss new file mode 100644 index 000000000..1ec81d561 --- /dev/null +++ b/lib/ng-nest/ui/tree/examples/en_US/default/height/height.component.scss @@ -0,0 +1,8 @@ +:host { + .row { + width: 15rem; + } + .row:not(:first-child) { + margin-top: 1rem; + } +} diff --git a/lib/ng-nest/ui/tree/examples/en_US/default/height/height.component.ts b/lib/ng-nest/ui/tree/examples/en_US/default/height/height.component.ts index 0921bfa38..efbf6fcb7 100644 --- a/lib/ng-nest/ui/tree/examples/en_US/default/height/height.component.ts +++ b/lib/ng-nest/ui/tree/examples/en_US/default/height/height.component.ts @@ -1,9 +1,12 @@ import { Component } from '@angular/core'; -import { XTreeNode } from '@ng-nest/ui/tree'; +import { XTreeComponent, XTreeNode } from '@ng-nest/ui/tree'; @Component({ selector: 'ex-height', - templateUrl: './height.component.html' + standalone: true, + imports: [XTreeComponent], + templateUrl: './height.component.html', + styleUrls: ['./height.component.scss'] }) export class ExHeightComponent { data: XTreeNode[] = [ diff --git a/lib/ng-nest/ui/tree/examples/en_US/default/icon/icon.component.ts b/lib/ng-nest/ui/tree/examples/en_US/default/icon/icon.component.ts index b23e986d0..ffa0c0d13 100644 --- a/lib/ng-nest/ui/tree/examples/en_US/default/icon/icon.component.ts +++ b/lib/ng-nest/ui/tree/examples/en_US/default/icon/icon.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; -import { XTreeNode } from '@ng-nest/ui/tree'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XTreeComponent, XTreeNode } from '@ng-nest/ui/tree'; @Component({ selector: 'ex-icon', + standalone: true, + imports: [XTreeComponent, XIconComponent], templateUrl: './icon.component.html' }) export class ExIconComponent { diff --git a/lib/ng-nest/ui/tree/examples/en_US/default/lazy/lazy.component.html b/lib/ng-nest/ui/tree/examples/en_US/default/lazy/lazy.component.html index aaa978d81..9764a60b4 100644 --- a/lib/ng-nest/ui/tree/examples/en_US/default/lazy/lazy.component.html +++ b/lib/ng-nest/ui/tree/examples/en_US/default/lazy/lazy.component.html @@ -1,5 +1 @@ - - - - - + diff --git a/lib/ng-nest/ui/tree/examples/en_US/default/lazy/lazy.component.scss b/lib/ng-nest/ui/tree/examples/en_US/default/lazy/lazy.component.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/lib/ng-nest/ui/tree/examples/en_US/default/lazy/lazy.component.ts b/lib/ng-nest/ui/tree/examples/en_US/default/lazy/lazy.component.ts index fba417a71..f81678b57 100644 --- a/lib/ng-nest/ui/tree/examples/en_US/default/lazy/lazy.component.ts +++ b/lib/ng-nest/ui/tree/examples/en_US/default/lazy/lazy.component.ts @@ -1,11 +1,12 @@ import { Component } from '@angular/core'; -import { XTreeNode } from '@ng-nest/ui/tree'; +import { XTreeComponent, XTreeNode } from '@ng-nest/ui/tree'; import { Observable } from 'rxjs'; @Component({ selector: 'ex-lazy', - templateUrl: './lazy.component.html', - styleUrls: ['./lazy.component.scss'] + standalone: true, + imports: [XTreeComponent], + templateUrl: './lazy.component.html' }) export class ExLazyComponent { data: XTreeNode[] = [ diff --git a/lib/ng-nest/ui/tree/examples/en_US/default/line/line.component.ts b/lib/ng-nest/ui/tree/examples/en_US/default/line/line.component.ts index 8b36e6e62..5ac2134a2 100644 --- a/lib/ng-nest/ui/tree/examples/en_US/default/line/line.component.ts +++ b/lib/ng-nest/ui/tree/examples/en_US/default/line/line.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; -import { XTreeNode } from '@ng-nest/ui/tree'; +import { XTreeComponent, XTreeNode } from '@ng-nest/ui/tree'; @Component({ selector: 'ex-line', + standalone: true, + imports: [XTreeComponent], templateUrl: './line.component.html' }) export class ExLineComponent { diff --git a/lib/ng-nest/ui/tree/examples/en_US/default/open/open.component.html b/lib/ng-nest/ui/tree/examples/en_US/default/open/open.component.html index d487bff27..29e27bcca 100644 --- a/lib/ng-nest/ui/tree/examples/en_US/default/open/open.component.html +++ b/lib/ng-nest/ui/tree/examples/en_US/default/open/open.component.html @@ -1,5 +1 @@ - - - - - + diff --git a/lib/ng-nest/ui/tree/examples/en_US/default/open/open.component.ts b/lib/ng-nest/ui/tree/examples/en_US/default/open/open.component.ts index c048cf836..989524323 100644 --- a/lib/ng-nest/ui/tree/examples/en_US/default/open/open.component.ts +++ b/lib/ng-nest/ui/tree/examples/en_US/default/open/open.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; -import { XTreeNode } from '@ng-nest/ui/tree'; +import { XTreeComponent, XTreeNode } from '@ng-nest/ui/tree'; @Component({ selector: 'ex-open', + standalone: true, + imports: [XTreeComponent], templateUrl: './open.component.html' }) export class ExOpenComponent { diff --git a/lib/ng-nest/ui/tree/examples/en_US/default/status/status.component.html b/lib/ng-nest/ui/tree/examples/en_US/default/status/status.component.html index 50981c637..e2297874b 100644 --- a/lib/ng-nest/ui/tree/examples/en_US/default/status/status.component.html +++ b/lib/ng-nest/ui/tree/examples/en_US/default/status/status.component.html @@ -1,5 +1 @@ - - - - - + diff --git a/lib/ng-nest/ui/tree/examples/en_US/default/status/status.component.ts b/lib/ng-nest/ui/tree/examples/en_US/default/status/status.component.ts index 401c1895e..ad7ebf899 100644 --- a/lib/ng-nest/ui/tree/examples/en_US/default/status/status.component.ts +++ b/lib/ng-nest/ui/tree/examples/en_US/default/status/status.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; -import { XTreeNode } from '@ng-nest/ui/tree'; +import { XTreeComponent, XTreeNode } from '@ng-nest/ui/tree'; @Component({ selector: 'ex-status', + standalone: true, + imports: [XTreeComponent], templateUrl: './status.component.html' }) export class ExStatusComponent { diff --git a/lib/ng-nest/ui/tree/examples/en_US/default/virtual-scroll/virtual-scroll.component.html b/lib/ng-nest/ui/tree/examples/en_US/default/virtual-scroll/virtual-scroll.component.html index 372630572..968e2b952 100644 --- a/lib/ng-nest/ui/tree/examples/en_US/default/virtual-scroll/virtual-scroll.component.html +++ b/lib/ng-nest/ui/tree/examples/en_US/default/virtual-scroll/virtual-scroll.component.html @@ -13,5 +13,6 @@

Lazy

Scroll Height Adaption

- + +
diff --git a/lib/ng-nest/ui/tree/examples/en_US/default/virtual-scroll/virtual-scroll.component.ts b/lib/ng-nest/ui/tree/examples/en_US/default/virtual-scroll/virtual-scroll.component.ts index 9ff78c0c8..01e20cabf 100644 --- a/lib/ng-nest/ui/tree/examples/en_US/default/virtual-scroll/virtual-scroll.component.ts +++ b/lib/ng-nest/ui/tree/examples/en_US/default/virtual-scroll/virtual-scroll.component.ts @@ -1,9 +1,14 @@ import { Component, ViewChild } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XInputNumberComponent } from '@ng-nest/ui/input-number'; import { XTreeComponent, XTreeNode } from '@ng-nest/ui/tree'; import { Observable } from 'rxjs'; @Component({ selector: 'ex-virtual-scroll', + standalone: true, + imports: [FormsModule, XTreeComponent, XButtonComponent, XInputNumberComponent], templateUrl: './virtual-scroll.component.html' }) export class ExVirtualScrollComponent { diff --git a/lib/ng-nest/ui/tree/examples/index.ts b/lib/ng-nest/ui/tree/examples/index.ts new file mode 100644 index 000000000..41932ee46 --- /dev/null +++ b/lib/ng-nest/ui/tree/examples/index.ts @@ -0,0 +1,13 @@ +export * from './zh_CN/default/activated/activated.component'; +export * from './zh_CN/default/checkbox/checkbox.component'; +export * from './zh_CN/default/control/control.component'; +export * from './zh_CN/default/custom/custom.component'; +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/drag/drag.component'; +export * from './zh_CN/default/height/height.component'; +export * from './zh_CN/default/icon/icon.component'; +export * from './zh_CN/default/lazy/lazy.component'; +export * from './zh_CN/default/line/line.component'; +export * from './zh_CN/default/open/open.component'; +export * from './zh_CN/default/status/status.component'; +export * from './zh_CN/default/virtual-scroll/virtual-scroll.component'; diff --git a/lib/ng-nest/ui/tree/examples/zh_CN/default/activated/activated.component.html b/lib/ng-nest/ui/tree/examples/zh_CN/default/activated/activated.component.html index a239746f2..09f0fc9e6 100644 --- a/lib/ng-nest/ui/tree/examples/zh_CN/default/activated/activated.component.html +++ b/lib/ng-nest/ui/tree/examples/zh_CN/default/activated/activated.component.html @@ -1,10 +1,8 @@ - - - 选中数据：{{ activatedId1 | json }} - - - - 选中数据：{{ activatedId2 | json }} - - - +
+ 选中数据：{{ activatedId1 | json }} + +
+
+ 选中数据：{{ activatedId2 | json }} + +
diff --git a/lib/ng-nest/ui/tree/examples/zh_CN/default/activated/activated.component.ts b/lib/ng-nest/ui/tree/examples/zh_CN/default/activated/activated.component.ts index 6186273c4..2de66a971 100644 --- a/lib/ng-nest/ui/tree/examples/zh_CN/default/activated/activated.component.ts +++ b/lib/ng-nest/ui/tree/examples/zh_CN/default/activated/activated.component.ts @@ -1,8 +1,11 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; -import { XTreeNode } from '@ng-nest/ui/tree'; +import { XTreeNode, XTreeComponent } from '@ng-nest/ui/tree'; @Component({ selector: 'ex-activated', + standalone: true, + imports: [CommonModule, XTreeComponent], templateUrl: './activated.component.html' }) export class ExActivatedComponent { diff --git a/lib/ng-nest/ui/tree/examples/zh_CN/default/checkbox/checkbox.component.html b/lib/ng-nest/ui/tree/examples/zh_CN/default/checkbox/checkbox.component.html index 80faa7445..32f0657c5 100644 --- a/lib/ng-nest/ui/tree/examples/zh_CN/default/checkbox/checkbox.component.html +++ b/lib/ng-nest/ui/tree/examples/zh_CN/default/checkbox/checkbox.component.html @@ -1,5 +1 @@ - - - - - + diff --git a/lib/ng-nest/ui/tree/examples/zh_CN/default/checkbox/checkbox.component.ts b/lib/ng-nest/ui/tree/examples/zh_CN/default/checkbox/checkbox.component.ts index e23809a73..6c3383d57 100644 --- a/lib/ng-nest/ui/tree/examples/zh_CN/default/checkbox/checkbox.component.ts +++ b/lib/ng-nest/ui/tree/examples/zh_CN/default/checkbox/checkbox.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; -import { XTreeNode } from '@ng-nest/ui/tree'; +import { XTreeComponent, XTreeNode } from '@ng-nest/ui/tree'; @Component({ selector: 'ex-checkbox', + standalone: true, + imports: [XTreeComponent], templateUrl: './checkbox.component.html' }) export class ExCheckboxComponent { diff --git a/lib/ng-nest/ui/tree/examples/zh_CN/default/control/control.component.html b/lib/ng-nest/ui/tree/examples/zh_CN/default/control/control.component.html index b5e7490cf..5e32419aa 100644 --- a/lib/ng-nest/ui/tree/examples/zh_CN/default/control/control.component.html +++ b/lib/ng-nest/ui/tree/examples/zh_CN/default/control/control.component.html @@ -1,16 +1,15 @@ - - -
    -
  • 当前激活的节点：{{ activatedNode?.label }}
    • -
  • 通过 Key 值设置选中的节点
    • -
  • 获取选中的节点的 Key 值
    • -
  • - {{ expandedAll ? '全部收起' : '全部展开' }} -
    • -
  • {{ content | json }}
    • -
- - - - - +
+
    +
  • 当前激活的节点：{{ activatedNode?.label }}
    • +
  • 通过 Key 值设置选中的节点
    • +
  • 获取选中的节点的 Key 值
    • +
  • + {{ expandedAll ? '全部收起' : '全部展开' }} +
    • +
  • {{ content | json }}
    • +
+
+
+ + +
diff --git a/lib/ng-nest/ui/tree/examples/zh_CN/default/control/control.component.scss b/lib/ng-nest/ui/tree/examples/zh_CN/default/control/control.component.scss index 3c5088b20..3a67be242 100644 --- a/lib/ng-nest/ui/tree/examples/zh_CN/default/control/control.component.scss +++ b/lib/ng-nest/ui/tree/examples/zh_CN/default/control/control.component.scss @@ -1,4 +1,7 @@ :host { + .row:not(:first-child) { + margin-top: 1rem; + } .operations > li:not(:first-child) { margin-top: 1rem; } diff --git a/lib/ng-nest/ui/tree/examples/zh_CN/default/control/control.component.ts b/lib/ng-nest/ui/tree/examples/zh_CN/default/control/control.component.ts index f021d6723..f2733dc80 100644 --- a/lib/ng-nest/ui/tree/examples/zh_CN/default/control/control.component.ts +++ b/lib/ng-nest/ui/tree/examples/zh_CN/default/control/control.component.ts @@ -1,8 +1,12 @@ +import { CommonModule } from '@angular/common'; import { Component, ViewChild } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; import { XTreeNode, XTreeComponent } from '@ng-nest/ui/tree'; @Component({ selector: 'ex-control', + standalone: true, + imports: [CommonModule, XTreeComponent, XButtonComponent], templateUrl: './control.component.html', styleUrls: ['./control.component.scss'] }) diff --git a/lib/ng-nest/ui/tree/examples/zh_CN/default/custom/custom.component.html b/lib/ng-nest/ui/tree/examples/zh_CN/default/custom/custom.component.html index d78d23469..28eca8473 100644 --- a/lib/ng-nest/ui/tree/examples/zh_CN/default/custom/custom.component.html +++ b/lib/ng-nest/ui/tree/examples/zh_CN/default/custom/custom.component.html @@ -1,15 +1,11 @@ - - - - -
- {{ node.label }} - - 新增 - 修改 - 删除 - -
- - - + + +
+ {{ node.label }} + + 新增 + 修改 + 删除 + +
+ diff --git a/lib/ng-nest/ui/tree/examples/zh_CN/default/custom/custom.component.ts b/lib/ng-nest/ui/tree/examples/zh_CN/default/custom/custom.component.ts index 2bd0b5f82..0c38c0f4a 100644 --- a/lib/ng-nest/ui/tree/examples/zh_CN/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/tree/examples/zh_CN/default/custom/custom.component.ts @@ -1,8 +1,12 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; -import { XTreeNode } from '@ng-nest/ui/tree'; +import { XLinkComponent } from '@ng-nest/ui/link'; +import { XTreeComponent, XTreeNode } from '@ng-nest/ui/tree'; @Component({ selector: 'ex-custom', + standalone: true, + imports: [CommonModule, XTreeComponent, XLinkComponent], templateUrl: './custom.component.html', styleUrls: ['./custom.component.scss'] }) diff --git a/lib/ng-nest/ui/tree/examples/zh_CN/default/default/default.component.html b/lib/ng-nest/ui/tree/examples/zh_CN/default/default/default.component.html index 2e4683064..b8a16f582 100644 --- a/lib/ng-nest/ui/tree/examples/zh_CN/default/default/default.component.html +++ b/lib/ng-nest/ui/tree/examples/zh_CN/default/default/default.component.html @@ -1,5 +1 @@ - - - - - + diff --git a/lib/ng-nest/ui/tree/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/tree/examples/zh_CN/default/default/default.component.ts index e7f7dcd5b..dfeb2fa31 100644 --- a/lib/ng-nest/ui/tree/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/tree/examples/zh_CN/default/default/default.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; -import { XTreeNode } from '@ng-nest/ui/tree'; +import { XTreeComponent, XTreeNode } from '@ng-nest/ui/tree'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XTreeComponent], templateUrl: './default.component.html' }) export class ExDefaultComponent { diff --git a/lib/ng-nest/ui/tree/examples/zh_CN/default/drag/drag.component.ts b/lib/ng-nest/ui/tree/examples/zh_CN/default/drag/drag.component.ts index c68bb33aa..f2a7aafa6 100644 --- a/lib/ng-nest/ui/tree/examples/zh_CN/default/drag/drag.component.ts +++ b/lib/ng-nest/ui/tree/examples/zh_CN/default/drag/drag.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; -import { XTreeNode, XTreeNodeDragEvent } from '@ng-nest/ui/tree'; +import { XTreeComponent, XTreeNode, XTreeNodeDragEvent } from '@ng-nest/ui/tree'; @Component({ selector: 'ex-drag', + standalone: true, + imports: [XTreeComponent], templateUrl: './drag.component.html' }) export class ExDragComponent { @@ -32,7 +34,9 @@ export class ExDragComponent { if (type === 'started') { console.log('开始拖动节点：', event.from?.label); } else { - console.log(`拖动节点 [${event.from?.label}] 至 [${event.to?.label}] 节点的 ${event.position === -1 ? '前面' : '后面'}`); + console.log( + `拖动节点 [${event.from?.label}] 至 [${event.to?.label}] 节点的 ${event.position === -1 ? '前面' : '后面'}` + ); } } } diff --git a/lib/ng-nest/ui/tree/examples/zh_CN/default/height/height.component.html b/lib/ng-nest/ui/tree/examples/zh_CN/default/height/height.component.html index 963e29247..d34e59d3e 100644 --- a/lib/ng-nest/ui/tree/examples/zh_CN/default/height/height.component.html +++ b/lib/ng-nest/ui/tree/examples/zh_CN/default/height/height.component.html @@ -1,13 +1,9 @@ - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/tree/examples/zh_CN/default/height/height.component.scss b/lib/ng-nest/ui/tree/examples/zh_CN/default/height/height.component.scss new file mode 100644 index 000000000..1ec81d561 --- /dev/null +++ b/lib/ng-nest/ui/tree/examples/zh_CN/default/height/height.component.scss @@ -0,0 +1,8 @@ +:host { + .row { + width: 15rem; + } + .row:not(:first-child) { + margin-top: 1rem; + } +} diff --git a/lib/ng-nest/ui/tree/examples/zh_CN/default/height/height.component.ts b/lib/ng-nest/ui/tree/examples/zh_CN/default/height/height.component.ts index 0921bfa38..3faef7476 100644 --- a/lib/ng-nest/ui/tree/examples/zh_CN/default/height/height.component.ts +++ b/lib/ng-nest/ui/tree/examples/zh_CN/default/height/height.component.ts @@ -1,9 +1,12 @@ import { Component } from '@angular/core'; -import { XTreeNode } from '@ng-nest/ui/tree'; +import { XTreeComponent, XTreeNode } from '@ng-nest/ui/tree'; @Component({ selector: 'ex-height', - templateUrl: './height.component.html' + standalone: true, + imports: [XTreeComponent], + templateUrl: './height.component.html', + styleUrls: ['./height.component.scss'] }) export class ExHeightComponent { data: XTreeNode[] = [ @@ -49,7 +52,12 @@ export class ExHeightComponent { { id: 24, label: '三级 1-1-4', pid: 5 } ]; data2: XTreeNode[] = [ - { id: 1, label: '一级 1一级 1一级 1一级 1一级 1一级 1一级 1一级 1一级 1一级 1', nowrap: false, alignItems: 'start' }, + { + id: 1, + label: '一级 1一级 1一级 1一级 1一级 1一级 1一级 1一级 1一级 1一级 1', + nowrap: false, + alignItems: 'start' + }, { id: 2, label: '一级 2一级 2一级 2一级 2一级 2一级 2一级 2一级 2一级 2一级 2', height: 3 }, { id: 3, label: '一级 3一级 3一级 3一级 3一级 3一级 3一级 3一级 3一级 3一级 3' }, { id: 5, label: '二级 1-1', pid: 1 }, diff --git a/lib/ng-nest/ui/tree/examples/zh_CN/default/icon/icon.component.ts b/lib/ng-nest/ui/tree/examples/zh_CN/default/icon/icon.component.ts index 4b6987bc0..d1d02a2fd 100644 --- a/lib/ng-nest/ui/tree/examples/zh_CN/default/icon/icon.component.ts +++ b/lib/ng-nest/ui/tree/examples/zh_CN/default/icon/icon.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; -import { XTreeNode } from '@ng-nest/ui/tree'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XTreeComponent, XTreeNode } from '@ng-nest/ui/tree'; @Component({ selector: 'ex-icon', + standalone: true, + imports: [XTreeComponent, XIconComponent], templateUrl: './icon.component.html' }) export class ExIconComponent { diff --git a/lib/ng-nest/ui/tree/examples/zh_CN/default/lazy/lazy.component.html b/lib/ng-nest/ui/tree/examples/zh_CN/default/lazy/lazy.component.html index aaa978d81..9764a60b4 100644 --- a/lib/ng-nest/ui/tree/examples/zh_CN/default/lazy/lazy.component.html +++ b/lib/ng-nest/ui/tree/examples/zh_CN/default/lazy/lazy.component.html @@ -1,5 +1 @@ - - - - - + diff --git a/lib/ng-nest/ui/tree/examples/zh_CN/default/lazy/lazy.component.scss b/lib/ng-nest/ui/tree/examples/zh_CN/default/lazy/lazy.component.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/lib/ng-nest/ui/tree/examples/zh_CN/default/lazy/lazy.component.ts b/lib/ng-nest/ui/tree/examples/zh_CN/default/lazy/lazy.component.ts index 3428e57b1..260efc4d1 100644 --- a/lib/ng-nest/ui/tree/examples/zh_CN/default/lazy/lazy.component.ts +++ b/lib/ng-nest/ui/tree/examples/zh_CN/default/lazy/lazy.component.ts @@ -1,11 +1,12 @@ import { Component } from '@angular/core'; -import { XTreeNode } from '@ng-nest/ui/tree'; +import { XTreeComponent, XTreeNode } from '@ng-nest/ui/tree'; import { Observable } from 'rxjs'; @Component({ selector: 'ex-lazy', - templateUrl: './lazy.component.html', - styleUrls: ['./lazy.component.scss'] + standalone: true, + imports: [XTreeComponent], + templateUrl: './lazy.component.html' }) export class ExLazyComponent { data: XTreeNode[] = [ diff --git a/lib/ng-nest/ui/tree/examples/zh_CN/default/line/line.component.ts b/lib/ng-nest/ui/tree/examples/zh_CN/default/line/line.component.ts index 0d7dbd5c2..1782bcb25 100644 --- a/lib/ng-nest/ui/tree/examples/zh_CN/default/line/line.component.ts +++ b/lib/ng-nest/ui/tree/examples/zh_CN/default/line/line.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; -import { XTreeNode } from '@ng-nest/ui/tree'; +import { XTreeComponent, XTreeNode } from '@ng-nest/ui/tree'; @Component({ selector: 'ex-line', + standalone: true, + imports: [XTreeComponent], templateUrl: './line.component.html' }) export class ExLineComponent { diff --git a/lib/ng-nest/ui/tree/examples/zh_CN/default/open/open.component.html b/lib/ng-nest/ui/tree/examples/zh_CN/default/open/open.component.html index d487bff27..29e27bcca 100644 --- a/lib/ng-nest/ui/tree/examples/zh_CN/default/open/open.component.html +++ b/lib/ng-nest/ui/tree/examples/zh_CN/default/open/open.component.html @@ -1,5 +1 @@ - - - - - + diff --git a/lib/ng-nest/ui/tree/examples/zh_CN/default/open/open.component.ts b/lib/ng-nest/ui/tree/examples/zh_CN/default/open/open.component.ts index 1d8fce684..07c8f7929 100644 --- a/lib/ng-nest/ui/tree/examples/zh_CN/default/open/open.component.ts +++ b/lib/ng-nest/ui/tree/examples/zh_CN/default/open/open.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; -import { XTreeNode } from '@ng-nest/ui/tree'; +import { XTreeComponent, XTreeNode } from '@ng-nest/ui/tree'; @Component({ selector: 'ex-open', + standalone: true, + imports: [XTreeComponent], templateUrl: './open.component.html' }) export class ExOpenComponent { diff --git a/lib/ng-nest/ui/tree/examples/zh_CN/default/status/status.component.html b/lib/ng-nest/ui/tree/examples/zh_CN/default/status/status.component.html index 50981c637..e2297874b 100644 --- a/lib/ng-nest/ui/tree/examples/zh_CN/default/status/status.component.html +++ b/lib/ng-nest/ui/tree/examples/zh_CN/default/status/status.component.html @@ -1,5 +1 @@ - - - - - + diff --git a/lib/ng-nest/ui/tree/examples/zh_CN/default/status/status.component.ts b/lib/ng-nest/ui/tree/examples/zh_CN/default/status/status.component.ts index 0b5119402..ce3aceb9a 100644 --- a/lib/ng-nest/ui/tree/examples/zh_CN/default/status/status.component.ts +++ b/lib/ng-nest/ui/tree/examples/zh_CN/default/status/status.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; -import { XTreeNode } from '@ng-nest/ui/tree'; +import { XTreeComponent, XTreeNode } from '@ng-nest/ui/tree'; @Component({ selector: 'ex-status', + standalone: true, + imports: [XTreeComponent], templateUrl: './status.component.html' }) export class ExStatusComponent { diff --git a/lib/ng-nest/ui/tree/examples/zh_CN/default/virtual-scroll/virtual-scroll.component.ts b/lib/ng-nest/ui/tree/examples/zh_CN/default/virtual-scroll/virtual-scroll.component.ts index 715913734..7f69895a5 100644 --- a/lib/ng-nest/ui/tree/examples/zh_CN/default/virtual-scroll/virtual-scroll.component.ts +++ b/lib/ng-nest/ui/tree/examples/zh_CN/default/virtual-scroll/virtual-scroll.component.ts @@ -1,9 +1,14 @@ import { Component, ViewChild } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XInputNumberComponent } from '@ng-nest/ui/input-number'; import { XTreeComponent, XTreeNode } from '@ng-nest/ui/tree'; import { Observable } from 'rxjs'; @Component({ selector: 'ex-virtual-scroll', + standalone: true, + imports: [FormsModule, XTreeComponent, XButtonComponent, XInputNumberComponent], templateUrl: './virtual-scroll.component.html' }) export class ExVirtualScrollComponent { diff --git a/lib/ng-nest/ui/tree/tree-node.component.ts b/lib/ng-nest/ui/tree/tree-node.component.ts index a0cc9bc85..4f6eb4ca5 100644 --- a/lib/ng-nest/ui/tree/tree-node.component.ts +++ b/lib/ng-nest/ui/tree/tree-node.component.ts @@ -1,24 +1,40 @@ import { Component, ViewEncapsulation, - Renderer2, ElementRef, ChangeDetectorRef, ChangeDetectionStrategy, HostBinding, HostListener, Input, - NgZone, Output, - EventEmitter + EventEmitter, + inject } from '@angular/core'; import { XTreeNodePrefix, XTreeNode, XTreeNodeProperty, XTreeAction } from './tree.property'; import { XIsEmpty, XConfigService, XBoolean } from '@ng-nest/ui/core'; import { Subject } from 'rxjs'; import { XTreeService } from './tree.service'; +import { CommonModule } from '@angular/common'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XCheckboxComponent } from '@ng-nest/ui/checkbox'; +import { FormsModule } from '@angular/forms'; +import { XKeywordDirective } from '@ng-nest/ui/keyword'; +import { XLinkComponent } from '@ng-nest/ui/link'; +import { XOutletDirective } from '@ng-nest/ui/outlet'; @Component({ selector: `${XTreeNodePrefix}, [${XTreeNodePrefix}]`, + standalone: true, + imports: [ + CommonModule, + FormsModule, + XIconComponent, + XCheckboxComponent, + XOutletDirective, + XLinkComponent, + XKeywordDirective + ], templateUrl: './tree-node.component.html', styleUrls: ['./tree-node.component.scss'], encapsulation: ViewEncapsulation.None, @@ -119,16 +135,10 @@ export class XTreeNodeComponent extends XTreeNodeProperty { } } - constructor( - public renderer: Renderer2, - public elementRef: ElementRef, - public cdr: ChangeDetectorRef, - public configService: XConfigService, - public ngZone: NgZone, - public treeService: XTreeService - ) { - super(); - } + private cdr = inject(ChangeDetectorRef); + private treeService = inject(XTreeService); + elementRef = inject(ElementRef); + configService = inject(XConfigService); ngOnInit() { this.node.change = (check: boolean) => { diff --git a/lib/ng-nest/ui/tree/tree.component.spec.ts b/lib/ng-nest/ui/tree/tree.component.spec.ts index 448edd907..79cb5babe 100644 --- a/lib/ng-nest/ui/tree/tree.component.spec.ts +++ b/lib/ng-nest/ui/tree/tree.component.spec.ts @@ -1,9 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XTreeComponent } from './tree.component'; import { Component, DebugElement, Injectable, ChangeDetectorRef, ViewChild } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { XTreeModule } from '@ng-nest/ui/tree'; +import { XTreeComponent } from '@ng-nest/ui/tree'; import { XTreePrefix, XTreeNode, XTreeAction } from './tree.property'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { Observable } from 'rxjs'; @@ -14,8 +12,8 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { UntypedFormGroup } from '@angular/forms'; import { XRepositoryService, XHttpService, XGuid } from '@ng-nest/ui/core'; import { map } from 'rxjs/operators'; -import { XMessageModule, XMessageService } from '@ng-nest/ui/message'; -import { XThemeModule } from '@ng-nest/ui/theme'; +import { XMessageService } from '@ng-nest/ui/message'; +import { XThemeComponent } from '@ng-nest/ui/theme'; import { XIconComponent } from '@ng-nest/ui/icon'; import { XInputNumberComponent } from '@ng-nest/ui/input-number'; import { HttpClientTestingModule } from '@angular/common/http/testing'; @@ -26,15 +24,14 @@ describe(XTreePrefix, () => { imports: [ BrowserAnimationsModule, HttpClientTestingModule, - XThemeModule, - XTreeModule, + XThemeComponent, + XTreeComponent, XRowComponent, XColComponent, XButtonComponent, XLinkComponent, XFormComponent, XLinkComponent, - XMessageModule, XInputNumberComponent, XIconComponent ], @@ -243,8 +240,7 @@ class TestXTreeLazyComponent { - - + `, @@ -271,8 +267,7 @@ class TestXTreeCheckedComponent { - - + `, @@ -353,9 +348,7 @@ class TestXTreeCustomComponent {
  • 获取选中的节点的 Key 值
  • - {{ - expandedAll ? '全部收起' : '全部展开' - }} + {{ expandedAll ? '全部收起' : '全部展开' }}
  • {{ content | json }}
    • @@ -575,11 +568,7 @@ class TestXTreeOperationComponent { ] } ]; - constructor( - private service: OrganizationService, - private message: XMessageService, - private cdr: ChangeDetectorRef - ) {} + constructor(private service: OrganizationService, private message: XMessageService, private cdr: ChangeDetectorRef) {} action(type: string, node: Organization) { switch (type) { diff --git a/lib/ng-nest/ui/tree/tree.component.ts b/lib/ng-nest/ui/tree/tree.component.ts index 30023f643..510913517 100644 --- a/lib/ng-nest/ui/tree/tree.component.ts +++ b/lib/ng-nest/ui/tree/tree.component.ts @@ -25,24 +25,21 @@ import { XResizeObserver } from '@ng-nest/ui/core'; import { debounceTime, map, Observable, Subject, takeUntil } from 'rxjs'; -import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling'; +import { CdkVirtualScrollViewport, ScrollingModule } from '@angular/cdk/scrolling'; import { XTreeNodeComponent } from './tree-node.component'; -import { - CdkDrag, - CdkDragEnd, - CdkDragMove, - CdkDragStart, - CdkDropList -} from '@angular/cdk/drag-drop'; +import { CdkDrag, CdkDragEnd, CdkDragMove, CdkDragStart, CdkDropList, DragDropModule } from '@angular/cdk/drag-drop'; import { XTreeService } from './tree.service'; +import { CommonModule } from '@angular/common'; +import { XIconComponent } from '@ng-nest/ui/icon'; @Component({ selector: `${XTreePrefix}`, + standalone: true, + imports: [CommonModule, DragDropModule, ScrollingModule, XTreeNodeComponent, XIconComponent], templateUrl: './tree.component.html', styleUrls: ['./tree.component.scss'], encapsulation: ViewEncapsulation.None, - changeDetection: ChangeDetectionStrategy.OnPush, - providers: [XTreeService] + changeDetection: ChangeDetectionStrategy.OnPush }) export class XTreeComponent extends XTreeProperty implements OnChanges { @ViewChild('tree', { static: true }) tree!: ElementRef; @@ -228,10 +225,7 @@ export class XTreeComponent extends XTreeProperty implements OnChanges { } } } - if ( - (!this.lazy && (XIsUndefined(node.leaf) || regetChildren)) || - node.id === lazyParant?.id - ) { + if ((!this.lazy && (XIsUndefined(node.leaf) || regetChildren)) || node.id === lazyParant?.id) { node.leaf = (node.children?.length as number) === 0; } if (!node.leaf) node.children?.map((y) => getChildren(y, level + 1)); @@ -438,9 +432,7 @@ export class XTreeComponent extends XTreeProperty implements OnChanges { let before = this.activatedNode; if (this.multiple) { if (this.activatedId.length > 0) { - let ids = this.objectArray - ? this.activatedId.map((x: XTreeNode) => x.id) - : this.activatedId; + let ids = this.objectArray ? this.activatedId.map((x: XTreeNode) => x.id) : this.activatedId; for (let i = 0; i < ids.length; i++) { let node = nodes.find((x) => x.id === ids[i]) as XTreeNode; if (node) { diff --git a/lib/ng-nest/ui/tree/tree.module.ts b/lib/ng-nest/ui/tree/tree.module.ts index 7935fdee9..a33d80fc9 100644 --- a/lib/ng-nest/ui/tree/tree.module.ts +++ b/lib/ng-nest/ui/tree/tree.module.ts @@ -1,30 +1,9 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; import { XTreeComponent } from './tree.component'; import { XTreeNodeComponent } from './tree-node.component'; -import { XIconComponent } from '@ng-nest/ui/icon'; -import { XCheckboxComponent } from '@ng-nest/ui/checkbox'; -import { XOutletDirective } from '@ng-nest/ui/outlet'; -import { XLinkComponent } from '@ng-nest/ui/link'; -import { XTreeProperty, XTreeNodeProperty } from './tree.property'; -import { ScrollingModule } from '@angular/cdk/scrolling'; -import { XKeywordDirective } from '@ng-nest/ui/keyword'; -import { DragDropModule } from '@angular/cdk/drag-drop'; @NgModule({ - declarations: [XTreeComponent, XTreeNodeComponent, XTreeProperty, XTreeNodeProperty], exports: [XTreeComponent, XTreeNodeComponent], - imports: [ - CommonModule, - FormsModule, - DragDropModule, - XIconComponent, - XCheckboxComponent, - XOutletDirective, - XLinkComponent, - ScrollingModule, - XKeywordDirective - ] + imports: [XTreeComponent, XTreeNodeComponent] }) export class XTreeModule {} diff --git a/lib/ng-nest/ui/tree/tree.service.ts b/lib/ng-nest/ui/tree/tree.service.ts index 61c9ab5c4..3c986beca 100644 --- a/lib/ng-nest/ui/tree/tree.service.ts +++ b/lib/ng-nest/ui/tree/tree.service.ts @@ -2,7 +2,7 @@ import { Injectable } from '@angular/core'; import { XIsEmpty, XRemove } from '@ng-nest/ui/core'; import { XTreeNode } from './tree.property'; -@Injectable() +@Injectable({ providedIn: 'root' }) export class XTreeService { getChildren(data: XTreeNode[], node: XTreeNode) { const res: XTreeNode[] = []; diff --git a/lib/ng-nest/ui/typography/examples/en_US/default/default/default.component.html b/lib/ng-nest/ui/typography/examples/en_US/default/default/default.component.html index 1aaed507b..ce5928e97 100644 --- a/lib/ng-nest/ui/typography/examples/en_US/default/default/default.component.html +++ b/lib/ng-nest/ui/typography/examples/en_US/default/default/default.component.html @@ -1,3 +1 @@ - - - + diff --git a/lib/ng-nest/ui/typography/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/typography/examples/en_US/default/default/default.component.ts index 0f43c443f..7029e5806 100644 --- a/lib/ng-nest/ui/typography/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/typography/examples/en_US/default/default/default.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XTypographyComponent } from '@ng-nest/ui/typography'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XTypographyComponent], templateUrl: './default.component.html' }) export class ExDefaultComponent { diff --git a/lib/ng-nest/ui/typography/examples/en_US/default/line-height/line-height.component.html b/lib/ng-nest/ui/typography/examples/en_US/default/line-height/line-height.component.html index a0163dea8..1a0cce3b8 100644 --- a/lib/ng-nest/ui/typography/examples/en_US/default/line-height/line-height.component.html +++ b/lib/ng-nest/ui/typography/examples/en_US/default/line-height/line-height.component.html @@ -1,31 +1,27 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Row heightValueDisplay
    No row heightline-height: 1rem
    compactline-height: 1.3rem
    conventionalline-height: 1.5rem
    increaseline-height: 1.75rem
    -     -     + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Row heightValueDisplay
    No row heightline-height: 1rem
    compactline-height: 1.3rem
    conventionalline-height: 1.5rem
    increaseline-height: 1.75rem
    diff --git a/lib/ng-nest/ui/typography/examples/en_US/default/line-height/line-height.component.ts b/lib/ng-nest/ui/typography/examples/en_US/default/line-height/line-height.component.ts index dab07f576..9b12893cd 100644 --- a/lib/ng-nest/ui/typography/examples/en_US/default/line-height/line-height.component.ts +++ b/lib/ng-nest/ui/typography/examples/en_US/default/line-height/line-height.component.ts @@ -2,6 +2,7 @@ import { Component } from '@angular/core'; @Component({ selector: 'ex-line-height', + standalone: true, templateUrl: './line-height.component.html' }) export class ExLineHeightComponent { diff --git a/lib/ng-nest/ui/typography/examples/en_US/default/size/size.component.html b/lib/ng-nest/ui/typography/examples/en_US/default/size/size.component.html index a9a646af0..20dadb8cb 100644 --- a/lib/ng-nest/ui/typography/examples/en_US/default/size/size.component.html +++ b/lib/ng-nest/ui/typography/examples/en_US/default/size/size.component.html @@ -1,34 +1,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    LevelFont size
    auxiliary text0.75rem Extra Small
    body (small)0.825rem Small
    text0.875rem Base
    subtitle1rem Medium
    title1.125rem large
    main title1.25rem Extra large
    -     -     + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    LevelFont size
    auxiliary text0.75rem Extra Small
    body (small)0.825rem Small
    text0.875rem Base
    subtitle1rem Medium
    title1.125rem large
    main title1.25rem Extra large
    diff --git a/lib/ng-nest/ui/typography/examples/en_US/default/size/size.component.ts b/lib/ng-nest/ui/typography/examples/en_US/default/size/size.component.ts index 2f2db7c84..f8fd94955 100644 --- a/lib/ng-nest/ui/typography/examples/en_US/default/size/size.component.ts +++ b/lib/ng-nest/ui/typography/examples/en_US/default/size/size.component.ts @@ -2,6 +2,7 @@ import { Component } from '@angular/core'; @Component({ selector: 'ex-size', + standalone: true, templateUrl: './size.component.html' }) export class ExSizeComponent {} diff --git a/lib/ng-nest/ui/typography/examples/index.ts b/lib/ng-nest/ui/typography/examples/index.ts new file mode 100644 index 000000000..e4f080323 --- /dev/null +++ b/lib/ng-nest/ui/typography/examples/index.ts @@ -0,0 +1,3 @@ +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/line-height/line-height.component'; +export * from './zh_CN/default/size/size.component'; diff --git a/lib/ng-nest/ui/typography/examples/zh_CN/default/default/default.component.html b/lib/ng-nest/ui/typography/examples/zh_CN/default/default/default.component.html index 1aaed507b..ce5928e97 100644 --- a/lib/ng-nest/ui/typography/examples/zh_CN/default/default/default.component.html +++ b/lib/ng-nest/ui/typography/examples/zh_CN/default/default/default.component.html @@ -1,3 +1 @@ - - - + diff --git a/lib/ng-nest/ui/typography/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/typography/examples/zh_CN/default/default/default.component.ts index 67a8e0d18..ad72077ff 100644 --- a/lib/ng-nest/ui/typography/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/typography/examples/zh_CN/default/default/default.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XTypographyComponent } from '@ng-nest/ui/typography'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XTypographyComponent], templateUrl: './default.component.html' }) export class ExDefaultComponent { diff --git a/lib/ng-nest/ui/typography/examples/zh_CN/default/line-height/line-height.component.html b/lib/ng-nest/ui/typography/examples/zh_CN/default/line-height/line-height.component.html index c86b74299..5dd9e61a0 100644 --- a/lib/ng-nest/ui/typography/examples/zh_CN/default/line-height/line-height.component.html +++ b/lib/ng-nest/ui/typography/examples/zh_CN/default/line-height/line-height.component.html @@ -1,31 +1,27 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    行高值显示
    无行高line-height: 1rem
    紧凑line-height: 1.3rem
    常规line-height: 1.5rem
    加大line-height: 1.75rem
    -     -     + + + + + + + + + + + + + + + + + + + + + + + + + + +
    行高值显示
    无行高line-height: 1rem
    紧凑line-height: 1.3rem
    常规line-height: 1.5rem
    加大line-height: 1.75rem
    diff --git a/lib/ng-nest/ui/typography/examples/zh_CN/default/line-height/line-height.component.ts b/lib/ng-nest/ui/typography/examples/zh_CN/default/line-height/line-height.component.ts index a1348f0e3..61eb24216 100644 --- a/lib/ng-nest/ui/typography/examples/zh_CN/default/line-height/line-height.component.ts +++ b/lib/ng-nest/ui/typography/examples/zh_CN/default/line-height/line-height.component.ts @@ -2,6 +2,7 @@ import { Component } from '@angular/core'; @Component({ selector: 'ex-line-height', + standalone: true, templateUrl: './line-height.component.html' }) export class ExLineHeightComponent { diff --git a/lib/ng-nest/ui/typography/examples/zh_CN/default/size/size.component.html b/lib/ng-nest/ui/typography/examples/zh_CN/default/size/size.component.html index 1499e7097..6e07c98e1 100644 --- a/lib/ng-nest/ui/typography/examples/zh_CN/default/size/size.component.html +++ b/lib/ng-nest/ui/typography/examples/zh_CN/default/size/size.component.html @@ -1,34 +1,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    层级字体大小
    辅助文字0.75rem Extra Small
    正文（小）0.825rem Small
    正文0.875rem Base
    小标题1rem Medium
    标题1.125rem large
    主标题1.25rem Extra large
    -     -     + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    层级字体大小
    辅助文字0.75rem Extra Small
    正文（小）0.825rem Small
    正文0.875rem Base
    小标题1rem Medium
    标题1.125rem large
    主标题1.25rem Extra large
    diff --git a/lib/ng-nest/ui/typography/examples/zh_CN/default/size/size.component.ts b/lib/ng-nest/ui/typography/examples/zh_CN/default/size/size.component.ts index 2f2db7c84..f8fd94955 100644 --- a/lib/ng-nest/ui/typography/examples/zh_CN/default/size/size.component.ts +++ b/lib/ng-nest/ui/typography/examples/zh_CN/default/size/size.component.ts @@ -2,6 +2,7 @@ import { Component } from '@angular/core'; @Component({ selector: 'ex-size', + standalone: true, templateUrl: './size.component.html' }) export class ExSizeComponent {} diff --git a/lib/ng-nest/ui/typography/typography.component.spec.ts b/lib/ng-nest/ui/typography/typography.component.spec.ts index d69d241e7..3d2dd6d92 100644 --- a/lib/ng-nest/ui/typography/typography.component.spec.ts +++ b/lib/ng-nest/ui/typography/typography.component.spec.ts @@ -1,24 +1,16 @@ import { XDocComponent } from '@ng-nest/ui/doc'; import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XTypographyComponent } from './typography.component'; import { Component, DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; -import { XTypographyModule } from '@ng-nest/ui/typography'; +import { XTypographyComponent } from '@ng-nest/ui/typography'; import { XTypographyPrefix } from './typography.property'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XTypographyPrefix, () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ - HttpClientTestingModule, - XTypographyModule, - XRowComponent, - XColComponent, - XDocComponent - ], + imports: [HttpClientTestingModule, XTypographyComponent, XRowComponent, XColComponent, XDocComponent], declarations: [TestXTypographyComponent] }).compileComponents(); }); @@ -112,8 +104,7 @@ describe(XTypographyPrefix, () => { ` }) class TestXTypographyComponent { - text = - '天将降大任于是人也，必先苦其心志，劳其筋骨，饿其体肤，空乏其身，行拂乱其所为也，所以动心忍性，增益其所不能。'; + text = '天将降大任于是人也，必先苦其心志，劳其筋骨，饿其体肤，空乏其身，行拂乱其所为也，所以动心忍性，增益其所不能。'; textLineHeight = '天将降大任于是人也，必先苦其心志，
    劳其筋骨，饿其体肤，空乏其身，
    行拂乱其所为也，所以动心忍性，增益其所不能。'; } diff --git a/lib/ng-nest/ui/typography/typography.component.ts b/lib/ng-nest/ui/typography/typography.component.ts index 223aabc6c..d3890b4e0 100644 --- a/lib/ng-nest/ui/typography/typography.component.ts +++ b/lib/ng-nest/ui/typography/typography.component.ts @@ -1,8 +1,17 @@ -import { Component, OnInit, ViewEncapsulation, ChangeDetectionStrategy, Renderer2, ElementRef } from '@angular/core'; +import { + Component, + OnInit, + ViewEncapsulation, + ChangeDetectionStrategy, + Renderer2, + ElementRef, + inject +} from '@angular/core'; import { XTypographyPrefix, XTypographyProperty } from './typography.property'; @Component({ selector: 'x-typography', + standalone: true, templateUrl: './typography.component.html', styleUrls: ['./style/index.scss'], encapsulation: ViewEncapsulation.None, @@ -10,13 +19,11 @@ import { XTypographyPrefix, XTypographyProperty } from './typography.property'; }) export class XTypographyComponent extends XTypographyProperty implements OnInit { firstText!: string; - - constructor(private renderer: Renderer2, private elementRef: ElementRef) { - super(); - this.renderer.addClass(this.elementRef.nativeElement, XTypographyPrefix); - } + private renderer = inject(Renderer2); + private elementRef = inject(ElementRef); ngOnInit() { + this.renderer.addClass(this.elementRef.nativeElement, XTypographyPrefix); if (this.font) this.renderer.setStyle(this.elementRef.nativeElement, 'font-family', this.font); if (this.text && this.text.length > 0) this.firstText = this.text.slice(0, 1); } diff --git a/lib/ng-nest/ui/typography/typography.module.ts b/lib/ng-nest/ui/typography/typography.module.ts index b1cf9dda1..5ba96f0cb 100644 --- a/lib/ng-nest/ui/typography/typography.module.ts +++ b/lib/ng-nest/ui/typography/typography.module.ts @@ -1,11 +1,8 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { XTypographyComponent } from './typography.component'; -import { XTypographyProperty } from './typography.property'; @NgModule({ - declarations: [XTypographyComponent, XTypographyProperty], exports: [XTypographyComponent], - imports: [CommonModule] + imports: [XTypographyComponent] }) export class XTypographyModule {} diff --git a/lib/ng-nest/ui/upload/examples/en_US/default/custom/custom.component.scss b/lib/ng-nest/ui/upload/examples/en_US/default/custom/custom.component.scss deleted file mode 100644 index 6852075fe..000000000 --- a/lib/ng-nest/ui/upload/examples/en_US/default/custom/custom.component.scss +++ /dev/null @@ -1,14 +0,0 @@ -:host { - x-col x-carousel-panel:nth-child(odd) { - background-color: var(--x-info-800); - } - x-col x-carousel-panel:nth-child(even) { - background-color: var(--x-info-600); - } - x-col x-carousel-panel h3 { - text-align: center; - line-height: 12rem; - margin: 0; - color: var(--x-text-300); - } -} diff --git a/lib/ng-nest/ui/upload/examples/en_US/default/custom/custom.component.ts b/lib/ng-nest/ui/upload/examples/en_US/default/custom/custom.component.ts index d5bf0dd4c..bb85423a6 100644 --- a/lib/ng-nest/ui/upload/examples/en_US/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/upload/examples/en_US/default/custom/custom.component.ts @@ -1,9 +1,13 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XUploadComponent } from '@ng-nest/ui/upload'; @Component({ selector: 'ex-custom', - templateUrl: './custom.component.html', - styleUrls: ['./custom.component.scss'] + standalone: true, + imports: [CommonModule, FormsModule, XUploadComponent], + templateUrl: './custom.component.html' }) export class ExCustomComponent { model1 = [{ url: 'http://127.0.0.1:3000/upload/1650888347319-test.txt', name: 'test.txt' }]; diff --git a/lib/ng-nest/ui/upload/examples/en_US/default/default/default.component.html b/lib/ng-nest/ui/upload/examples/en_US/default/default/default.component.html index 87907695c..fa8b3a6e9 100644 --- a/lib/ng-nest/ui/upload/examples/en_US/default/default/default.component.html +++ b/lib/ng-nest/ui/upload/examples/en_US/default/default/default.component.html @@ -1,5 +1 @@ - - - - - + diff --git a/lib/ng-nest/ui/upload/examples/en_US/default/default/default.component.scss b/lib/ng-nest/ui/upload/examples/en_US/default/default/default.component.scss deleted file mode 100644 index 20401c970..000000000 --- a/lib/ng-nest/ui/upload/examples/en_US/default/default/default.component.scss +++ /dev/null @@ -1,8 +0,0 @@ -:host { - x-row > x-col:not(:first-child) { - margin-top: 1rem; - } - x-row > x-col { - width: 14rem; - } -} diff --git a/lib/ng-nest/ui/upload/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/upload/examples/en_US/default/default/default.component.ts index cae54f2a5..fa97c5969 100644 --- a/lib/ng-nest/ui/upload/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/upload/examples/en_US/default/default/default.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; +import { XUploadComponent } from '@ng-nest/ui/upload'; @Component({ selector: 'ex-default', - templateUrl: './default.component.html', - styleUrls: ['./default.component.scss'] + standalone: true, + imports: [XUploadComponent], + templateUrl: './default.component.html' }) export class ExDefaultComponent {} diff --git a/lib/ng-nest/ui/upload/examples/en_US/default/disabled/disabled.component.html b/lib/ng-nest/ui/upload/examples/en_US/default/disabled/disabled.component.html index 81a90340d..b6952073c 100644 --- a/lib/ng-nest/ui/upload/examples/en_US/default/disabled/disabled.component.html +++ b/lib/ng-nest/ui/upload/examples/en_US/default/disabled/disabled.component.html @@ -1,5 +1 @@ - - - - - + diff --git a/lib/ng-nest/ui/upload/examples/en_US/default/disabled/disabled.component.scss b/lib/ng-nest/ui/upload/examples/en_US/default/disabled/disabled.component.scss deleted file mode 100644 index 20401c970..000000000 --- a/lib/ng-nest/ui/upload/examples/en_US/default/disabled/disabled.component.scss +++ /dev/null @@ -1,8 +0,0 @@ -:host { - x-row > x-col:not(:first-child) { - margin-top: 1rem; - } - x-row > x-col { - width: 14rem; - } -} diff --git a/lib/ng-nest/ui/upload/examples/en_US/default/disabled/disabled.component.ts b/lib/ng-nest/ui/upload/examples/en_US/default/disabled/disabled.component.ts index 300c89438..a8cafb76d 100644 --- a/lib/ng-nest/ui/upload/examples/en_US/default/disabled/disabled.component.ts +++ b/lib/ng-nest/ui/upload/examples/en_US/default/disabled/disabled.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; +import { XUploadComponent } from '@ng-nest/ui/upload'; @Component({ selector: 'ex-disabled', - templateUrl: './disabled.component.html', - styleUrls: ['./disabled.component.scss'] + standalone: true, + imports: [XUploadComponent], + templateUrl: './disabled.component.html' }) export class ExDisabledComponent {} diff --git a/lib/ng-nest/ui/upload/examples/en_US/default/img/img.component.html b/lib/ng-nest/ui/upload/examples/en_US/default/img/img.component.html index c36485f3f..c42b9aa0b 100644 --- a/lib/ng-nest/ui/upload/examples/en_US/default/img/img.component.html +++ b/lib/ng-nest/ui/upload/examples/en_US/default/img/img.component.html @@ -1,16 +1,16 @@ - - +
    Select Image - - +
    +
    + Select Image - - +
    + diff --git a/lib/ng-nest/ui/upload/examples/en_US/default/img/img.component.scss b/lib/ng-nest/ui/upload/examples/en_US/default/img/img.component.scss index 186a6e123..9194b3173 100644 --- a/lib/ng-nest/ui/upload/examples/en_US/default/img/img.component.scss +++ b/lib/ng-nest/ui/upload/examples/en_US/default/img/img.component.scss @@ -1,3 +1,9 @@ +:host { + .row:not(:first-child) { + margin-top: 1rem; + } +} + .upload-icon { font-size: 1.325rem; } diff --git a/lib/ng-nest/ui/upload/examples/en_US/default/img/img.component.ts b/lib/ng-nest/ui/upload/examples/en_US/default/img/img.component.ts index d3e386919..c68514205 100644 --- a/lib/ng-nest/ui/upload/examples/en_US/default/img/img.component.ts +++ b/lib/ng-nest/ui/upload/examples/en_US/default/img/img.component.ts @@ -1,7 +1,12 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XUploadComponent } from '@ng-nest/ui/upload'; @Component({ selector: 'ex-img', + standalone: true, + imports: [FormsModule, XUploadComponent, XIconComponent], templateUrl: './img.component.html', styleUrls: ['./img.component.scss'] }) diff --git a/lib/ng-nest/ui/upload/examples/index.ts b/lib/ng-nest/ui/upload/examples/index.ts new file mode 100644 index 000000000..013b9ab7a --- /dev/null +++ b/lib/ng-nest/ui/upload/examples/index.ts @@ -0,0 +1,4 @@ +export * from './zh_CN/default/custom/custom.component'; +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/disabled/disabled.component'; +export * from './zh_CN/default/img/img.component'; diff --git a/lib/ng-nest/ui/upload/examples/zh_CN/default/custom/custom.component.scss b/lib/ng-nest/ui/upload/examples/zh_CN/default/custom/custom.component.scss deleted file mode 100644 index 6852075fe..000000000 --- a/lib/ng-nest/ui/upload/examples/zh_CN/default/custom/custom.component.scss +++ /dev/null @@ -1,14 +0,0 @@ -:host { - x-col x-carousel-panel:nth-child(odd) { - background-color: var(--x-info-800); - } - x-col x-carousel-panel:nth-child(even) { - background-color: var(--x-info-600); - } - x-col x-carousel-panel h3 { - text-align: center; - line-height: 12rem; - margin: 0; - color: var(--x-text-300); - } -} diff --git a/lib/ng-nest/ui/upload/examples/zh_CN/default/custom/custom.component.ts b/lib/ng-nest/ui/upload/examples/zh_CN/default/custom/custom.component.ts index 83e55363e..a9dee15d3 100644 --- a/lib/ng-nest/ui/upload/examples/zh_CN/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/upload/examples/zh_CN/default/custom/custom.component.ts @@ -1,9 +1,13 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XUploadComponent } from '@ng-nest/ui/upload'; @Component({ selector: 'ex-custom', - templateUrl: './custom.component.html', - styleUrls: ['./custom.component.scss'] + standalone: true, + imports: [CommonModule, FormsModule, XUploadComponent], + templateUrl: './custom.component.html' }) export class ExCustomComponent { model1 = [{ url: 'http://127.0.0.1:3000/upload/1650888347319-新建文本文档.txt', name: '新建文本文档' }]; @@ -27,5 +31,4 @@ export class ExCustomComponent { uploadError($event: any) { console.log('uploadError', $event); } - } diff --git a/lib/ng-nest/ui/upload/examples/zh_CN/default/default/default.component.html b/lib/ng-nest/ui/upload/examples/zh_CN/default/default/default.component.html index 87907695c..fa8b3a6e9 100644 --- a/lib/ng-nest/ui/upload/examples/zh_CN/default/default/default.component.html +++ b/lib/ng-nest/ui/upload/examples/zh_CN/default/default/default.component.html @@ -1,5 +1 @@ - - - - - + diff --git a/lib/ng-nest/ui/upload/examples/zh_CN/default/default/default.component.scss b/lib/ng-nest/ui/upload/examples/zh_CN/default/default/default.component.scss deleted file mode 100644 index 20401c970..000000000 --- a/lib/ng-nest/ui/upload/examples/zh_CN/default/default/default.component.scss +++ /dev/null @@ -1,8 +0,0 @@ -:host { - x-row > x-col:not(:first-child) { - margin-top: 1rem; - } - x-row > x-col { - width: 14rem; - } -} diff --git a/lib/ng-nest/ui/upload/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/upload/examples/zh_CN/default/default/default.component.ts index cae54f2a5..fa97c5969 100644 --- a/lib/ng-nest/ui/upload/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/upload/examples/zh_CN/default/default/default.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; +import { XUploadComponent } from '@ng-nest/ui/upload'; @Component({ selector: 'ex-default', - templateUrl: './default.component.html', - styleUrls: ['./default.component.scss'] + standalone: true, + imports: [XUploadComponent], + templateUrl: './default.component.html' }) export class ExDefaultComponent {} diff --git a/lib/ng-nest/ui/upload/examples/zh_CN/default/disabled/disabled.component.html b/lib/ng-nest/ui/upload/examples/zh_CN/default/disabled/disabled.component.html index 81a90340d..b6952073c 100644 --- a/lib/ng-nest/ui/upload/examples/zh_CN/default/disabled/disabled.component.html +++ b/lib/ng-nest/ui/upload/examples/zh_CN/default/disabled/disabled.component.html @@ -1,5 +1 @@ - - - - - + diff --git a/lib/ng-nest/ui/upload/examples/zh_CN/default/disabled/disabled.component.scss b/lib/ng-nest/ui/upload/examples/zh_CN/default/disabled/disabled.component.scss deleted file mode 100644 index 20401c970..000000000 --- a/lib/ng-nest/ui/upload/examples/zh_CN/default/disabled/disabled.component.scss +++ /dev/null @@ -1,8 +0,0 @@ -:host { - x-row > x-col:not(:first-child) { - margin-top: 1rem; - } - x-row > x-col { - width: 14rem; - } -} diff --git a/lib/ng-nest/ui/upload/examples/zh_CN/default/disabled/disabled.component.ts b/lib/ng-nest/ui/upload/examples/zh_CN/default/disabled/disabled.component.ts index 300c89438..a8cafb76d 100644 --- a/lib/ng-nest/ui/upload/examples/zh_CN/default/disabled/disabled.component.ts +++ b/lib/ng-nest/ui/upload/examples/zh_CN/default/disabled/disabled.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; +import { XUploadComponent } from '@ng-nest/ui/upload'; @Component({ selector: 'ex-disabled', - templateUrl: './disabled.component.html', - styleUrls: ['./disabled.component.scss'] + standalone: true, + imports: [XUploadComponent], + templateUrl: './disabled.component.html' }) export class ExDisabledComponent {} diff --git a/lib/ng-nest/ui/upload/examples/zh_CN/default/img/img.component.html b/lib/ng-nest/ui/upload/examples/zh_CN/default/img/img.component.html index 7b2d04842..7208d62ae 100644 --- a/lib/ng-nest/ui/upload/examples/zh_CN/default/img/img.component.html +++ b/lib/ng-nest/ui/upload/examples/zh_CN/default/img/img.component.html @@ -1,16 +1,21 @@ - - - - - - 选择图片 - - - - - - - 选择图片 - - - +
    + + + + 选择图片 + +
    +
    + + + + 选择图片 + +
    diff --git a/lib/ng-nest/ui/upload/examples/zh_CN/default/img/img.component.scss b/lib/ng-nest/ui/upload/examples/zh_CN/default/img/img.component.scss index 186a6e123..9194b3173 100644 --- a/lib/ng-nest/ui/upload/examples/zh_CN/default/img/img.component.scss +++ b/lib/ng-nest/ui/upload/examples/zh_CN/default/img/img.component.scss @@ -1,3 +1,9 @@ +:host { + .row:not(:first-child) { + margin-top: 1rem; + } +} + .upload-icon { font-size: 1.325rem; } diff --git a/lib/ng-nest/ui/upload/examples/zh_CN/default/img/img.component.ts b/lib/ng-nest/ui/upload/examples/zh_CN/default/img/img.component.ts index 2d016d4e1..0909652fa 100644 --- a/lib/ng-nest/ui/upload/examples/zh_CN/default/img/img.component.ts +++ b/lib/ng-nest/ui/upload/examples/zh_CN/default/img/img.component.ts @@ -1,13 +1,21 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XUploadComponent } from '@ng-nest/ui/upload'; @Component({ selector: 'ex-img', + standalone: true, + imports: [FormsModule, XUploadComponent, XIconComponent], templateUrl: './img.component.html', styleUrls: ['./img.component.scss'] }) export class ExImgComponent { imgs = [ - { url: 'https://ngnest.com/static/docs/course/rbac/1-introduction/demo/1__ng-nest-admin/light.png', name: '明亮风格' }, + { + url: 'https://ngnest.com/static/docs/course/rbac/1-introduction/demo/1__ng-nest-admin/light.png', + name: '明亮风格' + }, { url: 'https://ngnest.com/static/docs/course/rbac/1-introduction/demo/1__ng-nest-admin/dark.png', name: '黑暗风格' diff --git a/lib/ng-nest/ui/upload/upload-portal.component.ts b/lib/ng-nest/ui/upload/upload-portal.component.ts index 0a89cca2c..3755a6fa3 100644 --- a/lib/ng-nest/ui/upload/upload-portal.component.ts +++ b/lib/ng-nest/ui/upload/upload-portal.component.ts @@ -1,4 +1,4 @@ -import { DOCUMENT } from '@angular/common'; +import { CommonModule, DOCUMENT } from '@angular/common'; import { Component, ViewEncapsulation, @@ -7,21 +7,26 @@ import { ElementRef, Renderer2, ChangeDetectorRef, - inject + inject, + AfterViewInit, + OnDestroy } from '@angular/core'; import { fromEvent, Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { XClamp } from '@ng-nest/ui/core'; import { XUploadCutType, XUploadNode, XUploadPortalPrefix } from './upload.property'; +import { XIconComponent } from '@ng-nest/ui/icon'; @Component({ selector: `${XUploadPortalPrefix}`, + standalone: true, + imports: [CommonModule, XIconComponent], templateUrl: './upload-portal.component.html', styleUrls: ['./upload-portal.component.scss'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush }) -export class XUploadPortalComponent { +export class XUploadPortalComponent implements AfterViewInit, OnDestroy { file?: XUploadNode; @ViewChild('imgRef') imgRef!: ElementRef; @ViewChild('imgClipRef') imgClipRef!: ElementRef; @@ -57,10 +62,8 @@ export class XUploadPortalComponent { destroyPortal!: () => void; surePortal!: (blob: Blob) => void; private _unSubject = new Subject(); - - constructor(private renderer: Renderer2, private cdr: ChangeDetectorRef) {} - - ngOnInit() {} + private renderer = inject(Renderer2); + private cdr = inject(ChangeDetectorRef); ngAfterViewInit() { this.setCut(); @@ -206,7 +209,11 @@ export class XUploadPortalComponent { ); this.renderer.setStyle(this.cutRef.nativeElement, 'width', `${this.cutBox.width}px`); this.renderer.setStyle(this.cutRef.nativeElement, 'height', `${this.cutBox.height}px`); - this.renderer.setStyle(this.cutRef.nativeElement, 'transform', `translate3d(${this.cutBox.x}px, ${this.cutBox.y}px, 0)`); + this.renderer.setStyle( + this.cutRef.nativeElement, + 'transform', + `translate3d(${this.cutBox.x}px, ${this.cutBox.y}px, 0)` + ); } sure() { diff --git a/lib/ng-nest/ui/upload/upload.component.spec.ts b/lib/ng-nest/ui/upload/upload.component.spec.ts index 29aea1d4c..6d1b196cf 100644 --- a/lib/ng-nest/ui/upload/upload.component.spec.ts +++ b/lib/ng-nest/ui/upload/upload.component.spec.ts @@ -1,11 +1,9 @@ import { XButtonComponent } from '@ng-nest/ui/button'; import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XUploadComponent } from './upload.component'; import { Component, DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; -import { XUploadModule } from '@ng-nest/ui/upload'; +import { XUploadComponent } from '@ng-nest/ui/upload'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { XUploadPrefix } from './upload.property'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; @@ -21,11 +19,17 @@ describe(XUploadPrefix, () => { FormsModule, ReactiveFormsModule, XIconComponent, - XUploadModule, + XUploadComponent, XButtonComponent, - XRowComponent, XColComponent + XRowComponent, + XColComponent ], - declarations: [TestXUploadComponent, TestXUploadDisabledComponent, TestXUploadImgComponent, TestXUploadImgCutComponent] + declarations: [ + TestXUploadComponent, + TestXUploadDisabledComponent, + TestXUploadImgComponent, + TestXUploadImgCutComponent + ] }).compileComponents(); }); describe(`default.`, () => { @@ -171,7 +175,14 @@ class TestXUploadImgComponent { template: ` - + diff --git a/lib/ng-nest/ui/upload/upload.component.ts b/lib/ng-nest/ui/upload/upload.component.ts index 5c6638fec..23352a731 100644 --- a/lib/ng-nest/ui/upload/upload.component.ts +++ b/lib/ng-nest/ui/upload/upload.component.ts @@ -3,14 +3,13 @@ import { Component, ViewEncapsulation, ChangeDetectionStrategy, - Renderer2, ElementRef, ChangeDetectorRef, ViewChild, ViewContainerRef, OnInit, OnDestroy, - Optional + inject } from '@angular/core'; import { XUploadPrefix, XUploadNode, XUploadProperty, XUploadPortalPrefix } from './upload.property'; import { XConfigService, XIsArray, XIsTemplateRef } from '@ng-nest/ui/core'; @@ -20,9 +19,25 @@ import { XI18nService, XI18nUpload } from '@ng-nest/ui/i18n'; import { XPortalOverlayRef, XPortalService } from '@ng-nest/ui/portal'; import { XUploadPortalComponent } from './upload-portal.component'; import { XValueAccessor } from '@ng-nest/ui/base-form'; +import { CommonModule } from '@angular/common'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XOutletDirective } from '@ng-nest/ui/outlet'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XImageComponent, XImageGroupComponent } from '@ng-nest/ui/image'; +import { XProgressComponent } from '@ng-nest/ui/progress'; @Component({ selector: `${XUploadPrefix}`, + standalone: true, + imports: [ + CommonModule, + XIconComponent, + XOutletDirective, + XButtonComponent, + XImageGroupComponent, + XImageComponent, + XProgressComponent + ], templateUrl: './upload.component.html', styleUrls: ['./upload.component.scss'], encapsulation: ViewEncapsulation.None, @@ -52,24 +67,19 @@ export class XUploadComponent extends XUploadProperty implements OnInit, OnDestr this.setFiles(); this.cdr.detectChanges(); } - - constructor( - public renderer: Renderer2, - public elementRef: ElementRef, - @Optional() public http: HttpClient, - public override cdr: ChangeDetectorRef, - public portalService: XPortalService, - public viewContainerRef: ViewContainerRef, - public i18n: XI18nService, - public configService: XConfigService - ) { - super(); - if (!http) { - throw new Error(`${XUploadPrefix}: Not found 'HttpClient', You can import 'HttpClientModule' in your root module.`); - } - } + private http = inject(HttpClient, { optional: true }); + override cdr = inject(ChangeDetectorRef); + private portalService = inject(XPortalService); + private viewContainerRef = inject(ViewContainerRef); + private i18n = inject(XI18nService); + configService = inject(XConfigService); ngOnInit() { + if (!this.http) { + throw new Error( + `${XUploadPrefix}: Not found 'HttpClient', You can import 'HttpClientModule' in your root module.` + ); + } this.i18n.localeChange .pipe( map((x) => x.upload as XI18nUpload), @@ -155,7 +165,7 @@ export class XUploadComponent extends XUploadProperty implements OnInit, OnDestr headers: new HttpHeaders(this.headers) }); this.http - .request(req) + ?.request(req) .pipe( map((event) => this.getEventMessage(event, file, (body: BlobPart) => { diff --git a/lib/ng-nest/ui/upload/upload.module.ts b/lib/ng-nest/ui/upload/upload.module.ts index a48260dd4..87ab3f7a2 100644 --- a/lib/ng-nest/ui/upload/upload.module.ts +++ b/lib/ng-nest/ui/upload/upload.module.ts @@ -1,32 +1,8 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { XUploadComponent } from './upload.component'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { XButtonComponent } from '@ng-nest/ui/button'; -import { XIconComponent } from '@ng-nest/ui/icon'; -import { XUploadProperty } from './upload.property'; -import { XOutletDirective } from '@ng-nest/ui/outlet'; -import { XUploadPortalComponent } from './upload-portal.component'; -import { DragDropModule } from '@angular/cdk/drag-drop'; -import { XControlValueAccessor } from '@ng-nest/ui/base-form'; -import { XImageComponent, XImageGroupComponent } from '@ng-nest/ui/image'; -import { XProgressModule } from '@ng-nest/ui/progress'; @NgModule({ - declarations: [XUploadComponent, XUploadPortalComponent, XUploadProperty], exports: [XUploadComponent], - imports: [ - CommonModule, - FormsModule, - ReactiveFormsModule, - DragDropModule, - XOutletDirective, - XButtonComponent, - XIconComponent, - XControlValueAccessor, - XImageComponent, - XImageGroupComponent, - XProgressModule - ] + imports: [XUploadComponent] }) export class XUploadModule {} diff --git a/scripts/main/generate/docs/index.ts b/scripts/main/generate/docs/index.ts index 4532a8067..755d817ab 100644 --- a/scripts/main/generate/docs/index.ts +++ b/scripts/main/generate/docs/index.ts @@ -8,7 +8,6 @@ import { parseMdDoc, generateMenu, handlerComponent, - getThemes, handlerDemo, orderBy } from '../../utils'; @@ -18,7 +17,7 @@ import * as fs from 'fs-extra'; export const docsDir = path.resolve(__dirname, '../../../../docs'); export const componentsDir = path.resolve(__dirname, '../../../../lib/ng-nest/ui'); export const genDir = path.resolve(__dirname, '../../../../src/main/docs'); -export const genMenusDir = path.resolve(__dirname, '../../../../src/environments'); +export const genMenusDir = path.resolve(__dirname, '../../../../src/app'); export const docsPrefix = 'docs'; export const languages = ['zh_CN', 'en_US']; diff --git a/scripts/main/interfaces/module.ts b/scripts/main/interfaces/module.ts new file mode 100644 index 000000000..61d45949f --- /dev/null +++ b/scripts/main/interfaces/module.ts @@ -0,0 +1,17 @@ +/** + * 模块文件 + * 主要获取 exports 导出的组件 + * + * @export + * @interface NcModule + */ +export interface NcModule { + /** + * 模块名称 + */ + module?: string; + /** + * 组件名称 + */ + exports?: string[]; +} diff --git a/scripts/main/templates/component.template.ts b/scripts/main/templates/component.template.ts index a57e56c89..7f422903f 100644 --- a/scripts/main/templates/component.template.ts +++ b/scripts/main/templates/component.template.ts @@ -1,8 +1,11 @@ import { Component, ViewEncapsulation } from '@angular/core'; import { OnlineIdeService } from '@services'; +import { ShareModule } from '@share'; {{ __imports }} @Component({ selector: '{{ __comName }}', + standalone: true, + imports: [ShareModule{{ __declarations }}], templateUrl: './{{ __fileName }}.component.html', encapsulation: ViewEncapsulation.None }) diff --git a/scripts/main/templates/routes-module.template.ts b/scripts/main/templates/routes-module.template.ts index 35fcacb88..a7a464fd1 100644 --- a/scripts/main/templates/routes-module.template.ts +++ b/scripts/main/templates/routes-module.template.ts @@ -1,17 +1,10 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; +import { Routes } from '@angular/router'; import { {{ __capName }}Component } from './{{ __fileName }}.component'; {{ __imports }} -const routes: Routes = [ +export const {{ __capName }}Routes: Routes = [ { path: '', component: {{ __capName }}Component, children: [{{ __loadChildren }}] } ]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] -}) -export class {{ __capName }}RoutesModule {} diff --git a/scripts/main/utils/generate-menu.ts b/scripts/main/utils/generate-menu.ts index 85758ead0..6cbf77b57 100644 --- a/scripts/main/utils/generate-menu.ts +++ b/scripts/main/utils/generate-menu.ts @@ -10,8 +10,8 @@ import * as fs from 'fs-extra'; */ export function generateMenu(genDir: string, menus: NcMenu[]) { fs.writeFileSync( - `${genDir}/menus.ts`, - `import { Menu } from './routes'; + `${genDir}/app.menus.ts`, + `import { Menu } from '@interfaces'; export const menus: Menu[] = ${JSON.stringify(menus, null, 2)}`, 'utf8' ); diff --git a/scripts/main/utils/handler-cates.ts b/scripts/main/utils/handler-cates.ts index 21354fe66..78ad545ee 100644 --- a/scripts/main/utils/handler-cates.ts +++ b/scripts/main/utils/handler-cates.ts @@ -13,7 +13,7 @@ import { NcTemplate } from '../interfaces/template'; */ export function hanlderCates(cates: NcCates, page: NcPage) { let folder = fs.readdirSync(cates.folderPath, 'utf8'); - let mod = page.templates.find((x) => x.type == 'default' && x.name == 'module'); + let component = page.templates.find((x) => x.type == 'default' && x.name == 'component'); cates.list = []; folder.forEach((x) => { let catePath = path.join(cates.folderPath, x); @@ -26,7 +26,7 @@ export function hanlderCates(cates: NcCates, page: NcPage) { label: readme.meta.label, path: catePath }; - handlerCodeBoxes(cate, readme, mod, page); + handlerCodeBoxes(cate, readme, component, page); cates.list.push(cate); cates.list = orderBy(cates.list, ['order'], ['asc']); } @@ -41,7 +41,7 @@ export function hanlderCates(cates: NcCates, page: NcPage) { * @param {NcCate} cate * @param {*} readme */ -export function handlerCodeBoxes(cate: NcCate, readme, module: NcTemplate, page: NcPage) { +export function handlerCodeBoxes(cate: NcCate, readme, component: NcTemplate, page: NcPage) { let folder = fs.readdirSync(cate.path, 'utf8'); let box: NcCodeBox = { codes: [], @@ -62,13 +62,15 @@ export function handlerCodeBoxes(cate: NcCate, readme, module: NcTemplate, page: const matchClassName = code.content.match(/export class (\S*) /); if (matchSelector.length > 1) cate.selector = matchSelector[1]; if (matchClassName.length > 1) cate.className = matchClassName[1]; - cate.rootPath = `./${cate.path.slice(cate.path.lastIndexOf('examples'), cate.path.length).replace(/\\/g, '/')}/${x.slice( - 0, - x.lastIndexOf(code.type) - 1 - )}`; + cate.rootPath = `./${cate.path + .slice(cate.path.lastIndexOf('examples'), cate.path.length) + .replace(/\\/g, '/')}/${x.slice(0, x.lastIndexOf(code.type) - 1)}`; if (cate.className) { - module.syswords.declarations += `, ${cate.className}`; - module.syswords.imports += `import { ${cate.className} } from '${cate.rootPath.replace(`/${page.lang}/`, '/')}';\n`; + component.syswords.declarations += `, ${cate.className}`; + component.syswords.imports += `import { ${cate.className} } from '${cate.rootPath.replace( + `/${page.lang}/`, + '/' + )}';\n`; } } box.codes.push(code); diff --git a/scripts/main/utils/handler-component.ts b/scripts/main/utils/handler-component.ts index 81659430a..4b80f16a3 100644 --- a/scripts/main/utils/handler-component.ts +++ b/scripts/main/utils/handler-component.ts @@ -6,16 +6,15 @@ import { NcExamples, NcCates } from '../interfaces/examples'; import { replaceKey, randomString, - generateTabs, - handlerTabs, hanlderCates, generateCates, hanlderPattern, generatePatterns, - hanlderSpec, + hanlderModule, hanlderProp, generateProps, - hasIn + hasIn, + firstLetterCapital } from '.'; const tplDir = path.resolve(__dirname, '../../main/templates'); @@ -30,7 +29,7 @@ export async function handlerComponent(page: NcPage) { handlerExamples(page); await handlerApi(page); await handlerPattern(page); - await handlerSpec(page); + await handlerModule(page); } /** @@ -48,25 +47,6 @@ export function handlerExamples(page: NcPage): Promise { examples.tplPath = path.join(tplDir, 'examples-component.template.html'); let func = ''; while (func == '' || hasIn(comTpl.syswords.constant, func)) func = randomString(); - - // let tabs = handlerTabs({ - // layout: NcTabsLayoutEnum.Left, - // nodeJustify: NcTabsNodeJustifyEnum.Start, - // size: NcTabsSizeEnum.Large, - // tabsType: NcTabsTypeEnum.Block, - // tabsAnimated: false, - // tabsLinkRouter: false, - // folderPath: `${examples.path}/${page.lang}` - // }); - // tabs.tabs.forEach((x) => { - // let cates: NcCates = { folderPath: path.join(tabs.folderPath, x.name) }; - // hanlderCates(cates, page); - // generateCates(cates, comTpl); - // if (cates.content) { - // x.content = cates.content; - // } - // }); - // generateTabs(tabs); let folderPath = path.join(`${examples.path}/${page.lang}`, 'default'); let cates: NcCates = { folderPath }; hanlderCates(cates, page); @@ -96,33 +76,32 @@ export async function handlerPattern(page: NcPage) { page.custom = replaceKey(page.custom, '__pattern', `${generatePatterns(...patterns)}`); } -export async function handlerSpec(page: NcPage) { - const fileTypes = ['component', 'directive', 'pipe']; - let fsPath = ''; - for (let fileTpye of fileTypes) { - fsPath = path.join(page.path, `${page.name}.${fileTpye}.spec.ts`); - if (fs.existsSync(fsPath)) break; - } - let specs = await hanlderSpec(fsPath); - let mod = page.templates.find((x) => x.type === 'default' && x.name === 'module'); - specs.forEach((x) => { - mod.syswords.imports += `${x.import}\n`; - mod.syswords.modules += `, ${x.module}`; - if (x.import.indexOf(`@ng-nest/ui/${page.name}`) !== -1) { - let temp = page.templates.find((x) => x.name === 'component' && x.type === 'default'); - if (temp !== null) { - let tpl = fs.readFileSync(path.join(tplDir, 'highlight-component.template.html'), 'utf8'); - let param = randomString(7); - tpl = replaceKey(tpl, '__type', 'typescript'); - tpl = replaceKey(tpl, '__data', param); - temp.syswords.constant += `${param} = \`${x.import}\`;\n`; - page.custom = replaceKey(page.custom, '__component', `${tpl}`); - } - } - }); +export async function handlerModule(page: NcPage) { + let fsPath = path.join(page.path, `${page.name}.module.ts`); + if (!fs.existsSync(fsPath)) return; + let module = await hanlderModule(fsPath); + if (!module) return; + let temp = page.templates.find((x) => x.name === 'component' && x.type === 'default'); + if (!temp) return; + let tpl = fs.readFileSync(path.join(tplDir, 'highlight-component.template.html'), 'utf8'); + let param = randomString(7); + tpl = replaceKey(tpl, '__type', 'typescript'); + tpl = replaceKey(tpl, '__data', param); - let htl = page.templates.find((x) => x.type === 'custom' && x.name === 'custom-component'); - if (htl) { - htl.syswords.modules = specs.map((x) => `'${x.name}'`).join(', '); + + if (module.exports.length !== 0) { + let text = `import { ${module.exports.map((x) => x).join(', ')} } from '@ng-nest/ui/${page.name}';\n// or`; + text += `\nimport { ${module.module} } from '@ng-nest/ui/${page.name}';\``; + temp.syswords.constant += `${param} = \`${text}`; + } else { + let text = `// Using root service`; + text += `\nimport { X${page.name + .replace(/_/g, '') + .split('-') + .map((x) => firstLetterCapital(x)) + .join('')}Service } from '@ng-nest/ui/${page.name}';\``; + temp.syswords.constant += `${param} = \`${text}`; } + + page.custom = replaceKey(page.custom, '__component', `${tpl}`); } diff --git a/scripts/main/utils/handler-demo.ts b/scripts/main/utils/handler-demo.ts index 8ad9fc467..22fde9609 100644 --- a/scripts/main/utils/handler-demo.ts +++ b/scripts/main/utils/handler-demo.ts @@ -28,11 +28,11 @@ export function handlerDemo(page: NcPage, docDir: string, router: string) { page.custom = replaceKey(page.custom, `__${child}${params?.length > 0 ? ':' + params.join(':') : ''}`, `${tpl}`); } } - if (children.length > 0) { - let mod = page.templates.find((x) => x.type === 'default' && x.name === 'module'); - mod.syswords.imports += `import { XTreeFileModule } from '@ng-nest/ui/tree-file';\n`; - mod.syswords.modules += `, XTreeFileModule`; - } + // if (children.length > 0) { + // let mod = page.templates.find((x) => x.type === 'default' && x.name === 'module'); + // mod.syswords.imports += `import { XTreeFileComponent } from '@ng-nest/ui/tree-file';\n`; + // mod.syswords.modules += `, XTreeFileComponent`; + // } } export function getTreeFile(demoPath: string, demo: string, router: string) { diff --git a/scripts/main/utils/handler-module.ts b/scripts/main/utils/handler-module.ts new file mode 100644 index 000000000..de35e41ea --- /dev/null +++ b/scripts/main/utils/handler-module.ts @@ -0,0 +1,57 @@ +import * as fs from 'fs-extra'; +import * as readline from 'readline'; +import { NcModule } from '../interfaces/module'; + +/** + * 模块文件处理 + * 获取模块文件中 exports 的组件 + * + * @export + * @param {string} fsPath + */ +export function hanlderModule(fsPath: string): Promise { + return new Promise((res, rej) => { + if (!fs.existsSync(fsPath)) { + res(null); + return; + } + let lines = readline.createInterface({ + input: fs.createReadStream(fsPath) + }); + let module: NcModule = { module: '', exports: [] }; + let startExports = false; + lines.on('line', (line: string) => { + line = line.trim(); + if (line.startsWith('exports: [')) { + let pattern = /exports: \[(.*)\]/; + let re = line.match(pattern); + if (re) { + let coms = re[1].split(','); + for (let i = 0; i < coms.length; i++) { + const com = coms[i].trim(); + if (com.length > 0) { + module.exports.push(com); + } + } + } else { + startExports = true; + } + } + if (startExports) { + if (line.startsWith(']')) { + startExports = false; + } else if (!line.startsWith('exports: [')) { + module.exports.push(line.replace(/,/g, '')); + } + } + if (line.startsWith('export class ')) { + let pattern = /export class (.*) {/; + let re = line.match(pattern); + module.module = re[1]; + } + }); + lines.on('close', () => { + res(module); + }); + }); +} diff --git a/scripts/main/utils/handler-page.ts b/scripts/main/utils/handler-page.ts index 1f836aaa7..8c2429eaa 100644 --- a/scripts/main/utils/handler-page.ts +++ b/scripts/main/utils/handler-page.ts @@ -6,7 +6,7 @@ import { NcPage } from '../interfaces/page'; const tplDir = path.resolve(__dirname, '../../main/templates'); export function handlerPage(page: NcPage) { - let templates: NcTplName[] = ['component', 'module', 'routes-module']; + let templates: NcTplName[] = ['component', 'routes-module']; templates.unshift({ name: `${page.type}-component`, extension: 'html', @@ -49,7 +49,7 @@ export function pageAddChildren(page: NcPage, children: NcPage[]) { children.forEach((x, index) => { let route = ` { path: '${x.name}', - loadChildren: () => import('./${x.name}/${x.fileName}.module').then(x => x.${x.capName}Module) + loadChildren: () => import('./${x.name}/${x.fileName}-routes.module').then(x => x.${x.capName}Routes) }`; if (x.default) { route = ` { diff --git a/scripts/main/utils/index.ts b/scripts/main/utils/index.ts index abd26705b..1b5e9076a 100644 --- a/scripts/main/utils/index.ts +++ b/scripts/main/utils/index.ts @@ -14,6 +14,7 @@ export * from './handler-tabs'; export * from './handler-cates'; export * from './handler-pattern'; export * from './handler-spec'; +export * from './handler-module'; export * from './handler-prop'; export * from './handler-demo'; export * from './generate-cates'; @@ -22,4 +23,4 @@ export * from './generate-menu'; export * from './generate-cates'; export * from './generate-tabs'; export * from './generate-prop'; -export * from './generate-pattern'; +export * from './generate-pattern'; \ No newline at end of file diff --git a/src/app/app.component.ts b/src/app/app.component.ts index b39960ecf..3bcc04597 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -1,8 +1,11 @@ import { AfterViewInit, Component, ViewEncapsulation } from '@angular/core'; +import { RouterOutlet } from '@angular/router'; import { ConfigService } from '@services'; @Component({ selector: 'ns-root', + standalone: true, + imports: [RouterOutlet], templateUrl: './app.component.html', styleUrls: ['./app.component.scss'], encapsulation: ViewEncapsulation.None diff --git a/src/app/app.config.server.ts b/src/app/app.config.server.ts new file mode 100644 index 000000000..2149731d2 --- /dev/null +++ b/src/app/app.config.server.ts @@ -0,0 +1,9 @@ +import { mergeApplicationConfig, ApplicationConfig } from '@angular/core'; +import { provideServerRendering } from '@angular/platform-server'; +import { appConfig } from './app.config'; + +const serverConfig: ApplicationConfig = { + providers: [provideServerRendering()] +}; + +export const config = mergeApplicationConfig(appConfig, serverConfig); diff --git a/src/app/app.config.ts b/src/app/app.config.ts new file mode 100644 index 000000000..7bf75994a --- /dev/null +++ b/src/app/app.config.ts @@ -0,0 +1,31 @@ +import { ApplicationConfig, isDevMode } from '@angular/core'; +import { + provideRouter, + withEnabledBlockingInitialNavigation, + withInMemoryScrolling, + withPreloading +} from '@angular/router'; +import { MainRoutes } from './app.routes'; +// import { provideClientHydration } from '@angular/platform-browser'; +import { provideServiceWorker } from '@angular/service-worker'; +import { provideHttpClient } from '@angular/common/http'; +import { provideAnimations } from '@angular/platform-browser/animations'; +import { XPreloadingStrategyService } from '@ng-nest/ui/core'; + +export const appConfig: ApplicationConfig = { + providers: [ + provideAnimations(), + provideHttpClient(), + provideRouter( + MainRoutes, + withInMemoryScrolling({ anchorScrolling: 'enabled', scrollPositionRestoration: 'top' }), + withEnabledBlockingInitialNavigation(), + withPreloading(XPreloadingStrategyService) + ), + // provideClientHydration(), + provideServiceWorker('ngsw-worker.js', { + enabled: !isDevMode(), + registrationStrategy: 'registerWhenStable:30000' + }) + ] +}; diff --git a/src/environments/menus.ts b/src/app/app.menus.ts similarity index 99% rename from src/environments/menus.ts rename to src/app/app.menus.ts index 9752e3cf9..cd8ebb931 100644 --- a/src/environments/menus.ts +++ b/src/app/app.menus.ts @@ -1,4 +1,4 @@ -import { Menu } from './routes'; +import { Menu } from '@interfaces'; export const menus: Menu[] = [ { "id": "4", diff --git a/src/app/app.module.ts b/src/app/app.module.ts deleted file mode 100644 index a0b751f51..000000000 --- a/src/app/app.module.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { BrowserModule, provideClientHydration } from '@angular/platform-browser'; -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { NgModule } from '@angular/core'; - -import { AppComponent } from './app.component'; -import { MainRoutesModule } from '../main/routes.module'; -import { HttpClientModule } from '@angular/common/http'; -import { ServiceWorkerModule } from '@angular/service-worker'; -import { environment } from '@environments'; - -@NgModule({ - declarations: [AppComponent], - imports: [ - BrowserModule, - BrowserAnimationsModule, - HttpClientModule, - MainRoutesModule, - ServiceWorkerModule.register('ngsw-worker.js', { - enabled: environment.production, - // Register the ServiceWorker as soon as the app is stable - // or after 30 seconds (whichever comes first). - registrationStrategy: 'registerWhenStable:30000' - }) - ], - providers: [provideClientHydration()], - bootstrap: [AppComponent] -}) -export class AppModule {} diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts new file mode 100644 index 000000000..425d8ece8 --- /dev/null +++ b/src/app/app.routes.ts @@ -0,0 +1,56 @@ +import { Routes } from '@angular/router'; +import { environment } from '@environments'; + +export const ShareRoutes: Routes = [ + { + path: 'no-auth', + loadChildren: () => import('../main/no-auth/no-auth-routes.module').then((x) => x.NoAuthRoutes) + }, + { + path: '**', + loadChildren: () => import('../main/exception/404-routes.module').then((x) => x.Exception404Routes) + } +]; + +export const MainRoutes: Routes = [ + { + path: `${environment.layout}`, + loadChildren: () => import('../main/layout/layout-routes.module').then((x) => x.LayoutRoutes) + }, + { path: '', redirectTo: `${environment.layout}`, pathMatch: 'full' }, + + ...ShareRoutes +]; + +export const TestRoutes: Routes = [ + { path: '', redirectTo: `test`, pathMatch: 'full' }, + { + path: `test`, + loadChildren: () => import('../main/test/test-routes.module').then((x) => x.TestRoutes) + } +]; + +/** + * DocModule 文档模块通过命令生成 + */ +export const LayoutRoutes: Routes = [ + { path: '', redirectTo: environment.defaultPage, pathMatch: 'full' }, + { + path: 'home', + loadChildren: () => import('../main/home/home-routes.module').then((x) => x.HomeRoutes) + }, + { + path: 'demo', + loadChildren: () => import('../main/demo/demo-routes.module').then((x) => x.DemoRoutes) + }, + { + path: 'docs', + loadChildren: () => import('../main/docs/docs-routes.module').then((x) => x.DocRoutes) + }, + { + path: 'news', + loadChildren: () => import('../main/news/news-routes.module').then((x) => x.NewsRoutes) + }, + + ...ShareRoutes +]; diff --git a/src/app/app.server.module.ts b/src/app/app.server.module.ts deleted file mode 100644 index 795380cd2..000000000 --- a/src/app/app.server.module.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { NgModule } from '@angular/core'; -import { ServerModule } from '@angular/platform-server'; - -import { AppModule } from './app.module'; -import { AppComponent } from './app.component'; - -@NgModule({ - imports: [ - AppModule, - ServerModule, - ], - bootstrap: [AppComponent], -}) -export class AppServerModule {} diff --git a/src/environments/environment.development.ts b/src/environments/environment.development.ts index f8c2075e6..be2bf65f3 100644 --- a/src/environments/environment.development.ts +++ b/src/environments/environment.development.ts @@ -1,6 +1,6 @@ export const environment = { - production: false, - layout: 'test', - defaultPage: 'alert', - static: 'http://localhost:9494' + production: true, + layout: 'index', + defaultPage: 'docs', + static: 'https://ngnest.com/static' }; diff --git a/src/environments/index.ts b/src/environments/index.ts index 9b9c54e3a..5d04aebd1 100644 --- a/src/environments/index.ts +++ b/src/environments/index.ts @@ -1,3 +1 @@ export * from './environment'; -export * from './menus'; -export * from './routes'; diff --git a/src/environments/routes.ts b/src/environments/routes.ts deleted file mode 100644 index 04b05eed9..000000000 --- a/src/environments/routes.ts +++ /dev/null @@ -1,71 +0,0 @@ -import { Routes } from '@angular/router'; -import { environment } from './environment'; - -export const shareRoutes: Routes = [ - { - path: 'no-auth', - loadChildren: () => import('../main/no-auth/no-auth.module').then((x) => x.NoAuthModule) - }, - { - path: '**', - loadChildren: () => import('../main/exception/404.module').then((x) => x.Exception404Module) - } -]; - -export const mainRoutes: Routes = [ - { - path: `${environment.layout}`, - loadChildren: () => import('../main/layout/layout.module').then((x) => x.LayoutModule) - }, - { path: '', redirectTo: `${environment.layout}`, pathMatch: 'full' }, - - ...shareRoutes -]; - -export const testRoutes: Routes = [ - { path: '', redirectTo: `test`, pathMatch: 'full' }, - { - path: `test`, - loadChildren: () => import('../main/test/test-routes.modules').then((x) => x.TestRoutes) - } -]; - -/** - * DocModule 文档模块通过命令生成 - */ -export const layoutRoutes: Routes = [ - { path: '', redirectTo: environment.defaultPage, pathMatch: 'full' }, - { - path: 'home', - loadChildren: () => import('../main/home/home.module').then((x) => x.HomeModule) - }, - { - path: 'demo', - loadChildren: () => import('../main/demo/demo.module').then((x) => x.DemoModule) - }, - { - path: 'docs', - loadChildren: () => import('../main/docs/docs.module').then((x) => x.NsDocsModule) - }, - { - path: 'news', - loadChildren: () => import('../main/news/news.module').then((x) => x.NewsModule) - }, - - ...shareRoutes -]; - -export interface Menu { - id?: string; - pid?: string | null; - label?: string; - name?: string; - enLabel?: string; - router?: string; - icon?: string; - type?: string; - order?: number; - category?: string; - lang?: string; - [property: string]: any; -} diff --git a/src/interfaces/index.ts b/src/interfaces/index.ts new file mode 100644 index 000000000..93ab9bd54 --- /dev/null +++ b/src/interfaces/index.ts @@ -0,0 +1 @@ +export * from './menu.interface'; diff --git a/src/interfaces/menu.interface.ts b/src/interfaces/menu.interface.ts new file mode 100644 index 000000000..5807fddc5 --- /dev/null +++ b/src/interfaces/menu.interface.ts @@ -0,0 +1,14 @@ +export interface Menu { + id?: string; + pid?: string | null; + label?: string; + name?: string; + enLabel?: string; + router?: string; + icon?: string; + type?: string; + order?: number; + category?: string; + lang?: string; + [property: string]: any; +} diff --git a/src/main.server.ts b/src/main.server.ts index f1273f59a..d5f18bc3d 100644 --- a/src/main.server.ts +++ b/src/main.server.ts @@ -1 +1,7 @@ -export { AppServerModule as default } from './app/app.server.module'; +import { bootstrapApplication } from '@angular/platform-browser'; +import { AppComponent } from './app/app.component'; +import { config } from './app/app.config.server'; + +const bootstrap = () => bootstrapApplication(AppComponent, config); + +export default bootstrap; \ No newline at end of file diff --git a/src/main.ts b/src/main.ts index c7b673cf4..c46dc16d6 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,12 +1,6 @@ -import { enableProdMode } from '@angular/core'; -import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; +import { bootstrapApplication } from '@angular/platform-browser'; +import { appConfig } from './app/app.config'; +import { AppComponent } from './app/app.component'; -import { AppModule } from './app/app.module'; -import { environment } from './environments/environment'; - -if (environment.production) { - enableProdMode(); -} - -platformBrowserDynamic().bootstrapModule(AppModule) - .catch(err => console.error(err)); +bootstrapApplication(AppComponent, appConfig) + .catch((err) => console.error(err)); \ No newline at end of file diff --git a/src/main/demo/demo-routes.module.ts b/src/main/demo/demo-routes.module.ts index 9cb5b69b2..c195a7769 100644 --- a/src/main/demo/demo-routes.module.ts +++ b/src/main/demo/demo-routes.module.ts @@ -1,11 +1,4 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; +import { Routes } from '@angular/router'; import { DemoComponent } from './demo.component'; -const routes: Routes = [{ path: '', component: DemoComponent }]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] -}) -export class DemoRoutesModule {} +export const DemoRoutes: Routes = [{ path: '', component: DemoComponent }]; diff --git a/src/main/demo/demo.component.ts b/src/main/demo/demo.component.ts index acc99e209..a2b346c3f 100644 --- a/src/main/demo/demo.component.ts +++ b/src/main/demo/demo.component.ts @@ -1,14 +1,10 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; -import { Router } from '@angular/router'; +import { Component, ViewEncapsulation } from '@angular/core'; @Component({ selector: 'ns-demo', + standalone: true, templateUrl: './demo.component.html', styleUrls: ['./demo.component.scss'], encapsulation: ViewEncapsulation.None }) -export class DemoComponent implements OnInit { - constructor(public router: Router) {} - - ngOnInit() {} -} +export class DemoComponent {} diff --git a/src/main/demo/demo.module.ts b/src/main/demo/demo.module.ts deleted file mode 100644 index b6ffa638c..000000000 --- a/src/main/demo/demo.module.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { NgModule } from '@angular/core'; -import { DemoComponent } from './demo.component'; -import { DemoRoutesModule } from './demo-routes.module'; - -@NgModule({ - imports: [DemoRoutesModule], - declarations: [DemoComponent], - exports: [DemoComponent] -}) -export class DemoModule {} diff --git a/src/main/docs/docs-routes.module.ts b/src/main/docs/docs-routes.module.ts index b6eb24740..9e7b6a5fb 100644 --- a/src/main/docs/docs-routes.module.ts +++ b/src/main/docs/docs-routes.module.ts @@ -1,27 +1,20 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; +import { Routes } from '@angular/router'; import { NsDocsComponent } from './docs.component'; -const routes: Routes = [ +export const DocRoutes: Routes = [ { path: '', component: NsDocsComponent, children: [ { path: '', redirectTo: 'zh_CN', pathMatch: 'full' }, - // { - // path: 'zh_CN', - // loadChildren: () => import('./zh_CN/docs-zh_CN.module').then((x) => x.NsDocsZhCNModule) - // }, - // { - // path: 'en_US', - // loadChildren: () => import('./en_US/docs-en_US.module').then((x) => x.NsDocsEnUSModule) - // } + { + path: 'zh_CN', + loadChildren: () => import('./zh_CN/docs-zh_CN-routes.module').then((x) => x.NsDocsZhCNRoutes) + }, + { + path: 'en_US', + loadChildren: () => import('./en_US/docs-en_US-routes.module').then((x) => x.NsDocsEnUSRoutes) + } ] } ]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] -}) -export class NsDocsRoutesModule {} diff --git a/src/main/docs/docs.component.ts b/src/main/docs/docs.component.ts index ed675c661..7d544785e 100644 --- a/src/main/docs/docs.component.ts +++ b/src/main/docs/docs.component.ts @@ -1,13 +1,17 @@ import { Component, ViewEncapsulation } from '@angular/core'; -import { Router, ActivatedRoute } from '@angular/router'; +import { Router, ActivatedRoute, RouterOutlet } from '@angular/router'; import { Location } from '@angular/common'; import { ConfigService } from '../../services/config.service'; import { LayoutService } from '../layout/layout.service'; -import { environment } from '../../environments/environment'; -import { Menu } from '../../environments/routes'; +import { environment } from '@environments'; +import { Menu } from '@interfaces'; +import { NsAdaptionDirective } from '@share'; +import { XMenuComponent } from '@ng-nest/ui/menu'; @Component({ selector: 'ns-docs', + standalone: true, + imports: [RouterOutlet, NsAdaptionDirective, XMenuComponent], templateUrl: './docs.component.html', styleUrls: ['./docs.component.scss'], encapsulation: ViewEncapsulation.None diff --git a/src/main/docs/docs.module.ts b/src/main/docs/docs.module.ts deleted file mode 100644 index 13c3673e7..000000000 --- a/src/main/docs/docs.module.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { ShareModule } from '@share'; -import { NgModule } from '@angular/core'; -import { NsDocsComponent } from './docs.component'; -import { NsDocsRoutesModule } from './docs-routes.module'; -import { XMenuComponent } from '@ng-nest/ui/menu'; - -@NgModule({ - imports: [ShareModule, NsDocsRoutesModule, XMenuComponent], - declarations: [NsDocsComponent], - exports: [NsDocsComponent] -}) -export class NsDocsModule {} diff --git a/src/main/exception/404-routes.module.ts b/src/main/exception/404-routes.module.ts index 92e827d5e..025d3bc87 100644 --- a/src/main/exception/404-routes.module.ts +++ b/src/main/exception/404-routes.module.ts @@ -1,11 +1,4 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; +import { Routes } from '@angular/router'; import { Exception404Component } from './404.component'; -const routes: Routes = [{ path: '', component: Exception404Component }]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] -}) -export class Exception404RoutesModule {} +export const Exception404Routes: Routes = [{ path: '', component: Exception404Component }]; diff --git a/src/main/exception/404.component.ts b/src/main/exception/404.component.ts index 05a4085d9..5bbc079d6 100644 --- a/src/main/exception/404.component.ts +++ b/src/main/exception/404.component.ts @@ -1,8 +1,12 @@ import { DOCUMENT } from '@angular/common'; import { Component, ViewEncapsulation, inject } from '@angular/core'; +import { RouterLink } from '@angular/router'; +import { XI18nPipe } from '@ng-nest/ui/i18n'; @Component({ selector: 'exception-404', + standalone: true, + imports: [XI18nPipe, RouterLink], templateUrl: './404.component.html', styleUrls: ['./404.component.scss'], encapsulation: ViewEncapsulation.None diff --git a/src/main/exception/404.module.ts b/src/main/exception/404.module.ts deleted file mode 100644 index c60a4e0bc..000000000 --- a/src/main/exception/404.module.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { Exception404Component } from './404.component'; -import { Exception404RoutesModule } from './404-routes.module'; -import { XI18nPipe } from '@ng-nest/ui/i18n'; - -@NgModule({ - imports: [CommonModule, XI18nPipe, Exception404RoutesModule], - declarations: [Exception404Component], - exports: [Exception404Component] -}) -export class Exception404Module {} diff --git a/src/main/home/home-routes.module.ts b/src/main/home/home-routes.module.ts index 9ddac9bcb..d8fb94bd6 100644 --- a/src/main/home/home-routes.module.ts +++ b/src/main/home/home-routes.module.ts @@ -1,11 +1,4 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; +import { Routes } from '@angular/router'; import { HomeComponent } from './home.component'; -const routes: Routes = [{ path: '', component: HomeComponent }]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] -}) -export class HomeRoutesModule {} +export const HomeRoutes: Routes = [{ path: '', component: HomeComponent }]; diff --git a/src/main/home/home.component.ts b/src/main/home/home.component.ts index 5dceba1ef..88c738802 100644 --- a/src/main/home/home.component.ts +++ b/src/main/home/home.component.ts @@ -1,21 +1,22 @@ -import { Component, HostBinding, OnInit, ViewEncapsulation } from '@angular/core'; -import { Router } from '@angular/router'; +import { Component, HostBinding, ViewEncapsulation } from '@angular/core'; import { LayoutService } from '../layout/layout.service'; +import { CommonModule } from '@angular/common'; +import { XButtonComponent } from '@ng-nest/ui/button'; @Component({ selector: 'ns-home', + standalone: true, + imports: [CommonModule, XButtonComponent], templateUrl: './home.component.html', styleUrls: ['./home.component.scss'], encapsulation: ViewEncapsulation.None }) -export class HomeComponent implements OnInit { +export class HomeComponent { @HostBinding('class.small') get small() { return this.layout.small; } @HostBinding('class.xsmall') get xsmall() { return this.layout.xsmall; } - constructor(public router: Router, public layout: LayoutService) {} - - ngOnInit() {} + constructor(public layout: LayoutService) {} } diff --git a/src/main/home/home.module.ts b/src/main/home/home.module.ts deleted file mode 100644 index 8c9fc5488..000000000 --- a/src/main/home/home.module.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { NgModule } from '@angular/core'; -import { HomeComponent } from './home.component'; -import { HomeRoutesModule } from './home-routes.module'; -import { XButtonComponent } from '@ng-nest/ui/button'; - -@NgModule({ - imports: [HomeRoutesModule, XButtonComponent], - declarations: [HomeComponent], - exports: [HomeComponent] -}) -export class HomeModule {} diff --git a/src/main/layout/affix/affix.component.ts b/src/main/layout/affix/affix.component.ts index 503b5b293..a2c0e0324 100644 --- a/src/main/layout/affix/affix.component.ts +++ b/src/main/layout/affix/affix.component.ts @@ -2,19 +2,19 @@ import { Component, ViewEncapsulation } from '@angular/core'; import { LayoutService } from '../layout.service'; import { XConfigService, X_THEME_COLORS, X_THEME_DARK_COLORS } from '@ng-nest/ui/core'; import { ConfigService } from '@services'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { CommonModule } from '@angular/common'; @Component({ selector: 'ns-affix', + standalone: true, + imports: [CommonModule, XButtonComponent], templateUrl: './affix.component.html', encapsulation: ViewEncapsulation.None }) export class AffixComponent { theme: 'dark' | 'light' = 'light'; - constructor( - public layout: LayoutService, - public configService: XConfigService, - public config: ConfigService - ) {} + constructor(public layout: LayoutService, public configService: XConfigService, public config: ConfigService) {} action(type: string) { switch (type) { diff --git a/src/main/layout/content/content.component.ts b/src/main/layout/content/content.component.ts index 7b86176aa..685d79da7 100644 --- a/src/main/layout/content/content.component.ts +++ b/src/main/layout/content/content.component.ts @@ -1,8 +1,11 @@ import { Component, OnInit, ViewEncapsulation, ElementRef } from '@angular/core'; import { LayoutService } from '../layout.service'; +import { RouterOutlet } from '@angular/router'; @Component({ selector: 'ns-content', + standalone: true, + imports: [RouterOutlet], templateUrl: './content.component.html', encapsulation: ViewEncapsulation.None }) diff --git a/src/main/layout/footer/footer.component.ts b/src/main/layout/footer/footer.component.ts index 8e5f5cac0..c26fe7a31 100644 --- a/src/main/layout/footer/footer.component.ts +++ b/src/main/layout/footer/footer.component.ts @@ -1,7 +1,10 @@ import { Component, ViewEncapsulation } from '@angular/core'; +import { XI18nPipe } from '@ng-nest/ui/i18n'; @Component({ selector: 'ns-footer', + standalone: true, + imports: [XI18nPipe], templateUrl: './footer.component.html', encapsulation: ViewEncapsulation.None }) diff --git a/src/main/layout/header/header.component.html b/src/main/layout/header/header.component.html index d59ba62ea..36c294f9a 100644 --- a/src/main/layout/header/header.component.html +++ b/src/main/layout/header/header.component.html @@ -1,13 +1,35 @@ - + - + - + - + diff --git a/src/main/layout/header/header.component.ts b/src/main/layout/header/header.component.ts index 763f7cd06..f8ae87179 100644 --- a/src/main/layout/header/header.component.ts +++ b/src/main/layout/header/header.component.ts @@ -1,9 +1,26 @@ import { Component, ElementRef, OnInit, ViewEncapsulation } from '@angular/core'; import { LayoutService } from '../layout.service'; import { XStorageService } from '@ng-nest/ui/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { CommonModule } from '@angular/common'; +import { LogoComponent } from '../logo/logo.component'; +import { SearchComponent } from '../search/search.component'; +import { NavComponent } from '../nav/nav.component'; +import { XDrawerComponent } from '@ng-nest/ui/drawer'; +import { SiderComponent } from '../sider/sider.component'; @Component({ selector: 'ns-header', + standalone: true, + imports: [ + CommonModule, + XButtonComponent, + LogoComponent, + SearchComponent, + NavComponent, + XDrawerComponent, + SiderComponent + ], templateUrl: './header.component.html', encapsulation: ViewEncapsulation.None }) diff --git a/src/main/layout/layout-routes.module.ts b/src/main/layout/layout-routes.module.ts index 05ea184ca..53286274a 100644 --- a/src/main/layout/layout-routes.module.ts +++ b/src/main/layout/layout-routes.module.ts @@ -1,18 +1,11 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; +import { Routes } from '@angular/router'; import { LayoutComponent } from './layout.component'; -import { layoutRoutes } from '../../environments/routes'; +import { LayoutRoutes as LRoutes } from '../../app/app.routes'; -const routes: Routes = [ +export const LayoutRoutes: Routes = [ { path: '', component: LayoutComponent, - children: layoutRoutes + children: LRoutes } ]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] -}) -export class LayoutRoutesModule {} diff --git a/src/main/layout/layout.component.ts b/src/main/layout/layout.component.ts index 496e881af..546da41c3 100644 --- a/src/main/layout/layout.component.ts +++ b/src/main/layout/layout.component.ts @@ -2,9 +2,12 @@ import { Component, OnInit, ViewEncapsulation, HostBinding, ViewChild } from '@a import { Breakpoints, BreakpointObserver } from '@angular/cdk/layout'; import { LayoutService } from './layout.service'; import { ContentComponent } from './content/content.component'; +import { HeaderComponent } from './header/header.component'; @Component({ selector: 'ns-layout', + standalone: true, + imports: [HeaderComponent, ContentComponent], templateUrl: './layout.component.html', styleUrls: ['./layout.component.scss'], encapsulation: ViewEncapsulation.None diff --git a/src/main/layout/layout.module.ts b/src/main/layout/layout.module.ts deleted file mode 100644 index 33ea9d926..000000000 --- a/src/main/layout/layout.module.ts +++ /dev/null @@ -1,63 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { XIconComponent } from '@ng-nest/ui/icon'; -import { XMenuComponent } from '@ng-nest/ui/menu'; -import { XDropdownComponent } from '@ng-nest/ui/dropdown'; -import { XLinkComponent } from '@ng-nest/ui/link'; -import { XButtonComponent } from '@ng-nest/ui/button'; -import { XDrawerComponent } from '@ng-nest/ui/drawer'; -import { XAffixComponent } from '@ng-nest/ui/affix'; -import { XI18nPipe } from '@ng-nest/ui/i18n'; -import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; -import { XSelectModule } from '@ng-nest/ui/select'; -import { XSliderModule } from '@ng-nest/ui/slider'; -import { XAutoCompleteComponent } from '@ng-nest/ui/auto-complete'; -import { FormsModule } from '@angular/forms'; -import { LayoutModule as CdkLayoutModule } from '@angular/cdk/layout'; -import { LayoutComponent } from './layout.component'; -import { LayoutRoutesModule } from './layout-routes.module'; -import { HeaderComponent } from './header/header.component'; -import { ContentComponent } from './content/content.component'; -import { FooterComponent } from './footer/footer.component'; -import { SiderComponent } from './sider/sider.component'; -import { LogoComponent } from './logo/logo.component'; -import { AffixComponent } from './affix/affix.component'; -import { NavComponent } from './nav/nav.component'; -import { SearchComponent } from './search/search.component'; - -const components = [ - LayoutComponent, - HeaderComponent, - LogoComponent, - NavComponent, - SearchComponent, - SiderComponent, - ContentComponent, - AffixComponent, - FooterComponent -]; - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - XIconComponent, - XMenuComponent, - XButtonComponent, - XDropdownComponent, - XSelectModule, - XDrawerComponent, - XAffixComponent, - XI18nPipe, - XLinkComponent, - XRowComponent, - XColComponent, - XSliderModule, - XAutoCompleteComponent, - CdkLayoutModule, - LayoutRoutesModule - ], - declarations: [...components], - exports: [...components] -}) -export class LayoutModule {} diff --git a/src/main/layout/layout.service.ts b/src/main/layout/layout.service.ts index 10515a881..810826ce1 100644 --- a/src/main/layout/layout.service.ts +++ b/src/main/layout/layout.service.ts @@ -5,10 +5,10 @@ import { Subject } from 'rxjs'; import { CdkScrollable } from '@angular/cdk/overlay'; import { Location } from '@angular/common'; import { Title } from '@angular/platform-browser'; -import { environment } from '../../environments/environment'; +import { environment } from '@environments'; import { ConfigService } from '@services'; -import { Menu } from '../../environments/routes'; -import { menus } from '../../environments/menus'; +import { Menu } from '@interfaces'; +import { menus } from '../../app/app.menus'; @Injectable({ providedIn: 'root' }) export class LayoutService { @@ -41,12 +41,7 @@ export class LayoutService { return route; } - constructor( - private router: Router, - private config: ConfigService, - private location: Location, - private title: Title - ) { + constructor(private router: Router, private config: ConfigService, private location: Location, private title: Title) { this.setMenusLang(); this.router.events.pipe(filter((x) => x instanceof NavigationEnd)).subscribe((x) => { const rt = x as NavigationEnd; diff --git a/src/main/layout/logo/logo.component.ts b/src/main/layout/logo/logo.component.ts index 9eec689c9..67307bb44 100644 --- a/src/main/layout/logo/logo.component.ts +++ b/src/main/layout/logo/logo.component.ts @@ -1,13 +1,9 @@ import { Component, ViewEncapsulation } from '@angular/core'; -import { ConfigService } from '@services'; -import { LayoutService } from '../layout.service'; @Component({ selector: 'ns-logo', + standalone: true, templateUrl: './logo.component.html', encapsulation: ViewEncapsulation.None }) -export class LogoComponent { - versions = []; - constructor(public layoutService: LayoutService, public config: ConfigService) {} -} +export class LogoComponent {} diff --git a/src/main/layout/nav/nav.component.ts b/src/main/layout/nav/nav.component.ts index 3743c9318..885e71ab0 100644 --- a/src/main/layout/nav/nav.component.ts +++ b/src/main/layout/nav/nav.component.ts @@ -1,14 +1,20 @@ import { ChangeDetectorRef, Component, ViewEncapsulation, inject } from '@angular/core'; -import { DOCUMENT, Location, PlatformLocation } from '@angular/common'; +import { CommonModule, DOCUMENT, Location, PlatformLocation } from '@angular/common'; import { ActivatedRoute, Router } from '@angular/router'; import { X_THEME_DARK_COLORS, X_THEME_COLORS, XConfigService } from '@ng-nest/ui/core'; import { ConfigService } from '@services/config.service'; -import { XSliderNode } from '@ng-nest/ui/slider'; -import { Menu } from '@environments'; +import { XSliderComponent, XSliderNode } from '@ng-nest/ui/slider'; +import { Menu } from '@interfaces'; import { LayoutService } from '../layout.service'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XSelectComponent } from '@ng-nest/ui/select'; +import { XI18nPipe } from '@ng-nest/ui/i18n'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'ns-nav', + standalone: true, + imports: [CommonModule, FormsModule, XSliderComponent, XButtonComponent, XSelectComponent, XI18nPipe], templateUrl: './nav.component.html', encapsulation: ViewEncapsulation.None }) diff --git a/src/main/layout/search/search.component.ts b/src/main/layout/search/search.component.ts index 2eb3475c5..481eb3191 100644 --- a/src/main/layout/search/search.component.ts +++ b/src/main/layout/search/search.component.ts @@ -5,11 +5,15 @@ import { XConfigService } from '@ng-nest/ui/core'; import { ConfigService } from '@services/config.service'; import { Observable } from 'rxjs'; import { LayoutService } from '../layout.service'; -import { Menu } from '@environments'; +import { Menu } from '@interfaces'; import { debounceTime } from 'rxjs/operators'; +import { XAutoCompleteComponent } from '@ng-nest/ui/auto-complete'; +import { XI18nPipe } from '@ng-nest/ui/i18n'; @Component({ selector: 'ns-search', + standalone: true, + imports: [XAutoCompleteComponent, XI18nPipe], templateUrl: './search.component.html', encapsulation: ViewEncapsulation.None }) diff --git a/src/main/layout/sider/sider.component.ts b/src/main/layout/sider/sider.component.ts index fc0ecf09d..9a8b0b835 100644 --- a/src/main/layout/sider/sider.component.ts +++ b/src/main/layout/sider/sider.component.ts @@ -1,11 +1,14 @@ import { Component, ViewEncapsulation } from '@angular/core'; import { LayoutService } from '../layout.service'; -import { Menu } from '@environments'; +import { Menu } from '@interfaces'; import { Router, ActivatedRoute } from '@angular/router'; import { ConfigService } from '@services'; +import { XMenuComponent } from '@ng-nest/ui/menu'; @Component({ selector: 'ns-sider', + standalone: true, + imports: [XMenuComponent], templateUrl: './sider.component.html', encapsulation: ViewEncapsulation.None }) diff --git a/src/main/news/news-routes.module.ts b/src/main/news/news-routes.module.ts index 35a6fae70..90889bf98 100644 --- a/src/main/news/news-routes.module.ts +++ b/src/main/news/news-routes.module.ts @@ -1,11 +1,4 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; +import { Routes } from '@angular/router'; import { NewsComponent } from './news.component'; -const routes: Routes = [{ path: '', component: NewsComponent }]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] -}) -export class NewsRoutesModule {} +export const NewsRoutes: Routes = [{ path: '', component: NewsComponent }]; diff --git a/src/main/news/news.component.scss b/src/main/news/news.component.scss deleted file mode 100644 index b3bef8f1b..000000000 --- a/src/main/news/news.component.scss +++ /dev/null @@ -1,6 +0,0 @@ -@import '../../styles/index.scss'; - -ns-news { - > .main { - } -} diff --git a/src/main/news/news.component.ts b/src/main/news/news.component.ts index 83ba17ed6..c5a8d3481 100644 --- a/src/main/news/news.component.ts +++ b/src/main/news/news.component.ts @@ -1,14 +1,11 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; -import { Router } from '@angular/router'; +import { Component, ViewEncapsulation } from '@angular/core'; +import { DevelopingComponent } from '@share/developing/developing.component'; @Component({ selector: 'ns-news', + standalone: true, + imports: [DevelopingComponent], templateUrl: './news.component.html', - styleUrls: ['./news.component.scss'], encapsulation: ViewEncapsulation.None }) -export class NewsComponent implements OnInit { - constructor(public router: Router) {} - - ngOnInit() {} -} +export class NewsComponent {} diff --git a/src/main/news/news.module.ts b/src/main/news/news.module.ts deleted file mode 100644 index 22e609022..000000000 --- a/src/main/news/news.module.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { NewsComponent } from './news.component'; -import { NewsRoutesModule } from './news-routes.module'; -import { DevelopingComponent } from '../../share/developing/developing.component'; - -@NgModule({ - imports: [CommonModule, NewsRoutesModule], - declarations: [NewsComponent, DevelopingComponent], - exports: [NewsComponent, DevelopingComponent] -}) -export class NewsModule {} diff --git a/src/main/no-auth/no-auth-routes.module.ts b/src/main/no-auth/no-auth-routes.module.ts index 3b539a419..d8804c00c 100644 --- a/src/main/no-auth/no-auth-routes.module.ts +++ b/src/main/no-auth/no-auth-routes.module.ts @@ -1,11 +1,6 @@ -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; +import { Routes } from '@angular/router'; import { NoAuthComponent } from './no-auth.component'; -const routes: Routes = [{ path: '', component: NoAuthComponent }]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule] -}) -export class NoAuthRoutesModule {} +export const NoAuthRoutes: Routes = [ + { path: '', component: NoAuthComponent } +]; diff --git a/src/main/no-auth/no-auth.component.ts b/src/main/no-auth/no-auth.component.ts index 5434a9b2a..fc9a1bb78 100644 --- a/src/main/no-auth/no-auth.component.ts +++ b/src/main/no-auth/no-auth.component.ts @@ -1,13 +1,9 @@ -import { Component, OnInit, ViewEncapsulation } from '@angular/core'; -import { Router } from '@angular/router'; +import { Component, ViewEncapsulation } from '@angular/core'; @Component({ selector: 'no-auth', + standalone: true, template: ``, encapsulation: ViewEncapsulation.None }) -export class NoAuthComponent implements OnInit { - constructor(public router: Router) {} - - ngOnInit() {} -} +export class NoAuthComponent {} diff --git a/src/main/no-auth/no-auth.module.ts b/src/main/no-auth/no-auth.module.ts deleted file mode 100644 index b482ed907..000000000 --- a/src/main/no-auth/no-auth.module.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { NgModule } from '@angular/core'; -import { NoAuthComponent } from './no-auth.component'; -import { NoAuthRoutesModule } from './no-auth-routes.module'; - -@NgModule({ - imports: [NoAuthRoutesModule], - declarations: [NoAuthComponent], - exports: [NoAuthComponent] -}) -export class NoAuthModule {} diff --git a/src/main/routes.module.ts b/src/main/routes.module.ts deleted file mode 100644 index f6e171777..000000000 --- a/src/main/routes.module.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import { mainRoutes, testRoutes } from '../environments/routes'; -import { XPreloadingStrategyService } from '@ng-nest/ui/core'; -import { environment } from '../environments/environment'; - -@NgModule({ - imports: [ - RouterModule.forRoot(environment.production ? mainRoutes : testRoutes, { - enableTracing: false, - anchorScrolling: 'enabled', - scrollPositionRestoration: 'top', - preloadingStrategy: XPreloadingStrategyService, - initialNavigation: 'enabledBlocking' - }) - ], - exports: [RouterModule], - providers: [ - XPreloadingStrategyService - // { provide: RouteReuseStrategy, useClass: XReuseStrategyService } - ] -}) -export class MainRoutesModule {} diff --git a/src/main/test/message-box/message-box.component.html b/src/main/test/message-box/message-box.component.html new file mode 100644 index 000000000..77453965b --- /dev/null +++ b/src/main/test/message-box/message-box.component.html @@ -0,0 +1,4 @@ + + + + diff --git a/src/main/test/message-box/message-box.component.ts b/src/main/test/message-box/message-box.component.ts new file mode 100644 index 000000000..145af7bf4 --- /dev/null +++ b/src/main/test/message-box/message-box.component.ts @@ -0,0 +1,15 @@ +import { Component } from '@angular/core'; +import { + ExDefaultComponent, + ExConfirmComponent, + ExCustomComponent, + ExPromptComponent +} from '@ng-nest/ui/message-box/examples'; + +@Component({ + selector: 'te-message-box', + standalone: true, + imports: [ExDefaultComponent, ExConfirmComponent, ExCustomComponent, ExPromptComponent], + templateUrl: './message-box.component.html' +}) +export class TeMessageBoxComponent {} diff --git a/src/main/test/notification/notification.component.html b/src/main/test/notification/notification.component.html new file mode 100644 index 000000000..fa52a5804 --- /dev/null +++ b/src/main/test/notification/notification.component.html @@ -0,0 +1,2 @@ + + diff --git a/src/main/test/notification/notification.component.ts b/src/main/test/notification/notification.component.ts new file mode 100644 index 000000000..12375d823 --- /dev/null +++ b/src/main/test/notification/notification.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; +import { ExDefaultComponent, ExTypeComponent } from '@ng-nest/ui/notification/examples'; + +@Component({ + selector: 'te-notification', + standalone: true, + imports: [ExDefaultComponent, ExTypeComponent], + templateUrl: './notification.component.html' +}) +export class TeNotificationComponent {} diff --git a/src/main/test/outlet/outlet.component.html b/src/main/test/outlet/outlet.component.html new file mode 100644 index 000000000..6f99fc062 --- /dev/null +++ b/src/main/test/outlet/outlet.component.html @@ -0,0 +1 @@ + diff --git a/src/main/test/outlet/outlet.component.ts b/src/main/test/outlet/outlet.component.ts new file mode 100644 index 000000000..ce8282a3a --- /dev/null +++ b/src/main/test/outlet/outlet.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; +import { ExDefaultComponent } from '@ng-nest/ui/outlet/examples'; + +@Component({ + selector: 'te-outlet', + standalone: true, + imports: [ExDefaultComponent], + templateUrl: './outlet.component.html' +}) +export class TeOutletComponent {} diff --git a/src/main/test/page-header/page-header.component.html b/src/main/test/page-header/page-header.component.html new file mode 100644 index 000000000..6f99fc062 --- /dev/null +++ b/src/main/test/page-header/page-header.component.html @@ -0,0 +1 @@ + diff --git a/src/main/test/page-header/page-header.component.ts b/src/main/test/page-header/page-header.component.ts new file mode 100644 index 000000000..8f5ae8311 --- /dev/null +++ b/src/main/test/page-header/page-header.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; +import { ExDefaultComponent } from '@ng-nest/ui/page-header/examples'; + +@Component({ + selector: 'te-page-header', + standalone: true, + imports: [ExDefaultComponent], + templateUrl: './page-header.component.html' +}) +export class TePageHeaderComponent {} diff --git a/src/main/test/pagination/pagination.component.html b/src/main/test/pagination/pagination.component.html new file mode 100644 index 000000000..6ba800a84 --- /dev/null +++ b/src/main/test/pagination/pagination.component.html @@ -0,0 +1,2 @@ + + diff --git a/src/main/test/pagination/pagination.component.ts b/src/main/test/pagination/pagination.component.ts new file mode 100644 index 000000000..a14d40742 --- /dev/null +++ b/src/main/test/pagination/pagination.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; +import { ExDefaultComponent, ExStyleComponent } from '@ng-nest/ui/pagination/examples'; + +@Component({ + selector: 'te-pagination', + standalone: true, + imports: [ExDefaultComponent, ExStyleComponent], + templateUrl: './pagination.component.html' +}) +export class TePaginationComponent {} diff --git a/src/main/test/popconfirm/popconfirm.component.html b/src/main/test/popconfirm/popconfirm.component.html new file mode 100644 index 000000000..177909d0d --- /dev/null +++ b/src/main/test/popconfirm/popconfirm.component.html @@ -0,0 +1,3 @@ + + + diff --git a/src/main/test/popconfirm/popconfirm.component.ts b/src/main/test/popconfirm/popconfirm.component.ts new file mode 100644 index 000000000..dad3359a9 --- /dev/null +++ b/src/main/test/popconfirm/popconfirm.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; +import { ExAsyncCloseComponent, ExConditionComponent, ExDefaultComponent } from '@ng-nest/ui/popconfirm/examples'; + +@Component({ + selector: 'te-popconfirm', + standalone: true, + imports: [ExAsyncCloseComponent, ExConditionComponent, ExDefaultComponent], + templateUrl: './popconfirm.component.html' +}) +export class TePopconfirmComponent {} diff --git a/src/main/test/popover/popover.component.html b/src/main/test/popover/popover.component.html new file mode 100644 index 000000000..6f99fc062 --- /dev/null +++ b/src/main/test/popover/popover.component.html @@ -0,0 +1 @@ + diff --git a/src/main/test/popover/popover.component.ts b/src/main/test/popover/popover.component.ts new file mode 100644 index 000000000..2c1db9f31 --- /dev/null +++ b/src/main/test/popover/popover.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; +import { ExDefaultComponent } from '@ng-nest/ui/popover/examples'; + +@Component({ + selector: 'te-popover', + standalone: true, + imports: [ExDefaultComponent], + templateUrl: './popover.component.html' +}) +export class TePopoverComponent {} diff --git a/src/main/test/progress/progress.component.html b/src/main/test/progress/progress.component.html new file mode 100644 index 000000000..904808259 --- /dev/null +++ b/src/main/test/progress/progress.component.html @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/main/test/progress/progress.component.ts b/src/main/test/progress/progress.component.ts new file mode 100644 index 000000000..a2c42179b --- /dev/null +++ b/src/main/test/progress/progress.component.ts @@ -0,0 +1,30 @@ +import { Component } from '@angular/core'; +import { + ExDefaultComponent, + ExCircleComponent, + ExColorComponent, + ExDashboardComponent, + ExSubsectionComponent, + ExFormatComponent, + ExGradientComponent, + ExInsideComponent, + ExStepsComponent +} from '@ng-nest/ui/progress/examples'; + +@Component({ + selector: 'te-progress', + standalone: true, + imports: [ + ExDefaultComponent, + ExCircleComponent, + ExColorComponent, + ExDashboardComponent, + ExSubsectionComponent, + ExFormatComponent, + ExGradientComponent, + ExInsideComponent, + ExStepsComponent + ], + templateUrl: './progress.component.html' +}) +export class TeProgressComponent {} diff --git a/src/main/test/radio/radio.component.html b/src/main/test/radio/radio.component.html new file mode 100644 index 000000000..e8eeb08d2 --- /dev/null +++ b/src/main/test/radio/radio.component.html @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/main/test/radio/radio.component.ts b/src/main/test/radio/radio.component.ts new file mode 100644 index 000000000..4550112a8 --- /dev/null +++ b/src/main/test/radio/radio.component.ts @@ -0,0 +1,26 @@ +import { Component } from '@angular/core'; +import { + ExDefaultComponent, + ExIconComponent, + ExAsyncComponent, + ExButtonComponent, + ExDisabledComponent, + ExPerpostComponent, + ExTagComponent +} from '@ng-nest/ui/radio/examples'; + +@Component({ + selector: 'te-radio', + standalone: true, + imports: [ + ExDefaultComponent, + ExIconComponent, + ExAsyncComponent, + ExButtonComponent, + ExDisabledComponent, + ExPerpostComponent, + ExTagComponent + ], + templateUrl: './radio.component.html' +}) +export class TeRadioComponent {} diff --git a/src/main/test/rate/rate.component.html b/src/main/test/rate/rate.component.html new file mode 100644 index 000000000..b599b75bf --- /dev/null +++ b/src/main/test/rate/rate.component.html @@ -0,0 +1,5 @@ + + + + + diff --git a/src/main/test/rate/rate.component.ts b/src/main/test/rate/rate.component.ts new file mode 100644 index 000000000..ce3a81240 --- /dev/null +++ b/src/main/test/rate/rate.component.ts @@ -0,0 +1,16 @@ +import { Component } from '@angular/core'; +import { + ExDefaultComponent, + ExColorComponent, + ExCustomComponent, + ExDisabledComponent, + ExHalfComponent +} from '@ng-nest/ui/rate/examples'; + +@Component({ + selector: 'te-rate', + standalone: true, + imports: [ExDefaultComponent, ExColorComponent, ExCustomComponent, ExDisabledComponent, ExHalfComponent], + templateUrl: './rate.component.html' +}) +export class TeRateComponent {} diff --git a/src/main/test/result/result.component.html b/src/main/test/result/result.component.html new file mode 100644 index 000000000..59bba00c3 --- /dev/null +++ b/src/main/test/result/result.component.html @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/main/test/result/result.component.ts b/src/main/test/result/result.component.ts new file mode 100644 index 000000000..209e5c618 --- /dev/null +++ b/src/main/test/result/result.component.ts @@ -0,0 +1,30 @@ +import { Component } from '@angular/core'; +import { + ExErrorComponent, + ExIconComponent, + ExImgComponent, + ExInfoComponent, + ExResult403Component, + ExResult404Component, + ExResult500Component, + ExSuccessComponent, + ExWarningComponent +} from '@ng-nest/ui/result/examples'; + +@Component({ + selector: 'te-result', + standalone: true, + imports: [ + ExErrorComponent, + ExIconComponent, + ExImgComponent, + ExInfoComponent, + ExResult403Component, + ExResult404Component, + ExResult500Component, + ExSuccessComponent, + ExWarningComponent + ], + templateUrl: './result.component.html' +}) +export class TeResultComponent {} diff --git a/src/main/test/select/select.component.html b/src/main/test/select/select.component.html new file mode 100644 index 000000000..4987ed160 --- /dev/null +++ b/src/main/test/select/select.component.html @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/main/test/select/select.component.ts b/src/main/test/select/select.component.ts new file mode 100644 index 000000000..e9386c81e --- /dev/null +++ b/src/main/test/select/select.component.ts @@ -0,0 +1,32 @@ +import { Component } from '@angular/core'; +import { + ExDefaultComponent, + ExAsyncComponent, + ExBorderedComponent, + ExCustomComponent, + ExDisabledComponent, + ExLabelComponent, + ExMultipleComponent, + ExRequiredComponent, + ExSearchComponent, + ExSizeComponent +} from '@ng-nest/ui/select/examples'; + +@Component({ + selector: 'te-select', + standalone: true, + imports: [ + ExDefaultComponent, + ExAsyncComponent, + ExBorderedComponent, + ExCustomComponent, + ExDisabledComponent, + ExLabelComponent, + ExMultipleComponent, + ExRequiredComponent, + ExSearchComponent, + ExSizeComponent + ], + templateUrl: './select.component.html' +}) +export class TeSelectComponent {} diff --git a/src/main/test/skeleton/skeleton.component.html b/src/main/test/skeleton/skeleton.component.html new file mode 100644 index 000000000..a31a84e53 --- /dev/null +++ b/src/main/test/skeleton/skeleton.component.html @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/main/test/skeleton/skeleton.component.ts b/src/main/test/skeleton/skeleton.component.ts new file mode 100644 index 000000000..314c14fd5 --- /dev/null +++ b/src/main/test/skeleton/skeleton.component.ts @@ -0,0 +1,24 @@ +import { Component } from '@angular/core'; +import { + ExDefaultComponent, + ExActiveComponent, + ExComplexComponent, + ExListComponent, + ExLoadingComponent, + ExTableComponent +} from '@ng-nest/ui/skeleton/examples'; + +@Component({ + selector: 'te-skeleton', + standalone: true, + imports: [ + ExDefaultComponent, + ExActiveComponent, + ExComplexComponent, + ExListComponent, + ExLoadingComponent, + ExTableComponent + ], + templateUrl: './skeleton.component.html' +}) +export class TeSkeletonComponent {} diff --git a/src/main/test/slider-select/slider-select.component.html b/src/main/test/slider-select/slider-select.component.html new file mode 100644 index 000000000..b0d89f150 --- /dev/null +++ b/src/main/test/slider-select/slider-select.component.html @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/main/test/slider-select/slider-select.component.ts b/src/main/test/slider-select/slider-select.component.ts new file mode 100644 index 000000000..21cbee700 --- /dev/null +++ b/src/main/test/slider-select/slider-select.component.ts @@ -0,0 +1,34 @@ +import { Component } from '@angular/core'; +import { + ExDefaultComponent, + ExCustomValueComponent, + ExDisabledComponent, + ExIconComponent, + ExLabelComponent, + ExLimitComponent, + ExMarksComponent, + ExPrecisionComponent, + ExRangeComponent, + ExReverseComponent, + ExVerticalComponent +} from '@ng-nest/ui/slider-select/examples'; + +@Component({ + selector: 'te-slider-select', + standalone: true, + imports: [ + ExDefaultComponent, + ExCustomValueComponent, + ExDisabledComponent, + ExIconComponent, + ExLabelComponent, + ExLimitComponent, + ExMarksComponent, + ExPrecisionComponent, + ExRangeComponent, + ExReverseComponent, + ExVerticalComponent + ], + templateUrl: './slider-select.component.html' +}) +export class TeSliderSelectComponent {} diff --git a/src/main/test/slider/slider.component.html b/src/main/test/slider/slider.component.html new file mode 100644 index 000000000..23601c673 --- /dev/null +++ b/src/main/test/slider/slider.component.html @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/main/test/slider/slider.component.ts b/src/main/test/slider/slider.component.ts new file mode 100644 index 000000000..2b277d78f --- /dev/null +++ b/src/main/test/slider/slider.component.ts @@ -0,0 +1,24 @@ +import { Component } from '@angular/core'; +import { + ExDefaultComponent, + ExActivatedComponent, + ExCustomComponent, + ExExpandComponent, + ExScrollComponent, + ExSizeComponent +} from '@ng-nest/ui/slider/examples'; + +@Component({ + selector: 'te-slider', + standalone: true, + imports: [ + ExDefaultComponent, + ExActivatedComponent, + ExCustomComponent, + ExExpandComponent, + ExScrollComponent, + ExSizeComponent + ], + templateUrl: './slider.component.html' +}) +export class TeSliderComponent {} diff --git a/src/main/test/statistic/statistic.component.html b/src/main/test/statistic/statistic.component.html new file mode 100644 index 000000000..9a35dd066 --- /dev/null +++ b/src/main/test/statistic/statistic.component.html @@ -0,0 +1,3 @@ + + + diff --git a/src/main/test/statistic/statistic.component.ts b/src/main/test/statistic/statistic.component.ts new file mode 100644 index 000000000..24eba8808 --- /dev/null +++ b/src/main/test/statistic/statistic.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; +import { ExDefaultComponent, ExDownComponent, ExPrefixComponent } from '@ng-nest/ui/statistic/examples'; + +@Component({ + selector: 'te-statistic', + standalone: true, + imports: [ExDefaultComponent, ExDownComponent, ExPrefixComponent], + templateUrl: './statistic.component.html' +}) +export class TeStatisticComponent {} diff --git a/src/main/test/steps/steps.component.html b/src/main/test/steps/steps.component.html new file mode 100644 index 000000000..9d0f5ee5b --- /dev/null +++ b/src/main/test/steps/steps.component.html @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/main/test/steps/steps.component.ts b/src/main/test/steps/steps.component.ts new file mode 100644 index 000000000..09b6cef28 --- /dev/null +++ b/src/main/test/steps/steps.component.ts @@ -0,0 +1,30 @@ +import { Component } from '@angular/core'; +import { + ExDefaultComponent, + ExCustomComponent, + ExDescriptionComponent, + ExIconComponent, + ExIndexComponent, + ExLayoutComponent, + ExNodeStatusComponent, + ExStatusComponent, + ExTabsComponent +} from '@ng-nest/ui/steps/examples'; + +@Component({ + selector: 'te-steps', + standalone: true, + imports: [ + ExDefaultComponent, + ExCustomComponent, + ExDescriptionComponent, + ExIconComponent, + ExIndexComponent, + ExLayoutComponent, + ExNodeStatusComponent, + ExStatusComponent, + ExTabsComponent + ], + templateUrl: './steps.component.html' +}) +export class TeStepsComponent {} diff --git a/src/main/test/switch/switch.component.html b/src/main/test/switch/switch.component.html new file mode 100644 index 000000000..2d9460c31 --- /dev/null +++ b/src/main/test/switch/switch.component.html @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/main/test/switch/switch.component.ts b/src/main/test/switch/switch.component.ts new file mode 100644 index 000000000..d83c7f165 --- /dev/null +++ b/src/main/test/switch/switch.component.ts @@ -0,0 +1,24 @@ +import { Component } from '@angular/core'; +import { + ExDefaultComponent, + ExLoadingComponent, + ExDisabledComponent, + ExLabelComponent, + ExSizeComponent, + ExTextComponent +} from '@ng-nest/ui/switch/examples'; + +@Component({ + selector: 'te-switch', + standalone: true, + imports: [ + ExDefaultComponent, + ExLoadingComponent, + ExDisabledComponent, + ExLabelComponent, + ExSizeComponent, + ExTextComponent + ], + templateUrl: './switch.component.html' +}) +export class TeSwitchComponent {} diff --git a/src/main/test/table/table.component.html b/src/main/test/table/table.component.html new file mode 100644 index 000000000..146de0fb8 --- /dev/null +++ b/src/main/test/table/table.component.html @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/src/main/test/table/table.component.ts b/src/main/test/table/table.component.ts new file mode 100644 index 000000000..f1dc21177 --- /dev/null +++ b/src/main/test/table/table.component.ts @@ -0,0 +1,46 @@ +import { Component } from '@angular/core'; +import { + ExDefaultComponent, + ExAdaptionComponent, + ExBorderedComponent, + ExCheckboxComponent, + ExConfigComponent, + ExCustomComponent, + ExDragColumnComponent, + ExDragWidthComponent, + ExEditComponent, + ExExpandComponent, + ExFixComponent, + ExHeadComponent, + ExHeaderComponent, + ExRowSizeComponent, + ExRowclassComponent, + ExScrollComponent, + ExSearchComponent +} from '@ng-nest/ui/table/examples'; + +@Component({ + selector: 'te-table', + standalone: true, + imports: [ + ExDefaultComponent, + ExAdaptionComponent, + ExBorderedComponent, + ExCheckboxComponent, + ExConfigComponent, + ExCustomComponent, + ExDragColumnComponent, + ExDragWidthComponent, + ExEditComponent, + ExExpandComponent, + ExFixComponent, + ExHeadComponent, + ExHeaderComponent, + ExRowSizeComponent, + ExRowclassComponent, + ExScrollComponent, + ExSearchComponent + ], + templateUrl: './table.component.html' +}) +export class TeTableComponent {} diff --git a/src/main/test/tabs/tabs.component.html b/src/main/test/tabs/tabs.component.html new file mode 100644 index 000000000..78d77211a --- /dev/null +++ b/src/main/test/tabs/tabs.component.html @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/main/test/tabs/tabs.component.ts b/src/main/test/tabs/tabs.component.ts new file mode 100644 index 000000000..bdce79b33 --- /dev/null +++ b/src/main/test/tabs/tabs.component.ts @@ -0,0 +1,28 @@ +import { Component } from '@angular/core'; +import { + ExDefaultComponent, + ExActionComponent, + ExCardComponent, + ExCustomComponent, + ExExpandComponent, + ExLayoutComponent, + ExRouterComponent, + ExTagComponent +} from '@ng-nest/ui/tabs/examples'; + +@Component({ + selector: 'te-tabs', + standalone: true, + imports: [ + ExDefaultComponent, + ExActionComponent, + ExCardComponent, + ExCustomComponent, + ExExpandComponent, + ExLayoutComponent, + ExRouterComponent, + ExTagComponent + ], + templateUrl: './tabs.component.html' +}) +export class TeTabsComponent {} diff --git a/src/main/test/tag/tag.component.html b/src/main/test/tag/tag.component.html new file mode 100644 index 000000000..097d50c03 --- /dev/null +++ b/src/main/test/tag/tag.component.html @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/main/test/tag/tag.component.ts b/src/main/test/tag/tag.component.ts new file mode 100644 index 000000000..88f33cfe1 --- /dev/null +++ b/src/main/test/tag/tag.component.ts @@ -0,0 +1,24 @@ +import { Component } from '@angular/core'; +import { + ExDefaultComponent, + ExBorderedComponent, + ExCheckedComponent, + ExCloseComponent, + ExColorComponent, + ExSizeComponent +} from '@ng-nest/ui/tag/examples'; + +@Component({ + selector: 'te-tag', + standalone: true, + imports: [ + ExDefaultComponent, + ExBorderedComponent, + ExCheckedComponent, + ExCloseComponent, + ExColorComponent, + ExSizeComponent + ], + templateUrl: './tag.component.html' +}) +export class TeTagComponent {} diff --git a/src/main/test/test-routes.modules.ts b/src/main/test/test-routes.module.ts similarity index 52% rename from src/main/test/test-routes.modules.ts rename to src/main/test/test-routes.module.ts index 1b3f3a71b..34aa39f9f 100644 --- a/src/main/test/test-routes.modules.ts +++ b/src/main/test/test-routes.module.ts @@ -151,6 +151,142 @@ export const TestRoutes: Routes = [ { path: 'message', loadComponent: () => import('./message/message.component').then((x) => x.TeMessageComponent) + }, + { + path: 'message-box', + loadComponent: () => import('./message-box/message-box.component').then((x) => x.TeMessageBoxComponent) + }, + { + path: 'notification', + loadComponent: () => import('./notification/notification.component').then((x) => x.TeNotificationComponent) + }, + { + path: 'outlet', + loadComponent: () => import('./outlet/outlet.component').then((x) => x.TeOutletComponent) + }, + { + path: 'page-header', + loadComponent: () => import('./page-header/page-header.component').then((x) => x.TePageHeaderComponent) + }, + { + path: 'pagination', + loadComponent: () => import('./pagination/pagination.component').then((x) => x.TePaginationComponent) + }, + { + path: 'popconfirm', + loadComponent: () => import('./popconfirm/popconfirm.component').then((x) => x.TePopconfirmComponent) + }, + { + path: 'popover', + loadComponent: () => import('./popover/popover.component').then((x) => x.TePopoverComponent) + }, + { + path: 'progress', + loadComponent: () => import('./progress/progress.component').then((x) => x.TeProgressComponent) + }, + { + path: 'radio', + loadComponent: () => import('./radio/radio.component').then((x) => x.TeRadioComponent) + }, + { + path: 'rate', + loadComponent: () => import('./rate/rate.component').then((x) => x.TeRateComponent) + }, + { + path: 'result', + loadComponent: () => import('./result/result.component').then((x) => x.TeResultComponent) + }, + { + path: 'select', + loadComponent: () => import('./select/select.component').then((x) => x.TeSelectComponent) + }, + { + path: 'skeleton', + loadComponent: () => import('./skeleton/skeleton.component').then((x) => x.TeSkeletonComponent) + }, + { + path: 'slider', + loadComponent: () => import('./slider/slider.component').then((x) => x.TeSliderComponent) + }, + { + path: 'slider-select', + loadComponent: () => import('./slider-select/slider-select.component').then((x) => x.TeSliderSelectComponent) + }, + { + path: 'statistic', + loadComponent: () => import('./statistic/statistic.component').then((x) => x.TeStatisticComponent) + }, + { + path: 'steps', + loadComponent: () => import('./steps/steps.component').then((x) => x.TeStepsComponent) + }, + { + path: 'table', + loadComponent: () => import('./table/table.component').then((x) => x.TeTableComponent) + }, + { + path: 'tabs', + loadComponent: () => import('./tabs/tabs.component').then((x) => x.TeTabsComponent) + }, + { + path: 'tag', + loadComponent: () => import('./tag/tag.component').then((x) => x.TeTagComponent) + }, + { + path: 'text-retract', + loadComponent: () => import('./text-retract/text-retract.component').then((x) => x.TeTextRetractComponent) + }, + { + path: 'textarea', + loadComponent: () => import('./textarea/textarea.component').then((x) => x.TeTextareaComponent) + }, + { + path: 'theme', + loadComponent: () => import('./theme/theme.component').then((x) => x.TeThemeComponent) + }, + { + path: 'time-ago', + loadComponent: () => import('./time-ago/time-ago.component').then((x) => x.TeTimeAgoComponent) + }, + { + path: 'time-picker', + loadComponent: () => import('./time-picker/time-picker.component').then((x) => x.TeTimePickerComponent) + }, + { + path: 'time-range', + loadComponent: () => import('./time-range/time-range.component').then((x) => x.TeTimeRangeComponent) + }, + { + path: 'timeline', + loadComponent: () => import('./timeline/timeline.component').then((x) => x.TeTimelineComponent) + }, + { + path: 'tooltip', + loadComponent: () => import('./tooltip/tooltip.component').then((x) => x.TeTooltipComponent) + }, + { + path: 'transfer', + loadComponent: () => import('./transfer/transfer.component').then((x) => x.TeTransferComponent) + }, + { + path: 'tree', + loadComponent: () => import('./tree/tree.component').then((x) => x.TeTreeComponent) + }, + { + path: 'tree-file', + loadComponent: () => import('./tree-file/tree-file.component').then((x) => x.TeTreeFileComponent) + }, + { + path: 'tree-select', + loadComponent: () => import('./tree-select/tree-select.component').then((x) => x.TeTreeSelectComponent) + }, + { + path: 'typography', + loadComponent: () => import('./typography/typography.component').then((x) => x.TeTypographyComponent) + }, + { + path: 'upload', + loadComponent: () => import('./upload/upload.component').then((x) => x.TeUploadComponent) } ] } diff --git a/src/main/test/text-retract/text-retract.component.html b/src/main/test/text-retract/text-retract.component.html new file mode 100644 index 000000000..6f99fc062 --- /dev/null +++ b/src/main/test/text-retract/text-retract.component.html @@ -0,0 +1 @@ + diff --git a/src/main/test/text-retract/text-retract.component.ts b/src/main/test/text-retract/text-retract.component.ts new file mode 100644 index 000000000..020ecf41d --- /dev/null +++ b/src/main/test/text-retract/text-retract.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; +import { ExDefaultComponent } from '@ng-nest/ui/text-retract/examples'; + +@Component({ + selector: 'te-text-retract', + standalone: true, + imports: [ExDefaultComponent], + templateUrl: './text-retract.component.html' +}) +export class TeTextRetractComponent {} diff --git a/src/main/test/textarea/textarea.component.html b/src/main/test/textarea/textarea.component.html new file mode 100644 index 000000000..be9929a3a --- /dev/null +++ b/src/main/test/textarea/textarea.component.html @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/main/test/textarea/textarea.component.ts b/src/main/test/textarea/textarea.component.ts new file mode 100644 index 000000000..1ee831764 --- /dev/null +++ b/src/main/test/textarea/textarea.component.ts @@ -0,0 +1,26 @@ +import { Component } from '@angular/core'; +import { + ExDefaultComponent, + ExClearComponent, + ExDisabledComponent, + ExIconComponent, + ExLabelComponent, + ExLengthComponent, + ExRequiredComponent +} from '@ng-nest/ui/textarea/examples'; + +@Component({ + selector: 'te-textarea', + standalone: true, + imports: [ + ExDefaultComponent, + ExClearComponent, + ExDisabledComponent, + ExIconComponent, + ExLabelComponent, + ExLengthComponent, + ExRequiredComponent + ], + templateUrl: './textarea.component.html' +}) +export class TeTextareaComponent {} diff --git a/src/main/test/theme/theme.component.html b/src/main/test/theme/theme.component.html new file mode 100644 index 000000000..6f99fc062 --- /dev/null +++ b/src/main/test/theme/theme.component.html @@ -0,0 +1 @@ + diff --git a/src/main/test/theme/theme.component.ts b/src/main/test/theme/theme.component.ts new file mode 100644 index 000000000..4b8ad32fe --- /dev/null +++ b/src/main/test/theme/theme.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; +import { ExDefaultComponent } from '@ng-nest/ui/theme/examples'; + +@Component({ + selector: 'te-theme', + standalone: true, + imports: [ExDefaultComponent], + templateUrl: './theme.component.html' +}) +export class TeThemeComponent {} diff --git a/src/main/test/time-ago/time-ago.component.html b/src/main/test/time-ago/time-ago.component.html new file mode 100644 index 000000000..6f99fc062 --- /dev/null +++ b/src/main/test/time-ago/time-ago.component.html @@ -0,0 +1 @@ + diff --git a/src/main/test/time-ago/time-ago.component.ts b/src/main/test/time-ago/time-ago.component.ts new file mode 100644 index 000000000..639a90664 --- /dev/null +++ b/src/main/test/time-ago/time-ago.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; +import { ExDefaultComponent } from '@ng-nest/ui/time-ago/examples'; + +@Component({ + selector: 'te-time-ago', + standalone: true, + imports: [ExDefaultComponent], + templateUrl: './time-ago.component.html' +}) +export class TeTimeAgoComponent {} diff --git a/src/main/test/time-picker/time-picker.component.html b/src/main/test/time-picker/time-picker.component.html new file mode 100644 index 000000000..d03f09576 --- /dev/null +++ b/src/main/test/time-picker/time-picker.component.html @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/main/test/time-picker/time-picker.component.ts b/src/main/test/time-picker/time-picker.component.ts new file mode 100644 index 000000000..0ef13c7e6 --- /dev/null +++ b/src/main/test/time-picker/time-picker.component.ts @@ -0,0 +1,32 @@ +import { Component } from '@angular/core'; +import { + ExDefaultComponent, + ExBorderedComponent, + ExDisabledComponent, + ExHourMinuteComponent, + ExLabelComponent, + ExPresetComponent, + ExRequiredComponent, + ExSizeComponent, + ExStepComponent, + ExUse12hoursComponent +} from '@ng-nest/ui/time-picker/examples'; + +@Component({ + selector: 'te-time-picker', + standalone: true, + imports: [ + ExDefaultComponent, + ExBorderedComponent, + ExDisabledComponent, + ExHourMinuteComponent, + ExLabelComponent, + ExPresetComponent, + ExRequiredComponent, + ExSizeComponent, + ExStepComponent, + ExUse12hoursComponent + ], + templateUrl: './time-picker.component.html' +}) +export class TeTimePickerComponent {} diff --git a/src/main/test/time-range/time-range.component.html b/src/main/test/time-range/time-range.component.html new file mode 100644 index 000000000..6f99fc062 --- /dev/null +++ b/src/main/test/time-range/time-range.component.html @@ -0,0 +1 @@ + diff --git a/src/main/test/time-range/time-range.component.ts b/src/main/test/time-range/time-range.component.ts new file mode 100644 index 000000000..2db5abcec --- /dev/null +++ b/src/main/test/time-range/time-range.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; +import { ExDefaultComponent } from '@ng-nest/ui/time-range/examples'; + +@Component({ + selector: 'te-time-range', + standalone: true, + imports: [ExDefaultComponent], + templateUrl: './time-range.component.html' +}) +export class TeTimeRangeComponent {} diff --git a/src/main/test/timeline/timeline.component.html b/src/main/test/timeline/timeline.component.html new file mode 100644 index 000000000..9b789aefe --- /dev/null +++ b/src/main/test/timeline/timeline.component.html @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/main/test/timeline/timeline.component.ts b/src/main/test/timeline/timeline.component.ts new file mode 100644 index 000000000..07df429e7 --- /dev/null +++ b/src/main/test/timeline/timeline.component.ts @@ -0,0 +1,28 @@ +import { Component } from '@angular/core'; +import { + ExDefaultComponent, + ExColorComponent, + ExCustomComponent, + ExLoadingComponent, + ExIconComponent, + ExModeComponent, + ExSizeComponent, + ExTypeComponent +} from '@ng-nest/ui/timeline/examples'; + +@Component({ + selector: 'te-timeline', + standalone: true, + imports: [ + ExDefaultComponent, + ExColorComponent, + ExCustomComponent, + ExLoadingComponent, + ExIconComponent, + ExModeComponent, + ExSizeComponent, + ExTypeComponent + ], + templateUrl: './timeline.component.html' +}) +export class TeTimelineComponent {} diff --git a/src/main/test/tooltip/tooltip.component.html b/src/main/test/tooltip/tooltip.component.html new file mode 100644 index 000000000..6f99fc062 --- /dev/null +++ b/src/main/test/tooltip/tooltip.component.html @@ -0,0 +1 @@ + diff --git a/src/main/test/tooltip/tooltip.component.ts b/src/main/test/tooltip/tooltip.component.ts new file mode 100644 index 000000000..814ebc0be --- /dev/null +++ b/src/main/test/tooltip/tooltip.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; +import { ExDefaultComponent } from '@ng-nest/ui/tooltip/examples'; + +@Component({ + selector: 'te-tooltip', + standalone: true, + imports: [ExDefaultComponent], + templateUrl: './tooltip.component.html' +}) +export class TeTooltipComponent {} diff --git a/src/main/test/transfer/transfer.component.html b/src/main/test/transfer/transfer.component.html new file mode 100644 index 000000000..9375b917a --- /dev/null +++ b/src/main/test/transfer/transfer.component.html @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/main/test/transfer/transfer.component.ts b/src/main/test/transfer/transfer.component.ts new file mode 100644 index 000000000..8e7d0bfe9 --- /dev/null +++ b/src/main/test/transfer/transfer.component.ts @@ -0,0 +1,28 @@ +import { Component } from '@angular/core'; +import { + ExDefaultComponent, + ExCustomComponent, + ExDragComponent, + ExFooterComponent, + ExInverseComponent, + ExSearchComponent, + ExTableComponent, + ExTreeComponent +} from '@ng-nest/ui/transfer/examples'; + +@Component({ + selector: 'te-transfer', + standalone: true, + imports: [ + ExDefaultComponent, + ExCustomComponent, + ExDragComponent, + ExFooterComponent, + ExInverseComponent, + ExSearchComponent, + ExTableComponent, + ExTreeComponent + ], + templateUrl: './transfer.component.html' +}) +export class TeTransferComponent {} diff --git a/src/main/test/tree-file/tree-file.component.html b/src/main/test/tree-file/tree-file.component.html new file mode 100644 index 000000000..86d2a294f --- /dev/null +++ b/src/main/test/tree-file/tree-file.component.html @@ -0,0 +1,2 @@ + + diff --git a/src/main/test/tree-file/tree-file.component.ts b/src/main/test/tree-file/tree-file.component.ts new file mode 100644 index 000000000..6ee210ffd --- /dev/null +++ b/src/main/test/tree-file/tree-file.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; +import { ExDefaultComponent, ExContentComponent } from '@ng-nest/ui/tree-file/examples'; + +@Component({ + selector: 'te-tree-file', + standalone: true, + imports: [ExDefaultComponent, ExContentComponent], + templateUrl: './tree-file.component.html' +}) +export class TeTreeFileComponent {} diff --git a/src/main/test/tree-select/tree-select.component.html b/src/main/test/tree-select/tree-select.component.html new file mode 100644 index 000000000..4138e2973 --- /dev/null +++ b/src/main/test/tree-select/tree-select.component.html @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/src/main/test/tree-select/tree-select.component.ts b/src/main/test/tree-select/tree-select.component.ts new file mode 100644 index 000000000..ba422c4eb --- /dev/null +++ b/src/main/test/tree-select/tree-select.component.ts @@ -0,0 +1,38 @@ +import { Component } from '@angular/core'; +import { + ExDefaultComponent, + ExAsyncComponent, + ExBorderedComponent, + ExCustomComponent, + ExDisabledComponent, + ExLabelComponent, + ExLeafComponent, + ExMultipleComponent, + ExPathComponent, + ExRequiredComponent, + ExScrollComponent, + ExSearchComponent, + ExSizeComponent +} from '@ng-nest/ui/tree-select/examples'; + +@Component({ + selector: 'te-tree-select', + standalone: true, + imports: [ + ExDefaultComponent, + ExAsyncComponent, + ExBorderedComponent, + ExCustomComponent, + ExDisabledComponent, + ExLabelComponent, + ExLeafComponent, + ExMultipleComponent, + ExPathComponent, + ExRequiredComponent, + ExScrollComponent, + ExSearchComponent, + ExSizeComponent + ], + templateUrl: './tree-select.component.html' +}) +export class TeTreeSelectComponent {} diff --git a/src/main/test/tree/tree.component.html b/src/main/test/tree/tree.component.html new file mode 100644 index 000000000..4816c66cd --- /dev/null +++ b/src/main/test/tree/tree.component.html @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/src/main/test/tree/tree.component.ts b/src/main/test/tree/tree.component.ts new file mode 100644 index 000000000..ca13998f3 --- /dev/null +++ b/src/main/test/tree/tree.component.ts @@ -0,0 +1,38 @@ +import { Component } from '@angular/core'; +import { + ExDefaultComponent, + ExActivatedComponent, + ExCheckboxComponent, + ExControlComponent, + ExCustomComponent, + ExDragComponent, + ExHeightComponent, + ExIconComponent, + ExLazyComponent, + ExLineComponent, + ExOpenComponent, + ExStatusComponent, + ExVirtualScrollComponent +} from '@ng-nest/ui/tree/examples'; + +@Component({ + selector: 'te-tree', + standalone: true, + imports: [ + ExDefaultComponent, + ExActivatedComponent, + ExCheckboxComponent, + ExControlComponent, + ExCustomComponent, + ExDragComponent, + ExHeightComponent, + ExIconComponent, + ExLazyComponent, + ExLineComponent, + ExOpenComponent, + ExStatusComponent, + ExVirtualScrollComponent + ], + templateUrl: './tree.component.html' +}) +export class TeTreeComponent {} diff --git a/src/main/test/typography/typography.component.html b/src/main/test/typography/typography.component.html new file mode 100644 index 000000000..00637a7d3 --- /dev/null +++ b/src/main/test/typography/typography.component.html @@ -0,0 +1,3 @@ + + + diff --git a/src/main/test/typography/typography.component.ts b/src/main/test/typography/typography.component.ts new file mode 100644 index 000000000..161067648 --- /dev/null +++ b/src/main/test/typography/typography.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; +import { ExDefaultComponent, ExLineHeightComponent, ExSizeComponent } from '@ng-nest/ui/typography/examples'; + +@Component({ + selector: 'te-typography', + standalone: true, + imports: [ExDefaultComponent, ExLineHeightComponent, ExSizeComponent], + templateUrl: './typography.component.html' +}) +export class TeTypographyComponent {} diff --git a/src/main/test/upload/upload.component.html b/src/main/test/upload/upload.component.html new file mode 100644 index 000000000..4de534896 --- /dev/null +++ b/src/main/test/upload/upload.component.html @@ -0,0 +1,4 @@ + + + + diff --git a/src/main/test/upload/upload.component.ts b/src/main/test/upload/upload.component.ts new file mode 100644 index 000000000..8665c45c7 --- /dev/null +++ b/src/main/test/upload/upload.component.ts @@ -0,0 +1,15 @@ +import { Component } from '@angular/core'; +import { + ExDefaultComponent, + ExCustomComponent, + ExDisabledComponent, + ExImgComponent +} from '@ng-nest/ui/upload/examples'; + +@Component({ + selector: 'te-upload', + standalone: true, + imports: [ExDefaultComponent, ExCustomComponent, ExDisabledComponent, ExImgComponent], + templateUrl: './upload.component.html' +}) +export class TeUploadComponent {} diff --git a/src/share/adaption/adaption.directive.ts b/src/share/adaption/adaption.directive.ts index a88a22528..5c41bca07 100644 --- a/src/share/adaption/adaption.directive.ts +++ b/src/share/adaption/adaption.directive.ts @@ -5,7 +5,8 @@ import { takeUntil } from 'rxjs/operators'; import { DOCUMENT } from '@angular/common'; @Directive({ - selector: '[ns-adaption]' + selector: '[ns-adaption]', + standalone: true }) export class NsAdaptionDirective implements AfterViewInit, OnDestroy { @Input() outerHeight: number = 0; @@ -37,6 +38,10 @@ export class NsAdaptionDirective implements AfterViewInit, OnDestroy { setAdaptionHeight() { const outerHeight = this.outerElement ? this.outerElement.clientHeight : this.outerHeight; - this.renderer.setStyle(this.elementRef.nativeElement, 'height', `${this.doc.documentElement.clientHeight - outerHeight}px`); + this.renderer.setStyle( + this.elementRef.nativeElement, + 'height', + `${this.doc.documentElement.clientHeight - outerHeight}px` + ); } } diff --git a/src/share/adaption/adaption.module.ts b/src/share/adaption/adaption.module.ts deleted file mode 100644 index 49298986a..000000000 --- a/src/share/adaption/adaption.module.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { NgModule } from '@angular/core'; -import { NsAdaptionDirective } from './adaption.directive'; - -@NgModule({ - declarations: [NsAdaptionDirective], - exports: [NsAdaptionDirective] -}) -export class NsAdaptionModule {} diff --git a/src/share/developing/developing.component.ts b/src/share/developing/developing.component.ts index f7445dc7f..eef65e68f 100644 --- a/src/share/developing/developing.component.ts +++ b/src/share/developing/developing.component.ts @@ -1,18 +1,18 @@ import { DOCUMENT } from '@angular/common'; -import { Component, OnInit, ViewEncapsulation, inject } from '@angular/core'; +import { Component, ViewEncapsulation, inject } from '@angular/core'; import { Router } from '@angular/router'; @Component({ selector: 'ns-developing', + standalone: true, templateUrl: './developing.component.html', styleUrls: ['./developing.component.scss'], encapsulation: ViewEncapsulation.None }) -export class DevelopingComponent implements OnInit { +export class DevelopingComponent { private wd = inject(DOCUMENT).defaultView!; constructor(public router: Router) {} - ngOnInit() {} push() { this.router.navigateByUrl(`/index/home`); } diff --git a/src/share/index.ts b/src/share/index.ts index 3645a27aa..9693c3894 100644 --- a/src/share/index.ts +++ b/src/share/index.ts @@ -1 +1,3 @@ export * from './share.module'; +export * from './adaption/adaption.directive'; +export * from './developing/developing.component'; diff --git a/src/share/share.module.ts b/src/share/share.module.ts index d2102fed5..5a562f313 100644 --- a/src/share/share.module.ts +++ b/src/share/share.module.ts @@ -1,19 +1,19 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { RouterModule } from '@angular/router'; +import { RouterModule, RouterOutlet } from '@angular/router'; import { HttpClientModule } from '@angular/common/http'; import { XDocComponent } from '@ng-nest/ui/doc'; import { XExamplesComponent } from '@ng-nest/ui/examples'; import { XApiComponent } from '@ng-nest/ui/api'; -import { XTabsModule } from '@ng-nest/ui/tabs'; +import { XTabsComponent, XTabComponent } from '@ng-nest/ui/tabs'; import { XHighlightComponent } from '@ng-nest/ui/highlight'; import { XPatternComponent } from '@ng-nest/ui/pattern'; -import { XI18nDirective } from '@ng-nest/ui/i18n'; -import { XButtonComponent } from '@ng-nest/ui/button'; -import { XTooltipModule } from '@ng-nest/ui/tooltip'; +import { XI18nPipe } from '@ng-nest/ui/i18n'; +import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; +import { XTooltipDirective } from '@ng-nest/ui/tooltip'; import { XAnchorComponent } from '@ng-nest/ui/anchor'; -import { NsAdaptionModule } from './adaption/adaption.module'; +import { XTreeFileComponent } from '@ng-nest/ui/tree-file'; const modules = [ CommonModule, @@ -21,17 +21,20 @@ const modules = [ RouterModule, HttpClientModule, ReactiveFormsModule, - NsAdaptionModule, + RouterOutlet, XDocComponent, XExamplesComponent, XAnchorComponent, XApiComponent, - XTabsModule, + XTabsComponent, + XTabComponent, XHighlightComponent, XPatternComponent, - XI18nDirective, + XI18nPipe, + XButtonsComponent, XButtonComponent, - XTooltipModule + XTooltipDirective, + XTreeFileComponent ]; @NgModule({ diff --git a/tsconfig.json b/tsconfig.json index 8fc468d1e..1aa474559 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -36,7 +36,9 @@ "@environments": ["./src/environments/"], "@environments/*": ["./src/environments/*"], "@share": ["./src/share/"], - "@share/*": ["./src/share/*"] + "@share/*": ["./src/share/*"], + "@interfaces": ["./src/interfaces/"], + "@interfaces/*": ["./src/interfaces/*"] }, "useDefineForClassFields": false },