@bit-sun/business-component 1.1.14 → 1.1.17

package/dist/index.esm.js

@@ -2448,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,
@@ -2508,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)) {
@@ -2561,30 +2562,24 @@ var SearchSelect = function SearchSelect(props) {
 
   var _useState23 = useState([]),
       _useState24 = _slicedToArray(_useState23, 2),
-      selectedRows = _useState24[0],
-      setSelectedRows = _useState24[1];
+      doubleArr = _useState24[0],
+      setDoubleArr = _useState24[1]; // 存放双数组的数组
 
-  var _useState25 = useState([]),
-      _useState26 = _slicedToArray(_useState25, 2),
-      doubleArr = _useState26[0],
-      setDoubleArr = _useState26[1]; // 存放双数组的数组
 
+  var _useState25 = useState(false),
+      _useState26 = _slicedToArray(_useState25, 2),
+      checkedAll = _useState26[0],
+      setCheckedAll = _useState26[1];
 
-  var _useState27 = useState([]),
+  var _useState27 = useState(false),
       _useState28 = _slicedToArray(_useState27, 2),
-      filterRows = _useState28[0],
-      setFilterRows = _useState28[1]; // 存放拼接后的一维数组的变量
-
+      indeterminate = _useState28[0],
+      setIndeterminate = _useState28[1];
 
-  var _useState29 = useState(false),
+  var _useState29 = useState({}),
       _useState30 = _slicedToArray(_useState29, 2),
-      checkedAll = _useState30[0],
-      setCheckedAll = _useState30[1];
-
-  var _useState31 = useState(false),
-      _useState32 = _slicedToArray(_useState31, 2),
-      indeterminate = _useState32[0],
-      setIndeterminate = _useState32[1]; // 获取数据源 （type: 1下拉框 2弹框  不传值默认为下拉框）
+      tableFormParams = _useState30[0],
+      setTableFormParams = _useState30[1]; // 获取数据源 （type: 1下拉框 2弹框  不传值默认为下拉框）
 
 
   var getData = function getData() {
@@ -2634,11 +2629,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 +2646,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 +2681,7 @@ var SearchSelect = function SearchSelect(props) {
   };
 
   useEffect(function () {
-    getData();
+    run('init');
   }, []);
   useEffect(function () {
     if (value) {
@@ -2706,16 +2702,6 @@ var SearchSelect = function SearchSelect(props) {
         setSelectedRowKeys(labelInValue ? value.map(function (i) {
           return i.key;
         }) : value);
-        setSelectedRows(labelInValue ? value.map(function (i) {
-          return {
-            value: i.key,
-            text: i.label
-          };
-        }) : value.map(function (i) {
-          return {
-            value: i
-          };
-        }));
         setPopValue(labelInValue ? value.map(function (i) {
           return {
             value: i.key,
@@ -2727,15 +2713,13 @@ var SearchSelect = function SearchSelect(props) {
           };
         }));
         setIndeterminate(!!value.length && value.length < itemsTotal);
-        setCheckedAll(value.length === itemsTotal);
+        setCheckedAll(value.length === itemsTotal); // 需清空数据
+
+        if (!value.length) {
+          setDoubleArr([]);
+        }
       } else {
         setSelectedRowKeys(labelInValue ? [value.key] : [value]);
-        setSelectedRows(labelInValue ? [{
-          value: value.key,
-          text: value.label
-        }] : [{
-          value: value
-        }]);
         setPopValue(labelInValue ? [{
           value: value.key,
           text: value.label
@@ -2748,10 +2732,17 @@ 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);
+    handleCancel();
   };
 
   var formaData = function formaData(value) {
@@ -2774,6 +2765,8 @@ var SearchSelect = function SearchSelect(props) {
   };
 
   var handleCancel = function handleCancel() {
+    form.resetFields();
+    setTableFormParams({});
     setIsModalVisible(false);
   };
 
@@ -2789,6 +2782,7 @@ var SearchSelect = function SearchSelect(props) {
 
   var onSearchTable = function onSearchTable() {
     var params = form.getFieldsValue();
+    setTableFormParams(params);
     getData(_objectSpread2(_objectSpread2({}, params), {}, {
       pageSize: tableInitPageSize
     }), 2);
@@ -2796,6 +2790,7 @@ var SearchSelect = function SearchSelect(props) {
 
   var onResetTable = function onResetTable() {
     form.resetFields();
+    setTableFormParams({});
     handleTableChange({
       pageSize: tableInitPageSize,
       currentPage: 1
@@ -2803,8 +2798,7 @@ var SearchSelect = function SearchSelect(props) {
   };
 
   var handleTableChange = function handleTableChange(pagination) {
-    var params = form.getFieldsValue();
-    getData(_objectSpread2(_objectSpread2({}, params), {}, {
+    getData(_objectSpread2(_objectSpread2({}, tableFormParams), {}, {
       pageSize: pagination.pageSize,
       currentPage: pagination.current
     }), 2);
@@ -2818,13 +2812,12 @@ var SearchSelect = function SearchSelect(props) {
         setSelectedRowKeys(currentItemsData.map(function (i) {
           return i.value;
         }));
-        setSelectedRows(currentItemsData);
         setPopValue(currentItemsData);
       }
     } else {
       setSelectedRowKeys([]);
-      setSelectedRows([]);
       setPopValue([]);
+      setDoubleArr([]);
     }
 
     setIndeterminate(false);
@@ -2874,7 +2867,8 @@ var SearchSelect = function SearchSelect(props) {
 
   var onChangeSelectedKeys = function onChangeSelectedKeys(selectKeys, selectRows) {
     var nowPage = tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.current;
-    var filterRows = [];
+    var filterRows = []; // 存放拼接后的一维数组的变量
+
     var sksResult = [];
 
     if (selectMode) {
@@ -2886,7 +2880,6 @@ var SearchSelect = function SearchSelect(props) {
 
       filterRows = mapRows(doubleArr); // console.log(filterRows)
 
-      setFilterRows(filterRows);
       sksResult = filterRows.map(function (i) {
         return i.value;
       });
@@ -2899,7 +2892,6 @@ var SearchSelect = function SearchSelect(props) {
     }
 
     setSelectedRowKeys(sksResult);
-    setSelectedRows(filterRows);
     setPopValue(filterRows);
     setIndeterminate(!!filterRows.length && filterRows.length < (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.total));
     setCheckedAll(filterRows.length === (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.total));
@@ -3047,7 +3039,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, {
@@ -3533,6 +3525,7 @@ function commonFun(type, prefixUrl) {
       url: "".concat(prefixUrl.selectPrefix, "/physicalWarehouse"),
       filter: 'qp-nameAndCode-like',
       mappingTextField: 'physicalWarehouseName',
+      mappingTextShowKeyField: 'physicalWarehouseCode',
       mappingValueField: 'id',
       otherParams: {
         sorter: 'desc-id'
@@ -3615,6 +3608,7 @@ function commonFun(type, prefixUrl) {
       url: "".concat(prefixUrl.selectPrefix, "/realWarehouse"),
       filter: 'qp-nameAndCode-like',
       mappingTextField: 'realWarehouseName',
+      mappingTextShowKeyField: 'realWarehouseCode',
       mappingValueField: 'id',
       otherParams: {
         sorter: 'desc-id'

package/dist/index.js

@@ -2459,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,
@@ -2519,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)) {
@@ -2572,30 +2573,24 @@ var SearchSelect = function SearchSelect(props) {
 
   var _useState23 = React.useState([]),
       _useState24 = _slicedToArray(_useState23, 2),
-      selectedRows = _useState24[0],
-      setSelectedRows = _useState24[1];
+      doubleArr = _useState24[0],
+      setDoubleArr = _useState24[1]; // 存放双数组的数组
 
-  var _useState25 = React.useState([]),
-      _useState26 = _slicedToArray(_useState25, 2),
-      doubleArr = _useState26[0],
-      setDoubleArr = _useState26[1]; // 存放双数组的数组
 
+  var _useState25 = React.useState(false),
+      _useState26 = _slicedToArray(_useState25, 2),
+      checkedAll = _useState26[0],
+      setCheckedAll = _useState26[1];
 
-  var _useState27 = React.useState([]),
+  var _useState27 = React.useState(false),
       _useState28 = _slicedToArray(_useState27, 2),
-      filterRows = _useState28[0],
-      setFilterRows = _useState28[1]; // 存放拼接后的一维数组的变量
-
+      indeterminate = _useState28[0],
+      setIndeterminate = _useState28[1];
 
-  var _useState29 = React.useState(false),
+  var _useState29 = React.useState({}),
       _useState30 = _slicedToArray(_useState29, 2),
-      checkedAll = _useState30[0],
-      setCheckedAll = _useState30[1];
-
-  var _useState31 = React.useState(false),
-      _useState32 = _slicedToArray(_useState31, 2),
-      indeterminate = _useState32[0],
-      setIndeterminate = _useState32[1]; // 获取数据源 （type: 1下拉框 2弹框  不传值默认为下拉框）
+      tableFormParams = _useState30[0],
+      setTableFormParams = _useState30[1]; // 获取数据源 （type: 1下拉框 2弹框  不传值默认为下拉框）
 
 
   var getData = function getData() {
@@ -2645,11 +2640,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]
           });
         })) : [];
@@ -2660,7 +2657,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));
@@ -2696,7 +2692,7 @@ var SearchSelect = function SearchSelect(props) {
   };
 
   React.useEffect(function () {
-    getData();
+    run('init');
   }, []);
   React.useEffect(function () {
     if (value) {
@@ -2717,16 +2713,6 @@ var SearchSelect = function SearchSelect(props) {
         setSelectedRowKeys(labelInValue ? value.map(function (i) {
           return i.key;
         }) : value);
-        setSelectedRows(labelInValue ? value.map(function (i) {
-          return {
-            value: i.key,
-            text: i.label
-          };
-        }) : value.map(function (i) {
-          return {
-            value: i
-          };
-        }));
         setPopValue(labelInValue ? value.map(function (i) {
           return {
             value: i.key,
@@ -2738,15 +2724,13 @@ var SearchSelect = function SearchSelect(props) {
           };
         }));
         setIndeterminate(!!value.length && value.length < itemsTotal);
-        setCheckedAll(value.length === itemsTotal);
+        setCheckedAll(value.length === itemsTotal); // 需清空数据
+
+        if (!value.length) {
+          setDoubleArr([]);
+        }
       } else {
         setSelectedRowKeys(labelInValue ? [value.key] : [value]);
-        setSelectedRows(labelInValue ? [{
-          value: value.key,
-          text: value.label
-        }] : [{
-          value: value
-        }]);
         setPopValue(labelInValue ? [{
           value: value.key,
           text: value.label
@@ -2759,10 +2743,17 @@ 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);
+    handleCancel();
   };
 
   var formaData = function formaData(value) {
@@ -2785,6 +2776,8 @@ var SearchSelect = function SearchSelect(props) {
   };
 
   var handleCancel = function handleCancel() {
+    form.resetFields();
+    setTableFormParams({});
     setIsModalVisible(false);
   };
 
@@ -2800,6 +2793,7 @@ var SearchSelect = function SearchSelect(props) {
 
   var onSearchTable = function onSearchTable() {
     var params = form.getFieldsValue();
+    setTableFormParams(params);
     getData(_objectSpread2(_objectSpread2({}, params), {}, {
       pageSize: tableInitPageSize
     }), 2);
@@ -2807,6 +2801,7 @@ var SearchSelect = function SearchSelect(props) {
 
   var onResetTable = function onResetTable() {
     form.resetFields();
+    setTableFormParams({});
     handleTableChange({
       pageSize: tableInitPageSize,
       currentPage: 1
@@ -2814,8 +2809,7 @@ var SearchSelect = function SearchSelect(props) {
   };
 
   var handleTableChange = function handleTableChange(pagination) {
-    var params = form.getFieldsValue();
-    getData(_objectSpread2(_objectSpread2({}, params), {}, {
+    getData(_objectSpread2(_objectSpread2({}, tableFormParams), {}, {
       pageSize: pagination.pageSize,
       currentPage: pagination.current
     }), 2);
@@ -2829,13 +2823,12 @@ var SearchSelect = function SearchSelect(props) {
         setSelectedRowKeys(currentItemsData.map(function (i) {
           return i.value;
         }));
-        setSelectedRows(currentItemsData);
         setPopValue(currentItemsData);
       }
     } else {
       setSelectedRowKeys([]);
-      setSelectedRows([]);
       setPopValue([]);
+      setDoubleArr([]);
     }
 
     setIndeterminate(false);
@@ -2885,7 +2878,8 @@ var SearchSelect = function SearchSelect(props) {
 
   var onChangeSelectedKeys = function onChangeSelectedKeys(selectKeys, selectRows) {
     var nowPage = tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.current;
-    var filterRows = [];
+    var filterRows = []; // 存放拼接后的一维数组的变量
+
     var sksResult = [];
 
     if (selectMode) {
@@ -2897,7 +2891,6 @@ var SearchSelect = function SearchSelect(props) {
 
       filterRows = mapRows(doubleArr); // console.log(filterRows)
 
-      setFilterRows(filterRows);
       sksResult = filterRows.map(function (i) {
         return i.value;
       });
@@ -2910,7 +2903,6 @@ var SearchSelect = function SearchSelect(props) {
     }
 
     setSelectedRowKeys(sksResult);
-    setSelectedRows(filterRows);
     setPopValue(filterRows);
     setIndeterminate(!!filterRows.length && filterRows.length < (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.total));
     setCheckedAll(filterRows.length === (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.total));
@@ -3058,7 +3050,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, {
@@ -3544,6 +3536,7 @@ function commonFun(type, prefixUrl) {
       url: "".concat(prefixUrl.selectPrefix, "/physicalWarehouse"),
       filter: 'qp-nameAndCode-like',
       mappingTextField: 'physicalWarehouseName',
+      mappingTextShowKeyField: 'physicalWarehouseCode',
       mappingValueField: 'id',
       otherParams: {
         sorter: 'desc-id'
@@ -3626,6 +3619,7 @@ function commonFun(type, prefixUrl) {
       url: "".concat(prefixUrl.selectPrefix, "/realWarehouse"),
       filter: 'qp-nameAndCode-like',
       mappingTextField: 'realWarehouseName',
+      mappingTextShowKeyField: 'realWarehouseCode',
       mappingValueField: 'id',
       otherParams: {
         sorter: 'desc-id'

package/package.json

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

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

@@ -351,6 +351,7 @@ export function commonFun (type?: string, prefixUrl: any) {
       url: `${prefixUrl.selectPrefix}/physicalWarehouse`,
       filter: 'qp-nameAndCode-like', // 过滤参数
       mappingTextField: 'physicalWarehouseName',
+      mappingTextShowKeyField: 'physicalWarehouseCode',
       mappingValueField: 'id',
       otherParams: {
         sorter: 'desc-id'
@@ -420,6 +421,7 @@ export function commonFun (type?: string, prefixUrl: any) {
       url: `${prefixUrl.selectPrefix}/realWarehouse`,
       filter: 'qp-nameAndCode-like', // 过滤参数
       mappingTextField: 'realWarehouseName',
+      mappingTextShowKeyField: 'realWarehouseCode',
       mappingValueField: 'id',
       otherParams: {
         sorter: 'desc-id'

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) => {
@@ -71,11 +71,10 @@ const SearchSelect = (props: any) => {
   const [tableData, setTableData] = useState([]);
   const [tablePagination, setTablePagination] = useState({ showQuickJumper: true, total: 0, current: 1, pageSize: tableInitPageSize })
   const [selectedRowKeys, setSelectedRowKeys] = useState([]);
-  const [selectedRows, setSelectedRows] = useState([]);
   const [doubleArr, setDoubleArr] = useState([]); // 存放双数组的数组
-  const [filterRows, setFilterRows] = useState([]); // 存放拼接后的一维数组的变量
   const [checkedAll, setCheckedAll] = useState(false)
   const [indeterminate, setIndeterminate] = useState(false)
+  const [tableFormParams, setTableFormParams] = useState({});
 
   // 获取数据源 （type: 1下拉框 2弹框  不传值默认为下拉框）
   const getData = (params={}, type=1) => {
@@ -128,6 +127,7 @@ const SearchSelect = (props: any) => {
                 return {
                   ...item,
                   text: item[mappingTextField],
+                  textShowKey: item[mappingTextShowKeyField || mappingValueField],
                   value: item[mappingValueField],
                 };
               })
@@ -136,6 +136,7 @@ const SearchSelect = (props: any) => {
                 return {
                   ...item,
                   text: item[mappingTextField],
+                  textShowKey: item[mappingTextShowKeyField || mappingValueField],
                   value: item[mappingValueField],
                 };
               })
@@ -143,7 +144,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 +171,7 @@ const SearchSelect = (props: any) => {
   }
 
   useEffect(() => {
-    getData()
+    run('init')
   }, [])
 
   useEffect(() => {
@@ -188,13 +188,15 @@ const SearchSelect = (props: any) => {
     if(value) {
       if(selectMode) {
         setSelectedRowKeys(labelInValue ? value.map(i => i.key) : value)
-        setSelectedRows(labelInValue ? value.map(i => ({ value: i.key, text: i.label })) : value.map(i => ({ value: i })))
         setPopValue(labelInValue ? value.map(i => ({ value: i.key, text: i.label })) : value.map(i => ({ value: i })));
         setIndeterminate(!!value.length && value.length < itemsTotal);
         setCheckedAll(value.length === itemsTotal);
+        // 需清空数据
+        if(!value.length) {
+          setDoubleArr([])
+        }
       } else {
         setSelectedRowKeys(labelInValue ? [value.key] : [value])
-        setSelectedRows(labelInValue ? [{ value: value.key, text: value.label }] : [{ value: value }])
         setPopValue(labelInValue ? [{ value: value.key, text: value.label }] : [{ value: value }]);
       }
     }
@@ -203,8 +205,12 @@ 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);
+    handleCancel();
   };
 
   const formaData = (value) => {
@@ -218,6 +224,8 @@ const SearchSelect = (props: any) => {
   };
 
   const handleCancel = () => {
+    form.resetFields();
+    setTableFormParams({});
     setIsModalVisible(false);
   };
 
@@ -233,17 +241,18 @@ const SearchSelect = (props: any) => {
 
   const onSearchTable = () => {
     const params = form.getFieldsValue();
+    setTableFormParams(params);
     getData({ ...params, pageSize: tableInitPageSize }, 2)
   }
 
   const onResetTable = () => {
     form.resetFields();
+    setTableFormParams({});
     handleTableChange({ pageSize: tableInitPageSize, currentPage: 1 })
   }
 
   const handleTableChange = (pagination) => {
-    const params = form.getFieldsValue();
-    getData({ ...params, pageSize: pagination.pageSize, currentPage: pagination.current }, 2)
+    getData({ ...tableFormParams, pageSize: pagination.pageSize, currentPage: pagination.current }, 2)
   }
 
   const onChangeCheckAll = (e) => {
@@ -252,15 +261,14 @@ const SearchSelect = (props: any) => {
       if(items.length === itemsTotal) {
         const currentItemsData = JSON.parse(JSON.stringify(items))
         setSelectedRowKeys(currentItemsData.map(i => i.value))
-        setSelectedRows(currentItemsData)
         setPopValue(currentItemsData);
       } else {
         // TODO 请求接口获取所有数据
       }
     } else {
       setSelectedRowKeys([])
-      setSelectedRows([])
       setPopValue([]);
+      setDoubleArr([])
     }
     setIndeterminate(false);
     setCheckedAll(e.target.checked);
@@ -307,7 +315,7 @@ const SearchSelect = (props: any) => {
   const onChangeSelectedKeys=(selectKeys,selectRows) => {
     const nowPage = tablePagination?.current;
 
-    let filterRows = [];
+    let filterRows = []; // 存放拼接后的一维数组的变量
     let sksResult = [];
 
     if(selectMode) {
@@ -319,7 +327,6 @@ const SearchSelect = (props: any) => {
       // 这块扁平化成为一位数组
       filterRows = mapRows(doubleArr);
       // console.log(filterRows)
-      setFilterRows(filterRows)
 
       sksResult = filterRows.map((i) => i.value)
     } else {
@@ -329,7 +336,6 @@ const SearchSelect = (props: any) => {
     }
 
     setSelectedRowKeys(sksResult)
-    setSelectedRows(filterRows)
     setPopValue(filterRows);
     setIndeterminate(!!filterRows.length && filterRows.length < tablePagination?.total);
     setCheckedAll(filterRows.length === tablePagination?.total);
@@ -430,7 +436,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>