sea-chart 0.0.66-alpha.2 → 0.0.66-alpha.3

package/dist/components/statistic-record-dialog/index.js

@@ -31,7 +31,8 @@ class StatisticRecordDialog extends React.Component {
       } = statisticRecord || {};
       const {
         table_id,
-        view_id
+        view_id,
+        filters
       } = chart.config;
       this.table = getTableById(tables, table_id);
       if (view_id) {
@@ -41,17 +42,17 @@ class StatisticRecordDialog extends React.Component {
       this.unShowColumnKeyList = this.getUnShowColumnKeyList(this.view);
       this.renderedColumns = this.getRenderedColumns(this.table);
       if (this.isArchiveView || !isCalculateByView || (rows === null || rows === void 0 ? void 0 : rows.length) === 0) {
-        var _context$api, _context$api2, _context$api3;
-        console.log((_context$api = context.api) === null || _context$api === void 0 ? void 0 : _context$api.customQueryRows);
-        if ((_context$api2 = context.api) === null || _context$api2 === void 0 ? void 0 : _context$api2.customQueryRows) {
-          const chartDataSQL = new ChartDataSQL({
-            table: this.table,
-            view: this.view,
-            chart
-          });
-          console.log('chartDataSQL', chartDataSQL.filter_sql);
-          const detailFilterConditions = (chartDataSQL === null || chartDataSQL === void 0 ? void 0 : chartDataSQL.filter_sql) || {
-            filters: []
+        var _context$api, _context$api2;
+        if ((_context$api = context.api) === null || _context$api === void 0 ? void 0 : _context$api.customQueryRows) {
+          const newFilters = (filters === null || filters === void 0 ? void 0 : filters.map(item => {
+            return {
+              ...item,
+              column_key: (item === null || item === void 0 ? void 0 : item.column_key) || '',
+              value: (item === null || item === void 0 ? void 0 : item.filter_term) || ''
+            };
+          })) || [];
+          const detailFilterConditions = {
+            filters: newFilters
           };
           context.api.customQueryRows(detailFilterConditions).then(res => {
             console.log('res', res);
@@ -70,7 +71,7 @@ class StatisticRecordDialog extends React.Component {
           isColumn,
           isRow
         });
-        ((_context$api3 = context.api) === null || _context$api3 === void 0 ? void 0 : _context$api3.sqlQuery) && context.api.sqlQuery(sqlString).then(res => {
+        ((_context$api2 = context.api) === null || _context$api2 === void 0 ? void 0 : _context$api2.sqlQuery) && context.api.sqlQuery(sqlString).then(res => {
           const {
             results: rows
           } = res.data;

package/dist/utils/sql/chart-data-sql.js

@@ -13,7 +13,6 @@ class ChartDataSQL {
     var _chart$config;
     let {
       table,
-      view,
       chart,
       username,
       userId,
@@ -1073,7 +1072,7 @@ class ChartDataSQL {
     Array.isArray(table.columns) && table.columns.forEach(column => {
       this.column_key_map[column.key] = column;
     });
-    this.filter_sql = filter2SqlCondition(table, view, username, userId, userDepartmentIdsMap);
+    this.filter_sql = filter2SqlCondition(table, chart, username, userId, userDepartmentIdsMap);
   }
 }
 export default ChartDataSQL;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sea-chart",
-  "version": "0.0.66-alpha.2",
+  "version": "0.0.66-alpha.3",
   "main": "./dist/index.js",
   "dependencies": {
     "@antv/data-set": "0.11.8",