bri-components 1.2.98 → 1.2.100

package/package.json

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

package/src/components/controls/base/DshInput/BriInputs.vue

@@ -159,7 +159,7 @@
             &-add {
                 flex: 1;
                 height: 34px;
-                line-height: 34px;
+                line-height: 34px!important;
             }
         }
     }

package/src/components/list/BriFlatTable.vue

@@ -241,29 +241,37 @@
                             ];
                         },
                         renderHeaderCell: ({ column }, h) => {
-                            return h("span", [
+                            return h("span", {
+                                style: {
+                                    position: "relative"
+                                }
+                            }, [
                                 column._required && h("i", {
                                     style: {
+                                        position: "absolute",
+                                        top: "2px",
+                                        left: "-10px",
                                         color: "#ed4014"
                                     }
                                 }, "*"),
+
                                 h("span", column.title),
-                                column._description &&
-                                    h("Tooltip", {
-                                        style: {
-                                            display: "inline-block"
-                                        },
-                                        props: {
-                                            content: column._description,
-                                            transfer: true,
-                                            maxWidth: 200
-                                        },
-                                        scopedSlots: {
-                                            default: props => h("i", {
-                                                class: "table-head-description ivu-icon bico-font bico-explain"
-                                            })
-                                        }
-                                    })
+
+                                column._description && h("Tooltip", {
+                                    style: {
+                                        display: "inline-block"
+                                    },
+                                    props: {
+                                        content: column._description,
+                                        transfer: true,
+                                        maxWidth: 200
+                                    },
+                                    scopedSlots: {
+                                        default: props => h("i", {
+                                            class: "table-head-description ivu-icon bico-font bico-explain"
+                                        })
+                                    }
+                                })
                             ]);
                         },
                         ...item

package/src/components/list/DshCascaderTable.vue

@@ -411,8 +411,9 @@
             validate () {
                 this.showRuleMessage = true;
 
+                const subColumns = this.columns.filter(col => col.colType === "data");
                 return this.rows.every((row, rowIndex) =>
-                    this.subColumns.every(col => this.getRuleResult(col, row, rowIndex, true).bool)
+                    subColumns.every(col => this.getRuleResult(col, row[col.nodeKey], rowIndex, true).bool)
                 );
             },