amis-ui 6.12.0-beta.8 → 6.12.0

package/lib/components/Selection.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.12.0-beta.8
+ * amis-ui v6.12.0
  * Copyright 2018-2025 fex
  */
 

package/lib/components/Shape.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.12.0-beta.8
+ * amis-ui v6.12.0
  * Copyright 2018-2025 fex
  */
 

package/lib/components/Signature.d.ts

@@ -5,8 +5,7 @@
  */
 /// <reference types="hoist-non-react-statics" />
 import React from 'react';
-import { ThemeProps } from 'amis-core';
-import { LocaleProps } from 'amis-core';
+import { ThemeProps, LocaleProps } from 'amis-core';
 export interface ISignatureProps extends LocaleProps, ThemeProps {
     value?: string;
     width?: number;
@@ -26,7 +25,7 @@ export interface ISignatureProps extends LocaleProps, ThemeProps {
     ebmedCancelIcon?: string;
     embedBtnIcon?: string;
     embedBtnLabel?: string;
-    onChange?: (value?: string) => void;
+    onChange?: (value?: string) => Promise<void>;
 }
 declare const _default: {
     new (props: Omit<Omit<ISignatureProps, keyof LocaleProps> & {

package/lib/components/Signature.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.12.0-beta.8
+ * amis-ui v6.12.0
  * Copyright 2018-2025 fex
  */
 
@@ -10,7 +10,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var React = require('react');
 var amisCore = require('amis-core');
-var smoothSignature = require('../utils/smoothSignature.js');
+var SmoothSignature = require('smooth-signature');
 var Button = require('./Button.js');
 require('./404.js');
 require('./Alert.js');
@@ -36,7 +36,7 @@ require('./Range.js');
 require('./Rating.js');
 require('./Select.js');
 require('./SparkLine.js');
-require('./Spinner.js');
+var Spinner = require('./Spinner.js');
 require('./Switch.js');
 require('./Textarea.js');
 require('./TitleBar.js');
@@ -132,17 +132,20 @@ require('./schema-editor/Common.js');
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var SmoothSignature__default = /*#__PURE__*/_interopDefaultLegacy(SmoothSignature);
 
 var __react_jsx__ = require('react');
 var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
 (__react_jsx__["default"] || __react_jsx__).Fragment;
 var Signature = function (props) {
     var __ = props.translate, cx = props.classnames, className = props.className, width = props.width, height = props.height;
+    var embedMobile = props.embed && amisCore.isMobileDevice() && window.innerWidth < 768;
     var _a = tslib.__read(React__default["default"].useState(null), 2), sign = _a[0], setSign = _a[1];
     var _b = tslib.__read(React__default["default"].useState(false), 2), open = _b[0], setOpen = _b[1];
-    var _c = tslib.__read(React__default["default"].useState(false), 2), fullScreen = _c[0], setFullScreen = _c[1];
-    var _d = tslib.__read(React__default["default"].useState(props.embed || false), 2), embed = _d[0], setEmbed = _d[1];
-    var _e = tslib.__read(React__default["default"].useState(props.value), 2), data = _e[0], setData = _e[1];
+    var _c = tslib.__read(React__default["default"].useState(false), 2), uploading = _c[0], setUploading = _c[1];
+    var _d = tslib.__read(React__default["default"].useState(!!embedMobile), 2), fullScreen = _d[0], setFullScreen = _d[1];
+    var _e = tslib.__read(React__default["default"].useState(props.embed || false), 2), embed = _e[0], setEmbed = _e[1];
+    var _f = tslib.__read(React__default["default"].useState(props.value), 2), data = _f[0], setData = _f[1];
     var wrapper = React__default["default"].useRef(null);
     React__default["default"].useEffect(function () {
         if (!wrapper.current) {
@@ -169,20 +172,18 @@ var Signature = function (props) {
         }
     }, [sign]);
     var confirm = React__default["default"].useCallback(function () {
-        var _a, _b;
-        if (sign) {
-            if (fullScreen) {
-                var canvas = sign.getRotateCanvas(-90);
-                var base64 = canvas.toDataURL();
-                setData(base64);
-                (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, base64);
-            }
-            else {
-                var base64 = sign.toDataURL();
-                setData(base64);
-                (_b = props.onChange) === null || _b === void 0 ? void 0 : _b.call(props, base64);
-            }
+        var _a;
+        if (!sign) {
+            return;
         }
+        var base64 = fullScreen
+            ? sign.getRotateCanvas(-90).toDataURL()
+            : sign.toDataURL();
+        setData(base64);
+        setUploading(true);
+        (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, base64).then(function () {
+            setUploading(false);
+        });
     }, [sign]);
     var resize = React__default["default"].useCallback(function () {
         setSign(null);
@@ -197,7 +198,7 @@ var Signature = function (props) {
     }, []);
     var handleCloseModal = React__default["default"].useCallback(function () {
         setOpen(false);
-        setFullScreen(false);
+        setFullScreen(!!embedMobile);
         setSign(null);
     }, []);
     var handleConfirmModal = React__default["default"].useCallback(function () {
@@ -212,7 +213,7 @@ var Signature = function (props) {
         var defaultHeight = fullScreen
             ? clientHeight
             : Math.min(height || clientWidth / 2 - 40, clientHeight - 40);
-        var signature = new smoothSignature["default"](element, {
+        var signature = new SmoothSignature__default["default"](element, {
             width: Math.max(defaultWidth, 200),
             height: Math.max(defaultHeight, 160),
             color: props.color || '#000',
@@ -220,11 +221,6 @@ var Signature = function (props) {
         });
         setSign(signature);
     }, [width, height, fullScreen]);
-    React__default["default"].useEffect(function () {
-        if (data && sign) {
-            sign.loadFromBase64(data);
-        }
-    }, [data, sign]);
     function embedCanvasRef(ref) {
         if (open && ref && !sign) {
             initCanvas(ref);
@@ -247,7 +243,7 @@ var Signature = function (props) {
                     _J$X_(Button["default"], { onClick: undo, tooltip: undoBtnLabel || __('Signature.undo') },
                         undoBtnLabel,
                         _J$X_(icons.Icon, { icon: undoBtnIcon || 'undo-normal', className: cx('icon', { 'ml-1': undoBtnLabel }) })),
-                    fullScreen ? (_J$X_(Button["default"], { onClick: handleUnFullScreen },
+                    embedMobile ? null : fullScreen ? (_J$X_(Button["default"], { onClick: handleUnFullScreen },
                         _J$X_(icons.Icon, { icon: "un-fullscreen", className: "icon" }))) : (_J$X_(Button["default"], { onClick: handleFullScreen },
                         _J$X_(icons.Icon, { icon: "full-screen", className: "icon" })))),
                 right ? (_J$X_("div", { className: "right-actions" }, embed ? (_J$X_(React__default["default"].Fragment, null,
@@ -265,10 +261,13 @@ var Signature = function (props) {
         return (_J$X_("div", { className: cx('Signature-Embed') },
             _J$X_(Button["default"], { onClick: function () { return setOpen(true); } },
                 _J$X_(icons.Icon, { className: "icon mr-1", icon: icon || 'fas fa-pen' }),
-                embedBtnLabel || __('Signature.embedLabel')),
-            data ? (_J$X_("div", { className: cx('Signature-Embed-Preview') },
+                embedBtnLabel || data
+                    ? __('Signature.embedUpdateLabel')
+                    : __('Signature.embedLabel')),
+            data ? (_J$X_("div", { className: cx('Signature-Embed-Preview') }, uploading ? (_J$X_(Spinner["default"], { show: uploading })) : (_J$X_(React__default["default"].Fragment, null,
                 _J$X_("img", { src: data }),
-                _J$X_(icons.Icon, { className: "preview-close", icon: "fas fa-close", onClick: clear }))) : null,
+                _J$X_(icons.Icon, { className: "preview-close icon", icon: "close", onClick: clear }))))) : uploading ? (_J$X_("div", { className: cx('Signature-Embed-Preview') },
+                _J$X_(Spinner["default"], { show: uploading }))) : null,
             _J$X_(Modal["default"], { show: open, onHide: handleCloseModal, size: "full" },
                 _J$X_(Modal["default"].Body, null,
                     _J$X_("div", { className: cx('Signature-Embed-Body', {

package/lib/components/Slider.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.12.0-beta.8
+ * amis-ui v6.12.0
  * Copyright 2018-2025 fex
  */