@nocobase/plugin-data-visualization 0.10.1-alpha.1 → 0.11.1-alpha.1

package/lib/client/block/schemas/configure.js

@@ -168,7 +168,7 @@ const querySchema = {
           'x-component-props': {
             options: '{{ collectionOptions }}',
             onChange: '{{ onCollectionChange }}',
-            placeholder: (0, _locale.lang)('Collection')
+            placeholder: '{{t("Collection")}}'
           }
         }
       }
@@ -219,19 +219,19 @@ const querySchema = {
                           placeholder: '{{t("Aggregation")}}'
                         },
                         enum: [{
-                          label: (0, _locale.lang)('Sum'),
+                          label: '{{t("Sum")}}',
                           value: 'sum'
                         }, {
-                          label: (0, _locale.lang)('Count'),
+                          label: '{{t("Count")}}',
                           value: 'count'
                         }, {
-                          label: (0, _locale.lang)('Avg'),
+                          label: '{{t("Avg")}}',
                           value: 'avg'
                         }, {
-                          label: (0, _locale.lang)('Max'),
+                          label: '{{t("Max")}}',
                           value: 'max'
                         }, {
-                          label: (0, _locale.lang)('Min'),
+                          label: '{{t("Min")}}',
                           value: 'min'
                         }]
                       },
@@ -309,7 +309,7 @@ const querySchema = {
                       'x-decorator': 'FormItem',
                       'x-decorator-props': {
                         style: {
-                          overflow: 'scroll'
+                          overflow: 'auto'
                         }
                       },
                       'x-component': 'Filter',

package/lib/client/block/transformers.js

@@ -4,35 +4,34 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-function _dayjs() {
-  const data = _interopRequireDefault(require("dayjs"));
-  _dayjs = function _dayjs() {
+function _client() {
+  const data = require("@nocobase/utils/client");
+  _client = function _client() {
     return data;
   };
   return data;
 }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const transformers = {
   datetime: {
-    YYYY: val => (0, _dayjs().default)(val).format('YYYY'),
-    MM: val => (0, _dayjs().default)(val).format('MM'),
-    DD: val => (0, _dayjs().default)(val).format('DD'),
-    'YYYY-MM': val => (0, _dayjs().default)(val).format('YYYY-MM'),
-    'YYYY-MM-DD': val => (0, _dayjs().default)(val).format('YYYY-MM-DD'),
-    'YYYY-MM-DD hh:mm': val => (0, _dayjs().default)(val).format('YYYY-MM-DD hh:mm'),
-    'YYYY-MM-DD hh:mm:ss': val => (0, _dayjs().default)(val).format('YYYY-MM-DD hh:mm:ss')
+    YYYY: val => (0, _client().dayjs)(val).format('YYYY'),
+    MM: val => (0, _client().dayjs)(val).format('MM'),
+    DD: val => (0, _client().dayjs)(val).format('DD'),
+    'YYYY-MM': val => (0, _client().dayjs)(val).format('YYYY-MM'),
+    'YYYY-MM-DD': val => (0, _client().dayjs)(val).format('YYYY-MM-DD'),
+    'YYYY-MM-DD hh:mm': val => (0, _client().dayjs)(val).format('YYYY-MM-DD hh:mm'),
+    'YYYY-MM-DD hh:mm:ss': val => (0, _client().dayjs)(val).format('YYYY-MM-DD hh:mm:ss')
   },
   date: {
-    YYYY: val => (0, _dayjs().default)(val).format('YYYY'),
-    MM: val => (0, _dayjs().default)(val).format('MM'),
-    DD: val => (0, _dayjs().default)(val).format('DD'),
-    'YYYY-MM': val => (0, _dayjs().default)(val).format('YYYY-MM'),
-    'YYYY-MM-DD': val => (0, _dayjs().default)(val).format('YYYY-MM-DD')
+    YYYY: val => (0, _client().dayjs)(val).format('YYYY'),
+    MM: val => (0, _client().dayjs)(val).format('MM'),
+    DD: val => (0, _client().dayjs)(val).format('DD'),
+    'YYYY-MM': val => (0, _client().dayjs)(val).format('YYYY-MM'),
+    'YYYY-MM-DD': val => (0, _client().dayjs)(val).format('YYYY-MM-DD')
   },
   time: {
-    'hh:mm:ss': val => (0, _dayjs().default)(val).format('hh:mm:ss'),
-    'hh:mm': val => (0, _dayjs().default)(val).format('hh:mm'),
-    hh: val => (0, _dayjs().default)(val).format('hh')
+    'hh:mm:ss': val => (0, _client().dayjs)(val).format('hh:mm:ss'),
+    'hh:mm': val => (0, _client().dayjs)(val).format('hh:mm'),
+    hh: val => (0, _client().dayjs)(val).format('hh')
   },
   number: {
     Percent: val => new Intl.NumberFormat('en-US', {

package/lib/client/hooks.d.ts

@@ -1,7 +1,7 @@
 import { ArrayField } from '@formily/core';
 import { ISchema } from '@formily/react';
 import { ChartRendererProps } from './renderer';
-export declare type FieldOption = {
+export type FieldOption = {
     value: string;
     label: string;
     key: string;

package/lib/client/index.d.ts

@@ -1,5 +1,7 @@
-import React from 'react';
+import { Plugin } from '@nocobase/client';
 import { ChartLibraryProvider } from './renderer/ChartLibrary';
-declare const Chart: React.FC;
-export default Chart;
+declare class DataVisualizationPlugin extends Plugin {
+    load(): Promise<void>;
+}
+export default DataVisualizationPlugin;
 export { ChartLibraryProvider };

package/lib/client/index.js

@@ -30,6 +30,8 @@ var _renderer = require("./renderer");
 var _ChartLibrary = require("./renderer/ChartLibrary");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -45,7 +47,7 @@ const Chart = props => {
     children.push({
       key: 'chart-v2',
       type: 'item',
-      title: t('Chart'),
+      title: t('Charts'),
       component: 'ChartV2BlockInitializer'
     });
   }
@@ -66,5 +68,13 @@ const Chart = props => {
     charts: _renderer.InternalLibrary
   }, props.children)));
 };
-var _default = Chart;
+class DataVisualizationPlugin extends _client().Plugin {
+  load() {
+    var _this = this;
+    return _asyncToGenerator(function* () {
+      _this.app.addProvider(Chart);
+    })();
+  }
+}
+var _default = DataVisualizationPlugin;
 exports.default = _default;

package/lib/client/locale/index.d.ts

@@ -1,3 +1,3 @@
-export declare const NAMESPACE = "charts-v2";
+export declare const NAMESPACE = "data-visualization";
 export declare function lang(key: string): string;
-export declare function useChartsTranslation(): import("react-i18next").UseTranslationResponse<"charts-v2", undefined>;
+export declare function useChartsTranslation(): import("react-i18next").UseTranslationResponse<"data-visualization", undefined>;

package/lib/client/locale/index.js

@@ -20,15 +20,13 @@ function _reactI18next() {
   };
   return data;
 }
-var _zhCN = _interopRequireDefault(require("./zh-CN"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const NAMESPACE = 'charts-v2';
-exports.NAMESPACE = NAMESPACE;
-_client().i18n.addResources('zh-CN', NAMESPACE, _zhCN.default);
+const NAMESPACE = 'data-visualization';
+// i18n.addResources('zh-CN', NAMESPACE, zhCN);
 // i18n.addResources('en-US', NAMESPACE, enUS);
 // i18n.addResources('ja-JP', NAMESPACE, jaJP);
 // i18n.addResources('ru-RU', NAMESPACE, ruRU);
 // i18n.addResources('tr-TR', NAMESPACE, trTR);
+exports.NAMESPACE = NAMESPACE;
 function lang(key) {
   return _client().i18n.t(key, {
     ns: NAMESPACE

package/lib/client/locale/zh-CN.d.ts

@@ -66,5 +66,6 @@ declare const _default: {
     Min: string;
     Max: string;
     'Please select a chart type.': string;
+    Collection: string;
 };
 export default _default;

package/lib/client/locale/zh-CN.js

@@ -71,6 +71,7 @@ var _default = {
   Count: '计数',
   Min: '最小值',
   Max: '最大值',
-  'Please select a chart type.': '请选择图表类型'
+  'Please select a chart type.': '请选择图表类型',
+  Collection: '数据表'
 };
 exports.default = _default;

package/lib/client/renderer/ChartLibrary.d.ts

@@ -6,7 +6,7 @@ import { QueryProps } from './ChartRendererProvider';
  * @params {usePropsFunc} useProps - Accept the information that the chart component needs to render,
  * process it and return the props of the chart component.
  */
-export declare type usePropsFunc = (props: {
+export type usePropsFunc = (props: {
     data: any[];
     fieldProps: {
         [field: string]: FieldOption & {
@@ -16,7 +16,7 @@ export declare type usePropsFunc = (props: {
     general: any;
     advanced: any;
 }) => any;
-export declare type ChartProps = {
+export type ChartProps = {
     name: string;
     component: React.FC<any>;
     schema?: ISchema;
@@ -33,10 +33,10 @@ export declare type ChartProps = {
         link: string;
     };
 };
-export declare type Charts = {
+export type Charts = {
     [type: string]: ChartProps;
 };
-export declare type ChartLibraries = {
+export type ChartLibraries = {
     [library: string]: {
         enabled: boolean;
         charts: Charts;
@@ -52,6 +52,7 @@ export declare const useChartTypes: () => {
         value: string;
     })[];
 }[];
+export declare const useDefaultChartType: () => string;
 export declare const useToggleChartLibrary: () => {
     toggle: (library: string) => void;
 };

package/lib/client/renderer/ChartLibrary.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useToggleChartLibrary = exports.useCharts = exports.useChartTypes = exports.infer = exports.commonInit = exports.ChartLibraryProvider = exports.ChartLibraryContext = void 0;
+exports.useToggleChartLibrary = exports.useDefaultChartType = exports.useCharts = exports.useChartTypes = exports.infer = exports.commonInit = exports.ChartLibraryProvider = exports.ChartLibraryContext = void 0;
 function _react() {
   const data = _interopRequireWildcard(require("react"));
   _react = function _react() {
@@ -32,7 +32,7 @@ const useChartTypes = () => {
   return Object.entries(library).filter(([_, l]) => l.enabled).reduce((charts, [name, l]) => {
     const children = Object.entries(l.charts).map(([type, chart]) => _objectSpread(_objectSpread({}, chart), {}, {
       key: type,
-      label: chart.name,
+      label: (0, _locale.lang)(chart.name),
       value: type
     }));
     return [...charts, {
@@ -42,6 +42,12 @@ const useChartTypes = () => {
   }, []);
 };
 exports.useChartTypes = useChartTypes;
+const useDefaultChartType = () => {
+  var _chartTypes$, _chartTypes$$children, _chartTypes$$children2;
+  const chartTypes = useChartTypes();
+  return (_chartTypes$ = chartTypes[0]) === null || _chartTypes$ === void 0 ? void 0 : (_chartTypes$$children = _chartTypes$.children) === null || _chartTypes$$children === void 0 ? void 0 : (_chartTypes$$children2 = _chartTypes$$children[0]) === null || _chartTypes$$children2 === void 0 ? void 0 : _chartTypes$$children2.value;
+};
+exports.useDefaultChartType = useDefaultChartType;
 const useToggleChartLibrary = () => {
   const ctx = (0, _react().useContext)(ChartLibraryContext);
   return {
@@ -83,7 +89,7 @@ const infer = (fields, {
       alias = _parseField.alias;
     return fields.find(f => f.value === alias);
   };
-  if (measures === null || measures === void 0 ? void 0 : measures.length) {
+  if (measures !== null && measures !== void 0 && measures.length) {
     yField = getField(fields, measures[0]);
     yFields = measures.map(m => getField(fields, m));
   }

package/lib/client/renderer/ChartRenderer.d.ts

@@ -1,7 +1,4 @@
 import React from 'react';
-export declare const ChartRenderer: React.FC<{
-    configuring?: boolean;
-    runQuery?: any;
-}> & {
+export declare const ChartRenderer: React.FC & {
     Designer: React.FC;
 };

package/lib/client/renderer/ChartRenderer.js

@@ -47,115 +47,30 @@ var _ChartLibrary = require("./ChartLibrary");
 var _ChartRendererProvider = require("./ChartRendererProvider");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 const Paragraph = _antd().Typography.Paragraph,
   Text = _antd().Typography.Text;
 const ChartRenderer = props => {
   var _chart$useProps;
   const _useChartsTranslation = (0, _locale.useChartsTranslation)(),
     t = _useChartsTranslation.t;
-  const _useContext = (0, _react2().useContext)(_block.ChartConfigContext),
-    setQueryData = _useContext.setData,
-    current = _useContext.current;
-  const _useContext2 = (0, _react2().useContext)(_ChartRendererProvider.ChartRendererContext),
-    query = _useContext2.query,
-    config = _useContext2.config,
-    collection = _useContext2.collection,
-    transform = _useContext2.transform;
-  const configuring = props.configuring,
-    runQuery = props.runQuery;
+  const ctx = (0, _react2().useContext)(_ChartRendererProvider.ChartRendererContext);
+  const config = ctx.config,
+    transform = ctx.transform,
+    collection = ctx.collection,
+    service = ctx.service,
+    _data = ctx.data;
+  const fields = (0, _hooks.useFieldsWithAssociation)(collection);
+  const data = (0, _utils.processData)(fields, (service === null || service === void 0 ? void 0 : service.data) || _data || [], {
+    t
+  });
   const general = (config === null || config === void 0 ? void 0 : config.general) || {};
   const advanced = (config === null || config === void 0 ? void 0 : config.advanced) || {};
-  const schema = (0, _react().useFieldSchema)();
-  const currentSchema = schema || (current === null || current === void 0 ? void 0 : current.schema);
-  const fields = (0, _hooks.useFieldsWithAssociation)(collection);
   const api = (0, _client().useAPIClient)();
-  const _useState = (0, _react2().useState)([]),
-    _useState2 = _slicedToArray(_useState, 2),
-    data = _useState2[0],
-    setData = _useState2[1];
-  const _useRequest = (0, _client().useRequest)(query => api.request({
-      url: 'charts:query',
-      method: 'POST',
-      data: _objectSpread(_objectSpread({
-        uid: currentSchema === null || currentSchema === void 0 ? void 0 : currentSchema['x-uid'],
-        collection
-      }, query), {}, {
-        dimensions: ((query === null || query === void 0 ? void 0 : query.dimensions) || []).map(item => {
-          const dimension = _objectSpread({}, item);
-          if (item.format && !item.alias) {
-            const _parseField = (0, _utils.parseField)(item.field),
-              alias = _parseField.alias;
-            dimension.alias = alias;
-          }
-          return dimension;
-        }),
-        measures: ((query === null || query === void 0 ? void 0 : query.measures) || []).map(item => {
-          const measure = _objectSpread({}, item);
-          if (item.aggregation && !item.alias) {
-            const _parseField2 = (0, _utils.parseField)(item.field),
-              alias = _parseField2.alias;
-            measure.alias = alias;
-          }
-          return measure;
-        })
-      })
-    }).then(res => {
-      var _res$data;
-      const data = (res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.data) || [];
-      return (0, _utils.processData)(fields, data, {
-        t
-      });
-    }), {
-      manual: true,
-      onSuccess: data => {
-        setData(data);
-      },
-      onFinally(params, data, error) {
-        if (!configuring) {
-          return;
-        }
-        if (error) {
-          var _error$response, _error$response$data, _error$response$data$, _error$response$data$2;
-          const message = error === null || error === void 0 ? void 0 : (_error$response = error.response) === null || _error$response === void 0 ? void 0 : (_error$response$data = _error$response.data) === null || _error$response$data === void 0 ? void 0 : (_error$response$data$ = _error$response$data.errors) === null || _error$response$data$ === void 0 ? void 0 : (_error$response$data$2 = _error$response$data$.map) === null || _error$response$data$2 === void 0 ? void 0 : _error$response$data$2.call(_error$response$data$, error => error.message).join('\n');
-          setQueryData(message || error.message);
-          return;
-        }
-        setQueryData(data);
-      }
-    }),
-    runAsync = _useRequest.runAsync;
-  (0, _react2().useEffect)(() => {
-    setData([]);
-    const run = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator(function* (query) {
-        var _query$measures;
-        if (query === null || query === void 0 ? void 0 : (_query$measures = query.measures) === null || _query$measures === void 0 ? void 0 : _query$measures.length // || (query?.sql?.fields && query?.sql?.clauses)
-        ) {
-          yield runAsync(query);
-        }
-      });
-      return function run(_x2) {
-        return _ref.apply(this, arguments);
-      };
-    }();
-    if (runQuery) {
-      runQuery.current = run;
-    }
-    run(query);
-  }, [query, runAsync, runQuery]);
   const charts = (0, _ChartLibrary.useCharts)();
   const chart = charts[config === null || config === void 0 ? void 0 : config.chartType];
   const Component = chart === null || chart === void 0 ? void 0 : chart.component;
@@ -187,18 +102,26 @@ const ChartRenderer = props => {
     image: _antd().Empty.PRESENTED_IMAGE_SIMPLE,
     description: t('Please configure chart')
   });
-  return data && data.length ? _react2().default.createElement(C, null) : _react2().default.createElement(_antd().Empty, {
-    image: _antd().Empty.PRESENTED_IMAGE_SIMPLE,
-    description: t('Please configure and run query')
-  });
+  if (service.loading) {
+    return _react2().default.createElement(_antd().Spin, null);
+  }
+  if (!(data && data.length)) {
+    return _react2().default.createElement(_antd().Empty, {
+      image: _antd().Empty.PRESENTED_IMAGE_SIMPLE,
+      description: t('Please configure and run query')
+    });
+  }
+  return _react2().default.createElement(C, null);
 };
 exports.ChartRenderer = ChartRenderer;
 ChartRenderer.Designer = function Designer() {
   const _useChartsTranslation2 = (0, _locale.useChartsTranslation)(),
     t = _useChartsTranslation2.t;
-  const _useContext3 = (0, _react2().useContext)(_block.ChartConfigContext),
-    setVisible = _useContext3.setVisible,
-    setCurrent = _useContext3.setCurrent;
+  const _useContext = (0, _react2().useContext)(_block.ChartConfigContext),
+    setVisible = _useContext.setVisible,
+    setCurrent = _useContext.setCurrent;
+  const _useContext2 = (0, _react2().useContext)(_ChartRendererProvider.ChartRendererContext),
+    service = _useContext2.service;
   const field = (0, _react().useField)();
   const schema = (0, _react().useFieldSchema)();
   const _useDesignable = (0, _client().useDesignable)(),
@@ -215,7 +138,9 @@ ChartRenderer.Designer = function Designer() {
       setCurrent({
         schema,
         field,
-        collection: name
+        collection: name,
+        service,
+        data: service === null || service === void 0 ? void 0 : service.data
       });
       setVisible(true);
     }

package/lib/client/renderer/ChartRendererProvider.d.ts

@@ -1,20 +1,20 @@
 import React from 'react';
-export declare type MeasureProps = {
+export type MeasureProps = {
     field: string | string[];
     aggregation?: string;
     alias?: string;
 };
-export declare type DimensionProps = {
+export type DimensionProps = {
     field: string | string[];
     alias?: string;
     format?: string;
 };
-export declare type TransformProps = {
+export type TransformProps = {
     field: string;
     type: string;
     format: string;
 };
-export declare type QueryProps = Partial<{
+export type QueryProps = Partial<{
     measures: MeasureProps[];
     dimensions: DimensionProps[];
     orders: {
@@ -28,7 +28,7 @@ export declare type QueryProps = Partial<{
         clauses?: string;
     };
 }>;
-export declare type ChartRendererProps = {
+export type ChartRendererProps = {
     collection: string;
     query?: QueryProps;
     config?: {
@@ -39,5 +39,15 @@ export declare type ChartRendererProps = {
     transform?: TransformProps[];
     mode?: 'builder' | 'sql';
 };
-export declare const ChartRendererContext: React.Context<ChartRendererProps>;
+export declare const ChartRendererContext: React.Context<{
+    collection: string;
+    config?: {
+        chartType: string;
+        general: any;
+        advanced: any;
+    };
+    transform?: TransformProps[];
+    service: any;
+    data?: any[];
+}>;
 export declare const ChartRendererProvider: React.FC<ChartRendererProps>;

package/lib/client/renderer/ChartRendererProvider.js

@@ -4,6 +4,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ChartRendererProvider = exports.ChartRendererContext = void 0;
+function _css() {
+  const data = require("@emotion/css");
+  _css = function _css() {
+    return data;
+  };
+  return data;
+}
+function _react() {
+  const data = require("@formily/react");
+  _react = function _react() {
+    return data;
+  };
+  return data;
+}
 function _client() {
   const data = require("@nocobase/client");
   _client = function _client() {
@@ -11,13 +25,14 @@ function _client() {
   };
   return data;
 }
-function _react() {
+function _react2() {
   const data = _interopRequireWildcard(require("react"));
-  _react = function _react() {
+  _react2 = function _react2() {
     return data;
   };
   return data;
 }
+var _utils = require("../utils");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -25,14 +40,66 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-const ChartRendererContext = (0, _react().createContext)({});
+const ChartRendererContext = (0, _react2().createContext)({});
 exports.ChartRendererContext = ChartRendererContext;
 const ChartRendererProvider = props => {
-  const collection = props.collection;
-  return _react().default.createElement(_client().MaybeCollectionProvider, {
+  const query = props.query,
+    config = props.config,
+    collection = props.collection,
+    transform = props.transform;
+  const schema = (0, _react().useFieldSchema)();
+  const api = (0, _client().useAPIClient)();
+  const service = (0, _client().useRequest)((collection, query) => new Promise((resolve, reject) => {
+    var _query$measures;
+    if (!(collection && query !== null && query !== void 0 && (_query$measures = query.measures) !== null && _query$measures !== void 0 && _query$measures.length)) return resolve(undefined);
+    api.request({
+      url: 'charts:query',
+      method: 'POST',
+      data: _objectSpread(_objectSpread({
+        uid: schema === null || schema === void 0 ? void 0 : schema['x-uid'],
+        collection
+      }, query), {}, {
+        dimensions: ((query === null || query === void 0 ? void 0 : query.dimensions) || []).map(item => {
+          const dimension = _objectSpread({}, item);
+          if (item.format && !item.alias) {
+            const _parseField = (0, _utils.parseField)(item.field),
+              alias = _parseField.alias;
+            dimension.alias = alias;
+          }
+          return dimension;
+        }),
+        measures: ((query === null || query === void 0 ? void 0 : query.measures) || []).map(item => {
+          const measure = _objectSpread({}, item);
+          if (item.aggregation && !item.alias) {
+            const _parseField2 = (0, _utils.parseField)(item.field),
+              alias = _parseField2.alias;
+            measure.alias = alias;
+          }
+          return measure;
+        })
+      })
+    }).then(res => {
+      var _res$data;
+      resolve(res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.data);
+    }).catch(reject);
+  }), {
+    defaultParams: [collection, query]
+  });
+  return _react2().default.createElement(_client().MaybeCollectionProvider, {
     collection: collection
-  }, _react().default.createElement(ChartRendererContext.Provider, {
-    value: _objectSpread({}, props)
-  }, props.children));
+  }, _react2().default.createElement("div", {
+    className: (0, _css().css)`
+          .ant-card {
+            box-shadow: none;
+          }
+        `
+  }, _react2().default.createElement(ChartRendererContext.Provider, {
+    value: {
+      collection,
+      config,
+      transform,
+      service
+    }
+  }, props.children)));
 };
 exports.ChartRendererProvider = ChartRendererProvider;

package/lib/client/renderer/library/AntdLibrary.js

@@ -97,7 +97,7 @@ const AntdLibrary = {
       const dataSource = data.map(item => {
         Object.keys(item).map(key => {
           const props = fieldProps[key];
-          if (props === null || props === void 0 ? void 0 : props.transformer) {
+          if (props !== null && props !== void 0 && props.transformer) {
             item[key] = props.transformer(item[key]);
           }
         });