@kmkf-fe-packages/basic-components 2.2.44-beta.91 → 2.2.44-beta.94

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, 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, filterJkyOrders, JKY_ORDER_FROM_MAP, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, getJkyLogisticInfo, 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, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, 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, filterJkyOrders, JKY_ORDER_FROM_MAP, JKY_ORDER_TYPE_MAP, JKY_ORDER_STATUS_MAP, getJkyLogisticInfo, 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, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, BS_E3_ORDER_STATUS_MAP, updateOrderSubFormGoodsHandle, updateWlnGoodsHandle, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, updateKmGoodsHandle, updateJyGoodsHandle, updateJkyGoodsHandle, 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';
@@ -25938,17 +25938,59 @@ var index$2 = (function (props) {
     });
     return baseInfoColumns || [];
   }, [type, showHeader]);
+  // 构建字段渲染值映射表（原始值 -> 显示值），用于筛选时同时匹配原始值和显示值
+  var fieldRenderMap = useMemo(function () {
+    var map = {};
+    // JKY_SYSTEM_ORDER 需要处理的字段
+    if (type === 'JKY_SYSTEM_ORDER') {
+      // isDelete: 1 -> "是", 0 -> "否"
+      map['isDelete'] = {
+        '1': '是',
+        '0': '否'
+      };
+      // tradeFrom - 订单来源映射
+      map['tradeFrom'] = _objectSpread2({}, JKY_ORDER_FROM_MAP);
+      // tradeType - 订单类型映射
+      map['tradeType'] = _objectSpread2({}, JKY_ORDER_TYPE_MAP);
+      // tradeStatus - 销售单状态映射
+      map['tradeStatus'] = _objectSpread2({}, JKY_ORDER_STATUS_MAP);
+    }
+    // BS_E3_SYSTEM_ORDER 需要处理的字段
+    if (type === 'BS_E3_SYSTEM_ORDER') {
+      // orderStatus - 订单状态映射
+      map['orderStatus'] = _objectSpread2({}, BS_E3_ORDER_STATUS_MAP);
+      // 布尔类型字段映射
+      var booleanMap = _objectSpread2({}, BS_E3_BOOLEAN_STATUS_MAP);
+      ['isSplit', 'isSplitNew', 'isCombine', 'isCombineNew', 'isCopy', 'isExchangeOrder'].forEach(function (field) {
+        map[field] = booleanMap;
+      });
+    }
+    return map;
+  }, [type]);
   // 过滤后的表格数据 - 根据选中字段和关键词模糊匹配（不区分大小写）
   var filteredData = useMemo(function () {
     if (!filterField || !filterKeyword) {
       return (value === null || value === void 0 ? void 0 : value.orders) || [];
     }
+    var keywordLower = filterKeyword.toLowerCase();
+    var renderMap = fieldRenderMap[filterField];
     return ((value === null || value === void 0 ? void 0 : value.orders) || []).filter(function (item) {
       var fieldValue = item[filterField];
       if (fieldValue == null) return false;
-      return String(fieldValue).toLowerCase().includes(filterKeyword.toLowerCase());
+      var fieldValueStr = String(fieldValue);
+      var fieldValueLower = fieldValueStr.toLowerCase();
+      // 直接匹配原始值
+      if (fieldValueLower.includes(keywordLower)) return true;
+      // 匹配渲染后的值
+      if (renderMap) {
+        var displayValue = renderMap[fieldValueStr];
+        if (displayValue && displayValue.toLowerCase().includes(keywordLower)) {
+          return true;
+        }
+      }
+      return false;
     });
-  }, [value === null || value === void 0 ? void 0 : value.orders, filterField, filterKeyword]);
+  }, [value === null || value === void 0 ? void 0 : value.orders, filterField, filterKeyword, fieldRenderMap]);
   var getOrderList = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -26241,21 +26283,6 @@ var index$2 = (function (props) {
       };
     }
   };
-  // useEffect(() => {
-  //   const dom = document.querySelector(
-  //     `.${type}_SYSTEM_ORDER_COMPONENT .ant-table-content`,
-  //   );
-  //   //解决列表出现横向滚动条时选择数据造成行内闪烁问题
-  //   if (
-  //     (value?.selectIds || []).length > 0 &&
-  //     dom &&
-  //     dom.scrollWidth > dom.clientWidth &&
-  //     dom.scrollLeft === 0
-  //   ) {
-  //     console.log(dom.scrollWidth > dom.clientWidth, dom.scrollLeft === 0);
-  //     dom.scrollLeft = 1;
-  //   }
-  // }, [JSON.stringify(value?.selectIds || [])]);
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(type, "_SYSTEM_ORDER_COMPONENT")
   }, /*#__PURE__*/React.createElement(Space, {
@@ -26271,7 +26298,9 @@ var index$2 = (function (props) {
     onChange: function onChange(value) {
       return setFilterField(value);
     },
-    allowClear: true
+    allowClear: true,
+    showSearch: true,
+    optionFilterProp: "children"
   }, (columnsMap[type] || []).map(function (col) {
     return /*#__PURE__*/React.createElement(Select.Option, {
       key: col.dataIndex,

package/dist/index.js

@@ -25953,17 +25953,59 @@ var index$2 = (function (props) {
     });
     return baseInfoColumns || [];
   }, [type, showHeader]);
+  // 构建字段渲染值映射表（原始值 -> 显示值），用于筛选时同时匹配原始值和显示值
+  var fieldRenderMap = React.useMemo(function () {
+    var map = {};
+    // JKY_SYSTEM_ORDER 需要处理的字段
+    if (type === 'JKY_SYSTEM_ORDER') {
+      // isDelete: 1 -> "是", 0 -> "否"
+      map['isDelete'] = {
+        '1': '是',
+        '0': '否'
+      };
+      // tradeFrom - 订单来源映射
+      map['tradeFrom'] = _objectSpread2({}, kmkfUtils.JKY_ORDER_FROM_MAP);
+      // tradeType - 订单类型映射
+      map['tradeType'] = _objectSpread2({}, kmkfUtils.JKY_ORDER_TYPE_MAP);
+      // tradeStatus - 销售单状态映射
+      map['tradeStatus'] = _objectSpread2({}, kmkfUtils.JKY_ORDER_STATUS_MAP);
+    }
+    // BS_E3_SYSTEM_ORDER 需要处理的字段
+    if (type === 'BS_E3_SYSTEM_ORDER') {
+      // orderStatus - 订单状态映射
+      map['orderStatus'] = _objectSpread2({}, kmkfUtils.BS_E3_ORDER_STATUS_MAP);
+      // 布尔类型字段映射
+      var booleanMap = _objectSpread2({}, kmkfUtils.BS_E3_BOOLEAN_STATUS_MAP);
+      ['isSplit', 'isSplitNew', 'isCombine', 'isCombineNew', 'isCopy', 'isExchangeOrder'].forEach(function (field) {
+        map[field] = booleanMap;
+      });
+    }
+    return map;
+  }, [type]);
   // 过滤后的表格数据 - 根据选中字段和关键词模糊匹配（不区分大小写）
   var filteredData = React.useMemo(function () {
     if (!filterField || !filterKeyword) {
       return (value === null || value === void 0 ? void 0 : value.orders) || [];
     }
+    var keywordLower = filterKeyword.toLowerCase();
+    var renderMap = fieldRenderMap[filterField];
     return ((value === null || value === void 0 ? void 0 : value.orders) || []).filter(function (item) {
       var fieldValue = item[filterField];
       if (fieldValue == null) return false;
-      return String(fieldValue).toLowerCase().includes(filterKeyword.toLowerCase());
+      var fieldValueStr = String(fieldValue);
+      var fieldValueLower = fieldValueStr.toLowerCase();
+      // 直接匹配原始值
+      if (fieldValueLower.includes(keywordLower)) return true;
+      // 匹配渲染后的值
+      if (renderMap) {
+        var displayValue = renderMap[fieldValueStr];
+        if (displayValue && displayValue.toLowerCase().includes(keywordLower)) {
+          return true;
+        }
+      }
+      return false;
     });
-  }, [value === null || value === void 0 ? void 0 : value.orders, filterField, filterKeyword]);
+  }, [value === null || value === void 0 ? void 0 : value.orders, filterField, filterKeyword, fieldRenderMap]);
   var getOrderList = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(orderNo) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -26256,21 +26298,6 @@ var index$2 = (function (props) {
       };
     }
   };
-  // useEffect(() => {
-  //   const dom = document.querySelector(
-  //     `.${type}_SYSTEM_ORDER_COMPONENT .ant-table-content`,
-  //   );
-  //   //解决列表出现横向滚动条时选择数据造成行内闪烁问题
-  //   if (
-  //     (value?.selectIds || []).length > 0 &&
-  //     dom &&
-  //     dom.scrollWidth > dom.clientWidth &&
-  //     dom.scrollLeft === 0
-  //   ) {
-  //     console.log(dom.scrollWidth > dom.clientWidth, dom.scrollLeft === 0);
-  //     dom.scrollLeft = 1;
-  //   }
-  // }, [JSON.stringify(value?.selectIds || [])]);
   return /*#__PURE__*/React__default['default'].createElement("div", {
     className: "".concat(type, "_SYSTEM_ORDER_COMPONENT")
   }, /*#__PURE__*/React__default['default'].createElement(antd.Space, {
@@ -26286,7 +26313,9 @@ var index$2 = (function (props) {
     onChange: function onChange(value) {
       return setFilterField(value);
     },
-    allowClear: true
+    allowClear: true,
+    showSearch: true,
+    optionFilterProp: "children"
   }, (columnsMap[type] || []).map(function (col) {
     return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
       key: col.dataIndex,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.2.44-beta.91",
+  "version": "2.2.44-beta.94",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0245d9893044dec302f3cf00b020662eda3be96d"
+  "gitHead": "c64bc7add09be98bc2f085375413c924f24ff961"
 }