yoone
/
WEB
1
0
Fork 3
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: yoone:4fd9cfee75da098b9014b2d3a3ff53d9e05c0e1a
Branches Tags
yoone:main
yoone:stable
yoone:v1.0
..
compare: yoone:bb907fa47ca4b3850cddc9ba1e0255e896a4ea2f
Branches Tags
yoone:main
yoone:stable
yoone:v1.0

No commits in common. "4fd9cfee75da098b9014b2d3a3ff53d9e05c0e1a" and "bb907fa47ca4b3850cddc9ba1e0255e896a4ea2f" have entirely different histories.
4fd9cfee75 ... bb907fa47c

8 changed files with 124 additions and 132 deletions
Show Stats Expand all files Collapse all files

7
src/pages/Order/List/index.tsx
View File

@ -275,9 +275,9 @@ const ListPage: React.FC = () => {
{(record as any)?.fulfillments?.map((item: any) => { {(record as any)?.fulfillments?.map((item: any) => {
if (!item) return; if (!item) return;
return ( return (
<div style={{ display:"flex", alignItems:"center",'flexDirection':'column' }}> <div style={{ display:"flex", alignItems:"center" }}>
<span>物流供应商: {item.shipping_provider}</span> {item.tracking_provider}
<span>物流单号: {item.tracking_number}</span> {item.tracking_number}
</div> </div>
); );
})} })}
@ -535,6 +535,7 @@ const ListPage: React.FC = () => {
> >
<Button <Button
type="primary" type="primary"
disabled={selectedRowKeys.length === 0}
ghost ghost
> >
批量导出 批量导出

13
src/pages/Product/List/EditForm.tsx
View File

@ -3,7 +3,6 @@ import {
productcontrollerGetcategoriesall, productcontrollerGetcategoriesall,
productcontrollerGetcategoryattributes, productcontrollerGetcategoryattributes,
productcontrollerGetproductcomponents, productcontrollerGetproductcomponents,
productcontrollerGetproductlist,
productcontrollerGetproductsiteskus, productcontrollerGetproductsiteskus,
productcontrollerUpdateproduct, productcontrollerUpdateproduct,
} from '@/servers/api/product'; } from '@/servers/api/product';
@ -316,17 +315,17 @@ const EditForm: React.FC<{
<ProForm.Group> <ProForm.Group>
<ProFormSelect <ProFormSelect
name="sku" name="sku"
label="单品SKU" label="库存SKU"
width="md" width="md"
showSearch showSearch
debounceTime={300} debounceTime={300}
placeholder="请输入单品SKU" placeholder="请输入库存SKU"
rules={[{ required: true, message: '请输入单品SKU' }]} rules={[{ required: true, message: '请输入库存SKU' }]}
request={async ({ keyWords }) => { request={async ({ keyWords }) => {
const params = keyWords const params = keyWords
? { where: {sku: keyWords, name: keyWords, type: 'single'} } ? { sku: keyWords, name: keyWords }
: { 'per_page': 9999 , where: {type: 'single'} }; : { pageSize: 9999 };
const { data } = await productcontrollerGetproductlist(params); const { data } = await getStocks(params as any);
if (!data || !data.items) { if (!data || !data.items) {
return []; return [];
} }

7
src/pages/Product/List/SyncToSiteModal/index.tsx
View File

@ -95,15 +95,14 @@ const SyncToSiteModal: React.FC<SyncToSiteModalProps> = ({
} }
}} }}
onFinish={async (values) => { onFinish={async (values) => {
console.log(`values`,values)
if (!values.siteId) return false; if (!values.siteId) return false;
try { try {
const siteSkusMap = values.siteSkus || {}; const siteSkusMap = values.siteSkus || {};
const data = products.map((product) => ({ const data = products.map((product) => ({
productId: product.id, productId: product.id,
siteSku: siteSkusMap[product.id] || `${values.siteId}-${product.sku}`, siteSku: siteSkusMap[product.id] || `${values.siteId}_${product.sku}`,
})); }));
console.log(`data`,data)
const result = await productcontrollerBatchsynctosite({ const result = await productcontrollerBatchsynctosite({
siteId: values.siteId, siteId: values.siteId,
data, data,
@ -131,7 +130,7 @@ const SyncToSiteModal: React.FC<SyncToSiteModalProps> = ({
<div style={{ display: 'flex', gap: 8, alignItems: 'center', marginBottom: 8 }}> <div style={{ display: 'flex', gap: 8, alignItems: 'center', marginBottom: 8 }}>
<div style={{ minWidth: 220 }}>原始SKU: {row.sku || '-'}</div> <div style={{ minWidth: 220 }}>原始SKU: {row.sku || '-'}</div>
<div style={{ minWidth: 150 }}> <div style={{ minWidth: 150 }}>
已有商品SKU:{' '} 商品SKU:{' '}
{row.siteSkus && row.siteSkus.length > 0 {row.siteSkus && row.siteSkus.length > 0
? row.siteSkus.map((siteSku: string, idx: number) => ( ? row.siteSkus.map((siteSku: string, idx: number) => (
<Tag key={idx} color="cyan"> <Tag key={idx} color="cyan">

53
src/pages/Product/List/components/ProductComponentList.tsx
View File

@ -1,53 +0,0 @@
import React from "react";
import { ProTable, ProColumns } from "@ant-design/pro-components";
interface ProductComponentListProps {
record: API.Product;
columns: ProColumns<API.Product>[];
dataSource?: API.Product[];
}
const ProductComponentList: React.FC<ProductComponentListProps> = ({ record, columns, dataSource }) => {
if (record.type !== "bundle" || !record.components || record.components.length === 0) {
return null;
}
const componentSkus = record.components.map(component => component.sku);
const includedProducts = [];
if (dataSource) {
includedProducts = dataSource
.filter(product => product.type === "single" && componentSkus.includes(product.sku));
}
if (includedProducts.length === 0) {
return (
<div style={{ padding: "16px", textAlign: "center", color: "#999" }}>
未找到包含的单品信息
</div>
);
}
const componentColumns = columns.filter(col =>
[200~cd ../api"option", "siteSkus", "category", "type"].includes(col.dataIndex as string)
);
return (
<div style={{ padding: "8px 16px", backgroundColor: "#fafafa" }}>
<ProTable
dataSource={includedProducts}
columns={componentColumns}
pagination={false}
rowKey="id"
bordered
size="small"
scroll={{ x: "max-content" }}
headerTitle={null}
toolBarRender={false}
/>
</div>
);
};
export default ProductComponentList;

52
src/pages/Product/List/index.tsx
View File

@ -67,7 +67,16 @@ const AttributesCell: React.FC<{ record: any }> = ({ record }) => {
); );
}; };
const ComponentsCell: React.FC<{ components?: any[] }> = ({ components }) => { const ComponentsCell: React.FC<{ productId: number }> = ({ productId }) => {
const [components, setComponents] = React.useState<any[]>([]);
React.useEffect(() => {
(async () => {
const { data = [] } = await productcontrollerGetproductcomponents({
id: productId,
});
setComponents(data || []);
})();
}, [productId]);
return ( return (
<div> <div>
{components && components.length ? ( {components && components.length ? (
@ -154,28 +163,7 @@ const BatchEditModal: React.FC<{
</ModalForm> </ModalForm>
); );
}; };
const ProductList = ({ filter, columns }: { filter: { skus: string[] },columns: any[] }) => {
return (
<ProTable
request={async (pag) => {
const { data, success } = await productcontrollerGetproductlist({
where: filter
});
if (!success) return [];
return data || [];
}}
columns={columns}
pagination={false}
rowKey="id"
bordered
size="small"
scroll={{ x: "max-content" }}
headerTitle={null}
toolBarRender={false}
/>
);
};
const List: React.FC = () => { const List: React.FC = () => {
const actionRef = useRef<ActionType>(); const actionRef = useRef<ActionType>();
@ -294,7 +282,7 @@ const List: React.FC = () => {
title: '构成', title: '构成',
dataIndex: 'components', dataIndex: 'components',
hideInSearch: true, hideInSearch: true,
render: (_, record) => <ComponentsCell components={record.components} />, render: (_, record) => <ComponentsCell productId={(record as any).id} />,
}, },
{ {
@ -521,16 +509,15 @@ const List: React.FC = () => {
}} }}
columns={columns} columns={columns}
// expandable={{ // expandable={{
// expandedRowRender: (record) => { // expandedRowRender: (record) => (
// return <ProductList filter={{ // <SiteProductInfo
// skus: record.components?.map(component => component.sku) || [], // skus={(record.siteSkus as string[]) || []}
// }} // record={record}
// columns={columns} // parentTableRef={actionRef}
// ></ProductList> // />
// } // ),
// ,
// rowExpandable: (record) => // rowExpandable: (record) =>
// !!(record.type==='bundle'), // !!(record.siteSkus && record.siteSkus.length > 0),
// }} // }}
editable={{ editable={{
type: 'single', type: 'single',
@ -566,5 +553,4 @@ const List: React.FC = () => {
); );
}; };
export default List; export default List;

4
src/servers/api/product.ts
View File

@ -588,6 +588,10 @@ export async function productcontrollerGetproductlist(
method: 'GET', method: 'GET',
params: { params: {
...params, ...params,
where: undefined,
...params['where'],
orderBy: undefined,
...params['orderBy'],
}, },
...(options || {}), ...(options || {}),
}); });

56
src/servers/api/siteApi.ts
View File

@ -15,6 +15,10 @@ export async function siteapicontrollerGetcustomers(
method: 'GET', method: 'GET',
params: { params: {
...queryParams, ...queryParams,
where: undefined,
...queryParams['where'],
orderBy: undefined,
...queryParams['orderBy'],
}, },
...(options || {}), ...(options || {}),
}, },
@ -70,6 +74,10 @@ export async function siteapicontrollerExportcustomers(
method: 'GET', method: 'GET',
params: { params: {
...queryParams, ...queryParams,
where: undefined,
...queryParams['where'],
orderBy: undefined,
...queryParams['orderBy'],
}, },
...(options || {}), ...(options || {}),
}); });
@ -119,6 +127,10 @@ export async function siteapicontrollerGetmedia(
method: 'GET', method: 'GET',
params: { params: {
...queryParams, ...queryParams,
where: undefined,
...queryParams['where'],
orderBy: undefined,
...queryParams['orderBy'],
}, },
...(options || {}), ...(options || {}),
}); });
@ -198,6 +210,10 @@ export async function siteapicontrollerExportmedia(
method: 'GET', method: 'GET',
params: { params: {
...queryParams, ...queryParams,
where: undefined,
...queryParams['where'],
orderBy: undefined,
...queryParams['orderBy'],
}, },
...(options || {}), ...(options || {}),
}); });
@ -214,6 +230,10 @@ export async function siteapicontrollerGetorders(
method: 'GET', method: 'GET',
params: { params: {
...queryParams, ...queryParams,
where: undefined,
...queryParams['where'],
orderBy: undefined,
...queryParams['orderBy'],
}, },
...(options || {}), ...(options || {}),
}); });
@ -293,6 +313,10 @@ export async function siteapicontrollerExportorders(
method: 'GET', method: 'GET',
params: { params: {
...queryParams, ...queryParams,
where: undefined,
...queryParams['where'],
orderBy: undefined,
...queryParams['orderBy'],
}, },
...(options || {}), ...(options || {}),
}); });
@ -330,6 +354,10 @@ export async function siteapicontrollerGetproducts(
method: 'GET', method: 'GET',
params: { params: {
...queryParams, ...queryParams,
where: undefined,
...queryParams['where'],
orderBy: undefined,
...queryParams['orderBy'],
}, },
...(options || {}), ...(options || {}),
}, },
@ -410,6 +438,10 @@ export async function siteapicontrollerExportproducts(
method: 'GET', method: 'GET',
params: { params: {
...queryParams, ...queryParams,
where: undefined,
...queryParams['where'],
orderBy: undefined,
...queryParams['orderBy'],
}, },
...(options || {}), ...(options || {}),
}); });
@ -426,6 +458,10 @@ export async function siteapicontrollerExportproductsspecial(
method: 'GET', method: 'GET',
params: { params: {
...queryParams, ...queryParams,
where: undefined,
...queryParams['where'],
orderBy: undefined,
...queryParams['orderBy'],
}, },
...(options || {}), ...(options || {}),
}); });
@ -504,6 +540,10 @@ export async function siteapicontrollerGetreviews(
method: 'GET', method: 'GET',
params: { params: {
...queryParams, ...queryParams,
where: undefined,
...queryParams['where'],
orderBy: undefined,
...queryParams['orderBy'],
}, },
...(options || {}), ...(options || {}),
}, },
@ -542,6 +582,10 @@ export async function siteapicontrollerGetsubscriptions(
method: 'GET', method: 'GET',
params: { params: {
...queryParams, ...queryParams,
where: undefined,
...queryParams['where'],
orderBy: undefined,
...queryParams['orderBy'],
}, },
...(options || {}), ...(options || {}),
}, },
@ -559,6 +603,10 @@ export async function siteapicontrollerExportsubscriptions(
method: 'GET', method: 'GET',
params: { params: {
...queryParams, ...queryParams,
where: undefined,
...queryParams['where'],
orderBy: undefined,
...queryParams['orderBy'],
}, },
...(options || {}), ...(options || {}),
}); });
@ -575,6 +623,10 @@ export async function siteapicontrollerGetwebhooks(
method: 'GET', method: 'GET',
params: { params: {
...queryParams, ...queryParams,
where: undefined,
...queryParams['where'],
orderBy: undefined,
...queryParams['orderBy'],
}, },
...(options || {}), ...(options || {}),
}); });
@ -668,6 +720,10 @@ export async function siteapicontrollerGetcustomerorders(
method: 'GET', method: 'GET',
params: { params: {
...queryParams, ...queryParams,
where: undefined,
...queryParams['where'],
orderBy: undefined,
...queryParams['orderBy'],
}, },
...(options || {}), ...(options || {}),
}, },

64
src/servers/api/typings.d.ts vendored
View File

@ -1189,9 +1189,9 @@ declare namespace API {
/** 搜索关键词 */ /** 搜索关键词 */
search?: string; search?: string;
/** 过滤条件对象 */ /** 过滤条件对象 */
where?: any; where?: Record<string, any>;
/** 排序对象,例如 { "sku": "desc" } */ /** 排序对象,例如 { "sku": "desc" } */
orderBy?: any; orderBy?: Record<string, any>;
}; };
type productcontrollerGetproductsiteskusParams = { type productcontrollerGetproductsiteskusParams = {
@ -1717,9 +1717,9 @@ declare namespace API {
/** 搜索关键词 */ /** 搜索关键词 */
search?: string; search?: string;
/** 过滤条件对象 */ /** 过滤条件对象 */
where?: any; where?: Record<string, any>;
/** 排序对象,例如 { "sku": "desc" } */ /** 排序对象,例如 { "sku": "desc" } */
orderBy?: any; orderBy?: Record<string, any>;
siteId: number; siteId: number;
}; };
@ -1735,9 +1735,9 @@ declare namespace API {
/** 搜索关键词 */ /** 搜索关键词 */
search?: string; search?: string;
/** 过滤条件对象 */ /** 过滤条件对象 */
where?: any; where?: Record<string, any>;
/** 排序对象,例如 { "sku": "desc" } */ /** 排序对象,例如 { "sku": "desc" } */
orderBy?: any; orderBy?: Record<string, any>;
siteId: number; siteId: number;
}; };
@ -1753,9 +1753,9 @@ declare namespace API {
/** 搜索关键词 */ /** 搜索关键词 */
search?: string; search?: string;
/** 过滤条件对象 */ /** 过滤条件对象 */
where?: any; where?: Record<string, any>;
/** 排序对象,例如 { "sku": "desc" } */ /** 排序对象,例如 { "sku": "desc" } */
orderBy?: any; orderBy?: Record<string, any>;
siteId: number; siteId: number;
}; };
@ -1771,9 +1771,9 @@ declare namespace API {
/** 搜索关键词 */ /** 搜索关键词 */
search?: string; search?: string;
/** 过滤条件对象 */ /** 过滤条件对象 */
where?: any; where?: Record<string, any>;
/** 排序对象,例如 { "sku": "desc" } */ /** 排序对象,例如 { "sku": "desc" } */
orderBy?: any; orderBy?: Record<string, any>;
siteId: number; siteId: number;
}; };
@ -1789,9 +1789,9 @@ declare namespace API {
/** 搜索关键词 */ /** 搜索关键词 */
search?: string; search?: string;
/** 过滤条件对象 */ /** 过滤条件对象 */
where?: any; where?: Record<string, any>;
/** 排序对象,例如 { "sku": "desc" } */ /** 排序对象,例如 { "sku": "desc" } */
orderBy?: any; orderBy?: Record<string, any>;
siteId: number; siteId: number;
}; };
@ -1807,9 +1807,9 @@ declare namespace API {
/** 搜索关键词 */ /** 搜索关键词 */
search?: string; search?: string;
/** 过滤条件对象 */ /** 过滤条件对象 */
where?: any; where?: Record<string, any>;
/** 排序对象,例如 { "sku": "desc" } */ /** 排序对象,例如 { "sku": "desc" } */
orderBy?: any; orderBy?: Record<string, any>;
siteId: number; siteId: number;
}; };
@ -1830,9 +1830,9 @@ declare namespace API {
/** 搜索关键词 */ /** 搜索关键词 */
search?: string; search?: string;
/** 过滤条件对象 */ /** 过滤条件对象 */
where?: any; where?: Record<string, any>;
/** 排序对象,例如 { "sku": "desc" } */ /** 排序对象,例如 { "sku": "desc" } */
orderBy?: any; orderBy?: Record<string, any>;
customerId: number; customerId: number;
siteId: number; siteId: number;
}; };
@ -1854,9 +1854,9 @@ declare namespace API {
/** 搜索关键词 */ /** 搜索关键词 */
search?: string; search?: string;
/** 过滤条件对象 */ /** 过滤条件对象 */
where?: any; where?: Record<string, any>;
/** 排序对象,例如 { "sku": "desc" } */ /** 排序对象,例如 { "sku": "desc" } */
orderBy?: any; orderBy?: Record<string, any>;
siteId: number; siteId: number;
}; };
@ -1876,9 +1876,9 @@ declare namespace API {
/** 搜索关键词 */ /** 搜索关键词 */
search?: string; search?: string;
/** 过滤条件对象 */ /** 过滤条件对象 */
where?: any; where?: Record<string, any>;
/** 排序对象,例如 { "sku": "desc" } */ /** 排序对象,例如 { "sku": "desc" } */
orderBy?: any; orderBy?: Record<string, any>;
siteId: number; siteId: number;
}; };
@ -1904,9 +1904,9 @@ declare namespace API {
/** 搜索关键词 */ /** 搜索关键词 */
search?: string; search?: string;
/** 过滤条件对象 */ /** 过滤条件对象 */
where?: any; where?: Record<string, any>;
/** 排序对象,例如 { "sku": "desc" } */ /** 排序对象,例如 { "sku": "desc" } */
orderBy?: any; orderBy?: Record<string, any>;
siteId: number; siteId: number;
}; };
@ -1932,9 +1932,9 @@ declare namespace API {
/** 搜索关键词 */ /** 搜索关键词 */
search?: string; search?: string;
/** 过滤条件对象 */ /** 过滤条件对象 */
where?: any; where?: Record<string, any>;
/** 排序对象,例如 { "sku": "desc" } */ /** 排序对象,例如 { "sku": "desc" } */
orderBy?: any; orderBy?: Record<string, any>;
siteId: number; siteId: number;
}; };
@ -1950,9 +1950,9 @@ declare namespace API {
/** 搜索关键词 */ /** 搜索关键词 */
search?: string; search?: string;
/** 过滤条件对象 */ /** 过滤条件对象 */
where?: any; where?: Record<string, any>;
/** 排序对象,例如 { "sku": "desc" } */ /** 排序对象,例如 { "sku": "desc" } */
orderBy?: any; orderBy?: Record<string, any>;
siteId: number; siteId: number;
}; };
@ -1968,9 +1968,9 @@ declare namespace API {
/** 搜索关键词 */ /** 搜索关键词 */
search?: string; search?: string;
/** 过滤条件对象 */ /** 过滤条件对象 */
where?: any; where?: Record<string, any>;
/** 排序对象,例如 { "sku": "desc" } */ /** 排序对象,例如 { "sku": "desc" } */
orderBy?: any; orderBy?: Record<string, any>;
siteId: number; siteId: number;
}; };
@ -1991,9 +1991,9 @@ declare namespace API {
/** 搜索关键词 */ /** 搜索关键词 */
search?: string; search?: string;
/** 过滤条件对象 */ /** 过滤条件对象 */
where?: any; where?: Record<string, any>;
/** 排序对象,例如 { "sku": "desc" } */ /** 排序对象,例如 { "sku": "desc" } */
orderBy?: any; orderBy?: Record<string, any>;
siteId: number; siteId: number;
}; };
@ -2942,9 +2942,9 @@ declare namespace API {
/** 搜索关键词 */ /** 搜索关键词 */
search?: string; search?: string;
/** 过滤条件对象 */ /** 过滤条件对象 */
where?: any; where?: Record<string, any>;
/** 排序对象,例如 { "sku": "desc" } */ /** 排序对象,例如 { "sku": "desc" } */
orderBy?: any; orderBy?: Record<string, any>;
}; };
type UnifiedShippingLineDTO = { type UnifiedShippingLineDTO = {