@antv/gpt-vis 0.3.3 → 0.3.4

package/dist/cjs/ConfigProvider/hooks/useConfig.d.ts

@@ -8,6 +8,6 @@ export declare function useMapConfig<T extends MapProps>(name: Charts, props: T)
     mapType: string | undefined;
     token: string | undefined;
 } & T;
-export declare function useGraphConfig<T extends GraphOptions>(name: Charts, ...configs: Partial<T>[]): {
+export declare function useGraphConfig<T extends GraphOptions>(name: Charts, defaultConfig: Partial<T>, props: Partial<T>): {
     [x: string]: any;
 };

package/dist/cjs/ConfigProvider/hooks/useConfig.js

@@ -59,12 +59,12 @@ function usePlotGlobalConfig(name) {
   return config;
 }
 function usePlotConfig(name, defaultConfig, props) {
-  const transformedProps = (0, import_plot.transform2ADCProps)(props);
-  const _defaultConfig = typeof defaultConfig === "function" ? defaultConfig(transformedProps) : defaultConfig;
   const globalConfig = usePlotGlobalConfig(name);
+  const mergedProps = { ...globalConfig, ...props };
+  const transformedProps = (0, import_plot.transform2ADCProps)(mergedProps);
+  const _defaultConfig = typeof defaultConfig === "function" ? defaultConfig(transformedProps) : defaultConfig;
   const config = {
     ..._defaultConfig,
-    ...globalConfig,
     ...transformedProps
   };
   return config;
@@ -95,9 +95,9 @@ function useGraphGlobalConfig(name) {
   const componentConfig = useComponentGlobalConfig(name);
   return (0, import_config.mergeGraphOptions)(graphConfig, componentConfig || {});
 }
-function useGraphConfig(name, ...configs) {
+function useGraphConfig(name, defaultConfig, props) {
   const globalConfig = useGraphGlobalConfig(name);
-  return (0, import_config.mergeGraphOptions)(globalConfig, ...configs);
+  return (0, import_config.mergeGraphOptions)(defaultConfig, globalConfig, props);
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/cjs/FlowDiagram/index.js

@@ -35,12 +35,13 @@ module.exports = __toCommonJS(FlowDiagram_exports);
 var import_graphs = require("@ant-design/graphs");
 var import_react = __toESM(require("react"));
 var import_hooks = require("../ConfigProvider/hooks");
+var import_config = require("../utils/config");
 var import_graph = require("../utils/graph");
 var import_helper = require("./helper");
 var { TextNode } = import_graphs.RCNode;
 var defaultConfig = {
   autoResize: true,
-  autoFit: "center",
+  autoFit: "view",
   node: {
     style: {
       component: (d) => {
@@ -61,8 +62,7 @@ var defaultConfig = {
         );
       },
       size: [140, 32]
-    },
-    animation: { enter: false }
+    }
   },
   edge: {
     style: {
@@ -78,8 +78,7 @@ var defaultConfig = {
         labelWordWrap: false,
         stroke: "#001f98"
       }
-    },
-    animation: { enter: false }
+    }
   },
   behaviors: (prev) => [
     ...prev,
@@ -99,8 +98,7 @@ var FlowDiagram = (props) => {
   const data = (0, import_react.useMemo)(() => (0, import_graph.visGraphData2GraphData)(propsData), [propsData]);
   const config = (0, import_hooks.useGraphConfig)(
     "FlowDiagram",
-    defaultConfig,
-    (0, import_helper.getGraphOptionsByData)(data),
+    (0, import_config.mergeGraphOptions)(defaultConfig, (0, import_helper.getGraphOptionsByData)(data)),
     restProps
   );
   return /* @__PURE__ */ import_react.default.createElement(import_graphs.FlowGraph, { data, ...config });

package/dist/cjs/utils/plot.js

@@ -46,15 +46,21 @@ function visG2Encode2ADCEncode(config) {
   return _config;
 }
 function axisTitle2G2axis(config) {
-  const { axisXTitle, axisYTitle, axis } = config;
-  if (!(0, import_lodash.isUndefined)(axis))
-    return config;
+  const { axisXTitle, axisYTitle } = config;
   const _config = { axis: {}, ...config };
   if (axisXTitle) {
-    _config.axis.x = { title: axisXTitle };
+    if ((0, import_lodash.get)(_config, "axis.x")) {
+      _config.axis.x.title = axisXTitle;
+    } else {
+      _config.axis.x = { title: axisXTitle };
+    }
   }
   if (axisYTitle) {
-    _config.axis.y = { title: axisYTitle };
+    if ((0, import_lodash.get)(_config, "axis.y")) {
+      _config.axis.y.title = axisYTitle;
+    } else {
+      _config.axis.y = { title: axisYTitle };
+    }
   }
   return _config;
 }

package/dist/cjs/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.3.3";
+declare const _default: "0.3.4";
 export default _default;

package/dist/cjs/version.js

@@ -22,4 +22,4 @@ __export(version_exports, {
   default: () => version_default
 });
 module.exports = __toCommonJS(version_exports);
-var version_default = "0.3.3";
+var version_default = "0.3.4";

package/dist/esm/ConfigProvider/hooks/useConfig.d.ts

@@ -8,6 +8,6 @@ export declare function useMapConfig<T extends MapProps>(name: Charts, props: T)
     mapType: string | undefined;
     token: string | undefined;
 } & T;
-export declare function useGraphConfig<T extends GraphOptions>(name: Charts, ...configs: Partial<T>[]): {
+export declare function useGraphConfig<T extends GraphOptions>(name: Charts, defaultConfig: Partial<T>, props: Partial<T>): {
     [x: string]: any;
 };

package/dist/esm/ConfigProvider/hooks/useConfig.js

@@ -22,10 +22,11 @@ function usePlotGlobalConfig(name) {
   return config;
 }
 export function usePlotConfig(name, defaultConfig, props) {
-  var transformedProps = transform2ADCProps(props);
-  var _defaultConfig = typeof defaultConfig === 'function' ? defaultConfig(transformedProps) : defaultConfig;
   var globalConfig = usePlotGlobalConfig(name);
-  var config = _objectSpread(_objectSpread(_objectSpread({}, _defaultConfig), globalConfig), transformedProps);
+  var mergedProps = _objectSpread(_objectSpread({}, globalConfig), props);
+  var transformedProps = transform2ADCProps(mergedProps);
+  var _defaultConfig = typeof defaultConfig === 'function' ? defaultConfig(transformedProps) : defaultConfig;
+  var config = _objectSpread(_objectSpread({}, _defaultConfig), transformedProps);
   return config;
 }
 function useMapGlobalConfig(name) {
@@ -51,10 +52,7 @@ function useGraphGlobalConfig(name) {
   var componentConfig = useComponentGlobalConfig(name);
   return mergeGraphOptions(graphConfig, componentConfig || {});
 }
-export function useGraphConfig(name) {
+export function useGraphConfig(name, defaultConfig, props) {
   var globalConfig = useGraphGlobalConfig(name);
-  for (var _len = arguments.length, configs = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-    configs[_key - 1] = arguments[_key];
-  }
-  return mergeGraphOptions.apply(void 0, [globalConfig].concat(configs));
+  return mergeGraphOptions(defaultConfig, globalConfig, props);
 }

package/dist/esm/FlowDiagram/index.js

@@ -5,12 +5,13 @@ var _excluded = ["data"];
 import { FlowGraph as ADCFlowGraph, RCNode } from '@ant-design/graphs';
 import React, { useMemo } from 'react';
 import { useGraphConfig } from "../ConfigProvider/hooks";
+import { mergeGraphOptions } from "../utils/config";
 import { visGraphData2GraphData } from "../utils/graph";
 import { getGraphOptionsByData } from "./helper";
 var TextNode = RCNode.TextNode;
 var defaultConfig = {
   autoResize: true,
-  autoFit: 'center',
+  autoFit: 'view',
   node: {
     style: {
       component: function component(d) {
@@ -28,9 +29,6 @@ var defaultConfig = {
         });
       },
       size: [140, 32]
-    },
-    animation: {
-      enter: false
     }
   },
   edge: {
@@ -47,9 +45,6 @@ var defaultConfig = {
         labelWordWrap: false,
         stroke: '#001f98'
       }
-    },
-    animation: {
-      enter: false
     }
   },
   behaviors: function behaviors(prev) {
@@ -70,7 +65,7 @@ var FlowDiagram = function FlowDiagram(props) {
   var data = useMemo(function () {
     return visGraphData2GraphData(propsData);
   }, [propsData]);
-  var config = useGraphConfig('FlowDiagram', defaultConfig, getGraphOptionsByData(data), restProps);
+  var config = useGraphConfig('FlowDiagram', mergeGraphOptions(defaultConfig, getGraphOptionsByData(data)), restProps);
   return /*#__PURE__*/React.createElement(ADCFlowGraph, _extends({
     data: data
   }, config));

package/dist/esm/utils/plot.js

@@ -1,6 +1,6 @@
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import { isUndefined } from 'lodash';
+import { get } from 'lodash';
 var ADC_ENCODE_FIELDS = new Map([['x', 'xField'], ['y', 'yField'], ['series', 'seriesField'], ['size', 'sizeField'], ['color', 'colorField'], ['shape', 'shapeField'], ['y', 'angleField']]);
 
 /**
@@ -34,23 +34,27 @@ function visG2Encode2ADCEncode(config) {
  */
 function axisTitle2G2axis(config) {
   var axisXTitle = config.axisXTitle,
-    axisYTitle = config.axisYTitle,
-    axis = config.axis;
-  if (!isUndefined(axis)) return config;
+    axisYTitle = config.axisYTitle;
   var _config = _objectSpread({
     axis: {}
   }, config);
   if (axisXTitle) {
-    // @ts-expect-error
-    _config.axis.x = {
-      title: axisXTitle
-    };
+    if (get(_config, 'axis.x')) {
+      _config.axis.x.title = axisXTitle;
+    } else {
+      _config.axis.x = {
+        title: axisXTitle
+      };
+    }
   }
   if (axisYTitle) {
-    // @ts-expect-error
-    _config.axis.y = {
-      title: axisYTitle
-    };
+    if (get(_config, 'axis.y')) {
+      _config.axis.y.title = axisYTitle;
+    } else {
+      _config.axis.y = {
+        title: axisYTitle
+      };
+    }
   }
   return _config;
 }

package/dist/esm/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "0.3.3";
+declare const _default: "0.3.4";
 export default _default;

package/dist/esm/version.js

@@ -1 +1 @@
-export default '0.3.3';
+export default '0.3.4';