amis 2.9.0 → 3.0.0

package/lib/renderers/Form/InputExcel.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.9.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -33,73 +33,91 @@ var ExcelControl = /** @class */ (function (_super) {
     };
     ExcelControl.prototype.handleDrop = function (files) {
         var _this = this;
-        var _a = this.props, allSheets = _a.allSheets, onChange = _a.onChange, parseImage = _a.parseImage;
         var excel = files[0];
+        var fileName = excel.name;
         var reader = new FileReader();
         reader.readAsArrayBuffer(excel);
         reader.onload = function () { return tslib.__awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return tslib.__generator(this, function (_a) {
                 if (reader.result) {
-                    Promise.resolve().then(function() {return new Promise(function(fullfill) {require(['exceljs'], function(mod) {fullfill(tslib.__importStar(mod))})})}).then(function (ExcelJS) { return tslib.__awaiter(_this, void 0, void 0, function () {
-                        var workbook, sheetsResult, worksheet, images, dispatcher;
-                        var _this = this;
-                        return tslib.__generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    this.ExcelJS = ExcelJS;
-                                    workbook = new ExcelJS.Workbook();
-                                    return [4 /*yield*/, workbook.xlsx.load(reader.result)];
-                                case 1:
-                                    _a.sent();
-                                    sheetsResult = [];
-                                    if (allSheets) {
-                                        workbook.eachSheet(function (worksheet) {
-                                            if (parseImage) {
-                                                sheetsResult.push({
-                                                    sheetName: worksheet.name,
-                                                    data: _this.readWorksheet(worksheet),
-                                                    images: _this.readImages(worksheet, workbook)
-                                                });
-                                            }
-                                            else {
-                                                sheetsResult.push({
-                                                    sheetName: worksheet.name,
-                                                    data: _this.readWorksheet(worksheet)
-                                                });
-                                            }
-                                        });
-                                    }
-                                    else {
-                                        worksheet = workbook.worksheets[0];
-                                        if (parseImage) {
-                                            images = this.readImages(worksheet, workbook);
-                                            sheetsResult = {
-                                                data: this.readWorksheet(worksheet),
-                                                images: images
-                                            };
-                                        }
-                                        else {
-                                            sheetsResult = this.readWorksheet(worksheet);
-                                        }
-                                    }
-                                    return [4 /*yield*/, this.dispatchEvent('change', sheetsResult)];
-                                case 2:
-                                    dispatcher = _a.sent();
-                                    if (dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented) {
-                                        return [2 /*return*/];
-                                    }
-                                    onChange(sheetsResult);
-                                    this.setState({ filename: files[0].name });
-                                    return [2 /*return*/];
-                            }
+                    // 如果是 xls 就用 xlsx 解析一下转成 xlsx 然后用 exceljs 解析
+                    // 为啥不直接用 xlsx 解析内容？因为它的社区版本不支持读图片，只有收费版才支持
+                    if (fileName.toLowerCase().endsWith('.xls')) {
+                        Promise.resolve().then(function() {return new Promise(function(fullfill) {require(['xlsx'], function(mod) {fullfill(tslib.__importStar(mod))})})}).then(function (XLSX) {
+                            var workbook = XLSX.read(new Uint8Array(reader.result), {
+                                cellDates: true
+                            });
+                            var xlsxFile = XLSX.writeXLSX(workbook, { type: 'array' });
+                            _this.processExcelFile(xlsxFile, fileName);
                         });
-                    }); });
+                    }
+                    else {
+                        this.processExcelFile(reader.result, fileName);
+                    }
                 }
                 return [2 /*return*/];
             });
         }); };
     };
+    ExcelControl.prototype.processExcelFile = function (excelData, fileName) {
+        var _this = this;
+        var _a = this.props, allSheets = _a.allSheets, onChange = _a.onChange, parseImage = _a.parseImage;
+        Promise.resolve().then(function() {return new Promise(function(fullfill) {require(['exceljs'], function(mod) {fullfill(tslib.__importStar(mod))})})}).then(function (ExcelJS) { return tslib.__awaiter(_this, void 0, void 0, function () {
+            var workbook, sheetsResult, worksheet, images, dispatcher;
+            var _this = this;
+            return tslib.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        this.ExcelJS = ExcelJS;
+                        workbook = new ExcelJS.Workbook();
+                        return [4 /*yield*/, workbook.xlsx.load(excelData)];
+                    case 1:
+                        _a.sent();
+                        sheetsResult = [];
+                        if (allSheets) {
+                            workbook.eachSheet(function (worksheet) {
+                                if (parseImage) {
+                                    sheetsResult.push({
+                                        sheetName: worksheet.name,
+                                        data: _this.readWorksheet(worksheet),
+                                        images: _this.readImages(worksheet, workbook)
+                                    });
+                                }
+                                else {
+                                    sheetsResult.push({
+                                        sheetName: worksheet.name,
+                                        data: _this.readWorksheet(worksheet)
+                                    });
+                                }
+                            });
+                        }
+                        else {
+                            worksheet = workbook.worksheets[0];
+                            if (parseImage) {
+                                images = this.readImages(worksheet, workbook);
+                                sheetsResult = {
+                                    data: this.readWorksheet(worksheet),
+                                    images: images
+                                };
+                            }
+                            else {
+                                sheetsResult = this.readWorksheet(worksheet);
+                            }
+                        }
+                        return [4 /*yield*/, this.dispatchEvent('change', sheetsResult)];
+                    case 2:
+                        dispatcher = _a.sent();
+                        if (dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented) {
+                            return [2 /*return*/];
+                        }
+                        onChange(sheetsResult);
+                        this.setState({ filename: fileName });
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+    };
     /** 读取工作表里的图片 */
     ExcelControl.prototype.readImages = function (worksheet, workbook) {
         var e_1, _a;
@@ -140,7 +158,7 @@ var ExcelControl = /** @class */ (function (_super) {
                 switch (_b.label) {
                     case 0:
                         _a = this.props, dispatchEvent = _a.dispatchEvent, _a.data;
-                        return [4 /*yield*/, dispatchEvent(eventName, amisCore.resolveEventData(this.props, { value: eventData }, 'value'))];
+                        return [4 /*yield*/, dispatchEvent(eventName, amisCore.resolveEventData(this.props, { value: eventData }))];
                     case 1: return [2 /*return*/, _b.sent()];
                 }
             });
@@ -275,7 +293,7 @@ var ExcelControl = /** @class */ (function (_super) {
         var _this = this;
         var _a = this.props, className = _a.className, cx = _a.classnames; _a.classPrefix; var disabled = _a.disabled, __ = _a.translate, placeholder = _a.placeholder;
         return (React__default["default"].createElement("div", { className: cx('ExcelControl', className) },
-            React__default["default"].createElement(DropZone__default["default"], { key: "drop-zone", onDrop: this.handleDrop, accept: ".xlsx", multiple: false, disabled: disabled }, function (_a) {
+            React__default["default"].createElement(DropZone__default["default"], { key: "drop-zone", onDrop: this.handleDrop, accept: ".xlsx,.xls", multiple: false, disabled: disabled }, function (_a) {
                 var getRootProps = _a.getRootProps, getInputProps = _a.getInputProps;
                 return (React__default["default"].createElement("section", { className: cx('ExcelControl-container', className) },
                     React__default["default"].createElement("div", tslib.__assign({}, getRootProps({ className: cx('ExcelControl-dropzone') })),

package/lib/renderers/Form/InputFile.d.ts

@@ -5,7 +5,7 @@ import { FileRejection } from 'react-dropzone';
 import { FormBaseControlSchema, SchemaApi, SchemaClassName, SchemaTokenizeableString } from '../../Schema';
 /**
  * File 文件上传控件
- * 文档：https://baidu.gitee.io/amis/docs/components/form/file
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/form/file
  */
 export interface FileControlSchema extends FormBaseControlSchema {
     /**

package/lib/renderers/Form/InputFile.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.9.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/InputFormula.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.9.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/InputGroup.d.ts

@@ -3,7 +3,7 @@ import { FormControlProps, IFormStore } from 'amis-core';
 import { FormBaseControlSchema, SchemaCollection } from '../../Schema';
 /**
  * InputGroup
- * 文档：https://baidu.gitee.io/amis/docs/components/form/input-group
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/form/input-group
  */
 export interface InputGroupControlSchema extends FormBaseControlSchema {
     type: 'input-group';

package/lib/renderers/Form/InputGroup.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.9.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/InputImage.d.ts

@@ -6,9 +6,10 @@ import { Payload, ActionObject } from 'amis-core';
 import { ImageThumbProps } from '../Image';
 import { TranslateFn } from 'amis-core';
 import { FormBaseControlSchema, SchemaApi, SchemaClassName, SchemaTokenizeableString, SchemaUrlPath } from '../../Schema';
+import { TplSchema } from '../Tpl';
 /**
  * Image 图片上传控件
- * 文档：https://baidu.gitee.io/amis/docs/components/form/image
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/form/image
  */
 export interface ImageControlSchema extends FormBaseControlSchema {
     /**
@@ -40,6 +41,10 @@ export interface ImageControlSchema extends FormBaseControlSchema {
      * 是否自动开始上传
      */
     autoUpload?: boolean;
+    /**
+     * 上传按钮文案
+     */
+    uploadBtnText?: string | TplSchema;
     /**
      * 选择图片按钮的 CSS 类名
      */
@@ -220,6 +225,7 @@ export interface ImageState {
     cropFileName?: string;
     submitOnChange?: boolean;
     frameImageWidth?: number;
+    dropMultiple?: boolean;
 }
 export interface FileValue {
     value?: any;
@@ -238,6 +244,7 @@ export interface FileX extends File {
     preview?: string;
     state?: 'init' | 'error' | 'pending' | 'uploading' | 'uploaded' | 'invalid';
     progress?: number;
+    error?: string;
     [propName: string]: any;
 }
 export type InputImageRendererEvent = 'change' | 'success' | 'fail' | 'remove';
@@ -292,6 +299,7 @@ export default class ImageControl extends React.Component<ImageProps, ImageState
         scalable?: boolean | undefined;
     } | null | undefined;
     handleDropRejected(rejectedFiles: FileRejection[], evt: React.DragEvent<any>): void;
+    handleFileCancel(): void;
     startUpload(retry?: boolean): void;
     toggleUpload(): void;
     stopUpload(): void;