@nocobase/plugin-data-visualization 1.6.0-alpha.3 → 1.6.0-alpha.31

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

@@ -32,6 +32,7 @@ export type QueryProps = Partial<{
     }[];
     filter: any;
     limit: number;
+    offset: number;
     sql: {
         fields?: string;
         clauses?: string;

package/dist/externalVersion.js

@@ -8,24 +8,24 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.6.0-alpha.3",
+  "@nocobase/client": "1.6.0-alpha.31",
   "dayjs": "1.11.10",
   "@formily/react": "2.3.0",
   "@formily/shared": "2.3.2",
   "lodash": "4.17.21",
   "react": "18.2.0",
-  "@nocobase/cache": "1.6.0-alpha.3",
-  "@nocobase/server": "1.6.0-alpha.3",
-  "@nocobase/test": "1.6.0-alpha.3",
+  "@nocobase/cache": "1.6.0-alpha.31",
+  "@nocobase/server": "1.6.0-alpha.31",
+  "@nocobase/test": "1.6.0-alpha.31",
   "@emotion/css": "11.13.0",
-  "@ant-design/icons": "5.2.6",
+  "@ant-design/icons": "5.6.1",
   "ahooks": "3.7.8",
   "antd": "5.12.8",
   "@formily/antd-v5": "1.1.9",
   "@formily/core": "2.3.0",
-  "@nocobase/utils": "1.6.0-alpha.3",
+  "@nocobase/utils": "1.6.0-alpha.31",
   "react-i18next": "11.18.6",
-  "@nocobase/actions": "1.6.0-alpha.3",
-  "@nocobase/database": "1.6.0-alpha.3",
+  "@nocobase/actions": "1.6.0-alpha.31",
+  "@nocobase/database": "1.6.0-alpha.31",
   "sequelize": "6.35.2"
 };

package/dist/locale/en-US.json

@@ -23,6 +23,7 @@
   "Filter": "Filter",
   "Sort": "Sort",
   "Limit": "Limit",
+  "Offset": "Offset",
   "Enable cache": "Enable cache",
   "TTL (second)": "TTL (second)",
   "Field": "Field",

package/dist/locale/it-IT.json

@@ -0,0 +1,101 @@
+{
+  "Edit": "Modifica",
+  "Delete": "Elimina",
+  "Cancel": "Annulla",
+  "Submit": "Invia",
+  "Actions": "Operazioni",
+  "Title": "Titolo",
+  "Enable": "Abilita",
+  "Chart": "Grafico",
+  "ChartV2": "GraficoV2",
+  "Charts": "Grafici",
+  "Configure": "Configura",
+  "Duplicate": "Duplica",
+  "Configure chart": "Configura grafico",
+  "Transform": "Trasforma",
+  "Chart type": "Tipo di grafico",
+  "JSON config": "Configurazione JSON",
+  "Query": "Query",
+  "Data": "Dati",
+  "Run query": "Esegui query",
+  "Measures": "Misure",
+  "Dimensions": "Dimensioni",
+  "Filter": "Filtro",
+  "Sort": "Ordina",
+  "Limit": "Limite",
+  "Offset": "Offset",
+  "Enable cache": "Abilita cache",
+  "TTL (second)": "TTL (secondi)",
+  "Field": "Campo",
+  "Aggregation": "Aggregazione",
+  "Alias": "Alias",
+  "Format": "Formato",
+  "The first 10 records of the query result:": "I primi 10 record del risultato della query:",
+  "Please run query to retrive data.": "Esegui la query per recuperare i dati.",
+  "Type": "Tipo",
+  "Add field": "Aggiungi campo",
+  "Add chart": "Aggiungi grafico",
+  "xField": "Campo X",
+  "yField": "Campo Y",
+  "seriesField": "Campo serie",
+  "angleField": "Campo angolo",
+  "colorField": "Campo colore",
+  "Line": "Linee",
+  "Area": "Area",
+  "Column": "Colonne",
+  "Bar": "Barra",
+  "Pie": "Torta",
+  "Dual axes": "Doppi assi",
+  "Scatter": "Dispersione",
+  "Gauge": "Indicatore",
+  "Statistic": "Statistica",
+  "Currency": "Valuta",
+  "Percent": "Percentuale",
+  "Exponential": "Esponenziale",
+  "Abbreviation": "Abbreviazione",
+  "Please configure and run query": "Configura ed esegui la query",
+  "Please configure chart": "Configura il grafico",
+  "Are you sure to cancel?": "Sei sicuro di voler annullare?",
+  "You changes are not saved. If you click OK, your changes will be lost.": "Le modifiche non sono state salvate. Se fai clic su OK, le modifiche andranno perse.",
+  "Same properties set in the form above will be overwritten by this JSON config.": "Le stesse proprietà impostate nel modulo sopra verranno sovrascritte da questa configurazione JSON.",
+  "Built-in": "Integrato",
+  "Config reference: ": "Riferimento configurazione: ",
+  "Table": "Tabella",
+  "Sum": "Somma",
+  "Avg": "Media",
+  "Count": "Conteggio",
+  "Min": "Minimo",
+  "Max": "Massimo",
+  "Please select a chart type.": "Seleziona un tipo di grafico.",
+  "Collection": "Raccolta",
+  "isStack": "èSovrapposto",
+  "isPercent": "èPercentuale",
+  "isGroup": "èGruppo",
+  "smooth": "smussato",
+  "Expand": "Espandi",
+  "Current filter": "Filtro corrente",
+  "Add custom field": "Aggiungi campo personalizzato",
+  "To filter with custom fields, use \"Current filter\" variables in the chart configuration.": "Per filtrare con campi personalizzati, utilizza le variabili \"Filtro corrente\" nella configurazione del grafico.",
+  "Input": "Input",
+  "Date range": "Intervallo date",
+  "Time range": "Intervallo tempo",
+  "Edit field properties": "Modifica proprietà del campo",
+  "Select a source field to use metadata of the field": "Seleziona un campo origine per utilizzare i metadati del campo",
+  "Original field": "Campo originale",
+  "Transformation": "Trasformazione",
+  "Add transformation": "Aggiungi trasformazione",
+  "Container": "Contenitore",
+  "Show border": "Mostra bordo",
+  "Transformation tip": "I campi consentono trasformazioni multiple, applicate in sequenza. Presta attenzione alle modifiche del tipo di dati dopo ogni trasformazione. La funzionalità di trascinamento consente di regolare l'ordine delle trasformazioni.",
+  "Type conversion": "Conversione tipo",
+  "Transformer": "Trasformatore",
+  "Size": "Dimensione",
+  "Width": "Larghezza",
+  "Height": "Altezza",
+  "Aspect ratio": "Proporzioni",
+  "Fixed height": "Altezza fissa",
+  "Show background": "Mostra sfondo",
+  "Show padding": "Mostra spaziatura interna",
+  "Distinct": "Rimuovi duplicati",
+  "Auto refresh": "Aggiornamento automatico"
+}

package/dist/locale/ja-JP.json

@@ -23,6 +23,7 @@
   "Filter": "フィルター",
   "Sort": "ソート",
   "Limit": "制限",
+  "Offset": "スキップする件数",
   "Enable cache": "キャッシュを有効化",
   "TTL (second)": "TTL（秒）",
   "Field": "フィールド",
@@ -97,4 +98,4 @@
   "Show padding": "パディングを表示",
   "Distinct": "重複排除",
   "Collapse": "折りたたみ"
-}
+}

package/dist/locale/ko-KR.json

@@ -23,6 +23,7 @@
   "Filter": "필터",
   "Sort": "정렬",
   "Limit": "결과 제한",
+  "Offset": "건너뛸 개수",
   "Enable cache": "캐시 활성화",
   "TTL (second)": "TTL (초)",
   "Field": "필드",

package/dist/locale/zh-CN.json

@@ -23,6 +23,7 @@
   "Filter": "过滤",
   "Sort": "排序",
   "Limit": "结果数量",
+  "Offset": "跳过数量",
   "Enable cache": "启用缓存",
   "TTL (second)": "缓存时间 (秒)",
   "Field": "字段",

package/dist/node_modules/koa-compose/package.json

@@ -1 +1 @@
-{"name":"koa-compose","description":"compose Koa middleware","repository":"koajs/compose","version":"4.1.0","keywords":["koa","middleware","compose"],"files":["index.js"],"dependencies":{},"devDependencies":{"codecov":"^3.0.0","jest":"^21.0.0","matcha":"^0.7.0","standard":"^10.0.3"},"scripts":{"bench":"matcha bench/bench.js","lint":"standard --fix .","test":"jest --forceExit --coverage"},"jest":{"testEnvironment":"node"},"license":"MIT","_lastModified":"2024-12-09T02:49:57.204Z"}
+{"name":"koa-compose","description":"compose Koa middleware","repository":"koajs/compose","version":"4.1.0","keywords":["koa","middleware","compose"],"files":["index.js"],"dependencies":{},"devDependencies":{"codecov":"^3.0.0","jest":"^21.0.0","matcha":"^0.7.0","standard":"^10.0.3"},"scripts":{"bench":"matcha bench/bench.js","lint":"standard --fix .","test":"jest --forceExit --coverage"},"jest":{"testEnvironment":"node"},"license":"MIT","_lastModified":"2025-03-10T17:52:12.591Z"}

package/dist/node_modules/moment-timezone/package.json

@@ -1 +1 @@
-{"name":"moment-timezone","version":"0.5.43","description":"Parse and display moments in any timezone.","homepage":"http://momentjs.com/timezone/","author":"Tim Wood <washwithcare@gmail.com> (http://timwoodcreates.com/)","keywords":["moment","date","time","timezone","olson","iana","zone","tz"],"main":"./index.js","typings":"./index.d.ts","engines":{"node":"*"},"repository":{"type":"git","url":"https://github.com/moment/moment-timezone.git"},"bugs":{"url":"https://github.com/moment/moment-timezone/issues"},"license":"MIT","dependencies":{"moment":"^2.29.4"},"devDependencies":{"grunt":"^1.5.3","grunt-contrib-clean":"^2.0.1","grunt-contrib-jshint":"^3.2.0","grunt-contrib-nodeunit":"^4.0.0","grunt-contrib-uglify":"^5.2.2","grunt-exec":"^3.0.0","typescript":"^3.5.1"},"jspm":{"main":"builds/moment-timezone-with-data","shim":{"moment-timezone":{"deps":["moment"]}}},"scripts":{"test":"grunt"},"_lastModified":"2024-12-09T02:49:57.979Z"}
+{"name":"moment-timezone","version":"0.5.43","description":"Parse and display moments in any timezone.","homepage":"http://momentjs.com/timezone/","author":"Tim Wood <washwithcare@gmail.com> (http://timwoodcreates.com/)","keywords":["moment","date","time","timezone","olson","iana","zone","tz"],"main":"./index.js","typings":"./index.d.ts","engines":{"node":"*"},"repository":{"type":"git","url":"https://github.com/moment/moment-timezone.git"},"bugs":{"url":"https://github.com/moment/moment-timezone/issues"},"license":"MIT","dependencies":{"moment":"^2.29.4"},"devDependencies":{"grunt":"^1.5.3","grunt-contrib-clean":"^2.0.1","grunt-contrib-jshint":"^3.2.0","grunt-contrib-nodeunit":"^4.0.0","grunt-contrib-uglify":"^5.2.2","grunt-exec":"^3.0.0","typescript":"^3.5.1"},"jspm":{"main":"builds/moment-timezone-with-data","shim":{"moment-timezone":{"deps":["moment"]}}},"scripts":{"test":"grunt"},"_lastModified":"2025-03-10T17:52:13.245Z"}

package/dist/server/actions/query.js

@@ -87,6 +87,7 @@ const queryData = async (ctx, next) => {
   await next();
 };
 const parseFieldAndAssociations = async (ctx, next) => {
+  var _a;
   const {
     dataSource,
     collection: collectionName,
@@ -101,7 +102,7 @@ const parseFieldAndAssociations = async (ctx, next) => {
   const associations = collection.model.associations;
   const models = {};
   const parseField = (selected) => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a2, _b, _c, _d, _e, _f;
     let target;
     let name;
     if (!Array.isArray(selected.field)) {
@@ -112,7 +113,7 @@ const parseFieldAndAssociations = async (ctx, next) => {
       [target, name] = selected.field;
     }
     const rawAttributes = collection.model.getAttributes();
-    let field = ((_a = rawAttributes[name]) == null ? void 0 : _a.field) || name;
+    let field = ((_a2 = rawAttributes[name]) == null ? void 0 : _a2.field) || name;
     let fieldType = (_b = fields.get(name)) == null ? void 0 : _b.type;
     let fieldOptions = (_c = fields.get(name)) == null ? void 0 : _c.options;
     if (target) {
@@ -165,20 +166,25 @@ const parseFieldAndAssociations = async (ctx, next) => {
     collection
   });
   const { where, include: filterInclude } = filterParser.toSequelizeParams();
-  const parsedFilterInclude = filterInclude == null ? void 0 : filterInclude.map((item) => {
-    var _a;
-    if (((_a = fields.get(item.association)) == null ? void 0 : _a.type) === "belongsToMany") {
-      item.through = { attributes: [] };
+  if (filterInclude) {
+    const stack = [...filterInclude];
+    while (stack.length) {
+      const item = stack.pop();
+      if (((_a = fields.get(item.association)) == null ? void 0 : _a.type) === "belongsToMany") {
+        item.through = { attributes: [] };
+      }
+      if (item.include) {
+        stack.push(...item.include);
+      }
     }
-    return item;
-  });
+  }
   ctx.action.params.values = {
     ...ctx.action.params.values,
     where,
     measures: parsedMeasures,
     dimensions: parsedDimensions,
     orders: parsedOrders,
-    include: [...include, ...parsedFilterInclude || []]
+    include: [...include, ...filterInclude || []]
   };
   await next();
 };

package/dist/server/query-parser/query-parser.js

@@ -96,14 +96,21 @@ class QueryParser {
     orders.forEach((item) => {
       const alias = sequelize.getQueryInterface().quoteIdentifier(item.alias);
       const name = hasAgg ? sequelize.literal(alias) : sequelize.col(item.field);
-      order.push([name, item.order || "ASC"]);
+      let sort = item.order || "ASC";
+      if (item.nulls === "first") {
+        sort += " NULLS FIRST";
+      }
+      if (item.nulls === "last") {
+        sort += " NULLS LAST";
+      }
+      order.push([name, sort]);
     });
     return order;
   }
   parse() {
     return async (ctx, next) => {
       var _a;
-      const { measures, dimensions, orders, include, where, limit } = ctx.action.params.values;
+      const { measures, dimensions, orders, include, where, limit, offset } = ctx.action.params.values;
       const { attributes: measureAttributes, fieldMap: measureFieldMap, hasAgg } = this.parseMeasures(ctx, measures);
       const {
         attributes: dimensionAttributes,
@@ -111,18 +118,22 @@ class QueryParser {
         fieldMap: dimensionFieldMap
       } = this.parseDimensions(ctx, dimensions, hasAgg, (_a = ctx.get) == null ? void 0 : _a.call(ctx, "x-timezone"));
       const order = this.parseOrders(ctx, orders, hasAgg);
+      const queryParams = {
+        where,
+        attributes: [...measureAttributes, ...dimensionAttributes],
+        include,
+        group,
+        order,
+        subQuery: false,
+        raw: true
+      };
+      if (!hasAgg || dimensions.length) {
+        queryParams["limit"] = limit || 2e3;
+        queryParams["offset"] = offset || 0;
+      }
       ctx.action.params.values = {
         ...ctx.action.params.values,
-        queryParams: {
-          where,
-          attributes: [...measureAttributes, ...dimensionAttributes],
-          include,
-          group,
-          order,
-          limit: limit || 2e3,
-          subQuery: false,
-          raw: true
-        },
+        queryParams,
         fieldMap: { ...measureFieldMap, ...dimensionFieldMap }
       };
       await next();

package/dist/server/types.d.ts

@@ -24,6 +24,7 @@ export type OrderProps = {
     field: string | string[];
     alias?: string;
     order?: 'asc' | 'desc';
+    nulls?: 'default' | 'first' | 'last';
 };
 export type QueryParams = Partial<{
     uid: string;
@@ -34,6 +35,7 @@ export type QueryParams = Partial<{
     orders: OrderProps[];
     filter: any;
     limit: number;
+    offset: number;
     sql: {
         fields?: string;
         clauses?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-visualization",
-  "version": "1.6.0-alpha.3",
+  "version": "1.6.0-alpha.31",
   "displayName": "Data visualization",
   "displayName.zh-CN": "数据可视化",
   "description": "Provides data visualization feature, including chart block and chart filter block, support line charts, area charts, bar charts and more than a dozen kinds of charts, you can also extend more chart types.",
@@ -34,7 +34,7 @@
     "@nocobase/test": "1.x",
     "@nocobase/utils": "1.x"
   },
-  "gitHead": "205b4aca5556d5af70679fa401394943a9e51670",
+  "gitHead": "2f118f0a0691dd51c437f208b1166258a615b6a8",
   "keywords": [
     "Blocks"
   ]