@kmkf-fe-packages/services-components 2.9.0-rc.0 → 2.9.1-beta.0

package/dist/esm/index.d.ts

@@ -101,6 +101,9 @@ export { default as AsyncSelect } from "./components/Public/AsyncSelect";
 export { default as SkxIdInputSelect } from "./components/SKX/SkxIdInputSelect";
 export { default as SkxGoods } from "./components/SKX/SkxGoods";
 export { default as OrderSubForm } from "./components/OrderSubForm";
+export { default as FlowOverallStatusSelect } from "./components/FlowOverallStatusSelect";
+export { default as ReturnWarehouse } from "./components/Public/ReturnWarehouse";
+export { default as KmExchange } from "./components/KM/KmExchange";
 export { default as KmErpOrderNum } from "./components/ErpTradeId/components/OrderNum";
 export { factory } from "./factory";
 export { default as PlatformAvatar } from "./commonComponents/PlatformAvatar";
@@ -113,3 +116,4 @@ export { default as Global } from "./commonComponents/GlobalContext";
 export * as ErpScenes from "./commonComponents/ErpContext";
 export * as servers from "./service/api";
 export { default as QueryLogisticsTrack } from "./commonComponents/QueryLogisticsTrack";
+export * from "./Hooks";

package/dist/esm/index.js

@@ -101,6 +101,10 @@ export { default as AsyncSelect } from "./components/Public/AsyncSelect";
 export { default as SkxIdInputSelect } from "./components/SKX/SkxIdInputSelect";
 export { default as SkxGoods } from "./components/SKX/SkxGoods";
 export { default as OrderSubForm } from "./components/OrderSubForm";
+export { default as FlowOverallStatusSelect } from "./components/FlowOverallStatusSelect";
+export { default as ReturnWarehouse } from "./components/Public/ReturnWarehouse";
+export { default as KmExchange } from "./components/KM/KmExchange";
+
 // TODO: ERP 打款工单使用
 export { default as KmErpOrderNum } from "./components/ErpTradeId/components/OrderNum";
 export { factory } from "./factory";
@@ -115,4 +119,5 @@ import * as _ErpScenes from "./commonComponents/ErpContext";
 export { _ErpScenes as ErpScenes };
 import * as _servers from "./service/api";
 export { _servers as servers };
-export { default as QueryLogisticsTrack } from "./commonComponents/QueryLogisticsTrack";
+export { default as QueryLogisticsTrack } from "./commonComponents/QueryLogisticsTrack";
+export * from "./Hooks";

package/dist/esm/service/api.d.ts

@@ -2,6 +2,7 @@ export declare const replaceCheck: (data: any) => Promise<any>;
 export declare const queryAddressData: () => Promise<void>;
 export declare const queryBsAddressData: () => Promise<void>;
 export declare const queryWdtAddressData: () => Promise<void>;
+export declare const queryJstAddressData: () => Promise<void>;
 export declare const queryPlatData: () => Promise<void>;
 export declare const queryExpressInterceptData: () => Promise<void>;
 export declare const queryLogisticsAddressData: () => Promise<void>;
@@ -10,6 +11,8 @@ export declare const queryWdtLogisticsCompany: () => Promise<void>;
 export declare const queryBsE3LogisticsCompany: () => Promise<void>;
 export declare const queryJSTLogisticsCompany: () => Promise<void>;
 export declare const queryGYLogisticsCompany: () => Promise<void>;
+export declare const queryJYLogisticsCompany: () => Promise<void>;
+export declare const queryJKYLogisticsCompany: () => Promise<void>;
 export declare const queryWLNLogisticsCompany: () => Promise<void>;
 export declare const queryKMLogisticsCompany: () => Promise<void>;
 export declare const getAlipayBillReceipt: (data: any) => Promise<any>;

package/dist/esm/service/api.js

@@ -10,7 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-import { AddressData, toTree, BsAddressData, WdtAddressData, PlatData, ExpressInterceptData, LogisticsAddressData, ExpressData, LabelData, servers } from "@kmkf-fe-packages/kmkf-utils";
+import { AddressData, toTree, BsAddressData, WdtAddressData, PlatData, ExpressInterceptData, LogisticsAddressData, ExpressData, LabelData, servers, JstAddressData } from "@kmkf-fe-packages/kmkf-utils";
 import get from "lodash/get";
 import request from "./request";
 // 重复校验
@@ -80,6 +80,26 @@ export var queryWdtAddressData = function queryWdtAddressData() {
     instance.addressOptions = toTree(list, 1);
   });
 };
+export var queryJstAddressData = function queryJstAddressData() {
+  return request({
+    url: "/qy/gdfw/template/queryJstAreas/noLogin",
+    method: "get",
+    data: {}
+  }).then(function (resp) {
+    var map = {};
+    var res = {};
+    var _resp$data3 = resp.data,
+      list = _resp$data3 === void 0 ? [] : _resp$data3;
+    for (var i = 0; i < list.length; i++) {
+      res[list[i]["id"]] = [list[i]["name"], list[i]["parentId"]];
+      map[list[i]["name"]] = list[i]["id"];
+    }
+    var instance = JstAddressData.getInstance();
+    instance.addrData = res;
+    instance.addrNameMap = map;
+    instance.addressOptions = toTree(list, 1);
+  });
+};
 export var queryPlatData = function queryPlatData() {
   return request({
     url: "/qy/platform/listPlatform/noLogin",
@@ -122,6 +142,7 @@ export var queryExpressInterceptData = function queryExpressInterceptData() {
       SF: "顺丰",
       ZTO: "中通",
       JT: "极兔",
+      STO: "申通",
       DEFAULT: ""
     };
     var expressList = data.map(function (item) {
@@ -217,9 +238,7 @@ export var queryExpressInterceptData = function queryExpressInterceptData() {
       }
     });
     instance.statusConditionOptions = tempList;
-  }).catch(function (e) {
-    console.log(e);
-  });
+  }).catch(function (e) {});
 };
 export var queryLogisticsAddressData = function queryLogisticsAddressData() {
   return request({
@@ -230,9 +249,7 @@ export var queryLogisticsAddressData = function queryLogisticsAddressData() {
     var data = res.data;
     var instance = LogisticsAddressData.getInstance();
     instance.addressData = data;
-  }).catch(function (e) {
-    console.log(e);
-  });
+  }).catch(function (e) {});
 };
 export var queryAllLogisticsCompany = function queryAllLogisticsCompany() {
   return request({
@@ -255,37 +272,49 @@ export var queryWdtLogisticsCompany = function queryWdtLogisticsCompany() {
   var instance = ExpressData.getInstance("wdt");
   return servers.getWdtSellerLogisticsCompanyRelation().then(function (data) {
     instance.expressData = data;
-  }).catch(console.log);
+  }).catch(function () {});
 };
 export var queryBsE3LogisticsCompany = function queryBsE3LogisticsCompany() {
   var instance = ExpressData.getInstance("bsE3");
   return servers.BSE3.getLogisticsDataAsync().then(function (data) {
     instance.expressData = data;
-  }).catch(console.log);
+  }).catch(function () {});
 };
 export var queryJSTLogisticsCompany = function queryJSTLogisticsCompany() {
   var instance = ExpressData.getInstance("jst");
   return servers.JST.getLogisticsDataAsync().then(function (data) {
     instance.expressData = data;
-  }).catch(console.log);
+  }).catch(function () {});
 };
 export var queryGYLogisticsCompany = function queryGYLogisticsCompany() {
   var instance = ExpressData.getInstance("gy");
   return servers.GY.getLogisticsDataAsync().then(function (data) {
     instance.expressData = data;
-  }).catch(console.log);
+  }).catch(function () {});
+};
+export var queryJYLogisticsCompany = function queryJYLogisticsCompany() {
+  var instance = ExpressData.getInstance("jy");
+  return servers.JY.getLogisticsDataAsync().then(function (data) {
+    instance.expressData = data;
+  }).catch(function () {});
+};
+export var queryJKYLogisticsCompany = function queryJKYLogisticsCompany() {
+  var instance = ExpressData.getInstance("jky");
+  return servers.JKY.getLogisticsDataAsync().then(function (data) {
+    instance.expressData = data;
+  }).catch(function () {});
 };
 export var queryWLNLogisticsCompany = function queryWLNLogisticsCompany() {
   var instance = ExpressData.getInstance("wln");
   return servers.WLN.getLogisticsDataAsync().then(function (data) {
     instance.expressData = data;
-  }).catch(console.log);
+  }).catch(function () {});
 };
 export var queryKMLogisticsCompany = function queryKMLogisticsCompany() {
   var instance = ExpressData.getInstance("km");
   return servers.KM.getLogisticsDataAsync().then(function (data) {
     instance.expressData = data;
-  }).catch(console.log);
+  }).catch(function () {});
 };
 // 获取支付宝电子回单
 export var getAlipayBillReceipt = function getAlipayBillReceipt(data) {
@@ -309,7 +338,6 @@ export var queryLabel = function queryLabel() {
       var finalData = JSON.parse(data);
       instance.labelData = finalData;
     } catch (e) {
-      console.error("转换标签数据数据异常");
       instance.labelData = [];
     }
   });

package/dist/esm/service/request.js

@@ -52,13 +52,10 @@ var requestApi = function requestApi(_ref) {
           message.warn(res.message);
         } else if (infoLevel === 'error') {
           message.error(res.message);
-        } else {
-          console.log(res.message);
-        }
+        } else {}
         reject(res);
       }
     }).catch(function (e) {
-      console.error('请求错误', e);
       reject(e);
     });
   });

package/dist/esm/type.d.ts

@@ -33,9 +33,9 @@ export declare type FilterConfigType = {
     filterFn?: (p: any) => (r: Record) => unknown;
     formatFilterValue?: (p: any) => any;
 };
-export declare type FilterComponentType = "MultipleSelect" | "Input" | "Date" | "Cascader" | "ShopList" | "Rate" | "SelectInput" | "AsyncSelect";
+export declare type FilterComponentType = "MultipleSelect" | "TagsSelect" | "Input" | "Date" | "Cascader" | "ShopList" | "Rate" | "SelectInput" | "AsyncSelect";
 export interface ComponentInterface {
-    transformValue?: (val: any, record?: any, parentName?: string) => any;
+    transformValue?: (val: any, record?: any, parentName?: string, parent?: any) => any;
     id: string;
     sortField: string;
     sortChildField?: {
@@ -64,6 +64,7 @@ export interface ComponentInterface {
     workOrderUniqueKey?: string;
     platform?: PlatForm;
     parentName?: string;
+    parent?: any;
     exampleValue?: any;
     compoundConfig?: Array<{
         id: string;
@@ -77,6 +78,34 @@ export interface ComponentInterface {
      */
     formItemIndex?: number;
     componentConfig?: {
+        /**
+         * @description 商品类组件选择商品来源配置
+         */
+        goodsSource?: {
+            source?: "workOrder" | "erp";
+            sourceSettings?: {
+                filterMode?: "some" | "every";
+                filterRules?: {
+                    leftValue: string;
+                    compareSymbol: any;
+                    rightValue?: any;
+                }[];
+                dataFilterConfig: {
+                    [cpId: string]: {
+                        isFilter?: boolean;
+                        isShow?: boolean;
+                        index?: number;
+                    };
+                };
+                keyMap: {
+                    [key: string]: string;
+                };
+                workOrder: {
+                    flowTemplateKey: string;
+                    nodeId: string;
+                };
+            };
+        };
         /**
          * @description 特殊自定义组件有的值
          */
@@ -212,6 +241,7 @@ export interface ComponentInterface {
             repeatRange: string;
             repeatComponents: any[];
         };
+        sortColumns?: string;
     };
     effects?: {
         queryWorkOrderDetail?: (r: Record) => void;
@@ -219,6 +249,7 @@ export interface ComponentInterface {
         handleChangeSingleWorkOrderMark?: (t: string, r: Record, id?: string) => void;
         templateList?: any[];
         templateDetail?: any[];
+        workOrderDetail?: Record;
         isEditing?: boolean;
         form?: FormInstance;
         shopList?: any[];
@@ -293,7 +324,7 @@ export interface ComponentInterface {
     getComponentValue: (r: Record) => any;
     formDataTransform?: (r: any) => any;
 }
-export declare type PickOption = Pick<ComponentInterface, "name" | "id" | "type" | "componentConfig" | "effects" | "columnHeader" | "templateId" | "workOrderUniqueKey" | "platform" | "parentName" | "width" | "flowTemplateKey" | "transformValue" | "renderExport">;
+export declare type PickOption = Pick<ComponentInterface, "name" | "id" | "type" | "componentConfig" | "effects" | "columnHeader" | "templateId" | "workOrderUniqueKey" | "platform" | "parentName" | "parent" | "width" | "flowTemplateKey" | "transformValue" | "renderExport">;
 export declare type ColumnConfig = {
     id: string;
     name: string;
@@ -303,3 +334,12 @@ export declare type ColumnConfig = {
     config?: ComponentInterface["componentConfig"];
     templateConfig?: ComponentInterface["componentConfig"];
 };
+export interface ColumnsConfigI {
+    show: boolean;
+    delete: boolean;
+    width: number;
+    name: string;
+    id: string;
+    type: string;
+    config?: any;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "2.9.0-rc.0",
+  "version": "2.9.1-beta.0",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -21,8 +21,8 @@
     ]
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "2.9.0-rc.0",
-    "@kmkf-fe-packages/kmkf-utils": "2.9.0-rc.0",
+    "@kmkf-fe-packages/basic-components": "2.9.1-beta.0",
+    "@kmkf-fe-packages/kmkf-utils": "2.9.1-beta.0",
     "b64-to-blob": "^1.2.19",
     "html2canvas": "^1.4.1",
     "react-pdf-js": "^5.1.0"
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b42dfb960ac3f140a6668c37243674aa5b4b444b",
+  "gitHead": "4b97a6cd35615a0cd1a8a51fe41b4a213d42fbcd",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }

package/dist/esm/components/Common/constants/gy.d.ts

@@ -1,3 +0,0 @@
-import { GetColumnsBaseInfoMapFnType } from "./columnsBaseInfoMap";
-declare const getColumns: GetColumnsBaseInfoMapFnType;
-export default getColumns;

package/dist/esm/components/Common/constants/gy.js

@@ -1,219 +0,0 @@
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-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 { isNull } from "@kmkf-fe-packages/kmkf-utils";
-var getYesOrNo = function getYesOrNo(val) {
-  if (isNull(val)) return null;
-  return val ? "是" : "否";
-};
-var getColumns = function getColumns() {
-  var data = {
-    //管易商品信息
-    GY_GOODS: [{
-      dataIndex: "goodName",
-      title: "\u5546\u54C1\u540D\u79F0",
-      width: 150
-    }, {
-      dataIndex: "goodShortName",
-      title: "\u5546\u54C1\u7B80\u79F0",
-      width: 150
-    }, {
-      dataIndex: "goodNo",
-      title: "\u5546\u54C1\u7F16\u7801",
-      width: 200
-    }, {
-      dataIndex: "specName",
-      title: "SKU\u540D\u79F0",
-      align: "center",
-      ellipsis: true,
-      width: 250
-    }, {
-      dataIndex: "specNo",
-      title: "SKU\u7F16\u7801",
-      align: "center",
-      ellipsis: true,
-      width: 150
-    }, {
-      dataIndex: "qty",
-      title: "\u6570\u91CF",
-      width: 100
-    }, {
-      dataIndex: "price",
-      title: "\u5B9E\u9645\u5355\u4EF7",
-      width: 150
-    }, {
-      dataIndex: "amount",
-      title: "\u5B9E\u9645\u91D1\u989D",
-      width: 150
-    }, {
-      dataIndex: "originPrice",
-      title: "\u6807\u51C6\u5355\u4EF7",
-      width: 150
-    }, {
-      dataIndex: "originAmount",
-      title: "\u6807\u51C6\u91D1\u989D",
-      width: 150
-    }, {
-      dataIndex: "discountFee",
-      title: "\u8BA9\u5229\u91D1\u989D",
-      width: 150
-    }, {
-      dataIndex: "amountAfter",
-      title: "\u8BA9\u5229\u540E\u91D1\u989D",
-      width: 150
-    }, {
-      dataIndex: "cancel",
-      title: "\u662F\u5426\u53D6\u6D88",
-      width: 150,
-      render: function render(val) {
-        return /*#__PURE__*/React.createElement("span", null, getYesOrNo(val));
-      }
-    }, {
-      dataIndex: "isGift",
-      title: "\u662F\u5426\u8D60\u54C1",
-      width: 150,
-      render: function render(val) {
-        return /*#__PURE__*/React.createElement("span", null, getYesOrNo(val));
-      }
-    }, {
-      dataIndex: "skuNote",
-      title: "\u5546\u54C1\u5907\u6CE8",
-      width: 150
-    }].map(function (item) {
-      return _objectSpread(_objectSpread({}, item), {}, {
-        align: "center",
-        ellipsis: true
-      });
-    }),
-    //管易补发商品信息
-    GY_REISSUE_GOODS: [{
-      dataIndex: "goodName",
-      title: "\u5546\u54C1\u540D\u79F0",
-      width: 150
-    }, {
-      dataIndex: "goodShortName",
-      title: "\u5546\u54C1\u7B80\u79F0",
-      width: 150
-    }, {
-      dataIndex: "goodNo",
-      title: "\u5546\u54C1\u7F16\u7801",
-      width: 200
-    }, {
-      dataIndex: "specName",
-      title: "SKU\u540D\u79F0",
-      align: "center",
-      ellipsis: true,
-      width: 250
-    }, {
-      dataIndex: "specNo",
-      title: "SKU\u7F16\u7801",
-      align: "center",
-      ellipsis: true,
-      width: 150
-    }, {
-      dataIndex: "qty",
-      title: "\u6570\u91CF",
-      width: 100
-    }, {
-      dataIndex: "price",
-      title: "\u5B9E\u9645\u5355\u4EF7",
-      width: 150
-    }, {
-      dataIndex: "amount",
-      title: "\u5B9E\u9645\u91D1\u989D",
-      width: 150
-    }, {
-      dataIndex: "originPrice",
-      title: "\u6807\u51C6\u5355\u4EF7",
-      width: 150
-    }, {
-      dataIndex: "originAmount",
-      title: "\u6807\u51C6\u91D1\u989D",
-      width: 150
-    }, {
-      dataIndex: "isGift",
-      title: "\u662F\u5426\u8D60\u54C1",
-      width: 150,
-      render: function render(val) {
-        return /*#__PURE__*/React.createElement("span", null, getYesOrNo(val));
-      }
-    }].map(function (item) {
-      return _objectSpread(_objectSpread({}, item), {}, {
-        align: "center",
-        ellipsis: true
-      });
-    }),
-    //管易退货商品信息
-    GY_RETURN_GOODS: [{
-      dataIndex: "goodName",
-      title: "\u5546\u54C1\u540D\u79F0",
-      width: 150
-    }, {
-      dataIndex: "goodShortName",
-      title: "\u5546\u54C1\u7B80\u79F0",
-      width: 150
-    }, {
-      dataIndex: "goodNo",
-      title: "\u5546\u54C1\u7F16\u7801",
-      width: 200
-    }, {
-      dataIndex: "specName",
-      title: "SKU\u540D\u79F0",
-      align: "center",
-      ellipsis: true,
-      width: 250
-    }, {
-      dataIndex: "specNo",
-      title: "SKU\u7F16\u7801",
-      align: "center",
-      ellipsis: true,
-      width: 150
-    }, {
-      dataIndex: "qty",
-      title: "\u6570\u91CF",
-      width: 100
-    }, {
-      dataIndex: "price",
-      title: "\u5B9E\u9645\u5355\u4EF7",
-      width: 150
-    }, {
-      dataIndex: "amount",
-      title: "\u5B9E\u9645\u91D1\u989D",
-      width: 150
-    }, {
-      dataIndex: "originPrice",
-      title: "\u6807\u51C6\u5355\u4EF7",
-      width: 150
-    }, {
-      dataIndex: "originAmount",
-      title: "\u6807\u51C6\u91D1\u989D",
-      width: 150
-    }, {
-      dataIndex: "discountFee",
-      title: "\u8BA9\u5229\u91D1\u989D",
-      width: 150
-    }, {
-      dataIndex: "amountAfter",
-      title: "\u8BA9\u5229\u540E\u91D1\u989D",
-      width: 150
-    }, {
-      dataIndex: "isGift",
-      title: "\u662F\u5426\u8D60\u54C1",
-      width: 150,
-      render: function render(val) {
-        return /*#__PURE__*/React.createElement("span", null, getYesOrNo(val));
-      }
-    }].map(function (item) {
-      return _objectSpread(_objectSpread({}, item), {}, {
-        align: "center",
-        ellipsis: true
-      });
-    })
-  };
-  return data;
-};
-export default getColumns;