bri-components 1.5.2 → 1.5.4

package/package.json

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

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/numberMixin.js

@@ -18,8 +18,8 @@ export default {
                 _separator: true, // 常规-千位分隔符
                 _showProgress: false, // 百分比-进度条展示(列表)
                 _strokeWidth: 12, // 百分比-进度条宽（高）
-                _overflowColor: "#87d068", // 百分比-进度条超100%颜色
-                _compeleteColor: "#87d068", // 百分比-进度条100%颜色
+                _overflowColor: "#19be6b", // 百分比-进度条超100%颜色
+                _compeleteColor: "#19be6b", // 百分比-进度条100%颜色
                 _lessColor: "#108ee9", // 百分比-进度条低于100%颜色
 
                 _round: "decimal", // 取值方式 "decimal", "round", "normal"

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 || "#cccccc" // 关闭时的背景色
             };
         },
         openText () {

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

@@ -80,6 +80,48 @@ export default {
             return this.selfPropsObj._cascaderDepartSelectVals || [];
         },
 
+        selfDepartList () {
+            const loop = (arr = [], filterVals = [], cascaderVals = [], reverseFilter = false) => {
+                arr = cascaderVals.length
+                    ? arr.filter(item => {
+                        return reverseFilter
+                            ? !cascaderVals.some(cascaderItem =>
+                                item.code && cascaderItem.code
+                                    ? item.code.length < cascaderItem.code.length
+                                        ? false
+                                        : item.code.startsWith(cascaderItem.code)
+                                    : false
+                            )
+                            : cascaderVals.some(cascaderItem =>
+                                item.code && cascaderItem.code
+                                    ? item.code.length < cascaderItem.code.length
+                                        ? cascaderItem.code.startsWith(item.code)
+                                        : item.code.startsWith(cascaderItem.code)
+                                    : false
+                        );
+                    })
+                    : filterVals.length
+                        ? arr.filter(item =>
+                            reverseFilter
+                                ? !filterVals.includes(item._key)
+                                : filterVals.includes(item._key)
+                        )
+                        : arr;
+
+                return arr.reduce((newArr, item) => {
+                    return [
+                        ...newArr,
+                        {
+                            ...item,
+                            children: loop(item.children, [], cascaderVals, reverseFilter)
+                        }
+                    ];
+                }, []);
+            };
+
+            return loop(this.departList, this.filterVals, this.cascaderVals, this.reverseFilter);
+            // return loop(this.$deepCopy(this.departList), this.filterVals, this.cascaderVals, this.reverseFilter);
+        },
         tmpValKeys () {
             return this.tmpValList.map(item => item._key);
         },
@@ -205,13 +247,13 @@ export default {
         },
 
         // 处理数据
-        transformDepartList (data = [], selectedKeys = []) {
+        transformShowList (data = [], selectedKeys = []) {
             return data.map(item => ({
                 ...item,
                 title: item.name,
                 checked: selectedKeys.includes(item._key),
                 expand: !!(item.children && item.children.length && item.level < this.expandLevel),
-                children: this.transformDepartList(item.children, selectedKeys)
+                children: this.transformShowList(item.children, selectedKeys)
             }));
         }
     }

package/src/components/controls/senior/selectDepartments.vue

@@ -214,51 +214,12 @@
             },
 
             departShowList () {
-                const loop = (arr = [], filterVals = [], cascaderVals = [], reverseFilter = false) => {
-                    arr = cascaderVals.length
-                        ? arr.filter(item => {
-                            return reverseFilter
-                                ? !cascaderVals.some(cascaderItem =>
-                                    item.code && cascaderItem.code
-                                        ? item.code.length < cascaderItem.code.length
-                                            ? false
-                                            : item.code.startsWith(cascaderItem.code)
-                                        : false
-                                )
-                                : cascaderVals.some(cascaderItem =>
-                                    item.code && cascaderItem.code
-                                        ? item.code.length < cascaderItem.code.length
-                                            ? cascaderItem.code.startsWith(item.code)
-                                            : item.code.startsWith(cascaderItem.code)
-                                        : false
-                            );
-                        })
-                        : filterVals.length
-                            ? arr.filter(item =>
-                                reverseFilter
-                                    ? !filterVals.includes(item._key)
-                                    : filterVals.includes(item._key)
-                            )
-                            : arr;
-
-                    return arr.reduce((newArr, item) => {
-                        if (item.children && item.children.length) {
-                            item.children = loop(item.children, [], cascaderVals, reverseFilter);
-                        }
-
-                        return [
-                            ...newArr,
-                            item
-                        ];
-                    }, []);
-                };
-
-                const departList = [
+                const selfDepartList = [
                     ...(this.highSearch ? this.highList : []),
-                    ...loop(this.departList, this.filterVals, this.cascaderVals, this.reverseFilter)
+                    ...this.selfDepartList
                 ];
 
-                return this.transformDepartList(departList, this.tmpValKeys);
+                return this.transformShowList(selfDepartList, this.tmpValKeys);
             },
 
             curValShowList () {

package/src/components/controls/senior/selectUsers/selectUsers.vue

@@ -335,45 +335,6 @@
 
             // 展示的部门
             departShowList () {
-                const loop = (arr = [], filterVals = [], cascaderVals = [], reverseFilter = false) => {
-                    arr = cascaderVals.length
-                        ? arr.filter(item => {
-                            return reverseFilter
-                                ? !cascaderVals.some(cascaderItem =>
-                                    item.code && cascaderItem.code
-                                        ? item.code.length < cascaderItem.code.length
-                                            ? false
-                                            : item.code.startsWith(cascaderItem.code)
-                                        : false
-                                )
-                                : cascaderVals.some(cascaderItem =>
-                                    item.code && cascaderItem.code
-                                        ? item.code.length < cascaderItem.code.length
-                                            ? cascaderItem.code.startsWith(item.code)
-                                            : item.code.startsWith(cascaderItem.code)
-                                        : false
-                            );
-                        })
-                        : filterVals.length
-                            ? arr.filter(item =>
-                                reverseFilter
-                                    ? !filterVals.includes(item._key)
-                                    : filterVals.includes(item._key)
-                            )
-                            : arr;
-
-                    return arr.reduce((newArr, item) => {
-                        if (item.children && item.children.length) {
-                            item.children = loop(item.children, [], cascaderVals, reverseFilter);
-                        }
-
-                        return [
-                            ...newArr,
-                            item
-                        ];
-                    }, []);
-                };
-
                 return [
                     ...(this.highSearch ? this.highList : []),
                     {
@@ -382,7 +343,7 @@
                         level: 1,
                         is_leaf: true
                     },
-                    ...loop(this.departList, this.filterVals, this.cascaderVals, this.reverseFilter),
+                    ...this.selfDepartList,
                     ...(
                         this.isCompAdmin
                             ? [
@@ -424,7 +385,7 @@
                             ? list
                             : list.filter(item => item.departmentKey === this.curDepart._key);
 
-                return this.transformDepartList(list, this.tmpValKeys);
+                return this.transformShowList(list, this.tmpValKeys);
             },
             userKeys () {
                 return this.userShowList.map(item => item._key);

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.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: {},