@gingkoo/pandora-metabase 1.0.21 → 1.0.22

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

@@ -60,6 +60,7 @@ var Metabase = function Metabase(props) {
           case 0:
             intercept = false; // 是否返回
             _metaList = (0, _utils.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/cjs/components/modules/join-data.js

@@ -73,7 +73,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);

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

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

package/lib/cjs/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/cjs/hooks/patch.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.sortPatch = exports.joinDataPatch = exports.filterPatch = exports.dataPatch = exports.customColumnPatch = void 0;
+exports.sortPatch = exports.patchMetas = exports.joinDataPatch = exports.filterPatch = exports.dataPatch = exports.customColumnPatch = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 var _helper = require("../utils/helper");
 var _utils = require("../utils");
@@ -18,11 +18,11 @@ var dataPatch = exports.dataPatch = function dataPatch(newMeta) {
       return newMeta;
     }
   }
-  newMeta.subquery = renderExists(newMeta.subquery);
+  newMeta.subquery = _patchMetas(newMeta.subquery);
   return newMeta;
 };
 var joinDataPatch = exports.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(_types.AtomsTypeEnum).includes(item.type)) {
     if ((item.type === _types.AtomsTypeEnum.EXPRESSION || item.type === _types.AtomsTypeEnum.JOIN_DEFAULT) && item.lhs) {
@@ -127,7 +127,7 @@ var joinDataPatch = exports.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 || [];
@@ -178,9 +178,10 @@ var joinDataPatch = exports.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') {
@@ -196,9 +197,9 @@ var joinDataPatch = exports.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 (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, vv), {}, {
+        return (0, _objectSpread2["default"])({
           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,
@@ -209,7 +210,7 @@ var joinDataPatch = exports.joinDataPatch = function joinDataPatch(newMeta) {
           datasourceId: newMeta.table1.datasourceId,
           // 数据源id
           type: _types.AtomsTypeEnum.FIELD
-        });
+        }, vv);
       });
     }
     if (v.right_type === 'string') {
@@ -225,9 +226,9 @@ var joinDataPatch = exports.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 (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, vv), {}, {
+        return (0, _objectSpread2["default"])({
           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,
@@ -238,7 +239,7 @@ var joinDataPatch = exports.joinDataPatch = function joinDataPatch(newMeta) {
           datasourceId: newMeta.table2.datasourceId,
           // 数据源id
           type: _types.AtomsTypeEnum.FIELD
-        });
+        }, vv);
       });
     }
     var item = {
@@ -249,14 +250,21 @@ var joinDataPatch = exports.joinDataPatch = function joinDataPatch(newMeta) {
       // quotes: '',
       type: _types.AtomsTypeEnum.JOIN_DEFAULT
     };
+    newExpressions.push(item);
+    if (_expressions.length - 1 > i) {
+      newExpressions.push({
+        val: 'AND',
+        type: _types.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;
 };
 var filterPatch = exports.filterPatch = function filterPatch(newMeta) {
@@ -282,7 +290,7 @@ var filterPatch = exports.filterPatch = function filterPatch(newMeta) {
     if (typeof v === 'string') {
       return {
         val: v,
-        type: _types.AtomsTypeEnum.INPUT_STRING
+        type: _types.AtomsTypeEnum.OPERATOR
       };
     } else if (v.type === 'expression') {
       var rhs;
@@ -348,14 +356,14 @@ var filterPatch = exports.filterPatch = function filterPatch(newMeta) {
       };
       return tem;
     } else if (v.type === 'notExists') {
-      var notExists = renderExists(v.notExists);
+      var notExists = _patchMetas(v.notExists);
       return {
         notExists: notExists,
         quotes: (0, _utils.buildSqlQuery)(notExists, v.type),
         type: _types.AtomsTypeEnum.NOT_EXISTS
       };
     } else if (v.type === 'exists') {
-      var _notExists = renderExists(v.notExists);
+      var _notExists = _patchMetas(v.notExists);
       return {
         notExists: _notExists,
         quotes: (0, _utils.buildSqlQuery)(_notExists, v.type),
@@ -540,7 +548,7 @@ var sortPatch = exports.sortPatch = function sortPatch(newMeta) {
   newMeta.sort = _sort;
   return newMeta;
 };
-var renderExists = function renderExists(items) {
+var _patchMetas = exports.patchMetas = function patchMetas(items) {
   return (items === null || items === void 0 ? void 0 : items.map(function (v) {
     if (v.type === _enum.TypeEnum.joinData) {
       v = joinDataPatch(v);
@@ -554,6 +562,9 @@ var renderExists = function renderExists(items) {
     if (v.type === _enum.TypeEnum.customColumn) {
       v = customColumnPatch(v);
     }
+    if (v.type === _enum.TypeEnum.union) {
+      v.subquery = _patchMetas(v.subquery || []);
+    }
     return v;
   })) || [];
 };

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

@@ -15,7 +15,6 @@ var _react = require("react");
 var _helper = require("../utils/helper");
 var _enum = require("../store/enum");
 var _utils = require("../utils");
-var _patch = require("./patch");
 var _excluded = ["alias", "datasourceName", "datasourceId", "column"];
 var metaKey = 1;
 var SummarizeAlias = exports.SummarizeAlias = 'source';
@@ -259,6 +258,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;
@@ -268,21 +268,24 @@ var useStore = function useStore() {
           if (v.table) {
             v.table.tableUuid = v.table.tableUuid || (0, _helper.uuidv4)('table');
           }
-          if (v.type === _enum.TypeEnum.joinData) {
-            newMeta[i] = (0, _patch.joinDataPatch)(newMeta[i]);
-          }
-          if (v.type === _enum.TypeEnum.filter) {
-            v = (0, _patch.filterPatch)(v);
-          }
-          if (v.type === _enum.TypeEnum.sort) {
-            newMeta[i] = (0, _patch.sortPatch)(newMeta[i]);
-          }
-          if (v.type === _enum.TypeEnum.customColumn) {
-            newMeta[i] = (0, _patch.customColumnPatch)(newMeta[i]);
-          }
-          if (v.type === _enum.TypeEnum.data) {
-            v = (0, _patch.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/cjs/index.js

@@ -61,7 +61,7 @@ var SqlVisionBuilder = _react["default"].forwardRef(function (props, ref) {
     store.setProps(props);
   }, [props]);
   (0, _react.useEffect)(function () {
-    var _value = (0, _utils.reassembleByUnion)(value);
+    var _value = (0, _utils.reassembleByUnion)((0, _utils.patchData)(value));
     store.setPreData(_value);
   }, [value]);
   (0, _react.useEffect)(function () {

package/lib/cjs/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/cjs/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/cjs/utils.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getSubColumns = exports.getHelper = exports.findIndex = exports.changeTableAlias = exports.changeFieldAlias = exports.buildSqlQuery = void 0;
+exports.patchData = exports.getSubColumns = exports.getHelper = exports.findIndex = exports.changeTableAlias = exports.changeFieldAlias = exports.buildSqlQuery = void 0;
 exports.reassembleByUnion = reassembleByUnion;
 exports.splitByUnion = splitByUnion;
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectWithoutProperties"));
@@ -17,6 +17,7 @@ var _types = require("./store/types");
 var _helper = require("./store/helper");
 var _helper2 = require("./utils/helper");
 var _cloneDeep3 = _interopRequireDefault(require("lodash/cloneDeep"));
+var _patch = require("./hooks/patch");
 var _excluded = ["list"];
 var findIndex = exports.findIndex = function findIndex(arr, item) {
   return arr.indexOf(item);
@@ -446,6 +447,14 @@ function splitByUnion(data) {
   }
   return result;
 }
+var patchData = exports.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 (0, _patch.patchMetas)(metas);
+  }
+  return metas;
+};
 function reassembleByUnion() {
   var target = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   if (!target) return [];

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/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);

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

@@ -11,11 +11,11 @@ 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) {
@@ -120,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 || [];
@@ -171,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') {
@@ -189,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,
@@ -202,7 +203,7 @@ export var joinDataPatch = function joinDataPatch(newMeta) {
           datasourceId: newMeta.table1.datasourceId,
           // 数据源id
           type: AtomsTypeEnum.FIELD
-        });
+        }, vv);
       });
     }
     if (v.right_type === 'string') {
@@ -218,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,
@@ -231,7 +232,7 @@ export var joinDataPatch = function joinDataPatch(newMeta) {
           datasourceId: newMeta.table2.datasourceId,
           // 数据源id
           type: AtomsTypeEnum.FIELD
-        });
+        }, vv);
       });
     }
     var item = {
@@ -242,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) {
@@ -275,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;
@@ -341,14 +349,14 @@ export var filterPatch = function filterPatch(newMeta) {
       };
       return tem;
     } else if (v.type === 'notExists') {
-      var notExists = renderExists(v.notExists);
+      var notExists = _patchMetas(v.notExists);
       return {
         notExists: notExists,
         quotes: buildSqlQuery(notExists, v.type),
         type: AtomsTypeEnum.NOT_EXISTS
       };
     } else if (v.type === 'exists') {
-      var _notExists = renderExists(v.notExists);
+      var _notExists = _patchMetas(v.notExists);
       return {
         notExists: _notExists,
         quotes: buildSqlQuery(_notExists, v.type),
@@ -533,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);
@@ -547,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 [];

package/package.json

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