DeXun/double-rack
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 同步至若依最新版

Browse Source
This commit is contained in:
tony
2023-02-10 09:05:38 +08:00
parent 736db6506f 5676cf9ad4
commit e080553f78
13 changed files with 76 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
ruoyi-ui/src/components/Process/components/nodePanel/property/signal.vue
View File

@@ -76,34 +76,57 @@ export default {
},
mounted() {
// this.formData.signal = this.element.businessObject.extensionElements?.values.map(item => {
// let type
// if ('class' in item.$attrs) type = 'class'
// if ('expression' in item.$attrs) type = 'expression'
// if ('delegateExpression' in item.$attrs) type = 'delegateExpression'
// return {
// event: item.$attrs.event,
// type: type,
// className: item.$attrs[type]
// }
// }) ?? []
this.formData.signal = this.element.businessObject.extensionElements?.values
.filter(item => item.$type === 'bpmn:Signal')
.map(item => {
return {
scope: item.scope,
id: item.id,
name: item.name
}
}) ?? []
},
methods: {
updateElement() {
// if (this.formData.signal?.length) {
// let extensionElements = this.element.businessObject.get('extensionElements')
// if (!extensionElements) {
// console.log(this.modeler.get('moddle'),"this.modeler.get('moddle')")
// extensionElements = this.modeler.get('moddle').create('bpmn:Signal')
// }
// extensionElements.values = extensionElements.values?.filter(item => item.$type !== 'bpmn:Signal') ?? []
// console.log(extensionElements,"extensionElements")
// const length = extensionElements.get('values').length
// for (let i = 0; i < length; i++) {
// // 清除旧值
// extensionElements.get('values').pop()
// }
// this.updateProperties({ extensionElements: extensionElements })
// } else {
// const extensionElements = this.element.businessObject[`extensionElements`]
// if (extensionElements) {
// extensionElements.values = extensionElements.values?.filter(item => item.$type !== 'flowable:ExecutionListener')
// }
// }
if (this.formData.signal?.length) {
let extensionElements = this.element.businessObject.get('extensionElements')
if (!extensionElements) {
extensionElements = this.modeler.get('moddle').create('bpmn:signal')
}
const length = extensionElements.get('values').length
for (let i = 0; i < length; i++) {
// 清除旧值
extensionElements.get('values').pop()
extensionElements = this.modeler.get('moddle').create('bpmn:ExtensionElements')
}
// 清除旧值
extensionElements.values = extensionElements.values?.filter(item => item.$type !== 'bpmn:Signal') ?? []
this.formData.signal.forEach(item => {
const signal = this.modeler.get('moddle').create('bpmn:Signal')
signal['scope'] = item.scope
signal['id'] = item.id
signal['name'] = item.name
extensionElements.get('values').push(signal)
})
this.updateProperties({ extensionElements: extensionElements })
} else {
const extensionElements = this.element.businessObject[`extensionElements`]
if (extensionElements) {
extensionElements.values = extensionElements.values?.filter(item => item.$type !== 'flowable:ExecutionListener')
extensionElements.values = extensionElements.values?.filter(item => item.$type !== 'bpmn:Signal') ?? []
}
}
},

3
ruoyi-ui/src/components/Process/flowable/flowable.json
View File

@@ -945,7 +945,8 @@
"bpmn:BoundaryEvent",
"bpmn:CallActivity",
"bpmn:SubProcess",
"bpmn:Process"
"bpmn:Process",
"bpmn:Signal"
]
},
"properties": [

2
ruoyi-ui/src/layout/components/TagsView/index.vue
View File

@@ -87,7 +87,7 @@ export default {
},
isFirstView() {
try {
return this.selectedTag.fullPath === this.visitedViews[1].fullPath || this.selectedTag.fullPath === '/index'
return this.selectedTag.fullPath === '/index' || this.selectedTag.fullPath === this.visitedViews[1].fullPath
} catch (err) {
return false
}

2
ruoyi-ui/src/permission.js
View File

@@ -8,7 +8,7 @@ import { isRelogin } from '@/utils/request'
NProgress.configure({ showSpinner: false })
const whiteList = ['/login', '/auth-redirect', '/bind', '/register']
const whiteList = ['/login', '/register']
router.beforeEach((to, from, next) => {
NProgress.start()

2
ruoyi-ui/src/views/login.vue
View File

@@ -56,7 +56,7 @@
</el-form>
<!-- 底部 -->
<div class="el-login-footer">
<span>Copyright © 2018-2022 ruoyi.vip All Rights Reserved.</span>
<span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>
</div>
</div>
</template>

2
ruoyi-ui/src/views/register.vue
View File

@@ -61,7 +61,7 @@
</el-form>
<!-- 底部 -->
<div class="el-register-footer">
<span>Copyright © 2018-2022 ruoyi.vip All Rights Reserved.</span>
<span>Copyright © 2018-2023 ruoyi.vip All Rights Reserved.</span>
</div>
</div>
</template>