bri-components 1.3.6 → 1.3.8

package/package.json

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

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

@@ -13,7 +13,6 @@
             @confirm="confirmCb"
         >
             <dsh-control-input
-                v-if="!['simple'].includes(showType)"
                 :class="commonClass"
                 :value="curValName"
                 :disabled="inputPropsObj._disabled"

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

@@ -116,16 +116,20 @@ export default {
             return loop(this.originData, this.cascaderLevel, undefined, this.cascaderFilterVals, this.isMobile);
         },
         cascaderData () {
-            const loop = (arr = []) => {
+            const loop = (arr = [], isMobile) => {
                 return arr
                     ? arr.reduce((arr, item) => {
                         if (item.rm !== 1) {
-                            if (item.children && item.children.length) {
-                                item.children = loop(item.children);
+                            let newItem = {
+                                ...item
+                            };
+
+                            if (newItem.children && newItem.children.length) {
+                                newItem.children = loop(newItem.children, isMobile);
                             } else {
-                                item.children = this.isMobile ? undefined : [];
+                                newItem.children = isMobile ? undefined : [];
                             }
-                            arr.push(item);
+                            arr.push(newItem);
                         }
 
                         return arr;
@@ -133,7 +137,7 @@ export default {
                     : [];
             };
 
-            return loop(this.cascaderAllData);
+            return loop(this.cascaderAllData, this.isMobile);
         },
 
         curValObj () {

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

@@ -250,6 +250,7 @@
             // 回调- 导入成功
             importCb (data) {
                 this.value[this.controlKey] = data;
+                this.change(data);
             },
 
             // 校验方法 -供外部使用

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

@@ -290,7 +290,9 @@
             highSearch () {
                 return this.isOnSearch ? true : this.selfPropsObj._highSearch;
             },
-
+            isCompAdmin () {
+                return (JSON.parse(sessionStorage.getItem("userData")) || {}).isCompAdmin || this.selfPropsObj._isCompAdmin;
+            },
             curCheckAll () {
                 return this.userList.length && this.userList.every(userItem =>
                     this.newValList.some(newItem => newItem._key === userItem._key)
@@ -340,6 +342,8 @@
                 if (departmentItem._key === "_highSearch") {
                     this.userList = this.hightUsers;
                     this.total = 1;
+                } else if (departmentItem._key === "_resign") {
+                    this.getResignListData();
                 } else {
                     this.getUserListData();
                 }
@@ -412,6 +416,35 @@
                     }
                 });
             },
+            getResignListData () {
+                this.userList = [];
+
+                this.$https({
+                    url: {
+                        module: "company",
+                        name: "userResign"
+                    },
+                    params: {
+                        search: {
+                            realname: this.searchData.name
+                                ? {
+                                    $regex: `.*${this.$speciaWord(this.searchData.name)}.*`,
+                                    $options: "i"
+                                }
+                                : undefined
+                        },
+                        pagination: {
+                            page: this.pagePropsObj.page,
+                            pagesize: this.pagePropsObj.pagesize
+                        }
+                    },
+                    loadingName: "loading",
+                    callback: data => {
+                        this.userList = data.list;
+                        this.total = data.total;
+                    }
+                });
+            },
             getDepartmentListData () {
                 this.$https({
                     url: {
@@ -435,6 +468,18 @@
                                     ]
                                     : []
                             ),
+                            ...(
+                                this.highSearch && this.isCompAdmin
+                                    ? [
+                                        {
+                                            is_leaf: true,
+                                            level: 1,
+                                            name: "离职人员",
+                                            _key: "_resign"
+                                        }
+                                    ]
+                                    : []
+                            ),
                             {
                                 is_leaf: true,
                                 level: 1,

package/src/components/form/DshForm.vue

@@ -170,7 +170,7 @@
                     "users", "departments", "labels", "flatTable", "reference", "referenceBy"
                 ],
                 ignoreProperties: [
-                    "_name", "_key", "_default", "_required", "_span", "_br", "_line", "_noLabel", "_clearable", "",
+                    "_name", "_key", "_default", "_required", "_span", "_br", "_line", "_noLabel", "_clearable",
                     "_disabledBtns", "_disabledOldDataRow"
                 ],
                 subIgnoreProperties: [
@@ -305,7 +305,7 @@
                     Object.entries({
                         ...formData,
                         _displayType: "show",
-                        canEdit: true
+                        canEdit: !["createdAt", "updatedAt", "_creaters"].includes(formData._key)
                     }).forEach(arr => {
                         !this.ignoreProperties.includes(arr[0]) && (formData.__parentKey__ ? !this.subIgnoreProperties.includes(arr[0]) : true) &&
                             this.$set(formItem, arr[0], arr[1]);

package/src/components/list/BriFlatTable.vue

@@ -13,7 +13,7 @@
         <!-- 添加行 -->
         <dsh-buttons
             class="BriFlatTable-create"
-            :list="$getOperationList(['create'])"
+            :list="$getOperationList(['canCreate'])"
             @click="$dispatchEvent($event, null, null, listData)"
         ></dsh-buttons>
     </div>
@@ -112,16 +112,19 @@
                 return {
                     isShare: false, // 是否是分享页在用
 
-                    _contentHeight: 500,
+                    _showRequired: true, // 表头显示校验符号*
+                    _showDescription: true, // 表头显示提示
+                    _headHeightAuto: false, // 表头高度自适应
+                    _heightAuto: false, // 单元格高度自适应
                     _useSelection: false, // 使用选择列
                     _useIndex: true, // 使用序号列
                     _useSummary: false, // 使用汇总行
                     _disabledBtns: false, // 禁用增删按钮
                     _disabledCreateBtn: false, // 置灰新增按钮，目前只内部使用，comp_web数据表配置页那块
                     _disabledOldDataRow: false, // 置灰老数据行包含删除
-                    _heightAuto: false, // 单元格内容高度自适应
+                    ...this.propsObj,
 
-                    ...this.propsObj
+                    _contentHeight: this.propsObj._contentHeight || 500 // 表格最大高度
                 };
             },
             isShare () {
@@ -130,6 +133,18 @@
             contentHeight () {
                 return this.selfPropsObj._contentHeight;
             },
+            showRequired () {
+                return this.selfPropsObj._showRequired;
+            },
+            showDescription () {
+                return this.selfPropsObj._showDescription;
+            },
+            headHeightAuto () {
+                return this.selfPropsObj._headHeightAuto;
+            },
+            heightAuto () {
+                return this.selfPropsObj._heightAuto;
+            },
             useSelection () {
                 return this.selfPropsObj._useSelection;
             },
@@ -148,15 +163,12 @@
             disabledOldDataRow () {
                 return this.selfPropsObj._disabledOldDataRow;
             },
-            heightAuto () {
-                return this.selfPropsObj._heightAuto;
-            },
 
             useCampare () {
                 return !!this.oldListData.length;
             },
             filterColumns () {
-                return this.columns.filter(colItem => this.$isAdvRelyShow(colItem, this.outObj));
+                return this.columns.filter(colItem => this.$isAdvRelyShow(colItem, this.outObj, true));
             },
             showColumns () {
                 const operationList = this.$getOperationList(["delete"]);
@@ -192,95 +204,70 @@
                             : []
                     ),
 
-                    ...this.$transformToColumns(this.filterColumns.map(item => ({
-                        filter: undefined,
-                        sortBy: undefined,
-                        renderBodyCell: ({ row, column, rowIndex }, h) => {
-                            return [
-                                this.isShowCompare(column, row, this.oldListData[rowIndex])
-                                    ? h("Tooltip", {
-                                        class: "td-inner-compare",
-                                        props: {
-                                            content: this.$isEmptyData(this.oldListData[rowIndex][column._key])
-                                                ? ""
-                                                : this.oldListData[rowIndex][column._key],
-                                            transfer: true,
-                                            maxWidth: 200,
-                                            placement: "top"
-                                        },
-                                        scopedSlots: {
-                                            default: props => h("dsh-list-unit", {
-                                                props: {
-                                                    canEdit: this.getUnitCanEdit(column, row),
-                                                    formData: row,
-                                                    formItem: this.resetCol(item),
-                                                    rowIndex: rowIndex,
-                                                    parentData: this.listData
-                                                },
-                                                on: {
-                                                    blur: () => this.controlBlur(null, column, row, arguments),
-                                                    change: () => this.$dispatchEvent(this.operationMap.changeVal, column, row, rowIndex, arguments)
-                                                }
-                                            })
-                                        }
-                                    })
-                                    : h("dsh-list-unit", {
-                                        props: {
-                                            canEdit: this.getUnitCanEdit(column, row),
-                                            formData: row,
-                                            formItem: this.resetCol(item),
-                                            rowIndex: rowIndex,
-                                            parentData: this.listData
-                                        },
-                                        on: {
-                                            blur: () => this.controlBlur(null, column, row, arguments),
-                                            change: () => this.$dispatchEvent(this.operationMap.changeVal, column, row, rowIndex, arguments)
-                                        }
-                                    }),
-
-                                !this.getRuleResult(column, row).bool
-                                    ? h("span", {
-                                        class: "table-row-td-tip"
-                                    }, this.getRuleResult(column, row).message)
-                                    : undefined
-                            ];
-                        },
-                        renderHeaderCell: ({ column }, h) => {
-                            return h("span", {
-                                style: {
-                                    position: "relative"
-                                }
-                            }, [
-                                column._required && h("i", {
-                                    style: {
-                                        position: "absolute",
-                                        top: "2px",
-                                        left: "-10px",
-                                        color: "#ed4014"
-                                    }
-                                }, "*"),
-
-                                h("span", column.title),
-
-                                column._description && h("Tooltip", {
-                                    style: {
-                                        display: "inline-block"
-                                    },
-                                    props: {
-                                        content: column._description,
-                                        transfer: true,
-                                        maxWidth: 200
-                                    },
-                                    scopedSlots: {
-                                        default: props => h("i", {
-                                            class: "table-head-description ivu-icon bico-font bico-explain"
+                    ...this.$transformToColumns(
+                        this.filterColumns.map(item => ({
+                            filter: undefined,
+                            sortBy: undefined,
+                            renderBodyCell: ({ row, column, rowIndex }, h) => {
+                                return [
+                                    this.isShowCompare(column, row, this.oldListData[rowIndex])
+                                        ? h("Tooltip", {
+                                            style: {
+                                                width: "100%"
+                                            },
+                                            props: {
+                                                content: this.$isEmptyData(this.oldListData[rowIndex][column._key])
+                                                    ? ""
+                                                    : this.oldListData[rowIndex][column._key],
+                                                transfer: true,
+                                                maxWidth: 200,
+                                                placement: "top"
+                                            },
+                                            scopedSlots: {
+                                                default: props => h("dsh-list-unit", {
+                                                    props: {
+                                                        canEdit: this.getUnitCanEdit(column, row),
+                                                        formData: row,
+                                                        formItem: this.resetCol(item),
+                                                        rowIndex: rowIndex,
+                                                        parentData: this.listData
+                                                    },
+                                                    on: {
+                                                        blur: () => this.controlBlur(null, column, row, arguments),
+                                                        change: () => this.$dispatchEvent(this.operationMap.changeVal, column, row, rowIndex, arguments)
+                                                    }
+                                                })
+                                            }
                                         })
-                                    }
-                                })
-                            ]);
-                        },
-                        ...item
-                    }))),
+                                        : h("dsh-list-unit", {
+                                            props: {
+                                                canEdit: this.getUnitCanEdit(column, row),
+                                                formData: row,
+                                                formItem: this.resetCol(item),
+                                                rowIndex: rowIndex,
+                                                parentData: this.listData
+                                            },
+                                            on: {
+                                                blur: () => this.controlBlur(null, column, row, arguments),
+                                                change: () => this.$dispatchEvent(this.operationMap.changeVal, column, row, rowIndex, arguments)
+                                            }
+                                        }),
+
+                                    !this.getRuleResult(column, row).bool
+                                        ? h("span", {
+                                            class: "bri-table-td-tip"
+                                        }, this.getRuleResult(column, row).message)
+                                        : undefined
+                                ];
+                            },
+                            ...item
+                        })),
+                        {
+                            showRequired: this.showRequired,
+                            showDescription: this.showDescription,
+                            headHeightAuto: this.headHeightAuto
+                        }
+                    ),
 
                     ...(
                         this.canEdit && operationList.length
@@ -316,9 +303,9 @@
             },
             operationMap () {
                 const allOperationMap = {
-                    create: {
+                    canCreate: {
                         name: "添加一行",
-                        type: "create",
+                        type: "canCreate",
                         size: "default",
                         long: true,
                         disabled: !!this.disabledCreateBtn,
@@ -350,7 +337,7 @@
                     ? this.$categoryMapToMap(
                         allOperationMap,
                         null,
-                        this.disabledBtns ? ["create", "delete"] : []
+                        this.disabledBtns ? ["canCreate", "delete"] : []
                     )
                     : {};
             }
@@ -448,81 +435,11 @@
     };
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
     .BriFlatTable {
         &-main {
             width: 100%;
             height: auto;
-
-            .table {
-                width: 100%;
-                border-spacing: 0;
-                border-collapse: collapse;
-                border-color: #E5E5E5;
-                background-color: #fff;
-
-                &-head {
-                    background-color: #f0f0f0;
-                    color: #666;
-
-                    &-description {
-                        color: #828499;
-                    }
-                }
-
-                &-row {
-                    height: 50px;
-
-                    &:hover {
-                        .table-row-td-add {
-                            display: inline-block;
-                        }
-                    }
-
-                    &-td {
-                        position: relative;
-
-                        .td-inner {
-                            &-compare {
-                                width: 100%;
-                            }
-                        }
-
-                        &-tip {
-                            padding: 2px 5px 0px 20px;
-                            font-size: 12px;
-                            line-height: 1;
-                            color: #ed4014;
-                            position: absolute;
-                            top: calc(100% -15px);
-                            left: 0px;
-                        }
-
-                        &-add {
-                            line-height: 20px;
-                            position: absolute;
-                            bottom: 0px;
-                            right: 0px;
-                            display: none;
-                        }
-                    }
-
-                    &-nodata {
-                        width: 100%;
-                        height: 40px;
-                        text-align: center;
-                    }
-                }
-
-                tbody {
-                    // display: block;
-                    // overflow-y: scroll;
-                }
-
-                thead {
-                    // display: block;
-                }
-            }
         }
 
         &-create {

package/src/components/list/DshBox/DshList.vue

@@ -280,3 +280,125 @@
         }
     };
 </script>
+
+<style lang="less">
+    .DshList {
+        @height:44px;
+
+        .list {
+            &-loading {
+                margin-top: 120px;
+            }
+
+            &-cols,
+            &-rows {
+                position: relative;
+
+                &-left {
+                    width: 48px;
+                    text-align: center;
+                    position: absolute;
+                    left: 0;
+                    top: 0;
+
+                    label {
+                        display: inline-block;
+                        height: 36px;
+                        padding: 9px 5px;
+                        margin: 0px;
+                        line-height: 18px;
+                    }
+                }
+
+                .row {
+                    width: 100%;
+                    line-height: 20px;
+                    display: flex;
+                    justify-content: space-between;
+
+                    &-item {
+                        min-width: 120px;
+                        height: 100%;
+                        padding: 0 16px;
+                        font-size: 14px;
+                        align-items: center;
+                    }
+                }
+            }
+
+            &-cols {
+                height: @height;
+                background: #f0f0f0;
+
+                &-left {}
+                &-right {
+
+                }
+
+                .row {
+                    font-weight: 700;
+
+                    &-item {
+                        padding: 10px 16px;
+                        border-top: 1px #e5e5e5 solid;
+                        border-bottom: 1px #f0f0f0 solid;
+                        border-left: 1px #e5e5e5 solid;
+                        background: #f0f0f0;
+
+                        &:last-child{
+                        border-right: 1px #e5e5e5 solid;
+                        }
+
+                        &-inner {
+                            .dsh-ellipsis{
+                                font-size: 14px;
+                                color: #666;
+                                font-weight: 700;
+                                line-height: 24px;
+                            }
+                        }
+                    }
+                }
+            }
+
+            &-rows {
+                &-left {
+                    label {
+                        height: 44px;
+                        line-height: 20px;
+                    }
+                }
+
+                &-right {}
+
+                .row {
+                    height: 44px;
+                    line-height: 20px;
+                    cursor: pointer;
+
+                    &-item {
+                        display: flex;
+                        border: 1px solid #E5E5E5;
+                        border-width: 0 0 1px 1px;
+
+                        &:last-child {
+                            border-width: 0 1px 1px 1px;
+                        }
+
+                        &-inner {
+                            width: 100%;
+                            font-size: 14px;
+                            color: #333;
+                            font-weight: 400;
+                            line-height: 24px;
+                        }
+                    }
+                }
+            }
+
+            &-nodata {
+                #dsh-nodata();
+            }
+        }
+    }
+</style>

package/src/components/list/DshBox/DshTable.vue

@@ -128,8 +128,8 @@
                                             // 漏在外部按钮的宽度
                                             this.selfOperationList
                                                 .slice(0, this.selfOperationList.length > maxBtnNum ? maxBtnNum - 1 : this.selfOperationList.length)
-                                                .reduce((total, operationItem) => total + operationItem.width + 16, 0) +
-                                                (this.selfOperationList.length > maxBtnNum ? 69 : 0) + // 出现更多按钮的宽度
+                                                .reduce((total, operationItem) => total + operationItem.width + 9, 0) +
+                                                (this.selfOperationList.length > maxBtnNum ? 70 : 0) + // 出现更多按钮的宽度
                                                 (this.selfOperationList.length > 0 ? 40 : 0) + // 操作列的padding
                                                 4 // 留出4px空间，避免麻烦问题
                                             , 80
@@ -148,11 +148,11 @@
 
                                             // TODO: 注意此处totalOperationList用的一定是表格行显示最多的操作按钮数组，有改动注意看此备注！！！
                                             return h("dsh-buttons", {
+                                                class: "bri-table-td-operation",
                                                 props: {
-                                                    class: "table-operation",
                                                     list: totalOperationList,
                                                     maxFlatNum: maxBtnNum - 1,
-                                                    itemClass: "table-operation-btn"
+                                                    itemClass: "bri-table-td-operation-btn"
                                                 },
                                                 on: {
                                                     click: (operationItem) => {
@@ -202,3 +202,10 @@
         }
     };
 </script>
+
+<style lang="less" scoped>
+    .DshTable {
+        width: 100%;
+        height: 100%;
+    }
+</style>