meixioacomponent 0.3.89 → 0.3.92

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meixioacomponent",
-  "version": "0.3.89",
+  "version": "0.3.92",
   "private": false,
   "author": "YuRi",
   "main": "lib/meixioacomponent.umd.min.js",

package/packages/components/base/baseUpload/baseUploadItem.vue

@@ -10,9 +10,9 @@
         type="file"
         ref="inputFile"
         :accept="accept"
-        @change="inputFileChange"
         style="display: none;"
         v-if="type == 'upload'"
+        @change="onInputFileChange"
         :multiple="uploadType == 'single' ? false : true"
       />
       <base-icon
@@ -129,6 +129,11 @@ export default {
       default: false,
     },
 
+    autoUpload: {
+      type: Boolean,
+      default: true,
+    },
+
     cropperConfig: {
       type: Object,
       default: () => {
@@ -224,6 +229,7 @@ export default {
 
     async returnFiles(files) {
       let list = []
+      console.log(files)
       const { fileSize } = this.$props
       for (let i = 0; i < files.length; i++) {
         if (files[i].size < fileSize * 1048576) {
@@ -240,9 +246,26 @@ export default {
       return list
     },
 
+    onInputFileChange(e) {
+      const { autoUpload } = this.$props
+
+      if (!autoUpload) {
+        this.$emit('onInputFileChange', e)
+        return
+      }
+      this.inputFileChange(e)
+    },
+
     inputFileChange(e) {
-      const { cropper, isGroup, fileType, uploadType } = this.$props
-      let files = e.target.files
+      const { cropper, isGroup, fileType, uploadType, autoUpload } = this.$props
+
+      let files = null
+      if (autoUpload) {
+        files = e.target.files
+      } else {
+        files = e
+      }
+
       if (cropper && !isGroup && fileType == 'img' && uploadType == 'single') {
         this.userCropper(files[0])
         return
@@ -289,7 +312,7 @@ export default {
     },
 
     async onPasteFile() {
-      const { disabled } = this.$props
+      const { disabled, autoUpload } = this.$props
       if (this.uploadLoading || disabled) return
       const items = (event.clipboardData || window.clipboardData).items
       const rowList = []
@@ -308,7 +331,17 @@ export default {
       }
       if (rowList.length <= 0) return
       let list = await this.returnFiles(rowList)
-      this.emitEvent(list)
+
+      if (autoUpload) {
+        this.emitEvent(list)
+      } else {
+        console.log(list)
+        this.$emit('onInputFileChange', list)
+      }
+    },
+
+    getInputFileValue() {
+      return this.$refs.inputFile.value
     },
   },
 }

package/packages/components/base/baseUpload/mixins.js

@@ -12,6 +12,7 @@ export const baseUploadMixins = {
 
   props: {
     uploadPath: {
+      type: [String, Array],
       default: () => {
         return [0, 1]
       },
@@ -40,7 +41,11 @@ export const baseUploadMixins = {
       }
       const { uploadPath } = this.$props
 
-      componentConfig.setUploadUrl(uploadPath[0], uploadPath[1])
+      if (uploadPath instanceof Array) {
+        componentConfig.setUploadUrl(uploadPath[0], uploadPath[1])
+      } else {
+        componentConfig.setUploadCustomUrl(uploadPath)
+      }
 
       if (!this.uploadLoading) {
         useUpload.toUpload(this.module ? this.module : list, this.uploadEd)

package/packages/components/base/baseUploadTemplate/index.vue

@@ -0,0 +1,236 @@
+<template>
+  <base-dialog
+    ref="dialog"
+    :modal="true"
+    :title="`批量上传`"
+    :isCache="true"
+    :isDestroy="true"
+    :width="`600px`"
+    @destroy="destroy"
+    :appendToBody="true"
+    :contentHeight="`200px`"
+  >
+    <div class="dialog-content" slot="dialog-content">
+      <el-steps :active="stepActive" simple>
+        <el-step title="上传文件" icon="el-icon-folder-add"></el-step>
+        <el-step title="导入数据" icon="el-icon-upload"></el-step>
+        <el-step title="导入完成" icon="el-icon-check"></el-step>
+      </el-steps>
+
+      <div class="custom-upload-content" v-on:paste="onPasteFile">
+        <span class="notice-text">
+          请选择需要导入的文件(
+          <strong>点击此处后</strong>
+          >支持黏贴文件上传)
+        </span>
+        <div class="upload-handle-wrap" v-show="stepActive == 0">
+          <el-input
+            :disabled="true"
+            :size="`mini`"
+            v-model="fileName"
+            style="margin-right: var(--margin-4);"
+          ></el-input>
+          <el-button type="primary" size="mini" @click="onHandleFile">
+            选择文件
+          </el-button>
+
+          <base-upload-item
+            :max="max"
+            v-model="module"
+            :disabled="disabled"
+            :fileType="fileType"
+            :auto-upload="false"
+            style="display: none;"
+            :uploadType="uploadType"
+            ref="baseUploadItemRef"
+            @uploadEd="uploadEd"
+            @onInputFileChange="onInputFileChange"
+          ></base-upload-item>
+
+          <slot name="upload-extend-notice"></slot>
+        </div>
+
+        <div class="upload-handle-wrap flex" v-show="stepActive == 1">
+          <base-default-svg
+            :wdith="200"
+            :text="`正在上传中`"
+            :svgName="`no-record`"
+          ></base-default-svg>
+        </div>
+        <div class="upload-handle-wrap flex" v-show="stepActive == 2">
+          <base-default-svg
+            :wdith="200"
+            v-if="!resultTemplate"
+            :text="result == 'fail' ? '上传失败' : '上传成功'"
+            :svgName="result == 'fail' ? '404' : 'no-data'"
+          ></base-default-svg>
+          <slot name="resultTemplate" v-else></slot>
+        </div>
+      </div>
+    </div>
+
+    <base-button-handle
+      slot="dialog-footer"
+      :size="`mini`"
+      :config="buttonConfig"
+    ></base-button-handle>
+  </base-dialog>
+</template>
+
+<script>
+import BaseDefaultSvg from '../baseDefaultSvg/baseDefaultSvg.vue'
+import baseUploadItem from '../baseUpload/baseUploadItem.vue'
+export default {
+  data() {
+    return {
+      file: null,
+      result: false,
+      stepActive: 0,
+      fileName: null,
+    }
+  },
+  created() {},
+  mounted() {
+    this.$refs.dialog.showDialog()
+  },
+  props: {
+    // 需要上传的路径，地址支持自定义
+    uploadPath: {
+      type: [String, Array],
+      default: () => {
+        return [0, 1]
+      },
+    },
+    //是否是单文件
+    uploadType: {
+      type: String,
+      default: 'single',
+    },
+    //文件类型
+    fileType: {
+      type: String,
+      default: 'other',
+    },
+    //最大的上传数量
+    max: {
+      type: Number,
+      default: 99,
+    },
+    //是否禁用
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    //v-model
+    value: {},
+
+    // resulte template slot插槽
+    resultTemplate: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  components: { baseUploadItem, BaseDefaultSvg },
+  computed: {
+    module: {
+      set(val) {
+        this.$emit('input', val)
+      },
+      get() {
+        return this.$props.value
+      },
+    },
+    buttonConfig() {
+      return [
+        {
+          type: 'info',
+          text: '取消',
+          disabled: this.stepActive == 1 ? true : false,
+          click: () => {
+            this.$refs.dialog.closeDialog()
+          },
+        },
+        {
+          type: 'primary',
+          disabled: this.stepActive == 1 ? true : false,
+          text: this.stepActive == 0 ? '导入文件' : '确定',
+          click: () => {
+            if (this.stepActive == 0) {
+              this.$refs.baseUploadItemRef.inputFileChange(this.file)
+              this.stepActive += 1
+            } else if (this.stepActive == 2) {
+              this.$emit('uploadOver')
+              this.$refs.dialog.closeDialog()
+            }
+          },
+        },
+      ]
+    },
+  },
+  methods: {
+    destroy() {
+      this.$destroy()
+    },
+    uploadEd(e) {
+      this.stepActive = 2
+      const { url } = e[0]
+      if (url == 'cancel') {
+        this.result = 'fail'
+      } else {
+        result = 'success'
+      }
+    },
+    onHandleFile() {
+      this.$refs.baseUploadItemRef.clickFile()
+    },
+    onInputFileChange(e) {
+      this.fileName = e.target?.files[0].name || e[0].file.name
+      this.file =
+        e.target?.files ||
+        e.map((item) => {
+          return item.file
+        })
+    },
+    onPasteFile() {
+      const { disabled } = this.$props
+      const { stepActive } = this
+      if (stepActive == '0' && !disabled) {
+        this.$refs.baseUploadItemRef.onPasteFile()
+      }
+    },
+  },
+}
+</script>
+
+<style lang="less" scoped>
+.dialog-content {
+  width: 100%;
+  height: 100%;
+
+  /deep/ .el-steps--simple {
+    padding: 8px 8%;
+  }
+  .custom-upload-content {
+    width: 100%;
+    height: calc(100% - 36px);
+    margin-top: var(--margin-4);
+    .notice-text {
+      color: var(--font-color-s);
+      font-size: var(--font-size-s);
+    }
+    .upload-handle-wrap {
+      width: 100%;
+      height: auto;
+      display: flex;
+      overflow-y: auto;
+      margin-top: var(--margin-4);
+    }
+    .flex {
+      display: flex;
+      flex-flow: column;
+      align-items: center;
+      justify-content: center;
+    }
+  }
+}
+</style>

package/packages/components/base/upload/upload.vue

@@ -33,24 +33,25 @@
 </template>
 
 <script>
-import uploadItemVue from "./uploadItem.vue";
+import uploadItemVue from './uploadItem.vue'
 //
-import Upload from "../../../utils/upload";
+import Upload from '../../../utils/upload'
 export default {
-  name: "upload",
+  name: 'upload',
   data() {
     return {
       isDown: false,
-    };
+      uploadArray: [],
+    }
   },
   mounted() {
-    this.startUpload();
+    this.startUpload()
   },
   components: {
     uploadItemVue,
   },
   props: {
-    uploadArray: {
+    toUploadList: {
       type: Array,
     },
     uploadEdEvent: {
@@ -61,130 +62,130 @@ export default {
   computed: {
     filterArray() {
       return this.uploadArray.filter((item) => {
-        return item.file;
-      });
+        return item.file
+      })
     },
     wrapStyle() {
       return {
-        bottom: this.isDown ? "-360px" : "0px",
-      };
+        bottom: this.isDown ? '-360px' : '0px',
+      }
     },
     handleDownIcon() {
       if (this.isDown) {
-        return "meixicomponenticon-shouqi";
+        return 'meixicomponenticon-shouqi'
       }
-      return "meixicomponenticon-xiala";
+      return 'meixicomponenticon-xiala'
     },
 
     completed() {
-      let uploadArray = this.$props.uploadArray;
+      let uploadArray = this.$props.uploadArray
       return (
         uploadArray.filter((item) => {
-          return item.process == 100;
+          return item.process == 100
         }).length / uploadArray.length
-      );
+      )
     },
     totalStyle() {
-      return { width: `${this.completed * 100}%` };
+      return { width: `${this.completed * 100}%` }
     },
   },
   methods: {
     handleDown() {
-      this.isDown = !this.isDown;
+      this.isDown = !this.isDown
     },
     async startUpload() {
-      let uploadArray = this.$props.uploadArray;
+      let uploadArray = this.$props.toUploadList
       for (let i = 0; i < uploadArray.length; i++) {
-        let item = uploadArray[i];
-        this.createUpload(item);
+        let item = uploadArray[i]
+        this.createUpload(item)
       }
     },
 
     appendUploadItem(list) {
-      let uploadArray = this.$props.uploadArray;
+      let uploadArray = this.uploadArray
       if (list instanceof Array) {
         list.forEach((item) => {
-          uploadArray.push(item);
-          this.createUpload(item);
-        });
+          this.createUpload(item)
+        })
       } else {
-        uploadArray.push(list);
+        uploadArray.push(list)
       }
     },
     createUpload(uploadItem) {
+      this.uploadArray.push(uploadItem)
       if (uploadItem.file && uploadItem.process != 100) {
         uploadItem.upload = new Upload({
           file: uploadItem.file,
           uploadProgressFn: (process) => {
-            uploadItem.process = process;
+            uploadItem.process = process
           },
-        });
+        })
         uploadItem.upload
           .start()
           .then((uploadEdUrl) => {
-            this.$set(uploadItem, "url", uploadEdUrl);
+            this.$set(uploadItem, 'url', uploadEdUrl)
             // uploadItem.url = uploadEdUrl;
             if (uploadItem.cb) {
-              uploadItem.cb([uploadItem]);
+              uploadItem.cb([uploadItem])
             }
-            this.uploadEd();
+            this.uploadEd()
           })
           .catch((error) => {
             // uploadItem.url = "cancel";
-            this.$set(uploadItem, "url", "cancel");
-            this.uploadEd();
-          });
+            this.$set(uploadItem, 'url', 'cancel')
+            this.uploadEd()
+          })
       }
     },
 
     uploadCancel() {
-      let flag = this.$props.uploadArray.some((item) => {
-        return item.upload?.state == 0;
-      });
+      let flag = this.uploadArray.some((item) => {
+        return item.upload?.state == 0
+      })
 
       if (flag) {
-        this.$confirm("此操作将取消当前未上传的文件, 是否继续?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
+        this.$confirm('此操作将取消当前未上传的文件, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning',
         })
           .then(() => {
-            this.$props.uploadArray.forEach((item) => {
+            this.uploadArray.forEach((item) => {
               if (item.upload?.state == 0) {
-                item.upload.cancel();
+                item.upload.cancel()
               }
-            });
-            this.uploadEd();
+            })
+            this.uploadEd()
           })
-          .catch(() => {});
+          .catch(() => {})
       } else {
-        this.uploadEd();
+        this.uploadEd()
       }
     },
 
     uploadEd() {
-      let uploadArray = this.$props.uploadArray;
+      let uploadArray = this.uploadArray
       let flag = uploadArray.every((item) => {
-        return !item.upload || item.upload.state != 0;
-      });
+        return !item.upload || item.upload.state != 0
+      })
       if (flag) {
         if (this.$props.uploadEdEvent) {
           uploadArray = uploadArray.filter((item) => {
-            return item.process == 100 || !item.upload;
-          });
+            return item.process == 100 || !item.upload
+          })
 
-          this.$props.uploadEdEvent(uploadArray);
+          this.$props.uploadEdEvent(uploadArray)
         }
       }
     },
 
     uploadFailed() {
       if (this.$props.uploadEdEvent) {
-        this.$props.uploadEdEvent();
+        this.$props.uploadEdEvent()
       }
     },
   },
-};
+}
 </script>
 
 <style lang="less" scoped>

package/packages/components/proPageTable/oa_pro_table.vue

@@ -128,7 +128,7 @@
               effect="dark"
               placement="top"
               :content="scope.row[`${item.key}`]"
-              v-else-if="scope.row[`${item.key}`].length > 8"
+              v-else-if="isToolTip(scope.row[`${item.key}`])"
             >
               <span
                 class="cell-content-text"
@@ -446,6 +446,12 @@ export default {
     oa_pro_table_skeletonVue,
   },
   methods: {
+    isToolTip(value) {
+      if (!value) {
+        return false
+      }
+      return value.toString().length > 10
+    },
     init() {
       canPush = !this.isAverageWidth
       this.initProScreenConfig()

package/packages/config/componentConfig.js

@@ -22,7 +22,11 @@ const componentConfig = {
   },
 
   setUploadUrl: (storeType, uploadType) => {
-    componentConfig.uploadUrl = `${componentConfig.uploadStoreList[storeType]}/${uploadType}/upload`
+    componentConfig.uploadUrl = `${componentConfig.uploadPrefix}/${componentConfig.uploadStoreList[storeType]}/${uploadType}/upload`
+  },
+
+  setUploadCustomUrl: (url) => {
+    componentConfig.uploadUrl = url
   },
 
   initConfig: (_store, _router) => {