gemercheung hace 2 años
padre
commit
f26f7e3efd

+ 1 - 1
packages/qjkankan-editor/.env.testprod

@@ -7,4 +7,4 @@ VUE_APP_PROXY_URL_ROOT='https://test.4dkankan.com'
 VUE_APP_PROXY_URL='https://test.4dkankan.com/qjkankan/'
 VUE_APP_ORIGIN=
 VUE_APP_URL_FILL=/qjkankan
-VUE_APP_DEBBUG_FLAG=0425-01
+VUE_APP_DEBBUG_FLAG=0424-03

+ 1 - 3
packages/qjkankan-editor/src/components/materialListInMaterialSelector.vue

@@ -708,6 +708,7 @@ export default {
               }
               itemInUploadList.successInfo = response.data;
             }
+            this.refreshMaterialList();
           },
           (err) => {
             if (err.statusText === "abort") {
@@ -730,9 +731,6 @@ export default {
             itemInUploadList.progress = progress;
           }
         );
-
-        // this.uploadStatusList.unshift(itemInUploadList);
-        this.refreshMaterialList();
       });
     },
     onClickRow(e) {

+ 30 - 9
packages/qjkankan-editor/src/components/selectedImageInEditor.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="img-wrapper">
-    <img :src="imgSrc || defaultImgSrc" alt="">
-    <div v-if="imgSrc" class="cancel-btn-background" @click="$emit('cancel')">
+    <img :src="realImage || defaultImgSrc" alt="" />
+    <div v-if="imgSrc" class="cancel-btn-background" @click="handleCancel">
       <i class="iconfont icon-pop-ups_shut-down"></i>
     </div>
   </div>
@@ -9,17 +9,38 @@
 
 <script>
 export default {
+  data() {
+    return {
+      realImage: "",
+    };
+  },
   props: {
     imgSrc: {
       type: String,
-      default: '',
+      default: "",
     },
     defaultImgSrc: {
       type: String,
       require: true,
-    }
-  }
-}
+    },
+  },
+  watch: {
+    imgSrc: {
+      handler(val) {
+        this.realImage = val;
+      },
+      immediate: true,
+      deep: true,
+    },
+  },
+  methods: {
+    handleCancel() {
+      console.log("select_image-component-cancel");
+      this.realImage = "";
+      this.$emit("cancel");
+    },
+  },
+};
 </script>
 
 <style lang="less" scoped>
@@ -29,7 +50,7 @@ export default {
   width: 136px;
   height: 136px;
   margin-right: 16px;
-  background: #1A1B1D;
+  background: #1a1b1d;
   border-radius: 4px;
   border: 1px solid #404040;
   overflow: hidden;
@@ -48,7 +69,7 @@ export default {
     border-radius: 50%;
     cursor: pointer;
     &:hover {
-      color: #FA5555;
+      color: #fa5555;
     }
     > i {
       font-size: 12px;
@@ -59,4 +80,4 @@ export default {
     }
   }
 }
-</style>
+</style>

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

@@ -93,7 +93,7 @@ pc端视频位置 videoPcLoc
         >
         </Option>
       </Select>
-    <!-- {{ info.coverInfo.coverSelect }} -->
+      <!-- {{ info.coverInfo.coverSelect }} -->
       <!-- 关于图片 -->
       <div class="mainImgBox" v-show="info.coverInfo.coverSelect !== 'video'">
         <div class="coverImgTit">{{ coverImgTit }}</div>
@@ -456,7 +456,7 @@ pc端视频位置 videoPcLoc
           <div class="VideoTitL">
             {{ $i18n.t(`edit_settings.coverVideoControlTit`) }}
           </div>
-          <div class="VideoTitR" >
+          <div class="VideoTitR">
             <Switcher
               :value="info.coverInfo.coverVideoControl"
               @change="coverVideoControlChange"
@@ -465,10 +465,16 @@ pc端视频位置 videoPcLoc
         </div>
         <!-- 出现顺序 -->
 
-        <div class="coverImgTit" v-show="info.coverInfo.coverSelect === 'videoAndImg'">
+        <div
+          class="coverImgTit"
+          v-show="info.coverInfo.coverSelect === 'videoAndImg'"
+        >
           {{ $i18n.t(`edit_settings.coverImageOrder`) }}
         </div>
-        <Select v-model="info.coverInfo.coverImageOrder" v-show="info.coverInfo.coverSelect === 'videoAndImg'">
+        <Select
+          v-model="info.coverInfo.coverImageOrder"
+          v-show="info.coverInfo.coverSelect === 'videoAndImg'"
+        >
           <Option
             v-for="item in coverImageOrderList"
             :key="item.type"
@@ -499,7 +505,7 @@ pc端视频位置 videoPcLoc
 import Switcher from "@/components/shared/Switcher";
 import { Select, Option, ColorPicker } from "element-ui";
 import { i18n } from "@/lang";
-import { mapGetters } from "vuex";
+import { mapGetters, mapState } from "vuex";
 import SelectedImage from "@/components/selectedImageInEditor.vue";
 import MaterialSelector from "@/components/materialSelector.vue";
 export default {
@@ -602,6 +608,7 @@ export default {
     ...mapGetters({
       info: "info",
     }),
+    coverPc: () => this.info.coverInfo.coverPc,
   },
   watch: {},
   methods: {
@@ -653,11 +660,14 @@ export default {
     onCancelPcTip() {
       this.$nextTick(() => {
         this.info.coverInfo.coverPc = "";
-        console.log("onCancelPcTip-1");
+        console.log("onCancelPcTip-1",this.info.coverInfo);
       });
     },
     onCancelAppTip() {
-      this.info.coverInfo.coverMo = "";
+      this.$nextTick(() => {
+        this.info.coverInfo.coverMo = "";
+        console.log("onCancelPcTip-2", this.info.coverInfo);
+      });
     },
     onCancelBac() {
       this.info.coverInfo.coverBac = "";

+ 1 - 1
packages/qjkankan-editor/src/views/material/popup/RenameFolder.vue

@@ -90,7 +90,7 @@ export default {
         } else {
           return char;
         }
-      });
+      }).replace(/\s+/g,'');
     },
     onClickConfirm() {
       if (!this.key.trim()) {

+ 5 - 3
packages/qjkankan-editor/src/views/material/popup/cover.vue

@@ -111,7 +111,7 @@ export default {
 
 <style lang="less" scoped>
 .ui-message-confirm {
-  width: 472px;
+  width: 600px;
   height: 421px;
   overflow: visible;
 
@@ -127,9 +127,11 @@ export default {
       > iframe,
       > img {
         margin-bottom: 10px;
-        width: 200px;
-        height: 200px;
+        width: 300px;
+        height: 300px;
         border-radius: 4px;
+        border: none;
+        outline: 0;
       }
       > div {
         display: flex;

+ 1 - 1
packages/qjkankan-editor/src/views/material/popup/rename.vue

@@ -48,7 +48,7 @@ export default {
         } else {
           return char;
         }
-      });
+      }).replace(/\s+/g,'');
     },
     emitname() {
       if (!this.key.trim()) {