bri-components 1.2.67 → 1.2.69

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.2.67",
+    "version": "1.2.69",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",
@@ -32,7 +32,7 @@
     "dependencies": {
         "ali-oss": "^6.13.1",
         "axios": "^0.23.0",
-        "bri-datas": "^1.0.49",
+        "bri-datas": "^1.0.50",
         "jshint": "^2.12.0",
         "jsonlint": "^1.6.3",
         "minio": "7.1.0",

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

@@ -37,6 +37,9 @@
                     ...commonClass,
                     'DshCascader-show-auto': true
                 }"
+                :style="{
+                    color: curValObj && curValObj.style.color // &&为了和 mobile一致
+                }"
             >
                 {{ showVal }}
             </div>
@@ -46,10 +49,15 @@
                 :content="showVal"
                 :transfer="true"
             >
-                <div :class="{
-                    ...commonClass,
-                    'DshCascader-show-ellipsis': true
-                }">
+                <div
+                    :class="{
+                        ...commonClass,
+                        'DshCascader-show-ellipsis': true
+                    }"
+                    :style="{
+                        color: curValObj && curValObj.style.color // &&为了和 mobile一致
+                    }"
+                >
                     {{ showVal }}
                 </div>
             </bri-tooltip>
@@ -102,8 +110,8 @@
                     ...commonClass,
                     'DshCascaders-show-auto': true
                 }"
-                :list="curValObjList"
                 itemClass="DshCascaders-show-auto-tag"
+                :list="curValObjList"
             ></dsh-tags>
 
             <bri-tooltip
@@ -116,8 +124,8 @@
                         ...commonClass,
                         'DshCascaders-show-ellipsis': true
                     }"
-                    :list="curValObjList"
                     itemClass="DshCascaders-show-ellipsis-tag"
+                    :list="curValObjList"
                 ></dsh-tags>
             </bri-tooltip>
         </template>

package/src/components/controls/control.less

@@ -182,7 +182,7 @@
                             
                             & + span {
                                 color: @value;
-                                opacity: 0.5;
+                                opacity: 0.6;
                             }
                         }
 

package/src/components/form/DshAdvSearch.vue

@@ -502,3 +502,14 @@
         }
     }
 </style>
+<style lang="less">
+    .DshAdvSearch {
+        &-conditions {
+            &-item {
+                .DshFormUnit-label-right {
+                    flex: 2;
+                }
+            }
+        }
+    }
+</style>

package/src/components/list/DshBox/DshCard.vue

@@ -231,11 +231,6 @@
             selfColumns () {
                 return this.columns
                     .filter(colItem => ![this.imageField, this.titleField].includes(colItem._key))
-                    .map(colItem => ({
-                        ...colItem,
-                        titleAlign: "left",
-                        columnAlign: "left"
-                    }))
                     .slice(0, 2);
             },
 

package/src/components/list/DshBox/DshPanel.vue

@@ -62,7 +62,7 @@
                         <div class="list">
                             <!-- 提示语 -->
                             <div
-                                v-if="!groupItem.finished"
+                                v-if="!groupItem.list.length || !groupItem.finished"
                                 class="list-tip"
                                 :style="{
                                     color: getBgColor(groupItem),
@@ -186,7 +186,7 @@
 
                             <!-- 提示语 -->
                             <div
-                                v-if="groupItem.finished"
+                                v-if="groupItem.list.length && groupItem.finished"
                                 class="list-tip"
                                 :style="{
                                     color: getBgColor(groupItem),
@@ -314,11 +314,6 @@
             selfColumns () {
                 return this.columns
                     .filter(colItem => ![this.groupField, this.titleField].includes(colItem._key))
-                    .map(colItem => ({
-                        ...colItem,
-                        titleAlign: "left",
-                        columnAlign: "left"
-                    }))
                     .slice(0, 1);
             },
             groupBtnOperationList () {

package/src/components/small/DshTabs.vue

@@ -6,13 +6,13 @@
     >
         <TabPane
             v-for="tabItem in list"
-            :key="tabItem._key"
+            :key="tabItem[keyField]"
             class="DshTabs-item"
-            :name="tabItem._key"
+            :name="tabItem[keyField]"
             :label="getLabel(tabItem)"
         >
             <slot
-                v-if="renderStatusMap[tabItem._key]"
+                v-if="renderStatusMap[tabItem[keyField]]"
                 :tabItem="tabItem"
             >
                 <span></span>
@@ -20,17 +20,18 @@
         </TabPane>
 
         <div
+            v-if="rightTabList.length"
             slot="extra"
             class="extra"
         >
             <span
                 v-for="tabItem in rightTabList"
-                :key="tabItem._key"
+                :key="tabItem[keyField]"
                 :class="{
                     'extra-item': true,
-                    'extra-item-active': tabItem._key === curTabKey
+                    'extra-item-active': tabItem[keyField] === curTabKey
                 }"
-                @click="curTabKey = tabItem._key"
+                @click="curTabKey = tabItem[keyField]"
             >
                 {{ tabItem.name }}
             </span>
@@ -49,9 +50,13 @@
                 type: String,
                 default: "creative",
                 validator (val) {
-                    return ["creative", "tradition", "page"].includes(val);
+                    return ["creative", "tradition", "page", "line"].includes(val);
                 }
             },
+            keyField: {
+                type: String,
+                default: "_key"
+            },
             list: {
                 type: Array,
                 default () {
@@ -75,7 +80,7 @@
                         this.init(tabKey);
 
                         this.$emit("input", tabKey);
-                        this.$emit("change", tabKey, this.list.find(item => item._key === tabKey));
+                        this.$emit("change", tabKey, this.list.find(item => item[this.keyField] === tabKey));
                     }
                 }
             },
@@ -84,7 +89,7 @@
             }
         },
         created () {
-            this.init(this.curTabKey != undefined ? this.curTabKey : (this.list[0] && this.list[0]._key));
+            this.init(this.curTabKey != undefined ? this.curTabKey : (this.list[0] && this.list[0][this.keyField]));
         },
         mounted () {},
         methods: {
@@ -133,17 +138,6 @@
                 &-active {
                     color: @themeColor;
                     position: relative;
-
-                    // &::after {
-                    //     content: "";
-                    //     width: 100%;
-                    //     height: 2px;
-                    //     position: absolute;
-                    //     bottom: 0px;
-                    //     left: 0;
-                    //     z-index: 1;
-                    //     background-color: @themeColor;
-                    // }
                 }
             }
         }
@@ -325,6 +319,7 @@
                                         // tab切换下方下划线
                                         .ivu-tabs-ink-bar {
                                             display: none;
+
                                             &-animated {
                                                 display: none;
                                             }
@@ -370,5 +365,53 @@
                 }
             }
         }
+
+        // 下划线
+        &-line {
+            .ivu-tabs {
+                // color: @titleColor;
+
+                &-bar {
+                    height: 100%;
+                    border-bottom: 0px!important;
+                    margin-bottom: 0px!important;
+
+                    .ivu-tabs-nav-container {
+
+                        .ivu-tabs-nav-wrap {
+
+                            .ivu-tabs-nav {
+                                &-prev,
+                                &-next {
+
+                                }
+
+                                &-scroll {
+                                    &-disabled {
+
+                                    }
+
+                                    .ivu-tabs-nav {
+
+                                        .ivu-tabs-ink-bar {
+
+                                        }
+
+                                        .ivu-tabs-tab {
+                                            // margin-right: 0px;
+
+                                            &-active,
+                                            &-focused {
+
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
     }
 </style>

package/src/components/unit/DshFormUnit.vue

@@ -138,12 +138,12 @@
         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
+                    width: `calc(${(this.formItem._br && this.formItem._span ? this.formItem._span / 24 : 1) * 100}% - 12px)`,
+                    height: [undefined, 0, 24].includes(this.formItem._span)
                         ? undefined
-                        : this.canEdit ? `${this.height}px` : `${this.height - 10}px`,
+                        : `${this.height - (this.canEdit ? 0 : 10)}px`, // 去掉下padding
                     minHeight: "42px",
-                    padding: this.canEdit ? undefined : "0px 10px", // 详情查看页时，不要上下的padding，为了美观
+                    paddingBottom: this.canEdit ? undefined : "0px", // 详情查看页时，不要上下的padding，为了美观
 
                     ...this.rowStyle
                 };