amis-ui 2.8.0 → 3.0.0

package/lib/components/Editor.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.8.0
+ * amis-ui v3.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -26,29 +26,31 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 function filterUrl(url) {
     return url;
 }
-window.MonacoEnvironment = {
-    getWorkerUrl: function (moduleId, label) {
-        var url = '/pkg/editor.worker.js';
-        if (label === 'json') {
-            url = '/pkg/json.worker.js';
-        }
-        else if (label === 'css') {
-            url = '/pkg/css.worker.js';
-        }
-        else if (label === 'html') {
-            url = '/pkg/html.worker.js';
-        }
-        else if (label === 'typescript' || label === 'javascript') {
-            url = '/pkg/ts.worker.js';
-        }
-        url = filterUrl(url);
-        // url 有可能会插件替换成 cdn 地址，比如：fis3-prepackager-stand-alone-pack
-        if (/^https?/.test(url)) {
-            return "data:text/javascript;charset=utf-8,".concat(encodeURIComponent("\n        importScripts('".concat(url, "');")), "\n      ");
+if (!window.MonacoEnvironment) {
+    window.MonacoEnvironment = {
+        getWorkerUrl: function (moduleId, label) {
+            var url = '/pkg/editor.worker.js';
+            if (label === 'json') {
+                url = '/pkg/json.worker.js';
+            }
+            else if (label === 'css') {
+                url = '/pkg/css.worker.js';
+            }
+            else if (label === 'html') {
+                url = '/pkg/html.worker.js';
+            }
+            else if (label === 'typescript' || label === 'javascript') {
+                url = '/pkg/ts.worker.js';
+            }
+            url = filterUrl(url);
+            // url 有可能会插件替换成 cdn 地址，比如：fis3-prepackager-stand-alone-pack
+            if (/^https?/.test(url)) {
+                return "data:text/javascript;charset=utf-8,".concat(encodeURIComponent("\n        importScripts('".concat(url, "');")), "\n      ");
+            }
+            return url;
         }
-        return url;
-    }
-};
+    };
+}
 function monacoFactory(containerElement, monaco, options) {
     return monaco.editor.create(containerElement, tslib.__assign({ 'autoIndent': true, 'formatOnType': true, 'formatOnPaste': true, 'selectOnLineNumbers': true, 'scrollBeyondLastLine': false, 'folding': true, 'minimap': {
             enabled: false

package/lib/components/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.8.0
+ * amis-ui v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/FormField.d.ts

@@ -20,7 +20,7 @@ export interface FormFieldProps extends LocaleProps, ThemeProps {
     isRequired?: boolean;
     hasError?: boolean;
     errors?: string | Array<string>;
-    children?: JSX.Element;
+    children?: React.ReactNode | Array<React.ReactNode>;
 }
 declare function FormField(props: FormFieldProps): JSX.Element;
 declare const ThemedFormField: {
@@ -32,7 +32,7 @@ declare const ThemedFormField: {
         childRef(ref: any): void;
         getWrappedInstance(): any;
         render(): JSX.Element;
-        context: any;
+        context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<Omit<FormFieldProps, keyof LocaleProps> & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
@@ -41,9 +41,7 @@ declare const ThemedFormField: {
         readonly props: Readonly<Omit<Omit<FormFieldProps, keyof LocaleProps> & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
-        }, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps> & Readonly<{
-            children?: React.ReactNode;
-        }>;
+        }, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>;
         state: Readonly<{}>;
         refs: {
             [key: string]: React.ReactInstance;
@@ -80,9 +78,7 @@ declare const ThemedFormField: {
         UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<Omit<FormFieldProps, keyof LocaleProps> & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
-        }, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void; /**
-         * 配置成 false 则不包裹
-         */
+        }, keyof ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
     };
     displayName: string;
     contextType: React.Context<string>;
@@ -95,7 +91,7 @@ declare const ThemedFormField: {
             childRef(ref: any): void;
             getWrappedInstance(): any;
             render(): JSX.Element;
-            context: any;
+            context: unknown;
             setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<FormFieldProps, keyof LocaleProps> & {
                 locale?: string | undefined;
                 translate?: ((str: string, ...args: any[]) => string) | undefined;
@@ -104,8 +100,6 @@ declare const ThemedFormField: {
             readonly props: Readonly<Omit<FormFieldProps, keyof LocaleProps> & {
                 locale?: string | undefined;
                 translate?: ((str: string, ...args: any[]) => string) | undefined;
-            }> & Readonly<{
-                children?: React.ReactNode;
             }>;
             state: Readonly<{}>;
             refs: {
@@ -141,7 +135,9 @@ declare const ThemedFormField: {
                 translate?: ((str: string, ...args: any[]) => string) | undefined;
             }>, nextState: Readonly<{}>, nextContext: any): void;
             UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<FormFieldProps, keyof LocaleProps> & {
-                locale?: string | undefined;
+                locale?: string | undefined; /**
+                 * 配置成 false 则不包裹
+                 */
                 translate?: ((str: string, ...args: any[]) => string) | undefined;
             }>, nextState: Readonly<{}>, nextContext: any): void;
         };
@@ -160,7 +156,7 @@ declare const ThemedFormField: {
         childRef(ref: any): void;
         getWrappedInstance(): any;
         render(): JSX.Element;
-        context: any;
+        context: unknown;
         setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<FormFieldProps, keyof LocaleProps> & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
@@ -169,8 +165,6 @@ declare const ThemedFormField: {
         readonly props: Readonly<Omit<FormFieldProps, keyof LocaleProps> & {
             locale?: string | undefined;
             translate?: ((str: string, ...args: any[]) => string) | undefined;
-        }> & Readonly<{
-            children?: React.ReactNode;
         }>;
         state: Readonly<{}>;
         refs: {
@@ -206,7 +200,9 @@ declare const ThemedFormField: {
             translate?: ((str: string, ...args: any[]) => string) | undefined;
         }>, nextState: Readonly<{}>, nextContext: any): void;
         UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<FormFieldProps, keyof LocaleProps> & {
-            locale?: string | undefined;
+            locale?: string | undefined; /**
+             * 配置成 false 则不包裹
+             */
             translate?: ((str: string, ...args: any[]) => string) | undefined;
         }>, nextState: Readonly<{}>, nextContext: any): void;
     };
@@ -225,7 +221,7 @@ declare const ThemedFormField: {
             childRef(ref: any): void;
             getWrappedInstance(): any;
             render(): JSX.Element;
-            context: any;
+            context: unknown;
             setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<FormFieldProps, keyof LocaleProps> & {
                 locale?: string | undefined;
                 translate?: ((str: string, ...args: any[]) => string) | undefined;
@@ -234,8 +230,6 @@ declare const ThemedFormField: {
             readonly props: Readonly<Omit<FormFieldProps, keyof LocaleProps> & {
                 locale?: string | undefined;
                 translate?: ((str: string, ...args: any[]) => string) | undefined;
-            }> & Readonly<{
-                children?: React.ReactNode;
             }>;
             state: Readonly<{}>;
             refs: {
@@ -271,7 +265,9 @@ declare const ThemedFormField: {
                 translate?: ((str: string, ...args: any[]) => string) | undefined;
             }>, nextState: Readonly<{}>, nextContext: any): void;
             UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<FormFieldProps, keyof LocaleProps> & {
-                locale?: string | undefined;
+                locale?: string | undefined; /**
+                 * 配置成 false 则不包裹
+                 */
                 translate?: ((str: string, ...args: any[]) => string) | undefined;
             }>, nextState: Readonly<{}>, nextContext: any): void;
         };

package/lib/components/FormField.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.8.0
+ * amis-ui v3.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/GaodeMapPicker.d.ts

@@ -0,0 +1,89 @@
+/// <reference types="lodash" />
+/// <reference types="hoist-non-react-statics" />
+import React from 'react';
+import { ClassNamesFn } from 'amis-core';
+interface MapPickerProps {
+    ak: string;
+    coordinatesType: string;
+    classnames: ClassNamesFn;
+    classPrefix: string;
+    value?: {
+        address: string;
+        lat: number;
+        lng: number;
+        city?: string;
+    };
+    onChange?: (value: any) => void;
+}
+interface LocationItem {
+    title?: string;
+    address: string;
+    lat: number;
+    lng: number;
+    city?: string;
+}
+interface MapPickerState {
+    inputValue: string;
+    locIndex?: number;
+    locs: Array<LocationItem>;
+    sugs: Array<string>;
+}
+export declare class BaiduMapPicker extends React.Component<MapPickerProps, MapPickerState> {
+    state: MapPickerState;
+    id: string;
+    mapRef: React.RefObject<HTMLDivElement>;
+    resultListRef: React.RefObject<HTMLDivElement>;
+    placeholderInput?: HTMLInputElement;
+    map: any;
+    ac: any;
+    geocoder: any;
+    placeSearch: any;
+    mark: any;
+    geolocation: any;
+    search: import("lodash").DebouncedFunc<() => void>;
+    convertor: any;
+    componentDidMount(): void;
+    initMap(): Promise<void>;
+    syncLocation(lnglat: {
+        lng: number;
+        lat: number;
+        address?: string;
+        city?: string;
+    }): Promise<void>;
+    handleChange(e: React.ChangeEvent<HTMLInputElement>): void;
+    render(): JSX.Element;
+}
+declare const _default: {
+    new (props: Omit<MapPickerProps, keyof import("amis-core").ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps): {
+        ref: any;
+        childRef(ref: any): void;
+        getWrappedInstance(): any;
+        render(): JSX.Element;
+        context: unknown;
+        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<MapPickerProps, keyof import("amis-core").ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
+        forceUpdate(callback?: (() => void) | undefined): void;
+        readonly props: Readonly<Omit<MapPickerProps, keyof import("amis-core").ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>;
+        state: Readonly<{}>;
+        refs: {
+            [key: string]: React.ReactInstance;
+        };
+        componentDidMount?(): void;
+        shouldComponentUpdate?(nextProps: Readonly<Omit<MapPickerProps, keyof import("amis-core").ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
+        componentWillUnmount?(): void;
+        componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
+        getSnapshotBeforeUpdate?(prevProps: Readonly<Omit<MapPickerProps, keyof import("amis-core").ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>): any;
+        componentDidUpdate?(prevProps: Readonly<Omit<MapPickerProps, keyof import("amis-core").ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, prevState: Readonly<{}>, snapshot?: any): void;
+        componentWillMount?(): void;
+        UNSAFE_componentWillMount?(): void;
+        componentWillReceiveProps?(nextProps: Readonly<Omit<MapPickerProps, keyof import("amis-core").ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Omit<MapPickerProps, keyof import("amis-core").ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextContext: any): void;
+        componentWillUpdate?(nextProps: Readonly<Omit<MapPickerProps, keyof import("amis-core").ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<Omit<MapPickerProps, keyof import("amis-core").ThemeProps> & import("packages/amis-core/lib/theme").ThemeOutterProps>, nextState: Readonly<{}>, nextContext: any): void;
+    };
+    displayName: string;
+    contextType: React.Context<string>;
+    ComposedComponent: React.ComponentType<typeof BaiduMapPicker>;
+} & import("hoist-non-react-statics").NonReactStatics<typeof BaiduMapPicker, {}> & {
+    ComposedComponent: typeof BaiduMapPicker;
+};
+export default _default;

package/lib/components/GaodeMapPicker.js

@@ -0,0 +1,214 @@
+/**
+ * amis-ui v3.0.0
+ * Copyright 2018-2023 fex
+ */
+
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var tslib = require('tslib');
+var React = require('react');
+var amisCore = require('amis-core');
+var debounce = require('lodash/debounce');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var debounce__default = /*#__PURE__*/_interopDefaultLegacy(debounce);
+
+var BaiduMapPicker = /** @class */ (function (_super) {
+    tslib.__extends(BaiduMapPicker, _super);
+    function BaiduMapPicker() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.state = {
+            inputValue: '',
+            locs: [],
+            locIndex: -1,
+            sugs: []
+        };
+        _this.id = amisCore.uuid();
+        _this.mapRef = React__default["default"].createRef();
+        _this.resultListRef = React__default["default"].createRef();
+        _this.search = debounce__default["default"](function () {
+            var _a;
+            if (_this.state.inputValue) {
+                (_a = _this.placeSearch) === null || _a === void 0 ? void 0 : _a.search(_this.state.inputValue);
+            }
+            else {
+                _this.setState({
+                    sugs: []
+                });
+            }
+        }, 250, {
+            trailing: true,
+            leading: false
+        });
+        return _this;
+    }
+    BaiduMapPicker.prototype.componentDidMount = function () {
+        if (window.AMap) {
+            this.initMap();
+        }
+        else {
+            amisCore.loadStyle('https://cache.amap.com/lbs/static/main1119.css');
+            amisCore.loadScript("//webapi.amap.com/maps?v=2.0&key=".concat(this.props.ak)).then(this.initMap);
+        }
+    };
+    BaiduMapPicker.prototype.initMap = function () {
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var map;
+            var _this = this;
+            return tslib.__generator(this, function (_a) {
+                map = new AMap.Map(this.mapRef.current, {
+                    resizeEnable: true,
+                    zoom: 13,
+                });
+                this.map = map;
+                map.plugin(["AMap.Geocoder"], function () {
+                    //加载地理编码插件
+                    _this.geocoder = new AMap.Geocoder({
+                        radius: 1000,
+                        extensions: "all", //返回地址描述以及附近兴趣点和道路信息，默认“base”
+                    });
+                });
+                map.plugin('AMap.Geolocation', function () {
+                    _this.geolocation = new AMap.Geolocation({
+                        enableHighAccuracy: true,
+                        timeout: 10000,
+                        maximumAge: 0,
+                        convert: true //自动偏移坐标，偏移后的坐标为高德坐标，默认：true
+                    });
+                    map.addControl(_this.geolocation);
+                });
+                AMap.plugin(["AMap.PlaceSearch"], function () {
+                    //构造地点查询类
+                    _this.placeSearch = new AMap.PlaceSearch({
+                        pageSize: 5,
+                        pageIndex: 1,
+                        map: map,
+                        panel: _this.resultListRef.current,
+                        autoFitView: true, // 是否自动调整地图视野使绘制的 Marker点都处于视口的可见范围
+                    });
+                    _this.placeSearch.on("selectChanged", function (e) {
+                        var poi = e.selected.data.location;
+                        _this.syncLocation({
+                            lng: poi.lng,
+                            lat: poi.lat,
+                            address: e.selected.data.address,
+                            city: e.selected.data.cityname,
+                        });
+                    });
+                });
+                if (this.props.value) {
+                    map.setZoomAndCenter(13, [this.props.value.lng, this.props.value.lat]);
+                    this.mark = new AMap.Marker({
+                        position: [this.props.value.lng, this.props.value.lat],
+                    });
+                    this.mark.setMap(map);
+                }
+                else {
+                    this.geolocation.getCurrentPosition(function (status, result) { });
+                }
+                map.on("click", function (e) {
+                    map.setCenter(e.lnglat);
+                    var marker = new AMap.Marker({
+                        position: [e.lnglat.lng, e.lnglat.lat],
+                    });
+                    marker.setMap(map);
+                    if (_this.mark) {
+                        _this.mark.setMap(null);
+                    }
+                    _this.mark = marker;
+                    _this.syncLocation(e.lnglat);
+                });
+                return [2 /*return*/];
+            });
+        });
+    };
+    BaiduMapPicker.prototype.syncLocation = function (lnglat) {
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var _this = this;
+            return tslib.__generator(this, function (_a) {
+                new Promise(function (resolve, reject) {
+                    var _a, _b;
+                    if (lnglat.address && lnglat.city) {
+                        var data = {
+                            lng: lnglat.lng,
+                            lat: lnglat.lat,
+                            address: lnglat.address,
+                            city: lnglat.city,
+                            vendor: "gaode",
+                        };
+                        if ((_a = _this.props) === null || _a === void 0 ? void 0 : _a.onChange)
+                            (_b = _this.props) === null || _b === void 0 ? void 0 : _b.onChange(data);
+                    }
+                    _this.geocoder.getAddress(lnglat, function (status, result) {
+                        var _a, _b;
+                        if (status === "complete" && result.info === "OK") {
+                            resolve({ status: status, result: result });
+                            var data = {
+                                lng: lnglat.lng,
+                                lat: lnglat.lat,
+                                address: result.regeocode.formattedAddress,
+                                city: result.regeocode.addressComponent.city ||
+                                    result.regeocode.addressComponent.province ||
+                                    result.regeocode.addressComponent.district,
+                                vendor: "gaode",
+                            };
+                            if ((_a = _this.props) === null || _a === void 0 ? void 0 : _a.onChange)
+                                (_b = _this.props) === null || _b === void 0 ? void 0 : _b.onChange(data);
+                        }
+                        else {
+                            reject({ status: status, result: result });
+                        }
+                    });
+                });
+                return [2 /*return*/];
+            });
+        });
+    };
+    BaiduMapPicker.prototype.handleChange = function (e) {
+        this.setState({
+            inputValue: e.currentTarget.value
+        }, this.search);
+    };
+    BaiduMapPicker.prototype.render = function () {
+        var cx = this.props.classnames;
+        var _a = this.state; _a.locIndex; _a.locs; var inputValue = _a.inputValue; _a.sugs;
+        // const hasSug = Array.isArray(sugs) && sugs.length;
+        return (React__default["default"].createElement("div", { className: cx('MapPicker') },
+            React__default["default"].createElement("div", { className: cx('MapPicker-search TextControl-control') },
+                React__default["default"].createElement("div", { className: cx('TextControl-input') },
+                    React__default["default"].createElement("input", { onChange: this.handleChange, value: inputValue, placeholder: "\u641C\u7D22\u5730\u70B9" }))),
+            React__default["default"].createElement("div", { ref: this.mapRef, className: cx('MapPicker-map', {
+                    invisible: false
+                }) }),
+            React__default["default"].createElement("div", { ref: this.resultListRef, className: cx('MapPicker-result', {
+                    invisible: false
+                }) })));
+    };
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", Promise)
+    ], BaiduMapPicker.prototype, "initMap", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object]),
+        tslib.__metadata("design:returntype", Promise)
+    ], BaiduMapPicker.prototype, "syncLocation", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object]),
+        tslib.__metadata("design:returntype", void 0)
+    ], BaiduMapPicker.prototype, "handleChange", null);
+    return BaiduMapPicker;
+}(React__default["default"].Component));
+var GaodeMapPicker = amisCore.themeable(BaiduMapPicker);
+
+exports.BaiduMapPicker = BaiduMapPicker;
+exports["default"] = GaodeMapPicker;

package/lib/components/GridNav.d.ts

@@ -27,6 +27,7 @@ export interface GridNavProps {
     itemClassName?: string;
     classnames: ClassNamesFn;
     style?: React.CSSProperties;
+    children?: React.ReactNode | Array<React.ReactNode>;
 }
 export interface GridNavItemProps {
     /**  图标右上角徽标	 */

package/lib/components/GridNav.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.8.0
+ * amis-ui v3.0.0
  * Copyright 2018-2023 fex
  */