Skip to content

Release #575

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
Jan 12, 2026
Merged

Release #575

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
6d8ce0c
修改TypeDate报错bug
zhipenglin Jan 12, 2026
a6d707a
Merge pull request #574 from kne-union/linzp
zhipenglin Jan 12, 2026
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-components/components-core",
"version": "0.4.49",
"version": "0.4.50",
"files": [
"build"
],
Expand Down
118 changes: 43 additions & 75 deletions src/common/components/TypeDateRangePickerField/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,81 +1,49 @@
import { DatePicker, Select, Space } from "antd";
import {DatePicker, Select, Space} from "antd";
import useControlValue from "@kne/use-control-value";
import dayjs from "dayjs";
import importMessages from "../locale";
import { createWithIntl, useIntl } from "@components/Intl";
import {createWithIntl, useIntl} from "@components/Intl";

const TypeDatePickerField = ({ ...props }) => {
const { formatMessage } = useIntl({ moduleName: "Common" });
const typeList = new Map([
["date", formatMessage({ id: "customTime" })],
["month", formatMessage({ id: "monthly" })],
["week", formatMessage({ id: "weekly" })],
]);
const [value, onChange] = useControlValue(props);
return (
<Space.Compact>
<Select
style={{ width: "120px" }}
value={value?.type || "date"}
onChange={(typeValue) => {
onChange((value) => {
return {
value: value?.value?.length
? [
dayjs(value.value[0]).startOf(typeValue || "date"),
dayjs(value.value[1]).endOf(typeValue || "date"),
]
: null,
type: typeValue || "date",
};
});
}}
options={Array.from(typeList).map(([value, label]) => ({
label,
value,
}))}
/>
<DatePicker.RangePicker
{...props}
picker={value?.type || "date"}
value={
Array.isArray(value?.value) &&
value.value.length === 2 &&
value.value.map((item) => item && dayjs(item))
}
onChange={(dateValue) => {
onChange((value) => {
console.log(
Object.assign({ type: "date" }, value, {
value: dateValue && [
dateValue[0] &&
new Date(
dateValue[0].startOf(value?.type || "date").valueOf()
),
dateValue[1] &&
new Date(
dateValue[1].endOf(value?.type || "date").valueOf()
),
],
})
);
return Object.assign({ type: "date" }, value, {
value: dateValue && [
dateValue[0] &&
new Date(
dateValue[0].startOf(value?.type || "date").valueOf()
),
dateValue[1] &&
new Date(dateValue[1].endOf(value?.type || "date").valueOf()),
],
});
});
}}
/>
</Space.Compact>
);
const TypeDatePickerField = ({...props}) => {
const {formatMessage} = useIntl({moduleName: "Common"});
const typeList = new Map([["date", formatMessage({id: "customTime"})], ["month", formatMessage({id: "monthly"})], ["week", formatMessage({id: "weekly"})],]);
const [value, onChange] = useControlValue(props);
return (<Space.Compact>
<Select
style={{width: "120px"}}
value={value?.type || "date"}
onChange={(typeValue) => {
onChange((value) => {
if (!value?.value?.length) {
return {value: null, type: typeValue || "date"};
}
const startTime = dayjs(value.value[0]), endTime = dayjs(value.value[1]);
return {
value: [startTime.isValid() ? startTime.startOf(typeValue || "date") : null, endTime.isValid() ? endTime.endOf(typeValue || "date") : null],
type: typeValue || "date",
};
});
}}
options={Array.from(typeList).map(([value, label]) => ({
label, value,
}))}
/>
<DatePicker.RangePicker
{...props}
picker={value?.type || "date"}
value={Array.isArray(value?.value) && value.value.length === 2 && value.value.map((item) => item && dayjs(item))}
onChange={(dateValue) => {
onChange((value) => {
console.log(Object.assign({type: "date"}, value, {
value: dateValue && [dateValue[0] && new Date(dateValue[0].startOf(value?.type || "date").valueOf()), dateValue[1] && new Date(dateValue[1].endOf(value?.type || "date").valueOf()),],
}));
return Object.assign({type: "date"}, value, {
value: dateValue && [dateValue[0] && new Date(dateValue[0].startOf(value?.type || "date").valueOf()), dateValue[1] && new Date(dateValue[1].endOf(value?.type || "date").valueOf()),],
});
});
}}
/>
</Space.Compact>);
};

export default createWithIntl({ importMessages, moduleName: "Common" })(
TypeDatePickerField
);
export default createWithIntl({importMessages, moduleName: "Common"})(TypeDatePickerField);
174 changes: 48 additions & 126 deletions src/components/Enum/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,132 +1,54 @@
import { preset } from "@kne/react-enum";
import {preset} from "@kne/react-enum";
import transform from "lodash/transform";

const baseLoaders = [
[
"gender",
() => [
{ value: "M", description: "男" },
{
value: "F",
description: "女",
},
],
],
[
"marital",
() => [
{ description: "已婚", value: "Y" },
{
description: "未婚",
value: "N",
},
],
],
[
"confirm",
() => [
{ description: "是", value: "Y" },
{
description: "否",
value: "N",
},
],
],
[
"political",
() => [
{ description: "中共党员", value: "中共党员" },
{
description: "共青团员",
value: "共青团员",
},
{ description: "群众", value: "群众" },
{
description: "其他党派",
value: "其他党派",
},
],
],
[
"phoneStateEnum",
() => [
{
value: 0,
description: "空号",
},
{
value: 1,
description: "实号",
},
{
value: 2,
description: "停机",
},
{
value: 3,
description: "库无",
},
{
value: 4,
description: "沉默号",
},
{
value: 5,
description: "风险号",
},
],
],
[
"degreeEnum",
() => [
{
description: "初中",
value: 10,
},
{
description: "中专",
value: 20,
},
{
description: "高中",
value: 30,
},
{
description: "大专",
value: 40,
},
{
description: "本科",
value: 50,
},
{
description: "硕士研究生",
value: 60,
},
{
description: "博士研究生",
value: 70,
},
{
description: "博士后",
value: 75,
},
{
description: "学历不限",
value: 999,
},
],
],
];
const baseLoaders = [['commonStatus', () => [{value: 'open', description: '开启', type: 'success',}, {
value: 'close', description: '关闭', type: 'danger'
}]], ["gender", () => [{value: "M", description: "男"}, {
value: "F", description: "女",
},],], ["marital", () => [{description: "已婚", value: "Y"}, {
description: "未婚", value: "N",
},],], ["confirm", () => [{description: "是", value: "Y"}, {
description: "否", value: "N",
},],], ["political", () => [{description: "中共党员", value: "中共党员"}, {
description: "共青团员", value: "共青团员",
}, {description: "群众", value: "群众"}, {
description: "其他党派", value: "其他党派",
},],], ["phoneStateEnum", () => [{
value: 0, description: "空号",
}, {
value: 1, description: "实号",
}, {
value: 2, description: "停机",
}, {
value: 3, description: "库无",
}, {
value: 4, description: "沉默号",
}, {
value: 5, description: "风险号",
},],], ["degreeEnum", () => [{
description: "初中", value: 10,
}, {
description: "中专", value: 20,
}, {
description: "高中", value: 30,
}, {
description: "大专", value: 40,
}, {
description: "本科", value: 50,
}, {
description: "硕士研究生", value: 60,
}, {
description: "博士研究生", value: 70,
}, {
description: "博士后", value: 75,
}, {
description: "学历不限", value: 999,
},],],];

preset({
base: transform(
baseLoaders,
(result, value) => {
result[value[0]] = value[1];
},
{}
),
base: transform(baseLoaders, (result, value) => {
result[value[0]] = value[1];
}, {}),
});

export { default } from "@kne/react-enum";
export {default} from "@kne/react-enum";