bri-components 1.5.0 → 1.5.2

package/package.json

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

package/src/components/controls/DshControlInput.vue

@@ -189,7 +189,7 @@
         }
 
         &:hover {
-            border-color: #64c6d1;
+            border-color: @theme-hover;
         }
     }
 </style>

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

@@ -14,12 +14,7 @@
             }"
             @click="curVal = icon"
         >
-            <div
-                class="item-content"
-                :style="{
-                    'backgroundColor': relateColor
-                }"
-            >
+            <div class="item-content">
                 <Icon :custom="'bico-font ' + iconPrefix + icon.replace('icon-', 'icon')" />
             </div>
         </div>
@@ -43,12 +38,13 @@
             selfPropsObj () {
                 return {
                     _relateColorKey: "colorType",
-                    _iconPrefix: "bico-",
+                    _iconPrefix: "bico",
 
                     ...this.propsObj,
                     ...this.commonDealPropsObj
                 };
             },
+
             relateColorKey () {
                 return this.selfPropsObj._relateColorKey;
             },
@@ -56,12 +52,12 @@
                 return this.value[this.relateColorKey];
             },
 
+            iconPrefix () {
+                return `${this.selfPropsObj._iconPrefix || ""}-`;
+            },
             themeIcons () {
                 return this.$appData.themeIcons || [];
             },
-            iconPrefix () {
-                return this.selfPropsObj._iconPrefix;
-            },
 
             themeColorMap () {
                 return this.$appData.themeColorMap || {};
@@ -106,6 +102,7 @@
                 width: 38px;
                 height: 38px;
                 margin: 8px auto;
+                background-color: @theme-color-self;
                 border-radius: 38px;
                 line-height: 38px;
                 text-align: center;

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

@@ -216,6 +216,9 @@ export default {
         appKey () {
             return this.propsObj.appKey;
         },
+        controlThemeColor () {
+            return this.propsObj.controlThemeColor;
+        },
         entityKey () {
             return this.propsObj.entityKey;
         },

package/src/components/form/DshDefaultSearch.vue

@@ -238,16 +238,16 @@
 
                 &-focused,
                 &:focus {
-                    border-color: #64c6d1;
-                    box-shadow: 0 0 0 2px rgba(61, 184, 197, 0.2);
+                    border-color: @theme-hover;
+                    box-shadow: 0 0 0 2px @theme-focus;
                 }
                 &:hover {
-                    border-color: #64c6d1;
+                    border-color: @theme-hover;
                 }
             }
             .ivu-select-visible .ivu-select-selection {
-                border-color: #64c6d1;
-                box-shadow: 0 0 0 2px rgba(61, 184, 197, 0.2);
+                border-color: @theme-hover;
+                box-shadow: 0 0 0 2px @theme-focus;
             }
             .ivu-input-icon,
             .ivu-select-arrow {

package/src/components/list/mixins/tableBaseMixin.js

@@ -137,7 +137,6 @@ export default {
                     btnType: "errorText",
                     icon: "md-trash",
                     size: "small",
-                    color: "#E83636",
                     disabled: false,
                     event: "clickDelete"
                 }
@@ -199,13 +198,10 @@ export default {
         };
     },
     computed: {
-        appObj () {
-            return this.$store.getters.appThemeColor;
-        },
-
         dshRender () {
             return this[this.dshRenderName];
         },
+
         controlKey () {
             return this.propsObj._key;
         },
@@ -715,8 +711,7 @@ export default {
                         : this.baseOperationMap.canInsert.name,
                     tip: this.showMode === "form"
                         ? this.baseOperationMap.canInsert.tip.replace("行", "条")
-                        : this.baseOperationMap.canInsert.tip,
-                    color: this.appThemeColor
+                        : this.baseOperationMap.canInsert.tip
                 },
                 canHideOrShow: {
                     ...this.topOperationMap.canHideOrShow,
@@ -1344,13 +1339,13 @@ export default {
 
             return operationItem && operationItem.disabled !== true
                 ? h("div", {
+                    class: `dsh-color-border-${operationItem.btnType.includes("error") ? "error" : "primary"}`,
                     style: {
                         position: "absolute",
                         bottom: "0px",
                         right: isLeft ? `${iconSize + 3}px` : "0px",
                         width: `${iconSize + 2}px`,
                         height: `${iconSize + 2}px`,
-                        border: `1px solid ${operationItem.color}`,
                         borderRadius: "2px",
                         backgroundColor: "#ffffff",
                         lineHeight: `${iconSize - 2}px`,
@@ -1367,9 +1362,9 @@ export default {
                         }
                     }, [
                         h("Icon", {
+                            class: `dsh-color-${operationItem.btnType.includes("error") ? "error" : "primary"}`,
                             style: {
-                                fontWeight: "500",
-                                color: operationItem.color
+                                fontWeight: "500"
                             },
                             props: {
                                 type: operationItem.icon,

package/src/components/list/mixins/treeTableBaseMixin.js

@@ -78,8 +78,7 @@ export default {
                         : this.baseOperationMap.canCreateChild.name,
                     tip: this.showMode === "form"
                         ? this.baseOperationMap.canCreateChild.tip.replace("行", "条")
-                        : this.baseOperationMap.canCreateChild.tip,
-                    color: this.appThemeColor
+                        : this.baseOperationMap.canCreateChild.tip
                 }
             };
         }

package/src/styles/global/variables.less

@@ -1,14 +1,15 @@
-// 主题色
+// 主题色系列 -默认
 @themeColor-default            : #3DB8C5;
 @theme-hover-default           : #7DD0D8;
 @theme-active-default          : #298089;
 @theme-focus-default           : #DCF2F4;
 @theme-disabled-default        : #BCE7EB;
-@themeColor            : #3DB8C5; // 主题颜色
-@theme-hover           : #7DD0D8;
-@theme-active          : #298089;
-@theme-focus           : #DCF2F4;
-@theme-disabled        : #BCE7EB;
+// 主题颜色系列
+@themeColor                    : #3DB8C5;
+@theme-hover                   : #7DD0D8;
+@theme-active                  : #298089;
+@theme-focus                   : #DCF2F4;
+@theme-disabled                : #BCE7EB;
 
 // 背景色
 @bgColor               : #F5F5F5;

package/src/styles/index.less

@@ -9,4 +9,19 @@
 // @import "./global/global.less"; // 全局公共css
 
 @import "./iconfont/iconfont.css"; // 字体图标样式
-@import "./components/index.less"; // 组件样式
+@import "./components/index.less"; // 组件样式
+
+.dsh-color-primary {
+    color: @themeColor;
+}
+.dsh-color-error {
+    color: @error-color;
+}
+.dsh-color-border-primary {
+    border: 1px solid @themeColor;
+    color: @themeColor;
+}
+.dsh-color-border-error {
+    color: @error-color;
+    border: 1px solid @error-color;
+}