@kmkf-fe-packages/basic-components 2.2.44 → 2.2.45

package/dist/index.esm.js

@@ -3,7 +3,7 @@ import { Cascader, DatePicker, Image, InputNumber, Input, Select, Upload, messag
 import { EyeOutlined, DeleteOutlined, CloseOutlined, PlusSquareOutlined, MinusCircleFilled, PlusCircleFilled, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, UpOutlined, DownOutlined, PlusOutlined, VideoCameraTwoTone } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
-import { AddressData, BsAddressData, WdtAddressData, GyAddressData, JstAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, findLabelBySelectValue, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, filterKmOrders, getSystemShowHead, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateWdtAftersaleGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, BsAddressData, WdtAddressData, GyAddressData, JstAddressData, request as request$1, ExpressData, isNull, imgResize, uuid, servers, columnsGoodsList, LogisticsAddressData, SendDataCenter, kmSkuTypeMap, hasAddNullComponent, SUBMIT_TIME_ID, UPGRADE_TIME_ID, FINAL_TIME_ID, CUSTOM_TIME_ID, useStatus, finalFormData, transformList, dataSourceTrans, DATA_SPLIT_COMPONENT_FIELDS_MAP, findLabelBySelectValue, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, tradeStatusMap, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, filterJstOrders, filterJyOrders, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, filterKmOrders, getSystemShowHead, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateWdtAftersaleGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog, skxSystemOrderBackValues, skxReturnSystemOrderBackValues, formatTrade, updateSkxGoodsHandle, formatReturnTrade, updateSkxReturnGoodsHandle } from '@kmkf-fe-packages/kmkf-utils';
 import every from 'lodash/every';
 import maxBy from 'lodash/maxBy';
 import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, uniqBy, cloneDeep, difference, differenceWith, isBoolean, isEqual, takeRight, reject as reject$1, intersection, isEmpty } from 'lodash';
@@ -14097,7 +14097,7 @@ var renderTextEllipsis = function renderTextEllipsis(value) {
 var css_248z$b = ".GoodModalColumns .ellipsis-text-3 {\n  display: -webkit-box;\n  overflow: hidden;\n  white-space: normal !important;\n  text-overflow: ellipsis;\n  word-break: break-all;\n  overflow-wrap: anywhere;\n  -webkit-box-orient: vertical;\n  -webkit-line-clamp: 3;\n  line-clamp: 3;\n}\n";
 styleInject(css_248z$b);
 
-var css_248z$c = ".search-form .ant-form-item {\n  margin-right: 0px !important;\n  margin-bottom: 12px !important;\n  padding-right: 10px !important;\n}\n@media (max-width: 600px) {\n  .search-form {\n    display: flex;\n    flex-wrap: wrap;\n  }\n  .search-form .ant-form-item {\n    box-sizing: border-box;\n    width: 33.33% !important;\n  }\n  .search-form .ant-input-affix-wrapper,\n  .search-form .ant-select,\n  .search-form .ant-select-selector {\n    width: 100% !important;\n  }\n  .search-form .search-form-actions .ant-form-item-control-input-content {\n    display: flex;\n    flex-wrap: nowrap;\n    justify-content: space-between;\n  }\n  .search-form .search-form-actions .ant-form-item-control-input-content .ant-btn {\n    width: calc((100% - 8px) / 2) !important;\n    padding: 0 !important;\n  }\n}\n";
+var css_248z$c = ".search-form .ant-form-item {\n  margin-right: 0px !important;\n  margin-bottom: 12px !important;\n  padding-right: 10px !important;\n}\n@media (max-width: 600px) {\n  .search-form {\n    display: flex;\n    flex-wrap: wrap;\n  }\n  .search-form .ant-form-item {\n    box-sizing: border-box;\n    width: 50% !important;\n  }\n  .search-form .ant-input-affix-wrapper,\n  .search-form .ant-select,\n  .search-form .ant-select-selector {\n    width: 100% !important;\n  }\n  .search-form .optional-input-select {\n    width: 70px !important;\n  }\n  .search-form .search-form-actions .ant-form-item-control-input-content {\n    display: flex;\n    flex-wrap: nowrap;\n    justify-content: space-between;\n  }\n  .search-form .search-form-actions .ant-form-item-control-input-content .ant-btn {\n    width: calc((100% - 8px) / 2) !important;\n    padding: 0 !important;\n  }\n}\n";
 styleInject(css_248z$c);
 
 var _excluded$d = ["shopId"];
@@ -14981,7 +14981,9 @@ var kmColumns = [{
   title: "\u5546\u54C1\u7C7B\u578B",
   ellipsis: true,
   width: 150,
-  render: renderTextEllipsis
+  render: function render(type) {
+    return renderTextEllipsis((kmSkuTypeMap === null || kmSkuTypeMap === void 0 ? void 0 : kmSkuTypeMap[type]) || type);
+  }
 }, {
   dataIndex: 'specName',
   title: "SKU\u540D\u79F0",
@@ -15318,6 +15320,64 @@ var useGetColumns = (function (type) {
   return [columns, showColumnsDataIndexList, loading];
 });
 
+var compareSymbolList = [{
+  label: '模糊',
+  value: 'like'
+}, {
+  label: '精准',
+  value: 'eq'
+}];
+var OptionalInput = function OptionalInput(props) {
+  var value = props.value,
+    onChange = props.onChange,
+    _props$placeholder = props.placeholder,
+    placeholder = _props$placeholder === void 0 ? '' : _props$placeholder,
+    onPressEnter = props.onPressEnter,
+    onBlur = props.onBlur,
+    formItemProps = props.formItemProps;
+  var handleSelectChange = function handleSelectChange(compareSymbol) {
+    if (typeof onChange === 'function') {
+      onChange({
+        type: compareSymbol || 'like',
+        inputValue: value === null || value === void 0 ? void 0 : value.inputValue
+      });
+    }
+  };
+  var handleInputChange = function handleInputChange(e) {
+    if (typeof onChange === 'function') {
+      onChange({
+        type: (value === null || value === void 0 ? void 0 : value.type) || 'like',
+        inputValue: e.target.value
+      });
+    }
+  };
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      display: 'flex',
+      alignItems: 'center'
+    }
+  }, /*#__PURE__*/React.createElement(Select, {
+    className: "optional-input-select",
+    style: {
+      width: '70px'
+    },
+    options: compareSymbolList,
+    onChange: handleSelectChange,
+    value: (value === null || value === void 0 ? void 0 : value.type) || 'like',
+    onBlur: onBlur
+  }), /*#__PURE__*/React.createElement(Input, _objectSpread2({
+    style: {
+      width: '150px'
+    },
+    allowClear: true,
+    placeholder: placeholder,
+    onChange: handleInputChange,
+    onPressEnter: onPressEnter,
+    onBlur: onBlur,
+    value: value === null || value === void 0 ? void 0 : value.inputValue
+  }, formItemProps)));
+};
+
 function SearchForm(_ref) {
   var searchFormData = _ref.searchFormData,
     form = _ref.form,
@@ -15369,7 +15429,16 @@ function SearchForm(_ref) {
       style: {
         marginBottom: '12px'
       }
-    }, type === 'select' ? /*#__PURE__*/React.createElement(Select, _objectSpread2({
+    }, type === 'optionalInput' ? /*#__PURE__*/React.createElement(OptionalInput, {
+      onPressEnter: function onPressEnter() {
+        return submitForm();
+      },
+      onBlur: function onBlur() {
+        return submitForm();
+      },
+      placeholder: label,
+      formItemProps: formItemProps
+    }) : type === 'select' ? /*#__PURE__*/React.createElement(Select, _objectSpread2({
       placeholder: label,
       showSearch: true,
       allowClear: true,
@@ -15410,24 +15479,35 @@ function SearchForm(_ref) {
   }, "\u91CD\u7F6E")));
 }
 
+var transformFormData = function transformFormData(formData) {
+  var conditionList = [];
+  for (var key in formData) {
+    if (formData[key]) {
+      var _formData$key, _formData$key2, _formData$key3, _formData$key4;
+      var value = ((_formData$key = formData[key]) === null || _formData$key === void 0 ? void 0 : _formData$key.type) ? (_formData$key2 = formData[key]) === null || _formData$key2 === void 0 ? void 0 : _formData$key2.inputValue : formData[key];
+      var compareSymbol = ((_formData$key3 = formData[key]) === null || _formData$key3 === void 0 ? void 0 : _formData$key3.type) ? (_formData$key4 = formData[key]) === null || _formData$key4 === void 0 ? void 0 : _formData$key4.type : 'like';
+      conditionList.push({
+        leftValue: key,
+        compareSymbol: compareSymbol,
+        rightValue: value
+      });
+    }
+  }
+  return conditionList;
+};
+
 var getTableData = function getTableData(_ref, formData) {
-  var _formData$brandIds;
   var current = _ref.current,
     pageSize = _ref.pageSize;
-  var data = {
-    brandIds: ((_formData$brandIds = formData.brandIds) === null || _formData$brandIds === void 0 ? void 0 : _formData$brandIds.length) ? formData.brandIds : null,
-    skuCode: formData.skuCode || null,
-    skuName: formData.skuName || null,
-    goodName: formData.goodName || null,
-    goodNo: formData.goodNo || null
-  };
+  var conditionList = transformFormData(formData);
   return extendRequest('/qy/gdfw/product/product/page', {
     method: 'post',
-    data: _objectSpread2({
+    data: {
       pageSize: pageSize,
       pageNo: current,
-      platform: 'WDT_ERP'
-    }, data)
+      platform: 'WDT_ERP',
+      conditionList: conditionList
+    }
   }).then(function (res) {
     var _res$data = res.data,
       _res$data$productSkuL = _res$data.productSkuList,
@@ -15521,13 +15601,15 @@ var GoodList = function GoodList(props, ref) {
   }, {
     label: 'SKU编码',
     name: 'skuCode',
-    dataIndex: 'specNo'
+    dataIndex: 'specNo',
+    type: 'optionalInput'
   }, {
     label: '商品名称',
     name: 'goodName'
   }, {
     label: '商品编码',
-    name: 'goodNo'
+    name: 'goodNo',
+    type: 'optionalInput'
   }, {
     label: '品牌',
     name: 'brandIds',
@@ -15717,13 +15799,15 @@ var WdtGoodsModal = /*#__PURE__*/forwardRef(GoodsModal$3);
 var getTableData$1 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
+  var conditionList = transformFormData(formData);
   return extendRequest('/qy/gdfw/product/product/page', {
     method: 'post',
-    data: _objectSpread2({
+    data: {
       pageSize: pageSize,
       pageNo: current,
-      platform: 'JST_ERP'
-    }, formData)
+      platform: 'JST_ERP',
+      conditionList: conditionList
+    }
   }).then(function (res) {
     var _res$data = res.data,
       _res$data$productSkuL = _res$data.productSkuList,
@@ -15744,10 +15828,12 @@ var searchFormData = [{
   name: 'goodName'
 }, {
   label: '商品编码',
-  name: 'goodNo'
+  name: 'goodNo',
+  type: 'optionalInput'
 }, {
   label: '款式编码',
-  name: 'styleCode'
+  name: 'styleCode',
+  type: 'optionalInput'
 }, {
   label: '商品类型',
   name: 'skuType',
@@ -15968,19 +16054,15 @@ var JstGoodsModal = /*#__PURE__*/forwardRef(GyGoodsModal);
 var getTableData$2 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
-  var data = {
-    goodNo: formData.goodNo || null,
-    goodName: formData.goodName || null,
-    skuCode: formData.skuCode || null,
-    skuId: formData.skuId || null
-  };
+  var conditionList = transformFormData(formData);
   return extendRequest('/qy/gdfw/product/product/page', {
     method: 'post',
-    data: _objectSpread2({
+    data: {
       pageSize: pageSize,
       pageNo: current,
-      platform: 'BS_E3_ERP'
-    }, data)
+      platform: 'BS_E3_ERP',
+      conditionList: conditionList
+    }
   }).then(function (res) {
     var _res$data = res.data,
       _res$data$productSkuL = _res$data.productSkuList,
@@ -16000,18 +16082,21 @@ var getTableData$2 = function getTableData(_ref, formData) {
 };
 var searchFormData$1 = [{
   label: '商品货号',
-  name: 'goodNo'
+  name: 'goodNo',
+  type: 'optionalInput'
 }, {
   label: '商品名称',
   name: 'goodName'
 }, {
   label: 'SKU',
   name: 'skuCode',
-  dataIndex: 'specNo'
+  dataIndex: 'specNo',
+  type: 'optionalInput'
 }, {
   label: 'SKU ID',
   name: 'skuId',
-  dataIndex: 'specId'
+  dataIndex: 'specId',
+  type: 'optionalInput'
 }];
 var GoodList$2 = function GoodList(props, ref) {
   var _useState = useState([]),
@@ -16213,13 +16298,15 @@ var rowCheckKey = 'id';
 var getTableData$3 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
+  var conditionList = transformFormData(formData);
   return extendRequest('/qy/gdfw/product/product/page', {
     method: 'post',
-    data: _objectSpread2({
+    data: {
       pageSize: pageSize,
       pageNo: current,
-      platform: 'KM_ERP'
-    }, formData)
+      platform: 'KM_ERP',
+      conditionList: conditionList
+    }
   }).then(function (res) {
     var _res$data = res.data,
       _res$data$productSkuL = _res$data.productSkuList,
@@ -16240,7 +16327,8 @@ var searchFormData$2 = [{
   name: 'goodName'
 }, {
   label: '商品编码',
-  name: 'goodNo'
+  name: 'goodNo',
+  type: 'optionalInput'
 }, {
   label: 'SKU名称',
   name: 'skuName',
@@ -16248,7 +16336,8 @@ var searchFormData$2 = [{
 }, {
   label: 'SKU编码',
   name: 'skuCode',
-  dataIndex: 'specNo'
+  dataIndex: 'specNo',
+  type: 'optionalInput'
 }];
 var GoodList$3 = function GoodList(props, ref) {
   var _useState = useState([]),
@@ -16456,20 +16545,15 @@ var KmGoodsModal = /*#__PURE__*/forwardRef(ErpGoodsModal);
 var getTableData$4 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
-  var data = {
-    goodShortName: formData.goodShortName || null,
-    skuName: formData.skuName || null,
-    skuCode: formData.skuCode || null,
-    goodName: formData.goodName || null,
-    goodNo: formData.goodNo || null
-  };
+  var conditionList = transformFormData(formData);
   return extendRequest('/qy/gdfw/product/product/page', {
     method: 'post',
-    data: _objectSpread2({
+    data: {
       pageSize: pageSize,
       pageNo: current,
-      platform: 'GY_ERP'
-    }, data)
+      platform: 'GY_ERP',
+      conditionList: conditionList
+    }
   }).then(function (res) {
     var _res$data = res.data,
       _res$data$productSkuL = _res$data.productSkuList,
@@ -16495,13 +16579,15 @@ var searchFormData$3 = [{
 }, {
   label: '商品sku编码',
   name: 'skuCode',
-  dataIndex: 'specNo'
+  dataIndex: 'specNo',
+  type: 'optionalInput'
 }, {
   label: '商品名称',
   name: 'goodName'
 }, {
   label: '商品编码',
-  name: 'goodNo'
+  name: 'goodNo',
+  type: 'optionalInput'
 }];
 var GoodList$4 = function GoodList(props, ref) {
   var _useState = useState([]),
@@ -18121,13 +18207,15 @@ var GyGoodsModal$2 = /*#__PURE__*/forwardRef(GyGoodsModal$1);
 var getTableData$5 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
+  var conditionList = transformFormData(formData);
   return extendRequest('/qy/gdfw/product/product/page', {
     method: 'post',
-    data: _objectSpread2({
+    data: {
       pageSize: pageSize,
       pageNo: current,
-      platform: 'JY_ERP'
-    }, formData)
+      platform: 'JY_ERP',
+      conditionList: conditionList
+    }
   }).then(function (res) {
     var _res$data = res.data,
       _res$data$productSkuL = _res$data.productSkuList,
@@ -18150,13 +18238,15 @@ var searchFormData$4 = [{
 }, {
   label: '规格编码',
   name: 'skuCode',
-  dataIndex: 'specNo'
+  dataIndex: 'specNo',
+  type: 'optionalInput'
 }, {
   label: '商品名称',
   name: 'goodName'
 }, {
   label: '商品编码',
-  name: 'goodNo'
+  name: 'goodNo',
+  type: 'optionalInput'
 }];
 var GoodList$5 = function GoodList(props, ref) {
   var _useState = useState([]),
@@ -22257,7 +22347,7 @@ var processKmGoods$1 = function processKmGoods(_ref7) {
       sysPicPath: item.goodPicUrl,
       payment: null,
       price: item.retailPrice,
-      type: null,
+      type: (kmSkuTypeMap === null || kmSkuTypeMap === void 0 ? void 0 : kmSkuTypeMap[item === null || item === void 0 ? void 0 : item.skuType]) || '',
       uuid: uuid(),
       canDelete: true,
       canEdit: true

package/dist/index.js

@@ -14112,7 +14112,7 @@ var renderTextEllipsis = function renderTextEllipsis(value) {
 var css_248z$b = ".GoodModalColumns .ellipsis-text-3 {\n  display: -webkit-box;\n  overflow: hidden;\n  white-space: normal !important;\n  text-overflow: ellipsis;\n  word-break: break-all;\n  overflow-wrap: anywhere;\n  -webkit-box-orient: vertical;\n  -webkit-line-clamp: 3;\n  line-clamp: 3;\n}\n";
 styleInject(css_248z$b);
 
-var css_248z$c = ".search-form .ant-form-item {\n  margin-right: 0px !important;\n  margin-bottom: 12px !important;\n  padding-right: 10px !important;\n}\n@media (max-width: 600px) {\n  .search-form {\n    display: flex;\n    flex-wrap: wrap;\n  }\n  .search-form .ant-form-item {\n    box-sizing: border-box;\n    width: 33.33% !important;\n  }\n  .search-form .ant-input-affix-wrapper,\n  .search-form .ant-select,\n  .search-form .ant-select-selector {\n    width: 100% !important;\n  }\n  .search-form .search-form-actions .ant-form-item-control-input-content {\n    display: flex;\n    flex-wrap: nowrap;\n    justify-content: space-between;\n  }\n  .search-form .search-form-actions .ant-form-item-control-input-content .ant-btn {\n    width: calc((100% - 8px) / 2) !important;\n    padding: 0 !important;\n  }\n}\n";
+var css_248z$c = ".search-form .ant-form-item {\n  margin-right: 0px !important;\n  margin-bottom: 12px !important;\n  padding-right: 10px !important;\n}\n@media (max-width: 600px) {\n  .search-form {\n    display: flex;\n    flex-wrap: wrap;\n  }\n  .search-form .ant-form-item {\n    box-sizing: border-box;\n    width: 50% !important;\n  }\n  .search-form .ant-input-affix-wrapper,\n  .search-form .ant-select,\n  .search-form .ant-select-selector {\n    width: 100% !important;\n  }\n  .search-form .optional-input-select {\n    width: 70px !important;\n  }\n  .search-form .search-form-actions .ant-form-item-control-input-content {\n    display: flex;\n    flex-wrap: nowrap;\n    justify-content: space-between;\n  }\n  .search-form .search-form-actions .ant-form-item-control-input-content .ant-btn {\n    width: calc((100% - 8px) / 2) !important;\n    padding: 0 !important;\n  }\n}\n";
 styleInject(css_248z$c);
 
 var _excluded$d = ["shopId"];
@@ -14996,7 +14996,9 @@ var kmColumns = [{
   title: "\u5546\u54C1\u7C7B\u578B",
   ellipsis: true,
   width: 150,
-  render: renderTextEllipsis
+  render: function render(type) {
+    return renderTextEllipsis((kmkfUtils.kmSkuTypeMap === null || kmkfUtils.kmSkuTypeMap === void 0 ? void 0 : kmkfUtils.kmSkuTypeMap[type]) || type);
+  }
 }, {
   dataIndex: 'specName',
   title: "SKU\u540D\u79F0",
@@ -15333,6 +15335,64 @@ var useGetColumns = (function (type) {
   return [columns, showColumnsDataIndexList, loading];
 });
 
+var compareSymbolList = [{
+  label: '模糊',
+  value: 'like'
+}, {
+  label: '精准',
+  value: 'eq'
+}];
+var OptionalInput = function OptionalInput(props) {
+  var value = props.value,
+    onChange = props.onChange,
+    _props$placeholder = props.placeholder,
+    placeholder = _props$placeholder === void 0 ? '' : _props$placeholder,
+    onPressEnter = props.onPressEnter,
+    onBlur = props.onBlur,
+    formItemProps = props.formItemProps;
+  var handleSelectChange = function handleSelectChange(compareSymbol) {
+    if (typeof onChange === 'function') {
+      onChange({
+        type: compareSymbol || 'like',
+        inputValue: value === null || value === void 0 ? void 0 : value.inputValue
+      });
+    }
+  };
+  var handleInputChange = function handleInputChange(e) {
+    if (typeof onChange === 'function') {
+      onChange({
+        type: (value === null || value === void 0 ? void 0 : value.type) || 'like',
+        inputValue: e.target.value
+      });
+    }
+  };
+  return /*#__PURE__*/React__default['default'].createElement("div", {
+    style: {
+      display: 'flex',
+      alignItems: 'center'
+    }
+  }, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+    className: "optional-input-select",
+    style: {
+      width: '70px'
+    },
+    options: compareSymbolList,
+    onChange: handleSelectChange,
+    value: (value === null || value === void 0 ? void 0 : value.type) || 'like',
+    onBlur: onBlur
+  }), /*#__PURE__*/React__default['default'].createElement(antd.Input, _objectSpread2({
+    style: {
+      width: '150px'
+    },
+    allowClear: true,
+    placeholder: placeholder,
+    onChange: handleInputChange,
+    onPressEnter: onPressEnter,
+    onBlur: onBlur,
+    value: value === null || value === void 0 ? void 0 : value.inputValue
+  }, formItemProps)));
+};
+
 function SearchForm(_ref) {
   var searchFormData = _ref.searchFormData,
     form = _ref.form,
@@ -15384,7 +15444,16 @@ function SearchForm(_ref) {
       style: {
         marginBottom: '12px'
       }
-    }, type === 'select' ? /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2({
+    }, type === 'optionalInput' ? /*#__PURE__*/React__default['default'].createElement(OptionalInput, {
+      onPressEnter: function onPressEnter() {
+        return submitForm();
+      },
+      onBlur: function onBlur() {
+        return submitForm();
+      },
+      placeholder: label,
+      formItemProps: formItemProps
+    }) : type === 'select' ? /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2({
       placeholder: label,
       showSearch: true,
       allowClear: true,
@@ -15425,24 +15494,35 @@ function SearchForm(_ref) {
   }, "\u91CD\u7F6E")));
 }
 
+var transformFormData = function transformFormData(formData) {
+  var conditionList = [];
+  for (var key in formData) {
+    if (formData[key]) {
+      var _formData$key, _formData$key2, _formData$key3, _formData$key4;
+      var value = ((_formData$key = formData[key]) === null || _formData$key === void 0 ? void 0 : _formData$key.type) ? (_formData$key2 = formData[key]) === null || _formData$key2 === void 0 ? void 0 : _formData$key2.inputValue : formData[key];
+      var compareSymbol = ((_formData$key3 = formData[key]) === null || _formData$key3 === void 0 ? void 0 : _formData$key3.type) ? (_formData$key4 = formData[key]) === null || _formData$key4 === void 0 ? void 0 : _formData$key4.type : 'like';
+      conditionList.push({
+        leftValue: key,
+        compareSymbol: compareSymbol,
+        rightValue: value
+      });
+    }
+  }
+  return conditionList;
+};
+
 var getTableData = function getTableData(_ref, formData) {
-  var _formData$brandIds;
   var current = _ref.current,
     pageSize = _ref.pageSize;
-  var data = {
-    brandIds: ((_formData$brandIds = formData.brandIds) === null || _formData$brandIds === void 0 ? void 0 : _formData$brandIds.length) ? formData.brandIds : null,
-    skuCode: formData.skuCode || null,
-    skuName: formData.skuName || null,
-    goodName: formData.goodName || null,
-    goodNo: formData.goodNo || null
-  };
+  var conditionList = transformFormData(formData);
   return extendRequest('/qy/gdfw/product/product/page', {
     method: 'post',
-    data: _objectSpread2({
+    data: {
       pageSize: pageSize,
       pageNo: current,
-      platform: 'WDT_ERP'
-    }, data)
+      platform: 'WDT_ERP',
+      conditionList: conditionList
+    }
   }).then(function (res) {
     var _res$data = res.data,
       _res$data$productSkuL = _res$data.productSkuList,
@@ -15536,13 +15616,15 @@ var GoodList = function GoodList(props, ref) {
   }, {
     label: 'SKU编码',
     name: 'skuCode',
-    dataIndex: 'specNo'
+    dataIndex: 'specNo',
+    type: 'optionalInput'
   }, {
     label: '商品名称',
     name: 'goodName'
   }, {
     label: '商品编码',
-    name: 'goodNo'
+    name: 'goodNo',
+    type: 'optionalInput'
   }, {
     label: '品牌',
     name: 'brandIds',
@@ -15732,13 +15814,15 @@ var WdtGoodsModal = /*#__PURE__*/React.forwardRef(GoodsModal$3);
 var getTableData$1 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
+  var conditionList = transformFormData(formData);
   return extendRequest('/qy/gdfw/product/product/page', {
     method: 'post',
-    data: _objectSpread2({
+    data: {
       pageSize: pageSize,
       pageNo: current,
-      platform: 'JST_ERP'
-    }, formData)
+      platform: 'JST_ERP',
+      conditionList: conditionList
+    }
   }).then(function (res) {
     var _res$data = res.data,
       _res$data$productSkuL = _res$data.productSkuList,
@@ -15759,10 +15843,12 @@ var searchFormData = [{
   name: 'goodName'
 }, {
   label: '商品编码',
-  name: 'goodNo'
+  name: 'goodNo',
+  type: 'optionalInput'
 }, {
   label: '款式编码',
-  name: 'styleCode'
+  name: 'styleCode',
+  type: 'optionalInput'
 }, {
   label: '商品类型',
   name: 'skuType',
@@ -15983,19 +16069,15 @@ var JstGoodsModal = /*#__PURE__*/React.forwardRef(GyGoodsModal);
 var getTableData$2 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
-  var data = {
-    goodNo: formData.goodNo || null,
-    goodName: formData.goodName || null,
-    skuCode: formData.skuCode || null,
-    skuId: formData.skuId || null
-  };
+  var conditionList = transformFormData(formData);
   return extendRequest('/qy/gdfw/product/product/page', {
     method: 'post',
-    data: _objectSpread2({
+    data: {
       pageSize: pageSize,
       pageNo: current,
-      platform: 'BS_E3_ERP'
-    }, data)
+      platform: 'BS_E3_ERP',
+      conditionList: conditionList
+    }
   }).then(function (res) {
     var _res$data = res.data,
       _res$data$productSkuL = _res$data.productSkuList,
@@ -16015,18 +16097,21 @@ var getTableData$2 = function getTableData(_ref, formData) {
 };
 var searchFormData$1 = [{
   label: '商品货号',
-  name: 'goodNo'
+  name: 'goodNo',
+  type: 'optionalInput'
 }, {
   label: '商品名称',
   name: 'goodName'
 }, {
   label: 'SKU',
   name: 'skuCode',
-  dataIndex: 'specNo'
+  dataIndex: 'specNo',
+  type: 'optionalInput'
 }, {
   label: 'SKU ID',
   name: 'skuId',
-  dataIndex: 'specId'
+  dataIndex: 'specId',
+  type: 'optionalInput'
 }];
 var GoodList$2 = function GoodList(props, ref) {
   var _useState = React.useState([]),
@@ -16228,13 +16313,15 @@ var rowCheckKey = 'id';
 var getTableData$3 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
+  var conditionList = transformFormData(formData);
   return extendRequest('/qy/gdfw/product/product/page', {
     method: 'post',
-    data: _objectSpread2({
+    data: {
       pageSize: pageSize,
       pageNo: current,
-      platform: 'KM_ERP'
-    }, formData)
+      platform: 'KM_ERP',
+      conditionList: conditionList
+    }
   }).then(function (res) {
     var _res$data = res.data,
       _res$data$productSkuL = _res$data.productSkuList,
@@ -16255,7 +16342,8 @@ var searchFormData$2 = [{
   name: 'goodName'
 }, {
   label: '商品编码',
-  name: 'goodNo'
+  name: 'goodNo',
+  type: 'optionalInput'
 }, {
   label: 'SKU名称',
   name: 'skuName',
@@ -16263,7 +16351,8 @@ var searchFormData$2 = [{
 }, {
   label: 'SKU编码',
   name: 'skuCode',
-  dataIndex: 'specNo'
+  dataIndex: 'specNo',
+  type: 'optionalInput'
 }];
 var GoodList$3 = function GoodList(props, ref) {
   var _useState = React.useState([]),
@@ -16471,20 +16560,15 @@ var KmGoodsModal = /*#__PURE__*/React.forwardRef(ErpGoodsModal);
 var getTableData$4 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
-  var data = {
-    goodShortName: formData.goodShortName || null,
-    skuName: formData.skuName || null,
-    skuCode: formData.skuCode || null,
-    goodName: formData.goodName || null,
-    goodNo: formData.goodNo || null
-  };
+  var conditionList = transformFormData(formData);
   return extendRequest('/qy/gdfw/product/product/page', {
     method: 'post',
-    data: _objectSpread2({
+    data: {
       pageSize: pageSize,
       pageNo: current,
-      platform: 'GY_ERP'
-    }, data)
+      platform: 'GY_ERP',
+      conditionList: conditionList
+    }
   }).then(function (res) {
     var _res$data = res.data,
       _res$data$productSkuL = _res$data.productSkuList,
@@ -16510,13 +16594,15 @@ var searchFormData$3 = [{
 }, {
   label: '商品sku编码',
   name: 'skuCode',
-  dataIndex: 'specNo'
+  dataIndex: 'specNo',
+  type: 'optionalInput'
 }, {
   label: '商品名称',
   name: 'goodName'
 }, {
   label: '商品编码',
-  name: 'goodNo'
+  name: 'goodNo',
+  type: 'optionalInput'
 }];
 var GoodList$4 = function GoodList(props, ref) {
   var _useState = React.useState([]),
@@ -18136,13 +18222,15 @@ var GyGoodsModal$2 = /*#__PURE__*/React.forwardRef(GyGoodsModal$1);
 var getTableData$5 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
+  var conditionList = transformFormData(formData);
   return extendRequest('/qy/gdfw/product/product/page', {
     method: 'post',
-    data: _objectSpread2({
+    data: {
       pageSize: pageSize,
       pageNo: current,
-      platform: 'JY_ERP'
-    }, formData)
+      platform: 'JY_ERP',
+      conditionList: conditionList
+    }
   }).then(function (res) {
     var _res$data = res.data,
       _res$data$productSkuL = _res$data.productSkuList,
@@ -18165,13 +18253,15 @@ var searchFormData$4 = [{
 }, {
   label: '规格编码',
   name: 'skuCode',
-  dataIndex: 'specNo'
+  dataIndex: 'specNo',
+  type: 'optionalInput'
 }, {
   label: '商品名称',
   name: 'goodName'
 }, {
   label: '商品编码',
-  name: 'goodNo'
+  name: 'goodNo',
+  type: 'optionalInput'
 }];
 var GoodList$5 = function GoodList(props, ref) {
   var _useState = React.useState([]),
@@ -22272,7 +22362,7 @@ var processKmGoods$1 = function processKmGoods(_ref7) {
       sysPicPath: item.goodPicUrl,
       payment: null,
       price: item.retailPrice,
-      type: null,
+      type: (kmkfUtils.kmSkuTypeMap === null || kmkfUtils.kmSkuTypeMap === void 0 ? void 0 : kmkfUtils.kmSkuTypeMap[item === null || item === void 0 ? void 0 : item.skuType]) || '',
       uuid: kmkfUtils.uuid(),
       canDelete: true,
       canEdit: true

package/dist/src/bs/component/model/Columns/Erp/km.d.ts

@@ -5,6 +5,12 @@ declare const _default: ({
     width: number;
     render: (val: string) => React.JSX.Element;
     ellipsis?: undefined;
+} | {
+    dataIndex: string;
+    title: string;
+    ellipsis: boolean;
+    width: number;
+    render: (type: number) => React.JSX.Element;
 } | {
     dataIndex: string;
     title: string;

package/dist/src/bs/component/model/components/SearchForm/components.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const OptionalInput: (props: any) => React.JSX.Element;

package/dist/src/bs/component/model/components/SearchForm/index.d.ts

@@ -8,12 +8,13 @@ type Props = {
     submit: () => void;
     reset: () => void;
 };
-export type SearchFormData = {
+export type SearchFormItem = {
     label: string;
     name: string;
     dataIndex?: string;
-    type?: undefined | 'input' | 'select';
+    type?: undefined | 'input' | 'select' | 'optionalInput';
     formItemProps?: Record<string, any>;
-}[];
+};
+export type SearchFormData = SearchFormItem[];
 declare function SearchForm({ searchFormData, form, showColumnsDataIndexList, submit, reset, }: Props): React.JSX.Element;
 export default SearchForm;

package/dist/src/bs/component/model/components/SearchForm/utils.d.ts

@@ -0,0 +1,5 @@
+export declare const transformFormData: (formData: Record<string, any>) => {
+    leftValue: string;
+    compareSymbol: any;
+    rightValue: any;
+}[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.2.44",
+  "version": "2.2.45",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -20,7 +20,7 @@
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
   },
   "dependencies": {
-    "@kmkf-fe-packages/kmkf-utils": "2.2.44",
+    "@kmkf-fe-packages/kmkf-utils": "2.2.45",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "41c1fbf76ed5c942bca355b808995efafedbf3e3"
+  "gitHead": "2ad8d90257f0b1670e5082daaa71c5ea041cdd64"
 }