bri-components 1.2.3 → 1.2.5

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="ios-close-circle"
+            type="md-close"
             size="20"
             @click.stop="clickClose"
         />

package/src/components/small/DshModal.vue

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

package/src/components/small/DshTags.vue

@@ -102,11 +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) &&
-                    (this.propsObj.closable == undefined ? true : this.propsObj.closable);
+                    return this.getItemDisabled(item) === false && this.propsObj.closable;
                 }
             };
         },
@@ -179,7 +178,6 @@
         },
         watch: {
             list: function () {
-                console.log("ss");
                 this.callEliipsis();
             }
         },

package/src/index.js

@@ -81,7 +81,11 @@ import BriUploadImage from "./components/controls/base/BriUpload/BriUploadImage.
 import DshCoordinates from "./components/controls/base/DshCoordinates.vue";
 import DshEditor from "./components/controls/base/DshEditor.vue";
 import DshDivider from "./components/controls/base/DshDivider.vue";
+
 import DshPackage from "./components/controls/senior/DshPackage.vue";
+import selectUsers from "./components/controls/senior/selectUsers/selectUsers.vue";
+import selectDepartments from "./components/controls/senior/selectDepartments.vue";
+
 import DshBack from "./components/controls/special/DshBack.vue";
 import DshUndeveloped from "./components/controls/special/DshUndeveloped.vue";
 
@@ -224,6 +228,8 @@ export {
     DshPackage,
     DshBack,
     DshUndeveloped,
+    selectUsers,
+    selectDepartments,
 
     // other
     BriCode,

package/src/styles/common/control.less

@@ -17,6 +17,7 @@
     color: @textColor;
 
     .ivu-icon {
+        padding: 5px;
         color: @placeholderColor;
     }
 }
@@ -28,6 +29,7 @@
     color: @textColor;
 
     .ivu-icon {
+        padding: 5px;
         color: @placeholder-disabled-color;
     }
     
@@ -51,6 +53,7 @@
     background-color: transparent;
 
     .ivu-icon {
+        padding: 5px;
         color: @placeholderColor;
     }
 }
@@ -59,6 +62,7 @@
     background-color: transparent;
 
     .ivu-icon {
+        padding: 5px;
         color: @placeholderColor;
     }
 }
@@ -90,11 +94,9 @@
 
     .icon {
         &-default {
-            padding: 5px;
-        }
 
+        }
         &-close {
-            padding: 5px;
             display: none;
         }
     }

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

@@ -25,7 +25,7 @@
     // 查看
     &-show {
         &-multiple {
-            #bri-control-wrap();
+            
         }
 
         &-single {

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

@@ -10,14 +10,6 @@
             color: @textColor;
         }
     }
-
-    &-unit {
-
-    }
-
-    &-show {
-        
-    }
 }
 
 .ivu-input-number {

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

@@ -135,25 +135,6 @@
         }
     }
 
-    &-value {
-        height: 24px;
-        line-height: 20px;
-        padding: 2px 8px;
-        border-radius: 4px;
-        margin-right: 8px;
-        display: inline-flex;
-
-        &:last-of-type {
-            margin-right: 0px;
-        }
-
-        &-wrapper {
-            min-height: 32px;
-            padding: 4px 0;
-            .dsh-ellipsis();
-        }
-    }
-
     &-tip {
         cursor: pointer;
 

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！！！

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

@@ -5,7 +5,7 @@
         #bri-control-wrap();
     }
     &-show {
-        #bri-control-wrap();
+        
     }
 
     // 弹框部分

package/src/styles/components/list/DshBox/DshPanel.less

@@ -51,8 +51,8 @@
                     padding: 10px;
                     overflow: auto;
 
-                    .item {
-                        height: 60px;
+                    .row-item {
+                        min-height: 60px;
                         padding: 10px 17px;
                         margin-bottom: 10px;
                         border: 1px solid rgba(102, 110, 126, 0.1);

package/src/styles/components/small/DshDropdown.less

@@ -35,7 +35,7 @@
                         color: @textColor-disabled
                     }
                     &-icon {
-                        margin-right: 3px;
+                        margin-right: 8px;
                     }
                     &-name {