@bit-sun/business-component 1.1.7 → 1.1.12

package/.gitlab-ci.yml

@@ -0,0 +1,174 @@
+variables:
+  REGISTRY: 10.90.21.93:8000
+  BUILD_IMAGE: mqr/wechat-board
+  PROJECT_DIR: wechat-board
+  APP_JAR_DIR: dist.tar.gz
+  ALIYUN_IMAGE: registry.cn-hangzhou.aliyuncs.com/mqe-front/wechat-board
+  ALIYUN_HARBOR_USER: xinjiangshuzhiyun1
+  ALIYUN_HARBOR_PASS: xinjiangshuzhiyun@
+
+
+before_script:
+  - echo "begin to run script"
+  - echo $HOME
+stages:
+  - build
+  - deploy
+  - trigger
+
+#构建模板
+.build:template: &template
+  stage: build
+  image: node:10-alpine
+  script:
+    - yarn config set registry https://registry.npm.taobao.org
+    - npm install cnpm -g
+    - yarn config set ignore-engines true
+    - cnpm install
+    - yarn docs:build
+    - tar -czvf dist.tar.gz docs-dist/
+
+#构建模板
+build:dev:
+    <<: *template
+    cache:
+      paths:
+        - $APP_JAR_DIR
+      policy: push
+
+# 开发分支发布镜像
+deploy:dev:branch:
+  stage: deploy
+  image: docker:19.03.1
+  variables:
+    DOCKER_IMAGE: $REGISTRY/$BUILD_IMAGE
+  script:
+    - docker version
+    - docker login -u admin -p Harbor12345 $REGISTRY
+    - docker build -t $DOCKER_IMAGE:dev .
+    - docker push $DOCKER_IMAGE:dev
+    - docker rmi $DOCKER_IMAGE:dev
+  cache:
+    paths:
+      - $APP_JAR_DIR
+    policy: pull
+  only:
+    - /^202.*$/
+    - develop
+    - master
+  except:
+    - tags
+
+
+# 推送tag到本地服务
+deploy:dev:tag:
+  stage: deploy
+  image: docker:19.03.1
+  variables:
+    DOCKER_IMAGE: $REGISTRY/$BUILD_IMAGE
+  script:
+    - pwd
+    - echo "docker start"
+    - docker version
+    - echo "docker verseion end"
+    - docker login -u admin -p Harbor12345 $REGISTRY
+    - docker build -t $DOCKER_IMAGE:dev .
+    - docker push $DOCKER_IMAGE:dev
+    - docker rmi $DOCKER_IMAGE:dev
+  cache:
+    paths:
+      - $APP_JAR_DIR
+    policy: pull
+  except:
+    - branches
+    - /^release.*$/
+    - /^uat.*$/
+    - /^prd.*$/
+
+# uat的branch上远程环境
+
+
+# uat版本tag上远程环境
+deploy:uat:tag:
+  stage: deploy
+  image: docker:19.03.1
+  variables:
+    DOCKER_IMAGE: $REGISTRY/$BUILD_IMAGE
+  script:
+    - pwd
+    - echo "docker start"
+    - docker version
+    - echo "docker verseion end"
+    - docker login -u admin -p Harbor12345 $REGISTRY
+    - docker build -t $DOCKER_IMAGE:dev .
+    - docker push $DOCKER_IMAGE:dev
+
+    - docker tag $DOCKER_IMAGE:dev $DOCKER_IMAGE:$CI_COMMIT_TAG
+    - docker login -u $ALIYUN_HARBOR_USER -p $ALIYUN_HARBOR_PASS registry.cn-hangzhou.aliyuncs.com
+    - docker tag $DOCKER_IMAGE:$CI_COMMIT_TAG $ALIYUN_IMAGE:latest
+    - docker push $ALIYUN_IMAGE:latest
+    - docker tag $DOCKER_IMAGE:$CI_COMMIT_TAG $ALIYUN_IMAGE:$CI_COMMIT_TAG
+    - docker push $ALIYUN_IMAGE:$CI_COMMIT_TAG
+
+    - docker rmi $DOCKER_IMAGE:dev
+    - docker rmi $DOCKER_IMAGE:$CI_COMMIT_TAG
+    - docker rmi $ALIYUN_IMAGE:latest
+    - docker rmi $ALIYUN_IMAGE:$CI_COMMIT_TAG
+  cache:
+    paths:
+      - $APP_JAR_DIR
+    policy: pull
+  only:
+    - /^uat.*$/
+    - /^prd.*$/
+    - /^release.*$/
+  except:
+    - branches
+
+
+# branch触发本地发布
+trigger:local:branch:
+  stage: trigger
+  image: $REGISTRY/bitsun-devtools/sshpass:latest
+  script:
+    sshpass -p xmx-2020 ssh -o StrictHostKeyChecking=no root@172.16.4.92 mkdir -p /$PROJECT_DIR;
+    sshpass -p xmx-2020 scp -o StrictHostKeyChecking=no -r deploy.sh root@172.16.4.92:/$PROJECT_DIR/deploy.sh;
+    sshpass -p xmx-2020 ssh -o StrictHostKeyChecking=no root@172.16.4.92 chmod +X  /$PROJECT_DIR/deploy.sh;
+    sshpass -p xmx-2020 ssh -o StrictHostKeyChecking=no root@172.16.4.92 sh /$PROJECT_DIR/deploy.sh;
+  only:
+    - develop
+    - master
+    - /^202.*$/
+  except:
+    - tags
+
+# tag触发本地发布
+trigger:local:tag:
+  stage: trigger
+  image: $REGISTRY/bitsun-devtools/sshpass:latest
+  script:
+    sshpass -p xmx-2020 ssh -o StrictHostKeyChecking=no root@172.16.4.92 mkdir -p /$PROJECT_DIR;
+    sshpass -p xmx-2020 scp -o StrictHostKeyChecking=no -r deploy.sh root@172.16.4.92:/$PROJECT_DIR/deploy.sh;
+    sshpass -p xmx-2020 ssh -o StrictHostKeyChecking=no root@172.16.4.92 chmod +X  /$PROJECT_DIR/deploy.sh;
+    sshpass -p xmx-2020 ssh -o StrictHostKeyChecking=no root@172.16.4.92 sh /$PROJECT_DIR/deploy.sh;
+  except:
+    - /^release.*$/
+    - branches
+
+
+# 触发阿里云发布
+trigger:remote:tag:
+  stage: trigger
+  image: $REGISTRY/bitsun-devtools/sshpass:latest
+  script:
+    - echo "trigger"
+  #  - curl -X POST -F token=d2681aea95c9907a64a693095dc910 -F "ref=master" -F "variables[DEPLOY_COMMIT_SHA]=$CI_COMMIT_SHA" -F "variables[DEPLOY_PROJECT_NAME]=phoenix-mall-platform" -F "variables[DEPLOY_NAMESPACE]=CENTER" http://47.102.40.227/api/v4/projects/108/trigger/pipeline
+  only:
+    - /^uat.*$/
+    - /^prd.*$/
+    - /^release.*$/
+  except:
+    - branches
+
+
+

package/dist/components/SearchSelect/business/BusinessUtils.d.ts

@@ -1,4 +1,4 @@
-export declare function commonFun(type?: string, prefixURL: any): {
+export declare function commonFun(type?: string, prefixUrl: any): {
     modalTableProps: {
         modalTableTitle: string;
         tableSearchForm: any[];

package/dist/index.esm.js

@@ -1,6 +1,6 @@
 import axios from 'axios';
 import React, { createContext, useContext, useEffect, forwardRef, createElement, useState } from 'react';
-import { message, Menu, Space, Dropdown, Tooltip, Button, Checkbox, Input, Modal, Select, Form, Divider, Spin, Table } from 'antd';
+import { message, Menu, Space, Dropdown, Tooltip, Button, Checkbox, Input, Modal, Select, Form, Divider, Spin, Table, TreeSelect } from 'antd';
 import { DragDropContext, Droppable, Draggable } from 'react-beautiful-dnd';
 import classNames from 'classnames';
 import _ from 'loadsh';
@@ -1265,14 +1265,6 @@ function injectCSS(css) {
   return styleNode;
 }
 var containerCache = new Map();
-
-function findExistNode(key) {
-  var option = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var container = getContainer(option);
-  return Array.from(containerCache.get(container).children).find(function (node) {
-    return node.tagName === 'STYLE' && node[MARK_KEY] === key;
-  });
-}
 function updateCSS(css, key) {
   var option = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var container = getContainer(option); // Get real parent
@@ -1284,7 +1276,9 @@ function updateCSS(css, key) {
     parentNode.removeChild(placeholderStyle);
   }
 
-  var existNode = findExistNode(key, option);
+  var existNode = Array.from(containerCache.get(container).children).find(function (node) {
+    return node.tagName === 'STYLE' && node[MARK_KEY] === key;
+  });
 
   if (existNode) {
     var _option$csp3, _option$csp4;
@@ -1734,13 +1728,12 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
             if (cell) {
               cell.fs = 10;
 
-              if (typeof cell.v === 'string') {
-                cell.m = cell.v = cell.m.trim();
+              if (typeof cell.v === 'number') {
+                cell.v = cell.m;
               }
 
-              if (typeof cell.v === 'number') {
-                cell.v = cell.v.toString();
-                cell.m = cell.v;
+              if (typeof cell.v === 'string') {
+                cell.m = cell.v = cell.m.trim();
               }
             } // console.log(postion);
 
@@ -2419,7 +2412,7 @@ function getStorageVale(storageKeyString) {
   return "";
 }
 
-var css_248z$2 = ".search_select_show {\n  display: flex;\n}\n.search_select_expand_button {\n  position: relative;\n  width: 30px;\n  color: #ffffff;\n  cursor: pointer;\n}\n.search_select_expand_button span {\n  position: absolute;\n  height: 20px;\n  line-height: 14px;\n  left: 50%;\n  top: 50%;\n  transform: translate(-50%, -50%);\n}\n.search_select_wrapper {\n  position: relative;\n  display: flex;\n  min-height: 60vh;\n  max-height: 60vh;\n  overflow: hidden;\n  font-size: 14px;\n}\n.search_select_wrapper_click_flag {\n  position: absolute;\n  z-index: 10;\n}\n.search_select_wrapper_click_flag_arrow {\n  transform: rotate(0deg);\n  transition: transform 0.5s;\n}\n.search_select_wrapper_click_flag_arrow_1 {\n  transform: rotate(-180deg);\n  transition: transform 0.5s;\n}\n.search_select_wrapper_left {\n  width: 28%;\n  overflow-y: hidden;\n  transition: all 0.3s;\n  margin-left: 20px;\n}\n.search_select_wrapper_left1 {\n  width: 0;\n  height: 0;\n  transition: all 0.3s;\n  display: none;\n}\n.search_select_wrapper_right {\n  width: 70%;\n  margin-left: 1%;\n}\n.search_select_wrapper_right1 {\n  width: 100%;\n  margin-left: 20px;\n}\n.search_select_wrapper_right,\n.search_select_wrapper _right1 {\n  overflow-x: auto;\n}\n.search_select_wrapper .select_list_columns {\n  width: 100%;\n  height: calc(60vh - 60px);\n  overflow-y: auto;\n  border: 1px solid #d8d8d8;\n}\n.search_select_wrapper .select_list_columns_tips {\n  background: #eee;\n  padding: 6px 20px;\n  margin-bottom: 10px;\n}\n.search_select_wrapper .select_list_columns_formItems {\n  padding: 0 20px;\n}\n.search_select_wrapper .select_list_searchButton {\n  display: flex;\n  margin: 10px 0px;\n  justify-content: flex-end;\n}\n.search_select_wrapper .select_list_button_space {\n  margin-right: 10px;\n}\n.search_select_wrapper .select_list_selectTips {\n  display: flex;\n  justify-content: space-between;\n  height: 34px;\n  line-height: 32px;\n  background-color: #eee;\n  margin-bottom: 10px;\n  padding: 0 12px;\n}\n.search_select_wrapper .select_list_selectAll {\n  position: relative;\n  top: -40px;\n  left: 20px;\n  width: 160px;\n}\n";
+var css_248z$2 = ".search_select_show {\n  display: flex;\n}\n.search_select_expand_button {\n  position: relative;\n  width: 30px;\n  color: #ffffff;\n  cursor: pointer;\n}\n.search_select_expand_button span {\n  position: absolute;\n  height: 20px;\n  line-height: 14px;\n  left: 50%;\n  top: 50%;\n  transform: translate(-50%, -50%);\n}\n.search_select_wrapper {\n  position: relative;\n  display: flex;\n  min-height: 60vh;\n  max-height: 60vh;\n  overflow: hidden;\n  font-size: 14px;\n}\n.search_select_wrapper_click_flag {\n  position: absolute;\n  z-index: 10;\n}\n.search_select_wrapper_click_flag_arrow {\n  transform: rotate(0deg);\n  transition: transform 0.5s;\n}\n.search_select_wrapper_click_flag_arrow_1 {\n  transform: rotate(-180deg);\n  transition: transform 0.5s;\n}\n.search_select_wrapper_left {\n  width: 28%;\n  overflow-y: hidden;\n  transition: all 0.3s;\n  margin-left: 20px;\n}\n.search_select_wrapper_left1 {\n  width: 0;\n  height: 0;\n  transition: all 0.3s;\n  display: none;\n}\n.search_select_wrapper_right {\n  width: 70%;\n  margin-left: 1%;\n}\n.search_select_wrapper_right1 {\n  width: 100%;\n  margin-left: 20px;\n}\n.search_select_wrapper_right,\n.search_select_wrapper_right1 {\n  overflow-x: auto;\n}\n.search_select_wrapper .select_list_columns {\n  width: 100%;\n  height: calc(60vh - 60px);\n  overflow-y: auto;\n  border: 1px solid #d8d8d8;\n}\n.search_select_wrapper .select_list_columns_tips {\n  background: #eee;\n  padding: 6px 20px;\n  margin-bottom: 10px;\n}\n.search_select_wrapper .select_list_columns_formItems {\n  padding: 0 20px;\n}\n.search_select_wrapper .select_list_searchButton {\n  display: flex;\n  margin: 10px 0px;\n  justify-content: flex-end;\n}\n.search_select_wrapper .select_list_button_space {\n  margin-right: 10px;\n}\n.search_select_wrapper .select_list_selectTips {\n  display: flex;\n  justify-content: space-between;\n  height: 34px;\n  line-height: 32px;\n  background-color: #eee;\n  margin-bottom: 10px;\n  padding: 0 12px;\n}\n.search_select_wrapper .select_list_selectAll {\n  position: relative;\n  top: -40px;\n  left: 20px;\n  width: 160px;\n}\n";
 styleInject(css_248z$2);
 
 var Option = Select.Option;
@@ -2435,6 +2428,20 @@ var SearchSelect = function SearchSelect(props) {
       labelInValue = _props$labelInValue === void 0 ? false : _props$labelInValue,
       requestConfig = props.requestConfig,
       ctx = props.ctx;
+
+  var _ref = requestConfig || {},
+      url = _ref.url,
+      otherParams = _ref.otherParams,
+      isMap = _ref.isMap,
+      fixedparameter = _ref.fixedparameter,
+      fieldValToParam = _ref.fieldValToParam,
+      _ref$mappingTextField = _ref.mappingTextField,
+      mappingTextField = _ref$mappingTextField === void 0 ? 'name' : _ref$mappingTextField,
+      _ref$mappingValueFiel = _ref.mappingValueField,
+      mappingValueField = _ref$mappingValueFiel === void 0 ? 'code' : _ref$mappingValueFiel,
+      _ref$sourceName = _ref.sourceName,
+      sourceName = _ref$sourceName === void 0 ? 'supplierCode' : _ref$sourceName;
+
   var selectMode = selectProps === null || selectProps === void 0 ? void 0 : selectProps.mode; // 设定当前选择器 为单选或者多选模式 无设定为单选模式（默认）
 
   var initVal = value || (selectMode ? [] : null);
@@ -2573,15 +2580,6 @@ var SearchSelect = function SearchSelect(props) {
     var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
     if (!requestConfig) return;
-    var url = requestConfig.url,
-        otherParams = requestConfig.otherParams,
-        isMap = requestConfig.isMap,
-        fixedparameter = requestConfig.fixedparameter,
-        fieldValToParam = requestConfig.fieldValToParam,
-        _requestConfig$mappin = requestConfig.mappingTextField,
-        mappingTextField = _requestConfig$mappin === void 0 ? 'name' : _requestConfig$mappin,
-        _requestConfig$mappin2 = requestConfig.mappingValueField,
-        mappingValueField = _requestConfig$mappin2 === void 0 ? 'code' : _requestConfig$mappin2;
     setFetching(true); // 处理dependence参数
 
     var fixedParam = {};
@@ -2640,7 +2638,8 @@ var SearchSelect = function SearchSelect(props) {
       if (type === 1) {
         var _ctx$form;
 
-        ctx === null || ctx === void 0 ? void 0 : (_ctx$form = ctx.form) === null || _ctx$form === void 0 ? void 0 : _ctx$form.setFieldSource('supplierCode', source);
+        console.log(sourceName, 'sourceName');
+        ctx === null || ctx === void 0 ? void 0 : (_ctx$form = ctx.form) === null || _ctx$form === void 0 ? void 0 : _ctx$form.setFieldSource(sourceName, source);
         setItems(source);
         setItemsTotal(Number(res === null || res === void 0 ? void 0 : res.total));
       } else {
@@ -2724,13 +2723,13 @@ var SearchSelect = function SearchSelect(props) {
           value: value.key,
           text: value.label
         }] : [{
-          value: value.key
+          value: value
         }]);
         setPopValue(labelInValue ? [{
           value: value.key,
           text: value.label
         }] : [{
-          value: value.key
+          value: value
         }]);
       }
     }
@@ -2793,10 +2792,11 @@ var SearchSelect = function SearchSelect(props) {
   };
 
   var handleTableChange = function handleTableChange(pagination) {
-    getData({
+    var params = form.getFieldsValue();
+    getData(_objectSpread2(_objectSpread2({}, params), {}, {
       pageSize: pagination.pageSize,
       currentPage: pagination.current
-    }, 2);
+    }), 2);
   };
 
   var onChangeCheckAll = function onChangeCheckAll(e) {
@@ -2919,7 +2919,7 @@ var SearchSelect = function SearchSelect(props) {
   var formItem = function formItem(list) {
     if (isModalVisible && (list === null || list === void 0 ? void 0 : list.length)) {
       return list.map(function (i) {
-        var _i$field, _i$field3;
+        var _i$field, _i$field3, _i$field5;
 
         if ((i === null || i === void 0 ? void 0 : i.type) === 'select' || (i === null || i === void 0 ? void 0 : (_i$field = i.field) === null || _i$field === void 0 ? void 0 : _i$field.type) === 'select') {
           var _i$field2, _i$initialSource;
@@ -2939,6 +2939,21 @@ var SearchSelect = function SearchSelect(props) {
               key: m.value
             }, m.text);
           }))));
+        }
+
+        if ((i === null || i === void 0 ? void 0 : i.type) === 'treeSelect' || (i === null || i === void 0 ? void 0 : (_i$field3 = i.field) === null || _i$field3 === void 0 ? void 0 : _i$field3.type) === 'treeSelect') {
+          var _i$field4;
+
+          return /*#__PURE__*/React.createElement(Form.Item, {
+            name: i.name,
+            label: i.label,
+            key: i.name
+          }, /*#__PURE__*/React.createElement(TreeSelect, _objectSpread2({
+            style: {
+              width: '100%'
+            },
+            placeholder: "\u8BF7\u9009\u62E9"
+          }, i === null || i === void 0 ? void 0 : (_i$field4 = i.field) === null || _i$field4 === void 0 ? void 0 : _i$field4.props)));
         } // 默认type是input
 
 
@@ -2953,7 +2968,7 @@ var SearchSelect = function SearchSelect(props) {
           placeholder: "\u8BF7\u8F93\u5165",
           allowClear: true,
           maxLength: 100
-        }, i === null || i === void 0 ? void 0 : (_i$field3 = i.field) === null || _i$field3 === void 0 ? void 0 : _i$field3.props)));
+        }, i === null || i === void 0 ? void 0 : (_i$field5 = i.field) === null || _i$field5 === void 0 ? void 0 : _i$field5.props)));
       });
     } else {
       return null;
@@ -3045,7 +3060,7 @@ var SearchSelect = function SearchSelect(props) {
       key: "submit",
       type: "primary",
       onClick: handleOk,
-      disabled: (selectProps === null || selectProps === void 0 ? void 0 : selectProps.disabled) || (props === null || props === void 0 ? void 0 : props.disabled)
+      disabled: !tableData.length || (selectProps === null || selectProps === void 0 ? void 0 : selectProps.disabled) || (props === null || props === void 0 ? void 0 : props.disabled)
     }, "\u786E\u5B9A")]
   }, /*#__PURE__*/React.createElement("div", {
     className: 'search_select_wrapper'
@@ -3094,14 +3109,14 @@ var SearchSelect = function SearchSelect(props) {
     style: {
       color: 'rgba(127, 127, 127, 0.6470588235294118)'
     }
-  }, selectMode ? '勾选后点击确定按钮完成选择' : '双击数据行或单击按钮完成选择')), /*#__PURE__*/React.createElement(Table, {
+  }, selectMode ? '勾选后点击确定按钮完成选择' : '双击数据行或点击单选图标完成选择')), /*#__PURE__*/React.createElement(Table, {
     size: 'small',
     rowSelection: rowSelection,
     columns: modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns,
     dataSource: tableData,
     pagination: tablePagination,
     onChange: handleTableChange,
-    rowKey: 'code',
+    rowKey: mappingValueField,
     scroll: {
       x: modalTableProps.overScrollX || 'max-content',
       y: modalTableProps.overScrollY || null
@@ -3184,10 +3199,10 @@ var loadSelectSource = function loadSelectSource(url, params) {
   });
 };
 
-function commonFun(type, prefixURL) {
+function commonFun(type, prefixUrl) {
   // 默认type === 'supplier' 供应商选择器
   var requestConfig = {
-    url: "".concat(prefixURL.selectPrefix, "/supplier"),
+    url: "".concat(prefixUrl.selectPrefix, "/supplier"),
     filter: 'qp-nameAndCode-like',
     otherParams: {
       sorter: 'desc-id'
@@ -3204,18 +3219,47 @@ function commonFun(type, prefixURL) {
   * */
 
   var formatSource = function formatSource(reData, position, changePosition, changeSearchForm) {
-    var _reData$position, _reData$position$data;
+    var _reData$position;
 
-    var data = reData && ((_reData$position = reData[position]) === null || _reData$position === void 0 ? void 0 : (_reData$position$data = _reData$position.data) === null || _reData$position$data === void 0 ? void 0 : _reData$position$data.items) || [];
-    var formatData = (data === null || data === void 0 ? void 0 : data.length) ? data.map(function (v) {
+    var resKeyValue = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : ['code', 'name'];
+    var data = reData && ((_reData$position = reData[position]) === null || _reData$position === void 0 ? void 0 : _reData$position.data);
+    var list = Array.isArray(data) ? data : (data === null || data === void 0 ? void 0 : data.items) || (data === null || data === void 0 ? void 0 : data.list) || [];
+    var formatData = (list === null || list === void 0 ? void 0 : list.length) ? list.map(function (v) {
       return {
-        text: v.name,
-        value: v.code
+        text: v[resKeyValue[1]],
+        value: v[resKeyValue[0]]
       };
     }) : [];
     changeSearchForm[changePosition] = _objectSpread2(_objectSpread2({}, changeSearchForm[changePosition]), {}, {
       initialSource: formatData
     });
+  }; // 格式化树选择器数据源
+
+
+  var mapSearchTree = function mapSearchTree(treeDataItem, resKeyValue) {
+    var haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0;
+    return {
+      title: treeDataItem[resKeyValue[1]],
+      key: treeDataItem[resKeyValue[0]],
+      parentId: treeDataItem.parent,
+      data: _objectSpread2({}, treeDataItem),
+      isLeaf: !haveChildren,
+      disabled: haveChildren,
+      children: haveChildren ? treeDataItem.children.map(function (i) {
+        return mapSearchTree(i, resKeyValue);
+      }) : []
+    };
+  };
+
+  var formatTreeDataSource = function formatTreeDataSource(reData, position, changePosition, changeSearchForm) {
+    var _reData$position2;
+
+    var resKeyValue = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : ['id', 'name'];
+    var data = reData && ((_reData$position2 = reData[position]) === null || _reData$position2 === void 0 ? void 0 : _reData$position2.data);
+    var formatData = data && Array.isArray(data) && data.length && data.map(function (ites) {
+      return mapSearchTree(ites, resKeyValue);
+    }) || [];
+    changeSearchForm[changePosition].field.props.treeData = formatData;
   };
 
   var tableSearchForm = [];
@@ -3290,14 +3334,14 @@ function commonFun(type, prefixURL) {
       label: '共享类型',
       initialSource: getDictionarySource('UC000013')
     }];
-    Promise.all([loadSelectSource("".concat(prefixURL.formSelectFix, "/company"), {
+    Promise.all([loadSelectSource("".concat(prefixUrl.formSelectFix, "/company"), {
       pageSize: 5000,
       currentPage: 1,
       'qp-companyType-eq': '30'
-    }), loadSelectSource("".concat(prefixURL.formSelectFix, "/accountingSubject"), {
+    }), loadSelectSource("".concat(prefixUrl.formSelectFix, "/accountingSubject"), {
       pageSize: 5000,
       currentPage: 1
-    }), loadSelectSource("".concat(prefixURL.formSelectFix, "/company"), {
+    }), loadSelectSource("".concat(prefixUrl.formSelectFix, "/company"), {
       pageSize: 5000,
       currentPage: 1,
       'qp-companyType-eq': '20'
@@ -3335,6 +3379,144 @@ function commonFun(type, prefixURL) {
     }]
   }; // 商品选择器
 
+  if (type === 'skuCommodity') {
+    requestConfig = {
+      url: "".concat(prefixUrl.selectPrefix, "/sku"),
+      filter: 'qp-nameAndCode-like',
+      mappingTextField: 'name',
+      mappingValueField: 'skuCode',
+      otherParams: {
+        'qp-approveStatus-eq': 2,
+        sorter: 'desc-id'
+      },
+      sourceName: 'skuCode'
+    };
+    tableSearchForm = [{
+      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: {
+          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, 5, tableSearchForm, ['id', 'name']);
+      formatTreeDataSource(x, 1, 6, tableSearchForm);
+      formatSource(x, 2, 7, tableSearchForm, ['id', 'name']);
+    });
+    modalTableProps = {
+      modalTableTitle: '选择SKU',
+      tableSearchForm: tableSearchForm,
+      tableColumns: [{
+        title: 'SKU编码',
+        dataIndex: 'skuCode'
+      }, {
+        title: 'SKU名称',
+        dataIndex: 'name'
+      }, {
+        title: '所属SPU',
+        dataIndex: 'itemName'
+      }, {
+        title: '规格',
+        dataIndex: 'skuSpec'
+      }, {
+        title: '类目',
+        dataIndex: 'categoryName'
+      }, {
+        title: '品类',
+        dataIndex: 'className'
+      }, {
+        title: '品牌',
+        dataIndex: 'brandName'
+      }, {
+        title: '条形码',
+        dataIndex: 'barCode'
+      }]
+    };
+  } // 仓库选择器
+
+  console.log(requestConfig, 'requestConfig');
   return {
     modalTableProps: modalTableProps,
     requestConfig: requestConfig
@@ -3342,13 +3524,13 @@ function commonFun(type, prefixURL) {
 }
 
 var BusinessSearchSelect = function BusinessSearchSelect(props) {
-  var businessType = (props === null || props === void 0 ? void 0 : props.SelectBusinessType) || 'supplier';
-  var prefixURL = (props === null || props === void 0 ? void 0 : props.prefixUrl) || {
+  var businessType = (props === null || props === void 0 ? void 0 : props.selectBusinessType) || 'supplier';
+  var prefixUrl = (props === null || props === void 0 ? void 0 : props.prefixUrl) || {
     selectPrefix: '/bop/api',
     formSelectFix: '/bop/api'
   };
 
-  var _commonFun = commonFun(businessType, prefixURL),
+  var _commonFun = commonFun(businessType, prefixUrl),
       requestConfig = _commonFun.requestConfig,
       modalTableProps = _commonFun.modalTableProps;