Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/jdf2e/nutui-react
Browse files Browse the repository at this point in the history
  • Loading branch information
oasis-cloud committed Sep 7, 2022
2 parents da545cd + 75ff4a8 commit d45c01a
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/sync-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: sync to docs
on:
push:
branches:
- main # default branch
- main
paths:
- '.github/workflows/**'
- 'src/**'
Expand All @@ -18,9 +18,9 @@ jobs:
- name : Sync
uses : JamesIves/[email protected]
with :
branch : main # action 应该部署到的分支 。
branch : master # action 应该部署到的分支 。
folder : site_docs #操作应该部署的文件夹 。
clean: false
repository-name: jdf2e/nutui-docs
token: ${{ secrets.GIT_ACTION }}
target-folder: src/docs_react
target-folder: src/docs_react
2 changes: 1 addition & 1 deletion src/packages/datepicker/datepicker.taro.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { FunctionComponent, useState, useEffect, useRef } from 'react'
import Picker from '@/packages/picker'
import Picker from '@/packages/picker/index.taro'

export interface PickerOption {
text: string | number
Expand Down
2 changes: 1 addition & 1 deletion src/packages/picker/picker.taro.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import React, {
RefObject,
ForwardRefRenderFunction,
} from 'react'
import Popup from '@/packages/popup'
import Popup from '@/packages/popup/index.taro'
import PickerSlot from './pickerSlot.taro'
import useRefs from '@/utils/useRefs'
import { useConfig } from '@/packages/configprovider/configprovider.taro'
Expand Down
2 changes: 1 addition & 1 deletion src/packages/picker/pickerSlot.taro.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import React, {
ForwardRefRenderFunction,
useImperativeHandle,
} from 'react'
import { PickerOption } from './picker'
import { PickerOption } from './picker.taro'
import { useTouch } from '../../utils/useTouch'
import { getRectByTaro } from '@/utils/useClientRect'

Expand Down

0 comments on commit d45c01a

Please sign in to comment.