amis-core 3.2.0 → 3.3.0

package/lib/utils/api.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -56,10 +56,10 @@ function buildApi(api, data, options) {
         api.headers = dataMapping.dataMapping(api.headers, data, undefined, false);
     }
     if (api.requestAdaptor && typeof api.requestAdaptor === 'string') {
-        api.requestAdaptor = str2function(api.requestAdaptor, 'api');
+        api.requestAdaptor = str2AsyncFunction(api.requestAdaptor, 'api', 'context');
     }
     if (api.adaptor && typeof api.adaptor === 'string') {
-        api.adaptor = str2function(api.adaptor, 'payload', 'response', 'api');
+        api.adaptor = str2AsyncFunction(api.adaptor, 'payload', 'response', 'api', 'context');
     }
     if (!data) {
         return api;
@@ -363,68 +363,84 @@ function wrapFetcher(fn, tracker) {
     }
     var wrappedFetcher = function (api, data, options) {
         var _a, _b, _c;
-        api = buildApi(api, data, options);
-        if (api.requestAdaptor) {
-            debug.debug('api', 'before requestAdaptor', api);
-            api = api.requestAdaptor(api) || api;
-            debug.debug('api', 'after requestAdaptor', api);
-        }
-        if (api.data &&
-            (api.data instanceof FormData ||
-                helper.hasFile(api.data) ||
-                api.dataType === 'form-data')) {
-            api.data =
-                api.data instanceof FormData
-                    ? api.data
-                    : helper.object2formData(api.data, api.qsOptions);
-        }
-        else if (api.data &&
-            typeof api.data !== 'string' &&
-            api.dataType === 'form') {
-            api.data = helper.qsstringify(api.data, api.qsOptions);
-            api.headers = api.headers || (api.headers = {});
-            api.headers['Content-Type'] = 'application/x-www-form-urlencoded';
-        }
-        else if (api.data &&
-            typeof api.data !== 'string' &&
-            api.dataType === 'json') {
-            api.data = JSON.stringify(api.data);
-            api.headers = api.headers || (api.headers = {});
-            api.headers['Content-Type'] = 'application/json';
-        }
-        if (!isValidApi(api.url)) {
-            throw new Error("invalid api url:".concat(api.url));
-        }
-        debug.debug('api', 'request api', api);
-        tracker === null || tracker === void 0 ? void 0 : tracker({ eventType: 'api', eventData: omit__default["default"](api, ['config', 'data', 'body']) }, api.data);
-        if (((_a = api.method) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === 'jsonp') {
-            return wrapAdaptor(jsonpFetcher(api), api);
-        }
-        if (((_b = api.method) === null || _b === void 0 ? void 0 : _b.toLocaleLowerCase()) === 'js') {
-            return wrapAdaptor(jsFetcher(fn, api), api);
-        }
-        if (typeof api.cache === 'number' && api.cache > 0) {
-            var apiCache = getApiCache(api);
-            return wrapAdaptor(apiCache
-                ? apiCache.cachedPromise
-                : setApiCache(api, fn(api)), api);
-        }
-        // IE 下 get 请求会被缓存，所以自动加个时间戳
-        if (isIE && api && ((_c = api.method) === null || _c === void 0 ? void 0 : _c.toLocaleLowerCase()) === 'get') {
-            var timeStamp = "_t=".concat(Date.now());
-            if (api.url.indexOf('?') === -1) {
-                api.url = api.url + "?".concat(timeStamp);
-            }
-            else {
-                api.url = api.url + "&".concat(timeStamp);
-            }
-        }
-        return wrapAdaptor(fn(api), api);
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            var apiCache, timeStamp;
+            return tslib.__generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        api = buildApi(api, data, options);
+                        if (!api.requestAdaptor) return [3 /*break*/, 2];
+                        debug.debug('api', 'before requestAdaptor', api);
+                        return [4 /*yield*/, api.requestAdaptor(api, data)];
+                    case 1:
+                        api = (_d.sent()) || api;
+                        debug.debug('api', 'after requestAdaptor', api);
+                        _d.label = 2;
+                    case 2:
+                        if (api.data &&
+                            (api.data instanceof FormData ||
+                                helper.hasFile(api.data) ||
+                                api.dataType === 'form-data')) {
+                            api.data =
+                                api.data instanceof FormData
+                                    ? api.data
+                                    : helper.object2formData(api.data, api.qsOptions);
+                        }
+                        else if (api.data &&
+                            typeof api.data !== 'string' &&
+                            api.dataType === 'form') {
+                            api.data = helper.qsstringify(api.data, api.qsOptions);
+                            api.headers = api.headers || (api.headers = {});
+                            api.headers['Content-Type'] = 'application/x-www-form-urlencoded';
+                        }
+                        else if (api.data &&
+                            typeof api.data !== 'string' &&
+                            api.dataType === 'json') {
+                            api.data = JSON.stringify(api.data);
+                            api.headers = api.headers || (api.headers = {});
+                            api.headers['Content-Type'] = 'application/json';
+                        }
+                        // 如果发送适配器中设置了 mockResponse
+                        // 则直接跳过请求发送
+                        if (api.mockResponse) {
+                            return [2 /*return*/, wrapAdaptor(Promise.resolve(api.mockResponse), api, data)];
+                        }
+                        if (!isValidApi(api.url)) {
+                            throw new Error("invalid api url:".concat(api.url));
+                        }
+                        debug.debug('api', 'request api', api);
+                        tracker === null || tracker === void 0 ? void 0 : tracker({ eventType: 'api', eventData: omit__default["default"](api, ['config', 'data', 'body']) }, api.data);
+                        if (((_a = api.method) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === 'jsonp') {
+                            return [2 /*return*/, wrapAdaptor(jsonpFetcher(api), api, data)];
+                        }
+                        if (((_b = api.method) === null || _b === void 0 ? void 0 : _b.toLocaleLowerCase()) === 'js') {
+                            return [2 /*return*/, wrapAdaptor(jsFetcher(fn, api), api, data)];
+                        }
+                        if (typeof api.cache === 'number' && api.cache > 0) {
+                            apiCache = getApiCache(api);
+                            return [2 /*return*/, wrapAdaptor(apiCache
+                                    ? apiCache.cachedPromise
+                                    : setApiCache(api, fn(api)), api, data)];
+                        }
+                        // IE 下 get 请求会被缓存，所以自动加个时间戳
+                        if (isIE && api && ((_c = api.method) === null || _c === void 0 ? void 0 : _c.toLocaleLowerCase()) === 'get') {
+                            timeStamp = "_t=".concat(Date.now());
+                            if (api.url.indexOf('?') === -1) {
+                                api.url = api.url + "?".concat(timeStamp);
+                            }
+                            else {
+                                api.url = api.url + "&".concat(timeStamp);
+                            }
+                        }
+                        return [2 /*return*/, wrapAdaptor(fn(api), api, data)];
+                }
+            });
+        });
     };
     wrappedFetcher._wrappedFetcher = true;
     return wrappedFetcher;
 }
-function wrapAdaptor(promise, api) {
+function wrapAdaptor(promise, api, context) {
     var _this = this;
     var adaptor = api.adaptor;
     return adaptor
@@ -435,7 +451,7 @@ function wrapAdaptor(promise, api) {
                 switch (_a.label) {
                     case 0:
                         debug.debug('api', 'before adaptor data', response.data);
-                        result = adaptor(response.data, response, api);
+                        result = adaptor(response.data, response, api, context);
                         if (!(result === null || result === void 0 ? void 0 : result.then)) return [3 /*break*/, 2];
                         return [4 /*yield*/, result];
                     case 1:
@@ -549,41 +565,57 @@ function isApiOutdated(prevApi, nextApi, prevData, nextData) {
         return true;
     }
     nextApi = normalizeApi(nextApi);
+    prevApi = (prevApi ? normalizeApi(prevApi) : prevApi);
     if (nextApi.autoRefresh === false) {
         return false;
     }
+    // api 本身有变化
+    if ((prevApi && prevApi.url !== nextApi.url) || !prevApi) {
+        return !!(isValidApi(nextApi.url) &&
+            (!nextApi.sendOn || tpl.evalExpression(nextApi.sendOn, nextData)));
+    }
     var trackExpression = (_a = nextApi.trackExpression) !== null && _a !== void 0 ? _a : nextApi.url;
     if (typeof trackExpression !== 'string' || !~trackExpression.indexOf('$')) {
         return false;
     }
     var isModified = false;
-    if (prevApi) {
-        prevApi = normalizeApi(prevApi);
-        if (nextApi.trackExpression || prevApi.trackExpression) {
-            isModified =
-                tokenize.tokenize(prevApi.trackExpression || '', prevData) !==
-                    tokenize.tokenize(nextApi.trackExpression || '', nextData);
-        }
-        else {
-            prevApi = buildApi(prevApi, prevData, {
-                ignoreData: true
-            });
-            nextApi = buildApi(nextApi, nextData, {
-                ignoreData: true
-            });
-            isModified = prevApi.url !== nextApi.url;
-        }
+    if (nextApi.trackExpression || prevApi.trackExpression) {
+        isModified =
+            tokenize.tokenize(prevApi.trackExpression || '', prevData) !==
+                tokenize.tokenize(nextApi.trackExpression || '', nextData);
     }
     else {
-        isModified = true;
+        prevApi = buildApi(prevApi, prevData, {
+            ignoreData: true
+        });
+        nextApi = buildApi(nextApi, nextData, {
+            ignoreData: true
+        });
+        isModified = prevApi.url !== nextApi.url;
     }
     return !!(isModified &&
         isValidApi(nextApi.url) &&
         (!nextApi.sendOn || tpl.evalExpression(nextApi.sendOn, nextData)));
 }
 function isValidApi(api) {
-    return (api &&
-        /^(?:(https?|wss?|taf):\/\/[^\/]+)?(\/?[^\s\/\?]*){1,}(\?.*)?$/.test(api));
+    if (!api || typeof api !== 'string') {
+        return false;
+    }
+    var idx = api.indexOf('://');
+    // 不允许直接相对路径写 api
+    // 不允许 :// 结尾
+    if ((!~idx && api[0] !== '/') || (~idx && idx + 3 === api.length)) {
+        return false;
+    }
+    try {
+        // 不补一个协议，URL 判断为 false
+        api = (~idx ? '' : 'schema://domain') + api;
+        new URL(api);
+    }
+    catch (error) {
+        return false;
+    }
+    return true;
 }
 function isEffectiveApi(api, data, initFetch, initFetchOn) {
     if (!api) {

package/lib/utils/arraySlice.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/attachmentAdpator.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/autobind.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/columnsSplit.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -8,14 +8,16 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
-var React = require('react');
+require('react');
 var chunk = require('lodash/chunk');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var chunk__default = /*#__PURE__*/_interopDefaultLegacy(chunk);
 
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
 function columnsSplit(body, cx, columnsCount) {
     if (Array.isArray(columnsCount) && columnsCount.length) {
         var bodyIndex_1 = 0;
@@ -24,10 +26,10 @@ function columnsSplit(body, cx, columnsCount) {
         var cellClassName_1 = "Grid-col--sm".concat(maxSize);
         columnsCount.forEach(function (columnSize, groupIndex) {
             if (columnSize) {
-                bodyList_1.push(React__default["default"].createElement("div", { className: cx('Grid'), key: groupIndex }, Array.from({ length: columnSize }).map(function (_, index) {
+                bodyList_1.push(_J$X_("div", { className: cx('Grid'), key: groupIndex }, Array.from({ length: columnSize }).map(function (_, index) {
                     if (bodyIndex_1 + index < body.length) {
                         // 避免溢出
-                        return (React__default["default"].createElement("div", { key: index, className: cx(cellClassName_1) }, body[bodyIndex_1 + index]));
+                        return (_J$X_("div", { key: index, className: cx(cellClassName_1) }, body[bodyIndex_1 + index]));
                     }
                     else {
                         return null;
@@ -41,7 +43,7 @@ function columnsSplit(body, cx, columnsCount) {
     else if (typeof columnsCount === 'number' && columnsCount > 1) {
         var weight = 12 / columnsCount;
         var cellClassName_2 = "Grid-col--sm".concat(weight === Math.round(weight) ? weight : '');
-        body = chunk__default["default"](body, columnsCount).map(function (group, groupIndex) { return (React__default["default"].createElement("div", { className: cx('Grid'), key: groupIndex }, Array.from({ length: columnsCount }).map(function (_, index) { return (React__default["default"].createElement("div", { key: index, className: cx(cellClassName_2) }, group[index])); }))); });
+        body = chunk__default["default"](body, columnsCount).map(function (group, groupIndex) { return (_J$X_("div", { className: cx('Grid'), key: groupIndex }, Array.from({ length: columnsCount }).map(function (_, index) { return (_J$X_("div", { key: index, className: cx(cellClassName_2) }, group[index])); }))); });
     }
     return body;
 }

package/lib/utils/dataMapping.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -139,7 +139,9 @@ function dataMapping(to, from, ignoreFunction, convertKeyToPath, ignoreIfNotMatc
             else if (value === '$$') {
                 object.setVariable(ret, key, from, convertKeyToPath);
             }
-            else if (value && value[0] === '$') {
+            else if (typeof value === 'string' &&
+                value.length > 0 &&
+                value[0] === '$') {
                 var v = resolveMapping(value, from, undefined, ignoreIfNotMatch);
                 object.setVariable(ret, key, v, convertKeyToPath);
                 if (v === '__undefined') {

package/lib/utils/date.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/debug.d.ts

@@ -2,7 +2,9 @@
  * amis 运行时调试功能，为了避免循环引用，这个组件不要依赖 amis 里的组件
  */
 import React, { Component } from 'react';
+export declare const JsonView: React.LazyExoticComponent<React.ComponentType<import("react-json-view").ReactJsonViewProps>>;
 export declare function enableDebug(): void;
+export declare function disableDebug(): void;
 interface DebugWrapperProps {
     renderer: any;
     children?: React.ReactNode;

package/lib/utils/debug.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -11,7 +11,6 @@ var tslib = require('tslib');
 var React = require('react');
 var cx = require('classnames');
 var ReactDOM = require('react-dom');
-var JsonView = require('react-json-view');
 var mobx = require('mobx');
 var mobxReact = require('mobx-react');
 var helper = require('./helper.js');
@@ -21,11 +20,11 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
-var JsonView__default = /*#__PURE__*/_interopDefaultLegacy(JsonView);
 
-/**
- * amis 运行时调试功能，为了避免循环引用，这个组件不要依赖 amis 里的组件
- */
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
+var JsonView = React__default["default"].lazy(function () { return Promise.resolve().then(function() {return new Promise(function(fullfill) {require(['react-json-view'], function(mod) {fullfill(tslib.__importStar(mod))})})}); });
 /** @class */ ((function () {
     function Log() {
         this.cat = '';
@@ -116,14 +115,15 @@ var LogView = mobxReact.observer(function (_a) {
     var store = _a.store;
     var logs = store.logs;
     var ellipsisThreshold = (_b = store.ellipsisThreshold) !== null && _b !== void 0 ? _b : 50;
-    return (React__default["default"].createElement(React__default["default"].Fragment, null, logs.map(function (log, index) {
-        return (React__default["default"].createElement("div", { className: "AMISDebug-logLine", key: "log-".concat(index) },
-            React__default["default"].createElement("div", { className: "AMISDebug-logLineMsg" },
+    return (_J$X_(React__default["default"].Fragment, null, logs.map(function (log, index) {
+        return (_J$X_("div", { className: "AMISDebug-logLine", key: "log-".concat(index) },
+            _J$X_("div", { className: "AMISDebug-logLineMsg" },
                 "[",
                 log.cat,
                 "] ",
                 log.msg),
-            log.ext ? (React__default["default"].createElement(JsonView__default["default"], { name: null, theme: "monokai", src: JSON.parse(log.ext), collapsed: true, enableClipboard: false, displayDataTypes: false, collapseStringsAfterLength: ellipsisThreshold, iconStyle: "square" })) : null));
+            log.ext ? (_J$X_(React__default["default"].Suspense, { fallback: _J$X_("div", null, "Loading...") },
+                _J$X_(JsonView, { name: null, theme: "monokai", src: JSON.parse(log.ext), collapsed: true, enableClipboard: false, displayDataTypes: false, collapseStringsAfterLength: ellipsisThreshold, iconStyle: "square" }))) : null));
     })));
 });
 var AMISDebug = mobxReact.observer(function (_a) {
@@ -149,11 +149,12 @@ var AMISDebug = mobxReact.observer(function (_a) {
         try {
             for (var stacks_1 = tslib.__values(stacks), stacks_1_1 = stacks_1.next(); !stacks_1_1.done; stacks_1_1 = stacks_1.next()) {
                 var stack = stacks_1_1.value;
-                stackDataView.push(React__default["default"].createElement("div", { key: "data-".concat(level) },
-                    React__default["default"].createElement("h3", null,
+                stackDataView.push(_J$X_("div", { key: "data-".concat(level) },
+                    _J$X_("h3", null,
                         "Data Level-",
                         level),
-                    React__default["default"].createElement(JsonView__default["default"], { key: "dataview-".concat(stack), name: null, theme: "monokai", src: stack, collapsed: level === 0 ? false : true, enableClipboard: false, displayDataTypes: false, iconStyle: "square" })));
+                    _J$X_(React__default["default"].Suspense, { fallback: _J$X_("div", null, "Loading...") },
+                        _J$X_(JsonView, { key: "dataview-".concat(stack), name: null, theme: "monokai", src: stack, collapsed: level === 0 ? false : true, enableClipboard: false, displayDataTypes: false, iconStyle: "square" }))));
                 level += 1;
             }
         }
@@ -199,47 +200,47 @@ var AMISDebug = mobxReact.observer(function (_a) {
             }
         };
     }, [isResizing]);
-    return (React__default["default"].createElement("div", { className: cx__default["default"]('AMISDebug', {
+    return (_J$X_("div", { className: cx__default["default"]('AMISDebug', {
             'is-expanded': store.isExpanded,
             'is-left': store.position === 'left'
         }), ref: panelRef },
-        React__default["default"].createElement("div", { className: "AMISDebug-toggle", title: "open debug", onClick: function () {
+        _J$X_("div", { className: "AMISDebug-toggle", title: "open debug", onClick: function () {
                 store.isExpanded = true;
-            } }, store.isExpanded ? (React__default["default"].createElement("i", { className: "fas fa-times" })) : (React__default["default"].createElement("i", { className: "fas fa-bug" }))),
-        React__default["default"].createElement("div", { className: cx__default["default"]('AMISDebug-content') },
-            React__default["default"].createElement("div", { className: "AMISDebug-close", title: "Close", onClick: function () {
+            } }, store.isExpanded ? (_J$X_("i", { className: "fas fa-times" })) : (_J$X_("i", { className: "fas fa-bug" }))),
+        _J$X_("div", { className: cx__default["default"]('AMISDebug-content') },
+            _J$X_("div", { className: "AMISDebug-close", title: "Close", onClick: function () {
                     store.isExpanded = false;
                     store.activeId = '';
                     store.hoverId = '';
                 } },
-                React__default["default"].createElement("i", { className: "fas fa-times" })),
-            React__default["default"].createElement("div", { className: "AMISDebug-resize", onMouseDown: function (event) {
+                _J$X_("i", { className: "fas fa-times" })),
+            _J$X_("div", { className: "AMISDebug-resize", onMouseDown: function (event) {
                     setStartX(event.clientX);
                     setPanelWidth(parseInt(getComputedStyle(panelRef.current).getPropertyValue('width'), 10));
                     setResizing(true);
                 } }),
-            React__default["default"].createElement("div", { className: "AMISDebug-tab" },
-                React__default["default"].createElement("button", { className: cx__default["default"]({ active: store.tab === 'log' }), onClick: function () {
+            _J$X_("div", { className: "AMISDebug-tab" },
+                _J$X_("button", { className: cx__default["default"]({ active: store.tab === 'log' }), onClick: function () {
                         store.tab = 'log';
                     } }, "Log"),
-                React__default["default"].createElement("button", { className: cx__default["default"]({ active: store.tab === 'inspect' }), onClick: function () {
+                _J$X_("button", { className: cx__default["default"]({ active: store.tab === 'inspect' }), onClick: function () {
                         store.tab = 'inspect';
                     } }, "Inspect")),
-            React__default["default"].createElement("div", { className: "AMISDebug-changePosition" }, store.position === 'right' ? (React__default["default"].createElement("i", { className: "fas fa-chevron-left", title: "move to left", onClick: function () {
+            _J$X_("div", { className: "AMISDebug-changePosition" }, store.position === 'right' ? (_J$X_("i", { className: "fas fa-chevron-left", title: "move to left", onClick: function () {
                     store.position = 'left';
-                } })) : (React__default["default"].createElement("i", { className: "fas fa-chevron-right", title: "move to right", onClick: function () {
+                } })) : (_J$X_("i", { className: "fas fa-chevron-right", title: "move to right", onClick: function () {
                     store.position = 'right';
                 } }))),
-            store.tab === 'log' ? (React__default["default"].createElement("div", { className: "AMISDebug-log" },
-                React__default["default"].createElement("button", { onClick: function () {
+            store.tab === 'log' ? (_J$X_("div", { className: "AMISDebug-log" },
+                _J$X_("button", { onClick: function () {
                         store.logs = [];
                     } }, "Clear Log"),
-                React__default["default"].createElement(LogView, { store: store }))) : null,
-            store.tab === 'inspect' ? (React__default["default"].createElement("div", { className: "AMISDebug-inspect" }, activeId ? (React__default["default"].createElement(React__default["default"].Fragment, null,
-                React__default["default"].createElement("h3", null,
+                _J$X_(LogView, { store: store }))) : null,
+            store.tab === 'inspect' ? (_J$X_("div", { className: "AMISDebug-inspect" }, activeId ? (_J$X_(React__default["default"].Fragment, null,
+                _J$X_("h3", null,
                     "Component:",
                     ' ',
-                    React__default["default"].createElement("span", { className: "primary" }, activeComponentInspect.name)),
+                    _J$X_("span", { className: "primary" }, activeComponentInspect.name)),
                 stackDataView)) : ('Click component to display inspect'))) : null)));
 });
 /**
@@ -264,7 +265,7 @@ function handleMouseclick(e) {
     }
     var dom = e.target;
     var target = dom.closest("[data-debug-id]");
-    if (target) {
+    if (target && !target.closest('.AMISDebug')) {
         store.activeId = target.getAttribute('data-debug-id');
         store.tab = 'inspect';
     }
@@ -304,6 +305,7 @@ mobx.autorun(function () {
 });
 // 页面中只能有一个实例
 var isEnabled = false;
+var unmount;
 function enableDebug() {
     if (isEnabled) {
         return;
@@ -311,13 +313,37 @@ function enableDebug() {
     isEnabled = true;
     var amisDebugElement = document.createElement('div');
     document.body.appendChild(amisDebugElement);
-    var element = React__default["default"].createElement(AMISDebug, { store: store });
+    var element = _J$X_(AMISDebug, { store: store });
+    // if (parseInt(version.split('.')[0], 10) >= 18) {
+    //   const root = createRoot(amisDebugElement);
+    //   root.render(element);
+    //   unmount = () => {
+    //     root.unmount();
+    //     document.body.removeChild(amisDebugElement);
+    //   };
+    // } else {
     ReactDOM.render(element, amisDebugElement);
+    unmount = function () {
+        ReactDOM.unmountComponentAtNode(amisDebugElement);
+        document.body.removeChild(amisDebugElement);
+    };
+    // }
     document.body.appendChild(amisHoverBox);
     document.body.appendChild(amisActiveBox);
     document.addEventListener('mousemove', handleMouseMove);
     document.addEventListener('click', handleMouseclick);
 }
+function disableDebug() {
+    if (!isEnabled) {
+        return;
+    }
+    isEnabled = false;
+    unmount === null || unmount === void 0 ? void 0 : unmount();
+    document.body.removeChild(amisHoverBox);
+    document.body.removeChild(amisActiveBox);
+    document.removeEventListener('mousemove', handleMouseMove);
+    document.removeEventListener('click', handleMouseclick);
+}
 var DebugWrapper = /** @class */ (function (_super) {
     tslib.__extends(DebugWrapper, _super);
     function DebugWrapper() {
@@ -397,6 +423,8 @@ function warning(cat, msg, ext) {
 }
 
 exports.DebugWrapper = DebugWrapper;
+exports.JsonView = JsonView;
 exports.debug = debug;
+exports.disableDebug = disableDebug;
 exports.enableDebug = enableDebug;
 exports.warning = warning;

package/lib/utils/decodeEntity.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/dom.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 
@@ -9,15 +9,17 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var ReactDOM = require('react-dom');
-var React = require('react');
+require('react');
 var offset = require('./offset.js');
 var position = require('./position.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var ReactDOM__default = /*#__PURE__*/_interopDefaultLegacy(ReactDOM);
-var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 
+var __react_jsx__ = require('react');
+var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
+(__react_jsx__["default"] || __react_jsx__).Fragment;
 function getContainer(container, defaultContainer) {
     container = typeof container === 'function' ? container() : container;
     return ReactDOM__default["default"].findDOMNode(container) || defaultContainer;
@@ -225,9 +227,9 @@ function renderTextByKeyword(rendererText, curKeyword) {
     if (curKeyword && ~rendererText.indexOf(curKeyword)) {
         var keywordStartIndex = rendererText.indexOf(curKeyword);
         var keywordEndIndex = keywordStartIndex + curKeyword.length;
-        return (React__default["default"].createElement("span", null,
+        return (_J$X_("span", null,
             rendererText.substring(0, keywordStartIndex),
-            React__default["default"].createElement("span", { className: "is-keyword" }, curKeyword),
+            _J$X_("span", { className: "is-keyword" }, curKeyword),
             rendererText.substring(keywordEndIndex)));
     }
     else {

package/lib/utils/errors.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/escapeHtml.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/filter-schema.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */
 

package/lib/utils/filter.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v3.2.0
+ * amis-core v3.3.0
  * Copyright 2018-2023 fex
  */