@kmkf-fe-packages/basic-components 2.10.9 → 2.10.13

package/dist/index.esm.js

@@ -7817,6 +7817,22 @@ var Province = function Province(props) {
 };
 
 var TextArea$1 = Input.TextArea;
+/**
+ * 直辖市省份名称映射（带"市" → 不带"市"）
+ * 接口返回的 province 可能带"市"（如"重庆市"），但省市区下拉数据一级节点不带"市"（如"重庆"），
+ * 此处做单向转换确保匹配。
+ */
+var MUNICIPALITY_PROVINCE_MAP = {
+  '北京市': '北京',
+  '天津市': '天津',
+  '上海市': '上海',
+  '重庆市': '重庆'
+};
+/** 直辖市省份名称去"市"处理，普通省份保持原值 */
+var normalizeMunicipalityProvince = function normalizeMunicipalityProvince(province) {
+  if (!province) return province;
+  return MUNICIPALITY_PROVINCE_MAP[province] || province;
+};
 var ParseLogistics = function ParseLogistics(props) {
   var onChange = props.onChange,
     _props$selfCalibratio = props.selfCalibration;
@@ -7856,11 +7872,10 @@ var ParseLogistics = function ParseLogistics(props) {
       }
     }).then(function (res) {
       var data = res.data;
-      // 如果是通过内部校准添加的姓名和手机号，则去除
-      // if (needCalibration) {
-      //   data.name = '';
-      //   data.phone = '';
-      // }
+      // 规范化直辖市省份名称，兼容接口带"市"、数据不带"市"的情况
+      if (data === null || data === void 0 ? void 0 : data.province) {
+        data.province = normalizeMunicipalityProvince(data.province);
+      }
       onChange === null || onChange === void 0 ? void 0 : onChange(data);
     }).catch(function (e) {
       handleAIIdentify(fullAddress);
@@ -7885,6 +7900,10 @@ var ParseLogistics = function ParseLogistics(props) {
       }
     }).then(function (res) {
       var data = res.data;
+      // 规范化直辖市省份名称，兼容接口带"市"、数据不带"市"的情况
+      if (data === null || data === void 0 ? void 0 : data.province) {
+        data.province = normalizeMunicipalityProvince(data.province);
+      }
       onChange === null || onChange === void 0 ? void 0 : onChange(data);
     }).catch(function (e) {
       message.error('识别失败，请输入正确的信息');
@@ -8671,7 +8690,8 @@ var processSceneStatus = function processSceneStatus(getValue) {
       WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList',
       JKY_WAREHOUSING_STATUS: 'jkyInStockStatusItemList',
       JST_WAREHOUSING_STATUS: 'jstInStockStatusItemList',
-      WLN_WAREHOUSING_STATUS: 'wlnInStockStatusItemList'
+      WLN_WAREHOUSING_STATUS: 'wlnInStockStatusItemList',
+      KM_WAREHOUSING_STATUS: 'kmInStockStatusItemList'
     };
     return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(STATUS_LIST_MAP[nex.workOrderComponentType])), []));
   };
@@ -9521,6 +9541,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       WLN_WAREHOUSING_STATUS: processSceneStatus,
       JKY_WAREHOUSING_STATUS: processSceneStatus,
       JST_WAREHOUSING_STATUS: processSceneStatus,
+      KM_WAREHOUSING_STATUS: processSceneStatus,
       BS_LOGISTICS: processErpLogistics,
       WLN_LOGISTICS: processErpLogistics,
       WDT_LOGISTICS: processErpLogistics,
@@ -21017,9 +21038,20 @@ var getColumns$2 = function getColumns(_ref) {
 };
 
 var getYesOrNo$4 = function getYesOrNo(val) {
-  if (isNull(val)) return null;
-  return val ? '是' : '否';
+  switch (val) {
+    case true:
+    case '1':
+    case 1:
+      return '是';
+    case false:
+    case '0':
+    case 0:
+      return '否';
+    default:
+      return null;
+  }
 };
+
 function toNum$1(value) {
   if (typeof value === 'string') {
     return value ? +value : void 0;
@@ -21507,10 +21539,6 @@ var isNumberOrNumberString$1 = function isNumberOrNumberString(value) {
   if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
   return false;
 };
-var getYesOrNo$5 = function getYesOrNo(val) {
-  if (isNull(val)) return null;
-  return val ? '是' : '否';
-};
 function toNum$2(value) {
   if (typeof value === 'string') {
     return value ? +value : void 0;
@@ -21622,7 +21650,7 @@ var getColumns$4 = function getColumns(_ref) {
       title: "\u662F\u5426\u53D6\u6D88",
       width: 150,
       render: function render(val) {
-        return /*#__PURE__*/React.createElement("span", null, getYesOrNo$5(val));
+        return /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
       }
     }, {
       dataIndex: 'isGift',
@@ -21641,7 +21669,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$5(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
       }
     }, {
       dataIndex: 'skuNote',
@@ -21767,7 +21795,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$5(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {
@@ -21896,7 +21924,7 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$5(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
       }
     }].map(function (item) {
       return _objectSpread2(_objectSpread2({}, item), {}, {

package/dist/src/constants/constants.d.ts

@@ -0,0 +1 @@
+export declare const getYesOrNo: (val: boolean | string | number) => "是" | "否" | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.10.9",
+  "version": "2.10.13",
   "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.10.9",
+    "@kmkf-fe-packages/kmkf-utils": "2.10.13",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2a86cf98f685e6784a6ee41776f4159c0463e76a"
+  "gitHead": "2d3fb7bd021c865e15539f0facef2171b80428ce"
 }