From 0a2a06c88feb29ca6393ad1f586593e061da070c Mon Sep 17 00:00:00 2001 From: oasis-cloud Date: Wed, 7 Sep 2022 13:51:58 +0800 Subject: [PATCH 1/3] Update sync-docs.yml --- .github/workflows/sync-docs.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sync-docs.yml b/.github/workflows/sync-docs.yml index bded520d91..9720c56f8f 100644 --- a/.github/workflows/sync-docs.yml +++ b/.github/workflows/sync-docs.yml @@ -18,9 +18,9 @@ jobs: - name : Sync uses : JamesIves/github-pages-deploy-action@4.1.7 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 \ No newline at end of file + target-folder: src/docs_react From 11c7dc7e14c7bcb2a3b58fbbef698bcb4333f3a6 Mon Sep 17 00:00:00 2001 From: yangxiaolu1993 <32215990+yangxiaolu1993@users.noreply.github.com> Date: Wed, 7 Sep 2022 13:52:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20Picker=E4=B8=8EDatePicker=E5=BC=95?= =?UTF-8?q?=E5=85=A5Taro=E6=96=87=E4=BB=B6=E8=B7=AF=E5=BE=84=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20(#275)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/datepicker/datepicker.taro.tsx | 2 +- src/packages/picker/picker.taro.tsx | 2 +- src/packages/picker/pickerSlot.taro.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/packages/datepicker/datepicker.taro.tsx b/src/packages/datepicker/datepicker.taro.tsx index 2bd43acbdc..254d1326fd 100644 --- a/src/packages/datepicker/datepicker.taro.tsx +++ b/src/packages/datepicker/datepicker.taro.tsx @@ -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 diff --git a/src/packages/picker/picker.taro.tsx b/src/packages/picker/picker.taro.tsx index be6c1fa967..3300b800c6 100644 --- a/src/packages/picker/picker.taro.tsx +++ b/src/packages/picker/picker.taro.tsx @@ -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' diff --git a/src/packages/picker/pickerSlot.taro.tsx b/src/packages/picker/pickerSlot.taro.tsx index 116645eec9..6d289d2ae9 100644 --- a/src/packages/picker/pickerSlot.taro.tsx +++ b/src/packages/picker/pickerSlot.taro.tsx @@ -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' From 75ff4a85641e2174cdb2b05ff0f25354325fc9a4 Mon Sep 17 00:00:00 2001 From: oasis-cloud Date: Wed, 7 Sep 2022 13:59:09 +0800 Subject: [PATCH 3/3] Update sync-docs.yml --- .github/workflows/sync-docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sync-docs.yml b/.github/workflows/sync-docs.yml index 9720c56f8f..682b9d86fe 100644 --- a/.github/workflows/sync-docs.yml +++ b/.github/workflows/sync-docs.yml @@ -3,7 +3,7 @@ name: sync to docs on: push: branches: - - main # default branch + - main paths: - '.github/workflows/**' - 'src/**'