@gingkoo/pandora-metabase 1.0.61 → 1.0.63

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

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = exports.SummarizeAlias = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 var _react = require("react");
@@ -146,6 +146,14 @@ var useStore = function useStore() {
     _useState44 = (0, _slicedToArray2["default"])(_useState43, 2),
     isSelectFields = _useState44[0],
     setIsSelectFields = _useState44[1]; // 是否默认勾选字段
+  var _useState45 = (0, _react.useState)(false),
+    _useState46 = (0, _slicedToArray2["default"])(_useState45, 2),
+    tableFlat = _useState46[0],
+    setTableFlat = _useState46[1]; // 是否平铺数据表
+  var _useState47 = (0, _react.useState)([]),
+    _useState48 = (0, _slicedToArray2["default"])(_useState47, 2),
+    sourceTable = _useState48[0],
+    setSourceTable = _useState48[1];
   // 外层ref
   var popupContainer = (0, _react.useRef)();
   // const [fetchDatasetFn, setFetchDatasetFn] = useState<(id: string) => Promise<any>>(
@@ -191,6 +199,55 @@ var useStore = function useStore() {
       };
     });
   }, [metaList]);
+  (0, _react.useEffect)(function () {
+    if (tableFlat) {
+      getSourceTable(sourceList);
+    }
+  }, [sourceList, isExit, tableFlat]);
+  // 获取所有数据表
+  var getSourceTable = /*#__PURE__*/function () {
+    var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(source) {
+      var results;
+      return _regenerator["default"].wrap(function (_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 1;
+            return Promise.all(source.map(/*#__PURE__*/function () {
+              var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(v) {
+                var tables;
+                return _regenerator["default"].wrap(function (_context) {
+                  while (1) switch (_context.prev = _context.next) {
+                    case 0:
+                      _context.next = 1;
+                      return fetchDataset(v.datasourceId);
+                    case 1:
+                      tables = _context.sent;
+                      return _context.abrupt("return", (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
+                        children: tables
+                      }));
+                    case 2:
+                    case "end":
+                      return _context.stop();
+                  }
+                }, _callee);
+              }));
+              return function (_x2) {
+                return _ref2.apply(this, arguments);
+              };
+            }()));
+          case 1:
+            results = _context2.sent;
+            setSourceTable(results || []);
+          case 2:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function getSourceTable(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
   // const showMainColumn = useMemo(() => {
   //   let summarizeList = metaList.filter((v) => v.type === TypeEnum.summarize);
   //   if (
@@ -207,41 +264,41 @@ var useStore = function useStore() {
     return !!~toolbar.indexOf(name);
   };
   var fetchDataset = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(datasourceId) {
+    var _ref3 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(datasourceId) {
       var tables, _tables;
-      return _regenerator["default"].wrap(function (_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regenerator["default"].wrap(function (_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
             tables = getDataset(datasourceId);
             if (!tables.length) {
-              _context.next = 1;
+              _context3.next = 1;
               break;
             }
-            return _context.abrupt("return", tables);
+            return _context3.abrupt("return", tables);
           case 1:
-            _context.next = 2;
+            _context3.next = 2;
             return fetchDatasetFn.current(datasourceId, {
               isExit: isExit
             });
           case 2:
-            _tables = _context.sent;
+            _tables = _context3.sent;
             setDataset(datasourceId, _tables);
-            return _context.abrupt("return", _tables);
+            return _context3.abrupt("return", _tables);
           case 3:
           case "end":
-            return _context.stop();
+            return _context3.stop();
         }
-      }, _callee);
+      }, _callee3);
     }));
-    return function fetchDataset(_x) {
-      return _ref.apply(this, arguments);
+    return function fetchDataset(_x3) {
+      return _ref3.apply(this, arguments);
     };
   }();
   // 根据数据源id查询集合列表
   //  fetchDataset():
   // 查询表字段
   var fetchColumns = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee2(table, datasourceId) {
+    var _ref4 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4(table, datasourceId) {
       var _columns2;
       var oldColumns,
         callback,
@@ -257,13 +314,13 @@ var useStore = function useStore() {
         tableName,
         columns,
         _columns,
-        _args2 = arguments;
-      return _regenerator["default"].wrap(function (_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+        _args4 = arguments;
+      return _regenerator["default"].wrap(function (_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            oldColumns = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : [];
-            callback = _args2.length > 3 ? _args2[3] : undefined;
-            isSelect = _args2.length > 4 && _args2[4] !== undefined ? _args2[4] : isSelectFields;
+            oldColumns = _args4.length > 2 && _args4[2] !== undefined ? _args4[2] : [];
+            callback = _args4.length > 3 ? _args4[3] : undefined;
+            isSelect = _args4.length > 4 && _args4[4] !== undefined ? _args4[4] : isSelectFields;
             // 获取之前选中的数据
             oldObj = {};
             selectId = oldColumns.filter(function (v) {
@@ -278,15 +335,15 @@ var useStore = function useStore() {
             tableName = table.name;
             columns = getColumns(tableName);
             if (columns.length) {
-              _context2.next = 2;
+              _context4.next = 2;
               break;
             }
-            _context2.next = 1;
+            _context4.next = 1;
             return fetchColumnsFn.current(extra, datasourceId, {
               isExit: isExit
             });
           case 1:
-            columns = _context2.sent;
+            columns = _context4.sent;
             setColumns(tableName, columns);
           case 2:
             _columns = (_columns2 = columns) === null || _columns2 === void 0 ? void 0 : _columns2.map(function (v) {
@@ -301,26 +358,26 @@ var useStore = function useStore() {
             typeof callback === 'function' && callback(_columns);
           case 3:
           case "end":
-            return _context2.stop();
+            return _context4.stop();
         }
-      }, _callee2);
+      }, _callee4);
     }));
-    return function fetchColumns(_x2, _x3) {
-      return _ref2.apply(this, arguments);
+    return function fetchColumns(_x4, _x5) {
+      return _ref4.apply(this, arguments);
     };
   }();
   var setMeta = /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee3(curData, groupInd) {
+    var _ref5 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee5(curData, groupInd) {
       var changeObj,
         _metaList,
         newMeta,
         isChange,
-        _args3 = arguments;
-      return _regenerator["default"].wrap(function (_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+        _args5 = arguments;
+      return _regenerator["default"].wrap(function (_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            changeObj = _args3.length > 2 && _args3[2] !== undefined ? _args3[2] : {};
-            _metaList = _args3.length > 3 && _args3[3] !== undefined ? _args3[3] : metaList;
+            changeObj = _args5.length > 2 && _args5[2] !== undefined ? _args5[2] : {};
+            _metaList = _args5.length > 3 && _args5[3] !== undefined ? _args5[3] : metaList;
             newMeta = (0, _cloneDeep["default"])(_metaList);
             if (newMeta[groupInd]) {
               newMeta[groupInd].list = curData;
@@ -328,29 +385,29 @@ var useStore = function useStore() {
             }
             // 过滤掉初始化
             if (!(changeObj === 'init')) {
-              _context3.next = 1;
+              _context5.next = 1;
               break;
             }
-            return _context3.abrupt("return");
+            return _context5.abrupt("return");
           case 1:
-            _context3.next = 2;
+            _context5.next = 2;
             return fetchChangeFn.current((0, _utils.splitByUnion)(_metaList), changeObj, {
               isExit: isExit
             });
           case 2:
-            isChange = _context3.sent;
+            isChange = _context5.sent;
             // 是否还原
             if (isChange === false) {
               _setMeta(_metaList);
             }
           case 3:
           case "end":
-            return _context3.stop();
+            return _context5.stop();
         }
-      }, _callee3);
+      }, _callee5);
     }));
-    return function setMeta(_x4, _x5) {
-      return _ref3.apply(this, arguments);
+    return function setMeta(_x6, _x7) {
+      return _ref5.apply(this, arguments);
     };
   }();
   // 回显
@@ -676,7 +733,11 @@ var useStore = function useStore() {
     fieldEnableAlias: fieldEnableAlias,
     setFieldEnableAlias: setFieldEnableAlias,
     isSelectFields: isSelectFields,
-    setIsSelectFields: setIsSelectFields
+    setIsSelectFields: setIsSelectFields,
+    tableFlat: tableFlat,
+    setTableFlat: setTableFlat,
+    getSourceTable: getSourceTable,
+    sourceTable: sourceTable
   };
 };
 var _default = exports["default"] = useStore;

package/lib/cjs/index.js

@@ -63,7 +63,9 @@ var SqlVisionBuilder = _react["default"].forwardRef(function (props, ref) {
     _props$fieldEnableAli = props.fieldEnableAlias,
     fieldEnableAlias = _props$fieldEnableAli === void 0 ? true : _props$fieldEnableAli,
     _props$isSelectFields = props.isSelectFields,
-    isSelectFields = _props$isSelectFields === void 0 ? true : _props$isSelectFields;
+    isSelectFields = _props$isSelectFields === void 0 ? true : _props$isSelectFields,
+    _props$tableFlat = props.tableFlat,
+    tableFlat = _props$tableFlat === void 0 ? false : _props$tableFlat;
   var store = (0, _useState["default"])();
   (0, _react.useEffect)(function () {
     getTables && store.setFetchDatasetFn(getTables);
@@ -95,7 +97,8 @@ var SqlVisionBuilder = _react["default"].forwardRef(function (props, ref) {
     store.setTableEnableAlias(tableEnableAlias);
     store.setFieldEnableAlias(fieldEnableAlias);
     store.setIsSelectFields(isSelectFields);
-  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit, tableEnableAlias, fieldEnableAlias, isSelectFields]);
+    store.setTableFlat(tableFlat);
+  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit, tableEnableAlias, fieldEnableAlias, isSelectFields, tableFlat]);
   _react["default"].useImperativeHandle(ref, function () {
     return {
       // setDatasource: (list) => {

package/lib/cjs/types.d.ts

@@ -41,6 +41,7 @@ export interface MetabaseProps {
     tableEnableAlias?: boolean;
     fieldEnableAlias?: boolean;
     isSelectFields?: boolean;
+    tableFlat?: boolean;
     onChange?: (newData: MetaListType[], curData: {
         data: any;
         type: ChangeType;

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

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

package/lib/cjs/utils/helper.js

@@ -189,6 +189,6 @@ var getAlias = exports.getAlias = function getAlias() {
   var nextIndex = Math.max.apply(Math, (0, _toConsumableArray2["default"])(uniqueIndexes)) + 1;
   return "".concat(name, "_").concat(nextIndex);
 };
-var mergeNameAlias = exports.mergeNameAlias = function mergeNameAlias(name, alias) {
-  return name + (alias ? "\uFF08".concat(alias, "\uFF09") : '');
+var mergeNameAlias = exports.mergeNameAlias = function mergeNameAlias(name, alias, isEnable) {
+  return name + (alias && isEnable ? "\uFF08".concat(alias, "\uFF09") : '');
 };

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

@@ -24,6 +24,7 @@ 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 _caseList2;
   var value = props.value,
     data = props.data,
     exitData = props.exitData,
@@ -38,6 +39,10 @@ var FormulaList = forwardRef(function (props, ref) {
     showPreview = _props$showPreview === void 0 ? true : _props$showPreview,
     check = props.check;
   var caseList = value || [];
+  var _useState = useState(''),
+    _useState2 = _slicedToArray(_useState, 2),
+    filterVal = _useState2[0],
+    setFilterVal = _useState2[1];
   var setCaseList = function setCaseList(data) {
     var quotes = data.map(function (v, i) {
       if (v !== null && v !== void 0 && v.quotes) {
@@ -49,11 +54,12 @@ var FormulaList = forwardRef(function (props, ref) {
       }
     }).join(' ');
     onChange === null || onChange === void 0 || onChange(data, quotes);
+    caseList = data;
   };
-  var _useState = useState(-1),
-    _useState2 = _slicedToArray(_useState, 2),
-    ind = _useState2[0],
-    setInd = _useState2[1];
+  var _useState3 = useState(-1),
+    _useState4 = _slicedToArray(_useState3, 2),
+    ind = _useState4[0],
+    setInd = _useState4[1];
   var store = useStore();
   var filterCustomType = store.filterCustomType;
   function closePopup() {
@@ -61,6 +67,72 @@ var FormulaList = forwardRef(function (props, ref) {
       visible: false
     });
   }
+  // 连接符
+  var selectOperator = function selectOperator(props) {
+    var triggerElement = props.triggerElement,
+      ind = props.ind,
+      position = props.position,
+      _props$trigger = props.trigger,
+      trigger = _props$trigger === void 0 ? 'click' : _props$trigger;
+    var showOperatorList = operatorList.filter(function (v) {
+      return ~(v + (v || '')).toLocaleLowerCase().indexOf(filterVal.toLocaleLowerCase());
+    });
+    return _jsxs(Select, {
+      style: {
+        width: '100px'
+      },
+      showSearch: true,
+      trigger: trigger,
+      triggerProps: {
+        clickToClose: true
+      },
+      virtualListProps: {
+        threshold: null
+      },
+      triggerElement: triggerElement,
+      onChange: function onChange(val) {
+        if (filterVal) {
+          var curInd = addOperator(AtomsTypeEnum.OPERATOR, ind, position);
+          handleConstant(val, curInd);
+          setFilterVal('');
+        } else {
+          addOperator(val, ind, position);
+        }
+      },
+      onVisibleChange: function onVisibleChange(visible) {
+        if (visible) {
+          setFilterVal('');
+        }
+      },
+      value: '',
+      children: [_jsx(_Fragment, {
+        children: _jsx(Input, {
+          autoFocus: true,
+          className: ':Sqb-Operator-input',
+          style: {
+            margin: '5px auto',
+            width: "calc(100% - 10px)"
+          },
+          value: filterVal,
+          placeholder: __('SqlQueryBuilder.pleaseEnter'),
+          // size='large'
+          onChange: function onChange(val) {
+            setFilterVal(val);
+          }
+        })
+      }), filterVal ? showOperatorList.map(function (option, index) {
+        return _jsx(Select.Option, {
+          value: option,
+          children: option
+        }, index + '' + ind);
+      }) : _customTypes.map(function (option, index) {
+        return _jsx(Select.Option, {
+          value: option.value,
+          children: option.label
+        }, index + '' + ind);
+      })]
+    });
+  };
   // 字段
   function handleField(e, i, val) {
     store.setPopup({
@@ -121,18 +193,24 @@ var FormulaList = forwardRef(function (props, ref) {
   // 添加
   var addOperator = function addOperator(type, index, position) {
     var _caseList = caseList.slice() || [];
+    var _ind = index;
     var temItem = getTemplateItem(type);
     if (position === 'add') {
       _caseList.push(temItem);
+      _ind = index + 1;
     } else if (position === 'before') {
       _caseList.splice(index, 0, temItem);
+      _ind = index;
     } else if (position === 'after') {
       _caseList.splice(index + 1, 0, temItem);
+      _ind = index + 1;
     } else {
       //替换
       _caseList.splice(index, 1, temItem);
+      _ind = index;
     }
     setCaseList(_caseList);
+    return _ind < 0 ? 0 : _ind;
   };
   // NotExists 窗口
   var showNotExists = function showNotExists(i) {
@@ -409,12 +487,8 @@ var FormulaList = forwardRef(function (props, ref) {
         })
       }, index);
     } else {
-      return _jsx(Select, {
-        triggerProps: {
-          clickToClose: true
-        },
-        value: v.val,
-        triggerElement: function triggerElement(value) {
+      return selectOperator({
+        triggerElement: function triggerElement() {
           return _jsxs("div", {
             className: cx("Sqb-TableName ", {
               notSelected: true
@@ -430,22 +504,46 @@ var FormulaList = forwardRef(function (props, ref) {
             })]
           });
         },
-        onChange: function onChange(val) {
-          addOperator(val, index, '');
-        },
-        children: _customTypes.map(function (option, index) {
-          return _jsx(Select.Option, {
-            value: option.value,
-            children: option.label
-          }, index + '' + ind);
-        })
+        ind: index,
+        position: ''
       });
+      // return (
+      //   <Select
+      //     triggerProps={{
+      //       clickToClose: true,
+      //     }}
+      //     value={v.val}
+      //     triggerElement={(value) => {
+      //       return (
+      //         <div
+      //           className={cx(`Sqb-TableName `, {
+      //             notSelected: true,
+      //           })}
+      //         >
+      //           {__('customColumn.selectCustomInput')}
+      //           <span style={{ fontSize: 0 }} onClick={(e) => handleDel(e, index)}>
+      //             <CloseIcon />
+      //           </span>
+      //         </div>
+      //       );
+      //     }}
+      //     onChange={(val) => {
+      //       addOperator(val, index, '');
+      //     }}
+      //   >
+      //     {_customTypes.map((option, index) => (
+      //       <Select.Option key={index + '' + ind} value={option.value}>
+      //         {option.label}
+      //       </Select.Option>
+      //     ))}
+      //   </Select>
+      // );
     }
   };
   return _jsx(_Fragment, {
     children: _jsxs("div", {
       className: "Sqb-NotebookCell",
-      children: [caseList === null || caseList === void 0 ? void 0 : caseList.map(function (v, i) {
+      children: [(_caseList2 = caseList) === null || _caseList2 === void 0 ? void 0 : _caseList2.map(function (v, i) {
         return _jsxs("div", {
           className: cx('Sqb-Filter-item', {
             hover: ind === i
@@ -456,14 +554,7 @@ var FormulaList = forwardRef(function (props, ref) {
           onMouseLeave: function onMouseLeave() {
             setInd(-1);
           },
-          children: [_jsx(Select, {
-            trigger: 'hover',
-            triggerProps: {
-              clickToClose: true
-            },
-            virtualListProps: {
-              threshold: null
-            },
+          children: [selectOperator({
             triggerElement: function triggerElement() {
               return _jsx("div", {
                 className: 'left-arrow',
@@ -477,30 +568,10 @@ var FormulaList = forwardRef(function (props, ref) {
                 })
               });
             },
-            onChange: function onChange(val) {
-              addOperator(val, i, 'before');
-            },
-            children: _customTypes.map(function (option, index) {
-              return _jsx(Select.Option, {
-                value: option.value,
-                children: option.label
-              }, index + '' + ind);
-            })
-          }), itemDom(v, i), _jsx(Select, {
-            trigger: 'hover',
-            triggerProps: {
-              clickToClose: true
-            },
-            virtualListProps: {
-              threshold: null
-            },
-            style: {
-              width: '100px'
-            },
-            value: '',
-            autoWidth: {
-              minWidth: 300
-            },
+            ind: i,
+            position: 'before',
+            trigger: 'hover'
+          }), itemDom(v, i), selectOperator({
             triggerElement: function triggerElement(value) {
               return _jsx("div", {
                 className: 'right-arrow',
@@ -514,41 +585,50 @@ var FormulaList = forwardRef(function (props, ref) {
                 })
               });
             },
-            onChange: function onChange(val, option) {
-              addOperator(val, i, 'after');
-            },
-            children: _customTypes.map(function (option, index) {
-              return _jsx(Select.Option, {
-                value: option.value,
-                children: option.label
-              }, index + '' + ind);
-            })
+            ind: i,
+            position: 'after',
+            trigger: 'hover'
           })]
         }, i);
-      }), Array.from(caseList).length < 1 && _jsx(Select, {
-        trigger: 'click',
-        triggerProps: {
-          clickToClose: true
-        },
-        virtualListProps: {
-          threshold: null
-        },
+      }), Array.from(caseList).length < 1 && selectOperator({
         triggerElement: function triggerElement() {
           return _jsx("div", {
             className: cx("Sqb-TableName gray-name"),
             children: _jsx(AddIcon, {})
           });
         },
-        onChange: function onChange(val) {
-          addOperator(val, -1, 'add');
-        },
-        children: _customTypes.map(function (option, index) {
-          return _jsx(Select.Option, {
-            value: option.value,
-            children: option.label
-          }, index + '' + ind);
-        })
-      }), showPreview && _jsxs("p", {
+        ind: -1,
+        position: 'add',
+        trigger: 'click'
+      })
+      // (
+      // <Select
+      //   trigger={'click'}
+      //   triggerProps={{
+      //     clickToClose: true,
+      //   }}
+      //   virtualListProps={{
+      //     threshold: null,
+      //   }}
+      //   triggerElement={() => {
+      //     return (
+      //       <div className={cx(`Sqb-TableName gray-name`)}>
+      //         <AddIcon />
+      //       </div>
+      //     );
+      //   }}
+      //   onChange={(val) => {
+      //     addOperator(val, -1, 'add');
+      //   }}
+      // >
+      //   {_customTypes.map((option, index) => (
+      //     <Select.Option key={index + '' + ind} value={option.value}>
+      //       {option.label}
+      //     </Select.Option>
+      //   ))}
+      // </Select>
+      // )
+      , showPreview && _jsxs("p", {
         className: "mb-2 font-bold uppercase tracking-wider",
         style: {
           fontSize: 12,

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

@@ -183,7 +183,7 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
         tableName = v.name,
         _v$datasourceName = v.datasourceName,
         datasourceName = _v$datasourceName === void 0 ? '' : _v$datasourceName;
-      var fullName = datasourceName ? "".concat(datasourceName, ".").concat(mergeNameAlias(tableName, tableAlias)) : mergeNameAlias(tableName, tableAlias);
+      var fullName = datasourceName ? "".concat(datasourceName, ".").concat(mergeNameAlias(tableName, tableAlias, store.tableEnableAlias)) : mergeNameAlias(tableName, tableAlias, store.tableEnableAlias);
       if (val === '' || ~fullName.toLocaleLowerCase().indexOf(val.toLocaleLowerCase())) {
         // let open = tableList.filter((vv) => vv.tableUuid === v.tableUuid)?.[0]?.open || false;
         return _objectSpread({}, v);
@@ -276,8 +276,8 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                     },
                     children: _jsx("h3", {
                       className: 'List-item-title ml-2',
-                      title: datasourceName ? "".concat(datasourceName, ".").concat(mergeNameAlias(tableName, tableAlias)) : mergeNameAlias(tableName, tableAlias),
-                      children: datasourceName ? "".concat(datasourceName, ".").concat(mergeNameAlias(tableName, tableAlias)) : mergeNameAlias(tableName, tableAlias)
+                      title: datasourceName ? "".concat(datasourceName, ".").concat(mergeNameAlias(tableName, tableAlias, store.tableEnableAlias)) : mergeNameAlias(tableName, tableAlias, store.tableEnableAlias),
+                      children: datasourceName ? "".concat(datasourceName, ".").concat(mergeNameAlias(tableName, tableAlias, store.tableEnableAlias)) : mergeNameAlias(tableName, tableAlias, store.tableEnableAlias)
                     })
                   }), isMultiple && !isGroup && _jsx("span", {
                     className: 'List-title-arrow',