bri-components 1.3.16 → 1.3.18

package/package.json

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

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

@@ -27,7 +27,7 @@
                         :columns="columns"
                         :data="curVal.list"
                         :rowDefault="curVal.rowDefault"
-                        :outObj="value"
+                        :parentObj="value"
                         :propsObj="propsObj"
                         @change="change"
                     ></bri-flat-table>
@@ -50,7 +50,7 @@
                         :data="curVal.list"
                         :oldData="curVal.oldList"
                         :rowDefault="curVal.rowDefault"
-                        :outObj="value"
+                        :parentObj="value"
                         :propsObj="propsObj"
                         @change="change"
                     ></bri-flat-table>
@@ -67,7 +67,7 @@
                             :data="curVal.list"
                             :oldData="curVal.oldList"
                             :rowDefault="curVal.rowDefault"
-                            :outObj="value"
+                            :parentObj="value"
                             :propsObj="propsObj"
                             @change="change"
                         ></bri-flat-table>

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

@@ -294,7 +294,7 @@
                 return this.selfPropsObj._reverseFilter;
             },
             // 禁止显示的部门以及部门下人员
-            userDepartFilterVals () {
+            listFilterVals () {
                 return this.selfPropsObj._userDepartFilterVals || [];
             },
             highSearch () {
@@ -421,11 +421,13 @@
                     },
                     loadingName: "loading",
                     callback: data => {
-                        this.userList = data.list.filter(item =>
-                            this.reverseFilter
-                                ? !this.userDepartFilterVals.includes(item.departmentKey)
-                                : !this.userDepartFilterVals.length || this.userDepartFilterVals.includes(item.departmentKey)
-                        );
+                        this.userList = this.listFilterVals.length
+                            ? data.list.filter(item =>
+                                this.reverseFilter
+                                    ? !this.listFilterVals.includes(item.departmentKey)
+                                    : this.listFilterVals.includes(item.departmentKey)
+                            )
+                            : data.list;
                         this.total = data.total;
                     }
                 });
@@ -500,10 +502,14 @@
                                 name: "全部",
                                 _key: ""
                             },
-                            ...data.list.filter(item =>
-                                this.reverseFilter
-                                    ? !this.userDepartFilterVals.includes(item._key)
-                                    : !this.userDepartFilterVals.length || this.userDepartFilterVals.includes(item._key)
+                            ...(
+                                this.listFilterVals.length
+                                    ? data.list.filter(item =>
+                                        this.reverseFilter
+                                            ? !this.listFilterVals.includes(item._key)
+                                            : this.listFilterVals.includes(item._key)
+                                    )
+                                    : data.list
                             )
                         ];
                     }

package/src/components/form/DshAdvSearch.vue

@@ -1,10 +1,10 @@
 <template>
     <div class="DshAdvSearch">
-        <!-- 无可筛选字段 -->
+        <!-- 有可选择字段 -->
         <template v-if="canSearchFormList.length">
-            <!-- 筛选逻辑 -->
+            <!-- 逻辑 -->
             <div class="DshAdvSearch-logic">
-                <div class="DshAdvSearch-logic-title">筛选逻辑</div>
+                <div class="DshAdvSearch-logic-title">{{ logicStr }}</div>
                 <dsh-select
                     class="DshAdvSearch-logic-option"
                     :value="advSearchObj"
@@ -13,8 +13,8 @@
                 ></dsh-select>
             </div>
 
-            <!-- 筛选条件 -->
-            <div class="DshAdvSearch-title">筛选条件</div>
+            <!-- 条件 -->
+            <div class="DshAdvSearch-title">{{ conditionStr }}</div>
             <div class="DshAdvSearch-conditions">
                 <template v-for="(conditionItem, conditionIndex) in advSearchObj.conditions">
                     <!-- 'and', 'or' 循环模式 -->
@@ -90,7 +90,7 @@
 
                                 <!-- 其它条件 -->
                                 <template v-else>
-                                    <!-- 动态文本 -匹配的动态筛选字段 -->
+                                    <!-- 动态文本 -匹配的动态字段 -->
                                     <template v-if="conditionItem.parameterType === 'dynamicText'">
                                         <dsh-select
                                             v-if="useChainField"
@@ -117,7 +117,7 @@
                                         ></dsh-checkbox>
                                     </template>
 
-                                    <!-- 固定文本 -筛选条件对应的显示 -->
+                                    <!-- 固定文本 -->
                                 </template>
                             </slot>
                         </template>
@@ -147,7 +147,7 @@
                                 </span>
                             </dsh-dropdown>
 
-                            <!-- operators 筛选条件 -->
+                            <!-- operators 操作类型 -->
                             <dsh-dropdown
                                 v-if="conditionItem.operators.length"
                                 class="extra-operator"
@@ -195,7 +195,7 @@
 
             <!-- 按钮s -->
             <div class="DshAdvSearch-btns">
-                <!-- 添加筛选项 -->
+                <!-- 添加条件项 -->
                 <dsh-dropdown
                     class="DshAdvSearch-btns-field"
                     menuClass="DshAdvSearch-btns-field-list"
@@ -219,7 +219,7 @@
             </div>
         </template>
 
-        <!-- 无可筛选字段 -->
+        <!-- 无可选择字段 -->
         <div
             v-else
             :class="{
@@ -227,7 +227,7 @@
                 'DshAdvSearch-nodata-small': isInner
             }"
         >
-            当前无可筛选的字段
+            {{ noFormListStr }}
         </div>
     </div>
 </template>
@@ -250,6 +250,10 @@
                     return ["default", "set"].includes(val);
                 }
             },
+            themeWord: {
+                type: String,
+                default: "筛选"
+            },
             useLoop: {
                 type: Boolean,
                 default: true
@@ -261,9 +265,20 @@
         },
         data () {
             return {
+                selfLogicPropsObj: {
+                    _name: `添加${this.themeWord}逻辑`,
+                    _key: "logic",
+                    _optionKind: "flat",
+                    _clearable: false,
+                    _data: [
+                        { _key: "and", name: "且" },
+                        { _key: "or", name: "或" }
+                    ]
+                },
+
                 allOperationMap: {
                     createCondition: {
-                        name: "添加筛选条件",
+                        name: `添加${this.themeWord}条件`,
                         type: "createCondition",
                         icon: "md-add",
                         size: this.isInner ? "small" : "default",
@@ -271,7 +286,7 @@
                         event: "createCondition"
                     },
                     createLoopContion: {
-                        name: "添加筛选层",
+                        name: `添加${this.themeWord === "筛选" ? this.themeWord : "逻辑"}层`,
                         type: "createLoopContion",
                         icon: "md-add",
                         size: this.isInner ? "small" : "default",
@@ -279,19 +294,19 @@
                         event: "createCondition"
                     },
                     deleteCondition: {
-                        name: "删除筛选条件",
+                        name: `删除${this.themeWord}条件`,
                         type: "deleteCondition",
                         customIcon: "bico-delete",
                         size: "16",
                         event: "deleteCondition"
                     },
                     selectOperator: {
-                        name: "选择筛选类型",
+                        name: `选择${this.themeWord}类型`,
                         type: "selectOperator",
                         event: "changeOperator"
                     },
                     selectParameterType: {
-                        name: "选择筛选方式",
+                        name: `选择${this.themeWord}方式`,
                         type: "selectParameterType",
                         event: "changeParameterType"
                     }
@@ -299,6 +314,16 @@
             };
         },
         computed: {
+            logicStr () {
+                return `${this.themeWord}逻辑`;
+            },
+            conditionStr () {
+                return `${this.themeWord}条件`;
+            },
+            noFormListStr () {
+                return "当前无可选择的字段";
+            },
+
             operationMap () {
                 return this.$categoryMapToMap(
                     this.allOperationMap,

package/src/components/form/DshDefaultSearch.vue

@@ -1,6 +1,5 @@
 <template>
     <div class="DshDefaultSearch">
-        <!-- 筛选表单 -->
         <div
             class="DshDefaultSearch-form"
             :style="{
@@ -86,6 +85,8 @@
         },
         data () {
             return {
+                isSimpleSearch: true,
+
                 conditionList: [],
                 isSpreadStatus: false, // 是否展开
 

package/src/components/form/searchMixin.js

@@ -46,16 +46,6 @@ export default {
                 logic: "and",
                 conditions: []
             },
-            selfLogicPropsObj: {
-                _name: "筛选逻辑",
-                _key: "logic",
-                _optionKind: "flat",
-                _clearable: false,
-                _data: [
-                    { _key: "and", name: "且" },
-                    { _key: "or", name: "或" }
-                ]
-            },
             parameterPropsObj: {
                 _name: "参数类型",
                 _key: "parameterType",
@@ -94,7 +84,7 @@ export default {
             });
         },
 
-        // 新增筛选条件
+        // 新增条件项
         createCondition (operationItem, isLoop, formItem, list) {
             const newConditionItem = this.createContionFunc({ logic: isLoop ? "and" : "field" }, formItem);
             this.dealSubSearch(newConditionItem);
@@ -102,7 +92,7 @@ export default {
 
             this.change(operationItem.type, newConditionItem);
         },
-        // 删除筛选条件
+        // 删除条件项
         deleteCondition (operationItem, conditionItem, conditionIndex, list) {
             list.splice(conditionIndex, 1);
 
@@ -118,7 +108,7 @@ export default {
 
             this.change(operationItem.type, conditionItem);
         },
-        // 选择某控件的筛选类型
+        // 选择某控件的操作类型
         changeOperator (operationItem, conditionItem, conditionIndex, list, optionItem) {
             if (optionItem._key !== conditionItem.fieldOperator) {
                 conditionItem.fieldOperator = optionItem._key;
@@ -165,7 +155,7 @@ export default {
         },
 
         /* -------- 方法 ----------- */
-        // 生成筛选条件的值
+        // 生成条件项的值
         createContionFunc (initContion = { logic: "field" }, curFormItem, fieldKey) {
             if (["field", undefined].includes(initContion.logic)) {
                 curFormItem = curFormItem || this.canSearchFormList.find(formItem => formItem._key === fieldKey);
@@ -191,10 +181,12 @@ export default {
                     const parameterTypeName = (this.parameterPropsObj._data.find(parameterTypeItem => parameterTypeItem._key === parameterType) || { name: `${parameterType}不存在` }).name;
 
                     const operators = fieldData[!dynamicList.length && ["set"].includes(this.mode) ? "operatorsSet" : "operators"] || fieldData.operators || [];
-                    const fieldOperator = initContion.fieldOperator || (
-                        ["reference"].includes(fieldType) && !["set"].includes(this.mode)
-                            ? "eq"
-                            : (operators[0] || {})._key
+                    const fieldOperator = ["_id"].includes(curFormItem._key)
+                        ? "eq"
+                        : initContion.fieldOperator || (
+                            ["reference"].includes(fieldType) && this.isSimpleSearch
+                                ? "eq"
+                                : (operators[0] || {})._key
                     );
                     const fieldOperatorName = (operators.find(operatorItem => operatorItem._key === fieldOperator) || { name: `${fieldOperator}不存在` }).name;
 
@@ -227,7 +219,7 @@ export default {
                     return {
                         _id: this.$ObjectID().str,
                         ...initContion,
-                        __isDelete__: true, // 前端用它标识对应字段已被删除的筛选项
+                        __isDelete__: true, // 前端用它标识对应字段已被删除的条件项
                         formItem: {
                             __realKey__: initContion.fieldKey
                         }
@@ -345,7 +337,7 @@ export default {
                                             : item[key]
                                 )
                                 : item[key]
-                        }), {})
+                    }), {})
                 );
             };
 

package/src/components/list/BriFlatTable.vue

@@ -57,7 +57,7 @@
                 }
             },
 
-            outObj: {
+            parentObj: {
                 type: Object,
                 default () {
                     return {};
@@ -181,7 +181,11 @@
                 return !!this.oldListData.length;
             },
             filterColumns () {
-                return this.columns.filter(colItem => this.$isAdvRelyShow(colItem, this.outObj, true));
+                return this.columns.filter(column => {
+                    return column._isRelyParent
+                        ? this.$isFormItemShow(column, this.parentObj, true)
+                        : !["hide"].includes(column._displayType);
+                });
             },
             showColumns () {
                 const operationList = this.$getOperationList(["delete"]);
@@ -218,10 +222,12 @@
                     ),
 
                     ...this.$transformToColumns(
-                        this.filterColumns.map(item => ({
+                        this.filterColumns.map(colItem => ({
                             filter: undefined,
                             sortBy: undefined,
                             renderBodyCell: ({ row, column, rowIndex }, h) => {
+                                column = this.$transformFieldProperty(column, row);
+
                                 return [
                                     this.isShowCompare(column, row, this.oldListData[rowIndex])
                                         ? h("Tooltip", {
@@ -241,7 +247,7 @@
                                                     props: {
                                                         canEdit: this.getUnitCanEdit(column, row),
                                                         formData: row,
-                                                        formItem: this.resetCol(item),
+                                                        formItem: this.resetCol(column, row),
                                                         rowIndex: rowIndex,
                                                         parentData: this.listData,
                                                         allFormList: this.columns
@@ -257,7 +263,7 @@
                                             props: {
                                                 canEdit: this.getUnitCanEdit(column, row),
                                                 formData: row,
-                                                formItem: this.resetCol(item),
+                                                formItem: this.resetCol(column, row),
                                                 rowIndex: rowIndex,
                                                 parentData: this.listData,
                                                 allFormList: this.columns
@@ -275,7 +281,7 @@
                                         : undefined
                                 ];
                             },
-                            ...item
+                            ...colItem
                         })),
                         {
                             showRequired: this.showRequired,
@@ -363,8 +369,11 @@
             validate () {
                 this.showRuleMessage = true;
 
-                return this.listData.every(dataItem =>
-                    this.filterColumns.every(col => this.getRuleResult(col, dataItem).bool)
+                return this.listData.every(row =>
+                    this.filterColumns.every(column => {
+                        column = this.$transformFieldProperty(column, row);
+                        return this.getRuleResult(column, row).bool;
+                    })
                 );
             },
             // 点击 -添加行
@@ -409,7 +418,7 @@
             },
 
             /* --------------- 工具方法 ------------- */
-            resetCol (col) {
+            resetCol (col, row) {
                 let resetMap = {
                     select: {
                         _optionKind: "dropdown"
@@ -421,15 +430,17 @@
                 return {
                     ...col,
                     ...(resetMap[col._type] || {}),
-                    _heightAuto: this.heightAuto,
-                    isShare: this.isShare
+                    isShare: this.isShare,
+                    _heightAuto: this.heightAuto
+                    // canEdit: this.$isAdvRelyShow(col, row, true)
                 };
             },
             getUnitCanEdit (col, row) {
                 return this.canEdit && // 是否是编辑状态
                     // (!this.disabledOldDataRow || !!this.createRowMap[row._id]) && // 是否让老数据行置灰
                     (!this.disabledOldDataRow || !!row.__isCreate__) && // 是否让老数据行置灰
-                (!col.dependRowCanEdit || row.canEdit !== false); // 在老数据行里某些列不可编辑
+                    (!col.dependRowCanEdit || row.canEdit !== false) &&
+                    this.$isAdvRelyShow(col, row, true); // 在老数据行里某些列不可编辑; // 在老数据行里某些列不可编辑
             },
             isShowCompare (col, row, oldRow = {}) {
                 return this.useCampare && ["number"].includes(col._type) &&

package/src/components/other/BriGantt.vue

@@ -186,7 +186,10 @@
                                                         background:$getColor(timeItem.style.background),
                                                         minWidth: minTdWidth,
                                                         border: `1px solid ${timeItem.style.background}`,
-                                                        padding: timeItem.task.progressField == 100 ? '' : '1px'}"
+                                                        padding: timeItem.task.progressField == 100 ? '' : '1px',
+                                                        cursor: canClick ? 'pointer' : ''
+                                                    }"
+                                                    @click="clickRow(timeItem)"
                                                 >
                                                     <slot
                                                         name="chartCenter"
@@ -412,6 +415,10 @@
             step: {
                 type: Number,
                 default: 1
+            },
+            canClick: {
+                type: Boolean,
+                default: false
             }
         },
         computed: {
@@ -770,6 +777,10 @@
                         speedTarget += speed;
                     }
                 }, 10);
+            },
+            // 行点击
+            clickRow (col) {
+                this.canClick && this.$emit("clickRow", col.task, col);
             }
         },
         filters: {

package/src/styles/components/other/BriGantt.less

@@ -8,6 +8,7 @@
     display: flex;
     overflow: auto;
     flex-direction: column;
+
     &-top {
         display: flex;
         height: 100%;
@@ -15,6 +16,7 @@
         justify-content: space-between;
         position: absolute;
     }
+
     &-bottom {
         width: 100%;
         overflow: auto;
@@ -22,6 +24,7 @@
         flex-direction: column;
         margin-top: 38px;
         background: @white;
+
         &-title {
             text-align: center;
             border: 1px solid #EDEDED;
@@ -29,21 +32,25 @@
             line-height: 27px;
             // margin: 10px 14px 0 14px;
         }
+
         &-content {
             flex: 1;
             display: flex;
             overflow: auto;
         }
     }
+
     // 表格渲染
     &-tableBox {
-       width:100%;
-       text-align:center;
-       border-collapse:collapse;
-       border-spacing:0;
-       td, th {
+        width: 100%;
+        text-align: center;
+        border-collapse: collapse;
+        border-spacing: 0;
+
+        td,
+        th {
             word-break: break-all;
-            word-wrap:break-word;
+            word-wrap: break-word;
             min-width: 50px;
             height: 29px;
             text-align: center;
@@ -52,66 +59,82 @@
             text-overflow: ellipsis;
             max-width: 200px;
         }
+
         .briGantt-chart-td {
             height: 40px;
         }
-        .briGantt-table-th-now{
+
+        .briGantt-table-th-now {
             color: @themeColor;
         }
     }
+
     &-table {
         &-tr {
             border: 1px solid #EDEDED;
         }
+
         &-tr:nth-child(2n) {
-            background: rgba(244,246,249,0.5119);
+            background: rgba(244, 246, 249, 0.5119);
         }
+
         &-th {
             background: #F4F8FF;
-            font-weight:400;
-            color:rgba(101,101,101,1);
+            font-weight: 400;
+            color: rgba(101, 101, 101, 1);
         }
+
         &-td {
             border-right: 1px solid #EDEDED;
-            font-weight:400;
-            color:rgba(111,111,111,1);
+            font-weight: 400;
+            color: rgba(111, 111, 111, 1);
+
             &-main {
                 height: 28px;
-                background:rgba(238,238,238,0.5);
-                border:1px solid #f6f6f6;
+                background: rgba(238, 238, 238, 0.5);
+                border: 1px solid #f6f6f6;
             }
         }
+
         &-td:last-of-type {
             border: none;
         }
     }
+
     &-chart {
         &-td {
             overflow: visible;
+
             &-greyLine {
                 border-top: 1px dashed #D5D5D5;
             }
+
             &-main {
                 display: flex;
                 width: 100%;
                 height: 100%;
                 align-items: center;
                 justify-content: center;
-                &-left, &-right {
+
+                &-left,
+                &-right {
                     height: 100%;
                     overflow: hidden;
                 }
+
                 &-right-auto {
                     height: 100%;
                     overflow: hidden;
                     flex: 1;
                 }
+
                 &-center {
                     height: 30px;
                     border-radius: 4px;
                     background: #f6f6f6;
                     z-index: 1;
                     min-width: 2px;
+
                     .ms-ellipsis {
                         border-radius: 4px;
                         height: 100%;
@@ -122,8 +145,10 @@
                         text-overflow: ellipsis;
                         overflow: hidden;
                     }
+
                     &-tooltip {
                         white-space: normal;
+
                         &-select {
                             height: 5px;
                             display: inline-block;
@@ -133,11 +158,12 @@
                         }
                     }
                 }
+
                 &-line {
                     width: 100%;
                     border-bottom: 1px solid #D5D5D5;
-                    font-weight:400;
-                    color:rgba(74,74,74,1);
+                    font-weight: 400;
+                    color: rgba(74, 74, 74, 1);
                     padding: 0 10px;
                     transform: translateY(15px);
                     text-align: left;
@@ -146,11 +172,13 @@
                     white-space: nowrap;
                     text-overflow: ellipsis;
                     overflow: hidden;
+
                     &-circle {
                         display: block;
                         width: 10px;
                         height: 100%;
                         min-width: 10px;
+
                         .circle {
                             display: block;
                             width: 10px;
@@ -161,15 +189,19 @@
                             background: #D5D5D5;
                         }
                     }
-                };
+                }
+
+                ;
             }
         }
     }
+
     // 蓝色虚线
     &-line-now {
         z-index: 9;
         text-align: center;
         background: transparent;
+
         &::before {
             content: "";
             border-left: 1px dashed @themeColor;
@@ -178,6 +210,7 @@
             bottom: 0px;
             z-index: 9;
         }
+
         &::after {
             content: "";
             width: 6px;
@@ -189,18 +222,21 @@
             margin-left: -3px;
         }
     }
+
     // 时间轴
     &-timer {
         align-items: center;
         position: relative;
         float: right;
         overflow: hidden;
+
         &-main {
             overflow: auto;
             flex: 1;
             height: 100%;
             position: relative;
         }
+
         &-bg {
             position: absolute;
             background: #F4F8FF;
@@ -209,6 +245,7 @@
             height: 28px;
             border-radius: 28px;
         }
+
         &-icon {
             background: #F4F8FF;
             color: #fff;
@@ -222,6 +259,11 @@
             z-index: 2;
             top: 0px;
             background: #F2F8FF;
+
+            &:hover {
+                color: #fff;
+            }
+
             i {
                 display: block;
                 width: 16px;
@@ -233,11 +275,13 @@
                 align-items: center;
                 justify-content: center;
             }
+
             &-left {
                 left: -1px;
                 border-top-left-radius: 28px;
                 border-bottom-left-radius: 28px;
             }
+
             &-right {
                 right: -1px;
                 border-top-right-radius: 28px;
@@ -245,20 +289,22 @@
             }
         }
     }
+
     // 区域映射
     &-data {
         flex: 1;
         overflow: auto;
         position: relative;
-        &-table {
-        }
-        &-chart {
-        }
+
+        &-table {}
+
+        &-chart {}
+
         &::-webkit-scrollbar {
             height: 0px;
         }
     }
-    
+
     // table 列表映射
     &-tabledata {
         overflow-y: auto;