bri-components 1.2.15 → 1.2.17

package/package.json

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

package/src/abolish/DshEditPanel.vue

@@ -66,7 +66,7 @@
 
         <!-- 操作按钮 -->
         <dsh-buttons
-            class="bri-footer"
+            class="bri-modal-footer"
             :list="$getOperationList(['canCancel', 'canConfirm'])"
             @click="$dispatchEvent($event)"
         ></dsh-buttons>

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

@@ -226,10 +226,10 @@
                         callback: data => {
                             this.initListData = [
                                 ...this.initListData,
-                                ...data.list.map(item =>
+                                ...data.list.map(dataItem =>
                                     ({
-                                        _key: item[item._key || "_key"],
-                                        name: item[item._name || "name"]
+                                        _key: dataItem[item._key || "_key"],
+                                        name: dataItem[item._name || "name"]
                                     })
                                 )
                             ];

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

@@ -96,7 +96,6 @@
                     <template v-else>
                         <!-- 树形形式 -->
                         <div
-                            v-if="isCascader"
                             class="list-center-tree"
                         >
                             <template v-if="allDepartmentList.length">
@@ -116,43 +115,14 @@
                                 暂无数据……
                             </div>
                         </div>
-
-                        <!-- 卡片形式 -->
-                        <div
-                            v-else
-                            class="list-center-card"
-                        >
-                            <bri-card
-                                :data="departmentList"
-                                :changeOnSelect="changeOnSelect"
-                                :multiple="multiple"
-                                @on-change="changeSelect"
-                            ></bri-card>
-
-                            <div
-                                v-if="highSearch"
-                                class="card-high"
-                            >
-                                <p class="card-high-title">高级选项</p>
-                                <bri-card
-                                    :data="highDepartmentList"
-                                    :changeOnSelect="changeOnSelect"
-                                    :multiple="multiple"
-                                    @on-change="changeSelect"
-                                ></bri-card>
-                            </div>
-                        </div>
                     </template>
                 </div>
-
-                <!-- 底 按钮 -->
-                <div class="list-footer">
-                    <dsh-buttons
-                        :list="$getOperationList(['canCancel', 'canConfirm'])"
-                        @click="$dispatchEvent($event)"
-                    ></dsh-buttons>
-                </div>
             </div>
+            <dsh-buttons
+                class="bri-modal-footer"
+                :list="$getOperationList(['canCancel', 'canConfirm'])"
+                @click="$dispatchEvent($event)"
+            ></dsh-buttons>
         </dsh-modal>
     </div>
 </template>
@@ -207,10 +177,8 @@
                 return {
                     _multiple: false,
                     _highSearch: false,
-                    _isCascader: true,
                     _changeOnSelect: true,
                     _searchString: "",
-
                     ...this.propsObj,
                     ...this.commonDealPropsObj
                 };
@@ -224,11 +192,6 @@
             inputIcon () {
                 return this.multiple ? "ios-people" : "ios-person";
             },
-
-            // 暂时没配置
-            isCascader () {
-                return this.selfPropsObj._isCascader;
-            },
             changeOnSelect () {
                 return this.selfPropsObj._changeOnSelect;
             },
@@ -239,7 +202,8 @@
             modalPropsObj () {
                 return {
                     title: "选择部门",
-                    class: `z-modal ${this.isCascader ? "selectDepartments-cascaderModal" : "selectDepartments-modal"}`,
+                    class: "bri-modal-center",
+                    width: 600,
                     showSlotClose: false,
                     closable: true
                 };
@@ -335,7 +299,7 @@
                 this.$https({
                     url: {
                         module: "company",
-                        name: this.isCascader ? "compDepartCascaderAll" : "compDepartIndex"
+                        name: "compDepartCascaderAll"
                     },
                     params: {
                         search: this.searchName

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

@@ -167,12 +167,11 @@
             </div>
 
             <!-- footer -->
-            <div class="selectUsers-modal-wrap-footer">
-                <dsh-buttons
-                    :list="$getOperationList(['canCancel', 'canConfirm'])"
-                    @click="$dispatchEvent($event)"
-                ></dsh-buttons>
-            </div>
+            <dsh-buttons
+                class="bri-modal-footer"
+                :list="$getOperationList(['canCancel', 'canConfirm'])"
+                @click="$dispatchEvent($event)"
+            ></dsh-buttons>
         </dsh-modal>
     </div>
 </template>
@@ -198,7 +197,8 @@
                 modalPropsObj: {
                     title: "选择成员",
                     showSlotClose: false,
-                    closable: true
+                    closable: true,
+                    class: "bri-modal-center"
                 },
                 // 筛选
                 searchData: {

package/src/components/list/BriTable.vue

@@ -37,8 +37,11 @@
         <bri-loading
             class="bri-table-empty"
             :value="isLoading ? 1 : data.length? 0 : 2"
-            :noText="noDataText"
-         />
+        >
+            <template slot="nodata">
+                {{ noDataText }}
+            </template>
+        </bri-loading>
     </div>
 </template>
 

package/src/components/list/BriTree.vue

@@ -134,7 +134,7 @@
                 treeFormShow: false,
                 treeFormPropsObj: {
                     title: "添加节点",
-                    class: "z-modal"
+                    class: "bri-modal-center"
                 },
                 treeFormData: {
                     _key: "",

package/src/components/other/BriIframe.vue

@@ -12,7 +12,7 @@
 
         <div
             v-else
-            class="dsh-flex-row-center-center BriIframe-nodata"
+            class="BriIframe-nodata"
         >
             <img
                 :src="noData"
@@ -59,25 +59,20 @@
         methods: {
             init () {
                 let iframe = this.$refs.BriIframe;
-                if (!iframe) {
-                    return;
+                if (iframe) {
+                    this.loading = true;
+                    if (iframe.attachEvent) {
+                        iframe.attachEvent("onreadystatechange", () => {
+                            if (iframe.readyState === "complete" || iframe.readyState == "loaded") {
+                                this.loading = false;
+                            }
+                        });
+                    } else {
+                        iframe.addEventListener("load", () => {
+                            this.loading = false;
+                        }, false);
+                    }
                 }
-                this.loading = true;
-                if (iframe.attachEvent) {
-                    iframe.attachEvent("onreadystatechange", () => {
-                        if (iframe.readyState === "complete" || iframe.readyState == "loaded") {
-                            this.loadingEnd();
-                        }
-                    });
-                } else {
-                    iframe.addEventListener("load", () => {
-                        this.loadingEnd();
-                    }, false);
-                }
-
-            },
-            loadingEnd () {
-                this.loading = false;
             },
             /**
              * 在iframe页面使用举例：

package/src/components/other/BriLoading.vue

@@ -8,22 +8,24 @@
         }"
     >
         <div class="BriLoading-main">
-            <slot>
-                <template v-if="value === 1">
+            <!-- loading -->
+            <template v-if="value === 1">
+                <slot>
                     <div
                         class="BriLoading-main-loading"
                         :style="getStyle"
-                    >
-                    </div>
+                    ></div>
                     <div
                         v-if="showLoadingText"
                         class="BriLoading-main-loadingText"
                     >
                         {{ loadText }}
                     </div>
-                </template>
-
-                <template v-else-if="value === 2">
+                </slot>
+            </template>
+            <!--  nodata -->
+            <template v-else-if="value === 2">
+                <slot name="nodata">
                     <bri-svg :src="imgSrc" />
                     <div
                         v-if="noText"
@@ -31,8 +33,8 @@
                     >
                         {{ noText }}
                     </div>
-                </template>
-            </slot>
+                </slot>
+            </template>
         </div>
     </div>
 </template>

package/src/components/small/DshModal.vue

@@ -39,7 +39,7 @@
 
         <!-- 删除按钮 -->
         <Icon
-            v-if="selfPropsObj.showSlotClose !== false"
+            v-if="selfPropsObj.showSlotClose"
             class="DshModal-close"
             type="md-close"
             size="20"
@@ -97,6 +97,8 @@
                     // stickyDistance: 30, // 拖拽时，自动吸附屏幕边缘的临界距离
                     // resetDragPosition: false, // Modal 再次打开时，是否重置拖拽的位置
                     transfer: true,
+                    showSlotClose: true, // 显示删除
+
                     ...this.propsObj,
                     class: [
                         "DshModal",
@@ -114,7 +116,7 @@
                 const widthOBj = {
                     default: "750",
                     small: "500",
-                    middle: "1000px",
+                    middle: "60%",
                     large: this.propsObj.draggable ? "100%" : "80%",
                     auto: "auto"
                 };

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

@@ -1,30 +1,8 @@
 .selectDepartments {
     width: 100%;
 
-    &-edit {
-
-    }
-
-    &-show {
-
-    }
-
-    // 传到子组件里的class！！！
-    &-modal {
-        .ivu-modal {
-            width: 800px!important;
-        }
-    }
-    // 传到子组件里的class！！！
-    &-cascaderModal {
-        .ivu-modal {
-            width: 600px !important;
-        }
-    }
-
     &-list {
-        height: 600px;
-        padding: 15px 20px;
+        height: 500px;
         .dsh-flex-col-start-stretch();
 
         .list {
@@ -34,11 +12,9 @@
                 display: flex;
                 flex-wrap: wrap;
                 align-items: center;
-    
-                &-label {
 
-                }
-                
+                &-label {}
+
                 .item {
                     max-width: 230px;
                     height: 24px;
@@ -63,17 +39,17 @@
                     }
                 }
             }
-    
+
             &-search {
                 padding: 10px 15px;
             }
-    
+
             &-center {
                 flex: 1;
                 min-height: 100px;
                 padding: 5px 0 10px;
                 overflow: auto;
-    
+
                 &-tree {
                     .tree {
                         &-nodata {
@@ -81,7 +57,7 @@
                         }
                     }
                 }
-                
+
                 &-card {
                     .card {
                         &-high-title {
@@ -92,15 +68,6 @@
                     }
                 }
             }
-    
-            &-footer {
-                text-align: right;
-    
-                .ivu-btn {
-                    width: 120px;
-                    height: 38px;
-                }
-            }
         }
     }
 }

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

@@ -1,75 +1,71 @@
 .selectUsers {
     width: 100%;
 
-    &-edit {
+    &-edit {}
 
-    }
-    &-show {
-        
-    }
+    &-show {}
 
     // 弹框部分
     &-modal {
         &-wrap {
             display: flex;
-            padding: 20px;
-            height: 550px;
+            height: 500px;
 
             &-left {
                 width: 520px;
                 overflow-y: auto;
                 background: @white;
                 border: 1px solid #E5E5E5;
-    
+
                 .search {
                     padding: 10px 20px;
                 }
-    
+
                 .content {
                     display: flex;
                     height: calc(100% - 52px);
                     border-top: 1px solid #E5E5E5;
-    
+
                     &-menu {
                         flex: 3;
                         height: 100%;
                         overflow: auto;
                     }
-    
+
                     &-users {
                         flex: 2;
                         position: relative;
-    
+
                         .ivu-checkbox-checked .ivu-checkbox-inner {
                             border-color: @themeColor;
                             background-color: @themeColor;
                         }
-    
+
                         &-list {
                             border-left: 1px solid #E5E5E5;
                             height: 100%;
                             display: flex;
                             flex-direction: column;
-    
-    
+
+
                             &-checkAll {
                                 height: 40px;
                                 line-height: 40px;
                                 border-bottom: 1px solid #E5E5E5;
                                 padding-left: 15px;
                             }
-    
+
                             &-selects {
                                 flex: 1;
                                 overflow: auto;
                                 padding: 15px;
-    
+
                                 &-item {
                                     margin-bottom: 5px;
                                 }
                             }
                         }
-    
+
                         &-nodata {
                             position: absolute;
                             top: 50%;
@@ -77,17 +73,17 @@
                             text-align: center;
                             transform: translateY(-50%);
                         }
-    
+
                     }
                 }
             }
-    
+
             &-center {
                 width: 100px;
                 display: flex;
                 justify-content: center;
                 align-items: center;
-    
+
                 .icon {
                     width: 24px;
                     height: 24px;
@@ -99,7 +95,7 @@
                     text-align: center;
                 }
             }
-    
+
             &-right {
                 flex: 1;
                 width: 0px;
@@ -111,12 +107,12 @@
                 overflow: auto;
                 display: flex;
                 flex-direction: column;
-    
+
                 .list {
                     display: flex;
                     flex-wrap: wrap;
                     align-items: center;
-            
+
                     &-item {
                         max-width: 150px;
                         height: 24px;
@@ -128,11 +124,11 @@
                         font-size: 12px;
                         display: flex;
                         align-items: center;
-            
+
                         &-name {
                             .dsh-ellipsis();
                         }
-            
+
                         &-delete {
                             padding: 3px;
                             margin-left: 5px;
@@ -142,15 +138,15 @@
                     }
                 }
             }
-    
+
             &-footer {
                 padding-bottom: 10px;
-    
+
                 .DshButtons {
                     text-align: right;
                     padding-right: 24px;
-    
-    
+
+
                     .ivu-btn {
                         width: 70px;
                         height: 32px;

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

@@ -12,5 +12,6 @@
     &-nodata {
         width: 100%;
         height: 100%;
+        .dsh-flex-row-center-center();
     }
 }