Skip to content

Commit 1029d1a

Browse files
XiaoDaiGua-RayXiaoDaiGua-Ray
authored
Merge branch 'InhiblabCore:master' into master
2 parents 71cea5a + 373af4b commit 1029d1a

File tree

10 files changed

+168
-34
lines changed

10 files changed

+168
-34
lines changed

‎.github/auto-comment.yml‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
1-
# Comment to a new issue.
2-
issueOpened: >
3-
Thank your for raising a issue. We will try and get back to you as soon as possible.
4-
5-
Please make sure you have given us as much context as possible.
6-
7-
8-
pullRequestOpened: >
9-
Thank your for raising your pull request.
10-
11-
Please make sure you have followed our contributing guidelines. We will review it as soon as possible
12-
1+
# Number of days of inactivity before an Issue or Pull Request becomes stale
2+
daysUntilStale: 90
3+
# Number of days of inactivity before a stale Issue or Pull Request is closed
4+
daysUntilClose: 30
5+
# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
6+
exemptLabels:
7+
- pinned
8+
- security
9+
# Label to use when marking as stale
10+
staleLabel: stale
11+
# Comment to post when marking as stale. Set to `false` to disable
12+
markComment: >
13+
This issue has been automatically marked as stale because it has not had
14+
recent activity. It will be closed if no further activity occurs. Thank you
15+
for your contributions.
16+
# Comment to post when removing the stale label. Set to `false` to disable
17+
unmarkComment: false
18+
# Comment to post when closing a stale Issue or Pull Request. Set to `false` to disable
19+
closeComment: true
20+
# Limit to only `issues` or `pulls`
21+
only: issues

‎.github/auto_assign.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Set to true to add reviewers to pull requests
2+
addReviewers: true
3+
4+
# Set to true to add assignees to pull requests
5+
addAssignees: author
6+
7+
# A list of reviewers to be added to pull requests (GitHub user name)
8+
reviewers:
9+
- Jonghakseo
10+
11+
# A number of reviewers added to the pull request
12+
# Set 0 to add all the reviewers (default: 0)
13+
numberOfReviewers: 0
14+
15+
# A list of assignees, overrides reviewers if set
16+
# assignees:
17+
# - assigneeA
18+
19+
# A number of assignees to add to the pull request
20+
# Set to 0 to add all of the assignees.
21+
# Uses numberOfReviewers if unset.
22+
# numberOfAssignees: 2
23+
24+
# A list of keywords to be skipped the process that add reviewers if pull requests include it
25+
# skipKeywords:
26+
# - wip
27+
28+
filterLabels:
29+
exclude:
30+
- dependencies

‎.github/workflows/auto-assign.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: 'Auto Assign'
2+
on:
3+
pull_request:
4+
types: [opened, ready_for_review]
5+
6+
jobs:
7+
add-reviews:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: kentaro-m/auto-assign-action@v1.2.5
11+
with:
12+
configuration-path: '.github/auto_assign.yml'

‎.github/workflows/greetings.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Greetings
2+
3+
on: [pull_request_target, issues]
4+
5+
jobs:
6+
greeting:
7+
runs-on: ubuntu-latest
8+
permissions:
9+
issues: write
10+
pull-requests: write
11+
steps:
12+
- uses: actions/first-interaction@v1
13+
with:
14+
repo-token: ${{ secrets.GITHUB_TOKEN }}
15+
issue-message: 'Thank you for your contribution. We will check and reply to you as soon as possible.'
16+
pr-message: 'Thank you for your contribution. We will check and reply to you as soon as possible.'

‎packages/hooks/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-hooks-plus",
3-
"version": "2.2.2",
3+
"version": "2.2.3",
44
"description": "Vue hooks library",
55
"files": [
66
"dist",

‎packages/hooks/src/useInfiniteScroll/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ const useInfiniteScroll = <TData extends UseInfiniteData>(
114114
run();
115115
});
116116

117-
const _loading = computed(() => loadingMore.value && loading.value);
117+
const _loading = computed(() => !loadingMore.value && loading.value);
118118

119119
return {
120120
data: shallowReadonly(finalData),

‎packages/use-request/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@vue-hooks-plus/use-request",
3-
"version": "2.2.0",
3+
"version": "2.2.1",
44
"description": "Vue use-request hooks library",
55
"files": [
66
"dist",

‎packages/use-request/src/plugins/useThrottlePlugin.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ const useThrottlePlugin: UseRequestPlugin<unknown, unknown[]> = (
5252
}
5353

5454
return {
55-
name: 'throttlePlugin',
55+
name: "throttlePlugin",
5656
onCancel: () => {
5757
throttledRef.value?.cancel()
5858
},

‎packages/use-request/src/types.ts‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,12 @@ export interface UseRequestPlugin<TData, TParams extends unknown[] = unknown[],
283283
) => Partial<UseRequestFetchState<TData, TParams>>
284284
}
285285

286-
export interface useRequestResult<TData, TParams extends unknown[]> {
286+
export interface useRequestResult<
287+
TData,
288+
TParams extends unknown[],
289+
FormatResult = any,
290+
Initial = any
291+
> {
287292
/**
288293
* Is the service being executed.
289294
*/
@@ -292,7 +297,17 @@ export interface useRequestResult<TData, TParams extends unknown[]> {
292297
/**
293298
* Data returned by service.
294299
*/
295-
data: Readonly<Ref<TData | undefined>>
300+
data: Readonly<
301+
Ref<
302+
FormatResult extends false
303+
? Initial extends false
304+
? TData | undefined
305+
: TData
306+
: FormatResult extends (...args: any[]) => any
307+
? ReturnType<FormatResult> | undefined
308+
: FormatResult | undefined
309+
>
310+
>
296311

297312
/**
298313
* Exception thrown by service.

‎packages/use-request/src/useRequest.ts‎

Lines changed: 68 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { withArgs } from './utils/resolve-args'
2323
export type PluginsMiddleOptionsType<
2424
PluginsOptions,
2525
TData,
26-
TParams extends unknown[] = unknown[]
26+
TParams extends unknown[] = unknown[],
2727
> = PluginsOptions extends (infer P)[]
2828
? P extends UseRequestPlugin<TData, TParams, infer R>
2929
? R
@@ -34,8 +34,11 @@ export type PluginsMiddleOptionsType<
3434
export function useRequest<
3535
TData,
3636
TParams extends unknown[] = unknown[],
37-
PluginsOptions extends UseRequestPlugin<TData, TParams>[] = UseRequestPlugin<TData, TParams>[],
38-
SR = any
37+
PluginsOptions extends UseRequestPlugin<TData, TParams>[] = UseRequestPlugin<
38+
TData,
39+
TParams
40+
>[],
41+
SR = any,
3942
>(
4043
service: UseRequestService<SR, TParams>,
4144
options: UseRequestOptionsWithFormatResult<
@@ -46,14 +49,31 @@ export function useRequest<
4649
> &
4750
UseRequestOptionsWithInitialData<SR, TParams, PluginsOptions>,
4851
plugins?: PluginsOptions,
49-
): useRequestResult<TData, TParams>
52+
): useRequestResult<
53+
TData,
54+
TParams,
55+
UseRequestOptionsWithFormatResult<
56+
TData,
57+
TParams,
58+
PluginsMiddleOptionsType<PluginsOptions, TData, TParams>,
59+
SR
60+
>['formatResult'],
61+
UseRequestOptionsWithInitialData<
62+
TData,
63+
TParams,
64+
PluginsMiddleOptionsType<PluginsOptions, TData, TParams>
65+
>['initialData']
66+
>
5067

5168
// 只有 formatResult
5269
export function useRequest<
5370
TData,
5471
TParams extends unknown[] = unknown[],
55-
PluginsOptions extends UseRequestPlugin<TData, TParams>[] = UseRequestPlugin<TData, TParams>[],
56-
SR = any
72+
PluginsOptions extends UseRequestPlugin<TData, TParams>[] = UseRequestPlugin<
73+
TData,
74+
TParams
75+
>[],
76+
SR = any,
5777
>(
5878
service: UseRequestService<SR, TParams>,
5979
options: UseRequestOptionsWithFormatResult<
@@ -63,13 +83,26 @@ export function useRequest<
6383
SR
6484
>,
6585
plugins?: PluginsOptions,
66-
): useRequestResult<TData, TParams>
86+
): useRequestResult<
87+
TData,
88+
TParams,
89+
UseRequestOptionsWithFormatResult<
90+
TData,
91+
TParams,
92+
PluginsMiddleOptionsType<PluginsOptions, TData, TParams>,
93+
SR
94+
>['formatResult'],
95+
false
96+
>
6797

6898
// 只有 initialData
6999
export function useRequest<
70100
TData,
71101
TParams extends unknown[] = unknown[],
72-
PluginsOptions extends UseRequestPlugin<TData, TParams>[] = UseRequestPlugin<TData, TParams>[]
102+
PluginsOptions extends UseRequestPlugin<TData, TParams>[] = UseRequestPlugin<
103+
TData,
104+
TParams
105+
>[],
73106
>(
74107
service: UseRequestService<TData, TParams>,
75108
options: UseRequestOptionsWithInitialData<
@@ -78,13 +111,25 @@ export function useRequest<
78111
PluginsMiddleOptionsType<PluginsOptions, TData, TParams>
79112
>,
80113
plugins?: PluginsOptions,
81-
): useRequestResult<TData, TParams>
114+
): useRequestResult<
115+
TData,
116+
TParams,
117+
false,
118+
UseRequestOptionsWithInitialData<
119+
TData,
120+
TParams,
121+
PluginsMiddleOptionsType<PluginsOptions, TData, TParams>
122+
>['initialData']
123+
>
82124

83125
// 无 formatResults 和 initialData
84126
export function useRequest<
85127
TData,
86128
TParams extends unknown[] = unknown[],
87-
PluginsOptions extends UseRequestPlugin<TData, TParams>[] = UseRequestPlugin<TData, TParams>[]
129+
PluginsOptions extends UseRequestPlugin<TData, TParams>[] = UseRequestPlugin<
130+
TData,
131+
TParams
132+
>[],
88133
>(
89134
service: UseRequestService<TData, TParams>,
90135
options?: UseRequestOptions<
@@ -93,12 +138,15 @@ export function useRequest<
93138
PluginsMiddleOptionsType<PluginsOptions, TData, TParams>
94139
>,
95140
plugins?: PluginsOptions,
96-
): useRequestResult<TData, TParams>
141+
): useRequestResult<TData, TParams, false, false>
97142

98143
export function useRequest<
99144
TData,
100145
TParams extends unknown[] = unknown[],
101-
PluginsOptions extends UseRequestPlugin<TData, TParams>[] = UseRequestPlugin<TData, TParams>[]
146+
PluginsOptions extends UseRequestPlugin<TData, TParams>[] = UseRequestPlugin<
147+
TData,
148+
TParams
149+
>[],
102150
>(
103151
service: UseRequestService<TData, TParams>,
104152
options?: UseRequestOptions<
@@ -120,10 +168,14 @@ export function useRequest<
120168
useRetryPlugin,
121169
]?.filter(Boolean)
122170

123-
return withArgs<TData, TParams>(useRequestImplement, options?.use)(service, options, [
124-
...(plugins || []),
125-
...BuiltInPlugins,
126-
] as UseRequestPlugin<TData, TParams>[])
171+
return withArgs<TData, TParams>(useRequestImplement, options?.use)(
172+
service,
173+
options,
174+
[...(plugins || []), ...BuiltInPlugins] as UseRequestPlugin<
175+
TData,
176+
TParams
177+
>[],
178+
)
127179
}
128180

129181
export default useRequest

0 commit comments

Comments
 (0)