@gingkoo/pandora-metabase 1.0.14 → 1.0.16

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

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getTemplate = void 0;
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/toConsumableArray"));
-var _enum = require("./enum");
+var _types = require("../../../store/types");
 /**
  *
  * @param type 当前选择的类型
@@ -23,71 +23,102 @@ var getTemplate = exports.getTemplate = function getTemplate(oldType, type, list
   }
   if (type === 'case') {
     temList = [{
-      operator: 'when',
-      type: _enum.OptionsTypeEnum.OTHER,
-      expression: ''
+      val: 'when',
+      type: _types.AtomsTypeEnum.OPERATOR
     }, {
-      operator: '',
-      type: '',
-      expression: ''
+      val: '',
+      type: _types.AtomsTypeEnum.UNKNOWN
     }, {
-      operator: 'then',
-      type: _enum.OptionsTypeEnum.OTHER,
-      expression: ''
+      val: 'then',
+      type: _types.AtomsTypeEnum.OPERATOR
     }, {
-      operator: '',
-      type: '',
-      expression: ''
+      val: '',
+      type: _types.AtomsTypeEnum.UNKNOWN
     }, {
-      operator: 'end',
-      type: _enum.OptionsTypeEnum.OTHER,
-      expression: ''
+      val: 'end',
+      type: _types.AtomsTypeEnum.OPERATOR
     }];
   }
   if (type === 'when') {
     temList = [{
-      operator: '',
-      type: '',
-      expression: ''
+      val: '',
+      type: _types.AtomsTypeEnum.UNKNOWN
     }, {
-      operator: 'then',
-      type: _enum.OptionsTypeEnum.OTHER,
-      expression: ''
+      val: 'then',
+      type: _types.AtomsTypeEnum.OPERATOR
     }, {
-      operator: '',
-      type: '',
-      expression: ''
+      val: '',
+      type: _types.AtomsTypeEnum.UNKNOWN
     }];
   }
   if (type === 'RANK()' || type === 'DENSE_RANK()' || type === 'ROW_NUMBER()') {
     temList = [{
-      operator: 'OVER',
-      type: _enum.OptionsTypeEnum.OPERATOR,
-      expression: ''
+      val: 'OVER',
+      type: _types.AtomsTypeEnum.OPERATOR
     }, {
-      operator: '(',
-      type: _enum.OptionsTypeEnum.OPERATOR,
-      expression: ''
+      val: '(',
+      type: _types.AtomsTypeEnum.OPERATOR
     }, {
-      operator: 'PARTITION BY',
-      type: _enum.OptionsTypeEnum.OPERATOR,
-      expression: ''
+      val: 'PARTITION BY',
+      type: _types.AtomsTypeEnum.OPERATOR
     }, {
-      operator: '',
-      type: _enum.OptionsTypeEnum.FIELD,
-      expression: ''
+      fieldName: '',
+      // 字段名
+      fieldNameZh: '',
+      // 字段中文名
+      fieldAlias: '',
+      // 别名
+      fieldUuid: '',
+      // uuid
+      fieldId: '',
+      // 字段id
+      // quotes?: string; // 字段展示的 不知道有没有用
+      tableName: '',
+      // 表名
+      tableNameZh: '',
+      tableId: '',
+      // 表名
+      tableAlias: '',
+      // 别名
+      tableUuid: '',
+      // 表唯一标识
+      datasourceName: '',
+      // 数据源名
+      datasourceId: '',
+      // 数据源id
+      type: _types.AtomsTypeEnum.FIELD
     }, {
-      operator: 'ORDER BY',
-      type: _enum.OptionsTypeEnum.OPERATOR,
-      expression: ''
+      val: 'ORDER BY',
+      type: _types.AtomsTypeEnum.OPERATOR
     }, {
-      operator: '',
-      type: _enum.OptionsTypeEnum.FIELD,
-      expression: ''
+      fieldName: '',
+      // 字段名
+      fieldNameZh: '',
+      // 字段中文名
+      fieldAlias: '',
+      // 别名
+      fieldUuid: '',
+      // uuid
+      fieldId: '',
+      // 字段id
+      // quotes?: string; // 字段展示的 不知道有没有用
+      tableName: '',
+      // 表名
+      tableNameZh: '',
+      tableId: '',
+      // 表名
+      tableAlias: '',
+      // 别名
+      tableUuid: '',
+      // 表唯一标识
+      datasourceName: '',
+      // 数据源名
+      datasourceId: '',
+      // 数据源id
+      type: _types.AtomsTypeEnum.FIELD
     }, {
-      operator: ')',
-      type: _enum.OptionsTypeEnum.OPERATOR,
-      expression: ''
+      val: ')',
+      type: _types.AtomsTypeEnum.OPERATOR
     }];
   }
   list.splice.apply(list, [index + 1, 0].concat((0, _toConsumableArray2["default"])(temList)));

package/lib/cjs/components/dialog/index.d.ts

@@ -1,10 +1,10 @@
 export { default as CustomColumnPopup } from './custom-column/index';
 export { default as SelectColumn } from './select-column/index';
 export { default as SelectJoinColumn } from './select-join-column/index';
-export { default as SelectJoinColumnMultiple } from './select-join-column-multiple/index';
-export { default as SelectFilter } from './select-filter/index';
+export { default as SelectColumnMultiple } from './select-column-multiple/index';
 export { default as SelectSummarize } from './select-summarize/index';
 export { default as SelectJoin } from './select-join/index';
 export { default as SelectTable } from './select-table/index';
 export { default as SelectPermissionTable } from './select-permission-table/index';
 export { default as FormulaList } from './formula-list/index';
+export { default as Expression } from './expression/index';

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

@@ -10,10 +10,16 @@ Object.defineProperty(exports, "CustomColumnPopup", {
     return _index["default"];
   }
 });
+Object.defineProperty(exports, "Expression", {
+  enumerable: true,
+  get: function get() {
+    return _index0["default"];
+  }
+});
 Object.defineProperty(exports, "FormulaList", {
   enumerable: true,
   get: function get() {
-    return _index10["default"];
+    return _index9["default"];
   }
 });
 Object.defineProperty(exports, "SelectColumn", {
@@ -22,16 +28,16 @@ Object.defineProperty(exports, "SelectColumn", {
     return _index2["default"];
   }
 });
-Object.defineProperty(exports, "SelectFilter", {
+Object.defineProperty(exports, "SelectColumnMultiple", {
   enumerable: true,
   get: function get() {
-    return _index5["default"];
+    return _index4["default"];
   }
 });
 Object.defineProperty(exports, "SelectJoin", {
   enumerable: true,
   get: function get() {
-    return _index7["default"];
+    return _index6["default"];
   }
 });
 Object.defineProperty(exports, "SelectJoinColumn", {
@@ -40,37 +46,31 @@ Object.defineProperty(exports, "SelectJoinColumn", {
     return _index3["default"];
   }
 });
-Object.defineProperty(exports, "SelectJoinColumnMultiple", {
-  enumerable: true,
-  get: function get() {
-    return _index4["default"];
-  }
-});
 Object.defineProperty(exports, "SelectPermissionTable", {
   enumerable: true,
   get: function get() {
-    return _index9["default"];
+    return _index8["default"];
   }
 });
 Object.defineProperty(exports, "SelectSummarize", {
   enumerable: true,
   get: function get() {
-    return _index6["default"];
+    return _index5["default"];
   }
 });
 Object.defineProperty(exports, "SelectTable", {
   enumerable: true,
   get: function get() {
-    return _index8["default"];
+    return _index7["default"];
   }
 });
 var _index = _interopRequireDefault(require("./custom-column/index"));
 var _index2 = _interopRequireDefault(require("./select-column/index"));
 var _index3 = _interopRequireDefault(require("./select-join-column/index"));
-var _index4 = _interopRequireDefault(require("./select-join-column-multiple/index"));
-var _index5 = _interopRequireDefault(require("./select-filter/index"));
-var _index6 = _interopRequireDefault(require("./select-summarize/index"));
-var _index7 = _interopRequireDefault(require("./select-join/index"));
-var _index8 = _interopRequireDefault(require("./select-table/index"));
-var _index9 = _interopRequireDefault(require("./select-permission-table/index"));
-var _index10 = _interopRequireDefault(require("./formula-list/index"));
+var _index4 = _interopRequireDefault(require("./select-column-multiple/index"));
+var _index5 = _interopRequireDefault(require("./select-summarize/index"));
+var _index6 = _interopRequireDefault(require("./select-join/index"));
+var _index7 = _interopRequireDefault(require("./select-table/index"));
+var _index8 = _interopRequireDefault(require("./select-permission-table/index"));
+var _index9 = _interopRequireDefault(require("./formula-list/index"));
+var _index0 = _interopRequireDefault(require("./expression/index"));

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

@@ -5,7 +5,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
 var _jsxRuntime = require("react/jsx-runtime");
 require("./index.less");
@@ -99,18 +101,47 @@ var SelectColumn = function SelectColumn(_ref) {
           fieldAlias = val;
         }
       }),
-      onOk: function onOk() {
-        var newColumns = (0, _cloneDeep["default"])(columns);
-        var newMetaList = store.metaList[groupIndex].list.slice();
-        newColumns[i].fieldAlias = fieldAlias;
-        newColumns[i].fieldUuid = newColumns[i].fieldUuid || (0, _helper.uuidv4)('field');
-        newMetaList = (0, _utils.changeFieldAlias)(newMetaList, newColumns[i]);
-        store.setMeta(newMetaList, groupIndex);
-        onSelect(newColumns);
-        setTimeout(function () {
-          store.setClosable(true);
-        }, 0);
-      },
+      onOk: function () {
+        var _onOk = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
+          var newColumns, newMetaList;
+          return _regenerator["default"].wrap(function (_context) {
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                if (fieldAlias) {
+                  _context.next = 1;
+                  break;
+                }
+                _pandora.Toast.warning((0, _locale.__)('SqlQueryBuilder.aliasCannotEmpty'));
+                return _context.abrupt("return", false);
+              case 1:
+                if (!(fieldAlias.length > 30)) {
+                  _context.next = 2;
+                  break;
+                }
+                _pandora.Toast.warning('别名长度不能超过30');
+                return _context.abrupt("return", false);
+              case 2:
+                newColumns = (0, _cloneDeep["default"])(columns);
+                newMetaList = store.metaList[groupIndex].list.slice();
+                newColumns[i].fieldAlias = fieldAlias;
+                newColumns[i].fieldUuid = newColumns[i].fieldUuid || (0, _helper.uuidv4)('field');
+                newMetaList = (0, _utils.changeFieldAlias)(newMetaList, newColumns[i]);
+                store.setMeta(newMetaList, groupIndex);
+                onSelect(newColumns);
+                setTimeout(function () {
+                  store.setClosable(true);
+                }, 0);
+              case 3:
+              case "end":
+                return _context.stop();
+            }
+          }, _callee);
+        }));
+        function onOk() {
+          return _onOk.apply(this, arguments);
+        }
+        return onOk;
+      }(),
       onCancel: function onCancel() {
         setTimeout(function () {
           store.setClosable(true);

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

@@ -0,0 +1,54 @@
+/**
+ * 选择表字段当条件
+ * 谁在用？
+ * 1、关联模块
+ * 2、过滤器模块
+ * 3、聚合模块
+ * 4、排序模块
+ */
+import './index.less';
+import { ColumnsPopupThemeEnum, SQL_COLUMN_TYPE } from '../../../store/enum';
+import { MetaData_ColumnsType, MetaJoin_TalbeType, AtomsField } from '../../../store/types';
+import { DatasourceType } from '../../../types';
+export declare const DATE_GROUP_MAP: Map<string, string>;
+export declare const NUMBER_GROUP_MAP: Map<string, string>;
+export interface ColumnType {
+    fieldUuid: string;
+    fieldAlias: string;
+    alias: string;
+    name: string;
+    database_type: SQL_COLUMN_TYPE | string;
+    sql?: string;
+    id: string;
+    datasourceId: string;
+    datasourceName: string;
+    table2?: Omit<MetaJoin_TalbeType, 'column' | 'column_id'> | null;
+}
+export interface ColumnGroupType {
+    condition: string;
+}
+export type DataType = Partial<DatasourceType> & {
+    name: string;
+    id: string;
+    name_zh: string;
+    tableUuid: string;
+    alias: string;
+    columns: MetaData_ColumnsType[];
+};
+interface PropsType {
+    data: DataType[];
+    value: AtomsField[];
+    theme: ColumnsPopupThemeEnum;
+    isGroup?: boolean;
+    onSelect?: (fields: AtomsField[], quotes: string) => void;
+    onGroup?: (record: ColumnType & ColumnGroupType & {
+        realName?: string;
+    }) => void;
+    didUpdate?: Function;
+    multiple?: boolean;
+    showNextBtn?: boolean;
+    nextBtnText?: string;
+    onNextStep?: () => void;
+}
+declare const SelectJoinColumn: ({ data, value: _value, theme, onSelect, isGroup, onGroup, didUpdate, multiple, showNextBtn, nextBtnText, onNextStep, }: PropsType) => import("react/jsx-runtime").JSX.Element;
+export default SelectJoinColumn;