@gingkoo/pandora-metabase 1.0.26 → 1.0.28

package/lib/es/utils.d.ts

@@ -1,7 +1,9 @@
 import { TypeEnum } from './store/enum';
-import { MetaListType, MetaSummarize, MetaData_TableType, MetaData_ColumnsType } from './store/types';
+import { MetaListType, MetaSummarize, MetaData_TableType, MetaData_ColumnsType, AtomsItem } from './store/types';
 import { DataType } from './components/dialog/select-column-multiple';
 export declare const findIndex: <T>(arr: T[], item: T) => number;
+export declare const getMetaTabels: (data: MetaListType[]) => any;
+export declare const getColumnsTables: (data: DataType[]) => any;
 interface HelperResultType {
     ExistAboveGroupBy: boolean;
     ExistBelowGroupBy: boolean;
@@ -11,6 +13,9 @@ interface HelperResultType {
     nextList: MetaListType[];
     prevGroupBy: MetaSummarize | undefined;
     nextGroupBy: MetaSummarize | undefined;
+    prevTables: {
+        [params: string]: any;
+    };
 }
 export declare const getHelper: (list: MetaListType[], item: MetaListType) => HelperResultType;
 export declare const getSubColumns: (metaList: any) => DataType[];
@@ -21,4 +26,5 @@ export declare function splitByUnion(data: any): any[];
 export declare const patchData: (metas: MetaListType[]) => MetaListType[];
 export declare function reassembleByUnion(target?: any[]): any[];
 export declare const buildSqlQuery: (data: MetaListType[] | undefined, type: string) => string;
+export declare const isError: (item: AtomsItem | AtomsItem[], data: DataType[]) => boolean;
 export {};

package/lib/es/utils.js

@@ -1,18 +1,50 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 var _excluded = ["list"];
 import { __ } from './locale';
 import { TypeEnum, SQL_COLUMN_TYPE } from './store/enum';
 import { AtomsTypeEnum } from './store/types';
 import { summarizeToSql } from './store/helper';
+import { transformSql } from './utils/transformSql';
 import { uuidv4 } from './utils/helper';
 import cloneDeep from 'lodash/cloneDeep';
 import { patchMetas } from './hooks/patch';
 export var findIndex = function findIndex(arr, item) {
   return arr.indexOf(item);
 };
+export var getMetaTabels = function getMetaTabels(data) {
+  var obj = {};
+  data.map(function (v) {
+    if (v.type === TypeEnum.data) {
+      var _v$table, _v$table2;
+      obj[(_v$table = v.table) === null || _v$table === void 0 ? void 0 : _v$table.datasourceId] = _objectSpread(_objectSpread({}, obj[(_v$table2 = v.table) === null || _v$table2 === void 0 ? void 0 : _v$table2.datasourceId]), {}, _defineProperty({}, v.table.id, v.columns));
+    }
+    if (v.type === TypeEnum.joinData) {
+      var _v$table3, _v$table4, _v$table5, _v$table6;
+      obj[((_v$table3 = v.table1) === null || _v$table3 === void 0 ? void 0 : _v$table3.datasourceId) || 'source'] = _objectSpread(_objectSpread({}, obj[(_v$table4 = v.table1) === null || _v$table4 === void 0 ? void 0 : _v$table4.datasourceId]), {}, _defineProperty({}, v.table1.id, v.columns));
+      obj[((_v$table5 = v.table2) === null || _v$table5 === void 0 ? void 0 : _v$table5.datasourceId) || 'source'] = _objectSpread(_objectSpread({}, obj[(_v$table6 = v.table2) === null || _v$table6 === void 0 ? void 0 : _v$table6.datasourceId]), {}, _defineProperty({}, v.table2.id, v.columns));
+    }
+  });
+  return obj;
+};
+export var getColumnsTables = function getColumnsTables(data) {
+  var obj = {};
+  data.map(function (v) {
+    // data也可直接是下拉框
+    var _v$datasourceId = v.datasourceId,
+      datasourceId = _v$datasourceId === void 0 ? 'source' : _v$datasourceId,
+      _v$id = v.id,
+      id = _v$id === void 0 ? '' : _v$id,
+      _v$columns = v.columns,
+      columns = _v$columns === void 0 ? [] : _v$columns;
+    var _datasourceId = datasourceId || 'source';
+    obj[_datasourceId] = _objectSpread(_objectSpread({}, obj[_datasourceId]), {}, _defineProperty({}, id, columns));
+  });
+  return obj;
+};
 export var getHelper = function getHelper(list, item) {
   var types = list.map(function (v) {
     return v.type;
@@ -22,6 +54,7 @@ export var getHelper = function getHelper(list, item) {
   var rightTypes = types.slice(curIndex + 1); // 当前元素下面的所有元素 （不包含自己）
   var leftList = list.slice(0, curIndex);
   var rightList = list.slice(curIndex + 1);
+  var topList = leftList; // 包含自己
   var ExistAboveGroupBy = false;
   var ExistBelowGroupBy = false;
   var prevTypes = [];
@@ -30,12 +63,14 @@ export var getHelper = function getHelper(list, item) {
   var nextList = [];
   var prevGroupBy;
   var nextGroupBy;
+  var prevTables = {};
   if (~leftTypes.indexOf(TypeEnum.summarize)) {
     ExistAboveGroupBy = true;
     var i = leftTypes.lastIndexOf(TypeEnum.summarize);
     prevTypes = leftTypes.slice(i + 1);
     prevList = leftList.slice(i + 1);
     prevGroupBy = list[i];
+    topList = topList.slice(i + 1);
   }
   if (~rightTypes.indexOf(TypeEnum.summarize)) {
     ExistBelowGroupBy = true;
@@ -44,6 +79,7 @@ export var getHelper = function getHelper(list, item) {
     nextList = rightList.slice(0, _i);
     nextGroupBy = list[curIndex + _i + 1];
   }
+  prevTables = getMetaTabels(topList);
   return {
     ExistAboveGroupBy: ExistAboveGroupBy,
     ExistBelowGroupBy: ExistBelowGroupBy,
@@ -52,7 +88,8 @@ export var getHelper = function getHelper(list, item) {
     prevList: prevList,
     nextList: nextList,
     prevGroupBy: prevGroupBy,
-    nextGroupBy: nextGroupBy
+    nextGroupBy: nextGroupBy,
+    prevTables: prevTables
   };
 };
 // 获取子查询的字段
@@ -254,7 +291,7 @@ var _changeAlias = function changeAlias(items, val, type) {
 };
 export function isValidSQLAlias(str) {
   if (!str) return false;
-  var regex = /^[A-Za-z_]{0,30}$/;
+  var regex = /^[a-zA-Z][a-zA-Z0-9_]{0,30}$/;
   return regex.test(str);
 }
 export var changeTableAlias = function changeTableAlias(list, curObj) {
@@ -538,6 +575,10 @@ export function reassembleByUnion() {
 export var buildSqlQuery = function buildSqlQuery() {
   var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var type = arguments.length > 1 ? arguments[1] : undefined;
+  var typeName = type === AtomsTypeEnum.EXISTS ? 'EXISTS' : 'NOT EXISTS';
+  var _transformSql = transformSql(data),
+    sql = _transformSql.sql;
+  return "".concat(typeName, " (").concat(sql, ") ");
   if (!data || data.length === 0) return '';
   var name = type === AtomsTypeEnum.EXISTS ? 'EXISTS' : 'NOT EXISTS';
   var sqlClauses = ["".concat(name, " (")];
@@ -623,4 +664,61 @@ export var buildSqlQuery = function buildSqlQuery() {
   }
   sqlClauses.push(')');
   return sqlClauses.join(' ');
-};
+};
+var _isError = function isError(item, data) {
+  var tables = getColumnsTables(data);
+  // 不存在
+  if (!item) {
+    return false;
+  }
+  if (Array.isArray(item)) {
+    return item.some(function (v) {
+      return _isError(v, data);
+    }); // item可能为数组关联的时候有多选情况，只要有一个错，整体就错
+  }
+  // 字段类型
+  if (item.type === AtomsTypeEnum.FIELD) {
+    var datasourceId = item.datasourceId,
+      _item$tableId = item.tableId,
+      tableId = _item$tableId === void 0 ? '' : _item$tableId,
+      fieldName = item.fieldName;
+    var _datasourceId = datasourceId || 'source'; // 默认为source
+    if (tableId === 'source') {
+      _datasourceId = 'source';
+    }
+    if (!tableId) {
+      return false; // 未选不报错
+    }
+    if (_datasourceId === 'source') {
+      var _tables$_datasourceId;
+      // 检查是否所有字段的 name 都不等于 fieldName
+      if (!(tables !== null && tables !== void 0 && (_tables$_datasourceId = tables[_datasourceId]) !== null && _tables$_datasourceId !== void 0 && _tables$_datasourceId[tableId])) {
+        return true;
+      } else {
+        var _tables$_datasourceId2;
+        return tables === null || tables === void 0 || (_tables$_datasourceId2 = tables[_datasourceId]) === null || _tables$_datasourceId2 === void 0 || (_tables$_datasourceId2 = _tables$_datasourceId2[tableId]) === null || _tables$_datasourceId2 === void 0 ? void 0 : _tables$_datasourceId2.every(function (field) {
+          return field.name !== fieldName;
+        });
+      }
+    } else {
+      var _tables$_datasourceId3;
+      return !(tables !== null && tables !== void 0 && (_tables$_datasourceId3 = tables[_datasourceId]) !== null && _tables$_datasourceId3 !== void 0 && _tables$_datasourceId3[tableId]); // 注意：返回 true 表示“有错误”
+    }
+  }
+  // 表达式类型
+  if (item.type === AtomsTypeEnum.EXPRESSION) {
+    var lhsHasError = _isError(item.lhs, data);
+    var rhsHasError = _isError(item.rhs, data);
+    return lhsHasError || rhsHasError;
+  }
+  // 公式
+  if (item.type === AtomsTypeEnum.FORMULA) {
+    return _isError(item.args, data);
+  }
+  // 公式
+  if (item.type === AtomsTypeEnum.COLLECTION) {
+    return _isError(item.list, data);
+  }
+  return false; // 其他类型默认无错误
+};
+export { _isError as isError };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gingkoo/pandora-metabase",
-  "version": "1.0.26",
+  "version": "1.0.28",
   "description": "",
   "main": "lib/es/index.js",
   "module": "lib/es/index.js",