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

package/dist/esm/FlowTemplateDetail/index.d.ts

@@ -14,6 +14,11 @@ declare type FlowTemplateDetailProps = {
         tid: string;
         shopId: string;
     }) => void;
+    autoSubmit?: boolean;
+    callbackAutoSubmitResult?: (result: {
+        success: boolean;
+        message?: string;
+    }) => void;
 };
 declare const ProviderWrap: (props: FlowTemplateDetailProps) => React.JSX.Element;
 export default ProviderWrap;

package/dist/esm/FlowTemplateDetail/index.js

@@ -43,6 +43,7 @@ import { saveWorkOrder, submitWorkOrder, addRemark, stopWorkOrder, closeWorkOrde
 import { orderDetail } from "../model/servers/api";
 import cache from "../common/cache";
 import "./index.less";
+import { isNull } from '@kmkf-fe-packages/kmkf-utils';
 var FlowTemplateDetail = function FlowTemplateDetail(props) {
   var _currentNodeDetail$wo, _currentNodeDetail$no, _currentNodeDetail$wo2, _shopList$find, _currentNodeDetail$no21, _currentNodeDetail$no22, _currentNodeDetail$no23;
   var flowTemplateKey = props.flowTemplateKey,
@@ -55,7 +56,10 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
     onOpenWangWang = props.onOpenWangWang,
     callbackDealWorkOrderSuccess = props.callbackDealWorkOrderSuccess,
     onJumpMemoPage = props.onJumpMemoPage,
-    onTalkChange = props.onTalkChange;
+    onTalkChange = props.onTalkChange,
+    _props$autoSubmit = props.autoSubmit,
+    autoSubmit = _props$autoSubmit === void 0 ? false : _props$autoSubmit,
+    callbackAutoSubmitResult = props.callbackAutoSubmitResult;
   var dispatch = useDispatch();
   var flowRecordList = useSelector(selectFlowRecordList);
   var remarkList = useSelector(selectRemarkRecordList);
@@ -379,7 +383,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, _controllerRef$curren3, _currentNodeDetail$wo9;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
@@ -396,12 +400,12 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
             return form.validateFields();
           case 7:
             formData = _context4.sent;
-            result = verifyHandle(formData, (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo7 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo7 === void 0 ? void 0 : _currentNodeDetail$wo7.componentDtoList) || []);
-            if (result.success) {
+            _result = verifyHandle(formData, (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo7 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo7 === void 0 ? void 0 : _currentNodeDetail$wo7.componentDtoList) || []);
+            if (_result.success) {
               _context4.next = 13;
               break;
             }
-            message.error(result.message);
+            message.error(_result.message);
             submitRequestUnlock();
             return _context4.abrupt("return");
           case 13:
@@ -424,6 +428,13 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
           case 16:
             res = _context4.sent;
             submitRequestUnlock();
+            // TODO: 兼容批量提交逻辑
+            if (autoSubmit && typeof callbackAutoSubmitResult === 'function') {
+              callbackAutoSubmitResult({
+                success: res.success,
+                message: res.message
+              });
+            }
             if (res.success) {
               handleSuccessCallBack('submit');
               dispatch(fetchPanelInfo({
@@ -443,12 +454,30 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
                 unDeleteOrderInfo: false
               });
             }
-            _context4.next = 25;
+            _context4.next = 30;
             break;
-          case 21:
-            _context4.prev = 21;
+          case 22:
+            _context4.prev = 22;
             _context4.t0 = _context4["catch"](0);
             submitRequestUnlock();
+            if (!(autoSubmit && typeof callbackAutoSubmitResult === 'function')) {
+              _context4.next = 29;
+              break;
+            }
+            if (!(get(_context4.t0, 'errorFields.length') > 0)) {
+              _context4.next = 28;
+              break;
+            }
+            return _context4.abrupt("return", callbackAutoSubmitResult({
+              success: false,
+              message: get(_context4.t0, 'errorFields.0.errors.0', '组件校验失败')
+            }));
+          case 28:
+            return _context4.abrupt("return", callbackAutoSubmitResult({
+              success: false,
+              message: "接口请求异常"
+            }));
+          case 29:
             if (get(_context4.t0, 'errorFields.length') > 0) {
               setTimeout(function () {
                 var _get;
@@ -461,11 +490,11 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
               // TODO: 解决显影导致的组件校验失败未提示问题
               message.error(get(_context4.t0, 'errorFields.0.errors.0', '组件校验失败'));
             }
-          case 25:
+          case 30:
           case "end":
             return _context4.stop();
         }
-      }, _callee4, null, [[0, 21]]);
+      }, _callee4, null, [[0, 22]]);
     }));
     return function handleSubmit() {
       return _ref4.apply(this, arguments);
@@ -918,6 +947,13 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
   useEffect(function () {
     dispatch(setPlat(plat));
   }, [plat]);
+  useEffect(function () {
+    if (autoSubmit && !isNull(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;
     return currentUserHasOperatorAuth({

package/dist/esm/index.d.ts

@@ -5,7 +5,6 @@ export { default as FormRender } from './FormRender';
 export { default as FormRenderTemplateId } from './FormRenderTemplateId';
 export { default as FlowWorkOrderDetail } from './FlowTemplateDetail';
 export { default as TradeList } from './TradeList';
-export { default as FlowFormRender } from './FlowTemplateDetail/components/FormRender';
 export * as utils from './common/utils/tools';
 export * as arithmetic from './common/utils/arithmetic';
 export * from './WorkOrder/types';

package/dist/esm/index.js

@@ -15,7 +15,6 @@ export { default as FormRender } from "./FormRender";
 export { default as FormRenderTemplateId } from "./FormRenderTemplateId";
 export { default as FlowWorkOrderDetail } from "./FlowTemplateDetail";
 export { default as TradeList } from "./TradeList";
-export { default as FlowFormRender } from "./FlowTemplateDetail/components/FormRender";
 import * as _utils from "./common/utils/tools";
 export { _utils as utils };
 import * as _arithmetic from "./common/utils/arithmetic";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "0.28.2-alpha.6",
+  "version": "0.28.2-beta.0",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -34,7 +34,7 @@
     "@ant-design/icons": "^4.7.0",
     "@kmkf-fe-packages/basic-components": "^0.28.1",
     "@kmkf-fe-packages/kmkf-utils": "^0.28.1",
-    "@kmkf-fe-packages/services-components": "^0.28.2-alpha.6",
+    "@kmkf-fe-packages/services-components": "^0.28.1",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3c2a6738436fbfbc34829fa57032dd1a3c904718",
+  "gitHead": "1386c3da0a83f44fd5262472e7e06f70a5f4ba11",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }