@kmkf-fe-packages/kmkf-work-order-service-component 1.11.0 → 1.12.0

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, 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';
@@ -508,8 +508,12 @@ var FormRender = function FormRender(props, ref) {
   };
   // 组件映射
   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]) {
@@ -620,7 +624,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/WorkOrder/components/WorkOrderList/components/CustomizeWorkOrderCard/index.js

@@ -15,6 +15,8 @@ import { SelectMark } from '@kmkf-fe-packages/services-components';
 import { useAppDispatch } from "../../../../../model/hooks";
 import { setFormModalVisible, setLogicFlowId, setFlowWorkOrderId, setCurrentCustomizeRecord, fetchFlatWorkOrder } from "../../../../../model/customizeWorkOrder";
 import { queryPanelInfo } from "../../../../../model/flowTemplateDetail/api";
+import reject from "../../../../../common/imgs/reject.png";
+import reminder from "../../../../../common/imgs/reminder.png";
 import "./index.less";
 var FlowStatus = {
   WAIT_COMMIT: {
@@ -151,7 +153,17 @@ var CustomizeWorkOrderCard = function CustomizeWorkOrderCard(props) {
     className: "order_status ".concat((_FlowStatus$item$flow = FlowStatus[item === null || item === void 0 ? void 0 : item.flowStatus]) === null || _FlowStatus$item$flow === void 0 ? void 0 : _FlowStatus$item$flow.class)
   }, (_FlowStatus$item$flow2 = FlowStatus[item === null || item === void 0 ? void 0 : item.flowStatus]) === null || _FlowStatus$item$flow2 === void 0 ? void 0 : _FlowStatus$item$flow2.name), /*#__PURE__*/React.createElement("span", {
     className: "order_card_header_left"
-  }, item.flowTemplateName)), /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement("span", {
+  }, /*#__PURE__*/React.createElement(Space, null, item.flowTags.includes('REJECT') && /*#__PURE__*/React.createElement("img", {
+    src: reject,
+    style: {
+      width: '20px'
+    }
+  }), item.flowTags.includes('REMINDER') && /*#__PURE__*/React.createElement("img", {
+    src: reminder,
+    style: {
+      width: '20px'
+    }
+  })))), /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement("span", {
     className: "order_card_header_detail",
     onClick: function onClick() {
       return handleDetailWorkOrderFlow(item);
@@ -162,6 +174,8 @@ var CustomizeWorkOrderCard = function CustomizeWorkOrderCard(props) {
       return updateMark(key, item);
     }
   }) : null)), /*#__PURE__*/React.createElement("div", {
+    className: "order_card_header_left"
+  }, item.flowTemplateName), /*#__PURE__*/React.createElement("div", {
     className: "order_card_step"
   }, /*#__PURE__*/React.createElement("span", null, "\u5F53\u524D\u6B65\u9AA4\uFF1A"), /*#__PURE__*/React.createElement("span", {
     style: {

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "1.11.0",
+  "version": "1.12.0",
   "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.11.0",
-    "@kmkf-fe-packages/kmkf-utils": "1.11.0",
-    "@kmkf-fe-packages/services-components": "1.11.0",
+    "@kmkf-fe-packages/basic-components": "1.12.0",
+    "@kmkf-fe-packages/kmkf-utils": "1.12.0",
+    "@kmkf-fe-packages/services-components": "1.12.0",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9c624c5410069e57085e281dbbc194346ac6bf42",
+  "gitHead": "487159f7c26b4c7c4fad564f62c8828931982005",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }