diff --git a/src/resources/components/TsTable/table.less b/src/resources/components/TsTable/table.less index e27970990789da434a94767c8c1ae8e1251433cb..a4eb983814886b20ebb52cbecdd6a43b9c4cef4e 100644 --- a/src/resources/components/TsTable/table.less +++ b/src/resources/components/TsTable/table.less @@ -1,6 +1,6 @@ .tstable-container,.table-container { position: relative; - overflow: hidden; + // overflow: hidden; //导致子元素backdrop-filter失效 line-height: initial; // .tstable-action:empty~.btn-hideaction { // display: none; diff --git a/src/resources/plugins/TsSheet/TsSheet.vue b/src/resources/plugins/TsSheet/TsSheet.vue index 7184b6520dcfc1fa0ccabb7563d49d91facbcd9f..6ea4a079c7e863035b08aae748aafe496b69d25a 100644 --- a/src/resources/plugins/TsSheet/TsSheet.vue +++ b/src/resources/plugins/TsSheet/TsSheet.vue @@ -2003,7 +2003,7 @@ export default { }, formData: { handler: function(newVal, oldVal) { - this.$emit('setValue', newVal); + this.$emit('setValue', this.$utils.deepClone(newVal)); // console.log(JSON.stringify(newVal, null, 2)); }, deep: true diff --git a/src/resources/plugins/TsSheet/form/config/common/reaction-filter.vue b/src/resources/plugins/TsSheet/form/config/common/reaction-filter.vue index a5aba757a358b329ebc4268dc69b125179541996..62e987ad7afb0dda47f3b775ac93fda62c45d596 100644 --- a/src/resources/plugins/TsSheet/form/config/common/reaction-filter.vue +++ b/src/resources/plugins/TsSheet/form/config/common/reaction-filter.vue @@ -13,51 +13,53 @@ {{ $t('term.framework.compval') }} - - - - - {{ $t('term.expression.eq') }} - - - - -
- -
+
{{ $t('page.filtercondition') }}
@@ -142,7 +144,16 @@ export default { }; } }, - watch: {} + watch: { + value: { + handler(val) { + if (!this.$utils.isSame(val, this.filter)) { + this.filter = val || {}; + } + }, + deep: true + } + } };