Skip to content

Linzp #5

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 2 commits into from
Nov 21, 2024
Merged

Linzp #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b5b6845
兼容老的locale参数
zhipenglin Nov 21, 2024
57dafc4
再修改一下
zhipenglin Nov 21, 2024
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.3",
"version": "0.1.4",
"description": "管理和获取枚举值.",
"syntax": {
"esmodules": true
Expand Down
21 changes: 12 additions & 9 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import uniq from 'lodash/uniq';
import transform from 'lodash/transform';
import preset, { globalParams, getCache } from './preset';

const formatEnum = ({ value, format, language }) => {
const label = value.locale?.[language] || value.description;
const formatEnum = ({ value, format, language, locale }) => {
const label = value.translation?.[language || locale] || value.description;
if (format === 'origin') {
return value;
}
Expand All @@ -19,7 +19,7 @@ const formatEnum = ({ value, format, language }) => {
};

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

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

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

const useEnumLoader = () => {
const { language } = usePreset();
const { language, locale } = usePreset();
const resource = useEnumResource();
return useRefCallback(async ({ requests, format }) => {
const cache = getCache();
Expand Down Expand Up @@ -83,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 });
const formatValue = formatEnum({ value: enumValue, format: request.format || format, language, locale });
cache.set(getCacheKey(request), formatValue);
return formatValue;
})(request);
Expand Down Expand Up @@ -115,7 +116,7 @@ const EnumResource = p => {
p
);
const resource = useEnumResource();
const { language } = usePreset();
const { language, locale } = usePreset();
return (
<Fetch
{...props}
Expand All @@ -135,15 +136,17 @@ const EnumResource = p => {
formatEnum({
value,
format,
language
language,
locale
})
)
)
: Array.from(data[0].values()).map(value =>
formatEnum({
value,
format,
language
language,
locale
})
)
);
Expand Down