fix:组件特性动作中执行全局变量修改

hsm-lv · Nov 7, 2023 · 28b3376 · 28b3376
1 parent a9eafda
commit 28b3376
Showing 1 changed file with 13 additions and 17 deletions.
diff --git a/packages/amis-core/src/actions/CmptAction.ts b/packages/amis-core/src/actions/CmptAction.ts
@@ -36,6 +36,19 @@ export class CmptAction implements RendererAction {
      */
     const key = action.componentId || action.componentName;
     const dataMergeMode = action.dataMergeMode || 'merge';
+    const path = action.args?.path;
+
+    /** 如果args中携带path参数, 则认为是全局变量赋值, 否则认为是组件变量赋值 */
+    if (action.actionType === 'setValue' && path && typeof path === 'string') {
+      const beforeSetData = renderer?.props?.env?.beforeSetData;
+      if (beforeSetData && typeof beforeSetData === 'function') {
+        const res = await beforeSetData(renderer, action, event);
+
+        if (res === false) {
+          return;
+        }
+      }
+    }
 
     if (!key) {
       console.warn('请提供目标组件的componentId或componentName');
@@ -59,23 +72,6 @@ export class CmptAction implements RendererAction {
     }
 
     if (action.actionType === 'setValue') {
-      const beforeSetData = renderer?.props?.env?.beforeSetData;
-      const path = action.args?.path;
-
-      /** 如果args中携带path参数, 则认为是全局变量赋值, 否则认为是组件变量赋值 */
-      if (
-        path &&
-        typeof path === 'string' &&
-        beforeSetData &&
-        typeof beforeSetData === 'function'
-      ) {
-        const res = await beforeSetData(renderer, action, event);
-
-        if (res === false) {
-          return;
-        }
-      }
-
       if (component?.setData) {
         return component?.setData(
           action.args?.value,