bri-components 1.3.23 → 1.3.25

package/package.json

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

package/src/components/controls/base/BriUpload/uploadList.vue

@@ -375,7 +375,7 @@
                     margin-right: 3px;
                     position: relative;
                     border-radius: @borderRadius;
-
+                    text-align: center;
                     &:hover {
                         .item-action {
                             display: flex !important;

package/src/components/controls/base/DshDate/DshDate.vue

@@ -109,12 +109,16 @@
                     shortcuts: [],
                     disabledDate: (date) => {
                         const resultObj = this.$validateComparedRule(
-                            [this.selfPropsObj],
+                            [{
+                                ...this.selfPropsObj,
+                                _isCompareByParent: true
+                            }],
                             {
                                 ...this.value,
                                 [this.controlKey]: this.$transformDate(date, "/", this.subType)
                             },
-                            this.allFormList
+                            this.selfPropsObj._isCompareByParent === true ? this.parentFormList : this.allFormList,
+                            this.selfPropsObj._isCompareByParent === true ? this.parentObj : undefined
                         );
                         return !resultObj.bool;
                     }

package/src/components/controls/mixins/controlMixin.js

@@ -16,8 +16,6 @@ export default {
                 return {};
             }
         },
-
-        /* 表单形式下用到的 */
         // 暂时是dshDate里在用，时间对比时需要用其他时间字段
         allFormList: {
             type: Array,
@@ -25,13 +23,26 @@ export default {
                 return [];
             }
         },
-        /* 列表形式下用到的 */
+
+        /* 内部表，层级表内的字段用到的 */
         rowIndex: Number,
         parentListData: {
             type: Array,
             default () {
                 return [];
             }
+        },
+        parentFormList: {
+            type: Array,
+            default () {
+                return [];
+            }
+        },
+        parentObj: {
+            type: Object,
+            default () {
+                return {};
+            }
         }
     },
     data () {
@@ -60,11 +71,12 @@ export default {
                 return this.value[this.controlKey];
             },
             set (val) {
-                this.value[this.controlKey] = val;
                 // 修复文本框clear后值为undefined，后端无法更新保存数据bug
                 if (["select"].includes(this.controlType) && this.value[this.controlKey] === undefined) {
-                    this.value[this.controlKey] = "";
+                    val = "";
                 }
+
+                this.$set(this.value, this.controlKey, val);
                 this.change();
             }
         },

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

@@ -16,14 +16,30 @@
         <template v-else>
             <!-- 配置端 设置默认值用-->
             <dsh-btn-modal v-if="propsObj._key === '_default'">
-                <dsh-cascader-table
-                    :canEdit="finalCanEdit"
-                    :treeColumns="treeColumns"
-                    :subColumns="subColumns"
-                    :data="curVal"
-                    :propsObj="propsObj"
-                    @change="change"
-                ></dsh-cascader-table>
+                <template>
+                    <dsh-tree-table
+                        v-if="showMode === 'treeTable'"
+                        :canEdit="finalCanEdit"
+                        :data="curVal.tree"
+                        :rowDefault="curVal.rowDefault"
+                        :columns="subForm"
+                        :propsObj="propsObj"
+                        :parentFormList="allFormList"
+                        :parentObj="value"
+                        @change="change"
+                    ></dsh-tree-table>
+                    <dsh-cascader-table
+                        v-else
+                        :canEdit="finalCanEdit"
+                        :data="curVal"
+                        :treeColumns="treeColumns"
+                        :subColumns="subForm"
+                        :propsObj="propsObj"
+                        :parentFormList="allFormList"
+                        :parentObj="value"
+                        @change="change"
+                    ></dsh-cascader-table>
+                </template>
             </dsh-btn-modal>
 
             <!-- 正常使用 -->
@@ -36,32 +52,65 @@
                     @click="$dispatchEvent($event)"
                 ></dsh-buttons>
 
-                <dsh-cascader-table
-                    ref="dshCascaderTable"
-                    useCol
-                    :canEdit="finalCanEdit"
-                    :treeColumns="treeColumns"
-                    :subColumns="subColumns"
-                    :data="curVal"
-                    :propsObj="propsObj"
-                    @change="change"
-                ></dsh-cascader-table>
-
-                <!-- 全屏查看 -->
-                <dsh-modal
-                    v-model="isEnlarge"
-                    mode="custom"
-                    :propsObj="modalPropsObj"
-                >
+                <template>
+                    <dsh-tree-table
+                        v-if="showMode === 'treeTable'"
+                        ref="table"
+                        :canEdit="finalCanEdit"
+                        :data="curVal.tree"
+                        :rowDefault="curVal.rowDefault"
+                        :columns="subForm"
+                        :propsObj="propsObj"
+                        :parentFormList="allFormList"
+                        :parentObj="value"
+                        @change="change"
+                    ></dsh-tree-table>
                     <dsh-cascader-table
+                        v-else
+                        ref="table"
                         useCol
                         :canEdit="finalCanEdit"
-                        :treeColumns="treeColumns"
-                        :subColumns="subColumns"
                         :data="curVal"
+                        :treeColumns="treeColumns"
+                        :subColumns="subForm"
                         :propsObj="propsObj"
+                        :parentFormList="allFormList"
+                        :parentObj="value"
                         @change="change"
                     ></dsh-cascader-table>
+                </template>
+
+                <!-- 全屏查看 -->
+                <dsh-modal
+                    v-model="isEnlarge"
+                    mode="custom"
+                    :propsObj="modalPropsObj"
+                >
+                    <template>
+                        <dsh-tree-table
+                            v-if="showMode === 'treeTable'"
+                            :canEdit="finalCanEdit"
+                            :data="curVal.tree"
+                            :rowDefault="curVal.rowDefault"
+                            :columns="subForm"
+                            :propsObj="propsObj"
+                            :parentFormList="allFormList"
+                            :parentObj="value"
+                            @change="change"
+                        ></dsh-tree-table>
+                        <dsh-cascader-table
+                            v-else
+                            useCol
+                            :canEdit="finalCanEdit"
+                            :data="curVal"
+                            :treeColumns="treeColumns"
+                            :subColumns="subForm"
+                            :propsObj="propsObj"
+                            :parentFormList="allFormList"
+                            :parentObj="value"
+                            @change="change"
+                        ></dsh-cascader-table>
+                    </template>
                 </dsh-modal>
             </template>
         </template>
@@ -70,8 +119,9 @@
 
 <script>
     import controlMixin from "../mixins/controlMixin.js";
-    import DshBtnModal from "../../small/DshBtnModal.vue";
     import DshCascaderTable from "../../list/DshCascaderTable.vue";
+    import DshTreeTable from "../../list/DshTreeTable.vue";
+    import DshBtnModal from "../../small/DshBtnModal.vue";
 
     export default {
         name: "cascaderTable",
@@ -79,8 +129,9 @@
             controlMixin
         ],
         components: {
-            DshBtnModal,
-            DshCascaderTable
+            DshCascaderTable,
+            DshTreeTable,
+            DshBtnModal
         },
         props: {},
         data () {
@@ -109,16 +160,30 @@
             };
         },
         computed: {
+            selfPropsObj () {
+                return {
+                    _showMode: "default", // "default", "treeTable"
+                    _subForm: [],
+                    _treeForm: [],
+                    _isExport: false,
+                    ...this.propsObj
+                };
+            },
+            showMode () {
+                return this.propsObj._showMode;
+            },
+            subForm () {
+                return this.propsObj._subForm;
+            },
+            treeForm () {
+                return this.propsObj._treeForm;
+            },
             // 用户态的每条数据的表头配置，都是存的自己的，不用通用配置_treeForm的
             treeColumns () {
                 return this.curVal && this.curVal._treeForm
                     ? this.curVal._treeForm
-                    : this.propsObj._treeForm;
+                    : this.treeForm;
             },
-            subColumns () {
-                return this.propsObj._subForm;
-            },
-
             operationBtns () {
                 return this.propsObj._isExport
                     ? ["canExport", "canEnlarge"]
@@ -126,7 +191,7 @@
             },
             modalPropsObj () {
                 return {
-                    title: this.propsObj._name,
+                    title: this.controlName,
                     fullscreen: true,
                     showSlotClose: false,
                     closable: true
@@ -141,7 +206,7 @@
         methods: {
             // 校验方法 -供外部使用
             validate () {
-                return this.$refs.dshCascaderTable.validate();
+                return this.$refs.table.validate();
             },
 
             // 点击导出

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

@@ -24,11 +24,12 @@
                 <dsh-btn-modal v-if="propsObj._key === '_default'">
                     <dsh-flat-table
                         :canEdit="finalCanEdit"
-                        :columns="columns"
                         :data="curVal.list"
                         :rowDefault="curVal.rowDefault"
-                        :parentObj="value"
+                        :columns="columns"
                         :propsObj="propsObj"
+                        :parentFormList="allFormList"
+                        :parentObj="value"
                         @change="change"
                     ></dsh-flat-table>
                 </dsh-btn-modal>
@@ -46,12 +47,13 @@
                     <dsh-flat-table
                         ref="dshFatTable"
                         :canEdit="finalCanEdit"
-                        :columns="columns"
                         :data="curVal.list"
                         :oldData="curVal.oldList"
                         :rowDefault="curVal.rowDefault"
-                        :parentObj="value"
+                        :columns="columns"
                         :propsObj="propsObj"
+                        :parentFormList="allFormList"
+                        :parentObj="value"
                         @change="change"
                     ></dsh-flat-table>
 
@@ -63,12 +65,13 @@
                     >
                         <dsh-flat-table
                             :canEdit="finalCanEdit"
-                            :columns="columns"
                             :data="curVal.list"
                             :oldData="curVal.oldList"
                             :rowDefault="curVal.rowDefault"
-                            :parentObj="value"
+                            :columns="columns"
                             :propsObj="propsObj"
+                            :parentFormList="allFormList"
+                            :parentObj="value"
                             @change="change"
                         ></dsh-flat-table>
                     </dsh-modal>
@@ -198,6 +201,9 @@
             },
             // 导出点击
             clickExport (operationItem) {
+                if (operationItem.disabled || this.timer) {
+                    return;
+                }
                 operationItem.disabled = true;
                 this.$https({
                     url: {
@@ -235,9 +241,11 @@
                     callback: data => {
                         if (data.status === "completed") {
                             clearInterval(this.timer);
+                            this.timer = null;
                             window.location.href = data.url;
                         } else if (data.status === "failed") {
                             clearInterval(this.timer);
+                            this.timer = null;
                             // this.exportBtnLoading = false;
                             this.$Message.info({ content: "操作失败，请稍后再试" });
                         }

package/src/components/form/DshForm.vue

@@ -27,6 +27,10 @@
                                 :formData="formData"
                                 :formItem="formItem"
                                 :allFormList="allFormList"
+                                :rowIndex="rowIndex"
+                                :parentListData="parentListData"
+                                :parentFormList="parentFormList"
+                                :parentObj="parentObj"
                                 :changedFields="changedFields"
                                 :height="height"
                                 :rowStyle="rowStyle"
@@ -123,13 +127,33 @@
                     return [];
                 }
             },
-
             allFormList: {
                 type: Array,
                 default () {
                     return [];
                 }
             },
+
+            rowIndex: Number,
+            parentListData: {
+                type: Array,
+                default () {
+                    return [];
+                }
+            },
+            parentFormList: {
+                type: Array,
+                default () {
+                    return [];
+                }
+            },
+            parentObj: {
+                type: Object,
+                default () {
+                    return {};
+                }
+            },
+
             changedFields: {
                 type: Array,
                 default () {

package/src/components/list/BriTable.vue

@@ -102,14 +102,12 @@
                 }
                 return className;
             },
-
             rowStyleOption () {
                 return {
                     clickHighlight: false,
                     ...(this.propsObj.rowStyleOption || {})
                 };
             },
-
             cellStyleOption () {
                 return {
                     headerCellClass: () => {

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

@@ -6,7 +6,6 @@
                 ref="list"
                 :data="data"
                 :columns="columns"
-                :fixTitle="fixTitle"
                 :ownColumns="ownColumns"
                 :operationList="dropdownOperationList"
                 :extraOperationList="extraOperationList"
@@ -83,13 +82,24 @@
                     return ["table", "crossTable", "panel", "card", "list", "singleData"].includes(val);
                 }
             },
-
-            fixTitle: {
-                type: Boolean,
-                default: true
+            data: {
+                type: Array,
+                default () {
+                    return [];
+                }
+            },
+            ownColumns: {
+                type: Array,
+                default () {
+                    return [];
+                }
+            },
+            columns: {
+                type: Array,
+                default () {
+                    return [];
+                }
             },
-            data: Array,
-            columns: Array,
             changedFields: {
                 type: Array,
                 default () {
@@ -103,10 +113,10 @@
                 }
             },
             listPropsObj: Object,
+
             pageMode: String,
             total: Number,
-            pagePropsObj: Object,
-            ownColumns: Array
+            pagePropsObj: Object
         },
         data () {
             return {};

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

@@ -141,7 +141,7 @@
 
             <!-- 操作 -->
             <div
-                v-if="operationCol && selfPropsObj.showAction"
+                v-if="operationColumn && selfPropsObj.showAction"
                 class="DshCrossTable-left-footer"
             >
                 <table
@@ -155,7 +155,7 @@
                                 background: '#f4f4f4'
                             }"
                         >
-                            <div class="td-content">操作</div>
+                            <div class="td-content">{{ operationColumn.title }}</div>
                         </td>
                     </tr>
                 </table>
@@ -317,7 +317,7 @@
 
             <!-- 操作 -->
             <div
-                v-if="operationCol && selfPropsObj.showAction"
+                v-if="operationColumn && selfPropsObj.showAction"
                 class="DshCrossTable-right-footer"
             >
                 <table
@@ -340,7 +340,7 @@
                                 <dsh-list-render
                                     :row="dataItem"
                                     :index="dataIndex"
-                                    :render="operationCol.renderBodyCell"
+                                    :render="operationColumn.renderBodyCell"
                                 ></dsh-list-render>
                             </div>
                         </td>
@@ -422,13 +422,14 @@
                 };
             },
             columnList () {
-                return this.columns.filter(item => item.type !== "operation");
+                return this.columns;
             },
-            operationCol () {
+            operationColumn () {
                 return {
                     title: "操作",
-                    _name: "操作",
-                    type: "expend",
+                    _key: "__operation__",
+                    key: "__operation__",
+                    field: "__operation__",
                     width: 150,
                     renderBodyCell: (params, h) => {
                         return this.operationList.length < 3