bri-components 1.0.5 → 1.1.1

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

@@ -1,9 +1,9 @@
 <template>
     <div class="DshPanel">
         <div
-            class="DshPanel-group"
             v-for="(groupItem, groupIndex) in data"
             :key="groupIndex"
+            class="DshPanel-group"
         >
             <!-- 组 标头 -->
             <div
@@ -164,7 +164,7 @@
             },
             noDataText: {
                 type: String,
-                default: "暂无数据..."
+                default: "暂无内容..."
             },
 
             operationList: {
@@ -192,10 +192,9 @@
 
                 getBgColor (groupItem) {
                     return this.groupFieldObj._useColor
-                        ? this.colorMap[(this.groupFieldObj._data.find(item => item._key === groupItem._key) || { color: "color-default" }).color]
-                        : "color-default";
-                },
-                colorMap: resourceData.colorMap
+                        ? resourceData.colorMap[(this.groupFieldObj._data.find(item => item._key === groupItem._key) || { color: "color-default" }).color]
+                        : resourceData.colorMap["color-default"];
+                }
             };
         },
         computed: {
@@ -385,10 +384,6 @@
                     height: 40px;
                     padding: 0px 10px;
                     text-align: center;
-
-                    .ivu-btn {
-                        background: transparent;
-                    }
                 }
             }
         }

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

@@ -8,7 +8,7 @@
             :formList="columns"
         ></dsh-form>
 
-        <!-- 暂无数据 -->
+        <!-- 暂无内容 -->
         <div
             v-else
             class="DshSingleData-nodata"

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

@@ -3,26 +3,18 @@
         class="DshTable"
         style="width: 100%; height: 100%;"
     >
-        <ev-table
+        <bri-table
             :className="propsObj.className"
             :data="data"
-            :columnsList="selfColumns"
-            :fixTitle="fixTitle"
-            :showSort="propsObj.showSort"
-            :tableBgColor="propsObj.tableBgColor"
-            :title-bg-color="propsObj.titleBgColor"
-            :title-font-color="propsObj.titleFontColor"
-            :odd-bg-color="propsObj.oddBgColor"
-            :even-bg-color="propsObj.evenBgColor"
-            :row-hover-color="propsObj.rowHoverColor"
-            :row-click-color="propsObj.rowClickColor"
-            :noDataText="propsObj.noDataText"
-            :is-loading="propsObj.isLoading"
-            :selectChange="changeSelect"
-            :selectAll="changeSelect"
+            :columns="selfColumns"
+            :propsObj="propsObj"
+            :isLoading="isLoading"
+            :noDataText="noDataText"
+            @selectChange="changeSelect"
+            @selectAll="changeSelect"
             @click-row="clickRow"
             @sort-change="changeSort"
-        ></ev-table>
+        ></bri-table>
     </div>
 </template>
 
@@ -59,7 +51,9 @@
                 default () {
                     return {};
                 }
-            }
+            },
+            isLoading: Boolean,
+            noDataText: String
         },
         data () {
             return {};
@@ -99,26 +93,24 @@
                         ...(
                             this.multiple
                                 ? [{
-                                    title: "多选",
-                                    _name: "多选",
-                                    type: "selection",
-                                    width: 45,
-                                    titleAlign: "left",
-                                    columnAlign: "left",
-                                    isFrozen: true
+                                    field: "selection",
+                                    key: "selection",
+                                    type: "checkbox",
+                                    width: 66,
+                                    align: "center",
+                                    fixed: "left"
                                 }]
                                 : []
                         ),
                         {
-                            field: "custome",
                             title: "序号",
-                            _name: "序号",
-                            width: 67,
-                            titleAlign: "center",
-                            columnAlign: "center",
-                            isFrozen: true,
-                            formatter: function (rowData, rowIndex, pagingIndex, field) {
-                                return rowIndex + 1;
+                            field: "custome",
+                            key: "customes",
+                            width: 78,
+                            align: "center",
+                            fixed: "left",
+                            renderBodyCell: ({ row, column, rowIndex }, h) => {
+                                return ++rowIndex;
                             }
                         },
 
@@ -129,8 +121,10 @@
                                 ? [
                                     {
                                         title: "操作",
-                                        _name: "操作",
-                                        type: "expend",
+                                        field: "operation",
+                                        key: "operation",
+                                        align: "center",
+                                        fixed: "right",
                                         width: Math.max(
                                             // 漏在外部按钮的宽度
                                             this.selfOperationList
@@ -141,11 +135,7 @@
                                                 4 // 留出4px空间，避免麻烦问题
                                             , 80
                                         ),
-                                        titleAlign: "center",
-                                        columnAlign: "center",
-                                        componentName: "dsh-td-render",
-                                        isFrozenRight: true,
-                                        render: (h, params) => {
+                                        renderBodyCell: (params, h) => {
                                             const totalOperationList = this.selfOperationList.map(operationItem => {
                                                 return {
                                                     ...operationItem,

package/src/components/list/DshCascaderTable.vue

@@ -1,6 +1,6 @@
 <template>
     <div
-        :class="`DshCascaderTable control-${mode}`"
+        class="DshCascaderTable"
         ref="DshCascaderTable"
     >
         <div :class="{
@@ -149,11 +149,11 @@
                                                 :style="getTdStyle(col, row)"
                                             >
                                                 <dsh-unit
-                                                    :mode="mode"
                                                     :canEdit="canEdit && (col.canEdit === undefined ? true : col.canEdit)"
                                                     :formData="row[col.nodeKey]"
                                                     :formItem="col"
                                                     :rowIndex="rowIndex"
+                                                    :isUnit="!canEdit"
                                                     @change="$dispatchEvent(operationMap.changeVal, col, row, arguments)"
                                                 ></dsh-unit>
                                             </td>
@@ -166,7 +166,7 @@
                                     v-else
                                     class="table-nodata"
                                 >
-                                    <td :colspan="columns.length">暂无数据……</td>
+                                    <td :colspan="columns.length">暂无内容……</td>
                                 </tr>
                             </tbody>
                         </table>
@@ -186,10 +186,6 @@
             DshUnit
         },
         props: {
-            mode: {
-                type: String,
-                default: "default"
-            },
             useCol: {
                 type: Boolean,
                 default: false
@@ -232,7 +228,7 @@
         },
         data () {
             return {
-                widthMap: this.$getModFieldPropertyMap("unitWidth"),
+                widthMap: this.$getModFieldPropertyMap("width"),
                 boxWidth: 0,
                 getColOperationNames (col) {
                     return [
@@ -342,7 +338,7 @@
             },
 
             treeData () {
-                return this.transformTreeData();
+                return this.transforBriTreeData();
             },
             columns () {
                 return this.transformColumns(this.treeColumns);
@@ -520,7 +516,7 @@
             deleteSelfAndChildNodes (operationItem, row, rowIndex, col) {
                 let nodeData = this.getNodeData(row, rowIndex, col);
                 nodeData.brotherList.splice(nodeData.index, 1);
-                // 此处应该判断子节点是否是最后一个，是的话就要添加一个一直到叶子节点，不过现在只需要添加一个子节点，transformTreeData会捎带着处理了
+                // 此处应该判断子节点是否是最后一个，是的话就要添加一个一直到叶子节点，不过现在只需要添加一个子节点，transforBriTreeData会捎带着处理了
                 if (!nodeData.brotherList.length) {
                     let newNode = this.getNewNode(nodeData.level, nodeData.brotherList);
                     nodeData.brotherList.push(newNode);
@@ -532,7 +528,7 @@
             deleteChildNodes (operationItem, row, rowIndex, col) {
                 let nodeData = this.getNodeData(row, rowIndex, col);
                 nodeData.childList.splice(0);
-                // 删除完应该添加一个子节点一直到叶子节点，不过现在只需要添加一个子节点，transformTreeData会捎带着处理了
+                // 删除完应该添加一个子节点一直到叶子节点，不过现在只需要添加一个子节点，transforBriTreeData会捎带着处理了
                 let newNode = this.getNewNode(nodeData.level + 1, nodeData.childList);
                 nodeData.childList.push(newNode);
 
@@ -589,7 +585,7 @@
                 );
             },
             // 转化树数据
-            transformTreeData (treeForm = this.treeColumns, subForm = this.subColumns) {
+            transforBriTreeData (treeForm = this.treeColumns, subForm = this.subColumns) {
                 treeForm.forEach((treeFormItem, treeFormIndex) => {
                     treeFormItem.canDelete = true; // 每次计算，重置一下
                     treeFormItem.level = treeFormIndex + 1; // treeColumns更新,缺少level

package/src/components/list/DshFlatTable.vue

@@ -154,7 +154,7 @@
                         <td
                             class="table-row-nodata"
                             :colspan="showColumns.length"
-                        >暂无数据……</td>
+                        >暂无内容……</td>
                     </tr>
                 </tfoot>
             </table>

package/src/components/list/easyTable/v-table/src/table.vue

@@ -992,7 +992,7 @@
                 hasFrozenColumn: false, // 是否拥有固定列（false时最后一列的右边border无边框）
                 hasFrozenRightColumn: false,
                 resizeTimer: null,
-                firstLoad: true, // 表格首次初始化加载，用于区分显示”数据加载中“还是”暂无数据“
+                firstLoad: true, // 表格首次初始化加载，用于区分显示”数据加载中“还是”暂无内容“
                 tipContent: ""
             };
         },
@@ -1113,7 +1113,7 @@
             // 没数据时的html
             errorContent: {
                 type: String,
-                default: "暂无数据..."
+                default: "暂无内容..."
             },
             // 没数据时内容区域高度
             errorContentHeight: {
@@ -1488,7 +1488,7 @@
             updateErrorContent () {
                 if (!this.firstLoad) {
                     if (!(this.internalTableData && this.internalTableData.length)) {
-                        this.tipContent = "暂无数据";
+                        this.tipContent = "暂无内容";
                     }
                 }
                 this.firstLoad = false;

package/src/components/list/evTable/EvTable.vue

@@ -173,7 +173,7 @@
             height: Number,
             noDataText: {
                 type: String,
-                default: "暂无数据..."
+                default: "暂无内容..."
             }
         },
         data () {

package/src/components/other/BriTransfer.vue

@@ -0,0 +1,71 @@
+<template>
+    <div class="BriTransfer">
+        <Transfer
+            :data="selfData"
+            :target-keys="targetKeys"
+            :filterable="filterable"
+            :filter-method="filterMethod"
+            :titles="titles"
+            not-found-text="暂无内容"
+            @on-change="handleChange"
+        ></Transfer>
+    </div>
+</template>
+
+<script>
+    export default {
+        name: "BriTransfer",
+        props: {
+            data: {
+                type: Array,
+                default: () => {
+                    return [];
+                }
+            },
+            value: {
+                type: Array,
+                default: () => {
+                    return [];
+                }
+            },
+            filterMethod: {
+                type: Function,
+                default: () => {
+                    return {};
+                }
+            },
+            titles: {
+                type: Array,
+                default: () => {
+                    return ["源列表", "目的列表"];
+                }
+            },
+            filterable: Boolean
+        },
+        data () {
+            return {
+                targetKeys: []
+            };
+        },
+        computed: {
+            selfData () {
+                return this.data.map(item => {
+                    return {
+                        key: item._key,
+                        label: item._name || item.name || item.realname
+                    };
+                });
+            }
+        },
+        created () {
+            this.targetKeys = this.value;
+        },
+        methods: {
+            handleChange (newTargetKeys) {
+                this.targetKeys = newTargetKeys;
+                this.$emit("input", this.targetKeys);
+                this.$emit("change", this.targetKeys);
+            }
+        }
+    };
+</script>

package/src/components/other/ZGantt.vue

@@ -110,14 +110,14 @@
                             <td
                                 :colspan="timeData.length"
                                 class="briGantt-table-td"
-                            >暂无数据</td>
+                            >暂无内容</td>
                         </tr>
                         <tbody v-if="type==='table'">
                             <tr v-if="computedData.length === 0">
                                 <td
                                     :colspan="timeData.length"
                                     class="briGantt-table-td"
-                                >暂无数据</td>
+                                >暂无内容</td>
                             </tr>
                             <tr
                                 class="briGantt-table-tr"

package/src/components/small/BriButton.vue

@@ -0,0 +1,65 @@
+<template>
+    <Button
+        class="BriButton"
+        :class="selfPropsObj.class"
+        :type="selfPropsObj.btnType"
+        :shape="selfPropsObj.shape || shape"
+        :size="selfPropsObj.size || size"
+        :loading="selfPropsObj.loading"
+        :disabled="selfPropsObj.disabled"
+        :htmlType="selfPropsObj.htmlType"
+        :icon="selfPropsObj.icon || icon"
+        :customIcon="selfPropsObj.customIcon || customIcon"
+        :long="selfPropsObj.long"
+        :ghost="selfPropsObj.ghost"
+        @click="dispatchEvent"
+    >
+        <slot></slot>
+    </Button>
+</template>
+
+<script>
+    import controlMixin from "../controls/controlMixin.js";
+    export default {
+        name: "BriButton",
+        mixins: [controlMixin],
+        props: {
+            type: {
+                type: String,
+                default: "primary"
+            },
+            icon: String,
+            shape: String,
+            size: String,
+            customIcon: String
+        },
+        data () {
+            return {};
+        },
+        computed: {
+            selfPropsObj () {
+                let defaultType = this.propsObj.btnType || this.type;
+                let setType = this.propsObj.btnType || this.type;
+                if (["cancel"].includes(defaultType)) {
+                    setType = "primary";
+                } else if (["errorLine"].includes(defaultType)) {
+                    setType = "default";
+                } else if (["linkText", "primaryText", "errorText"].includes(defaultType)) {
+                    setType = "text";
+                }
+                return {
+                    class: ["cancel", "linkText", "primaryText", "errorLine", "errorText"].includes(defaultType) ? `ivu-btn-${defaultType}` : "",
+                    ...this.propsObj,
+                    btnType: setType,
+                    customIcon: this.propsObj.customIcon ? `bico-font ${this.propsObj.customIcon}` : undefined
+                };
+            }
+        },
+        created () {},
+        methods: {
+            dispatchEvent () {
+                this.$emit("click", this.selfPropsObj);
+            }
+        }
+    };
+</script>

package/src/components/small/BriTree.vue

@@ -0,0 +1,42 @@
+<template>
+    <Tree
+        class="BriTree"
+        :data="val"
+        :multiple="propsObj.multiple"
+        :showCheckbox="propsObj.showCheckbox"
+        :checkStrictly="propsObj.checkStrictly"
+        :checkDirectly="propsObj.checkDirectly"
+        :emptyText="propsObj.emptyText"
+        :childrenKey="propsObj.childrenKey"
+        :loadData="propsObj.loadData"
+        :render="propsObj.render"
+        :selectNode="propsObj.selectNode"
+        :expandNode="propsObj.expandNode"
+    ></Tree>
+</template>
+
+<script>
+    import controlMixin from "../controls/controlMixin.js";
+    export default {
+        name: "BriTree",
+        mixins: [controlMixin],
+        props: {
+        },
+        data () {
+            return {};
+        },
+        computed: {
+            selfPropsObj () {
+                return {
+                    ...this.propsObj
+                };
+            },
+            val () {
+                return this.value[this.propsObj._key];
+            }
+        },
+        created () {},
+        methods: {
+        }
+    };
+</script>

package/src/components/small/Ctooltip.vue

@@ -6,7 +6,7 @@
         :content="content"
         :placement="placement"
         :transfer="transfer"
-        :maxWidth="maxWidth"
+        :max-width="maxWidth"
     >
         <div
             ref="ellipsisContent"

package/src/components/small/DshButtons.vue

@@ -9,7 +9,7 @@
         >
             <!-- 左侧按钮 -->
             <div class="DshButtons-flex-left">
-                <Button
+                <bri-button
                     v-for="(operationItem, index) in leftFlatList"
                     :key="operationItem.type"
                     :style="operationItem.style"
@@ -17,16 +17,8 @@
                         index ? 'dsh-margin-left5' : undefined,
                         !operationItem.customIcon && !operationItem.icon ? 'DshButtons-item' : undefined,
                         itemClass,
-                        ...(Array.isArray(operationItem.class) ? operationItem.class : [operationItem.class])
                     ]"
-                    :type="operationItem.btnType"
-                    :ghost="operationItem.ghost"
-                    :size="operationItem.size"
-                    :shape="operationItem.shape"
-                    :long="operationItem.long"
-                    :disabled="operationItem.disabled"
-                    :icon="operationItem.icon"
-                    :custom-icon="operationItem.customIcon ? `bico-font ${operationItem.customIcon}` : undefined"
+                    :propsObj="operationItem"
                     @click="emit(operationItem)"
                 >
                     <span
@@ -35,7 +27,7 @@
                     >
                         {{ operationItem.name }}
                     </span>
-                </Button>
+                </bri-button>
 
                 <!-- 更多的 下拉按钮-->
                 <dsh-dropdown
@@ -46,21 +38,14 @@
                     @click="emit($event)"
                 >
                     <slot name="more">
-                        <Button
+                        <bri-button
                             class="DshButtons-dropdown-more"
-                            :type="moreBtnOperationObj.btnType"
-                            :ghost="moreBtnOperationObj.ghost"
-                            :size="moreBtnOperationObj.size"
-                            :shape="moreBtnOperationObj.shape"
-                            :long="moreBtnOperationObj.long"
-                            :disabled="moreBtnOperationObj.disabled"
-                            :icon="moreBtnOperationObj.icon"
-                            :custom-icon="moreBtnOperationObj.customIcon ? `bico-font ${moreBtnOperationObj.customIcon}` : undefined"
+                            :propsObj="moreBtnOperationObj"
                         >
                             <span class="DshButtons-dropdown-more-name">
                                 {{ moreBtnOperationObj.name }}
                             </span>
-                        </Button>
+                        </bri-button>
                     </slot>
                 </dsh-dropdown>
             </div>
@@ -69,7 +54,7 @@
             <div class="DshButtons-flex-right">
                 <slot></slot>
 
-                <Button
+                <bri-button
                     v-for="(operationItem, index) in rightList"
                     :key="operationItem.type"
                     :style="operationItem.style"
@@ -77,16 +62,8 @@
                         index ? 'dsh-margin-left5' : undefined,
                         !operationItem.customIcon && !operationItem.icon ? 'DshButtons-item' : undefined,
                         itemClass,
-                        ...(Array.isArray(operationItem.class) ? operationItem.class : [operationItem.class])
                     ]"
-                    :type="operationItem.btnType"
-                    :ghost="operationItem.ghost"
-                    :size="operationItem.size"
-                    :shape="operationItem.shape"
-                    :long="operationItem.long"
-                    :disabled="operationItem.disabled"
-                    :icon="operationItem.icon"
-                    :custom-icon="operationItem.customIcon ? `bico-font ${operationItem.customIcon}` : undefined"
+                    :propsObj="operationItem"
                     @click="emit(operationItem)"
                 >
                     <span
@@ -95,12 +72,12 @@
                     >
                         {{ operationItem.name }}
                     </span>
-                </Button>
+                </bri-button>
             </div>
         </div>
 
         <template v-else>
-            <Button
+            <bri-button
                 v-for="(operationItem, index) in list"
                 :key="operationItem.type"
                 :style="operationItem.style"
@@ -110,14 +87,7 @@
                     itemClass,
                     ...(Array.isArray(operationItem.class) ? operationItem.class : [operationItem.class])
                 ]"
-                :type="operationItem.btnType"
-                :ghost="operationItem.ghost"
-                :size="operationItem.size"
-                :shape="operationItem.shape"
-                :long="operationItem.long"
-                :disabled="operationItem.disabled"
-                :icon="operationItem.icon"
-                :custom-icon="operationItem.customIcon ? `bico-font ${operationItem.customIcon}` : undefined"
+                :propsObj="operationItem"
                 @click="emit(operationItem)"
             >
                 <span
@@ -126,7 +96,7 @@
                 >
                     {{ operationItem.name }}
                 </span>
-            </Button>
+            </bri-button>
         </template>
     </div>
 </template>

package/src/components/small/DshControlDefine.vue

@@ -3,7 +3,8 @@
         :class="{
             'dsh-control-define': true,
             'dsh-control-define-multiplerow': selfPropsObj._multiplerow,
-            'dsh-control-define-disabled': !canEdit
+            'dsh-control-define-disabled': $isDisabled(canEdit, propsObj),
+            'dsh-control-define-show': !canEdit
         }"
         @click="clickInput"
     >

package/src/components/small/DshDropdown.vue

@@ -86,7 +86,7 @@
                     v-else
                     class="nodata"
                 >
-                    暂无数据
+                    暂无内容
                 </div>
             </div>
         </div>

package/src/components/small/DshTdRender.js

@@ -16,6 +16,6 @@ export default {
             index: ctx.props.index
         };
         if (ctx.props.column) params.column = ctx.props.column;
-        return ctx.props.render(h, params);
+        return ctx.props.render(params, h);
     }
 };