@cloud-app-dev/vidc 1.0.39 → 1.0.43

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (82) hide show
  1. package/.fatherrc.js +3 -0
  2. package/.umirc.ts +3 -0
  3. package/es/AppLayout/AppHeader/index.d.ts +18 -0
  4. package/es/AppLayout/AppHeader/index.js +5 -6
  5. package/es/AppLayout/AppHorizontalMenu/MenuEmptyBox.d.ts +1 -0
  6. package/es/AppLayout/AppHorizontalMenu/SubGroup.d.ts +9 -0
  7. package/es/AppLayout/AppHorizontalMenu/index.d.ts +13 -0
  8. package/es/AppLayout/AppHorizontalMenu/index.js +10 -16
  9. package/es/AppLayout/AppInlineMenu/SubGroup.d.ts +9 -0
  10. package/es/AppLayout/AppInlineMenu/SubGroup.js +29 -70
  11. package/es/AppLayout/AppInlineMenu/index.d.ts +12 -0
  12. package/es/AppLayout/AppInlineMenu/index.js +14 -18
  13. package/es/AppLayout/AppLogo/index.d.ts +13 -0
  14. package/es/AppLayout/AppLogo/index.js +11 -12
  15. package/es/AppLayout/AppTools/index.d.ts +7 -9
  16. package/es/AppLayout/FunctionPreview/index.d.ts +22 -0
  17. package/es/AppLayout/FunctionPreview/index.js +35 -40
  18. package/es/AppLayout/Header/ListenceRoute.d.ts +5 -0
  19. package/es/AppLayout/Header/ListenceRoute.js +1 -1
  20. package/es/AppLayout/Header/ModifyPassword/index.d.ts +6 -0
  21. package/es/AppLayout/Header/ModifyPassword/index.js +72 -38
  22. package/es/AppLayout/Header/ModifyUserAvatar/index.d.ts +10 -0
  23. package/es/AppLayout/Header/ModifyUserAvatar/index.js +4 -10
  24. package/es/AppLayout/Header/NotifyAlarm.js +14 -9
  25. package/es/AppLayout/Header/Tools.d.ts +11 -0
  26. package/es/AppLayout/Header/Tools.js +4 -5
  27. package/es/AppLayout/Header/ToolsItem.d.ts +1 -0
  28. package/es/AppLayout/Header/ToolsItem.js +7 -14
  29. package/es/AppLayout/Header/UserAction.d.ts +10 -0
  30. package/es/AppLayout/Header/UserAction.js +30 -36
  31. package/es/AppLayout/Header/index.d.ts +9 -0
  32. package/es/AppLayout/Header/index.js +10 -22
  33. package/es/AppLayout/index.d.ts +10 -12
  34. package/es/AppLayout/index.js +2 -1
  35. package/es/AppLayout/service/index.js +5 -5
  36. package/es/AppLayout/utils.d.ts +4 -0
  37. package/es/AppLayout/utils.js +12 -37
  38. package/es/DagInitialRequest/utils.js +7 -8
  39. package/es/InitialRequest/index.js +2 -2
  40. package/es/InitialRequest/utils.js +8 -9
  41. package/es/OrgUserTree/index.d.ts +6 -0
  42. package/es/OrgUserTree/index.js +6 -2
  43. package/es/PlaceTree/index.js +4 -3
  44. package/es/TreeMode/index.d.ts +1 -0
  45. package/es/TreeMode/index.js +12 -3
  46. package/es/UserSelect/demo.d.ts +2 -0
  47. package/es/UserSelect/demo.js +20 -0
  48. package/es/UserSelect/index.js +8 -5
  49. package/es/WorkerFlow/Demo.js +4 -33
  50. package/es/WorkerFlow/Form/Approver.d.ts +3 -2
  51. package/es/WorkerFlow/Form/Approver.js +14 -3
  52. package/es/WorkerFlow/Form/Condition.js +4 -1
  53. package/es/WorkerFlow/Form/FormAuth.js +1 -1
  54. package/es/WorkerFlow/Form/GroupSelectModalContent.js +25 -13
  55. package/es/WorkerFlow/Form/Handle.d.ts +3 -2
  56. package/es/WorkerFlow/Form/Handle.js +13 -3
  57. package/es/WorkerFlow/Form/Notifier.js +2 -1
  58. package/es/WorkerFlow/Form/UserAndGroupSelect.js +41 -2
  59. package/es/WorkerFlow/Form/UserSelectModalContent.js +12 -2
  60. package/es/WorkerFlow/Form/UserSet.d.ts +3 -2
  61. package/es/WorkerFlow/Form/UserSet.js +8 -5
  62. package/es/WorkerFlow/Form/UsersHandleType.js +3 -1
  63. package/es/WorkerFlow/Nodes/Add.js +16 -5
  64. package/es/WorkerFlow/Nodes/AddOptionList.d.ts +3 -4
  65. package/es/WorkerFlow/Nodes/AddOptionList.js +6 -6
  66. package/es/WorkerFlow/Nodes/Approver.js +1 -1
  67. package/es/WorkerFlow/Nodes/Condition.js +8 -11
  68. package/es/WorkerFlow/Nodes/Handle.js +1 -1
  69. package/es/WorkerFlow/Nodes/Notifier.js +1 -1
  70. package/es/WorkerFlow/Nodes/TitleElement.js +1 -1
  71. package/es/WorkerFlow/Tools.d.ts +1 -1
  72. package/es/WorkerFlow/Tools.js +3 -2
  73. package/es/WorkerFlow/XML/utils.d.ts +1 -0
  74. package/es/WorkerFlow/XML/utils.js +30 -0
  75. package/es/WorkerFlow/index.css +12 -2
  76. package/es/WorkerFlow/index.js +9 -2
  77. package/es/WorkerFlow/interface.d.ts +5 -2
  78. package/es/WorkerFlow/utils.d.ts +2 -2
  79. package/es/WorkerFlow/utils.js +16 -4
  80. package/es/utils.js +2 -2
  81. package/package.json +3 -3
  82. package/scripts/entry.js +1 -1
@@ -1,27 +1,13 @@
1
- import "antd/lib/drawer/style";
2
- import _Drawer from "antd/lib/drawer";
3
1
  import "antd/lib/config-provider/style";
4
2
  import _ConfigProvider from "antd/lib/config-provider";
5
-
6
- function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
7
-
8
- 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."); }
9
-
10
- 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); }
11
-
12
- 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; }
13
-
14
- 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; }
15
-
16
- function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
17
-
18
- import React, { useState } from 'react';
3
+ import React from 'react';
19
4
  import WorkerFlow from './index';
20
5
  var form = [{
21
6
  label: '处理意见',
22
7
  auth: 1,
23
8
  name: 'yijian',
24
- type: 'string',
9
+ fromType: 'SINGLE_SELECTION',
10
+ required: true,
25
11
  options: [{
26
12
  label: '有效',
27
13
  value: 1
@@ -51,31 +37,16 @@ var form = [{
51
37
  }];
52
38
 
53
39
  var App = function App() {
54
- var _useState = useState({
55
- visible: false
56
- }),
57
- _useState2 = _slicedToArray(_useState, 2),
58
- state = _useState2[0],
59
- setState = _useState2[1];
60
-
61
40
  return /*#__PURE__*/React.createElement(_ConfigProvider, {
62
41
  prefixCls: "cloudapp"
63
42
  }, /*#__PURE__*/React.createElement("div", {
64
43
  style: {
65
44
  height: 800
66
45
  }
67
- }, /*#__PURE__*/React.createElement("button", {
68
- onClick: function onClick(old) {
69
- return setState({
70
- visible: true
71
- });
72
- }
73
- }, "111"), /*#__PURE__*/React.createElement(WorkerFlow, {
46
+ }, /*#__PURE__*/React.createElement(WorkerFlow, {
74
47
  form: form,
75
48
  onChange: console.log,
76
49
  hasTools: true
77
- }), /*#__PURE__*/React.createElement(_Drawer, {
78
- visible: state.visible
79
50
  })));
80
51
  };
81
52
 
@@ -1,8 +1,9 @@
1
1
  import { NodeItem, WorkerFlowFormType } from '../interface';
2
2
  interface IApproverFormProps {
3
3
  form: WorkerFlowFormType[];
4
- item?: NodeItem;
4
+ item: NodeItem;
5
5
  onChange: (data: any) => void;
6
+ config: NodeItem;
6
7
  }
7
- declare function ApproverForm({ form, item, onChange }: IApproverFormProps): JSX.Element;
8
+ declare function ApproverForm({ form, item, onChange, config }: IApproverFormProps): JSX.Element;
8
9
  export default ApproverForm;
@@ -1,18 +1,29 @@
1
- import React from 'react';
1
+ import React, { useMemo } from 'react';
2
2
  import UserSet from './UserSet';
3
3
  import FormAuth from './FormAuth';
4
+ import { getParentNodeById } from '../XML/utils';
4
5
 
5
6
  function ApproverForm(_ref) {
6
7
  var form = _ref.form,
7
8
  item = _ref.item,
8
- onChange = _ref.onChange;
9
+ onChange = _ref.onChange,
10
+ config = _ref.config;
11
+ var parentNodeType = useMemo(function () {
12
+ var _a;
13
+
14
+ return (_a = getParentNodeById(config, item.id)) === null || _a === void 0 ? void 0 : _a.bpmnType;
15
+ }, [config, item.id]);
16
+ var includeUserTypes = useMemo(function () {
17
+ return parentNodeType === 'startEvent' || parentNodeType === 'sequenceFlow' ? [1, 3, 4, 5] : [1, 2, 3, 4, 5];
18
+ }, []);
9
19
  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(UserSet, {
10
20
  chargeLevel: item.chargeLevel,
11
21
  userType: item.userType,
12
22
  emptyUsers: item.emptyUserList,
13
23
  nodeUserList: item.nodeUserList,
14
24
  usersHandType: item.usersHandType,
15
- onChange: onChange
25
+ onChange: onChange,
26
+ includeUserTypes: includeUserTypes
16
27
  }), /*#__PURE__*/React.createElement(FormAuth, {
17
28
  form: form,
18
29
  onChange: onChange
@@ -56,6 +56,9 @@ function ConditionForm(_ref) {
56
56
  }, [formItem.name, useConditionFields]);
57
57
  var addCondition = useCallback(function () {
58
58
  var modal = modalRef.current;
59
+ var allowForm = form.filter(function (v) {
60
+ return v.fromType === 'SINGLE_SELECTION' && v.required;
61
+ });
59
62
 
60
63
  var onOk = function onOk() {
61
64
  var _a, _b;
@@ -83,7 +86,7 @@ function ConditionForm(_ref) {
83
86
  var options = {
84
87
  content: /*#__PURE__*/React.createElement(ModalContent, {
85
88
  ref: cRef,
86
- form: form,
89
+ form: allowForm,
87
90
  value: state.field
88
91
  }),
89
92
  width: 340,
@@ -104,7 +104,7 @@ function FormAuth(_ref) {
104
104
  onClick: function onClick() {
105
105
  return onFormAuthChange({
106
106
  name: item.name,
107
- auth: 3
107
+ auth: 0
108
108
  });
109
109
  }
110
110
  });
@@ -1,3 +1,4 @@
1
+ import _treeHelper from "@cloud-app-dev/utils/es/treeHelper";
1
2
  import _useHttp2 from "@cloud-app-dev/basic-components/es/useHttp";
2
3
 
3
4
  function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -23,9 +24,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
23
24
  import React, { useCallback, useMemo, useState, useImperativeHandle } from 'react';
24
25
  import api from '../../Api';
25
26
  import TreeMode from '../../TreeMode';
26
- import List from '../../List';
27
27
  import { uniq, intersectionWith } from 'lodash';
28
- import { treeHelper } from '@cloud-app-dev/utils';
29
28
  import { formatRenderGroup } from './utils';
30
29
  import GroupList from './GroupList';
31
30
 
@@ -52,7 +51,7 @@ function GroupSelectModalContent(_ref, ref) {
52
51
  orgList = _useHttp$data === void 0 ? [] : _useHttp$data;
53
52
 
54
53
  var treeData = useMemo(function () {
55
- return treeHelper.computTreeList(orgList);
54
+ return _treeHelper.computTreeList(orgList);
56
55
  }, [orgList]);
57
56
  var selectId = useMemo(function () {
58
57
  return state.orgId ? state.orgId : treeData[0] ? treeData[0].id : undefined;
@@ -112,9 +111,26 @@ function GroupSelectModalContent(_ref, ref) {
112
111
  })
113
112
  };
114
113
  }, [state.selectUsers, state.selectIds]);
114
+ var nodeUserList = useMemo(function () {
115
+ return formatRenderGroup(groupList.filter(function (v) {
116
+ return !state.keyword1 || v.postName.includes(state.keyword1);
117
+ }).map(function (v) {
118
+ var orgItem = orgList.find(function (v2) {
119
+ return v2.id === v.orgId;
120
+ });
121
+ return {
122
+ name: v.postName,
123
+ value: v.id,
124
+ key: 'groupId',
125
+ groupName: orgItem === null || orgItem === void 0 ? void 0 : orgItem.organizationName
126
+ };
127
+ }));
128
+ }, [groupList, orgList, state.keyword1]);
115
129
  var renderList = useMemo(function () {
116
- return formatRenderGroup(state.selectUsers);
117
- }, [state.selectUsers]);
130
+ return formatRenderGroup(state.selectUsers.filter(function (v) {
131
+ return !state.keyword2 || v.name.includes(state.keyword2);
132
+ }));
133
+ }, [state.selectUsers, state.keyword2]);
118
134
  return /*#__PURE__*/React.createElement("div", {
119
135
  className: "user-select-modal-content"
120
136
  }, /*#__PURE__*/React.createElement(TreeMode, {
@@ -129,14 +145,9 @@ function GroupSelectModalContent(_ref, ref) {
129
145
  });
130
146
  },
131
147
  selectedKeys: [selectId]
132
- }), /*#__PURE__*/React.createElement(List, {
133
- onChecked: onUserChecked1,
134
- list: groupList,
135
- key: groupList.length,
148
+ }), /*#__PURE__*/React.createElement(GroupList, {
149
+ list: nodeUserList,
136
150
  checkedKeys: list1CheckedKeys,
137
- itemKey: "id",
138
- itemNameKey: "postName",
139
- title: "\u5C97\u4F4D",
140
151
  onKeywordChange: function onKeywordChange(v) {
141
152
  return setState(function (old) {
142
153
  return Object.assign(Object.assign({}, old), {
@@ -144,7 +155,8 @@ function GroupSelectModalContent(_ref, ref) {
144
155
  });
145
156
  });
146
157
  },
147
- keywords: state.keyword1
158
+ keywords: state.keyword1,
159
+ onChecked: onUserChecked1
148
160
  }), /*#__PURE__*/React.createElement(GroupList, {
149
161
  list: renderList,
150
162
  checkedKeys: state.selectIds,
@@ -1,8 +1,9 @@
1
1
  import { NodeItem, WorkerFlowFormType } from '../interface';
2
2
  interface IHandleFormProps {
3
3
  form: WorkerFlowFormType[];
4
- item?: NodeItem;
4
+ item: NodeItem;
5
5
  onChange: (data: any) => void;
6
+ config: NodeItem;
6
7
  }
7
- declare function HandleForm({ form, item, onChange }: IHandleFormProps): JSX.Element;
8
+ declare function HandleForm({ form, item, onChange, config }: IHandleFormProps): JSX.Element;
8
9
  export default HandleForm;
@@ -1,18 +1,28 @@
1
- import React from 'react';
1
+ import React, { useMemo } from 'react';
2
2
  import UserSet from './UserSet';
3
3
  import FormAuth from './FormAuth';
4
+ import { getParentNodeById } from '../XML/utils';
4
5
 
5
6
  function HandleForm(_ref) {
6
7
  var form = _ref.form,
7
8
  item = _ref.item,
8
- onChange = _ref.onChange;
9
+ onChange = _ref.onChange,
10
+ config = _ref.config;
11
+ var parentNodeType = useMemo(function () {
12
+ var _a;
13
+
14
+ return (_a = getParentNodeById(config, item.id)) === null || _a === void 0 ? void 0 : _a.bpmnType;
15
+ }, [config, item.id]);
16
+ var includeUserTypes = useMemo(function () {
17
+ return parentNodeType === 'startEvent' || parentNodeType === 'sequenceFlow' ? [1, 3, 4, 5] : [1, 2, 3, 4, 5];
18
+ }, []);
9
19
  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(UserSet, {
10
20
  chargeLevel: item.chargeLevel,
11
21
  userType: item.userType,
12
22
  nodeUserList: item.nodeUserList,
13
23
  emptyUsers: item.emptyUserList,
14
24
  onChange: onChange,
15
- includeUserTypes: [1, 2, 3],
25
+ includeUserTypes: includeUserTypes,
16
26
  usersHandType: item.usersHandType
17
27
  }), /*#__PURE__*/React.createElement(FormAuth, {
18
28
  form: form,
@@ -8,7 +8,8 @@ function NotifierForm(_ref) {
8
8
  userType: item.userType,
9
9
  nodeUserList: item.nodeUserList,
10
10
  onChange: onChange,
11
- includeUserTypes: [1]
11
+ includeUserTypes: [1],
12
+ nodeType: 2
12
13
  }));
13
14
  }
14
15
 
@@ -27,6 +27,7 @@ import chroma from 'chroma-js';
27
27
  import UserSelectModalContent from './UserSelectModalContent';
28
28
  import GroupSelectModalContent from './GroupSelectModalContent';
29
29
  import RefModal from '../../RefModal';
30
+ import { formatRenderGroup } from './utils';
30
31
 
31
32
  function UserAndGroupSelect(_ref) {
32
33
  var _this = this;
@@ -97,6 +98,9 @@ function UserAndGroupSelect(_ref) {
97
98
  }
98
99
  });
99
100
  }, [state.userList, state.type]);
101
+ var renderList = useMemo(function () {
102
+ return state.type === 'groupId' ? formatRenderGroup(state.userList) : state.userList;
103
+ }, [state.userList, state.type]);
100
104
  useEffect(function () {
101
105
  return onChange(state.userList);
102
106
  }, [state.userList]);
@@ -108,6 +112,16 @@ function UserAndGroupSelect(_ref) {
108
112
  });
109
113
  });
110
114
  }, []);
115
+ var onCloseTag = useCallback(function (id) {
116
+ var list = state.userList.filter(function (v) {
117
+ return v.value !== id;
118
+ });
119
+ setState(function (old) {
120
+ return Object.assign(Object.assign({}, old), {
121
+ userList: list
122
+ });
123
+ });
124
+ }, [state.userList]);
111
125
  return /*#__PURE__*/React.createElement("div", {
112
126
  className: "user-select-component user-and-group-select-component"
113
127
  }, /*#__PURE__*/React.createElement("div", {
@@ -135,12 +149,37 @@ function UserAndGroupSelect(_ref) {
135
149
  className: "placeholder"
136
150
  }, "\u4E0D\u80FD\u8D85\u8FC720\u4E2A")), /*#__PURE__*/React.createElement("div", {
137
151
  className: "user-list-wrapper"
138
- }, state.userList.map(function (v) {
152
+ }, state.type === 'userId' ? state.userList.map(function (v) {
139
153
  return /*#__PURE__*/React.createElement(_Tag, {
140
154
  closable: true,
141
155
  key: v.value,
142
- color: color
156
+ color: color,
157
+ onClose: function onClose() {
158
+ return onCloseTag(v.value);
159
+ }
143
160
  }, v.name);
161
+ }) : renderList.map(function (v) {
162
+ return /*#__PURE__*/React.createElement("div", {
163
+ key: v[0],
164
+ style: {
165
+ marginBottom: 12,
166
+ fontSize: 'var(--fs)'
167
+ }
168
+ }, /*#__PURE__*/React.createElement("div", {
169
+ style: {
170
+ paddingBottom: 5,
171
+ fontWeight: 'bold'
172
+ }
173
+ }, v[0]), v[1].map(function (item) {
174
+ return /*#__PURE__*/React.createElement(_Tag, {
175
+ closable: true,
176
+ key: item.value,
177
+ color: color,
178
+ onClose: function onClose() {
179
+ return onCloseTag(item.value);
180
+ }
181
+ }, item.name);
182
+ }));
144
183
  })), /*#__PURE__*/React.createElement(RefModal, {
145
184
  ref: modalRef
146
185
  }));
@@ -98,6 +98,16 @@ var UserSelectModalContent = /*#__PURE__*/forwardRef(function UserSelectModalCon
98
98
  })
99
99
  };
100
100
  }, [state.selectUsers, state.selectIds]);
101
+ var renderList1 = useMemo(function () {
102
+ return userList.filter(function (v) {
103
+ return !state.keyword1 || v.realName.includes(state.keyword1);
104
+ });
105
+ }, [state.keyword1, userList]);
106
+ var renderList2 = useMemo(function () {
107
+ return state.selectUsers.filter(function (v) {
108
+ return !state.keyword2 || v.name.includes(state.keyword2);
109
+ });
110
+ }, [state.keyword2, state.selectUsers]);
101
111
  return /*#__PURE__*/React.createElement("div", {
102
112
  className: "user-select-modal-content"
103
113
  }, /*#__PURE__*/React.createElement(TreeMode, {
@@ -121,7 +131,7 @@ var UserSelectModalContent = /*#__PURE__*/forwardRef(function UserSelectModalCon
121
131
  mode: "Org"
122
132
  }), /*#__PURE__*/React.createElement(List, {
123
133
  onChecked: onUserChecked1,
124
- list: userList,
134
+ list: renderList1,
125
135
  key: userList.length,
126
136
  checkedKeys: list1CheckedKeys,
127
137
  itemKey: "id",
@@ -137,7 +147,7 @@ var UserSelectModalContent = /*#__PURE__*/forwardRef(function UserSelectModalCon
137
147
  },
138
148
  keywords: state.keyword1
139
149
  }), /*#__PURE__*/React.createElement(List, {
140
- list: state.selectUsers,
150
+ list: renderList2,
141
151
  itemKey: "value",
142
152
  itemNameKey: "name",
143
153
  checkedKeys: state.selectIds,
@@ -1,4 +1,4 @@
1
- import { MutipleUserHandleType, NodeUserType, UserSetType } from '../interface';
1
+ import { MutipleUserHandleType, NodeType, NodeUserType, UserSetType } from '../interface';
2
2
  interface IUserSetProps {
3
3
  userType?: UserSetType;
4
4
  nodeUserList?: NodeUserType[];
@@ -7,6 +7,7 @@ interface IUserSetProps {
7
7
  onChange: (data: any) => void;
8
8
  includeUserTypes?: UserSetType[];
9
9
  chargeLevel?: 1 | 2 | 3;
10
+ nodeType?: NodeType;
10
11
  }
11
- declare function UserSet({ userType, nodeUserList, usersHandType, onChange, emptyUsers, includeUserTypes, chargeLevel }: IUserSetProps): JSX.Element;
12
+ declare function UserSet({ userType, nodeType, nodeUserList, usersHandType, onChange, emptyUsers, includeUserTypes, chargeLevel }: IUserSetProps): JSX.Element;
12
13
  export default UserSet;
@@ -38,10 +38,11 @@ function UserSet(_ref) {
38
38
 
39
39
  var _ref$userType = _ref.userType,
40
40
  userType = _ref$userType === void 0 ? 1 : _ref$userType,
41
+ nodeType = _ref.nodeType,
41
42
  _ref$nodeUserList = _ref.nodeUserList,
42
43
  nodeUserList = _ref$nodeUserList === void 0 ? [] : _ref$nodeUserList,
43
44
  _ref$usersHandType = _ref.usersHandType,
44
- usersHandType = _ref$usersHandType === void 0 ? 1 : _ref$usersHandType,
45
+ usersHandType = _ref$usersHandType === void 0 ? 2 : _ref$usersHandType,
45
46
  onChange = _ref.onChange,
46
47
  emptyUsers = _ref.emptyUsers,
47
48
  includeUserTypes = _ref.includeUserTypes,
@@ -114,7 +115,8 @@ function UserSet(_ref) {
114
115
  usersHandType: state.usersHandType,
115
116
  onChange: function onChange(options) {
116
117
  return stateChange(options);
117
- }
118
+ },
119
+ nodeType: nodeType
118
120
  })));
119
121
  }
120
122
  /**
@@ -127,7 +129,8 @@ function UserSelectType1(_ref2) {
127
129
  usersHandType = _ref2.usersHandType,
128
130
  _onChange = _ref2.onChange,
129
131
  type = _ref2.type,
130
- emptyUsers = _ref2.emptyUsers;
132
+ emptyUsers = _ref2.emptyUsers,
133
+ nodeType = _ref2.nodeType;
131
134
  var userList = useMemo(function () {
132
135
  return users.filter(function (v) {
133
136
  return v.key === 'userId';
@@ -140,7 +143,7 @@ function UserSelectType1(_ref2) {
140
143
  onChange: function onChange(users) {
141
144
  return _onChange(_defineProperty({}, type, users));
142
145
  }
143
- }), /*#__PURE__*/React.createElement(UsersHandleType, {
146
+ }), nodeType !== 2 && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(UsersHandleType, {
144
147
  usersHandType: usersHandType,
145
148
  onChange: function onChange(value) {
146
149
  return _onChange({
@@ -154,7 +157,7 @@ function UserSelectType1(_ref2) {
154
157
  emptyUsers: users
155
158
  });
156
159
  }
157
- }));
160
+ })));
158
161
  }
159
162
  /**
160
163
  * @desc 自选人员
@@ -7,7 +7,9 @@ function UsersHandleType(_ref) {
7
7
  var usersHandType = _ref.usersHandType,
8
8
  _onChange = _ref.onChange;
9
9
  var options = useMemo(function () {
10
- return Object.values(UserHandleTypeOptions);
10
+ return Object.values(UserHandleTypeOptions).sort(function (a, b) {
11
+ return b.value - a.value;
12
+ });
11
13
  }, []);
12
14
  return /*#__PURE__*/React.createElement("div", {
13
15
  className: "users-handle-type-content"
@@ -19,9 +19,6 @@ import QueueAnim from 'rc-queue-anim';
19
19
 
20
20
  function AddNode(_ref) {
21
21
  var node = _ref.node;
22
-
23
- var _a;
24
-
25
22
  var boxRef = useRef(null);
26
23
 
27
24
  var _useState = useState(false),
@@ -58,6 +55,21 @@ function AddNode(_ref) {
58
55
  document.body.removeEventListener('click', fn, false);
59
56
  };
60
57
  }, [showPop]);
58
+
59
+ var types = function () {
60
+ var _a;
61
+
62
+ if (node.type === 0 || node.bpmnType === 'sequenceFlow') {
63
+ return [1, 3];
64
+ }
65
+
66
+ if (((_a = node.childNode) === null || _a === void 0 ? void 0 : _a.type) === 9) {
67
+ return [1, 2, 3];
68
+ }
69
+
70
+ return [1, 2, 3, 4];
71
+ }();
72
+
61
73
  return /*#__PURE__*/React.createElement("div", {
62
74
  className: "add-node-btn-box",
63
75
  ref: boxRef
@@ -68,8 +80,7 @@ function AddNode(_ref) {
68
80
  key: "add-popover"
69
81
  }, /*#__PURE__*/React.createElement(AddNodeList, {
70
82
  onOptionClick: onOptionClick,
71
- type: node.type,
72
- childType: (_a = node.childNode) === null || _a === void 0 ? void 0 : _a.type
83
+ types: types
73
84
  })) : /*#__PURE__*/React.createElement(React.Fragment, {
74
85
  key: "cancel-popover"
75
86
  })), /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement("button", {
@@ -1,8 +1,7 @@
1
- import { NodeType } from '../interface';
1
+ import { AddNodeType, NodeType } from '../interface';
2
2
  interface IAddNodeListProps {
3
3
  onOptionClick: (type: NodeType) => void;
4
- type: NodeType;
5
- childType: NodeType;
4
+ types: AddNodeType[];
6
5
  }
7
- declare function AddNodeList({ onOptionClick, type, childType }: IAddNodeListProps): JSX.Element;
6
+ declare function AddNodeList({ onOptionClick, types }: IAddNodeListProps): JSX.Element;
8
7
  export default AddNodeList;
@@ -4,11 +4,11 @@ import { OptionNames, OptionTypes } from './Constants';
4
4
 
5
5
  function AddNodeList(_ref) {
6
6
  var onOptionClick = _ref.onOptionClick,
7
- type = _ref.type,
8
- childType = _ref.childType;
7
+ _ref$types = _ref.types,
8
+ types = _ref$types === void 0 ? [1, 2, 3, 4] : _ref$types;
9
9
  return /*#__PURE__*/React.createElement("div", {
10
10
  className: "add-node-popover-body"
11
- }, /*#__PURE__*/React.createElement(AddNodeOption, {
11
+ }, types.includes(1) && /*#__PURE__*/React.createElement(AddNodeOption, {
12
12
  icon: "icon-yewu",
13
13
  type: "approver",
14
14
  onClick: function onClick() {
@@ -16,7 +16,7 @@ function AddNodeList(_ref) {
16
16
  },
17
17
  color: OptionNames[OptionTypes.APPROVER].color,
18
18
  name: OptionNames[OptionTypes.APPROVER].name
19
- }), type !== 0 && /*#__PURE__*/React.createElement(AddNodeOption, {
19
+ }), types.includes(2) && /*#__PURE__*/React.createElement(AddNodeOption, {
20
20
  icon: "icon-biaoqian",
21
21
  type: "notifier",
22
22
  onClick: function onClick() {
@@ -24,7 +24,7 @@ function AddNodeList(_ref) {
24
24
  },
25
25
  color: OptionNames[OptionTypes.NOTIFIER].color,
26
26
  name: OptionNames[OptionTypes.NOTIFIER].name
27
- }), /*#__PURE__*/React.createElement(AddNodeOption, {
27
+ }), types.includes(3) && /*#__PURE__*/React.createElement(AddNodeOption, {
28
28
  icon: "icon-yewu",
29
29
  type: "handle",
30
30
  onClick: function onClick() {
@@ -32,7 +32,7 @@ function AddNodeList(_ref) {
32
32
  },
33
33
  color: OptionNames[OptionTypes.HANDLE].color,
34
34
  name: OptionNames[OptionTypes.HANDLE].name
35
- }), !(type === 0 || childType === 9) && /*#__PURE__*/React.createElement(AddNodeOption, {
35
+ }), types.includes(4) && /*#__PURE__*/React.createElement(AddNodeOption, {
36
36
  icon: "icon-ListTree",
37
37
  type: "condition",
38
38
  onClick: function onClick() {
@@ -33,7 +33,7 @@ function ApproverNode(_ref) {
33
33
  backgroundColor: '#29CCCC'
34
34
  },
35
35
  onContentClick: function onContentClick() {
36
- return onSelectNode(node);
36
+ return onSelectNode(node, parentNode);
37
37
  },
38
38
  title: TitleEl,
39
39
  node: node
@@ -4,6 +4,7 @@ import AddNode from './Add';
4
4
  import Render from './Render';
5
5
  import { NodeTypes } from './Constants';
6
6
  import WFC from '../OperatorContext';
7
+ import TitleElement from './TitleElement';
7
8
 
8
9
  function CoverLine(_ref) {
9
10
  var _ref$first = _ref.first,
@@ -44,17 +45,13 @@ function BranchNode(_ref2) {
44
45
  onClick: sortLeft
45
46
  }), /*#__PURE__*/React.createElement("div", {
46
47
  className: "title-wrapper"
47
- }, /*#__PURE__*/React.createElement("span", {
48
- className: "editable-title"
49
- }, nodeName), /*#__PURE__*/React.createElement(_IconFont, {
50
- className: "worker-flow-node-del",
51
- type: "icon-MarkNo",
52
- style: {
53
- color: '#333',
54
- right: 5,
55
- top: 5
48
+ }, /*#__PURE__*/React.createElement(TitleElement, {
49
+ placeholder: "\u8BF7\u8F93\u5165\u6761\u4EF6\u540D\u79F0",
50
+ onTitleChange: function onTitleChange(v) {
51
+ return node.nodeName = v;
56
52
  },
57
- onClick: delBranch
53
+ delNode: delBranch,
54
+ nodeName: node.nodeName
58
55
  })), !last && /*#__PURE__*/React.createElement("div", {
59
56
  className: "sort-right",
60
57
  onClick: sortRight
@@ -115,7 +112,7 @@ function ConditionNode(_ref3) {
115
112
  owner: item.owner,
116
113
  first: index === 0,
117
114
  onBranchClick: function onBranchClick() {
118
- return onSelectNode(node, index);
115
+ return onSelectNode(node, parentNode, index);
119
116
  },
120
117
  delBranch: function delBranch() {
121
118
  return branches.length === 2 ? onDeleteNode(parentNode, node) : onDeleteNode(parentNode, node, NodeTypes.BRANCH, index);
@@ -32,7 +32,7 @@ function HandleNode(_ref) {
32
32
  backgroundColor: '#FFB319'
33
33
  },
34
34
  onContentClick: function onContentClick() {
35
- return onSelectNode(node);
35
+ return onSelectNode(node, parentNode);
36
36
  },
37
37
  title: TitleEl,
38
38
  node: node
@@ -32,7 +32,7 @@ function NotifierNode(_ref) {
32
32
  backgroundColor: '#198CFF'
33
33
  },
34
34
  onContentClick: function onContentClick() {
35
- return onSelectNode(node);
35
+ return onSelectNode(node, parentNode);
36
36
  },
37
37
  title: TitleEl,
38
38
  node: node
@@ -48,7 +48,7 @@ function TitleElement(_ref) {
48
48
  onTitleChange && onTitleChange(title);
49
49
  }, [title]);
50
50
 
51
- return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_IconFont, {
51
+ return /*#__PURE__*/React.createElement(React.Fragment, null, icon && /*#__PURE__*/React.createElement(_IconFont, {
52
52
  type: icon,
53
53
  style: {
54
54
  paddingRight: 4
@@ -4,5 +4,5 @@ interface IZoomLayoutProps {
4
4
  hasTools?: boolean;
5
5
  exportBpmnFile?: () => any;
6
6
  }
7
- declare function ZoomLayout({ children, exportBpmnFile }: IZoomLayoutProps): JSX.Element;
7
+ declare function ZoomLayout({ children, exportBpmnFile, hasTools }: IZoomLayoutProps): JSX.Element;
8
8
  export default ZoomLayout;