lw-cdp-ui 1.1.35 → 1.1.37

package/dist/components/lwForm/index.vue

@@ -78,9 +78,10 @@
                                :accept="_item.accept"
                                :title="_item.label"
                                :parseData="item.parseData"
-                               :disabled="item.options?.disabled"
+                               :disabled="_item?.disabled"
                                :multiple="_item?.multiple"
                                :limit="_item?.limit"
+                               :returnFile="_item?.returnFile"
                                :tip="_item?.tip"
                                :apiObj="item.apiObj"></lw-upload>
                   </div>
@@ -92,9 +93,10 @@
                                :accept="_item.accept"
                                :title="_item.label"
                                :parseData="item.parseData"
-                               :disabled="item.options?.disabled"
+                               :disabled="_item?.disabled"
                                :multiple="_item?.multiple"
                                :limit="_item?.limit"
+                               :returnFile="_item?.returnFile"
                                :tip="_item?.tip"
                                :apiObj="item.apiObj"></lw-upload>
                   </div>

package/dist/components/lwFormMini/index.vue

@@ -60,9 +60,10 @@
                            :accept="_item.accept"
                            :title="_item.label"
                            :parseData="item.parseData"
-                           :disabled="item.options?.disabled"
+                           :disabled="_item?.disabled"
                            :multiple="_item?.multiple"
                            :limit="_item?.limit"
+                           :returnFile="_item?.returnFile"
                            :tip="_item?.tip"
                            :apiObj="item.apiObj"></lw-upload>
 

package/dist/components/lwUpload/index.vue

@@ -1,14 +1,12 @@
 <template>
   <div class="lw-upload"
        :class="{ 'lw-upload-round': round }">
-
-    <div v-if="fileList.length > 0"
-         class="view-img-list">
+    <div class="view-img-list">
       <template v-for="(f, index) in fileList">
         <div class="lw-upload__img"
              :style="style">
           <el-image class="image"
-                    :src="f"
+                    :src="getShowValue(f)"
                     :preview-src-list="fileList"
                     fit="cover"
                     hide-on-click-modal
@@ -29,6 +27,36 @@
           </div>
         </div>
       </template>
+
+      <el-upload v-if="fileList.length < limit"
+                 class="uploader"
+                 :style="style"
+                 ref="uploader"
+                 :auto-upload="autoUpload"
+                 :disabled="disabled"
+                 :show-file-list="showFileList"
+                 :action="action"
+                 :name="name"
+                 :data="data"
+                 :accept="accept"
+                 :limit="limit"
+                 :http-request="request"
+                 :on-change="change"
+                 :before-upload="before"
+                 :on-success="success"
+                 :on-error="error"
+                 :on-exceed="handleExceed">
+        <slot>
+          <div class="el-upload--picture-card">
+            <div class="file-empty">
+              <el-icon>
+                <component :is="icon" />
+              </el-icon>
+              <h4 v-if="title">{{ title }}</h4>
+            </div>
+          </div>
+        </slot>
+      </el-upload>
     </div>
 
     <div v-if="file && file.status != 'success'"
@@ -43,35 +71,6 @@
                 fit="cover"></el-image>
     </div>
 
-    <el-upload v-if="fileList.length < limit"
-               class="uploader"
-               :style="style"
-               ref="uploader"
-               :auto-upload="autoUpload"
-               :disabled="disabled"
-               :show-file-list="showFileList"
-               :action="action"
-               :name="name"
-               :data="data"
-               :accept="accept"
-               :limit="limit"
-               :http-request="request"
-               :on-change="change"
-               :before-upload="before"
-               :on-success="success"
-               :on-error="error"
-               :on-exceed="handleExceed">
-      <slot>
-        <div class="el-upload--picture-card">
-          <div class="file-empty">
-            <el-icon>
-              <component :is="icon" />
-            </el-icon>
-            <h4 v-if="title">{{ title }}</h4>
-          </div>
-        </div>
-      </slot>
-    </el-upload>
     <div class="el-upload__tip">
       {{tip}}
     </div>
@@ -100,6 +99,7 @@ export default {
  * @property {Boolean} disabled - 是否禁用上传功能，默认为 false
  * @property {Boolean} round - 是否显示圆角按钮，默认为 false
  * @property {Boolean} multiple - 是否多个文件，默认为 false
+ * @property {Array} returnFile - 需要返回的字段，例如为 ['url', 'type', 'name'] 第一个参数为图片地址
  * @property {Function} onSuccess - 上传成功后的回调函数，默认为空函数
  * @property {Function} parseData - 解析上传响应数据的函数，默认为解析状态码、文件名、图片远程地址和描述字段
  */
@@ -123,6 +123,19 @@ export default {
     disabled: { type: Boolean, default: false },
     round: { type: Boolean, default: false },
     onSuccess: { type: Function, default: () => { return true } },
+    returnFile: { // 单传'url' 就返回数组 传对象映射关系就返回数组对象
+      type: [Object, String],
+      default: {
+        url: 'url', // 第一个就是默认图片字段
+        code: 'code',
+        fileName: 'fileName',
+        src: 'src',
+        type: 'type',
+        name: 'name',
+        size: 'size',
+        tempCropperFile: 'tempCropperFile',
+      }
+    },
     parseData: {
       type: Function, default: (res) => {
         return {
@@ -164,7 +177,7 @@ export default {
   methods: {
     newFile(url) {
       if (this.multiple) {
-        this.fileList = url
+        this.fileList = url || []
       } else {
         this.fileList = url ? [url] : []
       }
@@ -241,9 +254,15 @@ export default {
       this.$refs.uploader.handleStart(file)
     },
     success(res, file) {
+      file.type = file.raw.type
       //释放内存删除blob
       URL.revokeObjectURL(file.tempFile)
       delete file.tempFile
+      delete file.percentage
+      delete file.raw
+      delete file.response
+      delete file.status
+      delete file.uid
       var os = this.onSuccess(res, file)
       if (os != undefined && os == false) {
         this.$nextTick(() => {
@@ -252,9 +271,23 @@ export default {
         })
         return false
       }
-      var response = this.parseData(res, file)
+      var response = this.parseData(res)
       file.url = response.src
-      this.fileList.push(file.url)
+
+      // 自定义返回内容
+      let sourceObject = { ...response, ...file }
+      if (typeof this.returnFile == 'object') {
+        let mappedObject = Object.entries(this.returnFile).reduce((acc, [key, value]) => {
+          if (sourceObject[key] !== undefined) {
+            acc[value] = sourceObject[key];
+          }
+          return acc;
+        }, {})
+        this.fileList.push(mappedObject)
+      } else {
+        this.fileList.push(sourceObject[this.returnFile])
+      }
+
       if (this.multiple) {
         this.value = this.fileList
       } else {
@@ -293,6 +326,19 @@ export default {
       }).catch(err => {
         param.onError(err)
       })
+    },
+    // 获取显示字段内容
+    getShowValue(item) {
+      if (this.multiple) {
+        if (typeof this.returnFile == 'object') {
+          console.log(Object.keys(this.returnFile)[0])
+          return item[this.returnFile[Object.keys(this.returnFile)[0]]]
+        } else {
+          return item
+        }
+      } else {
+        return item
+      }
     }
   }
 }