@nocobase/plugin-workflow 0.9.2-alpha.2 → 0.9.2-alpha.3
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.
- package/lib/client/AddButton.js +1 -3
- package/lib/client/Branch.d.ts +1 -1
- package/lib/client/ExecutionCanvas.js +1 -1
- package/lib/client/FlowContext.d.ts +1 -1
- package/lib/client/WorkflowProvider.js +0 -1
- package/lib/client/components/CollectionFieldset.d.ts +1 -1
- package/lib/client/components/CollectionFieldset.js +13 -13
- package/lib/client/components/Duration.js +3 -3
- package/lib/client/components/DynamicExpression.d.ts +1 -1
- package/lib/client/components/RadioWithTooltip.js +4 -4
- package/lib/client/components/renderEngineReference.js +3 -2
- package/lib/client/interfaces/expression.d.ts +1 -1
- package/lib/client/locale/en-US.d.ts +70 -70
- package/lib/client/locale/en-US.js +115 -115
- package/lib/client/locale/ja-JP.d.ts +57 -57
- package/lib/client/locale/ja-JP.js +85 -85
- package/lib/client/locale/pt-BR.d.ts +70 -70
- package/lib/client/locale/pt-BR.js +115 -115
- package/lib/client/locale/ru-RU.d.ts +57 -57
- package/lib/client/locale/ru-RU.js +85 -85
- package/lib/client/locale/tr-TR.d.ts +57 -57
- package/lib/client/locale/tr-TR.js +85 -85
- package/lib/client/locale/zh-CN.js +55 -55
- package/lib/client/nodes/calculation.js +6 -6
- package/lib/client/nodes/condition.d.ts +3 -3
- package/lib/client/nodes/condition.js +46 -42
- package/lib/client/nodes/delay.d.ts +1 -1
- package/lib/client/nodes/index.js +35 -37
- package/lib/client/nodes/manual/ModeConfig.js +5 -5
- package/lib/client/nodes/manual/SchemaConfig.js +2 -5
- package/lib/client/nodes/manual/WorkflowTodo.js +3 -3
- package/lib/client/nodes/manual/forms/customForm.js +1 -2
- package/lib/client/nodes/parallel.d.ts +1 -1
- package/lib/client/nodes/parallel.js +6 -6
- package/lib/client/nodes/request.d.ts +2 -0
- package/lib/client/nodes/request.js +7 -5
- package/lib/client/style.js +67 -63
- package/lib/client/triggers/index.d.ts +4 -4
- package/lib/client/triggers/index.js +5 -7
- package/lib/client/triggers/schedule/DateFieldsSelect.d.ts +1 -1
- package/lib/client/triggers/schedule/EndsByField.js +3 -3
- package/lib/client/triggers/schedule/OnField.js +3 -3
- package/lib/client/triggers/schedule/RepeatField.js +16 -16
- package/lib/client/triggers/schedule/ScheduleConfig.js +2 -2
- package/lib/client/utils.js +1 -1
- package/lib/client/variable.js +4 -4
- package/lib/server/Processor.js +1 -1
- package/lib/server/functions/index.d.ts +1 -1
- package/lib/server/functions/index.js +1 -2
- package/lib/server/instructions/calculation.d.ts +1 -1
- package/lib/server/instructions/condition.d.ts +2 -2
- package/lib/server/instructions/create.d.ts +1 -1
- package/lib/server/instructions/destroy.d.ts +1 -1
- package/lib/server/instructions/manual/index.js +1 -2
- package/lib/server/instructions/parallel.d.ts +3 -3
- package/lib/server/instructions/query.d.ts +2 -2
- package/lib/server/instructions/request.js +0 -1
- package/lib/server/instructions/update.d.ts +2 -2
- package/lib/server/migrations/20230221071831-calculation-expression.js +11 -11
- package/lib/server/migrations/20230221121203-condition-calculation.js +6 -6
- package/lib/server/migrations/20230221162902-jsonb-to-json.js +3 -5
- package/lib/server/migrations/20230411034722-manual-multi-form.js +3 -2
- package/lib/server/triggers/collection.d.ts +2 -2
- package/lib/server/triggers/collection.js +2 -2
- package/lib/server/triggers/schedule.js +26 -20
- package/package.json +12 -12
package/lib/client/style.js
CHANGED
|
@@ -12,33 +12,33 @@ function _css() {
|
|
|
12
12
|
return data;
|
|
13
13
|
}
|
|
14
14
|
const workflowPageClass = (0, _css().css)`
|
|
15
|
-
.workflow-toolbar{
|
|
15
|
+
.workflow-toolbar {
|
|
16
16
|
display: flex;
|
|
17
17
|
align-items: center;
|
|
18
18
|
justify-content: space-between;
|
|
19
19
|
padding: 0.5rem 1rem;
|
|
20
20
|
background: #fff;
|
|
21
21
|
|
|
22
|
-
header{
|
|
22
|
+
header {
|
|
23
23
|
display: flex;
|
|
24
24
|
align-items: center;
|
|
25
25
|
min-height: 2rem;
|
|
26
26
|
}
|
|
27
27
|
|
|
28
|
-
aside{
|
|
28
|
+
aside {
|
|
29
29
|
display: flex;
|
|
30
30
|
align-items: center;
|
|
31
|
-
gap: .5em;
|
|
31
|
+
gap: 0.5em;
|
|
32
32
|
}
|
|
33
33
|
|
|
34
|
-
.workflow-versions{
|
|
35
|
-
label{
|
|
36
|
-
margin-right: .5em;
|
|
34
|
+
.workflow-versions {
|
|
35
|
+
label {
|
|
36
|
+
margin-right: 0.5em;
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
40
|
|
|
41
|
-
.workflow-canvas{
|
|
41
|
+
.workflow-canvas {
|
|
42
42
|
width: min-content;
|
|
43
43
|
min-width: 100%;
|
|
44
44
|
display: flex;
|
|
@@ -46,39 +46,39 @@ const workflowPageClass = (0, _css().css)`
|
|
|
46
46
|
align-items: center;
|
|
47
47
|
padding: 2em;
|
|
48
48
|
|
|
49
|
-
.end{
|
|
49
|
+
.end {
|
|
50
50
|
cursor: default;
|
|
51
51
|
|
|
52
|
-
&:hover{
|
|
53
|
-
box-shadow: 0 .25em .5em rgba(0, 0, 0, .1);
|
|
52
|
+
&:hover {
|
|
53
|
+
box-shadow: 0 0.25em 0.5em rgba(0, 0, 0, 0.1);
|
|
54
54
|
}
|
|
55
55
|
}
|
|
56
56
|
}
|
|
57
57
|
`;
|
|
58
58
|
exports.workflowPageClass = workflowPageClass;
|
|
59
59
|
const workflowVersionDropdownClass = (0, _css().css)`
|
|
60
|
-
.ant-dropdown-menu-item{
|
|
61
|
-
.ant-dropdown-menu-title-content{
|
|
60
|
+
.ant-dropdown-menu-item {
|
|
61
|
+
.ant-dropdown-menu-title-content {
|
|
62
62
|
text-align: right;
|
|
63
63
|
|
|
64
|
-
time{
|
|
64
|
+
time {
|
|
65
65
|
margin-left: 0.5rem;
|
|
66
66
|
color: #999;
|
|
67
67
|
font-size: 80%;
|
|
68
68
|
}
|
|
69
69
|
|
|
70
|
-
strong{
|
|
70
|
+
strong {
|
|
71
71
|
font-weight: normal;
|
|
72
72
|
}
|
|
73
73
|
|
|
74
|
-
> .enabled{
|
|
75
|
-
strong{
|
|
74
|
+
> .enabled {
|
|
75
|
+
strong {
|
|
76
76
|
font-weight: bold;
|
|
77
77
|
}
|
|
78
78
|
}
|
|
79
79
|
|
|
80
|
-
> .unexecuted{
|
|
81
|
-
strong{
|
|
80
|
+
> .unexecuted {
|
|
81
|
+
strong {
|
|
82
82
|
font-style: italic;
|
|
83
83
|
}
|
|
84
84
|
}
|
|
@@ -90,12 +90,12 @@ const branchBlockClass = (0, _css().css)`
|
|
|
90
90
|
display: flex;
|
|
91
91
|
position: relative;
|
|
92
92
|
|
|
93
|
-
:before{
|
|
94
|
-
content:
|
|
93
|
+
:before {
|
|
94
|
+
content: '';
|
|
95
95
|
position: absolute;
|
|
96
96
|
top: 0;
|
|
97
97
|
bottom: 0;
|
|
98
|
-
left: calc(50% - .5px);
|
|
98
|
+
left: calc(50% - 0.5px);
|
|
99
99
|
width: 1px;
|
|
100
100
|
background-color: #f0f2f5;
|
|
101
101
|
}
|
|
@@ -108,12 +108,12 @@ const branchClass = (0, _css().css)`
|
|
|
108
108
|
position: relative;
|
|
109
109
|
padding: 0 2em;
|
|
110
110
|
|
|
111
|
-
.workflow-node-list{
|
|
111
|
+
.workflow-node-list {
|
|
112
112
|
flex-grow: 1;
|
|
113
113
|
min-width: 20em;
|
|
114
114
|
}
|
|
115
115
|
|
|
116
|
-
.workflow-branch-lines{
|
|
116
|
+
.workflow-branch-lines {
|
|
117
117
|
position: absolute;
|
|
118
118
|
top: 0;
|
|
119
119
|
bottom: 0;
|
|
@@ -121,37 +121,41 @@ const branchClass = (0, _css().css)`
|
|
|
121
121
|
background-color: #ddd;
|
|
122
122
|
}
|
|
123
123
|
|
|
124
|
-
:before
|
|
125
|
-
|
|
124
|
+
:before,
|
|
125
|
+
:after {
|
|
126
|
+
content: '';
|
|
126
127
|
position: absolute;
|
|
127
128
|
height: 1px;
|
|
128
129
|
background-color: #ddd;
|
|
129
130
|
}
|
|
130
131
|
|
|
131
|
-
:before{
|
|
132
|
+
:before {
|
|
132
133
|
top: 0;
|
|
133
134
|
}
|
|
134
135
|
|
|
135
|
-
:after{
|
|
136
|
+
:after {
|
|
136
137
|
bottom: 0;
|
|
137
138
|
}
|
|
138
139
|
|
|
139
|
-
:not(:first-child):not(:last-child){
|
|
140
|
-
:before
|
|
140
|
+
:not(:first-child):not(:last-child) {
|
|
141
|
+
:before,
|
|
142
|
+
:after {
|
|
141
143
|
left: 0;
|
|
142
144
|
width: 100%;
|
|
143
145
|
}
|
|
144
146
|
}
|
|
145
147
|
|
|
146
|
-
:last-child:not(:first-child){
|
|
147
|
-
:before
|
|
148
|
+
:last-child:not(:first-child) {
|
|
149
|
+
:before,
|
|
150
|
+
:after {
|
|
148
151
|
right: 50%;
|
|
149
152
|
width: 50%;
|
|
150
153
|
}
|
|
151
154
|
}
|
|
152
155
|
|
|
153
|
-
:first-child:not(:last-child){
|
|
154
|
-
:before
|
|
156
|
+
:first-child:not(:last-child) {
|
|
157
|
+
:before,
|
|
158
|
+
:after {
|
|
155
159
|
left: 50%;
|
|
156
160
|
width: 50%;
|
|
157
161
|
}
|
|
@@ -179,28 +183,28 @@ const nodeCardClass = (0, _css().css)`
|
|
|
179
183
|
width: 20em;
|
|
180
184
|
background: #fff;
|
|
181
185
|
padding: 1em;
|
|
182
|
-
box-shadow: 0 .25em .5em rgba(0, 0, 0, .1);
|
|
183
|
-
border-radius: .5em;
|
|
186
|
+
box-shadow: 0 0.25em 0.5em rgba(0, 0, 0, 0.1);
|
|
187
|
+
border-radius: 0.5em;
|
|
184
188
|
cursor: pointer;
|
|
185
|
-
transition: box-shadow .3s ease;
|
|
189
|
+
transition: box-shadow 0.3s ease;
|
|
186
190
|
|
|
187
|
-
&.configuring{
|
|
188
|
-
box-shadow: 0 .25em 1em rgba(0, 100, 200, .25);
|
|
191
|
+
&.configuring {
|
|
192
|
+
box-shadow: 0 0.25em 1em rgba(0, 100, 200, 0.25);
|
|
189
193
|
}
|
|
190
194
|
|
|
191
195
|
.workflow-node-remove-button,
|
|
192
|
-
.workflow-node-job-button{
|
|
196
|
+
.workflow-node-job-button {
|
|
193
197
|
position: absolute;
|
|
194
198
|
}
|
|
195
199
|
|
|
196
|
-
.workflow-node-remove-button{
|
|
197
|
-
right: .5em;
|
|
198
|
-
top: .5em;
|
|
200
|
+
.workflow-node-remove-button {
|
|
201
|
+
right: 0.5em;
|
|
202
|
+
top: 0.5em;
|
|
199
203
|
color: #999;
|
|
200
204
|
opacity: 0;
|
|
201
|
-
transition: opacity .3s ease;
|
|
205
|
+
transition: opacity 0.3s ease;
|
|
202
206
|
|
|
203
|
-
&[disabled]{
|
|
207
|
+
&[disabled] {
|
|
204
208
|
display: none;
|
|
205
209
|
}
|
|
206
210
|
|
|
@@ -209,7 +213,7 @@ const nodeCardClass = (0, _css().css)`
|
|
|
209
213
|
}
|
|
210
214
|
}
|
|
211
215
|
|
|
212
|
-
.workflow-node-job-button{
|
|
216
|
+
.workflow-node-job-button {
|
|
213
217
|
display: flex;
|
|
214
218
|
top: 1em;
|
|
215
219
|
right: 1em;
|
|
@@ -221,38 +225,38 @@ const nodeCardClass = (0, _css().css)`
|
|
|
221
225
|
font-size: 0.8em;
|
|
222
226
|
color: #fff;
|
|
223
227
|
|
|
224
|
-
&[type=
|
|
228
|
+
&[type='button'] {
|
|
225
229
|
border: none;
|
|
226
230
|
}
|
|
227
231
|
}
|
|
228
232
|
|
|
229
|
-
.ant-input{
|
|
233
|
+
.ant-input {
|
|
230
234
|
font-weight: bold;
|
|
231
235
|
|
|
232
|
-
&:not(:focus){
|
|
233
|
-
transition: background-color .3s ease, border-color .3s ease;
|
|
236
|
+
&:not(:focus) {
|
|
237
|
+
transition: background-color 0.3s ease, border-color 0.3s ease;
|
|
234
238
|
border-color: #f7f7f7;
|
|
235
239
|
background-color: #f7f7f7;
|
|
236
240
|
|
|
237
|
-
&:not(:disabled):hover{
|
|
241
|
+
&:not(:disabled):hover {
|
|
238
242
|
border-color: #eee;
|
|
239
243
|
background-color: #eee;
|
|
240
244
|
}
|
|
241
245
|
|
|
242
|
-
&:disabled:hover{
|
|
246
|
+
&:disabled:hover {
|
|
243
247
|
border-color: #f7f7f7;
|
|
244
248
|
}
|
|
245
249
|
}
|
|
246
250
|
}
|
|
247
251
|
|
|
248
|
-
.workflow-node-config-button{
|
|
252
|
+
.workflow-node-config-button {
|
|
249
253
|
padding: 0;
|
|
250
254
|
}
|
|
251
255
|
|
|
252
|
-
&:hover{
|
|
253
|
-
box-shadow: 0 .25em .5em rgba(0, 0, 0, .25);
|
|
256
|
+
&:hover {
|
|
257
|
+
box-shadow: 0 0.25em 0.5em rgba(0, 0, 0, 0.25);
|
|
254
258
|
|
|
255
|
-
.workflow-node-remove-button{
|
|
259
|
+
.workflow-node-remove-button {
|
|
256
260
|
opacity: 1;
|
|
257
261
|
}
|
|
258
262
|
}
|
|
@@ -263,13 +267,13 @@ const nodeHeaderClass = (0, _css().css)`
|
|
|
263
267
|
`;
|
|
264
268
|
exports.nodeHeaderClass = nodeHeaderClass;
|
|
265
269
|
const nodeMetaClass = (0, _css().css)`
|
|
266
|
-
margin-bottom: .5em;
|
|
270
|
+
margin-bottom: 0.5em;
|
|
267
271
|
|
|
268
|
-
.workflow-node-id{
|
|
272
|
+
.workflow-node-id {
|
|
269
273
|
color: #999;
|
|
270
274
|
|
|
271
|
-
&:before{
|
|
272
|
-
content:
|
|
275
|
+
&:before {
|
|
276
|
+
content: '#';
|
|
273
277
|
}
|
|
274
278
|
}
|
|
275
279
|
`;
|
|
@@ -278,7 +282,7 @@ const nodeTitleClass = (0, _css().css)`
|
|
|
278
282
|
display: flex;
|
|
279
283
|
align-items: center;
|
|
280
284
|
font-weight: normal;
|
|
281
|
-
.workflow-node-id{
|
|
285
|
+
.workflow-node-id {
|
|
282
286
|
color: #999;
|
|
283
287
|
}
|
|
284
288
|
`;
|
|
@@ -293,8 +297,8 @@ const addButtonClass = (0, _css().css)`
|
|
|
293
297
|
flex-shrink: 0;
|
|
294
298
|
padding: 2em 0;
|
|
295
299
|
|
|
296
|
-
> .ant-btn{
|
|
297
|
-
&:disabled{
|
|
300
|
+
> .ant-btn {
|
|
301
|
+
&:disabled {
|
|
298
302
|
visibility: hidden;
|
|
299
303
|
}
|
|
300
304
|
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import React from
|
|
2
|
-
import { ISchema } from
|
|
3
|
-
import { Registry } from
|
|
1
|
+
import React from 'react';
|
|
2
|
+
import { ISchema } from '@formily/react';
|
|
3
|
+
import { Registry } from '@nocobase/utils/client';
|
|
4
4
|
import { SchemaInitializerItemOptions } from '@nocobase/client';
|
|
5
|
-
import { VariableOptions } from
|
|
5
|
+
import { VariableOptions } from '../variable';
|
|
6
6
|
export interface Trigger {
|
|
7
7
|
title: string;
|
|
8
8
|
type: string;
|
|
@@ -105,8 +105,6 @@ function useUpdateConfigAction() {
|
|
|
105
105
|
}
|
|
106
106
|
};
|
|
107
107
|
}
|
|
108
|
-
;
|
|
109
|
-
;
|
|
110
108
|
const triggers = new (_client().Registry)();
|
|
111
109
|
exports.triggers = triggers;
|
|
112
110
|
triggers.register(_collection.default.type, _collection.default);
|
|
@@ -292,10 +290,10 @@ const TriggerConfig = () => {
|
|
|
292
290
|
showIcon: true,
|
|
293
291
|
message: `{{t("Trigger in executed workflow cannot be modified", { ns: "${_locale.NAMESPACE}" })}}`,
|
|
294
292
|
className: (0, _css().css)`
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
293
|
+
width: 100%;
|
|
294
|
+
font-size: 85%;
|
|
295
|
+
margin-bottom: 2em;
|
|
296
|
+
`
|
|
299
297
|
}
|
|
300
298
|
}
|
|
301
299
|
} : {}), {}, {
|
|
@@ -304,7 +302,7 @@ const TriggerConfig = () => {
|
|
|
304
302
|
'x-component': 'fieldset',
|
|
305
303
|
'x-component-props': {
|
|
306
304
|
className: (0, _css().css)`
|
|
307
|
-
.ant-select:not(.full-width){
|
|
305
|
+
.ant-select:not(.full-width) {
|
|
308
306
|
width: auto;
|
|
309
307
|
min-width: 6em;
|
|
310
308
|
}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
import React from
|
|
1
|
+
import React from 'react';
|
|
2
2
|
export declare const DateFieldsSelect: React.FC<any>;
|
|
@@ -44,9 +44,9 @@ function EndsByField({
|
|
|
44
44
|
const type = value != null ? typeof value === 'object' && !(value instanceof Date) ? 'field' : 'date' : null;
|
|
45
45
|
return _react().default.createElement("fieldset", {
|
|
46
46
|
className: (0, _css().css)`
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
47
|
+
display: flex;
|
|
48
|
+
gap: 0.5em;
|
|
49
|
+
`
|
|
50
50
|
}, _react().default.createElement(_antd().Select, {
|
|
51
51
|
value: type,
|
|
52
52
|
onChange: t => {
|
|
@@ -61,9 +61,9 @@ function OnField({
|
|
|
61
61
|
setDir = _useState2[1];
|
|
62
62
|
return _react().default.createElement("fieldset", {
|
|
63
63
|
className: (0, _css().css)`
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
64
|
+
display: flex;
|
|
65
|
+
gap: 0.5em;
|
|
66
|
+
`
|
|
67
67
|
}, _react().default.createElement(_DateFieldsSelect.DateFieldsSelect, {
|
|
68
68
|
value: value.field,
|
|
69
69
|
onChange: field => _onChange(_objectSpread(_objectSpread({}, value), {}, {
|
|
@@ -115,28 +115,28 @@ function RepeatField({
|
|
|
115
115
|
const locale = languages[localStorage.getItem('NOCOBASE_LOCALE') || 'en-US'];
|
|
116
116
|
return _react().default.createElement("fieldset", {
|
|
117
117
|
className: (0, _css().css)`
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
118
|
+
display: flex;
|
|
119
|
+
flex-direction: ${typeValue === 'cron' ? 'column' : 'row'};
|
|
120
|
+
align-items: flex-start;
|
|
121
|
+
gap: 0.5em;
|
|
122
122
|
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
123
|
+
.react-js-cron {
|
|
124
|
+
padding: 0.5em 0.5em 0 0.5em;
|
|
125
|
+
border: 1px dashed #ccc;
|
|
126
126
|
|
|
127
|
-
|
|
128
|
-
|
|
127
|
+
.react-js-cron-field {
|
|
128
|
+
margin-bottom: 0.5em;
|
|
129
129
|
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
130
|
+
> span {
|
|
131
|
+
margin: 0 0.5em 0 0;
|
|
132
|
+
}
|
|
133
133
|
|
|
134
|
-
|
|
135
|
-
|
|
134
|
+
> .react-js-cron-select {
|
|
135
|
+
margin: 0 0.5em 0 0;
|
|
136
|
+
}
|
|
136
137
|
}
|
|
137
138
|
}
|
|
138
|
-
|
|
139
|
-
`
|
|
139
|
+
`
|
|
140
140
|
}, _react().default.createElement(_antd().Select, {
|
|
141
141
|
value: typeValue,
|
|
142
142
|
onChange: onTypeChange
|
|
@@ -225,11 +225,11 @@ const ScheduleConfig = () => {
|
|
|
225
225
|
'x-component': 'fieldset',
|
|
226
226
|
'x-component-props': {
|
|
227
227
|
className: (0, _css().css)`
|
|
228
|
-
.ant-input-number{
|
|
228
|
+
.ant-input-number {
|
|
229
229
|
width: 4em;
|
|
230
230
|
}
|
|
231
231
|
|
|
232
|
-
.ant-picker{
|
|
232
|
+
.ant-picker {
|
|
233
233
|
width: auto;
|
|
234
234
|
}
|
|
235
235
|
`
|
package/lib/client/utils.js
CHANGED
package/lib/client/variable.js
CHANGED
|
@@ -107,7 +107,7 @@ function filterTypedFields(fields, types, depth = 1) {
|
|
|
107
107
|
return fields;
|
|
108
108
|
}
|
|
109
109
|
return fields.filter(field => {
|
|
110
|
-
if (isAssociationField(field) && depth && filterTypedFields(
|
|
110
|
+
if (isAssociationField(field) && depth && filterTypedFields(useNormalizedFields(field.target), types, depth - 1).length) {
|
|
111
111
|
return true;
|
|
112
112
|
}
|
|
113
113
|
return types.some(type => matchFieldType(field, type));
|
|
@@ -127,7 +127,7 @@ function useWorkflowVariableOptions(types) {
|
|
|
127
127
|
});
|
|
128
128
|
return options;
|
|
129
129
|
}
|
|
130
|
-
function
|
|
130
|
+
function useNormalizedFields(collectionName) {
|
|
131
131
|
const compile = (0, _client().useCompile)();
|
|
132
132
|
const _useCollectionManager = (0, _client().useCollectionManager)(),
|
|
133
133
|
getCollection = _useCollectionManager.getCollection;
|
|
@@ -151,7 +151,7 @@ function useNormallizedFields(collectionName) {
|
|
|
151
151
|
const foreignKeyField = foreignKeyFields.find(f => f.name === field.foreignKey);
|
|
152
152
|
if (foreignKeyField) {
|
|
153
153
|
var _field$uiSchema, _field$uiSchema2;
|
|
154
|
-
otherFields.splice(i, 0, _objectSpread(_objectSpread({}, foreignKeyField), {}, {
|
|
154
|
+
otherFields.splice(i, 0, _objectSpread(_objectSpread(_objectSpread({}, field), foreignKeyField), {}, {
|
|
155
155
|
uiSchema: _objectSpread(_objectSpread({}, field.uiSchema), {}, {
|
|
156
156
|
title: ((_field$uiSchema = field.uiSchema) === null || _field$uiSchema === void 0 ? void 0 : _field$uiSchema.title) ? `${compile((_field$uiSchema2 = field.uiSchema) === null || _field$uiSchema2 === void 0 ? void 0 : _field$uiSchema2.title)} ID` : foreignKeyField.name
|
|
157
157
|
})
|
|
@@ -189,7 +189,7 @@ function useCollectionFieldOptions(options) {
|
|
|
189
189
|
_options$depth = options.depth,
|
|
190
190
|
depth = _options$depth === void 0 ? 1 : _options$depth;
|
|
191
191
|
const compile = (0, _client().useCompile)();
|
|
192
|
-
const normalizedFields = fields !== null && fields !== void 0 ? fields :
|
|
192
|
+
const normalizedFields = fields !== null && fields !== void 0 ? fields : useNormalizedFields(collection);
|
|
193
193
|
const result = filterTypedFields(normalizedFields, types, depth).filter(field => !isAssociationField(field) || depth).map(field => {
|
|
194
194
|
var _field$uiSchema5;
|
|
195
195
|
const label = compile(((_field$uiSchema5 = field.uiSchema) === null || _field$uiSchema5 === void 0 ? void 0 : _field$uiSchema5.title) || field.name);
|
package/lib/server/Processor.js
CHANGED
|
@@ -333,7 +333,7 @@ class Processor {
|
|
|
333
333
|
_step;
|
|
334
334
|
try {
|
|
335
335
|
for (_iterator.s(); !(_step = _iterator.n()).done;) {
|
|
336
|
-
|
|
336
|
+
const _step$value = _slicedToArray(_step.value, 2),
|
|
337
337
|
name = _step$value[0],
|
|
338
338
|
fn = _step$value[1];
|
|
339
339
|
systemFns[name] = fn.bind(scope);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Registry } from
|
|
2
|
-
import { Instruction } from
|
|
1
|
+
import { Registry } from '@nocobase/utils';
|
|
2
|
+
import { Instruction } from '.';
|
|
3
3
|
export declare const calculators: Registry<Function>;
|
|
4
4
|
declare const _default: Instruction;
|
|
5
5
|
export default _default;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import FlowNodeModel from
|
|
2
|
-
import JobModel from
|
|
3
|
-
import Processor from
|
|
1
|
+
import FlowNodeModel from '../models/FlowNode';
|
|
2
|
+
import JobModel from '../models/Job';
|
|
3
|
+
import Processor from '../Processor';
|
|
4
4
|
export declare const PARALLEL_MODE: {
|
|
5
5
|
readonly ALL: "all";
|
|
6
6
|
readonly ANY: "any";
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import FlowNodeModel from
|
|
2
|
-
import Processor from
|
|
1
|
+
import FlowNodeModel from '../models/FlowNode';
|
|
2
|
+
import Processor from '../Processor';
|
|
3
3
|
declare const _default: {
|
|
4
4
|
run(node: FlowNodeModel, input: any, processor: Processor): Promise<{
|
|
5
5
|
result: any;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import FlowNodeModel from
|
|
2
|
-
import Processor from
|
|
1
|
+
import FlowNodeModel from '../models/FlowNode';
|
|
2
|
+
import Processor from '../Processor';
|
|
3
3
|
declare const _default: {
|
|
4
4
|
run(node: FlowNodeModel, input: any, processor: Processor): Promise<{
|
|
5
5
|
result: any;
|
|
@@ -26,19 +26,19 @@ function addQuote(v) {
|
|
|
26
26
|
return `'${v}'`;
|
|
27
27
|
}
|
|
28
28
|
const calculatorsMap = {
|
|
29
|
-
|
|
29
|
+
equal: '==',
|
|
30
30
|
'===': '==',
|
|
31
|
-
|
|
31
|
+
notEqual: '!=',
|
|
32
32
|
'!==': '!=',
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
33
|
+
gt: '>',
|
|
34
|
+
gte: '>=',
|
|
35
|
+
lt: '<',
|
|
36
|
+
lte: '<=',
|
|
37
|
+
add: '+',
|
|
38
|
+
minus: '-',
|
|
39
|
+
multiple: '*',
|
|
40
|
+
divide: '/',
|
|
41
|
+
mod: '%',
|
|
42
42
|
includes(a, b) {
|
|
43
43
|
return `SEARCH(${b}, ${a}) >= 0`;
|
|
44
44
|
},
|
|
@@ -19,14 +19,14 @@ function _toPrimitive(input, hint) { if (typeof input !== "object" || input ===
|
|
|
19
19
|
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
|
|
20
20
|
function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
|
|
21
21
|
const calculatorsMap = {
|
|
22
|
-
|
|
22
|
+
equal: '==',
|
|
23
23
|
'===': '==',
|
|
24
|
-
|
|
24
|
+
notEqual: '!=',
|
|
25
25
|
'!==': '!=',
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
26
|
+
gt: '>',
|
|
27
|
+
gte: '>=',
|
|
28
|
+
lt: '<',
|
|
29
|
+
lte: '<=',
|
|
30
30
|
includes(a, b) {
|
|
31
31
|
return `SEARCH('${b}', '${a}') >= 0`;
|
|
32
32
|
},
|