@gingkoo/pandora-metabase 1.0.20 → 1.0.22

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

@@ -54,6 +54,7 @@ var Metabase = function Metabase(props) {
           case 0:
             intercept = false; // 是否返回
             _metaList = splitByUnion(store.metaList);
+            _metaList[0].patchVersion = '1.0.0';
             store.metaList.map(function (v) {
               var _v$list;
               if (v.type !== 'union' && !((_v$list = v.list) === null || _v$list === void 0 ? void 0 : _v$list[0]).table.name) {

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

@@ -118,6 +118,9 @@ var CustomColumn = function CustomColumn(props) {
       var _prevGroupBy$group, _prevGroupBy$by;
       var _data = {
         table: prevGroupBy.alias,
+        name: prevGroupBy.alias,
+        name_zh: prevGroupBy.alias,
+        id: prevGroupBy.alias,
         tableId: prevGroupBy.alias,
         tableUuid: prevGroupBy.tableUuid || uuidv4('table'),
         alias: prevGroupBy.alias,
@@ -163,7 +166,7 @@ var CustomColumn = function CustomColumn(props) {
         data = data.concat(
         // @ts-ignore
         joinData.map(function (v) {
-          return {
+          return _objectSpread(_objectSpread({}, v.table2), {}, {
             alias: v.table2.alias,
             table: v.table2.name,
             tableId: v.table2.id,
@@ -171,14 +174,14 @@ var CustomColumn = function CustomColumn(props) {
             columns: v.columns,
             datasourceId: mainTable.table.datasourceId,
             datasourceName: mainTable.table.datasourceName
-          };
+          });
         }));
       }
     } else {
       // @ts-ignore
       data = store.metaList[groupIndex].list.slice(0, index).map(function (v) {
         if (v.type === TypeEnum.data) {
-          return {
+          return _objectSpread(_objectSpread({}, v.table), {}, {
             alias: v.table.alias,
             table: v.table.name,
             tableId: v.table.id,
@@ -186,9 +189,9 @@ var CustomColumn = function CustomColumn(props) {
             columns: v.columns,
             datasourceId: mainTable.table.datasourceId,
             datasourceName: mainTable.table.datasourceName
-          };
+          });
         } else if (v.type === TypeEnum.joinData) {
-          return {
+          return _objectSpread(_objectSpread({}, v.table2), {}, {
             alias: v.table2.alias,
             table: v.table2.name,
             tableId: v.table2.id,
@@ -196,7 +199,7 @@ var CustomColumn = function CustomColumn(props) {
             columns: v.columns,
             datasourceId: mainTable.table.datasourceId,
             datasourceName: mainTable.table.datasourceName
-          };
+          });
         } else {
           return {
             table: null

package/lib/es/components/modules/join-data.js

@@ -67,7 +67,7 @@ var JoinData = function JoinData(props) {
   var table1Selected = Boolean(meta.table1.name);
   var table2Selected = Boolean(meta.table2.name);
   var subQuerySelected = Boolean((_meta$subquery = meta.subquery) === null || _meta$subquery === void 0 || (_meta$subquery = _meta$subquery[0]) === null || _meta$subquery === void 0 || (_meta$subquery = _meta$subquery.table) === null || _meta$subquery === void 0 ? void 0 : _meta$subquery.name);
-  var columnsSelected = meta.table1.id && meta.table2.id;
+  var columnsSelected = meta.table1.name && meta.table2.name;
   // useEffect(() => {
   //   let newMetaList = store.metaList[groupIndex].list.slice();
   //   newMetaList[index] = setQuotes(meta);
@@ -80,6 +80,7 @@ var JoinData = function JoinData(props) {
       ExistAboveGroupBy = _getHelper.ExistAboveGroupBy,
       prevList = _getHelper.prevList,
       prevGroupBy = _getHelper.prevGroupBy;
+    // 获取左侧表
     if (ExistAboveGroupBy) {
       var _prevGroupBy$group, _prevGroupBy$by;
       var _data = {
@@ -141,7 +142,7 @@ var JoinData = function JoinData(props) {
     } else {
       data = store.metaList[groupIndex].list.slice(0, index + 1).reduce(function (mo, v) {
         if (v.type === TypeEnum.data) {
-          mo.push({
+          mo.push(_objectSpread(_objectSpread({}, v.table), {}, {
             alias: v.table.alias,
             name: v.table.name,
             name_zh: v.table.name_zh,
@@ -150,7 +151,7 @@ var JoinData = function JoinData(props) {
             columns: v.columns,
             datasourceId: v.table.datasourceId,
             datasourceName: v.table.datasourceName
-          });
+          }));
         } else if (v.type === TypeEnum.joinData) {
           mo.push({
             alias: v.table2.alias,
@@ -164,9 +165,12 @@ var JoinData = function JoinData(props) {
           });
         }
         return mo;
-      }, []);
+      }, []).filter(function (v) {
+        return v.tableUuid === meta.table1.tableUuid;
+      });
     }
-    // 添加当前表
+    // 获取右侧表
+    // 添加table2
     data = data.concat([{
       alias: meta.table2.alias,
       name: meta.table2.name,
@@ -383,71 +387,77 @@ var JoinData = function JoinData(props) {
       })
     });
   }
+  // 切换表后重置数据
   function initExpressions() {
-    var _newMeta$index, _newMeta$index2;
+    console.log(11);
     var newMeta = store.metaList[groupIndex].list.slice();
-    if (newMeta[index].table1.name && newMeta[index].table2.name && !((_newMeta$index = newMeta[index]) !== null && _newMeta$index !== void 0 && _newMeta$index.expressions) || ((_newMeta$index2 = newMeta[index]) === null || _newMeta$index2 === void 0 || (_newMeta$index2 = _newMeta$index2.expressions) === null || _newMeta$index2 === void 0 ? void 0 : _newMeta$index2.length) < 1) {
-      newMeta[index].expressions = [{
-        lhs: [{
-          fieldName: '',
-          // 字段名
-          fieldNameZh: '',
-          // 字段中文名
-          fieldAlias: '',
-          // 别名
-          fieldUuid: '',
-          // uuid
-          fieldId: '',
-          // 字段id
-          // quotes?: string; // 字段展示的 不知道有没有用
-          tableName: '',
-          // 表名
-          tableNameZh: '',
-          tableId: '',
-          // 表名
-          tableAlias: '',
-          // 别名
-          tableUuid: '',
-          // 表唯一标识
-          datasourceName: '',
-          // 数据源名
-          datasourceId: '',
-          // 数据源id
-          type: AtomsTypeEnum.FIELD
-        }],
-        condition: '',
-        rhs: [{
-          fieldName: '',
-          // 字段名
-          fieldNameZh: '',
-          // 字段中文名
-          fieldAlias: '',
-          // 别名
-          fieldUuid: '',
-          // uuid
-          fieldId: '',
-          // 字段id
-          // quotes?: string; // 字段展示的 不知道有没有用
-          tableName: '',
-          // 表名
-          tableNameZh: '',
-          tableId: '',
-          // 表名
-          tableAlias: '',
-          // 别名
-          tableUuid: '',
-          // 表唯一标识
-          datasourceName: '',
-          // 数据源名
-          datasourceId: '',
-          // 数据源id
-          type: AtomsTypeEnum.FIELD
-        }],
-        // quotes: '',
-        type: AtomsTypeEnum.JOIN_DEFAULT
-      }];
-      store.setMeta(newMeta, groupIndex);
-    }
+    newMeta[index].expressions = [{
+      lhs: [{
+        fieldName: '',
+        // 字段名
+        fieldNameZh: '',
+        // 字段中文名
+        fieldAlias: '',
+        // 别名
+        fieldUuid: '',
+        // uuid
+        fieldId: '',
+        // 字段id
+        // quotes?: string; // 字段展示的 不知道有没有用
+        tableName: '',
+        // 表名
+        tableNameZh: '',
+        tableId: '',
+        // 表名
+        tableAlias: '',
+        // 别名
+        tableUuid: '',
+        // 表唯一标识
+        datasourceName: '',
+        // 数据源名
+        datasourceId: '',
+        // 数据源id
+        type: AtomsTypeEnum.FIELD
+      }],
+      condition: '',
+      rhs: [{
+        fieldName: '',
+        // 字段名
+        fieldNameZh: '',
+        // 字段中文名
+        fieldAlias: '',
+        // 别名
+        fieldUuid: '',
+        // uuid
+        fieldId: '',
+        // 字段id
+        // quotes?: string; // 字段展示的 不知道有没有用
+        tableName: '',
+        // 表名
+        tableNameZh: '',
+        tableId: '',
+        // 表名
+        tableAlias: '',
+        // 别名
+        tableUuid: '',
+        // 表唯一标识
+        datasourceName: '',
+        // 数据源名
+        datasourceId: '',
+        // 数据源id
+        type: AtomsTypeEnum.FIELD
+      }],
+      // quotes: '',
+      type: AtomsTypeEnum.JOIN_DEFAULT
+    }];
+    store.setMeta(newMeta, groupIndex);
+    // if (
+    //   ((newMeta[index] as MetaJoin).table1.name &&
+    //     (newMeta[index] as MetaJoin).table2.name &&
+    //     !(newMeta[index] as MetaJoin)?.expressions) ||
+    //   (newMeta[index] as MetaJoin)?.expressions?.length < 1
+    // ) {
+    // }
   }
   function selectJoin(e) {
     var newMeta = store.metaList[groupIndex].list.slice();

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

@@ -107,7 +107,7 @@ var Sort = function Sort(props) {
     newMeta[index].sort.forEach(function (v) {
       v.expression.forEach(function (vv) {
         if (vv.type === AtomsTypeEnum.FIELD) {
-          if (selectedSort[vv.fieldName]) {
+          if (selectedSort[vv.tableName]) {
             selectedSort[vv.tableAlias].push(vv.fieldName);
           } else {
             selectedSort[vv.tableAlias] = [vv.fieldName];

package/lib/es/hooks/patch.d.ts

@@ -1,5 +1,7 @@
+import { MetaListType } from '../store/types';
 export declare const dataPatch: (newMeta: any) => any;
 export declare const joinDataPatch: (newMeta: any) => any;
 export declare const filterPatch: (newMeta: any) => any;
 export declare const customColumnPatch: (newMeta: any) => any;
 export declare const sortPatch: (newMeta: any) => any;
+export declare const patchMetas: (items: MetaListType[]) => MetaListType[];

package/lib/es/hooks/patch.js

@@ -1,5 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { uuidv4 } from '../utils/helper';
+import { buildSqlQuery } from '../utils';
 import { AtomsTypeEnum } from '../store/types';
 import { TypeEnum } from '../store/enum';
 export var dataPatch = function dataPatch(newMeta) {
@@ -10,16 +11,25 @@ export var dataPatch = function dataPatch(newMeta) {
       return newMeta;
     }
   }
-  newMeta.subquery = renderExists(newMeta.subquery);
+  newMeta.subquery = _patchMetas(newMeta.subquery);
   return newMeta;
 };
 export var joinDataPatch = function joinDataPatch(newMeta) {
-  var _newMeta$expressions2, _fields, _fields2, _fields3, _fields4, _newMeta$expressions3, _expressions2;
+  var _newMeta$expressions2, _fields, _fields2, _fields3, _fields4, _newMeta$expressions3;
   var item = ((_newMeta$expressions2 = newMeta.expressions) === null || _newMeta$expressions2 === void 0 ? void 0 : _newMeta$expressions2[0]) || {};
   if (item !== null && item !== void 0 && item.type && Object.values(AtomsTypeEnum).includes(item.type)) {
     if ((item.type === AtomsTypeEnum.EXPRESSION || item.type === AtomsTypeEnum.JOIN_DEFAULT) && item.lhs) {
       return newMeta;
     }
+    if (item.type === AtomsTypeEnum.EXISTS && !item.tableUuid) {
+      return newMeta;
+    }
+    if (item.type === AtomsTypeEnum.NOT_EXISTS && !item.tableUuid) {
+      return newMeta;
+    }
+    if (item.type === AtomsTypeEnum.FIELD && item.fieldName) {
+      return newMeta;
+    }
   }
   // if (
   //   newMeta.expressions?.[0]?.type &&
@@ -110,7 +120,7 @@ export var joinDataPatch = function joinDataPatch(newMeta) {
       type: 'default' // 默认是字段模式
     }];
   }
-  var expressions = (_newMeta$expressions3 = newMeta.expressions) === null || _newMeta$expressions3 === void 0 ? void 0 : _newMeta$expressions3.map(function (v) {
+  var expressions = ((_newMeta$expressions3 = newMeta.expressions) === null || _newMeta$expressions3 === void 0 ? void 0 : _newMeta$expressions3.map(function (v) {
     var _left_fields, _right_fields;
     var left_fields = v.left_fields || [];
     var right_fields = v.right_fields || [];
@@ -161,9 +171,10 @@ export var joinDataPatch = function joinDataPatch(newMeta) {
       right_type: v.right_type || '',
       type: v.type || 'default' // 默认是字段模式
     };
-  });
+  })) || [];
   var _expressions = beforeExpressions.concat(expressions);
-  _expressions = (_expressions2 = _expressions) === null || _expressions2 === void 0 ? void 0 : _expressions2.map(function (v) {
+  var newExpressions = [];
+  _expressions === null || _expressions === void 0 || _expressions.map(function (v, i) {
     var lhs = [];
     var rhs = [];
     if (v.left_type === 'string') {
@@ -179,9 +190,9 @@ export var joinDataPatch = function joinDataPatch(newMeta) {
     } else {
       var _v$left_fields;
       lhs = (_v$left_fields = v.left_fields) === null || _v$left_fields === void 0 ? void 0 : _v$left_fields.map(function (vv) {
-        return _objectSpread(_objectSpread({}, vv), {}, {
+        return _objectSpread({
           fieldNameZh: newMeta.table1.name_zh,
-          fieldName: newMeta.table1.fieldName || newMeta.table1.name,
+          fieldName: vv.fieldName || vv.quotes || vv.fieldAlias || newMeta.table1.fieldName || newMeta.table1.name,
           tableAlias: newMeta.table1.alias,
           tableId: newMeta.table1.id,
           tableName: newMeta.table1.name,
@@ -192,7 +203,7 @@ export var joinDataPatch = function joinDataPatch(newMeta) {
           datasourceId: newMeta.table1.datasourceId,
           // 数据源id
           type: AtomsTypeEnum.FIELD
-        });
+        }, vv);
       });
     }
     if (v.right_type === 'string') {
@@ -208,9 +219,9 @@ export var joinDataPatch = function joinDataPatch(newMeta) {
     } else {
       var _v$right_fields;
       rhs = (_v$right_fields = v.right_fields) === null || _v$right_fields === void 0 ? void 0 : _v$right_fields.map(function (vv) {
-        return _objectSpread(_objectSpread({}, vv), {}, {
+        return _objectSpread({
           fieldNameZh: newMeta.table2.name_zh,
-          fieldName: newMeta.table2.fieldName || newMeta.table2.name,
+          fieldName: vv.fieldName || vv.quotes || vv.fieldAlias || newMeta.table2.fieldName || newMeta.table2.name,
           tableAlias: newMeta.table2.alias,
           tableId: newMeta.table2.id,
           tableName: newMeta.table2.name,
@@ -221,7 +232,7 @@ export var joinDataPatch = function joinDataPatch(newMeta) {
           datasourceId: newMeta.table2.datasourceId,
           // 数据源id
           type: AtomsTypeEnum.FIELD
-        });
+        }, vv);
       });
     }
     var item = {
@@ -232,14 +243,21 @@ export var joinDataPatch = function joinDataPatch(newMeta) {
       // quotes: '',
       type: AtomsTypeEnum.JOIN_DEFAULT
     };
+    newExpressions.push(item);
+    if (_expressions.length - 1 > i) {
+      newExpressions.push({
+        val: 'AND',
+        type: AtomsTypeEnum.OPERATOR
+      });
+    }
     return item;
   });
   // 清除table1中不用字段
   delete newMeta.table1.fields;
   // 清除table2中不用字段
   delete newMeta.table2.fields;
-  newMeta.subquery = renderExists(newMeta.subquery);
-  newMeta.expressions = _expressions;
+  newMeta.subquery = _patchMetas(newMeta.subquery);
+  newMeta.expressions = newExpressions;
   return newMeta;
 };
 export var filterPatch = function filterPatch(newMeta) {
@@ -255,6 +273,9 @@ export var filterPatch = function filterPatch(newMeta) {
     if (item.type === AtomsTypeEnum.NOT_EXISTS && !item.tableUuid) {
       return newMeta;
     }
+    if (item.type === AtomsTypeEnum.FIELD && item.fieldName) {
+      return newMeta;
+    }
   }
   var _filter = (_newMeta$filter2 = newMeta.filter) === null || _newMeta$filter2 === void 0 ? void 0 : _newMeta$filter2.map(function (v) {
     // 表达式
@@ -262,7 +283,7 @@ export var filterPatch = function filterPatch(newMeta) {
     if (typeof v === 'string') {
       return {
         val: v,
-        type: AtomsTypeEnum.INPUT_STRING
+        type: AtomsTypeEnum.OPERATOR
       };
     } else if (v.type === 'expression') {
       var rhs;
@@ -328,15 +349,17 @@ export var filterPatch = function filterPatch(newMeta) {
       };
       return tem;
     } else if (v.type === 'notExists') {
+      var notExists = _patchMetas(v.notExists);
       return {
-        notExists: renderExists(v.notExists),
-        quotes: v.quotes,
+        notExists: notExists,
+        quotes: buildSqlQuery(notExists, v.type),
         type: AtomsTypeEnum.NOT_EXISTS
       };
     } else if (v.type === 'exists') {
+      var _notExists = _patchMetas(v.notExists);
       return {
-        notExists: renderExists(v.notExists),
-        quotes: v.quotes,
+        notExists: _notExists,
+        quotes: buildSqlQuery(_notExists, v.type),
         type: AtomsTypeEnum.EXISTS
       };
     }
@@ -346,14 +369,23 @@ export var filterPatch = function filterPatch(newMeta) {
   return newMeta;
 };
 export var customColumnPatch = function customColumnPatch(newMeta) {
-  var _newMeta$customColumn;
+  var _newMeta$customColumn, _newMeta$customColumn2;
   var item = ((_newMeta$customColumn = newMeta.customColumn[0].formulaList) === null || _newMeta$customColumn === void 0 ? void 0 : _newMeta$customColumn[0]) || {};
-  if (item.type && Object.values(AtomsTypeEnum).includes(item.type || '')) {
+  if (item !== null && item !== void 0 && item.type && Object.values(AtomsTypeEnum).includes(item.type)) {
     if (item.type === AtomsTypeEnum.EXPRESSION && item.lhs) {
       return newMeta;
     }
+    if (item.type === AtomsTypeEnum.EXISTS && !item.tableUuid) {
+      return newMeta;
+    }
+    if (item.type === AtomsTypeEnum.NOT_EXISTS && !item.tableUuid) {
+      return newMeta;
+    }
+    if (item.type === AtomsTypeEnum.FIELD && item.fieldName) {
+      return newMeta;
+    }
   }
-  newMeta.customColumn = newMeta.customColumn.map(function (v) {
+  newMeta.customColumn = (newMeta === null || newMeta === void 0 || (_newMeta$customColumn2 = newMeta.customColumn) === null || _newMeta$customColumn2 === void 0 ? void 0 : _newMeta$customColumn2.map(function (v) {
     var _formulaList = v.formulaList.map(function (formula) {
       var tem = formula;
       if (formula.type === 'expression') {
@@ -466,7 +498,7 @@ export var customColumnPatch = function customColumnPatch(newMeta) {
     return _objectSpread(_objectSpread({}, v), {}, {
       formulaList: _formulaList
     });
-  });
+  })) || newMeta.customColumn;
   return newMeta;
 };
 export var sortPatch = function sortPatch(newMeta) {
@@ -476,6 +508,15 @@ export var sortPatch = function sortPatch(newMeta) {
     if (item.type === AtomsTypeEnum.EXPRESSION && item.lhs) {
       return newMeta;
     }
+    if (item.type === AtomsTypeEnum.EXISTS && !item.tableUuid) {
+      return newMeta;
+    }
+    if (item.type === AtomsTypeEnum.NOT_EXISTS && !item.tableUuid) {
+      return newMeta;
+    }
+    if (item.type === AtomsTypeEnum.FIELD && item.fieldName) {
+      return newMeta;
+    }
   }
   var _sort = (_newMeta$sort2 = newMeta.sort) === null || _newMeta$sort2 === void 0 ? void 0 : _newMeta$sort2.map(function (v) {
     return {
@@ -500,7 +541,7 @@ export var sortPatch = function sortPatch(newMeta) {
   newMeta.sort = _sort;
   return newMeta;
 };
-var renderExists = function renderExists(items) {
+var _patchMetas = function patchMetas(items) {
   return (items === null || items === void 0 ? void 0 : items.map(function (v) {
     if (v.type === TypeEnum.joinData) {
       v = joinDataPatch(v);
@@ -514,6 +555,10 @@ var renderExists = function renderExists(items) {
     if (v.type === TypeEnum.customColumn) {
       v = customColumnPatch(v);
     }
+    if (v.type === TypeEnum.union) {
+      v.subquery = _patchMetas(v.subquery || []);
+    }
     return v;
   })) || [];
-};
+};
+export { _patchMetas as patchMetas };

package/lib/es/hooks/use-state.js

@@ -9,7 +9,6 @@ import { useState, useRef, useMemo } from 'react';
 import { uuidv4 } from '../utils/helper';
 import { TypeEnum, JoinEnum, UnionEnum } from '../store/enum';
 import { getSubColumns } from '../utils';
-import { joinDataPatch, filterPatch, sortPatch, customColumnPatch, dataPatch } from './patch';
 var metaKey = 1;
 export var SummarizeAlias = 'source';
 var useStore = function useStore() {
@@ -252,6 +251,7 @@ var useStore = function useStore() {
     return newMeta;
   };
   var setPreData = function setPreData(data) {
+    // let patchVersion = (data?.[0]?.list?.[0] as any)?.patchVersion || '';
     if (data.length) {
       var _metaList = data === null || data === void 0 ? void 0 : data.map(function (item, groupIndex) {
         var _item$list;
@@ -261,21 +261,24 @@ var useStore = function useStore() {
           if (v.table) {
             v.table.tableUuid = v.table.tableUuid || uuidv4('table');
           }
-          if (v.type === TypeEnum.joinData) {
-            newMeta[i] = joinDataPatch(newMeta[i]);
-          }
-          if (v.type === TypeEnum.filter) {
-            v = filterPatch(v);
-          }
-          if (v.type === TypeEnum.sort) {
-            newMeta[i] = sortPatch(newMeta[i]);
-          }
-          if (v.type === TypeEnum.customColumn) {
-            newMeta[i] = customColumnPatch(newMeta[i]);
-          }
-          if (v.type === TypeEnum.data) {
-            v = dataPatch(v);
-          }
+          // // 兼容
+          // if (patchVersion != '1.0.0') {
+          //   if (v.type === TypeEnum.joinData) {
+          //     v = joinDataPatch(v);
+          //   }
+          //   if (v.type === TypeEnum.filter) {
+          //     v = filterPatch(v);
+          //   }
+          //   if (v.type === TypeEnum.sort) {
+          //     v = sortPatch(v);
+          //   }
+          //   if (v.type === TypeEnum.customColumn) {
+          //     v = customColumnPatch(v);
+          //   }
+          //   if (v.type === TypeEnum.data) {
+          //     v = dataPatch(v);
+          //   }
+          // }
           // if (v.type === TypeEnum.filter) {
           //   newMeta[i] = setFilterQuotes(newMeta[i]);
           // }

package/lib/es/index.js

@@ -9,7 +9,7 @@ import './locale/zh';
 import { __ } from './locale';
 import Loading from './common/Loading';
 import Metabase from './components/metabase';
-import { reassembleByUnion } from './utils';
+import { reassembleByUnion, patchData } from './utils';
 /**
  * 规则
  * 1、主表一换 下面全部删除
@@ -51,7 +51,7 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     store.setProps(props);
   }, [props]);
   useEffect(function () {
-    var _value = reassembleByUnion(value);
+    var _value = reassembleByUnion(patchData(value));
     store.setPreData(_value);
   }, [value]);
   useEffect(function () {

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

@@ -84,7 +84,7 @@ export interface AtomsUnknown {
 }
 export type AtomsItem = AtomsNotExists | AtomsExists | AtomsJoinDefault | AtomsExpression | AtomsField | AtomsInputString | AtomsInputStringList | AtomsInputNumberList | AtomsInputNumber | AtomsOprator | AtomsConstant | AtomsUnknown;
 export type ToolbarType = TypeEnum | 'filter' | 'summarize' | 'joinData' | 'permissionTable' | 'customColumn' | 'sort' | 'rowLimit' | 'union';
-export type MetaListType = MetaData | MetaJoin | MetaCustom | MetaFilter | MetaSummarize | MetaSort | MetaLimit | MetaPermissionTable;
+export type MetaListType = MetaData | MetaJoin | MetaCustom | MetaFilter | MetaSummarize | MetaSort | MetaLimit | MetaPermissionTable | MetaUnion;
 export type initColumnsType = MetaData_ColumnsType;
 export interface TableColumnsMapType {
     [tableName: string]: initColumnsType[];
@@ -243,6 +243,11 @@ export interface MetaPermissionTable {
     type: TypeEnum.permissionTable;
     table: MetaData_TableType;
 }
+export interface MetaUnion {
+    metaKey: number;
+    type: TypeEnum.union;
+    subquery: MetaListType[];
+}
 export interface LooseObject {
     [TypeEnum.data]?: MetaData;
     [TypeEnum.joinData]?: MetaJoin[];

package/lib/es/utils.d.ts

@@ -17,6 +17,7 @@ export declare const getSubColumns: (metaList: any) => DataType[];
 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">) => MetaListType[];
 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 {};

package/lib/es/utils.js

@@ -9,6 +9,7 @@ import { AtomsTypeEnum } from './store/types';
 import { summarizeToSql } from './store/helper';
 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);
 };
@@ -437,6 +438,14 @@ export function splitByUnion(data) {
   }
   return result;
 }
+export var patchData = function patchData(metas) {
+  var mainTable = metas[0] || {};
+  var version = (mainTable === null || mainTable === void 0 ? void 0 : mainTable.patchVersion) || '';
+  if (version != '1.0.0') {
+    return patchMetas(metas);
+  }
+  return metas;
+};
 export function reassembleByUnion() {
   var target = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   if (!target) return [];
@@ -523,7 +532,7 @@ export var buildSqlQuery = function buildSqlQuery() {
   var tables = [];
   var joins = [];
   var wheres = [];
-  data.forEach(function (item) {
+  data === null || data === void 0 || data.forEach(function (item) {
     if (item.type === TypeEnum.data) {
       var meta = item;
       var tableName = "".concat(meta.table.name);
@@ -597,7 +606,7 @@ export var buildSqlQuery = function buildSqlQuery() {
       sqlClauses.push(joins.join(' '));
     }
     if (wheres.length > 0) {
-      sqlClauses.push("WHERE ".concat(wheres.join(' AND ')));
+      sqlClauses.push("WHERE ".concat(wheres.join(' ')));
     }
   }
   sqlClauses.push(')');

package/package.json

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