@bit-sun/business-component 1.1.31 → 1.1.34

package/dist/index.esm.js

@@ -1657,7 +1657,7 @@ var itemsTemp = []; // const mapping = [
 //   { "key": "price", "name": "单价", "rule": "price" }
 // ]
 
-var mapping = new Map([['skuCode', 'SKU编码'], ['quantity', '数量'], ['price', '单价'], ['regionCode', '库区'], ['checkQuantity', '实盘数量'], ['shareRatio', '共享比例'], ['lotNumberCode', '批号'], ['warehouseCode', '仓库编码'], ['regionCode', '库区'], ['rowNumber', '货位排数'], ['layerNumber', '货位层数'], ['gridNumber', '货位格号']]); // for dnd
+var mapping = new Map([['skuCode', 'SKU编码'], ['quantity', '数量'], ['price', '单价'], ['regionCode', '库区'], ['checkQuantity', '实盘数量'], ['shareRatio', '共享比例'], ['lotNumberCode', '批号'], ['warehouseCode', '仓库编码'], ['regionCode', '库区'], ['locationCode', '货位'], ['rowNumber', '货位排数'], ['layerNumber', '货位层数'], ['gridNumber', '货位格号']]); // for dnd
 
 
 var reorder = function reorder(list, startIndex, endIndex) {
@@ -2665,7 +2665,7 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
     }]
   }, modalTableBusProps);
 
-  var needModalTable = true; // 商品选择器
+  var needModalTable = true; // 商品选择器sku
 
   if (type === 'skuCommodity') {
     requestConfig = _objectSpread2({
@@ -2827,6 +2827,126 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
         dataIndex: 'brandName'
       }]
     }, modalTableBusProps);
+  } // 商品选择器spu
+
+
+  if (type === 'spuCommodity') {
+    requestConfig = _objectSpread2({
+      url: "".concat(prefixUrl.selectPrefix, "/item"),
+      filter: 'qp-itemCode,name-orGroup,like',
+      mappingTextField: 'name',
+      mappingValueField: 'itemCode',
+      otherParams: {
+        'qp-approveStatus-eq': 1,
+        sorter: 'desc-id'
+      },
+      sourceName: 'itemCode'
+    }, requestConfigProp);
+    tableSearchForm = [{
+      name: 'qp-name-like',
+      label: 'SPU名称'
+    }, {
+      name: 'qp-itemCode-like',
+      label: 'SPU编码'
+    }, {
+      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;
+          }
+        }
+      }
+    }];
+    Promise.all([loadSelectSource("".concat(prefixUrl.formSelectFix, "/brand/queryBrandList"), {
+      pageSize: 5000,
+      currentPage: 1
+    }), loadSelectSource("".concat(prefixUrl.formSelectFix, "/category/queryCategoryTree"), {
+      pageSize: 5000,
+      currentPage: 1
+    }), loadSelectSource("".concat(prefixUrl.formSelectFix, "/class/withProperty"), {
+      pageSize: 5000,
+      currentPage: 1
+    })]).then(function (x) {
+      formatSource(x, 0, 2, tableSearchForm, ['id', 'name']);
+      formatTreeDataSource(x, 1, 3, tableSearchForm);
+      formatSource(x, 2, 4, tableSearchForm, ['id', 'name']);
+    });
+    modalTableProps = _objectSpread2({
+      modalTableTitle: '选择SPU',
+      tableSearchForm: tableSearchForm,
+      tableColumns: [{
+        title: 'SPU编码',
+        dataIndex: 'itemCode'
+      }, {
+        title: 'SPU名称',
+        dataIndex: 'name'
+      }, {
+        title: '品牌',
+        dataIndex: 'brandName'
+      }, {
+        title: '类目',
+        dataIndex: 'categoryText'
+      }, {
+        title: '品类',
+        dataIndex: 'className'
+      }]
+    }, modalTableBusProps);
   } // 商品规格选择器（无弹窗）
 
 
@@ -4517,7 +4637,7 @@ var itemsTemp$1 = []; // const mapping = [
 //   { "key": "price", "name": "单价", "rule": "price" }
 // ]
 
-var mapping$1 = new Map([['skuCode', 'SKU编码'], ['quantity', '数量'], ['price', '单价'], ['regionCode', '库区'], ['checkQuantity', '实盘数量'], ['shareRatio', '共享比例'], ['lotNumberCode', '批号'], ['warehouseCode', '仓库编码'], ['regionCode', '库区'], ['rowNumber', '货位排数'], ['layerNumber', '货位层数'], ['gridNumber', '货位格号']]); // for dnd
+var mapping$1 = new Map([['skuCode', 'SKU编码'], ['quantity', '数量'], ['price', '单价'], ['regionCode', '库区'], ['checkQuantity', '实盘数量'], ['shareRatio', '共享比例'], ['lotNumberCode', '批号'], ['warehouseCode', '仓库编码'], ['regionCode', '库区'], ['locationCode', '货位'], ['rowNumber', '货位排数'], ['layerNumber', '货位层数'], ['gridNumber', '货位格号']]); // for dnd
 
 
 var reorder$1 = function reorder(list, startIndex, endIndex) {

package/dist/index.js

@@ -1668,7 +1668,7 @@ var itemsTemp = []; // const mapping = [
 //   { "key": "price", "name": "单价", "rule": "price" }
 // ]
 
-var mapping = new Map([['skuCode', 'SKU编码'], ['quantity', '数量'], ['price', '单价'], ['regionCode', '库区'], ['checkQuantity', '实盘数量'], ['shareRatio', '共享比例'], ['lotNumberCode', '批号'], ['warehouseCode', '仓库编码'], ['regionCode', '库区'], ['rowNumber', '货位排数'], ['layerNumber', '货位层数'], ['gridNumber', '货位格号']]); // for dnd
+var mapping = new Map([['skuCode', 'SKU编码'], ['quantity', '数量'], ['price', '单价'], ['regionCode', '库区'], ['checkQuantity', '实盘数量'], ['shareRatio', '共享比例'], ['lotNumberCode', '批号'], ['warehouseCode', '仓库编码'], ['regionCode', '库区'], ['locationCode', '货位'], ['rowNumber', '货位排数'], ['layerNumber', '货位层数'], ['gridNumber', '货位格号']]); // for dnd
 
 
 var reorder = function reorder(list, startIndex, endIndex) {
@@ -2676,7 +2676,7 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
     }]
   }, modalTableBusProps);
 
-  var needModalTable = true; // 商品选择器
+  var needModalTable = true; // 商品选择器sku
 
   if (type === 'skuCommodity') {
     requestConfig = _objectSpread2({
@@ -2838,6 +2838,126 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
         dataIndex: 'brandName'
       }]
     }, modalTableBusProps);
+  } // 商品选择器spu
+
+
+  if (type === 'spuCommodity') {
+    requestConfig = _objectSpread2({
+      url: "".concat(prefixUrl.selectPrefix, "/item"),
+      filter: 'qp-itemCode,name-orGroup,like',
+      mappingTextField: 'name',
+      mappingValueField: 'itemCode',
+      otherParams: {
+        'qp-approveStatus-eq': 1,
+        sorter: 'desc-id'
+      },
+      sourceName: 'itemCode'
+    }, requestConfigProp);
+    tableSearchForm = [{
+      name: 'qp-name-like',
+      label: 'SPU名称'
+    }, {
+      name: 'qp-itemCode-like',
+      label: 'SPU编码'
+    }, {
+      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;
+          }
+        }
+      }
+    }];
+    Promise.all([loadSelectSource("".concat(prefixUrl.formSelectFix, "/brand/queryBrandList"), {
+      pageSize: 5000,
+      currentPage: 1
+    }), loadSelectSource("".concat(prefixUrl.formSelectFix, "/category/queryCategoryTree"), {
+      pageSize: 5000,
+      currentPage: 1
+    }), loadSelectSource("".concat(prefixUrl.formSelectFix, "/class/withProperty"), {
+      pageSize: 5000,
+      currentPage: 1
+    })]).then(function (x) {
+      formatSource(x, 0, 2, tableSearchForm, ['id', 'name']);
+      formatTreeDataSource(x, 1, 3, tableSearchForm);
+      formatSource(x, 2, 4, tableSearchForm, ['id', 'name']);
+    });
+    modalTableProps = _objectSpread2({
+      modalTableTitle: '选择SPU',
+      tableSearchForm: tableSearchForm,
+      tableColumns: [{
+        title: 'SPU编码',
+        dataIndex: 'itemCode'
+      }, {
+        title: 'SPU名称',
+        dataIndex: 'name'
+      }, {
+        title: '品牌',
+        dataIndex: 'brandName'
+      }, {
+        title: '类目',
+        dataIndex: 'categoryText'
+      }, {
+        title: '品类',
+        dataIndex: 'className'
+      }]
+    }, modalTableBusProps);
   } // 商品规格选择器（无弹窗）
 
 
@@ -4528,7 +4648,7 @@ var itemsTemp$1 = []; // const mapping = [
 //   { "key": "price", "name": "单价", "rule": "price" }
 // ]
 
-var mapping$1 = new Map([['skuCode', 'SKU编码'], ['quantity', '数量'], ['price', '单价'], ['regionCode', '库区'], ['checkQuantity', '实盘数量'], ['shareRatio', '共享比例'], ['lotNumberCode', '批号'], ['warehouseCode', '仓库编码'], ['regionCode', '库区'], ['rowNumber', '货位排数'], ['layerNumber', '货位层数'], ['gridNumber', '货位格号']]); // for dnd
+var mapping$1 = new Map([['skuCode', 'SKU编码'], ['quantity', '数量'], ['price', '单价'], ['regionCode', '库区'], ['checkQuantity', '实盘数量'], ['shareRatio', '共享比例'], ['lotNumberCode', '批号'], ['warehouseCode', '仓库编码'], ['regionCode', '库区'], ['locationCode', '货位'], ['rowNumber', '货位排数'], ['layerNumber', '货位层数'], ['gridNumber', '货位格号']]); // for dnd
 
 
 var reorder$1 = function reorder(list, startIndex, endIndex) {

package/package.json

@@ -1,50 +1,50 @@
-{
-  "name": "@bit-sun/business-component",
-  "version": "1.1.31",
-  "scripts": {
-    "start": "dumi dev",
-    "docs:build": "dumi build",
-    "docs:deploy": "gh-pages -d docs-dist",
-    "build": "father-build",
-    "deploy": "npm run docs:build && npm run docs:deploy",
-    "release": "npm run build && npm publish",
-    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
-    "test": "umi-test",
-    "test:coverage": "umi-test --coverage"
-  },
-  "main": "dist/index.js",
-  "module": "dist/index.esm.js",
-  "typings": "dist/index.d.ts",
-  "gitHooks": {
-    "pre-commit": "lint-staged"
-  },
-  "lint-staged": {
-    "*.{js,jsx,less,md,json}": [
-      "prettier --write"
-    ],
-    "*.ts?(x)": [
-      "prettier --parser=typescript --write"
-    ]
-  },
-  "dependencies": {
-    "ahooks": "^3.1.2",
-    "antd": "4.17.2",
-    "axios": "^0.24.0",
-    "classnames": "^2.3.1",
-    "loadsh": "^0.0.4",
-    "querystring": "^0.2.1",
-    "react": "^16.12.0",
-    "react-beautiful-dnd": "10.0.0"
-  },
-  "devDependencies": {
-    "@umijs/test": "^3.0.5",
-    "dumi": "^1.0.14",
-    "father-build": "^1.17.2",
-    "gh-pages": "^3.0.0",
-    "lint-staged": "^10.0.7",
-    "prettier": "^2.2.1"
-  },
-  "publishConfig": {
-    "access": "public"
-  }
-}
+{
+  "name": "@bit-sun/business-component",
+  "version": "1.1.34",
+  "scripts": {
+    "start": "dumi dev",
+    "docs:build": "dumi build",
+    "docs:deploy": "gh-pages -d docs-dist",
+    "build": "father-build",
+    "deploy": "npm run docs:build && npm run docs:deploy",
+    "release": "npm run build && npm publish",
+    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
+    "test": "umi-test",
+    "test:coverage": "umi-test --coverage"
+  },
+  "main": "dist/index.js",
+  "module": "dist/index.esm.js",
+  "typings": "dist/index.d.ts",
+  "gitHooks": {
+    "pre-commit": "lint-staged"
+  },
+  "lint-staged": {
+    "*.{js,jsx,less,md,json}": [
+      "prettier --write"
+    ],
+    "*.ts?(x)": [
+      "prettier --parser=typescript --write"
+    ]
+  },
+  "dependencies": {
+    "ahooks": "^3.1.2",
+    "antd": "4.17.2",
+    "axios": "^0.24.0",
+    "classnames": "^2.3.1",
+    "loadsh": "^0.0.4",
+    "querystring": "^0.2.1",
+    "react": "^16.12.0",
+    "react-beautiful-dnd": "10.0.0"
+  },
+  "devDependencies": {
+    "@umijs/test": "^3.0.5",
+    "dumi": "^1.0.14",
+    "father-build": "^1.17.2",
+    "gh-pages": "^3.0.0",
+    "lint-staged": "^10.0.7",
+    "prettier": "^2.2.1"
+  },
+  "publishConfig": {
+    "access": "public"
+  }
+}

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

@@ -161,7 +161,7 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
   }
   let needModalTable = true;
 
-  // 商品选择器
+  // 商品选择器sku
   if(type === 'skuCommodity') {
     requestConfig = {
       url: `${prefixUrl.selectPrefix}/sku/pager/v2`,
@@ -309,6 +309,117 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
     }
   }
 
+  // 商品选择器spu
+  if(type === 'spuCommodity') {
+    requestConfig = {
+      url: `${prefixUrl.selectPrefix}/item`,
+      filter: 'qp-itemCode,name-orGroup,like', // 过滤参数
+      mappingTextField: 'name',
+      mappingValueField: 'itemCode',
+      otherParams: {
+        'qp-approveStatus-eq': 1, // 审核状态(0.待审批;1.审批通过;2.驳回;3.审批未通过)
+        sorter: 'desc-id'
+      }, // 默认参数
+      sourceName: 'itemCode',
+      ...requestConfigProp,
+    }
+    tableSearchForm = [
+      { name: 'qp-name-like', label: 'SPU名称' },
+      { name: 'qp-itemCode-like', label: 'SPU编码' },
+      { 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,
+          },
+        } },
+    ]
+    Promise.all([
+      loadSelectSource(`${prefixUrl.formSelectFix}/brand/queryBrandList`, {
+        pageSize: 5000,
+        currentPage: 1,
+      }),
+      loadSelectSource(`${prefixUrl.formSelectFix}/category/queryCategoryTree`, {
+        pageSize: 5000,
+        currentPage: 1,
+      }),
+      loadSelectSource(`${prefixUrl.formSelectFix}/class/withProperty`, {
+        pageSize: 5000,
+        currentPage: 1,
+      }),
+    ]).then((x: any)=>{
+      formatSource(x,0, 2, tableSearchForm,['id','name']);
+      formatTreeDataSource(x,1, 3, tableSearchForm);
+      formatSource(x,2, 4, tableSearchForm,['id','name']);
+    })
+    modalTableProps = {
+      modalTableTitle: '选择SPU',
+      tableSearchForm,
+      tableColumns: [
+        {
+          title: 'SPU编码',
+          dataIndex: 'itemCode',
+        },
+        {
+          title: 'SPU名称',
+          dataIndex: 'name',
+        },
+        {
+          title: '品牌',
+          dataIndex: 'brandName',
+        },
+        {
+          title: '类目',
+          dataIndex: 'categoryText',
+        },
+        {
+          title: '品类',
+          dataIndex: 'className',
+        },
+      ],
+      ...modalTableBusProps
+    }
+  }
+
   // 商品规格选择器（无弹窗）
   if(type === 'skuPropertyValue') {
     requestConfig = {

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

@@ -247,6 +247,63 @@ export default () => {
 
 [comment]: <> (```)
 
+## 商品SPU选择器 Select-SPU-001
+
+```tsx
+import React, { useState } from 'react';
+import { Tabs } from 'antd';
+import {BusinessSearchSelect} from '../../../index.ts';
+
+const { TabPane } = Tabs;
+export default () => {
+  const selectProps = {
+    // mode: 'multiple',
+    // maxTagCount: 1,
+    // disabled: true
+  }
+  const selectPropsMultiple = {
+    mode: 'multiple',
+    maxTagCount: 6,
+  }
+
+  const [ tabKey, setTabKey ] = useState('single')
+  const [value, setValue] = useState(selectProps?.mode ? [] : null);
+  
+  const props = {
+    value,
+    onChange: (value: any) => {
+      console.log(value)
+      setValue(value)
+    },
+    prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
+    selectProps,
+    selectBusinessType: 'spuCommodity',
+  };
+
+  const onTabChange = (key) => {
+    setTabKey(key)
+    setValue(key === 'single' ? null: [])
+  }
+  
+  return (
+    <div>
+      <Tabs onChange={onTabChange} activeKey={tabKey}>
+        <TabPane tab='单选' key='single'>
+          {tabKey === 'single' && (
+            <BusinessSearchSelect {...props} />
+          )}
+        </TabPane>
+        <TabPane tab='多选' key='multiple'>
+          {tabKey === 'multiple' && (
+            <BusinessSearchSelect {...props} selectProps={selectPropsMultiple} />
+          )}
+        </TabPane>
+      </Tabs>
+    </div>
+  );
+};
+```
+
 
 ## 仓库选择器(物理仓) Select-Warehouse-001