bri-components 1.3.82 → 1.3.83

package/package.json

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

package/src/components/form/DshForm.vue

@@ -199,7 +199,7 @@
 
                 forceValidateTypes: [
                     "select", "region", "cascader", "regions", "cascaders", "file", "coordinates", "editor",
-                    "users", "departments", "labels", "flatTable", "reference", "referenceBy"
+                    "users", "departments", "labels", "flatTable", "cascaderTable", "reference", "referenceBy"
                 ],
                 ignoreProperties: [
                     "_name", "_key", "_default", "_required", "_regStr", "_regMessage", "_span", "_br", "_line", "_noLabel", "_clearable",

package/src/components/list/BriTable.vue

@@ -189,11 +189,11 @@
         methods: {
             // hidden columns
             hideColumnsByKeys (keys = []) {
-                this.$refs["briTable"].hideColumnsByKeys(keys);
+                this.$refs.briTable.hideColumnsByKeys(keys);
             },
             // show cloumns
             showColumnsByKeys (keys = []) {
-                this.$refs["briTable"].showColumnsByKeys(keys);
+                this.$refs.briTable.showColumnsByKeys(keys);
             }
         }
     };

package/src/components/list/DshFlatTable.vue

@@ -9,29 +9,62 @@
             :render="topSearchRender"
         ></dsh-render>
 
-        <!-- 表格 -->
-        <bri-table
-            v-show="showListData.length"
-            ref="briTable"
-            class="DshFlatTable-main"
-            :columns="showColumns"
-            :data="renderedListData"
-            :footer-data="footerData"
-            :propsObj="tablePropsObj"
-            @changeSelect="changeSelect"
-            @selectAll="changeSelect"
-        ></bri-table>
-        <bri-table
-            v-show="!showListData.length"
-            ref="briTable"
-            class="DshFlatTable-main"
-            :columns="showColumns"
-            :data="showListData"
-            :footer-data="footerData"
-            :propsObj="tablePropsObj"
-            @changeSelect="changeSelect"
-            @selectAll="changeSelect"
-        ></bri-table>
+        <!-- 表单展示模式 -->
+        <div
+            v-if="showMode === 'form'"
+            class="DshFlatTable-form"
+        >
+            <div
+                v-for="(row, rowIndex) in showListData"
+                :key="row._id"
+                class="item"
+            >
+                <dsh-form
+                    :canEdit="getRowCanEdit(row)"
+                    :formData="row"
+                    :formList="getRowFormList(row)"
+                    :allFormList="columns"
+                    :inTableType="inTableType"
+                    :allListRows="allListData"
+                    :rowIndex="rowIndex"
+                    :parentFormList="allFormList"
+                    :parentObj="parentObj"
+                ></dsh-form>
+
+                <dsh-icons
+                    v-if="$getOperationList(['canCreate', 'canDelete']).length"
+                    class="item-icons"
+                    itemClass="item-icons-item"
+                    :list="$getOperationList(['canCreate', 'canDelete'])"
+                    @click="$dispatchEvent($event, row, rowIndex)"
+                ></dsh-icons>
+            </div>
+        </div>
+
+        <!-- 表格展示模式 -->
+        <template v-else>
+            <bri-table
+                v-show="showListData.length"
+                ref="briTable"
+                class="DshFlatTable-main"
+                :columns="showColumns"
+                :data="renderedListData"
+                :footer-data="footerData"
+                :propsObj="tablePropsObj"
+                @changeSelect="changeSelect"
+                @selectAll="changeSelect"
+            ></bri-table>
+            <bri-table
+                v-show="!showListData.length"
+                class="DshFlatTable-main"
+                :columns="showColumns"
+                :data="showListData"
+                :footer-data="footerData"
+                :propsObj="tablePropsObj"
+                @changeSelect="changeSelect"
+                @selectAll="changeSelect"
+            ></bri-table>
+        </template>
 
         <!-- 添加行 -->
         <dsh-render :render="createOperationRender"></dsh-render>
@@ -58,6 +91,7 @@
 
                 <!-- 表格 -->
                 <bri-table
+                    v-show="showListData.length"
                     class="DshFlatTable-main"
                     :columns="showColumns"
                     :data="renderedListData"
@@ -66,6 +100,16 @@
                     @changeSelect="changeSelect"
                     @selectAll="changeSelect"
                 ></bri-table>
+                <bri-table
+                    v-show="!showListData.length"
+                    class="DshFlatTable-main"
+                    :columns="showColumns"
+                    :data="showListData"
+                    :footer-data="footerData"
+                    :propsObj="tablePropsObj"
+                    @changeSelect="changeSelect"
+                    @selectAll="changeSelect"
+                ></bri-table>
 
                 <!-- 添加行 -->
                 <dsh-render :render="createOperationRender"></dsh-render>
@@ -97,6 +141,13 @@
 
 <style lang="less" scoped>
     .DshFlatTable {
+        &-form {
+            .item {
+                border: 1px solid #E5E5E6;
+                margin-bottom: 5px;
+                position: relative;
+            }
+        }
 
         &-main {
             width: 100%;
@@ -110,3 +161,25 @@
         }
     }
 </style>
+<style lang="less">
+    .DshFlatTable {
+        &-form {
+            .item {
+                &-icons {
+                    position: absolute;
+                    top: -10px;
+                    right: -10px;
+                    line-height: 18px;
+                    z-index: 2;
+                    display: none;
+                }
+
+                &:hover {
+                    .item-icons {
+                        display: block !important;
+                    }
+                }
+            }
+        }
+    }
+</style>

package/src/components/list/DshTreeTable.vue

@@ -23,10 +23,9 @@
         ></bri-table>
         <bri-table
             v-show="!showListData.length"
-            ref="briTable"
             class="DshTreeTable-main"
             :columns="showColumns"
-            :data="renderedListData"
+            :data="showListData"
             :footer-data="footerData"
             :propsObj="tablePropsObj"
             @changeSelect="changeSelect"
@@ -58,6 +57,7 @@
 
                 <!-- 表格 -->
                 <bri-table
+                    v-show="showListData.length"
                     class="DshTreeTable-main"
                     :columns="showColumns"
                     :data="renderedListData"
@@ -66,6 +66,16 @@
                     @changeSelect="changeSelect"
                     @selectAll="changeSelect"
                 ></bri-table>
+                <bri-table
+                    v-show="!showListData.length"
+                    class="DshTreeTable-main"
+                    :columns="showColumns"
+                    :data="showListData"
+                    :footer-data="footerData"
+                    :propsObj="tablePropsObj"
+                    @changeSelect="changeSelect"
+                    @selectAll="changeSelect"
+                ></bri-table>
 
                 <!-- 添加行 -->
                 <dsh-render :render="createOperationRender"></dsh-render>

package/src/components/list/common/quoteListModal.vue

@@ -9,7 +9,7 @@
             :closable="true"
             :draggable="true"
         >
-            <div class="quoteListModal-drawer-body">
+            <div class="quoteListModal-body">
                 <div class="list">
                     <template v-if="listData.length">
                         <div
@@ -34,8 +34,8 @@
                 </div>
 
                 <dsh-buttons
-                    class="quoteListModal-drawer-body-btns"
-                    itemClass="quoteListModal-drawer-body-btns-item"
+                    class="quoteListModal-body-btns"
+                    itemClass="btns-item"
                     :list="$getOperationList()"
                     @click="$dispatchEvent($event)"
                 ></dsh-buttons>
@@ -74,12 +74,6 @@
                 curDataItem: undefined,
 
                 operationMap: {
-                    canReset: {
-                        name: "重 置",
-                        type: "canReset",
-                        size: "small",
-                        event: "clickReset"
-                    },
                     confirm: {
                         name: "确 认",
                         type: "confirm",
@@ -123,10 +117,6 @@
                 } else {
                     this.curDataItem = dataItem;
                 }
-            },
-            // 点击重置
-            clickReset () {
-
             },
             // 点击确认
             clickConfirm () {
@@ -155,47 +145,6 @@
 <style lang="less">
     .quoteListModal {
         &-drawer {
-            &-body {
-                width: 100%;
-                height: 100%;
-                padding: 20px;
-                overflow: auto;
-
-                .list {
-                    &-item {
-                        padding: 8px 12px;
-                        margin-bottom: 8px;
-                        border-radius: 4px;
-                        cursor: pointer;
-
-                        &-active {
-                            color: #ffffff;
-                            background-color: @theme-hover;
-                        }
-                    }
-
-                    &-nodata {
-                        #dsh-nodata();
-                    }
-                }
-
-                &-btns {
-                    position: absolute;
-                    bottom: 0px;
-                    left: 0px;
-                    .dsh-flex-row-start-stretch();
-                    width: calc(100% - 48px);
-                    height: 51px;
-                    margin: 25px 20px 25px 28px;
-
-                    &-item {
-                        flex: 1;
-                        margin: 5px;
-                        height: 40px;
-                    }
-                }
-            }
-
             .ivu-drawer-mask,
             .ivu-drawer-wrap {
                 z-index: 88888888;
@@ -212,5 +161,46 @@
                 font-weight: bold;
             }
         }
+
+        &-body {
+            width: 100%;
+            height: 100%;
+            padding: 20px;
+            overflow: auto;
+
+            .list {
+                &-item {
+                    padding: 8px 12px;
+                    margin-bottom: 8px;
+                    border-radius: 4px;
+                    cursor: pointer;
+
+                    &-active {
+                        color: #ffffff;
+                        background-color: @theme-hover;
+                    }
+                }
+
+                &-nodata {
+                    #dsh-nodata();
+                }
+            }
+
+            &-btns {
+                position: absolute;
+                bottom: 0px;
+                left: 0px;
+                .dsh-flex-row-start-stretch();
+                width: calc(100% - 48px);
+                height: 51px;
+                margin: 25px 20px 25px 28px;
+
+                .btns-item {
+                    flex: 1;
+                    min-width: 0px;
+                    height: 40px;
+                }
+            }
+        }
     }
 </style>

package/src/components/list/mixins/DshTreeTableMixin.js

@@ -186,7 +186,7 @@ export default {
                                         color: "#3DB8C5"
                                     },
                                     props: {
-                                        type: "md-add-circle", // "ios-add"
+                                        type: "md-add-circle",
                                         size: "14"
                                     },
                                     on: {
@@ -224,7 +224,7 @@ export default {
                                         color: "#3DB8C5"
                                     },
                                     props: {
-                                        type: "ios-add", // "md-add-circle"
+                                        type: "ios-add",
                                         size: "14"
                                     },
                                     on: {

package/src/components/list/mixins/tableBaseMixin.js

@@ -137,6 +137,7 @@ export default {
                     name: "添加一行",
                     type: "canCreate",
                     btnType: "default",
+                    icon: "md-add-circle",
                     size: "default",
                     long: true,
                     disabled: false,
@@ -673,6 +674,7 @@ export default {
             this.initFlag = true;
             this.showRuleMessage = false;
             this.ruleRecordMap = {};
+            this.selfReset && this.selfReset();
         },
         // 共外部使用
         validate () {
@@ -704,15 +706,15 @@ export default {
 
         /* ----------- 隐藏／显示字段 ---------- */
         toggleHideOrShow () {
-            if (this.$refs["briTable"]) {
+            if (this.$refs.briTable) {
                 if (this.hideStatus === true) {
-                    this.$refs["briTable"].showColumnsByKeys(this.hideColKeys);
+                    this.$refs.briTable.showColumnsByKeys(this.hideColKeys);
                 } else {
-                    this.$refs["briTable"].hideColumnsByKeys(this.hideColKeys);
+                    this.$refs.briTable.hideColumnsByKeys(this.hideColKeys);
                 }
-            }
 
-            this.hideStatus = !this.hideStatus;
+                this.hideStatus = !this.hideStatus;
+            }
         },
 
         /* ----------- 全屏 ---------- */
@@ -769,7 +771,8 @@ export default {
                             ...fieldVal,
                             list: fieldVal.list.map(item => ({
                                 ...item,
-                                __isQuote__: true
+                                __isQuote__: true,
+                                __old__: false
                             }))
                         };
                     } else if (["cascaderTable"].includes(this.controlType)) {
@@ -778,7 +781,8 @@ export default {
                                 list.map(item => ({
                                     ...item,
                                     children: item.children ? loop(item.children) : item.children,
-                                    __isQuote__: true
+                                    __isQuote__: true,
+                                    __old__: false
                                 }));
 
                             return loop(list);
@@ -792,7 +796,6 @@ export default {
 
                     this.$Message.success("引用成功！");
                     this.reset();
-                    this.selfReset && this.selfReset();
                     this.change("quote");
                 }
             } else {
@@ -1076,6 +1079,17 @@ export default {
             return this.getRowCanEdit(row) &&
                 this.getColCanEdit(col, row) &&
                 this.$isAdvRelyShow(col, row, this.parentObj, true);
+        },
+        getRowFormList (row) {
+            return this.columns.map(column => {
+                column = this.$transformDynamicProperty(column, row, this.parentObj);
+                const unitCanEdit = this.getColCanEdit(column, row);
+
+                return {
+                    ...column,
+                    canEdit: unitCanEdit
+                };
+            });
         }
     }
 };