@kmkf-fe-packages/kmkf-work-order-service-component 0.21.4 → 0.22.0-alpha.2

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

@@ -33,7 +33,7 @@ import styles from "./index.module.less";
 import { PlatForm } from "../../../WorkOrder/types";
 import { useSignal } from "../../../hooks/useSignal";
 var CurrentNode = function CurrentNode(props, ref) {
-  var _currentNodeDetail$no, _currentNodeDetail$no2, _currentNodeDetail$no3, _currentNodeDetail$no4, _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$wo12, _currentNodeDetail$wo13, _currentNodeDetail$wo14, _currentNodeDetail$wo15, _currentNodeDetail$wo16, _currentNodeDetail$wo17, _currentNodeDetail$no17, _currentNodeDetail$no18, _currentNodeDetail$wo18;
+  var _currentNodeDetail$no, _currentNodeDetail$no2, _currentNodeDetail$no3, _currentNodeDetail$no4, _currentNodeDetail$no16, _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$wo12, _currentNodeDetail$wo13, _currentNodeDetail$wo14, _currentNodeDetail$wo15, _currentNodeDetail$wo16, _currentNodeDetail$wo17, _currentNodeDetail$no18, _currentNodeDetail$no19, _currentNodeDetail$wo18;
   var formRenderRef = useRef(null);
   useImperativeHandle(ref, function () {
     return {
@@ -137,7 +137,7 @@ var CurrentNode = function CurrentNode(props, ref) {
     if (plat.orderNo && NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no15 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no15 === void 0 ? void 0 : _currentNodeDetail$no15.nodeType) && operateParams !== null && operateParams !== void 0 && operateParams.flowTemplateKey && tradeKey) {
       handleChangeTradeId(plat.orderNo);
     }
-  }, [plat, operateParams, currentNodeDetail, tradeKey]);
+  }, [plat.orderNo, operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey, currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no16 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no16 === void 0 ? void 0 : _currentNodeDetail$no16.nodeType, tradeKey]);
   var transData = useMemo(function () {
     if (flowStatus === FlowStatus.COMPLETED) {
       var _currentNodeDetail$wo6, _currentNodeDetail$wo7;
@@ -148,9 +148,9 @@ var CurrentNode = function CurrentNode(props, ref) {
     }
   }, [flowStatus, currentNodeDetail]);
   var handleWithdraw = function handleWithdraw() {
-    var _currentNodeDetail$no16;
+    var _currentNodeDetail$no17;
     dispatch(setWithdrawWorkOrderDetail({
-      nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no16 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no16 === void 0 ? void 0 : _currentNodeDetail$no16.id) || ''
+      nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no17 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no17 === void 0 ? void 0 : _currentNodeDetail$no17.id) || ''
     }));
     dispatch(setAction('withdraw'));
   };
@@ -230,14 +230,14 @@ var CurrentNode = function CurrentNode(props, ref) {
     handleSave: handleSave
   }), /*#__PURE__*/React.createElement("div", {
     className: styles.formRenderContainer
-  }, [NodeType.START_NODE, NodeType.EXECUTE_NODE].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no17 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no17 === void 0 ? void 0 : _currentNodeDetail$no17.nodeType) && (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo) && (flowStatus === FlowStatus.COMPLETED && !editing ? /*#__PURE__*/React.createElement(RenderDetail, {
+  }, [NodeType.START_NODE, NodeType.EXECUTE_NODE].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no18 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no18 === void 0 ? void 0 : _currentNodeDetail$no18.nodeType) && (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo) && (flowStatus === FlowStatus.COMPLETED && !editing ? /*#__PURE__*/React.createElement(RenderDetail, {
     workOrderTemplateInfo: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
     transData: transData,
     platform: plat.platform,
     onOpenWangWang: onOpenWangWang
   }) : /*#__PURE__*/React.createElement(FormRender, {
     ref: formRenderRef,
-    isShowShopList: NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no18 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no18 === void 0 ? void 0 : _currentNodeDetail$no18.nodeType) && PlatForm.PC === plat.platform,
+    isShowShopList: NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no19 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no19 === void 0 ? void 0 : _currentNodeDetail$no19.nodeType) && PlatForm.PC === plat.platform,
     plat: plat,
     templateDetail: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
     shopList: shopList,

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

@@ -26,7 +26,9 @@ import { ConfigProvider, Form } from 'antd';
 import zhCN from 'antd/es/locale/zh_CN';
 import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle } from 'lodash';
 import 'moment/locale/zh-cn';
-import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, reversalFormValues, bsSystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail } from "../../../common/utils/tools";
+import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, EXCLUDE_REPLACE_TOP_COMPONENT,
+// 重复检验不需要展示在顶部的
+INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail } from "../../../common/utils/tools";
 import { replaceCheck, orderDetail } from "../../../model/servers/api";
 import { factory } from '@kmkf-fe-packages/services-components';
 import { AddressData, ExpressData, ExpressInterceptData, PlatData, LogisticsAddressData, getExpression, formatDisplayConfig, BsAddressData } from '@kmkf-fe-packages/kmkf-utils';
@@ -126,7 +128,34 @@ var FormRender = function FormRender(props, ref) {
       fillByShopId(get(transData, '0', {}).shopId);
     }
   }, [record]);
-
+  // 过滤打款组件订单与支付宝账号重复校验结果
+  var filterReplaceValue = useMemo(function () {
+    var obj = {};
+    Object.keys(replaceValue).forEach(function (key) {
+      if (!EXCLUDE_REPLACE_TOP_COMPONENT.includes(key)) {
+        obj[key] = replaceValue[key];
+      }
+    });
+    return obj;
+  }, [replaceValue]);
+  var innerReplaceValue = useMemo(function () {
+    var obj = {};
+    Object.keys(replaceValue).forEach(function (key) {
+      if (INNER_REPLACE_COMPONENT.includes(key)) {
+        obj[key] = replaceValue[key];
+      }
+    });
+    return obj;
+  }, [replaceValue]);
+  var innerReplaceValueCh = useMemo(function () {
+    var _Object$keys;
+    return (_Object$keys = Object.keys(innerReplaceValue)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.reduce(function (prev, next) {
+      if ((innerReplaceValue === null || innerReplaceValue === void 0 ? void 0 : innerReplaceValue[next]) > 0) {
+        prev[next] = "\u63D0\u793A\uFF1A\u8BE5".concat(COMPONENT_MAP_NAME[next], "\u9488\u5BF9\u6B64\u6A21\u677F\u5DF2\u521B\u5EFA\u8FC7\n                ").concat(innerReplaceValue === null || innerReplaceValue === void 0 ? void 0 : innerReplaceValue[next], "\u6761\u5DE5\u5355\uFF01");
+      }
+      return prev;
+    }, {});
+  }, [innerReplaceValue]);
   //带*参数提示清空
   var filterStarValues = function filterStarValues() {
     var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -219,19 +248,29 @@ var FormRender = function FormRender(props, ref) {
       buyerNick = value.buyerNick,
       receiveMobile = value.receiveMobile,
       alipayAccount = value.alipayAccount,
+      enterprisePaymentAlipayNo = value.enterprisePaymentAlipayNo,
       expressLogisticsCode = value.expressLogisticsCode,
       _value$remark = value.remark,
       remark = _value$remark === void 0 ? '' : _value$remark,
       _value$flag = value.flag,
       flag = _value$flag === void 0 ? '' : _value$flag;
     onUpdateRemark === null || onUpdateRemark === void 0 ? void 0 : onUpdateRemark(remark, flag + '');
+    // 清空打款组件之前的重复校验
+    if (!enterprisePaymentAlipayNo) {
+      setReplaceValue(function (value) {
+        return _objectSpread(_objectSpread({}, value), {}, {
+          enterprisePaymentAlipayNo: 0
+        });
+      });
+    }
     queryReplaceCount({
       tradeId: orderNo,
       buyerNick: buyerNick,
       receiveMobile: receiveMobile,
       alipayAccount: alipayAccount,
       expressLogisticsCode: expressLogisticsCode,
-      enterprisePaymentTid: orderNo
+      enterprisePaymentTid: orderNo,
+      enterprisePaymentAlipayNo: enterprisePaymentAlipayNo
     }, templateDetail);
   };
   var queryDetail = function queryDetail(_ref2) {
@@ -500,6 +539,7 @@ var FormRender = function FormRender(props, ref) {
       });
     }
   };
+
   //组件失焦事件
   var componentOnBlur = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(value, type) {
@@ -697,11 +737,6 @@ var FormRender = function FormRender(props, ref) {
           noStyle: true,
           shouldUpdate: function shouldUpdate(prevValues, currentValues) {
             return true; // TODO: 修复重复依赖的问题 https://tb.raycloud.com/task/64e4491e0b8b5c001e1099b9
-            // 对所有依赖项进行是否需要更新判断，只有当当前组件的依赖项发生了变化的时候，我们才会进行渲染判断
-            return Array.from(dependenciesFields).reduce(function (cur, nxt) {
-              if (cur) return true;
-              return cur || (prevValues === null || prevValues === void 0 ? void 0 : prevValues[nxt]) !== (currentValues === null || currentValues === void 0 ? void 0 : currentValues[nxt]);
-            }, false);
           }
         }, function (_ref4) {
           var getFieldValue = _ref4.getFieldValue;
@@ -764,7 +799,8 @@ var FormRender = function FormRender(props, ref) {
               return componentOnValueChange(uniqueKey, value, workOrderComponentType);
             },
             hidden: !show || mappdingHideComponents.includes(uniqueKey),
-            platform: platform
+            platform: platform,
+            innerReplaceValueCh: innerReplaceValueCh
           });
         });
       }
@@ -774,7 +810,8 @@ var FormRender = function FormRender(props, ref) {
           return componentOnValueChange(uniqueKey, value, workOrderComponentType);
         },
         hidden: mappdingHideComponents.includes(uniqueKey),
-        platform: platform
+        platform: platform,
+        innerReplaceValueCh: innerReplaceValueCh
       });
     };
   };
@@ -812,7 +849,7 @@ var FormRender = function FormRender(props, ref) {
       return [].concat(_toConsumableArray(hiddenPreNode), [ShopName], _toConsumableArray(otherItems));
     }
     return [].concat(_toConsumableArray(hiddenPreNode), _toConsumableArray(otherItems));
-  }, [templateDetail, shopList, shopId, record, mappdingHideComponents, currentShopId, look, handleChangeTradeId]);
+  }, [templateDetail, shopList, shopId, record, mappdingHideComponents, currentShopId, look, handleChangeTradeId, innerReplaceValue]);
   // TODO: 计算类型组件列表
   var calculationTypeComponentList = useMemo(function () {
     var _templateDetail$compo;
@@ -903,8 +940,8 @@ var FormRender = function FormRender(props, ref) {
     locale: zhCN
   }, /*#__PURE__*/React.createElement("div", {
     className: "tipBox"
-  }, Object.keys(replaceValue).map(function (key) {
-    return replaceValue[key] > 0 && /*#__PURE__*/React.createElement("div", null, "\u63D0\u793A\uFF1A\u8BE5", COMPONENT_MAP_NAME[key], "\u9488\u5BF9\u6B64\u6A21\u677F\u5DF2\u521B\u5EFA\u8FC7", replaceValue[key], "\u6761\u5DE5\u5355\uFF01");
+  }, Object.keys(filterReplaceValue).map(function (key) {
+    return filterReplaceValue[key] > 0 && /*#__PURE__*/React.createElement("div", null, "\u63D0\u793A\uFF1A\u8BE5", COMPONENT_MAP_NAME[key], "\u9488\u5BF9\u6B64\u6A21\u677F\u5DF2\u521B\u5EFA\u8FC7", replaceValue[key], "\u6761\u5DE5\u5355\uFF01");
   })), /*#__PURE__*/React.createElement(Form, _extends({
     form: preNodeForm
   }, formProps), preNodeFormItems), /*#__PURE__*/React.createElement(Form, _extends({

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

@@ -65,6 +65,8 @@ export declare const COMPONENT_MAP: {
 export declare const COMPONENT_MAP_NAME: {
     [key: string]: string;
 };
+export declare const EXCLUDE_REPLACE_TOP_COMPONENT: string[];
+export declare const INNER_REPLACE_COMPONENT: string[];
 export declare const getReplaceWarnValues: (templateDetail: {
     componentDtoList: any[];
 }, keyValues: {

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

@@ -1750,16 +1750,20 @@ export var COMPONENT_MAP = {
   receiveMobile: 'RECEIVER_MOBILE_INPUT',
   alipayAccount: 'ALI_PAY_INPUT',
   expressLogisticsCode: 'EXPRESS_LOGISTICS_SELECT',
-  enterprisePaymentTid: 'ENTERPRISE_PAYMENT'
+  enterprisePaymentTid: 'ENTERPRISE_PAYMENT',
+  enterprisePaymentAlipayNo: 'ENTERPRISE_PAYMENT'
 };
 export var COMPONENT_MAP_NAME = {
   tradeId: '订单号',
   buyerNick: '买家昵称',
   receiveMobile: '收件人手机号',
   alipayAccount: '支付宝账号',
+  enterprisePaymentAlipayNo: '支付宝账号',
   expressLogisticsCode: '快递物流单号',
   enterprisePaymentTid: '打款订单号'
 };
+export var EXCLUDE_REPLACE_TOP_COMPONENT = ['enterprisePaymentAlipayNo', 'enterprisePaymentTid'];
+export var INNER_REPLACE_COMPONENT = ['enterprisePaymentAlipayNo', 'enterprisePaymentTid'];
 //数据唯一性校验提交数据组装
 export var getReplaceWarnValues = function getReplaceWarnValues(templateDetail, keyValues) {
   return templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList.reduce(function (prv, next) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "0.21.4",
+  "version": "0.22.0-alpha.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.21.4",
-    "@kmkf-fe-packages/kmkf-utils": "^0.21.4",
-    "@kmkf-fe-packages/services-components": "^0.21.4",
+    "@kmkf-fe-packages/basic-components": "^0.22.0-alpha.2",
+    "@kmkf-fe-packages/kmkf-utils": "^0.22.0-alpha.2",
+    "@kmkf-fe-packages/services-components": "^0.22.0-alpha.2",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -74,7 +74,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "510c76d8426f214eb5653d9e75a59fa44e318939",
+  "gitHead": "4d837d058d55c1d265bc34262f9bcb9d44807cba",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }