meixioacomponent 2.0.44 → 2.0.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meixioacomponent",
-  "version": "2.0.44",
+  "version": "2.0.45",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

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

@@ -10,8 +10,21 @@
       {{ filterContent() }}
     </div>
     <div v-else-if="type==='money'" :class="[type]">
-      <t-statistic :value="parseFloat(content)" prefix="￥" trend="increase"/>
+      <t-statistic
+          :value="parseFloat(content)" prefix="￥" trend="increase"/>
     </div>
+
+    <div v-else-if="type==='money+'" :class="[type]">
+      <t-statistic
+          :color="parseFloat(content)>0?'var(--color-error)': 'var(--font-color-d)'"
+          :value="parseFloat(content)" prefix="￥" trend="increase"/>
+    </div>
+    <div v-else-if="type==='money-'" :class="[type]">
+      <t-statistic
+          :color="parseFloat(content)<0?'var(--color-success)':'var(--font-color-d)'"
+          :value="parseFloat(content)" prefix="￥" trend="increase"/>
+    </div>
+
     <div v-else-if="type==='number'" :class="[type]">
       {{ filterContent() }}
     </div>
@@ -19,13 +32,8 @@
     <div v-else class="default">
       {{ filterContent() }}
     </div>
-
   </div>
-
-
   <div v-else class="empty">暂无数据</div>
-
-
 </template>
 
 
@@ -150,11 +158,11 @@ export default {
     justify-content: flex-start;
   }
 
-  .time, .number, .money {
+  .time, .number, .money, .money +, .money- {
     font-family: TCloudNumber !important;
   }
 
-  .money {
+  .money, .money +, .money- {
     font-weight: var(--font-weight-kg);
   }
 

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

@@ -65,6 +65,7 @@ export const baseUploadMixins = {
     },
 
     async uploadEd(evt) {
+      console.log('uploadEd',evt);
       let filterList = [];
       let callBackParams = null;
       try {

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

@@ -204,7 +204,6 @@ export default {
       })
     },
     uploadEd(evt) {
-
       this.stepActive = 2
       if (evt instanceof Array) {
         const {url} = evt[0]

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

@@ -23,10 +23,10 @@
     </div>
     <div class="upload-content">
       <uploadItemVue
-        v-for="(item, index) in filterArray"
-        :key="index"
-        :item="item"
-        @deleteAppendixItem="deleteAppendixItem"
+          v-for="(item, index) in filterArray"
+          :key="index"
+          :item="item"
+          @deleteAppendixItem="deleteAppendixItem"
       ></uploadItemVue>
     </div>
   </div>
@@ -36,7 +36,7 @@
 import uploadItemVue from "./uploadItem.vue";
 //
 import Upload from "../../../utils/upload";
-import {ArrowDownIcon,ArrowUpIcon,CloseIcon} from "tdesign-icons-vue"
+import {ArrowDownIcon, ArrowUpIcon, CloseIcon} from "tdesign-icons-vue"
 
 export default {
   name: "upload",
@@ -89,13 +89,13 @@ export default {
     completed() {
       let uploadArray = this.uploadArray;
       return (
-        uploadArray?.filter((item) => {
-          return item.process === 100;
-        }).length / uploadArray?.length
+          uploadArray?.filter((item) => {
+            return item.process === 100;
+          }).length / uploadArray?.length
       );
     },
     totalStyle() {
-      return { width: `${this.completed * 100}%` };
+      return {width: `${this.completed * 100}%`};
     },
   },
   methods: {
@@ -139,27 +139,26 @@ export default {
         }
 
         this.$set(
-          uploadItem,
-          "upload",
-          new Upload({
-            file: uploadItem.file,
-            uploadProgressFn: (process) => {
-              uploadItem.process = process;
-            },
-          })
+            uploadItem,
+            "upload",
+            new Upload({
+              file: uploadItem.file,
+              uploadProgressFn: (process) => {
+                uploadItem.process = process;
+              },
+            })
         );
 
         uploadItem.upload
-          .start(this.$props.isOss)
-          .then((uploadEdUrl) => {
-            this.$set(uploadItem, "url", uploadEdUrl);
-
-            this.uploadEd();
-          })
-          .catch((error) => {
-            this.$set(uploadItem, "url", "cancel");
-            this.uploadEd(error);
-          });
+            .start(this.$props.isOss)
+            .then((uploadEdUrl) => {
+              this.$set(uploadItem, "url", uploadEdUrl);
+              this.uploadEd();
+            })
+            .catch((error) => {
+              this.$set(uploadItem, "url", "cancel");
+              this.uploadEd(error);
+            });
       }
     },
 
@@ -174,21 +173,22 @@ export default {
           cancelButtonText: "取消",
           type: "warning",
         })
-          .then(() => {
-            this.uploadArray.forEach((item) => {
-              if (item.upload?.state === 0) {
-                item.upload.cancel();
-              }
+            .then(() => {
+              this.uploadArray.forEach((item) => {
+                if (item.upload?.state === 0) {
+                  item.upload.cancel();
+                }
+              });
+              this.uploadEd();
+            })
+            .catch(() => {
             });
-            this.uploadEd();
-          })
-          .catch(() => {});
       } else {
         this.uploadEd();
       }
     },
 
-    judgeUploadMapItemUploaded() {
+    judgeUploadMapItemUploaded(statusOfError = false) {
       this.uploadArrayMap.forEach((value, key) => {
         let uploadArr = this.uploadArrayMap.get(key);
 
@@ -197,14 +197,14 @@ export default {
         });
         // 判断群组是否上传了 只需要执行数组的第一个就行了
         if (flag) {
-          uploadArr[0]?.cb(uploadArr);
+          uploadArr[0]?.cb(statusOfError ? statusOfError : uploadArr);
         }
       });
     },
 
     uploadEd(statusOfError = false) {
       let uploadArray = this.uploadArray;
-      this.judgeUploadMapItemUploaded();
+      this.judgeUploadMapItemUploaded(statusOfError);
       let flag = uploadArray.every((item) => {
         return !item.upload || item.upload.state !== 0 || item.url === "cancel";
       });
@@ -216,7 +216,7 @@ export default {
           });
 
           this.$props.uploadEdEvent(
-            statusOfError ? statusOfError : uploadArray
+              statusOfError ? statusOfError : uploadArray
           );
         }
       }
@@ -228,12 +228,13 @@ export default {
         cancelButtonText: "取消",
         type: "warning",
       })
-        .then(() => {
-          if (item.upload?.state === 0) {
-            item.upload.cancel();
-          }
-        })
-        .catch(() => {});
+          .then(() => {
+            if (item.upload?.state === 0) {
+              item.upload.cancel();
+            }
+          })
+          .catch(() => {
+          });
     },
 
     uploadFailed() {

package/packages/config/use/UseUpload.js

@@ -36,6 +36,7 @@ var UseUpload = /** @class */ (function () {
             this.dynamicMount = new DynamicMountClass_1["default"]({
                 componentProps: {
                     uploadEdEvent: function (evt) {
+                        console.log('evt', evt);
                         _this.uploadEd(evt);
                     },
                     isOss: isOss,
@@ -48,22 +49,20 @@ var UseUpload = /** @class */ (function () {
         return true;
     };
     UseUpload.prototype.uploadEd = function (evt) {
-        var _this = this;
         if (evt === void 0) { evt = null; }
+        console.log('useUpload', evt);
         this.lock = true;
-        setTimeout(function () {
-            _this.cbList.forEach(function (item) {
-                item.cb(evt ? evt : item.uploadList);
-            });
-            if (_this.dynamicMount) {
-                var component = _this.dynamicMount.getComponent();
-                // @ts-ignore
-                component.$destroy();
-                _this.dynamicMount = null;
-                _this.cbList = [];
-                _this.lock = false;
-            }
-        }, 500);
+        this.cbList.forEach(function (item) {
+            item.cb(evt ? evt : item.uploadList);
+        });
+        if (this.dynamicMount) {
+            var component = this.dynamicMount.getComponent();
+            // @ts-ignore
+            component.$destroy();
+            this.dynamicMount = null;
+            this.cbList = [];
+            this.lock = false;
+        }
     };
     UseUpload.prototype.appendUploadItem = function (list) {
         if (this.dynamicMount) {

package/packages/config/use/UseUpload.ts

@@ -39,6 +39,7 @@ class UseUpload implements UseUploadInterFace {
       this.dynamicMount = new DynamicMount({
         componentProps: {
           uploadEdEvent: (evt) => {
+            console.log('evt',evt);
             this.uploadEd(evt);
           },
           isOss: isOss,
@@ -53,20 +54,19 @@ class UseUpload implements UseUploadInterFace {
   }
 
   uploadEd(evt = null) {
+    console.log('useUpload',evt);
     this.lock = true;
-    setTimeout(() => {
-      this.cbList.forEach((item) => {
-        item.cb(evt ? evt : item.uploadList);
-      });
-      if (this.dynamicMount) {
-        let component = this.dynamicMount.getComponent();
-        // @ts-ignore
-        component.$destroy();
-        this.dynamicMount = null;
-        this.cbList = [];
-        this.lock = false;
-      }
-    }, 500);
+    this.cbList.forEach((item) => {
+      item.cb(evt ? evt : item.uploadList);
+    });
+    if (this.dynamicMount) {
+      let component = this.dynamicMount.getComponent();
+      // @ts-ignore
+      component.$destroy();
+      this.dynamicMount = null;
+      this.cbList = [];
+      this.lock = false;
+    }
   }
 
   appendUploadItem(list) {

package/packages/utils/upload.js

@@ -47,6 +47,7 @@ class Upload {
                 this.state = 1;
                 resolve(uploadEdUrl);
             } catch (error) {
+                console.log('error',error);
                 this.state = 2;
                 reject(error);
             } finally {