修改OSS资源回显

2024-03-26 18:07:20 +08:00 · 2024-03-26 18:07:20 +08:00 · fb8fa9e787
commit fb8fa9e787
parent 223fa7ca05
36 changed files with 74 additions and 53 deletions
--- a/manager/src/components/editor/upload-image.vue
+++ b/manager/src/components/editor/upload-image.vue
@ -57,7 +57,7 @@
    </Modal>

    <Modal width="1000" v-model="showOssManager" @on-ok="confirmUrls">
-    <OssManage ref="ossManage" :isComponent="true" @selected="handleCallback"  />
+    <OssManage ref="ossManage" :isComponent="true" :initialize="showOssManager" @selected="handleCallback"  />
    </Modal>
  </div>
 </template>
--- a/manager/src/components/hotzone/components/Zone.vue
+++ b/manager/src/components/hotzone/components/Zone.vue
@ -90,6 +90,7 @@
      <ossManage
        @callback="callbackSelected"
        :isComponent="true"
+        :initialize="picModelFlag"
        ref="ossManage"
      />
    </Modal>
--- a/manager/src/components/lili/upload-pic-input.vue
+++ b/manager/src/components/lili/upload-pic-input.vue
@ -47,7 +47,7 @@
    </Modal>

    <Modal width="1200px" v-model="picModalFlag">
-      <ossManage @callback="callbackSelected" ref="ossManage" isComponent="true" />
+      <ossManage @callback="callbackSelected" ref="ossManage" :isComponent="true" :initialize="picModalFlag" />
    </Modal>

  </div>
@ -111,7 +111,6 @@ export default {
    },
    // 图片回显
    callbackSelected(val) {
-      console.log('图片回显', val);
      this.picModalFlag = false;
      this.currentValue = val.url;
      this.picIndex = "";
--- a/manager/src/views/member/list/index.vue
+++ b/manager/src/views/member/list/index.vue
@ -94,7 +94,7 @@
      </Form>
    </Modal>
    <Modal width="1200px" v-model="picModelFlag">
-      <ossManage @callback="callbackSelected" :isComponent="true" ref="ossManage" />
+      <ossManage @callback="callbackSelected" :isComponent="true" :initialize="picModelFlag" ref="ossManage" />
    </Modal>
    <multipleMap ref="map" @callback="selectedRegion"/>
  </div>
--- a/manager/src/views/member/list/memberRecycle.vue
+++ b/manager/src/views/member/list/memberRecycle.vue
@ -140,7 +140,7 @@
      </Form>
    </Modal>
    <Modal width="1200px" v-model="picModelFlag">
-      <ossManage @callback="callbackSelected" :isComponent="true" ref="ossManage" />
+      <ossManage @callback="callbackSelected" :isComponent="true" :initialize="picModelFlag" ref="ossManage" />
    </Modal>
    <multipleMap ref="map" @callback="selectedRegion" />
  </div>
--- a/manager/src/views/page-decoration/modelForm.vue
+++ b/manager/src/views/page-decoration/modelForm.vue
@ -161,6 +161,7 @@
      <ossManage
        @callback="callbackSelected"
        :isComponent="true"
+        :initialize="picModelFlag"
        ref="ossManage"
      />
    </Modal>
--- a/manager/src/views/page-decoration/modelFormItem.vue
+++ b/manager/src/views/page-decoration/modelFormItem.vue
@ -246,6 +246,7 @@
      <ossManage
        @callback="callbackSelected"
        :isComponent="true"
+        :initialize="picModelFlag"
        ref="ossManage"
      />
    </Modal>
--- a/manager/src/views/page-decoration/modelList/carousel.vue
+++ b/manager/src/views/page-decoration/modelList/carousel.vue
@ -121,6 +121,7 @@
      <ossManage
        @callback="callbackSelected"
        :isComponent="true"
+        :initialize="picModelFlag"
        ref="ossManage"
      />
    </Modal>
--- a/manager/src/views/page-decoration/modelList/carousel1.vue
+++ b/manager/src/views/page-decoration/modelList/carousel1.vue
@ -84,7 +84,7 @@
    <liliDialog ref="liliDialog" @selectedLink="selectedLink"></liliDialog>
    <!-- 选择图片 -->
    <Modal width="1200px" v-model="picModelFlag" footer-hide>
-      <ossManage @callback="callbackSelected" :isComponent="true" ref="ossManage" />
+      <ossManage @callback="callbackSelected" :isComponent="true" :initialize="picModelFlag" ref="ossManage" />
    </Modal>
  </div>
 </template>
--- a/manager/src/views/page-decoration/modelList/carousel2.vue
+++ b/manager/src/views/page-decoration/modelList/carousel2.vue
@ -204,7 +204,7 @@
    <liliDialog ref="liliDialog" @selectedLink="selectedLink"></liliDialog>
    <!-- 选择图片 -->
    <Modal width="1200px" v-model="picModelFlag" footer-hide>
-      <ossManage @callback="callbackSelected" :isComponent="true" ref="ossManage" />
+      <ossManage @callback="callbackSelected" :isComponent="true" :initialize="picModelFlag" ref="ossManage" />
    </Modal>
  </div>
 </template>
--- a/manager/src/views/page-decoration/modelList/firstPageAdvert.vue
+++ b/manager/src/views/page-decoration/modelList/firstPageAdvert.vue
@ -85,6 +85,7 @@
      <ossManage
        @callback="callbackSelected"
        :isComponent="true"
+        :initialize="picModelFlag"
        ref="ossManage"
      />
    </Modal>
@ -195,4 +196,4 @@ export default {
    height: 50px;
  }
 }
-</style>
+</style>
--- a/manager/src/views/page-decoration/modelList/forYour.vue
+++ b/manager/src/views/page-decoration/modelList/forYour.vue
@ -168,6 +168,7 @@
      <ossManage
        @callback="callbackSelected"
        :isComponent="true"
+        :initialize="picModelFlag"
        ref="ossManage"
      />
    </Modal>
--- a/manager/src/views/page-decoration/modelList/mixModel.vue
+++ b/manager/src/views/page-decoration/modelList/mixModel.vue
@ -152,6 +152,7 @@
      <ossManage
        @callback="callbackSelected"
        :isComponent="true"
+        :initialize="picModelFlag"
        ref="ossManage"
      />
    </Modal>
--- a/manager/src/views/page-decoration/modelList/newGoodsSort.vue
+++ b/manager/src/views/page-decoration/modelList/newGoodsSort.vue
@ -216,6 +216,7 @@
      <ossManage
        @callback="callbackSelected"
        :isComponent="true"
+        :initialize="picModelFlag"
        ref="ossManage"
      />
    </Modal>
@ -443,4 +444,4 @@ export default {
  align-items: start;
  padding: 0 30px;
 }
-</style>
+</style>
--- a/manager/src/views/page-decoration/modelList/oneRowThreeColumns.vue
+++ b/manager/src/views/page-decoration/modelList/oneRowThreeColumns.vue
@ -54,6 +54,7 @@
      <ossManage
        @callback="callbackSelected"
        :isComponent="true"
+        :initialize="picModelFlag"
        ref="ossManage"
      />
    </Modal>
--- a/manager/src/views/page-decoration/modelList/recommend.vue
+++ b/manager/src/views/page-decoration/modelList/recommend.vue
@ -209,6 +209,7 @@
      <ossManage
        @callback="callbackSelected"
        :isComponent="true"
+        :initialize="picModelFlag"
        ref="ossManage"
      />
    </Modal>
@ -427,4 +428,4 @@ export default {
  align-items: start;
  padding: 0 30px;
 }
-</style>
+</style>
--- a/manager/src/views/page-decoration/wap/advertising.vue
+++ b/manager/src/views/page-decoration/wap/advertising.vue
@ -80,7 +80,7 @@
        <liliDialog ref="liliDialog"    @selectedLink="selectedLink" :types="linkType"></liliDialog>
      </div>
      <Modal width="1200px" v-model="picModelFlag">
-         <ossManage @callback="callbackSelected" :isComponent="true" ref="ossManage" />
+         <ossManage @callback="callbackSelected" :isComponent="true" :initialize="picModelFlag" ref="ossManage" />
      </Modal>
    </div>
  </div>
--- a/manager/src/views/page-decoration/wap/alertAdvertising.vue
+++ b/manager/src/views/page-decoration/wap/alertAdvertising.vue
@ -83,7 +83,7 @@
        ></liliDialog>
      </div>
      <Modal width="1200px" v-model="picModelFlag">
-      <ossManage @callback="callbackSelected" :isComponent="true" ref="ossManage" />
+      <ossManage @callback="callbackSelected" :isComponent="true" :initialize="picModelFlag" ref="ossManage" />
    </Modal>
    </div>
  </div>
--- a/manager/src/views/page-decoration/wap/decorate.vue
+++ b/manager/src/views/page-decoration/wap/decorate.vue
@ -497,7 +497,7 @@
    <hotzone ref="hotzone" @changeZone="changeZone"></hotzone>

    <Modal width="1200px" v-model="picModelFlag">
-      <ossManage @callback="callbackSelected" :isComponent="true" ref="ossManage" />
+      <ossManage @callback="callbackSelected" :isComponent="true" :initialize="picModelFlag" ref="ossManage" />
    </Modal>
  </div>
 </template>
--- a/manager/src/views/seller/shop/shopOperation.vue
+++ b/manager/src/views/seller/shop/shopOperation.vue
@ -374,8 +374,8 @@
    </Card>


-    <Modal width="1200px" v-model="picModalFlag">
-      <ossManage @callback="callbackSelected" :isComponent="true" ref="ossManage" />
+    <Modal width="1200px" v-model="picModelFlag">
+      <ossManage @callback="callbackSelected" :isComponent="true" :initialize="picModelFlag" ref="ossManage" />
    </Modal>

    <Modal width="1200px" v-model="memberModalFlag">
@ -433,7 +433,7 @@ export default {
      loading: false,
      auditModel: false,
      auditModalLoading: false,
-      picModalFlag: false, // 图片选择器
+      picModelFlag: false, // 图片选择器
      address: "", // 地址
      returnAddress: "", // 退货地址
      memberModalFlag: false, // 商家账号
@ -634,13 +634,13 @@ export default {
    // 选择图片modal
    handleCLickImg(val, index) {
      this.$refs.ossManage.selectImage = true;
-      this.picModalFlag = true;
+      this.picModelFlag = true;
      this.selectedFormBtnName = val;
      this.picIndex = index;
    },
    // 图片回显
    callbackSelected(val) {
-      this.picModalFlag = false;
+      this.picModelFlag = false;
      if (this.picIndex === 0 || this.picIndex === 1) {
        this.shopForm[this.selectedFormBtnName][this.picIndex] = val.url;
      } else {
--- a/manager/src/views/sys/oss-manage/ossManage.vue
+++ b/manager/src/views/sys/oss-manage/ossManage.vue
@ -431,7 +431,11 @@ export default {
    choose: {
      type: String,
      default: ""
-    }
+    },
+    initialize: {
+      type: Boolean,
+      default: false,
+    },
  },
  data() {
    return {
@ -858,9 +862,15 @@ export default {
      if (val) this.selectImage = val
    },
    selectedOss(val) {
-      if (val) {
+      if (val && val.length) {
        this.$emit("callback", {url: val[val.length-1].split(',')[1]});
      }
+    },
+    // 初始化监听 是否清空所选图片
+    initialize(val) {
+      if (val && this.isComponent) {
+        this.selectedOss = [];
+      }
    }
  },

--- a/manager/src/views/sys/setting-manage/setting/BASE_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/BASE_SETTING.vue
@ -75,7 +75,7 @@
      </div>
    </Form>
    <Modal width="1200px" v-model="picModelFlag">
-      <ossManage @callback="callbackSelected" :isComponent="true" ref="ossManage" />
+      <ossManage @callback="callbackSelected" :isComponent="true" :initialize="picModelFlag" ref="ossManage" />
    </Modal>

  </div>
--- a/seller/src/views/goods/goods-seller/goodsOperationSec.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
@ -472,11 +472,11 @@
      </div>
    </Modal>

-    <!--<Modal width="1200px" v-model="picModalFlag">-->
+    <!--<Modal width="1200px" v-model="picModelFlag">-->
    <!--<ossManage @callback="callbackSelected" ref="ossManage" />-->
    <!--</Modal>-->
-    <Modal v-model="picModalFlag" width="1200px" @on-ok="confirmUrls">
-      <ossManage ref="ossManage" :isComponent="true" @callback="callbackSelected" @selected="(list)=>{ selectedImage = list}"/>
+    <Modal v-model="picModelFlag" width="1200px" @on-ok="confirmUrls">
+      <ossManage ref="ossManage" :isComponent="true" :initialize="picModelFlag" @callback="callbackSelected" @selected="(list)=>{ selectedImage = list}"/>
    </Modal>

  </div>
@ -688,7 +688,7 @@ export default {
        "specId",
        "specValueId",
      ],
-      picModalFlag: false, // 图片选择器
+      picModelFlag: false, // 图片选择器
      selectedFormBtnName: "", // 点击图片绑定form
      selectedImage: [],
      lastEditSkuValue: '',
@ -706,7 +706,7 @@ export default {
    // 选择图片modal
    handleCLickImg(val, index) {
      this.$refs.ossManage.selectImage = true;
-      this.picModalFlag = true;
+      this.picModelFlag = true;
      this.selectedFormBtnName = val;
      // this.picIndex = index;
    },
@ -744,7 +744,7 @@ export default {
    },
    // 图片选择后回调
    callbackSelected(val) {
-      this.picModalFlag = false;
+      this.picModelFlag = false;
      if (val && this.selectedFormBtnName == 'selectedSkuImages') {
        this.selectedSku.images.push(val);
      } else {
--- a/seller/src/views/lili-components/editor/upload-image.vue
+++ b/seller/src/views/lili-components/editor/upload-image.vue
@ -57,7 +57,7 @@
    </Modal>

    <Modal width="1000" v-model="showOssManager" @on-ok="confirmUrls">
-    <OssManage ref="ossManage" :isComponent="true" @selected="(list)=>{ selectedImage = list}" @callback="handleCallback" />
+    <OssManage ref="ossManage" :isComponent="true" :initialize="showOssManager"  @selected="(list)=>{ selectedImage = list}" @callback="handleCallback" />
    </Modal>
  </div>
 </template>
--- a/seller/src/views/my-components/lili/upload-pic-thumb.vue
+++ b/seller/src/views/my-components/lili/upload-pic-thumb.vue
@ -56,8 +56,8 @@
      </div>
    </Modal>

-    <Modal width="1200px" v-model="picModalFlag" @on-ok="confirmUrls">
-      <ossManage @callback="callbackSelected"  :isComponent="true" @selected="(list)=>{ selectedImage = list}" ref="ossManage" />
+    <Modal width="1200px" v-model="picModelFlag" @on-ok="confirmUrls">
+      <ossManage @callback="callbackSelected" :isComponent="true" :initialize="picModelFlag" @selected="(list)=>{ selectedImage = list}" ref="ossManage" />
    </Modal>
  </div>
 </template>
@ -108,7 +108,7 @@ export default {
      uploadList: [], // 上传文件列表
      viewImage: false, // 是否预览图片
      imgUrl: "", // 图片地址
-      picModalFlag: false, // 图片选择器
+      picModelFlag: false, // 图片选择器
      selectedFormBtnName: "", // 点击图片绑定form
      selectedImage: [],
    };
@ -117,12 +117,12 @@ export default {
    // 选择图片modal
    handleCLickImg(val, index) {
      this.$refs.ossManage.selectImage = true;
-      this.picModalFlag = true;
+      this.picModelFlag = true;
      this.selectedFormBtnName = val;
    },
    // 图片选择后回调
    callbackSelected(val) {
-      this.picModalFlag = false;
+      this.picModelFlag = false;
      if (!this.multiple && this.uploadList && this.uploadList.length > 0) {
        // 删除第一张
        this.uploadList.splice(0, 1);
--- a/seller/src/views/shop/hotzone/components/Zone.vue
+++ b/seller/src/views/shop/hotzone/components/Zone.vue
@ -87,11 +87,7 @@
    <liliDialog ref="liliDialog" @selectedLink="selectedLink"></liliDialog>
    <!-- 选择图片 -->
    <Modal width="1200px" v-model="picModelFlag" footer-hide>
-      <ossManage
-        @callback="callbackSelected"
-        :isComponent="true"
-        ref="ossManage"
-      />
+      <ossManage @callback="callbackSelected" :isComponent="true"  :initialize="picModelFlag" ref="ossManage"/>
    </Modal>
  </li>
 </template>
--- a/seller/src/views/shop/modelForm.vue
+++ b/seller/src/views/shop/modelForm.vue
@ -150,11 +150,7 @@
    <liliDialog ref="liliDialog" @selectedLink="selectedLink"></liliDialog>
    <!-- 选择图片 -->
    <Modal width="1200px" v-model="picModelFlag" footer-hide>
-      <ossManage
-        @callback="callbackSelected"
-        :isComponent="true"
-        ref="ossManage"
-      />
+      <ossManage @callback="callbackSelected" :isComponent="true" :initialize="picModelFlag" ref="ossManage"/>
    </Modal>
  </div>
 </template>
--- a/seller/src/views/shop/modelFormItem.vue
+++ b/seller/src/views/shop/modelFormItem.vue
@ -216,7 +216,7 @@
    ></liliDialog>
    <!-- 选择图片 -->
    <Modal width="1200px" v-model="picModelFlag" footer-hide>
-      <ossManage @callback="callbackSelected" :isComponent="true" ref="ossManage"/>
+      <ossManage @callback="callbackSelected" :isComponent="true" :initialize="picModelFlag" ref="ossManage"/>
    </Modal>
  </div>
 </template>
--- a/seller/src/views/shop/modelList/carousel.vue
+++ b/seller/src/views/shop/modelList/carousel.vue
@ -114,7 +114,7 @@
    ></liliDialog>
    <!-- 选择图片 -->
    <Modal width="1200px" v-model="picModelFlag" footer-hide>
-      <ossManage @callback="callbackSelected" :isComponent="true" ref="ossManage" />
+      <ossManage @callback="callbackSelected" :isComponent="true" :initialize="picModelFlag" ref="ossManage" />
    </Modal>
  </div>
 </template>
--- a/seller/src/views/shop/modelList/carousel1.vue
+++ b/seller/src/views/shop/modelList/carousel1.vue
@ -85,7 +85,7 @@
    ></liliDialog>
    <!-- 选择图片 -->
    <Modal width="1200px" v-model="picModelFlag" footer-hide>
-      <ossManage @callback="callbackSelected" :isComponent="true" ref="ossManage" />
+      <ossManage @callback="callbackSelected" :isComponent="true" :initialize="picModelFlag" ref="ossManage" />
    </Modal>
  </div>
 </template>
--- a/seller/src/views/shop/modelList/carousel2.vue
+++ b/seller/src/views/shop/modelList/carousel2.vue
@ -175,7 +175,7 @@
    ></liliDialog>
    <!-- 选择图片 -->
    <Modal width="1200px" v-model="picModelFlag" footer-hide>
-      <ossManage @callback="callbackSelected" :isComponent="true" ref="ossManage" />
+      <ossManage @callback="callbackSelected" :isComponent="true" :initialize="picModelFlag" ref="ossManage" />
    </Modal>
  </div>
 </template>
--- a/seller/src/views/shop/modelList/firstPageAdvert.vue
+++ b/seller/src/views/shop/modelList/firstPageAdvert.vue
@ -58,7 +58,7 @@
        ></liliDialog>
        <!-- 选择图片 -->
        <Modal width="1200px" v-model="picModelFlag" footer-hide>
-            <ossManage @callback="callbackSelected" :isComponent="true" ref="ossManage" />
+            <ossManage @callback="callbackSelected" :isComponent="true"  :initialize="picModelFlag" ref="ossManage" />
        </Modal>
    </div>
 </template>
--- a/seller/src/views/shop/modelList/newGoodsSort.vue
+++ b/seller/src/views/shop/modelList/newGoodsSort.vue
@ -134,7 +134,7 @@
        ></liliDialog>
        <!-- 选择图片 -->
        <Modal width="1200px" v-model="picModelFlag" footer-hide>
-            <ossManage @callback="callbackSelected" :isComponent="true" ref="ossManage" />
+            <ossManage @callback="callbackSelected" :isComponent="true" :initialize="picModelFlag" ref="ossManage" />
        </Modal>
    </div>
 </template>
--- a/seller/src/views/shop/modelList/recommend.vue
+++ b/seller/src/views/shop/modelList/recommend.vue
@ -200,7 +200,7 @@
    ></liliDialog>
    <!-- 选择图片 -->
    <Modal width="1200px" v-model="picModelFlag" footer-hide>
-      <ossManage @callback="callbackSelected" :isComponent="true" ref="ossManage" />
+      <ossManage @callback="callbackSelected" :isComponent="true" :initialize="picModelFlag" ref="ossManage" />
    </Modal>
  </div>
 </template>
--- a/seller/src/views/shop/ossManages.vue
+++ b/seller/src/views/shop/ossManages.vue
@ -217,7 +217,11 @@
      choose: {
        type: String,
        default: ""
-      }
+      },
+      initialize: {
+        type: Boolean,
+        default: false,
+      },
    },
    data() {
      return {
@ -643,9 +647,15 @@
        if (val) this.selectImage = val
      },
      selectedOss(val) {
-        if (val) {
+        if (val && val.length) {
          this.$emit("callback", {url: val[val.length-1].split(',')[1]});
        }
+      },
+      // 初始化监听 是否清空所选图片
+      initialize(val) {
+        if (val && this.isComponent) {
+          this.selectedOss = [];
+        }
      }
    },

--- a/seller/src/views/shop/wap/decorate.vue
+++ b/seller/src/views/shop/wap/decorate.vue
@ -221,7 +221,7 @@
    ></liliDialog>
    <hotzone ref="hotzone" @changeZone="changeZone"></hotzone>
    <Modal width="1200px" v-model="picModelFlag">
-      <ossManage  @callback="callbackSelected" :isComponent="true" ref="ossManage" />
+      <ossManage  @callback="callbackSelected" :isComponent="true"  :initialize="picModelFlag" ref="ossManage" />
    </Modal>
  </div>
 </template>