bri-components 1.5.3 → 1.5.5

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.5.3",
+    "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/base/DshSwitch/DshSwitch.vue

@@ -9,8 +9,8 @@
             :disabled="disabled"
             :loading="selfPropsObj.loading"
             :size="selfPropsObj._size"
-            :true-color="propsObj._openColor"
-            :false-color="propsObj._closeColor"
+            :true-color="selfPropsObj._openColor"
+            :false-color="selfPropsObj._closeColor"
             :true-value="selfPropsObj._openValue"
             :false-value="selfPropsObj._closeValue"
         >

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

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

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

@@ -15,7 +15,7 @@ export default {
             pagePropsObj: {
                 page: 1,
                 pagesize: 10,
-                pagesizeOpts: [10, 20, 30, 50]
+                pagesizeOpts: [10, 20, 30, 50, 80, 100]
             }
         };
     },
@@ -23,7 +23,8 @@ export default {
         selfBasePropsObj () {
             return {
                 _isUseDescSort: false, // 是否使用使用倒序
-                _mergeRowColKeys: [] // 合并行的列
+                _mergeRowColKeys: [], // 合并行的列
+                _pagesize: 10 // 列表的分页条数
             };
         },
         // 是不是合并行表格
@@ -191,6 +192,7 @@ export default {
     methods: {
         selfInit () {
             this.isUseDescSort = this.selfPropsObj._isUseDescSort;
+            this.pagePropsObj.pagesize = this.selfPropsObj._pagesize || this.selfBasePropsObj._pagesize;
             this.initRowspan();
         },
         // 本身的初始化

package/src/components/other/BriGantt.vue

@@ -365,7 +365,10 @@
         name: "briGantt",
         components: {},
         props: {
-            simpleDataColor: String,
+            simpleDataColor: {
+                type: String,
+                default: "#3DB8C5"
+            },
 
             tasks: Array,
             options: {

package/src/components/other/BriSvg.vue

@@ -5,7 +5,6 @@
 </template>
 
 <script>
-
     export default {
         name: "BriSvg",
         components: {},