bri-components 1.3.43 → 1.3.45

package/package.json

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

package/src/components/controls/base/DshCascader/components/cascaderPicker.vue

@@ -228,6 +228,11 @@
                 return this.selectedLinealDatas[this.curTabIndex];
             }
         },
+        watch: {
+            data () {
+                this.init();
+            }
+        },
         created () {
             this.init();
         },

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

@@ -85,6 +85,8 @@
         computed: {
             selfPropsObj () {
                 return {
+                    _writeSort: undefined, // 表格里字段的 该列上下行汇总限制顺序 "downToUp", "upToDown"
+                    _compareOperator: "gt", // 表格里字段的 该列上下行的对比条件 "gt", "lt", "et", "gtAet", "ltAet",
                     _transfer: true,
 
                     ...this.propsObj,
@@ -104,23 +106,43 @@
             subType () {
                 return this.selfPropsObj._dateType;
             },
+            writeSort () {
+                return this.selfPropsObj._writeSort;
+            },
+            compareOperator () {
+                return this.selfPropsObj._compareOperator;
+            },
             options () {
                 return {
                     shortcuts: [],
                     disabledDate: (date) => {
-                        const resultObj = this.$validateComparedRule(
-                            [{
-                                ...this.selfPropsObj,
-                                _isCompareByParent: true
-                            }],
+                        const curDateStr = this.$transformDate(date, "/", this.subType);
+
+                        // 日期字段的对比
+                        const compareResultObj = this.$validateComparedRuleFunc(
+                            this.selfPropsObj,
                             {
                                 ...this.value,
-                                [this.controlKey]: this.$transformDate(date, "/", this.subType)
+                                [this.controlKey]: curDateStr
                             },
-                            this.selfPropsObj._isCompareByParent === true ? this.parentFormList : this.allFormList,
-                            this.selfPropsObj._isCompareByParent === true ? this.parentObj : undefined
+                            this.parentObj,
+                            this.selfPropsObj._isCompareByParent === true ? this.parentObj : undefined,
+                            this.selfPropsObj._isCompareByParent === true ? this.parentFormList : this.allFormList
                         );
-                        return !resultObj.bool;
+
+                        // 表格里上下列的汇总
+                        let calResultObj = {
+                            bool: true
+                        };
+                        if (this.isInTable && this.writeSort === "upToDown" && this.value.level !== 1) {
+                            const parentRow = this.parentListData.find(row =>
+                                row.level === this.value.level - 1 && row.children.some(childNode => childNode._id === this.value._id)
+                            ) || {};
+                            const parentDateStr = parentRow[this.controlKey];
+                            calResultObj = this.$isComparedAccord(curDateStr, parentDateStr, this.compareOperator, "date", this.subType, this.subType);
+                        }
+
+                        return !compareResultObj.bool && !calResultObj.bool;
                     }
                 };
             }

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

@@ -170,6 +170,10 @@ export default {
                 ? !!this.propsObj._heightAuto
                 : this.isFullRow;
         },
+        // 查看页下的展示模式
+        showStatusMode () {
+            return this.propsObj.showStatusMode || "defaut"; // "default", "frame"
+        },
 
         /* 部分条件下 才使用的属性 */
         // isShare () {

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

@@ -35,7 +35,7 @@
                 ref="table"
                 :canEdit="finalCanEdit"
                 :data="curVal.list"
-                :oldData="curVal.oldList"
+                :compareData="curVal.oldList"
                 :rowDefault="curVal.rowDefault"
                 :columns="subForm"
                 :propsObj="propsObj"

package/src/components/list/DshCascaderTable.vue

@@ -461,17 +461,6 @@
             };
         },
         computed: {
-            treeData () {
-                return this.transforBriTreeData();
-            },
-            rows () {
-                return this.transformRows();
-            },
-            listData () {
-                // return rows;
-                return this.$getTreeFlatArr(this.data.tree, node => !(node.children && node.children.length));
-            },
-
             selfPropsObj () {
                 return {
                     ...this.commonPropsObj,
@@ -480,6 +469,16 @@
                 };
             },
 
+            allTreeData () {
+                return this.getCalcuedTree();
+            },
+            allListData () {
+                return this.$getTreeFlatArr(this.data.tree, node => !(node.children && node.children.length));
+            },
+            rows () {
+                return this.transformRows();
+            },
+
             showColumns () {
                 return this.transformColumns(this.treeColumns);
             },
@@ -669,7 +668,7 @@
                 );
             },
             // 转化树数据
-            transforBriTreeData (treeForm = this.treeColumns, subForm = this.columns) {
+            getCalcuedTree (treeForm = this.treeColumns, subForm = this.columns) {
                 treeForm.forEach((treeFormItem, treeFormIndex) => {
                     treeFormItem.canDelete = true; // 每次计算，重置一下
                     treeFormItem.level = treeFormIndex + 1; // treeColumns更新,缺少level
@@ -737,7 +736,7 @@
                 return this.data.tree;
             },
             // 转化渲染使用的columns数组
-            transformRowColumnsArr (nodes = this.treeData, treeForm = this.treeColumns) {
+            transformRowColumnsArr (nodes = this.allTreeData, treeForm = this.treeColumns) {
                 let loop = (nodes, rowColumnsArr) => {
                     return nodes.reduce((rowColumnsArr, node, nodeIndex) => {
                         if (nodeIndex !== 0 || rowColumnsArr.length === 0) {
@@ -754,7 +753,7 @@
                 return loop(nodes, []);
             },
             // 转化表格数据
-            transformRows (nodes = this.treeData, treeForm = this.treeColumns) {
+            transformRows (nodes = this.allTreeData, treeForm = this.treeColumns) {
                 const loop = (nodes, rows) => {
                     return nodes.reduce((rows, node, nodeIndex) => {
                         // 创建行，并把节点数据（对象类型）注入到行对象内
@@ -806,7 +805,7 @@
             getParentNode (row, rowIndex, col, treeForm = this.treeColumns) {
                 if (col.level === 1) {
                     return {
-                        children: this.treeData
+                        children: this.allTreeData
                     };
                 } else {
                     let parentCol = treeForm[col.level - 2];

package/src/components/list/DshFlatTable.vue

@@ -12,7 +12,7 @@
         <bri-table
             class="DshFlatTable-main"
             :columns="showColumns"
-            :data="listData"
+            :data="allListData"
             :footer-data="footerData"
             :propsObj="tablePropsObj"
             @changeSelect="changeSelect"
@@ -23,7 +23,7 @@
         <dsh-buttons
             class="DshFlatTable-create"
             :list="$getOperationList(['canCreate'])"
-            @click="$dispatchEvent($event, null, null, listData)"
+            @click="$dispatchEvent($event, null, null, allListData)"
         ></dsh-buttons>
 
         <!-- 全屏查看 -->
@@ -37,7 +37,7 @@
                 <bri-table
                     class="DshFlatTable-main"
                     :columns="showColumns"
-                    :data="listData"
+                    :data="allListData"
                     :footer-data="footerData"
                     :propsObj="tablePropsObj"
                     @changeSelect="changeSelect"
@@ -48,7 +48,7 @@
                 <dsh-buttons
                     class="DshFlatTable-create"
                     :list="$getOperationList(['canCreate'])"
-                    @click="$dispatchEvent($event, null, null, listData)"
+                    @click="$dispatchEvent($event, null, null, allListData)"
                 ></dsh-buttons>
             </template>
         </dsh-modal>

package/src/components/list/DshTreeTable.vue

@@ -24,7 +24,7 @@
         <bri-table
             class="DshTreeTable-main"
             :columns="showColumns"
-            :data="listData"
+            :data="renderedListData"
             :footer-data="footerData"
             :propsObj="tablePropsObj"
             @changeSelect="changeSelect"
@@ -60,7 +60,7 @@
                 <bri-table
                     class="DshTreeTable-main"
                     :columns="showColumns"
-                    :data="listData"
+                    :data="renderedListData"
                     :footer-data="footerData"
                     :propsObj="tablePropsObj"
                     @changeSelect="changeSelect"
@@ -106,11 +106,38 @@
             };
         },
         computed: {
+            selfPropsObj () {
+                return {
+                    _searchFields: [], // 作为搜索的字段
+                    _searchLabelWidth: 100, // 搜索的label宽度
+                    ...this.commonPropsObj,
+
+                    _maxLevel: this.commonPropsObj._maxLevel || 3
+                };
+            },
+            maxLevel () {
+                return this.selfPropsObj._maxLevel;
+            },
+            searchLabelWidth () {
+                return this.selfPropsObj._searchLabelWidth;
+            },
+            searchFormList () {
+                return (this.selfPropsObj._searchFields || []) // 级联表切层级表时 值会undefined覆盖selfPropsObj默认的[]
+                    .map(fieldKey => this.columns.find(column => column._key === fieldKey))
+                    .filter(column => !!column)
+                    .map(column => {
+                        return {
+                            ...column,
+                            _span: 6
+                        };
+                });
+            },
             isSearching () {
                 return this.searchFormList.length && this.advSearchObj.conditions.some(conditionItem =>
                     conditionItem.fieldValue.length && conditionItem.fieldValue.some(valItem => !this.$isEmptyData(valItem))
                 );
             },
+
             allTreeData () {
                 console.log("allTreeData");
                 return this.getCalcuedTree(this.data, this.filterColumns);
@@ -118,7 +145,7 @@
             allListData () {
                 return this.$getTreeFlatArr(this.allTreeData);
             },
-            listData () {
+            renderedListData () {
                 return this.allListData.filter(row => {
                     if (this.isSearching) {
                         const bool = this.$isAdvRelyAccord(this.advSearchObj, row);
@@ -137,7 +164,7 @@
                 });
             },
             showListData () {
-                return this.listData.filter(row =>
+                return this.renderedListData.filter(row =>
                     this.isSearching ? !!row.__isSearchShow__ : !!row.__isShow__
                 );
             },
@@ -153,14 +180,14 @@
                 console.log("footerData");
                 return this.isSearching
                     ? []
-                    : this.useSummary && this.listData.length
+                    : this.useSummary && this.allListData.length
                         ? [
                             this.filterColumns.reduce((obj, col) => {
                                 return {
                                     ...obj,
                                     [col._key]: col._type === "number" && ![undefined, null, "", "no"].includes(col._summaryType)
                                         ? this.$calNumList(
-                                            this.listData
+                                            this.allListData
                                                 .filter(item => item.level === 1)
                                                 .map(item => item[col._key]),
                                             col._summaryType,
@@ -178,33 +205,6 @@
                         : [];
             },
 
-            selfPropsObj () {
-                return {
-                    _searchFields: [], // 作为搜索的字段
-                    _searchLabelWidth: 100, // 搜索的label宽度
-                    ...this.commonPropsObj,
-
-                    _maxLevel: this.commonPropsObj._maxLevel || 3
-                };
-            },
-            maxLevel () {
-                return this.selfPropsObj._maxLevel;
-            },
-            searchLabelWidth () {
-                return this.selfPropsObj._searchLabelWidth;
-            },
-            searchFormList () {
-                return (this.selfPropsObj._searchFields || []) // 级联表切层级表时 值会undefined覆盖selfPropsObj默认的[]
-                    .map(fieldKey => this.columns.find(column => column._key === fieldKey))
-                    .filter(column => !!column)
-                    .map(column => {
-                        return {
-                            ...column,
-                            _span: 6
-                        };
-                });
-            },
-
             tablePropsObj () {
                 return {
                     maxHeight: this.contentHeight,

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

@@ -17,7 +17,13 @@ export default {
         return {};
     },
     computed: {
-        listData () {
+        selfPropsObj () {
+            return {
+                ...this.commonPropsObj
+            };
+        },
+
+        allListData () {
             this.data.forEach(item => {
                 !item._id && this.$set(item, "_id", this.$ObjectID().str);
 
@@ -30,14 +36,14 @@ export default {
             return this.data;
         },
         footerData () {
-            return this.useSummary && this.listData.length
+            return this.useSummary && this.allListData.length
                 ? [
                     this.filterColumns.reduce((obj, col) => {
                         return {
                             ...obj,
                             [col._key]: col._type === "number" && ![undefined, null, "", "no"].includes(col._summaryType)
                                 ? this.$calNumList(
-                                    this.listData.map(item => item[col._key]),
+                                    this.allListData.map(item => item[col._key]),
                                     col._summaryType,
                                     { ...col, _defaultDigit: 2 }
                                 )
@@ -52,12 +58,6 @@ export default {
                 : [];
         },
 
-        selfPropsObj () {
-            return {
-                ...this.commonPropsObj
-            };
-        },
-
         showColumns () {
             return [
                 ...(this.useSelection === true ? [this.selectionColumn] : []),
@@ -110,7 +110,7 @@ export default {
                         },
                         on: {
                             click: (operationItem) => {
-                                this.$dispatchEvent(operationItem, row, rowIndex, this.listData);
+                                this.$dispatchEvent(operationItem, row, rowIndex, this.allListData);
                             }
                         }
                     });
@@ -148,7 +148,7 @@ export default {
             this.$emit("changeSelect", list);
         },
         change (...params) {
-            this.$emit("change", { list: this.listData, rowDefault: this.rowDefault }, ...params);
+            this.$emit("change", { list: this.allListData, rowDefault: this.rowDefault }, ...params);
         }
     }
 };

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

@@ -12,7 +12,7 @@ export default {
             type: Boolean,
             default: true
         },
-        oldData: {
+        compareData: {
             type: Array,
             default () {
                 return [];
@@ -131,31 +131,6 @@ export default {
         dshRender () {
             return this[this.dshRenderName];
         },
-        parentDataId () {
-            return this.parentObj._id;
-        },
-        selfRowDefault () {
-            return this.filterColumns.reduce((obj, column) => {
-                const defaultVal = this.rowDefault[column._key];
-                const initDftVal = this.initDftValMap[column._type];
-
-                return Object.assign(obj, {
-                    [column._key]: this.$isEmptyData(defaultVal)
-                        ? initDftVal
-                        : defaultVal
-                });
-            }, {});
-        },
-        oldListData () {
-            this.oldData.forEach(item => {
-                !item._id && this.$set(item, "_id", this.$ObjectID().str);
-            });
-            return this.oldData;
-        },
-        useCampare () {
-            return !!this.oldListData.length;
-        },
-
         controlKey () {
             return this.propsObj._key;
         },
@@ -257,6 +232,31 @@ export default {
             return this.$transformAdvSearch(this.selfPropsObj._quoteAdvSearch, this.parentFormList, this.parentObj);
         },
 
+        parentDataId () {
+            return this.parentObj._id;
+        },
+        selfRowDefault () {
+            return this.filterColumns.reduce((obj, column) => {
+                const defaultVal = this.rowDefault[column._key];
+                const initDftVal = this.initDftValMap[column._type];
+
+                return Object.assign(obj, {
+                    [column._key]: this.$isEmptyData(defaultVal)
+                        ? initDftVal
+                        : defaultVal
+                });
+            }, {});
+        },
+        compareListData () {
+            this.compareData.forEach(item => {
+                !item._id && this.$set(item, "_id", this.$ObjectID().str);
+            });
+            return this.compareData;
+        },
+        useCampare () {
+            return !!this.compareListData.length;
+        },
+
         tablePropsObj () {
             return {
                 maxHeight: this.contentHeight,
@@ -302,7 +302,7 @@ export default {
         },
 
         filterColumns () {
-            return this.columns.filter(col => this.$isAdvRelyShow(col, this.listData, this.parentObj, true));
+            return this.columns.filter(col => this.$isAdvRelyShow(col, this.allListData, this.parentObj, true));
         },
         contentColumns () {
             return this.filterColumns.map(colItem => ({
@@ -314,15 +314,15 @@ export default {
                     const unitCanEdit = this.getUnitCanEdit(column, row);
 
                     return [
-                        this.isShowCompare(column, row, this.oldListData[rowIndex])
+                        this.isShowCompare(column, row, this.compareListData[rowIndex])
                             ? h("Tooltip", {
                                 style: {
                                     width: "100%"
                                 },
                                 props: {
-                                    content: this.$isEmptyData(this.oldListData[rowIndex][column._key])
+                                    content: this.$isEmptyData(this.compareListData[rowIndex][column._key])
                                         ? ""
-                                        : this.oldListData[rowIndex][column._key],
+                                        : this.compareListData[rowIndex][column._key],
                                     transfer: true,
                                     maxWidth: 200,
                                     placement: "top"
@@ -335,7 +335,7 @@ export default {
                                             formItem: column,
                                             rowIndex: rowIndex,
                                             allFormList: this.columns,
-                                            parentListData: this.listData,
+                                            parentListData: this.allListData,
                                             parentFormList: this.parentFormList,
                                             parentObj: this.parentObj
                                         },
@@ -353,7 +353,7 @@ export default {
                                     formItem: column,
                                     rowIndex: rowIndex,
                                     allFormList: this.columns,
-                                    parentListData: this.listData,
+                                    parentListData: this.allListData,
                                     parentFormList: this.parentFormList,
                                     parentObj: this.parentObj
                                 },
@@ -434,7 +434,7 @@ export default {
         validate () {
             this.showRuleMessage = true;
 
-            return this.listData.every((row, rowIndex) => this.getRowRuleResult(row, rowIndex));
+            return this.allListData.every((row, rowIndex) => this.getRowRuleResult(row, rowIndex));
         },
         // 重置
         reset () {