@monoui/vuejs 1.1.83 → 1.1.85
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/main.js +2 -2
- package/package.json +1 -1
- package/src/components/Table/Table.vue +7 -3
package/package.json
CHANGED
|
@@ -629,7 +629,8 @@ export default {
|
|
|
629
629
|
column: "CreatedDate",
|
|
630
630
|
title: "All",
|
|
631
631
|
frame: 3,
|
|
632
|
-
options: [3, 6, 9, 12, "Clear"]
|
|
632
|
+
options: [3, 6, 9, 12, "Clear"],
|
|
633
|
+
operator: 0
|
|
633
634
|
}
|
|
634
635
|
};
|
|
635
636
|
},
|
|
@@ -674,6 +675,9 @@ export default {
|
|
|
674
675
|
if (this.timeFrame.title)
|
|
675
676
|
this.finalTimeFrame.title = this.timeFrame.title;
|
|
676
677
|
|
|
678
|
+
if (this.timeFrame.operator)
|
|
679
|
+
this.finalTimeFrame.operator = this.timeFrame.operator;
|
|
680
|
+
|
|
677
681
|
if (this.timeFrame.frame)
|
|
678
682
|
this.finalTimeFrame.frame = this.timeFrame.frame;
|
|
679
683
|
|
|
@@ -720,14 +724,14 @@ export default {
|
|
|
720
724
|
this.$set(this.filters, existingIndex, {
|
|
721
725
|
Column: this.finalTimeFrame.column,
|
|
722
726
|
Value: this.calculateStartDate(opt),
|
|
723
|
-
Operator: 5
|
|
727
|
+
Operator: this.finalTimeFrame.operator || 5
|
|
724
728
|
});
|
|
725
729
|
} else {
|
|
726
730
|
// Add new filter
|
|
727
731
|
this.filters.push({
|
|
728
732
|
Column: this.finalTimeFrame.column,
|
|
729
733
|
Value: this.calculateStartDate(opt),
|
|
730
|
-
Operator: 5
|
|
734
|
+
Operator: this.finalTimeFrame.operator || 5
|
|
731
735
|
});
|
|
732
736
|
}
|
|
733
737
|
}
|