@bit-sun/business-component 1.1.34 → 1.1.37

package/.gitlab-ci.yml

@@ -22,7 +22,7 @@ stages:
   image: node:10-alpine
   script:
     - yarn config set registry https://registry.npm.taobao.org
-    - npm install cnpm -g
+    - npm install -g cnpm@6.2.0
     - yarn config set ignore-engines true
     - cnpm install
     - yarn docs:build

package/dist/index.esm.js

@@ -1650,8 +1650,9 @@ styleInject(css_248z);
 
 var _excluded$2 = ["flag", "checkResults"],
     _excluded2 = ["flag", "checkResults"];
-var luckysheet = window.luckysheet;
-var itemsTemp = []; // const mapping = [
+
+var itemsTemp = [];
+var luckysheet; // const mapping = [
 //   { "key": "skuCode", "name": "SKU编码", "rule": "skuCode"  },
 //   { "key": "quantity", "name": "数量", "rule": "quantity" },
 //   { "key": "price", "name": "单价", "rule": "price" }
@@ -2166,6 +2167,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         }
       };
     });
+    luckysheet = window.luckysheet;
     _this.state = {
       showErrorData: false,
       data: [],
@@ -2681,25 +2683,31 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       },
       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编码'
-    }, {
+    }, 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: '规格',
@@ -2713,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',
@@ -2788,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'
       }, {
@@ -2810,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'
@@ -4630,8 +4744,9 @@ var BusinessSearchSelect$1 = /*#__PURE__*/React.memo(BusinessSearchSelect, funct
 
 var _excluded$3 = ["flag", "checkResults"],
     _excluded2$1 = ["flag", "checkResults"];
-var luckysheet$1 = window.luckysheet;
-var itemsTemp$1 = []; // const mapping = [
+
+var itemsTemp$1 = [];
+var luckysheet$1; // const mapping = [
 //   { "key": "skuCode", "name": "SKU编码", "rule": "skuCode"  },
 //   { "key": "quantity", "name": "数量", "rule": "quantity" },
 //   { "key": "price", "name": "单价", "rule": "price" }
@@ -5146,6 +5261,7 @@ var DataValidation$1 = /*#__PURE__*/function (_React$Component) {
         }
       };
     });
+    luckysheet$1 = window.luckysheet;
     _this.state = {
       showErrorData: false,
       data: [],

package/dist/index.js

@@ -1661,8 +1661,9 @@ styleInject(css_248z);
 
 var _excluded$2 = ["flag", "checkResults"],
     _excluded2 = ["flag", "checkResults"];
-var luckysheet = window.luckysheet;
-var itemsTemp = []; // const mapping = [
+
+var itemsTemp = [];
+var luckysheet; // const mapping = [
 //   { "key": "skuCode", "name": "SKU编码", "rule": "skuCode"  },
 //   { "key": "quantity", "name": "数量", "rule": "quantity" },
 //   { "key": "price", "name": "单价", "rule": "price" }
@@ -2177,6 +2178,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         }
       };
     });
+    luckysheet = window.luckysheet;
     _this.state = {
       showErrorData: false,
       data: [],
@@ -2692,25 +2694,31 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       },
       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编码'
-    }, {
+    }, 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: '规格',
@@ -2724,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',
@@ -2799,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'
       }, {
@@ -2821,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'
@@ -4641,8 +4755,9 @@ var BusinessSearchSelect$1 = /*#__PURE__*/React__default['default'].memo(Busines
 
 var _excluded$3 = ["flag", "checkResults"],
     _excluded2$1 = ["flag", "checkResults"];
-var luckysheet$1 = window.luckysheet;
-var itemsTemp$1 = []; // const mapping = [
+
+var itemsTemp$1 = [];
+var luckysheet$1; // const mapping = [
 //   { "key": "skuCode", "name": "SKU编码", "rule": "skuCode"  },
 //   { "key": "quantity", "name": "数量", "rule": "quantity" },
 //   { "key": "price", "name": "单价", "rule": "price" }
@@ -5157,6 +5272,7 @@ var DataValidation$1 = /*#__PURE__*/function (_React$Component) {
         }
       };
     });
+    luckysheet$1 = window.luckysheet;
     _this.state = {
       showErrorData: false,
       data: [],

package/package.json

@@ -1,50 +1,50 @@
-{
-  "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"
-  }
-}
+{
+  "name": "@bit-sun/business-component",
+  "version": "1.1.37",
+  "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"
+  }
+}