@kmkf-fe-packages/kmkf-work-order-service-component 1.19.4 → 1.19.7

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

@@ -16,13 +16,7 @@ export declare const getCurrentNodeModifiedShowHideRule: (list: {
     }>;
     displayComponentList: Array<string>;
 }[];
-export declare const getCalculationComponentValue: ({ calculationTypeComponentList, allValues, componentShowMap }: {
-    calculationTypeComponentList: Array<{
-        uniqueKey: string;
-        name: string;
-        componentConfig: any;
-        workOrderComponentType: string;
-    }>;
-    allValues: any;
-    componentShowMap: any;
-}) => any;
+export declare const findComponentUniqueKeyByType: (componentDtoList: {
+    workOrderComponentType: string;
+    uniqueKey: string;
+}[], workOrderComponentType: string) => string | undefined;

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

@@ -1,5 +1,4 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -11,8 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { factory } from '@kmkf-fe-packages/services-components';
-import { cloneDeep, get } from 'lodash';
+import { cloneDeep } from 'lodash';
 // 针对前置组件按照节点id分组
 export var groupByPreNode = function groupByPreNode(list) {
   var map = new Map();
@@ -66,137 +64,11 @@ export var getCurrentNodeModifiedShowHideRule = function getCurrentNodeModifiedS
   }
   return [];
 };
-var isValidNumber = function isValidNumber(value) {
-  // 使用 isNaN 函数来检查值是否为数字
-  return !isNaN(value) && isFinite(value);
-};
-var parseExpression = function parseExpression(expression) {
-  // 使用正则表达式替换匹配的'+-'为'+0-'
-  expression = expression.replace(/\+\-/g, '+0-');
-  // 如果遇到-号前面没有数字，自动补0
-  expression = expression.replace(/(^|[-+*/(])\s*-\s*(?=\d)/g, '$10-');
-  var tokens = expression.match(/\d+\.\d+|\d+|[-+*/()]/g);
-  if (!tokens) {
-    throw new Error('表达式不合法');
-  }
-  var precedence = {
-    '+': 1,
-    '-': 1,
-    '*': 2,
-    '/': 2
-  };
-  function applyOperator(operators, values) {
-    var operator = operators.pop();
-    var b = values.pop();
-    var a = values.pop();
-    switch (operator) {
-      case '+':
-        values.push(a + b);
-        break;
-      case '-':
-        values.push(a - b);
-        break;
-      case '*':
-        values.push(a * b);
-        break;
-      case '/':
-        if (b === 0) {
-          throw new Error('除数不能为零');
-        }
-        values.push(a / b);
-        break;
-      default:
-        throw new Error('不支持的操作符');
-    }
-  }
-  var operators = [];
-  var values = [];
-  var _iterator = _createForOfIteratorHelper(tokens),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var token = _step.value;
-      if (/\d/.test(token)) {
-        values.push(parseFloat(token));
-      } else if ('+-*/'.includes(token)) {
-        var currentPrecedence = precedence[token];
-        while (operators.length && precedence[operators[operators.length - 1]] >= currentPrecedence) {
-          applyOperator(operators, values);
-        }
-        operators.push(token);
-      } else if (token === '(') {
-        operators.push(token);
-      } else if (token === ')') {
-        while (operators.length && operators[operators.length - 1] !== '(') {
-          applyOperator(operators, values);
-        }
-        if (operators.length === 0) {
-          throw new Error('括号不匹配');
-        }
-        operators.pop(); // 弹出左括号
-      }
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
-  while (operators.length > 0) {
-    if ('()'.includes(operators[operators.length - 1])) {
-      throw new Error('括号不匹配');
-    }
-    applyOperator(operators, values);
-  }
-  if (values.length !== 1 || operators.length !== 0) {
-    throw new Error('表达式不合法');
-  }
-  return values[0];
-};
 
-// TODO: 获取计算组件的值
-export var getCalculationComponentValue = function getCalculationComponentValue(_ref3) {
-  var calculationTypeComponentList = _ref3.calculationTypeComponentList,
-    allValues = _ref3.allValues,
-    componentShowMap = _ref3.componentShowMap;
-  return calculationTypeComponentList === null || calculationTypeComponentList === void 0 ? void 0 : calculationTypeComponentList.reduce(function (cur, nxt) {
-    var componentInstance = factory(nxt.workOrderComponentType, {
-      id: nxt.uniqueKey,
-      name: nxt.name,
-      componentConfig: (nxt === null || nxt === void 0 ? void 0 : nxt.componentConfig) || {},
-      effects: {},
-      type: nxt.workOrderComponentType
-    });
-    if (componentInstance) {
-      var _nxt$componentConfig, _nxt$componentConfig$, _nxt$componentConfig$2;
-      var express = nxt === null || nxt === void 0 ? void 0 : (_nxt$componentConfig = nxt.componentConfig) === null || _nxt$componentConfig === void 0 ? void 0 : (_nxt$componentConfig$ = _nxt$componentConfig.config) === null || _nxt$componentConfig$ === void 0 ? void 0 : (_nxt$componentConfig$2 = _nxt$componentConfig$.calcList) === null || _nxt$componentConfig$2 === void 0 ? void 0 : _nxt$componentConfig$2.reduce(function (cur, nxt) {
-        if ((nxt === null || nxt === void 0 ? void 0 : nxt.type) === 'value') {
-          var innerComponentInstance = factory(nxt.componentType, {
-            id: nxt.value,
-            name: nxt.label,
-            componentConfig: {},
-            effects: {},
-            type: nxt.componentType
-          });
-          // 如果当前计算组件是隐藏的时候,直接返回0
-          if (!componentShowMap[innerComponentInstance === null || innerComponentInstance === void 0 ? void 0 : innerComponentInstance.id]) return "".concat(cur, "0");
-          return "".concat(cur).concat(Number(get(allValues, innerComponentInstance === null || innerComponentInstance === void 0 ? void 0 : innerComponentInstance.id, 0)));
-        }
-        return "".concat(cur).concat(nxt === null || nxt === void 0 ? void 0 : nxt.label);
-      }, '');
-      var value = 0;
-      try {
-        var _value;
-        // 使用 eval 函数计算表达式，如果抛出异常则表示表达式不合法
-        value = parseExpression(express);
-        //TODO: 针对0.1+0.2的问题，这里对浮点类型的小数截取小数点后2位
-        value = parseFloat((_value = value) === null || _value === void 0 ? void 0 : _value.toFixed(2));
-        console.debug('计算组件计算结果', value, express);
-      } catch (error) {
-        console.error('计算组件计算异常', express);
-        value = 0;
-      }
-      cur[componentInstance.id] = isValidNumber(value) ? value : 0;
-    }
-    return cur;
-  }, {});
+// 根据组件类型获取组件的UniqueKey
+export var findComponentUniqueKeyByType = function findComponentUniqueKeyByType(componentDtoList, workOrderComponentType) {
+  var _componentDtoList$fin;
+  return (_componentDtoList$fin = componentDtoList.find(function (item) {
+    return item.workOrderComponentType === workOrderComponentType;
+  })) === null || _componentDtoList$fin === void 0 ? void 0 : _componentDtoList$fin.uniqueKey;
 };

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

@@ -29,24 +29,17 @@ import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle, grou
 import 'moment/locale/zh-cn';
 import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, EXCLUDE_REPLACE_TOP_COMPONENT,
 // 重复检验不需要展示在顶部的
-INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, getMappingTargetValue } from "../../../common/utils/tools";
+INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, bsE3SystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, getMappingTargetValue } from "../../../common/utils/tools";
 import { replaceCheck, orderDetail, queryLabelByTradeId } from "../../../model/servers/api";
 import { factory } from '@kmkf-fe-packages/services-components';
 import { getExpression, formatDisplayConfig, isNull, LabelData } from '@kmkf-fe-packages/kmkf-utils';
 import ShopName from "../ShopName";
 import { PlatForm } from "../../../model/flowTemplateDetail/types";
-import { groupByPreNode, getCurrentNodeModifiedShowHideRule } from "./common";
+import { groupByPreNode, getCurrentNodeModifiedShowHideRule, findComponentUniqueKeyByType } from "./common";
 import { getCalculationComponentValue } from "../../../common/utils/arithmetic";
 import "./index.less";
 import { CHILD_FIELD_TYPE, CHILD_FIELD_VALUE } from "../../../common/constant";
 import { jsonParseSecurity } from "../../../common/utils/tools";
-var hasComponent = function hasComponent(componentDtoList, workOrderComponentType) {
-  var _componentDtoList$fin;
-  return (_componentDtoList$fin = componentDtoList.find(function (item) {
-    return item.workOrderComponentType === workOrderComponentType;
-  })) === null || _componentDtoList$fin === void 0 ? void 0 : _componentDtoList$fin.uniqueKey;
-};
-
 // 记录显隐触发隐藏的组件。显示后，重新出发一遍映射规则
 // TODO: 用useState会有bug, 不确定是哪里导致的
 var hideByXYComponentsMap = {};
@@ -79,7 +72,7 @@ var FormRender = function FormRender(props, ref) {
     isErpUse = _props$isErpUse === void 0 ? false : _props$isErpUse,
     _props$autoSubmit = props.autoSubmit,
     autoSubmit = _props$autoSubmit === void 0 ? false : _props$autoSubmit;
-  var shopIdKeyMap = useMemo(function () {
+  var shopIdToUniqueKeyMap = useMemo(function () {
     var json = {};
     shopList.forEach(function (shop) {
       json[shop.shopId] = shop.uniqueKey;
@@ -89,23 +82,18 @@ var FormRender = function FormRender(props, ref) {
   var mappingConfig = useMemo(function () {
     return getMappingConfigByTemplateDetail(templateDetail);
   }, [templateDetail]);
-  var logisticsMappingConfig = useMemo(function () {
+  var activeLogisticsComponents = useMemo(function () {
     return templateDetail.componentDtoList.filter(function (item) {
       var _item$componentConfig;
       return ['LOGISTICS_TRAJECTORY_MORE', 'LOGISTICS_INTERCEPTION_MORE'].includes(item.workOrderComponentType) && ((_item$componentConfig = item.componentConfig) === null || _item$componentConfig === void 0 ? void 0 : _item$componentConfig.isOpen);
     });
   }, [templateDetail]);
-  var finallyMappdingHideComponents = useRef(mappingConfig.hideComponents);
+  var finallyMappingHideComponents = useRef(mappingConfig.hideComponents);
   var replaceValueRef = useRef();
   var _useState = useState(mappingConfig.hideComponents),
     _useState2 = _slicedToArray(_useState, 2),
-    mappdingHideComponents = _useState2[0],
-    setMappdingHideComponents = _useState2[1];
-  // // 记录显隐触发隐藏的组件。显示后，重新出发一遍映射规则
-  // const [hideByXYComponents, setHideByXYComponents] = useState<string[]>([])
-
-  // console.log('************* mappingConfig **************', { mappingConfig, mappdingHideComponents, templateDetail })
-
+    mappingHideComponents = _useState2[0],
+    setMappingHideComponents = _useState2[1];
   var orderNo = plat.orderNo,
     buyerId = plat.buyerId,
     buyerNick = plat.buyerNick,
@@ -374,7 +362,7 @@ var FormRender = function FormRender(props, ref) {
       batchFillByMapping(initialValues);
       orderBackReplace(transData, templateDetail);
       // TODO: 非开始节点录入，都会有workOrderId,这里判断是否有前置组件含有订单号；如果存在订单号，进行订单反填。
-      var tradeIdUniqueKey = hasComponent(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList, 'TRADE_ID_INPUT');
+      var tradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList, 'TRADE_ID_INPUT');
       if (tradeIdUniqueKey && shopId && record !== null && record !== void 0 && (_record$jsonMap2 = record.jsonMap) !== null && _record$jsonMap2 !== void 0 && _record$jsonMap2["".concat(tradeIdUniqueKey, "_tradeId")] && firstOrderBackfill) {
         var _record$jsonMap3, _record$jsonMap4;
         orderBack({
@@ -459,7 +447,7 @@ var FormRender = function FormRender(props, ref) {
     }
     var antFormEl = document.getElementsByClassName('ant-form');
     (antFormEl === null || antFormEl === void 0 ? void 0 : antFormEl.length) > 0 && set(antFormEl, '0.scrollTop', 0);
-    resetMappdingHideComponents();
+    resetMappingHideComponents();
   };
   useEffect(function () {
     if (isErpUse) return;
@@ -475,20 +463,20 @@ var FormRender = function FormRender(props, ref) {
   }, [workOrderId, record, shopId, isErpUse]);
 
   // 重置映射隐藏的组件, 目前只有单选、下拉组件可能会因为映射关系隐藏
-  var resetMappdingHideComponents = function resetMappdingHideComponents() {
+  var resetMappingHideComponents = function resetMappingHideComponents() {
     var hideComponents = mappingConfig.hideComponents.filter(function (key) {
       var value = form.getFieldValue(key);
       return _typeof(value) === 'object' ? !value.value : !value;
     });
-    if (!finallyMappdingHideComponents.current) {
-      finallyMappdingHideComponents.current = mappingConfig.hideComponents;
+    if (!finallyMappingHideComponents.current) {
+      finallyMappingHideComponents.current = mappingConfig.hideComponents;
     }
-    var noChange = hideComponents.length === finallyMappdingHideComponents.current.length && hideComponents.every(function (k) {
-      return finallyMappdingHideComponents.current.includes(k);
+    var noChange = hideComponents.length === finallyMappingHideComponents.current.length && hideComponents.every(function (k) {
+      return finallyMappingHideComponents.current.includes(k);
     });
     if (!noChange) {
-      finallyMappdingHideComponents.current = _toConsumableArray(hideComponents);
-      setMappdingHideComponents(hideComponents);
+      finallyMappingHideComponents.current = _toConsumableArray(hideComponents);
+      setMappingHideComponents(hideComponents);
     }
   };
 
@@ -496,7 +484,7 @@ var FormRender = function FormRender(props, ref) {
   var fillByShopId = function fillByShopId(shopId) {
     // PS: 增加setTimeout 为了让后续的items渲染，然后触发对应的映射
     setTimeout(function () {
-      var shopUniqueKey = shopId ? shopIdKeyMap[shopId] : '';
+      var shopUniqueKey = shopId ? shopIdToUniqueKeyMap[shopId] : '';
       shopUniqueKey && fillByMapping('SHOP_SELECT_MAPPING', shopUniqueKey);
     }, 0);
   };
@@ -528,7 +516,7 @@ var FormRender = function FormRender(props, ref) {
       }
       form.resetFields(_toConsumableArray(resetSet));
     }
-    resetMappdingHideComponents();
+    resetMappingHideComponents();
   };
   var checkFillMapping = function checkFillMapping(show, uniqueKey, workOrderComponentType) {
     if (['RADIO', 'SELECT'].includes(workOrderComponentType)) {
@@ -538,7 +526,6 @@ var FormRender = function FormRender(props, ref) {
       }
       if (!show && !hideByXYComponentsMap[_formUniqueKey].includes(uniqueKey)) {
         hideByXYComponentsMap[_formUniqueKey] = [uniqueKey].concat(_toConsumableArray(hideByXYComponentsMap[_formUniqueKey]));
-        // setHideByXYComponents([uniqueKey, ...hideByXYComponents])
         fillByMapping(uniqueKey, '');
       }
       if (show && hideByXYComponentsMap[_formUniqueKey].includes(uniqueKey)) {
@@ -547,7 +534,6 @@ var FormRender = function FormRender(props, ref) {
           return k !== uniqueKey;
         });
         hideByXYComponentsMap[_formUniqueKey] = newHideByXYComponents;
-        // setHideByXYComponents(newHideByXYComponents)
         fillByMapping(uniqueKey, (_form$getFieldValue = form.getFieldValue(uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.value);
       }
     }
@@ -648,9 +634,16 @@ var FormRender = function FormRender(props, ref) {
         form: form
       });
     }
-    if (logisticsMappingConfig && ['INPUT', 'EXPRESS_LOGISTICS_SELECT', 'BS_LOGISTICS'].includes(workOrderComponentType)) {
+    if (workOrderComponentType === 'BS_E3_SYSTEM_ORDER') {
+      bsE3SystemOrderBackValues({
+        templateList: templateDetail,
+        value: value,
+        form: form
+      });
+    }
+    if (activeLogisticsComponents && ['INPUT', 'EXPRESS_LOGISTICS_SELECT', 'BS_LOGISTICS'].includes(workOrderComponentType)) {
       setLogisticsInfo({
-        logisticsMappingConfig: logisticsMappingConfig,
+        logisticsMappingConfig: activeLogisticsComponents,
         uniqueKey: uniqueKey,
         workOrderComponentType: workOrderComponentType,
         value: value,
@@ -702,7 +695,7 @@ var FormRender = function FormRender(props, ref) {
     setShopId(val);
     // 清空表单字段
     var needClearFormFields = get(templateDetail, 'componentDtoList', []).reduce(function (cur, nxt) {
-      if (['ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD', 'BS_GOODS', 'BS_EXCHANGE_GOODS', 'BS_REISSUE_GOODS', 'BS_RETURN_GOODS', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_SYSTEM_ORDER', 'WDT_REISSUE_GOODS', 'WDT_RETURN_GOODS', 'WDT_EXCHANGE_GOODS', 'KM_SEND_GOOD'].includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
+      if (['ITEM_SELECT_THIRD', 'STATUS', 'ITEM_SELECT', 'ITEM_ID', 'ITEM_ENCODE', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD', 'BS_GOODS', 'BS_EXCHANGE_GOODS', 'BS_REISSUE_GOODS', 'BS_RETURN_GOODS', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_SYSTEM_ORDER', 'WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WDT_SYSTEM_ORDER', 'WDT_REISSUE_GOODS', 'WDT_RETURN_GOODS', 'WDT_EXCHANGE_GOODS', 'KM_SEND_GOOD', 'BS_E3_SYSTEM_ORDER'].includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
         cur.push(nxt === null || nxt === void 0 ? void 0 : nxt.uniqueKey);
       }
       return cur;
@@ -769,8 +762,8 @@ var FormRender = function FormRender(props, ref) {
     }
     //切换店铺时，判断是否有订单号 有订单号自动订单返填
     var allValue = form.getFieldsValue();
-    var tradeIdUniqueKey = hasComponent(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'TRADE_ID_INPUT');
-    var paymentUniqueKey = hasComponent(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'ENTERPRISE_PAYMENT');
+    var tradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'TRADE_ID_INPUT');
+    var paymentUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'ENTERPRISE_PAYMENT');
     if (tradeIdUniqueKey) {
       var tradeValue = allValue[tradeIdUniqueKey];
       queryLabels(tradeValue, val);
@@ -892,15 +885,6 @@ var FormRender = function FormRender(props, ref) {
         componentCanShow = _getDisplayAndDisable.display;
       // TODO: 非前置节点组件渲染消费是否可以编辑配置
       if (!isPreRender) {
-        // console.debug(
-        //   workOrderId ? '编辑状态:' : '新建状态:',
-        //   name,
-        //   '是否可以展示: ',
-        //   componentCanShow,
-        //   '是否可以编辑: ',
-        //   !componentCanEdit,
-        //   componentConfig?.status,
-        // );
         newComponentConfig['disabled'] = componentCanEdit;
       }
       if (workOrderComponentType === 'ENTERPRISE_PAYMENT') {
@@ -976,7 +960,7 @@ var FormRender = function FormRender(props, ref) {
             onChange: function onChange(value) {
               return componentOnValueChange(uniqueKey, value, workOrderComponentType);
             },
-            hidden: !show || mappdingHideComponents.includes(uniqueKey),
+            hidden: !show || mappingHideComponents.includes(uniqueKey),
             platform: platform,
             innerReplaceValueCh: innerReplaceValueCh,
             display: isPreRender ? true : componentCanShow
@@ -988,7 +972,7 @@ var FormRender = function FormRender(props, ref) {
         onChange: function onChange(value) {
           return componentOnValueChange(uniqueKey, value, workOrderComponentType);
         },
-        hidden: mappdingHideComponents.includes(uniqueKey),
+        hidden: mappingHideComponents.includes(uniqueKey),
         platform: platform,
         innerReplaceValueCh: innerReplaceValueCh,
         display: isPreRender ? true : componentCanShow
@@ -1031,7 +1015,7 @@ var FormRender = function FormRender(props, ref) {
       return [].concat(_toConsumableArray(hiddenPreNode), [ShopName], _toConsumableArray(otherItems));
     }
     return [].concat(_toConsumableArray(hiddenPreNode), _toConsumableArray(otherItems));
-  }, [platform, templateDetail, shopList, shopId, record, mappdingHideComponents, currentShopId, look, handleChangeTradeId, innerReplaceValue]);
+  }, [platform, templateDetail, shopList, shopId, record, mappingHideComponents, currentShopId, look, handleChangeTradeId, innerReplaceValue]);
   // TODO: 计算类型组件列表
   var calculationTypeComponentList = useMemo(function () {
     var _templateDetail$compo2;
@@ -1072,9 +1056,6 @@ var FormRender = function FormRender(props, ref) {
       }
     }
   }, 1000);
-
-  // const renderFinalFormItems = finalFormItems.filter(item => !mappdingHideComponents.includes(item.props?.name))
-
   var preNodeFormItems = useMemo(function () {
     var _get, _groupByPreNode;
     var configVosPrams = get(templateDetail, 'componentTemplateConfigVos', []).reduce(function (prv, next) {
@@ -1091,7 +1072,7 @@ var FormRender = function FormRender(props, ref) {
         componentConfig: _objectSpread(_objectSpread({}, item.componentConfig), config)
       });
     });
-    var preNodeItems = [];
+    var preNodeItems = new Array(preNodeComponentDtoList.length);
     (_groupByPreNode = groupByPreNode(preNodeComponentDtoList)) === null || _groupByPreNode === void 0 ? void 0 : _groupByPreNode.forEach(function (item, key) {
       var displayConfig = getCurrentNodeModifiedShowHideRule(flowAllShowHideRules === null || flowAllShowHideRules === void 0 ? void 0 : flowAllShowHideRules.allShowHideRules, key);
       var finalDisplayConfig = displayConfig === null || displayConfig === void 0 ? void 0 : displayConfig.filter(function (item) {
@@ -1112,23 +1093,29 @@ var FormRender = function FormRender(props, ref) {
       });
       console.debug('当前前置节点生效的显影规则', finalDisplayConfig);
       console.log('finalDisplayConfig', finalDisplayConfig);
-      preNodeItems.push(item === null || item === void 0 ? void 0 : item.map(newRenderColumnItem({
-        platform: platform,
-        form: form,
-        shopList: shopList,
-        shopId: shopId,
-        isEditing: !!workOrderId,
-        workOrderDetail: record,
-        templateDetail: templateDetail,
-        disabled: true,
-        displayConfig: finalDisplayConfig,
-        isPreRender: true
-      })));
+      //排序前置组件顺序
+      item.forEach(function (t) {
+        var index = preNodeComponentDtoList.findIndex(function (node) {
+          return node.uniqueKey === t.uniqueKey;
+        });
+        preNodeItems[index] = newRenderColumnItem({
+          platform: platform,
+          form: form,
+          shopList: shopList,
+          shopId: shopId,
+          isEditing: !!workOrderId,
+          workOrderDetail: record,
+          templateDetail: templateDetail,
+          disabled: true,
+          displayConfig: finalDisplayConfig,
+          isPreRender: true
+        })(t);
+      });
     });
     return preNodeItems;
-  }, [templateDetail, shopList, shopId, record, mappdingHideComponents, currentShopId, look, handleChangeTradeId]);
+  }, [templateDetail, shopList, shopId, record, mappingHideComponents, currentShopId, look, handleChangeTradeId]);
   useWhyDidYouUpdate('useWhyDidYouUpdateComponent', _objectSpread(_objectSpread({}, props), {}, {
-    mappdingHideComponents: mappdingHideComponents,
+    mappingHideComponents: mappingHideComponents,
     replaceValue: replaceValue,
     labelList: labelList,
     shopId: shopId

package/dist/esm/common/utils/constant.d.ts

@@ -0,0 +1,2 @@
+export declare const updateWorkTypeKeys: any;
+export declare const systemOrderMap: any;

package/dist/esm/common/utils/constant.js

@@ -0,0 +1,50 @@
+export var updateWorkTypeKeys = {
+  BASIC_GRADE: 'basicGrade',
+  TRADE_ID_INPUT: 'tradeId',
+  SHOP_NAME_INPUT: 'shopName',
+  RECEIVER_NAME_INPUT: 'receiveName',
+  //收件人姓名
+  RECEIVER_MOBILE_INPUT: 'receiveMobile',
+  //收件人手机号
+  TRADE_CREATE_DATETIME: 'tradeCreateDateTime',
+  //下单时间
+  TRADE_PAYMENT_DATETIME: 'tradePaymentDateTime',
+  //付款时间
+  TRADE_DELIVERY_DATETIME: 'tradeDeliveryDateTime',
+  //发货时间
+  TRADE_CLOSING_DATETIME: 'tradeClosingDateTime',
+  //成交时间
+  ACTUAL_PAYMENT: 'actualPayment',
+  SYSTEM_ORDER_NO: 'systemOrderNo',
+  BS_SIGNING_TIME: 'bsSigningTime',
+  BS_SEND_TIME: 'bsSendTime',
+  BS_TRADE_PAYMENT_TIME: 'bsTradePaymentTime',
+  BS_NET_RECEIPTS: 'bsNetReceipts',
+  BS_PACKAGE_WEIGHT: 'bsPackageWeight',
+  BS_DEPOSIT: 'bsDeposit',
+  NEW_PAYMENT_STATUS: 'newPaymentStatus',
+  BUSINESS_ORDER_NO: 'businessOrderNo',
+  PAYMENT_VOUCHER_CODE: 'paymentVoucherCode'
+};
+export var systemOrderMap = {
+  BS_SYSTEM_ORDER: {
+    no: 'bsSystemOrderNo',
+    ids: 'bsSystemSelectIds',
+    order: 'bsSystemShowOrder'
+  },
+  WLN_SYSTEM_ORDER: {
+    no: 'wlnSystemOrderNo',
+    ids: 'wlnSystemSelectIds',
+    order: 'wlnSystemShowOrder'
+  },
+  WDT_SYSTEM_ORDER: {
+    no: 'wdtSystemOrderNo',
+    ids: 'wdtSystemSelectIds',
+    order: 'wdtSystemShowOrder'
+  },
+  BS_E3_SYSTEM_ORDER: {
+    no: 'bsE3SystemOrderNo',
+    ids: 'bsE3SystemSelectIds',
+    order: 'bsE3SystemShowOrder'
+  }
+};

package/dist/esm/common/utils/tools.d.ts

@@ -47,6 +47,7 @@ export interface WorkOrderDetail {
     }[];
 }
 export declare const formatPictures: (pictures: any) => any;
+export declare const transTextToNumber: (value: string | number) => string | number;
 export declare const calcWorkOrderList: (source: Partial<WorkOrderDetail>[], templateColumns: {
     componentConfig: any;
     workOrderComponentType: string;
@@ -97,6 +98,7 @@ export declare const deleteCacheOrder: ({ templateList, values, nodeId, flowTemp
     unDeleteOrderInfo: boolean;
 }) => void;
 export declare const bsSystemOrderBackValues: ({ templateList, value, form }: any) => void;
+export declare const bsE3SystemOrderBackValues: ({ templateList, value, form }: any) => void;
 export declare const wlnSystemOrderBackValues: ({ templateList, value, form }: any) => void;
 export declare const wdtSystemOrderBackValues: ({ templateList, value, form }: any) => void;
 export declare const getMappingConfigByTemplateDetail: (templateDetail: {