From 8c6e53a6e2b98e51800716b821e262a0b688bd65 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Thu, 17 Jun 2021 17:12:30 +0800
Subject: [PATCH] no message

---
 resources/assets/js/pages/manage/calendar.vue | 15 +++++++++++
 .../js/pages/manage/setting/priority.vue      | 27 ++++++++++++++-----
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/resources/assets/js/pages/manage/calendar.vue b/resources/assets/js/pages/manage/calendar.vue
index 27655fc9..d6475693 100644
--- a/resources/assets/js/pages/manage/calendar.vue
+++ b/resources/assets/js/pages/manage/calendar.vue
@@ -24,6 +24,8 @@
             <Calendar
                 ref="cal"
                 :view="calendarView"
+                :week="calendarWeek"
+                :month="calendarMonth"
                 :theme="calendarTheme"
                 :template="calendarTemplate"
                 :calendars="calendarList"
@@ -70,6 +72,8 @@ export default {
             rangeTime: [],
 
             calendarView: 'month',
+            calendarWeek: {},
+            calendarMonth: {},
             calendarTheme: {},
             calendarTemplate: {},
             calendarList: [],
@@ -117,6 +121,17 @@ export default {
 
     methods: {
         initLanguage() {
+            let daynames = [
+                this.$L('周日'),
+                this.$L('周一'),
+                this.$L('周二'),
+                this.$L('周三'),
+                this.$L('周四'),
+                this.$L('周五'),
+                this.$L('周六')
+            ];
+            this.calendarWeek = {daynames};
+            this.calendarMonth = {daynames};
             this.calendarTheme = {
                 'common.border': '1px solid #f4f5f5',
                 'month.dayname.fontSize': '14px',
diff --git a/resources/assets/js/pages/manage/setting/priority.vue b/resources/assets/js/pages/manage/setting/priority.vue
index 8d2949be..ffcdc99a 100644
--- a/resources/assets/js/pages/manage/setting/priority.vue
+++ b/resources/assets/js/pages/manage/setting/priority.vue
@@ -44,6 +44,8 @@
 </template>
 
 <script>
+import {mapState} from "vuex";
+
 export default {
     data() {
         return {
@@ -64,6 +66,24 @@ export default {
         this.systemSetting();
     },
 
+
+
+    computed: {
+        ...mapState(['taskPriority']),
+    },
+
+    watch: {
+        taskPriority: {
+            handler(data) {
+                this.formDatum = $A.cloneJSON(data);
+                if (this.formDatum.length === 0) {
+                    this.addDatum();
+                }
+            },
+            immediate: true,
+        }
+    },
+
     methods: {
         submitForm() {
             this.$refs.formDatum.validate((valid) => {
@@ -74,7 +94,7 @@ export default {
         },
 
         resetForm() {
-            this.formDatum = $A.cloneJSON(this.formDatum_bak);
+            this.formDatum = $A.cloneJSON(this.taskPriority);
         },
 
         addDatum() {
@@ -102,11 +122,6 @@ export default {
                 }
                 this.loadIng--;
                 this.$store.state.taskPriority = $A.cloneJSON(data);
-                this.formDatum = data;
-                if (this.formDatum.length === 0) {
-                    this.addDatum();
-                }
-                this.formDatum_bak = $A.cloneJSON(this.formDatum);
             }).catch(({msg}) => {
                 if (save) {
                     $A.modalError(msg);