@kmkf-fe-packages/kmkf-work-order-service-component 0.17.2-alpha.0 → 0.18.1

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

@@ -32,7 +32,8 @@ import { factory } from '@kmkf-fe-packages/services-components';
 import { AddressData, ExpressData, ExpressInterceptData, PlatData, LogisticsAddressData, getExpression, formatDisplayConfig, BsAddressData } from '@kmkf-fe-packages/kmkf-utils';
 import ShopName from "../ShopName";
 import { PlatForm } from "../../../model/flowTemplateDetail/types";
-import { groupByPreNode, getCurrentNodeModifiedShowHideRule, getCalculationComponentValue } from "./common";
+import { groupByPreNode, getCurrentNodeModifiedShowHideRule } from "./common";
+import { getCalculationComponentValue } from "../../../common/utils/arithmetic";
 import "./index.less";
 var hasComponent = function hasComponent(componentDtoList, workOrderComponentType) {
   var _componentDtoList$fin;
@@ -279,6 +280,10 @@ var FormRender = function FormRender(props) {
         created: newRecord.created,
         processTime: newRecord.processTime
       }));
+      var initialValues = get(transData, '0', {});
+      for (var _key in initialValues) {
+        fillByMapping(_key, initialValues[_key]);
+      }
       orderBackReplace(transData, templateDetail);
       // TODO: 非开始节点录入，都会有workOrderId,这里判断是否有前置组件含有订单号；如果存在订单号，进行订单反填。
       var tradeIdUniqueKey = hasComponent(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList, 'TRADE_ID_INPUT');
@@ -336,13 +341,13 @@ var FormRender = function FormRender(props) {
         var _transData = calcWorkOrderList([{
           jsonMap: jsonMap
         }], [].concat(_toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList) || []), _toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || [])), 'init');
-        var initialValues = get(_transData, '0', {});
-        form.setFieldsValue(_objectSpread(_objectSpread({}, initialValues), {}, {
+        var _initialValues = get(_transData, '0', {});
+        form.setFieldsValue(_objectSpread(_objectSpread({}, _initialValues), {}, {
           shopId: shopId
         }));
         // 默认值触发映射
-        for (var _key in initialValues) {
-          fillByMapping(_key, initialValues[_key]);
+        for (var _key2 in _initialValues) {
+          fillByMapping(_key2, _initialValues[_key2]);
         }
         //如果有订单号 订单返填 通过订单号入口进行工单录入，需要将订单数据反填到工单
 
@@ -418,8 +423,8 @@ var FormRender = function FormRender(props) {
       form.setFieldsValue(mapping === null || mapping === void 0 ? void 0 : mapping[triggerValue]);
     } else {
       var resetSet = new Set();
-      for (var _key2 in mapping) {
-        for (var uniqueKey in mapping[_key2]) {
+      for (var _key3 in mapping) {
+        for (var uniqueKey in mapping[_key3]) {
           resetSet.add(uniqueKey);
         }
       }
@@ -452,6 +457,11 @@ var FormRender = function FormRender(props) {
   useEffect(function () {
     fillByShopId(shopId);
   }, [shopId]);
+  useEffect(function () {
+    if (templateDetail !== null && templateDetail !== void 0 && templateDetail.uniqueKey && finallyMappdingHideComponentsMap[templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.uniqueKey]) {
+      delete finallyMappdingHideComponentsMap[templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.uniqueKey];
+    }
+  }, [templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.uniqueKey]);
 
   //订单返填
   var changeHandle = function changeHandle(order_no) {

package/dist/esm/FlowTemplateDetail/index.js

@@ -416,6 +416,8 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
                   behavior: 'smooth'
                 });
               }, 0);
+              // TODO: 解决显影导致的组件校验失败未提示问题
+              message.error(get(_context3.t0, 'errorFields.0.errors.0', "组件校验失败"));
             }
           case 23:
             _context3.prev = 23;

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

@@ -0,0 +1,10 @@
+export declare const getCalculationComponentValue: ({ calculationTypeComponentList, allValues, componentShowMap }: {
+    calculationTypeComponentList: Array<{
+        uniqueKey: string;
+        name: string;
+        componentConfig: any;
+        workOrderComponentType: string;
+    }>;
+    allValues: any;
+    componentShowMap: any;
+}) => any;

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

@@ -0,0 +1,139 @@
+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(_e) { throw _e; }, 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(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+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; }
+import { factory } from '@kmkf-fe-packages/services-components';
+import { get } from 'lodash';
+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(_ref) {
+  var calculationTypeComponentList = _ref.calculationTypeComponentList,
+    allValues = _ref.allValues,
+    componentShowMap = _ref.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;
+  }, {});
+};

package/dist/esm/index.d.ts

@@ -6,4 +6,5 @@ export { default as FormRenderTemplateId } from './FormRenderTemplateId';
 export { default as FlowWorkOrderDetail } from './FlowTemplateDetail';
 export { default as TradeList } from './TradeList';
 export * as utils from './common/utils/tools';
+export * as arithmetic from './common/utils/arithmetic';
 export * from './WorkOrder/types';

package/dist/esm/index.js

@@ -17,4 +17,6 @@ export { default as FlowWorkOrderDetail } from "./FlowTemplateDetail";
 export { default as TradeList } from "./TradeList";
 import * as _utils from "./common/utils/tools";
 export { _utils as utils };
+import * as _arithmetic from "./common/utils/arithmetic";
+export { _arithmetic as arithmetic };
 export * from "./WorkOrder/types";

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

@@ -5,8 +5,6 @@ export declare const selectPaymentWorkOrderExamineModalVisible: ((state: {
     customizeWorkOrder: import("../customizeWorkOrder/types").CustomizeWorkOrderState;
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
-    logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -19,8 +17,6 @@ export declare const selectCurrentPaymentRecord: ((state: {
     customizeWorkOrder: import("../customizeWorkOrder/types").CustomizeWorkOrderState;
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
-    logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => any) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => any, {
     clearCache: () => void;
 }> & {
@@ -33,8 +29,6 @@ export declare const selectPaymentWorkOrderUnExamineModalVisible: ((state: {
     customizeWorkOrder: import("../customizeWorkOrder/types").CustomizeWorkOrderState;
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
-    logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -47,8 +41,6 @@ export declare const selectDeletePaymentWorkOrderVisible: ((state: {
     customizeWorkOrder: import("../customizeWorkOrder/types").CustomizeWorkOrderState;
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
-    logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -61,8 +53,6 @@ export declare const selectFlagPayModalVisible: ((state: {
     customizeWorkOrder: import("../customizeWorkOrder/types").CustomizeWorkOrderState;
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
-    logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -75,8 +65,6 @@ export declare const selectLogModalVisible: ((state: {
     customizeWorkOrder: import("../customizeWorkOrder/types").CustomizeWorkOrderState;
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
-    logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -89,8 +77,6 @@ export declare const selectPaymentFormModalVisible: ((state: {
     customizeWorkOrder: import("../customizeWorkOrder/types").CustomizeWorkOrderState;
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
-    logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -103,8 +89,6 @@ export declare const selectRepeatVisible: ((state: {
     customizeWorkOrder: import("../customizeWorkOrder/types").CustomizeWorkOrderState;
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
-    logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -117,8 +101,6 @@ export declare const selectRepeatWorkOrderList: ((state: {
     customizeWorkOrder: import("../customizeWorkOrder/types").CustomizeWorkOrderState;
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
-    logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => string[], {
     clearCache: () => void;
 }> & {

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

@@ -5,8 +5,6 @@ export declare const selectorSingleTemplateList: ((state: {
     customizeWorkOrder: import("../customizeWorkOrder/types").CustomizeWorkOrderState;
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
-    logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").SelectI[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => import("./types").SelectI[], {
     clearCache: () => void;
 }> & {
@@ -19,8 +17,6 @@ export declare const selectDeleteCustomizeWorkOrderModalVisible: ((state: {
     customizeWorkOrder: import("../customizeWorkOrder/types").CustomizeWorkOrderState;
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
-    logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -33,8 +29,6 @@ export declare const selectorCurrentCustomizeRecord: ((state: {
     customizeWorkOrder: import("../customizeWorkOrder/types").CustomizeWorkOrderState;
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
-    logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => any) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => any, {
     clearCache: () => void;
 }> & {
@@ -47,8 +41,6 @@ export declare const selectorTemplateId: ((state: {
     customizeWorkOrder: import("../customizeWorkOrder/types").CustomizeWorkOrderState;
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
-    logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => string, {
     clearCache: () => void;
 }> & {
@@ -61,8 +53,6 @@ export declare const selectorFormModalVisible: ((state: {
     customizeWorkOrder: import("../customizeWorkOrder/types").CustomizeWorkOrderState;
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
-    logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {

package/package.json

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