@gingkoo/pandora-metabase 1.0.48 → 1.0.50
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -17,8 +17,9 @@ var _formulaList = _interopRequireDefault(require("../dialog/formula-list"));
|
|
|
17
17
|
var _Wrapper = _interopRequireDefault(require("./components/Wrapper"));
|
|
18
18
|
var _metaIcon = _interopRequireDefault(require("./components/meta-icon"));
|
|
19
19
|
var _header = _interopRequireDefault(require("./components/header"));
|
|
20
|
-
var _filterEnum = require("./enum/filter-enum");
|
|
21
20
|
var _useProvider = require("../../hooks/use-provider");
|
|
21
|
+
// import { customTypes, operatorList } from './enum/filter-enum';
|
|
22
|
+
|
|
22
23
|
var Filter = function Filter(props) {
|
|
23
24
|
var meta = props.meta,
|
|
24
25
|
groupIndex = props.groupIndex;
|
|
@@ -175,9 +176,12 @@ var Filter = function Filter(props) {
|
|
|
175
176
|
}
|
|
176
177
|
}) : null, (0, _jsxRuntime.jsx)("div", {
|
|
177
178
|
className: "Sqb-item--content",
|
|
178
|
-
children: (0, _jsxRuntime.jsx)(_formulaList["default"]
|
|
179
|
-
|
|
180
|
-
|
|
179
|
+
children: (0, _jsxRuntime.jsx)(_formulaList["default"]
|
|
180
|
+
// customTypes={customTypes}
|
|
181
|
+
// operatorList={operatorList}
|
|
182
|
+
, {
|
|
183
|
+
// customTypes={customTypes}
|
|
184
|
+
// operatorList={operatorList}
|
|
181
185
|
value: filter,
|
|
182
186
|
data: getPreColumns(),
|
|
183
187
|
exitData: getColumns(),
|
|
@@ -311,12 +311,10 @@ var useStore = function useStore() {
|
|
|
311
311
|
fetchColumns(newMeta[i].table2, newMeta[i].table2.datasourceId, v.columns, function () {
|
|
312
312
|
var columns = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
|
|
313
313
|
if (v.isSubquery) {
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
newColumns = items
|
|
317
|
-
|
|
318
|
-
});
|
|
319
|
-
newMeta[i].columns = newColumns || [];
|
|
314
|
+
// let newColumns: any = [];
|
|
315
|
+
// const items = getSubColumns(v.subquery);
|
|
316
|
+
// newColumns = items?.flatMap((item) => item.columns);
|
|
317
|
+
// (newMeta[i] as MetaJoin).columns = newColumns || [];
|
|
320
318
|
} else {
|
|
321
319
|
newMeta[i].columns = columns || [];
|
|
322
320
|
}
|
|
@@ -10,7 +10,7 @@ import FormulaList from '../dialog/formula-list';
|
|
|
10
10
|
import Wrapper from './components/Wrapper';
|
|
11
11
|
import NextDom from './components/meta-icon';
|
|
12
12
|
import Header from './components/header';
|
|
13
|
-
import { customTypes, operatorList } from './enum/filter-enum';
|
|
13
|
+
// import { customTypes, operatorList } from './enum/filter-enum';
|
|
14
14
|
import { useStore } from '../../hooks/use-provider';
|
|
15
15
|
var Filter = function Filter(props) {
|
|
16
16
|
var meta = props.meta,
|
|
@@ -168,9 +168,12 @@ var Filter = function Filter(props) {
|
|
|
168
168
|
}
|
|
169
169
|
}) : null, _jsx("div", {
|
|
170
170
|
className: "Sqb-item--content",
|
|
171
|
-
children: _jsx(FormulaList
|
|
172
|
-
|
|
173
|
-
|
|
171
|
+
children: _jsx(FormulaList
|
|
172
|
+
// customTypes={customTypes}
|
|
173
|
+
// operatorList={operatorList}
|
|
174
|
+
, {
|
|
175
|
+
// customTypes={customTypes}
|
|
176
|
+
// operatorList={operatorList}
|
|
174
177
|
value: filter,
|
|
175
178
|
data: getPreColumns(),
|
|
176
179
|
exitData: getColumns(),
|
|
@@ -8,7 +8,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
|
|
|
8
8
|
import { useState, useRef, useMemo } from 'react';
|
|
9
9
|
import { uuidv4 } from '../utils/helper';
|
|
10
10
|
import { TypeEnum, JoinEnum, UnionEnum } from '../store/enum';
|
|
11
|
-
import {
|
|
11
|
+
import { findIndex } from '../utils';
|
|
12
12
|
var metaKey = 1;
|
|
13
13
|
export var SummarizeAlias = 'source';
|
|
14
14
|
var useStore = function useStore() {
|
|
@@ -304,12 +304,10 @@ var useStore = function useStore() {
|
|
|
304
304
|
fetchColumns(newMeta[i].table2, newMeta[i].table2.datasourceId, v.columns, function () {
|
|
305
305
|
var columns = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
|
|
306
306
|
if (v.isSubquery) {
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
newColumns = items
|
|
310
|
-
|
|
311
|
-
});
|
|
312
|
-
newMeta[i].columns = newColumns || [];
|
|
307
|
+
// let newColumns: any = [];
|
|
308
|
+
// const items = getSubColumns(v.subquery);
|
|
309
|
+
// newColumns = items?.flatMap((item) => item.columns);
|
|
310
|
+
// (newMeta[i] as MetaJoin).columns = newColumns || [];
|
|
313
311
|
} else {
|
|
314
312
|
newMeta[i].columns = columns || [];
|
|
315
313
|
}
|