@bit-sun/business-component 1.1.12 → 1.1.15

package/dist/index.esm.js

@@ -1265,6 +1265,14 @@ 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
@@ -1276,9 +1284,7 @@ function updateCSS(css, key) {
     parentNode.removeChild(placeholderStyle);
   }
 
-  var existNode = Array.from(containerCache.get(container).children).find(function (node) {
-    return node.tagName === 'STYLE' && node[MARK_KEY] === key;
-  });
+  var existNode = findExistNode(key, option);
 
   if (existNode) {
     var _option$csp3, _option$csp4;
@@ -1728,13 +1734,18 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
             if (cell) {
               cell.fs = 10;
 
-              if (typeof cell.v === 'number') {
-                cell.v = cell.m;
-              }
-
               if (typeof cell.v === 'string') {
                 cell.m = cell.v = cell.m.trim();
               }
+
+              if (cell && cell.m && cell.m.indexOf('E+') !== -1) {
+                cell.v = cell.v.toString();
+                cell.m = cell.v;
+              }
+
+              if (typeof cell.v === 'number') {
+                cell.v = cell.m;
+              }
             } // console.log(postion);
 
           },
@@ -2437,6 +2448,7 @@ var SearchSelect = function SearchSelect(props) {
       fieldValToParam = _ref.fieldValToParam,
       _ref$mappingTextField = _ref.mappingTextField,
       mappingTextField = _ref$mappingTextField === void 0 ? 'name' : _ref$mappingTextField,
+      mappingTextShowKeyField = _ref.mappingTextShowKeyField,
       _ref$mappingValueFiel = _ref.mappingValueField,
       mappingValueField = _ref$mappingValueFiel === void 0 ? 'code' : _ref$mappingValueFiel,
       _ref$sourceName = _ref.sourceName,
@@ -2497,12 +2509,12 @@ var SearchSelect = function SearchSelect(props) {
       popvalue = _useState14[0],
       setPopValue = _useState14[1];
 
-  var _useDebounceFn = useDebounceFn(function () {
+  var _useDebounceFn = useDebounceFn(function (v) {
     // 优化搜索参数 支持传多个
     var searchParams = {};
 
     if (typeof selectParamsKey === 'string') {
-      searchParams = _defineProperty({}, selectParamsKey, searchValue);
+      searchParams = _defineProperty({}, selectParamsKey, v ? initVal : searchValue);
     }
 
     if (Array.isArray(selectParamsKey)) {
@@ -2623,11 +2635,13 @@ var SearchSelect = function SearchSelect(props) {
         source = res ? res[keys] ? res[keys].map(function (item) {
           return _objectSpread2(_objectSpread2({}, item), {}, {
             text: item[mappingTextField],
+            textShowKey: item[mappingTextShowKeyField || mappingValueField],
             value: item[mappingValueField]
           });
         }) : Array.isArray(res) && (res === null || res === void 0 ? void 0 : res.map(function (item) {
           return _objectSpread2(_objectSpread2({}, item), {}, {
             text: item[mappingTextField],
+            textShowKey: item[mappingTextShowKeyField || mappingValueField],
             value: item[mappingValueField]
           });
         })) : [];
@@ -2638,7 +2652,6 @@ var SearchSelect = function SearchSelect(props) {
       if (type === 1) {
         var _ctx$form;
 
-        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));
@@ -2674,7 +2687,7 @@ var SearchSelect = function SearchSelect(props) {
   };
 
   useEffect(function () {
-    getData();
+    run('init');
   }, []);
   useEffect(function () {
     if (value) {
@@ -2737,7 +2750,14 @@ var SearchSelect = function SearchSelect(props) {
 
   var handleOk = function handleOk() {
     if (popvalue === null || popvalue === void 0 ? void 0 : popvalue.length) {
-      formaData(popvalue);
+      var _ctx$form2;
+
+      formaData(popvalue); // 解决选择最后1页的sku，返回后，不显示名称问题
+
+      var source = _.uniqBy(items.concat(popvalue), 'value');
+
+      ctx === null || ctx === void 0 ? void 0 : (_ctx$form2 = ctx.form) === null || _ctx$form2 === void 0 ? void 0 : _ctx$form2.setFieldSource(sourceName, source);
+      setItems(source);
     }
 
     setIsModalVisible(false);
@@ -3036,7 +3056,7 @@ var SearchSelect = function SearchSelect(props) {
       key: item.value,
       label: item.text
     }, LightHeightOption({
-      text: "".concat(item.value, "       ").concat(item.text),
+      text: "".concat(item.textShowKey, "       ").concat(item.text),
       filterTxt: searchValue
     }));
   })), /*#__PURE__*/React.createElement(Button, {
@@ -3516,7 +3536,144 @@ function commonFun(type, prefixUrl) {
     };
   } // 仓库选择器
 
-  console.log(requestConfig, 'requestConfig');
+
+  if (type === 'physicalWarehouse') {
+    requestConfig = {
+      url: "".concat(prefixUrl.selectPrefix, "/physicalWarehouse"),
+      filter: 'qp-nameAndCode-like',
+      mappingTextField: 'physicalWarehouseName',
+      mappingTextShowKeyField: 'physicalWarehouseCode',
+      mappingValueField: 'id',
+      otherParams: {
+        sorter: 'desc-id'
+      },
+      sourceName: 'warehouseIds'
+    };
+    tableSearchForm = [{
+      name: 'qp-physicalWarehouseName-like',
+      label: '物理仓名称'
+    }, {
+      name: 'qp-physicalWarehouseCode-like',
+      label: '物理仓编码'
+    }, {
+      name: 'qp-physicalWarehouseType-eq',
+      type: 'select',
+      label: '物理仓类型',
+      initialSource: getDictionarySource('SC00002')
+    }, {
+      name: 'qp-companyCode-eq',
+      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-isEnable-eq',
+      type: 'select',
+      label: '物理仓状态',
+      initialSource: getDictionarySource('SC00001')
+    }];
+    Promise.all([loadSelectSource("".concat(prefixUrl.formSelectFix, "/company"), {
+      pageSize: 5000,
+      currentPage: 1,
+      'qp-companyType-eq': 20
+    })]).then(function (x) {
+      formatSource(x, 0, 3, tableSearchForm);
+    });
+    modalTableProps = {
+      modalTableTitle: '选择物理仓',
+      tableSearchForm: tableSearchForm,
+      tableColumns: [{
+        title: '物理仓编码',
+        dataIndex: 'physicalWarehouseCode'
+      }, {
+        title: '物理仓名称',
+        dataIndex: 'physicalWarehouseName'
+      }, {
+        title: '物理仓类型',
+        dataIndex: 'physicalWarehouseType',
+        render: function render(text) {
+          return getDictionaryTextByValue('SC00002', text);
+        }
+      }, {
+        title: '物理仓状态',
+        dataIndex: 'isEnable',
+        render: function render(text) {
+          return getDictionaryTextByValue('SC00001', text);
+        }
+      }, {
+        title: '所属公司',
+        dataIndex: 'companyName'
+      }]
+    };
+  }
+
+  if (type === 'realWarehouse') {
+    requestConfig = {
+      url: "".concat(prefixUrl.selectPrefix, "/realWarehouse"),
+      filter: 'qp-nameAndCode-like',
+      mappingTextField: 'realWarehouseName',
+      mappingTextShowKeyField: 'realWarehouseCode',
+      mappingValueField: 'id',
+      otherParams: {
+        sorter: 'desc-id'
+      },
+      sourceName: 'warehouseIds'
+    };
+    tableSearchForm = [{
+      name: 'qp-realWarehouseName-like',
+      label: '逻辑仓名称'
+    }, {
+      name: 'qp-realWarehouseCode-like',
+      label: '逻辑仓编码'
+    }, {
+      name: 'qp-realWarehouseType-eq',
+      type: 'select',
+      label: '逻辑仓类型',
+      initialSource: getDictionarySource('SC00004')
+    }, {
+      name: 'qp-isEnable-eq',
+      type: 'select',
+      label: '逻辑仓状态',
+      initialSource: getDictionarySource('SC00001')
+    }];
+    modalTableProps = {
+      modalTableTitle: '选择逻辑仓',
+      tableSearchForm: tableSearchForm,
+      tableColumns: [{
+        title: '逻辑仓编码',
+        dataIndex: 'realWarehouseCode'
+      }, {
+        title: '逻辑仓名称',
+        dataIndex: 'realWarehouseName'
+      }, {
+        title: '逻辑仓类型',
+        dataIndex: 'realWarehouseType',
+        render: function render(text) {
+          return getDictionaryTextByValue('SC00004', text);
+        }
+      }, {
+        title: '逻辑仓状态',
+        dataIndex: 'isEnable',
+        render: function render(text) {
+          return getDictionaryTextByValue('SC00001', text);
+        }
+      }]
+    };
+  }
+
   return {
     modalTableProps: modalTableProps,
     requestConfig: requestConfig

package/dist/index.js

@@ -1276,6 +1276,14 @@ 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
@@ -1287,9 +1295,7 @@ function updateCSS(css, key) {
     parentNode.removeChild(placeholderStyle);
   }
 
-  var existNode = Array.from(containerCache.get(container).children).find(function (node) {
-    return node.tagName === 'STYLE' && node[MARK_KEY] === key;
-  });
+  var existNode = findExistNode(key, option);
 
   if (existNode) {
     var _option$csp3, _option$csp4;
@@ -1739,13 +1745,18 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
             if (cell) {
               cell.fs = 10;
 
-              if (typeof cell.v === 'number') {
-                cell.v = cell.m;
-              }
-
               if (typeof cell.v === 'string') {
                 cell.m = cell.v = cell.m.trim();
               }
+
+              if (cell && cell.m && cell.m.indexOf('E+') !== -1) {
+                cell.v = cell.v.toString();
+                cell.m = cell.v;
+              }
+
+              if (typeof cell.v === 'number') {
+                cell.v = cell.m;
+              }
             } // console.log(postion);
 
           },
@@ -2448,6 +2459,7 @@ var SearchSelect = function SearchSelect(props) {
       fieldValToParam = _ref.fieldValToParam,
       _ref$mappingTextField = _ref.mappingTextField,
       mappingTextField = _ref$mappingTextField === void 0 ? 'name' : _ref$mappingTextField,
+      mappingTextShowKeyField = _ref.mappingTextShowKeyField,
       _ref$mappingValueFiel = _ref.mappingValueField,
       mappingValueField = _ref$mappingValueFiel === void 0 ? 'code' : _ref$mappingValueFiel,
       _ref$sourceName = _ref.sourceName,
@@ -2508,12 +2520,12 @@ var SearchSelect = function SearchSelect(props) {
       popvalue = _useState14[0],
       setPopValue = _useState14[1];
 
-  var _useDebounceFn = ahooks.useDebounceFn(function () {
+  var _useDebounceFn = ahooks.useDebounceFn(function (v) {
     // 优化搜索参数 支持传多个
     var searchParams = {};
 
     if (typeof selectParamsKey === 'string') {
-      searchParams = _defineProperty({}, selectParamsKey, searchValue);
+      searchParams = _defineProperty({}, selectParamsKey, v ? initVal : searchValue);
     }
 
     if (Array.isArray(selectParamsKey)) {
@@ -2634,11 +2646,13 @@ var SearchSelect = function SearchSelect(props) {
         source = res ? res[keys] ? res[keys].map(function (item) {
           return _objectSpread2(_objectSpread2({}, item), {}, {
             text: item[mappingTextField],
+            textShowKey: item[mappingTextShowKeyField || mappingValueField],
             value: item[mappingValueField]
           });
         }) : Array.isArray(res) && (res === null || res === void 0 ? void 0 : res.map(function (item) {
           return _objectSpread2(_objectSpread2({}, item), {}, {
             text: item[mappingTextField],
+            textShowKey: item[mappingTextShowKeyField || mappingValueField],
             value: item[mappingValueField]
           });
         })) : [];
@@ -2649,7 +2663,6 @@ var SearchSelect = function SearchSelect(props) {
       if (type === 1) {
         var _ctx$form;
 
-        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));
@@ -2685,7 +2698,7 @@ var SearchSelect = function SearchSelect(props) {
   };
 
   React.useEffect(function () {
-    getData();
+    run('init');
   }, []);
   React.useEffect(function () {
     if (value) {
@@ -2748,7 +2761,14 @@ var SearchSelect = function SearchSelect(props) {
 
   var handleOk = function handleOk() {
     if (popvalue === null || popvalue === void 0 ? void 0 : popvalue.length) {
-      formaData(popvalue);
+      var _ctx$form2;
+
+      formaData(popvalue); // 解决选择最后1页的sku，返回后，不显示名称问题
+
+      var source = ___default['default'].uniqBy(items.concat(popvalue), 'value');
+
+      ctx === null || ctx === void 0 ? void 0 : (_ctx$form2 = ctx.form) === null || _ctx$form2 === void 0 ? void 0 : _ctx$form2.setFieldSource(sourceName, source);
+      setItems(source);
     }
 
     setIsModalVisible(false);
@@ -3047,7 +3067,7 @@ var SearchSelect = function SearchSelect(props) {
       key: item.value,
       label: item.text
     }, LightHeightOption({
-      text: "".concat(item.value, "       ").concat(item.text),
+      text: "".concat(item.textShowKey, "       ").concat(item.text),
       filterTxt: searchValue
     }));
   })), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
@@ -3527,7 +3547,144 @@ function commonFun(type, prefixUrl) {
     };
   } // 仓库选择器
 
-  console.log(requestConfig, 'requestConfig');
+
+  if (type === 'physicalWarehouse') {
+    requestConfig = {
+      url: "".concat(prefixUrl.selectPrefix, "/physicalWarehouse"),
+      filter: 'qp-nameAndCode-like',
+      mappingTextField: 'physicalWarehouseName',
+      mappingTextShowKeyField: 'physicalWarehouseCode',
+      mappingValueField: 'id',
+      otherParams: {
+        sorter: 'desc-id'
+      },
+      sourceName: 'warehouseIds'
+    };
+    tableSearchForm = [{
+      name: 'qp-physicalWarehouseName-like',
+      label: '物理仓名称'
+    }, {
+      name: 'qp-physicalWarehouseCode-like',
+      label: '物理仓编码'
+    }, {
+      name: 'qp-physicalWarehouseType-eq',
+      type: 'select',
+      label: '物理仓类型',
+      initialSource: getDictionarySource('SC00002')
+    }, {
+      name: 'qp-companyCode-eq',
+      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-isEnable-eq',
+      type: 'select',
+      label: '物理仓状态',
+      initialSource: getDictionarySource('SC00001')
+    }];
+    Promise.all([loadSelectSource("".concat(prefixUrl.formSelectFix, "/company"), {
+      pageSize: 5000,
+      currentPage: 1,
+      'qp-companyType-eq': 20
+    })]).then(function (x) {
+      formatSource(x, 0, 3, tableSearchForm);
+    });
+    modalTableProps = {
+      modalTableTitle: '选择物理仓',
+      tableSearchForm: tableSearchForm,
+      tableColumns: [{
+        title: '物理仓编码',
+        dataIndex: 'physicalWarehouseCode'
+      }, {
+        title: '物理仓名称',
+        dataIndex: 'physicalWarehouseName'
+      }, {
+        title: '物理仓类型',
+        dataIndex: 'physicalWarehouseType',
+        render: function render(text) {
+          return getDictionaryTextByValue('SC00002', text);
+        }
+      }, {
+        title: '物理仓状态',
+        dataIndex: 'isEnable',
+        render: function render(text) {
+          return getDictionaryTextByValue('SC00001', text);
+        }
+      }, {
+        title: '所属公司',
+        dataIndex: 'companyName'
+      }]
+    };
+  }
+
+  if (type === 'realWarehouse') {
+    requestConfig = {
+      url: "".concat(prefixUrl.selectPrefix, "/realWarehouse"),
+      filter: 'qp-nameAndCode-like',
+      mappingTextField: 'realWarehouseName',
+      mappingTextShowKeyField: 'realWarehouseCode',
+      mappingValueField: 'id',
+      otherParams: {
+        sorter: 'desc-id'
+      },
+      sourceName: 'warehouseIds'
+    };
+    tableSearchForm = [{
+      name: 'qp-realWarehouseName-like',
+      label: '逻辑仓名称'
+    }, {
+      name: 'qp-realWarehouseCode-like',
+      label: '逻辑仓编码'
+    }, {
+      name: 'qp-realWarehouseType-eq',
+      type: 'select',
+      label: '逻辑仓类型',
+      initialSource: getDictionarySource('SC00004')
+    }, {
+      name: 'qp-isEnable-eq',
+      type: 'select',
+      label: '逻辑仓状态',
+      initialSource: getDictionarySource('SC00001')
+    }];
+    modalTableProps = {
+      modalTableTitle: '选择逻辑仓',
+      tableSearchForm: tableSearchForm,
+      tableColumns: [{
+        title: '逻辑仓编码',
+        dataIndex: 'realWarehouseCode'
+      }, {
+        title: '逻辑仓名称',
+        dataIndex: 'realWarehouseName'
+      }, {
+        title: '逻辑仓类型',
+        dataIndex: 'realWarehouseType',
+        render: function render(text) {
+          return getDictionaryTextByValue('SC00004', text);
+        }
+      }, {
+        title: '逻辑仓状态',
+        dataIndex: 'isEnable',
+        render: function render(text) {
+          return getDictionaryTextByValue('SC00001', text);
+        }
+      }]
+    };
+  }
+
   return {
     modalTableProps: modalTableProps,
     requestConfig: requestConfig

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "1.1.12",
+  "version": "1.1.15",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -47,4 +47,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}

package/src/components/DataValidation/index.tsx

@@ -173,12 +173,18 @@ class DataValidation extends React.Component {
         cellRenderBefore: function (cell, postion, sheetFile, ctx) {
           if (cell) {
             cell.fs = 10;
-            if (typeof cell.v === 'number') {
-              cell.v = cell.m
-            }
+
+
             if (typeof cell.v === 'string') {
               cell.m = cell.v = cell.m.trim();
             }
+            if (cell && cell.m && cell.m.indexOf('E+') !== -1) {
+              cell.v = cell.v.toString()
+              cell.m = cell.v
+            }
+            if (typeof cell.v === 'number') {
+              cell.v = cell.m
+            }
           }
           // console.log(postion);
         },

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

@@ -346,10 +346,119 @@ export function commonFun (type?: string, prefixUrl: any) {
   }
 
   // 仓库选择器
-  if(type === 'warehouse') {
-
+  if(type === 'physicalWarehouse') {
+    requestConfig = {
+      url: `${prefixUrl.selectPrefix}/physicalWarehouse`,
+      filter: 'qp-nameAndCode-like', // 过滤参数
+      mappingTextField: 'physicalWarehouseName',
+      mappingTextShowKeyField: 'physicalWarehouseCode',
+      mappingValueField: 'id',
+      otherParams: {
+        sorter: 'desc-id'
+      }, // 默认参数
+      sourceName: 'warehouseIds',
+    }
+    tableSearchForm = [
+      { name: 'qp-physicalWarehouseName-like', label: '物理仓名称' },
+      { name: 'qp-physicalWarehouseCode-like', label: '物理仓编码' },
+      { name: 'qp-physicalWarehouseType-eq', type: 'select', label: '物理仓类型', initialSource: getDictionarySource('SC00002')  },
+      { name: 'qp-companyCode-eq', 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-isEnable-eq', type: 'select', label: '物理仓状态', initialSource: getDictionarySource('SC00001') },
+    ]
+    Promise.all([
+      loadSelectSource(`${prefixUrl.formSelectFix}/company`, {
+        pageSize: 5000,
+        currentPage: 1,
+        'qp-companyType-eq': 20,
+      }),
+    ]).then((x: any)=>{
+      formatSource(x,0, 3, tableSearchForm);
+    })
+    modalTableProps = {
+      modalTableTitle: '选择物理仓',
+      tableSearchForm,
+      tableColumns: [
+        {
+          title: '物理仓编码',
+          dataIndex: 'physicalWarehouseCode',
+        },
+        {
+          title: '物理仓名称',
+          dataIndex: 'physicalWarehouseName',
+        },
+        {
+          title: '物理仓类型',
+          dataIndex: 'physicalWarehouseType',
+          render: (text: number) => getDictionaryTextByValue('SC00002', text),
+        },
+        {
+          title: '物理仓状态',
+          dataIndex: 'isEnable',
+          render: (text: number) => getDictionaryTextByValue('SC00001', text),
+        },
+        {
+          title: '所属公司',
+          dataIndex: 'companyName',
+        },
+      ]
+    }
+  }
+  if(type === 'realWarehouse') {
+    requestConfig = {
+      url: `${prefixUrl.selectPrefix}/realWarehouse`,
+      filter: 'qp-nameAndCode-like', // 过滤参数
+      mappingTextField: 'realWarehouseName',
+      mappingTextShowKeyField: 'realWarehouseCode',
+      mappingValueField: 'id',
+      otherParams: {
+        sorter: 'desc-id'
+      }, // 默认参数
+      sourceName: 'warehouseIds',
+    }
+    tableSearchForm = [
+      { name: 'qp-realWarehouseName-like', label: '逻辑仓名称' },
+      { name: 'qp-realWarehouseCode-like', label: '逻辑仓编码' },
+      { name: 'qp-realWarehouseType-eq', type: 'select', label: '逻辑仓类型', initialSource: getDictionarySource('SC00004')  },
+      { name: 'qp-isEnable-eq', type: 'select', label: '逻辑仓状态', initialSource: getDictionarySource('SC00001') },
+    ]
+    modalTableProps = {
+      modalTableTitle: '选择逻辑仓',
+      tableSearchForm,
+      tableColumns: [
+        {
+          title: '逻辑仓编码',
+          dataIndex: 'realWarehouseCode',
+        },
+        {
+          title: '逻辑仓名称',
+          dataIndex: 'realWarehouseName',
+        },
+        {
+          title: '逻辑仓类型',
+          dataIndex: 'realWarehouseType',
+          render: (text: number) => getDictionaryTextByValue('SC00004', text),
+        },
+        {
+          title: '逻辑仓状态',
+          dataIndex: 'isEnable',
+          render: (text: number) => getDictionaryTextByValue('SC00001', text),
+        },
+      ]
+    }
   }
 
-  console.log(requestConfig, 'requestConfig')
   return { modalTableProps, requestConfig };
 }

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

@@ -36,7 +36,7 @@ export default () => {
     //   mappingTextField: 'name',
     //   mappingValueField: 'code',
     // },   // 非必传，业务字段已根据业务默认默认
-    // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' }, // 非必传，下拉框和tableForm下拉框接口前缀，默认为bop的接口
+    prefixUrl: { selectPrefix: 'http://test.i-baby.net/bop/api', formSelectFix: 'http://test.i-baby.net/bop/api' }, // 非必传，下拉框和tableForm下拉框接口前缀，默认为bop的接口
     selectProps, // 非必传
     onChange: (value: any) => {
       console.log(value)
@@ -73,15 +73,16 @@ export default () => {
       console.log(value)
       setValue(value)
     },
-    requestConfig: {
-      url: `/bop/api/sku`,
-      filter: 'qp-nameAndCode-like',
-      mappingValueField: 'skuCode',
-      otherParams: {
-        sorter: 'desc-id'
-      }, // 默认参数
-      sourceName: 'skuCode',
-    },
+    // requestConfig: {
+    //   url: `http://test.i-baby.net/bop/api/sku`,
+    //   filter: 'qp-nameAndCode-like',
+    //   mappingValueField: 'skuCode',
+    //   otherParams: {
+    //     sorter: 'desc-id'
+    //   }, // 默认参数
+    //   sourceName: 'skuCode',
+    // },
+    prefixUrl: { selectPrefix: 'http://test.i-baby.net/bop/api', formSelectFix: 'http://test.i-baby.net/bop/api' },
     selectProps,
     selectBusinessType: 'skuCommodity',
   };
@@ -93,4 +94,88 @@ export default () => {
   );
 };
 ```
+
+仓库选择器(物理仓) Select-Warehouse-001:
+
+```tsx
+import React, { useState } from 'react';
+import {BusinessSearchSelect} from '../../../index.ts';
+
+export default () => {
+  const selectProps = {
+    mode: 'multiple',
+    maxTagCount: 1,
+    // disabled: true
+  }
+  const [value, setValue] = useState(selectProps?.mode ? [] : null);
+  const props = {
+    value,
+    onChange: (value: any) => {
+      console.log(value)
+      setValue(value)
+    },
+    // requestConfig: {
+    //   url: `http://test.i-baby.net/bop/api/physicalWarehouse`,
+    //   filter: 'qp-nameAndCode-like',
+    //   mappingTextField: 'physicalWarehouseName',
+    //   mappingValueField: 'physicalWarehouseCode',
+    //   otherParams: {
+    //     sorter: 'desc-id'
+    //   }, // 默认参数
+    //   sourceName: 'warehouseIds',
+    // },
+    prefixUrl: { selectPrefix: 'http://test.i-baby.net/bop/api', formSelectFix: 'http://test.i-baby.net/bop/api' },
+    selectProps,
+    selectBusinessType: 'physicalWarehouse',
+  };
+  
+  return (
+    <div>
+      <BusinessSearchSelect {...props} />
+    </div>
+  );
+};
+```
+
+仓库选择器(逻辑仓) Select-Warehouse-002:
+
+```tsx
+import React, { useState } from 'react';
+import {BusinessSearchSelect} from '../../../index.ts';
+
+export default () => {
+  const selectProps = {
+    mode: 'multiple',
+    maxTagCount: 1,
+    // disabled: true
+  }
+  const [value, setValue] = useState(selectProps?.mode ? [] : null);
+  const props = {
+    value,
+    onChange: (value: any) => {
+      console.log(value)
+      setValue(value)
+    },
+    // requestConfig: {
+    //   url: `http://test.i-baby.net/bop/api/realWarehouse`,
+    //   filter: 'qp-nameAndCode-like',
+    //   mappingTextField: 'realWarehouseName',
+    //   mappingValueField: 'realWarehouseCode',
+    //   otherParams: {
+    //     sorter: 'desc-id'
+    //   }, // 默认参数
+    //   sourceName: 'warehouseIds',
+    // },
+    prefixUrl: { selectPrefix: 'http://test.i-baby.net/bop/api', formSelectFix: 'http://test.i-baby.net/bop/api' },
+    selectProps,
+    selectBusinessType: 'realWarehouse',
+  };
+  
+  return (
+    <div>
+      <BusinessSearchSelect {...props} />
+    </div>
+  );
+};
+```
 More skills for writing demo: https://d.umijs.org/guide/demo-principle

package/src/components/SearchSelect/index.tsx

@@ -20,7 +20,7 @@ const SearchSelect = (props: any) => {
     requestConfig,
     ctx,
   } = props;
-  const { url, otherParams, isMap, fixedparameter, fieldValToParam, mappingTextField='name', mappingValueField='code', sourceName='supplierCode' } = requestConfig || {};
+  const { url, otherParams, isMap, fixedparameter, fieldValToParam, mappingTextField='name', mappingTextShowKeyField,mappingValueField='code', sourceName='supplierCode' } = requestConfig || {};
 
   const selectMode = selectProps?.mode  // 设定当前选择器 为单选或者多选模式 无设定为单选模式（默认）
   const initVal = value || (selectMode ? [] : null);
@@ -47,11 +47,11 @@ const SearchSelect = (props: any) => {
   const [isModalVisible, setIsModalVisible] = useState(false);
   const [popvalue, setPopValue] = useState(initVal);
   const { run } = useDebounceFn(
-    () => {
+    (v?: any) => {
       // 优化搜索参数 支持传多个
       let searchParams = {};
       if(typeof selectParamsKey === 'string') {
-        searchParams = { [selectParamsKey]: searchValue }
+        searchParams = { [selectParamsKey]: v ? initVal : searchValue }
       }
       if(Array.isArray(selectParamsKey)) {
         selectParamsKey.forEach((i: any) => {
@@ -128,6 +128,7 @@ const SearchSelect = (props: any) => {
                 return {
                   ...item,
                   text: item[mappingTextField],
+                  textShowKey: item[mappingTextShowKeyField || mappingValueField],
                   value: item[mappingValueField],
                 };
               })
@@ -136,6 +137,7 @@ const SearchSelect = (props: any) => {
                 return {
                   ...item,
                   text: item[mappingTextField],
+                  textShowKey: item[mappingTextShowKeyField || mappingValueField],
                   value: item[mappingValueField],
                 };
               })
@@ -143,7 +145,6 @@ const SearchSelect = (props: any) => {
         }
         source = Array.isArray(source) ? source : []
         if(type === 1) {
-          console.log(sourceName, 'sourceName')
           ctx?.form?.setFieldSource(sourceName, source)
           setItems(source)
           setItemsTotal(Number(res?.total))
@@ -171,7 +172,7 @@ const SearchSelect = (props: any) => {
   }
 
   useEffect(() => {
-    getData()
+    run('init')
   }, [])
 
   useEffect(() => {
@@ -203,6 +204,10 @@ const SearchSelect = (props: any) => {
   const handleOk = () => {
     if(popvalue?.length) {
       formaData(popvalue);
+      // 解决选择最后1页的sku，返回后，不显示名称问题
+      const source = _.uniqBy(items.concat(popvalue), 'value')
+      ctx?.form?.setFieldSource(sourceName, source)
+      setItems(source)
     }
     setIsModalVisible(false);
   };
@@ -430,7 +435,7 @@ const SearchSelect = (props: any) => {
         >
           {items.map(item => (
             <Option key={item.value} label={item.text}>
-              {LightHeightOption({ text: `${item.value}       ${item.text}`, filterTxt: searchValue })}
+              {LightHeightOption({ text: `${item.textShowKey}       ${item.text}`, filterTxt: searchValue })}
             </Option>
           ))}
         </Select>