bri-components 1.2.14 → 1.2.16

package/package.json

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

package/src/{components/other → 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/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/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

@@ -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/BriTree.vue

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

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/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/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;
+        }
     }
-}
 }