bri-components 1.3.5 → 1.3.7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.3.5",
+    "version": "1.3.7",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",
@@ -32,7 +32,7 @@
     "dependencies": {
         "ali-oss": "^6.13.1",
         "axios": "^0.23.0",
-        "bri-datas": "^1.0.50",
+        "bri-datas": "^1.1.27",
         "jshint": "^2.12.0",
         "jsonlint": "^1.6.3",
         "minio": "7.1.0",

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

@@ -13,7 +13,6 @@
             @confirm="confirmCb"
         >
             <dsh-control-input
-                v-if="!['simple'].includes(showType)"
                 :class="commonClass"
                 :value="curValName"
                 :disabled="inputPropsObj._disabled"

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

@@ -73,7 +73,7 @@ export default {
                     ? userIndustryData
                     : this.selfPropsObj._data;
         },
-        cascaderData () {
+        cascaderAllData () {
             const loop = (arr = [], level, parentKeys = [], filterVals = [], isMobile = false) => {
                 if (filterVals.length) {
                     arr = arr.filter(item =>
@@ -115,6 +115,30 @@ export default {
 
             return loop(this.originData, this.cascaderLevel, undefined, this.cascaderFilterVals, this.isMobile);
         },
+        cascaderData () {
+            const loop = (arr = [], isMobile) => {
+                return arr
+                    ? arr.reduce((arr, item) => {
+                        if (item.rm !== 1) {
+                            let newItem = {
+                                ...item
+                            };
+
+                            if (newItem.children && newItem.children.length) {
+                                newItem.children = loop(newItem.children, isMobile);
+                            } else {
+                                newItem.children = isMobile ? undefined : [];
+                            }
+                            arr.push(newItem);
+                        }
+
+                        return arr;
+                    }, [])
+                    : [];
+            };
+
+            return loop(this.cascaderAllData, this.isMobile);
+        },
 
         curValObj () {
             return this.getItemObj(this.curValList);
@@ -180,7 +204,7 @@ export default {
 
         /* --------- 工具类 -------- */
         getItemObj (val) {
-            const objArr = this.$getTreeLinealDatas(val, this.cascaderData, undefined, this.saveKey);
+            const objArr = this.$getTreeLinealDatas(val, this.cascaderAllData, undefined, this.saveKey);
 
             return !this.$isEmptyData(val)
                 ? objArr.length
@@ -215,7 +239,7 @@ export default {
         },
         // 转化出级联全名
         transformFullName (val) {
-            return this.renderFormat(this.$getTreeLinealDatas(val, this.cascaderData, this.nameKey, this.saveKey));
+            return this.renderFormat(this.$getTreeLinealDatas(val, this.cascaderAllData, this.nameKey, this.saveKey));
         }
     }
 };

package/src/components/form/DshForm.vue

@@ -170,7 +170,7 @@
                     "users", "departments", "labels", "flatTable", "reference", "referenceBy"
                 ],
                 ignoreProperties: [
-                    "_name", "_key", "_default", "_required", "_span", "_br", "_line", "_noLabel", "_clearable", "",
+                    "_name", "_key", "_default", "_required", "_span", "_br", "_line", "_noLabel", "_clearable",
                     "_disabledBtns", "_disabledOldDataRow"
                 ],
                 subIgnoreProperties: [
@@ -305,7 +305,7 @@
                     Object.entries({
                         ...formData,
                         _displayType: "show",
-                        canEdit: true
+                        canEdit: !["createdAt", "updatedAt", "_creaters"].includes(formData._key)
                     }).forEach(arr => {
                         !this.ignoreProperties.includes(arr[0]) && (formData.__parentKey__ ? !this.subIgnoreProperties.includes(arr[0]) : true) &&
                             this.$set(formItem, arr[0], arr[1]);

package/src/components/list/BriFlatTable.vue

@@ -362,7 +362,7 @@
                 this.showRuleMessage = true;
 
                 return this.listData.every(dataItem =>
-                    this.filterColumns.every(col => this.getRuleResult(col, dataItem, true).bool)
+                    this.filterColumns.every(col => this.getRuleResult(col, dataItem).bool)
                 );
             },
             // 点击 -添加行
@@ -435,8 +435,8 @@
                     row[col._key] !== oldRow[col._key];
             },
             // 是否显示 单元格校验提示文字
-            getRuleResult (col, row, showRuleMessage = this.showRuleMessage) {
-                if ((this.ruleRecordMap[`${row._id}dsh${col._key}`] || {}).showRuleMessage || showRuleMessage) {
+            getRuleResult (col, row) {
+                if ((this.ruleRecordMap[`${row._id}dsh${col._key}`] || {}).showRuleMessage || this.showRuleMessage) {
                     return this.$getFieldRuleResult(col, row);
                 } else {
                     return {