bri-components 1.2.74 → 1.2.76

package/package.json

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

package/src/components/controls/extra/themeColor.vue

@@ -48,17 +48,6 @@
             },
             themeColorMap () {
                 return this.$appData.themeColors || {};
-            },
-
-            // 值为不是[]类型用的
-            curVal: {
-                get () {
-                    return this.value[this.controlKey];
-                },
-                set (val) {
-                    this.value[this.controlKey] = val;
-                    this.change();
-                }
             }
         },
         created () {

package/src/components/controls/extra/themeIcon.vue

@@ -59,17 +59,6 @@
             },
             bgColor () {
                 return (this.themeColorMap[this.value[this.relateColorkey]] || {}).bgColor;
-            },
-
-            // 值为不是[]类型用的
-            curVal: {
-                get () {
-                    return this.value[this.controlKey];
-                },
-                set (val) {
-                    this.value[this.controlKey] = val;
-                    this.change();
-                }
             }
         },
         created () {

package/src/components/controls/mixins/controlMixin.js

@@ -163,9 +163,13 @@ export default {
         // isShare () {
         //     return !!this.propsObj.isShare;
         // },
-        // 单元格状态
+        // 在单元格内
         isInTable () {
-            return !!this.propsObj.isInTable;
+            return !!this.propsObj.inTable;
+        },
+        // 单条关联内 使用详情模式的
+        isInRefDetail () {
+            return !!this.propsObj.inRefDetail;
         },
         // 高级搜索状态
         isOnSearch () {

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

@@ -121,9 +121,9 @@
                                 </bri-tooltip>
 
                                 <Tooltip
-                                    v-if="colItem._comment"
+                                    v-if="colItem._description"
                                     style="width:16px"
-                                    :content="colItem._comment"
+                                    :content="colItem._description"
                                     placement="top-start"
                                     max-width="200"
                                     :transfer="true"

package/src/components/small/DshTabs.vue

@@ -2,6 +2,7 @@
     <Tabs
         :class="['DshTabs', `DshTabs-${mode}`]"
         v-model="curTabKey"
+        :type="['button', 'card'].includes(mode) ? 'card' : undefined"
         :animated="false"
     >
         <TabPane
@@ -50,7 +51,7 @@
                 type: String,
                 default: "creative",
                 validator (val) {
-                    return ["creative", "tradition", "page", "line"].includes(val);
+                    return ["creative", "tradition", "page", "button", "card", "line"].includes(val);
                 }
             },
             keyField: {
@@ -103,7 +104,7 @@
                     ? (h) => {
                         return h("div", {
                             style: {
-                                padding: "0px 16px"
+                                padding: this.mode === "button" ? undefined : "0px 16px"
                             }
                         }, tabItem.name);
                     }
@@ -366,6 +367,51 @@
             }
         }
 
+        // 按钮式、卡片式
+        &-button,
+        &-card {
+            &.ivu-tabs.ivu-tabs-card {
+                & > .ivu-tabs-bar {
+                    border: none;
+                    margin-bottom: 0px;
+
+                    .ivu-tabs-nav-container {
+                        height: 33px;
+                    }
+
+                    .ivu-tabs-tab {
+                        height: 28px;
+                        background-color: transparent;
+                        color: @contentColor;
+                        border-radius: 4px;
+                        border: none;
+                        margin: 2px;
+                        padding: 3px 16px;
+                        line-height: 22px;
+
+                        &-active {
+                            background-color: #fff;
+                            color: @textColor;
+                        }
+
+                        &:hover {
+                            color: @textColor;
+                        }
+                    }
+
+                    .ivu-tabs-ink-bar {
+                        background-color: transparent;
+                        display: none;
+                    }
+                }
+
+                .ivu-tabs-nav {
+                    background-color: @borderColor;
+                    border-radius: @borderRadius;
+                }
+            }
+        }
+
         // 下划线
         &-line {
             .ivu-tabs {

package/src/components/unit/DshListUnit.vue

@@ -21,7 +21,7 @@
                 :propsObj="{
                     ...formItem,
                     size: 'default',
-                    isInTable: true
+                    inTable: true
                 }"
                 :rowIndex="rowIndex"
                 :parentData="parentData"

package/src/utils/table.js

@@ -4,7 +4,6 @@ const transformToColumns = function (form, {
     headerFilter = false
 } = {}) {
     return form
-        .filter(col => col._type !== "tag")
         .map(col => {
             const typeData = this.$modFieldMap[col._type] || {};