@gingkoo/pandora-metabase 1.0.129 → 1.0.131

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

@@ -28,7 +28,7 @@
       color: #4c5773;
       margin-top: 0;
       margin-bottom: 0;
-      font-size: 13px;
+      font-size: 14px;
       font-weight: 600;
     }
     &:not(.disabled):hover,
@@ -61,24 +61,23 @@
     padding: 0.5rem;
     display: flex;
     align-items: center;
+    justify-content: space-between;
+    gap: 8px;
     color: #949aab;
     border-bottom: 1px solid #f0f0f0;
     .left-info {
-      flex: 1;
+      min-width: 0;
       padding: 0.5rem 0.5rem 0.5rem 0;
       display: flex;
       align-items: center;
-      flex-wrap: wrap;
-      gap: 0.5rem;
-      .Sqb-DatasourceType-radio {
-        margin-left: auto;
-      }
-      > span {
+      flex: 1 1 auto;
+      span {
         font-weight: 900;
         font-size: 16px;
         color: #4c5773;
         display: flex;
         align-items: center;
+        min-width: 0;
         cursor: pointer;
         font-family: 'Lato', sans-serif;
         line-height: 1;
@@ -101,11 +100,18 @@
   .Sqb-List-section {
   }
 
-  .Sqb-List-title {
+  .Sqb-List-title-with-filter {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    gap: 0.75rem;
+    gap: 10px;
+  }
+
+  .Sqb-List-title-text {
+    flex: 1 1 auto;
+    min-width: 80px;
+    word-break: break-word;
+    word-wrap: anywhere;
   }
 
   .Sqb-List-item {
@@ -179,34 +185,43 @@
       }
     }
   }
-}
-
-.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;
+  .Sqb-TableType-tag-group {
+    display: inline-flex;
+    flex-wrap: wrap;
+    justify-content: flex-end;
+    gap: 4px;
+    max-width: 55%;
+    margin-left: auto;
   }
 
-  input {
-    margin: 0;
-    width: 13px;
-    height: 13px;
+  .Sqb-TableType-filter-tag.pd-Tag {
+    max-width: 150px;
+    height: 18px;
+    margin: 0 !important;
+    padding: 0 6px;
+    border: 1px solid #dce0e8;
+    background-color: #fff;
+    color: #5f6b85;
+    font-size: 12px;
+    line-height: 16px;
+    cursor: pointer;
+
+    .pd-Tag-content {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+
+    &:hover {
+      border-color: #509ee3;
+      color: #509ee3;
+    }
+
+    &.pd-Tag-checked {
+      border-color: #509ee3;
+      background-color: #e8f4ff;
+      color: #509ee3;
+    }
   }
 }

package/lib/es/components/metabase/index.js

@@ -55,16 +55,9 @@ var Metabase = function Metabase(props) {
     var doms = store.popupContainer.current.querySelectorAll('.isError');
     var isSqlError = store.popupContainer.current.querySelectorAll('.isSqlError');
     if (isSqlError.length) {
-      Modal.error({
-        title: __('metabase.prompt'),
-        content: __('metabase.validationFilter')
-      });
-      return;
-    }
-    if (doms.length) {
       Modal.confirm({
         title: __('metabase.prompt'),
-        content: __('metabase.validationFailed'),
+        content: __('metabase.validationFormulaSave'),
         onOk: function () {
           var _onOk = _asyncToGenerator(_regeneratorRuntime.mark(function _callee() {
             return _regeneratorRuntime.wrap(function (_context) {
@@ -84,15 +77,40 @@ var Metabase = function Metabase(props) {
           return onOk;
         }()
       });
+      return;
+    }
+    if (doms.length) {
+      Modal.confirm({
+        title: __('metabase.prompt'),
+        content: __('metabase.validationFailed'),
+        onOk: function () {
+          var _onOk2 = _asyncToGenerator(_regeneratorRuntime.mark(function _callee2() {
+            return _regeneratorRuntime.wrap(function (_context2) {
+              while (1) switch (_context2.prev = _context2.next) {
+                case 0:
+                  _context2.next = 1;
+                  return onSave();
+                case 1:
+                case "end":
+                  return _context2.stop();
+              }
+            }, _callee2);
+          }));
+          function onOk() {
+            return _onOk2.apply(this, arguments);
+          }
+          return onOk;
+        }()
+      });
     } else {
       onSave();
     }
   };
   var onSave = function () {
-    var _ref = _asyncToGenerator(_regeneratorRuntime.mark(function _callee2() {
+    var _ref = _asyncToGenerator(_regeneratorRuntime.mark(function _callee3() {
       var intercept, _metaList;
-      return _regeneratorRuntime.wrap(function (_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+      return _regeneratorRuntime.wrap(function (_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
             intercept = false;
             _metaList = normalizeLegacySummarizeForSave(splitByUnion(store.metaList));
@@ -106,21 +124,21 @@ var Metabase = function Metabase(props) {
               }
             });
             if (!(saveLoading || intercept)) {
-              _context2.next = 1;
+              _context3.next = 1;
               break;
             }
-            return _context2.abrupt("return", null);
+            return _context3.abrupt("return", null);
           case 1:
             setSaveLoading(true);
-            _context2.next = 2;
+            _context3.next = 2;
             return onOk === null || onOk === void 0 ? void 0 : onOk(_metaList);
           case 2:
             setSaveLoading(false);
           case 3:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
-      }, _callee2);
+      }, _callee3);
     }));
     return function onSave() {
       return _ref.apply(this, arguments);

package/lib/es/components/modules/components/item-name.js

@@ -7,7 +7,6 @@ var ItemName = function ItemName(props) {
     isError = props.isError,
     message = props.message;
   return _jsx(Badge, {
-    offset: [-8, 0],
     count: isError ? _jsx(Tooltip, {
       title: message || __('metabase.verify'),
       children: _jsx(Button, {

package/lib/es/components/modules/custom-column.js

@@ -127,7 +127,6 @@ var CustomColumn = function CustomColumn(props) {
         alias: prevGroupBy.alias,
         datasourceId: '',
         datasourceName: '',
-        datasourceType: '',
         columns: []
       };
       if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$group = prevGroupBy.group) !== null && _prevGroupBy$group !== void 0 && _prevGroupBy$group.length) {
@@ -171,8 +170,7 @@ var CustomColumn = function CustomColumn(props) {
             tableUuid: v.table2.tableUuid || uuidv4('table'),
             columns: v.columns,
             datasourceId: v.table2.datasourceId,
-            datasourceName: v.table2.datasourceName,
-            datasourceType: v.table2.datasourceType
+            datasourceName: v.table2.datasourceName
           });
         }));
       }
@@ -186,8 +184,7 @@ var CustomColumn = function CustomColumn(props) {
             tableUuid: v.table.tableUuid || uuidv4('table'),
             columns: v.columns,
             datasourceId: mainTable.table.datasourceId,
-            datasourceName: mainTable.table.datasourceName,
-            datasourceType: mainTable.table.datasourceType
+            datasourceName: mainTable.table.datasourceName
           });
         } else if (v.type === TypeEnum.joinData) {
           return _objectSpread(_objectSpread({}, v.table2), {}, {
@@ -197,8 +194,7 @@ var CustomColumn = function CustomColumn(props) {
             tableUuid: v.table2.tableUuid || uuidv4('table'),
             columns: v.columns,
             datasourceId: v.table2.datasourceId,
-            datasourceName: v.table2.datasourceName,
-            datasourceType: v.table2.datasourceType
+            datasourceName: v.table2.datasourceName
           });
         } else {
           return {

package/lib/es/components/modules/filter.js

@@ -82,8 +82,7 @@ var Filter = function Filter(props) {
             tableUuid: v.table2.tableUuid || uuidv4('table'),
             columns: v.columns,
             datasourceId: v.table2.datasourceId,
-            datasourceName: v.table2.datasourceName,
-            datasourceType: v.table2.datasourceType
+            datasourceName: v.table2.datasourceName
           };
         }));
       }
@@ -98,8 +97,7 @@ var Filter = function Filter(props) {
             tableUuid: v.table.tableUuid || uuidv4('table'),
             columns: v.columns,
             datasourceId: mainTable.table.datasourceId,
-            datasourceName: mainTable.table.datasourceName,
-            datasourceType: mainTable.table.datasourceType
+            datasourceName: mainTable.table.datasourceName
           };
         } else if (v.type === TypeEnum.joinData) {
           return {
@@ -110,8 +108,7 @@ var Filter = function Filter(props) {
             tableUuid: v.table2.tableUuid || uuidv4('table'),
             columns: v.columns,
             datasourceId: v.table2.datasourceId,
-            datasourceName: v.table2.datasourceName,
-            datasourceType: v.table2.datasourceType
+            datasourceName: v.table2.datasourceName
           };
         } else {
           return {