@cloud-app-dev/vidc 1.0.38 → 1.0.42

package/es/TreeMode/index.js

@@ -68,6 +68,10 @@ function TreeMode(_a) {
   var treeData = useMemo(function () {
     return mode === 'Place' ? treeHelper.computPlaceTree(list) : treeHelper.computTreeList(list);
   }, [list, mode]);
+  /**
+   * @description 实现关键字展开节点
+   */
+
   useEffect(function () {
     var _a, _b;
 
@@ -137,6 +141,10 @@ function TreeMode(_a) {
   var treeName = useMemo(function () {
     return mode === 'Place' ? 'areaName' : mode === 'Org' ? 'organizationName' : 'groupName';
   }, [mode]);
+  /**
+   * @description 触发默认选中节点事件
+   */
+
   useEffect(function () {
     var id = treeData[0] ? treeData[0][treeKey] : undefined;
 
@@ -185,6 +193,7 @@ function TreeMode(_a) {
 
 TreeMode.defaultProps = {
   mode: 'Bz',
-  className: ''
+  className: '',
+  treeNodeProps: {}
 };
 export default TreeMode;

package/es/WorkerFlow/Demo.js

@@ -1,21 +1,6 @@
-import "antd/lib/drawer/style";
-import _Drawer from "antd/lib/drawer";
 import "antd/lib/config-provider/style";
 import _ConfigProvider from "antd/lib/config-provider";
-
-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 = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-import React, { useState } from 'react';
+import React from 'react';
 import WorkerFlow from './index';
 var form = [{
   label: '处理意见',
@@ -51,31 +36,16 @@ var form = [{
 }];
 
 var App = function App() {
-  var _useState = useState({
-    visible: false
-  }),
-      _useState2 = _slicedToArray(_useState, 2),
-      state = _useState2[0],
-      setState = _useState2[1];
-
   return /*#__PURE__*/React.createElement(_ConfigProvider, {
     prefixCls: "cloudapp"
   }, /*#__PURE__*/React.createElement("div", {
     style: {
       height: 800
     }
-  }, /*#__PURE__*/React.createElement("button", {
-    onClick: function onClick(old) {
-      return setState({
-        visible: true
-      });
-    }
-  }, "111"), /*#__PURE__*/React.createElement(WorkerFlow, {
+  }, /*#__PURE__*/React.createElement(WorkerFlow, {
     form: form,
     onChange: console.log,
     hasTools: true
-  }), /*#__PURE__*/React.createElement(_Drawer, {
-    visible: state.visible
   })));
 };
 

package/es/WorkerFlow/Form/Approver.d.ts

@@ -1,8 +1,9 @@
 import { NodeItem, WorkerFlowFormType } from '../interface';
 interface IApproverFormProps {
     form: WorkerFlowFormType[];
-    item?: NodeItem;
+    item: NodeItem;
     onChange: (data: any) => void;
+    config: NodeItem;
 }
-declare function ApproverForm({ form, item, onChange }: IApproverFormProps): JSX.Element;
+declare function ApproverForm({ form, item, onChange, config }: IApproverFormProps): JSX.Element;
 export default ApproverForm;

package/es/WorkerFlow/Form/Approver.js

@@ -1,18 +1,29 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import UserSet from './UserSet';
 import FormAuth from './FormAuth';
+import { getParentNodeById } from '../XML/utils';
 
 function ApproverForm(_ref) {
   var form = _ref.form,
       item = _ref.item,
-      onChange = _ref.onChange;
+      onChange = _ref.onChange,
+      config = _ref.config;
+  var parentNodeType = useMemo(function () {
+    var _a;
+
+    return (_a = getParentNodeById(config, item.id)) === null || _a === void 0 ? void 0 : _a.bpmnType;
+  }, [config, item.id]);
+  var includeUserTypes = useMemo(function () {
+    return parentNodeType === 'startEvent' || parentNodeType === 'sequenceFlow' ? [1, 3, 4, 5] : [1, 2, 3, 4, 5];
+  }, []);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(UserSet, {
     chargeLevel: item.chargeLevel,
     userType: item.userType,
     emptyUsers: item.emptyUserList,
     nodeUserList: item.nodeUserList,
     usersHandType: item.usersHandType,
-    onChange: onChange
+    onChange: onChange,
+    includeUserTypes: includeUserTypes
   }), /*#__PURE__*/React.createElement(FormAuth, {
     form: form,
     onChange: onChange

package/es/WorkerFlow/Form/Handle.d.ts

@@ -1,8 +1,9 @@
 import { NodeItem, WorkerFlowFormType } from '../interface';
 interface IHandleFormProps {
     form: WorkerFlowFormType[];
-    item?: NodeItem;
+    item: NodeItem;
     onChange: (data: any) => void;
+    config: NodeItem;
 }
-declare function HandleForm({ form, item, onChange }: IHandleFormProps): JSX.Element;
+declare function HandleForm({ form, item, onChange, config }: IHandleFormProps): JSX.Element;
 export default HandleForm;

package/es/WorkerFlow/Form/Handle.js

@@ -1,18 +1,28 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import UserSet from './UserSet';
 import FormAuth from './FormAuth';
+import { getParentNodeById } from '../XML/utils';
 
 function HandleForm(_ref) {
   var form = _ref.form,
       item = _ref.item,
-      onChange = _ref.onChange;
+      onChange = _ref.onChange,
+      config = _ref.config;
+  var parentNodeType = useMemo(function () {
+    var _a;
+
+    return (_a = getParentNodeById(config, item.id)) === null || _a === void 0 ? void 0 : _a.bpmnType;
+  }, [config, item.id]);
+  var includeUserTypes = useMemo(function () {
+    return parentNodeType === 'startEvent' || parentNodeType === 'sequenceFlow' ? [1, 3] : [1, 2, 3];
+  }, []);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(UserSet, {
     chargeLevel: item.chargeLevel,
     userType: item.userType,
     nodeUserList: item.nodeUserList,
     emptyUsers: item.emptyUserList,
     onChange: onChange,
-    includeUserTypes: [1, 2, 3],
+    includeUserTypes: includeUserTypes,
     usersHandType: item.usersHandType
   }), /*#__PURE__*/React.createElement(FormAuth, {
     form: form,

package/es/WorkerFlow/Nodes/Add.js

@@ -19,9 +19,6 @@ import QueueAnim from 'rc-queue-anim';
 
 function AddNode(_ref) {
   var node = _ref.node;
-
-  var _a;
-
   var boxRef = useRef(null);
 
   var _useState = useState(false),
@@ -58,6 +55,21 @@ function AddNode(_ref) {
       document.body.removeEventListener('click', fn, false);
     };
   }, [showPop]);
+
+  var types = function () {
+    var _a;
+
+    if (node.type === 0 || node.bpmnType === 'sequenceFlow') {
+      return [1, 3];
+    }
+
+    if (((_a = node.childNode) === null || _a === void 0 ? void 0 : _a.type) === 9) {
+      return [1, 2, 3];
+    }
+
+    return [1, 2, 3, 4];
+  }();
+
   return /*#__PURE__*/React.createElement("div", {
     className: "add-node-btn-box",
     ref: boxRef
@@ -68,8 +80,7 @@ function AddNode(_ref) {
     key: "add-popover"
   }, /*#__PURE__*/React.createElement(AddNodeList, {
     onOptionClick: onOptionClick,
-    type: node.type,
-    childType: (_a = node.childNode) === null || _a === void 0 ? void 0 : _a.type
+    types: types
   })) : /*#__PURE__*/React.createElement(React.Fragment, {
     key: "cancel-popover"
   })), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("button", {

package/es/WorkerFlow/Nodes/AddOptionList.d.ts

@@ -1,8 +1,7 @@
-import { NodeType } from '../interface';
+import { AddNodeType, NodeType } from '../interface';
 interface IAddNodeListProps {
     onOptionClick: (type: NodeType) => void;
-    type: NodeType;
-    childType: NodeType;
+    types: AddNodeType[];
 }
-declare function AddNodeList({ onOptionClick, type, childType }: IAddNodeListProps): JSX.Element;
+declare function AddNodeList({ onOptionClick, types }: IAddNodeListProps): JSX.Element;
 export default AddNodeList;

package/es/WorkerFlow/Nodes/AddOptionList.js

@@ -4,11 +4,11 @@ import { OptionNames, OptionTypes } from './Constants';
 
 function AddNodeList(_ref) {
   var onOptionClick = _ref.onOptionClick,
-      type = _ref.type,
-      childType = _ref.childType;
+      _ref$types = _ref.types,
+      types = _ref$types === void 0 ? [1, 2, 3, 4] : _ref$types;
   return /*#__PURE__*/React.createElement("div", {
     className: "add-node-popover-body"
-  }, /*#__PURE__*/React.createElement(AddNodeOption, {
+  }, types.includes(1) && /*#__PURE__*/React.createElement(AddNodeOption, {
     icon: "icon-yewu",
     type: "approver",
     onClick: function onClick() {
@@ -16,7 +16,7 @@ function AddNodeList(_ref) {
     },
     color: OptionNames[OptionTypes.APPROVER].color,
     name: OptionNames[OptionTypes.APPROVER].name
-  }), type !== 0 && /*#__PURE__*/React.createElement(AddNodeOption, {
+  }), types.includes(2) && /*#__PURE__*/React.createElement(AddNodeOption, {
     icon: "icon-biaoqian",
     type: "notifier",
     onClick: function onClick() {
@@ -24,7 +24,7 @@ function AddNodeList(_ref) {
     },
     color: OptionNames[OptionTypes.NOTIFIER].color,
     name: OptionNames[OptionTypes.NOTIFIER].name
-  }), /*#__PURE__*/React.createElement(AddNodeOption, {
+  }), types.includes(3) && /*#__PURE__*/React.createElement(AddNodeOption, {
     icon: "icon-yewu",
     type: "handle",
     onClick: function onClick() {
@@ -32,7 +32,7 @@ function AddNodeList(_ref) {
     },
     color: OptionNames[OptionTypes.HANDLE].color,
     name: OptionNames[OptionTypes.HANDLE].name
-  }), !(type === 0 || childType === 9) && /*#__PURE__*/React.createElement(AddNodeOption, {
+  }), types.includes(4) && /*#__PURE__*/React.createElement(AddNodeOption, {
     icon: "icon-ListTree",
     type: "condition",
     onClick: function onClick() {

package/es/WorkerFlow/Nodes/Approver.js

@@ -33,7 +33,7 @@ function ApproverNode(_ref) {
       backgroundColor: '#29CCCC'
     },
     onContentClick: function onContentClick() {
-      return onSelectNode(node);
+      return onSelectNode(node, parentNode);
     },
     title: TitleEl,
     node: node

package/es/WorkerFlow/Nodes/Condition.js

@@ -115,7 +115,7 @@ function ConditionNode(_ref3) {
       owner: item.owner,
       first: index === 0,
       onBranchClick: function onBranchClick() {
-        return onSelectNode(node, index);
+        return onSelectNode(node, parentNode, index);
       },
       delBranch: function delBranch() {
         return branches.length === 2 ? onDeleteNode(parentNode, node) : onDeleteNode(parentNode, node, NodeTypes.BRANCH, index);

package/es/WorkerFlow/Nodes/Handle.js

@@ -32,7 +32,7 @@ function HandleNode(_ref) {
       backgroundColor: '#FFB319'
     },
     onContentClick: function onContentClick() {
-      return onSelectNode(node);
+      return onSelectNode(node, parentNode);
     },
     title: TitleEl,
     node: node

package/es/WorkerFlow/Nodes/Notifier.js

@@ -32,7 +32,7 @@ function NotifierNode(_ref) {
       backgroundColor: '#198CFF'
     },
     onContentClick: function onContentClick() {
-      return onSelectNode(node);
+      return onSelectNode(node, parentNode);
     },
     title: TitleEl,
     node: node

package/es/WorkerFlow/Tools.d.ts

@@ -4,5 +4,5 @@ interface IZoomLayoutProps {
     hasTools?: boolean;
     exportBpmnFile?: () => any;
 }
-declare function ZoomLayout({ children, exportBpmnFile }: IZoomLayoutProps): JSX.Element;
+declare function ZoomLayout({ children, exportBpmnFile, hasTools }: IZoomLayoutProps): JSX.Element;
 export default ZoomLayout;

package/es/WorkerFlow/Tools.js

@@ -20,7 +20,8 @@ var ZOOM = {
 
 function ZoomLayout(_ref) {
   var children = _ref.children,
-      exportBpmnFile = _ref.exportBpmnFile;
+      exportBpmnFile = _ref.exportBpmnFile,
+      hasTools = _ref.hasTools;
 
   // 放大比例, 按百分制给 100 为 100%
   var _useState = useState(100),
@@ -60,7 +61,7 @@ function ZoomLayout(_ref) {
     onClick: function onClick() {
       return zoomSize(ZOOM.UP);
     }
-  })), /*#__PURE__*/React.createElement("div", {
+  })), hasTools && /*#__PURE__*/React.createElement("div", {
     className: "tools"
   }, /*#__PURE__*/React.createElement("button", {
     onClick: exportBpmnFile

package/es/WorkerFlow/XML/utils.d.ts

@@ -2,4 +2,5 @@ import { NodeItem } from '../interface';
 export declare function createId(type: string): string;
 export declare function getEndEventId(data: NodeItem): string;
 export declare function getNodeById(data: NodeItem, id: string): NodeItem;
+export declare function getParentNodeById(data: NodeItem, id: string): NodeItem;
 export declare function transformArray(data: NodeItem): NodeItem[];

package/es/WorkerFlow/XML/utils.js

@@ -45,6 +45,36 @@ export function getNodeById(data, id) {
   runGetNode(data);
   return nodeItem;
 }
+export function getParentNodeById(data, id) {
+  var nodeItem;
+
+  var runGetNode = function runGetNode(node) {
+    if (!node || !!nodeItem) {
+      return;
+    }
+
+    if (!node.childNode) {
+      return;
+    }
+
+    if (node.childNode.id === id) {
+      nodeItem = node;
+    } else {
+      if (node.conditionNodes && node.conditionNodes.length > 0) {
+        node.conditionNodes.forEach(function (item) {
+          runGetNode(item);
+        });
+      }
+
+      if (node.childNode) {
+        runGetNode(node.childNode);
+      }
+    }
+  };
+
+  runGetNode(data);
+  return nodeItem;
+}
 export function transformArray(data) {
   var arr = [];
 

package/es/WorkerFlow/index.js

@@ -166,7 +166,7 @@ function WorkerFlow(_ref, ref) {
   } // 获取节点
 
 
-  function onSelectNode(node, index) {
+  function onSelectNode(node, parentNode, index) {
     if (readOnly) {
       return;
     }
@@ -209,13 +209,20 @@ function WorkerFlow(_ref, ref) {
         return v.id !== node.conditionNodes[index].id ? v.conditionList : [];
       })).flat() : [];
       var nodeItem = node.type === 4 ? node.conditionNodes[index] : node;
+      var from = nodeItem.form ? form.map(function (v) {
+        return nodeItem.form.find(function (v2) {
+          return v2.name === v.name;
+        }) || v;
+      }) : form;
       drawer.open({
         title: nodeName,
         width: 640,
         content: /*#__PURE__*/React.createElement(FormContent, {
           useConditionFields: useConditionFields,
-          form: nodeItem.form || form,
+          form: from,
           item: nodeItem,
+          config: config,
+          parentNode: parentNode,
           onChange: onChange,
           index: index
         }),

package/es/WorkerFlow/interface.d.ts

@@ -51,7 +51,7 @@ export interface WorkerFlowContext {
   form: WorkerFlowFormType[];
   onInsertNode: (type: NodeType, node: NodeItem) => void;
   onDeleteNode: (parentNode: NodeItem, node: NodeItem, type?: NodeType, index?: number) => void;
-  onSelectNode: (node: NodeItem, index?: number) => void;
+  onSelectNode: (node: NodeItem, parentNode: NodeItem, index?: number) => void;
   updateNode: () => void;
   readOnly?: boolean;
 }
@@ -87,3 +87,5 @@ export type SubmitData = {
   useFormKeys: string[];
   taskList: SubmitFlowItemType[];
 };
+
+export type AddNodeType = 1 | 2 | 3 | 4; //1审核人，2抄送人，3办理人，4条件分支

package/es/WorkerFlow/utils.d.ts

@@ -1,4 +1,6 @@
 import { NodeItem, SubmitFlowItemType } from './interface';
 export declare function getJAVATaskData(data: NodeItem): SubmitFlowItemType[];
+export declare function getNextTaskId(node: NodeItem): string | undefined;
+export declare function getNextNode(node: NodeItem): NodeItem | undefined;
 export declare function filterNoticeNode(data: NodeItem): NodeItem;
 export declare function getUserFormKeys(data: NodeItem): string[];

package/es/WorkerFlow/utils.js

@@ -11,11 +11,12 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 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 _ from 'lodash';
+import { getNodeById } from './XML/utils';
 export function getJAVATaskData(data) {
   var arr = [];
 
-  var fn = function fn(node) {
-    var _a, _b, _c, _d, _e;
+  var fn = function fn(node, _nextNode) {
+    var _a, _b, _c, _d;
 
     if (node.bpmnType === 'userTask') {
       var item = {
@@ -51,12 +52,17 @@ export function getJAVATaskData(data) {
         item.multiVariableName = "assigneeList_".concat(node.id);
       }
 
-      if (((_b = node.childNode) === null || _b === void 0 ? void 0 : _b.bpmnType) === 'userTask' && ((_c = node.childNode) === null || _c === void 0 ? void 0 : _c.type) !== 2) {
-        item.nextTaskId = node.childNode.id;
+      if (((_b = node.childNode) === null || _b === void 0 ? void 0 : _b.bpmnType) === 'userTask') {
+        item.nextTaskId = getNextTaskId(node.childNode);
+      } // 连接条件nextTaskId
+
+
+      if (!node.childNode) {
+        item.nextTaskId = _nextNode === null || _nextNode === void 0 ? void 0 : _nextNode.id;
       }
 
       if (node.form) {
-        item.formAuthority = JSON.stringify((_d = node.form) === null || _d === void 0 ? void 0 : _d.map(function (v) {
+        item.formAuthority = JSON.stringify((_c = node.form) === null || _c === void 0 ? void 0 : _c.map(function (v) {
           return {
             formAuth: v.auth,
             formVariableName: v.name
@@ -64,27 +70,26 @@ export function getJAVATaskData(data) {
         }));
       }
 
-      if (((_e = node.childNode) === null || _e === void 0 ? void 0 : _e.type) === 2) {
+      if (((_d = node.childNode) === null || _d === void 0 ? void 0 : _d.type) === 2) {
         item.copyUserIds = node.childNode.nodeUserList.map(function (v) {
           return v.value;
         });
       }
 
       arr.push(item);
-    }
+    } // 检查最后一个nextTaskId
+
+
+    var nextNode = getNextNode(node.childNode);
 
     if (node.conditionNodes) {
       node.conditionNodes.forEach(function (item) {
-        fn(item);
+        fn(item, nextNode);
       });
     }
 
-    if (node.childNode) {
-      if (node.childNode.type === 2 && node.childNode.childNode) {
-        fn(node.childNode.childNode);
-      } else {
-        fn(node.childNode);
-      }
+    if (nextNode) {
+      fn(nextNode, _nextNode);
     }
   };
 
@@ -92,10 +97,43 @@ export function getJAVATaskData(data) {
 
   if (arr[0]) {
     arr[0].taskFirstBlank = 1;
+  } // 修正最后一个节点的nextid
+
+
+  var lastNextId = arr[arr.length - 1].nextTaskId;
+
+  if (lastNextId) {
+    var lastNode = getNodeById(data, lastNextId);
+
+    if (lastNode.type === 2 || lastNode.bpmnType === 'endEvent') {
+      arr[arr.length - 1].nextTaskId = undefined;
+    }
   }
 
   return arr;
 }
+export function getNextTaskId(node) {
+  if (!node) {
+    return undefined;
+  }
+
+  if (node.type !== 2) {
+    return node.id;
+  } else {
+    return getNextTaskId(node.childNode);
+  }
+}
+export function getNextNode(node) {
+  if (!node) {
+    return undefined;
+  }
+
+  if (node.type !== 2) {
+    return node;
+  } else {
+    return getNextNode(node.childNode);
+  }
+}
 export function filterNoticeNode(data) {
   var newData = _.cloneDeep(data);
 

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "1.0.38",
+  "version": "1.0.42",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -30,7 +30,6 @@
     ]
   },
   "dependencies": {
-    "@cloud-app-dev/utils": "^1.0.2",
     "chroma-js": "^2.1.2",
     "jsencrypt": "^3.2.1",
     "lodash": "^4.17.21",
@@ -38,7 +37,8 @@
     "rc-queue-anim": "^2.0.0"
   },
   "devDependencies": {
-    "@cloud-app-dev/basic-components": "^1.0.51",
+    "@cloud-app-dev/utils": "^2.0.1",
+    "@cloud-app-dev/basic-components": "^1.0.54",
     "@types/chroma-js": "^2.1.3",
     "@types/lodash": "^4.14.172",
     "@umijs/test": "^3.0.5",

package/scripts/entry.js

@@ -17,4 +17,4 @@ function run() {
 
 run();
 
-console.log('entry is init!');
+console.log('================== entry is init! ===================');