bri-components 1.4.90 → 1.4.91

package/package.json

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

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

@@ -15,6 +15,7 @@
 
         <template v-else>
             <component
+                :class="changedCols.includes(formItem._key) ? 'DshListUnit-control' : ''"
                 :is="curComponentName"
                 :canEdit="canEdit"
                 :value="formData"
@@ -33,6 +34,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 +60,12 @@
             unitMixin
         ],
         props: {
+            changedCols: {
+                type: Array,
+                default () {
+                    return [];
+                }
+            },
             canEdit: {
                 type: Boolean,
                 default: false
@@ -68,6 +88,20 @@
 
 <style lang="less" scoped>
     .DshListUnit {
+        &-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;