@gingkoo/pandora-metabase 1.0.104 → 1.0.106

package/lib/es/components/dialog/expression/index.js

@@ -8,7 +8,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import './index.less';
 import React, { useEffect, useMemo, useState } from 'react';
 import { Repeat, Function } from '@gingkoo/pandora-icons';
-import { Button, Tooltip, Input, Select, InputNumber, Dropdown, DatePicker } from '@gingkoo/pandora';
+import { Button, Tooltip, Input, Select, InputNumber, Dropdown } from '@gingkoo/pandora';
 import cx from 'classnames';
 import { ChevronODown } from '@gingkoo/pandora-icons';
 import moment from 'dayjs';
@@ -23,7 +23,7 @@ import { useStore } from '../../../hooks/use-provider';
 import cloneDeep from 'lodash/cloneDeep';
 import { getConstantLabel } from '../formula-list/utils';
 import ItemName from '../../modules/components/item-name';
-var RangePicker = DatePicker.RangePicker;
+import { DateFormatPicker, DateRangeFormatPicker } from './date-format-picker';
 var NUMBER_LIST = ['等于', '不等于', '大于', '小于', '介于之间', '大于或等于', '小于或等于', '为空', '不为空', '以...开始', '以...结束', '不以...开始', '不以...结束', 'In', 'Not In', '正则匹配'];
 var STRING_LIST = ['等于', '不等于', '包含', '不包含', '为空', '不为空', '以...开始', '以...结束', '不以...开始', '不以...结束', 'In', 'Not In', '正则匹配'];
 var DATE_LIST = [
@@ -386,23 +386,21 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
         });
       }
       if (type === SQL_GROUP_TYPE.DATE) {
-        return _jsx("div", {
-          children: _jsx(RangePicker, {
-            showTime: {
-              format: 'HH:mm'
-            },
-            format: 'YYYY-MM-DD HH:mm',
-            className: 'w_300',
-            // @ts-ignore
-            value: firstVal ? [moment(firstVal !== null && firstVal !== void 0 ? firstVal : undefined), moment(secondVal !== null && secondVal !== void 0 ? secondVal : undefined)] : [],
-            onChange: function onChange(val) {
-              // @ts-ignore
-              val && setRhsVal([{
+        var _rhsVal$, _rhsVal$2;
+        var dateVal = ((_rhsVal$ = rhsVal[0]) === null || _rhsVal$ === void 0 ? void 0 : _rhsVal$.type) === AtomsTypeEnum.INPUT_STRING_LIST ? rhsVal[0].val : undefined;
+        var dateFormat = ((_rhsVal$2 = rhsVal[0]) === null || _rhsVal$2 === void 0 ? void 0 : _rhsVal$2.type) === AtomsTypeEnum.INPUT_STRING_LIST ? rhsVal[0].format : undefined;
+        return _jsx(DateRangeFormatPicker, {
+          value: dateVal,
+          format: dateFormat,
+          onChange: function onChange(val, format) {
+            if (val) {
+              setRhsVal([{
                 type: AtomsTypeEnum.INPUT_STRING_LIST,
-                val: [moment(val[0]).format('YYYY-MM-DD HH:mm'), moment(val[1]).format('YYYY-MM-DD HH:mm')]
+                val: val,
+                format: format
               }]);
             }
-          })
+          }
         });
       }
     } else if (conditionText === '当前') {
@@ -487,58 +485,50 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
         })]
       });
     } else if (~['早于', '晚于', '在'].indexOf(conditionText)) {
-      return _jsx("div", {
-        children: _jsx(DatePicker, {
-          showTime: {
-            format: 'HH:mm'
-          },
-          format: 'YYYY-MM-DD HH:mm',
-          className: 'w_300',
-          value: firstVal ? moment(firstVal) : '',
-          onChange: function onChange(val) {
-            if (val) {
-              setRhsVal([{
-                type: AtomsTypeEnum.INPUT_STRING,
-                val: moment(val).format('YYYY-MM-DD HH:mm')
-              }
-              // {
-              //   type: AtomsTypeEnum.INPUT_STRING,
-              //   val: moment(val).format('YYYY-MM-DD HH:mm'),
-              // },
-              ]);
-            } else {
-              setRhsVal([{
-                val: '',
-                type: AtomsTypeEnum.INPUT_STRING
-              }]);
-              // setVal([]);
-            }
+      var _rhsVal$3, _rhsVal$4;
+      var _dateVal = ((_rhsVal$3 = rhsVal[0]) === null || _rhsVal$3 === void 0 ? void 0 : _rhsVal$3.type) === AtomsTypeEnum.INPUT_STRING ? rhsVal[0].val : undefined;
+      var _dateFormat = ((_rhsVal$4 = rhsVal[0]) === null || _rhsVal$4 === void 0 ? void 0 : _rhsVal$4.type) === AtomsTypeEnum.INPUT_STRING ? rhsVal[0].format : undefined;
+      return _jsx(DateFormatPicker, {
+        value: _dateVal,
+        format: _dateFormat,
+        onChange: function onChange(val, format) {
+          if (val) {
+            setRhsVal([{
+              type: AtomsTypeEnum.INPUT_STRING,
+              val: val,
+              format: format
+            }]);
+          } else {
+            setRhsVal([{
+              val: '',
+              type: AtomsTypeEnum.INPUT_STRING,
+              format: format
+            }]);
           }
-        })
+        }
       });
     } else if (~['等于'].indexOf(conditionText) && type === SQL_GROUP_TYPE.DATE) {
-      return _jsx("div", {
-        children: _jsx(DatePicker, {
-          showTime: {
-            format: 'HH:mm'
-          },
-          format: 'YYYY-MM-DD HH:mm',
-          className: 'w_300',
-          value: firstVal ? moment(firstVal) : '',
-          onChange: function onChange(val) {
-            if (val) {
-              setRhsVal([{
-                type: AtomsTypeEnum.INPUT_STRING,
-                val: moment(val).format('YYYY-MM-DD HH:mm')
-              }]);
-            } else {
-              setRhsVal([{
-                val: '',
-                type: AtomsTypeEnum.INPUT_STRING
-              }]);
-            }
+      var _rhsVal$5, _rhsVal$6;
+      var _dateVal2 = ((_rhsVal$5 = rhsVal[0]) === null || _rhsVal$5 === void 0 ? void 0 : _rhsVal$5.type) === AtomsTypeEnum.INPUT_STRING ? rhsVal[0].val : undefined;
+      var _dateFormat2 = ((_rhsVal$6 = rhsVal[0]) === null || _rhsVal$6 === void 0 ? void 0 : _rhsVal$6.type) === AtomsTypeEnum.INPUT_STRING ? rhsVal[0].format : undefined;
+      return _jsx(DateFormatPicker, {
+        value: _dateVal2,
+        format: _dateFormat2,
+        onChange: function onChange(val, format) {
+          if (val) {
+            setRhsVal([{
+              type: AtomsTypeEnum.INPUT_STRING,
+              val: val,
+              format: format
+            }]);
+          } else {
+            setRhsVal([{
+              val: '',
+              type: AtomsTypeEnum.INPUT_STRING,
+              format: format
+            }]);
           }
-        })
+        }
       });
     } else if (~['In', 'Not In'].indexOf(conditionText)) {
       var options = firstVal ? firstVal.split(',') : [];
@@ -921,7 +911,8 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
     } else if (~['介于之间'].indexOf(_condition)) {
       setRhsVal([{
         val: ['', ''],
-        type: AtomsTypeEnum.INPUT_STRING_LIST
+        type: AtomsTypeEnum.INPUT_STRING_LIST,
+        format: 'YYYY-MM-DD HH:mm'
       }]);
     } else if (~['当前'].indexOf(_condition)) {
       setRhsVal([{
@@ -931,7 +922,8 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
     } else if (~['早于', '晚于', '在'].indexOf(_condition)) {
       setRhsVal([{
         val: moment().format('YYYY-MM-DD HH:mm'),
-        type: AtomsTypeEnum.INPUT_STRING
+        type: AtomsTypeEnum.INPUT_STRING,
+        format: 'YYYY-MM-DD HH:mm'
       }]);
     } else {
       setRhsVal([{

package/lib/es/components/modules/components/meta-icon.js

@@ -5,7 +5,7 @@ import React, { useEffect } from 'react';
 import cx from 'classnames';
 import { __ } from '../../../locale';
 import { TypeEnum } from '../../../store/enum';
-import { Tooltip, Button } from '@gingkoo/pandora';
+import { Tooltip, Button, Toast } from '@gingkoo/pandora';
 import { FfPlus } from '@gingkoo/pandora-icons';
 import storage from '../../../utils/storage';
 import { getHelper, isCanPaste } from '../../../utils';
@@ -345,11 +345,16 @@ var NextDom = function NextDom(props) {
   var handlePaste = function handlePaste() {
     var _store$metaList3;
     var index = (_store$metaList3 = store.metaList) === null || _store$metaList3 === void 0 || (_store$metaList3 = _store$metaList3[groupIndex]) === null || _store$metaList3 === void 0 || (_store$metaList3 = _store$metaList3.list) === null || _store$metaList3 === void 0 ? void 0 : _store$metaList3.indexOf(meta);
-    store.addMeta('', index + 1, groupIndex, store.metabaseCopyModule);
-    // 粘贴后重置
-    store.setMetabaseCopyModule([]);
-    store.setIsMetabaseCopy(false);
-    storage._metabaseCopyModule = [];
+    var success = store.addMeta('', index + 1, groupIndex, store.metabaseCopyModule, function (conflictingAlias) {
+      // 冲突提示
+      Toast.warning("".concat(conflictingAlias, " \u7684 table1 \u4E0E\u7C98\u8D34\u4F4D\u7F6E\u76F8\u90BB\u9879\u51B2\u7A81\uFF0C\u8BF7\u8C03\u6574\u540E\u518D\u7C98\u8D34"));
+    });
+    // 仅在成功时重置
+    if (success) {
+      store.setMetabaseCopyModule([]);
+      store.setIsMetabaseCopy(false);
+      storage._metabaseCopyModule = [];
+    }
   };
   return _jsxs(_Fragment, {
     children: [store.metabaseCopyModule && store.metabaseCopyModule.length > 0 && isShowAdd && _jsx(Tooltip, {

package/lib/es/hooks/use-state.js

@@ -1,3 +1,4 @@
+import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
@@ -6,7 +7,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["alias", "datasourceName", "datasourceId", "column"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useEffect, useState, useRef, useMemo } from 'react';
-import { uuidv4 } from '../utils/helper';
+import { uuidv4, getAlias } from '../utils/helper';
 import { TypeEnum, JoinEnum, UnionEnum } from '../store/enum';
 import { splitByUnion } from '../utils';
 import storage from '../utils/storage';
@@ -186,14 +187,18 @@ var useStore = function useStore() {
     _useState66 = _slicedToArray(_useState65, 2),
     isMetabaseCopy = _useState66[0],
     setIsMetabaseCopy = _useState66[1]; // 是否开启勾选组复制
-  var _useState67 = useState([]),
+  var _useState67 = useState(false),
     _useState68 = _slicedToArray(_useState67, 2),
-    existsError = _useState68[0],
-    setExistsError = _useState68[1]; // exists 的错误字段
-  var _useState69 = useState(storage._metabaseCopyModule || []),
+    joinAliasConflictCheck = _useState68[0],
+    setJoinAliasConflictCheck = _useState68[1]; // 是否开启关联别名冲突检测
+  var _useState69 = useState([]),
     _useState70 = _slicedToArray(_useState69, 2),
-    metabaseCopyModule = _useState70[0],
-    setMetabaseCopyModule = _useState70[1]; // 复制的内容
+    existsError = _useState70[0],
+    setExistsError = _useState70[1]; // exists 的错误字段
+  var _useState71 = useState(storage._metabaseCopyModule || []),
+    _useState72 = _slicedToArray(_useState71, 2),
+    metabaseCopyModule = _useState72[0],
+    setMetabaseCopyModule = _useState72[1]; // 复制的内容
   var setFormulaTemplates = function setFormulaTemplates(data) {
     var newData = data === null || data === void 0 ? void 0 : data.map(function (v) {
       var children = v.children.map(function (vv) {
@@ -605,10 +610,102 @@ var useStore = function useStore() {
       _setMeta(defaultMeta);
     }
   };
-  var getNewMeta = function getNewMeta(_type, index, groupIndex, obj) {
+  // 重新生成 UUID 的辅助函数
+  // 只修改 table2 中的 alias、tableUuid，expressions 中相等的 tableUuid 和 tableAlias 同步修改
+  var _regenerateUuid = function regenerateUuid(obj) {
+    var uuidMap = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    var aliasMap = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+    var tableAliasMap = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+    var existingAliases = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : [];
+    var originalTable2Uuid = arguments.length > 5 ? arguments[5] : undefined;
+    var
+    // 原始 table2 的 tableUuid，用于同步 expressions
+    newTable2Uuid = arguments.length > 6 ? arguments[6] : undefined;
+    var
+    // 新的 table2 的 tableUuid
+    originalTable2Alias = arguments.length > 7 ? arguments[7] : undefined;
+    if (!obj) return obj;
+    if (Array.isArray(obj)) {
+      return obj.map(function (item) {
+        return _regenerateUuid(item, uuidMap, aliasMap, tableAliasMap, existingAliases, originalTable2Uuid, newTable2Uuid, originalTable2Alias);
+      });
+    }
+    if (_typeof(obj) === 'object') {
+      var newObj = _objectSpread({}, obj);
+      // 处理 joinData 类型：只修改 table2 的 alias 和 tableUuid
+      if (newObj.type === 'joinData') {
+        if (newObj.table2) {
+          var table2 = _objectSpread({}, newObj.table2);
+          var originalAlias = table2.alias;
+          // 修改 table2.alias
+          if (table2.alias) {
+            if (!aliasMap[table2.alias]) {
+              table2.alias = getAlias(table2.alias, [], [], [].concat(_toConsumableArray(Object.values(aliasMap)), _toConsumableArray(existingAliases)));
+              aliasMap[originalAlias] = table2.alias; // 用原始 alias 作为 key
+            } else {
+              table2.alias = aliasMap[table2.alias];
+            }
+          }
+          // 修改 table2.tableUuid
+          if (table2.tableUuid && !uuidMap[table2.tableUuid]) {
+            var originalUuid = table2.tableUuid;
+            var newUuid = uuidv4('table');
+            uuidMap[originalUuid] = newUuid;
+            table2.tableUuid = newUuid;
+            // 记录原始和新 tableUuid，用于 expressions 同步
+            originalTable2Uuid = originalUuid;
+            newTable2Uuid = newUuid;
+          } else if (uuidMap[table2.tableUuid]) {
+            table2.tableUuid = uuidMap[table2.tableUuid];
+            newTable2Uuid = table2.tableUuid;
+          }
+          // 记录原始 alias，用于 expressions 同步 tableAlias
+          if (originalAlias) {
+            originalTable2Alias = originalAlias;
+          }
+          newObj.table2 = table2;
+        }
+      }
+      // 处理 expressions 中 tableUuid 相等的情况
+      if (originalTable2Uuid && newTable2Uuid && newObj.tableUuid === originalTable2Uuid) {
+        newObj.tableUuid = newTable2Uuid;
+        // 如果 originalTable2Alias 存在，tableAlias 要跟修改后的 table2.alias 保持一致
+        if (originalTable2Alias && aliasMap[originalTable2Alias]) {
+          newObj.tableAlias = aliasMap[originalTable2Alias];
+        }
+      }
+      // 递归处理嵌套对象
+      if (newObj.filter) newObj.filter = _regenerateUuid(newObj.filter, uuidMap, aliasMap, tableAliasMap, existingAliases, originalTable2Uuid, newTable2Uuid, originalTable2Alias);
+      if (newObj.lhs) newObj.lhs = _regenerateUuid(newObj.lhs, uuidMap, aliasMap, tableAliasMap, existingAliases, originalTable2Uuid, newTable2Uuid, originalTable2Alias);
+      if (newObj.rhs) newObj.rhs = _regenerateUuid(newObj.rhs, uuidMap, aliasMap, tableAliasMap, existingAliases, originalTable2Uuid, newTable2Uuid, originalTable2Alias);
+      if (newObj.expressions) newObj.expressions = _regenerateUuid(newObj.expressions, uuidMap, aliasMap, tableAliasMap, existingAliases, originalTable2Uuid, newTable2Uuid, originalTable2Alias);
+      if (newObj.customColumn) newObj.customColumn = _regenerateUuid(newObj.customColumn, uuidMap, aliasMap, tableAliasMap, existingAliases, originalTable2Uuid, newTable2Uuid, originalTable2Alias);
+      if (newObj.group) newObj.group = _regenerateUuid(newObj.group, uuidMap, aliasMap, tableAliasMap, existingAliases, originalTable2Uuid, newTable2Uuid, originalTable2Alias);
+      if (newObj.by) newObj.by = _regenerateUuid(newObj.by, uuidMap, aliasMap, tableAliasMap, existingAliases, originalTable2Uuid, newTable2Uuid, originalTable2Alias);
+      if (newObj.columns) newObj.columns = _regenerateUuid(newObj.columns, uuidMap, aliasMap, tableAliasMap, existingAliases, originalTable2Uuid, newTable2Uuid, originalTable2Alias);
+      if (newObj.subquery) newObj.subquery = _regenerateUuid(newObj.subquery, uuidMap, aliasMap, tableAliasMap, existingAliases, originalTable2Uuid, newTable2Uuid, originalTable2Alias);
+      if (newObj.list) newObj.list = _regenerateUuid(newObj.list, uuidMap, aliasMap, tableAliasMap, existingAliases, originalTable2Uuid, newTable2Uuid, originalTable2Alias);
+      if (newObj.table) newObj.table = _regenerateUuid(newObj.table, uuidMap, aliasMap, tableAliasMap, existingAliases, originalTable2Uuid, newTable2Uuid, originalTable2Alias);
+      if (newObj.args) newObj.args = _regenerateUuid(newObj.args, uuidMap, aliasMap, tableAliasMap, existingAliases, originalTable2Uuid, newTable2Uuid, originalTable2Alias);
+      return newObj;
+    }
+    return obj;
+  };
+  var getNewMeta = function getNewMeta(_type, index, groupIndex, obj, uuidMap, aliasMap, tableAliasMap, existingAliases) {
     var type = _type || obj.type;
     var item = false;
     var newMeta = metaList[groupIndex].list.slice();
+    // 如果没有传入 existingAliases，从 metaList 中提取
+    if (!existingAliases && newMeta) {
+      existingAliases = newMeta === null || newMeta === void 0 ? void 0 : newMeta.map(function (v) {
+        var _v$table3, _v$table4;
+        if (v.type === TypeEnum.data) return (_v$table3 = v.table) === null || _v$table3 === void 0 ? void 0 : _v$table3.alias;
+        if (v.type === TypeEnum.joinData) return (_v$table4 = v.table2) === null || _v$table4 === void 0 ? void 0 : _v$table4.alias;
+        return undefined;
+      }).filter(function (alias) {
+        return Boolean(alias);
+      });
+    }
     var mainTable = newMeta[0];
     metaKey += 1;
     if (type === TypeEnum.joinData) {
@@ -718,28 +815,105 @@ var useStore = function useStore() {
       return false;
     }
     if (obj) {
-      item = _objectSpread(_objectSpread({}, obj), {}, {
-        metaKey: metaKey
-      });
+      // 只对 joinData 类型调用 regenerateUuid
+      if (obj.type === TypeEnum.joinData) {
+        item = _objectSpread(_objectSpread({}, _regenerateUuid(obj, uuidMap || {}, aliasMap || {}, tableAliasMap || {}, existingAliases || [])), {}, {
+          metaKey: metaKey
+        });
+      } else {
+        item = _objectSpread(_objectSpread({}, obj), {}, {
+          metaKey: metaKey
+        });
+      }
     }
     return item;
   };
-  var addMeta = function addMeta(type, index, groupIndex, obj) {
+  // 检查粘贴位置上下级的 table1 是否与被粘贴项的 table1 有相同的 alias
+  var checkTable1Conflict = function checkTable1Conflict(objList, index, groupIndex) {
+    var _metaList$groupIndex, _objList$;
+    if (!objList || objList.length === 0) return {
+      hasConflict: false
+    };
+    var groupList = ((_metaList$groupIndex = metaList[groupIndex]) === null || _metaList$groupIndex === void 0 ? void 0 : _metaList$groupIndex.list) || [];
+    // 获取被粘贴项的 table1 alias
+    var pastedTable1Alias = (_objList$ = objList[0]) === null || _objList$ === void 0 || (_objList$ = _objList$.table1) === null || _objList$ === void 0 ? void 0 : _objList$.alias;
+    if (!pastedTable1Alias) return {
+      hasConflict: false
+    };
+    // 检查上下级的 table1 和 table2 alias
+    var checkItem = function checkItem(item) {
+      if (!item) return undefined;
+      if (item.type === TypeEnum.joinData) {
+        var _item$table, _item$table2;
+        if (((_item$table = item.table1) === null || _item$table === void 0 ? void 0 : _item$table.alias) === pastedTable1Alias) return item.table1.alias;
+        if (((_item$table2 = item.table2) === null || _item$table2 === void 0 ? void 0 : _item$table2.alias) === pastedTable1Alias) return item.table2.alias;
+      }
+      if (item.type === TypeEnum.data) {
+        var _item$table3;
+        if (((_item$table3 = item.table) === null || _item$table3 === void 0 ? void 0 : _item$table3.alias) === pastedTable1Alias) return item.table.alias;
+      }
+      return undefined;
+    };
+    // 检查上邻（index - 1 位置）
+    var prevItem = groupList[index - 1];
+    var prevConflict = checkItem(prevItem);
+    if (prevConflict) {
+      return {
+        hasConflict: true,
+        conflictingAlias: pastedTable1Alias
+      };
+    }
+    // 检查下邻（index 位置，即被插入位置的原元素）
+    var nextItem = groupList[index];
+    var nextConflict = checkItem(nextItem);
+    if (nextConflict) {
+      return {
+        hasConflict: true,
+        conflictingAlias: pastedTable1Alias
+      };
+    }
+    return {
+      hasConflict: false
+    };
+  };
+  var addMeta = function addMeta(type, index, groupIndex, obj, onConflict) {
+    // 检查 table1 冲突（仅在启用配置时检测）
+    if (joinAliasConflictCheck && obj && obj.length > 0) {
+      var conflict = checkTable1Conflict(obj, index, groupIndex);
+      if (conflict.hasConflict && conflict.conflictingAlias && onConflict) {
+        onConflict(conflict.conflictingAlias);
+        return false;
+      }
+    }
     var newMeta = metaList[groupIndex].list.slice();
     var items = [];
+    // 创建共享的映射对象，确保循环调用时保持一致
+    var sharedUuidMap = {};
+    var sharedAliasMap = {};
+    var sharedTableAliasMap = {};
+    // 提取当前组中已存在的 alias
+    var existingAliases = newMeta === null || newMeta === void 0 ? void 0 : newMeta.map(function (v) {
+      var _v$table5, _v$table6;
+      if (v.type === TypeEnum.data) return (_v$table5 = v.table) === null || _v$table5 === void 0 ? void 0 : _v$table5.alias;
+      if (v.type === TypeEnum.joinData) return (_v$table6 = v.table2) === null || _v$table6 === void 0 ? void 0 : _v$table6.alias;
+      return undefined;
+    }).filter(function (alias) {
+      return Boolean(alias);
+    });
     if (obj) {
       items = obj.map(function (v) {
-        return getNewMeta(type, index, groupIndex, v);
+        return getNewMeta(type, index, groupIndex, v, sharedUuidMap, sharedAliasMap, sharedTableAliasMap, existingAliases);
       });
     } else {
-      items = [getNewMeta(type, index, groupIndex, obj)];
+      items = [getNewMeta(type, index, groupIndex, obj, sharedUuidMap, sharedAliasMap, sharedTableAliasMap, existingAliases)];
     }
     if (items[0] === false) {
-      return;
+      return false;
     }
     // @ts-ignore
     newMeta.splice.apply(newMeta, [index, 0].concat(_toConsumableArray(items)));
     setMeta(newMeta, groupIndex);
+    return true;
   };
   var delMeta = function delMeta(meta, groupIndex) {
     if (meta.type === 'group') {
@@ -908,7 +1082,9 @@ var useStore = function useStore() {
     operatorList: operatorList,
     setOperatorList: setOperatorList,
     setExistsErrorFn: setExistsErrorFn,
-    existsError: existsError
+    existsError: existsError,
+    joinAliasConflictCheck: joinAliasConflictCheck,
+    setJoinAliasConflictCheck: setJoinAliasConflictCheck
   };
 };
 export default useStore;

package/lib/es/index.js

@@ -71,6 +71,8 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     moduleDiff = _props$moduleDiff === void 0 ? false : _props$moduleDiff,
     _props$moduleCopy = props.moduleCopy,
     moduleCopy = _props$moduleCopy === void 0 ? false : _props$moduleCopy,
+    _props$joinAliasConfl = props.joinAliasConflictCheck,
+    joinAliasConflictCheck = _props$joinAliasConfl === void 0 ? false : _props$joinAliasConfl,
     _props$operatorList = props.operatorList,
     operatorList = _props$operatorList === void 0 ? EMPTY_ARRAY : _props$operatorList;
   var store = useData();
@@ -115,8 +117,9 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     store.setModuleDiff(moduleDiff);
     store.setIsSubquery(isSubquery);
     store.setModuleCopy(moduleCopy);
+    store.setJoinAliasConflictCheck(joinAliasConflictCheck);
     store.setOperatorList(operatorList || []);
-  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit, tableEnableAlias, fieldEnableAlias, groupByEnableAlias, isSelectFields, tableFlat, copyType, metabaseCopy, moduleDiff, isSubquery, moduleCopy, operatorList]);
+  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit, tableEnableAlias, fieldEnableAlias, groupByEnableAlias, isSelectFields, tableFlat, copyType, metabaseCopy, moduleDiff, isSubquery, moduleCopy, joinAliasConflictCheck, operatorList]);
   React.useImperativeHandle(ref, function () {
     return {
       // setDatasource: (list) => {

package/lib/es/store/types.d.ts

@@ -107,10 +107,12 @@ export interface AtomsField {
 export interface AtomsInputString {
     val: string;
     type: AtomsTypeEnum.INPUT_STRING;
+    format?: string;
 }
 export interface AtomsInputStringList {
     val: string[];
     type: AtomsTypeEnum.INPUT_STRING_LIST;
+    format?: string;
 }
 export interface AtomsInputNumberList {
     val: number[];

package/lib/es/types.d.ts

@@ -52,6 +52,7 @@ export interface MetabaseProps {
     metabaseCopy?: boolean;
     moduleDiff?: boolean;
     moduleCopy?: boolean;
+    joinAliasConflictCheck?: boolean;
     getModuleDiffCode?: (obj: {
         oldCode: MetaListType;
         newCode: MetaListType;

package/lib/es/utils/helper.d.ts

@@ -16,5 +16,5 @@ export declare const replaceTpl: (inputString: string, values: {
     [key: string]: any;
 }) => string;
 export declare const uuidv4: (prefix?: string) => string;
-export declare const getAlias: (name: string | undefined, list: MetaListType[], columns?: any[]) => string;
+export declare const getAlias: (name?: string, list?: MetaListType[], columns?: any[], extraAliases?: string[]) => string;
 export declare const mergeNameAlias: (name: string, alias: string, isEnable: boolean) => string;

package/lib/es/utils/helper.js

@@ -133,15 +133,32 @@ export var uuidv4 = function uuidv4() {
 };
 export var getAlias = function getAlias() {
   var name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-  var list = arguments.length > 1 ? arguments[1] : undefined;
+  var list = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var columns = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+  var extraAliases = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
   // 提取所有有效的 alias
-  if (!list || list.length < 1) return name;
-  // const baseOld = oldName?.split('_')[0] ?? '';
-  // const baseNew = name?.split('_')[0] ?? '';
-  // if (oldName && baseOld === baseNew) {
-  //   return oldName;
-  // }
+  if (!list || list.length < 1) {
+    // 如果没有 list，只有 extraAliases，需要检查 extraAliases 中是否有冲突
+    if (extraAliases.length === 0) return name;
+    var _regex = new RegExp("^".concat(name, "_(\\d+)$"));
+    var _indexes = extraAliases.map(function (alias) {
+      var match = alias.match(_regex);
+      return match ? parseInt(match[1], 10) : 0;
+    }).filter(function (num) {
+      return num > 0;
+    });
+    var _hasPureName = extraAliases.includes(name);
+    if (_hasPureName) {
+      _indexes.push(1);
+    }
+    if (_indexes.length === 0) {
+      return name;
+    }
+    var _uniqueIndexes = _toConsumableArray(new Set(_indexes)).sort(function (a, b) {
+      return a - b;
+    });
+    return "".concat(name, "_").concat(Math.max.apply(Math, _toConsumableArray(_uniqueIndexes)) + 1);
+  }
   var aliass = list === null || list === void 0 ? void 0 : list.map(function (v) {
     if (v.type === TypeEnum.data) {
       var _v$table;
@@ -154,7 +171,7 @@ export var getAlias = function getAlias() {
     return undefined;
   }).concat(columns.map(function (v) {
     return v.alias;
-  })).filter(function (alias) {
+  })).concat(extraAliases).filter(function (alias) {
     return Boolean(alias);
   });
   // 收集所有 name_x 中的数字

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/pandora-metabase",
-  "version": "1.0.104",
+  "version": "1.0.106",
   "description": "",
   "main": "lib/es/index.js",
   "module": "lib/es/index.js",