@kmkf-fe-packages/services-components 0.7.15-alpha.7 → 0.7.15-alpha.71

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(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/commonComponents/ShopList/index.d.ts

@@ -9,5 +9,5 @@ declare type ShopListProps = {
     shopList: Shop[];
     [prop: string]: any;
 };
-declare const ShopList: ({ shopList, onChange, setShopId, ...prop }: ShopListProps) => React.JSX.Element;
+declare const ShopList: ({ shopList, valueMapping, onChange, setShopId, ...prop }: ShopListProps) => React.JSX.Element;
 export default ShopList;

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

@@ -1,4 +1,4 @@
-var _excluded = ["shopList", "onChange", "setShopId"];
+var _excluded = ["shopList", "valueMapping", "onChange", "setShopId"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -8,6 +8,8 @@ import PlatformAvatar from "../PlatformAvatar";
 var ShopList = function ShopList(_ref) {
   var _shopList$filter;
   var shopList = _ref.shopList,
+    _ref$valueMapping = _ref.valueMapping,
+    valueMapping = _ref$valueMapping === void 0 ? "shopId" : _ref$valueMapping,
     onChange = _ref.onChange,
     setShopId = _ref.setShopId,
     prop = _objectWithoutProperties(_ref, _excluded);
@@ -21,7 +23,7 @@ var ShopList = function ShopList(_ref) {
     return (item === null || item === void 0 ? void 0 : item.auditStatus) === 1;
   })) === null || _shopList$filter === void 0 ? void 0 : _shopList$filter.map(function (item) {
     return /*#__PURE__*/React.createElement(Select.Option, {
-      value: item.shopId,
+      value: item === null || item === void 0 ? void 0 : item[valueMapping],
       label: item.shopName
     }, /*#__PURE__*/React.createElement(PlatformAvatar, {
       styles: {

package/dist/esm/components/ActualPayment/index.d.ts

@@ -1,5 +1,5 @@
-import { ComponentInterface, PickOption, ColumnConfig, Record } from "../../type";
-import React from "react";
+import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
+import React from 'react';
 declare class ActualPayment implements ComponentInterface {
     name: string;
     id: string;
@@ -10,8 +10,8 @@ declare class ActualPayment implements ComponentInterface {
     formField: string;
     canSort: boolean;
     children: ComponentInterface[];
-    componentConfig: ComponentInterface["componentConfig"];
-    dataType: ComponentInterface["dataType"];
+    componentConfig: ComponentInterface['componentConfig'];
+    dataType: ComponentInterface['dataType'];
     dataMap: Record;
     constructor(options: PickOption);
     getKeyByComponentType: (type: string) => any;
@@ -32,6 +32,7 @@ declare class ActualPayment implements ComponentInterface {
         }[];
         props: {
             placeholder: string[];
+            prefix: string;
         };
         formatFilterValue: (val: Array<number | null>) => (number | null)[];
         filterFn: (value: string) => (i: Record) => boolean;

package/dist/esm/components/ActualPayment/index.js

@@ -9,17 +9,17 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-import React from "react";
-import { ApaasInput } from "@kmkf-fe-packages/basic-components";
+import React from 'react';
+import { ApaasInput } from '@kmkf-fe-packages/basic-components';
 import GetFormItem from "../GetFormItem";
 import ItemView from "../../commonComponents/ItemView";
-import { isNull, filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
+import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
 import { SYMBOL } from "../../constant";
 var typeMap = {
-  ACTUAL_PAYMENT: "actualPayment",
-  BS_NET_RECEIPTS: "bsNetReceipts",
-  BS_DEPOSIT: "bsDeposit",
-  BS_PACKAGE_WEIGHT: "bsPackageWeight"
+  ACTUAL_PAYMENT: 'actualPayment',
+  BS_NET_RECEIPTS: 'bsNetReceipts',
+  BS_DEPOSIT: 'bsDeposit',
+  BS_PACKAGE_WEIGHT: 'bsPackageWeight'
 };
 var ActualPayment = /*#__PURE__*/_createClass(function ActualPayment(options) {
   var _this = this;
@@ -37,7 +37,7 @@ var ActualPayment = /*#__PURE__*/_createClass(function ActualPayment(options) {
   _defineProperty(this, "dataType", void 0);
   _defineProperty(this, "dataMap", void 0);
   _defineProperty(this, "getKeyByComponentType", function (type) {
-    return typeMap[type] || "";
+    return typeMap[type] || '';
   });
   _defineProperty(this, "renderClient", function (record) {
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
@@ -49,7 +49,7 @@ var ActualPayment = /*#__PURE__*/_createClass(function ActualPayment(options) {
   _defineProperty(this, "renderPc", function (value, record) {
     var _record;
     var type = _this.type;
-    return /*#__PURE__*/React.createElement("span", null, (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat(typeMap[type])]) !== null && _record !== void 0 ? _record : "--");
+    return /*#__PURE__*/React.createElement("span", null, (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat(typeMap[type])]) !== null && _record !== void 0 ? _record : '--');
   });
   _defineProperty(this, "renderLog", function (r) {
     var type = _this.type;
@@ -63,7 +63,7 @@ var ActualPayment = /*#__PURE__*/_createClass(function ActualPayment(options) {
   _defineProperty(this, "renderExport", function (value, record) {
     var _record2;
     var type = _this.type;
-    return (_record2 = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat(typeMap[type])]) !== null && _record2 !== void 0 ? _record2 : "--";
+    return (_record2 = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat(typeMap[type])]) !== null && _record2 !== void 0 ? _record2 : '--';
   });
   _defineProperty(this, "editRender", function (p) {
     var _this$componentConfig, _this$componentConfig2;
@@ -87,7 +87,7 @@ var ActualPayment = /*#__PURE__*/_createClass(function ActualPayment(options) {
       // 过滤组件id
       name: item.name,
       // 过滤组件名称
-      filterComponentType: "Rate",
+      filterComponentType: 'Rate',
       rules: [{
         validator: function () {
           var _validator = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_, value) {
@@ -112,13 +112,13 @@ var ActualPayment = /*#__PURE__*/_createClass(function ActualPayment(options) {
                     _context.next = 5;
                     break;
                   }
-                  return _context.abrupt("return", Promise.reject(new Error("请输入正确的金额区间范围")));
+                  return _context.abrupt("return", Promise.reject(new Error('请输入正确的金额区间范围')));
                 case 5:
                   if (!(value[0] > value[1])) {
                     _context.next = 7;
                     break;
                   }
-                  return _context.abrupt("return", Promise.reject(new Error("开始金额必须小于结束金额")));
+                  return _context.abrupt("return", Promise.reject(new Error('开始金额必须小于结束金额')));
                 case 7:
                 case "end":
                   return _context.stop();
@@ -132,7 +132,8 @@ var ActualPayment = /*#__PURE__*/_createClass(function ActualPayment(options) {
         }()
       }],
       props: {
-        placeholder: ["始-实付金额", "终-实付金额"]
+        placeholder: ["\u59CB-".concat(item.name), "\u7EC8-".concat(item.name)],
+        prefix: typeMap[_this.type] === 'bsPackageWeight' ? '' : '￥'
       },
       formatFilterValue: function formatFilterValue(val) {
         if (val !== null && val !== void 0 && val.some(function (v) {
@@ -154,20 +155,23 @@ var ActualPayment = /*#__PURE__*/_createClass(function ActualPayment(options) {
   this.formField = "".concat(options.id, "_").concat(this.getKeyByComponentType(options.type));
   this.name = options.name;
   this.type = options.type;
-  this.dataType = "number";
+  this.dataType = 'number';
   this.isCombinationComponent = false;
   this.canSort = true;
   this.children = [];
   this.componentConfig = options.componentConfig;
-  this.rules = [{
+  this.rules = options.type === 'ACTUAL_PAYMENT' ? [{
     pattern: /^\d+(\.\d{1,2})?$/,
-    message: "字段为正数或最多两位小数"
+    message: '字段为正数或最多两位小数'
+  }] : [{
+    pattern: /^(([0-9]*(\.[0-9]{1,})$)|([0-9]+$))/,
+    message: '请输入数字'
   }];
   this.dataMap = {
-    ACTUAL_PAYMENT: "actualPayment",
-    BS_NET_RECEIPTS: "bsNetReceipts",
-    BS_DEPOSIT: "bsDeposit",
-    BS_PACKAGE_WEIGHT: "bsPackageWeight"
+    ACTUAL_PAYMENT: 'actualPayment',
+    BS_NET_RECEIPTS: 'bsNetReceipts',
+    BS_DEPOSIT: 'bsDeposit',
+    BS_PACKAGE_WEIGHT: 'bsPackageWeight'
   };
 });
 export default ActualPayment;

package/dist/esm/components/AlipayAccount/index.js

@@ -42,9 +42,10 @@ var EAlipayAccount = /*#__PURE__*/_createClass(function EAlipayAccount(options)
     var _record;
     return /*#__PURE__*/React.createElement("span", {
       className: "pointer",
-      onClick: function onClick() {
+      onClick: function onClick(e) {
         var _this$effects, _this$effects2;
         typeof ((_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.queryWorkOrderDetail) === 'function' && ((_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.queryWorkOrderDetail(record));
+        e.stopPropagation();
       }
     }, (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) !== null && _record !== void 0 ? _record : '--');
   });

package/dist/esm/components/BS/BsExchange/index.d.ts

@@ -1,7 +1,6 @@
 import { ComponentInterface, PickOption, ColumnConfig, Record } from "../../../type";
 import React from "react";
-import BsExchangeImage from "../common/BsExchangeImage";
-import { BsType, BsMemo } from "../common/index";
+import { BsType, BsMemo, BsHeaderGood } from "../common/index";
 declare class BsExchange implements ComponentInterface {
     name: string;
     id: string;
@@ -15,9 +14,11 @@ declare class BsExchange implements ComponentInterface {
     canSort: boolean;
     children: ComponentInterface[];
     dataType: ComponentInterface["dataType"];
-    goodImage: BsExchangeImage;
     bsType: BsType;
     bsMemo: BsMemo;
+    returnGoods: BsHeaderGood;
+    swapOutGoods: BsHeaderGood;
+    giftGoods: BsHeaderGood;
     constructor(options: PickOption);
     renderClient: (record: any) => React.JSX.Element | null;
     renderPc: () => null;
@@ -26,15 +27,20 @@ declare class BsExchange implements ComponentInterface {
     renderExport: (value: any, record: any) => null;
     editRender: (p: any) => React.JSX.Element;
     filterConfig: (item: ColumnConfig) => ({
-        searchDefaultConditions: "eq";
+        searchDefaultConditions: "in";
         type: string;
         id: string;
         name: string;
         filterComponentType: "Cascader";
         props: {
             options: any[] | undefined;
+            fieldNames: {
+                label: string;
+                value: string;
+                children: string;
+            };
         };
-        filterFn: (value: string) => (i: Record) => boolean;
+        formatFilterValue: (val: Array<string>) => string[] | undefined;
     } | {
         searchDefaultConditions: "like";
         type: string;
@@ -42,7 +48,7 @@ declare class BsExchange implements ComponentInterface {
         name: string;
         filterComponentType: "Input";
         props?: undefined;
-        filterFn?: undefined;
+        formatFilterValue?: undefined;
     })[];
 }
 export default BsExchange;