bri-components 1.5.4 → 1.5.5

package/package.json

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

package/src/components/controls/base/BriUpload/uploadList.vue

@@ -317,14 +317,22 @@
                 };
             },
             operationMap () {
+                let operations = { ...this.allOperationMap };
+                // comp_web图标前缀与其他不同，需特殊处理
+                if (this.propsObj._pageType === "comp") {
+                    operations.canDelete.customIcon = "bri-shanchu";
+                    operations.canEdit.customIcon = "bri-bianji";
+                    operations.canDownload.customIcon = "bri-xiazai";
+                    operations.canPreview.customIcon = "bri-keshi";
+                }
                 return this.canEdit
                     ? this.$categoryMapToMap(
-                        this.allOperationMap,
+                        operations,
                         undefined,
                         this.isShowEditIcon ? [] : ["canEdit"]
                     )
                     : this.$categoryMapToMap(
-                        this.allOperationMap,
+                        operations,
                         undefined,
                         ["canDelete", "canEdit"]
                 );

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

@@ -25,7 +25,7 @@ export default {
                 _openText: this.propsObj._openText || "是", // 此行放在 ...this.propsObj的下面目的是，处理_openText为空字符串的情况
                 _closeText: this.propsObj._closeText || "否",
                 _openColor: this.propsObj._openColor || this.controlThemeColor, // 打开时的背景色
-                _closeColor: this.propsObj._closeColor || "#cccccc" // 关闭时的背景色
+                _closeColor: this.propsObj._closeColor || "#aaaaaa" // 关闭时的背景色
             };
         },
         openText () {

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

@@ -192,7 +192,7 @@ export default {
     methods: {
         selfInit () {
             this.isUseDescSort = this.selfPropsObj._isUseDescSort;
-            this.pagePropsObj.pagesize = this.selfPropsObj._pagesize;
+            this.pagePropsObj.pagesize = this.selfPropsObj._pagesize || this.selfBasePropsObj._pagesize;
             this.initRowspan();
         },
         // 本身的初始化