@gingkoo/pandora-metabase 1.0.27 → 1.0.29

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

@@ -15,8 +15,7 @@ var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _classnames = _interopRequireDefault(require("classnames"));
 var _winsize = require("../../hooks/winsize");
 var _templateObject;
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var StyledSashHorizontal = _styledComponents["default"].div.attrs({
   className: 'view-sash horizontal'
 })(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2["default"])(["\n  top: ", ";\n"])), function (props) {
@@ -61,17 +60,17 @@ var SplitView = _react["default"].forwardRef(function (props, ref) {
     hMaximum = _useState8[0],
     setHMaximum = _useState8[1];
   var _useState9 = (0, _react.useState)(false),
-    _useState10 = (0, _slicedToArray2["default"])(_useState9, 2),
-    vMinimum = _useState10[0],
-    setVMinimum = _useState10[1];
-  var _useState11 = (0, _react.useState)(false),
+    _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
+    vMinimum = _useState0[0],
+    setVMinimum = _useState0[1];
+  var _useState1 = (0, _react.useState)(false),
+    _useState10 = (0, _slicedToArray2["default"])(_useState1, 2),
+    vMaximum = _useState10[0],
+    setVMaximum = _useState10[1];
+  var _useState11 = (0, _react.useState)(0),
     _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
-    vMaximum = _useState12[0],
-    setVMaximum = _useState12[1];
-  var _useState13 = (0, _react.useState)(0),
-    _useState14 = (0, _slicedToArray2["default"])(_useState13, 2),
-    bottomHeight = _useState14[0],
-    setBottomHeight = _useState14[1];
+    bottomHeight = _useState12[0],
+    setBottomHeight = _useState12[1];
   _react["default"].useImperativeHandle(ref, function () {
     return {
       open: function open() {

package/lib/cjs/components/dialog/custom-column/expression-editor.js

@@ -18,8 +18,7 @@ var _popup = _interopRequireDefault(require("../../popup"));
 var _selectList = _interopRequireDefault(require("./dialog/select-list"));
 var _functionTip = _interopRequireDefault(require("./dialog/function-tip"));
 var _useProvider = require("../../../hooks/use-provider");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var ErrorMessage = function ErrorMessage(_ref) {
   var msg = _ref.msg;
   if (!msg) return null;

package/lib/cjs/components/dialog/custom-column/tokenizedI-input.js

@@ -20,8 +20,7 @@ var _reactDom = _interopRequireDefault(require("react-dom"));
 var _server = _interopRequireDefault(require("react-dom/server"));
 var _selection = require("../../../utils/selection");
 var _tokenizedExpression = _interopRequireDefault(require("./tokenized-expression"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2["default"])(o), (0, _possibleConstructorReturn2["default"])(t, (0, _isNativeReflectConstruct2["default"])() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2["default"])(t).constructor) : o.apply(t, e)); }
 var TokenizedInput = /*#__PURE__*/function (_React$Component) {
   function TokenizedInput() {

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

@@ -25,8 +25,7 @@ var _selectColumnMultiple = _interopRequireDefault(require("../select-column-mul
 var _icons = require("../../icons");
 var _useProvider = require("../../../hooks/use-provider");
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 /**
  * 关联模块 选择表字段
  */
@@ -89,18 +88,18 @@ var SelectFilterColumn = function SelectFilterColumn(_ref) {
     special_type = _useState8[0],
     setSpecial_type = _useState8[1];
   var _useState9 = (0, _react.useState)(value.formula || {}),
-    _useState10 = (0, _slicedToArray2["default"])(_useState9, 2),
-    formula = _useState10[0],
-    setFormula = _useState10[1];
+    _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
+    formula = _useState0[0],
+    setFormula = _useState0[1];
   var store = (0, _useProvider.useStore)();
-  var _useState11 = (0, _react.useState)(false),
+  var _useState1 = (0, _react.useState)(false),
+    _useState10 = (0, _slicedToArray2["default"])(_useState1, 2),
+    popupVisible = _useState10[0],
+    setPopupVisible = _useState10[1];
+  var _useState11 = (0, _react.useState)((value === null || value === void 0 || (_value$lhs = value.lhs) === null || _value$lhs === void 0 ? void 0 : _value$lhs.length) > 0 || false),
     _useState12 = (0, _slicedToArray2["default"])(_useState11, 2),
-    popupVisible = _useState12[0],
-    setPopupVisible = _useState12[1];
-  var _useState13 = (0, _react.useState)((value === null || value === void 0 || (_value$lhs = value.lhs) === null || _value$lhs === void 0 ? void 0 : _value$lhs.length) > 0 || false),
-    _useState14 = (0, _slicedToArray2["default"])(_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 = (0, _react.useMemo)(function () {
     if (!condition) return true;

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

@@ -27,6 +27,7 @@ var _utils2 = require("./utils");
 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 FormulaList = (0, _react.forwardRef)(function (props, ref) {
   var value = props.value,
@@ -162,7 +163,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
           showSubquery: false,
           toolbar: _toolbar,
           btnText: (0, _locale.__)('SqlQueryBuilder.confirm'),
-          value: _value,
+          value: (0, _cloneDeep["default"])(_value),
           onOk: function onOk(newList) {
             try {
               // 子查询未改变不做操作
@@ -256,23 +257,26 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
       }, index);
     } else if (type === _types.AtomsTypeEnum.FIELD) {
       // 字段
-      return (0, _jsxRuntime.jsxs)("div", {
-        className: (0, _classnames["default"])("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) && (0, _locale.__)('customColumn.selectField'), v.fieldName, (0, _jsxRuntime.jsx)("span", {
-          style: {
-            fontSize: 0
-          },
+      return (0, _jsxRuntime.jsx)(_itemName["default"], {
+        isError: (0, _utils.isError)(v, data),
+        children: (0, _jsxRuntime.jsxs)("div", {
+          className: (0, _classnames["default"])("Sqb-TableName ", {
+            notSelected: !(v !== null && v !== void 0 && v.fieldName)
+          }),
           onClick: function onClick(e) {
-            return handleDel(e, index);
+            return handleField(e, index, v);
           },
-          children: (0, _jsxRuntime.jsx)(_icons.CloseIcon, {})
-        })]
-      });
+          children: [!(v !== null && v !== void 0 && v.fieldName) && (0, _locale.__)('customColumn.selectField'), v.fieldName, (0, _jsxRuntime.jsx)("span", {
+            style: {
+              fontSize: 0
+            },
+            onClick: function onClick(e) {
+              return handleDel(e, index);
+            },
+            children: (0, _jsxRuntime.jsx)(_icons.CloseIcon, {})
+          })]
+        })
+      }, index);
     } else if (type === _types.AtomsTypeEnum.INPUT_STRING) {
       // 输入框
       return (0, _jsxRuntime.jsxs)("div", {
@@ -371,39 +375,45 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
       }, index);
     } else if (type === _types.AtomsTypeEnum.EXPRESSION) {
       // 表达式
-      return (0, _jsxRuntime.jsxs)("div", {
-        className: (0, _classnames["default"])("Sqb-TableName purple-name", {
-          notSelected: !v.quotes
-        }),
-        onClick: function onClick(e) {
-          return handleExpression(e, index, v);
-        },
-        children: [v.quotes ? v.quotes : (0, _locale.__)('customColumn.selectExpression'), (0, _jsxRuntime.jsx)("span", {
-          style: {
-            fontSize: 0
-          },
+      return (0, _jsxRuntime.jsx)(_itemName["default"], {
+        isError: (0, _utils.isError)(v, data),
+        children: (0, _jsxRuntime.jsxs)("div", {
+          className: (0, _classnames["default"])("Sqb-TableName purple-name", {
+            notSelected: !v.quotes
+          }),
           onClick: function onClick(e) {
-            return handleDel(e, index);
+            return handleExpression(e, index, v);
           },
-          children: (0, _jsxRuntime.jsx)(_icons.CloseIcon, {})
-        })]
-      });
+          children: [v.quotes ? v.quotes : (0, _locale.__)('customColumn.selectExpression'), (0, _jsxRuntime.jsx)("span", {
+            style: {
+              fontSize: 0
+            },
+            onClick: function onClick(e) {
+              return handleDel(e, index);
+            },
+            children: (0, _jsxRuntime.jsx)(_icons.CloseIcon, {})
+          })]
+        })
+      }, index);
     } else if (type === _types.AtomsTypeEnum.FORMULA) {
       // 公式
-      return (0, _jsxRuntime.jsxs)("div", {
-        className: "Sqb-TableName gray-name",
-        onClick: function onClick(e) {
-          return showFunction(e, index);
-        },
-        children: [v.quotes ? v.quotes : (0, _locale.__)('customColumn.selectFormula'), (0, _jsxRuntime.jsx)("span", {
-          style: {
-            fontSize: 0
-          },
+      return (0, _jsxRuntime.jsx)(_itemName["default"], {
+        isError: (0, _utils.isError)(v, data),
+        children: (0, _jsxRuntime.jsxs)("div", {
+          className: (0, _classnames["default"])("Sqb-TableName gray-name"),
           onClick: function onClick(e) {
-            return handleDel(e, index);
+            return showFunction(e, index);
           },
-          children: (0, _jsxRuntime.jsx)(_icons.CloseIcon, {})
-        })]
+          children: [v.quotes ? v.quotes : (0, _locale.__)('customColumn.selectFormula'), (0, _jsxRuntime.jsx)("span", {
+            style: {
+              fontSize: 0
+            },
+            onClick: function onClick(e) {
+              return handleDel(e, index);
+            },
+            children: (0, _jsxRuntime.jsx)(_icons.CloseIcon, {})
+          })]
+        })
       }, index);
     } else {
       return (0, _jsxRuntime.jsx)(_pandora.Select, {

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

@@ -13,7 +13,7 @@ Object.defineProperty(exports, "CustomColumnPopup", {
 Object.defineProperty(exports, "Expression", {
   enumerable: true,
   get: function get() {
-    return _index10["default"];
+    return _index0["default"];
   }
 });
 Object.defineProperty(exports, "FormulaList", {
@@ -79,5 +79,5 @@ var _index6 = _interopRequireDefault(require("./select-join/index"));
 var _index7 = _interopRequireDefault(require("./select-table/index"));
 var _index8 = _interopRequireDefault(require("./select-permission-table/index"));
 var _index9 = _interopRequireDefault(require("./formula-list/index"));
-var _index10 = _interopRequireDefault(require("./expression/index"));
+var _index0 = _interopRequireDefault(require("./expression/index"));
 var _utils = require("./formula-list/utils");

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

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

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

@@ -46,7 +46,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,
@@ -68,7 +67,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     value = _useState2[0],
     setValue = _useState2[1]; // 当前选择的字段
-  var _useState3 = (0, _react.useState)(_value === null || _value === void 0 || (_value$ = _value[0]) === null || _value$ === void 0 ? void 0 : _value$.tableUuid),
+  var _useState3 = (0, _react.useState)(''),
     _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
     curTable = _useState4[0],
     setCurTable = _useState4[1]; // 当前选择的表
@@ -84,16 +83,28 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
     tableList = _useState6[0],
     setTableList = _useState6[1];
-  // useEffect(() => {
-  //   setCurTable(tableInfo);
-  // }, [tableInfo]);
+  (0, _react.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) === _helper.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]);
   (0, _react.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;
   };
   (0, _react.useEffect)(function () {
@@ -139,7 +150,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) {
@@ -149,7 +160,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);
@@ -269,7 +280,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.fieldUuid)
+                      active: isActive(v.id)
                     }),
                     onClick: function onClick() {
                       if (isSummarize) {

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

@@ -82,12 +82,19 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
     setTableList = _useState8[1];
   (0, _react.useEffect)(function () {
     setValue(_value);
-    setCurTable(_value.tableUuid);
     setCurColumn(_value.name);
   }, [_value]);
   (0, _react.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 (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
         open: open,
         searchText: '',
@@ -240,6 +247,8 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                       return onGroup((0, _objectSpread2["default"])((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _value), {}, {
                         tableUuid: tableUuid || _value.tableUuid
                       }, v), {}, {
+                        datasourceId: datasourceId,
+                        datasourceName: datasourceName,
                         table: table,
                         tableId: tableId,
                         alias: tableAlias,
@@ -311,6 +320,8 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                           return onGroup((0, _objectSpread2["default"])((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _value), {}, {
                             tableUuid: tableUuid || _value.tableUuid
                           }, v), {}, {
+                            datasourceId: datasourceId,
+                            datasourceName: datasourceName,
                             table: table,
                             tableId: tableId,
                             alias: tableAlias,

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

@@ -59,12 +59,12 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
                 }), (0, _jsxRuntime.jsx)("div", {
                   children: (0, _jsxRuntime.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);
         })
       })
     })

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

@@ -50,9 +50,9 @@ var SelectTable = function SelectTable(_ref) {
     originList = _useState8[0],
     setOriginList = _useState8[1];
   var _useState9 = (0, _react.useState)(value),
-    _useState10 = (0, _slicedToArray2["default"])(_useState9, 2),
-    val = _useState10[0],
-    setVal = _useState10[1];
+    _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
+    val = _useState0[0],
+    setVal = _useState0[1];
   (0, _react.useEffect)(function () {
     if (value.datasourceId) {
       getTables(value.datasourceId);
@@ -64,18 +64,18 @@ var SelectTable = function SelectTable(_ref) {
   function _getTables() {
     _getTables = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(datasourceId) {
       var tables;
-      return _regenerator["default"].wrap(function _callee$(_context) {
+      return _regenerator["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             setLoading(true);
-            _context.next = 3;
+            _context.next = 1;
             return store.fetchDataset(datasourceId);
-          case 3:
+          case 1:
             tables = _context.sent;
             setLoading(false);
             setList(tables);
             setOriginList(tables);
-          case 7:
+          case 2:
           case "end":
             return _context.stop();
         }

package/lib/cjs/components/icons.js

@@ -176,12 +176,12 @@ var LeftJoinIcon = exports.LeftJoinIcon = function LeftJoinIcon(_ref9) {
     })
   });
 };
-var InnerJoinIcon = exports.InnerJoinIcon = function InnerJoinIcon(_ref10) {
-  var _ref10$width = _ref10.width,
-    width = _ref10$width === void 0 ? 32 : _ref10$width,
-    _ref10$height = _ref10.height,
-    height = _ref10$height === void 0 ? 32 : _ref10$height,
-    style = _ref10.style;
+var InnerJoinIcon = exports.InnerJoinIcon = function InnerJoinIcon(_ref0) {
+  var _ref0$width = _ref0.width,
+    width = _ref0$width === void 0 ? 32 : _ref0$width,
+    _ref0$height = _ref0.height,
+    height = _ref0$height === void 0 ? 32 : _ref0$height,
+    style = _ref0.style;
   return (0, _jsxRuntime.jsx)("svg", {
     viewBox: '0 0 32 32',
     width: width,
@@ -195,11 +195,11 @@ var InnerJoinIcon = exports.InnerJoinIcon = function InnerJoinIcon(_ref10) {
     })
   });
 };
-var UpArrowIcon = exports.UpArrowIcon = function UpArrowIcon(_ref11) {
-  var _ref11$width = _ref11.width,
-    width = _ref11$width === void 0 ? 16 : _ref11$width,
-    _ref11$height = _ref11.height,
-    height = _ref11$height === void 0 ? 17 : _ref11$height;
+var UpArrowIcon = exports.UpArrowIcon = function UpArrowIcon(_ref1) {
+  var _ref1$width = _ref1.width,
+    width = _ref1$width === void 0 ? 16 : _ref1$width,
+    _ref1$height = _ref1.height,
+    height = _ref1$height === void 0 ? 17 : _ref1$height;
   return (0, _jsxRuntime.jsx)("svg", {
     className: 'sort-arrow',
     viewBox: '0 0 32 34',
@@ -213,11 +213,11 @@ var UpArrowIcon = exports.UpArrowIcon = function UpArrowIcon(_ref11) {
     })
   });
 };
-var DownArrowIcon = exports.DownArrowIcon = function DownArrowIcon(_ref12) {
-  var _ref12$width = _ref12.width,
-    width = _ref12$width === void 0 ? 16 : _ref12$width,
-    _ref12$height = _ref12.height,
-    height = _ref12$height === void 0 ? 17 : _ref12$height;
+var DownArrowIcon = exports.DownArrowIcon = function DownArrowIcon(_ref10) {
+  var _ref10$width = _ref10.width,
+    width = _ref10$width === void 0 ? 16 : _ref10$width,
+    _ref10$height = _ref10.height,
+    height = _ref10$height === void 0 ? 17 : _ref10$height;
   return (0, _jsxRuntime.jsx)("svg", {
     className: 'sort-arrow',
     viewBox: '0 0 32 34',
@@ -231,11 +231,11 @@ var DownArrowIcon = exports.DownArrowIcon = function DownArrowIcon(_ref12) {
     })
   });
 };
-var CloseIcon = exports.CloseIcon = function CloseIcon(_ref13) {
-  var _ref13$width = _ref13.width,
-    width = _ref13$width === void 0 ? 16 : _ref13$width,
-    _ref13$height = _ref13.height,
-    height = _ref13$height === void 0 ? 16 : _ref13$height;
+var CloseIcon = exports.CloseIcon = function CloseIcon(_ref11) {
+  var _ref11$width = _ref11.width,
+    width = _ref11$width === void 0 ? 16 : _ref11$width,
+    _ref11$height = _ref11.height,
+    height = _ref11$height === void 0 ? 16 : _ref11$height;
   return (0, _jsxRuntime.jsx)("svg", {
     className: 'closeIcon',
     viewBox: '0 0 32 32',
@@ -249,11 +249,11 @@ var CloseIcon = exports.CloseIcon = function CloseIcon(_ref13) {
     })
   });
 };
-var AddIcon = exports.AddIcon = function AddIcon(_ref14) {
-  var _ref14$width = _ref14.width,
-    width = _ref14$width === void 0 ? 16 : _ref14$width,
-    _ref14$height = _ref14.height,
-    height = _ref14$height === void 0 ? 16 : _ref14$height;
+var AddIcon = exports.AddIcon = function AddIcon(_ref12) {
+  var _ref12$width = _ref12.width,
+    width = _ref12$width === void 0 ? 16 : _ref12$width,
+    _ref12$height = _ref12.height,
+    height = _ref12$height === void 0 ? 16 : _ref12$height;
   return (0, _jsxRuntime.jsx)("svg", {
     viewBox: '0 0 32 32',
     width: width,
@@ -266,11 +266,11 @@ var AddIcon = exports.AddIcon = function AddIcon(_ref14) {
     })
   });
 };
-var TableIcon = exports.TableIcon = function TableIcon(_ref15) {
-  var _ref15$width = _ref15.width,
-    width = _ref15$width === void 0 ? 18 : _ref15$width,
-    _ref15$height = _ref15.height,
-    height = _ref15$height === void 0 ? 18 : _ref15$height;
+var TableIcon = exports.TableIcon = function TableIcon(_ref13) {
+  var _ref13$width = _ref13.width,
+    width = _ref13$width === void 0 ? 18 : _ref13$width,
+    _ref13$height = _ref13.height,
+    height = _ref13$height === void 0 ? 18 : _ref13$height;
   return (0, _jsxRuntime.jsx)("svg", {
     viewBox: '0 0 32 32',
     width: width,
@@ -283,11 +283,11 @@ var TableIcon = exports.TableIcon = function TableIcon(_ref15) {
     })
   });
 };
-var SearchIcon = exports.SearchIcon = function SearchIcon(_ref16) {
-  var _ref16$width = _ref16.width,
-    width = _ref16$width === void 0 ? 16 : _ref16$width,
-    _ref16$height = _ref16.height,
-    height = _ref16$height === void 0 ? 16 : _ref16$height;
+var SearchIcon = exports.SearchIcon = function SearchIcon(_ref14) {
+  var _ref14$width = _ref14.width,
+    width = _ref14$width === void 0 ? 16 : _ref14$width,
+    _ref14$height = _ref14.height,
+    height = _ref14$height === void 0 ? 16 : _ref14$height;
   return (0, _jsxRuntime.jsx)("svg", {
     viewBox: '0 0 32 32',
     width: width,