@kmkf-fe-packages/basic-components 2.10.10 → 2.10.14

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('识别失败，请输入正确的信息');
@@ -21019,17 +21038,18 @@ var getColumns$2 = function getColumns(_ref) {
 };
 
 var getYesOrNo$4 = function getYesOrNo(val) {
+  var content = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ['是', '否'];
   switch (val) {
     case true:
     case '1':
     case 1:
-      return '是';
+      return content[0];
     case false:
     case '0':
     case 0:
       return '否';
     default:
-      return null;
+      return content[1];
   }
 };
 
@@ -21228,7 +21248,7 @@ var getColumns$3 = function getColumns(_ref) {
             label: '非赠品',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val, ['赠品', '非赠品']));
       }
     }, {
       dataIndex: 'isPackage',
@@ -21460,7 +21480,7 @@ var getColumns$3 = function getColumns(_ref) {
             label: '非赠品',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val));
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo$4(val, ['赠品', '非赠品']));
       }
     }, {
       dataIndex: 'isPackage',

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.10.10",
+  "version": "2.10.14",
   "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.10",
+    "@kmkf-fe-packages/kmkf-utils": "2.10.14",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a914d8cc8eaff540f93b34e02fc854178bb47aaf"
+  "gitHead": "f39208196a64c8def6860f31bf3895b1f96ee765"
 }