bri-components 1.5.1 → 1.5.2

package/package.json

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

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/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/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;
+}