Skip to content

Commit 10c64ef

Browse files
YunaiVgitee-org
YunaiV
authored and
gitee-org
committed
!4 规范代码(eslint)
Merge pull request !4 from 孔思宇/feat-eslintformat
2 parents 4dfff16 + f2f564d commit 10c64ef

File tree

24 files changed

+127
-97
lines changed

24 files changed

+127
-97
lines changed

‎src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ const additionalModules = computed(() => {
331331
332332
// 插入用户自定义扩展模块
333333
if (Object.prototype.toString.call(props.additionalModel) == '[object Array]') {
334-
Modules.push(...props.additionalModel)
334+
Modules.push(...(props.additionalModel as any[]))
335335
} else {
336336
props.additionalModel && Modules.push(props.additionalModel)
337337
}

‎src/components/bpmnProcessDesigner/package/palette/ProcessPalette.vue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,10 @@
88
<script setup lang="ts" name="MyProcessPalette">
99
import { assign } from 'min-dash'
1010
11-
const addTask = (event, options = {}) => {
12-
const ElementFactory = window.bpmnInstances.elementFactory
13-
const create = window.bpmnInstances.modeler.get('create')
11+
const bpmnInstances = () => (window as any).bpmnInstances
12+
const addTask = (event, options: any = {}) => {
13+
const ElementFactory = bpmnInstances().elementFactory
14+
const create = bpmnInstances().modeler.get('create')
1415
1516
console.log(ElementFactory, create)
1617

‎src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ const bpmnElement = ref()
109109
const timer = ref()
110110
provide('prefix', props.prefix)
111111
provide('width', props.width)
112+
const bpmnInstances = () => (window as any)?.bpmnInstances
112113
const initModels = () => {
113114
// console.log(props, 'props')
114115
// console.log(props.bpmnModeler, 'sakdjjaskdsajdkasdjkadsjk')
@@ -121,7 +122,8 @@ const initModels = () => {
121122
}
122123
if (timer.value) {
123124
clearTimeout(timer.value)
124-
window.bpmnInstances = {
125+
const w = window as any
126+
w.bpmnInstances = {
125127
modeler: props.bpmnModeler,
126128
modeling: props.bpmnModeler.get('modeling'),
127129
moddle: props.bpmnModeler.get('moddle'),
@@ -134,7 +136,7 @@ const initModels = () => {
134136
}
135137
}
136138
137-
console.log(window.bpmnInstances, 'window.bpmnInstances')
139+
console.log(bpmnInstances(), 'window.bpmnInstances')
138140
getActiveElement()
139141
// })
140142
}
@@ -161,8 +163,8 @@ const initFormOnChanged = (element) => {
161163
let activatedElement = element
162164
if (!activatedElement) {
163165
activatedElement =
164-
window.bpmnInstances.elementRegistry.find((el) => el.type === 'bpmn:Process') ??
165-
window.bpmnInstances.elementRegistry.find((el) => el.type === 'bpmn:Collaboration')
166+
bpmnInstances().elementRegistry.find((el) => el.type === 'bpmn:Process') ??
167+
bpmnInstances().elementRegistry.find((el) => el.type === 'bpmn:Collaboration')
166168
}
167169
if (!activatedElement) return
168170
console.log(`
@@ -173,7 +175,7 @@ const initFormOnChanged = (element) => {
173175
----------
174176
`)
175177
console.log('businessObject: ', activatedElement.businessObject)
176-
window.bpmnInstances.bpmnElement = activatedElement
178+
bpmnInstances().bpmnElement = activatedElement
177179
bpmnElement.value = activatedElement
178180
elementId.value = activatedElement.id
179181
elementType.value = activatedElement.type.split(':')[1] || ''
@@ -191,7 +193,8 @@ onMounted(() => {
191193
}, 100)
192194
})
193195
onBeforeUnmount(() => {
194-
window.bpmnInstances = null
196+
const w = window as any
197+
w.bpmnInstances = null
195198
console.log(props, 'props1')
196199
console.log(props.bpmnModeler, 'props.bpmnModeler1')
197200
})

‎src/components/bpmnProcessDesigner/package/penal/base/ElementBaseInfo.vue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,12 @@ const rules = reactive({
5959
name: [{ required: true, message: '流程名称不能为空', trigger: 'blur' }]
6060
})
6161
62+
const bpmnInstances = () => (window as any)?.bpmnInstances
6263
const resetBaseInfo = () => {
6364
console.log(window, 'window')
6465
console.log(bpmnElement.value, 'bpmnElement')
6566
66-
bpmnElement.value = window?.bpmnInstances?.bpmnElement
67+
bpmnElement.value = bpmnInstances()?.bpmnElement
6768
console.log(bpmnElement.value, 'resetBaseInfo11111111111')
6869
elementBaseInfo.value = bpmnElement.value.businessObject
6970
needProps.value['type'] = bpmnElement.value.businessObject.$type
@@ -125,13 +126,13 @@ const updateBaseInfo = (key) => {
125126
console.log(window, 'window')
126127
console.log(bpmnElement.value, 'bpmnElement')
127128
console.log(toRaw(bpmnElement.value), 'bpmnElement')
128-
window.bpmnInstances.modeling.updateProperties(toRaw(bpmnElement.value), {
129+
bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
129130
id: elementBaseInfo.value[key],
130131
di: { id: `${elementBaseInfo.value[key]}_di` }
131132
})
132133
} else {
133134
console.log(attrObj, 'attrObj')
134-
window.bpmnInstances.modeling.updateProperties(toRaw(bpmnElement.value), attrObj)
135+
bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), attrObj)
135136
}
136137
}
137138
onMounted(() => {

‎src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,15 @@ const bpmnElement = ref()
7272
const bpmnElementSource = ref()
7373
const bpmnElementSourceRef = ref()
7474
const flowConditionRef = ref()
75+
const bpmnInstances = () => (window as any)?.bpmnInstances
7576
const resetFlowCondition = () => {
76-
bpmnElement.value = window.bpmnInstances.bpmnElement
77+
bpmnElement.value = bpmnInstances().bpmnElement
7778
bpmnElementSource.value = bpmnElement.value.source
7879
bpmnElementSourceRef.value = bpmnElement.value.businessObject.sourceRef
7980
if (
8081
bpmnElementSourceRef.value &&
8182
bpmnElementSourceRef.value.default &&
82-
bpmnElementSourceRef.value.default.id === this.bpmnElement.id
83+
bpmnElementSourceRef.value.default.id === bpmnElement.value.id
8384
) {
8485
// 默认
8586
flowConditionForm.value = { type: 'default' }
@@ -113,18 +114,18 @@ const resetFlowCondition = () => {
113114
const updateFlowType = (flowType) => {
114115
// 正常条件类
115116
if (flowType === 'condition') {
116-
flowConditionRef.value = window.bpmnInstances.moddle.create('bpmn:FormalExpression')
117-
window.bpmnInstances.modeling.updateProperties(toRaw(bpmnElement.value), {
117+
flowConditionRef.value = bpmnInstances().moddle.create('bpmn:FormalExpression')
118+
bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
118119
conditionExpression: flowConditionRef.value
119120
})
120121
return
121122
}
122123
// 默认路径
123124
if (flowType === 'default') {
124-
window.bpmnInstances.modeling.updateProperties(toRaw(bpmnElement.value), {
125+
bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
125126
conditionExpression: null
126127
})
127-
window.bpmnInstances.modeling.updateProperties(toRaw(bpmnElementSource.value), {
128+
bpmnInstances().modeling.updateProperties(toRaw(bpmnElementSource.value), {
128129
default: bpmnElement.value
129130
})
130131
return
@@ -134,34 +135,34 @@ const updateFlowType = (flowType) => {
134135
bpmnElementSourceRef.value.default &&
135136
bpmnElementSourceRef.value.default.id === bpmnElement.value.id
136137
) {
137-
window.bpmnInstances.modeling.updateProperties(toRaw(bpmnElementSource.value), {
138+
bpmnInstances().modeling.updateProperties(toRaw(bpmnElementSource.value), {
138139
default: null
139140
})
140141
}
141-
window.bpmnInstances.modeling.updateProperties(toRaw(bpmnElement.value), {
142+
bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
142143
conditionExpression: null
143144
})
144145
}
145146
const updateFlowCondition = () => {
146147
let { conditionType, scriptType, body, resource, language } = flowConditionForm.value
147148
let condition
148149
if (conditionType === 'expression') {
149-
condition = window.bpmnInstances.moddle.create('bpmn:FormalExpression', { body })
150+
condition = bpmnInstances().moddle.create('bpmn:FormalExpression', { body })
150151
} else {
151152
if (scriptType === 'inlineScript') {
152-
condition = window.bpmnInstances.moddle.create('bpmn:FormalExpression', { body, language })
153+
condition = bpmnInstances().moddle.create('bpmn:FormalExpression', { body, language })
153154
// this.$set(this.flowConditionForm, "resource", "");
154155
flowConditionForm.value['resource'] = ''
155156
} else {
156157
// this.$set(this.flowConditionForm, "body", "");
157158
flowConditionForm.value['body'] = ''
158-
condition = window.bpmnInstances.moddle.create('bpmn:FormalExpression', {
159+
condition = bpmnInstances().moddle.create('bpmn:FormalExpression', {
159160
resource,
160161
language
161162
})
162163
}
163164
}
164-
window.bpmnInstances.modeling.updateProperties(toRaw(bpmnElement.value), {
165+
bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
165166
conditionExpression: condition
166167
})
167168
}

‎src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -239,17 +239,18 @@ const elExtensionElements = ref()
239239
const formData = ref()
240240
const otherExtensions = ref()
241241
242+
const bpmnInstances = () => (window as any)?.bpmnInstances
242243
const resetFormList = () => {
243-
bpmnELement.value = window.bpmnInstances.bpmnElement
244+
bpmnELement.value = bpmnInstances().bpmnElement
244245
formKey.value = bpmnELement.value.businessObject.formKey
245246
// 获取元素扩展属性 或者 创建扩展属性
246247
elExtensionElements.value =
247248
bpmnELement.value.businessObject.get('extensionElements') ||
248-
window.bpmnInstances.moddle.create('bpmn:ExtensionElements', { values: [] })
249+
bpmnInstances().moddle.create('bpmn:ExtensionElements', { values: [] })
249250
// 获取元素表单配置 或者 创建新的表单配置
250251
formData.value =
251252
elExtensionElements.value.values.filter((ex) => ex.$type === `${prefix}:FormData`)?.[0] ||
252-
window.bpmnInstances.moddle.create(`${prefix}:FormData`, { fields: [] })
253+
bpmnInstances().moddle.create(`${prefix}:FormData`, { fields: [] })
253254
254255
// 业务标识 businessKey， 绑定在 formData 中
255256
businessKey.value = formData.value.businessKey
@@ -266,12 +267,12 @@ const resetFormList = () => {
266267
updateElementExtensions()
267268
}
268269
const updateElementFormKey = () => {
269-
window.bpmnInstances.modeling.updateProperties(toRaw(bpmnELement.value), {
270+
bpmnInstances().modeling.updateProperties(toRaw(bpmnELement.value), {
270271
formKey: formKey.value
271272
})
272273
}
273274
const updateElementBusinessKey = () => {
274-
window.bpmnInstances.modeling.updateModdleProperties(toRaw(bpmnELement.value), formData.value, {
275+
bpmnInstances().modeling.updateModdleProperties(toRaw(bpmnELement.value), formData.value, {
275276
businessKey: businessKey.value
276277
})
277278
}
@@ -353,37 +354,37 @@ const saveFieldOption = () => {
353354
// 保存字段配置
354355
const saveField = () => {
355356
const { id, type, label, defaultValue, datePattern } = formFieldForm.value
356-
const Field = window.bpmnInstances.moddle.create(`${prefix}:FormField`, { id, type, label })
357+
const Field = bpmnInstances().moddle.create(`${prefix}:FormField`, { id, type, label })
357358
defaultValue && (Field.defaultValue = defaultValue)
358359
datePattern && (Field.datePattern = datePattern)
359360
// 构建属性
360361
if (fieldPropertiesList.value && fieldPropertiesList.value.length) {
361362
const fieldPropertyList = fieldPropertiesList.value.map((fp) => {
362-
return window.bpmnInstances.moddle.create(`${prefix}:Property`, {
363+
return bpmnInstances().moddle.create(`${prefix}:Property`, {
363364
id: fp.id,
364365
value: fp.value
365366
})
366367
})
367-
Field.properties = window.bpmnInstances.moddle.create(`${this.prefix}:Properties`, {
368+
Field.properties = bpmnInstances().moddle.create(`${prefix}:Properties`, {
368369
values: fieldPropertyList
369370
})
370371
}
371372
// 构建校验规则
372373
if (fieldConstraintsList.value && fieldConstraintsList.value.length) {
373374
const fieldConstraintList = fieldConstraintsList.value.map((fc) => {
374-
return window.bpmnInstances.moddle.create(`${prefix}:Constraint`, {
375+
return bpmnInstances().moddle.create(`${prefix}:Constraint`, {
375376
name: fc.name,
376377
config: fc.config
377378
})
378379
})
379-
Field.validation = window.bpmnInstances.moddle.create(`${prefix}:Validation`, {
380+
Field.validation = bpmnInstances().moddle.create(`${prefix}:Validation`, {
380381
constraints: fieldConstraintList
381382
})
382383
}
383384
// 构建枚举值
384385
if (fieldEnumList.value && fieldEnumList.value.length) {
385386
Field.values = fieldEnumList.value.map((fe) => {
386-
return window.bpmnInstances.moddle.create(`${prefix}:Value`, { name: fe.name, id: fe.id })
387+
return bpmnInstances().moddle.create(`${prefix}:Value`, { name: fe.name, id: fe.id })
387388
})
388389
}
389390
// 更新数组 与 表单配置实例
@@ -421,11 +422,11 @@ const removeField = (field, index) => {
421422
422423
const updateElementExtensions = () => {
423424
// 更新回扩展元素
424-
const newElExtensionElements = window.bpmnInstances.moddle.create(`bpmn:ExtensionElements`, {
425+
const newElExtensionElements = bpmnInstances().moddle.create(`bpmn:ExtensionElements`, {
425426
values: otherExtensions.value.concat(formData.value)
426427
})
427428
// 更新到元素上
428-
window.bpmnInstances.modeling.updateProperties(toRaw(bpmnELement.value), {
429+
bpmnInstances().modeling.updateProperties(toRaw(bpmnELement.value), {
429430
extensionElements: newElExtensionElements
430431
})
431432
}

‎src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,9 +266,10 @@ const otherExtensionList = ref()
266266
const bpmnElementListeners = ref()
267267
const listenerFormRef = ref()
268268
const listenerFieldFormRef = ref()
269+
const bpmnInstances = () => (window as any)?.bpmnInstances
269270
270271
const resetListenersList = () => {
271-
bpmnElement.value = window.bpmnInstances.bpmnElement
272+
bpmnElement.value = bpmnInstances().bpmnElement
272273
otherExtensionList.value = []
273274
bpmnElementListeners.value =
274275
bpmnElement.value.businessObject?.extensionElements?.values?.filter(

‎src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,13 +313,14 @@ const bpmnElementListeners = ref()
313313
const otherExtensionList = ref()
314314
const listenerFormRef = ref()
315315
const listenerFieldFormRef = ref()
316+
const bpmnInstances = () => (window as any)?.bpmnInstances
316317
317318
const resetListenersList = () => {
318319
console.log(
319-
window.bpmnInstances.bpmnElement,
320+
bpmnInstances().bpmnElement,
320321
'window.bpmnInstances.bpmnElementwindow.bpmnInstances.bpmnElementwindow.bpmnInstances.bpmnElementwindow.bpmnInstances.bpmnElementwindow.bpmnInstances.bpmnElementwindow.bpmnInstances.bpmnElement'
321322
)
322-
bpmnElement.value = window.bpmnInstances.bpmnElement
323+
bpmnElement.value = bpmnInstances().bpmnElement
323324
otherExtensionList.value = []
324325
bpmnElementListeners.value =
325326
bpmnElement.value.businessObject?.extensionElements?.values.filter(

0 commit comments

Comments
 (0)