@gingkoo/pandora-metabase 1.0.137 → 1.0.138

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

@@ -29,7 +29,7 @@ var _helperDom = require("../../../utils/helper-dom");
 var _templateObject;
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var VisualBox = _styledComponents["default"].div.attrs({
-  className: 'visual-box'
+  className: 'visual-box scroller'
 })(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])([""])));
 var CaseEditor = _react["default"].forwardRef(function (props, ref) {
   var _store$formulaTemplat, _fun$args;

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

@@ -162,7 +162,7 @@ var CaseWhenGroup = function CaseWhenGroup(_ref) {
           className: 'Sqb-CaseBranchIndex',
           children: branchIndex + 1
         }), (0, _jsxRuntime.jsx)("div", {
-          className: 'Sqb-CaseBranch-body',
+          className: 'Sqb-CaseBranch-body scroller-x',
           children: renderBranchContent((0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
             children: [(0, _jsxRuntime.jsxs)("div", {
               className: 'Sqb-CaseSection Sqb-CaseSection-condition',
@@ -233,7 +233,7 @@ var CaseWhenGroup = function CaseWhenGroup(_ref) {
         className: 'Sqb-CaseBranchIndex Sqb-CaseBranchIndex--else',
         "aria-hidden": 'true'
       }), (0, _jsxRuntime.jsx)("div", {
-        className: 'Sqb-CaseBranch-body',
+        className: 'Sqb-CaseBranch-body scroller-x',
         children: renderBranchContent((0, _jsxRuntime.jsxs)("div", {
           className: 'Sqb-CaseSection Sqb-CaseSection-result Sqb-CaseSection-else',
           children: [(0, _jsxRuntime.jsx)("span", {

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

@@ -496,7 +496,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
         children: (0, _jsxRuntime.jsxs)("div", {
           className: 'Sqb-FormulaListZoomEditor',
           children: [(0, _jsxRuntime.jsx)("div", {
-            className: 'Sqb-FormulaListZoomEditor-body',
+            className: 'Sqb-FormulaListZoomEditor-body scroller scroller-x',
             children: (0, _jsxRuntime.jsx)("div", {
               className: 'Sqb-NotebookCell Sqb-FormulaListZoomEditor-cell',
               children: (0, _jsxRuntime.jsx)(_CaseWhenGroup["default"], {
@@ -658,7 +658,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
         children: (0, _jsxRuntime.jsxs)("div", {
           className: 'Sqb-FormulaListZoomEditor',
           children: [(0, _jsxRuntime.jsx)("div", {
-            className: 'Sqb-FormulaListZoomEditor-body Sqb-FormulaListZoomEditor-body--formulaList',
+            className: 'Sqb-FormulaListZoomEditor-body Sqb-FormulaListZoomEditor-body--formulaList scroller scroller-x',
             children: (0, _jsxRuntime.jsx)(FormulaList, {
               ref: ref,
               value: draftList,

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

@@ -1649,8 +1649,8 @@
   width: 100%;
   min-width: 100%;
   box-sizing: border-box;
-  padding-left: var(--sqb-item-shell-margin-x, 14px);
-  padding-right: var(--sqb-item-shell-margin-x, 14px);
+  padding: var(--sqb-item-shell-margin-x, 14px);
+  // padding: var(--sqb-item-shell-margin-x, 14px);
 }
 
 .Sqb-FormulaListZoomEditor-body .Sqb-FormulaListZoomEditor-cell {
@@ -1736,6 +1736,14 @@
   padding-bottom: 4px;
 }
 
+.Sqb-FormulaListZoomEditor-body
+  .Sqb-CaseWhenGroup:not(.Sqb-CaseWhenGroup--nested)
+  > .Sqb-FormulaGroup-row
+  > .Sqb-CaseBranch-body:has(.Sqb-CaseWhenGroup--nested) {
+  overflow: visible;
+  padding-bottom: 0;
+}
+
 .Sqb-FormulaListZoomEditor-body
   .Sqb-CaseWhenGroup:not(.Sqb-CaseWhenGroup--nested)
   > .Sqb-FormulaGroup-row
@@ -2162,3 +2170,101 @@
   background: rgba(80, 158, 227, 0.88);
   border-color: rgba(80, 158, 227, 0.88);
 }
+
+.Sqb-FormulaGroup.logic-group > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested),
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  > .Sqb-NestedFormulaList,
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  > .Sqb-NestedFormulaList
+  > .Sqb-NotebookCell,
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  > .Sqb-NestedFormulaList
+  > .Sqb-NotebookCell.Sqb-NotebookCell--embedded,
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  > .Sqb-NestedFormulaList
+  > .Sqb-NotebookCell.Sqb-NotebookCell--embedded
+  > .Sqb-Filter-item.item-composite,
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  > .Sqb-NestedFormulaList
+  > .Sqb-NotebookCell.Sqb-NotebookCell--embedded
+  > .Sqb-Filter-item.item-composite
+  > .Sqb-Filter-item-node,
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  .Sqb-CaseWhenGroup.Sqb-CaseWhenGroup--nested {
+  min-width: 0;
+  max-width: 100%;
+  box-sizing: border-box;
+}
+
+.Sqb-FormulaGroup.logic-group > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested) {
+  flex: 1 1 auto;
+}
+
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  > .Sqb-NestedFormulaList,
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  > .Sqb-NestedFormulaList
+  > .Sqb-NotebookCell,
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  > .Sqb-NestedFormulaList
+  > .Sqb-NotebookCell.Sqb-NotebookCell--embedded,
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  > .Sqb-NestedFormulaList
+  > .Sqb-NotebookCell.Sqb-NotebookCell--embedded
+  > .Sqb-Filter-item.item-composite,
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  > .Sqb-NestedFormulaList
+  > .Sqb-NotebookCell.Sqb-NotebookCell--embedded
+  > .Sqb-Filter-item.item-composite
+  > .Sqb-Filter-item-node,
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  .Sqb-CaseWhenGroup.Sqb-CaseWhenGroup--nested {
+  flex: 1 1 auto;
+  width: 100%;
+}
+
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  .Sqb-CaseWhenGroup.Sqb-CaseWhenGroup--nested
+  > .Sqb-FormulaGroup-row.row-when,
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  .Sqb-CaseWhenGroup.Sqb-CaseWhenGroup--nested
+  > .Sqb-FormulaGroup-row.row-else {
+  grid-template-columns:
+    var(--sqb-case-index-column) minmax(0, 1fr)
+    var(--sqb-case-action-column);
+  width: 100%;
+  min-width: 0;
+  max-width: 100%;
+}
+
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  .Sqb-CaseWhenGroup.Sqb-CaseWhenGroup--nested
+  > .Sqb-FormulaGroup-row.row-when
+  > .Sqb-CaseBranch-body,
+.Sqb-FormulaGroup.logic-group
+  > .Sqb-LogicGroup-content:has(.Sqb-CaseWhenGroup--nested)
+  .Sqb-CaseWhenGroup.Sqb-CaseWhenGroup--nested
+  > .Sqb-FormulaGroup-row.row-else
+  > .Sqb-CaseBranch-body {
+  width: 100%;
+  min-width: 0;
+  max-width: 100%;
+  overflow-x: auto;
+  overflow-y: hidden;
+  padding-bottom: 4px;
+}

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

@@ -108,6 +108,12 @@ var customTypes = exports.customTypes = [{
 }, {
   value: _types.AtomsTypeEnum.EXPRESSION,
   label: (0, _locale.__)('customColumn.expression')
+}, {
+  value: _types.AtomsTypeEnum.CASE_WHEN,
+  label: (0, _locale.__)('customColumn.caseWhen')
+}, {
+  value: _types.AtomsTypeEnum.AND_OR,
+  label: (0, _locale.__)('customColumn.andOr')
 }, {
   value: _types.AtomsTypeEnum.INPUT_STRING,
   label: (0, _locale.__)('customColumn.input')

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = exports.NUMBER_GROUP_MAP = exports.DATE_GROUP_MAP = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -95,32 +96,74 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
       setCurTable(selectedTableUuid);
     }
   }, [_value]);
-  var getFieldTableKey = function getFieldTableKey(tableId, tableUuid) {
-    return tableId || tableUuid || '';
+  var normalizeIdentityValue = function normalizeIdentityValue(val) {
+    if (val === undefined || val === null) return '';
+    return "".concat(val);
   };
-  var isSameSelectedTable = function isSameSelectedTable(field, tableId, tableUuid) {
-    if (field.tableId && tableId) {
-      return field.tableId === tableId;
+  var isSourceLikeDatasource = function isSourceLikeDatasource(datasourceId) {
+    var normalizedDatasourceId = normalizeIdentityValue(datasourceId);
+    return !normalizedDatasourceId || normalizedDatasourceId === _helper.SummarizeAlias;
+  };
+  var getFieldTableKey = function getFieldTableKey(tableId, tableUuid, tableAlias, datasourceId) {
+    var normalizedTableId = normalizeIdentityValue(tableId);
+    var normalizedTableAlias = normalizeIdentityValue(tableAlias);
+    var normalizedTableUuid = normalizeIdentityValue(tableUuid);
+    var normalizedDatasourceId = normalizeIdentityValue(datasourceId);
+    var datasourceKey = isSourceLikeDatasource(normalizedDatasourceId) ? '' : normalizedDatasourceId;
+    if (normalizedTableId) {
+      return "".concat(datasourceKey, "|id:").concat(normalizedTableId, "|alias:").concat(normalizedTableAlias);
     }
-    if (field.tableUuid && tableUuid) {
-      return field.tableUuid === tableUuid;
+    if (normalizedTableUuid) {
+      return "".concat(datasourceKey, "|uuid:").concat(normalizedTableUuid);
     }
-    return false;
+    return datasourceKey;
   };
-  var getSelectedFieldKey = function getSelectedFieldKey(field) {
-    if (!field) return '';
-    var tableKey = getFieldTableKey(field.tableId, field.tableUuid);
-    var fieldKey = field.fieldId || field.fieldUuid || field.fieldName || '';
-    return "".concat(tableKey, "|").concat(fieldKey);
+  var isSameSelectedTable = function isSameSelectedTable(field, tableItem) {
+    if (!tableItem) return false;
+    var fieldDatasourceId = normalizeIdentityValue(field.datasourceId);
+    var tableDatasourceId = normalizeIdentityValue(tableItem.datasourceId);
+    if (fieldDatasourceId && tableDatasourceId && !isSourceLikeDatasource(fieldDatasourceId) && !isSourceLikeDatasource(tableDatasourceId) && fieldDatasourceId !== tableDatasourceId) {
+      return false;
+    }
+    var fieldTableId = normalizeIdentityValue(field.tableId);
+    var tableId = normalizeIdentityValue(tableItem.id);
+    if (fieldTableId && tableId) {
+      if (fieldTableId !== tableId) return false;
+      var fieldTableAlias = normalizeIdentityValue(field.tableAlias);
+      var tableAlias = normalizeIdentityValue(tableItem.alias);
+      if (fieldTableAlias && tableAlias) {
+        return fieldTableAlias === tableAlias;
+      }
+      return true;
+    }
+    var fieldTableUuid = normalizeIdentityValue(field.tableUuid);
+    var tableUuid = normalizeIdentityValue(tableItem.tableUuid);
+    return Boolean(fieldTableUuid && tableUuid && fieldTableUuid === tableUuid);
   };
-  var getColumnKey = function getColumnKey(column, isSummarizeColumn, tableId, tableUuid) {
-    var tableKey = getFieldTableKey(tableId, tableUuid);
-    var fieldKey = column.id || column.fieldId || column.fieldUuid || column.name || '';
-    return "".concat(tableKey, "|").concat(fieldKey);
+  var getFieldStableValues = function getFieldStableValues(field) {
+    var includeAlias = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    if (!field) return [];
+    return [field.fieldId, field.id, field.fieldName].concat((0, _toConsumableArray2["default"])(includeAlias ? [field.fieldAlias] : [])).map(normalizeIdentityValue).filter(Boolean);
+  };
+  var getColumnStableValues = function getColumnStableValues(column) {
+    var includeAlias = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    if (!column) return [];
+    return [column.id, column.fieldId, column.fieldName, column.name, column.realName].concat((0, _toConsumableArray2["default"])(includeAlias ? [column.fieldAlias] : [])).map(normalizeIdentityValue).filter(Boolean);
+  };
+  var isSameSelectedField = function isSameSelectedField(field, column) {
+    var includeAlias = Boolean(column.summarizeType);
+    var fieldValues = getFieldStableValues(field, includeAlias);
+    var columnValues = getColumnStableValues(column, includeAlias);
+    if (fieldValues.some(function (value) {
+      return columnValues.includes(value);
+    })) {
+      return true;
+    }
+    return Boolean(field.fieldUuid && column.fieldUuid && field.fieldUuid === column.fieldUuid);
   };
-  var isActive = function isActive(id_alias, tableId, tableUuid) {
+  var isActive = function isActive(column, tableItem) {
     return (value === null || value === void 0 ? void 0 : value.filter(function (v) {
-      return isSameSelectedTable(v, tableId, tableUuid) && getSelectedFieldKey(v) === id_alias;
+      return isSameSelectedTable(v, tableItem) && isSameSelectedField(v, column);
     }).length) > 0;
   };
   (0, _react.useEffect)(function () {
@@ -174,14 +217,8 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
   };
   var getMatchedColumnByField = function getMatchedColumnByField(field, tableItem) {
     if (!tableItem) return null;
-    var tableId = tableItem.id || '';
-    var tableUuid = tableItem.tableUuid || '';
     return (tableItem.columns || []).find(function (column) {
-      return (0, _helper2.isSameColumnByIdFirst)((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, column), {}, {
-        tableId: tableId,
-        tableUuid: tableUuid,
-        datasourceId: tableItem.datasourceId || ''
-      }), field);
+      return isSameSelectedField(field, column);
     }) || null;
   };
   var syncSelectedFieldByColumn = function syncSelectedFieldByColumn(field, column, tableItem) {
@@ -206,7 +243,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
   (0, _react.useEffect)(function () {
     var syncedValue = (_value || []).map(function (field) {
       var tableItem = data.find(function (item) {
-        return isSameSelectedTable(field, item.id || '', item.tableUuid || '');
+        return isSameSelectedTable(field, item);
       });
       var matchedColumn = getMatchedColumnByField(field, tableItem);
       return matchedColumn ? syncSelectedFieldByColumn(field, matchedColumn, tableItem) : field;
@@ -226,7 +263,12 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
       return;
     }
     var isHas = (value === null || value === void 0 ? void 0 : value.filter(function (v) {
-      return val && isSameSelectedTable(v, val.tableId, val.tableUuid) && (0, _helper2.isSameColumnByIdFirst)(v, val);
+      return val && isSameSelectedTable(v, {
+        id: val.tableId,
+        tableUuid: val.tableUuid,
+        alias: val.tableAlias,
+        datasourceId: val.datasourceId
+      }) && isSameSelectedField(v, val);
     }).length) > 0;
     var _value = value.slice();
     if (tableUuid != selectedTable) {
@@ -234,22 +276,26 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     }
     if (!isHas && val) {
       _value = _value.filter(function (v) {
-        var hasTableKey = getFieldTableKey(v.tableId, v.tableUuid);
+        var hasTableKey = getFieldTableKey(v.tableId, v.tableUuid, v.tableAlias, v.datasourceId);
         var isLegacySameField = !hasTableKey && (v.fieldId && v.fieldId === val.fieldId || v.fieldName && v.fieldName === val.fieldName);
         return !isLegacySameField;
       });
       _value.push(val);
     } else {
       _value = _value.filter(function (v) {
-        return !(val && isSameSelectedTable(v, val.tableId, val.tableUuid) && (0, _helper2.isSameColumnByIdFirst)(v, val));
+        return !(val && isSameSelectedTable(v, {
+          id: val.tableId,
+          tableUuid: val.tableUuid,
+          alias: val.tableAlias,
+          datasourceId: val.datasourceId
+        }) && isSameSelectedField(v, val));
       });
     }
     var curTableItem = data.find(function (v) {
       return v.tableUuid === tableUuid;
     });
-    var curTableId = (curTableItem === null || curTableItem === void 0 ? void 0 : curTableItem.id) || '';
     _value = _value.map(function (item2) {
-      if (!isSameSelectedTable(item2, curTableId, tableUuid)) return null;
+      if (!isSameSelectedTable(item2, curTableItem)) return null;
       var matchedColumn = getMatchedColumnByField(item2, curTableItem);
       return matchedColumn ? syncSelectedFieldByColumn(item2, matchedColumn, curTableItem) : null;
     }).filter(Boolean);
@@ -400,7 +446,6 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                   _v$database_type = v.database_type,
                   database_type = _v$database_type === void 0 ? '' : _v$database_type,
                   name = v.name;
-                var columnKey = getColumnKey(v, isSummarize, tableId || '', tableUuid);
                 var fieldAlias = isSummarize ? v.fieldAlias || name || '' : v.fieldAlias || '';
                 var fieldName = name || '';
                 var fieldId = v.id || '';
@@ -416,7 +461,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                   className: (0, _classnames["default"])("Sqb-List-section"),
                   children: (0, _jsxRuntime.jsx)("div", {
                     className: (0, _classnames["default"])("Sqb-List-item mx-2", {
-                      active: isActive(columnKey, tableId || '', tableUuid)
+                      active: isActive(v, tableItem)
                     }),
                     onClick: function onClick() {
                       changeValue(tableUuid, {

package/lib/cjs/components/metabase/helper.less

@@ -1,3 +1,39 @@
+.scroller::-webkit-scrollbar {
+  width: 4px;
+  height: 100%;
+  background: transparent;
+}
+
+.scroller::-webkit-scrollbar-thumb {
+  background: rgba(100, 100, 100, 0.4);
+  border-radius: 2px;
+
+  &:hover {
+    background: rgba(100, 100, 100, 0.7);
+  }
+}
+
+.scroller-x::-webkit-scrollbar {
+  width: 100%;
+  height: 8px;
+  background: transparent;
+}
+
+.scroller.scroller-x::-webkit-scrollbar {
+  width: 4px;
+  height: 8px;
+  background: transparent;
+}
+
+.scroller-x::-webkit-scrollbar-thumb {
+  background: rgba(100, 100, 100, 0.4);
+  border-radius: 2px;
+
+  &:hover {
+    background: rgba(100, 100, 100, 0.7);
+  }
+}
+
 .mx-4 {
   margin-left: 1rem;
   margin-right: 1rem;

package/lib/cjs/components/metabase/index.js

@@ -24,7 +24,7 @@ var _useProvider = require("../../hooks/use-provider");
 var _storage = _interopRequireDefault(require("../../utils/storage"));
 var _templateObject;
 var VisualBox = _styledComponents["default"].div.attrs({
-  className: 'visual-box'
+  className: 'visual-box scroller'
 })(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])([""])));
 var Metabase = function Metabase(props) {
   var _props$btnText = props.btnText,

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

@@ -37,7 +37,19 @@ var _dialog = require("../dialog");
 var _useProvider = require("../../hooks/use-provider");
 var _excluded = ["subToolbar", "notExistsColumns", "isExit", "toolbar"];
 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) === _types.AtomsTypeEnum.OPERATOR;
+};
+var menuJoinOperator = [{
+  key: 'AND',
+  label: 'AND'
+}, {
+  key: 'OR',
+  label: 'OR'
+}];
 var FlagLocation;
 (function (FlagLocation) {
   FlagLocation["TABLE_1"] = "table1";
@@ -49,7 +61,7 @@ var ExpressionsEnum;
   ExpressionsEnum["RIGHT"] = "rhs";
 })(ExpressionsEnum || (ExpressionsEnum = {}));
 var getText = function getText(v) {
-  return (0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])({}, _types.AtomsTypeEnum.JOIN_DEFAULT, 'joinData.default'), _types.AtomsTypeEnum.EXPRESSION, 'joinData.expression'), _types.AtomsTypeEnum.OPERATOR, 'customColumn.operator'), _types.AtomsTypeEnum.COLLECTION, 'customColumn.collection')[v];
+  return (0, _defineProperty2["default"])((0, _defineProperty2["default"])((0, _defineProperty2["default"])({}, _types.AtomsTypeEnum.JOIN_DEFAULT, 'joinData.default'), _types.AtomsTypeEnum.EXPRESSION, 'joinData.expression'), _types.AtomsTypeEnum.COLLECTION, 'customColumn.collection')[v];
 };
 var menuTypes = [{
   key: _types.AtomsTypeEnum.JOIN_DEFAULT,
@@ -57,19 +69,10 @@ var menuTypes = [{
 }, {
   key: _types.AtomsTypeEnum.EXPRESSION,
   label: (0, _locale.__)(getText(_types.AtomsTypeEnum.EXPRESSION))
-}, {
-  key: _types.AtomsTypeEnum.OPERATOR,
-  label: (0, _locale.__)(getText(_types.AtomsTypeEnum.OPERATOR))
 }, {
   key: _types.AtomsTypeEnum.COLLECTION,
   label: (0, _locale.__)(getText(_types.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,
@@ -130,6 +133,26 @@ var JoinData = function JoinData(props) {
       tableIsDel();
     }, 0);
   }, [meta]);
+  (0, _react.useEffect)(function () {
+    var expressions = meta.expressions || [];
+    var hasInvalidOperator = expressions.some(function (item) {
+      return item.type === _types.AtomsTypeEnum.OPERATOR && item.val !== normalizeJoinOperator(item.val);
+    });
+    if (!hasInvalidOperator) {
+      return;
+    }
+    var currentIndex = (0, _utils2.findIndex)(store.metaList[groupIndex].list, meta);
+    var newMeta = store.metaList[groupIndex].list.slice();
+    newMeta[currentIndex].expressions = expressions.map(function (item) {
+      if (item.type !== _types.AtomsTypeEnum.OPERATOR) {
+        return item;
+      }
+      return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, item), {}, {
+        val: normalizeJoinOperator(item.val)
+      });
+    });
+    store.setMeta(newMeta, groupIndex);
+  }, [meta.expressions]);
   var getTableColumns = function getTableColumns() {
     var data = [];
     var _getHelper2 = (0, _utils2.getHelper)(store.metaList[groupIndex].list, meta),
@@ -973,7 +996,8 @@ var JoinData = function JoinData(props) {
               var _store$preProps3;
               newMeta[index].subquery = newList;
               newMeta[index].table2 = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, newList[0].table), {}, {
-                alias: newMeta[index].table2.alias || (0, _helper.getAlias)(newList[0].table.name, newMeta, ((_store$preProps3 = store.preProps) === null || _store$preProps3 === void 0 ? void 0 : _store$preProps3.notExistsColumns) || [])
+                alias: newMeta[index].table2.alias || (0, _helper.getAlias)(newList[0].table.name, newMeta, ((_store$preProps3 = store.preProps) === null || _store$preProps3 === void 0 ? void 0 : _store$preProps3.notExistsColumns) || []),
+                tableUuid: newMeta[index].table2.tableUuid || (0, _helper.uuidv4)('table')
               });
               var items = (0, _utils2.getSubColumns)(newList);
               var subQueryTable = newMeta[index].table2;
@@ -1064,10 +1088,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 = (0, _utils2.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 = (0, _utils2.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) {
@@ -1133,19 +1173,15 @@ var JoinData = function JoinData(props) {
         }],
         type: type
       };
-      store.setMeta(newMeta, groupIndex);
-    }
-    if (type === _types.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: _types.AtomsTypeEnum.OPERATOR
+      }, item);
     } else {
       newMeta[index].expressions.push(item);
     }
@@ -1460,16 +1496,14 @@ var JoinData = function JoinData(props) {
                       className: 'mr-2 operator-icon',
                       icon: (0, _jsxRuntime.jsx)(_pandoraIcons.FfLine, {}),
                       onClick: function onClick() {
-                        var index = (0, _utils2.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 === _types.AtomsTypeEnum.OPERATOR) {
+                var operator = normalizeJoinOperator(v.val);
                 return (0, _jsxRuntime.jsxs)("div", {
                   className: (0, _classnames["default"])("Sqb-where block"),
                   children: [i == 0 && (0, _jsxRuntime.jsx)("span", {
@@ -1480,41 +1514,12 @@ var JoinData = function JoinData(props) {
                     onChange: function onChange(key) {
                       changeOperator(key, i);
                     },
-                    droplist: menuOperator,
+                    droplist: menuJoinOperator,
                     children: (0, _jsxRuntime.jsx)(_pandora.Button, {
+                      disabled: meta.readonly,
                       className: 'ml-2 mr-4 text-gray-500',
                       type: 'link',
-                      children: v.val
-                    })
-                  }), (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
-                    title: (0, _locale.__)('SqlQueryBuilder.add'),
-                    children: (0, _jsxRuntime.jsx)(_pandora.Dropdown, {
-                      trigger: ['click'],
-                      onChange: function onChange(key) {
-                        addExpression(key, i);
-                      },
-                      droplist: menuTypes,
-                      children: (0, _jsxRuntime.jsx)(_pandora.Button, {
-                        disabled: meta.readonly,
-                        primary: true,
-                        ghost: true,
-                        className: 'mr-2 operator-icon',
-                        icon: (0, _jsxRuntime.jsx)(_pandoraIcons.FfPlus, {})
-                      })
-                    })
-                  }), (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
-                    title: (0, _locale.__)('SqlQueryBuilder.del'),
-                    children: (0, _jsxRuntime.jsx)(_pandora.Button, {
-                      disabled: meta.readonly,
-                      danger: true,
-                      className: 'mr-2 operator-icon',
-                      icon: (0, _jsxRuntime.jsx)(_pandoraIcons.FfLine, {}),
-                      onClick: function onClick() {
-                        var index = (0, _utils2.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);
@@ -1560,10 +1565,7 @@ var JoinData = function JoinData(props) {
                       className: 'mr-2 operator-icon',
                       icon: (0, _jsxRuntime.jsx)(_pandoraIcons.FfLine, {}),
                       onClick: function onClick() {
-                        var index = (0, _utils2.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);
                       }
                     })
                   })]
@@ -1614,10 +1616,7 @@ var JoinData = function JoinData(props) {
                       className: 'mr-2 operator-icon',
                       icon: (0, _jsxRuntime.jsx)(_pandoraIcons.FfLine, {}),
                       onClick: function onClick() {
-                        var index = (0, _utils2.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/cjs/utils/helper.js

@@ -119,11 +119,7 @@ var isSameColumnByIdFirst = exports.isSameColumnByIdFirst = function isSameColum
   var leftTableUuid = normalizeId(left.tableUuid);
   var rightTableUuid = normalizeId(right.tableUuid);
   if (hasBoth(leftTableUuid, rightTableUuid) && leftTableUuid !== rightTableUuid) {
-    var leftTableName = normalizeId(left.tableName || left.table);
-    var rightTableName = normalizeId(right.tableName || right.table);
-    if (!hasBoth(leftTableName, rightTableName) || leftTableName !== rightTableName) {
-      return false;
-    }
+    return false;
   }
   var leftFieldId = normalizeId(left.fieldId || left.id);
   var rightFieldId = normalizeId(right.fieldId || right.id);