chore: Merge branch 'master' into feat_gisdk

antvis · Aug 5, 2024 · 4542987 · 4542987
2 parents 2d8012c + 615d3f6
commit 4542987
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/packages/gi-sdk-app/src/index.tsx b/packages/gi-sdk-app/src/index.tsx
@@ -43,7 +43,7 @@ export interface StudioProps {
   service: (id: string) => Promise<{ data: Project }>;
   loadingText?: string;
   loadingComponent?: React.ReactElement;
-  GISDKExtraParams?: Record<string, any>;
+  extraParams?: Record<string, any>;
   componentExtraParams?: Record<string, any>;
 }
 
@@ -54,8 +54,8 @@ const Studio: React.FunctionComponent<StudioProps> = props => {
     service,
     loadingText = '正在加载图应用...',
     loadingComponent,
-    GISDKExtraParams = {},
-    componentExtraParams = {},
+    extraParams,
+    componentExtraParams,
   } = props;
   const [state, setState] = React.useState({
     isReady: false,
@@ -64,8 +64,8 @@ const Studio: React.FunctionComponent<StudioProps> = props => {
     services: [],
     ThemeComponent: () => null,
     GISDK: () => <></>,
-    GISDKExtraParams: {},
-    componentExtraParams: {},
+    extraParams: undefined,
+    componentExtraParams: undefined,
   });
 
   const startStudio = async () => {
@@ -145,7 +145,7 @@ const Studio: React.FunctionComponent<StudioProps> = props => {
         assets={assets}
         services={services}
         id={`GI_STUDIO_${id}`}
-        GISDKExtraParams={GISDKExtraParams}
+        extraParams={extraParams}
         componentExtraParams={componentExtraParams}
       />
     </>

diff --git a/packages/gi-sdk/src/GISDK.tsx b/packages/gi-sdk/src/GISDK.tsx
@@ -20,7 +20,7 @@ let updateHistoryTimer: number;
 const GISDK = (props: Props) => {
   const graphinRef = React.useRef<null | Graphin>(null);
   // @ts-ignore
-  const { children, assets, id, services, config, locales, componentExtraParams = {}, GISDKExtraParams = {} } = props;
+  const { children, assets, id, services, config, locales, componentExtraParams, extraParams } = props;
   const { language = 'zh-CN', ...localeMessages } = locales || {};
   const GISDK_ID = React.useMemo(() => {
     if (!id) {
@@ -62,7 +62,7 @@ const GISDK = (props: Props) => {
     },
     //@ts-ignore
     GISDK_ID,
-    extraParams: {},
+    extraParams: undefined,
   });
 
   React.useEffect(() => {
@@ -74,9 +74,9 @@ const GISDK = (props: Props) => {
   // 更新参数
   React.useEffect(() => {
     updateState(draft => {
-      draft.extraParams = GISDKExtraParams;
+      draft.extraParams = extraParams;
     });
-  }, [GISDKExtraParams]);
+  }, [extraParams]);
 
   const {
     layout: layoutCfg,

diff --git a/packages/gi-sdk/src/typing.ts b/packages/gi-sdk/src/typing.ts
@@ -74,7 +74,7 @@ export interface State<
   /** 是否使用缓存的布局 */
   layoutCache: boolean;
   /** 额外参数 */
-  extraParams: Record<string, any>;
+  extraParams?: Record<string, any>;
 }
 
 export interface Props {
@@ -105,7 +105,7 @@ export interface Props {
   className?: string;
   children?: React.ReactChildren | JSX.Element | JSX.Element[];
   /** 全局额外参数 */
-  GISDKExtraParams?: Record<string, any>;
+  extraParams?: Record<string, any>;
   /** 资产额外参数，以资产ID为 key, value 为传入对应资产的 props */
   componentExtraParams?: Record<string, any>;
 }