@gingkoo/pandora-metabase 1.0.14 → 1.0.15

package/lib/cjs/components/icons.js

@@ -176,12 +176,12 @@ var LeftJoinIcon = exports.LeftJoinIcon = function LeftJoinIcon(_ref9) {
     })
   });
 };
-var InnerJoinIcon = exports.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;
+var InnerJoinIcon = exports.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 (0, _jsxRuntime.jsx)("svg", {
     viewBox: '0 0 32 32',
     width: width,
@@ -195,11 +195,11 @@ var InnerJoinIcon = exports.InnerJoinIcon = function InnerJoinIcon(_ref10) {
     })
   });
 };
-var UpArrowIcon = exports.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;
+var UpArrowIcon = exports.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 (0, _jsxRuntime.jsx)("svg", {
     className: 'sort-arrow',
     viewBox: '0 0 32 34',
@@ -213,11 +213,11 @@ var UpArrowIcon = exports.UpArrowIcon = function UpArrowIcon(_ref11) {
     })
   });
 };
-var DownArrowIcon = exports.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;
+var DownArrowIcon = exports.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 (0, _jsxRuntime.jsx)("svg", {
     className: 'sort-arrow',
     viewBox: '0 0 32 34',
@@ -231,11 +231,11 @@ var DownArrowIcon = exports.DownArrowIcon = function DownArrowIcon(_ref12) {
     })
   });
 };
-var CloseIcon = exports.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;
+var CloseIcon = exports.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 (0, _jsxRuntime.jsx)("svg", {
     className: 'closeIcon',
     viewBox: '0 0 32 32',
@@ -249,11 +249,11 @@ var CloseIcon = exports.CloseIcon = function CloseIcon(_ref13) {
     })
   });
 };
-var AddIcon = exports.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;
+var AddIcon = exports.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 (0, _jsxRuntime.jsx)("svg", {
     viewBox: '0 0 32 32',
     width: width,
@@ -266,11 +266,11 @@ var AddIcon = exports.AddIcon = function AddIcon(_ref14) {
     })
   });
 };
-var TableIcon = exports.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;
+var TableIcon = exports.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 (0, _jsxRuntime.jsx)("svg", {
     viewBox: '0 0 32 32',
     width: width,
@@ -283,11 +283,11 @@ var TableIcon = exports.TableIcon = function TableIcon(_ref15) {
     })
   });
 };
-var SearchIcon = exports.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;
+var SearchIcon = exports.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 (0, _jsxRuntime.jsx)("svg", {
     viewBox: '0 0 32 32',
     width: width,

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

@@ -55,7 +55,7 @@ var Metabase = function Metabase(props) {
   var onSave = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var intercept, _metaList;
-      return _regenerator["default"].wrap(function _callee$(_context) {
+      return _regenerator["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             intercept = false; // 是否返回
@@ -68,17 +68,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/cjs/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/cjs/components/modules/components/Wrapper.js

@@ -32,19 +32,19 @@ var Wrapper = function Wrapper(_ref) {
   function _animation() {
     _animation = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
       var _couterRef$current;
-      return _regenerator["default"].wrap(function _callee$(_context) {
+      return _regenerator["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.next = 2;
+            _context.next = 1;
             return (0, _helper.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 (0, _helper.sleep)(500);
-          case 6:
+          case 2:
             setMaxHeight('auto');
-          case 7:
+          case 3:
           case "end":
             return _context.stop();
         }

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

@@ -73,14 +73,14 @@ var CustomColumn = function CustomColumn(props) {
   function _handleUpdate() {
     _handleUpdate = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(e, i) {
       var node, newMeta, value, columns;
-      return _regenerator["default"].wrap(function _callee$(_context) {
+      return _regenerator["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             node = e.currentTarget;
             closePopup();
-            _context.next = 4;
+            _context.next = 1;
             return (0, _helper.sleep)(100);
-          case 4:
+          case 1:
             newMeta = store.metaList[groupIndex].list.slice();
             value = customColumn[i];
             columns = getAvailableColumns();
@@ -102,7 +102,7 @@ var CustomColumn = function CustomColumn(props) {
                 onClose: closePopup
               })
             });
-          case 8:
+          case 2:
           case "end":
             return _context.stop();
         }
@@ -131,11 +131,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 (0, _objectSpread2["default"])((0, _objectSpread2["default"])({
-            name_zh: v.quotes
-          }, v), {}, {
-            name: v.quotes,
-            // name_zh: '',
+          return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, 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) || _enum.SQL_COLUMN_TYPE.FLOAT,
             sql: v.sql,
             special_type: '',
@@ -145,11 +144,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 (0, _objectSpread2["default"])((0, _objectSpread2["default"])({
-            name_zh: v.quotes
-          }, v), {}, {
-            name: v.quotes,
-            // name_zh: '',
+          return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, 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) || _enum.SQL_COLUMN_TYPE.FLOAT,
             sql: v.sql,
             special_type: '',

package/lib/cjs/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;
+}[];

package/lib/cjs/components/modules/enum/filter-enum.js

@@ -0,0 +1,137 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.operatorList = exports.customTypes = exports.FunctionEnum = void 0;
+var _locale = require("../../../locale");
+var _types = require("../../../store/types");
+// export enum OptionsTypeEnum {
+//   // CONSTANT = 'constant', // 常量
+//   NOT_EXISTS = 'notExists', // 输入框
+//   INPUT = 'input', // 输入框
+//   FIELD = 'field', // 字段
+//   OPERATOR = 'operator', // 运算符
+//   EXPRESSION = 'expression', // 公式
+//   OTHER = 'other', //  其他
+// }
+var FunctionEnum;
+(function (FunctionEnum) {
+  FunctionEnum["LOWER"] = "lower";
+  FunctionEnum["UPPER"] = "upper";
+  FunctionEnum["SUBSTRING"] = "substring";
+  FunctionEnum["REGEX_MATCH_FIRST"] = "regex-match-first";
+  FunctionEnum["CONCAT"] = "concat";
+  FunctionEnum["REPLACE"] = "replace";
+  FunctionEnum["TRIM"] = "trim";
+  FunctionEnum["RTRIM"] = "RTRIM";
+  FunctionEnum["LTRIM"] = "rtrim";
+  FunctionEnum["LENGTH"] = "length";
+  // NUMBER
+  FunctionEnum["ABS"] = "abs";
+  FunctionEnum["FLOOR"] = "floor";
+  FunctionEnum["CEIL"] = "ceil";
+  FunctionEnum["ROUND"] = "round";
+  FunctionEnum["SQRT"] = "sqrt";
+  FunctionEnum["POWER"] = "power";
+  FunctionEnum["LOG"] = "log";
+  FunctionEnum["EXP"] = "exp";
+  // BOOLEAN
+  FunctionEnum["CONTAINS"] = "contains";
+  FunctionEnum["ENDS_WITH"] = "ends-with";
+  FunctionEnum["STARTS_WITH"] = "starts-with";
+  FunctionEnum["BETWEEN"] = "between";
+  FunctionEnum["TIME_INTERVAL"] = "time-interval";
+  FunctionEnum["IS_NULL"] = "is-null";
+  FunctionEnum["IS_EMPTY"] = "is-empty";
+  // OTHER
+  FunctionEnum["COALESCE"] = "coalesce";
+})(FunctionEnum || (exports.FunctionEnum = FunctionEnum = {}));
+var operatorList = exports.operatorList = ['and', 'or', '(', ')', ',', '+', '-', '*', '/', '!=', '<=', '>=', '<', '>', '='
+// 'DESC',
+// 'ASC',
+// 'OVER',
+// 'PARTITION BY',
+// 'ORDER BY',
+];
+// export const otherList = [
+//   'case',
+//   'when',
+//   'then',
+//   'else',
+//   'end',
+//   'RANK()',
+//   'DENSE_RANK()',
+//   'ROW_NUMBER()',
+// ];
+// export const functionList = [
+//   'lower',
+//   'upper',
+//   'substring',
+//   'regex-match-first',
+//   'concat',
+//   'replace',
+//   'trim',
+//   'rtrim',
+//   'ltrim',
+//   'length',
+//   // number
+//   'abs',
+//   'floor',
+//   'ceil',
+//   'round',
+//   'sqrt',
+//   'power',
+//   'log',
+//   'exp',
+//   // boolean
+//   'contains',
+//   'ends-with',
+//   'starts-with',
+//   'between',
+//   'time-interval',
+//   'is-null',
+//   'is-empty',
+//   // other
+//   'coalesce',
+// ];
+var customTypes = exports.customTypes = [
+// 字段
+{
+  value: _types.AtomsTypeEnum.FIELD,
+  label: (0, _locale.__)('customColumn.field')
+},
+// 输入框
+{
+  value: _types.AtomsTypeEnum.INPUT_STRING,
+  label: (0, _locale.__)('SqlQueryBuilder.input')
+},
+// 数字输入框
+{
+  value: _types.AtomsTypeEnum.INPUT_NUMBER,
+  label: (0, _locale.__)('SqlQueryBuilder.numberInput')
+},
+// 表达式
+{
+  value: _types.AtomsTypeEnum.EXPRESSION,
+  label: (0, _locale.__)('customColumn.expression')
+},
+// 操作符
+{
+  value: _types.AtomsTypeEnum.OPERATOR,
+  label: (0, _locale.__)('customColumn.operator')
+},
+// EXISTS
+{
+  value: _types.AtomsTypeEnum.NOT_EXISTS,
+  label: 'NOT_EXISTS'
+}, {
+  value: _types.AtomsTypeEnum.EXISTS,
+  label: 'EXISTS'
+}
+// 更多连接符
+// {
+//   value: AtomsTypeEnum.OPERATOR_MORE,
+//   label: __('customColumn.operatorMore'),
+// },
+];