From 595106c8edfb4e1367ca26b1343fdaa7804a792f Mon Sep 17 00:00:00 2001 From: koppthe Date: Fri, 18 Jan 2019 15:38:27 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E7=BB=84=E4=BB=B6=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E6=94=B9=E7=94=A8=20alias=20=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/index.js | 3 +++ src/pages/action/action-sheet/index.js | 7 +------ src/pages/action/activity-indicator/index.js | 4 +--- src/pages/action/message/index.js | 5 +---- src/pages/action/modal/index.js | 10 +--------- src/pages/action/progress/index.js | 6 +----- src/pages/action/swipe-action/index.js | 10 +--------- src/pages/action/toast/index.js | 5 +---- src/pages/basic/button/index.js | 5 +---- src/pages/basic/icon/index.js | 6 ++---- src/pages/form/checkbox/index.js | 2 +- src/pages/form/image-picker/index.js | 2 +- src/pages/form/input-number/index.js | 2 +- src/pages/form/input/index.js | 5 ++--- src/pages/form/radio/index.js | 2 +- src/pages/form/range/index.js | 2 +- src/pages/form/rate/index.js | 2 +- src/pages/form/search-bar/index.js | 2 +- src/pages/form/slider/index.js | 2 +- src/pages/form/switch/index.js | 3 +-- src/pages/form/textarea/index.js | 3 +-- src/pages/layout/accordion/index.js | 6 +----- src/pages/layout/card/index.js | 4 +--- src/pages/layout/flex/index.js | 2 -- src/pages/layout/float-layout/index.js | 5 +---- src/pages/layout/grid/index.js | 4 +--- src/pages/layout/list/index.js | 5 +---- src/pages/navigation/drawer/index.js | 7 +------ src/pages/navigation/indexes/index.js | 2 +- src/pages/navigation/navbar/index.js | 2 +- src/pages/navigation/pagination/index.js | 4 +--- src/pages/navigation/segmented-control/index.js | 2 +- src/pages/navigation/tabbar/index.js | 2 +- src/pages/navigation/tabs/index.js | 4 +--- src/pages/view/avatar/index.js | 3 +-- src/pages/view/badge/index.js | 7 ++----- src/pages/view/countdown/index.js | 16 +++++++--------- src/pages/view/curtain/index.js | 5 +---- src/pages/view/divider/index.js | 5 +---- src/pages/view/load-more/index.js | 4 +--- src/pages/view/noticebar/index.js | 4 +--- src/pages/view/steps/index.js | 3 +-- src/pages/view/swiper/index.js | 3 +-- src/pages/view/tag/index.js | 4 +--- src/pages/view/timeline/index.js | 3 +-- 45 files changed, 55 insertions(+), 139 deletions(-) diff --git a/config/index.js b/config/index.js index 9ba92e0df..ca6a1d036 100644 --- a/config/index.js +++ b/config/index.js @@ -22,6 +22,9 @@ const config = { }, defineConstants: { }, + alias: { + 'taro-ui': path.resolve(__dirname, '../src/index.js'), + }, weapp: {}, h5: { staticDirectory: 'static', diff --git a/src/pages/action/action-sheet/index.js b/src/pages/action/action-sheet/index.js index af1bf89c1..81ef54171 100644 --- a/src/pages/action/action-sheet/index.js +++ b/src/pages/action/action-sheet/index.js @@ -1,13 +1,8 @@ -/* eslint taro/custom-component-children: 0 */ - import Taro from '@tarojs/taro' import { View, Text } from '@tarojs/components' - -import AtActionSheet from '../../../components/action-sheet' -import AtActionSheetItem from '../../../components/action-sheet/body/item/index' +import { AtActionSheet, AtActionSheetItem } from 'taro-ui' import AtButton from '../../../components/button/index' import DocsHeader from '../../components/doc-header' - import './index.scss' export default class ActionSheetPage extends Taro.Component { diff --git a/src/pages/action/activity-indicator/index.js b/src/pages/action/activity-indicator/index.js index ba0feceda..ab7631bb2 100644 --- a/src/pages/action/activity-indicator/index.js +++ b/src/pages/action/activity-indicator/index.js @@ -1,9 +1,7 @@ import Taro from '@tarojs/taro' import { View } from '@tarojs/components' - -import AtActivityIndicator from '../../../components/activity-indicator/index' +import { AtActivityIndicator } from 'taro-ui' import DocsHeader from '../../components/doc-header' - import './index.scss' export default class ActivityIndicatorPage extends Taro.Component { diff --git a/src/pages/action/message/index.js b/src/pages/action/message/index.js index 0b79b226d..f05c2cfcf 100644 --- a/src/pages/action/message/index.js +++ b/src/pages/action/message/index.js @@ -1,10 +1,7 @@ import Taro, { Component } from '@tarojs/taro' import { View } from '@tarojs/components' - +import { AtMessage, AtButton } from 'taro-ui' import DocsHeader from '../../components/doc-header' -import AtMessage from '../../../components/message/index' -import AtButton from '../../../components/button/index' - import './index.scss' export default class ToastPage extends Component { diff --git a/src/pages/action/modal/index.js b/src/pages/action/modal/index.js index 6faac5e08..584f24d79 100644 --- a/src/pages/action/modal/index.js +++ b/src/pages/action/modal/index.js @@ -1,15 +1,7 @@ -/* eslint taro/custom-component-children: 0 */ import Taro from '@tarojs/taro' import { View, Button } from '@tarojs/components' - -import AtButton from '../../../components/button/index' -import AtModal from '../../../components/modal/index' -import AtModalHeader from '../../../components/modal/header/index' -import AtModalContent from '../../../components/modal/content/index' -import AtModalAction from '../../../components/modal/action/index' - +import { AtButton, AtModal, AtModalHeader, AtModalContent, AtModalAction } from 'taro-ui' import DocsHeader from '../../components/doc-header' - import './index.scss' export default class ModalPage extends Taro.Component { diff --git a/src/pages/action/progress/index.js b/src/pages/action/progress/index.js index 262917d50..ddb210974 100644 --- a/src/pages/action/progress/index.js +++ b/src/pages/action/progress/index.js @@ -1,11 +1,7 @@ import Taro from '@tarojs/taro' import { View } from '@tarojs/components' - -import AtButton from '../../../components/button/index' -import AtIcon from '../../../components/icon/index' -import AtProgress from '../../../components/progress/index' +import { AtButton, AtIcon, AtProgress } from 'taro-ui' import DocsHeader from '../../components/doc-header' - import './index.scss' const OFFSET = 15 diff --git a/src/pages/action/swipe-action/index.js b/src/pages/action/swipe-action/index.js index 9511b412c..f69bea8c3 100644 --- a/src/pages/action/swipe-action/index.js +++ b/src/pages/action/swipe-action/index.js @@ -1,15 +1,7 @@ -/* eslint taro/custom-component-children: 0 */ - import Taro from '@tarojs/taro' import { View } from '@tarojs/components' - -import AtList from '../../../components/list/index' -import AtButton from '../../../components/button/index' -import AtListItem from '../../../components/list/item/index' -import AtSwipeAction from '../../../components/swipe-action/index' - +import { AtList, AtListItem, AtButton, AtSwipeAction } from 'taro-ui' import DocsHeader from '../../components/doc-header' - import './index.scss' const OPTIONS = [ diff --git a/src/pages/action/toast/index.js b/src/pages/action/toast/index.js index 3a944c16c..f7726cf99 100644 --- a/src/pages/action/toast/index.js +++ b/src/pages/action/toast/index.js @@ -1,10 +1,7 @@ import Taro, { Component } from '@tarojs/taro' import { View } from '@tarojs/components' - +import { AtToast, AtButton } from 'taro-ui' import DocsHeader from '../../components/doc-header' -import AtToast from '../../../components/toast/index' -import AtButton from '../../../components/button/index' - import './index.scss' const INIT_STATE = { diff --git a/src/pages/basic/button/index.js b/src/pages/basic/button/index.js index 1c3b62c20..bbd2feac9 100644 --- a/src/pages/basic/button/index.js +++ b/src/pages/basic/button/index.js @@ -1,10 +1,7 @@ import Taro from '@tarojs/taro' import { View, Form } from '@tarojs/components' - -import AtButton from '../../../components/button/index' -import AtForm from '../../../components/form/index' +import { AtButton, AtForm } from 'taro-ui' import DocsHeader from '../../components/doc-header' - import './index.scss' export default class ButtonPage extends Taro.Component { diff --git a/src/pages/basic/icon/index.js b/src/pages/basic/icon/index.js index c89c70e1b..5abab3f2a 100644 --- a/src/pages/basic/icon/index.js +++ b/src/pages/basic/icon/index.js @@ -1,10 +1,8 @@ import Taro from '@tarojs/taro' import { View } from '@tarojs/components' - -import AtIcon from '../../../components/icon/index' -import ICONS from './icons' +import { AtIcon } from 'taro-ui' import DocsHeader from '../../components/doc-header' - +import ICONS from './icons' import './index.scss' export default class IconPage extends Taro.Component { diff --git a/src/pages/form/checkbox/index.js b/src/pages/form/checkbox/index.js index 7ee9012b8..fb13f32bc 100644 --- a/src/pages/form/checkbox/index.js +++ b/src/pages/form/checkbox/index.js @@ -1,6 +1,6 @@ import Taro from '@tarojs/taro' import { View } from '@tarojs/components' -import AtCheckbox from '../../../components/checkbox/index' +import { AtCheckbox } from 'taro-ui' import DocsHeader from '../../components/doc-header' import './index.scss' diff --git a/src/pages/form/image-picker/index.js b/src/pages/form/image-picker/index.js index 4e3569a9d..9125418e9 100644 --- a/src/pages/form/image-picker/index.js +++ b/src/pages/form/image-picker/index.js @@ -1,6 +1,6 @@ import Taro from '@tarojs/taro' import { View } from '@tarojs/components' -import AtImagePicker from '../../../components/image-picker/index' +import { AtImagePicker } from 'taro-ui' import DocsHeader from '../../components/doc-header' import './index.scss' diff --git a/src/pages/form/input-number/index.js b/src/pages/form/input-number/index.js index a1c0565c3..f8e930665 100644 --- a/src/pages/form/input-number/index.js +++ b/src/pages/form/input-number/index.js @@ -1,6 +1,6 @@ import Taro from '@tarojs/taro' import { View } from '@tarojs/components' -import AtInputNumber from '../../../components/input-number/index' +import { AtInputNumber } from 'taro-ui' import DocsHeader from '../../components/doc-header' import './index.scss' diff --git a/src/pages/form/input/index.js b/src/pages/form/input/index.js index f98be3d61..131891340 100644 --- a/src/pages/form/input/index.js +++ b/src/pages/form/input/index.js @@ -1,9 +1,8 @@ import Taro from '@tarojs/taro' import { View, Image } from '@tarojs/components' -import AtInput from '../../../components/input/index' -import AtForm from '../../../components/form/index' -import verificationCode from '../../../assets/images/verification_code.png' +import { AtInput, AtForm } from 'taro-ui' import DocsHeader from '../../components/doc-header' +import verificationCode from '../../../assets/images/verification_code.png' import './index.scss' export default class Index extends Taro.Component { diff --git a/src/pages/form/radio/index.js b/src/pages/form/radio/index.js index d021da5f8..e22063fb6 100644 --- a/src/pages/form/radio/index.js +++ b/src/pages/form/radio/index.js @@ -1,6 +1,6 @@ import Taro from '@tarojs/taro' import { View } from '@tarojs/components' -import AtRadio from '../../../components/radio/index' +import { AtRadio } from 'taro-ui' import DocsHeader from '../../components/doc-header' import './index.scss' diff --git a/src/pages/form/range/index.js b/src/pages/form/range/index.js index 0b2d6b9be..55120d283 100644 --- a/src/pages/form/range/index.js +++ b/src/pages/form/range/index.js @@ -1,6 +1,6 @@ import Taro from '@tarojs/taro' import { View } from '@tarojs/components' -import AtRange from '../../../components/range/index' +import { AtRange } from 'taro-ui' import DocsHeader from '../../components/doc-header' import './index.scss' diff --git a/src/pages/form/rate/index.js b/src/pages/form/rate/index.js index c7ce845ef..5c5ee0947 100644 --- a/src/pages/form/rate/index.js +++ b/src/pages/form/rate/index.js @@ -1,6 +1,6 @@ import Taro from '@tarojs/taro' import { View } from '@tarojs/components' -import AtRate from '../../../components/rate/index' +import { AtRate } from 'taro-ui' import DocsHeader from '../../components/doc-header' import './index.scss' diff --git a/src/pages/form/search-bar/index.js b/src/pages/form/search-bar/index.js index 7ae5a02e3..321ed87b5 100644 --- a/src/pages/form/search-bar/index.js +++ b/src/pages/form/search-bar/index.js @@ -1,6 +1,6 @@ import Taro from '@tarojs/taro' import { View } from '@tarojs/components' -import AtSearchBar from '../../../components/search-bar/index' +import { AtSearchBar } from 'taro-ui' import DocsHeader from '../../components/doc-header' import './index.scss' diff --git a/src/pages/form/slider/index.js b/src/pages/form/slider/index.js index 49e6b43f2..dee481f3b 100644 --- a/src/pages/form/slider/index.js +++ b/src/pages/form/slider/index.js @@ -1,7 +1,7 @@ import Taro from '@tarojs/taro' import { View } from '@tarojs/components' +import { AtSlider } from 'taro-ui' import DocsHeader from '../../components/doc-header' -import AtSlider from '../../../components/slider/index' import './index.scss' export default class PageSlider extends Taro.Component { diff --git a/src/pages/form/switch/index.js b/src/pages/form/switch/index.js index db47261ee..18824812d 100644 --- a/src/pages/form/switch/index.js +++ b/src/pages/form/switch/index.js @@ -1,7 +1,6 @@ import Taro from '@tarojs/taro' import { View } from '@tarojs/components' -import AtSwitch from '../../../components/switch/index' -import AtForm from '../../../components/form/index' +import { AtSwitch, AtForm } from 'taro-ui' import DocsHeader from '../../components/doc-header' import './index.scss' diff --git a/src/pages/form/textarea/index.js b/src/pages/form/textarea/index.js index a4029bea1..d053a7e6f 100644 --- a/src/pages/form/textarea/index.js +++ b/src/pages/form/textarea/index.js @@ -1,7 +1,6 @@ -/* eslint-disable react/no-direct-mutation-state */ import Taro from '@tarojs/taro' import { View } from '@tarojs/components' -import AtTextarea from '../../../components/textarea/index' +import { AtTextarea } from 'taro-ui' import DocsHeader from '../../components/doc-header' import './index.scss' diff --git a/src/pages/layout/accordion/index.js b/src/pages/layout/accordion/index.js index 1cc78f381..ac338970f 100644 --- a/src/pages/layout/accordion/index.js +++ b/src/pages/layout/accordion/index.js @@ -1,11 +1,7 @@ import Taro from '@tarojs/taro' import { View } from '@tarojs/components' - -import AtAccordion from '../../../components/accordion/index' -import AtList from '../../../components/list/index' -import AtListItem from '../../../components/list/item/index' +import { AtAccordion, AtList, AtListItem } from 'taro-ui' import DocsHeader from '../../components/doc-header' - import './index.scss' export default class CardPage extends Taro.Component { diff --git a/src/pages/layout/card/index.js b/src/pages/layout/card/index.js index 4689d2819..39ab21c52 100644 --- a/src/pages/layout/card/index.js +++ b/src/pages/layout/card/index.js @@ -1,9 +1,7 @@ import Taro from '@tarojs/taro' import { View } from '@tarojs/components' - -import AtCard from '../../../components/card/index' +import { AtCard } from 'taro-ui' import DocsHeader from '../../components/doc-header' - import './index.scss' export default class CardPage extends Taro.Component { diff --git a/src/pages/layout/flex/index.js b/src/pages/layout/flex/index.js index 1ecf047e6..90db24603 100644 --- a/src/pages/layout/flex/index.js +++ b/src/pages/layout/flex/index.js @@ -1,8 +1,6 @@ import Taro from '@tarojs/taro' import { View } from '@tarojs/components' - import DocsHeader from '../../components/doc-header' - import '../../../style/components/flex.scss' import './index.scss' diff --git a/src/pages/layout/float-layout/index.js b/src/pages/layout/float-layout/index.js index 0edd115ae..1a6084880 100644 --- a/src/pages/layout/float-layout/index.js +++ b/src/pages/layout/float-layout/index.js @@ -1,10 +1,7 @@ import Taro from '@tarojs/taro' import { View } from '@tarojs/components' - -import AtFloatLayout from '../../../components/float-layout/index' -import AtButton from '../../../components/button/index' +import { AtFloatLayout, AtButton } from 'taro-ui' import DocsHeader from '../../components/doc-header' - import './index.scss' export default class FloatLayoutPage extends Taro.Component { diff --git a/src/pages/layout/grid/index.js b/src/pages/layout/grid/index.js index 31a5b664b..d225ebaec 100644 --- a/src/pages/layout/grid/index.js +++ b/src/pages/layout/grid/index.js @@ -1,9 +1,7 @@ import Taro from '@tarojs/taro' import { View } from '@tarojs/components' - -import AtGrid from '../../../components/grid/index' +import { AtGrid } from 'taro-ui' import DocsHeader from '../../components/doc-header' - import './index.scss' export default class GridPage extends Taro.Component { diff --git a/src/pages/layout/list/index.js b/src/pages/layout/list/index.js index c39877d05..2ed6626b5 100644 --- a/src/pages/layout/list/index.js +++ b/src/pages/layout/list/index.js @@ -1,10 +1,7 @@ import Taro, { Component } from '@tarojs/taro' import { View } from '@tarojs/components' - -import AtList from '../../../components/list/index' -import AtListItem from '../../../components/list/item/index' +import { AtList, AtListItem } from 'taro-ui' import DocsHeader from '../../components/doc-header' - import './index.scss' export default class ListPage extends Component { diff --git a/src/pages/navigation/drawer/index.js b/src/pages/navigation/drawer/index.js index 32cd349f8..76f47831a 100644 --- a/src/pages/navigation/drawer/index.js +++ b/src/pages/navigation/drawer/index.js @@ -1,13 +1,8 @@ import Taro from '@tarojs/taro' import classNames from 'classnames' import { View } from '@tarojs/components' -import AtDrawer from '../../../components/drawer/index' -import AtButton from '../../../components/button/index' -import AtIcon from '../../../components/icon/index' -import AtBadge from '../../../components/badge/index' +import { AtDrawer, AtButton, AtIcon, AtBadge } from 'taro-ui' import DocsHeader from '../../components/doc-header' - - import './index.scss' export default class DrawerPage extends Taro.Component { diff --git a/src/pages/navigation/indexes/index.js b/src/pages/navigation/indexes/index.js index 14579b01e..468b08b13 100644 --- a/src/pages/navigation/indexes/index.js +++ b/src/pages/navigation/indexes/index.js @@ -1,6 +1,6 @@ import Taro from '@tarojs/taro' import { View } from '@tarojs/components' -import AtIndexes from '../../../components/indexes/index' +import { AtIndexes } from 'taro-ui' import mockData from './mock-data' import './index.scss' diff --git a/src/pages/navigation/navbar/index.js b/src/pages/navigation/navbar/index.js index 59e8000e7..969f648f2 100644 --- a/src/pages/navigation/navbar/index.js +++ b/src/pages/navigation/navbar/index.js @@ -1,6 +1,6 @@ import Taro from '@tarojs/taro' import { View } from '@tarojs/components' -import AtNavBar from '../../../components/nav-bar/index' +import { AtNavBar } from 'taro-ui' import DocsHeader from '../../components/doc-header' import './index.scss' diff --git a/src/pages/navigation/pagination/index.js b/src/pages/navigation/pagination/index.js index a8ea1ac2f..7a0c5b412 100644 --- a/src/pages/navigation/pagination/index.js +++ b/src/pages/navigation/pagination/index.js @@ -1,9 +1,7 @@ import Taro from '@tarojs/taro' import { View } from '@tarojs/components' -import AtPagination from '../../../components/pagination/index' -import AtButton from '../../../components/button/index' +import { AtPagination, AtButton } from 'taro-ui' import DocsHeader from '../../components/doc-header' - import './index.scss' export default class PaginationPage extends Taro.Component { diff --git a/src/pages/navigation/segmented-control/index.js b/src/pages/navigation/segmented-control/index.js index 62be45431..3542ef129 100644 --- a/src/pages/navigation/segmented-control/index.js +++ b/src/pages/navigation/segmented-control/index.js @@ -1,6 +1,6 @@ import Taro from '@tarojs/taro' import { View } from '@tarojs/components' -import AtSegmentedControl from '../../../components/segmented-control/index' +import { AtSegmentedControl } from 'taro-ui' import DocsHeader from '../../components/doc-header' import './index.scss' diff --git a/src/pages/navigation/tabbar/index.js b/src/pages/navigation/tabbar/index.js index 8330be5ee..5b91803d7 100644 --- a/src/pages/navigation/tabbar/index.js +++ b/src/pages/navigation/tabbar/index.js @@ -1,6 +1,6 @@ import Taro from '@tarojs/taro' import { View } from '@tarojs/components' -import AtTabBar from '../../../components/tab-bar/index' +import { AtTabBar } from 'taro-ui' import DocsHeader from '../../components/doc-header' import './index.scss' diff --git a/src/pages/navigation/tabs/index.js b/src/pages/navigation/tabs/index.js index b068e5ff8..35c8ce000 100644 --- a/src/pages/navigation/tabs/index.js +++ b/src/pages/navigation/tabs/index.js @@ -1,8 +1,6 @@ -/* eslint-disable react/no-direct-mutation-state */ import Taro from '@tarojs/taro' import { View } from '@tarojs/components' -import AtTabs from '../../../components/tabs/index' -import AtTabsPane from '../../../components/tabs-pane/index' +import { AtTabs, AtTabsPane } from 'taro-ui' import DocsHeader from '../../components/doc-header' import './index.scss' diff --git a/src/pages/view/avatar/index.js b/src/pages/view/avatar/index.js index 3ec441b05..146210c6f 100644 --- a/src/pages/view/avatar/index.js +++ b/src/pages/view/avatar/index.js @@ -1,8 +1,7 @@ import Taro from '@tarojs/taro' import { View } from '@tarojs/components' -import AtAvatar from '../../../components/avatar/index' +import { AtAvatar } from 'taro-ui' import DocsHeader from '../../components/doc-header' - import './index.scss' export default class AvatarPage extends Taro.Component { diff --git a/src/pages/view/badge/index.js b/src/pages/view/badge/index.js index 697f5e82d..e3b38d654 100644 --- a/src/pages/view/badge/index.js +++ b/src/pages/view/badge/index.js @@ -1,10 +1,7 @@ import Taro from '@tarojs/taro' import { View } from '@tarojs/components' - -import AtBadge from '../../../components/badge/index' -import AtButton from '../../../components/button/index' +import { AtBadge, AtButton } from 'taro-ui' import DocsHeader from '../../components/doc-header' - import './index.scss' export default class BadgePage extends Taro.Component { @@ -18,7 +15,7 @@ export default class BadgePage extends Taro.Component { } } - /** eslint-disable */ + render () { const dot = '···' diff --git a/src/pages/view/countdown/index.js b/src/pages/view/countdown/index.js index 79f316cca..a1e743cb4 100644 --- a/src/pages/view/countdown/index.js +++ b/src/pages/view/countdown/index.js @@ -1,9 +1,7 @@ import Taro from '@tarojs/taro' import { View } from '@tarojs/components' - -import AtCountDown from '../../../components/countdown/index' +import { AtCountdown } from 'taro-ui' import DocsHeader from '../../components/doc-header' - import './index.scss' export default class CountDownPage extends Taro.Component { @@ -31,10 +29,10 @@ export default class CountDownPage extends Taro.Component { 一般用法 - + - + @@ -42,7 +40,7 @@ export default class CountDownPage extends Taro.Component { 自定义格式化 - 卡片式 - - 自定义倒计时回调事件 -