@kmkf-fe-packages/kmkf-work-order-service-component 2.0.71 → 2.0.72

package/dist/esm/FlowTemplateDetailV2/components/FormRender/common.js

@@ -11,6 +11,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { cloneDeep } from 'lodash';
+
 // 针对前置组件按照节点id分组
 export var groupByPreNode = function groupByPreNode(list) {
   var map = new Map();

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

@@ -32,7 +32,7 @@ import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME,
 INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, kmSystemOrderBackValues, bsE3SystemOrderBackValues, wlnSystemOrderBackValues, gySystemOrderBackValues, jstSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, getMappingTargetValue } from "../../../common/utils/tools";
 import { replaceCheck, orderDetail, queryLabelByTradeId, queryMemberLevel, queryTidByOutSid } from "../../../model/servers/api";
 import { factory } from '@kmkf-fe-packages/services-components';
-import { getExpression, formatDisplayConfig, isNull, LabelData, setSessionStorage } from '@kmkf-fe-packages/kmkf-utils';
+import { getExpression, formatDisplayConfig, isNull, LabelData, setSessionStorage, hasQualityValue } from '@kmkf-fe-packages/kmkf-utils';
 import ShopName from "../ShopName";
 import { PlatForm } from "../../../model/flowTemplateDetail/types";
 import { groupByPreNode, getCurrentNodeModifiedShowHideRule } from "./common";
@@ -750,7 +750,25 @@ var FormRender = function FormRender(props, ref) {
     };
   }();
   // 组件值变化
-  var componentOnValueChange = function componentOnValueChange(uniqueKey, value, workOrderComponentType) {
+  var componentOnValueChange = function componentOnValueChange(uniqueKey, value, workOrderComponentType, componentConfig) {
+    // 花西子定制问题场景处理
+    if (componentConfig) {
+      var hasQuality = hasQualityValue(value, uniqueKey, componentConfig);
+      if (hasQuality) {
+        var _templateDetail$compo3;
+        var bsGoods = templateDetail === null || templateDetail === void 0 ? void 0 : (_templateDetail$compo3 = templateDetail.componentDtoList) === null || _templateDetail$compo3 === void 0 ? void 0 : _templateDetail$compo3.find(function (item) {
+          return ['BS_GOODS'].includes(item.workOrderComponentType);
+        });
+        if (bsGoods) {
+          var _bsGoodsValue$bsGoods;
+          var bsGoodsValue = cloneDeep(form.getFieldValue(bsGoods === null || bsGoods === void 0 ? void 0 : bsGoods.uniqueKey));
+          bsGoodsValue === null || bsGoodsValue === void 0 ? void 0 : (_bsGoodsValue$bsGoods = bsGoodsValue.bsGoods) === null || _bsGoodsValue$bsGoods === void 0 ? void 0 : _bsGoodsValue$bsGoods.forEach(function (good) {
+            good.mark = '是';
+          });
+          form.setFieldsValue(_defineProperty({}, bsGoods === null || bsGoods === void 0 ? void 0 : bsGoods.uniqueKey, bsGoodsValue));
+        }
+      }
+    }
     if (mappingConfig.config[uniqueKey]) {
       // PS: 目前只有string 和 { value: string, other: ''}这两种类型，后面其他组件如果需要在调整
       fillByMapping(uniqueKey, value);
@@ -1222,7 +1240,7 @@ var FormRender = function FormRender(props, ref) {
           return instance.editRender({
             onBlur: componentOnBlur,
             onChange: function onChange(value) {
-              return componentOnValueChange(uniqueKey, value, workOrderComponentType);
+              return componentOnValueChange(uniqueKey, value, workOrderComponentType, componentConfig);
             },
             hidden: !show || mappingHideComponents.includes(uniqueKey),
             platform: platform,
@@ -1234,7 +1252,7 @@ var FormRender = function FormRender(props, ref) {
       return instance.editRender({
         onBlur: componentOnBlur,
         onChange: function onChange(value) {
-          return componentOnValueChange(uniqueKey, value, workOrderComponentType);
+          return componentOnValueChange(uniqueKey, value, workOrderComponentType, componentConfig);
         },
         hidden: mappingHideComponents.includes(uniqueKey),
         platform: platform,
@@ -1283,8 +1301,8 @@ var FormRender = function FormRender(props, ref) {
   }, [platform, templateDetail, shopList, shopId, record, mappingHideComponents, currentShopId, look, handleChangeTradeId, innerReplaceValue]);
   // TODO: 计算类型组件列表
   var calculationTypeComponentList = useMemo(function () {
-    var _templateDetail$compo3;
-    return templateDetail === null || templateDetail === void 0 ? void 0 : (_templateDetail$compo3 = templateDetail.componentDtoList) === null || _templateDetail$compo3 === void 0 ? void 0 : _templateDetail$compo3.filter(function (item) {
+    var _templateDetail$compo4;
+    return templateDetail === null || templateDetail === void 0 ? void 0 : (_templateDetail$compo4 = templateDetail.componentDtoList) === null || _templateDetail$compo4 === void 0 ? void 0 : _templateDetail$compo4.filter(function (item) {
       return item.workOrderComponentType === 'NUMERICAL_CALCULATION';
     });
   }, [templateDetail]);

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

@@ -29,6 +29,7 @@ import submitDataTransOldFormat from "./submitDataTransOldFormat";
 import xzSDK from "./xzSDK";
 import { pushGyLog } from '@kmkf-fe-packages/kmkf-utils';
 import { orderBackMap } from "./tools_constants";
+
 // 淘宝商品组件信息处理
 
 var ONLY_SHOW_COMPONENT_TYPE = ['RADIO', 'INPUT', 'TEXTAREA', 'CHECKBOX', 'SELECT', 'DATETIME', 'PICTURE', 'MULT_SELECT', 'ORDINARY_INVOICE'];
@@ -303,7 +304,11 @@ export var orderBack = /*#__PURE__*/function () {
               return item.billNo === plat.subOrderNo;
             });
           }
-          bsInfo = bsOrderTransform(bsOrders || {});
+          bsInfo = bsOrderTransform({
+            detail: bsOrders || {},
+            componentDtoList: templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList,
+            form: form
+          });
           wlnInfo = wlnOrderTransform(wlnOrders || {});
           bsE3Info = bsE3OrderTransform(_objectSpread(_objectSpread({}, bsE3Orders), {}, {
             componentList: templateDetail.componentDtoList,
@@ -995,9 +1000,14 @@ export var bsSystemOrderBackValues = function bsSystemOrderBackValues(_ref6) {
   });
   if (!(bsGoodsComponent !== null && bsGoodsComponent !== void 0 && bsGoodsComponent.length)) return;
   var bsGoodsValue = form.getFieldValue(bsGoodsComponent[0].uniqueKey);
+  // 花西子将是否选择质量类传入给bs商品组件，来判断是否将商品标记默认为是
   var orderInfo = bsOrderTransform({
-    orders: value.selectedRows,
-    shopCode: bsGoodsValue.shopCode
+    detail: {
+      orders: value.selectedRows,
+      shopCode: bsGoodsValue.shopCode
+    },
+    componentDtoList: templateList === null || templateList === void 0 ? void 0 : templateList.componentDtoList,
+    form: form
   });
   var values = bsOrderBackFormValues(orderInfo, {
     componentDtoList: bsGoodsComponent

package/dist/esm/model/logicFlow/selector.d.ts

@@ -6,6 +6,7 @@ export declare const selectFlowList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("./types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").LogicFlow[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").LogicFlow[], {
     clearCache: () => void;
 }> & {
@@ -19,6 +20,7 @@ export declare const selectGroupFlowList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("./types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
     clearCache: () => void;
 }> & {
@@ -32,6 +34,7 @@ export declare const selectFlowTemplateGroupWorkOrderTemplateList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("./types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
     clearCache: () => void;
 }> & {

package/dist/esm/model/paymentWorkOrder/selector.d.ts

@@ -6,6 +6,7 @@ export declare const selectPaymentWorkOrderExamineModalVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -19,6 +20,7 @@ export declare const selectCurrentPaymentRecord: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => any) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => any, {
     clearCache: () => void;
 }> & {
@@ -32,6 +34,7 @@ export declare const selectPaymentWorkOrderUnExamineModalVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -45,6 +48,7 @@ export declare const selectDeletePaymentWorkOrderVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -58,6 +62,7 @@ export declare const selectFlagPayModalVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -71,6 +76,7 @@ export declare const selectLogModalVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -84,6 +90,7 @@ export declare const selectPaymentFormModalVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -97,6 +104,7 @@ export declare const selectRepeatVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -110,6 +118,7 @@ export declare const selectRepeatWorkOrderList: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => string[], {
     clearCache: () => void;
 }> & {

package/dist/esm/model/singleShopWorkOrder/selector.d.ts

@@ -6,6 +6,7 @@ export declare const selectorSingleTemplateList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").SelectI[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => import("./types").SelectI[], {
     clearCache: () => void;
 }> & {
@@ -19,6 +20,7 @@ export declare const selectDeleteCustomizeWorkOrderModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -32,6 +34,7 @@ export declare const selectorCurrentCustomizeRecord: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => any) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => any, {
     clearCache: () => void;
 }> & {
@@ -45,6 +48,7 @@ export declare const selectorTemplateId: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => string, {
     clearCache: () => void;
 }> & {
@@ -58,6 +62,7 @@ export declare const selectorFormModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {

package/package.json

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