byzer-org#48 fix text

githubnameting · Dec 23, 2021 · e3f38ea · e3f38ea
1 parent 00e9714
commit e3f38ea
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 15 deletions.
diff --git a/src/components/CloneNoteBook/CloneNoteBook.vue b/src/components/CloneNoteBook/CloneNoteBook.vue
@@ -79,8 +79,10 @@ export default class CloneNoteBookModal extends Vue {
   async onDialogShow (newVal, oldVal) {
     // 关闭弹窗时，重置弹窗信息
     if (!newVal && oldVal) {
-      this.resetModal()
-      this.$refs.$form.clearValidate()
+      setTimeout(() => {
+        this.resetModal()
+        this.$refs.$form.clearValidate()
+      }, 500)
     }
   }
   // 校验参数名称

diff --git a/src/components/CreateFolder/index.vue b/src/components/CreateFolder/index.vue
@@ -22,7 +22,7 @@
         </el-form-item>
         <el-form-item class="dialog-btns">
           <el-button @click="closeModal" size="medium">{{$t('cancel')}}</el-button>
-          <el-button type="primary" :loading="isSubmiting" size="medium" native-type="submit" @click.prevent="handleSubmit">{{$t('clone')}}</el-button>
+          <el-button type="primary" :loading="isSubmiting" size="medium" native-type="submit" @click.prevent="handleSubmit">{{$t('create')}}</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -77,8 +77,10 @@ export default class CreateFolderModal extends Vue {
   async onDialogShow (newVal, oldVal) {
     // 关闭弹窗时，重置弹窗信息
     if (!newVal && oldVal) {
-      this.resetModal()
-      this.$refs.$form.clearValidate()
+      setTimeout(() => {
+        this.resetModal()
+        this.$refs.$form.clearValidate()
+      }, 500)
     }
   }
 

diff --git a/src/components/CreateNoteBook/CreateNoteBook.vue b/src/components/CreateNoteBook/CreateNoteBook.vue
@@ -45,8 +45,6 @@ vuex.registerModule(['modals', 'CreateNoteBookModal'], store)
       isShow: state => state.isShow,
       form: state => state.form,
       callback: state => state.callback
-    }),
-    ...mapState({
     })
   },
   methods: {
@@ -94,8 +92,10 @@ export default class CreateNoteBookModal extends Vue {
   async onDialogShow (newVal, oldVal) {
     // 关闭弹窗时，重置弹窗信息
     if (!newVal && oldVal) {
-      this.resetModal()
-      this.$refs.$form.clearValidate()
+      setTimeout(() => {
+        this.resetModal()
+        this.$refs.$form.clearValidate()
+      }, 500)
     }
   }
 
@@ -123,7 +123,6 @@ export default class CreateNoteBookModal extends Vue {
   }
 
   async handleSubmit () {
-    console.log('submit')
     try {
       await this.$refs.$form.validate()
       let params = {

diff --git a/src/components/MoveNotebook/index.vue b/src/components/MoveNotebook/index.vue
@@ -93,8 +93,10 @@ export default class MoveNotebookModal extends Vue {
   @Watch('isShow')
   async onDialogShow (newVal, oldVal) {
     if (!newVal && oldVal) {
-      this.resetModal()
-      this.$refs.$form.clearValidate()
+      setTimeout(() => {
+        this.resetModal()
+        this.$refs.$form.clearValidate()
+      }, 500)
     }
   }
   @Watch('notebookList', { deep: true })

diff --git a/src/components/RenameNoteBook/RenameNoteBook.vue b/src/components/RenameNoteBook/RenameNoteBook.vue
@@ -22,7 +22,7 @@
         </el-form-item>
         <el-form-item class="dialog-btns">
           <el-button @click="closeModal" size="medium">{{$t('cancel')}}</el-button>
-          <el-button type="primary" :loading="isSubmiting" size="medium" native-type="submit" @click.prevent="handleSubmit">{{$t('clone')}}</el-button>
+          <el-button type="primary" :loading="isSubmiting" size="medium" native-type="submit" @click.prevent="handleSubmit">{{$t('rename')}}</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -79,8 +79,10 @@ export default class RenameNoteBookModal extends Vue {
   async onDialogShow (newVal, oldVal) {
     // 关闭弹窗时，重置弹窗信息
     if (!newVal && oldVal) {
-      this.resetModal()
-      this.$refs.$form.clearValidate()
+      setTimeout(() => {
+        this.resetModal()
+        this.$refs.$form.clearValidate()
+      }, 500)
     }
   }