Skip to content

修改获取locale配置的配置 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhipenglin merged 1 commit into from
Nov 25, 2024
Merged

修改获取locale配置的配置 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@kne/react-enum",
"version": "0.1.4",
"version": "0.1.5",
"description": "管理和获取枚举值.",
"syntax": {
"esmodules": true
Expand Down
9 changes: 5 additions & 4 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { usePreset } from '@kne/global-context';
import { useGlobalContext, usePreset } from '@kne/global-context';
import useRefCallback from '@kne/use-ref-callback';
import Fetch, { useFetch } from '@kne/react-fetch';
import groupBy from 'lodash/groupBy';
Expand All @@ -19,7 +19,8 @@ const formatEnum = ({ value, format, language, locale }) => {
};

const useEnumResource = () => {
const { enums, locale, language } = usePreset();
const { locale, language } = useGlobalContext();
const { enums } = usePreset();
return useRefCallback(async ({ moduleNames }) => {
const getResource = async target => {
const loader = Object.assign({}, globalParams.base, enums)[target];
Expand All @@ -44,7 +45,7 @@ const useEnumResource = () => {
};

const useEnumLoader = () => {
const { language, locale } = usePreset();
const { language, locale } = useGlobalContext();
const resource = useEnumResource();
return useRefCallback(async ({ requests, format }) => {
const cache = getCache();
Expand Down Expand Up @@ -116,7 +117,7 @@ const EnumResource = p => {
p
);
const resource = useEnumResource();
const { language, locale } = usePreset();
const { language, locale } = useGlobalContext();
return (
<Fetch
{...props}
Expand Down