@easy-editor/react-renderer 0.0.1 → 0.0.2-alpha.1

package/dist/esm/index.js

@@ -357,7 +357,7 @@ const parseData = (schema, self, options = {}) => {
     return parseExpression({
       str: schema,
       self,
-      thisRequired: options.thisRequiredInJSE,
+      thisRequired: true,
       logScope: options.logScope
     });
   }
@@ -1036,7 +1036,7 @@ const leafWrapper = (Comp, {
 /**
  * execute method in schema.lifeCycles with context
  */
-function executeLifeCycleMethod(context, schema, method, args, thisRequiredInJSE) {
+function executeLifeCycleMethod(context, schema, method, args) {
   if (!context || !isSchema(schema) || !method) {
     return;
   }
@@ -1048,7 +1048,7 @@ function executeLifeCycleMethod(context, schema, method, args, thisRequiredInJSE
 
   // TODO: cache
   if (isJSExpression(fn) || isJSFunction(fn)) {
-    fn = thisRequiredInJSE ? parseThisRequiredExpression(fn, context) : parseExpression(fn, context);
+    fn = parseExpression(fn, context, true);
   }
   if (typeof fn !== 'function') {
     logger.error(`生命周期${method}类型不符`, fn);
@@ -1114,7 +1114,6 @@ function baseRendererFactory() {
         return parseExpression({
           str,
           self,
-          thisRequired: props?.thisRequiredInJSE,
           logScope: props.componentName
         });
       };
@@ -1131,7 +1130,7 @@ function baseRendererFactory() {
     }
     __afterInit(props) {}
     static getDerivedStateFromProps(props, state) {
-      const result = executeLifeCycleMethod(this, props?.__schema, 'getDerivedStateFromProps', [props, state], props.thisRequiredInJSE);
+      const result = executeLifeCycleMethod(this, props?.__schema, 'getDerivedStateFromProps', [props, state]);
       return result === undefined ? null : result;
     }
     async getSnapshotBeforeUpdate(...args) {
@@ -1187,7 +1186,7 @@ function baseRendererFactory() {
      * execute method in schema.lifeCycles
      */
     __executeLifeCycleMethod = (method, args) => {
-      executeLifeCycleMethod(this, this.props.__schema, method, args, this.props.thisRequiredInJSE);
+      executeLifeCycleMethod(this, this.props.__schema, method, args);
     };
 
     /**
@@ -1243,11 +1242,9 @@ function baseRendererFactory() {
     __parseData = (data, ctx) => {
       const {
         __ctx,
-        thisRequiredInJSE,
         componentName
       } = this.props;
       return parseData(data, ctx || __ctx || this, {
-        thisRequiredInJSE,
         logScope: componentName
       });
     };
@@ -2017,8 +2014,7 @@ function rendererFactory() {
       suspended: false,
       schema: {},
       onCompGetRef: () => {},
-      onCompGetCtx: () => {},
-      thisRequiredInJSE: true
+      onCompGetCtx: () => {}
     };
     constructor(props) {
       super(props);