@bit-sun/business-component 1.1.14 → 1.1.15

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)) {
@@ -2634,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]
           });
         })) : [];
@@ -2649,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));
@@ -2685,7 +2687,7 @@ var SearchSelect = function SearchSelect(props) {
   };
 
   useEffect(function () {
-    getData();
+    run('init');
   }, []);
   useEffect(function () {
     if (value) {
@@ -2748,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);
@@ -3047,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, {
@@ -3533,6 +3542,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 +3625,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)) {
@@ -2645,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]
           });
         })) : [];
@@ -2660,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));
@@ -2696,7 +2698,7 @@ var SearchSelect = function SearchSelect(props) {
   };
 
   React.useEffect(function () {
-    getData();
+    run('init');
   }, []);
   React.useEffect(function () {
     if (value) {
@@ -2759,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);
@@ -3058,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, {
@@ -3544,6 +3553,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 +3636,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.15",
   "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) => {
@@ -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>