@kmkf-fe-packages/kmkf-work-order-service-component 0.20.1 → 0.20.2-alpha.1

package/dist/esm/FlowTemplateDetail/components/ActionList/index.d.ts

@@ -1,7 +1,8 @@
 import React from 'react';
-import { NodeType, FlowStatus } from '../../../model/flowTemplateDetail/types';
+import { NodeType, FlowStatus, FlowType } from '../../../model/flowTemplateDetail/types';
 interface ActionListProps {
     flowStatus: FlowStatus | undefined;
+    flowType: FlowType;
     nodeType: NodeType;
     handleAction: (s: string) => void;
     hasPreNode: boolean;

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Menu, Button, Space, Dropdown } from 'antd';
 import { DownOutlined } from '@ant-design/icons';
-import { FlowStatus } from "../../../model/flowTemplateDetail/types";
+import { FlowStatus, FlowType } from "../../../model/flowTemplateDetail/types";
 import styles from "./index.module.less";
 var getActionMap = function getActionMap(nodeStatus, hasPreNode) {
   // 非开始节点看状态
@@ -16,41 +16,49 @@ var getActionMap = function getActionMap(nodeStatus, hasPreNode) {
     return ['save', 'submit'];
   }
 };
-var buttonMap = {
-  save: {
-    label: '暂存',
-    type: 'default'
-  },
-  submit: {
-    label: '提交',
-    type: 'primary'
-  },
-  forward: {
-    label: '转交',
-    type: 'default'
-  },
-  rejected: {
-    label: '驳回',
-    type: 'default'
-  },
-  close: {
-    label: '关闭',
-    type: 'default'
-  },
-  stop: {
-    label: '暂停',
-    type: 'default'
-  },
-  open: {
-    label: '启用',
-    type: 'primary'
-  }
+var buttonMap = function buttonMap(flowType) {
+  return {
+    save: {
+      label: '暂存',
+      type: 'default',
+      style: {
+        backgroundColor: flowType === FlowType.SINGLE_PAGE ? '#52c41a' : '',
+        color: flowType === FlowType.SINGLE_PAGE ? '#fff' : '#000'
+      }
+    },
+    submit: {
+      label: flowType === FlowType.SINGLE_PAGE ? '完结' : '提交',
+      type: 'primary'
+    },
+    forward: {
+      label: '转交',
+      type: 'default'
+    },
+    rejected: {
+      label: '驳回',
+      type: 'default'
+    },
+    close: {
+      label: '关闭',
+      type: 'default'
+    },
+    stop: {
+      label: '暂停',
+      type: 'default'
+    },
+    open: {
+      label: '启用',
+      type: 'primary'
+    }
+  };
 };
 var ActionList = function ActionList(props) {
   var _buttonList$slice;
   var _props$flowStatus = props.flowStatus,
     flowStatus = _props$flowStatus === void 0 ? FlowStatus.NON_START : _props$flowStatus,
     hasPreNode = props.hasPreNode,
+    _props$flowType = props.flowType,
+    flowType = _props$flowType === void 0 ? FlowType.SINGLE_PAGE : _props$flowType,
     handleAction = props.handleAction;
   var buttonList = getActionMap(flowStatus, hasPreNode);
   var menu = function menu(list) {
@@ -59,12 +67,12 @@ var ActionList = function ActionList(props) {
         key: index,
         label: /*#__PURE__*/React.createElement(Button, {
           type: "link",
-          "data-spm-click": buttonMap[item].label,
-          "data-spm-param": buttonMap[item].label,
+          "data-spm-click": buttonMap(flowType)[item].label,
+          "data-spm-param": buttonMap(flowType)[item].label,
           onClick: function onClick() {
             return handleAction(item);
           }
-        }, buttonMap[item].label)
+        }, buttonMap(flowType)[item].label)
       };
     });
     return /*#__PURE__*/React.createElement(Menu, {
@@ -80,16 +88,17 @@ var ActionList = function ActionList(props) {
       return e.preventDefault();
     }
   }, /*#__PURE__*/React.createElement(Space, null, "\u66F4\u591A", /*#__PURE__*/React.createElement(DownOutlined, null)))), (_buttonList$slice = buttonList.slice(0, 3)) === null || _buttonList$slice === void 0 ? void 0 : _buttonList$slice.map(function (button, index) {
-    var _buttonMap$button, _buttonMap$button2, _buttonMap$button3;
+    var _buttonMap$button, _buttonMap$button2, _buttonMap$button3, _buttonMap$button4;
     return /*#__PURE__*/React.createElement(Button, {
       key: "button".concat(index),
-      type: buttonMap[button].type,
+      type: buttonMap(flowType)[button].type,
       onClick: function onClick() {
         return handleAction(button);
       },
-      "data-spm-click": (_buttonMap$button = buttonMap[button]) === null || _buttonMap$button === void 0 ? void 0 : _buttonMap$button.label,
-      "data-spm-param": (_buttonMap$button2 = buttonMap[button]) === null || _buttonMap$button2 === void 0 ? void 0 : _buttonMap$button2.label
-    }, (_buttonMap$button3 = buttonMap[button]) === null || _buttonMap$button3 === void 0 ? void 0 : _buttonMap$button3.label);
+      "data-spm-click": (_buttonMap$button = buttonMap(flowType)[button]) === null || _buttonMap$button === void 0 ? void 0 : _buttonMap$button.label,
+      "data-spm-param": (_buttonMap$button2 = buttonMap(flowType)[button]) === null || _buttonMap$button2 === void 0 ? void 0 : _buttonMap$button2.label,
+      style: (_buttonMap$button3 = buttonMap(flowType)[button]) === null || _buttonMap$button3 === void 0 ? void 0 : _buttonMap$button3.style
+    }, (_buttonMap$button4 = buttonMap(flowType)[button]) === null || _buttonMap$button4 === void 0 ? void 0 : _buttonMap$button4.label);
   })));
 };
 export default ActionList;

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

@@ -35,6 +35,7 @@ import { PlatForm } from "../../../model/flowTemplateDetail/types";
 import { groupByPreNode, getCurrentNodeModifiedShowHideRule } from "./common";
 import { getCalculationComponentValue } from "../../../common/utils/arithmetic";
 import "./index.less";
+import { CHILD_FIELD_TYPE, CHILD_FIELD_VALUE } from "../../../common/constant";
 var hasComponent = function hasComponent(componentDtoList, workOrderComponentType) {
   var _componentDtoList$fin;
   return (_componentDtoList$fin = componentDtoList.find(function (item) {
@@ -637,6 +638,37 @@ var FormRender = function FormRender(props, ref) {
       type: info.workOrderComponentType
     });
   };
+  var conditionItemResult = function conditionItemResult(item, getFieldValue) {
+    var _item$leftValue$split, _item$leftValue$split2, _item$compareSymbol;
+    //现支持子组件控制显隐，格式为${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;
+    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);
+    console.log('dependenceDetail', dependenceDetail);
+    if (isChildField && CHILD_FIELD_TYPE[childFieldType]) {
+      var _dependenceDetail;
+      var childType = CHILD_FIELD_TYPE[childFieldType];
+      dependenceDetail = ((_dependenceDetail = dependenceDetail) === null || _dependenceDetail === void 0 ? void 0 : _dependenceDetail[childType]) || dependenceDetail;
+    }
+    var leftValue = getFieldValue(prefixId);
+    console.log('leftValue1', leftValue);
+    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]] : '';
+      console.log('leftValue2', leftValue);
+    }
+    if (typeof dependenceDetail.formDataTransform === 'function') {
+      leftValue = dependenceDetail.formDataTransform(leftValue);
+      console.log('leftValue3', leftValue);
+    }
+    // TODO: 如果依赖的组件是隐藏的，当前依赖项为false
+    if (Reflect.has(currentComponentDisplayStatus.current, prefixId) && !currentComponentDisplayStatus.current[prefixId]) {
+      return false;
+    }
+    console.log('getExpression', leftValue, item.rightValue);
+    return getExpression((_item$compareSymbol = item.compareSymbol) === null || _item$compareSymbol === void 0 ? void 0 : _item$compareSymbol.toUpperCase(), leftValue, item.rightValue);
+  };
   var newRenderColumnItem = function newRenderColumnItem(effects) {
     return function (item) {
       var _item$componentConfig = item.componentConfig,
@@ -697,11 +729,6 @@ var FormRender = function FormRender(props, ref) {
           noStyle: true,
           shouldUpdate: function shouldUpdate(prevValues, currentValues) {
             return true; // TODO: 修复重复依赖的问题 https://tb.raycloud.com/task/64e4491e0b8b5c001e1099b9
-            // 对所有依赖项进行是否需要更新判断，只有当当前组件的依赖项发生了变化的时候，我们才会进行渲染判断
-            return Array.from(dependenciesFields).reduce(function (cur, nxt) {
-              if (cur) return true;
-              return cur || (prevValues === null || prevValues === void 0 ? void 0 : prevValues[nxt]) !== (currentValues === null || currentValues === void 0 ? void 0 : currentValues[nxt]);
-            }, false);
           }
         }, function (_ref4) {
           var getFieldValue = _ref4.getFieldValue;
@@ -715,37 +742,58 @@ var FormRender = function FormRender(props, ref) {
             // 满足所有
             if (linkCondition === 'every') {
               return every(conditionList, function (item) {
-                var _item$compareSymbol;
-                var dependenceDetail = getComponentDetailByFieldId(item.leftValue);
-                var 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]) {
-                  // console.log(
-                  //   'every',
-                  //   item.leftValue,
-                  //   currentComponentDisplayStatus.current[item.leftValue],
-                  // );
-                  return false;
-                }
-                return getExpression((_item$compareSymbol = item.compareSymbol) === null || _item$compareSymbol === void 0 ? void 0 : _item$compareSymbol.toUpperCase(), leftValue, item.rightValue);
+                //现支持子组件控制显隐，格式为${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) {
-              var _item$compareSymbol2;
-              var dependenceDetail = getComponentDetailByFieldId(item.leftValue);
-              var 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$compareSymbol2 = item.compareSymbol) === null || _item$compareSymbol2 === void 0 ? void 0 : _item$compareSymbol2.toUpperCase(), leftValue, item.rightValue);
+              // 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);
           // TODO: 当组件的显影状态发生变化

package/dist/esm/FlowTemplateDetail/components/SubmitRemindModal/index.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+interface Props {
+    onCallback: () => void;
+    onClose: () => void;
+}
+declare const _default: (props: Props) => React.JSX.Element;
+export default _default;

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

@@ -0,0 +1,33 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+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; }
+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 React, { useState } from 'react';
+import { Modal, Checkbox } from 'antd';
+import cache from "../../../common/cache";
+export default (function (props) {
+  var onCallback = props.onCallback,
+    onClose = props.onClose;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    remind = _useState2[0],
+    setRemind = _useState2[1];
+  var onOk = function onOk() {
+    remind && cache.setRemind();
+    onCallback();
+  };
+  return /*#__PURE__*/React.createElement(Modal, {
+    visible: true,
+    title: "\u63D0\u9192",
+    okText: "\u786E\u5B9A",
+    cancelText: "\u53D6\u6D88",
+    onOk: onOk,
+    onCancel: onClose
+  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("p", null, "\u786E\u8BA4\u5B8C\u7ED3\u5DE5\u5355\u5417?\u5B8C\u7ED3\u540E\u5DE5\u5355\u5185\u5BB9\u4E0D\u53EF\u53D8\u66F4"), /*#__PURE__*/React.createElement(Checkbox, {
+    onChange: function onChange(e) {
+      return setRemind(e.target.checked);
+    }
+  }, "\u77E5\u9053\u4E86\uFF0C\u4E0D\u7528\u518D\u63D0\u9192\u6211\u4E86")));
+});