meixioacomponent 0.2.94 → 0.2.97

package/package.json

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

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

@@ -15,9 +15,9 @@
         :multiple="uploadType == 'single' ? false : true"
       />
       <base-icon
+        :size="`l`"
         :color="`s`"
         :event="true"
-        :size="`l`"
         class="upload-icon"
         v-if="!isUploadProImg"
         @iconClick="clickFile"
@@ -195,6 +195,7 @@ export default {
     },
 
     async onPasteFile() {
+      if (this.uploadLoading) return;
       const items = (event.clipboardData || window.clipboardData).items;
       const rowList = [];
       if (this.fileType == "img") {

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

@@ -33,23 +33,25 @@ export const baseUploadMixins = {
             this.$message.error("超出文件上传限制");
             break;
           }
+          list[i].cb = this.uploadEd;
           this.module.push(list[i]);
         }
       }
       const { uploadPath } = this.$props;
 
       componentConfig.setUploadUrl(uploadPath[0], uploadPath[1]);
-      
+
       if (!this.uploadLoading) {
-        useUpload.toUpload(this.module ? this.module : list, this.uploadEd);
+        useUpload.toUpload(
+          this.module ? this.module : list,
+          this.isGroup ? this.uploadEd : null
+        );
       }
 
       this.uploadLoading = true;
     },
 
     uploadEd(list) {
-      //console.log(list);
-      //console.log(this.module);
       this.module = list;
       this.uploadLoading = false;
       this.$emit("uploadEd", list);

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

@@ -124,6 +124,9 @@ export default {
           .then((uploadEdUrl) => {
             this.$set(uploadItem, "url", uploadEdUrl);
             // uploadItem.url = uploadEdUrl;
+            if (uploadItem.cb) {
+              uploadItem.cb([uploadItem]);
+            }
             this.uploadEd();
           })
           .catch((error) => {

package/packages/components/proPageTable/oa_pro_colum_config.vue

@@ -26,7 +26,7 @@
               <div class="item-left" @click="showTableColum(item)">
                 <el-checkbox
                   v-model="item.show"
-                  :disabled="item.lock"
+                  :disabled="item.lock?true:false"
                 ></el-checkbox>
                 <span class="item-text">{{ item.label }}</span>
               </div>

package/packages/config/use/UseUpload.js

@@ -10,10 +10,10 @@ class UseUpload {
     if (this.dynamicMount) {
       this.appendUploadItem(uploadList);
     } else {
-      this.dynamicmount = new DynamicMount({
+      this.dynamicMount = new DynamicMount({
         componentProps: {
           uploadEdEvent: (list) => {
-            this.uploadEd();
+            this.uploadEd(list);
             if (cb) {
               cb(list);
             }
@@ -22,13 +22,13 @@ class UseUpload {
         },
         vueComponent: uploadVue,
       });
-      this.dynamicmount.init();
+      this.dynamicMount.init();
     }
   }
 
-  uploadEd() {
+  uploadEd(list) {
     setTimeout(() => {
-      let component = this.dynamicmount.getComponent();
+      let component = this.dynamicMount.getComponent();
       component.$destroy();
       this.dynamicMount = null;
     }, 3000);