From dbebdb7d570c277f76d23cf89fb61367ac4c2c62 Mon Sep 17 00:00:00 2001 From: dengbf Date: Thu, 17 Jul 2025 09:55:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]=20#[14658227640401?= =?UTF-8?q?92]=E5=B7=A5=E5=8D=95=E8=AF=A6=E6=83=85=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AF=B9=E6=AF=94=E4=BC=98=E5=8C=96=20http://192.168.0.96:8090?= =?UTF-8?q?/demo/rdm.html#/story-detail/939050947543040/939050947543042/14?= =?UTF-8?q?65822764040192?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/resources/assets/js/util.js | 3 +++ .../pages/process/task/processdetail/detailmixin.js | 13 +++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/resources/assets/js/util.js b/src/resources/assets/js/util.js index e81b3b32..eb4f339e 100644 --- a/src/resources/assets/js/util.js +++ b/src/resources/assets/js/util.js @@ -1243,5 +1243,8 @@ const methods = { } return result; }, + filteredObj (obj, list) { //过滤对象中指定的属性列表 + return _.omit(obj, list) + } }; export default methods; diff --git a/src/views/pages/process/task/processdetail/detailmixin.js b/src/views/pages/process/task/processdetail/detailmixin.js index 18354528..7422a536 100644 --- a/src/views/pages/process/task/processdetail/detailmixin.js +++ b/src/views/pages/process/task/processdetail/detailmixin.js @@ -446,8 +446,17 @@ export default { isDraftData(to, from, next, url) { //路由跳转比较对比 父组件beforeRouterLeave调用 if (this.actionConfig.save && this.$refs.TaskCenterDetail) { - let draftData = this.getData(); - let isSame = this.$utils.isSame(this.draftData, draftData); + const draftData = this.getData(); + const filterAttrList = ['hidecomponentList', 'formExtendAttributeDataList']; + let newData = draftData; + let oldData = this.draftData; + if (newData) { + newData = this.$utils.deepRemoveEmptyValues(this.$utils.filteredObj(draftData, filterAttrList)); + } + if (oldData) { + oldData = this.$utils.deepRemoveEmptyValues(this.$utils.filteredObj(this.draftData, filterAttrList)); + } + let isSame = this.$utils.isSame(newData, oldData); if (isSame || this.draftData == '') { // 没有改变 url ? this.$utils.gotoHref(url) : next(); -- Gitee From 3ff5413a74a59575fbb77fbbbe19029ab93be186 Mon Sep 17 00:00:00 2001 From: dengbf Date: Wed, 30 Jul 2025 15:07:11 +0800 Subject: [PATCH 2/2] commit --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 67073117..b3743f0b 100755 --- a/package.json +++ b/package.json @@ -70,6 +70,7 @@ "particles.vue": "^2.42.2", "qs": "^6.11.2", "save": "^2.4.0", + "v-code-diff": "^1.13.1", "vue": "^2.7.16", "vue-codemirror": "^4.0.6", "vue-cropper": "^0.5.6", @@ -82,8 +83,7 @@ "vue-loader": "^17.4.0", "vue-router": "^3.5.4", "vuedraggable": "^2.23.2", - "vuex": "^3.0.1", - "xlsx": "^0.18.5" + "vuex": "^3.0.1" }, "devDependencies": { "@babel/core": "^7.24.5", -- Gitee