forked from yoone/WEB
feat: 添加webhook地址字段和区域选择功能
在站点列表和编辑表单中添加webhook地址字段 在订单列表中添加付款日期字段 在统计页面添加国家/区域选择功能,支持多选和搜索 引入i18n-iso-countries库实现国家名称本地化
This commit is contained in:
parent
49448cefb5
commit
bf32957f0a
|
|
@ -215,11 +215,17 @@ const ListPage: React.FC = () => {
|
||||||
dataIndex: 'externalOrderId',
|
dataIndex: 'externalOrderId',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '订单日期',
|
title: '订单创建日期',
|
||||||
dataIndex: 'date_created',
|
dataIndex: 'date_created',
|
||||||
hideInSearch: true,
|
hideInSearch: true,
|
||||||
valueType: 'dateTime',
|
valueType: 'dateTime',
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
title: '付款日期',
|
||||||
|
dataIndex: 'date_paid',
|
||||||
|
hideInSearch: true,
|
||||||
|
valueType: 'dateTime',
|
||||||
|
},
|
||||||
{
|
{
|
||||||
title: '金额',
|
title: '金额',
|
||||||
dataIndex: 'total',
|
dataIndex: 'total',
|
||||||
|
|
|
||||||
|
|
@ -188,6 +188,8 @@ const SiteList: React.FC = () => {
|
||||||
</a>
|
</a>
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
|
{ title: 'webhook地址', dataIndex: 'webhookUrl', width: 280, hideInSearch: true },
|
||||||
|
|
||||||
{
|
{
|
||||||
title: 'SKU 前缀',
|
title: 'SKU 前缀',
|
||||||
dataIndex: 'skuPrefix',
|
dataIndex: 'skuPrefix',
|
||||||
|
|
|
||||||
|
|
@ -100,6 +100,11 @@ const EditSiteForm: React.FC<EditSiteFormProps> = ({
|
||||||
label="网站地址"
|
label="网站地址"
|
||||||
placeholder="请输入网站地址"
|
placeholder="请输入网站地址"
|
||||||
/>
|
/>
|
||||||
|
<ProFormText
|
||||||
|
name="webhookUrl"
|
||||||
|
label="Webhook 地址"
|
||||||
|
placeholder="请输入 Webhook 地址"
|
||||||
|
/>
|
||||||
<ProFormSelect
|
<ProFormSelect
|
||||||
name="type"
|
name="type"
|
||||||
label="平台"
|
label="平台"
|
||||||
|
|
@ -164,6 +169,7 @@ const EditSiteForm: React.FC<EditSiteFormProps> = ({
|
||||||
label="区域"
|
label="区域"
|
||||||
mode="multiple"
|
mode="multiple"
|
||||||
placeholder="请选择区域"
|
placeholder="请选择区域"
|
||||||
|
|
||||||
showSearch
|
showSearch
|
||||||
filterOption={(input, option) =>
|
filterOption={(input, option) =>
|
||||||
(option?.label ?? '').toLowerCase().includes(input.toLowerCase())
|
(option?.label ?? '').toLowerCase().includes(input.toLowerCase())
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ import { ORDER_STATUS_ENUM } from '@/constants';
|
||||||
import { AddTag } from '@/pages/Customer/List';
|
import { AddTag } from '@/pages/Customer/List';
|
||||||
import { customercontrollerDeltag } from '@/servers/api/customer';
|
import { customercontrollerDeltag } from '@/servers/api/customer';
|
||||||
import { sitecontrollerAll } from '@/servers/api/site';
|
import { sitecontrollerAll } from '@/servers/api/site';
|
||||||
|
import * as countries from 'i18n-iso-countries';
|
||||||
import {
|
import {
|
||||||
statisticscontrollerGetorderbydate,
|
statisticscontrollerGetorderbydate,
|
||||||
statisticscontrollerGetorderbyemail,
|
statisticscontrollerGetorderbyemail,
|
||||||
|
|
@ -22,7 +23,8 @@ import dayjs from 'dayjs';
|
||||||
import ReactECharts from 'echarts-for-react';
|
import ReactECharts from 'echarts-for-react';
|
||||||
import { useEffect, useMemo, useRef, useState } from 'react';
|
import { useEffect, useMemo, useRef, useState } from 'react';
|
||||||
import weekOfYear from 'dayjs/plugin/weekOfYear';
|
import weekOfYear from 'dayjs/plugin/weekOfYear';
|
||||||
|
import zhCN from 'i18n-iso-countries/langs/zh';
|
||||||
|
countries.registerLocale(zhCN);
|
||||||
dayjs.extend(weekOfYear);
|
dayjs.extend(weekOfYear);
|
||||||
const highlightText = (text: string, keyword: string) => {
|
const highlightText = (text: string, keyword: string) => {
|
||||||
if (!keyword) return text;
|
if (!keyword) return text;
|
||||||
|
|
@ -38,6 +40,17 @@ const highlightText = (text: string, keyword: string) => {
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// 获取所有国家/地区的选项
|
||||||
|
const getCountryOptions = () => {
|
||||||
|
// 获取所有国家的 ISO 代码
|
||||||
|
const countryCodes = countries.getAlpha2Codes();
|
||||||
|
// 将国家代码转换为选项数组
|
||||||
|
return Object.keys(countryCodes).map((code) => ({
|
||||||
|
label: countries.getName(code, 'zh') || code, // 使用中文名称, 如果没有则使用代码
|
||||||
|
value: code,
|
||||||
|
}));
|
||||||
|
};
|
||||||
|
|
||||||
const ListPage: React.FC = () => {
|
const ListPage: React.FC = () => {
|
||||||
const [xAxis, setXAxis] = useState([]);
|
const [xAxis, setXAxis] = useState([]);
|
||||||
const [series, setSeries] = useState<any[]>([]);
|
const [series, setSeries] = useState<any[]>([]);
|
||||||
|
|
@ -620,6 +633,19 @@ const ListPage: React.FC = () => {
|
||||||
}));
|
}));
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<ProFormSelect
|
||||||
|
name="country"
|
||||||
|
label="区域"
|
||||||
|
mode="multiple"
|
||||||
|
placeholder="请选择区域"
|
||||||
|
|
||||||
|
showSearch
|
||||||
|
filterOption={(input, option) =>
|
||||||
|
(option?.label ?? '').toLowerCase().includes(input.toLowerCase())
|
||||||
|
}
|
||||||
|
options={getCountryOptions()}
|
||||||
|
/>
|
||||||
{/* <ProFormSelect
|
{/* <ProFormSelect
|
||||||
label="类型"
|
label="类型"
|
||||||
name="purchaseType"
|
name="purchaseType"
|
||||||
|
|
|
||||||
|
|
@ -9,18 +9,28 @@ import {
|
||||||
PageContainer,
|
PageContainer,
|
||||||
ProColumns,
|
ProColumns,
|
||||||
ProTable,
|
ProTable,
|
||||||
|
ProForm,
|
||||||
|
ProFormSelect,
|
||||||
} from '@ant-design/pro-components';
|
} from '@ant-design/pro-components';
|
||||||
import { Space, Tag } from 'antd';
|
import { Space, Tag } from 'antd';
|
||||||
import dayjs from 'dayjs';
|
import dayjs from 'dayjs';
|
||||||
import ReactECharts from 'echarts-for-react';
|
import ReactECharts from 'echarts-for-react';
|
||||||
import { HistoryOrder } from '../Order';
|
import { HistoryOrder } from '../Order';
|
||||||
|
import * as countries from 'i18n-iso-countries';
|
||||||
|
import zhCN from 'i18n-iso-countries/langs/zh';
|
||||||
|
countries.registerLocale(zhCN);
|
||||||
const ListPage: React.FC = () => {
|
const ListPage: React.FC = () => {
|
||||||
const [data, setData] = useState({});
|
const [data, setData] = useState({});
|
||||||
|
const initialValues = {
|
||||||
useEffect(() => {
|
country: ['CA'],
|
||||||
statisticscontrollerGetordersorce().then(({ data, success }) => {
|
};
|
||||||
|
function handleSubmit(values: typeof initialValues) {
|
||||||
|
statisticscontrollerGetordersorce({params: values}).then(({ data, success }) => {
|
||||||
if (success) setData(data);
|
if (success) setData(data);
|
||||||
});
|
});
|
||||||
|
}
|
||||||
|
useEffect(() => {
|
||||||
|
handleSubmit(initialValues)
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
const option = useMemo(() => {
|
const option = useMemo(() => {
|
||||||
|
|
@ -39,11 +49,11 @@ const ListPage: React.FC = () => {
|
||||||
data: data?.inactiveRes?.map((v) => v.new_user_count)?.sort((_) => -1),
|
data: data?.inactiveRes?.map((v) => v.new_user_count)?.sort((_) => -1),
|
||||||
label: {
|
label: {
|
||||||
show: true,
|
show: true,
|
||||||
formatter: function (params) {
|
formatter: function (params) {
|
||||||
if (!params.value) return '';
|
if (!params.value) return '';
|
||||||
return Math.abs(params.value)
|
return Math.abs(params.value)
|
||||||
+'\n'
|
+ '\n'
|
||||||
+Math.abs(data?.inactiveRes?.find((item) => item.order_month === params.name)?.new_user_total || 0);
|
+ Math.abs(data?.inactiveRes?.find((item) => item.order_month === params.name)?.new_user_total || 0);
|
||||||
},
|
},
|
||||||
color: '#000000',
|
color: '#000000',
|
||||||
},
|
},
|
||||||
|
|
@ -59,11 +69,11 @@ const ListPage: React.FC = () => {
|
||||||
data: data?.inactiveRes?.map((v) => v.old_user_count)?.sort((_) => -1),
|
data: data?.inactiveRes?.map((v) => v.old_user_count)?.sort((_) => -1),
|
||||||
label: {
|
label: {
|
||||||
show: true,
|
show: true,
|
||||||
formatter: function (params) {
|
formatter: function (params) {
|
||||||
if (!params.value) return '';
|
if (!params.value) return '';
|
||||||
return Math.abs(params.value)
|
return Math.abs(params.value)
|
||||||
+'\n'
|
+ '\n'
|
||||||
+Math.abs(data?.inactiveRes?.find((item) => item.order_month === params.name)?.old_user_total || 0);
|
+ Math.abs(data?.inactiveRes?.find((item) => item.order_month === params.name)?.old_user_total || 0);
|
||||||
},
|
},
|
||||||
color: '#000000',
|
color: '#000000',
|
||||||
},
|
},
|
||||||
|
|
@ -83,11 +93,11 @@ const ListPage: React.FC = () => {
|
||||||
show: true,
|
show: true,
|
||||||
formatter: function (params) {
|
formatter: function (params) {
|
||||||
if (!params.value) return '';
|
if (!params.value) return '';
|
||||||
return Math.abs(params.value)
|
return Math.abs(params.value)
|
||||||
+'\n'+
|
+ '\n' +
|
||||||
+Math.abs(data?.res?.find((item) => item.order_month === params.name &&
|
+Math.abs(data?.res?.find((item) => item.order_month === params.name &&
|
||||||
item.first_order_month_group === v)?.total || 0);
|
item.first_order_month_group === v)?.total || 0);
|
||||||
},
|
},
|
||||||
color: '#000000',
|
color: '#000000',
|
||||||
},
|
},
|
||||||
data: xAxisData.map((month) => {
|
data: xAxisData.map((month) => {
|
||||||
|
|
@ -258,9 +268,29 @@ const ListPage: React.FC = () => {
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<PageContainer ghost>
|
<PageContainer ghost>
|
||||||
|
<ProForm
|
||||||
|
initialValues={initialValues}
|
||||||
|
layout="inline"
|
||||||
|
onFinish={handleSubmit}
|
||||||
|
>
|
||||||
|
|
||||||
|
<ProFormSelect
|
||||||
|
name="country"
|
||||||
|
label="区域"
|
||||||
|
mode="multiple"
|
||||||
|
placeholder="请选择区域"
|
||||||
|
showSearch
|
||||||
|
filterOption={(input, option) =>
|
||||||
|
(option?.label ?? '').toLowerCase().includes(input.toLowerCase())
|
||||||
|
}
|
||||||
|
options={getCountryOptions()}
|
||||||
|
/>
|
||||||
|
</ProForm>
|
||||||
<ReactECharts
|
<ReactECharts
|
||||||
option={option}
|
option={option}
|
||||||
style={{ height: 1050 }}
|
style={{ height: 1050 }}
|
||||||
|
|
@ -277,6 +307,7 @@ const ListPage: React.FC = () => {
|
||||||
},
|
},
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{tableData?.length ? (
|
{tableData?.length ? (
|
||||||
<ProTable
|
<ProTable
|
||||||
search={false}
|
search={false}
|
||||||
|
|
@ -293,4 +324,17 @@ const ListPage: React.FC = () => {
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// 获取所有国家/地区的选项
|
||||||
|
const getCountryOptions = () => {
|
||||||
|
// 获取所有国家的 ISO 代码
|
||||||
|
const countryCodes = countries.getAlpha2Codes();
|
||||||
|
// 将国家代码转换为选项数组
|
||||||
|
|
||||||
|
return Object.keys(countryCodes).map((code) => ({
|
||||||
|
label: countries.getName(code, 'zh') || code, // 使用中文名称, 如果没有则使用代码
|
||||||
|
value: code,
|
||||||
|
}));
|
||||||
|
};
|
||||||
export default ListPage;
|
export default ListPage;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue