@kmkf-fe-packages/services-components 0.7.15-alpha.23 → 0.7.15-alpha.26

package/dist/esm/commonComponents/QueryLogisticsTrack/index.js

@@ -9,7 +9,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState } from "react";
-import { Modal, Timeline, message, Input } from "antd";
+import { Modal, Timeline, message } from "antd";
 import { request } from "@kmkf-fe-packages/kmkf-utils";
 var info = Modal.info;
 var QueryLogisticsTrack = function QueryLogisticsTrack(_ref) {
@@ -48,24 +48,26 @@ var QueryLogisticsTrack = function QueryLogisticsTrack(_ref) {
             }
             return _context.abrupt("return", message.error("缺少物流公司或物流单号"));
           case 2:
+            logisticsTraceSearch();
             //如果是顺丰且没有手机号 要输入手机号
-            if (interceptCompany === "SF" && !interceptSenderMobile) {
-              Modal.confirm({
-                title: "查询物流轨迹",
-                okText: "查询",
-                cancelText: "取消",
-                content: /*#__PURE__*/React.createElement("div", null, "\u53D1\u4EF6\u4EBA\u624B\u673A\u53F7", /*#__PURE__*/React.createElement(Input, {
-                  onChange: function onChange(e) {
-                    return setInputVal(e.target.value);
-                  }
-                })),
-                onOk: function onOk() {
-                  logisticsTraceSearch(inputVal);
-                }
-              });
-            } else {
-              logisticsTraceSearch();
-            }
+            // if (interceptCompany === "SF" && !interceptSenderMobile) {
+            //   Modal.confirm({
+            //     title: "查询物流轨迹",
+            //     okText: "查询",
+            //     cancelText: "取消",
+            //     content: (
+            //       <div>
+            //         发件人手机号
+            //         <Input onChange={(e) => setInputVal(e.target.value)}></Input>
+            //       </div>
+            //     ),
+            //     onOk: () => {
+            //       logisticsTraceSearch(inputVal);
+            //     },
+            //   });
+            // } else {
+            //   logisticsTraceSearch();
+            // }
           case 3:
           case "end":
             return _context.stop();
@@ -93,17 +95,17 @@ var QueryLogisticsTrack = function QueryLogisticsTrack(_ref) {
         var result = res.result,
           success = res.success,
           data = res.data,
-          message = res.message;
+          msg = res.message;
         if (result === 100 || success) {
           info({
             title: "物流轨迹",
             okText: "确定",
             icon: null,
             width: modelWidth,
-            content: LogisticsList(data)
+            content: LogisticsList(data === null || data === void 0 ? void 0 : data.traceDetailList)
           });
         } else {
-          message && message.error(message);
+          msg && message.error(msg);
         }
       });
     } catch (err) {

package/dist/esm/components/BS/BsGoods/index.js

@@ -11,12 +11,85 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 import React from "react";
 import GetFormItem from "../../GetFormItem";
 import { BsGoodImage } from "../../Common";
-import { BsChildPic, BsChildName, BsChildCode, BsChildSku, BsChildMoney, BsChildNumber, BsChildShare, BsChildType } from "../common/index";
+import { BsChildPic, BsChildName, BsChildCode, BsChildSku, BsChildMoney, BsChildShare, BsChildType } from "../common/index";
 import { isNull } from "@kmkf-fe-packages/kmkf-utils";
 import { BsGoods as Goods } from "@kmkf-fe-packages/basic-components";
 import { SYMBOL } from "../../../constant";
+var childHeaderMap = {
+  pic: {
+    component: BsChildPic,
+    name: "图片"
+  },
+  name: {
+    component: BsChildName,
+    name: "名称"
+  },
+  code: {
+    component: BsChildCode,
+    name: "编码"
+  },
+  sku: {
+    component: BsChildSku,
+    name: "sku编码"
+  },
+  money: {
+    component: BsChildMoney,
+    name: "实付金额"
+  },
+  number: {
+    component: BsChildMoney,
+    name: "数量"
+  },
+  share: {
+    component: BsChildShare,
+    name: "分摊价"
+  },
+  type: {
+    component: BsChildType,
+    name: "赠品类型"
+  }
+
+  // return {
+  //   name: new BsChildName({
+  //     ...options,
+  //     name: "名称",
+  //     id: `${options.id}_bsGoods`,
+  //   }),
+  //   code: new BsChildCode({
+  //     ...options,
+  //     name: "编码",
+  //     id: `${options.id}_bsGoods`,
+  //   }),
+  //   sku: new BsChildSku({
+  //     ...options,
+  //     name: "sku编码",
+  //     id: `${options.id}_bsGoods`,
+  //   }),
+  //   money: new BsChildMoney({
+  //     ...options,
+  //     name: "实付金额",
+  //     id: `${options.id}_bsGoods`,
+  //   }),
+  //   number: new BsChildNumber({
+  //     ...options,
+  //     name: "数量",
+  //     id: `${options.id}_bsGoods`,
+  //   }),
+  //   share: new BsChildShare({
+  //     ...options,
+  //     name: "分摊价",
+  //     id: `${options.id}_bsGoods`,
+  //   }),
+  //   type: new BsChildType({
+  //     ...options,
+  //     name: "赠品类型",
+  //     id: `${options.id}_bsGoods`,
+  //   }),
+  // };
+};
 var BsGoods = /*#__PURE__*/_createClass(function BsGoods(options) {
   var _this = this,
+    _options$componentCon,
     _this$componentConfig2;
   _classCallCheck(this, BsGoods);
   _defineProperty(this, "name", void 0);
@@ -96,31 +169,15 @@ var BsGoods = /*#__PURE__*/_createClass(function BsGoods(options) {
   this.effects = options === null || options === void 0 ? void 0 : options.effects;
   this.isCombinationComponent = false;
   this.canSort = false;
-  this.children = [new BsChildPic(_objectSpread(_objectSpread({}, options), {}, {
-    name: "bs图片",
-    id: "".concat(options.id, "_bsGoods")
-  })), new BsChildName(_objectSpread(_objectSpread({}, options), {}, {
-    name: "名称",
-    id: "".concat(options.id, "_bsGoods")
-  })), new BsChildCode(_objectSpread(_objectSpread({}, options), {}, {
-    name: "编码",
-    id: "".concat(options.id, "_bsGoods")
-  })), new BsChildSku(_objectSpread(_objectSpread({}, options), {}, {
-    name: "sku编码",
-    id: "".concat(options.id, "_bsGoods")
-  })), new BsChildMoney(_objectSpread(_objectSpread({}, options), {}, {
-    name: "实付金额",
-    id: "".concat(options.id, "_bsGoods")
-  })), new BsChildNumber(_objectSpread(_objectSpread({}, options), {}, {
-    name: "数量",
-    id: "".concat(options.id, "_bsGoods")
-  })), new BsChildShare(_objectSpread(_objectSpread({}, options), {}, {
-    name: "分摊价",
-    id: "".concat(options.id, "_bsGoods")
-  })), new BsChildType(_objectSpread(_objectSpread({}, options), {}, {
-    name: "赠品类型",
-    id: "".concat(options.id, "_bsGoods")
-  }))];
+  this.children = [((options === null || options === void 0 ? void 0 : (_options$componentCon = options.componentConfig) === null || _options$componentCon === void 0 ? void 0 : _options$componentCon.reasonList) || []).reduce(function (prv, next) {
+    if (childHeaderMap[next]) {
+      prv.push(new childHeaderMap[next].component(_objectSpread(_objectSpread({}, options), {}, {
+        name: childHeaderMap[next].name,
+        id: "".concat(options.id, "_bsGoods")
+      })));
+    }
+    return prv;
+  }, [])];
   this.componentConfig = options === null || options === void 0 ? void 0 : options.componentConfig;
   this.rules = this !== null && this !== void 0 && (_this$componentConfig2 = this.componentConfig) !== null && _this$componentConfig2 !== void 0 && _this$componentConfig2.required ? [{
     required: true,

package/dist/esm/components/LogisticsTrajectory/trajectoryCode.js

@@ -31,13 +31,14 @@ var TrajectoryCode = /*#__PURE__*/_createClass(function TrajectoryCode(options)
   _defineProperty(this, "renderCode", function (record) {
     var w = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 500;
     var company = record === null || record === void 0 ? void 0 : record["".concat(_this.parentId, "_trajectoryCompany")];
+    var mobile = record === null || record === void 0 ? void 0 : record["".concat(_this.parentId, "_trajectoryPhone")];
     var code = record === null || record === void 0 ? void 0 : record[_this.id];
     return /*#__PURE__*/React.createElement("div", null, code ? /*#__PURE__*/React.createElement(QueryLogisticsTrack, {
       title: code,
       modelWidth: w,
       interceptCompany: company,
       interceptCode: code,
-      interceptSenderMobile: ""
+      interceptSenderMobile: mobile
     }) : "--");
   });
   _defineProperty(this, "renderClient", function (record) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "0.7.15-alpha.23",
+  "version": "0.7.15-alpha.26",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -26,8 +26,8 @@
     "father": "^4.1.7"
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "^0.7.15-alpha.23",
-    "@kmkf-fe-packages/kmkf-utils": "^0.7.15-alpha.23"
+    "@kmkf-fe-packages/basic-components": "^0.7.15-alpha.26",
+    "@kmkf-fe-packages/kmkf-utils": "^0.7.15-alpha.26"
   },
   "peerDependencies": {
     "@ant-design/icons": "^4.7.0",
@@ -40,5 +40,5 @@
   "gitHooks": {
     "pre-commit": "lint-staged"
   },
-  "gitHead": "9e7a956b3c1caa6e2e0395bc7e174593217728a8"
+  "gitHead": "1864859c358cb78f091b1fdca91c1d3171bd5584"
 }