@gingkoo/pandora-metabase 1.0.34 → 1.0.35
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.
|
@@ -28,7 +28,7 @@ var _selectList = _interopRequireDefault(require("../../dialog/select-list"));
|
|
|
28
28
|
var _arrow = _interopRequireDefault(require("./arrow.svg"));
|
|
29
29
|
var _useProvider = require("../../../hooks/use-provider");
|
|
30
30
|
var _itemName = _interopRequireDefault(require("../../modules/components/item-name"));
|
|
31
|
-
var _excluded = ["notExistsToolbar", "toolbar"]; // import './index.less';
|
|
31
|
+
var _excluded = ["notExistsToolbar", "subShowSubquery", "toolbar"]; // import './index.less';
|
|
32
32
|
var FormulaList = (0, _react.forwardRef)(function (props, ref) {
|
|
33
33
|
var value = props.value,
|
|
34
34
|
data = props.data,
|
|
@@ -145,6 +145,8 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
|
|
|
145
145
|
var _caseList$i, _caseList$i2;
|
|
146
146
|
var _store$preProps = store.preProps,
|
|
147
147
|
notExistsToolbar = _store$preProps.notExistsToolbar,
|
|
148
|
+
_store$preProps$subSh = _store$preProps.subShowSubquery,
|
|
149
|
+
subShowSubquery = _store$preProps$subSh === void 0 ? false : _store$preProps$subSh,
|
|
148
150
|
toolbar = _store$preProps.toolbar,
|
|
149
151
|
other = (0, _objectWithoutProperties2["default"])(_store$preProps, _excluded);
|
|
150
152
|
var _value = ((_caseList$i = caseList[i]) === null || _caseList$i === void 0 ? void 0 : _caseList$i.notExists) || [];
|
|
@@ -160,7 +162,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
|
|
|
160
162
|
children: (0, _jsxRuntime.jsx)(_index["default"], (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, other), {}, {
|
|
161
163
|
notExistsColumns: exitData,
|
|
162
164
|
showFields: false,
|
|
163
|
-
showSubquery
|
|
165
|
+
// showSubquery={subShowSubquery}
|
|
164
166
|
toolbar: _toolbar,
|
|
165
167
|
btnText: (0, _locale.__)('SqlQueryBuilder.confirm'),
|
|
166
168
|
value: (0, _cloneDeep["default"])(_value),
|
|
@@ -948,7 +948,7 @@ var _sqlStruct2text3 = function sqlStruct2text(data) {
|
|
|
948
948
|
var transformSql = exports.transformSql = function transformSql(metas) {
|
|
949
949
|
var db = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : procEnum.mysql;
|
|
950
950
|
// let new_metas = upgradeLegacyData(metas);
|
|
951
|
-
var _handleSqlUnion = handleSqlUnion(metas, db),
|
|
951
|
+
var _handleSqlUnion = handleSqlUnion(metas, db, true),
|
|
952
952
|
sql = _handleSqlUnion.sql,
|
|
953
953
|
fields = _handleSqlUnion.fields,
|
|
954
954
|
union_fields = _handleSqlUnion.union_fields;
|
|
@@ -2,7 +2,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
|
|
|
2
2
|
import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
3
3
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
|
4
4
|
import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
|
|
5
|
-
var _excluded = ["notExistsToolbar", "toolbar"];
|
|
5
|
+
var _excluded = ["notExistsToolbar", "subShowSubquery", "toolbar"];
|
|
6
6
|
import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
|
|
7
7
|
import { useState, forwardRef } from 'react';
|
|
8
8
|
import cx from 'classnames';
|
|
@@ -139,6 +139,8 @@ var FormulaList = forwardRef(function (props, ref) {
|
|
|
139
139
|
var _caseList$i, _caseList$i2;
|
|
140
140
|
var _store$preProps = store.preProps,
|
|
141
141
|
notExistsToolbar = _store$preProps.notExistsToolbar,
|
|
142
|
+
_store$preProps$subSh = _store$preProps.subShowSubquery,
|
|
143
|
+
subShowSubquery = _store$preProps$subSh === void 0 ? false : _store$preProps$subSh,
|
|
142
144
|
toolbar = _store$preProps.toolbar,
|
|
143
145
|
other = _objectWithoutProperties(_store$preProps, _excluded);
|
|
144
146
|
var _value = ((_caseList$i = caseList[i]) === null || _caseList$i === void 0 ? void 0 : _caseList$i.notExists) || [];
|
|
@@ -154,7 +156,7 @@ var FormulaList = forwardRef(function (props, ref) {
|
|
|
154
156
|
children: _jsx(Metabase, _objectSpread(_objectSpread({}, other), {}, {
|
|
155
157
|
notExistsColumns: exitData,
|
|
156
158
|
showFields: false,
|
|
157
|
-
showSubquery
|
|
159
|
+
// showSubquery={subShowSubquery}
|
|
158
160
|
toolbar: _toolbar,
|
|
159
161
|
btnText: __('SqlQueryBuilder.confirm'),
|
|
160
162
|
value: cloneDeep(_value),
|
|
@@ -941,7 +941,7 @@ var _sqlStruct2text3 = function sqlStruct2text(data) {
|
|
|
941
941
|
export var transformSql = function transformSql(metas) {
|
|
942
942
|
var db = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : procEnum.mysql;
|
|
943
943
|
// let new_metas = upgradeLegacyData(metas);
|
|
944
|
-
var _handleSqlUnion = handleSqlUnion(metas, db),
|
|
944
|
+
var _handleSqlUnion = handleSqlUnion(metas, db, true),
|
|
945
945
|
sql = _handleSqlUnion.sql,
|
|
946
946
|
fields = _handleSqlUnion.fields,
|
|
947
947
|
union_fields = _handleSqlUnion.union_fields;
|