@kmkf-fe-packages/basic-components 2.2.39-beta.14 → 2.2.39-beta.16

package/dist/index.esm.js

@@ -14202,7 +14202,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"];
@@ -15641,6 +15641,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,
@@ -15692,7 +15750,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,
@@ -15733,24 +15800,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 : Array.isArray(value) ? 'include' : 'eq';
+      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,
@@ -15844,13 +15922,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',
@@ -16040,13 +16120,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,
@@ -16067,10 +16149,12 @@ var searchFormData = [{
   name: 'goodName'
 }, {
   label: '商品编码',
-  name: 'goodNo'
+  name: 'goodNo',
+  type: 'optionalInput'
 }, {
   label: '款式编码',
-  name: 'styleCode'
+  name: 'styleCode',
+  type: 'optionalInput'
 }, {
   label: '商品类型',
   name: 'skuType',
@@ -16291,20 +16375,15 @@ var JstGoodsModal = /*#__PURE__*/forwardRef(GyGoodsModal);
 var getTableData$2 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
-  var data = {
-    goodShortName: formData.goodShortName || null,
-    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,
@@ -16324,18 +16403,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([]),
@@ -16537,13 +16619,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,
@@ -16564,7 +16648,8 @@ var searchFormData$2 = [{
   name: 'goodName'
 }, {
   label: '商品编码',
-  name: 'goodNo'
+  name: 'goodNo',
+  type: 'optionalInput'
 }, {
   label: 'SKU名称',
   name: 'skuName',
@@ -16572,7 +16657,8 @@ var searchFormData$2 = [{
 }, {
   label: 'SKU编码',
   name: 'skuCode',
-  dataIndex: 'specNo'
+  dataIndex: 'specNo',
+  type: 'optionalInput'
 }];
 var GoodList$3 = function GoodList(props, ref) {
   var _useState = useState([]),
@@ -16780,20 +16866,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,
@@ -16815,11 +16896,13 @@ var searchFormData$3 = [{
 }, {
   label: '商品sku名称',
   name: 'skuName',
-  dataIndex: 'specName'
+  dataIndex: 'specName',
+  type: 'optionalInput'
 }, {
   label: '商品sku编码',
   name: 'skuCode',
-  dataIndex: 'specNo'
+  dataIndex: 'specNo',
+  type: 'optionalInput'
 }, {
   label: '商品名称',
   name: 'goodName'
@@ -18445,13 +18528,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,
@@ -18474,13 +18559,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([]),

package/dist/index.js

@@ -14217,7 +14217,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"];
@@ -15656,6 +15656,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,
@@ -15707,7 +15765,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,
@@ -15748,24 +15815,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 : Array.isArray(value) ? 'include' : 'eq';
+      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,
@@ -15859,13 +15937,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',
@@ -16055,13 +16135,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,
@@ -16082,10 +16164,12 @@ var searchFormData = [{
   name: 'goodName'
 }, {
   label: '商品编码',
-  name: 'goodNo'
+  name: 'goodNo',
+  type: 'optionalInput'
 }, {
   label: '款式编码',
-  name: 'styleCode'
+  name: 'styleCode',
+  type: 'optionalInput'
 }, {
   label: '商品类型',
   name: 'skuType',
@@ -16306,20 +16390,15 @@ var JstGoodsModal = /*#__PURE__*/React.forwardRef(GyGoodsModal);
 var getTableData$2 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
-  var data = {
-    goodShortName: formData.goodShortName || null,
-    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,
@@ -16339,18 +16418,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([]),
@@ -16552,13 +16634,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,
@@ -16579,7 +16663,8 @@ var searchFormData$2 = [{
   name: 'goodName'
 }, {
   label: '商品编码',
-  name: 'goodNo'
+  name: 'goodNo',
+  type: 'optionalInput'
 }, {
   label: 'SKU名称',
   name: 'skuName',
@@ -16587,7 +16672,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([]),
@@ -16795,20 +16881,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,
@@ -16830,11 +16911,13 @@ var searchFormData$3 = [{
 }, {
   label: '商品sku名称',
   name: 'skuName',
-  dataIndex: 'specName'
+  dataIndex: 'specName',
+  type: 'optionalInput'
 }, {
   label: '商品sku编码',
   name: 'skuCode',
-  dataIndex: 'specNo'
+  dataIndex: 'specNo',
+  type: 'optionalInput'
 }, {
   label: '商品名称',
   name: 'goodName'
@@ -18460,13 +18543,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,
@@ -18489,13 +18574,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([]),

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.39-beta.14",
+  "version": "2.2.39-beta.16",
   "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.39-beta.14",
+    "@kmkf-fe-packages/kmkf-utils": "2.2.39-beta.16",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "02671cc897620877ff1d3154371954783272bb27"
+  "gitHead": "337a7abf3d92ccceb79244e8f238f376aad12dc0"
 }