meixioacomponent 0.2.96 → 0.2.99

package/package.json

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

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

@@ -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,6 +33,7 @@ export const baseUploadMixins = {
             this.$message.error("超出文件上传限制");
             break;
           }
+          list[i].cb = this.uploadEd;
           this.module.push(list[i]);
         }
       }
@@ -41,15 +42,16 @@ export const baseUploadMixins = {
       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/proForm/proForm/pro_form_item.vue

@@ -8,13 +8,14 @@
     }"
   >
     <div class="item-content" v-if="!isEdit">
-      <span
+      <p
         v-if="!spContentType"
         class="content-value"
         @click="handleClick('content')"
         :class="[`${config.click ? 'click' : config.color}`]"
-        >{{ contentValue }}</span
       >
+        {{ contentValue }}
+      </p>
 
       <!-- 单选框 -->
       <el-radio-group
@@ -459,7 +460,10 @@ export default {
       visibility: hidden;
     }
     .content-value {
-      display: inline-block;
+      overflow: hidden;
+      white-space: nowrap;
+      // display: inline-block;
+      text-overflow: ellipsis;
       color: var(--font-color-d);
       font-size: var(--font-size-s);
       font-weight: var(--font-weight-g);

package/packages/components/proForm/proFormWrap/pro_form_wrap.vue

@@ -110,7 +110,7 @@ export default {
     async checkValidate() {
       let refs = this.$refs.proForm;
       let validateResult = true;
-      let validate = await refs[i].checkValidate();
+      let validate = await refs.checkValidate();
       validateResult = validate.result;
       if (!validateResult) {
         return validateResult;

package/packages/config/use/UseUpload.js

@@ -13,7 +13,7 @@ class UseUpload {
       this.dynamicMount = new DynamicMount({
         componentProps: {
           uploadEdEvent: (list) => {
-            this.uploadEd();
+            this.uploadEd(list);
             if (cb) {
               cb(list);
             }
@@ -26,7 +26,7 @@ class UseUpload {
     }
   }
 
-  uploadEd() {
+  uploadEd(list) {
     setTimeout(() => {
       let component = this.dynamicMount.getComponent();
       component.$destroy();