@cloud-app-dev/vidc 1.0.40 → 1.0.44

package/es/WorkerFlow/Form/UserSet.js

@@ -38,10 +38,11 @@ function UserSet(_ref) {
 
   var _ref$userType = _ref.userType,
       userType = _ref$userType === void 0 ? 1 : _ref$userType,
+      nodeType = _ref.nodeType,
       _ref$nodeUserList = _ref.nodeUserList,
       nodeUserList = _ref$nodeUserList === void 0 ? [] : _ref$nodeUserList,
       _ref$usersHandType = _ref.usersHandType,
-      usersHandType = _ref$usersHandType === void 0 ? 1 : _ref$usersHandType,
+      usersHandType = _ref$usersHandType === void 0 ? 2 : _ref$usersHandType,
       onChange = _ref.onChange,
       emptyUsers = _ref.emptyUsers,
       includeUserTypes = _ref.includeUserTypes,
@@ -114,7 +115,8 @@ function UserSet(_ref) {
     usersHandType: state.usersHandType,
     onChange: function onChange(options) {
       return stateChange(options);
-    }
+    },
+    nodeType: nodeType
   })));
 }
 /**
@@ -127,7 +129,8 @@ function UserSelectType1(_ref2) {
       usersHandType = _ref2.usersHandType,
       _onChange = _ref2.onChange,
       type = _ref2.type,
-      emptyUsers = _ref2.emptyUsers;
+      emptyUsers = _ref2.emptyUsers,
+      nodeType = _ref2.nodeType;
   var userList = useMemo(function () {
     return users.filter(function (v) {
       return v.key === 'userId';
@@ -140,7 +143,7 @@ function UserSelectType1(_ref2) {
     onChange: function onChange(users) {
       return _onChange(_defineProperty({}, type, users));
     }
-  }), /*#__PURE__*/React.createElement(UsersHandleType, {
+  }), nodeType !== 2 && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(UsersHandleType, {
     usersHandType: usersHandType,
     onChange: function onChange(value) {
       return _onChange({
@@ -154,7 +157,7 @@ function UserSelectType1(_ref2) {
         emptyUsers: users
       });
     }
-  }));
+  })));
 }
 /**
  * @desc 自选人员

package/es/WorkerFlow/Form/UsersHandleType.js

@@ -7,7 +7,9 @@ function UsersHandleType(_ref) {
   var usersHandType = _ref.usersHandType,
       _onChange = _ref.onChange;
   var options = useMemo(function () {
-    return Object.values(UserHandleTypeOptions);
+    return Object.values(UserHandleTypeOptions).sort(function (a, b) {
+      return b.value - a.value;
+    });
   }, []);
   return /*#__PURE__*/React.createElement("div", {
     className: "users-handle-type-content"

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

@@ -4,6 +4,7 @@ import AddNode from './Add';
 import Render from './Render';
 import { NodeTypes } from './Constants';
 import WFC from '../OperatorContext';
+import TitleElement from './TitleElement';
 
 function CoverLine(_ref) {
   var _ref$first = _ref.first,
@@ -44,17 +45,13 @@ function BranchNode(_ref2) {
     onClick: sortLeft
   }), /*#__PURE__*/React.createElement("div", {
     className: "title-wrapper"
-  }, /*#__PURE__*/React.createElement("span", {
-    className: "editable-title"
-  }, nodeName), /*#__PURE__*/React.createElement(_IconFont, {
-    className: "worker-flow-node-del",
-    type: "icon-MarkNo",
-    style: {
-      color: '#333',
-      right: 5,
-      top: 5
+  }, /*#__PURE__*/React.createElement(TitleElement, {
+    placeholder: "\u8BF7\u8F93\u5165\u6761\u4EF6\u540D\u79F0",
+    onTitleChange: function onTitleChange(v) {
+      return node.nodeName = v;
     },
-    onClick: delBranch
+    delNode: delBranch,
+    nodeName: node.nodeName
   })), !last && /*#__PURE__*/React.createElement("div", {
     className: "sort-right",
     onClick: sortRight
@@ -115,7 +112,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/Nodes/TitleElement.js

@@ -48,7 +48,7 @@ function TitleElement(_ref) {
     onTitleChange && onTitleChange(title);
   }, [title]);
 
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_IconFont, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, icon && /*#__PURE__*/React.createElement(_IconFont, {
     type: icon,
     style: {
       paddingRight: 4

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.css

@@ -246,10 +246,18 @@
 }
 .worker-flow-design .auto-judge .title-wrapper .editable-title {
   display: inline-block;
-  max-width: 120px;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
+  margin-right: 10px;
+  height: 20px;
+}
+.worker-flow-design .auto-judge .title-wrapper .editable-title-input {
+  margin-right: 10px;
+  height: 20px;
+}
+.worker-flow-design .auto-judge .title-wrapper .anticon {
+  color: #333;
 }
 .worker-flow-design .auto-judge .content {
   font-size: 14px;
@@ -400,7 +408,9 @@
   top: 30px;
   z-index: 1;
 }
-.auto-judge:hover .editable-title,
+.auto-judge:hover .editable-title {
+  border-bottom: 1px dashed #15bc83;
+}
 .node-wrap-box:hover .editable-title {
   border-bottom: 1px dashed #fff;
 }

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

@@ -15,6 +15,7 @@ export type NodeUserType = {
 export type WorkerFlowFormType = {
   name: string;
   label: string;
+  fromType: 'SINGLE_TEXT' | 'MULTIPLE_TEXT' | 'SINGLE_SELECTION' | 'MULTIPLE_SELECTION' | 'IMAGE';
   type: string;
   value: string;
   auth?: FormAuthType;
@@ -51,7 +52,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;
 }
@@ -84,6 +85,8 @@ export type SubmitFlowItemType = {
 export type SubmitData = {
   config: WorkerFlowRequest;
   bpmnBlob: Blob;
-  useFormKeys: string[];
+  useFormKeys: ConditionItemType[];
   taskList: SubmitFlowItemType[];
 };
+
+export type AddNodeType = 1 | 2 | 3 | 4; //1审核人，2抄送人，3办理人，4条件分支

package/es/WorkerFlow/utils.d.ts

@@ -1,6 +1,6 @@
-import { NodeItem, SubmitFlowItemType } from './interface';
+import { ConditionItemType, 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[];
+export declare function getUserFormKeys(data: NodeItem): ConditionItemType[];

package/es/WorkerFlow/utils.js

@@ -11,6 +11,7 @@ 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 = [];
 
@@ -76,7 +77,8 @@ export function getJAVATaskData(data) {
       }
 
       arr.push(item);
-    }
+    } // 检查最后一个nextTaskId
+
 
     var nextNode = getNextNode(node.childNode);
 
@@ -95,6 +97,17 @@ 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;
@@ -154,9 +167,8 @@ export function getUserFormKeys(data) {
 
   var fn = function fn(node) {
     if (node.bpmnType == 'sequenceFlow') {
-      arr.push.apply(arr, _toConsumableArray(node.conditionList.map(function (v) {
-        return v.field;
-      })));
+      console.log(node.conditionList);
+      arr.push.apply(arr, _toConsumableArray(node.conditionList));
     }
 
     if (node.conditionNodes) {

package/es/utils.js

@@ -1,7 +1,7 @@
-import { cache } from '@cloud-app-dev/utils';
+import _cache from "@cloud-app-dev/utils/es/cache";
 export var getHeader = function getHeader() {
   return {
-    Authorization: cache.getCache('token', 'session')
+    Authorization: _cache.getCache('token', 'session')
   };
 };
 /**

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "1.0.40",
+  "version": "1.0.44",
   "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.52",
+    "@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",