@kmkf-fe-packages/kmkf-work-order-service-component 0.25.2 → 0.26.0-alpha.2

package/README.md

@@ -65,4 +65,4 @@ const Text = ()=>{
 
 ```
 
-| 字段 | 说明 | 数据类型 | | ----------------- | ---------------- | ------------------------------------ | | platform | 平台 | TAOBAO =淘宝\|FXG=抖音\|PDD=拼多多\| | | shopId | 店铺 ID | number | | buyerNick | 买家昵称 | string | | buyerId | 买家 id | string | | orderNo | 订单 id | string | | onEmpowerCallback | 授权弹框点击回调 | function |
+| 字段 | 说明 | 数据类型 | | ----------------- | ---------------- | ------------------------------------ | | platform | 平台 | TAOBAO =淘宝\|FXG=抖音\|PDD=拼多多\| | | shopId | 店铺 ID | number | | buyerNick | 买家昵称 | string | | buyerId | 买家 id | string | | orderNo | 订单 id | string | | onEmpowerCallback | 授权弹框点击回调 | function |

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

@@ -1,4 +1,4 @@
-var _excluded = ["displayConfig", "disabled", "platform"];
+var _excluded = ["displayConfig", "disabled", "platform", "isPreRender"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
@@ -31,7 +31,7 @@ import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME,
 INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail, setLogisticsInfo } from "../../../common/utils/tools";
 import { replaceCheck, orderDetail } from "../../../model/servers/api";
 import { factory } from '@kmkf-fe-packages/services-components';
-import { AddressData, ExpressData, ExpressInterceptData, PlatData, LogisticsAddressData, getExpression, formatDisplayConfig, BsAddressData } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, ExpressData, ExpressInterceptData, PlatData, LogisticsAddressData, getExpression, formatDisplayConfig, BsAddressData, isNull } from '@kmkf-fe-packages/kmkf-utils';
 import ShopName from "../ShopName";
 import { PlatForm } from "../../../model/flowTemplateDetail/types";
 import { groupByPreNode, getCurrentNodeModifiedShowHideRule } from "./common";
@@ -721,8 +721,23 @@ var FormRender = function FormRender(props, ref) {
     }
     return getExpression((_item$compareSymbol = item.compareSymbol) === null || _item$compareSymbol === void 0 ? void 0 : _item$compareSymbol.toUpperCase(), leftValue, item.rightValue);
   };
+  var getDisplayAndDisabledConfig = function getDisplayAndDisabledConfig(config) {
+    if (isNull(config)) {
+      return {
+        display: true,
+        disabled: false
+      };
+    }
+    var display = Math.floor(Number(config) / 2) === 1; // 取整
+    var disabled = Number(config) % 2 === 0;
+    return {
+      display: display,
+      disabled: disabled
+    };
+  };
   var newRenderColumnItem = function newRenderColumnItem(effects) {
     return function (item) {
+      var _componentConfig$stat, _componentConfig$stat2;
       var _item$componentConfig2 = item.componentConfig,
         componentConfig = _item$componentConfig2 === void 0 ? {} : _item$componentConfig2,
         workOrderComponentType = item.workOrderComponentType,
@@ -731,13 +746,19 @@ var FormRender = function FormRender(props, ref) {
       var displayConfig = effects.displayConfig,
         disabled = effects.disabled,
         platform = effects.platform,
+        isPreRender = effects.isPreRender,
         others = _objectWithoutProperties(effects, _excluded);
       var newComponentConfig = _objectSpread(_objectSpread({}, componentConfig), {}, {
         disabled: disabled
       });
-      // if (workOrderComponentType === 'PICTURE') {
-      //   newComponentConfig['canPreview'] = disabled;
-      // }
+      var _getDisplayAndDisable = getDisplayAndDisabledConfig(workOrderId ? componentConfig === null || componentConfig === void 0 ? void 0 : (_componentConfig$stat = componentConfig.status) === null || _componentConfig$stat === void 0 ? void 0 : _componentConfig$stat.upgrade : componentConfig === null || componentConfig === void 0 ? void 0 : (_componentConfig$stat2 = componentConfig.status) === null || _componentConfig$stat2 === void 0 ? void 0 : _componentConfig$stat2.created),
+        componentCanEdit = _getDisplayAndDisable.disabled,
+        componentCanShow = _getDisplayAndDisable.display;
+      // TODO: 非前置节点组件渲染消费是否可以编辑配置
+      if (!isPreRender) {
+        console.debug(workOrderId ? '编辑状态:' : '新建状态:', name, '是否可以展示: ', componentCanShow, '是否可以编辑: ', !componentCanEdit, componentConfig === null || componentConfig === void 0 ? void 0 : componentConfig.status);
+        newComponentConfig['disabled'] = componentCanEdit;
+      }
       if (workOrderComponentType === 'ENTERPRISE_PAYMENT') {
         newComponentConfig['disabled'] = disabled || !canModifyPayment;
       }
@@ -769,19 +790,10 @@ var FormRender = function FormRender(props, ref) {
       currentTemplateAllComponentsDisplay.current[instance === null || instance === void 0 ? void 0 : instance.id] = true;
       if (Reflect.has(idConditionListMap, instance.id)) {
         var currentIdDependenceOtherFields = idConditionListMap[instance.id];
-        // 当前组件显隐依赖组件id列表
-        var dependenciesFields = currentIdDependenceOtherFields === null || currentIdDependenceOtherFields === void 0 ? void 0 : currentIdDependenceOtherFields.reduce(function (cur, nxt) {
-          var _nxt$rules;
-          nxt === null || nxt === void 0 ? void 0 : (_nxt$rules = nxt.rules) === null || _nxt$rules === void 0 ? void 0 : _nxt$rules.map(function (i) {
-            return cur.add(i.leftValue);
-          });
-          return cur;
-        }, new Set());
-
         // 需要增加显隐处理逻辑
         return /*#__PURE__*/React.createElement(Form.Item, {
           noStyle: true,
-          shouldUpdate: function shouldUpdate(prevValues, currentValues) {
+          shouldUpdate: function shouldUpdate() {
             return true; // TODO: 修复重复依赖的问题 https://tb.raycloud.com/task/64e4491e0b8b5c001e1099b9
           }
         }, function (_ref4) {
@@ -796,57 +808,11 @@ var FormRender = function FormRender(props, ref) {
             // 满足所有
             if (linkCondition === 'every') {
               return every(conditionList, function (item) {
-                //现支持子组件控制显隐，格式为${uniqueKey}_${type}与普通组件做区分
-                // const isChildField = item.leftValue.includes('_');
-                // const prefixId = isChildField ? item.leftValue.split('_')?.[0] : item.leftValue;
-                // const childFieldType = isChildField ? item.leftValue.split('_')?.[1] : '';
-                // let dependenceDetail = getComponentDetailByFieldId(prefixId);
-                // if (isChildField && CHILD_FIELD_TYPE[childFieldType]) {
-                //   const childType = CHILD_FIELD_TYPE[childFieldType];
-                //   dependenceDetail = dependenceDetail?.[childType] || dependenceDetail;
-                // }
-
-                // let leftValue = getFieldValue(prefixId);
-                // if (isChildField) {
-                //   leftValue = (leftValue as Record<string, any>)?.[childFieldType];
-                // }
-                // if (typeof dependenceDetail.formDataTransform === 'function') {
-                //   leftValue = dependenceDetail.formDataTransform(leftValue);
-                // }
-                // // TODO: 如果依赖的组件是隐藏的，当前依赖项为false
-                // if (
-                //   Reflect.has(currentComponentDisplayStatus.current, prefixId) &&
-                //   !currentComponentDisplayStatus.current[prefixId]
-                // ) {
-                //   return false;
-                // }
-                // return getExpression(
-                //   item.compareSymbol?.toUpperCase(),
-                //   leftValue,
-                //   item.rightValue,
-                // );
                 return conditionItemResult(item, getFieldValue);
               });
             }
             // 满足其中之一
             return some(conditionList, function (item) {
-              // const dependenceDetail = getComponentDetailByFieldId(item.leftValue);
-              // let leftValue = getFieldValue(item.leftValue);
-              // if (typeof dependenceDetail.formDataTransform === 'function') {
-              //   leftValue = dependenceDetail.formDataTransform(leftValue);
-              // }
-              // // TODO: 如果依赖的组件是隐藏的，当前依赖项为false
-              // if (
-              //   Reflect.has(currentComponentDisplayStatus.current, item.leftValue) &&
-              //   !currentComponentDisplayStatus.current[item.leftValue]
-              // ) {
-              //   return false;
-              // }
-              // return getExpression(
-              //   item.compareSymbol?.toUpperCase(),
-              //   leftValue,
-              //   item.rightValue,
-              // );
               return conditionItemResult(item, getFieldValue);
             });
           }, false);
@@ -867,7 +833,8 @@ var FormRender = function FormRender(props, ref) {
             },
             hidden: !show || mappdingHideComponents.includes(uniqueKey),
             platform: platform,
-            innerReplaceValueCh: innerReplaceValueCh
+            innerReplaceValueCh: innerReplaceValueCh,
+            display: isPreRender ? true : componentCanShow
           });
         });
       }
@@ -878,7 +845,8 @@ var FormRender = function FormRender(props, ref) {
         },
         hidden: mappdingHideComponents.includes(uniqueKey),
         platform: platform,
-        innerReplaceValueCh: innerReplaceValueCh
+        innerReplaceValueCh: innerReplaceValueCh,
+        display: isPreRender ? true : componentCanShow
       });
     };
   };
@@ -896,7 +864,8 @@ var FormRender = function FormRender(props, ref) {
       workOrderDetail: record,
       templateDetail: templateDetail,
       disabled: look,
-      displayConfig: get(templateDetail, 'flowTemplateConfig.showHideRule.rules', [])
+      displayConfig: get(templateDetail, 'flowTemplateConfig.showHideRule.rules', []),
+      isPreRender: false
     }));
     // TODO: 这里只是为了把前置组件的值能够set到当前form表单中去
     // TODO: 为什么不直接把前置和当前放在同一个form里面呢？因为放在同一个里面会有必填校验等逻辑，前置节点在当前表单中只是做展示，但是还必须有控制显隐功能
@@ -1007,7 +976,8 @@ var FormRender = function FormRender(props, ref) {
         workOrderDetail: record,
         templateDetail: templateDetail,
         disabled: true,
-        displayConfig: finalDisplayConfig
+        displayConfig: finalDisplayConfig,
+        isPreRender: true
       })));
     });
     return preNodeItems;

package/dist/esm/model/logicFlow/selector.d.ts

@@ -6,6 +6,7 @@ export declare const selectFlowList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("./types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").LogicFlow[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").LogicFlow[], {
     clearCache: () => void;
 }> & {
@@ -19,6 +20,7 @@ export declare const selectGroupFlowList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("./types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
     clearCache: () => void;
 }> & {
@@ -32,6 +34,7 @@ export declare const selectFlowTemplateGroupWorkOrderTemplateList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("./types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
     clearCache: () => void;
 }> & {

package/package.json

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