@gingkoo/pandora-metabase 1.0.60 → 1.0.62

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

@@ -30,6 +30,7 @@ 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 _caseList2;
   var value = props.value,
     data = props.data,
     exitData = props.exitData,
@@ -44,6 +45,10 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
     showPreview = _props$showPreview === void 0 ? true : _props$showPreview,
     check = props.check;
   var caseList = value || [];
+  var _useState = (0, _react.useState)(''),
+    _useState2 = (0, _slicedToArray2["default"])(_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) {
@@ -55,11 +60,12 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
       }
     }).join(' ');
     onChange === null || onChange === void 0 || onChange(data, quotes);
+    caseList = data;
   };
-  var _useState = (0, _react.useState)(-1),
-    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
-    ind = _useState2[0],
-    setInd = _useState2[1];
+  var _useState3 = (0, _react.useState)(-1),
+    _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+    ind = _useState4[0],
+    setInd = _useState4[1];
   var store = (0, _useProvider.useStore)();
   var filterCustomType = store.filterCustomType;
   function closePopup() {
@@ -67,6 +73,72 @@ var FormulaList = (0, _react.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 = _utils2.operatorList.filter(function (v) {
+      return ~(v + (v || '')).toLocaleLowerCase().indexOf(filterVal.toLocaleLowerCase());
+    });
+    return (0, _jsxRuntime.jsxs)(_pandora.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(_types.AtomsTypeEnum.OPERATOR, ind, position);
+          handleConstant(val, curInd);
+          setFilterVal('');
+        } else {
+          addOperator(val, ind, position);
+        }
+      },
+      onVisibleChange: function onVisibleChange(visible) {
+        if (visible) {
+          setFilterVal('');
+        }
+      },
+      value: '',
+      children: [(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+        children: (0, _jsxRuntime.jsx)(_pandora.Input, {
+          autoFocus: true,
+          className: ':Sqb-Operator-input',
+          style: {
+            margin: '5px auto',
+            width: "calc(100% - 10px)"
+          },
+          value: filterVal,
+          placeholder: (0, _locale.__)('SqlQueryBuilder.pleaseEnter'),
+          // size='large'
+          onChange: function onChange(val) {
+            setFilterVal(val);
+          }
+        })
+      }), filterVal ? showOperatorList.map(function (option, index) {
+        return (0, _jsxRuntime.jsx)(_pandora.Select.Option, {
+          value: option,
+          children: option
+        }, index + '' + ind);
+      }) : _customTypes.map(function (option, index) {
+        return (0, _jsxRuntime.jsx)(_pandora.Select.Option, {
+          value: option.value,
+          children: option.label
+        }, index + '' + ind);
+      })]
+    });
+  };
   // 字段
   function handleField(e, i, val) {
     store.setPopup({
@@ -127,18 +199,24 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
   // 添加
   var addOperator = function addOperator(type, index, position) {
     var _caseList = caseList.slice() || [];
+    var _ind = index;
     var temItem = (0, _utils2.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) {
@@ -415,12 +493,8 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
         })
       }, index);
     } else {
-      return (0, _jsxRuntime.jsx)(_pandora.Select, {
-        triggerProps: {
-          clickToClose: true
-        },
-        value: v.val,
-        triggerElement: function triggerElement(value) {
+      return selectOperator({
+        triggerElement: function triggerElement() {
           return (0, _jsxRuntime.jsxs)("div", {
             className: (0, _classnames["default"])("Sqb-TableName ", {
               notSelected: true
@@ -436,22 +510,46 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
             })]
           });
         },
-        onChange: function onChange(val) {
-          addOperator(val, index, '');
-        },
-        children: _customTypes.map(function (option, index) {
-          return (0, _jsxRuntime.jsx)(_pandora.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 (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
     children: (0, _jsxRuntime.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 (0, _jsxRuntime.jsxs)("div", {
           className: (0, _classnames["default"])('Sqb-Filter-item', {
             hover: ind === i
@@ -462,14 +560,7 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
           onMouseLeave: function onMouseLeave() {
             setInd(-1);
           },
-          children: [(0, _jsxRuntime.jsx)(_pandora.Select, {
-            trigger: 'hover',
-            triggerProps: {
-              clickToClose: true
-            },
-            virtualListProps: {
-              threshold: null
-            },
+          children: [selectOperator({
             triggerElement: function triggerElement() {
               return (0, _jsxRuntime.jsx)("div", {
                 className: 'left-arrow',
@@ -483,30 +574,10 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
                 })
               });
             },
-            onChange: function onChange(val) {
-              addOperator(val, i, 'before');
-            },
-            children: _customTypes.map(function (option, index) {
-              return (0, _jsxRuntime.jsx)(_pandora.Select.Option, {
-                value: option.value,
-                children: option.label
-              }, index + '' + ind);
-            })
-          }), itemDom(v, i), (0, _jsxRuntime.jsx)(_pandora.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 (0, _jsxRuntime.jsx)("div", {
                 className: 'right-arrow',
@@ -520,41 +591,50 @@ var FormulaList = (0, _react.forwardRef)(function (props, ref) {
                 })
               });
             },
-            onChange: function onChange(val, option) {
-              addOperator(val, i, 'after');
-            },
-            children: _customTypes.map(function (option, index) {
-              return (0, _jsxRuntime.jsx)(_pandora.Select.Option, {
-                value: option.value,
-                children: option.label
-              }, index + '' + ind);
-            })
+            ind: i,
+            position: 'after',
+            trigger: 'hover'
           })]
         }, i);
-      }), Array.from(caseList).length < 1 && (0, _jsxRuntime.jsx)(_pandora.Select, {
-        trigger: 'click',
-        triggerProps: {
-          clickToClose: true
-        },
-        virtualListProps: {
-          threshold: null
-        },
+      }), Array.from(caseList).length < 1 && selectOperator({
         triggerElement: function triggerElement() {
           return (0, _jsxRuntime.jsx)("div", {
             className: (0, _classnames["default"])("Sqb-TableName gray-name"),
             children: (0, _jsxRuntime.jsx)(_icons.AddIcon, {})
           });
         },
-        onChange: function onChange(val) {
-          addOperator(val, -1, 'add');
-        },
-        children: _customTypes.map(function (option, index) {
-          return (0, _jsxRuntime.jsx)(_pandora.Select.Option, {
-            value: option.value,
-            children: option.label
-          }, index + '' + ind);
-        })
-      }), showPreview && (0, _jsxRuntime.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 && (0, _jsxRuntime.jsxs)("p", {
         className: "mb-2 font-bold uppercase tracking-wider",
         style: {
           fontSize: 12,

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

@@ -188,7 +188,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((0, _helper2.mergeNameAlias)(tableName, tableAlias)) : (0, _helper2.mergeNameAlias)(tableName, tableAlias);
+      var fullName = datasourceName ? "".concat(datasourceName, ".").concat((0, _helper2.mergeNameAlias)(tableName, tableAlias, store.tableEnableAlias)) : (0, _helper2.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 (0, _objectSpread2["default"])({}, v);
@@ -281,8 +281,8 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                     },
                     children: (0, _jsxRuntime.jsx)("h3", {
                       className: 'List-item-title ml-2',
-                      title: datasourceName ? "".concat(datasourceName, ".").concat((0, _helper2.mergeNameAlias)(tableName, tableAlias)) : (0, _helper2.mergeNameAlias)(tableName, tableAlias),
-                      children: datasourceName ? "".concat(datasourceName, ".").concat((0, _helper2.mergeNameAlias)(tableName, tableAlias)) : (0, _helper2.mergeNameAlias)(tableName, tableAlias)
+                      title: datasourceName ? "".concat(datasourceName, ".").concat((0, _helper2.mergeNameAlias)(tableName, tableAlias, store.tableEnableAlias)) : (0, _helper2.mergeNameAlias)(tableName, tableAlias, store.tableEnableAlias),
+                      children: datasourceName ? "".concat(datasourceName, ".").concat((0, _helper2.mergeNameAlias)(tableName, tableAlias, store.tableEnableAlias)) : (0, _helper2.mergeNameAlias)(tableName, tableAlias, store.tableEnableAlias)
                     })
                   }), isMultiple && !isGroup && (0, _jsxRuntime.jsx)("span", {
                     className: 'List-title-arrow',

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

@@ -94,7 +94,8 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
       return v.tableUuid === tableUuid;
     });
     if (isHas.length < 1) {
-      tableUuid = data[0].tableUuid;
+      var _data$;
+      tableUuid = (_data$ = data[0]) === null || _data$ === void 0 ? void 0 : _data$.tableUuid;
     }
     setCurTable(tableUuid);
     setTableList(data.map(function (v, i) {
@@ -130,7 +131,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((0, _helper2.mergeNameAlias)(tableName, tableAlias)) : (0, _helper2.mergeNameAlias)(tableName, tableAlias);
+      var fullName = datasourceName ? "".concat(datasourceName, ".").concat((0, _helper2.mergeNameAlias)(tableName, tableAlias, store.tableEnableAlias)) : (0, _helper2.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 (0, _objectSpread2["default"])({}, v);
@@ -220,8 +221,8 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                   },
                   children: (0, _jsxRuntime.jsx)("h3", {
                     className: 'List-item-title ml-2',
-                    title: datasourceName ? "".concat(datasourceName, ".").concat((0, _helper2.mergeNameAlias)(table, tableAlias)) : (0, _helper2.mergeNameAlias)(table, tableAlias),
-                    children: datasourceName ? "".concat(datasourceName, ".").concat((0, _helper2.mergeNameAlias)(table, tableAlias)) : (0, _helper2.mergeNameAlias)(table, tableAlias)
+                    title: datasourceName ? "".concat(datasourceName, ".").concat((0, _helper2.mergeNameAlias)(table, tableAlias, store.tableEnableAlias)) : (0, _helper2.mergeNameAlias)(table, tableAlias, store.tableEnableAlias),
+                    children: datasourceName ? "".concat(datasourceName, ".").concat((0, _helper2.mergeNameAlias)(table, tableAlias, store.tableEnableAlias)) : (0, _helper2.mergeNameAlias)(table, tableAlias, store.tableEnableAlias)
                   })
                 }), isMultiple && (0, _jsxRuntime.jsx)("span", {
                   className: 'List-title-arrow',

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

@@ -195,8 +195,8 @@ var SelectJoinColumn = function SelectJoinColumn(_ref) {
                   },
                   children: (0, _jsxRuntime.jsx)("h3", {
                     className: 'List-item-title ml-2',
-                    title: datasourceName ? "".concat(datasourceName, ".").concat((0, _helper2.mergeNameAlias)(table, tableAlias)) : (0, _helper2.mergeNameAlias)(table, tableAlias),
-                    children: datasourceName ? "".concat(datasourceName, ".").concat((0, _helper2.mergeNameAlias)(table, tableAlias)) : (0, _helper2.mergeNameAlias)(table, tableAlias)
+                    title: datasourceName ? "".concat(datasourceName, ".").concat((0, _helper2.mergeNameAlias)(table, tableAlias, store.tableEnableAlias)) : (0, _helper2.mergeNameAlias)(table, tableAlias, store.tableEnableAlias),
+                    children: datasourceName ? "".concat(datasourceName, ".").concat((0, _helper2.mergeNameAlias)(table, tableAlias, store.tableEnableAlias)) : (0, _helper2.mergeNameAlias)(table, tableAlias, store.tableEnableAlias)
                   })
                 }), isMultiple && (0, _jsxRuntime.jsx)("span", {
                   className: 'List-title-arrow',

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

@@ -10,6 +10,7 @@ interface PropsType {
     value: MetaData_TableType;
     onChange: (reocrd: MetaData_TableType) => void;
     didUpdate?: Function;
+    tableEnableAlias: boolean;
 }
-declare const SelectPermissionTable: ({ data, value, onChange, didUpdate }: PropsType) => import("react/jsx-runtime").JSX.Element;
+declare const SelectPermissionTable: ({ data, value, onChange, didUpdate, tableEnableAlias, }: PropsType) => import("react/jsx-runtime").JSX.Element;
 export default SelectPermissionTable;

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

@@ -27,7 +27,8 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
     value = _ref.value,
     _ref$onChange = _ref.onChange,
     onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange,
-    didUpdate = _ref.didUpdate;
+    didUpdate = _ref.didUpdate,
+    tableEnableAlias = _ref.tableEnableAlias;
   var _useState = (0, _react.useState)(data.slice()),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
     datasource = _useState2[0],
@@ -39,7 +40,7 @@ var SelectPermissionTable = function SelectPermissionTable(_ref) {
     var val = e.target.value;
     var newList = (0, _cloneDeep["default"])(data.slice());
     setDatasource(newList.filter(function (v) {
-      return ~(v.datasourceName + '.' + (0, _helper.mergeNameAlias)(v.name, v.alias)).toLocaleLowerCase().indexOf(val.toLocaleLowerCase());
+      return ~(v.datasourceName + '.' + (0, _helper.mergeNameAlias)(v.name, v.alias, tableEnableAlias)).toLocaleLowerCase().indexOf(val.toLocaleLowerCase());
     }));
   }
   return (0, _jsxRuntime.jsx)("div", {
@@ -85,7 +86,7 @@ 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 : (0, _helper.mergeNameAlias)(v.name, v.alias)]
+                    children: [v.datasourceName ? "".concat(v.datasourceName, ".") : '', v.name === 'source' ? PrevResult : (0, _helper.mergeNameAlias)(v.name, v.alias, tableEnableAlias)]
                   })
                 })]
               })

package/lib/cjs/components/dialog/select-table/index.d.ts

@@ -9,9 +9,11 @@ import { MetaData_TableType } from '../../../store/types';
 import { DatasourceType } from '../../../types';
 interface PropsType {
     data: DatasourceType[];
+    sourceTable: any[];
     value: MetaData_TableType;
     onChange: (reocrd: MetaData_TableType) => void;
     didUpdate?: Function;
+    tableFlat?: boolean;
 }
-declare const SelectTable: ({ data, value, onChange, didUpdate }: PropsType) => import("react/jsx-runtime").JSX.Element;
+declare const SelectTable: ({ data, sourceTable, value, onChange, didUpdate, tableFlat, }: PropsType) => import("react/jsx-runtime").JSX.Element;
 export default SelectTable;

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

@@ -29,10 +29,14 @@ var _icons = require("../../icons");
 var SelectTable = function SelectTable(_ref) {
   var _ref$data = _ref.data,
     data = _ref$data === void 0 ? [] : _ref$data,
+    _ref$sourceTable = _ref.sourceTable,
+    sourceTable = _ref$sourceTable === void 0 ? [] : _ref$sourceTable,
     value = _ref.value,
     _ref$onChange = _ref.onChange,
     onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange,
-    didUpdate = _ref.didUpdate;
+    didUpdate = _ref.didUpdate,
+    _ref$tableFlat = _ref.tableFlat,
+    tableFlat = _ref$tableFlat === void 0 ? false : _ref$tableFlat;
   var store = (0, _useProvider.useStore)();
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
@@ -41,18 +45,22 @@ var SelectTable = function SelectTable(_ref) {
   var _useState3 = (0, _react.useState)(data.slice()),
     _useState4 = (0, _slicedToArray2["default"])(_useState3, 1),
     datasource = _useState4[0];
-  var _useState5 = (0, _react.useState)([]),
+  var _useState5 = (0, _react.useState)(sourceTable.slice()),
     _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
-    list = _useState6[0],
-    setList = _useState6[1];
+    datasourceTable = _useState6[0],
+    setDatasourceTable = _useState6[1];
   var _useState7 = (0, _react.useState)([]),
     _useState8 = (0, _slicedToArray2["default"])(_useState7, 2),
-    originList = _useState8[0],
-    setOriginList = _useState8[1];
-  var _useState9 = (0, _react.useState)(value),
+    list = _useState8[0],
+    setList = _useState8[1];
+  var _useState9 = (0, _react.useState)([]),
     _useState0 = (0, _slicedToArray2["default"])(_useState9, 2),
-    val = _useState0[0],
-    setVal = _useState0[1];
+    originList = _useState0[0],
+    setOriginList = _useState0[1];
+  var _useState1 = (0, _react.useState)(value),
+    _useState10 = (0, _slicedToArray2["default"])(_useState1, 2),
+    val = _useState10[0],
+    setVal = _useState10[1];
   (0, _react.useEffect)(function () {
     if (value.datasourceId) {
       getTables(value.datasourceId);
@@ -93,6 +101,21 @@ var SelectTable = function SelectTable(_ref) {
       return ~(v.name + (v.name_zh || '')).toLocaleLowerCase().indexOf(val.toLocaleLowerCase());
     }));
   }
+  function onInput1(e) {
+    var val = e.target.value;
+    var newList = (0, _cloneDeep["default"])(sourceTable.slice());
+    var _new = newList.map(function (v) {
+      var _v$children;
+      return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, v), {}, {
+        children: v === null || v === void 0 || (_v$children = v.children) === null || _v$children === void 0 ? void 0 : _v$children.filter(function (v) {
+          return ~(v.name + (v.name_zh || '')).toLocaleLowerCase().indexOf(val.toLocaleLowerCase());
+        })
+      });
+    }).filter(function (v) {
+      return v.children.length > 0;
+    });
+    setDatasourceTable(_new);
+  }
   function goPrevPage() {
     setVal({
       datasourceId: '',
@@ -104,6 +127,78 @@ var SelectTable = function SelectTable(_ref) {
       alias: ''
     });
   }
+  if (tableFlat) {
+    return (0, _jsxRuntime.jsx)("div", {
+      className: (0, _classnames["default"])("Sqb-SelectTable--box pb-2"),
+      children: (0, _jsxRuntime.jsx)("div", {
+        style: {
+          minWidth: 300
+        },
+        children: (0, _jsxRuntime.jsxs)("div", {
+          style: {
+            width: '100%'
+          },
+          children: [(0, _jsxRuntime.jsx)("div", {
+            className: (0, _classnames["default"])("Sqb-List-section"),
+            children: (0, _jsxRuntime.jsxs)("div", {
+              className: (0, _classnames["default"])("Sqb-List-search m-2 rounded-lg"),
+              children: [(0, _jsxRuntime.jsx)("span", {
+                className: 'px-2',
+                children: (0, _jsxRuntime.jsx)(_icons.SearchIcon, {})
+              }), (0, _jsxRuntime.jsx)("input", {
+                autoFocus: true,
+                type: 'text',
+                className: 'p-2',
+                placeholder: (0, _locale.__)('data.search'),
+                onInput: onInput1
+              })]
+            })
+          }), datasourceTable.map(function (table) {
+            var _table$children;
+            return (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+              children: [(0, _jsxRuntime.jsx)("div", {
+                className: (0, _classnames["default"])("Sqb-List-title mx-4 pb-2 pt-2"),
+                children: table.datasourceName
+              }), Array.isArray(table.children) && (table === null || table === void 0 || (_table$children = table.children) === null || _table$children === void 0 ? void 0 : _table$children.map(function (v) {
+                var _val = {
+                  datasourceId: table.datasourceId,
+                  datasourceName: table.datasourceName,
+                  name: '',
+                  name_zh: '',
+                  id: '',
+                  tableUuid: (0, _helper.uuidv4)('table'),
+                  alias: ''
+                };
+                return (0, _jsxRuntime.jsx)("div", {
+                  className: (0, _classnames["default"])("Sqb-List-section"),
+                  children: (0, _jsxRuntime.jsx)("div", {
+                    className: (0, _classnames["default"])("Sqb-List-item mx-2", {
+                      active: value.name === v.name
+                    }),
+                    onClick: function onClick() {
+                      onChange((0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, _val), v));
+                    },
+                    children: (0, _jsxRuntime.jsxs)("a", {
+                      className: 'p-2',
+                      children: [(0, _jsxRuntime.jsx)("span", {
+                        className: 'List-item-icon',
+                        children: (0, _jsxRuntime.jsx)(_icons.TableIcon, {})
+                      }), (0, _jsxRuntime.jsx)("div", {
+                        children: (0, _jsxRuntime.jsx)("h4", {
+                          className: 'List-item-title ml-2',
+                          children: (0, _helper.replaceTpl)(store.tableNameTpl, v)
+                        })
+                      })]
+                    })
+                  })
+                }, v.name);
+              }))]
+            });
+          })]
+        })
+      })
+    });
+  }
   var nextPage = !val.datasourceId;
   // 没有选 数据源 先选数据源
   if (nextPage) {

package/lib/cjs/components/metabase/index.less

@@ -51,7 +51,6 @@
       width: 66.6667%;
       box-sizing: border-box;
 
-      .Sqb-Custom-input,
       .sqb-Custom-input {
         border-radius: 0;
         padding: 0;

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

@@ -506,6 +506,7 @@ var JoinData = function JoinData(props) {
       visible: true,
       node: node,
       content: (0, _jsxRuntime.jsx)(_dialog.SelectPermissionTable, {
+        tableEnableAlias: store.tableEnableAlias,
         data: data,
         value: newMeta[index][table_type],
         onChange: function onChange(data) {
@@ -547,6 +548,8 @@ var JoinData = function JoinData(props) {
       visible: true,
       node: e.currentTarget,
       content: (0, _jsxRuntime.jsx)(_dialog.SelectTable, {
+        sourceTable: store.sourceTable || [],
+        tableFlat: store.tableFlat,
         data: store.sourceList,
         value: value,
         onChange: function onChange(data) {
@@ -1348,7 +1351,7 @@ var JoinData = function JoinData(props) {
       if (meta.table1.name === _helper2.SummarizeAlias) {
         return PrevResult;
       } else {
-        return "".concat(meta.table1.datasourceName, ".").concat((0, _helper.mergeNameAlias)(meta.table1.name, meta.table1.alias));
+        return "".concat(meta.table1.datasourceName, ".").concat((0, _helper.mergeNameAlias)(meta.table1.name, meta.table1.alias, store.tableEnableAlias));
       }
     } else {
       return '';

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

@@ -91,6 +91,7 @@ var PermissionTable = function PermissionTable(props) {
       visible: true,
       node: e.currentTarget,
       content: (0, _jsxRuntime.jsx)(_dialog.SelectPermissionTable, {
+        tableEnableAlias: store.tableEnableAlias,
         data: data,
         value: meta.table,
         onChange: function onChange(data) {

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

@@ -87,7 +87,9 @@ var TableData = function TableData(props) {
       visible: true,
       node: e.currentTarget,
       content: (0, _jsxRuntime.jsx)(_dialog.SelectTable, {
+        tableFlat: store.tableFlat,
         data: store.sourceList,
+        sourceTable: store.sourceTable || [],
         value: meta.table,
         onChange: function onChange(data) {
           if (meta.table.datasourceId !== data.datasourceId || meta.table.name !== data.name) {