fix: fix the unit test failure problem caused by thisRequiredInJSE modification

liujuping · liujuping · commit c2c59b7ff72b · 2022-06-24T16:03:11.000+08:00
diff --git a/packages/renderer-core/src/hoc/leaf.tsx b/packages/renderer-core/src/hoc/leaf.tsx
@@ -226,7 +226,7 @@ export function leafWrapper(Comp: types.IBaseRenderComponent, {
         nodeChildren: null,
         childrenInState: false,
         visible: !hidden,
-        condition: __parseData(condition, scope),
+        condition: __parseData?.(condition, scope),
         nodeCacheProps: {},
         nodeProps: {},
       };
@@ -396,7 +396,7 @@ export function leafWrapper(Comp: types.IBaseRenderComponent, {
 
         if (key === '___condition___') {
           const { condition = true } = this.leaf?.export(TransformStage.Render) || {};
-          const conditionValue = __parseData(condition, scope);
+          const conditionValue = __parseData?.(condition, scope);
           __debug(`key is ___condition___, change condition value to [${condition}]`);
           // 条件表达式改变
           this.setState({
diff --git a/packages/renderer-core/src/utils/common.ts b/packages/renderer-core/src/utils/common.ts
@@ -330,7 +330,11 @@ export function forEach(targetObj: any, fn: any, context?: any) {
   Object.keys(targetObj).forEach((key) => fn.call(context, targetObj[key], key));
 }
 
-export function parseData(schema: unknown, self: any, options: any): any {
+interface IParseOptions {
+  thisRequiredInJSE?: boolean;
+}
+
+export function parseData(schema: unknown, self: any, options: IParseOptions = {}): any {
   if (isJSExpression(schema)) {
     return parseExpression(schema, self, options.thisRequiredInJSE);
   } else if (isI18nData(schema)) {
diff --git a/packages/renderer-core/tests/hoc/leaf.test.tsx b/packages/renderer-core/tests/hoc/leaf.test.tsx
@@ -5,6 +5,7 @@ import '../utils/react-env-init';
 import { leafWrapper } from '../../src/hoc/leaf';
 import components from '../utils/components';
 import Node from '../utils/node';
+import { parseData } from '../../src/utils';
 
 let rerenderCount = 0;
 
@@ -37,6 +38,9 @@ const baseRenderer: any = {
       }
     },
     documentId: '01'
+  },
+  __parseData (data, scope) {
+    return parseData(data, scope, {});
   }
 }
 
diff --git a/packages/renderer-core/tests/renderer/renderer.test.tsx b/packages/renderer-core/tests/renderer/renderer.test.tsx
@@ -329,7 +329,7 @@ describe('JSExpression', () => {
                   ],
                   loop: {
                     type: "JSExpression",
-                    value: "state.content"
+                    value: "this.state.content"
                   },
                   loopArgs: [
                       "item",

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import '../utils/react-env-init';`
`5`	`5`	`import { leafWrapper } from '../../src/hoc/leaf';`
`6`	`6`	`import components from '../utils/components';`
`7`	`7`	`import Node from '../utils/node';`
	`8`	`+import { parseData } from '../../src/utils';`
`8`	`9`
`9`	`10`	`let rerenderCount = 0;`
`10`	`11`
`@@ -37,6 +38,9 @@ const baseRenderer: any = {`
`37`	`38`	`}`
`38`	`39`	`},`
`39`	`40`	`documentId: '01'`
	`41`	`+ },`
	`42`	`+ __parseData (data, scope) {`
	`43`	`+ return parseData(data, scope, {});`
`40`	`44`	`}`
`41`	`45`	`}`
`42`	`46`