Skip to content

修改國際化loader配置 #7

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

修改國際化loader配置 #7

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
3 changes: 2 additions & 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.5",
"version": "0.1.6",
"description": "管理和获取枚举值.",
"syntax": {
"esmodules": true
Expand Down Expand Up @@ -85,6 +85,7 @@
},
"dependencies": {
"@kne/global-context": "^1.1.2",
"@kne/is-empty": "^1.0.1",
"@kne/react-fetch": "^1.5.5",
"@kne/use-ref-callback": "^0.1.2",
"lodash": "^4.17.21",
Expand Down
47 changes: 21 additions & 26 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import groupBy from 'lodash/groupBy';
import uniq from 'lodash/uniq';
import transform from 'lodash/transform';
import preset, { globalParams, getCache } from './preset';
import { isEmpty } from '@kne/is-empty';

const formatEnum = ({ value, format, language, locale }) => {
const label = value.translation?.[language || locale] || value.description;
Expand All @@ -19,9 +20,8 @@ const formatEnum = ({ value, format, language, locale }) => {
};

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

//locale参数可能被废弃
const resource = await (typeof loader === 'function' ? loader({ target, locale, language }) : loader);
const resource = await (typeof loader === 'function' ? loader({ target, language, locale: language }) : loader);

if (Array.isArray(resource)) {
return new Map(resource.map(item => [item.value.toString(), item]));
Expand All @@ -45,12 +45,11 @@ const useEnumResource = () => {
};

const useEnumLoader = () => {
const { language, locale } = useGlobalContext();
const resource = useEnumResource();
return useRefCallback(async ({ requests, format }) => {
return useRefCallback(async ({ requests, format, language }) => {
const cache = getCache();
const getCacheKey = request => {
return Symbol.for(`${request.moduleName}_${request.value}_${request.format || format}`);
return Symbol.for(`${request.moduleName}_${request.value}_${language}_${request.format || format}`);
};
const requestsGroup = groupBy(requests, request => {
return !request.force && cache.has(getCacheKey(request)) ? 'cached' : 'uncached';
Expand All @@ -64,7 +63,7 @@ const useEnumLoader = () => {
const moduleNames = uniq(uncached.map(({ moduleName }) => moduleName));

const resourceObject = transform(
await resource({ moduleNames }),
await resource({ moduleNames, language }),
(result, value, index) => {
const moduleName = moduleNames[index];
result[moduleName] = value;
Expand All @@ -85,7 +84,7 @@ const useEnumLoader = () => {
}
const currentResource = resourceObject[request.moduleName];
const enumValue = currentResource.get(request.value);
const formatValue = formatEnum({ value: enumValue, format: request.format || format, language, locale });
const formatValue = formatEnum({ value: enumValue, format: request.format || format, language });
cache.set(getCacheKey(request), formatValue);
return formatValue;
})(request);
Expand All @@ -98,16 +97,6 @@ const useEnumLoader = () => {
});
};

const useEnum = () => {
const loader = useEnumLoader();
return useFetch({
loader: ({ data }) => {
const { requests, format } = Object.assign({}, { format: 'default' }, data);
return loader({ requests, format });
}
});
};

const EnumResource = p => {
const { moduleName, children, format, ...props } = Object.assign(
{},
Expand Down Expand Up @@ -166,9 +155,10 @@ const EnumLegacy = p => {
},
p
);
const { language, locale } = useGlobalContext();
const loader = useEnumLoader();

if (!name) {
if (isEmpty(name)) {
return (
<EnumResource moduleName={moduleName} format={format || 'origin'}>
{children}
Expand All @@ -180,8 +170,8 @@ const EnumLegacy = p => {
<Fetch
{...props}
loader={({ data }) => {
const { requests, format } = Object.assign({}, data);
return loader({ requests, format });
const { requests, language, format } = Object.assign({}, data);
return loader({ requests, language, format });
}}
data={{
requests: [
Expand All @@ -191,7 +181,8 @@ const EnumLegacy = p => {
force,
format: typeof children === 'function' ? 'origin' : format || 'default'
}
]
],
language: language || locale || window.navigator.language
}}
render={({ data, ...fetchApi }) => {
if (typeof children === 'function') {
Expand All @@ -211,15 +202,19 @@ const Enum = p => {
},
p
);
const { language, locale } = useGlobalContext();
const loader = useEnumLoader();
return (
<Fetch
{...props}
loader={({ data }) => {
const { requests, format } = Object.assign({}, data);
return loader({ requests, format });
const { requests, format, language } = Object.assign({}, data);
return loader({ requests, language, format });
}}
data={{
requests: Array.isArray(request) ? request : [request],
language: language || locale || window.navigator.language
}}
data={{ requests: Array.isArray(request) ? request : [request] }}
render={({ data, ...fetchApi }) => {
if (typeof children === 'function') {
return children(Array.isArray(request) ? data : data[0], fetchApi);
Expand All @@ -232,4 +227,4 @@ const Enum = p => {

export default EnumLegacy;

export { preset, Enum, EnumResource, useEnum, useEnumLoader, useEnumResource };
export { preset, Enum, EnumResource, useEnumLoader, useEnumResource };