@kmkf-fe-packages/kmkf-work-order-service-component 2.2.26 → 2.2.28

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 (22) hide show
  1. package/dist/esm/FlowTemplateDetailV2/common.d.ts +4 -2
  2. package/dist/esm/FlowTemplateDetailV2/common.js +21 -5
  3. package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.d.ts +1 -0
  4. package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.js +24 -21
  5. package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js +11 -18
  6. package/dist/esm/FlowTemplateDetailV2/components/FormRender/onBlur.d.ts +2 -2
  7. package/dist/esm/FlowTemplateDetailV2/components/FormRender/onBlur.js +34 -17
  8. package/dist/esm/FlowTemplateDetailV2/components/Item/index.d.ts +1 -0
  9. package/dist/esm/FlowTemplateDetailV2/components/Item/index.js +53 -29
  10. package/dist/esm/FlowTemplateDetailV2/index.js +20 -15
  11. package/dist/esm/FlowTemplateDetailV2/store/reducers.d.ts +6 -0
  12. package/dist/esm/FlowTemplateDetailV2/store/reducers.js +106 -81
  13. package/dist/esm/FlowTemplateDetailV2/store/selector.d.ts +3 -0
  14. package/dist/esm/FlowTemplateDetailV2/store/selector.js +3 -0
  15. package/dist/esm/WorkOrder/components/WorkOrderList/index.js +5 -1
  16. package/dist/esm/common/utils/transformWorkOrderData.js +5 -0
  17. package/dist/esm/model/flowTemplateDetail/api.d.ts +3 -0
  18. package/dist/esm/model/flowTemplateDetail/api.js +7 -0
  19. package/dist/esm/model/flowTemplateDetail/types.d.ts +3 -0
  20. package/dist/esm/model/servers/api.d.ts +1 -0
  21. package/dist/esm/model/servers/api.js +17 -1
  22. package/package.json +5 -5
package/dist/esm/FlowTemplateDetailV2/common.d.ts CHANGED
@@ -18,13 +18,15 @@ export declare const verifyHandle: (data: any, componentDtoList: Array<any>) =>
18
18
  success: boolean;
19
19
  message: string;
20
20
  };
21
- export declare const currentUserHasOperatorAuth: ({ currentUserKey, staffIds, operateDataPermission, handlerList, isAllStaff, assistantList, }: {
21
+ export declare const currentUserHasOperatorAuth: ({ isSuperAdmin, currentUserKey, staffIds, operateDataPermission, handlerList, isAllStaff, assistantList, userGroupList, }: {
22
+ isSuperAdmin?: boolean | undefined;
22
23
  currentUserKey: string;
23
24
  staffIds: Array<string>;
24
- operateDataPermission: 'HANDLE_DISTRIBUTE' | 'HANDLE_ALL';
25
+ operateDataPermission: 'HANDLE_DISTRIBUTE' | 'HANDLE_ALL' | 'ONLY_THE_SAME_USER_GROUP';
25
26
  handlerList: Array<{
26
27
  userKey: string;
27
28
  }>;
28
29
  isAllStaff: boolean;
29
30
  assistantList: Array<Assistant>;
31
+ userGroupList: Array<string>;
30
32
  }) => boolean;
package/dist/esm/FlowTemplateDetailV2/common.js CHANGED
@@ -1,4 +1,5 @@
1
1
  import { NodeType } from "../model/flowTemplateDetail/types";
2
+ import { intersection } from 'lodash';
2
3
  export var getTag = function getTag(item) {
3
4
  var tag = 'artificial'; // 人工节点
4
5
  // 先判断是什么节点类型 步骤/判断
@@ -58,21 +59,26 @@ export var verifyHandle = function verifyHandle(data, componentDtoList) {
58
59
  return res;
59
60
  };
60
61
  export var currentUserHasOperatorAuth = function currentUserHasOperatorAuth(_ref) {
61
- var currentUserKey = _ref.currentUserKey,
62
+ var _ref$isSuperAdmin = _ref.isSuperAdmin,
63
+ isSuperAdmin = _ref$isSuperAdmin === void 0 ? false : _ref$isSuperAdmin,
64
+ currentUserKey = _ref.currentUserKey,
62
65
  staffIds = _ref.staffIds,
63
66
  operateDataPermission = _ref.operateDataPermission,
64
67
  handlerList = _ref.handlerList,
65
68
  isAllStaff = _ref.isAllStaff,
66
- assistantList = _ref.assistantList;
67
- // 节点配置为组操作
68
- var groupCanOperate = operateDataPermission === 'HANDLE_ALL';
69
+ assistantList = _ref.assistantList,
70
+ _ref$userGroupList = _ref.userGroupList,
71
+ userGroupList = _ref$userGroupList === void 0 ? [] : _ref$userGroupList;
72
+ if (isSuperAdmin) {
73
+ return true;
74
+ }
69
75
  // handlerList为空数组是没有处理人，都可以处理
70
76
  if (Array.isArray(handlerList) && (handlerList === null || handlerList === void 0 ? void 0 : handlerList.length) === 0) {
71
77
  return true;
72
78
  }
73
79
 
74
80
  // 可以处理所有任务
75
- if (groupCanOperate) {
81
+ if (operateDataPermission === 'HANDLE_ALL') {
76
82
  // 判断是否是预备客服
77
83
  return isAllStaff || ( // 全部
78
84
  staffIds === null || staffIds === void 0 ? void 0 : staffIds.includes(currentUserKey)) ||
@@ -82,6 +88,16 @@ export var currentUserHasOperatorAuth = function currentUserHasOperatorAuth(_ref
82
88
  }) // 人在groups中
83
89
  ;
84
90
  }
91
+ //仅可处理同用户组的工单
92
+ if (operateDataPermission === 'ONLY_THE_SAME_USER_GROUP') {
93
+ //判断组用户中是否包含处理人 || 判断处理人是否是自己
94
+ var handlerKeys = handlerList === null || handlerList === void 0 ? void 0 : handlerList.map(function (item) {
95
+ return item.userKey;
96
+ });
97
+ return intersection(userGroupList, handlerKeys).length !== 0 || !!(handlerList !== null && handlerList !== void 0 && handlerList.find(function (item) {
98
+ return item.userKey === currentUserKey;
99
+ }));
100
+ }
85
101
 
86
102
  // 只能处理分配到自己的任务
87
103
  // 判断处理人是否是自己
package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.d.ts CHANGED
@@ -13,6 +13,7 @@ declare type CurrentNodeProps = {
13
13
  flowWorkOrderId?: string;
14
14
  queryRemarkList: () => void;
15
15
  autoSubmit?: boolean;
16
+ isSuperAdmin?: boolean;
16
17
  };
17
18
  declare const _default: React.ForwardRefExoticComponent<CurrentNodeProps & React.RefAttributes<unknown>>;
18
19
  export default _default;
package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.js CHANGED
@@ -31,7 +31,7 @@ import { getTag, currentUserHasOperatorAuth } from "../../common";
31
31
  import styles from "./index.module.less";
32
32
  import { PlatForm } from "../../../WorkOrder/types";
33
33
  import { useSignal } from "../../../hooks/useSignal";
34
- import { selectCurrentNodeDetail, selectTid, selectPlatInfo, selectFlowStatus, selectOperateParams, selectCurrentFlowAllShowHideRules, selectNodeAssistantMap } from "../../store/selector";
34
+ import { selectCurrentNodeDetail, selectTid, selectPlatInfo, selectFlowStatus, selectOperateParams, selectCurrentFlowAllShowHideRules, selectNodeAssistantMap, selectNodeUserGroupMap } from "../../store/selector";
35
35
  import { fetchCurrentTradeIdLinkWorkOrder, fetchPanelInfo } from "../../store/reducers";
36
36
  import { useSelector } from "../../context/useSelector";
37
37
  import { Context } from "../../context";
@@ -41,7 +41,7 @@ var formProps = {
41
41
  layout: 'vertical'
42
42
  };
43
43
  var CurrentNode = function CurrentNode(props, ref) {
44
- 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, _currentNodeDetail$no22, _currentNodeDetail$wo23;
44
+ var _currentNodeDetail$no, _currentNodeDetail$no2, _currentNodeDetail$no3, _currentNodeDetail$no4, _currentNodeDetail$no18, _currentNodeDetail$fl, _currentNodeDetail$wo12, _localStorage, _currentNodeDetail$wo13, _currentNodeDetail$wo14, _currentNodeDetail$wo15, _currentNodeDetail$wo16, _currentNodeDetail$wo17, _currentNodeDetail$wo18, _currentNodeDetail$wo19, _currentNodeDetail$wo20, _currentNodeDetail$wo21, _currentNodeDetail$no21, _currentNodeDetail$no22, _currentNodeDetail$no23, _currentNodeDetail$wo22, _currentNodeDetail$no24, _currentNodeDetail$wo23;
45
45
  var formRenderRef = useRef(null);
46
46
  useImperativeHandle(ref, function () {
47
47
  return {
@@ -88,6 +88,7 @@ var CurrentNode = function CurrentNode(props, ref) {
88
88
  var operateParams = useSelector(selectOperateParams);
89
89
  var allShowHideRules = useSelector(selectCurrentFlowAllShowHideRules);
90
90
  var assistantMap = useSelector(selectNodeAssistantMap);
91
+ var useGroupMap = useSelector(selectNodeUserGroupMap);
91
92
  var tradeKey = useMemo(function () {
92
93
  var _currentNodeDetail$wo, _currentNodeDetail$wo2, _currentNodeDetail$wo3, _currentNodeDetail$wo4;
93
94
  var tradeConfig = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo === void 0 ? void 0 : (_currentNodeDetail$wo2 = _currentNodeDetail$wo.componentDtoList) === null || _currentNodeDetail$wo2 === void 0 ? void 0 : _currentNodeDetail$wo2.find(function (item) {
@@ -102,20 +103,22 @@ var CurrentNode = function CurrentNode(props, ref) {
102
103
 
103
104
  // 是否是当前节点处理人
104
105
  var isCurrentNodeHandler = useMemo(function () {
105
- var _currentNodeDetail$no5, _currentNodeDetail$no6, _currentNodeDetail$no7, _currentNodeDetail$no8, _currentNodeDetail$no9, _currentNodeDetail$no10, _currentNodeDetail$wo5, _currentNodeDetail$no11, _currentNodeDetail$no12;
106
+ var _currentNodeDetail$no5, _currentNodeDetail$no6, _currentNodeDetail$no7, _currentNodeDetail$no8, _currentNodeDetail$no9, _currentNodeDetail$no10, _currentNodeDetail$no11, _currentNodeDetail$no12, _currentNodeDetail$wo5, _currentNodeDetail$no13, _currentNodeDetail$no14;
106
107
  return currentUserHasOperatorAuth({
108
+ isSuperAdmin: props === null || props === void 0 ? void 0 : props.isSuperAdmin,
107
109
  assistantList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no5 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no5 === void 0 ? void 0 : _currentNodeDetail$no5.id) && assistantMap[currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no6 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no6 === void 0 ? void 0 : _currentNodeDetail$no6.id] || [],
110
+ userGroupList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no7 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no7 === void 0 ? void 0 : _currentNodeDetail$no7.id) && useGroupMap[currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no8 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no8 === void 0 ? void 0 : _currentNodeDetail$no8.id] || [],
108
111
  currentUserKey: plat.userKey,
109
- staffIds: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no7 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no7 === void 0 ? void 0 : (_currentNodeDetail$no8 = _currentNodeDetail$no7.assistants) === null || _currentNodeDetail$no8 === void 0 ? void 0 : _currentNodeDetail$no8.staffIds) || [],
110
- operateDataPermission: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no9 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no9 === void 0 ? void 0 : (_currentNodeDetail$no10 = _currentNodeDetail$no9.assistants) === null || _currentNodeDetail$no10 === void 0 ? void 0 : _currentNodeDetail$no10.operateDataPermission,
112
+ staffIds: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no9 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no9 === void 0 ? void 0 : (_currentNodeDetail$no10 = _currentNodeDetail$no9.assistants) === null || _currentNodeDetail$no10 === void 0 ? void 0 : _currentNodeDetail$no10.staffIds) || [],
113
+ operateDataPermission: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no11 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no11 === void 0 ? void 0 : (_currentNodeDetail$no12 = _currentNodeDetail$no11.assistants) === null || _currentNodeDetail$no12 === void 0 ? void 0 : _currentNodeDetail$no12.operateDataPermission,
111
114
  handlerList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo5 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo5 === void 0 ? void 0 : _currentNodeDetail$wo5.handlerList) || [],
112
- isAllStaff: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no11 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no11 === void 0 ? void 0 : (_currentNodeDetail$no12 = _currentNodeDetail$no11.assistants) === null || _currentNodeDetail$no12 === void 0 ? void 0 : _currentNodeDetail$no12.isAllStaff
115
+ isAllStaff: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no13 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no13 === void 0 ? void 0 : (_currentNodeDetail$no14 = _currentNodeDetail$no13.assistants) === null || _currentNodeDetail$no14 === void 0 ? void 0 : _currentNodeDetail$no14.isAllStaff
113
116
  });
114
117
  }, [currentNodeDetail, plat.userKey, assistantMap]);
115
118
  var handleChangeTradeId = useMemoizedFn(function (tid) {
116
- var _currentNodeDetail$no13;
119
+ var _currentNodeDetail$no15;
117
120
  // 非开始节点不进行订单重复校验逻辑
118
- if ((currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no13 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no13 === void 0 ? void 0 : _currentNodeDetail$no13.nodeType) !== NodeType.START_NODE) {
121
+ if ((currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no15 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no15 === void 0 ? void 0 : _currentNodeDetail$no15.nodeType) !== NodeType.START_NODE) {
119
122
  return;
120
123
  }
121
124
  if (!tid) {
@@ -128,10 +131,10 @@ var CurrentNode = function CurrentNode(props, ref) {
128
131
  }
129
132
  });
130
133
  } else {
131
- var _currentNodeDetail$no14;
134
+ var _currentNodeDetail$no16;
132
135
  // 查询当前订单号有多少的重复
133
136
  var params = {
134
- flowNodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no14 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no14 === void 0 ? void 0 : _currentNodeDetail$no14.id,
137
+ flowNodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no16 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no16 === void 0 ? void 0 : _currentNodeDetail$no16.id,
135
138
  flowTemplateKey: operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey,
136
139
  desensitizedFlag: false,
137
140
  pageNo: 1,
@@ -151,11 +154,11 @@ var CurrentNode = function CurrentNode(props, ref) {
151
154
  });
152
155
  // 当前节点是开始节点、并且携带订单号时，此时会进行订单重复提醒
153
156
  useEffect(function () {
154
- var _currentNodeDetail$no15;
155
- 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) {
157
+ var _currentNodeDetail$no17;
158
+ if (plat.orderNo && NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no17 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no17 === void 0 ? void 0 : _currentNodeDetail$no17.nodeType) && operateParams !== null && operateParams !== void 0 && operateParams.flowTemplateKey && tradeKey) {
156
159
  handleChangeTradeId(plat.orderNo);
157
160
  }
158
- }, [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]);
161
+ }, [plat.orderNo, operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey, currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no18 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no18 === void 0 ? void 0 : _currentNodeDetail$no18.nodeType, tradeKey]);
159
162
  var transData = useMemo(function () {
160
163
  if (flowStatus === FlowStatus.COMPLETED) {
161
164
  var _currentNodeDetail$wo6, _currentNodeDetail$wo7;
@@ -166,11 +169,11 @@ var CurrentNode = function CurrentNode(props, ref) {
166
169
  }
167
170
  }, [flowStatus, currentNodeDetail]);
168
171
  var handleWithdraw = function handleWithdraw() {
169
- var _currentNodeDetail$no17;
172
+ var _currentNodeDetail$no19;
170
173
  dispatch({
171
174
  type: 'setWithdrawWorkOrderDetail',
172
175
  payload: {
173
- nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no17 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no17 === void 0 ? void 0 : _currentNodeDetail$no17.id) || ''
176
+ nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no19 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no19 === void 0 ? void 0 : _currentNodeDetail$no19.id) || ''
174
177
  }
175
178
  });
176
179
  dispatch({
@@ -241,7 +244,7 @@ var CurrentNode = function CurrentNode(props, ref) {
241
244
  }();
242
245
  var handleRestartAutoTask = /*#__PURE__*/function () {
243
246
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
244
- var _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$no18;
247
+ var _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$no20;
245
248
  var _yield$restartAutoTas, success, _controllerRef$curren2;
246
249
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
247
250
  while (1) switch (_context2.prev = _context2.next) {
@@ -253,7 +256,7 @@ var CurrentNode = function CurrentNode(props, ref) {
253
256
  flowWorkOrderId: flowWorkOrderId,
254
257
  workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo10 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo10 === void 0 ? void 0 : _currentNodeDetail$wo10.id,
255
258
  workOrderUpdateTime: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo11 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo11 === void 0 ? void 0 : _currentNodeDetail$wo11.update,
256
- nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no18 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no18 === void 0 ? void 0 : _currentNodeDetail$no18.id) || ''
259
+ nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no20 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no20 === void 0 ? void 0 : _currentNodeDetail$no20.id) || ''
257
260
  })
258
261
  });
259
262
  case 2:
@@ -307,17 +310,17 @@ var CurrentNode = function CurrentNode(props, ref) {
307
310
  handleRestartAutoTask: handleRestartAutoTask,
308
311
  flowTemplateKey: (operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowTemplateKey) || '',
309
312
  flowWorkOrderId: flowWorkOrderId || '',
310
- nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no19 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no19 === void 0 ? void 0 : _currentNodeDetail$no19.id) || ''
313
+ nodeId: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no21 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no21 === void 0 ? void 0 : _currentNodeDetail$no21.id) || ''
311
314
  }), /*#__PURE__*/React.createElement("div", {
312
315
  className: styles.formRenderContainer
313
- }, [NodeType.START_NODE, NodeType.EXECUTE_NODE].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no20 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no20 === void 0 ? void 0 : _currentNodeDetail$no20.nodeType) && (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo) && (flowStatus === FlowStatus.COMPLETED && !editing ? /*#__PURE__*/React.createElement(RenderDetail, {
316
+ }, [NodeType.START_NODE, NodeType.EXECUTE_NODE].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no22 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no22 === void 0 ? void 0 : _currentNodeDetail$no22.nodeType) && (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo) && (flowStatus === FlowStatus.COMPLETED && !editing ? /*#__PURE__*/React.createElement(RenderDetail, {
314
317
  workOrderTemplateInfo: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
315
318
  transData: transData,
316
319
  platform: plat.platform,
317
320
  onOpenWangWang: onOpenWangWang
318
321
  }) : /*#__PURE__*/React.createElement(FormRender, {
319
322
  ref: formRenderRef,
320
- 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),
323
+ isShowShopList: NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no23 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no23 === void 0 ? void 0 : _currentNodeDetail$no23.nodeType) && [PlatForm.PC, PlatForm.WEB].includes(plat.platform),
321
324
  plat: plat,
322
325
  templateDetail: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
323
326
  shopList: shopList,
@@ -334,7 +337,7 @@ var CurrentNode = function CurrentNode(props, ref) {
334
337
  handleChangeTradeId: handleChangeTradeId,
335
338
  canModifyPayment: true,
336
339
  flowAllShowHideRules: allShowHideRules,
337
- isStartNodeWaiting: NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no22 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no22 === void 0 ? void 0 : _currentNodeDetail$no22.nodeType) && [NodeStatus.WAITING].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo23 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo23 === void 0 ? void 0 : _currentNodeDetail$wo23.flowStatus),
340
+ isStartNodeWaiting: NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no24 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no24 === void 0 ? void 0 : _currentNodeDetail$no24.nodeType) && [NodeStatus.WAITING].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo23 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo23 === void 0 ? void 0 : _currentNodeDetail$wo23.flowStatus),
338
341
  firstOrderBackfill: flowStatus !== FlowStatus.COMPLETED,
339
342
  autoSubmit: autoSubmit
340
343
  })), isShowAutoNodeDetail && /*#__PURE__*/React.createElement(AutoTaskDetail, {
package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js CHANGED
@@ -23,9 +23,9 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
23
23
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
24
24
  import React, { useState, useRef, useEffect, useMemo, forwardRef, useImperativeHandle, useContext } from 'react';
25
25
  import { ConfigProvider, Form, Space, Tag } from 'antd';
26
- import { useWhyDidYouUpdate } from 'ahooks';
26
+ import { useWhyDidYouUpdate, useDebounceFn } from 'ahooks';
27
27
  import zhCN from 'antd/es/locale/zh_CN';
28
- import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle, groupBy, find, isArray, debounce, isMatch, isEqual } from 'lodash';
28
+ import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle, groupBy, find, isArray, isMatch, isEqual } from 'lodash';
29
29
  import 'moment/locale/zh-cn';
30
30
  import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, EXCLUDE_REPLACE_TOP_COMPONENT,
31
31
  // 重复检验不需要展示在顶部的
@@ -377,8 +377,7 @@ var FormRender = function FormRender(props, ref) {
377
377
  enterprisePaymentTid: orderNo,
378
378
  enterprisePaymentAlipayNo: enterprisePaymentAlipayNo
379
379
  }, templateDetail);
380
- var formData = form.getFieldsValue(true);
381
- handleWatchFormValueChange(undefined, formData);
380
+ handleWatchFormValueChange();
382
381
  };
383
382
  useEffect(function () {
384
383
  if (labelComponent && !isNull(record)) {
@@ -988,11 +987,7 @@ var FormRender = function FormRender(props, ref) {
988
987
  componentOnBlur: componentOnBlur
989
988
  });
990
989
  case 8:
991
- if (!['SZF4ZGWZSNW6PYXMCIFEWBXT',
992
- //test 测马奔腾
993
- '6O47IBXFR26FJF4HUQ7WGO4H',
994
- //prod 陈健企业工单
995
- 'TR3E2FYXFZCFANVG6O6AALSM' //prod 斯凯奇
990
+ if (!['TR3E2FYXFZCFANVG6O6AALSM' //prod 斯凯奇
996
991
  ].includes(companyKey)) {
997
992
  _context6.next = 11;
998
993
  break;
@@ -1398,8 +1393,7 @@ var FormRender = function FormRender(props, ref) {
1398
1393
  if (currentTemplateAllComponentsDisplay.current[instance === null || instance === void 0 ? void 0 : instance.id] !== show) {
1399
1394
  // 发现组件从显示变成隐藏后，立即将其变成隐藏状态，执行计算组件逻辑的时候会使用到这个标示
1400
1395
  currentTemplateAllComponentsDisplay.current[instance === null || instance === void 0 ? void 0 : instance.id] = show;
1401
- var formData = form.getFieldsValue(true); // 获取所有表单值，包括组件隐藏的数据
1402
- handleWatchFormValueChange(undefined, formData);
1396
+ handleWatchFormValueChange();
1403
1397
  }
1404
1398
  currentComponentDisplayStatus.current[instance === null || instance === void 0 ? void 0 : instance.id] = show;
1405
1399
  checkFillMapping(show, uniqueKey, workOrderComponentType);
@@ -1472,9 +1466,9 @@ var FormRender = function FormRender(props, ref) {
1472
1466
  return item.workOrderComponentType === 'NUMERICAL_CALCULATION';
1473
1467
  });
1474
1468
  }, [templateDetail]);
1475
- var handleWatchFormValueChange = function handleWatchFormValueChange(changedValues) {
1476
- var allValues = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
1469
+ var handleWatchFormValueChange = function handleWatchFormValueChange() {
1477
1470
  var componentShowMap = currentTemplateAllComponentsDisplay.current;
1471
+ var allValues = form.getFieldsValue(true);
1478
1472
  var formValue = {};
1479
1473
  // FIXME: 计算组件存在，此处还可能出现性能问题
1480
1474
  if (calculationTypeComponentList.length > 0) {
@@ -1493,11 +1487,10 @@ var FormRender = function FormRender(props, ref) {
1493
1487
  changeValuesCacheOrderInfo(_objectSpread(_objectSpread({}, form.getFieldsValue()), formValue), templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList);
1494
1488
  });
1495
1489
  };
1496
- var debouncedHandleWatchFormValueChange = useMemo(function () {
1497
- return debounce(handleWatchFormValueChange, 150);
1498
- },
1499
- // 150ms防抖
1500
- [handleWatchFormValueChange]);
1490
+ var _useDebounceFn = useDebounceFn(handleWatchFormValueChange, {
1491
+ wait: 150
1492
+ }),
1493
+ debouncedHandleWatchFormValueChange = _useDebounceFn.run;
1501
1494
  var changeValuesCacheOrderInfo = throttle(function (value, tempLateList) {
1502
1495
  //如果店铺id不存在 不缓存
1503
1496
  if (!(value !== null && value !== void 0 && value.shopId)) return;
package/dist/esm/FlowTemplateDetailV2/components/FormRender/onBlur.d.ts CHANGED
@@ -5,7 +5,7 @@ export declare const onBlurErpAfterSaleTradeId: ({ form, value, templateDetail,
5
5
  templateDetail: any;
6
6
  setKmLoading: (loading: boolean) => void;
7
7
  }) => Promise<void>;
8
- export declare const onBlurExpressLogisticsCode: ({ form, value, templateDetail, setKmLoading, componentOnBlur, onlyGetTid, needTradeIdOrderBack }: {
8
+ export declare const onBlurExpressLogisticsCode: ({ form, value, templateDetail, setKmLoading, componentOnBlur, onlyGetTid, needTradeIdOrderBack, }: {
9
9
  form: FormInstance;
10
10
  value: string;
11
11
  templateDetail: any;
@@ -14,7 +14,7 @@ export declare const onBlurExpressLogisticsCode: ({ form, value, templateDetail,
14
14
  onlyGetTid?: boolean | undefined;
15
15
  needTradeIdOrderBack?: boolean | undefined;
16
16
  }) => Promise<any>;
17
- export declare const onBlurSkxOutboundNoticeNo: ({ form, value, templateDetail, componentOnBlur, onlyGetTid, needTradeIdOrderBack }: {
17
+ export declare const onBlurSkxOutboundNoticeNo: ({ form, value, templateDetail, componentOnBlur, onlyGetTid, needTradeIdOrderBack, }: {
18
18
  form: FormInstance;
19
19
  value: string;
20
20
  templateDetail: any;
package/dist/esm/FlowTemplateDetailV2/components/FormRender/onBlur.js CHANGED
@@ -9,7 +9,7 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
9
9
  function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
10
10
  import { orderBackKmVideoByLogisticsCode } from "../../../common/utils/orderBackKm";
11
11
  import { isNull, skxSystemOrderBackValues, skxReturnSystemOrderBackValues } from '@kmkf-fe-packages/kmkf-utils';
12
- import { queryTidByOutSid } from "../../../model/servers/api";
12
+ import { queryTidByOutSid, queryTidByWdtOutSid } from "../../../model/servers/api";
13
13
  import { servers } from '@kmkf-fe-packages/kmkf-utils';
14
14
  export var onBlurErpAfterSaleTradeId = /*#__PURE__*/function () {
15
15
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
@@ -47,7 +47,7 @@ export var onBlurErpAfterSaleTradeId = /*#__PURE__*/function () {
47
47
  export var onBlurExpressLogisticsCode = /*#__PURE__*/function () {
48
48
  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref3) {
49
49
  var _kmErpVideoComponent$2;
50
- var form, value, templateDetail, setKmLoading, componentOnBlur, _ref3$onlyGetTid, onlyGetTid, _ref3$needTradeIdOrde, needTradeIdOrderBack, hasTradeIdComponent, kmErpVideoComponent, _res$data, hasKm, userInfo, _userInfo$companyUser, _companyUserConfig$pl, _companyUserConfig, _companyUserConfig$pl2, _companyUserConfig$pl3, companyUserConfig, oldValue, res, tradeId, blurPromise;
50
+ var form, value, templateDetail, setKmLoading, componentOnBlur, _ref3$onlyGetTid, onlyGetTid, _ref3$needTradeIdOrde, needTradeIdOrderBack, hasTradeIdComponent, kmErpVideoComponent, _res$data, hasKm, hasWdt, userInfo, _userInfo$companyUser, _companyUserConfig$pl, _companyUserConfig, _companyUserConfig$pl2, _companyUserConfig$pl3, _companyUserConfig$pl4, _companyUserConfig2, _companyUserConfig2$p, _companyUserConfig2$p2, companyUserConfig, oldValue, res, tradeId, blurPromise;
51
51
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
52
52
  while (1) switch (_context2.prev = _context2.next) {
53
53
  case 0:
@@ -72,10 +72,11 @@ export var onBlurExpressLogisticsCode = /*#__PURE__*/function () {
72
72
  });
73
73
  case 6:
74
74
  if (!hasTradeIdComponent) {
75
- _context2.next = 27;
75
+ _context2.next = 35;
76
76
  break;
77
77
  }
78
78
  hasKm = false;
79
+ hasWdt = false;
79
80
  try {
80
81
  userInfo = JSON.parse(localStorage.getItem('reduxData_userInfo') || '{}');
81
82
  if (isNull(userInfo)) {
@@ -86,6 +87,7 @@ export var onBlurExpressLogisticsCode = /*#__PURE__*/function () {
86
87
  companyUserConfig = JSON.parse(companyUserConfig);
87
88
  }
88
89
  hasKm = (_companyUserConfig$pl = (_companyUserConfig = companyUserConfig) === null || _companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl2 = _companyUserConfig.plugins) === null || _companyUserConfig$pl2 === void 0 ? void 0 : (_companyUserConfig$pl3 = _companyUserConfig$pl2.km) === null || _companyUserConfig$pl3 === void 0 ? void 0 : _companyUserConfig$pl3.show) !== null && _companyUserConfig$pl !== void 0 ? _companyUserConfig$pl : false;
90
+ hasWdt = (_companyUserConfig$pl4 = (_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.show) !== null && _companyUserConfig$pl4 !== void 0 ? _companyUserConfig$pl4 : false;
89
91
  }
90
92
  } catch (error) {
91
93
  console.error(error);
@@ -98,50 +100,65 @@ export var onBlurExpressLogisticsCode = /*#__PURE__*/function () {
98
100
  // hasKm,
99
101
  // form,
100
102
  // });
101
- if (hasKm) {
102
- _context2.next = 11;
103
+ if (!(!hasKm && !hasWdt)) {
104
+ _context2.next = 12;
103
105
  break;
104
106
  }
105
107
  return _context2.abrupt("return");
106
- case 11:
108
+ case 12:
107
109
  oldValue = form.getFieldValue('0eVTfMGEyd');
108
- _context2.next = 14;
110
+ if (!hasWdt) {
111
+ _context2.next = 19;
112
+ break;
113
+ }
114
+ _context2.next = 16;
115
+ return queryTidByWdtOutSid({
116
+ outSid: value
117
+ });
118
+ case 16:
119
+ _context2.t0 = _context2.sent;
120
+ _context2.next = 22;
121
+ break;
122
+ case 19:
123
+ _context2.next = 21;
109
124
  return queryTidByOutSid({
110
125
  outSid: value
111
126
  });
112
- case 14:
113
- res = _context2.sent;
127
+ case 21:
128
+ _context2.t0 = _context2.sent;
129
+ case 22:
130
+ res = _context2.t0;
114
131
  tradeId = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.tid;
115
132
  if (!onlyGetTid) {
116
- _context2.next = 18;
133
+ _context2.next = 26;
117
134
  break;
118
135
  }
119
136
  return _context2.abrupt("return", tradeId);
120
- case 18:
137
+ case 26:
121
138
  if (tradeId) {
122
- _context2.next = 20;
139
+ _context2.next = 28;
123
140
  break;
124
141
  }
125
142
  return _context2.abrupt("return");
126
- case 20:
143
+ case 28:
127
144
  form.setFieldsValue({
128
145
  m3ap1EvEyd: tradeId
129
146
  });
130
147
  if (!needTradeIdOrderBack) {
131
- _context2.next = 25;
148
+ _context2.next = 33;
132
149
  break;
133
150
  }
134
151
  // 创建一个异步操作的Promise
135
152
  blurPromise = componentOnBlur(tradeId, 'tradeId'); // 等待异步操作完成后再执行setTimeout
136
- _context2.next = 25;
153
+ _context2.next = 33;
137
154
  return blurPromise;
138
- case 25:
155
+ case 33:
139
156
  // 所有异步操作完成后执行
140
157
  form.setFieldsValue({
141
158
  '0eVTfMGEyd': oldValue
142
159
  });
143
160
  return _context2.abrupt("return", res.data);
144
- case 27:
161
+ case 35:
145
162
  case "end":
146
163
  return _context2.stop();
147
164
  }
package/dist/esm/FlowTemplateDetailV2/components/Item/index.d.ts CHANGED
@@ -18,6 +18,7 @@ interface NodeItem {
18
18
  nodeIsAuto: boolean;
19
19
  flowTemplateKey: string;
20
20
  eventNodeType: string;
21
+ isSuperAdmin?: boolean;
21
22
  }
22
23
  declare const NodeItem: (props: NodeItem) => React.JSX.Element;
23
24
  export default NodeItem;