bri-components 1.3.4 → 1.3.6

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.3.4",
+    "version": "1.3.6",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",
@@ -32,7 +32,7 @@
     "dependencies": {
         "ali-oss": "^6.13.1",
         "axios": "^0.23.0",
-        "bri-datas": "^1.0.50",
+        "bri-datas": "^1.1.27",
         "jshint": "^2.12.0",
         "jsonlint": "^1.6.3",
         "minio": "7.1.0",

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

@@ -248,41 +248,30 @@
     .BriUpload {
         width: 100%;
         height: 100%;
-        position: relative;
-        overflow: hidden;
         border: 1px solid @borderColor;
         border-radius: @borderRadius;
         background-color: @white;
+        overflow: hidden;
+        position: relative;
 
-        // 外围
-        &-old {
-            overflow: hidden;
+        &-old,
+        &-new,
+        &-inline {
             display: flex;
 
             &-wrapper {
-                min-width: 120px;
-                height: 100%;
-                margin: 16px 0px 16px 16px;
-                border-radius: 0px;
-                border: none;
+                border: none!important;
+                border-radius: 0px !important;
+
                 &:hover {
-                    border: none
+                    border: none;
                 }
             }
 
             &-add {
                 .dsh-flex-col-center-center();
-                width: 120px;
-                height: 120px;
-                position: relative;
-                border: 1px @borderColor dashed;
-                color: @themeColor;
-                border-radius: @borderRadius;
                 cursor: pointer;
-                &:hover {
-                    border-color: @themeColor;
-                    background-color: @theme-focus;
-                }
+                position: relative;
             }
 
             &-circle {
@@ -292,11 +281,38 @@
                 bottom: 0;
                 right: 0;
                 margin: auto;
-                width: 50px !important;
-                height: 50px !important;
                 border-radius: 50%;
-                background-color: @inputBg-readonly;
+            }
+        }
+
+        &-old {
+            overflow: hidden;
+
+            &-wrapper {
+                min-width: 120px;
+                height: 100%;
+                margin: 16px 0px 16px 16px;
+            }
 
+            &-add {
+                width: 120px;
+                height: 120px;
+                border: 1px @borderColor dashed;
+                border-radius: @borderRadius;
+                color: @themeColor;
+                
+                &:hover {
+                    border-color: @themeColor;
+                    background-color: @theme-focus;
+                }
+            }
+            
+            &-circle {
+                width: 50px!important;
+                height: 50px!important;
+                background-color: @inputBg-readonly;
+                color: @themeColor;
+                
                 i {
                     color: @scuess-color;
                     font-size: 40px;
@@ -306,27 +322,20 @@
 
         &-new,
         &-inline {
-            display: flex;
-
             &-wrapper {
                 min-width: 30px;
-                background-color: @border-readonly;
                 height: 30px;
                 line-height: 30px;
-                border: none;
-                border-radius: 0px !important;
-                &:hover {
-                    border: none
-                }
+                background-color: @border-readonly;
             }
 
             &-add {
-                .dsh-flex-row-center-center();
                 height: 30px;
-                background-color: @btn-hover;
-                color: @textColor;
                 border: none;
                 border-radius: 0px;
+                background-color: @btn-hover;
+                color: @textColor;
+
                 &:hover {
                     color: @themeColor;
                     background-color: @theme-focus;
@@ -334,15 +343,10 @@
             }
 
             &-circle {
-                position: absolute;
-                top: 50%;
-                left: 50%;
-                width: 24px !important;
-                height: 24px !important;
-                margin-top: -12px;
-                margin-left: -12px;
+                width: 24px!important;
+                height: 24px!important;
                 background-color: #f4f5fa;
-                border-radius: 50%;
+
                 i {
                     color: @scuess-color;
                     font-size: 24px;

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

@@ -73,7 +73,7 @@ export default {
                     ? userIndustryData
                     : this.selfPropsObj._data;
         },
-        cascaderData () {
+        cascaderAllData () {
             const loop = (arr = [], level, parentKeys = [], filterVals = [], isMobile = false) => {
                 if (filterVals.length) {
                     arr = arr.filter(item =>
@@ -115,6 +115,26 @@ export default {
 
             return loop(this.originData, this.cascaderLevel, undefined, this.cascaderFilterVals, this.isMobile);
         },
+        cascaderData () {
+            const loop = (arr = []) => {
+                return arr
+                    ? arr.reduce((arr, item) => {
+                        if (item.rm !== 1) {
+                            if (item.children && item.children.length) {
+                                item.children = loop(item.children);
+                            } else {
+                                item.children = this.isMobile ? undefined : [];
+                            }
+                            arr.push(item);
+                        }
+
+                        return arr;
+                    }, [])
+                    : [];
+            };
+
+            return loop(this.cascaderAllData);
+        },
 
         curValObj () {
             return this.getItemObj(this.curValList);
@@ -180,7 +200,7 @@ export default {
 
         /* --------- 工具类 -------- */
         getItemObj (val) {
-            const objArr = this.$getTreeLinealDatas(val, this.cascaderData, undefined, this.saveKey);
+            const objArr = this.$getTreeLinealDatas(val, this.cascaderAllData, undefined, this.saveKey);
 
             return !this.$isEmptyData(val)
                 ? objArr.length
@@ -215,7 +235,7 @@ export default {
         },
         // 转化出级联全名
         transformFullName (val) {
-            return this.renderFormat(this.$getTreeLinealDatas(val, this.cascaderData, this.nameKey, this.saveKey));
+            return this.renderFormat(this.$getTreeLinealDatas(val, this.cascaderAllData, this.nameKey, this.saveKey));
         }
     }
 };

package/src/components/list/BriFlatTable.vue

@@ -362,7 +362,7 @@
                 this.showRuleMessage = true;
 
                 return this.listData.every(dataItem =>
-                    this.filterColumns.every(col => this.getRuleResult(col, dataItem, true).bool)
+                    this.filterColumns.every(col => this.getRuleResult(col, dataItem).bool)
                 );
             },
             // 点击 -添加行
@@ -435,8 +435,8 @@
                     row[col._key] !== oldRow[col._key];
             },
             // 是否显示 单元格校验提示文字
-            getRuleResult (col, row, showRuleMessage = this.showRuleMessage) {
-                if ((this.ruleRecordMap[`${row._id}dsh${col._key}`] || {}).showRuleMessage || showRuleMessage) {
+            getRuleResult (col, row) {
+                if ((this.ruleRecordMap[`${row._id}dsh${col._key}`] || {}).showRuleMessage || this.showRuleMessage) {
                     return this.$getFieldRuleResult(col, row);
                 } else {
                     return {

package/src/utils/table.js

@@ -1,7 +1,7 @@
 /* -------------------- 表格 -------------- */
 // 转化表单字段属性 to 表格参数, 是否需要过滤tag
 const transformToColumns = function (form, {
-    headerFilter = false
+    headFilter = false
 } = {}) {
     return form
         .map(col => {
@@ -14,7 +14,7 @@ const transformToColumns = function (form, {
                 align: col._align || typeData.align,
                 fixed: col._fixed,
                 width: col._width || typeData.width,
-                sortBy: headerFilter ? col._sortBy || typeData.sortBy : undefined,
+                sortBy: headFilter ? col._sortBy || typeData.sortBy : undefined,
                 renderHeaderCell: ({ row, column }, h) => {
                     return h("div", {
                         class: { "bri-table-ellipsis": column.sortBy != undefined || column.filter || column.filterCustom },
@@ -57,9 +57,9 @@ const transformToColumns = function (form, {
                         : {}
                 ),
                 ...(
-                    ["select", "checkbox"].includes(col._type)
+                    ["select", "checkbox"].includes(col._type) && col._hideHeadFilter !== true
                         ? {
-                            filter: headerFilter ? {
+                            filter: headFilter ? {
                                 isMultiple: true,
                                 maxHeight: 250,
                                 filterList: (
@@ -70,12 +70,12 @@ const transformToColumns = function (form, {
                                                 : col._selectFilterVals.includes(item._key)
                                         )
                                         : col._data
-                                    ).map(item => ({
-                                        ...item,
-                                        value: item._key,
-                                        label: item.name,
-                                        selected: false
-                                    })),
+                                ).map(item => ({
+                                    ...item,
+                                    value: item._key,
+                                    label: item.name,
+                                    selected: false
+                                })),
                                 filterConfirm: (filterList) => {
                                     let conditionItem = {
                                         logic: "field",