重点商品导入

src/ExcelImportDialog.ts

@@ -131,7 +131,11 @@ export class ExcelImportDialog extends Scope {
         _.forEach(this.importExcelOption.columns, (v) => {
             xt.push(v.header);
         })
-        const filename = this.importExcelOption.templateName ? this.importExcelOption.templateName : "模版.xlsx"; //文件名称
+        let filename = this.importExcelOption.templateName ? this.importExcelOption.templateName : "模版"; //文件名称
+        if (filename.endsWith(".xlsx")) {
+            filename = filename.split(".xlsx")[0];
+        }
+        filename = filename + ".xlsx"
         var ws_name = "Sheet1"; //Excel第一个sheet的名称
         var wb = XLSX.utils.book_new(), ws = XLSX.utils.aoa_to_sheet([xt]);
         XLSX.utils.book_append_sheet(wb, ws, ws_name);  //将数据添加到工作薄
@@ -139,6 +143,24 @@ export class ExcelImportDialog extends Scope {
     }
 
     getData(sender) {
+        _.each(this.importData.okData, item=>{
+            delete item.id
+            delete item.__hasError__
+            delete item.__importID__
+            delete item._origin
+        })
+        _.each(this.importData.allData, item=>{
+            delete item.id
+            delete item.__hasError__
+            delete item.__importID__
+            delete item._origin
+        })
+        _.each(this.importData.errorData, item=>{
+            delete item.id
+            delete item.__hasError__
+            delete item.__importID__
+            delete item._origin
+        })
         this.dialogSuccess(this.importData)
     }
     importData: ImportResult
@@ -188,7 +210,7 @@ const vjsonFunc = (option) => {
                                 }, {
                                     xtype: "button",
                                     iconCls: "x-fa fa-upload",
-                                    text: "提取数据",
+                                    text: option.tQButtonText || "提取数据",
                                     listeners: {
                                         click: "scope.getData"
                                     }

src/xlsx.ts

@@ -288,7 +288,7 @@ export function readExcelWithColumnsSet(topScope: Scope,
                                     nv = column.importFormatter(vdata)
                                 }
 
-                                if (nv === undefined || nv === null || isNaN(nv)) {
+                                if (!nv) {
                                     hasError = true;
                                 } else {
                                     row[column.dataIndex] = nv;
@@ -443,7 +443,9 @@ export declare interface ImportExcelOption {
     // 外部定义的控件
     toolBar?: any[],
     // 关闭回调
-    onClose?: string | (() => void)
+    onClose?: string | (() => void),
+    // 提取数据按钮的名称
+    tQButtonText?: string | null | undefined
 }
 
 /**