@bit-sun/business-component 1.1.26 → 1.1.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "1.1.26",
+  "version": "1.1.29",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/Business/SearchSelect/BusinessUtils.ts

@@ -6,7 +6,7 @@ import { getDictionarySource, getDictionaryTextByValue, loadSelectSource } from
 const hasDictSharingType =  getDictionarySource('UC000013')?.length;
 const sharingTypeDataList = hasDictSharingType && getDictionarySource('UC000013') || sharingType
 
-export function commonFun (type?: string, prefixUrl: any) {
+export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: any, modalTableBusProps?:any) {
   // 默认type === 'supplier' 供应商选择器
   let requestConfig = {
     url: `${prefixUrl.selectPrefix}/supplier`,
@@ -14,6 +14,7 @@ export function commonFun (type?: string, prefixUrl: any) {
     otherParams: {
       sorter: 'desc-id'
     }, // 默认参数
+    ...requestConfigProp
   }
 
   /*
@@ -155,29 +156,45 @@ export function commonFun (type?: string, prefixUrl: any) {
         dataIndex: 'sharingType',
         render: (text: number) => hasDictSharingType ? getDictionaryTextByValue('UC000013', text) : sharingType.find((i: any) => i.value === text)?.text
       },
-    ]
+    ],
+    ...modalTableBusProps,
   }
   let needModalTable = true;
 
   // 商品选择器
   if(type === 'skuCommodity') {
     requestConfig = {
-      url: `${prefixUrl.selectPrefix}/sku`,
-      filter: 'qp-name,skuCode-orGroup,like', // 过滤参数
+      url: `${prefixUrl.selectPrefix}/sku/pager/v2`,
+      filter: 'skuCodeAndSkuName', // 过滤参数
       mappingTextField: 'name',
       mappingValueField: 'skuCode',
+      mappingTextShowTextField: ['name', 'propertyNameAndValue'],
       otherParams: {
-        'qp-approveStatus-eq':2,
+        'qp-approveStatus-eq': 1,
+        'qp-type-eq': 10, // 查唯一国际条码
         sorter: 'desc-id'
       }, // 默认参数
       sourceName: 'skuCode',
+      ...requestConfigProp,
     }
     tableSearchForm = [
-      { name: 'qp-name-like', label: 'SKU名称' },
+      { name: 'qp-skuName-like', label: 'SKU名称' },
       { name: 'qp-skuCode-like', label: 'SKU编码' },
-      { name: 'qp-barCode-like', label: '条形码' },
+      { name: 'qp-code-like', label: '国际条码' },
       { name: 'qp-itemName-like', label: '所属SPU名称' },
       { name: 'qp-itemCode-like', label: '所属SPU编码' },
+      { name: 'qp-externalCode-like', label: '外部编码' },
+      { name: 'qp-propertyValueCode-in', type: 'businessSearchSelect', label: '规格', field: {
+          type: 'businessSearchSelect',
+          props: {
+            selectBusinessType: 'skuPropertyValue',
+            selectProps: {
+              mode: 'multiple',
+              maxTagCount: 1,
+            }
+          },
+        }
+      },
       { name: 'qp-brandId-in', type: 'select', label: '品牌', field: {
           type: 'select',
           props: {
@@ -239,9 +256,9 @@ export function commonFun (type?: string, prefixUrl: any) {
         currentPage: 1,
       }),
     ]).then((x: any)=>{
-      formatSource(x,0, 5, tableSearchForm,['id','name']);
-      formatTreeDataSource(x,1, 6, tableSearchForm);
-      formatSource(x,2, 7, tableSearchForm,['id','name']);
+      formatSource(x,0, 7, tableSearchForm,['id','name']);
+      formatTreeDataSource(x,1, 8, tableSearchForm);
+      formatSource(x,2, 9, tableSearchForm,['id','name']);
     })
     modalTableProps = {
       modalTableTitle: '选择SKU',
@@ -256,12 +273,24 @@ export function commonFun (type?: string, prefixUrl: any) {
           dataIndex: 'name',
         },
         {
-          title: '所属SPU',
+          title: '国际条码',
+          dataIndex: 'barCode',
+        },
+        {
+          title: '所属SPU名称',
           dataIndex: 'itemName',
         },
+        {
+          title: '所属SPU编码',
+          dataIndex: 'itemCode',
+        },
+        {
+          title: '外部编码',
+          dataIndex: 'externalCode',
+        },
         {
           title: '规格',
-          dataIndex: 'skuSpec',
+          dataIndex: 'propertyNameAndValue',
         },
         {
           title: '类目',
@@ -275,14 +304,28 @@ export function commonFun (type?: string, prefixUrl: any) {
           title: '品牌',
           dataIndex: 'brandName',
         },
-        {
-          title: '条形码',
-          dataIndex: 'barCode',
-        },
-      ]
+      ],
+      ...modalTableBusProps
     }
   }
 
+  // 商品规格选择器（无弹窗）
+  if(type === 'skuPropertyValue') {
+    requestConfig = {
+      url: `${prefixUrl.selectPrefix}/skuPropertyValue/list`,
+      filter: 'qp-value-like', // 过滤参数
+      mappingTextField: 'value',
+      mappingTextShowKeyField: 'propertyValueCode',
+      mappingValueField: 'propertyValueCode',
+      otherParams: {
+        sorter: 'desc-id'
+      }, // 默认参数
+      sourceName: 'qp-propertyValueCode-in',
+      ...requestConfigProp,
+    }
+    needModalTable = false
+  }
+
   // 仓库选择器（物理、逻辑仓）
   if(type === 'physicalWarehouse') {
     requestConfig = {
@@ -296,6 +339,7 @@ export function commonFun (type?: string, prefixUrl: any) {
         sorter: 'desc-id'
       }, // 默认参数
       sourceName: 'warehouseIds',
+      ...requestConfigProp,
     }
     tableSearchForm = [
       { name: 'qp-physicalWarehouseName-like', label: '物理仓名称' },
@@ -346,7 +390,8 @@ export function commonFun (type?: string, prefixUrl: any) {
           title: '所属公司',
           dataIndex: 'companyName',
         },
-      ]
+      ],
+      ...modalTableBusProps
     }
   }
   if(type === 'realWarehouse') {
@@ -361,6 +406,7 @@ export function commonFun (type?: string, prefixUrl: any) {
         sorter: 'desc-id'
       }, // 默认参数
       sourceName: 'warehouseIds',
+      ...requestConfigProp,
     }
     tableSearchForm = [
       { name: 'qp-realWarehouseName-like', label: '逻辑仓名称' },
@@ -384,7 +430,8 @@ export function commonFun (type?: string, prefixUrl: any) {
           dataIndex: 'realWarehouseType',
           render: (text: number) => getDictionaryTextByValue('SC00004', text),
         },
-      ]
+      ],
+      ...modalTableBusProps,
     }
   }
 
@@ -401,6 +448,7 @@ export function commonFun (type?: string, prefixUrl: any) {
         sorter: 'desc-id'
       }, // 默认参数
       sourceName: 'warehouseIds',
+      ...requestConfigProp,
     }
     needModalTable = false
   }
@@ -416,6 +464,7 @@ export function commonFun (type?: string, prefixUrl: any) {
         sorter: 'desc-id'
       }, // 默认参数
       sourceName: 'warehouseIds',
+      ...requestConfigProp,
     }
     needModalTable = false
   }
@@ -431,6 +480,7 @@ export function commonFun (type?: string, prefixUrl: any) {
         sorter: 'desc-id'
       }, // 默认参数
       sourceName: 'customCode',
+      ...requestConfigProp,
     }
     tableSearchForm = [
       { name: 'qp-name-like', label: '客户名称' },
@@ -528,7 +578,8 @@ export function commonFun (type?: string, prefixUrl: any) {
           dataIndex: 'sharingType',
           render: (text: number) => hasDictSharingType ? getDictionaryTextByValue('UC000013', text) : sharingType.find((i: any) => i.value === text)?.text,
         },
-      ]
+      ],
+      ...modalTableBusProps
     }
   }
 
@@ -543,6 +594,7 @@ export function commonFun (type?: string, prefixUrl: any) {
         sorter: 'desc-id'
       }, // 默认参数
       sourceName: 'code',
+      ...requestConfigProp,
     }
     tableSearchForm = [
       { name: 'qp-name-like', label: '店铺名称' },
@@ -664,7 +716,8 @@ export function commonFun (type?: string, prefixUrl: any) {
           title: '归属核算主体',
           dataIndex: 'accountingName',
         },
-      ]
+      ],
+      ...modalTableBusProps
     }
   }
 
@@ -680,6 +733,7 @@ export function commonFun (type?: string, prefixUrl: any) {
         sorter: 'desc-id'
       }, // 默认参数
       sourceName: 'accountingSubjectCode',
+      ...requestConfigProp,
     }
     needModalTable = false
   }
@@ -695,6 +749,7 @@ export function commonFun (type?: string, prefixUrl: any) {
         sorter: 'desc-id'
       }, // 默认参数
       sourceName: 'inventoryOrgCode',
+      ...requestConfigProp,
     }
     needModalTable = false
   }
@@ -710,6 +765,7 @@ export function commonFun (type?: string, prefixUrl: any) {
         sorter: 'desc-id'
       }, // 默认参数
       sourceName: 'corporationCompany',
+      ...requestConfigProp,
     }
     needModalTable = false
   }
@@ -718,7 +774,7 @@ export function commonFun (type?: string, prefixUrl: any) {
   if(type === 'employee') {
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/employee/v2`,
-      filter: 'qp-name,employeeNumber-orGroup,like', // 过滤参数
+      filter: 'qp-employeeNumber,name-orGroup,like', // 过滤参数
       mappingTextField: 'name',
       mappingTextShowKeyField: 'employeeNumber',
       mappingValueField: 'employeeNumber',
@@ -727,6 +783,7 @@ export function commonFun (type?: string, prefixUrl: any) {
         sorter: 'desc-id'
       }, // 默认参数
       sourceName: 'employeeNumber',
+      ...requestConfigProp,
     }
     tableSearchForm = [
       { name: 'qp-name-like', label: '员工名称' },
@@ -781,7 +838,8 @@ export function commonFun (type?: string, prefixUrl: any) {
           title: '手机号',
           dataIndex: 'officeTelephone',
         },
-      ]
+      ],
+      ...modalTableBusProps
     }
   }
 
@@ -797,6 +855,7 @@ export function commonFun (type?: string, prefixUrl: any) {
         sorter: 'desc-id'
       }, // 默认参数
       sourceName: 'deliveryModeCode',
+      ...requestConfigProp
     }
     tableSearchForm = [
       { name: 'qp-name-like', label: '配送方式名称' },
@@ -880,7 +939,8 @@ export function commonFun (type?: string, prefixUrl: any) {
           dataIndex: 'remark',
           title: '备注',
         },
-      ]
+      ],
+      ...modalTableBusProps
     }
   }
 

package/src/components/Business/SearchSelect/index.md

@@ -110,8 +110,8 @@ export default () => {
       setValue(value)
     },
     // requestConfig: {
-    //   url: `/bop/api/sku`,
-    //   filter: 'qp-name,skuCode-orGroup,like',
+    //   url: `/bop/api/sku/pager/v2`,
+    //   filter: 'skuCodeAndSkuName',
     //   mappingValueField: 'skuCode',
     //   otherParams: {
     //     sorter: 'desc-id'
@@ -147,6 +147,107 @@ export default () => {
 };
 ```
 
+[comment]: <> (## 商品规格选择器 Select-SPGG-001)
+
+[comment]: <> (```tsx)
+
+[comment]: <> (import React, { useState } from 'react';)
+
+[comment]: <> (import { Tabs } from 'antd';)
+
+[comment]: <> (import {BusinessSearchSelect} from '../../../index.ts';)
+
+[comment]: <> (const { TabPane } = Tabs;)
+
+[comment]: <> (export default &#40;&#41; => {)
+
+[comment]: <> (  const selectProps = {)
+
+[comment]: <> (    // mode: 'multiple',)
+
+[comment]: <> (    // maxTagCount: 1,)
+
+[comment]: <> (    // disabled: true)
+
+[comment]: <> (  })
+
+[comment]: <> (  const selectPropsMultiple = {)
+
+[comment]: <> (    mode: 'multiple',)
+
+[comment]: <> (    maxTagCount: 1,)
+
+[comment]: <> (  })
+
+[comment]: <> (  const [ tabKey, setTabKey ] = useState&#40;'single'&#41;)
+
+[comment]: <> (  const [value, setValue] = useState&#40;selectProps?.mode ? [] : null&#41;;)
+  
+[comment]: <> (  const props = {)
+
+[comment]: <> (    value,)
+
+[comment]: <> (    onChange: &#40;value: any&#41; => {)
+
+[comment]: <> (      console.log&#40;value&#41;)
+
+[comment]: <> (      setValue&#40;value&#41;)
+
+[comment]: <> (    },)
+
+[comment]: <> (    prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },)
+
+[comment]: <> (    selectProps,)
+
+[comment]: <> (    selectBusinessType: 'skuPropertyValue',)
+
+[comment]: <> (  };)
+
+[comment]: <> (  const onTabChange = &#40;key&#41; => {)
+
+[comment]: <> (    setTabKey&#40;key&#41;)
+
+[comment]: <> (    setValue&#40;key === 'single' ? null: []&#41;)
+
+[comment]: <> (  })
+  
+[comment]: <> (  return &#40;)
+
+[comment]: <> (    <div>)
+
+[comment]: <> (      <Tabs onChange={onTabChange} activeKey={tabKey}>)
+
+[comment]: <> (        <TabPane tab='单选' key='single'>)
+
+[comment]: <> (          {tabKey === 'single' && &#40;)
+
+[comment]: <> (            <BusinessSearchSelect {...props} />)
+
+[comment]: <> (          &#41;})
+
+[comment]: <> (        </TabPane>)
+
+[comment]: <> (        <TabPane tab='多选' key='multiple'>)
+
+[comment]: <> (          {tabKey === 'multiple' && &#40;)
+
+[comment]: <> (            <BusinessSearchSelect {...props} selectProps={selectPropsMultiple} />)
+
+[comment]: <> (          &#41;})
+
+[comment]: <> (        </TabPane>)
+
+[comment]: <> (      </Tabs>)
+
+[comment]: <> (    </div>)
+
+[comment]: <> (  &#41;;)
+
+[comment]: <> (};)
+
+[comment]: <> (```)
+
+
 ## 仓库选择器(物理仓) Select-Warehouse-001
 
 ```tsx
@@ -177,14 +278,11 @@ export default () => {
       setValue(value)
     },
     // requestConfig: {
-    //   url: `/bop/api/physicalWarehouse`,
-    //   filter: 'qp-physicalWarehouseName,physicalWarehouseCode-orGroup,like',
-    //   mappingTextField: 'physicalWarehouseName',
     //   mappingValueField: 'physicalWarehouseCode',
-    //   otherParams: {
-    //     sorter: 'desc-id'
-    //   }, // 默认参数
-    //   sourceName: 'warehouseIds',
+    //   sourceName: 'physicalWarehouseCode',
+    // },
+    // modalTableProps: {
+    //   modalTableTitle: '选择物理仓-更改title测试',
     // },
     prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
     selectProps,

package/src/components/Business/SearchSelect/index.tsx

@@ -1,5 +1,5 @@
 /*
- * @Description: 
+ * @Description:
  * @Author: rodchen
  * @Date: 2022-05-07 15:17:28
  * @LastEditTime: 2022-05-08 21:01:21
@@ -15,15 +15,15 @@ const  BusinessSearchSelect = (props: any) => {
   const businessType = props?.selectBusinessType || 'supplier';
   const prefixUrl = props?.prefixUrl || { selectPrefix: '/bop/api', formSelectFix: '/bop/api' };
 
-  const { requestConfig, modalTableProps, needModalTable } = commonFun(businessType, prefixUrl);
+  const { requestConfig, modalTableProps, needModalTable } = commonFun(businessType, prefixUrl,props?.requestConfig || {}, props?.modalTableProps || {});
   const currentProps = useMemo(() => {
     return {
-      requestConfig,
       ...props,
+      requestConfig,
       needModalTable,
       modalTableProps
     }
-  }, [])
+  }, [props?.value])
 
   return (
     <div>
@@ -32,4 +32,12 @@ const  BusinessSearchSelect = (props: any) => {
   );
 };
 
-export default React.memo(BusinessSearchSelect, () => true);
+export default React.memo(BusinessSearchSelect, (props, nextProps) => {
+  if(props && props.labelInValue && props.value && JSON.stringify(props.value) !== JSON.stringify(nextProps.value)) {
+    return false
+  }
+  if(props && props.value !== nextProps.value) {
+    return false
+  }
+  return true
+});