bri-components 1.2.65 → 1.2.67

package/src/components/list/DshCascaderTable.vue

@@ -166,7 +166,7 @@
                                     v-else
                                     class="table-nodata"
                                 >
-                                    <td :colspan="columns.length">暂无内容……</td>
+                                    <td :colspan="columns.length">暂无数据…</td>
                                 </tr>
                             </tbody>
                         </table>

package/src/components/other/BriLoading.vue

@@ -69,7 +69,7 @@
             },
             mode: {
                 type: String,
-                default: "large" // small middle
+                default: "middle" // small middle
             },
             showLoadingText: {
                 type: Boolean,

package/src/components/small/DshDropdown.vue

@@ -81,7 +81,7 @@
                     v-else
                     class="nodata"
                 >
-                    暂无内容
+                    暂无内容...
                 </div>
             </div>
         </div>
@@ -170,7 +170,6 @@
 
             &-data {
                 width: 100%;
-                // max-height: 300px;
                 padding: 0 8px;
                 overflow: auto;
 
@@ -201,8 +200,12 @@
                         }
                     }
 
-                    .ivu-dropdown-item-divided:before {
-                        margin: 0px;
+                    .ivu-dropdown-item {
+                        white-space: normal;
+
+                        &-divided:before {
+                            margin: 0px;
+                        }
                     }
                 }
 

package/src/components/unit/DshFormUnit.vue

@@ -6,14 +6,9 @@
                 'DshFormUnit-required': canEdit && formItem._required,
                 'DshFormUnit-line': formItem._line
             },
-            formControlClass,
+            formControlClass
         ]"
-        :style="{
-            width: `calc(${(formItem._br ? (formItem._span || 24)/24 : 1) * 100}% - 12px)`,
-            height: formItem._br || (formItem._span || 24) === 24 ? undefined : `${height}px`,
-            minHeight: `${46}px`,
-            ...rowStyle
-        }"
+        :style="unitStyle"
     >
         <!-- label -->
         <div
@@ -76,6 +71,7 @@
             <slot>
                 <component
                     class="DshFormUnit-control-component"
+                    :style="{ 'text-align': formItem._lineAlign }"
                     ref="control"
                     :is="curComponentName"
                     :canEdit="canEdit"
@@ -139,7 +135,20 @@
                 showTipModal: false // tipsRender使用，不可删除
             };
         },
-        computed: {},
+        computed: {
+            unitStyle () {
+                return {
+                    width: `calc(${(this.formItem._br ? (this.formItem._span || 24) / 24 : 1) * 100}% - 12px)`,
+                    height: this.formItem._br || (this.formItem._span || 24) === 24
+                        ? undefined
+                        : this.canEdit ? `${this.height}px` : `${this.height - 10}px`,
+                    minHeight: "42px",
+                    padding: this.canEdit ? undefined : "0px 10px", // 详情查看页时，不要上下的padding，为了美观
+
+                    ...this.rowStyle
+                };
+            }
+        },
         created () {},
         methods: {
             // 校验方法 -供外部使用
@@ -155,7 +164,9 @@
                     ? formItem._tipsRender.call(this, formItem, formData)
                     : formItem._openTip
                         ? (h) => {
-                            return h("span", {}, [
+                            return h("span", {
+                                class: "DshFormUnit-tip"
+                            }, [
                                 h("Icon", {
                                     props: {
                                         type: "md-help-circle"
@@ -165,37 +176,18 @@
                                     },
                                     on: {
                                         click: () => {
-                                            if (formItem._tipKind === "dynamic" && !formItem._tipContent) {
-                                                if (formItem._tipUrl) {
-                                                    this.$https({
-                                                        url: {
-                                                            module: "customPage",
-                                                            name: formItem._tipUrl
-                                                        },
-                                                        params: {
-                                                            formData: formData,
-                                                            propsObj: formItem
-                                                        },
-                                                        callback: res => {
-                                                            this.showTipModal = true;
-                                                            formItem._tipContent = res;
-                                                        }
-                                                    });
-                                                }
-                                            } else {
-                                                this.showTipModal = true;
-                                            }
+                                            this.clickOpenTip(formItem, formData);
                                         }
                                     }
                                 }),
 
                                 h("dsh-modal", {
+                                    class: "DshFormUnit-tip-modal",
                                     props: {
                                         value: this.showTipModal,
                                         mode: "small",
                                         propsObj: {
                                             title: "温馨提示",
-                                            class: "DshFormUnit-modal",
                                             showSlotClose: false,
                                             maskClosable: true
                                         }
@@ -234,6 +226,29 @@
                             ]);
                         }
                         : undefined;
+            },
+            // 是否打开tip弹窗
+            clickOpenTip (formItem, formData) {
+                if (formItem._tipKind === "dynamic" && !formItem._tipContent) {
+                    if (formItem._tipUrl) {
+                        this.$https({
+                            url: {
+                                module: "customPage",
+                                name: formItem._tipUrl
+                            },
+                            params: {
+                                formData: formData,
+                                propsObj: formItem
+                            },
+                            callback: res => {
+                                this.showTipModal = true;
+                                formItem._tipContent = res;
+                            }
+                        });
+                    }
+                } else {
+                    this.showTipModal = true;
+                }
             }
         }
     };
@@ -245,28 +260,28 @@
         padding: 0px 10px 10px;
 
         &-label {
-            min-width: 50px;
-            padding: 5px 0px 5px;
+            padding: 5px 0px;
             line-height: 20px;
             font-size: @smallSize;
+            position: relative;
             display: flex;
             align-items: center;
 
             &-left {
-                flex: 2;
-                min-width: 150px;
-                position: relative;
+                flex: 3;
+                min-width: 0px;
             }
 
             &-right {
                 flex: 1;
                 min-width: 0px;
+                padding-left: 10px;
                 text-align: right;
             }
 
             &-name {
-                font-size: @textSize;
                 .dsh-ellipsis();
+                font-size: @textSize;
 
                 &-edit {
                     color: @textColor;
@@ -288,13 +303,14 @@
         }
 
         &-control {
-            overflow: hidden;
+            // overflow: hidden;
 
             &-component {
 
             }
         }
 
+        // 左右显示时
         &-line {
             display: flex;
             justify-content: space-between;
@@ -302,10 +318,9 @@
 
             .DshFormUnit-label {
                 max-width: 280px;
-                margin: 0px 8px 0px -10px; // fixedbug:line模式下显示必填
+                margin: 0px 8px 0px -10px; // line模式下显示必填
                 padding-left: 10px;
                 font-size: @textSize;
-                overflow: hidden;
 
                 &-left {
                     flex: 1;
@@ -314,7 +329,7 @@
 
                 &-right {
                     flex: none;
-                    max-width: 80px;
+                    max-width: 70px;
                     min-width: 0px;
                 }
             }
@@ -330,7 +345,7 @@
         }
 
         &-required {
-            .DshFormUnit-label-name:before {
+            .DshFormUnit-label::before {
                 position: absolute;
                 left: -10px;
 
@@ -345,29 +360,32 @@
             }
         }
 
-        &-modal {
-            .wrap {
-                width: 100%;
-                height: 100%;
-                display: flex;
-                flex-direction: column;
-
-                &-content {
-                    flex: 1;
-                    min-height: 0px;
-                    padding: 0px 12px;
-                    overflow: auto;
-                }
+        // 提示框的
+        &-tip {
+            &-modal {
+                .wrap {
+                    width: 100%;
+                    height: 100%;
+                    display: flex;
+                    flex-direction: column;
+
+                    &-content {
+                        flex: 1;
+                        min-height: 0px;
+                        padding: 0px 12px;
+                        overflow: auto;
+                    }
 
-                &-btns {
-                    margin: 10px 0px;
-                    text-align: right;
+                    &-btns {
+                        margin: 10px 0px;
+                        text-align: right;
 
-                    .ivu-btn {
-                        font-size: 16px;
-                        font-family: Microsoft YaHei-Semibold, Microsoft YaHei;
-                        font-weight: 600;
-                        border-radius: 4px;
+                        .ivu-btn {
+                            font-size: 16px;
+                            font-family: Microsoft YaHei-Semibold, Microsoft YaHei;
+                            font-weight: 600;
+                            border-radius: 4px;
+                        }
                     }
                 }
             }

package/src/styles/components/list/DshBox/DshList.less

@@ -112,9 +112,8 @@
             }
         }
 
-        &-noData {
-            padding: 10px 0px;
-            text-align: center;
+        &-nodata {
+            #dsh-nodata();
         }
     }
 }

package/src/styles/global/control.less

@@ -56,9 +56,8 @@
 .bri-unit-show () {
     display: inline-block;
     max-width: 100%;
-    padding: 2px 6px 2px 8px;
+    padding: 2px 6px;
     border-radius: @borderRadius;
     background-color: @theme-focus;
-    line-height: 24px;
     color: @themeColor;
 }

package/src/styles/global/text.less

@@ -6,13 +6,21 @@
     color: @textColor;
 }
 
-.dsh-tip {
+#dsh-nodata {
     width: 100%;
     padding: 20px 10px;
     text-align: center;
     font-size: 14px;
     font-weight: 500;
-    color: @textColor;
+    color: @placeholderColor;
+}
+#dsh-nodata-large {
+    width: 100%;
+    padding: 20px 10px;
+    text-align: center;
+    font-size: 16px;
+    font-weight: 500;
+    color: @placeholderColor;
 }
 
 .dsh-subtip {
@@ -21,7 +29,6 @@
     font-size: 12px;
     font-weight: 500;
     color: @placeholderColor;
-    // background-color: #f3f3f3;
 }
 
 // 出现三个点

package/src/styles/reset-iview-controls.less

@@ -62,24 +62,10 @@
 
     }
 
-    &-disabled {
-        .ivu-select-selection {
-            .bri-control-disabled();
-
-            &:hover {
-                border-color: @border-disabled;
-            }
-        }
-
-        .ivu-select-input[disabled] {
-            color: @textColor;
-            -webkit-text-fill-color: @placeholder-disabled-color;
-        }
-    }
-
     &-item {
         margin: 4px 8px;
         border-radius: @borderRadius;
+        white-space: normal;
 
         &:hover {
             background: @bgColor;
@@ -101,6 +87,37 @@
             -webkit-text-fill-color: @textColor-disabled;
         }
     }
+
+    &-disabled {
+        .ivu-select-selection {
+            .bri-control-disabled();
+
+            &:hover {
+                border-color: @border-disabled;
+            }
+        }
+
+        .ivu-select-input[disabled] {
+            color: @textColor;
+            -webkit-text-fill-color: @placeholder-disabled-color;
+        }
+    }
+
+    // 多选状态
+    &-multiple {
+        // 下拉面板项
+        .ivu-select-item {
+            // 压住iview同等权重的css
+            &-selected {
+                background-color: @theme-focus;
+                color: @themeColor;
+
+                &::after {
+                    // content: ""; // 多选时下拉项选中的对勾
+                }
+            }
+        }
+    }
 }
 
 .ivu-cascader {