bri-components 1.4.27 → 1.4.30

package/package.json

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

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

@@ -376,13 +376,13 @@
                 ];
             },
             allDepartShowKeys () {
-                const loop = (list = []) => {
-                    return list.reduce((arr, item) => {
+                const loop = (arr = []) => {
+                    return arr.reduce((totalList, item) => {
                         return [
-                            ...arr,
+                            ...totalList,
                             ...loop(item.children)
                         ];
-                    }, list);
+                    }, []);
                 };
 
                 return loop(this.departShowList).map(item => item._key);

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

@@ -269,13 +269,14 @@ export default {
                 _showByNumFieldKey: "", // 控制联动隐藏字段的外层字段
                 _hideColKeys: [], // 隐藏／查看列字段的keys
                 _isQuote: false, // 引用
-                _quoteDisabledColKeys: [], // 引用数据行不可编辑咧
+                _quoteDisabledColKeys: [], // 引用数据行不可编辑列
                 _quoteListFields: [], // 引用列表的显示字段
                 _quoteAdvSearch: {
                     logic: "and",
                     conditions: []
                 }, // 引用列表筛选条件
                 _isImport: false, // 导入
+                _importAsDft: false, // 导入的数据作为默认数据
                 _isExport: false, // 导出
                 _useEnlarge: true, // 全屏
 
@@ -645,6 +646,9 @@ export default {
         isImport () {
             return this.selfPropsObj._isImport;
         },
+        importAsDft () {
+            return this.selfPropsObj._importAsDft;
+        },
         importParams () {
             return {
                 _id: this.parentDataId,
@@ -947,8 +951,45 @@ export default {
         },
         // 导入回调
         importCb (dataObj) {
-            this.parentObj[this.controlKey] = dataObj;
-            this.change("import");
+            const fieldVal = dataObj;
+            if (this.importAsDft) {
+                if (["cascaderTable"].includes(this.controlType)) {
+                    const transformData = (list = []) => {
+                        const loop = (list = []) =>
+                            list.map(item => ({
+                                ...item,
+                                children: item.children ? loop(item.children) : item.children,
+                                __isDefault__: true,
+                                __old__: false
+                            }));
+
+                        return loop(list);
+                    };
+
+                    this.parentObj[this.controlKey] = {
+                        ...fieldVal,
+                        tree: transformData(fieldVal.tree)
+                    };
+                }
+                else if (["flatTable"].includes(this.controlType)) {
+                    this.parentObj[this.controlKey] = {
+                        ...fieldVal,
+                        list: fieldVal.list.map(item => ({
+                            ...item,
+                            __isDefault__: true,
+                            __old__: false
+                        }))
+                    };
+                }
+            } else {
+                this.parentObj[this.controlKey] = dataObj;
+            }
+
+            // 因为data和rowspanMap不马上更新
+            this.$nextTick(() => {
+                this.reset();
+                this.change("import");
+            });
         },
 
         /* ----------- 导出 ---------- */
@@ -1443,7 +1484,7 @@ export default {
         getColCanEdit ({ row, rowIndex, column }) {
             return (this.getIsDftRow(row) ? !this.dftReadonlyColKeys.includes(column._key) : true) && // 默认行的某列是否可编辑
                 (row.__old__ === true ? !this.oldReadonlyColKeys.includes(column._key) : true) && // 老数据行里某些列不可编辑
-                (row.__isQuote__ ? !this.quoteReadonlyColKeys.includes(column._key) : true) && // 引用过来的数据是否可编辑
+                (row.__isQuote__ ? !this.quoteReadonlyColKeys.includes(column._key) : true) && // 引用的数据是否可编辑
                 (this.getSelfColCanEdit ? this.getSelfColCanEdit({ row, rowIndex, column }) : true) &&
                 (
                     ["treeTable"].includes(this.inTableType) && ["number", "date"].includes(column._type)