@kmkf-fe-packages/kmkf-work-order-service-component 1.15.1-alpha.0 → 1.16.2

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

@@ -25,7 +25,7 @@ import React, { useState, useRef, useEffect, useMemo, forwardRef, useImperativeH
 import { ConfigProvider, Form, Space, Tag } from 'antd';
 import { useWhyDidYouUpdate } from 'ahooks';
 import zhCN from 'antd/es/locale/zh_CN';
-import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle, groupBy } from 'lodash';
+import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle, groupBy, find } from 'lodash';
 import 'moment/locale/zh-cn';
 import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, EXCLUDE_REPLACE_TOP_COMPONENT,
 // 重复检验不需要展示在顶部的
@@ -813,6 +813,10 @@ var FormRender = function FormRender(props, ref) {
     //现支持子组件控制显隐，格式为${uniqueKey}_${type}与普通组件做区分
     var isChildField = item.leftValue.includes('_');
     var prefixId = isChildField ? (_item$leftValue$split = item.leftValue.split('_')) === null || _item$leftValue$split === void 0 ? void 0 : _item$leftValue$split[0] : item.leftValue;
+    // 将prefixId为userId转成shopId
+    if (prefixId === 'userId') {
+      prefixId = 'shopId';
+    }
     var childFieldType = isChildField ? (_item$leftValue$split2 = item.leftValue.split('_')) === null || _item$leftValue$split2 === void 0 ? void 0 : _item$leftValue$split2[1] : '';
     var dependenceDetail = getComponentDetailByFieldId(prefixId);
     if (isChildField && CHILD_FIELD_TYPE[childFieldType]) {
@@ -821,6 +825,12 @@ var FormRender = function FormRender(props, ref) {
       dependenceDetail = ((_dependenceDetail = dependenceDetail) === null || _dependenceDetail === void 0 ? void 0 : _dependenceDetail[childType]) || dependenceDetail;
     }
     var leftValue = getFieldValue(prefixId);
+    // 显隐条件中rightValue为shopUniqueKey form获取shopId需要转化后匹配
+    if (prefixId === 'shopId') {
+      leftValue = get(find(shopList, function (s) {
+        return s.shopId === leftValue;
+      }), 'accessToken', '');
+    }
     if (isChildField) {
       var _leftValue;
       leftValue = CHILD_FIELD_VALUE !== null && CHILD_FIELD_VALUE !== void 0 && CHILD_FIELD_VALUE[childFieldType] ? (_leftValue = leftValue) === null || _leftValue === void 0 ? void 0 : _leftValue[CHILD_FIELD_VALUE[childFieldType]] : '';

package/dist/esm/FlowTemplateDetailV2/common.d.ts

@@ -12,8 +12,6 @@ export declare const FLOW_STATUS_V2: {
     STOPPING: string;
     COMPLETED: string;
     CLOSED: string;
-    FLOWING: string;
-    RETURNING: string;
 };
 export declare const CANNOT_BACK_FILL: string[];
 export declare const verifyHandle: (data: any, componentDtoList: Array<any>) => {

package/dist/esm/FlowTemplateDetailV2/common.js

@@ -49,9 +49,7 @@ export var FLOW_STATUS_V2 = {
   PROCESSING: '处理中',
   STOPPING: '暂停中',
   COMPLETED: '已完成',
-  CLOSED: '已关闭',
-  FLOWING: '流转中',
-  RETURNING: '回退中'
+  CLOSED: '已关闭'
 };
 //不能回填的组件type
 export var CANNOT_BACK_FILL = ['LOGISTICS_TRAJECTORY', 'LOGISTICS_TRAJECTORY_MORE', 'BUYER_MESSAGE_NOTICE', 'MSG_STATUS', 'NEW_PAYMENT_STATUS', 'REISSUE_STATUS', 'REISSUE_LOGISTICS', 'RETURN_GOODS_STATUS', 'RETURN_GOODS_TRADE_ID', 'ADJUST_WORK_ORDER_STATUS', 'INVOICE_STATUS', 'INVOICING_STATUS', 'EXCHANGE_STATUS', 'WAREHOUSING_STATUS', 'EXCHANGE_TRADE_ID', 'REISSUE_TRADE_ID', 'LOGISTICS_INTERCEPTION', 'LOGISTICS_INTERCEPTION_MORE'];

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

@@ -10,7 +10,7 @@ var getActionMap = function getActionMap(nodeStatus, hasPreNode, flowType) {
     return flowType === FlowType.SINGLE_PAGE ? ['save', 'forward', 'close', 'stop', 'submit'] : ['forward', 'save', 'submit', 'close', 'stop'];
   } else if (nodeStatus === FlowStatus.STOPPING) {
     return ['open', 'close'];
-  } else if ([FlowStatus.CLOSE, FlowStatus.COMPLETED, FlowStatus.RETURNING, FlowStatus.FLOWING].includes(nodeStatus)) {
+  } else if (nodeStatus === FlowStatus.CLOSE || nodeStatus === FlowStatus.COMPLETED) {
     return [];
   } else {
     return ['save', 'submit'];

package/dist/esm/FlowTemplateDetailV2/index.less

@@ -29,12 +29,6 @@
     .PROCESSING {
       background-color: #FAAD14;
     }
-    .FLOWING {
-      background-color: #FAAD14;
-    }
-    .RETURNING {
-      background-color: #FAAD14;
-    }
     .STOPPING {
       background-color: #FF4D4F;
     }

package/dist/esm/FormRender/index.js

@@ -650,6 +650,10 @@ var FormRender = function FormRender(props, ref) {
     //现支持子组件控制显隐，格式为${uniqueKey}_${type}与普通组件做区分
     var isChildField = item.leftValue.includes('_');
     var prefixId = isChildField ? (_item$leftValue$split = item.leftValue.split('_')) === null || _item$leftValue$split === void 0 ? void 0 : _item$leftValue$split[0] : item.leftValue;
+    // 将prefixId为userId转成shopId
+    if (prefixId === 'userId') {
+      prefixId = 'shopId';
+    }
     var childFieldType = isChildField ? (_item$leftValue$split2 = item.leftValue.split('_')) === null || _item$leftValue$split2 === void 0 ? void 0 : _item$leftValue$split2[1] : '';
     var dependenceDetail = getComponentDetailByFieldId(prefixId);
     if (isChildField && CHILD_FIELD_TYPE[childFieldType]) {
@@ -658,6 +662,12 @@ var FormRender = function FormRender(props, ref) {
       dependenceDetail = ((_dependenceDetail = dependenceDetail) === null || _dependenceDetail === void 0 ? void 0 : _dependenceDetail[childType]) || dependenceDetail;
     }
     var leftValue = getFieldValue(prefixId);
+    // 显隐条件中rightValue为shopUniqueKey form获取shopId需要转化后匹配
+    if (prefixId === 'shopId') {
+      leftValue = get(find(shopList, function (s) {
+        return s.shopId === leftValue;
+      }), 'accessToken', '');
+    }
     if (isChildField) {
       var _leftValue;
       leftValue = CHILD_FIELD_VALUE !== null && CHILD_FIELD_VALUE !== void 0 && CHILD_FIELD_VALUE[childFieldType] ? (_leftValue = leftValue) === null || _leftValue === void 0 ? void 0 : _leftValue[CHILD_FIELD_VALUE[childFieldType]] : '';

package/dist/esm/WorkOrder/components/WorkOrderList/components/CustomizeWorkOrderCard/index.js

@@ -38,14 +38,6 @@ var FlowStatus = {
   CLOSED: {
     name: '已关闭',
     class: 'status_close'
-  },
-  FLOWING: {
-    name: '流转中',
-    class: 'status_handle'
-  },
-  RETURNING: {
-    name: '回退中',
-    class: 'status_handle'
   }
 };
 var CustomizeWorkOrderCard = function CustomizeWorkOrderCard(props) {

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

@@ -41,12 +41,6 @@ var workOrderStatus = [{
 }, {
   label: '已关闭',
   value: 'CLOSED'
-}, {
-  label: '流转中',
-  value: 'FLOWING'
-}, {
-  label: '回退中',
-  value: 'RETURNING'
 }];
 var getTableData = function getTableData(_ref) {
   var checkedBuyerId = _ref.checkedBuyerId,

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

@@ -875,9 +875,7 @@ export declare enum FlowStatus {
     PROCESSING = "PROCESSING",
     STOPPING = "STOPPING",
     COMPLETED = "COMPLETED",
-    CLOSE = "CLOSED",
-    FLOWING = "FLOWING",
-    RETURNING = "RETURNING"
+    CLOSE = "CLOSED"
 }
 export declare enum FlowType {
     SINGLE_PAGE = "SINGLE_PAGE",

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

@@ -44,8 +44,6 @@ export var FlowStatus;
   FlowStatus["STOPPING"] = "STOPPING";
   FlowStatus["COMPLETED"] = "COMPLETED";
   FlowStatus["CLOSE"] = "CLOSED";
-  FlowStatus["FLOWING"] = "FLOWING";
-  FlowStatus["RETURNING"] = "RETURNING";
 })(FlowStatus || (FlowStatus = {}));
 export var FlowType;
 (function (FlowType) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "1.15.1-alpha.0",
+  "version": "1.16.2",
   "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": "1.15.1-alpha.0",
-    "@kmkf-fe-packages/kmkf-utils": "1.15.1-alpha.0",
-    "@kmkf-fe-packages/services-components": "1.15.1-alpha.0",
+    "@kmkf-fe-packages/basic-components": "1.16.2",
+    "@kmkf-fe-packages/kmkf-utils": "1.16.2",
+    "@kmkf-fe-packages/services-components": "1.16.2",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6f12b66e496625df688d9a617053b8ddec1d8e38",
+  "gitHead": "7325b1362937151eb0501ec04f90139c03cfbb25",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }