@gingkoo/pandora-metabase 1.0.136 → 1.0.137-alpha.2

package/lib/es/components/modules/filter.js

@@ -43,9 +43,10 @@ var Filter = function Filter(props) {
       if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$group = prevGroupBy.group) !== null && _prevGroupBy$group !== void 0 && _prevGroupBy$group.length) {
         _data.columns = _data.columns.concat(prevGroupBy.group.map(function (v) {
           return _objectSpread(_objectSpread({}, v), {}, {
-            name: v.name || v.quotes,
+            name: v.fieldAlias || v.name || v.quotes,
             name_zh: v.name_zh || v.quotes,
             id: v.id || v.fieldId,
+            fieldAlias: '',
             database_type: (v === null || v === void 0 ? void 0 : v.database_type) || SQL_COLUMN_TYPE.FLOAT,
             sql: v.sql,
             special_type: '',
@@ -56,9 +57,10 @@ var Filter = function Filter(props) {
       if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$by = prevGroupBy.by) !== null && _prevGroupBy$by !== void 0 && _prevGroupBy$by.length) {
         _data.columns = _data.columns.concat(prevGroupBy.by.map(function (v) {
           return _objectSpread(_objectSpread({}, v), {}, {
-            name: v.name || v.quotes,
+            name: v.fieldAlias || v.name || v.quotes,
             name_zh: v.name_zh || v.quotes,
             id: v.id || v.fieldId,
+            fieldAlias: '',
             database_type: (v === null || v === void 0 ? void 0 : v.database_type) || SQL_COLUMN_TYPE.FLOAT,
             sql: v.sql,
             special_type: '',

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

@@ -11,13 +11,12 @@ import cx from 'classnames';
 import { Button, Tooltip, Input, Modal2, Modal, Toast, Dropdown, InputNumber } from '@gingkoo/pandora';
 import { FfPlus, FfLine, Repeat, RelatedWork } from '@gingkoo/pandora-icons';
 import Metabase from '../../index';
-import isEqual from 'lodash/isEqual';
 import cloneDeep from 'lodash/cloneDeep';
-import { uuidv4, getAlias, mergeNameAlias, isSameColumnByIdFirst, isSameTableByIdFirst } from '../../utils/helper';
+import { uuidv4, getAlias, mergeNameAlias, isSameTableByIdFirst } from '../../utils/helper';
 import { getTopLayerZIndex } from '../../utils/helper-dom';
 import { getConstantLabel } from '../dialog/formula-list/utils';
 import { __ } from '../../locale';
-import { findIndex, getSubColumns } from '../../utils';
+import { findIndex, getSubColumns, mergeSubQueryColumns, syncSubQueryFieldReferences } from '../../utils';
 import { TypeEnum, ColumnsPopupThemeEnum, JoinEnum, SQL_COLUMN_TYPE } from '../../store/enum';
 import { AtomsTypeEnum, ChangeType, FormulaTypeEnum } from '../../store/types';
 import { SummarizeAlias } from '../../store/helper';
@@ -33,7 +32,19 @@ import { SelectTable, SelectJoin, SelectColumnMultiple, SelectColumn, Expression
 import { ExclamationCircleFill } from '@gingkoo/pandora-icons';
 import { useStore } from '../../hooks/use-provider';
 var PrevResult = 'Previous results';
-var operators = ['AND', 'OR', '(', ')', ',', '+', '-', '*', '/', '!=', '<=', '>=', '<', '>', '='];
+var normalizeJoinOperator = function normalizeJoinOperator(val) {
+  return String(val).toUpperCase() === 'OR' ? 'OR' : 'AND';
+};
+var isJoinOperator = function isJoinOperator(item) {
+  return (item === null || item === void 0 ? void 0 : item.type) === AtomsTypeEnum.OPERATOR;
+};
+var menuJoinOperator = [{
+  key: 'AND',
+  label: 'AND'
+}, {
+  key: 'OR',
+  label: 'OR'
+}];
 var FlagLocation;
 (function (FlagLocation) {
   FlagLocation["TABLE_1"] = "table1";
@@ -45,7 +56,7 @@ var ExpressionsEnum;
   ExpressionsEnum["RIGHT"] = "rhs";
 })(ExpressionsEnum || (ExpressionsEnum = {}));
 var getText = function getText(v) {
-  return _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, AtomsTypeEnum.JOIN_DEFAULT, 'joinData.default'), AtomsTypeEnum.EXPRESSION, 'joinData.expression'), AtomsTypeEnum.OPERATOR, 'customColumn.operator'), AtomsTypeEnum.COLLECTION, 'customColumn.collection')[v];
+  return _defineProperty(_defineProperty(_defineProperty({}, AtomsTypeEnum.JOIN_DEFAULT, 'joinData.default'), AtomsTypeEnum.EXPRESSION, 'joinData.expression'), AtomsTypeEnum.COLLECTION, 'customColumn.collection')[v];
 };
 var menuTypes = [{
   key: AtomsTypeEnum.JOIN_DEFAULT,
@@ -53,19 +64,10 @@ var menuTypes = [{
 }, {
   key: AtomsTypeEnum.EXPRESSION,
   label: __(getText(AtomsTypeEnum.EXPRESSION))
-}, {
-  key: AtomsTypeEnum.OPERATOR,
-  label: __(getText(AtomsTypeEnum.OPERATOR))
 }, {
   key: AtomsTypeEnum.COLLECTION,
   label: __(getText(AtomsTypeEnum.COLLECTION))
 }];
-var menuOperator = operators.map(function (v) {
-  return {
-    key: v,
-    label: v
-  };
-});
 var JoinData = function JoinData(props) {
   var _meta$subquery, _meta$subquery2, _meta$subquery3, _meta$table4, _meta$table5, _meta$table7, _meta$table8, _meta$table9, _meta$table0, _meta$expressions, _meta$table1, _meta$table10, _meta$expressions2, _store$showMainColumn, _store$showMainColumn2;
   var meta = props.meta,
@@ -126,6 +128,26 @@ var JoinData = function JoinData(props) {
       tableIsDel();
     }, 0);
   }, [meta]);
+  useEffect(function () {
+    var expressions = meta.expressions || [];
+    var hasInvalidOperator = expressions.some(function (item) {
+      return item.type === AtomsTypeEnum.OPERATOR && item.val !== normalizeJoinOperator(item.val);
+    });
+    if (!hasInvalidOperator) {
+      return;
+    }
+    var currentIndex = findIndex(store.metaList[groupIndex].list, meta);
+    var newMeta = store.metaList[groupIndex].list.slice();
+    newMeta[currentIndex].expressions = expressions.map(function (item) {
+      if (item.type !== AtomsTypeEnum.OPERATOR) {
+        return item;
+      }
+      return _objectSpread(_objectSpread({}, item), {}, {
+        val: normalizeJoinOperator(item.val)
+      });
+    });
+    store.setMeta(newMeta, groupIndex);
+  }, [meta.expressions]);
   var getTableColumns = function getTableColumns() {
     var data = [];
     var _getHelper2 = getHelper(store.metaList[groupIndex].list, meta),
@@ -952,7 +974,6 @@ var JoinData = function JoinData(props) {
     var childModalZIndex = getTopLayerZIndex() + 1;
     var newMeta = cloneDeep(store.metaList[groupIndex].list);
     var index = findIndex(store.metaList[groupIndex].list, meta);
-    var oldList = cloneDeep(newMeta[index].subquery);
     var _toolbar = subToolbar || toolbar;
     var o = Modal2.openModal({
       zIndex: childModalZIndex,
@@ -968,21 +989,22 @@ var JoinData = function JoinData(props) {
           onOk: function onOk(newList) {
             try {
               var _store$preProps3;
-              if (isEqual(newList, oldList)) {
-                o.close();
-                return;
-              }
               newMeta[index].subquery = newList;
               newMeta[index].table2 = _objectSpread(_objectSpread({}, newList[0].table), {}, {
                 alias: newMeta[index].table2.alias || getAlias(newList[0].table.name, newMeta, ((_store$preProps3 = store.preProps) === null || _store$preProps3 === void 0 ? void 0 : _store$preProps3.notExistsColumns) || [])
               });
               var items = getSubColumns(newList);
+              var subQueryTable = newMeta[index].table2;
               var newColumns = items.flatMap(function (item) {
                 return item.columns.map(function (column) {
+                  var columnMeta = column;
                   return _objectSpread(_objectSpread({}, column), {}, {
-                    tableId: column.tableId || column.id || item.id,
-                    tableUuid: column.tableUuid || item.tableUuid,
-                    datasourceId: column.datasourceId || item.datasourceId || ''
+                    tableId: subQueryTable.id || item.id || column.tableId || column.id,
+                    tableUuid: subQueryTable.tableUuid || item.tableUuid || column.tableUuid,
+                    tableName: subQueryTable.name || item.name || columnMeta.tableName || '',
+                    tableAlias: subQueryTable.alias || item.alias || columnMeta.tableAlias || '',
+                    datasourceId: subQueryTable.datasourceId || item.datasourceId || column.datasourceId || '',
+                    datasourceName: subQueryTable.datasourceName || item.datasourceName || column.datasourceName || ''
                   });
                 });
               }).map(function (v) {
@@ -990,15 +1012,10 @@ var JoinData = function JoinData(props) {
                   select: false
                 });
               });
-              newMeta[index].columns = newColumns.map(function (newCol) {
-                var existingCol = newMeta[index].columns.find(function (oldCol) {
-                  return isSameColumnByIdFirst(oldCol, newCol);
-                });
-                var _column = existingCol ? existingCol : newCol;
-                _column.select = store.isSelectFields || _column.select;
-                return _column;
-              });
+              var oldColumns = newMeta[index].columns;
+              newMeta[index].columns = mergeSubQueryColumns(newColumns, oldColumns, store.isSelectFields);
               initExpressions(newMeta);
+              newMeta = syncSubQueryFieldReferences(newMeta, newMeta[index].table2, newMeta[index].columns, oldColumns);
               store.setMeta(newMeta, groupIndex, {
                 obj: newList,
                 type: ChangeType.subQuery
@@ -1065,10 +1082,26 @@ var JoinData = function JoinData(props) {
       onCancel: function onCancel() {}
     });
   };
+  var cleanJoinOperators = function cleanJoinOperators(expressions) {
+    for (var i = expressions.length - 1; i >= 0; i--) {
+      if (isJoinOperator(expressions[i]) && (i === 0 || i === expressions.length - 1 || isJoinOperator(expressions[i - 1]))) {
+        expressions.splice(i, 1);
+      }
+    }
+  };
   var changeOperator = function changeOperator(key, i) {
     var index = findIndex(store.metaList[groupIndex].list, meta);
     var newMeta = store.metaList[groupIndex].list.slice();
-    newMeta[index].expressions[i].val = key;
+    var operator = newMeta[index].expressions[i];
+    operator.val = normalizeJoinOperator(key);
+    store.setMeta(newMeta, groupIndex);
+  };
+  var removeExpression = function removeExpression(i) {
+    var index = findIndex(store.metaList[groupIndex].list, meta);
+    var newMeta = store.metaList[groupIndex].list.slice();
+    var expressions = newMeta[index].expressions;
+    expressions.splice(i, 1);
+    cleanJoinOperators(expressions);
     store.setMeta(newMeta, groupIndex);
   };
   var changeExpression = function changeExpression(e, i) {
@@ -1134,19 +1167,15 @@ var JoinData = function JoinData(props) {
         }],
         type: type
       };
-      store.setMeta(newMeta, groupIndex);
-    }
-    if (type === AtomsTypeEnum.OPERATOR) {
-      item = {
-        val: 'AND',
-        type: type
-      };
     }
     if (!item) {
       return;
     }
     if (i >= 0) {
-      newMeta[index].expressions.splice(i + 1, 0, item);
+      newMeta[index].expressions.splice(i + 1, 0, {
+        val: 'AND',
+        type: AtomsTypeEnum.OPERATOR
+      }, item);
     } else {
       newMeta[index].expressions.push(item);
     }
@@ -1461,16 +1490,14 @@ var JoinData = function JoinData(props) {
                       className: 'mr-2 operator-icon',
                       icon: _jsx(FfLine, {}),
                       onClick: function onClick() {
-                        var index = findIndex(store.metaList[groupIndex].list, meta);
-                        var newMeta = store.metaList[groupIndex].list.slice();
-                        newMeta[index].expressions.splice(i, 1);
-                        store.setMeta(newMeta, groupIndex);
+                        removeExpression(i);
                       }
                     })
                   })]
                 }, i);
               }
               if (v.type === AtomsTypeEnum.OPERATOR) {
+                var operator = normalizeJoinOperator(v.val);
                 return _jsxs("div", {
                   className: cx("Sqb-where block"),
                   children: [i == 0 && _jsx("span", {
@@ -1481,41 +1508,12 @@ var JoinData = function JoinData(props) {
                     onChange: function onChange(key) {
                       changeOperator(key, i);
                     },
-                    droplist: menuOperator,
+                    droplist: menuJoinOperator,
                     children: _jsx(Button, {
+                      disabled: meta.readonly,
                       className: 'ml-2 mr-4 text-gray-500',
                       type: 'link',
-                      children: v.val
-                    })
-                  }), _jsx(Tooltip, {
-                    title: __('SqlQueryBuilder.add'),
-                    children: _jsx(Dropdown, {
-                      trigger: ['click'],
-                      onChange: function onChange(key) {
-                        addExpression(key, i);
-                      },
-                      droplist: menuTypes,
-                      children: _jsx(Button, {
-                        disabled: meta.readonly,
-                        primary: true,
-                        ghost: true,
-                        className: 'mr-2 operator-icon',
-                        icon: _jsx(FfPlus, {})
-                      })
-                    })
-                  }), _jsx(Tooltip, {
-                    title: __('SqlQueryBuilder.del'),
-                    children: _jsx(Button, {
-                      disabled: meta.readonly,
-                      danger: true,
-                      className: 'mr-2 operator-icon',
-                      icon: _jsx(FfLine, {}),
-                      onClick: function onClick() {
-                        var index = findIndex(store.metaList[groupIndex].list, meta);
-                        var newMeta = store.metaList[groupIndex].list.slice();
-                        newMeta[index].expressions.splice(i, 1);
-                        store.setMeta(newMeta, groupIndex);
-                      }
+                      children: operator
                     })
                   })]
                 }, i);
@@ -1561,10 +1559,7 @@ var JoinData = function JoinData(props) {
                       className: 'mr-2 operator-icon',
                       icon: _jsx(FfLine, {}),
                       onClick: function onClick() {
-                        var index = findIndex(store.metaList[groupIndex].list, meta);
-                        var newMeta = store.metaList[groupIndex].list.slice();
-                        newMeta[index].expressions.splice(i, 1);
-                        store.setMeta(newMeta, groupIndex);
+                        removeExpression(i);
                       }
                     })
                   })]
@@ -1615,10 +1610,7 @@ var JoinData = function JoinData(props) {
                       className: 'mr-2 operator-icon',
                       icon: _jsx(FfLine, {}),
                       onClick: function onClick() {
-                        var index = findIndex(store.metaList[groupIndex].list, meta);
-                        var newMeta = store.metaList[groupIndex].list.slice();
-                        newMeta[index].expressions.splice(i, 1);
-                        store.setMeta(newMeta, groupIndex);
+                        removeExpression(i);
                       }
                     })
                   })]

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

@@ -12,12 +12,11 @@ import { __ } from '../../locale';
 import { ChangeType } from '../../store/types';
 import { Tooltip, Button, Modal, Modal2, Input, Toast } from '@gingkoo/pandora';
 import Metabase from '../../index';
-import { uuidv4, getAlias, isSameColumnByIdFirst, isSameTableByIdFirst } from '../../utils/helper';
+import { uuidv4, getAlias, isSameTableByIdFirst } from '../../utils/helper';
 import { getTopLayerZIndex } from '../../utils/helper-dom';
-import { changeTableAlias, getSubColumns, isValidSQLAlias, isExistsError } from '../../utils';
+import { changeTableAlias, getSubColumns, mergeSubQueryColumns, isValidSQLAlias, isExistsError, syncSubQueryFieldReferences } from '../../utils';
 import { RelatedWork } from '@gingkoo/pandora-icons';
 import cloneDeep from 'lodash/cloneDeep';
-import isEqual from 'lodash/isEqual';
 import ItemName from './components/item-name';
 import { SelectTable, SelectColumn } from '../dialog';
 import Wrapper from './components/Wrapper';
@@ -189,7 +188,6 @@ var TableData = function TableData(props) {
     var childModalZIndex = getTopLayerZIndex() + 1;
     var newMetaList = store.metaList[groupIndex].list.slice()[0];
     var newMeta = store.metaList[groupIndex].list.slice();
-    var oldList = cloneDeep(newMetaList.subquery);
     var _toolbar = subToolbar || toolbar;
     var o = Modal2.openModal({
       zIndex: childModalZIndex,
@@ -204,22 +202,23 @@ var TableData = function TableData(props) {
           value: cloneDeep(val),
           onOk: function onOk(newList) {
             try {
-              if (isEqual(newList, oldList)) {
-                o.close();
-                return;
-              }
               newMetaList.subquery = newList;
               newMetaList.table = _objectSpread(_objectSpread({}, newList[0].table), {}, {
                 alias: newMetaList.table.alias || getAlias(newList[0].table.name, newMeta),
                 tableUuid: newMetaList.table.tableUuid || uuidv4('table')
               });
               var items = getSubColumns(newList);
+              var subQueryTable = newMetaList.table;
               var newColumns = items.flatMap(function (item) {
                 return item.columns.map(function (column) {
+                  var columnMeta = column;
                   return _objectSpread(_objectSpread({}, column), {}, {
-                    tableId: column.tableId || column.id || item.id,
-                    tableUuid: column.tableUuid || item.tableUuid,
-                    datasourceId: column.datasourceId || item.datasourceId || ''
+                    tableId: subQueryTable.id || item.id || column.tableId || column.id,
+                    tableUuid: subQueryTable.tableUuid || item.tableUuid || column.tableUuid,
+                    tableName: subQueryTable.name || item.name || columnMeta.tableName || '',
+                    tableAlias: subQueryTable.alias || item.alias || columnMeta.tableAlias || '',
+                    datasourceId: subQueryTable.datasourceId || item.datasourceId || column.datasourceId || '',
+                    datasourceName: subQueryTable.datasourceName || item.datasourceName || column.datasourceName || ''
                   });
                 });
               }).map(function (v) {
@@ -227,16 +226,11 @@ var TableData = function TableData(props) {
                   select: false
                 });
               });
-              newMetaList.columns = newColumns.map(function (newCol) {
-                var existingCol = newMetaList.columns.find(function (oldCol) {
-                  return isSameColumnByIdFirst(oldCol, newCol);
-                });
-                var _column = existingCol ? existingCol : newCol;
-                _column.select = store.isSelectFields || _column.select;
-                return _column;
-              });
+              var oldColumns = newMetaList.columns;
+              newMetaList.columns = mergeSubQueryColumns(newColumns, oldColumns, store.isSelectFields);
               var newMetas = store.metaList[groupIndex].list.slice();
               newMetas[0] = newMetaList;
+              newMetas = syncSubQueryFieldReferences(newMetas, newMetaList.table, newMetaList.columns, oldColumns);
               store.setMeta(newMetas, groupIndex, {
                 obj: newList,
                 type: ChangeType.subQuery

package/lib/es/utils.d.ts

@@ -21,6 +21,8 @@ interface HelperResultType {
     };
 }
 export declare const getHelper: (list: MetaListType[], item: MetaListType) => HelperResultType;
+export declare const mergeSubQueryColumns: (columns: MetaData_ColumnsType[], oldColumns?: MetaData_ColumnsType[], isSelectFields?: boolean) => MetaData_ColumnsType[];
+export declare const syncSubQueryFieldReferences: (list: MetaListType[], table: MetaData_TableType, columns: MetaData_ColumnsType[], oldColumns?: MetaData_ColumnsType[]) => MetaListType[];
 export declare const getSubColumns: (metaList: any) => DataType[];
 export declare function isValidSQLAlias(str: string): boolean;
 export declare const changeTableAlias: (list: MetaListType[] | [], curObj: Pick<MetaData_TableType, "tableUuid" | "alias">) => MetaListType[];
@@ -31,7 +33,7 @@ export declare const getObjTem: (arr: any[]) => any;
 export declare const patchData: (metas: MetaListType[], constantList?: any, formulaTemplates?: any) => MetaListType[];
 export declare function reassembleByUnion(target?: any[]): any[];
 export declare const buildSqlQuery: (data: MetaListType[] | undefined, type: string) => string;
-export declare const isError: (item: AtomsItem | AtomsItem[], data: DataType[]) => boolean;
+export declare const isError: (item: AtomsItem | AtomsItem[], data?: DataType[]) => boolean;
 export declare function containsSubset(root: unknown, target: Record<string, unknown>): boolean;
 export declare const isExistsError: (meta: any[], errorList: any[]) => boolean;
 export declare const changeCopyField: (items: AtomsItem[], data: any[]) => AtomsItem[];