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

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 && (_query$measures = query.measures) !== null && _query$measures !== 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

@@ -39,5 +39,15 @@ export 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

@@ -11,6 +11,13 @@ function _css() {
   };
   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() {
@@ -18,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; }
@@ -32,23 +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("div", {
+  }, _react2().default.createElement("div", {
     className: (0, _css().css)`
           .ant-card {
             box-shadow: none;
           }
-          .ant-card-body {
-            padding: 0;
-          }
         `
-  }, _react().default.createElement(ChartRendererContext.Provider, {
-    value: _objectSpread({}, props)
+  }, _react2().default.createElement(ChartRendererContext.Provider, {
+    value: {
+      collection,
+      config,
+      transform,
+      service
+    }
   }, props.children)));
 };
 exports.ChartRendererProvider = ChartRendererProvider;

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

@@ -11,7 +11,6 @@ function _plots() {
   };
   return data;
 }
-var _locale = require("../../locale");
 var _ChartLibrary = require("../ChartLibrary");
 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; }
@@ -23,7 +22,7 @@ const basicSchema = {
   type: 'object',
   properties: {
     xField: {
-      title: (0, _locale.lang)('xField'),
+      title: '{{t("xField")}}',
       type: 'string',
       'x-decorator': 'FormItem',
       'x-component': 'Select',
@@ -31,7 +30,7 @@ const basicSchema = {
       required: true
     },
     yField: {
-      title: (0, _locale.lang)('yField'),
+      title: '{{t("yField")}}',
       type: 'string',
       'x-decorator': 'FormItem',
       'x-component': 'Select',
@@ -39,7 +38,7 @@ const basicSchema = {
       required: true
     },
     seriesField: {
-      title: (0, _locale.lang)('seriesField'),
+      title: '{{t("seriesField")}}',
       type: 'string',
       'x-decorator': 'FormItem',
       'x-component': 'Select',
@@ -67,40 +66,40 @@ const _useProps = ({
 };
 const G2PlotLibrary = {
   line: {
-    name: (0, _locale.lang)('Line Chart'),
+    name: 'Line Chart',
     component: _plots().Line,
     schema: basicSchema,
     init,
     useProps: _useProps,
     reference: {
-      title: (0, _locale.lang)('Line Chart'),
+      title: 'Line Chart',
       link: 'https://g2plot.antv.antgroup.com/api/plots/bar'
     }
   },
   area: {
-    name: (0, _locale.lang)('Area Chart'),
+    name: 'Area Chart',
     component: _plots().Area,
     schema: basicSchema,
     init,
     useProps: _useProps,
     reference: {
-      title: (0, _locale.lang)('Area Chart'),
+      title: 'Area Chart',
       link: 'https://g2plot.antv.antgroup.com/api/plots/area'
     }
   },
   column: {
-    name: (0, _locale.lang)('Column Chart'),
+    name: 'Column Chart',
     component: _plots().Column,
     schema: basicSchema,
     init,
     useProps: _useProps,
     reference: {
-      title: (0, _locale.lang)('Column Chart'),
+      title: 'Column Chart',
       link: 'https://g2plot.antv.antgroup.com/api/plots/column'
     }
   },
   bar: {
-    name: (0, _locale.lang)('Bar Chart'),
+    name: 'Bar Chart',
     component: _plots().Bar,
     schema: basicSchema,
     init: (fields, {
@@ -124,18 +123,18 @@ const G2PlotLibrary = {
     },
     useProps: _useProps,
     reference: {
-      title: (0, _locale.lang)('Bar Chart'),
+      title: 'Bar Chart',
       link: 'https://g2plot.antv.antgroup.com/api/plots/bar'
     }
   },
   pie: {
-    name: (0, _locale.lang)('Pie Chart'),
+    name: 'Pie Chart',
     component: _plots().Pie,
     schema: {
       type: 'object',
       properties: {
         angleField: {
-          title: (0, _locale.lang)('angleField'),
+          title: '{{t("angleField")}}',
           type: 'string',
           'x-decorator': 'FormItem',
           'x-component': 'Select',
@@ -143,7 +142,7 @@ const G2PlotLibrary = {
           required: true
         },
         colorField: {
-          title: (0, _locale.lang)('colorField'),
+          title: '{{t("colorField")}}',
           type: 'string',
           'x-decorator': 'FormItem',
           'x-component': 'Select',
@@ -171,12 +170,12 @@ const G2PlotLibrary = {
     },
     useProps: _useProps,
     reference: {
-      title: (0, _locale.lang)('Pie Chart'),
+      title: 'Pie Chart',
       link: 'https://g2plot.antv.antgroup.com/api/plots/pie'
     }
   },
   dualAxes: {
-    name: (0, _locale.lang)('Dual Axes Chart'),
+    name: 'Dual Axes Chart',
     component: _plots().DualAxes,
     useProps: ({
       data,
@@ -197,7 +196,7 @@ const G2PlotLibrary = {
       type: 'object',
       properties: {
         xField: {
-          title: (0, _locale.lang)('xField'),
+          title: '{{t("xField")}}',
           type: 'string',
           'x-decorator': 'FormItem',
           'x-component': 'Select',
@@ -205,7 +204,7 @@ const G2PlotLibrary = {
           required: true
         },
         yField: {
-          title: (0, _locale.lang)('yField'),
+          title: '{{t("yField")}}',
           type: 'array',
           'x-decorator': 'FormItem',
           'x-component': 'ArrayItems',
@@ -225,7 +224,7 @@ const G2PlotLibrary = {
                 'x-reactions': '{{ useChartFields }}',
                 'x-component-props': {
                   style: {
-                    'min-width': '200px'
+                    minWidth: '200px'
                   }
                 },
                 required: true
@@ -240,7 +239,7 @@ const G2PlotLibrary = {
           properties: {
             add: {
               type: 'void',
-              title: (0, _locale.lang)('Add'),
+              title: '{{t("Add")}}',
               'x-component': 'ArrayItems.Addition'
             }
           }
@@ -265,22 +264,22 @@ const G2PlotLibrary = {
       };
     },
     reference: {
-      title: (0, _locale.lang)('Dual Axes Chart'),
+      title: 'Dual Axes Chart',
       link: 'https://g2plot.antv.antgroup.com/api/plots/dual-axes'
     }
   },
   // gauge: {
-  //   name: lang('Gauge Chart'),
+  //   name: 'Gauge Chart',
   //   component: Gauge,
   // },
   scatter: {
-    name: (0, _locale.lang)('Scatter Chart'),
+    name: 'Scatter Chart',
     component: _plots().Scatter,
     schema: basicSchema,
     init,
     useProps: _useProps,
     reference: {
-      title: (0, _locale.lang)('Scatter Chart'),
+      title: 'Scatter Chart',
       link: 'https://g2plot.antv.antgroup.com/api/plots/scatter'
     }
   }

package/lib/server/actions/query.js

@@ -161,7 +161,12 @@ const parseBuilder = (ctx, builder) => {
     fieldMap[alias || field] = dimension;
   });
   orders.forEach(item => {
-    const name = hasAgg ? sequelize.literal(`"${item.alias}"`) : sequelize.col(item.field);
+    const dialect = sequelize.getDialect();
+    let alias = `"${item.alias}"`;
+    if (dialect === 'mysql') {
+      alias = `\`${item.alias}\``;
+    }
+    const name = hasAgg ? sequelize.literal(alias) : sequelize.col(item.field);
     order.push([name, item.order || 'ASC']);
   });
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-visualization",
-  "version": "0.11.0-alpha.1",
+  "version": "0.11.1-alpha.2",
   "displayName": "Data Visualization",
   "displayName.zh-CN": "数据可视化",
   "description": "Provides business intelligence and data visualization features",
@@ -17,13 +17,13 @@
     "@formily/core": "2.2.26",
     "@formily/react": "2.2.26",
     "@formily/shared": "2.2.26",
-    "@nocobase/actions": "0.11.0-alpha.1",
-    "@nocobase/cache": "0.11.0-alpha.1",
-    "@nocobase/client": "0.11.0-alpha.1",
-    "@nocobase/database": "0.11.0-alpha.1",
-    "@nocobase/server": "0.11.0-alpha.1",
-    "@nocobase/test": "0.11.0-alpha.1",
-    "@nocobase/utils": "0.11.0-alpha.1",
+    "@nocobase/actions": "0.11.1-alpha.2",
+    "@nocobase/cache": "0.11.1-alpha.2",
+    "@nocobase/client": "0.11.1-alpha.2",
+    "@nocobase/database": "0.11.1-alpha.2",
+    "@nocobase/server": "0.11.1-alpha.2",
+    "@nocobase/test": "0.11.1-alpha.2",
+    "@nocobase/utils": "0.11.1-alpha.2",
     "@testing-library/react": "^12.1.5",
     "antd": "^5.6.4",
     "lodash": "^4.17.21",
@@ -31,5 +31,5 @@
     "react-i18next": "^11.15.1",
     "vitest": "^0.33.0"
   },
-  "gitHead": "7581b6d3a3a54f09f06a9effb7e3e65328281b2b"
+  "gitHead": "8482aa720ea1c3abbbb9fe1208e73778bd63f1cf"
 }

package/src/client/block/ChartBlock.tsx

@@ -1,21 +1,23 @@
 import { SchemaInitializerButtonContext, useDesignable } from '@nocobase/client';
 import React, { useState } from 'react';
+import { ChartRendererProvider } from '../renderer';
 import { ChartConfigContext, ChartConfigCurrent, ChartConfigure } from './ChartConfigure';
 
 export const ChartV2Block: React.FC = (props) => {
   const { insertAdjacent } = useDesignable();
   const [visible, setVisible] = useState(false);
   const [current, setCurrent] = useState<ChartConfigCurrent>({} as any);
-  const [data, setData] = useState<string | any[]>([]);
   const [initialVisible, setInitialVisible] = useState(false);
   const [searchValue, setSearchValue] = useState('');
   return (
     <SchemaInitializerButtonContext.Provider
       value={{ visible: initialVisible, setVisible: setInitialVisible, searchValue, setSearchValue }}
     >
-      <ChartConfigContext.Provider value={{ visible, setVisible, current, setCurrent, data, setData }}>
+      <ChartConfigContext.Provider value={{ visible, setVisible, current, setCurrent }}>
         {props.children}
-        <ChartConfigure insert={(schema, options) => insertAdjacent('beforeEnd', schema, options)} />
+        <ChartRendererProvider {...current.field?.decoratorProps}>
+          <ChartConfigure insert={(schema, options) => insertAdjacent('beforeEnd', schema, options)} />
+        </ChartRendererProvider>
       </ChartConfigContext.Provider>
     </SchemaInitializerButtonContext.Provider>
   );

package/src/client/block/ChartBlockInitializer.tsx

@@ -8,13 +8,12 @@ import { ChartConfigContext } from './ChartConfigure';
 
 const itemWrap = SchemaInitializer.itemWrap;
 const ConfigureButton = itemWrap((props) => {
-  const { setVisible, setCurrent, setData } = useContext(ChartConfigContext);
+  const { setVisible, setCurrent } = useContext(ChartConfigContext);
   return (
     <SchemaInitializer.Item
       {...props}
       onClick={() => {
-        setCurrent({ schema: {}, field: null, collection: props.item?.name });
-        setData([]);
+        setCurrent({ schema: {}, field: null, collection: props.item?.name, service: null, data: undefined });
         setVisible(true);
       }}
     />