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

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/index.js

@@ -43,6 +43,18 @@ var SelectColumn = function SelectColumn(_ref) {
     _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
     filterVal = _useState6[0],
     setFilterVal = _useState6[1];
+  (0, _react.useEffect)(function () {
+    setOriginList(function (currentList) {
+      return data.map(function (item) {
+        var existingItem = currentList.find(function (current) {
+          return (0, _helper.isSameColumnByIdFirst)(current, item);
+        });
+        return (0, _objectSpread2["default"])((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, existingItem || {}), item), {}, {
+          fieldUuid: item.fieldUuid || (existingItem === null || existingItem === void 0 ? void 0 : existingItem.fieldUuid) || (0, _helper.uuidv4)('field')
+        });
+      });
+    });
+  }, [data]);
   (0, _react.useEffect)(function () {
     var newList = (0, _cloneDeep["default"])(originList.slice());
     setColumns(newList.filter(function (v) {
@@ -79,7 +91,7 @@ var SelectColumn = function SelectColumn(_ref) {
     var originalData = (0, _cloneDeep["default"])(originList);
     var mergedColumns = originalData.map(function (item) {
       var match = columns.find(function (col) {
-        return (0, _helper.isSameColumnByIdName)(col, item);
+        return (0, _helper.isSameColumnByIdFirst)(col, item);
       });
       return match ? (0, _cloneDeep["default"])(match) : item;
     });

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

@@ -12,6 +12,7 @@ require("./index.less");
 var _react = require("react");
 var _pandora = require("@gingkoo/pandora");
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
+var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _enum = require("../../../store/enum");
 var _helper = require("../../../store/helper");
@@ -109,12 +110,12 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
   var getSelectedFieldKey = function getSelectedFieldKey(field) {
     if (!field) return '';
     var tableKey = getFieldTableKey(field.tableId, field.tableUuid);
-    var fieldKey = "".concat(field.fieldId || '', "|").concat(field.fieldName || '');
+    var fieldKey = field.fieldId || field.fieldUuid || field.fieldName || '';
     return "".concat(tableKey, "|").concat(fieldKey);
   };
   var getColumnKey = function getColumnKey(column, isSummarizeColumn, tableId, tableUuid) {
     var tableKey = getFieldTableKey(tableId, tableUuid);
-    var fieldKey = "".concat(column.id || '', "|").concat(column.name || '');
+    var fieldKey = column.id || column.fieldId || column.fieldUuid || column.name || '';
     return "".concat(tableKey, "|").concat(fieldKey);
   };
   var isActive = function isActive(id_alias, tableId, tableUuid) {
@@ -163,6 +164,58 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
       return v.tableId === _helper.SummarizeAlias ? v.fieldAlias : v.fieldName;
     }).join(' || ');
   };
+  var getFieldAliasByColumn = function getFieldAliasByColumn(field, column) {
+    if (field.tableId === _helper.SummarizeAlias) {
+      return column.fieldAlias || column.name || '';
+    }
+    if (column.fieldAlias) return column.fieldAlias;
+    if (field.fieldAlias === field.fieldName || field.fieldAlias === column.name) return '';
+    return field.fieldAlias || '';
+  };
+  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);
+    }) || null;
+  };
+  var syncSelectedFieldByColumn = function syncSelectedFieldByColumn(field, column, tableItem) {
+    return (0, _objectSpread2["default"])((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, field), {}, {
+      tableName: (tableItem === null || tableItem === void 0 ? void 0 : tableItem.name) || field.tableName || '',
+      tableId: (tableItem === null || tableItem === void 0 ? void 0 : tableItem.id) || field.tableId || '',
+      tableNameZh: (tableItem === null || tableItem === void 0 ? void 0 : tableItem.name_zh) || field.tableNameZh || '',
+      tableAlias: (tableItem === null || tableItem === void 0 ? void 0 : tableItem.alias) || field.tableAlias || '',
+      tableUuid: (tableItem === null || tableItem === void 0 ? void 0 : tableItem.tableUuid) || field.tableUuid || '',
+      datasourceName: (tableItem === null || tableItem === void 0 ? void 0 : tableItem.datasourceName) || field.datasourceName || '',
+      datasourceId: (tableItem === null || tableItem === void 0 ? void 0 : tableItem.datasourceId) || field.datasourceId || ''
+    }, 'name' in field ? {
+      name: column.name || field.name || ''
+    } : {}), {}, {
+      fieldName: column.name || field.fieldName || '',
+      fieldId: column.id || column.fieldId || field.fieldId || '',
+      fieldNameZh: field.fieldNameZh || column.name_zh || '',
+      fieldAlias: getFieldAliasByColumn(field, column),
+      fieldUuid: column.fieldUuid || field.fieldUuid || ''
+    });
+  };
+  (0, _react.useEffect)(function () {
+    var syncedValue = (_value || []).map(function (field) {
+      var tableItem = data.find(function (item) {
+        return isSameSelectedTable(field, item.id || '', item.tableUuid || '');
+      });
+      var matchedColumn = getMatchedColumnByField(field, tableItem);
+      return matchedColumn ? syncSelectedFieldByColumn(field, matchedColumn, tableItem) : field;
+    });
+    setValue(syncedValue);
+    if (!(0, _isEqual["default"])(syncedValue, _value || [])) {
+      onSelect === null || onSelect === void 0 || onSelect(syncedValue, getQuotes(syncedValue));
+    }
+  }, [data, _value]);
   var changeValue = function changeValue(tableUuid, val) {
     if (!multiple) {
       var _data = val ? [val] : [];
@@ -173,7 +226,7 @@ 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.isSameColumnByIdName)(v, val);
+      return val && isSameSelectedTable(v, val.tableId, val.tableUuid) && (0, _helper2.isSameColumnByIdFirst)(v, val);
     }).length) > 0;
     var _value = value.slice();
     if (tableUuid != selectedTable) {
@@ -188,26 +241,18 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
       _value.push(val);
     } else {
       _value = _value.filter(function (v) {
-        return !(val && isSameSelectedTable(v, val.tableId, val.tableUuid) && (0, _helper2.isSameColumnByIdName)(v, val));
+        return !(val && isSameSelectedTable(v, val.tableId, val.tableUuid) && (0, _helper2.isSameColumnByIdFirst)(v, val));
       });
     }
     var curTableItem = data.find(function (v) {
       return v.tableUuid === tableUuid;
     });
     var curTableId = (curTableItem === null || curTableItem === void 0 ? void 0 : curTableItem.id) || '';
-    var curTableColumn = (curTableItem === null || curTableItem === void 0 ? void 0 : curTableItem.columns) || [];
-    _value = _value.filter(function (item2) {
-      return isSameSelectedTable(item2, curTableId, tableUuid) && curTableColumn.some(function (item1) {
-        if (item2.tableId === _helper.SummarizeAlias) {
-          return (0, _helper2.isSameColumnByIdName)(item2, item1);
-        }
-        return (0, _helper2.isSameColumnByIdFirst)((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, item1), {}, {
-          tableId: curTableId,
-          tableUuid: tableUuid,
-          datasourceId: (curTableItem === null || curTableItem === void 0 ? void 0 : curTableItem.datasourceId) || ''
-        }), item2);
-      });
-    });
+    _value = _value.map(function (item2) {
+      if (!isSameSelectedTable(item2, curTableId, tableUuid)) return null;
+      var matchedColumn = getMatchedColumnByField(item2, curTableItem);
+      return matchedColumn ? syncSelectedFieldByColumn(item2, matchedColumn, curTableItem) : null;
+    }).filter(Boolean);
     setValue(_value);
     setSelectedTable(tableUuid);
     setCurTable(tableUuid);

package/lib/cjs/components/modules/components/header.js

@@ -15,6 +15,7 @@ var _locale = require("../../../locale");
 var _useProvider = require("../../../hooks/use-provider");
 var _utils = require("../../../utils");
 var _diffViewer = _interopRequireDefault(require("../../dialog/diff-viewer"));
+var _helperDom = require("../../../utils/helper-dom");
 var Header = function Header(props) {
   var meta = props.meta,
     groupIndex = props.groupIndex,
@@ -35,6 +36,7 @@ var Header = function Header(props) {
             oldCode = _yield$store$getModul.oldCode;
             newCode = _yield$store$getModul.newCode;
             o = _pandora.Modal2.openModal({
+              zIndex: (0, _helperDom.getTopLayerZIndex)() + 1,
               title: '差异对比',
               transparentMask: true,
               content: (0, _jsxRuntime.jsx)(_diffViewer["default"], {

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

@@ -50,9 +50,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 (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, 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) || _enum.SQL_COLUMN_TYPE.FLOAT,
             sql: v.sql,
             special_type: '',
@@ -63,9 +64,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 (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, 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) || _enum.SQL_COLUMN_TYPE.FLOAT,
             sql: v.sql,
             special_type: '',

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

@@ -17,7 +17,6 @@ var _classnames = _interopRequireDefault(require("classnames"));
 var _pandora = require("@gingkoo/pandora");
 var _pandoraIcons = require("@gingkoo/pandora-icons");
 var _index = _interopRequireDefault(require("../../index"));
-var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 var _helper = require("../../utils/helper");
 var _helperDom = require("../../utils/helper-dom");
@@ -38,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";
@@ -50,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,
@@ -58,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,
@@ -131,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),
@@ -957,7 +979,6 @@ var JoinData = function JoinData(props) {
     var childModalZIndex = (0, _helperDom.getTopLayerZIndex)() + 1;
     var newMeta = (0, _cloneDeep["default"])(store.metaList[groupIndex].list);
     var index = (0, _utils2.findIndex)(store.metaList[groupIndex].list, meta);
-    var oldList = (0, _cloneDeep["default"])(newMeta[index].subquery);
     var _toolbar = subToolbar || toolbar;
     var o = _pandora.Modal2.openModal({
       zIndex: childModalZIndex,
@@ -973,21 +994,22 @@ var JoinData = function JoinData(props) {
           onOk: function onOk(newList) {
             try {
               var _store$preProps3;
-              if ((0, _isEqual["default"])(newList, oldList)) {
-                o.close();
-                return;
-              }
               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) || [])
               });
               var items = (0, _utils2.getSubColumns)(newList);
+              var subQueryTable = newMeta[index].table2;
               var newColumns = items.flatMap(function (item) {
                 return item.columns.map(function (column) {
+                  var columnMeta = column;
                   return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, 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) {
@@ -995,15 +1017,10 @@ var JoinData = function JoinData(props) {
                   select: false
                 });
               });
-              newMeta[index].columns = newColumns.map(function (newCol) {
-                var existingCol = newMeta[index].columns.find(function (oldCol) {
-                  return (0, _helper.isSameColumnByIdFirst)(oldCol, newCol);
-                });
-                var _column = existingCol ? existingCol : newCol;
-                _column.select = store.isSelectFields || _column.select;
-                return _column;
-              });
+              var oldColumns = newMeta[index].columns;
+              newMeta[index].columns = (0, _utils2.mergeSubQueryColumns)(newColumns, oldColumns, store.isSelectFields);
               initExpressions(newMeta);
+              newMeta = (0, _utils2.syncSubQueryFieldReferences)(newMeta, newMeta[index].table2, newMeta[index].columns, oldColumns);
               store.setMeta(newMeta, groupIndex, {
                 obj: newList,
                 type: _types.ChangeType.subQuery
@@ -1070,10 +1087,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) {
@@ -1139,19 +1172,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);
     }
@@ -1466,16 +1495,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", {
@@ -1486,41 +1513,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);
@@ -1566,10 +1564,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);
                       }
                     })
                   })]
@@ -1620,10 +1615,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/components/modules/table-data.js

@@ -23,7 +23,6 @@ var _helperDom = require("../../utils/helper-dom");
 var _utils = require("../../utils");
 var _pandoraIcons = require("@gingkoo/pandora-icons");
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
-var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _itemName = _interopRequireDefault(require("./components/item-name"));
 var _dialog = require("../dialog");
 var _Wrapper = _interopRequireDefault(require("./components/Wrapper"));
@@ -195,7 +194,6 @@ var TableData = function TableData(props) {
     var childModalZIndex = (0, _helperDom.getTopLayerZIndex)() + 1;
     var newMetaList = store.metaList[groupIndex].list.slice()[0];
     var newMeta = store.metaList[groupIndex].list.slice();
-    var oldList = (0, _cloneDeep["default"])(newMetaList.subquery);
     var _toolbar = subToolbar || toolbar;
     var o = _pandora.Modal2.openModal({
       zIndex: childModalZIndex,
@@ -210,22 +208,23 @@ var TableData = function TableData(props) {
           value: (0, _cloneDeep["default"])(val),
           onOk: function onOk(newList) {
             try {
-              if ((0, _isEqual["default"])(newList, oldList)) {
-                o.close();
-                return;
-              }
               newMetaList.subquery = newList;
               newMetaList.table = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, newList[0].table), {}, {
                 alias: newMetaList.table.alias || (0, _helper.getAlias)(newList[0].table.name, newMeta),
                 tableUuid: newMetaList.table.tableUuid || (0, _helper.uuidv4)('table')
               });
               var items = (0, _utils.getSubColumns)(newList);
+              var subQueryTable = newMetaList.table;
               var newColumns = items.flatMap(function (item) {
                 return item.columns.map(function (column) {
+                  var columnMeta = column;
                   return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, 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) {
@@ -233,16 +232,11 @@ var TableData = function TableData(props) {
                   select: false
                 });
               });
-              newMetaList.columns = newColumns.map(function (newCol) {
-                var existingCol = newMetaList.columns.find(function (oldCol) {
-                  return (0, _helper.isSameColumnByIdFirst)(oldCol, newCol);
-                });
-                var _column = existingCol ? existingCol : newCol;
-                _column.select = store.isSelectFields || _column.select;
-                return _column;
-              });
+              var oldColumns = newMetaList.columns;
+              newMetaList.columns = (0, _utils.mergeSubQueryColumns)(newColumns, oldColumns, store.isSelectFields);
               var newMetas = store.metaList[groupIndex].list.slice();
               newMetas[0] = newMetaList;
+              newMetas = (0, _utils.syncSubQueryFieldReferences)(newMetas, newMetaList.table, newMetaList.columns, oldColumns);
               store.setMeta(newMetas, groupIndex, {
                 obj: newList,
                 type: _types.ChangeType.subQuery

package/lib/cjs/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[];