feat(): support setting track and lazy in context

easyops-cn · Oct 28, 2022 · c21ec6f · c21ec6f
1 parent c415244
commit c21ec6f
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 8 deletions.
diff --git a/bricks/next-builder/src/builder-container/DataView/ContextItemForm.spec.tsx b/bricks/next-builder/src/builder-container/DataView/ContextItemForm.spec.tsx
@@ -27,6 +27,7 @@ describe("ContextItemForm", () => {
       <Component
         data={{
           name: "data-a",
+          track: true,
           resolve: {
             useProvider: "provider-a",
             args: ["arg1"],
@@ -44,7 +45,7 @@ describe("ContextItemForm", () => {
         onContextItemUpdate={onContextItemUpdate}
       />
     );
-    expect(wrapper.find(Form.Item).length).toBe(10);
+    expect(wrapper.find(Form.Item).length).toBe(12);
 
     mockUseBuilderUIContext.mockReturnValue({
       providerList: ["provider-a", "provider-b"],
@@ -99,14 +100,14 @@ describe("ContextItemForm", () => {
         value: "value",
       },
     } as RadioChangeEvent);
-    expect(wrapper.find(Form.Item).length).toBe(5);
+    expect(wrapper.find(Form.Item).length).toBe(6);
     wrapper.setProps({
       data: {
         name: "data-b",
         value: "<% QUERY.objectId %>",
       },
     });
-    expect(wrapper.find(Form.Item).length).toBe(5);
+    expect(wrapper.find(Form.Item).length).toBe(6);
     expect(wrapper.find(Radio).children().length).toBe(3);
 
     wrapper.setProps({
@@ -118,6 +119,7 @@ describe("ContextItemForm", () => {
           args: "- arg1\n",
           if: "false\n",
           transform: "value: <% DATA %>\n",
+          lazy: true,
         },
       },
     });

diff --git a/bricks/next-builder/src/builder-container/DataView/ContextItemForm.tsx b/bricks/next-builder/src/builder-container/DataView/ContextItemForm.tsx
@@ -1,5 +1,5 @@
 import React, { useMemo, useState, useEffect } from "react";
-import { Input, Radio, Form, AutoComplete, FormItemProps } from "antd";
+import { Input, Radio, Form, AutoComplete, FormItemProps, Switch } from "antd";
 import {
   computeItemToSubmit,
   ContextItemFormValue,
@@ -225,8 +225,14 @@ export function ContextItemForm({
           >
             {getCodeEditorItem("value")}
           </Form.Item>
+          <Form.Item valuePropName="checked" {...getFormItemProps("lazy")}>
+            <Switch />
+          </Form.Item>
         </>
       )}
+      <Form.Item valuePropName="checked" {...getFormItemProps("track")}>
+        <Switch />
+      </Form.Item>
       <Form.Item {...getFormItemProps("if")}>
         {getCodeEditorItem("if")}
       </Form.Item>

diff --git a/bricks/next-builder/src/builder-container/DataView/DataView.tsx b/bricks/next-builder/src/builder-container/DataView/DataView.tsx
@@ -107,6 +107,7 @@ export function DataView({
       const formValue = {
         name: contextValue?.name,
         type: ContextType.VALUE,
+        track: contextValue?.track,
         ...safeDumpFields({
           value: contextValue?.value,
           if: contextValue?.if,
@@ -116,15 +117,16 @@ export function DataView({
       settingItemForm.setFieldsValue(formValue);
     } else {
       const formValue = {
-        name: contextValue?.name,
+        name: contextValue.name,
+        track: contextValue.track,
         ...((contextValue.resolve as SelectorProviderResolveConf).provider
           ? {
               type: ContextType.SELECTOR_RESOLVE,
               provider: (contextValue.resolve as SelectorProviderResolveConf)
                 .provider,
             }
           : (
-              contextValue?.resolve as UseProviderResolveConf
+              contextValue.resolve as UseProviderResolveConf
             ).useProvider?.includes("@")
           ? {
               type: ContextType.FLOW_API,
@@ -142,8 +144,9 @@ export function DataView({
           if: contextValue.if,
           resolveIf: contextValue.resolve.if,
           transform: contextValue.resolve.transform,
+          lazy: contextValue.resolve.lazy,
           onReject: contextValue.resolve.onReject,
-          onChange: contextValue?.onChange,
+          onChange: contextValue.onChange,
         }),
       };
       settingItemForm.setFieldsValue(formValue);

diff --git a/bricks/next-builder/src/builder-container/DataView/utils.spec.ts b/bricks/next-builder/src/builder-container/DataView/utils.spec.ts
@@ -72,9 +72,11 @@ describe("computeItemToSubmit", () => {
         value: "age: 18",
         name: "userInfo",
         onChange: 'target: "#id"\nproperties:\n  a: 1',
+        track: true,
       },
       {
         name: "userInfo",
+        track: true,
         value: {
           age: 18,
         },
@@ -99,6 +101,7 @@ describe("computeItemToSubmit", () => {
         name: "new",
         onChange: '- target: "#id"\n  properties:\n    a: 1',
         onReject: "transform:\n  value: <% DATA.message %>",
+        lazy: true,
       },
       {
         value: [],
@@ -108,6 +111,7 @@ describe("computeItemToSubmit", () => {
           useProvider: "provider-a",
           if: "<% QUERY.page > 0 %>",
           args: ["P-1"],
+          lazy: true,
           transform: {
             value: "<% DATA %>",
           },

diff --git a/bricks/next-builder/src/builder-container/DataView/utils.ts b/bricks/next-builder/src/builder-container/DataView/utils.ts
@@ -19,6 +19,7 @@ interface contextItemBaseConf {
   value?: string;
   if?: string;
   onChange?: string;
+  track?: boolean;
 }
 
 interface contextItemValueConf extends contextItemBaseConf {
@@ -29,6 +30,7 @@ interface contextResolveBaseConf extends contextItemBaseConf {
   resolveIf?: string;
   args?: string;
   transform?: string;
+  lazy?: boolean;
 }
 
 interface contextItemResolveConf extends contextResolveBaseConf {
@@ -139,6 +141,7 @@ export function computeItemToSubmit(
     }
     return {
       name: contextValue.name,
+      track: contextValue.track,
       ...computedFields,
     };
   } else {
@@ -177,10 +180,12 @@ export function computeItemToSubmit(
         args: computedFields.args,
         transform: computedFields.transform,
         onReject: computedFields.onReject,
+        lazy: contextValue.lazy,
       },
       value: computedFields.value,
       if: computedFields.if,
       onChange: computedFields.onChange,
+      track: contextValue.track,
     };
   }
 }

diff --git a/bricks/next-builder/src/data-providers/chunks/doLintStoryboard.ts b/bricks/next-builder/src/data-providers/chunks/doLintStoryboard.ts
@@ -29,8 +29,9 @@ export function doLintStoryboard(storyboard: Storyboard): StoryboardError[] {
   const warnedProviders = new Set<string>();
 
   const errors: StoryboardError[] = [];
-  const ast = parseStoryboard(storyboard);
   let usingScriptBrick = false;
+
+  const ast = parseStoryboard(storyboard);
   traverseStoryboard(ast, (node) => {
     switch (node.type) {
       case "Brick": {