@gingkoo/pandora-metabase 1.0.55 → 1.0.57

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

@@ -9,6 +9,7 @@ import cx from 'classnames';
 import { __ } from '../../locale';
 import { findIndex, isError } from '../../utils';
 import { sleep, flatArray } from '../../utils/helper';
+import { ChangeType } from '../../store/types';
 import { getHelper } from '../../utils';
 import { TypeEnum, SQL_COLUMN_TYPE } from '../../store/enum';
 import CustomEditor from '../../components/dialog/custom-editor';
@@ -95,7 +96,10 @@ var CustomColumn = function CustomColumn(props) {
                   // if(data.name !== value.name){
                   //   newMeta = newMeta.filter((v: MetaListType, _i: number)=> _i<=index)
                   // }
-                  store.setMeta(newMeta, groupIndex);
+                  store.setMeta(newMeta, groupIndex, {
+                    obj: data,
+                    type: ChangeType.customColumn
+                  });
                   closePopup();
                 },
                 onClose: closePopup
@@ -246,7 +250,10 @@ var CustomColumn = function CustomColumn(props) {
               } else {
                 newMeta[index].customColumn[i] = data;
               }
-              store.setMeta(newMeta, groupIndex);
+              store.setMeta(newMeta, groupIndex, {
+                obj: data,
+                type: ChangeType.customColumn
+              });
               try {
                 o.close();
               } catch (e) {
@@ -274,7 +281,10 @@ var CustomColumn = function CustomColumn(props) {
         meta: meta,
         onChange: function onChange(data) {
           newMeta[index].customColumn.push(data);
-          store.setMeta(newMeta, groupIndex);
+          store.setMeta(newMeta, groupIndex, {
+            obj: data,
+            type: ChangeType.customColumn
+          });
           closePopup();
         },
         onClose: closePopup

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

@@ -7,6 +7,7 @@ import { uuidv4 } from '../../utils/helper';
 import { findIndex, getHelper } from '../../utils';
 import { TypeEnum, SQL_COLUMN_TYPE } from '../../store/enum';
 import FormulaList from '../dialog/formula-list';
+import { ChangeType } from '../../store/types';
 import Wrapper from './components/Wrapper';
 import NextDom from './components/meta-icon';
 import Header from './components/header';
@@ -140,7 +141,10 @@ var Filter = function Filter(props) {
   var selectFilter = function selectFilter(val) {
     var newMeta = store.metaList[groupIndex].list.slice();
     newMeta[index].filter = val;
-    store.setMeta(newMeta, groupIndex);
+    store.setMeta(newMeta, groupIndex, {
+      obj: val,
+      type: ChangeType.formula
+    });
   };
   var getPreColumns = function getPreColumns() {
     var data = [].concat(_toConsumableArray(getColumns()), _toConsumableArray(cloneDeep(notExistsColumns || [])));

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

@@ -17,7 +17,7 @@ import { uuidv4, getAlias } from '../../utils/helper';
 import { __ } from '../../locale';
 import { findIndex, getSubColumns } from '../../utils';
 import { TypeEnum, ColumnsPopupThemeEnum, JoinEnum, SQL_COLUMN_TYPE } from '../../store/enum';
-import { AtomsTypeEnum } from '../../store/types';
+import { AtomsTypeEnum, ChangeType } from '../../store/types';
 import { SummarizeAlias } from '../../store/helper';
 import { getHelper, changeTableAlias, isValidSQLAlias, isError } from '../../utils';
 import ItemName from './components/item-name';
@@ -377,7 +377,10 @@ var JoinData = function JoinData(props) {
         onChange: function onChange(data) {
           var newMetaList = store.metaList[groupIndex].list.slice();
           newMetaList[index].columns = data;
-          store.setMeta(newMetaList, groupIndex);
+          store.setMeta(newMetaList, groupIndex, {
+            obj: data,
+            type: ChangeType.field
+          });
         }
       })
     });
@@ -486,7 +489,7 @@ var JoinData = function JoinData(props) {
       }, []);
     }
     // // 过滤为table1选中的表
-    var newMeta = store.metaList[groupIndex].list.slice();
+    var newMeta = cloneDeep(store.metaList[groupIndex].list);
     // if (((newMeta[index] as MetaJoin)[FlagLocation.TABLE_1] as MetaJoin_TalbeType).name) {
     //   data = data.filter((v) => {
     //     return (
@@ -513,8 +516,11 @@ var JoinData = function JoinData(props) {
           // }
           // }
           newMeta[index][table_type] = data;
-          initExpressions();
-          store.setMeta(newMeta, groupIndex);
+          initExpressions(newMeta);
+          store.setMeta(newMeta, groupIndex, {
+            obj: data,
+            type: ChangeType[table_type]
+          });
           store.setPopup({
             visible: false
           });
@@ -542,7 +548,7 @@ var JoinData = function JoinData(props) {
           var tableName = data.name;
           if (meta.table2.name !== tableName || meta.table2.datasourceId !== data.datasourceId) {
             var _store$preProps;
-            var newMeta = store.metaList[groupIndex].list.slice();
+            var newMeta = cloneDeep(store.metaList[groupIndex].list);
             var alias = getAlias(tableName, newMeta, ((_store$preProps = store.preProps) === null || _store$preProps === void 0 ? void 0 : _store$preProps.notExistsColumns) || []);
             var _table2 = _objectSpread(_objectSpread({}, data), {}, {
               name: tableName,
@@ -555,12 +561,15 @@ var JoinData = function JoinData(props) {
               datasourceName: data.datasourceName
             });
             newMeta[index].table2 = _table2;
-            initExpressions();
+            initExpressions(newMeta);
             store.fetchColumns(_table2, data.datasourceId, [], function (columns) {
               newMeta[index].columns = columns;
               // 关联表变了 下面模块全部删除
               // newMeta = newMeta.filter((v: MetaListType, i: number) => i <= index);
-              // store.setMeta(newMeta, groupIndex);
+              store.setMeta(newMeta, groupIndex, {
+                obj: data,
+                type: ChangeType.table2
+              });
             });
           }
           setIsDel(false);
@@ -572,8 +581,8 @@ var JoinData = function JoinData(props) {
     });
   }
   // 切换表后重置数据
-  function initExpressions() {
-    var newMeta = store.metaList[groupIndex].list.slice();
+  function initExpressions(newMeta) {
+    // let newMeta: MetaListType[] = store.metaList[groupIndex].list.slice();
     if (newMeta[index].expressions && newMeta[index].expressions.length > 0) {
       return;
     }
@@ -655,7 +664,10 @@ var JoinData = function JoinData(props) {
         onChange: function onChange(type) {
           var newMeta = store.metaList[groupIndex].list.slice();
           newMeta[index].joinType = type;
-          store.setMeta(newMeta, groupIndex);
+          store.setMeta(newMeta, groupIndex, {
+            obj: type,
+            type: ChangeType.joinType
+          });
           store.setPopup({
             visible: false
           });
@@ -941,7 +953,10 @@ var JoinData = function JoinData(props) {
           //     _ind2
           //   ] as AtomsField
           // ).quotes = quotes;
-          store.setMeta(newMeta, groupIndex);
+          store.setMeta(newMeta, groupIndex, {
+            obj: fields,
+            type: ChangeType[_position]
+          });
         }
       })
     });
@@ -966,7 +981,10 @@ var JoinData = function JoinData(props) {
           var index = findIndex(store.metaList[groupIndex].list, meta);
           var newMeta = store.metaList[groupIndex].list.slice();
           newMeta[index].expressions[_ind][_position][_ind2].val = curObj.value;
-          store.setMeta(newMeta, groupIndex);
+          store.setMeta(newMeta, groupIndex, {
+            obj: val,
+            type: ChangeType[_position]
+          });
         }
       })
     });
@@ -1072,7 +1090,7 @@ var JoinData = function JoinData(props) {
       isExit = _store$preProps2.isExit,
       toolbar = _store$preProps2.toolbar,
       other = _objectWithoutProperties(_store$preProps2, _excluded);
-    var newMeta = store.metaList[groupIndex].list.slice();
+    var newMeta = cloneDeep(store.metaList[groupIndex].list);
     var index = findIndex(store.metaList[groupIndex].list, meta);
     var oldList = cloneDeep(newMeta[index].subquery);
     var _toolbar = subToolbar || toolbar;
@@ -1120,10 +1138,13 @@ var JoinData = function JoinData(props) {
                 return _column;
               });
               // (newMeta[index] as MetaJoin).columns = newColumns;
-              initExpressions();
+              initExpressions(newMeta);
               // 关联表变了 下面模块全部删除
               // newMeta = newMeta.filter((v: MetaListType, i: number) => i <= index);
-              store.setMeta(newMeta, groupIndex);
+              store.setMeta(newMeta, groupIndex, {
+                obj: newList,
+                type: ChangeType.subQuery
+              });
               o.close();
             } catch (e) {
               console.warn(e);
@@ -1184,7 +1205,10 @@ var JoinData = function JoinData(props) {
                 newMeta = store.metaList[groupIndex].list.slice();
                 newMeta[index].table2.alias = alias;
                 newMeta = changeTableAlias(newMeta, newMeta[index].table2);
-                store.setMeta(newMeta, groupIndex);
+                store.setMeta(newMeta, groupIndex, {
+                  obj: newMeta[index].table2,
+                  type: ChangeType.tableAlias
+                });
               case 2:
               case "end":
                 return _context2.stop();
@@ -1220,7 +1244,10 @@ var JoinData = function JoinData(props) {
         value: value,
         onChange: function onChange(data) {
           newMeta[index].expressions.splice(i, 1, data);
-          store.setMeta(newMeta, groupIndex);
+          store.setMeta(newMeta, groupIndex, {
+            obj: newMeta[index].expressions,
+            type: ChangeType.expressions
+          });
           closePopup();
         }
       })
@@ -1533,7 +1560,7 @@ var JoinData = function JoinData(props) {
             //     }}
             //   ></Button>
             // </Tooltip>
-            , subQuerySelected ? "".concat(((_meta$subquery2 = meta.subquery) === null || _meta$subquery2 === void 0 ? void 0 : _meta$subquery2[0]).table.datasourceName, ".").concat(((_meta$subquery3 = meta.subquery) === null || _meta$subquery3 === void 0 ? void 0 : _meta$subquery3[0]).table.name, " ").concat((_meta$table5 = meta.table2) !== null && _meta$table5 !== void 0 && _meta$table5.alias ? "as ".concat((_meta$table6 = meta.table2) === null || _meta$table6 === void 0 ? void 0 : _meta$table6.alias) : '', " ") : __('SqlQueryBuilder.setSubQuery')]
+            , subQuerySelected ? "".concat(((_meta$subquery2 = meta.subquery) === null || _meta$subquery2 === void 0 ? void 0 : _meta$subquery2[0]).table.datasourceName, ".").concat(((_meta$subquery3 = meta.subquery) === null || _meta$subquery3 === void 0 ? void 0 : _meta$subquery3[0]).table.name, " ").concat((_meta$table5 = meta.table2) !== null && _meta$table5 !== void 0 && _meta$table5.alias && store.tableEnableAlias ? "as ".concat((_meta$table6 = meta.table2) === null || _meta$table6 === void 0 ? void 0 : _meta$table6.alias) : '', " ") : __('SqlQueryBuilder.setSubQuery')]
           }) : _jsxs("div", {
             className: cx("Sqb-TableName", {
               notSelected: !table2Selected
@@ -1607,7 +1634,7 @@ var JoinData = function JoinData(props) {
             //     }}
             //   ></Button>
             // </Tooltip>
-            , table2Selected ? "".concat(meta.table2.datasourceName, ".").concat(meta.table2.name, " ").concat((_meta$table8 = meta.table2) !== null && _meta$table8 !== void 0 && _meta$table8.alias ? "as ".concat((_meta$table9 = meta.table2) === null || _meta$table9 === void 0 ? void 0 : _meta$table9.alias) : '') : __('SqlQueryBuilder.pickTable')]
+            , table2Selected ? "".concat(meta.table2.datasourceName, ".").concat(meta.table2.name, " ").concat((_meta$table8 = meta.table2) !== null && _meta$table8 !== void 0 && _meta$table8.alias && store.tableEnableAlias ? "as ".concat((_meta$table9 = meta.table2) === null || _meta$table9 === void 0 ? void 0 : _meta$table9.alias) : '') : __('SqlQueryBuilder.pickTable')]
           }), store.showSubquery && _jsx(Tooltip, {
             title: __('SqlQueryBuilder.switchSubQuery'),
             children: _jsx(Button, {
@@ -1810,7 +1837,10 @@ var JoinData = function JoinData(props) {
                     var newMeta = store.metaList[groupIndex].list.slice();
                     newMeta[index].expressions[i].list = data;
                     newMeta[index].expressions[i].quotes = _quotes;
-                    store.setMeta(newMeta, groupIndex);
+                    store.setMeta(newMeta, groupIndex, {
+                      obj: newMeta[index].expressions,
+                      type: ChangeType.expressions
+                    });
                   }
                 }), _jsx(Tooltip, {
                   title: __('SqlQueryBuilder.add'),

package/lib/es/components/modules/summarize/group-by.js

@@ -6,7 +6,7 @@ import cx from 'classnames';
 import { __ } from '../../../locale';
 import { findIndex, getHelper } from '../../../utils';
 import { TypeEnum, ColumnsPopupThemeEnum, SQL_COLUMN_TYPE } from '../../../store/enum';
-import { MetaSummarize_Enum, AtomsTypeEnum } from '../../../store/types';
+import { MetaSummarize_Enum, AtomsTypeEnum, ChangeType } from '../../../store/types';
 import SelectJoinColumn from '../../dialog/select-join-column';
 import { Tooltip, Button, Modal, Input, Toast } from '@gingkoo/pandora';
 import { uuidv4, getAlias } from '../../../utils/helper';
@@ -151,7 +151,10 @@ var GroupBy = function GroupBy(props) {
           // if (value.quotes !== data.quotes) {
           //   newMeta = newMeta.filter((_: MetaListType, _i: number) => _i <= index);
           // }
-          store.setMeta(newMeta, groupIndex);
+          store.setMeta(newMeta, groupIndex, {
+            obj: newMeta[index].by,
+            type: ChangeType.by
+          });
           closePopup();
         }
       })
@@ -203,7 +206,10 @@ var GroupBy = function GroupBy(props) {
               summarizeType: MetaSummarize_Enum.BY
             });
           });
-          store.setMeta(newMeta, groupIndex);
+          store.setMeta(newMeta, groupIndex, {
+            obj: newMeta[index].by,
+            type: ChangeType.by
+          });
           closePopup();
         }
       })
@@ -253,7 +259,10 @@ var GroupBy = function GroupBy(props) {
                 newMeta[index].by[i].sql = newMeta[index].by[i].sql.split('AS ')[0] + "AS ".concat(fieldAlias); //修改sql
                 newMeta[index].by[i].fieldAlias = fieldAlias;
                 newMeta = changeFieldAlias(newMeta, newMeta[index].by[i]);
-                store.setMeta(newMeta, groupIndex);
+                store.setMeta(newMeta, groupIndex, {
+                  obj: newMeta[index].by,
+                  type: ChangeType.by
+                });
               case 2:
               case "end":
                 return _context.stop();

package/lib/es/components/modules/summarize/select-index.js

@@ -9,7 +9,7 @@ import { TypeEnum, SQL_COLUMN_TYPE } from '../../../store/enum';
 import { summarizeToSql } from '../../../store/helper';
 import { Tooltip, Button, Modal, Input, Toast } from '@gingkoo/pandora';
 import { uuidv4 } from '../../../utils/helper';
-import { MetaSummarize_Enum, AtomsTypeEnum } from '../../../store/types';
+import { MetaSummarize_Enum, AtomsTypeEnum, ChangeType } from '../../../store/types';
 import { changeFieldAlias, isValidSQLAlias, isError } from '../../../utils';
 import ItemName from '../components/item-name';
 import { AddIcon, CloseIcon } from '../../icons';
@@ -152,7 +152,10 @@ var SelectIndex = function SelectIndex(props) {
           // if (value.quotes !== data.quotes) {
           //   newMeta = newMeta.filter((_: MetaListType, _i: number) => _i <= index);
           // }
-          store.setMeta(newMeta, groupIndex);
+          store.setMeta(newMeta, groupIndex, {
+            obj: newMeta[index].group,
+            type: ChangeType.group
+          });
           closePopup();
         }
       })
@@ -203,7 +206,10 @@ var SelectIndex = function SelectIndex(props) {
               summarizeType: MetaSummarize_Enum.GROUP
             });
           });
-          store.setMeta(newMeta, groupIndex);
+          store.setMeta(newMeta, groupIndex, {
+            obj: newMeta[index].group,
+            type: ChangeType.group
+          });
           closePopup();
         }
       })
@@ -254,7 +260,10 @@ var SelectIndex = function SelectIndex(props) {
                 newMeta[index].group[i].fieldAlias = fieldAlias;
                 newMeta[index].group[i].sql = newMeta[index].group[i].sql.split('AS ')[0] + "AS ".concat(fieldAlias); //修改sql
                 newMeta = changeFieldAlias(newMeta, newMeta[index].group[i]);
-                store.setMeta(newMeta, groupIndex);
+                store.setMeta(newMeta, groupIndex, {
+                  obj: newMeta[index].group,
+                  type: ChangeType.group
+                });
               case 2:
               case "end":
                 return _context.stop();

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

@@ -9,6 +9,7 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
 import { useEffect, useState } from 'react';
 import cx from 'classnames';
 import { __ } from '../../locale';
+import { ChangeType } from '../../store/types';
 import { Tooltip, Button, Modal, Modal2, Input, Toast } from '@gingkoo/pandora';
 import Metabase from '../../index';
 import { uuidv4, getAlias } from '../../utils/helper';
@@ -83,6 +84,7 @@ var TableData = function TableData(props) {
         data: store.sourceList,
         value: meta.table,
         onChange: function onChange(data) {
+          console.log('🚀 ~ selectTable ~ data:', data);
           if (meta.table.datasourceId !== data.datasourceId || meta.table.name !== data.name) {
             var _store$preProps;
             var newMetaList = store.metaList[groupIndex].list.slice()[0];
@@ -95,7 +97,10 @@ var TableData = function TableData(props) {
               // ① 主表动了 其他都得重新选
               var newMetas = store.metaList[groupIndex].list.slice();
               newMetas[0] = newMetaList;
-              store.setMeta(newMetas, groupIndex);
+              store.setMeta(newMetas, groupIndex, {
+                obj: data,
+                type: ChangeType.datasource
+              });
               // store.setMeta([newMetaList], groupIndex);
             });
           }
@@ -119,7 +124,10 @@ var TableData = function TableData(props) {
           var newMetaList = store.metaList[groupIndex].list.slice();
           // @ts-ignore
           newMetaList[0].columns = data;
-          store.setMeta(newMetaList, groupIndex);
+          store.setMeta(newMetaList, groupIndex, {
+            obj: data,
+            type: ChangeType.columns
+          });
         }
       })
     });
@@ -151,7 +159,10 @@ var TableData = function TableData(props) {
                 newMetaList = store.metaList[groupIndex].list.slice(); // @ts-ignore
                 newMetaList[0].table.alias = alias;
                 newMetaList = changeTableAlias(newMetaList, newMetaList[0].table);
-                store.setMeta(newMetaList, groupIndex);
+                store.setMeta(newMetaList, groupIndex, {
+                  obj: newMetaList[0].table,
+                  type: ChangeType.tableAlias
+                });
               case 2:
               case "end":
                 return _context2.stop();
@@ -223,7 +234,10 @@ var TableData = function TableData(props) {
               // (newMeta[index] as MetaJoin).expressions = [];
               var newMetas = store.metaList[groupIndex].list.slice();
               newMetas[0] = newMetaList;
-              store.setMeta(newMetas, groupIndex);
+              store.setMeta(newMetas, groupIndex, {
+                obj: newList,
+                type: ChangeType.subQuery
+              });
               o.close();
             } catch (e) {
               console.warn(e);
@@ -318,7 +332,7 @@ var TableData = function TableData(props) {
                   })
                 }) : null;
               }()
-            }), subQuerySelected ? "".concat(((_meta$subquery2 = meta.subquery) === null || _meta$subquery2 === void 0 ? void 0 : _meta$subquery2[0]).table.datasourceName, ".").concat(((_meta$subquery3 = meta.subquery) === null || _meta$subquery3 === void 0 ? void 0 : _meta$subquery3[0]).table.name, " ").concat((_meta$table5 = meta.table) !== null && _meta$table5 !== void 0 && _meta$table5.alias ? "as ".concat((_meta$table6 = meta.table) === null || _meta$table6 === void 0 ? void 0 : _meta$table6.alias) : '', " ") : __('SqlQueryBuilder.setSubQuery')]
+            }), subQuerySelected ? "".concat(((_meta$subquery2 = meta.subquery) === null || _meta$subquery2 === void 0 ? void 0 : _meta$subquery2[0]).table.datasourceName, ".").concat(((_meta$subquery3 = meta.subquery) === null || _meta$subquery3 === void 0 ? void 0 : _meta$subquery3[0]).table.name, " ").concat((_meta$table5 = meta.table) !== null && _meta$table5 !== void 0 && _meta$table5.alias && store.tableEnableAlias ? "as ".concat((_meta$table6 = meta.table) === null || _meta$table6 === void 0 ? void 0 : _meta$table6.alias) : '', " ") : __('SqlQueryBuilder.setSubQuery')]
           }) : _jsxs("div", {
             className: cx("Sqb-TableName", {
               notSelected: !selected
@@ -392,7 +406,7 @@ var TableData = function TableData(props) {
             //     }}
             //   ></Button>
             // </Tooltip>
-            , selected ? "".concat(meta.table.datasourceName, ".").concat(meta.table.name, " ").concat((_meta$table8 = meta.table) !== null && _meta$table8 !== void 0 && _meta$table8.alias ? "as ".concat((_meta$table9 = meta.table) === null || _meta$table9 === void 0 ? void 0 : _meta$table9.alias) : '') : __('SqlQueryBuilder.pickTable')]
+            , selected ? "".concat(meta.table.datasourceName, ".").concat(meta.table.name, " ").concat((_meta$table8 = meta.table) !== null && _meta$table8 !== void 0 && _meta$table8.alias && store.tableEnableAlias ? "as ".concat((_meta$table9 = meta.table) === null || _meta$table9 === void 0 ? void 0 : _meta$table9.alias) : '') : __('SqlQueryBuilder.pickTable')]
           }), store.showSubquery && _jsx(Tooltip, {
             title: __('SqlQueryBuilder.switchSubQuery'),
             children: _jsx(Button, {

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

@@ -8,6 +8,8 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useState, useRef, useMemo } from 'react';
 import { uuidv4 } from '../utils/helper';
 import { TypeEnum, JoinEnum, UnionEnum } from '../store/enum';
+import { splitByUnion } from '../utils';
+import cloneDeep from 'lodash/cloneDeep';
 import { findIndex } from '../utils';
 var metaKey = 1;
 export var SummarizeAlias = 'source';
@@ -148,6 +150,10 @@ var useStore = function useStore() {
     fetchDatasetFn.current = fn;
   };
   var fetchColumnsFn = useRef();
+  var fetchChangeFn = useRef();
+  var setFetchChangeFn = function setFetchChangeFn(fn) {
+    fetchChangeFn.current = fn;
+  };
   var setFetchColumnsFn = function setFetchColumnsFn(fn) {
     fetchColumnsFn.current = fn;
   };
@@ -231,6 +237,7 @@ var useStore = function useStore() {
       var _columns2;
       var oldColumns,
         callback,
+        isSelect,
         oldObj,
         selectId,
         _table$alias,
@@ -248,6 +255,7 @@ var useStore = function useStore() {
           case 0:
             oldColumns = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : [];
             callback = _args2.length > 3 ? _args2[3] : undefined;
+            isSelect = _args2.length > 4 && _args2[4] !== undefined ? _args2[4] : isSelectFields;
             // 获取之前选中的数据
             oldObj = {};
             selectId = oldColumns.filter(function (v) {
@@ -276,7 +284,7 @@ var useStore = function useStore() {
               var obj = {};
               obj = oldObj[v.id] || {};
               return _objectSpread(_objectSpread(_objectSpread({}, obj), v), {}, {
-                select: isSelectFields || select,
+                select: isSelect || select,
                 fieldUuid: obj.fieldUuid || v.fieldUuid || uuidv4('field')
               });
             });
@@ -291,14 +299,47 @@ var useStore = function useStore() {
       return _ref2.apply(this, arguments);
     };
   }();
-  var setMeta = function setMeta(curData, groupInd) {
-    var _metaList = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : metaList;
-    var newMeta = _metaList.slice();
-    if (newMeta[groupInd]) {
-      newMeta[groupInd].list = curData;
-      _setMeta(newMeta);
-    }
-  };
+  var setMeta = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(curData, groupInd) {
+      var changeObj,
+        _metaList,
+        newMeta,
+        isChange,
+        _args3 = arguments;
+      return _regeneratorRuntime.wrap(function (_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            changeObj = _args3.length > 2 && _args3[2] !== undefined ? _args3[2] : {};
+            _metaList = _args3.length > 3 && _args3[3] !== undefined ? _args3[3] : metaList;
+            newMeta = cloneDeep(_metaList);
+            if (newMeta[groupInd]) {
+              newMeta[groupInd].list = curData;
+              _setMeta(newMeta);
+            }
+            // 过滤掉初始化
+            if (!(changeObj === 'init')) {
+              _context3.next = 1;
+              break;
+            }
+            return _context3.abrupt("return");
+          case 1:
+            _context3.next = 2;
+            return fetchChangeFn.current(splitByUnion(_metaList), changeObj);
+          case 2:
+            isChange = _context3.sent;
+            if (isChange === false) {
+              _setMeta(_metaList);
+            }
+          case 3:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    }));
+    return function setMeta(_x4, _x5) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
   // 回显
   var setPreData = function setPreData(data) {
     // let patchVersion = (data?.[0]?.list?.[0] as any)?.patchVersion || '';
@@ -323,8 +364,8 @@ var useStore = function useStore() {
               } else {
                 newMeta[i].columns = columns || [];
               }
-              setMeta(newMeta, groupIndex, data);
-            });
+              setMeta(newMeta, groupIndex, 'init', data);
+            }, false);
             return _objectSpread({}, v);
           }
           // 设置column
@@ -342,8 +383,8 @@ var useStore = function useStore() {
               // if (v.type === TypeEnum.joinData) {
               //   newMeta[i] = setQuotes(newMeta[i]);
               // }
-              setMeta(newMeta, groupIndex, data);
-            });
+              setMeta(newMeta, groupIndex, 'init', data);
+            }, false);
             return _objectSpread({}, v);
           }
           return _objectSpread({}, v);
@@ -585,6 +626,8 @@ var useStore = function useStore() {
     fetchDatasetFn: fetchDatasetFn.current,
     setFetchDatasetFn: setFetchDatasetFn,
     fetchColumnsFn: fetchColumnsFn.current,
+    setFetchChangeFn: setFetchChangeFn,
+    fetchChangeFn: fetchChangeFn.current,
     setFetchColumnsFn: setFetchColumnsFn,
     showMainColumn: showMainColumn,
     showToolbar: showToolbar,

package/lib/es/index.js

@@ -23,6 +23,7 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
     showFields = _props$showFields === void 0 ? true : _props$showFields,
     getTables = props.getTables,
     getColumns = props.getColumns,
+    onChange = props.onChange,
     _props$tableNameTpl = props.tableNameTpl,
     tableNameTpl = _props$tableNameTpl === void 0 ? '${name}' : _props$tableNameTpl,
     _props$fieldNameTpl = props.fieldNameTpl,
@@ -57,6 +58,7 @@ var SqlVisionBuilder = React.forwardRef(function (props, ref) {
   useEffect(function () {
     getTables && store.setFetchDatasetFn(getTables);
     getColumns && store.setFetchColumnsFn(getColumns);
+    onChange && store.setFetchChangeFn(onChange);
   }, []);
   useEffect(function () {
     store.setProps(props);

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

@@ -1,5 +1,23 @@
 import type { DatasourceType } from '../types';
 import { TypeEnum, SpecialType, JoinEnum, SQL_COLUMN_TYPE, SortEnum } from './enum';
+export declare enum ChangeType {
+    fieldAlias = "fieldAlias",// 修改字段别名
+    tableAlias = "tableAlias",// 修改字段别名
+    customColumn = "customColumn",// 自定义列
+    formula = "formula",
+    field = "field",// 修改字段别名
+    expressions = "expressions",// expressions
+    table1 = "table1",
+    table2 = "table2",
+    joinType = "joinType",
+    lhs = "lhs",
+    rhs = "rhs",
+    subQuery = "subQuery",
+    datasource = "datasource",
+    columns = "columns",
+    by = "by",
+    group = "group"
+}
 export declare enum AtomsTypeEnum {
     JOIN_DEFAULT = "joinDefault",// join默认
     EXISTS = "exists",// notExists

package/lib/es/store/types.js

@@ -1,3 +1,23 @@
+// 修改类型
+export var ChangeType;
+(function (ChangeType) {
+  ChangeType["fieldAlias"] = "fieldAlias";
+  ChangeType["tableAlias"] = "tableAlias";
+  ChangeType["customColumn"] = "customColumn";
+  ChangeType["formula"] = "formula";
+  ChangeType["field"] = "field";
+  ChangeType["expressions"] = "expressions";
+  ChangeType["table1"] = "table1";
+  ChangeType["table2"] = "table2";
+  ChangeType["joinType"] = "joinType";
+  ChangeType["lhs"] = "lhs";
+  ChangeType["rhs"] = "rhs";
+  ChangeType["subQuery"] = "subQuery";
+  ChangeType["datasource"] = "datasource";
+  ChangeType["columns"] = "columns";
+  ChangeType["by"] = "by";
+  ChangeType["group"] = "group";
+})(ChangeType || (ChangeType = {}));
 // 表达式类型
 export var AtomsTypeEnum;
 (function (AtomsTypeEnum) {

package/lib/es/types.d.ts

@@ -1,4 +1,4 @@
-import type { MetaListType, ToolbarType, FormulaTemplatesItem } from './store/types';
+import type { MetaListType, ToolbarType, FormulaTemplatesItem, ChangeType } from './store/types';
 import { UnionEnum } from './store/enum';
 import { DataType } from './components/dialog/select-join-column';
 export interface MetaListProps {
@@ -38,6 +38,10 @@ export interface MetabaseProps {
     tableEnableAlias?: boolean;
     fieldEnableAlias?: boolean;
     isSelectFields?: boolean;
+    onChange?: (newData: MetaListType[], curData?: {
+        data: any;
+        type: ChangeType;
+    }) => Promise<void | Boolean>;
 }
 export interface OptionItem {
     value?: string;

package/package.json

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