bri-components 1.4.90 → 1.4.92

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.4.90",
+    "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/list/mixins/DshFlatTableMixin.js

@@ -96,7 +96,7 @@ export default {
             return this.tableDataObj.rowspanMap || {};
         },
         allListData () {
-            this.data.forEach(row => {
+            this.data.forEach((row) => {
                 this.fixRowData(row);
             });
             this.initFlag = false;
@@ -125,6 +125,14 @@ export default {
                 ? this.showListData
                 : this.curPageShowListData;
         },
+        // 替换tableBaseMixin里的
+        changedCols () {
+            return this.selfShowListData.reduce((totalCols, row) => {
+                return [
+                    ...new Set([...totalCols, ...(row.__changed__ || []).map(item => item.fieldKey)])
+                ];
+            }, []);
+        },
         footerData () {
             return this.isSearching
                 ? []

package/src/components/list/mixins/tableBaseMixin.js

@@ -682,6 +682,9 @@ export default {
         // useCampare () {
         //     return !!this.compareListData.length;
         // },
+        changedCols () {
+            return [];
+        },
 
         /* --- 功能按钮 --- */
         baseOperationBtns () {
@@ -1267,6 +1270,8 @@ export default {
                             _key: column.colType === "tree" ? "name" : column._key
                         },
                         allFormList: this.selfColumns,
+                        changedCols: this.changedCols,
+                        changedFields: (row.__changed__ || []).map(item => item.fieldKey),
                         inTableType: this.inTableType,
                         allListRows: this.allListData,
                         rowIndex: rowIndex,

package/src/components/unit/DshFormUnit.vue

@@ -35,7 +35,7 @@
                             <span
                                 v-if="changedFields.includes(formItem._key)"
                                 class="DshFormUnit-label-name-sign"
-                            >！有更新</span>
+                            >!有更新</span>
                         </slot>
 
                         <!-- label后可自定义内容 -->
@@ -104,12 +104,6 @@
             unitMixin
         ],
         props: {
-            changedFields: {
-                type: Array,
-                default () {
-                    return [];
-                }
-            },
             // 实际最精确值是68px（label:30px, control:32px, 上下padding各: 2px 8px，因为ivu-form-item-content里line-height: 32px导致有问题，故先74px
             height: {
                 type: [String, Number],

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>
@@ -15,6 +18,7 @@
 
         <template v-else>
             <component
+                :class="changedCols.includes(formItem._key) ? 'DshListUnit-control' : ''"
                 :is="curComponentName"
                 :canEdit="canEdit"
                 :value="formData"
@@ -33,6 +37,19 @@
                 @quickChange="quickChange"
                 @change="change"
             ></component>
+
+            <template>
+                <!-- 有更新标记-->
+                <span
+                    v-if="changedFields.includes(formItem._key)"
+                    class="DshListUnit-sign"
+                >!有更新</span>
+                <!-- 占位 -制药某列的某行有，没更新也要占位，保持对齐 -->
+                <span
+                    v-else-if="changedCols.includes(formItem._key)"
+                    class="DshListUnit-sign-empty"
+                ></span>
+            </template>
         </template>
     </div>
 </template>
@@ -46,6 +63,12 @@
             unitMixin
         ],
         props: {
+            changedCols: {
+                type: Array,
+                default () {
+                    return [];
+                }
+            },
             canEdit: {
                 type: Boolean,
                 default: false
@@ -68,6 +91,25 @@
 
 <style lang="less" scoped>
     .DshListUnit {
+        &-changed {
+            display: flex;
+            align-items: center;
+        }
+
+        &-control {
+            display: inline-block;
+            width: calc(100% - 66px);
+        }
+
+        &-sign {
+            display: inline-block;
+            width: 56px;
+            #dsh-sign-change();
 
+            &-empty {
+                display: inline-block;
+                width: 56px;
+            }
+        }
     }
 </style>

package/src/components/unit/unitMixin.js

@@ -25,6 +25,12 @@ export default {
                 return [];
             }
         },
+        changedFields: {
+            type: Array,
+            default () {
+                return [];
+            }
+        },
 
         /* 表格字段内用到的 */
         inTableType: {

package/src/styles/global/base.less

@@ -29,8 +29,8 @@
 
 #dsh-sign-change () {
     display: inline-block;
-    padding: 3px 8px;
-    margin-left: 5px;
+    padding: 3px 6px;
+    margin-left: 4px;
     border-radius: 4px;
     background-color: #f75252;
     font-size: 12px;