bri-components 1.3.76 → 1.3.78

package/package.json

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

package/src/components/form/DshForm.vue

@@ -198,16 +198,14 @@
                 },
 
                 forceValidateTypes: [
-                    "select", "cascader", "regions", "cascaders", "file", "coordinates", "editor",
+                    "select", "region", "cascader", "regions", "cascaders", "file", "coordinates", "editor",
                     "users", "departments", "labels", "flatTable", "reference", "referenceBy"
                 ],
                 ignoreProperties: [
-                    "_name", "_key", "_default", "_required", "_span", "_br", "_line", "_noLabel", "_clearable",
+                    "_name", "_key", "_default", "_required", "_regStr", "_regMessage", "_span", "_br", "_line", "_noLabel", "_clearable",
                     "_disabledBtns", "_disabledOldDataRow"
-                ],
-                subIgnoreProperties: [
-                    "_regStr", "_regMessage"
                 ]
+                // subIgnoreProperties: []
             };
         },
         computed: {
@@ -290,11 +288,9 @@
                 if (this.$refs.dshFormUnit) {
                     errorRefs = this.$refs.dshFormUnit.filter(refItem => !refItem.validate());
                     bool = !errorRefs.length;
-                } else {
-                    bool = true;
                 }
-                cb && cb(bool, errorRefs.map(errorRefItem => errorRefItem.formItem));
 
+                cb && cb(bool, errorRefs.map(errorRefItem => errorRefItem.formItem));
                 return bool;
             },
             // iview的校验回调
@@ -342,9 +338,9 @@
                         _displayType: "show",
                         canEdit: !["createdAt", "updatedAt", "_creaters"].includes(formData._key)
                     }).forEach(arr => {
-                        !this.ignoreProperties.includes(arr[0]) &&
-                            (formData.__parentKey__ ? !this.subIgnoreProperties.includes(arr[0]) : true) &&
+                        if (!this.ignoreProperties.includes(arr[0])) {
                             this.$set(formItem, arr[0], arr[1]);
+                        }
                     });
                 }
 
@@ -378,7 +374,7 @@
                 if (ruleConfig.regs && ruleConfig.regs.length) {
                     rules.push({
                         message: formItem._regMessage || `${formItem._name}格式不正确!`,
-                        trigger: "blur",
+                        trigger: "blur, change",
                         type: "string",
                         transform: (val) => {
                             return this.$isEmptyData(val)

package/src/components/list/DshFlatTable.vue

@@ -11,6 +11,7 @@
 
         <!-- 表格 -->
         <bri-table
+            v-show="showListData.length"
             ref="briTable"
             class="DshFlatTable-main"
             :columns="showColumns"
@@ -20,6 +21,17 @@
             @changeSelect="changeSelect"
             @selectAll="changeSelect"
         ></bri-table>
+        <bri-table
+            v-show="!showListData.length"
+            ref="briTable"
+            class="DshFlatTable-main"
+            :columns="showColumns"
+            :data="showListData"
+            :footer-data="footerData"
+            :propsObj="tablePropsObj"
+            @changeSelect="changeSelect"
+            @selectAll="changeSelect"
+        ></bri-table>
 
         <!-- 添加行 -->
         <dsh-render :render="createOperationRender"></dsh-render>

package/src/components/list/DshTreeTable.vue

@@ -11,6 +11,18 @@
 
         <!-- 表格 -->
         <bri-table
+            v-show="showListData.length"
+            ref="briTable"
+            class="DshTreeTable-main"
+            :columns="showColumns"
+            :data="renderedListData"
+            :footer-data="footerData"
+            :propsObj="tablePropsObj"
+            @changeSelect="changeSelect"
+            @selectAll="changeSelect"
+        ></bri-table>
+        <bri-table
+            v-show="!showListData.length"
             ref="briTable"
             class="DshTreeTable-main"
             :columns="showColumns"

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

@@ -71,7 +71,47 @@ export default {
                 width: 76,
                 align: "center",
                 fixed: "left",
-                renderBodyCell: ({ column, row, rowIndex }) => ++rowIndex
+                renderBodyCell: ({ row, column, rowIndex }, h) => {
+                    return [
+                        h("div", rowIndex + 1),
+
+                        // 添加符
+                        // this.operationMap.canCreate && !this.isSearching && rowIndex !== this.allListData.length - 1
+                        this.operationMap.canCreate && !this.isSearching
+                            ? h("div", {
+                                style: {
+                                    position: "absolute",
+                                    bottom: "0px",
+                                    right: "0px",
+                                    display: "inline-block",
+                                    width: "16px",
+                                    height: " 16px",
+                                    border: "1px solid #dcdee2",
+                                    backgroundColor: "#ffffff",
+                                    lineHeight: "12px",
+                                    cursor: "pointer",
+                                    verticalAlign: "middle",
+                                    transition: "color .2s ease-in-out,border-color .2s ease-in-out"
+                                }
+                            }, [
+                                h("Icon", {
+                                    style: {
+                                        fontWeight: "500"
+                                    },
+                                    props: {
+                                        type: "md-add-circle", // "ios-add"
+                                        size: "14"
+                                    },
+                                    on: {
+                                        click: () => {
+                                            this.clickCreate(this.operationMap.canCreate, row, rowIndex);
+                                        }
+                                    }
+                                })
+                            ])
+                            : h("span", "")
+                    ];
+                }
             };
         }
     },
@@ -90,7 +130,7 @@ export default {
             };
             const newRowIndex = rowIndex == null ? list.length : rowIndex + 1;
             list.splice(newRowIndex, 0, newRow);
-            this.$forceUpdate(); // 自定义页中点击添加一行没有更新页面
+            // this.$forceUpdate(); // 自定义页中点击添加一行没有更新页面
 
             this.change("createRow", null, newRow, newRowIndex);
         },

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

@@ -161,7 +161,7 @@ export default {
                         }, row.__treeIndex__),
 
                         // 添加符
-                        this.operationMap.canCreate && row.level < this.maxLevel && !this.isSearching
+                        this.operationMap.canCreate && !this.isSearching && row.level < this.maxLevel
                             ? h("div", {
                                 style: {
                                     position: "absolute",
@@ -339,7 +339,7 @@ export default {
                         }, row);
                     }
 
-                    // 初次进来把前端存的状态值全部清除（除了__readonly__）
+                    // 初次进来把前端存的状态值全部清除（除了__readonly__和__isQuote__不处理）
                     if (this.initFlag) {
                         this.deleteProperties.forEach(property => {
                             delete row[property];