@kmkf-fe-packages/kmkf-work-order-service-component 2.2.13-beta.6 → 2.2.13-beta.8

package/dist/esm/FlowTemplateDetailV2/components/FormRender/skxOrderBack.js

@@ -6,7 +6,7 @@ import { get } from 'lodash';
 import { onBlurSkxLogisticsCode, onBlurSkxOutboundNoticeNo, onBlurSkxReturnBillNo } from "./onBlur";
 import { findComponentUniqueKeyByType } from "../../../common/utils/tools";
 var isMatchCompanyKey = function isMatchCompanyKey(companyKey) {
-  return ['TR3E2FYXFZCFANVG6O6AALSM', 'SZF4ZGWZSNW6PYXMCIFEWBXT'].includes(companyKey);
+  return ['TR3E2FYXFZCFANVG6O6AALSM', 'SZF4ZGWZSNW6PYXMCIFEWBXT', '6O47IBXFR26FJF4HUQ7WGO4H'].includes(companyKey);
 };
 var existSkxReturnLogisticsComponent = function existSkxReturnLogisticsComponent(templateDetail) {
   return get(templateDetail, 'componentDtoList', []).some(function (item) {

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

@@ -61,7 +61,7 @@ var ShareLinkModal = /*#__PURE__*/forwardRef(function (props, ref) {
           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);
+        setShortUrl("".concat(window.location.protocol, "//").concat((_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.shortShareLink));
       });
       return;
     }
@@ -75,25 +75,26 @@ var ShareLinkModal = /*#__PURE__*/forwardRef(function (props, ref) {
           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);
+        setShortUrl("".concat(window.location.protocol, "//").concat((_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.shortShareLink));
       });
       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);
+        setShortUrl("".concat(window.location.protocol, "//").concat(res.data));
       });
     }
   };
@@ -149,7 +150,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

@@ -27,7 +27,7 @@ import { calcWorkOrderList, deleteCacheOrder, submitParams } from "../common/uti
 import { useMemoizedFn } from 'ahooks';
 import moment from 'moment';
 import { fetchPanelInfo, fetchAllFlowOperateRecord, fetchCollectOrder, fetchShareNodeConfig, fetchH5SharePermission } from "./store/reducers";
-import { selectFlowRecordList, selectRemarkRecordList, selectCurrentNodeDetail, selectTid, selectShopUniqueKey, selectOperateParams, selectFlowStatus, selectCurrentTradeIdWOrkOrderNumber, selectFlowTemplateId, selectLoading, selectOrderBackLoading, selectOrderBackKmLoading, selectWithDrawOrder, selectNodeAssistantMap, selectFlowTemplateType, selectFollow, selectShowShareButton, selectH5SharePermission, selectAutoSubmitFlag } from "./store/selector";
+import { selectFlowRecordList, selectRemarkRecordList, selectCurrentNodeDetail, selectTid, selectShopUniqueKey, selectOperateParams, selectFlowStatus, selectCurrentTradeIdWOrkOrderNumber, selectFlowTemplateId, selectLoading, selectOrderBackLoading, selectOrderBackKmLoading, selectWithDrawOrder, selectNodeAssistantMap, selectFlowTemplateType, selectFollow, selectAutoSubmitFlag, selectShowShareButton, selectH5SharePermission } from "./store/selector";
 import { NodeType, FlowStatus, FlowType } from "../model/flowTemplateDetail/types";
 import NodeItem from "./components/Item";
 import CurrentNode from "./components/CurrentNode";

package/dist/esm/FlowTemplateDetailV2/store/reducers.d.ts

@@ -42,10 +42,10 @@ export declare const clearLabelList: (state: FlowTemplateDetailState) => void;
 export declare const setRejectLoading: (state: FlowTemplateDetailState, { payload }: PayloadAction<boolean>) => void;
 export declare const setWithDrawLoading: (state: FlowTemplateDetailState, { payload }: PayloadAction<boolean>) => void;
 export declare const setFollow: (state: FlowTemplateDetailState, { payload }: PayloadAction<boolean>) => void;
+export declare const setaAutoSubmitFlag: (state: FlowTemplateDetailState, { payload }: PayloadAction<boolean>) => void;
 export declare const setPrivilege: (state: FlowTemplateDetailState, { payload }: PayloadAction<string>) => void;
 export declare const setShowShareButton: (state: FlowTemplateDetailState, { payload }: PayloadAction<boolean>) => void;
 export declare const setH5SharePermission: (state: FlowTemplateDetailState, { payload }: PayloadAction<boolean>) => void;
-export declare const setaAutoSubmitFlag: (state: FlowTemplateDetailState, { payload }: PayloadAction<boolean>) => void;
 declare const reducers: (state: FlowTemplateDetailState | undefined, action: {
     type: string;
     payload: any;
@@ -92,9 +92,9 @@ declare const reducers: (state: FlowTemplateDetailState | undefined, action: {
     rejectLoading: boolean;
     withdrawLoading: boolean;
     follow: boolean;
+    autoSubmitFlag: boolean;
     privilege: string;
     showShareButton: boolean;
     hasH5SharePermission: boolean;
-    autoSubmitFlag: boolean;
 };
 export default reducers;

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

@@ -48,12 +48,12 @@ export var initState = {
   rejectLoading: false,
   withdrawLoading: false,
   follow: false,
+  autoSubmitFlag: false,
+  // 批量提交可操作标识
   privilege: '',
   showShareButton: false,
   //是否展示分享按钮
-  hasH5SharePermission: false,
-  //是否有h5分享权限
-  autoSubmitFlag: false // 批量提交可操作标识
+  hasH5SharePermission: false //是否有h5分享权限
 };
 
 export var fetchPanelInfo = function fetchPanelInfo(params, options) {
@@ -558,21 +558,21 @@ export var setFollow = function setFollow(state, _ref31) {
   var payload = _ref31.payload;
   state.follow = payload;
 };
-export var setPrivilege = function setPrivilege(state, _ref32) {
+export var setaAutoSubmitFlag = function setaAutoSubmitFlag(state, _ref32) {
   var payload = _ref32.payload;
-  state.privilege = payload;
+  state.autoSubmitFlag = payload;
 };
-export var setShowShareButton = function setShowShareButton(state, _ref33) {
+export var setPrivilege = function setPrivilege(state, _ref33) {
   var payload = _ref33.payload;
-  state.showShareButton = payload;
+  state.privilege = payload;
 };
-export var setH5SharePermission = function setH5SharePermission(state, _ref34) {
+export var setShowShareButton = function setShowShareButton(state, _ref34) {
   var payload = _ref34.payload;
-  state.hasH5SharePermission = payload;
+  state.showShareButton = payload;
 };
-export var setaAutoSubmitFlag = function setaAutoSubmitFlag(state, _ref35) {
+export var setH5SharePermission = function setH5SharePermission(state, _ref35) {
   var payload = _ref35.payload;
-  state.autoSubmitFlag = payload;
+  state.hasH5SharePermission = payload;
 };
 var reducerMap = {
   setNodeAssistantInfo: setNodeAssistantInfo,
@@ -601,10 +601,10 @@ var reducerMap = {
   setRejectLoading: setRejectLoading,
   setWithDrawLoading: setWithDrawLoading,
   setFollow: setFollow,
+  setaAutoSubmitFlag: setaAutoSubmitFlag,
   setPrivilege: setPrivilege,
   setShowShareButton: setShowShareButton,
-  setH5SharePermission: setH5SharePermission,
-  setaAutoSubmitFlag: setaAutoSubmitFlag
+  setH5SharePermission: setH5SharePermission
 };
 var reducers = function reducers() {
   var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : initState;

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

@@ -233,7 +233,7 @@ export var orderBack = /*#__PURE__*/function () {
           // 京东自营订单数据获取
           promise.push(
           // thirdShopSubType === 1 && shopSourceStr === 'JD' && window.invokerSDK
-          shopSourceStr === 'JD' && window.invokerSDK ? xzSDK.getActiveUserTardeInfo(order_no) : Promise.resolve([]));
+          shopSourceStr === 'JD' && window.invokerSDK ? xzSDK.getActiveUserTardeInfo(order_no) : Promise.reject());
           Object.keys(hasFlagMap).forEach(function (key) {
             var _hasFlagMap$key = hasFlagMap[key],
               flag = _hasFlagMap$key.flag,

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

@@ -77,10 +77,10 @@ export interface FlowTemplateDetailState {
     rejectLoading: boolean;
     withdrawLoading: boolean;
     follow: boolean;
+    autoSubmitFlag: boolean;
     privilege: string;
     showShareButton: boolean;
     hasH5SharePermission: boolean;
-    autoSubmitFlag: boolean;
 }
 export interface QyFlowPanelInfoRequest {
     /**

package/package.json

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