npm - @kmkf-fe-packages/kmkf-work-order-service-component - Versions diffs - 2.0.79-beta.3 → 2.0.79-beta.30 - Mend

@kmkf-fe-packages/kmkf-work-order-service-component 2.0.79-beta.3 → 2.0.79-beta.30

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (27) hide show

package/dist/esm/FlowTemplateDetailV2/common.d.ts CHANGED Viewed

@@ -3,7 +3,6 @@ export declare const getTag: (item: {
     nodeType: string;
     nodeIsAuto: boolean;
 }) => string;
-export declare const platformMap: any;
 export declare const getFlowOperate: any;
 export declare const FLOW_STATUS_V2: {
     WAIT_COMMIT: string;

package/dist/esm/FlowTemplateDetailV2/common.js CHANGED Viewed

@@ -10,15 +10,6 @@ export var getTag = function getTag(item) {
   return tag;
 };
-export var platformMap = {
-  tb: '淘宝',
-  fxg: '抖音',
-  ks: '快手',
-  pdd: '拼多多',
-  jd: '京东',
-  xiaozhi: '小智',
-  pc: '客服工作台'
-};
 export var getFlowOperate = {
   SAVE: '暂存',
   SUBMIT: '提交',

package/dist/esm/FlowTemplateDetailV2/components/AutoTaskDetail/index.js CHANGED Viewed

@@ -1,28 +1,35 @@
 import React from 'react';
 import { isNumber } from 'lodash';
+import { Divider } from 'antd';
 export var AutoTaskDetail = function AutoTaskDetail(_ref) {
   var flowEventData = _ref.flowEventData;
   var mapping = {
     0: '执行中',
     1: '部分成功',
     2: '全部成功',
-    4: '全部失败'
+    3: '部分失败',
+    4: '全部失败',
+    5: '同时存在成功和失败且尚未完结',
+    6: '同时存在成功和失败且已完结',
+    7: '等待业务执行'
   };
   var eventStatus = flowEventData === null || flowEventData === void 0 ? void 0 : flowEventData.eventStatus;
   var renderRules = function renderRules() {
-    var _flowEventData$eventD, _flowEventData$eventD2, _flowEventData$eventD3;
-    return /*#__PURE__*/React.createElement("div", null, flowEventData === null || flowEventData === void 0 ? void 0 : (_flowEventData$eventD = flowEventData.eventData) === null || _flowEventData$eventD === void 0 ? void 0 : (_flowEventData$eventD2 = _flowEventData$eventD.otherBusinessData) === null || _flowEventData$eventD2 === void 0 ? void 0 : (_flowEventData$eventD3 = _flowEventData$eventD2.ruleDomainList) === null || _flowEventData$eventD3 === void 0 ? void 0 : _flowEventData$eventD3.map(function (item) {
-      var _item$passConditionLi;
-      return /*#__PURE__*/React.createElement("div", null, item.ruleName && /*#__PURE__*/React.createElement("p", null, "\u547D\u4E2D\u89C4\u5219\u540D\u79F0: ", item.ruleName), /*#__PURE__*/React.createElement("p", null, (_item$passConditionLi = item.passConditionList) === null || _item$passConditionLi === void 0 ? void 0 : _item$passConditionLi.map(function (condition) {
+    var _flowEventData$eventD, _flowEventData$eventD2;
+    return /*#__PURE__*/React.createElement("div", null, flowEventData === null || flowEventData === void 0 ? void 0 : (_flowEventData$eventD = flowEventData.eventData) === null || _flowEventData$eventD === void 0 ? void 0 : (_flowEventData$eventD2 = _flowEventData$eventD.businessStatus) === null || _flowEventData$eventD2 === void 0 ? void 0 : _flowEventData$eventD2.map(function (item) {
+      var _flowEventData$eventD3, _flowEventData$eventD4, _flowEventData$eventD5, _result$passCondition;
+      var result = flowEventData === null || flowEventData === void 0 ? void 0 : (_flowEventData$eventD3 = flowEventData.eventData) === null || _flowEventData$eventD3 === void 0 ? void 0 : (_flowEventData$eventD4 = _flowEventData$eventD3.otherBusinessData) === null || _flowEventData$eventD4 === void 0 ? void 0 : (_flowEventData$eventD5 = _flowEventData$eventD4.ruleDomainList) === null || _flowEventData$eventD5 === void 0 ? void 0 : _flowEventData$eventD5.find(function (k) {
+        return k.businessKey === item.businessKey;
+      });
+      return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Divider, {
+        dashed: true
+      }), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("p", null, (result === null || result === void 0 ? void 0 : result.ruleName) && "\u547D\u4E2D\u89C4\u5219\u540D\u79F0: ".concat(result === null || result === void 0 ? void 0 : result.ruleName)), /*#__PURE__*/React.createElement("p", null, item.businessStatusDesc && "\u89C4\u5219\u72B6\u6001: ".concat(item.businessStatusDesc)), /*#__PURE__*/React.createElement("p", null, result === null || result === void 0 ? void 0 : (_result$passCondition = result.passConditionList) === null || _result$passCondition === void 0 ? void 0 : _result$passCondition.map(function (condition) {
         return /*#__PURE__*/React.createElement("p", null, condition);
-      })));
+      }))), /*#__PURE__*/React.createElement("p", null, item.remark));
     }));
   };
-  var renderReason = function renderReason() {
-    var _flowEventData$eventD4, _flowEventData$eventD5, _flowEventData$eventD6;
-    return /*#__PURE__*/React.createElement("p", null, flowEventData === null || flowEventData === void 0 ? void 0 : (_flowEventData$eventD4 = flowEventData.eventData) === null || _flowEventData$eventD4 === void 0 ? void 0 : (_flowEventData$eventD5 = _flowEventData$eventD4.businessStatus) === null || _flowEventData$eventD5 === void 0 ? void 0 : (_flowEventData$eventD6 = _flowEventData$eventD5.map(function (item) {
-      return item === null || item === void 0 ? void 0 : item.remark;
-    })) === null || _flowEventData$eventD6 === void 0 ? void 0 : _flowEventData$eventD6.join(','));
-  };
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("p", null, isNumber(eventStatus) && "\u6267\u884C\u72B6\u6001: ".concat(mapping[eventStatus])), isNumber(eventStatus) && [1, 2].includes(eventStatus) && renderRules(), isNumber(eventStatus) && [1, 4].includes(eventStatus) && renderReason());
+  // const renderReason = () => {
+  //   return <p>{ flowEventData?.eventData?.businessStatus?.map((item: any) => item?.remark)?.join(',') }</p>
+  // }
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("p", null, isNumber(eventStatus) && "\u6267\u884C\u72B6\u6001: ".concat(mapping[eventStatus])), renderRules());
 };

package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.js CHANGED Viewed

@@ -40,7 +40,7 @@ var formProps = {
   layout: 'vertical'
 };
 var CurrentNode = function CurrentNode(props, ref) {
-  var _currentNodeDetail$no, _currentNodeDetail$no2, _currentNodeDetail$no3, _currentNodeDetail$no4, _currentNodeDetail$no16, _currentNodeDetail$wo12, _localStorage, _currentNodeDetail$wo13, _currentNodeDetail$wo14, _currentNodeDetail$wo15, _currentNodeDetail$wo16, _currentNodeDetail$wo17, _currentNodeDetail$wo18, _currentNodeDetail$wo19, _currentNodeDetail$wo20, _currentNodeDetail$wo21, _currentNodeDetail$no19, _currentNodeDetail$no20, _currentNodeDetail$no21, _currentNodeDetail$wo22;
+  var _currentNodeDetail$no, _currentNodeDetail$no2, _currentNodeDetail$no3, _currentNodeDetail$no4, _currentNodeDetail$no16, _currentNodeDetail$fl, _currentNodeDetail$wo12, _localStorage, _currentNodeDetail$wo13, _currentNodeDetail$wo14, _currentNodeDetail$wo15, _currentNodeDetail$wo16, _currentNodeDetail$wo17, _currentNodeDetail$wo18, _currentNodeDetail$wo19, _currentNodeDetail$wo20, _currentNodeDetail$wo21, _currentNodeDetail$no19, _currentNodeDetail$no20, _currentNodeDetail$no21, _currentNodeDetail$wo22;
   var formRenderRef = useRef(null);
   useImperativeHandle(ref, function () {
     return {
@@ -277,6 +277,7 @@ var CurrentNode = function CurrentNode(props, ref) {
   }();
   var isArtificialNode = tag === 'artificial';
   var isAutoNode = tag === 'auto';
+  var isShowAutoNodeDetail = isAutoNode && ['ORDER_MEMO_MANY_RULES', 'AFTER_SALE_AUTO_RETURN_GOODS_AGREE_REJECT', 'AFTER_SALE_AUTO_REFUND_REJECT', 'LOGISTICS_INTERCEPT_MULTI_RULE', 'MESSAGE_NOTIFY_EVENT', 'DING_TALK_ROBOT_NOTIFY', 'HTTP_INVOKE'].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$fl = currentNodeDetail.flowEventData) === null || _currentNodeDetail$fl === void 0 ? void 0 : _currentNodeDetail$fl.eventType);
   var showEdit = isArtificialNode && isCurrentNodeHandler && !readonly && (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo12 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo12 === void 0 ? void 0 : _currentNodeDetail$wo12.flowStatus) === FlowStatus.COMPLETED;
   // TODO: 决策节点给后端修复数据加了一个入口
   // @ts-ignore
@@ -312,7 +313,7 @@ var CurrentNode = function CurrentNode(props, ref) {
     onOpenWangWang: onOpenWangWang
   }) : /*#__PURE__*/React.createElement(FormRender, {
     ref: formRenderRef,
-    isShowShopList: NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no21 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no21 === void 0 ? void 0 : _currentNodeDetail$no21.nodeType) && PlatForm.PC === plat.platform,
+    isShowShopList: NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no21 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no21 === void 0 ? void 0 : _currentNodeDetail$no21.nodeType) && [PlatForm.PC, PlatForm.WEB].includes(plat.platform),
     plat: plat,
     templateDetail: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
     shopList: shopList,
@@ -331,7 +332,7 @@ var CurrentNode = function CurrentNode(props, ref) {
     flowAllShowHideRules: allShowHideRules,
     firstOrderBackfill: flowStatus !== FlowStatus.COMPLETED,
     autoSubmit: autoSubmit
-  })), isAutoNode && /*#__PURE__*/React.createElement(AutoTaskDetail, {
+  })), isShowAutoNodeDetail && /*#__PURE__*/React.createElement(AutoTaskDetail, {
     flowEventData: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.flowEventData
   })));
 };

package/dist/esm/FlowTemplateDetailV2/components/Item/index.d.ts CHANGED Viewed

@@ -16,6 +16,7 @@ interface NodeItem {
     visibleType?: string;
     nodeIsAuto: boolean;
     flowTemplateKey: string;
+    eventNodeType: string;
 }
 declare const NodeItem: (props: NodeItem) => React.JSX.Element;
 export default NodeItem;

package/dist/esm/FlowTemplateDetailV2/components/Item/index.js CHANGED Viewed

@@ -34,7 +34,7 @@ import { useSelector } from "../../context/useSelector";
 import { Context } from "../../context";
 import { AutoTaskDetail } from "../AutoTaskDetail";
 var NodeItem = function NodeItem(props) {
-  var _data$data15, _data$data16, _data$data16$workOrde, _data$data17, _data$data17$workOrde, _data$data18, _data$data18$nodeInfo, _data$data19, _data$data20, _data$data20$nodeInfo, _data$data21, _data$data22, _data$data23, _data$data23$workOrde, _data$data24, _data$data25;
+  var _data$data10, _data$data11, _data$data11$workOrde, _data$data12, _data$data12$workOrde, _data$data13, _data$data13$nodeInfo, _data$data14, _data$data15, _data$data15$nodeInfo, _data$data16, _data$data17, _data$data18, _data$data18$workOrde, _data$data19, _data$data20;
   var tag = props.tag,
     nodeId = props.nodeId,
     nodeName = props.nodeName,
@@ -53,7 +53,8 @@ var NodeItem = function NodeItem(props) {
     visibleType = _props$visibleType === void 0 ? '' : _props$visibleType,
     nodeIsAuto = props.nodeIsAuto,
     flowTemplateKey = props.flowTemplateKey,
-    onJumpPage = props.onJumpPage;
+    onJumpPage = props.onJumpPage,
+    eventNodeType = props.eventNodeType;
   var _useContext = useContext(Context),
     dispatch = _useContext.dispatch;
   var plat = useSelector(selectPlatInfo);
@@ -239,7 +240,7 @@ var NodeItem = function NodeItem(props) {
       isAllStaff: data === null || data === void 0 ? void 0 : (_data$data9 = data.data) === null || _data$data9 === void 0 ? void 0 : (_data$data9$nodeInfo = _data$data9.nodeInfo) === null || _data$data9$nodeInfo === void 0 ? void 0 : (_data$data9$nodeInfo$ = _data$data9$nodeInfo.assistants) === null || _data$data9$nodeInfo$ === void 0 ? void 0 : _data$data9$nodeInfo$.isAllStaff
     });
   }, [data, plat.userKey, assistantMap]);
+  var isShowAutoNodeDetail = isAutoNode && ['ORDER_MEMO_MANY_RULES', 'AFTER_SALE_AUTO_RETURN_GOODS_AGREE_REJECT', 'AFTER_SALE_AUTO_REFUND_REJECT', 'LOGISTICS_INTERCEPT_MULTI_RULE', 'MESSAGE_NOTIFY_EVENT', 'DING_TALK_ROBOT_NOTIFY', 'HTTP_INVOKE'].includes(eventNodeType);
   // 人工节点+打开状态+当前工单提交人是当前完成人+状态是待处理
   var showEdit = isArtificialNode && open && isCurrentNodeHandler && !readonly && [FlowStatus.PROCESSING, FlowStatus.COMPLETED].includes(flowStatus);
@@ -257,31 +258,14 @@ var NodeItem = function NodeItem(props) {
   //   }
   // };
-  var renderFail = function renderFail() {
-    var _data$data10, _data$data10$flowEven, _data$data10$flowEven2, _data$data10$flowEven3, _data$data10$flowEven4;
-    return data === null || data === void 0 ? void 0 : (_data$data10 = data.data) === null || _data$data10 === void 0 ? void 0 : (_data$data10$flowEven = _data$data10.flowEventData) === null || _data$data10$flowEven === void 0 ? void 0 : (_data$data10$flowEven2 = _data$data10$flowEven.eventData) === null || _data$data10$flowEven2 === void 0 ? void 0 : (_data$data10$flowEven3 = _data$data10$flowEven2.businessStatus) === null || _data$data10$flowEven3 === void 0 ? void 0 : (_data$data10$flowEven4 = _data$data10$flowEven3[0]) === null || _data$data10$flowEven4 === void 0 ? void 0 : _data$data10$flowEven4.remark;
-  };
-  var renderSuccess = function renderSuccess() {
-    var _data$data11, _data$data11$flowEven, _data$data11$flowEven2, _data$data11$flowEven3, _data$data11$flowEven4;
-    return /*#__PURE__*/React.createElement("div", null, data === null || data === void 0 ? void 0 : (_data$data11 = data.data) === null || _data$data11 === void 0 ? void 0 : (_data$data11$flowEven = _data$data11.flowEventData) === null || _data$data11$flowEven === void 0 ? void 0 : (_data$data11$flowEven2 = _data$data11$flowEven.eventData) === null || _data$data11$flowEven2 === void 0 ? void 0 : (_data$data11$flowEven3 = _data$data11$flowEven2.otherBusinessData) === null || _data$data11$flowEven3 === void 0 ? void 0 : (_data$data11$flowEven4 = _data$data11$flowEven3.ruleDomainList) === null || _data$data11$flowEven4 === void 0 ? void 0 : _data$data11$flowEven4.map(function (item) {
-      var _item$passConditionLi;
-      return /*#__PURE__*/React.createElement("div", null, item.ruleName && /*#__PURE__*/React.createElement("p", null, "\u547D\u4E2D\u89C4\u5219\u540D\u79F0: ", item.ruleName), /*#__PURE__*/React.createElement("p", null, (_item$passConditionLi = item.passConditionList) === null || _item$passConditionLi === void 0 ? void 0 : _item$passConditionLi.map(function (item) {
-        return /*#__PURE__*/React.createElement("p", null, item);
-      })));
-    }));
-  };
-  var renderAutoNodeDetail = function renderAutoNodeDetail() {
-    var _data$data12, _data$data12$flowEven, _data$data12$flowEven2, _data$data12$flowEven3, _data$data12$flowEven4, _data$data13, _data$data13$flowEven, _data$data13$flowEven2, _data$data13$flowEven3, _data$data13$flowEven4, _data$data14, _data$data14$flowEven, _data$data14$flowEven2, _data$data14$flowEven3, _data$data14$flowEven4;
-    return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("p", null, (data === null || data === void 0 ? void 0 : (_data$data12 = data.data) === null || _data$data12 === void 0 ? void 0 : (_data$data12$flowEven = _data$data12.flowEventData) === null || _data$data12$flowEven === void 0 ? void 0 : (_data$data12$flowEven2 = _data$data12$flowEven.eventData) === null || _data$data12$flowEven2 === void 0 ? void 0 : (_data$data12$flowEven3 = _data$data12$flowEven2.businessStatus) === null || _data$data12$flowEven3 === void 0 ? void 0 : (_data$data12$flowEven4 = _data$data12$flowEven3[0]) === null || _data$data12$flowEven4 === void 0 ? void 0 : _data$data12$flowEven4.businessStatusDesc) && "\u6267\u884C\u72B6\u6001: ".concat(data === null || data === void 0 ? void 0 : (_data$data13 = data.data) === null || _data$data13 === void 0 ? void 0 : (_data$data13$flowEven = _data$data13.flowEventData) === null || _data$data13$flowEven === void 0 ? void 0 : (_data$data13$flowEven2 = _data$data13$flowEven.eventData) === null || _data$data13$flowEven2 === void 0 ? void 0 : (_data$data13$flowEven3 = _data$data13$flowEven2.businessStatus) === null || _data$data13$flowEven3 === void 0 ? void 0 : (_data$data13$flowEven4 = _data$data13$flowEven3[0]) === null || _data$data13$flowEven4 === void 0 ? void 0 : _data$data13$flowEven4.businessStatusDesc)), [1, 2].includes(data === null || data === void 0 ? void 0 : (_data$data14 = data.data) === null || _data$data14 === void 0 ? void 0 : (_data$data14$flowEven = _data$data14.flowEventData) === null || _data$data14$flowEven === void 0 ? void 0 : (_data$data14$flowEven2 = _data$data14$flowEven.eventData) === null || _data$data14$flowEven2 === void 0 ? void 0 : (_data$data14$flowEven3 = _data$data14$flowEven2.businessStatus) === null || _data$data14$flowEven3 === void 0 ? void 0 : (_data$data14$flowEven4 = _data$data14$flowEven3[0]) === null || _data$data14$flowEven4 === void 0 ? void 0 : _data$data14$flowEven4.businessStatus) ? renderSuccess() : renderFail());
-  };
-  var _calcWorkOrderList = calcWorkOrderList([(data === null || data === void 0 ? void 0 : (_data$data15 = data.data) === null || _data$data15 === void 0 ? void 0 : _data$data15.workOrder) || {}], [].concat(_toConsumableArray((data === null || data === void 0 ? void 0 : (_data$data16 = data.data) === null || _data$data16 === void 0 ? void 0 : (_data$data16$workOrde = _data$data16.workOrderTemplateInfo) === null || _data$data16$workOrde === void 0 ? void 0 : _data$data16$workOrde.preNodeComponentDtoList) || []), _toConsumableArray((data === null || data === void 0 ? void 0 : (_data$data17 = data.data) === null || _data$data17 === void 0 ? void 0 : (_data$data17$workOrde = _data$data17.workOrderTemplateInfo) === null || _data$data17$workOrde === void 0 ? void 0 : _data$data17$workOrde.componentDtoList) || []))),
+  var _calcWorkOrderList = calcWorkOrderList([(data === null || data === void 0 ? void 0 : (_data$data10 = data.data) === null || _data$data10 === void 0 ? void 0 : _data$data10.workOrder) || {}], [].concat(_toConsumableArray((data === null || data === void 0 ? void 0 : (_data$data11 = data.data) === null || _data$data11 === void 0 ? void 0 : (_data$data11$workOrde = _data$data11.workOrderTemplateInfo) === null || _data$data11$workOrde === void 0 ? void 0 : _data$data11$workOrde.preNodeComponentDtoList) || []), _toConsumableArray((data === null || data === void 0 ? void 0 : (_data$data12 = data.data) === null || _data$data12 === void 0 ? void 0 : (_data$data12$workOrde = _data$data12.workOrderTemplateInfo) === null || _data$data12$workOrde === void 0 ? void 0 : _data$data12$workOrde.componentDtoList) || []))),
     _calcWorkOrderList2 = _slicedToArray(_calcWorkOrderList, 1),
     transData = _calcWorkOrderList2[0];
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Header, {
     tag: tag,
     nodeName: nodeName,
     editing: editing,
-    showLook: isArtificialNode || isAutoNode,
+    showLook: isArtificialNode || isShowAutoNodeDetail,
     showEdit: showEdit,
     opening: open,
     handleLook: handleOpen,
@@ -302,18 +286,18 @@ var NodeItem = function NodeItem(props) {
       display: open ? 'block' : 'none',
       marginTop: '16px'
     }
-  }, [NodeType.START_NODE, NodeType.EXECUTE_NODE].includes(data === null || data === void 0 ? void 0 : (_data$data18 = data.data) === null || _data$data18 === void 0 ? void 0 : (_data$data18$nodeInfo = _data$data18.nodeInfo) === null || _data$data18$nodeInfo === void 0 ? void 0 : _data$data18$nodeInfo.nodeType) && (data === null || data === void 0 ? void 0 : (_data$data19 = data.data) === null || _data$data19 === void 0 ? void 0 : _data$data19.workOrderTemplateInfo) && /*#__PURE__*/React.createElement("div", null, editing ? /*#__PURE__*/React.createElement(FormRender, {
-    isShowShopList: NodeType.START_NODE === (data === null || data === void 0 ? void 0 : (_data$data20 = data.data) === null || _data$data20 === void 0 ? void 0 : (_data$data20$nodeInfo = _data$data20.nodeInfo) === null || _data$data20$nodeInfo === void 0 ? void 0 : _data$data20$nodeInfo.nodeType) && PlatForm.PC === plat.platform,
+  }, [NodeType.START_NODE, NodeType.EXECUTE_NODE].includes(data === null || data === void 0 ? void 0 : (_data$data13 = data.data) === null || _data$data13 === void 0 ? void 0 : (_data$data13$nodeInfo = _data$data13.nodeInfo) === null || _data$data13$nodeInfo === void 0 ? void 0 : _data$data13$nodeInfo.nodeType) && (data === null || data === void 0 ? void 0 : (_data$data14 = data.data) === null || _data$data14 === void 0 ? void 0 : _data$data14.workOrderTemplateInfo) && /*#__PURE__*/React.createElement("div", null, editing ? /*#__PURE__*/React.createElement(FormRender, {
+    isShowShopList: NodeType.START_NODE === (data === null || data === void 0 ? void 0 : (_data$data15 = data.data) === null || _data$data15 === void 0 ? void 0 : (_data$data15$nodeInfo = _data$data15.nodeInfo) === null || _data$data15$nodeInfo === void 0 ? void 0 : _data$data15$nodeInfo.nodeType) && [PlatForm.PC, PlatForm.WEB].includes(plat.platform),
     plat: plat,
-    templateDetail: data === null || data === void 0 ? void 0 : (_data$data21 = data.data) === null || _data$data21 === void 0 ? void 0 : _data$data21.workOrderTemplateInfo,
+    templateDetail: data === null || data === void 0 ? void 0 : (_data$data16 = data.data) === null || _data$data16 === void 0 ? void 0 : _data$data16.workOrderTemplateInfo,
     shopList: shopList,
-    record: data === null || data === void 0 ? void 0 : (_data$data22 = data.data) === null || _data$data22 === void 0 ? void 0 : _data$data22.workOrder,
+    record: data === null || data === void 0 ? void 0 : (_data$data17 = data.data) === null || _data$data17 === void 0 ? void 0 : _data$data17.workOrder,
     accountName: plat.accountName,
     form: form,
     onOpenWangWang: onOpenWangWang,
     onJumpPage: onJumpPage,
     look: !editing || flowStatus === FlowStatus.STOPPING,
-    shopId: data === null || data === void 0 ? void 0 : (_data$data23 = data.data) === null || _data$data23 === void 0 ? void 0 : (_data$data23$workOrde = _data$data23.workOrder) === null || _data$data23$workOrde === void 0 ? void 0 : _data$data23$workOrde.shopId,
+    shopId: data === null || data === void 0 ? void 0 : (_data$data18 = data.data) === null || _data$data18 === void 0 ? void 0 : (_data$data18$workOrde = _data$data18.workOrder) === null || _data$data18$workOrde === void 0 ? void 0 : _data$data18$workOrde.shopId,
     formProps: {
       className: 'customizeFormModalClassName',
       layout: 'vertical'
@@ -323,12 +307,12 @@ var NodeItem = function NodeItem(props) {
     firstOrderBackfill: false // TODO: 前面节点必然是已完成状态，已完成状态不再调用订单反填
     // handleChangeTradeId={handleChangeTradeId}
   }) : /*#__PURE__*/React.createElement(RenderDetail, {
-    workOrderTemplateInfo: data === null || data === void 0 ? void 0 : (_data$data24 = data.data) === null || _data$data24 === void 0 ? void 0 : _data$data24.workOrderTemplateInfo,
+    workOrderTemplateInfo: data === null || data === void 0 ? void 0 : (_data$data19 = data.data) === null || _data$data19 === void 0 ? void 0 : _data$data19.workOrderTemplateInfo,
     transData: transData,
     platform: plat.platform,
     onOpenWangWang: onOpenWangWang
-  })), isAutoNode && /*#__PURE__*/React.createElement(AutoTaskDetail, {
-    flowEventData: data === null || data === void 0 ? void 0 : (_data$data25 = data.data) === null || _data$data25 === void 0 ? void 0 : _data$data25.flowEventData
+  })), isShowAutoNodeDetail && /*#__PURE__*/React.createElement(AutoTaskDetail, {
+    flowEventData: data === null || data === void 0 ? void 0 : (_data$data20 = data.data) === null || _data$data20 === void 0 ? void 0 : _data$data20.flowEventData
   })));
 };
 export default NodeItem;

package/dist/esm/FlowTemplateDetailV2/index.js CHANGED Viewed

@@ -56,6 +56,7 @@ import { Provide, Context } from "./context";
 import { useSelector } from "./context/useSelector";
 import { pollOperationResult } from "./pollOperationResult";
 import { pushGyLog } from '@kmkf-fe-packages/kmkf-utils';
+import { PlatForm } from "../WorkOrder/types";
 var Text = Typography.Text,
   Link = Typography.Link;
 var FlowTemplateDetail = function FlowTemplateDetail(props) {
@@ -1077,7 +1078,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
     var shopId = details.shopId,
       ohter = _objectWithoutProperties(details, _excluded);
     var formData = form.getFieldsValue();
-    var params = plat.platform === 'pc' ? _objectSpread(_objectSpread({}, formData), details) : _objectSpread(_objectSpread({}, formData), ohter);
+    var params = [PlatForm.PC, PlatForm.WEB].includes(plat.platform) ? _objectSpread(_objectSpread({}, formData), details) : _objectSpread(_objectSpread({}, formData), ohter);
     form.setFieldsValue(params);
     message.success('填充成功');
     // 填充表单后触发映射
@@ -1204,7 +1205,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
     var _operateParams$maxPub2, _operateParams$maxPub3;
     return /*#__PURE__*/React.createElement(Text, {
       type: "secondary"
-    }, /*#__PURE__*/React.createElement(InfoCircleOutlined, null), "\u5F53\u524D\u5DE5\u5355\u6240\u5C5E\u6D41\u7A0B", plat.platform === 'pc' ? /*#__PURE__*/React.createElement(Link, {
+    }, /*#__PURE__*/React.createElement(InfoCircleOutlined, null), "\u5F53\u524D\u5DE5\u5355\u6240\u5C5E\u6D41\u7A0B", plat.platform === PlatForm.PC ? /*#__PURE__*/React.createElement(Link, {
       style: {
         cursor: 'pointer'
       },
@@ -1214,7 +1215,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
           flowTemplateId: flowTemplateId
         });
       }
-    }, "v", operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowVersion, "\u7248") : "v".concat(operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowVersion, "\u7248"), "\uFF0C\u76EE\u524D\u6700\u65B0\u6D41\u7A0B", plat.platform === 'pc' ? /*#__PURE__*/React.createElement(Link, {
+    }, "v", operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowVersion, "\u7248") : "v".concat(operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowVersion, "\u7248"), "\uFF0C\u76EE\u524D\u6700\u65B0\u6D41\u7A0B", plat.platform === PlatForm.PC ? /*#__PURE__*/React.createElement(Link, {
       style: {
         cursor: 'pointer'
       },
@@ -1237,7 +1238,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
     spinning: loading || orderBackLoading || orderBackKmLoading
   }, /*#__PURE__*/React.createElement("div", {
     className: "flowWorkOrderDetail"
-  }, flowWorkOrderId && /*#__PURE__*/React.createElement("div", null, plat.platform === 'pc' && /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(PlatformAvatar, {
+  }, flowWorkOrderId && /*#__PURE__*/React.createElement("div", null, [PlatForm.PC, PlatForm.WEB].includes(plat.platform) && /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(PlatformAvatar, {
     type: shopItem === null || shopItem === void 0 ? void 0 : shopItem.shopSource,
     styles: {
       marginRight: 5
@@ -1255,7 +1256,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
   }), /*#__PURE__*/React.createElement("span", null, FLOW_STATUS_V2[flowStatus]), /*#__PURE__*/React.createElement(Button, {
     onClick: reFreshPanel,
     type: "link"
-  }, "\u5237\u65B0"), plat.platform === 'pc' ? VersionText() : '')), flowTemplateType !== 'SINGLE_PAGE' && /*#__PURE__*/React.createElement(Col, {
+  }, "\u5237\u65B0"), plat.platform === PlatForm.PC ? VersionText() : '')), flowTemplateType !== 'SINGLE_PAGE' && /*#__PURE__*/React.createElement(Col, {
     style: {
       position: 'relative',
       zIndex: 1,
@@ -1271,7 +1272,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
     onClick: function onClick() {
       return setOpenCloseVisible('close');
     }
-  }, "\u6536\u8D77\u5168\u90E8"))), plat.platform !== 'pc' ? VersionText() : ''), /*#__PURE__*/React.createElement("div", {
+  }, "\u6536\u8D77\u5168\u90E8"))), plat.platform !== PlatForm.PC ? VersionText() : ''), /*#__PURE__*/React.createElement("div", {
     className: "center ".concat(readonly ? 'readonly' : '')
   }, currentTradeIdLinkWorkOrderId.total > 0 && /*#__PURE__*/React.createElement("div", {
     className: "alertRepeatTradeId"
@@ -1307,7 +1308,8 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
       nodeIsAuto: flowRecord.nodeIsAuto,
       openCloseCallback: function openCloseCallback() {
         setOpenCloseVisible('');
-      }
+      },
+      eventNodeType: flowRecord.eventNodeType
     }));
   }), currentNodeDetail && /*#__PURE__*/React.createElement(Timeline.Item, null, /*#__PURE__*/React.createElement(CurrentNode, {
     ref: currentNodeRef,

package/dist/esm/FlowTemplateDetailV2/store/reducers.js CHANGED Viewed

@@ -85,7 +85,8 @@ export var fetchPanelInfo = function fetchPanelInfo(params, options) {
                 tag: tag,
                 operator: item.operator || '',
                 nodeIsAuto: item.nodeIsAuto,
-                operateType: item.operateType
+                operateType: item.operateType,
+                eventNodeType: item.eventNodeType
               };
             }); // TODO: 针对已完结工单 会出现多一个最后节点问题；需要当前节点id和记录列表中最后一条比对，如果相同，则移除记录中最后一条；
             if ((res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : (_res$data2$currentNod = _res$data2.currentNodeDetail) === null || _res$data2$currentNod === void 0 ? void 0 : (_res$data2$currentNod2 = _res$data2$currentNod.nodeInfo) === null || _res$data2$currentNod2 === void 0 ? void 0 : _res$data2$currentNod2.id) === ((_last = last(recordList)) === null || _last === void 0 ? void 0 : _last.nodeId)) {

package/dist/esm/FlowTemplateDetailV2/store/selector.d.ts CHANGED Viewed

@@ -217,7 +217,6 @@ export declare const selectCurrentNodeDetail: (state: FlowTemplateDetailState) =
         }[] | undefined;
     };
     flowEventData?: {
-        eventStatus: 0 | 1 | 2 | 4;
         eventData?: {
             businessStatus?: {
                 businessKey: string;
@@ -226,10 +225,8 @@ export declare const selectCurrentNodeDetail: (state: FlowTemplateDetailState) =
                 remark: string;
             }[] | undefined;
             otherBusinessData?: {
-                ruleDomainList: {
-                    ruleName?: string | undefined;
-                    passConditionList?: string[] | undefined;
-                }[];
+                ruleName?: string | undefined;
+                passConditionList?: string[] | undefined;
             } | undefined;
         } | undefined;
     } | undefined;

package/dist/esm/FormRender/index.js CHANGED Viewed

@@ -27,6 +27,7 @@ import zhCN from 'antd/es/locale/zh_CN';
 import { get, find, some, set, last, every, cloneDeep } from 'lodash';
 import 'moment/locale/zh-cn';
 import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME } from "../common/utils/tools";
+import { platformMap } from "../common/utils/constant";
 import submitDataTransOldFormat from "../common/utils/submitDataTransOldFormat";
 import { queryTemplateDetail, addLogicFlowWorkOrder, queryWorkOrderDetail, updateWorkOrder, replaceCheck, queryTemplateIdByFlowId } from "../model/servers/api";
 import { factory, ShopList } from '@kmkf-fe-packages/services-components';
@@ -136,7 +137,7 @@ var FormRender = function FormRender(props, ref) {
   };
   var asyncDoSave = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(workOrderDetail, templateDetail) {
-      var _Object$keys, _templateDetail$compo3, data, res, finalComponentList, finalDtoList, newTemplateDetail, params, submitData, _yield$updateWorkOrde, success, _templateDetail$flowT, _templateDetail$flowT2, platformMap, _params, hasEnterPrisePayment, getEnterPrisePaymentData, uniqueKey, componentConfig, _yield$addLogicFlowWo, _success;
+      var _Object$keys, _templateDetail$compo3, data, res, finalComponentList, finalDtoList, newTemplateDetail, params, submitData, _yield$updateWorkOrde, success, _templateDetail$flowT, _templateDetail$flowT2, _params, hasEnterPrisePayment, getEnterPrisePaymentData, uniqueKey, componentConfig, _yield$addLogicFlowWo, _success;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -210,18 +211,9 @@ var FormRender = function FormRender(props, ref) {
                 id: workOrderId
               });
             }
-            _context.next = 42;
+            _context.next = 41;
             break;
           case 29:
-            platformMap = {
-              tb: '淘宝',
-              fxg: '抖音',
-              ks: '快手',
-              pdd: '拼多多',
-              jd: '京东',
-              xiaozhi: '小智',
-              pc: '客服工作台'
-            };
             _params = {
               apiName: 'addWorkOrder',
               shopId: shopId,
@@ -259,13 +251,13 @@ var FormRender = function FormRender(props, ref) {
             }
             console.debug('增加数据参数', _params, templateDetail);
             // return;
-            _context.next = 39;
+            _context.next = 38;
             return addLogicFlowWorkOrder({
               workOrderVo: _params,
               flowTemplateId: templateDetail === null || templateDetail === void 0 ? void 0 : (_templateDetail$flowT = templateDetail.flowTemplateConfig) === null || _templateDetail$flowT === void 0 ? void 0 : _templateDetail$flowT.flowTemplateId,
               nodeId: templateDetail === null || templateDetail === void 0 ? void 0 : (_templateDetail$flowT2 = templateDetail.flowTemplateConfig) === null || _templateDetail$flowT2 === void 0 ? void 0 : _templateDetail$flowT2.nodeId
             });
-          case 39:
+          case 38:
             _yield$addLogicFlowWo = _context.sent;
             _success = _yield$addLogicFlowWo.success;
             if (_success && typeof onFormSubmitSuccess === 'function') {
@@ -275,12 +267,12 @@ var FormRender = function FormRender(props, ref) {
                 result: _success
               });
             }
-          case 42:
+          case 41:
             console.groupEnd();
-            _context.next = 49;
+            _context.next = 48;
             break;
-          case 45:
-            _context.prev = 45;
+          case 44:
+            _context.prev = 44;
             _context.t0 = _context["catch"](0);
             onFormSubmitSuccess === null || onFormSubmitSuccess === void 0 ? void 0 : onFormSubmitSuccess({
               type: ''
@@ -296,11 +288,11 @@ var FormRender = function FormRender(props, ref) {
                 });
               }, 0);
             }
-          case 49:
+          case 48:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 45]]);
+      }, _callee, null, [[0, 44]]);
     }));
     return function asyncDoSave(_x2, _x3) {
       return _ref2.apply(this, arguments);

package/dist/esm/FormRenderTemplateId/index.js CHANGED Viewed

@@ -27,6 +27,7 @@ import zhCN from 'antd/es/locale/zh_CN';
 import { get, find, some, set, last, every, cloneDeep } from 'lodash';
 import 'moment/locale/zh-cn';
 import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME } from "../common/utils/tools";
+import { platformMap } from "../common/utils/constant";
 import submitDataTransOldFormat from "../common/utils/submitDataTransOldFormat";
 import { queryTemplateDetail, addWorkOrder, queryWorkOrderDetail, updateWorkOrder, replaceCheck } from "../model/servers/api";
 import { factory, ShopList } from '@kmkf-fe-packages/services-components';
@@ -131,7 +132,7 @@ var FormRender = function FormRender(props, ref) {
   };
   var asyncDoSave = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(workOrderDetail, templateDetail) {
-      var data, res, _Object$keys, _templateDetail$compo3, params, finalComponentList, finalDtoList, newTemplateDetail, submitData, _yield$updateWorkOrde, success, result, platformMap, _params, hasEnterPrisePayment, getEnterPrisePaymentData, uniqueKey, componentConfig, _yield$addWorkOrder, _success, _result;
+      var data, res, _Object$keys, _templateDetail$compo3, params, finalComponentList, finalDtoList, newTemplateDetail, submitData, _yield$updateWorkOrde, success, result, _params, hasEnterPrisePayment, getEnterPrisePaymentData, uniqueKey, componentConfig, _yield$addWorkOrder, _success, _result;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -205,18 +206,9 @@ var FormRender = function FormRender(props, ref) {
                 id: workOrderId
               });
             }
-            _context.next = 43;
+            _context.next = 42;
             break;
           case 30:
-            platformMap = {
-              tb: '淘宝',
-              fxg: '抖音',
-              ks: '快手',
-              pdd: '拼多多',
-              jd: '京东',
-              xiaozhi: '小智',
-              pc: '客服工作台'
-            };
             _params = {
               apiName: 'addWorkOrder',
               shopId: shopId,
@@ -255,9 +247,9 @@ var FormRender = function FormRender(props, ref) {
             }
             // console.debug('增加数据参数', params);
             // return;
-            _context.next = 39;
+            _context.next = 38;
             return addWorkOrder(_params);
-          case 39:
+          case 38:
             _yield$addWorkOrder = _context.sent;
             _success = _yield$addWorkOrder.success;
             _result = _yield$addWorkOrder.data;
@@ -268,12 +260,12 @@ var FormRender = function FormRender(props, ref) {
                 result: _result === null || _result === void 0 ? void 0 : _result.data
               });
             }
-          case 43:
+          case 42:
             console.groupEnd();
-            _context.next = 50;
+            _context.next = 49;
             break;
-          case 46:
-            _context.prev = 46;
+          case 45:
+            _context.prev = 45;
             _context.t0 = _context["catch"](0);
             onFormSubmitSuccess === null || onFormSubmitSuccess === void 0 ? void 0 : onFormSubmitSuccess({
               type: ''
@@ -289,11 +281,11 @@ var FormRender = function FormRender(props, ref) {
                 });
               }, 0);
             }
-          case 50:
+          case 49:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 46]]);
+      }, _callee, null, [[0, 45]]);
     }));
     return function asyncDoSave(_x2, _x3) {
       return _ref2.apply(this, arguments);

package/dist/esm/SingleShopWorkOrder/components/CustomizeFormModal/index.js CHANGED Viewed

@@ -26,6 +26,7 @@ import zhCN from 'antd/es/locale/zh_CN';
 import moment from 'moment';
 import 'moment/locale/zh-cn';
 import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME } from "../../../common/utils/tools";
+import { platformMap } from "../../../common/utils/constant";
 import submitDataTransOldFormat from "../../../common/utils/submitDataTransOldFormat";
 import { factory } from '@kmkf-fe-packages/services-components';
 import { querySingleShopTemplateDetail, addSingleShopWorkOrder, querySingleShopWorkOrderDetail, updateSingleShopWorkOrder, replaceCheck } from "../../../model/servers/api";
@@ -85,7 +86,7 @@ var CustomizeFormModal = function CustomizeFormModal(props) {
   }, [visible, templateId, workOrderId, currentShopId]);
   var asyncDoSave = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(workOrderDetail, templateDetail) {
-      var data, res, params, submitData, _yield$updateSingleSh, success, result, platformMap, _params, hasEnterPrisePayment, getEnterPrisePaymentData, uniqueKey, componentConfig, _yield$addSingleShopW, _success, _result;
+      var data, res, params, submitData, _yield$updateSingleSh, success, result, _params, hasEnterPrisePayment, getEnterPrisePaymentData, uniqueKey, componentConfig, _yield$addSingleShopW, _success, _result;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -136,17 +137,9 @@ var CustomizeFormModal = function CustomizeFormModal(props) {
                 id: workOrderId
               });
             }
-            _context.next = 35;
+            _context.next = 34;
             break;
           case 22:
-            platformMap = {
-              tb: '淘宝',
-              fxg: '抖音',
-              ks: '快手',
-              pdd: '拼多多',
-              jd: '京东',
-              xiaozhi: '小智'
-            };
             _params = {
               apiName: 'addWorkOrder',
               shopId: currentShopId,
@@ -180,9 +173,9 @@ var CustomizeFormModal = function CustomizeFormModal(props) {
               };
             }
             console.debug('增加数据参数', _params);
-            _context.next = 31;
+            _context.next = 30;
             return addSingleShopWorkOrder(_params);
-          case 31:
+          case 30:
             _yield$addSingleShopW = _context.sent;
             _success = _yield$addSingleShopW.success;
             _result = _yield$addSingleShopW.data;
@@ -195,12 +188,12 @@ var CustomizeFormModal = function CustomizeFormModal(props) {
                 result: _result === null || _result === void 0 ? void 0 : _result.data
               });
             }
-          case 35:
+          case 34:
             console.groupEnd();
-            _context.next = 41;
+            _context.next = 40;
             break;
-          case 38:
-            _context.prev = 38;
+          case 37:
+            _context.prev = 37;
             _context.t0 = _context["catch"](0);
             // 表单校验失败错误时，将错误第一项滚动到可视区域
             if (get(_context.t0, 'errorFields.length') > 0) {
@@ -213,11 +206,11 @@ var CustomizeFormModal = function CustomizeFormModal(props) {
                 });
               }, 0);
             }
-          case 41:
+          case 40:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 38]]);
+      }, _callee, null, [[0, 37]]);
     }));
     return function asyncDoSave(_x2, _x3) {
       return _ref.apply(this, arguments);

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

@@ -1,5 +1,6 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-var _excluded = ["shopId", "shopName", "shopList"];
+var _excluded = ["shopId", "shopName", "shopList"],
+  _excluded2 = ["shopId"];
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -25,6 +26,8 @@ import { useAppSelector } from "../../../../../model/hooks";
 import { decodeAlipayInfo, editRemitOrder, addPaymentOrder, getThirdOpenUidByOrderNo, paymentReplaceCheck } from "../../../../../model/servers/api";
 import { selectPaymentFormModalVisible, selectCurrentPaymentRecord } from "../../../../../model/paymentWorkOrder/selector";
 import { setPaymentFormModalVisible } from "../../../../../model/paymentWorkOrder";
+import ShopName from "../../../../../FlowTemplateDetailV2/components/ShopName";
+import { PlatForm } from "../../../../types";
 function ModifyModal(props) {
   var afterSuccessUpdateWorkOrder = props.afterSuccessUpdateWorkOrder,
     width = props.width,
@@ -86,7 +89,7 @@ function ModifyModal(props) {
     form.validateFields().then( /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(values) {
         var _shopList$find;
-        var shopSource, newValue, api, shopId, shopName, _shopList, other, _yield$api, success;
+        var shopSource, newValue, api, shopId, shopName, _shopList, other, newShopId, valueOhter, _yield$api, success;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -110,7 +113,8 @@ function ModifyModal(props) {
               if (type === 'edit') {
                 // eslint-disable-next-line @typescript-eslint/no-unused-vars
                 shopId = record.shopId, shopName = record.shopName, _shopList = record.shopList, other = _objectWithoutProperties(record, _excluded);
-                newValue = _objectSpread(_objectSpread({}, other), values);
+                newShopId = values.shopId, valueOhter = _objectWithoutProperties(values, _excluded2);
+                newValue = _objectSpread(_objectSpread({}, other), valueOhter);
               } else {
                 newValue = _objectSpread(_objectSpread(_objectSpread({}, values), shopInfo), {}, {
                   buyerOpenUid: record.buyerOpenUid
@@ -276,6 +280,15 @@ function ModifyModal(props) {
     setLoad(true);
     handleOk();
   };
+  var handleChangeShopId = function handleChangeShopId(val) {
+    var _shopList$find3;
+    setShopInfo({
+      shopId: val,
+      shopName: (_shopList$find3 = shopList.find(function (item) {
+        return item.shopId == val;
+      })) === null || _shopList$find3 === void 0 ? void 0 : _shopList$find3.shopName
+    });
+  };
   return /*#__PURE__*/React.createElement(Drawer, {
     closeIcon: /*#__PURE__*/React.createElement(LeftOutlined, null),
     open: visible,
@@ -306,7 +319,12 @@ function ModifyModal(props) {
     wrapperCol: {
       span: 18
     }
-  }, /*#__PURE__*/React.createElement(Form.Item, {
+  }, platformInfo.platform === PlatForm.WEB && /*#__PURE__*/React.createElement(ShopName, {
+    shopList: shopList,
+    handleChangeShopId: handleChangeShopId,
+    disabled: type === 'edit',
+    hidden: false
+  }), /*#__PURE__*/React.createElement(Form.Item, {
     label: "\u6253\u6B3E\u91D1\u989D",
     name: "workPayFee",
     rules: [{

package/dist/esm/WorkOrder/components/PaymentWorkOrderList/index.js CHANGED Viewed

@@ -201,7 +201,7 @@ var PaymentWorkOrderList = function PaymentWorkOrderList(_ref) {
     style: {
       marginLeft: 16
     }
-  }, "\u91CD\u7F6E")), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(Checkbox, {
+  }, "\u91CD\u7F6E")), /*#__PURE__*/React.createElement("span", null, platform !== PlatForm.WEB && /*#__PURE__*/React.createElement(Checkbox, {
     className: "custom_box_search_buyer",
     checked: paySearch.isBuyer,
     onChange: function onChange(e) {

package/dist/esm/WorkOrder/components/WorkOrderList/index.d.ts CHANGED Viewed

@@ -2,7 +2,8 @@ import React from 'react';
 import './index.less';
 declare type OrderListProps = {
     tabActive: string;
+    deleteHeight?: number;
     onOpenWangWang?: (nick: string, id: string) => void;
 };
-declare const CustomizeWorkOrderList: ({ tabActive, onOpenWangWang }: OrderListProps) => React.JSX.Element;
+declare const CustomizeWorkOrderList: ({ tabActive, onOpenWangWang, deleteHeight }: OrderListProps) => React.JSX.Element;
 export default CustomizeWorkOrderList;

package/dist/esm/WorkOrder/components/WorkOrderList/index.js CHANGED Viewed

@@ -84,7 +84,8 @@ var getTableData = function getTableData(_ref) {
     return queryAllWorkOrderList('/qy/flow/queryFlowWorkOrders', _objectSpread(_objectSpread({}, params), {}, {
       pageSize: pageSize,
       pageNo: pageNo,
-      onlyWaitForMe: onlyWaitForMe
+      onlyWaitForMe: onlyWaitForMe,
+      needFilterShopByPermission: true
     })).then(function (res) {
       var _res$data, _res$data2;
       return {
@@ -125,9 +126,10 @@ var FlowOrderList = function FlowOrderList(props) {
 };
 //工单列表
 var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
-  var _nodesData$data, _nodesData$data$workO;
+  var _nodesData$data, _nodesData$data$workO, _listRef$current2;
   var tabActive = _ref4.tabActive,
-    onOpenWangWang = _ref4.onOpenWangWang;
+    onOpenWangWang = _ref4.onOpenWangWang,
+    deleteHeight = _ref4.deleteHeight;
   var dispatch = useAppDispatch();
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -284,8 +286,8 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
   var height = useMemo(function () {
     var _listRef$current;
     var wHeight = window.innerHeight;
-    return wHeight - 40 - (platform !== PlatForm.TB ? (listRef === null || listRef === void 0 ? void 0 : (_listRef$current = listRef.current) === null || _listRef$current === void 0 ? void 0 : _listRef$current.clientHeight) || 0 : 0) - 54 - 83 - (open ? 191 : platform !== PlatForm.TB || isTbZnkf ? 111 : 51) - 8 - (platform === PlatForm.FXG ? 128 : 0);
-  }, [open, flowTemplateGroupWorkOrderTemplateList]);
+    return wHeight - 40 - (platform !== PlatForm.TB ? (listRef === null || listRef === void 0 ? void 0 : (_listRef$current = listRef.current) === null || _listRef$current === void 0 ? void 0 : _listRef$current.clientHeight) || 78 : 0) - 54 - 83 - (open ? 191 : platform !== PlatForm.TB ? 111 : 51) - (platform === PlatForm.FXG ? 128 : 0) - (deleteHeight ? deleteHeight : 0);
+  }, [open, listRef === null || listRef === void 0 ? void 0 : (_listRef$current2 = listRef.current) === null || _listRef$current2 === void 0 ? void 0 : _listRef$current2.clientHeight]);
   var searchHandle = function searchHandle() {
     var templateList = form.getFieldValue('templateIdList');
     if (templateList && templateList.length) {
@@ -314,7 +316,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
     className: "custom-search"
   }, /*#__PURE__*/React.createElement(Row, {
     justify: "space-between"
-  }, /*#__PURE__*/React.createElement(Col, null, /*#__PURE__*/React.createElement(Checkbox, {
+  }, /*#__PURE__*/React.createElement(Col, null, platform !== PlatForm.WEB && /*#__PURE__*/React.createElement(Checkbox, {
     className: "custom_box_search_buyer",
     checked: currentBuyerChecked,
     onChange: function onChange(e) {

package/dist/esm/WorkOrder/index.js CHANGED Viewed

@@ -22,7 +22,7 @@ import { fetchQueryCurrentCompanyUser } from "../model/workOrder";
 import { fetchLogicFlowList } from "../model/logicFlow";
 import { setCurrentBuyerChecked, showPayment } from "../model/customizeWorkOrder";
 import store from "../model/store";
-import { fetchxzLogOut } from "../model/login";
+import { fetchLogOut, fetchxzLogOut } from "../model/login";
 import { Global } from '@kmkf-fe-packages/services-components';
 import moment from 'moment';
 import { LogoutOutlined } from '@ant-design/icons';
@@ -187,38 +187,35 @@ var WorkOrder = function WorkOrder(props) {
     var loginOutHandle = function loginOutHandle() {
       setVisible(false);
       Modal.confirm({
-        content: '确定要退出登录吗？退出登录后将与当前平台账号解绑',
+        content: "\u786E\u5B9A\u8981\u9000\u51FA\u767B\u5F55\u5417\uFF1F".concat(platform === PlatForm.XIAOZHI ? '退出登录后将与当前平台账号解绑' : ''),
         okText: '确认',
         cancelText: '取消',
         onOk: function onOk() {
           var parsed = getHashParams();
-          // if (platform === PlatForm.XIAOZHI) {
-          dispatch(fetchxzLogOut({
-            thirdUserId: parsed === null || parsed === void 0 ? void 0 : parsed.thirdUserId,
-            platform: parsed === null || parsed === void 0 ? void 0 : parsed.platform,
-            taobaoNick: parsed === null || parsed === void 0 ? void 0 : parsed.taobaoNick,
-            subUserNick: parsed === null || parsed === void 0 ? void 0 : parsed.subUserNick
-          })).unwrap().then(function (res) {
-            var success = res.success;
-            if (success) {
-              console.log('xzlogOut3');
-              onEmpowerCallback === null || onEmpowerCallback === void 0 ? void 0 : onEmpowerCallback();
-            }
-          });
-          // } else {
-          // dispatch(fetchLogOut())
-          //   .unwrap()
-          //   .then((res: { success: boolean }) => {
-          //     const { success } = res;
-          //     if (success) {
-          //       onEmpowerCallback?.();
-          //     }
-          //   });
-          // }
+          if (platform === PlatForm.XIAOZHI) {
+            dispatch(fetchxzLogOut({
+              thirdUserId: parsed === null || parsed === void 0 ? void 0 : parsed.thirdUserId,
+              platform: parsed === null || parsed === void 0 ? void 0 : parsed.platform,
+              taobaoNick: parsed === null || parsed === void 0 ? void 0 : parsed.taobaoNick,
+              subUserNick: parsed === null || parsed === void 0 ? void 0 : parsed.subUserNick
+            })).unwrap().then(function (res) {
+              var success = res.success;
+              if (success) {
+                console.log('xzlogOut3');
+                onEmpowerCallback === null || onEmpowerCallback === void 0 ? void 0 : onEmpowerCallback();
+              }
+            });
+          } else {
+            dispatch(fetchLogOut()).unwrap().then(function (res) {
+              var success = res.success;
+              if (success) {
+                onEmpowerCallback === null || onEmpowerCallback === void 0 ? void 0 : onEmpowerCallback();
+              }
+            });
+          }
         }
       });
     };
     return /*#__PURE__*/React.createElement("div", {
       className: "userInfo"
     }, /*#__PURE__*/React.createElement("div", {
@@ -268,7 +265,7 @@ var WorkOrder = function WorkOrder(props) {
     style: {
       marginBottom: '8px'
     }
-  }), platform === PlatForm.XIAOZHI ? /*#__PURE__*/React.createElement(Popover, {
+  }), [PlatForm.XIAOZHI, PlatForm.WEB].includes(platform) ? /*#__PURE__*/React.createElement(Popover, {
     placement: "bottomRight",
     trigger: "click",
     visible: visible,
@@ -278,13 +275,14 @@ var WorkOrder = function WorkOrder(props) {
     src: avatarImg
   })) : null), /*#__PURE__*/React.createElement(OrderList, {
     tabActive: tabActive,
+    deleteHeight: (otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.deleteHeight) || 0,
     onOpenWangWang: onOpenWangWang
   }), /*#__PURE__*/React.createElement(PaymentWorkOrderList, {
     tabActive: tabActive,
     onOpenWangWang: onOpenWangWang
   }), tabActive === 'wdt' && /*#__PURE__*/React.createElement(WdtTradeList, {
     version: ((_companyUserConfig2 = companyUserConfig) === null || _companyUserConfig2 === void 0 ? void 0 : (_companyUserConfig2$p = _companyUserConfig2.plugins) === null || _companyUserConfig2$p === void 0 ? void 0 : (_companyUserConfig2$p2 = _companyUserConfig2$p.wdt) === null || _companyUserConfig2$p2 === void 0 ? void 0 : _companyUserConfig2$p2.version) || ''
-  }))), !isEmpower && Reminder({
+  }))), !isEmpower && platform !== PlatForm.WEB && Reminder({
     callback: onEmpowerCallback
   }));
 };

package/dist/esm/WorkOrder/types.d.ts CHANGED Viewed

@@ -5,6 +5,7 @@ export declare enum PlatForm {
     PDD = "pdd",
     JD = "jd",
     XIAOZHI = "xiaozhi",
+    WEB = "web",
     PC = "pc"
 }
 export declare type StatusType = 'WAITING' | 'HANDLING' | 'STOPPING' | 'COMPLETED';

package/dist/esm/WorkOrder/types.js CHANGED Viewed

@@ -6,5 +6,6 @@ export var PlatForm;
   PlatForm["PDD"] = "pdd";
   PlatForm["JD"] = "jd";
   PlatForm["XIAOZHI"] = "xiaozhi";
+  PlatForm["WEB"] = "web";
   PlatForm["PC"] = "pc";
 })(PlatForm || (PlatForm = {}));

package/dist/esm/common/utils/constant.d.ts CHANGED Viewed

@@ -10,3 +10,4 @@ export declare const SUBMIT_COMPONENT_GOODS_MAP: any;
 export declare const SUBMIT_COMPONENT_REISSUE_MAP: any;
 export declare const SUBMIT_COMPONENT_RETURN_GOODS_MAP: Record<string, Record<string, string>>;
 export declare const SUBMIT_COMPONENT_SYSTEM_ORDER_MAP: any;
+export declare const platformMap: any;

package/dist/esm/common/utils/constant.js CHANGED Viewed

@@ -350,4 +350,14 @@ export var SUBMIT_COMPONENT_SYSTEM_ORDER_MAP = {
     order: 'jstSystemShowOrder',
     select: 'oId'
   }
+};
+export var platformMap = {
+  tb: '淘宝',
+  fxg: '抖音',
+  ks: '快手',
+  pdd: '拼多多',
+  jd: '京东',
+  xiaozhi: '小智',
+  pc: '客服工作台',
+  web: '网页端'
 };

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

@@ -60,7 +60,6 @@ export declare const getReplaceWarnValues: (templateDetail: {
 export declare const HasFilterHandle: (templateDetail: any, filterList: string[]) => any;
 export declare const HasErpItemSelectHandle: (templateDetail?: any) => any;
 export declare const HasTradeSigningDatetime: (templateDetail?: any) => any;
-export declare const platformMap: any;
 declare type SubmitParams = {
     update: boolean;
     formData: Record<string, any>;

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

@@ -30,6 +30,7 @@ import xzSDK from "./xzSDK";
 import { pushGyLog } from '@kmkf-fe-packages/kmkf-utils';
 import { servers } from '@kmkf-fe-packages/kmkf-utils';
 import { orderBackMap } from "./tools_constants";
+import { platformMap } from "./constant";
 // 淘宝商品组件信息处理
@@ -145,7 +146,7 @@ export var orderBack = /*#__PURE__*/function () {
           order_no = _ref.order_no, form = _ref.form, propsShopid = _ref.shopId, shopList = _ref.shopList, templateDetail = _ref.templateDetail, _ref$type = _ref.type, type = _ref$type === void 0 ? 'add' : _ref$type, callback = _ref.callback, fromQNCreateWorkOrderByOrderNo = _ref.fromQNCreateWorkOrderByOrderNo, _ref$plat = _ref.plat, plat = _ref$plat === void 0 ? {} : _ref$plat, callbackShopId = _ref.callbackShopId, setLoading = _ref.setLoading, callKey = _ref.callKey;
           console.log('orderBack-run--', callKey);
           shopId = propsShopid; //如果是pc平台且没有shopId的情况下 获取shopId
-          if (!(order_no && plat.platform === PlatForm.PC && !!(plat !== null && plat !== void 0 && plat.bindERP) && type === 'add')) {
+          if (!(order_no && [PlatForm.PC, PlatForm.WEB].includes(plat.platform) && !!(plat !== null && plat !== void 0 && plat.bindERP) && type === 'add')) {
             _context.next = 18;
             break;
           }
@@ -321,16 +322,21 @@ export var orderBack = /*#__PURE__*/function () {
           bsInfo = bsOrders && bsOrderTransform({
             detail: bsOrders || {}
           });
-          wlnInfo = wlnOrders && wlnOrderTransform(wlnOrders || {});
+          wlnInfo = wlnOrders && wlnOrderTransform(_objectSpread(_objectSpread({}, wlnOrders), {}, {
+            allOrders: wlnOrders.orders
+          }));
           bsE3Info = bsE3Orders && bsE3OrderTransform(_objectSpread(_objectSpread({}, bsE3Orders), {}, {
             componentList: templateDetail.componentDtoList,
-            orderNo: order_no
+            orderNo: order_no,
+            allOrders: bsE3Orders === null || bsE3Orders === void 0 ? void 0 : bsE3Orders.orderList
           }), form);
           wdtInfo = wdtOrders && wdtOrderTransform(_objectSpread(_objectSpread({}, wdtOrders), {}, {
             componentList: templateDetail.componentDtoList,
-            orderNo: order_no
+            orderNo: order_no,
+            allOrders: (wdtOrders === null || wdtOrders === void 0 ? void 0 : wdtOrders.trades) || []
           }), form);
           kmInfo = kmOrders && kmOrderTransform(_objectSpread(_objectSpread({}, kmOrders), {}, {
+            allOrders: (kmOrders === null || kmOrders === void 0 ? void 0 : kmOrders.orderDetailDtoList) || (kmOrders === null || kmOrders === void 0 ? void 0 : kmOrders.trades),
             order_no: order_no,
             componentList: templateDetail.componentDtoList
           }), form);
@@ -338,13 +344,15 @@ export var orderBack = /*#__PURE__*/function () {
             kmInfo.kmVideo = kmVideoOrder === null || kmVideoOrder === void 0 ? void 0 : kmVideoOrder.value;
           }
           gyInfo = gyOrders && gyOrderTransform(_objectSpread(_objectSpread({}, gyOrders), {}, {
+            allOrders: gyOrders === null || gyOrders === void 0 ? void 0 : gyOrders.trades,
             componentList: templateDetail.componentDtoList,
             orderNo: order_no
           }), form);
           pushGyLog('gyInfo', gyInfo);
           jstInfo = jstOrders && jstOrderTransform(_objectSpread(_objectSpread({}, jstOrders), {}, {
             componentList: templateDetail.componentDtoList,
-            orderNo: order_no
+            orderNo: order_no,
+            allOrders: (jstOrders === null || jstOrders === void 0 ? void 0 : jstOrders.orderList) || []
           }), form);
           if ((bsOrders === null || bsOrders === void 0 ? void 0 : (_bsOrders$orders = bsOrders.orders) === null || _bsOrders$orders === void 0 ? void 0 : _bsOrders$orders.length) > 1) {
             bsInfo.bsGoods = _objectSpread(_objectSpread({}, bsInfo.bsGoods), {}, {
@@ -364,7 +372,8 @@ export var orderBack = /*#__PURE__*/function () {
           }
           if ((bsE3Orders === null || bsE3Orders === void 0 ? void 0 : (_bsE3Orders$orderList = bsE3Orders.orderList) === null || _bsE3Orders$orderList === void 0 ? void 0 : _bsE3Orders$orderList.length) > 1) {
             bsE3Info.bsE3Goods = _objectSpread(_objectSpread({}, bsE3Info.bsE3Goods), {}, {
-              bsE3Goods: []
+              bsE3Goods: [],
+              orders: []
             });
             // bsInfo.bsLogistics = [{ logisticsCompany: null, logisticsCode: '' }];
             // bsInfo.bsSendGood = [{ sendId: '', sendName: '' }];
@@ -738,15 +747,6 @@ export var HasTradeSigningDatetime = function HasTradeSigningDatetime() {
     return ['TRADE_SIGNING_DATETIME'].includes(item.workOrderComponentType);
   });
 };
-export var platformMap = {
-  tb: '淘宝',
-  fxg: '抖音',
-  ks: '快手',
-  pdd: '拼多多',
-  jd: '京东',
-  xiaozhi: '小智',
-  pc: '客服工作台'
-};
 export var submitParams = function submitParams(_ref4) {
   var _currentNodeDetail$no;
   var update = _ref4.update,
@@ -1051,7 +1051,8 @@ export var bsE3SystemOrderBackValues = function bsE3SystemOrderBackValues(_ref7)
   var orderInfo = bsE3OrderTransform({
     orderList: value.selectedRows,
     componentList: templateList.componentDtoList,
-    orderNo: orderNo
+    orderNo: orderNo,
+    allOrders: (value === null || value === void 0 ? void 0 : value.orders) || []
   }, form);
   var values = bsE3OrderBackFormValues(orderInfo, {
     componentDtoList: bsE3GoodsComponent
@@ -1074,7 +1075,8 @@ export var wlnSystemOrderBackValues = function wlnSystemOrderBackValues(_ref8) {
   var wlnGoodsValue = form.getFieldValue(bsGoodsComponent[0].uniqueKey);
   var orderInfo = wlnOrderTransform({
     orders: value.selectedRows,
-    shopCode: wlnGoodsValue.shopCode
+    shopCode: wlnGoodsValue.shopCode,
+    allOrders: value === null || value === void 0 ? void 0 : value.orders
   });
   var values = wlnOrderBackFormValues(orderInfo, {
     componentDtoList: bsGoodsComponent
@@ -1101,7 +1103,8 @@ export var kmSystemOrderBackValues = function kmSystemOrderBackValues(_ref9) {
   var orderInfo = kmOrderTransform({
     trades: value.selectedRows,
     componentList: templateList.componentDtoList,
-    orderNo: orderNo
+    orderNo: orderNo,
+    allOrders: value.orders
   }, form);
   var values = kmOrderBackFormValues(orderInfo, {
     componentDtoList: kmGoodsComponent
@@ -1133,7 +1136,8 @@ export var wdtSystemOrderBackValues = function wdtSystemOrderBackValues(_ref10)
     trades: value.selectedRows,
     shopCode: wdtGoodsValue.shopCode,
     componentList: templateList.componentDtoList,
-    orderNo: orderNo
+    orderNo: orderNo,
+    allOrders: (value === null || value === void 0 ? void 0 : value.orders) || []
   }, form);
   var values = wdtOrderBackFormValues(orderInfo, {
     componentDtoList: wdtGoodsComponent
@@ -1160,7 +1164,8 @@ export var gySystemOrderBackValues = function gySystemOrderBackValues(_ref11) {
   var orderInfo = gyOrderTransform({
     trades: value.selectedRows,
     componentList: templateList.componentDtoList,
-    orderNo: orderNo
+    orderNo: orderNo,
+    allOrders: value.orders
   }, form);
   var values = gyOrderBackFormValues(orderInfo, {
     componentDtoList: gyGoodsComponent
@@ -1187,7 +1192,8 @@ export var jstSystemOrderBackValues = function jstSystemOrderBackValues(_ref12)
   var orderInfo = jstOrderTransform({
     orderList: value.selectedRows,
     componentList: templateList.componentDtoList,
-    orderNo: orderNo
+    orderNo: orderNo,
+    allOrders: value.orders || []
   }, form);
   var values = jstOrderBackFormValues(orderInfo, {
     componentDtoList: jstGoodsComponent

package/dist/esm/common/utils/transformWorkOrderData.js CHANGED Viewed

@@ -839,12 +839,22 @@ var processErpTradeId = function processErpTradeId(getValue) {
     return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(SYSTEM_ORDER_MAP[nex.workOrderComponentType].key)), SYSTEM_ORDER_MAP[nex.workOrderComponentType].defaultValue));
   };
 };
-var processWlnGoods = function processWlnGoods(getValue) {
-  return function (nex, config) {
-    return _defineProperty({}, nex.uniqueKey, {
-      wlnGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_wlnGoods")), []),
-      shopCode: getValue("".concat(nex.uniqueKey, "_shopCode"))
-    });
+var processWlnGoods = function processWlnGoods(templateColumns) {
+  return function (getValue) {
+    return function (nex, config) {
+      var orderNo = '';
+      var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
+        return col.workOrderComponentType === 'TRADE_ID_INPUT';
+      });
+      if (tradeId) {
+        orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
+      }
+      return _defineProperty({}, nex.uniqueKey, {
+        wlnGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_wlnGoods")), []),
+        shopCode: getValue("".concat(nex.uniqueKey, "_shopCode")),
+        orderNo: orderNo
+      });
+    };
   };
 };
 var processWdtReissueGoods = function processWdtReissueGoods(templateColumns) {
@@ -1148,7 +1158,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       REISSUE_TRADE_ID: processErpTradeId,
       ERP_AFTER_SALE_TRADE_ID: processErpTradeId,
       EXCHANGE_TRADE_ID: processErpTradeId,
-      WLN_GOODS: processWlnGoods,
+      WLN_GOODS: processWlnGoods(templateColumns),
       WDT_REISSUE_GOODS: processWdtReissueGoods(templateColumns),
       GY_REISSUE_GOODS: processGyReissueGoods(templateColumns),
       GY_RETURN_GOODS: processGyReturnGoods(templateColumns),

package/dist/esm/model/flowTemplateDetail/types.d.ts CHANGED Viewed

@@ -5,6 +5,7 @@ export interface Line {
     operator: string;
     nodeIsAuto: boolean;
     operateType: string;
+    eventNodeType: string;
 }
 export interface Assistant {
     id: string;
@@ -798,6 +799,7 @@ export interface QyFlowPanelInfoResponse {
         };
         flowEventData?: {
             eventStatus: 0 | 1 | 2 | 4;
+            eventType: string;
             eventData?: {
                 businessStatus?: Array<{
                     businessKey: string;
@@ -890,6 +892,7 @@ export declare enum PlatForm {
     PDD = "pdd",
     JD = "jd",
     XIAOZHI = "xiaozhi",
+    WEB = "web",
     PC = "pc"
 }
 export declare enum NodeStatus {
@@ -1588,5 +1591,6 @@ export interface QueryNodeDetailResponse {
                 }>;
             };
         };
+        eventType: string;
     };
 }

package/dist/esm/model/flowTemplateDetail/types.js CHANGED Viewed

@@ -23,6 +23,7 @@ export var PlatForm;
   PlatForm["PDD"] = "pdd";
   PlatForm["JD"] = "jd";
   PlatForm["XIAOZHI"] = "xiaozhi";
+  PlatForm["WEB"] = "web";
   PlatForm["PC"] = "pc";
 })(PlatForm || (PlatForm = {}));
 export var NodeStatus;

package/package.json CHANGED Viewed

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