kmkf-work-order-service-component 0.0.1-alpha.18 → 0.0.1-alpha.20

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.
package/README.md CHANGED
@@ -3,7 +3,7 @@
3
3
  * @Author: litian
4
4
  * @Date: 2022-09-21 09:16:51
5
5
  * @LastEditors: litian
6
- * @LastEditTime: 2022-09-22 11:27:58
6
+ * @LastEditTime: 2022-10-10 16:17:49
7
7
  -->
8
8
 
9
9
  # kmkf-work-order-service-component
@@ -52,7 +52,7 @@ link 方式 https://cloud.tencent.com/developer/article/1842631
52
52
  ```
53
53
  import { WorkOrder } from 'kmkf-work-order-service-component'
54
54
 
55
- cosnt Text = ()=>{
55
+ const Text = ()=>{
56
56
  return <WorkOrder platform="FXG"
57
57
  shopId={shopId}
58
58
  buyerNick={buyerNick}
@@ -553,7 +553,7 @@ var transDataSource = function transDataSource(templateColumns) {
553
553
  } else if (nex.workOrderComponentType === 'REMARK_INPUT') {
554
554
  return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
555
555
  flag: item.jsonMap["".concat(nex.uniqueKey, "_flag")] ? +item.jsonMap["".concat(nex.uniqueKey, "_flag")] : config !== null && config !== void 0 && config.flag ? +(config === null || config === void 0 ? void 0 : config.flag) : '',
556
- remark: item.jsonMap["".concat(nex.uniqueKey, "_remark")] || (config === null || config === void 0 ? void 0 : config.remark)
556
+ remark: item.jsonMap["".concat(nex.uniqueKey, "_remark")] || (config === null || config === void 0 ? void 0 : config.remark) || ''
557
557
  }));
558
558
  } else if (nex.workOrderComponentType === 'STATUS') {
559
559
  var _objectSpread28;
@@ -707,7 +707,7 @@ export var orderBack = /*#__PURE__*/function () {
707
707
  break;
708
708
 
709
709
  case 'remark':
710
- prv[uniqueKey + '_remark'] = detail['remark'];
710
+ prv[uniqueKey + '_remark'] = detail['remark'] || '';
711
711
  prv[uniqueKey + '_flag'] = detail['flag'];
712
712
  break;
713
713
 
@@ -149,6 +149,7 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
149
149
 
150
150
  if (success && typeof onSuccess === 'function') {
151
151
  closeModal();
152
+ form.resetFields();
152
153
  message.success('编辑成功');
153
154
  onSuccess({
154
155
  type: 'EDIT',
@@ -206,6 +207,7 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
206
207
 
207
208
  if (_success && typeof onSuccess === 'function') {
208
209
  closeModal();
210
+ form.resetFields();
209
211
  message.success('添加成功');
210
212
  onSuccess({
211
213
  type: 'ADD',
@@ -460,6 +462,7 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
460
462
  open: visible,
461
463
  onClose: closeModal,
462
464
  footer: renderFooter(),
465
+ destroyOnClose: true,
463
466
  children: /*#__PURE__*/_jsx(Spin, {
464
467
  spinning: loading,
465
468
  children: /*#__PURE__*/_jsx(ConfigProvider, {
@@ -21,7 +21,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
21
21
  * @Author: litian
22
22
  * @Date: 2022-09-07 17:04:02
23
23
  * @LastEditors: litian
24
- * @LastEditTime: 2022-09-27 18:57:14
24
+ * @LastEditTime: 2022-09-29 16:19:54
25
25
  */
26
26
  import React from 'react';
27
27
  import { factory } from "../Widget";
@@ -29,6 +29,7 @@ import { calcWorkOrderList } from "../../common/utils/tools";
29
29
  import { Modal, Divider } from 'antd';
30
30
  import moment from 'moment';
31
31
  import { dealWorkOrder } from "../../model/servers/api";
32
+ import { isEmpty } from 'lodash';
32
33
  import styles from "./index.module.less";
33
34
  import { jsx as _jsx } from "react/jsx-runtime";
34
35
  import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -277,16 +278,16 @@ function ListOrderItem(props) {
277
278
  var subColumns = instance.getColumns(); // 复合组件存在多个字段展示
278
279
 
279
280
  return subColumns !== null && subColumns !== void 0 && subColumns.children ? subColumns.children.map(function (item) {
280
- return ItemView({
281
+ return !isEmpty(transData[(item === null || item === void 0 ? void 0 : item.dataIndex) || '']) ? ItemView({
281
282
  label: item.title,
282
283
  value: item.render(transData[(item === null || item === void 0 ? void 0 : item.dataIndex) || ''], transData),
283
284
  key: item.dataIndex
284
- });
285
- }) : ItemView({
285
+ }) : null;
286
+ }) : !isEmpty(transData[(subColumns === null || subColumns === void 0 ? void 0 : subColumns.dataIndex) || '']) ? ItemView({
286
287
  label: t.name,
287
288
  value: instance.render(transData[(subColumns === null || subColumns === void 0 ? void 0 : subColumns.dataIndex) || ''], transData),
288
289
  key: t.uniqueKey
289
- });
290
+ }) : null;
290
291
  })]
291
292
  });
292
293
  }
@@ -134,6 +134,7 @@ function ModifyModal(props, ref) {
134
134
 
135
135
  if (success) {
136
136
  message.success('保存成功');
137
+ form.resetFields();
137
138
  afterSuccessUpdateWorkOrder && afterSuccessUpdateWorkOrder(1); // 重新查询表格
138
139
 
139
140
  setVisible(false);
@@ -210,6 +211,7 @@ function ModifyModal(props, ref) {
210
211
  return setVisible(false);
211
212
  },
212
213
  title: "\u5F55\u5165\u5DE5\u5355",
214
+ destroyOnClose: true,
213
215
  footer: /*#__PURE__*/_jsxs(Space, {
214
216
  style: {
215
217
  float: 'right'
@@ -31,7 +31,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
31
31
  * @Author: litian
32
32
  * @Date: 2022-09-07 17:58:35
33
33
  * @LastEditors: litian
34
- * @LastEditTime: 2022-09-28 14:37:28
34
+ * @LastEditTime: 2022-10-10 17:21:00
35
35
  */
36
36
  import React from 'react';
37
37
  import BasicComponent from "../../BasicComponent";
@@ -27,8 +27,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
27
27
  /*
28
28
  * @Author: wangzhenggui jianjia.wzg@raycloud.com
29
29
  * @Date: 2022-09-16 11:19:43
30
- * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
31
- * @LastEditTime: 2022-10-10 11:27:26
30
+ * @LastEditors: litian
31
+ * @LastEditTime: 2022-10-10 17:28:55
32
32
  * @FilePath: /kmkf-work-order-service-component/src/WorkOrder/index.tsx
33
33
  * @Description:
34
34
  *
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "kmkf-work-order-service-component",
3
- "version": "0.0.1-alpha.18",
3
+ "version": "0.0.1-alpha.20",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",
@@ -37,7 +37,7 @@
37
37
  "react-dom": "^17.0.2"
38
38
  },
39
39
  "dependencies": {
40
- "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.0.21-alpha.2",
40
+ "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.0.22-alpha.2",
41
41
  "@reduxjs/toolkit": "^1.8.5",
42
42
  "react-redux": "^7.2.8",
43
43
  "store2": "^2.14.2",