@kmkf-fe-packages/kmkf-work-order-service-component 0.29.2-rc.6 → 1.0.2

package/README.md

@@ -66,3 +66,4 @@ const Text = ()=>{
 ```
 
 | 字段 | 说明 | 数据类型 | | ----------------- | ---------------- | ------------------------------------ | | platform | 平台 | TAOBAO =淘宝\|FXG=抖音\|PDD=拼多多\| | | shopId | 店铺 ID | number | | buyerNick | 买家昵称 | string | | buyerId | 买家 id | string | | orderNo | 订单 id | string | | onEmpowerCallback | 授权弹框点击回调 | function |
+

package/dist/esm/FlowTemplateDetail/components/FormRender/index.js

@@ -28,7 +28,7 @@ import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle } fro
 import 'moment/locale/zh-cn';
 import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, EXCLUDE_REPLACE_TOP_COMPONENT,
 // 重复检验不需要展示在顶部的
-INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, COMPONENT_MAP } from "../../../common/utils/tools";
+INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo } from "../../../common/utils/tools";
 import { replaceCheck, orderDetail } from "../../../model/servers/api";
 import { factory } from '@kmkf-fe-packages/services-components';
 import { getExpression, formatDisplayConfig, isNull } from '@kmkf-fe-packages/kmkf-utils';
@@ -179,7 +179,7 @@ var FormRender = function FormRender(props, ref) {
     var obj = {};
     Object.keys(params).forEach(function (key) {
       var _params$key;
-      if (params[key] && typeof params[key] === 'string' && ((_params$key = params[key]) === null || _params$key === void 0 ? void 0 : _params$key.indexOf('*')) > -1) {
+      if (params[key] && ((_params$key = params[key]) === null || _params$key === void 0 ? void 0 : _params$key.indexOf('*')) > -1) {
         obj[key] = 0;
       }
     });
@@ -432,45 +432,8 @@ var FormRender = function FormRender(props, ref) {
     (antFormEl === null || antFormEl === void 0 ? void 0 : antFormEl.length) > 0 && set(antFormEl, '0.scrollTop', 0);
     resetMappdingHideComponents();
   };
-  var repeatWarningDataSchema = function repeatWarningDataSchema(formValue, templateDetail) {
-    var getKeyByValue = function getKeyByValue(value) {
-      return Object.keys(COMPONENT_MAP).find(function (key) {
-        return COMPONENT_MAP[key] === value;
-      });
-    };
-    var needRepeatWarnComponent = Object.values(COMPONENT_MAP);
-    return templateDetail.componentDtoList.reduce(function (cur, nxt) {
-      if (needRepeatWarnComponent !== null && needRepeatWarnComponent !== void 0 && needRepeatWarnComponent.includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
-        var instance = factory(nxt.workOrderComponentType, {
-          id: nxt.uniqueKey,
-          name: nxt.name,
-          componentConfig: nxt.componentConfig,
-          effects: {},
-          type: nxt.workOrderComponentType
-        });
-        var _id = instance === null || instance === void 0 ? void 0 : instance.id;
-        var value = formValue[_id];
-        var _key = getKeyByValue(nxt.workOrderComponentType);
-        // TODO: 如果是订单号组件, 将值设置为orderNo
-        if (nxt.workOrderComponentType === 'TRADE_ID_INPUT') {
-          _key = 'orderNo';
-        }
-        if (_key) {
-          cur[_key] = value;
-        }
-      }
-      return cur;
-    }, {});
-  };
   useEffect(function () {
-    if (isErpUse && templateDetail) {
-      var formValue = form.getFieldsValue(true);
-      console.debug('表单内容值', formValue);
-      // TODO: 拼装需要重复提醒的组件数据格式
-      var value = repeatWarningDataSchema(formValue, templateDetail);
-      console.debug('重复提醒转换之后数据', value);
-      return orderBackReplace(value, templateDetail);
-    }
+    if (isErpUse) return;
     queryDetail({
       workOrderId: workOrderId,
       shopId: shopId,
@@ -480,7 +443,7 @@ var FormRender = function FormRender(props, ref) {
       buyerId: buyerId,
       buyerNick: buyerNick
     });
-  }, [workOrderId, record, shopId, isErpUse, templateDetail]);
+  }, [workOrderId, record, shopId, isErpUse]);
 
   // 重置映射隐藏的组件, 目前只有单选、下拉组件可能会因为映射关系隐藏
   var resetMappdingHideComponents = function resetMappdingHideComponents() {
@@ -511,8 +474,8 @@ var FormRender = function FormRender(props, ref) {
 
   // 批量映射
   var batchFillByMapping = function batchFillByMapping(values) {
-    for (var _key2 in values) {
-      fillByMapping(_key2, values[_key2]);
+    for (var _key in values) {
+      fillByMapping(_key, values[_key]);
     }
   };
   // 组件映射
@@ -525,8 +488,8 @@ var FormRender = function FormRender(props, ref) {
       form.setFieldsValue(mapping === null || mapping === void 0 ? void 0 : mapping[triggerValue]);
     } else {
       var resetSet = new Set();
-      for (var _key3 in mapping) {
-        for (var uniqueKey in mapping[_key3]) {
+      for (var _key2 in mapping) {
+        for (var uniqueKey in mapping[_key2]) {
           resetSet.add(uniqueKey);
         }
       }

package/dist/esm/WorkOrder/components/PaymentWorkOrderList/components/PaymentFormModal/index.js

@@ -85,7 +85,7 @@ function ModifyModal(props) {
   var handleOk = function handleOk() {
     form.validateFields().then( /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(values) {
-        var _record$shopList$find;
+        var _shopList$find;
         var shopSource, newValue, api, shopId, shopName, _shopList, other, _yield$api, success;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -102,9 +102,9 @@ function ModifyModal(props) {
               message.error('支付宝姓名/账号都要填写');
               return _context.abrupt("return");
             case 5:
-              shopSource = (_record$shopList$find = record.shopList.find(function (t) {
+              shopSource = (_shopList$find = shopList.find(function (t) {
                 return t.shopId === record.shopId;
-              })) === null || _record$shopList$find === void 0 ? void 0 : _record$shopList$find.shopSource;
+              })) === null || _shopList$find === void 0 ? void 0 : _shopList$find.shopSource;
               newValue = {};
               api = type === 'edit' ? editRemitOrder : addPaymentOrder;
               if (type === 'edit') {
@@ -189,11 +189,11 @@ function ModifyModal(props) {
     };
   }();
   var TidChangeHandle = function TidChangeHandle(e) {
-    var _shopList$find;
+    var _shopList$find2;
     var order_no = e.target.value;
-    var taobaoId = (_shopList$find = shopList.find(function (item) {
+    var taobaoId = (_shopList$find2 = shopList.find(function (item) {
       return item.shopSourceStr === 'TAOBAO' && item.shopId == platformInfo.shopId;
-    })) === null || _shopList$find === void 0 ? void 0 : _shopList$find.taobaoId;
+    })) === null || _shopList$find2 === void 0 ? void 0 : _shopList$find2.taobaoId;
 
     //淘宝订单买家id返填
     if (taobaoId) {

package/dist/esm/common/utils/tools.js

@@ -286,7 +286,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
       if (interceptCompany && !ExpressData.getInstance().getExpressNameByCode(interceptCompany, false)) {
         needTransForm = true;
       }
-      var interceptValuesMap = ['interceptCompany', 'interceptCode', 'interceptSenderMobile', 'interceptType', 'interceptDetail', 'interceptReceiverName', 'interceptReceiverMobile', 'interceptLogisticsStatus', 'interceptLogisticsStatusOther', 'interceptLogisticsSnapshot', 'qySelfInterceptLogisticsStatus'];
+      var interceptValuesMap = ['interceptCompany', 'interceptCode', 'interceptSenderMobile', 'interceptType', 'interceptDetail', 'interceptReceiverName', 'interceptReceiverMobile', 'interceptLogisticsStatus', 'interceptLogisticsStatusOther', 'interceptLogisticsSnapshot'];
       interceptValuesMap.forEach(function (t) {
         contentVoList.push({
           uniqueKey: "".concat(item.uniqueKey, "_").concat(t),
@@ -936,8 +936,7 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
         WDT_REISSUE_GOODS: {
           type: 'wdtReissueType',
           goods: 'wdtReissueGoods',
-          shopCode: 'shopCode',
-          systemOrderNo: 'wdtSystemOrderNo'
+          shopCode: 'shopCode'
         }
       };
       var reissue = get(nowData, "".concat(item.uniqueKey), {});
@@ -956,13 +955,6 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
         content: (reissue === null || reissue === void 0 ? void 0 : reissue.shopCode) || '',
         name: item.name
       });
-      if (item.workOrderComponentType === 'WDT_REISSUE_GOODS') {
-        contentVoList.push({
-          uniqueKey: "".concat(item.uniqueKey, "_").concat(reissueMap[item.workOrderComponentType].systemOrderNo),
-          content: (reissue === null || reissue === void 0 ? void 0 : reissue[reissueMap[item.workOrderComponentType].systemOrderNo]) || '',
-          name: item.name
-        });
-      }
     } else if (item.workOrderComponentType === 'BS_RETURN_GOODS') {
       var bsReturn = get(nowData, "".concat(item.uniqueKey), {});
       contentVoList.push({
@@ -1303,8 +1295,7 @@ var transDataSource = function transDataSource(templateColumns) {
           interceptReceiverMobile: item.jsonMap["".concat(nex.uniqueKey, "_interceptReceiverMobile")],
           interceptLogisticsStatus: item.jsonMap["".concat(nex.uniqueKey, "_interceptLogisticsStatus")],
           interceptLogisticsStatusOther: item.jsonMap["".concat(nex.uniqueKey, "_interceptLogisticsStatusOther")],
-          interceptLogisticsSnapshot: item.jsonMap["".concat(nex.uniqueKey, "_interceptLogisticsSnapshot")],
-          qySelfInterceptLogisticsStatus: item.jsonMap["".concat(nex.uniqueKey, "_qySelfInterceptLogisticsStatus")]
+          interceptLogisticsSnapshot: item.jsonMap["".concat(nex.uniqueKey, "_interceptLogisticsSnapshot")]
         }));
       } else if (nex.workOrderComponentType === 'LOGISTICS_INTERCEPTION_MORE') {
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_logisticsInterceptList")], [{}])));
@@ -1607,8 +1598,7 @@ var transDataSource = function transDataSource(templateColumns) {
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
           wdtReissueType: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_wdtReissueType")], []),
           wdtReissueGoods: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_wdtReissueGoods")], []),
-          shopCode: item.jsonMap["".concat(nex.uniqueKey, "_shopCode")],
-          wdtSystemOrderNo: item.jsonMap["".concat(nex.uniqueKey, "_wdtSystemOrderNo")]
+          shopCode: item.jsonMap["".concat(nex.uniqueKey, "_shopCode")]
         }));
       }
     }, {});
@@ -1631,7 +1621,7 @@ export var calcWorkOrderList = function calcWorkOrderList(source, templateColumn
 //订单返填
 export var orderBack = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-    var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, JOIN_SHOP, hasBs, hasWdt, hasWln, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsOrders$orders, _wlnOrders$orders, _wdtOrders$orders, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, wdtOrder, orderInfo, jstInfo, bsOrders, wlnOrders, wdtOrders, bsInfo, wlnInfo, wdtInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, _templateDetail$compo, paymentUniqueKey, cacheOrderInfo, _objectSpread55, _cacheOrderInfo;
+    var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, JOIN_SHOP, hasBs, hasWdt, hasWln, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsOrders$orders, _wlnOrders$orders, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, wdtOrder, orderInfo, jstInfo, bsOrders, wlnOrders, wdtOrders, bsInfo, wlnInfo, wdtInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, _templateDetail$compo, paymentUniqueKey, cacheOrderInfo, _objectSpread55, _cacheOrderInfo;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -1776,20 +1766,15 @@ export var orderBack = /*#__PURE__*/function () {
               sendName: ''
             }];
           }
-          if ((wdtOrders === null || wdtOrders === void 0 ? void 0 : (_wdtOrders$orders = wdtOrders.orders) === null || _wdtOrders$orders === void 0 ? void 0 : _wdtOrders$orders.length) > 1) {
-            wdtInfo.wdtGoods = _objectSpread(_objectSpread({}, wdtInfo.wdtGoods), {}, {
-              wdtGoods: []
-            });
-            wdtInfo.wdtLogistics = [{
-              logisticsCompany: null,
-              logisticsCode: ''
-            }];
-            wdtInfo.wdtSendGood = [{
-              sendId: '',
-              sendName: ''
-            }];
-            // wdtInfo.wdtDeliveryNo = [{ deliveryNo: '' }];
-          }
+          // if (wdtOrders?.orders?.length > 1) {
+          //   wdtInfo.bsGoods = {
+          //     ...wdtInfo.bsGoods,
+          //     bsGoods: [],
+          //   };
+          //   wdtInfo.bsLogistics = [{ logisticsCompany: null, logisticsCode: '' }];
+          //   wdtInfo.bsSendGood = [{ sendId: '', sendName: '' }];
+          //   wdtInfo.bsDeliveryNo = [{ deliveryNo: '' }];
+          // }
 
           //获取当前表单字段
           formValue = form.getFieldsValue();
@@ -1808,7 +1793,7 @@ export var orderBack = /*#__PURE__*/function () {
           hasSelectItem = HasErpItemSelectHandle(templateDetail);
           erpPromiseList = [];
           if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
-            _context.next = 56;
+            _context.next = 55;
             break;
           }
           list = detail['itemList'];
@@ -1826,10 +1811,10 @@ export var orderBack = /*#__PURE__*/function () {
               resolve({});
             });
           });
-          _context.prev = 46;
-          _context.next = 49;
+          _context.prev = 45;
+          _context.next = 48;
           return Promise.all(promises);
-        case 49:
+        case 48:
           erpPromiseList = _context.sent;
           detail['itemList'] = (_detail$itemList = detail['itemList']) === null || _detail$itemList === void 0 ? void 0 : _detail$itemList.map(function (item, index) {
             return _objectSpread(_objectSpread({}, item), {}, {
@@ -1839,13 +1824,13 @@ export var orderBack = /*#__PURE__*/function () {
               })
             });
           });
-          _context.next = 56;
+          _context.next = 55;
           break;
-        case 53:
-          _context.prev = 53;
-          _context.t0 = _context["catch"](46);
+        case 52:
+          _context.prev = 52;
+          _context.t0 = _context["catch"](45);
           console.error('调用erp获取宝贝编码错误', _context.t0);
-        case 56:
+        case 55:
           // console.log('detail', detail);
           values = orderBackFormValues({
             detail: detail,
@@ -1876,17 +1861,17 @@ export var orderBack = /*#__PURE__*/function () {
           // console.log('orderback', values);
           form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), values));
           callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
-          _context.next = 65;
+          _context.next = 64;
           break;
-        case 62:
-          _context.prev = 62;
+        case 61:
+          _context.prev = 61;
           _context.t1 = _context["catch"](8);
           console.error(_context.t1);
-        case 65:
+        case 64:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[8, 62], [46, 53]]);
+    }, _callee, null, [[8, 61], [45, 52]]);
   }));
   return function orderBack(_x) {
     return _ref2.apply(this, arguments);
@@ -2297,7 +2282,7 @@ export var wdtSystemOrderBackValues = function wdtSystemOrderBackValues(_ref8) {
   //如果没有选择的值不返填，会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
   if (!(value !== null && value !== void 0 && value.selectedRows)) return;
   var wdtGoodsComponent = (_templateList$compone3 = templateList.componentDtoList) === null || _templateList$compone3 === void 0 ? void 0 : _templateList$compone3.filter(function (item) {
-    return ['WDT_GOODS', 'WDT_DELIVERY_NO', 'WDT_SEND_GOOD', 'WDT_LOGISTICS'].includes(item.workOrderComponentType) && !item.notOrderBack;
+    return ['WDT_GOODS', 'WDT_DELIVERY_NO', 'WDT_SEND_GOOD', 'WDT_LOGISTICS'].includes(item.workOrderComponentType);
   });
   if (!(wdtGoodsComponent !== null && wdtGoodsComponent !== void 0 && wdtGoodsComponent.length)) return;
   var wdtGoodsValue = form.getFieldValue(wdtGoodsComponent[0].uniqueKey);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "0.29.2-rc.6",
+  "version": "1.0.2",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -32,9 +32,9 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@kmkf-fe-packages/basic-components": "^0.29.2-rc.0",
-    "@kmkf-fe-packages/kmkf-utils": "^0.29.2-rc.0",
-    "@kmkf-fe-packages/services-components": "^0.29.2-rc.0",
+    "@kmkf-fe-packages/basic-components": "^1.0.0",
+    "@kmkf-fe-packages/kmkf-utils": "^1.0.0",
+    "@kmkf-fe-packages/services-components": "^1.0.0",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "419c7447da06c025cc9dddf9f7cf9f844581efe5",
+  "gitHead": "54173aeb0947642595d098bff2526c29ccb5a54f",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }