bri-components 1.1.6 → 1.2.0

package/src/components/list/{ZTree.vue → BriTree.vue}

@@ -1,14 +1,14 @@
 <template>
-    <div class="ZTree">
-        <div class="ZTree-action">
+    <div class="BriTree">
+        <div class="BriTree-action">
             <dsh-buttons
-                class="ZTree-action-create"
+                class="BriTree-action-create"
                 :list="$getOperationList(['createNode'])"
                 @click="$dispatchEvent($event)"
             ></dsh-buttons>
         </div>
 
-        <div class="ZTree-tree">
+        <div class="BriTree-tree">
             <Tree
                 :data="treeData"
                 :render="renderContent"
@@ -17,11 +17,12 @@
 
         <!-- 添加节点弹窗 -->
         <dsh-modal
+            class="BriTree-modal"
             v-model="treeFormShow"
             :propsObj="treeFormPropsObj"
             mode="custom"
         >
-            <div class="ZTree-create-content">
+            <div class="BriTree-modal-content">
                 <dsh-form
                     v-if="treeFormShow"
                     ref="treeForm"
@@ -31,7 +32,7 @@
                 ></dsh-form>
 
                 <dsh-buttons
-                    class="textRight dsh-padding20"
+                    class="BriTree-modal-content-btns"
                     :list="$getOperationList(['clickNodeCancel', 'clickNodeConfirm'])"
                     @click="$dispatchEvent($event, { data: treeFormData })"
                 ></dsh-buttons>
@@ -53,7 +54,7 @@
         });
     };
     export default {
-        name: "ZTree",
+        name: "BriTree",
         props: {
             data: Array,
             // 树形级联类别：cascader dropdown
@@ -358,7 +359,7 @@
                                     icon: "md-arrow-dropdown-circle",
                                     color: this.colorMap[data.color] || this.colorMap["color-1"]
                                 },
-                                menuClass: "ZTree-dropdown-menu",
+                                menuClass: "BriTree-dropdown-menu",
                                 list: this.colorArr
                             },
                             style: {

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

@@ -35,13 +35,13 @@
                 <div class="DshCard-item-info">
                     <!-- 标题 -->
                     <div class="DshCard-item-info-title dsh-ellipsis">
-                        <Ctooltip
+                        <bri-tooltip
                             placement="top"
                             :transfer="true"
                             :content="dataItem[propsObj.titleField]"
                         >
                             <div class="dsh-ellipsis">{{ dataItem[propsObj.titleField] }}</div>
-                        </Ctooltip>
+                        </bri-tooltip>
                     </div>
 
                     <!-- 显示字段 -->
@@ -51,7 +51,7 @@
                         :key="colItem._key"
                     >
                         <!-- 左 label -->
-                        <Ctooltip
+                        <bri-tooltip
                             class="unit-label"
                             placement="top"
                             :transfer="true"
@@ -59,7 +59,7 @@
                             :content="colItem._name"
                         >
                             <span class="dsh-ellipsis">{{ colItem._name }}</span>
-                        </Ctooltip>
+                        </bri-tooltip>
                         <span class="unit-colon">：</span>
 
                         <!-- 右 val -->

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

@@ -71,14 +71,14 @@
                                     fontWeight: 500
                                 }"
                             >
-                                <Ctooltip
+                                <bri-tooltip
                                     transfer
                                     :content="colItem.title"
                                 >
                                     <div class="td-content dsh-ellipsis">
                                         {{ colItem.title }}
                                     </div>
-                                </Ctooltip>
+                                </bri-tooltip>
                             </td>
                         </tr>
 
@@ -93,7 +93,7 @@
                                     background: '#F7F9FD'
                                 }"
                             >
-                                <Ctooltip
+                                <bri-tooltip
                                     transfer
                                     :content="colItem.title"
                                 >
@@ -115,7 +115,7 @@
                                             </template>
                                         </slot>
                                     </div>
-                                </Ctooltip>
+                                </bri-tooltip>
                             </td>
                         </tr>
                     </table>

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

@@ -43,14 +43,14 @@
                         justifyContent: getFlexLayout(col._align)
                     }"
                 >
-                    <Ctooltip
+                    <bri-tooltip
                         transfer
                         :content="col._name"
                     >
                         <span class="dsh-ellipsis">
                             {{ col._name }}
                         </span>
-                    </Ctooltip>
+                    </bri-tooltip>
                 </div>
             </div>
         </div>

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

@@ -14,14 +14,14 @@
                 }"
             >
                 <span class="DshPanel-group-title-name">
-                    <Ctooltip
+                    <bri-tooltip
                         class="unit-label"
                         placement="top"
                         :transfer="true"
                         :content="groupItem.name"
                     >
                         <span class="dsh-ellipsis">{{ groupItem.name }} &nbsp;</span>
-                    </Ctooltip>
+                    </bri-tooltip>
                 </span>
                 <span>
                     <span class="DshPanel-group-title-number">
@@ -43,7 +43,7 @@
                 <div
                     v-if="!groupItem.list.length"
                     class="dsh-tip"
-                    style="position: absolute; top: 0px; left: 0px; width: 100%;"
+                    :style="{color: getBgColor(groupItem)}"
                 >
                     {{ noDataText }}
                 </div>
@@ -89,7 +89,7 @@
                                 :key="colItem._key"
                             >
                                 <!-- 左 label -->
-                                <Ctooltip
+                                <bri-tooltip
                                     class="unit-label"
                                     placement="top"
                                     :transfer="true"
@@ -97,7 +97,7 @@
                                     :content="colItem._name"
                                 >
                                     <span class="dsh-ellipsis">{{ colItem._name }}</span>
-                                </Ctooltip>
+                                </bri-tooltip>
                                 <span class="unit-colon">：</span>
 
                                 <!-- 右 val -->

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

@@ -66,8 +66,9 @@
                         ...(operationItem._name_ || operationItem.name)
                             .split("/")
                             .map(item => item.length * (operationItem.size === "small" ? 12 : 14))
-                    ) +
-                    (operationItem.size === "small" ? 16 : 8); // 按钮的padding,故意多了2px保留余地
+                    ) + (
+                        operationItem.icon || operationItem.customIcon ? 20 : 0) + (
+                            operationItem.size === "small" ? 8 : 16); // 按钮的padding,故意多了2px保留余地
                 };
 
                 return this.operationList.map(operationItem => {
@@ -127,8 +128,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 ? 53 : 0) + // 出现更多按钮的宽度
-                                                (this.selfOperationList.length > 0 ? 30 : 0) + // 操作列的padding
+                                                (this.selfOperationList.length > maxBtnNum ? 70 : 0) + // 出现更多按钮的宽度
+                                                (this.selfOperationList.length > 0 ? 40 : 0) + // 操作列的padding
                                                 4 // 留出4px空间，避免麻烦问题
                                             , 80
                                         ),
@@ -143,85 +144,25 @@
                                                     )
                                                 };
                                             });
-                                            const outFilterOperationList = totalOperationList.slice(0, maxBtnNum - 1);
-                                            const moreFilterOperationList = totalOperationList.slice(maxBtnNum - 1).filter(operationItem => !operationItem.disabled);
 
                                             // TODO: 注意此处totalOperationList用的一定是表格行显示最多的操作按钮数组，有改动注意看此备注！！！
-                                            return totalOperationList.length <= maxBtnNum
-                                                ? h("dsh-buttons", {
-                                                    props: {
-                                                        list: totalOperationList,
-                                                        itemClass: "table-operation-btn"
-                                                    },
-                                                    on: {
-                                                        click: (operationItem) => {
-                                                            this.$dshEmit(operationItem, params.row, params.row);
-                                                        }
-                                                    },
-                                                    nativeOn: {
-                                                        click: (e) => {
-                                                            e.stopPropagation();
-                                                        }
+                                            return h("dsh-buttons", {
+                                                props: {
+                                                    list: totalOperationList,
+                                                    maxFlatNum: maxBtnNum - 1,
+                                                    itemClass: "table-operation-btn"
+                                                },
+                                                on: {
+                                                    click: (operationItem) => {
+                                                        this.$dshEmit(operationItem, params.row, params.row);
                                                     }
-                                                })
-                                                : h("div", [
-                                                    h("dsh-buttons", {
-                                                        style: {
-                                                            display: "inline-block"
-                                                        },
-                                                        props: {
-                                                            list: outFilterOperationList,
-                                                            itemClass: "table-operation-btn"
-                                                        },
-                                                        on: {
-                                                            click: (operationItem) => {
-                                                                this.$dshEmit(operationItem, params.row, params.row);
-                                                            }
-                                                        },
-                                                        nativeOn: {
-                                                            click: (e) => {
-                                                                e.stopPropagation();
-                                                            }
-                                                        }
-                                                    }),
-                                                    h("dsh-dropdown", {
-                                                        props: {
-                                                            dropdownObj: {
-                                                                icon: "ios-more",
-                                                                size: 22,
-                                                                color: "#E9ECF4",
-                                                                showDropdownItemIcon: false
-                                                            },
-                                                            list: moreFilterOperationList
-                                                        },
-                                                        on: {
-                                                            click: (operationItem) => {
-                                                                this.$dshEmit(operationItem, params.row, params.row);
-                                                            }
-                                                        },
-                                                        nativeOn: {
-                                                            click: (e) => {
-                                                                e.stopPropagation();
-                                                            }
-                                                        }
-                                                    }, [
-                                                        h("dsh-buttons", {
-                                                            class: "dsh-margin-left5",
-                                                            props: {
-                                                                list: [
-                                                                    {
-                                                                        name: "更多>>",
-                                                                        type: "more",
-                                                                        btnType: "text",
-                                                                        size: "default",
-                                                                        class: "table-operation-btn",
-                                                                        disabled: !moreFilterOperationList.length
-                                                                    }
-                                                                ]
-                                                            }
-                                                        })
-                                                    ])
-                                            ]);
+                                                },
+                                                nativeOn: {
+                                                    click: (e) => {
+                                                        e.stopPropagation();
+                                                    }
+                                                }
+                                            });
                                         }
                                     }
                                 ]

package/src/components/list/DshCascaderTable.vue

@@ -105,7 +105,7 @@
 
                                                     <!-- 查看状态 -->
                                                     <template v-else>
-                                                        <Ctooltip
+                                                        <bri-tooltip
                                                             :transfer="true"
                                                             :content="enterText(row[col._key].name)"
                                                         >
@@ -114,7 +114,7 @@
                                                                 class="dsh-ellipsis"
                                                                 style="word-break:break-word"
                                                             ></span>
-                                                        </Ctooltip>
+                                                        </bri-tooltip>
 
                                                         <!-- 操作下拉 -->
                                                         <dsh-dropdown

package/src/components/other/{ZCode.vue → BriCode.vue}

@@ -1,5 +1,5 @@
 <template>
-   <div class="ZCode">
+   <div class="BriCode">
         <codemirror
             style="height:100%"
             v-model="computedVal"
@@ -38,7 +38,7 @@
     import "codemirror/addon/display/autorefresh"; // 及时自动更新，配置里面也需要设置autoRefresh为true
 
     export default {
-        name: "ZCode",
+        name: "BriCode",
         components: {
             codemirror
         },
@@ -116,10 +116,3 @@
         }
     };
 </script>
-
-<style lang="less" scoped>
-   .ZCode {
-       width: 100%;
-       height: 100%;
-   }
-</style>

package/src/components/other/{ZCollapseTree.vue → BriCollapseTree.vue}

@@ -1,10 +1,14 @@
 <template>
-    <div class="ZCollapseTree">
+    <div class="BriCollapseTree">
         <ul>
-            <li v-for="listItem in list" :key="listItem._key">
+            <li
+                v-for="listItem in list"
+                :key="listItem._key"
+            >
                 <!-- 有children -->
-                <Collapse class="ZCollapseTree-collapse"
+                <Collapse
                     v-if="listItem.children && listItem.children.length"
+                    class="BriCollapseTree-collapse"
                     :accordion="listItem._accordion"
                     :simple="listItem._simple === false ? false : true"
                     :hide-arrow="true"
@@ -12,33 +16,50 @@
                 >
                     <Panel :name="listItem._key">
                         <div
-                            class="ZCollapseTree-collapseItem"
-                            :class="{ 'ZCollapseTree-listItem-disabled': listItem.disabled }"
+                            :class="{
+                                'BriCollapseTree-collapseItem': true,
+                                'BriCollapseTree-listItem-disabled': listItem.disabled
+                            }"
                             @click.stop="click(listItem)"
                         >
-                            <div class="ZCollapseTree-listItem-text">
+                            <div class="BriCollapseTree-listItem-text">
                                 {{ listItem.name }}
-                                <span class="ZCollapseTree-listItem-current" v-if="listItem.current">(当前)</span>
+                                <span
+                                    class="BriCollapseTree-listItem-current"
+                                    v-if="listItem.current"
+                                >(当前)</span>
                             </div>
-                            <div class="ZCollapseTree-listItem-grey">
+                            <div class="BriCollapseTree-listItem-grey">
                                 {{ listItem._simpleDescription }}
                             </div>
                         </div>
-                        <z-collapse-tree slot="content" :list="listItem.children" @click="click"></z-collapse-tree>
+
+                        <bri-collapse-tree
+                            slot="content"
+                            :list="listItem.children"
+                            @click="click"
+                        ></bri-collapse-tree>
                     </Panel>
                 </Collapse>
 
                 <!-- 直接展示 -->
-                <div v-else
-                    class="ZCollapseTree-listItem"
-                    :class="{ 'ZCollapseTree-listItem-disabled': listItem.disabled }"
+                <div
+                    v-else
+                    :class="{
+                        'BriCollapseTree-collapseItem': true,
+                        'BriCollapseTree-listItem-disabled': listItem.disabled
+                    }"
                     @click.stop="click(listItem)"
                 >
-                    <div class="ZCollapseTree-listItem-text">
+                    <div class="BriCollapseTree-listItem-text">
                         {{ listItem.name }}
-                        <span class="ZCollapseTree-listItem-current" v-if="listItem.current">(当前)</span>
+                        <span
+                            v-if="listItem.current"
+                            class="BriCollapseTree-listItem-current"
+                        >(当前)</span>
                     </div>
-                    <div class="ZCollapseTree-listItem-grey">
+
+                    <div class="BriCollapseTree-listItem-grey">
                         <Tooltip
                             placement="right"
                             max-width="300"
@@ -57,7 +78,7 @@
 
 <script>
     export default {
-        name: "ZCollapseTree",
+        name: "BriCollapseTree",
         props: {
             list: {
                 type: Array,

package/src/components/other/{ZIframe.vue → BriIframe.vue}

@@ -1,17 +1,18 @@
 <template>
-    <div class="ZIframe">
+    <div class="BriIframe">
         <iframe
             v-if="url"
-            ref="ZIframe"
-            class="ZIframe-iframe"
+            ref="BriIframe"
+            class="BriIframe-iframe"
             :src="url"
             frameborder="0"
             allowtransparency="true"
             :allow="allow"
         ></iframe>
+
         <div
             v-else
-            class="dsh-flex-row-center-center ZIframe-nodata"
+            class="dsh-flex-row-center-center BriIframe-nodata"
         >
             <img
                 :src="noData"
@@ -29,7 +30,7 @@
 
 <script>
     export default {
-        name: "ZIframe",
+        name: "BriIframe",
         props: {
             url: {
                 type: String,
@@ -57,7 +58,7 @@
         },
         methods: {
             init () {
-                let iframe = this.$refs.ZIframe;
+                let iframe = this.$refs.BriIframe;
                 if (!iframe) {
                     return;
                 }
@@ -91,20 +92,3 @@
         }
     };
 </script>
-
-<style lang="less">
-    .ZIframe {
-        display: flex;
-        width: 100%;
-        height: 100%;
-        position: relative;
-        &-iframe {
-            flex: 1;
-            overflow: auto;
-        }
-        &-nodata {
-            width: 100%;
-            height: 100%;
-        }
-   }
-</style>

package/src/components/other/{ZLoading.vue → BriLoading.vue}

@@ -1,36 +1,50 @@
 <template>
-   <div
+    <div
         v-if="value"
-        class="ZLoading"
+        class="BriLoading"
         :class="{
-            'ZLoading-fix': fix,
-            'ZLoading-center': center
+            'BriLoading-fix': fix,
+            'BriLoading-center': center
         }"
     >
-        <div class="ZLoading-main">
+        <div class="BriLoading-main">
             <slot>
                 <template v-if="value === 1">
-                    <div class="ZLoading-main-loading" :style="getStyle">
+                    <div
+                        class="BriLoading-main-loading"
+                        :style="getStyle"
+                    >
                     </div>
-                    <div v-if="showLoadingText" class="ZLoading-main-loadingText">
+                    <div
+                        v-if="showLoadingText"
+                        class="BriLoading-main-loadingText"
+                    >
                         {{ loadText }}
                     </div>
                 </template>
 
                 <template v-else-if="value==2">
-                    <BriSvg :src="imgSrc" />
-                    <div v-if="noText" class="ZLoading-main-noText">
+                    <bri-svg :src="imgSrc" />
+                    <div
+                        v-if="noText"
+                        class="BriLoading-main-noText"
+                    >
                         {{ noText }}
                     </div>
                 </template>
             </slot>
         </div>
-   </div>
+    </div>
 </template>
 
 <script>
+    import BriSvg from "./BriSvg";
+
     export default {
-        name: "ZLoading",
+        name: "BriLoading",
+        components: {
+            BriSvg
+        },
         props: {
             // 0 不加载，1：loading，2：空数据
             value: {

package/src/components/other/BriSvg.vue

@@ -1,5 +1,5 @@
 <template>
-    <svg class="bri" aria-hidden="true">
+    <svg aria-hidden="true">
         <use :href="href"></use>
     </svg>
 </template>
@@ -7,7 +7,7 @@
 <script>
 
     export default {
-        name: "imgscg",
+        name: "BriSvg",
         components: {},
         props: {
             src: String