@kmkf-fe-packages/kmkf-work-order-service-component 0.28.2-beta.0 → 0.28.2-beta.2

package/dist/esm/FlowTemplateDetail/index.js

@@ -195,7 +195,9 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
     });
   }, [tid, formShopId]);
   useEffect(function () {
+    console.debug('FlowTemplateDetail-didMount', flowTemplateKey, flowWorkOrderId);
     return function () {
+      console.debug('FlowTemplateDetail-unMount', flowTemplateKey, flowWorkOrderId);
       form.resetFields();
       dispatch(setClearStore());
     };
@@ -383,7 +385,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
   // 提交
   var handleSubmit = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-      var _currentNodeDetail$wo7, _currentNodeDetail$wo8, formData, _result, params, res, _controllerRef$curren3, _currentNodeDetail$wo9;
+      var _currentNodeDetail$wo7, _currentNodeDetail$wo8, formData, _result, params, res, _currentNodeDetail$wo9, _controllerRef$curren3;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -423,9 +425,11 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
                 return s.shopId === formData.shopId;
               }), 'accessToken', '')
             });
-            _context4.next = 16;
-            return submitWorkOrder(params);
-          case 16:
+            console.debug('提交参数: ', currentNodeDetail, formData);
+            // TODO: 自动提交时开启接口静默模式
+            _context4.next = 17;
+            return submitWorkOrder(params, autoSubmit ? 'quiet' : 'error');
+          case 17:
             res = _context4.sent;
             submitRequestUnlock();
             // TODO: 兼容批量提交逻辑
@@ -437,13 +441,6 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
             }
             if (res.success) {
               handleSuccessCallBack('submit');
-              dispatch(fetchPanelInfo({
-                flowTemplateKey: flowTemplateKey,
-                flowWorkOrderId: flowWorkOrderIdState
-              }, {
-                signal: controllerRef === null || controllerRef === void 0 ? void 0 : (_controllerRef$curren3 = controllerRef.current) === null || _controllerRef$curren3 === void 0 ? void 0 : _controllerRef$curren3.signal
-              }));
-              message.success('提交成功');
               //删除缓存的订单信息
               deleteCacheOrder({
                 templateList: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo9 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo9 === void 0 ? void 0 : _currentNodeDetail$wo9.componentDtoList,
@@ -453,31 +450,40 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
                 plat: plat,
                 unDeleteOrderInfo: false
               });
+              if (!autoSubmit) {
+                dispatch(fetchPanelInfo({
+                  flowTemplateKey: flowTemplateKey,
+                  flowWorkOrderId: flowWorkOrderIdState
+                }, {
+                  signal: controllerRef === null || controllerRef === void 0 ? void 0 : (_controllerRef$curren3 = controllerRef.current) === null || _controllerRef$curren3 === void 0 ? void 0 : _controllerRef$curren3.signal
+                }));
+                message.success('提交成功');
+              }
             }
-            _context4.next = 30;
+            _context4.next = 31;
             break;
-          case 22:
-            _context4.prev = 22;
+          case 23:
+            _context4.prev = 23;
             _context4.t0 = _context4["catch"](0);
             submitRequestUnlock();
             if (!(autoSubmit && typeof callbackAutoSubmitResult === 'function')) {
-              _context4.next = 29;
+              _context4.next = 30;
               break;
             }
             if (!(get(_context4.t0, 'errorFields.length') > 0)) {
-              _context4.next = 28;
+              _context4.next = 29;
               break;
             }
             return _context4.abrupt("return", callbackAutoSubmitResult({
               success: false,
               message: get(_context4.t0, 'errorFields.0.errors.0', '组件校验失败')
             }));
-          case 28:
+          case 29:
             return _context4.abrupt("return", callbackAutoSubmitResult({
               success: false,
-              message: "接口请求异常"
+              message: (_context4.t0 === null || _context4.t0 === void 0 ? void 0 : _context4.t0.message) || "接口请求异常"
             }));
-          case 29:
+          case 30:
             if (get(_context4.t0, 'errorFields.length') > 0) {
               setTimeout(function () {
                 var _get;
@@ -490,11 +496,11 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
               // TODO: 解决显影导致的组件校验失败未提示问题
               message.error(get(_context4.t0, 'errorFields.0.errors.0', '组件校验失败'));
             }
-          case 30:
+          case 31:
           case "end":
             return _context4.stop();
         }
-      }, _callee4, null, [[0, 22]]);
+      }, _callee4, null, [[0, 23]]);
     }));
     return function handleSubmit() {
       return _ref4.apply(this, arguments);
@@ -948,20 +954,22 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
     dispatch(setPlat(plat));
   }, [plat]);
   useEffect(function () {
-    if (autoSubmit && !isNull(currentNodeDetail)) {
+    var _currentNodeDetail$wo24;
+    if (autoSubmit && !isNull(currentNodeDetail) && flowWorkOrderId === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo24 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo24 === void 0 ? void 0 : _currentNodeDetail$wo24.flowWorkOrderId)) {
+      console.debug('currentNodeDetail', currentNodeDetail);
       setTimeout(function () {
         handleSubmit();
       }, 0);
     }
   }, [currentNodeDetail]);
   var isCurrentNodeHandler = useMemo(function () {
-    var _currentNodeDetail$no11, _currentNodeDetail$no12, _currentNodeDetail$no13, _currentNodeDetail$no14, _currentNodeDetail$no15, _currentNodeDetail$no16, _currentNodeDetail$wo24, _currentNodeDetail$no17, _currentNodeDetail$no18;
+    var _currentNodeDetail$no11, _currentNodeDetail$no12, _currentNodeDetail$no13, _currentNodeDetail$no14, _currentNodeDetail$no15, _currentNodeDetail$no16, _currentNodeDetail$wo25, _currentNodeDetail$no17, _currentNodeDetail$no18;
     return currentUserHasOperatorAuth({
       assistantList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no11 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no11 === void 0 ? void 0 : _currentNodeDetail$no11.id) && assistantMap[currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no12 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no12 === void 0 ? void 0 : _currentNodeDetail$no12.id] || [],
       currentUserKey: plat.userKey,
       staffIds: (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.staffIds) || [],
       operateDataPermission: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no15 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no15 === void 0 ? void 0 : (_currentNodeDetail$no16 = _currentNodeDetail$no15.assistants) === null || _currentNodeDetail$no16 === void 0 ? void 0 : _currentNodeDetail$no16.operateDataPermission,
-      handlerList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo24 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo24 === void 0 ? void 0 : _currentNodeDetail$wo24.handlerList) || [],
+      handlerList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo25 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo25 === void 0 ? void 0 : _currentNodeDetail$wo25.handlerList) || [],
       isAllStaff: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no17 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no17 === void 0 ? void 0 : (_currentNodeDetail$no18 = _currentNodeDetail$no17.assistants) === null || _currentNodeDetail$no18 === void 0 ? void 0 : _currentNodeDetail$no18.isAllStaff
     });
   }, [currentNodeDetail, plat, assistantMap]);

package/dist/esm/model/flowTemplateDetail/api.d.ts

@@ -4,7 +4,7 @@ export declare const queryPanelInfo: (data: QyFlowPanelInfoRequest, options: any
 export declare const queryAllFlowOperateRecord: (data: QueryAllFlowOperateRecordRequest) => Promise<serverProps<Array<QyFlowOperateQueryAllFlowOperateRecordResponse>>>;
 export declare const queryNodeDetail: (data: QueryNodeDetailRequest) => Promise<serverProps<QueryNodeDetailResponse>>;
 export declare const saveWorkOrder: (data: any) => Promise<serverProps<string>>;
-export declare const submitWorkOrder: (data: any) => Promise<serverProps<boolean>>;
+export declare const submitWorkOrder: (data: any, infoLevel?: any) => Promise<serverProps<boolean>>;
 export declare const modifyWorkOrder: (data: any) => Promise<serverProps<boolean>>;
 export declare const addRemark: (data: any) => Promise<serverProps<boolean>>;
 export declare const stopWorkOrder: (data: any) => Promise<serverProps<{

package/dist/esm/model/flowTemplateDetail/api.js

@@ -36,10 +36,12 @@ export var saveWorkOrder = function saveWorkOrder(data) {
 
 // 提交
 export var submitWorkOrder = function submitWorkOrder(data) {
+  var infoLevel = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'error';
   return request({
     url: '/qy/flow/operate/submit',
     method: 'post',
-    data: data
+    data: data,
+    infoLevel: infoLevel
   });
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "0.28.2-beta.0",
+  "version": "0.28.2-beta.2",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1386c3da0a83f44fd5262472e7e06f70a5f4ba11",
+  "gitHead": "bd5b027c20a77e006d58cb771d5502b8912047ab",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }