@bit-sun/business-component 1.1.36 → 1.1.37

package/dist/index.esm.js

@@ -2683,7 +2683,7 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       },
       sourceName: 'skuCode'
     }, requestConfigProp);
-    tableSearchForm = [requestConfig.url.includes('v2') ? {
+    tableSearchForm = requestConfig.url.includes('v2') ? [requestConfig.url.includes('v2') ? {
       name: 'qp-skuName-like',
       label: 'SKU名称'
     } : {
@@ -2692,19 +2692,22 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
     }, {
       name: 'qp-skuCode-like',
       label: 'SKU编码'
-    }, {
+    }, requestConfig.url.includes('v2') ? {
       name: 'qp-code-like',
       label: '国际条码'
+    } : {
+      name: 'qp-barCode-like',
+      label: '国际条码'
     }, {
       name: 'qp-itemName-like',
       label: '所属SPU名称'
     }, {
       name: 'qp-itemCode-like',
       label: '所属SPU编码'
-    }, {
+    }, requestConfig.url.includes('v2') ? {
       name: 'qp-externalCode-like',
       label: '外部编码'
-    }, {
+    } : null, requestConfig.url.includes('v2') ? {
       name: 'qp-propertyValueCode-in',
       type: 'businessSearchSelect',
       label: '规格',
@@ -2718,6 +2721,85 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
           }
         }
       }
+    } : null, {
+      name: 'qp-brandId-in',
+      type: 'select',
+      label: '品牌',
+      field: {
+        type: 'select',
+        props: {
+          mode: 'multiple',
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          }
+        }
+      }
+    }, {
+      name: 'qp-categoryId-in',
+      type: 'treeSelect',
+      label: '类目',
+      field: {
+        type: 'treeSelect',
+        props: {
+          treeData: [],
+          treeCheckable: true,
+          showSearch: true,
+          allowClear: true,
+          showArrow: true,
+          treeNodeFilterProp: 'title',
+          treeDefaultExpandAll: true,
+          maxTagCount: 1,
+          placeholder: '请选择',
+          style: {
+            width: '100%'
+          },
+          dropdownStyle: {
+            maxHeight: 400,
+            maxWidth: 100,
+            overflow: 'auto'
+          }
+        }
+      }
+    }, {
+      name: 'qp-classId-in',
+      type: 'select',
+      label: '品类',
+      field: {
+        type: 'select',
+        props: {
+          mode: 'multiple',
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          }
+        }
+      }
+    }] : [{
+      name: 'qp-name-like',
+      label: 'SKU名称'
+    }, {
+      name: 'qp-skuCode-like',
+      label: 'SKU编码'
+    }, {
+      name: 'qp-barCode-like',
+      label: '国际条码'
+    }, {
+      name: 'qp-itemName-like',
+      label: '所属SPU名称'
+    }, {
+      name: 'qp-itemCode-like',
+      label: '所属SPU编码'
     }, {
       name: 'qp-brandId-in',
       type: 'select',
@@ -2793,14 +2875,14 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       pageSize: 5000,
       currentPage: 1
     })]).then(function (x) {
-      formatSource(x, 0, 7, tableSearchForm, ['id', 'name']);
-      formatTreeDataSource(x, 1, 8, tableSearchForm);
-      formatSource(x, 2, 9, tableSearchForm, ['id', 'name']);
+      requestConfig.url.includes('v2') ? formatSource(x, 0, 7, tableSearchForm, ['id', 'name']) : formatSource(x, 0, 5, tableSearchForm, ['id', 'name']);
+      requestConfig.url.includes('v2') ? formatTreeDataSource(x, 1, 8, tableSearchForm) : formatTreeDataSource(x, 1, 6, tableSearchForm);
+      requestConfig.url.includes('v2') ? formatSource(x, 2, 9, tableSearchForm, ['id', 'name']) : formatSource(x, 2, 7, tableSearchForm, ['id', 'name']);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择SKU',
       tableSearchForm: tableSearchForm,
-      tableColumns: [{
+      tableColumns: requestConfig.url.includes('v2') ? [{
         title: 'SKU编码',
         dataIndex: 'skuCode'
       }, {
@@ -2815,12 +2897,39 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       }, {
         title: '所属SPU编码',
         dataIndex: 'itemCode'
-      }, {
+      }, requestConfig.url.includes('v2') ? {
         title: '外部编码',
         dataIndex: 'externalCode'
+      } : false, {
+        title: '规格',
+        dataIndex: requestConfig.url.includes('v2') ? 'propertyNameAndValue' : 'skuSpec'
+      }, {
+        title: '类目',
+        dataIndex: 'categoryName'
+      }, {
+        title: '品类',
+        dataIndex: 'className'
+      }, {
+        title: '品牌',
+        dataIndex: 'brandName'
+      }] : [{
+        title: 'SKU编码',
+        dataIndex: 'skuCode'
+      }, {
+        title: 'SKU名称',
+        dataIndex: 'name'
+      }, {
+        title: '国际条码',
+        dataIndex: 'barCode'
+      }, {
+        title: '所属SPU名称',
+        dataIndex: 'itemName'
+      }, {
+        title: '所属SPU编码',
+        dataIndex: 'itemCode'
       }, {
         title: '规格',
-        dataIndex: 'propertyNameAndValue'
+        dataIndex: 'skuSpec'
       }, {
         title: '类目',
         dataIndex: 'categoryName'

package/dist/index.js

@@ -2694,7 +2694,7 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       },
       sourceName: 'skuCode'
     }, requestConfigProp);
-    tableSearchForm = [requestConfig.url.includes('v2') ? {
+    tableSearchForm = requestConfig.url.includes('v2') ? [requestConfig.url.includes('v2') ? {
       name: 'qp-skuName-like',
       label: 'SKU名称'
     } : {
@@ -2703,19 +2703,22 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
     }, {
       name: 'qp-skuCode-like',
       label: 'SKU编码'
-    }, {
+    }, requestConfig.url.includes('v2') ? {
       name: 'qp-code-like',
       label: '国际条码'
+    } : {
+      name: 'qp-barCode-like',
+      label: '国际条码'
     }, {
       name: 'qp-itemName-like',
       label: '所属SPU名称'
     }, {
       name: 'qp-itemCode-like',
       label: '所属SPU编码'
-    }, {
+    }, requestConfig.url.includes('v2') ? {
       name: 'qp-externalCode-like',
       label: '外部编码'
-    }, {
+    } : null, requestConfig.url.includes('v2') ? {
       name: 'qp-propertyValueCode-in',
       type: 'businessSearchSelect',
       label: '规格',
@@ -2729,6 +2732,85 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
           }
         }
       }
+    } : null, {
+      name: 'qp-brandId-in',
+      type: 'select',
+      label: '品牌',
+      field: {
+        type: 'select',
+        props: {
+          mode: 'multiple',
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          }
+        }
+      }
+    }, {
+      name: 'qp-categoryId-in',
+      type: 'treeSelect',
+      label: '类目',
+      field: {
+        type: 'treeSelect',
+        props: {
+          treeData: [],
+          treeCheckable: true,
+          showSearch: true,
+          allowClear: true,
+          showArrow: true,
+          treeNodeFilterProp: 'title',
+          treeDefaultExpandAll: true,
+          maxTagCount: 1,
+          placeholder: '请选择',
+          style: {
+            width: '100%'
+          },
+          dropdownStyle: {
+            maxHeight: 400,
+            maxWidth: 100,
+            overflow: 'auto'
+          }
+        }
+      }
+    }, {
+      name: 'qp-classId-in',
+      type: 'select',
+      label: '品类',
+      field: {
+        type: 'select',
+        props: {
+          mode: 'multiple',
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          }
+        }
+      }
+    }] : [{
+      name: 'qp-name-like',
+      label: 'SKU名称'
+    }, {
+      name: 'qp-skuCode-like',
+      label: 'SKU编码'
+    }, {
+      name: 'qp-barCode-like',
+      label: '国际条码'
+    }, {
+      name: 'qp-itemName-like',
+      label: '所属SPU名称'
+    }, {
+      name: 'qp-itemCode-like',
+      label: '所属SPU编码'
     }, {
       name: 'qp-brandId-in',
       type: 'select',
@@ -2804,14 +2886,14 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       pageSize: 5000,
       currentPage: 1
     })]).then(function (x) {
-      formatSource(x, 0, 7, tableSearchForm, ['id', 'name']);
-      formatTreeDataSource(x, 1, 8, tableSearchForm);
-      formatSource(x, 2, 9, tableSearchForm, ['id', 'name']);
+      requestConfig.url.includes('v2') ? formatSource(x, 0, 7, tableSearchForm, ['id', 'name']) : formatSource(x, 0, 5, tableSearchForm, ['id', 'name']);
+      requestConfig.url.includes('v2') ? formatTreeDataSource(x, 1, 8, tableSearchForm) : formatTreeDataSource(x, 1, 6, tableSearchForm);
+      requestConfig.url.includes('v2') ? formatSource(x, 2, 9, tableSearchForm, ['id', 'name']) : formatSource(x, 2, 7, tableSearchForm, ['id', 'name']);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择SKU',
       tableSearchForm: tableSearchForm,
-      tableColumns: [{
+      tableColumns: requestConfig.url.includes('v2') ? [{
         title: 'SKU编码',
         dataIndex: 'skuCode'
       }, {
@@ -2826,12 +2908,39 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       }, {
         title: '所属SPU编码',
         dataIndex: 'itemCode'
-      }, {
+      }, requestConfig.url.includes('v2') ? {
         title: '外部编码',
         dataIndex: 'externalCode'
+      } : false, {
+        title: '规格',
+        dataIndex: requestConfig.url.includes('v2') ? 'propertyNameAndValue' : 'skuSpec'
+      }, {
+        title: '类目',
+        dataIndex: 'categoryName'
+      }, {
+        title: '品类',
+        dataIndex: 'className'
+      }, {
+        title: '品牌',
+        dataIndex: 'brandName'
+      }] : [{
+        title: 'SKU编码',
+        dataIndex: 'skuCode'
+      }, {
+        title: 'SKU名称',
+        dataIndex: 'name'
+      }, {
+        title: '国际条码',
+        dataIndex: 'barCode'
+      }, {
+        title: '所属SPU名称',
+        dataIndex: 'itemName'
+      }, {
+        title: '所属SPU编码',
+        dataIndex: 'itemCode'
       }, {
         title: '规格',
-        dataIndex: 'propertyNameAndValue'
+        dataIndex: 'skuSpec'
       }, {
         title: '类目',
         dataIndex: 'categoryName'

package/package.json

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

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

@@ -177,14 +177,14 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
       sourceName: 'skuCode',
       ...requestConfigProp,
     }
-    tableSearchForm = [
+    tableSearchForm = requestConfig.url.includes('v2') ? [
       requestConfig.url.includes('v2') ? { name: 'qp-skuName-like', label: 'SKU名称' } : { name: 'qp-name-like', label: 'SKU名称' },
       { name: 'qp-skuCode-like', label: 'SKU编码' },
-      { name: 'qp-code-like', label: '国际条码' },
+      requestConfig.url.includes('v2') ? { name: 'qp-code-like', label: '国际条码' } : { name: 'qp-barCode-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: {
+      requestConfig.url.includes('v2') ?{ name: 'qp-externalCode-like', label: '外部编码' } : null,
+      requestConfig.url.includes('v2') ? { name: 'qp-propertyValueCode-in', type: 'businessSearchSelect', label: '规格', field: {
           type: 'businessSearchSelect',
           props: {
             selectBusinessType: 'skuPropertyValue',
@@ -194,7 +194,59 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
             }
           },
         }
-      },
+      } : null,
+      { name: 'qp-brandId-in', type: 'select', label: '品牌', field: {
+          type: 'select',
+          props: {
+            mode: 'multiple',
+            notFoundContent: '暂无数据',
+            allowClear: true,
+            showSearch: true,
+            showArrow: true,
+            maxTagCount: 1,
+            optionFilterProp: 'children',
+            filterOption: (input: string, option: { props: { children: string } }) =>
+              option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
+          },
+        } },
+      { name: 'qp-categoryId-in', type: 'treeSelect', label: '类目', field: {
+          type: 'treeSelect',
+          props: {
+            treeData: [],
+            treeCheckable: true,
+            showSearch: true,
+            allowClear: true,
+            showArrow: true,
+            treeNodeFilterProp: 'title',
+            treeDefaultExpandAll: true,
+            maxTagCount: 1,
+            placeholder: '请选择',
+            style: {
+              width: '100%',
+            },
+            dropdownStyle: { maxHeight: 400, maxWidth: 100, overflow: 'auto' }
+          },
+        } },
+      { name: 'qp-classId-in', type: 'select', label: '品类', field: {
+          type: 'select',
+          props: {
+            mode: 'multiple',
+            notFoundContent: '暂无数据',
+            allowClear: true,
+            showSearch: true,
+            showArrow: true,
+            maxTagCount: 1,
+            optionFilterProp: 'children',
+            filterOption: (input: string, option: { props: { children: string } }) =>
+              option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
+          },
+        } },
+    ] : [
+      { name: 'qp-name-like', label: 'SKU名称' },
+      { name: 'qp-skuCode-like', label: 'SKU编码' },
+      { name: 'qp-barCode-like', label: '国际条码'},
+      { name: 'qp-itemName-like', label: '所属SPU名称' },
+      { name: 'qp-itemCode-like', label: '所属SPU编码' },
       { name: 'qp-brandId-in', type: 'select', label: '品牌', field: {
           type: 'select',
           props: {
@@ -256,14 +308,14 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
         currentPage: 1,
       }),
     ]).then((x: any)=>{
-      formatSource(x,0, 7, tableSearchForm,['id','name']);
-      formatTreeDataSource(x,1, 8, tableSearchForm);
-      formatSource(x,2, 9, tableSearchForm,['id','name']);
+      requestConfig.url.includes('v2') ? formatSource(x,0, 7, tableSearchForm,['id','name']) : formatSource(x,0, 5, tableSearchForm,['id','name'])
+      requestConfig.url.includes('v2') ? formatTreeDataSource(x,1, 8, tableSearchForm) : formatTreeDataSource(x,1, 6, tableSearchForm)
+      requestConfig.url.includes('v2') ? formatSource(x,2, 9, tableSearchForm,['id','name']) : formatSource(x,2, 7, tableSearchForm,['id','name'])
     })
     modalTableProps = {
       modalTableTitle: '选择SKU',
       tableSearchForm,
-      tableColumns: [
+      tableColumns: requestConfig.url.includes('v2') ? [
         {
           title: 'SKU编码',
           dataIndex: 'skuCode',
@@ -284,13 +336,50 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
           title: '所属SPU编码',
           dataIndex: 'itemCode',
         },
-        {
+        requestConfig.url.includes('v2') ? {
           title: '外部编码',
           dataIndex: 'externalCode',
+        } : false,
+        {
+          title: '规格',
+          dataIndex: requestConfig.url.includes('v2') ? 'propertyNameAndValue' : 'skuSpec',
+        },
+        {
+          title: '类目',
+          dataIndex: 'categoryName',
+        },
+        {
+          title: '品类',
+          dataIndex: 'className',
+        },
+        {
+          title: '品牌',
+          dataIndex: 'brandName',
+        },
+      ] : [
+        {
+          title: 'SKU编码',
+          dataIndex: 'skuCode',
+        },
+        {
+          title: 'SKU名称',
+          dataIndex: 'name',
+        },
+        {
+          title: '国际条码',
+          dataIndex: 'barCode',
+        },
+        {
+          title: '所属SPU名称',
+          dataIndex: 'itemName',
+        },
+        {
+          title: '所属SPU编码',
+          dataIndex: 'itemCode',
         },
         {
           title: '规格',
-          dataIndex: 'propertyNameAndValue',
+          dataIndex: 'skuSpec',
         },
         {
           title: '类目',