@gingkoo/pandora-metabase 1.0.27 → 1.0.29

package/lib/cjs/utils.d.ts

@@ -1,7 +1,9 @@
 import { TypeEnum } from './store/enum';
-import { MetaListType, MetaSummarize, MetaData_TableType, MetaData_ColumnsType } from './store/types';
+import { MetaListType, MetaSummarize, MetaData_TableType, MetaData_ColumnsType, AtomsItem } from './store/types';
 import { DataType } from './components/dialog/select-column-multiple';
 export declare const findIndex: <T>(arr: T[], item: T) => number;
+export declare const getMetaTabels: (data: MetaListType[]) => any;
+export declare const getColumnsTables: (data: DataType[]) => any;
 interface HelperResultType {
     ExistAboveGroupBy: boolean;
     ExistBelowGroupBy: boolean;
@@ -11,6 +13,9 @@ interface HelperResultType {
     nextList: MetaListType[];
     prevGroupBy: MetaSummarize | undefined;
     nextGroupBy: MetaSummarize | undefined;
+    prevTables: {
+        [params: string]: any;
+    };
 }
 export declare const getHelper: (list: MetaListType[], item: MetaListType) => HelperResultType;
 export declare const getSubColumns: (metaList: any) => DataType[];
@@ -21,4 +26,5 @@ export declare function splitByUnion(data: any): any[];
 export declare const patchData: (metas: MetaListType[]) => 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 {};

package/lib/cjs/utils.js

@@ -4,19 +4,21 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getSubColumns = exports.getHelper = exports.findIndex = exports.changeTableAlias = exports.changeFieldAlias = exports.buildSqlQuery = void 0;
+exports.isError = exports.getSubColumns = exports.getMetaTabels = exports.getHelper = exports.getColumnsTables = exports.findIndex = exports.changeTableAlias = exports.changeFieldAlias = exports.buildSqlQuery = void 0;
 exports.isValidSQLAlias = isValidSQLAlias;
 exports.patchData = void 0;
 exports.reassembleByUnion = reassembleByUnion;
 exports.splitByUnion = splitByUnion;
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/createForOfIteratorHelper"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
+var _objectSpread6 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _locale = require("./locale");
 var _enum = require("./store/enum");
 var _types = require("./store/types");
 var _helper = require("./store/helper");
+var _transformSql2 = require("./utils/transformSql");
 var _helper2 = require("./utils/helper");
 var _cloneDeep3 = _interopRequireDefault(require("lodash/cloneDeep"));
 var _patch = require("./hooks/patch");
@@ -24,6 +26,36 @@ var _excluded = ["list"];
 var findIndex = exports.findIndex = function findIndex(arr, item) {
   return arr.indexOf(item);
 };
+var getMetaTabels = exports.getMetaTabels = function getMetaTabels(data) {
+  var obj = {};
+  data.map(function (v) {
+    if (v.type === _enum.TypeEnum.data) {
+      var _v$table, _v$table2;
+      obj[(_v$table = v.table) === null || _v$table === void 0 ? void 0 : _v$table.datasourceId] = (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, obj[(_v$table2 = v.table) === null || _v$table2 === void 0 ? void 0 : _v$table2.datasourceId]), {}, (0, _defineProperty2["default"])({}, v.table.id, v.columns));
+    }
+    if (v.type === _enum.TypeEnum.joinData) {
+      var _v$table3, _v$table4, _v$table5, _v$table6;
+      obj[((_v$table3 = v.table1) === null || _v$table3 === void 0 ? void 0 : _v$table3.datasourceId) || 'source'] = (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, obj[(_v$table4 = v.table1) === null || _v$table4 === void 0 ? void 0 : _v$table4.datasourceId]), {}, (0, _defineProperty2["default"])({}, v.table1.id, v.columns));
+      obj[((_v$table5 = v.table2) === null || _v$table5 === void 0 ? void 0 : _v$table5.datasourceId) || 'source'] = (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, obj[(_v$table6 = v.table2) === null || _v$table6 === void 0 ? void 0 : _v$table6.datasourceId]), {}, (0, _defineProperty2["default"])({}, v.table2.id, v.columns));
+    }
+  });
+  return obj;
+};
+var getColumnsTables = exports.getColumnsTables = function getColumnsTables(data) {
+  var obj = {};
+  data.map(function (v) {
+    // data也可直接是下拉框
+    var _v$datasourceId = v.datasourceId,
+      datasourceId = _v$datasourceId === void 0 ? 'source' : _v$datasourceId,
+      _v$id = v.id,
+      id = _v$id === void 0 ? '' : _v$id,
+      _v$columns = v.columns,
+      columns = _v$columns === void 0 ? [] : _v$columns;
+    var _datasourceId = datasourceId || 'source';
+    obj[_datasourceId] = (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, obj[_datasourceId]), {}, (0, _defineProperty2["default"])({}, id, columns));
+  });
+  return obj;
+};
 var getHelper = exports.getHelper = function getHelper(list, item) {
   var types = list.map(function (v) {
     return v.type;
@@ -33,6 +65,7 @@ var getHelper = exports.getHelper = function getHelper(list, item) {
   var rightTypes = types.slice(curIndex + 1); // 当前元素下面的所有元素 （不包含自己）
   var leftList = list.slice(0, curIndex);
   var rightList = list.slice(curIndex + 1);
+  var topList = leftList; // 包含自己
   var ExistAboveGroupBy = false;
   var ExistBelowGroupBy = false;
   var prevTypes = [];
@@ -41,12 +74,14 @@ var getHelper = exports.getHelper = function getHelper(list, item) {
   var nextList = [];
   var prevGroupBy;
   var nextGroupBy;
+  var prevTables = {};
   if (~leftTypes.indexOf(_enum.TypeEnum.summarize)) {
     ExistAboveGroupBy = true;
     var i = leftTypes.lastIndexOf(_enum.TypeEnum.summarize);
     prevTypes = leftTypes.slice(i + 1);
     prevList = leftList.slice(i + 1);
     prevGroupBy = list[i];
+    topList = topList.slice(i + 1);
   }
   if (~rightTypes.indexOf(_enum.TypeEnum.summarize)) {
     ExistBelowGroupBy = true;
@@ -55,6 +90,7 @@ var getHelper = exports.getHelper = function getHelper(list, item) {
     nextList = rightList.slice(0, _i);
     nextGroupBy = list[curIndex + _i + 1];
   }
+  prevTables = getMetaTabels(topList);
   return {
     ExistAboveGroupBy: ExistAboveGroupBy,
     ExistBelowGroupBy: ExistBelowGroupBy,
@@ -63,7 +99,8 @@ var getHelper = exports.getHelper = function getHelper(list, item) {
     prevList: prevList,
     nextList: nextList,
     prevGroupBy: prevGroupBy,
-    nextGroupBy: nextGroupBy
+    nextGroupBy: nextGroupBy,
+    prevTables: prevTables
   };
 };
 // 获取子查询的字段
@@ -94,7 +131,7 @@ var getSubColumns = exports.getSubColumns = function getSubColumns(metaList) {
     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) {
         var _v$sql;
-        return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
+        return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, v), {}, {
           name: v.name || v.quotes,
           name_zh: v.name_zh || v.quotes,
           id: v.id || v.fieldId,
@@ -110,7 +147,7 @@ var getSubColumns = exports.getSubColumns = function getSubColumns(metaList) {
     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) {
         var _v$sql2;
-        return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
+        return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, v), {}, {
           name: v.name || v.quotes,
           name_zh: v.name_zh || v.quotes,
           id: v.id || v.fieldId,
@@ -135,7 +172,7 @@ var getSubColumns = exports.getSubColumns = function getSubColumns(metaList) {
       // @ts-ignore
       joinData.map(function (v) {
         var columns = v.columns.map(function (column) {
-          return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, column), {}, {
+          return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, column), {}, {
             name: column.fieldAlias || column.name,
             fieldAlias: ''
             // fieldUuid: uuidv4('field'),
@@ -153,7 +190,7 @@ var getSubColumns = exports.getSubColumns = function getSubColumns(metaList) {
     data = metaList.slice().map(function (v) {
       if (v.type === _enum.TypeEnum.data) {
         var columns = v.columns.map(function (column) {
-          return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, column), {}, {
+          return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, column), {}, {
             name: column.fieldAlias || column.name,
             fieldAlias: ''
             // fieldUuid: uuidv4('field'),
@@ -168,7 +205,7 @@ var getSubColumns = exports.getSubColumns = function getSubColumns(metaList) {
         };
       } else if (v.type === _enum.TypeEnum.joinData) {
         var _columns = v.columns.map(function (column) {
-          return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, column), {}, {
+          return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, column), {}, {
             name: column.fieldAlias || column.name,
             fieldAlias: ''
             // fieldUuid: uuidv4('field'),
@@ -226,7 +263,7 @@ var AliasType;
 var _changeAlias = function changeAlias(items, val, type) {
   return items.map(function (v) {
     if (v.type === _types.AtomsTypeEnum.JOIN_DEFAULT || v.type === _types.AtomsTypeEnum.EXPRESSION) {
-      return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
+      return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, v), {}, {
         lhs: _changeAlias(v.lhs, val, type),
         rhs: _changeAlias(v.rhs, val, type)
       });
@@ -265,7 +302,7 @@ var _changeAlias = function changeAlias(items, val, type) {
 };
 function isValidSQLAlias(str) {
   if (!str) return false;
-  var regex = /^[A-Za-z_]{0,30}$/;
+  var regex = /^[a-zA-Z][a-zA-Z0-9_]{0,30}$/;
   return regex.test(str);
 }
 var changeTableAlias = exports.changeTableAlias = function changeTableAlias(list, curObj) {
@@ -313,7 +350,7 @@ var changeTableAlias = exports.changeTableAlias = function changeTableAlias(list
     if (v.type === _enum.TypeEnum.rowLimit) {}
     if (v.type === _enum.TypeEnum.sort) {
       v.sort = v.sort.map(function (sort) {
-        return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, sort), {}, {
+        return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, sort), {}, {
           expression: _changeAlias(sort.expression, {
             uuid: tableUuid,
             alias: alias
@@ -404,7 +441,7 @@ var changeFieldAlias = exports.changeFieldAlias = function changeFieldAlias(list
     if (v.type === _enum.TypeEnum.sort) {
       if (v.sort && v.sort.length > 0) {
         v.sort = v.sort.map(function (sort) {
-          return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, sort), {}, {
+          return (0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, sort), {}, {
             expression: _changeAlias(sort.expression, {
               uuid: uuid,
               alias: alias
@@ -413,7 +450,7 @@ var changeFieldAlias = exports.changeFieldAlias = function changeFieldAlias(list
         });
       }
     }
-    return (0, _objectSpread2["default"])({}, v);
+    return (0, _objectSpread6["default"])({}, v);
   })) || [];
 };
 function splitByUnion(data) {
@@ -444,14 +481,14 @@ function splitByUnion(data) {
       // 查找下一个 group，并将其 list 转成 subquery
       var nextItem = original[i + 1];
       if (nextItem && nextItem.type === 'group') {
-        result.push((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, otehr), {}, {
+        result.push((0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, otehr), {}, {
           subquery: nextItem.list.map(function (subItem) {
             return subItem;
           })
         }));
         i += 2;
       } else {
-        result.push((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, otehr), {}, {
+        result.push((0, _objectSpread6["default"])((0, _objectSpread6["default"])({}, otehr), {}, {
           subquery: []
         }));
         i++;
@@ -549,6 +586,10 @@ function reassembleByUnion() {
 var buildSqlQuery = exports.buildSqlQuery = function buildSqlQuery() {
   var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var type = arguments.length > 1 ? arguments[1] : undefined;
+  var typeName = type === _types.AtomsTypeEnum.EXISTS ? 'EXISTS' : 'NOT EXISTS';
+  var _transformSql = (0, _transformSql2.transformSql)(data),
+    sql = _transformSql.sql;
+  return "".concat(typeName, " (").concat(sql, ") ");
   if (!data || data.length === 0) return '';
   var name = type === _types.AtomsTypeEnum.EXISTS ? 'EXISTS' : 'NOT EXISTS';
   var sqlClauses = ["".concat(name, " (")];
@@ -634,4 +675,60 @@ var buildSqlQuery = exports.buildSqlQuery = function buildSqlQuery() {
   }
   sqlClauses.push(')');
   return sqlClauses.join(' ');
+};
+var _isError = exports.isError = function isError(item, data) {
+  var tables = getColumnsTables(data);
+  // 不存在
+  if (!item) {
+    return false;
+  }
+  if (Array.isArray(item)) {
+    return item.some(function (v) {
+      return _isError(v, data);
+    }); // item可能为数组关联的时候有多选情况，只要有一个错，整体就错
+  }
+  // 字段类型
+  if (item.type === _types.AtomsTypeEnum.FIELD) {
+    var datasourceId = item.datasourceId,
+      _item$tableId = item.tableId,
+      tableId = _item$tableId === void 0 ? '' : _item$tableId,
+      fieldName = item.fieldName;
+    var _datasourceId = datasourceId || 'source'; // 默认为source
+    if (tableId === 'source') {
+      _datasourceId = 'source';
+    }
+    if (!tableId) {
+      return false; // 未选不报错
+    }
+    if (_datasourceId === 'source') {
+      var _tables$_datasourceId;
+      // 检查是否所有字段的 name 都不等于 fieldName
+      if (!(tables !== null && tables !== void 0 && (_tables$_datasourceId = tables[_datasourceId]) !== null && _tables$_datasourceId !== void 0 && _tables$_datasourceId[tableId])) {
+        return true;
+      } else {
+        var _tables$_datasourceId2;
+        return tables === null || tables === void 0 || (_tables$_datasourceId2 = tables[_datasourceId]) === null || _tables$_datasourceId2 === void 0 || (_tables$_datasourceId2 = _tables$_datasourceId2[tableId]) === null || _tables$_datasourceId2 === void 0 ? void 0 : _tables$_datasourceId2.every(function (field) {
+          return field.name !== fieldName;
+        });
+      }
+    } else {
+      var _tables$_datasourceId3;
+      return !(tables !== null && tables !== void 0 && (_tables$_datasourceId3 = tables[_datasourceId]) !== null && _tables$_datasourceId3 !== void 0 && _tables$_datasourceId3[tableId]); // 注意：返回 true 表示“有错误”
+    }
+  }
+  // 表达式类型
+  if (item.type === _types.AtomsTypeEnum.EXPRESSION) {
+    var lhsHasError = _isError(item.lhs, data);
+    var rhsHasError = _isError(item.rhs, data);
+    return lhsHasError || rhsHasError;
+  }
+  // 公式
+  if (item.type === _types.AtomsTypeEnum.FORMULA) {
+    return _isError(item.args, data);
+  }
+  // 公式
+  if (item.type === _types.AtomsTypeEnum.COLLECTION) {
+    return _isError(item.list, data);
+  }
+  return false; // 其他类型默认无错误
 };

package/lib/es/common/SplitView/index.js

@@ -51,17 +51,17 @@ var SplitView = React.forwardRef(function (props, ref) {
     hMaximum = _useState8[0],
     setHMaximum = _useState8[1];
   var _useState9 = useState(false),
-    _useState10 = _slicedToArray(_useState9, 2),
-    vMinimum = _useState10[0],
-    setVMinimum = _useState10[1];
-  var _useState11 = useState(false),
+    _useState0 = _slicedToArray(_useState9, 2),
+    vMinimum = _useState0[0],
+    setVMinimum = _useState0[1];
+  var _useState1 = useState(false),
+    _useState10 = _slicedToArray(_useState1, 2),
+    vMaximum = _useState10[0],
+    setVMaximum = _useState10[1];
+  var _useState11 = useState(0),
     _useState12 = _slicedToArray(_useState11, 2),
-    vMaximum = _useState12[0],
-    setVMaximum = _useState12[1];
-  var _useState13 = useState(0),
-    _useState14 = _slicedToArray(_useState13, 2),
-    bottomHeight = _useState14[0],
-    setBottomHeight = _useState14[1];
+    bottomHeight = _useState12[0],
+    setBottomHeight = _useState12[1];
   React.useImperativeHandle(ref, function () {
     return {
       open: function open() {

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

@@ -79,18 +79,18 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
     special_type = _useState8[0],
     setSpecial_type = _useState8[1];
   var _useState9 = useState(value.formula || {}),
-    _useState10 = _slicedToArray(_useState9, 2),
-    formula = _useState10[0],
-    setFormula = _useState10[1];
+    _useState0 = _slicedToArray(_useState9, 2),
+    formula = _useState0[0],
+    setFormula = _useState0[1];
   var store = useStore();
-  var _useState11 = useState(false),
+  var _useState1 = useState(false),
+    _useState10 = _slicedToArray(_useState1, 2),
+    popupVisible = _useState10[0],
+    setPopupVisible = _useState10[1];
+  var _useState11 = useState((value === null || value === void 0 || (_value$lhs = value.lhs) === null || _value$lhs === void 0 ? void 0 : _value$lhs.length) > 0 || false),
     _useState12 = _slicedToArray(_useState11, 2),
-    popupVisible = _useState12[0],
-    setPopupVisible = _useState12[1];
-  var _useState13 = useState((value === null || value === void 0 || (_value$lhs = value.lhs) === null || _value$lhs === void 0 ? void 0 : _value$lhs.length) > 0 || false),
-    _useState14 = _slicedToArray(_useState13, 2),
-    isNext = _useState14[0],
-    setIsNext = _useState14[1];
+    isNext = _useState12[0],
+    setIsNext = _useState12[1];
   var table2Selected = Boolean(rhsVal && (rhsVal === null || rhsVal === void 0 ? void 0 : rhsVal.length) > 0);
   var disabled = useMemo(function () {
     if (!condition) return true;

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

@@ -14,7 +14,7 @@ import { AtomsTypeEnum } from '../../../store/types';
 import { ColumnsPopupThemeEnum } from '../../../store/enum';
 import { Select, Input, Modal2, InputNumber } from '@gingkoo/pandora';
 import cloneDeep from 'lodash/cloneDeep';
-import { buildSqlQuery } from '../../../utils';
+import { buildSqlQuery, isError } from '../../../utils';
 import Formula from '../formula';
 import { AddIcon, CloseIcon } from '../../icons';
 import { Expression, SelectColumnMultiple } from '../../dialog';
@@ -22,6 +22,7 @@ import { customTypes, operatorList, insertTemplateAt, getTemplateItem } from './
 import SelectList from '../../dialog/select-list';
 import arrow from './arrow.svg';
 import { useStore, Provider } from '../../../hooks/use-provider';
+import ItemName from '../../modules/components/item-name';
 var FormulaList = forwardRef(function (props, ref) {
   var value = props.value,
     data = props.data,
@@ -156,7 +157,7 @@ var FormulaList = forwardRef(function (props, ref) {
           showSubquery: false,
           toolbar: _toolbar,
           btnText: __('SqlQueryBuilder.confirm'),
-          value: _value,
+          value: cloneDeep(_value),
           onOk: function onOk(newList) {
             try {
               // 子查询未改变不做操作
@@ -250,23 +251,26 @@ var FormulaList = forwardRef(function (props, ref) {
       }, index);
     } else if (type === AtomsTypeEnum.FIELD) {
       // 字段
-      return _jsxs("div", {
-        className: cx("Sqb-TableName ", {
-          notSelected: !(v !== null && v !== void 0 && v.fieldName)
-        }),
-        onClick: function onClick(e) {
-          return handleField(e, index, v);
-        },
-        children: [!(v !== null && v !== void 0 && v.fieldName) && __('customColumn.selectField'), v.fieldName, _jsx("span", {
-          style: {
-            fontSize: 0
-          },
+      return _jsx(ItemName, {
+        isError: isError(v, data),
+        children: _jsxs("div", {
+          className: cx("Sqb-TableName ", {
+            notSelected: !(v !== null && v !== void 0 && v.fieldName)
+          }),
           onClick: function onClick(e) {
-            return handleDel(e, index);
+            return handleField(e, index, v);
           },
-          children: _jsx(CloseIcon, {})
-        })]
-      });
+          children: [!(v !== null && v !== void 0 && v.fieldName) && __('customColumn.selectField'), v.fieldName, _jsx("span", {
+            style: {
+              fontSize: 0
+            },
+            onClick: function onClick(e) {
+              return handleDel(e, index);
+            },
+            children: _jsx(CloseIcon, {})
+          })]
+        })
+      }, index);
     } else if (type === AtomsTypeEnum.INPUT_STRING) {
       // 输入框
       return _jsxs("div", {
@@ -365,39 +369,45 @@ var FormulaList = forwardRef(function (props, ref) {
       }, index);
     } else if (type === AtomsTypeEnum.EXPRESSION) {
       // 表达式
-      return _jsxs("div", {
-        className: cx("Sqb-TableName purple-name", {
-          notSelected: !v.quotes
-        }),
-        onClick: function onClick(e) {
-          return handleExpression(e, index, v);
-        },
-        children: [v.quotes ? v.quotes : __('customColumn.selectExpression'), _jsx("span", {
-          style: {
-            fontSize: 0
-          },
+      return _jsx(ItemName, {
+        isError: isError(v, data),
+        children: _jsxs("div", {
+          className: cx("Sqb-TableName purple-name", {
+            notSelected: !v.quotes
+          }),
           onClick: function onClick(e) {
-            return handleDel(e, index);
+            return handleExpression(e, index, v);
           },
-          children: _jsx(CloseIcon, {})
-        })]
-      });
+          children: [v.quotes ? v.quotes : __('customColumn.selectExpression'), _jsx("span", {
+            style: {
+              fontSize: 0
+            },
+            onClick: function onClick(e) {
+              return handleDel(e, index);
+            },
+            children: _jsx(CloseIcon, {})
+          })]
+        })
+      }, index);
     } else if (type === AtomsTypeEnum.FORMULA) {
       // 公式
-      return _jsxs("div", {
-        className: "Sqb-TableName gray-name",
-        onClick: function onClick(e) {
-          return showFunction(e, index);
-        },
-        children: [v.quotes ? v.quotes : __('customColumn.selectFormula'), _jsx("span", {
-          style: {
-            fontSize: 0
-          },
+      return _jsx(ItemName, {
+        isError: isError(v, data),
+        children: _jsxs("div", {
+          className: cx("Sqb-TableName gray-name"),
           onClick: function onClick(e) {
-            return handleDel(e, index);
+            return showFunction(e, index);
           },
-          children: _jsx(CloseIcon, {})
-        })]
+          children: [v.quotes ? v.quotes : __('customColumn.selectFormula'), _jsx("span", {
+            style: {
+              fontSize: 0
+            },
+            onClick: function onClick(e) {
+              return handleDel(e, index);
+            },
+            children: _jsx(CloseIcon, {})
+          })]
+        })
       }, index);
     } else {
       return _jsx(Select, {

package/lib/es/components/dialog/select-column/index.js

@@ -97,16 +97,16 @@ var SelectColumn = function SelectColumn(_ref) {
       onOk: function () {
         var _onOk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
           var newColumns, newMetaList;
-          return _regeneratorRuntime.wrap(function _callee$(_context) {
+          return _regeneratorRuntime.wrap(function (_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
                 if (isValidSQLAlias(fieldAlias)) {
-                  _context.next = 3;
+                  _context.next = 1;
                   break;
                 }
                 Toast.warning(__('SqlQueryBuilder.aliasForRules'));
                 return _context.abrupt("return", false);
-              case 3:
+              case 1:
                 newColumns = cloneDeep(columns);
                 newMetaList = store.metaList[groupIndex].list.slice();
                 newColumns[i].fieldAlias = fieldAlias;
@@ -117,7 +117,7 @@ var SelectColumn = function SelectColumn(_ref) {
                 setTimeout(function () {
                   store.setClosable(true);
                 }, 0);
-              case 11:
+              case 2:
               case "end":
                 return _context.stop();
             }

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

@@ -40,7 +40,6 @@ var IconMap = {
 };
 var OPEN_GROUP = false; // mr.chen 说不弄这块 弄个开关防止后面要用
 var SelectJoinColumn = function SelectJoinColumn(_ref) {
-  var _value$;
   var _ref$data = _ref.data,
     data = _ref$data === void 0 ? [] : _ref$data,
     _value = _ref.value,
@@ -62,7 +61,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     value = _useState2[0],
     setValue = _useState2[1]; // 当前选择的字段
-  var _useState3 = useState(_value === null || _value === void 0 || (_value$ = _value[0]) === null || _value$ === void 0 ? void 0 : _value$.tableUuid),
+  var _useState3 = useState(''),
     _useState4 = _slicedToArray(_useState3, 2),
     curTable = _useState4[0],
     setCurTable = _useState4[1]; // 当前选择的表
@@ -78,16 +77,28 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     tableList = _useState6[0],
     setTableList = _useState6[1];
-  // useEffect(() => {
-  //   setCurTable(tableInfo);
-  // }, [tableInfo]);
+  useEffect(function () {
+    var _value$, _value$2;
+    var tableUuid = _value === null || _value === void 0 || (_value$ = _value[0]) === null || _value$ === void 0 ? void 0 : _value$.tableUuid;
+    if ((_value === null || _value === void 0 || (_value$2 = _value[0]) === null || _value$2 === void 0 ? void 0 : _value$2.tableId) === SummarizeAlias) {
+      tableUuid = '';
+    } else {
+      var isHas = data.filter(function (v) {
+        return v.tableUuid === tableUuid;
+      });
+      if (isHas.length < 1) {
+        tableUuid = data[0].tableUuid;
+      }
+    }
+    setCurTable(tableUuid);
+  }, [data, _value]);
   useEffect(function () {
     // setCurColumn(_value);
     setValue(_value);
   }, [_value]);
-  var isActive = function isActive(fieldUuid) {
+  var isActive = function isActive(id) {
     return (value === null || value === void 0 ? void 0 : value.filter(function (v) {
-      return v.fieldUuid === fieldUuid;
+      return v.fieldId === id;
     }).length) > 0;
   };
   useEffect(function () {
@@ -133,7 +144,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
       return;
     }
     var isHas = (value === null || value === void 0 || (_value$filter = value.filter(function (v) {
-      return v.fieldUuid === (val === null || val === void 0 ? void 0 : val.fieldUuid);
+      return v.fieldId === (val === null || val === void 0 ? void 0 : val.fieldId);
     })) === null || _value$filter === void 0 ? void 0 : _value$filter.length) > 0;
     var _value = value;
     if (tableUuid != curTable) {
@@ -143,7 +154,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
       _value.push(val);
     } else {
       _value = _value.filter(function (v) {
-        return v.fieldUuid != (val === null || val === void 0 ? void 0 : val.fieldUuid);
+        return v.fieldId != (val === null || val === void 0 ? void 0 : val.fieldId);
       });
     }
     setValue(_value);
@@ -263,7 +274,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                   className: cx("Sqb-List-section"),
                   children: _jsx("div", {
                     className: cx("Sqb-List-item mx-2", {
-                      active: isActive(v.fieldUuid)
+                      active: isActive(v.id)
                     }),
                     onClick: function onClick() {
                       if (isSummarize) {

package/lib/es/components/dialog/select-join-column/index.js

@@ -74,12 +74,19 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     setTableList = _useState8[1];
   useEffect(function () {
     setValue(_value);
-    setCurTable(_value.tableUuid);
     setCurColumn(_value.name);
   }, [_value]);
   useEffect(function () {
+    var tableUuid = _value === null || _value === void 0 ? void 0 : _value.tableUuid;
+    var isHas = data.filter(function (v) {
+      return v.tableUuid === tableUuid;
+    });
+    if (isHas.length < 1) {
+      tableUuid = data[0].tableUuid;
+    }
+    setCurTable(tableUuid);
     setTableList(data.map(function (v, i) {
-      var open = !i && !_value.tableUuid ? true : v.tableUuid === _value.tableUuid; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
+      var open = !i && !tableUuid ? true : v.tableUuid === tableUuid; // TODO.这里只判断表名相等 没有用了 因为表上面加了一层数据源 先这样吧
       return _objectSpread(_objectSpread({}, v), {}, {
         open: open,
         searchText: '',
@@ -232,6 +239,8 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                       return onGroup(_objectSpread(_objectSpread(_objectSpread({}, _value), {}, {
                         tableUuid: tableUuid || _value.tableUuid
                       }, v), {}, {
+                        datasourceId: datasourceId,
+                        datasourceName: datasourceName,
                         table: table,
                         tableId: tableId,
                         alias: tableAlias,
@@ -303,6 +312,8 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                           return onGroup(_objectSpread(_objectSpread(_objectSpread({}, _value), {}, {
                             tableUuid: tableUuid || _value.tableUuid
                           }, v), {}, {
+                            datasourceId: datasourceId,
+                            datasourceName: datasourceName,
                             table: table,
                             tableId: tableId,
                             alias: tableAlias,

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

@@ -51,12 +51,12 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
                 }), _jsx("div", {
                   children: _jsxs("h4", {
                     className: 'List-item-title ml-2',
-                    children: [v.datasourceName ? "".concat(v.datasourceName, ".") : '', v.name === 'source' ? PrevResult : v.name]
+                    children: [v.datasourceName ? "".concat(v.datasourceName, ".") : '', v.name === 'source' ? PrevResult : v.alias || v.name]
                   })
                 })]
               })
             })
-          }, v.name);
+          }, v.alias || v.name);
         })
       })
     })