@gingkoo/pandora-metabase 1.0.141 → 1.0.143

package/lib/es/index.js

@@ -8,7 +8,7 @@ import './locale/zh';
 import { __ } from './locale';
 import Loading from './common/Loading';
 import Metabase from './components/metabase';
-import { reassembleByUnion, patchData, splitByUnion, normalizeLegacySummarizeForSave } from './utils';
+import { reassembleByUnion, patchData, splitByUnion, normalizeLegacySummarizeForSave, normalizeAndOrStructure } from './utils';
 import cloneDeep from 'lodash/cloneDeep';
 var EMPTY_ARRAY = [];
 var SqlVisionBuilder = React.forwardRef(function (props, ref) {
@@ -20,6 +20,8 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     getColumns = props.getColumns,
     onChange = props.onChange,
     getModuleDiffCode = props.getModuleDiffCode,
+    getFormulaSqlCode = props.getFormulaSqlCode,
+    getFormulaDiffCode = props.getFormulaDiffCode,
     getExistsError = props.getExistsError,
     _props$tableNameTpl = props.tableNameTpl,
     tableNameTpl = _props$tableNameTpl === void 0 ? '${name}' : _props$tableNameTpl,
@@ -66,6 +68,10 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     moduleDiff = _props$moduleDiff === void 0 ? false : _props$moduleDiff,
     _props$moduleCopy = props.moduleCopy,
     moduleCopy = _props$moduleCopy === void 0 ? false : _props$moduleCopy,
+    _props$showFormulaSql = props.showFormulaSql,
+    showFormulaSql = _props$showFormulaSql === void 0 ? true : _props$showFormulaSql,
+    _props$showFormulaDif = props.showFormulaDiff,
+    showFormulaDiff = _props$showFormulaDif === void 0 ? true : _props$showFormulaDif,
     _props$joinAliasConfl = props.joinAliasConflictCheck,
     joinAliasConflictCheck = _props$joinAliasConfl === void 0 ? false : _props$joinAliasConfl,
     _props$operatorList = props.operatorList,
@@ -76,13 +82,19 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     getColumns && store.setFetchColumnsFn(getColumns);
     onChange && store.setFetchChangeFn(onChange);
     getModuleDiffCode && store.setFetchDiffFn(getModuleDiffCode);
+    store.setFetchFormulaSqlFn(getFormulaSqlCode);
+    store.setFetchFormulaDiffFn(getFormulaDiffCode);
   }, []);
+  useEffect(function () {
+    store.setFetchFormulaSqlFn(getFormulaSqlCode);
+    store.setFetchFormulaDiffFn(getFormulaDiffCode);
+  }, [getFormulaSqlCode, getFormulaDiffCode]);
   useEffect(function () {
     store.setProps(props);
   }, [props]);
   useEffect(function () {
-    var _value = reassembleByUnion(patchData(value, constantList, formulaTemplates));
-    var source_value = patchData(value, constantList, formulaTemplates);
+    var source_value = normalizeAndOrStructure(patchData(value, constantList, formulaTemplates));
+    var _value = reassembleByUnion(source_value);
     store.setPreData(cloneDeep(_value), isSubquery, isExit);
     store.setSourceData(source_value);
     getExistsError && store.setExistsErrorFn(getExistsError, value);
@@ -110,11 +122,13 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     store.setCopyType(copyType || []);
     store.setMetabaseCopy(metabaseCopy);
     store.setModuleDiff(moduleDiff);
+    store.setShowFormulaSql(showFormulaSql);
+    store.setShowFormulaDiff(showFormulaDiff);
     store.setIsSubquery(isSubquery);
     store.setModuleCopy(moduleCopy);
     store.setJoinAliasConflictCheck(joinAliasConflictCheck);
     store.setOperatorList(operatorList || []);
-  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit, tableEnableAlias, fieldEnableAlias, groupByEnableAlias, isSelectFields, tableFlat, copyType, metabaseCopy, moduleDiff, isSubquery, moduleCopy, joinAliasConflictCheck, operatorList]);
+  }, [showFields, fieldNameTpl, tableNameTpl, toolbar, showSubquery, subShowSubquery, constantList, formulaTemplates, ignoreGroupByType, filterCustomType, isExit, tableEnableAlias, fieldEnableAlias, groupByEnableAlias, isSelectFields, tableFlat, copyType, metabaseCopy, moduleDiff, showFormulaSql, showFormulaDiff, getFormulaSqlCode, getFormulaDiffCode, isSubquery, moduleCopy, joinAliasConflictCheck, operatorList]);
   React.useImperativeHandle(ref, function () {
     return {
       reset: function reset() {

package/lib/es/store/types.d.ts

@@ -97,10 +97,10 @@ export interface AtomsCaseWhen {
     type: AtomsTypeEnum.CASE_WHEN;
 }
 export interface AtomsAndOr {
-    operator: 'and' | 'or';
-    leftAtoms?: AtomsItem[];
-    rightAtoms?: AtomsItem[];
-    atoms?: AtomsItem[];
+    items: {
+        operator?: 'and' | 'or';
+        atoms: AtomsItem[];
+    }[];
     quotes: string;
     type: AtomsTypeEnum.AND_OR;
 }

package/lib/es/types.d.ts

@@ -1,4 +1,4 @@
-import type { MetaListType, ToolbarType, FormulaTemplatesItem, ChangeType, FormulaTypeEnum } from './store/types';
+import type { MetaListType, ToolbarType, FormulaTemplatesItem, ChangeType, FormulaTypeEnum, AtomsItem } from './store/types';
 import { UnionEnum } from './store/enum';
 import { DataType } from './components/dialog/select-join-column';
 export interface MetaListProps {
@@ -11,6 +11,21 @@ export interface MetaListProps {
 export interface FetchOptions {
     isExit: boolean;
 }
+export type FormulaSqlCodeResult = string | {
+    sql?: string;
+    code?: string;
+    [key: string]: any;
+};
+export type FormulaDiffCodeResult = string | {
+    oldCode?: string;
+    newCode?: string;
+    code?: string;
+    [key: string]: any;
+};
+export interface FormulaDiffCodeParams {
+    oldCode: AtomsItem[];
+    newCode: AtomsItem[];
+}
 export interface MetabaseProps {
     loading?: boolean;
     btnText?: string;
@@ -52,6 +67,8 @@ export interface MetabaseProps {
     metabaseCopy?: boolean;
     moduleDiff?: boolean;
     moduleCopy?: boolean;
+    showFormulaSql?: boolean;
+    showFormulaDiff?: boolean;
     joinAliasConflictCheck?: boolean;
     getModuleDiffCode?: (obj: {
         oldCode: MetaListType;
@@ -60,6 +77,8 @@ export interface MetabaseProps {
         oldCode: string;
         newCode: string;
     }>;
+    getFormulaSqlCode?: (value: AtomsItem[]) => Promise<FormulaSqlCodeResult> | FormulaSqlCodeResult;
+    getFormulaDiffCode?: (params: FormulaDiffCodeParams) => Promise<FormulaDiffCodeResult> | FormulaDiffCodeResult;
     getExistsError?: (params: MetaListType[]) => Promise<any[]>;
     operatorList?: any[];
     otherTypes?: any[];

package/lib/es/utils/transformSql.js

@@ -1,6 +1,6 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 var _excluded = ["children"];
 var procEnum = {
   mysql: 'mysql',
@@ -48,6 +48,28 @@ var SQL_COLUMN_TYPE = {
   LONG: 'LONG',
   CURRENCY: 'CURRENCY'
 };
+var normalizeAndOrItems = function normalizeAndOrItems(item) {
+  if (Array.isArray(item.items) && item.items.length > 0) {
+    return item.items.map(function (logicItem, index) {
+      return _objectSpread(_objectSpread({}, index > 0 ? {
+        operator: logicItem.operator || item.operator || 'and'
+      } : {}), {}, {
+        atoms: Array.isArray(logicItem.atoms) ? logicItem.atoms : []
+      });
+    });
+  }
+  if (Array.isArray(item.leftAtoms) || Array.isArray(item.rightAtoms)) {
+    return [{
+      atoms: Array.isArray(item.leftAtoms) ? item.leftAtoms : []
+    }, {
+      operator: item.operator || 'and',
+      atoms: Array.isArray(item.rightAtoms) ? item.rightAtoms : []
+    }];
+  }
+  return [{
+    atoms: Array.isArray(item.atoms) ? item.atoms : []
+  }];
+};
 var DATE_GROUP = [SQL_COLUMN_TYPE.DATE];
 var NUMBER_GROUP = [SQL_COLUMN_TYPE.FLOAT, SQL_COLUMN_TYPE.LONG, SQL_COLUMN_TYPE.CURRENCY];
 var STRING_GROUP = [SQL_COLUMN_TYPE.STRING];
@@ -66,7 +88,7 @@ var _recursionArr2 = function _recursionArr(arr) {
   }
   return obj;
 };
-var _handleBaseType2Sql1 = function handleBaseType2Sql(list) {
+var _handleBaseType2Sql9 = function handleBaseType2Sql(list) {
   var db = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : procEnum.mysql;
   var sql = '';
   var constants = [];
@@ -128,11 +150,11 @@ var _handleBaseType2Sql1 = function handleBaseType2Sql(list) {
     if (type === BlockTypeEnum.joinDefault) {
       var lhs = item.lhs,
         rhs = item.rhs;
-      var _handleBaseType2Sql = _handleBaseType2Sql1(lhs, db),
+      var _handleBaseType2Sql = _handleBaseType2Sql9(lhs, db),
         leftSql = _handleBaseType2Sql.sql,
         leftSqlItems = _handleBaseType2Sql.sql_items,
         joinDefaultLeftConstants = _handleBaseType2Sql.constants;
-      var _handleBaseType2Sql2 = _handleBaseType2Sql1(rhs, db),
+      var _handleBaseType2Sql2 = _handleBaseType2Sql9(rhs, db),
         rightSql = _handleBaseType2Sql2.sql,
         rightSqlItems = _handleBaseType2Sql2.sql_items,
         joinDefaultRightConstants = _handleBaseType2Sql2.constants;
@@ -170,11 +192,11 @@ var _handleBaseType2Sql1 = function handleBaseType2Sql(list) {
         condition = item.condition,
         database_type = item.database_type,
         formula = item.formula;
-      var _handleBaseType2Sql3 = _handleBaseType2Sql1(_lhs, db),
+      var _handleBaseType2Sql3 = _handleBaseType2Sql9(_lhs, db),
         _leftSql = _handleBaseType2Sql3.sql,
         _leftSqlItems = _handleBaseType2Sql3.sql_items,
         _joinDefaultLeftConstants = _handleBaseType2Sql3.constants;
-      var _handleBaseType2Sql4 = _handleBaseType2Sql1(_rhs, db),
+      var _handleBaseType2Sql4 = _handleBaseType2Sql9(_rhs, db),
         _rightSql = _handleBaseType2Sql4.sql,
         _rightSqlItems = _handleBaseType2Sql4.sql_items,
         _joinDefaultRightConstants = _handleBaseType2Sql4.constants;
@@ -446,13 +468,13 @@ var _handleBaseType2Sql1 = function handleBaseType2Sql(list) {
     if (type === BlockTypeEnum.FORMULA) {
       var argSqlList = (Array.isArray(item.args) ? item.args : []).map(function (arg) {
         if ((arg === null || arg === void 0 ? void 0 : arg.type) === BlockTypeEnum.collection) {
-          var _handleBaseType2Sql5 = _handleBaseType2Sql1(arg.list, db),
+          var _handleBaseType2Sql5 = _handleBaseType2Sql9(arg.list, db),
             collectionSql = _handleBaseType2Sql5.sql,
             collectionConstants = _handleBaseType2Sql5.constants;
           constants.push.apply(constants, _toConsumableArray(collectionConstants));
           return collectionSql.trim();
         }
-        var _handleBaseType2Sql6 = _handleBaseType2Sql1([arg], db),
+        var _handleBaseType2Sql6 = _handleBaseType2Sql9([arg], db),
           nestedSql = _handleBaseType2Sql6.sql,
           nestedConstants = _handleBaseType2Sql6.constants;
         constants.push.apply(constants, _toConsumableArray(nestedConstants));
@@ -461,31 +483,22 @@ var _handleBaseType2Sql1 = function handleBaseType2Sql(list) {
       sql += " ".concat(item.name, "(").concat(argSqlList.join(', '), ")");
     }
     if (type === BlockTypeEnum.collection) {
-      var _handleBaseType2Sql7 = _handleBaseType2Sql1(item.list, db),
+      var _handleBaseType2Sql7 = _handleBaseType2Sql9(item.list, db),
         collectionSql = _handleBaseType2Sql7.sql,
         collectionConstants = _handleBaseType2Sql7.constants;
       sql += " ".concat(collectionSql);
       constants.push.apply(constants, _toConsumableArray(collectionConstants));
     }
     if (type === BlockTypeEnum.andOr) {
-      var hasBinarySides = Array.isArray(item.leftAtoms) || Array.isArray(item.rightAtoms);
-      if (hasBinarySides) {
-        var _handleBaseType2Sql8 = _handleBaseType2Sql1(item.leftAtoms || [], db),
-          _leftSql2 = _handleBaseType2Sql8.sql,
-          leftConstants = _handleBaseType2Sql8.constants;
-        var _handleBaseType2Sql9 = _handleBaseType2Sql1(item.rightAtoms || [], db),
-          _rightSql2 = _handleBaseType2Sql9.sql,
-          rightConstants = _handleBaseType2Sql9.constants;
-        constants.push.apply(constants, _toConsumableArray(leftConstants).concat(_toConsumableArray(rightConstants)));
-        var operator = (item.operator || 'and').toUpperCase();
-        sql += " (".concat(_leftSql2.trim(), " ").concat(operator, " ").concat(_rightSql2.trim(), ")");
-      } else {
-        var _handleBaseType2Sql0 = _handleBaseType2Sql1(item.atoms || [], db),
-          atomsSql = _handleBaseType2Sql0.sql,
-          nestedConstants = _handleBaseType2Sql0.constants;
+      var itemsSql = normalizeAndOrItems(item).map(function (logicItem, index) {
+        var _handleBaseType2Sql8 = _handleBaseType2Sql9(logicItem.atoms || [], db),
+          atomsSql = _handleBaseType2Sql8.sql,
+          nestedConstants = _handleBaseType2Sql8.constants;
         constants.push.apply(constants, _toConsumableArray(nestedConstants));
-        sql += " ".concat((item.operator || 'and').toUpperCase(), " (").concat(atomsSql.trim(), ")");
-      }
+        var trimmedSql = atomsSql.trim();
+        return index === 0 ? trimmedSql : "".concat((logicItem.operator || 'and').toUpperCase(), " ").concat(trimmedSql);
+      }).filter(Boolean).join(' ');
+      sql += " (".concat(itemsSql, ")");
     }
   });
   return {
@@ -494,7 +507,7 @@ var _handleBaseType2Sql1 = function handleBaseType2Sql(list) {
     constants: constants
   };
 };
-export { _handleBaseType2Sql1 as handleBaseType2Sql };
+export { _handleBaseType2Sql9 as handleBaseType2Sql };
 var _handleJoinData = function _handleJoinData(joinData) {
   var db = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : procEnum.mysql;
   var constants = [];
@@ -508,9 +521,9 @@ var _handleJoinData = function _handleJoinData(joinData) {
     if (isSubquery) {
       subQuery = subquery;
     }
-    var _handleBaseType2Sql10 = _handleBaseType2Sql1(expressions, db),
-      sql = _handleBaseType2Sql10.sql,
-      joinConstants = _handleBaseType2Sql10.constants;
+    var _handleBaseType2Sql0 = _handleBaseType2Sql9(expressions, db),
+      sql = _handleBaseType2Sql0.sql,
+      joinConstants = _handleBaseType2Sql0.constants;
     var joinCondition = "on ".concat(sql);
     constants = joinConstants;
     return {
@@ -593,9 +606,9 @@ var _handleNesting = function handleNesting(data) {
     var customColumnsConstants = [];
     var handleCustomColumn = function handleCustomColumn(data) {
       return data.map(function (it) {
-        var _handleBaseType2Sql11 = _handleBaseType2Sql1(it.formulaList, db),
-          field_sql = _handleBaseType2Sql11.sql,
-          constants = _handleBaseType2Sql11.constants;
+        var _handleBaseType2Sql1 = _handleBaseType2Sql9(it.formulaList, db),
+          field_sql = _handleBaseType2Sql1.sql,
+          constants = _handleBaseType2Sql1.constants;
         customColumnsConstants.push.apply(customColumnsConstants, _toConsumableArray(constants));
         return {
           field_sql: "".concat(field_sql, " as ").concat(it.name),
@@ -610,9 +623,9 @@ var _handleNesting = function handleNesting(data) {
     obj.customColumnsConstants = customColumnsConstants;
   }
   if (filterData && filterData.filter.length) {
-    var _handleBaseType2Sql12 = _handleBaseType2Sql1(filterData.filter, db),
-      sql = _handleBaseType2Sql12.sql,
-      constants = _handleBaseType2Sql12.constants;
+    var _handleBaseType2Sql10 = _handleBaseType2Sql9(filterData.filter, db),
+      sql = _handleBaseType2Sql10.sql,
+      constants = _handleBaseType2Sql10.constants;
     obj.filters = 'WHERE ' + sql;
     obj.filtersConstants = constants;
   }
@@ -637,7 +650,7 @@ var _handleNesting = function handleNesting(data) {
     if (summarize.by.length) {
       obj.groupBy.groupColumns = summarize.by.map(function (v) {
         var _v$atoms;
-        var fieldSql = (_v$atoms = v.atoms) !== null && _v$atoms !== void 0 && _v$atoms.length ? _handleBaseType2Sql1(v.atoms, db).sql.trim() || v.sql : v.sql || "".concat(v.alias, ".").concat(v.realName || v.name);
+        var fieldSql = (_v$atoms = v.atoms) !== null && _v$atoms !== void 0 && _v$atoms.length ? _handleBaseType2Sql9(v.atoms, db).sql.trim() || v.sql : v.sql || "".concat(v.alias, ".").concat(v.realName || v.name);
         queryColumns.push({
           field_sql: "".concat(fieldSql, " as ").concat(v.fieldAlias),
           read_name: '',
@@ -655,8 +668,8 @@ var _handleNesting = function handleNesting(data) {
   }
   if (sortData && sortData.sort.length) {
     obj.orderInfos = "ORDER BY ".concat(sortData.sort.map(function (v) {
-      var _handleBaseType2Sql13 = _handleBaseType2Sql1(v.expression, db),
-        sql = _handleBaseType2Sql13.sql;
+      var _handleBaseType2Sql11 = _handleBaseType2Sql9(v.expression, db),
+        sql = _handleBaseType2Sql11.sql;
       return "".concat(sql, " ").concat(v.sort);
     }).join(', '));
   }

package/lib/es/utils.d.ts

@@ -25,6 +25,7 @@ export declare const getHelper: (list: MetaListType[], item: MetaListType) => He
 export declare const mergeSubQueryColumns: (columns: MetaData_ColumnsType[], oldColumns?: MetaData_ColumnsType[], isSelectFields?: boolean) => MetaData_ColumnsType[];
 export declare const syncSubQueryFieldReferences: (list: MetaListType[], table: MetaData_TableType, columns: MetaData_ColumnsType[], oldColumns?: MetaData_ColumnsType[]) => MetaListType[];
 export declare const getSubColumns: (metaList: any) => DataType[];
+export declare const normalizeAndOrStructure: <T>(data: T) => T;
 export declare function isValidSQLAlias(str: string): boolean;
 export declare const changeTableAlias: (list: MetaListType[] | [], curObj: Pick<MetaData_TableType, "tableUuid" | "alias">) => MetaListType[];
 export declare const changeFieldAlias: (list: MetaListType[], curObj: Pick<MetaData_ColumnsType, "fieldUuid" | "fieldAlias"> & Partial<Pick<MetaData_ColumnsType, "id" | "name" | "datasourceId">> & Partial<Pick<MetaSummarize_Group | MetaSummarize_By, "table" | "tableId" | "tableUuid" | "fieldId" | "name">>) => MetaListType[];