@nocobase/plugin-data-visualization 1.7.0-beta.3 → 1.7.0-beta.31

package/dist/client/utils.d.ts

@@ -148,9 +148,6 @@ export declare const getSelectedFields: (fields: FieldOption[], query: QueryProp
     target?: string;
     targetFields?: FieldOption[];
 }[];
-export declare const processData: (selectedFields: (FieldOption & {
-    query?: any;
-})[], data: any[], scope: any) => {}[];
 export declare const removeUnparsableFilter: (filter: any) => any;
 export declare const getValuesByPath: (values: any, path: string) => any;
 export declare const getFormulaComponent: (type: string) => string;

package/dist/externalVersion.js

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

package/dist/locale/it-IT.json

@@ -3,7 +3,7 @@
   "Delete": "Elimina",
   "Cancel": "Annulla",
   "Submit": "Invia",
-  "Actions": "Operazioni",
+  "Actions": "Azioni",
   "Title": "Titolo",
   "Enable": "Abilita",
   "Chart": "Grafico",
@@ -76,7 +76,7 @@
   "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 \"Current filter\" nella configurazione del grafico.",
+  "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",

package/dist/locale/nl-NL.json

@@ -5,97 +5,97 @@
     "Submit": "Indienen",
     "Actions": "Acties",
     "Title": "Titel",
-    "Enable": "Enable",
-    "Chart": "Chart",
-    "ChartV2": "ChartV2",
-    "Charts": "Charts",
+    "Enable": "Inschakelen",
+    "Chart": "Grafiek",
+    "ChartV2": "GrafiekV2",
+    "Charts": "Grafieken",
     "Configure": "Configureren",
     "Duplicate": "Dupliceren",
-    "Configure chart": "Configure chart",
-    "Transform": "Transform",
+    "Configure chart": "Configureer grafiek",
+    "Transform": "Transformeer",
     "Chart type": "Grafiektype",
-    "JSON config": "JSON config",
+    "JSON config": "JSON configuratie",
     "Query": "Query",
     "Data": "Data",
-    "Run query": "Run query",
-    "Measures": "Measures",
-    "Dimensions": "Dimensions",
+    "Run query": "Query uitvoeren",
+    "Measures": "Afmetingen",
+    "Dimensions": "Dimensies",
     "Filter": "Filter",
     "Sort": "Sorteren",
-    "Limit": "Limit",
+    "Limit": "Limiet",
     "Offset": "Offset",
-    "Enable cache": "Enable cache",
-    "TTL (second)": "TTL (second)",
-    "Field": "Veld",
-    "Aggregation": "Aggregation",
+    "Enable cache": "Cache inschakelen",
+    "TTL (second)": "TTL (seconde)",
+    "veld": "Veld",
+    "Aggregation": "Aggregatie",
     "Alias": "Alias",
     "Format": "Formaat",
-    "The first 10 records of the query result:": "The first 10 records of the query result:",
-    "Please run query to retrive data.": "Please run query to retrive data.",
+    "The first 10 records of the query result:": "De eerste 10 records van het queryresultaat:",
+    "Please run query to retrive data.": "Voer query uit om gegevens op te halen.",
     "Type": "Type",
-    "Add field": "Voeg veld toe",
-    "Add chart": "Add chart",
-    "xField": "X field",
-    "yField": "Y field",
-    "seriesField": "Series field",
-    "angleField": "Angle field",
-    "colorField": "Color field",
-    "Line": "Line",
+    "Add veld": "Voeg veld toe",
+    "Add chart": "Voeg grafiek toe",
+    "xField": "X veld",
+    "yField": "Y veld",
+    "seriesField": "Serie veld",
+    "angleField": "Hoek veld",
+    "colorField": "Kleur veld",
+    "Line": "Lijn",
     "Area": "Gebied",
     "Column": "Kolom",
     "Bar": "Bar",
-    "Pie": "Pie",
-    "Dual axes": "Dual axes",
+    "Pie": "Taart",
+    "Dual axes": "Dubbele assen",
     "Scatter": "Scatter",
     "Gauge": "Gauge",
-    "Statistic": "Statistic",
-    "Currency": "Currency",
+    "Statistic": "Statistiek",
+    "Currency": "Munteenheid",
     "Percent": "Percentage",
     "Exponential": "Exponential",
-    "Abbreviation": "Abbreviation",
-    "Please configure and run query": "Please configure and run query",
-    "Please configure chart": "Please configure chart",
-    "Are you sure to cancel?": "Are you sure to cancel?",
-    "You changes are not saved. If you click OK, your changes will be lost.": "You changes are not saved. If you click OK, your changes will be lost.",
-    "Same properties set in the form above will be overwritten by this JSON config.": "Same properties set in the form above will be overwritten by this JSON config.",
+    "Abbreviation": "Afkorting",
+    "Please configure and run query": "Configureer en voer de query uit",
+    "Please configure chart": "Configureer grafiek",
+    "Are you sure to cancel?": "Ben je zeker dat je wil annuleren?",
+    "You changes are not saved. If you click OK, your changes will be lost.": "Je wijzigingen worden niet opgeslagen. Als je op OK klikt, gaan je wijzigingen verloren.",
+    "Same properties set in the form above will be overwritten by this JSON config.": "Sommige eigenschappen die in het bovenstaande formulier zijn ingesteld, worden overschreven door deze JSON-configuratie.",
     "Built-in": "Ingebouwd",
-    "Config reference: ": "Config reference: ",
+    "Config reference: ": "Configuratie referentie: ",
     "Table": "Tabel",
-    "Sum": "Sum",
-    "Avg": "Avg",
-    "Count": "Count",
+    "Sum": "Som",
+    "Avg": "Gem",
+    "Count": "Aantal",
     "Min": "Min",
     "Max": "Max",
-    "Please select a chart type.": "Please select a chart type.",
+    "Please select a chart type.": "Kies een grafiektype.",
     "Collection": "Collectie",
-    "isStack": "isStack",
-    "isPercent": "isPercent",
-    "isGroup": "isGroup",
-    "smooth": "smooth",
-    "Expand": "Expand",
-    "Current filter": "Current filter",
-    "Add custom field": "Add custom field",
-    "To filter with custom fields, use \"Current filter\" variables in the chart configuration.": "To filter with custom fields, use \"Current filter\" variables in the chart configuration.",
-    "Input": "Input",
-    "Date range": "Date range",
-    "Time range": "Time range",
-    "Edit field properties": "Edit field properties",
-    "Select a source field to use metadata of the field": "Select a source field to use metadata of the field",
-    "Original field": "Original field",
-    "Transformation": "Transformation",
-    "Add transformation": "Add transformation",
+    "isStack": "isStapel",
+    "isPercent": "isPercentage",
+    "isGroup": "isGroep",
+    "smooth": "glad",
+    "Expand": "Uitbreiden",
+    "Current filter": "Huidige filter",
+    "Add custom veld": "Aangepast veld toevoegen",
+    "To filter with custom fields, use \"Current filter\" variables in the chart configuration.": "Als je wil filteren met aangepaste velden, gebruik je de variabelen \"Current filter\" in de grafiekconfiguratie.",
+    "Input": "Invoer",
+    "Date range": "Datumbereik",
+    "Time range": "Tijdsbereik",
+    "Edit veld properties": "Bewerk veld eigenschappen",
+    "Select a source veld to use metadata of the veld": "Selecteer een bronveld om metagegevens van het veld te gebruiken",
+    "Original veld": "Origineel veld",
+    "Transformation": "Transformatie",
+    "Add transformation": "Transformatie toevoegen",
     "Container": "Container",
-    "Show border": "Show border",
-    "Transformation tip": "Fields allow multiple transformations, applied sequentially. Pay attention to data type changes after each transformation. Drag-and-drop functionality enables adjustment of transformation order.",
-    "Type conversion": "Type conversion",
-    "Transformer": "Transformer",
+    "Show border": "Toon rand",
+    "Transformation tip": "Velden staan ​​meerdere transformaties toe, die sequentieel worden toegepast. Let op wijzigingen in het gegevenstype na elke transformatie. Drag-and-drop-functionaliteit maakt aanpassing van de transformatievolgorde mogelijk.",
+    "Type conversion": "Type conversie",
+    "Transformer": "Transformeer",
     "Size": "Grootte",
-    "Width": "Width",
-    "Height": "Height",
+    "Width": "Breedte",
+    "Height": "Hoogte",
     "Aspect ratio": "Aspect ratio",
-    "Fixed height": "Fixed height",
-    "Show background": "Show background",
-    "Show padding": "Show padding",
-    "Distinct": "Distinct",
-    "Auto refresh": "Auto refresh"
+    "Fixed height": "Vaste hoogte",
+    "Show background": "Toon achtergrond",
+    "Show padding": "Toon opvulling",
+    "Distinct": "Onderscheiden",
+    "Auto refresh": "Auto vernieuwing"
 }

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":"2025-03-13T23:28:46.405Z"}
+{"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-05-15T09:25:18.207Z"}

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":"2025-03-13T23:28:47.069Z"}
+{"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-05-15T09:25:18.832Z"}

package/dist/server/actions/query.js

@@ -170,11 +170,16 @@ const parseFieldAndAssociations = async (ctx, next) => {
     const stack = [...filterInclude];
     while (stack.length) {
       const item = stack.pop();
-      if (((_a = fields.get(item.association)) == null ? void 0 : _a.type) === "belongsToMany") {
+      const parentCollection = db.getCollection(item.parentCollection || collectionName);
+      const field = parentCollection.fields.get(item.association);
+      if ((field == null ? void 0 : field.type) === "belongsToMany") {
         item.through = { attributes: [] };
       }
-      if (item.include) {
-        stack.push(...item.include);
+      if ((field == null ? void 0 : field.target) && ((_a = item.include) == null ? void 0 : _a.length)) {
+        for (const child of item.include) {
+          child.parentCollection = field.target;
+          stack.push(child);
+        }
       }
     }
   }
@@ -215,10 +220,10 @@ const cacheMiddleware = async (ctx, next) => {
 const checkPermission = (ctx, next) => {
   var _a;
   const { collection, dataSource } = ctx.action.params.values;
-  const roleName = ctx.state.currentRole || "anonymous";
+  const roleNames = ctx.state.currentRoles || ["anonymous"];
   const acl = ((_a = ctx.app.dataSourceManager.get(dataSource)) == null ? void 0 : _a.acl) || ctx.app.acl;
-  const can = acl.can({ role: roleName, resource: collection, action: "list" });
-  if (!can && roleName !== "root") {
+  const can = acl.can({ roles: roleNames, resource: collection, action: "list" });
+  if (!can && !roleNames.includes("root")) {
     ctx.throw(403, "No permissions");
   }
   return next();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/plugin-data-visualization",
-  "version": "1.7.0-beta.3",
+  "version": "1.7.0-beta.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": "8d52cb1d366a968f87c1cd3f98f55f24be3056a5",
+  "gitHead": "84bf8bcfeeaf3a05086e24cef00507ca209ac3c5",
   "keywords": [
     "Blocks"
   ]