@zzdadelu/schema-builder 1.0.0-alpha.46 → 1.0.0-alpha.47

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/es/main.js +127 -17
  2. package/lib/main.js +126 -16
  3. package/package.json +1 -1
package/es/main.js CHANGED
@@ -5,17 +5,29 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
5
5
  function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
6
6
  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
7
7
  function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
8
+ function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
9
+ function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
10
+ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
11
+ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
12
+ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
13
+ function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
8
14
  function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
9
15
  function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
10
- import React, { useEffect, useRef, useImperativeHandle, forwardRef } from 'react';
16
+ import React, { useEffect, useRef, useImperativeHandle, forwardRef, useState } from 'react';
11
17
  import createIframe from './createIframe';
12
18
  import * as defaultSetting from './settings';
13
19
  var iframe;
20
+ var retryCount = 0;
21
+ var MAX_RETRIES = 3;
14
22
  var Design = function Design(props, ref) {
15
23
  var widgets = props.widgets,
16
24
  settings = props.settings,
17
25
  restProps = _objectWithoutProperties(props, _excluded);
18
26
  var containerRef = useRef();
27
+ var _useState = useState(true),
28
+ _useState2 = _slicedToArray(_useState, 2),
29
+ loading = _useState2[0],
30
+ setLoading = _useState2[1];
19
31
  useImperativeHandle(ref, function () {
20
32
  return {
21
33
  getValue: function getValue() {
@@ -25,40 +37,138 @@ var Design = function Design(props, ref) {
25
37
  setValue: function setValue(schema) {
26
38
  var _iframe2, _iframe2$contentWindo, _iframe2$contentWindo2, _iframe2$contentWindo3;
27
39
  return (_iframe2 = iframe) === null || _iframe2 === void 0 ? void 0 : (_iframe2$contentWindo = _iframe2.contentWindow) === null || _iframe2$contentWindo === void 0 ? void 0 : (_iframe2$contentWindo2 = _iframe2$contentWindo.__FR_ENGINE__) === null || _iframe2$contentWindo2 === void 0 ? void 0 : (_iframe2$contentWindo3 = _iframe2$contentWindo2.importSchema) === null || _iframe2$contentWindo3 === void 0 ? void 0 : _iframe2$contentWindo3.call(_iframe2$contentWindo2, schema);
40
+ },
41
+ reload: function reload() {
42
+ if (containerRef.current && iframe) {
43
+ containerRef.current.removeChild(iframe);
44
+ iframe = null;
45
+ retryCount = 0;
46
+ initIframe();
47
+ }
28
48
  }
29
49
  };
30
50
  });
31
51
  useEffect(function () {
32
52
  initIframe();
33
- window.addEventListener('message', engineOnLoad);
53
+ var messageHandler = handleMessage;
54
+ window.addEventListener('message', messageHandler);
34
55
  return function () {
35
- window.removeEventListener('message', engineOnLoad);
56
+ window.removeEventListener('message', messageHandler);
57
+ if (iframe && containerRef.current) {
58
+ try {
59
+ containerRef.current.removeChild(iframe);
60
+ } catch (e) {}
61
+ iframe = null;
62
+ }
36
63
  };
37
64
  }, []);
38
65
  var initIframe = function initIframe() {
66
+ console.log('[SchemaBuilder] Initializing iframe, retry:', retryCount);
67
+
68
+ // 清理旧的 iframe
69
+ if (containerRef.current && iframe) {
70
+ try {
71
+ containerRef.current.removeChild(iframe);
72
+ } catch (e) {}
73
+ iframe = null;
74
+ }
75
+
76
+ // 创建新的 iframe
39
77
  iframe = createIframe();
78
+
79
+ // 添加错误处理
80
+ iframe.onerror = function (e) {
81
+ console.error('[SchemaBuilder] Iframe error:', e);
82
+ };
83
+ iframe.onload = function () {
84
+ console.log('[SchemaBuilder] Iframe loaded');
85
+ setLoading(false);
86
+ };
40
87
  containerRef.current.appendChild(iframe);
88
+
89
+ // 设置超时重试
90
+ setTimeout(function () {
91
+ if (iframe && (!iframe.contentWindow || !iframe.contentDocument)) {
92
+ console.warn('[SchemaBuilder] Iframe load timeout, retrying...');
93
+ retryIframe();
94
+ }
95
+ }, 10000);
41
96
  };
42
- var engineOnLoad = function engineOnLoad(event) {
43
- var _iframe3, _iframe3$contentWindo, _iframe3$contentWindo2;
44
- if (event.data.type !== 'engine-load') {
45
- return;
97
+ var retryIframe = function retryIframe() {
98
+ if (retryCount < MAX_RETRIES) {
99
+ retryCount++;
100
+ console.warn("[SchemaBuilder] Retrying iframe creation (".concat(retryCount, "/").concat(MAX_RETRIES, ")"));
101
+ initIframe();
102
+ } else {
103
+ console.error('[SchemaBuilder] Max retries reached');
46
104
  }
47
- (_iframe3 = iframe) === null || _iframe3 === void 0 ? void 0 : (_iframe3$contentWindo = _iframe3.contentWindow) === null || _iframe3$contentWindo === void 0 ? void 0 : (_iframe3$contentWindo2 = _iframe3$contentWindo.__FR_ENGINE__) === null || _iframe3$contentWindo2 === void 0 ? void 0 : _iframe3$contentWindo2.init(_objectSpread({
48
- settings: _objectSpread(_objectSpread({}, defaultSetting), settings),
49
- widgets: widgets,
50
- // recordEnable: true,
51
- logo: {
52
- title: 'XRender'
53
- }
54
- }, restProps));
55
105
  };
56
- return /*#__PURE__*/React.createElement("div", {
106
+ var handleMessage = function handleMessage(event) {
107
+ // 处理来自 iframe 的各种消息
108
+ switch (event.data.type) {
109
+ case 'getFormRenderMaterial-ready':
110
+ console.log('[SchemaBuilder] getFormRenderMaterial is ready in iframe');
111
+ break;
112
+ case 'engine-load':
113
+ console.log('[SchemaBuilder] Engine loaded, checks:', event.data.checks);
114
+ if (event.data.checks && !event.data.checks.getFormRenderMaterial) {
115
+ console.error('[SchemaBuilder] getFormRenderMaterial check failed, retrying...');
116
+ setTimeout(retryIframe, 500);
117
+ return;
118
+ }
119
+
120
+ // 延迟初始化以确保所有资源就绪
121
+ setTimeout(function () {
122
+ try {
123
+ var _iframe3, _iframe3$contentWindo;
124
+ if ((_iframe3 = iframe) === null || _iframe3 === void 0 ? void 0 : (_iframe3$contentWindo = _iframe3.contentWindow) === null || _iframe3$contentWindo === void 0 ? void 0 : _iframe3$contentWindo.__FR_ENGINE__) {
125
+ iframe.contentWindow.__FR_ENGINE__.init(_objectSpread({
126
+ settings: _objectSpread(_objectSpread({}, defaultSetting), settings),
127
+ widgets: widgets,
128
+ logo: {
129
+ title: 'XRender'
130
+ }
131
+ }, restProps));
132
+ console.log('[SchemaBuilder] Engine initialized successfully');
133
+ } else {
134
+ console.error('[SchemaBuilder] __FR_ENGINE__ not found in iframe');
135
+ retryIframe();
136
+ }
137
+ } catch (error) {
138
+ console.error('[SchemaBuilder] Error initializing engine:', error);
139
+ retryIframe();
140
+ }
141
+ }, 500);
142
+ break;
143
+ default:
144
+ // 其他消息可以忽略
145
+ break;
146
+ }
147
+ };
148
+ return /*#__PURE__*/React.createElement(React.Fragment, null, loading && /*#__PURE__*/React.createElement("div", {
149
+ style: {
150
+ position: 'absolute',
151
+ top: 0,
152
+ left: 0,
153
+ right: 0,
154
+ bottom: 0,
155
+ display: 'flex',
156
+ alignItems: 'center',
157
+ justifyContent: 'center',
158
+ backgroundColor: 'rgba(255, 255, 255, 0.8)',
159
+ zIndex: 10
160
+ }
161
+ }, /*#__PURE__*/React.createElement("div", null, "\u52A0\u8F7D\u8868\u5355\u8BBE\u8BA1\u5668...", retryCount > 0 && /*#__PURE__*/React.createElement("div", {
162
+ style: {
163
+ fontSize: '12px',
164
+ color: '#666'
165
+ }
166
+ }, "\u91CD\u8BD5 ", retryCount, "/", MAX_RETRIES))), /*#__PURE__*/React.createElement("div", {
57
167
  ref: containerRef,
58
168
  style: {
59
169
  width: '100%',
60
170
  height: '100%'
61
171
  }
62
- });
172
+ }));
63
173
  };
64
174
  export default /*#__PURE__*/forwardRef(Design);
package/lib/main.js CHANGED
@@ -16,14 +16,26 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
16
16
  function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
17
17
  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
18
18
  function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
19
+ function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
20
+ function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
21
+ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
22
+ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
23
+ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
24
+ function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
19
25
  function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
20
26
  function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
21
27
  var iframe;
28
+ var retryCount = 0;
29
+ var MAX_RETRIES = 3;
22
30
  var Design = function Design(props, ref) {
23
31
  var widgets = props.widgets,
24
32
  settings = props.settings,
25
33
  restProps = _objectWithoutProperties(props, _excluded);
26
34
  var containerRef = (0, _react.useRef)();
35
+ var _useState = (0, _react.useState)(true),
36
+ _useState2 = _slicedToArray(_useState, 2),
37
+ loading = _useState2[0],
38
+ setLoading = _useState2[1];
27
39
  (0, _react.useImperativeHandle)(ref, function () {
28
40
  return {
29
41
  getValue: function getValue() {
@@ -33,40 +45,138 @@ var Design = function Design(props, ref) {
33
45
  setValue: function setValue(schema) {
34
46
  var _iframe2, _iframe2$contentWindo, _iframe2$contentWindo2, _iframe2$contentWindo3;
35
47
  return (_iframe2 = iframe) === null || _iframe2 === void 0 ? void 0 : (_iframe2$contentWindo = _iframe2.contentWindow) === null || _iframe2$contentWindo === void 0 ? void 0 : (_iframe2$contentWindo2 = _iframe2$contentWindo.__FR_ENGINE__) === null || _iframe2$contentWindo2 === void 0 ? void 0 : (_iframe2$contentWindo3 = _iframe2$contentWindo2.importSchema) === null || _iframe2$contentWindo3 === void 0 ? void 0 : _iframe2$contentWindo3.call(_iframe2$contentWindo2, schema);
48
+ },
49
+ reload: function reload() {
50
+ if (containerRef.current && iframe) {
51
+ containerRef.current.removeChild(iframe);
52
+ iframe = null;
53
+ retryCount = 0;
54
+ initIframe();
55
+ }
36
56
  }
37
57
  };
38
58
  });
39
59
  (0, _react.useEffect)(function () {
40
60
  initIframe();
41
- window.addEventListener('message', engineOnLoad);
61
+ var messageHandler = handleMessage;
62
+ window.addEventListener('message', messageHandler);
42
63
  return function () {
43
- window.removeEventListener('message', engineOnLoad);
64
+ window.removeEventListener('message', messageHandler);
65
+ if (iframe && containerRef.current) {
66
+ try {
67
+ containerRef.current.removeChild(iframe);
68
+ } catch (e) {}
69
+ iframe = null;
70
+ }
44
71
  };
45
72
  }, []);
46
73
  var initIframe = function initIframe() {
74
+ console.log('[SchemaBuilder] Initializing iframe, retry:', retryCount);
75
+
76
+ // 清理旧的 iframe
77
+ if (containerRef.current && iframe) {
78
+ try {
79
+ containerRef.current.removeChild(iframe);
80
+ } catch (e) {}
81
+ iframe = null;
82
+ }
83
+
84
+ // 创建新的 iframe
47
85
  iframe = (0, _createIframe.default)();
86
+
87
+ // 添加错误处理
88
+ iframe.onerror = function (e) {
89
+ console.error('[SchemaBuilder] Iframe error:', e);
90
+ };
91
+ iframe.onload = function () {
92
+ console.log('[SchemaBuilder] Iframe loaded');
93
+ setLoading(false);
94
+ };
48
95
  containerRef.current.appendChild(iframe);
96
+
97
+ // 设置超时重试
98
+ setTimeout(function () {
99
+ if (iframe && (!iframe.contentWindow || !iframe.contentDocument)) {
100
+ console.warn('[SchemaBuilder] Iframe load timeout, retrying...');
101
+ retryIframe();
102
+ }
103
+ }, 10000);
49
104
  };
50
- var engineOnLoad = function engineOnLoad(event) {
51
- var _iframe3, _iframe3$contentWindo, _iframe3$contentWindo2;
52
- if (event.data.type !== 'engine-load') {
53
- return;
105
+ var retryIframe = function retryIframe() {
106
+ if (retryCount < MAX_RETRIES) {
107
+ retryCount++;
108
+ console.warn("[SchemaBuilder] Retrying iframe creation (".concat(retryCount, "/").concat(MAX_RETRIES, ")"));
109
+ initIframe();
110
+ } else {
111
+ console.error('[SchemaBuilder] Max retries reached');
54
112
  }
55
- (_iframe3 = iframe) === null || _iframe3 === void 0 ? void 0 : (_iframe3$contentWindo = _iframe3.contentWindow) === null || _iframe3$contentWindo === void 0 ? void 0 : (_iframe3$contentWindo2 = _iframe3$contentWindo.__FR_ENGINE__) === null || _iframe3$contentWindo2 === void 0 ? void 0 : _iframe3$contentWindo2.init(_objectSpread({
56
- settings: _objectSpread(_objectSpread({}, defaultSetting), settings),
57
- widgets: widgets,
58
- // recordEnable: true,
59
- logo: {
60
- title: 'XRender'
61
- }
62
- }, restProps));
63
113
  };
64
- return /*#__PURE__*/_react.default.createElement("div", {
114
+ var handleMessage = function handleMessage(event) {
115
+ // 处理来自 iframe 的各种消息
116
+ switch (event.data.type) {
117
+ case 'getFormRenderMaterial-ready':
118
+ console.log('[SchemaBuilder] getFormRenderMaterial is ready in iframe');
119
+ break;
120
+ case 'engine-load':
121
+ console.log('[SchemaBuilder] Engine loaded, checks:', event.data.checks);
122
+ if (event.data.checks && !event.data.checks.getFormRenderMaterial) {
123
+ console.error('[SchemaBuilder] getFormRenderMaterial check failed, retrying...');
124
+ setTimeout(retryIframe, 500);
125
+ return;
126
+ }
127
+
128
+ // 延迟初始化以确保所有资源就绪
129
+ setTimeout(function () {
130
+ try {
131
+ var _iframe3, _iframe3$contentWindo;
132
+ if ((_iframe3 = iframe) === null || _iframe3 === void 0 ? void 0 : (_iframe3$contentWindo = _iframe3.contentWindow) === null || _iframe3$contentWindo === void 0 ? void 0 : _iframe3$contentWindo.__FR_ENGINE__) {
133
+ iframe.contentWindow.__FR_ENGINE__.init(_objectSpread({
134
+ settings: _objectSpread(_objectSpread({}, defaultSetting), settings),
135
+ widgets: widgets,
136
+ logo: {
137
+ title: 'XRender'
138
+ }
139
+ }, restProps));
140
+ console.log('[SchemaBuilder] Engine initialized successfully');
141
+ } else {
142
+ console.error('[SchemaBuilder] __FR_ENGINE__ not found in iframe');
143
+ retryIframe();
144
+ }
145
+ } catch (error) {
146
+ console.error('[SchemaBuilder] Error initializing engine:', error);
147
+ retryIframe();
148
+ }
149
+ }, 500);
150
+ break;
151
+ default:
152
+ // 其他消息可以忽略
153
+ break;
154
+ }
155
+ };
156
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, loading && /*#__PURE__*/_react.default.createElement("div", {
157
+ style: {
158
+ position: 'absolute',
159
+ top: 0,
160
+ left: 0,
161
+ right: 0,
162
+ bottom: 0,
163
+ display: 'flex',
164
+ alignItems: 'center',
165
+ justifyContent: 'center',
166
+ backgroundColor: 'rgba(255, 255, 255, 0.8)',
167
+ zIndex: 10
168
+ }
169
+ }, /*#__PURE__*/_react.default.createElement("div", null, "\u52A0\u8F7D\u8868\u5355\u8BBE\u8BA1\u5668...", retryCount > 0 && /*#__PURE__*/_react.default.createElement("div", {
170
+ style: {
171
+ fontSize: '12px',
172
+ color: '#666'
173
+ }
174
+ }, "\u91CD\u8BD5 ", retryCount, "/", MAX_RETRIES))), /*#__PURE__*/_react.default.createElement("div", {
65
175
  ref: containerRef,
66
176
  style: {
67
177
  width: '100%',
68
178
  height: '100%'
69
179
  }
70
- });
180
+ }));
71
181
  };
72
182
  var _default = exports.default = /*#__PURE__*/(0, _react.forwardRef)(Design);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zzdadelu/schema-builder",
3
- "version": "1.0.0-alpha.46",
3
+ "version": "1.0.0-alpha.47",
4
4
  "description": "通过 JSON Schema 生成标准 Form,常用于自定义搭建配置界面生成",
5
5
  "keywords": [
6
6
  "Form",