@gingkoo/pandora-metabase 0.0.24 → 0.0.26
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.
- package/lib/es/index.js +9 -6
- package/lib/es/index.js.map +1 -1
- package/package.json +1 -1
package/lib/es/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* @gingkoo/pandora-metabase v0.0.
|
|
2
|
+
* @gingkoo/pandora-metabase v0.0.26
|
|
3
3
|
*/
|
|
4
4
|
import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
|
|
5
5
|
import * as React from 'react';
|
|
@@ -171,6 +171,7 @@ const getSubColumns = metaList => {
|
|
|
171
171
|
if (ExistAboveGroupBy) {
|
|
172
172
|
let _data = {
|
|
173
173
|
table: prevGroupBy.alias,
|
|
174
|
+
tableId: prevGroupBy.alias,
|
|
174
175
|
alias: prevGroupBy.alias,
|
|
175
176
|
columns: []
|
|
176
177
|
};
|
|
@@ -4156,11 +4157,7 @@ const SelectFilterColumn = ({
|
|
|
4156
4157
|
是空的: 'filter.isEmpty'
|
|
4157
4158
|
}[condition]);
|
|
4158
4159
|
if (curColumn.table2?.id) {
|
|
4159
|
-
|
|
4160
|
-
datasourceName,
|
|
4161
|
-
name
|
|
4162
|
-
} = curColumn.table2;
|
|
4163
|
-
quotes = curColumn.name + ' ' + cond + ' ' + datasourceName + '.' + name;
|
|
4160
|
+
quotes = curColumn.name + ' ' + cond + ' ' + curColumn.table2.name;
|
|
4164
4161
|
} else {
|
|
4165
4162
|
quotes = curColumn.name + ' ' + cond + ' ' + firstVal;
|
|
4166
4163
|
}
|
|
@@ -4470,6 +4467,11 @@ const SelectFilterColumn = ({
|
|
|
4470
4467
|
onClick: ({
|
|
4471
4468
|
key
|
|
4472
4469
|
}) => {
|
|
4470
|
+
setIsField(false);
|
|
4471
|
+
setCurColumn({
|
|
4472
|
+
...curColumn,
|
|
4473
|
+
table2: null
|
|
4474
|
+
});
|
|
4473
4475
|
setDefaultVal(key);
|
|
4474
4476
|
}
|
|
4475
4477
|
},
|
|
@@ -6550,6 +6552,7 @@ const GroupBy = props => {
|
|
|
6550
6552
|
if (ExistAboveGroupBy) {
|
|
6551
6553
|
let _data = {
|
|
6552
6554
|
table: prevGroupBy.alias,
|
|
6555
|
+
tableId: prevGroupBy.alias,
|
|
6553
6556
|
alias: prevGroupBy.alias,
|
|
6554
6557
|
columns: []
|
|
6555
6558
|
};
|