@gingkoo/pandora-metabase 1.0.35 → 1.0.37

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

@@ -28,7 +28,7 @@ var _selectList = _interopRequireDefault(require("../../dialog/select-list"));
 var _arrow = _interopRequireDefault(require("./arrow.svg"));
 var _useProvider = require("../../../hooks/use-provider");
 var _itemName = _interopRequireDefault(require("../../modules/components/item-name"));
-var _excluded = ["notExistsToolbar", "subShowSubquery", "toolbar"]; // import './index.less';
+var _excluded = ["notExistsToolbar", "toolbar"]; // import './index.less';
 var FormulaList = (0, _react.forwardRef)(function (props, ref) {
   var value = props.value,
     data = props.data,
@@ -145,23 +145,20 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     var _caseList$i, _caseList$i2;
     var _store$preProps = store.preProps,
       notExistsToolbar = _store$preProps.notExistsToolbar,
-      _store$preProps$subSh = _store$preProps.subShowSubquery,
-      subShowSubquery = _store$preProps$subSh === void 0 ? false : _store$preProps$subSh,
       toolbar = _store$preProps.toolbar,
       other = (0, _objectWithoutProperties2["default"])(_store$preProps, _excluded);
     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,
+          // showFields={false}
+          isExit: true,
           // showSubquery={subShowSubquery}
           toolbar: _toolbar,
           btnText: (0, _locale.__)('SqlQueryBuilder.confirm'),

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", "isExit", "toolbar"];
 var PrevResult = 'Previous results';
 var operators = ['AND', 'OR', '(', ')', ',', '+', '-', '*', '/', '!=', '<=', '>=', '<', '>', '='];
 var FlagLocation;
@@ -338,13 +338,19 @@ var JoinData = function JoinData(props) {
         data: data,
         value: newMeta[index][table_type],
         onChange: function onChange(data) {
-          console.log('🚀 ~ selectLeftTable ~ data:', data);
           // if (table_type === FlagLocation.TABLE_1) {
-          if (newMeta[index][table_type].datasourceId !== data.datasourceId || newMeta[index][table_type].name !== data.name || newMeta[index][table_type].alias !== data.alias) {
-            newMeta[index][table_type] = data;
-            initExpressions();
-          }
+          // if (
+          //   ((newMeta[index] as MetaJoin)[table_type] as MetaJoin_TalbeType).datasourceId !==
+          //     data.datasourceId ||
+          //   ((newMeta[index] as MetaJoin)[table_type] as MetaJoin_TalbeType).name !==
+          //     data.name ||
+          //   ((newMeta[index] as MetaJoin)[table_type] as MetaJoin_TalbeType).alias !==
+          //     data.alias
+          // ) {
+          // }
           // }
+          newMeta[index][table_type] = data;
+          initExpressions();
           store.setMeta(newMeta, groupIndex);
           store.setPopup({
             visible: false
@@ -898,15 +904,15 @@ 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,
+      isExit = _store$preProps2.isExit,
       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,
@@ -1588,7 +1594,7 @@ var JoinData = function JoinData(props) {
                 icon: (0, _jsxRuntime.jsx)(_pandoraIcons.FfPlus, {})
               })
             })
-          }), columnsSelected && (((_store$showMainColumn = store.showMainColumn[groupIndex]) === null || _store$showMainColumn === void 0 ? void 0 : _store$showMainColumn.showColumn) || ((_store$showMainColumn2 = store.showMainColumn[groupIndex]) === null || _store$showMainColumn2 === void 0 ? void 0 : _store$showMainColumn2.index) < index) && store.showFields && (0, _jsxRuntime.jsx)("div", {
+          }), columnsSelected && (((_store$showMainColumn = store.showMainColumn[groupIndex]) === null || _store$showMainColumn === void 0 ? void 0 : _store$showMainColumn.showColumn) || ((_store$showMainColumn2 = store.showMainColumn[groupIndex]) === null || _store$showMainColumn2 === void 0 ? void 0 : _store$showMainColumn2.index) < index) && !store.isExit && store.showFields && (0, _jsxRuntime.jsx)("div", {
             className: "Sqb-TableColumns",
             onClick: selectColumns,
             children: (0, _locale.__)('SqlQueryBuilder.columns')

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", "isExit", "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,15 @@ 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,
+      isExit = _store$preProps2.isExit,
       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,
@@ -156,7 +156,7 @@ var TableData = function TableData(props) {
               newMetaList.subquery = newList;
               newMetaList.table = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, newList[0].table), {}, {
                 alias: newMetaList.table.alias || (0, _helper.getAlias)(newList[0].table.name, newMeta),
-                tableUuid: (0, _helper.uuidv4)('table')
+                tableUuid: newMetaList.table.tableUuid || (0, _helper.uuidv4)('table')
               });
               var items = (0, _utils.getSubColumns)(newList);
               var newColumns = items.flatMap(function (item) {
@@ -294,7 +294,7 @@ var TableData = function TableData(props) {
               icon: (0, _jsxRuntime.jsx)(_pandoraIcons.RelatedWork, {}),
               onClick: switchSubQuery
             })
-          }), selected && store.showFields && ((_store$showMainColumn = store.showMainColumn[groupIndex]) === null || _store$showMainColumn === void 0 ? void 0 : _store$showMainColumn.showColumn) && (0, _jsxRuntime.jsx)("div", {
+          }), selected && store.showFields && !store.isExit && ((_store$showMainColumn = store.showMainColumn[groupIndex]) === null || _store$showMainColumn === void 0 ? void 0 : _store$showMainColumn.showColumn) && (0, _jsxRuntime.jsx)("div", {
             className: "Sqb-TableColumns",
             onClick: selectColumns,
             children: (0, _locale.__)('SqlQueryBuilder.columns')

package/lib/cjs/hooks/use-state.js

@@ -129,6 +129,10 @@ var useStore = function useStore() {
     _useState36 = (0, _slicedToArray2["default"])(_useState35, 2),
     currentTable = _useState36[0],
     setCurrentTable = _useState36[1]; // 当前存在的表
+  var _useState37 = (0, _react.useState)(false),
+    _useState38 = (0, _slicedToArray2["default"])(_useState37, 2),
+    isExit = _useState38[0],
+    setIsExit = _useState38[1]; // 是否是notExit
   // 外层ref
   var popupContainer = (0, _react.useRef)();
   // const [fetchDatasetFn, setFetchDatasetFn] = useState<(id: string) => Promise<any>>(
@@ -602,7 +606,9 @@ var useStore = function useStore() {
     filterCustomType: filterCustomType,
     setfilterCustomType: setfilterCustomType,
     formulaTemplates: formulaTemplates,
-    setFormulaTemplates: setFormulaTemplates
+    setFormulaTemplates: setFormulaTemplates,
+    isExit: isExit,
+    setIsExit: setIsExit
   };
 };
 var _default = exports["default"] = useStore;

package/lib/cjs/index.js

@@ -52,7 +52,9 @@ var SqlVisionBuilder = _react["default"].forwardRef(function (props, ref) {
     _props$ignoreGroupByT = props.ignoreGroupByType,
     ignoreGroupByType = _props$ignoreGroupByT === void 0 ? false : _props$ignoreGroupByT,
     _props$filterCustomTy = props.filterCustomType,
-    filterCustomType = _props$filterCustomTy === void 0 ? false : _props$filterCustomTy;
+    filterCustomType = _props$filterCustomTy === void 0 ? false : _props$filterCustomTy,
+    _props$isExit = props.isExit,
+    isExit = _props$isExit === void 0 ? false : _props$isExit;
   var store = (0, _useState["default"])();
   (0, _react.useEffect)(function () {
     getTables && store.setFetchDatasetFn(getTables);
@@ -79,7 +81,8 @@ var SqlVisionBuilder = _react["default"].forwardRef(function (props, ref) {
     store.setFormulaTemplates(formulaTemplates || []);
     store.setIgnoreGroupByType(ignoreGroupByType);
     store.setfilterCustomType(filterCustomType);
-  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType]);
+    store.setIsExit(isExit);
+  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit]);
   _react["default"].useImperativeHandle(ref, function () {
     return {
       // setDatasource: (list) => {

package/lib/cjs/types.d.ts

@@ -33,6 +33,7 @@ export interface MetabaseProps {
     filterCustomType?: boolean;
     notExistsColumns?: DataType[];
     formulaTemplates?: FormulaTemplatesItem[];
+    isExit?: boolean;
 }
 export interface OptionItem {
     value?: string;

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/es/components/dialog/formula-list/index.js

@@ -2,7 +2,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-var _excluded = ["notExistsToolbar", "subShowSubquery", "toolbar"];
+var _excluded = ["notExistsToolbar", "toolbar"];
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { useState, forwardRef } from 'react';
 import cx from 'classnames';
@@ -139,23 +139,20 @@ var FormulaList = forwardRef(function (props, ref) {
     var _caseList$i, _caseList$i2;
     var _store$preProps = store.preProps,
       notExistsToolbar = _store$preProps.notExistsToolbar,
-      _store$preProps$subSh = _store$preProps.subShowSubquery,
-      subShowSubquery = _store$preProps$subSh === void 0 ? false : _store$preProps$subSh,
       toolbar = _store$preProps.toolbar,
       other = _objectWithoutProperties(_store$preProps, _excluded);
     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,
+          // showFields={false}
+          isExit: true,
           // showSubquery={subShowSubquery}
           toolbar: _toolbar,
           btnText: __('SqlQueryBuilder.confirm'),

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", "isExit", "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';
@@ -332,13 +332,19 @@ var JoinData = function JoinData(props) {
         data: data,
         value: newMeta[index][table_type],
         onChange: function onChange(data) {
-          console.log('🚀 ~ selectLeftTable ~ data:', data);
           // if (table_type === FlagLocation.TABLE_1) {
-          if (newMeta[index][table_type].datasourceId !== data.datasourceId || newMeta[index][table_type].name !== data.name || newMeta[index][table_type].alias !== data.alias) {
-            newMeta[index][table_type] = data;
-            initExpressions();
-          }
+          // if (
+          //   ((newMeta[index] as MetaJoin)[table_type] as MetaJoin_TalbeType).datasourceId !==
+          //     data.datasourceId ||
+          //   ((newMeta[index] as MetaJoin)[table_type] as MetaJoin_TalbeType).name !==
+          //     data.name ||
+          //   ((newMeta[index] as MetaJoin)[table_type] as MetaJoin_TalbeType).alias !==
+          //     data.alias
+          // ) {
+          // }
           // }
+          newMeta[index][table_type] = data;
+          initExpressions();
           store.setMeta(newMeta, groupIndex);
           store.setPopup({
             visible: false
@@ -892,15 +898,15 @@ 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,
+      isExit = _store$preProps2.isExit,
       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,
@@ -1582,7 +1588,7 @@ var JoinData = function JoinData(props) {
                 icon: _jsx(FfPlus, {})
               })
             })
-          }), columnsSelected && (((_store$showMainColumn = store.showMainColumn[groupIndex]) === null || _store$showMainColumn === void 0 ? void 0 : _store$showMainColumn.showColumn) || ((_store$showMainColumn2 = store.showMainColumn[groupIndex]) === null || _store$showMainColumn2 === void 0 ? void 0 : _store$showMainColumn2.index) < index) && store.showFields && _jsx("div", {
+          }), columnsSelected && (((_store$showMainColumn = store.showMainColumn[groupIndex]) === null || _store$showMainColumn === void 0 ? void 0 : _store$showMainColumn.showColumn) || ((_store$showMainColumn2 = store.showMainColumn[groupIndex]) === null || _store$showMainColumn2 === void 0 ? void 0 : _store$showMainColumn2.index) < index) && !store.isExit && store.showFields && _jsx("div", {
             className: "Sqb-TableColumns",
             onClick: selectColumns,
             children: __('SqlQueryBuilder.columns')

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", "isExit", "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,15 @@ 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,
+      isExit = _store$preProps2.isExit,
       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,
@@ -149,7 +149,7 @@ var TableData = function TableData(props) {
               newMetaList.subquery = newList;
               newMetaList.table = _objectSpread(_objectSpread({}, newList[0].table), {}, {
                 alias: newMetaList.table.alias || getAlias(newList[0].table.name, newMeta),
-                tableUuid: uuidv4('table')
+                tableUuid: newMetaList.table.tableUuid || uuidv4('table')
               });
               var items = getSubColumns(newList);
               var newColumns = items.flatMap(function (item) {
@@ -287,7 +287,7 @@ var TableData = function TableData(props) {
               icon: _jsx(RelatedWork, {}),
               onClick: switchSubQuery
             })
-          }), selected && store.showFields && ((_store$showMainColumn = store.showMainColumn[groupIndex]) === null || _store$showMainColumn === void 0 ? void 0 : _store$showMainColumn.showColumn) && _jsx("div", {
+          }), selected && store.showFields && !store.isExit && ((_store$showMainColumn = store.showMainColumn[groupIndex]) === null || _store$showMainColumn === void 0 ? void 0 : _store$showMainColumn.showColumn) && _jsx("div", {
             className: "Sqb-TableColumns",
             onClick: selectColumns,
             children: __('SqlQueryBuilder.columns')

package/lib/es/hooks/use-state.js

@@ -122,6 +122,10 @@ var useStore = function useStore() {
     _useState36 = _slicedToArray(_useState35, 2),
     currentTable = _useState36[0],
     setCurrentTable = _useState36[1]; // 当前存在的表
+  var _useState37 = useState(false),
+    _useState38 = _slicedToArray(_useState37, 2),
+    isExit = _useState38[0],
+    setIsExit = _useState38[1]; // 是否是notExit
   // 外层ref
   var popupContainer = useRef();
   // const [fetchDatasetFn, setFetchDatasetFn] = useState<(id: string) => Promise<any>>(
@@ -595,7 +599,9 @@ var useStore = function useStore() {
     filterCustomType: filterCustomType,
     setfilterCustomType: setfilterCustomType,
     formulaTemplates: formulaTemplates,
-    setFormulaTemplates: setFormulaTemplates
+    setFormulaTemplates: setFormulaTemplates,
+    isExit: isExit,
+    setIsExit: setIsExit
   };
 };
 export default useStore;

package/lib/es/index.js

@@ -42,7 +42,9 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     _props$ignoreGroupByT = props.ignoreGroupByType,
     ignoreGroupByType = _props$ignoreGroupByT === void 0 ? false : _props$ignoreGroupByT,
     _props$filterCustomTy = props.filterCustomType,
-    filterCustomType = _props$filterCustomTy === void 0 ? false : _props$filterCustomTy;
+    filterCustomType = _props$filterCustomTy === void 0 ? false : _props$filterCustomTy,
+    _props$isExit = props.isExit,
+    isExit = _props$isExit === void 0 ? false : _props$isExit;
   var store = useData();
   useEffect(function () {
     getTables && store.setFetchDatasetFn(getTables);
@@ -69,7 +71,8 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     store.setFormulaTemplates(formulaTemplates || []);
     store.setIgnoreGroupByType(ignoreGroupByType);
     store.setfilterCustomType(filterCustomType);
-  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType]);
+    store.setIsExit(isExit);
+  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit]);
   React.useImperativeHandle(ref, function () {
     return {
       // setDatasource: (list) => {

package/lib/es/types.d.ts

@@ -33,6 +33,7 @@ export interface MetabaseProps {
     filterCustomType?: boolean;
     notExistsColumns?: DataType[];
     formulaTemplates?: FormulaTemplatesItem[];
+    isExit?: boolean;
 }
 export interface OptionItem {
     value?: string;

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/package.json

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