@kmkf-fe-packages/kmkf-work-order-service-component 2.2.13 → 2.2.15

package/dist/esm/FlowTemplateDetailV2/components/ShareLinkModal/index.js

@@ -56,12 +56,13 @@ var ShareLinkModal = /*#__PURE__*/forwardRef(function (props, ref) {
         flowWorkOrderId: info.flowWorkOrderId,
         flowNodeId: info.flowNodeId
       }).then(function (res) {
-        var _res$data, _res$data2;
+        var _res$data, _res$data2, _res$data3;
         if (res.data) {
           setVisible(true);
         }
         setUrl((_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.link);
-        setShortUrl((_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.shortShareLink);
+        var shortLink = (_res$data2 = res.data) !== null && _res$data2 !== void 0 && _res$data2.shortShareLink ? "".concat(window.location.protocol, "//").concat((_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.shortShareLink) : '';
+        setShortUrl(shortLink);
       });
       return;
     }
@@ -70,30 +71,33 @@ var ShareLinkModal = /*#__PURE__*/forwardRef(function (props, ref) {
         companyKey: info.companyKey,
         flowTemplateKey: info.flowTemplateKey
       }).then(function (res) {
-        var _res$data3, _res$data4;
+        var _res$data4, _res$data5, _res$data6;
         if (res.data) {
           setVisible(true);
         }
-        setUrl((_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.link);
-        setShortUrl((_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.shortShareLink);
+        setUrl((_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.link);
+        var shortLink = (_res$data5 = res.data) !== null && _res$data5 !== void 0 && _res$data5.shortShareLink ? "".concat(window.location.protocol, "//").concat((_res$data6 = res.data) === null || _res$data6 === void 0 ? void 0 : _res$data6.shortShareLink) : '';
+        setShortUrl(shortLink);
       });
       return;
     }
     setVisible(true);
+    var regex = /^(https?:\/\/)/;
     if (info.url) {
-      var regex = /^(https?:\/\/)/;
       var formatUrl = info.url.match(regex) ? info.url : "".concat(window.location.protocol, "//").concat(info.url);
       setUrl(formatUrl);
     }
     if ((info === null || info === void 0 ? void 0 : info.showType) !== 'shortUrl') return;
     if (info.shortUrl) {
-      setShortUrl(info.shortUrl);
+      var formaShortUrl = info.shortUrl.match(regex) ? info.shortUrl : "".concat(window.location.protocol, "//").concat(info.shortUrl);
+      setShortUrl(formaShortUrl);
     } else if (info.mongoId && info.url) {
       shortLink({
         mongoId: info.mongoId,
         longUrl: info.url
       }).then(function (res) {
-        setShortUrl(res.data);
+        var shortUrl = res.data ? "".concat(window.location.protocol, "//").concat(res.data) : '';
+        setShortUrl(shortUrl);
       });
     }
   };
@@ -149,7 +153,7 @@ var ShareLinkModal = /*#__PURE__*/forwardRef(function (props, ref) {
   }, "\u590D\u5236")), info.platform === 'pc' && /*#__PURE__*/React.createElement(Button, {
     type: "primary",
     onClick: function onClick() {
-      window.open("https://".concat(shortUrl));
+      window.open(shortUrl);
     }
   }, "\u6253\u5F00"))), /*#__PURE__*/React.createElement(Text, null, shortUrl))), /*#__PURE__*/React.createElement("li", {
     className: styles.shareLi

package/dist/esm/FlowTemplateDetailV2/index.js

@@ -51,7 +51,6 @@ import RenderDetail from "./components/RenderDetail";
 import { orderDetail } from "../model/servers/api";
 import cache from "../common/cache";
 import "./index.less";
-import { isNull } from '@kmkf-fe-packages/kmkf-utils';
 import { PlatformAvatar } from '@kmkf-fe-packages/services-components';
 import { Provide, Context } from "./context";
 import { WORK_ORDER_STATUS_AI_BUILD } from "../common/constant";
@@ -1147,7 +1146,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
     }
   };
   useEffect(function () {
-    if (autoSubmit && !isNull(currentNodeDetail)) {
+    if (autoSubmit && !isEmpty(currentNodeDetail)) {
       var _currentNodeDetail$wo25, _currentNodeDetail$wo26;
       // SKX首节点满足下列条件、此时批量提交会等订单数据反填再提交, 其余企业批量提交还是原先逻辑，不涉及订单数据反填
       if (currentNodeDetail !== null && currentNodeDetail !== void 0 && (_currentNodeDetail$wo25 = currentNodeDetail.workOrder) !== null && _currentNodeDetail$wo25 !== void 0 && _currentNodeDetail$wo25.notAutoFillWithFirstSubmit && autoSubmitFlag) {

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

@@ -73,7 +73,7 @@ export var fetchPanelInfo = function fetchPanelInfo(params, options) {
           case 4:
             res = _context.sent;
             if (!res.success) {
-              _context.next = 17;
+              _context.next = 19;
               break;
             }
             recordList = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : (_res$data$flowRecordL = _res$data.flowRecordList) === null || _res$data$flowRecordL === void 0 ? void 0 : (_res$data$flowRecordL2 = _res$data$flowRecordL.filter(function (t) {
@@ -178,24 +178,44 @@ export var fetchPanelInfo = function fetchPanelInfo(params, options) {
               });
             }
           case 17:
-            _context.next = 22;
+            _context.next = 20;
             break;
           case 19:
-            _context.prev = 19;
-            _context.t0 = _context["catch"](0);
-            console.error(_context.t0);
+            dispatch({
+              type: 'setCurrentNode',
+              payload: {
+                currentNodeDetail: {
+                  workOrder: {}
+                }
+              }
+            });
+          case 20:
+            _context.next = 26;
+            break;
           case 22:
             _context.prev = 22;
+            _context.t0 = _context["catch"](0);
+            console.error(_context.t0);
+            dispatch({
+              type: 'setCurrentNode',
+              payload: {
+                currentNodeDetail: {
+                  workOrder: {}
+                }
+              }
+            });
+          case 26:
+            _context.prev = 26;
             dispatch({
               type: 'setLoading',
               payload: false
             });
-            return _context.finish(22);
-          case 25:
+            return _context.finish(26);
+          case 29:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 19, 22, 25]]);
+      }, _callee, null, [[0, 22, 26, 29]]);
     }));
     return function (_x) {
       return _ref.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "2.2.13",
+  "version": "2.2.15",
   "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.2.13",
-    "@kmkf-fe-packages/kmkf-utils": "2.2.11",
-    "@kmkf-fe-packages/services-components": "2.2.13",
+    "@kmkf-fe-packages/basic-components": "2.2.15",
+    "@kmkf-fe-packages/kmkf-utils": "2.2.15",
+    "@kmkf-fe-packages/services-components": "2.2.15",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -74,7 +74,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "bda3806f7d08d735feda0badfc8e8235f1883ac1",
+  "gitHead": "fcfdedb4dd62e3aae672079a7dc7a285db5bf8dd",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }