olp-table 5.3.1 → 5.3.4

package/src/mixins/VTMixin/DefaultMethods.js

@@ -0,0 +1,749 @@
+import {handleTree} from "@/utils/tree";
+import {useMessage} from "@/utils/message";
+import {post, get, request, postAes} from "@/utils/http/httpUtils";
+import {exportExcel} from "@/utils/ExcelUtil";
+import VXETable from "vxe-table";
+import {groupAndCompute} from "@/utils/groupCompute";
+
+const message = useMessage() // 消息弹窗
+export const DefaultMethods = {
+    methods: {
+        //删除主子表
+        async doRemoveMainAndSub({obj, row},subTableName, whereObj, subForeignKey, content) {
+            if (content) {
+                let type = await VXETable.modal.confirm({
+                    content: content, title: '提示', status: 'warning'
+                })
+                if (type == "cancel") {
+                    return
+                }
+            }
+            this.doPostAes(obj.code, '/online/crudAes/deleteMainAndSubs', {
+                dbName: this.tableConfig.dbName,
+                tableName: this.tableConfig.mainTable,
+                subTableName:subTableName,
+                whereMap: this.doGetWhereMap(row, whereObj),//更新条件
+                subForeignKey:subForeignKey,
+            })
+        },
+        //单个更新
+        async doOneSave({obj, row}, updateObj, whereObj, content) {
+            if (content) {
+                let type = await VXETable.modal.confirm({
+                    content: content, title: '提示', status: 'warning'
+                })
+                if (type == "cancel") {
+                    return
+                }
+            }
+            if (!row) {
+                VXETable.modal.message({
+                    content: "数据为空！", title: '提示', status: 'error'
+                })
+                return
+            }
+            let dataSource = this.table.dataSource;
+            if (!dataSource) {
+                return;
+            }
+            row[this.formMainList.edit.formMain.updateKey] = ''
+            let params = {
+                dbName: this.tableConfig.dbName,
+                tableName: this.tableConfig.mainTable,
+                genIdMap:{[this.formMainList.edit.formMain.updateKey]: 'uuid'},
+                columnAndValueMap: this.getColumnTableUpdateValue(this.table.columns,row),
+                whereMap: this.doGetWhereMap(row, this.formMainList.edit.formMain.updateKey)
+            }
+            this.doPostAes(obj.code, '/online/crudAes/save', params)
+        },
+        //单个更新
+        async doOneModify({obj, row}, updateObj, whereObj, content) {
+            if (content) {
+                let type = await VXETable.modal.confirm({
+                    content: content, title: '提示', status: 'warning'
+                })
+                if (type == "cancel") {
+                    return
+                }
+            }
+
+            this.doPostAes(obj.code, '/online/crudAes/modify', {
+                dbName: this.tableConfig.dbName,
+                tableName: this.tableConfig.mainTable,
+                columnAndValueMap: this.doGetColumnAndValueMap(row, updateObj),//更新字段
+                whereMap: this.doGetWhereMap(row, whereObj),//更新条件
+            })
+        },
+        //批量更新
+        async doBatchModify(code, updateObj, whereObj, content, updateRecords) {
+            if (content) {
+                let type = await VXETable.modal.confirm({
+                    content: content, title: '提示', status: 'warning'
+                })
+                if (type == "cancel") {
+                    return
+                }
+            }
+            let rows = updateRecords;
+            if (!updateRecords || updateRecords.length <= 0) {
+                rows = this.getSelectRows();
+            }
+            if (rows.length == 0) {
+                VXETable.modal.message({
+                    content: "请选数据！", title: '提示', status: 'error'
+                })
+                return
+            }
+            let list = [];
+            for (const row of rows) {
+                list.push({
+                    columnAndValueMap: this.doGetColumnAndValueMap(row, updateObj),//更新字段
+                    whereMap: this.doGetWhereMap(row, whereObj),//更新条件
+                });
+            }
+            this.doPostAes(code, '/online/crudAes/batchModify', {
+                dbName: this.tableConfig.dbName,
+                tableName: this.tableConfig.mainTable,
+                list
+            })
+        },
+        doPostAes(code, url, params) {
+            this.loading[code] = true
+            postAes(this.http, url, params).then(r => {
+                if (r != false) {
+                    this.query();
+                }
+            }).finally(() => {
+                this.loading[code] = false
+            });
+        },
+        /**
+         * 根据列配置获取数据库表更新数据
+         * @param column
+         * @param formData
+         * @returns {{}}
+         */
+        getTableUpdateValue(column, formData) {
+            let columnAndValueMap = {}
+            for (let {prop,tableField} of column) {
+                if (!tableField || tableField != '1') {
+                    continue
+                }
+                let value = formData[prop];
+                if (value) {
+                    if (value instanceof String) {
+                        value = value.trim();
+                    }
+                    columnAndValueMap[prop] = value;
+                }
+            }
+            return columnAndValueMap;
+        },
+        getColumnTableUpdateValue(column, formData) {
+            let columnAndValueMap = {}
+            for (let {field,tableSaveToOtherProp} of column) {
+                // 勾选，不属于数据库表字段
+                if (tableSaveToOtherProp && tableSaveToOtherProp == '1') {
+                    continue
+                }
+                let value = formData[field];
+                if (value) {
+                    if (value instanceof String) {
+                        value = value.trim();
+                    }
+                    columnAndValueMap[field] = value;
+                }
+            }
+            return columnAndValueMap;
+        },
+        doGetColumnAndValueMap(row, updateObj) {
+            let columnAndValueMap = {};
+            for (let key of updateObj.split(",")) {
+                let k = key.split("=");
+
+                if (k.length == 2) {
+                    columnAndValueMap[k[0]] = k[1];
+                } else {
+                    k = key.split(":");
+                    columnAndValueMap[k[k.length - 1]] = row[k[0]];
+                }
+            }
+            return columnAndValueMap;
+        },
+        doGetColumnAndValueAny(rows, updateObj) {
+            if (!updateObj) {
+                return rows;
+            }
+            let list = []
+            let keys = [];
+            let hasKey = '';
+            for (const row of rows) {
+                keys = keys.length >=1 ?keys:Object.keys(row)
+                if (!hasKey) {
+                    hasKey = this.hasUpdateKey(keys, updateObj)
+                }
+                if (hasKey) {
+                    Object.assign(row, this.doGetColumnAndValueMap(row, updateObj))
+                }
+                list.push(row);
+            }
+            return list;
+        },
+        getJs(v, columnsStr) {
+            // let colemn = "HT_RentbillOID:BillID,ShopNumber:ShopNumber,rent:rent,tenant:tenant,Assetaddress:Assetaddress,DJYPFMY:DJYPFMY,MJPFM:MJPFM";
+            // return 'this.table.data.push(...this.doGetColumnAndValueAny(v, columnsStr))'
+        },
+        hasUpdateKey(keys, updateObj) {
+            for (const key of keys) {
+                if (updateObj.indexOf(key) >= 0) {
+                    return '1';
+                }
+            }
+            return '0';
+        },
+        doGetWhereMap(row, whereObj) {
+            let whereMap = {};
+            for (let key of whereObj.split(",")) {
+                let k = key.split(":");
+                whereMap[k[k.length - 1]] = row[k[0]];
+            }
+            return whereMap;
+        },
+        /**
+         * 内置批量删除方法
+         * @param o
+         * @returns {Promise<void>}
+         */ batchRemove() {
+            this.confirm("您选中" + this.getSelectRows().length + '条数据，删除后不可恢复，您确定要删除吗？', '删除提示', 'error').then(type => {
+                if (type != "cancel") {
+                    let list = [];
+                    for (let r of this.getSelectRows()) {
+                        let p = JSON.parse(JSON.stringify(this.deleteParameter));
+                        delete p['$parentId'];
+                        for (let key of Object.keys(p)) {
+                            p[key] = r[key];
+                        }
+                        list.push(p);
+                    }
+                    this.loading['batchDelete'] = true
+                    postAes(this.http, '/online/crudAes/batchDelete', {
+                        dbName: this.tableConfig.dbName,
+                        tableName: this.tableConfig.mainTable,
+                        list: list
+                    }).then(r => {
+                        if (r != false) {
+                            this.query();
+                        }
+                    }).finally(() => {
+                        this.loading['batchDelete'] = false
+                    });
+                }
+            })
+
+
+        }, /**
+         * 内置重置方法
+         * @param o
+         * @returns {Promise<void>}
+         */ resetQuery() {
+            for (let k of Object.keys(this.table.formConfig.data)) {
+                this.table.formConfig.data[k] = undefined
+            }
+            for (let k of Object.keys(this.parameter)) {
+                this.parameter[k] = undefined
+            }
+            this.initDefaultValue();
+            this.query();
+        }, /**
+         * 内置根据参数查询
+         * @param o
+         * @returns {Promise<void>}
+         */
+        queryParams(parameter) {
+            if (parameter) {
+                Object.assign(this.parameter, parameter)
+            }
+            return this.query();
+        }, /**
+         * 内置查询
+         * @param o
+         * @returns {Promise<void>}
+         */
+        query() {
+            let axios = undefined;
+            if (this.tableConfig.definitionSql == 2) {
+                if (this.tableConfig.requestType == '1') {
+                    axios = post(this.http, this.tableConfig.api, this.getParams(), false, false);
+                } else {
+                    axios = get(this.http, this.tableConfig.api, this.getParams(), false);
+                }
+            } else {
+                axios = postAes(this.http, '/online/crudAes/query', this.getParams(), false, false);
+            }
+            this.doQuery(axios);
+        }, doQuery(axios) {
+            if (this.loading['select']) {
+                return
+            }
+            this.table.loading = true;
+            this.loading['select'] = true
+            axios.then(({data, code, msg}) => {
+                if (code != 200 && code != 0) {
+                    message.error(msg)
+                    return
+                }
+                let respData = (data instanceof Array) ? data : data.listData;
+                if (this.table.treeConfig) {
+                    //id , parentId , children
+                    respData = handleTree(respData, this.table.treeConfig.treeId, this.table.treeConfig.treeParentId);
+                }
+                this.table.data = respData;
+                this.doGroupAndCompute(respData)
+                this.pagination.total = data.count;
+            }).finally(() => {
+                this.table.loading = false;
+                this.loading['select'] = false
+            });
+        },
+
+        /**
+         * 内置删除方法
+         * @param o
+         * @returns {Promise<void>}
+         */
+        remove(o) {
+            let {row} = o;
+            this.confirm('数据删除后不可恢复，您确定要删除吗？', '删除提示', 'error').then(type => {
+                if (type != "cancel") {
+                    let params = {};
+                    for (let key of Object.keys(this.deleteParameter)) {
+                        if (key != '$parentId') {
+                            params[key] = row[key];
+                        }
+                    }
+                    postAes(this.http, '/online/crudAes/delete', {
+                        where: params,
+                        dbName: this.tableConfig.dbName,
+                        tableName: this.tableConfig.mainTable,
+                    }).then(r => {
+                        if (r != false) {
+                            this.query()
+                        }
+                    })
+                }
+            })
+        }, /**
+         * 获取查询参数
+         * @returns {{enablePage: OTMixinBodyMethods.methods.pagination.enabled, theme: OTMixinBodyMethods.methods.theme, id: OTMixinBodyMethods.methods.uuid}}
+         */
+        getParams() {
+            if (this.tableConfig.definitionSql == 2) {
+                let params = JSON.parse(JSON.stringify(this.table.formConfig.data));
+                if (params.enablePage) {
+                    params.pageNumber = this.pagination.currentPage;
+                    params.pageSize = this.pagination.pageSize;
+                }
+                return {...this.parameter, ...params}
+            }
+            let params = {
+                id: this.uuid, theme: this.theme, enablePage: this.pagination.enabled
+            };
+            if (params.enablePage) {
+                params.pageNumber = this.pagination.currentPage;
+                params.pageSize = this.pagination.pageSize;
+            }
+            let paramsKey = [];
+            for (let o of this.table.formConfig.items) {
+                let value = this.table.formConfig.data[o.key];
+                if (value == undefined || value == '' || (o.itemRender && o.itemRender.name == '$buttons')) {
+                    continue
+                }
+                let key = o.key.replace(/\$/g, '');
+                if (o.tableName != undefined && o.tableName != '') {
+                    key = o.tableName + '.' + key;
+                }
+                //文本域
+                if (o.itemRender && o.itemRender.name == "textarea" && o.type != "9") {
+                    let values = value instanceof Array ? value : value.split("\n");
+                    if (values.length != 0) {
+                        let queryParameterMapIn = [];
+                        for (let v of values) {
+                            if (v != undefined && v.toString().trim() != '') {
+                                queryParameterMapIn.push(v);
+                            }
+                        }
+                        if (queryParameterMapIn.length != 0) {
+                            if (!params['queryParameterMapIn']) {
+                                params['queryParameterMapIn'] = {};
+                            }
+                            params['queryParameterMapIn'][key] = queryParameterMapIn;
+                            paramsKey.push(key);
+                        } else if (params['queryParameterMapIn']) {
+                            delete params['queryParameterMapIn'][key];
+                        }
+                    }
+
+                } else if (value.toString().trim() != '') {
+                    if (!params['queryParameterListAnd']) {
+                        params['queryParameterListAnd'] = [];
+                    }
+                    let values = value instanceof Array ? value : value.split(",");
+                    if (o.type == "98") {
+                        params['queryParameterListAnd'].push({
+                            value: values[0], key: key, type: 5, toDate: o.toDate
+                        });
+                        params['queryParameterListAnd'].push({
+                            value: values[1], key: key, type: 6, toDate: o.toDate
+                        });
+                        paramsKey.push(key);
+                    } else if (value.length == 1 && !(value instanceof Array)) {
+                        o.value = value;
+                        //type 查询类型 默认等于1--> 1：= 2：!=  3: > 4:< 5: >= 6: <= 7:like '%value' 8:like '%value%' 9:like 'value%'
+                        //replace(/\$/g, '') 目的解决范围
+                        let obj = {
+                            value: value, key: key, type: o.type, toDate: o.toDate
+                        };
+                        params['queryParameterListAnd'].push(obj);
+                        paramsKey.push(key);
+                    } else {
+                        for (let v of values) {
+                            if (!v) {
+                                continue;
+                            }
+                            let obj = {
+                                value: v, key: key, type: o.type, toDate: o.toDate
+                            };
+                            params['queryParameterListAnd'].push(obj);
+                            paramsKey.push(key);
+                        }
+                    }
+                }
+            }
+            for (let key of Object.keys(this.parameter)) {
+                let v = this.parameter[key];
+                if (paramsKey.indexOf(key) === -1 && v != undefined && v != '') {
+                    if (!params['queryParameterListAnd']) {
+                        params['queryParameterListAnd'] = [];
+                    }
+                    params['queryParameterListAnd'].push({
+                        key: key, value: v
+                    });
+                }
+            }
+            if (this.orderByColumns.length != 0) {
+                params['orderBy'] = this.orderByColumns;
+            }
+            if (this.events['queryBefore']) {
+                this.events['queryBefore'](params)
+            }
+            return params;
+        }, /**
+         * 导出数据
+         * @param columns 自定义导出字段 t_id
+         * @param selectData 选择数据: 当前页数据、勾选行数据、全部数据
+         * @param name
+         */
+        exportData({exportParam, cancelEvent}) {
+            let {columns, selectData, name} = exportParam
+            for (let column of this.table.columns) {
+                for (let c of columns) {
+                    if (column.field === c.field && column.params) {
+                        c.params = column.params;
+                    }
+                }
+            }
+            let data = []
+            switch (selectData) {
+                case '1': // 当前页
+                    data = this.table?.data
+                    break
+                case '2': // 勾选
+                    data = this.getSelectRows()
+                    if (!data || data.length == 0) return message.error('勾选行数据为空！')
+                    break
+                case '3': // 全部数据
+                    this.exportExcelAll(columns, name)
+                    break
+                default:
+                    data = this.table.data
+                    break
+            }
+            if (selectData != '3') {
+                exportExcel({
+                    data: data,
+                    name: name,
+                    columns: columns,
+                    option: {align: this.$table ? this.$table.align : 'center'}
+                })
+            }
+            cancelEvent()
+        }, /**
+         * 全部数据导出
+         * @param fields 自定义导出字段
+         * @param name 文件名
+         */
+        exportExcelAll(columns, name) {
+            let params = this.getParams();
+            params.enablePage = false;
+            if (this.tableConfig.definitionSql == 2) {
+                params.pageNumber = 1;
+                params.pageSize = 50000;
+            }
+            let url = this.tableConfig.definitionSql == 2 ? this.tableConfig.api : '/online/crud/query';
+            let method = this.tableConfig.definitionSql == 2 ? (this.tableConfig.requestType == '1' ? 'post' : 'get') : 'post'
+            request(this.http, {
+                url: url, method: method, data: params, timeout: 1000 * 90 * 90
+            }, false, false).then(({data}) => {
+                let respData = (data instanceof Array) ? data : data.listData;
+                exportExcel({
+                    data: respData,
+                    name: name,
+                    columns: columns,
+                    option: {align: this.$table ? this.$table.align : 'center'}
+                })
+            })
+        }, /**
+         * 内置确认框
+         * @param content
+         * @param title
+         * @param status
+         * @returns {Promise<"model"|"mask"|"close"|"confirm"|"cancel"|"exit"|"exist">}
+         */
+        async confirm(content, title, status) {
+            return await VXETable.modal.confirm({
+                content: content, title: title, status: status
+            })
+        }, /**
+         * 内置调用方法
+         * @param m
+         * @param v
+         * @param d
+         */
+        emits({m, v, d, js}) {
+            if (js) {
+                eval(js)
+            } else if (m && this[m]) {
+                this[m](v);
+            }
+            if (d != false) {
+                this.customUrl = undefined;
+            }
+        }, /**
+         * 设置工具栏 but
+         * @param code 编码
+         * @param key 要设置的key
+         * @param value 要设置的value
+         */
+        setToolBtn(code, key, value) {
+            for (let toolBtn of this.toolBtn) {
+                if (toolBtn.code == code) {
+                    toolBtn[key] = value;
+                }
+            }
+        }, /**
+         * 设置操作按钮 but
+         * @param code 编码
+         * @param key 要设置的key
+         * @param value 要设置的value
+         */
+        setOperationBtn(code, key, value) {
+            for (let toolBtn of this.operationBtn) {
+                if (toolBtn.code == code) {
+                    toolBtn[key] = value;
+                }
+            }
+        },
+        /**
+         * 获取修改数据（包括未修改数据）
+         */
+        getUpdateRecords() {
+            if (this.$table) {
+                return this.$table.getUpdateRecords()
+            }
+        },
+        /**
+         * 批量保存
+         */
+        async batchSave(code, content, rows, foreignKey, foreignKeyValue) {
+            if (content) {
+                let type = await VXETable.modal.confirm({
+                    content: content, title: '提示', status: 'warning'
+                })
+                if (type == "cancel") {
+                    return
+                }
+            }
+            if (rows.length == 0) {
+                VXETable.modal.message({
+                    content: "请选数据！", title: '提示', status: 'error'
+                })
+                return
+            }
+            let list = [];
+            let updateList = [];
+            let dataSource = this.table.dataSource;
+            this.formMainList.edit.formMain.updateKey = this.formMainList.edit.formMain.updateKey.trim();
+            const srcMap = new Map(dataSource.map(item => [item[this.formMainList.edit.formMain.updateKey], item]));
+            for (const row of rows) {
+                let rowId = row[this.formMainList.edit.formMain.updateKey];
+                if (rowId) {
+                    updateList.push({
+                        columnAndValueMap: this.getDifferingProperties(row, srcMap.get(row[this.formMainList.edit.formMain.updateKey])),//更新字段
+                        whereMap: this.doGetWhereMap(row, this.formMainList.edit.formMain.updateKey),//更新条件
+                    });
+                    continue
+                }
+                let columnTableUpdateValue = this.getColumnTableUpdateValue(this.table.columns,row);
+                columnTableUpdateValue[foreignKey] = foreignKeyValue?foreignKeyValue:this.mainId
+                list.push(columnTableUpdateValue);
+            }
+            if (updateList && updateList.length >= 1) {
+                console.log('updateList:', updateList)
+                this.doPostAes(code, '/online/crudAes/batchModify', {
+                    dbName: this.tableConfig.dbName,
+                    tableName: this.tableConfig.mainTable,
+                    updateList
+                })
+            }
+            if (list && list.length >= 1) {
+                this.doPostAes(code, '/online/crudAes/batchSave', {
+                    dbName: this.tableConfig.dbName,
+                    tableName: this.tableConfig.mainTable,
+                    tableConfigId: this.tableConfig.tableConfigId,
+                    columnAndValueListMap: list,
+                    genIdMap: {[this.formMainList.edit.formMain.updateKey]: 'uuid'}
+                })
+            }
+        },
+        /**
+         * 保存修改
+         */
+        async saveUpdate(code, content) {
+            let dataSource = this.table.dataSource;
+            const srcMap = new Map(dataSource.map(item => [item[this.formMainList.edit.formMain.updateKey], item]));
+            let rows = []
+            for (const row of this.getUpdateRecords()) {
+                let src = srcMap.get(row[this.formMainList.edit.formMain.updateKey]);
+                rows.push(this.getDifferingProperties(row, src));
+            }
+            // console.log('saveUpdate:',rows)
+            if (content) {
+                let type = await VXETable.modal.confirm({
+                    content: content, title: '提示', status: 'warning'
+                })
+                if (type == "cancel") {
+                    return
+                }
+            }
+            if (rows.length == 0) {
+                VXETable.modal.message({
+                    content: "请选数据！", title: '提示', status: 'error'
+                })
+                return
+            }
+            let list = [];
+            for (const row of this.getUpdateRecords()) {
+                list.push({
+                    columnAndValueMap: this.getDifferingProperties(row, srcMap.get(row[this.formMainList.edit.formMain.updateKey])),//更新字段
+                    whereMap: this.doGetWhereMap(row, this.formMainList.edit.formMain.updateKey),//更新条件
+                });
+            }
+            this.doPostAes(code, '/online/crudAes/batchModify', {
+                dbName: this.tableConfig.dbName,
+                tableName: this.tableConfig.mainTable,
+                list
+            })
+            // this.doBatchModify('batchModify', "age", this.formMainList.edit.formMain.updateKey, "确认修改编辑数据吗？", this.getUpdateRecords())
+        },
+        /**
+         * 获取新增数据
+         */
+        getInsertEvent()  {
+            if (this.$table) {
+                return this.$table.getInsertRecords()
+            }
+        },
+        /**
+         * 获取删除数据
+         * @returns {*}
+         */
+        getRemoveEvent() {
+            if (this.$table) {
+                return this.$table.getRemoveRecords()
+            }
+        },
+        /**
+         * 获取选中
+         * @returns {*|*[]|*[]}
+         */
+        getSelectRows() {
+            if (this.selectBox == 1) {
+                return this.$table.getRadioRecord() ? [this.$table.getRadioRecord()] : []
+            } else if (this.selectBox == 2) {
+                return this.$table.getCheckboxRecords(true)
+            }
+        }, updateColumn(rows) {
+            this.table['show-footer'] = false;
+            if (rows && rows instanceof Array) {
+                for (let o of this.table.columns) {
+                    for (let row of rows) {
+                        if (row.id == o.id) {
+                            for (let key of Object.keys(row)) {
+                                o[key] = row[key];
+                            }
+                        }
+                    }
+                    this.setColumnHide(o);
+                    this.setFixed(o);
+                    this.setShowFooter(o);
+                }
+            }
+            let data = this.table.columns.sort((a, b) => {
+                return a.sort - b.sort;
+            })
+            this.doGroupAndCompute()
+            this.$table.reloadColumn(data)
+        }, doGroupAndCompute(dataSource) {
+            if (dataSource) {
+                this.table.dataSource = JSON.parse(JSON.stringify(dataSource));
+            }
+            if (this.tableConfig.paging != 2) {
+                if (dataSource != undefined) {
+                    this.table.data = dataSource;
+                }
+                return
+            }
+
+            let groupKey = [];
+            let comValue = [];
+            for (let column of this.table.columns) {
+                if (column.visible && column.groupToOtherProp == 1) {
+                    groupKey.push(column.field)
+                }
+                if (column.groupTotalToOtherProp) {
+                    comValue.push(column.field + ":" + column.groupTotalToOtherProp)
+                }
+            }
+            if (dataSource == undefined) {
+                dataSource = this.table.dataSource;
+            }
+            if (groupKey.length != 0 & comValue.length != 0) {
+                dataSource = groupAndCompute(groupKey, comValue, dataSource)
+            }
+            this.table.data = dataSource;
+            this.$table.reloadData(this.table.data)
+        },
+        getDifferingProperties(tar, src) {
+            const differingProperties = {};
+            // 假设两个对象都有相同的属性
+            for (const key in tar) {
+                if (tar.hasOwnProperty(key) && src.hasOwnProperty(key)) {
+                    if (tar[key] !== src[key]) {
+                        differingProperties[key] = tar[key]; // 可以选择返回obj2的值，或创建一个数组存放两个值
+                    }
+                }
+            }
+            return differingProperties;
+        }
+    }
+}