diff --git a/package.json b/package.json index b702f11..475a290 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@kne/react-enum", - "version": "0.1.4", + "version": "0.1.5", "description": "管理和获取枚举值.", "syntax": { "esmodules": true diff --git a/src/index.js b/src/index.js index 4389821..bfc7e8d 100644 --- a/src/index.js +++ b/src/index.js @@ -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'; @@ -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]; @@ -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(); @@ -116,7 +117,7 @@ const EnumResource = p => { p ); const resource = useEnumResource(); - const { language, locale } = usePreset(); + const { language, locale } = useGlobalContext(); return (