@nocobase/plugin-charts 0.9.1-alpha.2 → 0.9.2-alpha.1

package/lib/client/templates/ColumnTemplate.js

@@ -4,19 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.columnTemplate = void 0;
-
 function _json() {
   const data = _interopRequireDefault(require("json5"));
-
   _json = function _json() {
     return data;
   };
-
   return data;
 }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const chartConfig = {
   appendPadding: 10,
   isGroup: true,

package/lib/client/templates/FunnelTemplate.js

@@ -4,19 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.funnelTemplate = void 0;
-
 function _json() {
   const data = _interopRequireDefault(require("json5"));
-
   _json = function _json() {
     return data;
   };
-
   return data;
 }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const chartConfig = {
   xField: '{{dimension}}',
   yField: '{{metric}}',

package/lib/client/templates/LineTemplate.js

@@ -4,26 +4,23 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.lineTemplate = void 0;
-
 function _json() {
   const data = _interopRequireDefault(require("json5"));
-
   _json = function _json() {
     return data;
   };
-
   return data;
 }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const chartConfig = {
   yField: '{{metric}}',
   xField: '{{dimension}}',
   seriesField: '{{category}}',
-  xAxis: {//type: 'time',
+  xAxis: {
+    //type: 'time',
   },
-  yAxis: {// label: {
+  yAxis: {
+    // label: {
     //   formatter: '{{(v) => `${v}`.replace(/\d{1,3}(?=(\d{3})+$)/g, (s) => `${s},`)}}',
     // },
   }

package/lib/client/templates/PieTemplate.js

@@ -4,19 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.pieTemplate = void 0;
-
 function _json() {
   const data = _interopRequireDefault(require("json5"));
-
   _json = function _json() {
     return data;
   };
-
   return data;
 }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const chartConfig = {
   appendPadding: 10,
   angleField: '{{metric}}',

package/lib/client/templates/RadarTemplate.js

@@ -4,19 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.radarTemplate = void 0;
-
 function _json() {
   const data = _interopRequireDefault(require("json5"));
-
   _json = function _json() {
     return data;
   };
-
   return data;
 }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const chartConfig = {
   xField: '{{dimension}}',
   yField: '{{metric}}',

package/lib/client/templates/ScatterTemplate.js

@@ -4,19 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.scatterTemplate = void 0;
-
 function _json() {
   const data = _interopRequireDefault(require("json5"));
-
   _json = function _json() {
     return data;
   };
-
   return data;
 }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const chartConfig = {
   appendPadding: 10,
   xField: '{{metric}}',

package/lib/client/templates/index.js

@@ -4,23 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.templates = void 0;
-
 var _PieTemplate = require("./PieTemplate");
-
 var _BarTemplate = require("./BarTemplate");
-
 var _ColumnTemplate = require("./ColumnTemplate");
-
 var _LineTemplate = require("./LineTemplate");
-
 var _AreaTemplate = require("./AreaTemplate");
-
 var _ScatterTemplate = require("./ScatterTemplate");
-
 var _RadarTemplate = require("./RadarTemplate");
-
 var _FunnelTemplate = require("./FunnelTemplate");
-
 const templates = new Map();
 exports.templates = templates;
 templates.set('Pie', _PieTemplate.pieTemplate);
@@ -30,4 +21,5 @@ templates.set('Bar', _BarTemplate.barTemplate);
 templates.set('Column', _ColumnTemplate.columnTemplate);
 templates.set('Scatter', _ScatterTemplate.scatterTemplate);
 templates.set('Radar', _RadarTemplate.radarTemplate);
-templates.set('Funnel', _FunnelTemplate.funnelTemplate); // templates.set('DataSetPreviewTable', tableTemplate);
+templates.set('Funnel', _FunnelTemplate.funnelTemplate);
+// templates.set('DataSetPreviewTable', tableTemplate);

package/lib/client/utils.js

@@ -4,50 +4,37 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.validateArray = exports.parseDataSetString = void 0;
-
 function _json() {
   const data = _interopRequireDefault(require("json5"));
-
   _json = function _json() {
     return data;
   };
-
   return data;
 }
-
 function _shared() {
   const data = require("@formily/shared");
-
   _shared = function _shared() {
     return data;
   };
-
   return data;
 }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const validateArray = value => {
   try {
     value = _json().default.parse(value);
   } catch (e) {
     return 'Please input validate dataset';
   }
-
   if (Array.isArray(value)) {
     if (value.every(item => {
       return typeof item === 'object' && Object.keys(item).length > 1;
     })) return true;
   }
-
   return 'Please input validate dataset';
 };
-
 exports.validateArray = validateArray;
-
 const parseDataSetString = str => {
   const dataSetDataArray = _json().default.parse(str);
-
   if (Array.isArray(dataSetDataArray)) {
     if (dataSetDataArray.every(item => {
       return typeof item === 'object' && Object.keys(item).length > 1;
@@ -55,12 +42,9 @@ const parseDataSetString = str => {
       if (!(item === null || item === void 0 ? void 0 : item.id)) {
         item.id = (0, _shared().uid)();
       }
-
       return item;
     });
   }
-
   return dataSetDataArray;
 };
-
 exports.parseDataSetString = parseDataSetString;

package/lib/index.js

@@ -9,7 +9,5 @@ Object.defineProperty(exports, "default", {
     return _server.default;
   }
 });
-
 var _server = _interopRequireDefault(require("./server"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/server/actions/chartsQueries.js

@@ -4,60 +4,51 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.validate = exports.listMetadata = exports.getData = void 0;
-
 function _json() {
   const data = _interopRequireDefault(require("json5"));
-
   _json = function _json() {
     return data;
   };
-
   return data;
 }
-
 var _query = require("../query");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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); }); }; }
-
 const getData = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(function* (ctx, next) {
     const filterByTk = ctx.action.params.filterByTk;
     const r = ctx.db.getRepository('chartsQueries');
-    const instance = yield r.findOne({
-      filterByTk
-    });
-    const result = yield _query.query[instance.type](instance.options, {
-      db: ctx.db,
-      skipError: true
-    });
-
-    if (typeof result === 'string') {
-      ctx.body = _json().default.parse(result);
-    } else {
-      ctx.body = result;
+    try {
+      const instance = yield r.findOne({
+        filterByTk
+      });
+      const result = yield _query.query[instance.type](instance.options, {
+        db: ctx.db,
+        skipError: true
+      });
+      if (typeof result === 'string') {
+        ctx.body = _json().default.parse(result);
+      } else {
+        ctx.body = result;
+      }
+    } catch (error) {
+      ctx.body = [];
+      ctx.logger.info('chartsQueries', error);
     }
-
     return next();
   });
-
   return function getData(_x, _x2) {
     return _ref.apply(this, arguments);
   };
 }();
-
 exports.getData = getData;
-
 const validate = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(function* (ctx, next) {
     const values = ctx.action.params.values;
     ctx.body = {
       errorMessage: ''
     };
-
     try {
       yield _query.query.sql(values, {
         db: ctx.db,
@@ -68,17 +59,13 @@ const validate = /*#__PURE__*/function () {
         errorMessage: error.message
       };
     }
-
     return next();
   });
-
   return function validate(_x3, _x4) {
     return _ref2.apply(this, arguments);
   };
 }();
-
 exports.validate = validate;
-
 const listMetadata = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator(function* (ctx, next) {
     const r = ctx.db.getRepository('chartsQueries');
@@ -95,10 +82,8 @@ const listMetadata = /*#__PURE__*/function () {
     });
     return next();
   });
-
   return function listMetadata(_x5, _x6) {
     return _ref3.apply(this, arguments);
   };
 }();
-
 exports.listMetadata = listMetadata;

package/lib/server/collections/chartsQueries.js

@@ -4,18 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 function _database() {
   const data = require("@nocobase/database");
-
   _database = function _database() {
     return data;
   };
-
   return data;
 }
-
 var _default = (0, _database().defineCollection)({
+  namespace: 'charts.chartsQueries',
+  duplicator: 'optional',
   name: 'chartsQueries',
   fields: [{
     name: 'title',
@@ -32,5 +30,4 @@ var _default = (0, _database().defineCollection)({
     defaultValue: []
   }]
 });
-
 exports.default = _default;

package/lib/server/index.js

@@ -9,7 +9,5 @@ Object.defineProperty(exports, "default", {
     return _plugin.default;
   }
 });
-
 var _plugin = _interopRequireDefault(require("./plugin"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/server/plugin.js

@@ -4,74 +4,53 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.ChartsPlugin = void 0;
-
 function _server() {
   const data = require("@nocobase/server");
-
   _server = function _server() {
     return data;
   };
-
   return data;
 }
-
 function _json() {
   const data = _interopRequireDefault(require("json5"));
-
   _json = function _json() {
     return data;
   };
-
   return data;
 }
-
 function _path() {
   const data = require("path");
-
   _path = function _path() {
     return data;
   };
-
   return data;
 }
-
 var _chartsQueries = require("./actions/chartsQueries");
-
 var _query = require("./query");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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); }); }; }
-
 class ChartsPlugin extends _server().Plugin {
   constructor(...args) {
     var _this;
-
     super(...args);
     _this = this;
-
     this.syncFields = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator(function* (instance, {
         transaction
       }) {
         var _data2;
-
         const _data = yield _query.query[instance.type](instance.options, {
           db: _this.db,
           transaction,
           validateSQL: true
         });
-
         let data;
-
         if (typeof _data === 'string') {
           data = _json().default.parse(_data);
         } else {
           data = _data;
         }
-
         const d = Array.isArray(data) ? (_data2 = data) === null || _data2 === void 0 ? void 0 : _data2[0] : data;
         const fields = Object.keys(d || {}).map(f => {
           return {
@@ -80,63 +59,48 @@ class ChartsPlugin extends _server().Plugin {
         });
         instance.set('fields', fields);
       });
-
       return function (_x, _x2) {
         return _ref.apply(this, arguments);
       };
     }();
   }
-
   afterAdd() {}
-
   beforeLoad() {
     this.app.db.on('chartsQueries.beforeCreate', this.syncFields);
     this.app.db.on('chartsQueries.beforeUpdate', this.syncFields);
   }
-
   load() {
     var _this2 = this;
-
     return _asyncToGenerator(function* () {
       yield _this2.db.import({
         directory: (0, _path().resolve)(__dirname, 'collections')
       });
-
       _this2.app.resourcer.registerActionHandlers({
         'chartsQueries:getData': _chartsQueries.getData,
         'chartsQueries:listMetadata': _chartsQueries.listMetadata,
         'chartsQueries:validate': _chartsQueries.validate
       });
-
       _this2.app.acl.registerSnippet({
         name: 'pm.charts.queries',
         actions: ['chartsQueries:*']
       });
-
       _this2.app.acl.allow('chartsQueries', 'getData', 'loggedIn');
-
       _this2.app.acl.allow('chartsQueries', 'listMetadata', 'loggedIn');
     })();
   }
-
   install(options) {
     return _asyncToGenerator(function* () {})();
   }
-
   afterEnable() {
     return _asyncToGenerator(function* () {})();
   }
-
   afterDisable() {
     return _asyncToGenerator(function* () {})();
   }
-
   remove() {
     return _asyncToGenerator(function* () {})();
   }
-
 }
-
 exports.ChartsPlugin = ChartsPlugin;
 var _default = ChartsPlugin;
 exports.default = _default;

package/lib/server/query.js

@@ -4,44 +4,31 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.query = exports.default = void 0;
-
 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 = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
+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; }
-
 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); }); }; }
-
 const query = {
   api: function () {
     var _api = _asyncToGenerator(function* (options) {
       return [];
     });
-
     function api(_x) {
       return _api.apply(this, arguments);
     }
-
     return api;
   }(),
   json: function () {
     var _json = _asyncToGenerator(function* (options) {
       return options.data || [];
     });
-
     function json(_x2) {
       return _json.apply(this, arguments);
     }
-
     return json;
   }(),
   sql: function () {
@@ -54,35 +41,28 @@ const query = {
       try {
         // 分号截取，只取第一段
         const sql = options.sql.trim().split(';').shift();
-
         if (!sql) {
           throw new Error('SQL is empty');
         }
-
         if (!/^select/i.test(sql) && !/^with([\s\S]+)select([\s\S]+)/i.test(sql)) {
           throw new Error('Only select query allowed');
         }
-
         const _yield$db$sequelize$q = yield db.sequelize.query(sql, {
-          transaction
-        }),
-              _yield$db$sequelize$q2 = _slicedToArray(_yield$db$sequelize$q, 1),
-              data = _yield$db$sequelize$q2[0];
-
+            transaction
+          }),
+          _yield$db$sequelize$q2 = _slicedToArray(_yield$db$sequelize$q, 1),
+          data = _yield$db$sequelize$q2[0];
         return data;
       } catch (error) {
         if (skipError) {
           return [];
         }
-
         throw error;
       }
     });
-
     function sql(_x3, _x4) {
       return _sql.apply(this, arguments);
     }
-
     return sql;
   }()
 };

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@nocobase/plugin-charts",
-  "version": "0.9.1-alpha.2",
+  "version": "0.9.2-alpha.1",
   "main": "lib/server/index.js",
   "devDependencies": {
-    "@nocobase/client": "0.9.1-alpha.2",
-    "@nocobase/server": "0.9.1-alpha.2",
-    "@nocobase/test": "0.9.1-alpha.2"
+    "@nocobase/client": "0.9.2-alpha.1",
+    "@nocobase/server": "0.9.2-alpha.1",
+    "@nocobase/test": "0.9.2-alpha.1"
   },
   "dependencies": {
     "json5": "^2.2.3"
   },
-  "gitHead": "d588a68eca4feed4642a4cb317301011266fe5c9"
+  "gitHead": "a4f103eb0144f07205aff7b2a6be8ea6aa1330df"
 }

package/src/client/DataSetPreviewTable.tsx

@@ -40,7 +40,6 @@ export default ({ queryId, fields }: { queryId: number; fields }) => {
         type: 'array',
         'x-component': 'TableV2',
         'x-component-props': {
-          rowKey: 'id',
           scroll: { y: 300 },
         },
         default: dataSet,
@@ -63,6 +62,14 @@ export default ({ queryId, fields }: { queryId: number; fields }) => {
         <Spin />
       </>
     );
+  //对dataset中引用类型数据类型进行序列化处理
+  dataSet.forEach((item) => {
+    for (const key in item) {
+      if (item[key] && item[key] instanceof Object) {
+        item[key] = JSON.stringify(item[key]);
+      }
+    }
+  });
   return (
     <SchemaComponentProvider scope={{ dataSet }} components={{ TableV2, Input, FormItem }}>
       <BlockSchemaComponentProvider>

package/src/client/locale/pt-BR.ts

@@ -0,0 +1,23 @@
+export default {
+  Edit: 'Editar',
+  Delete: 'Delete',
+  Cancel: 'Cancelar',
+  Submit: 'Enviar',
+  Actions: 'Ações',
+  Title: 'Titulo',
+  Enable: 'Ativo',
+  'SAML manager': 'Gerenciador SAML',
+'SAML Providers': 'Provedores SAML',
+'Redirect url': 'URL de redirecionamento',
+'SP entity id': 'ID de entidade do provedor de serviço (SP)',
+'Add provider': 'Adicionar',
+'Edit provider': 'Editar',
+'Client id': 'ID do cliente',
+'Entity id or issuer': 'ID de entidade ou emissor',
+'Login Url': 'URL de login',
+'Public cert': 'Certificado público',
+'Delete provider': 'Excluir',
+'Are you sure you want to delete it?': 'Tem certeza de que deseja excluí-lo?',
+'Sign in button name, which will be displayed on the sign in page':
+'Nome do botão de login, que será exibido na página de login',
+};