@nocobase/client 0.7.2-alpha.1 → 0.7.2-alpha.2

package/es/acl/Configuration/schemas/scopes.js

@@ -43,6 +43,7 @@ export var scopesSchema = {
           label: 'name',
           value: 'id'
         },
+        multiple: false,
         association: {
           target: 'rolesResourcesScopes'
         },

package/es/schema-component/antd/AntdSchemaComponentProvider.js

@@ -9,10 +9,12 @@ import * as components from '.';
 import * as common from '../common';
 import { SchemaComponentOptions } from '../core/SchemaComponentOptions';
 import { useFilterActionProps } from './filter/useFilterActionProps';
+import { requestChartData } from './g2plot/requestChartData';
 export var AntdSchemaComponentProvider = function AntdSchemaComponentProvider(props) {
   var children = props.children;
   return /*#__PURE__*/React.createElement(SchemaComponentOptions, {
     scope: {
+      requestChartData: requestChartData,
       useFilterActionProps: useFilterActionProps
     },
     components: _objectSpread(_objectSpread({}, components), common)

package/es/schema-component/antd/g2plot/G2Plot.js

@@ -4,7 +4,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import { Area, Bar, Column, Line, Pie } from '@antv/g2plot';
+import { Area, Bar, BidirectionalBar, Box, Bullet, Chord, CirclePacking, Column, DualAxes, Facet, Funnel, Gauge, Heatmap, Histogram, Line, Liquid, Mix, Pie, Progress, Radar, RadialBar, RingProgress, Rose, Sankey, Scatter, Stock, Sunburst, TinyArea, TinyColumn, TinyLine, Treemap, Venn, Violin, Waterfall, WordCloud } from '@antv/g2plot';
 import { observer, useField } from '@formily/react';
 import { Spin } from 'antd';
 import cls from 'classnames';
@@ -13,11 +13,41 @@ import { useTranslation } from 'react-i18next';
 import { useAPIClient } from '../../../api-client';
 import { G2PlotDesigner } from './G2PlotDesigner';
 var plots = {
+  Line: Line,
   Area: Area,
   Column: Column,
-  Line: Line,
+  Bar: Bar,
   Pie: Pie,
-  Bar: Bar
+  Rose: Rose,
+  WordCloud: WordCloud,
+  Scatter: Scatter,
+  Radar: Radar,
+  DualAxes: DualAxes,
+  TinyLine: TinyLine,
+  TinyColumn: TinyColumn,
+  TinyArea: TinyArea,
+  Histogram: Histogram,
+  Progress: Progress,
+  RingProgress: RingProgress,
+  Heatmap: Heatmap,
+  Box: Box,
+  Violin: Violin,
+  Venn: Venn,
+  Stock: Stock,
+  Funnel: Funnel,
+  Liquid: Liquid,
+  Bullet: Bullet,
+  Sunburst: Sunburst,
+  Gauge: Gauge,
+  Waterfall: Waterfall,
+  RadialBar: RadialBar,
+  BidirectionalBar: BidirectionalBar,
+  Treemap: Treemap,
+  Sankey: Sankey,
+  Chord: Chord,
+  CirclePacking: CirclePacking,
+  Mix: Mix,
+  Facet: Facet
 };
 export var G2PlotRenderer = /*#__PURE__*/forwardRef(function (props, ref) {
   var className = props.className,

package/es/schema-component/antd/g2plot/requestChartData.d.ts

@@ -0,0 +1,4 @@
+import { APIClient } from '../../../api-client';
+export declare const requestChartData: (options: any) => (this: {
+    api: APIClient;
+}) => Promise<any>;

package/es/schema-component/antd/g2plot/requestChartData.js

@@ -0,0 +1,33 @@
+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); }); }; }
+
+export var requestChartData = function requestChartData(options) {
+  return /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+    var _response$data, response;
+
+    return regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            _context.next = 3;
+            return this.api.request(options);
+
+          case 3:
+            response = _context.sent;
+            return _context.abrupt("return", response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.data);
+
+          case 7:
+            _context.prev = 7;
+            _context.t0 = _context["catch"](0);
+            return _context.abrupt("return", []);
+
+          case 10:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, this, [[0, 7]]);
+  }));
+};

package/lib/acl/Configuration/schemas/scopes.js

@@ -55,6 +55,7 @@ var scopesSchema = {
           label: 'name',
           value: 'id'
         },
+        multiple: false,
         association: {
           target: 'rolesResourcesScopes'
         },

package/lib/schema-component/antd/AntdSchemaComponentProvider.js

@@ -17,6 +17,8 @@ var _SchemaComponentOptions = require("../core/SchemaComponentOptions");
 
 var _useFilterActionProps = require("./filter/useFilterActionProps");
 
+var _requestChartData = require("./g2plot/requestChartData");
+
 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; }
@@ -33,6 +35,7 @@ var AntdSchemaComponentProvider = function AntdSchemaComponentProvider(props) {
   var children = props.children;
   return /*#__PURE__*/_react.default.createElement(_SchemaComponentOptions.SchemaComponentOptions, {
     scope: {
+      requestChartData: _requestChartData.requestChartData,
       useFilterActionProps: _useFilterActionProps.useFilterActionProps
     },
     components: _objectSpread(_objectSpread({}, components), common)

package/lib/schema-component/antd/g2plot/G2Plot.js

@@ -36,11 +36,41 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 var plots = {
+  Line: _g2plot.Line,
   Area: _g2plot.Area,
   Column: _g2plot.Column,
-  Line: _g2plot.Line,
+  Bar: _g2plot.Bar,
   Pie: _g2plot.Pie,
-  Bar: _g2plot.Bar
+  Rose: _g2plot.Rose,
+  WordCloud: _g2plot.WordCloud,
+  Scatter: _g2plot.Scatter,
+  Radar: _g2plot.Radar,
+  DualAxes: _g2plot.DualAxes,
+  TinyLine: _g2plot.TinyLine,
+  TinyColumn: _g2plot.TinyColumn,
+  TinyArea: _g2plot.TinyArea,
+  Histogram: _g2plot.Histogram,
+  Progress: _g2plot.Progress,
+  RingProgress: _g2plot.RingProgress,
+  Heatmap: _g2plot.Heatmap,
+  Box: _g2plot.Box,
+  Violin: _g2plot.Violin,
+  Venn: _g2plot.Venn,
+  Stock: _g2plot.Stock,
+  Funnel: _g2plot.Funnel,
+  Liquid: _g2plot.Liquid,
+  Bullet: _g2plot.Bullet,
+  Sunburst: _g2plot.Sunburst,
+  Gauge: _g2plot.Gauge,
+  Waterfall: _g2plot.Waterfall,
+  RadialBar: _g2plot.RadialBar,
+  BidirectionalBar: _g2plot.BidirectionalBar,
+  Treemap: _g2plot.Treemap,
+  Sankey: _g2plot.Sankey,
+  Chord: _g2plot.Chord,
+  CirclePacking: _g2plot.CirclePacking,
+  Mix: _g2plot.Mix,
+  Facet: _g2plot.Facet
 };
 var G2PlotRenderer = /*#__PURE__*/(0, _react2.forwardRef)(function (props, ref) {
   var className = props.className,

package/lib/schema-component/antd/g2plot/requestChartData.d.ts

@@ -0,0 +1,4 @@
+import { APIClient } from '../../../api-client';
+export declare const requestChartData: (options: any) => (this: {
+    api: APIClient;
+}) => Promise<any>;

package/lib/schema-component/antd/g2plot/requestChartData.js

@@ -0,0 +1,42 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.requestChartData = void 0;
+
+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); }); }; }
+
+var requestChartData = function requestChartData(options) {
+  return /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+    var _response$data, response;
+
+    return regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            _context.next = 3;
+            return this.api.request(options);
+
+          case 3:
+            response = _context.sent;
+            return _context.abrupt("return", response === null || response === void 0 ? void 0 : (_response$data = response.data) === null || _response$data === void 0 ? void 0 : _response$data.data);
+
+          case 7:
+            _context.prev = 7;
+            _context.t0 = _context["catch"](0);
+            return _context.abrupt("return", []);
+
+          case 10:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, this, [[0, 7]]);
+  }));
+};
+
+exports.requestChartData = requestChartData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client",
-  "version": "0.7.2-alpha.1",
+  "version": "0.7.2-alpha.2",
   "license": "Apache-2.0",
   "licenses": [
     {
@@ -19,8 +19,8 @@
     "@formily/antd": "2.0.20",
     "@formily/core": "2.0.20",
     "@formily/react": "2.0.20",
-    "@nocobase/sdk": "0.7.2-alpha.1",
-    "@nocobase/utils": "0.7.2-alpha.1",
+    "@nocobase/sdk": "0.7.2-alpha.2",
+    "@nocobase/utils": "0.7.2-alpha.2",
     "ahooks": "^3.0.5",
     "antd": "~4.19.5",
     "axios": "^0.26.1",
@@ -52,5 +52,5 @@
     "@types/marked": "^4.0.1",
     "axios-mock-adapter": "^1.20.0"
   },
-  "gitHead": "2e7958360628d6306845aabcb1e574a8e91d08ad"
+  "gitHead": "a0cc50154cc292248ef107c95a24bcc0c7a586fa"
 }