@kmkf-fe-packages/kmkf-work-order-service-component 2.2.5-beta.7 → 2.2.5-beta.9

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 (4) hide show
  1. package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js +23 -6
  2. package/dist/esm/FlowTemplateDetailV2/components/ShareLinkModal/index.js +4 -3
  3. package/dist/esm/FlowTemplateDetailV2/store/reducers.js +2 -3
  4. package/package.json +4 -4
package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js CHANGED
@@ -395,7 +395,7 @@ var FormRender = function FormRender(props, ref) {
395
395
  return prv;
396
396
  }, {});
397
397
  if (workOrderId) {
398
- var _record$jsonMap2;
398
+ var _record$jsonMap5;
399
399
  // 先初始化端上内容
400
400
  var newRecord = cloneDeep(record);
401
401
  var jsonMapOrderId = Object.keys(newRecord.jsonMap).reduce(function (prv, next) {
@@ -426,10 +426,11 @@ var FormRender = function FormRender(props, ref) {
426
426
  orderBackReplace(transData, templateDetail);
427
427
  // TODO: 非开始节点录入，都会有workOrderId,这里判断是否有前置组件含有订单号；如果存在订单号，进行订单反填。
428
428
  var tradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList, 'TRADE_ID_INPUT');
429
- if (tradeIdUniqueKey && shopId && record !== null && record !== void 0 && (_record$jsonMap2 = record.jsonMap) !== null && _record$jsonMap2 !== void 0 && _record$jsonMap2["".concat(tradeIdUniqueKey, "_tradeId")] && firstOrderBackfill || newRecord.notAutoFillWithFirstSubmit) {
430
- var _record$jsonMap3, _record$jsonMap4, _record$jsonMap5;
429
+ if (newRecord.notAutoFillWithFirstSubmit) {
430
+ var _record$jsonMap2, _record$jsonMap3, _record$jsonMap4;
431
+ var _tradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'TRADE_ID_INPUT');
431
432
  orderBack({
432
- order_no: record === null || record === void 0 ? void 0 : (_record$jsonMap3 = record.jsonMap) === null || _record$jsonMap3 === void 0 ? void 0 : _record$jsonMap3["".concat(tradeIdUniqueKey, "_tradeId")],
433
+ order_no: record === null || record === void 0 ? void 0 : (_record$jsonMap2 = record.jsonMap) === null || _record$jsonMap2 === void 0 ? void 0 : _record$jsonMap2["".concat(_tradeIdUniqueKey, "_tradeId")],
433
434
  form: form,
434
435
  shopId: shopId,
435
436
  shopList: shopList,
@@ -440,8 +441,24 @@ var FormRender = function FormRender(props, ref) {
440
441
  callKey: 1,
441
442
  setLoading: setLoading
442
443
  });
443
- queryLabels(record === null || record === void 0 ? void 0 : (_record$jsonMap4 = record.jsonMap) === null || _record$jsonMap4 === void 0 ? void 0 : _record$jsonMap4["".concat(tradeIdUniqueKey, "_tradeId")], shopId);
444
- queryMemberLevels(record === null || record === void 0 ? void 0 : (_record$jsonMap5 = record.jsonMap) === null || _record$jsonMap5 === void 0 ? void 0 : _record$jsonMap5["".concat(tradeIdUniqueKey, "_tradeId")], shopId);
444
+ queryLabels(record === null || record === void 0 ? void 0 : (_record$jsonMap3 = record.jsonMap) === null || _record$jsonMap3 === void 0 ? void 0 : _record$jsonMap3["".concat(_tradeIdUniqueKey, "_tradeId")], shopId);
445
+ queryMemberLevels(record === null || record === void 0 ? void 0 : (_record$jsonMap4 = record.jsonMap) === null || _record$jsonMap4 === void 0 ? void 0 : _record$jsonMap4["".concat(_tradeIdUniqueKey, "_tradeId")], shopId);
446
+ } else if (tradeIdUniqueKey && shopId && record !== null && record !== void 0 && (_record$jsonMap5 = record.jsonMap) !== null && _record$jsonMap5 !== void 0 && _record$jsonMap5["".concat(tradeIdUniqueKey, "_tradeId")] && firstOrderBackfill) {
447
+ var _record$jsonMap6, _record$jsonMap7, _record$jsonMap8;
448
+ orderBack({
449
+ order_no: record === null || record === void 0 ? void 0 : (_record$jsonMap6 = record.jsonMap) === null || _record$jsonMap6 === void 0 ? void 0 : _record$jsonMap6["".concat(tradeIdUniqueKey, "_tradeId")],
450
+ form: form,
451
+ shopId: shopId,
452
+ shopList: shopList,
453
+ templateDetail: templateDetail,
454
+ callback: orderBackReplace,
455
+ fromQNCreateWorkOrderByOrderNo: fromQNCreateWorkOrderByOrderNo,
456
+ plat: plat,
457
+ callKey: 1,
458
+ setLoading: setLoading
459
+ });
460
+ queryLabels(record === null || record === void 0 ? void 0 : (_record$jsonMap7 = record.jsonMap) === null || _record$jsonMap7 === void 0 ? void 0 : _record$jsonMap7["".concat(tradeIdUniqueKey, "_tradeId")], shopId);
461
+ queryMemberLevels(record === null || record === void 0 ? void 0 : (_record$jsonMap8 = record.jsonMap) === null || _record$jsonMap8 === void 0 ? void 0 : _record$jsonMap8["".concat(tradeIdUniqueKey, "_tradeId")], shopId);
445
462
  } else {
446
463
  // 如果没有订单反填，则单独更新remark
447
464
  fetchRemark(shopId, currentNodeTid);
package/dist/esm/FlowTemplateDetailV2/components/ShareLinkModal/index.js CHANGED
@@ -5,11 +5,12 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
5
5
  function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
6
6
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
7
7
  import React, { useState, useImperativeHandle, forwardRef } from 'react';
8
- import { Modal, Button, message, Space } from 'antd';
8
+ import { Modal, Button, message, Space, Typography } from 'antd';
9
9
  import { CopyToClipboard } from 'react-copy-to-clipboard';
10
10
  import { shortLink, createNodeLink, createLink } from "../../../model/flowTemplateDetail/api";
11
11
  import QRCode from 'qrcode.react';
12
12
  import styles from "./index.module.less";
13
+ var Text = Typography.Text;
13
14
  var ShareLinkModal = /*#__PURE__*/forwardRef(function (props, ref) {
14
15
  var _useState = useState(false),
15
16
  _useState2 = _slicedToArray(_useState, 2),
@@ -125,7 +126,7 @@ var ShareLinkModal = /*#__PURE__*/forwardRef(function (props, ref) {
125
126
  onClick: function onClick() {
126
127
  window.open(url);
127
128
  }
128
- }, "\u6253\u5F00"))), url)), ['shortUrl', 'all'].includes(showType) && !!shortUrl && /*#__PURE__*/React.createElement("li", {
129
+ }, "\u6253\u5F00"))), /*#__PURE__*/React.createElement(Text, null, url))), ['shortUrl', 'all'].includes(showType) && !!shortUrl && /*#__PURE__*/React.createElement("li", {
129
130
  className: styles.shareLi
130
131
  }, /*#__PURE__*/React.createElement("div", {
131
132
  className: styles.shareName
@@ -141,7 +142,7 @@ var ShareLinkModal = /*#__PURE__*/forwardRef(function (props, ref) {
141
142
  onClick: function onClick() {
142
143
  window.open(shortUrl);
143
144
  }
144
- }, "\u6253\u5F00"))), shortUrl)), /*#__PURE__*/React.createElement("li", {
145
+ }, "\u6253\u5F00"))), /*#__PURE__*/React.createElement(Text, null, shortUrl))), /*#__PURE__*/React.createElement("li", {
145
146
  className: styles.shareLi
146
147
  }, /*#__PURE__*/React.createElement("div", {
147
148
  className: styles.shareName
package/dist/esm/FlowTemplateDetailV2/store/reducers.js CHANGED
@@ -368,11 +368,10 @@ export var fetchShareNodeConfig = function fetchShareNodeConfig(params) {
368
368
  data = _yield$queryShareNode.data;
369
369
  success = _yield$queryShareNode.success;
370
370
  if (success) {
371
- console.log('data', data);
372
371
  nowNode = data.find(function (item) {
373
- return item.nodeId === params.flowNodeId;
372
+ return item.flowNodeId === params.flowNodeId;
374
373
  });
375
- showShareButton = (nowNode === null || nowNode === void 0 ? void 0 : nowNode.userId) === params.userKey;
374
+ showShareButton = (nowNode === null || nowNode === void 0 ? void 0 : nowNode.userKey) === params.userKey;
376
375
  dispatch({
377
376
  type: 'setShowShareButton',
378
377
  payload: showShareButton
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
3
- "version": "2.2.5-beta.7",
3
+ "version": "2.2.5-beta.9",
4
4
  "module": "dist/esm/index.js",
5
5
  "typings": "dist/esm/index.d.ts",
6
6
  "files": [
@@ -32,9 +32,9 @@
32
32
  },
33
33
  "dependencies": {
34
34
  "@ant-design/icons": "^4.7.0",
35
- "@kmkf-fe-packages/basic-components": "2.2.5-beta.6",
35
+ "@kmkf-fe-packages/basic-components": "2.2.5-beta.8",
36
36
  "@kmkf-fe-packages/kmkf-utils": "2.2.5-beta.5",
37
- "@kmkf-fe-packages/services-components": "2.2.5-beta.6",
37
+ "@kmkf-fe-packages/services-components": "2.2.5-beta.8",
38
38
  "@reduxjs/toolkit": "^1.8.5",
39
39
  "ahooks": "^3.7.4",
40
40
  "copy-to-clipboard": "^3.3.3",
@@ -74,7 +74,7 @@
74
74
  "publishConfig": {
75
75
  "access": "public"
76
76
  },
77
- "gitHead": "35a46bdd8a5c56911f7102d77017487c55ac8829",
77
+ "gitHead": "a80fe7e159fa72d8fd3bb3e277ca0322956f035b",
78
78
  "gitHooks": {
79
79
  "pre-commit": "lint-staged"
80
80
  }