@kmkf-fe-packages/kmkf-work-order-service-component 2.10.19 → 2.10.20

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

@@ -424,7 +424,7 @@ var CurrentNode = function CurrentNode(props, ref) {
   }();
   var isArtificialNode = tag === 'artificial';
   var isAutoNode = tag === 'auto';
-  var isShowAutoNodeDetail = isAutoNode && ['ORDER_MEMO_MANY_RULES', 'AFTER_SALE_AUTO_RETURN_GOODS_AGREE_REJECT', 'AFTER_SALE_AUTO_REFUND_REJECT', 'LOGISTICS_INTERCEPT_MULTI_RULE', 'MESSAGE_NOTIFY_EVENT', 'DING_TALK_ROBOT_NOTIFY', 'HTTP_INVOKE', 'ORDER_MEMO', 'LBDJ_ONE_PRICE_ORDER', 'JST_OBTAIN_REISSUE_LOGISTICS', 'JST_REISSUE_NEW', 'JST_RETURN_EXCHANGE', 'JST_INBOUND_STATUS_SYNC', 'KM_WAREHOUSING_STATUS_EVENT', 'DAXIDI_INBOUND_STATUS_SYNC'].includes(eventType);
+  var isShowAutoNodeDetail = isAutoNode && ['ORDER_MEMO_MANY_RULES', 'AFTER_SALE_AUTO_RETURN_GOODS_AGREE_REJECT', 'AFTER_SALE_AUTO_REFUND_REJECT', 'LOGISTICS_INTERCEPT_MULTI_RULE', 'MESSAGE_NOTIFY_EVENT', 'DING_TALK_ROBOT_NOTIFY', 'HTTP_INVOKE', 'ORDER_MEMO', 'LBDJ_ONE_PRICE_ORDER', 'JST_OBTAIN_REISSUE_LOGISTICS', 'JST_REISSUE_NEW', 'JST_RETURN_EXCHANGE', 'JST_INBOUND_STATUS_SYNC', 'KM_WAREHOUSING_STATUS_EVENT', 'DAXIDI_INBOUND_STATUS_SYNC', 'MESSAGE_CHANNEL_SEND'].includes(eventType);
   var showEdit = isArtificialNode && isCurrentNodeHandler && !readonly && (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo12 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo12 === void 0 ? void 0 : _currentNodeDetail$wo12.flowStatus) === FlowStatus.COMPLETED;
   // TODO: 决策节点给后端修复数据加了一个入口
   // @ts-ignore
@@ -495,7 +495,8 @@ var CurrentNode = function CurrentNode(props, ref) {
     workOrderTemplateInfo: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
     transData: transData,
     platform: plat.platform,
-    onOpenWangWang: onOpenWangWang
+    onOpenWangWang: onOpenWangWang,
+    shopList: shopList
   }) : /*#__PURE__*/React.createElement(FormRender, {
     ref: formRenderRef,
     isShowShopList: NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no24 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no24 === void 0 ? void 0 : _currentNodeDetail$no24.nodeType) && [PlatForm.PC, PlatForm.WEB].includes(plat.platform),

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

@@ -33,7 +33,7 @@ import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME,
 INNER_REPLACE_COMPONENT, reversalFormValues, wdtReturnBillNoBackValues, afterSaleOrderBackValues, bsSystemOrderBackValues, kmSystemOrderBackValues, bsE3SystemOrderBackValues, wlnSystemOrderBackValues, gySystemOrderBackValues, jstSystemOrderBackValues, jySystemOrderBackValues, jkySystemOrderBackValues, dxdSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, getMappingTargetValue, FIXED_FIELD_CAN_MODIFY_SHOP } from "../../../common/utils/tools";
 import { replaceCheck, orderDetail, queryLabelByTradeId, queryMemberLevel } from "../../../model/servers/api";
 import { factory } from '@kmkf-fe-packages/services-components';
-import { getExpression, formatDisplayConfig, isNull, LabelData, setSessionStorage, afterSaleOrderBack, DxdSuppliersData } from '@kmkf-fe-packages/kmkf-utils';
+import { getExpression, formatDisplayConfig, isNull, LabelData, setSessionStorage, afterSaleOrderBack, DxdSuppliersData, isYouzanShop } from '@kmkf-fe-packages/kmkf-utils';
 import ShopName from "../ShopName";
 import { PlatForm } from "../../../model/flowTemplateDetail/types";
 import { groupByPreNode, getCurrentNodeModifiedShowHideRule } from "./common";
@@ -397,7 +397,7 @@ var FormRender = function FormRender(props, ref) {
     var shop = (shopList || []).find(function (item) {
       return item.shopId === shopId;
     });
-    if (shop && !shop.notJoin && ['TAOBAO', 'JD', 'PDD', 'YLBB', 'KS', 'FXG', 'SPH', 'WXXD', 'XHS'].includes(shop.shopSourceStr)) {
+    if (shop && !shop.notJoin && (isYouzanShop(shop) || ['TAOBAO', 'JD', 'PDD', 'YLBB', 'KS', 'FXG', 'SPH', 'WXXD', 'XHS'].includes(shop.shopSourceStr))) {
       orderDetail({
         shopId: shopId,
         //店铺id

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

@@ -275,7 +275,7 @@ var NodeItem = function NodeItem(props) {
       isAllStaff: data === null || data === void 0 ? void 0 : (_data$data11 = data.data) === null || _data$data11 === void 0 ? void 0 : (_data$data11$nodeInfo = _data$data11.nodeInfo) === null || _data$data11$nodeInfo === void 0 ? void 0 : (_data$data11$nodeInfo2 = _data$data11$nodeInfo.assistants) === null || _data$data11$nodeInfo2 === void 0 ? void 0 : _data$data11$nodeInfo2.isAllStaff
     });
   }, [data, plat.userKey, assistantMap]);
-  var isShowAutoNodeDetail = isAutoNode && ['ORDER_MEMO_MANY_RULES', 'AFTER_SALE_AUTO_RETURN_GOODS_AGREE_REJECT', 'AFTER_SALE_AUTO_REFUND_REJECT', 'LOGISTICS_INTERCEPT_MULTI_RULE', 'MESSAGE_NOTIFY_EVENT', 'DING_TALK_ROBOT_NOTIFY', 'HTTP_INVOKE', 'ORDER_MEMO', 'WDT_STORE_STATUS', 'BS_E3_RETAIL_RETURN_IN_STOCK_SYNC', 'RETAIL_RETURN_IN_STOCK_SYNC', 'PLATFORM_LOGISTICS_INTERCEPT', 'LBDJ_ONE_PRICE_ORDER', 'JST_ORDER_REMARK', 'KM_WAREHOUSING_STATUS_EVENT', 'DAXIDI_INBOUND_STATUS_SYNC', 'JST_OBTAIN_REISSUE_LOGISTICS', 'JST_REISSUE_NEW', 'JST_RETURN_EXCHANGE', 'JST_INBOUND_STATUS_SYNC'].includes(eventNodeType);
+  var isShowAutoNodeDetail = isAutoNode && ['ORDER_MEMO_MANY_RULES', 'AFTER_SALE_AUTO_RETURN_GOODS_AGREE_REJECT', 'AFTER_SALE_AUTO_REFUND_REJECT', 'LOGISTICS_INTERCEPT_MULTI_RULE', 'MESSAGE_NOTIFY_EVENT', 'DING_TALK_ROBOT_NOTIFY', 'HTTP_INVOKE', 'ORDER_MEMO', 'WDT_STORE_STATUS', 'BS_E3_RETAIL_RETURN_IN_STOCK_SYNC', 'RETAIL_RETURN_IN_STOCK_SYNC', 'PLATFORM_LOGISTICS_INTERCEPT', 'LBDJ_ONE_PRICE_ORDER', 'JST_ORDER_REMARK', 'KM_WAREHOUSING_STATUS_EVENT', 'DAXIDI_INBOUND_STATUS_SYNC', 'JST_OBTAIN_REISSUE_LOGISTICS', 'JST_REISSUE_NEW', 'JST_RETURN_EXCHANGE', 'JST_INBOUND_STATUS_SYNC', 'MESSAGE_CHANNEL_SEND'].includes(eventNodeType);
   // 人工节点+打开状态+当前工单提交人是当前完成人+状态是待处理
   var showEdit = isArtificialNode && open && isCurrentNodeHandler && !readonly && [FlowStatus.PROCESSING, FlowStatus.COMPLETED].includes(flowStatus);
 
@@ -347,7 +347,8 @@ var NodeItem = function NodeItem(props) {
     workOrderTemplateInfo: data === null || data === void 0 ? void 0 : (_data$data21 = data.data) === null || _data$data21 === void 0 ? void 0 : _data$data21.workOrderTemplateInfo,
     transData: transData,
     platform: plat.platform,
-    onOpenWangWang: onOpenWangWang
+    onOpenWangWang: onOpenWangWang,
+    shopList: shopList
   })), isShowAutoNodeDetail && /*#__PURE__*/React.createElement(AutoTaskDetail, {
     flowEventData: data === null || data === void 0 ? void 0 : (_data$data22 = data.data) === null || _data$data22 === void 0 ? void 0 : _data$data22.flowEventData,
     shopList: shopList

package/dist/esm/FlowTemplateDetailV2/components/OrderRemark/index.d.ts

@@ -4,6 +4,7 @@ interface OrderRemarkProps {
     shopId: string;
     shopUniqueKey: string;
     shopSourceStr: string;
+    shopSource: string | number;
     tid: string;
     form: FormInstance<any>;
     orderRemarkObj?: {

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

@@ -13,6 +13,8 @@ import { debounce } from 'lodash';
 import { Button, Modal, Form, Input, Radio, message, Space, Checkbox, Popconfirm } from 'antd';
 import { DownOutlined, UpOutlined } from '@ant-design/icons';
 import moment from 'moment';
+import { YouzanStar } from '@kmkf-fe-packages/basic-components';
+import { isYouzanShop, normalizeYouzanStar } from '@kmkf-fe-packages/kmkf-utils';
 var TextArea = Input.TextArea;
 import { updatePlatformMemo, getSellerRemark } from "../../../model/servers/api";
 import styles from "./index.module.less";
@@ -35,11 +37,15 @@ var flagList = [trade0, trade1, trade2, trade3, trade4, trade5];
 var OrderRemark = function OrderRemark(props) {
   var shopUniqueKey = props.shopUniqueKey,
     shopSourceStr = props.shopSourceStr,
+    shopSource = props.shopSource,
     tid = props.tid,
     shopId = props.shopId,
     orderRemarkObj = props.orderRemarkObj,
     plat = props.plat,
     onJumpMemoPage = props.onJumpMemoPage;
+  var isYouzan = isYouzanShop({
+    shopSource: shopSource
+  });
   var _useState = useState({
       remark: '',
       flag: null
@@ -127,7 +133,8 @@ var OrderRemark = function OrderRemark(props) {
     setIsShowDetail(!isShowDetail);
   };
   var resetData = function resetData(remark, flag) {
-    var flagValue = flag || flag === 0 ? Number(flag) : null;
+    var _normalizeYouzanStar;
+    var flagValue = isYouzan ? (_normalizeYouzanStar = normalizeYouzanStar(flag)) !== null && _normalizeYouzanStar !== void 0 ? _normalizeYouzanStar : null : flag || flag === 0 ? Number(flag) : null;
     var remarkValue = remark || '';
     setRemark(remarkValue);
     setFlag(flagValue);
@@ -195,7 +202,11 @@ var OrderRemark = function OrderRemark(props) {
     type: "link"
   }, "\u5C55\u5F00 ", /*#__PURE__*/React.createElement(UpOutlined, null))), /*#__PURE__*/React.createElement("div", {
     className: "".concat(styles['remark-detail-wrap'], " ").concat(!isShowDetailBtn || isShowDetail ? '' : styles.furled)
-  }, /*#__PURE__*/React.createElement("span", null, "\u5356\u5BB6\u5907\u6CE8\uFF1A"), (flag || flag === 0) && flagList[Number(flag)] && /*#__PURE__*/React.createElement("img", {
+  }, /*#__PURE__*/React.createElement("span", null, "\u5356\u5BB6\u5907\u6CE8\uFF1A"), isYouzan ? normalizeYouzanStar(flag) && /*#__PURE__*/React.createElement(YouzanStar, {
+    compact: true,
+    disabled: true,
+    value: flag || undefined
+  }) : (flag || flag === 0) && flagList[Number(flag)] && /*#__PURE__*/React.createElement("img", {
     src: flagList[Number(flag)]
   }), /*#__PURE__*/React.createElement("span", {
     className: styles['remark-detail']
@@ -205,7 +216,7 @@ var OrderRemark = function OrderRemark(props) {
     onClick: showOrderRemarkModel
   }, "\u7F16\u8F91\u5907\u6CE8"))) : /*#__PURE__*/React.createElement("div", {
     className: styles['empty-wrap']
-  }, /*#__PURE__*/React.createElement("img", {
+  }, !isYouzan && /*#__PURE__*/React.createElement("img", {
     src: flagList[0]
   }), /*#__PURE__*/React.createElement(Button, {
     type: "link",
@@ -224,10 +235,10 @@ var OrderRemark = function OrderRemark(props) {
   }, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Form, {
     form: form
   }, /*#__PURE__*/React.createElement(Form.Item, {
-    label: "\u6807\u8BB0",
+    label: isYouzan ? '星标' : '标记',
     name: "flag",
     initialValue: flag || flag === 0 ? Number(flag) : null
-  }, /*#__PURE__*/React.createElement(Radio.Group, null, flagList === null || flagList === void 0 ? void 0 : flagList.map(function (item, index) {
+  }, isYouzan ? /*#__PURE__*/React.createElement(YouzanStar, null) : /*#__PURE__*/React.createElement(Radio.Group, null, flagList === null || flagList === void 0 ? void 0 : flagList.map(function (item, index) {
     if (shopSourceStr === 'PDD' && index === 0) return;
     // 1688仅支持红、黄、绿、蓝四种旗帜。
     if (shopSourceStr === 'YLBB' && [0, 5].includes(index)) return;

package/dist/esm/FlowTemplateDetailV2/components/RenderDetail/index.d.ts

@@ -5,6 +5,7 @@ interface RenderDetailProps {
     transData: any;
     platform: PlatForm;
     onOpenWangWang: any;
+    shopList: any[];
 }
 declare const RenderDetail: (props: RenderDetailProps) => React.JSX.Element;
 export default RenderDetail;

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

@@ -13,7 +13,8 @@ var RenderDetail = function RenderDetail(props) {
   var workOrderTemplateInfo = props.workOrderTemplateInfo,
     transData = props.transData,
     platform = props.platform,
-    onOpenWangWang = props.onOpenWangWang;
+    onOpenWangWang = props.onOpenWangWang,
+    shopList = props.shopList;
   var _workOrderTemplateInf = workOrderTemplateInfo.preNodeComponentDtoList,
     preNodeComponentDtoList = _workOrderTemplateInf === void 0 ? [] : _workOrderTemplateInf,
     _workOrderTemplateInf2 = workOrderTemplateInfo.componentDtoList,
@@ -40,7 +41,8 @@ var RenderDetail = function RenderDetail(props) {
       componentConfig: t.componentConfig,
       type: t.workOrderComponentType,
       effects: {
-        env: platform
+        env: platform,
+        shopList: shopList
       }
     });
     // 淘宝端的买家昵称是需要亮灯展示的
@@ -60,7 +62,8 @@ var RenderDetail = function RenderDetail(props) {
       componentConfig: t.componentConfig,
       type: t.workOrderComponentType,
       effects: {
-        env: platform
+        env: platform,
+        shopList: shopList
       }
     });
     // 淘宝端的买家昵称是需要亮灯展示的

package/dist/esm/FlowTemplateDetailV2/index.js

@@ -55,7 +55,7 @@ import { Provide, Context } from "./context";
 import { WORK_ORDER_STATUS_AI_BUILD } from "../common/constant";
 import { useSelector } from "./context/useSelector";
 import { pollOperationResult } from "./pollOperationResult";
-import { pushGyLog } from '@kmkf-fe-packages/kmkf-utils';
+import { isYouzanShop, pushGyLog } from '@kmkf-fe-packages/kmkf-utils';
 import { PlatForm } from "../WorkOrder/types";
 import Layout from "./components/Layout";
 import JumpCustomerIcon from "./components/XiaozhiConversation";
@@ -164,6 +164,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
   var isShowRemark = false;
   var shopUniqueKey = '';
   var shopSourceStr = '';
+  var shopSource = '';
   var shop;
   var shopId = '';
   var formShopId = Form.useWatch('shopId', form) || flowShopId;
@@ -181,8 +182,9 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
   }
   if (shop) {
     shopUniqueKey = shop.accessToken || '';
-    isShowRemark = !shop.notJoin && !!shop.shopSourceStr && !readonly && ['TAOBAO', 'JD', 'PDD', 'YLBB', 'KS', 'FXG', 'SPH', 'WXXD', 'XHS'].includes(shop.shopSourceStr);
+    isShowRemark = !shop.notJoin && !readonly && (isYouzanShop(shop) || !!shop.shopSourceStr && ['TAOBAO', 'JD', 'PDD', 'YLBB', 'KS', 'FXG', 'SPH', 'WXXD', 'XHS'].includes(shop.shopSourceStr));
     shopSourceStr = shop.shopSourceStr;
+    shopSource = shop.shopSource;
   }
   var shopItem = useMemo(function () {
     return shopList.find(function (t) {
@@ -1267,7 +1269,8 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
       workOrderTemplateInfo: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo,
       transData: transDataall,
       platform: plat.platform,
-      onOpenWangWang: onOpenWangWang
+      onOpenWangWang: onOpenWangWang,
+      shopList: shopList
     }));
   };
   var reFreshPanel = function reFreshPanel() {
@@ -1534,6 +1537,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
     }, /*#__PURE__*/React.createElement(OrderRemark, {
       shopUniqueKey: shopUniqueKey,
       shopSourceStr: shopSourceStr,
+      shopSource: shopSource,
       shopId: shopId || formShopId,
       tid: tid,
       form: form,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "2.10.19",
+  "version": "2.10.20",
   "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": "2.10.19",
-    "@kmkf-fe-packages/kmkf-utils": "2.10.19",
-    "@kmkf-fe-packages/services-components": "2.10.19",
+    "@kmkf-fe-packages/basic-components": "2.10.20",
+    "@kmkf-fe-packages/kmkf-utils": "2.10.20",
+    "@kmkf-fe-packages/services-components": "2.10.20",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -75,7 +75,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9dcce65e1ba7ff4b9e15312bc219357360a01c93",
+  "gitHead": "35e842426da4373ec5caafc58e77a9f54be77bc0",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }