@gingkoo/pandora-metabase 1.0.0-alpha.6 → 1.0.0-alpha.8

package/lib/es/index.js

@@ -1,5 +1,5 @@
 /**
- * @gingkoo/pandora-metabase v1.0.0-alpha.6
+ * @gingkoo/pandora-metabase v1.0.0-alpha.8
  */
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import * as React from 'react';
@@ -466,15 +466,15 @@ const handleNesting = data => {
   if (customColumn && customColumn.customColumn.length) {
     obj.customColumns = customColumn.customColumn.map(v => {
       return {
-        alias: v.name,
-        formula: v.formula.replace(/\[.*?\]/g, column => {
-          let str = column.substr(1, column.length - 2);
-          if (~str.indexOf('->')) {
-            let _str = str.replace(/ /g, '').split('->');
-            return `${_str[0]}.${_str[1]}`;
-          }
-          return str;
-        })
+        alias: v.name
+        // formula: v.formula.replace(/\[.*?\]/g, (column: string): string => {
+        //   let str = column.substr(1, column.length - 2);
+        //   if (~str.indexOf('->')) {
+        //     let _str = str.replace(/ /g, '').split('->');
+        //     return `${_str[0]}.${_str[1]}`;
+        //   }
+        //   return str;
+        // }),
       };
     });
   }
@@ -625,9 +625,8 @@ const getSubColumns = metaList => {
     metaKey: -1,
     type: TypeEnum.customColumn,
     customColumn: [{
-      name: '',
-      // 用户起的别名
-      formula: '' // 公式}];
+      name: '' // 用户起的别名
+      // formula: '', // 公式}];
     }]
   };
   let {
@@ -649,7 +648,7 @@ const getSubColumns = metaList => {
         return {
           name_zh: v.quotes,
           ...v,
-          name: v.quotes,
+          name: v.fieldAlias,
           realName: v.sql?.split(' AS ')?.[1] || '',
           // name_zh: '',
           database_type: v?.database_type || SQL_COLUMN_TYPE.FLOAT,
@@ -663,7 +662,7 @@ const getSubColumns = metaList => {
         return {
           name_zh: v.quotes,
           ...v,
-          name: v.quotes,
+          name: v.fieldAlias,
           realName: v.sql?.split(' AS ')?.[1] || '',
           // name_zh: '',
           database_type: v?.database_type || SQL_COLUMN_TYPE.FLOAT,
@@ -731,6 +730,9 @@ const changeTableAlias = (list, curObj) => {
       if (v.table1.tableUuid === tableUuid) {
         v.table1.alias = alias;
       }
+      if (v.table2.tableUuid === tableUuid) {
+        v.table2.alias = alias;
+      }
     }
     if (v.type === TypeEnum.customColumn) {
       v.customColumn.map(item => {
@@ -774,22 +776,40 @@ const changeTableAlias = (list, curObj) => {
     if (v.type === TypeEnum.filter) {
       v.filter.map(item => {
         if (item.tableUuid === tableUuid) {
-          if (item.alias === SummarizeAlias$1) {
-            //有groupBy 特殊处理
-            const {
-              prevGroupBy
-            } = getHelper(list, v);
-            let groupBy = prevGroupBy?.by.filter(v => v.fieldUuid === item.fieldUuid)[0] || prevGroupBy?.group.filter(v => v.fieldUuid === item.fieldUuid)[0] || null;
-            groupBy.alias = alias;
-            const sql = groupBy.sql;
-            if (groupBy) {
-              item.sql = sql;
-              item.groupSql = sql;
-            }
-          } else {
-            item.alias = alias;
-            item.sql = '';
-          }
+          // if (item.alias === SummarizeAlias) {
+          //   //有groupBy 特殊处理
+          //   const { prevGroupBy } = getHelper(list, v);
+          //   let groupBy: any =
+          //     prevGroupBy?.by.filter((v) => v.fieldUuid === item.fieldUuid)[0] ||
+          //     prevGroupBy?.group.filter((v) => v.fieldUuid === item.fieldUuid)[0] ||
+          //     null;
+          //   groupBy.alias = alias;
+          //   const sql = groupBy.sql;
+          //   if (groupBy) {
+          //     item.sql = sql;
+          //     item.groupSql = sql;
+          //   }
+          // }
+          item.alias = alias;
+          item.sql = '';
+        }
+        if (item.table2 && item.table2.tableUuid === tableUuid) {
+          // if (item.table2.alias === SummarizeAlias) {
+          //   //有groupBy 特殊处理
+          //   const { prevGroupBy } = getHelper(list, v);
+          //   let groupBy: any =
+          //     prevGroupBy?.by.filter((v) => v.fieldUuid === item.table2?.fieldUuid)[0] ||
+          //     prevGroupBy?.group.filter((v) => v.fieldUuid === item.table2?.fieldUuid)[0] ||
+          //     null;
+          //   groupBy.alias = alias;
+          //   const sql = groupBy.sql;
+          //   if (groupBy) {
+          //     item.table2.sql = sql;
+          //     item.table2.groupSql = sql;
+          //   }
+          // }
+          item.table2.alias = alias;
+          item.table2.sql = '';
         }
       });
     }
@@ -804,7 +824,25 @@ const changeFieldAlias = (list, curObj) => {
   const newList = cloneDeep(list);
   newList.map(v => {
     if (v.type === TypeEnum.data) ;
-    if (v.type === TypeEnum.joinData) ;
+    if (v.type === TypeEnum.joinData) {
+      if (v.table1.fieldUuid === fieldUuid) {
+        v.table1.fieldAlias = fieldAlias;
+      }
+      if (v.table2.fieldUuid === fieldUuid) {
+        v.table2.fieldAlias = fieldAlias;
+      }
+      v.expressions.map(column => {
+        if (column.left_fieldUuid === fieldUuid) {
+          column.left_fieldAlias = fieldAlias;
+        }
+        if (column.right_fieldUuid === fieldUuid) {
+          column.right_fieldAlias = fieldAlias;
+        }
+      });
+      // if (v.table1.tableUuid === tableUuid) {
+      //   v.table1.alias = alias;
+      // }
+    }
     if (v.type === TypeEnum.customColumn) {
       v.customColumn.map(item => {
         item.formulaList?.map(formula => {
@@ -863,6 +901,23 @@ const changeFieldAlias = (list, curObj) => {
             }
           }
         }
+        if (item.table2 && item.table2.fieldUuid === fieldUuid) {
+          item.table2.fieldAlias = fieldAlias;
+          // if (item.table2.alias === SummarizeAlias) {
+          //   //有groupBy 特殊处理
+          //   const { prevGroupBy } = getHelper(list, v);
+          //   let groupBy: any =
+          //     prevGroupBy?.by.filter((v) => v.fieldUuid === item.table2?.fieldUuid)[0] ||
+          //     prevGroupBy?.group.filter((v) => v.fieldUuid === item.table2?.fieldUuid)[0] ||
+          //     null;
+          //   groupBy.fieldAlias = fieldAlias;
+          //   const sql = groupBy.sql;
+          //   if (groupBy) {
+          //     item.table2.sql = sql;
+          //     item.table2.groupSql = sql;
+          //   }
+          // }
+        }
       });
     }
   });
@@ -1019,18 +1074,18 @@ const useStore = () => {
   };
   // 是否显示主表后面的字段按钮 （如果下面 没有聚合，或者选了聚合但是聚合里面没有选值的时候显示 主表字段按钮）
   const showMainColumn = useMemo(() => {
-    // 先将二维数组拍平为一维数组
-    const flatMetaList = metaList.flatMap(group => group.list);
-    // 过滤出所有汇总类型的项
-    const summarizeItems = flatMetaList.filter(v => v.type === TypeEnum.summarize);
-    // 如果没有汇总项，默认显示主列
-    if (summarizeItems.length === 0) {
-      return true;
-    }
-    // 如果只有一个汇总项，并且 group 和 by 都为空，则也显示主列
-    const onlyItem = summarizeItems[0];
-    const hasGroupOrBy = Array.isArray(onlyItem.group) && onlyItem.group.length > 0 || Array.isArray(onlyItem.by) && onlyItem.by.length > 0;
-    return !hasGroupOrBy;
+    return metaList.map((item, groupIndex) => {
+      // 过滤出所有汇总类型的项
+      const summarizeItems = item.list.filter(v => v.type === TypeEnum.summarize);
+      // 如果没有汇总项，默认显示主列
+      if (summarizeItems.length === 0) {
+        return true;
+      }
+      // 如果只有一个汇总项，并且 group 和 by 都为空，则也显示主列
+      const onlyItem = summarizeItems[0];
+      const hasGroupOrBy = Array.isArray(onlyItem.group) && onlyItem.group.length > 0 || Array.isArray(onlyItem.by) && onlyItem.by.length > 0;
+      return !hasGroupOrBy;
+    });
   }, [metaList]);
   // const showMainColumn = useMemo(() => {
   //   let summarizeList = metaList.filter((v) => v.type === TypeEnum.summarize);
@@ -1158,8 +1213,8 @@ const useStore = () => {
         tableUuid: '',
         datasourceId: '',
         datasourceName: '',
-        column: '',
-        column_id: ''
+        fieldAlias: '',
+        fieldUuid: ''
       };
       if (index === 1) {
         table1 = {
@@ -1168,8 +1223,8 @@ const useStore = () => {
           alias: mainTable.table.alias,
           datasourceId: mainTable.table.datasourceId,
           datasourceName: mainTable.table.datasourceName,
-          column: '',
-          column_id: ''
+          fieldAlias: '',
+          fieldUuid: ''
         };
       }
       item = {
@@ -1184,8 +1239,8 @@ const useStore = () => {
           tableUuid: '',
           datasourceId: '',
           datasourceName: '',
-          column: '',
-          column_id: ''
+          fieldAlias: '',
+          fieldUuid: ''
         },
         columns: [],
         expressions: []
@@ -3962,7 +4017,8 @@ const SelectFilterColumn = ({
   value,
   onChange,
   didUpdate,
-  isCustom: _isCustom = false
+  isCustom: _isCustom = false,
+  container: _container = null
 }) => {
   const [curColumn, setCurColumn] = useState(value);
   const [condition, setCondition] = useState(value.condition);
@@ -4379,6 +4435,7 @@ const SelectFilterColumn = ({
     store.setPopup2({
       visible: true,
       node: e.currentTarget,
+      container: _container,
       content: jsx(SelectList, {
         value: valType,
         list: store.constantList || [],
@@ -4401,6 +4458,7 @@ const SelectFilterColumn = ({
     store.setPopup2({
       visible: true,
       node: e.currentTarget,
+      container: _container,
       content: jsx(SelectList, {
         value: valType,
         list: [{
@@ -4435,6 +4493,7 @@ const SelectFilterColumn = ({
     store.setPopup2({
       visible: true,
       node: e.currentTarget,
+      container: _container,
       content: jsx(SelectJoinColumn, {
         data: [..._data],
         value: value,
@@ -5521,7 +5580,7 @@ const TableData = props => {
                 }
               })
             }), selected ? `${meta.table.datasourceName}.${meta.table.name} ${meta.table?.alias ? `as ${meta.table?.alias}` : ''}` : __('SqlQueryBuilder.pickTable')]
-          }), selected && store.showMainColumn && store.showFields && jsx("div", {
+          }), selected && store.showMainColumn[groupIndex] && store.showFields && jsx("div", {
             className: `Sqb-TableColumns`,
             onClick: selectColumns,
             children: __('SqlQueryBuilder.columns')
@@ -5536,6 +5595,33 @@ const TableData = props => {
 };
 
 const PrevResult$1 = 'Previous results';
+function setQuotes(_meta) {
+  let newMeta = cloneDeep(_meta);
+  newMeta.table1 = {
+    ...newMeta.table1,
+    fieldAlias: newMeta.table1.fieldAlias || newMeta.table1.column,
+    fieldUuid: newMeta.table1.fieldUuid || newMeta.table1.column_id,
+    quotes: newMeta.table1.quotes || newMeta.table1.column
+  };
+  newMeta.table2 = {
+    ...newMeta.table2,
+    fieldAlias: newMeta.table2.fieldAlias || newMeta.table2.column,
+    fieldUuid: newMeta.table2.fieldUuid || newMeta.table2.column_id,
+    quotes: newMeta.table2.quotes || newMeta.table2.column
+  };
+  newMeta.expressions = newMeta.expressions.map(v => {
+    return {
+      ...v,
+      left_fieldAlias: v.fieldAlias || v.left_column,
+      left_fieldUuid: v.fieldUuid || v.left_column_id,
+      left_quotes: v.left_quotes || v.left_column,
+      right_fieldAlias: v.right_fieldAlias || v.right_column,
+      right_fieldUuid: v.right_fieldUuid || v.right_column_id,
+      right_quotes: v.right_quotes || v.right_column
+    };
+  });
+  return newMeta;
+}
 var FlagLocation;
 (function (FlagLocation) {
   FlagLocation["TABLE_1"] = "table1";
@@ -5543,8 +5629,8 @@ var FlagLocation;
 })(FlagLocation || (FlagLocation = {}));
 var ExpressionsEnum;
 (function (ExpressionsEnum) {
-  ExpressionsEnum["LEFT"] = "left_column";
-  ExpressionsEnum["RIGHT"] = "right_column";
+  ExpressionsEnum["LEFT"] = "left";
+  ExpressionsEnum["RIGHT"] = "right";
 })(ExpressionsEnum || (ExpressionsEnum = {}));
 const JoinData = props => {
   const {
@@ -5559,7 +5645,12 @@ const JoinData = props => {
   let table1Selected = Boolean(meta.table1.name);
   let table2Selected = Boolean(meta.table2.name);
   let subQuerySelected = Boolean(meta.subquery?.[0]?.table?.name);
-  let columnsSelected = meta.table1.column && meta.table2.column;
+  let columnsSelected = meta.table1.quotes && meta.table2.quotes;
+  useEffect(() => {
+    let newMetaList = store.metaList[groupIndex].list.slice();
+    newMetaList[index] = setQuotes(meta);
+    store.setMeta(newMetaList, groupIndex);
+  }, []);
   function selectColumns(e) {
     let columns = meta.columns;
     !meta.readonly && store.setPopup({
@@ -5628,8 +5719,9 @@ const JoinData = props => {
               name: tableName,
               tableUuid: data.tableUuid || uuidv4('table'),
               alias,
-              column: '',
-              column_id: '',
+              fieldAlias: '',
+              fieldUuid: '',
+              quotes: '',
               datasourceId: data.datasourceId,
               datasourceName: data.datasourceName
             };
@@ -5672,8 +5764,9 @@ const JoinData = props => {
     let type = node.getAttribute('v-data');
     let data = [];
     let value = {
-      name: meta[type].column,
-      id: meta[type].column_id,
+      name: meta[type].quotes || meta[type].fieldAlias,
+      quotes: meta[type].quotes,
+      id: meta[type].fieldUuid,
       table: meta[type].name,
       tableId: meta[type].id,
       fieldUuid: meta[type].fieldUuid || uuidv4('field'),
@@ -5791,11 +5884,21 @@ const JoinData = props => {
             sql,
             datasourceId,
             datasourceName,
-            id = ''
+            id = '',
+            fieldAlias = '',
+            fieldUuid = '',
+            quotes
           } = record;
           let newMeta = store.metaList[groupIndex].list.slice();
-          newMeta[index][type].column = name;
-          newMeta[index][type].column_id = id;
+          if (alias === SummarizeAlias$1) {
+            newMeta[index][type].fieldAlias = fieldAlias;
+            newMeta[index][type].fieldUuid = fieldUuid;
+            newMeta[index][type].quotes = quotes;
+          } else {
+            newMeta[index][type].fieldAlias = name;
+            newMeta[index][type].fieldUuid = id;
+            newMeta[index][type].quotes = name;
+          }
           if (type === FlagLocation.TABLE_1) {
             if (newMeta[index][type].alias !== alias) {
               newMeta[index][type].alias = alias;
@@ -5823,8 +5926,8 @@ const JoinData = props => {
     let index = findIndex(store.metaList[groupIndex].list, meta);
     let table_type = type === ExpressionsEnum.LEFT ? FlagLocation.TABLE_1 : FlagLocation.TABLE_2;
     let value = {
-      name: meta.expressions[_ind][type],
-      id: meta.expressions[_ind][`${type}_id`],
+      name: meta.expressions[_ind][`${type}_quotes`] || meta.expressions[_ind][`${type}_fieldAlias`],
+      id: meta.expressions[_ind][`${type}_fieldUuid`],
       table: meta[table_type].name,
       fieldUuid: meta[table_type].fieldUuid || uuidv4('field'),
       fieldAlias: meta[table_type].fieldAlias || '',
@@ -5949,11 +6052,23 @@ const JoinData = props => {
             sql,
             datasourceId,
             datasourceName,
-            id = ''
+            id = '',
+            fieldAlias,
+            fieldUuid,
+            quotes = ''
           } = record;
           let newMeta = store.metaList[groupIndex].list.slice();
-          newMeta[index].expressions[_ind][type] = name;
-          newMeta[index].expressions[_ind][`${type}_id`] = id;
+          if (alias === SummarizeAlias$1) {
+            newMeta[index].expressions[_ind][`${type}_fieldAlias`] = fieldAlias;
+            newMeta[index].expressions[_ind][`${type}_fieldUuid`] = fieldUuid;
+            newMeta[index].expressions[_ind][`${type}_quotes`] = quotes;
+          } else {
+            newMeta[index].expressions[_ind][`${type}_fieldAlias`] = name;
+            newMeta[index].expressions[_ind][`${type}_fieldUuid`] = id;
+            newMeta[index].expressions[_ind][`${type}_quotes`] = name;
+          }
+          // (newMeta[index] as MetaJoin).expressions[_ind][type] = name;
+          // (newMeta[index] as MetaJoin).expressions[_ind][`${type}_id`] = id;
           store.setMeta(newMeta, groupIndex);
           store.setPopup({
             visible: false
@@ -6057,8 +6172,8 @@ const JoinData = props => {
               newMeta[index].subquery = newList;
               newMeta[index].table2 = {
                 ...newList[0].table,
-                column: '',
-                column_id: ''
+                fieldAlias: '',
+                fieldUuid: ''
               };
               const items = getSubColumns(newList);
               const newColumns = items.flatMap(item => item.columns);
@@ -6083,8 +6198,9 @@ const JoinData = props => {
     let newMeta = store.metaList[groupIndex].list.slice();
     newMeta[index].isSubquery = !newMeta[index].isSubquery;
     newMeta[index].table2 = {
-      column: '',
-      column_id: '',
+      quotes: '',
+      fieldAlias: '',
+      fieldUuid: '',
       name: '',
       // 表名
       tableUuid: '',
@@ -6217,23 +6333,23 @@ const JoinData = props => {
               children: "on"
             }), jsx("div", {
               className: cx(`Sqb-TableName`, {
-                notSelected: !meta.table1.column
+                notSelected: !meta.table1.quotes
               }),
               "v-data": FlagLocation.TABLE_1,
               onClick: selectJoinColumn,
-              children: meta.table1.column ? meta.table1.column : __('SqlQueryBuilder.pickTable')
+              children: meta.table1.quotes ? meta.table1.quotes : __('SqlQueryBuilder.pickTable')
             }), jsx("span", {
               className: 'mr-2 text-gray-500',
               children: "="
             }), jsx("div", {
               className: cx(`Sqb-TableName`, {
-                notSelected: !meta.table2.column
+                notSelected: !meta.table2.quotes
               }),
               "v-data": FlagLocation.TABLE_2,
               onClick: selectJoinColumn,
-              children: meta.table2.column ? meta.table2.column : __('SqlQueryBuilder.pickTable')
+              children: meta.table2.quotes ? meta.table2.quotes : __('SqlQueryBuilder.pickTable')
             })]
-          }), meta.table1.column_id && meta.table2.column_id && meta.expressions?.map((v, i) => {
+          }), meta.table1.fieldUuid && meta.table2.fieldUuid && meta.expressions?.map((v, i) => {
             return jsxs("div", {
               className: cx(`Sqb-where block`),
               children: [jsx("span", {
@@ -6262,12 +6378,12 @@ const JoinData = props => {
                 children: v.left_constant ? v.left_constant : __('SqlQueryBuilder.pickConstant')
               }), (!v.left_type || v.left_type === 'field') && jsx("div", {
                 className: cx(`Sqb-TableName`, {
-                  notSelected: !v.left_column
+                  notSelected: !v.left_quotes
                 }),
                 "v-data": ExpressionsEnum.LEFT,
                 "v-index": i,
                 onClick: selectMoreJoinColumn,
-                children: v.left_column ? v.left_column : __('SqlQueryBuilder.pickTable')
+                children: v.left_quotes ? v.left_quotes : __('SqlQueryBuilder.pickTable')
               }), jsx(Tooltip, {
                 title: __('SqlQueryBuilder.switch'),
                 children: jsx(Button, {
@@ -6306,12 +6422,12 @@ const JoinData = props => {
                 children: v.right_constant ? v.right_constant : __('SqlQueryBuilder.pickConstant')
               }), (!v.right_type || v.right_type === 'field') && jsx("div", {
                 className: cx(`Sqb-TableName`, {
-                  notSelected: !v.right_column
+                  notSelected: !v.right_quotes
                 }),
                 "v-data": ExpressionsEnum.RIGHT,
                 "v-index": i,
                 onClick: selectMoreJoinColumn,
-                children: v.right_column ? v.right_column : __('SqlQueryBuilder.pickTable')
+                children: v.right_quotes ? v.right_quotes : __('SqlQueryBuilder.pickTable')
               }), jsx(Tooltip, {
                 title: __('SqlQueryBuilder.switch'),
                 children: jsx(Button, {
@@ -6337,14 +6453,16 @@ const JoinData = props => {
                     let newMeta = store.metaList[groupIndex].list.slice();
                     newMeta[index].expressions.splice(i + 1, 0, {
                       operator: 'and',
-                      left_column: '',
-                      left_column_id: '',
+                      left_fieldAlias: '',
+                      left_fieldUuid: '',
+                      left_quotes: '',
                       left_string: '',
                       left_isString: false,
                       left_type: 'field',
                       left_constant: '',
-                      right_column: '',
-                      right_column_id: '',
+                      right_fieldAlias: '',
+                      right_fieldUuid: '',
+                      right_quotes: '',
                       right_string: '',
                       right_isString: false,
                       right_type: 'field',
@@ -6369,7 +6487,7 @@ const JoinData = props => {
                 })
               })]
             }, i);
-          }), meta.table1.column_id && meta.table2.column_id && (meta.expressions?.length || 0) < 1 && jsx(Tooltip, {
+          }), meta.table1.fieldUuid && meta.table2.fieldUuid && (meta.expressions?.length || 0) < 1 && jsx(Tooltip, {
             title: __('SqlQueryBuilder.add'),
             children: jsx(Button, {
               disabled: meta.readonly,
@@ -6382,14 +6500,16 @@ const JoinData = props => {
                 let newMeta = store.metaList[groupIndex].list.slice();
                 newMeta[index].expressions = [{
                   operator: 'and',
-                  left_column: '',
-                  left_column_id: '',
+                  left_fieldAlias: '',
+                  left_fieldUuid: '',
+                  left_quotes: '',
                   left_string: '',
                   left_isString: false,
                   left_type: 'field',
                   left_constant: '',
-                  right_column: '',
-                  right_column_id: '',
+                  right_fieldAlias: '',
+                  right_fieldUuid: '',
+                  right_quotes: '',
                   right_string: '',
                   right_isString: false,
                   right_constant: '',
@@ -6540,12 +6660,12 @@ const CaseEditor = props => {
     onOk,
     onCancel
   } = props;
-  const [popup, setPopup] = useState({
-    visible: false
-  }); // 弹框信息
+  // const [popup, setPopup] = useState<PopupType>({ visible: false }); // 弹框信息
   const [caseList, setCaseList] = useState(value.formulaList || []);
   const [name, setName] = useState(value?.name || ''); // 表达式名字
   const [ind, setInd] = useState(-1);
+  const ref = useRef(null);
+  const store = useStore$1();
   const filterCase = useMemo(() => {
     const hasCase = caseList.some(item => item.type === OptionsTypeEnum.OTHER && item.operator === 'case');
     if (hasCase) {
@@ -6557,24 +6677,22 @@ const CaseEditor = props => {
   const usable = useMemo(() => {
     return Array.from(caseList).length > 0 && name;
   }, [caseList, name]);
-  const popupContent = useMemo(() => {
-    let {
-      visible,
-      content
-    } = popup;
-    if (!visible) return null;
-    return content;
-  }, [popup]);
+  // const popupContent = useMemo(() => {
+  //   let { visible, content } = popup;
+  //   if (!visible) return null;
+  //   return content;
+  // }, [popup]);
   function closePopup() {
-    setPopup({
+    store.setPopup({
       visible: false
     });
   }
   // 字段
   function handleField(e, i, val) {
-    setPopup({
+    store.setPopup({
       visible: true,
       node: e.currentTarget,
+      container: ref.current,
       content: jsx(SelectJoinColumn, {
         data: data,
         value: val,
@@ -6604,11 +6722,13 @@ const CaseEditor = props => {
   };
   // 表达式
   function handleExpression(e, i, val) {
-    setPopup({
+    store.setPopup({
       visible: true,
       node: e.currentTarget,
+      container: ref.current,
       content: jsx(SelectFilter, {
         isCustom: true,
+        container: ref.current,
         data: data,
         value: val,
         onChange: data => {
@@ -6661,8 +6781,7 @@ const CaseEditor = props => {
   const _onOk = () => {
     typeof onOk === 'function' && onOk?.({
       name,
-      formulaList: caseList,
-      formula: ''
+      formulaList: caseList
     });
   };
   // 分段
@@ -6810,6 +6929,7 @@ const CaseEditor = props => {
   };
   return jsxs("div", {
     className: 'custom-box',
+    ref: ref,
     children: [jsx(VisualBox$1, {
       children: jsx("div", {
         className: `Sqb-item Sqb-case-editor mb-2 mt-2`,
@@ -6947,13 +7067,6 @@ const CaseEditor = props => {
           })]
         })
       })
-    }), jsx(Popup, {
-      visible: popup.visible,
-      closable: true,
-      node: popup.node,
-      innerSpacing: popup.innerSpacing,
-      hideVisible: closePopup,
-      children: popupContent
     }), jsx("div", {
       className: `btns p-4`,
       children: jsxs("div", {
@@ -7085,7 +7198,7 @@ const CustomColumn = props => {
     }
     return data;
   }
-  // 子查询弹窗
+  // 自定义弹窗
   const showSubQuery = (e, i) => {
     let newMeta = store.metaList[groupIndex].list.slice();
     const _value = newMeta[index].customColumn[i] || [];
@@ -7353,7 +7466,7 @@ const Filter = props => {
     let newMeta = store.metaList[groupIndex].list.slice();
     let val = filter[i];
     if (val.type === Filter_TypeEnum.NOT_EXISTS) {
-      showSubQuery(i, '');
+      showNotExists(i, '');
       return;
     }
     let data = getColumns();
@@ -7452,10 +7565,10 @@ const Filter = props => {
     newMeta[index].filter = [..._filter];
     setInd(-1);
   };
-  // 子查询弹窗
-  const showSubQuery = (i, position) => {
+  // NotExists 窗口
+  const showNotExists = (i, position) => {
     const {
-      subToolbar,
+      notExistsToolbar,
       toolbar,
       ...other
     } = store.preProps;
@@ -7463,7 +7576,7 @@ const Filter = props => {
     let index = findIndex(store.metaList[groupIndex].list, meta);
     let _value = position ? [] : newMeta[index].filter[i]?.subquery || [];
     let oldList = position ? [] : cloneDeep(newMeta[index].filter[i]?.subquery || []);
-    let _toolbar = subToolbar || toolbar;
+    let _toolbar = notExistsToolbar || toolbar;
     _toolbar = _toolbar.filter(v => v !== 'group'); // 子查询不需要分组
     let zIndex = store.popupContainer.current ? getMaxZIndexInParents(store.popupContainer.current) : null;
     let o = Modal2.openModal({
@@ -7562,7 +7675,7 @@ const Filter = props => {
           if (type === Filter_TypeEnum.EXPRESSION) {
             handleAdd(_e);
           } else if (type === Filter_TypeEnum.NOT_EXISTS) {
-            showSubQuery(_index, _type);
+            showNotExists(_index, _type);
           }
         }
       })
@@ -7839,8 +7952,8 @@ const GroupBy = props => {
       quotes: '',
       datasourceId: '',
       datasourceName: '',
-      column: '',
-      column_id: '',
+      // column: '',
+      // column_id: '',
       summarizeType: MetaSummarize_Enum.BY
     };
     store.setPopup({
@@ -8101,8 +8214,8 @@ const SelectIndex = props => {
       quotes: '',
       datasourceId: '',
       datasourceName: '',
-      column: '',
-      column_id: '',
+      // column: '',
+      // column_id: '',
       summarizeType: MetaSummarize_Enum.GROUP
     };
     store.setPopup({
@@ -8746,7 +8859,7 @@ const Metabase = props => {
           onClick: onSave,
           children: btnText || __('SqlQueryBuilder.visualize')
         }) : null, store.popupContainer.current && jsx(Popup, {
-          container: store.popupContainer.current,
+          container: store.popupData.container || store.popupContainer.current,
           visible: store.popupData.visible,
           node: store.popupData.node,
           closable: store.popupClosable,
@@ -8758,7 +8871,7 @@ const Metabase = props => {
           },
           children: popupContent
         }), store.popupContainer.current && jsx(Popup, {
-          container: store.popupContainer.current,
+          container: store.popupData2.container || store.popupContainer.current,
           visible: store.popupData2.visible,
           node: store.popupData2.node,
           closable: store.popupClosable2,