@kmkf-fe-packages/kmkf-work-order-service-component 0.13.5 → 0.14.1-alpha.0

package/dist/esm/FlowTemplateDetail/components/CloseModal/index.js

@@ -11,6 +11,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React from 'react';
 import { Modal, Form, Input } from 'antd';
 import { useSelector, useDispatch } from 'react-redux';
+import { ApaasUploadAsync } from '@kmkf-fe-packages/basic-components';
 import { selectCurrentAction } from "../../../model/flowTemplateDetail/selector";
 import { setAction } from "../../../model/flowTemplateDetail";
 var TextArea = Input.TextArea;
@@ -71,6 +72,13 @@ var CloseModal = function CloseModal(_ref) {
     placeholder: "\u8BF7\u8F93\u5165\u5907\u6CE8\u5185\u5BB9",
     showCount: true,
     maxLength: 200
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u56FE\u7247",
+    name: "imgList"
+  }, /*#__PURE__*/React.createElement(ApaasUploadAsync, {
+    maxCount: 5,
+    uniqueKey: "remark",
+    hostUrl: "https://kefu.kuaimai.com"
   })))));
 };
 export default CloseModal;

package/dist/esm/FlowTemplateDetail/components/ForWardModal/index.js

@@ -12,6 +12,7 @@ import React, { useEffect } from 'react';
 import { Modal, Form, Select, Input, Spin } from 'antd';
 import { useSelector, useDispatch } from 'react-redux';
 import { useRequest } from 'ahooks';
+import { ApaasUploadAsync } from '@kmkf-fe-packages/basic-components';
 import { queryMultiNodeAssistantInfo } from "../../../model/flowTemplateDetail/api";
 import { selectCurrentAction } from "../../../model/flowTemplateDetail/selector";
 import { setAction } from "../../../model/flowTemplateDetail";
@@ -107,6 +108,13 @@ var ForWardModal = function ForWardModal(_ref) {
     placeholder: "\u8BF7\u8F93\u5165\u5907\u6CE8\u5185\u5BB9",
     showCount: true,
     maxLength: 200
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u56FE\u7247",
+    name: "imgList"
+  }, /*#__PURE__*/React.createElement(ApaasUploadAsync, {
+    maxCount: 5,
+    uniqueKey: "remark",
+    hostUrl: "https://kefu.kuaimai.com"
   })))));
 };
 export default ForWardModal;

package/dist/esm/FlowTemplateDetail/components/RejectedModal/index.js

@@ -11,6 +11,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React from 'react';
 import { Modal, Form, Input } from 'antd';
 import { useSelector, useDispatch } from 'react-redux';
+import { ApaasUploadAsync } from '@kmkf-fe-packages/basic-components';
 import { selectCurrentAction } from "../../../model/flowTemplateDetail/selector";
 import { setAction } from "../../../model/flowTemplateDetail";
 var TextArea = Input.TextArea;
@@ -72,6 +73,13 @@ var RejectedModal = function RejectedModal(_ref) {
     placeholder: "\u8BF7\u8F93\u5165\u5907\u6CE8\u5185\u5BB9",
     showCount: true,
     maxLength: 200
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u56FE\u7247",
+    name: "imgList"
+  }, /*#__PURE__*/React.createElement(ApaasUploadAsync, {
+    maxCount: 5,
+    uniqueKey: "remark",
+    hostUrl: "https://kefu.kuaimai.com"
   })))));
 };
 export default RejectedModal;

package/dist/esm/FlowTemplateDetail/components/RemarkListModal/index.js

@@ -13,7 +13,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useState } from 'react';
-import { Modal, Timeline } from 'antd';
+import { Modal, Timeline, Image } from 'antd';
 import { useSelector, useDispatch } from 'react-redux';
 import { cloneDeep } from 'lodash';
 import { selectVisibleRemarkList, selectRemarkRecordList } from "../../../model/flowTemplateDetail/selector";
@@ -29,7 +29,8 @@ var Record = function Record(props) {
     operatorType = props.operatorType,
     nodeName = props.nodeName,
     workOrderUpdateLog = props.workOrderUpdateLog,
-    componentDtoList = props.componentDtoList;
+    componentDtoList = props.componentDtoList,
+    imgList = props.imgList;
   return /*#__PURE__*/React.createElement("div", {
     className: styles.remarkContext
   }, /*#__PURE__*/React.createElement("div", {
@@ -42,7 +43,13 @@ var Record = function Record(props) {
     className: styles.tag
   }, getFlowOperate === null || getFlowOperate === void 0 ? void 0 : getFlowOperate[operatorType]))), /*#__PURE__*/React.createElement("div", null, "\u8282\u70B9\uFF1A", nodeName), /*#__PURE__*/React.createElement("div", {
     className: styles.context
-  }, context), workOrderUpdateLog ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(OperationLog, {
+  }, /*#__PURE__*/React.createElement("div", null, context), /*#__PURE__*/React.createElement("div", null, imgList === null || imgList === void 0 ? void 0 : imgList.map(function (item) {
+    return /*#__PURE__*/React.createElement(Image, {
+      width: 40,
+      height: 40,
+      src: "https://kefu.kuaimai.com/".concat(item)
+    });
+  }))), workOrderUpdateLog ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(OperationLog, {
     content: workOrderUpdateLog.content,
     operation: workOrderUpdateLog.operation,
     componentDtoList: componentDtoList

package/dist/esm/FlowTemplateDetail/components/RemarkModal/index.js

@@ -16,6 +16,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React from 'react';
 import { Modal, Form, Input } from 'antd';
 import { useSelector, useDispatch } from 'react-redux';
+import { ApaasUploadAsync } from '@kmkf-fe-packages/basic-components';
 import { selectAddRemarkVisible } from "../../../model/flowTemplateDetail/selector";
 import { setAddRemarkVisible } from "../../../model/flowTemplateDetail";
 var TextArea = Input.TextArea;
@@ -80,6 +81,13 @@ var RemarkModal = function RemarkModal(_ref) {
     placeholder: "\u8BF7\u8F93\u5165\u5907\u6CE8\u5185\u5BB9",
     showCount: true,
     maxLength: 200
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u56FE\u7247",
+    name: "imgList"
+  }, /*#__PURE__*/React.createElement(ApaasUploadAsync, {
+    maxCount: 5,
+    uniqueKey: "remark",
+    hostUrl: "https://kefu.kuaimai.com"
   })))));
 };
 export default RemarkModal;

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

@@ -3,6 +3,7 @@ interface RemarkShowProps {
     time: string;
     operator: string;
     context: string;
+    imgList: Array<string>;
     operatorType: string;
     handleOpenRemarkList: () => void;
     handleOpenAddRemark: () => void;

package/dist/esm/FlowTemplateDetail/components/RemarkShow/index.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import { Image } from 'antd';
 import { getFlowOperate } from "../../common";
 import styles from "./index.module.less";
 var RemarkShow = function RemarkShow(props) {
@@ -7,7 +8,8 @@ var RemarkShow = function RemarkShow(props) {
     context = props.context,
     operatorType = props.operatorType,
     handleOpenRemarkList = props.handleOpenRemarkList,
-    handleOpenAddRemark = props.handleOpenAddRemark;
+    handleOpenAddRemark = props.handleOpenAddRemark,
+    imgList = props.imgList;
   return /*#__PURE__*/React.createElement("div", {
     className: styles.remarkContext
   }, /*#__PURE__*/React.createElement("div", {
@@ -26,6 +28,12 @@ var RemarkShow = function RemarkShow(props) {
     onClick: handleOpenRemarkList
   }, "\u8BB0\u5F55"))), /*#__PURE__*/React.createElement("div", {
     className: styles.context
-  }, context));
+  }, /*#__PURE__*/React.createElement("span", null, context), /*#__PURE__*/React.createElement(React.Fragment, null, imgList === null || imgList === void 0 ? void 0 : imgList.map(function (item) {
+    return /*#__PURE__*/React.createElement(Image, {
+      width: 20,
+      height: 20,
+      src: "https://kefu.kuaimai.com/".concat(item)
+    });
+  }))));
 };
 export default RemarkShow;

package/dist/esm/FlowTemplateDetail/components/StopModal/index.js

@@ -11,6 +11,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React from 'react';
 import { Modal, Form, Input } from 'antd';
 import { useSelector, useDispatch } from 'react-redux';
+import { ApaasUploadAsync } from '@kmkf-fe-packages/basic-components';
 import { selectCurrentAction } from "../../../model/flowTemplateDetail/selector";
 import { setAction } from "../../../model/flowTemplateDetail";
 var TextArea = Input.TextArea;
@@ -71,6 +72,13 @@ var StopModal = function StopModal(_ref) {
     placeholder: "\u8BF7\u8F93\u5165\u5907\u6CE8\u5185\u5BB9",
     showCount: true,
     maxLength: 200
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u56FE\u7247",
+    name: "imgList"
+  }, /*#__PURE__*/React.createElement(ApaasUploadAsync, {
+    maxCount: 5,
+    uniqueKey: "remark",
+    hostUrl: "https://kefu.kuaimai.com"
   })))));
 };
 export default StopModal;

package/dist/esm/FlowTemplateDetail/components/WithdrawModal/index.js

@@ -11,6 +11,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React from 'react';
 import { Modal, Form, Input } from 'antd';
 import { useSelector, useDispatch } from 'react-redux';
+import { ApaasUploadAsync } from '@kmkf-fe-packages/basic-components';
 import { selectCurrentAction } from "../../../model/flowTemplateDetail/selector";
 import { setAction } from "../../../model/flowTemplateDetail";
 var TextArea = Input.TextArea;
@@ -71,6 +72,13 @@ var WithdrawModal = function WithdrawModal(_ref) {
     placeholder: "\u8BF7\u8F93\u5165\u5907\u6CE8\u5185\u5BB9",
     showCount: true,
     maxLength: 200
+  })), /*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u56FE\u7247",
+    name: "imgList"
+  }, /*#__PURE__*/React.createElement(ApaasUploadAsync, {
+    maxCount: 5,
+    uniqueKey: "remark",
+    hostUrl: "https://kefu.kuaimai.com"
   })))));
 };
 export default WithdrawModal;

package/dist/esm/FlowTemplateDetail/index.js

@@ -204,8 +204,8 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
             }
             return _context.abrupt("return");
           case 3:
-            saveRequestLock.current = true;
             dispatch(setLoading(true));
+            saveRequestLock.current = true;
             update = !!(currentNodeDetail !== null && currentNodeDetail !== void 0 && currentNodeDetail.workOrder); // 如果workOrder有值的情况下，表示我们是更新操作
             formData = form.getFieldsValue();
             if (formData.shopId) {
@@ -337,8 +337,8 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
             }
             return _context3.abrupt("return");
           case 3:
-            submitRequestLock.current = true;
             dispatch(setLoading(true));
+            submitRequestLock.current = true;
             _context3.next = 7;
             return form.validateFields();
           case 7:

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

@@ -156,7 +156,8 @@ export var fetchAllFlowOperateRecord = function fetchAllFlowOperateRecord(params
                   time: (item === null || item === void 0 ? void 0 : item.created) || '',
                   operator: (item === null || item === void 0 ? void 0 : item.operator) || '',
                   context: (item === null || item === void 0 ? void 0 : item.remark) || '',
-                  operatorType: (item === null || item === void 0 ? void 0 : item.flowOperateType) || ''
+                  operatorType: (item === null || item === void 0 ? void 0 : item.flowOperateType) || '',
+                  imgList: (item === null || item === void 0 ? void 0 : item.imgList) || []
                 });
               });
               dispatch(setRemarkList(list || []));

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

@@ -13,6 +13,7 @@ export interface Remark {
     operator: string;
     context: string;
     operatorType: string;
+    imgList: Array<string>;
 }
 export interface PlatFormInfo {
     orderNo?: string;
@@ -905,6 +906,10 @@ export interface QyFlowOperateQueryAllFlowOperateRecordResponse {
      * 备注
      */
     remark?: string;
+    /**
+     * 图片
+     */
+    imgList?: Array<string>;
     /**
      * 版本号
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "0.13.5",
+  "version": "0.14.1-alpha.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.13.1",
     "@kmkf-fe-packages/kmkf-utils": "^0.13.1",
-    "@kmkf-fe-packages/services-components": "^0.13.5",
+    "@kmkf-fe-packages/services-components": "^0.13.1",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -72,7 +72,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "51c8b8dd7ed3f42f27a6c0b5651210e3b688e465",
+  "gitHead": "8861f047ac0d4b4705231f0fdc11464f82a2ca00",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }