@gingkoo/pandora-metabase 1.0.33 → 1.0.35

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

@@ -28,7 +28,7 @@ var _selectList = _interopRequireDefault(require("../../dialog/select-list"));
 var _arrow = _interopRequireDefault(require("./arrow.svg"));
 var _useProvider = require("../../../hooks/use-provider");
 var _itemName = _interopRequireDefault(require("../../modules/components/item-name"));
-var _excluded = ["notExistsToolbar", "toolbar"]; // import './index.less';
+var _excluded = ["notExistsToolbar", "subShowSubquery", "toolbar"]; // import './index.less';
 var FormulaList = (0, _react.forwardRef)(function (props, ref) {
   var value = props.value,
     data = props.data,
@@ -145,6 +145,8 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     var _caseList$i, _caseList$i2;
     var _store$preProps = store.preProps,
       notExistsToolbar = _store$preProps.notExistsToolbar,
+      _store$preProps$subSh = _store$preProps.subShowSubquery,
+      subShowSubquery = _store$preProps$subSh === void 0 ? false : _store$preProps$subSh,
       toolbar = _store$preProps.toolbar,
       other = (0, _objectWithoutProperties2["default"])(_store$preProps, _excluded);
     var _value = ((_caseList$i = caseList[i]) === null || _caseList$i === void 0 ? void 0 : _caseList$i.notExists) || [];
@@ -160,7 +162,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
         children: (0, _jsxRuntime.jsx)(_index["default"], (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, other), {}, {
           notExistsColumns: exitData,
           showFields: false,
-          showSubquery: false,
+          // showSubquery={subShowSubquery}
           toolbar: _toolbar,
           btnText: (0, _locale.__)('SqlQueryBuilder.confirm'),
           value: (0, _cloneDeep["default"])(_value),

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

@@ -164,6 +164,14 @@ var customTypes = exports.customTypes = [
   value: _types.AtomsTypeEnum.FORMULA,
   label: (0, _locale.__)('customColumn.formula'),
   children: operatorList
+},
+// EXISTS
+{
+  value: _types.AtomsTypeEnum.NOT_EXISTS,
+  label: 'NOT_EXISTS'
+}, {
+  value: _types.AtomsTypeEnum.EXISTS,
+  label: 'EXISTS'
 }];
 var getTemplateItem = exports.getTemplateItem = function getTemplateItem(type) {
   var temItem;

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

@@ -71,7 +71,8 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
   var _useState3 = (0, _react.useState)((_value === null || _value === void 0 || (_value$ = _value[0]) === null || _value$ === void 0 ? void 0 : _value$.tableId) === _helper.SummarizeAlias ? '' : _value === null || _value === void 0 || (_value$2 = _value[0]) === null || _value$2 === void 0 ? void 0 : _value$2.tableUuid),
     _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
     curTable = _useState4[0],
-    setCurTable = _useState4[1]; // 当前选择的表
+    setCurTable = _useState4[1];
+  // 当前选择的表
   // const [curColumn, setCurColumn] = useState(_value); // 当前选择的字段
   var _useState5 = (0, _react.useState)(data.map(function (v, i) {
       var open = !i && !curTable ? true : v.tableUuid === curTable; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
@@ -99,9 +100,10 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
       return v.tableUuid === tableUuid;
     });
     if (isHas.length < 1 && tableUuid !== _helper.SummarizeAlias) {
-      tableUuid = data[0].tableUuid;
+      var _data$;
+      tableUuid = (data === null || data === void 0 || (_data$ = data[0]) === null || _data$ === void 0 ? void 0 : _data$.tableUuid) || '';
     }
-    setTableList(data.map(function (v, i) {
+    setTableList(data === null || data === void 0 ? void 0 : data.map(function (v, i) {
       var open = !i && !tableUuid ? true : v.tableUuid === tableUuid; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
       return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
         open: open,
@@ -168,7 +170,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
         style: {
           width: 300
         },
-        children: tableList.map(function (tableItem) {
+        children: tableList.map(function (tableItem, i) {
           var tableAlias = tableItem.alias,
             tableName = tableItem.name,
             columns = tableItem.columns,
@@ -273,7 +275,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(v.id)
+                      active: isActive(v.id || v.name)
                     }),
                     onClick: function onClick() {
                       if (isSummarize) {
@@ -288,7 +290,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                         datasourceName: tableItem.datasourceName || '',
                         datasourceId: tableItem.datasourceId || '',
                         fieldName: v.name,
-                        fieldId: v.id,
+                        fieldId: v.id || v.name,
                         fieldNameZh: v.name_zh || '',
                         fieldAlias: v.fieldAlias,
                         fieldUuid: v.fieldUuid,
@@ -316,9 +318,9 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                         className: 'List-item-icon',
                         children: IconMap[special_type || database_type] || (0, _jsxRuntime.jsx)(_icons.LetterAaIcon, {})
                       }), (0, _jsxRuntime.jsx)("div", {
-                        children: (0, _jsxRuntime.jsx)("h4", {
+                        children: (0, _jsxRuntime.jsxs)("h4", {
                           className: 'List-item-title ml-2',
-                          children: (0, _helper2.replaceTpl)(store.fieldNameTpl, v)
+                          children: [(0, _helper2.replaceTpl)(store.fieldNameTpl, v), v.fieldAlias ? " as ".concat(v.fieldAlias) : '']
                         })
                       })]
                     })
@@ -326,7 +328,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                 }, i);
               })]
             })]
-          }, tableUuid || tableAlias);
+          }, (tableUuid || tableAlias) + '' + i);
         })
       })
     }), showNextBtn && multiple && (0, _jsxRuntime.jsx)(_pandora.Button, {

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

@@ -42,7 +42,6 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
           width: '100%'
         },
         children: Array.isArray(datasource) && datasource.map(function (v) {
-          console.log('🚀 ~ SelectPermissionTable ~ v:', v);
           return (0, _jsxRuntime.jsx)("div", {
             className: (0, _classnames["default"])("Sqb-List-section"),
             children: (0, _jsxRuntime.jsx)("div", {

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

@@ -149,6 +149,19 @@ var Filter = function Filter(props) {
     newMeta[index].filter = val;
     store.setMeta(newMeta, groupIndex);
   };
+  var getPreColumns = function getPreColumns() {
+    var data = [].concat((0, _toConsumableArray2["default"])(getColumns()), (0, _toConsumableArray2["default"])((0, _cloneDeep["default"])(notExistsColumns || [])));
+    // 将source 拍到最前面
+    var priorityNames = ['source'];
+    var sorted = data.sort(function (a, b) {
+      var aPriority = priorityNames.includes(a.name);
+      var bPriority = priorityNames.includes(b.name);
+      if (aPriority && !bPriority) return -1;
+      if (!aPriority && bPriority) return 1;
+      return 0;
+    });
+    return sorted;
+  };
   return (0, _jsxRuntime.jsx)(_Wrapper["default"], {
     className: "Sqb-item",
     children: (0, _jsxRuntime.jsxs)("div", {
@@ -166,7 +179,7 @@ var Filter = function Filter(props) {
           customTypes: _filterEnum.customTypes,
           operatorList: _filterEnum.operatorList,
           value: filter,
-          data: [].concat((0, _toConsumableArray2["default"])(getColumns()), (0, _toConsumableArray2["default"])((0, _cloneDeep["default"])(notExistsColumns || []))),
+          data: getPreColumns(),
           exitData: getColumns(),
           onChange: function onChange(val) {
             selectFilter(val);

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

@@ -67,7 +67,7 @@ var menuOperator = operators.map(function (v) {
   };
 });
 var JoinData = function JoinData(props) {
-  var _meta$subquery, _meta$subquery2, _meta$subquery3, _meta$table2, _meta$table3, _meta$table5, _meta$table6, _meta$table7, _meta$table8, _meta$expressions, _meta$table9, _meta$table0, _meta$expressions2, _store$showMainColumn, _store$showMainColumn2;
+  var _meta$subquery, _meta$subquery2, _meta$subquery3, _meta$table3, _meta$table4, _meta$table6, _meta$table7, _meta$table8, _meta$table9, _meta$expressions, _meta$table0, _meta$table1, _meta$expressions2, _store$showMainColumn, _store$showMainColumn2;
   var meta = props.meta,
     groupIndex = props.groupIndex;
   var store = (0, _useProvider.useStore)();
@@ -79,7 +79,8 @@ var JoinData = function JoinData(props) {
   var subQuerySelected = Boolean((_meta$subquery = meta.subquery) === null || _meta$subquery === void 0 || (_meta$subquery = _meta$subquery[0]) === null || _meta$subquery === void 0 || (_meta$subquery = _meta$subquery.table) === null || _meta$subquery === void 0 ? void 0 : _meta$subquery.name);
   var columnsSelected = meta.table1.name && meta.table2.name;
   var _getHelper = (0, _utils.getHelper)(store.metaList[groupIndex].list, meta),
-    prevTables = _getHelper.prevTables;
+    prevTables = _getHelper.prevTables,
+    prevGroupBy = _getHelper.prevGroupBy;
   // const ref = useRef(null);
   // useEffect(() => {
   //   let newMetaList = store.metaList[groupIndex].list.slice();
@@ -371,8 +372,9 @@ var JoinData = function JoinData(props) {
         onChange: function onChange(data) {
           var tableName = data.name;
           if (meta.table2.name !== tableName || meta.table2.datasourceId !== data.datasourceId) {
+            var _store$preProps;
             var newMeta = store.metaList[groupIndex].list.slice();
-            var alias = (0, _helper.getAlias)(tableName, newMeta);
+            var alias = (0, _helper.getAlias)(tableName, newMeta, ((_store$preProps = store.preProps) === null || _store$preProps === void 0 ? void 0 : _store$preProps.notExistsColumns) || []);
             var _table2 = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, data), {}, {
               name: tableName,
               tableUuid: data.tableUuid || (0, _helper.uuidv4)('table'),
@@ -606,6 +608,7 @@ var JoinData = function JoinData(props) {
     return data;
   }
   function selectMoreJoinColumn(e) {
+    var _data2, _data3, _data4;
     var node = e.currentTarget;
     var _position = node.getAttribute('v-position');
     var _ind = Number(node.getAttribute('v-index'));
@@ -722,6 +725,10 @@ var JoinData = function JoinData(props) {
         columns: meta.columns
       }];
     }
+    // 字段为空，或只存在聚合且聚合为空时
+    if (data.length < 1 || Array.isArray(data) && ((_data2 = data) === null || _data2 === void 0 ? void 0 : _data2.length) === 1 && ((_data3 = data) === null || _data3 === void 0 || (_data3 = _data3[0]) === null || _data3 === void 0 ? void 0 : _data3.name) === _helper2.SummarizeAlias && ((_data4 = data) === null || _data4 === void 0 || (_data4 = _data4[0]) === null || _data4 === void 0 || (_data4 = _data4.columns) === null || _data4 === void 0 ? void 0 : _data4.length) < 1) {
+      _pandora.Toast.warning((0, _locale.__)('SqlQueryBuilder.pleaseSelectTable'));
+    }
     !meta.readonly && store.setPopup({
       visible: true,
       node: node,
@@ -889,10 +896,10 @@ var JoinData = function JoinData(props) {
   // 子查询弹窗
   var showSubQuery = function showSubQuery() {
     var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-    var _store$preProps = store.preProps,
-      subToolbar = _store$preProps.subToolbar,
-      toolbar = _store$preProps.toolbar,
-      other = (0, _objectWithoutProperties2["default"])(_store$preProps, _excluded);
+    var _store$preProps2 = store.preProps,
+      subToolbar = _store$preProps2.subToolbar,
+      toolbar = _store$preProps2.toolbar,
+      other = (0, _objectWithoutProperties2["default"])(_store$preProps2, _excluded);
     var newMeta = store.metaList[groupIndex].list.slice();
     var index = (0, _utils.findIndex)(store.metaList[groupIndex].list, meta);
     var oldList = (0, _cloneDeep["default"])(newMeta[index].subquery);
@@ -911,6 +918,7 @@ var JoinData = function JoinData(props) {
           value: (0, _cloneDeep["default"])(val),
           onOk: function onOk(newList) {
             try {
+              var _store$preProps3;
               // 子查询未改变不做操作
               if ((0, _isEqual["default"])(newList, oldList)) {
                 o.close();
@@ -918,7 +926,7 @@ var JoinData = function JoinData(props) {
               }
               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)
+                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) || [])
                 // fields: [],
               });
               var items = (0, _utils.getSubColumns)(newList);
@@ -1143,6 +1151,9 @@ var JoinData = function JoinData(props) {
   var leftTableIsError = function leftTableIsError() {
     var _prevTables$meta$tabl;
     if (!meta.table1.datasourceId || !meta.table1.id || meta.table1.datasourceId === _helper2.SummarizeAlias) {
+      if (!prevGroupBy && meta.table1.id === _helper2.SummarizeAlias) {
+        return true;
+      }
       return false;
     }
     return !(prevTables !== null && prevTables !== void 0 && (_prevTables$meta$tabl = prevTables[meta.table1.datasourceId]) !== null && _prevTables$meta$tabl !== void 0 && _prevTables$meta$tabl[meta.table1.alias || meta.table1.id]);
@@ -1222,6 +1233,17 @@ var JoinData = function JoinData(props) {
       });
     }
   };
+  var tableIsError = function tableIsError() {
+    var _store$preProps4, _meta$table;
+    var aliass = ((_store$preProps4 = store.preProps) === null || _store$preProps4 === void 0 || (_store$preProps4 = _store$preProps4.notExistsColumns) === null || _store$preProps4 === void 0 ? void 0 : _store$preProps4.map(function (v) {
+      return v.alias;
+    })) || [];
+    var tableAlias = (_meta$table = meta.table2) === null || _meta$table === void 0 ? void 0 : _meta$table.alias;
+    if (tableAlias && aliass.includes(tableAlias)) {
+      return true;
+    }
+    return false;
+  };
   return (0, _jsxRuntime.jsx)(_Wrapper["default"], {
     className: (0, _classnames["default"])("Sqb-item"),
     children: (0, _jsxRuntime.jsxs)("div", {
@@ -1271,42 +1293,48 @@ var JoinData = function JoinData(props) {
               showSubQuery(meta.subquery);
             },
             children: [subQuerySelected && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
-              title: (0, _locale.__)('SqlQueryBuilder.alias'),
+              title: (0, _locale.__)(tableIsError() ? 'SqlQueryBuilder.repeatAlias' : 'SqlQueryBuilder.alias'),
               children: (0, _jsxRuntime.jsx)(_pandora.Button, {
-                className: ':Sqb-TableName-as',
+                danger: tableIsError(),
+                className: (0, _classnames["default"])(':Sqb-TableName-as', {
+                  isError: tableIsError()
+                }),
                 shape: 'circle',
                 iconOnly: true,
                 primary: true,
                 icon: 'As',
                 size: 'small',
                 onClick: function onClick(e) {
-                  var _meta$table;
+                  var _meta$table2;
                   e.stopPropagation();
-                  onChangeTableAlias(((_meta$table = meta.table2) === null || _meta$table === void 0 ? void 0 : _meta$table.alias) || '');
+                  onChangeTableAlias(((_meta$table2 = meta.table2) === null || _meta$table2 === void 0 ? void 0 : _meta$table2.alias) || '');
                 }
               })
-            }), subQuerySelected ? "".concat(((_meta$subquery2 = meta.subquery) === null || _meta$subquery2 === void 0 ? void 0 : _meta$subquery2[0]).table.datasourceName, ".").concat(((_meta$subquery3 = meta.subquery) === null || _meta$subquery3 === void 0 ? void 0 : _meta$subquery3[0]).table.name, " ").concat((_meta$table2 = meta.table2) !== null && _meta$table2 !== void 0 && _meta$table2.alias ? "as ".concat((_meta$table3 = meta.table2) === null || _meta$table3 === void 0 ? void 0 : _meta$table3.alias) : '', " ") : (0, _locale.__)('SqlQueryBuilder.setSubQuery')]
+            }), subQuerySelected ? "".concat(((_meta$subquery2 = meta.subquery) === null || _meta$subquery2 === void 0 ? void 0 : _meta$subquery2[0]).table.datasourceName, ".").concat(((_meta$subquery3 = meta.subquery) === null || _meta$subquery3 === void 0 ? void 0 : _meta$subquery3[0]).table.name, " ").concat((_meta$table3 = meta.table2) !== null && _meta$table3 !== void 0 && _meta$table3.alias ? "as ".concat((_meta$table4 = meta.table2) === null || _meta$table4 === void 0 ? void 0 : _meta$table4.alias) : '', " ") : (0, _locale.__)('SqlQueryBuilder.setSubQuery')]
           }) : (0, _jsxRuntime.jsxs)("div", {
             className: (0, _classnames["default"])("Sqb-TableName", {
               notSelected: !table2Selected
             }),
             onClick: selectTable,
             children: [table2Selected && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
-              title: (0, _locale.__)('SqlQueryBuilder.alias'),
+              title: (0, _locale.__)(tableIsError() ? 'SqlQueryBuilder.repeatAlias' : 'SqlQueryBuilder.alias'),
               children: (0, _jsxRuntime.jsx)(_pandora.Button, {
-                className: ':Sqb-TableName-as',
+                danger: tableIsError(),
+                className: (0, _classnames["default"])(':Sqb-TableName-as', {
+                  isError: tableIsError()
+                }),
                 shape: 'circle',
                 iconOnly: true,
                 primary: true,
                 icon: 'As',
                 size: 'small',
                 onClick: function onClick(e) {
-                  var _meta$table4;
+                  var _meta$table5;
                   e.stopPropagation();
-                  onChangeTableAlias(((_meta$table4 = meta.table2) === null || _meta$table4 === void 0 ? void 0 : _meta$table4.alias) || '');
+                  onChangeTableAlias(((_meta$table5 = meta.table2) === null || _meta$table5 === void 0 ? void 0 : _meta$table5.alias) || '');
                 }
               })
-            }), table2Selected ? "".concat(meta.table2.datasourceName, ".").concat(meta.table2.name, " ").concat((_meta$table5 = meta.table2) !== null && _meta$table5 !== void 0 && _meta$table5.alias ? "as ".concat((_meta$table6 = meta.table2) === null || _meta$table6 === void 0 ? void 0 : _meta$table6.alias) : '') : (0, _locale.__)('SqlQueryBuilder.pickTable')]
+            }), table2Selected ? "".concat(meta.table2.datasourceName, ".").concat(meta.table2.name, " ").concat((_meta$table6 = meta.table2) !== null && _meta$table6 !== void 0 && _meta$table6.alias ? "as ".concat((_meta$table7 = meta.table2) === null || _meta$table7 === void 0 ? void 0 : _meta$table7.alias) : '') : (0, _locale.__)('SqlQueryBuilder.pickTable')]
           }), store.showSubquery && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
             title: (0, _locale.__)('SqlQueryBuilder.switchSubQuery'),
             children: (0, _jsxRuntime.jsx)(_pandora.Button, {
@@ -1317,7 +1345,7 @@ var JoinData = function JoinData(props) {
               icon: (0, _jsxRuntime.jsx)(_pandoraIcons.RelatedWork, {}),
               onClick: switchSubQuery
             })
-          }), ((_meta$table7 = meta.table2) === null || _meta$table7 === void 0 ? void 0 : _meta$table7.name) && ((_meta$table8 = meta.table1) === null || _meta$table8 === void 0 ? void 0 : _meta$table8.name) && ((_meta$expressions = meta.expressions) === null || _meta$expressions === void 0 ? void 0 : _meta$expressions.map(function (v, i) {
+          }), ((_meta$table8 = meta.table2) === null || _meta$table8 === void 0 ? void 0 : _meta$table8.name) && ((_meta$table9 = meta.table1) === null || _meta$table9 === void 0 ? void 0 : _meta$table9.name) && ((_meta$expressions = meta.expressions) === null || _meta$expressions === void 0 ? void 0 : _meta$expressions.map(function (v, i) {
             if (v.type === _types.AtomsTypeEnum.JOIN_DEFAULT) {
               return (0, _jsxRuntime.jsxs)("div", {
                 className: (0, _classnames["default"])("Sqb-where block"),
@@ -1544,7 +1572,7 @@ var JoinData = function JoinData(props) {
                 })]
               }, i);
             }
-          })), ((_meta$table9 = meta.table2) === null || _meta$table9 === void 0 ? void 0 : _meta$table9.name) && ((_meta$table0 = meta.table1) === null || _meta$table0 === void 0 ? void 0 : _meta$table0.name) && (((_meta$expressions2 = meta.expressions) === null || _meta$expressions2 === void 0 ? void 0 : _meta$expressions2.length) || 0) < 1 && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
+          })), ((_meta$table0 = meta.table2) === null || _meta$table0 === void 0 ? void 0 : _meta$table0.name) && ((_meta$table1 = meta.table1) === null || _meta$table1 === void 0 ? void 0 : _meta$table1.name) && (((_meta$expressions2 = meta.expressions) === null || _meta$expressions2 === void 0 ? void 0 : _meta$expressions2.length) || 0) < 1 && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
             title: (0, _locale.__)('SqlQueryBuilder.add'),
             children: (0, _jsxRuntime.jsx)(_pandora.Dropdown, {
               trigger: ['click'],

package/lib/cjs/components/modules/summarize/group-by.js

@@ -200,7 +200,8 @@ var GroupBy = function GroupBy(props) {
           newMeta[index].by.push(data);
           // @ts-ignore
           newMeta[index].by = newMeta[index].by.map(function (v) {
-            var fieldAlias = "".concat(v.alias, "__").concat(v.name);
+            var _store$preProps;
+            var fieldAlias = "".concat((0, _helper.getAlias)(v.alias, newMeta, ((_store$preProps = store.preProps) === null || _store$preProps === void 0 ? void 0 : _store$preProps.notExistsColumns) || []), "__").concat(v.name);
             return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
               sql: "".concat(v.alias, ".").concat(v.realName || v.name),
               fieldAlias: fieldAlias,

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

@@ -27,7 +27,7 @@ var _header = _interopRequireDefault(require("./components/header"));
 var _useProvider = require("../../hooks/use-provider");
 var _excluded = ["subToolbar", "toolbar"];
 var TableData = function TableData(props) {
-  var _meta$subquery, _meta$subquery2, _meta$subquery3, _meta$table2, _meta$table3, _meta$table5, _meta$table6, _store$showMainColumn;
+  var _meta$subquery, _meta$subquery2, _meta$subquery3, _meta$table3, _meta$table4, _meta$table6, _meta$table7, _store$showMainColumn;
   var meta = props.meta,
     groupIndex = props.groupIndex;
   var store = (0, _useProvider.useStore)();
@@ -42,10 +42,11 @@ var TableData = function TableData(props) {
         value: meta.table,
         onChange: function onChange(data) {
           if (meta.table.datasourceId !== data.datasourceId || meta.table.name !== data.name) {
+            var _store$preProps;
             var newMetaList = store.metaList[groupIndex].list.slice()[0];
             newMetaList.table = (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, data), {}, {
               tableUuid: (0, _helper.uuidv4)('table'),
-              alias: (0, _helper.getAlias)(data.name, store.metaList[groupIndex].list.slice())
+              alias: (0, _helper.getAlias)(data.name, store.metaList[groupIndex].list.slice(), ((_store$preProps = store.preProps) === null || _store$preProps === void 0 ? void 0 : _store$preProps.notExistsColumns) || [])
             });
             store.fetchColumns(data, data.datasourceId, [], function (columns) {
               newMetaList.columns = columns;
@@ -125,10 +126,10 @@ var TableData = function TableData(props) {
   // 子查询弹窗
   var showSubQuery = function showSubQuery() {
     var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-    var _store$preProps = store.preProps,
-      subToolbar = _store$preProps.subToolbar,
-      toolbar = _store$preProps.toolbar,
-      other = (0, _objectWithoutProperties2["default"])(_store$preProps, _excluded);
+    var _store$preProps2 = store.preProps,
+      subToolbar = _store$preProps2.subToolbar,
+      toolbar = _store$preProps2.toolbar,
+      other = (0, _objectWithoutProperties2["default"])(_store$preProps2, _excluded);
     var newMetaList = store.metaList[groupIndex].list.slice()[0];
     var newMeta = store.metaList[groupIndex].list.slice();
     var oldList = (0, _cloneDeep["default"])(newMetaList.subquery);
@@ -212,6 +213,17 @@ var TableData = function TableData(props) {
     };
     store.setMeta(newMetaList, groupIndex);
   };
+  var tableIsError = function tableIsError() {
+    var _store$preProps3, _meta$table;
+    var aliass = ((_store$preProps3 = store.preProps) === null || _store$preProps3 === void 0 || (_store$preProps3 = _store$preProps3.notExistsColumns) === null || _store$preProps3 === void 0 ? void 0 : _store$preProps3.map(function (v) {
+      return v.alias;
+    })) || [];
+    var tableAlias = (_meta$table = meta.table) === null || _meta$table === void 0 ? void 0 : _meta$table.alias;
+    if (tableAlias && aliass.includes(tableAlias)) {
+      return true;
+    }
+    return false;
+  };
   return (0, _jsxRuntime.jsx)(_Wrapper["default"], {
     className: "Sqb-item",
     children: (0, _jsxRuntime.jsxs)("div", {
@@ -230,42 +242,48 @@ var TableData = function TableData(props) {
               showSubQuery(meta.subquery);
             },
             children: [subQuerySelected && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
-              title: (0, _locale.__)('SqlQueryBuilder.alias'),
+              title: (0, _locale.__)(tableIsError() ? 'SqlQueryBuilder.repeatAlias' : 'SqlQueryBuilder.alias'),
               children: (0, _jsxRuntime.jsx)(_pandora.Button, {
-                className: ':Sqb-TableName-as',
+                danger: tableIsError(),
+                className: (0, _classnames["default"])(':Sqb-TableName-as', {
+                  isError: tableIsError()
+                }),
                 shape: 'circle',
                 iconOnly: true,
                 primary: true,
                 icon: 'As',
                 size: 'small',
                 onClick: function onClick(e) {
-                  var _meta$table;
+                  var _meta$table2;
                   e.stopPropagation();
-                  onChangeTableAlias(((_meta$table = meta.table) === null || _meta$table === void 0 ? void 0 : _meta$table.alias) || '');
+                  onChangeTableAlias(((_meta$table2 = meta.table) === null || _meta$table2 === void 0 ? void 0 : _meta$table2.alias) || '');
                 }
               })
-            }), subQuerySelected ? "".concat(((_meta$subquery2 = meta.subquery) === null || _meta$subquery2 === void 0 ? void 0 : _meta$subquery2[0]).table.datasourceName, ".").concat(((_meta$subquery3 = meta.subquery) === null || _meta$subquery3 === void 0 ? void 0 : _meta$subquery3[0]).table.name, " ").concat((_meta$table2 = meta.table) !== null && _meta$table2 !== void 0 && _meta$table2.alias ? "as ".concat((_meta$table3 = meta.table) === null || _meta$table3 === void 0 ? void 0 : _meta$table3.alias) : '', " ") : (0, _locale.__)('SqlQueryBuilder.setSubQuery')]
+            }), subQuerySelected ? "".concat(((_meta$subquery2 = meta.subquery) === null || _meta$subquery2 === void 0 ? void 0 : _meta$subquery2[0]).table.datasourceName, ".").concat(((_meta$subquery3 = meta.subquery) === null || _meta$subquery3 === void 0 ? void 0 : _meta$subquery3[0]).table.name, " ").concat((_meta$table3 = meta.table) !== null && _meta$table3 !== void 0 && _meta$table3.alias ? "as ".concat((_meta$table4 = meta.table) === null || _meta$table4 === void 0 ? void 0 : _meta$table4.alias) : '', " ") : (0, _locale.__)('SqlQueryBuilder.setSubQuery')]
           }) : (0, _jsxRuntime.jsxs)("div", {
             className: (0, _classnames["default"])("Sqb-TableName", {
               notSelected: !selected
             }),
             onClick: selectTable,
             children: [selected && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
-              title: (0, _locale.__)('SqlQueryBuilder.alias'),
+              title: (0, _locale.__)(tableIsError() ? 'SqlQueryBuilder.repeatAlias' : 'SqlQueryBuilder.alias'),
               children: (0, _jsxRuntime.jsx)(_pandora.Button, {
-                className: ':Sqb-TableName-as',
+                danger: tableIsError(),
+                className: (0, _classnames["default"])(':Sqb-TableName-as', {
+                  isError: tableIsError()
+                }),
                 shape: 'circle',
                 iconOnly: true,
                 primary: true,
                 icon: 'As',
                 size: 'small',
                 onClick: function onClick(e) {
-                  var _meta$table4;
+                  var _meta$table5;
                   e.stopPropagation();
-                  onChangeTableAlias(((_meta$table4 = meta.table) === null || _meta$table4 === void 0 ? void 0 : _meta$table4.alias) || '');
+                  onChangeTableAlias(((_meta$table5 = meta.table) === null || _meta$table5 === void 0 ? void 0 : _meta$table5.alias) || '');
                 }
               })
-            }), selected ? "".concat(meta.table.datasourceName, ".").concat(meta.table.name, " ").concat((_meta$table5 = meta.table) !== null && _meta$table5 !== void 0 && _meta$table5.alias ? "as ".concat((_meta$table6 = meta.table) === null || _meta$table6 === void 0 ? void 0 : _meta$table6.alias) : '') : (0, _locale.__)('SqlQueryBuilder.pickTable')]
+            }), selected ? "".concat(meta.table.datasourceName, ".").concat(meta.table.name, " ").concat((_meta$table6 = meta.table) !== null && _meta$table6 !== void 0 && _meta$table6.alias ? "as ".concat((_meta$table7 = meta.table) === null || _meta$table7 === void 0 ? void 0 : _meta$table7.alias) : '') : (0, _locale.__)('SqlQueryBuilder.pickTable')]
           }), store.showSubquery && (0, _jsxRuntime.jsx)(_pandora.Tooltip, {
             title: (0, _locale.__)('SqlQueryBuilder.switchSubQuery'),
             children: (0, _jsxRuntime.jsx)(_pandora.Button, {

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

@@ -278,9 +278,12 @@ var useStore = function useStore() {
     };
   }();
   var setMeta = function setMeta(curData, groupInd) {
-    var newMeta = metaList.slice();
-    newMeta[groupInd].list = curData;
-    _setMeta(newMeta);
+    var _metaList = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : metaList;
+    var newMeta = _metaList.slice();
+    if (newMeta[groupInd]) {
+      newMeta[groupInd].list = curData;
+      _setMeta(newMeta);
+    }
   };
   // 回显
   var setPreData = function setPreData(data) {
@@ -294,27 +297,6 @@ var useStore = function useStore() {
           if (v.table) {
             v.table.tableUuid = v.table.tableUuid || (0, _helper.uuidv4)('table');
           }
-          // // 兼容
-          // if (patchVersion != '1.0.0') {
-          //   if (v.type === TypeEnum.joinData) {
-          //     v = joinDataPatch(v);
-          //   }
-          //   if (v.type === TypeEnum.filter) {
-          //     v = filterPatch(v);
-          //   }
-          //   if (v.type === TypeEnum.sort) {
-          //     v = sortPatch(v);
-          //   }
-          //   if (v.type === TypeEnum.customColumn) {
-          //     v = customColumnPatch(v);
-          //   }
-          //   if (v.type === TypeEnum.data) {
-          //     v = dataPatch(v);
-          //   }
-          // }
-          // if (v.type === TypeEnum.filter) {
-          //   newMeta[i] = setFilterQuotes(newMeta[i]);
-          // }
           // 设置右侧column
           if ((_v$table = v.table2) !== null && _v$table !== void 0 && _v$table.datasourceId) {
             fetchColumns(newMeta[i].table2, newMeta[i].table2.datasourceId, v.columns, function () {
@@ -329,7 +311,7 @@ var useStore = function useStore() {
               } else {
                 newMeta[i].columns = columns || [];
               }
-              setMeta(newMeta, groupIndex);
+              setMeta(newMeta, groupIndex, data);
             });
             return (0, _objectSpread2["default"])({}, v);
           }
@@ -350,7 +332,7 @@ var useStore = function useStore() {
               // if (v.type === TypeEnum.joinData) {
               //   newMeta[i] = setQuotes(newMeta[i]);
               // }
-              setMeta(newMeta, groupIndex);
+              setMeta(newMeta, groupIndex, data);
             });
             return (0, _objectSpread2["default"])({}, v);
           }

package/lib/cjs/locale/en.js

@@ -56,6 +56,8 @@ var _default = exports["default"] = (0, _index.register)('en', {
   'SqlQueryBuilder.selectColumnAll': 'select all',
   'SqlQueryBuilder.alias': 'alias',
   'SqlQueryBuilder.aliasForRules': 'The alias only supports a combination of letters, numbers, and underscores. It must start with a letter and cannot exceed 30 bytes',
+  'SqlQueryBuilder.pleaseSelectTable': 'The currently dependent table is empty or has been deleted',
+  'SqlQueryBuilder.repeatAlias': 'If there are duplicate names, please modify them',
   'customColumn.operator': 'operator',
   'customColumn.collection': 'collection',
   'customColumn.field': 'field',

package/lib/cjs/locale/zh.js

@@ -52,6 +52,8 @@ var _default = exports["default"] = (0, _index.register)('zh', {
   'SqlQueryBuilder.selectColumnAll': '全选',
   'SqlQueryBuilder.alias': '别名',
   'SqlQueryBuilder.aliasForRules': '别名只支持字母 + 数字 + 下划线组合，必须是字母开头，且不能超过30个字节',
+  'SqlQueryBuilder.pleaseSelectTable': '当前依赖的表为空或被删除',
+  'SqlQueryBuilder.repeatAlias': '有重名请修改',
   'customColumn.operator': '操作符',
   'customColumn.collection': '自定义组合',
   'customColumn.field': '字段',

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

@@ -16,4 +16,4 @@ 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[]) => string;
+export declare const getAlias: (name: string | undefined, list: MetaListType[], columns?: any[]) => string;

package/lib/cjs/utils/helper.js

@@ -141,6 +141,7 @@ var uuidv4 = exports.uuidv4 = function uuidv4() {
 var getAlias = exports.getAlias = function getAlias() {
   var name = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
   var list = arguments.length > 1 ? arguments[1] : undefined;
+  var columns = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
   // 提取所有有效的 alias
   if (!list || list.length < 1) return name;
   // const baseOld = oldName?.split('_')[0] ?? '';
@@ -158,9 +159,12 @@ var getAlias = exports.getAlias = function getAlias() {
       return (_v$table2 = v.table2) === null || _v$table2 === void 0 ? void 0 : _v$table2.alias;
     }
     return undefined;
-  }).filter(function (alias) {
+  }).concat(columns.map(function (v) {
+    return v.alias;
+  })).filter(function (alias) {
     return Boolean(alias);
   });
+  console.log('🚀 ~ getAlias ~ aliass:', aliass);
   // 收集所有 name_x 中的数字
   var regex = new RegExp("^".concat(name, "_(\\d+)$"));
   var indexes = aliass.map(function (alias) {

package/lib/cjs/utils/transformSql.d.ts

@@ -1,6 +1,5 @@
-import { MetaListType } from '../store/types';
-export declare const transformSql: (metas: MetaListType[], db?: string) => {
+export declare const transformSql: (metas: any, db?: string) => {
     sql: string;
-    fields: any[];
-    union_fields: any[][];
+    fields: any;
+    union_fields: any[];
 };