src/constants/index.ts

@@ -9,23 +9,23 @@ export const PRODUCT_STATUS_ENUM: ProSchemaValueEnumObj = {
   },
   draft: {
     text: '草稿',
-    status: 'draft',
+    status: 'default',
   },
   pending: {
     text: '待审核',
-    status: 'pending',
+    status: 'warning',
   },
   private: {
     text: '私有',
-    status: 'private',
+    status: 'warning',
   },
   trash: {
     text: '已删除',
     status: 'error',
   },
   'auto-draft': {
-    text: '自动草稿',
-    status: 'auto-draft',
+    text: '字段草稿',
+    status: 'default',
   },
   future: {
     text: '定时发布',
@@ -33,22 +33,7 @@ export const PRODUCT_STATUS_ENUM: ProSchemaValueEnumObj = {
   },
   inherit: {
     text: '继承状态',
-    status: 'inherit',
-  },
-};
-
-export const PRODUCT_STOCK_STATUS_ENUM: ProSchemaValueEnumObj = {
-  instock: {
-    text: '上架',
-    status: 'instock',
-  },
-  outofstock: {
-    text: 'out of stock',
-    status: 'outofstock',
-  },
-  onbackorder: {
-    text: 'on back order',
-    status: 'onbackorder',
+    status: 'default',
   },
 };
 

src/pages/Product/WpList/index.tsx

@@ -1,4 +1,4 @@
-import { PRODUCT_STATUS_ENUM, PRODUCT_STOCK_STATUS_ENUM } from '@/constants';
+import { PRODUCT_STATUS_ENUM } from '@/constants';
 import {
   productcontrollerProductbysku,
   productcontrollerSearchproducts,
@@ -10,7 +10,6 @@ import {
   wpproductcontrollerSyncproducts,
   wpproductcontrollerUpdateproduct,
   wpproductcontrollerUpdatevariation,
-  wpproductcontrollerUpdatewpproductstate,
 } from '@/servers/api/wpProduct';
 import { EditOutlined } from '@ant-design/icons';
 import {
@@ -87,7 +86,6 @@ const List: React.FC = () => {
       render: (_, record) => (
         <>
           <UpdateForm tableRef={actionRef} values={record} />
-          <UpdateStatus tableRef={actionRef} values={record} />
           {record.type === 'simple' && record.sku ? (
             <>
               <Divider type="vertical" />
@@ -234,69 +232,6 @@ const SyncForm: React.FC<{
   );
 };
 
-const UpdateStatus: React.FC<{
-  tableRef: React.MutableRefObject<ActionType | undefined>;
-  values: API.WpProductDTO;
-}> = ({ tableRef, values: initialValues }) => {
-  const { message } = App.useApp();
-  return (
-    <DrawerForm<API.UpdateProductDTO>
-      title="修改产品上下架状态"
-      initialValues={initialValues}
-      trigger={
-        <Button type="primary">
-          <EditOutlined />
-          上下架
-        </Button>
-      }
-      autoFocusFirstInput
-      drawerProps={{
-        destroyOnHidden: true,
-      }}
-      onFinish={async (values) => {
-        console.log('values', values);
-        const { status, stock_status } = values;
-        try {
-          const { success, message: errMsg } =
-            await wpproductcontrollerUpdatewpproductstate(
-              {
-                id: initialValues.id,
-              },
-              { 
-                status,
-                stock_status
-              },
-            );
-          if (!success) {
-            throw new Error(errMsg);
-          }
-          message.success('提交成功');
-          tableRef.current?.reload();
-          return true;
-        } catch (error: any) {
-          message.error(error.message);
-        }
-      }}
-    >
-      <ProForm.Group>
-        <ProFormSelect
-          label="状态"
-          width="lg"
-          name="status"
-          valueEnum={PRODUCT_STATUS_ENUM}
-        />
-         <ProFormSelect
-          label="上下架状态"
-          width="lg"
-          name="stock_status"
-          valueEnum={PRODUCT_STOCK_STATUS_ENUM}
-        />
-      </ProForm.Group>
-    </DrawerForm>
-  );
-};
-
-
 const UpdateForm: React.FC<{
   tableRef: React.MutableRefObject<ActionType | undefined>;
   values: API.WpProductDTO;

src/servers/api/typings.d.ts

@@ -299,7 +299,6 @@ declare namespace API {
 
   type ordercontrollerGetordersalesParams = {
     isSource?: boolean;
-    exceptPackage?: boolean;
     /** 页码 */
     current?: number;
     /** 每页大小 */
@@ -502,7 +501,7 @@ declare namespace API {
     /** sku */
     sku?: string;
     quantity?: number;
-    isPackage?: boolean;
+    exceptPackage?: boolean;
     isYoone?: boolean;
     isZex?: boolean;
     size?: number;
@@ -523,7 +522,7 @@ declare namespace API {
     /** sku */
     sku?: string;
     quantity?: number;
-    isPackage?: boolean;
+    exceptPackage?: boolean;
     isYoone?: boolean;
     isZex?: boolean;
     size?: number;
@@ -857,7 +856,6 @@ declare namespace API {
 
   type QueryOrderSalesDTO = {
     isSource?: boolean;
-    exceptPackage?: boolean;
     /** 页码 */
     current?: number;
     /** 每页大小 */
@@ -1449,10 +1447,6 @@ declare namespace API {
     siteId: string;
   };
 
-  type wpproductcontrollerUpdatewpproductstateParams = {
-    id: number;
-  };
-
   type WpProductDTO = {
     /** ID */
     id: number;
@@ -1474,8 +1468,6 @@ declare namespace API {
       | 'auto-draft'
       | 'future'
       | 'inherit';
-    /** 上下架状态 */
-    stockStatus?: 'instock' | 'outofstock' | 'onbackorder';
     /** 常规价格 */
     regular_price?: number;
     /** 销售价格 */

src/servers/api/wpProduct.ts

@@ -98,22 +98,3 @@ export async function wpproductcontrollerSyncproducts(
     ...(options || {}),
   });
 }
-
-/** 此处后端没有提供注释 POST /wp_product/updateState/${param0} */
-export async function wpproductcontrollerUpdatewpproductstate(
-  // 叠加生成的Param类型 (非body参数swagger默认没有生成对象)
-  params: API.wpproductcontrollerUpdatewpproductstateParams,
-  body: Record<string, any>,
-  options?: { [key: string]: any },
-) {
-  const { id: param0, ...queryParams } = params;
-  return request<API.BooleanRes>(`/wp_product/updateState/${param0}`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'text/plain',
-    },
-    params: { ...queryParams },
-    data: body,
-    ...(options || {}),
-  });
-}