@kmkf-fe-packages/kmkf-work-order-service-component 1.10.0 → 1.10.1-beta.2

package/README.md

@@ -63,4 +63,5 @@ const Text = ()=>{
 
 ```
 
-| 字段 | 说明 | 数据类型 | | ----------------- | ---------------- | ------------------------------------ | | platform | 平台 | TAOBAO =淘宝\|FXG=抖音\|PDD=拼多多\| | | shopId | 店铺 ID | number | | buyerNick | 买家昵称 | string | | buyerId | 买家 id | string | | orderNo | 订单 id | string | | onEmpowerCallback | 授权弹框点击回调 | function | 
+| 字段 | 说明 | 数据类型 | | ----------------- | ---------------- | ------------------------------------ | | 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, grou
 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 } from "../../../common/utils/tools";
+INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, COMPONENT_MAP, getMappingTargetValue } from "../../../common/utils/tools";
 import { replaceCheck, orderDetail, queryLabelByTradeId } from "../../../model/servers/api";
 import { factory } from '@kmkf-fe-packages/services-components';
 import { getExpression, formatDisplayConfig, isNull, LabelData } from '@kmkf-fe-packages/kmkf-utils';
@@ -194,7 +194,7 @@ var FormRender = function FormRender(props, ref) {
     var obj = {};
     Object.keys(params).forEach(function (key) {
       var _params$key;
-      if (params[key] && ((_params$key = params[key]) === null || _params$key === void 0 ? void 0 : _params$key.indexOf('*')) > -1) {
+      if (params[key] && typeof params[key] === 'string' && ((_params$key = params[key]) === null || _params$key === void 0 ? void 0 : _params$key.indexOf('*')) > -1) {
         obj[key] = 0;
       }
     });
@@ -460,8 +460,45 @@ 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) return;
+    if (isErpUse && templateDetail) {
+      var formValue = form.getFieldsValue(true);
+      console.debug('表单内容值', formValue);
+      // TODO: 拼装需要重复提醒的组件数据格式
+      var value = repeatWarningDataSchema(formValue, templateDetail);
+      console.debug('重复提醒转换之后数据', value);
+      return orderBackReplace(value, templateDetail);
+    }
     queryDetail({
       workOrderId: workOrderId,
       shopId: shopId,
@@ -471,7 +508,7 @@ var FormRender = function FormRender(props, ref) {
       buyerId: buyerId,
       buyerNick: buyerNick
     });
-  }, [workOrderId, record, shopId, isErpUse]);
+  }, [workOrderId, record, shopId, isErpUse, templateDetail]);
 
   // 重置映射隐藏的组件, 目前只有单选、下拉组件可能会因为映射关系隐藏
   var resetMappdingHideComponents = function resetMappdingHideComponents() {
@@ -502,22 +539,26 @@ var FormRender = function FormRender(props, ref) {
 
   // 批量映射
   var batchFillByMapping = function batchFillByMapping(values) {
-    for (var _key in values) {
-      fillByMapping(_key, values[_key]);
+    for (var _key2 in values) {
+      fillByMapping(_key2, values[_key2]);
     }
   };
   // 组件映射
   var fillByMapping = function fillByMapping(triggerUniqueKey, value) {
-    var _mappingConfig$config;
-    var triggerValue = _typeof(value) === 'object' ? value === null || value === void 0 ? void 0 : value.value : value;
+    var _componentList$find, _mappingConfig$config;
+    var componentList = [].concat(_toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList) || []), _toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []));
+    var workOrderComponentType = (_componentList$find = componentList.find(function (t) {
+      return t.uniqueKey === triggerUniqueKey;
+    })) === null || _componentList$find === void 0 ? void 0 : _componentList$find.workOrderComponentType;
+    var triggerValue = getMappingTargetValue(value, workOrderComponentType);
     // 如果有映射关系，则修改对应组件的值
     var mapping = (_mappingConfig$config = mappingConfig.config) === null || _mappingConfig$config === void 0 ? void 0 : _mappingConfig$config[triggerUniqueKey];
     if (mapping !== null && mapping !== void 0 && mapping[triggerValue]) {
       form.setFieldsValue(mapping === null || mapping === void 0 ? void 0 : mapping[triggerValue]);
     } else {
       var resetSet = new Set();
-      for (var _key2 in mapping) {
-        for (var uniqueKey in mapping[_key2]) {
+      for (var _key3 in mapping) {
+        for (var uniqueKey in mapping[_key3]) {
           resetSet.add(uniqueKey);
         }
       }
@@ -620,7 +661,7 @@ var FormRender = function FormRender(props, ref) {
   var componentOnValueChange = function componentOnValueChange(uniqueKey, value, workOrderComponentType) {
     if (mappingConfig.config[uniqueKey]) {
       // PS: 目前只有string 和 { value: string, other: ''}这两种类型，后面其他组件如果需要在调整
-      fillByMapping(uniqueKey, typeof value === 'string' ? value : value === null || value === void 0 ? void 0 : value.value);
+      fillByMapping(uniqueKey, value);
     }
     if (workOrderComponentType === 'BS_SYSTEM_ORDER') {
       bsSystemOrderBackValues({

package/dist/esm/FlowTemplateDetail/index.js

@@ -24,6 +24,7 @@ import { useDispatch, useSelector, Provider, batch } from 'react-redux';
 import store from "../model/store";
 import zhCN from 'antd/es/locale/zh_CN';
 import { calcWorkOrderList, deleteCacheOrder } from "../common/utils/tools";
+import moment from 'moment';
 import { setPlat, fetchPanelInfo, fetchAllFlowOperateRecord, setAction, setVisibleRemarkList, setAddRemarkVisible, setLoading, setClearStore
 // setLabelList
 } from "../model/flowTemplateDetail";
@@ -45,8 +46,8 @@ import SubmitRemindModal from "./components/SubmitRemindModal";
 import { useSignal } from "../hooks/useSignal";
 import { verifyHandle, submitParams, FLOW_STATUS_V2, getTag, currentUserHasOperatorAuth, CANNOT_BACK_FILL } from "./common";
 import { saveWorkOrder, submitWorkOrder, addRemark, stopWorkOrder, closeWorkOrder, startWorkOrder, forwardWorkOrder, returnWorkOrder, withDrawWorkOrder, reminder, cancelReminder } from "../model/flowTemplateDetail/api";
-import { COMPONENT_MAP } from "../common/utils/tools";
 import RenderDetail from "./components/RenderDetail";
+import { COMPONENT_MAP } from "../common/utils/tools";
 import { orderDetail } from "../model/servers/api";
 import cache from "../common/cache";
 import "./index.less";
@@ -1053,7 +1054,25 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
       onClick: function onClick() {
         return handleFillWorkOrder(transData);
       }
-    }, "\u7ACB\u5373\u586B\u5145"), details.flowWorkOrderId, /*#__PURE__*/React.createElement(RenderDetail, {
+    }, "\u7ACB\u5373\u586B\u5145"), details.flowWorkOrderId, /*#__PURE__*/React.createElement("div", {
+      style: {
+        margin: '0 8px'
+      }
+    }, /*#__PURE__*/React.createElement("span", {
+      style: {
+        color: 'rgba(0,0,0,0.4)',
+        fontSize: '12px'
+      }
+    }, "\u63D0\u4EA4\u4EBA\uFF1A"), ' ', details.submitter), /*#__PURE__*/React.createElement("div", {
+      style: {
+        margin: '0 8px'
+      }
+    }, /*#__PURE__*/React.createElement("span", {
+      style: {
+        color: 'rgba(0,0,0,0.4)',
+        fontSize: '12px'
+      }
+    }, "\u63D0\u4EA4\u65F6\u95F4\uFF1A"), moment(details.created).format('YYYY-MM-DD HH:mm:ss')), /*#__PURE__*/React.createElement(RenderDetail, {
       workOrderTemplateInfo: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
       transData: transDataall,
       platform: plat.platform,

package/dist/esm/common/utils/tools.d.ts

@@ -1,9 +1,4 @@
 import { PlatFormInfo } from '../../model/flowTemplateDetail/types';
-/**
- * 多级下拉框数据转换成aPaas数据结构
- * @param {*} sourceOptions
- */
-export declare const transMultSelectOptions: (sourceOptions: any[]) => any;
 /**
  * @param {*} nowData
  * @param {*} sourceTemplateDetail
@@ -129,6 +124,7 @@ export declare const getMappingConfigByTemplateDetail: (templateDetail: {
     };
     hideComponents: string[];
 };
+export declare const getMappingTargetValue: (value: any, type: string) => any;
 export declare const transformWorkOrderDetail: (detail: any) => any;
 export declare const setLogisticsInfo: ({ logisticsMappingConfig, uniqueKey, workOrderComponentType, value, form, }: any) => void;
 export {};

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

@@ -17,12 +17,11 @@ 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 { get, every, maxBy } from 'lodash';
+import { get, every, maxBy, last, cloneDeep, isEqual, set } from 'lodash';
 import V from 'voca';
 import { orderDetail, jstOrderDetail, bsOrderDetail, wlnOrderDetail, wdtOrderDetail } from "../../model/servers/api";
 import moment from 'moment';
-import { AddressData, ExpressData, ExpressInterceptData, orderBackFormValues, bsOrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, findLabelBySelectValue, request, isNull, bsOrderTransform, wlnOrderTransform, wdtOrderTransform, filterWdtOrders, unTransField } from '@kmkf-fe-packages/kmkf-utils';
-import { cloneDeep, isEqual, set } from 'lodash';
+import { AddressData, ExpressData, ExpressInterceptData, orderBackFormValues, bsOrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, findLabelBySelectValue, request, isNull, bsOrderTransform, wlnOrderTransform, wdtOrderTransform, filterWdtOrders, unTransField, transMultSelectOptions } from '@kmkf-fe-packages/kmkf-utils';
 import Monitor from 'kmkf-monitor';
 import { PlatForm } from "../../model/flowTemplateDetail/types";
 import cache from "../cache";
@@ -98,26 +97,6 @@ var findNodeById = function findNodeById(tree) {
     }
   }
 };
-
-/**
- * 多级下拉框数据转换成aPaas数据结构
- * @param {*} sourceOptions
- */
-export var transMultSelectOptions = function transMultSelectOptions(sourceOptions) {
-  var tree = [];
-  var newOptions = JSON.parse(JSON.stringify(sourceOptions));
-  newOptions.map(function (item) {
-    if (tree.length === 0) {
-      return tree = tree.concat(get(item, 'list.1', []));
-    }
-    Object.keys(item.list).map(function (l) {
-      // 在树中找到l对应的节点，将当前数组放到children里面
-      var result = findNodeById(tree, l);
-      result && (result.children = item.list[l]);
-    });
-  });
-  return tree;
-};
 var findValueByField = function findValueByField(componentDtoList) {
   return function (data, type) {
     var component = componentDtoList.find(function (item) {
@@ -2392,6 +2371,37 @@ export var wdtSystemOrderBackValues = function wdtSystemOrderBackValues(_ref8) {
   });
   form.setFieldsValue(values);
 };
+//获取多级下拉最后的值
+var getChildValue = function getChildValue() {
+  var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var keys = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var disabled = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var childs = [];
+  var newKeys = keys.map(function (t) {
+    return String(t);
+  });
+  function loop(list, key) {
+    var disabled = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+    var childs = arguments.length > 3 ? arguments[3] : undefined;
+    var len = list === null || list === void 0 ? void 0 : list.length;
+    for (var i = 0; i < len; i++) {
+      var _item$children, _item$children2;
+      var item = cloneDeep(list[i]);
+      var newDisabled = disabled;
+      if (key.includes(String(item === null || item === void 0 ? void 0 : item.actived))) {
+        newDisabled = true;
+      }
+      if (!(item !== null && item !== void 0 && (_item$children = item.children) !== null && _item$children !== void 0 && _item$children.length) && newDisabled) {
+        childs.push(item.actived);
+      }
+      if (item !== null && item !== void 0 && (_item$children2 = item.children) !== null && _item$children2 !== void 0 && _item$children2.length) {
+        item.children = loop(item.children, key, newDisabled, childs);
+      }
+    }
+    return childs;
+  }
+  return loop(options, newKeys, disabled, childs);
+};
 
 // 获取映射关系
 export var getMappingConfigByTemplateDetail = function getMappingConfigByTemplateDetail(templateDetail) {
@@ -2419,9 +2429,35 @@ export var getMappingConfigByTemplateDetail = function getMappingConfigByTemplat
     return newItem;
   });
   [].concat(_toConsumableArray(templateDetail.componentDtoList), _toConsumableArray(preList)).forEach(function (componentDto) {
-    var _mapping$rules;
+    var _mapping$rules2;
     var mapping = componentDto.componentConfig.mapping || {};
-    if ((_mapping$rules = mapping.rules) !== null && _mapping$rules !== void 0 && _mapping$rules.length && mapping.triggerComponentKey) {
+    var triggerComponent = templateDetail.componentDtoList.find(function (t) {
+      return t.uniqueKey === mapping.triggerComponentKey;
+    });
+    // 多级下拉处理rules数据
+    if ((triggerComponent === null || triggerComponent === void 0 ? void 0 : triggerComponent.workOrderComponentType) === 'MULT_SELECT') {
+      var _mapping$rules;
+      var options = transMultSelectOptions(triggerComponent.componentConfig.options || []);
+      if ((_mapping$rules = mapping.rules) !== null && _mapping$rules !== void 0 && _mapping$rules.length) {
+        var rules = cloneDeep(mapping.rules).reduce(function (prv, next) {
+          var lastTriggerValue = next.triggerValue.map(function (t) {
+            return last(t);
+          });
+          var childValues = getChildValue(options, lastTriggerValue, false);
+          prv.push.apply(prv, _toConsumableArray(childValues.map(function (t) {
+            return {
+              currentValue: next.currentValue,
+              triggerValue: t
+            };
+          })));
+          return prv;
+        }, []);
+        mapping = _objectSpread(_objectSpread({}, componentDto.componentConfig.mapping), {}, {
+          rules: rules
+        });
+      }
+    }
+    if ((_mapping$rules2 = mapping.rules) !== null && _mapping$rules2 !== void 0 && _mapping$rules2.length && mapping.triggerComponentKey) {
       readonlyComponents[componentDto.uniqueKey] = {
         auth: mapping.auth
       };
@@ -2431,17 +2467,17 @@ export var getMappingConfigByTemplateDetail = function getMappingConfigByTemplat
       if (componentDto._isPreItem) {
         return;
       }
-      var rules = {};
+      var _rules = {};
       mapping.rules.forEach(function (rule) {
-        if (!rules[rule.triggerValue]) {
-          rules[rule.triggerValue] = {};
+        if (!_rules[rule.triggerValue]) {
+          _rules[rule.triggerValue] = {};
         }
-        rules[rule.triggerValue][componentDto.uniqueKey] = componentDto.workOrderComponentType === 'RADIO' ? {
+        _rules[rule.triggerValue][componentDto.uniqueKey] = componentDto.workOrderComponentType === 'RADIO' ? {
           value: rule.currentValue,
           other: ''
         } : rule.currentValue;
       });
-      config[mapping.triggerComponentKey] = rules;
+      config[mapping.triggerComponentKey] = _rules;
     }
   });
   return {
@@ -2450,6 +2486,16 @@ export var getMappingConfigByTemplateDetail = function getMappingConfigByTemplat
     hideComponents: hideComponents
   };
 };
+
+// 获取映射值
+export var getMappingTargetValue = function getMappingTargetValue(value, type) {
+  if (type === 'RADIO') {
+    return value === null || value === void 0 ? void 0 : value.value;
+  } else if (type === 'MULT_SELECT') {
+    return last(value);
+  }
+  return value;
+};
 //转换表单信息基本数据
 export var transformWorkOrderDetail = function transformWorkOrderDetail(detail) {
   return Object.keys(detail).reduce(function (prv, key) {

package/dist/esm/index.d.ts

@@ -5,8 +5,8 @@ export { default as FormRender } from './FormRender';
 export { default as FormRenderTemplateId } from './FormRenderTemplateId';
 export { default as FlowWorkOrderDetail } from './FlowTemplateDetail';
 export { default as TradeList } from './TradeList';
-export { default as WdtTradeList } from './WdtTradeList';
 export { default as FlowFormRender } from './FlowTemplateDetail/components/FormRender';
+export { default as WdtTradeList } from './WdtTradeList';
 export * as utils from './common/utils/tools';
 export * as arithmetic from './common/utils/arithmetic';
 export * from './WorkOrder/types';

package/dist/esm/index.js

@@ -15,8 +15,8 @@ export { default as FormRender } from "./FormRender";
 export { default as FormRenderTemplateId } from "./FormRenderTemplateId";
 export { default as FlowWorkOrderDetail } from "./FlowTemplateDetail";
 export { default as TradeList } from "./TradeList";
-export { default as WdtTradeList } from "./WdtTradeList";
 export { default as FlowFormRender } from "./FlowTemplateDetail/components/FormRender";
+export { default as WdtTradeList } from "./WdtTradeList";
 import * as _utils from "./common/utils/tools";
 export { _utils as utils };
 import * as _arithmetic from "./common/utils/arithmetic";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "1.10.0",
+  "version": "1.10.1-beta.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": "1.10.0",
-    "@kmkf-fe-packages/kmkf-utils": "1.10.0",
-    "@kmkf-fe-packages/services-components": "1.10.0",
+    "@kmkf-fe-packages/basic-components": "1.10.1-beta.2",
+    "@kmkf-fe-packages/kmkf-utils": "1.10.1-beta.0",
+    "@kmkf-fe-packages/services-components": "1.10.1-beta.2",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c87abd7561de736554b620820b554f6817adc87b",
+  "gitHead": "d1f8b145213bc3fb624883b78fdfc9a902bfb308",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }