@nocobase/flow-engine 2.1.0-alpha.4 → 2.1.0-alpha.45

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 (209) hide show
  1. package/LICENSE +201 -661
  2. package/README.md +79 -10
  3. package/lib/FlowContextProvider.d.ts +5 -1
  4. package/lib/FlowContextProvider.js +9 -2
  5. package/lib/JSRunner.d.ts +10 -1
  6. package/lib/JSRunner.js +50 -5
  7. package/lib/ViewScopedFlowEngine.js +5 -1
  8. package/lib/components/FieldModelRenderer.js +2 -2
  9. package/lib/components/FlowModelRenderer.d.ts +3 -1
  10. package/lib/components/FlowModelRenderer.js +12 -6
  11. package/lib/components/FormItem.d.ts +6 -0
  12. package/lib/components/FormItem.js +11 -3
  13. package/lib/components/MobilePopup.js +6 -5
  14. package/lib/components/dnd/gridDragPlanner.d.ts +59 -2
  15. package/lib/components/dnd/gridDragPlanner.js +613 -21
  16. package/lib/components/dnd/index.d.ts +31 -2
  17. package/lib/components/dnd/index.js +244 -23
  18. package/lib/components/settings/wrappers/component/SelectWithTitle.d.ts +2 -1
  19. package/lib/components/settings/wrappers/component/SelectWithTitle.js +14 -12
  20. package/lib/components/settings/wrappers/contextual/DefaultSettingsIcon.d.ts +3 -0
  21. package/lib/components/settings/wrappers/contextual/DefaultSettingsIcon.js +76 -11
  22. package/lib/components/settings/wrappers/contextual/FlowsFloatContextMenu.d.ts +23 -43
  23. package/lib/components/settings/wrappers/contextual/FlowsFloatContextMenu.js +352 -295
  24. package/lib/components/settings/wrappers/contextual/StepSettingsDialog.js +16 -2
  25. package/lib/components/settings/wrappers/contextual/useFloatToolbarPortal.d.ts +36 -0
  26. package/lib/components/settings/wrappers/contextual/useFloatToolbarPortal.js +274 -0
  27. package/lib/components/settings/wrappers/contextual/useFloatToolbarVisibility.d.ts +30 -0
  28. package/lib/components/settings/wrappers/contextual/useFloatToolbarVisibility.js +315 -0
  29. package/lib/components/subModel/AddSubModelButton.js +27 -1
  30. package/lib/components/subModel/LazyDropdown.js +293 -52
  31. package/lib/components/subModel/index.d.ts +1 -0
  32. package/lib/components/subModel/index.js +19 -0
  33. package/lib/components/subModel/utils.d.ts +1 -1
  34. package/lib/components/subModel/utils.js +9 -3
  35. package/lib/components/variables/VariableHybridInput.d.ts +27 -0
  36. package/lib/components/variables/VariableHybridInput.js +499 -0
  37. package/lib/components/variables/index.d.ts +2 -0
  38. package/lib/components/variables/index.js +3 -0
  39. package/lib/data-source/index.d.ts +84 -0
  40. package/lib/data-source/index.js +259 -5
  41. package/lib/executor/FlowExecutor.js +32 -9
  42. package/lib/flow-registry/DetachedFlowRegistry.d.ts +21 -0
  43. package/lib/flow-registry/DetachedFlowRegistry.js +80 -0
  44. package/lib/flow-registry/index.d.ts +1 -0
  45. package/lib/flow-registry/index.js +3 -1
  46. package/lib/flowContext.d.ts +3 -0
  47. package/lib/flowContext.js +46 -1
  48. package/lib/flowEngine.d.ts +151 -1
  49. package/lib/flowEngine.js +392 -18
  50. package/lib/flowI18n.js +2 -1
  51. package/lib/flowSettings.d.ts +14 -6
  52. package/lib/flowSettings.js +34 -6
  53. package/lib/index.d.ts +2 -0
  54. package/lib/index.js +7 -0
  55. package/lib/lazy-helper.d.ts +14 -0
  56. package/lib/lazy-helper.js +71 -0
  57. package/lib/locale/en-US.json +1 -0
  58. package/lib/locale/index.d.ts +2 -0
  59. package/lib/locale/zh-CN.json +1 -0
  60. package/lib/models/DisplayItemModel.d.ts +1 -1
  61. package/lib/models/EditableItemModel.d.ts +1 -1
  62. package/lib/models/FilterableItemModel.d.ts +1 -1
  63. package/lib/models/flowModel.d.ts +13 -10
  64. package/lib/models/flowModel.js +81 -21
  65. package/lib/provider.js +38 -23
  66. package/lib/reactive/observer.js +46 -16
  67. package/lib/runjs-context/registry.d.ts +1 -1
  68. package/lib/runjs-context/setup.js +20 -12
  69. package/lib/runjs-context/snippets/index.js +13 -2
  70. package/lib/runjs-context/snippets/scene/detail/set-field-style.snippet.d.ts +11 -0
  71. package/lib/runjs-context/snippets/scene/detail/set-field-style.snippet.js +50 -0
  72. package/lib/runjs-context/snippets/scene/table/set-cell-style.snippet.d.ts +11 -0
  73. package/lib/runjs-context/snippets/scene/table/set-cell-style.snippet.js +54 -0
  74. package/lib/scheduler/ModelOperationScheduler.d.ts +5 -1
  75. package/lib/scheduler/ModelOperationScheduler.js +3 -2
  76. package/lib/types.d.ts +50 -2
  77. package/lib/types.js +1 -0
  78. package/lib/utils/createCollectionContextMeta.js +6 -2
  79. package/lib/utils/index.d.ts +3 -2
  80. package/lib/utils/index.js +7 -0
  81. package/lib/utils/parsePathnameToViewParams.d.ts +5 -1
  82. package/lib/utils/parsePathnameToViewParams.js +29 -5
  83. package/lib/utils/randomId.d.ts +39 -0
  84. package/lib/utils/randomId.js +45 -0
  85. package/lib/utils/runjsTemplateCompat.js +1 -1
  86. package/lib/utils/runjsValue.js +41 -11
  87. package/lib/utils/schema-utils.d.ts +7 -1
  88. package/lib/utils/schema-utils.js +19 -0
  89. package/lib/views/FlowView.d.ts +7 -1
  90. package/lib/views/FlowView.js +11 -1
  91. package/lib/views/PageComponent.js +8 -6
  92. package/lib/views/ViewNavigation.d.ts +12 -2
  93. package/lib/views/ViewNavigation.js +28 -9
  94. package/lib/views/createViewMeta.js +114 -50
  95. package/lib/views/inheritLayoutContext.d.ts +10 -0
  96. package/lib/views/inheritLayoutContext.js +50 -0
  97. package/lib/views/runViewBeforeClose.d.ts +10 -0
  98. package/lib/views/runViewBeforeClose.js +45 -0
  99. package/lib/views/useDialog.d.ts +2 -1
  100. package/lib/views/useDialog.js +22 -3
  101. package/lib/views/useDrawer.d.ts +2 -1
  102. package/lib/views/useDrawer.js +22 -3
  103. package/lib/views/usePage.d.ts +5 -11
  104. package/lib/views/usePage.js +304 -144
  105. package/package.json +6 -5
  106. package/src/FlowContextProvider.tsx +9 -1
  107. package/src/JSRunner.ts +68 -4
  108. package/src/ViewScopedFlowEngine.ts +4 -0
  109. package/src/__tests__/JSRunner.test.ts +27 -1
  110. package/src/__tests__/createViewMeta.popup.test.ts +115 -1
  111. package/src/__tests__/flow-engine.test.ts +166 -0
  112. package/src/__tests__/flowContext.test.ts +82 -1
  113. package/src/__tests__/flowEngine.modelLoaders.test.ts +245 -0
  114. package/src/__tests__/flowEngine.removeModel.test.ts +47 -3
  115. package/src/__tests__/flowSettings.test.ts +94 -15
  116. package/src/__tests__/objectVariable.test.ts +24 -0
  117. package/src/__tests__/provider.test.tsx +24 -2
  118. package/src/__tests__/renderHiddenInConfig.test.tsx +6 -6
  119. package/src/__tests__/runjsContext.test.ts +16 -0
  120. package/src/__tests__/runjsContextRuntime.test.ts +2 -0
  121. package/src/__tests__/runjsPreprocessDefault.test.ts +23 -0
  122. package/src/__tests__/runjsSnippets.test.ts +21 -0
  123. package/src/__tests__/viewScopedFlowEngine.test.ts +3 -3
  124. package/src/components/FieldModelRenderer.tsx +2 -1
  125. package/src/components/FlowModelRenderer.tsx +18 -6
  126. package/src/components/FormItem.tsx +7 -1
  127. package/src/components/MobilePopup.tsx +4 -2
  128. package/src/components/__tests__/FlowModelRenderer.test.tsx +65 -2
  129. package/src/components/__tests__/FormItem.test.tsx +25 -0
  130. package/src/components/__tests__/dnd.test.ts +44 -0
  131. package/src/components/__tests__/flow-model-render-error-fallback.test.tsx +20 -10
  132. package/src/components/__tests__/gridDragPlanner.test.ts +558 -3
  133. package/src/components/dnd/__tests__/DndProvider.test.tsx +98 -0
  134. package/src/components/dnd/gridDragPlanner.ts +758 -19
  135. package/src/components/dnd/index.tsx +305 -28
  136. package/src/components/settings/wrappers/component/SelectWithTitle.tsx +21 -9
  137. package/src/components/settings/wrappers/contextual/DefaultSettingsIcon.tsx +99 -11
  138. package/src/components/settings/wrappers/contextual/FlowsFloatContextMenu.tsx +487 -440
  139. package/src/components/settings/wrappers/contextual/StepSettingsDialog.tsx +18 -2
  140. package/src/components/settings/wrappers/contextual/__tests__/DefaultSettingsIcon.test.tsx +194 -5
  141. package/src/components/settings/wrappers/contextual/__tests__/FlowsFloatContextMenu.test.tsx +778 -0
  142. package/src/components/settings/wrappers/contextual/useFloatToolbarPortal.ts +360 -0
  143. package/src/components/settings/wrappers/contextual/useFloatToolbarVisibility.ts +361 -0
  144. package/src/components/subModel/AddSubModelButton.tsx +32 -2
  145. package/src/components/subModel/LazyDropdown.tsx +332 -56
  146. package/src/components/subModel/__tests__/AddSubModelButton.test.tsx +522 -37
  147. package/src/components/subModel/__tests__/utils.test.ts +24 -0
  148. package/src/components/subModel/index.ts +1 -0
  149. package/src/components/subModel/utils.ts +7 -1
  150. package/src/components/variables/VariableHybridInput.tsx +531 -0
  151. package/src/components/variables/index.ts +2 -0
  152. package/src/data-source/__tests__/collection.test.ts +41 -2
  153. package/src/data-source/__tests__/index.test.ts +68 -1
  154. package/src/data-source/index.ts +322 -6
  155. package/src/executor/FlowExecutor.ts +35 -10
  156. package/src/executor/__tests__/flowExecutor.test.ts +85 -0
  157. package/src/flow-registry/DetachedFlowRegistry.ts +46 -0
  158. package/src/flow-registry/__tests__/detachedFlowRegistry.test.ts +47 -0
  159. package/src/flow-registry/index.ts +1 -0
  160. package/src/flowContext.ts +50 -3
  161. package/src/flowEngine.ts +449 -14
  162. package/src/flowI18n.ts +2 -1
  163. package/src/flowSettings.ts +40 -6
  164. package/src/index.ts +2 -0
  165. package/src/lazy-helper.tsx +57 -0
  166. package/src/locale/en-US.json +1 -0
  167. package/src/locale/zh-CN.json +1 -0
  168. package/src/models/DisplayItemModel.tsx +1 -1
  169. package/src/models/EditableItemModel.tsx +1 -1
  170. package/src/models/FilterableItemModel.tsx +1 -1
  171. package/src/models/__tests__/dispatchEvent.when.test.ts +214 -0
  172. package/src/models/__tests__/flowEngine.resolveUse.test.ts +0 -15
  173. package/src/models/__tests__/flowModel.test.ts +80 -37
  174. package/src/models/flowModel.tsx +122 -36
  175. package/src/provider.tsx +41 -25
  176. package/src/reactive/__tests__/observer.test.tsx +82 -0
  177. package/src/reactive/observer.tsx +87 -25
  178. package/src/runjs-context/registry.ts +1 -1
  179. package/src/runjs-context/setup.ts +22 -12
  180. package/src/runjs-context/snippets/index.ts +12 -1
  181. package/src/runjs-context/snippets/scene/detail/set-field-style.snippet.ts +30 -0
  182. package/src/runjs-context/snippets/scene/table/set-cell-style.snippet.ts +34 -0
  183. package/src/scheduler/ModelOperationScheduler.ts +14 -3
  184. package/src/types.ts +62 -0
  185. package/src/utils/__tests__/createCollectionContextMeta.test.ts +48 -0
  186. package/src/utils/__tests__/parsePathnameToViewParams.test.ts +28 -0
  187. package/src/utils/__tests__/runjsValue.test.ts +11 -0
  188. package/src/utils/__tests__/utils.test.ts +62 -0
  189. package/src/utils/createCollectionContextMeta.ts +6 -2
  190. package/src/utils/index.ts +5 -1
  191. package/src/utils/parsePathnameToViewParams.ts +47 -7
  192. package/src/utils/randomId.ts +48 -0
  193. package/src/utils/runjsTemplateCompat.ts +1 -1
  194. package/src/utils/runjsValue.ts +50 -11
  195. package/src/utils/schema-utils.ts +30 -1
  196. package/src/views/FlowView.tsx +22 -2
  197. package/src/views/PageComponent.tsx +7 -4
  198. package/src/views/ViewNavigation.ts +46 -9
  199. package/src/views/__tests__/FlowView.usePage.test.tsx +243 -3
  200. package/src/views/__tests__/ViewNavigation.test.ts +52 -0
  201. package/src/views/__tests__/inheritLayoutContext.test.ts +53 -0
  202. package/src/views/__tests__/runViewBeforeClose.test.ts +30 -0
  203. package/src/views/__tests__/useDialog.closeDestroy.test.tsx +13 -12
  204. package/src/views/createViewMeta.ts +106 -34
  205. package/src/views/inheritLayoutContext.ts +26 -0
  206. package/src/views/runViewBeforeClose.ts +19 -0
  207. package/src/views/useDialog.tsx +27 -3
  208. package/src/views/useDrawer.tsx +27 -3
  209. package/src/views/usePage.tsx +367 -179
@@ -54,9 +54,107 @@ var import_viewEvents = require("./viewEvents");
54
54
  var import_provider = require("../provider");
55
55
  var import_ViewScopedFlowEngine = require("../ViewScopedFlowEngine");
56
56
  var import_variablesParams = require("../utils/variablesParams");
57
+ var import_runViewBeforeClose = require("./runViewBeforeClose");
58
+ var import_inheritLayoutContext = require("./inheritLayoutContext");
57
59
  let uuid = 0;
58
60
  const GLOBAL_EMBED_CONTAINER_ID = "nocobase-embed-container";
59
61
  const EMBED_REPLACING_DATA_KEY = "nocobaseEmbedReplacing";
62
+ function isPromiseLike(value) {
63
+ return !!value && typeof value.then === "function";
64
+ }
65
+ __name(isPromiseLike, "isPromiseLike");
66
+ function closeReplacingGlobalEmbed(target, activeView) {
67
+ target.dataset[EMBED_REPLACING_DATA_KEY] = "1";
68
+ try {
69
+ const closeResult = activeView.close();
70
+ if (isPromiseLike(closeResult)) {
71
+ return Promise.resolve(closeResult).finally(() => {
72
+ delete target.dataset[EMBED_REPLACING_DATA_KEY];
73
+ });
74
+ }
75
+ delete target.dataset[EMBED_REPLACING_DATA_KEY];
76
+ return closeResult;
77
+ } catch (error) {
78
+ delete target.dataset[EMBED_REPLACING_DATA_KEY];
79
+ throw error;
80
+ }
81
+ }
82
+ __name(closeReplacingGlobalEmbed, "closeReplacingGlobalEmbed");
83
+ function createPendingGlobalEmbedView(openedPromise, inputArgs, preventClose) {
84
+ let openedPage;
85
+ const pendingActions = {};
86
+ const readyPromise = openedPromise.then(({ page }) => {
87
+ openedPage = page;
88
+ if (openedPage) {
89
+ if ("beforeClose" in pendingActions) {
90
+ openedPage.beforeClose = pendingActions.beforeClose;
91
+ }
92
+ if ("update" in pendingActions) {
93
+ openedPage.update(pendingActions.update);
94
+ }
95
+ if ("footer" in pendingActions) {
96
+ openedPage.setFooter(pendingActions.footer);
97
+ }
98
+ if ("header" in pendingActions) {
99
+ openedPage.setHeader(pendingActions.header);
100
+ }
101
+ if (pendingActions.destroyed) {
102
+ openedPage.destroy(pendingActions.destroyed.result);
103
+ }
104
+ }
105
+ return { page };
106
+ });
107
+ return Object.assign(
108
+ readyPromise.then(({ page }) => page ? page : false),
109
+ {
110
+ type: "embed",
111
+ inputArgs,
112
+ preventClose,
113
+ Header: null,
114
+ Footer: null,
115
+ get beforeClose() {
116
+ return (openedPage == null ? void 0 : openedPage.beforeClose) ?? pendingActions.beforeClose;
117
+ },
118
+ set beforeClose(value) {
119
+ if (openedPage) {
120
+ openedPage.beforeClose = value;
121
+ } else {
122
+ pendingActions.beforeClose = value;
123
+ }
124
+ },
125
+ close: /* @__PURE__ */ __name((result, force) => readyPromise.then(({ page }) => page ? page.close(result, force) : false), "close"),
126
+ destroy: /* @__PURE__ */ __name((result) => {
127
+ if (openedPage) {
128
+ openedPage.destroy(result);
129
+ } else {
130
+ pendingActions.destroyed = { result };
131
+ }
132
+ }, "destroy"),
133
+ update: /* @__PURE__ */ __name((newConfig) => {
134
+ if (openedPage) {
135
+ openedPage.update(newConfig);
136
+ } else {
137
+ pendingActions.update = { ...pendingActions.update, ...newConfig };
138
+ }
139
+ }, "update"),
140
+ setFooter: /* @__PURE__ */ __name((footer) => {
141
+ if (openedPage) {
142
+ openedPage.setFooter(footer);
143
+ } else {
144
+ pendingActions.footer = footer;
145
+ }
146
+ }, "setFooter"),
147
+ setHeader: /* @__PURE__ */ __name((header) => {
148
+ if (openedPage) {
149
+ openedPage.setHeader(header);
150
+ } else {
151
+ pendingActions.header = header;
152
+ }
153
+ }, "setHeader")
154
+ }
155
+ );
156
+ }
157
+ __name(createPendingGlobalEmbedView, "createPendingGlobalEmbedView");
60
158
  const PageElementsHolder = import_react.default.memo(
61
159
  import_react.default.forwardRef((props, ref) => {
62
160
  const [elements, patchElement] = (0, import_usePatchElement.default)();
@@ -67,168 +165,230 @@ const PageElementsHolder = import_react.default.memo(
67
165
  function usePage() {
68
166
  const holderRef = import_react.default.useRef(null);
69
167
  const globalEmbedActiveRef = import_react.default.useRef(null);
168
+ const globalEmbedReplacementTokenRef = import_react.default.useRef(0);
70
169
  const open = /* @__PURE__ */ __name((config, flowContext) => {
71
- var _a, _b, _c;
72
- const parentEngine = flowContext == null ? void 0 : flowContext.engine;
73
- uuid += 1;
74
- const pageRef = import_react.default.createRef();
75
- let closeFunc;
76
- let resolvePromise;
77
- const promise = new Promise((resolve) => {
78
- resolvePromise = resolve;
79
- });
80
- const FooterComponent = /* @__PURE__ */ __name(({ children }) => {
81
- import_react.default.useEffect(() => {
82
- var _a2;
83
- (_a2 = pageRef.current) == null ? void 0 : _a2.setFooter(children);
84
- return () => {
85
- var _a3;
86
- (_a3 = pageRef.current) == null ? void 0 : _a3.setFooter(null);
87
- };
88
- }, [children]);
89
- return null;
90
- }, "FooterComponent");
91
- const HeaderComponent = /* @__PURE__ */ __name((props) => {
92
- import_react.default.useEffect(() => {
93
- var _a2;
94
- (_a2 = pageRef.current) == null ? void 0 : _a2.setHeader(props);
95
- return () => {
96
- var _a3;
97
- (_a3 = pageRef.current) == null ? void 0 : _a3.setHeader(null);
98
- };
99
- }, [props]);
100
- return null;
101
- }, "HeaderComponent");
102
170
  const {
103
171
  target,
104
172
  content,
105
173
  preventClose,
106
174
  inheritContext = true,
107
175
  inputArgs: viewInputArgs = {},
176
+ onOpenCancelled,
108
177
  ...restConfig
109
178
  } = config;
110
179
  const isGlobalEmbedContainer = target instanceof HTMLElement && target.id === GLOBAL_EMBED_CONTAINER_ID;
111
- if (isGlobalEmbedContainer && globalEmbedActiveRef.current) {
112
- try {
113
- target.dataset[EMBED_REPLACING_DATA_KEY] = "1";
114
- globalEmbedActiveRef.current.destroy();
115
- } finally {
116
- delete target.dataset[EMBED_REPLACING_DATA_KEY];
117
- globalEmbedActiveRef.current = null;
180
+ const openCurrentPage = /* @__PURE__ */ __name(() => {
181
+ var _a, _b, _c;
182
+ const parentEngine = flowContext == null ? void 0 : flowContext.engine;
183
+ uuid += 1;
184
+ const pageRef = import_react.default.createRef();
185
+ let closeFunc;
186
+ let resolvePromise;
187
+ const promise = new Promise((resolve) => {
188
+ resolvePromise = resolve;
189
+ });
190
+ const FooterComponent = /* @__PURE__ */ __name(({ children }) => {
191
+ import_react.default.useEffect(() => {
192
+ var _a2;
193
+ (_a2 = pageRef.current) == null ? void 0 : _a2.setFooter(children);
194
+ return () => {
195
+ var _a3;
196
+ (_a3 = pageRef.current) == null ? void 0 : _a3.setFooter(null);
197
+ };
198
+ }, [children]);
199
+ return null;
200
+ }, "FooterComponent");
201
+ const HeaderComponent = /* @__PURE__ */ __name((props) => {
202
+ import_react.default.useEffect(() => {
203
+ var _a2;
204
+ (_a2 = pageRef.current) == null ? void 0 : _a2.setHeader(props);
205
+ return () => {
206
+ var _a3;
207
+ (_a3 = pageRef.current) == null ? void 0 : _a3.setHeader(null);
208
+ };
209
+ }, [props]);
210
+ return null;
211
+ }, "HeaderComponent");
212
+ const ctx = new import_flowContext.FlowContext();
213
+ const scopedEngine = (0, import_ViewScopedFlowEngine.createViewScopedEngine)(flowContext.engine);
214
+ const openerEngine = (0, import_viewEvents.resolveOpenerEngine)(parentEngine, scopedEngine);
215
+ ctx.defineProperty("engine", { value: scopedEngine });
216
+ ctx.addDelegate(scopedEngine.context);
217
+ if (inheritContext) {
218
+ ctx.addDelegate(flowContext);
219
+ } else {
220
+ ctx.addDelegate(flowContext.engine.context);
221
+ (0, import_inheritLayoutContext.inheritLayoutContextForDetachedView)(ctx, flowContext);
118
222
  }
119
- }
120
- const ctx = new import_flowContext.FlowContext();
121
- const scopedEngine = (0, import_ViewScopedFlowEngine.createViewScopedEngine)(flowContext.engine);
122
- const openerEngine = (0, import_viewEvents.resolveOpenerEngine)(parentEngine, scopedEngine);
123
- ctx.defineProperty("engine", { value: scopedEngine });
124
- ctx.addDelegate(scopedEngine.context);
125
- if (inheritContext) {
126
- ctx.addDelegate(flowContext);
127
- } else {
128
- ctx.addDelegate(flowContext.engine.context);
129
- }
130
- const currentPage = {
131
- type: "embed",
132
- inputArgs: viewInputArgs,
133
- preventClose: !!config.preventClose,
134
- destroy: /* @__PURE__ */ __name((result) => {
135
- var _a2, _b2, _c2, _d, _e;
136
- (_a2 = config.onClose) == null ? void 0 : _a2.call(config);
137
- resolvePromise == null ? void 0 : resolvePromise(result);
138
- (_b2 = pageRef.current) == null ? void 0 : _b2.destroy();
139
- closeFunc == null ? void 0 : closeFunc();
140
- if (isGlobalEmbedContainer) {
141
- globalEmbedActiveRef.current = null;
142
- }
143
- const isReplacing = isGlobalEmbedContainer && target instanceof HTMLElement && ((_c2 = target.dataset) == null ? void 0 : _c2[EMBED_REPLACING_DATA_KEY]) === "1";
144
- if (!isReplacing) {
145
- const openerEmitter = openerEngine == null ? void 0 : openerEngine.emitter;
146
- (0, import_viewEvents.bumpViewActivatedVersion)(openerEmitter);
147
- (_e = openerEmitter == null ? void 0 : openerEmitter.emit) == null ? void 0 : _e.call(openerEmitter, import_viewEvents.VIEW_ACTIVATED_EVENT, { type: "embed", viewUid: (_d = currentPage == null ? void 0 : currentPage.inputArgs) == null ? void 0 : _d.viewUid });
148
- }
149
- scopedEngine.unlinkFromStack();
150
- }, "destroy"),
151
- update: /* @__PURE__ */ __name((newConfig) => {
152
- var _a2;
153
- return (_a2 = pageRef.current) == null ? void 0 : _a2.update(newConfig);
154
- }, "update"),
155
- close: /* @__PURE__ */ __name((result, force) => {
156
- var _a2, _b2;
157
- if (preventClose && !force) {
158
- return;
223
+ let destroyed = false;
224
+ let closingPromise;
225
+ const currentPage = {
226
+ type: "embed",
227
+ inputArgs: viewInputArgs,
228
+ preventClose: !!config.preventClose,
229
+ beforeClose: void 0,
230
+ destroy: /* @__PURE__ */ __name((result) => {
231
+ var _a2, _b2, _c2, _d, _e;
232
+ if (destroyed) return;
233
+ destroyed = true;
234
+ (_a2 = config.onClose) == null ? void 0 : _a2.call(config);
235
+ resolvePromise == null ? void 0 : resolvePromise(result);
236
+ (_b2 = pageRef.current) == null ? void 0 : _b2.destroy();
237
+ closeFunc == null ? void 0 : closeFunc();
238
+ if (isGlobalEmbedContainer && globalEmbedActiveRef.current === currentPage) {
239
+ globalEmbedActiveRef.current = null;
240
+ }
241
+ const isReplacing = isGlobalEmbedContainer && target instanceof HTMLElement && ((_c2 = target.dataset) == null ? void 0 : _c2[EMBED_REPLACING_DATA_KEY]) === "1";
242
+ if (!isReplacing) {
243
+ const openerEmitter = openerEngine == null ? void 0 : openerEngine.emitter;
244
+ (0, import_viewEvents.bumpViewActivatedVersion)(openerEmitter);
245
+ (_e = openerEmitter == null ? void 0 : openerEmitter.emit) == null ? void 0 : _e.call(openerEmitter, import_viewEvents.VIEW_ACTIVATED_EVENT, { type: "embed", viewUid: (_d = currentPage == null ? void 0 : currentPage.inputArgs) == null ? void 0 : _d.viewUid });
246
+ }
247
+ scopedEngine.unlinkFromStack();
248
+ }, "destroy"),
249
+ update: /* @__PURE__ */ __name((newConfig) => {
250
+ var _a2;
251
+ return (_a2 = pageRef.current) == null ? void 0 : _a2.update(newConfig);
252
+ }, "update"),
253
+ close: /* @__PURE__ */ __name((result, force) => {
254
+ if (destroyed) {
255
+ return Promise.resolve(true);
256
+ }
257
+ if (closingPromise) {
258
+ return closingPromise;
259
+ }
260
+ closingPromise = (async () => {
261
+ var _a2, _b2;
262
+ try {
263
+ if (preventClose && !force) {
264
+ closingPromise = void 0;
265
+ return false;
266
+ }
267
+ const shouldClose = await (0, import_runViewBeforeClose.runViewBeforeClose)(currentPage, { result, force });
268
+ if (destroyed) {
269
+ return true;
270
+ }
271
+ if (!shouldClose) {
272
+ closingPromise = void 0;
273
+ return false;
274
+ }
275
+ if (config.triggerByRouter && ((_b2 = (_a2 = config.inputArgs) == null ? void 0 : _a2.navigation) == null ? void 0 : _b2.back)) {
276
+ config.inputArgs.navigation.back();
277
+ return true;
278
+ }
279
+ currentPage.destroy(result);
280
+ return true;
281
+ } catch (error) {
282
+ if (!destroyed) {
283
+ closingPromise = void 0;
284
+ }
285
+ throw error;
286
+ }
287
+ })();
288
+ return closingPromise;
289
+ }, "close"),
290
+ Header: HeaderComponent,
291
+ Footer: FooterComponent,
292
+ setFooter: /* @__PURE__ */ __name((footer) => {
293
+ var _a2;
294
+ (_a2 = pageRef.current) == null ? void 0 : _a2.setFooter(footer);
295
+ }, "setFooter"),
296
+ setHeader: /* @__PURE__ */ __name((header) => {
297
+ var _a2;
298
+ (_a2 = pageRef.current) == null ? void 0 : _a2.setHeader(header);
299
+ }, "setHeader"),
300
+ navigation: (_a = config.inputArgs) == null ? void 0 : _a.navigation,
301
+ get record() {
302
+ return (0, import_variablesParams.getViewRecordFromParent)(flowContext, ctx);
159
303
  }
160
- if (config.triggerByRouter && ((_b2 = (_a2 = config.inputArgs) == null ? void 0 : _a2.navigation) == null ? void 0 : _b2.back)) {
161
- config.inputArgs.navigation.back();
162
- return;
304
+ };
305
+ ctx.defineProperty("view", {
306
+ get: /* @__PURE__ */ __name(() => currentPage, "get"),
307
+ // 仅当访问关联字段或前端无本地记录数据时,才交给服务端解析
308
+ resolveOnServer: (0, import_variablesParams.createViewRecordResolveOnServer)(ctx, () => (0, import_variablesParams.getViewRecordFromParent)(flowContext, ctx))
309
+ });
310
+ (0, import_createViewMeta.registerPopupVariable)(ctx, currentPage);
311
+ const PageWithContext = (0, import__.observer)(
312
+ () => {
313
+ var _a2, _b2, _c2, _d;
314
+ const mountedRef = import_react.default.useRef(false);
315
+ const pageContent = import_react.default.useMemo(
316
+ () => typeof content === "function" ? content(currentPage, ctx) : content,
317
+ []
318
+ );
319
+ void ctx.themeToken;
320
+ import_react.default.useEffect(() => {
321
+ var _a3;
322
+ (_a3 = config.onOpen) == null ? void 0 : _a3.call(config, currentPage, ctx);
323
+ }, []);
324
+ if (((_b2 = (_a2 = config.inputArgs) == null ? void 0 : _a2.hidden) == null ? void 0 : _b2.value) && !mountedRef.current) {
325
+ return null;
326
+ }
327
+ mountedRef.current = true;
328
+ return /* @__PURE__ */ import_react.default.createElement(
329
+ import_PageComponent.PageComponent,
330
+ {
331
+ ref: pageRef,
332
+ hidden: (_d = (_c2 = config.inputArgs) == null ? void 0 : _c2.hidden) == null ? void 0 : _d.value,
333
+ ...restConfig,
334
+ onClose: () => {
335
+ return currentPage.close(config.result);
336
+ }
337
+ },
338
+ pageContent
339
+ );
340
+ },
341
+ {
342
+ displayName: "PageWithContext"
163
343
  }
164
- currentPage.destroy(result);
165
- }, "close"),
166
- Header: HeaderComponent,
167
- Footer: FooterComponent,
168
- setFooter: /* @__PURE__ */ __name((footer) => {
169
- var _a2;
170
- (_a2 = pageRef.current) == null ? void 0 : _a2.setFooter(footer);
171
- }, "setFooter"),
172
- setHeader: /* @__PURE__ */ __name((header) => {
173
- var _a2;
174
- (_a2 = pageRef.current) == null ? void 0 : _a2.setHeader(header);
175
- }, "setHeader"),
176
- navigation: (_a = config.inputArgs) == null ? void 0 : _a.navigation,
177
- get record() {
178
- return (0, import_variablesParams.getViewRecordFromParent)(flowContext, ctx);
344
+ );
345
+ const key = (viewInputArgs == null ? void 0 : viewInputArgs.viewUid) || `page-${uuid}`;
346
+ const page = /* @__PURE__ */ import_react.default.createElement(import_provider.FlowEngineProvider, { key, engine: scopedEngine }, /* @__PURE__ */ import_react.default.createElement(import_FlowContextProvider.FlowViewContextProvider, { context: ctx }, /* @__PURE__ */ import_react.default.createElement(PageWithContext, null)));
347
+ if (target && target instanceof HTMLElement) {
348
+ closeFunc = (_b = holderRef.current) == null ? void 0 : _b.patchElement(import_react_dom.default.createPortal(page, target, key));
349
+ } else {
350
+ closeFunc = (_c = holderRef.current) == null ? void 0 : _c.patchElement(page);
179
351
  }
180
- };
181
- ctx.defineProperty("view", {
182
- get: /* @__PURE__ */ __name(() => currentPage, "get"),
183
- // 仅当访问关联字段或前端无本地记录数据时,才交给服务端解析
184
- resolveOnServer: (0, import_variablesParams.createViewRecordResolveOnServer)(ctx, () => (0, import_variablesParams.getViewRecordFromParent)(flowContext, ctx))
185
- });
186
- (0, import_createViewMeta.registerPopupVariable)(ctx, currentPage);
187
- const PageWithContext = (0, import__.observer)(
188
- () => {
189
- var _a2, _b2, _c2, _d;
190
- const mountedRef = import_react.default.useRef(false);
191
- const pageContent = import_react.default.useMemo(
192
- () => typeof content === "function" ? content(currentPage, ctx) : content,
193
- []
194
- );
195
- void ctx.themeToken;
196
- import_react.default.useEffect(() => {
197
- var _a3;
198
- (_a3 = config.onOpen) == null ? void 0 : _a3.call(config, currentPage, ctx);
199
- }, []);
200
- if (((_b2 = (_a2 = config.inputArgs) == null ? void 0 : _a2.hidden) == null ? void 0 : _b2.value) && !mountedRef.current) {
201
- return null;
202
- }
203
- mountedRef.current = true;
204
- return /* @__PURE__ */ import_react.default.createElement(
205
- import_PageComponent.PageComponent,
206
- {
207
- ref: pageRef,
208
- hidden: (_d = (_c2 = config.inputArgs) == null ? void 0 : _c2.hidden) == null ? void 0 : _d.value,
209
- ...restConfig,
210
- onClose: () => {
211
- currentPage.close(config.result);
352
+ if (isGlobalEmbedContainer) {
353
+ globalEmbedActiveRef.current = currentPage;
354
+ }
355
+ return Object.assign(promise, currentPage);
356
+ }, "openCurrentPage");
357
+ if (isGlobalEmbedContainer && globalEmbedActiveRef.current) {
358
+ const replacementToken = globalEmbedReplacementTokenRef.current += 1;
359
+ const cancelOpen = /* @__PURE__ */ __name(() => onOpenCancelled == null ? void 0 : onOpenCancelled(), "cancelOpen");
360
+ let closeResult;
361
+ try {
362
+ closeResult = closeReplacingGlobalEmbed(target, globalEmbedActiveRef.current);
363
+ } catch (error) {
364
+ cancelOpen();
365
+ throw error;
366
+ }
367
+ if (isPromiseLike(closeResult)) {
368
+ return createPendingGlobalEmbedView(
369
+ Promise.resolve(closeResult).then(
370
+ (closed) => {
371
+ if (closed === false || replacementToken !== globalEmbedReplacementTokenRef.current) {
372
+ cancelOpen();
373
+ return { page: null };
374
+ }
375
+ return { page: openCurrentPage() };
376
+ },
377
+ (error) => {
378
+ cancelOpen();
379
+ throw error;
212
380
  }
213
- },
214
- pageContent
381
+ ),
382
+ viewInputArgs,
383
+ !!config.preventClose
215
384
  );
216
- },
217
- {
218
- displayName: "PageWithContext"
219
385
  }
220
- );
221
- const key = (viewInputArgs == null ? void 0 : viewInputArgs.viewUid) || `page-${uuid}`;
222
- const page = /* @__PURE__ */ import_react.default.createElement(import_provider.FlowEngineProvider, { key, engine: scopedEngine }, /* @__PURE__ */ import_react.default.createElement(import_FlowContextProvider.FlowViewContextProvider, { context: ctx }, /* @__PURE__ */ import_react.default.createElement(PageWithContext, null)));
223
- if (target && target instanceof HTMLElement) {
224
- closeFunc = (_b = holderRef.current) == null ? void 0 : _b.patchElement(import_react_dom.default.createPortal(page, target, key));
225
- } else {
226
- closeFunc = (_c = holderRef.current) == null ? void 0 : _c.patchElement(page);
227
- }
228
- if (isGlobalEmbedContainer) {
229
- globalEmbedActiveRef.current = { destroy: currentPage.destroy };
386
+ if (closeResult === false) {
387
+ cancelOpen();
388
+ return createPendingGlobalEmbedView(Promise.resolve({ page: null }), viewInputArgs, !!config.preventClose);
389
+ }
230
390
  }
231
- return Object.assign(promise, currentPage);
391
+ return openCurrentPage();
232
392
  }, "open");
233
393
  const api = import_react.default.useMemo(() => ({ open }), []);
234
394
  return [api, /* @__PURE__ */ import_react.default.createElement(PageElementsHolder, { key: "page-holder", ref: holderRef })];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nocobase/flow-engine",
3
- "version": "2.1.0-alpha.4",
3
+ "version": "2.1.0-alpha.45",
4
4
  "private": false,
5
5
  "description": "A standalone flow engine for NocoBase, managing workflows, models, and actions.",
6
6
  "main": "lib/index.js",
@@ -8,9 +8,10 @@
8
8
  "dependencies": {
9
9
  "@formily/antd-v5": "1.x",
10
10
  "@formily/reactive": "2.x",
11
- "@nocobase/sdk": "2.1.0-alpha.4",
12
- "@nocobase/shared": "2.1.0-alpha.4",
11
+ "@nocobase/sdk": "2.1.0-alpha.45",
12
+ "@nocobase/shared": "2.1.0-alpha.45",
13
13
  "ahooks": "^3.7.2",
14
+ "axios": "^1.7.0",
14
15
  "dayjs": "^1.11.9",
15
16
  "dompurify": "^3.0.2",
16
17
  "lodash": "^4.x",
@@ -35,6 +36,6 @@
35
36
  "workflow"
36
37
  ],
37
38
  "author": "NocoBase Team",
38
- "license": "AGPL-3.0",
39
- "gitHead": "32c682485e5f1878b9165be2e9de18000d98f935"
39
+ "license": "Apache-2.0",
40
+ "gitHead": "e9e24987e12d0ad10a5db8815b1e1b7b447f1938"
40
41
  }
@@ -9,7 +9,7 @@
9
9
 
10
10
  import React, { createContext, useContext } from 'react';
11
11
  import { FlowContext, FlowEngineContext } from './flowContext';
12
- import { FlowView } from './views/FlowView';
12
+ import { FlowView, FlowViewer } from './views/FlowView';
13
13
 
14
14
  export const FlowReactContext = createContext<FlowContext>(null);
15
15
  export const FlowViewContext = createContext<FlowContext>(null);
@@ -40,3 +40,11 @@ export function useFlowView() {
40
40
  const ctx = useFlowContext();
41
41
  return ctx.view as FlowView;
42
42
  }
43
+
44
+ /**
45
+ * Access the `FlowViewer` that opens new drawers / modals / pages (`viewer.drawer({...})`, `viewer.modal({...})`, etc.). This is the counterpart to `useFlowView()`: `useFlowView()` returns the *current* mounted view (use it to close yourself, render Header/Footer slots, etc.), while `useFlowViewer()` returns the surface that lets you open a *new* view from inside any flow-context subtree.
46
+ */
47
+ export function useFlowViewer() {
48
+ const ctx = useFlowContext();
49
+ return ctx.viewer as FlowViewer;
50
+ }
package/src/JSRunner.ts CHANGED
@@ -16,12 +16,74 @@ export interface JSRunnerOptions {
16
16
  version?: string;
17
17
  /**
18
18
  * Enable RunJS template compatibility preprocessing for `{{ ... }}`.
19
- * When enabled via `ctx.runjs(code, vars, { preprocessTemplates: true })` (default),
19
+ * When enabled (or falling back to version default),
20
20
  * the code will be rewritten to call `ctx.resolveJsonTemplate(...)` at runtime.
21
21
  */
22
22
  preprocessTemplates?: boolean;
23
23
  }
24
24
 
25
+ /**
26
+ * Decide whether RunJS `{{ ... }}` compatibility preprocessing should run.
27
+ *
28
+ * Priority:
29
+ * 1. Explicit `preprocessTemplates` option always wins.
30
+ * 2. Otherwise, `version === 'v2'` disables preprocessing.
31
+ * 3. Fallback keeps v1-compatible behavior (enabled).
32
+ */
33
+ export function shouldPreprocessRunJSTemplates(
34
+ options?: Pick<JSRunnerOptions, 'preprocessTemplates' | 'version'>,
35
+ ): boolean {
36
+ if (typeof options?.preprocessTemplates === 'boolean') {
37
+ return options.preprocessTemplates;
38
+ }
39
+ return options?.version !== 'v2';
40
+ }
41
+
42
+ // Heuristic: detect likely bare `{{ctx.xxx}}` usage in executable positions (not quoted string literals).
43
+ const BARE_CTX_TEMPLATE_RE = /(^|[=(:,[\s)])(\{\{\s*(ctx(?:\.|\[|\?\.)[^}]*)\s*\}\})/m;
44
+
45
+ function extractDeprecatedCtxTemplateUsage(code: string): { placeholder: string; expression: string } | null {
46
+ const src = String(code || '');
47
+ const m = src.match(BARE_CTX_TEMPLATE_RE);
48
+ if (!m) return null;
49
+ const placeholder = String(m[2] || '').trim();
50
+ const expression = String(m[3] || '').trim();
51
+ if (!placeholder || !expression) return null;
52
+ return { placeholder, expression };
53
+ }
54
+
55
+ function shouldHintCtxTemplateSyntax(err: any, usage: { placeholder: string; expression: string } | null): boolean {
56
+ const isSyntaxError = err instanceof SyntaxError || String((err as any)?.name || '') === 'SyntaxError';
57
+ if (!isSyntaxError) return false;
58
+ if (!usage) return false;
59
+ const msg = String((err as any)?.message || err || '');
60
+ return /unexpected token/i.test(msg);
61
+ }
62
+
63
+ function toCtxTemplateSyntaxHintError(
64
+ err: any,
65
+ usage: {
66
+ placeholder: string;
67
+ expression: string;
68
+ },
69
+ ): Error {
70
+ const hint = `"${usage.placeholder}" has been deprecated and cannot be used as executable RunJS syntax. Use await ctx.getVar("${usage.expression}") instead, or keep "${usage.placeholder}" as a plain string.`;
71
+ const out = new SyntaxError(hint);
72
+ try {
73
+ (out as any).cause = err;
74
+ } catch (_) {
75
+ // ignore
76
+ }
77
+ try {
78
+ // Hint-only error: avoid leaking internal bundle line numbers from stack parsers in preview UI.
79
+ (out as any).__runjsHideLocation = true;
80
+ out.stack = `${out.name}: ${out.message}`;
81
+ } catch (_) {
82
+ // ignore
83
+ }
84
+ return out;
85
+ }
86
+
25
87
  export class JSRunner {
26
88
  private globals: Record<string, any>;
27
89
  private timeoutMs: number;
@@ -118,11 +180,13 @@ export class JSRunner {
118
180
  if (err instanceof FlowExitAllException) {
119
181
  throw err;
120
182
  }
121
- console.error(err);
183
+ const usage = extractDeprecatedCtxTemplateUsage(code);
184
+ const outErr = shouldHintCtxTemplateSyntax(err, usage) && usage ? toCtxTemplateSyntaxHintError(err, usage) : err;
185
+ console.error(outErr);
122
186
  return {
123
187
  success: false,
124
- error: err,
125
- timeout: err.message === 'Execution timed out',
188
+ error: outErr,
189
+ timeout: (outErr as any)?.message === 'Execution timed out',
126
190
  };
127
191
  }
128
192
  }
@@ -62,6 +62,10 @@ export function createViewScopedEngine(parent: FlowEngine): FlowEngine {
62
62
  '_nextEngine',
63
63
  // getModel 需要在本地执行以确保全局查找时正确遍历整个引擎栈
64
64
  'getModel',
65
+ // 视图销毁回调需要在本地存储,每个视图引擎有自己的销毁逻辑
66
+ '_destroyView',
67
+ 'setDestroyView',
68
+ 'destroyView',
65
69
  ]);
66
70
 
67
71
  const handler: ProxyHandler<FlowEngine> = {