bri-components 1.5.8 → 1.5.10

package/package.json

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

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

@@ -203,6 +203,11 @@
 
                 clearTimeout(this.timer);
                 this.timer = setTimeout(() => {
+                    // 对文本框进行前后空格处理（鞋写在上面不行，虽然input会早于onChange事件，但还是不行；值会更新，界面不更新）
+                    if (["text"].includes(this.controlType) && this.value[this.controlKey]) {
+                        this.value[this.controlKey] = this.value[this.controlKey].trim();
+                    }
+
                     this.change();
                     this.$emit("inputChange");
                 }, 800);

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

@@ -90,7 +90,7 @@ export default {
                     : this.selfPropsObj._data;
         },
         cascaderAllData () {
-            const loop = (arr = [], level, parentKeys = [], filterVals = [], cascaderVals = [], reverseFilter = false, isMobile = false, saveKey = "_key", valueKey = "code", nameKey = "name") => {
+            const loop = (arr = [], level, parentKeys = [], filterVals = [], cascaderVals = [], reverseFilter = false, isMb = false, saveKey = "_key", valueKey = "code", nameKey = "name") => {
                 arr = cascaderVals.length
                     ? arr.filter(item => {
                         const itemKey = item[saveKey];
@@ -134,17 +134,17 @@ export default {
                         (!level || level > newItem.level) &&
                         (newItem.children && newItem.children.length)
                     ) {
-                        newItem.children = loop(newItem.children, level, newItem.keys, [], cascaderVals, reverseFilter, isMobile, saveKey, valueKey, nameKey);
+                        newItem.children = loop(newItem.children, level, newItem.keys, [], cascaderVals, reverseFilter, isMb, saveKey, valueKey, nameKey);
 
                         if (newItem.children.length) {
                             newItem.loading = false; // 此代码pc端在用：为了所请求的级，出现继续加载的箭头图标
                             newItem.isLeaf = false;
                         } else {
-                            newItem.children = isMobile ? undefined : [];
+                            newItem.children = isMb ? undefined : [];
                             newItem.isLeaf = true;
                         }
                     } else {
-                        newItem.children = isMobile ? undefined : [];
+                        newItem.children = isMb ? undefined : [];
                         newItem.isLeaf = true;
                     }
 
@@ -155,10 +155,10 @@ export default {
                 }, []);
             };
 
-            return loop(this.originData, this.cascaderLevel, [], this.filterVals, this.cascaderVals, this.reverseFilter, this.isMobile, this.saveKey, this.valueKey, this.nameKey);
+            return loop(this.originData, this.cascaderLevel, [], this.filterVals, this.cascaderVals, this.reverseFilter, this.isMb, this.saveKey, this.valueKey, this.nameKey);
         },
         cascaderData () {
-            const loop = (arr = [], isMobile) => {
+            const loop = (arr = [], isMb) => {
                 return arr
                     ? arr.reduce((newArr, item) => {
                         if (item.rm !== 1) {
@@ -167,15 +167,15 @@ export default {
                             };
 
                             if (newItem.children && newItem.children.length) {
-                                newItem.children = loop(newItem.children, isMobile);
+                                newItem.children = loop(newItem.children, isMb);
 
                                 if (newItem.children.length) {
                                     // 无需处理
                                 } else {
-                                    newItem.children = isMobile ? undefined : [];
+                                    newItem.children = isMb ? undefined : [];
                                 }
                             } else {
-                                newItem.children = isMobile ? undefined : [];
+                                newItem.children = isMb ? undefined : [];
                             }
 
                             newArr.push(newItem);

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

@@ -139,10 +139,10 @@ export default {
         isTagShow () {
             return ["switch", "select", "checkbox", "regions", "cascaders", "users", "departments", "labels", "refSelect", "refCheckbox"].includes(this.controlType);
         },
-        // 点击行或单元格查看详细内容 -"flatTable", "cascaderTable", "reference", "referenceBy"在用
-        showDetailOnCR () {
-            return !!this.selfPropsObj && [true, false].includes(this.selfPropsObj._showDetailOnCR)
-                ? this.selfPropsObj._showDetailOnCR
+        // 全称showDetailOnClickUnitContent，点击行或单元格查看详细内容 -"flatTable", "cascaderTable", "reference", "referenceBy"在用
+        showDetailOnCUC () {
+            return !!this.selfPropsObj && [true, false].includes(this.selfPropsObj._showDetailOnCUC)
+                ? this.selfPropsObj._showDetailOnCUC
                 : true;
         },
 
@@ -190,10 +190,6 @@ export default {
         isInTable () {
             return !!this.propsObj.inTable;
         },
-        // 单条关联内 使用详情模式的
-        isInRefDetail () {
-            return !!this.propsObj.inRefDetail;
-        },
         // 在高级搜索下
         isInSearch () {
             return !!this.propsObj.inSearch;
@@ -220,15 +216,18 @@ export default {
         },
 
         /* ----- 部分控件下 才使用的属性 ----- */
+        isMobile () {
+            return this.propsObj.isMobile;
+        },
+        controlThemeColor () {
+            return this.propsObj.controlThemeColor;
+        },
         compKey () {
             return this.propsObj.compKey;
         },
         appKey () {
             return this.propsObj.appKey;
         },
-        controlThemeColor () {
-            return this.propsObj.controlThemeColor;
-        },
         entityKey () {
             return this.propsObj.entityKey;
         },
@@ -241,6 +240,10 @@ export default {
         allScreenKey () {
             return this.propsObj.allScreenKey;
         },
+        // 单条关联内 使用详情模式的
+        isInRefDetail () {
+            return !!this.propsObj.inRefDetail;
+        },
 
         /* ----- 移动端在用 ----- */
         // 只做校验而隐藏的的field框，所用的propsObj
@@ -372,12 +375,19 @@ export default {
             this.showModal = false;
         },
 
-        // 单元格展示 -打开列表模态框
-        openUnitModal (event) {
-            if (this.showDetailOnCR) {
-                this.showUnitModal = true;
+        // 点击外层dom（主要针对单元格空白处）
+        clickControlWrapper (event) {
+            // 点击行是选择数据效果时，点击单元格空白和点击行效果一样（啥也不做）；点击表格行进的是详情的话，点某列单元格空白处，显示谁都有争议，没有效果最好
+            if ((this.isUnitShow && this.showDetailOnCUC) || !this.isUnitShow) {
                 event.stopPropagation();
             }
+        },
+        // 点击单元格里的内容 -打开详情模态框
+        clickUnitContent (event) {
+            if ((this.isUnitShow && this.showDetailOnCUC) || this.isUnitUpdate) {
+                // event.stopPropagation(); // 可有可无，最外层已经阻止冒泡
+                this.showUnitModal = true;
+            }
         }
     }
 };

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

@@ -1,10 +1,13 @@
 <template>
-    <div class="cascaderTable">
+    <div
+        class="cascaderTable"
+        @click="clickControlWrapper"
+    >
         <!-- 查看 单元格内 -->
         <template v-if="isUnitShow">
             <span
                 class="cascaderTable-unit"
-                @click="openUnitModal"
+                @click="clickUnitContent"
             >
                 <dsh-icons :list="[{
                     customIcon: 'bico-Cascadetable'

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

@@ -1,10 +1,13 @@
 <template>
-    <div class="flatTable">
+    <div
+        class="flatTable"
+        @click="clickControlWrapper"
+    >
         <!-- 查看 单元格内 -->
         <template v-if="isUnitShow">
             <span
                 class="flatTable-unit"
-                @click="openUnitModal"
+                @click="clickUnitContent"
             >
                 <dsh-icons :list="[{
                     customIcon: 'bico-internaltable'

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

@@ -164,21 +164,17 @@ export default {
         },
         //  全部数据 或 筛选时符合条件的数据 -当前页的
         curPageShowListData () {
-            return this.pagePropsObj.page >= 1
-                ? (this.pagePropsObj.page - 1) * this.pagePropsObj.pagesize >= this.showListData.length
-                    ? this.showListData.slice(-(
-                        this.showListData.length % this.pagePropsObj.pagesize === 0
-                            ? this.pagePropsObj.pagesize
-                            : this.showListData.length % this.pagePropsObj.pagesize
-                    ))
-                    : this.showListData.slice(
-                        (this.pagePropsObj.page - 1) * this.pagePropsObj.pagesize,
-                        this.pagePropsObj.page * this.pagePropsObj.pagesize
-                    )
+            const page = this.pagePropsObj.page;
+            const pagesize = this.pagePropsObj.pagesize;
+
+            return page >= 1
+                ? (page - 1) * pagesize >= this.showListData.length
+                    ? this.showListData.slice(-(this.showListData.length % pagesize || pagesize))
+                    : this.showListData.slice((page - 1) * pagesize, page * pagesize)
                 : [];
         },
         // 全部数据 或 筛选时符合条件的数据 -共多少分（！！！最小为1）
-        PageNum () {
+        pageNum () {
             return (
                 this.selfTotal % this.pagePropsObj.pagesize > 0
                     ? Math.ceil(this.selfTotal / this.pagePropsObj.pagesize)
@@ -187,27 +183,41 @@ export default {
         }
     },
     created () {
-        this.selfInit();
+        this.flatTableMixinInit();
     },
     methods: {
-        selfInit () {
+        flatTableMixinInit () {
+            this.selfReset();
+        },
+        // 自身的重置
+        selfReset () {
             this.isUseDescSort = this.selfPropsObj._isUseDescSort;
             this.pagePropsObj.pagesize = this.selfPropsObj._pagesize || this.selfBasePropsObj._pagesize;
             this.initRowspan();
         },
-        // 本身的初始化
-        selfReset () {
-            this.selfInit();
+
+        // 也供外部使用 -转到最后一条数据所在的分页
+        goLastDataPage () {
+            if (this.isUseDescSort) {
+                if (this.pagePropsObj.page !== 1) {
+                    this.changePage(1);
+                }
+            } else {
+                if (this.pagePropsObj.page !== this.pageNum) {
+                    this.changePage(this.pageNum);
+                }
+            }
         },
-        fixSelfRowData (row) {
-            if (this.initFlag) {
-                // 每条数据都补充全所有字段值（赋一个默认的空值）
-                this.selfColumns.forEach((colItem) => {
-                    // 不用row[colItem._key] === undefined判断，是因为后端给的空值不可靠，多选的有时候都能给null
-                    if (!Object.prototype.hasOwnProperty.call(row, colItem._key) && this.$isEmptyData(row[colItem._key])) {
-                        this.$set(row, colItem._key, this.$deepCopy(this.dftInitValMap[colItem._type]));
-                    }
-                });
+        // 也供外部使用 -删除数据时，更正this.pagePropsObj.page
+        fixCurPage () {
+            if (this.pagePropsObj.page > this.pageNum) {
+                this.changePage(this.pageNum);
+            }
+        },
+        // 暂未供外部使用 -判断是否要转到下一页（在本页最后一条上插入一行时，要转到下一页）
+        goNextPage (rowIndex) {
+            if (rowIndex + 1 === this.pagePropsObj.pagesize) {
+                this.changePage(this.pagePropsObj.page + 1);
             }
         },
 
@@ -218,7 +228,7 @@ export default {
         },
         // 切换分页
         changePage (page) {
-            this.pagePropsObj.page = page;
+            this.pagePropsObj.page = page || 1;
             this.loadingFunc();
         },
         // 切换分页条数
@@ -307,26 +317,18 @@ export default {
                 if (this.isUseDescSort) {
                     if (row) {
                         list.splice(newRowIndex - 1, 0, newRow);
-                        if (rowIndex + 1 === this.pagePropsObj.pagesize) {
-                            this.changePage(this.pagePropsObj.page + 1); // 一定翻页了
-                        }
+                        this.goNextPage(rowIndex);
                     } else {
                         list.splice(newRowIndex, 0, newRow);
-                        if (this.pagePropsObj.page !== 1) {
-                            this.changePage(1);
-                        }
+                        this.goLastDataPage();
                     }
                 } else {
                     if (row) {
                         list.splice(newRowIndex, 0, newRow);
-                        if (rowIndex + 1 === this.pagePropsObj.pagesize) {
-                            this.changePage(this.pagePropsObj.page + 1); // 一定翻页了
-                        }
+                        this.goNextPage(rowIndex);
                     } else {
                         list.splice(newRowIndex, 0, newRow);
-                        if (this.pagePropsObj.page !== this.PageNum) {
-                            this.changePage(this.PageNum);
-                        }
+                        this.goLastDataPage();
                     }
                 }
             }
@@ -370,6 +372,7 @@ export default {
 
                     const listIndex = list.findIndex(rowItem => rowItem._id === row._id);
                     list.splice(listIndex, 1);
+                    this.fixCurPage();
 
                     this.change("deleteRow", row, rowIndex, null);
                 }
@@ -412,6 +415,17 @@ export default {
         },
 
         /* ----------- 方法 ---------- */
+        fixSelfRowData (row) {
+            if (this.initFlag) {
+                // 每条数据都补充全所有字段值（赋一个默认的空值）
+                this.selfColumns.forEach((colItem) => {
+                    // 不用row[colItem._key] === undefined判断，是因为后端给的空值不可靠，多选的有时候都能给null
+                    if (!Object.prototype.hasOwnProperty.call(row, colItem._key) && this.$isEmptyData(row[colItem._key])) {
+                        this.$set(row, colItem._key, this.$deepCopy(this.dftInitValMap[colItem._type]));
+                    }
+                });
+            }
+        },
         // 初始化合并单元格的rowspan
         initRowspan () {
             if (this.isMergeRowTable) {

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

@@ -85,7 +85,7 @@ export default {
     },
     created () { },
     methods: {
-        // 本身的初始化
+        // 自身的重置
         selfReset () {
             this.searchMode = "flat";
         },