@gingkoo/pandora-metabase 1.0.14 → 1.0.15

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

@@ -0,0 +1,246 @@
+// 选择表关联字段
+.Sqb-SelectColumns--box {
+  box-sizing: border-box;
+  min-width: 1em;
+  max-width: 500px;
+  background-color: #ffffff;
+  overflow: hidden;
+
+  .Sqb-List-item {
+    display: flex;
+    border-radius: 4px;
+    margin-top: 2px;
+    margin-bottom: 2px;
+
+    .List-item {
+      flex: auto;
+      cursor: pointer;
+      display: flex;
+      align-items: center;
+    }
+    .List-item-icon {
+      display: flex;
+      align-items: center;
+      color: #b8bbc3;
+    }
+    .List-item-title {
+      word-break: break-word;
+      word-wrap: anywhere;
+      color: #4c5773;
+      margin-top: 0;
+      margin-bottom: 0;
+      font-size: 14px;
+    }
+    .Field-extra {
+      display: flex;
+      align-items: center;
+      padding: 0.5rem;
+      cursor: pointer;
+      border-left: 2px solid rgba(113, 114, 173, 0.1);
+      color: rgba(255, 255, 255, 0.5);
+      visibility: hidden;
+      h4 {
+        margin-bottom: 0;
+        color: inherit;
+      }
+      svg {
+        color: #fff;
+        margin-left: 0.5rem;
+      }
+      &:hover {
+        color: #fff;
+      }
+    }
+    &:not(.disabled):hover,
+    &.active {
+      background-color: #509ee3;
+      border-color: rgba(169, 137, 197, 0.2);
+      .List-item-icon {
+        color: #fff !important;
+      }
+      .List-item-title {
+        color: #fff !important;
+      }
+      .Field-extra {
+        visibility: visible;
+      }
+    }
+    &.disabled {
+      .List-item-title {
+        color: #949aab !important;
+      }
+    }
+  }
+
+  .Sqb-List-title {
+    display: flex;
+    border-radius: 4px;
+
+    .List-item {
+      flex: auto;
+      cursor: pointer;
+      display: flex;
+      align-items: center;
+      color: #4c5773;
+      overflow: hidden;
+    }
+    .List-item-icon {
+      display: flex;
+      align-items: center;
+    }
+    .List-item-title {
+      word-break: break-word;
+      word-wrap: anywhere;
+      margin-top: 0;
+      margin-bottom: 0;
+      font-size: 16px;
+      font-weight: 600;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+    }
+
+    .List-title-arrow {
+      margin-left: auto;
+    }
+
+    &.active {
+      .List-item-icon {
+        color: #509ee3;
+      }
+    }
+    &.shrink {
+      cursor: pointer;
+      .List-item {
+        cursor: pointer;
+      }
+      &:hover {
+        .List-item {
+          color: #509ee3;
+          .List-item-title {
+            color: #509ee3;
+          }
+        }
+      }
+    }
+  }
+
+  .Sqb-List-search {
+    display: flex;
+    align-items: center;
+    flex: 1 0 auto;
+    color: #b8bbc3;
+    background-color: #fff;
+    border: 1px solid #f0f0f0;
+    font-size: 14px;
+    span {
+      line-height: 0;
+    }
+    input {
+      box-shadow: none;
+      outline: 0;
+      border: none !important;
+      background: transparent;
+      color: #4c5773;
+      font-size: 1.12em;
+      font-weight: 600;
+      &::-webkit-input-placeholder {
+        color: #b8bbc3;
+      }
+      &::-ms-input-placeholder {
+        color: #b8bbc3;
+      }
+    }
+  }
+
+  &.greenGrass {
+    .Sqb-List-item {
+      &:not(.disabled):hover,
+      &.active {
+        background-color: #88bf4d;
+      }
+    }
+
+    .Sqb-List-title {
+      &.active {
+        .List-item-icon {
+          color: #88bf4d;
+        }
+      }
+      &.shrink {
+        &:hover {
+          a {
+            color: #88bf4d;
+            .List-item-title {
+              color: #88bf4d;
+            }
+          }
+        }
+      }
+    }
+  }
+
+  &.purple {
+    .Sqb-List-item {
+      &:not(.disabled):hover,
+      &.active {
+        background-color: #7172ad;
+      }
+    }
+
+    .Sqb-List-title {
+      &.active {
+        .List-item-icon {
+          color: #7172ad;
+        }
+      }
+      &.shrink {
+        &:hover {
+          a {
+            color: #7172ad;
+            .List-item-title {
+              color: #7172ad;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+.Sqb-SelectColumns-btn {
+  position: sticky;
+  bottom: 0;
+  left: 0;
+  height: 36px;
+
+  &.purple-name {
+    color: white;
+    background-color: rgb(113, 114, 173);
+    &:hover {
+      background-color: rgba(113, 114, 173, 0.8) !important;
+    }
+    svg.closeIcon {
+      opacity: 0.6;
+      margin-left: 8px;
+    }
+    &.notSelected {
+      border: 2px solid rgba(113, 114, 173, 0.25);
+      color: rgb(113, 114, 173);
+      background-color: #fff;
+      &:hover {
+        border-color: rgba(113, 114, 173, 0.8);
+      }
+    }
+  }
+}
+.menu-list {
+  border: none !important;
+  .ant-menu-item:hover {
+    color: #88bf4d !important;
+  }
+  .ant-menu-item-selected {
+    background-color: #88bf4d !important;
+    color: #fff !important;
+    border-radius: 4px !important;
+  }
+}

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

@@ -43,9 +43,9 @@ var SelectTable = function SelectTable(_ref) {
     originList = _useState8[0],
     setOriginList = _useState8[1];
   var _useState9 = useState(value),
-    _useState10 = _slicedToArray(_useState9, 2),
-    val = _useState10[0],
-    setVal = _useState10[1];
+    _useState0 = _slicedToArray(_useState9, 2),
+    val = _useState0[0],
+    setVal = _useState0[1];
   useEffect(function () {
     if (value.datasourceId) {
       getTables(value.datasourceId);
@@ -57,18 +57,18 @@ var SelectTable = function SelectTable(_ref) {
   function _getTables() {
     _getTables = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(datasourceId) {
       var tables;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
+      return _regeneratorRuntime.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();
         }
@@ -91,6 +91,7 @@ var SelectTable = function SelectTable(_ref) {
       datasourceId: '',
       datasourceName: '',
       name: '',
+      name_zh: '',
       tableUuid: '',
       id: '',
       alias: ''
@@ -121,6 +122,7 @@ var SelectTable = function SelectTable(_ref) {
                     datasourceId: v.datasourceId,
                     datasourceName: v.datasourceName,
                     name: '',
+                    name_zh: '',
                     id: '',
                     tableUuid: uuidv4('table'),
                     alias: ''

package/lib/es/components/icons.js

@@ -169,12 +169,12 @@ export var LeftJoinIcon = function LeftJoinIcon(_ref9) {
     })
   });
 };
-export var 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;
+export var 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 _jsx("svg", {
     viewBox: '0 0 32 32',
     width: width,
@@ -188,11 +188,11 @@ export var InnerJoinIcon = function InnerJoinIcon(_ref10) {
     })
   });
 };
-export var 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;
+export var 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 _jsx("svg", {
     className: 'sort-arrow',
     viewBox: '0 0 32 34',
@@ -206,11 +206,11 @@ export var UpArrowIcon = function UpArrowIcon(_ref11) {
     })
   });
 };
-export var 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;
+export var 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 _jsx("svg", {
     className: 'sort-arrow',
     viewBox: '0 0 32 34',
@@ -224,11 +224,11 @@ export var DownArrowIcon = function DownArrowIcon(_ref12) {
     })
   });
 };
-export var 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;
+export var 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 _jsx("svg", {
     className: 'closeIcon',
     viewBox: '0 0 32 32',
@@ -242,11 +242,11 @@ export var CloseIcon = function CloseIcon(_ref13) {
     })
   });
 };
-export var 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;
+export var 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 _jsx("svg", {
     viewBox: '0 0 32 32',
     width: width,
@@ -259,11 +259,11 @@ export var AddIcon = function AddIcon(_ref14) {
     })
   });
 };
-export var 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;
+export var 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 _jsx("svg", {
     viewBox: '0 0 32 32',
     width: width,
@@ -276,11 +276,11 @@ export var TableIcon = function TableIcon(_ref15) {
     })
   });
 };
-export var 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;
+export var 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 _jsx("svg", {
     viewBox: '0 0 32 32',
     width: width,

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

@@ -49,7 +49,7 @@ var Metabase = function Metabase(props) {
   var onSave = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var intercept, _metaList;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
+      return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             intercept = false; // 是否返回
@@ -62,17 +62,17 @@ var Metabase = function Metabase(props) {
               }
             });
             if (!(saveLoading || intercept)) {
-              _context.next = 5;
+              _context.next = 1;
               break;
             }
             return _context.abrupt("return", null);
-          case 5:
+          case 1:
             setSaveLoading(true);
-            _context.next = 8;
+            _context.next = 2;
             return onOk === null || onOk === void 0 ? void 0 : onOk(_metaList);
-          case 8:
+          case 2:
             setSaveLoading(false);
-          case 9:
+          case 3:
           case "end":
             return _context.stop();
         }

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

@@ -51,7 +51,8 @@
       width: 66.6667%;
       box-sizing: border-box;
 
-      .Sqb-Custom-input {
+      .Sqb-Custom-input,
+      .sqb-Custom-input {
         border-radius: 0;
         padding: 0;
         border-top: 0;
@@ -59,6 +60,16 @@
         border-right: 0;
         border: 0;
         background: none !important;
+        .pd-Input,
+        .pd-Input-inner-wrapper {
+          border-radius: 0;
+          padding: 0;
+          border-top: 0;
+          border-left: 0;
+          border-right: 0;
+          border: 0;
+          background: none !important;
+        }
       }
       .Sqb-Filter-item {
         position: relative;

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

@@ -25,19 +25,19 @@ var Wrapper = function Wrapper(_ref) {
   function _animation() {
     _animation = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       var _couterRef$current;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
+      return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.next = 2;
+            _context.next = 1;
             return sleep(10);
-          case 2:
+          case 1:
             setOpacity(1);
             ((_couterRef$current = couterRef.current) === null || _couterRef$current === void 0 || (_couterRef$current = _couterRef$current.childNodes) === null || _couterRef$current === void 0 ? void 0 : _couterRef$current.length) && setMaxHeight(couterRef.current.childNodes[0].clientHeight + 16);
-            _context.next = 6;
+            _context.next = 2;
             return sleep(500);
-          case 6:
+          case 2:
             setMaxHeight('auto');
-          case 7:
+          case 3:
           case "end":
             return _context.stop();
         }

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

@@ -69,14 +69,14 @@ var CustomColumn = function CustomColumn(props) {
   function _handleUpdate() {
     _handleUpdate = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(e, i) {
       var node, newMeta, value, columns;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
+      return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             node = e.currentTarget;
             closePopup();
-            _context.next = 4;
+            _context.next = 1;
             return sleep(100);
-          case 4:
+          case 1:
             newMeta = store.metaList[groupIndex].list.slice();
             value = customColumn[i];
             columns = getAvailableColumns();
@@ -98,7 +98,7 @@ var CustomColumn = function CustomColumn(props) {
                 onClose: closePopup
               })
             });
-          case 8:
+          case 2:
           case "end":
             return _context.stop();
         }
@@ -127,11 +127,10 @@ var CustomColumn = function CustomColumn(props) {
       };
       if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$group = prevGroupBy.group) !== null && _prevGroupBy$group !== void 0 && _prevGroupBy$group.length) {
         _data.columns = _data.columns.concat(prevGroupBy.group.map(function (v) {
-          return _objectSpread(_objectSpread({
-            name_zh: v.quotes
-          }, v), {}, {
-            name: v.quotes,
-            // name_zh: '',
+          return _objectSpread(_objectSpread({}, v), {}, {
+            name: v.name || v.quotes,
+            name_zh: v.name_zh || v.quotes,
+            id: v.id || v.fieldId,
             database_type: (v === null || v === void 0 ? void 0 : v.database_type) || SQL_COLUMN_TYPE.FLOAT,
             sql: v.sql,
             special_type: '',
@@ -141,11 +140,10 @@ var CustomColumn = function CustomColumn(props) {
       }
       if (prevGroupBy !== null && prevGroupBy !== void 0 && (_prevGroupBy$by = prevGroupBy.by) !== null && _prevGroupBy$by !== void 0 && _prevGroupBy$by.length) {
         _data.columns = _data.columns.concat(prevGroupBy.by.map(function (v) {
-          return _objectSpread(_objectSpread({
-            name_zh: v.quotes
-          }, v), {}, {
-            name: v.quotes,
-            // name_zh: '',
+          return _objectSpread(_objectSpread({}, v), {}, {
+            name: v.name || v.quotes,
+            name_zh: v.name_zh || v.quotes,
+            id: v.id || v.fieldId,
             database_type: (v === null || v === void 0 ? void 0 : v.database_type) || SQL_COLUMN_TYPE.FLOAT,
             sql: v.sql,
             special_type: '',

package/lib/es/components/modules/enum/filter-enum.d.ts

@@ -0,0 +1,34 @@
+import { AtomsTypeEnum } from '../../../store/types';
+export declare enum FunctionEnum {
+    LOWER = "lower",
+    UPPER = "upper",
+    SUBSTRING = "substring",
+    REGEX_MATCH_FIRST = "regex-match-first",
+    'CONCAT' = "concat",
+    'REPLACE' = "replace",
+    'TRIM' = "trim",
+    'RTRIM' = "RTRIM",
+    'LTRIM' = "rtrim",
+    'LENGTH' = "length",
+    'ABS' = "abs",
+    'FLOOR' = "floor",
+    'CEIL' = "ceil",
+    'ROUND' = "round",
+    'SQRT' = "sqrt",
+    'POWER' = "power",
+    'LOG' = "log",
+    'EXP' = "exp",
+    'CONTAINS' = "contains",
+    'ENDS_WITH' = "ends-with",
+    'STARTS_WITH' = "starts-with",
+    'BETWEEN' = "between",
+    'TIME_INTERVAL' = "time-interval",
+    'IS_NULL' = "is-null",
+    'IS_EMPTY' = "is-empty",
+    'COALESCE' = "coalesce"
+}
+export declare const operatorList: string[];
+export declare const customTypes: {
+    value: AtomsTypeEnum;
+    label: any;
+}[];