Browse Source

将cancle批量更正cancel

gemercheung 1 year ago
parent
commit
cc358f2d30
21 changed files with 25 additions and 26 deletions
  1. 2 2
      packages/qjkankan-editor/src/components/RichTextEditor.vue
  2. 2 2
      packages/qjkankan-editor/src/components/materialSelector.vue
  3. 2 2
      packages/qjkankan-editor/src/components/materialSelectorFromWork.vue
  4. 1 1
      packages/qjkankan-editor/src/components/sceneGroupInEditor.vue
  5. 1 1
      packages/qjkankan-editor/src/views/base/Toolbar.vue
  6. 1 1
      packages/qjkankan-editor/src/views/base/backgroundMusicSettings.vue
  7. 1 1
      packages/qjkankan-editor/src/views/base/coverBase.vue
  8. 1 1
      packages/qjkankan-editor/src/views/base/customLogoSettings.vue
  9. 1 1
      packages/qjkankan-editor/src/views/base/customMaskSettings.vue
  10. 1 1
      packages/qjkankan-editor/src/views/base/openingTipSettings.vue
  11. 1 1
      packages/qjkankan-editor/src/views/explanation/explanationSettings.vue
  12. 1 1
      packages/qjkankan-editor/src/views/hotspot/hotspotIconType/custom_image.vue
  13. 1 1
      packages/qjkankan-editor/src/views/hotspot/hotspotIconType/serial_frame.vue
  14. 1 1
      packages/qjkankan-editor/src/views/hotspot/hotspotType/audio.vue
  15. 1 1
      packages/qjkankan-editor/src/views/hotspot/hotspotType/image.vue
  16. 2 2
      packages/qjkankan-editor/src/views/hotspot/hotspotType/imageText.vue
  17. 1 1
      packages/qjkankan-editor/src/views/hotspot/hotspotType/scene.vue
  18. 1 1
      packages/qjkankan-editor/src/views/hotspot/hotspotType/video.vue
  19. 1 1
      packages/qjkankan-editor/src/views/material/works/index.vue
  20. 2 2
      packages/qjkankan-editor/src/views/navigation/initialSceneSettings.vue
  21. 0 1
      packages/qjkankan-view/src/sdk/QJKanKan/modules/Scene.js

+ 2 - 2
packages/qjkankan-editor/src/components/RichTextEditor.vue

@@ -36,7 +36,7 @@
     <div class="dialog" style="z-index: 2000" v-if="isShowImageSelectionWindow">
       <MaterialSelector
         :title="$i18n.t('gather.select_material')"
-        @cancle="isShowImageSelectionWindow = false"
+        @cancel="isShowImageSelectionWindow = false"
         @submit="onSubmitFromImageMaterialSelector"
         :selectableType="['image']"
         :initialMaterialType="'image'"
@@ -47,7 +47,7 @@
     <div class="dialog" style="z-index: 2000" v-if="isShowVideoSelectionWindow">
       <MaterialSelector
         :title="$i18n.t('gather.select_material')"
-        @cancle="isShowVideoSelectionWindow = false"
+        @cancel="isShowVideoSelectionWindow = false"
         @submit="onSubmitFromVideoMaterialSelector"
         :selectableType="['video']"
         :initialMaterialType="'video'"

+ 2 - 2
packages/qjkankan-editor/src/components/materialSelector.vue

@@ -2,7 +2,7 @@
   <div class="table-select" :class="isDarkTheme ? '' : 'bright'">
     <span class="title">{{ title }}</span>
     <div class="close-btn">
-      <i class="iconfont icon-close" @click="$emit('cancle')"></i>
+      <i class="iconfont icon-close" @click="$emit('cancel')"></i>
     </div>
 
     <div class="material-tab">
@@ -347,7 +347,7 @@
       <button
         class="ui-button"
         :class="isDarkTheme ? 'deepcancel' : 'cancel'"
-        @click="$emit('cancle')"
+        @click="$emit('cancel')"
       >
         {{ $i18n.t("gather.cancel") }}
       </button>

+ 2 - 2
packages/qjkankan-editor/src/components/materialSelectorFromWork.vue

@@ -2,7 +2,7 @@
   <div class="table-select">
     <span class="title">{{ $i18n.t(`gather.select_material`) }}</span>
     <div class="close-btn">
-      <i class="iconfont icon-close" @click="$emit('cancle')"></i>
+      <i class="iconfont icon-close" @click="$emit('cancel')"></i>
     </div>
 
     <div class="material-tab">
@@ -153,7 +153,7 @@
 
     <div class="btns">
       <div>
-        <button class="ui-button deepcancel" @click="$emit('cancle')">
+        <button class="ui-button deepcancel" @click="$emit('cancel')">
           {{ $i18n.t(`gather.cancel`) }}
         </button>
         <button

+ 1 - 1
packages/qjkankan-editor/src/components/sceneGroupInEditor.vue

@@ -179,7 +179,7 @@
     <div class="dialog" style="z-index: 2000" v-if="isShowSelectionWindow">
       <MaterialSelector
         :title="$i18n.t('gather.select_material')"
-        @cancle="isShowSelectionWindow = false"
+        @cancel="isShowSelectionWindow = false"
         @submit="onSubmitFromMaterialSelector"
         :selectableType="['pano', '3D']"
         :initialMaterialType="'pano'"

+ 1 - 1
packages/qjkankan-editor/src/views/base/Toolbar.vue

@@ -114,7 +114,7 @@
       <MaterialSelector
         :selectableType="['image', 'pano', '3D']"
         :title="$i18n.t(`gather.select_material`)"
-        @cancle="isShowSettingCoverWindow = false"
+        @cancel="isShowSettingCoverWindow = false"
         @submit="onCoverSelected"
       />
     </div>

+ 1 - 1
packages/qjkankan-editor/src/views/base/backgroundMusicSettings.vue

@@ -21,7 +21,7 @@
     <div class="dialog" style="z-index: 2000" v-if="isShowSelectionWindow">
       <MaterialSelector
         :title="select_material"
-        @cancle="isShowSelectionWindow = false"
+        @cancel="isShowSelectionWindow = false"
         @submit="handleSubmitFromMaterialSelector"
         :selectableType="['audio']"
         initialMaterialType="audio"

+ 1 - 1
packages/qjkankan-editor/src/views/base/coverBase.vue

@@ -503,7 +503,7 @@ pc端视频位置 videoPcLoc
       <MaterialSelector
         :title="$i18n.t(`gather.select_material`)"
         :isMultiSelection="false"
-        @cancle="isShowSelectionWindow = false"
+        @cancel="isShowSelectionWindow = false"
         @submit="handleSubmitFromMaterialSelector"
         :selectableType="[upType]"
         :initialMaterialType="upType"

+ 1 - 1
packages/qjkankan-editor/src/views/base/customLogoSettings.vue

@@ -34,7 +34,7 @@
     <div class="dialog" style="z-index: 2000" v-if="isShowSelectionWindow">
       <MaterialSelector
         :title="$i18n.t(`gather.select_material`)"
-        @cancle="isShowSelectionWindow = false"
+        @cancel="isShowSelectionWindow = false"
         @submit="handleSubmitFromMaterialSelector"
         :selectableType="['image']"
       />

+ 1 - 1
packages/qjkankan-editor/src/views/base/customMaskSettings.vue

@@ -62,7 +62,7 @@
     <div class="dialog" style="z-index: 2000" v-if="isShowSelectionWindow">
       <MaterialSelector
         :title="$i18n.t(`gather.select_material`)"
-        @cancle="isShowSelectionWindow = false"
+        @cancel="isShowSelectionWindow = false"
         @submit="handleSubmitFromMaterialSelector"
         :selectableType="['image']"
       />

+ 1 - 1
packages/qjkankan-editor/src/views/base/openingTipSettings.vue

@@ -46,7 +46,7 @@
       <MaterialSelector
         :title="$i18n.t(`gather.select_material`)"
         :isMultiSelection="false"
-        @cancle="isShowSelectionWindow = false"
+        @cancel="isShowSelectionWindow = false"
         @submit="handleSubmitFromMaterialSelector"
         :selectableType="['image']"
       />

+ 1 - 1
packages/qjkankan-editor/src/views/explanation/explanationSettings.vue

@@ -46,7 +46,7 @@
       <div class="dialog" style="z-index: 2000" v-if="isShowSelectionWindow">
         <MaterialSelector
           :title="$i18n.t('gather.select_material')"
-          @cancle="isShowSelectionWindow = false"
+          @cancel="isShowSelectionWindow = false"
           @submit="handleSubmitFromMaterialSelector"
           :selectableType="['audio']"
           initialMaterialType="audio"

+ 1 - 1
packages/qjkankan-editor/src/views/hotspot/hotspotIconType/custom_image.vue

@@ -27,7 +27,7 @@
     <div class="dialog" style="z-index: 2000" v-if="isShowSelectionWindow">
       <MaterialSelector
         :title="$i18n.t(`gather.select_material`)"
-        @cancle="isShowSelectionWindow = false"
+        @cancel="isShowSelectionWindow = false"
         @submit="handleSubmitFromMaterialSelector"
         :selectableType="['image']"
       />

+ 1 - 1
packages/qjkankan-editor/src/views/hotspot/hotspotIconType/serial_frame.vue

@@ -75,7 +75,7 @@
     <div class="dialog" style="z-index: 2000" v-if="isShowSelectionWindow">
       <MaterialSelector
         :title="$i18n.t(`gather.select_material`)"
-        @cancle="isShowSelectionWindow = false"
+        @cancel="isShowSelectionWindow = false"
         @submit="handleSubmitFromMaterialSelector"
         :selectableType="['image']"
       />

+ 1 - 1
packages/qjkankan-editor/src/views/hotspot/hotspotType/audio.vue

@@ -20,7 +20,7 @@
     <div class="dialog" style="z-index: 2000" v-if="isShowSelect">
       <MaterialSelector
         :title="$i18n.t('hotspot.select_audio')"
-        @cancle="isShowSelect = false"
+        @cancel="isShowSelect = false"
         @submit="handleSelect"
         :selectableType="['audio']"
         initialMaterialType="audio"

+ 1 - 1
packages/qjkankan-editor/src/views/hotspot/hotspotType/image.vue

@@ -33,7 +33,7 @@
     <div class="dialog" style="z-index: 2000" v-if="isShowSelect">
       <MaterialSelector
         :title="$i18n.t('hotspot.select_image')"
-        @cancle="isShowSelect = false"
+        @cancel="isShowSelect = false"
         @submit="handleSelect"
         :selectableType="['image']"
         :isMultiSelection="true"

+ 2 - 2
packages/qjkankan-editor/src/views/hotspot/hotspotType/imageText.vue

@@ -101,7 +101,7 @@
     <div class="dialog" style="z-index: 2000" v-if="isShowImageSelect">
       <MaterialSelector
         :title="$i18n.t('hotspot.select_image')"
-        @cancle="isShowImageSelect = false"
+        @cancel="isShowImageSelect = false"
         @submit="onImageSelected"
         :selectableType="['image']"
         :isMultiSelection="true"
@@ -111,7 +111,7 @@
     <div class="dialog" style="z-index: 2000" v-if="isShowAudioSelect">
       <MaterialSelector
         :title="$i18n.t('hotspot.select_audio')"
-        @cancle="isShowAudioSelect = false"
+        @cancel="isShowAudioSelect = false"
         @submit="onAudioSelected"
         :selectableType="['audio']"
         initialMaterialType="audio"

+ 1 - 1
packages/qjkankan-editor/src/views/hotspot/hotspotType/scene.vue

@@ -24,7 +24,7 @@
     <div class="dialog" style="z-index: 2000" v-if="showScene">
       <Selector
         :selected="selected"
-        @cancle="showScene = false"
+        @cancel="showScene = false"
         @submit="handleSelect"
       />
     </div>

+ 1 - 1
packages/qjkankan-editor/src/views/hotspot/hotspotType/video.vue

@@ -25,7 +25,7 @@
     <div class="dialog" style="z-index: 2000" v-if="isShowSelect">
       <MaterialSelector
         :title="$i18n.t('hotspot.change_video')"
-        @cancle="isShowSelect = false"
+        @cancel="isShowSelect = false"
         @submit="handleSelect"
         :selectableType="['video']"
         initialMaterialType="video"

+ 1 - 1
packages/qjkankan-editor/src/views/material/works/index.vue

@@ -87,7 +87,7 @@
         :selectableType="['pano', '3D']"
         :isMultiSelection="true"
         initialMaterialType="pano"
-        @cancle="isShowMaterialSelector = false"
+        @cancel="isShowMaterialSelector = false"
         @submit="handleSubmitFromMaterialSelector"
       />
     </div>

+ 2 - 2
packages/qjkankan-editor/src/views/navigation/initialSceneSettings.vue

@@ -22,14 +22,14 @@
 
     <div class="dialog" style="z-index: 2000" v-if="showInitScene">
       <Selector
-        @cancle="showInitScene = false"
+        @cancel="showInitScene = false"
         @submit="handleSelect"
       />
     </div>
 
     <!-- <div class="dialog" style="z-index: 2000" v-if="showInitScene">
       <Select
-        @cancle="showInitScene = false"
+        @cancel="showInitScene = false"
         :selected='info.firstScene'
         :title="'选择素材'"
         @submit="handleSelect"

+ 0 - 1
packages/qjkankan-view/src/sdk/QJKanKan/modules/Scene.js

@@ -74,7 +74,6 @@ export default class Scene extends Emiter {
           this.emit("ready");
         },
         onerror: function (error) {
-          debugger;
           console.error("error", error);
         },
       });