diff --git a/components/accordion/accordion-group/accordion-group.component.ts b/components/accordion/accordion-group/accordion-group.component.ts index 65368cca..6fc84716 100644 --- a/components/accordion/accordion-group/accordion-group.component.ts +++ b/components/accordion/accordion-group/accordion-group.component.ts @@ -10,7 +10,8 @@ import { } from '@angular/core'; import { animate, state, style, transition, trigger } from '@angular/animations'; import { AccordionService } from '../accordion.service'; -import { isTemplateRef } from '../../core/util/check'; +import { isTemplateRef } from 'ng-zorro-antd-mobile/core'; + @Component({ selector: 'AccordionPanel, nzm-accordion-panel', templateUrl: './accordion-group.component.html', diff --git a/components/accordion/accordion.module.ts b/components/accordion/accordion.module.ts index 58152399..98c04341 100644 --- a/components/accordion/accordion.module.ts +++ b/components/accordion/accordion.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { AccordionComponent } from './accordion.component'; import { AccordionGroupComponent } from './accordion-group/accordion-group.component'; -import { WhiteSpaceModule } from '../white-space/white-space.module'; +import { WhiteSpaceModule } from 'ng-zorro-antd-mobile/white-space'; @NgModule({ imports: [CommonModule, WhiteSpaceModule], diff --git a/components/accordion/ng-package.json b/components/accordion/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/accordion/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/action-sheet/action-sheet.component.ts b/components/action-sheet/action-sheet.component.ts index 5e0643d9..074c9be2 100644 --- a/components/action-sheet/action-sheet.component.ts +++ b/components/action-sheet/action-sheet.component.ts @@ -1,8 +1,9 @@ import { OnInit, Component, OnDestroy, ElementRef, TemplateRef, ViewEncapsulation } from '@angular/core'; -import { Subject, Observable } from 'rxjs'; +import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; -import { LocaleProviderService } from '../locale-provider/locale-provider.service'; +import { LocaleProviderService } from 'ng-zorro-antd-mobile/locale-provider'; import { ActionSheetRef } from './action-sheet-ref.class'; + @Component({ selector: 'ActionSheet', templateUrl: './action-sheet.component.html', diff --git a/components/action-sheet/action-sheet.module.ts b/components/action-sheet/action-sheet.module.ts index c6f8885c..1e3067a1 100644 --- a/components/action-sheet/action-sheet.module.ts +++ b/components/action-sheet/action-sheet.module.ts @@ -1,14 +1,14 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { OverlayModule } from '@angular/cdk/overlay'; -import { ListModule } from '../list/list.module'; -import { NgZorroAntdMobilePipesModule } from '../pipes/ng-zorro-antd-mobile.pipes.module'; +import { ListModule } from 'ng-zorro-antd-mobile/list'; +import { NgZorroAntdMobilePipesModule } from 'ng-zorro-antd-mobile/pipes'; import { ActionSheetComponent } from './action-sheet.component'; -import { WingBlankModule } from '../wing-blank/wing-blank.module'; -import { WhiteSpaceModule } from '../white-space/white-space.module'; -import { LocaleProviderModule } from '../locale-provider/locale-provider.module'; -import { TouchFeedbackModule } from '../core/directive/touch-feedback.module'; -import { PopupService } from '../core/services/popup.service'; +import { WingBlankModule } from 'ng-zorro-antd-mobile/wing-blank'; +import { WhiteSpaceModule } from 'ng-zorro-antd-mobile/white-space'; +import { LocaleProviderModule } from 'ng-zorro-antd-mobile/locale-provider'; +import { TouchFeedbackModule } from 'ng-zorro-antd-mobile/core'; +import { PopupService } from 'ng-zorro-antd-mobile/core'; import { ActionSheetService } from './action-sheet.service'; @NgModule({ diff --git a/components/action-sheet/action-sheet.service.ts b/components/action-sheet/action-sheet.service.ts index a1f67a6e..482e0d75 100644 --- a/components/action-sheet/action-sheet.service.ts +++ b/components/action-sheet/action-sheet.service.ts @@ -6,7 +6,7 @@ import { ActionSheetWithOptions, ShareActionSheetWithOptions } from './action-sheet-options.provider'; -import { PopupService } from '../core/services/popup.service'; +import { PopupService } from 'ng-zorro-antd-mobile/core'; const NORMAL = 'NORMAL'; const SHARE = 'SHARE'; diff --git a/components/action-sheet/ng-package.json b/components/action-sheet/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/action-sheet/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/activity-indicator/ng-package.json b/components/activity-indicator/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/activity-indicator/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/badge/ng-package.json b/components/badge/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/badge/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/button/button.module.ts b/components/button/button.module.ts index 167e4e9e..04e1ca63 100644 --- a/components/button/button.module.ts +++ b/components/button/button.module.ts @@ -1,10 +1,10 @@ import { NgModule } from '@angular/core'; import { ButtonComponent } from './button.component'; import { CommonModule } from '@angular/common'; -import { IconModule } from '../icon/icon.module'; -import { WingBlankModule } from '../wing-blank/wing-blank.module'; -import { WhiteSpaceModule } from '../white-space/white-space.module'; -import { ListModule } from '../list/list.module'; +import { IconModule } from 'ng-zorro-antd-mobile/icon'; +import { WingBlankModule } from 'ng-zorro-antd-mobile/wing-blank'; +import { WhiteSpaceModule } from 'ng-zorro-antd-mobile/white-space'; +import { ListModule } from 'ng-zorro-antd-mobile/list'; export const NZ_BUTTON_DIRECTIVES: Array = [ButtonComponent]; @NgModule({ diff --git a/components/button/ng-package.json b/components/button/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/button/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/calendar/calendar.component.ts b/components/calendar/calendar.component.ts index 759210f8..cd5de8be 100644 --- a/components/calendar/calendar.component.ts +++ b/components/calendar/calendar.component.ts @@ -12,10 +12,9 @@ import { } from '@angular/core'; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; import { DateModels } from './date/DataTypes'; -import zhCN from './locale/zh_CN'; -import enUS from './locale/en_US'; +import { zh_CN, en_US } from 'ng-zorro-antd-mobile/locale-provider'; import { CalendarPropsType } from './calendar.props.component'; -import { LocaleProviderService } from '../locale-provider/locale-provider.service'; +import { LocaleProviderService } from 'ng-zorro-antd-mobile/locale-provider'; import { mergeDateTime, isSameDate } from './util/index'; import { takeUntil } from 'rxjs/operators'; import { CalendarDatePickerComponent } from './datepicker/datepicker.component'; @@ -48,7 +47,7 @@ export class CalendarComponent implements ControlValueAccessor, OnInit, OnDestro props = { visible: false, showHeader: true, - locale: zhCN, + locale: zh_CN.Calendar, pickTime: false, showShortcut: false, prefixCls: 'rmc-calendar', @@ -77,9 +76,9 @@ export class CalendarComponent implements ControlValueAccessor, OnInit, OnDestro @Input() set locale(value) { if (value === 'enUS') { - this.props.locale = enUS; + this.props.locale = en_US.Calendar; } else if (value === 'zhCN') { - this.props.locale = zhCN; + this.props.locale = zh_CN.Calendar; } this._unsubscribe$.next(); @@ -299,7 +298,7 @@ export class CalendarComponent implements ControlValueAccessor, OnInit, OnDestro this.writeModelData(date); return newState; - } + }; writeModelData(date) { if (this._dateModelValue instanceof Array) { @@ -353,14 +352,14 @@ export class CalendarComponent implements ControlValueAccessor, OnInit, OnDestro }; this.showClear = !!this.state.startDate; - } + }; triggerSelectHasDisableDate = (date: Date[]) => { this.triggerClear(); if (this.onSelectHasDisableDate) { this.onSelectHasDisableDate.emit(date); } - } + }; onClose = () => { this.state = { @@ -372,7 +371,7 @@ export class CalendarComponent implements ControlValueAccessor, OnInit, OnDestro clientHight: 0 } as CalendarStateType; this.showClear = !!this.state.startDate; - } + }; triggerConfirm = () => { const { startDate, endDate } = this.state; @@ -384,7 +383,7 @@ export class CalendarComponent implements ControlValueAccessor, OnInit, OnDestro this.onConfirm.emit({ startDate, endDate }); } this.onClose(); - } + }; triggerCancel() { if (this.props.onCancel) { @@ -408,7 +407,7 @@ export class CalendarComponent implements ControlValueAccessor, OnInit, OnDestro } this.showClear = !!this.state.startDate; }, 0); - } + }; onTimeChange = (date: Date) => { const { startDate, endDate } = this.state; @@ -417,7 +416,7 @@ export class CalendarComponent implements ControlValueAccessor, OnInit, OnDestro } else if (startDate) { this.state.startDate = date; } - } + }; shortcutSelect = (startDate: Date, endDate: Date, props = this.props) => { this.state = { @@ -426,11 +425,11 @@ export class CalendarComponent implements ControlValueAccessor, OnInit, OnDestro ...this.selectDate(endDate, true, { startDate }, props) }; this.showClear = !!this.state.startDate; - } + }; setClientHeight = (height: number) => { this.state.clientHight = height; - } + }; ngOnInit() { const defaultValue = this.props.defaultValue; diff --git a/components/calendar/calendar.module.ts b/components/calendar/calendar.module.ts index 533a9704..b961d0a1 100644 --- a/components/calendar/calendar.module.ts +++ b/components/calendar/calendar.module.ts @@ -1,13 +1,13 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { IconModule } from '../icon/icon.module'; +import { IconModule } from 'ng-zorro-antd-mobile/icon'; import { CalendarComponent } from './calendar.component'; import { CalendarHeaderComponent } from './header/header.component'; import { CalendarWeekPanelComponent } from './week-panel/week-panel.component'; import { CalendarDatePickerComponent } from './datepicker/datepicker.component'; import { CalendarTimePickerComponent } from './timepicker/timepicker.component'; -import { LocaleProviderModule } from '../locale-provider/locale-provider.module'; -import { DatePickerViewModule } from '../date-picker-view/date-picker-view.module'; +import { LocaleProviderModule } from 'ng-zorro-antd-mobile/locale-provider'; +import { DatePickerViewModule } from 'ng-zorro-antd-mobile/date-picker-view'; import { CalendarSingleMonthComponent } from './single-month/single-month.component'; import { CalendarConfirmPanelComponent } from './confirm-panel/confirm-panel.component'; import { CalendarShortcutPanelComponent } from './shortcut-panel/shortcut-panel.component'; diff --git a/components/calendar/datepicker/datepicker.base.component.ts b/components/calendar/datepicker/datepicker.base.component.ts index 73676c1e..a2b755ba 100644 --- a/components/calendar/datepicker/datepicker.base.component.ts +++ b/components/calendar/datepicker/datepicker.base.component.ts @@ -1,7 +1,7 @@ import { DateModels } from '../date/DataTypes'; import { DatepickerPropsType } from './datepicker.props.component'; import { formatDate } from '../util'; -import defaultLocale from '../locale/zh_CN'; +import { zh_CN } from 'ng-zorro-antd-mobile/locale-provider'; export interface DatepickerStateType { months: DateModels.MonthData[]; @@ -14,7 +14,7 @@ export class CalendarDatePickerBaseComponent { infiniteOpt: false, defaultDate: new Date(), initalMonths: 6, - locale: defaultLocale + locale: zh_CN.Calendar } as DatepickerPropsType; state: any = { @@ -81,7 +81,7 @@ export class CalendarDatePickerBaseComponent { return 0; } return +new Date(date.getFullYear(), date.getMonth(), date.getDate()); - } + }; genWeekData = (firstDate: Date) => { const minDateTime = this.getDateWithoutTime(this.props.minDate); @@ -121,7 +121,7 @@ export class CalendarDatePickerBaseComponent { } currentWeek[currentWeek.length - 1].isLastOfMonth = true; return weeks; - } + }; genMonthData(date?: Date, addMonth: number = 0) { if (!date) { @@ -225,7 +225,7 @@ export class CalendarDatePickerBaseComponent { console.warn('Unusable date. You can handle by onSelectHasDisableDate.', unuseable); } } - } + }; computeVisible = (clientHeight: number, scrollTop: number) => { let needUpdate = false; @@ -236,7 +236,8 @@ export class CalendarDatePickerBaseComponent { const filterFunc = (vm: DateModels.MonthData) => vm.y && vm.height && - (vm.y + vm.height > scrollTop - MAX_VIEW_PORT && vm.y < scrollTop + clientHeight + MAX_VIEW_PORT); + vm.y + vm.height > scrollTop - MAX_VIEW_PORT && + vm.y < scrollTop + clientHeight + MAX_VIEW_PORT; if (this.props.infiniteOpt && this.visibleMonth.length > 12) { this.visibleMonth = this.visibleMonth.filter(filterFunc).sort((a, b) => +a.firstDate - +b.firstDate); @@ -277,7 +278,7 @@ export class CalendarDatePickerBaseComponent { } return needUpdate; - } + }; createOnScroll = () => { // let timer: any; @@ -305,7 +306,7 @@ export class CalendarDatePickerBaseComponent { // } // }, 50); }; - } + }; baseOnCellClick = (day: DateModels.CellData) => { if (!day.tick) { @@ -314,5 +315,5 @@ export class CalendarDatePickerBaseComponent { if (this.props.onCellClick) { this.props.onCellClick(new Date(day.tick)); } - } + }; } diff --git a/components/calendar/ng-package.json b/components/calendar/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/calendar/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/calendar/timepicker/timepicker.component.ts b/components/calendar/timepicker/timepicker.component.ts index ca4731e5..eb472fef 100644 --- a/components/calendar/timepicker/timepicker.component.ts +++ b/components/calendar/timepicker/timepicker.component.ts @@ -1,5 +1,5 @@ import { Component, ViewEncapsulation, Input, HostBinding } from '@angular/core'; -import { zh_CN, en_US } from '../../locale-provider/locale'; +import { zh_CN, en_US } from 'ng-zorro-antd-mobile/locale-provider'; import { CalendarTimePickerPropsType } from './PropsType'; @Component({ diff --git a/components/card/ng-package.json b/components/card/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/card/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/carousel/carousel.component.ts b/components/carousel/carousel.component.ts index 6c8b1fcb..4d8db134 100644 --- a/components/carousel/carousel.component.ts +++ b/components/carousel/carousel.component.ts @@ -13,7 +13,7 @@ import { ViewEncapsulation } from '@angular/core'; import { CarouselSlideComponent } from './carousel-slide/carousel-slide.component'; -import * as touchEvent from '../core/util/touch-event'; +import { getEventTarget } from 'ng-zorro-antd-mobile/core'; @Component({ selector: 'Carousel, nzm-carousel', @@ -108,8 +108,8 @@ export class CarouselComponent implements AfterViewInit, OnDestroy { this.stopTimer(); this._isMouseDown = true; this.touchObject = { - startX: touchEvent.getEventTarget(event).pageX, - startY: touchEvent.getEventTarget(event).pageY, + startX: getEventTarget(event).pageX, + startY: getEventTarget(event).pageY, direction: this.touchObject.direction }; } @@ -124,22 +124,22 @@ export class CarouselComponent implements AfterViewInit, OnDestroy { } const { direction } = this.swipeDirection( this.touchObject.startX, - touchEvent.getEventTarget(event).pageX, + getEventTarget(event).pageX, this.touchObject.startY, - touchEvent.getEventTarget(event).pageY + getEventTarget(event).pageY ); if (direction === 0) { return; } const length = this.vertical - ? Math.abs(touchEvent.getEventTarget(event).pageY - this.touchObject.startY) - : Math.abs(touchEvent.getEventTarget(event).pageX - this.touchObject.startX); + ? Math.abs(getEventTarget(event).pageY - this.touchObject.startY) + : Math.abs(getEventTarget(event).pageX - this.touchObject.startX); const offset = -this.touchObject.direction * length - this.currentSelectedIndex * this._rationWidth; this.touchObject = { startX: this.touchObject.startX, startY: this.touchObject.startY, - endX: touchEvent.getEventTarget(event).pageX, - endY: touchEvent.getEventTarget(event).pageY, + endX: getEventTarget(event).pageX, + endY: getEventTarget(event).pageY, length, direction, offset diff --git a/components/carousel/ng-package.json b/components/carousel/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/carousel/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/checkbox/checkbox.module.ts b/components/checkbox/checkbox.module.ts index 57e46f30..2bbebadc 100644 --- a/components/checkbox/checkbox.module.ts +++ b/components/checkbox/checkbox.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { CommonModule } from '@angular/common'; -import { ListModule } from '../list/list.module'; +import { ListModule } from 'ng-zorro-antd-mobile/list'; import { CheckboxComponent } from './checkbox.component'; import { AgreeItemComponent } from './agree-item.component'; import { CheckboxItemComponent } from './checkbox-item.component'; diff --git a/components/checkbox/ng-package.json b/components/checkbox/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/checkbox/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/core/directive/index.ts b/components/core/directive/index.ts new file mode 100644 index 00000000..7e1a213e --- /dev/null +++ b/components/core/directive/index.ts @@ -0,0 +1 @@ +export * from './public-api'; diff --git a/components/core/directive/public-api.ts b/components/core/directive/public-api.ts new file mode 100644 index 00000000..68caf888 --- /dev/null +++ b/components/core/directive/public-api.ts @@ -0,0 +1,2 @@ +export * from './touch-feedback.directive'; +export * from './touch-feedback.module'; diff --git a/components/core/index.ts b/components/core/index.ts new file mode 100644 index 00000000..7e1a213e --- /dev/null +++ b/components/core/index.ts @@ -0,0 +1 @@ +export * from './public-api'; diff --git a/components/core/ng-package.json b/components/core/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/core/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/core/public-api.ts b/components/core/public-api.ts new file mode 100644 index 00000000..5acc022f --- /dev/null +++ b/components/core/public-api.ts @@ -0,0 +1,5 @@ +export * from './directive'; +export * from './services'; +export * from './testing'; +export * from './types'; +export * from './util'; diff --git a/components/core/services/index.ts b/components/core/services/index.ts new file mode 100644 index 00000000..7e1a213e --- /dev/null +++ b/components/core/services/index.ts @@ -0,0 +1 @@ +export * from './public-api'; diff --git a/components/core/services/public-api.ts b/components/core/services/public-api.ts new file mode 100644 index 00000000..e136e101 --- /dev/null +++ b/components/core/services/public-api.ts @@ -0,0 +1 @@ +export * from './popup.service'; diff --git a/components/core/types/index.ts b/components/core/types/index.ts new file mode 100644 index 00000000..7e1a213e --- /dev/null +++ b/components/core/types/index.ts @@ -0,0 +1 @@ +export * from './public-api'; diff --git a/components/core/types/public-api.ts b/components/core/types/public-api.ts new file mode 100644 index 00000000..a6c9f3b7 --- /dev/null +++ b/components/core/types/public-api.ts @@ -0,0 +1 @@ +export * from './indexable'; diff --git a/components/core/util/index.ts b/components/core/util/index.ts new file mode 100644 index 00000000..7e1a213e --- /dev/null +++ b/components/core/util/index.ts @@ -0,0 +1 @@ +export * from './public-api'; diff --git a/components/core/util/public-api.ts b/components/core/util/public-api.ts new file mode 100644 index 00000000..637a3508 --- /dev/null +++ b/components/core/util/public-api.ts @@ -0,0 +1,5 @@ +export * from './check'; +export * from './icon'; +export * from './position'; +export * from './touch-event'; +export * from './velocity'; diff --git a/components/date-picker-view/date-picker-view.component.ts b/components/date-picker-view/date-picker-view.component.ts index 3897fb56..d0522c5b 100644 --- a/components/date-picker-view/date-picker-view.component.ts +++ b/components/date-picker-view/date-picker-view.component.ts @@ -12,8 +12,7 @@ import { ViewEncapsulation } from '@angular/core'; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; -import { DatePickerComponent } from '../date-picker/date-picker.component'; -import { DatePickerOptions } from '../date-picker/date-picker-options.provider'; +import { DatePickerComponent, DatePickerOptions } from 'ng-zorro-antd-mobile/date-picker'; @Component({ selector: 'DatePickerView, nzm-date-picker-view', diff --git a/components/date-picker-view/date-picker-view.module.ts b/components/date-picker-view/date-picker-view.module.ts index 5cca62b3..2ae2741d 100644 --- a/components/date-picker-view/date-picker-view.module.ts +++ b/components/date-picker-view/date-picker-view.module.ts @@ -2,9 +2,9 @@ import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { CommonModule } from '@angular/common'; import { DatePickerViewComponent } from './date-picker-view.component'; -import { LocaleProviderModule } from '../locale-provider/locale-provider.module'; -import { DatePickerModule } from '../date-picker/date-picker.module'; -import { ToastModule } from '../toast/toast.module'; +import { LocaleProviderModule } from 'ng-zorro-antd-mobile/locale-provider'; +import { DatePickerModule } from 'ng-zorro-antd-mobile/date-picker'; +import { ToastModule } from 'ng-zorro-antd-mobile/toast'; @NgModule({ imports: [CommonModule, DatePickerModule, LocaleProviderModule, ToastModule, FormsModule], diff --git a/components/date-picker-view/ng-package.json b/components/date-picker-view/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/date-picker-view/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/date-picker/date-picker-options.provider.ts b/components/date-picker/date-picker-options.provider.ts index 40ab6e0e..eff921ce 100644 --- a/components/date-picker/date-picker-options.provider.ts +++ b/components/date-picker/date-picker-options.provider.ts @@ -1,5 +1,5 @@ import { EventEmitter, Injectable } from '@angular/core'; -import { zh_CN } from '../locale-provider/locale'; + export interface DatePickerOptionsInterface { mode: string; value: Date; diff --git a/components/date-picker/date-picker.component.ts b/components/date-picker/date-picker.component.ts index 8e28a102..57c914bd 100644 --- a/components/date-picker/date-picker.component.ts +++ b/components/date-picker/date-picker.component.ts @@ -11,10 +11,10 @@ import { } from '@angular/core'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; -import { LocaleProviderService } from '../locale-provider/locale-provider.service'; +import { LocaleProviderService } from 'ng-zorro-antd-mobile/locale-provider'; import { DatePickerOptions } from './date-picker-options.provider'; -import { ToastService } from '../toast/toast.service'; -import * as velocity from '../core/util/velocity'; +import { ToastService } from 'ng-zorro-antd-mobile/toast'; +import { getVelocity } from 'ng-zorro-antd-mobile/core'; export type DateMode = 'date' | 'time' | 'datetime' | 'year' | 'month'; @Component({ @@ -57,7 +57,7 @@ export class DatePickerComponent implements OnInit, OnDestroy, AfterViewInit { currentPicker: any; localeNew: any = {}; unsubscribe$ = new Subject(); - Velocity = velocity.getVelocity(); + Velocity = getVelocity(); errorMessage = ''; curTLessThanMin = false; curTMoreThanMax = false; diff --git a/components/date-picker/date-picker.module.ts b/components/date-picker/date-picker.module.ts index 7ee2196c..78351ff6 100644 --- a/components/date-picker/date-picker.module.ts +++ b/components/date-picker/date-picker.module.ts @@ -4,9 +4,8 @@ import { CommonModule } from '@angular/common'; import { DatePickerComponent } from './date-picker.component'; import { DatePickerDirective } from './date-picker.directive'; import { DatePickerOptions } from './date-picker-options.provider'; -import { LocaleProviderModule } from '../locale-provider/locale-provider.module'; -import { ToastModule } from '../toast/toast.module'; -import { ToastComponent } from '../toast/toast.component'; +import { LocaleProviderModule } from 'ng-zorro-antd-mobile/locale-provider'; +import { ToastModule } from 'ng-zorro-antd-mobile/toast'; @NgModule({ imports: [CommonModule, LocaleProviderModule, ToastModule, FormsModule], diff --git a/components/date-picker/ng-package.json b/components/date-picker/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/date-picker/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/drawer/ng-package.json b/components/drawer/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/drawer/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/flex/ng-package.json b/components/flex/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/flex/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/grid/grid.module.ts b/components/grid/grid.module.ts index e9069063..22e90acb 100644 --- a/components/grid/grid.module.ts +++ b/components/grid/grid.module.ts @@ -1,11 +1,12 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { GridComponent } from './grid.component'; -import { FlexModule } from '../flex/flex.module'; -import { CarouselModule } from '../carousel/carousel.module'; -import { IconModule } from '../icon/icon.module'; -import { TouchFeedbackModule } from '../core/directive/touch-feedback.module'; -import { NgZorroAntdMobilePipesModule } from '../pipes/ng-zorro-antd-mobile.pipes.module'; +import { FlexModule } from 'ng-zorro-antd-mobile/flex'; +import { CarouselModule } from 'ng-zorro-antd-mobile/carousel'; +import { IconModule } from 'ng-zorro-antd-mobile/icon'; +import { TouchFeedbackModule } from 'ng-zorro-antd-mobile/core'; +import { NgZorroAntdMobilePipesModule } from 'ng-zorro-antd-mobile/pipes'; + @NgModule({ imports: [FlexModule, IconModule, CommonModule, CarouselModule, TouchFeedbackModule, NgZorroAntdMobilePipesModule], exports: [GridComponent], diff --git a/components/grid/ng-package.json b/components/grid/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/grid/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/icon/icon.component.ts b/components/icon/icon.component.ts index 37462199..9fa3395f 100644 --- a/components/icon/icon.component.ts +++ b/components/icon/icon.component.ts @@ -1,5 +1,5 @@ import { Component, ViewEncapsulation, Input } from '@angular/core'; -import { IconHandler } from '../core/util/icon'; +import { IconHandler } from 'ng-zorro-antd-mobile/core'; @Component({ selector: 'Icon, nzm-icon', diff --git a/components/icon/ng-package.json b/components/icon/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/icon/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/image-picker/image-picker.module.ts b/components/image-picker/image-picker.module.ts index 5bb48787..727a4f46 100644 --- a/components/image-picker/image-picker.module.ts +++ b/components/image-picker/image-picker.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { ImagePickerComponent } from './image-picker.component'; -import { FlexModule } from '../flex/flex.module'; +import { FlexModule } from 'ng-zorro-antd-mobile/flex'; import { CommonModule } from '@angular/common'; @NgModule({ diff --git a/components/image-picker/ng-package.json b/components/image-picker/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/image-picker/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/index.ts b/components/index.ts new file mode 100644 index 00000000..24d481c2 --- /dev/null +++ b/components/index.ts @@ -0,0 +1 @@ +export * from './ng-zorro-antd-mobile.module'; diff --git a/components/input-item/custom-keyboard/custom-keyboard.component.ts b/components/input-item/custom-keyboard/custom-keyboard.component.ts index 7a80eee0..806a77f8 100644 --- a/components/input-item/custom-keyboard/custom-keyboard.component.ts +++ b/components/input-item/custom-keyboard/custom-keyboard.component.ts @@ -1,5 +1,5 @@ -import { Component, OnInit, Output, EventEmitter, ViewEncapsulation, OnDestroy, HostBinding } from '@angular/core'; -import { LocaleProviderService } from '../../locale-provider/locale-provider.service'; +import { Component, OnInit, Output, EventEmitter, ViewEncapsulation, OnDestroy } from '@angular/core'; +import { LocaleProviderService } from 'ng-zorro-antd-mobile/locale-provider'; import { takeUntil } from 'rxjs/operators'; import { Subject } from 'rxjs'; diff --git a/components/input-item/input-item.component.ts b/components/input-item/input-item.component.ts index 8fed1fd5..3eac15c1 100644 --- a/components/input-item/input-item.component.ts +++ b/components/input-item/input-item.component.ts @@ -13,7 +13,7 @@ import { TemplateRef } from '@angular/core'; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; -import { isTemplateRef } from '../core/util/check'; +import { isTemplateRef } from 'ng-zorro-antd-mobile/core'; import { NzmInputType } from './input-item.definitions'; @Component({ diff --git a/components/input-item/ng-package.json b/components/input-item/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/input-item/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/list/ng-package.json b/components/list/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/list/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/locale-provider/locale/action-sheet/da_DK.ts b/components/locale-provider/locale/action-sheet/da_DK.ts new file mode 100644 index 00000000..2978dc0c --- /dev/null +++ b/components/locale-provider/locale/action-sheet/da_DK.ts @@ -0,0 +1,3 @@ +export default { + dismissText: 'Annuller' +}; diff --git a/components/locale-provider/locale/action-sheet/en_US.ts b/components/locale-provider/locale/action-sheet/en_US.ts new file mode 100644 index 00000000..1799dd90 --- /dev/null +++ b/components/locale-provider/locale/action-sheet/en_US.ts @@ -0,0 +1,3 @@ +export default { + dismissText: 'Cancel' +}; diff --git a/components/locale-provider/locale/action-sheet/index.ts b/components/locale-provider/locale/action-sheet/index.ts new file mode 100644 index 00000000..1c1b4371 --- /dev/null +++ b/components/locale-provider/locale/action-sheet/index.ts @@ -0,0 +1,5 @@ +export { default as en_US } from './en_US'; +export { default as ru_RU } from './ru_RU'; +export { default as sv_SE } from './sv_SE'; +export { default as zh_CN } from './zh_CN'; +export { default as da_DK } from './da_DK'; diff --git a/components/locale-provider/locale/action-sheet/ru_RU.ts b/components/locale-provider/locale/action-sheet/ru_RU.ts new file mode 100644 index 00000000..d97c61e5 --- /dev/null +++ b/components/locale-provider/locale/action-sheet/ru_RU.ts @@ -0,0 +1,3 @@ +export default { + dismissText: 'Отмена' +}; diff --git a/components/locale-provider/locale/action-sheet/sv_SE.ts b/components/locale-provider/locale/action-sheet/sv_SE.ts new file mode 100644 index 00000000..bac4b83d --- /dev/null +++ b/components/locale-provider/locale/action-sheet/sv_SE.ts @@ -0,0 +1,3 @@ +export default { + dismissText: 'Avbryt' +}; diff --git a/components/locale-provider/locale/action-sheet/zh_CN.ts b/components/locale-provider/locale/action-sheet/zh_CN.ts new file mode 100644 index 00000000..bacc1da0 --- /dev/null +++ b/components/locale-provider/locale/action-sheet/zh_CN.ts @@ -0,0 +1,3 @@ +export default { + dismissText: '取消' +}; diff --git a/components/locale-provider/locale/calendar/da_DK.ts b/components/locale-provider/locale/calendar/da_DK.ts new file mode 100644 index 00000000..de17294b --- /dev/null +++ b/components/locale-provider/locale/calendar/da_DK.ts @@ -0,0 +1,29 @@ +// 同步自 'rmc-calendar/lib/locale/en_US'; + +export default { + title: 'Kalender', + today: 'I dag', + month: 'Måned', + year: 'År', + am: 'AM', + pm: 'PM', + dateTimeFormat: 'dd/MM/yyyy w hh:mm', + dateFormat: 'dd/MM/yyyy w', + noChoose: 'Intet valgt', + week: ['Søn', 'Man', 'Tir', 'Ons', 'Tor', 'Fre', 'Lør'], + clear: 'Fjern', + selectTime: 'Vælg tidspunkt', + selectStartTime: 'Vælg starttidspunkt', + selectEndTime: 'Vælg sluttidspunkt', + start: 'Start', + end: 'Slut', + begin: 'Start', + over: 'Slut', + begin_over: 'Start/Stop', + confirm: 'Bekræft', + monthTitle: 'MM yyyy', + loadPrevMonth: 'Indlæs forrige måned', + yesterday: 'I går', + lastWeek: 'Sidste uge', + lastMonth: 'Sidste måned' +}; diff --git a/components/locale-provider/locale/calendar/en_US.ts b/components/locale-provider/locale/calendar/en_US.ts new file mode 100644 index 00000000..a8cec616 --- /dev/null +++ b/components/locale-provider/locale/calendar/en_US.ts @@ -0,0 +1,29 @@ +// 同步自 'rmc-calendar/lib/locale/en_US'; + +export default { + title: 'Calendar', + today: 'Today', + month: 'Month', + year: 'Year', + am: 'AM', + pm: 'PM', + dateTimeFormat: 'MM/dd/yyyy w hh:mm', + dateFormat: 'yyyy/MM/dd w', + noChoose: 'No Choose', + week: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fir', 'Sat'], + clear: 'Clear', + selectTime: 'Select Time', + selectStartTime: 'Select Start Time', + selectEndTime: 'Select End Time', + start: 'Start', + end: 'End', + begin: 'Start', + over: 'End', + begin_over: 'S/E', + confirm: 'Confirm', + monthTitle: 'yyyy/MM', + loadPrevMonth: 'Load Prev Month', + yesterday: 'Yesterday', + lastWeek: 'Last Week', + lastMonth: 'Last Month' +}; diff --git a/components/locale-provider/locale/calendar/index.ts b/components/locale-provider/locale/calendar/index.ts new file mode 100644 index 00000000..aaae0ba7 --- /dev/null +++ b/components/locale-provider/locale/calendar/index.ts @@ -0,0 +1,4 @@ +export { default as en_US } from './en_US'; +export { default as sv_SE } from './pt_BR'; +export { default as zh_CN } from './zh_CN'; +export { default as da_DK } from './da_DK'; diff --git a/components/locale-provider/locale/calendar/pt_BR.ts b/components/locale-provider/locale/calendar/pt_BR.ts new file mode 100644 index 00000000..b06bb0cb --- /dev/null +++ b/components/locale-provider/locale/calendar/pt_BR.ts @@ -0,0 +1,29 @@ +// 同步自 'rmc-calendar/lib/locale/pt_BR'; + +export default { + title: 'Calendário', + today: 'Hoje', + month: 'Mês', + year: 'Ano', + am: 'AM', + pm: 'PM', + dateTimeFormat: 'dd/MM/yyyy w hh:mm', + dateFormat: 'dd/MM/yyyy w', + noChoose: 'Não Escolhido', + week: ['dom', 'seg', 'ter', 'qua', 'qui', 'sex', 'sab'], + clear: 'Limpar', + selectTime: 'Selecionar Tempo', + selectStartTime: 'Selecione Tempo Inicial', + selectEndTime: 'Selecione Tempo Final', + start: 'Início', + end: 'Fim', + begin: 'Início', + over: 'Fim', + begin_over: 'S/E', + confirm: 'Confirmar', + monthTitle: 'MM/yyyy', + loadPrevMonth: 'Carregar Mês Anterior', + yesterday: 'Ontem', + lastWeek: 'Última Semana', + lastMonth: 'Último Mês' +}; diff --git a/components/locale-provider/locale/calendar/zh_CN.ts b/components/locale-provider/locale/calendar/zh_CN.ts new file mode 100644 index 00000000..90a21048 --- /dev/null +++ b/components/locale-provider/locale/calendar/zh_CN.ts @@ -0,0 +1,29 @@ +// 同步自 'rmc-calendar/lib/locale/zh_CN'; + +export default { + title: '日期选择', + today: '今天', + month: '月', + year: '年', + am: '上午', + pm: '下午', + dateTimeFormat: 'yyyy年MM月dd日 星期w hh:mm', + dateFormat: 'yyyy年MM月dd日 星期w', + noChoose: '未选择', + week: ['日', '一', '二', '三', '四', '五', '六'], + clear: '清除', + selectTime: '选择时间', + selectStartTime: '选择开始时间', + selectEndTime: '选择结束时间', + start: '开始', + end: '结束', + begin: '起', + over: '止', + begin_over: '起/止', + confirm: '确认', + monthTitle: 'yyyy年MM月', + loadPrevMonth: '加载上一个月', + yesterday: '昨天', + lastWeek: '近一周', + lastMonth: '近一个月' +}; diff --git a/components/locale-provider/locale/da_DK.ts b/components/locale-provider/locale/da_DK.ts index 0f015358..a8f8dfe6 100644 --- a/components/locale-provider/locale/da_DK.ts +++ b/components/locale-provider/locale/da_DK.ts @@ -1,13 +1,13 @@ -import Picker from '../../picker/locale/da_DK'; -import DatePicker from '../../date-picker/locale/da_DK'; -import DatePickerView from '../../date-picker-view/locale/da_DK'; -import Menu from '../../menu/locale/da_DK'; -import Calendar from '../../calendar/locale/da_DK'; -import SearchBar from '../../search-bar/locale/da_DK'; -import InputItem from '../../input-item/locale/da_DK'; -import Pagination from '../../pagination/locale/da_DK'; -import PullToRefresh from '../../pull-to-refresh/locale/da_DK'; -import ActionSheet from '../../action-sheet/locale/da_DK'; +import Picker from './picker/da_DK'; +import DatePicker from './date-picker/da_DK'; +import DatePickerView from './date-picker-view/da_DK'; +import Menu from './menu/da_DK'; +import Calendar from './calendar/da_DK'; +import SearchBar from './search-bar/da_DK'; +import InputItem from './input-item/da_DK'; +import Pagination from './pagination/da_DK'; +import PullToRefresh from './pull-to-refresh/da_DK'; +import ActionSheet from './action-sheet/da_DK'; export default { locale: 'da_DK', diff --git a/components/locale-provider/locale/date-picker-view/da_DK.ts b/components/locale-provider/locale/date-picker-view/da_DK.ts new file mode 100644 index 00000000..81eeb561 --- /dev/null +++ b/components/locale-provider/locale/date-picker-view/da_DK.ts @@ -0,0 +1,15 @@ +// import DatePickerLocale from 'rmc-date-picker/lib/locale/en_US'; + +export default { + okText: 'Ok', + dismissText: 'Annuller', + extra: 'Vælg venligst', + // DatePickerLocale, + year: '', + month: '', + day: '', + hour: '', + minute: '', + am: 'AM', + pm: 'PM' +}; diff --git a/components/locale-provider/locale/date-picker-view/en_US.ts b/components/locale-provider/locale/date-picker-view/en_US.ts new file mode 100644 index 00000000..0637312a --- /dev/null +++ b/components/locale-provider/locale/date-picker-view/en_US.ts @@ -0,0 +1,15 @@ +// import DatePickerLocale from 'rmc-date-picker/lib/locale/en_US'; + +export default { + okText: 'OK', + dismissText: 'Cancel', + extra: 'please select', + // DatePickerLocale, + year: '', + month: '', + day: '', + hour: '', + minute: '', + am: 'AM', + pm: 'PM' +}; diff --git a/components/locale-provider/locale/date-picker-view/index.ts b/components/locale-provider/locale/date-picker-view/index.ts new file mode 100644 index 00000000..1c1b4371 --- /dev/null +++ b/components/locale-provider/locale/date-picker-view/index.ts @@ -0,0 +1,5 @@ +export { default as en_US } from './en_US'; +export { default as ru_RU } from './ru_RU'; +export { default as sv_SE } from './sv_SE'; +export { default as zh_CN } from './zh_CN'; +export { default as da_DK } from './da_DK'; diff --git a/components/locale-provider/locale/date-picker-view/ru_RU.ts b/components/locale-provider/locale/date-picker-view/ru_RU.ts new file mode 100644 index 00000000..e61840c4 --- /dev/null +++ b/components/locale-provider/locale/date-picker-view/ru_RU.ts @@ -0,0 +1,15 @@ +// import DatePickerLocale from 'rmc-date-picker/lib/locale/en_US'; + +export default { + okText: 'Ок', + dismissText: 'Отмена', + extra: '', + // DatePickerLocale, + year: '', + month: '', + day: '', + hour: '', + minute: '', + am: 'AM', + pm: 'PM' +}; diff --git a/components/locale-provider/locale/date-picker-view/sv_SE.ts b/components/locale-provider/locale/date-picker-view/sv_SE.ts new file mode 100644 index 00000000..95e55a1b --- /dev/null +++ b/components/locale-provider/locale/date-picker-view/sv_SE.ts @@ -0,0 +1,15 @@ +// import DatePickerLocale from 'rmc-date-picker/lib/locale/en_US'; + +export default { + okText: 'Ok', + dismissText: 'Avbryt', + extra: 'vänligen välj', + // DatePickerLocale, + year: '', + month: '', + day: '', + hour: '', + minute: '', + am: 'AM', + pm: 'PM' +}; diff --git a/components/locale-provider/locale/date-picker-view/zh_CN.ts b/components/locale-provider/locale/date-picker-view/zh_CN.ts new file mode 100644 index 00000000..e0479b50 --- /dev/null +++ b/components/locale-provider/locale/date-picker-view/zh_CN.ts @@ -0,0 +1,15 @@ +// import DatePickerLocale from 'rmc-date-picker/lib/locale/zh_CN'; + +export default { + okText: '确定', + dismissText: '取消', + extra: '请选择', + // DatePickerLocale, + year: '年', + month: '月', + day: '日', + hour: '时', + minute: '分', + am: '上午', + pm: '下午' +}; diff --git a/components/locale-provider/locale/date-picker/da_DK.ts b/components/locale-provider/locale/date-picker/da_DK.ts new file mode 100644 index 00000000..81eeb561 --- /dev/null +++ b/components/locale-provider/locale/date-picker/da_DK.ts @@ -0,0 +1,15 @@ +// import DatePickerLocale from 'rmc-date-picker/lib/locale/en_US'; + +export default { + okText: 'Ok', + dismissText: 'Annuller', + extra: 'Vælg venligst', + // DatePickerLocale, + year: '', + month: '', + day: '', + hour: '', + minute: '', + am: 'AM', + pm: 'PM' +}; diff --git a/components/locale-provider/locale/date-picker/en_US.ts b/components/locale-provider/locale/date-picker/en_US.ts new file mode 100644 index 00000000..0637312a --- /dev/null +++ b/components/locale-provider/locale/date-picker/en_US.ts @@ -0,0 +1,15 @@ +// import DatePickerLocale from 'rmc-date-picker/lib/locale/en_US'; + +export default { + okText: 'OK', + dismissText: 'Cancel', + extra: 'please select', + // DatePickerLocale, + year: '', + month: '', + day: '', + hour: '', + minute: '', + am: 'AM', + pm: 'PM' +}; diff --git a/components/locale-provider/locale/date-picker/index.ts b/components/locale-provider/locale/date-picker/index.ts new file mode 100644 index 00000000..1c1b4371 --- /dev/null +++ b/components/locale-provider/locale/date-picker/index.ts @@ -0,0 +1,5 @@ +export { default as en_US } from './en_US'; +export { default as ru_RU } from './ru_RU'; +export { default as sv_SE } from './sv_SE'; +export { default as zh_CN } from './zh_CN'; +export { default as da_DK } from './da_DK'; diff --git a/components/locale-provider/locale/date-picker/ru_RU.ts b/components/locale-provider/locale/date-picker/ru_RU.ts new file mode 100644 index 00000000..e61840c4 --- /dev/null +++ b/components/locale-provider/locale/date-picker/ru_RU.ts @@ -0,0 +1,15 @@ +// import DatePickerLocale from 'rmc-date-picker/lib/locale/en_US'; + +export default { + okText: 'Ок', + dismissText: 'Отмена', + extra: '', + // DatePickerLocale, + year: '', + month: '', + day: '', + hour: '', + minute: '', + am: 'AM', + pm: 'PM' +}; diff --git a/components/locale-provider/locale/date-picker/sv_SE.ts b/components/locale-provider/locale/date-picker/sv_SE.ts new file mode 100644 index 00000000..95e55a1b --- /dev/null +++ b/components/locale-provider/locale/date-picker/sv_SE.ts @@ -0,0 +1,15 @@ +// import DatePickerLocale from 'rmc-date-picker/lib/locale/en_US'; + +export default { + okText: 'Ok', + dismissText: 'Avbryt', + extra: 'vänligen välj', + // DatePickerLocale, + year: '', + month: '', + day: '', + hour: '', + minute: '', + am: 'AM', + pm: 'PM' +}; diff --git a/components/locale-provider/locale/date-picker/zh_CN.ts b/components/locale-provider/locale/date-picker/zh_CN.ts new file mode 100644 index 00000000..4c4abcbf --- /dev/null +++ b/components/locale-provider/locale/date-picker/zh_CN.ts @@ -0,0 +1,18 @@ +// import DatePickerLocale from 'rmc-date-picker/lib/locale/zh_CN'; + +export default { + errorMessage: '当前时间与设定最大或最小日期格式不一致', + curTMorethanMax: '当前时间大于设定最大日期', + curTLessthanMin: '当前时间小于设定最小日期', + okText: '确定', + dismissText: '取消', + extra: '请选择', + // DatePickerLocale, + year: '年', + month: '月', + day: '日', + hour: '时', + minute: '分', + am: '上午', + pm: '下午' +}; diff --git a/components/locale-provider/locale/en_US.ts b/components/locale-provider/locale/en_US.ts index c5f84c78..5a10d879 100644 --- a/components/locale-provider/locale/en_US.ts +++ b/components/locale-provider/locale/en_US.ts @@ -1,13 +1,13 @@ -import Picker from '../../picker/locale/en_US'; -import DatePicker from '../../date-picker/locale/en_US'; -import DatePickerView from '../../date-picker-view/locale/en_US'; -import Menu from '../../menu/locale/en_US'; -import Calendar from '../../calendar/locale/en_US'; -import SearchBar from '../../search-bar/locale/en_US'; -import InputItem from '../../input-item/locale/en_US'; -import Pagination from '../../pagination/locale/en_US'; -import PullToRefresh from '../../pull-to-refresh/locale/en_US'; -import ActionSheet from '../../action-sheet/locale/en_US'; +import Picker from './picker/en_US'; +import DatePicker from './date-picker/en_US'; +import DatePickerView from './date-picker-view/en_US'; +import Menu from './menu/en_US'; +import Calendar from './calendar/en_US'; +import SearchBar from './search-bar/en_US'; +import InputItem from './input-item/en_US'; +import Pagination from './pagination/en_US'; +import PullToRefresh from './pull-to-refresh/en_US'; +import ActionSheet from './action-sheet/en_US'; export default { locale: 'en_US', diff --git a/components/locale-provider/locale/input-item/da_DK.ts b/components/locale-provider/locale/input-item/da_DK.ts new file mode 100644 index 00000000..4b60a13f --- /dev/null +++ b/components/locale-provider/locale/input-item/da_DK.ts @@ -0,0 +1,5 @@ +export default { + confirmLabel: 'Ok', + backspaceLabel: 'Backspace', + cancelKeyboardLabel: 'CancelKeyboard' +}; diff --git a/components/locale-provider/locale/input-item/en_US.ts b/components/locale-provider/locale/input-item/en_US.ts new file mode 100644 index 00000000..5da56da1 --- /dev/null +++ b/components/locale-provider/locale/input-item/en_US.ts @@ -0,0 +1,5 @@ +export default { + confirmLabel: 'Done', + backspaceLabel: 'Backspace', + cancelKeyboardLabel: 'CancelKeyboard' +}; diff --git a/components/locale-provider/locale/input-item/index.ts b/components/locale-provider/locale/input-item/index.ts new file mode 100644 index 00000000..1c1b4371 --- /dev/null +++ b/components/locale-provider/locale/input-item/index.ts @@ -0,0 +1,5 @@ +export { default as en_US } from './en_US'; +export { default as ru_RU } from './ru_RU'; +export { default as sv_SE } from './sv_SE'; +export { default as zh_CN } from './zh_CN'; +export { default as da_DK } from './da_DK'; diff --git a/components/locale-provider/locale/input-item/ru_RU.ts b/components/locale-provider/locale/input-item/ru_RU.ts new file mode 100644 index 00000000..30d96108 --- /dev/null +++ b/components/locale-provider/locale/input-item/ru_RU.ts @@ -0,0 +1,5 @@ +export default { + confirmLabel: 'Ок', + backspaceLabel: 'возврат на одну позицию', + cancelKeyboardLabel: 'Отменить клавиатуру' +}; diff --git a/components/locale-provider/locale/input-item/sv_SE.ts b/components/locale-provider/locale/input-item/sv_SE.ts new file mode 100644 index 00000000..4b60a13f --- /dev/null +++ b/components/locale-provider/locale/input-item/sv_SE.ts @@ -0,0 +1,5 @@ +export default { + confirmLabel: 'Ok', + backspaceLabel: 'Backspace', + cancelKeyboardLabel: 'CancelKeyboard' +}; diff --git a/components/locale-provider/locale/input-item/zh_CN.ts b/components/locale-provider/locale/input-item/zh_CN.ts new file mode 100644 index 00000000..72e99411 --- /dev/null +++ b/components/locale-provider/locale/input-item/zh_CN.ts @@ -0,0 +1,5 @@ +export default { + confirmLabel: '确定', + backspaceLabel: '退格', + cancelKeyboardLabel: '收起键盘' +}; diff --git a/components/locale-provider/locale/menu/da_DK.ts b/components/locale-provider/locale/menu/da_DK.ts new file mode 100644 index 00000000..4cdd5ebe --- /dev/null +++ b/components/locale-provider/locale/menu/da_DK.ts @@ -0,0 +1,4 @@ +export default { + okText: 'Ok', + cancelText: 'Annuller' +}; diff --git a/components/locale-provider/locale/menu/en_US.ts b/components/locale-provider/locale/menu/en_US.ts new file mode 100644 index 00000000..0ba03427 --- /dev/null +++ b/components/locale-provider/locale/menu/en_US.ts @@ -0,0 +1,4 @@ +export default { + okText: 'Ok', + cancelText: 'Cancel' +}; diff --git a/components/locale-provider/locale/menu/index.ts b/components/locale-provider/locale/menu/index.ts new file mode 100644 index 00000000..1c1b4371 --- /dev/null +++ b/components/locale-provider/locale/menu/index.ts @@ -0,0 +1,5 @@ +export { default as en_US } from './en_US'; +export { default as ru_RU } from './ru_RU'; +export { default as sv_SE } from './sv_SE'; +export { default as zh_CN } from './zh_CN'; +export { default as da_DK } from './da_DK'; diff --git a/components/locale-provider/locale/menu/ru_RU.ts b/components/locale-provider/locale/menu/ru_RU.ts new file mode 100644 index 00000000..f78452e5 --- /dev/null +++ b/components/locale-provider/locale/menu/ru_RU.ts @@ -0,0 +1,4 @@ +export default { + okText: 'Ок', + cancelText: 'Отмена' +}; diff --git a/components/locale-provider/locale/menu/sv_SE.ts b/components/locale-provider/locale/menu/sv_SE.ts new file mode 100644 index 00000000..5a2bbbdb --- /dev/null +++ b/components/locale-provider/locale/menu/sv_SE.ts @@ -0,0 +1,4 @@ +export default { + okText: 'Ok', + cancelText: 'Avbryt' +}; diff --git a/components/locale-provider/locale/menu/zh_CN.ts b/components/locale-provider/locale/menu/zh_CN.ts new file mode 100644 index 00000000..78345086 --- /dev/null +++ b/components/locale-provider/locale/menu/zh_CN.ts @@ -0,0 +1,4 @@ +export default { + okText: '确定', + cancelText: '取消' +}; diff --git a/components/locale-provider/locale/pagination/da_DK.ts b/components/locale-provider/locale/pagination/da_DK.ts new file mode 100644 index 00000000..06b4424b --- /dev/null +++ b/components/locale-provider/locale/pagination/da_DK.ts @@ -0,0 +1,4 @@ +export default { + prevText: 'Forrige', + nextText: 'Næste' +}; diff --git a/components/locale-provider/locale/pagination/en_US.ts b/components/locale-provider/locale/pagination/en_US.ts new file mode 100644 index 00000000..e2689dfe --- /dev/null +++ b/components/locale-provider/locale/pagination/en_US.ts @@ -0,0 +1,4 @@ +export default { + prevText: 'Prev', + nextText: 'Next' +}; diff --git a/components/locale-provider/locale/pagination/index.ts b/components/locale-provider/locale/pagination/index.ts new file mode 100644 index 00000000..1c1b4371 --- /dev/null +++ b/components/locale-provider/locale/pagination/index.ts @@ -0,0 +1,5 @@ +export { default as en_US } from './en_US'; +export { default as ru_RU } from './ru_RU'; +export { default as sv_SE } from './sv_SE'; +export { default as zh_CN } from './zh_CN'; +export { default as da_DK } from './da_DK'; diff --git a/components/locale-provider/locale/pagination/ru_RU.ts b/components/locale-provider/locale/pagination/ru_RU.ts new file mode 100644 index 00000000..b84c8330 --- /dev/null +++ b/components/locale-provider/locale/pagination/ru_RU.ts @@ -0,0 +1,4 @@ +export default { + prevText: 'Назад', + nextText: 'Вперёд' +}; diff --git a/components/locale-provider/locale/pagination/sv_SE.ts b/components/locale-provider/locale/pagination/sv_SE.ts new file mode 100644 index 00000000..8aee6c88 --- /dev/null +++ b/components/locale-provider/locale/pagination/sv_SE.ts @@ -0,0 +1,4 @@ +export default { + prevText: 'Föreg', + nextText: 'Nästa' +}; diff --git a/components/locale-provider/locale/pagination/zh_CN.ts b/components/locale-provider/locale/pagination/zh_CN.ts new file mode 100644 index 00000000..0d2bcf42 --- /dev/null +++ b/components/locale-provider/locale/pagination/zh_CN.ts @@ -0,0 +1,4 @@ +export default { + prevText: '上一页', + nextText: '下一页' +}; diff --git a/components/locale-provider/locale/picker/da_DK.ts b/components/locale-provider/locale/picker/da_DK.ts new file mode 100644 index 00000000..097ae29d --- /dev/null +++ b/components/locale-provider/locale/picker/da_DK.ts @@ -0,0 +1,5 @@ +export default { + okText: 'Ok', + dismissText: 'Annuller', + extra: 'Vælg venligst' +}; diff --git a/components/locale-provider/locale/picker/en_US.ts b/components/locale-provider/locale/picker/en_US.ts new file mode 100644 index 00000000..dc99cfbd --- /dev/null +++ b/components/locale-provider/locale/picker/en_US.ts @@ -0,0 +1,5 @@ +export default { + okText: 'Ok', + dismissText: 'Cancel', + extra: 'please select' +}; diff --git a/components/locale-provider/locale/picker/index.ts b/components/locale-provider/locale/picker/index.ts new file mode 100644 index 00000000..1c1b4371 --- /dev/null +++ b/components/locale-provider/locale/picker/index.ts @@ -0,0 +1,5 @@ +export { default as en_US } from './en_US'; +export { default as ru_RU } from './ru_RU'; +export { default as sv_SE } from './sv_SE'; +export { default as zh_CN } from './zh_CN'; +export { default as da_DK } from './da_DK'; diff --git a/components/locale-provider/locale/picker/ru_RU.ts b/components/locale-provider/locale/picker/ru_RU.ts new file mode 100644 index 00000000..53cfa7f7 --- /dev/null +++ b/components/locale-provider/locale/picker/ru_RU.ts @@ -0,0 +1,5 @@ +export default { + okText: 'Ок', + dismissText: 'Отмена', + extra: '' +}; diff --git a/components/locale-provider/locale/picker/sv_SE.ts b/components/locale-provider/locale/picker/sv_SE.ts new file mode 100644 index 00000000..9da6421e --- /dev/null +++ b/components/locale-provider/locale/picker/sv_SE.ts @@ -0,0 +1,5 @@ +export default { + okText: 'Ok', + dismissText: 'Avbryt', + extra: 'vänligen välj' +}; diff --git a/components/locale-provider/locale/picker/zh_CN.ts b/components/locale-provider/locale/picker/zh_CN.ts new file mode 100644 index 00000000..d1fbea4e --- /dev/null +++ b/components/locale-provider/locale/picker/zh_CN.ts @@ -0,0 +1,5 @@ +export default { + okText: '确定', + dismissText: '取消', + extra: '请选择' +}; diff --git a/components/locale-provider/locale/pull-to-refresh/da_DK.ts b/components/locale-provider/locale/pull-to-refresh/da_DK.ts new file mode 100644 index 00000000..54dd4274 --- /dev/null +++ b/components/locale-provider/locale/pull-to-refresh/da_DK.ts @@ -0,0 +1,5 @@ +export default { + activateText: 'Opdater umiddelbart efter slip', + deactivateText: 'Træk ned for at opdatere', + finishText: 'Afslut opdatering' +}; diff --git a/components/locale-provider/locale/pull-to-refresh/en_US.ts b/components/locale-provider/locale/pull-to-refresh/en_US.ts new file mode 100644 index 00000000..daf73e86 --- /dev/null +++ b/components/locale-provider/locale/pull-to-refresh/en_US.ts @@ -0,0 +1,5 @@ +export default { + activateText: 'Refresh immediately after release', + deactivateText: 'Pull down to refresh', + finishText: 'Finish refresh' +}; diff --git a/components/locale-provider/locale/pull-to-refresh/index.ts b/components/locale-provider/locale/pull-to-refresh/index.ts new file mode 100644 index 00000000..1c1b4371 --- /dev/null +++ b/components/locale-provider/locale/pull-to-refresh/index.ts @@ -0,0 +1,5 @@ +export { default as en_US } from './en_US'; +export { default as ru_RU } from './ru_RU'; +export { default as sv_SE } from './sv_SE'; +export { default as zh_CN } from './zh_CN'; +export { default as da_DK } from './da_DK'; diff --git a/components/locale-provider/locale/pull-to-refresh/ru_RU.ts b/components/locale-provider/locale/pull-to-refresh/ru_RU.ts new file mode 100644 index 00000000..c2d4740d --- /dev/null +++ b/components/locale-provider/locale/pull-to-refresh/ru_RU.ts @@ -0,0 +1,5 @@ +export default { + activateText: 'Обновить сразу после выпуска', + deactivateText: 'Потяните вниз, чтобы обновить', + finishText: 'Завершить обновление' +}; diff --git a/components/locale-provider/locale/pull-to-refresh/sv_SE.ts b/components/locale-provider/locale/pull-to-refresh/sv_SE.ts new file mode 100644 index 00000000..0b72e14f --- /dev/null +++ b/components/locale-provider/locale/pull-to-refresh/sv_SE.ts @@ -0,0 +1,5 @@ +export default { + activateText: 'Uppdatera omedelbart efter utsläpp', + deactivateText: 'Dra ner för att uppdatera', + finishText: 'Avsluta uppdateringen' +}; diff --git a/components/locale-provider/locale/pull-to-refresh/zh_CN.ts b/components/locale-provider/locale/pull-to-refresh/zh_CN.ts new file mode 100644 index 00000000..0ab46e64 --- /dev/null +++ b/components/locale-provider/locale/pull-to-refresh/zh_CN.ts @@ -0,0 +1,5 @@ +export default { + activateText: '松开立即刷新', + deactivateText: '下拉可以刷新', + finishText: '完成刷新' +}; diff --git a/components/locale-provider/locale/ru_RU.ts b/components/locale-provider/locale/ru_RU.ts index b9b68940..7098f27f 100644 --- a/components/locale-provider/locale/ru_RU.ts +++ b/components/locale-provider/locale/ru_RU.ts @@ -1,13 +1,13 @@ -import Picker from '../../picker/locale/ru_RU'; -import DatePicker from '../../date-picker/locale/ru_RU'; -import DatePickerView from '../../date-picker-view/locale/ru_RU'; -import Menu from '../../menu/locale/ru_RU'; -// import Calendar from '../../calendar/locale/ru_RU'; -import SearchBar from '../../search-bar/locale/ru_RU'; -import InputItem from '../../input-item/locale/ru_RU'; -import Pagination from '../../pagination/locale/ru_RU'; -import PullToRefresh from '../../pull-to-refresh/locale/ru_RU'; -import ActionSheet from '../../action-sheet/locale/ru_RU'; +import Picker from './picker/ru_RU'; +import DatePicker from './date-picker/ru_RU'; +import DatePickerView from './date-picker-view/ru_RU'; +import Menu from './menu/ru_RU'; +// import Calendar from './calendar/locale/ru_RU'; +import SearchBar from './search-bar/ru_RU'; +import InputItem from './input-item/ru_RU'; +import Pagination from './pagination/ru_RU'; +import PullToRefresh from './pull-to-refresh/ru_RU'; +import ActionSheet from './action-sheet/ru_RU'; export default { locale: 'ru_RU', diff --git a/components/locale-provider/locale/search-bar/da_DK.ts b/components/locale-provider/locale/search-bar/da_DK.ts new file mode 100644 index 00000000..ad1f9231 --- /dev/null +++ b/components/locale-provider/locale/search-bar/da_DK.ts @@ -0,0 +1,3 @@ +export default { + cancelText: 'Annuller' +}; diff --git a/components/locale-provider/locale/search-bar/en_US.ts b/components/locale-provider/locale/search-bar/en_US.ts new file mode 100644 index 00000000..a1fad0fb --- /dev/null +++ b/components/locale-provider/locale/search-bar/en_US.ts @@ -0,0 +1,3 @@ +export default { + cancelText: 'Cancel' +}; diff --git a/components/locale-provider/locale/search-bar/index.ts b/components/locale-provider/locale/search-bar/index.ts new file mode 100644 index 00000000..1c1b4371 --- /dev/null +++ b/components/locale-provider/locale/search-bar/index.ts @@ -0,0 +1,5 @@ +export { default as en_US } from './en_US'; +export { default as ru_RU } from './ru_RU'; +export { default as sv_SE } from './sv_SE'; +export { default as zh_CN } from './zh_CN'; +export { default as da_DK } from './da_DK'; diff --git a/components/locale-provider/locale/search-bar/ru_RU.ts b/components/locale-provider/locale/search-bar/ru_RU.ts new file mode 100644 index 00000000..2df16c58 --- /dev/null +++ b/components/locale-provider/locale/search-bar/ru_RU.ts @@ -0,0 +1,3 @@ +export default { + cancelText: 'Отмена' +}; diff --git a/components/locale-provider/locale/search-bar/sv_SE.ts b/components/locale-provider/locale/search-bar/sv_SE.ts new file mode 100644 index 00000000..4ee45397 --- /dev/null +++ b/components/locale-provider/locale/search-bar/sv_SE.ts @@ -0,0 +1,3 @@ +export default { + cancelText: 'Avbryt' +}; diff --git a/components/locale-provider/locale/search-bar/zh_CN.ts b/components/locale-provider/locale/search-bar/zh_CN.ts new file mode 100644 index 00000000..7f222fdd --- /dev/null +++ b/components/locale-provider/locale/search-bar/zh_CN.ts @@ -0,0 +1,3 @@ +export default { + cancelText: '取消' +}; diff --git a/components/locale-provider/locale/sv_SE.ts b/components/locale-provider/locale/sv_SE.ts index fc261a79..0e0bce90 100644 --- a/components/locale-provider/locale/sv_SE.ts +++ b/components/locale-provider/locale/sv_SE.ts @@ -1,13 +1,13 @@ -import Picker from '../../picker/locale/sv_SE'; -import DatePicker from '../../date-picker/locale/sv_SE'; -import DatePickerView from '../../date-picker-view/locale/sv_SE'; -import Menu from '../../menu/locale/sv_SE'; -// import Calendar from '../../calendar/locale/sv_SE'; -import SearchBar from '../../search-bar/locale/sv_SE'; -import InputItem from '../../input-item/locale/sv_SE'; -import Pagination from '../../pagination/locale/sv_SE'; -import PullToRefresh from '../../pull-to-refresh/locale/sv_SE'; -import ActionSheet from '../../action-sheet/locale/sv_SE'; +import Picker from './picker/sv_SE'; +import DatePicker from './date-picker/sv_SE'; +import DatePickerView from './date-picker-view/sv_SE'; +import Menu from './menu/sv_SE'; +// import Calendar from './calendar/locale/sv_SE'; +import SearchBar from './search-bar/sv_SE'; +import InputItem from './input-item/sv_SE'; +import Pagination from './pagination/sv_SE'; +import PullToRefresh from './pull-to-refresh/sv_SE'; +import ActionSheet from './action-sheet/sv_SE'; export default { locale: 'sv_SE', diff --git a/components/locale-provider/locale/zh_CN.ts b/components/locale-provider/locale/zh_CN.ts index c302a45e..903f1296 100644 --- a/components/locale-provider/locale/zh_CN.ts +++ b/components/locale-provider/locale/zh_CN.ts @@ -1,13 +1,13 @@ -import Picker from '../../picker/locale/zh_CN'; -import DatePicker from '../../date-picker/locale/zh_CN'; -import DatePickerView from '../../date-picker-view/locale/zh_CN'; -import Menu from '../../menu/locale/zh_CN'; -import Calendar from '../../calendar/locale/zh_CN'; -import SearchBar from '../../search-bar/locale/zh_CN'; -import InputItem from '../../input-item/locale/zh_CN'; -import Pagination from '../../pagination/locale/zh_CN'; -import PullToRefresh from '../../pull-to-refresh/locale/zh_CN'; -import ActionSheet from '../../action-sheet/locale/zh_CN'; +import Picker from './picker/zh_CN'; +import DatePicker from './date-picker/zh_CN'; +import DatePickerView from './date-picker-view/zh_CN'; +import Menu from './menu/zh_CN'; +import Calendar from './calendar/zh_CN'; +import SearchBar from './search-bar/zh_CN'; +import InputItem from './input-item/zh_CN'; +import Pagination from './pagination/zh_CN'; +import PullToRefresh from './pull-to-refresh/zh_CN'; +import ActionSheet from './action-sheet/zh_CN'; export default { locale: 'zh_CN', diff --git a/components/locale-provider/ng-package.json b/components/locale-provider/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/locale-provider/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/menu/menu.component.ts b/components/menu/menu.component.ts index c4579f75..0166b147 100644 --- a/components/menu/menu.component.ts +++ b/components/menu/menu.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewEncapsulation, Input, Output, EventEmitter, OnDestroy } from '@angular/core'; import { Subject } from 'rxjs'; -import { LocaleProviderService } from '../locale-provider/locale-provider.service'; +import { LocaleProviderService } from 'ng-zorro-antd-mobile/locale-provider'; import { takeUntil } from 'rxjs/operators'; interface LocaleValue { diff --git a/components/menu/menu.module.ts b/components/menu/menu.module.ts index 9dd9dc26..d7ff3aee 100644 --- a/components/menu/menu.module.ts +++ b/components/menu/menu.module.ts @@ -1,13 +1,13 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { FlexModule } from '../flex/flex.module'; -import { ListModule } from '../list/list.module'; -import { RadioModule } from '../radio/radio.module'; -import { CheckboxModule } from '../checkbox/checkbox.module'; -import { ButtonModule } from '../button/button.module'; +import { FlexModule } from 'ng-zorro-antd-mobile/flex'; +import { ListModule } from 'ng-zorro-antd-mobile/list'; +import { RadioModule } from 'ng-zorro-antd-mobile/radio'; +import { CheckboxModule } from 'ng-zorro-antd-mobile/checkbox'; +import { ButtonModule } from 'ng-zorro-antd-mobile/button'; import { MenuComponent } from './menu.component'; import { SubMenuComponent } from './sub-menu/sub-menu.component'; -import { LocaleProviderModule } from '../locale-provider/locale-provider.module'; +import { LocaleProviderModule } from 'ng-zorro-antd-mobile/locale-provider'; import { FormsModule } from '@angular/forms'; @NgModule({ diff --git a/components/menu/ng-package.json b/components/menu/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/menu/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/modal/modal.module.ts b/components/modal/modal.module.ts index 7b582416..bb87e5ec 100644 --- a/components/modal/modal.module.ts +++ b/components/modal/modal.module.ts @@ -2,14 +2,15 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { ModalComponent, ModalServiceComponent } from './modal.component'; import { ModalService } from './modal.service'; -import { ListModule } from '../list/list.module'; -import { WingBlankModule } from '../wing-blank/wing-blank.module'; -import { WhiteSpaceModule } from '../white-space/white-space.module'; -import { ButtonModule } from '../button/button.module'; -import { InputItemModule } from '../input-item/input-item.module'; +import { ListModule } from 'ng-zorro-antd-mobile/list'; +import { WingBlankModule } from 'ng-zorro-antd-mobile/wing-blank'; +import { WhiteSpaceModule } from 'ng-zorro-antd-mobile/white-space'; +import { ButtonModule } from 'ng-zorro-antd-mobile/button'; +import { InputItemModule } from 'ng-zorro-antd-mobile/input-item'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { OverlayModule } from '@angular/cdk/overlay'; -import { PopupService } from '../core/services/popup.service'; +import { PopupService } from 'ng-zorro-antd-mobile/core'; + @NgModule({ imports: [ CommonModule, diff --git a/components/modal/modal.service.ts b/components/modal/modal.service.ts index 5235c6f5..85fba145 100644 --- a/components/modal/modal.service.ts +++ b/components/modal/modal.service.ts @@ -2,7 +2,7 @@ import { Injectable, Injector, ComponentRef, TemplateRef } from '@angular/core'; import { ModalServiceComponent } from './modal.component'; import { ModalBaseOptions, ModalOptions, ModalServiceCustomOptions, Action } from './modal-options.provider'; -import { PopupService } from '../core/services/popup.service'; +import { PopupService } from 'ng-zorro-antd-mobile/core'; @Injectable({ providedIn: 'root' diff --git a/components/modal/ng-package.json b/components/modal/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/modal/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/nav-bar/nav-bar.module.ts b/components/nav-bar/nav-bar.module.ts index fa25a655..288af824 100644 --- a/components/nav-bar/nav-bar.module.ts +++ b/components/nav-bar/nav-bar.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { IconModule } from '../icon/icon.module'; +import { IconModule } from 'ng-zorro-antd-mobile/icon'; import { NavBarComponent } from './nav-bar.component'; @NgModule({ diff --git a/components/nav-bar/ng-package.json b/components/nav-bar/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/nav-bar/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/ng-package.json b/components/ng-package.json index a1409825..e0ad0202 100644 --- a/components/ng-package.json +++ b/components/ng-package.json @@ -3,7 +3,7 @@ "dest": "../publish", "deleteDestPath": true, "lib": { - "entryFile": "ng-zorro-antd-mobile.module.ts" + "entryFile": "./index.ts" }, "allowedNonPeerDependencies": ["@ant-design/icons-angular", "tslib", "angular"] } diff --git a/components/ng-zorro-antd-mobile.module.ts b/components/ng-zorro-antd-mobile.module.ts index 4722d89f..8db5d286 100644 --- a/components/ng-zorro-antd-mobile.module.ts +++ b/components/ng-zorro-antd-mobile.module.ts @@ -1,102 +1,102 @@ import { ModuleWithProviders, NgModule } from '@angular/core'; -import { ActivityIndicatorModule } from './activity-indicator/activity-indicator.module'; -import { CardModule } from './card/card.module'; -import { BadgeModule } from './badge/badge.module'; -import { InputItemModule } from './input-item/input-item.module'; -import { ButtonModule } from './button/button.module'; -import { SwitchModule } from './switch/switch.module'; -import { SearchBarModule } from './search-bar/search-bar.module'; -import { StepperModule } from './stepper/stepper.module'; -import { StepsModule } from './steps/steps.module'; -import { CarouselModule } from './carousel/carousel.module'; -import { CheckboxModule } from './checkbox/checkbox.module'; -import { RadioModule } from './radio/radio.module'; -import { ProgressModule } from './progress/progress.module'; -import { AccordionModule } from './accordion/accordion.module'; -import { NoticeBarModule } from './notice-bar/notice-bar.module'; -import { IconModule } from './icon/icon.module'; -import { ToastModule } from './toast/toast.module'; -import { ModalModule } from './modal/modal.module'; -import { PopoverModule } from './popover/popover.module'; -import { NavBarModule } from './nav-bar/nav-bar.module'; -import { ListModule } from './list/list.module'; -import { CalendarModule } from './calendar/calendar.module'; -import { PopoverItemModule } from './popover/popover-item/popover-item.module'; -import { FlexModule } from './flex/flex.module'; -import { GridModule } from './grid/grid.module'; -import { ActionSheetModule } from './action-sheet/action-sheet.module'; -import { SegmentedControlModule } from './segmented-control/segmented-control.module'; +import { ActivityIndicatorModule } from 'ng-zorro-antd-mobile/activity-indicator'; +import { CardModule } from 'ng-zorro-antd-mobile/card'; +import { BadgeModule } from 'ng-zorro-antd-mobile/badge'; +import { InputItemModule } from 'ng-zorro-antd-mobile/input-item'; +import { ButtonModule } from 'ng-zorro-antd-mobile/button'; +import { SwitchModule } from 'ng-zorro-antd-mobile/switch'; +import { SearchBarModule } from 'ng-zorro-antd-mobile/search-bar'; +import { StepperModule } from 'ng-zorro-antd-mobile/stepper'; +import { StepsModule } from 'ng-zorro-antd-mobile/steps'; +import { CarouselModule } from 'ng-zorro-antd-mobile/carousel'; +import { CheckboxModule } from 'ng-zorro-antd-mobile/checkbox'; +import { RadioModule } from 'ng-zorro-antd-mobile/radio'; +import { ProgressModule } from 'ng-zorro-antd-mobile/progress'; +import { AccordionModule } from 'ng-zorro-antd-mobile/accordion'; +import { NoticeBarModule } from 'ng-zorro-antd-mobile/notice-bar'; +import { IconModule } from 'ng-zorro-antd-mobile/icon'; +import { ToastModule } from 'ng-zorro-antd-mobile/toast'; +import { ModalModule } from 'ng-zorro-antd-mobile/modal'; +import { PopoverModule } from 'ng-zorro-antd-mobile/popover'; +import { NavBarModule } from 'ng-zorro-antd-mobile/nav-bar'; +import { ListModule } from 'ng-zorro-antd-mobile/list'; +import { CalendarModule } from 'ng-zorro-antd-mobile/calendar'; +import { PopoverItemModule } from 'ng-zorro-antd-mobile/popover'; +import { FlexModule } from 'ng-zorro-antd-mobile/flex'; +import { GridModule } from 'ng-zorro-antd-mobile/grid'; +import { ActionSheetModule } from 'ng-zorro-antd-mobile/action-sheet'; +import { SegmentedControlModule } from 'ng-zorro-antd-mobile/segmented-control'; -import { TextareaItemModule } from './textarea-item/textarea-item.module'; -import { NgZorroAntdMobilePipesModule } from './pipes/ng-zorro-antd-mobile.pipes.module'; -import { TabsModule } from './tabs/tabs.module'; -import { TabBarModule } from './tab-bar/tab-bar.module'; -import { PickerModule } from './picker/picker.module'; -import { PickerViewModule } from './picker-view/picker-view.module'; -import { ImagePickerModule } from './image-picker/image-picker.module'; -import { ResultModule } from './result/result.module'; -import { WhiteSpaceModule } from './white-space/white-space.module'; -import { WingBlankModule } from './wing-blank/wing-blank.module'; -import { RangeModule } from './range/range.module'; -import { SliderModule } from './slider/slider.module'; -import { PaginationModule } from './pagination/pagination.module'; -import { TagModule } from './tag/tag.module'; -import { MenuModule } from './menu/menu.module'; -import { DatePickerModule } from './date-picker/date-picker.module'; -import { DatePickerViewModule } from './date-picker-view/date-picker-view.module'; -import { DrawerModule } from './drawer/drawer.module'; -import { SwipeActionModule } from './swipe-action/swipe-action.module'; -import { PullToRefreshModule } from './pull-to-refresh/pull-to-refresh.module'; -import { LocaleProviderModule } from './locale-provider/locale-provider.module'; +import { TextareaItemModule } from 'ng-zorro-antd-mobile/textarea-item'; +import { NgZorroAntdMobilePipesModule } from 'ng-zorro-antd-mobile/pipes'; +import { TabsModule } from 'ng-zorro-antd-mobile/tabs'; +import { TabBarModule } from 'ng-zorro-antd-mobile/tab-bar'; +import { PickerModule } from 'ng-zorro-antd-mobile/picker'; +import { PickerViewModule } from 'ng-zorro-antd-mobile/picker-view'; +import { ImagePickerModule } from 'ng-zorro-antd-mobile/image-picker'; +import { ResultModule } from 'ng-zorro-antd-mobile/result'; +import { WhiteSpaceModule } from 'ng-zorro-antd-mobile/white-space'; +import { WingBlankModule } from 'ng-zorro-antd-mobile/wing-blank'; +import { RangeModule } from 'ng-zorro-antd-mobile/range'; +import { SliderModule } from 'ng-zorro-antd-mobile/slider'; +import { PaginationModule } from 'ng-zorro-antd-mobile/pagination'; +import { TagModule } from 'ng-zorro-antd-mobile/tag'; +import { MenuModule } from 'ng-zorro-antd-mobile/menu'; +import { DatePickerModule } from 'ng-zorro-antd-mobile/date-picker'; +import { DatePickerViewModule } from 'ng-zorro-antd-mobile/date-picker-view'; +import { DrawerModule } from 'ng-zorro-antd-mobile/drawer'; +import { SwipeActionModule } from 'ng-zorro-antd-mobile/swipe-action'; +import { PullToRefreshModule } from 'ng-zorro-antd-mobile/pull-to-refresh'; +import { LocaleProviderModule } from 'ng-zorro-antd-mobile/locale-provider'; -export * from './tag/public-api'; -export * from './card/public-api'; -export * from './flex/public-api'; -export * from './grid/public-api'; -export * from './icon/public-api'; -export * from './list/public-api'; -export * from './menu/public-api'; -export * from './tabs/public-api'; -export * from './badge/public-api'; -export * from './modal/public-api'; -export * from './pipes/public-api'; -export * from './radio/public-api'; -export * from './range/public-api'; -export * from './steps/public-api'; -export * from './toast/public-api'; -export * from './button/public-api'; -export * from './drawer/public-api'; -export * from './picker/public-api'; -export * from './result/public-api'; -export * from './slider/public-api'; -export * from './switch/public-api'; -export * from './nav-bar/public-api'; -export * from './popover/public-api'; -export * from './stepper/public-api'; -export * from './tab-bar/public-api'; -export * from './calendar/public-api'; -export * from './carousel/public-api'; -export * from './checkbox/public-api'; -export * from './progress/public-api'; -export * from './accordion/public-api'; -export * from './input-item/public-api'; -export * from './notice-bar/public-api'; -export * from './pagination/public-api'; -export * from './search-bar/public-api'; -export * from './wing-blank/public-api'; -export * from './date-picker/public-api'; -export * from './white-space/public-api'; -export * from './picker-view/public-api'; -export * from './action-sheet/public-api'; -export * from './image-picker/public-api'; -export * from './swipe-action/public-api'; -export * from './textarea-item/public-api'; -export * from './locale-provider/public-api'; -export * from './pull-to-refresh/public-api'; -export * from './date-picker-view/public-api'; -export * from './segmented-control/public-api'; -export * from './activity-indicator/public-api'; +export * from 'ng-zorro-antd-mobile/tag'; +export * from 'ng-zorro-antd-mobile/card'; +export * from 'ng-zorro-antd-mobile/flex'; +export * from 'ng-zorro-antd-mobile/grid'; +export * from 'ng-zorro-antd-mobile/icon'; +export * from 'ng-zorro-antd-mobile/list'; +export * from 'ng-zorro-antd-mobile/menu'; +export * from 'ng-zorro-antd-mobile/tabs'; +export * from 'ng-zorro-antd-mobile/badge'; +export * from 'ng-zorro-antd-mobile/modal'; +export * from 'ng-zorro-antd-mobile/pipes'; +export * from 'ng-zorro-antd-mobile/radio'; +export * from 'ng-zorro-antd-mobile/range'; +export * from 'ng-zorro-antd-mobile/steps'; +export * from 'ng-zorro-antd-mobile/toast'; +export * from 'ng-zorro-antd-mobile/button'; +export * from 'ng-zorro-antd-mobile/drawer'; +export * from 'ng-zorro-antd-mobile/picker'; +export * from 'ng-zorro-antd-mobile/result'; +export * from 'ng-zorro-antd-mobile/slider'; +export * from 'ng-zorro-antd-mobile/switch'; +export * from 'ng-zorro-antd-mobile/nav-bar'; +export * from 'ng-zorro-antd-mobile/popover'; +export * from 'ng-zorro-antd-mobile/stepper'; +export * from 'ng-zorro-antd-mobile/tab-bar'; +export * from 'ng-zorro-antd-mobile/calendar'; +export * from 'ng-zorro-antd-mobile/carousel'; +export * from 'ng-zorro-antd-mobile/checkbox'; +export * from 'ng-zorro-antd-mobile/progress'; +export * from 'ng-zorro-antd-mobile/accordion'; +export * from 'ng-zorro-antd-mobile/input-item'; +export * from 'ng-zorro-antd-mobile/notice-bar'; +export * from 'ng-zorro-antd-mobile/pagination'; +export * from 'ng-zorro-antd-mobile/search-bar'; +export * from 'ng-zorro-antd-mobile/wing-blank'; +export * from 'ng-zorro-antd-mobile/date-picker'; +export * from 'ng-zorro-antd-mobile/white-space'; +export * from 'ng-zorro-antd-mobile/picker-view'; +export * from 'ng-zorro-antd-mobile/action-sheet'; +export * from 'ng-zorro-antd-mobile/image-picker'; +export * from 'ng-zorro-antd-mobile/swipe-action'; +export * from 'ng-zorro-antd-mobile/textarea-item'; +export * from 'ng-zorro-antd-mobile/locale-provider'; +export * from 'ng-zorro-antd-mobile/pull-to-refresh'; +export * from 'ng-zorro-antd-mobile/date-picker-view'; +export * from 'ng-zorro-antd-mobile/segmented-control'; +export * from 'ng-zorro-antd-mobile/activity-indicator'; @NgModule({ providers: [], diff --git a/components/notice-bar/ng-package.json b/components/notice-bar/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/notice-bar/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/notice-bar/notice-bar.component.ts b/components/notice-bar/notice-bar.component.ts index 0a4313b3..c0be44af 100644 --- a/components/notice-bar/notice-bar.component.ts +++ b/components/notice-bar/notice-bar.component.ts @@ -1,6 +1,7 @@ import { Component, OnInit, Input, Output, EventEmitter, OnDestroy } from '@angular/core'; -import { IconHandler } from '../core/util/icon'; -import * as util from './util'; +import { IconHandler } from 'ng-zorro-antd-mobile/core'; +import { deleteKeyFrame, getTextWidth, getWidthHeight, insertKeyFrame } from './util'; + @Component({ selector: 'NoticeBar, nzm-notice-bar', templateUrl: './notice-bar.component.html', @@ -52,15 +53,15 @@ export class NoticeBarComponent implements OnInit, OnDestroy { this.style = { width: '200%' }; - this._width = util.getTextWidth(this._option.content, this._option.fontSize); - if (util.getWidthHeight().width < this._width) { + this._width = getTextWidth(this._option.content, this._option.fontSize); + if (getWidthHeight().width < this._width) { const count = this._option.marqueeProps.loop ? 'infinite' : 1; let animationName = `noticebarmarquee_${this._width}`; this.style = { width: this._width * 2 + 'px', 'animation-name': animationName, 'animation-delay': `${this._option.marqueeProps.leading}ms`, - 'animation-duration': `${(((1 / this._option.marqueeProps.fps) * this._width) / util.getWidthHeight().width) * + 'animation-duration': `${(((1 / this._option.marqueeProps.fps) * this._width) / getWidthHeight().width) * 1000}s`, 'animation-iteration-count': `${count}` }; @@ -72,28 +73,28 @@ export class NoticeBarComponent implements OnInit, OnDestroy { } insetKeyframe(animationName) { - util.insertKeyFrame( + insertKeyFrame( `@keyframes ${animationName} { 0% { left: 0px; } 100% { left: -${this._width}px } }`, 'notice_bar_animation_cls' ); - util.insertKeyFrame( + insertKeyFrame( `@-webkit-keyframes ${animationName} { 0% { left: 0px; } 100% { left: -${this._width}px } }`, 'notice_bar_animation_cls' ); - util.insertKeyFrame( + insertKeyFrame( `@-moz-keyframes ${animationName} { 0% { left: 0px; } 100% { left: -${this._width}px } }`, 'notice_bar_animation_cls' ); - util.insertKeyFrame( + insertKeyFrame( `@-o-keyframes ${animationName} { 0% { left: 0px; } 100% { left: -${this._width}px } @@ -113,6 +114,6 @@ export class NoticeBarComponent implements OnInit, OnDestroy { } ngOnDestroy() { - util.deleteKeyFrame('notice_bar_animation_cls'); + deleteKeyFrame('notice_bar_animation_cls'); } } diff --git a/components/notice-bar/notice-bar.module.ts b/components/notice-bar/notice-bar.module.ts index 740e8f27..fdab8a4b 100644 --- a/components/notice-bar/notice-bar.module.ts +++ b/components/notice-bar/notice-bar.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { NoticeBarComponent } from './notice-bar.component'; -import { IconModule } from '../icon/icon.module'; +import { IconModule } from 'ng-zorro-antd-mobile/icon'; @NgModule({ imports: [IconModule, CommonModule, FormsModule], diff --git a/components/notice-bar/util.ts b/components/notice-bar/util.ts index 2d15dce9..37fd23ca 100644 --- a/components/notice-bar/util.ts +++ b/components/notice-bar/util.ts @@ -1,18 +1,18 @@ -function insertKeyFrame(rule, className) { +export function insertKeyFrame(rule, className) { const style = document.createElement('style'); style.setAttribute('class', className); style.innerHTML = rule; document.body.appendChild(style); } -function deleteKeyFrame(className) { +export function deleteKeyFrame(className) { const styleDom = document.getElementsByClassName(className); while (styleDom.length > 0) { styleDom[0].remove(); } } -function getWidthHeight() { +export function getWidthHeight() { const w = window; const d = document; const e = d.documentElement; @@ -23,7 +23,7 @@ function getWidthHeight() { }; } -function getTextWidth(text, font) { +export function getTextWidth(text, font) { const _dom = document.createElement('div'); _dom.innerHTML = text; _dom.style.position = 'absolute'; @@ -36,4 +36,4 @@ function getTextWidth(text, font) { return _w; } -export { insertKeyFrame, deleteKeyFrame, getWidthHeight, getTextWidth }; + \ No newline at end of file diff --git a/components/pagination/ng-package.json b/components/pagination/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/pagination/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/pagination/pagination.component.ts b/components/pagination/pagination.component.ts index ac0f0acc..09bf4c87 100644 --- a/components/pagination/pagination.component.ts +++ b/components/pagination/pagination.component.ts @@ -10,7 +10,7 @@ import { } from '@angular/core'; import { takeUntil } from 'rxjs/operators'; import { Subject } from 'rxjs'; -import { LocaleProviderService } from '../locale-provider/locale-provider.service'; +import { LocaleProviderService } from 'ng-zorro-antd-mobile/locale-provider'; interface LocaleValue { prevText: string; diff --git a/components/pagination/pagination.module.ts b/components/pagination/pagination.module.ts index cf7b0909..190f49aa 100644 --- a/components/pagination/pagination.module.ts +++ b/components/pagination/pagination.module.ts @@ -1,10 +1,10 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { ButtonModule } from '../button/button.module'; -import { FlexModule } from '../flex/flex.module'; -import { IconModule } from '../icon/icon.module'; +import { ButtonModule } from 'ng-zorro-antd-mobile/button'; +import { FlexModule } from 'ng-zorro-antd-mobile/flex'; +import { IconModule } from 'ng-zorro-antd-mobile/icon'; import { PaginationComponent } from './pagination.component'; -import { LocaleProviderModule } from '../locale-provider/locale-provider.module'; +import { LocaleProviderModule } from 'ng-zorro-antd-mobile/locale-provider'; @NgModule({ imports: [CommonModule, ButtonModule, FlexModule, IconModule, LocaleProviderModule], diff --git a/components/picker-view/ng-package.json b/components/picker-view/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/picker-view/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/picker-view/picker-view.component.ts b/components/picker-view/picker-view.component.ts index 454d6d64..f99e076b 100644 --- a/components/picker-view/picker-view.component.ts +++ b/components/picker-view/picker-view.component.ts @@ -1,6 +1,7 @@ import { Component, OnInit, ViewEncapsulation, AfterViewInit, Input, forwardRef, OnChanges, SimpleChanges } from '@angular/core'; -import { PickerComponent } from '../picker/picker.component'; +import { PickerComponent } from 'ng-zorro-antd-mobile/picker'; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; + @Component({ selector: 'PickerView, nzm-picker-view', templateUrl: './picker-view.component.html', diff --git a/components/picker-view/picker-view.module.ts b/components/picker-view/picker-view.module.ts index 4846f73a..94b8105b 100644 --- a/components/picker-view/picker-view.module.ts +++ b/components/picker-view/picker-view.module.ts @@ -2,8 +2,9 @@ import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { CommonModule } from '@angular/common'; import { PickerViewComponent } from './picker-view.component'; -import { PickerModule } from '../picker/picker.module'; -import { LocaleProviderModule } from '../locale-provider/locale-provider.module'; +import { PickerModule } from 'ng-zorro-antd-mobile/picker'; +import { LocaleProviderModule } from 'ng-zorro-antd-mobile/locale-provider'; + @NgModule({ imports: [FormsModule, CommonModule, PickerModule, LocaleProviderModule], exports: [PickerViewComponent], diff --git a/components/picker/ng-package.json b/components/picker/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/picker/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/picker/picker.component.ts b/components/picker/picker.component.ts index 3ed23491..40f7167e 100644 --- a/components/picker/picker.component.ts +++ b/components/picker/picker.component.ts @@ -10,11 +10,10 @@ import { ViewEncapsulation } from '@angular/core'; import { PickerOptions } from './picker-options.provider'; -import * as velocity from '../core/util/velocity'; -import * as touchEvent from '../core/util/touch-event'; -import { LocaleProviderService } from '../locale-provider/locale-provider.service'; +import { getEventTarget, getVelocity } from 'ng-zorro-antd-mobile/core'; +import { LocaleProviderService } from 'ng-zorro-antd-mobile/locale-provider'; import { takeUntil } from 'rxjs/operators'; -import { Subject, Observable } from 'rxjs'; +import { Subject } from 'rxjs'; import { PickerRef } from './picker-ref.class'; @Component({ @@ -36,7 +35,7 @@ export class PickerComponent extends PickerRef implement dataForRender: any[] = []; selectedTarget: any[] = []; isMouseDown: boolean = false; - Velocity = velocity.getVelocity(); + Velocity = getVelocity(); currentPicker: any; private _unsubscribe$: Subject = new Subject(); @@ -52,7 +51,7 @@ export class PickerComponent extends PickerRef implement } this.isMouseDown = true; event.preventDefault(); - this.dom = touchEvent.getEventTarget(event).target.parentElement.children[2]; + this.dom = getEventTarget(event).target.parentElement.children[2]; this.len = this.dom.children.length; this.maxY = -(this.len - 1); @@ -66,7 +65,7 @@ export class PickerComponent extends PickerRef implement } }); } - this.startY = touchEvent.getEventTarget(event).clientY; + this.startY = getEventTarget(event).clientY; } @HostListener('mousemove', ['$event']) @@ -76,7 +75,7 @@ export class PickerComponent extends PickerRef implement return; } event.preventDefault(); - const ev = touchEvent.getEventTarget(event); + const ev = getEventTarget(event); this.differY = ev.clientY - this.startY; this.Velocity.record(this.differY); this.dom.style.transition = 'transform 0s'; @@ -92,11 +91,11 @@ export class PickerComponent extends PickerRef implement } this.isMouseDown = false; event.preventDefault(); - const ev = touchEvent.getEventTarget(event); + const ev = getEventTarget(event); this.differY = ev.clientY - this.startY; let time = 0.3; const velocityTemp = this.Velocity.getVelocity(this.differY) * 4; - if (velocity) { + if (getVelocity) { this.differY = velocityTemp * 40 + this.differY; time = Math.abs(velocityTemp) * 0.1; } diff --git a/components/picker/picker.module.ts b/components/picker/picker.module.ts index f4240022..dff82566 100644 --- a/components/picker/picker.module.ts +++ b/components/picker/picker.module.ts @@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common'; import { PickerComponent } from './picker.component'; import { PickerDirective } from './picker.directive'; import { PickerOptions } from './picker-options.provider'; -import { PopupService } from '../core/services/popup.service'; +import { PopupService } from 'ng-zorro-antd-mobile/core'; import { PickerService } from './picker.service'; import { OverlayModule } from '@angular/cdk/overlay'; diff --git a/components/picker/picker.service.ts b/components/picker/picker.service.ts index 5b52fcca..3afd9d01 100644 --- a/components/picker/picker.service.ts +++ b/components/picker/picker.service.ts @@ -1,7 +1,7 @@ import { Injectable, Injector, ComponentRef } from '@angular/core'; import { PickerComponent } from './picker.component'; import { PickerCallBack, PickerOptions } from './picker-options.provider'; -import { PopupService } from '../core/services/popup.service'; +import { PopupService } from 'ng-zorro-antd-mobile/core'; @Injectable() export class PickerService extends PopupService { diff --git a/components/pipes/ng-package.json b/components/pipes/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/pipes/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/popover/ng-package.json b/components/popover/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/popover/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/popover/popover-item/popover-item.module.ts b/components/popover/popover-item/popover-item.module.ts index 8741311f..a8b1e2ba 100644 --- a/components/popover/popover-item/popover-item.module.ts +++ b/components/popover/popover-item/popover-item.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { PopoverItemComponent } from './popover-item.component'; -import { IconModule } from '../../icon/icon.module'; +import { IconModule } from 'ng-zorro-antd-mobile/icon'; @NgModule({ imports: [CommonModule, IconModule], diff --git a/components/popover/popover.directive.ts b/components/popover/popover.directive.ts index 561a13d8..e7ffea9f 100644 --- a/components/popover/popover.directive.ts +++ b/components/popover/popover.directive.ts @@ -20,7 +20,7 @@ import { import { PopoverComponent } from './popover.component'; import { PopoverOptions } from './popover-options.provider'; import { PopoverComponentOptions } from './popover-component-options.provider'; -import * as Positioning from '../core/util/position'; +import { getPositionElements } from 'ng-zorro-antd-mobile/core'; @Directive({ selector: '[Popover], [nzm-popover]', @@ -203,7 +203,7 @@ export class PopoverDirective implements OnInit, OnChanges, OnDestroy { private positionPopover(): void { if (this.popover) { const popoverElement = this.popover.location.nativeElement.children[1]; - const popoverPosition = Positioning.getPositionElements( + const popoverPosition = getPositionElements( this._elm.nativeElement, popoverElement, this.positionMap(this.placement) || this._defaultOptions.placement, diff --git a/components/progress/ng-package.json b/components/progress/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/progress/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/pull-to-refresh/ng-package.json b/components/pull-to-refresh/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/pull-to-refresh/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/pull-to-refresh/pull-to-refresh.module.ts b/components/pull-to-refresh/pull-to-refresh.module.ts index 2abfe0f1..b7387578 100644 --- a/components/pull-to-refresh/pull-to-refresh.module.ts +++ b/components/pull-to-refresh/pull-to-refresh.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { PullToRefreshComponent } from './pull-to-refresh.component'; -import { IconModule } from '../icon/icon.module'; +import { IconModule } from 'ng-zorro-antd-mobile/icon'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; @NgModule({ diff --git a/components/radio/ng-package.json b/components/radio/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/radio/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/radio/radio.module.ts b/components/radio/radio.module.ts index a0970cfb..c6a79be6 100644 --- a/components/radio/radio.module.ts +++ b/components/radio/radio.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { RadioComponent } from './radio.component'; -import { ListModule } from '../list/list.module'; +import { ListModule } from 'ng-zorro-antd-mobile/list'; import { RadioItemGroupComponent } from './radio-item-group.component'; import { RadioItemComponent } from './radio-item.component'; import { CommonModule } from '@angular/common'; diff --git a/components/range/ng-package.json b/components/range/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/range/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/range/range.module.ts b/components/range/range.module.ts index 70d63436..52cc4ab7 100644 --- a/components/range/range.module.ts +++ b/components/range/range.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { RangeComponent } from './range.component'; import { CommonModule } from '@angular/common'; -import { SliderModule } from '../slider/slider.module'; +import { SliderModule } from 'ng-zorro-antd-mobile/slider'; @NgModule({ exports: [RangeComponent], diff --git a/components/result/ng-package.json b/components/result/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/result/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/result/result.module.ts b/components/result/result.module.ts index 45c8ed6f..fe934b61 100644 --- a/components/result/result.module.ts +++ b/components/result/result.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { ResultComponent } from './result.component'; import { CommonModule } from '@angular/common'; -import { IconModule } from '../icon/icon.module'; +import { IconModule } from 'ng-zorro-antd-mobile/icon'; @NgModule({ declarations: [ResultComponent], diff --git a/components/search-bar/ng-package.json b/components/search-bar/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/search-bar/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/search-bar/search-bar.component.ts b/components/search-bar/search-bar.component.ts index 4fed8407..1ba04044 100644 --- a/components/search-bar/search-bar.component.ts +++ b/components/search-bar/search-bar.component.ts @@ -13,7 +13,7 @@ import { ViewChild } from '@angular/core'; import { trigger, state, animate, transition, style } from '@angular/animations'; -import { LocaleProviderService } from '../locale-provider/locale-provider.service'; +import { LocaleProviderService } from 'ng-zorro-antd-mobile/locale-provider'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { NG_VALUE_ACCESSOR, ControlValueAccessor } from '@angular/forms'; diff --git a/components/search-bar/search-bar.module.ts b/components/search-bar/search-bar.module.ts index dee69bd2..fdbc17d3 100644 --- a/components/search-bar/search-bar.module.ts +++ b/components/search-bar/search-bar.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { SearchBarComponent } from './search-bar.component'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; -import { LocaleProviderModule } from '../locale-provider/locale-provider.module'; +import { LocaleProviderModule } from 'ng-zorro-antd-mobile/locale-provider'; @NgModule({ exports: [SearchBarComponent], diff --git a/components/segmented-control/ng-package.json b/components/segmented-control/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/segmented-control/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/slider/ng-package.json b/components/slider/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/slider/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/stepper/ng-package.json b/components/stepper/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/stepper/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/stepper/stepper.module.ts b/components/stepper/stepper.module.ts index 4a13cb5d..9d9fb54a 100644 --- a/components/stepper/stepper.module.ts +++ b/components/stepper/stepper.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { CommonModule } from '@angular/common'; -import { IconModule } from '../icon/icon.module'; +import { IconModule } from 'ng-zorro-antd-mobile/icon'; import { StepperComponent } from './stepper.component'; @NgModule({ diff --git a/components/steps/ng-package.json b/components/steps/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/steps/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/steps/steps.module.ts b/components/steps/steps.module.ts index 520a6e4e..df352b19 100644 --- a/components/steps/steps.module.ts +++ b/components/steps/steps.module.ts @@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'; import { StepsComponent } from './steps.component'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; -import { IconModule } from '../icon/icon.module'; +import { IconModule } from 'ng-zorro-antd-mobile/icon'; import { StepComponent } from './step/step.component'; @NgModule({ diff --git a/components/swipe-action/ng-package.json b/components/swipe-action/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/swipe-action/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/switch/ng-package.json b/components/switch/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/switch/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/switch/switch.module.ts b/components/switch/switch.module.ts index c14e7292..19cc414f 100644 --- a/components/switch/switch.module.ts +++ b/components/switch/switch.module.ts @@ -1,7 +1,7 @@ import { NgModule } from '@angular/core'; import { SwitchComponent } from './switch.component'; import { CommonModule } from '@angular/common'; -import { WingBlankModule } from '../wing-blank/wing-blank.module'; +import { WingBlankModule } from 'ng-zorro-antd-mobile/wing-blank'; @NgModule({ exports: [SwitchComponent], diff --git a/components/tab-bar/ng-package.json b/components/tab-bar/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/tab-bar/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/tab-bar/tab-bar-item.component.ts b/components/tab-bar/tab-bar-item.component.ts index 24d4c3aa..9d35ad7b 100644 --- a/components/tab-bar/tab-bar-item.component.ts +++ b/components/tab-bar/tab-bar-item.component.ts @@ -1,5 +1,5 @@ import { Component, Input, ViewChild, TemplateRef } from '@angular/core'; -import { TabPaneComponent } from '../tabs/tab-pane.component'; +import { TabPaneComponent } from 'ng-zorro-antd-mobile/tabs'; @Component({ selector: 'TabBarItem, nzm-tab-bar-item', diff --git a/components/tab-bar/tab-bar.module.ts b/components/tab-bar/tab-bar.module.ts index d919c11c..1970ea16 100644 --- a/components/tab-bar/tab-bar.module.ts +++ b/components/tab-bar/tab-bar.module.ts @@ -1,8 +1,8 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { TabsModule } from '../tabs/tabs.module'; +import { TabsModule } from 'ng-zorro-antd-mobile/tabs'; import { TabBarComponent } from './tab-bar.component'; -import { BadgeModule } from '../badge/badge.module'; +import { BadgeModule } from 'ng-zorro-antd-mobile/badge'; import { TabBarItemComponent } from './tab-bar-item.component'; @NgModule({ diff --git a/components/tabs/ng-package.json b/components/tabs/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/tabs/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/tag/ng-package.json b/components/tag/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/tag/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/tag/tag.module.ts b/components/tag/tag.module.ts index 69f82a8c..18bf1626 100644 --- a/components/tag/tag.module.ts +++ b/components/tag/tag.module.ts @@ -1,6 +1,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { IconModule } from '../icon/icon.module'; +import { IconModule } from 'ng-zorro-antd-mobile/icon'; import { TagComponent } from './tag.component'; @NgModule({ diff --git a/components/textarea-item/ng-package.json b/components/textarea-item/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/textarea-item/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/toast/ng-package.json b/components/toast/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/toast/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/toast/toast.module.ts b/components/toast/toast.module.ts index 8cc81478..868fac3b 100644 --- a/components/toast/toast.module.ts +++ b/components/toast/toast.module.ts @@ -2,8 +2,8 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { ToastService } from './toast.service'; import { ToastComponent } from './toast.component'; -import { IconModule } from '../icon/icon.module'; -import { WingBlankModule } from '../wing-blank/wing-blank.module'; +import { IconModule } from 'ng-zorro-antd-mobile/icon'; +import { WingBlankModule } from 'ng-zorro-antd-mobile/wing-blank'; @NgModule({ imports: [CommonModule, IconModule, WingBlankModule], diff --git a/components/tsconfig.json b/components/tsconfig.json index 6a60b2e0..503103a5 100644 --- a/components/tsconfig.json +++ b/components/tsconfig.json @@ -9,12 +9,8 @@ "experimentalDecorators": true, "useDefineForClassFields": false, "declaration": true, - "outDir": "./dist", - "lib": ["es2015", "dom"] + "outDir": "./dist" }, - "files": [ - "./ng-zorro-antd-mobile.module.ts" - ], "angularCompilerOptions": { "skipTemplateCodegen": true } diff --git a/components/tsconfig.lib.json b/components/tsconfig.lib.json index 590e7c28..f63b7693 100644 --- a/components/tsconfig.lib.json +++ b/components/tsconfig.lib.json @@ -1,19 +1,8 @@ { "extends": "./tsconfig.json", "compilerOptions": { - "baseUrl": "./", - "target": "es2022", - "module": "es2015", - "sourceMap": true, "inlineSources": true, - "moduleResolution": "node", - "importHelpers": true, - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "useDefineForClassFields": false, - "declaration": true, - "outDir": "../release", - "lib": ["es2015", "dom"] + "outDir": "../release" }, "angularCompilerOptions": { "skipTemplateCodegen": true, diff --git a/components/tsconfig.lib.prod.json b/components/tsconfig.lib.prod.json index 47f73968..2a2faa88 100644 --- a/components/tsconfig.lib.prod.json +++ b/components/tsconfig.lib.prod.json @@ -1,6 +1,9 @@ { "extends": "./tsconfig.lib.json", + "compilerOptions": { + "declarationMap": false + }, "angularCompilerOptions": { "compilationMode": "partial" } -} \ No newline at end of file +} diff --git a/components/tsconfig.spec.json b/components/tsconfig.spec.json index c3fdc874..0ef7609d 100644 --- a/components/tsconfig.spec.json +++ b/components/tsconfig.spec.json @@ -2,8 +2,6 @@ "extends": "./tsconfig.json", "compilerOptions": { "outDir": "../out-tsc/spec", - "baseUrl": "./", - "target": "es2022", "types": [ "jasmine", "node" diff --git a/components/white-space/ng-package.json b/components/white-space/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/white-space/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/components/wing-blank/ng-package.json b/components/wing-blank/ng-package.json new file mode 100644 index 00000000..789c95e4 --- /dev/null +++ b/components/wing-blank/ng-package.json @@ -0,0 +1,5 @@ +{ + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/scripts/site/_site/src/tsconfig.app.json b/scripts/site/_site/src/tsconfig.app.json index a2a46223..6da1a207 100644 --- a/scripts/site/_site/src/tsconfig.app.json +++ b/scripts/site/_site/src/tsconfig.app.json @@ -2,15 +2,9 @@ "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "../out-tsc/app", - "baseUrl": "./", - "module": "esnext", "types": [ "node" ], - "paths": { - "ng-zorro-antd-mobile": [ "../../components/ng-zorro-antd-mobile.module.ts" ], - "ngx-color/sketch": [ "../../node_modules/ngx-color/sketch" ] - } }, "exclude": [ "test.ts", diff --git a/scripts/site/_site/src/tsconfig.spec.json b/scripts/site/_site/src/tsconfig.spec.json index 63d89ff2..14bee2a1 100644 --- a/scripts/site/_site/src/tsconfig.spec.json +++ b/scripts/site/_site/src/tsconfig.spec.json @@ -1,8 +1,7 @@ { - "extends": "../tsconfig.json", + "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "../out-tsc/spec", - "baseUrl": "./", "module": "commonjs", "target": "es5", "types": [ diff --git a/tsconfig.json b/tsconfig.json index cb305f24..2a247da9 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,6 +2,7 @@ "compileOnSave": false, "compilerOptions": { "module": "esnext", + "baseUrl": "./", "outDir": "./dist/out-tsc", "sourceMap": true, "declaration": false, @@ -9,13 +10,22 @@ "emitDecoratorMetadata": true, "experimentalDecorators": true, "useDefineForClassFields": false, + "strict": false, + "noImplicitReturns": false, + "noFallthroughCasesInSwitch": true, + "forceConsistentCasingInFileNames": true, "target": "es2022", - "typeRoots": [ - "node_modules/@types" - ], - "lib": [ - "es2017", - "dom" - ] - } -} \ No newline at end of file + "typeRoots": ["node_modules/@types"], + "lib": ["es2020", "dom"], + "paths": { + "ng-zorro-antd-mobile": ["components/index.ts"], + "ng-zorro-antd-mobile/*": ["components/*"] + } + }, + "angularCompilerOptions": { + "enableI18nLegacyMessageIdFormat": false, + "strictInjectionParameters": true, + "strictInputAccessModifiers": true + }, + "include": ["./components/**/*.ts", "./site/**/*.ts"] +}