Merge branch 'master' into LEXUpgrade2023-Deloitte

buli

2023-07-14 e6068da47c1bef5517c9e5fdc8c726766867ad4e

 force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImportHelper.js

@@ -89,7 +89,7 @@
        reader.onloadend = function () {};
        reader.readAsDataURL(file);
    },
    isNumber: function(str) {
    isNumber: function (str) {
        return /^\d+$/.test(str);
    },
    saveRecords: function (component, event, helper) {
@@ -115,37 +115,29 @@
                    for (var i = 0; i < ress.length; i++) {
                        res1 += ress[i].substr(7) + '\n';
                        if (ress[i] != '') {
<<<<<<< HEAD
                            let errorData = {};
                            if (
                                !this.isNumber(
                                    ress[i].substr(7).substring(1, 2)
                                )
                            ) {
                                continue;
                            }
                            let index = errorDataRow.indexOf(
                                ress[i].substr(7).substring(1, 2)
                            );
=======
                            let errorData = {}
                            if(!this.isNumber(ress[i].substr(7).substring(1, 2))){
                                continue
                            }
                            let index = errorDataRow.indexOf(ress[i].substr(7).substring(1, 2));
>>>>>>> LEXCommunityLiJun
                            if (index == -1) {
                                errorData.errorRow = ress[i]
                                    .substr(7)
                                    .substring(1, 2);
                                errorDataRow.push(errorData.errorRow);
<<<<<<< HEAD
                                errorData.errorInfo = ress[i]
                                    .substr(7)
                                    .substring(6);
                                    .substring(5);
                                errorDatas.push(errorData);
                            } else {
                                errorDatas[index].errorInfo +=
                                    '; ' + ress[i].substr(7).substring(6);
=======
                                errorData.errorInfo = ress[i].substr(7).substring(5);
                                errorDatas.push(errorData);
                            } else {
                                errorDatas[index].errorInfo += '; ' + ress[i].substr(7).substring(5);
>>>>>>> LEXCommunityLiJun
                                    '; ' + ress[i].substr(7).substring(5);
                            }
                        }
                    }
@@ -153,13 +145,12 @@
                        .get('v.fileContentData')
                        .split('\n');
                    let errorColumns = [
<<<<<<< HEAD
                        {
                            label: '错误行',
                            fieldName: 'errorRow',
                            type: 'text',
                            hideDefaultActions: true,
                            initialWidth: 50
                            initialWidth: 100
                        },
                        {
                            label: '错误信息',
@@ -169,10 +160,6 @@
                            initialWidth: 300,
                            wrapText: true
                        }
=======
                        { label: '错误行', fieldName: 'errorRow', type: 'text', hideDefaultActions: true, initialWidth: 100 },
                        { label: '错误信息', fieldName: 'errorInfo', type: 'text', hideDefaultActions: true,initialWidth: 300,wrapText: true }
>>>>>>> LEXCommunityLiJun
                    ];
                    for (
                        var i = 0;
@@ -180,37 +167,23 @@
                        i++
                    ) {
                        errorColumns.push({
<<<<<<< HEAD
                            label: fileContentData[0].split(',')[i],
                            fieldName: 'field' + i,
                            type: 'text',
                            hideDefaultActions: true,
                            wrapText: true
=======
                            label: fileContentData[0].split(',')[i], 
                            fieldName: 'field' + i, 
                            type: 'text', 
                            hideDefaultActions: true,
                            wrapText: true,
                            initialWidth: 120
>>>>>>> LEXCommunityLiJun
                        });
                    }

                    for (var i = 0; i < errorDatas.length; i++) {
                        let data = fileContentData[errorDatas[i].errorRow];
                        console.log('data = ' + JSON.stringify(data));
<<<<<<< HEAD
                        for (var j = 0; j < data.split(',').length; j++) {
                            let label = 'field' + j;
                            errorDatas[i][label] = data.split(',')[j];
=======
                        if(data){
                            for(var j = 0; j < data.split(',').length; j++){
                        if (data) {
                            for (var j = 0; j < data.split(',').length; j++) {
                                let label = 'field' + j;
                                errorDatas[i][label] = data.split(',')[j];
                            }
>>>>>>> LEXCommunityLiJun
                        }
                    }
                    console.log('errorDatas = ' + JSON.stringify(errorDatas));
@@ -224,14 +197,14 @@
                    component.set('v.errorMessage', res1 + '请修改后重新上传');
                    this.showErrorToast(component);
                    component.set('v.login', false);
                    component.find('save_con').set('v.disabled', true); 
                    component.find('save_con').set('v.disabled', true);
                } else {
                    // this.success('导入成功');
                    component.set('v.successMessage', '导入成功');
                    this.showSuccessToast01(component);
                    component.set('v.showMain', true);
                    component.set('v.login', false);
                    component.find('save_con').set('v.disabled', false); 
                    component.find('save_con').set('v.disabled', false);
                }
            } else if (state === 'INCOMPLETE') {
                component.set('v.login', false);
@@ -289,18 +262,11 @@
    //弹出 错误提示
    showErrorToast: function (component) {
        $A.util.removeClass(component.find('errorDiv'), 'slds-hide');
<<<<<<< HEAD
        window.setTimeout(
            $A.getCallback(function () {
                $A.util.addClass(component.find('errorDiv'), 'slds-hide');
            }),
            4000
=======
        window.setTimeout($A.getCallback(function () {
            $A.util.addClass(component.find('errorDiv'), 'slds-hide');
        }),
            7000
>>>>>>> LEXCommunityLiJun
        );
    },
    success: function (message) {
@@ -392,15 +358,10 @@
    downloadCSV: function (component, csv) {
        var link = document.createElement('a');
        // 设置字符集和文件头
<<<<<<< HEAD
        let bom = '\uFEFF';
        var bom = '\uFEFF';
        link.href =
            'data:text/csv;charset=utf-8,' + encodeURIComponent(bom + csv);
=======
        var bom = "\uFEFF";
        link.href = 'data:text/csv;charset=utf-8,' + encodeURIComponent(bom + csv);
        //link.href = URL.createObjectURL(csvFile);
>>>>>>> LEXCommunityLiJun
        link.download = 'data.csv';
        document.body.appendChild(link);
        link.click();