bri-components 1.4.88 → 1.4.90

package/package.json

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

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

@@ -147,6 +147,8 @@ export default {
         getCalcuedTree (nodes = [], subCols = [], treeCols = []) {
             const loop = (nodes = [], parentNodes = []) => {
                 nodes.forEach(row => {
+                    this.fixRowData(row);
+
                     // 初始化树节点的数据，给节点加上一些属性并监测，注入到节点对象中
                     let curCol = treeCols[row.level - 1];
                     this.$setObj(row, {
@@ -184,8 +186,6 @@ export default {
                             loop(row.children, [...parentNodes, row]);
                         }
                     }
-
-                    this.fixRowData(row);
                 });
             };
 
@@ -263,12 +263,14 @@ export default {
         // getNewRowData时，额外补充的行相关的数据（针对层级列）
         getSelfNewRowData (level) {
             const column = this.treeColumns[level - 1];
+            const dftVal = column._default;
+            const dftInitVal = this.dftInitValMap[column._type];
 
             return {
                 name: this.$deepCopy(
                     this.$isEmptyData(dftVal)
-                        ? this.dftInitValMap[column._type]
-                        : column._default
+                        ? dftInitVal
+                        : dftVal
                 )
             };
         }

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

@@ -168,11 +168,13 @@ export default {
                     )
                 : [];
         },
-        // 全部数据 或 筛选时符合条件的数据 -共多少分页
+        // 全部数据 或 筛选时符合条件的数据 -共多少分（！！！最小为1）
         PageNum () {
-            return this.selfTotal % this.pagePropsObj.pagesize > 0
-                ? Math.ceil(this.selfTotal / this.pagePropsObj.pagesize)
-                : Math.floor(this.selfTotal / this.pagePropsObj.pagesize);
+            return (
+                this.selfTotal % this.pagePropsObj.pagesize > 0
+                    ? Math.ceil(this.selfTotal / this.pagePropsObj.pagesize)
+                    : this.selfTotal / this.pagePropsObj.pagesize
+            ) || 1;
         }
     },
     created () {

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

@@ -130,6 +130,8 @@ export default {
         getCalcuedTree (treeData = [], cols = []) {
             const loop = (list = [], parentRow, levelNum = 1) =>
                 list.forEach(rowItem => {
+                    this.fixRowData(rowItem, levelNum);
+
                     // 递归到叶子节点前 从上往下执行 要处理的
                     cols.reduce((newRow, column) => {
                         if (["number", "date"].includes(column._type)) {
@@ -201,8 +203,6 @@ export default {
                             return newRow;
                         }, rowItem);
                     }
-
-                    this.fixRowData(rowItem, levelNum);
                 });
             loop(treeData);
 
@@ -210,6 +210,7 @@ export default {
             return treeData;
         },
         fixSelfRowData (row, levelNum) {
+            // console.log(row.level);
             if (this.initFlag) {
                 // 每条数据都补充全所有字段值（赋一个默认的空值）
                 this.selfColumns.forEach((colItem) => {
@@ -221,15 +222,28 @@ export default {
 
                 row.level = row.level || levelNum; // TODO：修正数据level属性，后期可以删除
                 // 第一级的需要显示出来
-                if (row.level == 1) {
-                    row.__isShow__ = true;
+                if (row.level === 1) {
+                    // 必须用$set
+                    this.$set(row, "__isExpand__", false);
+                    this.$set(row, "__isShow__", true);
+                    this.$set(row, "__isTmpShow__", true);
+                } else {
+                    this.$set(row, "__isExpand__", false);
+                    this.$set(row, "__isShow__", false);
+                    this.$set(row, "__isTmpShow__", false);
                 }
             }
-            // 计算或其它重新传进来值时
+            // 考虑计算或其它重新传进来值时
             else {
                 // 第一级的需要显示出来
-                if (row.level == 1) {
-                    row.__isShow__ = Object.prototype.hasOwnProperty.call(row, "__isShow__") ? row.__isShow__ : true;
+                if (row.level === 1) {
+                    !Object.prototype.hasOwnProperty.call(row, "__isExpand__") && this.$set(row, "__isExpand__", false);
+                    !Object.prototype.hasOwnProperty.call(row, "__isShow__") && this.$set(row, "__isShow__", true);
+                    !Object.prototype.hasOwnProperty.call(row, "__isTmpShow__") && this.$set(row, "__isTmpShow__", true);
+                } else {
+                    !Object.prototype.hasOwnProperty.call(row, "__isExpand__") && this.$set(row, "__isExpand__", false);
+                    !Object.prototype.hasOwnProperty.call(row, "__isShow__") && this.$set(row, "__isShow__", false);
+                    !Object.prototype.hasOwnProperty.call(row, "__isTmpShow__") && this.$set(row, "__isTmpShow__", false);
                 }
             }
         },
@@ -263,8 +277,9 @@ export default {
         // getNewRowData时，额外补充的行相关的数据
         getSelfNewRowData (level) {
             return {
-                // __isExpand__: false, // 此行不用也行
-                // __isTmpShow__: true // 此行不用也行
+                __isExpand__: false,
+                __isShow__: true,
+                __isTmpShow__: true
             };
         }
     }

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

@@ -70,7 +70,8 @@ export default {
             widthMap: this.$getModFieldPropertyMap("width"),
             dftInitValMap: this.$getModFieldPropertyMap("initDefaultVal"),
             // saveProperties: ["__readonly__", "__isDefault__", "__old__", "__isQuote__"],
-            resetProperties: ["__isShow__", "__isTmpShow__", "__isExpand__", "__treeIndex__"],
+            // resetProperties: ["__treeIndex__", "__isExpand__", "__isShow__", "__isTmpShow__"],
+            resetProperties: ["__treeIndex__", "__isExpand__", "__isShow__", "__isTmpShow__", "__isSearchShow__", "__isRendered__"],
 
             initFlag: true,
             isExpandAction: false,

package/src/components/small/DshSteps.vue

@@ -24,6 +24,7 @@
     export default {
         name: "DshSteps",
         props: {
+            value: Number,
             list: {
                 type: Array,
                 default () {
@@ -53,7 +54,18 @@
                 };
             }
         },
-        created () {},
+        watch: {
+            value (newVal, oldVal) {
+                if (newVal !== oldVal) {
+                    this.current = this.value;
+                }
+            }
+        },
+        created () {
+            if (this.value != null) {
+                this.current = this.value;
+            }
+        },
         methods: {
             clickStepItem (stepItem, stepIndex) {
                 if (!this.stepShowFunc || this.stepShowFunc(stepItem, stepIndex)) {

package/src/styles/components/BriTable.less

@@ -220,6 +220,8 @@
         
         &-tip {
             padding: 0px 0px 0px 16px;
+            // text-align: left;
+            word-break: break-all;
             font-size: 12px;
             line-height: 1;
             color: #ed4014;

package/src/utils/table.js

@@ -162,7 +162,7 @@ const transformToColumns = function (formList, {
 
                 ...col
             };
-        });
+    });
 };
 
 export default {