kmkf-work-order-service-component 0.0.1-alpha.17 → 0.0.1-alpha.19

package/README.md

@@ -3,7 +3,7 @@
  * @Author: litian
  * @Date: 2022-09-21 09:16:51
  * @LastEditors: litian
- * @LastEditTime: 2022-09-22 11:27:58
+ * @LastEditTime: 2022-10-10 16:17:49
 -->
 
 # kmkf-work-order-service-component
@@ -52,7 +52,7 @@ link 方式 https://cloud.tencent.com/developer/article/1842631
 ```
 import { WorkOrder } from 'kmkf-work-order-service-component'
 
-cosnt Text = ()=>{
+const Text = ()=>{
   return <WorkOrder platform="FXG"
         shopId={shopId}
         buyerNick={buyerNick}

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

@@ -553,7 +553,7 @@ var transDataSource = function transDataSource(templateColumns) {
       } else if (nex.workOrderComponentType === 'REMARK_INPUT') {
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
           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) : '',
-          remark: item.jsonMap["".concat(nex.uniqueKey, "_remark")] || (config === null || config === void 0 ? void 0 : config.remark)
+          remark: item.jsonMap["".concat(nex.uniqueKey, "_remark")] || (config === null || config === void 0 ? void 0 : config.remark) || ''
         }));
       } else if (nex.workOrderComponentType === 'STATUS') {
         var _objectSpread28;
@@ -707,7 +707,7 @@ export var orderBack = /*#__PURE__*/function () {
                     break;
 
                   case 'remark':
-                    prv[uniqueKey + '_remark'] = detail['remark'];
+                    prv[uniqueKey + '_remark'] = detail['remark'] || '';
                     prv[uniqueKey + '_flag'] = detail['flag'];
                     break;
 

package/dist/esm/WorkOrder/components/ListOrderItem/index.js

@@ -21,7 +21,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
  * @Author: litian
  * @Date: 2022-09-07 17:04:02
  * @LastEditors: litian
- * @LastEditTime: 2022-09-27 18:57:14
+ * @LastEditTime: 2022-09-29 16:19:54
  */
 import React from 'react';
 import { factory } from "../Widget";
@@ -29,6 +29,7 @@ import { calcWorkOrderList } from "../../common/utils/tools";
 import { Modal, Divider } from 'antd';
 import moment from 'moment';
 import { dealWorkOrder } from "../../model/servers/api";
+import { isEmpty } from 'lodash';
 import styles from "./index.module.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -277,16 +278,16 @@ function ListOrderItem(props) {
       var subColumns = instance.getColumns(); // 复合组件存在多个字段展示
 
       return subColumns !== null && subColumns !== void 0 && subColumns.children ? subColumns.children.map(function (item) {
-        return ItemView({
+        return !isEmpty(transData[(item === null || item === void 0 ? void 0 : item.dataIndex) || '']) ? ItemView({
           label: item.title,
           value: item.render(transData[(item === null || item === void 0 ? void 0 : item.dataIndex) || ''], transData),
           key: item.dataIndex
-        });
-      }) : ItemView({
+        }) : null;
+      }) : !isEmpty(transData[(subColumns === null || subColumns === void 0 ? void 0 : subColumns.dataIndex) || '']) ? ItemView({
         label: t.name,
         value: instance.render(transData[(subColumns === null || subColumns === void 0 ? void 0 : subColumns.dataIndex) || ''], transData),
         key: t.uniqueKey
-      });
+      }) : null;
     })]
   });
 }

package/dist/esm/WorkOrder/components/Widget/basic/Picture/index.js

@@ -31,7 +31,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Author: litian
  * @Date: 2022-09-07 17:58:35
  * @LastEditors: litian
- * @LastEditTime: 2022-09-28 14:37:28
+ * @LastEditTime: 2022-10-10 17:21:00
  */
 import React from 'react';
 import BasicComponent from "../../BasicComponent";

package/dist/esm/WorkOrder/index.js

@@ -27,8 +27,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 /*
  * @Author: wangzhenggui jianjia.wzg@raycloud.com
  * @Date: 2022-09-16 11:19:43
- * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-10-10 11:27:26
+ * @LastEditors: litian
+ * @LastEditTime: 2022-10-10 17:28:55
  * @FilePath: /kmkf-work-order-service-component/src/WorkOrder/index.tsx
  * @Description:
  *

package/dist/esm/WorkOrder/model/workOrder.js

@@ -29,7 +29,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
  * @Author: litian
  * @Date: 2022-09-06 17:44:56
  * @LastEditors: wangzhenggui jianjia.wzg@raycloud.com
- * @LastEditTime: 2022-10-10 10:14:26
+ * @LastEditTime: 2022-10-10 15:41:22
  */
 import { createSlice, createAsyncThunk } from '@reduxjs/toolkit';
 import { queryGroupCustomTemplate, queryWorkOrder, queryCurrentCompanyUser, queryPaymentWorkOrderList } from "../model/servers/api";
@@ -144,7 +144,7 @@ export var fetchQueryWorkOrder = createAsyncThunk('workOrder/queryWorkOrder', /*
             };
 
             if (isBuyer) {
-              params.buyerNick = global.platformInfo.buyerNick;
+              // params.buyerNick = global.platformInfo.buyerNick;
               params.buyerOpenUid = global.platformInfo.buyerId;
             }
 
@@ -200,7 +200,7 @@ export var fetchQueryPaymentWorkOrderList = createAsyncThunk('workOrder/queryPay
             }
 
             if (isBuyer) {
-              params.buyerNick = global.platformInfo.buyerNick;
+              // params.buyerNick = global.platformInfo.buyerNick;
               params.buyerOpenUid = global.platformInfo.buyerId;
             }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kmkf-work-order-service-component",
-  "version": "0.0.1-alpha.17",
+  "version": "0.0.1-alpha.19",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -37,7 +37,7 @@
     "react-dom": "^17.0.2"
   },
   "dependencies": {
-    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.0.21-alpha.2",
+    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.0.22-alpha.2",
     "@reduxjs/toolkit": "^1.8.5",
     "react-redux": "^7.2.8",
     "store2": "^2.14.2",