@gingkoo/pandora-metabase 1.0.118 → 1.0.119

package/lib/es/components/dialog/select-column-multiple/index.js

@@ -1,14 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-/**
- * 选择表字段当条件
- * 谁在用？
- * 1、关联模块
- * 2、过滤器模块
- * 3、聚合模块
- * 4、排序模块
- */
 import './index.less';
 import { useEffect, useState } from 'react';
 import { Empty } from '@gingkoo/pandora';
@@ -17,9 +9,7 @@ import cloneDeep from 'lodash/cloneDeep';
 import cx from 'classnames';
 import { ColumnsPopupThemeEnum, SQL_GROUP_TYPE } from '../../../store/enum';
 import { SummarizeAlias } from '../../../store/helper';
-import {
-// AtomsField,
-AtomsTypeEnum } from '../../../store/types';
+import { AtomsTypeEnum } from '../../../store/types';
 import { __ } from '../../../locale';
 import { NUMBER_GROUP, DATE_GROUP } from '../const';
 import { useStore } from '../../../hooks/use-provider';
@@ -40,7 +30,7 @@ var IconMap = {
   PK: _jsx(CircleIcon, {}),
   FK: _jsx(ForeignKeyIcon, {})
 };
-var OPEN_GROUP = false; // mr.chen 说不弄这块 弄个开关防止后面要用
+var OPEN_GROUP = false;
 var SelectJoinColumn = function SelectJoinColumn(_ref) {
   var _value$, _value$2;
   var _ref$data = _ref.data,
@@ -63,7 +53,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
   var _useState = useState(_value),
     _useState2 = _slicedToArray(_useState, 2),
     value = _useState2[0],
-    setValue = _useState2[1]; // 当前选择的字段
+    setValue = _useState2[1];
   var _useState3 = useState((_value === null || _value === void 0 || (_value$ = _value[0]) === null || _value$ === void 0 ? void 0 : _value$.tableId) === SummarizeAlias ? '' : _value === null || _value === void 0 || (_value$2 = _value[0]) === null || _value$2 === void 0 ? void 0 : _value$2.tableUuid),
     _useState4 = _slicedToArray(_useState3, 2),
     curTable = _useState4[0],
@@ -71,11 +61,9 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
   var _useState5 = useState(''),
     _useState6 = _slicedToArray(_useState5, 2),
     searchTableText = _useState6[0],
-    setSearchTableText = _useState6[1]; // 搜索表的文字
-  // 当前选择的表
-  // const [curColumn, setCurColumn] = useState(_value); // 当前选择的字段
+    setSearchTableText = _useState6[1];
   var _useState7 = useState(data.map(function (v, i) {
-      var open = !i && !curTable ? true : v.tableUuid === curTable; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
+      var open = !i && !curTable ? true : v.tableUuid === curTable;
       return _objectSpread(_objectSpread({}, v), {}, {
         open: open,
         searchText: '',
@@ -90,7 +78,6 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     tableList = _useState8[0],
     setTableList = _useState8[1];
   useEffect(function () {
-    // setCurColumn(_value);
     setValue(_value);
   }, [_value]);
   var isActive = function isActive(id_alias) {
@@ -108,7 +95,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
       tableUuid = (data === null || data === void 0 || (_data$ = data[0]) === null || _data$ === void 0 ? void 0 : _data$.tableUuid) || '';
     }
     setTableList(data === null || data === void 0 ? void 0 : data.map(function (v, i) {
-      var open = !i && !tableUuid ? true : v.tableUuid === tableUuid; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
+      var open = !i && !tableUuid ? true : v.tableUuid === tableUuid;
       return _objectSpread(_objectSpread({}, v), {}, {
         open: open,
         searchText: '',
@@ -162,13 +149,11 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
         return v.fieldId != (val === null || val === void 0 ? void 0 : val.fieldId);
       });
     }
-    // 当前选中的表字段
     var curTableColumn = data.filter(function (v) {
       return v.tableUuid === tableUuid;
     }).flatMap(function (v) {
       return v.columns;
     });
-    // 过滤选中字段不在当前选中的表字段中，
     _value = _value.filter(function (item2) {
       return curTableColumn.some(function (item1) {
         return item1.name === item2.fieldName;
@@ -186,7 +171,6 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
         datasourceName = _v$datasourceName === void 0 ? '' : _v$datasourceName;
       var fullName = datasourceName ? "".concat(datasourceName, ".").concat(mergeNameAlias(tableName, tableAlias, store.tableEnableAlias)) : mergeNameAlias(tableName, tableAlias, store.tableEnableAlias);
       if (val === '' || ~fullName.toLocaleLowerCase().indexOf(val.toLocaleLowerCase())) {
-        // let open = tableList.filter((vv) => vv.tableUuid === v.tableUuid)?.[0]?.open || false;
         return _objectSpread({}, v);
       }
       return null;
@@ -196,7 +180,6 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     setSearchTableText(val);
     setTableList(newData);
   };
-  // const _condition = value?.condition || '';
   if (data.length < 1) {
     return _jsx("div", {
       className: 'Sqb-SelectColumns--box',
@@ -244,7 +227,6 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
             _tableItem$tableUuid = tableItem.tableUuid,
             tableUuid = _tableItem$tableUuid === void 0 ? '' : _tableItem$tableUuid;
           var isMultiple = tableList.length > 1;
-          // 只有一张表时 展开
           if (!isMultiple) {
             open = true;
           }
@@ -308,7 +290,6 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                   }), _jsx("input", {
                     type: 'text',
                     className: 'p-2',
-                    // autoFocus
                     value: searchText,
                     placeholder: __('joinData.search'),
                     onChange: function onChange() {},
@@ -326,16 +307,12 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                   realName = _v$realName === void 0 ? '' : _v$realName,
                   fieldId = v.id;
                 var groupe = SQL_GROUP_TYPE.STRING;
-                // @ts-ignore
                 if (~NUMBER_GROUP.indexOf(database_type)) {
                   groupe = SQL_GROUP_TYPE.NUMBER;
                 }
-                // @ts-ignore
                 if (~DATE_GROUP.indexOf(database_type)) {
                   groupe = SQL_GROUP_TYPE.DATE;
                 }
-                // let showCondition =
-                //   curColumn === name && curTable === tableUuid && _condition;
                 return _jsx("div", {
                   className: cx("Sqb-List-section"),
                   children: _jsx("div", {
@@ -343,9 +320,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                       active: isActive((v.id || v.name) + (v.fieldAlias || ''))
                     }),
                     onClick: function onClick() {
-                      if (isSummarize) {
-                        // console.log(v, 'v');
-                      }
+                      if (isSummarize) {}
                       changeValue(tableUuid, {
                         tableName: tableItem.name || '',
                         tableId: tableItem.id || '',
@@ -360,22 +335,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                         fieldAlias: v.fieldAlias || '',
                         fieldUuid: v.fieldUuid || '',
                         type: AtomsTypeEnum.FIELD
-                        // quotes: v.fieldAlias || v.name,
                       });
-                      // setCurTable(tableUuid);
-                      // typeof onSelect === 'function' &&
-                      //   onSelect({
-                      //     ...v,
-                      //     table,
-                      //     tableId,
-                      //     alias: tableAlias,
-                      //     name,
-                      //     database_type,
-                      //     sql: v.sql || '',
-                      //     datasourceId,
-                      //     datasourceName,
-                      //     realName,
-                      //   });
                     },
                     children: _jsxs("div", {
                       className: 'p-2 List-item',

package/lib/es/components/dialog/select-join/index.d.ts

@@ -1,8 +1,3 @@
-/**
- * 选择关联方式
- * 谁在用？
- * 1、关联模块
- */
 import './index.less';
 import { JoinEnum } from '../../../store/enum';
 interface PropsType {

package/lib/es/components/dialog/select-join/index.js

@@ -1,9 +1,4 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-/**
- * 选择关联方式
- * 谁在用？
- * 1、关联模块
- */
 import './index.less';
 import cx from 'classnames';
 import { JoinEnum } from '../../../store/enum';

package/lib/es/components/dialog/select-join-column/index.d.ts

@@ -1,11 +1,3 @@
-/**
- * 选择表字段当条件
- * 谁在用？
- * 1、关联模块
- * 2、过滤器模块
- * 3、聚合模块
- * 4、排序模块
- */
 import './index.less';
 import { ColumnsPopupThemeEnum, SQL_COLUMN_TYPE } from '../../../store/enum';
 import { MetaData_ColumnsType, MetaJoin_TalbeType } from '../../../store/types';

package/lib/es/components/dialog/select-join-column/index.js

@@ -1,14 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-/**
- * 选择表字段当条件
- * 谁在用？
- * 1、关联模块
- * 2、过滤器模块
- * 3、聚合模块
- * 4、排序模块
- */
 import './index.less';
 import { useEffect, useState } from 'react';
 import { Menu, Popover } from '@gingkoo/pandora';
@@ -35,7 +27,7 @@ var IconMap = {
   PK: _jsx(CircleIcon, {}),
   FK: _jsx(ForeignKeyIcon, {})
 };
-var OPEN_GROUP = false; // mr.chen 说不弄这块 弄个开关防止后面要用
+var OPEN_GROUP = false;
 var SelectJoinColumn = function SelectJoinColumn(_ref) {
   var _ref$data = _ref.data,
     data = _ref$data === void 0 ? [] : _ref$data,
@@ -52,21 +44,21 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
   var _useState = useState(_value),
     _useState2 = _slicedToArray(_useState, 2),
     value = _useState2[0],
-    setValue = _useState2[1]; // 当前选择的字段
+    setValue = _useState2[1];
   var _useState3 = useState(_value.tableUuid),
     _useState4 = _slicedToArray(_useState3, 2),
     curTable = _useState4[0],
-    setCurTable = _useState4[1]; // 当前选择的表
+    setCurTable = _useState4[1];
   var _useState5 = useState(_value.name),
     _useState6 = _slicedToArray(_useState5, 2),
     curColumn = _useState6[0],
-    setCurColumn = _useState6[1]; // 当前选择的字段
+    setCurColumn = _useState6[1];
   var _useState7 = useState(''),
     _useState8 = _slicedToArray(_useState7, 2),
     searchTableText = _useState8[0],
-    setSearchTableText = _useState8[1]; // 搜索表的文字
+    setSearchTableText = _useState8[1];
   var _useState9 = useState(data.map(function (v, i) {
-      var open = !i && !_value.tableUuid ? true : v.tableUuid === _value.tableUuid; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
+      var open = !i && !_value.tableUuid ? true : v.tableUuid === _value.tableUuid;
       return _objectSpread(_objectSpread({}, v), {}, {
         open: open,
         searchText: '',
@@ -91,7 +83,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     }
     setCurTable(tableUuid);
     setTableList(data.map(function (v, i) {
-      var open = !i && !tableUuid ? true : v.tableUuid === tableUuid; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
+      var open = !i && !tableUuid ? true : v.tableUuid === tableUuid;
       return _objectSpread(_objectSpread({}, v), {}, {
         open: open,
         searchText: '',
@@ -125,7 +117,6 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
         datasourceName = _v$datasourceName === void 0 ? '' : _v$datasourceName;
       var fullName = datasourceName ? "".concat(datasourceName, ".").concat(mergeNameAlias(tableName, tableAlias, store.tableEnableAlias)) : mergeNameAlias(tableName, tableAlias, store.tableEnableAlias);
       if (val === '' || ~fullName.toLocaleLowerCase().indexOf(val.toLocaleLowerCase())) {
-        // let open = tableList.filter((vv) => vv.tableUuid === v.tableUuid)?.[0]?.open || false;
         return _objectSpread({}, v);
       }
       return null;
@@ -172,7 +163,6 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
           _tableItem$tableUuid = tableItem.tableUuid,
           tableUuid = _tableItem$tableUuid === void 0 ? '' : _tableItem$tableUuid;
         var isMultiple = tableList.length > 1;
-        // 只有一张表时 展开
         if (!isMultiple) {
           open = true;
         }
@@ -233,7 +223,6 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                 }), _jsx("input", {
                   type: 'text',
                   className: 'p-2',
-                  // autoFocus
                   value: searchText,
                   placeholder: __('joinData.search'),
                   onChange: function onChange() {},
@@ -249,11 +238,9 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                 _v$realName = v.realName,
                 realName = _v$realName === void 0 ? '' : _v$realName;
               var groupe = SQL_GROUP_TYPE.STRING;
-              // @ts-ignore
               if (~NUMBER_GROUP.indexOf(database_type)) {
                 groupe = SQL_GROUP_TYPE.NUMBER;
               }
-              // @ts-ignore
               if (~DATE_GROUP.indexOf(database_type)) {
                 groupe = SQL_GROUP_TYPE.DATE;
               }

package/lib/es/components/dialog/select-join-column-multiple/index.d.ts

@@ -1,11 +1,3 @@
-/**
- * 选择表字段当条件
- * 谁在用？
- * 1、关联模块
- * 2、过滤器模块
- * 3、聚合模块
- * 4、排序模块
- */
 import './index.less';
 import { ColumnsPopupThemeEnum, SQL_COLUMN_TYPE } from '../../../store/enum';
 import { MetaData_ColumnsType, MetaJoin_TalbeType, MetaJoin_Field } from '../../../store/types';

package/lib/es/components/dialog/select-join-column-multiple/index.js

@@ -2,14 +2,6 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-/**
- * 选择表字段当条件
- * 谁在用？
- * 1、关联模块
- * 2、过滤器模块
- * 3、聚合模块
- * 4、排序模块
- */
 import './index.less';
 import { useEffect, useState } from 'react';
 import cloneDeep from 'lodash/cloneDeep';
@@ -35,7 +27,7 @@ var IconMap = {
   PK: _jsx(CircleIcon, {}),
   FK: _jsx(ForeignKeyIcon, {})
 };
-var OPEN_GROUP = false; // mr.chen 说不弄这块 弄个开关防止后面要用
+var OPEN_GROUP = false;
 var SelectJoinColumn = function SelectJoinColumn(_ref) {
   var _ref$data = _ref.data,
     data = _ref$data === void 0 ? [] : _ref$data,
@@ -53,14 +45,13 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
   var _useState = useState(_value),
     _useState2 = _slicedToArray(_useState, 2),
     value = _useState2[0],
-    setValue = _useState2[1]; // 当前选择的字段
+    setValue = _useState2[1];
   var _useState3 = useState(tableInfo),
     _useState4 = _slicedToArray(_useState3, 2),
     curTable = _useState4[0],
-    setCurTable = _useState4[1]; // 当前选择的表
-  // const [curColumn, setCurColumn] = useState(_value); // 当前选择的字段
+    setCurTable = _useState4[1];
   var _useState5 = useState(data.map(function (v, i) {
-      var open = !i && !tableInfo.tableUuid ? true : v.tableUuid === tableInfo.tableUuid; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
+      var open = !i && !tableInfo.tableUuid ? true : v.tableUuid === tableInfo.tableUuid;
       return _objectSpread(_objectSpread({}, v), {}, {
         open: open,
         searchText: '',
@@ -74,7 +65,6 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     setCurTable(tableInfo);
   }, [tableInfo]);
   useEffect(function () {
-    // setCurColumn(_value);
     setValue(_value);
   }, [_value]);
   var isActive = function isActive(fieldUuid) {
@@ -84,7 +74,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
   };
   useEffect(function () {
     setTableList(data.map(function (v, i) {
-      var open = !i && !tableInfo.tableUuid ? true : v.tableUuid === tableInfo.tableUuid; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
+      var open = !i && !tableInfo.tableUuid ? true : v.tableUuid === tableInfo.tableUuid;
       return _objectSpread(_objectSpread({}, v), {}, {
         open: open,
         searchText: '',
@@ -129,7 +119,6 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     setCurTable(table);
     onSelect === null || onSelect === void 0 || onSelect(table, _value);
   };
-  // const _condition = value?.condition || '';
   return _jsx("div", {
     className: cx("Sqb-SelectColumns--box ".concat(theme)),
     children: _jsx("div", {
@@ -224,16 +213,12 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                 realName = _v$realName === void 0 ? '' : _v$realName,
                 fieldId = v.id;
               var groupe = SQL_GROUP_TYPE.STRING;
-              // @ts-ignore
               if (~NUMBER_GROUP.indexOf(database_type)) {
                 groupe = SQL_GROUP_TYPE.NUMBER;
               }
-              // @ts-ignore
               if (~DATE_GROUP.indexOf(database_type)) {
                 groupe = SQL_GROUP_TYPE.DATE;
               }
-              // let showCondition =
-              //   curColumn === name && curTable === tableUuid && _condition;
               return _jsx("div", {
                 className: cx("Sqb-List-section"),
                 children: _jsx("div", {
@@ -247,20 +232,6 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                       fieldUuid: v.fieldUuid,
                       quotes: v.fieldAlias || v.name
                     });
-                    // setCurTable(tableUuid);
-                    // typeof onSelect === 'function' &&
-                    //   onSelect({
-                    //     ...v,
-                    //     table,
-                    //     tableId,
-                    //     alias: tableAlias,
-                    //     name,
-                    //     database_type,
-                    //     sql: v.sql || '',
-                    //     datasourceId,
-                    //     datasourceName,
-                    //     realName,
-                    //   });
                   },
                   children: _jsxs("div", {
                     className: 'p-2 List-item',

package/lib/es/components/dialog/select-permission-table/index.d.ts

@@ -1,8 +1,3 @@
-/**
- * 选择表弹框
- * 谁在用？
- * 1、选择权限表
- */
 import './index.less';
 import { MetaData_TableType } from '../../../store/types';
 interface PropsType {

package/lib/es/components/dialog/select-permission-table/index.js

@@ -1,10 +1,5 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-/**
- * 选择表弹框
- * 谁在用？
- * 1、选择权限表
- */
 import './index.less';
 import { useState, useEffect } from 'react';
 import cx from 'classnames';

package/lib/es/components/dialog/select-summarize/index.d.ts

@@ -1,11 +1,11 @@
-/**
- * 关联模块 选择表字段
- */
 import './index.less';
 import { DataType, ColumnType } from '../select-join-column';
+import { AtomsItem } from '../../../store/types';
 export type ValueType = Partial<ColumnType> & {
+    name_zh?: string;
     condition: string;
     quotes: string;
+    atoms?: AtomsItem[];
 };
 interface PropsType {
     data: DataType[];

package/lib/es/components/dialog/select-summarize/index.js

@@ -1,20 +1,19 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-/**
- * 关联模块 选择表字段
- */
 import './index.less';
 import { useState } from 'react';
-import { Tooltip } from '@gingkoo/pandora';
+import { Tooltip, Button } from '@gingkoo/pandora';
 import cx from 'classnames';
 import { ColumnsPopupThemeEnum } from '../../../store/enum';
 import { NUMBER_GROUP, DATE_GROUP } from '../const';
 import { __ } from '../../../locale';
 import { TableIcon, LeftArrowIcon } from '../../icons';
-import { SelectJoinColumn } from '../index';
+import FormulaList from '../formula-list';
+import { AtomsTypeEnum } from '../../../store/types';
+import { uuidv4 } from '../../../utils/helper';
 var theme = ColumnsPopupThemeEnum.greenGrass;
-var FormulaList = [{
+var metricOptions = [{
   name: '总行数',
   tip: '总的数据行数'
 }, {
@@ -83,20 +82,78 @@ var SelectSummarize = function SelectSummarize(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     condition = _useState2[0],
     setCondition = _useState2[1];
+  var _useState3 = useState(function () {
+      if (Array.isArray(value.atoms) && value.atoms.length) {
+        return value.atoms;
+      }
+      if (value.name) {
+        var fieldAtom = {
+          fieldName: value.name,
+          fieldNameZh: value.name_zh || '',
+          fieldAlias: '',
+          fieldUuid: uuidv4('field'),
+          fieldId: value.id || '',
+          tableName: value.table || '',
+          tableNameZh: '',
+          tableId: value.tableId || '',
+          tableAlias: value.alias || '',
+          tableUuid: value.tableUuid || '',
+          datasourceName: value.datasourceName || '',
+          datasourceId: value.datasourceId || '',
+          type: AtomsTypeEnum.FIELD
+        };
+        return [fieldAtom];
+      }
+      return [];
+    }),
+    _useState4 = _slicedToArray(_useState3, 2),
+    atoms = _useState4[0],
+    setAtoms = _useState4[1];
   function goPrevPage() {
     setCondition('');
   }
+  function getFormulaSummary() {
+    var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    var itemToText = function itemToText(item) {
+      if (!item) return '';
+      if (item.quotes) return item.quotes;
+      if (item.fieldName) return item.fieldName;
+      if (item.type === AtomsTypeEnum.FORMULA) {
+        var argsText = (item.args || []).map(function (arg) {
+          return getFormulaSummary((arg === null || arg === void 0 ? void 0 : arg.list) || []);
+        }).filter(Boolean).join(', ');
+        return "".concat(item.name || '').concat(argsText ? "(".concat(argsText, ")") : '').trim();
+      }
+      if (item.type === AtomsTypeEnum.EXPRESSION) {
+        var lhs = getFormulaSummary(item.lhs || []);
+        var rhs = getFormulaSummary(item.rhs || []);
+        return [lhs, item.condition, rhs].filter(Boolean).join(' ').trim();
+      }
+      if (item.type === AtomsTypeEnum.AND_OR) {
+        return "".concat(item.operator || 'and', " ( ").concat(getFormulaSummary(item.list || []), " )").replace(/\s+/g, ' ').trim();
+      }
+      if (item.type === AtomsTypeEnum.CASE_WHEN) {
+        return item.quotes || 'case when';
+      }
+      if (Array.isArray(item.val)) return item.val.join(', ');
+      return item.val || '';
+    };
+    return list.map(function (item) {
+      return itemToText(item);
+    }).filter(Boolean).join(' ').replace(/\s+/g, ' ').trim();
+  }
   function handleSelect(condition, record) {
-    var quotes = __(localeMap[QuotesMap.get(condition)]) + ' ' + ((record === null || record === void 0 ? void 0 : record.name) || '');
+    var quotesPrefix = __(localeMap[QuotesMap.get(condition)]);
+    var formulaSummary = getFormulaSummary(record.atoms || atoms);
+    var quotes = [quotesPrefix, formulaSummary].filter(Boolean).join(' ').trim();
     onChange(_objectSpread(_objectSpread({}, record), {}, {
       condition: condition,
       quotes: quotes
     }));
   }
-  if (condition && !~Special.indexOf(condition)) {
+  function getAvailableData() {
     var availableData = data.slice();
     if (condition !== '不重复值的总数' && !ignoreGroupByType) {
-      // 只能用数字类型做聚合
       availableData = data.map(function (v) {
         return _objectSpread(_objectSpread({}, v), {}, {
           columns: v.columns.filter(function (o) {
@@ -107,7 +164,11 @@ var SelectSummarize = function SelectSummarize(_ref) {
         return v.columns.length;
       });
     }
+    return availableData;
+  }
+  if (condition && !~Special.indexOf(condition)) {
     return _jsxs("div", {
+      className: 'Sqb-SelectSummarize-formula',
       children: [_jsx("div", {
         className: 'back-title',
         children: _jsxs("div", {
@@ -116,14 +177,37 @@ var SelectSummarize = function SelectSummarize(_ref) {
             children: [" ", __(localeMap[condition]), " "]
           })]
         })
-      }), _jsx(SelectJoinColumn, {
-        data: availableData,
-        value: value,
-        theme: ColumnsPopupThemeEnum.greenGrass,
-        didUpdate: didUpdate,
-        onSelect: function onSelect(record) {
-          handleSelect(condition, record);
-        }
+      }), _jsx("div", {
+        className: 'Sqb-SelectSummarize-formula-body',
+        children: _jsx("div", {
+          className: 'Sqb-item',
+          children: _jsx("div", {
+            className: 'Sqb-item--content',
+            children: _jsx(FormulaList, {
+              value: atoms,
+              data: getAvailableData(),
+              exitData: getAvailableData(),
+              enableCopy: false,
+              parentPopupChannel: 'secondary',
+              onChange: function onChange(nextValue) {
+                setAtoms(nextValue);
+                didUpdate === null || didUpdate === void 0 || didUpdate();
+              }
+            })
+          })
+        })
+      }), _jsx("div", {
+        className: 'Sqb-SelectSummarize-formula-footer',
+        children: _jsx(Button, {
+          primary: true,
+          disabled: !atoms.length,
+          onClick: function onClick() {
+            handleSelect(condition, {
+              atoms: atoms
+            });
+          },
+          children: "\u786E\u5B9A"
+        })
       })]
     });
   }
@@ -150,7 +234,7 @@ var SelectSummarize = function SelectSummarize(_ref) {
               })]
             })
           })
-        }), FormulaList.map(function (v, i) {
+        }), metricOptions.map(function (v, i) {
           return _jsx("div", {
             className: cx("Sqb-List-section"),
             children: _jsx("div", {
@@ -161,6 +245,10 @@ var SelectSummarize = function SelectSummarize(_ref) {
                 if (~Special.indexOf(v.name)) {
                   handleSelect(v.name, {});
                 } else {
+                  var _value$atoms;
+                  if (!((_value$atoms = value.atoms) !== null && _value$atoms !== void 0 && _value$atoms.length) && !atoms.length) {
+                    setAtoms([]);
+                  }
                   setCondition(v.name);
                 }
               },

package/lib/es/components/dialog/select-summarize/index.less

@@ -151,3 +151,26 @@
     }
   }
 }
+
+.Sqb-SelectSummarize-formula {
+  width: min(760px, calc(100vw - 64px));
+  max-width: 100%;
+  background: #fff;
+}
+
+.Sqb-SelectSummarize-formula-body {
+  max-height: 420px;
+  overflow: auto;
+  padding: 16px 16px 8px;
+
+  .Sqb-item,
+  .Sqb-item--content {
+    width: 100%;
+  }
+}
+
+.Sqb-SelectSummarize-formula-footer {
+  display: flex;
+  justify-content: flex-end;
+  padding: 0 16px 16px;
+}

package/lib/es/components/dialog/select-table/index.d.ts

@@ -1,9 +1,3 @@
-/**
- * 选择表弹框
- * 谁在用？
- * 1、数据模块
- * 2、关联模块
- */
 import './index.less';
 import { MetaData_TableType } from '../../../store/types';
 import { DatasourceType } from '../../../types';