workflow-editor 0.0.75-up → 0.0.77-up

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 (16) hide show
  1. package/lib/{401-6378618f.js → 401-c757ab10.js} +1 -1
  2. package/lib/{404-01c42d0b.js → 404-edb68927.js} +1 -1
  3. package/lib/{iframe-page-8e106aa3.js → iframe-page-34726114.js} +1 -1
  4. package/lib/{index-ce04ab5e.js → index-9651e575.js} +148 -104
  5. package/lib/{tab-content-iframe-index-e034036f.js → tab-content-iframe-index-2b91c509.js} +1 -1
  6. package/lib/{tab-content-index-e8b02333.js → tab-content-index-68b33ad0.js} +1 -1
  7. package/lib/{tache-subprocess-history-0360baad.js → tache-subprocess-history-5162bfe8.js} +1 -1
  8. package/lib/workflow-editor.css +1 -1
  9. package/lib/workflow-editor.js +1 -1
  10. package/lib/workflow-editor.umd.cjs +4 -4
  11. package/package.json +2 -2
  12. package/packages/workflow-editor/src/properties-editors/common/variables.vue +9 -6
  13. package/packages/workflow-editor/src/properties-editors/human-task/componentsConfigUtil.js +131 -63
  14. package/packages/workflow-editor/src/properties-editors/human-task/editable-child-field-setting.vue +18 -10
  15. package/packages/workflow-editor/src/properties-editors/human-task/selection-conditions.vue +23 -91
  16. package/packages/workflow-editor/src/properties-editors/human-task.vue +1 -1
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "workflow-editor",
3
3
  "private": false,
4
- "version": "0.0.75-up",
4
+ "version": "0.0.77-up",
5
5
  "type": "module",
6
6
  "main": "./lib/workflow-editor.js",
7
7
  "scripts": {
@@ -16,7 +16,7 @@
16
16
  },
17
17
  "devDependencies": {
18
18
  "@vitejs/plugin-vue": "^4.2.3",
19
- "agilebuilder-ui": "1.1.54-sit4",
19
+ "agilebuilder-ui": "1.1.54",
20
20
  "axios": "^1.5.1",
21
21
  "element-plus": "^2.4.1",
22
22
  "font-awesome": "^4.7.0",
package/packages/workflow-editor/src/properties-editors/common/variables.vue CHANGED
@@ -43,19 +43,19 @@
43
43
  export default {
44
44
  name: 'Variables',
45
45
  props: {
46
- model: {
46
+ modelValue: {
47
47
  type: Object,
48
48
  default: null
49
49
  }
50
50
  },
51
51
  data() {
52
52
  let variables = []
53
- if (this.model.variable !== undefined) {
53
+ if (this.modelValue.variable !== undefined) {
54
54
  // xml中有多个variable时是数组，只有一个variable时是Object
55
- if (Array.isArray(this.model.variable)) {
56
- variables = this.model.variable
55
+ if (Array.isArray(this.modelValue.variable)) {
56
+ variables = this.modelValue.variable
57
57
  } else {
58
- variables.push(this.model.variable)
58
+ variables.push(this.modelValue.variable)
59
59
  }
60
60
  }
61
61
  return {
@@ -74,7 +74,10 @@ export default {
74
74
  const filteredVariables = this.variables.filter(variable => {
75
75
  return variable.name !== '' && variable.value !== ''
76
76
  })
77
- this.$emit('input', {
77
+ // this.$emit('input', {
78
+ // variable: filteredVariables
79
+ // })
80
+ this.$emit('update:modelValue',{
78
81
  variable: filteredVariables
79
82
  })
80
83
  }, {
package/packages/workflow-editor/src/properties-editors/human-task/componentsConfigUtil.js CHANGED
@@ -157,7 +157,19 @@ const utiljs = {
157
157
  logicOperator = ''
158
158
  }
159
159
 
160
- stringData = stringData + item.leftBracket + '${field[' + item.propName + ']} ' + item.operator + ' ' + item.propValue + item.rightBracket + ' ' + logicOperator + ' '
160
+ stringData =
161
+ stringData +
162
+ item.leftBracket +
163
+ '${field[' +
164
+ item.propName +
165
+ ']} ' +
166
+ item.operator +
167
+ ' ' +
168
+ item.propValue +
169
+ item.rightBracket +
170
+ ' ' +
171
+ logicOperator +
172
+ ' '
161
173
  }
162
174
  }
163
175
  return stringData
@@ -165,7 +177,7 @@ const utiljs = {
165
177
  formatConditionList(conditionList) {
166
178
  let returnStr = ''
167
179
  if (conditionList) {
168
- if (typeof (conditionList) === 'string') {
180
+ if (typeof conditionList === 'string') {
169
181
  // 先进行转换再解析
170
182
  const dataList = this.xmlToData(conditionList)
171
183
  returnStr = this.formatConditionListTwo(dataList)
@@ -189,7 +201,7 @@ const utiljs = {
189
201
  if (item && item.propName) {
190
202
  const operatorsArr = this.getOperators(this.fieldMap[item.propName])
191
203
  if (operatorsArr && operatorsArr.length > 0) {
192
- const operator = operatorsArr.filter(operItem => {
204
+ const operator = operatorsArr.filter((operItem) => {
193
205
  return operItem.name === item.operator
194
206
  })
195
207
  returnStr += item.leftBracket
@@ -218,73 +230,129 @@ const utiljs = {
218
230
  getOperators(item) {
219
231
  if (item) {
220
232
  if (item.type === 'INTEGER' || item.type === 'LONG' || item.type === 'DOUBLE' || item.type === 'FLOAT') {
221
- return [{
222
- name: 'operator.number.gt',
223
- label: getI18n().t('workflowEditor.process.greaterThan')
224
- }, {
225
- name: 'operator.number.lt',
226
- label: getI18n().t('workflowEditor.process.lessThan')
227
- }, {
228
- name: 'operator.number.eq',
229
- label: getI18n().t('workflowEditor.process.beEqualTo')
230
- }, {
231
- name: 'operator.number.le',
232
- label: getI18n().t('workflowEditor.process.notGreaterThan')
233
- }, {
234
- name: 'operator.number.ge',
235
- label: getI18n().t('workflowEditor.process.notLessThan')
236
- }, {
237
- name: 'operator.number.ne',
238
- label: getI18n().t('workflowEditor.process.notEqualTo')
239
- }]
233
+ return [
234
+ {
235
+ name: 'operator.number.gt',
236
+ label: getI18n().t('workflowEditor.process.greaterThan')
237
+ },
238
+ {
239
+ name: 'operator.number.lt',
240
+ label: getI18n().t('workflowEditor.process.lessThan')
241
+ },
242
+ {
243
+ name: 'operator.number.eq',
244
+ label: getI18n().t('workflowEditor.process.beEqualTo')
245
+ },
246
+ {
247
+ name: 'operator.number.le',
248
+ label: getI18n().t('workflowEditor.process.notGreaterThan')
249
+ },
250
+ {
251
+ name: 'operator.number.ge',
252
+ label: getI18n().t('workflowEditor.process.notLessThan')
253
+ },
254
+ {
255
+ name: 'operator.number.ne',
256
+ label: getI18n().t('workflowEditor.process.notEqualTo')
257
+ },
258
+ {
259
+ name: 'operator.text.is.null',
260
+ label: getI18n().t('workflowEditor.process.isNull')
261
+ },
262
+ {
263
+ name: 'operator.text.not.null',
264
+ label: getI18n().t('workflowEditor.process.isNotNull')
265
+ }
266
+ ]
240
267
  } else if (item.type === 'DATE' || item.type === 'TIME') {
241
- return [{
242
- name: 'operator.date.gt',
243
- label: getI18n().t('workflowEditor.process.laterThan')
244
- }, {
245
- name: 'operator.date.lt',
246
- label: getI18n().t('workflowEditor.process.earlierThan')
247
- }, {
248
- name: 'operator.date.eq',
249
- label: getI18n().t('workflowEditor.process.beEqualTo')
250
- }, {
251
- name: 'operator.date.le',
252
- label: getI18n().t('workflowEditor.process.noLaterThan')
253
- }, {
254
- name: 'operator.date.ge',
255
- label: getI18n().t('workflowEditor.process.noEarlierThan')
256
- }]
268
+ return [
269
+ {
270
+ name: 'operator.date.gt',
271
+ label: getI18n().t('workflowEditor.process.laterThan')
272
+ },
273
+ {
274
+ name: 'operator.date.lt',
275
+ label: getI18n().t('workflowEditor.process.earlierThan')
276
+ },
277
+ {
278
+ name: 'operator.date.eq',
279
+ label: getI18n().t('workflowEditor.process.beEqualTo')
280
+ },
281
+ {
282
+ name: 'operator.date.le',
283
+ label: getI18n().t('workflowEditor.process.noLaterThan')
284
+ },
285
+ {
286
+ name: 'operator.date.ge',
287
+ label: getI18n().t('workflowEditor.process.noEarlierThan')
288
+ },
289
+ {
290
+ name: 'operator.text.is.null',
291
+ label: getI18n().t('workflowEditor.process.isNull')
292
+ },
293
+ {
294
+ name: 'operator.text.not.null',
295
+ label: getI18n().t('workflowEditor.process.isNotNull')
296
+ }
297
+ ]
257
298
  } else if (item.type === 'TEXT') {
258
- return [{
259
- name: 'operator.text.eq',
260
- label: getI18n().t('workflowEditor.process.beEqualTo')
261
- }, {
262
- name: 'operator.text.neq',
263
- label: getI18n().t('workflowEditor.process.notEqualTo')
264
- }, {
265
- name: 'operator.text.contain',
266
- label: getI18n().t('workflowEditor.process.contain')
267
- }, {
268
- name: 'operator.text.contain.not',
269
- label: getI18n().t('workflowEditor.process.notIncluded')
270
- }]
299
+ return [
300
+ {
301
+ name: 'operator.text.eq',
302
+ label: getI18n().t('workflowEditor.process.beEqualTo')
303
+ },
304
+ {
305
+ name: 'operator.text.neq',
306
+ label: getI18n().t('workflowEditor.process.notEqualTo')
307
+ },
308
+ {
309
+ name: 'operator.text.contain',
310
+ label: getI18n().t('workflowEditor.process.contain')
311
+ },
312
+ {
313
+ name: 'operator.text.contain.not',
314
+ label: getI18n().t('workflowEditor.process.notIncluded')
315
+ },
316
+ {
317
+ name: 'operator.text.is.null',
318
+ label: getI18n().t('workflowEditor.process.isNull')
319
+ },
320
+ {
321
+ name: 'operator.text.not.null',
322
+ label: getI18n().t('workflowEditor.process.isNotNull')
323
+ }
324
+ ]
271
325
  } else {
272
- return [{
326
+ return [
327
+ {
328
+ name: 'operator.text.eq',
329
+ label: getI18n().t('workflowEditor.process.beEqualTo')
330
+ },
331
+ {
332
+ name: 'operator.text.neq',
333
+ label: getI18n().t('workflowEditor.process.notEqualTo')
334
+ },
335
+ {
336
+ name: 'operator.text.is.null',
337
+ label: getI18n().t('workflowEditor.process.isNull')
338
+ },
339
+ {
340
+ name: 'operator.text.not.null',
341
+ label: getI18n().t('workflowEditor.process.isNotNull')
342
+ }
343
+ ]
344
+ }
345
+ } else {
346
+ return [
347
+ {
273
348
  name: 'operator.text.eq',
274
349
  label: getI18n().t('workflowEditor.process.beEqualTo')
275
- }, {
350
+ },
351
+ {
276
352
  name: 'operator.text.neq',
277
353
  label: getI18n().t('workflowEditor.process.notEqualTo')
278
- }]
279
- }
280
- } else {
281
- return [{
282
- name: 'operator.text.eq',
283
- label: getI18n().t('workflowEditor.process.beEqualTo')
284
- }, {
285
- name: 'operator.text.neq',
286
- label: getI18n().t('workflowEditor.process.notEqualTo')
287
- }]
354
+ }
355
+ ]
288
356
  }
289
357
  }
290
358
  }
package/packages/workflow-editor/src/properties-editors/human-task/editable-child-field-setting.vue CHANGED
@@ -1,35 +1,43 @@
1
1
  <template>
2
2
  <div>
3
3
  <div>
4
- <el-checkbox-group v-model="actionArr" @change="changeActionArr">
5
- <el-row>
4
+ <el-checkbox-group v-model="actionArr" @change="changeActionArr">
5
+ <el-row>
6
6
  <el-col :span="6">
7
7
  <el-checkbox label="notEmpty">
8
8
  {{ $t('workflowEditor.condition.tableDataNotEmpty') }}
9
- <el-icon v-if="actionArr && actionArr.indexOf('notEmpty') !== -1" @click="showButtonVisible('notEmpty')"><Tools /></el-icon>
9
+ <el-icon v-if="actionArr && actionArr.indexOf('notEmpty') !== -1" @click="showButtonVisible('notEmpty')"
10
+ ><Tools
11
+ /></el-icon>
10
12
  </el-checkbox>
11
13
  </el-col>
12
14
  <el-col :span="6">
13
15
  <el-checkbox label="add">
14
16
  {{ $t('workflowEditor.condition.rowsCanBeAdded') }}
15
- <el-icon v-if="actionArr && actionArr.indexOf('add') !== -1" @click="showButtonVisible('add')"><Tools /></el-icon>
17
+ <el-icon v-if="actionArr && actionArr.indexOf('add') !== -1" @click="showButtonVisible('add')"
18
+ ><Tools
19
+ /></el-icon>
16
20
  </el-checkbox>
17
21
  </el-col>
18
22
  <el-col :span="6">
19
23
  <el-checkbox label="delete">
20
24
  {{ $t('workflowEditor.condition.deleteLine') }}
21
- <el-icon v-if="actionArr && actionArr.indexOf('delete') !== -1" @click="showButtonVisible('delete')"><Tools /></el-icon>
25
+ <el-icon v-if="actionArr && actionArr.indexOf('delete') !== -1" @click="showButtonVisible('delete')"
26
+ ><Tools
27
+ /></el-icon>
22
28
  </el-checkbox>
23
29
  </el-col>
24
30
  <el-col :span="6">
25
31
  <el-checkbox label="update">
26
32
  {{ $t('workflowEditor.condition.modifiableHistoricalData') }}
27
- <el-icon v-if="actionArr && actionArr.indexOf('update') !== -1" @click="showButtonVisible('update')"><Tools /></el-icon>
33
+ <el-icon v-if="actionArr && actionArr.indexOf('update') !== -1" @click="showButtonVisible('update')"
34
+ ><Tools
35
+ /></el-icon>
28
36
  </el-checkbox>
29
37
  </el-col>
30
- </el-row>
31
- </el-checkbox-group>
32
- <!-- <el-col :span="4">
38
+ </el-row>
39
+ </el-checkbox-group>
40
+ <!-- <el-col :span="4">
33
41
  <el-radio v-model="permission" label="fieldControl" @change="combinationParameters()">
34
42
  {{ $t('workflowEditor.condition.controlByField') }}
35
43
  </el-radio>
@@ -50,7 +58,7 @@
50
58
  :condition-list="buttonVisibleCon.condition"
51
59
  :parent-condition="buttonVisibleCon.parentCondition"
52
60
  :user-condition="buttonVisibleCon.userCondition"
53
- :is-add="buttonType && buttonType === 'add'"
61
+ :button-type="buttonType"
54
62
  @close="saveButtonVisible"
55
63
  />
56
64
  </div>
package/packages/workflow-editor/src/properties-editors/human-task/selection-conditions.vue CHANGED
@@ -34,7 +34,7 @@
34
34
  <additional-condition v-model="myParentCondition" />
35
35
  </div>
36
36
  </el-card>
37
- <el-card v-if="isAdd === false" class="box-card" shadow="never">
37
+ <el-card v-if="buttonType !== 'notEmpty' && buttonType !== 'add'" class="box-card" shadow="never">
38
38
  <template #header>
39
39
  <div>
40
40
  <span>{{ $t('workflowEditor.condition.subtableCondition') }}</span>
@@ -60,12 +60,7 @@
60
60
  >
61
61
  <el-table-column prop="leftBracket" label="(" width="90">
62
62
  <template v-slot="scope">
63
- <el-select
64
- v-model="scope.row.leftBracket"
65
- size="small"
66
- clearable
67
- @focus="selectRow(scope.row)"
68
- >
63
+ <el-select v-model="scope.row.leftBracket" size="small" clearable @focus="selectRow(scope.row)">
69
64
  <el-option label="" value="" />
70
65
  <el-option label="(" value="(" />
71
66
  <el-option label="((" value="((" />
@@ -84,23 +79,13 @@
84
79
  @focus="selectRow(scope.row)"
85
80
  @change="changeFieldName(scope.$index)"
86
81
  >
87
- <el-option
88
- v-for="item in attributeArr"
89
- :key="item.value"
90
- :label="item.label"
91
- :value="item.value"
92
- />
82
+ <el-option v-for="item in attributeArr" :key="item.value" :label="item.label" :value="item.value" />
93
83
  </el-select>
94
84
  </template>
95
85
  </el-table-column>
96
86
  <el-table-column :label="$t('workflowEditor.common.operator')" width="110">
97
87
  <template v-slot="scope">
98
- <el-select
99
- v-model="scope.row.operator"
100
- size="small"
101
- clearable
102
- @focus="selectRow(scope.row)"
103
- >
88
+ <el-select v-model="scope.row.operator" size="small" clearable @focus="selectRow(scope.row)">
104
89
  <el-option
105
90
  v-for="option in operationArr[scope.$index]"
106
91
  :key="option.name"
@@ -118,28 +103,13 @@
118
103
  size="small"
119
104
  @focus="selectRow(scope.row)"
120
105
  >
121
- <el-option
122
- :label="$t('workflowEditor.condition.fillInManually')"
123
- value="input"
124
- />
125
- <el-option
126
- :label="$t('workflowEditor.condition.environmentVariable')"
127
- value="context"
128
- />
129
- <el-option
130
- :label="$t('workflowEditor.condition.requestParameters')"
131
- value="request"
132
- />
106
+ <el-option :label="$t('workflowEditor.condition.fillInManually')" value="input" />
107
+ <el-option :label="$t('workflowEditor.condition.environmentVariable')" value="context" />
108
+ <el-option :label="$t('workflowEditor.condition.requestParameters')" value="request" />
133
109
  <el-option :label="$t('workflowEditor.condition.mainTableField')" value="obj" />
134
- <el-option
135
- :label="$t('workflowEditor.condition.databaseFields')"
136
- value="subObj"
137
- />
110
+ <el-option :label="$t('workflowEditor.condition.databaseFields')" value="subObj" />
138
111
  <el-option :label="$t('workflowEditor.condition.taskFields')" value="task" />
139
- <el-option
140
- :label="$t('workflowEditor.condition.systemParameter')"
141
- value="custom"
142
- />
112
+ <el-option :label="$t('workflowEditor.condition.systemParameter')" value="custom" />
143
113
  </el-select>
144
114
  <el-select
145
115
  v-if="scope.row.propValueType === 'context'"
@@ -153,10 +123,7 @@
153
123
  @change="changePropValue(scope.$index)"
154
124
  @focus="selectRow(scope.row)"
155
125
  >
156
- <el-option
157
- :label="$t('workflowEditor.condition.currentTime')"
158
- value="${context.currentTime}"
159
- />
126
+ <el-option :label="$t('workflowEditor.condition.currentTime')" value="${context.currentTime}" />
160
127
  <el-option
161
128
  :label="$t('workflowEditor.condition.currentTransactor')"
162
129
  value="${context.currentTransactor}"
@@ -206,26 +173,11 @@
206
173
  @change="changePropValue(scope.$index)"
207
174
  @focus="selectRow(scope.row)"
208
175
  >
209
- <el-option
210
- :label="$t('workflowEditor.condition.currentHandler')"
211
- value="${task.transactor}"
212
- />
213
- <el-option
214
- :label="$t('workflowEditor.condition.currentTaskClient')"
215
- value="${task.trustor}"
216
- />
217
- <el-option
218
- :label="$t('workflowEditor.condition.currentAssignor')"
219
- value="${task.assigner}"
220
- />
221
- <el-option
222
- :label="$t('workflowEditor.condition.linkName')"
223
- value="${task.name}"
224
- />
225
- <el-option
226
- :label="$t('workflowEditor.condition.linkCode')"
227
- value="${task.nodeId}"
228
- />
176
+ <el-option :label="$t('workflowEditor.condition.currentHandler')" value="${task.transactor}" />
177
+ <el-option :label="$t('workflowEditor.condition.currentTaskClient')" value="${task.trustor}" />
178
+ <el-option :label="$t('workflowEditor.condition.currentAssignor')" value="${task.assigner}" />
179
+ <el-option :label="$t('workflowEditor.condition.linkName')" value="${task.name}" />
180
+ <el-option :label="$t('workflowEditor.condition.linkCode')" value="${task.nodeId}" />
229
181
  </el-select>
230
182
  <el-date-picker
231
183
  v-if="scope.row.dataType === 'DATE' && scope.row.propValueType === 'input'"
@@ -318,12 +270,7 @@
318
270
  </el-select>
319
271
  </template>
320
272
  </el-table-column>
321
- <el-table-column
322
- prop="rightBracket"
323
- label=")"
324
- width="90"
325
- @focus="selectRow(scope.row)"
326
- >
273
+ <el-table-column prop="rightBracket" label=")" width="90" @focus="selectRow(scope.row)">
327
274
  <template v-slot="scope">
328
275
  <el-select v-model="scope.row.rightBracket" size="small" clearable>
329
276
  <el-option label="" value="" />
@@ -333,26 +280,11 @@
333
280
  </el-select>
334
281
  </template>
335
282
  </el-table-column>
336
- <el-table-column
337
- :label="$t('workflowEditorPublicModel.andOr')"
338
- prop="logicOperator"
339
- width="110"
340
- >
283
+ <el-table-column :label="$t('workflowEditorPublicModel.andOr')" prop="logicOperator" width="110">
341
284
  <template v-slot="scope">
342
- <el-select
343
- v-model="scope.row.logicOperator"
344
- size="small"
345
- clearable
346
- @focus="selectRow(scope.row)"
347
- >
348
- <el-option
349
- :label="$t('workflowEditor.process.perhaps')"
350
- value="condition.operator.or"
351
- />
352
- <el-option
353
- :label="$t('workflowEditor.process.also')"
354
- value="condition.operator.and"
355
- />
285
+ <el-select v-model="scope.row.logicOperator" size="small" clearable @focus="selectRow(scope.row)">
286
+ <el-option :label="$t('workflowEditor.process.perhaps')" value="condition.operator.or" />
287
+ <el-option :label="$t('workflowEditor.process.also')" value="condition.operator.and" />
356
288
  </el-select>
357
289
  </template>
358
290
  </el-table-column>
@@ -392,9 +324,9 @@ export default {
392
324
  type: Object,
393
325
  default: null
394
326
  },
395
- isAdd: {
396
- type: Boolean,
397
- default: false
327
+ buttonType: {
328
+ type: Object,
329
+ default: null
398
330
  }
399
331
  },
400
332
  data() {
package/packages/workflow-editor/src/properties-editors/human-task.vue CHANGED
@@ -45,7 +45,7 @@
45
45
  <events v-model="model.ref.events" />
46
46
  </el-tab-pane>
47
47
  <el-tab-pane :label="$t('workflowEditor.task.linkVariable')" name="variables">
48
- <variables :model="model.ref.variables" />
48
+ <variables v-model="model.ref.variables" />
49
49
  </el-tab-pane>
50
50
  </el-tabs>
51
51
  </el-dialog>