bri-components 1.2.9 → 1.2.10

package/package.json

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

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

@@ -126,7 +126,9 @@
                         @on-visible-change="visibleChange"
                         @on-change="changeVal"
                         @click.stop="clickCascader"
-                    ></Cascader>
+                    >
+                        <slot></slot>
+                    </Cascader>
                 </template>
             </template>
         </template>
@@ -394,6 +396,9 @@
                 if (this.isVisible || !val.length) {
                     this.curValList = val;
                 }
+
+                // 注：...params 参数不可去单独使用地区组件时调用
+                this.$emit("change", this.value[this.controlKey], ...params);
             }
         },
         watch: {

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

@@ -49,6 +49,7 @@
             <template v-else>
                 <bri-tooltip
                     :content="showVal"
+                    :defaultDisabled="false"
                     maxWidth="200"
                     :transfer="true"
                 >

package/src/components/controls/controlMixin.js

@@ -26,6 +26,7 @@ export default {
             }
         },
         /* 列表形式下用到的 */
+        rowIndex: Number,
         parentData: {
             type: Array,
             default () {

package/src/components/small/BriTooltip.vue

@@ -2,18 +2,13 @@
     <Tooltip
         class="BriTooltip"
         style="width: 100%;"
-        :disabled="disabled"
         :content="content"
+        :disabled="toolTipDisabled"
         :placement="placement"
-        :transfer="transfer"
         :max-width="maxWidth"
+        :transfer="transfer"
     >
-        <div
-            ref="ellipsisContent"
-            class="ellipsisContent"
-        >
-            <slot></slot>
-        </div>
+        <slot></slot>
 
         <slot
             slot="content"
@@ -27,12 +22,6 @@
         name: "BriTooltip",
         props: {
             content: String,
-            propsObj: {
-                type: Object,
-                default () {
-                    return {};
-                }
-            },
             placement: {
                 type: String,
                 default: "bottom"
@@ -44,44 +33,48 @@
             transfer: {
                 type: Boolean,
                 default: false
+            },
+
+            defaultDisabled: {
+                type: Boolean,
+                default: true
             }
         },
         data () {
             return {
-                disabled: false
+                toolTipDisabled: true,
+                tmpToolTipDisabled: true
             };
         },
-        computed: {},
-        methods: {
-            computedDisable () {
-                // 获取overflow：hidden元素的实际被撑开的宽度
-                let test = this.$refs.ellipsisContent;
-                if (test) {
-                    let cp = test.cloneNode(true);
-                    cp.style.cssText = "all: unset;position: absolute;opacity:0;";
-                    test.parentElement.appendChild(cp);
-                    let realWidth = cp.offsetWidth;
-                    cp.remove();
-                    this.disabled = realWidth <= test.offsetWidth;
-                }
-            }
+        created () {
+            this.toolTipDisabled = this.defaultDisabled;
+            this.tmpToolTipDisabled = this.toolTipDisabled;
         },
-        created () {},
         mounted () {
-            this.$nextTick(() => {
-                this.computedDisable();
-            });
+            this.getToolTipDisabled("mouted");
         },
         updated () {
-            this.$nextTick(() => {
-                this.computedDisable();
-            });
+            this.getToolTipDisabled("updated");
         },
-        watch: {
-            content () {
-                this.$nextTick(() => {
-                    this.computedDisable();
-                });
+        methods: {
+            getToolTipDisabled (type) {
+                const isOverflow = this.$slots.default;
+                const toolTipDisabled = isOverflow[0]
+                    ? !(isOverflow[0].elm.scrollWidth > isOverflow[0].elm.clientWidth)
+                    : this.toolTipDisabled;
+
+                if (toolTipDisabled !== this.toolTipDisabled) {
+                    if (toolTipDisabled !== this.tmpToolTipDisabled) {
+                        this.tmpToolTipDisabled = toolTipDisabled;
+
+                        this.timer = setTimeout(() => {
+                            this.toolTipDisabled = toolTipDisabled;
+                            this.tmpToolTipDisabled = this.toolTipDisabled;
+                        }, 2000);
+                    }
+                } else {
+                    clearTimeout(this.timer);
+                }
             }
         }
     };

package/src/components/unit/DshUnit.vue

@@ -23,6 +23,7 @@
                     size: 'default',
                     inTable: true
                 }"
+                :rowIndex="rowIndex"
                 :parentData="parentData"
                 @blur="blur"
                 @change="change"

package/src/styles/components/small/BriTooltip.less

@@ -6,12 +6,12 @@
     }
 
     .ivu-tooltip-inner {
+        padding: 5px 8px;
         border-radius: 4px;
         background: rgba(0, 0, 0, 0.9);
-        color: rgba(255, 255, 255, 0.9);
         font-size: 14px;
         font-weight: 400;
-        padding: 5px 8px;
+        color: rgba(255, 255, 255, 0.9);
     }
 
     .ivu-tooltip-rel {