From 7ccecc12e016b6aed068003e3e27c9e471837013 Mon Sep 17 00:00:00 2001 From: ng-nest-moon Date: Thu, 30 Nov 2023 19:50:21 +0800 Subject: [PATCH] refactor(standalone): update some components to standalone components includes: Find Form Highlight Image Input InputNumber Layout Link List Loading Menu Message --- .prettierrc.json | 2 +- .../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 +- .../auto-complete-portal.component.ts | 4 +- .../auto-complete.component.spec.ts | 8 +- .../auto-complete/auto-complete.component.ts | 58 +++-- .../ui/cascade/cascade-portal.component.ts | 4 +- .../ui/cascade/cascade.component.spec.ts | 2 - lib/ng-nest/ui/cascade/cascade.component.ts | 18 +- .../ui/checkbox/checkbox.component.spec.ts | 8 +- .../default/perpost/perpost.component.ts | 4 +- .../default/perpost/perpost.component.ts | 4 +- .../color-picker-portal.component.ts | 44 +++- .../ui/color-picker/color-picker.component.ts | 27 ++- .../ui/comment/comment-reply.component.ts | 12 +- lib/ng-nest/ui/core/config/config.spec.ts | 6 +- .../date-picker/date-picker.component.spec.ts | 8 +- .../ui/date-picker/date-picker.component.ts | 32 ++- .../ui/date-picker/date-range.component.ts | 27 ++- .../ui/dialog/dialog-portal.component.ts | 54 ++++- .../ui/dialog/dialog.component.spec.ts | 8 +- .../en_US/default/custom/custom.component.ts | 4 +- .../zh_CN/default/custom/custom.component.ts | 4 +- lib/ng-nest/ui/doc/doc.component.spec.ts | 8 +- .../ui/drawer/drawer.component.spec.ts | 9 +- .../en_US/default/custom/custom.component.ts | 4 +- .../zh_CN/default/custom/custom.component.ts | 4 +- .../ui/dropdown/dropdown-portal.component.ts | 4 +- .../ui/dropdown/dropdown.component.spec.ts | 27 ++- .../ui/examples/examples.component.spec.ts | 35 ++- lib/ng-nest/ui/examples/examples.component.ts | 19 +- lib/ng-nest/ui/examples/examples.module.ts | 4 +- .../default/bordered/bordered.component.html | 40 ++- .../default/bordered/bordered.component.scss | 5 +- .../default/bordered/bordered.component.ts | 4 + .../default/default/default.component.html | 23 +- .../default/default/default.component.scss | 5 + .../default/default/default.component.ts | 8 +- .../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 | 32 +-- .../en_US/default/label/label.component.scss | 2 +- .../en_US/default/label/label.component.ts | 4 + .../en_US/default/size/size.component.html | 40 ++- .../en_US/default/size/size.component.scss | 5 +- .../en_US/default/size/size.component.ts | 5 + .../tree-table/tree-table.component.html | 8 +- .../tree-table/tree-table.component.scss | 5 + .../tree-table/tree-table.component.ts | 8 +- .../en_US/default/tree/tree.component.html | 19 +- .../en_US/default/tree/tree.component.scss | 5 + .../en_US/default/tree/tree.component.ts | 5 + lib/ng-nest/ui/find/examples/index.ts | 7 + .../default/bordered/bordered.component.html | 40 ++- .../default/bordered/bordered.component.scss | 5 +- .../default/bordered/bordered.component.ts | 4 + .../default/default/default.component.html | 23 +- .../default/default/default.component.scss | 5 + .../default/default/default.component.ts | 8 +- .../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 + .../zh_CN/default/size/size.component.html | 40 ++- .../zh_CN/default/size/size.component.scss | 5 +- .../zh_CN/default/size/size.component.ts | 5 + .../tree-table/tree-table.component.html | 12 +- .../tree-table/tree-table.component.scss | 5 + .../tree-table/tree-table.component.ts | 8 +- .../zh_CN/default/tree/tree.component.html | 15 +- .../zh_CN/default/tree/tree.component.scss | 5 + .../zh_CN/default/tree/tree.component.ts | 5 + lib/ng-nest/ui/find/find.component.html | 52 +++- lib/ng-nest/ui/find/find.component.scss | 8 +- lib/ng-nest/ui/find/find.component.spec.ts | 6 +- lib/ng-nest/ui/find/find.component.ts | 63 ++++- lib/ng-nest/ui/find/find.module.ts | 28 +-- lib/ng-nest/ui/form/control.component.ts | 94 ++++++-- .../default/default/default.component.ts | 228 +++++++++++++++--- .../form-vaild/form-vaild.component.ts | 7 +- .../default/label-row/label-row.component.ts | 12 +- .../en_US/default/title/title.component.ts | 21 +- lib/ng-nest/ui/form/examples/index.ts | 4 + .../default/default/default.component.ts | 222 ++++++++++++++--- .../form-vaild/form-vaild.component.ts | 9 +- .../default/label-row/label-row.component.ts | 12 +- .../zh_CN/default/title/title.component.ts | 30 ++- lib/ng-nest/ui/form/form.component.spec.ts | 4 +- lib/ng-nest/ui/form/form.component.ts | 35 ++- lib/ng-nest/ui/form/form.module.ts | 50 +--- .../en_US/default/copy/copy.component.ts | 3 + .../en_US/default/html/html.component.ts | 3 + .../en_US/default/scss/scss.component.ts | 3 + .../typescript/typescript.component.ts | 3 + lib/ng-nest/ui/highlight/examples/index.ts | 4 + .../zh_CN/default/copy/copy.component.ts | 3 + .../zh_CN/default/html/html.component.ts | 3 + .../zh_CN/default/scss/scss.component.ts | 3 + .../typescript/typescript.component.ts | 3 + .../ui/highlight/highlight.component.spec.ts | 18 +- .../ui/highlight/highlight.component.ts | 36 ++- lib/ng-nest/ui/highlight/highlight.module.ts | 6 +- lib/ng-nest/ui/i18n/i18n.service.ts | 8 +- lib/ng-nest/ui/icon/icon.module.ts | 4 +- lib/ng-nest/ui/icon/icon.service.ts | 10 +- .../default/custom/custom.component.scss | 2 - .../en_US/default/custom/custom.component.ts | 12 +- .../default/default/default.component.scss | 2 - .../default/default/default.component.ts | 6 +- .../default/fallback/fallback.component.scss | 2 - .../default/fallback/fallback.component.ts | 6 +- .../en_US/default/group/group.component.scss | 2 - .../en_US/default/group/group.component.ts | 6 +- .../placeholder/placeholder.component.scss | 2 - .../placeholder/placeholder.component.ts | 7 +- lib/ng-nest/ui/image/examples/index.ts | 5 + .../default/custom/custom.component.scss | 2 - .../zh_CN/default/custom/custom.component.ts | 12 +- .../default/default/default.component.scss | 2 - .../default/default/default.component.ts | 6 +- .../default/fallback/fallback.component.scss | 2 - .../default/fallback/fallback.component.ts | 6 +- .../zh_CN/default/group/group.component.scss | 2 - .../zh_CN/default/group/group.component.ts | 6 +- .../placeholder/placeholder.component.scss | 2 - .../placeholder/placeholder.component.ts | 7 +- lib/ng-nest/ui/image/image-group.component.ts | 3 + .../ui/image/image-preview.component.ts | 37 ++- lib/ng-nest/ui/image/image.component.spec.ts | 4 +- lib/ng-nest/ui/image/image.component.ts | 35 +-- lib/ng-nest/ui/image/image.module.ts | 9 +- lib/ng-nest/ui/inner/inner.component.spec.ts | 5 +- lib/ng-nest/ui/inner/inner.component.ts | 18 +- lib/ng-nest/ui/inner/inner.module.ts | 5 +- .../default/bordered/bordered.component.html | 32 ++- .../default/bordered/bordered.component.scss | 5 +- .../default/bordered/bordered.component.ts | 3 + .../default/default/default.component.html | 6 +- .../default/default/default.component.scss | 5 - .../default/default/default.component.ts | 6 +- .../default/disabled/disabled.component.html | 16 +- .../default/disabled/disabled.component.scss | 5 +- .../default/disabled/disabled.component.ts | 4 + .../default/format/format.component.html | 16 +- .../default/format/format.component.scss | 4 +- .../en_US/default/format/format.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 | 3 + .../en_US/default/limit/limit.component.html | 24 +- .../en_US/default/limit/limit.component.scss | 5 +- .../en_US/default/limit/limit.component.ts | 3 + .../precision/precision.component.html | 6 +- .../precision/precision.component.scss | 8 - .../default/precision/precision.component.ts | 6 +- .../default/required/required.component.html | 22 +- .../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 + lib/ng-nest/ui/input-number/examples/index.ts | 9 + .../default/bordered/bordered.component.html | 32 ++- .../default/bordered/bordered.component.scss | 5 +- .../default/bordered/bordered.component.ts | 3 + .../default/default/default.component.html | 6 +- .../default/default/default.component.scss | 5 - .../default/default/default.component.ts | 6 +- .../default/disabled/disabled.component.html | 16 +- .../default/disabled/disabled.component.scss | 5 +- .../default/disabled/disabled.component.ts | 4 + .../default/format/format.component.html | 16 +- .../default/format/format.component.scss | 4 +- .../zh_CN/default/format/format.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 + .../zh_CN/default/limit/limit.component.html | 24 +- .../zh_CN/default/limit/limit.component.scss | 5 +- .../zh_CN/default/limit/limit.component.ts | 3 + .../precision/precision.component.html | 6 +- .../precision/precision.component.scss | 8 - .../default/precision/precision.component.ts | 6 +- .../default/required/required.component.html | 24 +- .../default/required/required.component.scss | 5 +- .../default/required/required.component.ts | 4 + .../zh_CN/default/size/size.component.html | 38 ++- .../zh_CN/default/size/size.component.scss | 6 +- .../zh_CN/default/size/size.component.ts | 5 + .../input-number.component.spec.ts | 13 +- .../ui/input-number/input-number.component.ts | 46 ++-- .../ui/input-number/input-number.module.ts | 16 +- .../default/bordered/bordered.component.html | 52 ++-- .../default/bordered/bordered.component.scss | 5 +- .../default/bordered/bordered.component.ts | 3 + .../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/focus/focus.component.html | 22 +- .../en_US/default/focus/focus.component.scss | 2 +- .../en_US/default/focus/focus.component.ts | 5 + .../en_US/default/group/group.component.html | 12 +- .../en_US/default/group/group.component.ts | 26 ++ .../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/perpost/perpost.component.html | 165 +++++++------ .../default/perpost/perpost.component.scss | 5 +- .../default/perpost/perpost.component.ts | 21 ++ .../default/required/required.component.html | 24 +- .../default/required/required.component.scss | 5 +- .../default/required/required.component.ts | 4 + .../en_US/default/size/size.component.html | 40 ++- .../en_US/default/size/size.component.scss | 5 +- .../en_US/default/size/size.component.ts | 5 + lib/ng-nest/ui/input/examples/index.ts | 12 + .../default/bordered/bordered.component.html | 40 ++- .../default/bordered/bordered.component.scss | 5 +- .../default/bordered/bordered.component.ts | 3 + .../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/focus/focus.component.html | 22 +- .../zh_CN/default/focus/focus.component.scss | 2 +- .../zh_CN/default/focus/focus.component.ts | 5 + .../zh_CN/default/group/group.component.html | 12 +- .../zh_CN/default/group/group.component.ts | 26 ++ .../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/perpost/perpost.component.html | 164 +++++++------ .../default/perpost/perpost.component.scss | 5 +- .../default/perpost/perpost.component.ts | 21 ++ .../default/required/required.component.html | 24 +- .../default/required/required.component.scss | 5 +- .../default/required/required.component.ts | 4 + .../zh_CN/default/size/size.component.html | 40 ++- .../zh_CN/default/size/size.component.scss | 5 +- .../zh_CN/default/size/size.component.ts | 5 + lib/ng-nest/ui/input/input-group.component.ts | 21 +- lib/ng-nest/ui/input/input.component.spec.ts | 14 +- lib/ng-nest/ui/input/input.component.ts | 24 +- lib/ng-nest/ui/input/input.module.ts | 17 +- .../ui/keyword/keyword.directive.spec.ts | 4 +- lib/ng-nest/ui/layout/examples/index.ts | 7 + .../default/default/default.component.html | 16 +- .../default/default/default.component.scss | 2 +- .../default/disabled/disabled.component.html | 16 +- .../default/disabled/disabled.component.scss | 2 +- .../default/disabled/disabled.component.ts | 3 +- .../en_US/default/icon/icon.component.html | 8 +- .../en_US/default/icon/icon.component.scss | 2 +- .../en_US/default/icon/icon.component.ts | 3 +- .../underline/underline.component.html | 8 +- .../underline/underline.component.scss | 2 +- .../default/underline/underline.component.ts | 3 +- lib/ng-nest/ui/link/examples/index.ts | 4 + .../default/default/default.component.html | 16 +- .../default/default/default.component.scss | 2 +- .../default/default/default.component.ts | 3 +- .../default/disabled/disabled.component.html | 16 +- .../default/disabled/disabled.component.scss | 2 +- .../default/disabled/disabled.component.ts | 3 +- .../zh_CN/default/icon/icon.component.html | 8 +- .../zh_CN/default/icon/icon.component.scss | 2 +- .../zh_CN/default/icon/icon.component.ts | 3 +- .../underline/underline.component.html | 8 +- .../underline/underline.component.scss | 2 +- .../default/underline/underline.component.ts | 3 +- lib/ng-nest/ui/link/link.component.ts | 4 +- .../default/default/default.component.html | 68 +++--- .../default/default/default.component.scss | 6 +- .../default/default/default.component.ts | 5 + .../default/load-more/load-more.component.ts | 3 + .../en_US/default/scroll/scroll.component.ts | 7 + .../en_US/default/size/size.component.ts | 5 + lib/ng-nest/ui/list/examples/index.ts | 4 + .../default/default/default.component.html | 68 +++--- .../default/default/default.component.scss | 6 +- .../default/default/default.component.ts | 5 + .../default/load-more/load-more.component.ts | 3 + .../zh_CN/default/scroll/scroll.component.ts | 7 + .../zh_CN/default/size/size.component.ts | 5 + .../ui/list/list-drop-group.directive.ts | 1 + lib/ng-nest/ui/list/list-option.component.ts | 19 +- lib/ng-nest/ui/list/list.component.spec.ts | 23 +- lib/ng-nest/ui/list/list.component.ts | 55 +++-- lib/ng-nest/ui/list/list.module.ts | 34 +-- .../default/custom/custom.component.html | 50 ++-- .../en_US/default/custom/custom.component.ts | 3 + .../default/default/default.component.html | 42 ++-- .../default/default/default.component.ts | 4 + .../full-screen/full-screen.component.ts | 5 + lib/ng-nest/ui/loading/examples/index.ts | 3 + .../default/custom/custom.component.html | 42 ++-- .../zh_CN/default/custom/custom.component.ts | 3 + .../default/default/default.component.html | 42 ++-- .../default/default/default.component.ts | 4 + .../full-screen/full-screen.component.ts | 5 + .../ui/loading/loading.component.spec.ts | 6 +- lib/ng-nest/ui/loading/loading.component.ts | 24 +- lib/ng-nest/ui/loading/loading.module.ts | 7 +- .../default/default/default.component.ts | 3 + .../en_US/default/icon/icon.component.ts | 10 +- .../en_US/default/layout/layout.component.ts | 3 + .../en_US/default/leaf/leaf.component.ts | 3 + .../en_US/default/size/size.component.ts | 3 + lib/ng-nest/ui/menu/examples/index.ts | 5 + .../default/default/default.component.ts | 3 + .../zh_CN/default/icon/icon.component.ts | 3 + .../zh_CN/default/layout/layout.component.ts | 3 + .../zh_CN/default/leaf/leaf.component.ts | 3 + .../zh_CN/default/size/size.component.ts | 3 + lib/ng-nest/ui/menu/menu-node.component.ts | 30 ++- lib/ng-nest/ui/menu/menu.component.spec.ts | 23 +- lib/ng-nest/ui/menu/menu.component.ts | 22 +- lib/ng-nest/ui/menu/menu.module.ts | 9 +- .../ui/message-box/message-box.module.ts | 4 +- .../en_US/default/close/close.component.ts | 4 + .../default/default/default.component.ts | 4 + .../default/loading/loading.component.ts | 4 + .../en_US/default/single/single.component.ts | 4 + .../en_US/default/type/type.component.ts | 4 + lib/ng-nest/ui/message/examples/index.ts | 5 + .../zh_CN/default/close/close.component.ts | 4 + .../default/default/default.component.ts | 4 + .../default/loading/loading.component.ts | 4 + .../zh_CN/default/single/single.component.ts | 4 + .../zh_CN/default/type/type.component.ts | 4 + lib/ng-nest/ui/message/message.component.ts | 9 +- lib/ng-nest/ui/message/message.module.ts | 7 +- lib/ng-nest/ui/message/message.service.ts | 22 +- .../ui/pagination/pagination.module.ts | 4 +- .../ui/progress/progress.component.spec.ts | 3 +- lib/ng-nest/ui/radio/radio.component.spec.ts | 8 +- .../ui/result/result.component.spec.ts | 3 +- lib/ng-nest/ui/select/select.module.ts | 8 +- lib/ng-nest/ui/slider/slider.module.ts | 4 +- lib/ng-nest/ui/steps/steps.component.spec.ts | 12 +- .../ui/switch/switch.component.spec.ts | 4 +- lib/ng-nest/ui/switch/switch.module.ts | 4 +- lib/ng-nest/ui/table/table.component.spec.ts | 62 +++-- lib/ng-nest/ui/table/table.module.ts | 4 +- lib/ng-nest/ui/theme/theme.component.spec.ts | 15 +- lib/ng-nest/ui/theme/theme.module.ts | 4 +- .../ui/time-picker/time-picker.module.ts | 8 +- .../ui/transfer/transfer.component.spec.ts | 4 +- lib/ng-nest/ui/transfer/transfer.module.ts | 4 +- lib/ng-nest/ui/tree-file/tree-file.module.ts | 6 +- .../tree-select/tree-select.component.spec.ts | 4 +- .../ui/tree-select/tree-select.module.ts | 8 +- lib/ng-nest/ui/tree/tree.component.spec.ts | 8 +- lib/ng-nest/ui/upload/upload.module.ts | 5 +- src/app/app.component.spec.ts | 6 +- src/main/docs/docs.module.ts | 4 +- src/main/layout/layout.module.ts | 8 +- src/main/test/find/find.component.html | 7 + src/main/test/find/find.component.ts | 26 ++ src/main/test/form/form.component.html | 4 + src/main/test/form/form.component.ts | 15 ++ .../test/highlight/highlight.component.html | 4 + .../test/highlight/highlight.component.ts | 15 ++ src/main/test/image/image.component.html | 5 + src/main/test/image/image.component.ts | 22 ++ .../input-number/input-number.component.html | 9 + .../input-number/input-number.component.ts | 30 +++ src/main/test/input/input.component.html | 12 + src/main/test/input/input.component.ts | 36 +++ src/main/test/layout/layout.component.html | 7 + src/main/test/layout/layout.component.ts | 26 ++ src/main/test/link/link.component.html | 4 + src/main/test/link/link.component.ts | 15 ++ src/main/test/list/list.component.html | 4 + src/main/test/list/list.component.ts | 10 + src/main/test/loading/loading.component.html | 3 + src/main/test/loading/loading.component.ts | 10 + src/main/test/menu/menu.component.html | 5 + src/main/test/menu/menu.component.ts | 16 ++ src/main/test/message/message.component.html | 5 + src/main/test/message/message.component.ts | 16 ++ src/main/test/test-routes.modules.ts | 48 ++++ src/share/share.module.ts | 8 +- 411 files changed, 3370 insertions(+), 2247 deletions(-) create mode 100644 lib/ng-nest/ui/find/examples/en_US/default/default/default.component.scss create mode 100644 lib/ng-nest/ui/find/examples/en_US/default/tree-table/tree-table.component.scss create mode 100644 lib/ng-nest/ui/find/examples/en_US/default/tree/tree.component.scss create mode 100644 lib/ng-nest/ui/find/examples/index.ts create mode 100644 lib/ng-nest/ui/find/examples/zh_CN/default/default/default.component.scss create mode 100644 lib/ng-nest/ui/find/examples/zh_CN/default/tree-table/tree-table.component.scss create mode 100644 lib/ng-nest/ui/find/examples/zh_CN/default/tree/tree.component.scss create mode 100644 lib/ng-nest/ui/form/examples/index.ts create mode 100644 lib/ng-nest/ui/highlight/examples/index.ts delete mode 100644 lib/ng-nest/ui/image/examples/en_US/default/custom/custom.component.scss delete mode 100644 lib/ng-nest/ui/image/examples/en_US/default/default/default.component.scss delete mode 100644 lib/ng-nest/ui/image/examples/en_US/default/fallback/fallback.component.scss delete mode 100644 lib/ng-nest/ui/image/examples/en_US/default/group/group.component.scss delete mode 100644 lib/ng-nest/ui/image/examples/en_US/default/placeholder/placeholder.component.scss create mode 100644 lib/ng-nest/ui/image/examples/index.ts delete mode 100644 lib/ng-nest/ui/image/examples/zh_CN/default/custom/custom.component.scss delete mode 100644 lib/ng-nest/ui/image/examples/zh_CN/default/default/default.component.scss delete mode 100644 lib/ng-nest/ui/image/examples/zh_CN/default/fallback/fallback.component.scss delete mode 100644 lib/ng-nest/ui/image/examples/zh_CN/default/group/group.component.scss delete mode 100644 lib/ng-nest/ui/image/examples/zh_CN/default/placeholder/placeholder.component.scss delete mode 100644 lib/ng-nest/ui/input-number/examples/en_US/default/default/default.component.scss delete mode 100644 lib/ng-nest/ui/input-number/examples/en_US/default/precision/precision.component.scss create mode 100644 lib/ng-nest/ui/input-number/examples/index.ts delete mode 100644 lib/ng-nest/ui/input-number/examples/zh_CN/default/default/default.component.scss delete mode 100644 lib/ng-nest/ui/input-number/examples/zh_CN/default/precision/precision.component.scss create mode 100644 lib/ng-nest/ui/input/examples/index.ts create mode 100644 lib/ng-nest/ui/layout/examples/index.ts create mode 100644 lib/ng-nest/ui/link/examples/index.ts create mode 100644 lib/ng-nest/ui/list/examples/index.ts create mode 100644 lib/ng-nest/ui/loading/examples/index.ts create mode 100644 lib/ng-nest/ui/menu/examples/index.ts create mode 100644 lib/ng-nest/ui/message/examples/index.ts create mode 100644 src/main/test/find/find.component.html create mode 100644 src/main/test/find/find.component.ts create mode 100644 src/main/test/form/form.component.html create mode 100644 src/main/test/form/form.component.ts create mode 100644 src/main/test/highlight/highlight.component.html create mode 100644 src/main/test/highlight/highlight.component.ts create mode 100644 src/main/test/image/image.component.html create mode 100644 src/main/test/image/image.component.ts create mode 100644 src/main/test/input-number/input-number.component.html create mode 100644 src/main/test/input-number/input-number.component.ts create mode 100644 src/main/test/input/input.component.html create mode 100644 src/main/test/input/input.component.ts create mode 100644 src/main/test/layout/layout.component.html create mode 100644 src/main/test/layout/layout.component.ts create mode 100644 src/main/test/link/link.component.html create mode 100644 src/main/test/link/link.component.ts create mode 100644 src/main/test/list/list.component.html create mode 100644 src/main/test/list/list.component.ts create mode 100644 src/main/test/loading/loading.component.html create mode 100644 src/main/test/loading/loading.component.ts create mode 100644 src/main/test/menu/menu.component.html create mode 100644 src/main/test/menu/menu.component.ts create mode 100644 src/main/test/message/message.component.html create mode 100644 src/main/test/message/message.component.ts diff --git a/.prettierrc.json b/.prettierrc.json index 50fa4ebd0..e9199cf2d 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -1,5 +1,5 @@ { - "printWidth": 100, + "printWidth": 120, "semi": true, "singleQuote": true, "trailingComma": "none" 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 019526a5a..b7f5e28cb 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 @@ -8,7 +8,7 @@ import { SidebarComponent } from './sidebar/sidebar.component'; import { TabsComponent } from './tabs/tabs.component'; import { RouterModule } from '@angular/router'; import { mainRoutes } from 'src/environments/routes'; -import { XMenuModule } from '@ng-nest/ui/menu'; +import { XMenuComponent } from '@ng-nest/ui/menu'; import { XSliderModule } from '@ng-nest/ui/slider'; import { XIconComponent } from '@ng-nest/ui/icon'; import { XCrumbModule } from '@ng-nest/ui/crumb'; @@ -17,7 +17,7 @@ import { XCrumbModule } from '@ng-nest/ui/crumb'; declarations: [IndexComponent, ContentComponent, CrumbComponent, HeaderComponent, SidebarComponent, TabsComponent], imports: [ CommonModule, - XMenuModule, + XMenuComponent, XSliderModule, XIconComponent, XCrumbModule, 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 7fff6135f..36f025fe6 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 @@ -8,7 +8,7 @@ import { SidebarComponent } from './sidebar/sidebar.component'; import { TabsComponent } from './tabs/tabs.component'; import { RouterModule } from '@angular/router'; import { mainRoutes } from 'src/environments/routes'; -import { XMenuModule } from '@ng-nest/ui/menu'; +import { XMenuComponent } from '@ng-nest/ui/menu'; import { XSliderModule } from '@ng-nest/ui/slider'; import { XIconComponent } from '@ng-nest/ui/icon'; @@ -16,7 +16,7 @@ import { XIconComponent } from '@ng-nest/ui/icon'; declarations: [IndexComponent, ContentComponent, CrumbComponent, HeaderComponent, SidebarComponent, TabsComponent], imports: [ CommonModule, - XMenuModule, + XMenuComponent, XSliderModule, XIconComponent, RouterModule.forChild([ 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 400bee0b7..f1c08fd40 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 @@ -5,7 +5,7 @@ import { RouterModule } from '@angular/router'; import { XTableModule } from '@ng-nest/ui/table'; import { UserDetailComponent } from './user-detail/user-detail.component'; import { XButtonComponent } from '@ng-nest/ui/button'; -import { XFormModule } from '@ng-nest/ui/form'; +import { XFormComponent } from '@ng-nest/ui/form'; import { XMessageModule } from '@ng-nest/ui/message'; @NgModule({ @@ -14,7 +14,7 @@ import { XMessageModule } from '@ng-nest/ui/message'; CommonModule, XTableModule, XButtonComponent, - XFormModule, + XFormComponent, XMessageModule, RouterModule.forChild([ { path: '', component: UserComponent }, 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 497a7282f..b5e0636c4 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 @@ -5,7 +5,7 @@ import { RouterModule } from '@angular/router'; import { XTableModule } from '@ng-nest/ui/table'; import { UserDetailComponent } from './user-detail/user-detail.component'; import { XButtonComponent } from '@ng-nest/ui/button'; -import { XFormModule } from '@ng-nest/ui/form'; +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'; @@ -16,7 +16,7 @@ import { XMessageBoxModule } from '@ng-nest/ui/message-box'; CommonModule, XTableModule, XButtonComponent, - XFormModule, + XFormComponent, XMessageModule, XLinkComponent, XMessageBoxModule, diff --git a/lib/ng-nest/ui/auto-complete/auto-complete-portal.component.ts b/lib/ng-nest/ui/auto-complete/auto-complete-portal.component.ts index eff7b9220..180627886 100644 --- a/lib/ng-nest/ui/auto-complete/auto-complete-portal.component.ts +++ b/lib/ng-nest/ui/auto-complete/auto-complete-portal.component.ts @@ -15,13 +15,13 @@ import { XAutoCompleteNode, XAutoCompletePortalPrefix } from './auto-complete.pr import { Subject, BehaviorSubject } from 'rxjs'; import { XBoolean, XConnectBaseAnimation, XNumber, XPositionTopBottom } from '@ng-nest/ui/core'; import { filter, takeUntil } from 'rxjs/operators'; -import { XListComponent, XListModule } from '@ng-nest/ui/list'; +import { XListComponent } from '@ng-nest/ui/list'; import { XInputComponent } from '@ng-nest/ui/input'; @Component({ selector: `${XAutoCompletePortalPrefix}`, standalone: true, - imports: [XListModule], + imports: [XListComponent], templateUrl: './auto-complete-portal.component.html', styleUrls: ['./auto-complete-portal.component.scss'], encapsulation: ViewEncapsulation.None, 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 ed754c347..e54633dad 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 @@ -11,11 +11,11 @@ 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 { XInputModule } from '@ng-nest/ui/input'; +import { XInputComponent } from '@ng-nest/ui/input'; import { XSelectModule } from '@ng-nest/ui/select'; import { XCascadeComponent } from '@ng-nest/ui/cascade'; import { XColorPickerComponent } from '@ng-nest/ui/color-picker'; -import { XFindModule } from '@ng-nest/ui/find'; +import { XFindComponent } from '@ng-nest/ui/find'; import { XTextareaModule } from '@ng-nest/ui/textarea'; import { XTimePickerModule } from '@ng-nest/ui/time-picker'; import { XButtonComponent } from '@ng-nest/ui/button'; @@ -38,10 +38,10 @@ describe(XAutoCompletePrefix, () => { XRadioModule, XSelectModule, XButtonComponent, - XInputModule, + XInputComponent, XCascadeComponent, XColorPickerComponent, - XFindModule, + XFindComponent, XTextareaModule, XTimePickerModule, XDatePickerComponent, diff --git a/lib/ng-nest/ui/auto-complete/auto-complete.component.ts b/lib/ng-nest/ui/auto-complete/auto-complete.component.ts index d41779d66..ae483d9dc 100644 --- a/lib/ng-nest/ui/auto-complete/auto-complete.component.ts +++ b/lib/ng-nest/ui/auto-complete/auto-complete.component.ts @@ -13,7 +13,11 @@ import { ViewChild, inject } from '@angular/core'; -import { XAutoCompleteNode, XAutoCompleteProperty, XAutoCompletePrefix } from './auto-complete.property'; +import { + XAutoCompleteNode, + XAutoCompleteProperty, + XAutoCompletePrefix +} from './auto-complete.property'; import { XIsEmpty, XIsObservable, @@ -26,7 +30,7 @@ import { XParents } from '@ng-nest/ui/core'; import { XPortalService, XPortalOverlayRef, XPortalConnectedPosition } from '@ng-nest/ui/portal'; -import { XInputModule, XInputComponent } from '@ng-nest/ui/input'; +import { XInputComponent } from '@ng-nest/ui/input'; import { XAutoCompletePortalComponent } from './auto-complete-portal.component'; import { Overlay, @@ -43,7 +47,13 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; @Component({ selector: `${XAutoCompletePrefix}`, standalone: true, - imports: [FormsModule, ReactiveFormsModule, XInputModule, XControlValueAccessor, XAutoCompletePortalComponent], + imports: [ + FormsModule, + ReactiveFormsModule, + XInputComponent, + XControlValueAccessor, + XAutoCompletePortalComponent + ], templateUrl: './auto-complete.component.html', styleUrls: ['./auto-complete.component.scss'], encapsulation: ViewEncapsulation.None, @@ -93,7 +103,13 @@ export class XAutoCompleteComponent extends XAutoCompleteProperty implements OnI override cdr = inject(ChangeDetectorRef); ngOnInit() { - this.setFlex(this.autoComplete.nativeElement, this.renderer, this.justify, this.align, this.direction); + this.setFlex( + this.autoComplete.nativeElement, + this.renderer, + this.justify, + this.align, + this.direction + ); this.setClassMap(); this.setSubject(); this.setParantScroll(); @@ -257,10 +273,12 @@ export class XAutoCompleteComponent extends XAutoCompleteProperty implements OnI 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 XPositionTopBottom; - place !== this.placement && this.positionChange.next(place); - }); + position.positionChanges + .pipe(takeUntil(this._unSubject)) + .subscribe((pos: ConnectedOverlayPositionChange) => { + const place = XPortalConnectedPosition.get(pos.connectionPair) as XPositionTopBottom; + place !== this.placement && this.positionChange.next(place); + }); } setInstance() { @@ -304,7 +322,13 @@ export class XAutoCompleteComponent extends XAutoCompleteProperty implements OnI setPlacement() { return this.portalService.setPlacement({ elementRef: this.inputCom.inputRef, - placement: [this.placement as XPositionTopBottom, 'bottom-start', 'bottom-end', 'top-start', 'top-end'], + placement: [ + this.placement as XPositionTopBottom, + 'bottom-start', + 'bottom-end', + 'top-start', + 'top-end' + ], transformOriginOn: 'x-auto-complete-portal' }); } @@ -334,13 +358,15 @@ export class XAutoCompleteComponent extends XAutoCompleteProperty implements OnI this.icon = 'fto-loader'; this.iconSpin = true; this.cdr.detectChanges(); - XSetData(this.data, this._unSubject, true, value as any).subscribe((x) => { - this.icon = ''; - this.iconSpin = false; - this.nodes = x; - this.dataChange.next(this.nodes); - this.cdr.detectChanges(); - }); + XSetData(this.data, this._unSubject, true, value as any).subscribe( + (x) => { + this.icon = ''; + this.iconSpin = false; + this.nodes = x; + this.dataChange.next(this.nodes); + this.cdr.detectChanges(); + } + ); } } if (!this.onlySelect) { diff --git a/lib/ng-nest/ui/cascade/cascade-portal.component.ts b/lib/ng-nest/ui/cascade/cascade-portal.component.ts index 4248241de..fabf947e5 100644 --- a/lib/ng-nest/ui/cascade/cascade-portal.component.ts +++ b/lib/ng-nest/ui/cascade/cascade-portal.component.ts @@ -17,13 +17,13 @@ import { of, Subject } from 'rxjs'; import { delay, takeUntil } from 'rxjs/operators'; import { XInputComponent } from '@ng-nest/ui/input'; import { CommonModule } from '@angular/common'; -import { XListModule } from '@ng-nest/ui/list'; +import { XListComponent } from '@ng-nest/ui/list'; import { FormsModule } from '@angular/forms'; @Component({ selector: 'x-cascade-portal', standalone: true, - imports: [CommonModule, FormsModule, XListModule], + imports: [CommonModule, FormsModule, XListComponent], templateUrl: './cascade-portal.component.html', styleUrls: ['./cascade-portal.component.scss'], encapsulation: ViewEncapsulation.None, diff --git a/lib/ng-nest/ui/cascade/cascade.component.spec.ts b/lib/ng-nest/ui/cascade/cascade.component.spec.ts index 227366e4c..dde1bd26a 100644 --- a/lib/ng-nest/ui/cascade/cascade.component.spec.ts +++ b/lib/ng-nest/ui/cascade/cascade.component.spec.ts @@ -1,7 +1,5 @@ import { interval } from 'rxjs'; import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XCascadeComponent } from './cascade.component'; import { Component, DebugElement, ChangeDetectorRef } from '@angular/core'; import { By } from '@angular/platform-browser'; import { XCascadeComponent } from '@ng-nest/ui/cascade'; diff --git a/lib/ng-nest/ui/cascade/cascade.component.ts b/lib/ng-nest/ui/cascade/cascade.component.ts index 9717709fd..e5bc90f90 100644 --- a/lib/ng-nest/ui/cascade/cascade.component.ts +++ b/lib/ng-nest/ui/cascade/cascade.component.ts @@ -27,12 +27,8 @@ import { XParents, XConfigService } from '@ng-nest/ui/core'; -import { - XPortalService, - XPortalOverlayRef, - XPortalConnectedPosition -} from '@ng-nest/ui/portal'; -import { XInputComponent, XInputModule } from '@ng-nest/ui/input'; +import { XPortalService, XPortalOverlayRef, XPortalConnectedPosition } from '@ng-nest/ui/portal'; +import { XInputComponent } from '@ng-nest/ui/input'; import { Overlay, OverlayConfig, @@ -40,20 +36,14 @@ import { ConnectedOverlayPositionChange } from '@angular/cdk/overlay'; import { filter, takeUntil } from 'rxjs/operators'; -import { XValueAccessor,XControlValueAccessor } from '@ng-nest/ui/base-form'; +import { XValueAccessor, XControlValueAccessor } from '@ng-nest/ui/base-form'; import { CommonModule, DOCUMENT } from '@angular/common'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; @Component({ selector: 'x-cascade', standalone: true, - imports: [ - CommonModule, - FormsModule, - ReactiveFormsModule, - XInputModule, - XControlValueAccessor - ], + imports: [CommonModule, FormsModule, ReactiveFormsModule, XInputComponent, XControlValueAccessor], templateUrl: './cascade.component.html', styleUrls: ['./cascade.component.scss'], encapsulation: ViewEncapsulation.None, diff --git a/lib/ng-nest/ui/checkbox/checkbox.component.spec.ts b/lib/ng-nest/ui/checkbox/checkbox.component.spec.ts index e14992a76..82cc9dddd 100644 --- a/lib/ng-nest/ui/checkbox/checkbox.component.spec.ts +++ b/lib/ng-nest/ui/checkbox/checkbox.component.spec.ts @@ -15,10 +15,10 @@ 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 { XFindModule } from '@ng-nest/ui/find'; +import { XFindComponent } from '@ng-nest/ui/find'; import { XTextareaModule } from '@ng-nest/ui/textarea'; import { XTimePickerModule } from '@ng-nest/ui/time-picker'; -import { XInputModule } from '@ng-nest/ui/input'; +import { XInputComponent } from '@ng-nest/ui/input'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { XTagModule } from '@ng-nest/ui/tag'; @@ -39,10 +39,10 @@ describe(XCheckboxPrefix, () => { XColComponent, XCascadeComponent, XColorPickerComponent, - XFindModule, + XFindComponent, XTextareaModule, XTimePickerModule, - XInputModule, + XInputComponent, XTagModule ], declarations: [ 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 6f70a99e6..cffb358bc 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 @@ -4,7 +4,7 @@ import { XCheckboxComponent, XCheckboxNode } from '@ng-nest/ui/checkbox'; import { FormsModule } from '@angular/forms'; import { XSelectModule } from '@ng-nest/ui/select'; import { XButtonComponent } from '@ng-nest/ui/button'; -import { XInputModule } from '@ng-nest/ui/input'; +import { XInputComponent } from '@ng-nest/ui/input'; import { XDatePickerComponent } from '@ng-nest/ui/date-picker'; import { XAutoCompleteComponent } from '@ng-nest/ui/auto-complete'; import { XCascadeComponent } from '@ng-nest/ui/cascade'; @@ -19,7 +19,7 @@ import { XTimePickerModule } from '@ng-nest/ui/time-picker'; XCheckboxComponent, XSelectModule, XButtonComponent, - XInputModule, + XInputComponent, XDatePickerComponent, XAutoCompleteComponent, XCascadeComponent, 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 6f70a99e6..cffb358bc 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 @@ -4,7 +4,7 @@ import { XCheckboxComponent, XCheckboxNode } from '@ng-nest/ui/checkbox'; import { FormsModule } from '@angular/forms'; import { XSelectModule } from '@ng-nest/ui/select'; import { XButtonComponent } from '@ng-nest/ui/button'; -import { XInputModule } from '@ng-nest/ui/input'; +import { XInputComponent } from '@ng-nest/ui/input'; import { XDatePickerComponent } from '@ng-nest/ui/date-picker'; import { XAutoCompleteComponent } from '@ng-nest/ui/auto-complete'; import { XCascadeComponent } from '@ng-nest/ui/cascade'; @@ -19,7 +19,7 @@ import { XTimePickerModule } from '@ng-nest/ui/time-picker'; XCheckboxComponent, XSelectModule, XButtonComponent, - XInputModule, + XInputComponent, XDatePickerComponent, XAutoCompleteComponent, XCascadeComponent, 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 438ffce10..603815b06 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 @@ -19,7 +19,7 @@ import { Subject } from 'rxjs'; import { CdkDragMove } from '@angular/cdk/drag-drop'; import { CommonModule, DOCUMENT, DecimalPipe, PercentPipe } from '@angular/common'; import { takeUntil } from 'rxjs/operators'; -import { XInputComponent, XInputModule } from '@ng-nest/ui/input'; +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'; @@ -28,7 +28,14 @@ import { FormsModule } from '@angular/forms'; @Component({ selector: `${XColorPickerPortalPrefix}`, standalone: true, - imports: [CommonModule, FormsModule, DragDropModule, XSliderSelectModule, XTabsModule, XInputModule], + imports: [ + CommonModule, + FormsModule, + DragDropModule, + XSliderSelectModule, + XTabsModule, + XInputComponent + ], templateUrl: './color-picker-portal.component.html', styleUrls: ['./color-picker-portal.component.scss'], encapsulation: ViewEncapsulation.None, @@ -69,7 +76,10 @@ export class XColorPickerPortalComponent implements OnInit, OnDestroy { drag = false; rgba: { r?: number; g?: number; b?: number; a?: number } = { a: 1 }; - hsla: { h?: number; s?: number; l?: number; a?: number; sp?: string; lp?: string } = { h: 0, a: 1 }; + hsla: { h?: number; s?: number; l?: number; a?: number; sp?: string; lp?: string } = { + h: 0, + a: 1 + }; hex!: string; private _unSubject = new Subject(); @@ -101,7 +111,9 @@ 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(); @@ -222,7 +234,10 @@ export class XColorPickerPortalComponent implements OnInit, OnDestroy { moved(drag: CdkDragMove) { const transform = drag.source.getFreeDragPosition(); drag.source.reset(); - this.transform = { x: transform.x + this.initTransform.x, y: transform.y + this.initTransform.y }; + this.transform = { + x: transform.x + this.initTransform.x, + y: transform.y + this.initTransform.y + }; let left = this.transform.x + this.offset; let top = this.transform.y + this.offset; this.setLetfTop(left, top); @@ -252,8 +267,10 @@ 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() { @@ -268,7 +285,11 @@ 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() { @@ -323,7 +344,12 @@ export class XColorPickerPortalComponent implements OnInit, OnDestroy { g = hue2rgb(p, q, h / 360); b = hue2rgb(p, q, h / 360 - 1 / 3); } - return { r: Math.round(r * 255), g: Math.round(g * 255), b: Math.round(b * 255), a: Number(hsla.a) }; + return { + r: Math.round(r * 255), + g: Math.round(g * 255), + b: Math.round(b * 255), + a: Number(hsla.a) + }; } rgbaToHex(rgba: { r?: number; g?: number; b?: number; a?: number }) { diff --git a/lib/ng-nest/ui/color-picker/color-picker.component.ts b/lib/ng-nest/ui/color-picker/color-picker.component.ts index c10670052..5ddc76685 100644 --- a/lib/ng-nest/ui/color-picker/color-picker.component.ts +++ b/lib/ng-nest/ui/color-picker/color-picker.component.ts @@ -17,7 +17,7 @@ import { } from '@angular/core'; import { XColorPickerProperty } from './color-picker.property'; import { XIsEmpty, XCorner, XClearClass, XParents } from '@ng-nest/ui/core'; -import { XInputComponent, XInputModule } from '@ng-nest/ui/input'; +import { XInputComponent } from '@ng-nest/ui/input'; import { Overlay, OverlayConfig, @@ -32,14 +32,17 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; @Component({ selector: 'x-color-picker', standalone: true, - imports: [CommonModule, FormsModule, ReactiveFormsModule, XInputModule, XControlValueAccessor], + imports: [CommonModule, FormsModule, ReactiveFormsModule, XInputComponent, XControlValueAccessor], templateUrl: './color-picker.component.html', styleUrls: ['./color-picker.component.scss'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, providers: [XValueAccessor(XColorPickerComponent)] }) -export class XColorPickerComponent extends XColorPickerProperty implements OnInit, AfterViewInit, OnDestroy { +export class XColorPickerComponent + extends XColorPickerProperty + implements OnInit, AfterViewInit, OnDestroy +{ @ViewChild('colorPicker', { static: true }) colorPicker!: ElementRef; @ViewChild('inputCom', { static: true }) inputCom!: XInputComponent; @@ -83,7 +86,13 @@ export class XColorPickerComponent extends XColorPickerProperty implements OnIni private elementRef = inject(ElementRef); ngOnInit() { - this.setFlex(this.colorPicker.nativeElement, this.renderer, this.justify, this.align, this.direction); + this.setFlex( + this.colorPicker.nativeElement, + this.renderer, + this.justify, + this.align, + this.direction + ); this.setClassMap(); this.setSubject(); this.setParantScroll(); @@ -188,10 +197,12 @@ export class XColorPickerComponent extends XColorPickerProperty implements OnIni 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 XCorner; - place !== this.placement && this.positionChange.next(place); - }); + position.positionChanges + .pipe(takeUntil(this._unSubject)) + .subscribe((pos: ConnectedOverlayPositionChange) => { + const place = XPortalConnectedPosition.get(pos.connectionPair) as XCorner; + place !== this.placement && this.positionChange.next(place); + }); } setParantScroll() { diff --git a/lib/ng-nest/ui/comment/comment-reply.component.ts b/lib/ng-nest/ui/comment/comment-reply.component.ts index 8facdf4c5..5cf8fe741 100644 --- a/lib/ng-nest/ui/comment/comment-reply.component.ts +++ b/lib/ng-nest/ui/comment/comment-reply.component.ts @@ -1,10 +1,16 @@ -import { Component, ViewEncapsulation, ChangeDetectorRef, ChangeDetectionStrategy, inject } from '@angular/core'; +import { + Component, + ViewEncapsulation, + ChangeDetectorRef, + ChangeDetectionStrategy, + inject +} from '@angular/core'; import { XCommentReplyPrefix, XCommentReplyProperty } from './comment.property'; import { XConfigService } from '@ng-nest/ui/core'; import { takeUntil } from 'rxjs/operators'; import { XI18nService, XI18nPipe } from '@ng-nest/ui/i18n'; import { Subject } from 'rxjs'; -import { XInputModule } from '@ng-nest/ui/input'; +import { XInputComponent } from '@ng-nest/ui/input'; import { XButtonComponent } from '@ng-nest/ui/button'; import { FormsModule } from '@angular/forms'; import { CommonModule } from '@angular/common'; @@ -12,7 +18,7 @@ import { CommonModule } from '@angular/common'; @Component({ selector: `${XCommentReplyPrefix}`, standalone: true, - imports: [CommonModule, FormsModule, XInputModule, XI18nPipe, XButtonComponent], + imports: [CommonModule, FormsModule, XInputComponent, XI18nPipe, XButtonComponent], templateUrl: './comment-reply.component.html', styleUrls: ['./comment-reply.component.scss'], encapsulation: ViewEncapsulation.None, diff --git a/lib/ng-nest/ui/core/config/config.spec.ts b/lib/ng-nest/ui/core/config/config.spec.ts index 45cccce6e..d1964c4c6 100644 --- a/lib/ng-nest/ui/core/config/config.spec.ts +++ b/lib/ng-nest/ui/core/config/config.spec.ts @@ -1,11 +1,11 @@ import { waitForAsync, TestBed, ComponentFixture } from '@angular/core/testing'; -import { XButtonComponent, XButtonComponent } from '@ng-nest/ui/button'; +import { XButtonComponent } from '@ng-nest/ui/button'; import { XConfigService } from './config.service'; import { X_CONFIG, XConfig } from './config'; import { Component, DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; import { XSize } from '@ng-nest/ui/core'; -import { XDropdownModule } from '@ng-nest/ui/dropdown'; +import { XDropdownComponent } from '@ng-nest/ui/dropdown'; import { XLinkComponent } from '@ng-nest/ui/link'; import { HttpClientTestingModule } from '@angular/common/http/testing'; @@ -41,7 +41,7 @@ describe('x-config', () => { }; beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - imports: [XButtonComponent, HttpClientTestingModule, XDropdownModule, XLinkComponent], + imports: [XButtonComponent, HttpClientTestingModule, XDropdownComponent, XLinkComponent], declarations: [NzGlobalConfigTestBasicComponent], providers: [ { 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 4c218cc62..513e1ea94 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 @@ -15,10 +15,10 @@ import { XSelectModule } 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 { XFindModule } from '@ng-nest/ui/find'; +import { XFindComponent } from '@ng-nest/ui/find'; import { XTextareaModule } from '@ng-nest/ui/textarea'; import { XTimePickerModule } from '@ng-nest/ui/time-picker'; -import { XInputModule } from '@ng-nest/ui/input'; +import { XInputComponent } from '@ng-nest/ui/input'; import { XAddDays } from '@ng-nest/ui/core'; import { HttpClientTestingModule } from '@angular/common/http/testing'; @@ -37,11 +37,11 @@ describe(XDatePickerPrefix, () => { XButtonComponent, XRadioModule, XSelectModule, - XInputModule, + XInputComponent, XAutoCompleteComponent, XCascadeComponent, XColorPickerComponent, - XFindModule, + XFindComponent, XTextareaModule, XTimePickerModule ], diff --git a/lib/ng-nest/ui/date-picker/date-picker.component.ts b/lib/ng-nest/ui/date-picker/date-picker.component.ts index d3215b51e..82a2b121f 100644 --- a/lib/ng-nest/ui/date-picker/date-picker.component.ts +++ b/lib/ng-nest/ui/date-picker/date-picker.component.ts @@ -15,7 +15,11 @@ import { SimpleChanges, inject } from '@angular/core'; -import { XDatePickerPrefix, XDatePickerProperty, XDatePickerModelType } from './date-picker.property'; +import { + XDatePickerPrefix, + XDatePickerProperty, + XDatePickerModelType +} from './date-picker.property'; import { XIsEmpty, XIsDate, @@ -30,7 +34,7 @@ import { XDateYearQuarter, XParents } from '@ng-nest/ui/core'; -import { XInputComponent, XInputModule } from '@ng-nest/ui/input'; +import { XInputComponent } from '@ng-nest/ui/input'; import { DOCUMENT, DatePipe } from '@angular/common'; import { Overlay, @@ -46,7 +50,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; @Component({ selector: `${XDatePickerPrefix}`, standalone: true, - imports: [FormsModule, ReactiveFormsModule, XInputModule], + imports: [FormsModule, ReactiveFormsModule, XInputComponent], templateUrl: './date-picker.component.html', styleUrls: ['./date-picker.component.scss'], encapsulation: ViewEncapsulation.None, @@ -125,7 +129,13 @@ export class XDatePickerComponent extends XDatePickerProperty implements OnInit, private overlay = inject(Overlay); ngOnInit() { - this.setFlex(this.datePicker.nativeElement, this.renderer, this.justify, this.align, this.direction); + this.setFlex( + this.datePicker.nativeElement, + this.renderer, + this.justify, + this.align, + this.direction + ); this.setFormat(); this.setClassMap(); this.setSubject(); @@ -250,7 +260,9 @@ export class XDatePickerComponent extends XDatePickerProperty implements OnInit, getValue() { if (this.numberValue === '') return null; - return ['date', 'string'].includes(this.modelType) ? new Date(this.numberValue) : this.numberValue; + return ['date', 'string'].includes(this.modelType) + ? new Date(this.numberValue) + : this.numberValue; } portalAttached() { @@ -297,10 +309,12 @@ export class XDatePickerComponent extends XDatePickerProperty implements OnInit, 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 XCorner; - place !== this.placement && this.positionChange.next(place); - }); + position.positionChanges + .pipe(takeUntil(this._unSubject)) + .subscribe((pos: ConnectedOverlayPositionChange) => { + const place = XPortalConnectedPosition.get(pos.connectionPair) as XCorner; + place !== this.placement && this.positionChange.next(place); + }); } setInstance() { diff --git a/lib/ng-nest/ui/date-picker/date-range.component.ts b/lib/ng-nest/ui/date-picker/date-range.component.ts index 086b762d3..5743be9d2 100644 --- a/lib/ng-nest/ui/date-picker/date-range.component.ts +++ b/lib/ng-nest/ui/date-picker/date-range.component.ts @@ -31,7 +31,7 @@ import { XDateYearQuarter, XParents } from '@ng-nest/ui/core'; -import { XInputComponent, XInputGroupComponent, XInputModule } from '@ng-nest/ui/input'; +import { XInputComponent, XInputGroupComponent } from '@ng-nest/ui/input'; import { CommonModule, DOCUMENT, DatePipe } from '@angular/common'; import { Overlay, @@ -48,14 +48,17 @@ import { FormsModule } from '@angular/forms'; @Component({ selector: `${XDateRangePrefix}`, standalone: true, - imports: [CommonModule, FormsModule, XInputModule], + imports: [CommonModule, FormsModule, XInputComponent, XInputGroupComponent], templateUrl: './date-range.component.html', styleUrls: ['./date-range.component.scss'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, providers: [XValueAccessor(XDateRangeComponent), DatePipe] }) -export class XDateRangeComponent extends XDateRangeProperty implements OnInit, OnChanges, AfterViewInit, OnDestroy { +export class XDateRangeComponent + extends XDateRangeProperty + implements OnInit, OnChanges, AfterViewInit, OnDestroy +{ @ViewChild('dateRange', { static: true }) dateRange!: ElementRef; @ViewChild('inputGroup', { static: true }) inputGroup!: XInputGroupComponent; @ViewChild('inputStartCom', { static: true }) inputStartCom!: XInputComponent; @@ -157,7 +160,13 @@ export class XDateRangeComponent extends XDateRangeProperty implements OnInit, O configService = inject(XConfigService); ngOnInit() { - this.setFlex(this.dateRange.nativeElement, this.renderer, this.justify, this.align, this.direction); + this.setFlex( + this.dateRange.nativeElement, + this.renderer, + this.justify, + this.align, + this.direction + ); this.setHostTypeClass(); this.setFormat(); this.setClassMap(); @@ -397,10 +406,12 @@ export class XDateRangeComponent extends XDateRangeProperty implements OnInit, O 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 XCorner; - place !== this.placement && this.positionChange.next(place); - }); + position.positionChanges + .pipe(takeUntil(this._unSubject)) + .subscribe((pos: ConnectedOverlayPositionChange) => { + const place = XPortalConnectedPosition.get(pos.connectionPair) as XCorner; + place !== this.placement && this.positionChange.next(place); + }); } setInstance() { diff --git a/lib/ng-nest/ui/dialog/dialog-portal.component.ts b/lib/ng-nest/ui/dialog/dialog-portal.component.ts index 16ba46cb8..e0b030488 100644 --- a/lib/ng-nest/ui/dialog/dialog-portal.component.ts +++ b/lib/ng-nest/ui/dialog/dialog-portal.component.ts @@ -1,4 +1,10 @@ -import { BasePortalOutlet, CdkPortalOutlet, ComponentPortal, TemplatePortal } from '@angular/cdk/portal'; +import { + BasePortalOutlet, + CdkPortalOutlet, + ComponentPortal, + PortalModule, + TemplatePortal +} from '@angular/cdk/portal'; import { ChangeDetectionStrategy, Component, @@ -24,7 +30,7 @@ import { CommonModule } from '@angular/common'; @Component({ selector: 'x-dialog-portal', standalone: true, - imports: [CommonModule, DragDropModule, XResizableDirective], + imports: [CommonModule, DragDropModule, PortalModule, XResizableDirective], templateUrl: './dialog-portal.component.html', styleUrls: ['./dialog-portal.component.scss'], encapsulation: ViewEncapsulation.None, @@ -34,11 +40,25 @@ import { CommonModule } from '@angular/common'; export class XDialogPortalComponent extends BasePortalOutlet { // @HostBinding('class.x-dialog-portal') _has = true; @HostBinding('@x-move-box-animation') public placement?: XDialogAnimationState; - @HostListener('@x-move-box-animation.done', ['$event']) done({ toState, totalTime }: AnimationEvent) { - this.animationChanged.next({ action: 'done', state: toState as XDialogAnimationState, totalTime }); + @HostListener('@x-move-box-animation.done', ['$event']) done({ + toState, + totalTime + }: AnimationEvent) { + this.animationChanged.next({ + action: 'done', + state: toState as XDialogAnimationState, + totalTime + }); } - @HostListener('@x-move-box-animation.start', ['$event']) start({ toState, totalTime }: AnimationEvent) { - this.animationChanged.next({ action: 'start', state: toState as XDialogAnimationState, totalTime }); + @HostListener('@x-move-box-animation.start', ['$event']) start({ + toState, + totalTime + }: AnimationEvent) { + this.animationChanged.next({ + action: 'start', + state: toState as XDialogAnimationState, + totalTime + }); } @ViewChild(CdkPortalOutlet, { static: true }) portalOutlet!: CdkPortalOutlet; @ViewChild(CdkDrag, { static: true }) dragRef!: CdkDrag; @@ -69,8 +89,12 @@ export class XDialogPortalComponent extends BasePortalOutlet { } ngOnInit() { - this.dialogBox['draggable'] = this.defaultMaximize ? this.dialogBox['draggable'] : this.option.draggable; - this.dialogBox['resizable'] = this.defaultMaximize ? this.dialogBox['resizable'] : this.option.resizable; + this.dialogBox['draggable'] = this.defaultMaximize + ? this.dialogBox['draggable'] + : this.option.draggable; + this.dialogBox['resizable'] = this.defaultMaximize + ? this.dialogBox['resizable'] + : this.option.resizable; } ngAfterViewInit() { @@ -100,15 +124,23 @@ export class XDialogPortalComponent extends BasePortalOutlet { } resizing(event: XResizableEvent) { - const contentHeight = Number(this.initContentHeight) + Number(event.clientHeight) - Number(this.initHeight); + const contentHeight = + Number(this.initContentHeight) + Number(event.clientHeight) - Number(this.initHeight); this.renderer.setStyle(this.dialogContent, 'max-height', 'initial'); this.renderer.setStyle(this.dialogContent, 'flex', 'initial'); - if (['top-start', 'top-end', 'bottom', 'top', 'bottom-start', 'bottom-end'].includes(event.direction as string)) { + if ( + ['top-start', 'top-end', 'bottom', 'top', 'bottom-start', 'bottom-end'].includes( + event.direction as string + ) + ) { this.renderer.setStyle(this.dialogContent, 'height', `${contentHeight}px`); } } onDragEnded(event: CdkDragEnd) { - this.distance = { x: this.distance.x + event.distance.x, y: this.distance.y + event.distance.y }; + this.distance = { + x: this.distance.x + event.distance.x, + y: this.distance.y + event.distance.y + }; } } diff --git a/lib/ng-nest/ui/dialog/dialog.component.spec.ts b/lib/ng-nest/ui/dialog/dialog.component.spec.ts index 206b8cd16..c855ecc2f 100644 --- a/lib/ng-nest/ui/dialog/dialog.component.spec.ts +++ b/lib/ng-nest/ui/dialog/dialog.component.spec.ts @@ -7,14 +7,14 @@ 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 { FormsModule } from '@angular/forms'; -import { XInputModule } from '@ng-nest/ui/input'; +import { XInputComponent } from '@ng-nest/ui/input'; import { XRadioModule } 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 { XI18nService, en_US, zh_CN } from '@ng-nest/ui/i18n'; import { interval } from 'rxjs'; -import { XFormModule } from '@ng-nest/ui/form'; +import { XFormComponent } from '@ng-nest/ui/form'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { XDialogComponent } from './dialog.component'; @@ -26,13 +26,13 @@ describe(XDialogPrefix, () => { HttpClientTestingModule, XThemeModule, FormsModule, - XInputModule, + XInputComponent, XRadioModule, XDialogComponent, XButtonComponent, XIconComponent, XLinkComponent, - XFormModule, + XFormComponent, XMessageBoxModule ], declarations: [TestXDialogComponent, TestXDialogDraggableComponent] diff --git a/lib/ng-nest/ui/dialog/examples/en_US/default/custom/custom.component.ts b/lib/ng-nest/ui/dialog/examples/en_US/default/custom/custom.component.ts index 9fc24610c..0c52cec11 100644 --- a/lib/ng-nest/ui/dialog/examples/en_US/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/dialog/examples/en_US/default/custom/custom.component.ts @@ -2,14 +2,14 @@ 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 { XFormControlOption, XFormModule } from '@ng-nest/ui/form'; +import { XFormControlOption, XFormComponent } from '@ng-nest/ui/form'; import { XIconComponent } from '@ng-nest/ui/icon'; import { XLinkComponent } from '@ng-nest/ui/link'; @Component({ selector: 'ex-custom', standalone: true, - imports: [CommonModule, XFormModule, XButtonComponent, XDialogComponent, XIconComponent, XLinkComponent], + imports: [CommonModule, XFormComponent, XButtonComponent, XDialogComponent, XIconComponent, XLinkComponent], templateUrl: './custom.component.html', styleUrls: ['./custom.component.scss'] }) diff --git a/lib/ng-nest/ui/dialog/examples/zh_CN/default/custom/custom.component.ts b/lib/ng-nest/ui/dialog/examples/zh_CN/default/custom/custom.component.ts index 9fc24610c..0c52cec11 100644 --- a/lib/ng-nest/ui/dialog/examples/zh_CN/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/dialog/examples/zh_CN/default/custom/custom.component.ts @@ -2,14 +2,14 @@ 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 { XFormControlOption, XFormModule } from '@ng-nest/ui/form'; +import { XFormControlOption, XFormComponent } from '@ng-nest/ui/form'; import { XIconComponent } from '@ng-nest/ui/icon'; import { XLinkComponent } from '@ng-nest/ui/link'; @Component({ selector: 'ex-custom', standalone: true, - imports: [CommonModule, XFormModule, XButtonComponent, XDialogComponent, XIconComponent, XLinkComponent], + imports: [CommonModule, XFormComponent, XButtonComponent, XDialogComponent, XIconComponent, XLinkComponent], templateUrl: './custom.component.html', styleUrls: ['./custom.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 a3668c944..dd3b1b593 100644 --- a/lib/ng-nest/ui/doc/doc.component.spec.ts +++ b/lib/ng-nest/ui/doc/doc.component.spec.ts @@ -9,10 +9,10 @@ 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 { XExamplesModule } from '@ng-nest/ui/examples'; +import { XExamplesComponent } from '@ng-nest/ui/examples'; import { XApiComponent } from '@ng-nest/ui/api'; import { XTabsModule } from '@ng-nest/ui/tabs'; -import { XHighlightModule } from '@ng-nest/ui/highlight'; +import { XHighlightComponent } from '@ng-nest/ui/highlight'; import { XPatternComponent } from '@ng-nest/ui/pattern'; import { HttpClientTestingModule } from '@angular/common/http/testing'; @@ -29,10 +29,10 @@ describe(XDocPrefix, () => { XColComponent, XBadgeComponent, XButtonComponent, - XExamplesModule, + XExamplesComponent, XApiComponent, XTabsModule, - XHighlightModule, + XHighlightComponent, XPatternComponent ], declarations: [ diff --git a/lib/ng-nest/ui/drawer/drawer.component.spec.ts b/lib/ng-nest/ui/drawer/drawer.component.spec.ts index 24a4b4496..d5ba68826 100644 --- a/lib/ng-nest/ui/drawer/drawer.component.spec.ts +++ b/lib/ng-nest/ui/drawer/drawer.component.spec.ts @@ -7,9 +7,9 @@ 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 { XButtonComponent } from '@ng-nest/ui/button'; +import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; import { XIconComponent } from '@ng-nest/ui/icon'; -import { XInputModule } from '@ng-nest/ui/input'; +import { XInputComponent } from '@ng-nest/ui/input'; import { XPosition } from '@ng-nest/ui/core'; import { XThemeModule } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; @@ -23,10 +23,11 @@ describe(XDrawerPrefix, () => { XThemeModule, XDrawerComponent, FormsModule, - XInputModule, + XInputComponent, XIconComponent, XRadioModule, - XButtonComponent + XButtonComponent, + XButtonsComponent ], declarations: [ TestXDrawerComponent, 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 3e13cae1c..aeec5741d 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 @@ -4,7 +4,7 @@ import { FormsModule } from '@angular/forms'; 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 { XInputModule } from '@ng-nest/ui/input'; +import { XInputComponent } from '@ng-nest/ui/input'; import { XRadioModule } from '@ng-nest/ui/radio'; @Component({ @@ -15,7 +15,7 @@ import { XRadioModule } from '@ng-nest/ui/radio'; FormsModule, XButtonComponent, XButtonsComponent, - XInputModule, + XInputComponent, XRadioModule, XDrawerComponent, XIconComponent 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 3e13cae1c..aeec5741d 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 @@ -4,7 +4,7 @@ import { FormsModule } from '@angular/forms'; 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 { XInputModule } from '@ng-nest/ui/input'; +import { XInputComponent } from '@ng-nest/ui/input'; import { XRadioModule } from '@ng-nest/ui/radio'; @Component({ @@ -15,7 +15,7 @@ import { XRadioModule } from '@ng-nest/ui/radio'; FormsModule, XButtonComponent, XButtonsComponent, - XInputModule, + XInputComponent, XRadioModule, XDrawerComponent, XIconComponent diff --git a/lib/ng-nest/ui/dropdown/dropdown-portal.component.ts b/lib/ng-nest/ui/dropdown/dropdown-portal.component.ts index 453d5c227..72418d7c3 100644 --- a/lib/ng-nest/ui/dropdown/dropdown-portal.component.ts +++ b/lib/ng-nest/ui/dropdown/dropdown-portal.component.ts @@ -22,13 +22,13 @@ import { OverlayConfig } from '@angular/cdk/overlay'; import { CommonModule } from '@angular/common'; -import { XListModule } from '@ng-nest/ui/list'; +import { XListComponent } from '@ng-nest/ui/list'; import { FormsModule } from '@angular/forms'; @Component({ selector: `${XDropdownPortalPrefix}`, standalone: true, - imports: [CommonModule, FormsModule, XListModule], + imports: [CommonModule, FormsModule, XListComponent], templateUrl: './dropdown-portal.component.html', styleUrls: ['./dropdown-portal.component.scss'], encapsulation: ViewEncapsulation.None, diff --git a/lib/ng-nest/ui/dropdown/dropdown.component.spec.ts b/lib/ng-nest/ui/dropdown/dropdown.component.spec.ts index 3390d3ae8..18639c796 100644 --- a/lib/ng-nest/ui/dropdown/dropdown.component.spec.ts +++ b/lib/ng-nest/ui/dropdown/dropdown.component.spec.ts @@ -1,9 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XDropdownComponent } from './dropdown.component'; import { Component, DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { XDropdownModule } from '@ng-nest/ui/dropdown'; +import { XDropdownComponent } from '@ng-nest/ui/dropdown'; import { XDropdownPrefix, XDropdownNode } from './dropdown.property'; import { XLinkComponent } from '@ng-nest/ui/link'; import { XButtonComponent } from '@ng-nest/ui/button'; @@ -15,7 +13,16 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XDropdownPrefix, () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [BrowserAnimationsModule, HttpClientTestingModule, XThemeModule, XDropdownModule, XButtonComponent, XLinkComponent, XRowComponent, XColComponent], + imports: [ + BrowserAnimationsModule, + HttpClientTestingModule, + XThemeModule, + XDropdownComponent, + XButtonComponent, + XLinkComponent, + XRowComponent, + XColComponent + ], declarations: [TestXDropdownComponent] }).compileComponents(); }); @@ -46,17 +53,23 @@ describe(XDropdownPrefix, () => {
- 下拉菜单 + + 下拉菜单 +
- 下拉菜单 + + 下拉菜单 +
- 下拉菜单 + + 下拉菜单 +
`, diff --git a/lib/ng-nest/ui/examples/examples.component.spec.ts b/lib/ng-nest/ui/examples/examples.component.spec.ts index 603dc4026..599517118 100644 --- a/lib/ng-nest/ui/examples/examples.component.spec.ts +++ b/lib/ng-nest/ui/examples/examples.component.spec.ts @@ -1,9 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XExamplesComponent } from './examples.component'; import { Component, DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { XExamplesModule } from '@ng-nest/ui/examples'; +import { XExamplesComponent } from '@ng-nest/ui/examples'; import { XExamplesPrefix } from './examples.property'; import { XTabsModule } from '@ng-nest/ui/tabs'; import { HttpClientTestingModule } from '@angular/common/http/testing'; @@ -11,7 +9,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XExamplesPrefix, () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [XExamplesModule, HttpClientTestingModule, XTabsModule], + imports: [XExamplesComponent, HttpClientTestingModule, XTabsModule], declarations: [TestXExamplesComponent] }).compileComponents(); }); @@ -43,7 +41,8 @@ describe(XExamplesPrefix, () => {

基础的按钮用法。

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

基础的按钮用法。

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

基础的按钮用法。

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

按钮不可用状态。

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

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

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

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

    -
  • 要设置为 loading 状态，只要设置 loading 属性为 true 即可。
    • +
  • + 要设置为 loading 状态，只要设置 loading 属性为 + true 即可。 +
@@ -214,7 +224,10 @@ describe(XExamplesPrefix, () => {
不同尺寸
-

Button 组件提供除了默认值以外的四种尺寸，可以在不同场景下选择合适的按钮尺寸。

+

+ Button + 组件提供除了默认值以外的四种尺寸，可以在不同场景下选择合适的按钮尺寸。 +

  • 额外的尺寸：large、medium、small、mini，通过设置 diff --git a/lib/ng-nest/ui/examples/examples.component.ts b/lib/ng-nest/ui/examples/examples.component.ts index 54f8ec505..f9c971518 100644 --- a/lib/ng-nest/ui/examples/examples.component.ts +++ b/lib/ng-nest/ui/examples/examples.component.ts @@ -1,15 +1,28 @@ -import { Component, ViewEncapsulation, ChangeDetectionStrategy, Renderer2, ElementRef } from '@angular/core'; +import { + Component, + ViewEncapsulation, + ChangeDetectionStrategy, + Renderer2, + ElementRef, + inject, + OnInit +} from '@angular/core'; import { XExamplesPrefix } from './examples.property'; +import { CommonModule } from '@angular/common'; @Component({ selector: `${XExamplesPrefix}`, + standalone: true, + imports: [CommonModule], templateUrl: './examples.component.html', styleUrls: ['./style/index.scss'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush }) -export class XExamplesComponent { - constructor(private renderer: Renderer2, private elementRef: ElementRef) { +export class XExamplesComponent implements OnInit { + renderer = inject(Renderer2); + elementRef = inject(ElementRef); + ngOnInit(): void { this.renderer.addClass(this.elementRef.nativeElement, XExamplesPrefix); } } diff --git a/lib/ng-nest/ui/examples/examples.module.ts b/lib/ng-nest/ui/examples/examples.module.ts index 88489ecb5..6fe5dc626 100644 --- a/lib/ng-nest/ui/examples/examples.module.ts +++ b/lib/ng-nest/ui/examples/examples.module.ts @@ -1,10 +1,8 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { XExamplesComponent } from './examples.component'; @NgModule({ - declarations: [XExamplesComponent], exports: [XExamplesComponent], - imports: [CommonModule] + imports: [XExamplesComponent] }) export class XExamplesModule {} diff --git a/lib/ng-nest/ui/find/examples/en_US/default/bordered/bordered.component.html b/lib/ng-nest/ui/find/examples/en_US/default/bordered/bordered.component.html index 195c4150f..78b3dd941 100644 --- a/lib/ng-nest/ui/find/examples/en_US/default/bordered/bordered.component.html +++ b/lib/ng-nest/ui/find/examples/en_US/default/bordered/bordered.component.html @@ -1,25 +1,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    diff --git a/lib/ng-nest/ui/find/examples/en_US/default/bordered/bordered.component.scss b/lib/ng-nest/ui/find/examples/en_US/default/bordered/bordered.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/find/examples/en_US/default/bordered/bordered.component.scss +++ b/lib/ng-nest/ui/find/examples/en_US/default/bordered/bordered.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/find/examples/en_US/default/bordered/bordered.component.ts b/lib/ng-nest/ui/find/examples/en_US/default/bordered/bordered.component.ts index 4c16d0e2d..617a0bf0e 100644 --- a/lib/ng-nest/ui/find/examples/en_US/default/bordered/bordered.component.ts +++ b/lib/ng-nest/ui/find/examples/en_US/default/bordered/bordered.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XFindComponent } from '@ng-nest/ui/find'; @Component({ selector: 'ex-bordered', + standalone: true, + imports: [FormsModule, XFindComponent], templateUrl: './bordered.component.html', styleUrls: ['./bordered.component.scss'] }) diff --git a/lib/ng-nest/ui/find/examples/en_US/default/default/default.component.html b/lib/ng-nest/ui/find/examples/en_US/default/default/default.component.html index f8dc2205b..31a655237 100644 --- a/lib/ng-nest/ui/find/examples/en_US/default/default/default.component.html +++ b/lib/ng-nest/ui/find/examples/en_US/default/default/default.component.html @@ -1,6 +1,17 @@ - - - - - - +
    + +
    +
    + +
    diff --git a/lib/ng-nest/ui/find/examples/en_US/default/default/default.component.scss b/lib/ng-nest/ui/find/examples/en_US/default/default/default.component.scss new file mode 100644 index 000000000..b4943baa0 --- /dev/null +++ b/lib/ng-nest/ui/find/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/find/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/find/examples/en_US/default/default/default.component.ts index 604824d03..7a13f795a 100644 --- a/lib/ng-nest/ui/find/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/find/examples/en_US/default/default/default.component.ts @@ -2,10 +2,15 @@ import { Component } from '@angular/core'; import { XData, XQuery } from '@ng-nest/ui/core'; import { XTableColumn, XTableRow } from '@ng-nest/ui/table'; import { DefaultService } from './default.service'; +import { FormsModule } from '@angular/forms'; +import { XFindComponent } from '@ng-nest/ui/find'; @Component({ selector: 'ex-default', + standalone: true, + imports: [FormsModule, XFindComponent], templateUrl: './default.component.html', + styleUrls: ['./default.component.scss'], providers: [DefaultService] }) export class ExDefaultComponent { @@ -19,5 +24,6 @@ export class ExDefaultComponent { { id: 'position', label: 'position', flex: 1, sort: true }, { id: 'organization', label: 'organization', flex: 1, sort: true } ]; - tableData: XData = (index: number, size: number, query: XQuery) => this.defaultService.getList(index, size, query); + tableData: XData = (index: number, size: number, query: XQuery) => + this.defaultService.getList(index, size, query); } diff --git a/lib/ng-nest/ui/find/examples/en_US/default/disabled/disabled.component.html b/lib/ng-nest/ui/find/examples/en_US/default/disabled/disabled.component.html index b6d5a05f8..7930273b5 100644 --- a/lib/ng-nest/ui/find/examples/en_US/default/disabled/disabled.component.html +++ b/lib/ng-nest/ui/find/examples/en_US/default/disabled/disabled.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
    + +
    +
    + +
    diff --git a/lib/ng-nest/ui/find/examples/en_US/default/disabled/disabled.component.scss b/lib/ng-nest/ui/find/examples/en_US/default/disabled/disabled.component.scss index 3ec576c8c..b4943baa0 100644 --- a/lib/ng-nest/ui/find/examples/en_US/default/disabled/disabled.component.scss +++ b/lib/ng-nest/ui/find/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/find/examples/en_US/default/disabled/disabled.component.ts b/lib/ng-nest/ui/find/examples/en_US/default/disabled/disabled.component.ts index c9b737d0c..bbcc12ba1 100644 --- a/lib/ng-nest/ui/find/examples/en_US/default/disabled/disabled.component.ts +++ b/lib/ng-nest/ui/find/examples/en_US/default/disabled/disabled.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XFindComponent } from '@ng-nest/ui/find'; @Component({ selector: 'ex-disabled', + standalone: true, + imports: [FormsModule, XFindComponent], templateUrl: './disabled.component.html', styleUrls: ['./disabled.component.scss'] }) diff --git a/lib/ng-nest/ui/find/examples/en_US/default/label/label.component.html b/lib/ng-nest/ui/find/examples/en_US/default/label/label.component.html index 04baf6ea3..ad2aaa0ee 100644 --- a/lib/ng-nest/ui/find/examples/en_US/default/label/label.component.html +++ b/lib/ng-nest/ui/find/examples/en_US/default/label/label.component.html @@ -1,20 +1,12 @@ - - - - - - - - - - - - - - - - - - - - +
    + +
    +
    + +
    +
    + +
    +
    + +
    diff --git a/lib/ng-nest/ui/find/examples/en_US/default/label/label.component.scss b/lib/ng-nest/ui/find/examples/en_US/default/label/label.component.scss index 3ec576c8c..b4943baa0 100644 --- a/lib/ng-nest/ui/find/examples/en_US/default/label/label.component.scss +++ b/lib/ng-nest/ui/find/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/find/examples/en_US/default/label/label.component.ts b/lib/ng-nest/ui/find/examples/en_US/default/label/label.component.ts index 3423f5829..804d325fa 100644 --- a/lib/ng-nest/ui/find/examples/en_US/default/label/label.component.ts +++ b/lib/ng-nest/ui/find/examples/en_US/default/label/label.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XFindComponent } from '@ng-nest/ui/find'; @Component({ selector: 'ex-label', + standalone: true, + imports: [FormsModule, XFindComponent], templateUrl: './label.component.html', styleUrls: ['./label.component.scss'] }) diff --git a/lib/ng-nest/ui/find/examples/en_US/default/size/size.component.html b/lib/ng-nest/ui/find/examples/en_US/default/size/size.component.html index 944f75223..a3c951b1c 100644 --- a/lib/ng-nest/ui/find/examples/en_US/default/size/size.component.html +++ b/lib/ng-nest/ui/find/examples/en_US/default/size/size.component.html @@ -1,26 +1,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - - +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    diff --git a/lib/ng-nest/ui/find/examples/en_US/default/size/size.component.scss b/lib/ng-nest/ui/find/examples/en_US/default/size/size.component.scss index 388331f62..5e83058ed 100644 --- a/lib/ng-nest/ui/find/examples/en_US/default/size/size.component.scss +++ b/lib/ng-nest/ui/find/examples/en_US/default/size/size.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 15rem; - } - x-row:not(:first-child) { + .row { margin-top: 1rem; } } 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 655f60fab..fba3d8044 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 @@ -1,8 +1,13 @@ 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'; @Component({ selector: 'ex-size', + standalone: true, + imports: [FormsModule, XFindComponent, XRadioModule], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/find/examples/en_US/default/tree-table/tree-table.component.html b/lib/ng-nest/ui/find/examples/en_US/default/tree-table/tree-table.component.html index 28ec79f08..00012ecfc 100644 --- a/lib/ng-nest/ui/find/examples/en_US/default/tree-table/tree-table.component.html +++ b/lib/ng-nest/ui/find/examples/en_US/default/tree-table/tree-table.component.html @@ -1,4 +1,4 @@ - +
    - - +
    +
    - +
    diff --git a/lib/ng-nest/ui/find/examples/en_US/default/tree-table/tree-table.component.scss b/lib/ng-nest/ui/find/examples/en_US/default/tree-table/tree-table.component.scss new file mode 100644 index 000000000..b4943baa0 --- /dev/null +++ b/lib/ng-nest/ui/find/examples/en_US/default/tree-table/tree-table.component.scss @@ -0,0 +1,5 @@ +:host { + .row:not(:first-child) { + margin-top: 1rem; + } +} diff --git a/lib/ng-nest/ui/find/examples/en_US/default/tree-table/tree-table.component.ts b/lib/ng-nest/ui/find/examples/en_US/default/tree-table/tree-table.component.ts index a73aa4c54..162ac7392 100644 --- a/lib/ng-nest/ui/find/examples/en_US/default/tree-table/tree-table.component.ts +++ b/lib/ng-nest/ui/find/examples/en_US/default/tree-table/tree-table.component.ts @@ -3,10 +3,15 @@ import { XData, XQuery } from '@ng-nest/ui/core'; import { XTableColumn, XTableRow } from '@ng-nest/ui/table'; import { TreeTableService } from './tree-table.service'; import { TreeService } from './tree.service'; +import { FormsModule } from '@angular/forms'; +import { XFindComponent } from '@ng-nest/ui/find'; @Component({ selector: 'ex-tree-table', + standalone: true, + imports: [FormsModule, XFindComponent], templateUrl: './tree-table.component.html', + styleUrls: ['./tree-table.component.scss'], providers: [TreeTableService, TreeService] }) export class ExTreeTableComponent { @@ -20,5 +25,6 @@ export class ExTreeTableComponent { { id: 'position', label: 'position', flex: 1, sort: true }, { id: 'organization', label: 'organization', flex: 1, sort: true } ]; - tableData: XData = (index: number, size: number, query: XQuery) => this.treeTableService.getList(index, size, query); + tableData: XData = (index: number, size: number, query: XQuery) => + this.treeTableService.getList(index, size, query); } diff --git a/lib/ng-nest/ui/find/examples/en_US/default/tree/tree.component.html b/lib/ng-nest/ui/find/examples/en_US/default/tree/tree.component.html index 64a8212a5..3978d6f3e 100644 --- a/lib/ng-nest/ui/find/examples/en_US/default/tree/tree.component.html +++ b/lib/ng-nest/ui/find/examples/en_US/default/tree/tree.component.html @@ -1,4 +1,15 @@ - - +
    + +
    +
    + +
    diff --git a/lib/ng-nest/ui/find/examples/en_US/default/tree/tree.component.scss b/lib/ng-nest/ui/find/examples/en_US/default/tree/tree.component.scss new file mode 100644 index 000000000..b4943baa0 --- /dev/null +++ b/lib/ng-nest/ui/find/examples/en_US/default/tree/tree.component.scss @@ -0,0 +1,5 @@ +:host { + .row:not(:first-child) { + margin-top: 1rem; + } +} diff --git a/lib/ng-nest/ui/find/examples/en_US/default/tree/tree.component.ts b/lib/ng-nest/ui/find/examples/en_US/default/tree/tree.component.ts index 4bf79b6cb..997d94048 100644 --- a/lib/ng-nest/ui/find/examples/en_US/default/tree/tree.component.ts +++ b/lib/ng-nest/ui/find/examples/en_US/default/tree/tree.component.ts @@ -1,9 +1,14 @@ import { Component } from '@angular/core'; import { TreeService } from './tree.service'; +import { XFindComponent } from '@ng-nest/ui/find'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'ex-tree', + standalone: true, + imports: [FormsModule, XFindComponent], templateUrl: './tree.component.html', + styleUrls: ['./tree.component.scss'], providers: [TreeService] }) export class ExTreeComponent { diff --git a/lib/ng-nest/ui/find/examples/index.ts b/lib/ng-nest/ui/find/examples/index.ts new file mode 100644 index 000000000..c49e3b44e --- /dev/null +++ b/lib/ng-nest/ui/find/examples/index.ts @@ -0,0 +1,7 @@ +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/label/label.component'; +export * from './zh_CN/default/size/size.component'; +export * from './zh_CN/default/tree/tree.component'; +export * from './zh_CN/default/tree-table/tree-table.component'; diff --git a/lib/ng-nest/ui/find/examples/zh_CN/default/bordered/bordered.component.html b/lib/ng-nest/ui/find/examples/zh_CN/default/bordered/bordered.component.html index 3dc54a01a..929ea6f01 100644 --- a/lib/ng-nest/ui/find/examples/zh_CN/default/bordered/bordered.component.html +++ b/lib/ng-nest/ui/find/examples/zh_CN/default/bordered/bordered.component.html @@ -1,25 +1,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    diff --git a/lib/ng-nest/ui/find/examples/zh_CN/default/bordered/bordered.component.scss b/lib/ng-nest/ui/find/examples/zh_CN/default/bordered/bordered.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/find/examples/zh_CN/default/bordered/bordered.component.scss +++ b/lib/ng-nest/ui/find/examples/zh_CN/default/bordered/bordered.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/find/examples/zh_CN/default/bordered/bordered.component.ts b/lib/ng-nest/ui/find/examples/zh_CN/default/bordered/bordered.component.ts index 68616b836..555e46f2d 100644 --- a/lib/ng-nest/ui/find/examples/zh_CN/default/bordered/bordered.component.ts +++ b/lib/ng-nest/ui/find/examples/zh_CN/default/bordered/bordered.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XFindComponent } from '@ng-nest/ui/find'; @Component({ selector: 'ex-bordered', + standalone: true, + imports: [FormsModule, XFindComponent], templateUrl: './bordered.component.html', styleUrls: ['./bordered.component.scss'] }) diff --git a/lib/ng-nest/ui/find/examples/zh_CN/default/default/default.component.html b/lib/ng-nest/ui/find/examples/zh_CN/default/default/default.component.html index 24e1bfdc7..d7b3d9c8c 100644 --- a/lib/ng-nest/ui/find/examples/zh_CN/default/default/default.component.html +++ b/lib/ng-nest/ui/find/examples/zh_CN/default/default/default.component.html @@ -1,6 +1,17 @@ - - - - - - +
    + +
    +
    + +
    diff --git a/lib/ng-nest/ui/find/examples/zh_CN/default/default/default.component.scss b/lib/ng-nest/ui/find/examples/zh_CN/default/default/default.component.scss new file mode 100644 index 000000000..b4943baa0 --- /dev/null +++ b/lib/ng-nest/ui/find/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/find/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/find/examples/zh_CN/default/default/default.component.ts index fd41d1f0f..f377a45f9 100644 --- a/lib/ng-nest/ui/find/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/find/examples/zh_CN/default/default/default.component.ts @@ -2,10 +2,15 @@ import { Component } from '@angular/core'; import { XData, XQuery } from '@ng-nest/ui/core'; import { XTableColumn, XTableRow } from '@ng-nest/ui/table'; import { DefaultService } from './default.service'; +import { FormsModule } from '@angular/forms'; +import { XFindComponent } from '@ng-nest/ui/find'; @Component({ selector: 'ex-default', + standalone: true, + imports: [FormsModule, XFindComponent], templateUrl: './default.component.html', + styleUrls: ['./default.component.scss'], providers: [DefaultService] }) export class ExDefaultComponent { @@ -19,5 +24,6 @@ export class ExDefaultComponent { { id: 'position', label: '职位', flex: 1, sort: true }, { id: 'organization', label: '组织机构', flex: 1, sort: true } ]; - tableData: XData = (index: number, size: number, query: XQuery) => this.defaultService.getList(index, size, query); + tableData: XData = (index: number, size: number, query: XQuery) => + this.defaultService.getList(index, size, query); } diff --git a/lib/ng-nest/ui/find/examples/zh_CN/default/disabled/disabled.component.html b/lib/ng-nest/ui/find/examples/zh_CN/default/disabled/disabled.component.html index b6d5a05f8..7930273b5 100644 --- a/lib/ng-nest/ui/find/examples/zh_CN/default/disabled/disabled.component.html +++ b/lib/ng-nest/ui/find/examples/zh_CN/default/disabled/disabled.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
    + +
    +
    + +
    diff --git a/lib/ng-nest/ui/find/examples/zh_CN/default/disabled/disabled.component.scss b/lib/ng-nest/ui/find/examples/zh_CN/default/disabled/disabled.component.scss index 3ec576c8c..b4943baa0 100644 --- a/lib/ng-nest/ui/find/examples/zh_CN/default/disabled/disabled.component.scss +++ b/lib/ng-nest/ui/find/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/find/examples/zh_CN/default/disabled/disabled.component.ts b/lib/ng-nest/ui/find/examples/zh_CN/default/disabled/disabled.component.ts index 4688511e1..a74b0c21d 100644 --- a/lib/ng-nest/ui/find/examples/zh_CN/default/disabled/disabled.component.ts +++ b/lib/ng-nest/ui/find/examples/zh_CN/default/disabled/disabled.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XFindComponent } from '@ng-nest/ui/find'; @Component({ selector: 'ex-disabled', + standalone: true, + imports: [FormsModule, XFindComponent], templateUrl: './disabled.component.html', styleUrls: ['./disabled.component.scss'] }) diff --git a/lib/ng-nest/ui/find/examples/zh_CN/default/label/label.component.html b/lib/ng-nest/ui/find/examples/zh_CN/default/label/label.component.html index 8e2a9605c..d8732911d 100644 --- a/lib/ng-nest/ui/find/examples/zh_CN/default/label/label.component.html +++ b/lib/ng-nest/ui/find/examples/zh_CN/default/label/label.component.html @@ -1,20 +1,12 @@ - - - - - - - - - - - - - - - - - - - - +
    + +
    +
    + +
    +
    + +
    +
    + +
    diff --git a/lib/ng-nest/ui/find/examples/zh_CN/default/label/label.component.scss b/lib/ng-nest/ui/find/examples/zh_CN/default/label/label.component.scss index 3ec576c8c..b4943baa0 100644 --- a/lib/ng-nest/ui/find/examples/zh_CN/default/label/label.component.scss +++ b/lib/ng-nest/ui/find/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/find/examples/zh_CN/default/label/label.component.ts b/lib/ng-nest/ui/find/examples/zh_CN/default/label/label.component.ts index 3423f5829..804d325fa 100644 --- a/lib/ng-nest/ui/find/examples/zh_CN/default/label/label.component.ts +++ b/lib/ng-nest/ui/find/examples/zh_CN/default/label/label.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XFindComponent } from '@ng-nest/ui/find'; @Component({ selector: 'ex-label', + standalone: true, + imports: [FormsModule, XFindComponent], templateUrl: './label.component.html', styleUrls: ['./label.component.scss'] }) diff --git a/lib/ng-nest/ui/find/examples/zh_CN/default/size/size.component.html b/lib/ng-nest/ui/find/examples/zh_CN/default/size/size.component.html index 8a4fa6650..c7dc0c334 100644 --- a/lib/ng-nest/ui/find/examples/zh_CN/default/size/size.component.html +++ b/lib/ng-nest/ui/find/examples/zh_CN/default/size/size.component.html @@ -1,26 +1,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - - +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    diff --git a/lib/ng-nest/ui/find/examples/zh_CN/default/size/size.component.scss b/lib/ng-nest/ui/find/examples/zh_CN/default/size/size.component.scss index 388331f62..5e83058ed 100644 --- a/lib/ng-nest/ui/find/examples/zh_CN/default/size/size.component.scss +++ b/lib/ng-nest/ui/find/examples/zh_CN/default/size/size.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 15rem; - } - x-row:not(:first-child) { + .row { margin-top: 1rem; } } 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 655f60fab..fba3d8044 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 @@ -1,8 +1,13 @@ 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'; @Component({ selector: 'ex-size', + standalone: true, + imports: [FormsModule, XFindComponent, XRadioModule], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/find/examples/zh_CN/default/tree-table/tree-table.component.html b/lib/ng-nest/ui/find/examples/zh_CN/default/tree-table/tree-table.component.html index 983293b9c..1d9b4a4a0 100644 --- a/lib/ng-nest/ui/find/examples/zh_CN/default/tree-table/tree-table.component.html +++ b/lib/ng-nest/ui/find/examples/zh_CN/default/tree-table/tree-table.component.html @@ -1,5 +1,5 @@ - + - - +
    + - +
    diff --git a/lib/ng-nest/ui/find/examples/zh_CN/default/tree-table/tree-table.component.scss b/lib/ng-nest/ui/find/examples/zh_CN/default/tree-table/tree-table.component.scss new file mode 100644 index 000000000..b4943baa0 --- /dev/null +++ b/lib/ng-nest/ui/find/examples/zh_CN/default/tree-table/tree-table.component.scss @@ -0,0 +1,5 @@ +:host { + .row:not(:first-child) { + margin-top: 1rem; + } +} diff --git a/lib/ng-nest/ui/find/examples/zh_CN/default/tree-table/tree-table.component.ts b/lib/ng-nest/ui/find/examples/zh_CN/default/tree-table/tree-table.component.ts index 6e0b9bede..a3fc0e228 100644 --- a/lib/ng-nest/ui/find/examples/zh_CN/default/tree-table/tree-table.component.ts +++ b/lib/ng-nest/ui/find/examples/zh_CN/default/tree-table/tree-table.component.ts @@ -3,10 +3,15 @@ import { XData, XQuery } from '@ng-nest/ui/core'; import { XTableColumn, XTableRow } from '@ng-nest/ui/table'; import { TreeTableService } from './tree-table.service'; import { TreeService } from './tree.service'; +import { FormsModule } from '@angular/forms'; +import { XFindComponent } from '@ng-nest/ui/find'; @Component({ selector: 'ex-tree-table', + standalone: true, + imports: [FormsModule, XFindComponent], templateUrl: './tree-table.component.html', + styleUrls: ['./tree-table.component.scss'], providers: [TreeTableService, TreeService] }) export class ExTreeTableComponent { @@ -20,5 +25,6 @@ export class ExTreeTableComponent { { id: 'position', label: '职位', flex: 1, sort: true }, { id: 'organization', label: '组织机构', flex: 1, sort: true } ]; - tableData: XData = (index: number, size: number, query: XQuery) => this.treeTableService.getList(index, size, query); + tableData: XData = (index: number, size: number, query: XQuery) => + this.treeTableService.getList(index, size, query); } diff --git a/lib/ng-nest/ui/find/examples/zh_CN/default/tree/tree.component.html b/lib/ng-nest/ui/find/examples/zh_CN/default/tree/tree.component.html index a2b89ea40..cde3c3ee4 100644 --- a/lib/ng-nest/ui/find/examples/zh_CN/default/tree/tree.component.html +++ b/lib/ng-nest/ui/find/examples/zh_CN/default/tree/tree.component.html @@ -1,4 +1,11 @@ - - +
    + +
    +
    + +
    diff --git a/lib/ng-nest/ui/find/examples/zh_CN/default/tree/tree.component.scss b/lib/ng-nest/ui/find/examples/zh_CN/default/tree/tree.component.scss new file mode 100644 index 000000000..b4943baa0 --- /dev/null +++ b/lib/ng-nest/ui/find/examples/zh_CN/default/tree/tree.component.scss @@ -0,0 +1,5 @@ +:host { + .row:not(:first-child) { + margin-top: 1rem; + } +} diff --git a/lib/ng-nest/ui/find/examples/zh_CN/default/tree/tree.component.ts b/lib/ng-nest/ui/find/examples/zh_CN/default/tree/tree.component.ts index 4bf79b6cb..997d94048 100644 --- a/lib/ng-nest/ui/find/examples/zh_CN/default/tree/tree.component.ts +++ b/lib/ng-nest/ui/find/examples/zh_CN/default/tree/tree.component.ts @@ -1,9 +1,14 @@ import { Component } from '@angular/core'; import { TreeService } from './tree.service'; +import { XFindComponent } from '@ng-nest/ui/find'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'ex-tree', + standalone: true, + imports: [FormsModule, XFindComponent], templateUrl: './tree.component.html', + styleUrls: ['./tree.component.scss'], providers: [TreeService] }) export class ExTreeComponent { diff --git a/lib/ng-nest/ui/find/find.component.html b/lib/ng-nest/ui/find/find.component.html index 3b1c83c6f..fe7ce3828 100644 --- a/lib/ng-nest/ui/find/find.component.html +++ b/lib/ng-nest/ui/find/find.component.html @@ -8,7 +8,13 @@ [class.x-invalid]="invalid" [ngClass]="classMap" > - +
    - {{ - value[columnLabel] - }} + {{ value[columnLabel] }}
@@ -46,6 +58,7 @@ [width]="dialogWidth" [height]="dialogHeight" [buttonsCenter]="dialogButtonsCenter" + [className]="'x-find-dialog-container'" [(visible)]="dialogVisible" (visibleChange)="dialogVisibleChange.emit($event)" (closeDone)="dialogCloseDone()" @@ -54,7 +67,12 @@ (confirm)="sure()" >
-
+
- - {{ search.button || '查询' }} + + {{ + search.button || '查询' + }}
-
+
- + {{ item[columnLabel] }}
diff --git a/lib/ng-nest/ui/find/find.component.scss b/lib/ng-nest/ui/find/find.component.scss index a884f5199..183ab2389 100644 --- a/lib/ng-nest/ui/find/find.component.scss +++ b/lib/ng-nest/ui/find/find.component.scss @@ -13,6 +13,12 @@ @include find-dialog(); } +.#{$--x-find-prefix}-dialog-container { + .x-dialog-content { + overflow: initial; + } +} + .#{$--x-find-prefix}-search { display: flex; padding: 0.3rem; @@ -23,4 +29,4 @@ .x-button { margin-left: 0.5rem; } -} \ No newline at end of file +} diff --git a/lib/ng-nest/ui/find/find.component.spec.ts b/lib/ng-nest/ui/find/find.component.spec.ts index 7803cc114..90409affb 100644 --- a/lib/ng-nest/ui/find/find.component.spec.ts +++ b/lib/ng-nest/ui/find/find.component.spec.ts @@ -1,9 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XFindComponent } from './find.component'; import { Component, DebugElement, ChangeDetectorRef, Injectable } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { XFindModule } from '@ng-nest/ui/find'; +import { XFindComponent } from '@ng-nest/ui/find'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { XFindPrefix, XFindSearchOption } from './find.property'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; @@ -34,7 +32,7 @@ describe(XFindPrefix, () => { BrowserAnimationsModule, HttpClientTestingModule, XThemeModule, - XFindModule, + XFindComponent, FormsModule, ReactiveFormsModule, XRowComponent, diff --git a/lib/ng-nest/ui/find/find.component.ts b/lib/ng-nest/ui/find/find.component.ts index 96e09440d..130138ba8 100644 --- a/lib/ng-nest/ui/find/find.component.ts +++ b/lib/ng-nest/ui/find/find.component.ts @@ -7,27 +7,63 @@ import { Renderer2, ElementRef, ViewChild, - SimpleChanges + SimpleChanges, + inject, + OnChanges, + AfterViewInit, + OnDestroy } from '@angular/core'; import { XFindProperty, XFindPrefix } from './find.property'; -import { XClearClass, XResize, XIsUndefined, XIsChange, XConfigService, XIsEmpty, XResizeObserver } from '@ng-nest/ui/core'; -import { XTableComponent, XTableRow } from '@ng-nest/ui/table'; +import { + XClearClass, + XResize, + XIsUndefined, + XIsChange, + XConfigService, + XIsEmpty, + XResizeObserver +} from '@ng-nest/ui/core'; +import { XTableComponent, XTableRow, XTableModule } 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 } from '@ng-nest/ui/tree'; -import { XValueAccessor } from '@ng-nest/ui/base-form'; +import { XTreeNode, XTreeComponent, XTreeModule } from '@ng-nest/ui/tree'; +import { XValueAccessor, XControlValueAccessor } from '@ng-nest/ui/base-form'; +import { XTagModule } 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'; +import { CommonModule } from '@angular/common'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; @Component({ selector: `${XFindPrefix}`, + standalone: true, + imports: [ + CommonModule, + FormsModule, + ReactiveFormsModule, + XTagModule, + XButtonComponent, + XDialogComponent, + XTableModule, + XTreeModule, + XIconComponent, + XEmptyComponent, + XInputComponent, + XControlValueAccessor + ], templateUrl: './find.component.html', styleUrls: ['./find.component.scss'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, providers: [XValueAccessor(XFindComponent)] }) -export class XFindComponent extends XFindProperty implements OnInit { +export class XFindComponent + extends XFindProperty + implements OnInit, OnChanges, AfterViewInit, OnDestroy +{ @ViewChild('find', { static: true }) find!: ElementRef; @ViewChild('dialogCom') dialogCom!: XDialogComponent; @ViewChild('tableCom') tableCom!: XTableComponent; @@ -68,7 +104,9 @@ export class XFindComponent extends XFindProperty implements OnInit { get hasTree() { return ( - (Array.isArray(this.treeData) && this.treeData.length > 0) || this.treeData instanceof Function || this.treeData instanceof Observable + (Array.isArray(this.treeData) && this.treeData.length > 0) || + this.treeData instanceof Function || + this.treeData instanceof Observable ); } @@ -95,9 +133,9 @@ export class XFindComponent extends XFindProperty implements OnInit { 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(simples: SimpleChanges) { const { tableData, labelAlign, size } = simples; @@ -322,7 +360,10 @@ export class XFindComponent extends XFindProperty implements OnInit { field.value = node.id; field.operation = '='; } else { - this.tableQuery.filter = [...this.tableQuery.filter, { field: this.treeTableConnect, value: node.id, operation: '=' }]; + this.tableQuery.filter = [ + ...this.tableQuery.filter, + { field: this.treeTableConnect, value: node.id, operation: '=' } + ]; } this.tableCom.change(1); this.treeActivatedId = node.id; diff --git a/lib/ng-nest/ui/find/find.module.ts b/lib/ng-nest/ui/find/find.module.ts index b7bf3f7f1..0e0498a2f 100644 --- a/lib/ng-nest/ui/find/find.module.ts +++ b/lib/ng-nest/ui/find/find.module.ts @@ -1,34 +1,8 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { XFindComponent } from './find.component'; -import { XFindProperty } from './find.property'; -import { XButtonComponent } from '@ng-nest/ui/button'; -import { XDialogComponent } from '@ng-nest/ui/dialog'; -import { XTableModule } from '@ng-nest/ui/table'; -import { XTagModule } from '@ng-nest/ui/tag'; -import { XEmptyComponent } from '@ng-nest/ui/empty'; -import { XTreeModule } from '@ng-nest/ui/tree'; -import { XIconComponent } from '@ng-nest/ui/icon'; -import { XControlValueAccessor } from '@ng-nest/ui/base-form'; -import { XInputModule } from '@ng-nest/ui/input'; @NgModule({ - declarations: [XFindComponent, XFindProperty], exports: [XFindComponent], - imports: [ - CommonModule, - FormsModule, - ReactiveFormsModule, - XTagModule, - XButtonComponent, - XDialogComponent, - XTableModule, - XTreeModule, - XIconComponent, - XEmptyComponent, - XInputModule, - XControlValueAccessor - ] + imports: [XFindComponent] }) export class XFindModule {} diff --git a/lib/ng-nest/ui/form/control.component.ts b/lib/ng-nest/ui/form/control.component.ts index 307e4a96b..6848291bf 100644 --- a/lib/ng-nest/ui/form/control.component.ts +++ b/lib/ng-nest/ui/form/control.component.ts @@ -7,7 +7,8 @@ import { ChangeDetectorRef, OnInit, AfterViewInit, - OnDestroy + OnDestroy, + inject } from '@angular/core'; import { XControlProperty, @@ -46,21 +47,70 @@ import { XAutoCompleteControl, XAutoCompleteControlOption } from './form.property'; -import { FormControlName, Validators, UntypedFormControl, ValidatorFn, ControlValueAccessor, FormControlStatus } from '@angular/forms'; +import { + FormControlName, + Validators, + UntypedFormControl, + ValidatorFn, + ControlValueAccessor, + FormControlStatus, + FormsModule, + ReactiveFormsModule +} from '@angular/forms'; import { XIsEmpty, XConfigService, XIsFunction } from '@ng-nest/ui/core'; import { Subject } from 'rxjs'; import { map, takeUntil } from 'rxjs/operators'; 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 { 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 { XTimePickerModule } from '@ng-nest/ui/time-picker'; +import { XTextareaModule } from '@ng-nest/ui/textarea'; +import { XFindComponent } from '@ng-nest/ui/find'; +import { XAutoCompleteComponent } from '@ng-nest/ui/auto-complete'; @Component({ selector: 'x-control', + standalone: true, + imports: [ + CommonModule, + FormsModule, + ReactiveFormsModule, + XInputComponent, + XSelectModule, + XCascadeComponent, + XCheckboxComponent, + XColorPickerComponent, + XDatePickerComponent, + XInputNumberComponent, + XRadioModule, + XRateModule, + XSliderSelectModule, + XSwitchModule, + XTimePickerModule, + XTextareaModule, + XFindComponent, + XAutoCompleteComponent + ], templateUrl: './control.component.html', styleUrls: ['./control.component.scss'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush }) -export class XControlComponent extends XControlProperty implements OnInit, AfterViewInit, OnDestroy { +export class XControlComponent + extends XControlProperty + implements OnInit, AfterViewInit, OnDestroy +{ @Input() override option!: XFormControlOption; @Input() form: any; @ViewChild(FormControlName) control!: FormControlName; @@ -71,15 +121,9 @@ export class XControlComponent extends XControlProperty implements OnInit, After private _validatorFns: ValidatorFn[] = []; private _unSubject = new Subject(); private _formControl!: UntypedFormControl; - - constructor( - // @Host() @Optional() public form: XFormComponent, - public cdr: ChangeDetectorRef, - public configService: XConfigService, - public i18n: XI18nService - ) { - super(); - } + private cdr = inject(ChangeDetectorRef); + private i18n = inject(XI18nService); + configService = inject(XConfigService); ngOnInit() { this.option = { ...this.option }; @@ -87,7 +131,9 @@ export class XControlComponent extends XControlProperty implements OnInit, After if (XIsEmpty(this.option.label)) this.option.label = ''; this.option.label = `${this.option.label}${this.form.labelSuffix}`; this._control = this.createControl(this.option); - this._formControl = new UntypedFormControl(this._control.value, { nonNullable: this._control.nonNullable }); + this._formControl = new UntypedFormControl(this._control.value, { + nonNullable: this._control.nonNullable + }); this.setValidators(); this._formControl.statusChanges.pipe(takeUntil(this._unSubject)).subscribe((x) => { this.setMessages(x); @@ -116,7 +162,8 @@ export class XControlComponent extends XControlProperty implements OnInit, After ngAfterViewInit() { Object.assign(this.control.valueAccessor!, this._control as ControlValueAccessor); this.form.controlTypes[this._control.id] = this._control; - this.form.controlComponents[this._control.id] = this.control.valueAccessor as XFormControlComponent; + this.form.controlComponents[this._control.id] = this.control + .valueAccessor as XFormControlComponent; this.form.controlComponents[this._control.id].formControlChanges(); } @@ -139,7 +186,10 @@ export class XControlComponent extends XControlProperty implements OnInit, After this.setPattern(); } if (XIsFunction(this._control.inputValidator)) { - this._validatorFns = [...this._validatorFns, XFormInputValidator(this._control.inputValidator!)]; + this._validatorFns = [ + ...this._validatorFns, + XFormInputValidator(this._control.inputValidator!) + ]; } this._formControl.setValidators(this._validatorFns); this._formControl.updateValueAndValidity(); @@ -157,13 +207,18 @@ export class XControlComponent extends XControlProperty implements OnInit, After this._validatorFns = [...this._validatorFns, Validators.pattern(pt)]; } } else { - this._validatorFns = [...this._validatorFns, Validators.pattern(this._control.pattern as RegExp)]; + this._validatorFns = [ + ...this._validatorFns, + Validators.pattern(this._control.pattern as RegExp) + ]; } } getPatternMsg(pattern: string) { if (Array.isArray(this._control.pattern)) { - return (this._control.message as Array)[this._control.pattern.findIndex((x) => String(x) === pattern)]; + return (this._control.message as Array)[ + this._control.pattern.findIndex((x) => String(x) === pattern) + ]; } else { return this._control.message; } @@ -178,7 +233,10 @@ export class XControlComponent extends XControlProperty implements OnInit, After if (key === 'required') { messages = [...messages, `${label} ${this.locale?.required || 'required'}`]; } else if (key === 'pattern') { - messages = [...messages, `${label} ${this.getPatternMsg(control.errors[key].requiredPattern)}`]; + messages = [ + ...messages, + `${label} ${this.getPatternMsg(control.errors[key].requiredPattern)}` + ]; } else if (key === 'inputValidator') { messages = [...messages, `${label} ${this._control.message}`]; } diff --git a/lib/ng-nest/ui/form/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/form/examples/en_US/default/default/default.component.ts index 9cb9a5179..b25dda9a8 100644 --- a/lib/ng-nest/ui/form/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/form/examples/en_US/default/default/default.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { XFormRow } from '@ng-nest/ui/form'; +import { XFormComponent, XFormRow } from '@ng-nest/ui/form'; import { XData, XQuery } from '@ng-nest/ui/core'; import { XCalendarNode } from '@ng-nest/ui/calendar'; import { XCheckboxNode } from '@ng-nest/ui/checkbox'; @@ -49,10 +49,23 @@ const DATA_CASCADE: XData = [ const DATA_CHECKBOX: XData = ['QQ', 'WeChat', 'DingTalk', 'Weibo']; -const DATA_SELECT: XData = ['AAAA', 'BBBB', 'CCCC', 'DDDD', 'EEEE', 'FFFF', 'GGGG', 'HHHH', 'IIII', 'JJJJ']; +const DATA_SELECT: XData = [ + 'AAAA', + 'BBBB', + 'CCCC', + 'DDDD', + 'EEEE', + 'FFFF', + 'GGGG', + 'HHHH', + 'IIII', + 'JJJJ' +]; @Component({ selector: 'ex-default', + standalone: true, + imports: [XFormComponent], templateUrl: './default.component.html', providers: [DefaultService, TreeService] }) @@ -65,13 +78,44 @@ export class ExDefaultComponent { icon: 'fto-list', controls: [ { id: 'cascade', control: 'cascade', label: 'defalut', span: 8, data: DATA_CASCADE }, - { id: 'cascadeDisabled', control: 'cascade', label: 'disabled', span: 8, data: DATA_CASCADE, value: 22, disabled: true }, - { id: 'cascadeRequired', control: 'cascade', label: 'required', span: 8, data: DATA_CASCADE, required: true }, - { id: 'cascadePlaceholder', control: 'cascade', label: 'prompt select', span: 8, data: DATA_CASCADE, placeholder: '请选择城市' } + { + id: 'cascadeDisabled', + control: 'cascade', + label: 'disabled', + span: 8, + data: DATA_CASCADE, + value: 22, + disabled: true + }, + { + id: 'cascadeRequired', + control: 'cascade', + label: 'required', + span: 8, + data: DATA_CASCADE, + required: true + }, + { + id: 'cascadePlaceholder', + control: 'cascade', + label: 'prompt select', + span: 8, + data: DATA_CASCADE, + placeholder: '请选择城市' + } ] }, { - controls: [{ control: 'cascade', id: 'cascadeRow', label: 'label position', direction: 'row', span: 8, data: DATA_CASCADE }] + controls: [ + { + control: 'cascade', + id: 'cascadeRow', + label: 'label position', + direction: 'row', + span: 8, + data: DATA_CASCADE + } + ] }, { title: 'Checkbox', @@ -135,9 +179,28 @@ export class ExDefaultComponent { icon: 'fto-list', controls: [ { control: 'color-picker', id: 'colorPicker', label: 'defalut', span: 8 }, - { control: 'color-picker', id: 'colorPickerDisabled', label: 'disabled', span: 8, value: '#1976d2', disabled: true }, - { control: 'color-picker', id: 'colorPickerRequired', label: 'required', span: 8, required: true }, - { control: 'color-picker', id: 'colorPickerPlaceholder', label: 'prompt select', span: 8, placeholder: '请选择颜色' } + { + control: 'color-picker', + id: 'colorPickerDisabled', + label: 'disabled', + span: 8, + value: '#1976d2', + disabled: true + }, + { + control: 'color-picker', + id: 'colorPickerRequired', + label: 'required', + span: 8, + required: true + }, + { + control: 'color-picker', + id: 'colorPickerPlaceholder', + label: 'prompt select', + span: 8, + placeholder: '请选择颜色' + } ] }, { @@ -145,11 +208,42 @@ export class ExDefaultComponent { icon: 'fto-list', controls: [ { control: 'date-picker', id: 'datePicker', label: 'defalut', span: 8 }, - { control: 'date-picker', id: 'datePickerDisabled', label: 'disabled', span: 8, value: '2020-05-19', disabled: true }, - { control: 'date-picker', id: 'datePickerRequired', label: 'required', span: 8, required: true }, - { control: 'date-picker', id: 'datePickerPlaceholder', label: 'prompt select', span: 8, placeholder: '请选择日期' }, - { control: 'date-picker', id: 'datePickerYear', label: 'select year', span: 8, type: 'year' }, - { control: 'date-picker', id: 'datePickerMonth', label: 'select month', span: 8, type: 'month' } + { + control: 'date-picker', + id: 'datePickerDisabled', + label: 'disabled', + span: 8, + value: '2020-05-19', + disabled: true + }, + { + control: 'date-picker', + id: 'datePickerRequired', + label: 'required', + span: 8, + required: true + }, + { + control: 'date-picker', + id: 'datePickerPlaceholder', + label: 'prompt select', + span: 8, + placeholder: '请选择日期' + }, + { + control: 'date-picker', + id: 'datePickerYear', + label: 'select year', + span: 8, + type: 'year' + }, + { + control: 'date-picker', + id: 'datePickerMonth', + label: 'select month', + span: 8, + type: 'month' + } ] }, { @@ -157,10 +251,37 @@ export class ExDefaultComponent { icon: 'fto-list', controls: [ { control: 'input-number', id: 'inputNumber', label: 'defalut', span: 8 }, - { control: 'input-number', id: 'inputNumberDisabled', label: 'disabled', span: 8, value: 20, disabled: true }, - { control: 'input-number', id: 'inputNumberRequired', label: 'required', span: 8, required: true }, - { control: 'input-number', id: 'inputNumberMinMax', label: 'restricted size (-10 to 10)', span: 8, min: -10, max: 10 }, - { control: 'input-number', id: 'inputNumberPrecision', label: 'precision', span: 8, precision: 2, step: 0.1 } + { + control: 'input-number', + id: 'inputNumberDisabled', + label: 'disabled', + span: 8, + value: 20, + disabled: true + }, + { + control: 'input-number', + id: 'inputNumberRequired', + label: 'required', + span: 8, + required: true + }, + { + control: 'input-number', + id: 'inputNumberMinMax', + label: 'restricted size (-10 to 10)', + span: 8, + min: -10, + max: 10 + }, + { + control: 'input-number', + id: 'inputNumberPrecision', + label: 'precision', + span: 8, + precision: 2, + step: 0.1 + } ] }, { @@ -245,9 +366,31 @@ export class ExDefaultComponent { icon: 'fto-list', controls: [ { control: 'radio', id: 'radio', label: 'defalut', span: 8, data: DATA_CHECKBOX }, - { control: 'radio', id: 'radioDisabled', label: 'disabled', span: 8, data: DATA_CHECKBOX, value: 'QQ', disabled: true }, - { control: 'radio', id: 'radioRequired', label: 'will choose', span: 8, data: DATA_CHECKBOX, required: true }, - { control: 'radio', id: 'radioButton', label: 'button style', span: 8, data: DATA_CHECKBOX, button: true }, + { + control: 'radio', + id: 'radioDisabled', + label: 'disabled', + span: 8, + data: DATA_CHECKBOX, + value: 'QQ', + disabled: true + }, + { + control: 'radio', + id: 'radioRequired', + label: 'will choose', + span: 8, + data: DATA_CHECKBOX, + required: true + }, + { + control: 'radio', + id: 'radioButton', + label: 'button style', + span: 8, + data: DATA_CHECKBOX, + button: true + }, { control: 'radio', id: 'radioButtonDisabled', @@ -301,9 +444,31 @@ export class ExDefaultComponent { icon: 'fto-list', controls: [ { control: 'select', id: 'select', label: 'defalut', span: 8, data: DATA_SELECT }, - { control: 'select', id: 'selectDisabled', label: 'disabled', span: 8, data: DATA_SELECT, value: 'BBBB', disabled: true }, - { control: 'select', id: 'selectRequired', label: 'required', span: 8, data: DATA_SELECT, required: true }, - { control: 'select', id: 'selectPlaceholder', label: 'prompt select', span: 8, data: DATA_SELECT, placeholder: 'select city' }, + { + control: 'select', + id: 'selectDisabled', + label: 'disabled', + span: 8, + data: DATA_SELECT, + value: 'BBBB', + disabled: true + }, + { + control: 'select', + id: 'selectRequired', + label: 'required', + span: 8, + data: DATA_SELECT, + required: true + }, + { + control: 'select', + id: 'selectPlaceholder', + label: 'prompt select', + span: 8, + data: DATA_SELECT, + placeholder: 'select city' + }, { control: 'select', id: 'selectAsync', @@ -425,7 +590,8 @@ export class ExDefaultComponent { { id: 'position', label: 'position', flex: 1, sort: true }, { id: 'organization', label: 'organization', flex: 1, sort: true } ], - tableData: (index: number, size: number, query: XQuery) => this.defaultService.getList(index, size, query), + tableData: (index: number, size: number, query: XQuery) => + this.defaultService.getList(index, size, query), label: 'table single select', span: 8 }, @@ -438,7 +604,8 @@ export class ExDefaultComponent { { id: 'position', label: 'position', flex: 1, sort: true }, { id: 'organization', label: 'organization', flex: 1, sort: true } ], - tableData: (index: number, size: number, query: XQuery) => this.defaultService.getList(index, size, query), + tableData: (index: number, size: number, query: XQuery) => + this.defaultService.getList(index, size, query), multiple: true, label: 'table multiple select', span: 8 @@ -459,7 +626,8 @@ export class ExDefaultComponent { { id: 'position', label: 'position', flex: 1, sort: true }, { id: 'organization', label: 'organization', flex: 1, sort: true } ], - tableData: (index: number, size: number, query: XQuery) => this.defaultService.getList(index, size, query), + tableData: (index: number, size: number, query: XQuery) => + this.defaultService.getList(index, size, query), treeData: this.treeService.getTreeList, treeTableConnect: 'organizationId', label: 'tree table single select', @@ -475,7 +643,8 @@ export class ExDefaultComponent { { id: 'position', label: 'position', flex: 1, sort: true }, { id: 'organization', label: 'organization', flex: 1, sort: true } ], - tableData: (index: number, size: number, query: XQuery) => this.defaultService.getList(index, size, query), + tableData: (index: number, size: number, query: XQuery) => + this.defaultService.getList(index, size, query), treeData: this.treeService.getTreeList, treeTableConnect: 'organizationId', multiple: true, @@ -499,7 +668,8 @@ export class ExDefaultComponent { { id: 'position', label: 'position', flex: 1, sort: true }, { id: 'organization', label: 'organization', flex: 1, sort: true } ], - tableData: (index: number, size: number, query: XQuery) => this.defaultService.getList(index, size, query), + tableData: (index: number, size: number, query: XQuery) => + this.defaultService.getList(index, size, query), label: 'required', span: 8, required: true diff --git a/lib/ng-nest/ui/form/examples/en_US/default/form-vaild/form-vaild.component.ts b/lib/ng-nest/ui/form/examples/en_US/default/form-vaild/form-vaild.component.ts index 76473630a..bd79f9ee8 100644 --- a/lib/ng-nest/ui/form/examples/en_US/default/form-vaild/form-vaild.component.ts +++ b/lib/ng-nest/ui/form/examples/en_US/default/form-vaild/form-vaild.component.ts @@ -1,10 +1,13 @@ +import { CommonModule } from '@angular/common'; import { Component, ViewChild } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; import { XControl, XFormComponent } from '@ng-nest/ui/form'; @Component({ selector: 'ex-form-vaild', - templateUrl: './form-vaild.component.html', - providers: [] + standalone: true, + imports: [CommonModule, XButtonComponent, XFormComponent], + templateUrl: './form-vaild.component.html' }) export class ExFormVaildComponent { constructor() {} diff --git a/lib/ng-nest/ui/form/examples/en_US/default/label-row/label-row.component.ts b/lib/ng-nest/ui/form/examples/en_US/default/label-row/label-row.component.ts index 83e0483c8..0a201c001 100644 --- a/lib/ng-nest/ui/form/examples/en_US/default/label-row/label-row.component.ts +++ b/lib/ng-nest/ui/form/examples/en_US/default/label-row/label-row.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; -import { XControl } from '@ng-nest/ui/form'; +import { XControl, XFormComponent } from '@ng-nest/ui/form'; @Component({ selector: 'ex-label-row', + standalone: true, + imports: [XFormComponent], templateUrl: './label-row.component.html' }) export class ExLabelRowComponent { @@ -41,7 +43,13 @@ export class ExLabelRowComponent { id: 'file', label: 'file' }, - { control: 'select', id: 'type', label: 'role', data: ['ordinary user', 'administrator', 'sales'], value: 'administrator' }, + { + control: 'select', + id: 'type', + label: 'role', + data: ['ordinary user', 'administrator', 'sales'], + value: 'administrator' + }, { control: 'cascade', id: 'city', diff --git a/lib/ng-nest/ui/form/examples/en_US/default/title/title.component.ts b/lib/ng-nest/ui/form/examples/en_US/default/title/title.component.ts index b713b28ed..d3a4a051c 100644 --- a/lib/ng-nest/ui/form/examples/en_US/default/title/title.component.ts +++ b/lib/ng-nest/ui/form/examples/en_US/default/title/title.component.ts @@ -1,14 +1,23 @@ import { Component } from '@angular/core'; -import { XControl } from '@ng-nest/ui/form'; +import { XControl, XFormComponent } from '@ng-nest/ui/form'; @Component({ selector: 'ex-title', + standalone: true, + imports: [XFormComponent], templateUrl: './title.component.html' }) export class ExTitleComponent { controls: XControl[] = [ { control: 'input', id: 'name', label: 'name', required: true, maxlength: 10 }, - { control: 'input', id: 'id', label: 'code', disabled: true, value: '001001001', required: true }, + { + control: 'input', + id: 'id', + label: 'code', + disabled: true, + value: '001001001', + required: true + }, { control: 'input', id: 'account', @@ -50,6 +59,12 @@ export class ExTitleComponent { { control: 'switch', id: 'disabled', label: 'disabled' }, { control: 'time-picker', id: 'time', label: 'time', required: true }, { control: 'slider-select', id: 'process', label: 'process', required: true }, - { control: 'checkbox', id: 'hobby', label: 'hobby', data: ['table tennis', 'basketball', 'football'], required: true } + { + control: 'checkbox', + id: 'hobby', + label: 'hobby', + data: ['table tennis', 'basketball', 'football'], + required: true + } ]; } diff --git a/lib/ng-nest/ui/form/examples/index.ts b/lib/ng-nest/ui/form/examples/index.ts new file mode 100644 index 000000000..ec25da12b --- /dev/null +++ b/lib/ng-nest/ui/form/examples/index.ts @@ -0,0 +1,4 @@ +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/form-vaild/form-vaild.component'; +export * from './zh_CN/default/label-row/label-row.component'; +export * from './zh_CN/default/title/title.component'; diff --git a/lib/ng-nest/ui/form/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/form/examples/zh_CN/default/default/default.component.ts index 87c3f6445..efc8eafaf 100644 --- a/lib/ng-nest/ui/form/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/form/examples/zh_CN/default/default/default.component.ts @@ -1,5 +1,5 @@ import { Component } from '@angular/core'; -import { XFormRow } from '@ng-nest/ui/form'; +import { XFormComponent, XFormRow } from '@ng-nest/ui/form'; import { XData, XQuery } from '@ng-nest/ui/core'; import { XCalendarNode } from '@ng-nest/ui/calendar'; import { XCheckboxNode } from '@ng-nest/ui/checkbox'; @@ -49,10 +49,23 @@ const DATA_CASCADE: XData = [ const DATA_CHECKBOX: XData = ['QQ', '微信', '钉钉', '微博']; -const DATA_SELECT: XData = ['AAAA', 'BBBB', 'CCCC', 'DDDD', 'EEEE', 'FFFF', 'GGGG', 'HHHH', 'IIII', 'JJJJ']; +const DATA_SELECT: XData = [ + 'AAAA', + 'BBBB', + 'CCCC', + 'DDDD', + 'EEEE', + 'FFFF', + 'GGGG', + 'HHHH', + 'IIII', + 'JJJJ' +]; @Component({ selector: 'ex-default', + standalone: true, + imports: [XFormComponent], templateUrl: './default.component.html', providers: [DefaultService, TreeService] }) @@ -65,13 +78,44 @@ export class ExDefaultComponent { icon: 'fto-list', controls: [ { id: 'cascade', control: 'cascade', label: '默认', span: 8, data: DATA_CASCADE }, - { id: 'cascadeDisabled', control: 'cascade', label: '禁用', span: 8, data: DATA_CASCADE, value: 22, disabled: true }, - { id: 'cascadeRequired', control: 'cascade', label: '必填', span: 8, data: DATA_CASCADE, required: true }, - { id: 'cascadePlaceholder', control: 'cascade', label: '提示选择', span: 8, data: DATA_CASCADE, placeholder: '请选择城市' } + { + id: 'cascadeDisabled', + control: 'cascade', + label: '禁用', + span: 8, + data: DATA_CASCADE, + value: 22, + disabled: true + }, + { + id: 'cascadeRequired', + control: 'cascade', + label: '必填', + span: 8, + data: DATA_CASCADE, + required: true + }, + { + id: 'cascadePlaceholder', + control: 'cascade', + label: '提示选择', + span: 8, + data: DATA_CASCADE, + placeholder: '请选择城市' + } ] }, { - controls: [{ control: 'cascade', id: 'cascadeRow', label: '标签位置', direction: 'row', span: 8, data: DATA_CASCADE }] + controls: [ + { + control: 'cascade', + id: 'cascadeRow', + label: '标签位置', + direction: 'row', + span: 8, + data: DATA_CASCADE + } + ] }, { title: 'Checkbox 多选框', @@ -135,9 +179,28 @@ export class ExDefaultComponent { icon: 'fto-list', controls: [ { control: 'color-picker', id: 'colorPicker', label: '默认', span: 8 }, - { control: 'color-picker', id: 'colorPickerDisabled', label: '禁用', span: 8, value: '#1976d2', disabled: true }, - { control: 'color-picker', id: 'colorPickerRequired', label: '必填', span: 8, required: true }, - { control: 'color-picker', id: 'colorPickerPlaceholder', label: '提示选择', span: 8, placeholder: '请选择颜色' } + { + control: 'color-picker', + id: 'colorPickerDisabled', + label: '禁用', + span: 8, + value: '#1976d2', + disabled: true + }, + { + control: 'color-picker', + id: 'colorPickerRequired', + label: '必填', + span: 8, + required: true + }, + { + control: 'color-picker', + id: 'colorPickerPlaceholder', + label: '提示选择', + span: 8, + placeholder: '请选择颜色' + } ] }, { @@ -145,9 +208,28 @@ export class ExDefaultComponent { icon: 'fto-list', controls: [ { control: 'date-picker', id: 'datePicker', label: '默认', span: 8 }, - { control: 'date-picker', id: 'datePickerDisabled', label: '禁用', span: 8, value: '2020-05-19', disabled: true }, - { control: 'date-picker', id: 'datePickerRequired', label: '必填', span: 8, required: true }, - { control: 'date-picker', id: 'datePickerPlaceholder', label: '提示选择', span: 8, placeholder: '请选择日期' }, + { + control: 'date-picker', + id: 'datePickerDisabled', + label: '禁用', + span: 8, + value: '2020-05-19', + disabled: true + }, + { + control: 'date-picker', + id: 'datePickerRequired', + label: '必填', + span: 8, + required: true + }, + { + control: 'date-picker', + id: 'datePickerPlaceholder', + label: '提示选择', + span: 8, + placeholder: '请选择日期' + }, { control: 'date-picker', id: 'datePickerYear', label: '选年', span: 8, type: 'year' }, { control: 'date-picker', id: 'datePickerMonth', label: '选月', span: 8, type: 'month' } ] @@ -157,10 +239,37 @@ export class ExDefaultComponent { icon: 'fto-list', controls: [ { control: 'input-number', id: 'inputNumber', label: '默认', span: 8 }, - { control: 'input-number', id: 'inputNumberDisabled', label: '禁用', span: 8, value: 20, disabled: true }, - { control: 'input-number', id: 'inputNumberRequired', label: '必填', span: 8, required: true }, - { control: 'input-number', id: 'inputNumberMinMax', label: '限制大小( -10 至 10 )', span: 8, min: -10, max: 10 }, - { control: 'input-number', id: 'inputNumberPrecision', label: '精度', span: 8, precision: 2, step: 0.1 } + { + control: 'input-number', + id: 'inputNumberDisabled', + label: '禁用', + span: 8, + value: 20, + disabled: true + }, + { + control: 'input-number', + id: 'inputNumberRequired', + label: '必填', + span: 8, + required: true + }, + { + control: 'input-number', + id: 'inputNumberMinMax', + label: '限制大小( -10 至 10 )', + span: 8, + min: -10, + max: 10 + }, + { + control: 'input-number', + id: 'inputNumberPrecision', + label: '精度', + span: 8, + precision: 2, + step: 0.1 + } ] }, { @@ -245,9 +354,31 @@ export class ExDefaultComponent { icon: 'fto-list', controls: [ { control: 'radio', id: 'radio', label: '默认', span: 8, data: DATA_CHECKBOX }, - { control: 'radio', id: 'radioDisabled', label: '禁用', span: 8, data: DATA_CHECKBOX, value: 'QQ', disabled: true }, - { control: 'radio', id: 'radioRequired', label: '必选', span: 8, data: DATA_CHECKBOX, required: true }, - { control: 'radio', id: 'radioButton', label: '按钮样式', span: 8, data: DATA_CHECKBOX, button: true }, + { + control: 'radio', + id: 'radioDisabled', + label: '禁用', + span: 8, + data: DATA_CHECKBOX, + value: 'QQ', + disabled: true + }, + { + control: 'radio', + id: 'radioRequired', + label: '必选', + span: 8, + data: DATA_CHECKBOX, + required: true + }, + { + control: 'radio', + id: 'radioButton', + label: '按钮样式', + span: 8, + data: DATA_CHECKBOX, + button: true + }, { control: 'radio', id: 'radioButtonDisabled', @@ -258,7 +389,15 @@ export class ExDefaultComponent { value: 'QQ', disabled: true }, - { control: 'radio', id: 'radioButtonRequired', label: '按钮必选', span: 8, data: DATA_CHECKBOX, button: true, required: true } + { + control: 'radio', + id: 'radioButtonRequired', + label: '按钮必选', + span: 8, + data: DATA_CHECKBOX, + button: true, + required: true + } ] }, { @@ -293,9 +432,31 @@ export class ExDefaultComponent { icon: 'fto-list', controls: [ { control: 'select', id: 'select', label: '默认', span: 8, data: DATA_SELECT }, - { control: 'select', id: 'selectDisabled', label: '禁用', span: 8, data: DATA_SELECT, value: 'BBBB', disabled: true }, - { control: 'select', id: 'selectRequired', label: '必填', span: 8, data: DATA_SELECT, required: true }, - { control: 'select', id: 'selectPlaceholder', label: '提示选择', span: 8, data: DATA_SELECT, placeholder: '请选择城市' }, + { + control: 'select', + id: 'selectDisabled', + label: '禁用', + span: 8, + data: DATA_SELECT, + value: 'BBBB', + disabled: true + }, + { + control: 'select', + id: 'selectRequired', + label: '必填', + span: 8, + data: DATA_SELECT, + required: true + }, + { + control: 'select', + id: 'selectPlaceholder', + label: '提示选择', + span: 8, + data: DATA_SELECT, + placeholder: '请选择城市' + }, { control: 'select', id: 'selectAsync', @@ -417,7 +578,8 @@ export class ExDefaultComponent { { id: 'position', label: '职位', flex: 1, sort: true }, { id: 'organization', label: '组织机构', flex: 1, sort: true } ], - tableData: (index: number, size: number, query: XQuery) => this.defaultService.getList(index, size, query), + tableData: (index: number, size: number, query: XQuery) => + this.defaultService.getList(index, size, query), label: '表格单选', span: 8 }, @@ -430,7 +592,8 @@ export class ExDefaultComponent { { id: 'position', label: '职位', flex: 1, sort: true }, { id: 'organization', label: '组织机构', flex: 1, sort: true } ], - tableData: (index: number, size: number, query: XQuery) => this.defaultService.getList(index, size, query), + tableData: (index: number, size: number, query: XQuery) => + this.defaultService.getList(index, size, query), multiple: true, label: '表格多选', span: 8 @@ -451,7 +614,8 @@ export class ExDefaultComponent { { id: 'position', label: '职位', flex: 1, sort: true }, { id: 'organization', label: '组织机构', flex: 1, sort: true } ], - tableData: (index: number, size: number, query: XQuery) => this.defaultService.getList(index, size, query), + tableData: (index: number, size: number, query: XQuery) => + this.defaultService.getList(index, size, query), treeData: this.treeService.getTreeList, treeTableConnect: 'organizationId', label: '树+表格单选', @@ -467,7 +631,8 @@ export class ExDefaultComponent { { id: 'position', label: '职位', flex: 1, sort: true }, { id: 'organization', label: '组织机构', flex: 1, sort: true } ], - tableData: (index: number, size: number, query: XQuery) => this.defaultService.getList(index, size, query), + tableData: (index: number, size: number, query: XQuery) => + this.defaultService.getList(index, size, query), treeData: this.treeService.getTreeList, treeTableConnect: 'organizationId', multiple: true, @@ -491,7 +656,8 @@ export class ExDefaultComponent { { id: 'position', label: '职位', flex: 1, sort: true }, { id: 'organization', label: '组织机构', flex: 1, sort: true } ], - tableData: (index: number, size: number, query: XQuery) => this.defaultService.getList(index, size, query), + tableData: (index: number, size: number, query: XQuery) => + this.defaultService.getList(index, size, query), label: '必填', span: 8, required: true diff --git a/lib/ng-nest/ui/form/examples/zh_CN/default/form-vaild/form-vaild.component.ts b/lib/ng-nest/ui/form/examples/zh_CN/default/form-vaild/form-vaild.component.ts index d7630ac4a..a913f4c71 100644 --- a/lib/ng-nest/ui/form/examples/zh_CN/default/form-vaild/form-vaild.component.ts +++ b/lib/ng-nest/ui/form/examples/zh_CN/default/form-vaild/form-vaild.component.ts @@ -1,14 +1,15 @@ +import { CommonModule } from '@angular/common'; import { Component, ViewChild } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; import { XControl, XFormComponent } from '@ng-nest/ui/form'; @Component({ selector: 'ex-form-vaild', - templateUrl: './form-vaild.component.html', - providers: [] + standalone: true, + imports: [CommonModule, XButtonComponent, XFormComponent], + templateUrl: './form-vaild.component.html' }) export class ExFormVaildComponent { - constructor() {} - @ViewChild('form') form!: XFormComponent; @ViewChild('manualForm') manualForm!: XFormComponent; diff --git a/lib/ng-nest/ui/form/examples/zh_CN/default/label-row/label-row.component.ts b/lib/ng-nest/ui/form/examples/zh_CN/default/label-row/label-row.component.ts index 888953456..948759bcd 100644 --- a/lib/ng-nest/ui/form/examples/zh_CN/default/label-row/label-row.component.ts +++ b/lib/ng-nest/ui/form/examples/zh_CN/default/label-row/label-row.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; -import { XControl } from '@ng-nest/ui/form'; +import { XControl, XFormComponent } from '@ng-nest/ui/form'; @Component({ selector: 'ex-label-row', + standalone: true, + imports: [XFormComponent], templateUrl: './label-row.component.html' }) export class ExLabelRowComponent { @@ -41,7 +43,13 @@ export class ExLabelRowComponent { id: 'file', label: '文件' }, - { control: 'select', id: 'type', label: '角色', data: ['普通用户', '管理员', '销售'], value: '管理员' }, + { + control: 'select', + id: 'type', + label: '角色', + data: ['普通用户', '管理员', '销售'], + value: '管理员' + }, { control: 'cascade', id: 'city', diff --git a/lib/ng-nest/ui/form/examples/zh_CN/default/title/title.component.ts b/lib/ng-nest/ui/form/examples/zh_CN/default/title/title.component.ts index 3eb7a89e4..336ed48d8 100644 --- a/lib/ng-nest/ui/form/examples/zh_CN/default/title/title.component.ts +++ b/lib/ng-nest/ui/form/examples/zh_CN/default/title/title.component.ts @@ -1,14 +1,23 @@ import { Component } from '@angular/core'; -import { XControl } from '@ng-nest/ui/form'; +import { XControl, XFormComponent } from '@ng-nest/ui/form'; @Component({ selector: 'ex-title', + standalone: true, + imports: [XFormComponent], templateUrl: './title.component.html' }) export class ExTitleComponent { controls: XControl[] = [ { control: 'input', id: 'name', label: '姓名', required: true, maxlength: 10 }, - { control: 'input', id: 'id', label: '编码', disabled: true, value: '001001001', required: true }, + { + control: 'input', + id: 'id', + label: '编码', + disabled: true, + value: '001001001', + required: true + }, { control: 'input', id: 'account', @@ -19,7 +28,14 @@ export class ExTitleComponent { }, { control: 'input', id: 'password', label: '密码', type: 'password', required: true }, { control: 'input', id: 'file', label: '文件', required: true }, - { control: 'select', id: 'type', label: '角色', data: ['普通用户', '管理员', '销售'], value: '管理员', required: true }, + { + control: 'select', + id: 'type', + label: '角色', + data: ['普通用户', '管理员', '销售'], + value: '管理员', + required: true + }, { control: 'cascade', id: 'city', @@ -43,6 +59,12 @@ export class ExTitleComponent { { control: 'switch', id: 'disabled', label: '禁用' }, { control: 'time-picker', id: 'time', label: '时间', required: true }, { control: 'slider-select', id: 'process', label: '进度', required: true }, - { control: 'checkbox', id: 'active', label: '爱好', data: ['乒乓球', '篮球', '足球'], required: true } + { + control: 'checkbox', + id: 'active', + label: '爱好', + data: ['乒乓球', '篮球', '足球'], + required: true + } ]; } diff --git a/lib/ng-nest/ui/form/form.component.spec.ts b/lib/ng-nest/ui/form/form.component.spec.ts index b2400eed3..7cb3db254 100644 --- a/lib/ng-nest/ui/form/form.component.spec.ts +++ b/lib/ng-nest/ui/form/form.component.spec.ts @@ -3,7 +3,7 @@ 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 { XFormModule } from '@ng-nest/ui/form'; +import { XFormComponent } from '@ng-nest/ui/form'; import { XFormPrefix, XControl, XFormRow } from './form.property'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { XData, XRepositoryAbstract, XQuery, XResultList, XGroupItem, XFilter, XChunk, XSort, XId, XOrderBy } from '@ng-nest/ui/core'; @@ -18,7 +18,7 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XFormPrefix, () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [BrowserAnimationsModule, HttpClientTestingModule, XButtonComponent, XFormModule], + imports: [BrowserAnimationsModule, HttpClientTestingModule, XButtonComponent, XFormComponent], declarations: [TestXFormComponent, TestXFormRowComponent, TestXFormTitleComponent] }).compileComponents(); }); diff --git a/lib/ng-nest/ui/form/form.component.ts b/lib/ng-nest/ui/form/form.component.ts index 684c7e0a4..b4b3b6de2 100644 --- a/lib/ng-nest/ui/form/form.component.ts +++ b/lib/ng-nest/ui/form/form.component.ts @@ -1,4 +1,13 @@ -import { Component, OnInit, ViewEncapsulation, ChangeDetectionStrategy, ChangeDetectorRef, SimpleChanges } from '@angular/core'; +import { + Component, + OnInit, + ViewEncapsulation, + ChangeDetectionStrategy, + SimpleChanges, + inject, + OnChanges, + AfterViewInit +} from '@angular/core'; import { XFormProperty, XFormRow, @@ -9,23 +18,37 @@ import { XFormControlType } from './form.property'; import { XIsChange, XBoolean, XConfigService } from '@ng-nest/ui/core'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { XColComponent, XRowComponent } from '@ng-nest/ui/layout'; +import { CommonModule } from '@angular/common'; +import { XOutletDirective } from '@ng-nest/ui/outlet'; +import { XControlComponent } from './control.component'; +import { XIconComponent } from '@ng-nest/ui/icon'; @Component({ selector: `${XFormPrefix}`, + standalone: true, + imports: [ + CommonModule, + FormsModule, + ReactiveFormsModule, + XRowComponent, + XColComponent, + XOutletDirective, + XIconComponent, + XControlComponent + ], templateUrl: './form.component.html', styleUrls: ['./form.component.scss'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush }) -export class XFormComponent extends XFormProperty implements OnInit { +export class XFormComponent extends XFormProperty implements OnInit, OnChanges, AfterViewInit { controlsType!: 'controls' | 'rows'; controlComponents: { [property: string]: XFormControlComponent } = {}; controlTypes: { [property: string]: XFormControlType } = {}; formId = Number(Math.random().toString().substring(2, 6) + Date.now()).toString(36); - - constructor(public cdr: ChangeDetectorRef, public configService: XConfigService) { - super(); - } + configService = inject(XConfigService); ngOnChanges(changes: SimpleChanges) { const { disabled } = changes; diff --git a/lib/ng-nest/ui/form/form.module.ts b/lib/ng-nest/ui/form/form.module.ts index cf64aa132..1ef5cb367 100644 --- a/lib/ng-nest/ui/form/form.module.ts +++ b/lib/ng-nest/ui/form/form.module.ts @@ -1,57 +1,9 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { XFormComponent } from './form.component'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { XControlComponent } from './control.component'; -import { XFormProperty, XControlProperty } from './form.property'; -import { XInputModule } from '@ng-nest/ui/input'; -import { XSelectModule } 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 { XInputNumberModule } 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 { XTimePickerModule } from '@ng-nest/ui/time-picker'; -import { XIconComponent } from '@ng-nest/ui/icon'; -import { XFindModule } from '@ng-nest/ui/find'; -import { XTextareaModule } from '@ng-nest/ui/textarea'; -import { XOutletDirective } from '@ng-nest/ui/outlet'; -import { XControlValueAccessor } from '@ng-nest/ui/base-form'; -import { XAutoCompleteComponent } from '@ng-nest/ui/auto-complete'; -import { XI18nDirective } from '@ng-nest/ui/i18n'; - -const modules = [ - XRowComponent, - XColComponent, - XIconComponent, - XInputModule, - XSelectModule, - XCascadeComponent, - XCheckboxComponent, - XColorPickerComponent, - XDatePickerComponent, - XInputNumberModule, - XRadioModule, - XRateModule, - XSliderSelectModule, - XSwitchModule, - XTimePickerModule, - XTextareaModule, - XFindModule, - XAutoCompleteComponent, - XOutletDirective, - XControlValueAccessor, - XI18nDirective -]; @NgModule({ - declarations: [XFormComponent, XControlComponent, XFormProperty, XControlProperty], exports: [XFormComponent, XControlComponent], - imports: [CommonModule, FormsModule, ReactiveFormsModule, ...modules] + imports: [XFormComponent, XControlComponent] }) export class XFormModule {} diff --git a/lib/ng-nest/ui/highlight/examples/en_US/default/copy/copy.component.ts b/lib/ng-nest/ui/highlight/examples/en_US/default/copy/copy.component.ts index 279c7b10f..2b9a75851 100644 --- a/lib/ng-nest/ui/highlight/examples/en_US/default/copy/copy.component.ts +++ b/lib/ng-nest/ui/highlight/examples/en_US/default/copy/copy.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XHighlightComponent } from '@ng-nest/ui/highlight'; @Component({ selector: 'ex-copy', + standalone: true, + imports: [XHighlightComponent], templateUrl: './copy.component.html' }) export class ExCopyComponent { diff --git a/lib/ng-nest/ui/highlight/examples/en_US/default/html/html.component.ts b/lib/ng-nest/ui/highlight/examples/en_US/default/html/html.component.ts index 5209dfc38..361db9c83 100644 --- a/lib/ng-nest/ui/highlight/examples/en_US/default/html/html.component.ts +++ b/lib/ng-nest/ui/highlight/examples/en_US/default/html/html.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XHighlightComponent } from '@ng-nest/ui/highlight'; @Component({ selector: 'ex-html', + standalone: true, + imports: [XHighlightComponent], templateUrl: './html.component.html' }) export class ExHtmlComponent { diff --git a/lib/ng-nest/ui/highlight/examples/en_US/default/scss/scss.component.ts b/lib/ng-nest/ui/highlight/examples/en_US/default/scss/scss.component.ts index 0b40587fe..cd282d73e 100644 --- a/lib/ng-nest/ui/highlight/examples/en_US/default/scss/scss.component.ts +++ b/lib/ng-nest/ui/highlight/examples/en_US/default/scss/scss.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XHighlightComponent } from '@ng-nest/ui/highlight'; @Component({ selector: 'ex-scss', + standalone: true, + imports: [XHighlightComponent], templateUrl: './scss.component.html' }) export class ExScssComponent { diff --git a/lib/ng-nest/ui/highlight/examples/en_US/default/typescript/typescript.component.ts b/lib/ng-nest/ui/highlight/examples/en_US/default/typescript/typescript.component.ts index b11d45fc9..d8e27b45d 100644 --- a/lib/ng-nest/ui/highlight/examples/en_US/default/typescript/typescript.component.ts +++ b/lib/ng-nest/ui/highlight/examples/en_US/default/typescript/typescript.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XHighlightComponent } from '@ng-nest/ui/highlight'; @Component({ selector: 'ex-typescript', + standalone: true, + imports: [XHighlightComponent], templateUrl: './typescript.component.html' }) export class ExTypescriptComponent { diff --git a/lib/ng-nest/ui/highlight/examples/index.ts b/lib/ng-nest/ui/highlight/examples/index.ts new file mode 100644 index 000000000..25572bbd7 --- /dev/null +++ b/lib/ng-nest/ui/highlight/examples/index.ts @@ -0,0 +1,4 @@ +export * from './zh_CN/default/copy/copy.component'; +export * from './zh_CN/default/html/html.component'; +export * from './zh_CN/default/scss/scss.component'; +export * from './zh_CN/default/typescript/typescript.component'; diff --git a/lib/ng-nest/ui/highlight/examples/zh_CN/default/copy/copy.component.ts b/lib/ng-nest/ui/highlight/examples/zh_CN/default/copy/copy.component.ts index 279c7b10f..2b9a75851 100644 --- a/lib/ng-nest/ui/highlight/examples/zh_CN/default/copy/copy.component.ts +++ b/lib/ng-nest/ui/highlight/examples/zh_CN/default/copy/copy.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XHighlightComponent } from '@ng-nest/ui/highlight'; @Component({ selector: 'ex-copy', + standalone: true, + imports: [XHighlightComponent], templateUrl: './copy.component.html' }) export class ExCopyComponent { diff --git a/lib/ng-nest/ui/highlight/examples/zh_CN/default/html/html.component.ts b/lib/ng-nest/ui/highlight/examples/zh_CN/default/html/html.component.ts index 5209dfc38..361db9c83 100644 --- a/lib/ng-nest/ui/highlight/examples/zh_CN/default/html/html.component.ts +++ b/lib/ng-nest/ui/highlight/examples/zh_CN/default/html/html.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XHighlightComponent } from '@ng-nest/ui/highlight'; @Component({ selector: 'ex-html', + standalone: true, + imports: [XHighlightComponent], templateUrl: './html.component.html' }) export class ExHtmlComponent { diff --git a/lib/ng-nest/ui/highlight/examples/zh_CN/default/scss/scss.component.ts b/lib/ng-nest/ui/highlight/examples/zh_CN/default/scss/scss.component.ts index 0b40587fe..cd282d73e 100644 --- a/lib/ng-nest/ui/highlight/examples/zh_CN/default/scss/scss.component.ts +++ b/lib/ng-nest/ui/highlight/examples/zh_CN/default/scss/scss.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XHighlightComponent } from '@ng-nest/ui/highlight'; @Component({ selector: 'ex-scss', + standalone: true, + imports: [XHighlightComponent], templateUrl: './scss.component.html' }) export class ExScssComponent { diff --git a/lib/ng-nest/ui/highlight/examples/zh_CN/default/typescript/typescript.component.ts b/lib/ng-nest/ui/highlight/examples/zh_CN/default/typescript/typescript.component.ts index b11d45fc9..d8e27b45d 100644 --- a/lib/ng-nest/ui/highlight/examples/zh_CN/default/typescript/typescript.component.ts +++ b/lib/ng-nest/ui/highlight/examples/zh_CN/default/typescript/typescript.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XHighlightComponent } from '@ng-nest/ui/highlight'; @Component({ selector: 'ex-typescript', + standalone: true, + imports: [XHighlightComponent], templateUrl: './typescript.component.html' }) export class ExTypescriptComponent { diff --git a/lib/ng-nest/ui/highlight/highlight.component.spec.ts b/lib/ng-nest/ui/highlight/highlight.component.spec.ts index 44d58ae74..7e3f42ad3 100644 --- a/lib/ng-nest/ui/highlight/highlight.component.spec.ts +++ b/lib/ng-nest/ui/highlight/highlight.component.spec.ts @@ -1,9 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XHighlightComponent } from './highlight.component'; import { Component, DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { XHighlightModule } from '@ng-nest/ui/highlight'; +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'; @@ -12,7 +10,12 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XHighlightPrefix, () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [BrowserAnimationsModule, HttpClientTestingModule, XThemeModule, XHighlightModule], + imports: [ + BrowserAnimationsModule, + HttpClientTestingModule, + XThemeModule, + XHighlightComponent + ], declarations: [TestXHighlightComponent] }).compileComponents(); }); @@ -34,7 +37,12 @@ describe(XHighlightPrefix, () => { selector: 'test-x-highlight', template: ` - + `, styles: [ ` diff --git a/lib/ng-nest/ui/highlight/highlight.component.ts b/lib/ng-nest/ui/highlight/highlight.component.ts index babce02b2..1a9005025 100644 --- a/lib/ng-nest/ui/highlight/highlight.component.ts +++ b/lib/ng-nest/ui/highlight/highlight.component.ts @@ -8,52 +8,44 @@ import { ViewChild, ChangeDetectorRef, SimpleChanges, - Inject, inject, - PLATFORM_ID + PLATFORM_ID, + OnInit } from '@angular/core'; import { XHighlightPrefix, XHighlightProperty } from './highlight.property'; import { XIsChange, XIsEmpty } from '@ng-nest/ui/core'; import { DomSanitizer, SafeHtml } from '@angular/platform-browser'; -import { DOCUMENT, isPlatformBrowser } from '@angular/common'; +import { CommonModule, isPlatformBrowser } from '@angular/common'; import { delay, of } from 'rxjs'; +import { XButtonComponent } from '@ng-nest/ui/button'; @Component({ selector: `${XHighlightPrefix}`, + standalone: true, + imports: [CommonModule, XButtonComponent], templateUrl: './highlight.component.html', styleUrls: ['./style/index.scss'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush }) -export class XHighlightComponent extends XHighlightProperty implements OnChanges { +export class XHighlightComponent extends XHighlightProperty implements OnInit, OnChanges { @ViewChild('code') codeRef!: ElementRef; display!: SafeHtml; lines: string[] = []; lineHeight = 1.1875; - - document: Document; iconCopy = 'fto-copy'; platformId = inject(PLATFORM_ID); - isBrowser = true; - - prism: any; + isBrowser = isPlatformBrowser(this.platformId); + prism = this.isBrowser ? (window as any)['Prism'] : null; + private elementRef = inject(ElementRef); + private renderer = inject(Renderer2); + private cdr = inject(ChangeDetectorRef); + private sanitizer = inject(DomSanitizer); - constructor( - public elementRef: ElementRef, - public renderer: Renderer2, - public cdr: ChangeDetectorRef, - public sanitizer: DomSanitizer, - @Inject(DOCUMENT) document: any - ) { - super(); + ngOnInit(): void { this.renderer.addClass(this.elementRef.nativeElement, XHighlightPrefix); - this.document = document; - this.isBrowser = isPlatformBrowser(this.platformId); - if (this.isBrowser) { - this.prism = (window as any)['Prism']; - } } ngOnChanges(changes: SimpleChanges): void { diff --git a/lib/ng-nest/ui/highlight/highlight.module.ts b/lib/ng-nest/ui/highlight/highlight.module.ts index 7e9100f9d..abaaefa52 100644 --- a/lib/ng-nest/ui/highlight/highlight.module.ts +++ b/lib/ng-nest/ui/highlight/highlight.module.ts @@ -1,12 +1,8 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { XHighlightComponent } from './highlight.component'; -import { XHighlightProperty } from './highlight.property'; -import { XButtonComponent } from '@ng-nest/ui/button'; @NgModule({ - declarations: [XHighlightComponent, XHighlightProperty], exports: [XHighlightComponent], - imports: [CommonModule, XButtonComponent] + imports: [XHighlightComponent] }) export class XHighlightModule {} diff --git a/lib/ng-nest/ui/i18n/i18n.service.ts b/lib/ng-nest/ui/i18n/i18n.service.ts index a43994c4f..8da55fca3 100644 --- a/lib/ng-nest/ui/i18n/i18n.service.ts +++ b/lib/ng-nest/ui/i18n/i18n.service.ts @@ -1,4 +1,4 @@ -import { Injectable, Optional, Inject } from '@angular/core'; +import { Injectable, inject } from '@angular/core'; import zh_CN from './languages/zh_CN'; import { XI18nProperty, X_I18N } from './i18n.property'; @@ -15,8 +15,10 @@ export class XI18nService { return this._change.asObservable(); } - constructor(@Optional() @Inject(X_I18N) locale: XI18nProperty) { - this.setLocale(locale || zh_CN); + private locale = inject(X_I18N, { optional: true }); + + constructor() { + this.setLocale(this.locale || zh_CN); } translate(path: string, data?: any) { diff --git a/lib/ng-nest/ui/icon/icon.module.ts b/lib/ng-nest/ui/icon/icon.module.ts index c911cd4f4..2f9baf16e 100644 --- a/lib/ng-nest/ui/icon/icon.module.ts +++ b/lib/ng-nest/ui/icon/icon.module.ts @@ -1,10 +1,8 @@ import { NgModule } from '@angular/core'; import { XIconComponent } from './icon.component'; -import { XIconService } from './icon.service'; @NgModule({ exports: [XIconComponent], - imports: [XIconComponent], - providers: [XIconService] + imports: [XIconComponent] }) export class XIconModule {} diff --git a/lib/ng-nest/ui/icon/icon.service.ts b/lib/ng-nest/ui/icon/icon.service.ts index 05dee226d..c50480423 100644 --- a/lib/ng-nest/ui/icon/icon.service.ts +++ b/lib/ng-nest/ui/icon/icon.service.ts @@ -1,4 +1,4 @@ -import { Injectable, Optional, SecurityContext } from '@angular/core'; +import { Injectable, SecurityContext, inject } from '@angular/core'; import { DomSanitizer } from '@angular/platform-browser'; import { HttpClient } from '@angular/common/http'; import { Observable, Subscriber } from 'rxjs'; @@ -12,16 +12,18 @@ type Task = { }; // @dynamic -@Injectable() +@Injectable({ providedIn: 'root' }) export class XIconService { caches: { [property: string]: any } = {}; queue: Task[] = []; activeTaskXm: number = 0; isRunningTask = false; limit: number = 10; + sanitizer = inject(DomSanitizer); + http = inject(HttpClient, { optional: true })!; - constructor(private sanitizer: DomSanitizer, @Optional() private http: HttpClient) { - if (!http) { + constructor() { + if (!this.http) { throw new Error( `${XIconPrefix}: Not found 'HttpClient', You can import 'HttpClientModule' in your root module.` ); diff --git a/lib/ng-nest/ui/image/examples/en_US/default/custom/custom.component.scss b/lib/ng-nest/ui/image/examples/en_US/default/custom/custom.component.scss deleted file mode 100644 index dc9093b45..000000000 --- a/lib/ng-nest/ui/image/examples/en_US/default/custom/custom.component.scss +++ /dev/null @@ -1,2 +0,0 @@ -:host { -} diff --git a/lib/ng-nest/ui/image/examples/en_US/default/custom/custom.component.ts b/lib/ng-nest/ui/image/examples/en_US/default/custom/custom.component.ts index e13c45154..a3454a911 100644 --- a/lib/ng-nest/ui/image/examples/en_US/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/image/examples/en_US/default/custom/custom.component.ts @@ -1,11 +1,13 @@ import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; import { XDialogService } from '@ng-nest/ui/dialog'; import { XImagePreviewComponent } from '@ng-nest/ui/image'; @Component({ selector: 'ex-custom', - templateUrl: './custom.component.html', - styleUrls: ['./custom.component.scss'] + standalone: true, + imports: [XButtonComponent], + templateUrl: './custom.component.html' }) export class ExCustomComponent { constructor(private dialogSewrvice: XDialogService) {} @@ -14,7 +16,11 @@ export class ExCustomComponent { width: '100%', height: '100%', className: 'x-image-preview-portal', - data: [{ src: 'https://ngnest.com/static/docs/course/rbac/1-introduction/demo/1__ng-nest-admin/light.png' }] + data: [ + { + src: 'https://ngnest.com/static/docs/course/rbac/1-introduction/demo/1__ng-nest-admin/light.png' + } + ] }); } } diff --git a/lib/ng-nest/ui/image/examples/en_US/default/default/default.component.scss b/lib/ng-nest/ui/image/examples/en_US/default/default/default.component.scss deleted file mode 100644 index dc9093b45..000000000 --- a/lib/ng-nest/ui/image/examples/en_US/default/default/default.component.scss +++ /dev/null @@ -1,2 +0,0 @@ -:host { -} diff --git a/lib/ng-nest/ui/image/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/image/examples/en_US/default/default/default.component.ts index cae54f2a5..42d41f612 100644 --- a/lib/ng-nest/ui/image/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/image/examples/en_US/default/default/default.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; +import { XImageComponent } from '@ng-nest/ui/image'; @Component({ selector: 'ex-default', - templateUrl: './default.component.html', - styleUrls: ['./default.component.scss'] + standalone: true, + imports: [XImageComponent], + templateUrl: './default.component.html' }) export class ExDefaultComponent {} diff --git a/lib/ng-nest/ui/image/examples/en_US/default/fallback/fallback.component.scss b/lib/ng-nest/ui/image/examples/en_US/default/fallback/fallback.component.scss deleted file mode 100644 index dc9093b45..000000000 --- a/lib/ng-nest/ui/image/examples/en_US/default/fallback/fallback.component.scss +++ /dev/null @@ -1,2 +0,0 @@ -:host { -} diff --git a/lib/ng-nest/ui/image/examples/en_US/default/fallback/fallback.component.ts b/lib/ng-nest/ui/image/examples/en_US/default/fallback/fallback.component.ts index 3f4d7048b..0e73655e9 100644 --- a/lib/ng-nest/ui/image/examples/en_US/default/fallback/fallback.component.ts +++ b/lib/ng-nest/ui/image/examples/en_US/default/fallback/fallback.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; +import { XImageComponent } from '@ng-nest/ui/image'; @Component({ selector: 'ex-fallback', - templateUrl: './fallback.component.html', - styleUrls: ['./fallback.component.scss'] + standalone: true, + imports: [XImageComponent], + templateUrl: './fallback.component.html' }) export class ExFallbackComponent {} diff --git a/lib/ng-nest/ui/image/examples/en_US/default/group/group.component.scss b/lib/ng-nest/ui/image/examples/en_US/default/group/group.component.scss deleted file mode 100644 index dc9093b45..000000000 --- a/lib/ng-nest/ui/image/examples/en_US/default/group/group.component.scss +++ /dev/null @@ -1,2 +0,0 @@ -:host { -} diff --git a/lib/ng-nest/ui/image/examples/en_US/default/group/group.component.ts b/lib/ng-nest/ui/image/examples/en_US/default/group/group.component.ts index 0d612e26f..c42f56e47 100644 --- a/lib/ng-nest/ui/image/examples/en_US/default/group/group.component.ts +++ b/lib/ng-nest/ui/image/examples/en_US/default/group/group.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; +import { XImageComponent, XImageGroupComponent } from '@ng-nest/ui/image'; @Component({ selector: 'ex-group', - templateUrl: './group.component.html', - styleUrls: ['./group.component.scss'] + standalone: true, + imports: [XImageComponent, XImageGroupComponent], + templateUrl: './group.component.html' }) export class ExGroupComponent {} diff --git a/lib/ng-nest/ui/image/examples/en_US/default/placeholder/placeholder.component.scss b/lib/ng-nest/ui/image/examples/en_US/default/placeholder/placeholder.component.scss deleted file mode 100644 index dc9093b45..000000000 --- a/lib/ng-nest/ui/image/examples/en_US/default/placeholder/placeholder.component.scss +++ /dev/null @@ -1,2 +0,0 @@ -:host { -} diff --git a/lib/ng-nest/ui/image/examples/en_US/default/placeholder/placeholder.component.ts b/lib/ng-nest/ui/image/examples/en_US/default/placeholder/placeholder.component.ts index 27c2def17..f06e9c856 100644 --- a/lib/ng-nest/ui/image/examples/en_US/default/placeholder/placeholder.component.ts +++ b/lib/ng-nest/ui/image/examples/en_US/default/placeholder/placeholder.component.ts @@ -1,9 +1,12 @@ import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XImageComponent } from '@ng-nest/ui/image'; @Component({ selector: 'ex-placeholder', - templateUrl: './placeholder.component.html', - styleUrls: ['./placeholder.component.scss'] + standalone: true, + imports: [XButtonComponent, XImageComponent], + templateUrl: './placeholder.component.html' }) export class ExPlaceholderComponent { src = 'https://ngnest.com/static/docs/course/rbac/1-introduction/demo/1__ng-nest-admin/light.png'; diff --git a/lib/ng-nest/ui/image/examples/index.ts b/lib/ng-nest/ui/image/examples/index.ts new file mode 100644 index 000000000..35c5ace94 --- /dev/null +++ b/lib/ng-nest/ui/image/examples/index.ts @@ -0,0 +1,5 @@ +export * from './zh_CN/default/custom/custom.component'; +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/fallback/fallback.component'; +export * from './zh_CN/default/group/group.component'; +export * from './zh_CN/default/placeholder/placeholder.component'; diff --git a/lib/ng-nest/ui/image/examples/zh_CN/default/custom/custom.component.scss b/lib/ng-nest/ui/image/examples/zh_CN/default/custom/custom.component.scss deleted file mode 100644 index dc9093b45..000000000 --- a/lib/ng-nest/ui/image/examples/zh_CN/default/custom/custom.component.scss +++ /dev/null @@ -1,2 +0,0 @@ -:host { -} diff --git a/lib/ng-nest/ui/image/examples/zh_CN/default/custom/custom.component.ts b/lib/ng-nest/ui/image/examples/zh_CN/default/custom/custom.component.ts index e13c45154..a3454a911 100644 --- a/lib/ng-nest/ui/image/examples/zh_CN/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/image/examples/zh_CN/default/custom/custom.component.ts @@ -1,11 +1,13 @@ import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; import { XDialogService } from '@ng-nest/ui/dialog'; import { XImagePreviewComponent } from '@ng-nest/ui/image'; @Component({ selector: 'ex-custom', - templateUrl: './custom.component.html', - styleUrls: ['./custom.component.scss'] + standalone: true, + imports: [XButtonComponent], + templateUrl: './custom.component.html' }) export class ExCustomComponent { constructor(private dialogSewrvice: XDialogService) {} @@ -14,7 +16,11 @@ export class ExCustomComponent { width: '100%', height: '100%', className: 'x-image-preview-portal', - data: [{ src: 'https://ngnest.com/static/docs/course/rbac/1-introduction/demo/1__ng-nest-admin/light.png' }] + data: [ + { + src: 'https://ngnest.com/static/docs/course/rbac/1-introduction/demo/1__ng-nest-admin/light.png' + } + ] }); } } diff --git a/lib/ng-nest/ui/image/examples/zh_CN/default/default/default.component.scss b/lib/ng-nest/ui/image/examples/zh_CN/default/default/default.component.scss deleted file mode 100644 index dc9093b45..000000000 --- a/lib/ng-nest/ui/image/examples/zh_CN/default/default/default.component.scss +++ /dev/null @@ -1,2 +0,0 @@ -:host { -} diff --git a/lib/ng-nest/ui/image/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/image/examples/zh_CN/default/default/default.component.ts index cae54f2a5..42d41f612 100644 --- a/lib/ng-nest/ui/image/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/image/examples/zh_CN/default/default/default.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; +import { XImageComponent } from '@ng-nest/ui/image'; @Component({ selector: 'ex-default', - templateUrl: './default.component.html', - styleUrls: ['./default.component.scss'] + standalone: true, + imports: [XImageComponent], + templateUrl: './default.component.html' }) export class ExDefaultComponent {} diff --git a/lib/ng-nest/ui/image/examples/zh_CN/default/fallback/fallback.component.scss b/lib/ng-nest/ui/image/examples/zh_CN/default/fallback/fallback.component.scss deleted file mode 100644 index dc9093b45..000000000 --- a/lib/ng-nest/ui/image/examples/zh_CN/default/fallback/fallback.component.scss +++ /dev/null @@ -1,2 +0,0 @@ -:host { -} diff --git a/lib/ng-nest/ui/image/examples/zh_CN/default/fallback/fallback.component.ts b/lib/ng-nest/ui/image/examples/zh_CN/default/fallback/fallback.component.ts index 3f4d7048b..0e73655e9 100644 --- a/lib/ng-nest/ui/image/examples/zh_CN/default/fallback/fallback.component.ts +++ b/lib/ng-nest/ui/image/examples/zh_CN/default/fallback/fallback.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; +import { XImageComponent } from '@ng-nest/ui/image'; @Component({ selector: 'ex-fallback', - templateUrl: './fallback.component.html', - styleUrls: ['./fallback.component.scss'] + standalone: true, + imports: [XImageComponent], + templateUrl: './fallback.component.html' }) export class ExFallbackComponent {} diff --git a/lib/ng-nest/ui/image/examples/zh_CN/default/group/group.component.scss b/lib/ng-nest/ui/image/examples/zh_CN/default/group/group.component.scss deleted file mode 100644 index dc9093b45..000000000 --- a/lib/ng-nest/ui/image/examples/zh_CN/default/group/group.component.scss +++ /dev/null @@ -1,2 +0,0 @@ -:host { -} diff --git a/lib/ng-nest/ui/image/examples/zh_CN/default/group/group.component.ts b/lib/ng-nest/ui/image/examples/zh_CN/default/group/group.component.ts index 0d612e26f..c42f56e47 100644 --- a/lib/ng-nest/ui/image/examples/zh_CN/default/group/group.component.ts +++ b/lib/ng-nest/ui/image/examples/zh_CN/default/group/group.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; +import { XImageComponent, XImageGroupComponent } from '@ng-nest/ui/image'; @Component({ selector: 'ex-group', - templateUrl: './group.component.html', - styleUrls: ['./group.component.scss'] + standalone: true, + imports: [XImageComponent, XImageGroupComponent], + templateUrl: './group.component.html' }) export class ExGroupComponent {} diff --git a/lib/ng-nest/ui/image/examples/zh_CN/default/placeholder/placeholder.component.scss b/lib/ng-nest/ui/image/examples/zh_CN/default/placeholder/placeholder.component.scss deleted file mode 100644 index dc9093b45..000000000 --- a/lib/ng-nest/ui/image/examples/zh_CN/default/placeholder/placeholder.component.scss +++ /dev/null @@ -1,2 +0,0 @@ -:host { -} diff --git a/lib/ng-nest/ui/image/examples/zh_CN/default/placeholder/placeholder.component.ts b/lib/ng-nest/ui/image/examples/zh_CN/default/placeholder/placeholder.component.ts index 27c2def17..f06e9c856 100644 --- a/lib/ng-nest/ui/image/examples/zh_CN/default/placeholder/placeholder.component.ts +++ b/lib/ng-nest/ui/image/examples/zh_CN/default/placeholder/placeholder.component.ts @@ -1,9 +1,12 @@ import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XImageComponent } from '@ng-nest/ui/image'; @Component({ selector: 'ex-placeholder', - templateUrl: './placeholder.component.html', - styleUrls: ['./placeholder.component.scss'] + standalone: true, + imports: [XButtonComponent, XImageComponent], + templateUrl: './placeholder.component.html' }) export class ExPlaceholderComponent { src = 'https://ngnest.com/static/docs/course/rbac/1-introduction/demo/1__ng-nest-admin/light.png'; diff --git a/lib/ng-nest/ui/image/image-group.component.ts b/lib/ng-nest/ui/image/image-group.component.ts index f2ae34a8d..8b38423b6 100644 --- a/lib/ng-nest/ui/image/image-group.component.ts +++ b/lib/ng-nest/ui/image/image-group.component.ts @@ -1,9 +1,12 @@ import { Component, ViewEncapsulation, ChangeDetectionStrategy } from '@angular/core'; import { XImageComponent } from './image.component'; import { XImageGroupPrefix } from './image.property'; +import { CommonModule } from '@angular/common'; @Component({ selector: `${XImageGroupPrefix}`, + standalone: true, + imports: [CommonModule], templateUrl: './image-group.component.html', styleUrls: ['./image-group.component.scss'], encapsulation: ViewEncapsulation.None, diff --git a/lib/ng-nest/ui/image/image-preview.component.ts b/lib/ng-nest/ui/image/image-preview.component.ts index aaee33e62..1f0e58013 100644 --- a/lib/ng-nest/ui/image/image-preview.component.ts +++ b/lib/ng-nest/ui/image/image-preview.component.ts @@ -1,28 +1,29 @@ import { Component, ViewEncapsulation, - Renderer2, ElementRef, - ChangeDetectorRef, ChangeDetectionStrategy, - OnChanges, - Inject, ViewChild, - inject + inject, + OnInit } from '@angular/core'; import { XImageNode, XImagePreviewPrefix, XImagePreviewProperty } from './image.property'; import { XConfigService } from '@ng-nest/ui/core'; -import { X_DIALOG_DATA } from '@ng-nest/ui/dialog'; -import { DOCUMENT } from '@angular/common'; +import { XDialogCloseDirective, X_DIALOG_DATA } from '@ng-nest/ui/dialog'; +import { CommonModule, DOCUMENT } from '@angular/common'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { DragDropModule } from '@angular/cdk/drag-drop'; @Component({ selector: `${XImagePreviewPrefix}`, + standalone: true, + imports: [CommonModule, XIconComponent, DragDropModule, XDialogCloseDirective], templateUrl: './image-preview.component.html', styleUrls: ['./image-preview.component.scss'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush }) -export class XImagePreviewComponent extends XImagePreviewProperty implements OnChanges { +export class XImagePreviewComponent extends XImagePreviewProperty implements OnInit { imgScale3d = { x: 1, y: 1, @@ -50,22 +51,13 @@ export class XImagePreviewComponent extends XImagePreviewProperty implements OnC @ViewChild('imageRef') imageRef!: ElementRef; - constructor( - public renderer: Renderer2, - public elementRef: ElementRef, - public cdr: ChangeDetectorRef, - public configService: XConfigService, - @Inject(X_DIALOG_DATA) public data: XImageNode[] - ) { - super(); - } + data = inject(X_DIALOG_DATA); + configService = inject(XConfigService); ngOnInit() { this.setActivated(); } - ngOnChanges() {} - initialization() { this.imgScale3d = { x: 1, @@ -115,7 +107,8 @@ export class XImagePreviewComponent extends XImagePreviewProperty implements OnC let width = this.imageRef.nativeElement.offsetWidth * this.imgScale3d.x; let height = this.imageRef.nativeElement.offsetHeight * this.imgScale3d.x; const clientWidth = this.document.documentElement.clientWidth; - const clientHeight = this.document.defaultView?.innerHeight || this.document.documentElement.clientHeight; + const clientHeight = + this.document.defaultView?.innerHeight || this.document.documentElement.clientHeight; const isRotate = this.rotate % 180 !== 0; const box = this.imageRef.nativeElement.getBoundingClientRect(); const docElem = this.document.documentElement; @@ -124,7 +117,9 @@ export class XImagePreviewComponent extends XImagePreviewProperty implements OnC (this.document.defaultView?.pageXOffset || docElem.scrollLeft) - (docElem.clientLeft || this.document.body.clientLeft || 0); const top = - box.top + (this.document.defaultView?.pageYOffset || docElem.scrollTop) - (docElem.clientTop || this.document.body.clientTop || 0); + box.top + + (this.document.defaultView?.pageYOffset || docElem.scrollTop) - + (docElem.clientTop || this.document.body.clientTop || 0); width = isRotate ? height : width; height = isRotate ? width : height; diff --git a/lib/ng-nest/ui/image/image.component.spec.ts b/lib/ng-nest/ui/image/image.component.spec.ts index 7da0a64bf..046cfb8ee 100644 --- a/lib/ng-nest/ui/image/image.component.spec.ts +++ b/lib/ng-nest/ui/image/image.component.spec.ts @@ -5,7 +5,7 @@ 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'; -import { XImageModule } from '@ng-nest/ui/image'; +import { XImageComponent } from '@ng-nest/ui/image'; import { FormsModule } from '@angular/forms'; import { XImagePrefix } from './image.property'; import { XButtonComponent } from '@ng-nest/ui/button'; @@ -22,7 +22,7 @@ describe(XImagePrefix, () => { HttpClientTestingModule, XThemeModule, FormsModule, - XImageModule, + XImageComponent, XButtonComponent, XContainerComponent, XRowComponent, diff --git a/lib/ng-nest/ui/image/image.component.ts b/lib/ng-nest/ui/image/image.component.ts index 53ace2b5f..631ba91c3 100644 --- a/lib/ng-nest/ui/image/image.component.ts +++ b/lib/ng-nest/ui/image/image.component.ts @@ -1,14 +1,12 @@ import { Component, ViewEncapsulation, - Renderer2, - ElementRef, ChangeDetectorRef, ChangeDetectionStrategy, OnInit, - Optional, OnChanges, - SimpleChanges + SimpleChanges, + inject } from '@angular/core'; import { XImageNode, XImagePrefix, XImageProperty } from './image.property'; import { XConfigService, XIsChange } from '@ng-nest/ui/core'; @@ -18,9 +16,14 @@ import { XI18nImage, XI18nService } from '@ng-nest/ui/i18n'; import { map, Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { XImageGroupComponent } from './image-group.component'; +import { CommonModule } from '@angular/common'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XOutletDirective } from '@ng-nest/ui/outlet'; @Component({ selector: `${XImagePrefix}`, + standalone: true, + imports: [CommonModule, XIconComponent, XOutletDirective], templateUrl: './image.component.html', styleUrls: ['./image.component.scss'], encapsulation: ViewEncapsulation.None, @@ -35,17 +38,12 @@ export class XImageComponent extends XImageProperty implements OnInit, OnChanges get getPreviewText() { return this.previewText || this.locale.previewText; } - constructor( - public renderer: Renderer2, - public elementRef: ElementRef, - public cdr: ChangeDetectorRef, - public configService: XConfigService, - public dialog: XDialogService, - public i18n: XI18nService, - @Optional() public group: XImageGroupComponent - ) { - super(); - } + + private cdr = inject(ChangeDetectorRef); + private dialog = inject(XDialogService); + private i18n = inject(XI18nService); + private group = inject(XImageGroupComponent, { optional: true }); + configService = inject(XConfigService); ngOnInit(): void { if (this.group) { @@ -81,7 +79,12 @@ export class XImageComponent extends XImageProperty implements OnInit, OnChanges let data: XImageNode[] = []; if (this.group) { const activatedIndex = this.group.images.indexOf(this); - data = this.group.images.map((x, index) => ({ src: x.src, alt: x.alt, fallback: x.fallback, activated: index === activatedIndex })); + data = this.group.images.map((x, index) => ({ + src: x.src, + alt: x.alt, + fallback: x.fallback, + activated: index === activatedIndex + })); } else { data = [{ src: this.src, alt: this.alt, fallback: this.fallback }]; } diff --git a/lib/ng-nest/ui/image/image.module.ts b/lib/ng-nest/ui/image/image.module.ts index fb2f041ee..4dce47775 100644 --- a/lib/ng-nest/ui/image/image.module.ts +++ b/lib/ng-nest/ui/image/image.module.ts @@ -1,17 +1,10 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { XImageComponent } from './image.component'; -import { XIconComponent } from '@ng-nest/ui/icon'; -import { XImagePreviewProperty, XImageProperty } from './image.property'; import { XImagePreviewComponent } from './image-preview.component'; -import { XButtonComponent } from '@ng-nest/ui/button'; -import { DragDropModule } from '@angular/cdk/drag-drop'; import { XImageGroupComponent } from './image-group.component'; -import { XOutletDirective } from '@ng-nest/ui/outlet'; @NgModule({ - declarations: [XImageComponent, XImageProperty, XImagePreviewComponent, XImagePreviewProperty, XImageGroupComponent], exports: [XImageComponent, XImagePreviewComponent, XImageGroupComponent], - imports: [CommonModule, XIconComponent, XButtonComponent, XOutletDirective, DragDropModule] + imports: [XImageComponent, XImagePreviewComponent, XImageGroupComponent] }) export class XImageModule {} diff --git a/lib/ng-nest/ui/inner/inner.component.spec.ts b/lib/ng-nest/ui/inner/inner.component.spec.ts index 94cf05711..006facf50 100644 --- a/lib/ng-nest/ui/inner/inner.component.spec.ts +++ b/lib/ng-nest/ui/inner/inner.component.spec.ts @@ -1,16 +1,15 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { XInnerComponent } from './inner.component'; +import { XInnerComponent } from '@ng-nest/ui/inner'; import { Component, DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { XInnerModule } from './inner.module'; import { XInnerPrefix } from './inner.property'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XInnerPrefix, () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, XInnerModule], + imports: [HttpClientTestingModule, XInnerComponent], declarations: [TestXInnerComponent] }).compileComponents(); }); diff --git a/lib/ng-nest/ui/inner/inner.component.ts b/lib/ng-nest/ui/inner/inner.component.ts index 7b52e0461..47ed202c4 100644 --- a/lib/ng-nest/ui/inner/inner.component.ts +++ b/lib/ng-nest/ui/inner/inner.component.ts @@ -6,28 +6,30 @@ import { Renderer2, ElementRef, OnChanges, - SimpleChanges + SimpleChanges, + inject } from '@angular/core'; import { XInnerPrefix, XInnerProperty } from './inner.property'; import { XConfigService } from '@ng-nest/ui/core'; +import { CommonModule } from '@angular/common'; @Component({ selector: `${XInnerPrefix}`, + standalone: true, + imports: [CommonModule], templateUrl: './inner.component.html', styleUrls: ['./style/index.scss'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush }) export class XInnerComponent extends XInnerProperty implements OnInit, OnChanges { - private _ele: HTMLElement; - - constructor(private renderer: Renderer2, private elementRef: ElementRef, public configService: XConfigService) { - super(); - this.renderer.addClass(this.elementRef.nativeElement, XInnerPrefix); - this._ele = this.elementRef.nativeElement; - } + private renderer = inject(Renderer2); + private elementRef = inject(ElementRef); + configService = inject(XConfigService); + private _ele: HTMLElement = this.elementRef.nativeElement; ngOnInit() { + this.renderer.addClass(this._ele, XInnerPrefix); this.setStyle(); } diff --git a/lib/ng-nest/ui/inner/inner.module.ts b/lib/ng-nest/ui/inner/inner.module.ts index 5f7b15741..b3b485f89 100644 --- a/lib/ng-nest/ui/inner/inner.module.ts +++ b/lib/ng-nest/ui/inner/inner.module.ts @@ -1,11 +1,8 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { XInnerComponent } from './inner.component'; -import { XInnerProperty } from './inner.property'; @NgModule({ - declarations: [XInnerComponent, XInnerProperty], exports: [XInnerComponent], - imports: [CommonModule] + imports: [XInnerComponent] }) export class XInnerModule {} diff --git a/lib/ng-nest/ui/input-number/examples/en_US/default/bordered/bordered.component.html b/lib/ng-nest/ui/input-number/examples/en_US/default/bordered/bordered.component.html index 38d3197d8..9a6d59c20 100644 --- a/lib/ng-nest/ui/input-number/examples/en_US/default/bordered/bordered.component.html +++ b/lib/ng-nest/ui/input-number/examples/en_US/default/bordered/bordered.component.html @@ -1,17 +1,15 @@ - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input-number/examples/en_US/default/bordered/bordered.component.scss b/lib/ng-nest/ui/input-number/examples/en_US/default/bordered/bordered.component.scss index 8554c774a..b4943baa0 100644 --- a/lib/ng-nest/ui/input-number/examples/en_US/default/bordered/bordered.component.scss +++ b/lib/ng-nest/ui/input-number/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 > x-input-number { - width: 10rem; - } } diff --git a/lib/ng-nest/ui/input-number/examples/en_US/default/bordered/bordered.component.ts b/lib/ng-nest/ui/input-number/examples/en_US/default/bordered/bordered.component.ts index 89ce67091..5ce2d14d2 100644 --- a/lib/ng-nest/ui/input-number/examples/en_US/default/bordered/bordered.component.ts +++ b/lib/ng-nest/ui/input-number/examples/en_US/default/bordered/bordered.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XInputNumberComponent } from '@ng-nest/ui/input-number'; @Component({ selector: 'ex-bordered', + standalone: true, + imports: [XInputNumberComponent], templateUrl: './bordered.component.html', styleUrls: ['./bordered.component.scss'] }) diff --git a/lib/ng-nest/ui/input-number/examples/en_US/default/default/default.component.html b/lib/ng-nest/ui/input-number/examples/en_US/default/default/default.component.html index b35f69489..fe741bd01 100644 --- a/lib/ng-nest/ui/input-number/examples/en_US/default/default/default.component.html +++ b/lib/ng-nest/ui/input-number/examples/en_US/default/default/default.component.html @@ -1,5 +1 @@ - - - - - + diff --git a/lib/ng-nest/ui/input-number/examples/en_US/default/default/default.component.scss b/lib/ng-nest/ui/input-number/examples/en_US/default/default/default.component.scss deleted file mode 100644 index 9b50f09a9..000000000 --- a/lib/ng-nest/ui/input-number/examples/en_US/default/default/default.component.scss +++ /dev/null @@ -1,5 +0,0 @@ -:host { - x-row > x-col { - width: 10rem; - } -} diff --git a/lib/ng-nest/ui/input-number/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/input-number/examples/en_US/default/default/default.component.ts index cae54f2a5..02139b9bf 100644 --- a/lib/ng-nest/ui/input-number/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/input-number/examples/en_US/default/default/default.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; +import { XInputNumberComponent } from '@ng-nest/ui/input-number'; @Component({ selector: 'ex-default', - templateUrl: './default.component.html', - styleUrls: ['./default.component.scss'] + standalone: true, + imports: [XInputNumberComponent], + templateUrl: './default.component.html' }) export class ExDefaultComponent {} diff --git a/lib/ng-nest/ui/input-number/examples/en_US/default/disabled/disabled.component.html b/lib/ng-nest/ui/input-number/examples/en_US/default/disabled/disabled.component.html index df1a56525..dfc2aeff5 100644 --- a/lib/ng-nest/ui/input-number/examples/en_US/default/disabled/disabled.component.html +++ b/lib/ng-nest/ui/input-number/examples/en_US/default/disabled/disabled.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input-number/examples/en_US/default/disabled/disabled.component.scss b/lib/ng-nest/ui/input-number/examples/en_US/default/disabled/disabled.component.scss index fae8d0a71..b4943baa0 100644 --- a/lib/ng-nest/ui/input-number/examples/en_US/default/disabled/disabled.component.scss +++ b/lib/ng-nest/ui/input-number/examples/en_US/default/disabled/disabled.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 10rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/input-number/examples/en_US/default/disabled/disabled.component.ts b/lib/ng-nest/ui/input-number/examples/en_US/default/disabled/disabled.component.ts index 1754f9136..eb1bcd859 100644 --- a/lib/ng-nest/ui/input-number/examples/en_US/default/disabled/disabled.component.ts +++ b/lib/ng-nest/ui/input-number/examples/en_US/default/disabled/disabled.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XInputNumberComponent } from '@ng-nest/ui/input-number'; @Component({ selector: 'ex-disabled', + standalone: true, + imports: [FormsModule, XInputNumberComponent], templateUrl: './disabled.component.html', styleUrls: ['./disabled.component.scss'] }) diff --git a/lib/ng-nest/ui/input-number/examples/en_US/default/format/format.component.html b/lib/ng-nest/ui/input-number/examples/en_US/default/format/format.component.html index af5c81684..f188a9adb 100644 --- a/lib/ng-nest/ui/input-number/examples/en_US/default/format/format.component.html +++ b/lib/ng-nest/ui/input-number/examples/en_US/default/format/format.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input-number/examples/en_US/default/format/format.component.scss b/lib/ng-nest/ui/input-number/examples/en_US/default/format/format.component.scss index 9b50f09a9..b4943baa0 100644 --- a/lib/ng-nest/ui/input-number/examples/en_US/default/format/format.component.scss +++ b/lib/ng-nest/ui/input-number/examples/en_US/default/format/format.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col { - width: 10rem; + .row:not(:first-child) { + margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/input-number/examples/en_US/default/format/format.component.ts b/lib/ng-nest/ui/input-number/examples/en_US/default/format/format.component.ts index b06fab296..779833e15 100644 --- a/lib/ng-nest/ui/input-number/examples/en_US/default/format/format.component.ts +++ b/lib/ng-nest/ui/input-number/examples/en_US/default/format/format.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; import { XNumber } from '@ng-nest/ui/core'; +import { XInputNumberComponent } from '@ng-nest/ui/input-number'; @Component({ - selector: 'x-format', + selector: 'ex-format', + standalone: true, + imports: [XInputNumberComponent], templateUrl: './format.component.html', styleUrls: ['./format.component.scss'] }) diff --git a/lib/ng-nest/ui/input-number/examples/en_US/default/label/label.component.html b/lib/ng-nest/ui/input-number/examples/en_US/default/label/label.component.html index f4abe0727..e4381463a 100644 --- a/lib/ng-nest/ui/input-number/examples/en_US/default/label/label.component.html +++ b/lib/ng-nest/ui/input-number/examples/en_US/default/label/label.component.html @@ -1,20 +1,12 @@ - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input-number/examples/en_US/default/label/label.component.scss b/lib/ng-nest/ui/input-number/examples/en_US/default/label/label.component.scss index fae8d0a71..b4943baa0 100644 --- a/lib/ng-nest/ui/input-number/examples/en_US/default/label/label.component.scss +++ b/lib/ng-nest/ui/input-number/examples/en_US/default/label/label.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 10rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/input-number/examples/en_US/default/label/label.component.ts b/lib/ng-nest/ui/input-number/examples/en_US/default/label/label.component.ts index 64c8a7056..04eefd57c 100644 --- a/lib/ng-nest/ui/input-number/examples/en_US/default/label/label.component.ts +++ b/lib/ng-nest/ui/input-number/examples/en_US/default/label/label.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XInputNumberComponent } from '@ng-nest/ui/input-number'; @Component({ selector: 'ex-label', + standalone: true, + imports: [XInputNumberComponent], templateUrl: './label.component.html', styleUrls: ['./label.component.scss'] }) diff --git a/lib/ng-nest/ui/input-number/examples/en_US/default/limit/limit.component.html b/lib/ng-nest/ui/input-number/examples/en_US/default/limit/limit.component.html index fb6e47568..0715f6091 100644 --- a/lib/ng-nest/ui/input-number/examples/en_US/default/limit/limit.component.html +++ b/lib/ng-nest/ui/input-number/examples/en_US/default/limit/limit.component.html @@ -1,15 +1,9 @@ - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input-number/examples/en_US/default/limit/limit.component.scss b/lib/ng-nest/ui/input-number/examples/en_US/default/limit/limit.component.scss index fae8d0a71..b4943baa0 100644 --- a/lib/ng-nest/ui/input-number/examples/en_US/default/limit/limit.component.scss +++ b/lib/ng-nest/ui/input-number/examples/en_US/default/limit/limit.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 10rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/input-number/examples/en_US/default/limit/limit.component.ts b/lib/ng-nest/ui/input-number/examples/en_US/default/limit/limit.component.ts index 7b1216215..8c9c69fac 100644 --- a/lib/ng-nest/ui/input-number/examples/en_US/default/limit/limit.component.ts +++ b/lib/ng-nest/ui/input-number/examples/en_US/default/limit/limit.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XInputNumberComponent } from '@ng-nest/ui/input-number'; @Component({ selector: 'ex-limit', + standalone: true, + imports: [XInputNumberComponent], templateUrl: './limit.component.html', styleUrls: ['./limit.component.scss'] }) diff --git a/lib/ng-nest/ui/input-number/examples/en_US/default/precision/precision.component.html b/lib/ng-nest/ui/input-number/examples/en_US/default/precision/precision.component.html index d3e47002c..c3383a7e5 100644 --- a/lib/ng-nest/ui/input-number/examples/en_US/default/precision/precision.component.html +++ b/lib/ng-nest/ui/input-number/examples/en_US/default/precision/precision.component.html @@ -1,5 +1 @@ - - - - - + diff --git a/lib/ng-nest/ui/input-number/examples/en_US/default/precision/precision.component.scss b/lib/ng-nest/ui/input-number/examples/en_US/default/precision/precision.component.scss deleted file mode 100644 index fae8d0a71..000000000 --- a/lib/ng-nest/ui/input-number/examples/en_US/default/precision/precision.component.scss +++ /dev/null @@ -1,8 +0,0 @@ -:host { - x-row > x-col { - width: 10rem; - } - x-row:not(:first-child) { - margin-top: 1rem; - } -} diff --git a/lib/ng-nest/ui/input-number/examples/en_US/default/precision/precision.component.ts b/lib/ng-nest/ui/input-number/examples/en_US/default/precision/precision.component.ts index daf15159b..08eb4ea01 100644 --- a/lib/ng-nest/ui/input-number/examples/en_US/default/precision/precision.component.ts +++ b/lib/ng-nest/ui/input-number/examples/en_US/default/precision/precision.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; +import { XInputNumberComponent } from '@ng-nest/ui/input-number'; @Component({ selector: 'ex-precision', - templateUrl: './precision.component.html', - styleUrls: ['./precision.component.scss'] + standalone: true, + imports: [XInputNumberComponent], + templateUrl: './precision.component.html' }) export class ExPrecisionComponent {} diff --git a/lib/ng-nest/ui/input-number/examples/en_US/default/required/required.component.html b/lib/ng-nest/ui/input-number/examples/en_US/default/required/required.component.html index a2a7de153..f529de6da 100644 --- a/lib/ng-nest/ui/input-number/examples/en_US/default/required/required.component.html +++ b/lib/ng-nest/ui/input-number/examples/en_US/default/required/required.component.html @@ -1,15 +1,13 @@ - - +
+ - - - - +
+
+ - - - - +
+
+ - - +
+ diff --git a/lib/ng-nest/ui/input-number/examples/en_US/default/required/required.component.scss b/lib/ng-nest/ui/input-number/examples/en_US/default/required/required.component.scss index fae8d0a71..b4943baa0 100644 --- a/lib/ng-nest/ui/input-number/examples/en_US/default/required/required.component.scss +++ b/lib/ng-nest/ui/input-number/examples/en_US/default/required/required.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 10rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/input-number/examples/en_US/default/required/required.component.ts b/lib/ng-nest/ui/input-number/examples/en_US/default/required/required.component.ts index c8debbb95..eb0ce598c 100644 --- a/lib/ng-nest/ui/input-number/examples/en_US/default/required/required.component.ts +++ b/lib/ng-nest/ui/input-number/examples/en_US/default/required/required.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XInputNumberComponent } from '@ng-nest/ui/input-number'; @Component({ selector: 'ex-required', + standalone: true, + imports: [FormsModule, XInputNumberComponent], templateUrl: './required.component.html', styleUrls: ['./required.component.scss'] }) diff --git a/lib/ng-nest/ui/input-number/examples/en_US/default/size/size.component.html b/lib/ng-nest/ui/input-number/examples/en_US/default/size/size.component.html index 17ecf0731..2a46d4dce 100644 --- a/lib/ng-nest/ui/input-number/examples/en_US/default/size/size.component.html +++ b/lib/ng-nest/ui/input-number/examples/en_US/default/size/size.component.html @@ -1,21 +1,25 @@ - - +
- - +
+
+ - - +
+
+ - - +
+
+ - - +
+
+ - - +
+
+ - - +
+ diff --git a/lib/ng-nest/ui/input-number/examples/en_US/default/size/size.component.scss b/lib/ng-nest/ui/input-number/examples/en_US/default/size/size.component.scss index db47dab4e..5e83058ed 100644 --- a/lib/ng-nest/ui/input-number/examples/en_US/default/size/size.component.scss +++ b/lib/ng-nest/ui/input-number/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/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 7840212ca..fab4756a5 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 @@ -1,8 +1,13 @@ 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'; @Component({ selector: 'ex-size', + standalone: true, + imports: [FormsModule, XInputNumberComponent, XRadioModule], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/input-number/examples/index.ts b/lib/ng-nest/ui/input-number/examples/index.ts new file mode 100644 index 000000000..c232b8c76 --- /dev/null +++ b/lib/ng-nest/ui/input-number/examples/index.ts @@ -0,0 +1,9 @@ +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/format/format.component'; +export * from './zh_CN/default/label/label.component'; +export * from './zh_CN/default/limit/limit.component'; +export * from './zh_CN/default/precision/precision.component'; +export * from './zh_CN/default/required/required.component'; +export * from './zh_CN/default/size/size.component'; diff --git a/lib/ng-nest/ui/input-number/examples/zh_CN/default/bordered/bordered.component.html b/lib/ng-nest/ui/input-number/examples/zh_CN/default/bordered/bordered.component.html index c66d5ae86..88d360464 100644 --- a/lib/ng-nest/ui/input-number/examples/zh_CN/default/bordered/bordered.component.html +++ b/lib/ng-nest/ui/input-number/examples/zh_CN/default/bordered/bordered.component.html @@ -1,17 +1,15 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input-number/examples/zh_CN/default/bordered/bordered.component.scss b/lib/ng-nest/ui/input-number/examples/zh_CN/default/bordered/bordered.component.scss index 8554c774a..b4943baa0 100644 --- a/lib/ng-nest/ui/input-number/examples/zh_CN/default/bordered/bordered.component.scss +++ b/lib/ng-nest/ui/input-number/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 > x-input-number { - width: 10rem; - } } diff --git a/lib/ng-nest/ui/input-number/examples/zh_CN/default/bordered/bordered.component.ts b/lib/ng-nest/ui/input-number/examples/zh_CN/default/bordered/bordered.component.ts index 89ce67091..5ce2d14d2 100644 --- a/lib/ng-nest/ui/input-number/examples/zh_CN/default/bordered/bordered.component.ts +++ b/lib/ng-nest/ui/input-number/examples/zh_CN/default/bordered/bordered.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XInputNumberComponent } from '@ng-nest/ui/input-number'; @Component({ selector: 'ex-bordered', + standalone: true, + imports: [XInputNumberComponent], templateUrl: './bordered.component.html', styleUrls: ['./bordered.component.scss'] }) diff --git a/lib/ng-nest/ui/input-number/examples/zh_CN/default/default/default.component.html b/lib/ng-nest/ui/input-number/examples/zh_CN/default/default/default.component.html index b35f69489..fe741bd01 100644 --- a/lib/ng-nest/ui/input-number/examples/zh_CN/default/default/default.component.html +++ b/lib/ng-nest/ui/input-number/examples/zh_CN/default/default/default.component.html @@ -1,5 +1 @@ - - - - - + diff --git a/lib/ng-nest/ui/input-number/examples/zh_CN/default/default/default.component.scss b/lib/ng-nest/ui/input-number/examples/zh_CN/default/default/default.component.scss deleted file mode 100644 index 9b50f09a9..000000000 --- a/lib/ng-nest/ui/input-number/examples/zh_CN/default/default/default.component.scss +++ /dev/null @@ -1,5 +0,0 @@ -:host { - x-row > x-col { - width: 10rem; - } -} diff --git a/lib/ng-nest/ui/input-number/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/input-number/examples/zh_CN/default/default/default.component.ts index cae54f2a5..02139b9bf 100644 --- a/lib/ng-nest/ui/input-number/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/input-number/examples/zh_CN/default/default/default.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; +import { XInputNumberComponent } from '@ng-nest/ui/input-number'; @Component({ selector: 'ex-default', - templateUrl: './default.component.html', - styleUrls: ['./default.component.scss'] + standalone: true, + imports: [XInputNumberComponent], + templateUrl: './default.component.html' }) export class ExDefaultComponent {} diff --git a/lib/ng-nest/ui/input-number/examples/zh_CN/default/disabled/disabled.component.html b/lib/ng-nest/ui/input-number/examples/zh_CN/default/disabled/disabled.component.html index df1a56525..dfc2aeff5 100644 --- a/lib/ng-nest/ui/input-number/examples/zh_CN/default/disabled/disabled.component.html +++ b/lib/ng-nest/ui/input-number/examples/zh_CN/default/disabled/disabled.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input-number/examples/zh_CN/default/disabled/disabled.component.scss b/lib/ng-nest/ui/input-number/examples/zh_CN/default/disabled/disabled.component.scss index fae8d0a71..b4943baa0 100644 --- a/lib/ng-nest/ui/input-number/examples/zh_CN/default/disabled/disabled.component.scss +++ b/lib/ng-nest/ui/input-number/examples/zh_CN/default/disabled/disabled.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 10rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/input-number/examples/zh_CN/default/disabled/disabled.component.ts b/lib/ng-nest/ui/input-number/examples/zh_CN/default/disabled/disabled.component.ts index 1754f9136..eb1bcd859 100644 --- a/lib/ng-nest/ui/input-number/examples/zh_CN/default/disabled/disabled.component.ts +++ b/lib/ng-nest/ui/input-number/examples/zh_CN/default/disabled/disabled.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XInputNumberComponent } from '@ng-nest/ui/input-number'; @Component({ selector: 'ex-disabled', + standalone: true, + imports: [FormsModule, XInputNumberComponent], templateUrl: './disabled.component.html', styleUrls: ['./disabled.component.scss'] }) diff --git a/lib/ng-nest/ui/input-number/examples/zh_CN/default/format/format.component.html b/lib/ng-nest/ui/input-number/examples/zh_CN/default/format/format.component.html index af5c81684..f188a9adb 100644 --- a/lib/ng-nest/ui/input-number/examples/zh_CN/default/format/format.component.html +++ b/lib/ng-nest/ui/input-number/examples/zh_CN/default/format/format.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input-number/examples/zh_CN/default/format/format.component.scss b/lib/ng-nest/ui/input-number/examples/zh_CN/default/format/format.component.scss index 9b50f09a9..b4943baa0 100644 --- a/lib/ng-nest/ui/input-number/examples/zh_CN/default/format/format.component.scss +++ b/lib/ng-nest/ui/input-number/examples/zh_CN/default/format/format.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col { - width: 10rem; + .row:not(:first-child) { + margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/input-number/examples/zh_CN/default/format/format.component.ts b/lib/ng-nest/ui/input-number/examples/zh_CN/default/format/format.component.ts index 8c153cba0..779833e15 100644 --- a/lib/ng-nest/ui/input-number/examples/zh_CN/default/format/format.component.ts +++ b/lib/ng-nest/ui/input-number/examples/zh_CN/default/format/format.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; import { XNumber } from '@ng-nest/ui/core'; +import { XInputNumberComponent } from '@ng-nest/ui/input-number'; @Component({ selector: 'ex-format', + standalone: true, + imports: [XInputNumberComponent], templateUrl: './format.component.html', styleUrls: ['./format.component.scss'] }) diff --git a/lib/ng-nest/ui/input-number/examples/zh_CN/default/label/label.component.html b/lib/ng-nest/ui/input-number/examples/zh_CN/default/label/label.component.html index f89ffe912..fe045846c 100644 --- a/lib/ng-nest/ui/input-number/examples/zh_CN/default/label/label.component.html +++ b/lib/ng-nest/ui/input-number/examples/zh_CN/default/label/label.component.html @@ -1,20 +1,12 @@ - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input-number/examples/zh_CN/default/label/label.component.scss b/lib/ng-nest/ui/input-number/examples/zh_CN/default/label/label.component.scss index fae8d0a71..b4943baa0 100644 --- a/lib/ng-nest/ui/input-number/examples/zh_CN/default/label/label.component.scss +++ b/lib/ng-nest/ui/input-number/examples/zh_CN/default/label/label.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 10rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/input-number/examples/zh_CN/default/label/label.component.ts b/lib/ng-nest/ui/input-number/examples/zh_CN/default/label/label.component.ts index 64c8a7056..04eefd57c 100644 --- a/lib/ng-nest/ui/input-number/examples/zh_CN/default/label/label.component.ts +++ b/lib/ng-nest/ui/input-number/examples/zh_CN/default/label/label.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XInputNumberComponent } from '@ng-nest/ui/input-number'; @Component({ selector: 'ex-label', + standalone: true, + imports: [XInputNumberComponent], templateUrl: './label.component.html', styleUrls: ['./label.component.scss'] }) diff --git a/lib/ng-nest/ui/input-number/examples/zh_CN/default/limit/limit.component.html b/lib/ng-nest/ui/input-number/examples/zh_CN/default/limit/limit.component.html index fb6e47568..0715f6091 100644 --- a/lib/ng-nest/ui/input-number/examples/zh_CN/default/limit/limit.component.html +++ b/lib/ng-nest/ui/input-number/examples/zh_CN/default/limit/limit.component.html @@ -1,15 +1,9 @@ - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input-number/examples/zh_CN/default/limit/limit.component.scss b/lib/ng-nest/ui/input-number/examples/zh_CN/default/limit/limit.component.scss index fae8d0a71..b4943baa0 100644 --- a/lib/ng-nest/ui/input-number/examples/zh_CN/default/limit/limit.component.scss +++ b/lib/ng-nest/ui/input-number/examples/zh_CN/default/limit/limit.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 10rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/input-number/examples/zh_CN/default/limit/limit.component.ts b/lib/ng-nest/ui/input-number/examples/zh_CN/default/limit/limit.component.ts index 7b1216215..8c9c69fac 100644 --- a/lib/ng-nest/ui/input-number/examples/zh_CN/default/limit/limit.component.ts +++ b/lib/ng-nest/ui/input-number/examples/zh_CN/default/limit/limit.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XInputNumberComponent } from '@ng-nest/ui/input-number'; @Component({ selector: 'ex-limit', + standalone: true, + imports: [XInputNumberComponent], templateUrl: './limit.component.html', styleUrls: ['./limit.component.scss'] }) diff --git a/lib/ng-nest/ui/input-number/examples/zh_CN/default/precision/precision.component.html b/lib/ng-nest/ui/input-number/examples/zh_CN/default/precision/precision.component.html index d3e47002c..c3383a7e5 100644 --- a/lib/ng-nest/ui/input-number/examples/zh_CN/default/precision/precision.component.html +++ b/lib/ng-nest/ui/input-number/examples/zh_CN/default/precision/precision.component.html @@ -1,5 +1 @@ - - - - - + diff --git a/lib/ng-nest/ui/input-number/examples/zh_CN/default/precision/precision.component.scss b/lib/ng-nest/ui/input-number/examples/zh_CN/default/precision/precision.component.scss deleted file mode 100644 index fae8d0a71..000000000 --- a/lib/ng-nest/ui/input-number/examples/zh_CN/default/precision/precision.component.scss +++ /dev/null @@ -1,8 +0,0 @@ -:host { - x-row > x-col { - width: 10rem; - } - x-row:not(:first-child) { - margin-top: 1rem; - } -} diff --git a/lib/ng-nest/ui/input-number/examples/zh_CN/default/precision/precision.component.ts b/lib/ng-nest/ui/input-number/examples/zh_CN/default/precision/precision.component.ts index daf15159b..08eb4ea01 100644 --- a/lib/ng-nest/ui/input-number/examples/zh_CN/default/precision/precision.component.ts +++ b/lib/ng-nest/ui/input-number/examples/zh_CN/default/precision/precision.component.ts @@ -1,8 +1,10 @@ import { Component } from '@angular/core'; +import { XInputNumberComponent } from '@ng-nest/ui/input-number'; @Component({ selector: 'ex-precision', - templateUrl: './precision.component.html', - styleUrls: ['./precision.component.scss'] + standalone: true, + imports: [XInputNumberComponent], + templateUrl: './precision.component.html' }) export class ExPrecisionComponent {} diff --git a/lib/ng-nest/ui/input-number/examples/zh_CN/default/required/required.component.html b/lib/ng-nest/ui/input-number/examples/zh_CN/default/required/required.component.html index 6a5ac8372..7fd0c38e8 100644 --- a/lib/ng-nest/ui/input-number/examples/zh_CN/default/required/required.component.html +++ b/lib/ng-nest/ui/input-number/examples/zh_CN/default/required/required.component.html @@ -1,15 +1,9 @@ - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input-number/examples/zh_CN/default/required/required.component.scss b/lib/ng-nest/ui/input-number/examples/zh_CN/default/required/required.component.scss index fae8d0a71..b4943baa0 100644 --- a/lib/ng-nest/ui/input-number/examples/zh_CN/default/required/required.component.scss +++ b/lib/ng-nest/ui/input-number/examples/zh_CN/default/required/required.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 10rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/input-number/examples/zh_CN/default/required/required.component.ts b/lib/ng-nest/ui/input-number/examples/zh_CN/default/required/required.component.ts index c8debbb95..eb0ce598c 100644 --- a/lib/ng-nest/ui/input-number/examples/zh_CN/default/required/required.component.ts +++ b/lib/ng-nest/ui/input-number/examples/zh_CN/default/required/required.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XInputNumberComponent } from '@ng-nest/ui/input-number'; @Component({ selector: 'ex-required', + standalone: true, + imports: [FormsModule, XInputNumberComponent], templateUrl: './required.component.html', styleUrls: ['./required.component.scss'] }) diff --git a/lib/ng-nest/ui/input-number/examples/zh_CN/default/size/size.component.html b/lib/ng-nest/ui/input-number/examples/zh_CN/default/size/size.component.html index 36eb7f002..1cc387d16 100644 --- a/lib/ng-nest/ui/input-number/examples/zh_CN/default/size/size.component.html +++ b/lib/ng-nest/ui/input-number/examples/zh_CN/default/size/size.component.html @@ -1,21 +1,19 @@ - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input-number/examples/zh_CN/default/size/size.component.scss b/lib/ng-nest/ui/input-number/examples/zh_CN/default/size/size.component.scss index db47dab4e..5e83058ed 100644 --- a/lib/ng-nest/ui/input-number/examples/zh_CN/default/size/size.component.scss +++ b/lib/ng-nest/ui/input-number/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/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 7840212ca..fab4756a5 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 @@ -1,8 +1,13 @@ 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'; @Component({ selector: 'ex-size', + standalone: true, + imports: [FormsModule, XInputNumberComponent, XRadioModule], 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 3801398e5..81023007e 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 @@ -1,9 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XInputNumberComponent } from './input-number.component'; import { ChangeDetectorRef, Component, DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { XInputNumberModule } from '@ng-nest/ui/input-number'; +import { XInputNumberComponent } from '@ng-nest/ui/input-number'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { XInputNumberPrefix } from './input-number.property'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; @@ -19,7 +17,7 @@ describe(XInputNumberPrefix, () => { HttpClientTestingModule, BrowserAnimationsModule, XThemeModule, - XInputNumberModule, + XInputNumberComponent, FormsModule, ReactiveFormsModule, XRowComponent, @@ -386,12 +384,7 @@ class TestXInputNumberSizeComponent { - + diff --git a/lib/ng-nest/ui/input-number/input-number.component.ts b/lib/ng-nest/ui/input-number/input-number.component.ts index 87125a832..96c3a0c8a 100644 --- a/lib/ng-nest/ui/input-number/input-number.component.ts +++ b/lib/ng-nest/ui/input-number/input-number.component.ts @@ -10,21 +10,18 @@ import { ViewChild, inject } from '@angular/core'; -import { - XIsEmpty, - XNumber, - XClearClass, - XConfigService, - isNotNil, - XIsFunction -} from '@ng-nest/ui/core'; +import { XIsEmpty, XNumber, XClearClass, XConfigService, isNotNil, XIsFunction } from '@ng-nest/ui/core'; import { XInputNumberPrefix, XInputNumberProperty } from './input-number.property'; import { XValueAccessor } from '@ng-nest/ui/base-form'; -import { DOCUMENT } from '@angular/common'; +import { CommonModule, DOCUMENT } from '@angular/common'; import { XInputComponent } from '@ng-nest/ui/input'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { XButtonComponent } from '@ng-nest/ui/button'; @Component({ selector: `${XInputNumberPrefix}`, + standalone: true, + imports: [CommonModule, FormsModule, ReactiveFormsModule, XInputComponent, XButtonComponent], templateUrl: './input-number.component.html', styleUrls: ['./style/index.scss'], encapsulation: ViewEncapsulation.None, @@ -55,23 +52,12 @@ export class XInputNumberComponent extends XInputNumberProperty implements OnIni valueChange = new Subject(); document = inject(DOCUMENT); - - constructor( - public renderer: Renderer2, - public override cdr: ChangeDetectorRef, - public configService: XConfigService - ) { - super(); - } + private renderer = inject(Renderer2); + override cdr = inject(ChangeDetectorRef); + configService = inject(XConfigService); ngOnInit() { - this.setFlex( - this.inputNumber.nativeElement, - this.renderer, - this.justify, - this.align, - this.direction - ); + this.setFlex(this.inputNumber.nativeElement, this.renderer, this.justify, this.align, this.direction); this.setClassMap(); this.valueChange.pipe(distinctUntilChanged()).subscribe((x) => { this.onChange && this.onChange(x); @@ -87,9 +73,7 @@ export class XInputNumberComponent extends XInputNumberProperty implements OnIni if (!XIsEmpty(this.value) && !this.formatter) { this.displayValue = Number(this.value).toFixed(Number(this.precision)); } else if (this.formatter) { - const displayValue = isNotNil(this.formatter(Number(this.value))) - ? this.formatter(Number(this.value)) - : ''; + const displayValue = isNotNil(this.formatter(Number(this.value))) ? this.formatter(Number(this.value)) : ''; if (isNotNil(displayValue)) { this.displayValue = displayValue; } @@ -116,11 +100,9 @@ export class XInputNumberComponent extends XInputNumberProperty implements OnIni this.mousedown$ = interval(Number(this.debounce)).subscribe(() => { this.plus(event, limit, increase); }); - this.mouseup$ = fromEvent(this.document.documentElement, 'mouseup').subscribe( - (event: Event) => { - this.up(event); - } - ); + this.mouseup$ = fromEvent(this.document.documentElement, 'mouseup').subscribe((event: Event) => { + this.up(event); + }); }, 150); } diff --git a/lib/ng-nest/ui/input-number/input-number.module.ts b/lib/ng-nest/ui/input-number/input-number.module.ts index 2c3482db9..10c76782c 100644 --- a/lib/ng-nest/ui/input-number/input-number.module.ts +++ b/lib/ng-nest/ui/input-number/input-number.module.ts @@ -1,22 +1,8 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { XInputNumberComponent } from './input-number.component'; -import { XButtonComponent } from '@ng-nest/ui/button'; -import { XInputNumberProperty } from './input-number.property'; -import { XControlValueAccessor } from '@ng-nest/ui/base-form'; -import { XInputModule } from '@ng-nest/ui/input'; @NgModule({ - declarations: [XInputNumberComponent, XInputNumberProperty], exports: [XInputNumberComponent], - imports: [ - CommonModule, - FormsModule, - ReactiveFormsModule, - XInputModule, - XButtonComponent, - XControlValueAccessor - ] + imports: [XInputNumberComponent] }) export class XInputNumberModule {} diff --git a/lib/ng-nest/ui/input/examples/en_US/default/bordered/bordered.component.html b/lib/ng-nest/ui/input/examples/en_US/default/bordered/bordered.component.html index 4d61eabf7..f88bfe69f 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/bordered/bordered.component.html +++ b/lib/ng-nest/ui/input/examples/en_US/default/bordered/bordered.component.html @@ -1,25 +1,27 @@ - - - - - - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input/examples/en_US/default/bordered/bordered.component.scss b/lib/ng-nest/ui/input/examples/en_US/default/bordered/bordered.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/bordered/bordered.component.scss +++ b/lib/ng-nest/ui/input/examples/en_US/default/bordered/bordered.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/input/examples/en_US/default/bordered/bordered.component.ts b/lib/ng-nest/ui/input/examples/en_US/default/bordered/bordered.component.ts index 89ce67091..82df64fbd 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/bordered/bordered.component.ts +++ b/lib/ng-nest/ui/input/examples/en_US/default/bordered/bordered.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XInputComponent } from '@ng-nest/ui/input'; @Component({ selector: 'ex-bordered', + standalone: true, + imports: [XInputComponent], templateUrl: './bordered.component.html', styleUrls: ['./bordered.component.scss'] }) diff --git a/lib/ng-nest/ui/input/examples/en_US/default/clear/clear.component.html b/lib/ng-nest/ui/input/examples/en_US/default/clear/clear.component.html index 0a661dc3a..5186a4bd9 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/clear/clear.component.html +++ b/lib/ng-nest/ui/input/examples/en_US/default/clear/clear.component.html @@ -1,20 +1,12 @@ - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input/examples/en_US/default/clear/clear.component.scss b/lib/ng-nest/ui/input/examples/en_US/default/clear/clear.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/clear/clear.component.scss +++ b/lib/ng-nest/ui/input/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/input/examples/en_US/default/clear/clear.component.ts b/lib/ng-nest/ui/input/examples/en_US/default/clear/clear.component.ts index f5af437d1..b62699dc0 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/clear/clear.component.ts +++ b/lib/ng-nest/ui/input/examples/en_US/default/clear/clear.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XInputComponent } from '@ng-nest/ui/input'; @Component({ selector: 'ex-clear', + standalone: true, + imports: [FormsModule, XInputComponent], templateUrl: './clear.component.html', styleUrls: ['./clear.component.scss'] }) diff --git a/lib/ng-nest/ui/input/examples/en_US/default/default/default.component.html b/lib/ng-nest/ui/input/examples/en_US/default/default/default.component.html index 98ae02a1d..68a5598d5 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/default/default.component.html +++ b/lib/ng-nest/ui/input/examples/en_US/default/default/default.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input/examples/en_US/default/default/default.component.scss b/lib/ng-nest/ui/input/examples/en_US/default/default/default.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/default/default.component.scss +++ b/lib/ng-nest/ui/input/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/input/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/input/examples/en_US/default/default/default.component.ts index cae54f2a5..10f51c799 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/input/examples/en_US/default/default/default.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XInputComponent } from '@ng-nest/ui/input'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XInputComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/input/examples/en_US/default/disabled/disabled.component.html b/lib/ng-nest/ui/input/examples/en_US/default/disabled/disabled.component.html index 176c0fb8b..a00770911 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/disabled/disabled.component.html +++ b/lib/ng-nest/ui/input/examples/en_US/default/disabled/disabled.component.html @@ -1,20 +1,12 @@ - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input/examples/en_US/default/disabled/disabled.component.scss b/lib/ng-nest/ui/input/examples/en_US/default/disabled/disabled.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/disabled/disabled.component.scss +++ b/lib/ng-nest/ui/input/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/input/examples/en_US/default/disabled/disabled.component.ts b/lib/ng-nest/ui/input/examples/en_US/default/disabled/disabled.component.ts index 579679414..e21dd3198 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/disabled/disabled.component.ts +++ b/lib/ng-nest/ui/input/examples/en_US/default/disabled/disabled.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XInputComponent } from '@ng-nest/ui/input'; @Component({ selector: 'ex-disabled', + standalone: true, + imports: [FormsModule, XInputComponent], templateUrl: './disabled.component.html', styleUrls: ['./disabled.component.scss'] }) diff --git a/lib/ng-nest/ui/input/examples/en_US/default/focus/focus.component.html b/lib/ng-nest/ui/input/examples/en_US/default/focus/focus.component.html index 326d70c0b..f3b0a6624 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/focus/focus.component.html +++ b/lib/ng-nest/ui/input/examples/en_US/default/focus/focus.component.html @@ -1,12 +1,10 @@ - - - - Focus (selected text) - Focus (cursor before writing) - Focus (after the cursor, default) - - - - - - +
+ + Focus (selected text) + Focus (cursor before writing) + Focus (after the cursor, default) + +
+
+ +
diff --git a/lib/ng-nest/ui/input/examples/en_US/default/focus/focus.component.scss b/lib/ng-nest/ui/input/examples/en_US/default/focus/focus.component.scss index ff616fbb2..b4943baa0 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/focus/focus.component.scss +++ b/lib/ng-nest/ui/input/examples/en_US/default/focus/focus.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/input/examples/en_US/default/focus/focus.component.ts b/lib/ng-nest/ui/input/examples/en_US/default/focus/focus.component.ts index 5a4bea912..c96a3431e 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/focus/focus.component.ts +++ b/lib/ng-nest/ui/input/examples/en_US/default/focus/focus.component.ts @@ -1,7 +1,12 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; +import { XInputComponent } from '@ng-nest/ui/input'; @Component({ selector: 'ex-focus', + standalone: true, + imports: [FormsModule, XInputComponent, XButtonComponent, XButtonsComponent], templateUrl: './focus.component.html', styleUrls: ['./focus.component.scss'] }) diff --git a/lib/ng-nest/ui/input/examples/en_US/default/group/group.component.html b/lib/ng-nest/ui/input/examples/en_US/default/group/group.component.html index 088e65f55..dc848be23 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/group/group.component.html +++ b/lib/ng-nest/ui/input/examples/en_US/default/group/group.component.html @@ -1,12 +1,6 @@ - - - - - - - - - + + + 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 4d1cc0ab7..b5338ea8b 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 @@ -1,7 +1,33 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +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 { 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 { XTimePickerModule } from '@ng-nest/ui/time-picker'; @Component({ selector: 'ex-group', + standalone: true, + imports: [ + CommonModule, + XInputComponent, + XInputGroupComponent, + XSelectModule, + XButtonComponent, + XDatePickerComponent, + XAutoCompleteComponent, + XCascadeComponent, + XColorPickerComponent, + XFindComponent, + XTimePickerModule, + XTextareaModule + ], templateUrl: './group.component.html', styleUrls: ['./group.component.scss'] }) diff --git a/lib/ng-nest/ui/input/examples/en_US/default/icon/icon.component.html b/lib/ng-nest/ui/input/examples/en_US/default/icon/icon.component.html index fab42110c..c927de4bf 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/icon/icon.component.html +++ b/lib/ng-nest/ui/input/examples/en_US/default/icon/icon.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input/examples/en_US/default/icon/icon.component.scss b/lib/ng-nest/ui/input/examples/en_US/default/icon/icon.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/icon/icon.component.scss +++ b/lib/ng-nest/ui/input/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/input/examples/en_US/default/icon/icon.component.ts b/lib/ng-nest/ui/input/examples/en_US/default/icon/icon.component.ts index 7ad46cf35..cbf04a00a 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/icon/icon.component.ts +++ b/lib/ng-nest/ui/input/examples/en_US/default/icon/icon.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XInputComponent } from '@ng-nest/ui/input'; @Component({ selector: 'ex-icon', + standalone: true, + imports: [XInputComponent], templateUrl: './icon.component.html', styleUrls: ['./icon.component.scss'] }) diff --git a/lib/ng-nest/ui/input/examples/en_US/default/label/label.component.html b/lib/ng-nest/ui/input/examples/en_US/default/label/label.component.html index a19dd9f06..b228058dd 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/label/label.component.html +++ b/lib/ng-nest/ui/input/examples/en_US/default/label/label.component.html @@ -1,20 +1,12 @@ - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input/examples/en_US/default/label/label.component.scss b/lib/ng-nest/ui/input/examples/en_US/default/label/label.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/label/label.component.scss +++ b/lib/ng-nest/ui/input/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/input/examples/en_US/default/label/label.component.ts b/lib/ng-nest/ui/input/examples/en_US/default/label/label.component.ts index 64c8a7056..0338cdccb 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/label/label.component.ts +++ b/lib/ng-nest/ui/input/examples/en_US/default/label/label.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XInputComponent } from '@ng-nest/ui/input'; @Component({ selector: 'ex-label', + standalone: true, + imports: [XInputComponent], templateUrl: './label.component.html', styleUrls: ['./label.component.scss'] }) diff --git a/lib/ng-nest/ui/input/examples/en_US/default/length/length.component.html b/lib/ng-nest/ui/input/examples/en_US/default/length/length.component.html index e9f83a08d..b58e72383 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/length/length.component.html +++ b/lib/ng-nest/ui/input/examples/en_US/default/length/length.component.html @@ -1,25 +1,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input/examples/en_US/default/length/length.component.scss b/lib/ng-nest/ui/input/examples/en_US/default/length/length.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/length/length.component.scss +++ b/lib/ng-nest/ui/input/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/input/examples/en_US/default/length/length.component.ts b/lib/ng-nest/ui/input/examples/en_US/default/length/length.component.ts index a690f4157..23ef3ac6c 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/length/length.component.ts +++ b/lib/ng-nest/ui/input/examples/en_US/default/length/length.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XInputComponent } from '@ng-nest/ui/input'; @Component({ selector: 'ex-length', + standalone: true, + imports: [FormsModule, XInputComponent], templateUrl: './length.component.html', styleUrls: ['./length.component.scss'] }) diff --git a/lib/ng-nest/ui/input/examples/en_US/default/perpost/perpost.component.html b/lib/ng-nest/ui/input/examples/en_US/default/perpost/perpost.component.html index 2065517c4..53626c4a0 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/perpost/perpost.component.html +++ b/lib/ng-nest/ui/input/examples/en_US/default/perpost/perpost.component.html @@ -1,86 +1,85 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ diff --git a/lib/ng-nest/ui/input/examples/en_US/default/perpost/perpost.component.scss b/lib/ng-nest/ui/input/examples/en_US/default/perpost/perpost.component.scss index 0fdf75e48..4ae0d03d7 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/perpost/perpost.component.scss +++ b/lib/ng-nest/ui/input/examples/en_US/default/perpost/perpost.component.scss @@ -1,5 +1,8 @@ :host { - x-row > x-col:not(:first-child) { + .row x-input { + width: 18rem; + } + .row:not(:first-child) { margin-top: 1rem; } } 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 5b70bd0b5..08fa114fe 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 @@ -1,7 +1,28 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +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 { XDatePickerComponent } from '@ng-nest/ui/date-picker'; +import { XInputComponent } from '@ng-nest/ui/input'; +import { XSelectModule } from '@ng-nest/ui/select'; +import { XTimePickerModule } from '@ng-nest/ui/time-picker'; @Component({ selector: 'ex-perpost', + standalone: true, + imports: [ + CommonModule, + XInputComponent, + XSelectModule, + XButtonComponent, + XDatePickerComponent, + XAutoCompleteComponent, + XCascadeComponent, + XColorPickerComponent, + XTimePickerModule + ], templateUrl: './perpost.component.html', styleUrls: ['./perpost.component.scss'] }) diff --git a/lib/ng-nest/ui/input/examples/en_US/default/required/required.component.html b/lib/ng-nest/ui/input/examples/en_US/default/required/required.component.html index a37da3e2e..23b947e40 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/required/required.component.html +++ b/lib/ng-nest/ui/input/examples/en_US/default/required/required.component.html @@ -1,15 +1,9 @@ - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input/examples/en_US/default/required/required.component.scss b/lib/ng-nest/ui/input/examples/en_US/default/required/required.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/required/required.component.scss +++ b/lib/ng-nest/ui/input/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/input/examples/en_US/default/required/required.component.ts b/lib/ng-nest/ui/input/examples/en_US/default/required/required.component.ts index c8debbb95..b62aa1cd6 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/required/required.component.ts +++ b/lib/ng-nest/ui/input/examples/en_US/default/required/required.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XInputComponent } from '@ng-nest/ui/input'; @Component({ selector: 'ex-required', + standalone: true, + imports: [FormsModule, XInputComponent], templateUrl: './required.component.html', styleUrls: ['./required.component.scss'] }) diff --git a/lib/ng-nest/ui/input/examples/en_US/default/size/size.component.html b/lib/ng-nest/ui/input/examples/en_US/default/size/size.component.html index fc8cc4efd..076253f38 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/size/size.component.html +++ b/lib/ng-nest/ui/input/examples/en_US/default/size/size.component.html @@ -1,26 +1,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input/examples/en_US/default/size/size.component.scss b/lib/ng-nest/ui/input/examples/en_US/default/size/size.component.scss index 388331f62..5e83058ed 100644 --- a/lib/ng-nest/ui/input/examples/en_US/default/size/size.component.scss +++ b/lib/ng-nest/ui/input/examples/en_US/default/size/size.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 15rem; - } - x-row:not(:first-child) { + .row { margin-top: 1rem; } } 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 7840212ca..0accb38a6 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 @@ -1,8 +1,13 @@ 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'; @Component({ selector: 'ex-size', + standalone: true, + imports: [FormsModule, XInputComponent, XRadioModule], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/input/examples/index.ts b/lib/ng-nest/ui/input/examples/index.ts new file mode 100644 index 000000000..07dffdcee --- /dev/null +++ b/lib/ng-nest/ui/input/examples/index.ts @@ -0,0 +1,12 @@ +export * from './zh_CN/default/bordered/bordered.component'; +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/focus/focus.component'; +export * from './zh_CN/default/group/group.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/perpost/perpost.component'; +export * from './zh_CN/default/required/required.component'; +export * from './zh_CN/default/size/size.component'; diff --git a/lib/ng-nest/ui/input/examples/zh_CN/default/bordered/bordered.component.html b/lib/ng-nest/ui/input/examples/zh_CN/default/bordered/bordered.component.html index cf20c2b04..b30a479be 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/bordered/bordered.component.html +++ b/lib/ng-nest/ui/input/examples/zh_CN/default/bordered/bordered.component.html @@ -1,25 +1,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input/examples/zh_CN/default/bordered/bordered.component.scss b/lib/ng-nest/ui/input/examples/zh_CN/default/bordered/bordered.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/bordered/bordered.component.scss +++ b/lib/ng-nest/ui/input/examples/zh_CN/default/bordered/bordered.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/input/examples/zh_CN/default/bordered/bordered.component.ts b/lib/ng-nest/ui/input/examples/zh_CN/default/bordered/bordered.component.ts index 89ce67091..82df64fbd 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/bordered/bordered.component.ts +++ b/lib/ng-nest/ui/input/examples/zh_CN/default/bordered/bordered.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XInputComponent } from '@ng-nest/ui/input'; @Component({ selector: 'ex-bordered', + standalone: true, + imports: [XInputComponent], templateUrl: './bordered.component.html', styleUrls: ['./bordered.component.scss'] }) diff --git a/lib/ng-nest/ui/input/examples/zh_CN/default/clear/clear.component.html b/lib/ng-nest/ui/input/examples/zh_CN/default/clear/clear.component.html index 0a661dc3a..5186a4bd9 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/clear/clear.component.html +++ b/lib/ng-nest/ui/input/examples/zh_CN/default/clear/clear.component.html @@ -1,20 +1,12 @@ - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input/examples/zh_CN/default/clear/clear.component.scss b/lib/ng-nest/ui/input/examples/zh_CN/default/clear/clear.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/clear/clear.component.scss +++ b/lib/ng-nest/ui/input/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/input/examples/zh_CN/default/clear/clear.component.ts b/lib/ng-nest/ui/input/examples/zh_CN/default/clear/clear.component.ts index 10c6a7f54..a8fdbc46d 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/clear/clear.component.ts +++ b/lib/ng-nest/ui/input/examples/zh_CN/default/clear/clear.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XInputComponent } from '@ng-nest/ui/input'; @Component({ selector: 'ex-clear', + standalone: true, + imports: [FormsModule, XInputComponent], templateUrl: './clear.component.html', styleUrls: ['./clear.component.scss'] }) diff --git a/lib/ng-nest/ui/input/examples/zh_CN/default/default/default.component.html b/lib/ng-nest/ui/input/examples/zh_CN/default/default/default.component.html index ef60be406..9afecbe6d 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/default/default.component.html +++ b/lib/ng-nest/ui/input/examples/zh_CN/default/default/default.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input/examples/zh_CN/default/default/default.component.scss b/lib/ng-nest/ui/input/examples/zh_CN/default/default/default.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/default/default.component.scss +++ b/lib/ng-nest/ui/input/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/input/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/input/examples/zh_CN/default/default/default.component.ts index cae54f2a5..10f51c799 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/input/examples/zh_CN/default/default/default.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XInputComponent } from '@ng-nest/ui/input'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XInputComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/input/examples/zh_CN/default/disabled/disabled.component.html b/lib/ng-nest/ui/input/examples/zh_CN/default/disabled/disabled.component.html index 176c0fb8b..a00770911 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/disabled/disabled.component.html +++ b/lib/ng-nest/ui/input/examples/zh_CN/default/disabled/disabled.component.html @@ -1,20 +1,12 @@ - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input/examples/zh_CN/default/disabled/disabled.component.scss b/lib/ng-nest/ui/input/examples/zh_CN/default/disabled/disabled.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/disabled/disabled.component.scss +++ b/lib/ng-nest/ui/input/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/input/examples/zh_CN/default/disabled/disabled.component.ts b/lib/ng-nest/ui/input/examples/zh_CN/default/disabled/disabled.component.ts index dd37d0972..b54b200f1 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/disabled/disabled.component.ts +++ b/lib/ng-nest/ui/input/examples/zh_CN/default/disabled/disabled.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XInputComponent } from '@ng-nest/ui/input'; @Component({ selector: 'ex-disabled', + standalone: true, + imports: [FormsModule, XInputComponent], templateUrl: './disabled.component.html', styleUrls: ['./disabled.component.scss'] }) diff --git a/lib/ng-nest/ui/input/examples/zh_CN/default/focus/focus.component.html b/lib/ng-nest/ui/input/examples/zh_CN/default/focus/focus.component.html index 6809318a1..5cac6e0a9 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/focus/focus.component.html +++ b/lib/ng-nest/ui/input/examples/zh_CN/default/focus/focus.component.html @@ -1,12 +1,10 @@ - - - - 设置焦点（选中文字） - 设置焦点（光标在文字前） - 设置焦点（光标在文字后，默认） - - - - - - +
+ + 设置焦点（选中文字） + 设置焦点（光标在文字前） + 设置焦点（光标在文字后，默认） + +
+
+ +
diff --git a/lib/ng-nest/ui/input/examples/zh_CN/default/focus/focus.component.scss b/lib/ng-nest/ui/input/examples/zh_CN/default/focus/focus.component.scss index ff616fbb2..b4943baa0 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/focus/focus.component.scss +++ b/lib/ng-nest/ui/input/examples/zh_CN/default/focus/focus.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/input/examples/zh_CN/default/focus/focus.component.ts b/lib/ng-nest/ui/input/examples/zh_CN/default/focus/focus.component.ts index 3d3abf6fc..e59ab5d98 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/focus/focus.component.ts +++ b/lib/ng-nest/ui/input/examples/zh_CN/default/focus/focus.component.ts @@ -1,7 +1,12 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; +import { XInputComponent } from '@ng-nest/ui/input'; @Component({ selector: 'ex-focus', + standalone: true, + imports: [FormsModule, XInputComponent, XButtonComponent, XButtonsComponent], templateUrl: './focus.component.html', styleUrls: ['./focus.component.scss'] }) diff --git a/lib/ng-nest/ui/input/examples/zh_CN/default/group/group.component.html b/lib/ng-nest/ui/input/examples/zh_CN/default/group/group.component.html index 78f840d97..6d94dac74 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/group/group.component.html +++ b/lib/ng-nest/ui/input/examples/zh_CN/default/group/group.component.html @@ -1,12 +1,6 @@ - - - - - - - - - + + + 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 4d1cc0ab7..b5338ea8b 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 @@ -1,7 +1,33 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +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 { 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 { XTimePickerModule } from '@ng-nest/ui/time-picker'; @Component({ selector: 'ex-group', + standalone: true, + imports: [ + CommonModule, + XInputComponent, + XInputGroupComponent, + XSelectModule, + XButtonComponent, + XDatePickerComponent, + XAutoCompleteComponent, + XCascadeComponent, + XColorPickerComponent, + XFindComponent, + XTimePickerModule, + XTextareaModule + ], templateUrl: './group.component.html', styleUrls: ['./group.component.scss'] }) diff --git a/lib/ng-nest/ui/input/examples/zh_CN/default/icon/icon.component.html b/lib/ng-nest/ui/input/examples/zh_CN/default/icon/icon.component.html index fab42110c..c927de4bf 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/icon/icon.component.html +++ b/lib/ng-nest/ui/input/examples/zh_CN/default/icon/icon.component.html @@ -1,10 +1,6 @@ - - - - - - - - - - +
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input/examples/zh_CN/default/icon/icon.component.scss b/lib/ng-nest/ui/input/examples/zh_CN/default/icon/icon.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/icon/icon.component.scss +++ b/lib/ng-nest/ui/input/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/input/examples/zh_CN/default/icon/icon.component.ts b/lib/ng-nest/ui/input/examples/zh_CN/default/icon/icon.component.ts index 7ad46cf35..cbf04a00a 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/icon/icon.component.ts +++ b/lib/ng-nest/ui/input/examples/zh_CN/default/icon/icon.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XInputComponent } from '@ng-nest/ui/input'; @Component({ selector: 'ex-icon', + standalone: true, + imports: [XInputComponent], templateUrl: './icon.component.html', styleUrls: ['./icon.component.scss'] }) diff --git a/lib/ng-nest/ui/input/examples/zh_CN/default/label/label.component.html b/lib/ng-nest/ui/input/examples/zh_CN/default/label/label.component.html index da755e222..09c62c6ca 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/label/label.component.html +++ b/lib/ng-nest/ui/input/examples/zh_CN/default/label/label.component.html @@ -1,20 +1,12 @@ - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input/examples/zh_CN/default/label/label.component.scss b/lib/ng-nest/ui/input/examples/zh_CN/default/label/label.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/label/label.component.scss +++ b/lib/ng-nest/ui/input/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/input/examples/zh_CN/default/label/label.component.ts b/lib/ng-nest/ui/input/examples/zh_CN/default/label/label.component.ts index 64c8a7056..0338cdccb 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/label/label.component.ts +++ b/lib/ng-nest/ui/input/examples/zh_CN/default/label/label.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XInputComponent } from '@ng-nest/ui/input'; @Component({ selector: 'ex-label', + standalone: true, + imports: [XInputComponent], templateUrl: './label.component.html', styleUrls: ['./label.component.scss'] }) diff --git a/lib/ng-nest/ui/input/examples/zh_CN/default/length/length.component.html b/lib/ng-nest/ui/input/examples/zh_CN/default/length/length.component.html index 3e3eb4c62..abc2da5e8 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/length/length.component.html +++ b/lib/ng-nest/ui/input/examples/zh_CN/default/length/length.component.html @@ -1,25 +1,15 @@ - - - - - - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input/examples/zh_CN/default/length/length.component.scss b/lib/ng-nest/ui/input/examples/zh_CN/default/length/length.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/length/length.component.scss +++ b/lib/ng-nest/ui/input/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/input/examples/zh_CN/default/length/length.component.ts b/lib/ng-nest/ui/input/examples/zh_CN/default/length/length.component.ts index a690f4157..23ef3ac6c 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/length/length.component.ts +++ b/lib/ng-nest/ui/input/examples/zh_CN/default/length/length.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XInputComponent } from '@ng-nest/ui/input'; @Component({ selector: 'ex-length', + standalone: true, + imports: [FormsModule, XInputComponent], templateUrl: './length.component.html', styleUrls: ['./length.component.scss'] }) diff --git a/lib/ng-nest/ui/input/examples/zh_CN/default/perpost/perpost.component.html b/lib/ng-nest/ui/input/examples/zh_CN/default/perpost/perpost.component.html index 2f165e104..20f37a892 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/perpost/perpost.component.html +++ b/lib/ng-nest/ui/input/examples/zh_CN/default/perpost/perpost.component.html @@ -1,86 +1,84 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input/examples/zh_CN/default/perpost/perpost.component.scss b/lib/ng-nest/ui/input/examples/zh_CN/default/perpost/perpost.component.scss index 0fdf75e48..4ae0d03d7 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/perpost/perpost.component.scss +++ b/lib/ng-nest/ui/input/examples/zh_CN/default/perpost/perpost.component.scss @@ -1,5 +1,8 @@ :host { - x-row > x-col:not(:first-child) { + .row x-input { + width: 18rem; + } + .row:not(:first-child) { margin-top: 1rem; } } 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 5b70bd0b5..08fa114fe 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 @@ -1,7 +1,28 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +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 { XDatePickerComponent } from '@ng-nest/ui/date-picker'; +import { XInputComponent } from '@ng-nest/ui/input'; +import { XSelectModule } from '@ng-nest/ui/select'; +import { XTimePickerModule } from '@ng-nest/ui/time-picker'; @Component({ selector: 'ex-perpost', + standalone: true, + imports: [ + CommonModule, + XInputComponent, + XSelectModule, + XButtonComponent, + XDatePickerComponent, + XAutoCompleteComponent, + XCascadeComponent, + XColorPickerComponent, + XTimePickerModule + ], templateUrl: './perpost.component.html', styleUrls: ['./perpost.component.scss'] }) diff --git a/lib/ng-nest/ui/input/examples/zh_CN/default/required/required.component.html b/lib/ng-nest/ui/input/examples/zh_CN/default/required/required.component.html index 955c12644..fdd858bde 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/required/required.component.html +++ b/lib/ng-nest/ui/input/examples/zh_CN/default/required/required.component.html @@ -1,15 +1,9 @@ - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input/examples/zh_CN/default/required/required.component.scss b/lib/ng-nest/ui/input/examples/zh_CN/default/required/required.component.scss index 388331f62..b4943baa0 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/required/required.component.scss +++ b/lib/ng-nest/ui/input/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/input/examples/zh_CN/default/required/required.component.ts b/lib/ng-nest/ui/input/examples/zh_CN/default/required/required.component.ts index c8debbb95..b62aa1cd6 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/required/required.component.ts +++ b/lib/ng-nest/ui/input/examples/zh_CN/default/required/required.component.ts @@ -1,7 +1,11 @@ import { Component } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XInputComponent } from '@ng-nest/ui/input'; @Component({ selector: 'ex-required', + standalone: true, + imports: [FormsModule, XInputComponent], templateUrl: './required.component.html', styleUrls: ['./required.component.scss'] }) diff --git a/lib/ng-nest/ui/input/examples/zh_CN/default/size/size.component.html b/lib/ng-nest/ui/input/examples/zh_CN/default/size/size.component.html index af3a5dc24..8d3955b74 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/size/size.component.html +++ b/lib/ng-nest/ui/input/examples/zh_CN/default/size/size.component.html @@ -1,26 +1,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/lib/ng-nest/ui/input/examples/zh_CN/default/size/size.component.scss b/lib/ng-nest/ui/input/examples/zh_CN/default/size/size.component.scss index 388331f62..5e83058ed 100644 --- a/lib/ng-nest/ui/input/examples/zh_CN/default/size/size.component.scss +++ b/lib/ng-nest/ui/input/examples/zh_CN/default/size/size.component.scss @@ -1,8 +1,5 @@ :host { - x-row > x-col { - width: 15rem; - } - x-row:not(:first-child) { + .row { margin-top: 1rem; } } 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 7840212ca..0accb38a6 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 @@ -1,8 +1,13 @@ 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'; @Component({ selector: 'ex-size', + standalone: true, + imports: [FormsModule, XInputComponent, XRadioModule], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/input/input-group.component.ts b/lib/ng-nest/ui/input/input-group.component.ts index 324b34674..6fd488049 100644 --- a/lib/ng-nest/ui/input/input-group.component.ts +++ b/lib/ng-nest/ui/input/input-group.component.ts @@ -1,21 +1,24 @@ -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Renderer2, ViewEncapsulation } from '@angular/core'; +import { + ChangeDetectionStrategy, + Component, + ElementRef, + ViewEncapsulation, + inject +} from '@angular/core'; import { XConfigService } from '@ng-nest/ui/core'; import { XInputGroupPrefix, XInputGroupProperty } from './input.property'; +import { CommonModule } from '@angular/common'; @Component({ selector: `${XInputGroupPrefix}`, + standalone: true, + imports: [CommonModule], templateUrl: './input-group.component.html', styleUrls: ['./input-group.component.scss'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush }) export class XInputGroupComponent extends XInputGroupProperty { - constructor( - public renderer: Renderer2, - public elementRef: ElementRef, - public cdr: ChangeDetectorRef, - public configService: XConfigService - ) { - super(); - } + configService = inject(XConfigService); + elementRef = inject(ElementRef); } diff --git a/lib/ng-nest/ui/input/input.component.spec.ts b/lib/ng-nest/ui/input/input.component.spec.ts index acee39878..5587b73c5 100644 --- a/lib/ng-nest/ui/input/input.component.spec.ts +++ b/lib/ng-nest/ui/input/input.component.spec.ts @@ -1,9 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XInputComponent } from './input.component'; import { Component, DebugElement, ChangeDetectorRef } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { XInputModule } from '@ng-nest/ui/input'; +import { XInputComponent, XInputGroupComponent } from '@ng-nest/ui/input'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { XInputPrefix } from './input.property'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; @@ -12,12 +10,12 @@ 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 { XButtonComponent } from '@ng-nest/ui/button'; +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 { XFindModule } from '@ng-nest/ui/find'; +import { XFindComponent } from '@ng-nest/ui/find'; import { XTextareaModule } from '@ng-nest/ui/textarea'; import { XTimePickerModule } from '@ng-nest/ui/time-picker'; import { HttpClientTestingModule } from '@angular/common/http/testing'; @@ -29,7 +27,8 @@ describe(XInputPrefix, () => { BrowserAnimationsModule, HttpClientTestingModule, XThemeModule, - XInputModule, + XInputComponent, + XInputGroupComponent, FormsModule, ReactiveFormsModule, XRowComponent, @@ -37,11 +36,12 @@ describe(XInputPrefix, () => { XRadioModule, XSelectModule, XButtonComponent, + XButtonsComponent, XDatePickerComponent, XAutoCompleteComponent, XCascadeComponent, XColorPickerComponent, - XFindModule, + XFindComponent, XTextareaModule, XTimePickerModule ], diff --git a/lib/ng-nest/ui/input/input.component.ts b/lib/ng-nest/ui/input/input.component.ts index 63ce4fd9a..17e6b3f6f 100644 --- a/lib/ng-nest/ui/input/input.component.ts +++ b/lib/ng-nest/ui/input/input.component.ts @@ -9,9 +9,9 @@ import { ViewChild, OnChanges, SimpleChanges, - Optional, TemplateRef, - HostBinding + HostBinding, + inject } from '@angular/core'; import { XInputPrefix, XInputProperty } from './input.property'; import { @@ -25,9 +25,15 @@ import { import { Subject, distinctUntilChanged, fromEvent, takeUntil } from 'rxjs'; import { XValueAccessor } from '@ng-nest/ui/base-form'; import { XInputGroupComponent } from './input-group.component'; +import { CommonModule } from '@angular/common'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XOutletDirective } from '@ng-nest/ui/outlet'; @Component({ selector: `${XInputPrefix}`, + standalone: true, + imports: [CommonModule, FormsModule, ReactiveFormsModule, XIconComponent, XOutletDirective], templateUrl: './input.component.html', styleUrls: ['./input.component.scss'], encapsulation: ViewEncapsulation.None, @@ -87,15 +93,11 @@ export class XInputComponent extends XInputProperty implements OnInit, OnChanges return `calc(100% - ${this.paddingLeft + this.paddingRight}rem)`; } - constructor( - public renderer: Renderer2, - public elementRef: ElementRef, - public override cdr: ChangeDetectorRef, - public configService: XConfigService, - @Optional() public inputGroup: XInputGroupComponent - ) { - super(); - } + private renderer = inject(Renderer2); + override cdr = inject(ChangeDetectorRef); + private inputGroup = inject(XInputGroupComponent, { optional: true }); + elementRef = inject(ElementRef); + configService = inject(XConfigService); ngOnInit() { this.setPadding(); diff --git a/lib/ng-nest/ui/input/input.module.ts b/lib/ng-nest/ui/input/input.module.ts index f11efb3e2..7991d6898 100644 --- a/lib/ng-nest/ui/input/input.module.ts +++ b/lib/ng-nest/ui/input/input.module.ts @@ -1,23 +1,8 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { XInputComponent } from './input.component'; -import { XIconComponent } from '@ng-nest/ui/icon'; -import { XInputGroupProperty, XInputProperty } from './input.property'; -import { XControlValueAccessor } from '@ng-nest/ui/base-form'; import { XInputGroupComponent } from './input-group.component'; -import { XOutletDirective } from '@ng-nest/ui/outlet'; - @NgModule({ - declarations: [XInputComponent, XInputProperty, XInputGroupComponent, XInputGroupProperty], exports: [XInputComponent, XInputGroupComponent], - imports: [ - CommonModule, - FormsModule, - ReactiveFormsModule, - XIconComponent, - XControlValueAccessor, - XOutletDirective - ] + imports: [XInputComponent, XInputGroupComponent] }) export class XInputModule {} diff --git a/lib/ng-nest/ui/keyword/keyword.directive.spec.ts b/lib/ng-nest/ui/keyword/keyword.directive.spec.ts index 509003376..ffd13179a 100644 --- a/lib/ng-nest/ui/keyword/keyword.directive.spec.ts +++ b/lib/ng-nest/ui/keyword/keyword.directive.spec.ts @@ -1,11 +1,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XKeywordDirective } from './keyword.directive'; import { Component, DebugElement } from '@angular/core'; import { By } from '@angular/platform-browser'; import { XKeywordPrefix } from './keyword.property'; import { XButtonComponent } from '@ng-nest/ui/button'; -import { XKeywordDirective } from './keyword.module'; +import { XKeywordDirective } from '@ng-nest/ui/keyword'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XKeywordPrefix, () => { diff --git a/lib/ng-nest/ui/layout/examples/index.ts b/lib/ng-nest/ui/layout/examples/index.ts new file mode 100644 index 000000000..3dfad6d7a --- /dev/null +++ b/lib/ng-nest/ui/layout/examples/index.ts @@ -0,0 +1,7 @@ +export * from './zh_CN/default/blend/blend.component'; +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/flex/flex.component'; +export * from './zh_CN/default/hidden/hidden.component'; +export * from './zh_CN/default/layout/layout.component'; +export * from './zh_CN/default/offset/offset.component'; +export * from './zh_CN/default/space/space.component'; diff --git a/lib/ng-nest/ui/link/examples/en_US/default/default/default.component.html b/lib/ng-nest/ui/link/examples/en_US/default/default/default.component.html index d37af3306..bcb707771 100644 --- a/lib/ng-nest/ui/link/examples/en_US/default/default/default.component.html +++ b/lib/ng-nest/ui/link/examples/en_US/default/default/default.component.html @@ -1,10 +1,6 @@ - - - default - primary - success - warning - danger - info - - +default +primary +success +warning +danger +info diff --git a/lib/ng-nest/ui/link/examples/en_US/default/default/default.component.scss b/lib/ng-nest/ui/link/examples/en_US/default/default/default.component.scss index b2428ff47..4ba7904ad 100644 --- a/lib/ng-nest/ui/link/examples/en_US/default/default/default.component.scss +++ b/lib/ng-nest/ui/link/examples/en_US/default/default/default.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col > x-link:not(:first-child) { + x-link:not(:first-child) { margin-left: 1rem; } } diff --git a/lib/ng-nest/ui/link/examples/en_US/default/disabled/disabled.component.html b/lib/ng-nest/ui/link/examples/en_US/default/disabled/disabled.component.html index f5aeaaacb..07d3c8938 100644 --- a/lib/ng-nest/ui/link/examples/en_US/default/disabled/disabled.component.html +++ b/lib/ng-nest/ui/link/examples/en_US/default/disabled/disabled.component.html @@ -1,10 +1,6 @@ - - - default - primary - success - warning - danger - info - - +default +primary +success +warning +danger +info diff --git a/lib/ng-nest/ui/link/examples/en_US/default/disabled/disabled.component.scss b/lib/ng-nest/ui/link/examples/en_US/default/disabled/disabled.component.scss index b2428ff47..4ba7904ad 100644 --- a/lib/ng-nest/ui/link/examples/en_US/default/disabled/disabled.component.scss +++ b/lib/ng-nest/ui/link/examples/en_US/default/disabled/disabled.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col > x-link:not(:first-child) { + x-link:not(:first-child) { margin-left: 1rem; } } diff --git a/lib/ng-nest/ui/link/examples/en_US/default/disabled/disabled.component.ts b/lib/ng-nest/ui/link/examples/en_US/default/disabled/disabled.component.ts index 7bf6eac69..7cab7bfa0 100644 --- a/lib/ng-nest/ui/link/examples/en_US/default/disabled/disabled.component.ts +++ b/lib/ng-nest/ui/link/examples/en_US/default/disabled/disabled.component.ts @@ -1,11 +1,10 @@ import { Component } from '@angular/core'; -import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { XLinkComponent } from '@ng-nest/ui/link'; @Component({ selector: 'ex-disabled', standalone: true, - imports: [XLinkComponent, XRowComponent, XColComponent], + imports: [XLinkComponent], templateUrl: './disabled.component.html', styleUrls: ['./disabled.component.scss'] }) diff --git a/lib/ng-nest/ui/link/examples/en_US/default/icon/icon.component.html b/lib/ng-nest/ui/link/examples/en_US/default/icon/icon.component.html index 098217774..ea47125f4 100644 --- a/lib/ng-nest/ui/link/examples/en_US/default/icon/icon.component.html +++ b/lib/ng-nest/ui/link/examples/en_US/default/icon/icon.component.html @@ -1,6 +1,2 @@ - - - back - forward - - +back +forward diff --git a/lib/ng-nest/ui/link/examples/en_US/default/icon/icon.component.scss b/lib/ng-nest/ui/link/examples/en_US/default/icon/icon.component.scss index b2428ff47..4ba7904ad 100644 --- a/lib/ng-nest/ui/link/examples/en_US/default/icon/icon.component.scss +++ b/lib/ng-nest/ui/link/examples/en_US/default/icon/icon.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col > x-link:not(:first-child) { + x-link:not(:first-child) { margin-left: 1rem; } } diff --git a/lib/ng-nest/ui/link/examples/en_US/default/icon/icon.component.ts b/lib/ng-nest/ui/link/examples/en_US/default/icon/icon.component.ts index 8d9083d6a..4fa9d0782 100644 --- a/lib/ng-nest/ui/link/examples/en_US/default/icon/icon.component.ts +++ b/lib/ng-nest/ui/link/examples/en_US/default/icon/icon.component.ts @@ -1,11 +1,10 @@ import { Component } from '@angular/core'; -import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { XLinkComponent } from '@ng-nest/ui/link'; @Component({ selector: 'ex-icon', standalone: true, - imports: [XLinkComponent, XRowComponent, XColComponent], + imports: [XLinkComponent], templateUrl: './icon.component.html', styleUrls: ['./icon.component.scss'] }) diff --git a/lib/ng-nest/ui/link/examples/en_US/default/underline/underline.component.html b/lib/ng-nest/ui/link/examples/en_US/default/underline/underline.component.html index d2d8b8c2f..1d4b7c649 100644 --- a/lib/ng-nest/ui/link/examples/en_US/default/underline/underline.component.html +++ b/lib/ng-nest/ui/link/examples/en_US/default/underline/underline.component.html @@ -1,6 +1,2 @@ - - - underlined - none - - +underlined +none diff --git a/lib/ng-nest/ui/link/examples/en_US/default/underline/underline.component.scss b/lib/ng-nest/ui/link/examples/en_US/default/underline/underline.component.scss index b2428ff47..4ba7904ad 100644 --- a/lib/ng-nest/ui/link/examples/en_US/default/underline/underline.component.scss +++ b/lib/ng-nest/ui/link/examples/en_US/default/underline/underline.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col > x-link:not(:first-child) { + x-link:not(:first-child) { margin-left: 1rem; } } diff --git a/lib/ng-nest/ui/link/examples/en_US/default/underline/underline.component.ts b/lib/ng-nest/ui/link/examples/en_US/default/underline/underline.component.ts index 02f126ec8..802dc920f 100644 --- a/lib/ng-nest/ui/link/examples/en_US/default/underline/underline.component.ts +++ b/lib/ng-nest/ui/link/examples/en_US/default/underline/underline.component.ts @@ -1,11 +1,10 @@ import { Component } from '@angular/core'; -import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { XLinkComponent } from '@ng-nest/ui/link'; @Component({ selector: 'ex-underline', standalone: true, - imports: [XLinkComponent, XRowComponent, XColComponent], + imports: [XLinkComponent], templateUrl: './underline.component.html', styleUrls: ['./underline.component.scss'] }) diff --git a/lib/ng-nest/ui/link/examples/index.ts b/lib/ng-nest/ui/link/examples/index.ts new file mode 100644 index 000000000..53c025e04 --- /dev/null +++ b/lib/ng-nest/ui/link/examples/index.ts @@ -0,0 +1,4 @@ +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/underline/underline.component'; diff --git a/lib/ng-nest/ui/link/examples/zh_CN/default/default/default.component.html b/lib/ng-nest/ui/link/examples/zh_CN/default/default/default.component.html index c0b8049b8..94673e2be 100644 --- a/lib/ng-nest/ui/link/examples/zh_CN/default/default/default.component.html +++ b/lib/ng-nest/ui/link/examples/zh_CN/default/default/default.component.html @@ -1,10 +1,6 @@ - - - 默认链接 - 主要链接 - 成功链接 - 警告链接 - 危险链接 - 信息链接 - - +默认链接 +主要链接 +成功链接 +警告链接 +危险链接 +信息链接 diff --git a/lib/ng-nest/ui/link/examples/zh_CN/default/default/default.component.scss b/lib/ng-nest/ui/link/examples/zh_CN/default/default/default.component.scss index b2428ff47..4ba7904ad 100644 --- a/lib/ng-nest/ui/link/examples/zh_CN/default/default/default.component.scss +++ b/lib/ng-nest/ui/link/examples/zh_CN/default/default/default.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col > x-link:not(:first-child) { + x-link:not(:first-child) { margin-left: 1rem; } } diff --git a/lib/ng-nest/ui/link/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/link/examples/zh_CN/default/default/default.component.ts index 24d6c42e1..f8f4ea24c 100644 --- a/lib/ng-nest/ui/link/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/link/examples/zh_CN/default/default/default.component.ts @@ -1,11 +1,10 @@ import { Component } from '@angular/core'; -import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { XLinkComponent } from '@ng-nest/ui/link'; @Component({ selector: 'ex-default', standalone: true, - imports: [XLinkComponent, XRowComponent, XColComponent], + imports: [XLinkComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/link/examples/zh_CN/default/disabled/disabled.component.html b/lib/ng-nest/ui/link/examples/zh_CN/default/disabled/disabled.component.html index 100e2262e..f7d578356 100644 --- a/lib/ng-nest/ui/link/examples/zh_CN/default/disabled/disabled.component.html +++ b/lib/ng-nest/ui/link/examples/zh_CN/default/disabled/disabled.component.html @@ -1,10 +1,6 @@ - - - 默认链接 - 主要链接 - 成功链接 - 警告链接 - 危险链接 - 信息链接 - - +默认链接 +主要链接 +成功链接 +警告链接 +危险链接 +信息链接 diff --git a/lib/ng-nest/ui/link/examples/zh_CN/default/disabled/disabled.component.scss b/lib/ng-nest/ui/link/examples/zh_CN/default/disabled/disabled.component.scss index b2428ff47..4ba7904ad 100644 --- a/lib/ng-nest/ui/link/examples/zh_CN/default/disabled/disabled.component.scss +++ b/lib/ng-nest/ui/link/examples/zh_CN/default/disabled/disabled.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col > x-link:not(:first-child) { + x-link:not(:first-child) { margin-left: 1rem; } } diff --git a/lib/ng-nest/ui/link/examples/zh_CN/default/disabled/disabled.component.ts b/lib/ng-nest/ui/link/examples/zh_CN/default/disabled/disabled.component.ts index 7bf6eac69..7cab7bfa0 100644 --- a/lib/ng-nest/ui/link/examples/zh_CN/default/disabled/disabled.component.ts +++ b/lib/ng-nest/ui/link/examples/zh_CN/default/disabled/disabled.component.ts @@ -1,11 +1,10 @@ import { Component } from '@angular/core'; -import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { XLinkComponent } from '@ng-nest/ui/link'; @Component({ selector: 'ex-disabled', standalone: true, - imports: [XLinkComponent, XRowComponent, XColComponent], + imports: [XLinkComponent], templateUrl: './disabled.component.html', styleUrls: ['./disabled.component.scss'] }) diff --git a/lib/ng-nest/ui/link/examples/zh_CN/default/icon/icon.component.html b/lib/ng-nest/ui/link/examples/zh_CN/default/icon/icon.component.html index 252375369..f457a97b2 100644 --- a/lib/ng-nest/ui/link/examples/zh_CN/default/icon/icon.component.html +++ b/lib/ng-nest/ui/link/examples/zh_CN/default/icon/icon.component.html @@ -1,6 +1,2 @@ - - - 后退 - 前进 - - +后退 +前进 diff --git a/lib/ng-nest/ui/link/examples/zh_CN/default/icon/icon.component.scss b/lib/ng-nest/ui/link/examples/zh_CN/default/icon/icon.component.scss index b2428ff47..4ba7904ad 100644 --- a/lib/ng-nest/ui/link/examples/zh_CN/default/icon/icon.component.scss +++ b/lib/ng-nest/ui/link/examples/zh_CN/default/icon/icon.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col > x-link:not(:first-child) { + x-link:not(:first-child) { margin-left: 1rem; } } diff --git a/lib/ng-nest/ui/link/examples/zh_CN/default/icon/icon.component.ts b/lib/ng-nest/ui/link/examples/zh_CN/default/icon/icon.component.ts index 8d9083d6a..4fa9d0782 100644 --- a/lib/ng-nest/ui/link/examples/zh_CN/default/icon/icon.component.ts +++ b/lib/ng-nest/ui/link/examples/zh_CN/default/icon/icon.component.ts @@ -1,11 +1,10 @@ import { Component } from '@angular/core'; -import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { XLinkComponent } from '@ng-nest/ui/link'; @Component({ selector: 'ex-icon', standalone: true, - imports: [XLinkComponent, XRowComponent, XColComponent], + imports: [XLinkComponent], templateUrl: './icon.component.html', styleUrls: ['./icon.component.scss'] }) diff --git a/lib/ng-nest/ui/link/examples/zh_CN/default/underline/underline.component.html b/lib/ng-nest/ui/link/examples/zh_CN/default/underline/underline.component.html index 5c5ac0178..8a0a3f6b2 100644 --- a/lib/ng-nest/ui/link/examples/zh_CN/default/underline/underline.component.html +++ b/lib/ng-nest/ui/link/examples/zh_CN/default/underline/underline.component.html @@ -1,6 +1,2 @@ - - - 有下划线 - 无下划线 - - +有下划线 +无下划线 diff --git a/lib/ng-nest/ui/link/examples/zh_CN/default/underline/underline.component.scss b/lib/ng-nest/ui/link/examples/zh_CN/default/underline/underline.component.scss index b2428ff47..4ba7904ad 100644 --- a/lib/ng-nest/ui/link/examples/zh_CN/default/underline/underline.component.scss +++ b/lib/ng-nest/ui/link/examples/zh_CN/default/underline/underline.component.scss @@ -1,5 +1,5 @@ :host { - x-row > x-col > x-link:not(:first-child) { + x-link:not(:first-child) { margin-left: 1rem; } } diff --git a/lib/ng-nest/ui/link/examples/zh_CN/default/underline/underline.component.ts b/lib/ng-nest/ui/link/examples/zh_CN/default/underline/underline.component.ts index 02f126ec8..802dc920f 100644 --- a/lib/ng-nest/ui/link/examples/zh_CN/default/underline/underline.component.ts +++ b/lib/ng-nest/ui/link/examples/zh_CN/default/underline/underline.component.ts @@ -1,11 +1,10 @@ import { Component } from '@angular/core'; -import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { XLinkComponent } from '@ng-nest/ui/link'; @Component({ selector: 'ex-underline', standalone: true, - imports: [XLinkComponent, XRowComponent, XColComponent], + imports: [XLinkComponent], templateUrl: './underline.component.html', styleUrls: ['./underline.component.scss'] }) diff --git a/lib/ng-nest/ui/link/link.component.ts b/lib/ng-nest/ui/link/link.component.ts index bac9852e6..ee5036ca7 100644 --- a/lib/ng-nest/ui/link/link.component.ts +++ b/lib/ng-nest/ui/link/link.component.ts @@ -15,13 +15,11 @@ import { XLinkPrefix, XLinkProperty } from './link.property'; import { XConfigService, XIsEmpty } from '@ng-nest/ui/core'; import { CommonModule } from '@angular/common'; import { XIconComponent } from '@ng-nest/ui/icon'; -import { XOutletDirective } from '@ng-nest/ui/outlet'; -import { XRippleDirective } from '@ng-nest/ui/ripple'; @Component({ selector: `${XLinkPrefix}`, standalone: true, - imports: [CommonModule, XIconComponent, XOutletDirective, XRippleDirective, XLinkProperty], + imports: [CommonModule, XIconComponent], templateUrl: './link.component.html', styleUrls: ['./link.component.scss'], encapsulation: ViewEncapsulation.None, diff --git a/lib/ng-nest/ui/list/examples/en_US/default/default/default.component.html b/lib/ng-nest/ui/list/examples/en_US/default/default/default.component.html index 6414463f0..cb6ca2a4d 100644 --- a/lib/ng-nest/ui/list/examples/en_US/default/default/default.component.html +++ b/lib/ng-nest/ui/list/examples/en_US/default/default/default.component.html @@ -1,37 +1,31 @@ - - -
- - -
- - -
- - - - -
- - -
- - -
- - - - -
Drag the up and down
-
- - -
Template
-
- {{ node.label }}2 - - -
Header/Footer
-
- - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
Drag the up and down
+
+
+
+
Template
+
+ {{ node.label }}2 +
+
+
Header/Footer
+
+
diff --git a/lib/ng-nest/ui/list/examples/en_US/default/default/default.component.scss b/lib/ng-nest/ui/list/examples/en_US/default/default/default.component.scss index f62b54cfc..b4943baa0 100644 --- a/lib/ng-nest/ui/list/examples/en_US/default/default/default.component.scss +++ b/lib/ng-nest/ui/list/examples/en_US/default/default/default.component.scss @@ -1,9 +1,5 @@ :host { - x-row > x-col > div { - border: 0.0625rem solid var(--x-border-300); - border-radius: 0.125rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/list/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/list/examples/en_US/default/default/default.component.ts index 964f3c0a9..8009d68e0 100644 --- a/lib/ng-nest/ui/list/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/list/examples/en_US/default/default/default.component.ts @@ -1,7 +1,12 @@ +import { CommonModule } from '@angular/common'; import { Component, OnInit } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XListComponent } from '@ng-nest/ui/list'; @Component({ selector: 'ex-default', + standalone: true, + imports: [CommonModule, FormsModule, XListComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/list/examples/en_US/default/load-more/load-more.component.ts b/lib/ng-nest/ui/list/examples/en_US/default/load-more/load-more.component.ts index 8c57aa937..54db2f03d 100644 --- a/lib/ng-nest/ui/list/examples/en_US/default/load-more/load-more.component.ts +++ b/lib/ng-nest/ui/list/examples/en_US/default/load-more/load-more.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; +import { XListComponent } from '@ng-nest/ui/list'; import { Observable } from 'rxjs'; @Component({ selector: 'ex-load-more', + standalone: true, + imports: [XListComponent], templateUrl: './load-more.component.html', styleUrls: ['./load-more.component.scss'] }) 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 708e04d27..2194c9682 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 @@ -1,8 +1,15 @@ +import { CommonModule } from '@angular/common'; 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 { XListComponent } from '@ng-nest/ui/list'; +import { XRadioModule } from '@ng-nest/ui/radio'; @Component({ selector: 'ex-scroll', + standalone: true, + imports: [CommonModule, FormsModule, XListComponent, XRadioModule, 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 8fa12d7d7..564378202 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,8 +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 { XListComponent } from '@ng-nest/ui/list'; @Component({ selector: 'ex-size', + standalone: true, + imports: [FormsModule, XListComponent, XRadioModule], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/list/examples/index.ts b/lib/ng-nest/ui/list/examples/index.ts new file mode 100644 index 000000000..cf41ebead --- /dev/null +++ b/lib/ng-nest/ui/list/examples/index.ts @@ -0,0 +1,4 @@ +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/load-more/load-more.component'; +export * from './zh_CN/default/scroll/scroll.component'; +export * from './zh_CN/default/size/size.component'; diff --git a/lib/ng-nest/ui/list/examples/zh_CN/default/default/default.component.html b/lib/ng-nest/ui/list/examples/zh_CN/default/default/default.component.html index 232d7e5c4..f9c184870 100644 --- a/lib/ng-nest/ui/list/examples/zh_CN/default/default/default.component.html +++ b/lib/ng-nest/ui/list/examples/zh_CN/default/default/default.component.html @@ -1,37 +1,31 @@ - - -
- - -
- - -
- - - - -
- - -
- - -
- - - - -
上下拖动
-
- - -
模板
-
- {{ node.label }}2 - - -
头部/底部
-
- - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
上下拖动
+
+
+
+
模板
+
+ {{ node.label }}2 +
+
+
头部/底部
+
+
diff --git a/lib/ng-nest/ui/list/examples/zh_CN/default/default/default.component.scss b/lib/ng-nest/ui/list/examples/zh_CN/default/default/default.component.scss index f62b54cfc..b4943baa0 100644 --- a/lib/ng-nest/ui/list/examples/zh_CN/default/default/default.component.scss +++ b/lib/ng-nest/ui/list/examples/zh_CN/default/default/default.component.scss @@ -1,9 +1,5 @@ :host { - x-row > x-col > div { - border: 0.0625rem solid var(--x-border-300); - border-radius: 0.125rem; - } - x-row:not(:first-child) { + .row:not(:first-child) { margin-top: 1rem; } } diff --git a/lib/ng-nest/ui/list/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/list/examples/zh_CN/default/default/default.component.ts index 964f3c0a9..8009d68e0 100644 --- a/lib/ng-nest/ui/list/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/list/examples/zh_CN/default/default/default.component.ts @@ -1,7 +1,12 @@ +import { CommonModule } from '@angular/common'; import { Component, OnInit } from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { XListComponent } from '@ng-nest/ui/list'; @Component({ selector: 'ex-default', + standalone: true, + imports: [CommonModule, FormsModule, XListComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/list/examples/zh_CN/default/load-more/load-more.component.ts b/lib/ng-nest/ui/list/examples/zh_CN/default/load-more/load-more.component.ts index 8c57aa937..54db2f03d 100644 --- a/lib/ng-nest/ui/list/examples/zh_CN/default/load-more/load-more.component.ts +++ b/lib/ng-nest/ui/list/examples/zh_CN/default/load-more/load-more.component.ts @@ -1,8 +1,11 @@ import { Component } from '@angular/core'; +import { XListComponent } from '@ng-nest/ui/list'; import { Observable } from 'rxjs'; @Component({ selector: 'ex-load-more', + standalone: true, + imports: [XListComponent], templateUrl: './load-more.component.html', styleUrls: ['./load-more.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 2e34f4e73..83fb7585c 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 @@ -1,8 +1,15 @@ +import { CommonModule } from '@angular/common'; 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 { XListComponent } from '@ng-nest/ui/list'; +import { XRadioModule } from '@ng-nest/ui/radio'; @Component({ selector: 'ex-scroll', + standalone: true, + imports: [CommonModule, FormsModule, XListComponent, XRadioModule, 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 8fa12d7d7..564378202 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,8 +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 { XListComponent } from '@ng-nest/ui/list'; @Component({ selector: 'ex-size', + standalone: true, + imports: [FormsModule, XListComponent, XRadioModule], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/list/list-drop-group.directive.ts b/lib/ng-nest/ui/list/list-drop-group.directive.ts index 03aa74d6b..77426d7a7 100644 --- a/lib/ng-nest/ui/list/list-drop-group.directive.ts +++ b/lib/ng-nest/ui/list/list-drop-group.directive.ts @@ -6,6 +6,7 @@ export const X_LIST_DROP_GROUP = new InjectionToken('XListDropGr @Directive({ selector: '[xListDropGroup]', + standalone: true, providers: [{ provide: X_LIST_DROP_GROUP, useExisting: XListDropGroup }] }) export class XListDropGroup implements OnDestroy { diff --git a/lib/ng-nest/ui/list/list-option.component.ts b/lib/ng-nest/ui/list/list-option.component.ts index d64f31819..4c8555dbb 100644 --- a/lib/ng-nest/ui/list/list-option.component.ts +++ b/lib/ng-nest/ui/list/list-option.component.ts @@ -4,27 +4,34 @@ import { Component, ElementRef, HostBinding, + OnChanges, + OnInit, SimpleChanges, - ViewEncapsulation + ViewEncapsulation, + inject } from '@angular/core'; import { XListOptionPrefix, XListOptionProperty } from './list.property'; import { Highlightable } from '@angular/cdk/a11y'; import { XClassMap, XClearClass, XConfigService, XIsChange } from '@ng-nest/ui/core'; +import { CommonModule } from '@angular/common'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XKeywordDirective } from '@ng-nest/ui/keyword'; @Component({ selector: `${XListOptionPrefix}`, + standalone: true, + imports: [CommonModule, XIconComponent, XKeywordDirective], templateUrl: './list-option.component.html', styleUrls: ['./list-option.component.scss'], encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush }) -export class XListOptionComponent extends XListOptionProperty implements Highlightable { +export class XListOptionComponent extends XListOptionProperty implements Highlightable, OnInit, OnChanges { @HostBinding('attr.role') role = 'option'; classMap: XClassMap = {}; - - constructor(public elementRef: ElementRef, private cdr: ChangeDetectorRef, public configService: XConfigService) { - super(); - } + private cdr = inject(ChangeDetectorRef); + elementRef = inject(ElementRef); + configService = inject(XConfigService); ngOnInit() { if (this.node) diff --git a/lib/ng-nest/ui/list/list.component.spec.ts b/lib/ng-nest/ui/list/list.component.spec.ts index f4192360d..b45375218 100644 --- a/lib/ng-nest/ui/list/list.component.spec.ts +++ b/lib/ng-nest/ui/list/list.component.spec.ts @@ -1,17 +1,16 @@ import { interval } from 'rxjs'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { XListComponent } from './list.component'; import { Component, DebugElement, ChangeDetectorRef } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { XListModule } from '@ng-nest/ui/list'; +import { XListComponent } from '@ng-nest/ui/list'; 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 { XInputNumberModule } from '@ng-nest/ui/input-number'; +import { XInputNumberComponent } from '@ng-nest/ui/input-number'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { HttpClientTestingModule } from '@angular/common/http/testing'; @@ -23,12 +22,12 @@ describe(XListPrefix, () => { HttpClientTestingModule, XThemeModule, XRadioModule, - XListModule, + XListComponent, FormsModule, ReactiveFormsModule, XRowComponent, XColComponent, - XInputNumberModule + XInputNumberComponent ], declarations: [TestXListComponent] }).compileComponents(); @@ -54,20 +53,10 @@ const data: XData = ['AAAA', 'BBBB', { label: 'CCCC', leaf: true }, ' - + - + (); - - constructor( - public renderer: Renderer2, - public override cdr: ChangeDetectorRef, - public elementRef: ElementRef, - public configService: XConfigService, - private i18n: XI18nService, - @Optional() - @Inject(X_LIST_DROP_GROUP) - @SkipSelf() - private group?: XListDropGroup - ) { - super(); - } + override cdr = inject(ChangeDetectorRef); + private i18n = inject(XI18nService); + private group = inject(X_LIST_DROP_GROUP, { optional: true, skipSelf: true }); + configService = inject(XConfigService); ngOnInit() { this.i18n.localeChange diff --git a/lib/ng-nest/ui/list/list.module.ts b/lib/ng-nest/ui/list/list.module.ts index 9ff206158..c721f0094 100644 --- a/lib/ng-nest/ui/list/list.module.ts +++ b/lib/ng-nest/ui/list/list.module.ts @@ -1,42 +1,10 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { XListComponent } from './list.component'; import { XListOptionComponent } from './list-option.component'; -import { XIconComponent } from '@ng-nest/ui/icon'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { DragDropModule } from '@angular/cdk/drag-drop'; -import { XListOptionProperty, XListProperty } from './list.property'; -import { XEmptyComponent } from '@ng-nest/ui/empty'; -import { A11yModule } from '@angular/cdk/a11y'; -import { XControlValueAccessor } from '@ng-nest/ui/base-form'; -import { XOutletDirective } from '@ng-nest/ui/outlet'; -import { XI18nDirective } from '@ng-nest/ui/i18n'; -import { ScrollingModule } from '@angular/cdk/scrolling'; -import { XKeywordDirective } from '@ng-nest/ui/keyword'; import { XListDropGroup } from './list-drop-group.directive'; @NgModule({ - declarations: [ - XListComponent, - XListDropGroup, - XListOptionComponent, - XListProperty, - XListOptionProperty - ], exports: [XListComponent, XListDropGroup, XListOptionComponent], - imports: [ - CommonModule, - FormsModule, - ReactiveFormsModule, - DragDropModule, - A11yModule, - XIconComponent, - XEmptyComponent, - XControlValueAccessor, - XI18nDirective, - XOutletDirective, - ScrollingModule, - XKeywordDirective - ] + imports: [XListComponent, XListDropGroup, XListOptionComponent] }) export class XListModule {} diff --git a/lib/ng-nest/ui/loading/examples/en_US/default/custom/custom.component.html b/lib/ng-nest/ui/loading/examples/en_US/default/custom/custom.component.html index 1e37af591..a15d76562 100644 --- a/lib/ng-nest/ui/loading/examples/en_US/default/custom/custom.component.html +++ b/lib/ng-nest/ui/loading/examples/en_US/default/custom/custom.component.html @@ -1,26 +1,34 @@
-
+
- - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + +
useremailstate
adminadmin@admin.comenabled
johnjohn@john.comdisabled
jackjack@jack.comenabled
useremailstate
adminadmin@admin.comenabled
johnjohn@john.comdisabled
jackjack@jack.comenabled
diff --git a/lib/ng-nest/ui/loading/examples/en_US/default/custom/custom.component.ts b/lib/ng-nest/ui/loading/examples/en_US/default/custom/custom.component.ts index 7915d8beb..7df54de84 100644 --- a/lib/ng-nest/ui/loading/examples/en_US/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/loading/examples/en_US/default/custom/custom.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XLoadingComponent } from '@ng-nest/ui/loading'; @Component({ selector: 'ex-custom', + standalone: true, + imports: [XLoadingComponent], templateUrl: './custom.component.html', styleUrls: ['./custom.component.scss'] }) diff --git a/lib/ng-nest/ui/loading/examples/en_US/default/default/default.component.html b/lib/ng-nest/ui/loading/examples/en_US/default/default/default.component.html index 16ceca520..53687de87 100644 --- a/lib/ng-nest/ui/loading/examples/en_US/default/default/default.component.html +++ b/lib/ng-nest/ui/loading/examples/en_US/default/default/default.component.html @@ -18,25 +18,27 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + +
useremailstate
adminadmin@admin.comenabled
johnjohn@john.comdisabled
jackjack@jack.comenabled
useremailstate
adminadmin@admin.comenabled
johnjohn@john.comdisabled
jackjack@jack.comenabled
diff --git a/lib/ng-nest/ui/loading/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/loading/examples/en_US/default/default/default.component.ts index cae54f2a5..5857fbdca 100644 --- a/lib/ng-nest/ui/loading/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/loading/examples/en_US/default/default/default.component.ts @@ -1,7 +1,11 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XLoadingComponent } from '@ng-nest/ui/loading'; @Component({ selector: 'ex-default', + standalone: true, + imports: [CommonModule, XLoadingComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/loading/examples/en_US/default/full-screen/full-screen.component.ts b/lib/ng-nest/ui/loading/examples/en_US/default/full-screen/full-screen.component.ts index dfafedef0..c8d21b9cc 100644 --- a/lib/ng-nest/ui/loading/examples/en_US/default/full-screen/full-screen.component.ts +++ b/lib/ng-nest/ui/loading/examples/en_US/default/full-screen/full-screen.component.ts @@ -1,9 +1,14 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XLoadingComponent } from '@ng-nest/ui/loading'; import { of } from 'rxjs'; import { delay } from 'rxjs/operators'; @Component({ selector: 'ex-full-screen', + standalone: true, + imports: [CommonModule, XLoadingComponent, XButtonComponent], templateUrl: './full-screen.component.html' }) export class ExFullScreenComponent { diff --git a/lib/ng-nest/ui/loading/examples/index.ts b/lib/ng-nest/ui/loading/examples/index.ts new file mode 100644 index 000000000..f1c30a525 --- /dev/null +++ b/lib/ng-nest/ui/loading/examples/index.ts @@ -0,0 +1,3 @@ +export * from './zh_CN/default/custom/custom.component'; +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/full-screen/full-screen.component'; diff --git a/lib/ng-nest/ui/loading/examples/zh_CN/default/custom/custom.component.html b/lib/ng-nest/ui/loading/examples/zh_CN/default/custom/custom.component.html index fc019cd17..5716a352c 100644 --- a/lib/ng-nest/ui/loading/examples/zh_CN/default/custom/custom.component.html +++ b/lib/ng-nest/ui/loading/examples/zh_CN/default/custom/custom.component.html @@ -1,26 +1,28 @@
- - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + +
用户邮箱状态
adminadmin@admin.com启用
johnjohn@john.com禁用
jackjack@jack.com启用
用户邮箱状态
adminadmin@admin.com启用
johnjohn@john.com禁用
jackjack@jack.com启用
diff --git a/lib/ng-nest/ui/loading/examples/zh_CN/default/custom/custom.component.ts b/lib/ng-nest/ui/loading/examples/zh_CN/default/custom/custom.component.ts index 7915d8beb..7df54de84 100644 --- a/lib/ng-nest/ui/loading/examples/zh_CN/default/custom/custom.component.ts +++ b/lib/ng-nest/ui/loading/examples/zh_CN/default/custom/custom.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XLoadingComponent } from '@ng-nest/ui/loading'; @Component({ selector: 'ex-custom', + standalone: true, + imports: [XLoadingComponent], templateUrl: './custom.component.html', styleUrls: ['./custom.component.scss'] }) diff --git a/lib/ng-nest/ui/loading/examples/zh_CN/default/default/default.component.html b/lib/ng-nest/ui/loading/examples/zh_CN/default/default/default.component.html index 9ef91c6b2..b2de3cdde 100644 --- a/lib/ng-nest/ui/loading/examples/zh_CN/default/default/default.component.html +++ b/lib/ng-nest/ui/loading/examples/zh_CN/default/default/default.component.html @@ -18,25 +18,27 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + +
用户邮箱状态
adminadmin@admin.com启用
johnjohn@john.com禁用
jackjack@jack.com启用
用户邮箱状态
adminadmin@admin.com启用
johnjohn@john.com禁用
jackjack@jack.com启用
diff --git a/lib/ng-nest/ui/loading/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/loading/examples/zh_CN/default/default/default.component.ts index cae54f2a5..5857fbdca 100644 --- a/lib/ng-nest/ui/loading/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/loading/examples/zh_CN/default/default/default.component.ts @@ -1,7 +1,11 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XLoadingComponent } from '@ng-nest/ui/loading'; @Component({ selector: 'ex-default', + standalone: true, + imports: [CommonModule, XLoadingComponent], templateUrl: './default.component.html', styleUrls: ['./default.component.scss'] }) diff --git a/lib/ng-nest/ui/loading/examples/zh_CN/default/full-screen/full-screen.component.ts b/lib/ng-nest/ui/loading/examples/zh_CN/default/full-screen/full-screen.component.ts index dfafedef0..c8d21b9cc 100644 --- a/lib/ng-nest/ui/loading/examples/zh_CN/default/full-screen/full-screen.component.ts +++ b/lib/ng-nest/ui/loading/examples/zh_CN/default/full-screen/full-screen.component.ts @@ -1,9 +1,14 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; +import { XLoadingComponent } from '@ng-nest/ui/loading'; import { of } from 'rxjs'; import { delay } from 'rxjs/operators'; @Component({ selector: 'ex-full-screen', + standalone: true, + imports: [CommonModule, XLoadingComponent, XButtonComponent], templateUrl: './full-screen.component.html' }) export class ExFullScreenComponent { diff --git a/lib/ng-nest/ui/loading/loading.component.spec.ts b/lib/ng-nest/ui/loading/loading.component.spec.ts index aa53cfdd9..124b3571d 100644 --- a/lib/ng-nest/ui/loading/loading.component.spec.ts +++ b/lib/ng-nest/ui/loading/loading.component.spec.ts @@ -1,11 +1,9 @@ import { XIconComponent } from '@ng-nest/ui/icon'; import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XLoadingComponent } from './loading.component'; import { Component, DebugElement, ChangeDetectorRef } from '@angular/core'; import { By } from '@angular/platform-browser'; import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; -import { XLoadingModule } from '@ng-nest/ui/loading'; +import { XLoadingComponent } from '@ng-nest/ui/loading'; import { FormsModule } from '@angular/forms'; import { XLoadingPrefix } from './loading.property'; import { XButtonComponent } from '@ng-nest/ui/button'; @@ -25,7 +23,7 @@ describe(XLoadingPrefix, () => { XThemeModule, FormsModule, BrowserAnimationsModule, - XLoadingModule, + XLoadingComponent, XButtonComponent, XContainerComponent, XRowComponent, diff --git a/lib/ng-nest/ui/loading/loading.component.ts b/lib/ng-nest/ui/loading/loading.component.ts index 66d6662e9..0e39b6f5d 100644 --- a/lib/ng-nest/ui/loading/loading.component.ts +++ b/lib/ng-nest/ui/loading/loading.component.ts @@ -2,8 +2,6 @@ import { Component, OnInit, ViewEncapsulation, - Renderer2, - ElementRef, ChangeDetectorRef, ChangeDetectionStrategy, SimpleChanges, @@ -11,14 +9,20 @@ import { HostBinding, ViewChild, TemplateRef, - ViewContainerRef + ViewContainerRef, + inject } from '@angular/core'; import { XLoadingPrefix, XLoadingProperty } from './loading.property'; import { XIsChange, XIsEmpty, XConfigService, XIsNumber, XClearClass } from '@ng-nest/ui/core'; import { XPortalService, XPortalOverlayRef } from '@ng-nest/ui/portal'; +import { CommonModule } from '@angular/common'; +import { XIconComponent } from '@ng-nest/ui/icon'; +import { XOutletDirective } from '@ng-nest/ui/outlet'; @Component({ selector: `${XLoadingPrefix}, [${XLoadingPrefix}]`, + standalone: true, + imports: [CommonModule, XIconComponent, XOutletDirective], templateUrl: './loading.component.html', styleUrls: ['./loading.component.scss'], encapsulation: ViewEncapsulation.None, @@ -33,16 +37,10 @@ export class XLoadingComponent extends XLoadingProperty implements OnInit, OnCha sizeNumber?: number; - constructor( - public renderer: Renderer2, - public elementRef: ElementRef, - public cdr: ChangeDetectorRef, - public portal: XPortalService, - public viewContainerRef: ViewContainerRef, - public configService: XConfigService - ) { - super(); - } + private cdr = inject(ChangeDetectorRef); + private portal = inject(XPortalService); + private viewContainerRef = inject(ViewContainerRef); + configService = inject(XConfigService); ngOnInit() { this.setClassMap(); diff --git a/lib/ng-nest/ui/loading/loading.module.ts b/lib/ng-nest/ui/loading/loading.module.ts index 5cf0da267..70d8ca640 100644 --- a/lib/ng-nest/ui/loading/loading.module.ts +++ b/lib/ng-nest/ui/loading/loading.module.ts @@ -1,13 +1,8 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { XLoadingComponent } from './loading.component'; -import { XIconComponent } from '@ng-nest/ui/icon'; -import { XOutletDirective } from '@ng-nest/ui/outlet'; -import { XLoadingProperty } from './loading.property'; @NgModule({ - declarations: [XLoadingComponent, XLoadingProperty], exports: [XLoadingComponent], - imports: [CommonModule, XIconComponent, XOutletDirective] + imports: [XLoadingComponent] }) export class XLoadingModule {} diff --git a/lib/ng-nest/ui/menu/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/menu/examples/en_US/default/default/default.component.ts index 3f1e2da38..7eaf3aca9 100644 --- a/lib/ng-nest/ui/menu/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/menu/examples/en_US/default/default/default.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XMenuComponent } from '@ng-nest/ui/menu'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XMenuComponent], templateUrl: './default.component.html' }) export class ExDefaultComponent { diff --git a/lib/ng-nest/ui/menu/examples/en_US/default/icon/icon.component.ts b/lib/ng-nest/ui/menu/examples/en_US/default/icon/icon.component.ts index 84f17b78f..1afb68de5 100644 --- a/lib/ng-nest/ui/menu/examples/en_US/default/icon/icon.component.ts +++ b/lib/ng-nest/ui/menu/examples/en_US/default/icon/icon.component.ts @@ -1,9 +1,17 @@ import { Component } from '@angular/core'; +import { XMenuComponent } from '@ng-nest/ui/menu'; @Component({ selector: 'ex-icon', + standalone: true, + imports: [XMenuComponent], templateUrl: './icon.component.html' }) export class ExIconComponent { - data = ['latest events', { label: 'product', icon: 'fto-package' }, 'solution', { label: 'Help and support', icon: 'fto-phone' }]; + data = [ + 'latest events', + { label: 'product', icon: 'fto-package' }, + 'solution', + { label: 'Help and support', icon: 'fto-phone' } + ]; } diff --git a/lib/ng-nest/ui/menu/examples/en_US/default/layout/layout.component.ts b/lib/ng-nest/ui/menu/examples/en_US/default/layout/layout.component.ts index 09f32e0eb..7835dc6fa 100644 --- a/lib/ng-nest/ui/menu/examples/en_US/default/layout/layout.component.ts +++ b/lib/ng-nest/ui/menu/examples/en_US/default/layout/layout.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XMenuComponent } from '@ng-nest/ui/menu'; @Component({ selector: 'ex-layout', + standalone: true, + imports: [XMenuComponent], templateUrl: './layout.component.html' }) export class ExLayoutComponent { diff --git a/lib/ng-nest/ui/menu/examples/en_US/default/leaf/leaf.component.ts b/lib/ng-nest/ui/menu/examples/en_US/default/leaf/leaf.component.ts index c51696775..1983cb7fb 100644 --- a/lib/ng-nest/ui/menu/examples/en_US/default/leaf/leaf.component.ts +++ b/lib/ng-nest/ui/menu/examples/en_US/default/leaf/leaf.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XMenuComponent } from '@ng-nest/ui/menu'; @Component({ selector: 'ex-leaf', + standalone: true, + imports: [XMenuComponent], templateUrl: './leaf.component.html' }) export class ExLeafComponent { diff --git a/lib/ng-nest/ui/menu/examples/en_US/default/size/size.component.ts b/lib/ng-nest/ui/menu/examples/en_US/default/size/size.component.ts index 50ffbb139..0b5c9f695 100644 --- a/lib/ng-nest/ui/menu/examples/en_US/default/size/size.component.ts +++ b/lib/ng-nest/ui/menu/examples/en_US/default/size/size.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XMenuComponent } from '@ng-nest/ui/menu'; @Component({ selector: 'ex-size', + standalone: true, + imports: [XMenuComponent], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/menu/examples/index.ts b/lib/ng-nest/ui/menu/examples/index.ts new file mode 100644 index 000000000..d85fa67a5 --- /dev/null +++ b/lib/ng-nest/ui/menu/examples/index.ts @@ -0,0 +1,5 @@ +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/icon/icon.component'; +export * from './zh_CN/default/layout/layout.component'; +export * from './zh_CN/default/leaf/leaf.component'; +export * from './zh_CN/default/size/size.component'; diff --git a/lib/ng-nest/ui/menu/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/menu/examples/zh_CN/default/default/default.component.ts index 5a1278c2c..0b6e35c8f 100644 --- a/lib/ng-nest/ui/menu/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/menu/examples/zh_CN/default/default/default.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XMenuComponent } from '@ng-nest/ui/menu'; @Component({ selector: 'ex-default', + standalone: true, + imports: [XMenuComponent], templateUrl: './default.component.html' }) export class ExDefaultComponent { diff --git a/lib/ng-nest/ui/menu/examples/zh_CN/default/icon/icon.component.ts b/lib/ng-nest/ui/menu/examples/zh_CN/default/icon/icon.component.ts index 7af375c19..0271b6441 100644 --- a/lib/ng-nest/ui/menu/examples/zh_CN/default/icon/icon.component.ts +++ b/lib/ng-nest/ui/menu/examples/zh_CN/default/icon/icon.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XMenuComponent } from '@ng-nest/ui/menu'; @Component({ selector: 'ex-icon', + standalone: true, + imports: [XMenuComponent], templateUrl: './icon.component.html' }) export class ExIconComponent { diff --git a/lib/ng-nest/ui/menu/examples/zh_CN/default/layout/layout.component.ts b/lib/ng-nest/ui/menu/examples/zh_CN/default/layout/layout.component.ts index 3fced979c..374c1e96d 100644 --- a/lib/ng-nest/ui/menu/examples/zh_CN/default/layout/layout.component.ts +++ b/lib/ng-nest/ui/menu/examples/zh_CN/default/layout/layout.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XMenuComponent } from '@ng-nest/ui/menu'; @Component({ selector: 'ex-layout', + standalone: true, + imports: [XMenuComponent], templateUrl: './layout.component.html' }) export class ExLayoutComponent { diff --git a/lib/ng-nest/ui/menu/examples/zh_CN/default/leaf/leaf.component.ts b/lib/ng-nest/ui/menu/examples/zh_CN/default/leaf/leaf.component.ts index 3147781d7..bde81ecdc 100644 --- a/lib/ng-nest/ui/menu/examples/zh_CN/default/leaf/leaf.component.ts +++ b/lib/ng-nest/ui/menu/examples/zh_CN/default/leaf/leaf.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XMenuComponent } from '@ng-nest/ui/menu'; @Component({ selector: 'ex-leaf', + standalone: true, + imports: [XMenuComponent], templateUrl: './leaf.component.html' }) export class ExLeafComponent { diff --git a/lib/ng-nest/ui/menu/examples/zh_CN/default/size/size.component.ts b/lib/ng-nest/ui/menu/examples/zh_CN/default/size/size.component.ts index 78c35b01c..2c8ebb1e8 100644 --- a/lib/ng-nest/ui/menu/examples/zh_CN/default/size/size.component.ts +++ b/lib/ng-nest/ui/menu/examples/zh_CN/default/size/size.component.ts @@ -1,7 +1,10 @@ import { Component } from '@angular/core'; +import { XMenuComponent } from '@ng-nest/ui/menu'; @Component({ selector: 'ex-size', + standalone: true, + imports: [XMenuComponent], templateUrl: './size.component.html', styleUrls: ['./size.component.scss'] }) diff --git a/lib/ng-nest/ui/menu/menu-node.component.ts b/lib/ng-nest/ui/menu/menu-node.component.ts index 9d57eb9cf..2fb5ef158 100644 --- a/lib/ng-nest/ui/menu/menu-node.component.ts +++ b/lib/ng-nest/ui/menu/menu-node.component.ts @@ -1,23 +1,33 @@ -import { Component, ViewEncapsulation, ChangeDetectionStrategy, ChangeDetectorRef, ElementRef, Input } from '@angular/core'; +import { + Component, + ViewEncapsulation, + ChangeDetectionStrategy, + ChangeDetectorRef, + ElementRef, + Input, + inject, + OnInit +} from '@angular/core'; import { XMenuNodeProperty, XMenuNodePrefix } from './menu.property'; import { XConfigService } from '@ng-nest/ui/core'; +import { XIconComponent } from '../icon'; +import { CommonModule } from '@angular/common'; +import { RouterModule } from '@angular/router'; @Component({ selector: `${XMenuNodePrefix}`, + standalone: true, + imports: [CommonModule, XIconComponent, RouterModule], templateUrl: './menu-node.component.html', encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush }) -export class XMenuNodeComponent extends XMenuNodeProperty { +export class XMenuNodeComponent extends XMenuNodeProperty implements OnInit { @Input() menu: any; - constructor( - // @Host() @Optional() public menu: XMenuComponent, - public cdr: ChangeDetectorRef, - public elementRef: ElementRef, - public configService: XConfigService - ) { - super(); - } + private cdr = inject(ChangeDetectorRef); + private elementRef = inject(ElementRef); + configService = inject(XConfigService); + ngOnInit() { if (this.menu?.activatedId == this.node.id) { this.menu.activatedElementRef = this.elementRef; diff --git a/lib/ng-nest/ui/menu/menu.component.spec.ts b/lib/ng-nest/ui/menu/menu.component.spec.ts index 434b42e72..8ac39d224 100644 --- a/lib/ng-nest/ui/menu/menu.component.spec.ts +++ b/lib/ng-nest/ui/menu/menu.component.spec.ts @@ -1,9 +1,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { XMenuComponent } from './menu.component'; import { Component, DebugElement, ChangeDetectorRef, NgModule } from '@angular/core'; import { By } from '@angular/platform-browser'; -import { XMenuModule } from '@ng-nest/ui/menu'; +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'; @@ -16,7 +14,14 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XMenuPrefix, () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, BrowserAnimationsModule, XThemeModule, XMenuModule, XButtonComponent, TestMenuRoutesModule], + imports: [ + HttpClientTestingModule, + BrowserAnimationsModule, + XThemeModule, + XMenuComponent, + XButtonComponent, + TestMenuRoutesModule + ], declarations: [ TestXMenuComponent, TestXMenuExpandedComponent, @@ -120,7 +125,12 @@ describe(XMenuPrefix, () => { }) class TestXMenuComponent { data = ['最新活动', '产品', '解决方案', '帮助和支持']; - dataIcon = ['最新活动', { label: '产品', icon: 'fto-package' }, '解决方案', { label: '帮助和支持', icon: 'fto-phone' }]; + dataIcon = [ + '最新活动', + { label: '产品', icon: 'fto-package' }, + '解决方案', + { label: '帮助和支持', icon: 'fto-phone' } + ]; dataLeaf = [ { id: '1-8', @@ -1189,7 +1199,8 @@ export class TestMenuRoutesModule {} template: `
- + +
`, styles: [ diff --git a/lib/ng-nest/ui/menu/menu.component.ts b/lib/ng-nest/ui/menu/menu.component.ts index 119811f62..40a24bfc6 100644 --- a/lib/ng-nest/ui/menu/menu.component.ts +++ b/lib/ng-nest/ui/menu/menu.component.ts @@ -2,7 +2,6 @@ import { Component, OnInit, ViewEncapsulation, - Renderer2, ElementRef, ChangeDetectorRef, ChangeDetectionStrategy, @@ -15,10 +14,15 @@ import { import { XMenuPrefix, XMenuNode, XMenuProperty } from './menu.property'; import { XClassMap, XIsChange, XIsEmpty, XSetData, XGroupBy, XConfigService } from '@ng-nest/ui/core'; import { Subject } from 'rxjs'; -import { DOCUMENT } from '@angular/common'; +import { CommonModule, DOCUMENT } from '@angular/common'; +import { XSliderModule } 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], templateUrl: './menu.component.html', styleUrls: ['./menu.component.scss'], encapsulation: ViewEncapsulation.None, @@ -39,15 +43,8 @@ export class XMenuComponent extends XMenuProperty implements OnInit, OnChanges, private doc = inject(DOCUMENT); private _unSubject = new Subject(); private _target!: HTMLElement; - - constructor( - public renderer: Renderer2, - public elementRef: ElementRef, - public cdr: ChangeDetectorRef, - public configService: XConfigService - ) { - super(); - } + private cdr = inject(ChangeDetectorRef); + configService = inject(XConfigService); ngOnInit() { this.setClassMap(); @@ -146,7 +143,8 @@ export class XMenuComponent extends XMenuProperty implements OnInit, OnChanges, node.children = value.filter((y) => y.pid === node.id); node.leaf = node.children?.length > 0; if (node.leaf) { - node.open = Boolean(this.expandedAll) || level <= Number(this.expandedLevel) || this.expanded.indexOf(node.id) >= 0; + node.open = + Boolean(this.expandedAll) || level <= Number(this.expandedLevel) || this.expanded.indexOf(node.id) >= 0; node.childrenLoaded = node.open; node.children.map((y) => getChildren(y, level + 1)); node.children = this.setCategory(node.children); diff --git a/lib/ng-nest/ui/menu/menu.module.ts b/lib/ng-nest/ui/menu/menu.module.ts index a828c6ae8..8641904e4 100644 --- a/lib/ng-nest/ui/menu/menu.module.ts +++ b/lib/ng-nest/ui/menu/menu.module.ts @@ -1,16 +1,9 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { XMenuComponent } from './menu.component'; import { XMenuNodeComponent } from './menu-node.component'; -import { XDropdownModule } from '@ng-nest/ui/dropdown'; -import { XSliderModule } from '@ng-nest/ui/slider'; -import { XIconComponent } from '@ng-nest/ui/icon'; -import { XMenuProperty, XMenuNodeProperty } from './menu.property'; -import { RouterModule } from '@angular/router'; @NgModule({ - declarations: [XMenuComponent, XMenuNodeComponent, XMenuProperty, XMenuNodeProperty], exports: [XMenuComponent, XMenuNodeComponent], - imports: [CommonModule, RouterModule, XDropdownModule, XSliderModule, XIconComponent] + imports: [XMenuComponent, XMenuNodeComponent] }) export class XMenuModule {} 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 47ff7e458..7931ea561 100644 --- a/lib/ng-nest/ui/message-box/message-box.module.ts +++ b/lib/ng-nest/ui/message-box/message-box.module.ts @@ -5,7 +5,7 @@ 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 { XInputModule } from '@ng-nest/ui/input'; +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'; @@ -17,7 +17,7 @@ import { XControlValueAccessor } from '@ng-nest/ui/base-form'; CommonModule, FormsModule, ReactiveFormsModule, - XInputModule, + XInputComponent, XButtonComponent, XButtonsComponent, XIconComponent, diff --git a/lib/ng-nest/ui/message/examples/en_US/default/close/close.component.ts b/lib/ng-nest/ui/message/examples/en_US/default/close/close.component.ts index 2ac97b8ea..53e0f31cd 100644 --- a/lib/ng-nest/ui/message/examples/en_US/default/close/close.component.ts +++ b/lib/ng-nest/ui/message/examples/en_US/default/close/close.component.ts @@ -1,8 +1,12 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; import { XMessageService } from '@ng-nest/ui/message'; @Component({ selector: 'ex-close', + standalone: true, + imports: [CommonModule, XButtonComponent], templateUrl: './close.component.html', styleUrls: ['./close.component.scss'] }) diff --git a/lib/ng-nest/ui/message/examples/en_US/default/default/default.component.ts b/lib/ng-nest/ui/message/examples/en_US/default/default/default.component.ts index 06011a80b..97474f285 100644 --- a/lib/ng-nest/ui/message/examples/en_US/default/default/default.component.ts +++ b/lib/ng-nest/ui/message/examples/en_US/default/default/default.component.ts @@ -1,9 +1,13 @@ import { Component } from '@angular/core'; 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/examples/en_US/default/loading/loading.component.ts b/lib/ng-nest/ui/message/examples/en_US/default/loading/loading.component.ts index cb913b59f..a5cd9d553 100644 --- a/lib/ng-nest/ui/message/examples/en_US/default/loading/loading.component.ts +++ b/lib/ng-nest/ui/message/examples/en_US/default/loading/loading.component.ts @@ -1,8 +1,12 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; import { XMessageService } from '@ng-nest/ui/message'; @Component({ selector: 'ex-loading', + standalone: true, + imports: [CommonModule, XButtonComponent], templateUrl: './loading.component.html' }) export class ExLoadingComponent { diff --git a/lib/ng-nest/ui/message/examples/en_US/default/single/single.component.ts b/lib/ng-nest/ui/message/examples/en_US/default/single/single.component.ts index 7ba2a300c..d72331703 100644 --- a/lib/ng-nest/ui/message/examples/en_US/default/single/single.component.ts +++ b/lib/ng-nest/ui/message/examples/en_US/default/single/single.component.ts @@ -1,9 +1,13 @@ import { Component } from '@angular/core'; 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-single', + standalone: true, + imports: [CommonModule, XButtonComponent], templateUrl: './single.component.html', styleUrls: ['./single.component.scss'] }) diff --git a/lib/ng-nest/ui/message/examples/en_US/default/type/type.component.ts b/lib/ng-nest/ui/message/examples/en_US/default/type/type.component.ts index c2a3575d2..ebc8bf1a6 100644 --- a/lib/ng-nest/ui/message/examples/en_US/default/type/type.component.ts +++ b/lib/ng-nest/ui/message/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 { XMessageService } from '@ng-nest/ui/message'; @Component({ selector: 'ex-type', + standalone: true, + imports: [CommonModule, XButtonComponent], templateUrl: './type.component.html', styleUrls: ['./type.component.scss'] }) diff --git a/lib/ng-nest/ui/message/examples/index.ts b/lib/ng-nest/ui/message/examples/index.ts new file mode 100644 index 000000000..0b8300fdf --- /dev/null +++ b/lib/ng-nest/ui/message/examples/index.ts @@ -0,0 +1,5 @@ +export * from './zh_CN/default/close/close.component'; +export * from './zh_CN/default/default/default.component'; +export * from './zh_CN/default/loading/loading.component'; +export * from './zh_CN/default/single/single.component'; +export * from './zh_CN/default/type/type.component'; diff --git a/lib/ng-nest/ui/message/examples/zh_CN/default/close/close.component.ts b/lib/ng-nest/ui/message/examples/zh_CN/default/close/close.component.ts index 2ac97b8ea..53e0f31cd 100644 --- a/lib/ng-nest/ui/message/examples/zh_CN/default/close/close.component.ts +++ b/lib/ng-nest/ui/message/examples/zh_CN/default/close/close.component.ts @@ -1,8 +1,12 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; import { XMessageService } from '@ng-nest/ui/message'; @Component({ selector: 'ex-close', + standalone: true, + imports: [CommonModule, XButtonComponent], templateUrl: './close.component.html', styleUrls: ['./close.component.scss'] }) diff --git a/lib/ng-nest/ui/message/examples/zh_CN/default/default/default.component.ts b/lib/ng-nest/ui/message/examples/zh_CN/default/default/default.component.ts index 7a98ecc4c..d8da826e1 100644 --- a/lib/ng-nest/ui/message/examples/zh_CN/default/default/default.component.ts +++ b/lib/ng-nest/ui/message/examples/zh_CN/default/default/default.component.ts @@ -1,9 +1,13 @@ import { Component } from '@angular/core'; 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/examples/zh_CN/default/loading/loading.component.ts b/lib/ng-nest/ui/message/examples/zh_CN/default/loading/loading.component.ts index cfa95df10..f0d329831 100644 --- a/lib/ng-nest/ui/message/examples/zh_CN/default/loading/loading.component.ts +++ b/lib/ng-nest/ui/message/examples/zh_CN/default/loading/loading.component.ts @@ -1,8 +1,12 @@ +import { CommonModule } from '@angular/common'; import { Component } from '@angular/core'; +import { XButtonComponent } from '@ng-nest/ui/button'; import { XMessageService } from '@ng-nest/ui/message'; @Component({ selector: 'ex-loading', + standalone: true, + imports: [CommonModule, XButtonComponent], templateUrl: './loading.component.html' }) export class ExLoadingComponent { diff --git a/lib/ng-nest/ui/message/examples/zh_CN/default/single/single.component.ts b/lib/ng-nest/ui/message/examples/zh_CN/default/single/single.component.ts index d278c1d2d..061007100 100644 --- a/lib/ng-nest/ui/message/examples/zh_CN/default/single/single.component.ts +++ b/lib/ng-nest/ui/message/examples/zh_CN/default/single/single.component.ts @@ -1,9 +1,13 @@ import { Component } from '@angular/core'; 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-single', + standalone: true, + imports: [CommonModule, XButtonComponent], templateUrl: './single.component.html', styleUrls: ['./single.component.scss'] }) diff --git a/lib/ng-nest/ui/message/examples/zh_CN/default/type/type.component.ts b/lib/ng-nest/ui/message/examples/zh_CN/default/type/type.component.ts index c2a3575d2..ebc8bf1a6 100644 --- a/lib/ng-nest/ui/message/examples/zh_CN/default/type/type.component.ts +++ b/lib/ng-nest/ui/message/examples/zh_CN/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 { XMessageService } from '@ng-nest/ui/message'; @Component({ selector: 'ex-type', + standalone: true, + imports: [CommonModule, XButtonComponent], templateUrl: './type.component.html', styleUrls: ['./type.component.scss'] }) diff --git a/lib/ng-nest/ui/message/message.component.ts b/lib/ng-nest/ui/message/message.component.ts index 02ba2b635..7cf0cc0df 100644 --- a/lib/ng-nest/ui/message/message.component.ts +++ b/lib/ng-nest/ui/message/message.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 { XMessagePrefix, XMessageOption, XMessagePlacementRef } from './message.property'; import { of } from 'rxjs'; import { delay } from 'rxjs/operators'; +import { CommonModule } from '@angular/common'; +import { XAlertComponent } from '@ng-nest/ui/alert'; @Component({ selector: `${XMessagePrefix}`, + standalone: true, + imports: [CommonModule, XAlertComponent], templateUrl: './message.component.html', styleUrls: ['./message.component.scss'], encapsulation: ViewEncapsulation.None, @@ -14,8 +18,7 @@ import { delay } from 'rxjs/operators'; }) export class XMessageComponent { message: XMessagePlacementRef = { ref: {}, list: [], closeAll: () => {} }; - - constructor(public renderer: Renderer2, public elementRef: ElementRef, public cdr: ChangeDetectorRef) {} + cdr = inject(ChangeDetectorRef); onClose(item: XMessageOption) { this.message.list?.splice(this.message.list.indexOf(item), 1); diff --git a/lib/ng-nest/ui/message/message.module.ts b/lib/ng-nest/ui/message/message.module.ts index c66a900fa..4718ddab3 100644 --- a/lib/ng-nest/ui/message/message.module.ts +++ b/lib/ng-nest/ui/message/message.module.ts @@ -1,13 +1,8 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; import { XMessageComponent } from './message.component'; -import { XAlertComponent } from '@ng-nest/ui/alert'; -import { XMessageService } from './message.service'; @NgModule({ - declarations: [XMessageComponent], exports: [XMessageComponent], - imports: [CommonModule, XAlertComponent], - providers: [XMessageService] + imports: [XMessageComponent] }) export class XMessageModule {} diff --git a/lib/ng-nest/ui/message/message.service.ts b/lib/ng-nest/ui/message/message.service.ts index 7146fde87..2f37b1d6b 100644 --- a/lib/ng-nest/ui/message/message.service.ts +++ b/lib/ng-nest/ui/message/message.service.ts @@ -1,5 +1,14 @@ -import { Injectable } from '@angular/core'; -import { XTemplate, XIsXTemplate, XIsEmpty, fillDefault, XIsString, XConfigService, XMessageConfig, XIsUndefined } from '@ng-nest/ui/core'; +import { Injectable, inject } from '@angular/core'; +import { + XTemplate, + XIsXTemplate, + XIsEmpty, + fillDefault, + XIsString, + XConfigService, + XMessageConfig, + XIsUndefined +} from '@ng-nest/ui/core'; import { XMessageOverlayRef, XMessageType, @@ -15,7 +24,7 @@ import { delay } from 'rxjs/operators'; import { XPortalService } from '@ng-nest/ui/portal'; import { XMessageRef } from './message-ref'; -@Injectable() +@Injectable({ providedIn: 'root' }) export class XMessageService { messages: XMessagePlacement = {}; @@ -32,10 +41,11 @@ export class XMessageService { hide: false }; - configDefault?: XMessageConfig; + private portal = inject(XPortalService); + private configService = inject(XConfigService); + configDefault?: XMessageConfig = this.configService.getConfigForComponent(X_MESSAGE_CONFIG_NAME); - constructor(public portal: XPortalService, public configService: XConfigService) { - this.configDefault = this.configService.getConfigForComponent(X_MESSAGE_CONFIG_NAME); + constructor() { Object.assign(this.default, this.configDefault); } diff --git a/lib/ng-nest/ui/pagination/pagination.module.ts b/lib/ng-nest/ui/pagination/pagination.module.ts index 18ea03684..60fe14a2a 100644 --- a/lib/ng-nest/ui/pagination/pagination.module.ts +++ b/lib/ng-nest/ui/pagination/pagination.module.ts @@ -6,7 +6,7 @@ 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 { XInputModule } from '@ng-nest/ui/input'; +import { XInputComponent } from '@ng-nest/ui/input'; import { XOutletDirective } from '@ng-nest/ui/outlet'; @NgModule({ @@ -19,7 +19,7 @@ import { XOutletDirective } from '@ng-nest/ui/outlet'; XButtonsComponent, XI18nPipe, XSelectModule, - XInputModule, + XInputComponent, XOutletDirective ] }) diff --git a/lib/ng-nest/ui/progress/progress.component.spec.ts b/lib/ng-nest/ui/progress/progress.component.spec.ts index 3771bd7bf..80b83da4f 100644 --- a/lib/ng-nest/ui/progress/progress.component.spec.ts +++ b/lib/ng-nest/ui/progress/progress.component.spec.ts @@ -8,7 +8,7 @@ import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { XProgressModule } from '@ng-nest/ui/progress'; import { FormsModule } from '@angular/forms'; import { XProgressPrefix } from './progress.property'; -import { XButtonComponent } from '@ng-nest/ui/button'; +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'; @@ -24,6 +24,7 @@ describe(XProgressPrefix, () => { FormsModule, XProgressModule, XButtonComponent, + XButtonsComponent, XContainerComponent, XRowComponent, XColComponent, diff --git a/lib/ng-nest/ui/radio/radio.component.spec.ts b/lib/ng-nest/ui/radio/radio.component.spec.ts index 2f72f19c0..c3ce32c6a 100644 --- a/lib/ng-nest/ui/radio/radio.component.spec.ts +++ b/lib/ng-nest/ui/radio/radio.component.spec.ts @@ -17,10 +17,10 @@ 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 { XFindModule } from '@ng-nest/ui/find'; +import { XFindComponent } from '@ng-nest/ui/find'; import { XTextareaModule } from '@ng-nest/ui/textarea'; import { XTimePickerModule } from '@ng-nest/ui/time-picker'; -import { XInputModule } from '@ng-nest/ui/input'; +import { XInputComponent } from '@ng-nest/ui/input'; import { XTagModule } from '@ng-nest/ui/tag'; import { HttpClientTestingModule } from '@angular/common/http/testing'; @@ -41,10 +41,10 @@ describe(XRadioPrefix, () => { XColComponent, XCascadeComponent, XColorPickerComponent, - XFindModule, + XFindComponent, XTextareaModule, XTimePickerModule, - XInputModule, + XInputComponent, XTagModule ], declarations: [ diff --git a/lib/ng-nest/ui/result/result.component.spec.ts b/lib/ng-nest/ui/result/result.component.spec.ts index 9cb78d1ea..8b293c73d 100644 --- a/lib/ng-nest/ui/result/result.component.spec.ts +++ b/lib/ng-nest/ui/result/result.component.spec.ts @@ -8,7 +8,7 @@ import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { XResultModule } from '@ng-nest/ui/result'; import { FormsModule } from '@angular/forms'; import { XResultPrefix } from './result.property'; -import { XButtonComponent } from '@ng-nest/ui/button'; +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'; @@ -24,6 +24,7 @@ describe(XResultPrefix, () => { FormsModule, XResultModule, XButtonComponent, + XButtonsComponent, XContainerComponent, XRowComponent, XColComponent, diff --git a/lib/ng-nest/ui/select/select.module.ts b/lib/ng-nest/ui/select/select.module.ts index b45c20c05..36d27dc7d 100644 --- a/lib/ng-nest/ui/select/select.module.ts +++ b/lib/ng-nest/ui/select/select.module.ts @@ -2,8 +2,8 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { XSelectComponent } from './select.component'; -import { XInputModule } from '@ng-nest/ui/input'; -import { XListModule } from '@ng-nest/ui/list'; +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'; @@ -18,8 +18,8 @@ import { XOutletDirective } from '@ng-nest/ui/outlet'; CommonModule, FormsModule, ReactiveFormsModule, - XInputModule, - XListModule, + XInputComponent, + XListComponent, XControlValueAccessor, XTagModule, XI18nDirective, diff --git a/lib/ng-nest/ui/slider/slider.module.ts b/lib/ng-nest/ui/slider/slider.module.ts index 8770137d2..2413e4ec8 100644 --- a/lib/ng-nest/ui/slider/slider.module.ts +++ b/lib/ng-nest/ui/slider/slider.module.ts @@ -5,11 +5,11 @@ 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 { XDropdownModule } from '@ng-nest/ui/dropdown'; +import { XDropdownComponent } from '@ng-nest/ui/dropdown'; @NgModule({ declarations: [XSliderComponent, XSliderProperty], exports: [XSliderComponent], - imports: [CommonModule, XLinkComponent, XButtonComponent, XOutletDirective, XDropdownModule] + imports: [CommonModule, XLinkComponent, XButtonComponent, XOutletDirective, XDropdownComponent] }) export class XSliderModule {} diff --git a/lib/ng-nest/ui/steps/steps.component.spec.ts b/lib/ng-nest/ui/steps/steps.component.spec.ts index 431044e0f..c15ebae13 100644 --- a/lib/ng-nest/ui/steps/steps.component.spec.ts +++ b/lib/ng-nest/ui/steps/steps.component.spec.ts @@ -5,7 +5,7 @@ import { Component, DebugElement, ChangeDetectorRef } from '@angular/core'; import { By } from '@angular/platform-browser'; import { XStepsModule } from '@ng-nest/ui/steps'; import { XStepsPrefix } from './steps.property'; -import { XButtonComponent } from '@ng-nest/ui/button'; +import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; import { XTabsModule } from '@ng-nest/ui/tabs'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { XThemeModule } from '@ng-nest/ui/theme'; @@ -14,7 +14,15 @@ import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XStepsPrefix, () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [HttpClientTestingModule, BrowserAnimationsModule, XThemeModule, XStepsModule, XButtonComponent, XTabsModule], + imports: [ + HttpClientTestingModule, + BrowserAnimationsModule, + XThemeModule, + XStepsModule, + XButtonComponent, + XButtonsComponent, + XTabsModule + ], declarations: [TestXStepsComponent, TestXStepsDotComponent] }).compileComponents(); }); diff --git a/lib/ng-nest/ui/switch/switch.component.spec.ts b/lib/ng-nest/ui/switch/switch.component.spec.ts index 6034fe69a..8cf06703b 100644 --- a/lib/ng-nest/ui/switch/switch.component.spec.ts +++ b/lib/ng-nest/ui/switch/switch.component.spec.ts @@ -11,7 +11,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { XThemeModule } from '@ng-nest/ui/theme'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { XRadioModule } from '@ng-nest/ui/radio'; -import { XInputModule } from '@ng-nest/ui/input'; +import { XInputComponent } from '@ng-nest/ui/input'; import { XIconComponent } from '@ng-nest/ui/icon'; describe(XSwitchPrefix, () => { @@ -27,7 +27,7 @@ describe(XSwitchPrefix, () => { XRowComponent, XColComponent, XRadioModule, - XInputModule, + XInputComponent, XIconComponent ], declarations: [TestXSwitchComponent, TestXSwitchLabelComponent, TestXSwitchDisabledComponent] diff --git a/lib/ng-nest/ui/switch/switch.module.ts b/lib/ng-nest/ui/switch/switch.module.ts index 258edc023..535064b9e 100644 --- a/lib/ng-nest/ui/switch/switch.module.ts +++ b/lib/ng-nest/ui/switch/switch.module.ts @@ -4,12 +4,12 @@ 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 { XLoadingModule } from '@ng-nest/ui/loading'; +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, XLoadingModule, XOutletDirective] + imports: [CommonModule, FormsModule, ReactiveFormsModule, XControlValueAccessor, XLoadingComponent, XOutletDirective] }) export class XSwitchModule {} diff --git a/lib/ng-nest/ui/table/table.component.spec.ts b/lib/ng-nest/ui/table/table.component.spec.ts index c140e0dc5..5a68900ab 100644 --- a/lib/ng-nest/ui/table/table.component.spec.ts +++ b/lib/ng-nest/ui/table/table.component.spec.ts @@ -23,13 +23,14 @@ import { map as rxjsMap, delay } from 'rxjs/operators'; import { XIconComponent } from '@ng-nest/ui/icon'; import { XAvatarComponent } from '@ng-nest/ui/avatar'; import { XButtonComponent } from '@ng-nest/ui/button'; -import { XInputModule } from '@ng-nest/ui/input'; +import { XInputComponent } from '@ng-nest/ui/input'; import { XSelectModule } from '@ng-nest/ui/select'; import { XSwitchModule } 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'; import { HttpClientTestingModule } from '@angular/common/http/testing'; +import { XDialogComponent } from '@ng-nest/ui/dialog'; describe(XTablePrefix, () => { beforeEach(() => { @@ -44,9 +45,10 @@ describe(XTablePrefix, () => { XAvatarComponent, XButtonComponent, XLinkComponent, - XInputModule, + XInputComponent, XSelectModule, - XSwitchModule + XSwitchModule, + XDialogComponent ], declarations: [ TestXTableComponent, @@ -293,7 +295,8 @@ 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 }, @@ -342,7 +345,8 @@ 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 }, @@ -391,7 +395,8 @@ 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 }, @@ -440,7 +445,8 @@ 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 }, @@ -702,7 +708,8 @@ 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' }, @@ -721,19 +728,44 @@ class TestXTableCheckboxComponent { @Component({ template: `
- + +
- + +
- + +
- + +
`, styles: [ @@ -754,7 +786,8 @@ 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 }, @@ -837,7 +870,8 @@ 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.module.ts b/lib/ng-nest/ui/table/table.module.ts index 101ed5a96..74e34a3e6 100644 --- a/lib/ng-nest/ui/table/table.module.ts +++ b/lib/ng-nest/ui/table/table.module.ts @@ -6,7 +6,7 @@ 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 { XLoadingModule } from '@ng-nest/ui/loading'; +import { XLoadingComponent } from '@ng-nest/ui/loading'; import { FormsModule } from '@angular/forms'; import { XTableProperty, @@ -45,7 +45,7 @@ import { XDragDirective } from '@ng-nest/ui/drag'; ScrollingModule, DragDropModule, XEmptyComponent, - XLoadingModule, + XLoadingComponent, XDragDirective ] }) diff --git a/lib/ng-nest/ui/theme/theme.component.spec.ts b/lib/ng-nest/ui/theme/theme.component.spec.ts index b99633750..4da1671b0 100644 --- a/lib/ng-nest/ui/theme/theme.component.spec.ts +++ b/lib/ng-nest/ui/theme/theme.component.spec.ts @@ -6,9 +6,9 @@ import { By } from '@angular/platform-browser'; import { XThemeModule } from '@ng-nest/ui/theme'; import { XThemePrefix } from './theme.property'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { XFormModule } from '@ng-nest/ui/form'; +import { XFormComponent } from '@ng-nest/ui/form'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { XButtonComponent } from '@ng-nest/ui/button'; +import { XButtonComponent, XButtonsComponent } from '@ng-nest/ui/button'; import { XSwitchModule } from '@ng-nest/ui/switch'; import { XI18nService, en_US, zh_CN } from '@ng-nest/ui/i18n'; import { HttpClientTestingModule } from '@angular/common/http/testing'; @@ -22,9 +22,10 @@ describe(XThemePrefix, () => { FormsModule, ReactiveFormsModule, XButtonComponent, + XButtonsComponent, XThemeModule, XSwitchModule, - XFormModule + XFormComponent ], declarations: [TestXThemeComponent] }).compileComponents(); @@ -189,7 +190,9 @@ describe(XThemePrefix, () => { 上一页 - 下一页 + 下一页 @@ -223,7 +226,9 @@ describe(XThemePrefix, () => { 上一页 - 下一页 + 下一页 diff --git a/lib/ng-nest/ui/theme/theme.module.ts b/lib/ng-nest/ui/theme/theme.module.ts index 375df99c5..60620105a 100644 --- a/lib/ng-nest/ui/theme/theme.module.ts +++ b/lib/ng-nest/ui/theme/theme.module.ts @@ -4,7 +4,7 @@ import { XThemeComponent } from './theme.component'; import { XThemeProperty } from './theme.property'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { XButtonComponent } from '@ng-nest/ui/button'; -import { XFormModule } from '@ng-nest/ui/form'; +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'; @@ -21,7 +21,7 @@ import { XControlValueAccessor } from '@ng-nest/ui/base-form'; XButtonComponent, XRowComponent, XColComponent, - XFormModule, + XFormComponent, XI18nDirective, XControlValueAccessor ] 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 8db8070be..0907d8b7a 100644 --- a/lib/ng-nest/ui/time-picker/time-picker.module.ts +++ b/lib/ng-nest/ui/time-picker/time-picker.module.ts @@ -1,10 +1,10 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { XInputModule } from '@ng-nest/ui/input'; +import { XInputComponent } from '@ng-nest/ui/input'; import { XIconComponent } from '@ng-nest/ui/icon'; import { XButtonComponent } from '@ng-nest/ui/button'; -import { XListModule } from '@ng-nest/ui/list'; +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'; @@ -19,8 +19,8 @@ import { XI18nDirective } from '@ng-nest/ui/i18n'; CommonModule, FormsModule, ReactiveFormsModule, - XInputModule, - XListModule, + XInputComponent, + XListComponent, XButtonComponent, XIconComponent, XControlValueAccessor, diff --git a/lib/ng-nest/ui/transfer/transfer.component.spec.ts b/lib/ng-nest/ui/transfer/transfer.component.spec.ts index e2072dea7..c4c89ae4c 100644 --- a/lib/ng-nest/ui/transfer/transfer.component.spec.ts +++ b/lib/ng-nest/ui/transfer/transfer.component.spec.ts @@ -15,7 +15,7 @@ import { XThemeModule } from '@ng-nest/ui/theme'; import { XTreeModule } from '@ng-nest/ui/tree'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { XSelectModule } from '@ng-nest/ui/select'; -import { XInputModule } from '@ng-nest/ui/input'; +import { XInputComponent } from '@ng-nest/ui/input'; describe(XTransferPrefix, () => { beforeEach(() => { @@ -34,7 +34,7 @@ describe(XTransferPrefix, () => { XIconComponent, XTreeModule, XSelectModule, - XInputModule + XInputComponent ], declarations: [TestXTransferComponent] }).compileComponents(); diff --git a/lib/ng-nest/ui/transfer/transfer.module.ts b/lib/ng-nest/ui/transfer/transfer.module.ts index 9ab0944c2..4cd65cde0 100644 --- a/lib/ng-nest/ui/transfer/transfer.module.ts +++ b/lib/ng-nest/ui/transfer/transfer.module.ts @@ -5,7 +5,7 @@ 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 { XInputModule } from '@ng-nest/ui/input'; +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'; @@ -25,7 +25,7 @@ import { XI18nPipe } from '@ng-nest/ui/i18n'; XOutletDirective, XCheckboxComponent, XButtonComponent, - XInputModule, + XInputComponent, XControlValueAccessor, XTreeModule, XTableModule, 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 c84e056c7..9a39c31af 100644 --- a/lib/ng-nest/ui/tree-file/tree-file.module.ts +++ b/lib/ng-nest/ui/tree-file/tree-file.module.ts @@ -3,15 +3,15 @@ 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 { XHighlightModule } from '@ng-nest/ui/highlight'; +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 { XLoadingModule } from '@ng-nest/ui/loading'; +import { XLoadingComponent } from '@ng-nest/ui/loading'; @NgModule({ declarations: [XTreeFileComponent, XTreeFileProperty], exports: [XTreeFileComponent], - imports: [CommonModule, XTreeModule, XLinkComponent, XCrumbComponent, XIconComponent, XLoadingModule, XHighlightModule] + imports: [CommonModule, XTreeModule, XLinkComponent, XCrumbComponent, XIconComponent, XLoadingComponent, XHighlightComponent] }) export class XTreeFileModule {} 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 709ea16b8..bcc240d0b 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 @@ -11,7 +11,7 @@ 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 { XInputModule } from '@ng-nest/ui/input'; +import { XInputComponent } from '@ng-nest/ui/input'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XTreeSelectPrefix, () => { @@ -24,7 +24,7 @@ describe(XTreeSelectPrefix, () => { XTreeSelectModule, FormsModule, ReactiveFormsModule, - XInputModule, + XInputComponent, XRowComponent, XColComponent, XRadioModule 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 808468b67..701542eee 100644 --- a/lib/ng-nest/ui/tree-select/tree-select.module.ts +++ b/lib/ng-nest/ui/tree-select/tree-select.module.ts @@ -2,8 +2,8 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { XTreeSelectComponent } from './tree-select.component'; -import { XInputModule } from '@ng-nest/ui/input'; -import { XListModule } from '@ng-nest/ui/list'; +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'; @@ -20,8 +20,8 @@ import { XEmptyComponent } from '@ng-nest/ui/empty'; CommonModule, FormsModule, ReactiveFormsModule, - XInputModule, - XListModule, + XInputComponent, + XListComponent, XControlValueAccessor, XTagModule, XI18nDirective, diff --git a/lib/ng-nest/ui/tree/tree.component.spec.ts b/lib/ng-nest/ui/tree/tree.component.spec.ts index 4d385376e..448edd907 100644 --- a/lib/ng-nest/ui/tree/tree.component.spec.ts +++ b/lib/ng-nest/ui/tree/tree.component.spec.ts @@ -9,7 +9,7 @@ import { XRowComponent, XColComponent } from '@ng-nest/ui/layout'; import { Observable } from 'rxjs'; import { XButtonComponent } from '@ng-nest/ui/button'; import { XLinkComponent } from '@ng-nest/ui/link'; -import { XFormModule, XFormRow } from '@ng-nest/ui/form'; +import { XFormComponent, XFormRow } from '@ng-nest/ui/form'; import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; import { UntypedFormGroup } from '@angular/forms'; import { XRepositoryService, XHttpService, XGuid } from '@ng-nest/ui/core'; @@ -17,7 +17,7 @@ import { map } from 'rxjs/operators'; import { XMessageModule, XMessageService } from '@ng-nest/ui/message'; import { XThemeModule } from '@ng-nest/ui/theme'; import { XIconComponent } from '@ng-nest/ui/icon'; -import { XInputNumberModule } from '@ng-nest/ui/input-number'; +import { XInputNumberComponent } from '@ng-nest/ui/input-number'; import { HttpClientTestingModule } from '@angular/common/http/testing'; describe(XTreePrefix, () => { @@ -32,10 +32,10 @@ describe(XTreePrefix, () => { XColComponent, XButtonComponent, XLinkComponent, - XFormModule, + XFormComponent, XLinkComponent, XMessageModule, - XInputNumberModule, + XInputNumberComponent, XIconComponent ], declarations: [ diff --git a/lib/ng-nest/ui/upload/upload.module.ts b/lib/ng-nest/ui/upload/upload.module.ts index 6ae374224..a48260dd4 100644 --- a/lib/ng-nest/ui/upload/upload.module.ts +++ b/lib/ng-nest/ui/upload/upload.module.ts @@ -9,7 +9,7 @@ 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 { XImageModule } from '@ng-nest/ui/image'; +import { XImageComponent, XImageGroupComponent } from '@ng-nest/ui/image'; import { XProgressModule } from '@ng-nest/ui/progress'; @NgModule({ @@ -24,7 +24,8 @@ import { XProgressModule } from '@ng-nest/ui/progress'; XButtonComponent, XIconComponent, XControlValueAccessor, - XImageModule, + XImageComponent, + XImageGroupComponent, XProgressModule ] }) diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts index 45596b144..f96f6c2de 100644 --- a/src/app/app.component.spec.ts +++ b/src/app/app.component.spec.ts @@ -1,14 +1,14 @@ -import { TestBed, async } from '@angular/core/testing'; +import { TestBed } from '@angular/core/testing'; import { RouterTestingModule } from '@angular/router/testing'; import { AppComponent } from './app.component'; describe('AppComponent', () => { - beforeEach((() => { + beforeEach(() => { TestBed.configureTestingModule({ imports: [RouterTestingModule], declarations: [AppComponent] }).compileComponents(); - })); + }); it('should create the app', () => { const fixture = TestBed.createComponent(AppComponent); diff --git a/src/main/docs/docs.module.ts b/src/main/docs/docs.module.ts index 94c956b6f..13c3673e7 100644 --- a/src/main/docs/docs.module.ts +++ b/src/main/docs/docs.module.ts @@ -2,10 +2,10 @@ import { ShareModule } from '@share'; import { NgModule } from '@angular/core'; import { NsDocsComponent } from './docs.component'; import { NsDocsRoutesModule } from './docs-routes.module'; -import { XMenuModule } from '@ng-nest/ui/menu'; +import { XMenuComponent } from '@ng-nest/ui/menu'; @NgModule({ - imports: [ShareModule, NsDocsRoutesModule, XMenuModule], + imports: [ShareModule, NsDocsRoutesModule, XMenuComponent], declarations: [NsDocsComponent], exports: [NsDocsComponent] }) diff --git a/src/main/layout/layout.module.ts b/src/main/layout/layout.module.ts index d16b726d2..33ea9d926 100644 --- a/src/main/layout/layout.module.ts +++ b/src/main/layout/layout.module.ts @@ -1,8 +1,8 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { XIconComponent } from '@ng-nest/ui/icon'; -import { XMenuModule } from '@ng-nest/ui/menu'; -import { XDropdownModule } from '@ng-nest/ui/dropdown'; +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'; @@ -42,9 +42,9 @@ const components = [ CommonModule, FormsModule, XIconComponent, - XMenuModule, + XMenuComponent, XButtonComponent, - XDropdownModule, + XDropdownComponent, XSelectModule, XDrawerComponent, XAffixComponent, diff --git a/src/main/test/find/find.component.html b/src/main/test/find/find.component.html new file mode 100644 index 000000000..60af398ef --- /dev/null +++ b/src/main/test/find/find.component.html @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/main/test/find/find.component.ts b/src/main/test/find/find.component.ts new file mode 100644 index 000000000..899fb5527 --- /dev/null +++ b/src/main/test/find/find.component.ts @@ -0,0 +1,26 @@ +import { Component } from '@angular/core'; +import { + ExDefaultComponent, + ExBorderedComponent, + ExDisabledComponent, + ExLabelComponent, + ExSizeComponent, + ExTreeComponent, + ExTreeTableComponent +} from '@ng-nest/ui/find/examples'; + +@Component({ + selector: 'te-find', + standalone: true, + imports: [ + ExDefaultComponent, + ExBorderedComponent, + ExDisabledComponent, + ExLabelComponent, + ExSizeComponent, + ExTreeComponent, + ExTreeTableComponent + ], + templateUrl: './find.component.html' +}) +export class TeFindComponent {} diff --git a/src/main/test/form/form.component.html b/src/main/test/form/form.component.html new file mode 100644 index 000000000..2b9e4b67d --- /dev/null +++ b/src/main/test/form/form.component.html @@ -0,0 +1,4 @@ + + + + diff --git a/src/main/test/form/form.component.ts b/src/main/test/form/form.component.ts new file mode 100644 index 000000000..3071ef962 --- /dev/null +++ b/src/main/test/form/form.component.ts @@ -0,0 +1,15 @@ +import { Component } from '@angular/core'; +import { + ExDefaultComponent, + ExFormVaildComponent, + ExLabelRowComponent, + ExTitleComponent +} from '@ng-nest/ui/form/examples'; + +@Component({ + selector: 'te-form', + standalone: true, + imports: [ExDefaultComponent, ExFormVaildComponent, ExLabelRowComponent, ExTitleComponent], + templateUrl: './form.component.html' +}) +export class TeFormComponent {} diff --git a/src/main/test/highlight/highlight.component.html b/src/main/test/highlight/highlight.component.html new file mode 100644 index 000000000..3e4c7a881 --- /dev/null +++ b/src/main/test/highlight/highlight.component.html @@ -0,0 +1,4 @@ + + + + diff --git a/src/main/test/highlight/highlight.component.ts b/src/main/test/highlight/highlight.component.ts new file mode 100644 index 000000000..034d7d01f --- /dev/null +++ b/src/main/test/highlight/highlight.component.ts @@ -0,0 +1,15 @@ +import { Component } from '@angular/core'; +import { + ExCopyComponent, + ExHtmlComponent, + ExScssComponent, + ExTypescriptComponent +} from '@ng-nest/ui/highlight/examples'; + +@Component({ + selector: 'te-highlight', + standalone: true, + imports: [ExCopyComponent, ExHtmlComponent, ExScssComponent, ExTypescriptComponent], + templateUrl: './highlight.component.html' +}) +export class TeHighlightComponent {} diff --git a/src/main/test/image/image.component.html b/src/main/test/image/image.component.html new file mode 100644 index 000000000..e1e3b6225 --- /dev/null +++ b/src/main/test/image/image.component.html @@ -0,0 +1,5 @@ + + + + + diff --git a/src/main/test/image/image.component.ts b/src/main/test/image/image.component.ts new file mode 100644 index 000000000..943a629c6 --- /dev/null +++ b/src/main/test/image/image.component.ts @@ -0,0 +1,22 @@ +import { Component } from '@angular/core'; +import { + ExDefaultComponent, + ExCustomComponent, + ExGroupComponent, + ExFallbackComponent, + ExPlaceholderComponent +} from '@ng-nest/ui/image/examples'; + +@Component({ + selector: 'te-image', + standalone: true, + imports: [ + ExDefaultComponent, + ExCustomComponent, + ExGroupComponent, + ExFallbackComponent, + ExPlaceholderComponent + ], + templateUrl: './image.component.html' +}) +export class TeImageComponent {} diff --git a/src/main/test/input-number/input-number.component.html b/src/main/test/input-number/input-number.component.html new file mode 100644 index 000000000..b58400914 --- /dev/null +++ b/src/main/test/input-number/input-number.component.html @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/main/test/input-number/input-number.component.ts b/src/main/test/input-number/input-number.component.ts new file mode 100644 index 000000000..a2e48da19 --- /dev/null +++ b/src/main/test/input-number/input-number.component.ts @@ -0,0 +1,30 @@ +import { Component } from '@angular/core'; +import { + ExBorderedComponent, + ExDefaultComponent, + ExDisabledComponent, + ExFormatComponent, + ExLabelComponent, + ExLimitComponent, + ExPrecisionComponent, + ExRequiredComponent, + ExSizeComponent +} from '@ng-nest/ui/input-number/examples'; + +@Component({ + selector: 'te-input-number', + standalone: true, + imports: [ + ExBorderedComponent, + ExDefaultComponent, + ExDisabledComponent, + ExFormatComponent, + ExLabelComponent, + ExLimitComponent, + ExPrecisionComponent, + ExRequiredComponent, + ExSizeComponent + ], + templateUrl: './input-number.component.html' +}) +export class TeInputNumberComponent {} diff --git a/src/main/test/input/input.component.html b/src/main/test/input/input.component.html new file mode 100644 index 000000000..0bec68083 --- /dev/null +++ b/src/main/test/input/input.component.html @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/main/test/input/input.component.ts b/src/main/test/input/input.component.ts new file mode 100644 index 000000000..1adac75c3 --- /dev/null +++ b/src/main/test/input/input.component.ts @@ -0,0 +1,36 @@ +import { Component } from '@angular/core'; +import { + ExDefaultComponent, + ExBorderedComponent, + ExClearComponent, + ExDisabledComponent, + ExFocusComponent, + ExGroupComponent, + ExIconComponent, + ExLabelComponent, + ExLengthComponent, + ExPerpostComponent, + ExRequiredComponent, + ExSizeComponent +} from '@ng-nest/ui/input/examples'; + +@Component({ + selector: 'te-input', + standalone: true, + imports: [ + ExDefaultComponent, + ExBorderedComponent, + ExClearComponent, + ExDisabledComponent, + ExFocusComponent, + ExGroupComponent, + ExIconComponent, + ExLabelComponent, + ExLengthComponent, + ExPerpostComponent, + ExRequiredComponent, + ExSizeComponent + ], + templateUrl: './input.component.html' +}) +export class TeInputComponent {} diff --git a/src/main/test/layout/layout.component.html b/src/main/test/layout/layout.component.html new file mode 100644 index 000000000..cac9084b4 --- /dev/null +++ b/src/main/test/layout/layout.component.html @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/main/test/layout/layout.component.ts b/src/main/test/layout/layout.component.ts new file mode 100644 index 000000000..5bbd79599 --- /dev/null +++ b/src/main/test/layout/layout.component.ts @@ -0,0 +1,26 @@ +import { Component } from '@angular/core'; +import { + ExDefaultComponent, + ExBlendComponent, + ExFlexComponent, + ExHiddenComponent, + ExLayoutComponent, + ExOffsetComponent, + ExSpaceComponent +} from '@ng-nest/ui/layout/examples'; + +@Component({ + selector: 'te-layout', + standalone: true, + imports: [ + ExDefaultComponent, + ExBlendComponent, + ExFlexComponent, + ExHiddenComponent, + ExLayoutComponent, + ExOffsetComponent, + ExSpaceComponent + ], + templateUrl: './layout.component.html' +}) +export class TeLayoutComponent {} diff --git a/src/main/test/link/link.component.html b/src/main/test/link/link.component.html new file mode 100644 index 000000000..3c6c56f83 --- /dev/null +++ b/src/main/test/link/link.component.html @@ -0,0 +1,4 @@ + + + + diff --git a/src/main/test/link/link.component.ts b/src/main/test/link/link.component.ts new file mode 100644 index 000000000..94ebfa29c --- /dev/null +++ b/src/main/test/link/link.component.ts @@ -0,0 +1,15 @@ +import { Component } from '@angular/core'; +import { + ExDefaultComponent, + ExDisabledComponent, + ExIconComponent, + ExUnderlineComponent +} from '@ng-nest/ui/link/examples'; + +@Component({ + selector: 'te-link', + standalone: true, + imports: [ExDefaultComponent, ExDisabledComponent, ExIconComponent, ExUnderlineComponent], + templateUrl: './link.component.html' +}) +export class TeLinkComponent {} diff --git a/src/main/test/list/list.component.html b/src/main/test/list/list.component.html new file mode 100644 index 000000000..ae8d55787 --- /dev/null +++ b/src/main/test/list/list.component.html @@ -0,0 +1,4 @@ + + + + diff --git a/src/main/test/list/list.component.ts b/src/main/test/list/list.component.ts new file mode 100644 index 000000000..43d706b9f --- /dev/null +++ b/src/main/test/list/list.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; +import { ExDefaultComponent, ExLoadMoreComponent, ExScrollComponent, ExSizeComponent } from '@ng-nest/ui/list/examples'; + +@Component({ + selector: 'te-list', + standalone: true, + imports: [ExDefaultComponent, ExLoadMoreComponent, ExScrollComponent, ExSizeComponent], + templateUrl: './list.component.html' +}) +export class TeListComponent {} diff --git a/src/main/test/loading/loading.component.html b/src/main/test/loading/loading.component.html new file mode 100644 index 000000000..72a0481a7 --- /dev/null +++ b/src/main/test/loading/loading.component.html @@ -0,0 +1,3 @@ + + + diff --git a/src/main/test/loading/loading.component.ts b/src/main/test/loading/loading.component.ts new file mode 100644 index 000000000..021038983 --- /dev/null +++ b/src/main/test/loading/loading.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; +import { ExDefaultComponent, ExCustomComponent, ExFullScreenComponent } from '@ng-nest/ui/loading/examples'; + +@Component({ + selector: 'te-loading', + standalone: true, + imports: [ExDefaultComponent, ExCustomComponent, ExFullScreenComponent], + templateUrl: './loading.component.html' +}) +export class TeLoadingComponent {} diff --git a/src/main/test/menu/menu.component.html b/src/main/test/menu/menu.component.html new file mode 100644 index 000000000..2b266f5a6 --- /dev/null +++ b/src/main/test/menu/menu.component.html @@ -0,0 +1,5 @@ + + + + + diff --git a/src/main/test/menu/menu.component.ts b/src/main/test/menu/menu.component.ts new file mode 100644 index 000000000..030f59756 --- /dev/null +++ b/src/main/test/menu/menu.component.ts @@ -0,0 +1,16 @@ +import { Component } from '@angular/core'; +import { + ExDefaultComponent, + ExIconComponent, + ExLayoutComponent, + ExLeafComponent, + ExSizeComponent +} from '@ng-nest/ui/menu/examples'; + +@Component({ + selector: 'te-menu', + standalone: true, + imports: [ExDefaultComponent, ExIconComponent, ExLayoutComponent, ExLeafComponent, ExSizeComponent], + templateUrl: './menu.component.html' +}) +export class TeMenuComponent {} diff --git a/src/main/test/message/message.component.html b/src/main/test/message/message.component.html new file mode 100644 index 000000000..f5ffcfe55 --- /dev/null +++ b/src/main/test/message/message.component.html @@ -0,0 +1,5 @@ + + + + + diff --git a/src/main/test/message/message.component.ts b/src/main/test/message/message.component.ts new file mode 100644 index 000000000..8f2e78551 --- /dev/null +++ b/src/main/test/message/message.component.ts @@ -0,0 +1,16 @@ +import { Component } from '@angular/core'; +import { + ExDefaultComponent, + ExCloseComponent, + ExLoadingComponent, + ExSingleComponent, + ExTypeComponent +} from '@ng-nest/ui/message/examples'; + +@Component({ + selector: 'te-message', + standalone: true, + imports: [ExDefaultComponent, ExCloseComponent, ExLoadingComponent, ExSingleComponent, ExTypeComponent], + templateUrl: './message.component.html' +}) +export class TeMessageComponent {} diff --git a/src/main/test/test-routes.modules.ts b/src/main/test/test-routes.modules.ts index d6b38eb02..1b3f3a71b 100644 --- a/src/main/test/test-routes.modules.ts +++ b/src/main/test/test-routes.modules.ts @@ -103,6 +103,54 @@ export const TestRoutes: Routes = [ { path: 'dropdown', loadComponent: () => import('./dropdown/dropdown.component').then((x) => x.TeDropdownComponent) + }, + { + path: 'find', + loadComponent: () => import('./find/find.component').then((x) => x.TeFindComponent) + }, + { + path: 'form', + loadComponent: () => import('./form/form.component').then((x) => x.TeFormComponent) + }, + { + path: 'highlight', + loadComponent: () => import('./highlight/highlight.component').then((x) => x.TeHighlightComponent) + }, + { + path: 'image', + loadComponent: () => import('./image/image.component').then((x) => x.TeImageComponent) + }, + { + path: 'input', + loadComponent: () => import('./input/input.component').then((x) => x.TeInputComponent) + }, + { + path: 'input-number', + loadComponent: () => import('./input-number/input-number.component').then((x) => x.TeInputNumberComponent) + }, + { + path: 'layout', + loadComponent: () => import('./layout/layout.component').then((x) => x.TeLayoutComponent) + }, + { + path: 'link', + loadComponent: () => import('./link/link.component').then((x) => x.TeLinkComponent) + }, + { + path: 'list', + loadComponent: () => import('./list/list.component').then((x) => x.TeListComponent) + }, + { + path: 'loading', + loadComponent: () => import('./loading/loading.component').then((x) => x.TeLoadingComponent) + }, + { + path: 'menu', + loadComponent: () => import('./menu/menu.component').then((x) => x.TeMenuComponent) + }, + { + path: 'message', + loadComponent: () => import('./message/message.component').then((x) => x.TeMessageComponent) } ] } diff --git a/src/share/share.module.ts b/src/share/share.module.ts index c058305e2..d2102fed5 100644 --- a/src/share/share.module.ts +++ b/src/share/share.module.ts @@ -4,10 +4,10 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { RouterModule } from '@angular/router'; import { HttpClientModule } from '@angular/common/http'; import { XDocComponent } from '@ng-nest/ui/doc'; -import { XExamplesModule } from '@ng-nest/ui/examples'; +import { XExamplesComponent } from '@ng-nest/ui/examples'; import { XApiComponent } from '@ng-nest/ui/api'; import { XTabsModule } from '@ng-nest/ui/tabs'; -import { XHighlightModule } from '@ng-nest/ui/highlight'; +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'; @@ -23,11 +23,11 @@ const modules = [ ReactiveFormsModule, NsAdaptionModule, XDocComponent, - XExamplesModule, + XExamplesComponent, XAnchorComponent, XApiComponent, XTabsModule, - XHighlightModule, + XHighlightComponent, XPatternComponent, XI18nDirective, XButtonComponent,