@gingkoo/pandora-metabase 1.0.126 → 1.0.128

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

@@ -1,5 +1,5 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
@@ -21,6 +21,7 @@ var SelectTable = function SelectTable(_ref) {
     value = _ref.value,
     _ref$onChange = _ref.onChange,
     onChange = _ref$onChange === void 0 ? function () {} : _ref$onChange,
+    onDatasourceTypeChange = _ref.onDatasourceTypeChange,
     didUpdate = _ref.didUpdate,
     _ref$tableFlat = _ref.tableFlat,
     tableFlat = _ref$tableFlat === void 0 ? false : _ref$tableFlat;
@@ -34,50 +35,198 @@ var SelectTable = function SelectTable(_ref) {
     datasource = _useState4[0];
   var _useState5 = useState(sourceTable.slice()),
     _useState6 = _slicedToArray(_useState5, 2),
-    datasourceTable = _useState6[0],
-    setDatasourceTable = _useState6[1];
-  var _useState7 = useState([]),
+    originDatasourceTable = _useState6[0],
+    setOriginDatasourceTable = _useState6[1];
+  var _useState7 = useState(sourceTable.slice()),
     _useState8 = _slicedToArray(_useState7, 2),
-    list = _useState8[0],
-    setList = _useState8[1];
+    datasourceTable = _useState8[0],
+    setDatasourceTable = _useState8[1];
   var _useState9 = useState([]),
     _useState0 = _slicedToArray(_useState9, 2),
-    originList = _useState0[0],
-    setOriginList = _useState0[1];
-  var _useState1 = useState(value),
+    list = _useState0[0],
+    setList = _useState0[1];
+  var _useState1 = useState([]),
     _useState10 = _slicedToArray(_useState1, 2),
-    val = _useState10[0],
-    setVal = _useState10[1];
+    originList = _useState10[0],
+    setOriginList = _useState10[1];
+  var _useState11 = useState(value),
+    _useState12 = _slicedToArray(_useState11, 2),
+    val = _useState12[0],
+    setVal = _useState12[1];
+  var _useState13 = useState(''),
+    _useState14 = _slicedToArray(_useState13, 2),
+    tableFilterValue = _useState14[0],
+    setTableFilterValue = _useState14[1];
   useEffect(function () {
     if (value.datasourceId) {
-      getTables(value.datasourceId);
+      var datasourceItem = getDatasource(value.datasourceId);
+      var _datasourceType = value.datasourceType || getDefaultDatasourceType(datasourceItem);
+      var nextVal = _objectSpread(_objectSpread({}, value), {}, {
+        datasourceType: _datasourceType
+      });
+      setVal(nextVal);
+      if (!value.datasourceType && _datasourceType) {
+        emitDatasourceTypeChange(nextVal);
+      }
+      loadTables(value.datasourceId, _datasourceType);
     }
   }, []);
-  function getTables(_x) {
-    return _getTables.apply(this, arguments);
+  function getDefaultDatasourceType(datasource) {
+    var _datasource$datasourc;
+    return (datasource === null || datasource === void 0 ? void 0 : datasource.defaultDatasourceType) || (datasource === null || datasource === void 0 ? void 0 : datasource.datasourceType) || (datasource === null || datasource === void 0 || (_datasource$datasourc = datasource.datasourceTypeList) === null || _datasource$datasourc === void 0 || (_datasource$datasourc = _datasource$datasourc[0]) === null || _datasource$datasourc === void 0 ? void 0 : _datasource$datasourc.value) || '';
+  }
+  function getDatasource(datasourceId) {
+    return datasource.find(function (v) {
+      return v.datasourceId === datasourceId;
+    });
+  }
+  function filterDatasourceTables(tables, keyword) {
+    var searchVal = keyword.toLocaleLowerCase();
+    if (!searchVal) return tables.slice();
+    return cloneDeep(tables.slice()).map(function (v) {
+      var _v$children;
+      return _objectSpread(_objectSpread({}, v), {}, {
+        children: v === null || v === void 0 || (_v$children = v.children) === null || _v$children === void 0 ? void 0 : _v$children.filter(function (vv) {
+          return ~(vv.name + (vv.name_zh || '')).toLocaleLowerCase().indexOf(searchVal);
+        })
+      });
+    }).filter(function (v) {
+      return (v.children || []).length > 0;
+    });
   }
-  function _getTables() {
-    _getTables = _asyncToGenerator(_regeneratorRuntime.mark(function _callee(datasourceId) {
-      var tables;
+  function loadTables(_x) {
+    return _loadTables.apply(this, arguments);
+  }
+  function _loadTables() {
+    _loadTables = _asyncToGenerator(_regeneratorRuntime.mark(function _callee(datasourceId) {
+      var datasourceType,
+        force,
+        tables,
+        _args = arguments;
       return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            datasourceType = _args.length > 1 && _args[1] !== undefined ? _args[1] : '';
+            force = _args.length > 2 && _args[2] !== undefined ? _args[2] : false;
             setLoading(true);
             _context.next = 1;
-            return store.fetchDataset(datasourceId);
+            return store.fetchDataset(datasourceId, datasourceType, force);
           case 1:
             tables = _context.sent;
             setLoading(false);
             setList(tables);
             setOriginList(tables);
+            return _context.abrupt("return", tables);
           case 2:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
-    return _getTables.apply(this, arguments);
+    return _loadTables.apply(this, arguments);
+  }
+  function emitDatasourceTypeChange(nextVal) {
+    if (!nextVal.datasourceId || !nextVal.name) return;
+    onDatasourceTypeChange === null || onDatasourceTypeChange === void 0 || onDatasourceTypeChange(nextVal);
+  }
+  function handleSelectDatasource(datasource, datasourceType) {
+    var force = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+    var nextDatasourceType = datasourceType || getDefaultDatasourceType(datasource);
+    setVal({
+      datasourceId: datasource.datasourceId,
+      datasourceName: datasource.datasourceName,
+      datasourceType: nextDatasourceType,
+      name: '',
+      name_zh: '',
+      id: '',
+      tableUuid: uuidv4('table'),
+      alias: ''
+    });
+    loadTables(datasource.datasourceId, nextDatasourceType, force);
+  }
+  function handleDatasourceTypeChange(datasourceType) {
+    var nextVal = _objectSpread(_objectSpread({}, val), {}, {
+      datasourceType: datasourceType
+    });
+    setVal(nextVal);
+    emitDatasourceTypeChange(nextVal);
+    loadTables(nextVal.datasourceId, datasourceType, true);
+  }
+  function handleFlatDatasourceTypeChange(_x2, _x3) {
+    return _handleFlatDatasourceTypeChange.apply(this, arguments);
+  }
+  function _handleFlatDatasourceTypeChange() {
+    _handleFlatDatasourceTypeChange = _asyncToGenerator(_regeneratorRuntime.mark(function _callee2(datasourceItem, datasourceType) {
+      var nextVal, tables, updateDatasourceTable, nextOriginDatasourceTable;
+      return _regeneratorRuntime.wrap(function (_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            if (val.datasourceId === datasourceItem.datasourceId) {
+              nextVal = _objectSpread(_objectSpread({}, val), {}, {
+                datasourceType: datasourceType
+              });
+              setVal(nextVal);
+              emitDatasourceTypeChange(nextVal);
+            }
+            _context2.next = 1;
+            return loadTables(datasourceItem.datasourceId, datasourceType, true);
+          case 1:
+            tables = _context2.sent;
+            updateDatasourceTable = function updateDatasourceTable(tablesData) {
+              return tablesData.map(function (v) {
+                if (v.datasourceId !== datasourceItem.datasourceId) return v;
+                return _objectSpread(_objectSpread({}, v), {}, {
+                  datasourceType: datasourceType,
+                  children: tables
+                });
+              });
+            };
+            nextOriginDatasourceTable = updateDatasourceTable(originDatasourceTable);
+            setOriginDatasourceTable(nextOriginDatasourceTable);
+            setDatasourceTable(filterDatasourceTables(nextOriginDatasourceTable, tableFilterValue));
+          case 2:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return _handleFlatDatasourceTypeChange.apply(this, arguments);
+  }
+  function renderDatasourceTypeSelector(datasourceItem, datasourceType, onChange) {
+    var datasourceTypeList = datasourceItem.datasourceTypeList || [];
+    if (!datasourceTypeList.length) return null;
+    return _jsx("div", {
+      className: 'Sqb-DatasourceType-radio',
+      onClick: function onClick(e) {
+        return e.stopPropagation();
+      },
+      children: datasourceTypeList.map(function (item) {
+        var checked = datasourceType === item.value;
+        var handleChangeType = function handleChangeType(e) {
+          e.preventDefault();
+          e.stopPropagation();
+          if (!checked) onChange(item.value);
+        };
+        return _jsxs("label", {
+          className: 'Sqb-DatasourceType-radio-item',
+          onMouseDown: handleChangeType,
+          onClick: handleChangeType,
+          children: [_jsx("input", {
+            type: 'radio',
+            name: "datasourceType_".concat(datasourceItem.datasourceId || 'current'),
+            checked: checked,
+            readOnly: true
+          }), _jsx("span", {
+            children: item.label
+          })]
+        }, item.value);
+      })
+    });
   }
+  useEffect(function () {
+    setOriginDatasourceTable(sourceTable.slice());
+    setDatasourceTable(filterDatasourceTables(sourceTable.slice(), tableFilterValue));
+  }, [sourceTable]);
   useEffect(function () {
     didUpdate === null || didUpdate === void 0 || didUpdate();
   }, [list, loading, datasource]);
@@ -90,23 +239,14 @@ var SelectTable = function SelectTable(_ref) {
   }
   function onInput1(e) {
     var val = e.target.value;
-    var newList = cloneDeep(sourceTable.slice());
-    var _new = newList.map(function (v) {
-      var _v$children;
-      return _objectSpread(_objectSpread({}, 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);
+    setTableFilterValue(val);
+    setDatasourceTable(filterDatasourceTables(originDatasourceTable, val));
   }
   function goPrevPage() {
     setVal({
       datasourceId: '',
       datasourceName: '',
+      datasourceType: '',
       name: '',
       name_zh: '',
       tableUuid: '',
@@ -142,14 +282,20 @@ var SelectTable = function SelectTable(_ref) {
             })
           }), datasourceTable.map(function (table) {
             var _table$children;
+            var datasourceType = table.datasourceType || getDefaultDatasourceType(table);
             return _jsxs(React.Fragment, {
-              children: [_jsx("div", {
+              children: [_jsxs("div", {
                 className: cx("Sqb-List-title mx-4 pb-2 pt-2"),
-                children: table.datasourceName
+                children: [_jsx("span", {
+                  children: table.datasourceName
+                }), renderDatasourceTypeSelector(table, datasourceType, function (type) {
+                  return handleFlatDatasourceTypeChange(table, type);
+                })]
               }), 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,
+                  datasourceType: datasourceType,
                   name: '',
                   name_zh: '',
                   id: '',
@@ -160,10 +306,12 @@ var SelectTable = function SelectTable(_ref) {
                   className: cx("Sqb-List-section"),
                   children: _jsx("div", {
                     className: cx("Sqb-List-item mx-2", {
-                      active: value.name === v.name
+                      active: val.datasourceId === table.datasourceId && val.name === v.name && (val.datasourceType || datasourceType) === datasourceType
                     }),
                     onClick: function onClick() {
-                      onChange(_objectSpread(_objectSpread({}, _val), v));
+                      onChange(_objectSpread(_objectSpread(_objectSpread({}, _val), v), {}, {
+                        datasourceType: datasourceType
+                      }));
                     },
                     children: _jsxs("a", {
                       className: 'p-2',
@@ -178,9 +326,9 @@ var SelectTable = function SelectTable(_ref) {
                       })]
                     })
                   })
-                }, v.name);
+                }, "".concat(datasourceType, "_").concat(v.name));
               }))]
-            }, table.datasourceId);
+            }, "".concat(table.datasourceId, "_").concat(datasourceType));
           })]
         })
       })
@@ -206,16 +354,7 @@ var SelectTable = function SelectTable(_ref) {
                   active: val.datasourceId === v.datasourceId
                 }),
                 onClick: function onClick() {
-                  setVal({
-                    datasourceId: v.datasourceId,
-                    datasourceName: v.datasourceName,
-                    name: '',
-                    name_zh: '',
-                    id: '',
-                    tableUuid: uuidv4('table'),
-                    alias: ''
-                  });
-                  getTables(v.datasourceId);
+                  handleSelectDatasource(v);
                 },
                 children: _jsxs("a", {
                   className: 'p-2',
@@ -236,6 +375,8 @@ var SelectTable = function SelectTable(_ref) {
       })
     });
   }
+  var selectedDatasource = getDatasource(val.datasourceId) || val;
+  var datasourceType = val.datasourceType || getDefaultDatasourceType(selectedDatasource);
   return _jsx("div", {
     className: cx("Sqb-SelectTable--box pb-2"),
     children: _jsx("div", {
@@ -248,12 +389,14 @@ var SelectTable = function SelectTable(_ref) {
         },
         children: [_jsx("div", {
           className: 'header',
-          children: _jsx("div", {
+          children: _jsxs("div", {
             className: 'left-info',
-            children: _jsxs("span", {
+            children: [_jsxs("span", {
               onClick: goPrevPage,
               children: [_jsx(LeftArrowIcon, {}), val.datasourceName]
-            })
+            }), renderDatasourceTypeSelector(selectedDatasource, datasourceType, function (type) {
+              return handleDatasourceTypeChange(type);
+            })]
           })
         }), loading ? _jsx("div", {
           className: 'Sqb-SelectTable-loading',
@@ -282,10 +425,12 @@ var SelectTable = function SelectTable(_ref) {
               className: cx("Sqb-List-section"),
               children: _jsx("div", {
                 className: cx("Sqb-List-item mx-2", {
-                  active: value.name === v.name
+                  active: val.datasourceId === value.datasourceId && val.name === v.name && (val.datasourceType || datasourceType) === datasourceType
                 }),
                 onClick: function onClick() {
-                  onChange(_objectSpread(_objectSpread({}, val), v));
+                  onChange(_objectSpread(_objectSpread(_objectSpread({}, val), v), {}, {
+                    datasourceType: datasourceType
+                  }));
                 },
                 children: _jsxs("a", {
                   className: 'p-2',

package/lib/es/components/dialog/select-table/index.less

@@ -28,7 +28,7 @@
       color: #4c5773;
       margin-top: 0;
       margin-bottom: 0;
-      font-size: 14px;
+      font-size: 13px;
       font-weight: 600;
     }
     &:not(.disabled):hover,
@@ -64,10 +64,16 @@
     color: #949aab;
     border-bottom: 1px solid #f0f0f0;
     .left-info {
+      flex: 1;
       padding: 0.5rem 0.5rem 0.5rem 0;
       display: flex;
       align-items: center;
-      span {
+      flex-wrap: wrap;
+      gap: 0.5rem;
+      .Sqb-DatasourceType-radio {
+        margin-left: auto;
+      }
+      > span {
         font-weight: 900;
         font-size: 16px;
         color: #4c5773;
@@ -95,6 +101,13 @@
   .Sqb-List-section {
   }
 
+  .Sqb-List-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 0.75rem;
+  }
+
   .Sqb-List-item {
     display: flex;
     border-radius: 4px;
@@ -167,3 +180,33 @@
     }
   }
 }
+
+.Sqb-DatasourceType-radio {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 0.375rem;
+  justify-content: flex-end;
+}
+
+.Sqb-DatasourceType-radio-item {
+  display: inline-flex;
+  align-items: center;
+  gap: 2px;
+  color: #4c5773;
+  cursor: pointer;
+  font-size: 13px !important;
+  font-weight: 600;
+  line-height: 1.2;
+
+  span {
+    font-size: 13px !important;
+    line-height: 15px;
+  }
+
+  input {
+    margin: 0;
+    width: 13px;
+    height: 13px;
+  }
+}