bri-components 1.1.5 → 1.2.0

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

@@ -1,38 +1,45 @@
 <!-- 动态标签 -->
 <template>
     <div class="BriLabels">
-        <!-- 编辑 -->
+        <!-- 编辑页 -->
         <Dropdown
-            v-if="finalCanEdit"
+            v-if="canEdit"
             class="BriLabels-dropdown"
             trigger="custom"
             placement="bottom-start"
             :visible="listVisible"
+            transfer
             @on-clickoutside="clickInput"
         >
+            <!-- 可编辑 -->
             <div
                 :class="{
-                    'control-edit': true,
-                    'BriLabels-dropdown-show':true,
-                    'BriLabels-dropdown-show-active':listVisible
+                    'BriLabels-box': true,
+                    ...commonClass
                 }"
                 @click="clickInput"
             >
-                <div class="BriLabels-dropdown-show-list">
-                    <Tag
-                        v-for="item in val"
-                        :key="item._key"
-                        closable
-                        @on-close="handleCancel(item)"
+                <template v-if="val.length">
+                    <dsh-tags
+                        v-if="val"
+                        class="BriLabels-text"
+                        :list="val"
+                        :propsObj="{
+                            closable: finalCanEdit,
+                            disabled: !finalCanEdit
+                        }"
+                        @delete="handleCancel"
                     >
-                        {{item.name}}
-                    </Tag>
-                </div>
-                <Icon
-                    class="BriLabels-dropdown-show-arrow"
-                    color="#808695"
-                    :type="inputIcon"
-                />
+                        <span slot-scope="{ tagItem }"> {{ tagItem.name }}</span>
+                    </dsh-tags>
+
+                    <Icon
+                        class="BriLabels-icon"
+                        :type="inputIcon"
+                    />
+                </template>
+
+                <template v-else>{{ commonDealPropsObj._placeholder }}</template>
             </div>
 
             <template #list>
@@ -93,7 +100,7 @@
                                 btnType: 'default',
                                 icon:'md-add'
                             }"
-                            @click="addLabel"
+                            @click.native.stop="addLabel"
                         >
                             添加选项
                         </bri-button>
@@ -102,38 +109,30 @@
             </template>
         </Dropdown>
 
-        <!-- 查看 -->
-        <div
-            v-else
-            class="BriLabels-view"
-        >
-            <template v-if="val.length">
-                <Ctooltip
-                    placement="top"
-                    :transfer="true"
-                    maxWidth="200"
-                    :content="showValStr"
-                >
-                    <div class="dsh-ellipsis">
-                        <div
-                            v-for="item in val"
-                            :key="item._key"
-                            size="medium"
-                            class="BriLabels-view-item"
-                        >
-                            {{ item.name }}
-                        </div>
-                    </div>
-                </Ctooltip>
-            </template>
-
-            <div
-                v-else
-                class="BriLabels-view-nodata"
+        <!-- 查看模式 -->
+        <template v-else>
+            <bri-tooltip
+                :content="showValStr"
+                maxWidth="200"
+                :transfer="true"
             >
-                {{ emptyShowVal }}
-            </div>
-        </div>
+                <div :class="commonClass">
+                    <dsh-tags
+                        v-if="!$isEmptyData(val)"
+                        class="BriLabels-text"
+                        :list="val"
+                        :propsObj="{
+                            closable: false
+                        }"
+                    >
+                        <span slot-scope="{ tagItem }"> {{ tagItem.name }}</span>
+                    </dsh-tags>
+                    <template v-else>
+                        {{ emptyShowVal }}
+                    </template>
+                </div>
+            </bri-tooltip>
+        </template>
     </div>
 </template>
 
@@ -158,6 +157,9 @@
                     ...this.commonDealPropsObj
                 };
             },
+            modKey () {
+                return this.selfPropsObj.modKey;
+            },
             val: {
                 get () {
                     return this.value[this.propsObj._key] || [];
@@ -169,13 +171,25 @@
             showValStr () {
                 let valArr = this.val && this.val.map(item => item.name);
                 return valArr && valArr.join("、");
+            },
+            isCore () {
+                return this.propsObj.isCore;
             }
         },
         created () {
         },
         methods: {
             init () {
-                this.getListData();
+                if (this.isCore) {
+                    this.listData = this.propsObj._originLabels.map(item => {
+                        return {
+                            ...item,
+                            isEdit: false
+                        };
+                    });
+                } else {
+                    this.getListData();
+                }
             },
             getListData () {
                 this.$https({
@@ -187,7 +201,8 @@
                         search: {
                             entityKey: this.entityKey, // 当前工作表关联的数据表Key
                             fieldKey: this.selfPropsObj._key === "_default" ? this.value._key : (this.selfPropsObj.__realKey__ || this.selfPropsObj._key), // 当前字段Key
-                            labelType: this.selfPropsObj._labelType
+                            labelType: this.selfPropsObj._labelType,
+                            modKey: this.modKey
                         },
                         pagination: {
                             page: 1,
@@ -223,6 +238,7 @@
                 } else {
                     this.val.push(item);
                 }
+                this.change();
             },
             clickEdit (item) {
                 item.isEdit = true;
@@ -235,9 +251,10 @@
                 if (item.name == "") return;
                 item.isEdit = false;
                 this.$forceUpdate();
+                this.change();
             },
             handleCancel (item) {
-                this.val = this.val.filter(i => i._key != item._key);
+                this.change();
             },
             addLabel () {
                 this.listData.push({
@@ -246,6 +263,7 @@
                     name: "",
                     labelType: this.selfPropsObj._labelType
                 });
+                this.change();
             }
         },
         watch: {

package/src/components/controls/special/DshUndeveloped.vue

@@ -33,9 +33,3 @@
         methods: {}
     };
 </script>
-
-<style lang="less">
-    .DshUndeveloped {
-        width: 100%;
-    }
-</style>

package/src/components/form/DshDefaultSearch.vue

@@ -53,7 +53,7 @@
             v-if="canUseFold"
             class="DshDefaultSearch-fold"
         >
-            <div class="DshDefaultSearch-fold-zhanwei"></div>
+            <!-- <div class="DshDefaultSearch-fold-zhanwei"></div> -->
             <Icon
                 :class="[
                     'DshDefaultSearch-fold-icon',

package/src/components/form/DshForm.vue

@@ -148,7 +148,10 @@
         data () {
             return {
                 rules: {},
-                forceValidateTypes: ["select", "cascader", "regions", "cascaders", "file", "coordinates", "editor", "users", "departments", "labels", "flatTable", "reference", "referenceBy"],
+                forceValidateTypes: [
+                    "select", "cascader", "regions", "cascaders", "file", "coordinates", "editor",
+                    "users", "departments", "labels", "flatTable", "reference", "referenceBy"
+                ],
                 ignoreProperties: [
                     "_name", "_key", "_default", "_required", "_span", "_br", "_line", "_noLabel", "_clearable",
                     "_disabledBtns", "_disabledOldDataRow"
@@ -319,15 +322,3 @@
         }
     };
 </script>
-
-<style lang="less">
-    .DshForm {
-        &-item-FormItem {
-            margin-bottom: 0px!important;
-        }
-        .ivu-form-item-error-tip {
-            top: 90%;
-            left: 15px;
-        }
-    }
-</style>

package/src/components/list/BriTable.vue

@@ -34,7 +34,7 @@
         ></ve-table>
 
         <!-- loading -->
-        <ZLoading v-if="isLoading" />
+        <bri-loading v-if="isLoading" />
         <!-- empty -->
         <div
             v-else-if="!data.length"

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>