bri-components 1.2.2 → 1.2.4

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

@@ -17,32 +17,37 @@
                 @mouseleave="isHover = false"
                 @click="clickInput"
             >
+                <!-- 有值 -->
                 <template v-if="!$isEmptyData(curValList)">
                     <dsh-tags
                         class="text"
                         :list="curValList"
                         :propsObj="{
-                            disabled: !finalCanEdit
+                            disabled: !finalCanEdit,
+                            closable: true
                         }"
                         @delete="clickDeleteItem"
                     ></dsh-tags>
+                </template>
+                <!-- 无值 -->
+                <template v-else>
+                    {{ emptyShowVal }}
+                </template>
 
+                <!-- 图标 -->
+                <template>
                     <Icon
-                        v-if="selfPropsObj._clearable && isHover"
+                        v-if="!$isEmptyData(curValList) && selfPropsObj._clearable && isHover"
                         class="icon-close"
-                        type="md-close"
+                        type="ios-close-circle"
                         @click.stop="clickClear"
                     />
                     <Icon
                         v-else
                         class="icon-default"
-                        :type="`${multiple ? 'ios-people' : 'ios-person'}`"
+                        :type="inputIcon"
                     />
                 </template>
-
-                <template v-else>
-                    {{ emptyShowVal }}
-                </template>
             </div>
 
             <!-- 查看模式 -->
@@ -57,9 +62,6 @@
                     v-if="!$isEmptyData(curValList)"
                     class="text"
                     :list="curValList"
-                    :propsObj="{
-                        closable: false
-                    }"
                 ></dsh-tags>
 
                 <template v-else>
@@ -93,7 +95,7 @@
                         </span>
                         <Icon
                             class="item-delete"
-                            type="md-close"
+                            type="ios-close-circle"
                             @click="deleteSelect(selectItem, selectIndex, newValList)"
                         />
                     </span>
@@ -246,6 +248,10 @@
             highSearch () {
                 return this.selfPropsObj._highSearch;
             },
+            inputIcon () {
+                return this.multiple ? "ios-people" : "ios-person";
+            },
+
             // 暂时没配置
             isCascader () {
                 return this.selfPropsObj._isCascader;

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

@@ -17,32 +17,37 @@
                 @mouseleave="isHover = false"
                 @click="clickInput"
             >
+                <!-- 有值 -->
                 <template v-if="!$isEmptyData(curValList)">
                     <dsh-tags
                         class="text"
                         :list="curValList"
                         :propsObj="{
-                            disabled: !finalCanEdit
+                            disabled: !finalCanEdit,
+                            closable: true
                         }"
                         @delete="clickDeleteItem"
                     ></dsh-tags>
+                </template>
+                <!-- 无值 -->
+                <template v-else>
+                    {{ emptyShowVal }}
+                </template>
 
+                <!-- 图标 -->
+                <template>
                     <Icon
-                        v-if="selfPropsObj._clearable && isHover"
+                        v-if="!$isEmptyData(curValList) && selfPropsObj._clearable && isHover"
                         class="icon-close"
-                        type="md-close"
+                        type="ios-close-circle"
                         @click.stop="clickClear"
                     />
                     <Icon
                         v-else
                         class="icon-default"
-                        :type="`${multiple ? 'ios-people' : 'ios-person'}`"
+                        :type="inputIcon"
                     />
                 </template>
-
-                <template v-else>
-                    {{ emptyShowVal }}
-                </template>
             </div>
 
             <!-- 查看 -->
@@ -57,9 +62,6 @@
                     v-if="!$isEmptyData(curValList)"
                     class="text"
                     :list="curValList"
-                    :propsObj="{
-                        closable: false
-                    }"
                 ></dsh-tags>
 
                 <template v-else>
@@ -121,9 +123,7 @@
                                             :indeterminate="false"
                                             :value="curCheckAll"
                                             @click.prevent.native="clickCheckAll"
-                                        >
-                                            全选
-                                        </Checkbox>
+                                        >全选</Checkbox>
                                     </div>
 
                                     <!-- 下 列表-->
@@ -182,7 +182,7 @@
                             </span>
                             <Icon
                                 class="list-item-delete"
-                                type="md-close"
+                                type="ios-close-circle"
                                 @click="clickDeleteUserItem(userItem, userIndex, newValList)"
                             />
                         </span>
@@ -193,7 +193,7 @@
             <!-- footer -->
             <div class="selectUsers-modal-wrap-footer">
                 <dsh-buttons
-                    :list="$getOperationList(['cancel', 'confirm'])"
+                    :list="$getOperationList(['canCancel', 'canConfirm'])"
                     @click="$dispatchEvent($event)"
                 ></dsh-buttons>
             </div>
@@ -261,16 +261,16 @@
                 },
 
                 operationMap: {
-                    cancel: {
+                    canCancel: {
                         name: "取消",
-                        type: "clickCancel",
+                        type: "canCancel",
                         btnType: "cancel",
                         event: "clickCancel"
                     },
-                    confirm: {
+                    canConfirm: {
                         name: "完成",
+                        type: "canConfirm",
                         btnType: "primary",
-                        type: "clickConfirm",
                         event: "clickConfirm"
                     }
                 }
@@ -293,19 +293,14 @@
             highSearch () {
                 return this.selfPropsObj._highSearch;
             },
-            // 审签单定制需求使用字段
-            transmit_type () {
-                return this.selfPropsObj.transmit_type;
-            },
-            current_step_sp_user_key () {
-                return this.selfPropsObj.current_step_sp_user_key;
-            },
-            stepKey () {
-                return this.selfPropsObj.stepKey;
+            inputIcon () {
+                return this.multiple ? "ios-people" : "ios-person";
             },
 
             curCheckAll () {
-                return this.userList.every(userItem => this.newValList.find(newItem => newItem._key == userItem._key));
+                return this.userList.length && this.userList.every(userItem =>
+                    this.newValList.some(newItem => newItem._key === userItem._key)
+                );
             },
             showVal () {
                 return this.$isEmptyData(this.curValList)
@@ -328,13 +323,13 @@
                 };
                 this.curDepartment = {};
                 this.pagePropsObj.page = 1;
-                this.getUserList();
-                this.getDepartmentList();
+                this.getUserListData();
+                this.getDepartmentListData();
             },
 
             search () {
                 this.pagePropsObj.page = 1;
-                this.getUserList();
+                this.getUserListData();
             },
             // 选择部门
             changeDepartment (departmentItem) {
@@ -345,7 +340,7 @@
                     this.userList = this.hightUsers;
                     this.total = 1;
                 } else {
-                    this.getUserList();
+                    this.getUserListData();
                 }
             },
             clickInput () {
@@ -371,7 +366,7 @@
                 } else {
                     this.newValList = [
                         ...this.newValList,
-                        this.userList.filter(userItem =>
+                        ...this.userList.filter(userItem =>
                             !this.newValList.some(newItem => newItem._key === userItem._key)
                         )
                     ];
@@ -400,7 +395,7 @@
             },
 
             /* ----------- 接口方法 ------------- */
-            getUserList () {
+            getUserListData () {
                 this.loading = true;
                 this.userList = [];
                 let searchName = this.searchData.name;
@@ -420,9 +415,6 @@
                     params: {
                         search: search,
                         department: this.curDepartment._key,
-                        transmit_type: this.transmit_type,
-                        current_step_sp_user_key: this.current_step_sp_user_key,
-                        stepKey: this.stepKey,
                         pagination: {
                             page: this.pagePropsObj.page,
                             pagesize: this.pagePropsObj.pagesize
@@ -435,16 +427,13 @@
                     }
                 });
             },
-            getDepartmentList () {
+            getDepartmentListData () {
                 this.$https({
                     url: {
                         module: "company",
                         name: "compDepartCascaderAll"
                     },
                     params: {
-                        transmit_type: this.transmit_type,
-                        current_step_sp_user_key: this.current_step_sp_user_key,
-                        stepKey: this.stepKey,
                         searchString: this.propsObj.searchString
                     },
                     callback: data => {

package/src/components/list/BriTreeItem.vue

@@ -47,14 +47,14 @@
                 v-if="showChildren"
                 class="BriTreeItem-children"
             >
-                <yc-tree-item
+                <bri-tree-item
                     v-for="item in value.children"
                     :key="item._key"
                     :value="item"
                     :changeOnSelect="changeOnSelect"
                     :multiple="multiple"
                     @on-change="onChange"
-                ></yc-tree-item>
+                ></bri-tree-item>
             </div>
         </transition>
     </div>

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

@@ -67,12 +67,12 @@
                             v-for="(dataItem, dataIndex) in groupItem.list"
                             :key="dataItem._id"
                             :id="dataItem._id"
-                            class="item"
+                            class="row-item"
                             @click="clickRow(dataItem, dataIndex)"
                         >
                             <!-- 下拉操作 -->
                             <dsh-dropdown
-                                class="item-dropdown"
+                                class="row-item-dropdown"
                                 :dropdownObj="dropdownObj"
                                 :list="operationList"
                                 @click="$dshEmit($event, dataItem, dataIndex)"
@@ -80,11 +80,11 @@
                             ></dsh-dropdown>
 
                             <!-- 标题 -->
-                            <div class="item-title dsh-ellipsis">{{ dataItem[titleField] }}</div>
+                            <div class="row-item-title dsh-ellipsis">{{ dataItem[titleField] }}</div>
 
                             <!-- 显示字段 -->
                             <div
-                                class="item-cols unit"
+                                class="row-item-cols unit"
                                 v-for="colItem in selfColumns"
                                 :key="colItem._key"
                             >
@@ -103,11 +103,11 @@
                                 <!-- 右 val -->
                                 <div class="unit-value dsh-ellipsis">
                                     <dsh-td-render
-                                        v-if="colItem.render"
+                                        v-if="colItem.renderBodyCell"
                                         :row="dataItem"
                                         :column="colItem"
                                         :index="0"
-                                        :render="colItem.render"
+                                        :render="colItem.renderBodyCell"
                                     ></dsh-td-render>
 
                                     <div

package/src/components/small/BriDrawer.vue

@@ -36,7 +36,7 @@
             v-if="selfPropsObj.closable"
             slot="close"
             class="BriDrawer-close"
-            type="md-close"
+            type="ios-close-circle"
             size="20"
             @click.stop="clickClose"
         />

package/src/components/small/DshDropdown.vue

@@ -4,6 +4,7 @@
         :trigger="trigger"
         :placement="placement"
         :transfer="transfer"
+        transfer-class-name="DshDropdown"
     >
         <slot>
             <Icon

package/src/components/small/DshModal.vue

@@ -41,7 +41,7 @@
         <Icon
             v-if="selfPropsObj.showSlotClose !== false"
             class="DshModal-close"
-            type="md-close"
+            type="ios-close-circle"
             size="20"
             @click.native.stop="visibleChange(false)"
         />

package/src/components/small/DshTags.vue

@@ -17,7 +17,7 @@
             :closable="getItemClosable(tagItem)"
             :checkable="propsObj.checkable"
             :checked="propsObj.checked"
-            :color="propsObj.color || tagItem.color || 'primary'"
+            :color="propsObj.color || tagItem.color || 'default'"
             :fade="propsObj.fade || false"
             :size="propsObj.size || 'medium'"
             @on-close="deleteTag($event, tagItem, tagIndex)"
@@ -63,7 +63,7 @@
                         :fade="propsObj.fade || false"
                         :size="propsObj.size || 'medium'"
                         class="DshTags-poptip-tag"
-                        @on-close="deleteTag($event, tagItem, tagIndex)"
+                        @on-close="deleteTag($event, tagItem, tagIndex + computedList.length)"
                         @on-change="changeChecked"
                     >
                         <slot :tagItem="tagItem">
@@ -102,10 +102,10 @@
                 maxTagCount: undefined,
 
                 getItemDisabled (item) {
-                    return this.propsObj.disabled || item._disabled || item.disabled;
+                    return !!(this.propsObj.disabled || item._disabled || item.disabled);
                 },
                 getItemClosable (item) {
-                    return this.getItemDisabled(item) ? false : (this.propsObj.closable !== false);
+                    return this.getItemDisabled(item) === false && this.propsObj.closable;
                 }
             };
         },
@@ -136,7 +136,7 @@
             // 删除标签
             deleteTag (event, item, index) {
                 this.list.splice(index, 1);
-                this.getAutoEllipsis();
+                this.callEliipsis();
                 this.$emit("delete", item, index);
             },
             // 改变标签状态
@@ -144,27 +144,6 @@
 
             },
 
-            getAutoEllipsis () {
-                let parWidth = this.$refs.DshTags.clientWidth;
-                let tags = this.$refs.tagItem;
-
-                for (let idx in tags) {
-                    let el = tags[idx]["$el"];
-                    let showEllipsis = el.clientWidth + el.offsetLeft > parWidth;
-
-                    if (showEllipsis) {
-                        // 判断加上... 是否被隐藏
-                        if (el.clientWidth + el.offsetLeft + 40 < parWidth) {
-                            this.maxTagCount = idx;
-                        } else {
-                            this.maxTagCount = idx - 1;
-                        }
-                        break;
-                    } else {
-                        this.maxTagCount = undefined;
-                    }
-                }
-            },
             callEliipsis () {
                 if (this.autoEllipsis) {
                     this.maxTagCount = undefined;
@@ -172,6 +151,29 @@
                         this.getAutoEllipsis();
                     });
                 }
+            },
+            getAutoEllipsis () {
+                if (this.autoEllipsis) {
+                    let parWidth = this.$refs.DshTags.clientWidth;
+                    let tags = this.$refs.tagItem;
+
+                    for (let idx in tags) {
+                        let el = tags[idx]["$el"];
+                        let showEllipsis = el.clientWidth + el.offsetLeft > parWidth;
+
+                        if (showEllipsis) {
+                            // 判断加上... 是否被隐藏
+                            if (el.clientWidth + el.offsetLeft + 40 < parWidth) {
+                                this.maxTagCount = idx;
+                            } else {
+                                this.maxTagCount = idx - 1;
+                            }
+                            break;
+                        } else {
+                            this.maxTagCount = undefined;
+                        }
+                    }
+                }
             }
         },
         watch: {

package/src/styles/common/control.less

@@ -16,8 +16,9 @@
     cursor: pointer;
     color: @textColor;
 
-    &.bri-control-nodata {
-        .bri-control-nodata();
+    .ivu-icon {
+        padding: 5px;
+        color: @placeholderColor;
     }
 }
 .bri-control-disabled {
@@ -27,8 +28,13 @@
     cursor: not-allowed;
     color: @textColor;
 
+    .ivu-icon {
+        padding: 5px;
+        color: @placeholder-disabled-color;
+    }
+    
     &.bri-control-nodata {
-        .bri-control-disabled-placeholder();
+        color: @placeholder-disabled-color;
     }
 }
 // .bri-control-readonly {
@@ -37,24 +43,30 @@
 //     background: @inputBg-readonly;
 //     cursor: not-allowed;
 //     color: @textColor-readonly;
+    
+//     .ivu-icon {
+//         color: @textColor-readonly;
+//     }
 // }
 .bri-control-show {
     border: none;
     background-color: transparent;
 
-    &.bri-control-nodata {
-        .bri-control-nodata();
+    .ivu-icon {
+        padding: 5px;
+        color: @placeholderColor;
     }
 }
 .bri-control-unit {
     border: none;
     background-color: transparent;
 
-    // unit 模式下不用特殊处理颜色
-    &.bri-control-nodata {
-        .bri-control-nodata();
+    .ivu-icon {
+        padding: 5px;
+        color: @placeholderColor;
     }
 }
+
 // 无数据
 .bri-control-nodata {
     color: @placeholderColor;
@@ -66,10 +78,10 @@
 
 // 展示为tag标签公共样式
 #bri-control-wrap () {
-    .dsh-flex-row-between-center();
     height: 32px;
-    padding: 4px 0 4px 4px;
+    padding: 4px 0 4px 7px;
     line-height: 24px;
+    .dsh-flex-row-between-center();
 
     .text {
         .dsh-ellipsis();
@@ -82,14 +94,10 @@
 
     .icon {
         &-default {
-            padding: 5px;
-            color: @placeholderColor;
-        }
 
+        }
         &-close {
-            padding: 5px;
             display: none;
-            color: @placeholderColor;
         }
     }
 
@@ -98,8 +106,4 @@
             display: block;
         }
     }
-
-    &.bri-control-nodata {
-        padding-left: 7px;
-    }
 }

package/src/styles/components/controls/base/DshCascader/DshCascader.less

@@ -25,7 +25,7 @@
     // 查看
     &-show {
         &-multiple {
-            #bri-control-wrap();
+            
         }
 
         &-single {
@@ -35,8 +35,11 @@
 
     // 多选类型且独自一行时
     &-row {
-        &-edit,
+        &-edit {
+            // height: 68px;
+        }
         &-show {
+            height: auto;
             .text,
             .overflow {
                 width: 100%;
@@ -46,12 +49,6 @@
                 .bri-scrollbar3();
             }
         }
-        &-edit {
-            height: 68px;
-        }
-        &-show {
-            height: auto;
-        }
     }
 }
 

package/src/styles/components/controls/base/DshCheckbox.less

@@ -14,9 +14,9 @@
                 margin-bottom: 5px;
                 margin-right: 16px;
                 height: 32px;
-                line-height: 32px;
-                border-radius: 4px;
                 border: none;
+                border-radius: 4px;
+                line-height: 32px;
                 color: #FFF;
             }
 
@@ -86,38 +86,29 @@
     .ivu-select-multiple {
         .ivu-select-selection {
             height: 32px;
-    
+            .dsh-flex-row-between-center();
+            
             & > div {
-                overflow-x: auto;
-                overflow-y: hidden;
+                width: 100%;
+                word-break: keep-all;
                 white-space: nowrap;
-    
+
+                overflow: auto;
+                .bri-scrollbar3();
+
                 .ivu-tag {
-                    margin: 2px 4px 4px 0;
-                }
-    
-                &::-webkit-scrollbar {
-                    height: 8px;
-                }
-    
-                &:-webkit-scrollbar-thumb {
-                    border-radius: 3px;
-                    background: rgba(51, 51, 51, .1);
-                    background-clip: border-box;
+                    margin: 2px 4px 0px 0px;
+                    background-color: @borderColor;
                 }
             }
         }
 
-        &.ivu-select-default {
+        &.ivu-select-disabled {
             .ivu-select-selection {
-                height: 32px;
-                overflow: hidden;
-        
                 & > div {
-                    width: 100%;
-                    height: 100%;
-                    .dsh-flex-row-start-center();
-                    flex-wrap: wrap;
+                    .ivu-tag {
+                        background-color: @border-disabled;
+                    }
                 }
             }
         }

package/src/styles/components/controls/senior/BriLabels.less

@@ -6,7 +6,7 @@
     }
     
     &-show {
-        #bri-control-wrap();
+
     }
 
     &-dropdown {

package/src/styles/components/controls/senior/selectDepartments.less

@@ -6,7 +6,7 @@
     }
 
     &-show {
-        #bri-control-wrap();
+
     }
 
     // 传到子组件里的class！！！