@gingkoo/pandora-metabase 1.0.34 → 1.0.36

package/lib/cjs/components/dialog/formula-list/index.js

@@ -150,17 +150,15 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     var _value = ((_caseList$i = caseList[i]) === null || _caseList$i === void 0 ? void 0 : _caseList$i.notExists) || [];
     var oldList = (0, _cloneDeep["default"])(((_caseList$i2 = caseList[i]) === null || _caseList$i2 === void 0 ? void 0 : _caseList$i2.notExists) || []);
     var _toolbar = notExistsToolbar || toolbar;
-    _toolbar = _toolbar.filter(function (v) {
-      return v !== 'group';
-    }); // 子查询不需要分组
+    // _toolbar = _toolbar.filter((v: string) => v !== 'group'); // 子查询不需要分组
     var o = _pandora.Modal2.openModal({
       title: caseList[i].type,
       transparentMask: true,
       content: (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
         children: (0, _jsxRuntime.jsx)(_index["default"], (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, other), {}, {
           notExistsColumns: exitData,
-          showFields: false,
-          showSubquery: false,
+          // showFields={false}
+          // showSubquery={subShowSubquery}
           toolbar: _toolbar,
           btnText: (0, _locale.__)('SqlQueryBuilder.confirm'),
           value: (0, _cloneDeep["default"])(_value),

package/lib/cjs/components/modules/join-data.js

@@ -31,7 +31,7 @@ var _selectList = _interopRequireDefault(require("../dialog/select-list"));
 var _icons = require("../icons");
 var _dialog = require("../dialog");
 var _useProvider = require("../../hooks/use-provider");
-var _excluded = ["subToolbar", "toolbar"];
+var _excluded = ["subToolbar", "notExistsColumns", "toolbar"];
 var PrevResult = 'Previous results';
 var operators = ['AND', 'OR', '(', ')', ',', '+', '-', '*', '/', '!=', '<=', '>=', '<', '>', '='];
 var FlagLocation;
@@ -898,15 +898,14 @@ var JoinData = function JoinData(props) {
     var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
     var _store$preProps2 = store.preProps,
       subToolbar = _store$preProps2.subToolbar,
+      notExistsColumns = _store$preProps2.notExistsColumns,
       toolbar = _store$preProps2.toolbar,
       other = (0, _objectWithoutProperties2["default"])(_store$preProps2, _excluded);
     var newMeta = store.metaList[groupIndex].list.slice();
     var index = (0, _utils.findIndex)(store.metaList[groupIndex].list, meta);
     var oldList = (0, _cloneDeep["default"])(newMeta[index].subquery);
     var _toolbar = subToolbar || toolbar;
-    _toolbar = _toolbar.filter(function (v) {
-      return v !== 'group';
-    }); // 子查询不需要分组
+    // _toolbar = _toolbar.filter((v: string) => v !== 'group'); // 子查询不需要分组
     var o = _pandora.Modal2.openModal({
       title: (0, _locale.__)('SqlQueryBuilder.subquery'),
       transparentMask: true,

package/lib/cjs/components/modules/table-data.js

@@ -25,7 +25,7 @@ var _Wrapper = _interopRequireDefault(require("./components/Wrapper"));
 var _metaIcon = _interopRequireDefault(require("./components/meta-icon"));
 var _header = _interopRequireDefault(require("./components/header"));
 var _useProvider = require("../../hooks/use-provider");
-var _excluded = ["subToolbar", "toolbar"];
+var _excluded = ["subToolbar", "notExistsColumns", "toolbar"];
 var TableData = function TableData(props) {
   var _meta$subquery, _meta$subquery2, _meta$subquery3, _meta$table3, _meta$table4, _meta$table6, _meta$table7, _store$showMainColumn;
   var meta = props.meta,
@@ -128,15 +128,14 @@ var TableData = function TableData(props) {
     var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
     var _store$preProps2 = store.preProps,
       subToolbar = _store$preProps2.subToolbar,
+      notExistsColumns = _store$preProps2.notExistsColumns,
       toolbar = _store$preProps2.toolbar,
       other = (0, _objectWithoutProperties2["default"])(_store$preProps2, _excluded);
     var newMetaList = store.metaList[groupIndex].list.slice()[0];
     var newMeta = store.metaList[groupIndex].list.slice();
     var oldList = (0, _cloneDeep["default"])(newMetaList.subquery);
     var _toolbar = subToolbar || toolbar;
-    _toolbar = _toolbar.filter(function (v) {
-      return v !== 'group';
-    }); // 子查询不需要分组
+    // _toolbar = _toolbar.filter((v: string) => v !== 'group'); // 子查询不需要分组
     var o = _pandora.Modal2.openModal({
       title: (0, _locale.__)('SqlQueryBuilder.subquery'),
       transparentMask: true,

package/lib/cjs/utils/helper.js

@@ -164,7 +164,6 @@ var getAlias = exports.getAlias = function getAlias() {
   })).filter(function (alias) {
     return Boolean(alias);
   });
-  console.log('🚀 ~ getAlias ~ aliass:', aliass);
   // 收集所有 name_x 中的数字
   var regex = new RegExp("^".concat(name, "_(\\d+)$"));
   var indexes = aliass.map(function (alias) {

package/lib/cjs/utils/transformSql.js

@@ -948,7 +948,7 @@ var _sqlStruct2text3 = function sqlStruct2text(data) {
 var transformSql = exports.transformSql = function transformSql(metas) {
   var db = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : procEnum.mysql;
   // let new_metas = upgradeLegacyData(metas);
-  var _handleSqlUnion = handleSqlUnion(metas, db),
+  var _handleSqlUnion = handleSqlUnion(metas, db, true),
     sql = _handleSqlUnion.sql,
     fields = _handleSqlUnion.fields,
     union_fields = _handleSqlUnion.union_fields;

package/lib/es/components/dialog/formula-list/index.js

@@ -144,17 +144,15 @@ var FormulaList = forwardRef(function (props, ref) {
     var _value = ((_caseList$i = caseList[i]) === null || _caseList$i === void 0 ? void 0 : _caseList$i.notExists) || [];
     var oldList = cloneDeep(((_caseList$i2 = caseList[i]) === null || _caseList$i2 === void 0 ? void 0 : _caseList$i2.notExists) || []);
     var _toolbar = notExistsToolbar || toolbar;
-    _toolbar = _toolbar.filter(function (v) {
-      return v !== 'group';
-    }); // 子查询不需要分组
+    // _toolbar = _toolbar.filter((v: string) => v !== 'group'); // 子查询不需要分组
     var o = Modal2.openModal({
       title: caseList[i].type,
       transparentMask: true,
       content: _jsx(_Fragment, {
         children: _jsx(Metabase, _objectSpread(_objectSpread({}, other), {}, {
           notExistsColumns: exitData,
-          showFields: false,
-          showSubquery: false,
+          // showFields={false}
+          // showSubquery={subShowSubquery}
           toolbar: _toolbar,
           btnText: __('SqlQueryBuilder.confirm'),
           value: cloneDeep(_value),

package/lib/es/components/modules/join-data.js

@@ -2,7 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-var _excluded = ["subToolbar", "toolbar"];
+var _excluded = ["subToolbar", "notExistsColumns", "toolbar"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import cx from 'classnames';
@@ -892,15 +892,14 @@ var JoinData = function JoinData(props) {
     var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
     var _store$preProps2 = store.preProps,
       subToolbar = _store$preProps2.subToolbar,
+      notExistsColumns = _store$preProps2.notExistsColumns,
       toolbar = _store$preProps2.toolbar,
       other = _objectWithoutProperties(_store$preProps2, _excluded);
     var newMeta = store.metaList[groupIndex].list.slice();
     var index = findIndex(store.metaList[groupIndex].list, meta);
     var oldList = cloneDeep(newMeta[index].subquery);
     var _toolbar = subToolbar || toolbar;
-    _toolbar = _toolbar.filter(function (v) {
-      return v !== 'group';
-    }); // 子查询不需要分组
+    // _toolbar = _toolbar.filter((v: string) => v !== 'group'); // 子查询不需要分组
     var o = Modal2.openModal({
       title: __('SqlQueryBuilder.subquery'),
       transparentMask: true,

package/lib/es/components/modules/table-data.js

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-var _excluded = ["subToolbar", "toolbar"];
+var _excluded = ["subToolbar", "notExistsColumns", "toolbar"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import cx from 'classnames';
@@ -121,15 +121,14 @@ var TableData = function TableData(props) {
     var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
     var _store$preProps2 = store.preProps,
       subToolbar = _store$preProps2.subToolbar,
+      notExistsColumns = _store$preProps2.notExistsColumns,
       toolbar = _store$preProps2.toolbar,
       other = _objectWithoutProperties(_store$preProps2, _excluded);
     var newMetaList = store.metaList[groupIndex].list.slice()[0];
     var newMeta = store.metaList[groupIndex].list.slice();
     var oldList = cloneDeep(newMetaList.subquery);
     var _toolbar = subToolbar || toolbar;
-    _toolbar = _toolbar.filter(function (v) {
-      return v !== 'group';
-    }); // 子查询不需要分组
+    // _toolbar = _toolbar.filter((v: string) => v !== 'group'); // 子查询不需要分组
     var o = Modal2.openModal({
       title: __('SqlQueryBuilder.subquery'),
       transparentMask: true,

package/lib/es/utils/helper.js

@@ -157,7 +157,6 @@ export var getAlias = function getAlias() {
   })).filter(function (alias) {
     return Boolean(alias);
   });
-  console.log('🚀 ~ getAlias ~ aliass:', aliass);
   // 收集所有 name_x 中的数字
   var regex = new RegExp("^".concat(name, "_(\\d+)$"));
   var indexes = aliass.map(function (alias) {

package/lib/es/utils/transformSql.js

@@ -941,7 +941,7 @@ var _sqlStruct2text3 = function sqlStruct2text(data) {
 export var transformSql = function transformSql(metas) {
   var db = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : procEnum.mysql;
   // let new_metas = upgradeLegacyData(metas);
-  var _handleSqlUnion = handleSqlUnion(metas, db),
+  var _handleSqlUnion = handleSqlUnion(metas, db, true),
     sql = _handleSqlUnion.sql,
     fields = _handleSqlUnion.fields,
     union_fields = _handleSqlUnion.union_fields;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/pandora-metabase",
-  "version": "1.0.34",
+  "version": "1.0.36",
   "description": "",
   "main": "lib/es/index.js",
   "module": "lib/es/index.js",