bri-components 1.2.14 → 1.2.15

package/package.json

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

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

@@ -43,7 +43,6 @@
                     <div
                         v-else
                         class="dsh-subtip"
-                        style="backgroundColor: #f3f3f3;"
                     >-- 无选择项 --</div>
                 </CheckboxGroup>
             </template>

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

@@ -33,7 +33,6 @@
                     <div
                         v-else
                         class="dsh-subtip"
-                        style="backgroundColor: #f3f3f3;"
                     >-- 无选择项 --</div>
                 </RadioGroup>
 

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

@@ -68,13 +68,18 @@
 
 <script>
     import controlMixin from "../controlMixin.js";
+    import DshBtnModal from "../../small/DshBtnModal.vue";
+    import DshCascaderTable from "../../list/DshCascaderTable.vue";
 
     export default {
         name: "cascaderTable",
         mixins: [
             controlMixin
         ],
-        components: {},
+        components: {
+            DshBtnModal,
+            DshCascaderTable
+        },
         props: {},
         data () {
             return {

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

@@ -9,7 +9,7 @@
                 customIcon: 'bico-internaltable'
             }]"></dsh-icons>
             <span class="flatTable-unit-text">
-                {{ val.list.length }}行
+                {{ curVal.list.length }}行
             </span>
         </span>
 
@@ -19,8 +19,8 @@
                 <bri-flat-table
                     :canEdit="finalCanEdit"
                     :columns="columns"
-                    :data="val.list"
-                    :rowDefault="val.rowDefault"
+                    :data="curVal.list"
+                    :rowDefault="curVal.rowDefault"
                     :outObj="value"
                     :propsObj="propsObj"
                     @change="change"
@@ -41,9 +41,9 @@
                     ref="dshFatTable"
                     :canEdit="finalCanEdit"
                     :columns="columns"
-                    :data="val.list"
-                    :oldData="val.oldList"
-                    :rowDefault="val.rowDefault"
+                    :data="curVal.list"
+                    :oldData="curVal.oldList"
+                    :rowDefault="curVal.rowDefault"
                     :outObj="value"
                     :propsObj="propsObj"
                     @change="change"
@@ -56,12 +56,12 @@
                     :propsObj="modalPropsObj"
                 >
                     <bri-flat-table
-                        v-if="value[controlKey] && isEnlarge"
+                        v-if="isEnlarge"
                         :canEdit="finalCanEdit"
                         :columns="columns"
-                        :data="val.list"
-                        :oldData="val.oldList"
-                        :rowDefault="val.rowDefault"
+                        :data="curVal.list"
+                        :oldData="curVal.oldList"
+                        :rowDefault="curVal.rowDefault"
                         :outObj="value"
                         :propsObj="propsObj"
                         @change="change"
@@ -74,13 +74,18 @@
 
 <script>
     import controlMixin from "../controlMixin.js";
+    import DshBtnModal from "../../small/DshBtnModal.vue";
+    import BriFlatTable from "../../list/BriFlatTable.vue";
 
     export default {
         name: "flatTable",
         mixins: [
             controlMixin
         ],
-        components: {},
+        components: {
+            DshBtnModal,
+            BriFlatTable
+        },
         props: {},
         data () {
             return {
@@ -99,7 +104,7 @@
             };
         },
         computed: {
-            val () {
+            curVal () {
                 // TODO: 待定处理
                 return this.value[this.controlKey] || {
                     list: [],

package/src/components/list/BriTable.vue

@@ -34,14 +34,11 @@
         ></ve-table>
 
         <!-- loading -->
-        <bri-loading v-if="isLoading" />
-        <!-- empty -->
-        <div
-            v-else-if="!data.length"
+        <bri-loading
             class="bri-table-empty"
-        >
-            <slot name="empty">{{ noDataText }}</slot>
-        </div>
+            :value="isLoading ? 1 : data.length? 0 : 2"
+            :noText="noDataText"
+         />
     </div>
 </template>
 
@@ -75,6 +72,7 @@
                     rowKeyFieldName: "_id",
                     scrollWidth: "0",
                     borderY: true,
+                    fixedHeader: true,
                     cellSelectionOption: {
                         enable: false
                     },

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

@@ -66,8 +66,8 @@
                             .split("/")
                             .map(item => item.length * (operationItem.size === "small" ? 12 : 14))
                     ) + (
-                        operationItem.icon || operationItem.customIcon ? 20 : 0) + (
-                            operationItem.size === "small" ? 8 : 16); // 按钮的padding,故意多了2px保留余地
+                        operationItem.icon || operationItem.customIcon ? 25 : 0
+                    );
                 };
 
                 return this.operationList.map(operationItem => {
@@ -126,8 +126,8 @@
                                             // 漏在外部按钮的宽度
                                             this.selfOperationList
                                                 .slice(0, this.selfOperationList.length > maxBtnNum ? maxBtnNum - 1 : this.selfOperationList.length)
-                                                .reduce((total, operationItem) => total + operationItem.width, 0) +
-                                                (this.selfOperationList.length > maxBtnNum ? 70 : 0) + // 出现更多按钮的宽度
+                                                .reduce((total, operationItem) => total + operationItem.width + 16, 0) +
+                                                (this.selfOperationList.length > maxBtnNum ? 69 : 0) + // 出现更多按钮的宽度
                                                 (this.selfOperationList.length > 0 ? 40 : 0) + // 操作列的padding
                                                 4 // 留出4px空间，避免麻烦问题
                                             , 80
@@ -147,6 +147,7 @@
                                             // TODO: 注意此处totalOperationList用的一定是表格行显示最多的操作按钮数组，有改动注意看此备注！！！
                                             return h("dsh-buttons", {
                                                 props: {
+                                                    class: "table-operation",
                                                     list: totalOperationList,
                                                     maxFlatNum: maxBtnNum - 1,
                                                     itemClass: "table-operation-btn"

package/src/index.js

@@ -11,11 +11,10 @@ import CN from "vue-easytable/libs/locale/lang/zh-CN.js";
 import DshBox from "./components/list/DshBox/DshBox.vue";
 import DshTable from "./components/list/DshBox/DshTable.vue";
 import DshList from "./components/list/DshBox/DshList.vue";
-
-import BriFlatTable from "./components/list/BriFlatTable.vue";
 import BriTable from "./components/list/BriTable.vue";
-import DshCascaderTable from "./components/list/DshCascaderTable.vue";
 import DshPage from "./components/list/DshPage.vue";
+import BriFlatTable from "./components/list/BriFlatTable.vue";
+// import DshCascaderTable from "./components/list/DshCascaderTable.vue";
 
 // form
 import DshForm from "./components/form/DshForm.vue";
@@ -34,22 +33,15 @@ import DshCheckbox from "./components/controls/base/DshCheckbox.vue";
 import DshCascader from "./components/controls/base/DshCascader/DshCascader.vue";
 
 // other
-import BriCode from "./components/other/BriCode.vue";
 import BriLoading from "./components/other/BriLoading.vue";
+import BriSvg from "./components/other/BriSvg.vue";
 import DshAvatar from "./components/other/DshAvatar.vue";
-import DshBtnModal from "./components/other/DshBtnModal.vue";
-import DshColorPanel from "./components/other/DshColorPanel.vue";
-import DshEditPanel from "./components/other/DshEditPanel.vue";
-import DshMenu from "./components/other/DshMenu.vue";
-import DshMenuNav from "./components/other/DshMenuNav.vue";
 
 // small
 import BriButton from "./components/small/BriButton.vue";
 import BriDrawer from "./components/small/BriDrawer.vue";
 import BriTooltip from "./components/small/BriTooltip.vue";
 import DshButtons from "./components/small/DshButtons.vue";
-import DshCrumbs from "./components/small/DshCrumbs.vue";
-import DshCrumbsItem from "./components/small/DshCrumbsItem.vue";
 import DshDropdown from "./components/small/DshDropdown.vue";
 import DshIcons from "./components/small/DshIcons.vue";
 import DshModal from "./components/small/DshModal.vue";
@@ -91,9 +83,15 @@ import DshBack from "./components/controls/special/DshBack.vue";
 import DshUndeveloped from "./components/controls/special/DshUndeveloped.vue";
 
 // other
+import DshMenuNav from "./components/other/DshMenuNav.vue";
+import BriCode from "./components/other/BriCode.vue";
 import BriCollapseTree from "./components/other/BriCollapseTree.vue";
 import BriGantt from "./components/other/BriGantt.vue";
 import BriIframe from "./components/other/BriIframe.vue";
+import DshColorPanel from "./components/other/DshColorPanel.vue";
+
+// small
+import DshBtnModal from "./components/small/DshBtnModal.vue";
 
 // ！！！！！！挂载全局的组件，不是别写在这
 const map = {
@@ -104,10 +102,7 @@ const map = {
     DshBox,
     DshTable,
     DshList,
-
-    BriFlatTable, // 可取消全局
     BriTable,
-    DshCascaderTable, // 可取消全局
     DshPage,
 
     // form
@@ -129,19 +124,12 @@ const map = {
     // other
     BriLoading,
     DshAvatar,
-    DshBtnModal,
-    DshEditPanel,
-    DshColorPanel,
-    DshMenu,
-    DshMenuNav,
 
     // small
     BriButton,
     BriDrawer,
     BriTooltip,
     DshButtons,
-    DshCrumbs,
-    DshCrumbsItem,
     DshDropdown,
     DshIcons,
     DshModal,
@@ -193,14 +181,14 @@ export {
     DshBox,
     DshTable,
     DshList,
+    BriTable,
+    DshPage,
+    BriFlatTable,
+    // DshCascaderTable,
 
     BriCard,
-    BriFlatTable,
-    BriTable,
     BriTree,
     BriTreeItem,
-    DshCascaderTable,
-    DshPage,
 
     // form
     DshForm,
@@ -234,26 +222,22 @@ export {
     selectDepartments,
 
     // other
-    BriCode,
     BriLoading,
+    BriSvg,
     DshAvatar,
-    DshBtnModal,
-    DshColorPanel,
-    DshEditPanel,
-    DshMenu,
-    DshMenuNav,
 
+    DshMenuNav,
+    BriCode,
     BriCollapseTree,
     BriGantt,
     BriIframe,
+    DshColorPanel,
 
     // small
     BriButton,
     BriDrawer,
     DshButtons,
     BriTooltip,
-    DshCrumbs,
-    DshCrumbsItem,
     DshDropdown,
     DshIcons,
     DshModal,
@@ -262,5 +246,7 @@ export {
     DshTags,
     DshTitle,
     DshRender,
-    DshTdRender
+    DshTdRender,
+
+    DshBtnModal
 };

package/src/styles/common/text.less

@@ -18,11 +18,10 @@
 }
 .dsh-subtip {
     width: 100%;
-    // padding: 10px 5px;
     text-align: center;
     font-size: 12px;
     font-weight: 500;
-    color: @textColor;
+    color: @placeholderColor;
     // background-color: #f3f3f3;
 }
 // 出现三个点

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

@@ -49,67 +49,67 @@
                     }
                 }
             });
-    }
+        }
 
-    &-disabled {
-        .ivu-checkbox-disabled+span {
-            color: #515a6e;
+        &-disabled {
+            .ivu-checkbox-disabled+span {
+                color: #515a6e;
+            }
         }
-    }
 
-    &-scroll {
-        overflow-x: auto;
-        overflow-y: hidden;
-        white-space: nowrap;
+        &-scroll {
+            overflow-x: auto;
+            overflow-y: hidden;
+            white-space: nowrap;
 
-        &::-webkit-scrollbar {
-            height: 6px;
-        }
+            &::-webkit-scrollbar {
+                height: 6px;
+            }
 
-        &:-webkit-scrollbar-thumb {
-            border-radius: 3px;
-            background: rgba(51, 51, 51, .1);
-            background-clip: border-box;
+            &:-webkit-scrollbar-thumb {
+                border-radius: 3px;
+                background: rgba(51, 51, 51, .1);
+                background-clip: border-box;
+            }
         }
     }
-}
 
-&-item {}
+    &-item {}
 
-&-show {}
+    &-show {}
 
-.ivu-select-multiple {
-    .ivu-select-selection {
-        height: 32px;
-        .dsh-flex-row-between-center();
+    .ivu-select-multiple {
+        .ivu-select-selection {
+            height: 32px;
+            .dsh-flex-row-between-center();
 
-        &>div {
-            width: 100%;
-            height: 100%;
-            word-break: keep-all;
-            white-space: nowrap;
-            overflow: auto;
-            .bri-scrollbar3();
+            & > div {
+                width: 100%;
+                height: 100%;
+                word-break: keep-all;
+                white-space: nowrap;
+                overflow: auto;
+                .bri-scrollbar3();
 
-            .ivu-tag {
-                margin: 2px 4px 0px 0px;
-                background-color: @borderColor;
+                .ivu-tag {
+                    margin: 2px 4px 0px 0px;
+                    background-color: @borderColor;
+                }
             }
         }
-    }
 
-    &.ivu-select-disabled {
-        .ivu-select-selection {
-            &>div {
-                .ivu-tag {
-                    background-color: @border-disabled;
+        &.ivu-select-disabled {
+            .ivu-select-selection {
+                & > div {
+                    .ivu-tag {
+                        background-color: @border-disabled;
+                    }
                 }
             }
         }
-    }
 
-    .ivu-select-item-selected:after {
-        content: none;
+        .ivu-select-item-selected:after {
+            content: none;
+        }
     }
-}
 }

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

@@ -147,44 +147,44 @@
     .ivu-select-selection {
         // .bri-control-edit();
     }
-}
-
-.ivu-select-disabled {
-    .ivu-select-selection {
-        .bri-control-disabled();
-
-        &:hover {
-            border-color: @border-disabled;
-        }
-    }
-
-    .ivu-select-input[disabled] {
-        color: @textColor;
-        -webkit-text-fill-color: @textColor;
-    }
-}
-
-.ivu-select-item {
-    margin: 4px 8px;
-    border-radius: @borderRadius;
-
-    &:hover {
-        background: @bgColor;
-    }
-
-    &-selected {
-        background-color: @theme-focus;
-        color: @themeColor;
-    }
-
+    
     &-disabled {
         .ivu-select-selection {
             .bri-control-disabled();
+    
+            &:hover {
+                border-color: @border-disabled;
+            }
+        }
+    
+        .ivu-select-input[disabled] {
+            color: @textColor;
+            -webkit-text-fill-color: @placeholder-disabled-color;
         }
     }
-
-    &-input[disabled] {
-        color: @textColor-disabled;
-        -webkit-text-fill-color: @textColor-disabled;
+    
+    &-item {
+        margin: 4px 8px;
+        border-radius: @borderRadius;
+    
+        &:hover {
+            background: @bgColor;
+        }
+    
+        &-selected {
+            background-color: @theme-focus;
+            color: @themeColor;
+        }
+    
+        &-disabled {
+            .ivu-select-selection {
+                .bri-control-disabled();
+            }
+        }
+    
+        &-input[disabled] {
+            color: @textColor-disabled;
+            -webkit-text-fill-color: @textColor-disabled;
+        }
     }
-}
+}

package/src/styles/components/index.less

@@ -6,13 +6,14 @@
 @import "./list/DshBox/DshPanel.less";
 @import "./list/DshBox/DshSingleData.less";
 @import "./list/DshBox/DshList.less";
+@import "./list/BriTable.less"; 
+@import "./list/DshPage.less";
+
+@import "./list/BriFlatTable.less"; // 不能注释flatTable在用
+@import "./list/DshCascaderTable.less"; // 不能注释cascaderTable在用
 @import "./list/BriCard.less";
-@import "./list/BriFlatTable.less";
-@import "./list/BriTable.less";
 @import "./list/BriTree.less";
 @import "./list/BriTreeItem.less";
-@import "./list/DshCascaderTable.less";
-@import "./list/DshPage.less";
 
 // form
 @import "./form/DshForm.less";
@@ -51,25 +52,21 @@
 @import "./controls/special/DshUndeveloped.less";
 
 // other
-@import "./other/BriCode.less";
-@import "./other/BriCollapseTree.less";
-@import "./other/BriGantt.less";
-@import "./other/BriIframe.less";
 @import "./other/BriLoading.less";
 @import "./other/DshAvatar.less";
-@import "./other/DshBtnModal.less";
 @import "./other/DshColorPanel.less";
-@import "./other/DshEditPanel.less";
-@import "./other/DshMenu.less";
+
 @import "./other/DshMenuNav.less";
+@import "./other/BriCode.less";
+@import "./other/BriCollapseTree.less";
+@import "./other/BriGantt.less";
+@import "./other/BriIframe.less";
 
 // small
 @import "./small/BriButton.less";
 @import "./small/BriDrawer.less";
 @import "./small/BriTooltip.less";
 @import "./small/DshButtons.less";
-@import "./small/DshCrumbs.less";
-@import "./small/DshCrumbItem.less";
 @import "./small/DshDropdown.less";
 @import "./small/DshIcons.less";
 @import "./small/DshModal.less";
@@ -77,3 +74,5 @@
 @import "./small/DshTabs.less";
 @import "./small/DshTags.less";
 @import "./small/DshTitle.less";
+
+@import "./small/DshBtnModal.less";

package/src/styles/components/list/BriTable.less

@@ -50,7 +50,7 @@
 
     &-ellipsis {
         max-width: calc(100% - 20px);
-    } 
+    }
 
     td {
         white-space: normal !important;
@@ -59,6 +59,7 @@
     &-th {
         border-bottom: none !important;
     }
+
     &-td {
         position: relative;
     }
@@ -92,7 +93,7 @@
 
 // 排序
 .ve-table-sort {
-    position: absolute!important;
+    position: absolute !important;
     top: 7px;
     right: 20px;
 
@@ -119,6 +120,11 @@
 }
 
 .ve-dropdown-popper {
+    .ve-dropdown-items-warpper {
+        max-width: 200px;
+        min-width: 100px;
+    }
+
     .ve-dropdown-dd .ve-dropdown-items {
         border-radius: @borderRadius;
         border: none;
@@ -128,7 +134,7 @@
     // 重置
     .ve-dropdown-operation .ve-dropdown-operation-item:first-of-type {
         background-color: @borderColor;
-        color: @textColor  !important;
+        color: @textColor !important;
         margin-right: 8px;
     }
 
@@ -137,7 +143,7 @@
         width: 40px;
         height: 24px;
         opacity: 1;
-        color: @white  !important;
+        color: @white !important;
         font-weight: 500;
         font-family: "PingFang SC";
         text-align: center;

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

@@ -1,13 +1,21 @@
 .DshTable {
-    width: 100%; 
+    width: 100%;
     height: 100%;
+
+    .table-operation {
+        display: flex;
+        justify-content: center;
+    }
+
     .table-operation-btn {
         margin-left: 16px;
         padding: 0px;
+
         &:first-of-type {
             margin: 0px;
         }
     }
+
     .DshButtons-dropdown-more {
         padding: 0px;
         margin-left: 16px;