bri-components 1.4.60 → 1.4.62

package/package.json

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

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

@@ -20,16 +20,6 @@
 
             <!-- 日期、日期时间、年、月 -->
             <template v-else>
-                <!-- <DatePicker
-                    class="DshDate-edit"
-                    v-model="curVal"
-                    :type="subType"
-                    :placeholder="selfPropsObj._placeholder"
-                    :disabled="disabled"
-                    :clearable="clearable"
-                    :options="options"
-                    :transfer="selfPropsObj._transfer"
-                    ></DatePicker> -->
                 <DatePicker
                     class="DshDate-edit"
                     :model-value="curVal"

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

@@ -55,7 +55,7 @@ export default {
             return this.selfPropsObj._selectFilterVals || []; // 老版级联表格层级属性那用到单选，缺这些属性，会产生undefined，有问题
         },
         selectFilterKey () {
-            return this.selfPropsObj._selectFilterKey;
+            return this.selfPropsObj._selectFilterKey || this.saveKey;
         },
 
         listData () {
@@ -63,8 +63,8 @@ export default {
             listData = this.selectFilterVals.length
                 ? listData.filter(item =>
                     this.reverseFilter
-                        ? !this.selectFilterVals.includes(item[this.selectFilterKey || this.saveKey])
-                        : this.selectFilterVals.includes(item[this.selectFilterKey || this.saveKey])
+                        ? !this.selectFilterVals.includes(item[this.selectFilterKey])
+                        : this.selectFilterVals.includes(item[this.selectFilterKey])
                 )
                 : listData;
             listData = this.$dataType(this.selfPropsObj._filterFunc, "function")

package/src/components/list/DshFlatTable.vue

@@ -53,8 +53,9 @@
             <template v-else>
                 <bri-table
                     class="DshFlatTable-main"
+                    :isLoading="isLoading"
                     :columns="showColumns"
-                    :data="selfShowListData"
+                    :data="isLoading ? [] : selfShowListData"
                     :footer-data="footerData"
                     :propsObj="tablePropsObj"
                     @changeSelect="changeSelect"
@@ -161,8 +162,9 @@
                     <template v-else>
                         <bri-table
                             class="DshFlatTable-fullscreen-inner-main"
+                            :isLoading="isLoading"
                             :columns="showColumns"
-                            :data="selfShowListData"
+                            :data="isLoading ? [] : selfShowListData"
                             :footer-data="footerData"
                             :propsObj="tableInModalPropsObj"
                             @changeSelect="changeSelect"

package/src/components/list/DshTreeTable.vue

@@ -11,26 +11,37 @@
 
         <!-- 表格 -->
         <bri-table
+            class="DshTreeTable-main"
+            :isLoading="isLoading"
+            :columns="showColumns"
+            :data="isLoading ? [] : showListData"
+            :footer-data="footerData"
+            :propsObj="tablePropsObj"
+            @changeSelect="changeSelect"
+            @selectAll="changeSelect"
+        ></bri-table>
+        <!-- <bri-table
             v-show="showListData.length"
-            ref="briTable"
             class="DshTreeTable-main"
+            :isLoading="isLoading"
             :columns="showColumns"
-            :data="renderedListData"
+            :data="isLoading ? [] : renderedListData"
             :footer-data="footerData"
             :propsObj="tablePropsObj"
             @changeSelect="changeSelect"
             @selectAll="changeSelect"
         ></bri-table>
         <bri-table
-            v-show="!showListData.length"
+            v-if="!showListData.length"
             class="DshTreeTable-main"
+            :isLoading="isLoading"
             :columns="showColumns"
-            :data="showListData"
+            :data="[]"
             :footer-data="footerData"
             :propsObj="tablePropsObj"
             @changeSelect="changeSelect"
             @selectAll="changeSelect"
-        ></bri-table>
+        ></bri-table> -->
 
         <!-- 添加行 -->
         <dsh-render :render="createBtnRender"></dsh-render>
@@ -58,20 +69,10 @@
 
                 <!-- 表格 -->
                 <bri-table
-                    v-show="showListData.length"
-                    class="DshTreeTable-fullscreen-inner-main"
-                    :columns="showColumns"
-                    :data="renderedListData"
-                    :footer-data="footerData"
-                    :propsObj="tableInModalPropsObj"
-                    @changeSelect="changeSelect"
-                    @selectAll="changeSelect"
-                ></bri-table>
-                <bri-table
-                    v-show="!showListData.length"
                     class="DshTreeTable-fullscreen-inner-main"
+                    :isLoading="isLoading"
                     :columns="showColumns"
-                    :data="showListData"
+                    :data="isLoading ? [] : showListData"
                     :footer-data="footerData"
                     :propsObj="tableInModalPropsObj"
                     @changeSelect="changeSelect"

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

@@ -130,46 +130,48 @@ export default {
             return h("div", {
                 class: "DshCasTable-main-center-list"
             }, [
-                h("div", {
-                    class: "DshCasTable-main-center-list-inner"
-                }, [
-                    h("table", {
-                        class: "table",
-                        attrs: {
-                            border: "1",
-                            cellspacin: "0",
-                            bordercolor: "#E7EDF8"
-                        }
+                this.isLoading
+                    ? h("bri-loading")
+                    : h("div", {
+                        class: "DshCasTable-main-center-list-inner"
                     }, [
-                        h("tbody", {
-                            class: ""
+                        h("table", {
+                            class: "table",
+                            attrs: {
+                                border: "1",
+                                cellspacin: "0",
+                                bordercolor: "#E7EDF8"
+                            }
                         }, [
-                            this.showListData.length
-                                ? this.showListData.map((mixedRow, rowIndex) => {
-                                    return h(
+                            h("tbody", {
+                                class: ""
+                            }, [
+                                this.showListData.length
+                                    ? this.showListData.map((mixedRow, rowIndex) => {
+                                        return h(
+                                            "tr",
+                                            {
+                                                key: mixedRow._id,
+                                                class: ""
+                                            },
+                                            this.rowColumnsArr[rowIndex].map(column => {
+                                                return this.tdRender(h, { row: mixedRow[column.nodeKey || column._key], rowIndex, column });
+                                            })
+                                        );
+                                    })
+                                    // 无数据
+                                    : h(
                                         "tr",
                                         {
-                                            key: mixedRow._id,
-                                            class: ""
+                                            class: "bri-table-nodata"
                                         },
-                                        this.rowColumnsArr[rowIndex].map(column => {
-                                            return this.tdRender(h, { row: mixedRow[column.nodeKey || column._key], rowIndex, column });
-                                        })
-                                    );
-                                })
-                                // 无数据
-                                : h(
-                                    "tr",
-                                    {
-                                        class: "bri-table-nodata"
-                                    },
-                                    [
-                                        this.emptyTdRender(h, {})
-                                    ]
-                                )
+                                        [
+                                            this.emptyTdRender(h, {})
+                                        ]
+                                    )
+                            ])
                         ])
                     ])
-                ])
             ]);
         },
         // 表头单元格渲染函数 （无法共用contentColumns的renderHeaderCell，因为级联老版表头的无renderHeaderCell）

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

@@ -256,18 +256,26 @@ export default {
                 if (this.isUseDescSort) {
                     if (row) {
                         list.splice(newRowIndex - 1, 0, newRow);
-                        rowIndex + 1 === this.pagePropsObj.pagesize && this.changePage(this.pagePropsObj.page + 1);
+                        if (rowIndex + 1 === this.pagePropsObj.pagesize) {
+                            this.changePage(this.pagePropsObj.page + 1); // 一定翻页了
+                        }
                     } else {
                         list.splice(newRowIndex, 0, newRow);
-                        this.changePage(1);
+                        if (this.pagePropsObj.page !== 1) {
+                            this.changePage(1);
+                        }
                     }
                 } else {
                     if (row) {
                         list.splice(newRowIndex, 0, newRow);
-                        rowIndex + 1 === this.pagePropsObj.pagesize && this.changePage(this.pagePropsObj.page + 1);
+                        if (rowIndex + 1 === this.pagePropsObj.pagesize) {
+                            this.changePage(this.pagePropsObj.page + 1); // 一定翻页了
+                        }
                     } else {
                         list.splice(newRowIndex, 0, newRow);
-                        this.changePage(this.PageNum);
+                        if (this.pagePropsObj.page !== this.PageNum) {
+                            this.changePage(this.PageNum);
+                        }
                     }
                 }
             }

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

@@ -95,6 +95,7 @@ export default {
                 conditions: []
             },
 
+            isLoading: false,
             isUseDescSort: false,
             pageMode: "small",
             pagePropsObj: {
@@ -234,6 +235,9 @@ export default {
         allScreenKey () {
             return this.propsObj.allScreenKey;
         },
+        flowInstId () {
+            return this.propsObj.flowInstId;
+        },
 
         commonPropsObj () {
             return {
@@ -421,7 +425,9 @@ export default {
         },
         // 是否搜索状态
         isSearching () {
-            return this.$isAdvSearching(this.finalTableAdvSearch);
+            return this.parentObj.__isCreate__ === true
+                ? false
+                : this.$isAdvSearching(this.finalTableAdvSearch);
         },
         searchTitle () {
             return `${this.isSearching ? "筛选" : "全部"}数据；`;
@@ -471,10 +477,12 @@ export default {
         },
         //  全部数据 或 筛选时符合条件的数据 -当前页的
         curPageShowListData () {
-            return this.showListData.slice(
-                (this.pagePropsObj.page - 1) * this.pagePropsObj.pagesize,
-                this.pagePropsObj.page * this.pagePropsObj.pagesize
-            );
+            return this.pagePropsObj.page >= 1
+                ? this.showListData.slice(
+                    (this.pagePropsObj.page - 1) * this.pagePropsObj.pagesize,
+                    this.pagePropsObj.page * this.pagePropsObj.pagesize
+                )
+                : [];
         },
         // 全部数据 或 筛选时符合条件的数据 -总数
         total () {
@@ -581,6 +589,7 @@ export default {
 
         tablePropsObj () {
             return {
+                // isLoading: false,
                 // rowStyleOption: {
                 //     hoverHighlight: true,
                 //     clickHighlight: true,
@@ -689,6 +698,7 @@ export default {
                 screenKey: this.screenKey,
                 _id: this.parentDataId,
                 _key: this.controlKey,
+                flowinst: this.flowInstId,
                 advSearch: this.finalTableAdvSearch
             };
         },
@@ -798,7 +808,10 @@ export default {
                     this.searchListFields.includes(conditionItem.fieldKey)
                 )
             };
+
+            this.loadingFunc();
         },
+
         // 重置
         reset () {
             this.initFlag = true;
@@ -809,12 +822,12 @@ export default {
             this.hoverRecordMap = {};
             this.ruleRecordMap = {};
 
-            this.changePage(1);
             this.dftAdvSearch = {
                 logic: "and",
                 conditions: []
             };
             this.hideStatus = true;
+            this.changePage(1);
 
             this.selfReset && this.selfReset();
         },
@@ -827,9 +840,11 @@ export default {
 
         // 筛选回调
         searchCb (conditions) {
-            this.isExpandAction = false;
-            this.dftAdvSearch.conditions = conditions;
-            this.changePage(1);
+            if (this.parentObj.__isCreate__ !== true) {
+                this.isExpandAction = false;
+                this.dftAdvSearch.conditions = conditions;
+                this.changePage(1);
+            }
         },
         // 列表选择项改变
         changeSelect (list) {
@@ -843,12 +858,19 @@ export default {
         // 切换分页
         changePage (page) {
             this.pagePropsObj.page = page;
+            this.loadingFunc();
         },
         // 切换分页条数
         changePageSize (pagesize) {
             this.pagePropsObj.page = 1;
             this.pagePropsObj.pagesize = pagesize;
         },
+        loadingFunc () {
+            this.isLoading = true;
+            setTimeout(() => {
+                this.isLoading = false;
+            });
+        },
 
         // 输入框失去焦点
         controlBlur (operationItem, row, rowIndex, column, params) {
@@ -1572,7 +1594,7 @@ export default {
                     row._id = this.$ObjectID().str;
                 }
 
-                row.__old__ = this.isDftSet ? false : !this.parentObj.__isCreate__; // 标记老数据
+                row.__old__ = this.isDftSet ? false : this.parentObj.__isCreate__ !== true; // 标记老数据
                 row.__isDefault__ = this.isDftSet ? true : !!row.__isDefault__; // 标记默认数据（配置端默认值）
 
                 // 初次进来 把关于展示的状态值全部清除

package/src/components/other/BriLoading.vue

@@ -113,12 +113,12 @@
 <style lang="less" scoped>
     .BriLoading {
         &-fix {
+            width: 100%;
+            height: 100%;
             position: absolute;
             top: 0;
             left: 0;
             z-index: 8;
-            width: 100%;
-            height: 100%;
 
             .BriLoading-main {
                 position: absolute;

package/src/index.js

@@ -13,10 +13,6 @@ import DshBox from "./components/list/DshBox/DshBox.vue";
 import DshList from "./components/list/DshBox/DshList.vue";
 import DshTable from "./components/list/DshBox/DshTable.vue";
 import DshPage from "./components/list/DshPage.vue";
-import DshCrossTable from "./components/list/DshBox/DshCrossTable.vue";
-import DshFlatTable from "./components/list/DshFlatTable.vue";
-// import DshCascaderTable from "./components/list/DshCascaderTable.vue";
-// import DshTreeTable from "./components/list/DshTreeTable.vue";
 
 // form
 import DshForm from "./components/form/DshForm.vue";
@@ -63,6 +59,10 @@ import Error403 from "./components/Error/Error403.vue";
 import Error404 from "./components/Error/Error404.vue";
 
 // list
+import DshCrossTable from "./components/list/DshBox/DshCrossTable.vue";
+import DshFlatTable from "./components/list/DshFlatTable.vue";
+// import DshCascaderTable from "./components/list/DshCascaderTable.vue";
+// import DshTreeTable from "./components/list/DshTreeTable.vue";
 import BriCard from "./components/list/BriCard.vue";
 import BriTree from "./components/list/BriTree.vue";
 import BriTreeItem from "./components/list/BriTreeItem.vue";