npm - @kmkf-fe-packages/services-components - Versions diffs - 1.22.1-beta.62 → 1.22.1-beta.64 - Mend

@kmkf-fe-packages/services-components 1.22.1-beta.62 → 1.22.1-beta.64

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/esm/components/BS/BsSystemOrder/index.js +5 -163
package/dist/esm/components/Common/index.js +6 -111
package/package.json +4 -4

package/dist/esm/components/BS/BsSystemOrder/index.js CHANGED Viewed

@@ -11,175 +11,17 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 import React from "react";
 import GetFormItem from "../../GetFormItem";
 import ItemView from "../../../commonComponents/ItemView";
-import { isNull, BS_E3_BOOLEAN_STATUS_MAP, BS_E3_ORDER_STATUS_MAP, KM_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG } from "@kmkf-fe-packages/kmkf-utils";
+import { isNull, KM_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, BS_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG } from "@kmkf-fe-packages/kmkf-utils";
 import { BsSystemOrder as SystemOrder } from "@kmkf-fe-packages/basic-components";
 import { BsSystemOrderTable } from "../../Common";
 import { BsHeaderChild } from "../common/index";
 import { SYMBOL, batchInput } from "../../../constant";
 var typeMap = {
-  BS_SYSTEM_ORDER: {
-    key: "bsSystemShowOrder",
-    name: "百胜",
-    selectId: "bsSystemSelectIds",
-    columns: [{
-      title: "单据类型",
-      dataIndex: "billType",
-      width: 150
-    }, {
-      title: "系统订单号",
-      dataIndex: "billNo",
-      width: 150
-    }, {
-      title: "标签",
-      dataIndex: "billTag",
-      width: 150
-    }, {
-      title: "主播名称",
-      dataIndex: "authorName",
-      width: 150
-    }, {
-      title: "主播ID",
-      dataIndex: "authorId",
-      width: 150
-    }
-    // {
-    //   title: '直播活动',
-    //   dataIndex: 'liveActivites',
-    //   width: 150,
-    // },
-    ]
-  },
+  BS_SYSTEM_ORDER: BS_SYSTEM_ORDER_CONFIG,
   KM_SYSTEM_ORDER: KM_SYSTEM_ORDER_CONFIG,
-  WLN_SYSTEM_ORDER: {
-    key: "wlnSystemShowOrder",
-    name: "万里牛",
-    selectId: "wlnSystemSelectIds",
-    columns: [{
-      title: "订单类型",
-      dataIndex: "billType",
-      width: 150
-    }, {
-      title: "系统订单号",
-      dataIndex: "billNo",
-      width: 150
-    }, {
-      title: "标记",
-      dataIndex: "billTag",
-      width: 150
-    }]
-  },
-  WDT_SYSTEM_ORDER: {
-    key: "wdtSystemShowOrder",
-    name: "旺店通",
-    selectId: "wdtSystemSelectIds",
-    columns: [{
-      title: "订单类型",
-      dataIndex: "billType",
-      width: 150
-    }, {
-      title: "系统订单号",
-      dataIndex: "billNo",
-      width: 150
-    }, {
-      title: "订单标签",
-      dataIndex: "billTag",
-      width: 150
-    }]
-  },
-  BS_E3_SYSTEM_ORDER: {
-    key: "bsE3SystemShowOrder",
-    name: "百胜",
-    selectId: "bsE3SystemSelectIds",
-    columns: [{
-      title: "系统订单号",
-      dataIndex: "orderSn",
-      width: 150,
-      ellipsis: true
-    }, {
-      title: "订单状态",
-      dataIndex: "orderStatus",
-      width: 100,
-      ellipsis: true,
-      render: function render(val) {
-        return /*#__PURE__*/React.createElement("span", null, BS_E3_ORDER_STATUS_MAP[val] || val);
-      },
-      renderExport: function renderExport(val) {
-        return BS_E3_ORDER_STATUS_MAP[val] || val;
-      }
-    }, {
-      title: "是否被拆分",
-      dataIndex: "isSplit",
-      width: 100,
-      ellipsis: true,
-      render: function render(val) {
-        return /*#__PURE__*/React.createElement("span", null, BS_E3_BOOLEAN_STATUS_MAP[val] || val);
-      },
-      renderExport: function renderExport(val) {
-        return BS_E3_BOOLEAN_STATUS_MAP[val] || val;
-      }
-    }, {
-      title: "是否拆分子单",
-      dataIndex: "isSplitNew",
-      width: 100,
-      ellipsis: true,
-      render: function render(val) {
-        return /*#__PURE__*/React.createElement("span", null, BS_E3_BOOLEAN_STATUS_MAP[val] || val);
-      },
-      renderExport: function renderExport(val) {
-        return BS_E3_BOOLEAN_STATUS_MAP[val] || val;
-      }
-    }, {
-      title: "是否被合并",
-      dataIndex: "isCombine",
-      width: 100,
-      ellipsis: true,
-      render: function render(val) {
-        return /*#__PURE__*/React.createElement("span", null, BS_E3_BOOLEAN_STATUS_MAP[val] || val);
-      },
-      renderExport: function renderExport(val) {
-        return BS_E3_BOOLEAN_STATUS_MAP[val] || val;
-      }
-    }, {
-      title: "是否合并新单",
-      dataIndex: "isCombineNew",
-      width: 100,
-      ellipsis: true,
-      render: function render(val) {
-        return /*#__PURE__*/React.createElement("span", null, BS_E3_BOOLEAN_STATUS_MAP[val] || val);
-      },
-      renderExport: function renderExport(val) {
-        return BS_E3_BOOLEAN_STATUS_MAP[val] || val;
-      }
-    }, {
-      title: "是否复制单",
-      dataIndex: "isCopy",
-      width: 100,
-      ellipsis: true,
-      render: function render(val) {
-        return /*#__PURE__*/React.createElement("span", null, BS_E3_BOOLEAN_STATUS_MAP[val] || val);
-      },
-      renderExport: function renderExport(val) {
-        return BS_E3_BOOLEAN_STATUS_MAP[val] || val;
-      }
-    }, {
-      title: "是否换货单",
-      dataIndex: "isExchangeOrder",
-      width: 100,
-      ellipsis: true,
-      render: function render(val) {
-        return /*#__PURE__*/React.createElement("span", null, BS_E3_BOOLEAN_STATUS_MAP[val] || val);
-      },
-      renderExport: function renderExport(val) {
-        return BS_E3_BOOLEAN_STATUS_MAP[val] || val;
-      }
-    }, {
-      title: "订单备注",
-      dataIndex: "orderMsg",
-      width: 150,
-      ellipsis: true
-    }]
-  },
+  WLN_SYSTEM_ORDER: WLN_SYSTEM_ORDER_CONFIG,
+  WDT_SYSTEM_ORDER: WDT_SYSTEM_ORDER_CONFIG,
+  BS_E3_SYSTEM_ORDER: BS_E3_SYSTEM_ORDER_CONFIG,
   GY_SYSTEM_ORDER: GY_SYSTEM_ORDER_CONFIG
 };
 var BsSystemOrder = /*#__PURE__*/_createClass(function BsSystemOrder(options) {

package/dist/esm/components/Common/index.js CHANGED Viewed

@@ -14,13 +14,13 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Form, Button, Modal, Tooltip, Space, Image, Popover, Table, message, Typography } from "antd";
 import React, { useState, useMemo } from "react";
-import { ExpressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, BS_E3_ORDER_STATUS_MAP } from "@kmkf-fe-packages/kmkf-utils";
+import { ExpressData, SendDataCenter } from "@kmkf-fe-packages/kmkf-utils";
 import { getAlipayBillReceipt } from "../../service/api";
 import { CopyToClipboard } from "react-copy-to-clipboard";
 import styles from "./index.module.less";
 import defaultImg from "./img/default-img.png";
 import CopyText from "../../commonComponents/CopyText";
-import { KM_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, msgTypeCh, getMapping, columnsGoodsList } from "@kmkf-fe-packages/kmkf-utils";
+import { KM_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, BS_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, msgTypeCh, getMapping, columnsGoodsList } from "@kmkf-fe-packages/kmkf-utils";
 import { getColumnsMap } from "./constants/columnsBaseInfoMap";
 var Paragraph = Typography.Paragraph;
 export var getFormItem = function getFormItem(_ref) {
@@ -635,116 +635,11 @@ export var BsSystemOrderTable = function BsSystemOrderTable(_ref13) {
   var value = _ref13.value,
     type = _ref13.type;
   var columnMap = {
-    BS_SYSTEM_ORDER: [{
-      dataIndex: "billType",
-      title: "订单类型"
-    }, {
-      dataIndex: "billNo",
-      title: "系统订单号"
-    }, {
-      dataIndex: "billTag",
-      title: "标签"
-    }, {
-      title: "主播名称",
-      dataIndex: "authorName"
-    }, {
-      title: "主播ID",
-      dataIndex: "authorId"
-    }
-    // {
-    //   title: '直播活动',
-    //   dataIndex: 'liveActivites',
-    // },
-    ],
+    BS_SYSTEM_ORDER: BS_SYSTEM_ORDER_CONFIG.columns,
     KM_SYSTEM_ORDER: KM_SYSTEM_ORDER_CONFIG.columns,
-    WLN_SYSTEM_ORDER: [{
-      dataIndex: "billType",
-      title: "单据类型"
-    }, {
-      dataIndex: "billNo",
-      title: "系统订单号"
-    }, {
-      dataIndex: "billTag",
-      title: "标签"
-    }],
-    WDT_SYSTEM_ORDER: [{
-      dataIndex: "billType",
-      title: "订单类型"
-    }, {
-      dataIndex: "billNo",
-      title: "系统订单号"
-    }, {
-      dataIndex: "billTag",
-      title: "订单标签"
-    }],
-    BS_E3_SYSTEM_ORDER: [{
-      title: "系统订单号",
-      dataIndex: "orderSn",
-      width: 150,
-      ellipsis: true
-    }, {
-      title: "订单状态",
-      dataIndex: "orderStatus",
-      width: 100,
-      ellipsis: true,
-      render: function render(val) {
-        return /*#__PURE__*/React.createElement("span", null, BS_E3_ORDER_STATUS_MAP[val] || val);
-      }
-    }, {
-      title: "是否被拆分",
-      dataIndex: "isSplit",
-      width: 100,
-      ellipsis: true,
-      render: function render(val) {
-        return /*#__PURE__*/React.createElement("span", null, BS_E3_BOOLEAN_STATUS_MAP[val] || val);
-      }
-    }, {
-      title: "是否拆分子单",
-      dataIndex: "isSplitNew",
-      width: 100,
-      ellipsis: true,
-      render: function render(val) {
-        return /*#__PURE__*/React.createElement("span", null, BS_E3_BOOLEAN_STATUS_MAP[val] || val);
-      }
-    }, {
-      title: "是否被合并",
-      dataIndex: "isCombine",
-      width: 100,
-      ellipsis: true,
-      render: function render(val) {
-        return /*#__PURE__*/React.createElement("span", null, BS_E3_BOOLEAN_STATUS_MAP[val] || val);
-      }
-    }, {
-      title: "是否合并新单",
-      dataIndex: "isCombineNew",
-      width: 100,
-      ellipsis: true,
-      render: function render(val) {
-        return /*#__PURE__*/React.createElement("span", null, BS_E3_BOOLEAN_STATUS_MAP[val] || val);
-      }
-    }, {
-      title: "是否复制单",
-      dataIndex: "isCopy",
-      width: 100,
-      ellipsis: true,
-      render: function render(val) {
-        return /*#__PURE__*/React.createElement("span", null, BS_E3_BOOLEAN_STATUS_MAP[val] || val);
-      }
-    }, {
-      title: "是否换货单",
-      dataIndex: "isExchangeOrder",
-      width: 100,
-      ellipsis: true,
-      render: function render(val) {
-        return /*#__PURE__*/React.createElement("span", null, BS_E3_BOOLEAN_STATUS_MAP[val] || val);
-      }
-    }, {
-      title: "订单备注",
-      dataIndex: "orderMsg",
-      width: 100,
-      ellipsis: true
-    }],
+    WLN_SYSTEM_ORDER: WLN_SYSTEM_ORDER_CONFIG.columns,
+    WDT_SYSTEM_ORDER: WDT_SYSTEM_ORDER_CONFIG.columns,
+    BS_E3_SYSTEM_ORDER: BS_E3_SYSTEM_ORDER_CONFIG.columns,
     GY_SYSTEM_ORDER: GY_SYSTEM_ORDER_CONFIG.columns
   };
   var rowKeyMap = {

package/package.json CHANGED Viewed

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