swordpass-ui 1.1.10 → 1.1.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swordpass-ui",
-  "version": "1.1.10",
+  "version": "1.1.12",
   "author": "sword",
   "private": false,
   "scripts": {

package/packages/File/src/main.vue

@@ -15,8 +15,8 @@
       :name="inputName"
     />
     <file-upload
+      v-show="inputWriteable"
       ref="fileUpload"
-      v-if="inputWriteable"
       v-model="inputVal"
       :list-type="pictureWall ? 'picture-card' : null"
       :action-url="actionUrlVal"
@@ -30,6 +30,7 @@
       :size="size"
       :readonly="!inputWriteable"
       :with-credentials="withCredentials"
+      @on-progress="handleProgress"
       @handle-error="handleError"
       @clear="handleClear"
     >
@@ -219,7 +220,7 @@ export default {
     return {
       writeable: true,
       temp: null,
-      refreshFileUploadDebounce: null,
+      refreshFileUploadDebounce: _.debounce(this.refreshFileUpload, 50),
       inputVal: [],
     }
   },
@@ -307,17 +308,10 @@ export default {
     },
   },
   created() {
-    this.refreshFileUploadDebounce = _.debounce(this.refreshFileUpload, 1000)
     if (this.value) {
       this.inputVal = JSON.parse(this.value)
     }
   },
-  beforeDestroy() {
-    // 组件销毁前取消防抖调用
-    if (this.refreshFileUploadDebounce) {
-      this.refreshFileUploadDebounce.cancel()
-    }
-  },
   methods: {
     //获取指定字符串点最后一个字符
     substringType(str) {
@@ -344,133 +338,46 @@ export default {
         prop5: '',
         prop6: '',
       }
-      console.log('item', item)
       if (file.response) {
         item.response = { ...file.response }
         item.username = file.response.username || ''
       }
-
       return item
     },
     // 对附件对象的操作，包括：添加、更新、删除、清空、调整顺序
-    // valueOpration(item, opType = 'update', direct) {
-    //   if (opType == 'clear') {
-    //     this.$emit('input', '')
-    //     this.refreshFileUploadDebounce()
-    //     return
-    //   }
-    //   let ary = utils.isEmpty(this.value) ? [] : JSON.parse(this.value)
-    //   const index = ary.findIndex((m) => m.uid == item.uid)
-    //   switch (opType) {
-    //     case 'update': {
-    //       if (index > -1) {
-    //         ary[index] = item
-    //       } else {
-    //         ary.push(item)
-    //       }
-    //       break
-    //     }
-    //     case 'remove':
-    //       ary.splice(index, 1)
-    //       break
-    //     case 'move': {
-    //       const realItem = ary.find((m) => m.uid == item.uid)
-    //       ary = utils.arrayMove(ary, realItem, direct)
-    //       break
-    //     }
-    //   }
-    //   this.$emit('input', ary.length > 0 ? JSON.stringify(ary) : '')
-    //   this.refreshFileUploadDebounce()
-    // },
     valueOpration(item, opType = 'update', direct) {
-      // 清空操作
-      if (opType === 'clear') {
+      if (opType == 'clear') {
         this.$emit('input', '')
-        if (this.refreshFileUploadDebounce) {
-          this.refreshFileUploadDebounce()
-        }
-        return
-      }
-
-      // 参数验证
-      if (!item || !item.uid) {
-        console.warn('item 或 item.uid 不能为空')
+        this.refreshFileUploadDebounce()
         return
       }
-
-      // 获取当前附件数组
-      let ary = this.value ? JSON.parse(this.value) : []
-
-      // 根据操作类型执行相应逻辑
+      let ary = utils.isEmpty(this.value) ? [] : JSON.parse(this.value)
+      const index = ary.findIndex((m) => m.uid == item.uid)
       switch (opType) {
-        case 'update':
-          this.handleUpdate(ary, item)
+        case 'update': {
+          if (index > -1) {
+            ary[index] = item
+          } else {
+            ary.push(item)
+          }
           break
+        }
         case 'remove':
-          this.handleRemove(ary, item)
+          ary.splice(index, 1)
           break
-        case 'move':
-          this.handleMove(ary, item, direct)
+        case 'move': {
+          const realItem = ary.find((m) => m.uid == item.uid)
+          ary = utils.arrayMove(ary, realItem, direct)
           break
-        default:
-          console.warn(`不支持的操作类型: ${opType}`)
-          return
+        }
       }
-
-      // 更新组件值并刷新上传组件
       this.$emit('input', ary.length > 0 ? JSON.stringify(ary) : '')
-      if (this.refreshFileUploadDebounce) {
-        this.refreshFileUploadDebounce()
-      }
-    },
-
-    /**
-     * 处理附件更新操作
-     */
-    handleUpdate(ary, item) {
-      const index = ary.findIndex((m) => m.uid === item.uid)
-      console.log('index', index)
-      if (index > -1) {
-        // 存在则更新
-        ary[index] = { ...ary[index], ...item }
-      } else {
-        // 不存在则添加
-        ary.push(item)
-      }
-    },
-
-    /**
-     * 处理附件删除操作
-     */
-    handleRemove(ary, item) {
-      const index = ary.findIndex((m) => m.uid === item.uid)
-      if (index > -1) {
-        ary.splice(index, 1)
-      }
-    },
-
-    /**
-     * 处理附件移动操作
-     */
-    handleMove(ary, item, direct) {
-      const index = ary.findIndex((m) => m.uid === item.uid)
-      if (index > -1) {
-        const realItem = ary[index]
-        ary = utils.arrayMove(ary, realItem, direct)
-      }
+      this.refreshFileUploadDebounce()
     },
     // 同步附件数据到上传组件
     refreshFileUpload() {
       this.$nextTick(() => {
-        if (
-          this.$refs.fileUpload &&
-          typeof this.$refs.fileUpload.reload === 'function'
-        ) {
-          this.$refs.fileUpload.reload(this.inputVal)
-        } else {
-          console.warn('FileUpload 组件尚未渲染或已卸载')
-          this.refreshFileUpload()
-        }
+        this.$refs.fileUpload.reload(this.inputVal)
       })
     },
     handleError(err, file) {
@@ -490,17 +397,11 @@ export default {
       this.valueOpration(item, 'move', direct)
     },
     uploadSuccess(response, file, fileList) {
-      console.log('uploadSuccess', response, file, fileList)
       this.valueOpration(this.convertFile2Item(file))
       this.$emit('onSuccess', response, file, fileList)
     },
     removeFile(file) {
-      if (
-        this.$refs.fileUpload &&
-        typeof this.$refs.fileUpload.abort === 'function'
-      ) {
-        this.$refs.fileUpload.abort(file)
-      }
+      this.$refs.fileUpload.abort(file)
       this.valueOpration(this.convertFile2Item(file), 'remove')
       this.$emit('remove', file, this.inputVal)
     },
@@ -549,9 +450,7 @@ export default {
     },
     handleSort(data) {
       this.$emit('input', JSON.stringify(data))
-      if (this.refreshFileUploadDebounce) {
-        this.refreshFileUploadDebounce()
-      }
+      this.refreshFileUploadDebounce()
     },
   },
 }

package/packages/FileUpload/src/main.vue

@@ -56,7 +56,7 @@
 </template>
 <script>
 export default {
-  name: 'ClFileUpload',
+  name: 'FileUpload',
   props: {
     withCredentials: {
       type: Boolean,
@@ -119,7 +119,7 @@ export default {
   },
   methods: {
     reload(files) {
-      this.files = files
+      this.$set(this, 'files', files)
     },
     // 附件是否超过最大尺寸
     exceedFileSize(file) {