dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5368 from dataease/dev

Browse Source 
merge dev
This commit is contained in:
fit2cloudrd 2023-05-31 09:04:29 +08:00 committed by GitHub
commit 5385f81737
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/components/widget/deWidget/DeDate.vue
View File

@ -183,6 +183,7 @@ export default {
}
},
beforeDestroy() {
this.timer && clearInterval(this.timer)
bus.$off('onScroll', this.onScroll)
bus.$off('reset-default-value', this.resetDefaultValue)
},

4
frontend/src/utils/conditionUtil.js
View File

@ -17,8 +17,8 @@ export const isChange = (conditions1, conditions2) => {
let arr1 = JSON.parse(JSON.stringify(conditions1))
let arr2 = JSON.parse(JSON.stringify(conditions2))
const strCodeAt = (str) => str[0].charCodeAt()
arr1 = arr1.sort((s1, s2) => strCodeAt(s1.componentId.trim() || s1.filedId) - strCodeAt(s2.componentId.trim() || s2.filedId))
arr2 = arr2.sort((s1, s2) => strCodeAt(s1.componentId.trim() || s1.filedId) - strCodeAt(s2.componentId.trim() || s2.filedId))
arr1 = arr1.sort((s1, s2) => strCodeAt(s1.componentId.trim() || s1.fieldId) - strCodeAt(s2.componentId.trim() || s2.fieldId))
arr2 = arr2.sort((s1, s2) => strCodeAt(s1.componentId.trim() || s1.fieldId) - strCodeAt(s2.componentId.trim() || s2.fieldId))
return JSON.stringify(arr1) !== JSON.stringify(arr2)
}