@gingkoo/pandora-metabase 1.0.80 → 1.0.82

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

@@ -33,7 +33,7 @@ var _itemName = _interopRequireDefault(require("../../modules/components/item-na
 var _diffViewer = _interopRequireDefault(require("../diff-viewer"));
 var _storage = _interopRequireDefault(require("../../../utils/storage"));
 var _excluded = ["notExistsToolbar", "toolbar"],
-  _excluded2 = ["subToolbar", "notExistsColumns", "isExit", "toolbar"]; // import './index.less';
+  _excluded2 = ["subToolbar", "notExistsColumns", "showFields", "isExit", "toolbar"]; // import './index.less';
 var FormulaList = (0, _react.forwardRef)(function (props, ref) {
   var _storage$_metabaseCop, _caseList2;
   // 响应 storage._metabaseCopyItems 变化，保证粘贴按钮能实时显示
@@ -459,6 +459,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     var _store$preProps2 = store.preProps,
       subToolbar = _store$preProps2.subToolbar,
       notExistsColumns = _store$preProps2.notExistsColumns,
+      showFields = _store$preProps2.showFields,
       isExit = _store$preProps2.isExit,
       toolbar = _store$preProps2.toolbar,
       other = (0, _objectWithoutProperties2["default"])(_store$preProps2, _excluded2);
@@ -466,10 +467,14 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     var oldList = (0, _cloneDeep["default"])(((_caseList$i4 = caseList[i]) === null || _caseList$i4 === void 0 ? void 0 : _caseList$i4.subQuery) || []);
     var _toolbar = subToolbar || toolbar;
     var o = _pandora.Modal2.openModal({
-      title: caseList[i].type,
+      title: (0, _locale.__)('SqlQueryBuilder.subquery'),
       transparentMask: true,
       content: (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
         children: (0, _jsxRuntime.jsx)(_index2["default"], (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, other), {}, {
+          isExit: true,
+          isSubquery: true,
+          notExistsColumns: exitData,
+          fieldEnableAlias: false,
           toolbar: _toolbar,
           btnText: (0, _locale.__)('SqlQueryBuilder.confirm'),
           value: (0, _cloneDeep["default"])(_value),

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

@@ -1899,7 +1899,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.isExit && 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.isSubquery) && store.showFields && (0, _jsxRuntime.jsx)("div", {
             className: "Sqb-TableColumns",
             onClick: selectColumns,
             children: (0, _locale.__)('SqlQueryBuilder.columns')

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

@@ -427,7 +427,7 @@ var TableData = function TableData(props) {
               icon: (0, _jsxRuntime.jsx)(_pandoraIcons.RelatedWork, {}),
               onClick: switchSubQuery
             })
-          }), selected && store.showFields && !store.isExit && ((_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.isSubquery) && ((_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

@@ -134,46 +134,50 @@ var useStore = function useStore() {
     _useState38 = (0, _slicedToArray2["default"])(_useState37, 2),
     isExit = _useState38[0],
     setIsExit = _useState38[1]; // 是否是notExit
-  var _useState39 = (0, _react.useState)(true),
+  var _useState39 = (0, _react.useState)(false),
     _useState40 = (0, _slicedToArray2["default"])(_useState39, 2),
-    tableEnableAlias = _useState40[0],
-    setTableEnableAlias = _useState40[1]; // 表名是否开启别名
+    isSubquery = _useState40[0],
+    setIsSubquery = _useState40[1]; // 是否是子查询
   var _useState41 = (0, _react.useState)(true),
     _useState42 = (0, _slicedToArray2["default"])(_useState41, 2),
-    fieldEnableAlias = _useState42[0],
-    setFieldEnableAlias = _useState42[1]; // 字段名是否开启别名
+    tableEnableAlias = _useState42[0],
+    setTableEnableAlias = _useState42[1]; // 表名是否开启别名
   var _useState43 = (0, _react.useState)(true),
     _useState44 = (0, _slicedToArray2["default"])(_useState43, 2),
-    groupByEnableAlias = _useState44[0],
-    setGroupByEnableAlias = _useState44[1]; // 聚合是否开启别名
+    fieldEnableAlias = _useState44[0],
+    setFieldEnableAlias = _useState44[1]; // 字段名是否开启别名
   var _useState45 = (0, _react.useState)(true),
     _useState46 = (0, _slicedToArray2["default"])(_useState45, 2),
-    isSelectFields = _useState46[0],
-    setIsSelectFields = _useState46[1]; // 是否默认勾选字段
-  var _useState47 = (0, _react.useState)(false),
+    groupByEnableAlias = _useState46[0],
+    setGroupByEnableAlias = _useState46[1]; // 聚合是否开启别名
+  var _useState47 = (0, _react.useState)(true),
     _useState48 = (0, _slicedToArray2["default"])(_useState47, 2),
-    tableFlat = _useState48[0],
-    setTableFlat = _useState48[1]; // 是否平铺数据表
-  var _useState49 = (0, _react.useState)([]),
+    isSelectFields = _useState48[0],
+    setIsSelectFields = _useState48[1]; // 是否默认勾选字段
+  var _useState49 = (0, _react.useState)(false),
     _useState50 = (0, _slicedToArray2["default"])(_useState49, 2),
-    sourceTable = _useState50[0],
-    setSourceTable = _useState50[1];
+    tableFlat = _useState50[0],
+    setTableFlat = _useState50[1]; // 是否平铺数据表
   var _useState51 = (0, _react.useState)([]),
     _useState52 = (0, _slicedToArray2["default"])(_useState51, 2),
-    copyType = _useState52[0],
-    setCopyType = _useState52[1]; // 复制类型
-  var _useState53 = (0, _react.useState)(false),
+    sourceTable = _useState52[0],
+    setSourceTable = _useState52[1];
+  var _useState53 = (0, _react.useState)([]),
     _useState54 = (0, _slicedToArray2["default"])(_useState53, 2),
-    metabaseCopy = _useState54[0],
-    setMetabaseCopy = _useState54[1]; // 是否开启复制功能
+    copyType = _useState54[0],
+    setCopyType = _useState54[1]; // 复制类型
   var _useState55 = (0, _react.useState)(false),
     _useState56 = (0, _slicedToArray2["default"])(_useState55, 2),
-    moduleDiff = _useState56[0],
-    setModuleDiff = _useState56[1]; // 是否开启模块比对功能
-  var _useState57 = (0, _react.useState)([]),
+    metabaseCopy = _useState56[0],
+    setMetabaseCopy = _useState56[1]; // 是否开启复制功能
+  var _useState57 = (0, _react.useState)(false),
     _useState58 = (0, _slicedToArray2["default"])(_useState57, 2),
-    sourceData = _useState58[0],
-    setSourceData = _useState58[1]; // 原始数据
+    moduleDiff = _useState58[0],
+    setModuleDiff = _useState58[1]; // 是否开启模块比对功能
+  var _useState59 = (0, _react.useState)([]),
+    _useState60 = (0, _slicedToArray2["default"])(_useState59, 2),
+    sourceData = _useState60[0],
+    setSourceData = _useState60[1]; // 原始数据
   // 外层ref
   var popupContainer = (0, _react.useRef)();
   // const [fetchDatasetFn, setFetchDatasetFn] = useState<(id: string) => Promise<any>>(
@@ -357,6 +361,7 @@ var useStore = function useStore() {
       var oldColumns,
         callback,
         isSelect,
+        _isSubquery,
         oldObj,
         selectId,
         _table$alias,
@@ -375,6 +380,7 @@ var useStore = function useStore() {
             oldColumns = _args5.length > 2 && _args5[2] !== undefined ? _args5[2] : [];
             callback = _args5.length > 3 ? _args5[3] : undefined;
             isSelect = _args5.length > 4 && _args5[4] !== undefined ? _args5[4] : isSelectFields;
+            _isSubquery = _args5.length > 5 && _args5[5] !== undefined ? _args5[5] : isSubquery;
             // 获取之前选中的数据
             oldObj = {};
             selectId = oldColumns.filter(function (v) {
@@ -385,6 +391,10 @@ var useStore = function useStore() {
             }).filter(function (v) {
               return v;
             });
+            if (_isSubquery) {
+              selectId = [];
+              isSelect = false;
+            }
             _table$alias = table.alias, alias = _table$alias === void 0 ? '' : _table$alias, datasourceName = table.datasourceName, did = table.datasourceId, column = table.column, extra = (0, _objectWithoutProperties2["default"])(table, _excluded);
             tableName = table.name;
             columns = getColumns(tableName);
@@ -466,6 +476,7 @@ var useStore = function useStore() {
   }();
   // 回显
   var setPreData = function setPreData(data) {
+    var _isSubquery = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : isSubquery;
     // let patchVersion = (data?.[0]?.list?.[0] as any)?.patchVersion || '';
     if (data.length) {
       var _metaList = data === null || data === void 0 ? void 0 : data.map(function (item, groupIndex) {
@@ -489,7 +500,7 @@ var useStore = function useStore() {
                 newMeta[i].columns = columns || [];
               }
               setMeta(newMeta, groupIndex, 'init', data);
-            }, false);
+            }, false, _isSubquery);
             return (0, _objectSpread2["default"])({}, v);
           }
           // 设置column
@@ -508,7 +519,7 @@ var useStore = function useStore() {
               //   newMeta[i] = setQuotes(newMeta[i]);
               // }
               setMeta(newMeta, groupIndex, 'init', data);
-            }, false);
+            }, false, _isSubquery);
             return (0, _objectSpread2["default"])({}, v);
           }
           return (0, _objectSpread2["default"])({}, v);
@@ -803,7 +814,9 @@ var useStore = function useStore() {
     sourceData: sourceData,
     setSourceData: setSourceData,
     setFetchDiffFn: setFetchDiffFn,
-    getModuleDiffCode: getModuleDiffCode
+    getModuleDiffCode: getModuleDiffCode,
+    isSubquery: isSubquery,
+    setIsSubquery: setIsSubquery
   };
 };
 var _default = exports["default"] = useStore;

package/lib/cjs/index.js

@@ -60,6 +60,8 @@ var SqlVisionBuilder = _react["default"].forwardRef(function (props, ref) {
     filterCustomType = _props$filterCustomTy === void 0 ? false : _props$filterCustomTy,
     _props$isExit = props.isExit,
     isExit = _props$isExit === void 0 ? false : _props$isExit,
+    _props$isSubquery = props.isSubquery,
+    isSubquery = _props$isSubquery === void 0 ? false : _props$isSubquery,
     _props$tableEnableAli = props.tableEnableAlias,
     tableEnableAlias = _props$tableEnableAli === void 0 ? true : _props$tableEnableAli,
     _props$fieldEnableAli = props.fieldEnableAlias,
@@ -88,7 +90,7 @@ var SqlVisionBuilder = _react["default"].forwardRef(function (props, ref) {
   (0, _react.useEffect)(function () {
     var _value = (0, _utils.reassembleByUnion)((0, _utils.patchData)(value));
     var source_value = (0, _utils.patchData)(value);
-    store.setPreData((0, _cloneDeep["default"])(_value));
+    store.setPreData((0, _cloneDeep["default"])(_value), isSubquery);
     store.setSourceData(source_value);
   }, [value]);
   (0, _react.useEffect)(function () {
@@ -114,7 +116,8 @@ var SqlVisionBuilder = _react["default"].forwardRef(function (props, ref) {
     store.setCopyType(copyType || []);
     store.setMetabaseCopy(metabaseCopy);
     store.setModuleDiff(moduleDiff);
-  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit, tableEnableAlias, fieldEnableAlias, groupByEnableAlias, isSelectFields, tableFlat, copyType, metabaseCopy, moduleDiff]);
+    store.setIsSubquery(isSubquery);
+  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit, tableEnableAlias, fieldEnableAlias, groupByEnableAlias, isSelectFields, tableFlat, copyType, metabaseCopy, moduleDiff, isSubquery]);
   _react["default"].useImperativeHandle(ref, function () {
     return {
       // setDatasource: (list) => {

package/lib/cjs/types.d.ts

@@ -38,6 +38,7 @@ export interface MetabaseProps {
     notExistsColumns?: DataType[];
     formulaTemplates?: FormulaTemplatesItem[];
     isExit?: boolean;
+    isSubquery?: boolean;
     tableEnableAlias?: boolean;
     fieldEnableAlias?: boolean;
     groupByEnableAlias?: boolean;

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

@@ -3,7 +3,7 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["notExistsToolbar", "toolbar"],
-  _excluded2 = ["subToolbar", "notExistsColumns", "isExit", "toolbar"];
+  _excluded2 = ["subToolbar", "notExistsColumns", "showFields", "isExit", "toolbar"];
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState, useRef, forwardRef } from 'react';
 import './index.less';
@@ -453,6 +453,7 @@ var FormulaList = forwardRef(function (props, ref) {
     var _store$preProps2 = store.preProps,
       subToolbar = _store$preProps2.subToolbar,
       notExistsColumns = _store$preProps2.notExistsColumns,
+      showFields = _store$preProps2.showFields,
       isExit = _store$preProps2.isExit,
       toolbar = _store$preProps2.toolbar,
       other = _objectWithoutProperties(_store$preProps2, _excluded2);
@@ -460,10 +461,14 @@ var FormulaList = forwardRef(function (props, ref) {
     var oldList = cloneDeep(((_caseList$i4 = caseList[i]) === null || _caseList$i4 === void 0 ? void 0 : _caseList$i4.subQuery) || []);
     var _toolbar = subToolbar || toolbar;
     var o = Modal2.openModal({
-      title: caseList[i].type,
+      title: __('SqlQueryBuilder.subquery'),
       transparentMask: true,
       content: _jsx(_Fragment, {
         children: _jsx(Metabase, _objectSpread(_objectSpread({}, other), {}, {
+          isExit: true,
+          isSubquery: true,
+          notExistsColumns: exitData,
+          fieldEnableAlias: false,
           toolbar: _toolbar,
           btnText: __('SqlQueryBuilder.confirm'),
           value: cloneDeep(_value),

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

@@ -1894,7 +1894,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.isExit && 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.isSubquery) && store.showFields && _jsx("div", {
             className: "Sqb-TableColumns",
             onClick: selectColumns,
             children: __('SqlQueryBuilder.columns')

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

@@ -421,7 +421,7 @@ var TableData = function TableData(props) {
               icon: _jsx(RelatedWork, {}),
               onClick: switchSubQuery
             })
-          }), selected && store.showFields && !store.isExit && ((_store$showMainColumn = store.showMainColumn[groupIndex]) === null || _store$showMainColumn === void 0 ? void 0 : _store$showMainColumn.showColumn) && _jsx("div", {
+          }), selected && store.showFields && (!store.isExit || store.isSubquery) && ((_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

@@ -128,46 +128,50 @@ var useStore = function useStore() {
     _useState38 = _slicedToArray(_useState37, 2),
     isExit = _useState38[0],
     setIsExit = _useState38[1]; // 是否是notExit
-  var _useState39 = useState(true),
+  var _useState39 = useState(false),
     _useState40 = _slicedToArray(_useState39, 2),
-    tableEnableAlias = _useState40[0],
-    setTableEnableAlias = _useState40[1]; // 表名是否开启别名
+    isSubquery = _useState40[0],
+    setIsSubquery = _useState40[1]; // 是否是子查询
   var _useState41 = useState(true),
     _useState42 = _slicedToArray(_useState41, 2),
-    fieldEnableAlias = _useState42[0],
-    setFieldEnableAlias = _useState42[1]; // 字段名是否开启别名
+    tableEnableAlias = _useState42[0],
+    setTableEnableAlias = _useState42[1]; // 表名是否开启别名
   var _useState43 = useState(true),
     _useState44 = _slicedToArray(_useState43, 2),
-    groupByEnableAlias = _useState44[0],
-    setGroupByEnableAlias = _useState44[1]; // 聚合是否开启别名
+    fieldEnableAlias = _useState44[0],
+    setFieldEnableAlias = _useState44[1]; // 字段名是否开启别名
   var _useState45 = useState(true),
     _useState46 = _slicedToArray(_useState45, 2),
-    isSelectFields = _useState46[0],
-    setIsSelectFields = _useState46[1]; // 是否默认勾选字段
-  var _useState47 = useState(false),
+    groupByEnableAlias = _useState46[0],
+    setGroupByEnableAlias = _useState46[1]; // 聚合是否开启别名
+  var _useState47 = useState(true),
     _useState48 = _slicedToArray(_useState47, 2),
-    tableFlat = _useState48[0],
-    setTableFlat = _useState48[1]; // 是否平铺数据表
-  var _useState49 = useState([]),
+    isSelectFields = _useState48[0],
+    setIsSelectFields = _useState48[1]; // 是否默认勾选字段
+  var _useState49 = useState(false),
     _useState50 = _slicedToArray(_useState49, 2),
-    sourceTable = _useState50[0],
-    setSourceTable = _useState50[1];
+    tableFlat = _useState50[0],
+    setTableFlat = _useState50[1]; // 是否平铺数据表
   var _useState51 = useState([]),
     _useState52 = _slicedToArray(_useState51, 2),
-    copyType = _useState52[0],
-    setCopyType = _useState52[1]; // 复制类型
-  var _useState53 = useState(false),
+    sourceTable = _useState52[0],
+    setSourceTable = _useState52[1];
+  var _useState53 = useState([]),
     _useState54 = _slicedToArray(_useState53, 2),
-    metabaseCopy = _useState54[0],
-    setMetabaseCopy = _useState54[1]; // 是否开启复制功能
+    copyType = _useState54[0],
+    setCopyType = _useState54[1]; // 复制类型
   var _useState55 = useState(false),
     _useState56 = _slicedToArray(_useState55, 2),
-    moduleDiff = _useState56[0],
-    setModuleDiff = _useState56[1]; // 是否开启模块比对功能
-  var _useState57 = useState([]),
+    metabaseCopy = _useState56[0],
+    setMetabaseCopy = _useState56[1]; // 是否开启复制功能
+  var _useState57 = useState(false),
     _useState58 = _slicedToArray(_useState57, 2),
-    sourceData = _useState58[0],
-    setSourceData = _useState58[1]; // 原始数据
+    moduleDiff = _useState58[0],
+    setModuleDiff = _useState58[1]; // 是否开启模块比对功能
+  var _useState59 = useState([]),
+    _useState60 = _slicedToArray(_useState59, 2),
+    sourceData = _useState60[0],
+    setSourceData = _useState60[1]; // 原始数据
   // 外层ref
   var popupContainer = useRef();
   // const [fetchDatasetFn, setFetchDatasetFn] = useState<(id: string) => Promise<any>>(
@@ -351,6 +355,7 @@ var useStore = function useStore() {
       var oldColumns,
         callback,
         isSelect,
+        _isSubquery,
         oldObj,
         selectId,
         _table$alias,
@@ -369,6 +374,7 @@ var useStore = function useStore() {
             oldColumns = _args5.length > 2 && _args5[2] !== undefined ? _args5[2] : [];
             callback = _args5.length > 3 ? _args5[3] : undefined;
             isSelect = _args5.length > 4 && _args5[4] !== undefined ? _args5[4] : isSelectFields;
+            _isSubquery = _args5.length > 5 && _args5[5] !== undefined ? _args5[5] : isSubquery;
             // 获取之前选中的数据
             oldObj = {};
             selectId = oldColumns.filter(function (v) {
@@ -379,6 +385,10 @@ var useStore = function useStore() {
             }).filter(function (v) {
               return v;
             });
+            if (_isSubquery) {
+              selectId = [];
+              isSelect = false;
+            }
             _table$alias = table.alias, alias = _table$alias === void 0 ? '' : _table$alias, datasourceName = table.datasourceName, did = table.datasourceId, column = table.column, extra = _objectWithoutProperties(table, _excluded);
             tableName = table.name;
             columns = getColumns(tableName);
@@ -460,6 +470,7 @@ var useStore = function useStore() {
   }();
   // 回显
   var setPreData = function setPreData(data) {
+    var _isSubquery = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : isSubquery;
     // let patchVersion = (data?.[0]?.list?.[0] as any)?.patchVersion || '';
     if (data.length) {
       var _metaList = data === null || data === void 0 ? void 0 : data.map(function (item, groupIndex) {
@@ -483,7 +494,7 @@ var useStore = function useStore() {
                 newMeta[i].columns = columns || [];
               }
               setMeta(newMeta, groupIndex, 'init', data);
-            }, false);
+            }, false, _isSubquery);
             return _objectSpread({}, v);
           }
           // 设置column
@@ -502,7 +513,7 @@ var useStore = function useStore() {
               //   newMeta[i] = setQuotes(newMeta[i]);
               // }
               setMeta(newMeta, groupIndex, 'init', data);
-            }, false);
+            }, false, _isSubquery);
             return _objectSpread({}, v);
           }
           return _objectSpread({}, v);
@@ -797,7 +808,9 @@ var useStore = function useStore() {
     sourceData: sourceData,
     setSourceData: setSourceData,
     setFetchDiffFn: setFetchDiffFn,
-    getModuleDiffCode: getModuleDiffCode
+    getModuleDiffCode: getModuleDiffCode,
+    isSubquery: isSubquery,
+    setIsSubquery: setIsSubquery
   };
 };
 export default useStore;

package/lib/es/index.js

@@ -50,6 +50,8 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     filterCustomType = _props$filterCustomTy === void 0 ? false : _props$filterCustomTy,
     _props$isExit = props.isExit,
     isExit = _props$isExit === void 0 ? false : _props$isExit,
+    _props$isSubquery = props.isSubquery,
+    isSubquery = _props$isSubquery === void 0 ? false : _props$isSubquery,
     _props$tableEnableAli = props.tableEnableAlias,
     tableEnableAlias = _props$tableEnableAli === void 0 ? true : _props$tableEnableAli,
     _props$fieldEnableAli = props.fieldEnableAlias,
@@ -78,7 +80,7 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
   useEffect(function () {
     var _value = reassembleByUnion(patchData(value));
     var source_value = patchData(value);
-    store.setPreData(cloneDeep(_value));
+    store.setPreData(cloneDeep(_value), isSubquery);
     store.setSourceData(source_value);
   }, [value]);
   useEffect(function () {
@@ -104,7 +106,8 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     store.setCopyType(copyType || []);
     store.setMetabaseCopy(metabaseCopy);
     store.setModuleDiff(moduleDiff);
-  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit, tableEnableAlias, fieldEnableAlias, groupByEnableAlias, isSelectFields, tableFlat, copyType, metabaseCopy, moduleDiff]);
+    store.setIsSubquery(isSubquery);
+  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit, tableEnableAlias, fieldEnableAlias, groupByEnableAlias, isSelectFields, tableFlat, copyType, metabaseCopy, moduleDiff, isSubquery]);
   React.useImperativeHandle(ref, function () {
     return {
       // setDatasource: (list) => {

package/lib/es/types.d.ts

@@ -38,6 +38,7 @@ export interface MetabaseProps {
     notExistsColumns?: DataType[];
     formulaTemplates?: FormulaTemplatesItem[];
     isExit?: boolean;
+    isSubquery?: boolean;
     tableEnableAlias?: boolean;
     fieldEnableAlias?: boolean;
     groupByEnableAlias?: boolean;

package/package.json

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