Skip to content

Commit 001e327

Browse files
committed
feat: 支持国际化时区 #3924
--153390250 所选时区与容器时间"跨日",导致无法正常选择昨天的时间
1 parent e808b45 commit 001e327

3 files changed

Lines changed: 22 additions & 7 deletions

File tree

src/frontend/src/views/cron-job/list/components/operation/form-item-strategy/end-time.vue

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@
5050
prettyDateTimeFormat,
5151
} from '@utils/assist';
5252
53+
import Model from '@/domain/model/model';
54+
55+
const model = new Model();
56+
5357
export default {
5458
name: '',
5559
props: {
@@ -58,12 +62,27 @@
5862
type: Object,
5963
required: true,
6064
},
65+
timezone: {
66+
type: String,
67+
required: true,
68+
},
6169
},
6270
data() {
6371
return {
6472
isEndTime: false,
6573
};
6674
},
75+
computed: {
76+
dateOptions() {
77+
const disabledDate = (date) => {
78+
const prettyDate = prettyDateTimeFormat(date); // 当前经过格式化的日期 --去除时区
79+
return model.getTimestamp({ date: prettyDate, timezone: this.timezone }) < Date.now() - 86400000;
80+
};
81+
return {
82+
disabledDate,
83+
};
84+
},
85+
},
6786
watch: {
6887
formData: {
6988
handler() {
@@ -74,13 +93,6 @@
7493
immediate: true,
7594
},
7695
},
77-
created() {
78-
this.dateOptions = {
79-
disabledDate(date) {
80-
return date.valueOf() < Date.now() - 86400000;
81-
},
82-
};
83-
},
8496
methods: {
8597
handleChange(value) {
8698
this.isEndTime = value;

src/frontend/src/views/cron-job/list/components/operation/form-item-strategy/index.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<component
3030
:is="com"
3131
:rules="rules"
32+
:timezone="timezone"
3233
v-bind="$attrs"
3334
v-on="$listeners" />
3435
</template>
@@ -51,6 +52,7 @@
5152
required: true,
5253
},
5354
rules: Array,
55+
timezone: String,
5456
},
5557
computed: {
5658
com() {

src/frontend/src/views/cron-job/list/components/operation/index.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
:form-data="formData"
100100
:name="item"
101101
:rules="getItemRule(item)"
102+
:timezone="formData.executeTimeZone"
102103
@on-change="handleFormItemChange" />
103104
<jb-form-item
104105
:label="$t('cron.作业模板')"

0 commit comments

Comments
 (0)