@bit-sun/business-component 1.1.19 → 1.1.20

package/dist/index.esm.js

@@ -1947,7 +1947,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
       }).map(function (item) {
         var obj = {};
         item.slice(0, itemsTemp.length).map(function (innerItem, index) {
-          obj[_this.state.items[index].code] = innerItem && innerItem.v;
+          obj[_this.state.items[index].code] = innerItem && (innerItem.v === innerItem.m ? innerItem.v : innerItem.m);
         });
         return obj;
       });
@@ -1982,6 +1982,17 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         sheetData.map(function (item, index) {
           if (!res[index]) return item;
 
+          var changeVMIndex = _this.props.columns.findIndex(function (i) {
+            return i === 'skuCode';
+          });
+
+          if (_this.props.columns.find(function (i) {
+            return i === 'skuCode';
+          }) && item[changeVMIndex].v !== res[index].skuCode) {
+            item[changeVMIndex].v = res[index].skuCode;
+            item[changeVMIndex].m = res[index].skuCode;
+          }
+
           if (res[index].flag) {
             item[validIndex] = _objectSpread2(_objectSpread2({}, item[validIndex]), {}, {
               v: '通过',
@@ -2438,7 +2449,8 @@ var SearchSelect = function SearchSelect(props) {
       _props$labelInValue = props.labelInValue,
       labelInValue = _props$labelInValue === void 0 ? false : _props$labelInValue,
       requestConfig = props.requestConfig,
-      ctx = props.ctx;
+      ctx = props.ctx,
+      sourceName = props.sourceName;
 
   var _ref = requestConfig || {},
       url = _ref.url,
@@ -2450,10 +2462,9 @@ var SearchSelect = function SearchSelect(props) {
       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,
-      sourceName = _ref$sourceName === void 0 ? 'supplierCode' : _ref$sourceName;
+      mappingValueField = _ref$mappingValueFiel === void 0 ? 'code' : _ref$mappingValueFiel;
 
+  var resultSourceKey = sourceName || (requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.sourceName) || 'supplierCode';
   var selectMode = selectProps === null || selectProps === void 0 ? void 0 : selectProps.mode; // 设定当前选择器 为单选或者多选模式 无设定为单选模式（默认）
 
   var initVal = value || (selectMode ? [] : null);
@@ -2646,7 +2657,7 @@ 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(sourceName, source);
+        ctx === null || ctx === void 0 ? void 0 : (_ctx$form = ctx.form) === null || _ctx$form === void 0 ? void 0 : _ctx$form.setFieldSource(resultSourceKey, source);
         setItems(source);
         setItemsTotal(Number(res === null || res === void 0 ? void 0 : res.total));
       } else {
@@ -2738,7 +2749,7 @@ var SearchSelect = function SearchSelect(props) {
 
       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);
+      ctx === null || ctx === void 0 ? void 0 : (_ctx$form2 = ctx.form) === null || _ctx$form2 === void 0 ? void 0 : _ctx$form2.setFieldSource(resultSourceKey, source);
       setItems(source);
     }
 
@@ -2895,6 +2906,11 @@ var SearchSelect = function SearchSelect(props) {
     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));
+  }; // 生成唯一值
+
+
+  var makeUniqueValue = function makeUniqueValue() {
+    return ((1 + Math.random()) * 0x10000 | 0).toString(16);
   };
 
   var rowSelection = {
@@ -2982,7 +2998,7 @@ var SearchSelect = function SearchSelect(props) {
     className: 'search_select'
   }, /*#__PURE__*/React.createElement("div", {
     className: "search_select_show",
-    id: 'search_select_div'
+    id: "search_select_div_".concat(makeUniqueValue())
   }, /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({
     virtual: true,
     labelInValue: labelInValue,
@@ -3028,7 +3044,7 @@ var SearchSelect = function SearchSelect(props) {
     onPopupScroll: SelectScroll
   }, currentSelectProps), {}, {
     getPopupContainer: function getPopupContainer() {
-      return document.getElementById('search_select_div');
+      return document.getElementById("search_select_div_".concat(makeUniqueValue()));
     },
     style: {
       width: 'calc(100% - 30px)'

package/dist/index.js

@@ -1958,7 +1958,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
       }).map(function (item) {
         var obj = {};
         item.slice(0, itemsTemp.length).map(function (innerItem, index) {
-          obj[_this.state.items[index].code] = innerItem && innerItem.v;
+          obj[_this.state.items[index].code] = innerItem && (innerItem.v === innerItem.m ? innerItem.v : innerItem.m);
         });
         return obj;
       });
@@ -1993,6 +1993,17 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         sheetData.map(function (item, index) {
           if (!res[index]) return item;
 
+          var changeVMIndex = _this.props.columns.findIndex(function (i) {
+            return i === 'skuCode';
+          });
+
+          if (_this.props.columns.find(function (i) {
+            return i === 'skuCode';
+          }) && item[changeVMIndex].v !== res[index].skuCode) {
+            item[changeVMIndex].v = res[index].skuCode;
+            item[changeVMIndex].m = res[index].skuCode;
+          }
+
           if (res[index].flag) {
             item[validIndex] = _objectSpread2(_objectSpread2({}, item[validIndex]), {}, {
               v: '通过',
@@ -2449,7 +2460,8 @@ var SearchSelect = function SearchSelect(props) {
       _props$labelInValue = props.labelInValue,
       labelInValue = _props$labelInValue === void 0 ? false : _props$labelInValue,
       requestConfig = props.requestConfig,
-      ctx = props.ctx;
+      ctx = props.ctx,
+      sourceName = props.sourceName;
 
   var _ref = requestConfig || {},
       url = _ref.url,
@@ -2461,10 +2473,9 @@ var SearchSelect = function SearchSelect(props) {
       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,
-      sourceName = _ref$sourceName === void 0 ? 'supplierCode' : _ref$sourceName;
+      mappingValueField = _ref$mappingValueFiel === void 0 ? 'code' : _ref$mappingValueFiel;
 
+  var resultSourceKey = sourceName || (requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.sourceName) || 'supplierCode';
   var selectMode = selectProps === null || selectProps === void 0 ? void 0 : selectProps.mode; // 设定当前选择器 为单选或者多选模式 无设定为单选模式（默认）
 
   var initVal = value || (selectMode ? [] : null);
@@ -2657,7 +2668,7 @@ 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(sourceName, source);
+        ctx === null || ctx === void 0 ? void 0 : (_ctx$form = ctx.form) === null || _ctx$form === void 0 ? void 0 : _ctx$form.setFieldSource(resultSourceKey, source);
         setItems(source);
         setItemsTotal(Number(res === null || res === void 0 ? void 0 : res.total));
       } else {
@@ -2749,7 +2760,7 @@ var SearchSelect = function SearchSelect(props) {
 
       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);
+      ctx === null || ctx === void 0 ? void 0 : (_ctx$form2 = ctx.form) === null || _ctx$form2 === void 0 ? void 0 : _ctx$form2.setFieldSource(resultSourceKey, source);
       setItems(source);
     }
 
@@ -2906,6 +2917,11 @@ var SearchSelect = function SearchSelect(props) {
     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));
+  }; // 生成唯一值
+
+
+  var makeUniqueValue = function makeUniqueValue() {
+    return ((1 + Math.random()) * 0x10000 | 0).toString(16);
   };
 
   var rowSelection = {
@@ -2993,7 +3009,7 @@ var SearchSelect = function SearchSelect(props) {
     className: 'search_select'
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: "search_select_show",
-    id: 'search_select_div'
+    id: "search_select_div_".concat(makeUniqueValue())
   }, /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2(_objectSpread2({
     virtual: true,
     labelInValue: labelInValue,
@@ -3039,7 +3055,7 @@ var SearchSelect = function SearchSelect(props) {
     onPopupScroll: SelectScroll
   }, currentSelectProps), {}, {
     getPopupContainer: function getPopupContainer() {
-      return document.getElementById('search_select_div');
+      return document.getElementById("search_select_div_".concat(makeUniqueValue()));
     },
     style: {
       width: 'calc(100% - 30px)'

package/package.json

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

package/src/components/DataValidation/index.tsx

@@ -379,7 +379,7 @@ class DataValidation extends React.Component {
         let obj = {};
 
         item.slice(0, itemsTemp.length).map((innerItem, index) => {
-          obj[this.state.items[index].code] = innerItem && innerItem.v;
+          obj[this.state.items[index].code] = innerItem && (innerItem.v === innerItem.m ? innerItem.v : innerItem.m);
         });
 
         return obj;
@@ -414,6 +414,12 @@ class DataValidation extends React.Component {
         sheetData.map((item, index) => {
           if (!res[index]) return item;
 
+          const changeVMIndex = this.props.columns.findIndex(i => i === 'skuCode');
+          if(this.props.columns.find(i => i === 'skuCode') && item[changeVMIndex].v !== res[index].skuCode) {
+            item[changeVMIndex].v = res[index].skuCode;
+            item[changeVMIndex].m = res[index].skuCode;
+          }
+
           if (res[index].flag) {
             item[validIndex] = {
               ...item[validIndex],

package/src/components/SearchSelect/index.tsx

@@ -19,8 +19,10 @@ const SearchSelect = (props: any) => {
     labelInValue=false,
     requestConfig,
     ctx,
+    sourceName,
   } = props;
-  const { url, otherParams, isMap, fixedparameter, fieldValToParam, mappingTextField='name', mappingTextShowKeyField,mappingValueField='code', sourceName='supplierCode' } = requestConfig || {};
+  const { url, otherParams, isMap, fixedparameter, fieldValToParam, mappingTextField='name', mappingTextShowKeyField,mappingValueField='code' } = requestConfig || {};
+  const resultSourceKey = sourceName || requestConfig?.sourceName || 'supplierCode'
 
   const selectMode = selectProps?.mode  // 设定当前选择器 为单选或者多选模式 无设定为单选模式（默认）
   const initVal = value || (selectMode ? [] : null);
@@ -144,7 +146,7 @@ const SearchSelect = (props: any) => {
         }
         source = Array.isArray(source) ? source : []
         if(type === 1) {
-          ctx?.form?.setFieldSource(sourceName, source)
+          ctx?.form?.setFieldSource(resultSourceKey, source)
           setItems(source)
           setItemsTotal(Number(res?.total))
         } else {
@@ -207,7 +209,7 @@ const SearchSelect = (props: any) => {
       formaData(popvalue);
       // 解决选择最后1页的sku，返回后，不显示名称问题
       const source = _.uniqBy(items.concat(popvalue), 'value')
-      ctx?.form?.setFieldSource(sourceName, source)
+      ctx?.form?.setFieldSource(resultSourceKey, source)
       setItems(source)
     }
     handleCancel();
@@ -341,6 +343,11 @@ const SearchSelect = (props: any) => {
     setCheckedAll(filterRows.length === tablePagination?.total);
   }
 
+  // 生成唯一值
+  const makeUniqueValue = () => {
+    return (((1+Math.random())*0x10000)|0).toString(16);
+  }
+
   const rowSelection = {
     type: selectMode ? 'checkbox' : 'radio',
     selectedRowKeys,
@@ -396,7 +403,7 @@ const SearchSelect = (props: any) => {
 
   return (
     <div className={'search_select'}>
-      <div className="search_select_show" id='search_select_div'>
+      <div className="search_select_show" id={`search_select_div_${makeUniqueValue()}`}>
         <Select
           virtual
           labelInValue={labelInValue}
@@ -430,7 +437,7 @@ const SearchSelect = (props: any) => {
           }
           onPopupScroll={SelectScroll}
           {...currentSelectProps}
-          getPopupContainer={() => document.getElementById('search_select_div')}
+          getPopupContainer={() => document.getElementById(`search_select_div_${makeUniqueValue()}`)}
           style={{ width: 'calc(100% - 30px)' }}
           placeholder="请选择"
         >