bri-components 1.4.91 → 1.4.92

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.4.91",
+    "version": "1.4.92",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",

package/src/components/controls/base/BriUpload/BriUpload.vue

@@ -52,7 +52,7 @@
                     >
                         <!-- 上传完 -->
                         <Icon
-                            v-if="percent === 100"
+                            v-if="Number(percent) === 100"
                             type="ios-checkmark"
                         ></Icon>
                         <!-- 上传中 -->
@@ -150,7 +150,7 @@
 
                     _multiple: true,
                     _useType: "drag",
-                    _maxSize: 1024 * 1024,
+                    _maxSize: 1024 * 1024 * 2, // 根据四局要求，限制文件为2G
                     _format: [],
 
                     ...this.propsObj,
@@ -254,7 +254,6 @@
                     if (!this.multipleMode) {
                         postFiles = postFiles.slice(0, 1);
                     }
-
                     postFiles.forEach(fileItem => {
                         if (
                             (!this.format.length || this.format.some(item => item.toLocaleLowerCase() === fileItem.name.split(".").pop().toLocaleLowerCase())) &&

package/src/components/controls/base/BriUpload/uploadMixin.js

@@ -24,7 +24,8 @@ export default {
     },
     data () {
         return {
-            percent: 0
+            percent: 0,
+            uploadSuccess: false
         };
     },
     created () { },
@@ -42,7 +43,7 @@ export default {
             return this.propsObj._archiveKey || [];
         },
         percentColor () {
-            if (this.percent === 100) {
+            if (Number(this.percent) === 100) {
                 return "#5cb85c";
             } else {
                 return "#6090ed";
@@ -88,9 +89,15 @@ export default {
                     filebody: JSON.stringify(fileBody)
                 },
                 onUploadProgress: progressEvent => {
-                    this.inProgress(Number((progressEvent.loaded / progressEvent.total * 100).toFixed(0)));
+                    this.inProgress(Number((progressEvent.loaded / progressEvent.total * 100).toFixed(1)));
                 }
             }).then(response => {
+                this.uploadSuccess = true;
+                this.percent = 100;
+                setTimeout(() => {
+                    this.percent = 0;
+                    this.uploadSuccess = false;
+                }, 500);
                 this.successCb && this.successCb(response, response.data, file);
                 callback && callback(response.data);
             }).catch(error => {
@@ -161,7 +168,7 @@ export default {
 
             new Oss(newOss).multipartUpload(remoteName, file, {
                 progress: (percentage) => {
-                    this.inProgress(Number((percentage * 100).toFixed(0)));
+                    this.inProgress(Number((percentage * 100).toFixed(1)));
                     this.handleProgress && this.handleProgress(percentage, file);
                 },
                 headers: {
@@ -169,6 +176,12 @@ export default {
                     "Content-Disposition": type === "pdf" ? `inline;filename=${encodeURI(file.name)}` : `attachment;filename=${encodeURI(file.name)}`
                 }
             }).then(response => {
+                this.uploadSuccess = true;
+                this.percent = 100;
+                setTimeout(() => {
+                    this.percent = 0;
+                    this.uploadSuccess = false;
+                }, 500);
                 this.successCb && this.successCb(response, response.data, file);
                 callback && callback(response.data);
             }).catch((err, response) => {
@@ -303,7 +316,7 @@ export default {
 
             new Oss(newOss).multipartUpload(remoteName, file, {
                 progress: (percentage) => {
-                    this.inProgress(Number((percentage * 100).toFixed(0)));
+                    this.inProgress(Number((percentage * 100).toFixed(1)));
                     this.handleProgress && this.handleProgress(percentage, file);
                 },
                 headers: {
@@ -311,6 +324,12 @@ export default {
                     "Content-Disposition": type === "pdf" ? `inline;filename=${encodeURI(file.name)}` : `attachment;filename=${encodeURI(file.name)}`
                 }
             }).then(response => {
+                this.percent = 100;
+                this.uploadSuccess = true;
+                setTimeout(() => {
+                    this.percent = 0;
+                    this.uploadSuccess = false;
+                }, 500);
                 this.successCb && this.successCb(response, response.data, file);
                 callback && callback(response.data);
             }).catch((err, response) => {
@@ -320,8 +339,12 @@ export default {
 
         },
         inProgress (percent) {
-            this.percent = percent;
-            if (percent >= 100) {
+            if (percent === 100 && !this.uploadSuccess) {
+                this.percent = 99.9;
+            } else {
+                this.percent = percent;
+            }
+            if (this.percent >= 100) {
                 this.percent = 100;
                 setTimeout(() => {
                     this.percent = 0;

package/src/components/controls/mixins/dateMixin.js

@@ -109,7 +109,9 @@ export default {
             this.subType !== "datetime" && this.changeOpen(false, index);
         },
         changeOpen (bool, index) {
-            this[`open${index}`] = bool;
+            if (!this.disabled) {
+                this[`open${index}`] = bool;
+            }
         },
 
         /* -------- 方法 ------- */

package/src/components/unit/DshListUnit.vue

@@ -1,5 +1,8 @@
 <template>
-    <div class="DshListUnit">
+    <div :class="{
+        DshListUnit: true,
+        'DshListUnit-changed': changedCols.includes(formItem._key)
+    }">
         <template v-if="selfFormItem._type === 'index'">
             <span>{{ indexStr || rowIndex + 1 }}</span>
         </template>
@@ -88,6 +91,11 @@
 
 <style lang="less" scoped>
     .DshListUnit {
+        &-changed {
+            display: flex;
+            align-items: center;
+        }
+
         &-control {
             display: inline-block;
             width: calc(100% - 66px);